From 5c9319ddac964ae78d947a47b3f0b36fd0efda51 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Wed, 18 Feb 2015 01:08:03 +0100
Subject: [PATCH 0001/2322] writeTextFile: Use passAsFile if available

---
 pkgs/build-support/trivial-builders.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 78e671e8d22..7e73f98db78 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -20,13 +20,18 @@ rec {
     }:
     runCommand name
       { inherit text executable;
+        passAsFile = [ "text" ];
         # Pointless to do this on a remote machine.
         preferLocalBuild = true;
       }
       ''
         n=$out${destination}
         mkdir -p "$(dirname "$n")"
-        echo -n "$text" > "$n"
+        if [ -e "$textPath" ]; then
+          mv "$textPath" "$n"
+        else
+          echo -n "$text" > "$n"
+        fi
         (test -n "$executable" && chmod +x "$n") || true
       '';
 

From 79d3e8f8c19eca0ddff2144c4a29762e6fd5018e Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Tue, 7 Apr 2015 13:41:44 -0400
Subject: [PATCH 0002/2322] iniparser: fix Darwin by building static lib

---
 .../libraries/iniparser/default.nix            | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix
index f71c273f6d0..8d6e0b91ca0 100644
--- a/pkgs/development/libraries/iniparser/default.nix
+++ b/pkgs/development/libraries/iniparser/default.nix
@@ -1,5 +1,9 @@
 { stdenv, fetchurl }:
 
+let
+  inherit (stdenv.lib) optional;
+  isClang = (stdenv.cc.cc.isClang or false);
+in
 stdenv.mkDerivation rec{
   name = "iniparser-3.1";
 
@@ -10,12 +14,12 @@ stdenv.mkDerivation rec{
 
   patches = ./no-usr.patch;
 
-  buildFlags = "libiniparser.so";
+  # TODO: Build dylib on Darwin
+  buildFlags = (if stdenv.isDarwin then [ "libiniparser.a" ] else [ "libiniparser.so" ])
+    ++ optional isClang "CC=clang";
 
   installPhase = ''
     mkdir -p $out/lib
-    cp libiniparser.so.0 $out/lib
-    ln -s libiniparser.so.0 $out/lib/libiniparser.so
 
     mkdir -p $out/include
     cp src/*.h $out/include
@@ -25,7 +29,13 @@ stdenv.mkDerivation rec{
       bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2;
     done;
     cp -r html $out/share/doc/${name}
-  '';
+
+  '' + (if stdenv.isDarwin then ''
+    cp libiniparser.a $out/lib
+  '' else ''
+    cp libiniparser.so.0 $out/lib
+    ln -s libiniparser.so.0 $out/lib/libiniparser.so
+  '');
 
   meta = {
     homepage = http://ndevilla.free.fr/iniparser;

From 0144849f678f9ff611c2a2f1538a455bb8ebdf69 Mon Sep 17 00:00:00 2001
From: Oliver Matthews <oliver@codersoffortune.net>
Date: Tue, 14 Apr 2015 12:34:26 +0000
Subject: [PATCH 0003/2322] Allow allowing local access to mysql socket

---
 nixos/modules/services/databases/mysql.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 05b13492052..30d7a77c58b 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -77,6 +77,14 @@ in
         description = "Location of the file which stores the PID of the MySQL server";
       };
 
+      enableSocketAccess = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to grant local processes access to the mysqld socket.
+        '';
+      };
+
       extraOptions = mkOption {
         default = "";
         example = ''
@@ -180,7 +188,8 @@ in
             chown -R ${cfg.user} ${cfg.pidDir}
 
             # Make the socket directory
-            mkdir -m 0700 -p /run/mysqld
+            mkdir -p /run/mysqld
+            chmod ${if cfg.enableSocketAccess then "0755" else "0700"} /run/mysqld
             chown -R ${cfg.user} /run/mysqld
           '';
 

From b7cb0420ca68fde36a715649b91920fb8d79c322 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 25 Apr 2015 14:23:31 +0200
Subject: [PATCH 0004/2322] nixos/docker-registry: docker independant docker
 registry

---
 nixos/modules/services/misc/docker-registry.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix
index d25fd13a77d..f472e530a70 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixos/modules/services/misc/docker-registry.nix
@@ -29,7 +29,7 @@ in {
 
     storagePath = mkOption {
       type = types.path;
-      default = "/var/lib/docker/registry";
+      default = "/var/lib/docker-registry";
       description = "Docker registry storage path.";
     };
 
@@ -61,14 +61,9 @@ in {
         User = "docker-registry";
         Group = "docker";
         PermissionsStartOnly = true;
+        WorkingDirectory = cfg.storagePath;
       };
 
-      preStart = ''
-        mkdir -p ${cfg.storagePath}
-        if [ "$(id -u)" = 0 ]; then
-          chown -R docker-registry:docker ${cfg.storagePath}
-        fi
-      '';
       postStart = ''
         until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/'; do
           sleep 1;
@@ -77,6 +72,10 @@ in {
     };
 
     users.extraGroups.docker.gid = mkDefault config.ids.gids.docker;
-    users.extraUsers.docker-registry.uid = config.ids.uids.docker-registry;
+    users.extraUsers.docker-registry = {
+      createHome = true;
+      home = cfg.storagePath;
+      uid = config.ids.uids.docker-registry;
+    };
   };
 }

From d6660af8accdbd9ec5312e0c0f8dcd787f87acdc Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 25 Apr 2015 15:25:15 +0200
Subject: [PATCH 0005/2322] nixos/docker: set extraOptions to separatedString
 type

This change is needed if you want to pass extraOptions to docker in multiple
nixos modules.
---
 nixos/modules/virtualisation/docker.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 5be76b2682f..49170f2220b 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -45,7 +45,7 @@ in
       };
     extraOptions =
       mkOption {
-        type = types.str;
+        type = types.separatedString " ";
         default = "";
         description =
           ''

From b5114de4acaf65f0a7daebed1b45a9f97c834698 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 25 Apr 2015 15:31:27 +0200
Subject: [PATCH 0006/2322] nixos: add racoon ipsec IKE deamon

---
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/networking/racoon.nix | 42 ++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 nixos/modules/services/networking/racoon.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 17717c5988d..ebc77ba776a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -293,6 +293,7 @@
   ./services/networking/privoxy.nix
   ./services/networking/prosody.nix
   ./services/networking/quassel.nix
+  ./services/networking/racoon.nix
   ./services/networking/radicale.nix
   ./services/networking/radvd.nix
   ./services/networking/rdnssd.nix
diff --git a/nixos/modules/services/networking/racoon.nix b/nixos/modules/services/networking/racoon.nix
new file mode 100644
index 00000000000..00986bbbd84
--- /dev/null
+++ b/nixos/modules/services/networking/racoon.nix
@@ -0,0 +1,42 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.racoon;
+in {
+  options.services.racoon = {
+    enable = mkEnableOption "Whether to enable racoon.";
+
+    config = mkOption {
+      description = "Contents of racoon configuration file.";
+      default = "";
+      type = types.str;
+    };
+
+    configPath = mkOption {
+      description = "Location of racoon config if config is not provided.";
+      default = "/etc/racoon/racoon.conf";
+      type = types.path;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.racoon = {
+      description = "Racoon Daemon";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.ipsecTools}/bin/racoon -f ${
+          if (cfg.config != "") then pkgs.writeText "racoon.conf" cfg.config
+          else cfg.configPath
+        }";
+        ExecReload = "${pkgs.ipsecTools}/bin/racoonctl reload-config";
+        PIDFile = "/var/run/racoon.pid";
+        Type = "forking";
+        Restart = "always";
+      };
+      preStart = "rm /var/run/racoon.pid || true";
+    };
+  };
+}

From f2ec6964db208abbebdc3db2a958fd266eb50867 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 25 Apr 2015 15:33:08 +0200
Subject: [PATCH 0007/2322] openvswitch: export and fix ovs-monitor-ipsec
 script

---
 .../os-specific/linux/openvswitch/default.nix | 69 +++++++++++--------
 1 file changed, 42 insertions(+), 27 deletions(-)

diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index 2e25c0383b7..67cbbd13826 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -1,47 +1,62 @@
-{ stdenv, fetchurl, openssl, python27, iproute, perl, kernel ? null}:
+{ stdenv, fetchurl, makeWrapper
+, openssl, python27, iproute, perl, kernel ? null }:
+
+with stdenv.lib;
+
 let
-
-  version = "2.1.2";
-
-  skipKernelMod = kernel == null;
-
-in
-stdenv.mkDerivation {
-  version = "2.1.2";
+  _kernel = kernel;
+in stdenv.mkDerivation rec {
+  version = "2.3.1";
   name = "openvswitch-${version}";
+
   src = fetchurl {
-    url = "http://openvswitch.org/releases/openvswitch-2.1.2.tar.gz";
-    sha256 = "16q7faqrj2pfchhn0x5s9ggi5ckcg9n62f6bnqaih064aaq2jm47";
+    url = "http://openvswitch.org/releases/${name}.tar.gz";
+    sha256 = "1lmwyhm5wmdv1l4v1v5xd36d5ra21jz9ix57nh1lgm8iqc0lj5r1";
   };
-  kernel = if skipKernelMod then null else kernel.dev;
-  buildInputs = [
-    openssl
-    python27
-    perl
-  ];
+
+  kernel = optional (_kernel != null) _kernel.dev;
+
+  buildInputs = [ makeWrapper openssl python27 perl ];
+
   configureFlags = [
     "--localstatedir=/var"
     "--sharedstatedir=/var"
     "--sbindir=$(out)/bin"
-  ] ++ (if skipKernelMod then [] else ["--with-linux"]);
+  ] ++ (optionals (_kernel != null) ["--with-linux"]);
+
   # Leave /var out of this!
   installFlags = [
     "LOGDIR=$(TMPDIR)/dummy"
     "RUNDIR=$(TMPDIR)/dummy"
     "PKIDIR=$(TMPDIR)/dummy"
   ];
+
+  postInstall = ''
+    cp debian/ovs-monitor-ipsec $out/share/openvswitch/scripts
+    makeWrapper \
+      $out/share/openvswitch/scripts/ovs-monitor-ipsec \
+      $out/bin/ovs-monitor-ipsec \
+      --prefix PYTHONPATH : "$out/share/openvswitch/python"
+    substituteInPlace $out/share/openvswitch/scripts/ovs-monitor-ipsec \
+      --replace "UnixctlServer.create(None)" "UnixctlServer.create(os.environ['UNIXCTLPATH'])"
+    substituteInPlace $out/share/openvswitch/scripts/ovs-monitor-ipsec \
+      --replace "self.psk_file" "root_prefix + self.psk_file"
+    substituteInPlace $out/share/openvswitch/scripts/ovs-monitor-ipsec \
+      --replace "self.cert_dir" "root_prefix + self.cert_dir"
+  '';
+
   meta = {
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
     description = "A multilayer virtual switch";
-    longDescription = 
+    longDescription =
       ''
-      Open vSwitch is a production quality, multilayer virtual switch 
-      licensed under the open source Apache 2.0 license. It is 
-      designed to enable massive network automation through 
-      programmatic extension, while still supporting standard 
-      management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, 
-      RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to 
-      support distribution across multiple physical servers similar 
+      Open vSwitch is a production quality, multilayer virtual switch
+      licensed under the open source Apache 2.0 license. It is
+      designed to enable massive network automation through
+      programmatic extension, while still supporting standard
+      management interfaces and protocols (e.g. NetFlow, sFlow, SPAN,
+      RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to
+      support distribution across multiple physical servers similar
       to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
       '';
     homepage = "http://openvswitch.org/";

From ec6ecce8cf2ecea21122ad24634ec2a6be8258f2 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 25 Apr 2015 15:35:02 +0200
Subject: [PATCH 0008/2322] nixos/openvswitch: add ipsec gre tunnels support

---
 nixos/modules/virtualisation/openvswitch.nix | 132 +++++++++++++------
 1 file changed, 90 insertions(+), 42 deletions(-)

diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix
index c1579d94657..69ca13a7147 100644
--- a/nixos/modules/virtualisation/openvswitch.nix
+++ b/nixos/modules/virtualisation/openvswitch.nix
@@ -7,35 +7,36 @@ with lib;
 let
   cfg = config.virtualisation.vswitch;
 
-in
+in {
 
-{
-
-  options = {
-
-    virtualisation.vswitch.enable = mkOption {
+  options.virtualisation.vswitch = {
+    enable = mkOption {
       type = types.bool;
       default = false;
-      description =
-        ''
-        Enable Open vSwitch. A configuration 
-        daemon (ovs-server) will be started.
+      description = ''
+        Whether to enable Open vSwitch. A configuration daemon (ovs-server)
+        will be started.
         '';
     };
 
-
-    virtualisation.vswitch.package = mkOption {
+    package = mkOption {
       type = types.package;
       default = pkgs.openvswitch;
-      description =
-        ''
+      description = ''
         Open vSwitch package to use.
-        '';
+      '';
     };
 
+    ipsec = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to start racoon service for openvswitch.
+      '';
+    };
   };
 
-  config = mkIf cfg.enable (let 
+  config = mkIf cfg.enable (let
 
     # Where the communication sockets live
     runDir = "/var/run/openvswitch";
@@ -43,7 +44,7 @@ in
     # Where the config database live (can't be in nix-store)
     stateDir = "/var/db/openvswitch";
 
-    # The path to the an initialized version of the database 
+    # The path to the an initialized version of the database
     db = pkgs.stdenv.mkDerivation {
       name = "vswitch.db";
       unpackPhase = "true";
@@ -51,15 +52,12 @@ in
       buildInputs = with pkgs; [
         cfg.package
       ];
-      installPhase = 
-        ''
-        ensureDir $out/
-        '';
+      installPhase = "mkdir -p $out";
     };
 
-  in {
+  in (mkMerge [{
 
-    environment.systemPackages = [ cfg.package ]; 
+    environment.systemPackages = [ cfg.package pkgs.ipsecTools ];
 
     boot.kernelModules = [ "tun" "openvswitch" ];
 
@@ -73,7 +71,7 @@ in
       path = [ cfg.package ];
       restartTriggers = [ db cfg.package ];
       # Create the config database
-      preStart = 
+      preStart =
         ''
         mkdir -p ${runDir}
         mkdir -p /var/db/openvswitch
@@ -85,23 +83,27 @@ in
         fi
         chmod -R +w /var/db/openvswitch
         '';
-      serviceConfig.ExecStart = 
-        ''
-        ${cfg.package}/bin/ovsdb-server \
-          --remote=punix:${runDir}/db.sock \
-          --private-key=db:Open_vSwitch,SSL,private_key \
-          --certificate=db:Open_vSwitch,SSL,certificate \
-          --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \
-          --unixctl=ovsdb.ctl.sock \
-          /var/db/openvswitch/conf.db
-        '';       
-      serviceConfig.Restart = "always";
-      serviceConfig.RestartSec = 3;
-      postStart =
-        ''
+      serviceConfig = {
+        ExecStart =
+          ''
+          ${cfg.package}/bin/ovsdb-server \
+            --remote=punix:${runDir}/db.sock \
+            --private-key=db:Open_vSwitch,SSL,private_key \
+            --certificate=db:Open_vSwitch,SSL,certificate \
+            --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \
+            --unixctl=ovsdb.ctl.sock \
+            --pidfile=/var/run/openvswitch/ovsdb.pid \
+            --detach \
+            /var/db/openvswitch/conf.db
+          '';
+        Restart = "always";
+        RestartSec = 3;
+        PIDFile = "/var/run/openvswitch/ovsdb.pid";
+        Type = "forking";
+      };
+      postStart = ''
         ${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init
-        '';
-
+      '';
     };
 
     systemd.services.vswitchd = {
@@ -109,9 +111,55 @@ in
       bindsTo = [ "ovsdb.service" ];
       after = [ "ovsdb.service" ];
       path = [ cfg.package ];
-      serviceConfig.ExecStart = ''${cfg.package}/bin/ovs-vswitchd'';
+      serviceConfig = {
+        ExecStart = ''
+          ${cfg.package}/bin/ovs-vswitchd \
+          --pidfile=/var/run/openvswitch/ovs-vswitchd.pid \
+          --detach
+        '';
+        PIDFile = "/var/run/openvswitch/ovs-vswitchd.pid";
+        Type = "forking";
+      };
     };
 
-  });
+  }
+  (mkIf cfg.ipsec {
+    services.racoon.enable = true;
+    services.racoon.configPath = "${runDir}/ipsec/etc/racoon/racoon.conf";
+
+    networking.firewall.extraCommands = ''
+      iptables -I INPUT -t mangle -p esp -j MARK --set-mark 1/1
+      iptables -I INPUT -t mangle -p udp --dport 4500 -j MARK --set-mark 1/1
+    '';
+
+    systemd.services.ovs-monitor-ipsec = {
+      description = "Open_vSwitch Ipsec Daemon";
+      wantedBy = [ "multi-user.target" ];
+      requires = [ "racoon.service" ];
+      after = [ "vswitchd.service" ];
+      environment.UNIXCTLPATH = "/tmp/ovsdb.ctl.sock";
+      serviceConfig = {
+        ExecStart = ''
+          ${cfg.package}/bin/ovs-monitor-ipsec \
+            --root-prefix ${runDir}/ipsec \
+            --pidfile /var/run/openvswitch/ovs-monitor-ipsec.pid \
+            --monitor --detach \
+            unix:/var/run/openvswitch/db.sock
+        '';
+        PIDFile = "/var/run/openvswitch/ovs-monitor-ipsec.pid";
+        Type = "forking";
+      };
+
+      preStart = ''
+        rm -r ${runDir}/ipsec/etc/racoon/certs || true
+        mkdir -p ${runDir}/ipsec/{etc/racoon,etc/init.d/,usr/sbin/}
+        ln -fs ${pkgs.ipsecTools}/bin/setkey ${runDir}/ipsec/usr/sbin/setkey
+        ln -fs ${pkgs.writeScript "racoon-restart" ''
+        #!${pkgs.stdenv.shell}
+        /var/run/current-system/sw/bin/systemctl $1 racoon
+        ''} ${runDir}/ipsec/etc/init.d/racoon
+      '';
+    };
+  })]));
 
 }

From ff095f5002d2dae21e8d3c91855c8bfc56c72d1c Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 25 Apr 2015 16:16:34 +0200
Subject: [PATCH 0009/2322] nixos: add node docker registry server

---
 nixos/modules/module-list.nix                 |  1 +
 .../networking/docker-registry-server.nix     | 98 +++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 nixos/modules/services/networking/docker-registry-server.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 17717c5988d..5b15c8012db 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -256,6 +256,7 @@
   ./services/networking/dhcpd.nix
   ./services/networking/dnscrypt-proxy.nix
   ./services/networking/dnsmasq.nix
+  ./services/networking/docker-registry-server.nix
   ./services/networking/ejabberd.nix
   ./services/networking/firefox/sync-server.nix
   ./services/networking/firewall.nix
diff --git a/nixos/modules/services/networking/docker-registry-server.nix b/nixos/modules/services/networking/docker-registry-server.nix
new file mode 100644
index 00000000000..093d20ecb16
--- /dev/null
+++ b/nixos/modules/services/networking/docker-registry-server.nix
@@ -0,0 +1,98 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.nodeDockerRegistry;
+
+in {
+  options.services.nodeDockerRegistry = {
+    enable = mkEnableOption "Whether to enable docker registry service.";
+
+    port = mkOption {
+      description = "Docker registry listening port.";
+      default = 8080;
+      type = types.int;
+    };
+
+    users = mkOption {
+      description = "Docker registry list of users.";
+      default = [];
+      options = [{
+        user = mkOption {
+          description = "Docker registry user username.";
+          type = types.str;
+        };
+
+        pass = mkOption {
+          description = "Docker registry user password.";
+          type = types.str;
+        };
+      }];
+      type = types.listOf types.optionSet;
+    };
+
+    onTag = mkOption {
+      description = "Docker registry hook triggered when an image is tagged.";
+      default = "";
+      type = types.str;
+    };
+
+    onImage = mkOption {
+      description = "Docker registry hook triggered when an image metadata is uploaded.";
+      default = "";
+      type = types.str;
+    };
+
+    onLayer = mkOption {
+      description = "Docker registry hook triggered when an when an image layer is uploaded.";
+      default = "";
+      type = types.str;
+    };
+
+    onVerify = mkOption {
+      description = "Docker registry hook triggered when an image layer+metadata has been verified.";
+      default = "";
+      type = types.str;
+    };
+
+    onIndex = mkOption {
+      description = "Docker registry hook triggered when an when an image file system data has been indexed.";
+      default = "";
+      type = types.str;
+    };
+
+    dataDir = mkOption {
+      description = "Docker registry data directory";
+      default = "/var/lib/docker-registry";
+      type = types.path;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.docker-registry-server = {
+      description = "Docker Registry Service.";
+      wantedBy = ["multi-user.target"];
+      after = ["network.target"];
+      script = ''
+        ${pkgs.nodePackages.docker-registry-server}/bin/docker-registry-server \
+          --dir ${cfg.dataDir} \
+          --port ${toString cfg.port} \
+          ${concatMapStringsSep " " (u: "--user ${u.user}:${u.pass}") cfg.users} \
+          ${optionalString (cfg.onTag != "") "--on-tag '${cfg.onTag}'"} \
+          ${optionalString (cfg.onImage != "") "--on-image '${cfg.onImage}'"} \
+          ${optionalString (cfg.onVerify != "") "--on-verify '${cfg.onVerify}'"} \
+          ${optionalString (cfg.onIndex != "") "--on-index '${cfg.onIndex}'"}
+      '';
+
+      serviceConfig.User = "docker-registry";
+    };
+
+    users.extraUsers.docker-registry = {
+      uid = config.ids.uids.docker-registry;
+      description = "Docker registry user";
+      createHome = true;
+      home = cfg.dataDir;
+    };
+  };
+}

From b7d8d5dd30a6cdcccc15707eb56d80373366ecee Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 25 Apr 2015 15:13:38 +0200
Subject: [PATCH 0010/2322] Add graphite beacon package and module

---
 .../modules/services/monitoring/graphite.nix  | 27 +++++++++++++++++-
 pkgs/top-level/python-packages.nix            | 28 ++++++++++++++++---
 2 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index bbbbcbccb9b..2a572a6a065 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -354,6 +354,16 @@ in {
         type = types.lines;
       };
     };
+
+    beacon = {
+      enable = mkEnableOption "Whether to enable graphite beacon.";
+
+      config = mkOption {
+        description = "Graphite beacon configuration.";
+        default = {};
+        type = types.attrs;
+      };
+    };
   };
 
   ###### implementation
@@ -535,10 +545,25 @@ in {
       environment.systemPackages = [ pkgs.pythonPackages.graphite_pager ];
     })
 
+    (mkIf cfg.beacon.enable {
+      systemd.services.graphite-beacon = {
+        description = "Grpahite Beacon Alerting Daemon";
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          ExecStart = ''
+            ${pkgs.pythonPackages.graphite_beacon}/bin/graphite-beacon \
+              --config ${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)}
+          '';
+          User = "graphite";
+          Group = "graphite";
+        };
+      };
+    })
+
     (mkIf (
       cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay ||
       cfg.web.enable || cfg.api.enable ||
-      cfg.seyren.enable || cfg.pager.enable
+      cfg.seyren.enable || cfg.pager.enable || cfg.beacon.enable
      ) {
       users.extraUsers = singleton {
         name = "graphite";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5d3ba25347b..9594b171e4b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4307,7 +4307,7 @@ let
     };
 
     propagatedBuildInputs = with self; [ django_1_7 ];
-    
+
     # tests appear to be broken on 0.6.1 at least
     doCheck = ( version != "0.6.1" );
 
@@ -6956,12 +6956,12 @@ let
   nameparser = buildPythonPackage rec {
     name = "nameparser-${version}";
     version = "0.3.4";
-    
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/n/nameparser/${name}.tar.gz";
       sha256 = "1zi94m99ziwwd6kkip3w2xpnl05r2cfv9iq68inz7np81c3g8vag";
     };
-    
+
     meta = {
       description = "A simple Python module for parsing human names into their individual components";
       homepage = https://github.com/derek73/python-nameparser;
@@ -13867,6 +13867,26 @@ let
     };
   };
 
+  graphite_beacon = buildPythonPackage rec {
+    name = "graphite_beacon-0.22.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/g/graphite_beacon/${name}.tar.gz";
+      md5 = "3d7b2bf8a41b6c3ec5ba2c14db321096";
+    };
+
+    propagatedBuildInputs = [ self.tornado ];
+
+    preBuild = "> requirements.txt";
+
+    meta = {
+      description = "A simple alerting application for Graphite metrics";
+      homepage = https://github.com/klen/graphite-beacon;
+      maintainers = [ maintainers.offline ];
+      license = licenses.mit;
+    };
+  };
+
   graphite_influxdb = buildPythonPackage rec {
     name = "graphite-influxdb-0.3";
 
@@ -14715,7 +14735,7 @@ let
       licences = [ licenses.mit licenses.gpl2 ];
     };
   };
-  
+
   dicttoxml = buildPythonPackage rec {
     name = "dicttoxml-1.6.4";
 

From 8854691356ae329df5758223fe31ea683544e212 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 21 Mar 2015 21:28:11 +0100
Subject: [PATCH 0011/2322] picolisp: re-define using mkDerivation

Retains the old install script, with two exceptions:
- Generates a custom pil wrapper; the existing wrapper
  inexplicably fails to load lib.l
- Installs emacs lisp into share/emacs/site-lisp, so that
  it gets installed into the user's environment.
---
 .../interpreters/picolisp/default.nix         | 80 +++++++------------
 1 file changed, 29 insertions(+), 51 deletions(-)

diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index ddb2a26bab2..c263611bde2 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -1,66 +1,44 @@
-x@{builderDefsPackage
-  , jdk /* only used in bootstrap */
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, jdk }:
+with stdenv.lib;
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="picolisp";
-    tarballBaseName="picoLisp";
-    version="3.1.9";
-    name="${baseName}-${version}";
-    tarballName="${tarballBaseName}-${version}";
-    extension="tgz";
-    url="http://www.software-lab.de/${tarballName}.${extension}";
-    sha256="1rhfd743ga9qsgn4h2aw1xcgrc7amsllli2zqg8cgm408vxkr6j1";
+stdenv.mkDerivation rec {
+  name = "picoLisp-${version}";
+  version = "3.1.9";
+  src = fetchurl {
+    url = "http://www.software-lab.de/${name}.tgz";
+    sha256 = "1rhfd743ga9qsgn4h2aw1xcgrc7amsllli2zqg8cgm408vxkr6j1";
   };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.sha256;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doMake" "doDeploy"];
-
-  goSrcDir = if a.stdenv.system == "x86_64-linux" then 
-    "cd src64" else "cd src";
-  makeFlags = [''PREFIX=$out''];
-
-  doDeploy = a.fullDepEntry (''
+  buildInputs = [ jdk ];
+  sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}'';
+  installPhase = ''
     cd ..
 
-    sed -e "s@/usr/@$out/@g" -i bin/pil
-
     mkdir -p "$out/share/picolisp" "$out/lib" "$out/bin"
     cp -r . "$out/share/picolisp/build-dir"
     ln -s "$out/share/picolisp/build-dir" "$out/lib/picolisp"
     ln -s "$out/lib/picolisp/bin/picolisp" "$out/bin/picolisp"
-  '') ["minInit" "defEnsureDir" "doMake"];
-      
+
+    cat >"$out/bin/pil" <<EOF
+    #! /bin/sh
+    $out/bin/picolisp $out/lib/picolisp/lib.l @lib/misc.l @lib/btree.l @lib/db.l @lib/pilog.l
+    EOF
+    chmod +x "$out/bin/pil"
+
+    mkdir -p "$out/share/emacs"
+    ln -s "$out/lib/picolisp/lib/el" "$out/share/emacs/site-lisp"
+  '';
+
   meta = {
-    description = "An interpreter for a small Lisp dialect with builtin DB";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.mit;
+    description = "A simple Lisp with an integrated database.";
+    homepage = http://picolisp.com/;
+    license = licenses.mit;
+    platform = platforms.all;
+    maintainers = with maintainers; [ raskin ];
   };
+
   passthru = {
     updateInfo = {
       downloadPage = "http://www.software-lab.de/down.html";
     };
   };
-}) x
-
+}

From 47614198210287fa5c2bdf42e0c77e8a22cd88ec Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 25 Apr 2015 19:04:40 +0200
Subject: [PATCH 0012/2322] picolisp: 3.1.9 -> 3.1.10

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

diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index c263611bde2..fdeb950bcfd 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -3,10 +3,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "picoLisp-${version}";
-  version = "3.1.9";
+  version = "3.1.10";
   src = fetchurl {
     url = "http://www.software-lab.de/${name}.tgz";
-    sha256 = "1rhfd743ga9qsgn4h2aw1xcgrc7amsllli2zqg8cgm408vxkr6j1";
+    sha256 = "1pn5c0d81rz1fazsdijhw4cqybaad2wn6qramdj2qqkzxa3vvll1";
   };
   buildInputs = [ jdk ];
   sourceRoot = ''picoLisp/src${optionalString stdenv.is64bit "64"}'';

From f44add691155639fdfd5570043799b0218587fb6 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 27 Apr 2015 15:11:12 +0300
Subject: [PATCH 0013/2322] refind: Fix build on i686

Use the correct linker script filename on i686 to fix this build error:

/.../ld: cannot open linker script file /nix/store/...-gnu-efi_3.0u/lib/elf_x86_64_efi.lds: No such file or directory

Only compile tested.
---
 pkgs/tools/bootloaders/refind/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index 85a544ccd4c..aa44c1924bf 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -26,9 +26,13 @@ stdenv.mkDerivation rec {
     sed -e 's|-m64|-maccumulate-outgoing-args -m64|g' -i filesystems/Make.gnuefi
   '';
 
-  buildPhase = ''
-    make prefix= EFIINC=${gnu-efi}/include/efi EFILIB=${gnu-efi}/lib GNUEFILIB=${gnu-efi}/lib  EFICRT0=${gnu-efi}/lib LDSCRIPT=${gnu-efi}/lib/elf_x86_64_efi.lds gnuefi fs_gnuefi
-  '';
+  buildPhase =
+    let ldScript =
+      if stdenv.system == "x86_64-linux" then "elf_x86_64_efi.lds"
+      else if stdenv.system == "i686-linux" then "elf_ia32_efi.lds" else "null";
+    in ''
+      make prefix= EFIINC=${gnu-efi}/include/efi EFILIB=${gnu-efi}/lib GNUEFILIB=${gnu-efi}/lib  EFICRT0=${gnu-efi}/lib LDSCRIPT=${gnu-efi}/lib/${ldScript} gnuefi fs_gnuefi
+    '';
 
   installPhase = ''
     install -d $out/bin/

From 46e82353a1d74183d55a3097f1e18f47f24d0fc4 Mon Sep 17 00:00:00 2001
From: jz <jeffz@eml.cc>
Date: Tue, 28 Apr 2015 17:45:32 -0600
Subject: [PATCH 0014/2322] add goimports

---
 pkgs/development/tools/goimports/default.nix | 34 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 ++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/goimports/default.nix

diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix
new file mode 100644
index 00000000000..91bd207581d
--- /dev/null
+++ b/pkgs/development/tools/goimports/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, lib, go, fetchurl, fetchgit, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  rev = "7534f4943d94a318edde90212439e538ed54cdde";
+  version = "git-2015-04-26";
+  name = "goimports-${version}";
+
+  buildInputs = [ go ];
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "golang";
+    repo = "tools";
+    sha256 = "12ybykrn92l7awav0wkx9yqpc5z0pdwwi29qs9mdr2xspx61rb50";
+  };
+
+  buildPhase = ''
+    export GOPATH=$src
+    go build -v -o goimports golang.org/x/tools/cmd/goimports
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv goimports $out/bin
+  '';
+
+  meta = with lib; {
+    description = "Import management tool for go";
+    homepage = https://godoc.org/golang.org/x/tools/cmd/goimports;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jzellner ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2bdf26fea90..dfbbe417c77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4842,7 +4842,7 @@ let
   jdtsdk = callPackage ../development/eclipse/jdt-sdk { };
 
   jruby165 = callPackage ../development/interpreters/jruby { };
-  
+
   jython = callPackage ../development/interpreters/jython {};
 
   guileCairo = callPackage ../development/guile-modules/guile-cairo { };
@@ -9496,6 +9496,8 @@ let
 
   godep = callPackage ../development/tools/godep { };
 
+  goimports = callPackage ../development/tools/goimports { };
+
   gogoclient = callPackage ../os-specific/linux/gogoclient { };
 
   nss_ldap = callPackage ../os-specific/linux/nss_ldap { };

From 60da99ea2a461b6cf1a11f7af3708a09c9215b3a Mon Sep 17 00:00:00 2001
From: Alexei Robyn <shados@shados.net>
Date: Thu, 30 Apr 2015 04:18:47 +1000
Subject: [PATCH 0015/2322] grub module: removed invalid device check for grub
 EFI installation

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

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 585c8854fee..e8e7727d319 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -21,7 +21,7 @@ let
 
   grubEfi =
     # EFI version of Grub v2
-    if (cfg.devices != ["nodev"]) && cfg.efiSupport && (cfg.version == 2)
+    if cfg.efiSupport && (cfg.version == 2)
     then realGrub.override { efiSupport = cfg.efiSupport; }
     else null;
 

From 00cbf82c01da23780ef75a9d34dd89f57c4ace91 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Sun, 3 May 2015 02:28:13 +0200
Subject: [PATCH 0016/2322] clamav: CVE-2015-2170 CVE-2015-2221 CVE-2015-2222
 CVE-2015-2305 CVE-2015-2668

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

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 350a6f369f0..9a0b947e99b 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl }:
 stdenv.mkDerivation rec {
   name = "clamav-${version}";
-  version = "0.98.6";
+  version = "0.98.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz";
-    sha256 = "0l99a0shgzpl8rvrrgbm1ki2zxlb7g1n82bhq7f2snj4amfj94b5";
+    sha256 = "0wp2ad8km4cqmlndni5ljv7q3lfxm6y4r3giv0yf23bl0yvif918";
   };
 
   buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.clamav.net;
     description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats";
     license = licenses.gpl2;
-    maintainers = [ maintainers.phreedom maintainers.robberer ];
+    maintainers = with maintainers; [ phreedom robberer qknight ];
     platforms = platforms.linux;
   };
 }

From 8d7991b852776a750273bcc722f47ac812b2eca8 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sun, 10 May 2015 14:07:25 +0200
Subject: [PATCH 0017/2322] add Lassulus to maintainers.nix

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8f148ba91c4..8a8ff7ffa09 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -116,6 +116,7 @@
   kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
   kragniz = "Louis Taylor <kragniz@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
+  lassulus = "Lassulus <lassulus@gmail.com>";
   lethalman = "Luca Bruno <lucabru@src.gnome.org>";
   lhvwb = "Nathaniel Baxter <nathaniel.baxter@gmail.com>";
   linquize = "Linquize <linquize@yahoo.com.hk>";

From 23b97e4066839530e679c0745d1947008b93f03b Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 7 May 2015 23:26:06 +0200
Subject: [PATCH 0018/2322] gitolite: v3.6.2 -> v3.6.3

---
 .../version-management/gitolite/default.nix          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix
index 72640662ead..60e0a794705 100644
--- a/pkgs/applications/version-management/gitolite/default.nix
+++ b/pkgs/applications/version-management/gitolite/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, perl, git }:
+{ stdenv, fetchurl, git, nettools, perl }:
 
 stdenv.mkDerivation rec {
   name = "gitolite-${version}";
-  version = "3.6.2";
+  version = "3.6.3";
 
   src = fetchurl {
     url = "https://github.com/sitaramc/gitolite/archive/v${version}.tar.gz";
-    sha256 = "1gsgzi9ayb4rablki3mqr11b0h8db4xg43df660marfpacmkfb01";
+    sha256 = "16cxifjxnri719qb6zzwkdf61x5y957acbdhcgqcan23x1mfn84v";
   };
 
-  buildInputs = [ perl git ];
+  buildInputs = [ git nettools perl ];
   buildPhase = "true";
 
   patchPhase = ''
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
       --replace /usr/bin/perl "${perl}/bin/perl"
     substituteInPlace src/lib/Gitolite/Hooks/Update.pm \
       --replace /usr/bin/perl "${perl}/bin/perl"
+    substituteInPlace src/lib/Gitolite/Setup.pm \
+      --replace hostname "${nettools}/bin/hostname"
   '';
 
   installPhase = ''
@@ -30,6 +32,6 @@ stdenv.mkDerivation rec {
     homepage    = http://gitolite.com/gitolite/index.html;
     license     = licenses.gpl2;
     platforms   = platforms.unix;
-    maintainers = [ maintainers.thoughtpolice ];
+    maintainers = [ maintainers.thoughtpolice maintainers.lassulus ];
   };
 }

From 5a9ac9fed70b63b7ec27e11ba7f4b5673c25a946 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 May 2015 17:28:06 +0200
Subject: [PATCH 0019/2322] Use gcc 4.9 by default

---
 pkgs/tools/misc/pipelight/default.nix |  4 +--
 pkgs/top-level/all-packages.nix       | 36 +++++++++++----------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index cb130c8e917..89459eb281b 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchgit, autoconf, automake, wineStaging, perl, xlibs
-  , gnupg, gcc48_multi, mesa, curl, bash, cacert, cabextract, utillinux, attr
+  , gnupg, gcc_multi, mesa, curl, bash, cacert, cabextract, utillinux, attr
   }:
 
 let
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1i440rf22fmd2w86dlm1mpi3nb7410rfczc0yldnhgsvp5p3sm5f";
   };
 
-  buildInputs = [ wine_custom xlibs.libX11 gcc48_multi mesa curl ];
+  buildInputs = [ wine_custom xlibs.libX11 gcc_multi mesa curl ];
   propagatedbuildInputs = [ curl cabextract ];
 
   patches = [ ./pipelight.patch ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6fcb1c0f95..0711b41d529 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -239,7 +239,7 @@ let
   # just the plain stdenv.
   stdenv_32bit = lowPrio (
     if system == "x86_64-linux" then
-      overrideCC stdenv gcc48_multi
+      overrideCC stdenv gcc_multi
     else
       stdenv);
 
@@ -3469,8 +3469,20 @@ let
 
   gambit = callPackage ../development/compilers/gambit { };
 
-  gcc       = gcc48;
-  gcc_multi = gcc48_multi;
+  gcc = gcc49;
+
+  gcc_multi =
+    if system == "x86_64-linux" then lowPrio (
+      wrapCCWith (import ../build-support/cc-wrapper) glibc_multi (gcc.cc.override {
+        stdenv = overrideCC stdenv (wrapCCWith (import ../build-support/cc-wrapper) glibc_multi gcc.cc);
+        profiledCompiler = false;
+        enableMultilib = true;
+      }))
+    else throw "Multilib gcc not supported on ‘${system}’";
+
+  gcc_debug = lowPrio (wrapCC (gcc.cc.override {
+    stripped = false;
+  }));
 
   gccApple = throw "gccApple is no longer supported";
 
@@ -3601,24 +3613,6 @@ let
       else null;
   }));
 
-  gcc48_multi =
-    if system == "x86_64-linux" then lowPrio (
-      wrapCCWith (import ../build-support/cc-wrapper) glibc_multi (gcc48.cc.override {
-        stdenv = overrideCC stdenv (wrapCCWith (import ../build-support/cc-wrapper) glibc_multi gcc.cc);
-        profiledCompiler = false;
-        enableMultilib = true;
-      }))
-    else throw "Multilib gcc not supported on ‘${system}’";
-
-  gcc48_debug = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 {
-    stripped = false;
-
-    inherit noSysDirs;
-    cross = null;
-    libcCross = null;
-    binutilsCross = null;
-  }));
-
   gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 {
     inherit noSysDirs;
 

From 6671bb8be4744cc15c9da2871766ce6e16886488 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 May 2015 17:35:23 +0200
Subject: [PATCH 0020/2322] Remove gccStdInc

This reverts d927da8dae1c4ff0c492d41e00835cfd08ff84d7. Having a copy
of gcc-wrapper/setup-hook.sh is bad for maintainability - it had
already started to diverge. Also, gccStdInc gave a nix-env conflict
with the standard gcc. And it wasn't actually used in Nixpkgs.

Instead, if you really need to change "-isystem" to "-I", you can now
set ccIncludeFlag to "-I".
---
 pkgs/build-support/cc-wrapper/default.nix     |  3 +-
 .../cc-wrapper/setup-hook-stdinc.sh           | 44 -------------------
 pkgs/build-support/cc-wrapper/setup-hook.sh   |  2 +-
 pkgs/top-level/all-packages.nix               | 21 ---------
 4 files changed, 2 insertions(+), 68 deletions(-)
 delete mode 100644 pkgs/build-support/cc-wrapper/setup-hook-stdinc.sh

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index f6826c837ca..8f930eb4dc4 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -9,7 +9,6 @@
 , cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell
 , zlib ? null, extraPackages ? []
 , dyld ? null # TODO: should this be a setup-hook on dyld?
-, setupHook ? ./setup-hook.sh
 }:
 
 with stdenv.lib;
@@ -226,7 +225,7 @@ stdenv.mkDerivation {
     ''
 
     + ''
-      substituteAll ${setupHook} $out/nix-support/setup-hook.tmp
+      substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook.tmp
       cat $out/nix-support/setup-hook.tmp >> $out/nix-support/setup-hook
       rm $out/nix-support/setup-hook.tmp
 
diff --git a/pkgs/build-support/cc-wrapper/setup-hook-stdinc.sh b/pkgs/build-support/cc-wrapper/setup-hook-stdinc.sh
deleted file mode 100644
index 22e778b0690..00000000000
--- a/pkgs/build-support/cc-wrapper/setup-hook-stdinc.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-# This is an alternate setup hook for gcc-wrapper that uses the -I flag to
-# add include search paths instead of -isystem. We need this for some packages
-# because -isystem can change the search order specified by prior -I flags.
-# Changing the search order can point gcc to the wrong package's headers.
-# The -I flag will never change the order of prior flags.
-
-export NIX_CC=@out@
-
-addCVars () {
-    if [ -d $1/include ]; then
-        export NIX_CFLAGS_COMPILE+=" -I $1/include"
-    fi
-
-    if [ -d $1/lib64 -a ! -L $1/lib64 ]; then
-        export NIX_LDFLAGS+=" -L$1/lib64"
-    fi
-
-    if [ -d $1/lib ]; then
-        export NIX_LDFLAGS+=" -L$1/lib"
-    fi
-}
-
-envHooks+=(addCVars)
-
-# Note: these come *after* $out in the PATH (see setup.sh).
-
-if [ -n "@gcc@" ]; then
-    addToSearchPath PATH @gcc@/bin
-fi
-
-if [ -n "@binutils@" ]; then
-    addToSearchPath PATH @binutils@/bin
-fi
-
-if [ -n "@libc@" ]; then
-    addToSearchPath PATH @libc@/bin
-fi
-
-if [ -n "@coreutils@" ]; then
-    addToSearchPath PATH @coreutils@/bin
-fi
-
-export CC=gcc
-export CXX=g++
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index 648afda6ebb..3d0b2fdfe8a 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -2,7 +2,7 @@ export NIX_CC=@out@
 
 addCVars () {
     if [ -d $1/include ]; then
-        export NIX_CFLAGS_COMPILE+=" -isystem $1/include"
+        export NIX_CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include"
     fi
 
     if [ -d $1/lib64 -a ! -L $1/lib64 ]; then
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0711b41d529..e3f616ad74f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4511,27 +4511,6 @@ let
       inherit stdenv gcc binutils libc shell name cross;
     });
 
-  /* Alternative GCC wrapper that uses the standard -I include flag instead of
-   * -isystem. The -isystem flag can change the search order specified by prior
-   * -I flags. For KDE 5 packages, we don't want to interfere with the include
-   * search path order specified by the build system. Some packages depend on
-   * Qt 4 and Qt 5 simultaneously; because the two Qt versions provide headers
-   * with the same filenames, we must respect the search order specified by the
-   * build system so that the Qt 4 components find the Qt 4 headers and the Qt 5
-   * components find the Qt 5 headers.
-   */
-  wrapGCCStdInc = glibc: baseGCC: (import ../build-support/cc-wrapper) {
-    nativeTools = stdenv.cc.nativeTools or false;
-    nativeLibc = stdenv.cc.nativeLibc or false;
-    nativePrefix = stdenv.cc.nativePrefix or "";
-    cc = baseGCC;
-    libc = glibc;
-    inherit stdenv binutils coreutils zlib;
-    setupHook = ../build-support/cc-wrapper/setup-hook-stdinc.sh;
-  };
-
-  gccStdInc = wrapGCCStdInc glibc gcc.cc;
-
   # prolog
   yap = callPackage ../development/compilers/yap { };
 

From 9ae86dc3fc9db623dbed81c74e7ab37bce785715 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 May 2015 18:41:02 +0200
Subject: [PATCH 0021/2322] Ensure that errexit is honoured in hooks

Partial fix for #7524.
---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 75be719c2b9..47e33056270 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -19,7 +19,7 @@ runHook() {
     if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
     eval "local -a dummy=(\"\${$var[@]}\")"
     for hook in "_callImplicitHook 0 $hookName" "${dummy[@]}"; do
-        if ! _eval "$hook" "$@"; then return 1; fi
+        _eval "$hook" "$@"
     done
     return 0
 }

From 90fd9a55d9346d39948a690b4209c57940e79120 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 12 May 2015 06:40:31 -0400
Subject: [PATCH 0022/2322] binutils: don't build with Werror

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

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index f740c60c487..767edcd7984 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-static-libgcc";
 
   configureFlags =
-    [ "--enable-shared" "--enable-deterministic-archives" ]
+    [ "--enable-shared" "--enable-deterministic-archives" "--disable-werror" ]
     ++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop"
     ++ optional (cross != null) "--target=${cross.config}"
     ++ optionals gold [ "--enable-gold" "--enable-plugins" ]

From 110b671c13747aeda5cc3b3f64f17d0599a262d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 13:09:17 +0200
Subject: [PATCH 0023/2322] gcc: Put info in a separate output

---
 pkgs/development/compilers/gcc/4.8/default.nix | 2 ++
 pkgs/development/compilers/gcc/4.9/default.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 6d5627c34d6..69f9a8df025 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -209,6 +209,8 @@ stdenv.mkDerivation ({
 
   builder = ../builder.sh;
 
+  outputs = [ "out" "info" ];
+
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
     sha256 = "15c6gwm6dzsaagamxkak5smdkf1rdfbqqjs9jdbrp3lbg4ism02a";
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 16737ffc896..1cc894b9dcf 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -208,6 +208,8 @@ stdenv.mkDerivation ({
 
   builder = ../builder.sh;
 
+  outputs = [ "out" "info" ];
+
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
     sha256 = "1pbjp4blk2ycaa6r3jmw4ky5f1s9ji3klbqgv8zs2sl5jn1cj810";

From 24aa3551b0e68c05b8291e61075e612b38586069 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 13:17:25 +0200
Subject: [PATCH 0024/2322] Fix stdenv build

---
 pkgs/stdenv/linux/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index d432206a9e1..e4d79fce744 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -285,6 +285,7 @@ rec {
       [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
         glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl
         paxctl zlib pcre linuxHeaders ed gcc gcc.cc libsigsegv
+        stage3.pkgs.isl_0_11 stage3.pkgs.cloog_0_18_0
       ];
 
     overrides = pkgs: {

From 0cc883f2ee12b8454bfff63d0d26c99bc8da2ca7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 13:47:41 +0200
Subject: [PATCH 0025/2322] groff: Mark as unsafe for parallel building

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

diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index 90beca862c0..b0421a8ed0d 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s";
   };
 
+  enableParallelBuilding = false;
+
   buildInputs = [ ghostscript ];
   nativeBuildInputs = [ perl ];
 

From e8e0995bd04c4342d0683f235299f7f72c3a940d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 13:53:40 +0200
Subject: [PATCH 0026/2322] Fix inputproto and probably other packages

"grep Requires" failed on *.pc files that had no Requires fields, due
to pipefail. But this error was previously masked by #7524.
---
 pkgs/servers/x11/xorg/builder.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index 6ba50d24507..f5b8803a98a 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/pkgs/servers/x11/xorg/builder.sh
@@ -9,8 +9,10 @@ postInstall() {
     if test -n "$origPostInstall"; then eval "$origPostInstall"; fi
 
     local r p requires
+    set +o pipefail
     requires=$(grep "Requires:" $out/lib/pkgconfig/*.pc | \
         sed "s/Requires://" | sed "s/,/ /g")
+    set -o pipefail
 
     echo "propagating requisites $requires"
 

From e7feb89158e0e4330d0221e1c48483a94ba5a6ce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 15:29:29 +0200
Subject: [PATCH 0027/2322] systemd: Fix another build failure hidden by #7524

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index f18cc6fa613..bde6686ff0a 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
     ''
       # FIXME: patch this in systemd properly (and send upstream).
       # FIXME: use sulogin from util-linux once updated.
-      for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.m4.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c; do
+      for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c; do
         test -e $i
         substituteInPlace $i \
           --replace /usr/bin/getent ${stdenv.glibc}/bin/getent \

From f40c885a34ce7b2644e5d450566806da1a7ac6f5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 15:31:26 +0200
Subject: [PATCH 0028/2322] libtiff: Update to 4.0.4beta

---
 .../development/libraries/libtiff/default.nix | 22 ++-----------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 7ed9794011c..739148cb9a6 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,12 +1,7 @@
-{ stdenv, fetchurl, fetchsvn, pkgconfig, zlib, libjpeg, xz }:
+{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }:
 
 let
-  version = "4.0.3";
-  patchDir = fetchsvn {
-    url = svn://svn.archlinux.org/packages/libtiff/trunk;
-    rev = "198247";
-    sha256 = "0a47l0zkc1zz7wxg64cyjv9z1djdvfyxgmwd03znlsac4zijkcy4";
-  };
+  version = "4.0.4beta";
 in
 stdenv.mkDerivation rec {
   name = "libtiff-${version}";
@@ -19,19 +14,6 @@ stdenv.mkDerivation rec {
     sha256 = "0wj8d1iwk9vnpax2h29xqc2hwknxg3s0ay2d5pxkg59ihbifn6pa";
   };
 
-  patchPhase = ''
-    for p in ${patchDir}/*-{2013-4244,2012-4447,2012-4564,2013-1960,2013-1961,libjpeg-turbo}.patch; do
-      patch -p1 < "$p"
-    done
-    (
-    cd tools
-    for p in ${patchDir}/*-CVE-{2013-4231,2013-4232}.patch; do
-      patch -p0 < "$p"
-    done
-    )
-    patch -p0 < ${patchDir}/${if stdenv.isDarwin then "tiff-4.0.3" else "*"}-tiff2pdf-colors.patch
-  ''; # ^ sh on darwin seems not to expand globs in redirects, and I don't want to rebuild all again elsewhere
-
   nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection)

From 94389cb8c6a0cf79bb68dd6c6f60318efa1c9ffb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 15:32:32 +0200
Subject: [PATCH 0029/2322] xdg-utils, libclc: Use fetchzip

---
 pkgs/development/libraries/libclc/default.nix | 13 +++++++------
 pkgs/tools/X11/xdg-utils/default.nix          | 12 +++++++-----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix
index c41e2e0a70b..16d9d8c75a4 100644
--- a/pkgs/development/libraries/libclc/default.nix
+++ b/pkgs/development/libraries/libclc/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchsvn, python, llvm, clang }:
+{ stdenv, fetchFromGitHub, python, llvm, clang }:
 
 stdenv.mkDerivation {
   name = "libclc-2015-03-27";
 
-  src = fetchsvn {
-    url = "http://llvm.org/svn/llvm-project/libclc/trunk";
-    rev = "233456";
-    sha256 = "0g56kgffc1qr9rzhcjr4w8kljcicg0q828s9b4bmfzjvywd7hhr0";
+  src = fetchFromGitHub {
+    owner = "llvm-mirror";
+    repo = "libclc";
+    rev = "0a2d1619921545b52303be5608b64dc46f381e97";
+    sha256 = "0hgm013c0vlfqfbbf4cdajl01hhk1mhsfk4h4bfza1san97l0vcc";
   };
 
   buildInputs = [ python llvm clang ];
@@ -22,7 +23,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage = http://libclc.llvm.org/;
-    description = "implementation of the library requirements of the OpenCL C programming language";
+    description = "Implementation of the library requirements of the OpenCL C programming language";
     license = licenses.mit;
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 53b3531b685..4d7ead019ce 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchgit, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto, w3m }:
+{ stdenv, fetchzip, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto, w3m }:
+
+let rev = "e8ee3b18d16e41b95148111b920a0c8beed3ac6c"; in
 
 stdenv.mkDerivation rec {
   name = "xdg-utils-1.1.0-rc3p7";
 
-  src = fetchgit {
-    url = "http://anongit.freedesktop.org/git/xdg/xdg-utils.git";
-    rev = "e8ee3b18d16e41b95148111b920a0c8beed3ac6c";
-    sha256 = "0qy9h7vh6sw7wmadjvasw4sdhb9fvv7bn32ifgasdx7ag3r3939w";
+  src = fetchzip {
+    name = "xdg-utils-${rev}.tar.gz";
+    url = "http://cgit.freedesktop.org/xdg/xdg-utils/snapshot/${rev}.tar.gz";
+    sha256 = "1hz6rv45blcii1a8n1j45rg8vzm98vh4fvlca3zmay1kp57yr4jl";
   };
 
   # just needed when built from git

From 1fc19adf2c9d360aac3af63f901c3315ddf20dfd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 18:14:27 +0200
Subject: [PATCH 0030/2322] mesa: Remove gallium references

These files no longer exist. The resulting failures were hidden by

@vcunat
---
 pkgs/development/libraries/mesa/default.nix | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 2e94626411e..d5838308b39 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -132,9 +132,6 @@ stdenv.mkDerivation {
       `#$out/lib/libXvMC*` \
       $out/lib/gbm $out/lib/libgbm* \
   '' + ''
-      $out/lib/gallium-pipe \
-      $out/lib/libdricore* \
-      $out/lib/libgallium* \
       $out/lib/vdpau \
       $out/lib/libxatracker*
 
@@ -149,18 +146,6 @@ stdenv.mkDerivation {
       $out/lib/pkgconfig/osmesa.pc
 
   '' + /* now fix references in .la files */ ''
-    sed "/^libdir=/s,$out,$drivers," -i \
-  '' + optionalString enableExtraFeatures ''
-      `#$drivers/lib/libXvMC*.la` \
-  '' + ''
-      $drivers/lib/gallium-pipe/*.la \
-      $drivers/lib/libgallium.la \
-      $drivers/lib/vdpau/*.la \
-      $drivers/lib/libdricore*.la
-
-    sed "s,$out\(/lib/\(libdricore[0-9\.]*\|libgallium\).la\),$drivers\1,g" \
-      -i $drivers/lib/*.la $drivers/lib/*/*.la
-
     sed "/^libdir=/s,$out,$osmesa," -i \
       $osmesa/lib/libOSMesa*.la
 

From 279aca0f4b18aa8157762a26e78c53b3eb074acc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 18:15:25 +0200
Subject: [PATCH 0031/2322] llvm: Don't depend on valgrind/gdb

See a4619673b50bb424371b3fbfa52b202db767313d.
---
 pkgs/development/compilers/llvm/3.6/llvm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/3.6/llvm.nix b/pkgs/development/compilers/llvm/3.6/llvm.nix
index 736ffca295f..05772ebb318 100644
--- a/pkgs/development/compilers/llvm/3.6/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.6/llvm.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
     mv compiler-rt-* $sourceRoot/projects/compiler-rt
   '';
 
-  buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind;
+  buildInputs = [ perl groff cmake libxml2 python libffi ] /* ++ stdenv.lib.optional stdenv.isLinux valgrind */;
 
   propagatedBuildInputs = [ ncurses zlib ];
 

From eb5c1616401ff78509ee707a060efe738f5378b1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 18:16:07 +0200
Subject: [PATCH 0032/2322] wayland: Fewer build-time dependencies

---
 pkgs/development/libraries/wayland/default.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index cdd663bf191..e5a01c5d843 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -1,16 +1,12 @@
 { stdenv, fetchurl, pkgconfig
-, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto
-, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
+, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, expat
 }:
 
 # Require the optional to be enabled until upstream fixes or removes the configure flag
 assert expat != null;
 
-let
-  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
-in
-
 with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "wayland-${version}";
   version = "1.7.0";
@@ -20,13 +16,11 @@ stdenv.mkDerivation rec {
     sha256 = "173w0pqzk2m7hjlg15bymrx7ynxgq1ciadg03hzybxwnvfi4gsmx";
   };
 
-  configureFlags = [
-    (mkFlag (expat != null) "scanner")
-  ];
+  configureFlags = "--with-scanner --disable-documentation";
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ libffi docbook_xsl doxygen graphviz libxslt xmlto expat ];
+  buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat ];
 
   meta = {
     description = "Reference implementation of the wayland protocol";

From 26f17ee091248b4ead62f78a969f94e1230f4588 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 18:16:22 +0200
Subject: [PATCH 0033/2322] cmake: Get rid of circular dependency

Also, don't install static libraries in jsoncpp.
---
 pkgs/development/libraries/jsoncpp/default.nix         | 10 +++-------
 .../development/tools/build-managers/cmake/default.nix |  5 ++---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index 07563364e34..357ba257c24 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -20,18 +20,14 @@ stdenv.mkDerivation rec {
     export sourceRoot=${src.name}
   '';
 
-  nativeBuildInputs = [
-    # cmake can be built with the system jsoncpp, or its own bundled version.
-    # Obviously we cannot build it against the system jsoncpp that doesn't yet exist, so
-    # we make a bootstrapping build with the bundled version.
-    (cmake.override { jsoncpp = null; })
-    python
-  ];
+  nativeBuildInputs = [ cmake python ];
 
   cmakeFlags = [
     "-DJSONCPP_WITH_CMAKE_PACKAGE=1"
   ];
 
+  postInstall = "rm $out/lib/*.a";
+
   meta = {
     inherit version;
     homepage = https://github.com/open-source-parsers/jsoncpp;
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 72ecb10b099..77863c4532d 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, bzip2, curl, expat, jsoncpp, libarchive, xz, zlib
+, bzip2, curl, expat, libarchive, xz, zlib
 , useNcurses ? false, ncurses, useQt4 ? false, qt4
 , wantPS ? false, ps ? null
 }:
@@ -40,7 +40,6 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ bzip2 curl expat libarchive xz zlib ]
-    ++ optional (jsoncpp != null) jsoncpp
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
@@ -53,8 +52,8 @@ stdenv.mkDerivation rec {
       "--docdir=/share/doc/${name}"
       "--mandir=/share/man"
       "--system-libs"
+      "--no-system-jsoncpp"
     ]
-    ++ optional (jsoncpp == null) "--no-system-jsoncpp"
     ++ optional useQt4 "--qt-gui";
 
   setupHook = ./setup-hook.sh;

From 81dfb2c948334372f138d19625409af62fea182a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 15 May 2015 10:58:07 +0200
Subject: [PATCH 0034/2322] Fix usbutils

More #7524.

http://hydra.nixos.org/build/22211118
---
 pkgs/os-specific/linux/usbutils/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index 710a01ed03d..158ff2299b1 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
 
   postInstall =
     ''
-      rm $out/sbin/update-usbids.sh
       substituteInPlace $out/bin/lsusb.py \
         --replace /usr/share/usb.ids ${hwdata}/data/hwdata/usb.ids
     '';

From 592d4af9cf0e81907919cf954c1d0ad3089ae772 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 15 May 2015 11:08:22 +0200
Subject: [PATCH 0035/2322] wpa_supplicant: Fix build

There is no wpa_priv. Another case of #7524.

http://hydra.nixos.org/build/22211118
---
 pkgs/os-specific/linux/wpa_supplicant/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index c709880af2d..baa0d1c6b54 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -87,10 +87,6 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-    # Copy the wpa_priv binary which is not installed
-    mkdir -p $out/bin
-    cp -v wpa_priv $out/bin
-
     mkdir -p $out/share/man/man5 $out/share/man/man8
     cp -v "doc/docbook/"*.5 $out/share/man/man5/
     cp -v "doc/docbook/"*.8 $out/share/man/man8/
@@ -99,6 +95,7 @@ stdenv.mkDerivation rec {
     sed -e "s@/sbin/wpa_supplicant@$out&@" -i "$out/share/dbus-1/system-services/"*
     cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d
     cp -v "systemd/"*.service $out/etc/systemd/system
+    rm $out/share/man/man8/wpa_priv.8
   '';
 
   meta = with stdenv.lib; {

From a88c5a8037e09d04787deb9ac1f4c92ebbefc73a Mon Sep 17 00:00:00 2001
From: Marco Schlumpp <marco.schlumpp@gmail.com>
Date: Thu, 14 May 2015 12:13:33 +0000
Subject: [PATCH 0036/2322] glibc: fixed a warning caused by
 nix-locale-archive.patch

If a function shouldn't accept any parameters, use "(void)" instead of "()".
Close #7843. Vcunat purged unimportant changes from this commit.
---
 pkgs/development/libraries/glibc/nix-locale-archive.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glibc/nix-locale-archive.patch b/pkgs/development/libraries/glibc/nix-locale-archive.patch
index 88c8adef922..eeaf21901a3 100644
--- a/pkgs/development/libraries/glibc/nix-locale-archive.patch
+++ b/pkgs/development/libraries/glibc/nix-locale-archive.patch
@@ -6,7 +6,7 @@ diff -ru glibc-2.16.0-orig/locale/loadarchive.c glibc-2.16.0/locale/loadarchive.
  
  
 +static int
-+open_locale_archive ()
++open_locale_archive (void)
 +{
 +  int fd = -1;
 +  char *path = getenv ("LOCALE_ARCHIVE_2_11");

From f49d2e9953c1473fa6e58d2cae043099f57e617d Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 17 May 2015 19:34:16 +0200
Subject: [PATCH 0037/2322] Fix: khal 0.4.0 does not work with python 3

---
 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 bdc4c643c04..5ed23b48983 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11390,9 +11390,7 @@ let
 
   keymon = callPackage ../applications/video/key-mon { };
 
-  khal = callPackage ../applications/misc/khal {
-    pythonPackages = python3Packages;
-  };
+  khal = callPackage ../applications/misc/khal { };
 
   kid3 = callPackage ../applications/audio/kid3 {
     qt = qt4;

From b2dc40401b06c6089f31b748aa94caed26702848 Mon Sep 17 00:00:00 2001
From: Fabian Schmitthenner <development@schmitthenner.eu>
Date: Sun, 17 May 2015 18:06:49 +0000
Subject: [PATCH 0038/2322] updated digikam to version 4.10.0

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

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 70966196b07..47528ecad62 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-4.6.0";
+  name = "digikam-4.10.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/digikam/${name}.tar.bz2";
-    sha256 = "0id3anikki8c3rzqzapdbg00h577qwybknvkbz1kdq0348bs6ixh";
+    sha256 = "4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725";
   };
 
   nativeBuildInputs = [ cmake automoc4 pkgconfig ];

From bd5011fc34e20b7bf15970b29496e6406ee2bcff Mon Sep 17 00:00:00 2001
From: Richard Zetterberg <richard.zetterberg@googlemail.com>
Date: Sun, 17 May 2015 20:55:07 +0200
Subject: [PATCH 0039/2322] Fixes eval and build error of nova image builder

---
 nixos/modules/virtualisation/nova-image.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/nova-image.nix b/nixos/modules/virtualisation/nova-image.nix
index 2523dacc0b5..9738552774d 100644
--- a/nixos/modules/virtualisation/nova-image.nix
+++ b/nixos/modules/virtualisation/nova-image.nix
@@ -46,16 +46,20 @@ with lib;
 
           # Register the paths in the Nix database.
           printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
-              chroot /mnt ${config.nix.package}/bin/nix-store --load-db
+              chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group ""
 
           # Create the system profile to allow nixos-rebuild to work.
-          chroot /mnt ${config.nix.package}/bin/nix-env \
+          chroot /mnt ${config.nix.package}/bin/nix-env --option build-users-group "" \
               -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
 
           # `nixos-rebuild' requires an /etc/NIXOS.
           mkdir -p /mnt/etc
           touch /mnt/etc/NIXOS
 
+          # `switch-to-configuration' requires a /bin/sh
+          mkdir -p /mnt/bin
+          ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
+
           # Install a configuration.nix.
           mkdir -p /mnt/etc/nixos
           cp ${./nova-config.nix} /mnt/etc/nixos/configuration.nix
@@ -106,7 +110,6 @@ with lib;
 
   # Since Nova allows VNC access to instances, it's nice to start to
   # start a few virtual consoles.
-  services.mingetty.ttys = [ "tty1" "tty2" ];
 
   # Allow root logins only using the SSH key that the user specified
   # at instance creation time.

From 6d176afe5e3664e2a522afcc59c5dc3a5b40c455 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 2 May 2015 05:56:48 +0300
Subject: [PATCH 0040/2322] generic-extlinux-compatible: Add new bootloader for
 ARM

This module generates a /boot/extlinux/extlinux.conf bootloader
configuration file that is supported by e.g. U-Boot:

http://git.denx.de/?p=u-boot.git;a=blob;f=doc/README.distro;hb=refs/heads/master

With this, all ARM boards supported by U-Boot can be booted in a common
way (a single boot file generator, all boards booting via initrd like
x86) and with same boot menu functionality as GRUB has.

-- sample extlinux.conf file --
# Generated file, all changes will be lost on nixos-rebuild!

# Change this to e.g. nixos-42 to temporarily boot to an older configuration.
DEFAULT nixos-default

TIMEOUT 50

LABEL nixos-default
  MENU LABEL NixOS - Default
  LINUX ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-zImage
  INITRD ../nixos/0ss2zs8sb6d1qn4gblxpwlxkfjsgs5f0-initrd-initrd
  FDTDIR ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-dtbs
  APPEND systemConfig=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M init=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M/init loglevel=8 console=ttyS0,115200n8 drm.debug=0xf

LABEL nixos-71
  MENU LABEL NixOS - Configuration 71 (2015-05-17 21:32 - 15.06.git.0b7a7a6M)
  LINUX ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-zImage
  INITRD ../nixos/0ss2zs8sb6d1qn4gblxpwlxkfjsgs5f0-initrd-initrd
  FDTDIR ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-dtbs
  APPEND systemConfig=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M init=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M/init loglevel=8 console=ttyS0,115200n8 drm.debug=0xf
---
 nixos/modules/module-list.nix                 |   1 +
 .../generic-extlinux-compatible/default.nix   |  44 ++++++
 .../extlinux-conf-builder.nix                 |   8 ++
 .../extlinux-conf-builder.sh                  | 132 ++++++++++++++++++
 4 files changed, 185 insertions(+)
 create mode 100644 nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix
 create mode 100644 nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix
 create mode 100644 nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 043b0470edf..3d938869e52 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -411,6 +411,7 @@
   ./system/boot/loader/efi.nix
   ./system/boot/loader/loader.nix
   ./system/boot/loader/generations-dir/generations-dir.nix
+  ./system/boot/loader/generic-extlinux-compatible
   ./system/boot/loader/grub/grub.nix
   ./system/boot/loader/grub/ipxe.nix
   ./system/boot/loader/grub/memtest.nix
diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix
new file mode 100644
index 00000000000..af39c7bb684
--- /dev/null
+++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix
@@ -0,0 +1,44 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  blCfg = config.boot.loader;
+  cfg = blCfg.generic-extlinux-compatible;
+
+  timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout;
+
+  builder = import ./extlinux-conf-builder.nix { inherit pkgs; };
+in
+{
+  options = {
+    boot.loader.generic-extlinux-compatible = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Whether to generate an extlinux-compatible configuration file
+          under <literal>/boot/extlinux.conf</literal>.  For instance,
+          U-Boot's generic distro boot support uses this file format.
+
+          See <link xlink:href="http://git.denx.de/?p=u-boot.git;a=blob;f=doc/README.distro;hb=refs/heads/master">U-boot's documentation</link>
+          for more information.
+        '';
+      };
+
+      configurationLimit = mkOption {
+        default = 20;
+        example = 10;
+        type = types.int;
+        description = ''
+          Maximum number of configurations in the boot menu.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    system.build.installBootLoader = "${builder} -g ${toString cfg.configurationLimit} -t ${timeoutStr} -c";
+    system.boot.loader.id = "generic-extlinux-compatible";
+  };
+}
diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix
new file mode 100644
index 00000000000..261192c6d24
--- /dev/null
+++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix
@@ -0,0 +1,8 @@
+{ pkgs }:
+
+pkgs.substituteAll {
+  src = ./extlinux-conf-builder.sh;
+  isExecutable = true;
+  inherit (pkgs) bash;
+  path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
+}
diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
new file mode 100644
index 00000000000..8f2a496de8b
--- /dev/null
+++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
@@ -0,0 +1,132 @@
+#! @bash@/bin/sh -e
+
+shopt -s nullglob
+
+export PATH=/empty
+for i in @path@; do PATH=$PATH:$i/bin; done
+
+usage() {
+    echo "usage: $0 -t <timeout> -c <path-to-default-configuration> [-d <boot-dir>] [-g <num-generations>]" >&2
+    exit 1
+}
+
+timeout=                # Timeout in centiseconds
+default=                # Default configuration
+target=/boot            # Target directory
+numGenerations=0        # Number of other generations to include in the menu
+
+while getopts "t:c:d:g:" opt; do
+    case "$opt" in
+        t) # U-Boot interprets '0' as infinite and negative as instant boot
+            if [ "$OPTARG" -lt 0 ]; then
+                timeout=0
+            elif [ "$OPTARG" = 0 ]; then
+                timeout=-10
+            else
+                timeout=$((OPTARG * 10))
+            fi
+            ;;
+        c) default="$OPTARG" ;;
+        d) target="$OPTARG" ;;
+        g) numGenerations="$OPTARG" ;;
+        \?) usage ;;
+    esac
+done
+
+[ "$timeout" = "" -o "$default" = "" ] && usage
+
+mkdir -p $target/nixos
+mkdir -p $target/extlinux
+
+# Convert a path to a file in the Nix store such as
+# /nix/store/<hash>-<name>/file to <hash>-<name>-<file>.
+cleanName() {
+    local path="$1"
+    echo "$path" | sed 's|^/nix/store/||' | sed 's|/|-|g'
+}
+
+# Copy a file from the Nix store to $target/nixos.
+declare -A filesCopied
+
+copyToKernelsDir() {
+    local src=$(readlink -f "$1")
+    local dst="$target/nixos/$(cleanName $src)"
+    # Don't copy the file if $dst already exists.  This means that we
+    # have to create $dst atomically to prevent partially copied
+    # kernels or initrd if this script is ever interrupted.
+    if ! test -e $dst; then
+        local dstTmp=$dst.tmp.$$
+        cp -r $src $dstTmp
+        mv $dstTmp $dst
+    fi
+    filesCopied[$dst]=1
+    result=$dst
+}
+
+# Copy its kernel, initrd and dtbs to $target/nixos, and echo out an
+# extlinux menu entry
+addEntry() {
+    local path=$(readlink -f "$1")
+    local tag="$2" # Generation number or 'default'
+
+    if ! test -e $path/kernel -a -e $path/initrd; then
+        return
+    fi
+
+    copyToKernelsDir "$path/kernel"; kernel=$result
+    copyToKernelsDir "$path/initrd"; initrd=$result
+    # XXX UGLY: maybe the system config should have a top-level "dtbs" entry?
+    copyToKernelsDir $(readlink -m "$path/kernel/../dtbs"); dtbs=$result
+
+    timestampEpoch=$(stat -L -c '%Z' $path)
+
+    timestamp=$(date "+%Y-%m-%d %H:%M" -d @$timestampEpoch)
+    nixosVersion="$(cat $path/nixos-version)"
+    extraParams="$(cat $path/kernel-params)"
+
+    echo
+    echo "LABEL nixos-$tag"
+    if [ "$tag" = "default" ]; then
+        echo "  MENU LABEL NixOS - Default"
+    else
+        echo "  MENU LABEL NixOS - Configuration $tag ($timestamp - $nixosVersion)"
+    fi
+    echo "  LINUX ../nixos/$(basename $kernel)"
+    echo "  INITRD ../nixos/$(basename $initrd)"
+    echo "  FDTDIR ../nixos/$(basename $dtbs)"
+    echo "  APPEND systemConfig=$path init=$path/init $extraParams"
+}
+
+tmpFile="$target/extlinux/extlinux.conf.tmp.$$"
+
+cat > $tmpFile <<EOF
+# Generated file, all changes will be lost on nixos-rebuild!
+
+# Change this to e.g. nixos-42 to temporarily boot to an older configuration.
+DEFAULT nixos-default
+
+TIMEOUT $timeout
+$(addEntry $default default)
+EOF
+
+# Add up to $numGenerations generations of the system profile to the menu,
+# in reverse (most recent to least recent) order.
+for generation in $(
+        (cd /nix/var/nix/profiles && ls -d system-*-link) \
+        | sed 's/system-\([0-9]\+\)-link/\1/' \
+        | sort -n -r \
+        | head -n $numGenerations); do
+    link=/nix/var/nix/profiles/system-$generation-link
+    addEntry $link $generation
+done >> $tmpFile
+
+mv -f $tmpFile $target/extlinux/extlinux.conf
+
+# Remove obsolete files from $target/nixos.
+for fn in $target/nixos/*; do
+    if ! test "${filesCopied[$fn]}" = 1; then
+        echo "Removing no longer needed boot file: $fn"
+        chmod +w -- "$fn"
+        rm -rf -- "$fn"
+    fi
+done

From 705c4d7b49a7a824be70b6ead4799dfe328df783 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 9 May 2015 00:50:39 +0000
Subject: [PATCH 0041/2322] agda: Remove unnecessary env-var export

Derivation attributes are automatically exported as environment
variables already.
---
 pkgs/build-support/agda/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index cb6059e00cd..a137704a30c 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -70,7 +70,6 @@ in
         # configurePhase is idempotent
         configurePhase = ''
           eval "$preConfigure"
-          export AGDA_PACKAGE_PATH=${self.AGDA_PACKAGE_PATH};
           export PATH="${self.agdaWrapper}/bin:$PATH"
           eval "$postConfigure"
         '';

From 45052c02a8b27f76a0a4ad9d43a37f7e23d637eb Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 9 May 2015 00:58:18 +0000
Subject: [PATCH 0042/2322] agda: Replace `eval` with `runHook`

This is what haskell-ng does, so I figure it is the right thing to
do.
---
 pkgs/build-support/agda/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index a137704a30c..03a417a3784 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -69,22 +69,22 @@ in
 
         # configurePhase is idempotent
         configurePhase = ''
-          eval "$preConfigure"
+          runHook preConfigure
           export PATH="${self.agdaWrapper}/bin:$PATH"
-          eval "$postConfigure"
+          runHook postConfigure
         '';
 
         buildPhase = ''
-          eval "$preBuild"
+          runHook preBuild
           ${Agda}/bin/agda ${self.buildFlags} ${self.everythingFile}
-          eval "$postBuild"
+          runHook postBuild
         '';
 
         installPhase = ''
-          eval "$preInstall"
+          runHook preInstall
           mkdir -p $out/share/agda
           cp -pR ${unwords self.sourceDirectories} ${mapInside self.topSourceDirectories} $out/share/agda
-          eval "$postInstall"
+          runHook postInstall
         '';
       };
     in stdenv.mkDerivation

From 95c1c686a371954751003c8108f9b6bd49a5338b Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 18 May 2015 04:02:31 +0000
Subject: [PATCH 0043/2322] agda: Remove buildTools, it is unused

---
 pkgs/build-support/agda/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index 03a417a3784..d268bc3b122 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -37,7 +37,7 @@ in
 
         everythingFile = "Everything.agda";
 
-        propagatedBuildInputs = self.buildDepends ++ self.buildTools;
+        propagatedBuildInputs = self.buildDepends;
         propagatedUserEnvPkgs = self.buildDepends;
 
         # Immediate source directories under which modules can be found.
@@ -50,8 +50,6 @@ in
         # would make a direct copy of the whole thing.
         topSourceDirectories = [ "src" ];
 
-        buildTools = [];
-
         # Extra stuff to pass to the Agda binary.
         extraBuildFlags = [ "-i ." ];
         buildFlags = let r = map (x: "-i " + x + "/share/agda") self.buildDepends;

From 86cfcabfbb8df17515fba2713565415a4740ce13 Mon Sep 17 00:00:00 2001
From: Fabian Schmitthenner <development@schmitthenner.eu>
Date: Mon, 18 May 2015 09:56:06 +0000
Subject: [PATCH 0044/2322] digikam: enable face recognition

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

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 47528ecad62..f86d3056db9 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   KDEDIRS="${marble}:${qjson}";
 
   # Help digiKam find libusb, otherwise gphoto2 support is disabled
-  cmakeFlags = "-DLIBUSB_LIBRARIES=${libusb1}/lib -DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0";
+  cmakeFlags = "-DLIBUSB_LIBRARIES=${libusb1}/lib -DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0 -DDIGIKAMSC_COMPILE_LIBKFACE=ON";
 
   enableParallelBuilding = true;
 

From ae444ea4c4e12853e9791d6c567964e345fea922 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 18 May 2015 04:21:50 +0000
Subject: [PATCH 0045/2322] agda: Remove `extraBuildFlags`

This is unused, future users can just use override `buildFlags`
and extend/replace as needed. `includeDirs` is provided for this
purpose.

We should add `dirOf self.everythingFile` rather than `.`, but
`dirOf` breaks on relative paths so that is not an option.
---
 pkgs/build-support/agda/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index d268bc3b122..a513d50d04c 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -21,7 +21,6 @@ in
         sourceDirectories = filter (y: !(y == null)) x.sourceDirectories;
         propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs;
         propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs;
-        extraBuildFlags = filter (y : ! (y == null)) x.extraBuildFlags;
         everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile;
       };
 
@@ -50,11 +49,11 @@ in
         # would make a direct copy of the whole thing.
         topSourceDirectories = [ "src" ];
 
-        # Extra stuff to pass to the Agda binary.
-        extraBuildFlags = [ "-i ." ];
-        buildFlags = let r = map (x: "-i " + x + "/share/agda") self.buildDepends;
-                         d = map (x : "-i " + x) (self.sourceDirectories ++ self.topSourceDirectories);
-                     in unwords (r ++ d ++ self.extraBuildFlags);
+        # FIXME: `dirOf self.everythingFile` is what we really want, not hardcoded "./"
+        includeDirs = let r = map (x: x + "/share/agda") self.buildDepends;
+                          d = self.sourceDirectories ++ self.topSourceDirectories;
+                      in r ++ d ++ [ "." ];
+        buildFlags = unwords (map (x: "-i " + x) self.includeDirs);
 
         # We expose this as a mere convenience for any tools.
         AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDepends;

From b4b621552381fe022d9481a7d4a9cb7aff270105 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Mon, 18 May 2015 17:01:43 -0500
Subject: [PATCH 0046/2322] added flags/switches necessary to get openblas to
 compile on osx

---
 .../libraries/science/math/openblas/default.nix       | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index e779957a6fb..6fdb09c3e7e 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, perl, liblapack, config }:
+{ stdenv, fetchurl, gfortran, perl, liblapack, config, coreutils, clang }:
 
 with stdenv.lib;
 
@@ -7,6 +7,7 @@ let local = config.openblas.preferLocalBuild or false;
       {
         i686-linux = "32";
         x86_64-linux = "64";
+        x86_64-darwin = "64";
       }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
     genericFlags =
       [
@@ -29,14 +30,16 @@ stdenv.mkDerivation rec {
 
   preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz";
 
-  nativeBuildInputs = [gfortran perl];
+  nativeBuildInputs = optionals stdenv.isDarwin [coreutils] ++ [gfortran perl];
 
   makeFlags =
     (if local then localFlags else genericFlags)
     ++
+    optionals stdenv.isDarwin ["MACOSX_DEPLOYMENT_TARGET=10.9"]
+    ++
     [
       "FC=gfortran"
-      "CC=gcc"
+      "CC=${if stdenv.isDarwin then "clang" else "gcc"}"
       ''PREFIX="''$(out)"''
       "INTERFACE64=1"
     ];
@@ -45,7 +48,7 @@ stdenv.mkDerivation rec {
     description = "Basic Linear Algebra Subprograms";
     license = licenses.bsd3;
     homepage = "https://github.com/xianyi/OpenBLAS";
-    platforms = with platforms; linux;
+    platforms = with platforms; all;
     maintainers = with maintainers; [ ttuegel ];
   };
 }

From 2a0a5c697e46d144a2a8cec04352533d5c39d852 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Mon, 18 May 2015 17:45:18 -0500
Subject: [PATCH 0047/2322] added clang dependency, using unix platform

---
 .../development/libraries/science/math/openblas/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 6fdb09c3e7e..67d95f97e07 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, perl, liblapack, config, coreutils, clang }:
+{ stdenv, fetchurl, gfortran, perl, liblapack, config, coreutils }:
 
 with stdenv.lib;
 
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
     ++
     [
       "FC=gfortran"
+      # Note that clang is available through the stdenv on OSX and
+      # thus is not an explicit dependency.
       "CC=${if stdenv.isDarwin then "clang" else "gcc"}"
       ''PREFIX="''$(out)"''
       "INTERFACE64=1"
@@ -48,7 +50,7 @@ stdenv.mkDerivation rec {
     description = "Basic Linear Algebra Subprograms";
     license = licenses.bsd3;
     homepage = "https://github.com/xianyi/OpenBLAS";
-    platforms = with platforms; all;
+    platforms = with platforms; unix;
     maintainers = with maintainers; [ ttuegel ];
   };
 }

From 9b03663f9edb284a4515fc95e001ed3fa30b5753 Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Tue, 19 May 2015 15:31:37 +0200
Subject: [PATCH 0048/2322] ipython: comments about deprecated pylab flag

The pylab flag is deprecated: http://mail.scipy.org/pipermail/ipython-dev/2014-March/013411.html
---
 pkgs/shells/ipython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix
index 47705a05cc8..a9c672471a8 100644
--- a/pkgs/shells/ipython/default.nix
+++ b/pkgs/shells/ipython/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null
 , notebookSupport ? true   # ipython notebook
 , qtconsoleSupport ? true  # ipython qtconsole
-, pylabSupport ? true      # ipython --pylab    (backend: agg - no gui, just file)
-, pylabQtSupport ? true    # ipython --pylab=qt (backend: Qt4Agg - plot to window)
+, pylabSupport ? true      # '%pylab' magic (backend: agg - no gui, just file)
+, pylabQtSupport ? true    # '%pylab qt' (backend: Qt4Agg - plot to window)
 }:
 
 # ipython qtconsole works with both pyside and pyqt4. But ipython --pylab=qt

From ec2f3eb855ed22df4a56ccded9d285321fd4a69d Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Tue, 19 May 2015 15:59:55 -0500
Subject: [PATCH 0049/2322] added gfortran expression for darwin

---
 .../compilers/gcc/gfortran-darwin.nix         | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/gcc/gfortran-darwin.nix

diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.nix b/pkgs/development/compilers/gcc/gfortran-darwin.nix
new file mode 100644
index 00000000000..58f30f677b6
--- /dev/null
+++ b/pkgs/development/compilers/gcc/gfortran-darwin.nix
@@ -0,0 +1,22 @@
+# This is a derivation customized to work on OS X (Darwin).
+{gmp, mpfr, libmpc, fetchurl, stdenv}:
+
+# This package is only intended for OSX.
+assert stdenv.isDarwin;
+
+stdenv.mkDerivation rec {
+  name = "gfortran";
+  version = "5.1.0";
+  buildInputs = [gmp mpfr libmpc];
+  src = fetchurl {
+    url = "https://ftp.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
+    sha256 = "1bd5vj4px3s8nlakbgrh38ynxq4s654m6nxz7lrj03mvkkwgvnmp";
+  };
+  configureFlags = ''
+    --enable-languages=fortran --enable-checking=release --disable-bootstrap
+    --with-gmp=${gmp}
+    --with-mpfr=${mpfr}
+    --with-mpc=${libmpc}
+  '';
+  makeFlags = ["CC=/usr/bin/gcc"];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40a77f8a623..86f71ddb502 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3676,7 +3676,8 @@ let
     isl = isl_0_14;
   }));
 
-  gfortran = gfortran48;
+  gfortran = if !stdenv.isDarwin then gfortran48
+             else callPackage ../development/compilers/gcc/gfortran-darwin.nix {};
 
   gfortran48 = wrapCC (gcc48.cc.override {
     name = "gfortran";

From e70f9e74f222dce8f8dbebb38ab49530e53e10ba Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Tue, 19 May 2015 16:49:58 -0500
Subject: [PATCH 0050/2322] changed to CC=clang

---
 pkgs/development/compilers/gcc/gfortran-darwin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.nix b/pkgs/development/compilers/gcc/gfortran-darwin.nix
index 58f30f677b6..4c596c4f1fb 100644
--- a/pkgs/development/compilers/gcc/gfortran-darwin.nix
+++ b/pkgs/development/compilers/gcc/gfortran-darwin.nix
@@ -18,5 +18,5 @@ stdenv.mkDerivation rec {
     --with-mpfr=${mpfr}
     --with-mpc=${libmpc}
   '';
-  makeFlags = ["CC=/usr/bin/gcc"];
+  makeFlags = ["CC=clang"];
 }

From 33c28bdc833effbf4cd31971e782eeb925f88877 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 18 May 2015 04:46:48 +0000
Subject: [PATCH 0051/2322] agda: Agda dependencies are treated seperately

 - Only they are added to the optional build path (share/agda)
 - Only they are are passed as an include dir (share/agda)
 - Only they are propigatedBuildInputs
---
 pkgs/build-support/agda/default.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index a513d50d04c..6e9aef5499a 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -28,16 +28,24 @@ in
         # There is no Hackage for Agda so we require src.
         inherit (self) src name;
 
+        isAgdaPackage = true;
+
         buildInputs = [ Agda ] ++ self.buildDepends;
         buildDepends = [];
+
+        buildDependsAgda = filter
+          (dep: dep ? isAgdaPackage && dep.isAgdaPackage)
+          self.buildDepends;
+        buildDependsAgdaShareAgda = map (x: x + "/share/agda") self.buildDependsAgda;
+
         # Not much choice here ;)
         LANG = "en_US.UTF-8";
         LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
 
         everythingFile = "Everything.agda";
 
-        propagatedBuildInputs = self.buildDepends;
-        propagatedUserEnvPkgs = self.buildDepends;
+        propagatedBuildInputs = self.buildDependsAgda;
+        propagatedUserEnvPkgs = self.buildDependsAgda;
 
         # Immediate source directories under which modules can be found.
         sourceDirectories = [ ];
@@ -50,13 +58,13 @@ in
         topSourceDirectories = [ "src" ];
 
         # FIXME: `dirOf self.everythingFile` is what we really want, not hardcoded "./"
-        includeDirs = let r = map (x: x + "/share/agda") self.buildDepends;
-                          d = self.sourceDirectories ++ self.topSourceDirectories;
-                      in r ++ d ++ [ "." ];
+        includeDirs = self.buildDependsAgdaShareAgda
+                      ++ self.sourceDirectories ++ self.topSourceDirectories
+                      ++ [ "." ];
         buildFlags = unwords (map (x: "-i " + x) self.includeDirs);
 
         # We expose this as a mere convenience for any tools.
-        AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDepends;
+        AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda;
 
         # Makes a wrapper available to the user. Very useful in
         # nix-shell where all dependencies are -i'd.

From 91ab6c9e899605be047e0e96af1144b964e6b64e Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 18 May 2015 04:50:37 +0000
Subject: [PATCH 0052/2322] agda: Wrapper is no longer built by default

Instead it is provided to the user who can choose whether or not
to include it in the final derivati. Example of including would
be:

```nix
callPackage ... (self: { inherit (self.extras) extraThing; })
```

These extras are also available downstream without being built by
default. This is achieved with `passthru`.
---
 pkgs/build-support/agda/default.nix | 39 +++++++++++++++++------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index 6e9aef5499a..69c4897d1a4 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -22,6 +22,9 @@ in
         propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs;
         propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs;
         everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile;
+
+        passthru = { inherit (x) extras; };
+        extras = null;
       };
 
       defaults = self : {
@@ -63,25 +66,11 @@ in
                       ++ [ "." ];
         buildFlags = unwords (map (x: "-i " + x) self.includeDirs);
 
-        # We expose this as a mere convenience for any tools.
-        AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda;
-
-        # Makes a wrapper available to the user. Very useful in
-        # nix-shell where all dependencies are -i'd.
-        agdaWrapper = writeScriptBin "agda" ''
-          ${Agda}/bin/agda ${self.buildFlags} "$@"
-        '';
-
-        # configurePhase is idempotent
-        configurePhase = ''
-          runHook preConfigure
-          export PATH="${self.agdaWrapper}/bin:$PATH"
-          runHook postConfigure
-        '';
+        agdaWithArgs = "${Agda}/bin/agda ${self.buildFlags}";
 
         buildPhase = ''
           runHook preBuild
-          ${Agda}/bin/agda ${self.buildFlags} ${self.everythingFile}
+          ${self.agdaWithArgs} ${self.everythingFile}
           runHook postBuild
         '';
 
@@ -91,6 +80,24 @@ in
           cp -pR ${unwords self.sourceDirectories} ${mapInside self.topSourceDirectories} $out/share/agda
           runHook postInstall
         '';
+
+        # Optionally-built conveniences
+        extras = {
+          # Makes a wrapper available to the user. Very useful in
+          # nix-shell where all dependencies are -i'd.
+          agdaWrapper = writeScriptBin "agda" ''
+            ${self.agdaWithArgs} "$@"
+          '';
+
+          # Use this to stick `agdaWrapper` at the front of the PATH:
+          #
+          # agda.mkDerivation (self: { PATH = self.extras.agdaWrapperPATH; })
+          #
+          # Not sure this is the best way to handle conflicts....
+          agdaWrapperPATH = "${self.extras.agdaWrapper}/bin:$PATH";
+
+          AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda;
+        };
       };
     in stdenv.mkDerivation
          (postprocess (let super = defaults self // args self;

From 52a6589559ea424857b30b531f766c3c783b60a8 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 18 May 2015 01:49:19 -0400
Subject: [PATCH 0053/2322] agda: the Iowa stdlib seems to be behind a private
 SVN now

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

diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
index 2c76c2f4350..cda2cd9bb05 100644
--- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
@@ -22,5 +22,7 @@ agda.mkDerivation (self: rec {
     license = stdenv.lib.licenses.free;
     platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+
+    broken = true;
   };
 })

From a0d3e234ecab15f463291fb7fc337eacb6c924ff Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Thu, 21 May 2015 13:59:58 +0200
Subject: [PATCH 0054/2322] rpy2: disable pypy

---
 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 20436811c49..2a3b9a01255 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10957,6 +10957,7 @@ let
 
   rpy2 = buildPythonPackage rec {
     name = "rpy2-2.5.6";
+    disabled = isPyPy;
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/r/rpy2/${name}.tar.gz";
       md5 = "a36e758b633ce6aec6a5f450bfee980f";

From c6f68fc17d6ed3b5cd7e97ccf03f405459f259d5 Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Thu, 21 May 2015 14:13:13 +0200
Subject: [PATCH 0055/2322] graph-tool update: 2.2.36 -> 2.2.42

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

diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix
index aa5deb6d6db..d3b02370460 100644
--- a/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix
@@ -3,7 +3,7 @@ pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, makeWrapper,
 gobjectIntrospection, pygobject3, gtk3, matplotlib }:
 
 stdenv.mkDerivation rec {
-  version = "2.2.36";
+  version = "2.2.42";
   name = "${python.libPrefix}-graph-tool-${version}";
 
   meta = with stdenv.lib; {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
-    sha256 = "0wp81dp2kd4bzsl6f3gxjmf11hiqr7rz7g0wa1j38fc0chq31q71";
+    sha256 = "124qmd0mgam7hm87gscp3836ymhhwwnlfm2c5pzpml06da1w0xg9";
   };
 
   preConfigure = ''

From ee4096be8c19fd7e5508e5c602f1183e7e7046c2 Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Thu, 21 May 2015 16:43:07 +0200
Subject: [PATCH 0056/2322] graph-tool: enable openmp

---
 pkgs/development/python-modules/graph-tool/2.x.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix
index d3b02370460..46571978a6d 100644
--- a/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    configureFlags="--with-python-module-path=$out/${python.sitePackages}"
+    configureFlags="--with-python-module-path=$out/${python.sitePackages} --enable-openmp"
   '';
 
   buildInputs = [ automake m4 pkgconfig makeWrapper ];

From e802740b69375fc628e446ffd7c3f746c59312d0 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Fri, 22 May 2015 00:31:14 -0500
Subject: [PATCH 0057/2322] adding metadata, putting version in name

---
 .../compilers/gcc/gfortran-darwin.nix            | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.nix b/pkgs/development/compilers/gcc/gfortran-darwin.nix
index 4c596c4f1fb..954b236ff6f 100644
--- a/pkgs/development/compilers/gcc/gfortran-darwin.nix
+++ b/pkgs/development/compilers/gcc/gfortran-darwin.nix
@@ -1,15 +1,13 @@
-# This is a derivation customized to work on OS X (Darwin).
+# This is a derivation specific to OS X (Darwin). It may work on other
+# systems as well but has not been tested.
 {gmp, mpfr, libmpc, fetchurl, stdenv}:
 
-# This package is only intended for OSX.
-assert stdenv.isDarwin;
-
 stdenv.mkDerivation rec {
-  name = "gfortran";
+  name = "gfortran-${version}";
   version = "5.1.0";
   buildInputs = [gmp mpfr libmpc];
   src = fetchurl {
-    url = "https://ftp.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
+    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
     sha256 = "1bd5vj4px3s8nlakbgrh38ynxq4s654m6nxz7lrj03mvkkwgvnmp";
   };
   configureFlags = ''
@@ -19,4 +17,10 @@ stdenv.mkDerivation rec {
     --with-mpc=${libmpc}
   '';
   makeFlags = ["CC=clang"];
+  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;
+  };
 }

From 71da96faf474e4e1eca8501028181ad6545a176d Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Fri, 22 May 2015 10:39:45 +0200
Subject: [PATCH 0058/2322] add QmidiNet: a MIDI network gateway application

---
 pkgs/applications/audio/QmidiNet/default.nix | 21 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  6 ++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/audio/QmidiNet/default.nix

diff --git a/pkgs/applications/audio/QmidiNet/default.nix b/pkgs/applications/audio/QmidiNet/default.nix
new file mode 100644
index 00000000000..4ab871c22a0
--- /dev/null
+++ b/pkgs/applications/audio/QmidiNet/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, qt4, alsaLib, jack2 }:
+
+stdenv.mkDerivation rec {
+  version = "0.2.1";
+  name = "qmidinet-${version}";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/qmidinet/${name}.tar.gz";
+    sha256 = "1a1pj4w74wj1gcfv4a0vzcglmr5sw0xp0y56w8rk3ig4k11xi8sa";
+  };
+
+  buildInputs = [ qt4 alsaLib jack2 ];
+
+  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/;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c662b413caa..b48feb1b3b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11126,8 +11126,6 @@ let
 
   quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { };
 
-  qjackctl = callPackage ../applications/audio/qjackctl { };
-
   gkrellm = callPackage ../applications/misc/gkrellm { };
 
   gmu = callPackage ../applications/audio/gmu { };
@@ -11977,6 +11975,10 @@ let
 
   qemu-nix = qemu.override { type = "nix"; };
 
+  qjackctl = callPackage ../applications/audio/qjackctl { };
+
+  QmidiNet = callPackage ../applications/audio/QmidiNet { };
+
   qmmp = callPackage ../applications/audio/qmmp { };
 
   qrcode = callPackage ../tools/graphics/qrcode {};

From 7aeab54129db66e979d85d6fa5820bef82b70a61 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Fri, 22 May 2015 09:10:47 -0400
Subject: [PATCH 0059/2322] Readme: Minor grammatical tweaks

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9486759f468..672fc7495de 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 [![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/issue)](http://www.issuestats.com/github/nixos/nixpkgs)
 
 Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package
-manager. It is periodically build and tested by the [hydra](http://hydra.nixos.org/)
+manager. It is periodically built and tested by the [hydra](http://hydra.nixos.org/)
 build daemon as so-called channels. To get channel information via git, add
 [nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels.git) as a remote:
 
@@ -15,7 +15,7 @@ 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-14.12` for the latest
-release and `nixos-unstable` for the latest successfully build master:
+release and `nixos-unstable` for the latest successful build of master:
 
 ```
 % git remote update channels

From 86d299bc6ec739702c5c8d2aae3e2d6b2bb94b1e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 May 2015 14:23:21 +0200
Subject: [PATCH 0060/2322] nixos: add config.services.openssh.moduliFile
 option so that users can replace the default file from OpenSSH

The man page for ssh-keygen(1) has a section "MODULI GENERATION" that describes
how to generate your own moduli file. The following script might also be helpful:

 | #! /usr/bin/env bash
 |
 | moduliFiles=()
 |
 | generateModuli()
 | {
 |   ssh-keygen -G "moduli-$1.candidates" -b "$1"
 |   ssh-keygen -T "moduli-$1" -f "moduli-$1.candidates"
 |   rm "moduli-$1.candidates"
 | }
 |
 | for (( i=0 ; i <= 16 ; ++i )); do
 |   let bitSize="2048 + i * 128"
 |   generateModuli "$bitSize" &
 |   moduliFiles+=( "moduli-$bitSize" )
 | done
 | wait
 |
 | echo >moduli "# Time Type Tests Tries Size Generator Modulus"
 | cat >>moduli "${moduliFiles[@]}"
 | rm "${moduliFiles[@]}"

Note that generating moduli takes a long time, i.e. several hours on a fast
machine!

This patch resolves https://github.com/NixOS/nixpkgs/pull/5870.
---
 nixos/modules/services/networking/ssh/sshd.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 6cc86b4e4b5..14d516ddbb6 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -268,6 +268,16 @@ in
         };
       };
 
+      moduliFile = mkOption {
+        example = "services.openssh.moduliFile = /etc/my-local-ssh-moduli;";
+        type = types.path;
+        description = ''
+          Path to <literal>moduli</literal> file to install in
+          <literal>/etc/ssh/moduli</literal>. If this option is unset, then
+          the <literal>moduli</literal> file shipped with OpenSSH will be used.
+        '';
+      };
+
     };
 
     users.extraUsers = mkOption {
@@ -286,8 +296,10 @@ in
         description = "SSH privilege separation user";
       };
 
+    services.openssh.moduliFile = mkDefault "${cfgc.package}/etc/ssh/moduli";
+
     environment.etc = authKeysFiles ++ [
-      { source = "${cfgc.package}/etc/ssh/moduli";
+      { source = cfg.moduliFile;
         target = "ssh/moduli";
       }
       { text = knownHostsText;

From da6567785b19de0ec934055108a6f04d177ef40e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 May 2015 15:40:25 +0200
Subject: [PATCH 0061/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/134ac5a06c59c5385a7fe958c881515ceb8de45b
 with hackage2nix revision a31a6f02a9c437a93e5f13394aa2268f476433aa

---
 .../haskell-modules/hackage-packages.nix      | 377 ++++++++++++------
 1 file changed, 253 insertions(+), 124 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 972d5d8f382..cc084adabb2 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -19194,13 +19194,12 @@ self: {
      }:
      mkDerivation {
        pname = "analyze-client";
-       version = "0.1.0.1";
-       sha256 = "1k2x6srrf2cwiihhi2aacjy3bxyz59nczr49rnsxa0kk7gnkjngm";
+       version = "0.1.0.2";
+       sha256 = "12csrds628c3ff9giyc6q74jn1s2fbkdyagzbqcvnh3brnzsjvss";
        buildDepends = [
          base bytestring http-conduit MonadCatchIO-transformers mtl snap
          snap-core time
        ];
-       jailbreak = true;
        homepage = "https://github.com/dbp/analyze-client";
        description = "Client for analyze service";
        license = stdenv.lib.licenses.bsd3;
@@ -32562,8 +32561,8 @@ self: {
      }:
      mkDerivation {
        pname = "codex";
-       version = "0.3";
-       sha256 = "0sy9md1r44x0c0a9y012qc851hi5c0rj8fsbagdqy75ajlncp00s";
+       version = "0.3.0.4";
+       sha256 = "1fk3cw37ng80mw6nxv089sadzyf2s0m90c5rz936qpda06rqng08";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -32656,6 +32655,7 @@ self: {
        jailbreak = true;
        description = "Connector library for the coinbase exchange";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colada" = callPackage
@@ -33077,7 +33077,9 @@ self: {
      mkDerivation {
        pname = "comonad";
        version = "4.2.6";
+       revision = "1";
        sha256 = "1dspysfyjk74di2wvv7xj8r92acqsynjl5gi3sh8m7hqb122m60i";
+       editedCabalFile = "7a617c03c1147d1955930ac77cf2395f853195c2331468822aa58a5813b49556";
        buildDepends = [
          base containers contravariant distributive semigroups tagged
          transformers transformers-compat
@@ -35599,8 +35601,8 @@ self: {
     ({ mkDerivation, array, base, containers, parallel }:
      mkDerivation {
        pname = "cpsa";
-       version = "2.4.0";
-       sha256 = "1xhqqrfz6jdmmil1b3awz1j7hfkcpla7vzindqdxhf99y81wd187";
+       version = "2.5.0";
+       sha256 = "1pdcpgfxba55sg19awcds8l6lw48waaz4dh43dlyb666hmhb2adh";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ array base containers parallel ];
@@ -37036,14 +37038,13 @@ self: {
     ({ mkDerivation, base, GLUT, Yampa }:
      mkDerivation {
        pname = "cuboid";
-       version = "0.14.1";
-       sha256 = "10h14qzvv46pmqcwwsvil93da2g8ddk5cpqxwmi884v2svjvz7qm";
+       version = "0.14.2";
+       sha256 = "08l8qf98d5p9d5qyj3kh35rzp8fih77bd2pras4dkn7an39pmr6b";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base GLUT Yampa ];
        description = "3D Yampa/GLUT Puzzle Game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cuda" = callPackage
@@ -49181,20 +49182,19 @@ self: {
 
   "flowdock" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , http-client, http-client-tls, lens, mtl, pipes, pipes-aeson
-     , pipes-http, pipes-parse, template-haskell, text
-     , unordered-containers, uuid
+     , http-client, http-client-tls, lens, lens-action, mtl, network
+     , pipes, pipes-aeson, pipes-http, pipes-parse, template-haskell
+     , text, unordered-containers, uuid
      }:
      mkDerivation {
        pname = "flowdock";
-       version = "0.2.0.0";
-       sha256 = "1lmjhy6cxdr86pia9v04h4q40w0401r3a2srsdhgwbgxzj3syi1r";
+       version = "0.3.0.0";
+       sha256 = "199n32q64gw6i381kn70x5avrh3r2al1nj3f90nibivpip886zgc";
        buildDepends = [
          aeson base base64-bytestring bytestring http-client http-client-tls
-         lens mtl pipes pipes-aeson pipes-http pipes-parse template-haskell
-         text unordered-containers uuid
+         lens lens-action mtl network pipes pipes-aeson pipes-http
+         pipes-parse template-haskell text unordered-containers uuid
        ];
-       jailbreak = true;
        homepage = "https://github.com/brewtown/hs-flowdock";
        description = "Flowdock client library for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -49395,6 +49395,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "fold-debounce" = callPackage
+    ({ mkDerivation, base, data-default, hspec, stm, time }:
+     mkDerivation {
+       pname = "fold-debounce";
+       version = "0.1.0.0";
+       sha256 = "1g22npjhjc35n05gyqrfk9cqr3m976cgdav3f8w1f2hbwvnfbxy7";
+       buildDepends = [ base data-default stm time ];
+       testDepends = [ base hspec stm ];
+       homepage = "https://github.com/debug-ito/fold-debounce";
+       description = "Fold multiple events that happen in a given period of time";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "foldl" = callPackage
     ({ mkDerivation, base, bytestring, containers, mwc-random
      , primitive, text, transformers, vector
@@ -52236,9 +52249,9 @@ self: {
     ({ mkDerivation, async, base, Cabal, containers, data-default
      , deepseq, directory, djinn-ghc, doctest, emacs, filepath, ghc
      , ghc-paths, ghc-syb-utils, haskell-src-exts, hlint, hspec
-     , io-choice, makeWrapper, monad-control, monad-journal, mtl
-     , old-time, pretty, process, split, syb, temporary, text, time
-     , transformers, transformers-base
+     , io-choice, monad-control, monad-journal, mtl, old-time, pretty
+     , process, split, syb, temporary, text, time, transformers
+     , transformers-base
      }:
      mkDerivation {
        pname = "ghc-mod";
@@ -52259,7 +52272,7 @@ self: {
          monad-control monad-journal mtl old-time pretty process split syb
          temporary text time transformers transformers-base
        ];
-       buildTools = [ emacs makeWrapper ];
+       buildTools = [ emacs ];
        configureFlags = "--datasubdir=ghc-mod-5.2.1.2";
        postInstall = ''
          cd $out/share/ghc-mod-5.2.1.2
@@ -52272,7 +52285,7 @@ self: {
        homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
        description = "Happy Haskell Programming";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) emacs;  inherit (pkgs) makeWrapper;};
+     }) { inherit (pkgs) emacs;};
 
   "ghc-mtl" = callPackage
     ({ mkDerivation, base, exceptions, extensible-exceptions, ghc, mtl
@@ -52316,8 +52329,8 @@ self: {
     ({ mkDerivation, base, cpphs, ghc, happy }:
      mkDerivation {
        pname = "ghc-parser";
-       version = "0.1.6.0";
-       sha256 = "1j0axpzm1ysi6sv80rr2bka1wycinrnqvkpnxlb18yb3zbwijz76";
+       version = "0.1.7.0";
+       sha256 = "0cb0d9szrimlflxh67ad74cqfi6yc2cr1bcl17c6b23ccnyqbq73";
        buildDepends = [ base ghc ];
        buildTools = [ cpphs happy ];
        patchPhase = ''
@@ -52389,8 +52402,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ghc-prof-flamegraph";
-       version = "0.1.1.0";
-       sha256 = "0vc456155wsf0qgzih4m3lijzxx99rxpfa149hh8zcqsx1pgq7gm";
+       version = "0.1.2.1";
+       sha256 = "0nzk3h65iqnmva7n2m00kknllqbmg95xav4g5rpizhridpivg9hb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base ];
@@ -53278,19 +53291,18 @@ self: {
     ({ mkDerivation, base, base16-bytestring, bytestring, conduit
      , conduit-combinators, containers, directory, exceptions, filepath
      , hashable, lifted-async, lifted-base, monad-control, monad-logger
-     , mtl, resourcet, semigroups, system-filepath, tagged, text, time
-     , transformers, unix, unordered-containers
+     , mtl, resourcet, semigroups, tagged, text, time, transformers
+     , unix, unordered-containers
      }:
      mkDerivation {
        pname = "gitlib";
-       version = "3.1.0.1";
-       sha256 = "0h6drwxb8nc3nsw9b5w6xaqpwnila0i546w4xykxb61lybjdmw2g";
+       version = "3.1.0.2";
+       sha256 = "05l5i2s0212sx3bzw6r9njanjv1q1gmqc7f6g1z1sy9fibyxcwah";
        buildDepends = [
          base base16-bytestring bytestring conduit conduit-combinators
          containers directory exceptions filepath hashable lifted-async
          lifted-base monad-control monad-logger mtl resourcet semigroups
-         system-filepath tagged text time transformers unix
-         unordered-containers
+         tagged text time transformers unix unordered-containers
        ];
        description = "API library for working with Git repositories";
        license = stdenv.lib.licenses.mit;
@@ -53301,17 +53313,19 @@ self: {
      , containers, directory, exceptions, gitlib, gitlib-test, hspec
      , hspec-expectations, monad-control, mtl, old-locale, parsec
      , process-extras, shelly, system-filepath, tagged, text, time
-     , transformers, transformers-base, unordered-containers
+     , time-locale-compat, transformers, transformers-base
+     , unordered-containers
      }:
      mkDerivation {
        pname = "gitlib-cmdline";
-       version = "3.1.0.1";
-       sha256 = "1vsn7sz71vj79ghcn9wmzf0jnjnaiibvx0k4q8vm4q8aqnl7rvl4";
+       version = "3.1.0.2";
+       sha256 = "1dridps65mw06r9slza80vl21f5n1kq1if7gnwcrbagicvy45p0k";
        buildDepends = [
          base bytestring conduit conduit-combinators containers directory
          exceptions gitlib monad-control mtl old-locale parsec
-         process-extras shelly system-filepath tagged text time transformers
-         transformers-base unordered-containers
+         process-extras shelly system-filepath tagged text time
+         time-locale-compat transformers transformers-base
+         unordered-containers
        ];
        testDepends = [
          base gitlib gitlib-test hspec hspec-expectations system-filepath
@@ -53351,8 +53365,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitlib-libgit2";
-       version = "3.1.0.4";
-       sha256 = "0657m22xybk54rpyzhdv27089nh85a1n0v47w06q9h5pakq3vfv7";
+       version = "3.1.0.5";
+       sha256 = "1xnzks7jwl7d0xf7qgz9gmqf4n1yn3qvjrs73prla8n063kgdh95";
        buildDepends = [
          base bytestring conduit conduit-combinators containers directory
          exceptions fast-logger filepath gitlib hlibgit2 lifted-async
@@ -53417,8 +53431,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitlib-test";
-       version = "3.1.0.2";
-       sha256 = "0nny0fp1j3g5fsxskqnlwcqrrxn74yjxkg9avfqdgai8b585yka2";
+       version = "3.1.0.3";
+       sha256 = "07r970d6m15gri6xim71kl2vvml85jlb0vc51zb67gfsd6iby2py";
        buildDepends = [
          base bytestring conduit conduit-combinators exceptions gitlib hspec
          hspec-expectations HUnit monad-control tagged text time
@@ -53541,6 +53555,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "glambda" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, containers, directory
+     , errors, haskeline, mtl, parsec, tasty, tasty-hunit
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "glambda";
+       version = "1.0";
+       sha256 = "01bqh7g76a02qvzqm8di6ig84k0v7crd9aljsg339h7d3y7grxhf";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         ansi-wl-pprint base containers directory errors haskeline mtl
+         parsec
+       ];
+       testDepends = [
+         ansi-wl-pprint base errors mtl parsec tasty tasty-hunit
+         template-haskell
+       ];
+       homepage = "https://github.com/goldfirere/glambda";
+       description = "A simply typed lambda calculus interpreter, written with GADTs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "glapp" = callPackage
     ({ mkDerivation, base, containers, GLFW-b, lens, mtl, OpenGL }:
      mkDerivation {
@@ -63434,6 +63472,7 @@ self: {
        ];
        description = "Hess-Smith panel code for inviscid 2-d airfoil analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hfov" = callPackage
@@ -65230,8 +65269,8 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix-gsl-stats";
-       version = "0.2.1";
-       sha256 = "1sfyvp5dlxcfqwpfwzqly9h8g26lm8470xaqcw6nj15dya1zl1fj";
+       version = "0.3";
+       sha256 = "1hwm8wm70qzhajqpxzyw652lv1hkrb0lskp3lfsmg1jsaakpckmm";
        buildDepends = [ base binary hmatrix storable-complex ];
        extraLibraries = [ blas lapack ];
        homepage = "http://code.haskell.org/hmatrix-gsl-stats";
@@ -69525,6 +69564,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-monad-control" = callPackage
+    ({ mkDerivation, base, hspec-core, monad-control, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "hspec-monad-control";
+       version = "0.1.0.0";
+       sha256 = "07ry4nghrjbrlv6slv2a1m67r5ajdss7ifyzph0zwa96bjl1w124";
+       buildDepends = [
+         base hspec-core monad-control transformers transformers-base
+       ];
+       description = "Orphan instances of MonadBase and MonadBaseControl for SpecM";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hspec-server" = callPackage
     ({ mkDerivation, base, containers, hspec, hspec-contrib, hspec-core
      , hspec-expectations, HUnit, process, regex-posix, temporary
@@ -73227,8 +73281,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell";
-       version = "0.6.0.0";
-       sha256 = "15fsan1dxlmd7y31630rqrg9gaa205g3s89vlqnxjv0dfvs86qf0";
+       version = "0.6.3.0";
+       sha256 = "0apkidaa0b8xq80y8hvijpkwyv6vl3v8pq19lxjq53y3hs3nqcqm";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -73312,13 +73366,12 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-charts";
-       version = "0.2.0.0";
-       sha256 = "0zncvhjr3nkpr80m5lhl52jq1ha8ml14bjkykkg6d2l1pqnrb3mg";
+       version = "0.2.1.0";
+       sha256 = "0gw737kg5sjmlf43b2wmnjq9k1p4mc5j4b5q50qa2q1n48lz8c0q";
        buildDepends = [
          base bytestring Chart Chart-cairo classy-prelude data-default-class
          directory ihaskell
        ];
-       jailbreak = true;
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for charts types";
        license = stdenv.lib.licenses.mit;
@@ -73326,18 +73379,17 @@ self: {
      }) {};
 
   "ihaskell-diagrams" = callPackage
-    ({ mkDerivation, base, bytestring, classy-prelude, diagrams
+    ({ mkDerivation, active, base, bytestring, classy-prelude, diagrams
      , diagrams-cairo, diagrams-lib, directory, ihaskell
      }:
      mkDerivation {
        pname = "ihaskell-diagrams";
-       version = "0.2.0.0";
-       sha256 = "1if010ky6raw4g0wl24iww1i8qygy4jwd4f8yi9axhxzqzknmqvi";
+       version = "0.2.2.0";
+       sha256 = "0nxspimzzz7pn7lbbgqfq3k83gp4kdxw3cj2c6dlzjvx1bhpqp74";
        buildDepends = [
-         base bytestring classy-prelude diagrams diagrams-cairo diagrams-lib
-         directory ihaskell
+         active base bytestring classy-prelude diagrams diagrams-cairo
+         diagrams-lib directory ihaskell
        ];
-       jailbreak = true;
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for diagram types";
        license = stdenv.lib.licenses.mit;
@@ -73377,12 +73429,11 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-juicypixels";
-       version = "0.2.0.0";
-       sha256 = "058a7wcksbmxq2nahyvpbckd24ziya5f99vmlb3l9wgy9a3i4v2k";
+       version = "0.2.2.0";
+       sha256 = "0c50xsdlmaq4fz92hicljjdpqwvsprw3a1z7fdfzwjdc25gkd2mr";
        buildDepends = [
          base bytestring classy-prelude directory ihaskell JuicyPixels
        ];
-       jailbreak = true;
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package";
        license = stdenv.lib.licenses.mit;
@@ -73428,6 +73479,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ihaskell-plot" = callPackage
+    ({ mkDerivation, base, bytestring, classy-prelude, ihaskell, plot
+     }:
+     mkDerivation {
+       pname = "ihaskell-plot";
+       version = "0.2.0.0";
+       sha256 = "18ghf6fscqqbk3rag1g9rz3knm39r7i4mhj8sxmj195skrmkydpc";
+       buildDepends = [ base bytestring classy-prelude ihaskell plot ];
+       homepage = "http://www.github.com/gibiansky/ihaskell";
+       description = "IHaskell display instance for Plot (from plot package)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ihaskell-rlangqq" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
      , directory, filepath, ihaskell, ihaskell-blaze, Rlang-QQ, split
@@ -73435,13 +73500,12 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-rlangqq";
-       version = "0.2.0.1";
-       sha256 = "1si38n47p57kwqsmsqw9bnv4k6z3zd6n8f5kmsmmbcmjdqmi7i86";
+       version = "0.2.2.0";
+       sha256 = "1kjp7nmmwjh4wc2b5xqw5f8hg9jq3a8p6rdxcd61qp2iizm4r372";
        buildDepends = [
          base base64-bytestring blaze-html bytestring directory filepath
          ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat
        ];
-       jailbreak = true;
        description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75056,17 +75120,17 @@ self: {
   "ipython-kernel" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, containers
      , directory, filepath, mtl, parsec, SHA, tar, text, transformers
-     , unix, uuid, zeromq4-haskell
+     , uuid, zeromq4-haskell
      }:
      mkDerivation {
        pname = "ipython-kernel";
-       version = "0.6.0.0";
-       sha256 = "0pk49hz2ba2ikd96nymrlk7nrd5sw1fmy7xbx24hrri5izqfjjli";
+       version = "0.6.1.0";
+       sha256 = "1dmmrkph3myc67wp4ibx2l10dkxpkgzh7i4shbjbqag39ljb0q60";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base bytestring cereal containers directory filepath mtl
-         parsec SHA tar text transformers unix uuid zeromq4-haskell
+         parsec SHA tar text transformers uuid zeromq4-haskell
        ];
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for creating kernels for IPython frontends";
@@ -76435,8 +76499,8 @@ self: {
      }:
      mkDerivation {
        pname = "jose-jwt";
-       version = "0.6";
-       sha256 = "0bap7a7d984mz0ss04vva5m2qy0kly60r6plxrihvj381bnq69k4";
+       version = "0.6.1";
+       sha256 = "0bw7pwz4blcjwxipjy0s5y7ibkf09d6kfjpw1zmkhz6padi9pvwi";
        buildDepends = [
          aeson base base64-bytestring byteable bytestring cereal cipher-aes
          containers crypto-cipher-types crypto-numbers crypto-pubkey
@@ -80047,8 +80111,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens-action";
-       version = "0.2";
-       sha256 = "1paam0sk1p9cgnrg74qc08szipnb5pmp1vzq4pjaki7jrbh8fr74";
+       version = "0.2.0.1";
+       sha256 = "164fka3krz32zhxnhkylnkmgnx2qj4qvn6y1hfwwla4ddn0axm9n";
        buildDepends = [
          base comonad contravariant lens mtl profunctors semigroupoids
          semigroups transformers
@@ -81245,6 +81309,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "line-break" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "line-break";
+       version = "0.1.0.0";
+       sha256 = "01w5bk58n14vni6cb8rc4ri3hpgism1c78jk605927yf2llxnc14";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ base ];
+       description = "Convert newlines in text";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "line2pdf" = callPackage
     ({ mkDerivation, base, bytestring, containers }:
      mkDerivation {
@@ -81269,8 +81346,8 @@ self: {
      }:
      mkDerivation {
        pname = "linear";
-       version = "1.18.1";
-       sha256 = "1msj1h4mzlxj255lv085f1im7w741x4kl1v5pav4bx6ga886sp3z";
+       version = "1.18.1.1";
+       sha256 = "1qgpv6c3q4ljqc3223iyj49piqs9xx58zmnpvg76wkaygsnnzq9p";
        buildDepends = [
          adjunctions base binary bytes cereal containers deepseq
          distributive ghc-prim hashable lens reflection semigroupoids
@@ -81281,7 +81358,6 @@ self: {
          base binary bytestring directory doctest filepath HUnit lens
          simple-reflect test-framework test-framework-hunit
        ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/linear/";
        description = "Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
@@ -81377,34 +81453,33 @@ self: {
      }) {};
 
   "linearscan" = callPackage
-    ({ mkDerivation, base, containers, mtl, transformers }:
+    ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }:
      mkDerivation {
        pname = "linearscan";
-       version = "0.4.0.0";
-       sha256 = "170dppl4hgfrxpqix19a7nf1dv46wc46s797h8ppa2j0xvcdf4xs";
-       buildDepends = [ base containers mtl transformers ];
-       jailbreak = true;
+       version = "0.5.0.0";
+       sha256 = "0n8xcj5pkz50mkx4cvqh1iywlf9vrk6bk4d3lv8fa22ik88mdr15";
+       buildDepends = [ base containers ghc-prim mtl transformers ];
        homepage = "http://github.com/jwiegley/linearscan";
        description = "Linear scan register allocator, formally verified in Coq";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linearscan-hoopl" = callPackage
-    ({ mkDerivation, base, containers, free, hoopl, hspec
+    ({ mkDerivation, base, containers, deepseq, free, hoopl, hspec
      , hspec-expectations, lens-family-core, linearscan, transformers
      }:
      mkDerivation {
        pname = "linearscan-hoopl";
-       version = "0.4.0.1";
-       sha256 = "0b8p1ij5rsap4z7cfs5byrn2ixm997ppl3z41m82kmk1vzsj04my";
+       version = "0.5.0.0";
+       sha256 = "0z8lhi4q89f1b2fk5a3vn0a9q9h4w81b0wjqdypb7bz5lisvvg0s";
        buildDepends = [
          base containers free hoopl linearscan transformers
        ];
        testDepends = [
-         base containers hoopl hspec hspec-expectations lens-family-core
-         linearscan transformers
+         base containers deepseq hoopl hspec hspec-expectations
+         lens-family-core linearscan transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/jwiegley/linearscan-hoopl";
        description = "Makes it easy to use the linearscan register allocator with Hoopl";
        license = stdenv.lib.licenses.bsd3;
@@ -81763,12 +81838,12 @@ self: {
      , bytestring, cmdargs, containers, deepseq, directory, filemanip
      , filepath, ghc-prim, hashable, intern, mtl, ocaml, parsec, pretty
      , process, syb, tasty, tasty-hunit, tasty-rerun, text, text-format
-     , transformers, unordered-containers
+     , transformers, unordered-containers, z3
      }:
      mkDerivation {
        pname = "liquid-fixpoint";
-       version = "0.3.0.0";
-       sha256 = "14hpvnf46xpw1c3jmi9v91116dv5sglsn4v0gfqxds1nabjw1c5s";
+       version = "0.3.0.1";
+       sha256 = "00s5ch8i96nqjy2kq6y3i25mji3ld6z8121ngpbz87zbgp3zwhaw";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -81780,13 +81855,13 @@ self: {
        testDepends = [
          base directory filepath process tasty tasty-hunit tasty-rerun text
        ];
-       buildTools = [ ocaml ];
+       buildTools = [ ocaml z3 ];
        configureFlags = [ "-fbuild-external" ];
        homepage = "https://github.com/ucsd-progsys/liquid-fixpoint";
        description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ocaml;};
+     }) { inherit (pkgs) ocaml;  inherit (pkgs) z3;};
 
   "liquidhaskell" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base, bifunctors
@@ -81795,12 +81870,12 @@ self: {
      , hashable, hpc, hscolour, intern, liquid-fixpoint, mtl
      , optparse-applicative, parsec, pretty, process, syb, tagged, tasty
      , tasty-hunit, tasty-rerun, template-haskell, text, time
-     , unordered-containers, vector
+     , unordered-containers, vector, z3
      }:
      mkDerivation {
        pname = "liquidhaskell";
-       version = "0.3.1.0";
-       sha256 = "0dcrgbwchssp62n8ywkdfa70dvx186338s3gyyj7rlfvxilfqc7k";
+       version = "0.4.0.1";
+       sha256 = "079dj0kq1fznad34ydmqh0klhbky45c7mcyman1aqsnn7rlhh1nv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -81814,12 +81889,12 @@ self: {
          base directory filepath optparse-applicative process tagged tasty
          tasty-hunit tasty-rerun
        ];
-       doCheck = false;
+       buildTools = [ z3 ];
        homepage = "http://goto.ucsd.edu/liquidhaskell";
        description = "Liquid Types for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) { inherit (pkgs) z3;};
 
   "lispparser" = callPackage
     ({ mkDerivation, base, parsec }:
@@ -82670,8 +82745,8 @@ self: {
      }:
      mkDerivation {
        pname = "log";
-       version = "0.1.1";
-       sha256 = "0kzziark5y41ig6z3qaa66x5avibwp6k74qcs9jf38hnl9z74pfr";
+       version = "0.2.0";
+       sha256 = "1mm41m8vg7n6hnnrg47qy2pbhsxgykclz3wypjsf1zj5wbqdd2w0";
        buildDepends = [
          aeson aeson-pretty base bytestring deepseq exceptions hpqtypes
          monad-control monad-time mtl old-locale split stm text time
@@ -83699,7 +83774,9 @@ self: {
      mkDerivation {
        pname = "machines";
        version = "0.5.1";
+       revision = "1";
        sha256 = "1dyvyy0yv9qha1ff2nfrl304vmmbi4hd881jyj3xpqhgc3zz8ab2";
+       editedCabalFile = "c50d5fcc8b1b5635539169a5da097a25c7a7b7e9b8cc582abba3703014ba2d1d";
        buildDepends = [
          base comonad containers free mtl pointed profunctors semigroups
          transformers void
@@ -83716,8 +83793,8 @@ self: {
      }:
      mkDerivation {
        pname = "machines-directory";
-       version = "0.2.0.4";
-       sha256 = "059jxf636l4xy4dflp6imf2sbrb2sq5ig3mr13pjqx4s5agwcl8r";
+       version = "0.2.0.6";
+       sha256 = "03faha5zbxikbrz40wb0qar8qyjkzaylnk78ba925vms57dwwxva";
        buildDepends = [
          base directory filepath machines machines-io transformers
        ];
@@ -83732,8 +83809,8 @@ self: {
      }:
      mkDerivation {
        pname = "machines-io";
-       version = "0.2.0.4";
-       sha256 = "078xr6hh27ssv07vw85h5h297akvpar13m5sykf7m0rz8kzdybgk";
+       version = "0.2.0.6";
+       sha256 = "19xi9ia2f18nwqx58qb4l1hc2cv25jwcsl4qxd7snp4ynjyy6ln1";
        buildDepends = [
          base bytestring chunked-data machines transformers
        ];
@@ -91533,6 +91610,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-uri-static" = callPackage
+    ({ mkDerivation, base, doctest, network-uri, template-haskell }:
+     mkDerivation {
+       pname = "network-uri-static";
+       version = "0.1.0.0";
+       sha256 = "16b8jn72g76zd2gxzimnnj77l42y430y862sxzdnsclsnc7w4fn9";
+       buildDepends = [ base network-uri template-haskell ];
+       testDepends = [ base doctest ];
+       homepage = "http://github.com/snakamura/network-uri-static";
+       description = "A small utility to declare type-safe static URIs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "network-wai-router" = callPackage
     ({ mkDerivation, base, wai }:
      mkDerivation {
@@ -92141,8 +92231,8 @@ self: {
      }:
      mkDerivation {
        pname = "not-gloss";
-       version = "0.7.3.0";
-       sha256 = "0c5i2c8z15ibdhq9czacazm8wzmngchnbw2hjyypq8vj7y8bhjs2";
+       version = "0.7.4.0";
+       sha256 = "11ikk8yia52qbaajcnwc7gq1jwwid12j8vzgn2v18j5d272lzwyc";
        buildDepends = [
          base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw
          spatial-math time vector vector-binary-instances
@@ -95434,8 +95524,8 @@ self: {
      }:
      mkDerivation {
        pname = "path";
-       version = "0.3.0";
-       sha256 = "1hxpylnbqn38biggrb18h9kva61hhpwsdsp76jbkn4kcbd3h48r4";
+       version = "0.4.0";
+       sha256 = "1576dlzrachkrxspsx4rnssmhmicja1pfd8z63g3zmz0m450dkpj";
        buildDepends = [ base exceptions filepath template-haskell ];
        testDepends = [ base hspec HUnit mtl ];
        description = "Path";
@@ -97447,6 +97537,18 @@ self: {
      }) {};
 
   "pipes-errors" = callPackage
+    ({ mkDerivation, base, errors, pipes }:
+     mkDerivation {
+       pname = "pipes-errors";
+       version = "0.2.1";
+       sha256 = "08i3rzqz7r5vkjfry0bdw3gpxjzhni8xmwwa6p8hdkixznjq7539";
+       buildDepends = [ base errors pipes ];
+       homepage = "https://github.com/jdnavarro/pipes-errors";
+       description = "Integration between pipes and errors";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "pipes-errors_0_3" = callPackage
     ({ mkDerivation, base, errors, pipes }:
      mkDerivation {
        pname = "pipes-errors";
@@ -106285,10 +106387,9 @@ self: {
     ({ mkDerivation, base, postgresql-simple, text }:
      mkDerivation {
        pname = "rivet-migration";
-       version = "0.1.0.0";
-       sha256 = "1ki6jk2shxh9r4kzpn1bsa1a7jc8vvpgigv4gg87sialr2k0f4zr";
+       version = "0.1.0.1";
+       sha256 = "1vg6ns5scq5nqyj2w070hswynji8pqfh654qa3zjda2xhna5mnbd";
        buildDepends = [ base postgresql-simple text ];
-       jailbreak = true;
        homepage = "https://github.com/dbp/rivet";
        description = "Postgresql migration support for project management tool";
        license = stdenv.lib.licenses.bsd3;
@@ -109268,7 +109369,9 @@ self: {
      mkDerivation {
        pname = "semigroupoids";
        version = "5.0.0.1";
+       revision = "1";
        sha256 = "0njand5df3ri7pr0jd12z7dfvcfw6xdm7z5ap0b4xcpy47ndcw8l";
+       editedCabalFile = "30bb2d94a228945d3d719a7004d79c218479dbdf31f1e92f730378af57fd6575";
        buildDepends = [
          base base-orphans bifunctors comonad containers contravariant
          distributive semigroups tagged transformers transformers-compat
@@ -109661,18 +109764,17 @@ self: {
      }) {};
 
   "serf" = callPackage
-    ({ mkDerivation, attoparsec, attoparsec-conduit, base, conduit, mtl
+    ({ mkDerivation, attoparsec, base, conduit, conduit-extra, mtl
      , operational, process, resourcet, text
      }:
      mkDerivation {
        pname = "serf";
-       version = "0.1.0.0";
-       sha256 = "18ddr4pkr1zld49x6k3lcbrv9916s9r1mxfsi9nfrv7lbvrjmj3v";
+       version = "0.1.1.0";
+       sha256 = "0ry0shqmazxcsjxsh6amvz2fky2fy3wwlck7d331j8csz7fwdjfn";
        buildDepends = [
-         attoparsec attoparsec-conduit base conduit mtl operational process
+         attoparsec base conduit conduit-extra mtl operational process
          resourcet text
        ];
-       jailbreak = true;
        homepage = "http://github.com/sanetracker/serf";
        description = "Interact with Serf via Haskell";
        license = stdenv.lib.licenses.mit;
@@ -110388,8 +110490,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake";
-       version = "0.15.1";
-       sha256 = "0bdx2pclcnqbkdwv8jw6v7w21hn29dp9xbvsbfrnqjvb9f6p1my9";
+       version = "0.15.2";
+       sha256 = "1vjvfmscmja4f60ag619bca9xdpqlaj3ra2yacrmh1wdi5fzcrdf";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -113103,9 +113205,9 @@ self: {
      mkDerivation {
        pname = "snaplet-fay";
        version = "0.3.3.11";
-       revision = "1";
+       revision = "2";
        sha256 = "18g61qivc49g37zmb4qv2piwlgs572fmngdpsjdhjmrgqn049fjr";
-       editedCabalFile = "754ad06e1c8e6fd26f362bdc3f83f0863e7f2e941ffcf8b753310aee2c1aad26";
+       editedCabalFile = "6b536ac4ad158ceed55ca18802caf4e970caabce93af33d95579ac431a003e9d";
        buildDepends = [
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
@@ -113662,6 +113764,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "snaplet-wordpress" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder
+     , bytestring, configurator, containers, data-default, either, hedis
+     , heist, hspec, hspec-snap, lens, map-syntax, mtl, snap, snap-core
+     , snaplet-redis, text, time, unordered-containers, vector, wreq
+     , xmlhtml
+     }:
+     mkDerivation {
+       pname = "snaplet-wordpress";
+       version = "0.1.1.1";
+       sha256 = "1l0hxv267qlih9bqa5a2mlarmy15wk5awg8pmjv7a358sm7k53kq";
+       buildDepends = [
+         aeson async attoparsec base blaze-builder bytestring configurator
+         containers data-default either hedis heist hspec hspec-snap lens
+         map-syntax mtl snap snap-core snaplet-redis text time
+         unordered-containers vector wreq xmlhtml
+       ];
+       testDepends = [
+         aeson base blaze-builder containers data-default either hedis heist
+         hspec hspec-snap lens mtl snap snaplet-redis text
+         unordered-containers xmlhtml
+       ];
+       homepage = "https://github.com/dbp/snaplet-wordpress";
+       description = "A snaplet that communicates with wordpress over its api";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "snappy" = callPackage
     ({ mkDerivation, base, bytestring, QuickCheck, snappy
      , test-framework, test-framework-quickcheck2
@@ -119528,18 +119657,18 @@ self: {
     ({ mkDerivation, array, base, containers, deepseq, directory
      , exceptions, filepath, ghc, ghc-paths, ghc-prim, liquid-fixpoint
      , liquidhaskell, mtl, pretty, process, syb, tagged, tasty
-     , tasty-hunit, template-haskell, text, text-format, transformers
-     , unordered-containers, vector
+     , tasty-hunit, template-haskell, text, text-format, th-lift
+     , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "target";
-       version = "0.1.1.0";
-       sha256 = "1b6kbiqpx57ghi98ki4gbqclyl91rs113ayd51bx8wmwwbaag21v";
+       version = "0.1.2.0";
+       sha256 = "116wig7zr4x0qza1gx92b01jb962w59y716cxj5qkf78sv9pml6s";
        buildDepends = [
          base containers directory exceptions filepath ghc ghc-paths
          liquid-fixpoint liquidhaskell mtl pretty process syb tagged
-         template-haskell text text-format transformers unordered-containers
-         vector
+         template-haskell text text-format th-lift transformers
+         unordered-containers vector
        ];
        testDepends = [
          array base containers deepseq ghc ghc-prim liquid-fixpoint
@@ -129210,15 +129339,15 @@ self: {
      }:
      mkDerivation {
        pname = "waddle";
-       version = "0.1.0.2";
-       sha256 = "00c6yd2ivrlgwp90q2p4s2ci4j4g40p0qsl29skg4jzw13rncchp";
+       version = "0.1.0.3";
+       sha256 = "1jvijw4bsg206cy8y49g1vz0y7j3p3xzq6jxz70w1gicrw5ja01c";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base binary bytestring case-insensitive containers
        ];
        jailbreak = true;
-       description = "WAD file utilities";
+       description = "DOOM WAD file utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 

From 2e01d4a2b6a52f6bd4120d51078039751274d17e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 May 2015 11:19:11 +0200
Subject: [PATCH 0062/2322] haskell-pipes-errors: fix build of latest
 (non-default) version

---
 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 628ffcfa4b7..b4393d7d4f0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -837,4 +837,7 @@ self: super: {
   servant-jquery = dontDistribute super.servant-jquery;
   language-puppet = dontDistribute super.language-puppet;
 
+  # This needs the latest version of errors to compile.
+  pipes-errors_0_3 = super.pipes-errors_0_3.override { errors = self.errors_2_0_0; };
+
 }

From f25d2e1a71c9eadf7429087ac640e650353850ff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 May 2015 11:20:53 +0200
Subject: [PATCH 0063/2322] haskell-snap: drop obsolete override

---
 pkgs/development/haskell-modules/configuration-common.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b4393d7d4f0..f7b039c6d6a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -808,11 +808,6 @@ self: super: {
   # Obsolete for GHC versions after GHC 6.10.x.
   utf8-prelude = markBroken super.utf8-prelude;
 
-  # https://github.com/snapframework/snap/issues/148
-  snap = overrideCabal super.snap (drv: {
-    patchPhase = "sed -i -e 's|attoparsec.*>=.*,|attoparsec,|' -e 's|lens.*>=.*|lens|' snap.cabal";
-  });
-
   # https://github.com/jwiegley/gitlib/issues/46
   gitlib = markBroken super.gitlib;
   gitlib-sample = dontDistribute super.gitlib-sample;

From 791e865c3edddc57f6dbadb7fe1c2695eb91e5e6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 May 2015 11:31:26 +0200
Subject: [PATCH 0064/2322] haskell-token-bucket: disable test suite to avoid
 build failure because of an apparently trivial error

---
 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 f7b039c6d6a..68302016bcf 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -835,4 +835,7 @@ self: super: {
   # This needs the latest version of errors to compile.
   pipes-errors_0_3 = super.pipes-errors_0_3.override { errors = self.errors_2_0_0; };
 
+  # https://github.com/hvr/token-bucket/issues/3
+  token-bucket = dontCheck super.token-bucket;
+
 }

From 4e3669b6eae36e7c5091881751c3ddc6fb61462a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 May 2015 12:06:28 +0200
Subject: [PATCH 0065/2322] haskell-configuration-ghc-7.10.x: update ticket URL
 for ghc-mod

---
 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 b1bd3fda7fe..178a5906e6c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -212,7 +212,7 @@ self: super: {
   pell = dontDistribute super.pell;
   quadratic-irrational = dontDistribute super.quadratic-irrational;
 
-  # https://github.com/kazu-yamamoto/ghc-mod/issues/467
+  # https://github.com/kazu-yamamoto/ghc-mod/issues/437
   ghc-mod = markBroken super.ghc-mod;
   HaRe = dontDistribute super.HaRe;
   ghc-imported-from = dontDistribute super.ghc-imported-from;

From f3b68ea7e08853a870ed8187a599e6f06ba2eef2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 May 2015 13:37:44 +0200
Subject: [PATCH 0066/2322] haskell-gitlib has been fixed upstream.

Resolves https://github.com/peti/nixpkgs/pull/6.
---
 pkgs/development/haskell-modules/configuration-common.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 68302016bcf..9959f093f93 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -808,11 +808,6 @@ self: super: {
   # Obsolete for GHC versions after GHC 6.10.x.
   utf8-prelude = markBroken super.utf8-prelude;
 
-  # https://github.com/jwiegley/gitlib/issues/46
-  gitlib = markBroken super.gitlib;
-  gitlib-sample = dontDistribute super.gitlib-sample;
-  gitlib-test = dontDistribute super.gitlib-test;
-
   # https://github.com/yaccz/saturnin/issues/3
   Saturnin = dontCheck super.Saturnin;
 

From 1da49e714dcbf641d07fcad0793119cd069d89fb Mon Sep 17 00:00:00 2001
From: Boris Sukholitko <boriss@gmail.com>
Date: Fri, 22 May 2015 17:40:18 +0300
Subject: [PATCH 0067/2322] Upgrade to selenium 2.45

Without the upgrade, firefox driver is unusable, due to:

https://code.google.com/p/selenium/issues/detail?id=8399
---
 pkgs/development/tools/selenium/server/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix
index 6a009f5af09..26435088ade 100644
--- a/pkgs/development/tools/selenium/server/default.nix
+++ b/pkgs/development/tools/selenium/server/default.nix
@@ -10,11 +10,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "selenium-server-standalone-${version}";
-  version = "2.44.0";
+  version = "2.45.0";
 
   src = fetchurl {
-    url = "http://selenium-release.storage.googleapis.com/2.44/selenium-server-standalone-2.44.0.jar";
-    sha256 = "1n53pyrxpmfh9lvr68d1l9rsiw7qr36farirpl3ivkyvnpm5iwm5";
+    url = "http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar";
+    sha256 = "0yvmmngqff3k5si1js8v87nx3whlsx7q4p78v6ybqhsbv6idywhi";
   };
 
   unpackPhase = "true";

From e32332b9b58382a14c3c1ee809d638d153b310f3 Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <couchemar@yandex.ru>
Date: Fri, 22 May 2015 19:11:27 +0300
Subject: [PATCH 0068/2322] Add python package: isort-3.9.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8d6e25e339e..672a1ce6b92 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3532,6 +3532,30 @@ let
     };
   };
 
+  natsort = buildPythonPackage rec {
+    name = "natsort-4.0.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/n/natsort/${name}.tar.gz";
+      md5 = "38cc0bb27c95bf549fe737d9f267f453";
+    };
+
+    buildInputs = with self;
+      [
+        hypothesis
+        pytestcov
+        pytestflakes
+        pytestpep8
+        covCore
+      ];
+
+    meta = with stdenv.lib; {
+      description = "Natural sorting for python";
+      homepage = https://github.com/SethMMorton/natsort;
+      license = licenses.mit;
+    };
+  };
+
   logster = buildPythonPackage {
     name = "logster-7475c53822";
     src = pkgs.fetchgit {
@@ -3658,6 +3682,46 @@ let
     };
   };
 
+  pies = buildPythonPackage rec {
+    name = "pies-2.6.5";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pies/${name}.tar.gz";
+      md5 = "caba1ce15d312bf68d65a5d2cf9ccff2";
+    };
+
+    deps = if !isPy3k then [ self.pies2overrides self.enum34 ]
+           else if isPy33 then [ self.enum34 ]
+           else [];
+
+    propagatedBuildInputs = deps;
+
+    meta = with stdenv.lib; {
+      description = "The simplest way to write one program that runs on both Python 2 and Python 3";
+      homepage = https://github.com/timothycrosley/pies;
+      license = licenses.mit;
+    };
+  };
+
+  pies2overrides = pythonPackages.buildPythonPackage rec {
+    name = "pies2overrides-2.6.5";
+    disabled = isPy3k;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pies2overrides/${name}.tar.gz";
+      md5 = "e73716454a2560341edf99d8f6fe5135";
+    };
+
+    propagatedBuildInputs = with self; [ ipaddress ];
+
+    meta = with stdenv.lib; {
+      description = "Defines override classes that should be included with pies only if running on Python2";
+      homepage = https://github.com/timothycrosley/pies;
+      license = licenses.mit;
+    };
+  };
+
+
   poppler-qt4 = buildPythonPackage rec {
     name = "poppler-qt4-${version}";
     version = "0.18.1";
@@ -6187,6 +6251,21 @@ let
     };
   };
 
+  ipaddress = buildPythonPackage rec {
+    name = "ipaddress-1.0.7";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/i/ipaddress/${name}.tar.gz";
+      md5 = "5d9ecf415cced476f7781cf5b9ef70c4";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Port of the 3.3+ ipaddress module to 2.6, 2.7, and 3.2";
+      homepage = https://github.com/phihag/ipaddress;
+      license = licenses.psfl;
+    };
+  };
+
   ipdb = buildPythonPackage rec {
     name = "ipdb-0.8";
     disabled = isPyPy;  # setupterm: could not find terminfo database
@@ -6220,6 +6299,25 @@ let
     };
   };
 
+  isort = buildPythonPackage rec {
+    name = "isort-3.9.6";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/i/isort/${name}.tar.gz";
+      md5 = "c0f4a7b16fde265f2ff4842c3e1cdd05";
+    };
+
+    buildInputs = with self; [ mock pytest ];
+
+    propagatedBuildInputs = with self; [ natsort pies ];
+
+    meta = with stdenv.lib; {
+      description = "A Python utility / library to sort Python imports";
+      homepage = https://github.com/timothycrosley/isort;
+      license = licenses.mit;
+    };
+  };
+
   jedi = buildPythonPackage (rec {
     name = "jedi-0.8.1";
 

From 4115f7794bdd40fe0f48da0412f57cb91cd8b282 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 22 May 2015 11:52:01 -0500
Subject: [PATCH 0069/2322] webkitgtk24x: update to webkitgtk-2.4.9, fix build

---
 pkgs/development/libraries/webkitgtk/2.4.nix  |   8 +-
 .../libraries/webkitgtk/bug140241.patch       |  59 ----
 .../webkitgtk-2.4-gmutexlocker.patch          | 276 ------------------
 3 files changed, 3 insertions(+), 340 deletions(-)
 delete mode 100644 pkgs/development/libraries/webkitgtk/bug140241.patch
 delete mode 100644 pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch

diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 5c868838c99..30d69a0253b 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.4.8";
+  version = "2.4.9";
 
   meta = with stdenv.lib; {
     description = "Web content rendering engine, GTK+ port";
@@ -21,11 +21,9 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "08xxqsxpa63nzgbsz63vrdxdxgpysyiy7jdcjb57k1hprdcibwb8";
+    sha256 = "0r651ar3p0f8zwl7764kyimxk5hy88cwy116pv8cl5l8hbkjkpxg";
   };
 
-  patches = [ ./webkitgtk-2.4-gmutexlocker.patch ./bug140241.patch ];
-
   CC = "cc";
 
   prePatch = ''
@@ -46,7 +44,7 @@ stdenv.mkDerivation rec {
   dontAddDisableDepTrack = true;
 
   nativeBuildInputs = [
-    autoreconfHook/*bug140241.patch*/ perl python ruby bison gperf flex
+    autoreconfHook perl python ruby bison gperf flex
     pkgconfig which gettext gobjectIntrospection
   ];
 
diff --git a/pkgs/development/libraries/webkitgtk/bug140241.patch b/pkgs/development/libraries/webkitgtk/bug140241.patch
deleted file mode 100644
index 8d8c1bae0be..00000000000
--- a/pkgs/development/libraries/webkitgtk/bug140241.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-@@ -, +, @@ 
-        REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled
-        https://bugs.webkit.org/show_bug.cgi?id=140241
-        Reviewed by NOBODY (OOPS!).
-        We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp
-        just when WebKit2 is enabled and we are not building for X11.
-        * GNUmakefile.list.am:
----
- Source/WebCore/ChangeLog           | 12 ++++++++++++
- Source/WebCore/GNUmakefile.list.am |  8 ++++++++
- 2 files changed, 20 insertions(+)
---- a/Source/WebCore/ChangeLog	
-+++ a/Source/WebCore/ChangeLog	
-@@ -1,3 +1,15 @@ 
-+2015-01-16  Tomas Popela  <tpopela@redhat.com>
-+
-+        REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled
-+        https://bugs.webkit.org/show_bug.cgi?id=140241
-+
-+        Reviewed by NOBODY (OOPS!).
-+
-+        We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp
-+        just when WebKit2 is enabled and we are not building for X11.
-+
-+        * GNUmakefile.list.am:
-+
- 2014-11-10  Csaba Osztrogonác  <ossy@webkit.org>
- 
-         Crash in WebCore::Node::getFlag
---- a/Source/WebCore/GNUmakefile.list.am	
-+++ a/Source/WebCore/GNUmakefile.list.am	
-@@ -6254,9 +6254,13 @@ endif # END USE_GLX
- endif # END TARGET_X11
- 
- if TARGET_WAYLAND
-+if !TARGET_X11
-+if ENABLE_WEBKIT2
- webcore_sources += \
- 	Source/WebCore/plugins/PluginPackageNone.cpp \
- 	Source/WebCore/plugins/PluginViewNone.cpp
-+endif # END ENABLE_WEBKIT2
-+endif # END !TARGET_X11
- endif # END TARGET_WAYLAND
- 
- if TARGET_X11_OR_WAYLAND
-@@ -6305,9 +6309,13 @@ webcoregtk_sources += \
- endif # END TARGET_WIN32
- 
- if TARGET_QUARTZ
-+if !TARGET_X11
-+if ENABLE_WEBKIT2
- webcore_sources += \
- 	Source/WebCore/plugins/PluginPackageNone.cpp \
- 	Source/WebCore/plugins/PluginViewNone.cpp
-+endif # END ENABLE_WEBKIT2
-+endif # END !TARGET_X11
- platformgtk_sources += \
- 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
- 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
diff --git a/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch b/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch
deleted file mode 100644
index 1acfb87bfbc..00000000000
--- a/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch
+++ /dev/null
@@ -1,276 +0,0 @@
---- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.orig	2015-04-13 18:39:20.763864030 +0200
-+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp	2015-04-13 18:43:29.756164227 +0200
-@@ -118,7 +118,7 @@
-     WebKitVideoSink* sink = reinterpret_cast<WebKitVideoSink*>(data);
-     WebKitVideoSinkPrivate* priv = sink->priv;
- 
--    GMutexLocker lock(priv->bufferMutex);
-+    WebCore::GMutexLocker lock(priv->bufferMutex);
-     GstBuffer* buffer = priv->buffer;
-     priv->buffer = 0;
-     priv->timeoutId = 0;
-@@ -140,7 +140,7 @@
-     WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
-     WebKitVideoSinkPrivate* priv = sink->priv;
- 
--    GMutexLocker lock(priv->bufferMutex);
-+    WebCore::GMutexLocker lock(priv->bufferMutex);
- 
-     if (priv->unlocked)
-         return GST_FLOW_OK;
-@@ -279,7 +279,7 @@
- 
- static void unlockBufferMutex(WebKitVideoSinkPrivate* priv)
- {
--    GMutexLocker lock(priv->bufferMutex);
-+    WebCore::GMutexLocker lock(priv->bufferMutex);
- 
-     if (priv->buffer) {
-         gst_buffer_unref(priv->buffer);
-@@ -305,7 +305,7 @@
-     WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
- 
-     {
--        GMutexLocker lock(priv->bufferMutex);
-+        WebCore::GMutexLocker lock(priv->bufferMutex);
-         priv->unlocked = false;
-     }
- 
-@@ -330,7 +330,7 @@
- {
-     WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
- 
--    GMutexLocker lock(priv->bufferMutex);
-+    WebCore::GMutexLocker lock(priv->bufferMutex);
-     priv->unlocked = false;
-     return TRUE;
- }
---- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig	2015-04-13 18:36:44.258046776 +0200
-+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp	2015-04-13 18:44:10.004374397 +0200
-@@ -316,7 +316,7 @@
- #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
- PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
- {
--    GMutexLocker lock(m_bufferMutex);
-+    WebCore::GMutexLocker lock(m_bufferMutex);
-     if (!m_buffer)
-         return nullptr;
- 
-@@ -366,7 +366,7 @@
-     g_return_if_fail(GST_IS_BUFFER(buffer));
- 
-     {
--        GMutexLocker lock(m_bufferMutex);
-+        WebCore::GMutexLocker lock(m_bufferMutex);
-         gst_buffer_replace(&m_buffer, buffer);
-     }
- 
-@@ -398,7 +398,7 @@
-     if (!m_player->visible())
-         return;
- 
--    GMutexLocker lock(m_bufferMutex);
-+    WebCore::GMutexLocker lock(m_bufferMutex);
-     if (!m_buffer)
-         return;
- 
---- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig	2015-04-13 18:37:20.083233858 +0200
-+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp	2015-04-13 18:44:37.753519299 +0200
-@@ -346,7 +346,7 @@
- 
-     switch (propID) {
-     case PROP_IRADIO_MODE: {
--        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-         priv->iradioMode = g_value_get_boolean(value);
-         break;
-     }
-@@ -364,7 +364,7 @@
-     WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
-     WebKitWebSrcPrivate* priv = src->priv;
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     switch (propID) {
-     case PROP_IRADIO_MODE:
-         g_value_set_boolean(value, priv->iradioMode);
-@@ -417,7 +417,7 @@
- 
-     ASSERT(isMainThread());
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- 
-     bool seeking = priv->seekID;
- 
-@@ -476,7 +476,7 @@
- 
-     ASSERT(isMainThread());
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- 
-     priv->startID = 0;
-     priv->corsAccessCheck = CORSNoCheck;
-@@ -573,7 +573,7 @@
-         return ret;
-     }
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     switch (transition) {
-     case GST_STATE_CHANGE_READY_TO_PAUSED:
-         GST_DEBUG_OBJECT(src, "READY->PAUSED");
-@@ -604,7 +604,7 @@
-         gst_query_parse_duration(query, &format, NULL);
- 
-         GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
--        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-         if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
-             gst_query_set_duration(query, format, src->priv->size);
-             result = TRUE;
-@@ -612,7 +612,7 @@
-         break;
-     }
-     case GST_QUERY_URI: {
--        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-         gst_query_set_uri(query, src->priv->uri);
-         result = TRUE;
-         break;
-@@ -653,7 +653,7 @@
-     WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
-     gchar* ret;
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     ret = g_strdup(src->priv->uri);
-     return ret;
- }
-@@ -668,7 +668,7 @@
-         return FALSE;
-     }
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- 
-     g_free(priv->uri);
-     priv->uri = 0;
-@@ -704,7 +704,7 @@
- 
-     ASSERT(isMainThread());
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     // already stopped
-     if (!priv->needDataID)
-         return FALSE;
-@@ -725,7 +725,7 @@
- 
-     GST_DEBUG_OBJECT(src, "Need more data: %u", length);
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     if (priv->needDataID || !priv->paused) {
-         return;
-     }
-@@ -739,7 +739,7 @@
- 
-     ASSERT(isMainThread());
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     // already stopped
-     if (!priv->enoughDataID)
-         return FALSE;
-@@ -760,7 +760,7 @@
- 
-     GST_DEBUG_OBJECT(src, "Have enough data");
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     if (priv->enoughDataID || priv->paused) {
-         return;
-     }
-@@ -774,7 +774,7 @@
- 
-     ASSERT(isMainThread());
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     // already stopped
-     if (!priv->seekID)
-         return FALSE;
-@@ -792,7 +792,7 @@
-     WebKitWebSrcPrivate* priv = src->priv;
- 
-     GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     if (offset == priv->offset && priv->requestedOffset == priv->offset)
-         return TRUE;
- 
-@@ -811,7 +811,7 @@
- void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
- {
-     ASSERT(player);
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     src->priv->player = player;
- }
- 
-@@ -841,7 +841,7 @@
- 
-     mapGstBuffer(buffer);
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     priv->buffer = adoptGRef(buffer);
-     locker.unlock();
- 
-@@ -867,7 +867,7 @@
-         return;
-     }
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- 
-     priv->corsAccessCheck = corsAccessCheck;
- 
-@@ -966,7 +966,7 @@
-     WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src);
-     WebKitWebSrcPrivate* priv = src->priv;
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- 
-     GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast<long long>(gst_buffer_get_size(priv->buffer.get())) : length);
- 
-@@ -1035,7 +1035,7 @@
- 
-     GST_DEBUG_OBJECT(src, "Have EOS");
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     if (!priv->seekID) {
-         locker.unlock();
-         gst_app_src_end_of_stream(priv->appsrc);
-@@ -1194,7 +1194,7 @@
- 
-     GST_ERROR_OBJECT(src, "Request was blocked");
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     uri.reset(g_strdup(src->priv->uri));
-     locker.unlock();
- 
-@@ -1208,7 +1208,7 @@
- 
-     GST_ERROR_OBJECT(src, "Cannot show URL");
- 
--    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-     uri.reset(g_strdup(src->priv->uri));
-     locker.unlock();
- 

From ae0e3c8974f8ab0710ad81dad005d3127ac91eca Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Mon, 11 May 2015 18:57:05 -0500
Subject: [PATCH 0070/2322] add ericbmerritt to the maintainers list

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 875d66e04bd..5eb913caff9 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -71,6 +71,7 @@
   eikek = "Eike Kettner <eike.kettner@posteo.de>";
   ellis = "Ellis Whitehead <nixos@ellisw.net>";
   emery = "Emery Hemingway <emery@vfemail.net>";
+  ericbmerritt = "Eric Merritt <eric@afiniate.com>";
   ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
   exlevan = "Alexey Levan <exlevan@gmail.com>";
   falsifian = "James Cook <james.cook@utoronto.ca>";

From d814c50505c0583bc2b80e6af2f62fe02cb24971 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Thu, 21 May 2015 11:03:57 -0500
Subject: [PATCH 0071/2322] add an ocaml specific builder to the system

---
 pkgs/build-support/ocaml/default.nix | 36 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/build-support/ocaml/default.nix

diff --git a/pkgs/build-support/ocaml/default.nix b/pkgs/build-support/ocaml/default.nix
new file mode 100644
index 00000000000..87bfa6cea12
--- /dev/null
+++ b/pkgs/build-support/ocaml/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, writeText, ocaml, findlib, camlp4 }:
+
+{ name, version, buildInputs ? [],
+  createFindlibDestdir ?  true,
+  dontStrip ? true,
+  minimumSupportedOcamlVersion ? null,
+  hasSharedObjects ? false,
+  setupHook ? null,
+  meta ? {}, ...
+}@args:
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  defaultMeta = {
+    platforms = ocaml.meta.platforms;
+  };
+in
+  assert minimumSupportedOcamlVersion != null ->
+          stdenv.lib.versionOlder minimumSupportedOcamlVersion ocaml_version;
+
+stdenv.mkDerivation (args // {
+  name = "ocaml-${name}-${version}";
+
+  buildInputs = [ ocaml findlib camlp4 ] ++ buildInputs;
+
+  setupHook = if setupHook == null && hasSharedObjects
+  then writeText "setupHook.sh" ''
+    export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml_version}/site-lib/${name}/"
+    ''
+  else setupHook;
+
+  inherit ocaml_version;
+  inherit createFindlibDestdir;
+  inherit dontStrip;
+
+  meta = defaultMeta // meta;
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40a77f8a623..438629e93cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4039,6 +4039,7 @@ let
       ocaml_version = (builtins.parseDrvName ocaml.name).version;
     in rec {
     inherit ocaml;
+    buildOcaml = callPackage ../build-support/ocaml { };
 
     acgtk = callPackage ../applications/science/logic/acgtk { };
 

From 06f3c4dba547835cc18228fc84814c9f53a96748 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 May 2015 20:41:59 +0200
Subject: [PATCH 0072/2322] daq: update to version 2.0.5

Fixes https://github.com/NixOS/nixpkgs/issues/7947.
---
 pkgs/applications/networking/ids/daq/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix
index 287a4239c2c..81a94ec540d 100644
--- a/pkgs/applications/networking/ids/daq/default.nix
+++ b/pkgs/applications/networking/ids/daq/default.nix
@@ -1,16 +1,16 @@
 {stdenv, fetchurl, flex, bison, libpcap}:
 
 stdenv.mkDerivation rec {
-  name = "daq-2.0.4";
-  
+  name = "daq-2.0.5";
+
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "http://www.snort.org/downloads/snort/${name}.tar.gz";
-    sha256 = "0g15kny0s6mpqfc723jxv7mgjfh45izhwcidhjzh52fd04ysm552";
+    sha256 = "0vdwb0r9kdlgj4g0i0swafbc7qik0zmks17mhqji8cl7hpdva13p";
   };
-  
+
   buildInputs = [ flex bison libpcap ];
-  
+
   meta = {
     description = "Data AcQuisition library (DAQ), for packet I/O";
     homepage = http://www.snort.org;

From 177cbf7348ad74603c0dfc13503e4c02f5aaefdc Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Fri, 22 May 2015 21:46:26 +0200
Subject: [PATCH 0073/2322] fasd: remove pandoc dep (==haskell), update
 revision

---
 pkgs/tools/misc/fasd/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix
index f34ce44633f..aa1fa8f3c6c 100644
--- a/pkgs/tools/misc/fasd/default.nix
+++ b/pkgs/tools/misc/fasd/default.nix
@@ -1,21 +1,18 @@
-{ stdenv, fetchgit, pandoc } :
+{ stdenv, fetchgit } :
 
 let
-  rev = "287af2b80e0829b08dc6329b4fe8d8e5594d64b0";
+  rev = "61ce53be996189e1c325916e45a7dc0aa89660e3";
 in
 stdenv.mkDerivation {
 
-  name = "fasd-1.0.1";
+  name = "fasd-git-2015-03-29";
 
   src = fetchgit {
     url = "https://github.com/clvv/fasd.git";
     inherit rev;
-    sha256 = "0kv9iyfdf916x0gab9fzs4vmsnkaqmb6kh4xna485nqij89xzkgs";
+    sha256 = "1fd36ff065ae73de2d6b1bae2131c18c8c4dea98ca63d96b0396e8b291072b5e";
   };
 
-  # seems to be needed non-deterministically (timestamps?)
-  nativeBuildInputs = [ pandoc ];
-
   installPhase = ''
     PREFIX=$out make install
   '';

From 25a148fa196b944b3f134527da87e43d88c066f9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 22 May 2015 12:59:21 -0700
Subject: [PATCH 0074/2322] Refactor mkFlag / shouldUsePkg into the nixpkgs
 libraries

---
 lib/customisation.nix                         | 23 +++++
 .../virtualization/qemu/default.nix           | 93 +++++++++----------
 .../libraries/kerberos/heimdal.nix            | 13 +--
 .../libraries/libgcrypt/default.nix           | 15 +--
 .../libraries/libmicrohttpd/default.nix       | 10 +-
 pkgs/development/libraries/libssh/default.nix |  3 +-
 .../development/libraries/libssh2/default.nix | 10 +-
 .../development/libraries/libxml2/default.nix | 11 +--
 .../development/libraries/ncurses/default.nix | 18 +---
 .../development/libraries/nghttp2/default.nix | 15 +--
 .../libraries/wiredtiger/default.nix          | 12 +--
 pkgs/misc/jackaudio/default.nix               |  3 +-
 pkgs/misc/jackaudio/jack1.nix                 |  3 +-
 pkgs/os-specific/linux/ffado/default.nix      |  4 +-
 pkgs/servers/pulseaudio/default.nix           | 21 ++---
 pkgs/servers/shishi/default.nix               | 10 +-
 pkgs/stdenv/generic/default.nix               |  2 +
 pkgs/tools/networking/curl/default.nix        | 14 +--
 18 files changed, 104 insertions(+), 176 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 91a25055df2..ca3dd4980da 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -158,4 +158,27 @@ rec {
       drv' = (lib.head outputsList).value;
     in lib.deepSeq drv' drv';
 
+
+  /* Tests whether a derivation can be used by the current platform
+     Returns the derivation if true, otherwise null. */
+  shouldUsePkgSystem = system: pkg_: let pkg = (builtins.tryEval pkg_).value;
+    in if lib.any (x: x == system) (pkg.meta.platforms or [])
+      then pkg
+      else null;
+
+  /* Returns a configure flag string in an autotools format
+     trueStr: Prepended when cond is true
+     falseStr: Prepended when cond is false
+     cond: The condition for the prepended string type and value
+     name: The flag name
+     val: The value of the flag only set when cond is true */
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}"
+      + "${if val != null && cond != false then "=${val}" else ""}";
+
+  /* Flag setting helpers for autotools like packages */
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
 }
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 5b23e36af83..bf722431d91 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -27,65 +27,60 @@
 , type ? ""
 }:
 
+with stdenv;
 with stdenv.lib;
 let
   n = "qemu-2.3.0";
 
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
+  isKvmOnly = type == "kvm-only";
+  isNix = type == "nix";
 
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
-  optSDL2 = if type == "nix" then null else shouldUsePkg SDL2;
-  optGtk = if type == "nix" then null else shouldUsePkg gtk;
-  optLibcap = if type == "nix" then null else shouldUsePkg libcap;
-  optAttr = if type == "nix" then null else shouldUsePkg attr;
-  optGnutls = if type == "nix" then null else shouldUsePkg gnutls;
-  optCyrus_sasl = if type == "nix" then null else shouldUsePkg cyrus_sasl;
-  optLibjpeg = if type == "nix" then null else shouldUsePkg libjpeg;
-  optLibpng = if type == "nix" then null else shouldUsePkg libpng;
-  optNcurses = if type == "nix" then null else shouldUsePkg ncurses;
-  optCurl = if type == "nix" then null else shouldUsePkg curl;
-  optBluez = if type == "nix" then null else shouldUsePkg bluez;
-  optLibibverbs = if type == "nix" then null else shouldUsePkg libibverbs;
-  optLibrdmacm = if type == "nix" then null else shouldUsePkg librdmacm;
-  optLibuuid = if type == "nix" then null else shouldUsePkg libuuid;
-  optVde2 = if type == "nix" then null else shouldUsePkg vde2;
+  optSDL2 = if isNix then null else shouldUsePkg SDL2;
+  optGtk = if isNix then null else shouldUsePkg gtk;
+  optLibcap = if isNix then null else shouldUsePkg libcap;
+  optAttr = if isNix then null else shouldUsePkg attr;
+  optGnutls = if isNix then null else shouldUsePkg gnutls;
+  optCyrus_sasl = if isNix then null else shouldUsePkg cyrus_sasl;
+  optLibjpeg = if isNix then null else shouldUsePkg libjpeg;
+  optLibpng = if isNix then null else shouldUsePkg libpng;
+  optNcurses = if isNix then null else shouldUsePkg ncurses;
+  optCurl = if isNix then null else shouldUsePkg curl;
+  optBluez = if isNix then null else shouldUsePkg bluez;
+  optLibibverbs = if isNix then null else shouldUsePkg libibverbs;
+  optLibrdmacm = if isNix then null else shouldUsePkg librdmacm;
+  optLibuuid = if isNix then null else shouldUsePkg libuuid;
+  optVde2 = if isNix then null else shouldUsePkg vde2;
   optLibaio = shouldUsePkg libaio;
   optLibcap_ng = shouldUsePkg libcap_ng;
-  optSpice = if type == "nix" then null else shouldUsePkg spice;
-  optSpice_protocol = if type == "nix" then null else shouldUsePkg spice_protocol;
-  optLibceph = if type == "nix" then null else shouldUsePkg libceph;
-  optLibxfs = if type == "nix" then null else shouldUsePkg libxfs;
-  optNss = if type == "nix" then null else shouldUsePkg nss;
-  optNspr = if type == "nix" then null else shouldUsePkg nspr;
-  optLibusb = if type == "nix" then null else shouldUsePkg libusb;
-  optUsbredir = if type == "nix" then null else shouldUsePkg usbredir;
-  optMesa = if type == "nix" then null else shouldUsePkg mesa;
-  optLzo = if type == "nix" then null else shouldUsePkg lzo;
-  optSnappy = if type == "nix" then null else shouldUsePkg snappy;
-  optBzip2 = if type == "nix" then null else shouldUsePkg bzip2;
-  optLibseccomp = if type == "nix" then null else shouldUsePkg libseccomp;
-  optGlusterfs = if type == "nix" then null else shouldUsePkg glusterfs;
-  optLibssh2 = if type == "nix" then null else shouldUsePkg libssh2;
-  optNumactl = if type == "nix" then null else shouldUsePkg numactl;
+  optSpice = if isNix then null else shouldUsePkg spice;
+  optSpice_protocol = if isNix then null else shouldUsePkg spice_protocol;
+  optLibceph = if isNix then null else shouldUsePkg libceph;
+  optLibxfs = if isNix then null else shouldUsePkg libxfs;
+  optNss = if isNix then null else shouldUsePkg nss;
+  optNspr = if isNix then null else shouldUsePkg nspr;
+  optLibusb = if isNix then null else shouldUsePkg libusb;
+  optUsbredir = if isNix then null else shouldUsePkg usbredir;
+  optMesa = if isNix then null else shouldUsePkg mesa;
+  optLzo = if isNix then null else shouldUsePkg lzo;
+  optSnappy = if isNix then null else shouldUsePkg snappy;
+  optBzip2 = if isNix then null else shouldUsePkg bzip2;
+  optLibseccomp = if isNix then null else shouldUsePkg libseccomp;
+  optGlusterfs = if isNix then null else shouldUsePkg glusterfs;
+  optLibssh2 = if isNix then null else shouldUsePkg libssh2;
+  optNumactl = if isNix then null else shouldUsePkg numactl;
 
   hasSDLAbi = if optSDL2 != null then true else null;
 
   hasVirtfs = stdenv.isLinux && optLibcap != null && optAttr != null;
 
-  hasVnc = type != "nix";
+  hasVnc = !isNix;
   hasVncTls = hasVnc && optGnutls != null;
   hasVncSasl = hasVnc && optCyrus_sasl != null;
   hasVncJpeg = hasVnc && optLibjpeg != null;
   hasVncPng = hasVnc && optLibpng != null;
   hasVncWs = hasVnc && optGnutls != null;
 
-  hasFdt = type != "nix";
+  hasFdt = !isNix;
 
   hasRdma = optLibibverbs != null && optLibrdmacm != null;
 
@@ -95,8 +90,8 @@ let
 
   hasNss = optNss != null && optNspr != null;
 
-  optLibpulseaudio = if type == "nix" then null else shouldUsePkg libpulseaudio;
-  optAlsaLib = if type == "nix" then null else shouldUsePkg alsaLib;
+  optLibpulseaudio = if isNix then null else shouldUsePkg libpulseaudio;
+  optAlsaLib = if isNix then null else shouldUsePkg alsaLib;
   audio = concatStringsSep "," (
        optional (optSDL2 != null) "sdl"
     ++ optional (optLibpulseaudio != null) "pa"
@@ -179,9 +174,9 @@ stdenv.mkDerivation rec {
     (mkEnable (optBluez != null)      "bluez"               null)
     (mkEnable stdenv.isLinux          "kvm"                 null)
     (mkEnable hasRdma                 "rdma"                null)
-    (mkEnable (type != "nix")         "system"              null)
-    (mkEnable (type != "kvm-only")    "user"                null)
-    (mkEnable (type != "kvm-only")    "guest-base"          null)
+    (mkEnable (!isNix)                "system"              null)
+    (mkEnable (!isKvmOnly)            "user"                null)
+    (mkEnable (!isKvmOnly)            "guest-base"          null)
     (mkEnable true                    "pie"                 null)
     (mkEnable (optLibuuid != null)    "uuid"                null)
     (mkEnable (optVde2 != null)       "vde"                 null)
@@ -189,7 +184,7 @@ stdenv.mkDerivation rec {
     (mkEnable hasLinuxAio             "linux-aio"           null)
     (mkEnable (optLibcap_ng != null)  "cap-ng"              null)
     (mkEnable (optAttr != null)       "attr"                null)
-    (mkEnable (type != "nix")         "docs"                null)
+    (mkEnable (!isNix)                "docs"                null)
     (mkEnable stdenv.isLinux          "vhost-net"           null)
     (mkEnable hasSpice                "spice"               null)
     (mkEnable (optLibceph != null)    "rbd"                 null)
@@ -212,7 +207,7 @@ stdenv.mkDerivation rec {
     (mkEnable (optLibuuid != null)    "vhdx"                null)
     (mkEnable (optGnutls != null)     "quorum"              null)
     (mkEnable (optNumactl != null)    "numa"                null)
-  ] ++ optionals (type == "kvm-only") [
+  ] ++ optionals isKvmOnly [
     (mkOther                          "target-list"         targetList)
   ];
 
@@ -235,6 +230,6 @@ stdenv.mkDerivation rec {
     description = "A generic and open source machine emulator and virtualizer";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ viric shlevy eelco wkennington ];
-    platforms = if type == "kvm-only" then platforms.linux else platforms.all;
+    platforms = if isKvmOnly then platforms.linux else platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index b0de8c15146..6050891ba27 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -8,16 +8,9 @@
 #, sqlite, db, ncurses, openssl, cyrus_sasl
 }:
 
+with stdenv;
+with stdenv.lib;
 let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
   optOpenldap = shouldUsePkg openldap;
   optLibcap_ng = shouldUsePkg libcap_ng;
   optSqlite = shouldUsePkg sqlite;
@@ -97,7 +90,7 @@ stdenv.mkDerivation rec {
     rmdir $out/libexec
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "an implementation of Kerberos 5 (and some more stuff) largely written in Sweden";
     license = licenses.bsd3;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 7d327a499bc..702d54392a6 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -5,16 +5,9 @@
 , libcap ? null, pth ? null
 }:
 
+with stdenv;
+with stdenv.lib;
 let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
   optLibcap = shouldUsePkg libcap;
   #optPth = shouldUsePkg pth;
   optPth = null; # Broken as of 1.6.3
@@ -38,13 +31,13 @@ stdenv.mkDerivation rec {
   # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
   postInstall = ''
     sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin && optLibcap != null) ''
+  '' + optionalString (!stdenv.isDarwin && optLibcap != null) ''
     sed -i 's,\(-lcap\),-L${optLibcap}/lib \1,' $out/lib/libgcrypt.la
   '';
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = https://www.gnu.org/software/libgcrypt/;
     description = "General-pupose cryptographic library";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 9eca6bd84b9..c7892716c9d 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -5,16 +5,8 @@
 , openssl ? null, zlib ? null, libgcrypt ? null, gnutls ? null
 }:
 
+with stdenv;
 let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
   optOpenssl = shouldUsePkg openssl;
   optZlib = shouldUsePkg zlib;
   hasSpdy = optOpenssl != null && optZlib != null;
diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index e5d01f213cb..83efa5e65c9 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -7,9 +7,8 @@
 , openssl ? null, libgcrypt ? null
 }:
 
+with stdenv;
 let
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
   # Prefer openssl
   cryptoStr = if shouldUsePkg openssl != null then "openssl"
     else if shouldUsePkg libgcrypt != null then "libgcrypt"
diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index 3434fde1a62..a8e8777f06c 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -7,16 +7,8 @@
 , openssl ? null, libgcrypt ? null
 }:
 
+with stdenv;
 let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
   # Prefer openssl
   cryptoStr = if shouldUsePkg openssl != null then "openssl"
     else if shouldUsePkg libgcrypt != null then "libgcrypt"
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 0d70a6502fe..77050a1d3b3 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -6,16 +6,8 @@
 
 #TODO: share most stuff between python and non-python builds, perhaps via multiple-output
 
+with stdenv;
 let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
   optIcu = shouldUsePkg icu;
   optPython = shouldUsePkg python;
   optReadline = shouldUsePkg readline;
@@ -25,6 +17,7 @@ let
   sitePackages = if optPython == null then null else
     "\${out}/lib/${python.libPrefix}/site-packages";
 in
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libxml2-${version}";
   version = "2.9.2";
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index fd545e53625..43fca875f58 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -8,23 +8,11 @@
 , unicode ? true
 }:
 
+with stdenv.lib;
 let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg_: let
-    pkg = (builtins.tryEval pkg_).value;
-  in if stdenv.lib.any (x: x == stdenv.system) (pkg.meta.platforms or [])
-    then pkg
-    else null;
-
   buildShared = !stdenv.isDarwin;
 
-  optGpm = shouldUsePkg gpm;
+  optGpm = stdenv.shouldUsePkg gpm;
 in
 stdenv.mkDerivation rec {
   name = "ncurses-5.9";
@@ -119,7 +107,7 @@ stdenv.mkDerivation rec {
     echo "INPUT(-lncurses)" > $out/lib/libcurses.so
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Free software emulation of curses in SVR4 and more";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index bc8c599a901..d8fd36ecba6 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -8,16 +8,9 @@
 , prefix ? ""
 }:
 
+with stdenv;
+with stdenv.lib;
 let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
   isLib = prefix == "lib";
 
   optOpenssl = if isLib then null else shouldUsePkg openssl;
@@ -50,7 +43,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ optJansson optBoost optLibxml2 optJemalloc ]
-    ++ stdenv.lib.optionals hasApp [ optOpenssl optLibev optZlib ];
+    ++ optionals hasApp [ optOpenssl optLibev optZlib ];
 
   configureFlags = [
     (mkEnable false                 "werror"          null)
@@ -68,7 +61,7 @@ stdenv.mkDerivation rec {
     (mkWith   false                 "cython"          null)
   ];
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = http://nghttp2.org/;
     description = "an implementation of HTTP/2 in C";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index da4dc9d6bbc..514dcd5972a 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -5,17 +5,8 @@
 , gperftools ? null, leveldb ? null
 }:
 
-with stdenv.lib;
+with stdenv;
 let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg: if pkg != null && any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
   optLz4 = shouldUsePkg lz4;
   optSnappy = shouldUsePkg snappy;
   optZlib = shouldUsePkg zlib;
@@ -24,6 +15,7 @@ let
   optGperftools = shouldUsePkg gperftools;
   optLeveldb = shouldUsePkg leveldb;
 in
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "wiredtiger-${version}";
   version = "2.6.0";
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 47511cf58b0..adddd3ac211 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -9,10 +9,9 @@
 , prefix ? ""
 }:
 
+with stdenv;
 with stdenv.lib;
 let
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
   libOnly = prefix == "lib";
 
   optDbus = shouldUsePkg dbus;
diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix
index 1c5c78548f5..343c3af9cee 100644
--- a/pkgs/misc/jackaudio/jack1.nix
+++ b/pkgs/misc/jackaudio/jack1.nix
@@ -4,9 +4,8 @@
 , alsaLib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null
 }:
 
+with stdenv;
 let
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
   optAlsaLib = shouldUsePkg alsaLib;
   optDb = shouldUsePkg db;
   optLibuuid = shouldUsePkg libuuid;
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index b0f545b2171..49a7d820a1c 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -9,10 +9,8 @@
 , prefix ? ""
 }:
 
+with stdenv;
 let
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
   libOnly = prefix == "lib";
 
   optLibjack2 = shouldUsePkg libjack2;
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 8dee9a801e3..784b5a2ce94 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -15,16 +15,8 @@
 , prefix ? ""
 }:
 
+with stdenv;
 let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
   libOnly = prefix == "lib";
 
   hasXlibs = xlibs != null;
@@ -66,6 +58,7 @@ let
     simple = null;
   }.${databaseName};
 in
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "${prefix}pulseaudio-${version}";
   version = "6.0";
@@ -84,9 +77,9 @@ stdenv.mkDerivation rec {
     optLibcap valgrind optOss optCoreaudio optAlsaLib optEsound optGlib
     optGtk3 optGconf optAvahi optLibjack2 optLibasyncns optLirc optDbus optUdev
     optOpenssl optFftw optSpeexdsp optSystemd optWebrtc-audio-processing
-  ] ++ stdenv.lib.optionals hasXlibs (with xlibs; [
+  ] ++ optionals hasXlibs (with xlibs; [
       libX11 libxcb libICE libSM libXtst xextproto libXi
-    ]) ++ stdenv.lib.optionals (optBluez5 != null) [ optBluez5 optSbc ];
+    ]) ++ optionals (optBluez5 != null) [ optBluez5 optSbc ];
 
   preConfigure = ''
     # Performs and autoreconf
@@ -162,7 +155,7 @@ stdenv.mkDerivation rec {
   # the alternative is to copy the files from /usr/include to src, but there are
   # probably a large number of files that would need to be copied (I stopped
   # after the seventh)
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
+  NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin
     "-I/usr/include";
 
   installFlags = [
@@ -170,11 +163,11 @@ stdenv.mkDerivation rec {
     "pulseconfdir=$(out)/etc/pulse"
   ];
 
-  postInstall = stdenv.lib.optionalString libOnly ''
+  postInstall = optionalString libOnly ''
     rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}}
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Sound server for POSIX and Win32 systems";
     homepage    = http://www.pulseaudio.org/;
     # Note: Practically, the server is under the GPL due to the
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index a97e6847a45..bc4e57ba116 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -5,16 +5,8 @@
 , pam ? null, libidn ? null, gnutls ? null
 }:
 
+with stdenv;
 let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
   optPam = shouldUsePkg pam;
   optLibidn = shouldUsePkg libidn;
   optGnutls = shouldUsePkg gnutls;
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 7efd2ead2f8..440e9e6b4d0 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -229,6 +229,8 @@ let
            || system == "armv7l-linux";
       isBigEndian = system == "powerpc-linux";
 
+      shouldUsePkg = lib.shouldUsePkgSystem system;
+
       # Whether we should run paxctl to pax-mark binaries.
       needsPax = isLinux;
 
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index ad2c9ec6897..8a101e9845a 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -8,19 +8,12 @@
 , suffix ? ""
 }:
 
+with stdenv;
+with stdenv.lib;
 let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
   isLight = suffix == "light";
   isFull = suffix == "full";
-  nameSuffix = stdenv.lib.optionalString (suffix != "") "-${suffix}";
+  nameSuffix = optionalString (suffix != "") "-${suffix}";
 
   # Normal Depedencies
   optZlib = if isLight then null else shouldUsePkg zlib;
@@ -35,7 +28,6 @@ let
   optOpenldap = if !isFull then null else shouldUsePkg openldap;
   optLibidn = if !isFull then null else shouldUsePkg libidn;
 in
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "curl${nameSuffix}-${version}";
   version = "7.42.1";

From 3117e0c897522ec8431572de12449f676cc8c8be Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 22 May 2015 13:33:08 -0700
Subject: [PATCH 0075/2322] Refactor mkFlag out of old packages

---
 .../graphics/ImageMagick/default.nix          |  68 +++++----
 pkgs/development/libraries/lame/default.nix   |  25 ++--
 pkgs/development/libraries/libass/default.nix |  14 +-
 .../libraries/libinput/default.nix            |  10 +-
 .../development/libraries/libwebp/default.nix |  30 ++--
 pkgs/development/libraries/stxxl/default.nix  |   6 +-
 .../development/libraries/wayland/default.nix |   6 +-
 pkgs/servers/mpd/default.nix                  |  64 ++++-----
 pkgs/servers/samba/4.x.nix                    |  12 +-
 pkgs/tools/filesystems/ceph/generic.nix       |   7 -
 pkgs/tools/security/pinentry/default.nix      |  15 +-
 pkgs/tools/system/rsyslog/default.nix         | 131 +++++++++---------
 12 files changed, 173 insertions(+), 215 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 7ae24b38c01..011e75fbc1c 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -17,10 +17,6 @@ let
     else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64"
     else throw "ImageMagick is not supported on this platform.";
 
-  mkFlag = trueStr: falseStr: cond: val: "--${if cond then trueStr else falseStr}-${val}";
-  mkWith = mkFlag "with" "without";
-  mkEnable = mkFlag "enable" "disable";
-
   hasX11 = libX11 != null && libXext != null && libXt != null;
 
 in
@@ -37,38 +33,38 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   configureFlags = [
-    (mkEnable (libcl != null)        "opencl")
-    (mkWith   true                   "modules")
-    (mkWith   true                   "gcc-arch=${arch}")
-    #(mkEnable true                   "hdri") This breaks some dependencies
-    (mkWith   (perl != null)         "perl")
-    (mkWith   (jemalloc != null)     "jemalloc")
-    (mkWith   true                   "frozenpaths")
-    (mkWith   (bzip2 != null)        "bzlib")
-    (mkWith   hasX11                 "x")
-    (mkWith   (zlib != null)         "zlib")
-    (mkWith   false                  "dps")
-    (mkWith   (fftw != null)         "fftw")
-    (mkWith   (libfpx != null)       "fpx")
-    (mkWith   (djvulibre != null)    "djvu")
-    (mkWith   (fontconfig != null)   "fontconfig")
-    (mkWith   (freetype != null)     "freetype")
-    (mkWith   (ghostscript != null)  "gslib")
-    (mkWith   (graphviz != null)     "gvc")
-    (mkWith   (jbigkit != null)      "jbig")
-    (mkWith   (libjpeg != null)      "jpeg")
-    (mkWith   (lcms2 != null)        "lcms2")
-    (mkWith   false                  "lcms")
-    (mkWith   (openjpeg != null)     "openjp2")
-    (mkWith   (liblqr1 != null)      "lqr")
-    (mkWith   (xz != null)           "lzma")
-    (mkWith   (openexr != null)      "openexr")
-    (mkWith   (pango != null)        "pango")
-    (mkWith   (libpng != null)       "png")
-    (mkWith   (librsvg != null)      "rsvg")
-    (mkWith   (libtiff != null)      "tiff")
-    (mkWith   (libwebp != null)      "webp")
-    (mkWith   (libxml2 != null)      "xml")
+    (mkEnable (libcl != null)        "opencl"      null)
+    (mkWith   true                   "modules"     null)
+    (mkWith   true                   "gcc-arch"    arch)
+    #(mkEnable true                   "hdri"        null) This breaks some dependencies
+    (mkWith   (perl != null)         "perl"        null)
+    (mkWith   (jemalloc != null)     "jemalloc"    null)
+    (mkWith   true                   "frozenpaths" null)
+    (mkWith   (bzip2 != null)        "bzlib"       null)
+    (mkWith   hasX11                 "x"           null)
+    (mkWith   (zlib != null)         "zlib"        null)
+    (mkWith   false                  "dps"         null)
+    (mkWith   (fftw != null)         "fftw"        null)
+    (mkWith   (libfpx != null)       "fpx"         null)
+    (mkWith   (djvulibre != null)    "djvu"        null)
+    (mkWith   (fontconfig != null)   "fontconfig"  null)
+    (mkWith   (freetype != null)     "freetype"    null)
+    (mkWith   (ghostscript != null)  "gslib"       null)
+    (mkWith   (graphviz != null)     "gvc"         null)
+    (mkWith   (jbigkit != null)      "jbig"        null)
+    (mkWith   (libjpeg != null)      "jpeg"        null)
+    (mkWith   (lcms2 != null)        "lcms2"       null)
+    (mkWith   false                  "lcms"        null)
+    (mkWith   (openjpeg != null)     "openjp2"     null)
+    (mkWith   (liblqr1 != null)      "lqr"         null)
+    (mkWith   (xz != null)           "lzma"        null)
+    (mkWith   (openexr != null)      "openexr"     null)
+    (mkWith   (pango != null)        "pango"       null)
+    (mkWith   (libpng != null)       "png"         null)
+    (mkWith   (librsvg != null)      "rsvg"        null)
+    (mkWith   (libtiff != null)      "tiff"        null)
+    (mkWith   (libwebp != null)      "webp"        null)
+    (mkWith   (libxml2 != null)      "xml"         null)
   ] ++ optional (dejavu_fonts != null) "--with-dejavu-font-dir=${dejavu_fonts}/share/fonts/truetype/"
     ++ optional (ghostscript != null) "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts/";
 
diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix
index 562e292791a..4a61d188ef6 100644
--- a/pkgs/development/libraries/lame/default.nix
+++ b/pkgs/development/libraries/lame/default.nix
@@ -17,7 +17,7 @@ assert sndfileFileIOSupport -> (libsndfile != null);
 #assert mp3xSupport -> (analyzerHooksSupport && (gtk1 != null));
 
 let
-  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
+  sndfileFileIO = if sndfileFileIOSupport then "sndfile" else "lame";
 in
 
 with stdenv.lib;
@@ -39,17 +39,18 @@ stdenv.mkDerivation rec {
     ++ optional sndfileFileIOSupport libsndfile;
 
   configureFlags = [
-    (mkFlag nasmSupport "nasm")
-    (mkFlag cpmlSupport "cpml")
-    #(mkFlag efenceSupport "efence")
-    (if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame")
-    (mkFlag analyzerHooksSupport "analyzer-hooks")
-    (mkFlag decoderSupport "decoder")
-    (mkFlag frontendSupport "frontend")
-    (mkFlag frontendSupport "dynamic-frontends")
-    #(mkFlag mp3xSupport "mp3x")
-    (mkFlag mp3rtpSupport "mp3rtp")
-    (if debugSupport then "--enable-debug=alot" else "")
+    (mkEnable nasmSupport          "nasm"              null)
+    (mkEnable cpmlSupport          "cpml"              null)
+    #(mkEnable efenceSupport        "efence"            null)
+    (mkWith   true                 "fileio"            sndfileFileIO)
+    (mkEnable analyzerHooksSupport "analyzer-hooks"    null)
+    (mkEnable decoderSupport       "decoder"           null)
+    (mkEnable frontendSupport      "frontend"          null)
+    (mkEnable frontendSupport      "dynamic-frontends" null)
+    #(mkEnable mp3xSupport          "mp3x"              null)
+    (mkEnable mp3rtpSupport        "mp3rtp"            null)
+  ] ++ optional debugSupport [
+    (mkEnable true                 "debug"             "alot")
   ];
 
   meta = {
diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index 2a9af50fcde..77742c3d625 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -13,10 +13,6 @@ assert encaSupport -> (enca != null);
 assert fontconfigSupport -> (fontconfig != null);
 assert harfbuzzSupport -> (harfbuzz != null);
 
-let
-  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
-in
-
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libass-${version}";
@@ -28,11 +24,11 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags = [
-    (mkFlag encaSupport "enca")
-    (mkFlag fontconfigSupport "fontconfig")
-    (mkFlag harfbuzzSupport "harfbuzz")
-    (mkFlag rasterizerSupport "rasterizer")
-    (mkFlag largeTilesSupport "large-tiles")
+    (mkEnable encaSupport       "enca"        null)
+    (mkEnable fontconfigSupport "fontconfig"  null)
+    (mkEnable harfbuzzSupport   "harfbuzz"    null)
+    (mkEnable rasterizerSupport "rasterizer"  null)
+    (mkEnable largeTilesSupport "large-tiles" null)
   ];
 
   nativeBuildInputs = [ pkgconfig yasm ];
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 87d8154e5aa..3b8b7565e77 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -9,10 +9,6 @@ assert documentationSupport -> doxygen != null && graphviz != null;
 assert eventGUISupport -> cairo != null && glib != null && gtk3 != null;
 assert testsSupport -> check != null && valgrind != null;
 
-let
-  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
-in
-
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libinput-0.15.0";
@@ -23,9 +19,9 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags = [
-    (mkFlag documentationSupport "documentation")
-    (mkFlag eventGUISupport "event-gui")
-    (mkFlag testsSupport "tests")
+    (mkEnable documentationSupport "documentation" null)
+    (mkEnable eventGUISupport      "event-gui"     null)
+    (mkEnable testsSupport         "tests"         null)
   ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index 6da1b00ee81..871dff0aa8a 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -20,10 +20,6 @@ assert jpegSupport -> (libjpeg != null);
 assert tiffSupport -> (libtiff != null);
 assert gifSupport -> (giflib != null);
 
-let
-  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
-in
-
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libwebp-${version}";
@@ -35,19 +31,19 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags = [
-    (mkFlag threadingSupport "threading")
-    (mkFlag openglSupport "gl")
-    (mkFlag pngSupport "png")
-    (mkFlag jpegSupport "jpeg")
-    (mkFlag tiffSupport "tiff")
-    (mkFlag gifSupport "gif")
-    #(mkFlag (wicSupport && stdenv.isCygwin) "wic")
-    (mkFlag alignedSupport "aligned")
-    (mkFlag swap16bitcspSupport "swap-16bit-csp")
-    (mkFlag experimentalSupport "experimental")
-    (mkFlag libwebpmuxSupport "libwebpmux")
-    (mkFlag libwebpdemuxSupport "libwebpdemux")
-    (mkFlag libwebpdecoderSupport "libwebpdecoder")
+    (mkEnable threadingSupport "threading" null)
+    (mkEnable openglSupport "gl" null)
+    (mkEnable pngSupport "png" null)
+    (mkEnable jpegSupport "jpeg" null)
+    (mkEnable tiffSupport "tiff" null)
+    (mkEnable gifSupport "gif" null)
+    #(mkEnable (wicSupport && stdenv.isCygwin) "wic" null)
+    (mkEnable alignedSupport "aligned" null)
+    (mkEnable swap16bitcspSupport "swap-16bit-csp" null)
+    (mkEnable experimentalSupport "experimental" null)
+    (mkEnable libwebpmuxSupport "libwebpmux" null)
+    (mkEnable libwebpdemuxSupport "libwebpdemux" null)
+    (mkEnable libwebpdecoderSupport "libwebpdecoder" null)
   ];
 
   buildInputs = [ ]
diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix
index 9fb25aa36e0..9ebd27e8277 100644
--- a/pkgs/development/libraries/stxxl/default.nix
+++ b/pkgs/development/libraries/stxxl/default.nix
@@ -2,10 +2,6 @@
 , parallel ? true
 }:
 
-let
-  mkFlag = optset: flag: if optset then "-D${flag}=ON" else "-D${flag}=OFF";
-in
-
 stdenv.mkDerivation rec {
   name = "stxxl-${version}";
   version = "1.4.1";
@@ -21,7 +17,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_SHARED_LIBS=ON"
     "-DBUILD_STATIC_LIBS=OFF"
     "-DCMAKE_BUILD_TYPE=Release"
-    (mkFlag parallel "USE_GNU_PARALLEL")
+    "-DUSE_GNU_PARALLEL=${if parallel then "ON" else "OFF"}"
   ];
 
   passthru = {
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index cdd663bf191..00061e79fa5 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -6,10 +6,6 @@
 # Require the optional to be enabled until upstream fixes or removes the configure flag
 assert expat != null;
 
-let
-  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
-in
-
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "wayland-${version}";
@@ -21,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags = [
-    (mkFlag (expat != null) "scanner")
+    (mkEnable (expat != null) "scanner" null)
   ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 36b78388980..cac346e946e 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -25,13 +25,13 @@
 , opusSupport ? true, libopus
 }:
 
+with stdenv.lib;
 let
-  opt = stdenv.lib.optional;
-  mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
+  opt = optional;
   major = "0.19";
   minor = "9";
-
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
   name = "mpd-${major}.${minor}";
   src = fetchurl {
     url    = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz";
@@ -68,33 +68,33 @@ in stdenv.mkDerivation rec {
     ++ opt opusSupport libopus;
 
   configureFlags =
-    [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa")
-      (mkFlag flacSupport "flac")
-      (mkFlag vorbisSupport "vorbis")
-      (mkFlag vorbisSupport "vorbis-encoder")
-      (mkFlag (!stdenv.isDarwin && madSupport) "mad")
-      (mkFlag mikmodSupport "mikmod")
-      (mkFlag id3tagSupport "id3")
-      (mkFlag shoutSupport "shout")
-      (mkFlag sqliteSupport "sqlite")
-      (mkFlag curlSupport "curl")
-      (mkFlag audiofileSupport "audiofile")
-      (mkFlag bzip2Support "bzip2")
-      (mkFlag ffmpegSupport "ffmpeg")
-      (mkFlag fluidsynthSupport "fluidsynth")
-      (mkFlag zipSupport "zzip")
-      (mkFlag samplerateSupport "lsr")
-      (mkFlag mmsSupport "mms")
-      (mkFlag mpg123Support "mpg123")
-      (mkFlag aacSupport "aac")
-      (mkFlag pulseaudioSupport "pulse")
-      (mkFlag jackSupport "jack")
-      (mkFlag stdenv.isDarwin "osx")
-      (mkFlag icuSupport "icu")
-      (mkFlag gmeSupport "gme")
-      (mkFlag clientSupport "libmpdclient")
-      (mkFlag opusSupport "opus")
-      "--enable-debug"
+    [ (mkEnable (!stdenv.isDarwin && alsaSupport) "alsa" null)
+      (mkEnable flacSupport "flac" null)
+      (mkEnable vorbisSupport "vorbis" null)
+      (mkEnable vorbisSupport "vorbis-encoder" null)
+      (mkEnable (!stdenv.isDarwin && madSupport) "mad" null)
+      (mkEnable mikmodSupport "mikmod" null)
+      (mkEnable id3tagSupport "id3" null)
+      (mkEnable shoutSupport "shout" null)
+      (mkEnable sqliteSupport "sqlite" null)
+      (mkEnable curlSupport "curl" null)
+      (mkEnable audiofileSupport "audiofile" null)
+      (mkEnable bzip2Support "bzip2" null)
+      (mkEnable ffmpegSupport "ffmpeg" null)
+      (mkEnable fluidsynthSupport "fluidsynth" null)
+      (mkEnable zipSupport "zzip" null)
+      (mkEnable samplerateSupport "lsr" null)
+      (mkEnable mmsSupport "mms" null)
+      (mkEnable mpg123Support "mpg123" null)
+      (mkEnable aacSupport "aac" null)
+      (mkEnable pulseaudioSupport "pulse" null)
+      (mkEnable jackSupport "jack" null)
+      (mkEnable stdenv.isDarwin "osx" null)
+      (mkEnable icuSupport "icu" null)
+      (mkEnable gmeSupport "gme" null)
+      (mkEnable clientSupport "libmpdclient" null)
+      (mkEnable opusSupport "opus" null)
+      (mkEnable true "debug" null)
     ]
     ++ opt stdenv.isLinux
       "--with-systemdsystemunitdir=$(out)/etc/systemd/system";
@@ -103,7 +103,7 @@ in stdenv.mkDerivation rec {
     ${if shoutSupport then "-lshout" else ""}
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "A flexible, powerful daemon for playing music";
     homepage    = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
     license     = licenses.gpl2;
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index c785d76ddce..877850f532b 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -37,18 +37,12 @@
 assert kerberos != null -> zlib != null;
 
 let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
   bundledLibs = if kerberos != null && kerberos.implementation == "heimdal" then "NONE" else "com_err";
   hasGnutls = gnutls != null && libgcrypt != null && libgpgerror != null;
   isKrb5OrNull = if kerberos != null && kerberos.implementation == "krb5" then true else null;
   hasInfinibandOrNull = if libibverbs != null && librdmacm != null then true else null;
 in
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "samba-4.2.1";
 
@@ -60,7 +54,7 @@ stdenv.mkDerivation rec {
   patches = [
     ./4.x-no-persistent-install.patch
     ./4.x-fix-ctdb-deps.patch
-  ] ++ stdenv.lib.optional (kerberos != null) ./4.x-heimdal-compat.patch;
+  ] ++ optional (kerberos != null) ./4.x-heimdal-compat.patch;
 
   buildInputs = [
     python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42
@@ -162,7 +156,7 @@ stdenv.mkDerivation rec {
     find $out -type f -exec $SHELL -c "$SCRIPT" \;
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = http://www.samba.org/;
     description = "The standard Windows interoperability suite of programs for Linux and Unix";
     license = licenses.gpl3;
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 33d9b3dc64f..5d4932e36b4 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -28,13 +28,6 @@ assert cryptopp != null || (nss != null && nspr != null);
 
 with stdenv.lib;
 let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
   hasServer = snappy != null && leveldb != null;
   hasMon = hasServer;
   hasMds = hasServer;
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 757959f5345..3849c773a3e 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -3,9 +3,6 @@
 }:
 
 let
-  mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}";
-  mkEnable = mkFlag "enable" "disable";
-  mkWith = mkFlag "with" "without";
   hasX = gtk2 != null || qt4 != null;
 in
 with stdenv.lib;
@@ -20,12 +17,12 @@ stdenv.mkDerivation rec {
   buildInputs = [ libcap gtk2 ncurses qt4 ];
 
   configureFlags = [
-    (mkWith   (libcap != null)  "libcap")
-    (mkWith   (hasX)            "x")
-    (mkEnable (ncurses != null) "pinentry-curses")
-    (mkEnable true              "pinentry-tty")
-    (mkEnable (gtk2 != null)    "pinentry-gtk2")
-    (mkEnable (qt4 != null)     "pinentry-qt4")
+    (mkWith   (libcap != null)  "libcap"          null)
+    (mkWith   (hasX)            "x"               null)
+    (mkEnable (ncurses != null) "pinentry-curses" null)
+    (mkEnable true              "pinentry-tty"    null)
+    (mkEnable (gtk2 != null)    "pinentry-gtk2"   null)
+    (mkEnable (qt4 != null)     "pinentry-qt4"    null)
   ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index a9fdcf6fa64..195e6bc4329 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -7,9 +7,6 @@
 }:
 
 with stdenv.lib;
-let
-  mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
-in
 stdenv.mkDerivation rec {
   name = "rsyslog-8.9.0";
 
@@ -26,70 +23,70 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optional stdenv.isLinux systemd;
 
   configureFlags = [
-    "--sysconfdir=/etc"
-    "--localstatedir=/var"
-    "--with-systemdsystemunitdir=\${out}/etc/systemd/system"
-    (mkFlag true                      "largefile")
-    (mkFlag true                      "regexp")
-    (mkFlag (krb5 != null)            "gssapi-krb5")
-    (mkFlag true                      "klog")
-    (mkFlag true                      "kmsg")
-    (mkFlag (systemd != null)         "imjournal")
-    (mkFlag true                      "inet")
-    (mkFlag (jemalloc != null)        "jemalloc")
-    (mkFlag true                      "unlimited-select")
-    (mkFlag true                      "usertools")
-    (mkFlag (libmysql != null)        "mysql")
-    (mkFlag (postgresql != null)      "pgsql")
-    (mkFlag (libdbi != null)          "libdbi")
-    (mkFlag (net_snmp != null)        "snmp")
-    (mkFlag (libuuid != null)         "uuid")
-    (mkFlag (curl != null)            "elasticsearch")
-    (mkFlag (gnutls != null)          "gnutls")
-    (mkFlag (libgcrypt != null)       "libgcrypt")
-    (mkFlag true                      "rsyslogrt")
-    (mkFlag true                      "rsyslogd")
-    (mkFlag true                      "mail")
-    (mkFlag (liblognorm != null)      "mmnormalize")
-    (mkFlag true                      "mmjsonparse")
-    (mkFlag true                      "mmaudit")
-    (mkFlag true                      "mmanon")
-    (mkFlag true                      "mmutf8fix")
-    (mkFlag true                      "mmcount")
-    (mkFlag true                      "mmsequence")
-    (mkFlag true                      "mmfields")
-    (mkFlag true                      "mmpstrucdata")
-    (mkFlag (openssl != null)         "mmrfc5424addhmac")
-    (mkFlag (librelp != null)         "relp")
-    (mkFlag (libgt != null)           "guardtime")
-    (mkFlag (liblogging != null)      "liblogging-stdlog")
-    (mkFlag (liblogging != null)      "rfc3195")
-    (mkFlag true                      "imfile")
-    (mkFlag false                     "imsolaris")
-    (mkFlag true                      "imptcp")
-    (mkFlag true                      "impstats")
-    (mkFlag true                      "omprog")
-    (mkFlag (libnet != null)          "omudpspoof")
-    (mkFlag true                      "omstdout")
-    (mkFlag (systemd != null)         "omjournal")
-    (mkFlag true                      "pmlastmsg")
-    (mkFlag true                      "pmcisconames")
-    (mkFlag true                      "pmciscoios")
-    (mkFlag true                      "pmaixforwardedfrom")
-    (mkFlag true                      "pmsnare")
-    (mkFlag true                      "omruleset")
-    (mkFlag true                      "omuxsock")
-    (mkFlag true                      "mmsnmptrapd")
-    (mkFlag (hadoop != null)          "omhdfs")
-    (mkFlag (rdkafka != null)         "omkafka")
-    (mkFlag (libmongo-client != null) "ommongodb")
-    (mkFlag (czmq != null)            "imzmq3")
-    (mkFlag (czmq != null)            "imczmq")
-    (mkFlag (czmq != null)            "omzmq3")
-    (mkFlag (czmq != null)            "omczmq")
-    (mkFlag (rabbitmq-c != null)      "omrabbitmq")
-    (mkFlag (hiredis != null)         "omhiredis")
-    (mkFlag true                      "generate-man-pages")
+    (mkOther                            "sysconfdir"           "/etc")
+    (mkOther                            "localstatedir"        "/var")
+    (mkWith   true                      "systemdsystemunitdir" "\${out}/etc/systemd/system")
+    (mkEnable true                      "largefile"            null)
+    (mkEnable true                      "regexp"               null)
+    (mkEnable (krb5 != null)            "gssapi-krb5"          null)
+    (mkEnable true                      "klog"                 null)
+    (mkEnable true                      "kmsg"                 null)
+    (mkEnable (systemd != null)         "imjournal"            null)
+    (mkEnable true                      "inet"                 null)
+    (mkEnable (jemalloc != null)        "jemalloc"             null)
+    (mkEnable true                      "unlimited-select"     null)
+    (mkEnable true                      "usertools"            null)
+    (mkEnable (libmysql != null)        "mysql"                null)
+    (mkEnable (postgresql != null)      "pgsql"                null)
+    (mkEnable (libdbi != null)          "libdbi"               null)
+    (mkEnable (net_snmp != null)        "snmp"                 null)
+    (mkEnable (libuuid != null)         "uuid"                 null)
+    (mkEnable (curl != null)            "elasticsearch"        null)
+    (mkEnable (gnutls != null)          "gnutls"               null)
+    (mkEnable (libgcrypt != null)       "libgcrypt"            null)
+    (mkEnable true                      "rsyslogrt"            null)
+    (mkEnable true                      "rsyslogd"             null)
+    (mkEnable true                      "mail"                 null)
+    (mkEnable (liblognorm != null)      "mmnormalize"          null)
+    (mkEnable true                      "mmjsonparse"          null)
+    (mkEnable true                      "mmaudit"              null)
+    (mkEnable true                      "mmanon"               null)
+    (mkEnable true                      "mmutf8fix"            null)
+    (mkEnable true                      "mmcount"              null)
+    (mkEnable true                      "mmsequence"           null)
+    (mkEnable true                      "mmfields"             null)
+    (mkEnable true                      "mmpstrucdata"         null)
+    (mkEnable (openssl != null)         "mmrfc5424addhmac"     null)
+    (mkEnable (librelp != null)         "relp"                 null)
+    (mkEnable (libgt != null)           "guardtime"            null)
+    (mkEnable (liblogging != null)      "liblogging-stdlog"    null)
+    (mkEnable (liblogging != null)      "rfc3195"              null)
+    (mkEnable true                      "imfile"               null)
+    (mkEnable false                     "imsolaris"            null)
+    (mkEnable true                      "imptcp"               null)
+    (mkEnable true                      "impstats"             null)
+    (mkEnable true                      "omprog"               null)
+    (mkEnable (libnet != null)          "omudpspoof"           null)
+    (mkEnable true                      "omstdout"             null)
+    (mkEnable (systemd != null)         "omjournal"            null)
+    (mkEnable true                      "pmlastmsg"            null)
+    (mkEnable true                      "pmcisconames"         null)
+    (mkEnable true                      "pmciscoios"           null)
+    (mkEnable true                      "pmaixforwardedfrom"   null)
+    (mkEnable true                      "pmsnare"              null)
+    (mkEnable true                      "omruleset"            null)
+    (mkEnable true                      "omuxsock"             null)
+    (mkEnable true                      "mmsnmptrapd"          null)
+    (mkEnable (hadoop != null)          "omhdfs"               null)
+    (mkEnable (rdkafka != null)         "omkafka"              null)
+    (mkEnable (libmongo-client != null) "ommongodb"            null)
+    (mkEnable (czmq != null)            "imzmq3"               null)
+    (mkEnable (czmq != null)            "imczmq"               null)
+    (mkEnable (czmq != null)            "omzmq3"               null)
+    (mkEnable (czmq != null)            "omczmq"               null)
+    (mkEnable (rabbitmq-c != null)      "omrabbitmq"           null)
+    (mkEnable (hiredis != null)         "omhiredis"            null)
+    (mkEnable true                      "generate-man-pages"   null)
   ];
 
   meta = {

From 2ebe0fc88b97bcc6f9b058fee57c298a36889e30 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 22 May 2015 14:14:28 -0700
Subject: [PATCH 0076/2322] gtk3: Mark as linux only temporarily

---
 pkgs/development/libraries/gtk+/3.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 84bea07602f..18aaa9fa228 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl2Plus;
 
     maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux; # Temporary until fixed for darwin
   };
 }

From 54963fb5b7495ad3f63baa0b6d5d75d3f7c8a874 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 22 May 2015 14:14:46 -0700
Subject: [PATCH 0077/2322] ceph: Now evaluate on darwin

---
 pkgs/tools/filesystems/ceph/generic.nix | 79 +++++++++++++++++--------
 1 file changed, 54 insertions(+), 25 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 5d4932e36b4..9dbc85a3243 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -26,32 +26,61 @@
 # We must have one crypto library
 assert cryptopp != null || (nss != null && nspr != null);
 
+with stdenv;
 with stdenv.lib;
 let
-  hasServer = snappy != null && leveldb != null;
+  optSnappy = shouldUsePkg snappy;
+  optLeveldb = shouldUsePkg leveldb;
+  optYasm = shouldUsePkg yasm;
+  optFcgi = shouldUsePkg fcgi;
+  optExpat = shouldUsePkg expat;
+  optCurl = shouldUsePkg curl;
+  optFuse = shouldUsePkg fuse;
+  optAccelio = shouldUsePkg accelio;
+  optLibibverbs = shouldUsePkg libibverbs;
+  optLibrdmacm = shouldUsePkg librdmacm;
+  optLibedit = shouldUsePkg libedit;
+  optLibatomic_ops = shouldUsePkg libatomic_ops;
+  optKinetic-cpp-client = shouldUsePkg kinetic-cpp-client;
+  optRocksdb = shouldUsePkg rocksdb;
+  optLibs3 = shouldUsePkg libs3;
+
+  optJemalloc = shouldUsePkg jemalloc;
+  optGperftools = shouldUsePkg gperftools;
+
+  optCryptopp = shouldUsePkg cryptopp;
+  optNss = shouldUsePkg nss;
+  optNspr = shouldUsePkg nspr;
+
+  optLibaio = shouldUsePkg libaio;
+  optLibxfs = shouldUsePkg libxfs;
+  optZfs = shouldUsePkg zfs;
+
+  hasServer = optSnappy != null && optLeveldb != null;
   hasMon = hasServer;
   hasMds = hasServer;
   hasOsd = hasServer;
-  hasRadosgw = fcgi != null && expat != null && curl != null && libedit != null;
+  hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null;
 
   hasXio = (stdenv.isLinux || stdenv.isFreeBSD) &&
     versionAtLeast version "0.95" &&
-    accelio != null && libibverbs != null && librdmacm != null;
+    optAccelio != null && optLibibverbs != null && optLibrdmacm != null;
 
-  hasRocksdb = versionAtLeast version "0.95" && rocksdb != null;
+  hasRocksdb = versionAtLeast version "0.95" && optRocksdb != null;
 
   # TODO: Reenable when kinetic support is fixed
-  hasKinetic = versionAtLeast version "0.95" && kinetic-cpp-client != null && false;
+  #hasKinetic = versionAtLeast version "0.95" && optKinetic-cpp-client != null;
+  hasKinetic = false;
 
   # Malloc implementation (can be jemalloc, tcmalloc or null)
-  malloc = if jemalloc != null then jemalloc else gperftools;
+  malloc = if optJemalloc != null then optJemalloc else optGperftools;
 
   # We prefer nss over cryptopp
-  cryptoStr = if nss != null && nspr != null then "nss" else
-    if cryptopp != null then "cryptopp" else "none";
+  cryptoStr = if optNss != null && optNspr != null then "nss" else
+    if optCryptopp != null then "cryptopp" else "none";
   cryptoLibsMap = {
-    nss = [ nss nspr ];
-    cryptopp = [ cryptopp ];
+    nss = [ optNss optNspr ];
+    cryptopp = [ optCryptopp ];
     none = [ ];
   };
 
@@ -71,22 +100,22 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ];
   buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
-    boost python libxml2 yasm libatomic_ops libs3 malloc pythonPackages.flask zlib
+    boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib
   ] ++ optional (versionAtLeast version "9.0.0") [
     git                   # Used for the gitversion string
     pythonPackages.sphinx # Used for docs
   ] ++ optional stdenv.isLinux [
-    linuxHeaders libuuid udev keyutils libaio libxfs zfs
+    linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs
   ] ++ optional hasServer [
-    snappy leveldb
+    optSnappy optLeveldb
   ] ++ optional hasRadosgw [
-    fcgi expat curl fuse libedit
+    optFcgi optExpat optCurl optFuse optLibedit
   ] ++ optional hasXio [
-    accelio libibverbs librdmacm
+    optAccelio optLibibverbs optLibrdmacm
   ] ++ optional hasRocksdb [
-    rocksdb
+    optRocksdb
   ] ++ optional hasKinetic [
-    kinetic-cpp-client
+    optKinetic-cpp-client
   ];
 
   postPatch = ''
@@ -134,23 +163,23 @@ stdenv.mkDerivation {
     (mkWith   false                        "profiler"          null)
     (mkWith   false                        "debug"             null)
     (mkEnable false                        "coverage"          null)
-    (mkWith   (fuse != null)               "fuse"              null)
-    (mkWith   (malloc == jemalloc)         "jemalloc"          null)
-    (mkWith   (malloc == gperftools)       "tcmalloc"          null)
+    (mkWith   (optFuse != null)            "fuse"              null)
+    (mkWith   (malloc == optJemalloc)      "jemalloc"          null)
+    (mkWith   (malloc == optGperftools)    "tcmalloc"          null)
     (mkEnable false                        "pgrefdebugging"    null)
     (mkEnable false                        "cephfs-java"       null)
     (mkEnable hasXio                       "xio"               null)
-    (mkWith   (libatomic_ops != null)      "libatomic-ops"     null)
+    (mkWith   (optLibatomic_ops != null)   "libatomic-ops"     null)
     (mkWith   true                         "ocf"               null)
     (mkWith   hasKinetic                   "kinetic"           null)
     (mkWith   hasRocksdb                   "librocksdb"        null)
     (mkWith   false                        "librocksdb-static" null)
-    (mkWith   (libs3 != null)              "system-libs3"      null)
+    (mkWith   (optLibs3 != null)           "system-libs3"      null)
     (mkWith   true                         "rest-bench"        null)
   ] ++ optional stdenv.isLinux [
-    (mkWith   (libaio != null)             "libaio"            null)
-    (mkWith   (libxfs != null)             "libxfs"            null)
-    (mkWith   (zfs != null)                "libzfs"            null)
+    (mkWith   (optLibaio != null)             "libaio"            null)
+    (mkWith   (optLibxfs != null)             "libxfs"            null)
+    (mkWith   (optZfs != null)                "libzfs"            null)
   ] ++ optional (versionAtLeast version "10.0.0") [
     (mkWith   true                         "man-pages"         null)
     (mkWith   false                        "tcmalloc-minimal"  null)

From 5a89a87cc575f0d8b9f6cc20e8203c18ac30a8c0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 22 May 2015 15:31:53 -0700
Subject: [PATCH 0078/2322] ncurses: Always symlink to a real .so and add
 symlinks for major versions

---
 pkgs/development/libraries/ncurses/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 051d29924df..61920f9d000 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -93,16 +93,16 @@ stdenv.mkDerivation rec {
     libs="$(find $out/lib -name \*w.a | sed 's,.*lib\(.*\)w.a.*,\1,g')"
     for lib in $libs; do
       if [ -e "$out/lib/lib''${lib}w.so" ]; then
-        echo "INPUT(-l''${lib}w)" > $out/lib/lib$lib.so
+        ln -svf lib''${lib}w.so $out/lib/lib$lib.so
+        ln -svf lib''${lib}w.so.${abiVersion} $out/lib/lib$lib.so.${abiVersion}
       fi
       ln -svf lib''${lib}w.a $out/lib/lib$lib.a
       ln -svf ''${lib}w.pc $out/lib/pkgconfig/$lib.pc
     done
 
     # Create curses compatability
-    echo "INPUT(-lncursesw)" > $out/lib/libcursesw.so
-    echo "INPUT(-lncursesw)" > $out/lib/libcurses.so
-    ln -svf libncurses
+    ln -svf libncursesw.so $out/lib/libcursesw.so
+    ln -svf libncursesw.so $out/lib/libcurses.so
   '' else ''
     # Create a non-abi versioned config
     cfg=$(basename $out/bin/ncurses*-config)
@@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
     ln -svf . $out/include/ncurses
 
     # Create curses compatability
-    echo "INPUT(-lncurses)" > $out/lib/libcurses.so
+    ln -svf libncurses.so $out/lib/libcurses.so
   '';
 
   meta = with stdenv.lib; {

From dabd9ec29c7f04fb4c656d2f43561cc3c3bfda0d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 22 May 2015 15:58:49 -0700
Subject: [PATCH 0079/2322] goPackages: Build on hydra

---
 pkgs/development/go-modules/generic/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index f747ade72f2..1d259da1415 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -129,7 +129,10 @@ go.stdenv.mkDerivation (
 
   passthru = passthru // lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; };
 
-  meta = meta // {
+  meta = {
+    # Add default meta information
+    platforms = lib.platforms.all;
+  } // meta // {
     # add an extra maintainer to every package
     maintainers = (meta.maintainers or []) ++
                   [ lib.maintainers.emery lib.maintainers.lethalman ];

From 1dc671956b97e0c2e0b6df01cb542c26490bf8a7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 22 May 2015 15:59:05 -0700
Subject: [PATCH 0080/2322] consul: 0.5.1 -> 0.5.2

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index d890e88a702..c4fc9065698 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -417,7 +417,7 @@ let
   };
 
   consul = buildGoPackage rec {
-    rev = "v0.5.1";
+    rev = "v0.5.2";
     name = "consul-${rev}";
     goPackagePath = "github.com/hashicorp/consul";
 
@@ -425,7 +425,7 @@ let
       inherit rev;
       owner = "hashicorp";
       repo = "consul";
-      sha256 = "0glmvw52mgf3gwqr0f8v19ip5i6csiimv25jh30ilkig29k7027k";
+      sha256 = "0p3lc1p346a5ipvkf15l94gn1ml3m7zz6bx0viark3hsv0a7iij7";
     };
 
     buildInputs = [

From 3d60104a74fa72e1fc00ed17684b134655479861 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Fri, 22 May 2015 20:04:06 -0400
Subject: [PATCH 0081/2322] libepoxy: enable on Darwin

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

diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index a1b0d87cdfd..4798c50225d 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/anholt/libepoxy;
     license = licenses.mit;
     maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From ffcea6546d4832d5141add56f1d6126a6fd33a5e Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Fri, 22 May 2015 20:08:22 -0400
Subject: [PATCH 0082/2322] gtk3: fix on Darwin

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

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 18aaa9fa228..252e52ee3b9 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -25,12 +25,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libxkbcommon epoxy ];
   propagatedBuildInputs = with xlibs; with stdenv.lib;
-    [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ]
-    ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ]
-    ++ optional stdenv.isDarwin x11
+    [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ]
+    ++ optionals stdenv.isLinux [ wayland ]
     ++ optional xineramaSupport libXinerama
     ++ optional cupsSupport cups;
 
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+
   # demos fail to install, no idea where's the problem
   preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in";
 
@@ -64,6 +65,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl2Plus;
 
     maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ];
-    platforms = stdenv.lib.platforms.linux; # Temporary until fixed for darwin
+    platforms = stdenv.lib.platforms.all;
   };
 }

From 815f85edfd2818efb190f1cdd59a9d2834712b77 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 23 May 2015 01:40:19 +0100
Subject: [PATCH 0083/2322] python-livestreamer: update to 1.12.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e85b2b6ae58..9ddbb6e2dc4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7908,13 +7908,13 @@ let
   };
 
   livestreamer = buildPythonPackage rec {
-    version = "1.11.1";
+    version = "1.12.2";
     name = "livestreamer-${version}";
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
       url = "https://github.com/chrippa/livestreamer/archive/v${version}.tar.gz";
-      sha256 = "1hic3z5any64gn2b0gs1b7m34bzgzv71inr8wgjq59pwf8mbrqk9";
+      sha256 = "1fp3d3z2grb1ls97smjkraazpxnvajda2d1g1378s6gzmda2jvjd";
     };
 
     buildInputs = with self; [ pkgs.makeWrapper ];
@@ -7930,6 +7930,7 @@ let
         services and pipes them into a video player of choice.
       '';
       license = stdenv.lib.licenses.bsd2;
+      maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
     };
   };
 

From 4d867b0b08cc6a91912836a46d94b435e964b999 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 23 May 2015 01:56:39 +0100
Subject: [PATCH 0084/2322] mpv: update to 0.9.2

---
 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 8e516fd91e3..0e0c71bd9e1 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -59,14 +59,14 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchurl {
     url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
-    sha256 = "17hpx8wb4b6hjhc208jn71p02s0gd6665vzyyy249k6jfn2nh8sx";
+    sha256 = "0la7pmy75mq92kcrawdiw5idw6a46z7d15mlkgs0axyivdaqy560";
   };
 
-  buildInputs = 
+  buildInputs =
     [ python3 lua perl freetype pkgconfig ffmpeg libass docutils which libpthreadstubs lua5_sockets ]
     ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
     ++ optional alsaSupport alsaLib

From 1690c1598efc9dd06aba731f6283e64713390ad5 Mon Sep 17 00:00:00 2001
From: Sam Griffin <sam.griffin@gmail.com>
Date: Fri, 22 May 2015 21:01:21 -0400
Subject: [PATCH 0085/2322] updating bitcoin to 0.10.2

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

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index b888b587be9..b759b2dcb2c 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -6,14 +6,14 @@ with stdenv.lib;
 stdenv.mkDerivation rec{
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  core_version = "0.10.1";
+  core_version = "0.10.2";
   version = core_version;
 
   src = fetchurl {
     url = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz"
             "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz"
           ];
-    sha256 = "287873f9ba4fd49cd4e4be7eba070d2606878f1690c5be0273164d37cbf3c138";
+    sha256 = "cddf96c71d0a35524fde93380981cf0cf0b51441454a3a68b9be491b9239bfec";
   };
 
   buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib

From 6014752e73ba5456750cb0b611a4808e8f0f49d3 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 23 May 2015 02:27:47 +0100
Subject: [PATCH 0086/2322] tesseract: fix postInstall

We needed to separate each of the unpack commands.
---
 pkgs/applications/graphics/tesseract/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix
index f20c868d4a0..b531c41e2d8 100644
--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/pkgs/applications/graphics/tesseract/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
                   'LIBLEPT_HEADERSDIR=${leptonica}/include'
   '';
 
-  postInstall = concatStrings extraLanguages;
+  postInstall = concatStringsSep "; " extraLanguages;
 
   meta = {
     description = "OCR engine";

From 6ad9f8e1ddb54b841fcaa011e66cb455ca8d0ba5 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 23 May 2015 12:41:07 +0200
Subject: [PATCH 0087/2322] mediathekview-9

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

diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix
new file mode 100644
index 00000000000..be4363c8314
--- /dev/null
+++ b/pkgs/applications/video/mediathekview/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, jre, unzip }:
+
+stdenv.mkDerivation {
+  name = "mediathekview-9";
+  src = fetchurl {
+    url = "mirror://sourceforge/zdfmediathk/MediathekView_9.zip";
+    sha256 = "1wff0igr33z9p1mjw7yvb6658smdwnp22dv8klz0y8qg116wx7a4";
+  };
+  unpackPhase = "true";
+
+  buildInputs = [ unzip ];
+  
+  # Could use some more love
+  # Maybe we can also preconfigure locations for vlc and the others.
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/opt/mediathekview
+    cd $out/opt/mediathekview
+    unzip $src
+    find . -iname '*.exe' -delete
+    sed -i -e 's, java, ${jre}/bin/java,' MediathekView__Linux.sh
+    ln -s $out/opt/mediathekview/MediathekView__Linux.sh $out/bin/mediathekview
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://zdfmediathk.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ maintainers.chaoflow ];
+    platforms = platforms.linux;  #  also OS X and cygwin, but not investigated, yet
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3984747a51f..b43fb9c7896 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11558,6 +11558,8 @@ let
 
   mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { };
 
+  mediathekview = callPackage ../applications/video/mediathekview { };
+
   meld = callPackage ../applications/version-management/meld { };
 
   mcomix = callPackage ../applications/graphics/mcomix { };

From 42d9fe8b09768b59ac55c2a3aaeea1174eaa393a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 23 May 2015 14:30:39 +0200
Subject: [PATCH 0088/2322] gevent: 1.0.1 -> 1.0.2

---
 .../python-modules/gevent_sslwrap.patch       | 49 -------------------
 pkgs/top-level/python-packages.nix            |  6 +--
 2 files changed, 2 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/development/python-modules/gevent_sslwrap.patch

diff --git a/pkgs/development/python-modules/gevent_sslwrap.patch b/pkgs/development/python-modules/gevent_sslwrap.patch
deleted file mode 100644
index a9bb0eab5de..00000000000
--- a/pkgs/development/python-modules/gevent_sslwrap.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 485cebc4d9bab2dae51cf29f91fad2f1cf157fec Mon Sep 17 00:00:00 2001
-From: Eugene Pankov <john.pankov@gmail.com>
-Date: Sun, 21 Sep 2014 12:04:13 +0300
-Subject: [PATCH] Work around missing sslwrap in Python 2.7.9 (fixes #477)
-
----
- gevent/_ssl2.py | 28 ++++++++++++++++++++--------
- 1 file changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/gevent/ssl.py b/gevent/ssl.py
-index 21491b7..85e6a86 100644
---- a/gevent/ssl.py
-+++ b/gevent/ssl.py
-@@ -80,15 +80,27 @@ def __init__(self, sock, keyfile=None, certfile=None,
-             self._sslobj = None
-         else:
-             # yes, create the SSL object
--            if ciphers is None:
--                self._sslobj = _ssl.sslwrap(self._sock, server_side,
--                                            keyfile, certfile,
--                                            cert_reqs, ssl_version, ca_certs)
-+            if hasattr(_ssl, 'sslwrap'):
-+                if ciphers is None:
-+                    self._sslobj = _ssl.sslwrap(self._sock, server_side,
-+                                                keyfile, certfile,
-+                                                cert_reqs, ssl_version, ca_certs)
-+                else:
-+                    self._sslobj = _ssl.sslwrap(self._sock, server_side,
-+                                                keyfile, certfile,
-+                                                cert_reqs, ssl_version, ca_certs,
-+                                                ciphers)
-             else:
--                self._sslobj = _ssl.sslwrap(self._sock, server_side,
--                                            keyfile, certfile,
--                                            cert_reqs, ssl_version, ca_certs,
--                                            ciphers)
-+                self.context = __ssl__.SSLContext(ssl_version)
-+                self.context.verify_mode = cert_reqs
-+                if ca_certs:
-+                    self.context.load_verify_locations(ca_certs)
-+                if certfile:
-+                    self.context.load_cert_chain(certfile, keyfile)
-+                if ciphers:
-+                    self.context.set_ciphers(ciphers)
-+                self._sslobj = self.context._wrap_socket(self._sock, server_side=server_side, ssl_sock=self)
-+
-             if do_handshake_on_connect:
-                 self.do_handshake()
-         self.keyfile = keyfile
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9ddbb6e2dc4..b4504ce8cc6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5589,16 +5589,14 @@ let
   };
 
   gevent = buildPythonPackage rec {
-    name = "gevent-1.0.1";
+    name = "gevent-1.0.2";
     disabled = isPy3k || isPyPy;  # see https://github.com/surfly/gevent/issues/248
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/g/gevent/${name}.tar.gz";
-      sha256 = "0hyzfb0gcx9pm5c2igan8y57hqy2wixrwvdjwsaivxsqs0ay49s6";
+      sha256 = "0cds7yvwdlqmd590i59vzxaviwxk4js6dkhnmdxb3p1xac7wmq9s";
     };
 
-    patches = [ ../development/python-modules/gevent_sslwrap.patch ];
-
     buildInputs = with self; [ pkgs.libev ];
     propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ];
 

From 0a329f4512dcff526325b914257a55991e642ef5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 May 2015 16:38:02 +0200
Subject: [PATCH 0089/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/381af77b5413dd83ee14458e874b2b0876e44500
 with hackage2nix revision ca778c8501c0d2e3c44fa9016b1f79cdf6f3dcc2

---
 .../haskell-modules/hackage-packages.nix      | 287 +++++++++++-------
 1 file changed, 180 insertions(+), 107 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index cc084adabb2..886c03b3d84 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -17261,22 +17261,22 @@ self: {
   "aeson" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , containers, deepseq, dlist, ghc-prim, hashable, HUnit, mtl
-     , old-locale, QuickCheck, scientific, syb, template-haskell
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, transformers, unordered-containers, vector
+     , QuickCheck, scientific, syb, template-haskell, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson";
-       version = "0.8.1.0";
-       sha256 = "0dr0pnql4hlb6fxg9wvzg8a7ssjnzc89gpv0rxlkpaqrbb2hk32m";
+       version = "0.8.1.1";
+       sha256 = "15fdicmgkcadgqiqql3f4iv2s01aiclny8hjz3d6ryivjsch7cyh";
        buildDepends = [
          attoparsec base blaze-builder bytestring containers deepseq dlist
          ghc-prim hashable mtl scientific syb template-haskell text time
          transformers unordered-containers vector
        ];
        testDepends = [
-         attoparsec base bytestring containers ghc-prim HUnit old-locale
-         QuickCheck template-haskell test-framework test-framework-hunit
+         attoparsec base bytestring containers ghc-prim HUnit QuickCheck
+         template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 text time unordered-containers vector
        ];
        homepage = "https://github.com/bos/aeson";
@@ -26789,6 +26789,7 @@ self: {
        jailbreak = true;
        description = "Simple part of speech tagger";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "broadcast-chan" = callPackage
@@ -27271,15 +27272,14 @@ self: {
      }:
      mkDerivation {
        pname = "byline";
-       version = "0.1.0.0";
-       sha256 = "1w2blafifvsliz4z9lplfm73lpd95frjnp5y3jk6xzjrvsnyqahs";
+       version = "0.2.0.0";
+       sha256 = "1194h9bhd1n9sxc224j22mir852b9c5ww2cq0sf9x8k3vlfpm1jl";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          ansi-terminal base colour containers exceptions haskeline mtl
          terminfo-hs text transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/pjones/byline";
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
        license = stdenv.lib.licenses.bsd2;
@@ -29894,8 +29894,8 @@ self: {
      }:
      mkDerivation {
        pname = "cef";
-       version = "0.1.0.0";
-       sha256 = "0lr9yhlrp40kn8n5asw3xnz3xd28xd8nclh90y9f1ikci4i9xgxp";
+       version = "0.1.1";
+       sha256 = "045sh0mfpwjpr3vc7bax89hv7aq29ak0xqhmyldj2p8allcfrv24";
        buildDepends = [ base bytestring text time ];
        testDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/picussecurity/haskell-cef.git";
@@ -32304,10 +32304,8 @@ self: {
      }:
      mkDerivation {
        pname = "cmdargs";
-       version = "0.10.12";
-       revision = "1";
-       sha256 = "0axn3ycw4rijh1ka5f73gz9w330s851cpxbv39ia4xnb0l95hrjy";
-       editedCabalFile = "e37c92e6337ccbacd95f77938a1d0459f52cdb1a51c920a96610793cf2b5e4dc";
+       version = "0.10.13";
+       sha256 = "0vmz7f0ssrqlp6wzmc0mjqj4qczfgk58g0lr0yz7jamamlgpq4b6";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -37771,6 +37769,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "darkplaces-rcon" = callPackage
+    ({ mkDerivation, base, byteable, bytestring, cryptohash, hspec
+     , hspec-core, network, time
+     }:
+     mkDerivation {
+       pname = "darkplaces-rcon";
+       version = "0.1";
+       sha256 = "0ngxjb6zja7l905ixkr0cjyan21m311wc5dqdzacw5j5w7119v75";
+       buildDepends = [
+         base byteable bytestring cryptohash network time
+       ];
+       testDepends = [ base bytestring hspec hspec-core ];
+       jailbreak = true;
+       homepage = "https://github.com/bacher09/darkplaces-rcon";
+       description = "Darkplaces rcon client library";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "darkplaces-text" = callPackage
     ({ mkDerivation, alex, ansi-terminal, array, base, bytestring, text
      , vector
@@ -39026,6 +39042,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "datetime-sb" = callPackage
+    ({ mkDerivation, base, old-locale, old-time, QuickCheck, time }:
+     mkDerivation {
+       pname = "datetime-sb";
+       version = "0.2.2";
+       sha256 = "10c9anhlgzy7s0yvws7v0mf2ckxvwip74jl8izia76smhq9hf3sw";
+       buildDepends = [ base old-locale old-time QuickCheck time ];
+       homepage = "http://github.com/stackbuilders/datetime";
+       description = "Utilities to make Data.Time.* easier to use.";
+       license = "GPL";
+     }) {};
+
   "dawg" = callPackage
     ({ mkDerivation, base, binary, containers, mtl, transformers
      , vector, vector-binary
@@ -40691,8 +40719,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-haddock";
-       version = "0.3.0.2";
-       sha256 = "0vm41w1cvlw1k2gp7d3iyjdi1sla91v5v0xd7d7zhfgx7cs1b6dn";
+       version = "0.3.0.3";
+       sha256 = "0cjl78swzsx7yx3ry2yv94gbn5mwc7gbrlldgqxxiw0ip3mbzk7r";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -42724,13 +42752,12 @@ self: {
      }:
      mkDerivation {
        pname = "domplate";
-       version = "0.1";
-       sha256 = "116ljs471cdb21sjglk53wa8270axw7zbsm6ah785q1vabczgs8p";
+       version = "0.1.0.1";
+       sha256 = "1njzjxz7mymjfismmv8rxkqb24m0gindbsiszbjgy1wm1lwrspb4";
        buildDepends = [
          base bytestring containers tagsoup text unordered-containers vector
          yaml
        ];
-       jailbreak = true;
        homepage = "https://github.com/valderman/domplate";
        description = "A simple templating library using HTML5 as its template language";
        license = stdenv.lib.licenses.bsd3;
@@ -48150,8 +48177,8 @@ self: {
     ({ mkDerivation, base, bytestring, clock, directory, zip-archive }:
      mkDerivation {
        pname = "file-collection";
-       version = "0.1.1.3";
-       sha256 = "19wx2z66gcmvcxjbhz96c2finzmgkynsd52dwy309af3fbpmgcn0";
+       version = "0.1.1.6";
+       sha256 = "12rsizcxisys6bf3z3ghmqpm2201pyqpihhyhhx2s14mgmf53l7l";
        buildDepends = [ base bytestring clock directory zip-archive ];
        homepage = "https://github.com/joelwilliamson/file-collection";
        description = "Provide a uniform interface over file archives and directories";
@@ -48817,12 +48844,11 @@ self: {
     ({ mkDerivation, aeson, attoparsec, base, bytestring, text }:
      mkDerivation {
        pname = "fixedwidth-hs";
-       version = "0.4.0.0";
-       sha256 = "1j15yx5shwrc60k64z45lyrdif3zg5hfqyvq4b9msn1g9shxldyz";
+       version = "0.4.0.1";
+       sha256 = "0k4lidf95nb4a735331xdr77643b1yb15xllplxknbxxq9r2z3px";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ aeson attoparsec base bytestring text ];
-       jailbreak = true;
        homepage = "https://github.com/michaelochurch/fixedwidth-hs";
        description = "Quick parsing of fixed-width data formats";
        license = stdenv.lib.licenses.mit;
@@ -52839,7 +52865,7 @@ self: {
      , clientsession, conduit, conduit-extra, containers, crypto-api
      , cryptohash, curl, data-default, DAV, dbus, directory, dlist, dns
      , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath
-     , git, gnupg1, gnutls, hamlet, hinotify, hslogger, http-client
+     , git, gnupg1, gnutls, hinotify, hslogger, http-client
      , http-conduit, http-types, IfElse, json, lsof, MissingH
      , monad-control, monad-logger, mtl, network, network-info
      , network-multicast, network-protocol-xmpp, network-uri, openssh
@@ -52854,8 +52880,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "5.20150508.1";
-       sha256 = "1l2rll066iwbfm2jhcp55wqsx73qksi2mjjj63wzvfng6iyk60ix";
+       version = "5.20150522";
+       sha256 = "0spczrg1rrg4qgyxpjqlcfpkcdph6d2m6dv1lbf77nbfc6cqh83p";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -52863,8 +52889,8 @@ self: {
          case-insensitive clientsession conduit conduit-extra containers
          crypto-api cryptohash data-default DAV dbus directory dlist dns
          edit-distance esqueleto exceptions fdo-notify feed filepath gnutls
-         hamlet hinotify hslogger http-client http-conduit http-types IfElse
-         json MissingH monad-control monad-logger mtl network network-info
+         hinotify hslogger http-client http-conduit http-types IfElse json
+         MissingH monad-control monad-logger mtl network network-info
          network-multicast network-protocol-xmpp network-uri
          optparse-applicative path-pieces persistent persistent-sqlite
          persistent-template process QuickCheck random regex-tdfa resourcet
@@ -65269,8 +65295,8 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix-gsl-stats";
-       version = "0.3";
-       sha256 = "1hwm8wm70qzhajqpxzyw652lv1hkrb0lskp3lfsmg1jsaakpckmm";
+       version = "0.3.0.1";
+       sha256 = "0q5l82m6692isl9499q9szgmkxarkjkmwsdvg6frf7izkzrxx5l5";
        buildDepends = [ base binary hmatrix storable-complex ];
        extraLibraries = [ blas lapack ];
        homepage = "http://code.haskell.org/hmatrix-gsl-stats";
@@ -69629,8 +69655,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-snap";
-       version = "0.3.2.7";
-       sha256 = "0d1mmk4w82bxyi682fdmgxk5zm6ni3yhpvkps4m3i04x6gf2xyaj";
+       version = "0.3.2.9";
+       sha256 = "1m324bjln2i6qz7ym26m82s1qiaq0i0sq4yfscc3bh1s6p8r5vva";
        buildDepends = [
          base bytestring containers digestive-functors HandsomeSoup hspec
          hspec-core hxt lens mtl snap snap-core text transformers
@@ -69644,7 +69670,6 @@ self: {
        homepage = "https://github.com/dbp/hspec-snap";
        description = "A library for testing with Hspec and the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-test-framework" = callPackage
@@ -71824,6 +71849,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "huttons-razor" = callPackage
+    ({ mkDerivation, base, parsec, parsec-numbers }:
+     mkDerivation {
+       pname = "huttons-razor";
+       version = "0.1.0.0";
+       sha256 = "018br27y575crdnsn3lahklk7zmwrjqka9kan3c1g857fv2hnkq9";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ base parsec parsec-numbers ];
+       description = "Quick implemention of Hutton's Razor";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "huzzy" = callPackage
     ({ mkDerivation, base, easyplot }:
      mkDerivation {
@@ -73088,8 +73126,8 @@ self: {
      }:
      mkDerivation {
        pname = "idris";
-       version = "0.9.18";
-       sha256 = "09bskx00lxzf7fdw66sbi55bqr7z1d92cabf9askjf2ych07k26s";
+       version = "0.9.18.1";
+       sha256 = "0xd4kqnjdx427l26b07rrw9bnrxb8zrsqy93wayf4rmg6l8rymj8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -76494,18 +76532,18 @@ self: {
      , bytestring, cereal, cipher-aes, containers, cprng-aes
      , crypto-cipher-types, crypto-numbers, crypto-pubkey
      , crypto-pubkey-types, crypto-random, cryptohash, doctest, either
-     , errors, hspec, HUnit, mtl, old-locale, QuickCheck, text, time
-     , unordered-containers, vector
+     , hspec, HUnit, mtl, QuickCheck, text, time, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "jose-jwt";
-       version = "0.6.1";
-       sha256 = "0bw7pwz4blcjwxipjy0s5y7ibkf09d6kfjpw1zmkhz6padi9pvwi";
+       version = "0.6.2";
+       sha256 = "0fw3b34ghpjpm56iln1i46kr8dcj1yv8gmalgdl7ym7n9bvgrfzq";
        buildDepends = [
          aeson base base64-bytestring byteable bytestring cereal cipher-aes
          containers crypto-cipher-types crypto-numbers crypto-pubkey
-         crypto-pubkey-types crypto-random cryptohash errors mtl old-locale
-         text time unordered-containers vector
+         crypto-pubkey-types crypto-random cryptohash either mtl text time
+         unordered-containers vector
        ];
        testDepends = [
          aeson aeson-qq base base64-bytestring bytestring cipher-aes
@@ -76570,18 +76608,21 @@ self: {
      }) {};
 
   "jsaddle" = callPackage
-    ({ mkDerivation, base, hslogger, lens, template-haskell, text
-     , transformers
+    ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell
+     , text, transformers, webkitgtk3, webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.2.0.4";
-       sha256 = "154f75lhlqixrmwrvzcdvmvmila7cj8hzgch2020yamlwyi4gnk8";
-       buildDepends = [ base lens template-haskell text transformers ];
-       testDepends = [
-         base hslogger lens template-haskell text transformers
+       version = "0.2.0.5";
+       sha256 = "0avl5gvq3sv2fk524hazfk1xgb9rlyqqqrvnxb63psjds7s6rxp1";
+       buildDepends = [
+         base lens template-haskell text transformers webkitgtk3
+         webkitgtk3-javascriptcore
+       ];
+       testDepends = [
+         base glib gtk3 hslogger lens template-haskell text transformers
+         webkitgtk3 webkitgtk3-javascriptcore
        ];
-       jailbreak = true;
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -77135,8 +77176,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsontsv";
-       version = "0.1.4.6";
-       sha256 = "05rfpzs7ln87n17dbq22g990hkiqwwr656w6l2mrqfnq10qzx8xc";
+       version = "0.1.5.0";
+       sha256 = "0qilhv14q51g3dzsxk0zp5fp2igy7m79lq1qsk1myrd6iyannxc5";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -77528,6 +77569,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "keera-hails-reactivevalues" = callPackage
+    ({ mkDerivation, base, contravariant }:
+     mkDerivation {
+       pname = "keera-hails-reactivevalues";
+       version = "0.0.3.4";
+       sha256 = "0qqp4ss0prl3z4bwrsd5jmbvdmhh7x3m846b58dd7ibb0bycp1pb";
+       buildDepends = [ base contravariant ];
+       homepage = "http://www.keera.es/blog/community/";
+       description = "Haskell on Rails - Reactive Values";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "keiretsu" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring
      , conduit, conduit-extra, directory, filepath, hslogger, network
@@ -81874,8 +81927,8 @@ self: {
      }:
      mkDerivation {
        pname = "liquidhaskell";
-       version = "0.4.0.1";
-       sha256 = "079dj0kq1fznad34ydmqh0klhbky45c7mcyman1aqsnn7rlhh1nv";
+       version = "0.4.1.1";
+       sha256 = "1yxg6zii0mbsri5j37k2s976nyglijyjfgz9vwafiqdrca328z4s";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -85054,6 +85107,7 @@ self: {
        jailbreak = true;
        description = "Discover your (academic) ancestors!";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mathlink" = callPackage
@@ -98712,8 +98766,8 @@ self: {
      }:
      mkDerivation {
        pname = "pontarius-xmpp";
-       version = "0.4.2.0";
-       sha256 = "14f20any4pasjwxq81dmcds3l9gyaabdh9rma65yapkpgrs2v56z";
+       version = "0.4.2.1";
+       sha256 = "14jhxmccj9ywhxz2rkd4vdwhzz6ciq070ml8vl282hz8k3dr1va9";
        buildDepends = [
          attoparsec base base64-bytestring binary bytestring conduit
          containers crypto-api crypto-random cryptohash cryptohash-cryptoapi
@@ -98731,7 +98785,6 @@ self: {
          tasty-quickcheck tasty-th text tls transformers xml-picklers
          xml-types
        ];
-       jailbreak = true;
        homepage = "https://github.com/pontarius/pontarius-xmpp/";
        description = "An XMPP client library";
        license = stdenv.lib.licenses.bsd3;
@@ -99044,10 +99097,9 @@ self: {
     ({ mkDerivation, base, unix }:
      mkDerivation {
        pname = "posix-realtime";
-       version = "0.0.0.2";
-       sha256 = "1i3ag71ymmbcg1v0s6fqkpli8d1wplhj2jkalrv7alz8z666ms3h";
+       version = "0.0.0.3";
+       sha256 = "0g7mflyvhrypr8a5795vnqb5qlkg3w4nd3j8pnqql9dbmcbqc2aq";
        buildDepends = [ base unix ];
-       jailbreak = true;
        description = "POSIX Realtime functionality";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108934,8 +108986,8 @@ self: {
     ({ mkDerivation, base, SDL2, transformers }:
      mkDerivation {
        pname = "sdl2";
-       version = "1.3.0";
-       sha256 = "0fi9kjf12qlp64r2pxwc1k9241s23j6xm0dmwdsc18y8f6acvqxa";
+       version = "1.3.1";
+       sha256 = "17d3nmiz32hccbbxx55wa2zca8xn7mq3f02rcarzynqczvi5hlyv";
        buildDepends = [ base transformers ];
        extraLibraries = [ SDL2 ];
        pkgconfigDepends = [ SDL2 ];
@@ -109106,19 +109158,19 @@ self: {
      }) {};
 
   "second-transfer" = callPackage
-    ({ mkDerivation, base, base16-bytestring, binary, bytestring
-     , conduit, containers, cpphs, exceptions, hashable, hashtables
-     , hslogger, http2, HUnit, lens, network, network-uri, openssl, text
-     , transformers
+    ({ mkDerivation, attoparsec, base, base16-bytestring, binary
+     , bytestring, conduit, containers, cpphs, exceptions, hashable
+     , hashtables, hslogger, http2, HUnit, lens, network, network-uri
+     , openssl, text, transformers
      }:
      mkDerivation {
        pname = "second-transfer";
-       version = "0.4.0.0";
-       sha256 = "1xmlfdvcic11pi8ik9pasljq4h61nsnxpykcw2c9i9pgkl6bkwj9";
+       version = "0.5.0.0";
+       sha256 = "16bf857l0dhd2xkb63s47f1f8r41001lf7vkfy48r0p4hfm3bqr2";
        buildDepends = [
-         base base16-bytestring binary bytestring conduit containers
-         exceptions hashable hashtables hslogger http2 lens network
-         network-uri text transformers
+         attoparsec base base16-bytestring binary bytestring conduit
+         containers exceptions hashable hashtables hslogger http2 lens
+         network network-uri text transformers
        ];
        testDepends = [ base bytestring conduit http2 HUnit lens ];
        buildTools = [ cpphs ];
@@ -109946,15 +109998,16 @@ self: {
      }) {};
 
   "servant-pandoc" = callPackage
-    ({ mkDerivation, base, bytestring, pandoc-types, servant-docs, text
-     , unordered-containers
+    ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types
+     , semigroupoids, servant-docs, text, unordered-containers
      }:
      mkDerivation {
        pname = "servant-pandoc";
-       version = "0.1.0.2";
-       sha256 = "0k7fb1ijnvicsrdddibcw1kzjfaq5s776znf6mrpwjgazidq6wfl";
+       version = "0.4.0";
+       sha256 = "07cyw1d12hg5amjrbsmk2m2ch52yav16k8c3sh83xf42f2j05avs";
        buildDepends = [
-         base bytestring pandoc-types servant-docs text unordered-containers
+         base bytestring http-media lens pandoc-types semigroupoids
+         servant-docs text unordered-containers
        ];
        jailbreak = true;
        description = "Use Pandoc to render servant API documentation";
@@ -119658,12 +119711,12 @@ self: {
      , exceptions, filepath, ghc, ghc-paths, ghc-prim, liquid-fixpoint
      , liquidhaskell, mtl, pretty, process, syb, tagged, tasty
      , tasty-hunit, template-haskell, text, text-format, th-lift
-     , transformers, unordered-containers, vector
+     , transformers, unordered-containers, vector, z3
      }:
      mkDerivation {
        pname = "target";
-       version = "0.1.2.0";
-       sha256 = "116wig7zr4x0qza1gx92b01jb962w59y716cxj5qkf78sv9pml6s";
+       version = "0.1.3.0";
+       sha256 = "0przmavzzcbyxkqj1wffiissxz9fdlrx2q8lpxgmsamadd46xq66";
        buildDepends = [
          base containers directory exceptions filepath ghc ghc-paths
          liquid-fixpoint liquidhaskell mtl pretty process syb tagged
@@ -119675,10 +119728,11 @@ self: {
          liquidhaskell mtl tagged tasty tasty-hunit template-haskell
          unordered-containers
        ];
+       buildTools = [ z3 ];
        description = "Generate test-suites from refinement types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) { inherit (pkgs) z3;};
 
   "task" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
@@ -120805,8 +120859,8 @@ self: {
     ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck }:
      mkDerivation {
        pname = "test-invariant";
-       version = "0.4.4.0";
-       sha256 = "12b3m9ryfkc4gvlsw7jchy3rnqjs5j0gcknn1b3rhm2gzn66ac04";
+       version = "0.4.5.0";
+       sha256 = "0ck3kk7pmj1679ddmrysx5j3y27619ar1b2pny45mskz3g6vyvrh";
        buildDepends = [ base QuickCheck ];
        testDepends = [ base QuickCheck tasty tasty-quickcheck ];
        homepage = "https://github.com/knupfer/test-invariant";
@@ -121102,21 +121156,21 @@ self: {
      }) {};
 
   "text" = callPackage
-    ({ mkDerivation, array, base, bytestring, deepseq, directory
-     , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode
-     , random, test-framework, test-framework-hunit
+    ({ mkDerivation, array, base, binary, bytestring, deepseq
+     , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
+     , quickcheck-unicode, random, test-framework, test-framework-hunit
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "text";
-       version = "1.2.0.6";
-       sha256 = "0wvgynm76pb69wzlpys6l8j8ac4j43gas1anqbsg5ldlfvl85zfq";
+       version = "1.2.1.0";
+       sha256 = "0mpv82v853jimshff8xg2429hr23lp81vlrps76ypndz5ilxzipi";
        buildDepends = [
-         array base bytestring deepseq ghc-prim integer-gmp
+         array base binary bytestring deepseq ghc-prim integer-gmp
        ];
        testDepends = [
-         array base bytestring deepseq directory ghc-prim HUnit integer-gmp
-         QuickCheck quickcheck-unicode random test-framework
+         array base binary bytestring deepseq directory ghc-prim HUnit
+         integer-gmp QuickCheck quickcheck-unicode random test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
        homepage = "https://github.com/bos/text";
@@ -121146,8 +121200,11 @@ self: {
      mkDerivation {
        pname = "text-binary";
        version = "0.1.0";
+       revision = "1";
        sha256 = "0wc501j8hqspnhf4d1hyb18f1wgc4kl2qx1b5s4bkxv0dfbwrk6z";
+       editedCabalFile = "73815941abe470b6d0e2287c054995c5ec59524bed9d2f6bfef2411a4397c48d";
        buildDepends = [ base binary text ];
+       jailbreak = true;
        homepage = "https://github.com/kawu/text-binary";
        description = "Binary instances for text types";
        license = stdenv.lib.licenses.bsd3;
@@ -121527,6 +121584,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "textocat-api" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, http-conduit
+     , http-types, resourcet, tasty, tasty-hunit, text, transformers
+     }:
+     mkDerivation {
+       pname = "textocat-api";
+       version = "0.1.0.0";
+       sha256 = "0cljy3s13xqdvxffpp74iwamfvkmq7s49vpc8vpxnq2fvh6bmkx9";
+       buildDepends = [
+         aeson base bytestring conduit http-conduit http-types resourcet
+         text transformers
+       ];
+       testDepends = [
+         aeson base bytestring conduit http-conduit http-types resourcet
+         tasty tasty-hunit text transformers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/gltronred/textocat-api-haskell";
+       description = "Unofficial Haskell SDK for Textocat API -- http://textocat.com";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "texts" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -121934,26 +122013,21 @@ self: {
 
   "themoviedb" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, either
-     , http-client, http-client-tls, http-types, mtl, network
-     , network-uri, old-locale, tasty, tasty-hunit, text, text-binary
-     , time, transformers, unix
+     , http-client, http-client-tls, http-types, mtl, tasty, tasty-hunit
+     , text, text-binary, time, time-locale-compat, transformers
      }:
      mkDerivation {
        pname = "themoviedb";
-       version = "1.0.0.0";
-       sha256 = "1gwvhbxmhzc5sbcfvyln84x7j8jpglknxx15q82dyr8bhccs4x0w";
+       version = "1.1.0.0";
+       sha256 = "0yvpijr2dk01g1ks65nalyz547l9aq97a9v1bx3lp47allihrp8k";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base binary bytestring either http-client http-client-tls
-         http-types mtl network network-uri old-locale text text-binary time
-         transformers unix
+         http-types mtl text text-binary time time-locale-compat
+         transformers
        ];
-       testDepends = [
-         aeson base bytestring network old-locale tasty tasty-hunit text
-         time transformers unix
-       ];
-       jailbreak = true;
+       testDepends = [ base bytestring tasty tasty-hunit text time ];
        homepage = "http://github.com/pjones/themoviedb";
        description = "Haskell API bindings for http://themoviedb.org";
        license = stdenv.lib.licenses.mit;
@@ -128041,15 +128115,14 @@ self: {
      }:
      mkDerivation {
        pname = "vado";
-       version = "0.0.4";
-       sha256 = "0ndhknsqrb0vg5gba2q6dala16m7vbc8x4dga28q3ys0f14h1m6m";
+       version = "0.0.5";
+       sha256 = "07bqcp58hqyh5zvi6zpwwpppfzj30j60ryf6k0wqzckklibffqkj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ attoparsec base directory filepath process text ];
        testDepends = [
          attoparsec base directory filepath process QuickCheck text
        ];
-       jailbreak = true;
        homepage = "https://github.com/hamishmack/vado";
        description = "Runs commands on remote machines using ssh";
        license = stdenv.lib.licenses.mit;

From e281707ae9898e61b916c10f4bc9b5759f9114a5 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 22 May 2015 12:31:54 -0400
Subject: [PATCH 0090/2322] lens-action has been fixed.

---
 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 9959f093f93..175c1363f04 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -817,10 +817,6 @@ self: super: {
   # https://github.com/kkardzis/curlhs/issues/6
   curlhs = dontCheck super.curlhs;
 
-  # https://github.com/ekmett/lens-action/issues/5
-  lens-action = markBroken super.lens-action;
-  aws-kinesis-client = markBroken super.aws-kinesis-client;
-
   # https://github.com/haskell-servant/servant-server/issues/45
   servant-server = markBroken super.servant-server;
   servant-client = dontDistribute super.servant-client;

From 58e96c79d838c5b74a2effd52c019d780b5799bc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 May 2015 11:18:05 +0200
Subject: [PATCH 0091/2322] haskell-text-binary: patch to fix build with
 text-1.2.1.0 or later

https://github.com/kawu/text-binary/pull/1
---
 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 175c1363f04..1dcb8d00abb 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -829,4 +829,10 @@ self: super: {
   # https://github.com/hvr/token-bucket/issues/3
   token-bucket = dontCheck super.token-bucket;
 
+  # https://github.com/kawu/text-binary/issues/2
+  text-binary = appendPatch super.text-binary (pkgs.fetchpatch {
+    url = "https://github.com/RyanGlScott/text-binary/commit/608e0ce86a9a7591dbfe83f7cbb36b8d8ebd07b8.patch";
+    sha256 = "1rk5rgb5lsykpvylz77hzxyflxzlmi3fi06rf0yqg2vvrnri83f1";
+  });
+
 }

From 18a6e7171e5f0238c50876198648dd7808cfc6e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 May 2015 11:45:05 +0200
Subject: [PATCH 0092/2322] haskell-hbro-contrib: missing dependency hbro has
 been fixed upstream

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1dcb8d00abb..b27b43c12be 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -168,7 +168,6 @@ self: super: {
   ASN1 = dontDistribute super.ASN1;                             # NewBinary
   frame-markdown = dontDistribute super.frame-markdown;         # frame
   hails-bin = dontDistribute super.hails-bin;                   # Hails
-  hbro-contrib = dontDistribute super.hbro-contrib;             # hbro
   lss = markBrokenVersion "0.1.0.0" super.lss;                  # https://github.com/dbp/lss/issues/2
   snaplet-lss = markBrokenVersion "0.1.0.0" super.snaplet-lss;  # https://github.com/dbp/lss/issues/2
 

From 70a7f7c14da197968a381a5890a5000656934a01 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 May 2015 12:49:42 +0200
Subject: [PATCH 0093/2322] haskell-configuration-common: use overrideScope on
 cabal-install instead of override

This patch works around https://github.com/NixOS/nixpkgs/issues/7953 so
that we can use overrideScope on this attribute in the GHC 7.6.x package
set (see next commit).
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b27b43c12be..5adc679f0ec 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -8,8 +8,8 @@ self: super: {
   Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
   Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
   Cabal_1_22_3_0 = dontCheck super.Cabal_1_22_3_0;
-  cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_3_0; zlib = self.zlib_0_5_4_2; });
-  cabal-install_1_18_1_0 = dontCheck (super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; });
+  cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_3_0; zlib = self.zlib_0_5_4_2; });
+  cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; });
 
   # Break infinite recursions.
   Dust-crypto = dontCheck super.Dust-crypto;

From e25b42d852f950b5c54e9b0e6de91c23f3263fa7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 May 2015 13:05:07 +0200
Subject: [PATCH 0094/2322] cabal-install: avoid inconsistent 'binary' versions
 on ghc-7.4.x and ghc-7.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 3 +++
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 3 +++
 2 files changed, 6 insertions(+)

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 88fa300e2e7..2bad8d8b97d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -40,6 +40,9 @@ self: super: {
   # https://github.com/haskell/cabal/issues/2322
   Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; };
 
+  # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_4_0; });
+
   # 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 2ee40105439..a90c5f99173 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -42,6 +42,9 @@ self: super: {
   # https://github.com/haskell/cabal/issues/2322
   Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; };
 
+  # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_4_0; });
+
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
 

From c32c742a82fc29474b8cd12601cdfa0006a90bf8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 May 2015 15:12:20 +0200
Subject: [PATCH 0095/2322] haskell-textocat-api: test suite tries to access
 the network

---
 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 5adc679f0ec..e71fc5910f4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -311,6 +311,7 @@ self: super: {
   scotty-binding-play = dontCheck super.scotty-binding-play;
   slack-api = dontCheck super.slack-api;                # https://github.com/mpickering/slack-api/issues/5
   stackage = dontCheck super.stackage;                  # http://hydra.cryp.to/build/501867/nixlog/1/raw
+  textocat-api = dontCheck super.textocat-api;          # http://hydra.cryp.to/build/887011/log/raw
   warp = dontCheck super.warp;                          # http://hydra.cryp.to/build/501073/nixlog/5/raw
   wreq = dontCheck super.wreq;                          # http://hydra.cryp.to/build/501895/nixlog/1/raw
   wreq-sb = dontCheck super.wreq-sb;                    # http://hydra.cryp.to/build/783948/log/raw

From f0311f9b8cd142a83ffcf738138fa51d0064e115 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 May 2015 15:16:31 +0200
Subject: [PATCH 0096/2322] haskell-lzma-enumerator: test suite is broken (and
 has been for quite a while)

---
 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 e71fc5910f4..1432b9361db 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -835,4 +835,7 @@ self: super: {
     sha256 = "1rk5rgb5lsykpvylz77hzxyflxzlmi3fi06rf0yqg2vvrnri83f1";
   });
 
+  # https://github.com/alphaHeavy/lzma-enumerator/issues/3
+  lzma-enumerator = dontCheck super.lzma-enumerator;
+
 }

From 6276ebafaea30797d338ddeee1134fe889251507 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 23 May 2015 22:42:37 +0300
Subject: [PATCH 0097/2322] Update Query-FS (and CL-Fuse-Meta-FS)

---
 pkgs/development/lisp-modules/lisp-packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 5b24c704362..91c08419e70 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -226,14 +226,14 @@ let lispPackages = rec {
 
   query-fs = buildLispPackage rec {
     baseName = "query-fs";
-    version = "git-20141113";
+    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 = "4ed66f255e50d2c9ea9f0b3fbaa92bde9b8acf6a5fafb0d7f12b254be9de99e9";
-      rev = ''831f0180967f09b1dd345fef82144f48334279c3'';
+      sha256 = "19h6hscza7p93bc7jvb6ya7ghg96dr1c1v4imlxpjqfdhhdpxsq6";
+      rev = ''0f28e3f31a4cd3636a8edb346230482e68af86c2'';
     };
     overrides = x: {
       linkedSystems = [];
@@ -319,14 +319,14 @@ let lispPackages = rec {
 
   cl-fuse-meta-fs = buildLispPackage rec {
     baseName = "cl-fuse-meta-fs";
-    version = "git-20141113";
+    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 = "259303effea61baf293ffc5d080cb071ef15bed8fa1c76f0c1631f68d2aa3c85";
-      rev = ''d3d332471ce9330e3eaebf9d6cecdd2014c3599b'';
+      sha256 = "0cpxwsc0ma1ypl54n3n37wbgdxhz5j67h28q6rhghjn96dgy4ac9";
+      rev = ''6ab92ebbb8e6f1f69d179214032915e3744d8c03'';
     };
   };
 

From 59ab07351b87ad1fbaf234f1a1109f82bee4e03e Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Sat, 23 May 2015 13:46:48 -0700
Subject: [PATCH 0098/2322] emacs-packages: update swiper to 0.5.0

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 40bfb245f39..1f3386aa9cb 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1093,14 +1093,14 @@ let self = _self // overrides;
 
   swiper = melpaBuild rec {
     pname   = "swiper";
-    version = "0.4.0";
+    version = "0.5.0";
     src = fetchFromGitHub {
       owner  = "abo-abo";
       repo   = pname;
       rev    = version;
-      sha256 = "1skgw84j5a59ds86bpdcaf3c8iq2m0fz720chjh91ixhkavvdd87";
+      sha256 = "1a28vignwpcn62xk46w5p5wjfrbcmvs0gz1jgn4ba7ibmn4cmnnm";
     };
-    fileSpecs = [ "swiper.el" "ivy.el" "colir.el" ];
+    fileSpecs = [ "swiper.el" "ivy.el" "colir.el" "counsel.el" ];
     meta = { license = gpl3Plus; };
   };
 

From c95e489149897cb1c34fae3a6e5910519018a488 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Sat, 23 May 2015 13:48:54 -0700
Subject: [PATCH 0099/2322] fish: dont demand man-db on darwin since we cant
 build it

---
 pkgs/shells/fish/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index d7d69c00c5f..119a3593cec 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
 
   # Required binaries during execution
   # Python: Autocompletion generated from manpages and config editing
-  propagatedBuildInputs = [ python which groff gettext man_db bc ];
+  propagatedBuildInputs = [ python which groff gettext ]
+                          ++ stdenv.lib.optional (!stdenv.isDarwin) man_db
+                          ++ [ bc ];
 
   postInstall = ''
     sed -i "s|bc|${bc}/bin/bc|" "$out/share/fish/functions/seq.fish"
@@ -22,7 +24,9 @@ stdenv.mkDerivation rec {
     sed -e "s|gettext |${gettext}/bin/gettext |" \
         -e "s|which |${which}/bin/which |" \
         -i "$out/share/fish/functions/_.fish"
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py"
+  '' + ''
     sed -i "s|/sbin /usr/sbin||" \
            "$out/share/fish/functions/__fish_complete_subcommand_root.fish"
   '';

From 7d2ce8e70753118878c0b88d6587c9d4eec0a805 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 May 2015 23:03:38 +0200
Subject: [PATCH 0100/2322] qfsm: update to version 0.54.0

---
 pkgs/applications/science/electronics/qfsm/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix
index 160c530e722..8b09b7dd37d 100644
--- a/pkgs/applications/science/electronics/qfsm/default.nix
+++ b/pkgs/applications/science/electronics/qfsm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qt4, cmake, graphviz, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "qfsm-0.53.0";
+  name = "qfsm-0.54.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/qfsm/${name}-Source.tar.bz2";
-    sha256 = "1fx99dyai8zhs8s6mbr1i1467mnv1pf0ymh6mr0jm68mzj2jyzx4";
+    sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb";
   };
 
   buildInputs = [ qt4 cmake graphviz pkgconfig ];
@@ -18,6 +18,5 @@ stdenv.mkDerivation rec {
     description = "Graphical editor for finite state machines";
     homepage = "http://qfsm.sourceforge.net/";
     license = stdenv.lib.licenses.gpl3Plus;
-    broken = true;
   };
 }

From 85276267789f35ede13152ad8e598a2d0199594d Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 23 May 2015 23:59:13 +0200
Subject: [PATCH 0101/2322] fix build ir.lv2: add fftw

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

diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix
index 2b808c3b015..804d6e7d4e4 100644
--- a/pkgs/applications/audio/ir.lv2/default.nix
+++ b/pkgs/applications/audio/ir.lv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }:
+{ stdenv, fetchurl, fftw, gtk, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }:
 
 stdenv.mkDerivation rec {
   name = "ir.lv2-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "17a6h2mv9xv41jpbx6bdakkngin4kqzh2v67l4076ddq609k5a7v";
   };
 
-  buildInputs = [ gtk lv2 libsamplerate libsndfile pkgconfig zita-convolver ];
+  buildInputs = [ fftw gtk lv2 libsamplerate libsndfile pkgconfig zita-convolver ];
 
   buildPhase = ''
     make

From b2de6ccc8ed72194d1999e21eea7e7bfde77d396 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Sat, 23 May 2015 16:23:24 -0700
Subject: [PATCH 0102/2322] Update prometheus and its various helper packages

Updates to:

 - prometheus
 - prometheus-alertmanager
 - prometheus-cli
 - prometheus-mesos-exporter
 - prometheus-node-exporter
 - prometheus-pushgateway
 - prometheus-statsd-bridge
---
 .../prometheus/alertmanager/default.nix        | 14 ++++++--------
 .../monitoring/prometheus/cli/default.nix      |  8 +++++---
 pkgs/servers/monitoring/prometheus/default.nix | 18 ++++++++++--------
 .../prometheus/mesos_exporter/default.nix      |  6 +++---
 .../prometheus/node_exporter/default.nix       |  7 ++++---
 .../prometheus/pushgateway/default.nix         | 12 ++++--------
 .../prometheus/statsd_bridge/default.nix       | 10 +++++-----
 pkgs/top-level/go-packages.nix                 | 14 ++++++++++++++
 8 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
index 06dfc1ef1c9..56fcee76278 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
@@ -1,23 +1,21 @@
 { stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }:
 
-with goPackages;
-
-buildGoPackage rec {
+goPackages.buildGoPackage rec {
   name = "prometheus-alertmanager-${version}";
-  version = "0.1.0";
+  version = "0.0.1";
   goPackagePath = "github.com/prometheus/alertmanager";
 
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "alertmanager";
-    rev = "942cd35dea6dc406b106d7a57ffe7adbb3b978a5";
-    sha256 = "1c14vgn9s0dn322ss8fs5b47blw1g8cxy9w4yjn0f7x2sdwplx1i";
+    rev = "2b6c5caf89a492b013204e8d7db99fbb78c5dcd4";
+    sha256 = "13rdqnvmx11ks305dlnzv9gwf8c4zjyi5fkwcd69xgjfars2m4f3";
   };
 
   buildInputs = [
     goPackages.glog
     goPackages.protobuf
-    goPackages.fsnotify.v1
+    goPackages.fsnotify.v0
     goPackages.httprouter
     goPackages.prometheus.client_golang
     goPackages.pushover
@@ -31,7 +29,7 @@ buildGoPackage rec {
         -X main.buildBranch master
         -X main.buildUser nix@nixpkgs
         -X main.buildDate 20150101-00:00:00
-        -X main.goVersion ${lib.getVersion go}
+        -X main.goVersion ${lib.getVersion goPackages.go}
   '';
 
   preBuild = ''
diff --git a/pkgs/servers/monitoring/prometheus/cli/default.nix b/pkgs/servers/monitoring/prometheus/cli/default.nix
index f1f5ef9975c..701ee46d498 100644
--- a/pkgs/servers/monitoring/prometheus/cli/default.nix
+++ b/pkgs/servers/monitoring/prometheus/cli/default.nix
@@ -1,13 +1,15 @@
 { stdenv, lib, goPackages, fetchFromGitHub }:
 
 goPackages.buildGoPackage rec {
-  name = "prometheus-cli-0.2.0";
+  name = "prometheus-cli-${rev}";
+  rev = "0.3.0";
   goPackagePath = "github.com/prometheus/prometheus_cli";
+
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "prometheus_cli";
-    rev = "b36c21d2301cf686bff81953573a29a6d5a0a883";
-    sha256 = "190dlc6fyrfgxab4xj3gaz4jwx33jhzg57d8h36xjx56gbvp7iyk";
+    inherit rev;
+    sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn";
   };
 
   buildInputs = [
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 6e181c6ec9e..8180d24aa9e 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,23 +1,25 @@
 { stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }:
 
-with goPackages;
-
-buildGoPackage rec {
+goPackages.buildGoPackage rec {
    name = "prometheus-${version}";
-   version = "0.12.0";
+   version = "0.13.4";
    goPackagePath = "github.com/prometheus/prometheus";
-   rev = "55dcb55498b43bafe94915a4de7907d6d66b4427";
+   rev = "612da96c46f0b7ea6cc28a3fc614f14eae0189d0";
 
    src = fetchFromGitHub {
      inherit rev;
      owner = "prometheus";
      repo = "prometheus";
-     sha256 = "17bbdk9axr91m2947ddbnzqwaap2vrzsbknbrlpdsmlsjhc8h7cb";
+     sha256 = "1r3pcnxs1cdh18lmqd60r3nh614cw543wzd4slkr2nzr73pn5x4j";
    };
 
    buildInputs = [
-     dns glog goleveldb prometheus.client_golang
+     goPackages.dns
+     goPackages.glog
      goPackages.protobuf
+     goPackages.goleveldb
+     goPackages.net
+     goPackages.prometheus.client_golang
      protobuf  # the non-golang package, for protoc
      vim  # for xxd, used in embed-static.sh
    ];
@@ -30,7 +32,7 @@ buildGoPackage rec {
          -X main.buildBranch master
          -X main.buildUser nix@nixpkgs
          -X main.buildDate 20150101-00:00:00
-         -X main.goVersion ${lib.getVersion go}
+         -X main.goVersion ${lib.getVersion goPackages.go}
    '';
 
    preBuild = ''
diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
index e816f346e53..5a62a46823b 100644
--- a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
@@ -1,15 +1,15 @@
 { stdenv, lib, goPackages, fetchFromGitHub }:
 
 goPackages.buildGoPackage rec {
-  name = "prometheus-mesos-exporter-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "a4a6638d6db6b5137e130cd4903b30dd82b78e9a";
+  name = "prometheus-mesos-exporter-${rev}";
+  rev = "0.1.0";
   goPackagePath = "github.com/prometheus/mesos_exporter";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "prometheus";
     repo = "mesos_exporter";
-    sha256 = "1h4yxfcr8l9i2m1s5ygk3slhxdrs4mvmpn3sq8m5s205abvp891q";
+    sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm";
   };
 
   buildInputs = [ goPackages.mesos-stats ];
diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
index 97169a0e298..c60985d3aa7 100644
--- a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
@@ -3,14 +3,15 @@
 with goPackages;
 
 buildGoPackage rec {
-  name = "prometheus-node-exporter-0.8.0";
+  name = "prometheus-node-exporter-${rev}";
+  rev = "0.8.1";
   goPackagePath = "github.com/prometheus/node_exporter";
 
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "node_exporter";
-    rev = "aaf01e52e25883671fd67234b415df7abd0e4eac";
-    sha256 = "0j1qvgsc2hcv50l9lyfivkzsyjkjp3w1yyqvd1gzfybk7hi59dya";
+    inherit rev;
+    sha256 = "15vp88w0b7h6sryy61qk369yjr3p4qvpch1nbxd9rm51bdgsqyys";
   };
 
   buildInputs = [
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
index c16cb7a9408..ae1e1e38902 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
@@ -3,16 +3,15 @@
 with goPackages;
 
 buildGoPackage rec {
-  name = "prometheus-pushgateway-${version}";
-  version = "0.1.0";
+  name = "prometheus-pushgateway-${rev}";
+  rev = "0.1.1";
   goPackagePath = "github.com/prometheus/pushgateway";
-  rev = "3f1d42dade342ddb88381607358bae61a0a6b6c7";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "prometheus";
     repo = "pushgateway";
-    sha256 = "1wqxbl9rlnxszp9ylvdbx6f5lyj2z0if3x099fnjahbqmz8yhnf4";
+    sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230";
   };
 
   buildInputs = [
@@ -25,7 +24,7 @@ buildGoPackage rec {
 
   buildFlagsArray = ''
     -ldflags=
-        -X main.buildVersion ${version}
+        -X main.buildVersion ${rev}
         -X main.buildRev ${rev}
         -X main.buildBranch master
         -X main.buildUser nix@nixpkgs
@@ -37,9 +36,6 @@ buildGoPackage rec {
   (
     cd "go/src/$goPackagePath"
     go-bindata ./resources/
-    ${govers}/bin/govers -d -m github.com/matttproud/golang_protobuf_extensions/ext github.com/matttproud/golang_protobuf_extensions/pbutil
-    substituteInPlace handler/push.go \
-      --replace ext.ReadDelimited pbutil.ReadDelimited
   )
   '';
 
diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
index b6548b90f29..31acf79c813 100644
--- a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
@@ -1,19 +1,19 @@
 { stdenv, lib, goPackages, fetchFromGitHub }:
 
 goPackages.buildGoPackage rec {
-  name = "prometheus-statsd-bridge-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "9715b183150c7bed8a10affb23d33fb55c597180";
+  name = "prometheus-statsd-bridge-${version}";
+  version = "0.1.0";
   goPackagePath = "github.com/prometheus/statsd_bridge";
 
   src = fetchFromGitHub {
-    inherit rev;
+    rev = version;
     owner = "prometheus";
     repo = "statsd_bridge";
-    sha256 = "119024xb08qjwbhplpl5d94bjdfhn92w4ffn4kxr7aviri1gynfz";
+    sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr";
   };
 
   buildInputs = with goPackages; [
-    fsnotify.v1
+    fsnotify.v0
     prometheus.client_golang
   ];
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index c4fc9065698..a205cb7f8fb 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -598,6 +598,20 @@ let
     };
   };
 
+  fsnotify.v0 = buildGoPackage rec {
+    rev = "v0.9.3";
+    name = "fsnotify.v0-${rev}";
+    goPackagePath = "gopkg.in/fsnotify.v0";
+    goPackageAliases = [ "github.com/howeyc/fsnotify" ];
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "go-fsnotify";
+      repo = "fsnotify";
+      sha256 = "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9";
+    };
+  };
+
   fsnotify.v1 = buildGoPackage rec {
     rev = "v1.2.0";
     name = "fsnotify.v1-${rev}";

From 34ad0a304a12062642a58eb3a49a1b8358c15367 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Sat, 23 May 2015 17:51:00 -0700
Subject: [PATCH 0103/2322] riemann: update to 0.2.9

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

diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix
index f8cd73605ca..132275a56e0 100644
--- a/pkgs/servers/monitoring/riemann/default.nix
+++ b/pkgs/servers/monitoring/riemann/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "riemann-${version}";
-  version = "0.2.8";
+  version = "0.2.9";
 
   src = fetchurl {
     url = "http://aphyr.com/riemann/${name}.tar.bz2";
-    sha256 = "1p2pdkxy2xc5zlj6kadf4z8l0f0r4bvdgipqf52193l7rdm6dfzm";
+    sha256 = "10zz92sg9ak8g7xsfc05p4kic6hzwj7nqpkjgsd8f7f3slvfjqw3";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

From f9963065278719422475c6c38ea761c2f7ec5c2b Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Sat, 23 May 2015 18:01:51 -0700
Subject: [PATCH 0104/2322] riemann-c-client: update to 1.7.0

---
 pkgs/tools/misc/riemann-c-client/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix
index efdc21ad9b7..5dde592aade 100644
--- a/pkgs/tools/misc/riemann-c-client/default.nix
+++ b/pkgs/tools/misc/riemann-c-client/default.nix
@@ -1,13 +1,16 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, protobufc }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, file
+, protobufc }:
 
 stdenv.mkDerivation rec {
   name = "riemann-c-client-${version}";
 
-  version = "1.2.1";
+  version = "1.7.0";
 
-  src = fetchurl {
-    url = "https://github.com/algernon/riemann-c-client/archive/${name}.tar.gz";
-    sha256 = "132yd1m523inmv17sd48xf7xdqb7jj36v7is1xw7w9nny6qxkzwm";
+  src = fetchFromGitHub {
+    owner = "algernon";
+    repo = "riemann-c-client";
+    rev = "54f4a656793d6c5ca0bf1ff2388693fb6b2b82a7";
+    sha256 = "0jc2bbw7sp2gr4cswx78srs0p1kp81prcarq4ivqpfw4bmzg6xg4";
   };
 
   buildInputs = [ autoconf automake libtool pkgconfig file protobufc ];
@@ -15,7 +18,7 @@ stdenv.mkDerivation rec {
   preConfigure = "autoreconf -i";
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/algernon/riemann-c-client";
+    homepage = https://github.com/algernon/riemann-c-client;
     description = "A C client library for the Riemann monitoring system";
     license = licenses.gpl3;
     maintainers = [ maintainers.rickynils ];

From ec027fbb424f3dc258853ea9110c84b427cf075e Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Sat, 23 May 2015 18:14:56 -0700
Subject: [PATCH 0105/2322] riemann-dash: update to 0.2.11

---
 pkgs/servers/monitoring/riemann-dash/Gemfile  |  2 +-
 .../monitoring/riemann-dash/Gemfile.lock      | 14 +++----
 .../monitoring/riemann-dash/gemset.nix        | 40 +++++++++----------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile b/pkgs/servers/monitoring/riemann-dash/Gemfile
index 496302e7643..6b770b70818 100644
--- a/pkgs/servers/monitoring/riemann-dash/Gemfile
+++ b/pkgs/servers/monitoring/riemann-dash/Gemfile
@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem "riemann-dash", "0.2.9"
+gem "riemann-dash", "0.2.11"
diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock
index cd0ace470e2..a5445b953c4 100644
--- a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock
+++ b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock
@@ -3,25 +3,25 @@ GEM
   specs:
     erubis (2.7.0)
     multi_json (1.3.6)
-    rack (1.5.2)
+    rack (1.6.1)
     rack-protection (1.5.3)
       rack
-    riemann-dash (0.2.9)
+    riemann-dash (0.2.11)
       erubis (>= 2.7.0)
       multi_json (= 1.3.6)
       sass (>= 3.1.14)
       sinatra (~> 1.4.5)
       webrick (~> 1.3.1)
-    sass (3.4.8)
-    sinatra (1.4.5)
+    sass (3.4.14)
+    sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    tilt (1.4.1)
+      tilt (>= 1.3, < 3)
+    tilt (2.0.1)
     webrick (1.3.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  riemann-dash (= 0.2.9)
+  riemann-dash (= 0.2.11)
diff --git a/pkgs/servers/monitoring/riemann-dash/gemset.nix b/pkgs/servers/monitoring/riemann-dash/gemset.nix
index f2e80e9aca4..b98fd452f1a 100644
--- a/pkgs/servers/monitoring/riemann-dash/gemset.nix
+++ b/pkgs/servers/monitoring/riemann-dash/gemset.nix
@@ -1,26 +1,26 @@
 {
-  erubis = {
+  "erubis" = {
     version = "2.7.0";
     source = {
       type = "gem";
       sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
     };
   };
-  multi_json = {
+  "multi_json" = {
     version = "1.3.6";
     source = {
       type = "gem";
       sha256 = "0q2zjfvd2ibds9g9nzf2p1b47fc1wqliwfywv5pw85w15lmy91yr";
     };
   };
-  rack = {
-    version = "1.5.2";
+  "rack" = {
+    version = "1.6.1";
     source = {
       type = "gem";
-      sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6";
+      sha256 = "0f73v6phkwczl1sfv0wgdwsnlsg364bhialbnfkg2dnxhh57l0gl";
     };
   };
-  rack-protection = {
+  "rack-protection" = {
     version = "1.5.3";
     source = {
       type = "gem";
@@ -30,11 +30,11 @@
       "rack"
     ];
   };
-  riemann-dash = {
-    version = "0.2.9";
+  "riemann-dash" = {
+    version = "0.2.11";
     source = {
       type = "gem";
-      sha256 = "0ws5wmjbv8w9lcr3i2mdinj2qm91p6c85k6c067i67cf0p90jxq3";
+      sha256 = "1vzb75hf1xy7ssil7fp9z7z51vh79ba22x56ific7f1kcb21lzk7";
     };
     dependencies = [
       "erubis"
@@ -44,18 +44,18 @@
       "webrick"
     ];
   };
-  sass = {
-    version = "3.4.8";
+  "sass" = {
+    version = "3.4.14";
     source = {
       type = "gem";
-      sha256 = "1ianyj2figwk314h10fkzpjql2xxi5l4njv1h0w8iyzjda85rqlp";
+      sha256 = "0x2mg6pid87s4ddvv6xnxfzwgy72pjmkm461pav92ngqnngx2ggk";
     };
   };
-  sinatra = {
-    version = "1.4.5";
+  "sinatra" = {
+    version = "1.4.6";
     source = {
       type = "gem";
-      sha256 = "0qyna3wzlnvsz69d21lxcm3ixq7db08mi08l0a88011qi4qq701s";
+      sha256 = "1hhmwqc81ram7lfwwziv0z70jh92sj1m7h7s9fr0cn2xq8mmn8l7";
     };
     dependencies = [
       "rack"
@@ -63,18 +63,18 @@
       "tilt"
     ];
   };
-  tilt = {
-    version = "1.4.1";
+  "tilt" = {
+    version = "2.0.1";
     source = {
       type = "gem";
-      sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir";
+      sha256 = "1qc1k2r6whnb006m10751dyz3168cq72vj8mgp5m2hpys8n6xp3k";
     };
   };
-  webrick = {
+  "webrick" = {
     version = "1.3.1";
     source = {
       type = "gem";
       sha256 = "0s42mxihcl2bx0h9q0v2syl70qndydfkl39a06h9il17p895ya8g";
     };
   };
-}
+}
\ No newline at end of file

From 50cb206cd5401710b7479b32d8849cb0c523dc54 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Sat, 23 May 2015 18:28:03 -0700
Subject: [PATCH 0106/2322] awscli: update to 1.7.29

Includes updates to bcdoc and botocore.
---
 pkgs/tools/admin/awscli/default.nix |  4 ++--
 pkgs/top-level/python-packages.nix  | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index d924ae0b7d5..c846de70852 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -2,12 +2,12 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "awscli-${version}";
-  version = "1.7.21";
+  version = "1.7.29";
   namePrefix = "";
 
   src = fetchzip {
     url = "https://github.com/aws/aws-cli/archive/${version}.tar.gz";
-    sha256 = "1hm2m5ycsyn4lap8549d6glryp9b9mvar9xwbpmpdcf698lcxzsj";
+    sha256 = "0r0w5qldimdp2d2ykw7pmppn8chbhh6cm48famhldqnyrh3vrf02";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b4504ce8cc6..4aaded395e3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -837,14 +837,14 @@ let
   };
 
   bcdoc = buildPythonPackage rec {
-    name = "bcdoc-0.13.0";
+    name = "bcdoc-0.14.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/b/bcdoc/bcdoc-0.13.0.tar.gz";
-      md5 = "819882458be7b642e00ddc9846073d89";
+      url = "https://pypi.python.org/packages/source/b/bcdoc/${name}.tar.gz";
+      sha256 = "1s2kdqs1n2mj7wq3w0pq30zs7vxq0l3abik2clqnc4hm2j7crbk8";
     };
 
-    buildInputs = with self; [ self.docutils self.six ];
+    buildInputs = with self; [ docutils six ];
 
     meta = {
       homepage = https://github.com/botocore/bcdoc;
@@ -1331,12 +1331,12 @@ let
   };
 
   botocore = buildPythonPackage rec {
-    version = "0.102.0";
+    version = "1.0.0a1";
     name = "botocore-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz";
-      sha256 = "1266hwkcchzr9r2z1q1150zmk20p3d4a75p6nppi6w9bhsywxhnr";
+      sha256 = "0fybr48l0fvpc57n71khynpb4j0ibzn35bzybw6g1q9063xfwnxm";
     };
 
     propagatedBuildInputs =
@@ -6399,17 +6399,17 @@ let
 
 
   jmespath = buildPythonPackage rec {
-    name = "jmespath-0.6.1";
+    name = "jmespath-0.7.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/j/jmespath/${name}.tar.gz";
-      sha256 = "1f7nxk62yifh6zwhf34w4fgwxvyls8x2daphljgrg4lh0i2sgwgr";
+      sha256 = "1lazbx65imassd7h24z49za001rvx1lmx8r0l21h4izs7pp14nnd";
     };
 
     propagatedBuildInputs = with self; [ ply ];
 
     meta = {
-      homepage = "https://github.com/boto/jmespath";
+      homepage = https://github.com/boto/jmespath;
       description = "JMESPath allows you to declaratively specify how to extract elements from a JSON document";
       license = "BSD";
     };

From c078890a1962831955a3814ee70b795bf2e40f06 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 13:49:45 -0700
Subject: [PATCH 0107/2322] postgres: Cleanup meta

---
 pkgs/servers/sql/postgresql/8.4.x.nix |  9 +++++----
 pkgs/servers/sql/postgresql/9.0.x.nix |  9 +++++----
 pkgs/servers/sql/postgresql/9.1.x.nix |  9 +++++----
 pkgs/servers/sql/postgresql/9.2.x.nix |  9 +++++----
 pkgs/servers/sql/postgresql/9.3.x.nix |  9 +++++----
 pkgs/servers/sql/postgresql/9.4.x.nix | 11 ++++++-----
 6 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index d77a539cb5d..4c72dbfd448 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -20,11 +20,12 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit readline; };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
-    license = stdenv.lib.licenses.postgresql;
-    maintainers = [ stdenv.lib.maintainers.ocharles ];
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    license = licenses.postgresql;
+    maintainers = with maintaiers; [ ocharles ];
+    platforms = platforms.unix;
+    hydraPlatforms = platforms.linux;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index 340307c01f9..a27bc012b6e 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -23,11 +23,12 @@ stdenv.mkDerivation rec {
     psqlSchema = "9.0";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
-    license = stdenv.lib.licenses.postgresql;
-    maintainers = [ stdenv.lib.maintainers.ocharles ];
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    license = licenses.postgresql;
+    maintainers = with maintaiers; [ ocharles ];
+    platforms = platforms.unix;
+    hydraPlatforms = platforms.linux;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 5b0774d6229..87ed9abe690 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -31,11 +31,12 @@ stdenv.mkDerivation rec {
     psqlSchema = "9.1";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
-    license = stdenv.lib.licenses.postgresql;
-    maintainers = [ stdenv.lib.maintainers.ocharles ];
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    license = licenses.postgresql;
+    maintainers = with maintaiers; [ ocharles ];
+    platforms = platforms.unix;
+    hydraPlatforms = platforms.linux;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index d09cde5b995..3c21a96e9b2 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -29,11 +29,12 @@ stdenv.mkDerivation rec {
     psqlSchema = "9.2";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
-    license = stdenv.lib.licenses.postgresql;
-    maintainers = [ stdenv.lib.maintainers.ocharles ];
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    license = licenses.postgresql;
+    maintainers = with maintaiers; [ ocharles ];
+    platforms = platforms.unix;
+    hydraPlatforms = platforms.linux;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
index 6467ce80af1..4406aecaa89 100644
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -33,11 +33,12 @@ stdenv.mkDerivation rec {
     psqlSchema = "9.3";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
-    license = stdenv.lib.licenses.postgresql;
-    maintainers = [ stdenv.lib.maintainers.ocharles ];
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    license = licenses.postgresql;
+    maintainers = with maintaiers; [ ocharles ];
+    platforms = platforms.unix;
+    hydraPlatforms = platforms.linux;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix
index 6649975d790..73f416912a2 100644
--- a/pkgs/servers/sql/postgresql/9.4.x.nix
+++ b/pkgs/servers/sql/postgresql/9.4.x.nix
@@ -33,11 +33,12 @@ stdenv.mkDerivation rec {
     psqlSchema = "9.4";
   };
 
-  meta = {
-    homepage = http://www.postgresql.org/ ;
+  meta = with stdenv.lib; {
+    homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
-    license = stdenv.lib.licenses.postgresql;
-    maintainers = with stdenv.lib.maintainers; [ aristid ocharles ];
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    license = licenses.postgresql;
+    maintainers = with maintaiers; [ ocharles ];
+    platforms = platforms.unix;
+    hydraPlatforms = platforms.linux;
   };
 }

From 3f4f90b58ba4d09352111c98a3e99019673ff64f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 16:00:02 -0700
Subject: [PATCH 0108/2322] e2fsprogs: 1.14.12 -> 1.14.13

---
 pkgs/tools/filesystems/e2fsprogs/default.nix | 66 +++++++++++++++-----
 1 file changed, 49 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 7617e82f1a8..c4b44b824f0 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,34 +1,66 @@
-{ stdenv, fetchurl, pkgconfig, libuuid }:
+{ stdenv, fetchurl, pkgconfig
 
+# Optional Dependencies
+, libuuid
+}:
+
+with stdenv;
+let
+  optLibuuid = shouldUsePkg libuuid;
+in
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "e2fsprogs-1.42.12";
+  name = "e2fsprogs-1.42.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
-    sha256 = "0v0qcfyls0dlrjy8gx9m3s2wbkp5z3lbsr5hb7x8kp8f3bclcy71";
+    sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar";
   };
 
-  buildInputs = [ pkgconfig libuuid ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ optLibuuid ];
 
-  crossAttrs = {
-    preConfigure = ''
-      export CC=$crossConfig-gcc
-    '';
-  };
-
-  # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency).
-  configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck --enable-symlink-install";
+  configureFlags = [
+    (mkEnable true                 "symlink-install"           null)
+    (mkEnable true                 "relative-symlinks"         null)
+    (mkEnable true                 "symlink-relative-symlinks" null)
+    (mkEnable false                "compression"               null)
+    (mkEnable true                 "htree"                     null)
+    (mkEnable true                 "elf-shlibs"                null)
+    (mkEnable false                "profile"                   null)
+    (mkEnable false                "gcov"                      null)
+    (mkEnable false                "jbd-debug"                 null)
+    (mkEnable false                "blkid-debug"               null)
+    (mkEnable false                "testio-debug"              null)
+    (mkEnable (optLibuuid == null) "libuuid"                   null)
+    (mkEnable (optLibuuid == null) "libblkid"                  null)
+    (mkEnable true                 "quota"                     null)
+    (mkEnable false                "backtrace"                 null)
+    (mkEnable false                "debugfs"                   null)
+    (mkEnable true                 "imager"                    null)
+    (mkEnable true                 "resizer"                   null)
+    (mkEnable true                 "defrag"                    null)
+    (mkEnable true                 "fsck"                      null)
+    (mkEnable false                "e2initrd-helper"           null)
+    (mkEnable true                 "tls"                       null)
+    (mkEnable false                 "uuidd"                    null)  # Build is broken in 1.42.13
+  ];
 
   enableParallelBuilding = true;
 
-  preInstall = "installFlagsArray=('LN=ln -s')";
+  installFlags = [
+    "LN=ln -s"
+  ];
 
-  postInstall = "make install-libs";
+  postInstall = ''
+    make install-libs
+  '';
 
-  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 = with maintainers; [ eelco wkennington ];
   };
 }

From d5ca9c017cc7cce7be49b24a63e18ad7d4b01dca Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 16:06:17 -0700
Subject: [PATCH 0109/2322] idnkit: Add derivation

---
 pkgs/development/libraries/idnkit/default.nix | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/idnkit/default.nix

diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix
new file mode 100644
index 00000000000..25c8d7e561b
--- /dev/null
+++ b/pkgs/development/libraries/idnkit/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, libiconv }:
+
+stdenv.mkDerivation rec {
+  name = "idnkit-1.0";
+
+  src = fetchurl {
+    url = "http://www.nic.ad.jp/ja/idn/idnkit/download/sources/${name}-src.tar.gz";
+    sha256 = "1z4i6fmyv67sflmjg763ymcxrcv84rbj1kv15im0s655h775zk8n";
+  };
+
+  buildInputs = [ libiconv ];
+
+  meta = with stdenv.lib; {
+    homepage = https://www.nic.ad.jp/ja/idn/idnkit;
+    description = "provides functionalities about i18n domain name processing";
+    license = "idnkit-2 license";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b43fb9c7896..88a9cca6302 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6782,6 +6782,8 @@ let
 
   libidn = callPackage ../development/libraries/libidn { };
 
+  idnkit = callPackage ../development/libraries/idnkit { };
+
   libiec61883 = callPackage ../development/libraries/libiec61883 { };
 
   libinfinity = callPackage ../development/libraries/libinfinity {

From 0a06b99d69000e5da2b6dc33abf91ab73961f1cf Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 16:43:27 -0700
Subject: [PATCH 0110/2322] bind: Modify build

---
 pkgs/servers/dns/bind/default.nix | 118 +++++++++++++++++++++++++-----
 1 file changed, 98 insertions(+), 20 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index fbfa2d8d9b7..b60998ce6aa 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,7 +1,37 @@
-{ stdenv, fetchurl, openssl, libtool, perl, libxml2 }:
+{ stdenv, fetchurl, libtool, docbook5_xsl
 
-let version = "9.10.2"; in
+# Optional Dependencies
+, libseccomp ? null, python ? null, kerberos ? null, openssl ? null
+, libxml2 ? null, json_c ? null, readline ? null, libcap ? null, idnkit ? null
+, libiconv ? null
 
+# Optional DLZ Modules
+, postgresql ? null, libmysql ? null, db ? null, openldap ? null
+}:
+
+assert postgresql != null;
+with stdenv;
+let
+  version = "9.10.2";
+
+  optLibseccomp = shouldUsePkg libseccomp;
+  optPython = shouldUsePkg python;
+  optKerberos = shouldUsePkg kerberos;
+  optOpenssl = shouldUsePkg openssl;
+  optLibxml2 = shouldUsePkg libxml2;
+  optJson_c = shouldUsePkg json_c;
+  optReadline = shouldUsePkg readline;
+  optLibcap = if !stdenv.isLinux then null else shouldUsePkg libcap;
+  optIdnkit = shouldUsePkg idnkit;
+  optLibiconv = shouldUsePkg libiconv;
+
+  optPostgresql = shouldUsePkg postgresql;
+  optLibmysql = shouldUsePkg libmysql;
+  optDb = shouldUsePkg db;
+  optOpenldap = shouldUsePkg openldap;
+in
+assert optPostgresql != null;
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
@@ -14,30 +44,78 @@ stdenv.mkDerivation rec {
     sed -i 's/^\t.*run/\t/' Makefile.in
   '';
 
-  buildInputs = [ openssl libtool perl libxml2 ];
+  nativeBuildInputs = [ optPython libtool docbook5_xsl ];
+  buildInputs = [
+    optLibseccomp optPython optKerberos optOpenssl optLibxml2 optJson_c
+    optReadline optLibcap optIdnkit optLibiconv optPostgresql optLibmysql
+    optDb optOpenldap
+  ];
 
   configureFlags = [
-    "--localstatedir=/var"
-    "--with-libtool"
-    "--with-libxml2=${libxml2}"
-    "--with-openssl=${openssl}"
-    "--without-atf"
-    "--without-dlopen"
-    "--without-docbook-xsl"
-    "--without-gssapi"
-    "--without-idn"
-    "--without-idnlib"
-    "--without-pkcs11"
-    "--without-purify"
-    "--without-python"
+    (mkOther                          "localstatedir"       "/var")
+    (mkOther                          "sysconfdir"          "/etc")
+    (mkEnable (optLibseccomp != null) "seccomp"             null)
+    (mkWith   (optPython != null)     "python"              "${optPython}/bin/python")
+    (mkEnable true                    "kqueue"              null)
+    (mkEnable true                    "epoll"               null)
+    (mkEnable true                    "devpoll"             null)
+    (mkWith   false                   "geoip"               null)  # TODO(wkennington): GeoDNS support
+    (mkWith   (optKerberos != null)   "gssapi"              optKerberos)
+    (mkWith   true                    "libtool"             null)
+    (mkEnable (optOpenssl == null)    "native-pkcs11"       null)
+    (mkWith   (optOpenssl != null)    "openssl"             optOpenssl)
+    (mkWith   true                    "pkcs11"              null)
+    (mkWith   true                    "ecdsa"               null)
+    (mkWith   false                   "gost"                null)  # Insecure cipher
+    (mkWith   true                    "aes"                 null)
+    (mkEnable (optOpenssl != null)    "openssl-hash"        null)
+    (mkEnable true                    "sit"                 null)
+    (mkWith   true                    "sit-alg"             "aes")
+    (mkWith   (optLibxml2 != null)    "libxml2"             optLibxml2)
+    (mkWith   (optJson_c != null)     "libjson"             optJson_c)
+    (mkEnable true                    "largefile"           null)
+    (mkWith   false                   "purify"              null)
+    (mkWith   false                   "gperftools-profiler" null)
+    (mkEnable false                   "backtrace"           null)
+    (mkEnable false                   "symtable"            null)
+    (mkEnable true                    "ipv6"                null)
+    (mkWith   false                   "kame"                null)
+    (mkWith   (optReadline != null)   "readline"            null)
+    (mkEnable (optKerberos == null)   "isc-spnego"          null)
+    (mkEnable true                    "chroot"              null)
+    (mkEnable (optLibcap != null)     "linux-caps"          null)
+    (mkEnable true                    "atomic"              null)
+    (mkEnable false                   "fixed-rrset"         null)
+    (mkEnable true                    "rpz-nsip"            null)
+    (mkEnable true                    "rpz-nsdname"         null)
+    (mkEnable true                    "filter-aaaa"         null)
+    (mkWith   true                    "docbook-xsl"         "${docbook5_xsl}/share/xsl/docbook")
+    (mkWith   (optIdnkit != null)     "idn"                 optIdnkit)
+    (mkWith   (optLibiconv != null)   "libiconv"            optLibiconv)
+    (mkWith   false                   "atf"                 null)
+    (mkWith   true                    "tuning"              "large")
+    (mkWith   true                    "dlopen"              null)
+    (mkWith   false                   "make-clean"          null)
+    (mkEnable true                    "full-report"         null)
+    (mkWith   (optPostgresql != null) "dlz-postgres"        optPostgresql)
+    (mkWith   (optLibmysql != null)   "dlz-mysql"           optLibmysql)
+    (mkWith   (optDb != null)         "dlz-bdb"             optDb)
+    (mkWith   true                    "dlz-filesystem"      null)
+    (mkWith   (optOpenldap != null)   "dlz-ldap"            optOpenldap)
+    (mkWith   false                   "dlz-odbc"            null)
+    (mkWith   true                    "dlz-stub"            null)
+  ];
+
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+    "localstatedir=\${TMPDIR}"
   ];
 
   meta = {
     homepage = "http://www.isc.org/software/bind";
     description = "Domain name server";
-    license = stdenv.lib.licenses.isc;
-
-    maintainers = with stdenv.lib.maintainers; [viric simons];
-    platforms = with stdenv.lib.platforms; unix;
+    license = licenses.isc;
+    maintainers = with maintainers; [ viric simons wkennington ];
+    platforms = platforms.unix;
   };
 }

From 9c6d4533d04e4cf4995e7be9ecc513519f31bc86 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 18:32:53 -0700
Subject: [PATCH 0111/2322] mariadb: 10.0.18 -> 10.0.19

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

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index fe7c70ced2d..21ccd50e3ef 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "mariadb-${version}";
-  version = "10.0.18";
+  version = "10.0.19";
 
   src = fetchurl {
     url    = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz";
-    sha256 = "1xcs391cm0vnl9bvx1470v8z4d77zqv16n6iaqi12jm0ma8fwvv8";
+    sha256 = "0cm1j4805ypbmrhajn4ar5rqsis1p5haxs7c04b6k540gmfmxgrg";
   };
 
   buildInputs = [ cmake ncurses openssl zlib pcre libxml2 boost judy bison libevent ]

From 3ede091d56a6dead4e961cd9e2df8ac937ee856d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 18:33:09 -0700
Subject: [PATCH 0112/2322] ossp-uuid: Meta fixup

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

diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix
index 7f6335f6496..119f4111666 100644
--- a/pkgs/development/libraries/libossp-uuid/default.nix
+++ b/pkgs/development/libraries/libossp-uuid/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.ossp.org/pkg/lib/uuid/;
     description = "OSSP uuid ISO-C and C++ shared library";
     longDescription =
@@ -35,6 +35,7 @@ stdenv.mkDerivation {
         short lifetime and to reliably identifying very persistent
         objects across a network.
       '';
-    license = stdenv.lib.licenses.bsd2;
+    license = licenses.bsd2;
+    platforms = platforms.all;
   };
-}
\ No newline at end of file
+}

From 1bb67e514b2514b9267919784524821952cd73b3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 18:36:00 -0700
Subject: [PATCH 0113/2322] postgresql: Refactor 8.4 into generic

---
 pkgs/servers/sql/postgresql/8.4.x.nix   | 31 ++-------
 pkgs/servers/sql/postgresql/generic.nix | 92 +++++++++++++++++++++++++
 2 files changed, 97 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/servers/sql/postgresql/generic.nix

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index 4c72dbfd448..66933f2ad42 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -1,31 +1,10 @@
-{ stdenv, fetchurl, zlib, ncurses, readline, openssl }:
+{ callPackage, fetchurl, ... } @ args:
 
-let version = "8.4.22"; in
-
-stdenv.mkDerivation rec {
-  name = "postgresql-${version}";
+callPackage ./generic.nix (args // rec {
+  version = "8.4.22";
 
   src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+    url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw";
   };
-
-  buildInputs = [ zlib ncurses readline openssl ];
-
-  LC_ALL = "C";
-
-  configureFlags = [ "--with-openssl" ];
-
-  patches = [ ./less-is-more.patch ];
-
-  passthru = { inherit readline; };
-
-  meta = with stdenv.lib; {
-    homepage = http://www.postgresql.org/;
-    description = "A powerful, open source object-relational database system";
-    license = licenses.postgresql;
-    maintainers = with maintaiers; [ ocharles ];
-    platforms = platforms.unix;
-    hydraPlatforms = platforms.linux;
-  };
-}
+})
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
new file mode 100644
index 00000000000..d7fd28ccb68
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -0,0 +1,92 @@
+{ stdenv, bison, flex
+, gettext
+
+# Optional Dependencies
+, kerberos ? null, pam ? null, openldap ? null, openssl ? null, readline ? null
+, libossp_uuid ? null, libxml2 ? null, libxslt ? null, zlib ? null
+
+# Extra Arguments
+, blockSizeKB ? 8, segmentSizeGB ? 1
+, walBlockSizeKB ? 8, walSegmentSizeMB ? 16
+
+# Version specific arguments
+, version, src
+, ...
+}:
+
+with stdenv;
+let
+  optKerberos = shouldUsePkg kerberos;
+  optPam = shouldUsePkg pam;
+  optOpenldap = shouldUsePkg openldap;
+  optOpenssl = shouldUsePkg openssl;
+  optReadline = shouldUsePkg readline;
+  optLibossp_uuid = shouldUsePkg libossp_uuid;
+  optLibxml2 = shouldUsePkg libxml2;
+  optLibxslt = shouldUsePkg libxslt;
+  optZlib = shouldUsePkg zlib;
+in
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "postgresql-${version}";
+
+  inherit src;
+
+  patches = [ ./less-is-more.patch ];
+
+  nativeBuildInputs = [ bison flex ];
+  buildInputs = [
+    gettext optKerberos optPam optOpenldap optOpenssl optReadline
+    optLibossp_uuid optLibxml2 optLibxslt optZlib
+  ];
+
+  #LC_ALL = "C";
+
+  configureFlags = [
+    (mkOther                        "sysconfdir"        "/etc")
+    (mkOther                        "localstatedir"     "/var")
+    (mkEnable true                  "integer-datetimes" null)
+    (mkEnable true                  "nls"               null)
+    (mkWith   true                  "pgport"            "5432")
+    (mkEnable true                  "shared"            null)
+    (mkEnable true                  "rpath"             null)
+    (mkEnable true                  "spinlocks"         null)
+    (mkEnable false                 "debug"             null)
+    (mkEnable false                 "profiling"         null)
+    (mkEnable false                 "coverage"          null)
+    (mkEnable false                 "dtrace"            null)
+    (mkWith   true                  "blocksize"         (toString blockSizeKB))
+    (mkWith   true                  "segsize"           (toString segmentSizeGB))
+    (mkWith   true                  "wal-blocksize"     (toString walBlockSizeKB))
+    (mkWith   true                  "wal-segsize"       (toString walSegmentSizeMB))
+    (mkEnable true                  "autodepend"        null)
+    (mkEnable false                 "cassert"           null)
+    (mkEnable true                  "thread-safety"     null)
+    (mkWith   false                 "tcl"               null)  # Maybe enable some day
+    (mkWith   false                 "perl"              null)  # Maybe enable some day
+    (mkWith   false                 "python"            null)  # Maybe enable some day
+    (mkWith   (optKerberos != null) "gssapi"            null)
+    (mkWith   false                 "krb5"              null)
+    (mkWith   (optPam != null)      "pam"               null)
+    (mkWith   (optOpenldap != null) "ldap"              null)
+    (mkWith   false                 "bonjour"           null)
+    (mkWith   (optOpenssl != null)       "openssl"           null)
+    (mkWith   (optReadline != null)     "readline"          null)
+    (mkWith   false                     "libedit-preferred" null)
+    (mkWith   (optLibossp_uuid != null) "ossp-uuid"         null)
+    (mkWith   (optLibxml2 != null)      "libxml"            null)
+    (mkWith   (optLibxslt != null)      "libxslt"           null)
+    (mkWith   (optZlib != null)         "zlib"              null)
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.postgresql.org/;
+    description = "A powerful, open source object-relational database system";
+    license = licenses.postgresql;
+    maintainers = with maintaiers; [ ocharles ];
+    platforms = platforms.unix;
+    hydraPlatforms = platforms.linux;
+  };
+
+  passthru = { inherit readline; };
+}

From 8c99f2e3d65add9bca5df66f7f2f3014ea337c85 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 19:02:22 -0700
Subject: [PATCH 0114/2322] postgresql: 9.0.19 -> 9.0.20

---
 pkgs/servers/sql/postgresql/9.0.x.nix   | 36 +++-------------
 pkgs/servers/sql/postgresql/generic.nix | 56 ++++++++++++-------------
 2 files changed, 34 insertions(+), 58 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index a27bc012b6e..6c24e6aa4c4 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -1,34 +1,10 @@
-{ stdenv, fetchurl, zlib, readline, openssl }:
+{ callPackage, fetchurl, ... } @ args:
 
-let version = "9.0.19"; in
-
-stdenv.mkDerivation rec {
-  name = "postgresql-${version}";
+callPackage ./generic.nix (args // rec {
+  version = "9.0.20";
 
   src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "1h45jdbzdcvprdsi9gija81s3ny46h3faf9f007gza4vm6y15bak";
+    url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
+    sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02";
   };
-
-  buildInputs = [ zlib readline openssl ];
-
-  LC_ALL = "C";
-
-  configureFlags = [ "--with-openssl" ];
-
-  patches = [ ./less-is-more.patch ];
-
-  passthru = {
-    inherit readline;
-    psqlSchema = "9.0";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = http://www.postgresql.org/;
-    description = "A powerful, open source object-relational database system";
-    license = licenses.postgresql;
-    maintainers = with maintaiers; [ ocharles ];
-    platforms = platforms.unix;
-    hydraPlatforms = platforms.linux;
-  };
-}
+})
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index d7fd28ccb68..b2af6dd5331 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -43,34 +43,34 @@ stdenv.mkDerivation rec {
   #LC_ALL = "C";
 
   configureFlags = [
-    (mkOther                        "sysconfdir"        "/etc")
-    (mkOther                        "localstatedir"     "/var")
-    (mkEnable true                  "integer-datetimes" null)
-    (mkEnable true                  "nls"               null)
-    (mkWith   true                  "pgport"            "5432")
-    (mkEnable true                  "shared"            null)
-    (mkEnable true                  "rpath"             null)
-    (mkEnable true                  "spinlocks"         null)
-    (mkEnable false                 "debug"             null)
-    (mkEnable false                 "profiling"         null)
-    (mkEnable false                 "coverage"          null)
-    (mkEnable false                 "dtrace"            null)
-    (mkWith   true                  "blocksize"         (toString blockSizeKB))
-    (mkWith   true                  "segsize"           (toString segmentSizeGB))
-    (mkWith   true                  "wal-blocksize"     (toString walBlockSizeKB))
-    (mkWith   true                  "wal-segsize"       (toString walSegmentSizeMB))
-    (mkEnable true                  "autodepend"        null)
-    (mkEnable false                 "cassert"           null)
-    (mkEnable true                  "thread-safety"     null)
-    (mkWith   false                 "tcl"               null)  # Maybe enable some day
-    (mkWith   false                 "perl"              null)  # Maybe enable some day
-    (mkWith   false                 "python"            null)  # Maybe enable some day
-    (mkWith   (optKerberos != null) "gssapi"            null)
-    (mkWith   false                 "krb5"              null)
-    (mkWith   (optPam != null)      "pam"               null)
-    (mkWith   (optOpenldap != null) "ldap"              null)
-    (mkWith   false                 "bonjour"           null)
-    (mkWith   (optOpenssl != null)       "openssl"           null)
+    (mkOther                            "sysconfdir"        "/etc")
+    (mkOther                            "localstatedir"     "/var")
+    (mkEnable true                      "integer-datetimes" null)
+    (mkEnable true                      "nls"               null)
+    (mkWith   true                      "pgport"            "5432")
+    (mkEnable true                      "shared"            null)
+    (mkEnable true                      "rpath"             null)
+    (mkEnable true                      "spinlocks"         null)
+    (mkEnable false                     "debug"             null)
+    (mkEnable false                     "profiling"         null)
+    (mkEnable false                     "coverage"          null)
+    (mkEnable false                     "dtrace"            null)
+    (mkWith   true                      "blocksize"         (toString blockSizeKB))
+    (mkWith   true                      "segsize"           (toString segmentSizeGB))
+    (mkWith   true                      "wal-blocksize"     (toString walBlockSizeKB))
+    (mkWith   true                      "wal-segsize"       (toString walSegmentSizeMB))
+    (mkEnable true                      "depend"            null)
+    (mkEnable false                     "cassert"           null)
+    (mkEnable true                      "thread-safety"     null)
+    (mkWith   false                     "tcl"               null)  # Maybe enable some day
+    (mkWith   false                     "perl"              null)  # Maybe enable some day
+    (mkWith   false                     "python"            null)  # Maybe enable some day
+    (mkWith   (optKerberos != null)     "gssapi"            null)
+    (mkWith   false                     "krb5"              null)
+    (mkWith   (optPam != null)          "pam"               null)
+    (mkWith   (optOpenldap != null)     "ldap"              null)
+    (mkWith   false                     "bonjour"           null)
+    (mkWith   (optOpenssl != null)      "openssl"           null)
     (mkWith   (optReadline != null)     "readline"          null)
     (mkWith   false                     "libedit-preferred" null)
     (mkWith   (optLibossp_uuid != null) "ossp-uuid"         null)

From be94d4bc25e27583ee36024dd9b45ead29c7f796 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 19:03:27 -0700
Subject: [PATCH 0115/2322] postgresql: 9.1.15 -> 9.1.16

---
 pkgs/servers/sql/postgresql/9.1.x.nix   | 44 ++++---------------------
 pkgs/servers/sql/postgresql/generic.nix |  2 ++
 2 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 87ed9abe690..b481f292ec5 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -1,42 +1,10 @@
-{ stdenv, fetchurl, zlib, readline, openssl }:
+{ callPackage, fetchurl, ... } @ args:
 
-let version = "9.1.15"; in
-
-stdenv.mkDerivation rec {
-  name = "postgresql-${version}";
+callPackage ./generic.nix (args // rec {
+  version = "9.1.16";
 
   src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0pyyw0cy91z9wkqf8qzkwsy8cyjps0s94c9czz6mzhyd2npxxmk7";
+    url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
+    sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b";
   };
-
-  buildInputs = [ zlib readline openssl ];
-
-  enableParallelBuilding = true;
-
-  LC_ALL = "C";
-
-  configureFlags = [ "--with-openssl" ];
-
-  patches = [ ./less-is-more.patch ];
-
-  postInstall =
-    ''
-      mkdir -p $out/share/man
-      cp -rvd doc/src/sgml/man1 $out/share/man
-    '';
-
-  passthru = {
-    inherit readline;
-    psqlSchema = "9.1";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = http://www.postgresql.org/;
-    description = "A powerful, open source object-relational database system";
-    license = licenses.postgresql;
-    maintainers = with maintaiers; [ ocharles ];
-    platforms = platforms.unix;
-    hydraPlatforms = platforms.linux;
-  };
-}
+})
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index b2af6dd5331..06e6d1e79d6 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -77,6 +77,8 @@ stdenv.mkDerivation rec {
     (mkWith   (optLibxml2 != null)      "libxml"            null)
     (mkWith   (optLibxslt != null)      "libxslt"           null)
     (mkWith   (optZlib != null)         "zlib"              null)
+  ] ++ optionals (versionAtLeast version "9.1.0") [
+    (mkWith   false                     "selinux"           null)
   ];
 
   meta = with stdenv.lib; {

From 243dc10b0b54fbc840ebae39bcb224d9e0717add Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 19:06:29 -0700
Subject: [PATCH 0116/2322] postgresql: Add schema version

---
 pkgs/servers/sql/postgresql/8.4.x.nix   | 3 ++-
 pkgs/servers/sql/postgresql/9.0.x.nix   | 3 ++-
 pkgs/servers/sql/postgresql/9.1.x.nix   | 3 ++-
 pkgs/servers/sql/postgresql/generic.nix | 6 ++++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index 66933f2ad42..0254bbe951d 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -1,7 +1,8 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "8.4.22";
+  psqlSchema = "8.4";
+  version = "${psqlSchema}.22";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index 6c24e6aa4c4..dba42e4fb11 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -1,7 +1,8 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "9.0.20";
+  psqlSchema = "9.0";
+  version = "${psqlSchema}.20";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index b481f292ec5..138bc4a3023 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -1,7 +1,8 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "9.1.16";
+  psqlSchema = "9.1";
+  version = "${psqlSchema}.16";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 06e6d1e79d6..721a3b6323f 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -10,7 +10,7 @@
 , walBlockSizeKB ? 8, walSegmentSizeMB ? 16
 
 # Version specific arguments
-, version, src
+, version, src, psqlSchema
 , ...
 }:
 
@@ -90,5 +90,7 @@ stdenv.mkDerivation rec {
     hydraPlatforms = platforms.linux;
   };
 
-  passthru = { inherit readline; };
+  passthru = {
+    inherit readline psqlSchema;
+  };
 }

From e9d0c395d1e9e1616ae07fa9eacbbfc9df52d4a8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 19:07:36 -0700
Subject: [PATCH 0117/2322] postgresql: Add myself as maintainer

---
 pkgs/servers/sql/postgresql/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 721a3b6323f..74c7b2906b4 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
     license = licenses.postgresql;
-    maintainers = with maintaiers; [ ocharles ];
+    maintainers = with maintaiers; [ ocharles wkennington ];
     platforms = platforms.unix;
     hydraPlatforms = platforms.linux;
   };

From 601e713bb84a9c4f27a38d7d4595b49301b98dcc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 19:18:26 -0700
Subject: [PATCH 0118/2322] postgresql: 9.2.10 -> 9.2.11

---
 pkgs/servers/sql/postgresql/8.4.x.nix   |  2 ++
 pkgs/servers/sql/postgresql/9.0.x.nix   |  2 ++
 pkgs/servers/sql/postgresql/9.1.x.nix   |  2 ++
 pkgs/servers/sql/postgresql/9.2.x.nix   | 43 +++++--------------------
 pkgs/servers/sql/postgresql/generic.nix | 10 +++---
 5 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index 0254bbe951d..f946f9fc145 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw";
   };
+
+  patches = [ ./disable-resolve_symlinks.patch ];
 })
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index dba42e4fb11..b2a53bfc4b1 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02";
   };
+
+  patches = [ ./disable-resolve_symlinks.patch ];
 })
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 138bc4a3023..1debe457e1f 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b";
   };
+
+  patches = [ ./disable-resolve_symlinks.patch ];
 })
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index 3c21a96e9b2..477bb9d2484 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -1,40 +1,13 @@
-{ stdenv, fetchurl, zlib, readline, openssl }:
+{ callPackage, fetchurl, ... } @ args:
 
-let version = "9.2.10"; in
-
-stdenv.mkDerivation rec {
-  name = "postgresql-${version}";
+callPackage ./generic.nix (args // rec {
+  psqlSchema = "9.2";
+  version = "${psqlSchema}.11";
 
   src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "1bbkinqzb3c8i0vfzcy2g7djrq0kxz63jgvzda9p0vylxazmnm1m";
+    url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
+    sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5";
   };
 
-  buildInputs = [ zlib readline openssl ];
-
-  enableParallelBuilding = true;
-
-  makeFlags = [ "world" ];
-
-  configureFlags = [ "--with-openssl" ];
-
-  patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ];
-
-  installTargets = [ "install-world" ];
-
-  LC_ALL = "C";
-
-  passthru = {
-    inherit readline;
-    psqlSchema = "9.2";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = http://www.postgresql.org/;
-    description = "A powerful, open source object-relational database system";
-    license = licenses.postgresql;
-    maintainers = with maintaiers; [ ocharles ];
-    platforms = platforms.unix;
-    hydraPlatforms = platforms.linux;
-  };
-}
+  patches = [ ./disable-resolve_symlinks.patch ];
+})
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 74c7b2906b4..40c5ff660ce 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -10,7 +10,7 @@
 , walBlockSizeKB ? 8, walSegmentSizeMB ? 16
 
 # Version specific arguments
-, version, src, psqlSchema
+, psqlSchema , version, src, patches ? [ ]
 , ...
 }:
 
@@ -25,6 +25,8 @@ let
   optLibxml2 = shouldUsePkg libxml2;
   optLibxslt = shouldUsePkg libxslt;
   optZlib = shouldUsePkg zlib;
+
+  patches' = [ ./less-is-more.patch ] ++ patches;
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -32,7 +34,7 @@ stdenv.mkDerivation rec {
 
   inherit src;
 
-  patches = [ ./less-is-more.patch ];
+  patches = patches';
 
   nativeBuildInputs = [ bison flex ];
   buildInputs = [
@@ -40,8 +42,6 @@ stdenv.mkDerivation rec {
     optLibossp_uuid optLibxml2 optLibxslt optZlib
   ];
 
-  #LC_ALL = "C";
-
   configureFlags = [
     (mkOther                            "sysconfdir"        "/etc")
     (mkOther                            "localstatedir"     "/var")
@@ -81,6 +81,8 @@ stdenv.mkDerivation rec {
     (mkWith   false                     "selinux"           null)
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";

From d9efd0676fec01fe0161b882a5f84f23b1c89f87 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 19:23:54 -0700
Subject: [PATCH 0119/2322] postgresql: Correct propagated readline

---
 pkgs/servers/sql/postgresql/generic.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 40c5ff660ce..b7b2e3014ce 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -93,6 +93,7 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    inherit readline psqlSchema;
+    inherit psqlSchema;
+    readline = optReadline;
   };
 }

From 7174391e5bff8206025d4c7c7107d11487c534f7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 19:21:42 -0700
Subject: [PATCH 0120/2322] postgresql: Consolidate patches

---
 pkgs/servers/sql/postgresql/8.4.x.nix   |  2 --
 pkgs/servers/sql/postgresql/9.0.x.nix   |  2 --
 pkgs/servers/sql/postgresql/9.1.x.nix   |  2 --
 pkgs/servers/sql/postgresql/9.2.x.nix   |  2 --
 pkgs/servers/sql/postgresql/generic.nix | 12 ++++++++----
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index f946f9fc145..0254bbe951d 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw";
   };
-
-  patches = [ ./disable-resolve_symlinks.patch ];
 })
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index b2a53bfc4b1..dba42e4fb11 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02";
   };
-
-  patches = [ ./disable-resolve_symlinks.patch ];
 })
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 1debe457e1f..138bc4a3023 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b";
   };
-
-  patches = [ ./disable-resolve_symlinks.patch ];
 })
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index 477bb9d2484..9517b4e803c 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5";
   };
-
-  patches = [ ./disable-resolve_symlinks.patch ];
 })
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index b7b2e3014ce..46d2030224d 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -10,7 +10,7 @@
 , walBlockSizeKB ? 8, walSegmentSizeMB ? 16
 
 # Version specific arguments
-, psqlSchema , version, src, patches ? [ ]
+, psqlSchema , version, src
 , ...
 }:
 
@@ -25,8 +25,6 @@ let
   optLibxml2 = shouldUsePkg libxml2;
   optLibxslt = shouldUsePkg libxslt;
   optZlib = shouldUsePkg zlib;
-
-  patches' = [ ./less-is-more.patch ] ++ patches;
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -34,7 +32,13 @@ stdenv.mkDerivation rec {
 
   inherit src;
 
-  patches = patches';
+  patches = [
+    ./less-is-more.patch
+  ] ++ optionals (versionOlder version "9.4.0") [
+    ./disable-resolve_symlinks.patch
+  ] ++ optionals (versionAtLeast version "9.4.0") [
+    ./disable-resolve_symlinks-94.patch
+  ];
 
   nativeBuildInputs = [ bison flex ];
   buildInputs = [

From 5486c08dc27c5cdc7b251adf6d50d306501ba3b1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 19:34:28 -0700
Subject: [PATCH 0121/2322] postgresql: 9.3.6 -> 9.3.7

---
 pkgs/servers/sql/postgresql/9.3.x.nix   | 47 ++++---------------------
 pkgs/servers/sql/postgresql/generic.nix |  3 +-
 2 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
index 4406aecaa89..9671c316832 100644
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -1,44 +1,11 @@
-{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl}:
+{ callPackage, fetchurl, ... } @ args:
 
-with stdenv.lib;
-
-let version = "9.3.6"; in
-
-stdenv.mkDerivation rec {
-  name = "postgresql-${version}";
+callPackage ./generic.nix (args // rec {
+  psqlSchema = "9.3";
+  version = "${psqlSchema}.7";
 
   src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "056ass7nnfyv7blv02anv795kgpz77gipdpxggd835cdwrhwns13";
+    url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
+    sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw";
   };
-
-  buildInputs = [ zlib readline openssl ]
-                ++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
-
-  enableParallelBuilding = true;
-
-  makeFlags = [ "world" ];
-
-  configureFlags = [ "--with-openssl" ]
-                   ++ optional (!stdenv.isDarwin) "--with-ossp-uuid";
-
-  patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ];
-
-  installTargets = [ "install-world" ];
-
-  LC_ALL = "C";
-
-  passthru = {
-    inherit readline;
-    psqlSchema = "9.3";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = http://www.postgresql.org/;
-    description = "A powerful, open source object-relational database system";
-    license = licenses.postgresql;
-    maintainers = with maintaiers; [ ocharles ];
-    platforms = platforms.unix;
-    hydraPlatforms = platforms.linux;
-  };
-}
+})
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 46d2030224d..88e2b77cf83 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -52,7 +52,6 @@ stdenv.mkDerivation rec {
     (mkEnable true                      "integer-datetimes" null)
     (mkEnable true                      "nls"               null)
     (mkWith   true                      "pgport"            "5432")
-    (mkEnable true                      "shared"            null)
     (mkEnable true                      "rpath"             null)
     (mkEnable true                      "spinlocks"         null)
     (mkEnable false                     "debug"             null)
@@ -83,6 +82,8 @@ stdenv.mkDerivation rec {
     (mkWith   (optZlib != null)         "zlib"              null)
   ] ++ optionals (versionAtLeast version "9.1.0") [
     (mkWith   false                     "selinux"           null)
+  ] ++ optionals (versionOlder version "9.3.0") [
+    (mkEnable true                      "shared"            null)
   ];
 
   enableParallelBuilding = true;

From 6775c0696f9e8b2c148f9be382f30bce7a4ec4a0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 19:38:34 -0700
Subject: [PATCH 0122/2322] postgresql: 9.4.1 -> 9.4.2

---
 pkgs/servers/sql/postgresql/9.4.x.nix   | 47 ++++---------------------
 pkgs/servers/sql/postgresql/generic.nix |  8 +++--
 2 files changed, 13 insertions(+), 42 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix
index 73f416912a2..0d8b573dcc5 100644
--- a/pkgs/servers/sql/postgresql/9.4.x.nix
+++ b/pkgs/servers/sql/postgresql/9.4.x.nix
@@ -1,44 +1,11 @@
-{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl }:
+{ callPackage, fetchurl, ... } @ args:
 
-with stdenv.lib;
-
-let version = "9.4.1"; in
-
-stdenv.mkDerivation rec {
-  name = "postgresql-${version}";
+callPackage ./generic.nix (args // rec {
+  psqlSchema = "9.4";
+  version = "${psqlSchema}.2";
 
   src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "19n3i14bhmw8dacd2kl3n1wzj362qv3fjmal5vsvi580h9ybgp99";
+    url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
+    sha256 = "04adpfg2f7ip96rh3jjygx5cpgasrrp1dl2wswjivfk5q68s3zc1";
   };
-
-  buildInputs = [ zlib readline openssl ]
-                ++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
-
-  enableParallelBuilding = true;
-
-  makeFlags = [ "world" ];
-
-  configureFlags = [ "--with-openssl" ]
-                   ++ optional (!stdenv.isDarwin) "--with-ossp-uuid";
-
-  patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ];
-
-  installTargets = [ "install-world" ];
-
-  LC_ALL = "C";
-
-  passthru = {
-    inherit readline;
-    psqlSchema = "9.4";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = http://www.postgresql.org/;
-    description = "A powerful, open source object-relational database system";
-    license = licenses.postgresql;
-    maintainers = with maintaiers; [ ocharles ];
-    platforms = platforms.unix;
-    hydraPlatforms = platforms.linux;
-  };
-}
+})
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 88e2b77cf83..f8d1ad0a475 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -69,14 +69,12 @@ stdenv.mkDerivation rec {
     (mkWith   false                     "perl"              null)  # Maybe enable some day
     (mkWith   false                     "python"            null)  # Maybe enable some day
     (mkWith   (optKerberos != null)     "gssapi"            null)
-    (mkWith   false                     "krb5"              null)
     (mkWith   (optPam != null)          "pam"               null)
     (mkWith   (optOpenldap != null)     "ldap"              null)
     (mkWith   false                     "bonjour"           null)
     (mkWith   (optOpenssl != null)      "openssl"           null)
     (mkWith   (optReadline != null)     "readline"          null)
     (mkWith   false                     "libedit-preferred" null)
-    (mkWith   (optLibossp_uuid != null) "ossp-uuid"         null)
     (mkWith   (optLibxml2 != null)      "libxml"            null)
     (mkWith   (optLibxslt != null)      "libxslt"           null)
     (mkWith   (optZlib != null)         "zlib"              null)
@@ -84,6 +82,12 @@ stdenv.mkDerivation rec {
     (mkWith   false                     "selinux"           null)
   ] ++ optionals (versionOlder version "9.3.0") [
     (mkEnable true                      "shared"            null)
+  ] ++ optionals (versionAtLeast version "9.4.0") [
+    (mkEnable false                     "tap-tests"         null)
+    (mkWith   (optLibossp_uuid != null) "uuid"              "ossp")
+  ] ++ optionals (versionOlder version "9.4.0") [
+    (mkWith   false                     "krb5"              null)
+    (mkWith   (optLibossp_uuid != null) "ossp-uuid"         null)
   ];
 
   enableParallelBuilding = true;

From adcf1c7a90b48eda3eec707f164c64b38af27e41 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 19:39:21 -0700
Subject: [PATCH 0123/2322] postgresql: Fix sha256 for 9.3.7

---
 pkgs/servers/sql/postgresql/9.3.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
index 9671c316832..fabc6dbc1de 100644
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -6,6 +6,6 @@ callPackage ./generic.nix (args // rec {
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
-    sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw";
+    sha256 = "0ggz0i91znv053zx9qas7pjf93s5by3dk84z1jxbjkg8yyrnlx4b";
   };
 })

From e74b5704a854ad796b0df36d0d38f1ec1ba2da4e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 20:07:47 -0700
Subject: [PATCH 0124/2322] bind: Enable parallel building

---
 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 b60998ce6aa..bb4e1a0f8d4 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -111,6 +111,8 @@ stdenv.mkDerivation rec {
     "localstatedir=\${TMPDIR}"
   ];
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = "http://www.isc.org/software/bind";
     description = "Domain name server";

From 3440c4c8e469a6d42b846f57042a2b457e22641f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 23 May 2015 17:38:55 +0200
Subject: [PATCH 0125/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/a4032345e08c60e54f4ac992c1586ad5f385d17e
 with hackage2nix revision ca778c8501c0d2e3c44fa9016b1f79cdf6f3dcc2

---
 .../haskell-modules/hackage-packages.nix      | 120 ++++++++++++++----
 1 file changed, 97 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 886c03b3d84..74bf9011231 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -36604,6 +36604,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cryptonite" = callPackage
+    ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim
+     , integer-gmp, memory, tasty, tasty-hunit, tasty-kat
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "cryptonite";
+       version = "0.1";
+       sha256 = "10rcz9547igjpg908cbgk5aws011g861ywprgf3x5yspml1nc6z5";
+       buildDepends = [
+         base bytestring deepseq ghc-prim integer-gmp memory
+       ];
+       testDepends = [
+         base byteable bytestring memory tasty tasty-hunit tasty-kat
+         tasty-quickcheck
+       ];
+       homepage = "https://github.com/vincenthz/cryptonite";
+       description = "Cryptography Primitives sink";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cryptsy-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, either
      , http-client, http-client-tls, old-locale, pipes-attoparsec
@@ -37754,7 +37775,9 @@ self: {
      mkDerivation {
        pname = "darkplaces-demo";
        version = "0.1";
+       revision = "1";
        sha256 = "0map78fnnqm2nlh92xrxmg3fs9q2hb4pl87hyara41v2dvwlsj3f";
+       editedCabalFile = "d16b0f7e29060476084a0457d38e524e1965b05e591af570197f287d574a8d01";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -37787,17 +37810,48 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "darkplaces-rcon-util" = callPackage
+    ({ mkDerivation, base, bytestring, ConfigFile, containers
+     , darkplaces-rcon, darkplaces-text, directory, filepath, haskeline
+     , HostAndPort, hspec, hspec-core, mtl, old-locale
+     , optparse-applicative, text, time, utf8-string
+     }:
+     mkDerivation {
+       pname = "darkplaces-rcon-util";
+       version = "0.1";
+       revision = "3";
+       sha256 = "0accwwwifhmlnrc5rqb9kc44mcrpbfibakip8pwi2aqs7xvchavr";
+       editedCabalFile = "c26b82e362cada670c0edc2c27c5c571f1898edb5ec29ab4c35d913c537b264d";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring ConfigFile containers darkplaces-rcon
+         darkplaces-text directory filepath haskeline HostAndPort mtl
+         old-locale optparse-applicative text time utf8-string
+       ];
+       testDepends = [
+         base bytestring darkplaces-rcon darkplaces-text hspec hspec-core
+         text
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/bacher09/darkplaces-rcon";
+       description = "Darplaces rcon utility";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "darkplaces-text" = callPackage
-    ({ mkDerivation, alex, ansi-terminal, array, base, bytestring, text
-     , vector
+    ({ mkDerivation, alex, ansi-terminal, array, base, bytestring
+     , hspec, QuickCheck, text, utf8-string, vector
      }:
      mkDerivation {
        pname = "darkplaces-text";
-       version = "0.1";
-       sha256 = "08zqrivqz57r0ifjpgksm5l8h19zmsxcicwf97h3andds62v05lf";
-       buildDepends = [ ansi-terminal array base bytestring text vector ];
+       version = "0.2.1";
+       sha256 = "12nsr005pk0v1nril61javh6nrjhqcvlif11mfhch8bvvcaiy4rm";
+       buildDepends = [
+         ansi-terminal array base bytestring text utf8-string vector
+       ];
+       testDepends = [ base bytestring hspec QuickCheck ];
        buildTools = [ alex ];
-       jailbreak = true;
        homepage = "https://github.com/bacher09/darkplaces-text";
        description = "Parser for darkplaces colorful text";
        license = stdenv.lib.licenses.gpl2;
@@ -63488,8 +63542,8 @@ self: {
      }:
      mkDerivation {
        pname = "hfoil";
-       version = "0.2.0.1";
-       sha256 = "0y8amvxx77368z48gdg414iwhp1fkhdscn6gzvwb4i3vga98mga4";
+       version = "0.2.0.2";
+       sha256 = "0jwnyfl1rcd2439738jgs0rgl0p09d1j877z84g0ax3xh7cm4zj1";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -71853,11 +71907,12 @@ self: {
     ({ mkDerivation, base, parsec, parsec-numbers }:
      mkDerivation {
        pname = "huttons-razor";
-       version = "0.1.0.0";
-       sha256 = "018br27y575crdnsn3lahklk7zmwrjqka9kan3c1g857fv2hnkq9";
+       version = "0.1.0.1";
+       sha256 = "0iq377pbz3rpxj8zibavnjjck9f3xkl2ar2hy8jpj265rzm6lr7m";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base parsec parsec-numbers ];
+       homepage = "https://github.com/steshaw/huttons-razor";
        description = "Quick implemention of Hutton's Razor";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -86128,6 +86183,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "midi-music-box" = callPackage
+    ({ mkDerivation, base, containers, diagrams-lib
+     , diagrams-postscript, event-list, midi, non-empty
+     , optparse-applicative, utility-ht
+     }:
+     mkDerivation {
+       pname = "midi-music-box";
+       version = "0.0";
+       sha256 = "0hnlnjgn378mkrhky8fvpzs6i34s3n6lx81mf3hnxmb1vgwy2nmf";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base containers diagrams-lib diagrams-postscript event-list midi
+         non-empty optparse-applicative utility-ht
+       ];
+       homepage = "http://hub.darcs.net/thielema/midi-music-box";
+       description = "Convert MIDI file to music box punch tape";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "midi-util" = callPackage
     ({ mkDerivation, base, containers, event-list, midi, non-negative
      }:
@@ -86594,8 +86669,8 @@ self: {
      }:
      mkDerivation {
        pname = "miniutter";
-       version = "0.4.4.1";
-       sha256 = "1raq5dq6mx56ddyq5hnh9r2yflry6prcjf17p15ds1w5r8cp8yx1";
+       version = "0.4.4.2";
+       sha256 = "1nr08cm6qrww01sqxvr4bmkhxxihcl9sm8077gl25alj1s3gq21s";
        buildDepends = [ base binary containers ghc-prim minimorph text ];
        testDepends = [
          base containers HUnit test-framework test-framework-hunit text
@@ -109161,21 +109236,20 @@ self: {
     ({ mkDerivation, attoparsec, base, base16-bytestring, binary
      , bytestring, conduit, containers, cpphs, exceptions, hashable
      , hashtables, hslogger, http2, HUnit, lens, network, network-uri
-     , openssl, text, transformers
+     , openssl, text, time, transformers
      }:
      mkDerivation {
        pname = "second-transfer";
-       version = "0.5.0.0";
-       sha256 = "16bf857l0dhd2xkb63s47f1f8r41001lf7vkfy48r0p4hfm3bqr2";
+       version = "0.5.2.2";
+       sha256 = "0zch87psqszg42rxwjd3px80j867xjqz06lgvndrd01sqzadw18g";
        buildDepends = [
          attoparsec base base16-bytestring binary bytestring conduit
          containers exceptions hashable hashtables hslogger http2 lens
-         network network-uri text transformers
+         network network-uri text time transformers
        ];
        testDepends = [ base bytestring conduit http2 HUnit lens ];
        buildTools = [ cpphs ];
        extraLibraries = [ openssl ];
-       jailbreak = true;
        homepage = "https://www.httptwo.com/second-transfer/";
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
@@ -113820,14 +113894,14 @@ self: {
   "snaplet-wordpress" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder
      , bytestring, configurator, containers, data-default, either, hedis
-     , heist, hspec, hspec-snap, lens, map-syntax, mtl, snap, snap-core
-     , snaplet-redis, text, time, unordered-containers, vector, wreq
-     , xmlhtml
+     , heist, hspec, hspec-core, hspec-snap, lens, map-syntax, mtl, snap
+     , snap-core, snaplet-redis, text, time, unordered-containers
+     , vector, wreq, xmlhtml
      }:
      mkDerivation {
        pname = "snaplet-wordpress";
-       version = "0.1.1.1";
-       sha256 = "1l0hxv267qlih9bqa5a2mlarmy15wk5awg8pmjv7a358sm7k53kq";
+       version = "0.1.1.2";
+       sha256 = "1vmkywrd0vfyd028d0pvfglywgbv1m26j1shwy9wmnr581vx9pab";
        buildDepends = [
          aeson async attoparsec base blaze-builder bytestring configurator
          containers data-default either hedis heist hspec hspec-snap lens
@@ -113836,7 +113910,7 @@ self: {
        ];
        testDepends = [
          aeson base blaze-builder containers data-default either hedis heist
-         hspec hspec-snap lens mtl snap snaplet-redis text
+         hspec hspec-core hspec-snap lens mtl snap snaplet-redis text
          unordered-containers xmlhtml
        ];
        homepage = "https://github.com/dbp/snaplet-wordpress";

From da2aef368559a6991f1a455fd1cb383409505006 Mon Sep 17 00:00:00 2001
From: Stephen Weinberg <stephen@q5comm.com>
Date: Tue, 5 May 2015 17:09:40 -0400
Subject: [PATCH 0126/2322] Add the google-cloud-sdk package

---
 lib/maintainers.nix                           |  1 +
 pkgs/tools/admin/google-cloud-sdk/default.nix | 51 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 54 insertions(+)
 create mode 100644 pkgs/tools/admin/google-cloud-sdk/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d4fda831d59..efb0363c5bd 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -195,6 +195,7 @@
   smironov = "Sergey Mironov <ierton@gmail.com>";
   sprock = "Roger Mason <rmason@mun.ca>";
   spwhitt = "Spencer Whitt <sw@swhitt.me>";
+  stephenmw = "Stephen Weinberg <stephen@q5comm.com>";
   sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
   tailhook = "Paul Colomiets <paul@colomiets.name>";
   taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
new file mode 100644
index 00000000000..d2c22b055be
--- /dev/null
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -0,0 +1,51 @@
+{stdenv, fetchurl, python27, python27Packages, makeWrapper}:
+
+stdenv.mkDerivation rec {
+  version = "0.9.58";
+  name = "google-cloud-sdk-${version}";
+
+  src = fetchurl {
+    url = "https://dl.google.com/dl/cloudsdk/release/packages/google-cloud-sdk-coretools-linux-static-20150429151447.tar.gz";
+    sha256 = "0sak1fmm7z7ry1k2r67a13mpgi55rbnx81s0y0xhd86dm5aw4f48";
+  };
+
+  buildInputs = [python27 makeWrapper];
+
+  phases = [ "installPhase" "fixupPhase" ];
+
+  installPhase = ''
+    mkdir -p "$out"
+    tar -xzf "$src" -C "$out" google-cloud-sdk
+
+    # create wrappers with correct env
+    for program in gcloud bq gsutil git-credential-gcloud.sh; do
+        programPath="$out/google-cloud-sdk/bin/$program"
+        wrapper="$out/bin/$program"
+        makeWrapper "$programPath" "$wrapper" \
+            --set CLOUDSDK_PYTHON "${python27}/bin/python" \
+            --prefix PYTHONPATH : "$(toPythonPath ${python27Packages.crcmod})"
+    done
+
+    # install man pages
+    mv "$out/google-cloud-sdk/help/man" "$out"
+
+    # setup bash completion
+    mkdir -p "$out/etc/bash_completion.d/"
+    mv "$out/google-cloud-sdk/completion.bash.inc" "$out/etc/bash_completion.d/gcloud.inc"
+
+    # This directory contains compiled mac binaries. We used crcmod from
+    # nixpkgs instead.
+    rm -r $out/google-cloud-sdk/platform/gsutil/third_party/crcmod
+  '';
+
+  meta = {
+    description = "Tools for the google cloud platform";
+    longDescription = "The Google Cloud SDK. This package has the programs: gcloud, gsutil, and bq";
+    version = version;
+    # This package contains vendored dependencies. All have free licenses.
+    license = stdenv.lib.licenses.free;
+    homepage = "https://cloud.google.com/sdk/";
+    maintainers = with stdenv.lib.maintainers; [stephenmw];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c15f9ce0a4..cbcc1361660 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1553,6 +1553,8 @@ let
 
   googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
 
+  google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { };
+
   gource = callPackage ../applications/version-management/gource { };
 
   gparted = callPackage ../tools/misc/gparted { };

From bb6ac771c40342d578aa5959d81454b3676b0e49 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 22:26:02 -0700
Subject: [PATCH 0127/2322] dnsutils: Add smaller derivation of bind

---
 pkgs/servers/dns/bind/default.nix | 35 ++++++++++++++++++++++---------
 pkgs/top-level/all-packages.nix   |  3 +++
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index bb4e1a0f8d4..70d88b2a968 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -7,15 +7,19 @@
 
 # Optional DLZ Modules
 , postgresql ? null, libmysql ? null, db ? null, openldap ? null
+
+# Extra arguments
+, suffix ? ""
 }:
 
-assert postgresql != null;
 with stdenv;
 let
   version = "9.10.2";
 
+  toolsOnly = suffix == "tools";
+
   optLibseccomp = shouldUsePkg libseccomp;
-  optPython = shouldUsePkg python;
+  optPython = if toolsOnly then null else shouldUsePkg python;
   optKerberos = shouldUsePkg kerberos;
   optOpenssl = shouldUsePkg openssl;
   optLibxml2 = shouldUsePkg libxml2;
@@ -25,18 +29,19 @@ let
   optIdnkit = shouldUsePkg idnkit;
   optLibiconv = shouldUsePkg libiconv;
 
-  optPostgresql = shouldUsePkg postgresql;
-  optLibmysql = shouldUsePkg libmysql;
-  optDb = shouldUsePkg db;
-  optOpenldap = shouldUsePkg openldap;
+  optPostgresql = if toolsOnly then null else shouldUsePkg postgresql;
+  optLibmysql = if toolsOnly then null else shouldUsePkg libmysql;
+  optDb = if toolsOnly then null else shouldUsePkg db;
+  optOpenldap = if toolsOnly then null else shouldUsePkg openldap;
+
+  pythonBin = if optPython == null then null else "${optPython}/bin/python";
 in
-assert optPostgresql != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "bind-${version}";
+  name = "bind${optionalString (suffix != "") "-${suffix}"}-${version}";
 
   src = fetchurl {
-    url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
+    url = "http://ftp.isc.org/isc/bind9/${version}/bind-${version}.tar.gz";
     sha256 = "163s8pvqj4lyryvfzkc6acbys7gw1by5dqwilggiwp54ia8bg6vg";
   };
 
@@ -55,7 +60,7 @@ stdenv.mkDerivation rec {
     (mkOther                          "localstatedir"       "/var")
     (mkOther                          "sysconfdir"          "/etc")
     (mkEnable (optLibseccomp != null) "seccomp"             null)
-    (mkWith   (optPython != null)     "python"              "${optPython}/bin/python")
+    (mkWith   (optPython != null)     "python"              pythonBin)
     (mkEnable true                    "kqueue"              null)
     (mkEnable true                    "epoll"               null)
     (mkEnable true                    "devpoll"             null)
@@ -109,8 +114,18 @@ stdenv.mkDerivation rec {
   installFlags = [
     "sysconfdir=\${out}/etc"
     "localstatedir=\${TMPDIR}"
+  ] ++ optionals toolsOnly [
+    "DESTDIR=\${TMPDIR}"
   ];
 
+  postInstall = optionalString toolsOnly ''
+    mkdir -p $out/{bin,etc,lib,share/man/man1}
+    install -m 0755 $TMPDIR/$out/bin/{dig,nslookup,nsupdate} $out/bin
+    install -m 0644 $TMPDIR/$out/etc/bind.keys $out/etc
+    install -m 0644 $TMPDIR/$out/lib/*.so.* $out/lib
+    install -m 0644 $TMPDIR/$out/share/man/man1/{dig,nslookup,nsupdate}.1 $out/share/man/man1
+  '';
+
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b0c09f2974..339563fddf1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8502,6 +8502,9 @@ let
   sabnzbd = callPackage ../servers/sabnzbd { };
 
   bind = callPackage ../servers/dns/bind { };
+  dnsutils = bind.override {
+    suffix = "tools";
+  };
 
   bird = callPackage ../servers/bird { };
 

From e8392bb33f087912d6602b239fa836b05741c9b8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 23 May 2015 22:26:16 -0700
Subject: [PATCH 0128/2322] postgres: Fix maintainers

---
 pkgs/servers/sql/postgresql/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index f8d1ad0a475..ded9247f42a 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
     license = licenses.postgresql;
-    maintainers = with maintaiers; [ ocharles wkennington ];
+    maintainers = with maintainers; [ ocharles wkennington ];
     platforms = platforms.unix;
     hydraPlatforms = platforms.linux;
   };

From cdd93463c0677b4aeb1f7a75825c6a8f36c6de16 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 21 May 2015 00:24:56 -0700
Subject: [PATCH 0129/2322] gawk: 4.1.2 -> 4.1.3

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

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 9017025477b..35e0b6d927b 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libsigsegv, readline, readlineSupport ? false }:
 
 stdenv.mkDerivation rec {
-  name = "gawk-4.1.2";
+  name = "gawk-4.1.3";
 
   src = fetchurl {
     url = "mirror://gnu/gawk/${name}.tar.xz";
-    sha256 = "10glh5amry76v8fzhp4phi4119zwjwzjg9ybzq971qjfhg2m72za";
+    sha256 = "09d6pmx6h3i2glafm0jd1v1iyrs03vcyv2rkz12jisii3vlmbkz3";
   };
 
   doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1

From 6e41581809b6c96b2094240b383598b60370610d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 24 May 2015 01:52:12 -0700
Subject: [PATCH 0130/2322] feh: 2.12.1 -> 2.13

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

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index ad636772237..49c7870b212 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -2,11 +2,11 @@
 , libXinerama, curl, libexif }:
 
 stdenv.mkDerivation rec {
-  name = "feh-2.12.1";
+  name = "feh-2.13";
 
   src = fetchurl {
     url = "http://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "18b6yjk88ybqxsa5knk6qwi2xy7fclbzl5cpzwg0wmkr3phfq9lh";
+    sha256 = "06fa9zh1zpi63l90kw3l9a0sfavf424j7ksi396ifg9669gx35gn";
   };
 
   buildInputs = [ makeWrapper x11 imlib2 libjpeg libpng libXinerama curl libexif ];

From 1efd5f0fdf0c4c485eeefceeb8f6d3332fb0b455 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 24 May 2015 01:53:14 -0700
Subject: [PATCH 0131/2322] ccid: 1.4.18 -> 1.4.19

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

diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index c9a261ba97a..21de5705e4f 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.18";
+  version = "1.4.19";
   name = "ccid-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/c/ccid/ccid_${version}.orig.tar.bz2";
-    sha256 = "1aj14lkmfaxkhk5swqfgn2x18j7fijxs0jnxnx9cdc9f5mxaknsz";
+    sha256 = "1q9lx5ci8kikwk9mhbjl6m3zk4id209zfna5wgpqjrp5nhmjrjyc";
   };
 
   patchPhase = ''

From 1592c81d542ee823c167ea47c509d53d5b64ccc4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 24 May 2015 02:00:18 -0700
Subject: [PATCH 0132/2322] redis: 3.0.0-rc3 -> 3.0.1

---
 pkgs/servers/nosql/redis/3.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/redis/3.0.nix b/pkgs/servers/nosql/redis/3.0.nix
index 049639ad684..0e7a7d0f250 100644
--- a/pkgs/servers/nosql/redis/3.0.nix
+++ b/pkgs/servers/nosql/redis/3.0.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.0-rc3";
+  version = "3.0.1";
   name = "redis-${version}";
 
   src = fetchurl {
     url = "https://github.com/antirez/redis/archive/${version}.tar.gz";
-    sha256 = "1695fa532eafc14c95f45add5d8a71d07e0e87b5c8f06c29dfa06313322d27b7";
+    sha256 = "1m34s60qvj1xyqw7x7ar0graw52wypx47dhvfb0br67vfb62l8sl";
   };
 
   makeFlags = "PREFIX=$(out)";

From 5f557885313088a235762d3cb7fd76ec0b1e6547 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Sun, 24 May 2015 04:55:24 -0500
Subject: [PATCH 0133/2322] adding docs to python wrap.sh

---
 .../python-modules/generic/wrap.sh            | 57 +++++++++++++------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index 220ddf26b30..45f86df4dcf 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -1,51 +1,74 @@
+# Wrapper around wrapPythonProgramsIn, below. The $pythonPath
+# variable is passed in from the buildPythonPackage function.
 wrapPythonPrograms() {
     wrapPythonProgramsIn $out "$out $pythonPath"
 }
 
+# Transforms any binaries generated by the setup.py script, replacing them
+# with an executable shell script which will set some environment variables
+# and then call into the original binary (which has been given a .wrapped
+# suffix).
 wrapPythonProgramsIn() {
     local dir="$1"
     local pythonPath="$2"
     local python="@executable@"
-    local i
+    local path
+    local f
 
+    # Create an empty table of python paths (see doc on _addToPythonPath
+    # for how this is used). Build up the program_PATH and program_PYTHONPATH
+    # variables.
     declare -A pythonPathsSeen=()
     program_PYTHONPATH=
     program_PATH=
-    for i in $pythonPath; do
-        _addToPythonPath $i
+    for path in $pythonPath; do
+        _addToPythonPath $path
     done
 
-    for i in $(find "$dir" -type f -perm +0100); do
+    # Find all regular files in the output directory that are executable.
+    for f in $(find "$dir" -type f -perm +0100); do
         # Rewrite "#! .../env python" to "#! /nix/store/.../python".
-        if head -n1 "$i" | grep -q '#!.*/env.*\(python\|pypy\)'; then
-            sed -i "$i" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^"
+        if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then
+            sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^"
         fi
-        
+
         # catch /python and /.python-wrapped
-        if head -n1 "$i" | grep -q '/\.\?\(python\|pypy\)'; then
+        if head -n1 "$f" | grep -q '/\.\?\(python\|pypy\)'; then
             # dont wrap EGG-INFO scripts since they are called from python
-            if echo "$i" | grep -v EGG-INFO/scripts; then
-                echo "wrapping \`$i'..."
-                sed -i "$i" -re '@magicalSedExpression@'
-                wrapProgram "$i" \
-                    --prefix PYTHONPATH ":" $program_PYTHONPATH \
-                    --prefix PATH ":" $program_PATH
+            if echo "$f" | grep -qv EGG-INFO/scripts; then
+                echo "wrapping \`$f'..."
+                sed -i "$f" -re '@magicalSedExpression@'
+                # wrapProgram creates the executable shell script described
+                # above. The script will set PYTHONPATH and PATH variables.!
+                # (see pkgs/build-support/setup-hooks/make-wrapper.sh)
+                wrapProgram $f \
+                              --prefix PYTHONPATH ':' $program_PYTHONPATH \
+                              --prefix PATH ':' $program_PATH
             fi
         fi
     done
 }
 
+# Adds the lib and bin directories to the PYTHONPATH and PATH variables,
+# respectively. Recurses on any paths declared in
+# `propagated-native-build-inputs`, while avoiding duplicating paths by
+# flagging the directories it has visited in `pythonPathsSeen`.
 _addToPythonPath() {
     local dir="$1"
+    # Stop if we've already visited here.
     if [ -n "${pythonPathsSeen[$dir]}" ]; then return; fi
     pythonPathsSeen[$dir]=1
+    # addToSearchPath is defined in stdenv/generic/setup.sh. It will have
+    # the effect of calling `export program_X=$dir/...:$program_X`.
     addToSearchPath program_PYTHONPATH $dir/lib/@libPrefix@/site-packages
     addToSearchPath program_PATH $dir/bin
+
+    # Inspect the propagated inputs (if they exist) and recur on them.
     local prop="$dir/nix-support/propagated-native-build-inputs"
     if [ -e $prop ]; then
-        local i
-        for i in $(cat $prop); do
-            _addToPythonPath $i
+        local new_path
+        for new_path in $(cat $prop); do
+            _addToPythonPath $new_path
         done
     fi
 }

From 32126ebf259939c4570e0b08759394eb2af2b1bf Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sun, 24 May 2015 12:53:14 +0200
Subject: [PATCH 0134/2322] Add gstreamer-vaapi for gstreamer-1.0.

---
 .../libraries/gstreamer/default.nix           |  2 ++
 .../libraries/gstreamer/vaapi/default.nix     | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/libraries/gstreamer/vaapi/default.nix

diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index 4796ce078df..6ec5e5d9e0a 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -18,4 +18,6 @@ rec {
   gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; };
 
   gst-editing-services = callPackage ./ges { inherit gnonlin; };
+
+  gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; };
 }
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
new file mode 100644
index 00000000000..a1f936e20af
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva
+, libdrm, udev, xorg, mesa, yasm, gstreamer, gst-plugins-bad, nasm
+, libvpx
+}:
+
+stdenv.mkDerivation rec {
+  name = "gst-vaapi-${version}";
+  version = "0.5.10";
+
+  src = fetchurl {
+    url = "${meta.homepage}/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.bz2";
+    sha256 = "179wnz4c4gnw9ibfgjrad9b44icygadaknsgjfw24lr2pz3kdlhd";
+  };
+
+  nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ];
+
+  buildInputs = with stdenv.lib; [ gstreamer gst-plugins-base gst-plugins-bad libva libdrm udev
+    xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr mesa nasm libvpx ];
+
+  preConfigure = "
+    export GST_PLUGIN_PATH_1_0=$out/lib/gstreamer-1.0
+    mkdir -p $GST_PLUGIN_PATH_1_0
+    ";
+  configureFlags = "--disable-builtin-libvpx --with-gstreamer-api=1.0";
+
+  meta = {
+    homepage = "http://www.freedesktop.org";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
+  };
+}

From 3d020482833ac89e70cf3f2bc2271a451064c8f4 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 29 Apr 2015 23:22:39 +0000
Subject: [PATCH 0135/2322] xbomb: add version 2.2b

---
 pkgs/games/xbomb/default.nix    | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/games/xbomb/default.nix

diff --git a/pkgs/games/xbomb/default.nix b/pkgs/games/xbomb/default.nix
new file mode 100644
index 00000000000..787aebef2d5
--- /dev/null
+++ b/pkgs/games/xbomb/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, libX11, libXaw }:
+
+stdenv.mkDerivation rec {
+  name = "xbomb-2.2b";
+  src = fetchurl {
+    url    = "http://www.gedanken.org.uk/software/xbomb/download/${name}.tgz";
+    sha256 = "0692gjw28qvh8wj9l58scjw6kxj7jdyb3yzgcgs9wcznq11q839m";
+  };
+
+  buildInputs = [ libX11 libXaw ];
+
+  preBuild = ''
+    substituteInPlace Makefile \
+      --replace /usr/local $out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.gedanken.org.uk/software/xbomb/;
+    description = "Minesweeper for X11 with various grid sizes and shapes";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b43fb9c7896..80e13bbff38 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9986,6 +9986,8 @@ let
 
   wpa_supplicant_gui = callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };
 
+  xbomb = callPackage ../games/xbomb { };
+
   xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack {
     inherit (xorg) utilmacros xproto inputproto xorgserver;
   };

From bdf32ed2ab1ed0f627a6217d85be942763c2bb1a Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 24 May 2015 13:52:12 +0000
Subject: [PATCH 0136/2322] fetchurl: allow adding meta info; fetchFrom*: add
 meta.homepage

The point of this is to be able to do `meta.homepage = src.meta.homepage;`
instead of the usual copy-paste for the packages that are hosted
on these hosting services.
---
 pkgs/build-support/fetchurl/default.nix |  5 +++++
 pkgs/top-level/all-packages.nix         | 15 +++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 0d7534e6758..b1dc6e7be31 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -76,6 +76,9 @@ in
 , # If set, don't download the file, but write a list of all possible
   # URLs (resulting from resolving mirror:// URLs) to $out.
   showURLs ? false
+
+, # Meta information, if any.
+  meta ? {}
 }:
 
 assert builtins.isList urls;
@@ -120,4 +123,6 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s
   # Doing the download on a remote machine just duplicates network
   # traffic, so don't do that.
   preferLocalBuild = true;
+
+  inherit meta;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b43fb9c7896..20d7fa23403 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -370,40 +370,43 @@ let
   fetchzip = import ../build-support/fetchzip { inherit lib fetchurl unzip; };
 
   fetchFromGitHub = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
-    inherit name;
+    inherit name sha256;
     url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
-    inherit sha256;
+    meta.homepage = "https://github.com/${owner}/${repo}/";
   };
 
   fetchFromBitbucket = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
-    inherit name;
+    inherit name sha256;
     url = "https://bitbucket.org/${owner}/${repo}/get/${rev}.tar.gz";
-    inherit sha256;
+    meta.homepage = "https://bitbucket.org/${owner}/${repo}/";
   };
 
   # gitorious example
   fetchFromGitorious = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
-    inherit name;
+    inherit name sha256;
     url = "https://gitorious.org/${owner}/${repo}/archive/${rev}.tar.gz";
-    inherit sha256;
+    meta.homepage = "https://gitorious.org/${owner}/${repo}/";
   };
 
   # cgit example, snapshot support is optional in cgit
   fetchFromSavannah = { repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
     inherit name sha256;
     url = "http://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz";
+    meta.homepage = "http://git.savannah.gnu.org/cgit/${repo}.git/";
   };
 
   # gitlab example
   fetchFromGitLab = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
     inherit name sha256;
     url = "https://gitlab.com/${owner}/${repo}/repository/archive.tar.gz?ref=${rev}";
+    meta.homepage = "https://gitlab.com/${owner}/${repo}/";
   };
 
   # gitweb example, snapshot support is optional in gitweb
   fetchFromRepoOrCz = { repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
     inherit name sha256;
     url = "http://repo.or.cz/${repo}.git/snapshot/${rev}.tar.gz";
+    meta.homepage = "http://repo.or.cz/${repo}.git/";
   };
 
   resolveMirrorURLs = {url}: fetchurl {

From 06ff4af597a75a0854cbcb9c822b1fe38a466a98 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Thu, 21 May 2015 23:32:03 -0500
Subject: [PATCH 0137/2322] Adding documentation to wrap.sh, added ability to
 retain any desired environment variables.

---
 .../python-modules/generic/default.nix            | 15 ++++++++++++++-
 pkgs/development/python-modules/generic/wrap.sh   | 14 +++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index b962e9f8472..211c781b5d4 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -47,11 +47,24 @@
 # Execute after shell hook
 , postShellHook ? ""
 
+# Environment variables to set in wrapper scripts, in addition to
+# PYTHONPATH and PATH.
+, setEnvVars ? []
+
 , ... } @ attrs:
 
 
 # Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
-if disabled then throw "${name} not supported for interpreter ${python.executable}" else python.stdenv.mkDerivation (attrs // {
+if disabled
+then throw "${name} not supported for interpreter ${python.executable}"
+else
+
+let
+  inherit (builtins) hasAttr;
+  inherit (lib) mapAttrs concatStringsSep optionals hasSuffix;
+in
+
+python.stdenv.mkDerivation (attrs // {
   inherit doCheck;
 
   name = namePrefix + name;
diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index 45f86df4dcf..f9a65c6a33f 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -41,9 +41,17 @@ wrapPythonProgramsIn() {
                 # wrapProgram creates the executable shell script described
                 # above. The script will set PYTHONPATH and PATH variables.!
                 # (see pkgs/build-support/setup-hooks/make-wrapper.sh)
-                wrapProgram $f \
-                              --prefix PYTHONPATH ':' $program_PYTHONPATH \
-                              --prefix PATH ':' $program_PATH
+                local wrap_args="$f \
+                                 --prefix PYTHONPATH ':' $program_PYTHONPATH \
+                                 --prefix PATH ':' $program_PATH"
+
+                # Add any additional environment variables to propagate.
+                for env_var in $setEnvVars; do
+                    # Look up the value of this variable
+                    local value=$(eval "echo \$$env_var")
+                    wrap_args="$wrap_args --set $env_var $value"
+                done
+                wrapProgram $wrap_args
             fi
         fi
     done

From bf1a16bbeac462ee46674e4d340a7f1edffddb0a Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Fri, 22 May 2015 09:57:42 -0500
Subject: [PATCH 0138/2322] removing superfluous lets

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

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 211c781b5d4..9856682ba89 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -59,11 +59,6 @@ if disabled
 then throw "${name} not supported for interpreter ${python.executable}"
 else
 
-let
-  inherit (builtins) hasAttr;
-  inherit (lib) mapAttrs concatStringsSep optionals hasSuffix;
-in
-
 python.stdenv.mkDerivation (attrs // {
   inherit doCheck;
 

From 6bb2e47abf8317364c86d84808a04a72e40ff1f0 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Sun, 24 May 2015 10:19:13 -0500
Subject: [PATCH 0139/2322] using makeWrapperArgs instead of setEnvVars

---
 pkgs/development/python-modules/generic/default.nix | 6 +++---
 pkgs/development/python-modules/generic/wrap.sh     | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 9856682ba89..378f047939f 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -47,9 +47,9 @@
 # Execute after shell hook
 , postShellHook ? ""
 
-# Environment variables to set in wrapper scripts, in addition to
-# PYTHONPATH and PATH.
-, setEnvVars ? []
+# Additional arguments to pass to the makeWrapper function, which wraps
+# generated binaries.
+, makeWrapperArgs ? []
 
 , ... } @ attrs:
 
diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index f9a65c6a33f..33b9a06f608 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -45,11 +45,10 @@ wrapPythonProgramsIn() {
                                  --prefix PYTHONPATH ':' $program_PYTHONPATH \
                                  --prefix PATH ':' $program_PATH"
 
-                # Add any additional environment variables to propagate.
-                for env_var in $setEnvVars; do
-                    # Look up the value of this variable
-                    local value=$(eval "echo \$$env_var")
-                    wrap_args="$wrap_args --set $env_var $value"
+                # Add any additional arguments provided by makeWrapperArgs
+                # argument to buildPythonPackage.
+                for arg in $makeWrapperArgs; do
+                    wrap_args="$wrap_args $arg"
                 done
                 wrapProgram $wrap_args
             fi

From c918903381e0aa2c48c5f40e9270148324bb476a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 May 2015 18:55:26 +0200
Subject: [PATCH 0140/2322] python: 2.7.9 -> 2.7.10

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

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index cfc52dabc5b..2b9e3c3736b 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -19,11 +19,11 @@ with stdenv.lib;
 
 let
   majorVersion = "2.7";
-  version = "${majorVersion}.9";
+  version = "${majorVersion}.10";
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
-    sha256 = "05j9in7yygfgl6nml0rixfvj1bbip982w3l54q05f0vyx8a7xllh";
+    sha256 = "1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw";
   };
 
   patches =

From 50be522a517b406cc11ef1f2d2ba7996498c648f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 May 2015 18:55:47 +0200
Subject: [PATCH 0141/2322] libvterm: set platforms

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

diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix
index 20433ab1458..cc2fd268ae6 100644
--- a/pkgs/development/libraries/libvterm/default.nix
+++ b/pkgs/development/libraries/libvterm/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, pkgconfig, glib, ncurses}:
+{ stdenv, fetchurl, pkgconfig, glib, ncurses }:
+
 stdenv.mkDerivation rec {
   name = "libvterm-0.99.7";
 
@@ -21,6 +22,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://libvterm.sourceforge.net/;
     description = "Terminal emulator library to mimic both vt100 and rxvt";
-    license="GPLv2+";
+    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 2e9bc4aee3e14bdb749925b59f715d620c9ad7cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 24 May 2015 12:17:43 +0200
Subject: [PATCH 0142/2322] goffice: update

Some update(s) were lost during GNOME-3.12 drop 25f9555599.
I hope there weren't much else lost.

@lethalman: do you think it's good to have goffice inside gnome3?
Nothing from inside refers to it, and it doesn't seem to be follow
gnome's release cycle. In fact it rather seems tied to gnumeric instead.
---
 pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix
index fd16d2d4985..517836f4d63 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix
@@ -2,11 +2,11 @@
 , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
 
 stdenv.mkDerivation rec {
-  name = "goffice-0.10.12";
+  name = "goffice-0.10.22";
 
   src = fetchurl {
     url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
-    sha256 = "0vh0sdig5n8sxzh4xx82lm8y8d0jcdhc2ipb1kq02qs142zs74ff";
+    sha256 = "0206a87a323b52a874dc54491374245f9e1c5f62e93a2ce4a02fb444a26b0e28";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From c75590fa6fe5ecc34fce69e8b47a2cc4d87fb65a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 24 May 2015 19:36:36 +0200
Subject: [PATCH 0143/2322] libgsf: small update

It was needed for gnumeric update.
/cc maintainer @lovek323.
---
 pkgs/development/libraries/libgsf/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 0479343a8f5..d08e4c231f5 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -1,24 +1,26 @@
 { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
-, python, gdk_pixbuf, libiconv, libintlOrEmpty }:
+, python, perl, gdk_pixbuf, libiconv, libintlOrEmpty }:
 
 with { inherit (stdenv.lib) optionals; };
 
 stdenv.mkDerivation rec {
-  name = "libgsf-1.14.30";
+  name = "libgsf-1.14.32";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
-    sha256 = "0w2v1a9sxsymd1mcy4mwsz4r6za9iwq69rj86nb939p41d4c6j6b";
+    sha256 = "13bf38b848c01e20eb89a48150b6f864434ee4dfbb6301ddf6f4080a36cd99e9";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
-  buildInputs = [ gettext bzip2 zlib python ];
+  buildInputs = [ gettext bzip2 zlib python ]
+    ++ stdenv.lib.optional doCheck perl;
 
   propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ]
     ++ libintlOrEmpty;
 
   doCheck = true;
+  preCheck = "patchShebangs ./tests/";
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 

From c505b8ac287aac0d5fecfc3b8e91f5cdc22ed649 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 24 May 2015 19:52:57 +0200
Subject: [PATCH 0144/2322] gnumeric: fix build, minor update,
 enableParallelBuilding

---
 pkgs/applications/office/gnumeric/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index 14e130ba1ff..02a78a2b2d1 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -3,15 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnumeric-1.12.18";
+  name = "gnumeric-1.12.20";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
-    sha256 = "402224f858cfa4e91503ab1be0491fa3322713dabe56b6eae171def8b736d9e9";
+    sha256 = "1k915ks55a32fpqrr0rx6j8ml9bw0a07f11350qc1bvkx53i2jad";
   };
 
-  preConfigure = ''sed -i 's/\(SUBDIRS.*\) doc/\1/' Makefile.in''; # fails when installing docs
-
   configureFlags = "--disable-component";
 
   # ToDo: optional libgda, python, introspection?
@@ -20,13 +18,14 @@ stdenv.mkDerivation rec {
     gnome3.goffice gtk3 makeWrapper gnome3.defaultIconTheme
   ];
 
+  enableParallelBuilding = true;
+
   preFixup = ''
     for f in "$out"/bin/gnumeric-*; do
       wrapProgram $f \
         --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
         --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
     done
-    rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
   meta = with stdenv.lib; {

From b217d9a4dd8384a267bfdd0fee82747c83a8ea13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 24 May 2015 17:01:06 +0200
Subject: [PATCH 0145/2322] fail2ban: fix broken download/hash

The (dynamically generated) compressed archive has changed. Switch from
fetchurl to fetchzip to not get bitten by that again.
---
 pkgs/tools/security/fail2ban/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index 03e193dacc7..184f8a59d28 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, pythonPackages, unzip, systemd, gamin }:
+{ stdenv, fetchzip, python, pythonPackages, unzip, systemd, gamin }:
 
 let version = "0.9.1"; in
 
@@ -6,10 +6,10 @@ pythonPackages.buildPythonPackage {
   name = "fail2ban-${version}";
   namePrefix = "";
 
-  src = fetchurl {
-    url    = "https://github.com/fail2ban/fail2ban/zipball/${version}";
-    name   = "fail2ban-${version}.zip";
-    sha256 = "0lk720r212mbpk1654qihyxcj5wmglzkg7v4pyiy5qq9qy58jmyr";
+  src = fetchzip {
+    name   = "fail2ban-${version}-src";
+    url    = "https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz";
+    sha256 = "111xvy2gxwn868kn0zy2fmdfa423z6fk57i7wsfrc0l74p1cdvs5";
   };
 
   buildInputs = [ unzip ];

From 56627d5444d53b32b0c46bb7037cfa7e4510b1db Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Sat, 23 May 2015 20:01:30 -0700
Subject: [PATCH 0146/2322] ocaml-opam: the sha hash of 1.2.2 changed

This is a bit scary. The sha of 1.2.2 changed, causing a crash on
download of the url. This updates to the current sha. Opam maintainer
why, oh why, do you change a released version without a version bump??
---
 pkgs/development/tools/ocaml/opam/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index 283bd581a13..0d765ec93bb 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -38,7 +38,7 @@ let
     };
     opam = fetchurl {
       url = "https://github.com/ocaml/opam/archive/1.2.2.zip";
-      sha256 = "1fxd5axlh9f3jb47y9paa9ld78qwcyp7pv3m60k401ym1dps32jk";
+      sha256 = "c590ce55ae69ec74f46215cf16a156a02b23c5f3ecb22f23a3ad9ba3d91ddb6e";
     };
   };
 in stdenv.mkDerivation rec {

From 82e098fd9319fe4e23c98819972fa3a0206442bf Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Mon, 11 May 2015 19:03:56 -0500
Subject: [PATCH 0147/2322] ocaml-typeconv: upgrade to 112.01.01

---
 .../typeconv/{default.nix => 109.60.01.nix}   |  0
 .../ocaml-modules/typeconv/112.01.01.nix      | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  8 ++++++--
 3 files changed, 26 insertions(+), 2 deletions(-)
 rename pkgs/development/ocaml-modules/typeconv/{default.nix => 109.60.01.nix} (100%)
 create mode 100644 pkgs/development/ocaml-modules/typeconv/112.01.01.nix

diff --git a/pkgs/development/ocaml-modules/typeconv/default.nix b/pkgs/development/ocaml-modules/typeconv/109.60.01.nix
similarity index 100%
rename from pkgs/development/ocaml-modules/typeconv/default.nix
rename to pkgs/development/ocaml-modules/typeconv/109.60.01.nix
diff --git a/pkgs/development/ocaml-modules/typeconv/112.01.01.nix b/pkgs/development/ocaml-modules/typeconv/112.01.01.nix
new file mode 100644
index 00000000000..fd7ebc28b97
--- /dev/null
+++ b/pkgs/development/ocaml-modules/typeconv/112.01.01.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, buildOcaml}:
+
+buildOcaml rec {
+  minimumSupportedOcamlVersion = "4.02";
+
+  name = "typeconv";
+  version = "112.01.01";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/type_conv/archive/${version}.tar.gz";
+    sha256 = "dbbc33b7ab420e8442d79ba4308ea6c0c16903b310d33525be18841159aa8855";
+  };
+
+  meta = {
+    homepage = "https://github.com/janestreet/type_conv/";
+    description = "Support library for preprocessor type conversions";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = with stdenv.lib.maintainers; [ z77z ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 438629e93cb..ef55701f917 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4294,9 +4294,13 @@ let
     };
 
     typeconv_108_08_00 = callPackage ../development/ocaml-modules/typeconv/108.08.00.nix { };
+    typeconv_109_60_01 = callPackage ../development/ocaml-modules/typeconv/109.60.01.nix { };
+    typeconv_112_01_01 = callPackage ../development/ocaml-modules/typeconv/112.01.01.nix { };
     ocaml_typeconv =
-      if lib.versionOlder "4.00" ocaml_version
-      then callPackage ../development/ocaml-modules/typeconv { }
+      if lib.versionOlder "4.02" ocaml_version
+      then typeconv_112_01_01
+      else if lib.versionOlder "4.00" ocaml_version
+      then typeconv_109_60_01
       else if lib.versionOlder "3.12" ocaml_version
       then typeconv_108_08_00
       else null;

From 8751d1ea1a43d877ebce2b57b2ce2f1bb1087593 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Sun, 24 May 2015 10:45:01 -0700
Subject: [PATCH 0148/2322] rename ocaml_typeconv to type_conv

The actual name of the package is type_conv
(https://github.com/janestreet/type_conv). Having it named
ocaml_typeconv adds a verbosity that isn't required and actually makes
the package harder to find.
---
 .../ocaml-modules/fieldslib/default.nix       |  4 ++--
 .../development/ocaml-modules/odn/default.nix |  4 ++--
 .../ocaml-modules/sexplib/108.08.00.nix       |  4 ++--
 .../ocaml-modules/sexplib/default.nix         |  4 ++--
 .../{typeconv => type_conv}/108.08.00.nix     |  2 +-
 .../{typeconv => type_conv}/109.60.01.nix     |  2 +-
 .../{typeconv => type_conv}/112.01.01.nix     |  2 +-
 .../development/tools/ocaml/oasis/default.nix |  4 ++--
 pkgs/top-level/all-packages.nix               | 23 ++++++++-----------
 9 files changed, 23 insertions(+), 26 deletions(-)
 rename pkgs/development/ocaml-modules/{typeconv => type_conv}/108.08.00.nix (95%)
 rename pkgs/development/ocaml-modules/{typeconv => type_conv}/109.60.01.nix (95%)
 rename pkgs/development/ocaml-modules/{typeconv => type_conv}/112.01.01.nix (96%)

diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix
index 28b83d3af46..38548790329 100644
--- a/pkgs/development/ocaml-modules/fieldslib/default.nix
+++ b/pkgs/development/ocaml-modules/fieldslib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, camlp4 }:
+{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }:
 
 assert stdenv.lib.versionOlder "4.00" (stdenv.lib.getVersion ocaml);
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ ocaml findlib ];
-  propagatedBuildInputs = [ ocaml_typeconv camlp4 ];
+  propagatedBuildInputs = [ type_conv camlp4 ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix
index bfffb67d4b0..eaeb7e7b22f 100644
--- a/pkgs/development/ocaml-modules/odn/default.nix
+++ b/pkgs/development/ocaml-modules/odn/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, ounit, camlp4}:
+{stdenv, fetchurl, ocaml, findlib, type_conv, ounit, camlp4}:
 
 stdenv.mkDerivation {
   name = "ocaml-data-notation-0.0.11";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj";
   };
 
-  buildInputs = [ocaml findlib ocaml_typeconv ounit camlp4];
+  buildInputs = [ocaml findlib type_conv ounit camlp4];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
index bde9c271371..dd9e89bcef7 100644
--- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
+++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, typeconv, camlp4}:
+{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ocaml findlib];
-  propagatedBuildInputs = [typeconv camlp4];
+  propagatedBuildInputs = [type_conv camlp4];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/default.nix
index a32c6a0e2ce..f816f80e51e 100644
--- a/pkgs/development/ocaml-modules/sexplib/default.nix
+++ b/pkgs/development/ocaml-modules/sexplib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, camlp4}:
+{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ocaml findlib];
-  propagatedBuildInputs = [ocaml_typeconv camlp4];
+  propagatedBuildInputs = [type_conv camlp4];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/typeconv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix
similarity index 95%
rename from pkgs/development/ocaml-modules/typeconv/108.08.00.nix
rename to pkgs/development/ocaml-modules/type_conv/108.08.00.nix
index 24daa366b2a..d3e32105f7d 100644
--- a/pkgs/development/ocaml-modules/typeconv/108.08.00.nix
+++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix
@@ -7,7 +7,7 @@ in
 assert stdenv.lib.versionOlder "3.12" ocaml_version;
 
 stdenv.mkDerivation {
-  name = "ocaml-typeconv-108.08.00";
+  name = "ocaml-type_conv-108.08.00";
 
   src = fetchurl {
     url = https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/type_conv-108.08.00.tar.gz;
diff --git a/pkgs/development/ocaml-modules/typeconv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
similarity index 95%
rename from pkgs/development/ocaml-modules/typeconv/109.60.01.nix
rename to pkgs/development/ocaml-modules/type_conv/109.60.01.nix
index 359f906ce34..fe42dd5ddcb 100644
--- a/pkgs/development/ocaml-modules/typeconv/109.60.01.nix
+++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
@@ -7,7 +7,7 @@ in
 assert stdenv.lib.versionOlder "4.00" ocaml_version;
 
 stdenv.mkDerivation {
-  name = "ocaml-typeconv-109.60.01";
+  name = "ocaml-type_conv-109.60.01";
 
   src = fetchurl {
     url = https://github.com/janestreet/type_conv/archive/109.60.01.tar.gz;
diff --git a/pkgs/development/ocaml-modules/typeconv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
similarity index 96%
rename from pkgs/development/ocaml-modules/typeconv/112.01.01.nix
rename to pkgs/development/ocaml-modules/type_conv/112.01.01.nix
index fd7ebc28b97..e65306d1501 100644
--- a/pkgs/development/ocaml-modules/typeconv/112.01.01.nix
+++ b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
@@ -3,7 +3,7 @@
 buildOcaml rec {
   minimumSupportedOcamlVersion = "4.02";
 
-  name = "typeconv";
+  name = "type_conv";
   version = "112.01.01";
 
   src = fetchurl {
diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index 29507f49c18..e823466f417 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, ocaml_typeconv, camlp4,
+{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, type_conv, camlp4,
  ocamlmod, ocamlify, ounit, expect}:
 
 stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   buildInputs =
     [
-      ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit camlp4
+      ocaml findlib type_conv ocamlmod ocamlify ounit camlp4
     ];
 
   propagatedBuildInputs = [ ocaml_data_notation ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef55701f917..87bb768d4e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4133,9 +4133,7 @@ let
 
     eliom = callPackage ../development/ocaml-modules/eliom { };
 
-    enumerate = callPackage ../development/ocaml-modules/enumerate {
-      type_conv = ocaml_typeconv;
-    };
+    enumerate = callPackage ../development/ocaml-modules/enumerate { };
 
     erm_xml = callPackage ../development/ocaml-modules/erm_xml { };
 
@@ -4293,21 +4291,20 @@ let
       camlp5 = camlp5_transitional;
     };
 
-    typeconv_108_08_00 = callPackage ../development/ocaml-modules/typeconv/108.08.00.nix { };
-    typeconv_109_60_01 = callPackage ../development/ocaml-modules/typeconv/109.60.01.nix { };
-    typeconv_112_01_01 = callPackage ../development/ocaml-modules/typeconv/112.01.01.nix { };
-    ocaml_typeconv =
+    type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { };
+    type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { };
+    type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { };
+    type_conv =
       if lib.versionOlder "4.02" ocaml_version
-      then typeconv_112_01_01
+      then type_conv_112_01_01
       else if lib.versionOlder "4.00" ocaml_version
-      then typeconv_109_60_01
+      then type_conv_109_60_01
       else if lib.versionOlder "3.12" ocaml_version
-      then typeconv_108_08_00
+      then type_conv_108_08_00
       else null;
 
-    sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix {
-      typeconv = typeconv_108_08_00;
-    };
+    sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { };
+
     ocaml_sexplib =
       if lib.versionOlder "4.00" ocaml_version
       then callPackage ../development/ocaml-modules/sexplib { }

From cac000d73a81e400e9e49cd14fb6070bea34df5a Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Sun, 24 May 2015 10:48:40 -0700
Subject: [PATCH 0149/2322] ocaml-sexplib: upgrade to 112.24.01

---
 .../sexplib/{default.nix => 111.25.00.nix}    |  4 ++--
 .../ocaml-modules/sexplib/112.24.01.nix       | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  8 +++++--
 3 files changed, 29 insertions(+), 4 deletions(-)
 rename pkgs/development/ocaml-modules/sexplib/{default.nix => 111.25.00.nix} (87%)
 create mode 100644 pkgs/development/ocaml-modules/sexplib/112.24.01.nix

diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix
similarity index 87%
rename from pkgs/development/ocaml-modules/sexplib/default.nix
rename to pkgs/development/ocaml-modules/sexplib/111.25.00.nix
index f816f80e51e..61d46e205fa 100644
--- a/pkgs/development/ocaml-modules/sexplib/default.nix
+++ b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix
@@ -7,7 +7,7 @@ in
 assert stdenv.lib.versionOlder "4.00" ocaml_version;
 
 stdenv.mkDerivation {
-  name = "ocaml-sexplib-111.25.0";
+  name = "ocaml-sexplib-111.25.00";
 
   src = fetchurl {
     url = https://ocaml.janestreet.com/ocaml-core/111.25.00/individual/sexplib-111.25.00.tar.gz;
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     homepage = https://ocaml.janestreet.com/;
     description = "Library for serializing OCaml values to and from S-expressions";
     license = licenses.asl20;
-    maintainers = [ maintainers.vbgl ];
+    maintainers = [ maintainers.vbgl maintainers.ericbmerritt ];
     platforms = ocaml.meta.platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix
new file mode 100644
index 00000000000..b63b5af05e8
--- /dev/null
+++ b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix
@@ -0,0 +1,21 @@
+{stdenv, buildOcaml, fetchurl, type_conv, camlp4}:
+
+buildOcaml rec {
+  minimumSupportedOcamlVersion = "4.02";
+  name = "sexplib";
+  version = "112.24.01";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/sexplib/archive/${version}.tar.gz";
+    sha256 = "5f776aee295cc51c952aecd4b74b52dd2b850c665cc25b3d69bc42014d3ba073";
+  };
+
+  propagatedBuildInputs = [ type_conv camlp4 ];
+
+  meta = with stdenv.lib; {
+    homepage = https://ocaml.janestreet.com/;
+    description = "Library for serializing OCaml values to and from S-expressions";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87bb768d4e6..5abd701501b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4304,10 +4304,14 @@ let
       else null;
 
     sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { };
+    sexplib_111_25_00 = callPackage ../development/ocaml-modules/sexplib/111.25.00.nix { };
+    sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { };
 
     ocaml_sexplib =
-      if lib.versionOlder "4.00" ocaml_version
-      then callPackage ../development/ocaml-modules/sexplib { }
+      if lib.versionOlder "4.02" ocaml_version
+      then sexplib_112_24_01
+      else if lib.versionOlder "4.00" ocaml_version
+      then sexplib_111_25_00
       else if lib.versionOlder "3.12" ocaml_version
       then sexplib_108_08_00
       else null;

From ea0d507935b4deda7faea3ac6d34a11e44f286e8 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Sun, 24 May 2015 10:14:14 -0700
Subject: [PATCH 0150/2322] sexplib: rename from ocaml_sexplib to sexplib

There really isn't any need for it to be named ocaml_sexplib
---
 pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                         | 8 ++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix b/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
index 09cfe1c350d..6b50f79caf9 100644
--- a/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
@@ -1,15 +1,15 @@
-{ocaml, findlib, stdenv, fetchurl, ocaml_sexplib}:
+{ocaml, findlib, stdenv, fetchurl, sexplib}:
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
 stdenv.mkDerivation {
   name = "ocaml-ipaddr-2.5.0";
-  
+
   src = fetchurl {
     url = https://github.com/mirage/ocaml-ipaddr/archive/2.5.0.tar.gz;
     sha256 = "0zpslxzjs5zdw20j3jaf6fr0w2imnidhrzggmnvwp198r76aq917";
   };
 
   buildInputs = [ocaml findlib];
-  propagatedBuildInputs = [ocaml_sexplib];
+  propagatedBuildInputs = [sexplib];
 
   createFindlibDestdir = true;
 
@@ -19,5 +19,5 @@ stdenv.mkDerivation {
     maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms;
   };
-  
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5abd701501b..b298c868204 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4118,7 +4118,6 @@ let
 
     cstruct = callPackage ../development/ocaml-modules/cstruct {
       lwt = ocaml_lwt;
-      sexplib = ocaml_sexplib;
     };
 
     csv = callPackage ../development/ocaml-modules/csv { };
@@ -4141,7 +4140,6 @@ let
 
     ezjsonm = callPackage ../development/ocaml-modules/ezjsonm {
       lwt = ocaml_lwt;
-      sexplib = ocaml_sexplib;
     };
 
     fieldslib = callPackage ../development/ocaml-modules/fieldslib { };
@@ -4307,7 +4305,7 @@ let
     sexplib_111_25_00 = callPackage ../development/ocaml-modules/sexplib/111.25.00.nix { };
     sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { };
 
-    ocaml_sexplib =
+    sexplib =
       if lib.versionOlder "4.02" ocaml_version
       then sexplib_112_24_01
       else if lib.versionOlder "4.00" ocaml_version
@@ -4349,9 +4347,7 @@ let
     uucp = callPackage ../development/ocaml-modules/uucp { };
     uunf = callPackage ../development/ocaml-modules/uunf { };
 
-    uri = callPackage ../development/ocaml-modules/uri {
-      sexplib = ocaml_sexplib;
-    };
+    uri = callPackage ../development/ocaml-modules/uri { };
 
     uuseg = callPackage ../development/ocaml-modules/uuseg { };
     uutf = callPackage ../development/ocaml-modules/uutf { };

From a88b7ed9087e5b772ce1343159e5f6ccd76a0de4 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Mon, 11 May 2015 19:12:05 -0500
Subject: [PATCH 0151/2322] ocaml-bin_prot: add initial version (112.24.00) to
 the system

---
 .../ocaml-modules/bin_prot/default.nix        | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/bin_prot/default.nix

diff --git a/pkgs/development/ocaml-modules/bin_prot/default.nix b/pkgs/development/ocaml-modules/bin_prot/default.nix
new file mode 100644
index 00000000000..4a2b9846271
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bin_prot/default.nix
@@ -0,0 +1,24 @@
+{stdenv, writeText, buildOcaml, fetchurl, type_conv}:
+
+buildOcaml rec {
+  name = "bin_prot";
+  version = "112.24.00";
+
+  minimumSupportedOcamlVersion = "4.00";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/bin_prot/archive/${version}.tar.gz";
+    sha256 = "dc0c978a825c7c123990af3317637c218f61079e6f35dc878260651084f1adb4";
+  };
+
+  propagatedBuildInputs = [ type_conv ];
+
+  hasSharedObjects = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/bin_prot;
+    description = "Binary protocol generator ";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b298c868204..861a95b2f01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4100,6 +4100,8 @@ let
 
     biniou = callPackage ../development/ocaml-modules/biniou { };
 
+    bin_prot = callPackage ../development/ocaml-modules/bin_prot { };
+
     ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
 
     ocaml_cairo2 = callPackage ../development/ocaml-modules/ocaml-cairo2 { };

From 21fa39af2ed484e29e53edac125a6b8ebee58c53 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Mon, 11 May 2015 23:27:08 -0500
Subject: [PATCH 0152/2322] ocaml-comparelib: add initial version (109.60.00)
 to the system

---
 .../ocaml-modules/comparelib/default.nix      | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/comparelib/default.nix

diff --git a/pkgs/development/ocaml-modules/comparelib/default.nix b/pkgs/development/ocaml-modules/comparelib/default.nix
new file mode 100644
index 00000000000..95001215814
--- /dev/null
+++ b/pkgs/development/ocaml-modules/comparelib/default.nix
@@ -0,0 +1,22 @@
+{stdenv, buildOcaml, fetchurl, type_conv}:
+
+buildOcaml rec {
+  name = "comparelib";
+  version = "109.60.00";
+
+  minimumSupportedOcamlVersion = "4.00";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/comparelib/archive/${version}.tar.gz";
+    sha256 = "1075fb05e0d1e290f71ad0f6163f32b2cb4cebdc77568491c7eb38ba91f5db7e";
+  };
+
+  propagatedBuildInputs = [ type_conv ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/comparelib;
+    description = "Syntax extension for deriving \"compare\" functions automatically";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 861a95b2f01..058a5a49c57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4220,6 +4220,8 @@ let
 
     ocaml_batteries = callPackage ../development/ocaml-modules/batteries { };
 
+    comparelib = callPackage ../development/ocaml-modules/comparelib { };
+
     ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { };
 
     ocaml_data_notation = callPackage ../development/ocaml-modules/odn { };

From 12c3b11bf4afcd33e46615f19ad24dc9ed6cdf8f Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Thu, 21 May 2015 20:36:10 -0700
Subject: [PATCH 0153/2322] ocaml-pa_ounit: add initial version (112.24.00) to
 the system

---
 .../ocaml-modules/pa_ounit/default.nix        | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/pa_ounit/default.nix

diff --git a/pkgs/development/ocaml-modules/pa_ounit/default.nix b/pkgs/development/ocaml-modules/pa_ounit/default.nix
new file mode 100644
index 00000000000..5970aba1e50
--- /dev/null
+++ b/pkgs/development/ocaml-modules/pa_ounit/default.nix
@@ -0,0 +1,20 @@
+{stdenv, buildOcaml, fetchurl, ounit}:
+
+buildOcaml rec {
+  name = "pa_ounit";
+  version = "112.24.00";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/pa_ounit/archive/${version}.tar.gz";
+    sha256 = "fa04e72fe1db41e6dc64f9707cf5705cb9b957aa93265120c875c808eb9b9b96";
+  };
+
+  propagatedBuildInputs = [ ounit ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/pa_ounit;
+    description = "OCaml inline testing";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 058a5a49c57..2bd61bddef8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4325,6 +4325,8 @@ let
 
     ocurl = callPackage ../development/ocaml-modules/ocurl { };
 
+    pa_ounit = callPackage ../development/ocaml-modules/pa_ounit { };
+
     pprint = callPackage ../development/ocaml-modules/pprint { };
 
     pycaml = callPackage ../development/ocaml-modules/pycaml { };

From 8a9d5637bc8efc2cb636ffc39a3ccc312f00dbac Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Mon, 11 May 2015 19:16:27 -0500
Subject: [PATCH 0154/2322] ocaml-custom_printf: add initial version
 (112.24.00) to the system

---
 .../ocaml-modules/custom_printf/default.nix   | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/custom_printf/default.nix

diff --git a/pkgs/development/ocaml-modules/custom_printf/default.nix b/pkgs/development/ocaml-modules/custom_printf/default.nix
new file mode 100644
index 00000000000..05a8ecfe616
--- /dev/null
+++ b/pkgs/development/ocaml-modules/custom_printf/default.nix
@@ -0,0 +1,23 @@
+{stdenv, buildOcaml, fetchurl, type_conv, sexplib, pa_ounit}:
+
+buildOcaml rec {
+  name = "custom_printf";
+  version = "112.24.00";
+
+  minimumSupportedOcamlVersion = "4.02";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/custom_printf/archive/${version}.tar.gz";
+    sha256 = "dad3aface92c53e8fbcc12cc9358c4767cb1cb09857d4819a10ed98eccaca8f9";
+  };
+
+  buildInputs = [ pa_ounit ];
+  propagatedBuildInputs = [ type_conv sexplib ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/custom_printf;
+    description = "Syntax extension for printf format strings";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2bd61bddef8..f0ade1baffc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4124,6 +4124,8 @@ let
 
     csv = callPackage ../development/ocaml-modules/csv { };
 
+    custom_printf = callPackage ../development/ocaml-modules/custom_printf { };
+
     deriving = callPackage ../development/tools/ocaml/deriving { };
 
     dolog = callPackage ../development/ocaml-modules/dolog { };

From 86e8c73d7b075bde8e9731690fa9c6bdd76bba18 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Fri, 15 May 2015 09:27:54 -0500
Subject: [PATCH 0155/2322] ocaml-herelib: add initial version (109.35.02) to
 the system

---
 .../ocaml-modules/herelib/default.nix         | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/herelib/default.nix

diff --git a/pkgs/development/ocaml-modules/herelib/default.nix b/pkgs/development/ocaml-modules/herelib/default.nix
new file mode 100644
index 00000000000..fd955602844
--- /dev/null
+++ b/pkgs/development/ocaml-modules/herelib/default.nix
@@ -0,0 +1,20 @@
+{stdenv, buildOcaml, fetchurl}:
+
+buildOcaml rec {
+  version = "109.35.02";
+  name = "herelib";
+
+  minimumSupportedOcamlVersion = "4.02";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/herelib/archive/${version}.tar.gz";
+    sha256 = "7f8394169cb63f6d41e91c9affa1b8ec240d5f6e9dfeda3fbb611df521d4b05a";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/herelib;
+    description = "Syntax extension for inserting the current location";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0ade1baffc..8a624670c83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4156,6 +4156,8 @@ let
 
     functory = callPackage ../development/ocaml-modules/functory { };
 
+    herelib = callPackage ../development/ocaml-modules/herelib { };
+
     io-page = callPackage ../development/ocaml-modules/io-page { };
 
     javalib = callPackage ../development/ocaml-modules/javalib {

From 6c2a3f35ea2947660ed6684a2e86cec8e97fcc6d Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Thu, 21 May 2015 20:50:32 -0700
Subject: [PATCH 0156/2322] ocaml-pa_bench: add initial version (112.06.00) to
 the system

---
 .../ocaml-modules/pa_bench/default.nix        | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/pa_bench/default.nix

diff --git a/pkgs/development/ocaml-modules/pa_bench/default.nix b/pkgs/development/ocaml-modules/pa_bench/default.nix
new file mode 100644
index 00000000000..d8ce0dbc7ea
--- /dev/null
+++ b/pkgs/development/ocaml-modules/pa_bench/default.nix
@@ -0,0 +1,23 @@
+{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit}:
+
+buildOcaml rec {
+  name = "pa_bench";
+  version = "112.06.00";
+
+  minimumSupportedOcamlVersion = "4.00";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/pa_bench/archive/${version}.tar.gz";
+    sha256 = "e3401e37f1d3d4acb957fd46a192d0ffcefeb0bedee63bbeb26969af1d540870";
+  };
+
+  buildInputs = [ pa_ounit ];
+  propagatedBuildInputs = [ type_conv ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/pa_bench;
+    description = "Syntax extension for inline benchmarks";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a624670c83..735e3318167 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4331,6 +4331,8 @@ let
 
     pa_ounit = callPackage ../development/ocaml-modules/pa_ounit { };
 
+    pa_bench = callPackage ../development/ocaml-modules/pa_bench { };
+
     pprint = callPackage ../development/ocaml-modules/pprint { };
 
     pycaml = callPackage ../development/ocaml-modules/pycaml { };

From 74b9ccfe3f8cda0aa95c5d0c45bfcac7b75c7c24 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Fri, 15 May 2015 09:29:11 -0500
Subject: [PATCH 0157/2322] ocaml-pa_test: add initial version (112.24.00) to
 the system

---
 .../ocaml-modules/pa_test/default.nix         | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/pa_test/default.nix

diff --git a/pkgs/development/ocaml-modules/pa_test/default.nix b/pkgs/development/ocaml-modules/pa_test/default.nix
new file mode 100644
index 00000000000..faf17e20dc1
--- /dev/null
+++ b/pkgs/development/ocaml-modules/pa_test/default.nix
@@ -0,0 +1,23 @@
+{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit, sexplib, herelib}:
+
+buildOcaml rec {
+  name = "pa_test";
+  version = "112.24.00";
+
+  minimumSupportedOcamlVersion = "4.00";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/pa_test/archive/${version}.tar.gz";
+    sha256 = "b03d13c2bc9fa9a4b1c507d7108d965202160f83e9781d430d3b53a1993e30d6";
+  };
+
+  buildInputs = [ pa_ounit ];
+  propagatedBuildInputs = [ type_conv sexplib herelib ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/pa_test;
+    description = "Syntax to reduce boiler plate in testing";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 735e3318167..48631df519d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4333,6 +4333,8 @@ let
 
     pa_bench = callPackage ../development/ocaml-modules/pa_bench { };
 
+    pa_test = callPackage ../development/ocaml-modules/pa_test { };
+
     pprint = callPackage ../development/ocaml-modules/pprint { };
 
     pycaml = callPackage ../development/ocaml-modules/pycaml { };

From 48c98e12d2b7651efc93e7f0ccb4d54cb3c8f12a Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Fri, 15 May 2015 09:29:22 -0500
Subject: [PATCH 0158/2322] ocaml-pipebang: add initial version (110.01.00) to
 the system

---
 .../ocaml-modules/pipebang/default.nix        | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/pipebang/default.nix

diff --git a/pkgs/development/ocaml-modules/pipebang/default.nix b/pkgs/development/ocaml-modules/pipebang/default.nix
new file mode 100644
index 00000000000..fa9a9f8f86a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/pipebang/default.nix
@@ -0,0 +1,20 @@
+{stdenv, buildOcaml, fetchurl}:
+
+buildOcaml rec {
+  name = "pipebang";
+  version = "110.01.00";
+
+  minimumSupportedOcamlVersion = "4.00";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/pipebang/archive/${version}.tar.gz";
+    sha256 = "a8858d9607c15cdf0a775196be060c8d91de724fc80a347d7a76ef1d38329096";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/pipebang;
+    description = "Syntax extension to transform x |! f into f x";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48631df519d..1735b1d7939 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4335,6 +4335,8 @@ let
 
     pa_test = callPackage ../development/ocaml-modules/pa_test { };
 
+    pipebang = callPackage ../development/ocaml-modules/pipebang { };
+
     pprint = callPackage ../development/ocaml-modules/pprint { };
 
     pycaml = callPackage ../development/ocaml-modules/pycaml { };

From e617429759ce9917b92b79a2f4199a67f62d46c6 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Fri, 15 May 2015 09:29:35 -0500
Subject: [PATCH 0159/2322] ocaml-typerep: add initial version (112.24.00) to
 the system

---
 .../ocaml-modules/typerep/default.nix         | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/typerep/default.nix

diff --git a/pkgs/development/ocaml-modules/typerep/default.nix b/pkgs/development/ocaml-modules/typerep/default.nix
new file mode 100644
index 00000000000..9500579e245
--- /dev/null
+++ b/pkgs/development/ocaml-modules/typerep/default.nix
@@ -0,0 +1,23 @@
+{stdenv, buildOcaml, fetchurl, type_conv}:
+
+buildOcaml rec {
+  name = "typerep";
+  version = "112.24.00";
+
+  minimumSupportedOcamlVersion = "4.00";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/typerep/archive/${version}.tar.gz";
+    sha256 = "4f1ab611a00aaf774e9774b26b687233e0c70d91f684415a876f094a9969eada";
+  };
+
+  propagatedBuildInputs = [ type_conv ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/typerep;
+    description = "Runtime types for OCaml (beta version)";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1735b1d7939..6f3b1781d78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4355,6 +4355,8 @@ let
 
     twt = callPackage ../development/ocaml-modules/twt { };
 
+    typerep = callPackage ../development/ocaml-modules/typerep { };
+
     utop = callPackage ../development/tools/ocaml/utop { };
 
     sawja = callPackage ../development/ocaml-modules/sawja { };

From 5dc0817b838d36ee229336baa5685bf59f697a87 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Sun, 24 May 2015 10:59:45 -0700
Subject: [PATCH 0160/2322] ocaml-variantslib: add initial version (109.15.03)
 to the system

---
 .../ocaml-modules/variantslib/default.nix     | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/variantslib/default.nix

diff --git a/pkgs/development/ocaml-modules/variantslib/default.nix b/pkgs/development/ocaml-modules/variantslib/default.nix
new file mode 100644
index 00000000000..cb25b844606
--- /dev/null
+++ b/pkgs/development/ocaml-modules/variantslib/default.nix
@@ -0,0 +1,22 @@
+{stdenv, buildOcaml, fetchurl, type_conv}:
+
+buildOcaml rec {
+  name = "variantslib";
+  version = "109.15.03";
+
+  minimumSupportedOcamlVersion = "4.00";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/variantslib/archive/${version}.tar.gz";
+    sha256 = "a948dcdd4ca54786fe0646386b6e37a9db03bf276c6557ea374d82740bf18055";
+  };
+
+  propagatedBuildInputs = [ type_conv ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/variantslib;
+    description = "OCaml variants as first class values";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f3b1781d78..4318cd8f13e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4370,6 +4370,8 @@ let
     uuseg = callPackage ../development/ocaml-modules/uuseg { };
     uutf = callPackage ../development/ocaml-modules/uutf { };
 
+    variantslib = callPackage ../development/ocaml-modules/variantslib { };
+
     vg = callPackage ../development/ocaml-modules/vg { };
 
     xmlm = callPackage ../development/ocaml-modules/xmlm { };

From ee089a7f19e74de259071af9d8e1408f0915ee7d Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Sun, 24 May 2015 11:00:39 -0700
Subject: [PATCH 0161/2322] ocaml-core_kernel: add initial version (112.24.00)
 to the system

---
 .../ocaml-modules/core_kernel/default.nix     | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/core_kernel/default.nix

diff --git a/pkgs/development/ocaml-modules/core_kernel/default.nix b/pkgs/development/ocaml-modules/core_kernel/default.nix
new file mode 100644
index 00000000000..0fed12b195d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/core_kernel/default.nix
@@ -0,0 +1,30 @@
+{stdenv, buildOcaml, fetchurl, type_conv,
+ bin_prot, comparelib, custom_printf, enumerate,
+ fieldslib, herelib, pa_bench, pa_test, pa_ounit,
+ pipebang, sexplib, typerep, variantslib}:
+
+buildOcaml rec {
+  name = "core_kernel";
+  version = "112.24.00";
+
+  minimumSupportedOcamlVersion = "4.02";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/core_kernel/archive/${version}.tar.gz";
+    sha256 = "93e1f21e35ade98a2bfbe45ba76eef4a8ad3fed97cdc0769f96e0fcc86d6a761";
+  };
+
+  hasSharedObjects = true;
+
+  buildInputs = [ pa_test pa_ounit ];
+  propagatedBuildInputs = [ type_conv pa_bench bin_prot comparelib custom_printf
+                            enumerate fieldslib herelib pipebang sexplib
+                            typerep variantslib ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/core_kernel;
+    description = "Jane Street Capital's standard library overlay (kernel)";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4318cd8f13e..699ea09806d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4226,6 +4226,8 @@ let
 
     comparelib = callPackage ../development/ocaml-modules/comparelib { };
 
+    core_kernel = callPackage ../development/ocaml-modules/core_kernel { };
+
     ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { };
 
     ocaml_data_notation = callPackage ../development/ocaml-modules/odn { };

From ed2782db54d715c6ec200292a79b5d157d7aebb9 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Sun, 24 May 2015 10:27:07 -0700
Subject: [PATCH 0162/2322] ocaml-core: add initial version (112.24.01) to the
 system

---
 .../ocaml-modules/core/default.nix            | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/core/default.nix

diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix
new file mode 100644
index 00000000000..96fd80087d6
--- /dev/null
+++ b/pkgs/development/ocaml-modules/core/default.nix
@@ -0,0 +1,30 @@
+{stdenv, buildOcaml, fetchurl, type_conv,
+ core_kernel, bin_prot, comparelib, custom_printf, enumerate,
+ fieldslib, herelib, pa_bench, pa_test, pa_ounit,
+ pipebang, sexplib, typerep, variantslib}:
+
+buildOcaml rec {
+  name = "core";
+  version = "112.24.01";
+
+  minimumSupportedOcamlVersion = "4.02";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/core/archive/${version}.tar.gz";
+    sha256 = "be5d53ebd4fd04ef23ebf9b3b2840c7aeced6bc4cc6cd3f5e89f71c9949000f4";
+  };
+
+  hasSharedObjects = true;
+
+  buildInputs = [ pa_bench pa_test pa_ounit ];
+  propagatedBuildInputs = [ type_conv core_kernel bin_prot comparelib
+                            custom_printf enumerate fieldslib herelib
+                            pipebang sexplib typerep variantslib ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/core;
+    description = "Jane Street Capital's standard library overlay";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 699ea09806d..deb18155da4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4228,6 +4228,8 @@ let
 
     core_kernel = callPackage ../development/ocaml-modules/core_kernel { };
 
+    core = callPackage ../development/ocaml-modules/core { };
+
     ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { };
 
     ocaml_data_notation = callPackage ../development/ocaml-modules/odn { };

From a129ec1b9b30b94c28e021412c9afe8e643cc9e2 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Fri, 15 May 2015 09:30:39 -0500
Subject: [PATCH 0163/2322] ocaml-async_kernel: add initial version (112.24.00)
 to the system

---
 .../ocaml-modules/async_kernel/default.nix    | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/async_kernel/default.nix

diff --git a/pkgs/development/ocaml-modules/async_kernel/default.nix b/pkgs/development/ocaml-modules/async_kernel/default.nix
new file mode 100644
index 00000000000..8c0d8d7c851
--- /dev/null
+++ b/pkgs/development/ocaml-modules/async_kernel/default.nix
@@ -0,0 +1,25 @@
+{stdenv, buildOcaml, fetchurl, core_kernel,
+ bin_prot, fieldslib, pa_ounit, pa_test,
+ sexplib, herelib}:
+
+buildOcaml rec {
+  name = "async_kernel";
+  version = "112.24.00";
+
+  minimumSupportedOcamlVersion = "4.02";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/async_kernel/archive/${version}.tar.gz";
+    sha256 = "95caf4249b55c5a6b38da56e314845e9ea9a0876eedd4cf0ddcb6c8dd660c6a0";
+  };
+
+  buildInputs = [ pa_test pa_ounit ];
+  propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/async_kernel;
+    description = "Jane Street Capital's asynchronous execution library (core) ";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index deb18155da4..d7886633af9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4047,6 +4047,8 @@ let
 
     asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { };
 
+    async_kernel = callPackage ../development/ocaml-modules/async_kernel { };
+
     base64 = callPackage ../development/ocaml-modules/base64 { };
 
     bolt = callPackage ../development/ocaml-modules/bolt { };

From 6fe371a695d46d4da6181384aeabbc5d2c4d9971 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Sun, 24 May 2015 11:20:38 -0700
Subject: [PATCH 0164/2322] ocaml-async_unix: add initial version (112.24.00)
 to the system

---
 .../ocaml-modules/async_unix/default.nix      | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/async_unix/default.nix

diff --git a/pkgs/development/ocaml-modules/async_unix/default.nix b/pkgs/development/ocaml-modules/async_unix/default.nix
new file mode 100644
index 00000000000..81fbd6a9918
--- /dev/null
+++ b/pkgs/development/ocaml-modules/async_unix/default.nix
@@ -0,0 +1,27 @@
+{stdenv, buildOcaml, fetchurl, async_kernel,
+ bin_prot, comparelib, core, fieldslib, herelib, pa_ounit,
+ pipebang, pa_test, sexplib}:
+
+buildOcaml rec {
+  name = "async_unix";
+  version = "112.24.00";
+
+  minimumSupportedOcamlVersion = "4.02";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/async_unix/archive/${version}.tar.gz";
+    sha256 = "d490b1dc42f0987a131fa9695b55f215ad90cdaffbfac35b7f9f88f3834337ab";
+  };
+
+  hasSharedObjects = true;
+  buildInputs = [ pa_ounit ];
+  propagatedBuildInputs = [ async_kernel core bin_prot comparelib
+                            fieldslib herelib pipebang pa_test sexplib ];
+
+   meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/async_unix;
+    description = "Jane Street Capital's asynchronous execution library (unix)";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+   };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7886633af9..b6b2c063b68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4049,6 +4049,8 @@ let
 
     async_kernel = callPackage ../development/ocaml-modules/async_kernel { };
 
+    async_unix = callPackage ../development/ocaml-modules/async_unix { };
+
     base64 = callPackage ../development/ocaml-modules/base64 { };
 
     bolt = callPackage ../development/ocaml-modules/bolt { };

From b20b270607a4358e51c24dd69938152d31d83ba2 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Sun, 24 May 2015 11:21:00 -0700
Subject: [PATCH 0165/2322] ocaml-async_extra: add initial version (112.24.00)
 to the system

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

diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix
new file mode 100644
index 00000000000..2d1e1dea69c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/async_extra/default.nix
@@ -0,0 +1,26 @@
+{stdenv, buildOcaml, fetchurl, async_kernel, async_unix,
+ bin_prot, core, custom_printf, fieldslib, herelib, pa_ounit,
+ pipebang, pa_test, sexplib}:
+
+buildOcaml rec {
+  name = "async_extra";
+  version = "112.24.00";
+
+  minimumSupportedOcamlVersion = "4.02";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/async_extra/archive/${version}.tar.gz";
+    sha256 = "51f6f67a9ad56fe5dcf09faeeca6ec2fea53a7a975a72bc80504b90841212e28";
+  };
+
+  buildInputs = [ pa_test pa_ounit ];
+  propagatedBuildInputs = [ async_kernel async_unix core bin_prot custom_printf
+                            fieldslib herelib pipebang sexplib ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/async_extra;
+    description = "Jane Street Capital's asynchronous execution library (extra)";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6b2c063b68..16fe90e9cdb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4047,6 +4047,8 @@ let
 
     asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { };
 
+    async_extra = callPackage ../development/ocaml-modules/async_extra { };
+
     async_kernel = callPackage ../development/ocaml-modules/async_kernel { };
 
     async_unix = callPackage ../development/ocaml-modules/async_unix { };

From cd0836233ade87180327194b8903ec3f2532c936 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Fri, 15 May 2015 09:31:34 -0500
Subject: [PATCH 0166/2322] ocaml-async: add initial version (112.24.00) to the
 system

---
 .../ocaml-modules/async/default.nix           | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/async/default.nix

diff --git a/pkgs/development/ocaml-modules/async/default.nix b/pkgs/development/ocaml-modules/async/default.nix
new file mode 100644
index 00000000000..2b84519036c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/async/default.nix
@@ -0,0 +1,23 @@
+{stdenv, buildOcaml, fetchurl, async_kernel,
+ async_unix, async_extra, pa_ounit}:
+
+buildOcaml rec {
+  name = "async";
+  version = "112.24.00";
+
+  minimumSupportedOcamlVersion = "4.02";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/async/archive/${version}.tar.gz";
+    sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9";
+  };
+
+  propagatedBuildInputs = [ async_kernel async_unix async_extra pa_ounit ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/async;
+    description = "Jane Street Capital's asynchronous execution library";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16fe90e9cdb..fcea3eb8c20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4053,6 +4053,8 @@ let
 
     async_unix = callPackage ../development/ocaml-modules/async_unix { };
 
+    async = callPackage ../development/ocaml-modules/async { };
+
     base64 = callPackage ../development/ocaml-modules/base64 { };
 
     bolt = callPackage ../development/ocaml-modules/bolt { };

From fbba3c1c33aca5d2e5161e69b9d8eefce49d9a6a Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Fri, 15 May 2015 09:31:44 -0500
Subject: [PATCH 0167/2322] ocaml-ctypes: add initial version (0.4.1) to the
 system

---
 .../ocaml-modules/ctypes/default.nix          | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ctypes/default.nix

diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix
new file mode 100644
index 00000000000..43c7ddbb290
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ctypes/default.nix
@@ -0,0 +1,32 @@
+{stdenv, buildOcaml, fetchurl, libffi, pkgconfig, ncurses}:
+
+buildOcaml rec {
+  name = "ctypes";
+  version = "0.4.1";
+
+  src = fetchurl {
+    url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz";
+    sha256 = "74564e049de5d3c0e76ea284c225cb658ac1a2b483345be1efb9be4b3c1702f5";
+  };
+
+  buildInputs = [ ncurses pkgconfig ];
+  propagatedBuildInputs = [ libffi ];
+
+  hasSharedObjects = true;
+
+  buildPhase =  ''
+     make XEN=false libffi.config ctypes-base ctypes-stubs
+     make XEN=false ctypes-foreign
+  '';
+
+  installPhase =  ''
+    make install XEN=false
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/ocamllabs/ocaml-ctypes;
+    description = "Library for binding to C libraries using pure OCaml";
+    license = licenses.mit;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fcea3eb8c20..acc7ccbee33 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4134,6 +4134,8 @@ let
 
     custom_printf = callPackage ../development/ocaml-modules/custom_printf { };
 
+    ctypes = callPackage ../development/ocaml-modules/ctypes { };
+
     deriving = callPackage ../development/tools/ocaml/deriving { };
 
     dolog = callPackage ../development/ocaml-modules/dolog { };

From 09c6cc19f2a906968546d54f7dd0feed06b95b63 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Sun, 24 May 2015 11:21:51 -0700
Subject: [PATCH 0168/2322] ocaml-async_ssl: add initial version (112.24.03) to
 the system

---
 .../ocaml-modules/async_ssl/default.nix       | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/async_ssl/default.nix

diff --git a/pkgs/development/ocaml-modules/async_ssl/default.nix b/pkgs/development/ocaml-modules/async_ssl/default.nix
new file mode 100644
index 00000000000..527d56ceaa0
--- /dev/null
+++ b/pkgs/development/ocaml-modules/async_ssl/default.nix
@@ -0,0 +1,25 @@
+{stdenv, buildOcaml, fetchurl, async, comparelib, core, ctypes, openssl,
+ fieldslib, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib}:
+
+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 comparelib core fieldslib pa_ounit
+                            herelib pipebang sexplib 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index acc7ccbee33..3593285c1b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4051,6 +4051,8 @@ let
 
     async_kernel = callPackage ../development/ocaml-modules/async_kernel { };
 
+    async_ssl = callPackage ../development/ocaml-modules/async_ssl { };
+
     async_unix = callPackage ../development/ocaml-modules/async_unix { };
 
     async = callPackage ../development/ocaml-modules/async { };

From ea41b6eec8a6b2f191d79de36416672c6ec8d3d7 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Fri, 15 May 2015 09:32:33 -0500
Subject: [PATCH 0169/2322] ocaml-cstruct: fix various build problems

---
 .../ocaml-modules/cstruct/default.nix         | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix
index 194a852e7ef..d62b9397a73 100644
--- a/pkgs/development/ocaml-modules/cstruct/default.nix
+++ b/pkgs/development/ocaml-modules/cstruct/default.nix
@@ -1,27 +1,31 @@
-{ stdenv, fetchzip, ocaml, findlib, sexplib, ocplib-endian, lwt, camlp4 }:
+{stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib, findlib,
+ async ? null, lwt ? null, camlp4}:
 
-let version = "1.6.0"; in
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
 
 stdenv.mkDerivation {
-  name = "ocaml-cstruct-${version}";
+  name = "ocaml-cstruct-1.6.0";
 
-  src = fetchzip {
-    url = "https://github.com/mirage/ocaml-cstruct/archive/v${version}.tar.gz";
-    sha256 = "09qw3rhfiq2kkns6660p9cwm5610k72md52a04cy91gr6gsig6ic";
+  src = fetchurl {
+    url = https://github.com/mirage/ocaml-cstruct/archive/v1.6.0.tar.gz;
+    sha256 = "0f90a1b7a03091cf22a3ccb11a0cce03b6500f064ad3766b5ed81418ac008ece";
   };
 
-  buildInputs = [ ocaml findlib lwt camlp4 ];
-  propagatedBuildInputs = [ ocplib-endian sexplib ];
-
-  configureFlags = "--enable-lwt";
+  configureFlags = stdenv.lib.strings.concatStringsSep " " ((if lwt != null then ["--enable-lwt"] else []) ++
+                                          (if async != null then ["--enable-async"] else []));
+  buildInputs = [ocaml findlib camlp4];
+  propagatedBuildInputs = [ocplib-endian sexplib lwt async];
 
   createFindlibDestdir = true;
+  dontStrip = true;
 
-  meta = {
-    description = "Map OCaml arrays onto C-like structs";
+  meta = with stdenv.lib; {
     homepage = https://github.com/mirage/ocaml-cstruct;
+    description = "Map OCaml arrays onto C-like structs";
     license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    maintainers = [ maintainers.vbgl maintainers.ericbmerritt ];
     platforms = ocaml.meta.platforms;
   };
 }

From 1c2fcf411503155da7d9ae0eee66f1894f4c511f Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Fri, 15 May 2015 09:35:42 -0500
Subject: [PATCH 0170/2322] ocaml-ipaddr: add version (2.6.1) to the system

---
 .../ocaml-modules/eliom/default.nix           |  4 +--
 .../ocaml-modules/ipaddr/default.nix          | 32 +++++++++++++++++++
 .../ocaml-modules/ocaml-ipaddr/default.nix    | 23 -------------
 .../ocaml-modules/ocsigen-server/default.nix  |  8 ++---
 pkgs/top-level/all-packages.nix               |  4 +--
 5 files changed, 40 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/ipaddr/default.nix
 delete mode 100644 pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix

diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 9700a1d8cc5..54644d83699 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving,
   js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml,
-  ocaml_ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
+  ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
   reactivedata, opam}:
 
 stdenv.mkDerivation rec
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec
   buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving
                  js_of_ocaml ocaml_optcomp opam];
 
-  propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ocaml_ipaddr
+  propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr
                             calendar cryptokit ocamlnet ocaml_react ocaml_ssl
                             ocaml_pcre ];
 
diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix
new file mode 100644
index 00000000000..749b6a1d94e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ipaddr/default.nix
@@ -0,0 +1,32 @@
+{stdenv, buildOcaml, fetchurl, sexplib}:
+
+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 ];
+
+  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/ocaml-ipaddr/default.nix b/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
deleted file mode 100644
index 6b50f79caf9..00000000000
--- a/pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ocaml, findlib, stdenv, fetchurl, sexplib}:
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
-stdenv.mkDerivation {
-  name = "ocaml-ipaddr-2.5.0";
-
-  src = fetchurl {
-    url = https://github.com/mirage/ocaml-ipaddr/archive/2.5.0.tar.gz;
-    sha256 = "0zpslxzjs5zdw20j3jaf6fr0w2imnidhrzggmnvwp198r76aq917";
-  };
-
-  buildInputs = [ocaml findlib];
-  propagatedBuildInputs = [sexplib];
-
-  createFindlibDestdir = true;
-
-  meta = with stdenv.lib; {
-    description = "An OCaml library for manipulation of IP (and MAC) address representations";
-    license = licenses.isc;
-    maintainers = [ maintainers.vbgl ];
-    platforms = ocaml.meta.platforms;
-  };
-
-}
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index d5c066ae2aa..58d8b047ec1 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -1,17 +1,17 @@
 {stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl,
-ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ocaml_ipaddr, zlib,
+ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
 libev, openssl, ocaml_sqlite3, tree, uutf}:
 
 stdenv.mkDerivation {
   name = "ocsigenserver-2.5";
-  
+
   src = fetchurl {
     url = https://github.com/ocsigen/ocsigenserver/archive/2.5.tar.gz;
     sha256 = "0ayzlzjwg199va4sclsldlcp0dnwdj45ahhg9ckb51m28c2pw46r";
   };
 
   buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt
-  ocamlnet ocaml_pcre cryptokit tyxml ocaml_ipaddr zlib libev openssl
+  ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl
   ocaml_sqlite3 tree uutf];
 
   configureFlags = "--root $(out) --prefix /";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   createFindlibDestdir = true;
 
-  postFixup = 
+  postFixup =
   ''
   rm -rf $out/var/run
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3593285c1b5..81d66fd2c0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4172,6 +4172,8 @@ let
 
     io-page = callPackage ../development/ocaml-modules/io-page { };
 
+    ipaddr = callPackage ../development/ocaml-modules/ipaddr { };
+
     javalib = callPackage ../development/ocaml-modules/javalib {
       extlib = ocaml_extlib_maximal;
     };
@@ -4256,8 +4258,6 @@ let
 
     ocamlify = callPackage ../development/tools/ocaml/ocamlify { };
 
-    ocaml_ipaddr = callPackage ../development/ocaml-modules/ocaml-ipaddr { };
-
     ocaml_lwt = callPackage ../development/ocaml-modules/lwt { };
 
     ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { };

From 745bb72050b0aa9df57533ed0c809164672ee403 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Fri, 15 May 2015 09:36:02 -0500
Subject: [PATCH 0171/2322] ocaml-conduit: add initial version (0.8.3) to the
 system

---
 .../ocaml-modules/conduit/default.nix         | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/conduit/default.nix

diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix
new file mode 100644
index 00000000000..dbb83f4c8cf
--- /dev/null
+++ b/pkgs/development/ocaml-modules/conduit/default.nix
@@ -0,0 +1,24 @@
+{stdenv, buildOcaml, fetchurl, sexplib, stringext, uri, cstruct, ipaddr,
+ async ? null, async_ssl ? null, lwt ? null}:
+
+buildOcaml rec {
+  name = "conduit";
+  version = "0.8.3";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-conduit/archive/v${version}.tar.gz";
+    sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1";
+  };
+
+  propagatedBuildInputs = ([ sexplib stringext uri cstruct ipaddr ]
+                            ++ stdenv.lib.optional (lwt != null) lwt
+                            ++ stdenv.lib.optional (async != null) async
+                            ++ stdenv.lib.optional (async_ssl != null) async_ssl);
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mirage/ocaml-conduit;
+    description = "Resolve URIs into communication channels for Async or Lwt ";
+    license = licenses.mit;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81d66fd2c0f..ad7cd690723 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4108,6 +4108,10 @@ let
     };
     camlimages = camlimages_4_1;
 
+    conduit = callPackage ../development/ocaml-modules/conduit {
+       lwt = ocaml_lwt;
+    };
+
     biniou = callPackage ../development/ocaml-modules/biniou { };
 
     bin_prot = callPackage ../development/ocaml-modules/bin_prot { };

From 38cabebc8d80b1a1bf229376d5dd4fcfa2181696 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Fri, 15 May 2015 09:36:16 -0500
Subject: [PATCH 0172/2322] ocaml-alcotest: add initial version (0.3.1) to the
 system

---
 .../ocaml-modules/alcotest/default.nix        | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/alcotest/default.nix

diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix
new file mode 100644
index 00000000000..68edfca25a8
--- /dev/null
+++ b/pkgs/development/ocaml-modules/alcotest/default.nix
@@ -0,0 +1,20 @@
+{stdenv, buildOcaml, fetchurl, ounit, re, cmdliner}:
+
+buildOcaml rec {
+  name = "alcotest";
+  version = "0.3.1";
+
+  src = fetchurl {
+    url = "https://github.com/samoht/alcotest/archive/${version}.tar.gz";
+    sha256 = "a0e6c9a33c59b206ecc949655fa6e17bdd1078c8b610b14d8f6f0f1b489b0b43";
+  };
+
+  propagatedBuildInputs = [ ounit re cmdliner ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/samoht/alcotest;
+    description = "A lightweight and colourful test framework";
+    license = stdenv.lib.licenses.isc;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad7cd690723..f14bf3c22ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4043,6 +4043,8 @@ let
 
     acgtk = callPackage ../applications/science/logic/acgtk { };
 
+    alcotest = callPackage ../development/ocaml-modules/alcotest {};
+
     ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { };
 
     asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { };

From e0f3638fdeeee645a1a8e0e87bab97a6383487fa Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Fri, 15 May 2015 09:36:30 -0500
Subject: [PATCH 0173/2322] ocaml-cohttp: add initial version (0.17.1) to the
 system

---
 .../ocaml-modules/cohttp/default.nix          | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/cohttp/default.nix

diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
new file mode 100644
index 00000000000..e219b59de5d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -0,0 +1,29 @@
+{stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib, sexplib, conduit,
+ stringext, base64, magic-mime, ounit, alcotest, lwt ? null,
+ async ? null, async_ssl ? null}:
+
+buildOcaml rec {
+  name = "cohttp";
+  version = "0.17.1";
+
+  minimumSupportedOcamlVersion = "4.02";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz";
+    sha256 = "fb124fb2fb5ff2e74559bf380627f6a537e208c1518ddcb01f0d37b62b55f673";
+  };
+
+  buildInputs = [ alcotest ];
+  propagatedBuildInputs = [ cmdliner re uri fieldslib sexplib sexplib
+                            conduit stringext base64 magic-mime ounit async
+                            async_ssl lwt ];
+
+  buildFlags = "PREFIX=$(out)";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mirage/ocaml-cohttp;
+    description = "Very lightweight HTTP server using Lwt or Async";
+    license = licenses.mit;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f14bf3c22ad..a8f879c05bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4126,6 +4126,10 @@ let
 
     cmdliner = callPackage ../development/ocaml-modules/cmdliner { };
 
+    cohttp = callPackage ../development/ocaml-modules/cohttp {
+      lwt = ocaml_lwt;
+    };
+
     config-file = callPackage ../development/ocaml-modules/config-file { };
 
     cpdf = callPackage ../development/ocaml-modules/cpdf { };

From b7ea979a75fb12872d23067a8bb16b849e7ee75c Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Fri, 22 May 2015 09:27:46 -0700
Subject: [PATCH 0174/2322] ocaml-lwt: make sure libev propagates as a
 dependency

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

diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 20acb75d931..0c81775f236 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -16,9 +16,9 @@ stdenv.mkDerivation {
     sha256 = "0idci0zadpb8hmblszsrvg6yf36w5a9y6rsdwjc3jww71dgrw5d9";
   };
 
-  buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib glib libev ncurses camlp4];
+  buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib glib ncurses camlp4];
 
-  propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text ];
+  propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ];
 
   configureFlags = [ "--enable-react" "--enable-glib" "--enable-ssl" "--enable-text" "--disable-ppx" ]
   ++ optional (versionAtLeast ocaml_version "4.0" && ! versionAtLeast ocaml_version "4.02") "--enable-toplevel";

From 75ea4778f5dcb571099c4cd62b34693a88f817a5 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 24 May 2015 20:20:49 +0000
Subject: [PATCH 0175/2322] switch to working libssh 0.7 download

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

diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 83efa5e65c9..64a6213433c 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
   name = "libssh-0.7.0";
 
   src = fetchurl {
-    url = "https://red.libssh.org/attachments/download/140/libssh-0.7.0.tar.xz";
-    sha256 = "0as07vz3h5qa14ysvgsddb90m1qh605p6ccv6kf1sr1k3wsbql85";
+    url = "https://git.libssh.org/projects/libssh.git/snapshot/libssh-0.7.0.tar.gz";
+    sha256 = "1wfrdqhv97f4ycd9bcpgb6gw47kr7b2iq8cz5knk8a6n9c6870k0";
   };
 
   postPatch = ''

From adf59e7110fd6cc608a23f20ee6b245db4030d4e Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Sun, 24 May 2015 00:15:12 -0700
Subject: [PATCH 0176/2322] New package: prom2json

---
 .../prometheus/prom2json/default.nix          | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/prom2json/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/prom2json/default.nix b/pkgs/servers/monitoring/prometheus/prom2json/default.nix
new file mode 100644
index 00000000000..95457758cd2
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/prom2json/default.nix
@@ -0,0 +1,28 @@
+{ goPackages, lib, fetchFromGitHub }:
+
+goPackages.buildGoPackage rec {
+  name = "prom2json-${rev}";
+  rev = "0.1.0";
+  goPackagePath = "github.com/prometheus/prom2json";
+
+  src = fetchFromGitHub {
+    owner = "prometheus";
+    repo = "prom2json";
+    inherit rev;
+    sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl";
+  };
+
+  buildInputs = with goPackages; [
+    golang_protobuf_extensions
+    prometheus.client_golang
+    protobuf
+  ];
+
+  meta = with lib; {
+    description = "A tool to scrape a Prometheus client and dump the result as JSON.";
+    homepage = https://github.com/prometheus/prom2json;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0e54b916ca..208000292bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8802,6 +8802,7 @@ let
 
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
+  prom2json = callPackage ../servers/monitoring/prometheus/prom2json { };
   prometheus = callPackage ../servers/monitoring/prometheus { };
   prometheus-alertmanager =
     callPackage ../servers/monitoring/prometheus/alertmanager { };

From af142824cbf490dd9117f0a5a8fb69da7a6e402a Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Sun, 24 May 2015 00:21:47 -0700
Subject: [PATCH 0177/2322] New package: prometheus-mysqld-exporter

---
 .../prometheus/mysqld_exporter/default.nix    | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix
new file mode 100644
index 00000000000..0b399d0cfff
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix
@@ -0,0 +1,27 @@
+{ goPackages, lib, fetchFromGitHub }:
+
+goPackages.buildGoPackage rec {
+  name = "prometheus-mysqld-exporter-${rev}";
+  rev = "0.1.0";
+  goPackagePath = "github.com/prometheus/mysqld_exporter";
+
+  src = fetchFromGitHub {
+    owner = "prometheus";
+    repo = "mysqld_exporter";
+    inherit rev;
+    sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9";
+  };
+
+  buildInputs = with goPackages; [
+    mysql
+    prometheus.client_golang
+  ];
+
+  meta = with lib; {
+    description = "Prometheus exporter for MySQL server metrics";
+    homepage = https://github.com/prometheus/mysqld_exporter;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 208000292bd..c7f4e396639 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8812,6 +8812,8 @@ let
     callPackage ../servers/monitoring/prometheus/haproxy_exporter { };
   prometheus-mesos-exporter =
     callPackage ../servers/monitoring/prometheus/mesos_exporter { };
+  prometheus-mysqld-exporter =
+    callPackage ../servers/monitoring/prometheus/mysqld_exporter { };
   prometheus-node-exporter =
     callPackage ../servers/monitoring/prometheus/node_exporter { };
   prometheus-pushgateway =

From 3115d18c533d685460288cedceb797b563c3347d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 24 May 2015 23:10:52 +0200
Subject: [PATCH 0178/2322] xorg: update drivers that seem useless

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

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index b7e5eef6d56..4d13e0a1709 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1405,11 +1405,11 @@ let
   }) // {inherit inputproto kbproto xorgserver xproto ;};
 
   xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" {
-    name = "xf86-input-keyboard-1.8.0";
+    name = "xf86-input-keyboard-1.8.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2;
-      sha256 = "0nyb61w30z32djrllgr2s1i13di3vsl6hg4pqjhxdal71971ria1";
+      url = mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2;
+      sha256 = "04d27kwqq03fc26an6051hs3i0bff8albhnngzyd59wxpwwzzj0s";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
   }) // {inherit inputproto xorgserver xproto ;};
@@ -1455,11 +1455,11 @@ let
   }) // {inherit inputproto randrproto xorgserver xproto ;};
 
   xf86inputvoid = (mkDerivation "xf86inputvoid" {
-    name = "xf86-input-void-1.4.0";
+    name = "xf86-input-void-1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2;
-      sha256 = "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a";
+      url = mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2;
+      sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr";
     };
     buildInputs = [pkgconfig xorgserver xproto ];
   }) // {inherit xorgserver xproto ;};
@@ -1535,11 +1535,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
 
   xf86videogeode = (mkDerivation "xf86videogeode" {
-    name = "xf86-video-geode-2.11.16";
+    name = "xf86-video-geode-2.11.17";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-geode-2.11.16.tar.bz2;
-      sha256 = "19y13xl7yfrgyis92rmxi0ld95ajgr5il0n9j1dridwzw9aizz1q";
+      url = mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2;
+      sha256 = "0h9w6cfj7s86rg72c6qci8f733hg4g7paan5fwmmj7p74ckd9d07";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
@@ -1595,11 +1595,11 @@ let
   }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;};
 
   xf86videomach64 = (mkDerivation "xf86videomach64" {
-    name = "xf86-video-mach64-6.9.4";
+    name = "xf86-video-mach64-6.9.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2;
-      sha256 = "0pl582vnc6hdxqhf5c0qdyanjqxb4crnhqlmxxml5a60syw0iwcp";
+      url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2;
+      sha256 = "07xlf5nsjm0x18ij5gyy4lf8hwpl10i8chi3skpqjh84drdri61y";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
@@ -1625,11 +1625,11 @@ let
   }) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;};
 
   xf86videoneomagic = (mkDerivation "xf86videoneomagic" {
-    name = "xf86-video-neomagic-1.2.8";
+    name = "xf86-video-neomagic-1.2.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2;
-      sha256 = "0x48sxs1p3kmwk3pq1j7vl93y59gdmgkq1x5xbnh0yal0angdash";
+      url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2;
+      sha256 = "1whb2kgyqaxdjim27ya404acz50izgmafwnb6y9m89q5n6b97y3j";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess xorgserver xproto ];
   }) // {inherit fontsproto libpciaccess xorgserver xproto ;};
@@ -1685,31 +1685,31 @@ let
   }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
 
   xf86videor128 = (mkDerivation "xf86videor128" {
-    name = "xf86-video-r128-6.9.2";
+    name = "xf86-video-r128-6.10.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-r128-6.9.2.tar.bz2;
-      sha256 = "1q3fsc603k2yinphx5rrcl5356qkpywwz8axlw277l2231gjjbcb";
+      url = mirror://xorg/individual/driver/xf86-video-r128-6.10.0.tar.bz2;
+      sha256 = "0g9m1n5184h05mq14vb6k288zm6g81a9m048id00l8v8f6h33mc0";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ];
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
 
   xf86videosavage = (mkDerivation "xf86videosavage" {
-    name = "xf86-video-savage-2.3.7";
+    name = "xf86-video-savage-2.3.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-savage-2.3.7.tar.bz2;
-      sha256 = "0i2aqp68rfkrz9c1p6d7ny9x7bjrlnby7q56zf01fb12r42l4784";
+      url = mirror://xorg/individual/driver/xf86-video-savage-2.3.8.tar.bz2;
+      sha256 = "0qzshncynjdmyhavhqw4x5ha3gwbygi0zbsy158fpg1jcnla9kpx";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videosiliconmotion = (mkDerivation "xf86videosiliconmotion" {
-    name = "xf86-video-siliconmotion-1.7.7";
+    name = "xf86-video-siliconmotion-1.7.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2;
-      sha256 = "1an321kqvsxq0z35acwl99lc8hpdkayw0q180744ypcl8ffvbf47";
+      url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.8.tar.bz2;
+      sha256 = "1sqv0y31mi4zmh9yaxqpzg7p8y2z01j6qys433hb8n4yznllkm79";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ];
   }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index f02dd1e89f0..72e960d5c72 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -117,12 +117,12 @@ 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.9.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
-mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2
+mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-libinput-0.8.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-synaptics-1.8.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2
-mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2
+mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ati-7.5.0.tar.bz2
@@ -131,23 +131,23 @@ mirror://xorg/individual/driver/xf86-video-nouveau-1.0.11.tar.bz2
 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2
-mirror://xorg/individual/driver/xf86-video-geode-2.11.16.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-i128-1.3.6.tar.bz2
 mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
-mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.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-modesetting-0.9.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2
-mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.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-openchrome-0.3.3.tar.bz2
-mirror://xorg/individual/driver/xf86-video-r128-6.9.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-savage-2.3.7.tar.bz2
-mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2
+mirror://xorg/individual/driver/xf86-video-r128-6.10.0.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.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

From 6686914d714666be9bf4a64a42ef1307bc67ce50 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Tue, 7 Apr 2015 16:11:59 +0300
Subject: [PATCH 0179/2322] CONTRIBUTING.md: initial

---
 CONTRIBUTING.md | 68 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000000..519b2180b01
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,68 @@
+# How to contribute
+
+## Opening issues
+
+* Make sure you have a [GitHub account](https://github.com/signup/free)
+* Submit a ticket for your issue, assuming one does not already exist.
+  * Clearly describe the issue including steps to reproduce when it is a bug.
+
+## Making patches
+
+* Read [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/)
+* Fork the repository on GitHub.
+* Create a branch for your future fix.
+  * You can make branch from a commit of your local `nixos-version`. That will help you to avoid additional local compilations. Because you will recieve some packages from cache server.
+    * For example: `nixos-version` returns `15.05.git.0998212 (Dingo)`. So you can do:
+
+        ```bash
+        git checkout 0998212
+        git checkout -b 'fix/pkg-name-update'
+        ```
+  * Please avoid working directly on the `master` branch.
+* Make commits of logical units. 
+  * If you removed pkgs, made some major changes etc., write about them in `nixos/doc/manual/release-notes/rl-unstable.xml`.
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Format the commit in a following way:
+
+        ```
+        (pkg-name | service-name): (update from -> to | init at version | refactor | etc)
+
+        Additional information.
+        ```
+  * Examples:
+    * `foo-pkg: init at 2.0.1`
+    * `bar-pkg: update 3.0 -> 3.1.1`
+    * `lala-service: add bazBaz option`
+    * `tata-service: refactor config generation`
+* Test your changes. If you work with 
+  * nixpkgs
+    * update pkg -> 
+      * `nix-env -i pkg-name -f <path to your local nixpkgs folder>`
+    * add pkg -> 
+      * Make sure it's in `pkgs/top-level/all-packages.nix`
+      * `nix-env -i pkg-name -f <path to your local nixpkgs folder>`
+    * _If you don't want to install pkg in you profile_. 
+      * `nix-build -A pkg-attribute-name <path to your local nixpkgs folder>/default.nix` and check results in the folder `result`. It will appear in the same directory where you did `nix-build`.
+    * If you did `nix-env -i pkg-name` you can do `nix-env -e pkg-name` to uninstall it from your system.
+  * nixos and it's modules
+    * You can add new module to you `nixos-configuration file` (usually it's `/etc/nixos/configuration.nix`.  
+    And do `sudo nixos-rebuild test -I nixpkgs=<path to your local nixpkgs folder> --fast`
+* If you have commits `pkg-name: oh, forgot to insert whitespace`: squash commits in this case. Use `git rebase -i`.
+* Rebase you branch against current `master`.
+
+## Submitting changes
+
+* Push your changes to your fork of nixpkgs.
+* Create pull request.
+  * Write the title in format `(pkg-name | service): improvement`
+    * If you update the pkg, write versions `from -> to`
+  * Write in comment if you have tested your patch. Do not rely much on `TravisCL`.
+  * If you make an improvement, write why is it good.
+  * Notify maintainers of the package. For example add to the message: `cc @jagajaga @domenkozar`
+
+## Hotfixing pull requests
+
+* Make the appropriate changes in you branch.
+* Don't create additional commits.
+  * `git rebase`
+  * `git push --force` to your branch.

From 3c5b83262bc397db53cde5a153c78eda4fe268fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 24 May 2015 23:26:07 +0200
Subject: [PATCH 0180/2322] xorg: update cirrus and libinput drivers

---
 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 4d13e0a1709..7b4a49d4077 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1415,11 +1415,11 @@ let
   }) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputlibinput = (mkDerivation "xf86inputlibinput" {
-    name = "xf86-input-libinput-0.8.0";
+    name = "xf86-input-libinput-0.10.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-libinput-0.8.0.tar.bz2;
-      sha256 = "0fm4vrkw7azipbnwvc2l18g65z77pllsznaajd8q3zpg9ycb0li1";
+      url = mirror://xorg/individual/driver/xf86-input-libinput-0.10.0.tar.bz2;
+      sha256 = "1w1v83qlr7n4iqgd7grmhx0gbz1fhsnpk88j4a136dk4xmc069x4";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
   }) // {inherit inputproto xorgserver xproto ;};
@@ -1505,11 +1505,11 @@ let
   }) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videocirrus = (mkDerivation "xf86videocirrus" {
-    name = "xf86-video-cirrus-1.5.2";
+    name = "xf86-video-cirrus-1.5.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2;
-      sha256 = "1mycqgjp18b6adqj2h90vp324xh8ysyi5migfmjc914vbnkf2q9k";
+      url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2;
+      sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 72e960d5c72..9913371542b 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -118,7 +118,7 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-evdev-2.9.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-libinput-0.8.0.tar.bz2
+mirror://xorg/individual/driver/xf86-input-libinput-0.10.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-synaptics-1.8.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2
@@ -128,7 +128,7 @@ mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ati-7.5.0.tar.bz2
 mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.11.tar.bz2
-mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.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-fbdev-0.4.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2

From 34c9d898dad1fcead5d9f1f0593ef3f13219dd70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 24 May 2015 23:28:41 +0200
Subject: [PATCH 0181/2322] xorg: update randr

---
 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 7b4a49d4077..d5c1abe3f36 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -775,11 +775,11 @@ let
   }) // {inherit libX11 libXext xextproto xproto libXt ;};
 
   libXrandr = (mkDerivation "libXrandr" {
-    name = "libXrandr-1.4.2";
+    name = "libXrandr-1.5.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXrandr-1.4.2.tar.bz2;
-      sha256 = "1b95p3l84ppv6j7dbbmg0zrz6k8xdwvnag1l6ajm3gk9qwdb79ya";
+      url = mirror://xorg/individual/lib/libXrandr-1.5.0.tar.bz2;
+      sha256 = "0n6ycs1arf4wb1cal9il6v7vbxbf21qhs9sbfl8xndgwnxclk1kg";
     };
     buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ];
   }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
@@ -1015,11 +1015,11 @@ let
   }) // {inherit libXau ;};
 
   randrproto = (mkDerivation "randrproto" {
-    name = "randrproto-1.4.1";
+    name = "randrproto-1.5.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/proto/randrproto-1.4.1.tar.bz2;
-      sha256 = "1p7155hsp48b0sjm4rc67wz6y1nxqrq69vyw0sjxh8h6pcpcngal";
+      url = mirror://xorg/individual/proto/randrproto-1.5.0.tar.bz2;
+      sha256 = "0s4496z61y5q45q20gldwpf788b9nsa8hb13gnck1mwwwwrmarsc";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 9913371542b..5382dc0b765 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -75,7 +75,7 @@ mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.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/libXrandr-1.4.2.tar.bz2
+mirror://xorg/individual/lib/libXrandr-1.5.0.tar.bz2
 mirror://xorg/individual/lib/libXrender-0.9.8.tar.bz2
 mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2
@@ -89,7 +89,7 @@ mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2
 mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2
 mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2
 mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2
-mirror://xorg/individual/proto/randrproto-1.4.1.tar.bz2
+mirror://xorg/individual/proto/randrproto-1.5.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2

From d3fe5487add465f46da407cdfa0cc1fe031d1020 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Sun, 24 May 2015 14:33:39 -0700
Subject: [PATCH 0182/2322] New package: prometheus-collectd-exporter

---
 .../prometheus/collectd_exporter/default.nix  | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix
new file mode 100644
index 00000000000..a859c437701
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix
@@ -0,0 +1,24 @@
+{ goPackages, lib, fetchFromGitHub }:
+
+goPackages.buildGoPackage rec {
+  name = "prometheus-collectd-exporter-${rev}";
+  rev = "0.1.0";
+  goPackagePath = "github.com/prometheus/collectd_exporter";
+
+  src = fetchFromGitHub {
+    owner = "prometheus";
+    repo = "collectd_exporter";
+    inherit rev;
+    sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1";
+  };
+
+  buildInputs = [ goPackages.prometheus.client_golang ];
+
+  meta = with lib; {
+    description = "Relay server for exporting metrics from collectd to Prometheus";
+    homepage = "https://github.com/prometheus/alertmanager";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7f4e396639..f55c035c3a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8808,6 +8808,8 @@ let
     callPackage ../servers/monitoring/prometheus/alertmanager { };
   prometheus-cli =
     callPackage ../servers/monitoring/prometheus/cli { };
+  prometheus-collectd-exporter =
+    callPackage ../servers/monitoring/prometheus/collectd_exporter { };
   prometheus-haproxy-exporter =
     callPackage ../servers/monitoring/prometheus/haproxy_exporter { };
   prometheus-mesos-exporter =

From 9f70b1ab313ecfd6322e488879deb32ab58ccaf3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 24 May 2015 15:01:13 -0700
Subject: [PATCH 0183/2322] bind: Add propagatedBuildInputs

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

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 70d88b2a968..604908a4522 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -55,6 +55,11 @@ stdenv.mkDerivation rec {
     optReadline optLibcap optIdnkit optLibiconv optPostgresql optLibmysql
     optDb optOpenldap
   ];
+  # TODO(wkennington): Remove this hack once we fix header / .la  / .pc files
+  propagatedBuildInputs = [
+    optKerberos optOpenssl optLibxml2 optJson_c
+    optLibseccomp optLibcap
+  ];
 
   configureFlags = [
     (mkOther                          "localstatedir"       "/var")

From 580032914f16ece55ee9b4146fc0740975a56f2e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 24 May 2015 15:05:17 -0700
Subject: [PATCH 0184/2322] dhcp: Add proper bind dependency

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

diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix
index 4bf321d1ac0..6b3bf4fcedb 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/pkgs/tools/networking/dhcp/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   # due to an uninitialized variable.
   CFLAGS = "-g -O2 -Wall";
 
-  buildInputs = [ perl makeWrapper openldap ];
+  buildInputs = [ perl makeWrapper openldap bind ];
 
   configureFlags = [
     "--with-libbind=${bind}"

From 83096066c87f9a2c4b19ceded8d3e86d751ce583 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 May 2015 00:12:16 +0200
Subject: [PATCH 0185/2322] irssi: add second download mirror because irrsi.org
 is offline

(cherry picked from commit 79effb88a0d342ffc423b7044548c34c7f5c1aa4)
---
 pkgs/applications/networking/irc/irssi/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index b8940bcd96e..8c26bf8d10e 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -2,16 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "irssi-0.8.17";
-  
+
   src = fetchurl {
-    url = "http://irssi.org/files/${name}.tar.bz2";
+    urls = [ "https://distfiles.macports.org/irssi/${name}.tar.bz2"
+             "http://irssi.org/files/${name}.tar.bz2"
+           ];
     sha256 = "01v82q2pfiimx6lh271kdvgp8hl4pahc3srg04fqzxgdsb5015iw";
   };
-  
+
   buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ];
-  
+
   NIX_LDFLAGS = ncurses.ldflags;
-  
+
   configureFlags = "--with-proxy --with-ncurses --enable-ssl --with-perl=yes";
 
   meta = {

From 3fa1b2183af51df57cb4fa521fd8d4da005d2b0d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 May 2015 11:38:32 +0200
Subject: [PATCH 0186/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/8ed599c15553edfe681968a9ce26b983bf81a6bf
 with hackage2nix revision 61d7380337df7e1b568c1b30f4d97e5c2df42b66

---
 .../haskell-modules/hackage-packages.nix      | 123 ++++++++++++++----
 1 file changed, 96 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 74bf9011231..3d102742a26 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1057,8 +1057,8 @@ self: {
      }:
      mkDerivation {
        pname = "BNFC";
-       version = "2.7.1";
-       sha256 = "1n9l64wzga3i7ifh2k5rwhxp60gb0av5fszygw5mvr31r64cf4fp";
+       version = "2.8";
+       sha256 = "0d3zcxspxcpnifv3kqg8d6gp01wxybakcbw7jh69gqg8rzfmzgi1";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -17385,7 +17385,9 @@ self: {
      mkDerivation {
        pname = "aeson-native";
        version = "0.3.3.2";
+       revision = "1";
        sha256 = "1s5i88r8sdd7ayrpjw6f18273k6r0igk0sswb503hzvjagzmzffh";
+       editedCabalFile = "c9519a30bce75564cfbe84aade5ffb99fad12ecea1c7d2c362cca2234b8ae497";
        buildDepends = [
          attoparsec base blaze-builder blaze-textual-native bytestring
          containers deepseq hashable mtl old-locale syb text time
@@ -23032,8 +23034,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, hspec }:
      mkDerivation {
        pname = "base-orphans";
-       version = "0.3.1";
-       sha256 = "12nabqwniywwxsysdk0kh1zscdwyjk10z1fk3iqqcg0bqmyb67i5";
+       version = "0.3.2";
+       sha256 = "1qbnhxchl2kdjbwqz3mp7rq963w6y6ws4kflmv6hmcp25aaqh6pl";
        buildDepends = [ base ghc-prim ];
        testDepends = [ base hspec ];
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
@@ -37813,21 +37815,19 @@ self: {
   "darkplaces-rcon-util" = callPackage
     ({ mkDerivation, base, bytestring, ConfigFile, containers
      , darkplaces-rcon, darkplaces-text, directory, filepath, haskeline
-     , HostAndPort, hspec, hspec-core, mtl, old-locale
-     , optparse-applicative, text, time, utf8-string
+     , HostAndPort, hspec, hspec-core, mtl, optparse-applicative, text
+     , time, utf8-string
      }:
      mkDerivation {
        pname = "darkplaces-rcon-util";
-       version = "0.1";
-       revision = "3";
-       sha256 = "0accwwwifhmlnrc5rqb9kc44mcrpbfibakip8pwi2aqs7xvchavr";
-       editedCabalFile = "c26b82e362cada670c0edc2c27c5c571f1898edb5ec29ab4c35d913c537b264d";
+       version = "0.1.1";
+       sha256 = "1xv9906ag2vgkzbk66f9r6lr5j6qwlwss246hjl7iriq315dmqlg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base bytestring ConfigFile containers darkplaces-rcon
          darkplaces-text directory filepath haskeline HostAndPort mtl
-         old-locale optparse-applicative text time utf8-string
+         optparse-applicative text time utf8-string
        ];
        testDepends = [
          base bytestring darkplaces-rcon darkplaces-text hspec hspec-core
@@ -46625,6 +46625,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "exherbo-cabal" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers
+     , haddock-library, http-client, pcre-light, pretty
+     }:
+     mkDerivation {
+       pname = "exherbo-cabal";
+       version = "0.1.0.0";
+       sha256 = "0ap3j5shgy5l1crsyq6dkz2g4gd9y7r8vx4rsppib7y0gqqczpfm";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring Cabal containers haddock-library http-client
+         pcre-light pretty
+       ];
+       jailbreak = true;
+       description = "Exheres generator for cabal packages";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "exif" = callPackage
     ({ mkDerivation, base, exif }:
      mkDerivation {
@@ -73011,6 +73031,7 @@ self: {
        ];
        description = "Shared library used be ide-backend and ide-backend-server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ide-backend-rts" = callPackage
@@ -73044,6 +73065,7 @@ self: {
        ];
        description = "An IDE backend server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ideas" = callPackage
@@ -81564,8 +81586,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }:
      mkDerivation {
        pname = "linearscan";
-       version = "0.5.0.0";
-       sha256 = "0n8xcj5pkz50mkx4cvqh1iywlf9vrk6bk4d3lv8fa22ik88mdr15";
+       version = "0.5.1.0";
+       sha256 = "123gs28vfb1lx9izzjran79caqj92p1l0v051pd0pf2nfm6iymgb";
        buildDepends = [ base containers ghc-prim mtl transformers ];
        homepage = "http://github.com/jwiegley/linearscan";
        description = "Linear scan register allocator, formally verified in Coq";
@@ -81579,8 +81601,8 @@ self: {
      }:
      mkDerivation {
        pname = "linearscan-hoopl";
-       version = "0.5.0.0";
-       sha256 = "0z8lhi4q89f1b2fk5a3vn0a9q9h4w81b0wjqdypb7bz5lisvvg0s";
+       version = "0.5.1.0";
+       sha256 = "147ryhliilbpmzy87bda7aapfpfhw4r6rcy6jla2ampy7qvvvbyk";
        buildDepends = [
          base containers free hoopl linearscan transformers
        ];
@@ -85771,8 +85793,8 @@ self: {
      }:
      mkDerivation {
        pname = "memory";
-       version = "0.2";
-       sha256 = "05v7ywbxn61bk8gk8sc4fpm1n76kcvbab1jgvbq82m6g56dhmrh0";
+       version = "0.3";
+       sha256 = "17dry2yfnj7vldrdh0kynyaa4pfyy88k3035w3hxggh7n325dfir";
        buildDepends = [ base bytestring deepseq ghc-prim ];
        testDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        homepage = "https://github.com/vincenthz/hs-memory";
@@ -89762,8 +89784,8 @@ self: {
      }:
      mkDerivation {
        pname = "mvc";
-       version = "1.0.4";
-       sha256 = "0mbbcjcvd05ql76ys5fmsr57aif1bysasz91rvmp795a9wj3i83i";
+       version = "1.0.5";
+       sha256 = "1lrq0nkxi0ljs6pxf7p4awhrf9ix9dqwvwsydph6fw356ypc39r2";
        buildDepends = [
          async base contravariant foldl managed mmorph pipes
          pipes-concurrency transformers
@@ -94271,8 +94293,8 @@ self: {
      }:
      mkDerivation {
        pname = "orgmode-parse";
-       version = "0.1.1.0";
-       sha256 = "1hrbfifm9476n28l2gxyr9m00hjibnl78anc5m7inqm8wr1s3cl0";
+       version = "0.1.1.1";
+       sha256 = "17slf2i7k8bk1d47l165awn38dlpq2rdw6glzvp8if1dir2l2jl7";
        buildDepends = [
          aeson attoparsec base bytestring containers free hashable
          old-locale text thyme unordered-containers
@@ -94808,10 +94830,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.0.2";
-       revision = "1";
-       sha256 = "0mnksd8wl6y9qh4z5p6nzf64lic2cxws0hm2n1aj8vq8asfy28af";
-       editedCabalFile = "c209bec5811d40360ca07a9218404186ab8564ee649b14d6e3ece04b4006204f";
+       version = "0.1.1.0";
+       sha256 = "1z6q9sb5h0bbvkdlv6abvhgz0cgw4vixs3pv531l9jpkmvfri8r4";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -101168,6 +101188,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pseudo-boolean" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
+     , containers, deepseq, dlist, hashable, HUnit, parsec, QuickCheck
+     , tasty, tasty-hunit, tasty-quickcheck, tasty-th, temporary
+     }:
+     mkDerivation {
+       pname = "pseudo-boolean";
+       version = "0.1.0.0";
+       sha256 = "1dqy8zpf7016rm3wyvgwipllm95wmrr9na04v4x402k1f8pvkdvc";
+       buildDepends = [
+         attoparsec base bytestring bytestring-builder containers deepseq
+         dlist hashable parsec
+       ];
+       testDepends = [
+         base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
+         tasty-th temporary
+       ];
+       homepage = "https://github.com/msakai/pseudo-boolean";
+       description = "Reading\/Writing OPB\/WBO files used in pseudo boolean competition";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pseudo-trie" = callPackage
     ({ mkDerivation, base, semigroups }:
      mkDerivation {
@@ -113916,6 +113959,7 @@ self: {
        homepage = "https://github.com/dbp/snaplet-wordpress";
        description = "A snaplet that communicates with wordpress over its api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snappy" = callPackage
@@ -116655,8 +116699,8 @@ self: {
      }:
      mkDerivation {
        pname = "stm-conduit";
-       version = "2.6.0";
-       sha256 = "0lhqhsvisyn4wgj5qk0slzbgy7lbmzgcryi4vlw1d058nsjnpxwj";
+       version = "2.6.1";
+       sha256 = "0cd99aj9azlr6d9bayjyrbigbzll9yfny7qan1wnrh413i1z1x0p";
        buildDepends = [
          async base cereal cereal-conduit conduit conduit-combinators
          conduit-extra directory ghc-prim lifted-async lifted-base
@@ -135621,6 +135665,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-raml" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, hspec
+     , network-uri, optparse-applicative, regex-posix, template-haskell
+     , text, unordered-containers, yaml, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-raml";
+       version = "0.1.0";
+       sha256 = "1vcllxsyqvr26a27l9vfi76kpdzld3ws1i0q6g9jnwhkr16bmc3f";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring containers network-uri optparse-applicative
+         regex-posix template-haskell text unordered-containers yaml
+         yesod-core
+       ];
+       testDepends = [
+         aeson base bytestring containers hspec network-uri regex-posix
+         template-haskell text unordered-containers yaml yesod-core
+       ];
+       description = "RAML style route definitions for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-recaptcha" = callPackage
     ({ mkDerivation, base, bytestring, data-default, http-conduit
      , http-types, lifted-base, network, network-info, resourcet, text

From 37ca982a66328320355bd83ecadbe1009bc97f1a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 24 May 2015 15:40:49 -0700
Subject: [PATCH 0187/2322] linux-testing: 4.1-rc4

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 769381355d4..895616ad20a 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, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.0-rc7";
-  modDirVersion = "4.0.0-rc7";
-  extraMeta.branch = "4.0";
+  version = "4.1-rc4";
+  modDirVersion = "4.1.0-rc4";
+  extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "1261p44zmsaq7gf08b8sd9xng2y46d4v7jyfipjlgrrmlkyfgqki";
+    sha256 = "0l3rmlng7pn4r788km8cgs562cq2is2cgzy3capdnngwmfrfmrr2";
   };
 
   features.iwlwifi = true;

From 5722d7c5b593c8cabf0cf2783161ad5ef8d89e07 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 24 May 2015 15:58:26 -0700
Subject: [PATCH 0188/2322] umurmur: Enable shmapi

---
 pkgs/applications/networking/umurmur/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix
index a8ae393598d..194b22f0fd7 100644
--- a/pkgs/applications/networking/umurmur/default.nix
+++ b/pkgs/applications/networking/umurmur/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
   
   buildInputs = [ autoreconfHook openssl protobufc libconfig ];
 
-  configureFlags = "--with-ssl=openssl";
+  configureFlags = [
+    "--with-ssl=openssl"
+    "--enable-shmapi"
+  ];
 
   meta = with stdenv.lib; {
     description = "Minimalistic Murmur (Mumble server)";

From 847f8297fc9f2bf692147008b731657182d3a3f2 Mon Sep 17 00:00:00 2001
From: Jonathan Glines <auntieNeo@gmail.com>
Date: Thu, 5 Feb 2015 01:42:00 -0700
Subject: [PATCH 0189/2322] Added config options for systemd-coredump
 functionality.

---
 nixos/modules/module-list.nix          |  1 +
 nixos/modules/system/boot/coredump.nix | 51 ++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 nixos/modules/system/boot/coredump.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3b6305179f0..cd679f8e93c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -406,6 +406,7 @@
   ./services/x11/xserver.nix
   ./system/activation/activation-script.nix
   ./system/activation/top-level.nix
+  ./system/boot/coredump.nix
   ./system/boot/emergency-mode.nix
   ./system/boot/kernel.nix
   ./system/boot/kexec.nix
diff --git a/nixos/modules/system/boot/coredump.nix b/nixos/modules/system/boot/coredump.nix
new file mode 100644
index 00000000000..25b11ed9c8a
--- /dev/null
+++ b/nixos/modules/system/boot/coredump.nix
@@ -0,0 +1,51 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+
+  options = {
+
+    systemd.coredump = {
+
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enables storing core dumps in systemd.
+          Note that this alone is not enough to enable core dumps. The maximum
+          file size for core dumps must be specified in limits.conf as well. See
+          <option>security.pam.loginLimits</option> as well as the limits.conf(5)
+          man page.
+        '';
+      };
+
+      extraConfig = mkOption {
+        default = "";
+        type = types.lines;
+        example = "Storage=journal";
+        description = ''
+          Extra config options for systemd-coredump. See coredump.conf(5) man page
+          for available options.
+        '';
+      };
+    };
+
+  };
+
+  config = mkIf config.systemd.coredump.enable {
+
+    environment.etc."systemd/coredump.conf".text =
+      ''
+        [Coredump]
+        ${config.systemd.coredump.extraConfig}
+      '';
+
+    # Have the kernel pass core dumps to systemd's coredump helper binary.
+    # From systemd's 50-coredump.conf file. See:
+    # <https://github.com/systemd/systemd/blob/v218/sysctl.d/50-coredump.conf.in>
+    boot.kernel.sysctl."kernel.core_pattern" = "|${pkgs.systemd}/lib/systemd/systemd-coredump %p %u %g %s %t %e";
+
+  };
+
+}

From da2d1c17dca630dcf59596929315c49a846439c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Mon, 25 May 2015 10:49:54 +0800
Subject: [PATCH 0190/2322] glfw: Update to 3.1.1 and build shared library.

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

diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix
index ab7e312762f..087be3bb6de 100644
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/pkgs/development/libraries/glfw/3.x.nix
@@ -1,16 +1,23 @@
-{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, x11 }:
+{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, x11
+, libXinerama, libXcursor
+}:
 
 stdenv.mkDerivation rec {
-  name = "glfw-3.0.4";
+  name = "glfw-3.1.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/glfw/${name}.tar.bz2";
-    sha256 = "1h7g16ncgkl38w19x4dvnn17k9j0kqfvbb9whw9qc71lkq5xf2ag";
+    sha256 = "0q9dhbj2az7jwwi556zai0qr8zmg6d2lyxcqngppkw0x7hi1d1aa";
   };
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake mesa libXrandr libXi libXxf86vm libXfixes x11 ];
+  buildInputs = [
+    cmake mesa libXrandr libXi libXxf86vm libXfixes x11
+    libXinerama libXcursor
+  ];
+
+  cmakeFlags = "-DBUILD_SHARED_LIBS=ON";
 
   meta = with stdenv.lib; { 
     description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";

From d2cbcc68be00173e58a7c5e60079d485f95a63e3 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Sun, 24 May 2015 22:22:20 -0500
Subject: [PATCH 0191/2322] added documentation for makeWrapperArgs

---
 doc/language-support.xml | 108 ++++++++++++++++++++++-----------------
 1 file changed, 61 insertions(+), 47 deletions(-)

diff --git a/doc/language-support.xml b/doc/language-support.xml
index da709b34a94..1e1bdf75eda 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -245,14 +245,14 @@ are provided with all modules included.</para>
         Name of the folder in <literal>${python}/lib/</literal> for corresponding interpreter.
     </para></listitem>
   </varlistentry>
-  
+
   <varlistentry>
     <term><varname>interpreter</varname></term>
     <listitem><para>
         Alias for <literal>${python}/bin/${executable}.</literal>
     </para></listitem>
   </varlistentry>
-  
+
   <varlistentry>
     <term><varname>buildEnv</varname></term>
     <listitem><para>
@@ -260,29 +260,29 @@ are provided with all modules included.</para>
         See <xref linkend="python-build-env" /> for usage and documentation.
     </para></listitem>
   </varlistentry>
-  
+
   <varlistentry>
     <term><varname>sitePackages</varname></term>
     <listitem><para>
       Alias for <literal>lib/${libPrefix}/site-packages</literal>.
     </para></listitem>
   </varlistentry>
-  
+
   <varlistentry>
     <term><varname>executable</varname></term>
     <listitem><para>
       Name of the interpreter executable, ie <literal>python3.4</literal>.
     </para></listitem>
   </varlistentry>
-  
+
 </variablelist>
 <section xml:id="build-python-package"><title><varname>buildPythonPackage</varname> function</title>
-  
+
   <para>
   The function is implemented in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/generic/default.nix">
   <filename>pkgs/development/python-modules/generic/default.nix</filename></link>.
   Example usage:
-  
+
 <programlisting language="nix">
 twisted = buildPythonPackage {
   name = "twisted-8.1.0";
@@ -308,27 +308,27 @@ twisted = buildPythonPackage {
   <varname>python27Packages</varname>, <varname>python32Packages</varname>, <varname>python33Packages</varname>,
   <varname>python34Packages</varname> and <varname>pypyPackages</varname>.
   </para>
-  
+
   <para>
     <function>buildPythonPackage</function> mainly does four things:
-      
+
     <orderedlist>
       <listitem><para>
         In the <varname>configurePhase</varname>, it patches
         <literal>setup.py</literal> to always include setuptools before
         distutils for monkeypatching machinery to take place.
       </para></listitem>
-    
+
       <listitem><para>
-        In the <varname>buildPhase</varname>, it calls 
+        In the <varname>buildPhase</varname>, it calls
         <literal>${python.interpreter} setup.py build ...</literal>
       </para></listitem>
-      
+
       <listitem><para>
-        In the <varname>installPhase</varname>, it calls 
+        In the <varname>installPhase</varname>, it calls
         <literal>${python.interpreter} setup.py install ...</literal>
       </para></listitem>
-      
+
       <listitem><para>
         In the <varname>postFixup</varname> phase, <literal>wrapPythonPrograms</literal>
         bash function is called to wrap all programs in <filename>$out/bin/*</filename>
@@ -337,23 +337,23 @@ twisted = buildPythonPackage {
       </para></listitem>
     </orderedlist>
   </para>
-  
-  <para>By default <varname>doCheck = true</varname> is set and tests are run with 
+
+  <para>By default <varname>doCheck = true</varname> is set and tests are run with
   <literal>${python.interpreter} setup.py test</literal> command in <varname>checkPhase</varname>.</para>
-  
+
   <para><varname>propagatedBuildInputs</varname> packages are propagated to user environment.</para>
-    
+
   <para>
     By default <varname>meta.platforms</varname> is set to the same value
     as the interpreter unless overriden otherwise.
   </para>
-  
+
   <variablelist>
     <title>
       <varname>buildPythonPackage</varname> parameters
       (all parameters from <varname>mkDerivation</varname> function are still supported)
     </title>
-  
+
     <varlistentry>
       <term><varname>namePrefix</varname></term>
       <listitem><para>
@@ -363,7 +363,7 @@ twisted = buildPythonPackage {
         if you're packaging an application or a command line tool.
       </para></listitem>
     </varlistentry>
-  
+
     <varlistentry>
       <term><varname>disabled</varname></term>
       <listitem><para>
@@ -373,21 +373,21 @@ twisted = buildPythonPackage {
         for examples.
       </para></listitem>
     </varlistentry>
-      
+
     <varlistentry>
       <term><varname>setupPyInstallFlags</varname></term>
       <listitem><para>
         List of flags passed to <command>setup.py install</command> command.
       </para></listitem>
     </varlistentry>
-     
+
     <varlistentry>
       <term><varname>setupPyBuildFlags</varname></term>
       <listitem><para>
         List of flags passed to <command>setup.py build</command> command.
       </para></listitem>
     </varlistentry>
-     
+
     <varlistentry>
       <term><varname>pythonPath</varname></term>
       <listitem><para>
@@ -396,21 +396,21 @@ twisted = buildPythonPackage {
         (contrary to <varname>propagatedBuildInputs</varname>).
       </para></listitem>
     </varlistentry>
-     
+
     <varlistentry>
       <term><varname>preShellHook</varname></term>
       <listitem><para>
         Hook to execute commands before <varname>shellHook</varname>.
       </para></listitem>
     </varlistentry>
-    
+
     <varlistentry>
       <term><varname>postShellHook</varname></term>
       <listitem><para>
         Hook to execute commands after <varname>shellHook</varname>.
       </para></listitem>
     </varlistentry>
-    
+
     <varlistentry>
       <term><varname>distutilsExtraCfg</varname></term>
       <listitem><para>
@@ -419,15 +419,29 @@ twisted = buildPythonPackage {
         configuration).
       </para></listitem>
     </varlistentry>
-  
+
+    <varlistentry>
+      <term><varname>makeWrapperArgs</varname></term>
+      <listitem><para>
+        A list of strings. Arguments to be passed to
+        <varname>makeWrapper</varname>, which wraps generated binaries. By
+        default, the arguments to <varname>makeWrapper</varname> set
+        <varname>PATH</varname> and <varname>PYTHONPATH</varname> environment
+        variables before calling the binary. Additional arguments here can
+        allow a developer to set environment variables which will be
+        available when the binary is run. For example,
+        <varname>makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]</varname>.
+      </para></listitem>
+    </varlistentry>
+
   </variablelist>
-  
+
 </section>
 
 <section xml:id="python-build-env"><title><function>python.buildEnv</function> function</title>
   <para>
     Create Python environments using low-level <function>pkgs.buildEnv</function> function. Example <filename>default.nix</filename>:
-    
+
 <programlisting language="nix">
 <![CDATA[with import <nixpkgs> {};
 
@@ -436,31 +450,31 @@ python.buildEnv.override {
   ignoreCollisions = true;
 }]]>
 </programlisting>
-    
+
     Running <command>nix-build</command> will create
     <filename>/nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env</filename>
     with wrapped binaries in <filename>bin/</filename>.
   </para>
-  
+
   <variablelist>
     <title>
       <function>python.buildEnv</function> arguments
     </title>
-  
+
     <varlistentry>
       <term><varname>extraLibs</varname></term>
       <listitem><para>
         List of packages installed inside the environment.
       </para></listitem>
     </varlistentry>
-    
+
     <varlistentry>
       <term><varname>postBuild</varname></term>
       <listitem><para>
         Shell command executed after the build of environment.
       </para></listitem>
     </varlistentry>
-    
+
     <varlistentry>
       <term><varname>ignoreCollisions</varname></term>
       <listitem><para>
@@ -504,13 +518,13 @@ exist in community to help save time. No tool is preferred at the moment.
     additional logic inside <varname>shellPhase</varname> to run
     <command>${python.interpreter} setup.py develop</command> for the package.
   </para>
-  
+
   <warning><para><varname>shellPhase</varname> is executed only if <filename>setup.py</filename>
   exists.</para></warning>
-  
+
   <para>
     Given a <filename>default.nix</filename>:
-    
+
 <programlisting language="nix">
 <![CDATA[with import <nixpkgs> {};
 
@@ -522,18 +536,18 @@ buildPythonPackage {
   src = ./.;
 }]]>
 </programlisting>
-    
+
     Running <command>nix-shell</command> with no arguments should give you
     the environment in which the package would be build with
     <command>nix-build</command>.
   </para>
-  
+
   <para>
     Shortcut to setup environments with C headers/libraries and python packages:
-    
+
     <programlisting language="bash">$ nix-shell -p pythonPackages.pyramid zlib libjpeg git</programlisting>
   </para>
-  
+
   <note><para>
     There is a boolean value <varname>lib.inNixShell</varname> set to
     <varname>true</varname> if nix-shell is invoked.
@@ -562,12 +576,12 @@ buildPythonPackage {
       Known bug in setuptools <varname>install_data</varname> does not respect --prefix</link>. Example of
       such package using the feature is <filename>pkgs/tools/X11/xpra/default.nix</filename>. As workaround
       install it as an extra <varname>preInstall</varname> step:
-      
+
       <programlisting>${python.interpreter} setup.py install_data --install-dir=$out --root=$out
 sed -i '/ = data_files/d' setup.py</programlisting>
     </para></listitem>
   </varlistentry>
-  
+
   <varlistentry>
     <term>Rationale of non-existent global site-packages</term>
     <listitem><para>
@@ -616,7 +630,7 @@ sed -i '/ = data_files/d' setup.py</programlisting>
   this into a nix expression that contains all Gem dependencies automatically.</para>
 
   <para>For example, to package sensu, we did:</para>
-  
+
 <screen>
 <![CDATA[$ cd pkgs/servers/monitoring
 $ mkdir sensu
@@ -876,7 +890,7 @@ fileSystem = buildLuaPackage {
   src = fetchurl {
     url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz";
     sha256 = "1n8qdwa20ypbrny99vhkmx8q04zd2jjycdb5196xdhgvqzk10abz";
-  };  
+  };
   meta = {
     homepage = "https://github.com/keplerproject/luafilesystem";
     hydraPlatforms = stdenv.lib.platforms.linux;
@@ -887,7 +901,7 @@ fileSystem = buildLuaPackage {
 </para>
 
 <para>
-  Though, more complicated package should be placed in a seperate file in 
+  Though, more complicated package should be placed in a seperate file in
   <link
   xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules"><filename>pkgs/development/lua-modules</filename></link>.
 </para>

From e035e2939a2d598a06887e3b7f9ce1d62abc609e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 25 May 2015 10:10:23 +0200
Subject: [PATCH 0192/2322] idea updates idea.pycharm: 4.5 -> 4.5.1
 idea.webstorm: 10.0.2 -> 10.0.3

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

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 9d42aecf5f0..d22f03d56d9 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -273,25 +273,25 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "4.5";
-    build = "141.1116";
+    version = "4.5.1";
+    build = "141.1245";
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0igx62rijalppsd1nwrri1r4m1597n93ncglyb6b94m3fm32fca6";
+      sha256 = "1rjl8r863cm7bn3bkp8kbkb9f35rb344pycg5qlvjlvwvp2f448f";
     };
   };
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "4.5";
-    build = "141.1116";
+    version = "4.5.1";
+    build = "141.1245";
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0zga8sxwrvjvyw9v1pvq40gasp485r1d627jj6jvwzcv78il50d9";
+      sha256 = "1wwyggl6941hd034xfsb3avjgvvah9lh0pdmzlndmvm677cdgzz1";
     };
   };
 
@@ -309,13 +309,13 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "10.0.2";
-    build = "141.728";
+    version = "10.0.3";
+    build = "141.1237";
     description = "Professional IDE for Web and JavaScript devlopment";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "0ghv1r145qb5kmp2x375f5674b86d51w024fz390znlnniclizqx";
+      sha256 = "06m852mbiij2dbmiz5y10bd4mhsdg5dmpy8arg75psl2j354spf8";
     };
   };
 

From 9d0bd2cd2d48ee7f2a69b808e277f25ac140b66c Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Mon, 25 May 2015 10:24:02 +0200
Subject: [PATCH 0193/2322] Update syncthing to 0.11.6

---
 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 54e4e64cdcf..cea9329d9c8 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,12 +4,12 @@ with goPackages;
 
 buildGoPackage rec {
   name = "syncthing-${version}";
-  version = "0.11.5";
+  version = "0.11.6";
   goPackagePath = "github.com/syncthing/syncthing";
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "3a68cdecaec8d00b0fbf6348fb9b8adc628910e9572a89d9a413d6e7b79e7a06";
+    sha256 = "7fe7d7034c0e502036e2a0bb1b94b1701bd194cc82f07495da8a41c4b097c6a3";
   };
 
   subPackages = [ "cmd/syncthing" ];

From 0e9464478d0e3ae52f79e94db700b9dd39e4cec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 25 May 2015 10:38:42 +0200
Subject: [PATCH 0194/2322] catch: add version 1.1-3

---
 pkgs/development/libraries/catch/default.nix | 36 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 ++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/catch/default.nix

diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix
new file mode 100644
index 00000000000..49376b74c17
--- /dev/null
+++ b/pkgs/development/libraries/catch/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, cmake, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+
+  name = "catch-${version}";
+  version = "1.1-3";
+
+  src = fetchFromGitHub {
+    owner = "philsquared";
+    repo = "Catch";
+    rev = "c51e86819dc993d590e5d0adaf1952f4b53e5355";
+    sha256 = "0kgi7wxxysgjbpisqfj4dj0k19cyyai92f001zi8gzkybd4fkgv5";
+  };
+
+  buildInputs = [ cmake ];
+  dontUseCmakeConfigure = true;
+
+  buildPhase = ''
+    cmake -Hprojects/CMake -BBuild -DCMAKE_BUILD_TYPE=Release
+    cd Build
+    make
+    cd ..
+  '';
+
+  installPhase = ''
+    mkdir -p $out
+    mv include $out/.
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)";
+    homepage = "http://catch-lib.net";
+    license = licenses.boost;
+    maintainers = with maintainers; [ edwtjo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3913e9f65e8..d22a888a1c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -748,6 +748,8 @@ let
 
   capstone = callPackage ../development/libraries/capstone { };
 
+  catch = callPackage ../development/libraries/catch { };
+
   catdoc = callPackage ../tools/text/catdoc { };
 
   cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { };
@@ -4498,7 +4500,7 @@ let
   teyjus = callPackage ../development/compilers/teyjus {
     omake = omake_rc1;
   };
-  
+
   thrust = callPackage ../development/tools/thrust {
     gconf = pkgs.gnome.GConf;
   };

From 68e3614ad00a3b8c59c77087da9462714dc07709 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 25 May 2015 10:06:13 +0200
Subject: [PATCH 0195/2322] viber: fix evaluation for nox-review

Even broken packages ought to evaluate, or die. Especially when
less than a month (!) old...
---
 .../networking/instant-messengers/viber/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix
index 521f568ff5b..4ebfddf82e1 100644
--- a/pkgs/applications/networking/instant-messengers/viber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/viber/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, dpkg, makeWrapper, xlibs, qt5, gstreamer, zlib, sqlite, libxslt }:
+{ fetchurl, stdenv, dpkg, makeWrapper, xlibs, qt5Full, gstreamer, zlib, sqlite, libxslt }:
 
 assert stdenv.system == "x86_64-linux";
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   unpackPhase = "true";
 
   libPath = stdenv.lib.makeLibraryPath [
-      qt5
+      qt5Full
       xlibs.libX11
       gstreamer
       zlib

From b10cb12a93ca25e912d984a8dfc705f65d2de5c1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 22 May 2015 11:08:53 +0200
Subject: [PATCH 0196/2322] tetgen 1.4.3 -> 1.5.0

Keep version 1.4.3 around as `tetgen_1_4`, because the licence
changed from MIT to AGPL3+ in the meantime.
---
 .../science/geometry/tetgen/1.4.nix           | 21 +++++++++++++++++++
 .../science/geometry/tetgen/default.nix       | 12 ++++++-----
 pkgs/top-level/all-packages.nix               |  4 ++--
 3 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/applications/science/geometry/tetgen/1.4.nix

diff --git a/pkgs/applications/science/geometry/tetgen/1.4.nix b/pkgs/applications/science/geometry/tetgen/1.4.nix
new file mode 100644
index 00000000000..d542bf87c79
--- /dev/null
+++ b/pkgs/applications/science/geometry/tetgen/1.4.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "tetgen-1.4.3";
+
+  src = fetchurl {
+    url = "${meta.homepage}/files/tetgen1.4.3.tar.gz";
+    sha256 = "0d70vjqdapmy1ghlsxjlvl5z9yp310zw697bapc4zxmp0sxi29wm";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp tetgen $out/bin
+  '';
+
+  meta = {
+    description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator";
+    homepage = "http://tetgen.org/";
+    license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix
index ddfb92def95..8a0565fce10 100644
--- a/pkgs/applications/science/geometry/tetgen/default.nix
+++ b/pkgs/applications/science/geometry/tetgen/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl}: 
 
-stdenv.mkDerivation rec {
-  name = "tetgen-1.4.3";
+let version = "1.5.0"; in
+stdenv.mkDerivation {
+  name = "tetgen-${version}";
 
   src = fetchurl {
-    url = "${meta.homepage}/files/tetgen1.4.3.tar.gz";
-    sha256 = "0d70vjqdapmy1ghlsxjlvl5z9yp310zw697bapc4zxmp0sxi29wm";
+    url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz";
+    sha256 = "1www3x2r6r7pck43ismlwy82x0j6xj2qiwvfs2pn687gsmhlh4ad";
   };
 
   installPhase = ''
@@ -14,8 +15,9 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
+    inherit version;
     description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator";
     homepage = "http://tetgen.org/";
-    license = stdenv.lib.licenses.mit;
+    license = stdenv.lib.licenses.agpl3Plus;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d22a888a1c2..00a1174d87e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13676,8 +13676,8 @@ let
     guile = guile_1_8;
   };
 
-  tetgen = callPackage ../applications/science/geometry/tetgen { };
-
+  tetgen = callPackage ../applications/science/geometry/tetgen { }; # AGPL3+
+  tetgen_1_4 = callPackage ../applications/science/geometry/tetgen/1.4.nix { }; # MIT
 
   ### SCIENCE/BIOLOGY
 

From c4a2f4f4b180287cd20380e02bdbc8dfb401c7f1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 24 May 2015 15:32:57 +0200
Subject: [PATCH 0197/2322] darkstat 3.0.718 -> 3.0.719

- Implement tracking of remote ports: shows which ports the host
  is making outgoing connections to. Long time feature request.
- Bugfix: when the capture interface goes down, exit instead of
  busy-looping forever.
- Fix "clock error" due to machine reboot.
- SIGUSR1 now resets the time and bytes reported on the graphs
  page.
- Account for all IP protocols.
- Change the default ports_max to only twice the default
  ports_keep.
---
 pkgs/tools/networking/darkstat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix
index af15f6a62e5..bc48bb6cf47 100644
--- a/pkgs/tools/networking/darkstat/default.nix
+++ b/pkgs/tools/networking/darkstat/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, libpcap, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.718";
+  version = "3.0.719";
   name = "darkstat-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${name}.tar.bz2";
-    sha256 = "1zxd4bxdfk1pjpcxhrcp54l991g0lljl4sr312nsd7p8yi9kwbv8";
+    sha256 = "1mzddlim6dhd7jhr4smh0n2fa511nvyjhlx76b03vx7phnar1bxf";
   };
 
   buildInputs = [ libpcap zlib ];

From 8d98f626a1a46d745e23d421888f5aed455cbd67 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 22 May 2015 11:30:39 +0200
Subject: [PATCH 0198/2322] statifier 1.6.15 -> 1.7.3

Also switch to mkDerivation and fix build on amd64.
---
 pkgs/os-specific/linux/statifier/default.nix | 32 ++++++++------------
 pkgs/top-level/all-packages.nix              |  2 +-
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix
index b4e37a36ff5..0e1ecdd6d7d 100644
--- a/pkgs/os-specific/linux/statifier/default.nix
+++ b/pkgs/os-specific/linux/statifier/default.nix
@@ -1,31 +1,25 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, gcc_multi, glibc_multi }:
+
+let version = "1.7.3"; in
+stdenv.mkDerivation {
+  name = "statifier-${version}";
 
-  version = a.lib.attrByPath ["version"] "1.6.15" a; 
-  buildInputs = with a; [
-    
-  ];
-in
-rec {
   src = fetchurl {
     url = "mirror://sourceforge/statifier/statifier-${version}.tar.gz";
-    sha256 = "0lhdbp7hc15nn6r31yxx7i993a5k8926n5r6j2gi2vvkmf1hciqf";
+    sha256 = "0jc67kq3clkdwvahpr2bjp2zix4j7z7z8b7bcn1b3g3sybh1cbd6";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
+  buildInputs = [ gcc_multi glibc_multi ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["fixPaths" "doMakeInstall"];
+  phaseNames = [ "patchPhase" "installPhase" ];
 
-  fixPaths = a.fullDepEntry (''
+  postPatch = ''
     sed -e s@/usr/@"$out/"@g -i */Makefile src/statifier
-    sed -e s@/bin/bash@"$shell"@g -i src/*.sh
-  '') ["minInit" "doUnpack"];
+    sed -e s@/bin/bash@"${stdenv.shell}"@g -i src/*.sh
+  '';
       
-  name = "statifier-" + version;
-  meta = {
+  meta = with stdenv.lib; {
     description = "Tool for creating static Linux binaries";
+    platforms = with platforms; [ linux ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00a1174d87e..97942ed956f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9811,7 +9811,7 @@ let
 
   smem = callPackage ../os-specific/linux/smem { };
 
-  statifier = builderDefsPackage (import ../os-specific/linux/statifier) { };
+  statifier = callPackage ../os-specific/linux/statifier { };
 
   spl = callPackage ../os-specific/linux/spl {
     configFile = "user";

From 2f4dc083d5d294392b9aaef59808466b4dad55c2 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Mon, 20 Apr 2015 13:55:04 +0200
Subject: [PATCH 0199/2322] added hwinfo

---
 .../libraries/libx86emu/default.nix           | 33 +++++++++++++++++
 pkgs/tools/system/hwinfo/default.nix          | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 3 files changed, 72 insertions(+)
 create mode 100644 pkgs/development/libraries/libx86emu/default.nix
 create mode 100644 pkgs/tools/system/hwinfo/default.nix

diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix
new file mode 100644
index 00000000000..a1471766516
--- /dev/null
+++ b/pkgs/development/libraries/libx86emu/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+  name = "libx86emu-${version}";
+  version = "1.5";
+
+  src = fetchurl {
+    url = "https://github.com/wfeldt/libx86emu/archive/${version}.tar.gz";
+    sha256 = "1im6w6m0bl6ajynx4hc028lad8v10whv4y7w9zxndzh3j4mi3aa8";
+  };
+
+  buildInputs = [ perl ];
+
+  patchPhase = ''
+    # VERSION is usually generated using Git
+    echo "${version}" > VERSION
+    sed -i 's|/usr/|/|g' Makefile
+  '';
+
+  makeFlags = "shared";
+
+  installPhase = ''
+    make install DESTDIR=$out/ LIBDIR=lib
+  '';
+
+  meta = with stdenv.lib; {
+    description = "x86 emulation library";
+    license = licenses.bsd2;
+    homepage = https://github.com/wfeldt/libx86emu;
+    maintainers = with maintainers; [ bobvanderlinden ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix
new file mode 100644
index 00000000000..6ecbbb98a54
--- /dev/null
+++ b/pkgs/tools/system/hwinfo/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, libx86emu, flex, perl }:
+
+stdenv.mkDerivation rec {
+  name = "hwinfo-${version}";
+  version = "21.12";
+
+  src = fetchurl {
+    url = "https://github.com/opensuse/hwinfo/archive/${version}.tar.gz";
+    sha256 = "01y5jk2jns0a3mgsgmvmpvi5yyc0df7b3yqsg32hn5r2nv17i47p";
+  };
+
+  patchPhase = ''
+    # VERSION and changelog is usually generated using Git
+    echo "${version}" > VERSION
+    sed -i 's|^\(TARGETS\s*=.*\)\<changelog\>\(.*\)$|\1\2|g' Makefile
+
+    sed -i 's|lex isdn_cdb.lex|${flex}/bin/flex isdn_cdb.lex|g' src/isdn/cdb/Makefile
+    sed -i 's|/sbin|/bin|g' Makefile
+    sed -i 's|/usr/|/|g' Makefile
+  '';
+
+  installPhase = ''
+    make install DESTDIR=$out
+  '';
+
+  buildInputs = [ libx86emu flex perl ];
+
+  meta = with stdenv.lib; {
+    description = "Hardware detection tool from openSUSE";
+    license = licenses.gpl2;
+    homepage = https://github.com/openSUSE/hwinfo;
+    maintainers = with maintainers; [ bobvanderlinden ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ee71adff23..f6dd5891baa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1670,6 +1670,8 @@ let
 
   httptunnel = callPackage ../tools/networking/httptunnel { };
 
+  hwinfo = callPackage ../tools/system/hwinfo { };
+
   i2p = callPackage ../tools/networking/i2p {};
 
   i2pd = callPackage ../tools/networking/i2pd {};
@@ -1869,6 +1871,8 @@ let
 
   libxcomp = callPackage ../development/libraries/libxcomp { };
 
+  libx86emu = callPackage ../development/libraries/libx86emu { };
+
   librdmacm = callPackage ../development/libraries/librdmacm { };
 
   limesurvey = callPackage ../servers/limesurvey { };

From d808f5b3e669e9924a5d44ee3a966e94e92c8f3b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 May 2015 14:55:06 +0200
Subject: [PATCH 0200/2322] cabal2nix: update to version 20150525

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

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 73b11508374..d14e2272614 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -7,11 +7,11 @@
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20150518";
+  version = "20150525";
   src = fetchgit {
     url = "http://github.com/NixOS/cabal2nix.git";
-    rev = "bf850da9044b16efb9ef06a05c645fa981513444";
-    sha256 = "0kwiwakff1iaglf7mfvz096smqi73pgcfd975dvp5w1cd8yazd73";
+    rev = "a7998916868af0d09882468b3e43f5854082860f";
+    sha256 = "07bz2z4ramrs2dmvvf6a82fliq51m61c11vmhkkz31nr09l25k6y";
     deepClone = true;
   };
   isExecutable = true;

From 161fdec0f5cd035c5999ad2863ddd25ef7e2136b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 25 May 2015 15:03:37 +0200
Subject: [PATCH 0201/2322] tidy-html5: added package, also provides libtidy5

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

diff --git a/pkgs/tools/text/tidy-html5/default.nix b/pkgs/tools/text/tidy-html5/default.nix
new file mode 100644
index 00000000000..e2651e20293
--- /dev/null
+++ b/pkgs/tools/text/tidy-html5/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, lib, cmake, fetchFromGitHub, ... }:
+
+stdenv.mkDerivation rec {
+
+  name = "tidy-html5";
+  version = "4.9.30";
+
+  src = fetchFromGitHub {
+    owner = "htacg";
+    repo = "tidy-html5";
+    rev = version;
+    sha256 = "0hd4c23352r5lnh23mx137wb4mkxcjdrl1dy8kgghszik5fprs3s";
+  };
+
+  buildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "The granddaddy of HTML tools, with support for modern standards";
+    homepage = "http://www.html-tidy.org/";
+    license = licenses.w3c;
+    maintainers = with maintainers; [ edwtjo ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97942ed956f..e55aa3b76b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3122,6 +3122,8 @@ let
 
   tftp_hpa = callPackage ../tools/networking/tftp-hpa {};
 
+  tidy-html5 = callPackage ../tools/text/tidy-html5 { };
+
   tigervnc = callPackage ../tools/admin/tigervnc {
     fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc
       xorg.fontbhlucidatypewriter75dpi ];

From c03c7791cc04fbd6a99718d1ffb36df461fe5464 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Mon, 25 May 2015 15:32:25 +0200
Subject: [PATCH 0202/2322] fix roxterm

---
 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 f0e54b916ca..587246f2694 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12915,7 +12915,8 @@ let
 
   roxterm = callPackage ../applications/misc/roxterm {
     inherit (pythonPackages) lockfile;
-    inherit (gnome3) vte gsettings_desktop_schemas;
+    inherit (gnome3) gsettings_desktop_schemas;
+    vte = gnome3.vte_290;
   };
 
   xtrace = callPackage ../tools/X11/xtrace { };

From 2ed4587b61f0a9b1f8d95c0663d9de633a48853b Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Mon, 25 May 2015 18:24:22 +0200
Subject: [PATCH 0203/2322] mod_python: Avoid that git is called to generate a
 version

This failed when building mod_python and resulted in a broken
value being included in the file "version.py".
---
 pkgs/servers/http/apache-modules/mod_python/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix
index 08f5d745684..d156576b21a 100644
--- a/pkgs/servers/http/apache-modules/mod_python/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_python/default.nix
@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
 
   patches = [ ./install.patch ];
 
+  postPatch = ''
+    substituteInPlace dist/version.sh \
+        --replace 'GIT=`git describe --always`' "" \
+        --replace '-$GIT' ""
+  '';
+
   preInstall = ''
     installFlags="LIBEXECDIR=$out/modules $installFlags"
     mkdir -p $out/modules $out/bin

From 3ddaf0c32ad6961cbc5e1594fd08f04e0f7dfbf3 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Mon, 25 May 2015 18:56:15 +0200
Subject: [PATCH 0204/2322] add bitmeter: also known as jack bitscope. Useful
 to detect denormals.

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

diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix
new file mode 100644
index 00000000000..2084ab481fa
--- /dev/null
+++ b/pkgs/applications/audio/bitmeter/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, jack2, gtk2, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "bitmeter-${version}";
+  version = "1.2";
+
+  src = fetchurl {
+    url = "http://devel.tlrmx.org/audio/source/${name}.tar.gz";
+    sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7";
+  };
+
+  buildInputs = [ jack2 gtk2 pkgconfig ];
+
+  meta = with stdenv.lib; {
+    homepage = http://devel.tlrmx.org/audio/bitmeter/;
+    description = "Also known as jack bitscope. Useful to detect denormals.";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b62ec4e6515..ad4a4af44a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10436,6 +10436,8 @@ let
 
   bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
 
+  bitmeter = callPackage ../applications/audio/bitmeter { };
+
   blender = callPackage  ../applications/misc/blender {
     python = python34;
   };

From 59b94c36f82d442cd93709615e1b81fd78ce70e2 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Fri, 15 May 2015 09:36:50 -0500
Subject: [PATCH 0205/2322] ocaml-re2: add initial version (112.06.00) to the
 system

---
 .../ocaml-modules/re2/Makefile.patch          | 17 +++++++++++
 .../development/ocaml-modules/re2/default.nix | 29 +++++++++++++++++++
 .../ocaml-modules/re2/myocamlbuild.patch      | 24 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 72 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/re2/Makefile.patch
 create mode 100644 pkgs/development/ocaml-modules/re2/default.nix
 create mode 100644 pkgs/development/ocaml-modules/re2/myocamlbuild.patch

diff --git a/pkgs/development/ocaml-modules/re2/Makefile.patch b/pkgs/development/ocaml-modules/re2/Makefile.patch
new file mode 100644
index 00000000000..fcb6eefe62b
--- /dev/null
+++ b/pkgs/development/ocaml-modules/re2/Makefile.patch
@@ -0,0 +1,17 @@
+--- ./lib/Makefile	2014-11-18 08:16:19.000000000 -0800
++++ ./lib/Makefile	2015-05-23 14:48:31.000000000 -0700
+@@ -6,12 +6,12 @@
+ all: libre2_stubs.a dllre2_stubs.so
+ 
+ dllre2_stubs.so libre2_stubs.a: stubs.o $(LIBRE2)
+-	ocamlmklib -oc re2_stubs stubs.o $(LIBRE2) -lstdc++
++	ocamlmklib -oc re2_stubs stubs.o $(LIBRE2) -lc++
+ 	rm libre2_stubs.a # ocamlmklib just includes $(LIBRE2) inside the stubs archive
+ 	cp $(LIBRE2) libre2_stubs.a && ar r libre2_stubs.a stubs.o
+ 
+ stubs.o: stubs.cpp stubs.h util.h enum_x_macro.h
+-	g++ -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \
++	$(CXX) -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \
+ 	-I$(RE2_HOME) -I$(ocaml-version-selected-include-path) -c stubs.cpp
+ 
+ #stubs.o: %.o: %.cpp %.h
diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix
new file mode 100644
index 00000000000..e89e28fe1e5
--- /dev/null
+++ b/pkgs/development/ocaml-modules/re2/default.nix
@@ -0,0 +1,29 @@
+{stdenv, buildOcaml, fetchurl, ocaml, core, pa_ounit, pa_test,
+ bin_prot, comparelib, sexplib, rsync}:
+
+buildOcaml rec {
+  name = "re2";
+  version = "112.06.00";
+
+  minimumSupportedOcamlVersion = "4.00";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/re2/archive/${version}.tar.gz";
+    sha256 = "a538765872363fcb67f12b95c07455a0afd68f5ae9008b59bb85a996d97cc752";
+  };
+  patches = if stdenv.isDarwin
+            then [./Makefile.patch ./myocamlbuild.patch]
+            else null;
+
+  buildInputs = [ pa_ounit pa_test rsync ];
+  propagatedBuildInputs = [ core bin_prot comparelib sexplib ];
+
+  hasSharedObjects = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/re2;
+    description = "OCaml bindings for RE2";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/re2/myocamlbuild.patch b/pkgs/development/ocaml-modules/re2/myocamlbuild.patch
new file mode 100644
index 00000000000..46ad6fa801b
--- /dev/null
+++ b/pkgs/development/ocaml-modules/re2/myocamlbuild.patch
@@ -0,0 +1,24 @@
+--- ./myocamlbuild.ml	2015-05-23 14:35:18.000000000 -0700
++++ ./myocamlbuild.ml	2015-05-23 15:05:24.000000000 -0700
+@@ -626,16 +626,18 @@
+     rule "Generate lib/options.ml"
+       ~prod:"lib/options.ml"
+       ~deps:["lib/options.mlp"; "lib/enum_x_macro.h"]
+-      (fun _ _ -> Cmd (S[A"gcc"; A"-E"; A"-P"; A"-x"; A"c";
++      (fun _ _ -> Cmd (S[A"cc"; A"-E"; A"-P"; A"-x"; A"c";
+                          P"lib/options.mlp"; A"-o"; P"lib/options.ml"]));
+ 
+     flag ["ocaml"; "link"; "library"; "native"] (S[A"-cclib"; A"-Llib";
+                                                    A"-cclib"; A"-lre2_stubs";
+-                                                   A"-cclib"; A"-lstdc++"]);
++                                                   A"-ccopt"; A"--stdlib=libc++";
++                                                   A"-cclib"; A"-lc++"]);
+     flag ["ocaml"; "link"; "library"; "byte"]   (S[A"-dllib"; A"dllre2_stubs.so";
+                                                    A"-cclib"; A"-Llib";
+                                                    A"-cclib"; A"-lre2_stubs";
+-                                                   A"-cclib"; A"-lstdc++"]);
++                                                   A"-ccopt"; A"--stdlib=libc++";                                                   
++                                                   A"-cclib"; A"-lc++"]);
+   | _ ->
+     ()
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8f879c05bf..a260a98f371 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4315,6 +4315,8 @@ let
 
     ounit = callPackage ../development/ocaml-modules/ounit { };
 
+    re2 = callPackage ../development/ocaml-modules/re2 { };
+
     tyxml = callPackage ../development/ocaml-modules/tyxml { };
 
     ulex = callPackage ../development/ocaml-modules/ulex { };

From da56bd300265ff12b62b1c642dd05f2f8ee50be1 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Sun, 24 May 2015 10:50:15 -0700
Subject: [PATCH 0206/2322] ocaml-textutils: add initial version (112.17.00) to
 the system

---
 .../ocaml-modules/textutils/default.nix       | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/textutils/default.nix

diff --git a/pkgs/development/ocaml-modules/textutils/default.nix b/pkgs/development/ocaml-modules/textutils/default.nix
new file mode 100644
index 00000000000..377b94eff8b
--- /dev/null
+++ b/pkgs/development/ocaml-modules/textutils/default.nix
@@ -0,0 +1,23 @@
+{stdenv, buildOcaml, fetchurl, core, pa_ounit, pa_test, sexplib}:
+
+buildOcaml rec {
+  name = "textutils";
+  version = "112.17.00";
+
+  minimalSupportedOcamlVersion = "4.02";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/textutils/archive/${version}.tar.gz";
+    sha256 = "605d9fde66dc2d777721c936aa521e17169c143efaf9ff29619a7f273a7d0052";
+  };
+
+  buildInputs = [ pa_test ];
+  propagatedBuildInputs = [ core pa_ounit sexplib ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/textutils;
+    description = "";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a260a98f371..298035dadc9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4325,6 +4325,8 @@ let
       camlp5 = camlp5_transitional;
     };
 
+    textutils = callPackage ../development/ocaml-modules/textutils { };
+
     type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { };
     type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { };
     type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { };

From c7ba42a516d8480d783d7b723082a9e3b0d209d9 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Sun, 24 May 2015 11:36:25 -0700
Subject: [PATCH 0207/2322] ocaml-core_extended: add initial version
 (112.24.00) to the system

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

diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix
new file mode 100644
index 00000000000..f311aae3d30
--- /dev/null
+++ b/pkgs/development/ocaml-modules/core_extended/default.nix
@@ -0,0 +1,26 @@
+{stdenv, buildOcaml, fetchurl, bin_prot, comparelib, core, custom_printf,
+ fieldslib, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib}:
+
+buildOcaml rec {
+  name = "core_extended";
+  version = "112.24.00";
+
+  minimumSupportedOcamlVersion = "4.02";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/core_extended/archive/${version}.tar.gz";
+    sha256 = "f87b0661b6c2cfb545ec61d1cb2ab1b9c4967b6ac14e651de41d3a6fb7f0f1e3";
+  };
+
+  hasSharedObjects = true;
+  buildInputs = [ pa_bench pa_test pa_ounit ];
+  propagatedBuildInputs = [bin_prot comparelib core custom_printf fieldslib
+                           pipebang textutils re2 sexplib ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/core_extended;
+    description = "Jane Street Capital's standard library overlay";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 298035dadc9..b28663f46d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4250,6 +4250,8 @@ let
 
     comparelib = callPackage ../development/ocaml-modules/comparelib { };
 
+    core_extended = callPackage ../development/ocaml-modules/core_extended { };
+
     core_kernel = callPackage ../development/ocaml-modules/core_kernel { };
 
     core = callPackage ../development/ocaml-modules/core { };

From 96775f040250e7487d84a4fc85eae8a58ec35d53 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Fri, 15 May 2015 10:55:37 -0500
Subject: [PATCH 0208/2322] ocaml-jingoo: add initial version (1.2.7) to the
 system

---
 .../ocaml-modules/jingoo/default.nix          | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/jingoo/default.nix

diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix
new file mode 100644
index 00000000000..4f42f51c16e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/jingoo/default.nix
@@ -0,0 +1,23 @@
+{stdenv, buildOcaml, fetchurl, batteries, pcre}:
+
+buildOcaml rec {
+  name = "jingoo";
+  version = "1.2.7";
+
+  src = fetchurl {
+    url = "https://github.com/tategakibunko/jingoo/archive/v${version}.tar.gz";
+    sha256 = "8ffc5723d77b323a12761981d048c046af77db47543a4b1076573aa5f4003009";
+  };
+
+  propagatedBuildInputs = [ batteries pcre ];
+
+  preInstall = "mkdir -p $out/bin";
+  installFlags = "BINDIR=$(out)/bin";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/tategakibunko/jingoo;
+    description = "OCaml template engine almost compatible with jinja2";
+    license = licenses.mit;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b28663f46d0..fb311269244 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4202,6 +4202,11 @@ let
 
     hex = callPackage ../development/ocaml-modules/hex { };
 
+    jingoo = callPackage ../development/ocaml-modules/jingoo {
+      batteries = ocaml_batteries;
+      pcre = ocaml_pcre;
+    };
+
     js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { };
 
     jsonm = callPackage ../development/ocaml-modules/jsonm { };

From 9c4bda25305e03f946725326d7470e1ce77bf8b9 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Sun, 24 May 2015 11:42:28 -0700
Subject: [PATCH 0209/2322] ocaml-async_shell: add initial version (109.28.03)
 to the system

---
 .../ocaml-modules/async_shell/default.nix     | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/async_shell/default.nix

diff --git a/pkgs/development/ocaml-modules/async_shell/default.nix b/pkgs/development/ocaml-modules/async_shell/default.nix
new file mode 100644
index 00000000000..75755833a5f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/async_shell/default.nix
@@ -0,0 +1,22 @@
+{stdenv, buildOcaml, fetchurl, async, core, core_extended}:
+
+buildOcaml rec {
+  name = "async_shell";
+  version = "109.28.03";
+
+  minimumSupportedOcamlVersion = "4.02";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/async_shell/archive/${version}.tar.gz";
+    sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105";
+  };
+
+  propagatedBuildInputs = [ async core core_extended ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/async_shell;
+    description = "Shell helpers for Async";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb311269244..e02b779ee9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4053,6 +4053,8 @@ let
 
     async_kernel = callPackage ../development/ocaml-modules/async_kernel { };
 
+    async_shell = callPackage ../development/ocaml-modules/async_shell { };
+
     async_ssl = callPackage ../development/ocaml-modules/async_ssl { };
 
     async_unix = callPackage ../development/ocaml-modules/async_unix { };

From 27541f65f3249ce2fc04023f7c22597c12c4d4da Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Sun, 24 May 2015 11:37:00 -0700
Subject: [PATCH 0210/2322] ocaml-async_find: add initial version (111.28.00)
 to the system

---
 .../ocaml-modules/async_find/default.nix      | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/async_find/default.nix

diff --git a/pkgs/development/ocaml-modules/async_find/default.nix b/pkgs/development/ocaml-modules/async_find/default.nix
new file mode 100644
index 00000000000..ae10e931ce2
--- /dev/null
+++ b/pkgs/development/ocaml-modules/async_find/default.nix
@@ -0,0 +1,22 @@
+{stdenv, buildOcaml, fetchurl, async, core, sexplib}:
+
+buildOcaml rec {
+  name = "async_find";
+  version = "111.28.00";
+
+  minimumSupportedOcamlVersion = "4.02";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/async_find/archive/${version}.tar.gz";
+    sha256 = "4e3fda72f50174f05d96a5a09323f236c041b1a685890c155822956f3deb8803";
+  };
+
+  propagatedBuildInputs = [ async core sexplib ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/async_find;
+    description = "Directory traversal with Async";
+    license = licenses.asl20;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e02b779ee9d..07c8c59d874 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4051,6 +4051,8 @@ let
 
     async_extra = callPackage ../development/ocaml-modules/async_extra { };
 
+    async_find = callPackage ../development/ocaml-modules/async_find { };
+
     async_kernel = callPackage ../development/ocaml-modules/async_kernel { };
 
     async_shell = callPackage ../development/ocaml-modules/async_shell { };

From 9f1eb28a20c74ba872b8e69d41c4aeefbe6b8a4b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 22 May 2015 09:12:52 +0200
Subject: [PATCH 0211/2322] Adds gappa 1.2.0

Gappa is a tool intended to help verifying and formally proving
properties on numerical programs dealing with floating-point or
fixed-point arithmetic.

Homepage: http://gappa.gforge.inria.fr/
---
 .../science/logic/gappa/default.nix           | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/science/logic/gappa/default.nix

diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/applications/science/logic/gappa/default.nix
new file mode 100644
index 00000000000..71114d2f9e1
--- /dev/null
+++ b/pkgs/applications/science/logic/gappa/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, gmp, mpfr, boost }:
+
+stdenv.mkDerivation {
+  name = "gappa-1.2";
+
+  src = fetchurl {
+    url = https://gforge.inria.fr/frs/download.php/file/34787/gappa-1.2.0.tar.gz;
+    sha256 = "03hfzmaf5jm54sjpbks20q7qixpmagrfbnyyc276vgmiyslk4dkh";
+  };
+
+  buildInputs = [ gmp mpfr boost.dev ];
+
+  buildPhase = "./remake";
+  installPhase = "./remake install";
+
+  meta = {
+    homepage = http://gappa.gforge.inria.fr/;
+    description = "Verifying and formally proving properties on numerical programs dealing with floating-point or fixed-point arithmetic";
+    license = with stdenv.lib.licenses; [ cecill20 gpl2 ];
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b62ec4e6515..66c2d519ff6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13878,6 +13878,8 @@ let
     };
   };
 
+  gappa = callPackage ../applications/science/logic/gappa { };
+
   ginac = callPackage ../applications/science/math/ginac { };
 
   hol = callPackage ../applications/science/logic/hol { };

From 4835763e13c295e465936d33f3a02001cb9e93bf Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Mon, 25 May 2015 19:55:26 +0200
Subject: [PATCH 0212/2322] Trackpoint scrolling on T450s et al

---
 nixos/modules/tasks/trackpoint.nix | 48 +++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix
index 778cdc5d30d..bd340869d69 100644
--- a/nixos/modules/tasks/trackpoint.nix
+++ b/nixos/modules/tasks/trackpoint.nix
@@ -45,6 +45,16 @@ with lib;
         '';
       };
 
+      fakeButtons = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Switch to "bare" PS/2 mouse support in case Trackpoint buttons are not recognized
+          properly. This can happen for example on models like the L430, T450, T450s, on
+          which the Trackpoint buttons are actually a part of the Synaptics touchpad.
+        '';
+      };
+
     };
 
   };
@@ -52,11 +62,13 @@ with lib;
 
   ###### implementation
 
-  config = mkMerge [
-    (mkIf config.hardware.trackpoint.enable {
+  config =
+  let cfg = config.hardware.trackpoint; in
+  mkMerge [
+    (mkIf cfg.enable {
       services.udev.extraRules =
       ''
-        ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString config.hardware.trackpoint.speed}", ATTR{device/sensitivity}="${toString config.hardware.trackpoint.sensitivity}"
+        ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString cfg.speed}", ATTR{device/sensitivity}="${toString cfg.sensitivity}"
       '';
 
       system.activationScripts.trackpoint =
@@ -65,20 +77,22 @@ with lib;
         '';
     })
 
-    (mkIf config.hardware.trackpoint.emulateWheel {
-      services.xserver.config =
-        ''
-          Section "InputClass"
-            Identifier "Trackpoint Wheel Emulation"
-            MatchProduct "Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint"
-            MatchDevicePath "/dev/input/event*"
-            Option "EmulateWheel" "true"
-            Option "EmulateWheelButton" "2"
-            Option "Emulate3Buttons" "false"
-            Option "XAxisMapping" "6 7"
-            Option "YAxisMapping" "4 5"
-            EndSection
-        '';
+    (mkIf (cfg.emulateWheel) {
+      services.xserver.inputClassSections =
+        [''
+        Identifier "Trackpoint Wheel Emulation"
+          MatchProduct "${if cfg.fakeButtons then "PS/2 Generic Mouse" else "Elantech PS/2 TrackPoint|TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint"}"
+          MatchDevicePath "/dev/input/event*"
+          Option "EmulateWheel" "true"
+          Option "EmulateWheelButton" "2"
+          Option "Emulate3Buttons" "false"
+          Option "XAxisMapping" "6 7"
+          Option "YAxisMapping" "4 5"
+        ''];
+    })
+
+    (mkIf cfg.fakeButtons {
+      boot.extraModprobeConfig = "options psmouse proto=bare";
     })
   ];
 }

From 1b66d9318b21a44e4e11805b87728d6d0de23217 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 May 2015 11:38:32 +0200
Subject: [PATCH 0213/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/67bad0d79a5d7d767ef5c9e239fd42a26ffa6550
 with hackage2nix revision fb67f15c8cb79342f5719342c1b1b42e134bcce4

---
 .../haskell-modules/hackage-packages.nix      | 244 ++++++++++--------
 1 file changed, 134 insertions(+), 110 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3d102742a26..2f03b30e0ad 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -654,26 +654,25 @@ self: {
 
   "Agda" = callPackage
     ({ mkDerivation, alex, array, base, binary, boxes, bytestring
-     , containers, cpphs, data-hash, deepseq, directory, emacs
-     , equivalence, filepath, geniplate, happy, hashable, hashtables
-     , haskeline, haskell-src-exts, mtl, parallel, pretty, process
-     , QuickCheck, STMonadTrans, strict, template-haskell, text, time
-     , transformers, unordered-containers, xhtml, zlib
+     , containers, cpphs, data-hash, deepseq, directory, edit-distance
+     , emacs, equivalence, filepath, geniplate-mirror, happy, hashable
+     , hashtables, haskeline, haskell-src-exts, mtl, parallel, pretty
+     , process, QuickCheck, strict, template-haskell, text, time
+     , transformers, transformers-compat, unordered-containers, xhtml
+     , zlib
      }:
      mkDerivation {
        pname = "Agda";
-       version = "2.4.2.2";
-       revision = "1";
-       sha256 = "1hxvapnvlkx6imifswc70ng869zll0zfsygivhc2mjyhaiv10i13";
-       editedCabalFile = "b604adb3c6609d27384834ce1d9483841245ac3d59e07571bc1ec114a080dcf3";
+       version = "2.4.2.3";
+       sha256 = "09vvipvab6bys8g7cdka1iirs0wc0jzcyynncccgb614wd2yyvdw";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          array base binary boxes bytestring containers data-hash deepseq
-         directory equivalence filepath geniplate hashable hashtables
-         haskeline haskell-src-exts mtl parallel pretty process QuickCheck
-         STMonadTrans strict template-haskell text time transformers
-         unordered-containers xhtml zlib
+         directory edit-distance equivalence filepath geniplate-mirror
+         hashable hashtables haskeline haskell-src-exts mtl parallel pretty
+         process QuickCheck strict template-haskell text time transformers
+         transformers-compat unordered-containers xhtml zlib
        ];
        buildTools = [ alex cpphs emacs happy ];
        jailbreak = true;
@@ -8944,10 +8943,8 @@ self: {
      }:
      mkDerivation {
        pname = "JuicyPixels";
-       version = "3.2.4";
-       revision = "1";
-       sha256 = "113w66rd6h04x0zbkqh34x33pf15hmrn3l9yy8kirs55kbg266w0";
-       editedCabalFile = "0ea6de6b2defec5f1be0f98fc995b3a9654fbf8d3b34cd3fa77a0f2e3919dc2b";
+       version = "3.2.5.1";
+       sha256 = "11wpk4lr7h7s7mhl48i27dq1wwvzjviv2fnq3yl8dnikcl00k6dq";
        buildDepends = [
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
@@ -12643,16 +12640,16 @@ self: {
      }) {};
 
   "Rasterific" = callPackage
-    ({ mkDerivation, base, dlist, FontyFruity, free, JuicyPixels, mtl
-     , primitive, vector, vector-algorithms
+    ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
+     , free, JuicyPixels, mtl, primitive, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "Rasterific";
-       version = "0.5.2.1";
-       sha256 = "1wd12l4vpav3jsjf2mib5yrblys5aifwq6xniqm4l92qs5vjh4a2";
+       version = "0.6.1";
+       sha256 = "1y9jciiaam0dn2falhxc0nb97vy35dfvv71xzc1bhiw4gn66n4rm";
        buildDepends = [
-         base dlist FontyFruity free JuicyPixels mtl primitive vector
-         vector-algorithms
+         base bytestring containers dlist FontyFruity free JuicyPixels mtl
+         primitive vector vector-algorithms
        ];
        description = "A pure haskell drawing engine";
        license = stdenv.lib.licenses.bsd3;
@@ -20826,21 +20823,21 @@ self: {
      }) {};
 
   "asciidiagram" = callPackage
-    ({ mkDerivation, base, containers, filepath, FontyFruity
-     , JuicyPixels, lens, linear, mtl, optparse-applicative
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative
      , rasterific-svg, svg-tree, text, vector
      }:
      mkDerivation {
        pname = "asciidiagram";
-       version = "1.1";
-       sha256 = "0vd4m3i4997vdd5wzy3jbidaz4rcsncqjdz0pf5ggrm9c5a8jb2y";
+       version = "1.1.1.1";
+       sha256 = "0nzg4m1nd41x6fyki5qva5jj80sl7jd1z1gd674v50zchkw71a9m";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base containers filepath FontyFruity JuicyPixels lens linear mtl
-         optparse-applicative rasterific-svg svg-tree text vector
+         base bytestring containers directory filepath FontyFruity
+         JuicyPixels lens linear mtl optparse-applicative rasterific-svg
+         svg-tree text vector
        ];
-       jailbreak = true;
        description = "Pretty rendering of Ascii diagram into svg or png";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35592,6 +35589,7 @@ self: {
          base cprng-aes crypto-random crypto-random-effect
          extensible-effects
        ];
+       jailbreak = true;
        homepage = "https://github.com/ibotty/crypto-random-effect";
        description = "Run random effect using cprng-aes, a crypto pseudo number generator";
        license = stdenv.lib.licenses.mit;
@@ -36493,6 +36491,7 @@ self: {
          base bytestring crypto-random extensible-effects securemem
          transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/ibotty/crypto-random-effect";
        description = "A random effect using crypto-random";
        license = stdenv.lib.licenses.mit;
@@ -47004,19 +47003,20 @@ self: {
 
   "extensible-effects" = callPackage
     ({ mkDerivation, base, HUnit, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, transformers
-     , transformers-base, type-aligned, void
+     , test-framework-hunit, test-framework-quickcheck2
+     , test-framework-th, transformers, transformers-base, type-aligned
+     , void
      }:
      mkDerivation {
        pname = "extensible-effects";
-       version = "1.9.2.2";
-       sha256 = "07mhvwxbqzn8bhhcgyc9b7bzbf1axbxsg3ps8b3zsz35r480irc3";
+       version = "1.10.0.1";
+       sha256 = "0zj72lnwncy9diagicp1xkvryakal17p5fslv1pl731z8janal1s";
        buildDepends = [
          base transformers transformers-base type-aligned void
        ];
        testDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 void
+         test-framework-quickcheck2 test-framework-th void
        ];
        homepage = "https://github.com/suhailshergill/extensible-effects";
        description = "An Alternative to Monad Transformers";
@@ -47796,8 +47796,8 @@ self: {
      }:
      mkDerivation {
        pname = "feed";
-       version = "0.3.9.4";
-       sha256 = "18jq1zw1qb2z6lga2vpn4z7dsylglgzl4bskb9x2skw9wv7pgsnk";
+       version = "0.3.9.5";
+       sha256 = "1kbi0hb2ywp5qbhjw65p86bj4cxag9ngi5dvjcjd63r673kwicv1";
        buildDepends = [
          base old-locale old-time time time-locale-compat utf8-string xml
        ];
@@ -48251,8 +48251,8 @@ self: {
     ({ mkDerivation, base, bytestring, clock, directory, zip-archive }:
      mkDerivation {
        pname = "file-collection";
-       version = "0.1.1.6";
-       sha256 = "12rsizcxisys6bf3z3ghmqpm2201pyqpihhyhhx2s14mgmf53l7l";
+       version = "0.1.1.9";
+       sha256 = "06bcj143j85p8m519zn88z6qn4bg5ifrw5pv5yva5x49gc3jq6gc";
        buildDepends = [ base bytestring clock directory zip-archive ];
        homepage = "https://github.com/joelwilliamson/file-collection";
        description = "Provide a uniform interface over file archives and directories";
@@ -48337,8 +48337,8 @@ self: {
      }:
      mkDerivation {
        pname = "filediff";
-       version = "1.0.0.5";
-       sha256 = "1mi0qywbaw0v3ilscmrn3cq467f8y2p09v4xsfa1hk90aybyz2lv";
+       version = "2.0.0";
+       sha256 = "15a02dya0qhgxq98whxza268vqsrkw6b1ipdskw3hwnjp02hnc9p";
        buildDepends = [
          base bytestring data-default data-memocombinators directory either
          hashmap mtl rainbow tasty tasty-hunit text threads time
@@ -51843,9 +51843,10 @@ self: {
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
        pname = "geniplate-mirror";
-       version = "0.6.0.6";
-       sha256 = "1fgs9aak7l7r3xlgna1kbq43zm55nd43phsv0w4ssy305dqylshj";
+       version = "0.6.0.7";
+       sha256 = "0az8q9jjakbi891ypzm4qg8ys78102zqxqpznk6mm08ng2hzb0wz";
        buildDepends = [ base mtl template-haskell ];
+       homepage = "https://github.com/danr/geniplate";
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56099,21 +56100,37 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "hBDD";
-       version = "0.0.2";
-       sha256 = "15pq6r8kz7ki1siz9xihd85qck9gnkp17cdz331srgr5kzij3lgv";
+       version = "0.0.3";
+       sha256 = "1jj8hj8wl95fy0n1qixhra4sqlmgddgn080plk7q7iv000qv67gk";
        buildDepends = [ base ];
        description = "An abstraction layer for BDD libraries";
        license = "LGPL";
      }) {};
 
+  "hBDD-CMUBDD" = callPackage
+    ({ mkDerivation, base, bdd, c2hs, containers, deepseq, hBDD, mem
+     , unix
+     }:
+     mkDerivation {
+       pname = "hBDD-CMUBDD";
+       version = "0.0.3";
+       sha256 = "16pvi496qi3q2rrw08p6lndnsz6d6p65i8m10ldjlh143y8k9ga9";
+       buildDepends = [ base containers deepseq hBDD unix ];
+       buildTools = [ c2hs ];
+       extraLibraries = [ bdd mem ];
+       description = "An FFI binding to CMU/Long's BDD library";
+       license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) { bdd = null;  mem = null;};
+
   "hBDD-CUDD" = callPackage
     ({ mkDerivation, base, c2hs, containers, cudd, deepseq, epd, hBDD
      , mtr, st, unix, util
      }:
      mkDerivation {
        pname = "hBDD-CUDD";
-       version = "0.0.2";
-       sha256 = "0rjfycxnhwwylpdb5sm4kqzypfbigzmx6azrs44sixmkq0cv5yb4";
+       version = "0.0.3";
+       sha256 = "1r94nj23pj134bd5b2mqk01g8xvbcn4ik2xs9yp01v1jg2clhjha";
        buildDepends = [ base containers deepseq hBDD unix ];
        buildTools = [ c2hs ];
        extraLibraries = [ cudd epd mtr st util ];
@@ -61897,7 +61914,9 @@ self: {
      mkDerivation {
        pname = "hbro";
        version = "1.4.0.0";
+       revision = "1";
        sha256 = "08vw5j3a22gszbsjhjp13dkgvxj2875zjsx6w3w7c2dkjg4lijpr";
+       editedCabalFile = "331a844037ba6df7831151e45e40223eed66313dabef7dc0285a6e658747b15c";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -62101,12 +62120,12 @@ self: {
      }:
      mkDerivation {
        pname = "hdaemonize";
-       version = "0.5.0.0";
-       sha256 = "15dyaa9rbmsjp3sg9yxg1i90kfy9rvlzmwg5kl8kwal69ajzjjgv";
+       version = "0.5.0.1";
+       sha256 = "03daf8qb8x0503h5k2vr6r4lyv6fv1a5n6mhykx5872khl81d8ms";
        buildDepends = [
          base extensible-exceptions filepath hsyslog mtl unix
        ];
-       homepage = "http://github.com/madhadron/hdaemonize";
+       homepage = "http://github.com/greydot/hdaemonize";
        description = "Library to handle the details of writing daemons for UNIX";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64844,8 +64863,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "0.5.3.2";
-       sha256 = "0w4m50glqvqipv99bk55jipzdga8dwics0sw1k52kmbf34qac5ih";
+       version = "0.6.0.0";
+       sha256 = "01v2nb77bp94jx9va757b2iimvvi9p73aqw7izyrqp1li4gd6yq2";
        buildDepends = [
          aeson base bytestring file-embed hashable hjsonpointer http-client
          http-types regexpr scientific text unordered-containers vector
@@ -69096,10 +69115,9 @@ self: {
     ({ mkDerivation, base, hslogger, mtl, template-haskell }:
      mkDerivation {
        pname = "hslogger-template";
-       version = "2.0.2";
-       sha256 = "0qkyclj9fajvzbfcs0ik8ncy66x916r40jd85r4wi5nh482i7sp3";
+       version = "2.0.3";
+       sha256 = "1q5g2jgx4yjzvbrc22qcxrb3r9cma64jg90wzx9yc19yxq0fa95k";
        buildDepends = [ base hslogger mtl template-haskell ];
-       jailbreak = true;
        description = "Automatic generation of hslogger functions";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -73021,8 +73039,8 @@ self: {
      }:
      mkDerivation {
        pname = "ide-backend-common";
-       version = "0.9.1.1";
-       sha256 = "1k3sp9byqmhk80l918jnklck635dp1cfx48akah483jkhzjph0fj";
+       version = "0.9.1.2";
+       sha256 = "1cj594vq0x87h9mvwsj9mplacrdn999bbsknjwdpvrpsbadlx5q7";
        buildDepends = [
          aeson async attoparsec base binary bytestring bytestring-trie
          containers crypto-api data-accessor directory filepath fingertree
@@ -74411,8 +74429,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-c";
-       version = "0.5.0.1";
-       sha256 = "1gkk9ldlac8jfiibyw15madrxa731fk2qbll22c8lm0l83r9kpsa";
+       version = "0.5.2.0";
+       sha256 = "1i0x80g8sy7lb7wln22n4hbh3i553v1ky9gz7x72xf0gifszlr4y";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -76576,13 +76594,13 @@ self: {
      , bifunctors, byteable, bytestring, crypto-pubkey
      , crypto-pubkey-types, crypto-random, cryptohash
      , data-default-class, ghc-prim, hspec, integer-gmp, lens
-     , network-uri, old-locale, safe, semigroups, template-haskell, text
-     , time, unordered-containers, vector, x509
+     , network-uri, safe, semigroups, template-haskell, text, time
+     , unordered-containers, vector, x509
      }:
      mkDerivation {
        pname = "jose";
-       version = "0.3.41.1";
-       sha256 = "1grb1yq3knm7hniqiivkx76mxkgacyq2qa12mv5lz097w7bldf4l";
+       version = "0.3.41.2";
+       sha256 = "0pamg1wkp85zpwnbsvmsszy7nxsifl3zhbxvfmh44n0b6d2wg4w5";
        buildDepends = [
          aeson attoparsec base base64-bytestring bifunctors byteable
          bytestring crypto-pubkey crypto-pubkey-types crypto-random
@@ -76593,9 +76611,9 @@ self: {
        testDepends = [
          aeson attoparsec base base64-bytestring bifunctors byteable
          bytestring crypto-pubkey crypto-pubkey-types crypto-random
-         cryptohash data-default-class hspec lens network-uri old-locale
-         safe semigroups template-haskell text time unordered-containers
-         vector x509
+         cryptohash data-default-class hspec lens network-uri safe
+         semigroups template-haskell text time unordered-containers vector
+         x509
        ];
        jailbreak = true;
        homepage = "https://github.com/frasertweedale/hs-jose";
@@ -78707,9 +78725,9 @@ self: {
      mkDerivation {
        pname = "lambdabot-utils";
        version = "4.2.2";
-       revision = "1";
+       revision = "3";
        sha256 = "0mmz9rn6vv8xnavmz66g164h1liir3rzg1n7lmbcsgwcyhm925d7";
-       editedCabalFile = "1936d25bbfb2ce39465857c136e0d77c656714feb2c1936024da4d763e9dbbf3";
+       editedCabalFile = "f54d43d6964d63f1d8796606419b512a6e7b87b1defe960748c27c7417f59a08";
        buildDepends = [
          base binary bytestring containers haskell-src mtl network old-time
          process random regex-compat regex-posix syb tagsoup unix
@@ -80125,8 +80143,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah";
-       version = "0.14.4.0";
-       sha256 = "13p6fil3s8pgjgicxgkn1qfcdhvv5j0lilk85a66nz7vw4rg3x2v";
+       version = "0.15.0.1";
+       sha256 = "169vrqdxcx8xkilrw3dh5zmdsb876fny4n0k5gzvi8fian0dl8nh";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -80144,7 +80162,6 @@ self: {
          leksah-server ltk monad-loops QuickCheck text transformers
          webkitgtk3
        ];
-       jailbreak = true;
        homepage = "http://www.leksah.org";
        description = "Haskell IDE written in Haskell";
        license = "GPL";
@@ -80152,31 +80169,30 @@ self: {
      }) {};
 
   "leksah-server" = callPackage
-    ({ mkDerivation, attoparsec, attoparsec-conduit, base, binary
-     , binary-shared, bytestring, Cabal, conduit, conduit-extra
-     , containers, deepseq, directory, executable-path, filepath, ghc
-     , haddock-api, hslogger, HTTP, HUnit, ltk, network, network-uri
-     , parsec, pretty, process, resourcet, strict, text, time
-     , transformers, unix
+    ({ mkDerivation, attoparsec, attoparsec-conduit, base
+     , bin-package-db, binary, binary-shared, bytestring, Cabal, conduit
+     , conduit-extra, containers, deepseq, directory, executable-path
+     , filepath, ghc, haddock-api, haddock-library, hslogger, HTTP
+     , HUnit, ltk, network, network-uri, parsec, pretty, process
+     , resourcet, strict, text, time, transformers, unix
      }:
      mkDerivation {
        pname = "leksah-server";
-       version = "0.14.3.2";
-       sha256 = "0gbjxbma0jyw0jli63f3apfsap9by6nr75qx77773nj2l48hxz3w";
+       version = "0.15.0.1";
+       sha256 = "04sxfzl8p9fk8qkzmwnm7fkg5sgrzjx0992kivgbrnyx7wh06xsp";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         attoparsec attoparsec-conduit base binary binary-shared bytestring
-         Cabal conduit conduit-extra containers deepseq directory
-         executable-path filepath ghc haddock-api hslogger HTTP ltk network
-         network-uri parsec pretty process resourcet strict text time
-         transformers unix
+         attoparsec attoparsec-conduit base bin-package-db binary
+         binary-shared bytestring Cabal conduit conduit-extra containers
+         deepseq directory executable-path filepath ghc haddock-api
+         haddock-library hslogger HTTP ltk network network-uri parsec pretty
+         process resourcet strict text time transformers unix
        ];
        testDepends = [
          base conduit conduit-extra hslogger HUnit process resourcet
          transformers
        ];
-       jailbreak = true;
        homepage = "http://leksah.org";
        description = "Metadata collection for leksah";
        license = "GPL";
@@ -83469,8 +83485,8 @@ self: {
      }:
      mkDerivation {
        pname = "ltk";
-       version = "0.15.0.0";
-       sha256 = "1hl9cbr8n2nczsz8gkd4lkcmf3bhzcji82p8ym176abzyz2i3h09";
+       version = "0.15.0.1";
+       sha256 = "0qw689ip8kibczjvar6bicns6g8a0zwlb6vdcmpicxxmpr1p7g16";
        buildDepends = [
          base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text
          transformers
@@ -88200,7 +88216,9 @@ self: {
      mkDerivation {
        pname = "mono-traversable";
        version = "0.9.1";
+       revision = "1";
        sha256 = "0hzqlldilkkfmrq3pkymwkzpp9dn40v6fa18kahxlf4qiyih0xzc";
+       editedCabalFile = "28392123a8b245f7bc2c13bb63f5c3008118ed38e107cf0534be37461fb64daf";
        buildDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
          semigroupoids semigroups text transformers unordered-containers
@@ -92985,12 +93003,12 @@ self: {
      }) {};
 
   "observable-sharing" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, unordered-containers }:
      mkDerivation {
        pname = "observable-sharing";
-       version = "0.1.0.0";
-       sha256 = "1l9l7jjk1zxc6wzw2n89l4mr964ys87b37sc55jsm73km19q07jy";
-       buildDepends = [ base ];
+       version = "0.2.0.0";
+       sha256 = "01lri324xygda17nzc7bg6s3f52nivi8qjigbx9ack7zxhm9jyd7";
+       buildDepends = [ base unordered-containers ];
        description = "Simple observable sharing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95373,8 +95391,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "parsek";
-       version = "1.0.1.2";
-       sha256 = "0ybh76cx5y73ywhlv4g2z74x1mvg5n2rxl045mscs6dwcyw9vhbd";
+       version = "1.0.1.3";
+       sha256 = "184cbw9gz3vv2jbr2wzkygv25y70jayxd8d76pgpvjcaps4qqxp7";
        buildDepends = [ base ];
        description = "Parallel Parsing Processes";
        license = stdenv.lib.licenses.gpl3;
@@ -98941,10 +98959,13 @@ self: {
      mkDerivation {
        pname = "pool-conduit";
        version = "0.1.2.3";
+       revision = "1";
        sha256 = "1myjbmbh0jm89ycx9d961mpgw8hp7al8wgnsls4p19gvr73gcbfv";
+       editedCabalFile = "b894f71054b3824a0a05753e8273efbc7c1dc48efa9c6d56625ba4411a74afa5";
        buildDepends = [
          base monad-control resource-pool resourcet transformers
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Resource pool allocations via ResourceT. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -103113,8 +103134,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasterific-svg";
-       version = "0.2.2.1";
-       sha256 = "1p8bpy9kh1j2lhczw8wyj1918h26yf7w7ii370g6m63szx6v1lj6";
+       version = "0.2.3";
+       sha256 = "1gr050dlvq8pfp77g21ywc6cknbgmkw8bcc4d8klw8jpf0ppar45";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -112594,16 +112615,19 @@ self: {
      }) {};
 
   "smallcheck-series" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, Glob, smallcheck, text
+    ({ mkDerivation, base, bytestring, containers, doctest, Glob
+     , logict, smallcheck, text, transformers
      }:
      mkDerivation {
        pname = "smallcheck-series";
-       version = "0.2";
-       sha256 = "1666pf3ki46w3zi01c3lzih7jh0jgqx9jyc1ykrjs056mlnbxp3v";
-       buildDepends = [ base bytestring smallcheck text ];
+       version = "0.3";
+       sha256 = "1vdwafwdv38n1bvjf1rybfhh42a0q0g0g4wmw0v4fgxh73qndfdv";
+       buildDepends = [
+         base bytestring containers logict smallcheck text transformers
+       ];
        testDepends = [ base doctest Glob ];
        homepage = "https://github.com/jdnavarro/smallcheck-series";
-       description = "Extra SmallCheck series";
+       description = "Extra SmallCheck series and utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -122113,16 +122137,16 @@ self: {
      }:
      mkDerivation {
        pname = "th-typegraph";
-       version = "0.14";
-       sha256 = "1f2wgr429hkv687mk9qgaqnr1n9nznl90cy7w74w4jzp6fd6rskp";
+       version = "0.17";
+       sha256 = "0k6bjf3r6g64h5al7gxcrkwb5b67kjpx8y4ib6f3a6l00p620297";
        buildDepends = [
          base containers data-default haskell-src-exts lens mtl syb
          template-haskell th-desugar th-orphans
        ];
        testDepends = [
-         array base bytestring containers deepseq ghc-prim hspec hspec-core
-         lens mtl syb template-haskell text th-desugar th-orphans
-         th-reify-many
+         array base bytestring containers data-default deepseq ghc-prim
+         hspec hspec-core lens mtl syb template-haskell text th-desugar
+         th-orphans th-reify-many
        ];
        homepage = "https://github.com/seereason/th-typegraph";
        description = "Graph of the subtype relation";
@@ -123700,17 +123724,17 @@ self: {
      }) {};
 
   "topkata" = callPackage
-    ({ mkDerivation, ALUT, array, base, filepath, GLUT, OpenAL, OpenGL
-     , random
+    ({ mkDerivation, ALUT, array, base, filepath, GLFW-b, OpenAL
+     , OpenGL, parseargs, random
      }:
      mkDerivation {
        pname = "topkata";
-       version = "0.2.3";
-       sha256 = "19lm9i65ywh3a8hsrqnihq8gkfxmz81zznyqlqgcf1914w826i3a";
+       version = "0.2.4";
+       sha256 = "06b938i2362c4jcd0923lwrcf6hqgxdscizj91ns51wx73nm8fxi";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         ALUT array base filepath GLUT OpenAL OpenGL random
+         ALUT array base filepath GLFW-b OpenAL OpenGL parseargs random
        ];
        homepage = "http://home.arcor.de/chr_bauer/topkata.html";
        description = "OpenGL Arcade Game";

From 38bf7f94d03b7d86d7e0157845cb6302506d1fde Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 May 2015 14:05:07 +0200
Subject: [PATCH 0214/2322] webkitgtk-2.4: disable parallel building to fix
 race conditions

http://hydra.cryp.to/build/888422/nixlog/9/raw
---
 pkgs/development/libraries/webkitgtk/2.4.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 30d69a0253b..3800a6f78dd 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -59,8 +59,7 @@ stdenv.mkDerivation rec {
     (if withGtk2 then gtk2 else gtk3)
   ];
 
-  # Probably OK now, see:
-  # https://bugs.webkit.org/show_bug.cgi?id=79498
-  enableParallelBuilding = true;
-}
+  # Still fails with transient errors in version 2.4.9.
+  enableParallelBuilding = false;
 
+}

From 7ad53157e071e4f3f2dbee560a9d9b4904072c1f Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Mon, 25 May 2015 03:12:07 +0200
Subject: [PATCH 0215/2322] add eq10q: LV2 EQ plugins and more, with 64 bit
 processing

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

diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix
new file mode 100644
index 00000000000..61c97953422
--- /dev/null
+++ b/pkgs/applications/audio/eq10q/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xlibs }:
+stdenv.mkDerivation rec {
+  name = "eq10q-2-${version}";
+  version = "beta7.1";
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/eq10q/${name}.tar.gz";
+    sha256 = "1jmrcx4jlx8kgsy5n4jcxa6qkjqvx7d8l2p7dsmw4hj20s39lgyi";
+  };
+
+  buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence ];
+
+  installFlags = ''
+    DESTDIR=$(out)
+  '';
+
+  fixupPhase = ''
+    cp -r $out/var/empty/local/lib $out
+    rm -R $out/var
+  '';
+
+  meta = {
+    description = "LV2 EQ plugins and more, with 64 bit processing";
+    longDescription = ''
+      Up to 10-Bands parametric equalizer with mono and stereo versions.
+      Versatile noise-gate plugin with mono and stereo versions.
+      Compressor plugin with mono and stereo versions.
+      BassUp plugin - Enhanceing the bass guitar sound or other low frequency sounding instruments.
+      Improved high frequency response for peaking filter (in equalizers).
+      64 bits floating point internal audio processing.
+      Nice GUI with powerful metering for every plugin.
+    '';
+    homepage = http://eq10q.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b62ec4e6515..8eaaa0941de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10890,6 +10890,8 @@ let
 
   inherit (gnome3) epiphany;
 
+  eq10q = callPackage ../applications/audio/eq10q { };
+
   espeak = callPackage ../applications/audio/espeak { };
 
   espeakedit = callPackage ../applications/audio/espeak/edit.nix { };

From 73bb94e6205a5a2be88ece051b55819ef0cf3aa1 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Mon, 25 May 2015 18:25:24 +0200
Subject: [PATCH 0216/2322] add foo-yc20: a Faust implementation of a combo
 organ

---
 pkgs/applications/audio/foo-yc20/default.nix | 27 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/audio/foo-yc20/default.nix

diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix
new file mode 100644
index 00000000000..d0de8c9f9a7
--- /dev/null
+++ b/pkgs/applications/audio/foo-yc20/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub,  jack2, gtk2, lv2, faust, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "git-2015-05-21";
+  name = "foo-yc20-${version}";
+  src = fetchFromGitHub {
+    owner = "sampov2";
+    repo = "foo-yc20";
+    rev = "edd9d14c91229429b14270a181743e1046160ca8";
+    sha256 = "0i8261n95n4xic766h70xkrpbvw3sag96n1883ahmg6h7yb94avq";
+  };
+
+  buildInputs = [ jack2 gtk2 lv2 faust pkgconfig ];
+
+  makeFlags = "PREFIX=$(out)";
+
+  # remove lv2 until https://github.com/sampov2/foo-yc20/issues/6 is resolved
+  postInstallFixup = "rm -rf $out/lib/lv2";
+
+  meta = {
+    description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20";
+    homepage = https://github.com/sampov2/foo-yc20;
+    license     = "BSD";
+    maintainers = stdenv.lib.maintainers.magnetophon;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b62ec4e6515..927c18c19e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10932,6 +10932,8 @@ let
 
   focuswriter = callPackage ../applications/editors/focuswriter { };
 
+  foo-yc20 = callPackage ../applications/audio/foo-yc20 { };
+
   fossil = callPackage ../applications/version-management/fossil { };
 
   freewheeling = callPackage ../applications/audio/freewheeling { };

From 9cc8b80c9613aba4c11d442a29fbfd7ffd79c12b Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Mon, 25 May 2015 13:40:32 -0700
Subject: [PATCH 0217/2322] add jwilberding as a maintainer

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 5eb913caff9..3057da847ee 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -112,6 +112,7 @@
   joelteon = "Joel Taylor <me@joelt.io>";
   jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
   jwiegley = "John Wiegley <johnw@newartisans.com>";
+  jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";
   jzellner = "Jeff Zellner <jeffz@eml.cc>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   koral = "Koral <koral@mailoo.org>";

From 7efe850b1d0a3428f2feb4eb027049651a1de579 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Mon, 25 May 2015 13:42:07 -0700
Subject: [PATCH 0218/2322] ocaml-atd: add initial version (1.1.2) to the
 system

---
 .../development/ocaml-modules/atd/default.nix | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/atd/default.nix

diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix
new file mode 100644
index 00000000000..c7f8bc3d10f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/atd/default.nix
@@ -0,0 +1,26 @@
+{stdenv, menhir, easy-format, buildOcaml, fetchurl, which}:
+
+buildOcaml rec {
+  name = "atd";
+  version = "1.1.2";
+
+  src = fetchurl {
+    url = "https://github.com/mjambon/atd/archive/v${version}.tar.gz";
+    sha256 = "0ef10c63192aed75e9a4274e89c5f9ca27efb1ef230d9949eda53ad4a9a37291";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    make PREFIX=$out install
+  '';
+
+  buildInputs = [ which ];
+  propagatedBuildInputs = [ menhir easy-format ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mjambon/atd;
+    description = "Syntax for cross-language type definitions";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.jwilberding ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07c8c59d874..59acd04a652 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4063,6 +4063,7 @@ let
 
     async = callPackage ../development/ocaml-modules/async { };
 
+    atd = callPackage ../development/ocaml-modules/atd { };
     base64 = callPackage ../development/ocaml-modules/base64 { };
 
     bolt = callPackage ../development/ocaml-modules/bolt { };

From c651e7ff610b48a1f73a6db6da34e12174722bbd Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Mon, 25 May 2015 13:45:10 -0700
Subject: [PATCH 0219/2322] ocaml-atdgen: add minimal version (1.6.0) to the
 system

---
 .../ocaml-modules/atdgen/default.nix          | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/atdgen/default.nix

diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix
new file mode 100644
index 00000000000..bab2541fd74
--- /dev/null
+++ b/pkgs/development/ocaml-modules/atdgen/default.nix
@@ -0,0 +1,25 @@
+{stdenv, atd, yojson, menhir, easy-format, biniou, cppo, buildOcaml, fetchurl, which}:
+
+buildOcaml rec {
+  name = "atdgen";
+  version = "1.6.0";
+
+  src = fetchurl {
+    url = "https://github.com/mjambon/atdgen/archive/v${version}.tar.gz";
+    sha256 = "1icdxgb7qqq1pcbfqi0ikryiwaljd594z3acyci8g3bnlq0yc7zn";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    make PREFIX=$out install
+  '';
+
+  buildInputs = [ which atd biniou yojson ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mjambon/atdgen;
+    description = "Generates optimized boilerplate OCaml code for JSON and Biniou IO from type definitions";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.jwilberding ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59acd04a652..b12d45283e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4064,6 +4064,9 @@ let
     async = callPackage ../development/ocaml-modules/async { };
 
     atd = callPackage ../development/ocaml-modules/atd { };
+
+    atdgen = callPackage ../development/ocaml-modules/atdgen { };
+
     base64 = callPackage ../development/ocaml-modules/base64 { };
 
     bolt = callPackage ../development/ocaml-modules/bolt { };

From fb655dce4cb0984720ca8af916edd9a9f9728d14 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 24 May 2015 08:00:40 -0400
Subject: [PATCH 0220/2322] Fix SHA for pasystray.

I presume there's something about how github creates the .zip files such
that they can change SHA.

Please note: this is a very outdated version of pasystray---I don't know
if that's intentional, but perhaps a better strategy would be to update
it wholesale.
---
 pkgs/tools/audio/pasystray/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index bbe99eaccbe..787ab7dd3d6 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/christophgysin/pasystray/archive/${name}.zip";
-    sha256 = "1gpb7yqcxqglv50iqbkg2lg3r0z07jm4ir2zqmvns6sgddks590w";
+    sha256 = "0n41qm04kilhc827yx8y1ijslmajg2dxykaf3s3aq6s6bjzzw8bh";
   };
 
   buildInputs = [ unzip autoconf automake makeWrapper pkgconfig 

From bc1b8cb33ac858acad881a19c2383542a1eef8b4 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 24 May 2015 20:41:34 -0400
Subject: [PATCH 0221/2322] Update pasystray to current version.

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

diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index 787ab7dd3d6..af8dbe2a4db 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -2,11 +2,11 @@
 , gnome3, avahi, gtk3, libnotify, pulseaudio, x11}:
 
 stdenv.mkDerivation rec {
-  name = "pasystray-0.4.0";
+  name = "pasystray-0.5.2";
 
   src = fetchurl {
     url = "https://github.com/christophgysin/pasystray/archive/${name}.zip";
-    sha256 = "0n41qm04kilhc827yx8y1ijslmajg2dxykaf3s3aq6s6bjzzw8bh";
+    sha256 = "084jld5zk89h4akll73bwhfav6mpg55zmdd5kvlg396rqi9lqkj4";
   };
 
   buildInputs = [ unzip autoconf automake makeWrapper pkgconfig 

From e81c6bd6547b778ffcabb715c516c3f66ef4155a Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 25 May 2015 08:13:21 -0400
Subject: [PATCH 0222/2322] Use fetchzip to retrieve new pasystray.

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

diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index af8dbe2a4db..4efdb9aa9e4 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -1,15 +1,15 @@
-{stdenv, fetchurl, unzip, autoconf, automake, makeWrapper, pkgconfig
+{stdenv, fetchzip, autoconf, automake, makeWrapper, pkgconfig
 , gnome3, avahi, gtk3, libnotify, pulseaudio, x11}:
 
 stdenv.mkDerivation rec {
   name = "pasystray-0.5.2";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://github.com/christophgysin/pasystray/archive/${name}.zip";
     sha256 = "084jld5zk89h4akll73bwhfav6mpg55zmdd5kvlg396rqi9lqkj4";
   };
 
-  buildInputs = [ unzip autoconf automake makeWrapper pkgconfig 
+  buildInputs = [ autoconf automake makeWrapper pkgconfig 
                   gnome3.defaultIconTheme
                   avahi gtk3 libnotify pulseaudio x11 ];
 

From 1a4c95242297f2b31a140664609eae0bf062b0d9 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 25 May 2015 17:12:38 -0400
Subject: [PATCH 0223/2322] And now try fetchFromGitHub

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

diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index 4efdb9aa9e4..c542386cb5a 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -1,12 +1,14 @@
-{stdenv, fetchzip, autoconf, automake, makeWrapper, pkgconfig
+{stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig
 , gnome3, avahi, gtk3, libnotify, pulseaudio, x11}:
 
 stdenv.mkDerivation rec {
   name = "pasystray-0.5.2";
 
-  src = fetchzip {
-    url = "https://github.com/christophgysin/pasystray/archive/${name}.zip";
-    sha256 = "084jld5zk89h4akll73bwhfav6mpg55zmdd5kvlg396rqi9lqkj4";
+  src = fetchFromGitHub {
+    owner = "christophgysin";
+    repo = "pasystray";
+    rev = "6709fc1e9f792baf4f7b4507a887d5876b2cfa70";
+    sha256 = "1z21wassdiwfnlcrkpdqh8ylblpd1xxjxcmib5mwix9va2lykdfv";
   };
 
   buildInputs = [ autoconf automake makeWrapper pkgconfig 

From a6531b084e141f12c345cff65fb0fd9afd42baa2 Mon Sep 17 00:00:00 2001
From: fro_ozen <fro_ozen@gmx.de>
Date: Mon, 25 May 2015 23:45:53 +0200
Subject: [PATCH 0224/2322] Update alock to version 20150418

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

diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix
index c2405c9c380..9083a90f6f5 100644
--- a/pkgs/misc/screensavers/alock/default.nix
+++ b/pkgs/misc/screensavers/alock/default.nix
@@ -2,13 +2,13 @@
 , libX11, pam, libgcrypt, libXrender, imlib2 }:
 
 stdenv.mkDerivation rec {
-  date = "20141209";
+  date = "20150418";
   name = "alock-${date}";
 
   src = fetchgit {
     url = https://github.com/Arkq/alock;
-    rev = "5ab7e6014faa1659c2d55bf9734bfa3ce7137443";
-    sha256 = "07wf3vxh54ncxslp3zf8m7szpqbissxf8q9rs5zgvg333zdqd49s";
+    rev = "69b547602d965733d415f877eb59d05966bd158d";
+    sha256 = "c1f00bf90c966b2b76e00061cc4b54a3c0bc6547e788731ab694b43f55a216ab";
   };
 
   preConfigure = "autoreconf -fvi";

From 255c0903a1ac10a2b2518c343ac4613918075615 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 May 2015 21:04:01 -0500
Subject: [PATCH 0225/2322] gnuplot: requires Qt 4

---
 pkgs/tools/graphics/gnuplot/default.nix | 2 +-
 pkgs/top-level/all-packages.nix         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index fcd8a37382e..f8dd35576ff 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional withTeXLive texLive
     ++ lib.optional withLua lua
     ++ lib.optionals withX [ libX11 libXpm libXt libXaw ]
-    ++ lib.optional withQt [ qt.base ]
+    ++ lib.optional withQt [ qt ]
     # compiling with wxGTK causes a malloc (double free) error on darwin
     ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3201bd5f851..95266a23863 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1564,7 +1564,7 @@ let
 
   gnupg = gnupg20;
 
-  gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt5; };
+  gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; };
 
   gnuplot_qt = gnuplot.override { withQt = true; };
 

From d9c8b1f83a9e190aec401cd7e1d1d514a4042300 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Tue, 26 May 2015 04:17:09 +0200
Subject: [PATCH 0226/2322] tetraproc: init at 0.8.2

Converts the A-format signals from a tetrahedral Ambisonic microphone into B-format signals ready for recording
---
 pkgs/applications/audio/tetraproc/default.nix | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/audio/tetraproc/default.nix

diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix
new file mode 100644
index 00000000000..de351a72022
--- /dev/null
+++ b/pkgs/applications/audio/tetraproc/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, jack2, libclthreads, libclxclient, fftwFloat, libsndfile, freetype, x11
+}:
+
+stdenv.mkDerivation rec {
+  name = "tetraproc-${version}";
+  version = "0.8.2";
+  src = fetchurl {
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    sha256 = "17y3vbm5f6h5cmh3yfxjgqz4xhfwpkla3lqfspnbm4ndlzmfpykv";
+  };
+
+  buildInputs = [
+   jack2 libclthreads libclxclient fftwFloat libsndfile freetype x11
+  ];
+
+  patchPhase = ''
+    cd source
+    sed -e "s@#include <clthreads.h>@#include <${libclthreads}/include>@" -i tetraproc.cc
+    sed -e "s@#include <clxclient.h>@#include <${libclxclient}/include>@" -i *.h
+    sed -e "s@#include <clthreads.h>@#include <${libclthreads}/include>@" -i *.h
+    sed -e "s@#include <clxclient.h>@#include <${libclxclient}/include>@" -i png2img.*
+    sed -e "s@/usr/local@$out@" -i Makefile
+  '';
+
+  meta = {
+    description = "Converts the A-format signals from a tetrahedral Ambisonic microphone into B-format signals ready for recording";
+    version = "${version}";
+    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3201bd5f851..ec82f90284e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12384,6 +12384,8 @@ let
 
   tesseract = callPackage ../applications/graphics/tesseract { };
 
+  tetraproc = callPackage ../applications/audio/tetraproc { };
+
   thinkingRock = callPackage ../applications/misc/thinking-rock { };
 
   thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {

From fd5b273e82cf7e78a94479730cf1f51d3a19c637 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 25 May 2015 14:57:20 -0700
Subject: [PATCH 0227/2322] nixos/grub: Add the ability to mirror grub to
 multiple partitions

---
 .../modules/system/boot/loader/grub/grub.nix  | 116 +++++++++++++++---
 .../system/boot/loader/grub/install-grub.pl   |  41 ++++---
 2 files changed, 120 insertions(+), 37 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index e8e7727d319..e64c41b7f48 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -27,7 +27,7 @@ let
 
   f = x: if x == null then "" else "" + x;
 
-  grubConfig = pkgs.writeText "grub-config.xml" (builtins.toXML
+  grubConfig = args: pkgs.writeText "grub-config.xml" (builtins.toXML
     { splashImage = f config.boot.loader.grub.splashImage;
       grub = f grub;
       grubTarget = f (grub.grubTarget or "");
@@ -35,11 +35,14 @@ let
       fullVersion = (builtins.parseDrvName realGrub.name).version;
       grubEfi = f grubEfi;
       grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else "";
-      inherit (efi) efiSysMountPoint canTouchEfiVariables;
+      bootPath = args.path;
+      efiSysMountPoint = if args.efiSysMountPoint == null then args.path else args.efiSysMountPoint;
+      inherit (args) devices;
+      inherit (efi) canTouchEfiVariables;
       inherit (cfg)
         version extraConfig extraPerEntryConfig extraEntries
         extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout
-        default devices fsIdentifier efiSupport;
+        default fsIdentifier efiSupport;
       path = (makeSearchPath "bin" ([
         pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfsProgs
         pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else [])
@@ -48,6 +51,9 @@ let
       ]);
     });
 
+  bootDeviceCounters = fold (device: attr: attr // { "${device}" = (attr."${device}" or 0) + 1; }) {}
+    (concatMap (args: args.devices) cfg.mirroredBoots);
+
 in
 
 {
@@ -101,6 +107,53 @@ in
         '';
       };
 
+      mirroredBoots = mkOption {
+        default = [ ];
+        example = [
+          { path = "/boot1"; devices = [ "/dev/sda" ]; }
+          { path = "/boot2"; devices = [ "/dev/sdb" ]; }
+        ];
+        description = ''
+          Mirror the boot configuration to multiple partitions and install grub
+          to the respective devices corresponding to those partitions.
+        '';
+
+        type = types.listOf types.optionSet;
+
+        options = {
+
+          path = mkOption {
+            example = "/boot1";
+            type = types.str;
+            description = ''
+              The path to the boot directory where grub will be written. Generally
+              this boot parth should double as an efi path.
+            '';
+          };
+
+          efiSysMountPoint = mkOption {
+            default = null;
+            example = "/boot1/efi";
+            type = types.nullOr types.str;
+            description = ''
+              The path to the efi system mount point. Usually this is the same
+              partition as the above path and can be left as null.
+            '';
+          };
+
+          devices = mkOption {
+            default = [ ];
+            example = [ "/dev/sda" "/dev/sdb" ];
+            type = types.listOf types.str;
+            description = ''
+              The path to the devices which will have the grub mbr written.
+              Note these are typically device paths and not paths to partitions.
+            '';
+          };
+
+        };
+      };
+
       configurationName = mkOption {
         default = "";
         example = "Stable 2.6.21";
@@ -291,13 +344,18 @@ in
 
       boot.loader.grub.devices = optional (cfg.device != "") cfg.device;
 
-      system.build.installBootLoader =
-        if cfg.devices == [] then
-          throw "You must set the option ‘boot.loader.grub.device’ to make the system bootable."
-        else
-          "PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])} " +
-          (if cfg.enableCryptodisk then "GRUB_ENABLE_CRYPTODISK=y " else "") +
-          "${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig}";
+      boot.loader.grub.mirroredBoots = optionals (cfg.devices != [ ]) [
+        { path = "/boot"; inherit (cfg) devices; inherit (efi) efiSysMountPoint; }
+      ];
+
+      system.build.installBootLoader = pkgs.writeScript "install-grub.sh" (''
+        #!${pkgs.stdenv.shell}
+        set -e
+        export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])}
+        ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"}
+      '' + flip concatMapStrings cfg.mirroredBoots (args: ''
+        ${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig args}
+      ''));
 
       system.build.grub = grub;
 
@@ -312,13 +370,37 @@ in
           ${pkgs.coreutils}/bin/cp -pf "${v}" "/boot/${n}"
         '') config.boot.loader.grub.extraFiles);
 
-    assertions = [{ assertion = !cfg.zfsSupport || cfg.version == 2;
-                    message = "Only grub version 2 provides zfs support";}]
-      ++ flip map cfg.devices (dev: {
-        assertion = dev == "nodev" || hasPrefix "/" dev;
-        message = "Grub devices must be absolute paths, not ${dev}";
-      });
-
+      assertions = [
+        {
+          assertion = !cfg.zfsSupport || cfg.version == 2;
+          message = "Only grub version 2 provides zfs support";
+        }
+        {
+          assertion = cfg.mirroredBoots != [ ];
+          message = "You must set the option ‘boot.loader.grub.devices’ or "
+            + "'boot.loader.grub.mirroredBoots' to make the system bootable.";
+        }
+        {
+          assertion = all (c: c < 2) (mapAttrsToList (_: c: c) bootDeviceCounters);
+          message = "You cannot have duplicated devices in mirroredBoots";
+        }
+      ] ++ flip concatMap cfg.mirroredBoots (args: [
+        {
+          assertion = args.devices != [ ];
+          message = "A boot path cannot have an empty devices string in ${arg.path}";
+        }
+        {
+          assertion = hasPrefix "/" args.path;
+          message = "Boot paths must be absolute, not ${args.path}";
+        }
+        {
+          assertion = hasPrefix "/" args.efiSysMountPoint;
+          message = "Efi paths must be absolute, not ${args.efiSysMountPoint}";
+        }
+      ] ++ flip map args.devices (device: {
+        assertion = device == "nodev" || hasPrefix "/" device;
+        message = "Grub devices must be absolute paths, not ${dev} in ${args.path}";
+      }));
     })
 
   ];
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 81009e9fb82..a0384d23f82 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -11,7 +11,7 @@ require List::Compare;
 use POSIX;
 use Cwd;
 
-my $defaultConfig = $ARGV[1] or die;
+my $defaultConfig = $ARGV[0] or die;
 
 my $dom = XML::LibXML->load_xml(location => $ARGV[0]);
 
@@ -54,6 +54,7 @@ my $defaultEntry = int(get("default"));
 my $fsIdentifier = get("fsIdentifier");
 my $grubEfi = get("grubEfi");
 my $grubTargetEfi = get("grubTargetEfi");
+my $bootPath = get("bootPath");
 my $canTouchEfiVariables = get("canTouchEfiVariables");
 my $efiSysMountPoint = get("efiSysMountPoint");
 $ENV{'PATH'} = get("path");
@@ -62,16 +63,16 @@ die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2;
 
 print STDERR "updating GRUB $grubVersion menu...\n";
 
-mkpath("/boot/grub", 0, 0700);
+mkpath("$bootPath/grub", 0, 0700);
 
-# Discover whether /boot is on the same filesystem as / and
+# Discover whether the bootPath is on the same filesystem as / and
 # /nix/store.  If not, then all kernels and initrds must be copied to
-# /boot.
-if (stat("/boot")->dev != stat("/nix/store")->dev) {
+# the bootPath.
+if (stat($bootPath)->dev != stat("/nix/store")->dev) {
     $copyKernels = 1;
 }
 
-# Discover information about the location of /boot
+# Discover information about the location of the bootPath
 struct(Fs => {
     device => '$',
     type => '$',
@@ -206,7 +207,7 @@ sub GrubFs {
     }
     return Grub->new(path => $path, search => $search);
 }
-my $grubBoot = GrubFs("/boot");
+my $grubBoot = GrubFs($bootPath);
 my $grubStore;
 if ($copyKernels == 0) {
     $grubStore = GrubFs("/nix/store");
@@ -221,7 +222,7 @@ if ($grubVersion == 1) {
         timeout $timeout
     ";
     if ($splashImage) {
-        copy $splashImage, "/boot/background.xpm.gz" or die "cannot copy $splashImage to /boot\n";
+        copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath\n";
         $conf .= "splashimage " . $grubBoot->path . "/background.xpm.gz\n";
     }
 }
@@ -264,7 +265,7 @@ else {
     if ($splashImage) {
         # FIXME: GRUB 1.97 doesn't resize the background image if it
         # doesn't match the video resolution.
-        copy $splashImage, "/boot/background.png" or die "cannot copy $splashImage to /boot\n";
+        copy $splashImage, "$bootPath/background.png" or die "cannot copy $splashImage to $bootPath\n";
         $conf .= "
             insmod png
             if background_image " . $grubBoot->path . "/background.png; then
@@ -285,14 +286,14 @@ $conf .= "$extraConfig\n";
 $conf .= "\n";
 
 my %copied;
-mkpath("/boot/kernels", 0, 0755) if $copyKernels;
+mkpath("$bootPath/kernels", 0, 0755) if $copyKernels;
 
 sub copyToKernelsDir {
     my ($path) = @_;
     return $grubStore->path . substr($path, length("/nix/store")) unless $copyKernels;
     $path =~ /\/nix\/store\/(.*)/ or die;
     my $name = $1; $name =~ s/\//-/g;
-    my $dst = "/boot/kernels/$name";
+    my $dst = "$bootPath/kernels/$name";
     # Don't copy the file if $dst already exists.  This means that we
     # have to create $dst atomically to prevent partially copied
     # kernels or initrd if this script is ever interrupted.
@@ -396,14 +397,14 @@ if ($extraPrepareConfig ne "") {
 }
 
 # Atomically update the GRUB config.
-my $confFile = $grubVersion == 1 ? "/boot/grub/menu.lst" : "/boot/grub/grub.cfg";
+my $confFile = $grubVersion == 1 ? "$bootPath/grub/menu.lst" : "$bootPath/grub/grub.cfg";
 my $tmpFile = $confFile . ".tmp";
 writeFile($tmpFile, $conf);
 rename $tmpFile, $confFile or die "cannot rename $tmpFile to $confFile\n";
 
 
-# Remove obsolete files from /boot/kernels.
-foreach my $fn (glob "/boot/kernels/*") {
+# Remove obsolete files from $bootPath/kernels.
+foreach my $fn (glob "$bootPath/kernels/*") {
     next if defined $copied{$fn};
     print STDERR "removing obsolete file $fn\n";
     unlink $fn;
@@ -422,7 +423,7 @@ struct(GrubState => {
 });
 sub readGrubState {
     my $defaultGrubState = GrubState->new(version => "", efi => "", devices => "", efiMountPoint => "" );
-    open FILE, "</boot/grub/state" or return $defaultGrubState;
+    open FILE, "<$bootPath/grub/state" or return $defaultGrubState;
     local $/ = "\n";
     my $version = <FILE>;
     chomp($version);
@@ -491,10 +492,10 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) {
         next if $dev eq "nodev";
         print STDERR "installing the GRUB $grubVersion boot loader on $dev...\n";
         if ($grubTarget eq "") {
-            system("$grub/sbin/grub-install", "--recheck", Cwd::abs_path($dev)) == 0
+            system("$grub/sbin/grub-install", "--recheck", "--boot-directory=$bootPath", Cwd::abs_path($dev)) == 0
                 or die "$0: installation of GRUB on $dev failed\n";
         } else {
-            system("$grub/sbin/grub-install", "--recheck", "--target=$grubTarget", Cwd::abs_path($dev)) == 0
+            system("$grub/sbin/grub-install", "--recheck", "--boot-directory=$bootPath", "--target=$grubTarget", Cwd::abs_path($dev)) == 0
                 or die "$0: installation of GRUB on $dev failed\n";
         }
     }
@@ -505,10 +506,10 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) {
 if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both")) {
     print STDERR "installing the GRUB $grubVersion EFI boot loader into $efiSysMountPoint...\n";
     if ($canTouchEfiVariables eq "true") {
-        system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--efi-directory=$efiSysMountPoint") == 0
+        system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint") == 0
                 or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n";
     } else {
-        system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--efi-directory=$efiSysMountPoint", "--no-nvram") == 0
+        system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint", "--no-nvram") == 0
                 or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n";
     }
 }
@@ -516,7 +517,7 @@ if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both"))
 
 # update GRUB state file
 if ($requireNewInstall != 0) {
-    open FILE, ">/boot/grub/state" or die "cannot create /boot/grub/state: $!\n";
+    open FILE, ">$bootPath/grub/state" or die "cannot create $bootPath/grub/state: $!\n";
     print FILE get("fullVersion"), "\n" or die;
     print FILE $efiTarget, "\n" or die;
     print FILE join( ":", @deviceTargets ), "\n" or die;

From 2966068968c4fbee0cc8bb7ecebf17872a30725c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 26 May 2015 06:45:25 +0300
Subject: [PATCH 0228/2322] ddclient: Set SSL_CERT_FILE environment variable

Otherwise connection to SSL hosts fails like this:

May 26 06:44:05 kbuilder ddclient[17084]: WARNING:  cannot connect to dynamicdns.park-your-domain.com:443 socket:
    IO::Socket::IP configuration failed SSL connect attempt failed with unknown error
    error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed
---
 nixos/modules/services/networking/ddclient.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index 92f6396b358..5802d8b95b3 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -126,6 +126,8 @@ in
       description = "Dynamic DNS Client";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
+
+      environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
       serviceConfig = {
         # Uncomment this if too many problems occur:
         # Type = "forking";

From c8db08ee07e16164448aed24de37ff020d112337 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 25 May 2015 21:11:59 -0700
Subject: [PATCH 0229/2322] nixos/installer: Make test install disk larger to
 support the expressions

---
 nixos/tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 64f98141cc0..603dfbe224f 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -120,7 +120,7 @@ let
       hdFlags =''hda => "harddisk", hdaInterface => "${iface}", '';
     in
     ''
-      createDisk("harddisk", 4 * 1024);
+      createDisk("harddisk", 8 * 1024);
 
       my $machine = createMachine({ ${hdFlags}
         cdrom => glob("${iso}/iso/*.iso"),

From 1a6e124da84b4579097366f620ffa07b9186b876 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Tue, 26 May 2015 05:26:16 +0100
Subject: [PATCH 0230/2322] mpv: use ffmpeg-full when using youtubeSupport

We need networking and potentially ssl/tls compiled into ffmpeg but the
minimal ffmpeg_x wrappers no longer offer that. We could of course use
ffmpeg-full and slim it down to just what we need but we'd end up
building ffmpeg twice, might as well stick with full
---
 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 95266a23863..234593906ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11697,13 +11697,15 @@ let
       # !!! should depend on MPlayer
     };
 
-  mpv = callPackage ../applications/video/mpv {
+  mpv = callPackage ../applications/video/mpv rec {
     lua = lua5_1;
     lua5_sockets = lua5_1_sockets;
     bs2bSupport = config.mpv.bs2bSupport or true;
     youtubeSupport = config.mpv.youtubeSupport or true;
     cacaSupport = config.mpv.cacaSupport or true;
     vaapiSupport = config.mpv.vaapiSupport or false;
+    # YouTube needs network support and potentially openssl/tls
+    ffmpeg = if youtubeSupport then ffmpeg-full else ffmpeg;
   };
 
   mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { };

From c69164509d3abd23225b9acc82d279ee5539905a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 26 May 2015 07:36:26 +0300
Subject: [PATCH 0231/2322] rxvt_unicode: Add terminfo output to
 propagated-user-env-packages

Fixes #7787. This should avoid error messages from terminal apps like
"'rxvt-unicode-256color': unknown terminal type.'"
---
 pkgs/applications/misc/rxvt_unicode/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 12eeb62dc04..c1d74c247ce 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -45,6 +45,11 @@ stdenv.mkDerivation (rec {
       ln -s $out/{lib/urxvt,lib/perl5/site_perl}
     '';
 
+  postInstall = ''
+    mkdir -p $out/nix-support
+    echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
+  '';
+
   meta = {
     description = "A clone of the well-known terminal emulator rxvt";
     homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";

From 4128b474f4fabca1f389971cf321e07f466f10c6 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Tue, 26 May 2015 05:51:33 +0100
Subject: [PATCH 0232/2322] haskell-Agda: overrides are no longer necessary

---
 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 1432b9361db..ce7b8b27d32 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -115,9 +115,6 @@ self: super: {
   # Cannot compile its own test suite: https://github.com/haskell/network-uri/issues/10.
   network-uri = dontCheck super.network-uri;
 
-  # Agda-2.4.2.2 needs these overrides to compile.
-  Agda = super.Agda.override { equivalence = self.equivalence_0_2_5; cpphs = self.cpphs_1_18_9; };
-
   # Help libconfig find it's C language counterpart.
   libconfig = (dontCheck super.libconfig).override { config = pkgs.libconfig; };
 

From b07d2a447b3a95bba0887c360353eac68f156aa4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 25 May 2015 23:03:24 -0700
Subject: [PATCH 0233/2322] nixos/grub: Fix assertion

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

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index e64c41b7f48..c790e05f51b 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -394,7 +394,7 @@ in
           message = "Boot paths must be absolute, not ${args.path}";
         }
         {
-          assertion = hasPrefix "/" args.efiSysMountPoint;
+          assertion = if args.efiSysMountPoint == null then true else hasPrefix "/" args.efiSysMountPoint;
           message = "Efi paths must be absolute, not ${args.efiSysMountPoint}";
         }
       ] ++ flip map args.devices (device: {

From a92271f195f1490ca7da2b6ac3e1c6b38975c529 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 26 May 2015 07:54:46 +0200
Subject: [PATCH 0234/2322] lua-nginx-module: Update from 0.9.15 to 0.9.16rc1

This fixes the build that has been broken since nginx was bumped to 1.8.0
---
 pkgs/servers/http/nginx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index de964f1776a..87a4cc398a9 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -57,8 +57,8 @@ let
   lua-ext = fetchFromGitHub {
     owner = "openresty";
     repo = "lua-nginx-module";
-    rev = "v0.9.15";
-    sha256 = "0kicfs0gyfb5fhjmrwr6p09c5x6g0jwsh0wg5bsp3p209rnbq94q";
+    rev = "v0.9.16rc1";
+    sha256 = "0fdrzfkzdrxykbyxrpas7ns6kxzjf9s6h0fj7k4423wfwybi0kic";
   };
 
   set-misc-ext = fetchFromGitHub {

From 47aeaf9d04aa53202ed7ac9c7bf17799af100793 Mon Sep 17 00:00:00 2001
From: Alastair Pharo <asppsa@gmail.com>
Date: Tue, 26 May 2015 16:58:18 +1000
Subject: [PATCH 0235/2322] Fairly complete set of packages for Pure

---
 .../pure-modules/audio/default.nix            | 25 ++++++++++++
 .../pure-modules/avahi/default.nix            | 25 ++++++++++++
 pkgs/development/pure-modules/csv/default.nix | 25 ++++++++++++
 pkgs/development/pure-modules/doc/default.nix | 23 +++++++++++
 .../pure-modules/fastcgi/default.nix          | 25 ++++++++++++
 .../pure-modules/faust/default.nix            | 25 ++++++++++++
 pkgs/development/pure-modules/ffi/default.nix | 25 ++++++++++++
 pkgs/development/pure-modules/gen/default.nix | 25 ++++++++++++
 .../setup-hook.sh => generic-setup-hook.sh}   |  0
 pkgs/development/pure-modules/gl/default.nix  | 25 ++++++++++++
 .../development/pure-modules/glpk/default.nix | 39 +++++++++++++++++++
 .../pure-modules/gplot/default.nix            | 25 ++++++++++++
 .../{pure-gsl => gsl}/default.nix             | 21 +++++-----
 pkgs/development/pure-modules/gtk/default.nix | 25 ++++++++++++
 .../pure-modules/liblo/default.nix            | 25 ++++++++++++
 .../development/pure-modules/lilv/default.nix | 25 ++++++++++++
 pkgs/development/pure-modules/lv2/default.nix | 25 ++++++++++++
 .../development/pure-modules/midi/default.nix | 25 ++++++++++++
 .../development/pure-modules/mpfr/default.nix | 25 ++++++++++++
 .../pure-modules/octave/default.nix           | 25 ++++++++++++
 .../development/pure-modules/odbc/default.nix | 25 ++++++++++++
 .../pure-modules/pandoc/default.nix           | 28 +++++++++++++
 .../pure-modules/rational/default.nix         | 25 ++++++++++++
 .../pure-modules/readline/default.nix         | 25 ++++++++++++
 .../pure-modules/sockets/default.nix          | 25 ++++++++++++
 .../development/pure-modules/sql3/default.nix | 25 ++++++++++++
 .../pure-modules/stldict/default.nix          | 25 ++++++++++++
 .../pure-modules/stllib/default.nix           | 25 ++++++++++++
 pkgs/development/pure-modules/tk/default.nix  | 25 ++++++++++++
 pkgs/development/pure-modules/xml/default.nix | 25 ++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 pkgs/top-level/pure-packages.nix              | 33 ++++++++++++++++
 32 files changed, 760 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/pure-modules/audio/default.nix
 create mode 100644 pkgs/development/pure-modules/avahi/default.nix
 create mode 100644 pkgs/development/pure-modules/csv/default.nix
 create mode 100644 pkgs/development/pure-modules/doc/default.nix
 create mode 100644 pkgs/development/pure-modules/fastcgi/default.nix
 create mode 100644 pkgs/development/pure-modules/faust/default.nix
 create mode 100644 pkgs/development/pure-modules/ffi/default.nix
 create mode 100644 pkgs/development/pure-modules/gen/default.nix
 rename pkgs/development/pure-modules/{pure-gsl/setup-hook.sh => generic-setup-hook.sh} (100%)
 create mode 100644 pkgs/development/pure-modules/gl/default.nix
 create mode 100644 pkgs/development/pure-modules/glpk/default.nix
 create mode 100644 pkgs/development/pure-modules/gplot/default.nix
 rename pkgs/development/pure-modules/{pure-gsl => gsl}/default.nix (60%)
 create mode 100644 pkgs/development/pure-modules/gtk/default.nix
 create mode 100644 pkgs/development/pure-modules/liblo/default.nix
 create mode 100644 pkgs/development/pure-modules/lilv/default.nix
 create mode 100644 pkgs/development/pure-modules/lv2/default.nix
 create mode 100644 pkgs/development/pure-modules/midi/default.nix
 create mode 100644 pkgs/development/pure-modules/mpfr/default.nix
 create mode 100644 pkgs/development/pure-modules/octave/default.nix
 create mode 100644 pkgs/development/pure-modules/odbc/default.nix
 create mode 100644 pkgs/development/pure-modules/pandoc/default.nix
 create mode 100644 pkgs/development/pure-modules/rational/default.nix
 create mode 100644 pkgs/development/pure-modules/readline/default.nix
 create mode 100644 pkgs/development/pure-modules/sockets/default.nix
 create mode 100644 pkgs/development/pure-modules/sql3/default.nix
 create mode 100644 pkgs/development/pure-modules/stldict/default.nix
 create mode 100644 pkgs/development/pure-modules/stllib/default.nix
 create mode 100644 pkgs/development/pure-modules/tk/default.nix
 create mode 100644 pkgs/development/pure-modules/xml/default.nix
 create mode 100644 pkgs/top-level/pure-packages.nix

diff --git a/pkgs/development/pure-modules/audio/default.nix b/pkgs/development/pure-modules/audio/default.nix
new file mode 100644
index 00000000000..7b14b20dc83
--- /dev/null
+++ b/pkgs/development/pure-modules/audio/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, portaudio, fftw, libsndfile, libsamplerate }:
+
+stdenv.mkDerivation rec {
+  baseName = "audio";
+  version = "0.6";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "c1f2a5da73983efb5a54f86d57ba93713ebed20ff0c72de9b3467f10f2904ee0";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure portaudio fftw libsndfile libsamplerate ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "A digital audio interface for the Pure programming language";
+    homepage = http://puredocs.bitbucket.org/pure-audio.html;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/avahi/default.nix b/pkgs/development/pure-modules/avahi/default.nix
new file mode 100644
index 00000000000..e22e1fae220
--- /dev/null
+++ b/pkgs/development/pure-modules/avahi/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, avahi }:
+
+stdenv.mkDerivation rec {
+  baseName = "avahi";
+  version = "0.3";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "5fac8a6e3a54e45648ceb207ee0061b22eac8c4e668b8d53f13eb338b09c9160";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure avahi ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "A digital audio interface for the Pure programming language";
+    homepage = http://puredocs.bitbucket.org/pure-avahi.html;
+    license = stdenv.lib.licenses.lgpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/csv/default.nix b/pkgs/development/pure-modules/csv/default.nix
new file mode 100644
index 00000000000..6d41f2c5e6a
--- /dev/null
+++ b/pkgs/development/pure-modules/csv/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure }:
+
+stdenv.mkDerivation rec {
+  baseName = "csv";
+  version = "1.6";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "fe7c4edebe8208c54d5792a9eefaeb28c4a58b9094d161a6dda8126f0823ab3c";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "Comma Separated Value Interface for the Pure Programming Language";
+    homepage = http://puredocs.bitbucket.org/pure-csv.html;
+    license = stdenv.lib.licenses.free;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/doc/default.nix b/pkgs/development/pure-modules/doc/default.nix
new file mode 100644
index 00000000000..68a08334375
--- /dev/null
+++ b/pkgs/development/pure-modules/doc/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, pure }:
+
+stdenv.mkDerivation rec {
+  baseName = "doc";
+  version = "0.7";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "cfa880573941f37868269bcc443a09fecd2a141a78556383d2213f6c9f45ddd9";
+  };
+
+  buildInputs = [ pkgconfig pure ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+
+  meta = {
+    description = "A simple utility for literate programming and documenting source code written in the Pure programming language";
+    homepage = http://puredocs.bitbucket.org/pure-doc.html;
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/fastcgi/default.nix b/pkgs/development/pure-modules/fastcgi/default.nix
new file mode 100644
index 00000000000..f1bc49c5ecc
--- /dev/null
+++ b/pkgs/development/pure-modules/fastcgi/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, fcgi }:
+
+stdenv.mkDerivation rec {
+  baseName = "fastcgi";
+  version = "0.6";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "aa5789cc1e17521c01f349ee82ce2a00500e025b3f8494f89a7ebe165b5aabc7";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure fcgi ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "Lets you write FastCGI scripts with Pure, to be run by web servers like Apache";
+    homepage = http://puredocs.bitbucket.org/pure-fastcgi.html;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/faust/default.nix b/pkgs/development/pure-modules/faust/default.nix
new file mode 100644
index 00000000000..7f5c4801d5d
--- /dev/null
+++ b/pkgs/development/pure-modules/faust/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, faust, libtool }:
+
+stdenv.mkDerivation rec {
+  baseName = "faust";
+  version = "0.11";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "51278a3b0807c4770163dc2ce423507dcf0ffec9cd1c1fbc08426d07294f6ae0";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure faust libtool ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "Lets you load and run Faust-generated signal processing modules in Pure";
+    homepage = http://puredocs.bitbucket.org/pure-faust.html;
+    license = stdenv.lib.licenses.lgpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/ffi/default.nix b/pkgs/development/pure-modules/ffi/default.nix
new file mode 100644
index 00000000000..a9a3a56ebb8
--- /dev/null
+++ b/pkgs/development/pure-modules/ffi/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, libffi }:
+
+stdenv.mkDerivation rec {
+  baseName = "ffi";
+  version = "0.14";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "0331f48efaae40af21b23cf286fd7eac0ea0a249d08fd97bf23246929c0ea71a";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure libffi ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "Provides an interface to libffi which enables you to call C functions from Pure and vice versa";
+    homepage = http://puredocs.bitbucket.org/pure-ffi.html;
+    license = stdenv.lib.licenses.lgpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix
new file mode 100644
index 00000000000..082a8c88c61
--- /dev/null
+++ b/pkgs/development/pure-modules/gen/default.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchurl,
+  pkgconfig, pure, haskellPackages }:
+
+stdenv.mkDerivation rec {
+  baseName = "gen";
+  version = "0.20";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "cfadd99a378b296325937d2492347611cc1e1d9f24594f91f3c2293eca01a4a8";
+  };
+
+  hsEnv = haskellPackages.ghcWithPackages (hsPkgs : [hsPkgs.language-c]);
+  buildInputs = [ pkgconfig hsEnv pure ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+
+  meta = {
+    description = "Pure interface generator";
+    homepage = http://puredocs.bitbucket.org/pure-gen.html;
+    license = stdenv.lib.licenses.free;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/pure-gsl/setup-hook.sh b/pkgs/development/pure-modules/generic-setup-hook.sh
similarity index 100%
rename from pkgs/development/pure-modules/pure-gsl/setup-hook.sh
rename to pkgs/development/pure-modules/generic-setup-hook.sh
diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix
new file mode 100644
index 00000000000..37026ad9344
--- /dev/null
+++ b/pkgs/development/pure-modules/gl/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, freeglut, mesa, x11 }:
+
+stdenv.mkDerivation rec {
+  baseName = "gl";
+  version = "0.9";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "edd594222f89ae372067eda6679a37488986b9739b5b79b4a25ac48255d31bba";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure freeglut mesa x11 ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "Fairly complete Pure bindings for the OpenGL graphics library, which allow you to do 2D and 3D graphics programming with Pure";
+    homepage = http://puredocs.bitbucket.org/pure-gl.html;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix
new file mode 100644
index 00000000000..22d2bc17738
--- /dev/null
+++ b/pkgs/development/pure-modules/glpk/default.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv, fetchurl,
+  pkgconfig, pure, glpk, gmp, libtool, libmysql, libiodbc, zlib }:
+
+stdenv.mkDerivation rec {
+  baseName = "glpk";
+  version = "0.5";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "5d6dc11706985dda02d96d481ea5f164c9e95ee446432fc4fc3d0db61a076346";
+  };
+
+  glpkWithExtras = lib.overrideDerivation glpk (attrs: {
+    propagatedNativeBuildInputs = [ gmp libtool libmysql libiodbc ];
+
+    preConfigure = ''
+      substituteInPlace configure \
+        --replace /usr/include/mysql ${libmysql}/include/mysql
+    '';
+    configureFlags = [ "--enable-dl"
+                       "--enable-odbc"
+                       "--enable-mysql"
+                       "--with-gmp=yes" ];
+  });
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure glpkWithExtras ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "GLPK interface for the Pure Programming Language";
+    homepage = http://puredocs.bitbucket.org/pure-glpk.html;
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix
new file mode 100644
index 00000000000..acaf1efdaaa
--- /dev/null
+++ b/pkgs/development/pure-modules/gplot/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, gnuplot }:
+
+stdenv.mkDerivation rec {
+  baseName = "gplot";
+  version = "0.1";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "841ded98e4d1cdfaf78f95481e5995d0440bfda2d5df533d6741a6e7058a882c";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure gnuplot ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "a pure binding to gnuplot";
+    homepage = http://puredocs.bitbucket.org/pure-gplot.html;
+    license = stdenv.lib.licenses.lgpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/pure-gsl/default.nix b/pkgs/development/pure-modules/gsl/default.nix
similarity index 60%
rename from pkgs/development/pure-modules/pure-gsl/default.nix
rename to pkgs/development/pure-modules/gsl/default.nix
index bbad1e380d5..10eddeeb797 100644
--- a/pkgs/development/pure-modules/pure-gsl/default.nix
+++ b/pkgs/development/pure-modules/gsl/default.nix
@@ -1,22 +1,19 @@
 { stdenv, fetchurl, pure, pkgconfig, gsl }:
 
-stdenv.mkDerivation {
-  name = "pure-gsl-0.12";
+stdenv.mkDerivation rec {
+  baseName = "gsl";
+  version = "0.12";
+  name = "pure-${baseName}-${version}";
+  
   src = fetchurl {
-    url = https://bitbucket.org/purelang/pure-lang/downloads/pure-gsl-0.12.tar.gz;
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
     sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75";
   };
 
   buildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ pure gsl ];
-
-  installPhase = ''
-    mkdir -p $out/lib/pure/gsl
-    install gsl.pure gsl$(pkg-config pure --variable DLL) $out/lib/pure
-    install gsl/*.pure $out/lib/pure/gsl
-  '';
-
-  setupHook = ./setup-hook.sh;
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
 
   meta = {
     description = "GNU Scientific Library interface for Pure";
@@ -25,4 +22,4 @@ stdenv.mkDerivation {
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ asppsa ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/pure-modules/gtk/default.nix b/pkgs/development/pure-modules/gtk/default.nix
new file mode 100644
index 00000000000..fd2460b5c1b
--- /dev/null
+++ b/pkgs/development/pure-modules/gtk/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, pure-ffi, gtk2 }:
+
+stdenv.mkDerivation rec {
+  baseName = "gtk";
+  version = "0.13";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "e659ff1bc5809ce35b810f8ac3fb7e8cadaaef13996537d8632e2f86ed76d203";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure pure-ffi gtk2 ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "A collection of bindings to use the GTK+ GUI toolkit version 2.x with Pure";
+    homepage = http://puredocs.bitbucket.org/pure-gtk.html;
+    license = stdenv.lib.licenses.lgpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/liblo/default.nix b/pkgs/development/pure-modules/liblo/default.nix
new file mode 100644
index 00000000000..a68d04f901f
--- /dev/null
+++ b/pkgs/development/pure-modules/liblo/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, liblo }:
+
+stdenv.mkDerivation rec {
+  baseName = "liblo";
+  version = "0.9";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "c2ba4d6f94489acf8a8fac73982ae03d5ad4113146eb1f7d6558a956c57cb8ee";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure liblo ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "A quick and dirty Pure wrapper for the liblo library, which implements Berkeley’s Open Sound Control (OSC) protocol";
+    homepage = http://puredocs.bitbucket.org/pure-liblo.html;
+    license = stdenv.lib.licenses.lgpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/lilv/default.nix b/pkgs/development/pure-modules/lilv/default.nix
new file mode 100644
index 00000000000..4f2d5abba1e
--- /dev/null
+++ b/pkgs/development/pure-modules/lilv/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, lilv, lv2, serd, sord, sratom }:
+
+stdenv.mkDerivation rec {
+  baseName = "lilv";
+  version = "0.4";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "af20982fe43e8dce62d50bf7a78e461ab36c308325b123cddbababf0d3beaf9f";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure lilv lv2 serd sord sratom ];
+  makeFlags = "CFLAGS=-I${lilv}/include/lilv-0 libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "A Pure module for David Robillard’s Lilv, a library for LV2 plugin host writers";
+    homepage = http://puredocs.bitbucket.org/pure-lilv.html;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/lv2/default.nix b/pkgs/development/pure-modules/lv2/default.nix
new file mode 100644
index 00000000000..63a8cafc474
--- /dev/null
+++ b/pkgs/development/pure-modules/lv2/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, lv2 }:
+
+stdenv.mkDerivation rec {
+  baseName = "lv2";
+  version = "0.2";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "721cacd831781d8309e7ecabb0ee7c01da17e75c5642a5627cf158bfb36093e1";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure lv2 ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "A generic LV2 plugin wrapper for Pure which can be linked with batch-compiled Pure scripts to obtain LV2 plugin modules";
+    homepage = http://puredocs.bitbucket.org/pure-lv2.html;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/midi/default.nix b/pkgs/development/pure-modules/midi/default.nix
new file mode 100644
index 00000000000..bbf20b66c29
--- /dev/null
+++ b/pkgs/development/pure-modules/midi/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, portmidi }:
+
+stdenv.mkDerivation rec {
+  baseName = "midi";
+  version = "0.6";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "817ae9fa5f443a8c478a6770f36091e3cf99f3515c74e00d09ca958dead1e7eb";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure portmidi ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "A MIDI interface for the Pure programming language";
+    homepage = http://puredocs.bitbucket.org/pure-midi.html;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/mpfr/default.nix b/pkgs/development/pure-modules/mpfr/default.nix
new file mode 100644
index 00000000000..ccc32739a49
--- /dev/null
+++ b/pkgs/development/pure-modules/mpfr/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure }:
+
+stdenv.mkDerivation rec {
+  baseName = "mpfr";
+  version = "0.5";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "39d2255c2c0c2d60ce727be178b5e5a06f7c92eb365976c49c4a34b1edc576e7";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "This module makes the MPFR multiprecision floats available in Pure";
+    homepage = http://puredocs.bitbucket.org/pure-mpfr.html;
+    license = stdenv.lib.licenses.lgpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix
new file mode 100644
index 00000000000..6a039313f0e
--- /dev/null
+++ b/pkgs/development/pure-modules/octave/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, octave }:
+
+stdenv.mkDerivation rec {
+  baseName = "octave";
+  version = "0.6";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "5a42e8dff8023f6bf1214ed31b7999645d88ce2f103d9fba23b527259da9a0df";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure octave ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "An Octave module for the Pure programming language";
+    homepage = http://puredocs.bitbucket.org/pure-octave.html;
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/odbc/default.nix b/pkgs/development/pure-modules/odbc/default.nix
new file mode 100644
index 00000000000..666cf55044d
--- /dev/null
+++ b/pkgs/development/pure-modules/odbc/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, libiodbc }:
+
+stdenv.mkDerivation rec {
+  baseName = "odbc";
+  version = "0.10";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "1907e9ebca11cc68762cf7046084b31e9e2bf056df85c40ccbcbe9f02221ff8d";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure libiodbc ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "A simple ODBC interface for the Pure programming language";
+    homepage = http://puredocs.bitbucket.org/pure-odbc.html;
+    license = stdenv.lib.licenses.lgpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/pandoc/default.nix b/pkgs/development/pure-modules/pandoc/default.nix
new file mode 100644
index 00000000000..b51f2ff5e87
--- /dev/null
+++ b/pkgs/development/pure-modules/pandoc/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, pure, pandoc, gawk, getopt }:
+
+stdenv.mkDerivation rec {
+  baseName = "pandoc";
+  version = "0.1";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "0f23a17549048ca3a8f4936ea9e931feb05997390b486850936b746996350cda";
+  };
+
+  buildInputs = [ pkgconfig pure ];
+  propagatedBuildInputs = [ pandoc gawk getopt ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  preInstall = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/man/man1
+  '';
+
+  meta = {
+    description = "Converts Sphinx-formatted Pure documentation files to Markdown and other formats using Pandoc";
+    homepage = http://puredocs.bitbucket.org/pure-pandoc.html;
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/rational/default.nix b/pkgs/development/pure-modules/rational/default.nix
new file mode 100644
index 00000000000..42ead62b256
--- /dev/null
+++ b/pkgs/development/pure-modules/rational/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure }:
+
+stdenv.mkDerivation rec {
+  baseName = "rational";
+  version = "0.1";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "62cb4079a0dadd232a859e577e97e50e9718ccfcc5983c4d9c4c32cac7a9bafa";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "A collection of utility functions for rational numbers, and a module for doing interval arithmetic in Pure";
+    homepage = http://puredocs.bitbucket.org/pure-rational.html;
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/readline/default.nix b/pkgs/development/pure-modules/readline/default.nix
new file mode 100644
index 00000000000..e93207943b0
--- /dev/null
+++ b/pkgs/development/pure-modules/readline/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, readline }:
+
+stdenv.mkDerivation rec {
+  baseName = "readline";
+  version = "0.3";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "db8e6663b1c085466c09662fe86d952b6f4ffdafeecffe805c681ab91c910886";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure readline ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "A trivial wrapper around GNU readline, which gives Pure scripts access to the most important facilities of the readline interface";
+    homepage = http://puredocs.bitbucket.org/pure-readline.html;
+    license = stdenv.lib.licenses.free;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/sockets/default.nix b/pkgs/development/pure-modules/sockets/default.nix
new file mode 100644
index 00000000000..522446104ff
--- /dev/null
+++ b/pkgs/development/pure-modules/sockets/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure }:
+
+stdenv.mkDerivation rec {
+  baseName = "sockets";
+  version = "0.7";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "4f2769618ae5818cf6005bb08bcf02fe359a2e31998d12dc0c72f0494e9c0420";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "A Pure interface to the Berkeley socket functions";
+    homepage = http://puredocs.bitbucket.org/pure-sockets.html;
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/sql3/default.nix b/pkgs/development/pure-modules/sql3/default.nix
new file mode 100644
index 00000000000..f937b9eb530
--- /dev/null
+++ b/pkgs/development/pure-modules/sql3/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, sqlite }:
+
+stdenv.mkDerivation rec {
+  baseName = "sql3";
+  version = "0.5";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "b9f79dd443c8ffc5cede51e2af617f24726f5c0409aab4948c9847e6adb53c37";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure sqlite ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "A SQLite module for the Pure programming language";
+    homepage = http://puredocs.bitbucket.org/pure-sql3.html;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/stldict/default.nix b/pkgs/development/pure-modules/stldict/default.nix
new file mode 100644
index 00000000000..abfc0d0fdef
--- /dev/null
+++ b/pkgs/development/pure-modules/stldict/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure }:
+
+stdenv.mkDerivation rec {
+  baseName = "stldict";
+  version = "0.8";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "5b894ae6dc574c7022258e2732bea649c82c959ec4d0be13fb5a3e8ba8488f28";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "A Pure interface to the C++ dictionary containers map and unordered_map";
+    homepage = http://puredocs.bitbucket.org/pure-stldict.html;
+    license = stdenv.lib.licenses.lgpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/stllib/default.nix b/pkgs/development/pure-modules/stllib/default.nix
new file mode 100644
index 00000000000..3be7bccf2a4
--- /dev/null
+++ b/pkgs/development/pure-modules/stllib/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure }:
+
+stdenv.mkDerivation rec {
+  baseName = "stllib";
+  version = "0.6";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-stllib-${version}.tar.gz";
+    sha256 = "1d550764fc2f8ba6ddbd1fbd3da2d6965b69e2c992747265d9ebe4f16aa5e455";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "An “umbrella” package that contains a pair of Pure addons, pure-stlvec and pure-stlmap";
+    homepage = http://puredocs.bitbucket.org/pure-stllib.html;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix
new file mode 100644
index 00000000000..b36a58279fa
--- /dev/null
+++ b/pkgs/development/pure-modules/tk/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, x11 }:
+
+stdenv.mkDerivation rec {
+  baseName = "tk";
+  version = "0.5";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "3b6e97e2d723d5a05bf25f4ac62068ac17a1fd81db03e1986366097bf071a516";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure tcl tk x11 ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "A basic interface between Pure and Tcl/Tk";
+    homepage = http://puredocs.bitbucket.org/pure-tk.html;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/development/pure-modules/xml/default.nix b/pkgs/development/pure-modules/xml/default.nix
new file mode 100644
index 00000000000..ed08cdf5209
--- /dev/null
+++ b/pkgs/development/pure-modules/xml/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, pure, libxml2, libxslt }:
+
+stdenv.mkDerivation rec {
+  baseName = "xml";
+  version = "0.7";
+  name = "pure-${baseName}-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
+    sha256 = "e862dec060917a285bc3befc90f4eb70b6cc33136fb524ad3aa173714a35b0f7";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pure libxml2 libxslt ];
+  makeFlags = "libdir=$(out)/lib prefix=$(out)/";
+  setupHook = ../generic-setup-hook.sh;
+
+  meta = {
+    description = "A simplified interface to the Gnome libxml2 and libxslt libraries for Pure";
+    homepage = http://puredocs.bitbucket.org/pure-xml.html;
+    license = stdenv.lib.licenses.lgpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ asppsa ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 234593906ac..5d01a619aba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4768,7 +4768,9 @@ let
   pure = callPackage ../development/interpreters/pure {
     llvm = llvm_35;
   };
-  pure-gsl = callPackage ../development/pure-modules/pure-gsl { };
+  purePackages = recurseIntoAttrs (import ./pure-packages.nix {
+    inherit callPackage;
+  });
 
   python = python2;
   python2 = python27;
diff --git a/pkgs/top-level/pure-packages.nix b/pkgs/top-level/pure-packages.nix
new file mode 100644
index 00000000000..005e09cc003
--- /dev/null
+++ b/pkgs/top-level/pure-packages.nix
@@ -0,0 +1,33 @@
+{ callPackage }:
+
+rec {
+  audio = callPackage ../development/pure-modules/audio { };
+  avahi = callPackage ../development/pure-modules/avahi { };
+  csv = callPackage ../development/pure-modules/csv { };
+  doc = callPackage ../development/pure-modules/doc { };
+  fastcgi = callPackage ../development/pure-modules/fastcgi { };
+  faust = callPackage ../development/pure-modules/faust { };
+  ffi = callPackage ../development/pure-modules/ffi { };
+  gen = callPackage ../development/pure-modules/gen { };
+  gl = callPackage ../development/pure-modules/gl { };
+  glpk = callPackage ../development/pure-modules/glpk { };
+  gplot = callPackage ../development/pure-modules/gplot { };
+  gsl = callPackage ../development/pure-modules/gsl { };
+  gtk = callPackage ../development/pure-modules/gtk { pure-ffi = ffi; };
+  liblo = callPackage ../development/pure-modules/liblo { };
+  lilv = callPackage ../development/pure-modules/lilv { };
+  lv2 = callPackage ../development/pure-modules/lv2 { };
+  midi = callPackage ../development/pure-modules/midi { };
+  mpfr = callPackage ../development/pure-modules/mpfr { };
+  octave = callPackage ../development/pure-modules/octave { };
+  odbc = callPackage ../development/pure-modules/odbc { };
+  pandoc = callPackage ../development/pure-modules/pandoc { };
+  rational = callPackage ../development/pure-modules/rational { };
+  readline = callPackage ../development/pure-modules/readline { };
+  sockets = callPackage ../development/pure-modules/sockets { };
+  sql3 = callPackage ../development/pure-modules/sql3 { };
+  stldict = callPackage ../development/pure-modules/stldict { };
+  stllib = callPackage ../development/pure-modules/stllib { };
+  tk = callPackage ../development/pure-modules/tk { };
+  xml = callPackage ../development/pure-modules/xml { };
+}

From 3df28a32f536ef3d8fbc877de8bbb0b096b0fb5d Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 26 May 2015 09:45:27 +0200
Subject: [PATCH 0236/2322] debootstrap: update to current stable

makedev 2.3.1-89 -> 2.3.1-93
debootstrap 1.0.66 -> 1.0.67
---
 pkgs/tools/misc/debootstrap/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 3b14e46d0d3..9b6c35f41a4 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -14,8 +14,8 @@ let
     };
     patches = [
       (fetchurl {
-       url = "mirror://debian/pool/main/m/makedev/makedev_2.3.1-89.diff.gz";
-       sha256 = "1zbifw2jkq6471fb67y893nq4lq009xbfbi57jbjwxnhqmrppcy9";
+       url = "mirror://debian/pool/main/m/makedev/makedev_2.3.1-93.diff.gz";
+       sha256 = "08328779mc0b20xkj76ilpf9c8bw6zkz5xiw5l2kwm690dxp9nvw";
        })
     ];
     # TODO install man
@@ -32,13 +32,13 @@ in
 
 stdenv.mkDerivation {
 
-  name = "debootstrap-1.0.66";
+  name = "debootstrap-1.0.67";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
-    url = mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.66.tar.gz;
-    sha256 = "15gh6pvk7f0fib8ggz2zx53pg2jzqk4x0s8ihkpqxqdf4rlns91k";
+    url = mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.67.tar.gz;
+    sha256 = "06x5zw6fskw37qh62hvqx006319l4wgnnw8sf53ms67zpfif04ha";
   };
 
   buildInputs = [ dpkg gettext gawk perl ];

From 114b3b064bb3b86d31ec9c58fa4a0f85b54965f7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 26 May 2015 01:27:18 -0700
Subject: [PATCH 0237/2322] feh: 2.13 -> 2.13.1

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

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 49c7870b212..ac0a2ec0d4c 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -2,11 +2,11 @@
 , libXinerama, curl, libexif }:
 
 stdenv.mkDerivation rec {
-  name = "feh-2.13";
+  name = "feh-2.13.1";
 
   src = fetchurl {
     url = "http://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "06fa9zh1zpi63l90kw3l9a0sfavf424j7ksi396ifg9669gx35gn";
+    sha256 = "1059mflgw8hl398lwy55fj50a98xryvdf23wkpbn4s0z9388hl46";
   };
 
   buildInputs = [ makeWrapper x11 imlib2 libjpeg libpng libXinerama curl libexif ];

From 988ede2c6beeac0f6ce1ef9ffcd2019bb1f6e775 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 26 May 2015 01:28:19 -0700
Subject: [PATCH 0238/2322] linux-testing: 4.1-rc4 -> 4.1-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 895616ad20a..f073a09dd0b 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, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1-rc4";
-  modDirVersion = "4.1.0-rc4";
+  version = "4.1-rc5";
+  modDirVersion = "4.1.0-rc5";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "0l3rmlng7pn4r788km8cgs562cq2is2cgzy3capdnngwmfrfmrr2";
+    sha256 = "0kqw5y5p8x1qyljlzj78vhg5zmj9ngn3m76c9qyji6izclh3y8vv";
   };
 
   features.iwlwifi = true;

From 96178127c52308a219f4952356bb245c2550e00e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 26 May 2015 01:28:50 -0700
Subject: [PATCH 0239/2322] aria2: 1.18.10 -> 1.19.0

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

diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index efd04e33d7f..3167f7ffc22 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "aria2-${version}";
-  version = "1.18.10";
+  version = "1.19.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.bz2";
-    sha256 = "1vvc3pv1100xb4293bmgqpxvy3pdvivnz415b9q78n7190kag3a5";
+    url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.xz";
+    sha256 = "0xm4fmap9gp2pz6z01mnnpmazw6pnhzs8qc58181m5ai4gy5ksp2";
   };
 
   buildInputs = [ pkgconfig c-ares openssl libxml2 sqlite zlib ];

From 308cdd483d2226001423d564839f6837a51a6d8d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 26 May 2015 01:34:50 -0700
Subject: [PATCH 0240/2322] mesa: 10.5.4 -> 10.5.6

---
 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 1e84276ec00..e444264b3a8 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "10.5.4";
+  version = "10.5.6";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
   clang = if llvmPackages ? clang-unwrapped then llvmPackages.clang-unwrapped else llvmPackages.clang;
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "00v89jna7m6r2w1yrnx09isc97r2bd1hkn4jib445n1078zp47mm";
+    sha256 = "15d5icr7q0nq1a7718fsj4s1l29aa4qdxvmkgmjadxz5pm9ph0b6";
   };
 
   prePatch = "patchShebangs .";

From c2a32a689da25ff9f213a80b5f0d23c7ecd6f0c5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 26 May 2015 01:35:28 -0700
Subject: [PATCH 0241/2322] nbd: 3.10 -> 3.11

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

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index b16aa46cc75..d0011c66766 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "nbd-3.10";
+  name = "nbd-3.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/nbd/${name}.tar.xz";
-    sha256 = "1kj772zv6s3rjmvr0gi3yhagzlq2nmv5n5gfhrjphv5bcxx3mibg";
+    sha256 = "187jwc43dhxbv9rrszimm3bvwr1hcpyixv82jfd61p0nrds0yhhl";
   };
 
   buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders;

From 1b821948924b8387fd18b7e6e3602866cf4d2b97 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 26 May 2015 01:35:46 -0700
Subject: [PATCH 0242/2322] dos2unix: 7.2.1 -> 7.2.2

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

diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix
index 83b3d49b253..30b546361f2 100644
--- a/pkgs/tools/text/dos2unix/default.nix
+++ b/pkgs/tools/text/dos2unix/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "dos2unix-7.2.1";
+  name = "dos2unix-7.2.2";
   
   src = fetchurl {
     url = "http://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz";
-    sha256 = "1ws5d66gjs3iqc92d0qxwivixl9092540kxqq2gr6jdzmflqm4jk";
+    sha256 = "04i6kkl6l1vp1b81i0wncixwyab2dzmh7vp1cvma8zr6jrr908ww";
   };
 
   configurePhase = ''

From 386575c0c24866274941d99795c1616dcb777c6e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 26 May 2015 01:36:16 -0700
Subject: [PATCH 0243/2322] llvm: 3.6.0 -> 3.6.1

---
 pkgs/development/compilers/llvm/3.6/clang/default.nix  | 2 +-
 pkgs/development/compilers/llvm/3.6/default.nix        | 6 +++---
 pkgs/development/compilers/llvm/3.6/libc++/default.nix | 2 +-
 pkgs/development/compilers/llvm/3.6/libc++abi.nix      | 2 +-
 pkgs/development/compilers/llvm/3.6/lldb.nix           | 2 +-
 pkgs/development/compilers/llvm/3.6/llvm.nix           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.6/clang/default.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix
index 898ca37558e..ecca67398ec 100644
--- a/pkgs/development/compilers/llvm/3.6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix
@@ -6,7 +6,7 @@ in stdenv.mkDerivation {
   name = "clang-${version}";
 
   unpackPhase = ''
-    unpackFile ${fetch "cfe" "0b8825mvdhfk5r9gwcwp1j2dl9kw5glgyk7pybq2dzhrh4vnj3my"}
+    unpackFile ${fetch "cfe" "1myssbxlyln0nggfz04nfrbzdckljksmaxp82nq7hrmqjc62vybl"}
     mv cfe-${version}.src clang
     sourceRoot=$PWD/clang
     unpackFile ${clang-tools-extra_src}
diff --git a/pkgs/development/compilers/llvm/3.6/default.nix b/pkgs/development/compilers/llvm/3.6/default.nix
index 624fc68c21a..3321e38949f 100644
--- a/pkgs/development/compilers/llvm/3.6/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/default.nix
@@ -2,7 +2,7 @@
 let
   callPackage = newScope (self // { inherit isl version fetch; });
 
-  version = "3.6.0";
+  version = "3.6.1";
 
   fetch = fetch_v version;
   fetch_v = ver: name: sha256: fetchurl {
@@ -10,8 +10,8 @@ let
     inherit sha256;
   };
 
-  compiler-rt_src = fetch "compiler-rt" "04bbn946jninynkrjyp337xqs8ihn4fkz5xgvmywxkddwmwznjbz";
-  clang-tools-extra_src = fetch "clang-tools-extra" "04n83gsmy2ghvn7vp9hamsgn332rx2g7sa4paskr0d4ihax4ka9s";
+  compiler-rt_src = fetch "compiler-rt" "17v4gf4y5krgkrd12r95hfxbw5q4c4jlf3513kqlfq5yfw663gzw";
+  clang-tools-extra_src = fetch "clang-tools-extra" "1dljzdk2jmrwyh8z92rljxl9wzdggp74i9f6g8aajl6mf3c71vpl";
 
   self = {
     llvm = callPackage ./llvm.nix {
diff --git a/pkgs/development/compilers/llvm/3.6/libc++/default.nix b/pkgs/development/compilers/llvm/3.6/libc++/default.nix
index a01d15e186b..5bc122fa5ce 100644
--- a/pkgs/development/compilers/llvm/3.6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/libc++/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
-  src = fetch "libcxx" "1dzvhyrzj54v823biadag5lwxfz37gm8a65aq72pjsh8n211x719";
+  src = fetch "libcxx" "1yf0ns4cvvirp1ml5a8h29lysnw5c23715b09x68v5zkxhxnap2s";
 
   # instead of allowing libc++ to link with /usr/lib/libc++abi.dylib,
   # force it to link with our copy
diff --git a/pkgs/development/compilers/llvm/3.6/libc++abi.nix b/pkgs/development/compilers/llvm/3.6/libc++abi.nix
index ddc9c267edd..6cd08e46e63 100644
--- a/pkgs/development/compilers/llvm/3.6/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.6/libc++abi.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libc++abi-${version}";
 
-  src = fetch "libcxxabi" "1xclv63l7cmrxkl129w6j9fsxgdm8jjlcm8gswl2y9qmh3dwz2zp";
+  src = fetch "libcxxabi" "0pgimy1b5vj4favzdz2830n917fyz65hm3khdgkbgnfs43s8g0xw";
 
   buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind;
 
diff --git a/pkgs/development/compilers/llvm/3.6/lldb.nix b/pkgs/development/compilers/llvm/3.6/lldb.nix
index d4f496a1749..4740c97cb9b 100644
--- a/pkgs/development/compilers/llvm/3.6/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.6/lldb.nix
@@ -15,7 +15,7 @@
 stdenv.mkDerivation {
   name = "lldb-${version}";
 
-  src = fetch "lldb" "1cphxbc8c0yqs2rxn94vcn8his465m97rnynklpzm8sf5kad26ib";
+  src = fetch "lldb" "1fmaz7zcc1f54ns4x8rx9nvhh4pyrhbz103bl02sv1cfwxj5ryyf";
 
   patchPhase = ''
     sed -i 's|/usr/bin/env||' \
diff --git a/pkgs/development/compilers/llvm/3.6/llvm.nix b/pkgs/development/compilers/llvm/3.6/llvm.nix
index 736ffca295f..f23ac614b5c 100644
--- a/pkgs/development/compilers/llvm/3.6/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.6/llvm.nix
@@ -15,7 +15,7 @@
 }:
 
 let
-  src = fetch "llvm" "1kmr5vlnz1419nnvyc7lsrcfx09n65ravjbmzxrqz7ml07jnk6mk";
+  src = fetch "llvm" "0ypwcqrld91jn0zz4mkdksl2mbb0ds9lh5gf0xkbb81sj4awc01g";
 in stdenv.mkDerivation rec {
   name = "llvm-${version}";
 

From 4053dcdacea8e18aa6403a8c8bccbaf3f09edd51 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 26 May 2015 10:56:25 +0200
Subject: [PATCH 0244/2322] mutter: fix failure on i686

---
 .../gnome-3/3.16/core/mutter/default.nix      |  6 ++++--
 .../gnome-3/3.16/core/mutter/x86.patch        | 20 +++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch

diff --git a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix
index 3df5d9f55d9..9b91cd98777 100644
--- a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix
@@ -4,11 +4,11 @@
 
 
 stdenv.mkDerivation rec {
-  name = "mutter-${gnome3.version}.1.1";
+  name = "mutter-${gnome3.version}.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${gnome3.version}/${name}.tar.xz";
-    sha256 = "07059jmwhc7zf2gww2xw94hhy4csjj2v30ivyzllbas2nvv88l3r";
+    sha256 = "0qq7gpkljn1z45sg2sxvmia52krj4ck2541iar89z99s1cppaasa";
   };
 
   # fatal error: gio/gunixfdlist.h: No such file or directory
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
+  patches = [ ./x86.patch ];
+
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     maintainers = [ maintainers.lethalman ];
diff --git a/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch
new file mode 100644
index 00000000000..bc8829de42f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch
@@ -0,0 +1,20 @@
+--- mutter-3.16.2/src/core/window.c.orig	2015-05-26 10:52:41.382834963 +0200
++++ mutter-3.16.2/src/core/window.c	2015-05-26 10:53:03.039948034 +0200
+@@ -3499,7 +3499,7 @@
+ 
+ static MetaMonitorInfo *
+ find_monitor_by_winsys_id (MetaWindow *window,
+-                           guint       winsys_id)
++                           gint       winsys_id)
+ {
+   int i;
+ 
+@@ -3618,7 +3618,7 @@
+    */
+ 
+   gboolean did_placement;
+-  guint old_output_winsys_id;
++  gint old_output_winsys_id;
+   MetaRectangle unconstrained_rect;
+   MetaRectangle constrained_rect;
+   MetaMoveResizeResultFlags result = 0;

From 7b6d9d4cff3854a3ecfb5df727d557d8b3f6358c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 25 May 2015 21:24:57 +0200
Subject: [PATCH 0245/2322] Remove arb and then-orphaned lesstif93

Arb has been broken (and marked as such) since the removal of
GCC 4.2 in July 2014. Nothing and no-one uses it. Time to go.
---
 .../science/biology/arb/default.nix           | 86 -------------------
 .../science/biology/arb/makefile.patch        | 12 ---
 .../lesstif-0.93/c-bad_integer_cast.patch     | 13 ---
 .../lesstif-0.93/c-render_table_crash.patch   | 11 ---
 .../c-xim_chained_list_crash.patch            | 24 ------
 .../libraries/lesstif-0.93/default.nix        | 26 ------
 .../libraries/lesstif-0.93/stdint.patch       | 11 ---
 pkgs/top-level/all-packages.nix               |  6 --
 8 files changed, 189 deletions(-)
 delete mode 100644 pkgs/applications/science/biology/arb/default.nix
 delete mode 100644 pkgs/applications/science/biology/arb/makefile.patch
 delete mode 100644 pkgs/development/libraries/lesstif-0.93/c-bad_integer_cast.patch
 delete mode 100644 pkgs/development/libraries/lesstif-0.93/c-render_table_crash.patch
 delete mode 100644 pkgs/development/libraries/lesstif-0.93/c-xim_chained_list_crash.patch
 delete mode 100644 pkgs/development/libraries/lesstif-0.93/default.nix
 delete mode 100644 pkgs/development/libraries/lesstif-0.93/stdint.patch

diff --git a/pkgs/applications/science/biology/arb/default.nix b/pkgs/applications/science/biology/arb/default.nix
deleted file mode 100644
index 2f622e94057..00000000000
--- a/pkgs/applications/science/biology/arb/default.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{ stdenv, fetchurl, glew, mesa, libpng, lesstif, lynx, freeglut
-, libtiff, rxp, sablotron, perl, jdk, transfig, gv, gnuplot, xorg }:
-
-# NOTE: This package does not build on 64-bit systems. Because of some faulty
-# int->pointer arithmatic. The build scripts are abnormal - but it appears to
-# work.
-
-stdenv.mkDerivation {
-  name = "arb-2007-Dec-07";
-  
-  src = fetchurl {
-    url = http://download.arb-home.de/release/2007_12_07/arbsrc.tgz;
-    sha256 = "04l7qj0wigg1h56a9d70hxhdr343v3dg5dhqrc7fahc1v4h8f1rd";
-  };
-
-  patches = [ ./makefile.patch ];
-
-  buildInputs =
-    [ glew mesa libpng xorg.libXpm lesstif lynx freeglut libtiff rxp
-      sablotron xorg.libXaw perl jdk transfig xorg.libX11 xorg.libXext
-      xorg.libXt gv gnuplot
-    ];
-
-  unpackPhase = ''
-    tar xzf $src
-  '';
-
-  buildPhase = ''
-    echo `make`   # avoids error signal
-    export ARBHOME=`pwd`
-    export PATH=$ARBHOME/bin:$PATH
-    make all
-  '';
-
-  installPhase = ''
-    mkdir -p $out/lib
-    shareddir=/nix/var/lib/arb
-    # link out writable shared location lib/pts
-    mkdir -p $shareddir/lib/pts
-    cp -vau lib/pts $shareddir/lib
-    rm -vrf lib/pts
-    ln -vs $shareddir/lib/pts $out/lib/pts
-    chmod a+rwx $shareddir/lib/pts
-    # link out writable shared location lib/nas/
-    mkdir -p $shareddir/lib/nas
-    cp -vau lib/nas $shareddir/lib
-    rm -vrf lib/nas
-    ln -vs $shareddir/lib/nas $out/lib/nas
-    chmod a+rwx $shareddir/lib/nas
-    # link out shared lib/pixmaps (not sure about this, yet):
-    mkdir -p $shareddir/lib/pixmaps
-    cp -vau lib/pixmaps $shareddir/lib
-    rm -vrf lib/pixmaps
-    ln -vs $shareddir/lib/pixmaps $out/lib/pixmaps
-    chmod a+rwx $shareddir/lib/pixmaps
-    # bulk copy
-    cp -vau * $out
-    
-    # replace arb script
-    mv $out/bin/arb $out/bin/arb.orig
-    cat > $out/bin/arb << ARB 
-    #!/bin/sh
-
-    echo Starting Nix compiled arb from $out
-    echo Shared databases are located in $shareddir
-    # sometimes local profiles override these:
-    export ARBHOME=$out
-    export LD_LIBRARY=$ARBHOME/lib   
-
-    $out/bin/arb_ntree $*
-
-    ARB
-    
-    chmod +x $out/bin/arb
-  '';
-
-  meta = {
-    description     = "Software for sequence database handling and analysis";
-    longDescription = ''The ARB software is a graphically oriented package comprising various tools for sequence database handling and data analysis. A central database of processed (aligned) sequences and any type of additional data linked to the respective sequence entries is structured according to phylogeny or other user defined criteria. Note that this package includes its own older versions of clustal etc.''; 
-    license     = "non-free";
-    pkgMaintainer = "http://BioLib.open-bio.org/";
-    homepage    = http://www.arb-home.de/;
-    priority    = "10";   # because it includes binaries of clustal etc.
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/science/biology/arb/makefile.patch b/pkgs/applications/science/biology/arb/makefile.patch
deleted file mode 100644
index 8e7962511af..00000000000
--- a/pkgs/applications/science/biology/arb/makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r a1e04cdafd13 Makefile
---- a/Makefile	Thu Sep 25 11:59:19 2008 +0200
-+++ b/Makefile	Thu Sep 25 11:59:27 2008 +0200
-@@ -109,7 +109,7 @@ endif
- 
- ALLOWED_GCC_295_VERSIONS=2.95.3
- ALLOWED_GCC_3xx_VERSIONS=3.2 3.3.1 3.3.3 3.3.4 3.3.5 3.3.6 3.4.0 3.4.2 3.4.3
--ALLOWED_GCC_4xx_VERSIONS=4.0.0 4.0.2 4.0.3 4.1.1 4.1.2 4.1.3 4.2.0 4.2.1 4.2.3
-+ALLOWED_GCC_4xx_VERSIONS=4.0.0 4.0.2 4.0.3 4.1.1 4.1.2 4.1.3 4.2.0 4.2.1 4.2.3 4.2.4
- ALLOWED_GCC_VERSIONS=$(ALLOWED_GCC_295_VERSIONS) $(ALLOWED_GCC_3xx_VERSIONS) $(ALLOWED_GCC_4xx_VERSIONS)
- 
- GCC_VERSION_FOUND=$(shell $(GCC) -dumpversion)
diff --git a/pkgs/development/libraries/lesstif-0.93/c-bad_integer_cast.patch b/pkgs/development/libraries/lesstif-0.93/c-bad_integer_cast.patch
deleted file mode 100644
index 620d702f0f0..00000000000
--- a/pkgs/development/libraries/lesstif-0.93/c-bad_integer_cast.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- lesstif2-0.94.4.orig/include/Motif-2.1/XmI/XpmI.h
-+++ lesstif2-0.94.4/include/Motif-2.1/XmI/XpmI.h
-@@ -217,8 +217,8 @@
- FUNC(xpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s));
- FUNC(xpmHashIntern, int, (xpmHashTable *table, char *tag, void *data));
- 
--#define HashAtomData(i) ((void *)i)
--#define HashColorIndex(slot) ((unsigned int)((*slot)->data))
-+#define HashAtomData(i) ((void *)(uintptr_t)i)
-+#define HashColorIndex(slot) ((uintptr_t)((*slot)->data))
- #define USE_HASHTABLE (cpp > 2 && ncolors > 4)
- 
- /* I/O utility */
diff --git a/pkgs/development/libraries/lesstif-0.93/c-render_table_crash.patch b/pkgs/development/libraries/lesstif-0.93/c-render_table_crash.patch
deleted file mode 100644
index 1699dbe1908..00000000000
--- a/pkgs/development/libraries/lesstif-0.93/c-render_table_crash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lesstif2-0.95.0.orig/lib/Xm-2.1/RenderTable.c
-+++ lesstif2-0.95.0/lib/Xm-2.1/RenderTable.c
-@@ -465,7 +465,7 @@
- 	DEBUGOUT(_LtDebug(__FILE__, w, "_XmRenderTableFinaliseTag(%s)\n", tag));
- #if 1
- 	/* Experimental start */
--	if (r->dpy == 0)
-+	if (r->dpy == 0  &&  w)
- 		r->dpy = XtDisplay(w);
- 	/* Experimental end */
- #endif
diff --git a/pkgs/development/libraries/lesstif-0.93/c-xim_chained_list_crash.patch b/pkgs/development/libraries/lesstif-0.93/c-xim_chained_list_crash.patch
deleted file mode 100644
index 10bdf8d0b97..00000000000
--- a/pkgs/development/libraries/lesstif-0.93/c-xim_chained_list_crash.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru lesstif2-0.94.4-old/lib/Xm-2.1/XmIm.c lesstif2-0.94.4/lib/Xm-2.1/XmIm.c
---- lesstif2-0.94.4-old/lib/Xm-2.1/XmIm.c	2004-10-20 21:32:11.000000000 +0200
-+++ lesstif2-0.94.4/lib/Xm-2.1/XmIm.c	2007-03-28 14:39:27.000000000 +0200
-@@ -133,7 +133,10 @@
- 		p->next = q->next;
- 	}
- 
--	XtFree((char *)stuff);
-+	/* if count!=0 then someone uses the stuff as orig_xim
-+	   so unlink it but not free it */
-+	if (!stuff->count)
-+		XtFree((char *)stuff);
- }
- 
- /*
-@@ -1060,6 +1063,8 @@
- 		   XCloseIM(stuff->xim);
- 		DEBUGOUT(_LtDebug(__FILE__, w, "XCloseIM(%p)\n", stuff->xim));
- 		stuff->orig_xim->xim = NULL;
-+		/* stuff->orig_xim is now useless */
-+		XtFree(stuff->orig_xim);
- 	} else {
- 		DEBUGOUT(_LtDebug(__FILE__, w, "XmImCloseXIM(%p), count -> %d\n",
- 			stuff->xim, stuff->orig_xim->count));
diff --git a/pkgs/development/libraries/lesstif-0.93/default.nix b/pkgs/development/libraries/lesstif-0.93/default.nix
deleted file mode 100644
index e8ec3d5e659..00000000000
--- a/pkgs/development/libraries/lesstif-0.93/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, x11, libXp, libXau }:
-
-stdenv.mkDerivation {
-  name = "lesstif-0.93.94";
-  
-  src = fetchurl {
-    url = http://prdownloads.sourceforge.net/lesstif/lesstif-0.93.94.tar.bz2;
-    sha256 = "0v4l46ill6dhhswsw1hk6rqyng98d85nsr214vhd2k0mfajpig1y";
-  };
-  
-  buildInputs = [x11];
-  
-  propagatedBuildInputs = [libXp libXau];
-
-  # This is an older release of lesstif which works with arb.
-  patches =
-    [ ./c-bad_integer_cast.patch    
-      ./c-xim_chained_list_crash.patch
-      ./c-render_table_crash.patch 
-      ./stdint.patch
-    ];
-    
-  meta = {
-    priority = "5";
-  };
-}
diff --git a/pkgs/development/libraries/lesstif-0.93/stdint.patch b/pkgs/development/libraries/lesstif-0.93/stdint.patch
deleted file mode 100644
index 8b202704abd..00000000000
--- a/pkgs/development/libraries/lesstif-0.93/stdint.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r 97ac365bfcd6 lesstif-0.93.94/lib/Xm-2.1/Xpm.c
---- lesstif-0.93.94/lib/Xm-2.1/Xpm.c	Mon Oct 06 15:52:50 2008 +0200
-+++ lesstif-0.93.94/lib/Xm-2.1/Xpm.c	Mon Oct 06 15:53:16 2008 +0200
-@@ -54,6 +54,7 @@
- #include <io.h>
- #endif
- 
-+#include <stdint.h>
- #include <X11/Intrinsic.h> /* Avoid re-definition of Pixel-type */
- 
- #include <Xm/XpmP.h>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9dc30d9f0a..46f73556894 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6410,8 +6410,6 @@ let
 
   lesstif = callPackage ../development/libraries/lesstif { };
 
-  lesstif93 = callPackage ../development/libraries/lesstif-0.93 { };
-
   leveldb = callPackage ../development/libraries/leveldb { };
 
   levmar = callPackage ../development/libraries/levmar { };
@@ -13699,10 +13697,6 @@ let
     motif = lesstif;
   };
 
-  arb = callPackage ../applications/science/biology/arb {
-    lesstif = lesstif93;
-  };
-
   archimedes = callPackage ../applications/science/electronics/archimedes { };
 
   emboss = callPackage ../applications/science/biology/emboss { };

From 02e693e1b93427aa4208efc86d5f50f75de9d0ed Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 25 May 2015 21:56:39 +0200
Subject: [PATCH 0246/2322] Remove w3c-css-validator

Depends on missing tarballs. Broken since 2013.
---
 pkgs/tools/misc/w3c-css-validator/default.nix | 77 -------------------
 pkgs/top-level/all-packages.nix               |  4 -
 2 files changed, 81 deletions(-)
 delete mode 100644 pkgs/tools/misc/w3c-css-validator/default.nix

diff --git a/pkgs/tools/misc/w3c-css-validator/default.nix b/pkgs/tools/misc/w3c-css-validator/default.nix
deleted file mode 100644
index 3c7aa5261a2..00000000000
--- a/pkgs/tools/misc/w3c-css-validator/default.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ stdenv, fetchurl, sourceFromHead, apacheAnt, tomcat, jre }:
-
-let
-
-  sources =
-    [ (fetchurl {
-        name = "jigsaw_2.2.6.tar.gz";
-        url="http://jigsaw.w3.org/Distrib/jigsaw_2.2.6.tar.gz";
-        sha256 = "01cjpqjcs8gbvvzy0f488cb552f9b38hvwr97wydglrzndmcwypd";
-      })
-      (fetchurl {
-        name = "commons-collectionurl3.2.1-bin.tar.gz";
-        url="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.1-bin.tar.gz";
-        sha256 = "7843f8307495b2be446353b10c25218793b776fa3e22615a1f50f067d81713ce";
-      })
-      (fetchurl {
-        name = "commons-lang-2.4-bin.tar.gz";
-        url="http://www.apache.org/dist/commons/lang/binaries/commons-lang-2.4-bin.tar.gz";
-        sha256 = "0phwlgnvwj3n3j1aka2pkm0biacvgs72qc0ldir6s69i9qbv7rh0";
-      })
-      (fetchurl {
-        name = "velocity-1.6.1.tar.gz";
-        url="http://www.apache.org/dist/velocity/engine/1.6.1/velocity-1.6.1.tar.gz";
-        sha256 = "125s8yp8whx947kahm902wc49ms44knxdj6yfskhpk0a8h0rz9jm";
-      })
-      (fetchurl {
-        name = "Xerces-J-bin.2.9.1.tar.gz";
-        url="http://www.apache.org/dist/xerces/j/Xerces-J-bin.2.9.1.tar.gz";
-        sha256 = "1xlrrznfgdars0a9m9z5k9q8arbqskdfdfjx4s0pp52wn3r0gbns";
-      })
-    ];
-
-in
-
-stdenv.mkDerivation {
-  name = "w3c-css-validator";
-
-  # REGION AUTO UPDATE:       { name="w3c-css-validator"; type="cvs"; cvsRoot=":pserver:anonymous:anonymous@dev.w3.org:/sources/public"; module="2002/css-validator"; }
-  src = sourceFromHead "w3c-css-validator-F_17-52-37.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/w3c-css-validator-F_17-52-37.tar.gz"; sha256 = "b6f05d4812eaa464906d101242689effa8b5516d32d6420315740a77d8ee11fd"; });
-  # END
-
-  buildInputs = [ apacheAnt ];
-
-  # prepare target downloads dependency .tar.gz into tmp
-  # note: There is a .war as well which could be deployed to tomcat
-  installPhase = ''
-    cd css-validator
-    mkdir tmp
-    ${ stdenv.lib.concatStringsSep "\n" (map (src: "tar xfz ${src} -C tmp") sources) }
-    sed -i -e 's@<property name="servlet.lib" value=".*"/>@<property name="servlet.lib" value="${tomcat}/lib/servlet-api.jar"/>@' \
-          -e '/dest="tmp\//d' \
-          -e '/untar/d' \
-          build.xml
-    ant
-    mkdir -p $out/{bin,lib}
-    JAR=$out/lib/css-validator.jar
-    cat >> $out/bin/css-validator << EOF
-    #!/bin/sh
-    exec ${jre}/bin/java -jar $JAR "\$@"
-    EOF
-    chmod +x $out/bin/css-validator
-    cp css-validator.jar $out/lib
-    cp -r lib $out/lib/lib
-  '';
-
-  meta = {
-    description = "W3C CSS validator";
-    homepage = http://dev.w3.org/cvsweb/2002/css-validator/;
-    # dependencies ship their own license files
-    # I think all .java files are covered by this license (?)
-    license = stdenv.lib.licenses.w3c;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46f73556894..42e6a4599a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3228,10 +3228,6 @@ let
 
   wavemon = callPackage ../tools/networking/wavemon { };
 
-  w3cCSSValidator = callPackage ../tools/misc/w3c-css-validator {
-    tomcat = tomcat6;
-  };
-
   wdfs = callPackage ../tools/filesystems/wdfs { };
 
   wdiff = callPackage ../tools/text/wdiff { };

From 3a61b7fca31bc24f19f52edc370690b12254969c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 25 May 2015 10:15:48 +0200
Subject: [PATCH 0247/2322] python-packages: clean up meta attribute

- Typos: meta.maintainer -> meta.maintainers, licences -> license, ...
- Remove unnecessary stdenv.lib (already in scope for entire file)
- [ maintainers.foo maintainers.bar ] -> with maintainers; [ foo bar ]
  Doing so even for single-maintainer packages makes it slightly
  more inviting to add others, which can only be a good thing.
---
 pkgs/top-level/python-packages.nix | 1323 +++++++++++++---------------
 1 file changed, 630 insertions(+), 693 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 76d6d9aefb7..e1658c58f81 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -96,12 +96,12 @@ let
   discid = buildPythonPackage rec {
     name = "discid-1.1.0";
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Python binding of libdiscid";
       homepage    = "https://python-discid.readthedocs.org/";
       license     = licenses.lgpl3Plus;
       platforms   = platforms.linux;
-      maintainer  = with maintainers; [ iyzsong ];
+      maintainers = with maintainers; [ iyzsong ];
     };
 
     src = pkgs.fetchurl {
@@ -209,12 +209,12 @@ let
       sed -i "s|/usr/share/fonts|/nonexisting-fonts-path|" aafigure/PILhelper.py
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "ASCII art to image converter";
       homepage = https://launchpad.net/aafigure/;
       license = licenses.bsd2;
       platforms = platforms.linux;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -235,12 +235,12 @@ let
     #   UnicodeEncodeError: 'ascii' codec can't encode character u'\u3042' in position 0: ordinal not in range(128)
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Generate activity-diagram image from spec-text file (similar to Graphviz)";
       homepage = http://blockdiag.com/;
       license = licenses.asl20;
       platforms = platforms.linux;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -276,7 +276,7 @@ let
     meta = {
       homepage = https://github.com/teythoon/afew;
       description = "An initial tagging script for notmuch mail";
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   };
 
@@ -292,7 +292,7 @@ let
     meta = {
       homepage = https://github.com/bitprophet/alabaster;
       description = "a Sphinx theme";
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -311,7 +311,7 @@ let
     meta = {
       homepage = http://bitbucket.org/zzzeek/alembic;
       description = "A database migration tool for SQLAlchemy";
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -362,8 +362,8 @@ let
     '';
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -398,7 +398,7 @@ let
     meta = {
       homepage = https://github.com/pazz/alot;
       description = "Terminal MUA using notmuch mail";
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   };
 
@@ -472,7 +472,7 @@ let
     meta = {
       description = "namespace control and lazy-import mechanism";
       homepage = "http://bitbucket.org/hpk42/apipkg";
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -484,7 +484,7 @@ let
       md5 = "1d17b4c9694ab84794e228f28dc3275b";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A python module for determining appropriate platform-specific dirs";
       homepage = http://github.com/ActiveState/appdirs;
       license = licenses.mit;
@@ -570,14 +570,14 @@ let
     meta = {
       description = "Twitter API library";
       license     = "apache";
-      maintainers = [ maintainers.thoughtpolice ];
+      maintainers = with maintainers; [ thoughtpolice ];
     };
   };
 
   async = buildPythonPackage rec {
     name = "async-0.6.1";
     disabled = isPy3k;
-    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+    meta.maintainers = with maintainers; [ mornfall ];
 
     buildInputs = with self; [ pkgs.zlib ];
     doCheck = false;
@@ -619,7 +619,7 @@ let
     meta = {
       homepage = http://code.google.com/p/argparse/;
 
-      license = stdenv.lib.licenses.asl20;
+      license = licenses.asl20;
 
       description = "argparse: Python command line parser";
 
@@ -656,7 +656,7 @@ let
     meta = {
       description = "A dict with attribute-style access";
       homepage = https://github.com/bcj/AttrDict;
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   });
 
@@ -671,7 +671,7 @@ let
     meta = {
       description = "Cross-platform audio decoding";
       homepage = "https://github.com/sampsyo/audioread";
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -688,7 +688,7 @@ let
     meta = {
       description = "Utilities and Python modules for handling audio";
       homepage = "http://audiotools.sourceforge.net/";
-      license = stdenv.lib.licenses.gpl2Plus;
+      license = licenses.gpl2Plus;
     };
   };
 
@@ -706,12 +706,12 @@ let
     # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests)
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A tool that automatically formats Python code to conform to the PEP 8 style guide";
       homepage = https://pypi.python.org/pypi/autopep8/;
       license = licenses.mit;
       platforms = platforms.all;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   });
 
@@ -725,7 +725,7 @@ let
       md5 = "7f4893205e5ad69ac86f6b44efb7df72";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A serialization and RPC framework";
       homepage = "https://pypi.python.org/pypi/avro/";
     };
@@ -743,7 +743,7 @@ let
 
     doCheck = false;        # No such file or directory: './run_tests.py
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A serialization and RPC framework";
       homepage = "https://pypi.python.org/pypi/avro3k/";
     };
@@ -761,11 +761,11 @@ let
 
     propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Microsoft Azure SDK for Python";
       homepage = "http://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
-      maintainers = [ maintainers.olcai ];
+      maintainers = with maintainers; [ olcai ];
     };
   };
 
@@ -797,7 +797,7 @@ let
     meta = {
       describe = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files";
       homepage = https://github.com/peterjc/backports.lzma;
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -814,7 +814,7 @@ let
     meta = {
       homepage = http://pypi.python.org/pypi/babelfish;
       description = "A module to work with countries and languages";
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -827,12 +827,12 @@ let
       sha256 = "1kmrdr1c2ivpqgp2csln7vbanga3sh3nvaqmgbsg96z6fbg7f7w8";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://github.com/nicolargo/batinfo;
       description = "A simple Python lib to retrieve battery information";
       license = licenses.lgpl3;
       platforms = platforms.all;
-      maintainers = [ maintainers.koral ];
+      maintainers = with maintainers; [ koral ];
     };
   };
 
@@ -848,7 +848,7 @@ let
 
     meta = {
       homepage = https://github.com/botocore/bcdoc;
-      license = stdenv.lib.licenses.asl20;
+      license = licenses.asl20;
       description = "ReST document generation tools for botocore";
     };
   };
@@ -886,8 +886,8 @@ let
     meta = {
       homepage = http://crummy.com/software/BeautifulSoup/bs4/;
       description = "HTML and XML parser";
-      license = stdenv.lib.licenses.mit;
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      license = licenses.mit;
+      maintainers = with maintainers; [ iElectric ];
     };
   });
 
@@ -914,11 +914,8 @@ let
     doCheck = false;
 
     meta = {
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -969,11 +966,11 @@ let
         are incremental and low-impact.
       '';
       homepage = https://github.com/g2p/bedup;
-      license = stdenv.lib.licenses.gpl2;
+      license = licenses.gpl2;
 
-      platforms = stdenv.lib.platforms.linux;
+      platforms = platforms.linux;
 
-      maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
+      maintainers = with maintainers; [ bluescreen303 ];
     };
   };
 
@@ -1015,7 +1012,7 @@ let
     };
     doCheck = false;
     buildInputs = with pkgs; [ liblapack blas ];
-    meta = with stdenv.lib; {
+    meta = {
       homepage = "http://cvxopt.org/";
       description = "Python Software for Convex Optimization";
       maintainers = with maintainers; [ edwtjo ];
@@ -1053,7 +1050,7 @@ let
       md5 = "f49ca7766fe4a67e03a731e575614f87";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Platform-independent module for I/O completion events";
       homepage = https://launchpad.net/python-iowait;
     };
@@ -1081,7 +1078,7 @@ let
       md5 = "50ce3f3fdb9196a00059a5ea7b3739fd";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "rarfile - RAR archive reader for Python";
       homepage = https://github.com/markokr/rarfile;
     };
@@ -1098,7 +1095,7 @@ let
     propagatedBuildInputs = with pythonPackages; [ nose ];
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A Python test framework that extends Python's built-in unittest module and Nose with features from TestNG";
       homepage = https://github.com/rackspace/python-proboscis;
       license = licenses.asl20;
@@ -1113,7 +1110,7 @@ let
       md5 = "5586fe8ece7af4e24f71ea740185127e";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web";
       homepage = https://github.com/echonest/pyechonest;
     };
@@ -1173,10 +1170,10 @@ let
 
     pythonPath = [ self.requests ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Bitbucket command line interface";
       homepage = "https://bitbucket.org/zhemao/bitbucket-cli";
-      maintainers = [ maintainers.refnil ];
+      maintainers = with maintainers; [ refnil ];
     };
   };
 
@@ -1192,12 +1189,12 @@ let
     # error: invalid command 'test'
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Module for binary data manipulation";
       homepage = https://code.google.com/p/python-bitstring/;
       license = licenses.mit;
       platforms = platforms.linux;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -1212,7 +1209,7 @@ let
 
     propagatedBuildInputs = with self; [ six html5lib ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "An easy, HTML5, whitelisting HTML sanitizer";
       longDescription = ''
         Bleach is an HTML sanitizing library that escapes or strips markup and
@@ -1242,7 +1239,7 @@ let
       md5 = "66e9688f2d287593a0e698cd8a5fbc57";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = http://pythonhosted.org/blinker/;
       description = "Fast, simple object-to-object and broadcast signaling";
       license = licenses.mit;
@@ -1267,12 +1264,12 @@ let
     #   FAIL: test_auto_font_detection (blockdiag.tests.test_boot_params.TestBootParams)
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Generate block-diagram image from spec-text file (similar to Graphviz)";
       homepage = http://blockdiag.com/;
       license = licenses.asl20;
       platforms = platforms.linux;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -1290,9 +1287,7 @@ let
      meta = {
        description = "UNKNOWN";
        homepage = "UNKNOWN";
-       maintainers = [
-         stdenv.lib.maintainers.iElectric
-       ];
+       maintainers = with maintainers; [ iElectric ];
      };
    };
 
@@ -1366,12 +1361,12 @@ let
 
     propagatedBuildInputs = with self; [ setuptools ];
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = http://bottlepy.org;
       description = "A fast and simple micro-framework for small web-applications";
       license = licenses.mit;
       platforms = platforms.all;
-      maintainers = [ maintainers.koral ];
+      maintainers = with maintainers; [ koral ];
     };
   };
 
@@ -1389,7 +1384,7 @@ let
 
     propagatedBuildInputs = [ pkgs.swig pkgs.box2d ];
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://code.google.com/p/pybox2d/;
       description = ''
         A 2D game physics library for Python under
@@ -1397,7 +1392,7 @@ let
       '';
       license = licenses.zlib;
       platforms = platforms.all;
-      maintainers = [ maintainers.sepi ];
+      maintainers = with maintainers; [ sepi ];
     };
   };
 
@@ -1420,12 +1415,12 @@ let
     # for the moment jira>=0.22 and megaplan>=1.4 are missing for running the test suite.
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage =  http://github.com/ralphbean/bugwarrior;
       description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior";
       license = licenses.gpl3Plus;
       platforms = platforms.all;
-      maintainers = [ maintainers.pierron ];
+      maintainers = with maintainers; [ pierron ];
     };
   };
 
@@ -1467,12 +1462,12 @@ let
       export HOME=$(pwd)/check-phase
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://fedorahosted.org/python-bugzilla/;
       description = "Bugzilla XMLRPC access module";
       license = licenses.gpl2;
       platforms = platforms.all;
-      maintainers = [ maintainers.pierron ];
+      maintainers = with maintainers; [ pierron ];
     };
   };
 
@@ -1497,7 +1492,7 @@ let
       homepage = "http://www.buildout.org";
       description = "A software build and configuration system";
       license = licenses.zpt21;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   };
 
@@ -1515,7 +1510,7 @@ let
       homepage = "http://www.buildout.org";
       description = "A software build and configuration system";
       license = licenses.zpt21;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   };
 
@@ -1539,7 +1534,7 @@ let
       homepage = "http://www.buildout.org";
       description = "A software build and configuration system";
       license = licenses.zpt21;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   };
 
@@ -1568,7 +1563,7 @@ let
 
   bunch = buildPythonPackage (rec {
     name = "bunch-1.0.1";
-    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+    meta.maintainers = with maintainers; [ mornfall ];
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/bunch/${name}.tar.gz";
@@ -1655,11 +1650,11 @@ let
       sha256 = "0s8vxzfz6s4m6fvxc7z25k9j35w0rh6jkw3wwcd1az1mssncn6qy";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = http://certifi.io/;
       description = "Python package for providing Mozilla's CA Bundle";
       license = licenses.isc;
-      maintainers = [ maintainers.koral ];
+      maintainers = with maintainers; [ koral ];
     };
   };
 
@@ -1727,7 +1722,7 @@ let
       sha256 = "a01fabb7593728c3d851e1cd9a3efbd18f72650a31a5aa8a74018640da3de8b3";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A very fast JSON encoder/decoder for Python";
       homepage    = "http://ag-projects.com/";
       license     = licenses.lgpl2;
@@ -1748,11 +1743,11 @@ let
     # No local packages or download links found for requests
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://github.com/ncrocfer/clf;
       description = "Command line tool to search snippets on Commandlinefu.com";
       license = licenses.mit;
-      maintainers = [ maintainers.koral ];
+      maintainers = with maintainers; [ koral ];
     };
   };
 
@@ -1764,7 +1759,7 @@ let
       sha256 = "1rfn8ml80rw3hkgpm1an5p3vdyhh7hzx4zynr8dhfl7bsw28r77p";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = http://click.pocoo.org/;
       description = "Create beautiful command line interfaces in Python";
       longDescription = ''
@@ -1824,7 +1819,7 @@ let
     # there are no tests
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A code generator for executing Python snippets in source files";
       homepage    = http://nedbatchelder.com/code/cog;
       license     = licenses.mit;
@@ -1893,11 +1888,8 @@ let
     propagatedBuildInputs = with self; [ self.translationstring self.iso8601 ];
 
     meta = {
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -1917,7 +1909,7 @@ let
 
     meta = {
       maintainers = [ ];
-      platforms = stdenv.lib.platforms.all;
+      platforms = platforms.all;
     };
   };
 
@@ -1961,7 +1953,7 @@ let
       description = "Config file reading, writing and validation";
       homepage = http://pypi.python.org/pypi/configobj;
       license = licenses.bsd3;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   });
 
@@ -1984,7 +1976,7 @@ let
     meta = {
       description = "A Python library for building configuration shells";
       homepage = "https://github.com/agrover/configshell-fb";
-      platforms = stdenv.lib.platforms.linux;
+      platforms = platforms.linux;
     };
   };
 
@@ -1999,12 +1991,12 @@ let
 
     propagatedBuildInputs = with self; [ six ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Powerful declarative parser (and builder) for binary data";
       homepage = http://construct.readthedocs.org/;
       license = licenses.mit;
       platforms = platforms.linux;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -2054,7 +2046,7 @@ let
     meta = {
       description = "Python module for generating objects that compute the Cyclic Redundancy Check (CRC)";
       homepage = http://crcmod.sourceforge.net/;
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -2072,7 +2064,7 @@ let
 
     meta = {
       description = "An interpreter to help writing C extensions for Python 2";
-      platforms = stdenv.lib.platforms.all;
+      platforms = platforms.all;
     };
   };
 
@@ -2091,7 +2083,7 @@ let
     doCheck = false;
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -2125,7 +2117,7 @@ let
       sha256 = "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://github.com/alex/pretend;
       license = licenses.bsd3;
     };
@@ -2142,7 +2134,7 @@ let
       md5 = "b52588ec61cd4c2d33e419677a5eac8c";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "What is detox?";
       homepage = http://bitbucket.org/hpk42/detox;
     };
@@ -2161,7 +2153,7 @@ let
     doCheck = false;
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -2176,7 +2168,7 @@ let
     buildInputs = with self; [ pycparser mock pytest py ] ++ optionals (!isPyPy) [ cffi ];
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -2191,7 +2183,7 @@ let
     propagatedBuildInputs = with self; [ pkgs.libffi pycparser ];
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -2210,12 +2202,12 @@ let
     # (upstream packaging issue)
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Python library for reading and writing collada documents";
       homepage = http://pycollada.github.io/;
       license = "BSD"; # they don't specify which BSD variant
       platforms = with platforms; linux ++ darwin;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -2231,7 +2223,7 @@ let
     doCheck = false;
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -2254,7 +2246,7 @@ let
         pkgs.config.pythonPackages.pytest.selenium or false
         self.selenium;
 
-    meta = with stdenv.lib; {
+    meta = {
       maintainers = with maintainers; [ iElectric lovek323 madjar ];
       platforms = platforms.unix;
     };
@@ -2270,7 +2262,7 @@ let
     propagatedBuildInputs = with self ; [ pytest execnet ];
 
     meta = {
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
       website = "https://pypi.python.org/pypi/pytest-cache/";
       description = "pytest plugin with mechanisms for caching across test runs";
     };
@@ -2286,7 +2278,7 @@ let
     propagatedBuildInputs = with self ; [ pytest pyflakes pytestcache ];
 
     meta = {
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
       website = "https://pypi.python.org/pypi/pytest-flakes";
       description = "pytest plugin to check source code with pyflakes";
     };
@@ -2302,7 +2294,7 @@ let
     propagatedBuildInputs = with self ; [ pytest pytestcache pep8 ];
 
     meta = {
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
       website = "https://pypi.python.org/pypi/pytest-pep8";
       description = "pytest plugin to check PEP8 requirements";
     };
@@ -2319,7 +2311,7 @@ let
     propagatedBuildInputs = with self ; [ pytest pytestflakes pytestpep8 tox ];
 
     meta = {
-      license = stdenv.lib.licenses.asl20;
+      license = licenses.asl20;
       website = "https://pypi.python.org/pypi/pytest-quickcheck";
       description = "pytest plugin to generate random data inspired by QuickCheck";
     };
@@ -2340,7 +2332,7 @@ let
 
       homepage = https://github.com/schlamar/pytest-cov;
 
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   });
 
@@ -2389,7 +2381,7 @@ let
 
       homepage = http://code.google.com/p/cssutils/;
 
-      license = stdenv.lib.licenses.lgpl3Plus;
+      license = licenses.lgpl3Plus;
     };
   });
 
@@ -2538,11 +2530,8 @@ let
       ];
 
     meta = {
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -2568,11 +2557,8 @@ let
       ];
 
     meta = {
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -2588,8 +2574,8 @@ let
     propagatedBuildInputs = with self; [ deform ];
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -2612,9 +2598,9 @@ let
     meta = {
       description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
       homepage = http://deron.meranda.us/python/demjson/;
-      license = stdenv.lib.licenses.lgpl3Plus;
-      maintainers = with stdenv.lib.maintainers; [ bjornfor ];
-      platforms = stdenv.lib.platforms.all;
+      license = licenses.lgpl3Plus;
+      maintainers = with maintainers; [ bjornfor ];
+      platforms = platforms.all;
     };
   };
 
@@ -2833,12 +2819,12 @@ let
     # error: invalid command 'test'
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols";
       homepage = https://code.google.com/p/dpkt/;
       license = licenses.bsd3;
-      maintainers = [ maintainers.bjornfor ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ bjornfor ];
+      platforms = platforms.all;
     };
   };
 
@@ -2860,7 +2846,7 @@ let
 
     buildInputs = with self; [ coverage tornado mock nose ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs";
       homepage = https://www.dropbox.com/developers/core/docs;
       license = licenses.mit;
@@ -2879,7 +2865,7 @@ let
 
     propagatedBuildInputs = with self; [ urllib3 mock setuptools ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs";
       homepage = https://www.dropbox.com/developers/core/docs;
       license = licenses.mit;
@@ -2904,7 +2890,7 @@ let
 
       homepage = https://github.com/elasticsearch/elasticsearch-py;
 
-      license = stdenv.lib.licenses.asl20;
+      license = licenses.asl20;
     };
   });
 
@@ -2927,7 +2913,7 @@ let
 
       homepage = https://github.com/elasticsearch/elasticsearch-dsl-py;
 
-      license = stdenv.lib.licenses.asl20;
+      license = licenses.asl20;
     };
   });
 
@@ -2948,12 +2934,12 @@ let
 
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Provides bindings to the generic input event interface in Linux";
       homepage = http://pythonhosted.org/evdev;
       license = licenses.bsd3;
-      maintainers = [ maintainers.goibhniu ];
-      platforms = stdenv.lib.platforms.linux;
+      maintainers = with maintainers; [ goibhniu ];
+      platforms = platforms.linux;
     };
   };
 
@@ -2969,7 +2955,7 @@ let
 
     propagatedBuildInputs = with self; [ greenlet ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Eventlib bindings for python";
       homepage    = "http://ag-projects.com/";
       license     = licenses.lgpl2;
@@ -2996,7 +2982,7 @@ let
       done
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A Python module and command line program for processing ID3 tags";
       homepage    = http://eyed3.nicfit.net/;
       license     = licenses.gpl2;
@@ -3025,7 +3011,7 @@ let
 
     meta = {
       description = "rapid multi-Python deployment";
-      license = stdenv.lib.licenses.gpl2;
+      license = licenses.gpl2;
     };
   };
 
@@ -3054,7 +3040,7 @@ let
       sha256 = "09q5jna3j8di0gw5yjx0dvlndkrk2x9vvqzwyfsvg3nlp8h38js1";
     };
     buildInputs = with self; [ nose ];
-    meta = with stdenv.lib; {
+    meta = {
       description = "A Python library for generating fake user data";
       homepage    = http://pypi.python.org/pypi/Faker;
       license     = licenses.mit;
@@ -3069,7 +3055,7 @@ let
       url = https://pypi.python.org/packages/source/f/fake-factory/fake-factory-0.2.tar.gz;
       sha256 = "0qdmk8p4anrj9mf95dh9v7bkhv1pz69hvhlw380kj4iz7b44b6zn";
     };
-    meta = with stdenv.lib; {
+    meta = {
       description = "A Python package that generates fake data for you";
       homepage    = https://pypi.python.org/pypi/fake-factory;
       license     = licenses.mit;
@@ -3093,7 +3079,7 @@ let
 
   fedora_cert = stdenv.mkDerivation (rec {
     name = "fedora-cert-0.5.9.2";
-    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+    meta.maintainers = with maintainers; [ mornfall ];
 
     src = pkgs.fetchurl {
       url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2";
@@ -3109,7 +3095,7 @@ let
 
   fedpkg = buildPythonPackage (rec {
     name = "fedpkg-1.14";
-    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+    meta.maintainers = with maintainers; [ mornfall ];
 
     src = pkgs.fetchurl {
       url = "https://fedorahosted.org/releases/f/e/fedpkg/fedpkg-1.14.tar.bz2";
@@ -3139,7 +3125,7 @@ let
       md5 = "3aba546bdad5d0826596910551ce37c0";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Recursive descent parsing library based on functional combinators";
       homepage = https://code.google.com/p/funcparserlib/;
       license = licenses.mit;
@@ -3157,14 +3143,14 @@ let
       md5 = "af2fc6a3d6cc5a02d0bf54d909785fcb";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = http://docs.python.org/3/library/functools.html;
     };
   };
 
   gcutil = buildPythonPackage rec {
     name = "gcutil-1.16.1";
-    meta.maintainers = [ stdenv.lib.maintainers.phreedom ];
+    meta.maintainers = with maintainers; [ phreedom ];
 
     src = pkgs.fetchurl {
       url = https://dl.google.com/dl/cloudsdk/release/artifacts/gcutil-1.16.1.tar.gz;
@@ -3203,7 +3189,7 @@ let
     ];
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "An unofficial API for Google Play Music";
       homepage = http://pypi.python.org/pypi/gmusicapi/;
       license = licenses.bsd3;
@@ -3222,7 +3208,7 @@ let
 
   gitdb = buildPythonPackage rec {
     name = "gitdb-0.5.4";
-    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+    meta.maintainers = with maintainers; [ mornfall ];
     doCheck = false;
 
     src = pkgs.fetchurl {
@@ -3235,7 +3221,7 @@ let
 
   GitPython = buildPythonPackage rec {
     name = "GitPython-0.3.2";
-    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+    meta.maintainers = with maintainers; [ mornfall ];
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/G/GitPython/GitPython-0.3.2.RC1.tar.gz";
@@ -3256,7 +3242,7 @@ let
       sha256 = "0nnf7xkr780wivr5xnchfcrahlzy9bi2dxcs1w1bh1014jql0iha";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Brings Google services to the command line";
       homepage    = https://code.google.com/p/googlecl/;
       license     = licenses.asl20;
@@ -3299,11 +3285,11 @@ let
 
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible";
       homepage = http://mg.pov.lt/gtimelog/;
       license = licenses.gpl2Plus;
-      maintainers = [ maintainers.ocharles ];
+      maintainers = with maintainers; [ ocharles ];
       platforms = platforms.unix;
     };
   };
@@ -3328,7 +3314,7 @@ let
       description = "A tool to make impress.js presentations from reStructuredText";
       homepage = https://github.com/regebro/hovercraft;
       license = licenses.mit;
-      maintainers = [ maintainers.goibhniu ];
+      maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -3340,7 +3326,7 @@ let
       sha256 = "06856q6x675ly542ig0plbqcyab6ksfzijlyf1hzhgg3sgwgrcyb";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "helpers to pass trusted data to untrusted environments and back";
       homepage = "https://pypi.python.org/pypi/itsdangerous/";
     };
@@ -3359,8 +3345,8 @@ let
     meta = {
       description = "Apply JSON-Patches (RFC 6902)";
       homepage = "https://github.com/stefankoegl/python-json-patch";
-      license = stdenv.lib.licenses.bsd3;
-      platforms = stdenv.lib.platforms.all;
+      license = licenses.bsd3;
+      platforms = platforms.all;
     };
   };
 
@@ -3377,8 +3363,8 @@ let
     meta = {
       description = "Identify specific nodes in a JSON document (RFC 6901)";
       homepage = "https://github.com/stefankoegl/python-json-pointer";
-      license = stdenv.lib.licenses.bsd3;
-      platforms = stdenv.lib.platforms.all;
+      license = licenses.bsd3;
+      platforms = platforms.all;
     };
   };
 
@@ -3405,8 +3391,8 @@ let
         for plain-text data.
       '';
       homepage = "https://github.com/dbohdan/jsonwatch";
-      license = stdenv.lib.licenses.mit;
-      platforms = stdenv.lib.platforms.all;
+      license = licenses.mit;
+      platforms = platforms.all;
     };
   };
 
@@ -3442,7 +3428,7 @@ let
     meta = {
       description = "A CLI client and Python API library for the MailChimp email platform";
       homepage = "http://apidocs.mailchimp.com/api/2.0/";
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -3488,7 +3474,7 @@ let
     meta = {
       description = "Library for parsing MediaWiki articles and converting them to different output formats";
       homepage = "http://pediapress.com/code/";
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -3505,7 +3491,7 @@ let
     meta = {
       description = "dependencies for mwlib markup";
       homepage = "http://pediapress.com/code/";
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -3528,7 +3514,7 @@ let
     meta = {
       description = "generate pdfs from mediawiki markup";
       homepage = "http://pediapress.com/code/";
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -3549,7 +3535,7 @@ let
         covCore
       ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Natural sorting for python";
       homepage = https://github.com/SethMMorton/natsort;
       license = licenses.mit;
@@ -3581,7 +3567,7 @@ let
     meta = {
       description = "Python API and tools to manipulate OpenDocument files";
       homepage = "https://joinup.ec.europa.eu/software/odfpy/home";
-      license = stdenv.lib.licenses.asl20;
+      license = licenses.asl20;
     };
   };
 
@@ -3598,7 +3584,7 @@ let
       description = "Pattern matching and various utilities for file systems paths";
       homepage = http://github.com/gorakhargosh/pathtools;
       license = licenses.mit;
-      maintainers = [ maintainers.goibhniu ];
+      maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -3618,7 +3604,7 @@ let
     # the tests do not pass
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A Python-based build/distribution/deployment scripting tool";
       homepage    = http://github.com/paver/paver;
       matinainers = with maintainers; [ lovek323 ];
@@ -3637,7 +3623,7 @@ let
 
     buildInputs = with self; [ nose pybcrypt];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A password hashing library for Python";
       homepage    = https://code.google.com/p/passlib/;
     };
@@ -3653,11 +3639,8 @@ let
     };
 
     meta = {
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -3674,11 +3657,11 @@ let
 
     propagatedBuildInputs = with self; [ virtualenv virtualenv-clone ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Tools to manage multiple virtualenvs written in pure python, a virtualenvwrapper rewrite";
       license = licenses.mit;
       platforms = platforms.all;
-      maintainers = [ maintainers.berdario ];
+      maintainers = with maintainers; [ berdario ];
     };
   };
 
@@ -3696,7 +3679,7 @@ let
 
     propagatedBuildInputs = deps;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "The simplest way to write one program that runs on both Python 2 and Python 3";
       homepage = https://github.com/timothycrosley/pies;
       license = licenses.mit;
@@ -3714,7 +3697,7 @@ let
 
     propagatedBuildInputs = with self; [ ipaddress ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Defines override classes that should be included with pies only if running on Python2";
       homepage = https://github.com/timothycrosley/pies;
       license = licenses.mit;
@@ -3738,14 +3721,14 @@ let
     preBuild = "${python}/bin/${python.executable} setup.py build_ext" +
                " --include-dirs=${pkgs.poppler_qt4}/include/poppler/";
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A Python binding to Poppler-Qt4";
       longDescription = ''
         A Python binding to Poppler-Qt4 that aims for completeness
         and for being actively maintained.
       '';
       license = licenses.lgpl21Plus;
-      maintainers = [ maintainers.sepi ];
+      maintainers = with maintainers; [ sepi ];
       platforms = platforms.all;
     };
   };
@@ -3760,7 +3743,7 @@ let
 
     propagatedBuildInputs = with self; [ self.pygments self.urwid ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A full-screen, console-based Python debugger";
       license = licenses.mit;
       platforms = platforms.all;
@@ -3801,11 +3784,8 @@ let
     ];
 
     meta = {
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -3821,8 +3801,8 @@ let
     propagatedBuildInputs = with self; [ beaker pyramid ];
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -3842,8 +3822,8 @@ let
       setuptools
     ];
 
-    meta = with stdenv.lib; {
-      maintainers = [ maintainers.iElectric ];
+    meta = {
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -3860,8 +3840,8 @@ let
     propagatedBuildInputs = with self; [ jinja2 pyramid ];
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -3903,11 +3883,8 @@ let
     propagatedBuildInputs = with self; [ pyramid ];
 
     meta = {
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -3925,12 +3902,8 @@ let
 
     propagatedBuildInputs = with self; [ transaction pyramid ];
     meta = {
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-        stdenv.lib.maintainers.matejc
-      ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ garbas iElectric matejc ];
+      platforms = platforms.all;
     };
   };
 
@@ -3946,7 +3919,7 @@ let
 
     propagatedBuildInputs = with self; [ pyramid ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies";
       homepage = https://github.com/mozilla-services/pyramid_multiauth;
     };
@@ -3992,8 +3965,8 @@ let
         policies. They can be viewed and edited by calendar and contact clients
         on mobile phones or computers.
       '';
-      license = stdenv.lib.licenses.gpl3Plus;
-      maintainers = [ stdenv.lib.maintainers.edwtjo ];
+      license = licenses.gpl3Plus;
+      maintainers = with maintainers; [ edwtjo ];
     };
   };
 
@@ -4010,7 +3983,7 @@ let
     doCheck = false;
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -4030,7 +4003,7 @@ let
     meta = {
       description = "Integer to Roman numerals converter";
       homepage = "https://pypi.python.org/pypi/roman";
-      license = stdenv.lib.licenses.psfl;
+      license = licenses.psfl;
     };
   };
 
@@ -4046,7 +4019,7 @@ let
     buildInputs = with self; [ zope_interface zodb ];
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -4062,7 +4035,7 @@ let
     buildInputs = with self; [ zope_interface zope_location zope_schema ];
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -4078,7 +4051,7 @@ let
     buildInputs = with self; [ ];
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -4090,7 +4063,7 @@ let
     };
     propagatedBuildInputs = with self; [ requests2 ];
     meta = {
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   };
 
@@ -4109,7 +4082,7 @@ let
     propagatedBuildInputs = with self; [ zodb zodburi ];
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -4126,7 +4099,7 @@ let
     propagatedBuildInputs = with self; [ repoze_sendmail ];
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -4142,12 +4115,12 @@ let
       sed "s|driver_files =.*|driver_files = ['${pkgs.rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Python wrapper for librtlsdr (a driver for Realtek RTL2832U based SDR's)";
       homepage = https://github.com/roger-/pyrtlsdr;
       license = licenses.gpl3;
       platforms = platforms.linux;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -4163,7 +4136,7 @@ let
     buildInputs = with self; [ transaction ];
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -4179,7 +4152,7 @@ let
     buildInputs = with self; [ zodb mock ZEO ];
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -4193,7 +4166,7 @@ let
       md5 = "494d8320549185097ba4a6b6b76017d6";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://pypi.python.org/pypi/ZEO;
     };
   };
@@ -4244,8 +4217,8 @@ let
       ZEO
     ];
 
-    meta = with stdenv.lib; {
-      maintainers = [ maintainers.iElectric ];
+    meta = {
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -4263,7 +4236,7 @@ let
       description = "SVG path objects and parser";
       homepage = https://github.com/regebro/svg.path;
       license = licenses.cc0;
-      maintainers = [ maintainers.goibhniu ];
+      maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -4277,11 +4250,8 @@ let
     };
 
     meta = {
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -4298,8 +4268,8 @@ let
     propagatedBuildInputs = with self; [ zope_interface sphinx ];
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -4319,11 +4289,11 @@ let
 
     buildInputs = with self; [ pkgs.alsaLib pkgs.jack2 ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A Python wrapper for the RtMidi C++ library written with Cython";
       homepage = http://trac.chrisarndt.de/code/wiki/python-rtmidi;
       license = licenses.mit;
-      maintainers = [ maintainers.goibhniu ];
+      maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -4365,7 +4335,7 @@ let
       description = "Python API and shell utilities to monitor file system events";
       homepage = http://github.com/gorakhargosh/watchdog;
       license = licenses.asl20;
-      maintainers = [ maintainers.goibhniu ];
+      maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -4393,11 +4363,8 @@ let
     buildInputs = with self; [ zope_testing ];
 
     meta = {
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -4412,7 +4379,7 @@ let
     propagatedBuildInputs = with pythonPackages; [  ];
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Validate dicts against a schema";
       homepage = http://github.com/sunlightlabs/validictory;
       license = licenses.mit;
@@ -4431,11 +4398,8 @@ let
     doCheck = false;
 
     meta = {
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -4454,11 +4418,8 @@ let
     doCheck = false;
 
     meta = {
-       maintainers = [
-         stdenv.lib.maintainers.garbas
-         stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.all;
+       maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -4475,7 +4436,7 @@ let
 
       homepage = https://github.com/txels/ddt;
 
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   });
 
@@ -4514,9 +4475,9 @@ let
     meta = {
       homepage = http://deluge-torrent.org;
       description = "Torrent client";
-      license = stdenv.lib.licenses.gpl3Plus;
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
-      platforms = stdenv.lib.platforms.all;
+      license = licenses.gpl3Plus;
+      maintainers = with maintainers; [ iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -4534,8 +4495,8 @@ let
     meta = {
       homepage = http://freedesktop.org/wiki/Software/pyxdg;
       description = "Contains implementations of freedesktop.org standards";
-      license = stdenv.lib.licenses.lgpl2;
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      license = licenses.lgpl2;
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -4550,8 +4511,8 @@ let
     meta = {
       homepage = https://github.com/erikrose/chardet;
       description = "Universal encoding detector";
-      license = stdenv.lib.licenses.lgpl2;
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      license = licenses.lgpl2;
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -4751,10 +4712,10 @@ let
     # tests appear to be broken on 0.6.1 at least
     doCheck = ( version != "0.6.1" );
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Class based template tags for Django";
       homepage = https://github.com/ojii/django-classy-tags;
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -4772,10 +4733,10 @@ let
     propagatedBuildInputs = with self; [ django_1_7 ] ++
       (optionals (pythonOlder "2.7") [ importlib ordereddict ]);
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "An extension to the Django web framework that provides comprehensive version control facilities";
       homepage = https://github.com/etianen/django-reversion;
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -4809,11 +4770,11 @@ let
     # Only test dependencies
     buildInputs = with self; [ pkgs.git gevent geventhttpclient mock fastimport ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Simple Python implementation of the Git file formats and protocols";
       homepage = http://samba.org/~jelmer/dulwich/;
       license = licenses.gpl2Plus;
-      maintainers = [ maintainers.koral ];
+      maintainers = with maintainers; [ koral ];
     };
   };
 
@@ -4829,10 +4790,10 @@ let
 
     propagatedBuildInputs = with self; [ pkgs.mercurial dulwich ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Push and pull from a Git server using Mercurial";
       homepage = http://hg-git.github.com/;
-      maintainers = [ maintainers.koral ];
+      maintainers = with maintainers; [ koral ];
     };
   };
 
@@ -4901,8 +4862,8 @@ let
     meta = {
       description = "ECDSA cryptographic signature library";
       homepage = "https://github.com/warner/python-ecdsa";
-      license = stdenv.lib.licenses.mit;
-      maintainers = [ stdenv.lib.maintainers.aszlig ];
+      license = licenses.mit;
+      maintainers = with maintainers; [ aszlig ];
     };
   };
 
@@ -5009,10 +4970,10 @@ let
       sha256 = "0k8x7552ypx9rc14vbsvg2lc6z0r8pv9laah28pdwyynbq10825d";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://launchpad.net/python-fastimport;
       description = "VCS fastimport/fastexport parser";
-      maintainers = [ maintainers.koral ];
+      maintainers = with maintainers; [ koral ];
       license = licenses.gpl2Plus;
     };
   };
@@ -5050,8 +5011,8 @@ let
     meta = {
       homepage = http://code.google.com/p/feedparser/;
       description = "Universal feed parser";
-      license = stdenv.lib.licenses.bsd2;
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      license = licenses.bsd2;
+      maintainers = with maintainers; [ iElectric ];
     };
   });
 
@@ -5091,7 +5052,7 @@ let
     meta = {
       homepage = http://www.fig.sh/;
       description = "Fast, isolated development environments using Docker";
-      license = stdenv.lib.licenses.asl20;
+      license = licenses.asl20;
     };
   };
 
@@ -5104,7 +5065,7 @@ let
       md5 = "12a1ad3a1ed6a9377e758c4fa7fee570";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A snapshot of django-filebrowser for the Mezzanine CMS";
       longDescription = ''
         filebrowser_safe was created to provide a snapshot of the FileBrowser
@@ -5142,7 +5103,7 @@ let
       description = "Code checking using pep8 and pyflakes";
       homepage = http://pypi.python.org/pypi/flake8;
       license = licenses.mit;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   });
 
@@ -5225,8 +5186,8 @@ let
     meta = {
       homepage = http://flexget.com/;
       description = "Multipurpose automation tool for content like torrents";
-      license = stdenv.lib.licenses.mit;
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      license = licenses.mit;
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -5243,7 +5204,7 @@ let
       md5 = "5c8c681a0b1df94ecd6dc0b3a8b80892";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A snapshot of django-grappelli for the Mezzanine CMS";
       longDescription = ''
         grappelli_safe was created to provide a snapshot of the Grappelli admin
@@ -5278,8 +5239,8 @@ let
     meta = {
       homepage = https://github.com/ckreutzer/python-tvrage;
       description = "Client interface for tvrage.com's XML-based api feeds";
-      license = stdenv.lib.licenses.bsd3;
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ iElectric ];
     };
   });
 
@@ -5305,8 +5266,8 @@ let
     meta = {
       homepage = https://github.com/Julian/jsonschema;
       description = "An implementation of JSON Schema validation for Python";
-      license = stdenv.lib.licenses.mit;
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      license = licenses.mit;
+      maintainers = with maintainers; [ iElectric ];
     };
   });
 
@@ -5325,7 +5286,7 @@ let
 
       homepage = http://falconframework.org;
 
-      license = stdenv.lib.licenses.asl20;
+      license = licenses.asl20;
     };
   });
 
@@ -5387,7 +5348,7 @@ let
       '';
 
       # See http://foolscap.lothar.com/trac/browser/LICENSE.
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
 
       maintainers = [ ];
     };
@@ -5401,7 +5362,7 @@ let
       sha256 = "144f4yn2nvnxh2vrnmiabpwx3s637np0d1j1w95zym790d66shir";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Filesystem abstraction";
       homepage    = http://pypi.python.org/pypi/fs;
       license     = licenses.bsd3;
@@ -5428,7 +5389,7 @@ let
 
     meta = {
       description = "Python bindings for FUSE";
-      license = stdenv.lib.licenses.lgpl21;
+      license = licenses.lgpl21;
     };
   });
 
@@ -5447,7 +5408,7 @@ let
         "find_library('fuse')" "'${pkgs.fuse}/lib/libfuse.so'"
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Simple ctypes bindings for FUSE";
       longDescription = ''
         Python module that provides a simple interface to FUSE and MacFUSE.
@@ -5472,7 +5433,7 @@ let
     propagatedBuildInputs = with self; optionals isPy26 [ importlib argparse ];
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Clean single-source support for Python 3 and 2";
       longDescription = ''
         python-future is the missing compatibility layer between Python 2 and
@@ -5543,7 +5504,7 @@ let
         --replace "==" ">="
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Mount Google Drive as a local file system";
       longDescription = ''
         GDriveFS is a FUSE wrapper for Google Drive developed. Design goals:
@@ -5600,12 +5561,12 @@ let
     buildInputs = with self; [ pkgs.libev ];
     propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Coroutine-based networking library";
       homepage = http://www.gevent.org/;
       license = licenses.mit;
       platforms = platforms.linux;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -5620,11 +5581,11 @@ let
 
     propagatedBuildInputs = with self; [ gevent certifi backports_ssl_match_hostname_3_4_0_2 ];
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = http://github.com/gwik/geventhttpclient;
       description = "HTTP client library for gevent";
       license = licenses.mit;
-      maintainers = [ maintainers.koral ];
+      maintainers = with maintainers; [ koral ];
     };
   };
 
@@ -5695,7 +5656,7 @@ let
 
     propagatedBuildInputs = with self; [ gevent ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "gevent-cooperative child processes and IPC";
       longDescription = ''
         Usage of Python's multiprocessing package in a gevent-powered
@@ -5776,7 +5737,7 @@ let
       sed -i '/distribute/d' setup.py
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Search your google contacts from the command-line or mutt";
       homepage    = https://pypi.python.org/pypi/goobook;
       license     = licenses.gpl3;
@@ -5797,7 +5758,7 @@ let
 
     propagatedBuildInputs = with self; [ httplib2 ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "The core Python library for accessing Google APIs";
       homepage = "https://code.google.com/p/google-api-python-client/";
       license = licenses.asl20;
@@ -5826,7 +5787,7 @@ let
 
     doCheck = true;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Google Application Utilities for Python";
       homepage = http://code.google.com/p/google-apputils-python;
     };
@@ -5848,7 +5809,7 @@ let
       rm tests/test_leaks.py
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = http://pypi.python.org/pypi/greenlet;
       description = "Module for lightweight in-process concurrent programming";
       license     = licenses.lgpl2;
@@ -5886,7 +5847,7 @@ let
       ../development/python-modules/gyp/no-darwin-cflags.patch
     ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A tool to generate native build files";
       homepage = https://chromium.googlesource.com/external/gyp/+/master/README.md;
       license = licenses.bsd3;
@@ -5912,7 +5873,7 @@ let
 
     meta = {
       homepage = http://code.google.com/p/gyp;
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
       description = "Generate Your Projects";
     };
   });
@@ -5936,7 +5897,7 @@ let
 
     meta = {
       homepage = http://pypi.python.org/pypi/guessit;
-      license = stdenv.lib.licenses.lgpl3;
+      license = licenses.lgpl3;
       description = "A library for guessing information from video files";
     };
   };
@@ -5983,7 +5944,7 @@ let
 
     buildInputs = with self; [ six pkgs.glibcLocales ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Library collecting some useful snippets";
       homepage    = https://pypi.python.org/pypi/hcs_utils/1.3;
       license     = licenses.isc;
@@ -6009,8 +5970,8 @@ let
     meta = {
       homepage = "https://github.com/RedMoonStudios/hetzner";
       description = "High-level Python API for accessing the Hetzner robot";
-      license = stdenv.lib.licenses.bsd3;
-      maintainers = [ stdenv.lib.maintainers.aszlig ];
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ aszlig ];
     };
   };
 
@@ -6032,7 +5993,7 @@ let
 
     meta = {
       description = "Simple HTML cleanup utilities";
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -6053,7 +6014,7 @@ let
 
     checkPhase = "nosetests";
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://github.com/html5lib/html5lib-python;
       downloadPage = https://github.com/html5lib/html5lib-python/releases;
       description = "HTML parser based on WHAT-WG HTML5 specification";
@@ -6081,7 +6042,7 @@ let
     meta = {
       homepage = https://github.com/atl/py-http-signature;
       description = "";
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   });
 
@@ -6115,7 +6076,7 @@ let
       homepage = http://code.google.com/p/httplib2;
       description = "A comprehensive HTTP client library";
       license = licenses.mit;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   };
 
@@ -6129,7 +6090,7 @@ let
       md5 = "0c4112bab04b71979286387b033921b5";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A Python library for property based testing";
       homepage = https://github.com/DRMacIver/hypothesis;
       license = licenses.mpl20;
@@ -6182,11 +6143,11 @@ let
     buildInputs = with self; [ setuptools ];
     propagatedBuildInputs = with self; [ dateutil pytz ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A parser/generator of iCalendar files";
       homepage = "http://icalendar.readthedocs.org/";
       license = licenses.bsd2;
-      maintainers = [ maintainers.olcai ];
+      maintainers = with maintainers; [ olcai ];
     };
   };
 
@@ -6279,7 +6240,7 @@ let
       md5 = "5d9ecf415cced476f7781cf5b9ef70c4";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Port of the 3.3+ ipaddress module to 2.6, 2.7, and 3.2";
       homepage = https://github.com/phihag/ipaddress;
       license = licenses.psfl;
@@ -6315,7 +6276,7 @@ let
     meta = {
       homepage = https://bitbucket.org/micktwomey/pyiso8601/;
       description = "Simple module to parse ISO 8601 dates";
-      maintainers = [ stdenv.lib.maintainers.phreedom ];
+      maintainers = with maintainers; [ phreedom ];
     };
   };
 
@@ -6331,7 +6292,7 @@ let
 
     propagatedBuildInputs = with self; [ natsort pies ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A Python utility / library to sort Python imports";
       homepage = https://github.com/timothycrosley/isort;
       license = licenses.mit;
@@ -6350,7 +6311,7 @@ let
       homepage = https://github.com/davidhalter/jedi;
       description = "An autocompletion tool for Python that can be used for text editors";
       license = licenses.lgpl3Plus;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   });
 
@@ -6365,10 +6326,10 @@ let
 
     buildInputs = with self; [ pytest unicodecsv ];
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = http://github.com/sunlightlabs/jellyfish;
       description = "Approximate and phonetic matching of strings";
-      maintainers = [ maintainers.koral ];
+      maintainers = with maintainers; [ koral ];
     };
   };
 
@@ -6393,7 +6354,7 @@ let
         an optional sandboxed environment.
       '';
       platforms = platforms.all;
-      maintainers = [ maintainers.pierron ];
+      maintainers = with maintainers; [ pierron ];
     };
   };
 
@@ -6430,7 +6391,7 @@ let
       parsedatetime
     ];
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = http://maebert.github.io/jrnl/;
       description = "A simple command line journal application that stores your journal in a plain text file";
       license = licenses.mit;
@@ -6449,7 +6410,7 @@ let
     buildInputs = with self;
       [ fs gdata python_keyczar mock pyasn1 pycrypto pytest six ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Store and access your passwords safely";
       homepage    = "https://pypi.python.org/pypi/keyring";
       license     = licenses.psfl;
@@ -6479,7 +6440,7 @@ let
     # tests also appear to depend on anyjson, which has Py3k problems
     doCheck = (pythonAtLeast "2.7") && !isPy3k ;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Messaging library for Python";
       homepage    = "http://github.com/celery/kombu";
       license     = licenses.bsd3;
@@ -6502,7 +6463,7 @@ let
 
     propagatedBuildInputs = with self; [ configparser argparse ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Yet Another Config Parser";
       homepage    = "https://github.com/mozilla-services/konfig";
       license     = licenses.mpl20;
@@ -6513,7 +6474,7 @@ let
     name = "kitchen-1.1.1";
     disabled = isPy3k;
 
-    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+    meta.maintainers = with maintainers; [ mornfall ];
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/k/kitchen/kitchen-1.1.1.tar.gz";
@@ -6598,11 +6559,11 @@ let
 
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A modified version of Supybot, an IRC bot";
       homepage = http://supybot.fr.cr;
       license = licenses.bsd3;
-      maintainers = [ maintainers.goibhniu ];
+      maintainers = with maintainers; [ goibhniu ];
     };
   });
 
@@ -6618,11 +6579,11 @@ let
 
     propagatedBuildInputs = with self; [ requests2 ];
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = "https://github.com/ghickman/linode";
       description = "A thin python wrapper around Linode's API";
       license = licenses.mit;
-      maintainers = [ maintainers.nslqqq ];
+      maintainers = with maintainers; [ nslqqq ];
     };
   };
 
@@ -6636,12 +6597,12 @@ let
 
     buildInputs = [ pkgs.pkgconfig pkgs.fuse pkgs.attr ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Python bindings for the low-level FUSE API";
       homepage = https://code.google.com/p/python-llfuse/;
       license = licenses.lgpl2Plus;
       platforms = platforms.unix;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -6703,7 +6664,7 @@ let
     propagatedBuildInputs = with self; [ wxPython modules.readline ];
     postInstall = "mv $out/bin/loxodo.py $out/bin/loxodo";
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A Password Safe V3 compatible password vault";
       homepage = http://www.christoph-sommer.de/loxodo/;
       license = licenses.gpl2Plus;
@@ -6811,8 +6772,8 @@ let
     meta = {
       description = "Super-fast templating language";
       homepage = http://www.makotemplates.org;
-      license = stdenv.lib.licenses.mit;
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      license = licenses.mit;
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -6829,7 +6790,7 @@ let
       description = "Implements a XML/HTML/XHTML Markup safe string";
       homepage = http://dev.pocoo.org;
       license = "BSD";
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -6847,7 +6808,7 @@ let
     meta = {
       description = "A documentation builder";
       homepage = http://pypi.python.org/pypi/manuel;
-      license = stdenv.lib.licenses.zpt20;
+      license = licenses.zpt20;
     };
   };
 
@@ -6896,7 +6857,7 @@ let
       description = "McCabe checker, plugin for flake8";
       homepage = "https://github.com/flintwork/mccabe";
       license = licenses.mit;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   });
 
@@ -6935,7 +6896,7 @@ let
     meta = {
       description = "An HTML/XML templating engine used by supervisor";
       homepage = https://github.com/supervisor/meld3;
-      license = stdenv.lib.licenses.free;
+      license = licenses.free;
     };
   };
 
@@ -7000,7 +6961,7 @@ let
       export LC_ALL="en_US.UTF-8"
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       description = ''
         A content management platform built using the Django framework
       '';
@@ -7076,7 +7037,7 @@ let
       description = "Streaming command-line twitter client";
       homepage    = "http://www.rainbowstream.org/";
       license     = licenses.mit;
-      maintainers = [ maintainers.thoughtpolice ];
+      maintainers = with maintainers; [ thoughtpolice ];
     };
   };
 
@@ -7144,7 +7105,7 @@ let
 
       homepage = http://moinmo.in/;
 
-      license = stdenv.lib.licenses.gpl2Plus;
+      license = licenses.gpl2Plus;
     };
   });
 
@@ -7159,7 +7120,7 @@ let
     buildInputs = with self; [ six pathpy setuptools ];
     propagatedBuildInputs = with self; [ decorator ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Many more basic tools for python 2/3 extending itertools, functools, operator and collections";
       homepage = https://bitbucket.org/userzimmermann/python-moretools;
       license = licenses.gpl3Plus;
@@ -7216,7 +7177,7 @@ let
       sha256 = "1blgzwq4irzaf8abb4z0d2r48903n9zxf51fhnv3gv09bgxjqzxh";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage    = http://mpmath.googlecode.com;
       description = "A pure-Python library for multiprecision floating arithmetic";
       license     = licenses.bsd3;
@@ -7311,7 +7272,7 @@ let
       homepage = http://bmc.github.com/munkres/;
       description = "Munkres algorithm for the Assignment Problem";
       license = licenses.bsd3;
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -7334,7 +7295,7 @@ let
       homepage = http://alastair/python-musicbrainz-ngs;
       description = "Python bindings for musicbrainz NGS webservice";
       license = licenses.bsd2;
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -7351,8 +7312,8 @@ let
 
     meta = {
       homepage = https://github.com/aroig/mutag;
-      license = stdenv.lib.licenses.gpl3;
-      maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+      license = licenses.gpl3;
+      maintainers = with maintainers; [ DamienCassou ];
     };
   };
 
@@ -7370,7 +7331,7 @@ let
     meta = {
       description = "Python multimedia tagging library";
       homepage = http://code.google.com/p/mutagen;
-      license = stdenv.lib.licenses.lgpl2;
+      license = licenses.lgpl2;
     };
   });
 
@@ -7390,7 +7351,7 @@ let
     meta = {
       description = "Utilities for use with console mail clients, like mutt";
       homepage = http://www.blacktrash.org/hg/muttils;
-      license = stdenv.lib.licenses.gpl2Plus;
+      license = licenses.gpl2Plus;
     };
   });
 
@@ -7456,11 +7417,8 @@ let
     };
 
     meta = {
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.linux;
+      maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.linux;
     };
   };
 
@@ -7513,7 +7471,7 @@ let
     meta = {
       description = "A simple Python module for parsing human names into their individual components";
       homepage = https://github.com/derek73/python-nameparser;
-      license = stdenv.lib.licenses.lgpl21Plus;
+      license = licenses.lgpl21Plus;
     };
   };
 
@@ -7529,7 +7487,7 @@ let
     meta = {
       homepage = "https://python-nbxmpp.gajim.org/";
       description = "Non-blocking Jabber/XMPP module";
-      license = stdenv.lib.licenses.gpl3;
+      license = licenses.gpl3;
     };
   };
 
@@ -7702,7 +7660,7 @@ let
     meta = {
       description = "Coverage 3.x support for Nose";
       homepage = https://github.com/ask/nosecover3;
-      license = stdenv.lib.licenses.lgpl21;
+      license = licenses.lgpl21;
     };
   };
 
@@ -7721,7 +7679,7 @@ let
 
       homepage = http://github.com/cmheisel/nose-xcover/;
 
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   });
 
@@ -7793,7 +7751,7 @@ let
     meta = {
       description = "A Python wrapper around notmuch";
       homepage = http://notmuchmail.org/;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   };
 
@@ -7896,12 +7854,12 @@ let
     # tests fail
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Generate network-diagram image from spec-text file (similar to Graphviz)";
       homepage = http://blockdiag.com/;
       license = licenses.asl20;
       platforms = platforms.linux;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -7927,8 +7885,8 @@ let
         Livestreamer is CLI program that extracts streams from various
         services and pipes them into a video player of choice.
       '';
-      license = stdenv.lib.licenses.bsd2;
-      maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+      license = licenses.bsd2;
+      maintainers = with maintainers; [ fuuzetsu ];
     };
   };
 
@@ -7944,7 +7902,7 @@ let
       homepage = http://code.google.com/p/oauth;
       description = "Library for OAuth version 1.0a";
       license = licenses.mit;
-      platforms = stdenv.lib.platforms.all;
+      platforms = platforms.all;
     };
   });
 
@@ -7968,8 +7926,8 @@ let
       homepage = "https://github.com/simplegeo/python-oauth2";
       description = "library for OAuth version 1.0";
       license = licenses.mit;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
-      platforms = stdenv.lib.platforms.linux;
+      maintainers = with maintainers; [ garbas ];
+      platforms = platforms.linux;
     };
   });
 
@@ -7984,7 +7942,7 @@ let
     propagatedBuildInputs = with pythonPackages; [ httplib2 pyasn1 pyasn1-modules rsa ];
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A client library for OAuth 2.0";
       homepage = http://github.com/google/oauth2client/;
       license = licenses.bsd2;
@@ -8030,13 +7988,13 @@ let
       description = "a pluggable transport proxy";
       homepage = https://www.torproject.org/projects/obfsproxy;
       repositories.git = https://git.torproject.org/pluggable-transports/obfsproxy.git;
-      maintainers = with stdenv.lib.maintainers; [ phreedom thoughtpolice ];
+      maintainers = with maintainers; [ phreedom thoughtpolice ];
     };
   });
 
   offtrac = buildPythonPackage rec {
     name = "offtrac-0.1.0";
-    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+    meta.maintainers = with maintainers; [ mornfall ];
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/o/offtrac/${name}.tar.gz";
@@ -8155,9 +8113,9 @@ let
     meta = {
       homepage = "http://pandas.pydata.org/";
       description = "Python Data Analysis Library";
-      license = stdenv.lib.licenses.bsd3;
-      maintainers = [ stdenv.lib.maintainers.raskin ];
-      platforms = stdenv.lib.platforms.linux;
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ raskin ];
+      platforms = platforms.linux;
     };
   };
 
@@ -8193,8 +8151,8 @@ let
     meta = {
       homepage = "https://github.com/paramiko/paramiko/";
       description = "Native Python SSHv2 protocol library";
-      license = stdenv.lib.licenses.lgpl21Plus;
-      maintainers = [ stdenv.lib.maintainers.aszlig ];
+      license = licenses.lgpl21Plus;
+      maintainers = with maintainers; [ aszlig ];
 
       longDescription = ''
         This is a library for making SSH2 connections (client or server).
@@ -8240,7 +8198,7 @@ let
     meta = {
       description = "Load, configure, and compose WSGI applications and servers";
       homepage = http://pythonpaste.org/deploy/;
-      platforms = stdenv.lib.platforms.all;
+      platforms = platforms.all;
     };
   };
 
@@ -8260,7 +8218,7 @@ let
     meta = {
       description = "A pluggable command-line frontend, including commands to setup package file layouts";
       homepage = http://pythonpaste.org/script/;
-      platforms = stdenv.lib.platforms.all;
+      platforms = platforms.all;
     };
   };
 
@@ -8277,7 +8235,7 @@ let
     meta = {
       description = "Object-oriented filesystem paths";
       homepage = "https://pathlib.readthedocs.org/";
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -8289,7 +8247,7 @@ let
       sha256 = "0n1kpbbm1dg5f484yzxr7gb3ak6vjp92j70nw3bgjzsj9fh26afq";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A module wrapper for os.path";
       homepage = http://github.com/jaraco/path.py;
       license = licenses.mit;
@@ -8364,7 +8322,7 @@ let
       homepage = http://getpelican.com/;
       description = "A tool to generate a static blog from reStructuredText or Markdown input files";
       license = licenses.agpl3;
-      maintainers = with stdenv.lib.maintainers; [ offline prikhi ];
+      maintainers = with maintainers; [ offline prikhi ];
     };
   };
 
@@ -8381,7 +8339,7 @@ let
       homepage = "http://pep8.readthedocs.org/";
       description = "Python style guide checker";
       license = licenses.mit;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   };
 
@@ -8401,7 +8359,7 @@ let
       homepage = https://github.com/mooz/percol;
       description = "Adds flavor of interactive filtering to the traditional pipe concept of shell";
       license = licenses.mit;
-      maintainers = with stdenv.lib.maintainers; [ koral ];
+      maintainers = with maintainers; [ koral ];
     };
   };
 
@@ -8420,7 +8378,7 @@ let
     meta = {
       homepage = http://www.noah.org/wiki/Pexpect;
       description = "Automate interactive console applications such as ssh, ftp, etc";
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
 
       longDescription = ''
         Pexpect is similar to the Don Libes "Expect" system, but Pexpect
@@ -8452,11 +8410,8 @@ let
     propagatedBuildInputs = with self; [ pytz ];
 
     meta = {
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.linux;
+      maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.linux;
     };
   };
 
@@ -8473,7 +8428,7 @@ let
 
     propagatedBuildInputs = with self; [ click jedi prompt_toolkit psycopg2 pygments sqlparse ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Command-line interface for PostgreSQL";
       longDescription = ''
         Rich command-line interface for PostgreSQL with auto-completion and
@@ -8632,7 +8587,7 @@ let
 
       license = "http://www.pythonware.com/products/pil/license.htm";
 
-      maintainers = with stdenv.lib.maintainers; [ goibhniu prikhi ];
+      maintainers = with maintainers; [ goibhniu prikhi ];
     };
   };
 
@@ -8717,7 +8672,7 @@ let
       install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf"
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage    = https://github.com/powerline/powerline;
       description = "The ultimate statusline/prompt utility";
       license     = licenses.mit;
@@ -8741,7 +8696,7 @@ let
     # can't find the tests module?
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Python Reddit API wrapper";
       homepage = http://praw.readthedocs.org/;
       license = licenses.gpl3;
@@ -8781,7 +8736,7 @@ let
     buildInputs = with self; [ jedi ipython pygments ];
     propagatedBuildInputs = with self; [ docopt six wcwidth ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Python library for building powerful interactive command lines";
       longDescription = ''
         prompt_toolkit could be a replacement for readline, but it can be
@@ -8870,7 +8825,7 @@ let
 
     meta = {
       description = "PostgreSQL database adapter for the Python programming language";
-      license = with stdenv.lib.licenses; [ gpl2 zpt20 ];
+      license = with licenses; [ gpl2 zpt20 ];
     };
   };
 
@@ -8923,7 +8878,7 @@ let
     meta = {
       description = "Bindings for Chromaprint acoustic fingerprinting";
       homepage = "https://github.com/sampsyo/pyacoustid";
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -8941,7 +8896,7 @@ let
     meta = {
       description = "Python Algorithmic Trading";
       homepage = http://gbeced.github.io/pyalgotrade/;
-      license = stdenv.lib.licenses.asl20;
+      license = licenses.asl20;
     };
   };
 
@@ -8958,7 +8913,7 @@ let
       description = "ASN.1 tools for Python";
       homepage = http://pyasn1.sourceforge.net/;
       license = "mBSD";
-      platforms = stdenv.lib.platforms.unix;  # arbitrary choice
+      platforms = platforms.unix;  # arbitrary choice
     };
   });
 
@@ -8977,8 +8932,8 @@ let
     meta = {
       description = "A collection of ASN.1-based protocols modules";
       homepage = https://pypi.python.org/pypi/pyasn1-modules;
-      license = stdenv.lib.licenses.bsd3;
-      platforms = stdenv.lib.platforms.unix;  # same as pyasn1
+      license = licenses.bsd3;
+      platforms = platforms.unix;  # same as pyasn1
     };
   };
 
@@ -9004,7 +8959,7 @@ let
     meta = {
       description = "Python bindings for PortAudio";
       homepage = "http://people.csail.mit.edu/hubert/pyaudio/";
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -9021,11 +8976,11 @@ let
 
     propagatedBuildInputs = with self; [ dateutil ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Module for reading vCard and vCalendar files";
       homepage = http://vobject.skyhouseconsulting.com/;
       license = licenses.asl20;
-      maintainers = [ maintainers.DamienCassou ];
+      maintainers = with maintainers; [ DamienCassou ];
     };
   };
 
@@ -9042,11 +8997,11 @@ let
 
     propagatedBuildInputs = with self; [ sqlite3 vobject lxml requests urwid pyxdg ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Command-line interface carddav client";
       homepage = http://lostpackets.de/pycarddav;
       license = licenses.mit;
-      maintainers = [ maintainers.DamienCassou ];
+      maintainers = with maintainers; [ DamienCassou ];
     };
   };
 
@@ -9060,7 +9015,7 @@ let
       sha256 = "02sdn2998jlrm35smn1530hix3kzwyc1jv49cjdcnvfvrqqi3rww";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = ''PicoSAT is a popular SAT solver written by Armin
           Biere in pure C. This package provides efficient Python bindings
           to picosat on the C level, i.e. when importing pycosat, the
@@ -9095,8 +9050,8 @@ let
     meta = {
       homepage = https://pypi.python.org/pypi/pygit2;
       description = "A set of Python bindings to the libgit2 shared library";
-      license = with stdenv.lib.licenses; gpl2;
-      platforms = with stdenv.lib.platforms; all;
+      license = with licenses; gpl2;
+      platforms = with platforms; all;
     };
   };
 
@@ -9115,8 +9070,8 @@ let
       homepage = http://babel.edgewall.org;
       description = "A collection of tools for internationalizing Python applications";
       license = "BSD";
-      maintainers = [ stdenv.lib.maintainers.garbas ];
-      platforms = stdenv.lib.platforms.linux;
+      maintainers = with maintainers; [ garbas ];
+      platforms = platforms.linux;
     };
   });
 
@@ -9147,7 +9102,7 @@ let
         --prefix="$out"
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://github.com/Groundworkstech/pybfd;
       description = "A Python interface to the GNU Binary File Descriptor (BFD) library";
       license = licenses.gpl2;
@@ -9179,7 +9134,7 @@ let
 
     meta = {
       description = "Interface for working with block devices";
-      license = stdenv.lib.licenses.gpl2Plus;
+      license = licenses.gpl2Plus;
     };
   };
 
@@ -9213,7 +9168,7 @@ let
   
     propagatedBuildInputs = with self; [ pygments markdown ];
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = "http://pyblosxom.github.io";
       description = "File-based blogging engine";
       license = licenses.mit;
@@ -9237,10 +9192,10 @@ let
       sed -i '3iimport setuptools' setup.py
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       maintainers = with maintainers; [ cstrahan ];
-      license = stdenv.lib.licenses.bsd2;
-      platforms = stdenv.lib.platforms.all;
+      license = licenses.bsd2;
+      platforms = platforms.all;
       homepage = "http://jparyani.github.io/pycapnp/index.html";
     };
   };
@@ -9272,7 +9227,7 @@ let
       nosetests
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = http://www.gnu.org/software/libcdio/;
       description = "Wrapper around libcdio (CD Input and Control library)";
       maintainers = with maintainers; [ rycee ];
@@ -9302,10 +9257,10 @@ let
 
       description = "Python wrappers for the Crypto++ library";
 
-      license = stdenv.lib.licenses.gpl2Plus;
+      license = licenses.gpl2Plus;
 
       maintainers = [ ];
-      platforms = stdenv.lib.platforms.linux;
+      platforms = platforms.linux;
     };
   });
 
@@ -9332,7 +9287,7 @@ let
     meta = {
       homepage = http://pycurl.sourceforge.net/;
       description = "Python wrapper for libcurl";
-      platforms = stdenv.lib.platforms.linux;
+      platforms = platforms.linux;
     };
   });
 
@@ -9355,7 +9310,7 @@ let
     meta = {
       homepage = https://pypi.python.org/pypi/pycurl2;
       description = "A fork from original PycURL library that no maintained from 7.19.0";
-      platforms = stdenv.lib.platforms.linux;
+      platforms = platforms.linux;
     };
   });
 
@@ -9395,7 +9350,7 @@ let
     # dictionaries needed for tests
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "pyenchant: Python bindings for the Enchant spellchecker";
       homepage = https://pythonhosted.org/pyenchant/;
       license = licenses.lgpl21;
@@ -9434,7 +9389,7 @@ let
     meta = {
       description = "FIGlet in pure Python";
       license     = licenses.gpl2Plus;
-      maintainers = [ maintainers.thoughtpolice ];
+      maintainers = with maintainers; [ thoughtpolice ];
     };
   };
 
@@ -9454,7 +9409,7 @@ let
       homepage = https://launchpad.net/pyflakes;
       description = "A simple program which checks Python source files for errors";
       license = licenses.mit;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   };
 
@@ -9469,7 +9424,7 @@ let
 
     propagatedBuildInputs = with pythonPackages; [  ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Pure Python GeoIP API";
       homepage = https://github.com/appliedsec/pygeoip;
       license = licenses.lgpl3Plus;
@@ -9494,8 +9449,8 @@ let
     meta = {
       homepage = "http://www.pyglet.org/";
       description = "A cross-platform windowing and multimedia library";
-      license = stdenv.lib.licenses.bsd3;
-      platforms = stdenv.lib.platforms.mesaPlatforms;
+      license = licenses.bsd3;
+      platforms = platforms.mesaPlatforms;
     };
   };
 
@@ -9508,7 +9463,7 @@ let
       sha256 = "0lagrwifsgn0s8bzqahpr87p7gd38xja8f06akscinp6hj89283k";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = http://pygments.org/;
       description = "A generic syntax highlighter";
       license = with licenses; [ bsd2 ];
@@ -9536,7 +9491,7 @@ let
       homepage = "https://launchpad.net/pygpgme";
       description = "A Python wrapper for the GPGME library";
       license = licenses.lgpl21;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   };
 
@@ -9552,11 +9507,11 @@ let
 
     disabled = isPyPy || isPy3k;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Media Meta Data retrieval framework";
       homepage = http://sourceforge.net/projects/mmpython/;
       license = licenses.gpl2;
-      maintainers = [ maintainers.DamienCassou ];
+      maintainers = with maintainers; [ DamienCassou ];
     };
   };
 
@@ -9595,11 +9550,11 @@ let
       runHook postInstall
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Generic application framework, providing the foundation for other modules";
       homepage = https://github.com/freevo/kaa-base;
       license = licenses.lgpl21;
-      maintainers = [ maintainers.DamienCassou ];
+      maintainers = with maintainers; [ DamienCassou ];
     };
   };
 
@@ -9642,11 +9597,11 @@ let
 
     propagatedBuildInputs = with self; [ kaa-base ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Python library for parsing media metadata, which can extract metadata (e.g., such as id3 tags) from a wide range of media files";
       homepage = https://github.com/freevo/kaa-metadata;
       license = licenses.gpl2;
-      maintainers = [ maintainers.DamienCassou ];
+      maintainers = with maintainers; [ DamienCassou ];
     };
   };
 
@@ -9684,7 +9639,7 @@ let
 
     propagatedBuildInputs = with self; [ pycrypto ecdsa ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "JSON Web Token implementation in Python";
       longDescription = "A Python implementation of JSON Web Token draft 01";
       homepage = https://github.com/progrium/pyjwt;
@@ -9736,12 +9691,12 @@ let
 
     buildInputs = with self; [ pkgs.libiodbc ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Python ODBC module to connect to almost any database";
       homepage = https://code.google.com/p/pyodbc/;
       license = licenses.mit;
       platforms = platforms.linux;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -9827,8 +9782,8 @@ let
     meta = {
       homepage = "https://fedorahosted.org/pyparted/";
       description = "Python interface for libparted";
-      license = stdenv.lib.licenses.gpl2Plus;
-      platforms = stdenv.lib.platforms.linux;
+      license = licenses.gpl2Plus;
+      platforms = platforms.linux;
     };
   };
 
@@ -9846,7 +9801,7 @@ let
     };
     meta = {
       description = "A python implementation of the Pluggable Transports for Circumvention specification for Tor";
-      license = stdenv.lib.licenses.bsd2;
+      license = licenses.bsd2;
     };
   });
 
@@ -9863,12 +9818,12 @@ let
 
     propagatedBuildInputs = with self; [ scipy numpy pyqt4 pyopengl ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Scientific Graphics and GUI Library for Python";
       homepage = http://www.pyqtgraph.org/;
       license = licenses.mit;
       platforms = platforms.unix;
-      maintainers = [ maintainers.koral ];
+      maintainers = with maintainers; [ koral ];
     };
   };
 
@@ -9880,7 +9835,7 @@ let
       md5 = "46ee623eeeba5a7cc0d95cbfa7e18abd";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Snowball stemming algorithms, for information retrieval";
       homepage = http://snowball.tartarus.org/;
       license = licenses.mit;
@@ -9897,12 +9852,12 @@ let
       md5 = "59d4d3f4a8786776c9d7f9051b8f1a69";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Distributed object middleware for Python (IPC/RPC)";
       homepage = http://pythonhosted.org/Pyro/;
       license = licenses.mit;
       platforms = platforms.unix;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   });
 
@@ -9917,8 +9872,8 @@ let
     meta = {
       homepage = http://www.dalkescientific.om/Python/PyRSS2Gen.html;
       description = "Library for generating RSS 2.0 feeds";
-      license = stdenv.lib.licenses.bsd2;
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      license = licenses.bsd2;
+      maintainers = with maintainers; [ iElectric ];
     };
   });
 
@@ -9933,12 +9888,12 @@ let
 
     propagatedBuildInputs = with self; [ pyasn1 pycrypto ];
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = http://pysnmp.sf.net;
       description = "A pure-Python SNMPv1/v2c/v3 library";
       license = licenses.bsd2;
       platforms = platforms.all;
-      maintainers = [ maintainers.koral ];
+      maintainers = with maintainers; [ koral ];
     };
   };
 
@@ -9956,13 +9911,13 @@ let
     meta = {
       description = "SOCKS module for Python";
       license     = licenses.bsd3;
-      maintainers = [ maintainers.thoughtpolice ];
+      maintainers = with maintainers; [ thoughtpolice ];
     };
   };
 
   python_fedora = buildPythonPackage (rec {
     name = "python-fedora-0.3.33";
-    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+    meta.maintainers = with maintainers; [ mornfall ];
 
     src = pkgs.fetchurl {
       url = "https://fedorahosted.org/releases/p/y/python-fedora/${name}.tar.gz";
@@ -9992,7 +9947,7 @@ let
       sha256 = "18mhiwqq6vp65ykmi8x3i5l3gvrvrrr8z2kv11z1rpixmyr7sw1p";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Toolkit for safe and simple cryptography";
       homepage    = https://pypi.python.org/pypi/python-keyczar;
       license     = licenses.asl20;
@@ -10023,8 +9978,8 @@ let
     meta = {
       homepage = "http://pyudev.readthedocs.org/";
       description = "Pure Python libudev binding";
-      license = stdenv.lib.licenses.lgpl21Plus;
-      platforms = stdenv.lib.platforms.linux;
+      license = licenses.lgpl21Plus;
+      platforms = platforms.linux;
     };
   };
 
@@ -10040,8 +9995,8 @@ let
     meta = {
       homepage = http://github.com/ericflo/pynzb;
       description = "Unified API for parsing NZB files";
-      license = stdenv.lib.licenses.bsd3;
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ iElectric ];
     };
   });
 
@@ -10059,8 +10014,8 @@ let
     meta = {
       homepage = http://code.google.com/p/python-progressbar/;
       description = "Text progressbar library for python";
-      license = stdenv.lib.licenses.lgpl3Plus;
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      license = licenses.lgpl3Plus;
+      maintainers = with maintainers; [ iElectric ];
     };
   });
 
@@ -10094,7 +10049,7 @@ let
 
     meta = {
       description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them";
-      license = stdenv.lib.licenses.lgpl21Plus;
+      license = licenses.lgpl21Plus;
     };
   });
 
@@ -10121,11 +10076,11 @@ let
 
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Emacs Lisp to Python interface";
       homepage = http://pymacs.progiciels-bpi.ca;
       license = licenses.gpl2;
-      maintainers = [ maintainers.goibhniu ];
+      maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -10142,7 +10097,7 @@ let
     meta = {
       description = "Pure-Python PDF toolkit";
       homepage = "http://pybrary.net/pyPdf/";
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -10171,7 +10126,7 @@ let
         liberal BSD-style Open-Source license.
       '';
       license = "BSD-style";
-      platforms = stdenv.lib.platforms.mesaPlatforms;
+      platforms = platforms.mesaPlatforms;
     };
   };
 
@@ -10255,7 +10210,7 @@ let
     meta = {
       description = "A Scss compiler for Python";
       homepage = http://pyscss.readthedocs.org/en/latest/;
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -10271,7 +10226,7 @@ let
 
     meta = {
       homepage = "http://pyserial.sourceforge.net/";
-      license = stdenv.lib.licenses.psfl;
+      license = licenses.psfl;
       description = "Python serial port extension";
     };
   };
@@ -10452,7 +10407,7 @@ let
 
       homepage = http://allmydata.org/trac/pyutil;
 
-      license = stdenv.lib.licenses.gpl2Plus;
+      license = licenses.gpl2Plus;
     };
   });
 
@@ -10474,7 +10429,7 @@ let
     meta = {
       homepage = "https://code.google.com/p/pywebkitgtk/";
       description = "Python bindings for the WebKit GTK+ port";
-      license = stdenv.lib.licenses.lgpl2Plus;
+      license = licenses.lgpl2Plus;
     };
   };
 
@@ -10494,7 +10449,7 @@ let
 
     meta = {
       description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems";
-      license = stdenv.lib.licenses.lgpl21Plus;
+      license = licenses.lgpl21Plus;
     };
   });
 
@@ -10531,7 +10486,7 @@ let
     meta = {
       description = "The next generation YAML parser and emitter for Python";
       homepage = http://pyyaml.org;
-      license = stdenv.lib.licenses.free; # !?
+      license = licenses.free; # !?
     };
   });
 
@@ -10650,7 +10605,7 @@ let
     };
     meta = {
       homepage = https://github.com/pnpnpn/retry-decorator;
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -10668,7 +10623,7 @@ let
     meta = {
       description = "job queue server";
       homepage = "https://github.com/pediapress/qserve";
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -10781,12 +10736,12 @@ let
 
     propagatedBuildInputs = with self; [ docutils mock pygments ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "ReStructuredText viewer";
       homepage = http://mg.pov.lt/restview/;
       license = licenses.gpl2;
       platforms = platforms.all;
-      maintainers = [ maintainers.koral ];
+      maintainers = with maintainers; [ koral ];
     };
   };
 
@@ -10834,7 +10789,7 @@ let
       md5 = "9a267e9327feb3d021cae26002ba6e0e";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "ISO 8601 date/time parser";
       homepage = http://cheeseshop.python.org/pypi/isodate;
     };
@@ -10855,11 +10810,11 @@ let
       rm "$out/bin/"*.bat
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Test data generator for Robot Framework";
       homepage = https://github.com/mkorpela/RoboMachine;
       license = licenses.asl20;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -10876,12 +10831,12 @@ let
     # error: invalid command 'test'
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Generic test automation framework";
       homepage = http://robotframework.org/;
       license = licenses.asl20;
       platforms = platforms.linux;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -10900,7 +10855,7 @@ let
 
     propagatedBuildInputs = with self; [ robotframework selenium docutils decorator ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "";
       homepage = http://robotframework.org/;
       license = licenses.asl20;
@@ -10919,7 +10874,7 @@ let
 
     propagatedBuildInputs = with self; [ robotframework moretools pathpy six setuptools ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Python Tools for Robot Framework and Test Libraries";
       homepage = http://bitbucket.org/userzimmermann/robotframework-tools;
       license = licenses.gpl3;
@@ -10943,7 +10898,7 @@ let
     buildInputs = with self; [ unittest2 ];
     propagatedBuildInputs = with self; [ robotframework lxml ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Python unittest test suite for Robot Framework";
       homepage = http://github.com/collective/robotsuite/;
       license = licenses.gpl3;
@@ -10973,12 +10928,12 @@ let
     # error: invalid command 'test'
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Light-weight and intuitive editor for Robot Framework test case files";
       homepage = https://code.google.com/p/robotframework-ride/;
       license = licenses.asl20;
       platforms = platforms.linux;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -10994,10 +10949,10 @@ let
       sha256 = "0rdlvp8h74qs49wz1hx6qy8mgp2ddwlfs7z13h9139ynq04a3z7z";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "python refactoring library";
       homepage = http://rope.sf.net;
-      maintainers = [ maintainers.goibhniu ];
+      maintainers = with maintainers; [ goibhniu ];
       license = licenses.gpl2;
     };
   };
@@ -11013,10 +10968,10 @@ let
 
     propagatedBuildInputs = with self; [ ropemode ];
 
-     meta = with stdenv.lib; {
+     meta = {
        description = "a plugin for performing python refactorings in emacs";
        homepage = http://rope.sf.net/ropemacs.html;
-       maintainers = [ maintainers.goibhniu ];
+       maintainers = with maintainers; [ goibhniu ];
        license = licenses.gpl2;
      };
   };
@@ -11032,10 +10987,10 @@ let
 
     propagatedBuildInputs = with self; [ rope ];
 
-     meta = with stdenv.lib; {
+     meta = {
        description = "a plugin for performing python refactorings in emacs";
        homepage = http://rope.sf.net;
-       maintainers = [ maintainers.goibhniu ];
+       maintainers = with maintainers; [ goibhniu ];
        license = licenses.gpl2;
      };
   };
@@ -11060,7 +11015,7 @@ let
 
   rpkg = buildPythonPackage (rec {
     name = "rpkg-1.14";
-    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+    meta.maintainers = with maintainers; [ mornfall ];
 
     src = pkgs.fetchurl {
       url = "https://fedorahosted.org/releases/r/p/rpkg/rpkg-1.14.tar.gz";
@@ -11088,8 +11043,8 @@ let
     meta = {
       homepage = http://rpy.sourceforge.net/rpy2;
       description = "Python interface to R";
-      license = stdenv.lib.licenses.gpl2Plus;
-      maintainers = [ stdenv.lib.maintainers.joelmo ];
+      license = licenses.gpl2Plus;
+      maintainers = with maintainers; [ joelmo ];
     };
   };
 
@@ -11107,7 +11062,7 @@ let
     meta = {
       description = "Remote Python Call (RPyC), a transparent and symmetric RPC library";
       homepage = http://rpyc.readthedocs.org;
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -11123,7 +11078,7 @@ let
 
     meta = {
       homepage = http://stuvel.eu/rsa;
-      license = stdenv.lib.licenses.asl20;
+      license = licenses.asl20;
       description = "A pure-Python RSA implementation";
     };
   };
@@ -11137,7 +11092,7 @@ let
       md5 = "e36a453baddb97c19af6f79d5ba51f38";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Hierarchic visualization control for wxPython";
       homepage = https://launchpad.net/squaremap;
       license = licenses.bsd3;
@@ -11155,7 +11110,7 @@ let
 
     propagatedBuildInputs = [ self.squaremap self.wxPython28 ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "GUI Viewer for Python profiling runs";
       homepage = http://www.vrplumber.com/programming/runsnakerun/;
       license = licenses.bsd3;
@@ -11174,7 +11129,7 @@ let
     meta = {
       description = "A Python object API for managing the Linux LIO kernel target";
       homepage = "https://github.com/agrover/rtslib-fb";
-      platforms = stdenv.lib.platforms.linux;
+      platforms = platforms.linux;
     };
   };
 
@@ -11195,12 +11150,12 @@ let
     #   ERROR: Failure: OSError ([Errno 2] No such file or directory: '/tmp/nix-build-python2.7-seqdiag-0.9.0.drv-0/seqdiag-0.9.0/src/seqdiag/tests/diagrams/')
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)";
       homepage = http://blockdiag.com/;
       license = licenses.asl20;
       platforms = platforms.linux;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -11217,12 +11172,12 @@ let
 
     propagatedBuildInputs = [ modules.readline ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Powerful interactive network packet manipulation program";
       homepage = http://www.secdev.org/projects/scapy/;
       license = licenses.gpl2;
       platforms = platforms.linux;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -11279,7 +11234,7 @@ let
     meta = {
       description = "A set of python modules for machine learning and data mining";
       homepage = http://scikit-learn.org;
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -11395,7 +11350,7 @@ let
 
       homepage = http://code.google.com/p/simplejson/;
 
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   });
 
@@ -11410,11 +11365,11 @@ let
       sha256 = "1n8msk71lpl3kv086xr2sv68ppgz6228575xfnbszc6p1mwr64rg";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A Parser Generator for Python";
       homepage = https://pypi.python.org/pypi/SimpleParse;
       platforms = platforms.all;
-      maintainers = [ maintainers.DamienCassou ];
+      maintainers = with maintainers; [ DamienCassou ];
     };
   };
 
@@ -11428,11 +11383,11 @@ let
 
     propagatedBuildInputs = with self; [ jinja2 markdown pillow pilkit clint argh pytest ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Yet another simple static gallery generator";
       homepage = http://sigal.saimon.org/en/latest/index.html;
       license = licenses.mit;
-      maintainers = [ maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -11446,7 +11401,7 @@ let
 
     propagatedBuildInputs = with self; [ PyStemmer ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms";
       homepage = http://sigal.saimon.org/en/latest/index.html;
       license = licenses.bsd3;
@@ -11465,10 +11420,10 @@ let
 
     buildInputs = with self; [ modules.sqlite3 ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "sqlite-backed dictionary";
       homepage = "http://github.com/Yelp/sqlite3dbm";
-      license = stdenv.lib.licenses.asl20;
+      license = licenses.asl20;
     };
   };
 
@@ -11480,7 +11435,7 @@ let
       md5 = "040a451c8e63de3e61fc5b66efa7fca5";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Python library for parsing PGP packets";
       homepage = https://github.com/toofishes/python-pgpdump;
       license = licenses.bsd3;
@@ -11497,7 +11452,7 @@ let
 
     propagatedBuildInputs = with self; [ pydns lockfile ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Statistical anti-spam filter, initially based on the work of Paul Graham";
       homepage = http://spambayes.sourceforge.net/;
     };
@@ -11523,7 +11478,7 @@ let
 
     doCheck = false; # won't suceed for unknown reasons that look harmless, though
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Geometric objects, predicates, and operations";
       homepage = "https://pypi.python.org/pypi/Shapely/";
     };
@@ -11561,7 +11516,7 @@ let
     meta = {
       description = "parse english textual date descriptions";
       homepage = "https://github.com/pediapress/timelib/";
-      license = stdenv.lib.licenses.zlib;
+      license = licenses.zlib;
     };
   };
 
@@ -11593,7 +11548,7 @@ let
       export LANG="en_US.UTF-8"
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A Python library for symbolic mathematics";
       homepage    = http://www.sympy.org/;
       license     = licenses.bsd3;
@@ -11619,8 +11574,8 @@ let
 
     buildInputs = with self; [ pillow nose_progressive nose mock blessings ];
 
-    meta = with stdenv.lib; {
-      maintainers = [ maintainers.iElectric ];
+    meta = {
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -11638,8 +11593,8 @@ let
 
     buildInputs = with self; [ pillow nose_progressive nose mock blessings nose ];
 
-    meta = with stdenv.lib; {
-      maintainers = [ maintainers.iElectric ];
+    meta = {
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -11658,8 +11613,8 @@ let
 
     buildInputs = with self; [ pytest py mock pkgs.glibcLocales ];
 
-    meta = with stdenv.lib; {
-      maintainers = [ maintainers.iElectric ];
+    meta = {
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -11674,8 +11629,8 @@ let
     buildInputs = with self; [ pillow blessings nose ];
     propagatedBuildInputs = with self; [ modules.curses ];
 
-    meta = with stdenv.lib; {
-      maintainers = [ maintainers.iElectric ];
+    meta = {
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -11692,8 +11647,8 @@ let
 
     buildInputs = with self; [ nose modules.curses ];
 
-    meta = with stdenv.lib; {
-      maintainers = [ maintainers.iElectric ];
+    meta = {
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -11850,7 +11805,7 @@ let
     meta = {
       homepage = http://code.google.com/p/socksipy-branch/;
       description = "This Python module allows you to create TCP connections through a SOCKS proxy without any special effort";
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -11868,7 +11823,7 @@ let
     meta = {
       homepage = http://sorl-thumbnail.readthedocs.org/en/latest/;
       description = "Thumbnails for Django";
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -11924,7 +11879,7 @@ let
     meta = {
       homepage = https://pypi.python.org/pypi/subprocess32;
       description = "Backport of the subprocess module from Python 3.2.5 for use on 2.x";
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   };
 
@@ -11939,7 +11894,7 @@ let
 
     propagatedBuildInputs = with self; [ docutils jinja2 pygments sphinx_rtd_theme alabaster Babel snowballstemmer  six ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects";
       homepage = http://sphinx.pocoo.org/;
       license = licenses.bsd3;
@@ -11961,7 +11916,7 @@ let
       touch requirements.txt
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "ReadTheDocs.org theme for Sphinx, 2013 version";
       homepage = https://github.com/snide/sphinx_rtd_theme/;
       license = licenses.bsd3;
@@ -12160,7 +12115,7 @@ let
       sha256 = "1w6shyh7n139cp636sym0frdyiwybw1m7gd2l4s3d7xbaccf6qg5";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Non-validating SQL parser for Python";
       longDescription = ''
         Provides support for parsing, splitting and formatting SQL statements.
@@ -12263,11 +12218,11 @@ let
       echo '${setup}' > $sourceRoot/setup.py
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Tool for automatic download/upload subtitles for videofiles using fast hashing";
       homepage = http://www.subdownloader.net;
       license = licenses.gpl3;
-      maintainers = [ maintainers.DamienCassou ];
+      maintainers = with maintainers; [ DamienCassou ];
     };
   };
 
@@ -12358,7 +12313,7 @@ let
     meta = {
       description = "A command shell for managing the Linux LIO kernel target";
       homepage = "https://github.com/agrover/targetcli-fb";
-      platforms = stdenv.lib.platforms.linux;
+      platforms = platforms.linux;
     };
   };
 
@@ -12382,12 +12337,12 @@ let
     '';
 
 
-    meta = with stdenv.lib; {
+    meta = {
       description = " GTK3 & python based GUI for Syncthing ";
-      maintainers = [ maintainers.DamienCassou ];
+      maintainers = with maintainers; [ DamienCassou ];
       platforms = pkgs.syncthing.meta.platforms;
       homepage = "https://github.com/syncthing/syncthing-gtk";
-      license = stdenv.lib.licenses.gpl2;
+      license = licenses.gpl2;
     };
   };
 
@@ -12436,7 +12391,7 @@ let
     meta = {
       homepage = http://taskcoach.org/;
       description = "Todo manager to keep track of personal tasks and todo lists";
-      license = stdenv.lib.licenses.gpl3Plus;
+      license = licenses.gpl3Plus;
     };
   };
 
@@ -12463,7 +12418,7 @@ let
       description = "Python bindings for your taskwarrior database";
       license = licenses.gpl3Plus;
       platforms = platforms.all;
-      maintainers = [ maintainers.pierron ];
+      maintainers = with maintainers; [ pierron ];
     };
   };
 
@@ -12572,7 +12527,7 @@ let
       md5 = "4fe37704f16ecf424b91e122defedd7e";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A module to generate a formatted text table, using ASCII characters";
       homepage = http://foutaise.org/code/;
       license = licenses.lgpl2;
@@ -12591,7 +12546,7 @@ let
     meta = {
       description = "A pure Python implementation of SSL and TLS";
       homepage = https://pypi.python.org/pypi/tlslite;
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -12609,7 +12564,7 @@ let
     meta = {
       description = "Quick Response code generation for Python";
       home = "https://pypi.python.org/pypi/qrcode";
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -12625,7 +12580,7 @@ let
     meta = {
       description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information";
       homepage = http://pypi.python.org/pypi/tmdb3;
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
     };
   };
 
@@ -12645,7 +12600,7 @@ let
   smmap = buildPythonPackage rec {
     name = "smmap-0.8.2";
     disabled = isPy3k || isPyPy;  # next release will have py3k/pypy support
-    meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
+    meta.maintainers = with maintainers; [ mornfall ];
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/s/smmap/${name}.tar.gz";
@@ -12691,7 +12646,7 @@ let
     meta = {
       description = "Transaction management";
       homepage = http://pypi.python.org/pypi/transaction;
-      license = stdenv.lib.licenses.zpt20;
+      license = licenses.zpt20;
     };
   };
 
@@ -12709,7 +12664,7 @@ let
     meta = {
       description = "Python implementation of the Transmission bittorent client RPC protocol";
       homepage = http://pypi.python.org/pypi/transmissionrpc/;
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -12729,7 +12684,7 @@ let
      meta = {
        description = "A tool which computes a dependency graph between active Python eggs";
        homepage = http://thomas-lotze.de/en/software/eggdeps/;
-       license = stdenv.lib.licenses.zpt20;
+       license = licenses.zpt20;
      };
    };
 
@@ -12752,8 +12707,8 @@ let
       homepage = https://github.com/alejandrogomez/turses;
       description = "A Twitter client for the console";
       license = licenses.gpl3;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
-      platforms = stdenv.lib.platforms.linux;
+      maintainers = with maintainers; [ garbas ];
+      platforms = platforms.linux;
     };
   });
 
@@ -12770,8 +12725,8 @@ let
       homepage = "https://github.com/tweepy/tweepy";
       description = "Twitter library for python";
       license = licenses.mit;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
-      platforms = stdenv.lib.platforms.linux;
+      maintainers = with maintainers; [ garbas ];
+      platforms = platforms.linux;
     };
   });
 
@@ -12793,7 +12748,7 @@ let
       description = "Twiggy is the first totally new design for a logger since log4j";
       license     = licenses.bsd3;
       platforms = platforms.all;
-      maintainers = [ maintainers.pierron ];
+      maintainers = with maintainers; [ pierron ];
     };
   };
 
@@ -12811,7 +12766,7 @@ let
     meta = {
       description = "Twitter API library";
       license     = licenses.mit;
-      maintainers = [ maintainers.thoughtpolice ];
+      maintainers = with maintainers; [ thoughtpolice ];
     };
   };
 
@@ -12901,10 +12856,10 @@ let
     #buildInputs = with self; [ unittest2 ];
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Drop-in replacement for Python2's stdlib csv module, with unicode support";
       homepage = https://github.com/jdunck/python-unicodecsv;
-      maintainers = [ maintainers.koral ];
+      maintainers = with maintainers; [ koral ];
     };
   };
 
@@ -12946,7 +12901,7 @@ let
 
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A python module that will check for package updates";
       homepage = https://github.com/bboe/update_checker;
       license = licenses.bsd2;
@@ -12969,9 +12924,9 @@ let
 
     meta = {
       homepage = "urlgrabber.baseurl.org";
-      license = stdenv.lib.licenses.lgpl2Plus;
+      license = licenses.lgpl2Plus;
       description = "Python module for downloading files";
-      maintainers = [ stdenv.lib.maintainers.qknight ];
+      maintainers = with maintainers; [ qknight ];
     };
   };
 
@@ -12992,7 +12947,7 @@ let
       homepage = http://excess.org/urwid;
       repositories.git = git://github.com/wardi/urwid.git;
       license = licenses.lgpl21;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   });
 
@@ -13034,11 +12989,11 @@ let
 
     # XXX: Ran 0 tests in 0.003s
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "a tool to create isolated Python environments";
       homepage = http://www.virtualenv.org;
       license = licenses.mit;
-      maintainers = [ maintainers.goibhniu ];
+      maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13056,7 +13011,7 @@ let
     # needs tox to run the tests
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Script to clone virtualenvs";
       license = licenses.mit;
       platforms = platforms.all;
@@ -13139,11 +13094,8 @@ let
     doCheck = false;
 
     meta = {
-       maintainers = [
-         stdenv.lib.maintainers.garbas
-         stdenv.lib.maintainers.iElectric
-       ];
-       platforms = stdenv.lib.platforms.all;
+       maintainers = with maintainers; [ garbas iElectric ];
+       platforms = platforms.all;
     };
   };
 
@@ -13159,7 +13111,7 @@ let
     # error: invalid command 'test'
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       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;
@@ -13181,7 +13133,7 @@ let
     meta = {
       description = "Ctypes-based simple MagickWand API binding for Python";
       homepage = http://wand-py.org/;
-      platforms = stdenv.lib.platforms.all;
+      platforms = platforms.all;
     };
   };
 
@@ -13198,7 +13150,7 @@ let
     # Checks fail due to missing tox.ini file:
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Measures number of Terminal column cells of wide-character codes";
       longDescription = ''
         This API is mainly for Terminal Emulator implementors -- any Python
@@ -13226,7 +13178,7 @@ let
     meta = {
       description = "WSGI request and response object";
       homepage = http://pythonpaste.org/webob/;
-      platforms = stdenv.lib.platforms.all;
+      platforms = platforms.all;
     };
   };
 
@@ -13283,7 +13235,7 @@ let
     meta = {
       description = "Helper to test WSGI applications";
       homepage = http://webtest.readthedocs.org/en/latest/;
-      platforms = stdenv.lib.platforms.all;
+      platforms = platforms.all;
     };
   };
 
@@ -13319,7 +13271,7 @@ let
 
     propagatedBuildInputs = with pythonPackages; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname_3_4_0_2 ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "A simple, lightweight, open source, easy-to-use IRC utility bot, written in Python";
       homepage = http://willie.dftba.net/;
       license = licenses.efl20;
@@ -13339,7 +13291,7 @@ let
     meta = {
       description = "Some (mainly XMPP-related) additions to twisted";
       homepage = "http://wokkel.ik.nu/";
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   });
 
@@ -13355,11 +13307,8 @@ let
     propagatedBuildInputs = with self; [ six webob ];
 
     meta = {
-       maintainers = [
-         stdenv.lib.maintainers.garbas
-         stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.all;
+       maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -13420,7 +13369,7 @@ let
 
       homepage = http://python-xlib.sourceforge.net/;
 
-      license = stdenv.lib.licenses.gpl2Plus;
+      license = licenses.gpl2Plus;
     };
   });
 
@@ -13461,8 +13410,8 @@ let
     meta = {
       description = "Structured Configuration Library";
       homepage = http://pypi.python.org/pypi/ZConfig;
-      license = stdenv.lib.licenses.zpt20;
-      maintainers = [ stdenv.lib.maintainers.goibhniu ];
+      license = licenses.zpt20;
+      maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13479,8 +13428,8 @@ let
     meta = {
       description = "Inter-process locks";
       homepage =  http://www.python.org/pypi/zc.lockfile;
-      license = stdenv.lib.licenses.zpt20;
-      maintainers = [ stdenv.lib.maintainers.goibhniu ];
+      license = licenses.zpt20;
+      maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13502,8 +13451,8 @@ let
     meta = {
       description = "A daemon process control library and tools for Unix-based systems";
       homepage = http://pypi.python.org/pypi/zdaemon;
-      license = stdenv.lib.licenses.zpt20;
-      maintainers = [ stdenv.lib.maintainers.goibhniu ];
+      license = licenses.zpt20;
+      maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13534,7 +13483,7 @@ let
         and Haskell API.
       '';
 
-      license = stdenv.lib.licenses.gpl2Plus;
+      license = licenses.gpl2Plus;
     };
   });
 
@@ -13553,8 +13502,8 @@ let
     meta = {
       description = "An object-oriented database for Python";
       homepage = http://pypi.python.org/pypi/ZODB3;
-      license = stdenv.lib.licenses.zpt20;
-      maintainers = [ stdenv.lib.maintainers.goibhniu ];
+      license = licenses.zpt20;
+      maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13580,8 +13529,8 @@ let
     meta = {
       description = "An object-oriented database for Python";
       homepage = http://pypi.python.org/pypi/ZODB;
-      license = stdenv.lib.licenses.zpt20;
-      maintainers = [ stdenv.lib.maintainers.goibhniu ];
+      license = licenses.zpt20;
+      maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13597,7 +13546,7 @@ let
     # fails..
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = http://pypi.python.org/pypi/zodbpickle;
     };
   };
@@ -13615,7 +13564,7 @@ let
       md5 = "7f5df4cf8dd50fb0c584c0929a406c92";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "scalable persistent components";
       homepage = http://packages.python.org/BTrees;
     };
@@ -13632,7 +13581,7 @@ let
       md5 = "2942f1ca7764b1bef8d48fa0d9a236b7";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "automatic persistence for Python objects";
       homepage = http://www.zope.org/Products/ZODB;
     };
@@ -13648,7 +13597,7 @@ let
 
     propagatedBuildInputs = with self; [ pygtk pygobject pkgs.graphviz ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot";
       homepage = https://github.com/jrfonseca/xdot.py;
       license = licenses.lgpl3Plus;
@@ -13666,7 +13615,7 @@ let
     buildInputs = with self; [ zope_interface ];
 
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+        maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13682,7 +13631,7 @@ let
     propagatedBuildInputs = with self; [ zope_interface ];
 
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+        maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13722,7 +13671,7 @@ let
     doCheck = false;
 
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+        maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13738,7 +13687,7 @@ let
     propagatedBuildInputs = with self; [ zope_i18nmessageid zope_schema ];
 
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+        maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13761,7 +13710,7 @@ let
     ];
 
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+        maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13775,7 +13724,7 @@ let
     };
 
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+        maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13788,7 +13737,7 @@ let
       md5 = "62d639f75b31d2d864fe5982cb23959c";
     };
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+        maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13805,8 +13754,8 @@ let
     meta = {
       description = "An event publishing system";
       homepage = http://pypi.python.org/pypi/zope.event;
-      license = stdenv.lib.licenses.zpt20;
-      maintainers = [ stdenv.lib.maintainers.goibhniu ];
+      license = licenses.zpt20;
+      maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13825,8 +13774,8 @@ let
      meta = {
        description = "Exception interfaces and implementations";
        homepage = http://pypi.python.org/pypi/zope.exceptions;
-       license = stdenv.lib.licenses.zpt20;
-       maintainers = [ stdenv.lib.maintainers.goibhniu ];
+       license = licenses.zpt20;
+       maintainers = with maintainers; [ goibhniu ];
      };
    };
 
@@ -13842,7 +13791,7 @@ let
     propagatedBuildInputs = with self; [ zope_schema ];
 
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+        maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13858,7 +13807,7 @@ let
     propagatedBuildInputs = with self; [ pytz zope_component ];
 
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+        maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13872,7 +13821,7 @@ let
     };
 
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+        maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13888,7 +13837,7 @@ let
     propagatedBuildInputs = with self; [ zope_event zope_component ];
 
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+        maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13911,7 +13860,7 @@ let
     doCheck = false;
 
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+        maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13927,7 +13876,7 @@ let
     propagatedBuildInputs = with self; [ zope_interface ];
 
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+        maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13945,7 +13894,7 @@ let
     ];
 
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+        maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13961,7 +13910,7 @@ let
     propagatedBuildInputs = with self; [ zope_location zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict;
 
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+        maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13980,7 +13929,7 @@ let
     ];
 
     meta = {
-      maintainers = [ stdenv.lib.maintainers.goibhniu ];
+      maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -13996,7 +13945,7 @@ let
     propagatedBuildInputs = with self; [ zope_i18nmessageid zope_interface ];
 
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+        maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -14015,11 +13964,8 @@ let
     propagatedBuildInputs = with self; [ sqlalchemy9 transaction ];
 
     meta = {
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -14040,8 +13986,8 @@ let
     meta = {
       description = "Zope testing helpers";
       homepage =  http://pypi.python.org/pypi/zope.testing;
-      license = stdenv.lib.licenses.zpt20;
-      maintainers = [ stdenv.lib.maintainers.goibhniu ];
+      license = licenses.zpt20;
+      maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -14062,8 +14008,8 @@ let
     meta = {
       description = "A flexible test runner with layer support";
       homepage = http://pypi.python.org/pypi/zope.testrunner;
-      license = stdenv.lib.licenses.zpt20;
-      maintainers = [ stdenv.lib.maintainers.goibhniu ];
+      license = licenses.zpt20;
+      maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -14082,7 +14028,7 @@ let
     doCheck = false;
 
     meta = {
-        maintainers = [ stdenv.lib.maintainers.goibhniu ];
+        maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -14100,8 +14046,8 @@ let
     meta = {
       description = "Zope.Interface";
       homepage = http://zope.org/Products/ZopeInterface;
-      license = stdenv.lib.licenses.zpt20;
-      maintainers = [ stdenv.lib.maintainers.goibhniu ];
+      license = licenses.zpt20;
+      maintainers = with maintainers; [ goibhniu ];
     };
   };
 
@@ -14140,7 +14086,7 @@ let
     meta = {
       homepage = http://liw.fi/cliapp/;
       description = "Python framework for Unix command line programs";
-      maintainers = [ stdenv.lib.maintainers.rickynils ];
+      maintainers = with maintainers; [ rickynils ];
     };
   };
 
@@ -14195,7 +14141,7 @@ let
     meta = {
       description = "A Toolkit for the Tornado Web Framework";
       homepage = http://github.com/multoncore/tornadokick;
-      license = stdenv.lib.licenses.asl20;
+      license = licenses.asl20;
     };
   };
 
@@ -14222,11 +14168,11 @@ let
         sha256 = "eb754917e98e03cb9d528eb5f57a08c88fa7a8172f92325a9fe796b2daf14db0";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://github.com/scs3jb/screenkey;
       description = "A screencast tool to show your keys";
-      license = stdenv.lib.licenses.gpl3Plus;
-      maintainers = [ maintainers.DamienCassou ];
+      license = licenses.gpl3Plus;
+      maintainers = with maintainers; [ DamienCassou ];
       platforms = platforms.linux;
     };
   };
@@ -14279,7 +14225,7 @@ let
     buildInputs = with self; [ mock unittest2 ];
     propagatedBuildInputs = with self; [ requests ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Python library for the BrowserID Protocol";
       homepage    = "https://github.com/mozilla/PyBrowserID";
       license     = licenses.mpl20;
@@ -14315,7 +14261,7 @@ let
 
     meta = {
       maintainers = [ ];
-      platforms = stdenv.lib.platforms.all;
+      platforms = platforms.all;
     };
   };
 
@@ -14330,11 +14276,8 @@ let
     propagatedBuildInputs = with self; [ pep8 ];
 
     meta = {
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -14356,7 +14299,7 @@ let
     meta = {
       homepage = http://liw.fi/tracing/;
       description = "Python debug logging helper";
-      maintainers = [ stdenv.lib.maintainers.rickynils ];
+      maintainers = with maintainers; [ rickynils ];
     };
   };
 
@@ -14369,11 +14312,8 @@ let
     };
 
     meta = {
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -14396,7 +14336,7 @@ let
     meta = {
       homepage = http://liw.fi/ttystatus/;
       description = "Progress and status updates on terminals for Python";
-      maintainers = [ stdenv.lib.maintainers.rickynils ];
+      maintainers = with maintainers; [ rickynils ];
     };
   };
 
@@ -14418,7 +14358,7 @@ let
     meta = {
       homepage = http://liw.fi/larch/;
       description = "Python B-tree library";
-      maintainers = [ stdenv.lib.maintainers.rickynils ];
+      maintainers = with maintainers; [ rickynils ];
     };
   };
 
@@ -14455,11 +14395,8 @@ let
     doCheck = false;
 
     meta = {
-      maintainers = [
-        stdenv.lib.maintainers.garbas
-        stdenv.lib.maintainers.iElectric
-      ];
-      platforms = stdenv.lib.platforms.all;
+      maintainers = with maintainers; [ garbas iElectric ];
+      platforms = platforms.all;
     };
   };
 
@@ -14475,7 +14412,7 @@ let
     # error: invalid command 'test'
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = http://graphite.wikidot.com/;
       description = "Fixed size round-robin style database";
       maintainers = with maintainers; [ rickynils offline ];
@@ -14496,7 +14433,7 @@ let
     # error: invalid command 'test'
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = http://graphite.wikidot.com/;
       description = "Backend data caching and persistence daemon for Graphite";
       maintainers = with maintainers; [ rickynils offline ];
@@ -14534,7 +14471,7 @@ let
       homepage = http://pypi.python.org/pypi/Unidecode/;
       description = "ASCII transliterations of Unicode text";
       license = licenses.gpl2;
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
+      maintainers = with maintainers; [ iElectric ];
     };
   };
 
@@ -14554,11 +14491,11 @@ let
       sed -i -e "s|libname = .*|libname = \"$libusb\"|" usb/backend/libusb1.py
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Python USB access module (wraps libusb 1.0)";  # can use other backends
       homepage = http://pyusb.sourceforge.net/;
       license = "BSD";
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -14578,7 +14515,7 @@ let
       description = "Python implementation of the USBTMC instrument control protocol";
       homepage = http://alexforencich.com/wiki/en/python-usbtmc/start;
       license = licenses.mit;
-      maintainers = [ maintainers.bjornfor ];
+      maintainers = with maintainers; [ bjornfor ];
     };
   };
 
@@ -14597,7 +14534,7 @@ let
     meta = {
       homepage = https://launchpad.net/txamqp;
       description = "Library for communicating with AMQP peers and brokers using Twisted";
-      maintainers = [ stdenv.lib.maintainers.rickynils ];
+      maintainers = with maintainers; [ rickynils ];
     };
   };
 
@@ -14638,7 +14575,7 @@ let
     # error: invalid command 'test'
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = http://graphite.wikidot.com/;
       description = "Enterprise scalable realtime graphing";
       maintainers = with maintainers; [ rickynils offline ];
@@ -14726,7 +14663,7 @@ let
     meta = {
       description = "A simple alerting application for Graphite metrics";
       homepage = https://github.com/seatgeek/graphite-pager;
-      maintainers = [ maintainers.offline ];
+      maintainers = with maintainers; [ offline ];
       license = licenses.bsd2;
     };
   };
@@ -14761,7 +14698,7 @@ let
     # There are no tests
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage    = http://pyspotify.mopidy.com;
       description = "A Python interface to Spotify’s online music streaming service";
       license     = licenses.unfree;
@@ -14784,10 +14721,10 @@ let
     # There are no tests
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = http://www.pykka.org;
       description = "A Python implementation of the actor model";
-      maintainers = [ maintainers.rickynils ];
+      maintainers = with maintainers; [ rickynils ];
     };
   };
 
@@ -14813,7 +14750,7 @@ let
     meta = {
       homepage = https://ws4py.readthedocs.org;
       description = "A WebSocket package for Python";
-      maintainers = [ stdenv.lib.maintainers.rickynils ];
+      maintainers = with maintainers; [ rickynils ];
     };
   };
 
@@ -14896,7 +14833,7 @@ let
     meta = {
       homepage = http://www.libvirt.org/;
       description = "libvirt Python bindings";
-      license = pkgs.lib.licenses.lgpl2;
+      license = licenses.lgpl2;
     };
   };
 
@@ -14914,8 +14851,8 @@ let
     meta = {
       homepage = https://github.com/asciimoo/searx;
       description = "A privacy-respecting, hackable metasearch engine";
-      license = stdenv.lib.licenses.agpl3Plus;
-      maintainers = [ stdenv.lib.maintainers.matejc ];
+      license = licenses.agpl3Plus;
+      maintainers = with maintainers; [ matejc ];
     };
   };
 
@@ -14934,7 +14871,7 @@ let
       description = "Asynchronous HTTP requests";
       homepage = https://github.com/kennethreitz/grequests;
       license = "bsd";
-      maintainers = [ stdenv.lib.maintainers.matejc ];
+      maintainers = with maintainers; [ matejc ];
     };
   };
 
@@ -14952,7 +14889,7 @@ let
       description = "Adds i18n/l10n support to Flask applications";
       homepage = https://github.com/mitsuhiko/flask-babel;
       license = "bsd";
-      maintainers = [ stdenv.lib.maintainers.matejc ];
+      maintainers = with maintainers; [ matejc ];
     };
   };
 
@@ -14968,7 +14905,7 @@ let
       description = "implements a lazy string for python useful for use with gettext";
       homepage = https://github.com/mitsuhiko/speaklater;
       license = "bsd";
-      maintainers = [ stdenv.lib.maintainers.matejc ];
+      maintainers = with maintainers; [ matejc ];
     };
   };
 
@@ -14995,7 +14932,7 @@ let
     meta = {
       description = "Cross-platform system power status information";
       homepage = https://github.com/Kentzo/Power;
-      license = stdenv.lib.licenses.mit;
+      license = licenses.mit;
     };
   };
 
@@ -15022,11 +14959,11 @@ let
     # tests require dbusmock
     doCheck = false;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Removable disk automounter for udisks";
       license = licenses.mit;
       homepage = https://github.com/coldfix/udiskie;
-      maintainers = [ maintainers.AndersonTorres ];
+      maintainers = with maintainers; [ AndersonTorres ];
     };
   };
 
@@ -15044,9 +14981,9 @@ let
     meta = {
       description = "Python bindings for EFL and Elementary";
       homepage = http://enlightenment.org/;
-      maintainers = [ stdenv.lib.maintainers.matejc stdenv.lib.maintainers.tstrobel ];
-      platforms = stdenv.lib.platforms.linux;
-      license = stdenv.lib.licenses.gpl3;
+      maintainers = with maintainers; [ matejc tstrobel ];
+      platforms = platforms.linux;
+      license = licenses.gpl3;
     };
   };
 
@@ -15060,9 +14997,9 @@ let
     meta = {
       description = "A topological sort algorithm";
       homepage = https://pypi.python.org/pypi/toposort/1.1;
-      maintainers = [ stdenv.lib.maintainers.tstrobel ];
-      platforms = stdenv.lib.platforms.linux;
-      #license = stdenv.lib.licenses.apache;
+      maintainers = with maintainers; [ tstrobel ];
+      platforms = platforms.linux;
+      #license = licenses.apache;
     };
   };
 
@@ -15084,7 +15021,7 @@ let
       homepage = https://github.com/ricardomv/snapper-gui;
       description = "Graphical frontend for snapper";
       license = licenses.gpl2;
-      maintainers = [ stdenv.lib.maintainers.tstrobel ];
+      maintainers = with maintainers; [ tstrobel ];
     };
   };
 
@@ -15106,7 +15043,7 @@ let
       homepage = http://rednotebook.sourceforge.net/index.html;
       description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds";
       license = licenses.gpl2;
-      maintainers = [ stdenv.lib.maintainers.tstrobel ];
+      maintainers = with maintainers; [ tstrobel ];
     };
   };
 
@@ -15157,10 +15094,10 @@ let
         sha256 = "694e29aa67d03a6ab006f1854740b65f4f87e581afb33853f80e647ddb5f24e7";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Collection of fancy functional tools focused on practicality";
       homepage = "http://funcy.readthedocs.org/";
-      license = stdenv.lib.licenses.bsd3;
+      license = licenses.bsd3;
 
     };
   };
@@ -15191,7 +15128,7 @@ let
     meta = {
       homepage = https://developers.google.com/storage/docs/gspythonlibrary;
       description = "Provides OAuth 2.0 credentials that can be used with Google Cloud Storage";
-      license = stdenv.lib.licenses.asl20;
+      license = licenses.asl20;
     };
   };
 
@@ -15202,7 +15139,7 @@ let
       homepage = https://developers.google.com/storage/docs/gsutil;
       description = "Google Cloud Storage Tool";
       maintainers = [ "Russell O'Connor <oconnorr@google.com>" ];
-      license = stdenv.lib.licenses.asl20;
+      license = licenses.asl20;
     };
     doCheck = false;
 
@@ -15231,7 +15168,7 @@ let
     meta = {
       homepage = https://github.com/garbas/pypi2nix;
       description = "";
-      maintainers = [ pkgs.stdenv.lib.maintainers.garbas ];
+      maintainers = with maintainers; [ garbas ];
     };
   };
 
@@ -15250,8 +15187,8 @@ let
     meta = {
       homepage = https://github.com/kjellmf/svg2tikz;
       description = "An SVG to TikZ converter";
-      license = stdenv.lib.licenses.gpl2Plus;
-      maintainers =  with pkgs.stdenv.lib.maintainers; [gal_bolle];
+      license = licenses.gpl2Plus;
+      maintainers =  with maintainers; [ gal_bolle ];
     };
   };
 
@@ -15274,7 +15211,7 @@ let
 
     meta = {
       maintainers = [ ];
-      platforms = stdenv.lib.platforms.all;
+      platforms = platforms.all;
     };
   };
 
@@ -15366,12 +15303,12 @@ let
       sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py
     '';
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Python Wrapper for Mac OS 10.8 Notification Center";
       homepage    = https://pypi.python.org/pypi/pync/1.4;
       license     = licenses.mit;
       platforms   = platforms.darwin;
-      maintainers = [ maintainers.lovek323 ];
+      maintainers = with maintainers; [ lovek323 ];
     };
   };
 
@@ -15391,8 +15328,8 @@ let
     meta = {
       homepage = http://weboob.org;
       description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser";
-      license = stdenv.lib.licenses.agpl3;
-      maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+      license = licenses.agpl3;
+      maintainers = with maintainers; [ DamienCassou ];
     };
   };
 
@@ -15407,7 +15344,7 @@ let
 
     buildInputs = with self; [ nose ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "DataDiff";
       homepage = http://sourceforge.net/projects/datadiff/;
       license = licenses.asl20;
@@ -15423,7 +15360,7 @@ let
       md5 = "043e89644f8909d462fbbfa511c768df";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Termcolor";
       homepage = http://pypi.python.org/pypi/termcolor;
       license = licenses.mit;
@@ -15441,7 +15378,7 @@ let
 
     propagatedBuildInputs = with pythonPackages; [  ];
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://github.com/Alir3z4/html2text/;
     };
   };
@@ -15455,7 +15392,7 @@ let
       sha256 = "882650928776a7ca72e67054a9e0ac98f78645f279c0cfb5910db28f03f07c2e";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Library for creating high quality encapsulated Postscript, PDF, PNG, or SVG charts";
       homepage = http://home.gna.org/pychart/;
       license = licenses.gpl2;
@@ -15531,7 +15468,7 @@ let
         coastlines, lakes, rivers and political boundaries. See
         http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do.
       '';
-      licences = [ licenses.mit licenses.gpl2 ];
+      license = with licenses; [ mit gpl2 ];
     };
   };
 
@@ -15545,7 +15482,7 @@ let
 
     propagatedBuildInputs = with self; [  ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Summary";
       homepage = https://github.com/quandyfactory/dicttoxml;
     };
@@ -15561,7 +15498,7 @@ let
       sha256 = "073zyx3caqa9zlzxa82k9k2nhhn8c5imqpgp5nwqnh0fgaj9pqn8";
     };
     propagatedBuildInputs = with self; [];
-    meta = with stdenv.lib; {
+    meta = {
       description = "A fast and complete Python implementation of Markdown";
       homepage =  https://github.com/trentm/python-markdown2;
       license = licenses.mit;
@@ -15582,7 +15519,7 @@ let
 
      propagatedBuildInputs = with self; [ oauth2 ];
 
-     meta = with stdenv.lib; {
+     meta = {
       description = "Evernote SDK for Python";
       homepage = http://dev.evernote.com;
       license = licenses.asl20;
@@ -15599,7 +15536,7 @@ let
       sha256 = "1yla6wg18x2a0l0lrvkp1v464hqhff98ck8pnv8d5j9kn3j6bxh8";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Python bindings for the Apache Thrift RPC system";
       homepage = http://thrift.apache.org/;
       license = licenses.asl20;
@@ -15633,7 +15570,7 @@ let
         evernote
     ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Work with Evernote from command line";
       homepage = http://www.geeknote.me;
       license = licenses.gpl1;

From 002c687edf9a7aca64660f3ef67db88b0ad46c85 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Tue, 26 May 2015 11:05:52 +0100
Subject: [PATCH 0248/2322] nova-image: Delete no longer used comment

---
 nixos/modules/virtualisation/nova-image.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/modules/virtualisation/nova-image.nix b/nixos/modules/virtualisation/nova-image.nix
index 9738552774d..20ec6b024e9 100644
--- a/nixos/modules/virtualisation/nova-image.nix
+++ b/nixos/modules/virtualisation/nova-image.nix
@@ -108,9 +108,6 @@ with lib;
     boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
     */
 
-  # Since Nova allows VNC access to instances, it's nice to start to
-  # start a few virtual consoles.
-
   # Allow root logins only using the SSH key that the user specified
   # at instance creation time.
   services.openssh.enable = true;

From d2b906c771917148df29969b2b1cc9bb33207650 Mon Sep 17 00:00:00 2001
From: Alexander Flatter <flatter@fastmail.fm>
Date: Tue, 24 Mar 2015 11:03:07 +0100
Subject: [PATCH 0249/2322] Add heroku-client

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

diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
new file mode 100644
index 00000000000..d9767ee166c
--- /dev/null
+++ b/pkgs/development/tools/heroku/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, postgresql, ruby }:
+
+stdenv.mkDerivation rec {
+  version = "3.30.3";
+  name = "heroku-${version}";
+
+  src = fetchurl {
+    url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz";
+    sha256 = "0m9l04syli4ripkh37lwk0hq4silnp830ddsk3ph77iymzh2iz1f";
+  };
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R * $out/
+  '';
+
+  buildInputs = [ ruby postgresql ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 888b8bea781..cda6163037f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5287,6 +5287,8 @@ let
     inherit (perlPackages) LocaleGettext;
   };
 
+  heroku = callPackage ../development/tools/heroku { };
+
   hyenae = callPackage ../tools/networking/hyenae { };
 
   icmake = callPackage ../development/tools/build-managers/icmake { };

From be71c0871c7edebc72367b1ce1f95ea10af609df Mon Sep 17 00:00:00 2001
From: Alexander Flatter <flatter@fastmail.fm>
Date: Tue, 28 Apr 2015 17:02:33 +0200
Subject: [PATCH 0250/2322] Add meta information to heroku toolbelt

---
 lib/maintainers.nix                       | 2 ++
 pkgs/development/tools/heroku/default.nix | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0d42ca79987..bbd89c74eb7 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -8,6 +8,7 @@
   abaldeau = "Andreas Baldeau <andreas@baldeau.net>";
   abbradar = "Nikolay Amiantov <ab@fmap.me>";
   aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
+  aflatter = "Alexander Flatter <flatter@fastmail.fm>";
   aherrmann = "Andreas Herrmann <andreash87@gmx.ch>";
   ak = "Alexander Kjeldaas <ak@formalprivacy.com>";
   akc = "Anders Claesson <akc@akc.is>";
@@ -134,6 +135,7 @@
   meditans = "Carlo Nucera <meditans@gmail.com>";
   meisternu = "Matt Miemiec <meister@krutt.org>";
   michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";
+  mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";
   mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>";
   modulistic = "Pablo Costa <modulistic@gmail.com>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index d9767ee166c..a160e44b9ac 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -1,9 +1,17 @@
 { stdenv, fetchurl, postgresql, ruby }:
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
   version = "3.30.3";
   name = "heroku-${version}";
 
+  meta = {
+    homepage = "https://toolbelt.heroku.com";
+    description = "Everything you need to get started using Heroku";
+    maintainers = with maintainers; [ aflatter mirdhyn ];
+    license = licenses.mit;
+  };
+
   src = fetchurl {
     url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz";
     sha256 = "0m9l04syli4ripkh37lwk0hq4silnp830ddsk3ph77iymzh2iz1f";

From 7d9724057ca7c37a2dba246b48fc02a3c1329b79 Mon Sep 17 00:00:00 2001
From: Alexander Flatter <flatter@fastmail.fm>
Date: Tue, 28 Apr 2015 17:03:48 +0200
Subject: [PATCH 0251/2322] Update heroku toolbelt to 3.32.0

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

diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index a160e44b9ac..df5f6454f6d 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -2,7 +2,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  version = "3.30.3";
+  version = "3.32.0";
   name = "heroku-${version}";
 
   meta = {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz";
-    sha256 = "0m9l04syli4ripkh37lwk0hq4silnp830ddsk3ph77iymzh2iz1f";
+    sha256 = "1596zmnlwshx15xiccfskm71syrlm87jf40y2x0y7wn0vfcyis5s";
   };
 
   installPhase = ''

From a6724ddd5663b154f4249e1720d495b990560ad7 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 26 May 2015 14:38:50 +0200
Subject: [PATCH 0252/2322] ccrtp: mark version 1.8 as broken (not compatible
 with libgcrypt >= 1.6)

closes #7855
---
 pkgs/development/libraries/ccrtp/1.8.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix
index 5105bd29876..5574e18ffa0 100644
--- a/pkgs/development/libraries/ccrtp/1.8.nix
+++ b/pkgs/development/libraries/ccrtp/1.8.nix
@@ -18,5 +18,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
+    broken = true; # fails to compile with libgcrypt >= 1.6
   };
 }

From 5f92dcce3693c1d54dc8501c162c1093dd1c685e Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Tue, 26 May 2015 15:12:40 +0200
Subject: [PATCH 0253/2322] Update offlineimap 6.5.6 -> 6.5.7

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

diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 2a100fd2873..298e2251368 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,13 +1,13 @@
 { pkgs, fetchurl, buildPythonPackage, sqlite3 }:
 
 buildPythonPackage rec {
-  version = "6.5.6";
+  version = "6.5.7";
   name = "offlineimap-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz";
-    sha256 = "1hr8yxb6r8lmdzzly4hafa1l1z9pfx14rsgc8qiy2zxfpg6ijcn2";
+    sha256 = "18whwc4f8nk8gi3mjw9153c9cvwd3i9i7njmpdbhcplrv33m5pmp";
   };
 
   doCheck = false;

From c3b7a8b053bc08c82dd8a312fda769110b3ab578 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Mon, 25 May 2015 17:40:16 +0200
Subject: [PATCH 0254/2322] add das_watchdog: a realtime watchdog

---
 nixos/modules/module-list.nix                 |  1 +
 .../services/monitoring/das_watchdog.nix      | 34 +++++++++++++++++++
 pkgs/tools/system/das_watchdog/default.nix    | 32 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 69 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/das_watchdog.nix
 create mode 100644 pkgs/tools/system/das_watchdog/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index cd679f8e93c..9a5aaf108ec 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -222,6 +222,7 @@
   ./services/monitoring/bosun.nix
   ./services/monitoring/cadvisor.nix
   ./services/monitoring/collectd.nix
+  ./services/monitoring/das_watchdog.nix
   ./services/monitoring/dd-agent.nix
   ./services/monitoring/graphite.nix
   ./services/monitoring/monit.nix
diff --git a/nixos/modules/services/monitoring/das_watchdog.nix b/nixos/modules/services/monitoring/das_watchdog.nix
new file mode 100644
index 00000000000..785b4289dff
--- /dev/null
+++ b/nixos/modules/services/monitoring/das_watchdog.nix
@@ -0,0 +1,34 @@
+# A general watchdog for the linux operating system that should run in the
+# background at all times to ensure a realtime process won't hang the machine
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  inherit (pkgs) das_watchdog;
+
+in {
+  ###### interface
+
+  options = {
+    services.das_watchdog.enable = mkEnableOption "Whether to enable realtime watchdog";
+  };
+
+  ###### implementation
+
+  config = mkIf config.services.das_watchdog.enable {
+    environment.systemPackages = [ das_watchdog ];
+    systemd.services.das_watchdog = {
+      description = "Watchdog to ensure a realtime process won't hang the machine";
+      after = [ "multi-user.target" "sound.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        User = "root";
+        Type = "oneshot";
+        ExecStart = "${das_watchdog}/bin/das_watchdog";
+        RemainAfterExit = true;
+      };
+    };
+  };
+}
diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix
new file mode 100644
index 00000000000..465ae48063b
--- /dev/null
+++ b/pkgs/tools/system/das_watchdog/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, libgtop, xmessage, which, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "das_watchdog-${version}";
+  version = "git-2015-04-02";
+
+  src = fetchgit {
+    url = "https://github.com/kmatheussen/das_watchdog.git";
+    rev = "1c203d9a55455c4670c164f945ea2dd9fd197ba9";
+    sha256 = "c817491d67d31297dcd6177b9c33b5c3977c1c383eac588026631dd6961ba6bf";
+  };
+
+  buildInputs = [ libgtop xmessage which pkgconfig ];
+
+  installPhase = ''
+    mkdir -p $out/bin/
+    cp das_watchdog $out/bin/
+    cp test_rt $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/kmatheussen/das_watchdog;
+    description = "A general watchdog for the linux operating system";
+    longDescription = ''
+      It should run in the background at all times to ensure a realtime process
+      won't hang the machine.";
+    '';
+    license = licenses.free;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3201bd5f851..3fe8b5be321 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10595,6 +10595,8 @@ let
     inherit (gnome) GConf libglade;
   };
 
+  das_watchdog = callPackage ../tools/system/das_watchdog { };
+
   dbvisualizer = callPackage ../applications/misc/dbvisualizer {};
 
   dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; };

From aa1ce46281005c7f08f7f2a286a3606298d0d27a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <ikervagyok@gmail.com>
Date: Thu, 21 May 2015 19:16:26 +0200
Subject: [PATCH 0255/2322] Inital commit for Darkice

---
 lib/maintainers.nix                  |  1 +
 pkgs/tools/audio/darkice/default.nix | 33 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 3 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/audio/darkice/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index bf1e1bba1c8..5f7dc6f7796 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -98,6 +98,7 @@
   iand675 = "Ian Duncan <ian@iankduncan.com>";
   ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
   iElectric = "Domen Kozar <domen@dev.si>";
+  ikervagyok = "Balázs Lengyel <ikervagyok@gmail.com>";
   iyzsong = "Song Wenwu <iyzsong@gmail.com>";
   j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>";
   jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>";
diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix
new file mode 100644
index 00000000000..8a9393cd1f6
--- /dev/null
+++ b/pkgs/tools/audio/darkice/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, alsaLib, faac, jack2, lame, libopus, libpulseaudio, libsamplerate, libvorbis }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "darkice-${version}";
+  version = "1.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/darkice/${version}/darkice-${version}.tar.gz";
+    sha256 = "0m5jzmja7a9x15zl1634bhxrg3rccph9rkar0rmz6wlw5nzakyxk";
+  };
+
+  configureFlags = [
+    "--with-alsa-prefix=${alsaLib}"
+    "--with-faac-prefix=${faac}"
+    "--with-jack-prefix=${jack2}"
+    "--with-lame-prefix=${lame}"
+    "--with-opus-prefix=${libopus}"
+    "--with-pulseaudio-prefix=${libpulseaudio}"
+    "--with-samplerate-prefix=${libsamplerate}"	
+    "--with-vorbis-prefix=${libvorbis}"
+#    "--with-aacplus-prefix=${aacplus}" ### missing: aacplus
+#    "--with-twolame-prefix=${twolame}" ### missing: twolame
+  ];
+
+  meta = {
+    homepage = http://darkice.org/;
+    description = "Live audio streamer";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ ikervagyok ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b43fb9c7896..0a9d729f2e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1759,6 +1759,8 @@ let
 
   icecast = callPackage ../servers/icecast { };
 
+  darkice = callPackage ../tools/audio/darkice { };
+
   icoutils = callPackage ../tools/graphics/icoutils { };
 
   idutils = callPackage ../tools/misc/idutils { };

From 184682d4d3ad66960c4025c92732ac25d3e1f8f9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 26 May 2015 16:20:52 +0200
Subject: [PATCH 0256/2322] python-packages: pgcli 0.16.3 -> 0.17.0

New features:
- Add support for auto-completing view names
- Add support for building RPM and DEB packages
- Add subsequence matching for completion
- Completion for built-in tables and temporary tables are suggested after
  entering a prefix of pg_
- Add place holder doc strings for special commands that are planned for
  implementation
- Updated version of prompt_toolkit, now matching braces are highlighted
- Added support of \\e command. Queries can be edited in an external editor
- Add special command \dT to show datatypes
- Add auto-completion support for datatypes in CREATE, SELECT etc
- Improve the auto-completion in WHERE clause with logical operators

Bug Fixes:
- Fix the table formatting while printing multi-byte characters
- Fix a crash when pg_catalog was present in search path
- Fixed a bug that broke \e when prompt_tookit was updated
- Fix the display of triggers as shown in the \d output
- Fix broken auto-completion for INNER JOIN, LEFT JOIN etc
- Fix incorrect super() calls in pgbuffer, pgtoolbar and pgcompleter
- Add missing schema completion for CREATE and DROP statements
- Minor fixes around cursor 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 e1658c58f81..3fa7895cfe1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8417,10 +8417,10 @@ let
 
   pgcli = buildPythonPackage rec {
     name = "pgcli-${version}";
-    version = "0.16.3";
+    version = "0.17.0";
 
     src = pkgs.fetchFromGitHub {
-      sha256 = "12zizpj3fqbf90kj43zylpaqi3hhlihfg9xpzqa0aysiqri0ydx2";
+      sha256 = "0fnzhsir1m7a2rlh3iqinrz5i38ssfg9p7s60bkyy55614l146yg";
       rev = "v${version}";
       repo = "pgcli";
       owner = "amjith";

From 3f4bdb8ee0abd16261fc8e4970744a667faab6a1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 26 May 2015 16:36:17 +0200
Subject: [PATCH 0257/2322] python-packages: prompt_toolkit 0.26 -> 0.37

---
 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 3fa7895cfe1..d4c7f8894b1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8726,11 +8726,11 @@ let
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "0.26";
+    version = "0.37";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
-      sha256 = "1rd9gy3bcwp08agw5hiqckhaxbsz1i1kgkhjqw6vwhjdfgdjiq9l";
+      sha256 = "0nb87j4dgv16wf998ga8ia4fwd3p9wizrx3m7h0rwqcpn2x0l3v8";
     };
 
     buildInputs = with self; [ jedi ipython pygments ];

From da516baceaee5525b283e28b91c3702f723c0c3b Mon Sep 17 00:00:00 2001
From: dnhgff <dnhgff@gmail.com>
Date: Tue, 26 May 2015 08:02:41 -0700
Subject: [PATCH 0258/2322] zeal: add xcb-util-keysyms to buildInputs

---
 pkgs/data/documentation/zeal/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 7bc1b9fa1fd..5c1711edd28 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive }:
+{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xlibs }:
 
 stdenv.mkDerivation rec {
   version = "0.1.1";
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "172wf50fq1l5p8hq1irvpwr7ljxkjaby71afrm82jz3ixl6dg2ii";
   };
 
-  buildInputs = [ pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive ];
+  buildInputs = [
+    xlibs.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive
+  ];
 
   configurePhase = ''
     qmake PREFIX=/

From a9b9856c37db7212fcc8af410f49054abcff7814 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Sat, 23 May 2015 18:38:51 -0700
Subject: [PATCH 0259/2322] New package: cli53 (AWS Route53 admin CLI tool)

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

diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix
new file mode 100644
index 00000000000..2fa54796e4c
--- /dev/null
+++ b/pkgs/tools/admin/cli53/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, pythonPackages, fetchurl }:
+
+buildPythonPackage rec {
+  name = "cli53-${version}";
+  namePrefix = "";  # Suppress "python27-" name prefix
+  version = "0.4.4";
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/c/cli53/${name}.tar.gz";
+    sha256 = "0s9jzigq6a16m2c3qklssx2lz16cf13g5zh80vh24kxazaxqzbig";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [
+    argparse
+    boto
+    dns
+  ];
+
+  meta = {
+    description = "CLI tool for the Amazon Route 53 DNS service";
+    homepage = https://github.com/barnybug/cli53;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ benley ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f55c035c3a9..01c88e44253 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -764,6 +764,8 @@ let
 
   ccnet = callPackage ../tools/networking/ccnet { };
 
+  cli53 = callPackage ../tools/admin/cli53 { };
+
   cloud-init = callPackage ../tools/virtualization/cloud-init { };
 
   consul = goPackages.consul;

From a12dd8f6a1a450ea763d546001ef22e62a00e3f0 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont" <antoine.romain.dumont@gmail.com>
Date: Tue, 26 May 2015 19:30:19 +0200
Subject: [PATCH 0260/2322] Upgrade to latest stable

Upgraded the dependency to oracle's jdk8.
---
 pkgs/development/tools/database/sqldeveloper/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix
index 7c4aefee639..6668df6a828 100644
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, makeWrapper, requireFile, unzip, oraclejdk7, bash}:
+{ stdenv, makeWrapper, requireFile, unzip, oraclejdk8, bash}:
 
 stdenv.mkDerivation rec {
-  version = "4.0.3.16.84";
+  version = "4.1.0.19.07";
   name = "sqldeveloper-${version}";
 
   src = requireFile {
     name = "${name}-no-jre.zip";
     url = http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html;
-    sha256 = "1qbqjkfda7xry716da2hdbbazks96rgyslrw1lw0azmqdp1mir7g";
+    sha256 = "09gr40n4574fw9hg47xi4dk8vwgawzkjzzzj2h5jaicy0fdjkpbx";
   };
 
   buildInputs = [ makeWrapper unzip ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     chmod +x $out/sqldeveloper/bin/sqldeveloper
 
     wrapProgram $out/bin/sqldeveloper \
-      --set JAVA_HOME "${oraclejdk7}"
+      --set JAVA_HOME "${oraclejdk8}"
   '';
 
   meta = with stdenv.lib; {

From 3287103b006e03dbe10c0d8c1b94e0f1429992a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 24 May 2015 23:46:56 +0200
Subject: [PATCH 0261/2322] xorg: add libXpresent and xcb-util-errors

---
 pkgs/servers/x11/xorg/default.nix       | 20 ++++++++++++++++++++
 pkgs/servers/x11/xorg/extra.list        |  1 +
 pkgs/servers/x11/xorg/overrides.nix     |  3 +++
 pkgs/servers/x11/xorg/tarballs-7.7.list |  1 +
 4 files changed, 25 insertions(+)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d5c1abe3f36..33eedd9b84f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -774,6 +774,16 @@ let
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
   }) // {inherit libX11 libXext xextproto xproto libXt ;};
 
+  libXpresent = (mkDerivation "libXpresent" {
+    name = "libXpresent-1.0.0";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2;
+      sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1";
+    };
+    buildInputs = [pkgconfig presentproto libX11 xextproto xproto ];
+  }) // {inherit presentproto libX11 xextproto xproto ;};
+
   libXrandr = (mkDerivation "libXrandr" {
     name = "libXrandr-1.5.0";
     builder = ./builder.sh;
@@ -1204,6 +1214,16 @@ let
     buildInputs = [pkgconfig gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ];
   }) // {inherit gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ;};
 
+  xcbutilerrors = (mkDerivation "xcbutilerrors" {
+    name = "xcb-util-errors-1.0";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2;
+      sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8";
+    };
+    buildInputs = [pkgconfig gperf m4 libxcb xcbproto xproto ];
+  }) // {inherit gperf m4 libxcb xcbproto xproto ;};
+
   xcbutilimage = (mkDerivation "xcbutilimage" {
     name = "xcb-util-image-0.4.0";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index f0bf8bf7378..8a445a69c69 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -7,3 +7,4 @@ http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2
+http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index e7a5bdb1018..1ef0d88ce3a 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -173,6 +173,9 @@ in
     patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
   };
 
+  libXpresent = attrs: attrs
+    // { buildInputs = with xorg; attrs.buildInputs ++ [ libXext libXfixes libXrandr ]; };
+
   setxkbmap = attrs: attrs // {
     postInstall =
       ''
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 5382dc0b765..e33269c590c 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -75,6 +75,7 @@ mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.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/libXpresent-1.0.0.tar.bz2
 mirror://xorg/individual/lib/libXrandr-1.5.0.tar.bz2
 mirror://xorg/individual/lib/libXrender-0.9.8.tar.bz2
 mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2

From d35bd55ab7919841fa2f0777e9225ac77908db16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 May 2015 09:34:05 +0200
Subject: [PATCH 0262/2322] libdrm: small update

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

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 5ffdd9303e0..b223bd962e7 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.60";
+  name = "libdrm-2.4.61";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "12cqnmssi6mbr93n29mm84k8wix5nx6zs82k7wcmj7z3r335ymwr";
+    sha256 = "8b549092c8961a393a7e1d9a1bccddcea8e2af67c0d7d7c67babb9fc3b47699c";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From cbb365f722b493091dea522925529df5088608bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 May 2015 09:34:32 +0200
Subject: [PATCH 0263/2322] mesa: maintenance update

---
 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 1e84276ec00..e5626c3d263 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "10.5.4";
+  version = "10.5.6";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
   clang = if llvmPackages ? clang-unwrapped then llvmPackages.clang-unwrapped else llvmPackages.clang;
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "00v89jna7m6r2w1yrnx09isc97r2bd1hkn4jib445n1078zp47mm";
+    sha256 = "66017853bde5f7a6647db3eede30512a091a3491daa1708e0ad8027c328ba595";
   };
 
   prePatch = "patchShebangs .";

From 6bddcbda8a72e55b93801523104e106717eb0856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 May 2015 09:42:59 +0200
Subject: [PATCH 0264/2322] xorg: maintenance updates of libs

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

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 33eedd9b84f..5b2a05941ec 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -565,11 +565,11 @@ let
   }) // {inherit applewmproto libX11 libXext xextproto ;};
 
   libFS = (mkDerivation "libFS" {
-    name = "libFS-1.0.6";
+    name = "libFS-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libFS-1.0.6.tar.bz2;
-      sha256 = "1mxfsvj9m3pn8cdkcn4kg190zp665mf4pv0083g6xykvsgxzq1wh";
+      url = mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2;
+      sha256 = "1wy4km3qwwajbyl8y9pka0zwizn7d9pfiyjgzba02x3a083lr79f";
     };
     buildInputs = [pkgconfig fontsproto xproto xtrans ];
   }) // {inherit fontsproto xproto xtrans ;};
@@ -635,11 +635,11 @@ let
   }) // {inherit xproto ;};
 
   libXaw = (mkDerivation "libXaw" {
-    name = "libXaw-1.0.12";
+    name = "libXaw-1.0.13";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXaw-1.0.12.tar.bz2;
-      sha256 = "1xnv7jy86j9vhmw74frkzcraynqbw1p1s79jasargsgwfi433z4n";
+      url = mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2;
+      sha256 = "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ];
   }) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
@@ -795,11 +795,11 @@ let
   }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
 
   libXrender = (mkDerivation "libXrender" {
-    name = "libXrender-0.9.8";
+    name = "libXrender-0.9.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXrender-0.9.8.tar.bz2;
-      sha256 = "0qpwyjhbpp734vnhca992pjh4w7ijslidkzx1pcwbbk000pv050x";
+      url = mirror://xorg/individual/lib/libXrender-0.9.9.tar.bz2;
+      sha256 = "06myx7044qqdswxndsmd82fpp670klnizkgzdm194h51h1wyabzw";
     };
     buildInputs = [pkgconfig renderproto libX11 xproto ];
   }) // {inherit renderproto libX11 xproto ;};
@@ -815,11 +815,11 @@ let
   }) // {inherit resourceproto libX11 libXext xextproto xproto ;};
 
   libXt = (mkDerivation "libXt" {
-    name = "libXt-1.1.4";
+    name = "libXt-1.1.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXt-1.1.4.tar.bz2;
-      sha256 = "0myxwbx9ylam5x3ia5b5f4x8azcqdm420h9ad1r4hrgmi2lrffl4";
+      url = mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2;
+      sha256 = "06lz6i7rbrp19kgikpaz4c97fw7n31k2h2aiikczs482g2zbdvj6";
     };
     buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ];
   }) // {inherit libICE kbproto libSM libX11 xproto ;};
@@ -895,21 +895,21 @@ let
   }) // {inherit dmxproto libX11 libXext xextproto ;};
 
   libfontenc = (mkDerivation "libfontenc" {
-    name = "libfontenc-1.1.2";
+    name = "libfontenc-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libfontenc-1.1.2.tar.bz2;
-      sha256 = "0qign0ivqk166l9yfd51gw9lbhgs718bcrmvc40yicjr6gnyz959";
+      url = mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2;
+      sha256 = "08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h";
     };
     buildInputs = [pkgconfig xproto zlib ];
   }) // {inherit xproto zlib ;};
 
   libpciaccess = (mkDerivation "libpciaccess" {
-    name = "libpciaccess-0.13.3";
+    name = "libpciaccess-0.13.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libpciaccess-0.13.3.tar.bz2;
-      sha256 = "1qy2i776jb7912dxqylv59p41sa0hw8lmn7asd3ywvp0wk56rmvc";
+      url = mirror://xorg/individual/lib/libpciaccess-0.13.4.tar.bz2;
+      sha256 = "1krgryi9ngjr66242v0v5mczihgv0y7rrvx0563arr318mjn9y07";
     };
     buildInputs = [pkgconfig zlib ];
   }) // {inherit zlib ;};
@@ -935,11 +935,11 @@ let
   }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
 
   libxkbfile = (mkDerivation "libxkbfile" {
-    name = "libxkbfile-1.0.8";
+    name = "libxkbfile-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2;
-      sha256 = "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca";
+      url = mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2;
+      sha256 = "0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai";
     };
     buildInputs = [pkgconfig kbproto libX11 ];
   }) // {inherit kbproto libX11 ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index e33269c590c..11f617421e0 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -53,15 +53,15 @@ mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2
 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2
 mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2
-mirror://xorg/individual/lib/libfontenc-1.1.2.tar.bz2
-mirror://xorg/individual/lib/libFS-1.0.6.tar.bz2
+mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2
+mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2
 mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
-mirror://xorg/individual/lib/libpciaccess-0.13.3.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.3.tar.bz2
 mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2
-mirror://xorg/individual/lib/libXaw-1.0.12.tar.bz2
+mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2
 mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2
 mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2
 mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2
@@ -72,15 +72,15 @@ mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2
 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
 mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
-mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.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/libXpresent-1.0.0.tar.bz2
 mirror://xorg/individual/lib/libXrandr-1.5.0.tar.bz2
-mirror://xorg/individual/lib/libXrender-0.9.8.tar.bz2
+mirror://xorg/individual/lib/libXrender-0.9.9.tar.bz2
 mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2
-mirror://xorg/individual/lib/libXt-1.1.4.tar.bz2
+mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2
 mirror://xorg/individual/lib/libXtst-1.2.2.tar.bz2
 mirror://xorg/individual/lib/libXv-1.0.10.tar.bz2
 mirror://xorg/individual/lib/libXvMC-1.0.9.tar.bz2

From 1a13909173ce9ec56bc9ebfb77ba4e40a081357f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 May 2015 10:44:29 +0200
Subject: [PATCH 0265/2322] xorg: minor updates of apps

---
 pkgs/servers/x11/xorg/default.nix       | 92 ++++++++++++-------------
 pkgs/servers/x11/xorg/tarballs-7.7.list | 27 ++++----
 2 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 5b2a05941ec..5c9e6483672 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1085,31 +1085,31 @@ let
   }) // {inherit xproto ;};
 
   setxkbmap = (mkDerivation "setxkbmap" {
-    name = "setxkbmap-1.3.0";
+    name = "setxkbmap-1.3.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/setxkbmap-1.3.0.tar.bz2;
-      sha256 = "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x";
+      url = mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2;
+      sha256 = "1qfk097vjysqb72pq89h0la3462kbb2dh1d11qzs2fr67ybb7pd9";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
   }) // {inherit libX11 libxkbfile ;};
 
   smproxy = (mkDerivation "smproxy" {
-    name = "smproxy-1.0.5";
+    name = "smproxy-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/smproxy-1.0.5.tar.bz2;
-      sha256 = "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67";
+      url = mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2;
+      sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc";
     };
     buildInputs = [pkgconfig libICE libSM libXmu libXt ];
   }) // {inherit libICE libSM libXmu libXt ;};
 
   twm = (mkDerivation "twm" {
-    name = "twm-1.0.8";
+    name = "twm-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/twm-1.0.8.tar.bz2;
-      sha256 = "0i1ff8h2gh1ab311da5dlhl0nrma0qbrk403ymzi4cnnacikaq3n";
+      url = mirror://xorg/individual/app/twm-1.0.9.tar.bz2;
+      sha256 = "02iicvhkp3i7q5rliyymiq9bppjr0pzfs6rgb78kppryqdx1cxf5";
     };
     buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu xproto libXt ];
   }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
@@ -1285,11 +1285,11 @@ let
   }) // {inherit ;};
 
   xcmsdb = (mkDerivation "xcmsdb" {
-    name = "xcmsdb-1.0.4";
+    name = "xcmsdb-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2;
-      sha256 = "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74";
+      url = mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2;
+      sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75";
     };
     buildInputs = [pkgconfig libX11 ];
   }) // {inherit libX11 ;};
@@ -1325,31 +1325,31 @@ let
   }) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;};
 
   xdpyinfo = (mkDerivation "xdpyinfo" {
-    name = "xdpyinfo-1.3.1";
+    name = "xdpyinfo-1.3.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xdpyinfo-1.3.1.tar.bz2;
-      sha256 = "154b29zlrq33lmni883jgwyrb2kx7z8h52jx1s3ys5x5d582iydf";
+      url = mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2;
+      sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh";
     };
     buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
   }) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
 
   xdriinfo = (mkDerivation "xdriinfo" {
-    name = "xdriinfo-1.0.4";
+    name = "xdriinfo-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2;
-      sha256 = "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim";
+      url = mirror://xorg/individual/app/xdriinfo-1.0.5.tar.bz2;
+      sha256 = "0681d0y8liqakkpz7mmsf689jcxrvs5291r20qi78mc9xxk3gfjc";
     };
     buildInputs = [pkgconfig glproto libX11 ];
   }) // {inherit glproto libX11 ;};
 
   xev = (mkDerivation "xev" {
-    name = "xev-1.2.1";
+    name = "xev-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xev-1.2.1.tar.bz2;
-      sha256 = "0hv296mysglcgkx6lj1wxc23kshb2kix1a8yqppxj5vz16mpzw8i";
+      url = mirror://xorg/individual/app/xev-1.2.2.tar.bz2;
+      sha256 = "0krivhrxpq6719103r541xpi3i3a0y15f7ypc4lnrx8sdhmfcjnr";
     };
     buildInputs = [pkgconfig libX11 xproto libXrandr ];
   }) // {inherit libX11 xproto libXrandr ;};
@@ -1865,21 +1865,21 @@ let
   }) // {inherit libXfont xproto xtrans ;};
 
   xgamma = (mkDerivation "xgamma" {
-    name = "xgamma-1.0.5";
+    name = "xgamma-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xgamma-1.0.5.tar.bz2;
-      sha256 = "0463sawps86jnxn121ramsz4sicy3az5wa5wsq4rqm8dm3za48p3";
+      url = mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2;
+      sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f";
     };
-    buildInputs = [pkgconfig libX11 libXxf86vm ];
-  }) // {inherit libX11 libXxf86vm ;};
+    buildInputs = [pkgconfig libX11 xproto libXxf86vm ];
+  }) // {inherit libX11 xproto libXxf86vm ;};
 
   xhost = (mkDerivation "xhost" {
-    name = "xhost-1.0.6";
+    name = "xhost-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xhost-1.0.6.tar.bz2;
-      sha256 = "1hlxm0is9nks1cx033s1733kkib9ivx2bxa3pb9yayqavwibkxd6";
+      url = mirror://xorg/individual/app/xhost-1.0.7.tar.bz2;
+      sha256 = "16n26xw6l01zq31d4qvsaz50misvizhn7iihzdn5f7s72pp1krlk";
     };
     buildInputs = [pkgconfig libX11 libXau libXmu xproto ];
   }) // {inherit libX11 libXau libXmu xproto ;};
@@ -1925,24 +1925,24 @@ let
   }) // {inherit libX11 libxkbfile xproto ;};
 
   xkbevd = (mkDerivation "xkbevd" {
-    name = "xkbevd-1.1.3";
+    name = "xkbevd-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2;
-      sha256 = "05h1xcnbalndbrryyqs8wzy9h3wz655vc0ymhlk2q4aik17licjm";
+      url = mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2;
+      sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
   }) // {inherit libX11 libxkbfile ;};
 
   xkbprint = (mkDerivation "xkbprint" {
-    name = "xkbprint-1.0.3";
+    name = "xkbprint-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xkbprint-1.0.3.tar.bz2;
-      sha256 = "1h4jb3gjrbjp79h5gcgkjvdxykcy2bmq03smpls820c8wnw6v17s";
+      url = mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2;
+      sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb";
     };
-    buildInputs = [pkgconfig libX11 libxkbfile ];
-  }) // {inherit libX11 libxkbfile ;};
+    buildInputs = [pkgconfig libX11 libxkbfile xproto ];
+  }) // {inherit libX11 libxkbfile xproto ;};
 
   xkbutils = (mkDerivation "xkbutils" {
     name = "xkbutils-1.0.4";
@@ -1975,11 +1975,11 @@ let
   }) // {inherit libX11 libXmu xproto ;};
 
   xlsatoms = (mkDerivation "xlsatoms" {
-    name = "xlsatoms-1.1.1";
+    name = "xlsatoms-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2;
-      sha256 = "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv";
+      url = mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2;
+      sha256 = "196yjik910xsr7dwy8daa0amr0r22ynfs360z0ndp9mx7mydrra7";
     };
     buildInputs = [pkgconfig libxcb ];
   }) // {inherit libxcb ;};
@@ -2005,11 +2005,11 @@ let
   }) // {inherit libXaw libXt ;};
 
   xmodmap = (mkDerivation "xmodmap" {
-    name = "xmodmap-1.0.8";
+    name = "xmodmap-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2;
-      sha256 = "1hwzm54m4ng09ls9i4bq0x84zbyhamgzasgrvhxxp8jqk34f7qpg";
+      url = mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2;
+      sha256 = "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p";
     };
     buildInputs = [pkgconfig libX11 xproto ];
   }) // {inherit libX11 xproto ;};
@@ -2145,11 +2145,11 @@ let
   }) // {inherit ;};
 
   xvinfo = (mkDerivation "xvinfo" {
-    name = "xvinfo-1.1.2";
+    name = "xvinfo-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xvinfo-1.1.2.tar.bz2;
-      sha256 = "1qsh7fszi727l3vwlaf9pb7bpikdv15smrx5qhlgg3kqzl7xklzf";
+      url = mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2;
+      sha256 = "1sz5wqhxd1fqsfi1w5advdlwzkizf2fgl12hdpk66f7mv9l8pflz";
     };
     buildInputs = [pkgconfig libX11 xproto libXv ];
   }) // {inherit libX11 xproto libXv ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 11f617421e0..6f8fcf53c76 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -96,8 +96,9 @@ mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2
 mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2
-mirror://xorg/X11R7.7/src/everything/setxkbmap-1.3.0.tar.bz2
-mirror://xorg/X11R7.7/src/everything/smproxy-1.0.5.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/proto/videoproto-2.3.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2
@@ -106,12 +107,12 @@ mirror://xorg/individual/app/xauth-1.0.9.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
-mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2
+mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2
 mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2
 mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2
-mirror://xorg/individual/app/xdpyinfo-1.3.1.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2
-mirror://xorg/individual/app/xev-1.2.1.tar.bz2
+mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2
+mirror://xorg/individual/app/xdriinfo-1.0.5.tar.bz2
+mirror://xorg/individual/app/xev-1.2.2.tar.bz2
 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
@@ -161,18 +162,18 @@ mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xgamma-1.0.5.tar.bz2
-mirror://xorg/individual/app/xhost-1.0.6.tar.bz2
+mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2
+mirror://xorg/individual/app/xhost-1.0.7.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2
 mirror://xorg/individual/app/xinput-1.6.1.tar.bz2
 mirror://xorg/individual/app/xkbcomp-1.3.0.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.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.11.tar.bz2
 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2
+mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2
 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2
-mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2
+mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
 mirror://xorg/individual/xserver/xorg-server-1.16.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
@@ -185,8 +186,8 @@ mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2
 mirror://xorg/individual/app/xset-1.2.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2
 mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2
-mirror://xorg/individual/app/xvinfo-1.1.2.tar.bz2
+mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2
 mirror://xorg/individual/app/xwd-1.0.6.tar.bz2
 mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2
-mirror://xorg/individual/app/xkbprint-1.0.3.tar.bz2
+mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2

From 688b4ca5dbec29f126632187f5f726d11e3f5f74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 May 2015 11:11:05 +0200
Subject: [PATCH 0266/2322] xorg: add xmag and xgc apps

Tested very briefly.
---
 pkgs/servers/x11/xorg/default.nix       | 20 ++++++++++++++++++++
 pkgs/servers/x11/xorg/tarballs-7.7.list |  2 ++
 2 files changed, 22 insertions(+)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 5c9e6483672..d01caddd710 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1874,6 +1874,16 @@ let
     buildInputs = [pkgconfig libX11 xproto libXxf86vm ];
   }) // {inherit libX11 xproto libXxf86vm ;};
 
+  xgc = (mkDerivation "xgc" {
+    name = "xgc-1.0.5";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/app/xgc-1.0.5.tar.bz2;
+      sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl";
+    };
+    buildInputs = [pkgconfig libXaw libXt ];
+  }) // {inherit libXaw libXt ;};
+
   xhost = (mkDerivation "xhost" {
     name = "xhost-1.0.7";
     builder = ./builder.sh;
@@ -1994,6 +2004,16 @@ let
     buildInputs = [pkgconfig libxcb ];
   }) // {inherit libxcb ;};
 
+  xmag = (mkDerivation "xmag" {
+    name = "xmag-1.0.6";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/app/xmag-1.0.6.tar.bz2;
+      sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7";
+    };
+    buildInputs = [pkgconfig libX11 libXaw libXmu libXt ];
+  }) // {inherit libX11 libXaw libXmu libXt ;};
+
   xmessage = (mkDerivation "xmessage" {
     name = "xmessage-1.0.4";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 6f8fcf53c76..15568733cbe 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -163,6 +163,7 @@ mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2
 mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2
+mirror://xorg/individual/app/xgc-1.0.5.tar.bz2
 mirror://xorg/individual/app/xhost-1.0.7.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2
 mirror://xorg/individual/app/xinput-1.6.1.tar.bz2
@@ -173,6 +174,7 @@ mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.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
+mirror://xorg/individual/app/xmag-1.0.6.tar.bz2
 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
 mirror://xorg/individual/xserver/xorg-server-1.16.4.tar.bz2

From e5fa9ab0fd432f661ba1bbb13bee461ca95038b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 26 May 2015 18:52:32 +0200
Subject: [PATCH 0267/2322] xlsfonts: generate along with xorg stuff

Also a minor update.
/cc maintainer @viric.
---
 pkgs/applications/misc/xlsfonts/default.nix | 23 ---------------------
 pkgs/servers/x11/xorg/default.nix           | 10 +++++++++
 pkgs/servers/x11/xorg/tarballs-7.7.list     |  1 +
 pkgs/top-level/all-packages.nix             |  2 +-
 4 files changed, 12 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/applications/misc/xlsfonts/default.nix

diff --git a/pkgs/applications/misc/xlsfonts/default.nix b/pkgs/applications/misc/xlsfonts/default.nix
deleted file mode 100644
index 7584ebf72fb..00000000000
--- a/pkgs/applications/misc/xlsfonts/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This program used to come with xorg releases, but now I could only find it
-# at http://www.x.org/releases/individual/.
-# That is why this expression is not inside pkgs.xorg
-
-{stdenv, fetchurl, libX11, pkgconfig}:
-stdenv.mkDerivation rec {
-  name = "xlsfonts-1.0.4";
-
-  src = fetchurl {
-    url = "mirror://xorg/individual/app/${name}.tar.bz2";
-    sha256 = "1lhcx600z9v65nk93xaxfzi79bm4naynabb52gz1vy1bxj2r25r8";
-  };
-
-  buildInputs = [libX11 pkgconfig];
-
-  meta = {
-    homepage = http://www.x.org/;
-    description = "Lists the fonts available in the X server";
-    license = stdenv.lib.licenses.free;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-  };
-}
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d01caddd710..f16bc23d76a 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2004,6 +2004,16 @@ let
     buildInputs = [pkgconfig libxcb ];
   }) // {inherit libxcb ;};
 
+  xlsfonts = (mkDerivation "xlsfonts" {
+    name = "xlsfonts-1.0.5";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2;
+      sha256 = "1yi774g6r1kafsbnxbkrwyndd3i60362ck1fps9ywz076pn5naa0";
+    };
+    buildInputs = [pkgconfig libX11 xproto ];
+  }) // {inherit libX11 xproto ;};
+
   xmag = (mkDerivation "xmag" {
     name = "xmag-1.0.6";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 15568733cbe..5821390110e 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -174,6 +174,7 @@ mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.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
+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/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 339563fddf1..72158197107 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11049,7 +11049,7 @@ let
   freepv = callPackage ../applications/graphics/freepv { };
 
   xfontsel = callPackage ../applications/misc/xfontsel { };
-  xlsfonts = callPackage ../applications/misc/xlsfonts { };
+  inherit (xorg) xlsfonts;
 
   freerdp = callPackage ../applications/networking/remote/freerdp {
     ffmpeg = ffmpeg_1;

From 471a2a7ee7cfdaba691471acf2556a5bc48b105a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 26 May 2015 18:54:17 +0200
Subject: [PATCH 0268/2322] xorg {xorg-docs,kbproto}: minor updates

---
 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 f16bc23d76a..f996db7f9af 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -545,11 +545,11 @@ let
   }) // {inherit ;};
 
   kbproto = (mkDerivation "kbproto" {
-    name = "kbproto-1.0.6";
+    name = "kbproto-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2;
-      sha256 = "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03";
+      url = mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2;
+      sha256 = "0mxqj1pzhjpz9495vrjnpi10kv2n1s4vs7di0sh3yvipfq5j30pq";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
@@ -2055,11 +2055,11 @@ let
   }) // {inherit ;};
 
   xorgdocs = (mkDerivation "xorgdocs" {
-    name = "xorg-docs-1.7";
+    name = "xorg-docs-1.7.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2;
-      sha256 = "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr";
+      url = mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2;
+      sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 5821390110e..39ea8caa60a 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -49,7 +49,7 @@ mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2
 mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2
 mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2
 mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2
-mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2
+mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2
 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2
 mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2
@@ -177,7 +177,7 @@ mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2
 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/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
+mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2
 mirror://xorg/individual/xserver/xorg-server-1.16.4.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

From 0e270def52fe334c271a339a1004d3569542a320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 26 May 2015 18:59:40 +0200
Subject: [PATCH 0269/2322] xorg.x11perf: larger update

Seems to run fine.
---
 pkgs/servers/x11/xorg/default.nix       | 10 +++++-----
 pkgs/servers/x11/xorg/tarballs-7.7.list |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f996db7f9af..8834a5e59fb 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1145,14 +1145,14 @@ let
   }) // {inherit ;};
 
   x11perf = (mkDerivation "x11perf" {
-    name = "x11perf-1.5.4";
+    name = "x11perf-1.6.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/x11perf-1.5.4.tar.bz2;
-      sha256 = "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4";
+      url = mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2;
+      sha256 = "0lb716yfdb8f11h4cz93d1bapqdxf1xplsb21kbp4xclq7g9hw78";
     };
-    buildInputs = [pkgconfig libX11 libXext libXft libXmu libXrender ];
-  }) // {inherit libX11 libXext libXft libXmu libXrender ;};
+    buildInputs = [pkgconfig libX11 libXext libXft libXmu xproto libXrender ];
+  }) // {inherit libX11 libXext libXft libXmu xproto libXrender ;};
 
   xauth = (mkDerivation "xauth" {
     name = "xauth-1.0.9";
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 39ea8caa60a..baded542cab 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -102,7 +102,7 @@ mirror://xorg/individual/app/twm-1.0.9.tar.bz2
 mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2
 mirror://xorg/individual/proto/videoproto-2.3.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2
-mirror://xorg/X11R7.7/src/everything/x11perf-1.5.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/xbacklight-1.2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2

From edeab759130b1ac213e2b744ac30e941b1a423f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 26 May 2015 19:03:14 +0200
Subject: [PATCH 0270/2322] xcompmgr: generate along with xorg stuff

Also a minor update.
/cc maintainer @astsmtl.
---
 .../window-managers/xcompmgr/default.nix      | 22 -------------------
 pkgs/servers/x11/xorg/default.nix             | 10 +++++++++
 pkgs/servers/x11/xorg/tarballs-7.7.list       |  1 +
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/applications/window-managers/xcompmgr/default.nix

diff --git a/pkgs/applications/window-managers/xcompmgr/default.nix b/pkgs/applications/window-managers/xcompmgr/default.nix
deleted file mode 100644
index 930b612f691..00000000000
--- a/pkgs/applications/window-managers/xcompmgr/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libXcomposite, libXfixes, libXdamage
-, libXrender, libXext }:
-stdenv.mkDerivation rec {
-  name = "xcompmgr-1.1.6";
-  src = fetchurl {
-    url = "mirror://xorg/individual/app/${name}.tar.bz2";
-    sha256 = "c98949d36793b30ed1ed47495c87a05fa245ac0fc2857d2abc54979124687c02";
-  };
-  buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender libXext ];
-  meta = {
-    homepage = http://www.x.org/;
-    description = "A sample compositing manager for X servers";
-    longDescription = ''
-      A sample compositing manager for X servers supporting the XFIXES,
-      DAMAGE, RENDER, and COMPOSITE extensions.  It enables basic eye-candy
-      effects.
-    '';
-    license = "bsd";
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8834a5e59fb..1d8997e3c1d 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1294,6 +1294,16 @@ let
     buildInputs = [pkgconfig libX11 ];
   }) // {inherit libX11 ;};
 
+  xcompmgr = (mkDerivation "xcompmgr" {
+    name = "xcompmgr-1.1.7";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2;
+      sha256 = "14k89mz13jxgp4h2pz0yq0fbkw1lsfcb3acv8vkknc9i4ld9n168";
+    };
+    buildInputs = [pkgconfig libXcomposite libXdamage libXext libXfixes libXrender ];
+  }) // {inherit libXcomposite libXdamage libXext libXfixes libXrender ;};
+
   xcursorgen = (mkDerivation "xcursorgen" {
     name = "xcursorgen-1.0.6";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index baded542cab..932d4f1236f 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -108,6 +108,7 @@ 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
 mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2
+mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2
 mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2
 mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2
 mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72158197107..7e6f0b8f18b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12807,7 +12807,7 @@ let
 
   xchm = callPackage ../applications/misc/xchm { };
 
-  xcompmgr = callPackage ../applications/window-managers/xcompmgr { };
+  inherit (xorg) xcompmgr;
 
   compton = callPackage ../applications/window-managers/compton { };
 

From 16b40c7b1fa0610e204f62484bbcf748b59ce52f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 26 May 2015 20:00:23 +0200
Subject: [PATCH 0271/2322] qt48: maintenance update, try
 enableParallelBuilding

I successfully built it with 8 free cores;
hopefully it won't give problems.

/cc maintainers: @lovek323, @phreedom, @sander.

I wonder that the build reports no support for gstreamer and pulseaudio.
I checked it was so before this commit, but it might still be useful
to enable those.

No more 4.8.x releases are planned. End of support is scheduled to Dec'15.
---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index a65cbeed3fd..8715af062c7 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -17,7 +17,7 @@ with stdenv.lib;
 
 let
   v_maj = "4.8";
-  v_min = "6";
+  v_min = "7";
   vers = "${v_maj}.${v_min}";
 in
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "http://download.qt-project.org/official_releases/qt/"
       + "${v_maj}/${vers}/qt-everywhere-opensource-src-${vers}.tar.gz";
-    sha256 = "0b036iqgmbbv37dgwwfihw3mihjbnw3kb5kaisdy0qi8nn8xs54b";
+    sha256 = "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272";
   };
 
   # The version property must be kept because it will be included into the QtSDK package name
@@ -126,9 +126,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ perl pkgconfig which ];
 
-  # occasional build problems if one has too many cores (like on Hydra)
-  # @vcunat has been unable to find a *reliable* fix
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin
     "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";

From 2a1c34288795c245718ea9ac9b12f3dfee5144c4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 May 2015 20:20:53 +0200
Subject: [PATCH 0272/2322] Disable the manual in the minimal profile

---
 nixos/modules/profiles/minimal.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix
index 69729923e03..3b18ae129b9 100644
--- a/nixos/modules/profiles/minimal.nix
+++ b/nixos/modules/profiles/minimal.nix
@@ -8,4 +8,5 @@ with lib;
 {
   environment.noXlibs = mkDefault true;
   i18n.supportedLocales = [ config.i18n.defaultLocale ];
+  services.nixosManual.enable = mkDefault false;
 }

From 6f67b91db3c8c9e2c4688b1c45445cb8d2e94729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 26 May 2015 20:47:10 +0200
Subject: [PATCH 0273/2322] xfce: maint. updates of exo, thunar, xfdesktop,
 xfwm4

---
 pkgs/desktops/xfce/core/exo.nix       | 4 ++--
 pkgs/desktops/xfce/core/thunar.nix    | 4 ++--
 pkgs/desktops/xfce/core/xfdesktop.nix | 4 ++--
 pkgs/desktops/xfce/core/xfwm4.nix     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix
index e4c7c318352..f48a3e3808b 100644
--- a/pkgs/desktops/xfce/core/exo.nix
+++ b/pkgs/desktops/xfce/core/exo.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   p_name  = "exo";
   ver_maj = "0.10";
-  ver_min = "4";
+  ver_min = "6";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "cced5fdbc0b61a5d976210ff71ecdd81b89fcd15e5860a44f50da7b83fb2deaa";
+    sha256 = "1cc0e5a432e050a5e5aa64d126b988f4440da4f27474aaf42a4d8e13651d0752";
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
diff --git a/pkgs/desktops/xfce/core/thunar.nix b/pkgs/desktops/xfce/core/thunar.nix
index abcfd656c50..6e479454459 100644
--- a/pkgs/desktops/xfce/core/thunar.nix
+++ b/pkgs/desktops/xfce/core/thunar.nix
@@ -6,11 +6,11 @@
 stdenv.mkDerivation rec {
   p_name  = "thunar";
   ver_maj = "1.6";
-  ver_min = "6";
+  ver_min = "10";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/Thunar-${ver_maj}.${ver_min}.tar.bz2";
-    sha256 = "1cl9v3rdzipyyxml3pyrzspxfmmssz5h5snpj18irq4an42539dr";
+    sha256 = "7e9d24067268900e5e44d3325e60a1a2b2f8f556ec238ec12574fbea15fdee8a";
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix
index 45a89b93748..4402e61a2fb 100644
--- a/pkgs/desktops/xfce/core/xfdesktop.nix
+++ b/pkgs/desktops/xfce/core/xfdesktop.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   p_name  = "xfdesktop";
   ver_maj = "4.12";
-  ver_min = "0";
+  ver_min = "2";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "1ivzgg4792nid6wcgd1nq5vc3z0y5ip6ymq7ci5j2qkp663qnykf";
+    sha256 = "c9788883163b57bac39d12e5f8310c869d176454879defb78b67f8e9f1ad5225";
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix
index cedf36d43ae..dd18b1355f7 100644
--- a/pkgs/desktops/xfce/core/xfwm4.nix
+++ b/pkgs/desktops/xfce/core/xfwm4.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   p_name  = "xfwm4";
   ver_maj = "4.12";
-  ver_min = "2";
+  ver_min = "3";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "5bb5f72b41060d10bd3823f8b69abcd462bbd8853fdf9c82041450ae68e7d75a";
+    sha256 = "f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac";
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 

From f02284a36194619d4533b3349d4f67bc5cd54b19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 26 May 2015 20:50:05 +0200
Subject: [PATCH 0274/2322] activator: add version 1.3.2

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

diff --git a/pkgs/development/tools/activator/default.nix b/pkgs/development/tools/activator/default.nix
new file mode 100644
index 00000000000..72bed9d46ca
--- /dev/null
+++ b/pkgs/development/tools/activator/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, unzip, jre }:
+
+stdenv.mkDerivation rec {
+
+  name = "${pname}-${version}";
+  pname = "activator";
+  version = "1.3.2";
+
+  src = fetchurl {
+    url = "http://downloads.typesafe.com/typesafe-${pname}/${version}/typesafe-${name}.zip";
+    sha256 = "0a6x4w63829fbp13gk1l37p6di11lfmgla26gqnr065vzpkg90y6";
+  };
+
+  buildInputs = [ unzip jre ];
+
+  installPhase = ''
+    mkdir -p $out/{bin,lib}
+    mv repository $out/lib
+    sed -i -e "s,declare.*activator_home.*=.*,declare -r activator_home=$out/lib/,g" activator
+    mv activator $out/bin
+    mv activator-launch-${version}.jar $out/lib
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A scafollding tool for setting up reactive projects";
+    homepage = "http://typesafe.com/activator";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ edwtjo ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cda6163037f..777eb394fb2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4974,6 +4974,8 @@ let
 
   ### DEVELOPMENT / TOOLS
 
+  activator = callPackage ../development/tools/activator { };
+
   alloy = callPackage ../development/tools/alloy { };
 
   augeas = callPackage ../tools/system/augeas { };

From df7ccbab5d29352a9147da0fd84e7e54fb8da479 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 26 May 2015 23:13:16 +0200
Subject: [PATCH 0275/2322] libssh: temporarily patch to fix x2goclient

See <https://red.libssh.org/issues/194>:

  "In libssh 0.7.0, ssh_forward_listen() is present in the headers as
  a deprecated function, but it is not actually present in the code.
  This appears to have been introduced in commit 5229253f."
---
 ...troduce-ssh_forward_listen-Fixes-194.patch | 28 +++++++++++++++++++
 pkgs/development/libraries/libssh/default.nix |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch

diff --git a/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch b/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch
new file mode 100644
index 00000000000..030983d5c55
--- /dev/null
+++ b/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch
@@ -0,0 +1,28 @@
+From 3c8fe6e2c595ee019408249c364b3019b6c31a8a Mon Sep 17 00:00:00 2001
+From: Mike DePaulo <mikedep333@gmail.com>
+Date: Fri, 15 May 2015 22:22:13 -0400
+Subject: [PATCH] Reintroduce ssh_forward_listen() (Fixes: #194)
+
+---
+ src/channels.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/channels.c b/src/channels.c
+index 7a4e71f..db5f83a 100644
+--- a/src/channels.c
++++ b/src/channels.c
+@@ -2206,6 +2206,11 @@ error:
+ }
+ 
+ /* DEPRECATED */
++int ssh_forward_listen(ssh_session session, const char *address, int port, int *bound_port) {
++  return ssh_channel_listen_forward(session, address, port, bound_port);
++}
++
++/* DEPRECATED */
+ ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms) {
+   return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms, NULL);
+ }
+-- 
+2.1.4
+
diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 64a6213433c..8ea2ac72da0 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
     sha256 = "1wfrdqhv97f4ycd9bcpgb6gw47kr7b2iq8cz5knk8a6n9c6870k0";
   };
 
+  patches = [ ./0001-Reintroduce-ssh_forward_listen-Fixes-194.patch ];
+
   postPatch = ''
     # Fix headers to use libsodium instead of NaCl
     sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c

From 661326b34cbf368ed51a75d3a3352d2f3cd2d069 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 26 May 2015 21:43:59 +0200
Subject: [PATCH 0276/2322] x2goclient 4.0.3.2 -> 4.0.4.0

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

diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 8544ccc0f79..446b65c9882 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }:
 
-let version = "4.0.3.2"; in
+let version = "4.0.4.0"; in
 stdenv.mkDerivation rec {
   name = "x2goclient-${version}";
 
   src = fetchurl {
     url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
-    sha256 = "0vqcz9kmnbvlj8kns68zl60019fdz97rydz4wsgnsgdf7r370npn";
+    sha256 = "0mqn4nvq2w7qja5i4vx9fg2spwzl01p0hmfwbjb0mzir03hmrl46";
   };
 
   meta = with stdenv.lib; {

From 48b7e40f0c3ab3c384090a1ca7428cdc9d0312ce Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 26 May 2015 14:43:27 +0200
Subject: [PATCH 0277/2322] licenses: add Vim licence

---
 lib/licenses.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 08376b7e7e0..4ac155a9bed 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -403,6 +403,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "The Unlicense";
   };
 
+  vim = spdx {
+    spdxId = "Vim";
+    fullName = "Vim License";
+  };
+
   vsl10 = spdx {
     spdxId = "VSL-1.0";
     fullName = "Vovida Software License v1.0";

From bd67bfa3065e34a4719ac0da3fd02587aa999b7b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 26 May 2015 15:12:27 +0200
Subject: [PATCH 0278/2322] neovim: various small improvements

- Fix package name ("neovim-nightly" -> "neovim")
- Use fetchFromGitHub, remove unused parameters
- Improve metadata
- Maintain
---
 pkgs/applications/editors/neovim/default.nix | 46 +++++++++++++-------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 1c1c050b000..8fa328daeeb 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,34 +1,37 @@
-{ stdenv, fetchgit, fetchurl, unzip, callPackage, ncurses, gettext, pkgconfig,
-cmake, pkgs, lpeg, lua, luajit, luaMessagePack, luabitop }:
+{ stdenv, fetchFromGitHub, unzip, ncurses, gettext, pkgconfig
+, cmake, pkgs, lpeg, lua, luajit, luaMessagePack, luabitop }:
 
+let version = "2014-11-26"; in
 stdenv.mkDerivation rec {
-  name = "neovim-nightly";
+  name = "neovim-${version}";
 
-  version = "nightly";
-
-  src = fetchgit {
-    url = "https://github.com/neovim/neovim";
+  src = fetchFromGitHub {
+    sha256 = "1bcmv0h3ln736xdv7r7v97vim2yqfdnkvpbckwdxi69p4d6lfms6";
     rev = "68fcd8b696dae33897303c9f8265629a31afbf17";
-    sha256 = "0hxkcy641jpn4qka44gfvhmb6q3dkjx6lvn9748lcl2gx2d36w4i";
+    repo = "neovim";
+    owner = "neovim";
   };
 
   libmsgpack = stdenv.mkDerivation rec {
     version = "0.5.9";
     name = "libmsgpack-${version}";
 
-    src = fetchgit {
+    src = fetchFromGitHub {
+      sha256 = "12np3c2q346963mdgwa61y5dfnb91avq2hy4r6i6bdjwa7w6waq4";
       rev = "ecf4b09acd29746829b6a02939db91dfdec635b4";
-      url = "https://github.com/msgpack/msgpack-c";
-      sha256 = "076ygqgxrc3vk2l20l8x2cgcv05py3am6mjjkknr418pf8yav2ww";
+      repo = "msgpack-c";
+      owner = "msgpack";
     };
 
     buildInputs = [ cmake ];
 
+    enableParallelBuilding = true;
+
     meta = with stdenv.lib; {
       description = "MessagePack implementation for C and C++";
       homepage = http://msgpack.org;
-      maintainers = [ maintainers.manveru ];
       license = licenses.asl20;
+      maintainers = with maintainers; [ manveru nckx ];
       platforms = platforms.all;
     };
   };
@@ -56,10 +59,23 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    description = "Aggressive refactor of Vim";
+    description = "Vim text editor fork focused on extensibility and agility";
+    longDescription = ''
+      Neovim is a project that seeks to aggressively refactor Vim in order to:
+      - Simplify maintenance and encourage contributions
+      - Split the work between multiple developers
+      - Enable the implementation of new/modern user interfaces without any
+        modifications to the core source
+      - Improve extensibility with a new plugin architecture
+    '';
     homepage    = http://www.neovim.org;
-    maintainers = with maintainers; [ manveru ];
+    # "Contributions committed before b17d96 by authors who did not sign the
+    # Contributor License Agreement (CLA) remain under the Vim license.
+    # Contributions committed after b17d96 are licensed under Apache 2.0 unless
+    # those contributions were copied from Vim (identified in the commit logs
+    # by the vim-patch token). See LICENSE for details."
+    license = with licenses; [ asl20 vim ];
+    maintainers = with maintainers; [ manveru nckx ];
     platforms   = platforms.unix;
   };
 }
-

From b84588cbdedc99c3b119d4226d1af6d18167c195 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 26 May 2015 17:01:16 +0200
Subject: [PATCH 0279/2322] vim (all builds): add licence information

---
 pkgs/applications/editors/vim/configurable.nix | 1 +
 pkgs/applications/editors/vim/default.nix      | 1 +
 pkgs/applications/editors/vim/macvim.nix       | 1 +
 pkgs/applications/editors/vim/qvim.nix         | 1 +
 4 files changed, 4 insertions(+)

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index e6c2cacc49a..b40e797f7ea 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -190,6 +190,7 @@ composableDerivation {
   meta = with stdenv.lib; {
     description = "The most popular clone of the VI editor";
     homepage    = http://www.vim.org;
+    license = with licenses; [ vim ];
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
   };
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 4f14aade5a5..b13925fe14e 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "The most popular clone of the VI editor";
     homepage    = http://www.vim.org;
+    license = with licenses; [ vim ];
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
   };
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index 784be80ecf4..4519d4c2626 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -87,6 +87,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Vim - the text editor - for Mac OS X";
     homepage    = https://github.com/b4winckler/macvim;
+    license = with licenses; [ vim ];
     maintainers = with maintainers; [ cstrahan ];
     platforms   = platforms.darwin;
   };
diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix
index b9e3d668d62..42ed3daa688 100644
--- a/pkgs/applications/editors/vim/qvim.nix
+++ b/pkgs/applications/editors/vim/qvim.nix
@@ -118,6 +118,7 @@ composableDerivation {
   meta = with stdenv.lib; {
     description = "The most popular clone of the VI editor (Qt GUI fork)";
     homepage    = https://bitbucket.org/equalsraf/vim-qt/wiki/Home;
+    license = with licenses; [ vim ];
     maintainers = with maintainers; [ smironov ttuegel ];
     platforms   = platforms.linux;
   };

From af15a201e1884f00f064e4eacf18f1b99b8aa04c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 27 May 2015 01:20:53 +0200
Subject: [PATCH 0280/2322] neovim: update to latest master 2015-05-26

---
 pkgs/applications/editors/neovim/default.nix | 59 +++++++++++---------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 8fa328daeeb..f19c1b65e13 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,62 +1,69 @@
-{ stdenv, fetchFromGitHub, unzip, ncurses, gettext, pkgconfig
-, cmake, pkgs, lpeg, lua, luajit, luaMessagePack, luabitop }:
+{ stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack
+, libtermkey, libtool, libuv, lpeg, lua, luajit, luaMessagePack
+, luabitop, ncurses, perl, pkgconfig, unibilium
+, withJemalloc ? true, jemalloc }:
 
-let version = "2014-11-26"; in
+let version = "2015-05-26"; in
 stdenv.mkDerivation rec {
   name = "neovim-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1bcmv0h3ln736xdv7r7v97vim2yqfdnkvpbckwdxi69p4d6lfms6";
-    rev = "68fcd8b696dae33897303c9f8265629a31afbf17";
+    sha256 = "0sszpqlq0yp6r62zgcjcmnllc058wzzh9ccvgb2jh9k19ksszyhc";
+    rev = "5a9ad68b258f33ebd7fa0a5da47b308f50f1e5e7";
     repo = "neovim";
     owner = "neovim";
   };
 
-  libmsgpack = stdenv.mkDerivation rec {
-    version = "0.5.9";
-    name = "libmsgpack-${version}";
+  # FIXME: this is NOT the libvterm already in nixpkgs, but some NIH silliness:
+  neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation rec {
+    name = "neovim-libvterm-${version}";
 
     src = fetchFromGitHub {
-      sha256 = "12np3c2q346963mdgwa61y5dfnb91avq2hy4r6i6bdjwa7w6waq4";
-      rev = "ecf4b09acd29746829b6a02939db91dfdec635b4";
-      repo = "msgpack-c";
-      owner = "msgpack";
+      sha256 = "0i2h74jrx4fy90sv57xj8g4lbjjg4nhrq2rv6rz576fmqfpllcc5";
+      rev = "20ad1396c178c72873aeeb2870bd726f847acb70";
+      repo = "libvterm";
+      owner = "neovim";
     };
 
-    buildInputs = [ cmake ];
+    buildInputs = [ libtool perl ];
+
+    makeFlags = "PREFIX=$(out)";
 
     enableParallelBuilding = true;
 
     meta = with stdenv.lib; {
-      description = "MessagePack implementation for C and C++";
-      homepage = http://msgpack.org;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ manveru nckx ];
-      platforms = platforms.all;
+      description = "VT220/xterm/ECMA-48 terminal emulator library";
+      homepage = http://www.leonerd.org.uk/code/libvterm/;
+      license = licenses.mit;
+      maintainers = with maintainers; [ nckx ];
+      platforms = platforms.unix;
     };
   };
 
   enableParallelBuilding = true;
 
   buildInputs = [
-    ncurses
-    pkgconfig
     cmake
-    pkgs.libuvVersions.v0_11_29
+    glib
+    libtermkey
+    libuv
     luajit
     lua
     lpeg
     luaMessagePack
     luabitop
     libmsgpack
+    ncurses
+    neovimLibvterm
+    pkgconfig
+    unibilium
+  ] ++ stdenv.lib.optional withJemalloc jemalloc;
+  nativeBuildInputs = [
+    gettext
   ];
-  nativeBuildInputs = [ gettext ];
 
   LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so";
   LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua";
-  cmakeFlags = [
-    "-DUSE_BUNDLED_MSGPACK=ON"
-  ];
 
   meta = with stdenv.lib; {
     description = "Vim text editor fork focused on extensibility and agility";
@@ -68,7 +75,7 @@ stdenv.mkDerivation rec {
         modifications to the core source
       - Improve extensibility with a new plugin architecture
     '';
-    homepage    = http://www.neovim.org;
+    homepage    = http://www.neovim.io;
     # "Contributions committed before b17d96 by authors who did not sign the
     # Contributor License Agreement (CLA) remain under the Vim license.
     # Contributions committed after b17d96 are licensed under Apache 2.0 unless

From 2af37733427eef86faf6c3c18126b06ac510f5be Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 24 May 2015 20:34:07 +0200
Subject: [PATCH 0281/2322] python-packages: webtest: unittest2 is a Python
 package

---
 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 d4c7f8894b1..641616352f8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13217,7 +13217,7 @@ let
     # XXX: skipping two tests fails in python2.6
     doCheck = ! isPy26;
 
-    buildInputs = optionals isPy26 [ self.ordereddict unittest2 ];
+    buildInputs = with self; optionals isPy26 [ ordereddict unittest2 ];
 
     propagatedBuildInputs = with self; [
       nose

From 60461dee1c55c6305c98dad517db6b5d5444ad2d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 27 May 2015 01:37:42 +0200
Subject: [PATCH 0282/2322] python-packages: pyramid_tm: re-enable checks

Tested on x86_64-linux.

If tests still fail elsewhere, disable them (per platform?) with a
more descriptive and up-to-date comment.
---
 pkgs/top-level/python-packages.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 641616352f8..f086aef1a6f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3897,9 +3897,6 @@ let
       md5 = "89a293488093d6c30036345fa46184d2";
     };
 
-    # tests are failing in version 0.7 but are fixed in trunk
-    doCheck = false;
-
     propagatedBuildInputs = with self; [ transaction pyramid ];
     meta = {
       maintainers = with maintainers; [ garbas iElectric matejc ];

From dda255f938ca9a89b196aa43192f3a5555a89364 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 27 May 2015 02:56:39 +0200
Subject: [PATCH 0283/2322] jmtpfs: fix changed sha256 hash

...by switching to fetchFromGitHub. Also clean up (some
dependencies are no longer needed).
---
 pkgs/tools/filesystems/jmtpfs/default.nix | 25 +++++++++++------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix
index 86dad1cc0fa..2a2ff0a47a5 100644
--- a/pkgs/tools/filesystems/jmtpfs/default.nix
+++ b/pkgs/tools/filesystems/jmtpfs/default.nix
@@ -1,23 +1,22 @@
-{ stdenv, fetchurl
-, autoconf, automake
-, unzip, pkgconfig
-, file, fuse, libmtp }:
+{ stdenv, fetchFromGitHub, pkgconfig, file, fuse, libmtp }:
 
-stdenv.mkDerivation rec {
-  version = "0.5";
+let version = "0.5"; in
+stdenv.mkDerivation {
   name = "jmtpfs-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/JasonFerrara/jmtpfs/archive/v0.5.zip";
-    sha256 = "09fw4g350mjz1mnga7ws5nvnsnfzs8s7cscl300mas1m9s6vmhz6";
+  src = fetchFromGitHub {
+    sha256 = "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1";
+    rev = "v${version}";
+    repo = "jmtpfs";
+    owner = "JasonFerrara";
   };
 
-  buildInputs = [ autoconf automake file fuse libmtp pkgconfig unzip ];
+  buildInputs = [ file fuse libmtp pkgconfig ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A FUSE filesystem for MTP devices like Android phones";
     homepage = https://github.com/JasonFerrara/jmtpfs;
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.coconnor ];
+    license = licenses.gpl3;
+    maintainers = [ maintainers.coconnor ];
   };
 }

From 4e4d01af81f627fe7ea3221ccd0e2d9a7f4b94e6 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 27 May 2015 01:18:30 +0200
Subject: [PATCH 0284/2322] rustc: Use fetchzip in src attr instead of fetchurl

Otherwise, `RUST_SRC_PATH` in `racerRust` will point to an invalid path
(such as `/nix/store/xxx-rustc-1.0.0.tar.gz/src`, where
`rustc-1.0.0.tar.gz` is a real tarball file).
---
 pkgs/development/compilers/rustc/1.0.0.nix               | 2 +-
 pkgs/development/compilers/rustc/makeRustcDerivation.nix | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/rustc/1.0.0.nix b/pkgs/development/compilers/rustc/1.0.0.nix
index bd02397986b..a85ed9290fe 100644
--- a/pkgs/development/compilers/rustc/1.0.0.nix
+++ b/pkgs/development/compilers/rustc/1.0.0.nix
@@ -2,7 +2,7 @@
 callPackage ./makeRustcDerivation.nix {
   shortVersion = "1.0.0";
   isRelease = true;
-  srcSha = "1fjyk5xhg9dx85d1kkjmb1jai7awvdmzcjf2fdmi2pdjyzacn163";
+  srcSha = "14brziw91d3r88fa1kvpvhap5ws4z8h2mas7h6k9lpsc2zl9blak";
   snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec";
   snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349";
   snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234";
diff --git a/pkgs/development/compilers/rustc/makeRustcDerivation.nix b/pkgs/development/compilers/rustc/makeRustcDerivation.nix
index ae3981f1add..6208190f8df 100644
--- a/pkgs/development/compilers/rustc/makeRustcDerivation.nix
+++ b/pkgs/development/compilers/rustc/makeRustcDerivation.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper
-, tzdata, git, valgrind, procps, coreutils
+{ stdenv, fetchurl, fetchgit, fetchzip, which, file, perl, curl, python27
+, makeWrapper, tzdata, git, valgrind, procps, coreutils
 
 , shortVersion, isRelease
 , srcSha, srcRev ? ""
@@ -85,7 +85,7 @@ stdenv.mkDerivation {
   inherit meta;
 
   src = if isRelease then
-      fetchurl {
+      fetchzip {
         url = "http://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
         sha256 = srcSha;
       }

From faff3a44a7e20f3f19aa074aafab88155914dbef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 May 2015 20:46:39 +0200
Subject: [PATCH 0285/2322] Add libpqxx

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

diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix
new file mode 100644
index 00000000000..5b02cfec7e3
--- /dev/null
+++ b/pkgs/development/libraries/libpqxx/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchurl, postgresql, python }:
+
+stdenv.mkDerivation rec {
+  name = "libpqxx-4.0.1";
+
+  src = fetchurl {
+    url = "http://pqxx.org/download/software/libpqxx/${name}.tar.gz";
+    sha256 = "0f6wxspp6rx12fkasanb0z2g2gc8dhcfwnxagx8wwqbpg6ifsz09";
+  };
+
+  buildInputs = [ postgresql python ];
+
+  preConfigure = ''
+    patchShebangs .
+  '';
+
+  configureFlags = "--enable-shared";
+
+  meta = {
+    description = "A C++ library to access PostgreSQL databases";
+    homepage = http://pqxx.org/development/libpqxx/;
+    license = lib.licenses.postgresql;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.eelco ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c488a1f9985..0ea0cae355f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7019,6 +7019,8 @@ let
 
   libpfm = callPackage ../development/libraries/libpfm { };
 
+  libpqxx = callPackage ../development/libraries/libpqxx { };
+
   libproxy = callPackage ../development/libraries/libproxy {
     stdenv = if stdenv.isDarwin
       then overrideCC stdenv gcc

From 49b5acc3d915bac81614773fd604aeffaa540641 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 27 May 2015 11:42:53 +0000
Subject: [PATCH 0286/2322] Upgrade dhcpcd to 6.9.0. Version 6.8.1 caused
 issues on GCE, making the instances unavailable.

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

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 95700cb3806..a89d1e3e888 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, udev }:
 
 stdenv.mkDerivation rec {
-  name = "dhcpcd-6.8.1";
+  name = "dhcpcd-6.9.0";
 
   src = fetchurl {
     url = "mirror://roy/dhcpcd/${name}.tar.bz2";
-    sha256 = "10mg68yxvl4kn1ya8ziifg2dm71c10r12sg7y7k1k0vafazhrdi7";
+    sha256 = "0s0a29ml9x108lxv5yz55f3l5kvlx4hcbxigfq3hr245yy7aarhm";
   };
 
   buildInputs = [ pkgconfig udev ];

From 0c44867bf2a5dbf5a89c09328b83ccc234269346 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 27 May 2015 14:07:34 +0200
Subject: [PATCH 0287/2322] Update seahorse 3.14 -> 3.16

---
 pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
index cebbce78177..7d610c79b49 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
@@ -2,16 +2,16 @@
 , pkgconfig, gtk3, glib, hicolor_icon_theme
 , makeWrapper, itstool, gnupg, libsoup
 , gnome3, librsvg, gdk_pixbuf, gpgme
-, libsecret, avahi, p11_kit }:
+, libsecret, avahi, p11_kit, openssh }:
 
 let
-  majVer = "3.14";
+  majVer = gnome3.version;
 in stdenv.mkDerivation rec {
-  name = "seahorse-${majVer}.1";
+  name = "seahorse-${majVer}.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/seahorse/${majVer}/${name}.tar.xz";
-    sha256 = "14syy2qxxrim220aj64mbp76jbrrc6wmdwc4lfl4sngsh84qjah9";
+    sha256 = "0cg1grgpwbfkiny5148n17rzpc8kswyr5yff0kpm8l3lp01my2kp";
   };
 
   doCheck = true;
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
                   gnome3.gsettings_desktop_schemas makeWrapper gnupg
                   gdk_pixbuf gnome3.adwaita-icon-theme librsvg gpgme
                   libsecret avahi libsoup p11_kit vala gnome3.gcr
-                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+                  hicolor_icon_theme gnome3.adwaita-icon-theme openssh ];
 
   preFixup = ''
     wrapProgram "$out/bin/seahorse" \

From 150ae25546ac7f3424c26fd282829792a4b8b74d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 27 May 2015 14:43:46 +0200
Subject: [PATCH 0288/2322] bundler: do not add a ruby name prefix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Otherwise bundler replaces ruby:

% nix-env -iA nixpkgs.ruby
installing ‘ruby-1.9.3-p547’
% nix-env -iA nixpkgs.bundler
replacing old ‘ruby-1.9.3-p547’
installing ‘ruby-1.9.3-p547-bundler-1.9.2’
---
 pkgs/development/interpreters/ruby/bundler.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/interpreters/ruby/bundler.nix b/pkgs/development/interpreters/ruby/bundler.nix
index 88e0af2a21b..9ae1af70fcf 100644
--- a/pkgs/development/interpreters/ruby/bundler.nix
+++ b/pkgs/development/interpreters/ruby/bundler.nix
@@ -2,6 +2,7 @@
 
 buildRubyGem {
   name = "bundler-1.9.2";
+  namePrefix = "";
   sha256 = "0ck9bnqg7miimggj1d6qlabrsa5h9yaw241fqn15cvqh915209zk";
   dontPatchShebangs = true;
   postInstall = ''

From 2a133686787fe220c16daec8e49af463624677c7 Mon Sep 17 00:00:00 2001
From: Aycan iRiCAN <iricanaycan@gmail.com>
Date: Wed, 27 May 2015 05:27:07 +0300
Subject: [PATCH 0289/2322] Added web-mode for emacs

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 1f3386aa9cb..b393d689155 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1201,6 +1201,22 @@ let self = _self // overrides;
     };
   };
 
+  web-mode = melpaBuild rec {
+    pname   = "web-mode";
+    version = "11.1.12";
+    src = fetchFromGitHub {
+      owner  = "fxbois";
+      repo   = pname;
+      rev    = "67259f16bfaec5c006a53533b8feeba7771e1365";
+      sha256 = "16zcnwm7wnbl1xbsx7rr5rr697ax141akfx2lknwirx18vqmkijj";
+    };
+    
+    meta = {
+      description = "Web template editing mode for emacs";
+      license = gpl2;
+    };
+  };
+  
   weechat = melpaBuild rec {
     pname   = "weechat.el";
     version = "0.2.2";

From 7ed1fb30e2e9cb3c823f011f89f714cffe578c4d Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Mon, 25 May 2015 10:41:24 +0000
Subject: [PATCH 0290/2322] Added mwlib services

Simple local usage:

    mwlib = {
      nserve = {
        enable = true;
      };

      qserve = {
        enable = true;
      };
    };

For MediaWiki:

      $wgCollectionMWServeURL = 'http://localhost:8899';
      $wgCollectionFormats = array(
        'rl' => 'PDF',
        'odf' => 'ODT',
      );

      $wgCollectionPortletFormats = array (
        'odf', 'rl'
      );
---
 nixos/modules/module-list.nix         |   1 +
 nixos/modules/services/misc/mwlib.nix | 258 ++++++++++++++++++++++++++
 2 files changed, 259 insertions(+)
 create mode 100644 nixos/modules/services/misc/mwlib.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 043b0470edf..03c3f10088e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -202,6 +202,7 @@
   ./services/misc/mediatomb.nix
   ./services/misc/mesos-master.nix
   ./services/misc/mesos-slave.nix
+  ./services/misc/mwlib.nix
   ./services/misc/nix-daemon.nix
   ./services/misc/nix-gc.nix
   ./services/misc/nixos-manual.nix
diff --git a/nixos/modules/services/misc/mwlib.nix b/nixos/modules/services/misc/mwlib.nix
new file mode 100644
index 00000000000..fb4a24253df
--- /dev/null
+++ b/nixos/modules/services/misc/mwlib.nix
@@ -0,0 +1,258 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.mwlib;
+  pypkgs = pkgs.python27Packages;
+
+  inherit (pypkgs) python mwlib;
+
+  user = mkOption {
+    default = "nobody";
+    type = types.str;
+    description = "User to run as.";
+  };
+
+in
+{
+
+  options.services.mwlib = {
+
+    nserve = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Whether to enable nserve. Nserve is a HTTP
+          server.  The Collection extension is talking to
+          that program directly.  Nserve uses at least
+          one qserve instance in order to distribute
+          and manage jobs.
+        '';
+      }; # nserve.enable
+
+      port = mkOption {
+        default = 8899;
+        type = types.int;
+        description = "Specify port to listen on.";
+      }; # nserve.port
+
+      address = mkOption {
+        default = "127.0.0.1";
+        type = types.str;
+        description = "Specify network interface to listen on.";
+      }; # nserve.address
+
+      qserve = mkOption {
+        default = [ "${cfg.qserve.address}:${toString cfg.qserve.port}" ];
+        type = types.listOf types.str;
+        description = "Register qserve instance.";
+      }; # nserve.qserve
+
+      inherit user;
+    }; # nserve
+
+    qserve = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          A job queue server used to distribute and manage
+          jobs. You should start one qserve instance
+          for each machine that is supposed to render pdf
+          files. Unless you’re operating the Wikipedia
+          installation, one machine should suffice.
+        '';
+      }; # qserve.enable
+
+      port = mkOption {
+        default = 14311;
+        type = types.int;
+        description = "Specify port to listen on.";
+      }; # qserve.port
+
+      address = mkOption {
+        default = "127.0.0.1";
+        type = types.str;
+        description = "Specify network interface to listen on.";
+      }; # qserve.address
+
+      datadir = mkOption {
+        default = "/var/lib/mwlib-qserve";
+        type = types.path;
+        description = "qserve data directory (FIXME: unused?)";
+      }; # qserve.datadir
+
+      allow = mkOption {
+        default = [ "127.0.0.1" ];
+        type = types.listOf types.str;
+        description = "List of allowed client IPs. Empty means any.";
+      }; # qserve.allow
+
+      inherit user;
+    }; # qserve
+
+    nslave = {
+      enable = mkOption {
+        default = cfg.qserve.enable;
+        type = types.bool;
+        description = ''
+          Pulls new jobs from exactly one qserve instance
+          and calls the zip and render programs
+          in order to download article collections and
+          convert them to different output formats. Nslave
+          uses a cache directory to store the generated
+          documents. Nslave also starts an internal http
+          server serving the content of the cache directory.
+        '';
+      }; # nslave.enable
+
+      cachedir = mkOption {
+        default = "/var/cache/mwlib-nslave";
+        type = types.path;
+        description = "Directory to store generated documents.";
+      }; # nslave.cachedir
+
+      numprocs = mkOption {
+        default = 10;
+        type = types.int;
+        description = "Number of parallel jobs to be executed.";
+      }; # nslave.numprocs
+
+      http = mkOption {
+        default = {};
+        description = ''
+          Internal http server serving the content of the cache directory.
+          You have to enable it, or use your own way for serving files
+          and set the http.url option accordingly.
+          '';
+        type = types.submodule ({
+          options = {
+            enable = mkOption {
+              default = true;
+              type = types.bool;
+              description = "Enable internal http server.";
+            }; # nslave.http.enable
+
+            port = mkOption {
+              default = 8898;
+              type = types.int;
+              description = "Port to listen to when serving files from cache.";
+            }; # nslave.http.port
+
+            address = mkOption {
+              default = "127.0.0.1";
+              type = types.str;
+              description = "Specify network interface to listen on.";
+            }; # nslave.http.address
+
+            url = mkOption {
+              default = "http://localhost:${toString cfg.nslave.http.port}/cache";
+              type = types.str;
+              description = ''
+                Specify URL for accessing generated files from cache.
+                The Collection extension of Mediawiki won't be able to
+                download files without it.
+                '';
+            }; # nslave.http.url
+          };
+        }); # types.submodule
+      }; # nslave.http
+
+      inherit user;
+    }; # nslave
+
+  }; # options.services
+
+  config = { 
+
+    systemd.services.mwlib-nserve = mkIf cfg.nserve.enable
+    {
+      description = "mwlib network interface";
+
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" "mwlib-qserve.service" ];
+
+      serviceConfig = {
+        ExecStart = concatStringsSep " " (
+          [
+            "${mwlib}/bin/nserve"
+            "--port ${toString cfg.nserve.port}"
+            "--interface ${cfg.nserve.address}"
+          ] ++ cfg.nserve.qserve
+        );
+        User = cfg.nserve.user;
+      };
+    }; # systemd.services.mwlib-nserve
+
+    systemd.services.mwlib-qserve = mkIf cfg.qserve.enable
+    {
+      description = "mwlib job queue server";
+
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" "local-fs.target" ];
+
+      preStart = ''
+        mkdir -pv '${cfg.qserve.datadir}'
+        chown -Rc ${cfg.qserve.user}:`id -ng ${cfg.qserve.user}` '${cfg.qserve.datadir}'
+        chmod -Rc u=rwX,go= '${cfg.qserve.datadir}'
+      '';
+
+      serviceConfig = {
+        ExecStart = concatStringsSep " " (
+          [
+            "${mwlib}/bin/mw-qserve"
+            "-p ${toString cfg.qserve.port}"
+            "-i ${cfg.qserve.address}"
+            "-d ${cfg.qserve.datadir}"
+          ] ++ map (a: "-a ${a}") cfg.qserve.allow
+        );
+        User = cfg.qserve.user;
+        PermissionsStartOnly = true;
+      };
+    }; # systemd.services.mwlib-qserve
+
+    systemd.services.mwlib-nslave = mkIf cfg.nslave.enable
+    {
+      description = "mwlib worker";
+
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" "local-fs.target" ];
+
+      preStart = ''
+        mkdir -pv '${cfg.nslave.cachedir}'
+        chown -Rc ${cfg.nslave.user}:`id -ng ${cfg.nslave.user}` '${cfg.nslave.cachedir}'
+        chmod -Rc u=rwX,go= '${cfg.nslave.cachedir}'
+      '';
+
+      environment = {
+        PYTHONPATH = concatMapStringsSep ":"
+          (m: "${pypkgs.${m}}/lib/${python.libPrefix}/site-packages")
+          [ "mwlib-rl" "mwlib-ext" "pygments" ];
+      };
+
+      serviceConfig = {
+        ExecStart = concatStringsSep " " (
+          [
+            "${mwlib}/bin/nslave"
+            "--cachedir ${cfg.nslave.cachedir}"
+            "--numprocs ${toString cfg.nslave.numprocs}"
+            "--url ${cfg.nslave.http.url}"
+          ] ++ (
+            if cfg.nslave.http.enable then
+            [
+              "--serve-files-port ${toString cfg.nslave.http.port}"
+              "--serve-files-address ${cfg.nslave.http.address}"
+            ] else
+            [
+              "--no-serve-files"
+            ]
+          ));
+        User = cfg.nslave.user;
+        PermissionsStartOnly = true;
+      };
+    }; # systemd.services.mwlib-nslave
+
+  }; # config
+}

From d88f704516a4759c9af2502a93f237076bb9fc6a Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Tue, 26 May 2015 11:49:02 +0000
Subject: [PATCH 0291/2322] Pillow requires lcms2 with python2.7 too

---
 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 47ec86b41ad..b9a1eaf32ed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8477,7 +8477,7 @@ let
 
     buildInputs = with self; [
       pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl ]
-      ++ optionals (isPy26 || isPy33 || isPyPy) [ pkgs.lcms2 ]
+      ++ optionals (isPy26 || isPy27 || isPy33 || isPyPy) [ pkgs.lcms2 ]
       ++ optionals (isPyPy) [ pkgs.tk pkgs.xlibs.libX11 ];
 
     # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.

From 9e0763dd8a5a157d056b665ee41ba3c67cee5077 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 27 May 2015 17:01:53 +0200
Subject: [PATCH 0292/2322] Add lolcat, a rainbow version of cat

Closes #3399
---
 pkgs/tools/misc/lolcat/Gemfile      |  2 ++
 pkgs/tools/misc/lolcat/Gemfile.lock | 14 ++++++++++++++
 pkgs/tools/misc/lolcat/default.nix  | 18 ++++++++++++++++++
 pkgs/tools/misc/lolcat/gemset.nix   | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 5 files changed, 63 insertions(+)
 create mode 100644 pkgs/tools/misc/lolcat/Gemfile
 create mode 100644 pkgs/tools/misc/lolcat/Gemfile.lock
 create mode 100644 pkgs/tools/misc/lolcat/default.nix
 create mode 100644 pkgs/tools/misc/lolcat/gemset.nix

diff --git a/pkgs/tools/misc/lolcat/Gemfile b/pkgs/tools/misc/lolcat/Gemfile
new file mode 100644
index 00000000000..63f6c6633b3
--- /dev/null
+++ b/pkgs/tools/misc/lolcat/Gemfile
@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gem "lolcat"
\ No newline at end of file
diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock
new file mode 100644
index 00000000000..4b318ea1473
--- /dev/null
+++ b/pkgs/tools/misc/lolcat/Gemfile.lock
@@ -0,0 +1,14 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    lolcat (42.1.0)
+      paint (~> 0.8.3)
+      trollop (~> 1.16.2)
+    paint (0.8.7)
+    trollop (1.16.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  lolcat
diff --git a/pkgs/tools/misc/lolcat/default.nix b/pkgs/tools/misc/lolcat/default.nix
new file mode 100644
index 00000000000..21355652d3e
--- /dev/null
+++ b/pkgs/tools/misc/lolcat/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, lib, bundlerEnv, gpgme, ruby, ncurses, writeText, zlib, xapian
+, pkgconfig, which }:
+
+bundlerEnv {
+  name = "lolcat-42.1.0";
+
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  meta = with lib; {
+    description = "A rainbow version of cat";
+    homepage    = https://github.com/busyloop/lolcat;
+    license     = licenses.wtfpl;
+    maintainers = with maintainers; [ pSub ];
+  };
+}
diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix
new file mode 100644
index 00000000000..85acf7767a8
--- /dev/null
+++ b/pkgs/tools/misc/lolcat/gemset.nix
@@ -0,0 +1,27 @@
+{
+  "lolcat" = {
+    version = "42.1.0";
+    source = {
+      type = "gem";
+      sha256 = "1jp0g7k958dg709dm1qs7nr8dmi4vlgvmcvqcr1zhk8ygx89rwgc";
+    };
+    dependencies = [
+      "paint"
+      "trollop"
+    ];
+  };
+  "paint" = {
+    version = "0.8.7";
+    source = {
+      type = "gem";
+      sha256 = "0nl1x0190d44bfczlxdy16gxsvm95y14kxv3k9n92h9ap2zvdyd8";
+    };
+  };
+  "trollop" = {
+    version = "1.16.2";
+    source = {
+      type = "gem";
+      sha256 = "0frrp90dw266h3kf9g925dppir9l7p8jxknw6dn5nz6fa6c4g5lg";
+    };
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ea0cae355f..6340088b89d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1885,6 +1885,8 @@ let
 
   logstash-forwarder = callPackage ../tools/misc/logstash-forwarder { };
 
+  lolcat = callPackage ../tools/misc/lolcat { };
+
   lsdvd = callPackage ../tools/cd-dvd/lsdvd {};
 
   kippo = callPackage ../servers/kippo { };

From 6c2fc83a858a6453b9e4671345a654d6b177c5b1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 27 May 2015 17:11:33 +0200
Subject: [PATCH 0293/2322] bundler: bin/bundler expects ruby in PATH

---
 pkgs/development/interpreters/ruby/bundler.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/ruby/bundler.nix b/pkgs/development/interpreters/ruby/bundler.nix
index 9ae1af70fcf..336d4054422 100644
--- a/pkgs/development/interpreters/ruby/bundler.nix
+++ b/pkgs/development/interpreters/ruby/bundler.nix
@@ -1,4 +1,4 @@
-{ buildRubyGem, coreutils }:
+{ buildRubyGem, makeWrapper, ruby, coreutils }:
 
 buildRubyGem {
   name = "bundler-1.9.2";
@@ -10,5 +10,8 @@ buildRubyGem {
       substituteInPlace $f \
          --replace "/usr/bin/env" "${coreutils}/bin/env"
     done
+
+    wrapProgram $out/bin/bundler \
+      --prefix PATH ":" ${ruby}/bin
   '';
 }

From 4587819638a2785f7f13b9dc78a32157dd7ce547 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Wed, 27 May 2015 11:48:03 -0400
Subject: [PATCH 0294/2322] openjpeg: refactor, fixes #8017 + Disable JPIP
 which requires Java + fix typo in nativeBuildInputs, which fixes pkgconfig

---
 pkgs/development/libraries/openjpeg/1.x.nix   |  7 +-
 pkgs/development/libraries/openjpeg/2.0.1.nix | 10 ---
 pkgs/development/libraries/openjpeg/2.0.nix   |  7 ++
 pkgs/development/libraries/openjpeg/2.1.nix   |  7 +-
 .../libraries/openjpeg/generic.nix            | 69 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  4 +-
 6 files changed, 40 insertions(+), 64 deletions(-)
 delete mode 100644 pkgs/development/libraries/openjpeg/2.0.1.nix
 create mode 100644 pkgs/development/libraries/openjpeg/2.0.nix

diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix
index 14886f02142..2147bab0a6a 100644
--- a/pkgs/development/libraries/openjpeg/1.x.nix
+++ b/pkgs/development/libraries/openjpeg/1.x.nix
@@ -1,10 +1,7 @@
-{ callPackage, fetchurl, ... } @ args:
+{ callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "${branch}.2";
   branch = "1.5";
-  src = fetchurl {
-    url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz";
-    sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm";
-  };
+  sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm";
 })
diff --git a/pkgs/development/libraries/openjpeg/2.0.1.nix b/pkgs/development/libraries/openjpeg/2.0.1.nix
deleted file mode 100644
index 25575450b47..00000000000
--- a/pkgs/development/libraries/openjpeg/2.0.1.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "${branch}.0.1";
-  branch = "2";
-  src = fetchurl {
-    url = "mirror://sourceforge/openjpeg.mirror/openjpeg-${version}.tar.gz";
-    sha256 = "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z";
-  };
-})
diff --git a/pkgs/development/libraries/openjpeg/2.0.nix b/pkgs/development/libraries/openjpeg/2.0.nix
new file mode 100644
index 00000000000..034942b25dd
--- /dev/null
+++ b/pkgs/development/libraries/openjpeg/2.0.nix
@@ -0,0 +1,7 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}.0.1";
+  branch = "2";
+  sha256 = "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z";
+})
diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix
index 7e48b656ae2..f6b3ce3a9cd 100644
--- a/pkgs/development/libraries/openjpeg/2.1.nix
+++ b/pkgs/development/libraries/openjpeg/2.1.nix
@@ -1,10 +1,7 @@
-{ callPackage, fetchurl, ... } @ args:
+{ callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "${branch}.0";
   branch = "2.1";
-  src = fetchurl {
-    url = "mirror://gentoo/distfiles/openjpeg-${version}.tar.gz";
-    sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj";
-  };
+  sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj";
 })
diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix
index 3fae65d9bd2..717e5a4de2c 100644
--- a/pkgs/development/libraries/openjpeg/generic.nix
+++ b/pkgs/development/libraries/openjpeg/generic.nix
@@ -1,85 +1,70 @@
-{ stdenv, cmake, pkgconfig, libpng, libtiff, lcms2, glib/*passthru only*/
-, sharedLibsSupport ? true # Build shared libraries
-, codecSupport ? true # Codec executables
+{ stdenv, fetchurl, cmake, pkgconfig
+, libpng, libtiff, lcms2
 , mj2Support ? true # MJ2 executables
 , jpwlLibSupport ? true # JPWL library & executables
-, jpipLibSupport ? true # JPIP library & executables
+, jpipLibSupport ? false # JPIP library & executables
 , jpipServerSupport ? false, curl ? null, fcgi ? null # JPIP Server
 #, opjViewerSupport ? false, wxGTK ? null # OPJViewer executable
-, openjpegJarSupport ? false, jdk ? null # Openjpeg jar (Java)
+, openjpegJarSupport ? false # Openjpeg jar (Java)
 , jp3dSupport ? true # # JP3D comp
 , thirdPartySupport ? false # Third party libraries - OFF: only build when found, ON: always build
 , testsSupport ? false
+, jdk ? null
 # Inherit generics
-, branch, src, version, ...
+, branch, sha256, version, ...
 }:
 
-assert jpipServerSupport -> (jpipLibSupport && (curl != null) && (fcgi != null));
+assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null;
 #assert opjViewerSupport -> (wxGTK != null);
-assert openjpegJarSupport -> (jdk != null);
-assert testsSupport -> codecSupport;
+assert (openjpegJarSupport || jpipLibSupport) -> jdk != null;
 
 let
-  mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF";
+  inherit (stdenv.lib) optional optionals;
+  mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}";
 in
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "openjpeg-${version}";
-  inherit branch;
-  inherit version;
-  inherit src;
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/openjpeg.mirror/${version}/openjpeg-${version}.tar.gz";
+    inherit sha256;
+  };
 
   cmakeFlags = [
-    (mkFlag sharedLibsSupport "BUILD_SHARED_LIBS")
-    (mkFlag codecSupport "BUILD_CODEC")
+    "-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib"
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DBUILD_CODEC=ON"
     (mkFlag mj2Support "BUILD_MJ2")
     (mkFlag jpwlLibSupport "BUILD_JPWL")
     (mkFlag jpipLibSupport "BUILD_JPIP")
     (mkFlag jpipServerSupport "BUILD_JPIP_SERVER")
     #(mkFlag opjViewerSupport "BUILD_VIEWER")
+    "-DBUILD_VIEWER=OFF"
     (mkFlag openjpegJarSupport "BUILD_JAVA")
     (mkFlag jp3dSupport "BUILD_JP3D")
     (mkFlag thirdPartySupport "BUILD_THIRDPARTY")
     (mkFlag testsSupport "BUILD_TESTING")
-  ] ++ stdenv.lib.optionals stdenv.isDarwin
-  [ "-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib"
   ];
 
-  nativebuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ cmake ]
+  buildInputs = [ ]
     ++ optionals jpipServerSupport [ curl fcgi ]
     #++ optional opjViewerSupport wxGTK
-    ++ optional openjpegJarSupport jdk;
+    ++ optional (openjpegJarSupport || jpipLibSupport) jdk;
 
   propagatedBuildInputs = [ libpng libtiff lcms2 ];
 
-  postInstall = glib.flattenInclude + ''
-    mkdir -p "$out/lib/pkgconfig"
-    cat > "$out/lib/pkgconfig/libopenjp2.pc" <<EOF
-    prefix=$out
-    libdir=$out/lib
-    includedir=$out/include
-
-    Name: openjp2
-    Description: JPEG2000 library (Part 1 and 2)
-    URL: http://www.openjpeg.org/
-    Version: ${version}
-    Libs: -L$out/lib -lopenjp2
-    Cflags: -I$out/include
-    EOF
-  '';
-
   passthru = {
     incDir = "openjpeg-${branch}";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Open-source JPEG 2000 codec written in C language";
-    homepage    = http://www.openjpeg.org/;
-    license     = licenses.bsd2;
-    maintainer  = with maintainers; [ codyopel ];
-    platforms   = platforms.all;
+    homepage = http://www.openjpeg.org/;
+    license = licenses.bsd2;
+    maintainer = with maintainers; [ codyopel ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ea0cae355f..d333142adff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7502,7 +7502,7 @@ let
   opal = callPackage ../development/libraries/opal {};
 
   openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { };
-  openjpeg_2_0_1 = callPackage ../development/libraries/openjpeg/2.0.1.nix { };
+  openjpeg_2_0 = callPackage ../development/libraries/openjpeg/2.0.nix { };
   openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { };
   openjpeg = openjpeg_2_1;
 
@@ -11868,7 +11868,7 @@ let
   maxlib = callPackage ../applications/audio/pd-plugins/maxlib { };
 
   mupdf = callPackage ../applications/misc/mupdf {
-    openjpeg = openjpeg_2_0_1;
+    openjpeg = openjpeg_2_0;
   };
 
   mypaint = callPackage ../applications/graphics/mypaint { };

From a22cffa7bb3f00bdeccfcc959323966526f9b1d9 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 26 May 2015 21:23:55 -0400
Subject: [PATCH 0295/2322] ht: new package

HT is a file editor/viewer/analyzer for executables.
---
 pkgs/applications/editors/ht/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/editors/ht/default.nix

diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix
new file mode 100644
index 00000000000..b7acdb7f1d5
--- /dev/null
+++ b/pkgs/applications/editors/ht/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, lib, fetchurl, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "ht-${version}";
+  version = "2.1.0";
+  src = fetchurl {
+    url = "http://sourceforge.net/projects/hte/files/ht-source/ht-${version}.tar.bz2";
+    sha256 = "0w2xnw3z9ws9qrdpb80q55h6ynhh3aziixcfn45x91bzrbifix9i";
+  };
+  buildInputs = [
+    ncurses
+  ];
+  meta = with lib; {
+    description = "File editor/viewer/analyzer for executables";
+    homepage = "http://hte.sourceforge.net";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6340088b89d..016ea101384 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11353,6 +11353,8 @@ let
     gtk = gtk3;
   };
 
+  ht = callPackage ../applications/editors/ht { };
+
   htmldoc = callPackage ../applications/misc/htmldoc {
     fltk = fltk13;
   };

From 4976bcd21825b1608cd0fb86b5b5e643f4edc3b1 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 26 May 2015 21:32:33 -0400
Subject: [PATCH 0296/2322] hexcurse: new package

ncurses-based console hexeditor written in C
---
 .../applications/editors/hexcurse/default.nix | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/editors/hexcurse/default.nix

diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix
new file mode 100644
index 00000000000..861bf88f7dd
--- /dev/null
+++ b/pkgs/applications/editors/hexcurse/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, lib, fetchFromGitHub, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "hexcurse-${version}";
+  version = "1.58";
+  src = fetchFromGitHub {
+    owner = "LonnyGomes";
+    repo = "hexcurse";
+    rev = "hexcurse-${version}";
+    sha256 = "0hm9mms2ija3wqba0mkk9i8fhb8q1pam6d6pjlingkzz6ygxnnp7";
+  };
+  buildInputs = [
+    ncurses
+  ];
+  meta = with lib; {
+    description = "ncurses-based console hexeditor written in C";
+    homepage = "https://github.com/LonnyGomes/hexcurse";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 016ea101384..6441948d0c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11345,8 +11345,12 @@ let
 
   hexchat = callPackage ../applications/networking/irc/hexchat { };
 
+  hexcurse = callPackage ../applications/editors/hexcurse { };
+
   hexedit = callPackage ../applications/editors/hexedit { };
 
+  hiew = callPackage ../applications/editors/hiew { };
+
   hipchat = callPackage ../applications/networking/instant-messengers/hipchat { };
 
   homebank = callPackage ../applications/office/homebank {

From 15b9fe1fabc8c7478c63e9a908e2c1ff286fc487 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Wed, 27 May 2015 11:23:04 -0400
Subject: [PATCH 0297/2322] heme: new package

A portable and fast console hex editor for unix operating systems.
---
 pkgs/applications/editors/heme/default.nix | 27 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/editors/heme/default.nix

diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix
new file mode 100644
index 00000000000..092b7ef6865
--- /dev/null
+++ b/pkgs/applications/editors/heme/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, lib, fetchurl, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "heme-${version}";
+  version = "0.4.2";
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/heme/heme/heme-${version}/heme-${version}.tar.gz";
+    sha256 = "0wsrnj5mrlazgqs4252k30aw8m86qw0z9dmrsli9zdxl7j4cg99v";
+  };
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "/usr/local" "$out" \
+      --replace "CFLAGS = " "CFLAGS = -I${ncurses}/include " \
+      --replace "LDFLAGS = " "LDFLAGS = -L${ncurses}/lib "
+  '';
+  preBuild = ''
+    mkdir -p $out/bin
+    mkdir -p $out/man/man1
+  '';
+  meta = with lib; {
+    description = "Portable and fast console hex editor for unix operating systems";
+    homepage = "http://heme.sourceforge.net/";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6441948d0c5..0e1426d64c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11341,6 +11341,8 @@ let
 
   helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { };
 
+  heme = callPackage ../applications/editors/heme { };
+
   herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { };
 
   hexchat = callPackage ../applications/networking/irc/hexchat { };

From 069913e1b90f649e66f7542ba7c1437a6a2d7f0f Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Wed, 27 May 2015 11:47:18 -0400
Subject: [PATCH 0298/2322] bviplus: new package

ncurses based hex editor with a vim-like interface
---
 pkgs/applications/editors/bviplus/default.nix | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/editors/bviplus/default.nix

diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix
new file mode 100644
index 00000000000..0a8d7081b23
--- /dev/null
+++ b/pkgs/applications/editors/bviplus/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, lib, fetchurl, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "bviplus-${version}";
+  version = "0.9.4";
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/bviplus/bviplus/${version}/bviplus-${version}.tgz";
+    sha256 = "10x6fbn8v6i0y0m40ja30pwpyqksnn8k2vqd290vxxlvlhzah4zb";
+  };
+  buildInputs = [
+    ncurses
+  ];
+  makeFlags = "PREFIX=$(out)";
+  meta = with lib; {
+    description = "ncurses based hex editor with a vim-like interface";
+    homepage = "http://bviplus.sourceforge.net";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e1426d64c1..139a5389319 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10530,6 +10530,8 @@ let
 
   bvi = callPackage ../applications/editors/bvi { };
 
+  bviplus = callPackage ../applications/editors/bviplus { };
+
   calf = callPackage ../applications/audio/calf {
       inherit (gnome) libglade;
   };

From 7355066bfe3cb6faa22d3d647850f5a0e5e6511a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 27 May 2015 18:58:13 +0300
Subject: [PATCH 0299/2322] nixos: add support for exfat filesystem

---
 nixos/modules/module-list.nix             |  1 +
 nixos/modules/tasks/filesystems/exfat.nix | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 nixos/modules/tasks/filesystems/exfat.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 9688585238d..d7b8b34aefe 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -442,6 +442,7 @@
   ./tasks/filesystems.nix
   ./tasks/filesystems/btrfs.nix
   ./tasks/filesystems/cifs.nix
+  ./tasks/filesystems/exfat.nix
   ./tasks/filesystems/ext.nix
   ./tasks/filesystems/f2fs.nix
   ./tasks/filesystems/jfs.nix
diff --git a/nixos/modules/tasks/filesystems/exfat.nix b/nixos/modules/tasks/filesystems/exfat.nix
new file mode 100644
index 00000000000..963bc940b4f
--- /dev/null
+++ b/nixos/modules/tasks/filesystems/exfat.nix
@@ -0,0 +1,11 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = mkIf (any (fs: fs == "exfat") config.boot.supportedFilesystems) {
+
+    system.fsPackages = [ pkgs.exfat-utils pkgs.fuse_exfat ];
+
+  };
+}

From b94e4348ac456c4aeb74a8d1fdbb32644974e122 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Wed, 27 May 2015 12:00:11 -0400
Subject: [PATCH 0300/2322] remove nonexistent "hiew" package

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 139a5389319..4f83ea31c85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11353,8 +11353,6 @@ let
 
   hexedit = callPackage ../applications/editors/hexedit { };
 
-  hiew = callPackage ../applications/editors/hiew { };
-
   hipchat = callPackage ../applications/networking/instant-messengers/hipchat { };
 
   homebank = callPackage ../applications/office/homebank {

From 5e5eaf0fba6775eb4b4d2220418288f73aa62e60 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 27 May 2015 18:11:48 +0200
Subject: [PATCH 0301/2322] Add autotetris-mode, automatically play emacs
 tetris

---
 pkgs/top-level/emacs-packages.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index b393d689155..d74d1840449 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -198,6 +198,19 @@ let self = _self // overrides;
     };
   };
 
+  autotetris = melpaBuild {
+    pname = "autotetris-mode";
+    version = "20141114.846";
+    src = fetchFromGitHub {
+      owner = "skeeto";
+      repo = "autotetris-mode";
+      rev = "7d348d33829bc89ddbd2b4d5cfe5073c3b0cbaaa";
+      sha256 = "14pjsb026mgjf6l3dggy255knr7c1vfmgb6kgafmkzvr96aglcdc";
+    };
+    files = [ "autotetris-mode.el" ];
+    meta =  { license = unlicense; };
+  };
+
   bind-key = melpaBuild {
     pname   = "bind-key";
     version = "20150317";
@@ -1210,13 +1223,13 @@ let self = _self // overrides;
       rev    = "67259f16bfaec5c006a53533b8feeba7771e1365";
       sha256 = "16zcnwm7wnbl1xbsx7rr5rr697ax141akfx2lknwirx18vqmkijj";
     };
-    
+
     meta = {
       description = "Web template editing mode for emacs";
       license = gpl2;
     };
   };
-  
+
   weechat = melpaBuild rec {
     pname   = "weechat.el";
     version = "0.2.2";

From d22b6fb10f30a65583deafa39eeb4f1285f1209b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 27 May 2015 18:13:18 +0200
Subject: [PATCH 0302/2322] nixos: Add small VM test for lightdm.

Serves as a regression test for #7902.

It's not yet referenced in release(-combined)?.nix because it will fail
until the issue is resolved. Tested successfully against libgcrypt with
libcap passed as null however.

As for the test itself, I'm not quite sure whether checking for the time
displayed by IceWM is a good idea, but we can still fix that if it turns
out to be a problem.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/tests/lightdm.nix | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 nixos/tests/lightdm.nix

diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix
new file mode 100644
index 00000000000..dba20a49dbd
--- /dev/null
+++ b/nixos/tests/lightdm.nix
@@ -0,0 +1,25 @@
+import ./make-test.nix {
+  name = "lightdm";
+
+  machine = { lib, ... }: {
+    imports = [ ./common/user-account.nix ];
+    services.xserver.enable = true;
+    services.xserver.displayManager.lightdm.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/${user.description}/);
+    $machine->screenshot("lightdm");
+    $machine->sendChars("${user.password}\n");
+    $machine->waitForText(qr/^\d{2}(?::\d{2}){2} (?:AM|PM)$/m);
+    $machine->screenshot("session");
+  '';
+}

From b3176951a190a1b18c0e089b65841f7105ea01ce Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 27 May 2015 10:54:05 -0700
Subject: [PATCH 0303/2322] libgcrypt: Disable libcap permission dropping

---
 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 4f83ea31c85..368ec616654 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6742,7 +6742,9 @@ let
   libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { };
 
   libgcrypt = callPackage ../development/libraries/libgcrypt {
-    libcap = if stdenv.isDarwin then null else pkgs.libcap;
+    # Breaks packages that expect to have elevated privileges
+    # Ex. Lightdm, cryptsetup
+    libcap = null;
   };
 
   libgdiplus = callPackage ../development/libraries/libgdiplus { };

From 4fd635404d14aa7ef8d59df3e19298118e033c3a Mon Sep 17 00:00:00 2001
From: Siarhei Zirukin <ftrvxmtrx@gmail.com>
Date: Sat, 16 May 2015 16:42:40 +0200
Subject: [PATCH 0304/2322] e19: updates for 1.14.0

- libraries and applications updated to the latest
- the "elementary getting started" (https://docs.enlightenment.org/auto/elementary/group__Start.html)
  works with just `pkg-config --cflags --libs elementary`
- switched from lua-old to elua
---
 pkgs/desktops/e19/econnman.nix      |  6 +++---
 pkgs/desktops/e19/efl-elua.patch    | 14 ++++++++++++++
 pkgs/desktops/e19/efl-setup-hook.sh |  8 --------
 pkgs/desktops/e19/efl.nix           | 26 +++++++++++++++++---------
 pkgs/desktops/e19/elementary.nix    | 15 +++++++--------
 pkgs/desktops/e19/elementary.patch  | 18 ++++++++++++++++++
 pkgs/desktops/e19/emotion.nix       | 10 ++++------
 pkgs/desktops/e19/enlightenment.nix |  8 ++++----
 pkgs/desktops/e19/evas.nix          |  6 +++---
 pkgs/desktops/e19/rage.nix          | 21 +++------------------
 pkgs/desktops/e19/terminology.nix   |  9 +--------
 pkgs/top-level/python-packages.nix  | 12 ++++++------
 12 files changed, 80 insertions(+), 73 deletions(-)
 create mode 100644 pkgs/desktops/e19/efl-elua.patch
 delete mode 100755 pkgs/desktops/e19/efl-setup-hook.sh
 create mode 100644 pkgs/desktops/e19/elementary.patch

diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix
index 08d7a8c3e73..4d80b633bd3 100644
--- a/pkgs/desktops/e19/econnman.nix
+++ b/pkgs/desktops/e19/econnman.nix
@@ -8,15 +8,15 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ];
-  propagatedBuildInputs = [ python27Packages.pythonefl_1_13 python27Packages.dbus e19.elementary ];
+  propagatedBuildInputs = [ python27Packages.pythonefl_1_14 python27Packages.dbus e19.elementary ];
   postInstall = ''
-    wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_13}/lib/python2.7/site-packages
+    wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_14}/lib/python2.7/site-packages
   '';
 
   meta = {
     description = "A user interface for the connman network connection manager";
     homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ];
+    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.lgpl3;
   };
diff --git a/pkgs/desktops/e19/efl-elua.patch b/pkgs/desktops/e19/efl-elua.patch
new file mode 100644
index 00000000000..96c42b3ff3c
--- /dev/null
+++ b/pkgs/desktops/e19/efl-elua.patch
@@ -0,0 +1,14 @@
+--- ./src/scripts/elua/core/util.lua.old	2015-05-17 11:59:57.307743243 +0200
++++ ./src/scripts/elua/core/util.lua	2015-05-17 12:39:11.906797377 +0200
+@@ -159,7 +159,10 @@
+         local ev = os.getenv("ELUA_" .. libname:upper() .. "_LIBRARY_PATH")
+         local succ, v = load_lib(libname, ev)
+         if not succ then
+-            error(v, 2)
++            succ, v = load_lib(libname, "$out/lib")
++            if not succ then
++                error(v, 2)
++            end
+         end
+         lib = v
+         loaded_libs[libname] = lib
diff --git a/pkgs/desktops/e19/efl-setup-hook.sh b/pkgs/desktops/e19/efl-setup-hook.sh
deleted file mode 100755
index d98f24b4c04..00000000000
--- a/pkgs/desktops/e19/efl-setup-hook.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-addDbusIncludePath () {
-    if test -d "$1/include/dbus-1.0"
-    then
-        export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/include/dbus-1.0 -I $1/lib/dbus-1.0/include"
-    fi
-}
-
-envHooks=(${envHooks[@]} addDbusIncludePath)
diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix
index c8860a5f7da..ada0f4650d2 100644
--- a/pkgs/desktops/e19/efl.nix
+++ b/pkgs/desktops/e19/efl.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }:
+{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }:
 
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";
-  version = "1.13.2";
+  version = "1.14.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz";
-    sha256 = "196293zf4pbyd5acs4nzb818yql9r67709ccfj7k3siyws6lsh4q";
+    sha256 = "0sb2104b2rayr2ag0n3g8zqds9nxd53mlyvq7650c3cy8hws5a1h";
   };
 
   buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
     giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base
     gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto
-    xlibs.libX11 udev utillinuxCurses luajit ];
+    xlibs.libX11 udev utillinuxCurses ];
 
   propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite
     xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext
     bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr
-    xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2
+    xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat luajit
     harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm
     libinput ];
 
@@ -25,23 +25,31 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full"
     "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd"
     "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-xine" "--enable-fb"
-    "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "--enable-lua-old"
+    "--disable-tslib" "--with-systemdunitdir=$out/systemd/user"
     "ac_ct_CXX=foo" ];
 
   NIX_CFLAGS_COMPILE = [ "-I${xlibs.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ];
 
+  patches = [ ./efl-elua.patch ];
+
   preConfigure = ''
     export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH"
+    export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH"
+  '';
+
+  postInstall = ''
+    substituteInPlace "$out/share/elua/core/util.lua" --replace '$out' "$out"
+    modules=$(for i in "$out/include/"*/; do printf ' -I''${includedir}/'`basename $i`; done)
+    substituteInPlace "$out/lib/pkgconfig/efl.pc" --replace 'Cflags: -I''${includedir}/efl-1' \
+      'Cflags: -I''${includedir}/eina-1/eina'"$modules"
   '';
 
   enableParallelBuilding = true;
 
-  setupHook = ./efl-setup-hook.sh;
-
   meta = {
     description = "Enlightenment Core libraries";
     homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ];
+    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.lgpl3;
   };
diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix
index 28ce894bfc7..30d0761c99e 100644
--- a/pkgs/desktops/e19/elementary.nix
+++ b/pkgs/desktops/e19/elementary.nix
@@ -1,20 +1,19 @@
-{ stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }:
+{ stdenv, fetchurl, pkgconfig, e19, libcap, automake114x, autoconf, libdrm, gdbm }:
 stdenv.mkDerivation rec {
   name = "elementary-${version}";
-  version = "1.13.2";
+  version = "1.14.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz";
-    sha256 = "0f8hz60aj4ar8lqnc63nlxkpf3b51scjalgy1iphgjc27hzxcb9i";
+    sha256 = "03h9sv5c3473wxf7hcimdf80d2phxl81yv0kzngx4g1b6cdwl1ma";
   };
-  buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 -I${e19.efl}/include/efl-1 $NIX_CFLAGS_COMPILE"
-  '';
+  buildInputs = [ pkgconfig e19.efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
+  NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ];
+  patches = [ ./elementary.patch ];
   enableParallelBuilding = true;
   meta = {
     description = "Widget set/toolkit";
     homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ];
+    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.lgpl2;
   };
diff --git a/pkgs/desktops/e19/elementary.patch b/pkgs/desktops/e19/elementary.patch
new file mode 100644
index 00000000000..32080c81cb3
--- /dev/null
+++ b/pkgs/desktops/e19/elementary.patch
@@ -0,0 +1,18 @@
+--- a/elementary.pc.in	2015-05-16 21:08:14.321148417 +0200
++++ b/elementary.pc.in	2015-05-16 21:08:30.643412725 +0200
+@@ -14,4 +14,4 @@
+ Requires.private: @requirement_elm_pc@
+ Version: @VERSION@
+ Libs: -L${libdir} -lelementary @ELEMENTARY_PC_LIBS@
+-Cflags: -I${includedir}/elementary-@VMAJ@
++Cflags: -I${includedir}/elementary-@VMAJ@ @ELEMENTARY_PC_CFLAGS@
+--- a/Makefile.am	2015-05-16 21:08:14.322148433 +0200
++++ b/Makefile.am	2015-05-16 21:08:30.643412725 +0200
+@@ -84,6 +84,7 @@
+ -e 's,@requirement_elm_pc\@,$(requirement_elm_pc),g' \
+ -e 's,@ELEMENTARY_LIBS\@,$(ELEMENTARY_LIBS),g' \
+ -e 's,@ELEMENTARY_PC_LIBS\@,$(ELEMENTARY_PC_LIBS),g' \
++-e 's,@ELEMENTARY_PC_CFLAGS\@,$(ELEMENTARY_PC_CFLAGS),g' \
+ < $< > $@ || rm $@
+ 
+ pc_verbose = $(pc_verbose_@AM_V@)
diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/e19/emotion.nix
index bffc2e70f59..6aa4089f52f 100644
--- a/pkgs/desktops/e19/emotion.nix
+++ b/pkgs/desktops/e19/emotion.nix
@@ -1,19 +1,17 @@
 { stdenv, fetchurl, pkgconfig, e19, vlc }:
 stdenv.mkDerivation rec {
   name = "emotion_generic_players-${version}";
-  version = "1.13.0";
+  version = "1.14.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz";
-    sha256 = "0gin3cjhfj75v0gjsvv7harbj4fs4r7r1sfi74ncxzna71nrd8r3";
+    sha256 = "1n1a5n2wi68n8gjw4yk6cyf11djpqpac0025vysn5w6dqgccfic3";
   };
   buildInputs = [ pkgconfig e19.efl vlc ];
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 $NIX_CFLAGS_COMPILE"
-  '';
+  NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" ];
   meta = {
     description = "Extra video decoders";
     homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ];
+    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.bsd2;
   };
diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix
index 2cccf3a0dfd..7e770ffe00b 100644
--- a/pkgs/desktops/e19/enlightenment.nix
+++ b/pkgs/desktops/e19/enlightenment.nix
@@ -3,16 +3,16 @@
 
 stdenv.mkDerivation rec {
   name = "enlightenment-${version}";
-  version = "0.19.4";
+  version = "0.19.5";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
-    sha256 = "0r3bad700cfx5sq8y61dbz3hxdx9n3nf5hzx40ryqld75yxzwxz7";
+    sha256 = "0j66x7x76fbgqfw6fi77v8qy50slw3jnsq3vvs82rrfvniabm8wc";
   };
   buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb
     xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2
     libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
+  NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" ];
   preConfigure = ''
-    export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 -I${e19.efl}/include/ecore-imf-1 -I${e19.efl}/include/ethumb-client-1 -I${e19.efl}/include/elocation-1 -I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
     export USER_SESSION_DIR=$prefix/lib/systemd/user
 
     substituteInPlace src/modules/xkbswitch/e_mod_parse.c \
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The Compositing Window Manager and Desktop Shell";
     homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ];
+    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.bsd2;
   };
diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix
index 3ec3d53c69a..a35b4c58321 100644
--- a/pkgs/desktops/e19/evas.nix
+++ b/pkgs/desktops/e19/evas.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }:
 stdenv.mkDerivation rec {
   name = "evas_generic_loaders-${version}";
-  version = "1.13.2";
+  version = "1.14.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz";
-    sha256 = "06m8p8k8dpyvzdm690zhdzcr7n0ld12bcgjdssjfl66lil5z2mc4";
+    sha256 = "04m8vsrigbsg9hm94lxac56frdxil1bib0bjmspa6xsfgi12afwl";
   };
   buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ];
   meta = {
     description = "Extra image decoders";
     homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ];
+    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl2;
   };
diff --git a/pkgs/desktops/e19/rage.nix b/pkgs/desktops/e19/rage.nix
index 0ccdb3bf3e3..19c99ac17eb 100644
--- a/pkgs/desktops/e19/rage.nix
+++ b/pkgs/desktops/e19/rage.nix
@@ -2,28 +2,13 @@
 , makeWrapper, lib }:
 stdenv.mkDerivation rec {
   name = "rage-${version}";
-  version = "0.1.1";
+  version = "0.1.4";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz";
-    sha256 = "0jdhbzmnvl0i2zzmjs1wgvxmnv0lm76k7h5llbb8ai34xh4yp3fi";
+    sha256 = "10j3n8crk16jzqz2hn5djx6vms5f6x83qyiaphhqx94h9dgv2mgg";
   };
   buildInputs = [ e19.elementary e19.efl automake autoconf libtool pkgconfig
     makeWrapper ];
-  NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/evas-1"
-    "-I${e19.efl}/include/ecore-1"
-    "-I${e19.efl}/include/eina-1"
-    "-I${e19.efl}/include/eina-1/eina"
-    "-I${e19.efl}/include/eet-1"
-    "-I${e19.efl}/include/eo-1"
-    "-I${e19.efl}/include/ecore-evas-1"
-    "-I${e19.efl}/include/ecore-imf-1"
-    "-I${e19.efl}/include/ecore-con-1"
-    "-I${e19.efl}/include/ecore-file-1"
-    "-I${e19.efl}/include/ecore-input-1"
-    "-I${e19.efl}/include/eldbus-1"
-    "-I${e19.efl}/include/efreet-1"
-    "-I${e19.efl}/include/ethumb-client-1"
-    "-I${e19.efl}/include/ethumb-1" ];
   GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [
     gst_all_1.gst-plugins-base
     gst_all_1.gst-plugins-good
@@ -39,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Video + Audio player along the lines of mplayer";
     homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc ];
+    maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.bsd2;
   };
diff --git a/pkgs/desktops/e19/terminology.nix b/pkgs/desktops/e19/terminology.nix
index 96028311f1e..32135bbe2e2 100644
--- a/pkgs/desktops/e19/terminology.nix
+++ b/pkgs/desktops/e19/terminology.nix
@@ -7,17 +7,10 @@ stdenv.mkDerivation rec {
     sha256 = "7a10d44b023cf6134c2483304e4ad33bea6df0f11266aec482f54fa67a3ce628";
   };
   buildInputs = [ pkgconfig e19.efl e19.elementary ];
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 $NIX_CFLAGS_COMPILE"
-    export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE"
-    export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE"
-    export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
-    export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/elocation-1 $NIX_CFLAGS_COMPILE"
-  '';
   meta = {
     description = "The best terminal emulator written with the EFL";
     homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ];
+    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.bsd2;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3109b95d35b..b33448fa944 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14964,21 +14964,21 @@ let
     };
   };
 
-  pythonefl_1_13 = buildPythonPackage rec {
+  pythonefl_1_14 = buildPythonPackage rec {
     name = "python-efl-${version}";
-    version = "1.13.0";
+    version = "1.14.0";
     src = pkgs.fetchurl {
-      url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.bz2";
-      sha256 = "0yy4v0f04dgdz21wd2c09x9w6lzsbq6g12s8895laln44l5aqd82";
+      url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz";
+      sha256 = "1pns5mdyc069z6j1pywjasdd6v9xka5kjdl2yxpd6ds948dia0q0";
     };
     preConfigure = ''
-      export NIX_CFLAGS_COMPILE="-I${pkgs.e19.efl}/include/eo-1 -I${pkgs.e19.efl}/include/eina-1 -I${pkgs.e19.efl}/include/eina-1/eina -I${pkgs.e19.efl}/include/evas-1 -I${self.dbus}/include/dbus-1.0 -I${pkgs.e19.efl}/include/efl-1 -I${pkgs.e19.efl}/include/eet-1 -I${pkgs.e19.efl}/include/ecore-1 -I${pkgs.e19.efl}/include/ecore-evas-1 -I${pkgs.e19.efl}/include/ecore-file-1 -I${pkgs.e19.efl}/include/ecore-input-1 -I${pkgs.e19.efl}/include/ecore-imf-1 -I${pkgs.e19.efl}/include/ecore-con-1 -I${pkgs.e19.efl}/include/edje-1 -I${pkgs.e19.efl}/include/eldbus-1 -I${pkgs.e19.efl}/include/efreet-1 -I${pkgs.e19.efl}/include/ethumb-client-1 -I${pkgs.e19.efl}/include/ethumb-1 -I${pkgs.e19.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE"
+      export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus}/include/dbus-1.0 $NIX_CFLAGS_COMPILE"
     '';
     buildInputs = with self; [ pkgs.pkgconfig pkgs.e19.efl pkgs.e19.elementary ];
     meta = {
       description = "Python bindings for EFL and Elementary";
       homepage = http://enlightenment.org/;
-      maintainers = with maintainers; [ matejc tstrobel ];
+      maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ];
       platforms = platforms.linux;
       license = licenses.gpl3;
     };

From 8cc5c08808b257f2b99582cc1112cd37426331e5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 27 May 2015 20:24:34 +0200
Subject: [PATCH 0305/2322] Updated patches for Haskell packages mueval and
 misfortune.

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 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 178a5906e6c..678faa1c54c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -127,7 +127,7 @@ self: super: {
   # Until the changes have been pushed to Hackage
   mueval = appendPatch super.mueval (pkgs.fetchpatch {
     url = "https://github.com/gwern/mueval/commit/c41aa40ed63b74c069d1e4e3caa8c8d890cde960.patch";
-    sha256 = "1gs8p89d1qsrd1qycbhf6kv4qw0sbb8m6dy106dqkmdzcjzcyq74";
+    sha256 = "0h1lx4z15imq009k0qmwkn5l3hmigw463ahvwffdnszi2n618kpg";
   });
   present = appendPatch super.present (pkgs.fetchpatch {
     url = "https://github.com/chrisdone/present/commit/6a61f099bf01e2127d0c68f1abe438cd3eaa15f7.patch";
@@ -166,7 +166,7 @@ self: super: {
 
   misfortune = appendPatch super.misfortune (pkgs.fetchpatch {
     url = "https://github.com/mokus0/misfortune/commit/9e0a38cf8d59a0de9ae1156034653f32099610e4.patch";
-    sha256 = "15frwdallm3i6k7mil26bbjd4wl6k9h20ixf3cmyris3q3jhlcfh";
+    sha256 = "01m1l199ihq85j9pyc3n0wqv1z4my453hhhcvg3yz3gpz3lf224r";
   });
 
   timezone-series = doJailbreak super.timezone-series;

From c0f09411e832d5f21f122954fa4a72163ebe0284 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 27 May 2015 20:17:43 +0200
Subject: [PATCH 0306/2322] grsecurity: Update stable and test patches

stable: 3.1-3.14.43-201505191737 -> 3.1-3.14.43-201505222221
test:   3.1-4.0.4-201505182014   -> 3.1-4.0.4-201505222222
---
 pkgs/os-specific/linux/kernel/patches.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 348b26b3d3b..9072371d33c 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -66,16 +66,16 @@ rec {
 
   grsecurity_stable = grsecPatch
     { kversion  = "3.14.43";
-      revision  = "201505191737";
+      revision  = "201505222221";
       branch    = "stable";
-      sha256    = "1ijrqmdwpdbkp10lhjw8msv0y02d98v5xgq6xb62ksrdb6k27fiw";
+      sha256    = "1qmlcp1lg9c56p0fx6ancavxqxpvkh6h8fpxnr2ks35s4wln5y7x";
     };
 
   grsecurity_unstable = grsecPatch
     { kversion  = "4.0.4";
-      revision  = "201505182014";
+      revision  = "201505222222";
       branch    = "test";
-      sha256    = "1l1s00zbyzr53p46yj6yh75dbayg9kigv5r6g9mr5irfs5p8s2ay";
+      sha256    = "0ampby10y3kr36f7rvzm5fdk9f2gcfmcdgkzf67b5kj78y52ypfz";
     };
 
   grsec_fix_path =

From 4de17c78370e5e66204b78bd4e2b12aefc8c9ed2 Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Wed, 27 May 2015 19:57:57 +0100
Subject: [PATCH 0307/2322] Update mediainfo{-gui} and dependencies

* mediainfo{-gui} 0.7.73 -> 0.7.74
* libmediainfo    0.7.73 -> 0.7.74

From the mediainfo ChangeLog:
```
Version 0.7.74, 2015-05-25

+ FIMS: Preliminary version (not for production)
+ D-10 audio: display of real bitrate beside the encoded bitrate
+ VC-3: detection of CDP packets (608/708 captions), created by Nexio, inside the VC-3 private data
+ AES3: generic term AES3 replaced by more precise SMPTE ST numbers (302, 331, 337)
+ NUT: basic detection
+ FFV1: more parsing of the bitstream, support of any version of FFV1 in MOV and Matroska
+ DPX: color space and frame rate
x #B906, Matroska: duration was missing if Info block is at the end of the file
x #B908, AC-3: bit depth removed
x #P86, MPEG-4: moov_trak_edts_elst Atom was ignoring version of the atom
x Dolby E: the MXF channel count value was sometimes reported instead of the real channel count
x VorbisComment: WAVEFORMATEXTENSIBLE_CHANNEL_MASK "0X" ("x" in uppercase) is accepted now
x EBUCore: TotalProgrammeDuration was wrongly filled with IdentClockStart value
x EBUCore: Source/Material moved from timecodeStart to timecodeTrack
x MPEG-4: info is missing for some streams in some specific cases
```
---
 pkgs/applications/misc/mediainfo-gui/default.nix    | 4 ++--
 pkgs/applications/misc/mediainfo/default.nix        | 4 ++--
 pkgs/development/libraries/libmediainfo/default.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index ac128b2460e..1055b4de72b 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.73";
+  version = "0.7.74";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2";
-    sha256 = "14mbiy1xhj4nlp7hnfqvi518xn1f718b2vbl8xkjqr2sqjdf5jm7";
+    sha256 = "06r6inggkb3gmxax182y4y39icxry5hdcvq7syb060l8wxrk14ky";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index ce2875656b6..6330d90c178 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.73";
+  version = "0.7.74";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2";
-    sha256 = "14mbiy1xhj4nlp7hnfqvi518xn1f718b2vbl8xkjqr2sqjdf5jm7";
+    sha256 = "06r6inggkb3gmxax182y4y39icxry5hdcvq7syb060l8wxrk14ky";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ];
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 54862e0482b..947cee94bd9 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.73";
+  version = "0.7.74";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.bz2";
-    sha256 = "1c7yc9m4fdrfdlb80g6157sa8s0wlv892pixrfdzfljsqayxnl6k";
+    sha256 = "1dn7zwqkl08vafc979i1mx63r2jlr95gfazg4d2cc9v3pav28zpk";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ];

From 8e4c91124825a384814c9011b08468455b879a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 27 May 2015 21:10:12 +0200
Subject: [PATCH 0308/2322] gfortran-darwin: add `cc` attribute to fix
 evaluation

Hopefully the value is reasonable.
It's used on two places at least to find libs to link against.
---
 pkgs/development/compilers/gcc/gfortran-darwin.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.nix b/pkgs/development/compilers/gcc/gfortran-darwin.nix
index 954b236ff6f..bd11b1ebc8e 100644
--- a/pkgs/development/compilers/gcc/gfortran-darwin.nix
+++ b/pkgs/development/compilers/gcc/gfortran-darwin.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
     --with-mpc=${libmpc}
   '';
   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/";

From 9cb63367dc64b2cae8a84faaf0b297d18845cc44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= <r.dahlen@gmail.com>
Date: Wed, 27 May 2015 20:39:17 +0100
Subject: [PATCH 0309/2322] boot: Update version from 2.0.0-rc14 to 2.0.0.

---
 pkgs/development/tools/build-managers/boot/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix
index 6ae4da408c0..d4fddbb1791 100644
--- a/pkgs/development/tools/build-managers/boot/default.nix
+++ b/pkgs/development/tools/build-managers/boot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, jdk }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.0-rc14";
+  version = "2.0.0";
   name = "boot-${version}";
 
   src = fetchurl {

From 6eb8ff878da4a5d99d6c4881a65d7f3e94076fe0 Mon Sep 17 00:00:00 2001
From: Allen Nelson <ithinkican@gmail.com>
Date: Wed, 27 May 2015 12:40:44 -0700
Subject: [PATCH 0310/2322] added cmake flag to prevent autodetection of SDK
 directory

---
 .../libraries/science/math/liblapack/default.nix            | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 9f4f43311a4..25667e11264 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -3,6 +3,7 @@ let
   atlasMaybeShared = atlas.override { inherit shared; };
   usedLibExtension = if shared then ".so" else ".a";
   version = "3.4.1";
+  inherit (stdenv.lib) optional;
 in
 stdenv.mkDerivation rec {
   name = "liblapack-${version}";
@@ -21,7 +22,10 @@ stdenv.mkDerivation rec {
     "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
     "-DCMAKE_Fortran_FLAGS=-fPIC"
   ]
-  ++ (stdenv.lib.optional shared "-DBUILD_SHARED_LIBS=ON")
+  ++ (optional shared "-DBUILD_SHARED_LIBS=ON")
+  # If we're on darwin, CMake will automatically detect impure paths. This switch
+  # prevents that.
+  ++ (optional stdenv.isDarwin "-DCMAKE_OSX_SYSROOT:PATH=''")
   ;
 
   doCheck = ! shared;

From 87fd373aac3a1aaa84ddb328d43074aeebc1b133 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 27 May 2015 21:24:01 +0200
Subject: [PATCH 0311/2322] lib/licenses: add CC-BY-SA-2.5

---
 lib/licenses.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 4ac155a9bed..2b259c68069 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -85,6 +85,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "Creative Commons Zero v1.0 Universal";
   };
 
+  cc-by-sa-25 = spdx {
+    spdxId = "CC-BY-SA-2.5";
+    fullName = "Creative Commons Attribution Share Alike 2.5";
+  };
+
   cc-by-30 = spdx {
     spdxId = "CC-BY-3.0";
     fullName = "Creative Commons Attribution 3.0";

From b2d7f4b1ba937951fefdd026314512ab0be91508 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 27 May 2015 21:56:04 +0200
Subject: [PATCH 0312/2322] Use common licence attributes from lib/licenses.nix

Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
---
 pkgs/applications/audio/beast/default.nix     |  4 +-
 .../editors/emacs-modes/jabber/default.nix    |  8 ++--
 .../editors/emacs-modes/nyan-mode/default.nix |  6 +--
 .../graphics/gimp/plugins/default.nix         |  4 +-
 pkgs/applications/misc/eaglemode/default.nix  |  8 ++--
 .../networking/browsers/conkeror/default.nix  |  8 ++--
 .../mozilla-plugins/fribid/default.nix        |  8 ++--
 .../mplayerplug-in/default.nix                |  4 +-
 .../networking/browsers/netsurf/netsurf.nix   | 11 +++--
 .../science/electronics/ngspice/default.nix   |  8 ++--
 .../science/math/pari/default.nix             |  8 ++--
 .../science/math/speedcrunch/default.nix      |  4 +-
 .../molecular-dynamics/gromacs/default.nix    |  4 +-
 pkgs/applications/video/dvdauthor/default.nix |  4 +-
 .../window-managers/awesome/default.nix       |  2 +-
 .../window-managers/tabbed/default.nix        |  8 ++--
 .../window-managers/vwm/default.nix           |  8 ++--
 .../window-managers/wmii/default.nix          |  2 +-
 .../window-managers/wmii31/default.nix        |  2 +-
 pkgs/data/fonts/powerline-fonts/default.nix   |  2 +-
 pkgs/data/fonts/terminus-font/default.nix     |  8 ++--
 pkgs/development/compilers/haxe/default.nix   |  8 ++--
 pkgs/development/compilers/ocaml/3.11.2.nix   |  9 ++--
 pkgs/development/compilers/ocaml/3.12.1.nix   |  9 ++--
 pkgs/development/compilers/ocaml/4.00.1.nix   |  9 ++--
 pkgs/development/compilers/ocaml/4.01.0.nix   |  9 ++--
 pkgs/development/compilers/ocaml/4.02.1.nix   |  9 ++--
 .../compilers/ocaml/ber-metaocaml-003.nix     | 13 ++++--
 .../haskell-modules/hackage-packages.nix      |  6 +--
 .../interpreters/ruby/ruby-1.9.3.nix          |  8 ++--
 .../libraries/boost-process/default.nix       |  2 +-
 pkgs/development/libraries/cairo/default.nix  |  6 +--
 .../development/libraries/cairomm/default.nix |  4 +-
 pkgs/development/libraries/hwloc/default.nix  |  6 +--
 .../libraries/java/rhino/default.nix          |  4 +-
 .../libraries/libpseudo/default.nix           |  6 +--
 .../libraries/libviper/default.nix            |  4 +-
 .../libraries/libvterm/default.nix            |  8 ++--
 .../libraries/pkcs11helper/default.nix        |  4 +-
 .../libraries/quesoglc/default.nix            |  8 ++--
 .../rabbitmq-java-client/default.nix          |  2 +-
 .../science/math/liblapack/3.5.0.nix          |  8 ++--
 .../science/math/liblapack/default.nix        |  8 ++--
 .../development/libraries/zziplib/default.nix |  4 +-
 .../ocaml-modules/menhir/default.nix          | 11 ++---
 .../python-modules/blivet/default.nix         |  6 +--
 .../tools/misc/autogen/default.nix            |  4 +-
 .../tools/sauce-connect/default.nix           |  2 +-
 pkgs/games/0ad/default.nix                    |  7 +++-
 pkgs/games/alienarena/default.nix             |  8 ++--
 pkgs/games/gsb/default.nix                    |  6 +--
 pkgs/games/tremulous/default.nix              | 11 +++--
 pkgs/games/urbanterror/default.nix            |  8 ++--
 pkgs/games/vessel/default.nix                 |  6 +--
 pkgs/games/warsow/default.nix                 |  8 ++--
 pkgs/games/worldofgoo/default.nix             |  6 +--
 pkgs/os-specific/linux/hal-flash/default.nix  |  2 +-
 pkgs/servers/dico/default.nix                 |  2 +-
 pkgs/tools/backup/bacula/default.nix          |  4 +-
 pkgs/tools/compression/xz/default.nix         |  8 ++--
 pkgs/tools/filesystems/nixpart/0.4/blivet.nix |  6 +--
 pkgs/tools/filesystems/s3fs/default.nix       |  4 +-
 pkgs/tools/networking/isync/default.nix       |  8 ++--
 pkgs/tools/networking/maildrop/default.nix    |  4 +-
 pkgs/tools/networking/mailutils/default.nix   |  9 ++--
 .../networking/nss-pam-ldapd/default.nix      |  4 +-
 pkgs/tools/networking/wicd/default.nix        |  6 +--
 pkgs/tools/system/bootchart/default.nix       |  4 +-
 pkgs/tools/system/dog/default.nix             | 10 ++---
 pkgs/tools/system/tm/default.nix              |  8 ++--
 pkgs/tools/system/ts/default.nix              |  8 ++--
 pkgs/top-level/perl-packages.nix              | 42 +++++++++----------
 pkgs/top-level/python-packages.nix            | 16 +++----
 73 files changed, 269 insertions(+), 234 deletions(-)

diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix
index 340a83e7963..3997855a75b 100644
--- a/pkgs/applications/audio/beast/default.nix
+++ b/pkgs/applications/audio/beast/default.nix
@@ -29,9 +29,9 @@ stdenv.mkDerivation {
       ./patch.patch # patches taken from gentoo
     ];
 
-  meta = { 
+  meta = with stdenv.lib; {
     description = "A music composition and modular synthesis application";
     homepage = http://beast.gtk.org;
-    license = ["GPL-2" "LGPL-2.1"];
+    license = with licenses; [ gpl2 lgpl21 ];
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/jabber/default.nix b/pkgs/applications/editors/emacs-modes/jabber/default.nix
index 82028722f54..cb8a22a3c06 100644
--- a/pkgs/applications/editors/emacs-modes/jabber/default.nix
+++ b/pkgs/applications/editors/emacs-modes/jabber/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "75e3b7853de4783b8ab8270dcbe6a1e4f576224f77f7463116532e11c6498c26";
   };
   buildInputs = [ emacs ];
-  meta = {
+  meta = with stdenv.lib; {
     description = "A Jabber client for Emacs";
     longDescription = ''
       jabber.el is a Jabber client for Emacs. It may seem strange to have a
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
       a special case of text editing.
     '';
     homepage = http://emacs-jabber.sourceforge.net/;
-    license = [ "GPLv2+" ];
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = with licenses; gpl2Plus;
+    maintainers = with maintainers; [ astsmtl ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
index ab94dbae950..a21c73b7e8b 100644
--- a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
+++ b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
@@ -1,4 +1,4 @@
-{trivialBuild, fetchFromGitHub}:
+{trivialBuild, lib, fetchFromGitHub}:
 
 trivialBuild rec {
   pname    = "nyan-mode";
@@ -23,9 +23,9 @@ trivialBuild rec {
     cp -r mus $out
   '';
 
-  meta = {
+  meta = with lib; {
     description = "An analog indicator of the position in the buffer";
     homepage = https://github.com/TeMPOraL/nyan-mode/;
-    license = "GPLv3+";
+    license = with licenses; gpl3Plus;
   };
 }
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 5f43abfcfc1..8ece9ba2453 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -59,12 +59,12 @@ rec {
       sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \
        -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure
     '';
-    meta = {
+    meta = with stdenv.lib; {
       description = "The GIMP Animation Package";
       homepage = http://www.gimp.org;
       # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license
       # falls inside "free".
-      license = [ "GPLv3" "free" ];
+      license = with licenses; [ gpl3 free ];
     };
   };
 
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index db613cd4922..47535ab6b90 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -31,11 +31,11 @@ stdenv.mkDerivation rec {
     ln -s $out/eaglemode.sh $out/bin/eaglemode.sh
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://eaglemode.sourceforge.net";
     description = "Zoomable User Interface";
-    license="GPLv3";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = with licenses; gpl3;
+    maintainers = with maintainers; [ viric ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix
index f6e3cd3cf8d..9715b46ed50 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
       --add-flags "-app $out/libexec/conkeror/application.ini"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A keyboard-oriented, customizable, extensible web browser";
     longDescription = ''
       Conkeror is a keyboard-oriented, highly-customizable, highly-extensible
@@ -30,8 +30,8 @@ stdenv.mkDerivation {
       self-documenting, featuring a powerful interactive help system.
     '';
     homepage = http://conkeror.org/;
-    license = [ "MPLv1.1" "GPLv2" "LGPLv2.1" ];
-    maintainers = with stdenv.lib.maintainers; [ astsmtl chaoflow ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = with licenses; [ mpl11 gpl2 lgpl21 ];
+    maintainers = with maintainers; [ astsmtl chaoflow ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
index 3b473019600..b8aa17803e9 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   passthru.mozillaPlugin = "/lib/mozilla/plugins";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A browser plugin to manage Swedish BankID:s";
     longDescription = ''
       FriBID is an open source software for the Swedish e-id system
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
       support.
     '';
     homepage = http://fribid.se;
-    license = [ "GPLv2" "MPLv1" ];
-    maintainers = [ stdenv.lib.maintainers.edwtjo ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = with licenses; [ gpl2 mpl10 ];
+    maintainers = [ maintainers.edwtjo ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
index 105e5904715..07e152e91db 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
     mozillaPlugin = "/lib/mozilla/plugins";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A browser plugin that uses mplayer to play digital media from websites";
     homepage = http://mplayerplug-in.sourceforge.net/;
-    license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
+    license = with licenses; [ gpl2Plus lgpl2Plus "MPLv1+" ];
   };
 }
diff --git a/pkgs/applications/networking/browsers/netsurf/netsurf.nix b/pkgs/applications/networking/browsers/netsurf/netsurf.nix
index 2d2253f43ef..f7e90b61a94 100644
--- a/pkgs/applications/networking/browsers/netsurf/netsurf.nix
+++ b/pkgs/applications/networking/browsers/netsurf/netsurf.nix
@@ -23,12 +23,15 @@ stdenv.mkDerivation {
   buildPhase = "make PREFIX=$out";
   installPhase = "make PREFIX=$out install";
 
-  meta = { 
+  meta = with args.lib; {
     description = "free, open source web browser";
     homepage = http://www.netsurf-browser.org;
-    license = ["GPLv2" /* visual worrk : */ "MIT" ];
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    license = with licenses; [
+      gpl2
+      mit /* visual work */
+    ];
+    maintainers = with maintainers; [ marcweber ];
+    platforms = platforms.linux;
   };
 
 }
diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index 493af97d156..e64ea909cbb 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -12,11 +12,11 @@ stdenv.mkDerivation {
 
   configureFlags = [ "--enable-x" "--with-x" "--with-readline" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "The Next Generation Spice (Electronic Circuit Simulator)";
     homepage = "http://ngspice.sourceforge.net";
-    license = ["BSD" "GPLv2"];
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = with licenses; [ "BSD" gpl2 ];
+    maintainers = with maintainers; [ viric ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 0dbab841a81..b97314f02d1 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -16,12 +16,12 @@ stdenv.mkDerivation rec {
     "--with-gmp=${gmp} " +
     "--with-readline=${readline}";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Computer algebra system for high-performance number theory computations";
     homepage    = "http://pari.math.u-bordeaux.fr/";
-    license     = "GPLv2+";
-    maintainers = with stdenv.lib.maintainers; [ertes raskin];
-    platforms   = stdenv.lib.platforms.linux;
+    license     = with licenses; gpl2Plus;
+    maintainers = with maintainers; [ ertes raskin ];
+    platforms   = platforms.linux;
 
     inherit version;
     downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix
index dee33a04be2..e2f34d48de2 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/applications/science/math/speedcrunch/default.nix
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
 
   buildFlags = "VERBOSE=1";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage    = "http://speedcrunch.digitalfanatics.org";
-    license     = "GPLv2+";
+    license     = with licenses; gpl2Plus;
     description = "A fast power user calculator";
     longDescription = ''
       SpeedCrunch is a fast, high precision and powerful desktop calculator.
diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index 879690bc91e..bb851140b45 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -19,9 +19,9 @@ stdenv.mkDerivation {
     ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage    = "http://www.gromacs.org";
-    license     = "GPLv2";
+    license     = with licenses; gpl2;
     description = "Molecular dynamics software package";
     longDescription = ''
       GROMACS is a versatile package to perform molecular dynamics,
diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix
index cab7b4112d0..03ccb2664fc 100644
--- a/pkgs/applications/video/dvdauthor/default.nix
+++ b/pkgs/applications/video/dvdauthor/default.nix
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec{
     ./dvdauthor-imagemagick-0.7.0.patch
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Tools for generating DVD files to be played on standalone DVD players";
     homepage = http://dvdauthor.sourceforge.net/;
-    license = ["GPLv2"];
+    license = with licenses; gpl2;
   };
 }
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 3541743057c..a158dd8dcf4 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Highly configurable, dynamic window manager for X";
     homepage    = http://awesome.naquadah.org/;
-    license     = "GPLv2+";
+    license     = with licenses; gpl2Plus;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.linux;
   };
diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix
index 2dec3b2241f..82539b940b8 100644
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
     export makeFlags="PREFIX=$out"
   '';
  
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://tools.suckless.org/tabbed;
     description = "Simple generic tabbed fronted to xembed aware applications";
-    license="MIT";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = with licenses; mit;
+    maintainers = with maintainers; [ viric ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix
index 3613bb21ff6..be0a946064b 100644
--- a/pkgs/applications/window-managers/vwm/default.nix
+++ b/pkgs/applications/window-managers/vwm/default.nix
@@ -22,11 +22,11 @@ stdenv.mkDerivation rec {
  
   buildInputs = [ ncurses pkgconfig glib libviper libpseudo gpm libvterm ];
  
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://vwm.sourceforge.net/;
     description = "Dynamic window manager for the console";
-    license="GPLv2+";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = with licenses; gpl2Plus;
+    maintainers = with maintainers; [ viric ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix
index a44c54f7b57..e8ecc72a6d3 100644
--- a/pkgs/applications/window-managers/wmii/default.nix
+++ b/pkgs/applications/window-managers/wmii/default.nix
@@ -30,6 +30,6 @@ args: with args; stdenv.mkDerivation {
   ";
   meta = { homepage = "www.suckless.org";
            description = "a really cool window manager which can by driven by keyboard only";
-           license="MIT";
+           license = stdenv.lib.licenses.mit;
          };
 }
diff --git a/pkgs/applications/window-managers/wmii31/default.nix b/pkgs/applications/window-managers/wmii31/default.nix
index dd49cf5ec43..568be30f1c5 100644
--- a/pkgs/applications/window-managers/wmii31/default.nix
+++ b/pkgs/applications/window-managers/wmii31/default.nix
@@ -30,6 +30,6 @@ args: with args; stdenv.mkDerivation {
   ";
   meta = { homepage = "www.suckless.org";
            description = "One small tool of the wmii window manger to let the user select an item from a list by filtering";
-           license="MIT";
+           license = stdenv.lib.licenses.mit;
          };
 }
diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix
index 2f528a619e7..3ae436179ba 100644
--- a/pkgs/data/fonts/powerline-fonts/default.nix
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     longDescription = ''
       Pre-patched and adjusted fonts for usage with the Powerline plugin.
     '';
-    license = "asl20 free ofl";
+    license = with licenses; [ asl20 free ofl ];
     platforms = platforms.all;
     maintainer = with maintainers; [ malyn ];
   };
diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix
index fa9eb0ac42d..6dab322b056 100644
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/pkgs/data/fonts/terminus-font/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     make install fontdir
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A clean fixed width font";
     longDescription = ''
       Terminus Font is designed for long (8 and more hours per day) work
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
       EGA/VGA-bold for 8x14 and 8x16.
     '';
     homepage = http://www.is-vn.bg/hamster/;
-    license = [ "GPLv2+" ];
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = with licenses; [ gpl2Plus ];
+    maintainers = with maintainers; [ astsmtl ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index 8e6828bce46..d9c9f91df6a 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -32,11 +32,11 @@ stdenv.mkDerivation {
 
   dontStrip = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++";
     homepage = http://haxe.org;
-    license = ["GPLv2" "BSD2" /*?*/ ];  # -> docs/license.txt
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.lib.platforms.linux;
+    license = with licenses; [ gpl2 bsd2 /*?*/ ];  # -> docs/license.txt
+    maintainers = [ maintainers.marcweber ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix
index 195e83e7313..ce61e562139 100644
--- a/pkgs/development/compilers/ocaml/3.11.2.nix
+++ b/pkgs/development/compilers/ocaml/3.11.2.nix
@@ -41,9 +41,12 @@ stdenv.mkDerivation rec {
     ln -sv $out/lib/ocaml/caml $out/include/caml
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://caml.inria.fr/ocaml;
-    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = with licenses; [
+      qpl /* compiler */
+      lgpl2 /* library */
+    ];
     description = "Most popular variant of the Caml language";
 
     longDescription =
@@ -65,7 +68,7 @@ stdenv.mkDerivation rec {
          documentation generator (ocamldoc).
        '';
 
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = with platforms; linux ++ darwin;
   };
 
 }
diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix
index 6488d94cc08..e6ed6f4b73e 100644
--- a/pkgs/development/compilers/ocaml/3.12.1.nix
+++ b/pkgs/development/compilers/ocaml/3.12.1.nix
@@ -34,10 +34,13 @@ stdenv.mkDerivation rec {
     nativeCompilers = useNativeCompilers;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://caml.inria.fr/ocaml;
     branch = "3.12";
-    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = with licenses; [
+      qpl /* compiler */
+      lgpl2 /* library */
+    ];
     description = "Most popular variant of the Caml language";
 
     longDescription =
@@ -59,7 +62,7 @@ stdenv.mkDerivation rec {
         and a documentation generator (ocamldoc).
       '';
 
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = with platforms; linux ++ darwin;
   };
 
 }
diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix
index 4e888e14322..f8a7ed920a5 100644
--- a/pkgs/development/compilers/ocaml/4.00.1.nix
+++ b/pkgs/development/compilers/ocaml/4.00.1.nix
@@ -33,10 +33,13 @@ stdenv.mkDerivation rec {
     nativeCompilers = useNativeCompilers;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://caml.inria.fr/ocaml;
     branch = "4.00";
-    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = with licenses; [
+      qpl /* compiler */
+      lgpl2 /* library */
+    ];
     description = "Most popular variant of the Caml language";
 
     longDescription =
@@ -58,7 +61,7 @@ stdenv.mkDerivation rec {
         and a documentation generator (ocamldoc).
       '';
 
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = with platforms; linux ++ darwin;
   };
 
 }
diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix
index d178285834f..1d323ec0cba 100644
--- a/pkgs/development/compilers/ocaml/4.01.0.nix
+++ b/pkgs/development/compilers/ocaml/4.01.0.nix
@@ -48,10 +48,13 @@ stdenv.mkDerivation rec {
     nativeCompilers = useNativeCompilers;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://caml.inria.fr/ocaml;
     branch = "4.01";
-    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = with licenses; [
+      qpl /* compiler */
+      lgpl2 /* library */
+    ];
     description = "Most popular variant of the Caml language";
 
     longDescription =
@@ -73,7 +76,7 @@ stdenv.mkDerivation rec {
         and a documentation generator (ocamldoc).
       '';
 
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = with platforms; linux ++ darwin;
   };
 
 }
diff --git a/pkgs/development/compilers/ocaml/4.02.1.nix b/pkgs/development/compilers/ocaml/4.02.1.nix
index 18f9d373650..6f4cce522e4 100644
--- a/pkgs/development/compilers/ocaml/4.02.1.nix
+++ b/pkgs/development/compilers/ocaml/4.02.1.nix
@@ -44,10 +44,13 @@ stdenv.mkDerivation rec {
     nativeCompilers = useNativeCompilers;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://caml.inria.fr/ocaml;
     branch = "4.02";
-    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = with licenses; [
+      qpl /* compiler */
+      lgpl2 /* library */
+    ];
     description = "Most popular variant of the Caml language";
 
     longDescription =
@@ -69,7 +72,7 @@ stdenv.mkDerivation rec {
         and a documentation generator (ocamldoc).
       '';
 
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = with platforms; linux ++ darwin;
   };
 
 }
diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix
index 8b86c805c61..882af287c04 100644
--- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix
+++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix
@@ -55,9 +55,16 @@ stdenv.mkDerivation rec {
     cd ..
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml";
-    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
-    description = "A conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run";
+    license = with licenses; [
+      qpl /* compiler */
+      lgpl2 /* library */
+    ];
+    description = "Conservative extension of OCaml";
+    longDescription = ''
+      A conservative extension of OCaml with the primitive type of code values,
+      and three basic multi-stage expression forms: Brackets, Escape, and Run
+    '';
   };
 }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2f03b30e0ad..d24e5f44828 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -4726,7 +4726,7 @@ self: {
        sha256 = "1kf638h5gsc8fklhaw2jiad1r0ssgj8zkfmzywp85lrx5z529gky";
        buildDepends = [ base haskell98 ];
        description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562";
-       license = "BSD4";
+       license = stdenv.lib.licenses.bsdOriginal;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -21072,7 +21072,7 @@ self: {
          glib Glob gtk gtksourceview2 hint mtl process syb
        ];
        description = "A GTK-based abstract syntax tree viewer for custom languages and parsers";
-       license = "BSD4";
+       license = stdenv.lib.licenses.bsdOriginal;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -21084,7 +21084,7 @@ self: {
        sha256 = "1rqqlngmcdd7i1gww95lyim971w8xv0hjg20h0j8av4y29pjxfyn";
        buildDepends = [ base containers syb ];
        description = "Interfacing between hint and astview";
-       license = "BSD4";
+       license = stdenv.lib.licenses.bsdOriginal;
      }) {};
 
   "async" = callPackage
diff --git a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix
index db807ebbd8b..5f6540d3ee2 100644
--- a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix
+++ b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix
@@ -101,12 +101,12 @@ stdenv.mkDerivation rec {
     sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
   '';
 
-  meta = {
-    license     = "Ruby";
+  meta = with stdenv.lib; {
+    license     = with licenses; [ ruby ];
     homepage    = "http://www.ruby-lang.org/en/";
     description = "The Ruby language";
-    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
-    platforms   = stdenv.lib.platforms.all;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.all;
   };
 
   passthru = rec {
diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix
index 974654216e0..86cdd08db64 100644
--- a/pkgs/development/libraries/boost-process/default.nix
+++ b/pkgs/development/libraries/boost-process/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = "http://www.highscore.de/boost/process0.5/";
     description = "Library to manage system processes";
-    license = "boost-license";
+    license = with licenses; boost;
     platforms = platforms.unix;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 89c791fae02..47a2c63d328 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     '' + glib.flattenInclude
     );
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A 2D graphics library with support for multiple output devices";
 
     longDescription = ''
@@ -77,8 +77,8 @@ stdenv.mkDerivation rec {
 
     homepage = http://cairographics.org/;
 
-    license = [ "LGPLv2+" "MPLv1" ];
+    license = with licenses; [ lgpl2Plus mpl10 ];
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix
index 990d44dfef8..b8e9fd7966b 100644
--- a/pkgs/development/libraries/cairomm/default.nix
+++ b/pkgs/development/libraries/cairomm/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A 2D graphics library with support for multiple output devices";
 
     longDescription = ''
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://cairographics.org/;
 
-    license = [ "LGPLv2+" "MPLv1" ];
+    license = with licenses; [ lgpl2Plus mpl10 ];
   };
 }
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index f5a3857ec28..da658e398eb 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   # <http://hydra.bordeaux.inria.fr/build/51474/nixlog/1/raw>.
   doCheck = !stdenv.isCygwin;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Portable abstraction of hierarchical architectures for high-performance computing";
 
     longDescription = ''
@@ -63,11 +63,11 @@ stdenv.mkDerivation rec {
     '';
 
     # http://www.open-mpi.org/projects/hwloc/license.php
-    license = "revised-BSD";
+    license = with licenses; bsd3;
 
     homepage = http://www.open-mpi.org/projects/hwloc/;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix
index 34aaded7cb4..74aa8c9ba16 100644
--- a/pkgs/development/libraries/java/rhino/default.nix
+++ b/pkgs/development/libraries/java/rhino/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
       cp -v *.jar "$out/share/java"
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An implementation of JavaScript written in Java";
 
     longDescription =
@@ -52,6 +52,6 @@ stdenv.mkDerivation {
 
     homepage = http://www.mozilla.org/rhino/;
 
-    license = [ "MPLv1.1" /* or */ "GPLv2+" ];
+    license = with licenses; [ mpl11 /* or */ gpl2Plus ];
   };
 }
diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix
index 29a8c459c34..8a7054db20a 100644
--- a/pkgs/development/libraries/libpseudo/default.nix
+++ b/pkgs/development/libraries/libpseudo/default.nix
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
     mkdir -p $out/lib
   '';
 
-  buildInputs = [pkgconfig glib ncurses];
+  buildInputs = [ pkgconfig glib ncurses ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libpseudo.sourceforge.net/;
     description = "Simple, thread-safe messaging between threads";
-    license="GPLv2+";
+    license = with licenses; gpl2Plus;
   };
 }
diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix
index f82581b1097..1dcd578da29 100644
--- a/pkgs/development/libraries/libviper/default.nix
+++ b/pkgs/development/libraries/libviper/default.nix
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [pkgconfig glib ncurses gpm];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libviper.sourceforge.net/;
     description = "Simple window creation and management facilities for the console";
-    license="GPLv2+";
+    license = with licenses; gpl2Plus;
   };
 }
diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix
index cc2fd268ae6..b52db39042f 100644
--- a/pkgs/development/libraries/libvterm/default.nix
+++ b/pkgs/development/libraries/libvterm/default.nix
@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
     mkdir -p $out/lib
   '';
 
-  buildInputs = [pkgconfig glib ncurses];
+  buildInputs = [ pkgconfig glib ncurses ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libvterm.sourceforge.net/;
     description = "Terminal emulator library to mimic both vt100 and rxvt";
-    license = "GPLv2+";
-    platforms = stdenv.lib.platforms.linux;
+    license = with licenses; gpl2Plus;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix
index 5443df89704..c4f0ad16fb7 100644
--- a/pkgs/development/libraries/pkcs11helper/default.nix
+++ b/pkgs/development/libraries/pkcs11helper/default.nix
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
   
   buildInputs = [ pkgconfig openssl autoconf automake libtool ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper;
-    license = [ "BSD" "GPLv2" ];
+    license = with licenses; [ "BSD" gpl2 ];
     description = "Library that simplifies the interaction with PKCS#11 providers";
   };
 }
diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix
index 3d2f098267d..928095a4e29 100644
--- a/pkgs/development/libraries/quesoglc/default.nix
+++ b/pkgs/development/libraries/quesoglc/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
   buildInputs = [ mesa glew freetype fontconfig fribidi libX11 ];
   # FIXME: Configure fails to use system glew.
-  meta = {
+  meta = with stdenv.lib; {
     description = "A free implementation of the OpenGL Character Renderer";
     longDescription = ''
       QuesoGLC is a free (as in free speech) implementation of the OpenGL
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
       platform that supports both FreeType and the OpenGL API.
     '';
     homepage = http://quesoglc.sourceforge.net/;
-    license = [ "LGPLv2.1+" ];
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = with licenses; [ lgpl21Plus ];
+    maintainers = with maintainers; [ astsmtl ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix
index 2183aa83e20..a1708ba59c3 100644
--- a/pkgs/development/libraries/rabbitmq-java-client/default.nix
+++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers";
     homepage = http://www.rabbitmq.com/java-client.html;
-    license = [ "MPLv1.1" "GPLv2" ];
+    license = with licenses; [ mpl11 gpl2 ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
index 0b4badf26e7..3427bf1c4e9 100644
--- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
+++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
@@ -37,13 +37,13 @@ stdenv.mkDerivation rec {
     blas = atlas;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit version;
     description = "Linear Algebra PACKage";
     homepage = "http://www.netlib.org/lapack/";
-    license = "revised-BSD";
+    license = with licenses; bsd3;
 
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = platforms.all;
+    maintainers = [ maintainers.simons ];
   };
 }
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 9f4f43311a4..cbe03b8eb63 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -37,13 +37,13 @@ stdenv.mkDerivation rec {
     blas = atlas;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit version;
     description = "Linear Algebra PACKage";
     homepage = "http://www.netlib.org/lapack/";
-    license = "revised-BSD";
+    license = with licenses; bsd3;
 
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = platforms.all;
+    maintainers = [ maintainers.simons ];
   };
 }
diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index dcfaafc2b7d..1e474e722ff 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Library to extract data from files archived in a zip file";
 
     longDescription = ''
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       zip/unzip tools.
     '';
 
-    license = [ "LGPLv2+" "MPLv1.1" ];
+    license = with licenses; [ lgpl2Plus mpl11 ];
 
     homepage = http://zziplib.sourceforge.net/;
 
diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix
index d5db6e9c7e0..0a73f8aa04a 100644
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/pkgs/development/ocaml-modules/menhir/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     export PREFIX=$out
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://pauillac.inria.fr/~fpottier/menhir/;
     description = "A LR(1) parser generator for OCaml";
     longDescription = ''
@@ -41,10 +41,11 @@ stdenv.mkDerivation {
       to OCaml code.  Menhir was designed and implemented by François Pottier
       and Yann Régis-Gianas.
     '';
-    license = [ "QPL" /* generator */ "LGPLv2" /* library */ ];
-    platforms = ocaml.meta.platforms;
-    maintainers = [
-      stdenv.lib.maintainers.z77z
+    license = with licenses; [
+      qpl /* generator */
+      lgpl2 /* library */
     ];
+    platforms = ocaml.meta.platforms;
+    maintainers = with maintainers; [ z77z ];
   };
 }
diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index f84c836c056..3065af0fd15 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -39,10 +39,10 @@ in buildPythonPackage rec {
   # Tests are in <nixos/tests/blivet.nix>.
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://fedoraproject.org/wiki/Blivet";
     description = "Module for management of a system's storage configuration";
-    license = [ "GPLv2+" "LGPLv2.1+" ];
-    platforms = stdenv.lib.platforms.linux;
+    license = with licenses; [ gpl2Plus lgpl21Plus ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 48533f553fe..01c5fd7dcba 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -24,7 +24,7 @@ let version = "5.18"; in
 
     #doCheck = true; # 2 tests fail because of missing /dev/tty
 
-    meta = {
+    meta = with stdenv.lib; {
       description = "Automated text and program generation tool";
 
       longDescription = ''
@@ -46,7 +46,7 @@ let version = "5.18"; in
         documentation of program options.
       '';
 
-      license = ["GPLv3+" "LGPLv3+" ];
+      license = with licenses; [ gpl3Plus lgpl3Plus ];
 
       homepage = http://www.gnu.org/software/autogen/;
 
diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index e41b45dff68..99e54e86a56 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A secure tunneling app for executing tests securely when testing behind firewalls";
-    license = "unfree";
+    license = with licenses; unfree;
     homepage = https://docs.saucelabs.com/reference/sauce-connect/;
     maintainers = with maintainers; [offline];
     platforms = with platforms; platforms.linux;
diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix
index bbcc6f11d1d..5a0bdcd70a7 100644
--- a/pkgs/games/0ad/default.nix
+++ b/pkgs/games/0ad/default.nix
@@ -112,10 +112,13 @@ stdenv.mkDerivation rec {
     done <build/resources/0ad.desktop >"$out"/share/applications/0ad.desktop
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A free, open-source game of ancient warfare";
     homepage = "http://wildfiregames.com/0ad/";
-    license = [ "GPLv2" "LGPLv2.1" "MIT" "CC BY-SA 3.0" "zlib" ];
+    license = with licenses; [
+      gpl2 lgpl21 mit cc-by-sa-30
+      licenses.zlib # otherwise masked by pkgs.zlib
+    ];
     platforms = [ "x86_64-linux" "i686-linux" ];
   };
 }
diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix
index b3c2dd14718..485b52d3d08 100644
--- a/pkgs/games/alienarena/default.nix
+++ b/pkgs/games/alienarena/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
       --replace libGL.so.1 ${mesa}/lib/libGL.so.1
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A free, stand-alone first-person shooter computer game";
     longDescription = ''
       Do you like old school deathmatch with modern features? How
@@ -31,9 +31,9 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://red.planetarena.org;
     # Engine is under GPLv2, everything else is under
-    license = [ "unfree-redistributable" ];
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = stdenv.lib.platforms.linux;
+    license = with licenses; unfreeRedistributable;
+    maintainers = with maintainers; [ astsmtl ];
+    platforms = platforms.linux;
     hydraPlatforms = [];
   };
 }
diff --git a/pkgs/games/gsb/default.nix b/pkgs/games/gsb/default.nix
index 642a86ac4de..a0a25a2ff4b 100644
--- a/pkgs/games/gsb/default.nix
+++ b/pkgs/games/gsb/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     chmod +x $out/bin/GSB
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Gratuitous Space Battles";
     longDescription = ''
       a strategy / management / simulation game that does away with all the
@@ -66,8 +66,8 @@ stdenv.mkDerivation rec {
       battle (or at least blow to bits in aesthetically pleasing ways).
     '';
     homepage = http://www.positech.co.uk/gratuitousspacebattles/index.html;
-    license = [ "unfree" ];
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+    license = with licenses; unfree;
+    maintainers = with maintainers; [ jcumming ];
     platforms = [ "x86_64-linux" "i686-linux" ] ;
   };
 
diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix
index 3fcbff42527..fd80eecfd55 100644
--- a/pkgs/games/tremulous/default.nix
+++ b/pkgs/games/tremulous/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     done
   '';
   dontPatchELF = true;
-  meta = {
+  meta = with stdenv.lib; {
     description = "A game that blends a team based FPS with elements of an RTS";
     longDescription = ''
       Tremulous is a free, open source game that blends a team based FPS with
@@ -70,9 +70,12 @@ stdenv.mkDerivation rec {
       degree), healing functions and much more...
     '';
     homepage = http://www.tremulous.net;
-    license = [ "GPLv2" ];  # media under cc by-sa 2.5
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = with licenses; [
+      gpl2
+      cc-by-sa-25 /* media */
+    ];
+    maintainers = with maintainers; [ astsmtl ];
+    platforms = with platforms; linux;
     broken = true;
   };
 }
diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix
index 6b4c6e68bac..925362be1c5 100644
--- a/pkgs/games/urbanterror/default.nix
+++ b/pkgs/games/urbanterror/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     cur_rpath=$(patchelf --print-rpath $p)
     patchelf --set-rpath $cur_rpath:${mesa}/lib $p
   '';
-  meta = {
+  meta = with stdenv.lib; {
     description = "A multiplayer tactical FPS on top of Quake 3 engine";
     longDescription = ''
       Urban Terror is a free multiplayer first person shooter developed by
@@ -57,9 +57,9 @@ stdenv.mkDerivation rec {
       realism". This results in a very unique, enjoyable and addictive game.
     '';
     homepage = http://www.urbanterror.net;
-    license = [ "unfree-redistributable" ];
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = stdenv.lib.platforms.linux;
+    license = with licenses; unfreeRedistributable;
+    maintainers = with maintainers; [ astsmtl ];
+    platforms = platforms.linux;
     hydraPlatforms = [];
   };
 }
diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix
index cab6a269f93..4a845a3a17e 100644
--- a/pkgs/games/vessel/default.nix
+++ b/pkgs/games/vessel/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     chmod +x $out/bin/Vessel
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A fluid physics based puzzle game";
     longDescription = ''
       Living liquid machines have overrun this world of unstoppable progress,
@@ -76,8 +76,8 @@ stdenv.mkDerivation rec {
       to life, and all the consequences that ensue.
     '';
     homepage = http://www.strangeloopgames.com;
-    license = [ "unfree" ];
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+    license = with licenses; unfree;
+    maintainers = with maintainers; [ jcumming ];
   };
 
 }
diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix
index 84d15efb810..83c9b5d52fa 100644
--- a/pkgs/games/warsow/default.nix
+++ b/pkgs/games/warsow/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     cur_rpath=$(patchelf --print-rpath $p)
     patchelf --set-rpath $cur_rpath:${mesa}/lib $p
   '';
-  meta = {
+  meta = with stdenv.lib; {
     description = "Multiplayer FPS game designed for competitive gaming";
     longDescription = ''
       Set in a futuristic cartoon-like world where rocketlauncher-wielding
@@ -56,8 +56,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.warsow.net;
     # Engine is under GPLv2, everything else is under
-    license = [ "unfree-redistributable" ];
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = with licenses; unfreeRedistributable;
+    maintainers = with maintainers; [ astsmtl ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix
index 8df3ef1e840..2382da03453 100644
--- a/pkgs/games/worldofgoo/default.nix
+++ b/pkgs/games/worldofgoo/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     chmod +x $out/bin/WorldofGoo
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A physics based puzzle game";
     longDescription = ''
       World of Goo is a physics based puzzle / construction game. The millions of Goo
@@ -75,8 +75,8 @@ stdenv.mkDerivation rec {
       game, or that they are extremely delicious.
     '';
     homepage = http://worldofgoo.com;
-    license = [ "unfree" ];
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+    license = with licenses; unfree;
+    maintainers = with maintainers; [ jcumming ];
   };
 
 }
diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix
index f61318e1b6b..c385971104d 100644
--- a/pkgs/os-specific/linux/hal-flash/default.nix
+++ b/pkgs/os-specific/linux/hal-flash/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
         package.  Provides the minimum necessary functionality to enable
         libflashplayer.so/libadobecp.so to play back DRM content.
       '';
-    license = "afl21 gpl2";
+    license = with licenses; [ afl21 gpl2 ];
     maintainers = with maintainers; [ malyn ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix
index f345fe71a34..ebabb1091ee 100644
--- a/pkgs/servers/dico/default.nix
+++ b/pkgs/servers/dico/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Flexible dictionary server and client implementing RFC 2229";
     homepage    = http://www.gnu.org/software/dico/;
-    license     = "GPLv3+";
+    license     = with licenses; gpl3Plus;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
 
diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index 4882097c91a..fdc52eabd4b 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Enterprise ready, Network Backup Tool";
     homepage    = http://bacula.org/;
-    license     = "GPLv2";
+    license     = with licenses; gpl2;
     maintainers = with maintainers; [ iElectric lovek323 ];
-    platforms   = stdenv.lib.platforms.all;
+    platforms   = platforms.all;
   };
 }
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index 69c14023701..6a9d4582dff 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   postInstall = "rm -rf $out/share/doc";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://tukaani.org/xz/;
     description = "XZ, general-purpose data compression software, successor of LZMA";
 
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
          bzip2.
       '';
 
-    license = [ "GPLv2+" "LGPLv2.1+" ];
-    maintainers = with stdenv.lib.maintainers; [ sander ];
-    platforms = stdenv.lib.platforms.all;
+    license = with licenses; [ gpl2Plus lgpl21Plus ];
+    maintainers = with maintainers; [ sander ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
index 44333b519cb..fd7d59774b2 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
@@ -45,10 +45,10 @@ buildPythonPackage rec {
   # tests are currently _heavily_ broken upstream
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://fedoraproject.org/wiki/Blivet";
     description = "Module for management of a system's storage configuration";
-    license = [ "GPLv2+" "LGPLv2.1+" ];
-    platforms = stdenv.lib.platforms.linux;
+    license = with licenses; [ gpl2Plus lgpl21Plus ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index c39f5cba775..f081f812169 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation {
   preConfigure = "./autogen.sh";
   buildInputs = [ autoconf automake pkgconfig curl openssl libxml2 fuse ];
   
-  meta = {
+  meta = with stdenv.lib; {
     description = "Mount an S3 bucket as filesystem through FUSE";
-    license = "GPLv2";
+    license = with licenses; gpl2;
   };
 }
diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix
index 47efe53c0a9..f16698ef3cd 100644
--- a/pkgs/tools/networking/isync/default.nix
+++ b/pkgs/tools/networking/isync/default.nix
@@ -10,12 +10,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl pkgconfig db cyrus_sasl ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://isync.sourceforge.net/;
     description = "Free IMAP and MailDir mailbox synchronizer";
-    license = [ "GPLv2+" ];
+    license = with licenses; [ gpl2Plus ];
 
-    maintainers = with stdenv.lib.maintainers; [ the-kenny viric ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = with maintainers; [ the-kenny viric ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix
index 991d75c66ae..cf9c3a4fa4e 100644
--- a/pkgs/tools/networking/maildrop/default.nix
+++ b/pkgs/tools/networking/maildrop/default.nix
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
 
   patches = [ ./maildrop.configure.hack.patch ]; # for building in chroot
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.courier-mta.org/maildrop/;
     description = "Mail filter/mail delivery agent that is used by the Courier Mail Server";
-    license = [ "GPLv3" ];
+    license = with licenses; gpl3;
   };
 }
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index 0b57a752a37..cbca408f084 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   # Tests fail since gcc 4.8
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Rich and powerful protocol-independent mail framework";
 
     longDescription = ''
@@ -46,13 +46,16 @@ stdenv.mkDerivation rec {
       message handling system.
     '';
 
-    license = [ "LGPLv3+" /* libraries */  "GPLv3+" /* tools */ ];
+    license = with licenses; [
+      lgpl3Plus /* libraries */
+      gpl3Plus /* tools */
+    ];
 
     maintainers = [ ];
 
     homepage = http://www.gnu.org/software/mailutils/;
 
     # Some of the dependencies fail to build on {cyg,dar}win.
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = platforms.gnu;
   };
 }
diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix
index a63ec2a3d68..2368470b84d 100644
--- a/pkgs/tools/networking/nss-pam-ldapd/default.nix
+++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
     wrapProgram $out/sbin/nslcd --prefix LD_LIBRARY_PATH ":" $out/lib
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "LDAP identity and authentication for NSS/PAM";
     homepage = http://arthurdejong.org/nss-pam-ldapd/;
-    license = [ "GPLv21" ];
+    license = with licenses; [ lgpl21 ];
   };
 }
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 55a99dd2729..7f6addc8629 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
     echo "wpa2-ttls" >> "$out/etc/encryption/templates/active"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://wicd.net/;
     description = "A wiredless and wired network manager";
     longDescription=''
@@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
       encryption types, such as WPA and WEP. Wicd will automatically
       connect at startup to any preferred network within range.
     '';
-    maintainers = [ stdenv.lib.maintainers.roconnor ];
-    license="GPLv2";
+    maintainers = [ maintainers.roconnor ];
+    license = with licenses; gpl2;
   };
 }
diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix
index bb3f9d72e82..1e2f74e1b0a 100644
--- a/pkgs/tools/system/bootchart/default.nix
+++ b/pkgs/tools/system/bootchart/default.nix
@@ -28,10 +28,10 @@ stdenv.mkDerivation rec {
     chmod +x $out/sbin/bootchartd
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.bootchart.org/;
     description = "Performance analysis and visualization of the GNU/Linux boot process";
-    license="GPLv2+";
+    license = with licenses; gpl2Plus;
   };
 
 }
diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix
index 9c98da6ac85..fd911142c21 100644
--- a/pkgs/tools/system/dog/default.nix
+++ b/pkgs/tools/system/dog/default.nix
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
     cp dog $out/bin
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://lwn.net/Articles/421072/";
-    description = "a cat replacement";
-    license="GPLv2+";
-    maintainers = with stdenv.lib.maintainers; [qknight];
-    platforms = with stdenv.lib.platforms; all;
+    description = "cat replacement";
+    license = with licenses; gpl2Plus;
+    maintainers = with maintainers; [ qknight ];
+    platforms = with platforms; all;
   };
 }
diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix
index 0a4c1e58fc5..a1397cb6214 100644
--- a/pkgs/tools/system/tm/default.nix
+++ b/pkgs/tools/system/tm/default.nix
@@ -17,12 +17,12 @@ stdenv.mkDerivation {
     sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://vicerveza.homeunix.net/~viric/soft/tm";
     description = "terminal mixer - multiplexer for the i/o of terminal applications";
-    license="GPLv2";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; all;
+    license = with licenses; gpl2;
+    maintainers = with maintainers; [ viric ];
+    platforms = with platforms; all;
   };
 
 }
diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix
index 6d1c6ad5e1f..6cd69a746f0 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/pkgs/tools/system/ts/default.nix
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
     sha256 = "042r9a09300v4fdrw4r60g5xi25v5m6g12kvvr6pcsm9qnfqyqqs";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://vicerveza.homeunix.net/~viric/soft/ts";
     description = "task spooler - batch queue";
-    license="GPLv2";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; all;
+    license = with licenses; gpl2;
+    maintainers = with maintainers; [ viric ];
+    platforms = with platforms; all;
   };
 }
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 56bffa0bc51..e6556b0898a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -33,12 +33,12 @@ let self = _self // overrides; _self = with self; {
     # use gnused so that the preCheck command passes
     buildInputs = stdenv.lib.optional stdenv.isDarwin [ gnused ];
     propagatedBuildInputs = [ FileNext ];
-    meta = {
+    meta = with stdenv.lib; {
       description = "A grep-like tool tailored to working with large trees of source code";
       homepage    = http://betterthangrep.com/;
-      license     = "free";  # Artistic 2.0
+      license     = with licenses; artistic2;
       maintainers = with maintainers; [ lovek323 ];
-      platforms   = stdenv.lib.platforms.unix;
+      platforms   = platforms.unix;
     };
     # tests fails on nixos and hydra because of different purity issues
     doCheck = false;
@@ -3721,9 +3721,9 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs =
       [ ClassLoad ListMoreUtils ModulePluggable Moose MooseXParamsValidate MooseXSemiAffordanceAccessor namespaceautoclean ]
       ++ stdenv.lib.optional stdenv.isLinux LinuxInotify2;
-    meta = {
+    meta = with stdenv.lib; {
       description = "Watch for changes to files, cross-platform style";
-      license = "artistic_2";
+      license = with licenses; artistic2;
     };
   };
 
@@ -3983,10 +3983,10 @@ let self = _self // overrides; _self = with self; {
       sha256 = "0mxfhi1ndckj4w7fw20rwy6ymalg2yncnp9xn0v2bnk5ibqj439w";
     };
     propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc JSON ];
-    meta = {
+    meta = with stdenv.lib; {
       homepage = http://finance-quote.sourceforge.net/;
       description = "Get stock and mutual fund quotes from various exchanges";
-      license = "gpl";
+      license = with licenses; gpl2;
     };
   };
 
@@ -4158,9 +4158,9 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ pkgs.graphviz ];
     propagatedBuildInputs = [ IPCRun TestMore ];
 
-    meta = {
+    meta = with stdenv.lib; {
       description = "Perl interface to the GraphViz graphing tool";
-      license = [ "Artistic" ];
+      license = with licenses; artistic2;
       maintainers = [ ];
     };
   };
@@ -4861,7 +4861,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "1f37pi7a6fcphp0kkhj7yr9b5c95m2wvy5jcwjq1xdiq74gdi16c";
     };
 
-    meta = {
+    meta = with stdenv.lib; {
       description = "ExifTool, a tool to read, write and edit EXIF meta information";
       homepage = http://www.sno.phy.queensu.ca/~phil/exiftool/;
 
@@ -4877,10 +4877,10 @@ let self = _self // overrides; _self = with self; {
         Sigma/Foveon and Sony.
       '';
 
-      license = [ "GPLv1+" /* or */ "Artistic" ];
+      license = with licenses; [ gpl1Plus /* or */ artistic2 ];
 
       maintainers = [ ];
-      platforms = stdenv.lib.platforms.unix;
+      platforms = platforms.unix;
     };
   };
 
@@ -7810,10 +7810,10 @@ let self = _self // overrides; _self = with self; {
       sha256 = "c5da0e390b58655934e1df57937d29d7de13b99f5638fe44833832a5b39c8aa5";
     };
     propagatedBuildInputs = [ FileFindIterator IPCRun constantdefer libintlperl ];
-    meta = {
+    meta = with stdenv.lib; {
       homepage = http://user42.tuxfamily.org/podlinkcheck/index.html;
       description = "Check POD L<> link references";
-      license = "gpl";
+      license = with licenses; gpl3Plus;
     };
   };
 
@@ -7921,9 +7921,9 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2013031301.tar.gz;
       sha256 = "729a8198d264aa64ecbb233ff990507f97fbb66bda746b95f3286f50f5f25c84";
     };
-    meta = {
+    meta = with stdenv.lib; {
       description = "Provide commonly requested regular expressions";
-      license = "mit";
+      license = with licenses; mit;
     };
   };
 
@@ -8433,9 +8433,9 @@ let self = _self // overrides; _self = with self; {
       sha256 = "0mlwm0rirv46gj4h072q8gdync5zxxsxy8p028gdyrhczl942dc3";
     };
     propagatedBuildInputs = [ ParamsUtil SubExporter ];
-    meta = {
+    meta = with stdenv.lib; {
       description = "Build sprintf-like functions of your own";
-      license = "gpl";
+      license = with licenses; gpl2;
     };
   };
 
@@ -9333,11 +9333,11 @@ let self = _self // overrides; _self = with self; {
     };
     buildInputs = [ ClassInspector TestUnitLite ];
     propagatedBuildInputs = [ ExceptionBase FatalException Moose namespaceclean TestAssert ];
-    meta = {
+    meta = with stdenv.lib; {
       description = "Simulating other classes";
-      license = "lgpl";
+      license = with licenses; lgpl2Plus;
       maintainers = with maintainers; [ ocharles ];
-      platforms   = stdenv.lib.platforms.unix;
+      platforms   = platforms.unix;
     };
   };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b33448fa944..7d6678974e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7437,12 +7437,12 @@ let
     meta = {
       homepage = http://namebench.googlecode.com/;
       description = "Find fastest DNS servers available";
-      license = [
-        "Apache-2.0"
+      license = with licenses; [
+        asl20
         # third-party program licenses (embedded in the sources)
         "LGPL" # Crystal_Clear
-        "free" # dns
-        "Apache-2.0" # graphy
+        free # dns
+        asl20 # graphy
         "BSD" # jinja2
       ];
       longDescription = ''
@@ -8058,7 +8058,7 @@ let
         not a large parsing framework or a component of some larger system.
       '';
 
-      license = "revised-BSD";
+      license = with licenses; bsd3;
 
       maintainers = [ ];
     };
@@ -10164,7 +10164,7 @@ let
 
     meta = {
       homepage    = "https://github.com/rackspace/pyrax";
-      license     = "MIT";
+      license     = with licenses; mit;
       description = "Python API to interface with Rackspace";
     };
 
@@ -10240,7 +10240,7 @@ let
 
     meta = {
       homepage = "http://github.com/mongodb/mongo-python-driver";
-      license = [ "Apache-2.0" ];
+      license = with licenses; [ asl20 ];
       description = "Python driver for MongoDB ";
     };
   };
@@ -10308,7 +10308,7 @@ let
         in Python.
       '';
 
-      license = "revised BSD";
+      license = with licenses; bsd3;
 
       maintainers = [ ];
     };

From c4f1011cabb904e8830c77105321f30055c254af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 27 May 2015 22:05:04 +0200
Subject: [PATCH 0313/2322] gtk+ stack: maintenance updates

---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 4 ++--
 pkgs/development/libraries/glib/default.nix       | 4 ++--
 pkgs/development/libraries/gtk+/2.x.nix           | 4 ++--
 pkgs/development/libraries/gtk+/3.x.nix           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index da6a3ad1dff..1fa57b5adb5 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.31";
-  ver_min = "3";
+  ver_min = "4";
 in
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
-    sha256 = "ddd861747bb7c580acce7cfa3ce38c3f52a9516e66a6477988fd100c8fb9eabc";
+    sha256 = "05bslhk33qpssg66n2wys9khyzwkr4am0b23dym8n67qjds9gng5";
   };
 
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 7d61bea64e1..5c76bc3186b 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -40,7 +40,7 @@ let
   '';
 
   ver_maj = "2.44";
-  ver_min = "0";
+  ver_min = "1";
 in
 
 stdenv.mkDerivation rec {
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
-    sha256 = "1fgmjv3yzxgbks31h42201x2izpw0sd84h8dfw0si3x00sqn5lzj";
+    sha256 = "01yabrfp64i11mrks3p1gcks99lw0zm7f5vhkc53sl4amyndw4c8";
   };
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 774193cc06c..fec9d16cf95 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 stdenv.mkDerivation rec {
-  name = "gtk+-2.24.27";
+  name = "gtk+-2.24.28";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz";
-    sha256 = "1x14rnjvqslpa1q19fp1qalz5sxds72amsgjk8m7769rwk511jr0";
+    sha256 = "0mj6xn40py9r9lvzg633fal81xfwfm89d9mvz7jk4lmwk0g49imj";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 252e52ee3b9..4bc31b99e82 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -10,7 +10,7 @@ assert cupsSupport -> cups != null;
 
 let
   ver_maj = "3.16";
-  ver_min = "2";
+  ver_min = "3";
   version = "${ver_maj}.${ver_min}";
 in
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "1yhwg2l72l3khfkprydcjlpxjrg11ccqfc80sjl56llz3jk66fd0";
+    sha256 = "195ykv53sl2gsc847wcnd79zilm1yzcc2cfjxnrakhh2dd5gshr9";
   };
 
   nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];

From 201059f728f93be48d1043d45ca5c51bd87d5407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 27 May 2015 22:49:57 +0200
Subject: [PATCH 0314/2322] python-pyev: new package

Python bindings for the libev library.

https://code.google.com/p/pyev/
---
 pkgs/top-level/python-packages.nix | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7d6678974e0..bc6b79a86e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9354,6 +9354,32 @@ let
     };
   };
 
+
+  pyev = buildPythonPackage rec {
+    name = "pyev-0.9.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pyev/${name}.tar.gz";
+      sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx";
+    };
+
+    buildInputs = [ pkgs.libev ];
+
+    postPatch = ''
+      libev_so=${pkgs.libev}/lib/libev.so.4
+      test -f "$libev_so" || { echo "ERROR: File $libev_so does not exist, please fix nix expression for pyev"; exit 1; }
+      sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"$libev_so\"|" setup.py
+    '';
+
+    meta = {
+      description = "Python bindings for libev";
+      homepage = https://code.google.com/p/pyev/;
+      license = licenses.gpl3;
+      maintainers = [ maintainers.bjornfor ];
+    };
+  };
+
+
   pyfeed = buildPythonPackage rec {
     url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz";
     name = stdenv.lib.nameFromURL url ".tar";

From 4793f2c7d3a521310c128b8afb11750455022bf9 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 26 May 2015 10:58:16 -0500
Subject: [PATCH 0315/2322] nixpkgs: arcanist 20150412 -> 20150525

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 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 309d20d675b..dfa83ffb312 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -3,18 +3,18 @@
 let
   libphutil = fetchgit {
     url    = "git://github.com/phacility/libphutil.git";
-    rev    = "efc338d50f17dec594a66337034797c90c8b10c1";
-    sha256 = "9a9df8667d9bf31667facd1cd873adef292c63893adc15d32bd819c47256027c";
+    rev    = "672c0f7d5da9be6cda619428a9da3b91a670ea2f";
+    sha256 = "830c7abce7244afa188255a6f288c345004cc4be1c8bbe93afa2aa2f1768f025";
   };
   arcanist = fetchgit {
     url    = "git://github.com/phacility/arcanist.git";
-    rev    = "e101496508e279e1b9ee15d7d549735a0352f8ab";
-    sha256 = "4f2ae195173d859f9920378c42e257d70e5720b7f54c02d9af2c398f936f20b9";
+    rev    = "64d03ff68bf2ff4ef99186472704df8aface9ef3";
+    sha256 = "e9c5f9a9dcb1be0b7fd6f5fbda865e14277ddb0c1cedd256c459b3540ec6ded7";
   };
 in
 stdenv.mkDerivation rec {
   name    = "arcanist-${version}";
-  version = "20150412";
+  version = "20150525";
 
   src = [ arcanist libphutil ];
   buildInputs = [ php makeWrapper flex ];

From 6fbc62419b70ef7a0336bd65c89227db2aec0f5b Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 13 May 2015 06:52:56 -0500
Subject: [PATCH 0316/2322] nixpkgs: afl 1.67b -> 1.80b

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/afl/default.nix               | 15 +++++----------
 pkgs/tools/security/afl/qemu-patches/afl-config.h |  9 +++++----
 .../security/afl/qemu-patches/cpu-exec.patch      | 14 +++++++-------
 .../tools/security/afl/qemu-patches/elfload.patch |  8 ++++----
 .../tools/security/afl/qemu-patches/syscall.patch |  4 ++--
 .../security/afl/qemu-patches/translate-all.patch |  6 +++---
 pkgs/tools/security/afl/qemu.nix                  |  4 ++--
 7 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index ea495145d1a..2aed8df3260 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -9,11 +9,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "1.67b";
+  version = "1.80b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "11763zgwqg2b5hak006rp0jb3w252js067z9ibgl4nj3br2ncmd2";
+    sha256 = "008l2qirwlf40yhlrybcpglsil9nw8498qcjmvrnvvq31piwyhp0";
   };
 
   # Note: libcgroup isn't needed for building, just for the afl-cgroup
@@ -22,7 +22,9 @@ stdenv.mkDerivation rec {
 
   buildPhase   = ''
     make PREFIX=$out
-    cd llvm_mode && make && cd ..
+    cd llvm_mode
+    make PREFIX=$out CC=${clang}/bin/clang CXX=${clang}/bin/clang++
+    cd ..
   '';
   installPhase = ''
     # Do the normal installation
@@ -42,13 +44,6 @@ stdenv.mkDerivation rec {
     # Patch shebangs before wrapping
     patchShebangs $out/bin
 
-    # Wrap every program with a custom $AFL_PATH; I believe there is a
-    # bug in afl which causes it to fail to find `afl-qemu-trace`
-    # relative to `afl-fuzz` or `afl-showmap`, so we instead set
-    # $AFL_PATH as a workaround, which allows it to be found.
-    for x in `ls $out/bin/afl-* | grep -v afl-clang-fast`; do
-      wrapProgram $x --prefix AFL_PATH : "$out/bin"
-    done
     # Wrap afl-clang-fast(++) with a *different* AFL_PATH, because it
     # has totally different semantics in that case(?) - and also set a
     # proper AFL_CC and AFL_CXX so we don't pick up the wrong one out
diff --git a/pkgs/tools/security/afl/qemu-patches/afl-config.h b/pkgs/tools/security/afl/qemu-patches/afl-config.h
index 0017f9d83f4..cbf48881ade 100644
--- a/pkgs/tools/security/afl/qemu-patches/afl-config.h
+++ b/pkgs/tools/security/afl/qemu-patches/afl-config.h
@@ -88,10 +88,10 @@
 /* Maximum stacking for havoc-stage tweaks. The actual value is calculated
    like this: 
 
-   n = random between 0 and HAVOC_STACK_POW2
+   n = random between 1 and HAVOC_STACK_POW2
    stacking = 2^n
 
-   In other words, the default (n = 7) produces 1, 2, 4, 8, 16, 32, 64, or
+   In other words, the default (n = 7) produces 2, 4, 8, 16, 32, 64, or
    128 stacked tweaks: */
 
 #define HAVOC_STACK_POW2    7
@@ -250,9 +250,10 @@
 
 #define RESEED_RNG          10000
 
-/* Maximum line length passed from GCC to 'as': */
+/* Maximum line length passed from GCC to 'as' and used for parsing
+   configuration files: */
 
-#define MAX_AS_LINE         8192
+#define MAX_LINE            8192
 
 /* Environment variable used to pass SHM ID to the called program. */
 
diff --git a/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch b/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch
index 29b65e71b9a..75a7ea450ef 100644
--- a/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch
+++ b/pkgs/tools/security/afl/qemu-patches/cpu-exec.patch
@@ -1,15 +1,15 @@
---- qemu-2.2.0/cpu-exec.c.orig     2014-12-09 14:45:40.000000000 +0000
-+++ qemu-2.2.0/cpu-exec.c  2015-02-20 22:07:02.966000000 +0000
-@@ -25,6 +25,8 @@
- #include "sysemu/qtest.h"
- #include "qemu/timer.h"
+--- qemu-2.3.0/cpu-exec.c.orig     2014-12-09 14:45:40.000000000 +0000
++++ qemu-2.3.0/cpu-exec.c  2015-02-20 22:07:02.966000000 +0000
+@@ -28,6 +28,8 @@
+ #include "exec/memory-internal.h"
+ #include "qemu/rcu.h"
 
 +#include "afl-qemu-cpu-inl.h"
 +
  /* -icount align implementation. */
 
  typedef struct SyncClocks {
-@@ -262,8 +264,11 @@
+@@ -296,8 +298,11 @@
      }
   not_found:
     /* if no translated code available, then translate it now */
@@ -21,7 +21,7 @@
   found:
      /* Move the last found TB to the head of the list */
      if (likely(*ptb1)) {
-@@ -455,6 +460,9 @@
+@@ -492,6 +497,9 @@
                      next_tb = 0;
                      tcg_ctx.tb_ctx.tb_invalidated_flag = 0;
                  }
diff --git a/pkgs/tools/security/afl/qemu-patches/elfload.patch b/pkgs/tools/security/afl/qemu-patches/elfload.patch
index 65f1572e9a7..325c917d15a 100644
--- a/pkgs/tools/security/afl/qemu-patches/elfload.patch
+++ b/pkgs/tools/security/afl/qemu-patches/elfload.patch
@@ -1,5 +1,5 @@
---- qemu-2.2.0/linux-user/elfload.c.orig	2014-12-09 14:45:42.000000000 +0000
-+++ qemu-2.2.0/linux-user/elfload.c	2015-01-28 02:51:23.719000000 +0000
+--- qemu-2.3.0/linux-user/elfload.c.orig	2014-12-09 14:45:42.000000000 +0000
++++ qemu-2.3.0/linux-user/elfload.c	2015-01-28 02:51:23.719000000 +0000
 @@ -28,6 +28,8 @@
  
  #define ELF_OSABI   ELFOSABI_SYSV
@@ -9,7 +9,7 @@
  /* from personality.h */
  
  /*
-@@ -1886,6 +1888,8 @@
+@@ -1889,6 +1891,8 @@
      info->brk = 0;
      info->elf_flags = ehdr->e_flags;
  
@@ -18,7 +18,7 @@
      for (i = 0; i < ehdr->e_phnum; i++) {
          struct elf_phdr *eppnt = phdr + i;
          if (eppnt->p_type == PT_LOAD) {
-@@ -1919,9 +1923,11 @@
+@@ -1922,9 +1926,11 @@
              if (elf_prot & PROT_EXEC) {
                  if (vaddr < info->start_code) {
                      info->start_code = vaddr;
diff --git a/pkgs/tools/security/afl/qemu-patches/syscall.patch b/pkgs/tools/security/afl/qemu-patches/syscall.patch
index c8ffb61ba2c..75d39386164 100644
--- a/pkgs/tools/security/afl/qemu-patches/syscall.patch
+++ b/pkgs/tools/security/afl/qemu-patches/syscall.patch
@@ -1,5 +1,5 @@
---- qemu-2.2.0/linux-user/syscall.c.orig	2014-12-09 14:45:43.000000000 +0000
-+++ qemu-2.2.0/linux-user/syscall.c	2015-03-27 06:33:00.736000000 +0000
+--- qemu-2.3.0/linux-user/syscall.c.orig	2014-12-09 14:45:43.000000000 +0000
++++ qemu-2.3.0/linux-user/syscall.c	2015-03-27 06:33:00.736000000 +0000
 @@ -227,7 +227,21 @@
  _syscall3(int,sys_rt_sigqueueinfo,int,pid,int,sig,siginfo_t *,uinfo)
  _syscall3(int,sys_syslog,int,type,char*,bufp,int,len)
diff --git a/pkgs/tools/security/afl/qemu-patches/translate-all.patch b/pkgs/tools/security/afl/qemu-patches/translate-all.patch
index 89163b607fd..180b3a55ab2 100644
--- a/pkgs/tools/security/afl/qemu-patches/translate-all.patch
+++ b/pkgs/tools/security/afl/qemu-patches/translate-all.patch
@@ -1,6 +1,6 @@
---- qemu-2.2.0/translate-all.c.orig     2014-12-09 14:45:46.000000000 +0000
-+++ qemu-2.2.0/translate-all.c  2015-01-28 22:37:42.383000000 +0000
-@@ -387,8 +387,13 @@
+--- qemu-2.3.0/translate-all.c.orig     2014-12-09 14:45:46.000000000 +0000
++++ qemu-2.3.0/translate-all.c  2015-01-28 22:37:42.383000000 +0000
+@@ -393,8 +393,13 @@
      /* We can't use g_malloc because it may recurse into a locked mutex. */
  # define ALLOC(P, SIZE)                                 \
      do {                                                \
diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix
index 5b69811d08d..3dd47f50cf7 100644
--- a/pkgs/tools/security/afl/qemu.nix
+++ b/pkgs/tools/security/afl/qemu.nix
@@ -7,7 +7,7 @@
 with stdenv.lib;
 
 let
-  n = "qemu-2.2.0";
+  n = "qemu-2.3.0";
 
   aflHeaderFile = writeText "afl-qemu-cpu-inl.h"
     (builtins.readFile ./qemu-patches/afl-qemu-cpu-inl.h);
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://wiki.qemu.org/download/${n}.tar.bz2";
-    sha256 = "1703c3scl5n07gmpilg7g2xzyxnr7jczxgx6nn4m8kv9gin9p35n";
+    sha256 = "120m53c3p28qxmfzllicjzr8syjv6v4d9rsyrgkp7gnmcgvvgfmn";
   };
 
   buildInputs =

From 5762db8504cd639e593a293cb9ed6900f7d58231 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 27 May 2015 16:36:08 -0500
Subject: [PATCH 0317/2322] nixpkgs: luajit 2.0.3 -> 2.0.4

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/interpreters/luajit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index f0d9d03991b..8e148f1189c 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "luajit-${version}";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchurl {
     url    = "http://luajit.org/download/LuaJIT-${version}.tar.gz";
-    sha256 = "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm";
+    sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2";
   };
 
   enableParallelBuilding = true;

From 4d12ea8311c8a55bd905ed4b9d5480481c4c3726 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 28 May 2015 03:15:42 +0000
Subject: [PATCH 0318/2322] Add micro-httpd package

---
 pkgs/servers/http/micro-httpd/default.nix | 25 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/servers/http/micro-httpd/default.nix

diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/servers/http/micro-httpd/default.nix
new file mode 100644
index 00000000000..ba7c69ef7db
--- /dev/null
+++ b/pkgs/servers/http/micro-httpd/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "micro-httpd-20140814";
+
+  src = fetchurl {
+    url   = "http://acme.com/software/micro_httpd/micro_httpd_14Aug2014.tar.gz";
+    sha256 = "0mlm24bi31s0s8w55i0sysv2nc1n2x4cfp6dm47slz49h2fz24rk";
+  };
+
+  preBuild = ''
+    makeFlagsArray=(BINDIR="$out/bin" MANDIR="$out/share/man/man8")
+    mkdir -p $out/bin
+    mkdir -p $out/share/man/man8
+  '';
+
+  meta = with stdenv.lib; {
+    homepage    = "http://acme.com/software/micro_httpd/";
+    description = "a really small HTTP server";
+    license     = licenses.bsd2;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ copumpkin ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1066161dc9b..41c0e0436e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8722,6 +8722,8 @@ let
 
   mpdscribble = callPackage ../tools/misc/mpdscribble { };
 
+  microHttpd = callPackage ../servers/http/micro-httpd { };
+
   miniHttpd = callPackage ../servers/http/mini-httpd {};
 
   mlmmj = callPackage ../servers/mail/mlmmj { };

From 2906376ddc99d9d36199a9eaf3ee6892fb83b154 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Thu, 28 May 2015 00:26:17 -0400
Subject: [PATCH 0319/2322] libclxclient: reacfor & fix include directory

---
 .../libraries/libclxclient/default.nix        | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix
index 7d0e4596dd0..4dc103515ac 100644
--- a/pkgs/development/libraries/libclxclient/default.nix
+++ b/pkgs/development/libraries/libclxclient/default.nix
@@ -1,38 +1,41 @@
-{ stdenv, fetchurl, libclthreads, libXft, libX11, xlibs }:
+{ stdenv, fetchurl, libclthreads, libX11, libXft, xlibs }:
 
 stdenv.mkDerivation rec {
   name = "libclxclient-${version}";
   version = "3.9.0";
+
   src = fetchurl {
     url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2";
     sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0";
   };
 
-  buildInputs = [
-    libclthreads libXft libX11 xlibs.xproto
-  ];
+  buildInputs = [ libclthreads libX11 libXft xlibs.xproto ];
 
-  configurePhase = ''
-    cpp -v
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${xlibs.xproto}/include"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXft}/include"
-    echo $NIX_CFLAGS_COMPILE
-    sed -e "s@/usr/local@$out@" -i Makefile
-    sed -e "s@#include <clthreads.h>@#include <${libclthreads}/include>@" -i clxclient.h
+  NIX_CFLAGS_COMPILE = "-I${xlibs.xproto}/include -I${libXft}/include";
+
+  patchPhase = ''
     sed -e "s@ldconfig@@" -i Makefile
-    sed -e "s@SUFFIX :=.*@SUFFIX =@" -i Makefile
   '';
 
-  fixupPhase = ''
+  makeFlags = [
+    "PREFIX=$(out)"
+    "SUFFIX=''"
+  ];
+
+  preInstall = ''
+    # The Makefile does not create the include directory
+    mkdir -p $out/include
+  '';
+
+  postInstall = ''
     ln $out/lib/libclxclient.so $out/lib/libclxclient.so.3
   '';
 
-  meta = {
-    description = "zita X11 library";
-    version = "${version}";
+  meta = with stdenv.lib; {
+    description = "Zita X11 library";
     homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.magnetophon ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ magnetophon ];
+    platforms = platforms.linux;
   };
 }

From 83fa9994e5c34a516c0eb9f7eed7b841e4cb85a2 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Thu, 28 May 2015 01:53:23 -0400
Subject: [PATCH 0320/2322] libclthreads: refactor fix include directories fix
 symlink to library

---
 .../libraries/libclthreads/default.nix        | 42 +++++++++++++------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix
index 5d5a9e49381..ea27046279c 100644
--- a/pkgs/development/libraries/libclthreads/default.nix
+++ b/pkgs/development/libraries/libclthreads/default.nix
@@ -1,26 +1,42 @@
-{ stdenv, fetchurl, }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libclthreads-${version}";
   version = "2.4.0";
+
   src = fetchurl {
     url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2";
     sha256 = "1s8xx99z6llv46cvkllmd72v2pkzbfl5gngcql85mf14mxkdb7x6";
   };
 
-  configurePhase = ''
-    sed -e "s@/usr/local@$out@" -i Makefile
-    sed -e "s@/usr/bin/install@install@" -i Makefile
-    sed -e "s@/sbin/ldconfig@ldconfig@" -i Makefile
-    sed -e "s@SUFFIX :=.*@SUFFIX =@" -i Makefile
+  patchPhase = ''
+    # Fix hardcoded paths to executables
+    sed -e "s@/usr/bin/install@install@" -i ./Makefile
+    sed -e "s@/sbin/ldconfig@ldconfig@" -i ./Makefile
+
+    # Remove useless symlink: /lib64 -> /lib
+    sed -e '/ln -sf \$(CLTHREADS_MIN) \$(PREFIX)\/\$(LIBDIR)\/\$(CLTHREADS_SO)/d' -i ./Makefile
   '';
 
-  meta = {
-    description = "zita thread library";
-    version = "${version}";
-    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.magnetophon ];
-    platforms = stdenv.lib.platforms.linux;
+  makeFlags = [
+    "PREFIX=$(out)"
+    "SUFFIX=''"
+  ];
+
+  preInstall = ''
+    # The Makefile does not create the include directory
+    mkdir -p $out/include
+  '';
+
+  postInstall = ''
+    ln -s $out/lib/libclthreads.so.${version} $out/lib/libclthreads.so
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Zita thread library";
+    homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ magnetophon ];
+    platforms = platforms.linux;
   };
 }

From 0a9d9639ea1e606b50a42f5f5798ef0ac22f63e0 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Thu, 28 May 2015 01:57:38 -0400
Subject: [PATCH 0321/2322] jaaa: refactor

---
 pkgs/applications/audio/jaaa/default.nix | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix
index b855bd29660..0f29ce34cac 100644
--- a/pkgs/applications/audio/jaaa/default.nix
+++ b/pkgs/applications/audio/jaaa/default.nix
@@ -25,29 +25,20 @@ stdenv.mkDerivation rec {
     "-I${zita-alsa-pcmi}/include"
   ];
 
-  patchPhase = ''
-    cd source/
-    sed -i "s@clthreads.h@${libclthreads}/include@g" $(find . -name '*.cc')
-    sed -i "s@clxclient.h@${libclxclient}/include@g" $(find . -name '*.cc')
-    sed -i "s@clthreads.h@${libclthreads}/include@g" $(find . -name '*.h')
-    sed -i "s@clxclient.h@${libclxclient}/include@g" $(find . -name '*.h')
-  '';
+  makeFlags = [
+    "PREFIX=$(out)"
+    "SUFFIX=''"
+  ];
 
-  buildlPhase = ''
-    make PREFIX="$out"
-  '';
-
-  installPhase = ''
-    echo zita= ${zita-alsa-pcmi}
-    make PREFIX="$out" install
-    install -Dm644 ../README "$out/README"
+  preConfigure = ''
+    cd ./source/
   '';
 
   meta = with stdenv.lib; {
     homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html;
     description = "JACK and ALSA Audio Analyser";
     license = licenses.gpl2;
-    maintainers = [ maintainers.magnetophon ];
+    maintainers = with maintainers; [ magnetophon ];
     platforms = platforms.linux;
   };
 }

From 045e93e0a660e2db58403ee3bf40ada2d351971e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= <r.dahlen@gmail.com>
Date: Mon, 20 Apr 2015 21:54:58 +0100
Subject: [PATCH 0322/2322] mesos-slave: docker and IP address config options

- Usage of docker containerizer is currently hardcoded, this PR makes it
  optional. Default is to enable it if docker is enabled.
- Make IP address to listen on part of service configuration.
---
 nixos/modules/services/misc/mesos-slave.nix | 25 ++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix
index 26fb3fdb00c..811aa812c8d 100644
--- a/nixos/modules/services/misc/mesos-slave.nix
+++ b/nixos/modules/services/misc/mesos-slave.nix
@@ -12,6 +12,8 @@ let
   attribsArg = optionalString (cfg.attributes != {})
                               "--attributes=${mkAttributes cfg.attributes}";
 
+  containerizers = [ "mesos" ] ++ (optional cfg.withDocker "docker");
+
 in {
 
   options.services.mesos = {
@@ -22,8 +24,14 @@ in {
         type = types.uniq types.bool;
       };
 
+      ip = mkOption {
+        description = "IP address to listen on.";
+        default = "0.0.0.0";
+        type = types.string;
+      };
+
       port = mkOption {
-        description = "Mesos Slave port";
+        description = "Port to listen on.";
         default = 5051;
         type = types.int;
       };
@@ -43,6 +51,12 @@ in {
         type = types.bool;
       };
 
+      withDocker = mkOption {
+        description = "Enable the docker containerizer.";
+        default = config.virtualisation.docker.enable;
+        type = types.bool;
+      };
+
       workDir = mkOption {
         description = "The Mesos work directory.";
         default = "/var/lib/mesos/slave";
@@ -92,17 +106,18 @@ in {
       description = "Mesos Slave";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
-      environment.MESOS_CONTAINERIZERS = "docker,mesos";
+      environment.MESOS_CONTAINERIZERS = concatStringsSep "," containerizers;
       serviceConfig = {
         ExecStart = ''
           ${pkgs.mesos}/bin/mesos-slave \
+            --ip=${cfg.ip} \
             --port=${toString cfg.port} \
             --master=${cfg.master} \
-            ${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \
-            ${attribsArg} \
             --work_dir=${cfg.workDir} \
             --logging_level=${cfg.logLevel} \
-            --docker=${pkgs.docker}/libexec/docker/docker \
+            ${attribsArg} \
+            ${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \
+            ${optionalString cfg.withDocker "--docker=${pkgs.docker}/libexec/docker/docker"} \
             ${toString cfg.extraCmdLineOptions}
         '';
         PermissionsStartOnly = true;

From e4fece4f287083cb9f70124c5c71612d4a2df8ff Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Thu, 28 May 2015 02:12:45 -0400
Subject: [PATCH 0323/2322] tetraproc: refactor

---
 pkgs/applications/audio/tetraproc/default.nix | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix
index de351a72022..b1356d3c547 100644
--- a/pkgs/applications/audio/tetraproc/default.nix
+++ b/pkgs/applications/audio/tetraproc/default.nix
@@ -1,33 +1,30 @@
-{ stdenv, fetchurl, jack2, libclthreads, libclxclient, fftwFloat, libsndfile, freetype, x11
-}:
+{ stdenv, fetchurl, fftwFloat, freetype, jack2, libclthreads, libclxclient, libsndfile, x11 }:
 
 stdenv.mkDerivation rec {
   name = "tetraproc-${version}";
   version = "0.8.2";
+
   src = fetchurl {
     url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
     sha256 = "17y3vbm5f6h5cmh3yfxjgqz4xhfwpkla3lqfspnbm4ndlzmfpykv";
   };
 
-  buildInputs = [
-   jack2 libclthreads libclxclient fftwFloat libsndfile freetype x11
+  buildInputs = [ jack2 libclthreads libclxclient fftwFloat libsndfile freetype x11 ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "SUFFIX=''"
   ];
 
-  patchPhase = ''
-    cd source
-    sed -e "s@#include <clthreads.h>@#include <${libclthreads}/include>@" -i tetraproc.cc
-    sed -e "s@#include <clxclient.h>@#include <${libclxclient}/include>@" -i *.h
-    sed -e "s@#include <clthreads.h>@#include <${libclthreads}/include>@" -i *.h
-    sed -e "s@#include <clxclient.h>@#include <${libclxclient}/include>@" -i png2img.*
-    sed -e "s@/usr/local@$out@" -i Makefile
+  preConfigure = ''
+    cd ./source/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Converts the A-format signals from a tetrahedral Ambisonic microphone into B-format signals ready for recording";
-    version = "${version}";
-    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.magnetophon ];
-    platforms = stdenv.lib.platforms.linux;
+    homepage = http://kokkinizita.linuxaudio.org/linuxaudio/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ magnetophon ];
+    platforms = platforms.linux;
   };
 }

From c9d22a69b10af014ab08c0c3bf6e488da59a5463 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 28 May 2015 10:25:11 +0200
Subject: [PATCH 0324/2322] nixos: Add lightdm test to release.nix.

This is just to let it run on Hydra but doesn't have an affect on
channel updates.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/release.nix b/nixos/release.nix
index dfc28173f1a..3559926eefa 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -271,6 +271,7 @@ in rec {
   tests.kde4 = callTest tests/kde4.nix {};
   tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
   tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
+  tests.lightdm = callTest tests/lightdm.nix {};
   tests.login = callTest tests/login.nix {};
   #tests.logstash = callTest tests/logstash.nix {};
   tests.misc = callTest tests/misc.nix {};

From f0d0617827c49dc5e7c72580a40a3d01e82c9ff4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 28 May 2015 10:27:29 +0200
Subject: [PATCH 0325/2322] nixos: Add lightdm test to the "tested" job.

This is to prevent bugs such as #7902 from hitting the channels again.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/release-combined.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index a79f72823fd..d501c2e7c53 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -64,6 +64,7 @@ in rec {
         (all nixos.tests.installer.btrfsSubvolDefault)
         (all nixos.tests.ipv6)
         (all nixos.tests.kde4)
+        (all nixos.tests.lightdm)
         (all nixos.tests.login)
         (all nixos.tests.misc)
         (all nixos.tests.nat.firewall)

From d2e364c6781359a0fd6ea66b041d37e061b01cef Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 28 May 2015 11:38:59 +0300
Subject: [PATCH 0326/2322] unbreak the nixpkgs monitor: url -> urls

---
 pkgs/applications/altcoins/bitcoin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index b759b2dcb2c..7be2b90551e 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec{
   version = core_version;
 
   src = fetchurl {
-    url = [ "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-${core_version}/bitcoin-${version}.tar.gz"
+             "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz"
+           ];
     sha256 = "cddf96c71d0a35524fde93380981cf0cf0b51441454a3a68b9be491b9239bfec";
   };
 

From 88e58a4fa208a967c4e4bde5beda86e44eca9c12 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Tue, 26 May 2015 15:18:49 +0200
Subject: [PATCH 0327/2322] cygwin: stdenv

---
 maintainers/scripts/hydra_eval_check          |  1 +
 .../cygwin/all-buildinputs-as-runtimedep.sh   | 16 ++++
 pkgs/stdenv/cygwin/rebase-i686.sh             | 21 ++++++
 pkgs/stdenv/cygwin/rebase-x86_64.sh           | 21 ++++++
 pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh  | 74 +++++++++++++++++++
 pkgs/stdenv/default.nix                       |  2 +
 pkgs/stdenv/generic/default.nix               |  3 +
 pkgs/stdenv/native/default.nix                | 23 ++++--
 pkgs/top-level/release-lib.nix                |  2 +
 9 files changed, 158 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh
 create mode 100644 pkgs/stdenv/cygwin/rebase-i686.sh
 create mode 100644 pkgs/stdenv/cygwin/rebase-x86_64.sh
 create mode 100644 pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh

diff --git a/maintainers/scripts/hydra_eval_check b/maintainers/scripts/hydra_eval_check
index e16a40455a3..c8e03424f32 100755
--- a/maintainers/scripts/hydra_eval_check
+++ b/maintainers/scripts/hydra_eval_check
@@ -6,6 +6,7 @@ hydra_eval_jobs \
   --argstr system i686-linux \
   --argstr system x86_64-darwin \
   --argstr system i686-cygwin \
+  --argstr system x86_64-cygwin \
   --argstr system i686-freebsd \
   --arg officialRelease false \
   --arg nixpkgs "{ outPath = builtins.storePath ./. ; rev = 1234; }" \
diff --git a/pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh b/pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh
new file mode 100644
index 00000000000..7cb6a58f180
--- /dev/null
+++ b/pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh
@@ -0,0 +1,16 @@
+# On cygwin, automatic runtime dependency detection does not work
+# because the binaries do not contain absolute references to store
+# locations (yet)
+postFixupHooks+=(_cygwinAllBuildInputsAsRuntimeDep)
+
+_cygwinAllBuildInputsAsRuntimeDep() {
+    if [ -n "$buildInputs" ]; then
+        mkdir -p "$out/nix-support"
+        echo "$buildInputs" >> "$out/nix-support/cygwin-buildinputs-as-runtime-deps"
+    fi
+
+    if [ -n "$nativeBuildInputs" ]; then
+        mkdir -p "$out/nix-support"
+        echo "$nativeBuildInputs" >> "$out/nix-support/cygwin-buildinputs-as-runtime-deps"
+    fi
+}
diff --git a/pkgs/stdenv/cygwin/rebase-i686.sh b/pkgs/stdenv/cygwin/rebase-i686.sh
new file mode 100644
index 00000000000..e5695c75a96
--- /dev/null
+++ b/pkgs/stdenv/cygwin/rebase-i686.sh
@@ -0,0 +1,21 @@
+postFixupHooks+=(_cygwinFixAutoImageBase)
+
+_cygwinFixAutoImageBase() {
+    find $out -name "*.dll" | while read DLL; do
+        if [ -f /etc/rebasenix.nextbase ]; then
+            NEXTBASE="$(</etc/rebasenix.nextbase)"
+        fi
+        NEXTBASE=${NEXTBASE:-0x62000000}
+
+        REBASE=(`/bin/rebase -i $DLL`)
+        BASE=${REBASE[2]}
+        SIZE=${REBASE[4]}
+        SKIP=$(((($SIZE>>16)+1)<<16))
+
+        echo "REBASE FIX: $DLL $BASE -> $NEXTBASE"
+        /bin/rebase -b $NEXTBASE $DLL
+        NEXTBASE="0x`printf %x $(($NEXTBASE+$SKIP))`"
+
+        echo $NEXTBASE > /etc/rebasenix.nextbase
+    done
+}
diff --git a/pkgs/stdenv/cygwin/rebase-x86_64.sh b/pkgs/stdenv/cygwin/rebase-x86_64.sh
new file mode 100644
index 00000000000..f782f18dfd1
--- /dev/null
+++ b/pkgs/stdenv/cygwin/rebase-x86_64.sh
@@ -0,0 +1,21 @@
+postFixupHooks+=(_cygwinFixAutoImageBase)
+
+_cygwinFixAutoImageBase() {
+    find $out -name "*.dll" | while read DLL; do
+        if [ -f /etc/rebasenix.nextbase ]; then
+            NEXTBASE="$(</etc/rebasenix.nextbase)"
+        fi
+        NEXTBASE=${NEXTBASE:-0x200000000}
+
+        REBASE=(`/bin/rebase -i $DLL`)
+        BASE=${REBASE[2]}
+        SIZE=${REBASE[4]}
+        SKIP=$(((($SIZE>>16)+1)<<16))
+
+        echo "REBASE FIX: $DLL $BASE -> $NEXTBASE"
+        /bin/rebase -b $NEXTBASE $DLL
+        NEXTBASE="0x`printf %x $(($NEXTBASE+$SKIP))`"
+
+        echo $NEXTBASE > /etc/rebasenix.nextbase
+    done
+}
diff --git a/pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh b/pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh
new file mode 100644
index 00000000000..d0da8c1b65c
--- /dev/null
+++ b/pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh
@@ -0,0 +1,74 @@
+postFixupHooks+=(_cygwinWrapExesToFindDlls)
+
+_cygwinWrapExesToFindDlls() {
+    find $out -type l | while read LINK; do
+        TARGET="$(readlink "${LINK}")"
+
+        # fix all non .exe links that link explicitly to a .exe
+        if [[ ${TARGET} == *.exe ]] && [[ ${LINK} != *.exe ]]; then
+            mv "${LINK}" "${LINK}.exe"
+            LINK="${LINK}.exe"
+        fi
+
+        # generate complementary filenames
+        if [[ ${LINK} == *.exe ]]; then
+            _LINK="${LINK%.exe}"
+            _TARGET="${TARGET%.exe}"
+        else
+            _LINK="${LINK}.exe"
+            _TARGET="${TARGET}.exe"
+        fi
+
+        # check if sould create complementary link
+        DOLINK=1
+        if [[ ${_TARGET} == *.exe ]]; then
+            # the canonical target has to be a .exe
+            CTARGET="$(readlink -f "${LINK}")"
+            if [[ ${CTARGET} != *.exe ]]; then
+                CTARGET="${CTARGET}.exe"
+            fi
+
+            if [ ! -e "${CTARGET}" ]; then
+                unset DOLINK
+            fi
+        fi
+
+        if [ -e "${_LINK}" ]; then
+            # complementary link seems to exist
+            # but could be cygwin smoke and mirrors
+            INO=$(stat -c%i "${LINK}")
+            _INO=$(stat -c%i "${_LINK}")
+            if [ "${INO}" -ne "${_INO}" ]; then
+                unset DOLINK
+            fi
+        fi
+
+        # create complementary link
+        if [ -n "${DOLINK}" ]; then
+            ln -s "${_TARGET}" "${_LINK}.tmp"
+            mv "${_LINK}.tmp" "${_LINK}"
+        fi
+    done
+
+    find $out -type f -name "*.exe" | while read EXE; do
+        WRAPPER="${EXE%.exe}"
+        if [ -e "${WRAPPER}" ]; then
+            # check if really exists or cygwin smoke and mirrors
+            INO=$(stat -c%i "${EXE}")
+            _INO=$(stat -c%i "${WRAPPER}")
+            if [ "${INO}" -ne "${_INO}" ]; then
+                continue
+            fi
+        fi
+
+        mv "${EXE}" "${EXE}.tmp"
+
+        cat >"${WRAPPER}" <<EOF
+#!/bin/sh
+export PATH=$_PATH${_PATH:+:}\${PATH}
+exec "\$0.exe" "\$@"
+EOF
+        chmod +x "${WRAPPER}"
+        mv "${EXE}.tmp" "${EXE}"
+    done
+}
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index ba87a7aaafb..545a3d748eb 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -50,5 +50,7 @@ rec {
     if system == "powerpc-linux" then /* stdenvLinux */ stdenvNative else
     if system == "x86_64-darwin" then stdenvDarwin else
     if system == "x86_64-solaris" then stdenvNix else
+    if system == "i686-cygwin" then stdenvNative else
+    if system == "x86_64-cygwin" then stdenvNative else
     stdenvNative;
 }
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 440e9e6b4d0..cca89487462 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -210,16 +210,19 @@ let
             || system == "i686-gnu"
             || system == "i686-freebsd"
             || system == "i686-openbsd"
+            || system == "i686-cygwin"
             || system == "i386-sunos";
       isx86_64 = system == "x86_64-linux"
               || system == "x86_64-darwin"
               || system == "x86_64-freebsd"
               || system == "x86_64-openbsd"
+              || system == "x86_64-cygwin"
               || system == "x86_64-solaris";
       is64bit = system == "x86_64-linux"
              || system == "x86_64-darwin"
              || system == "x86_64-freebsd"
              || system == "x86_64-openbsd"
+             || system == "x86_64-cygwin"
              || system == "x86_64-solaris"
              || system == "mips64el-linux";
       isMips = system == "mips-linux"
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 935af7d4c36..5390907928d 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -52,16 +52,22 @@ rec {
     shopt -s expand_aliases
   '';
 
+  # prevent libtool from failing to find dynamic libraries
   prehookCygwin = ''
     ${prehookBase}
 
-    if test -z "$cygwinConfigureEnableShared"; then
-      export configureFlags="$configureFlags --disable-shared"
-    fi
-
-    PATH_DELIMITER=';'
+    shopt -s expand_aliases
+    export lt_cv_deplibs_check_method=pass_all
   '';
 
+  extraBuildInputsCygwin = [
+    ../cygwin/all-buildinputs-as-runtimedep.sh
+    ../cygwin/wrap-exes-to-find-dlls.sh
+  ] ++ (if system == "i686-cygwin" then [
+    ../cygwin/rebase-i686.sh
+  ] else if system == "x86_64-cygwin" then [
+    ../cygwin/rebase-x86_64.sh
+  ] else []);
 
   # A function that builds a "native" stdenv (one that uses tools in
   # /usr etc.).
@@ -74,8 +80,15 @@ rec {
         if system == "x86_64-freebsd" then prehookFreeBSD else
         if system == "i686-openbsd" then prehookOpenBSD else
         if system == "i686-netbsd" then prehookNetBSD else
+        if system == "i686-cygwin" then prehookCygwin else
+        if system == "x86_64-cygwin" then prehookCygwin else
         prehookBase;
 
+      extraBuildInputs =
+        if system == "i686-cygwin" then extraBuildInputsCygwin else
+        if system == "x86_64-cygwin" then extraBuildInputsCygwin else
+        [];
+
       initialPath = extraPath ++ path;
 
       fetchurlBoot = fetchurl;
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 1f324de8544..2f272ced4af 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -22,6 +22,7 @@ rec {
     else if system == "x86_64-freebsd" then pkgs_x86_64_freebsd
     else if system == "i686-freebsd" then pkgs_i686_freebsd
     else if system == "i686-cygwin" then pkgs_i686_cygwin
+    else if system == "x86_64-cygwin" then pkgs_x86_64_cygwin
     else abort "unsupported system type: ${system}";
 
   pkgs_x86_64_linux = allPackages { system = "x86_64-linux"; };
@@ -30,6 +31,7 @@ rec {
   pkgs_x86_64_freebsd = allPackages { system = "x86_64-freebsd"; };
   pkgs_i686_freebsd = allPackages { system = "i686-freebsd"; };
   pkgs_i686_cygwin = allPackages { system = "i686-cygwin"; };
+  pkgs_x86_64_cygwin = allPackages { system = "x86_64-cygwin"; };
 
 
   /* The working or failing mails for cross builds will be sent only to

From ebf6d98fc2518b6687f367d38ce76d05d9b2171a Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 23 Oct 2014 16:14:48 +0200
Subject: [PATCH 0328/2322] cygwin: build perl as usual, no sysPerl

---
 .../interpreters/perl/sys-perl/default.nix    | 19 -------------------
 .../interpreters/perl/sys-perl/setup-hook.sh  |  5 -----
 pkgs/top-level/all-packages.nix               |  4 +---
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 pkgs/development/interpreters/perl/sys-perl/default.nix
 delete mode 100644 pkgs/development/interpreters/perl/sys-perl/setup-hook.sh

diff --git a/pkgs/development/interpreters/perl/sys-perl/default.nix b/pkgs/development/interpreters/perl/sys-perl/default.nix
deleted file mode 100644
index e30ce92c61e..00000000000
--- a/pkgs/development/interpreters/perl/sys-perl/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv }:
-
-stdenv.mkDerivation rec {
-  name = "perl";
-
-  unpackPhase = "true";
-  
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      ln -s /usr/bin/perl $out/bin
-    '';
-
-  setupHook = ./setup-hook.sh;
-
-  libPrefix = "lib/perl5/site_perl/5.10/i686-cygwin";
-
-  passthru.libPrefix = libPrefix;
-}
diff --git a/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh b/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh
deleted file mode 100644
index 7b03c15ec5a..00000000000
--- a/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-addPerlLibPath () {
-    addToSearchPath PERL5LIB $1/@libPrefix@
-}
-
-envHooks+=(addPerlLibPath)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8713dab4786..60cffbbf4d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4807,7 +4807,7 @@ let
     fetchurl = fetchurlBoot;
   };
 
-  perl = if system != "i686-cygwin" then perl520 else sysPerl;
+  perl = perl520;
 
   php = php56;
 
@@ -4965,8 +4965,6 @@ let
 
   supercollider_scel = supercollider.override { useSCEL = true; };
 
-  sysPerl = callPackage ../development/interpreters/perl/sys-perl { };
-
   tcl = tcl-8_6;
   tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { };
   tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };

From b658196c6c00f02878e8e5c4c55c8cc871314e83 Mon Sep 17 00:00:00 2001
From: Marko Durkovic <marko@miding.de>
Date: Thu, 23 Oct 2014 12:03:01 +0200
Subject: [PATCH 0329/2322] cygwin: libiconv and gettext for x86_64

---
 .../development/libraries/gettext/default.nix |  10 +-
 .../libraries/libiconv/default.nix            |   7 +-
 .../libiconv/libiconv-1.14-reloc.patch        | 269 ++++++++++++++++++
 .../libiconv/libiconv-1.14-wchar.patch        | 102 +++++++
 4 files changed, 384 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch
 create mode 100644 pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch

diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 8f6277ca2e9..15f11f8a133 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -12,11 +12,13 @@ stdenv.mkDerivation (rec {
 
   configureFlags = [ "--disable-csharp" "--with-xz" ]
      ++ (stdenv.lib.optionals stdenv.isCygwin
-          [ # We have a static libiconv, so we can only build the static lib.
-            "--disable-shared" "--enable-static"
-
+          [ "--disable-java"
+            "--disable-native-java"
             # Share the cache among the various `configure' runs.
             "--config-cache"
+            "--with-included-gettext"
+            "--with-included-glib"
+            "--with-included-libcroco"
           ]);
 
   # On cross building, gettext supposes that the wchar.h from libc
@@ -28,6 +30,8 @@ stdenv.mkDerivation (rec {
       echo gl_cv_func_wcwidth_works=yes > cachefile
       configureFlags="$configureFlags --cache-file=`pwd`/cachefile"
     fi
+  '' + stdenv.lib.optionalString stdenv.isCygwin ''
+    sed -i -e "s/\(am_libgettextlib_la_OBJECTS = \)error.lo/\\1/" gettext-tools/gnulib-lib/Makefile.in
   '';
 
   buildInputs = [ xz ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index 9e65e63ffdb..70b0574a7b4 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -10,11 +10,16 @@ stdenv.mkDerivation rec {
     sha256 = "04q6lgl3kglmmhw59igq1n7v3rp1rpkypl366cy1k1yn2znlvckj";
   };
 
+  patches = if stdenv.isCygwin then [
+    ./libiconv-1.14-reloc.patch
+    ./libiconv-1.14-wchar.patch
+  ] else null;
+
   # On Cygwin, Libtool produces a `.dll.a', which is not a "real" DLL
   # (Windows' linker would need to be used somehow to produce an actual
   # DLL.)  Thus, build the static library too, and this is what Gettext
   # will actually use.
-  configureFlags = stdenv.lib.optional stdenv.isCygwin [ "--enable-static" ];
+  configureFlags = if stdenv.isCygwin then [ "--enable-static" ] else null;
 
   crossAttrs = {
     # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW).
diff --git a/pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch b/pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch
new file mode 100644
index 00000000000..005e3379d16
--- /dev/null
+++ b/pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch
@@ -0,0 +1,269 @@
+--- libiconv-1.14/lib/relocatable.c	2011-08-07 13:48:03.000000000 -0400
++++ libiconv-1.14/lib/relocatable.c	2011-10-15 03:14:13.195133600 -0400
+@@ -2,20 +2,18 @@
+    Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc.
+    Written by Bruno Haible <bruno@clisp.org>, 2003.
+ 
+-   This program is free software; you can redistribute it and/or modify it
+-   under the terms of the GNU Library General Public License as published
+-   by the Free Software Foundation; either version 2, or (at your option)
+-   any later version.
++   This program is free software: you can redistribute it and/or modify
++   it under the terms of the GNU Lesser General Public License as published by
++   the Free Software Foundation; either version 2.1 of the License, or
++   (at your option) any later version.
+ 
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Library General Public License for more details.
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU Lesser General Public License for more details.
+ 
+-   You should have received a copy of the GNU Library General Public
+-   License along with this program; if not, write to the Free Software
+-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+-   USA.  */
++   You should have received a copy of the GNU Lesser General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
+ 
+ /* Tell glibc's <stdio.h> to provide a prototype for getline().
+@@ -87,6 +85,19 @@
+ # define FILE_SYSTEM_PREFIX_LEN(P) 0
+ #endif
+ 
++/* Whether to enable the more costly support for relocatable libraries.
++   It allows libraries to be have been installed with a different original
++   prefix than the program.  But it is quite costly, especially on Cygwin
++   platforms, see below.  Therefore we enable it by default only on native
++   Win32 platforms.  */
++#ifndef ENABLE_COSTLY_RELOCATABLE
++# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
++#  define ENABLE_COSTLY_RELOCATABLE 1
++# else
++#  define ENABLE_COSTLY_RELOCATABLE 0
++# endif
++#endif
++
+ /* Original installation prefix.  */
+ static char *orig_prefix;
+ static size_t orig_prefix_len;
+@@ -156,7 +167,7 @@
+ #endif
+ }
+ 
+-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
++#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE)
+ 
+ /* Convenience function:
+    Computes the current installation prefix, based on the original
+@@ -286,7 +297,7 @@
+ 
+ #endif /* !IN_LIBRARY || PIC */
+ 
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+ 
+ /* Full pathname of shared library, or NULL.  */
+ static char *shared_library_fullname;
+@@ -332,7 +343,9 @@
+ #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__
+   /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline()
+      function.
+-     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.  */
++     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.
++     But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on
++     Cygwin 1.7.  */
+   FILE *fp;
+ 
+   /* Open the current process' maps file.  It describes one VMA per line.  */
+@@ -405,7 +418,7 @@
+ const char *
+ relocate (const char *pathname)
+ {
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+   static int initialized;
+ 
+   /* Initialization code for a shared library.  */
+--- libiconv-1.14/libcharset/lib/relocatable.c	2011-08-07 13:48:03.000000000 -0400
++++ libiconv-1.14/libcharset/lib/relocatable.c	2011-10-15 03:14:27.878133600 -0400
+@@ -2,20 +2,18 @@
+    Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc.
+    Written by Bruno Haible <bruno@clisp.org>, 2003.
+ 
+-   This program is free software; you can redistribute it and/or modify it
+-   under the terms of the GNU Library General Public License as published
+-   by the Free Software Foundation; either version 2, or (at your option)
+-   any later version.
++   This program is free software: you can redistribute it and/or modify
++   it under the terms of the GNU Lesser General Public License as published by
++   the Free Software Foundation; either version 2.1 of the License, or
++   (at your option) any later version.
+ 
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Library General Public License for more details.
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU Lesser General Public License for more details.
+ 
+-   You should have received a copy of the GNU Library General Public
+-   License along with this program; if not, write to the Free Software
+-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+-   USA.  */
++   You should have received a copy of the GNU Lesser General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
+ 
+ /* Tell glibc's <stdio.h> to provide a prototype for getline().
+@@ -87,6 +85,19 @@
+ # define FILE_SYSTEM_PREFIX_LEN(P) 0
+ #endif
+ 
++/* Whether to enable the more costly support for relocatable libraries.
++   It allows libraries to be have been installed with a different original
++   prefix than the program.  But it is quite costly, especially on Cygwin
++   platforms, see below.  Therefore we enable it by default only on native
++   Win32 platforms.  */
++#ifndef ENABLE_COSTLY_RELOCATABLE
++# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
++#  define ENABLE_COSTLY_RELOCATABLE 1
++# else
++#  define ENABLE_COSTLY_RELOCATABLE 0
++# endif
++#endif
++
+ /* Original installation prefix.  */
+ static char *orig_prefix;
+ static size_t orig_prefix_len;
+@@ -156,7 +167,7 @@
+ #endif
+ }
+ 
+-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
++#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE)
+ 
+ /* Convenience function:
+    Computes the current installation prefix, based on the original
+@@ -286,7 +297,7 @@
+ 
+ #endif /* !IN_LIBRARY || PIC */
+ 
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+ 
+ /* Full pathname of shared library, or NULL.  */
+ static char *shared_library_fullname;
+@@ -332,7 +343,9 @@
+ #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__
+   /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline()
+      function.
+-     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.  */
++     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.
++     But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on
++     Cygwin 1.7.  */
+   FILE *fp;
+ 
+   /* Open the current process' maps file.  It describes one VMA per line.  */
+@@ -405,7 +418,7 @@
+ const char *
+ relocate (const char *pathname)
+ {
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+   static int initialized;
+ 
+   /* Initialization code for a shared library.  */
+--- libiconv-1.14/srclib/relocatable.c	2011-08-07 09:42:06.000000000 -0400
++++ libiconv-1.14/srclib/relocatable.c	2011-10-15 03:14:37.739133600 -0400
+@@ -3,16 +3,16 @@
+    Written by Bruno Haible <bruno@clisp.org>, 2003.
+ 
+    This program is free software: you can redistribute it and/or modify
+-   it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation; either version 3 of the License, or
++   it under the terms of the GNU Lesser General Public License as published by
++   the Free Software Foundation; either version 2.1 of the License, or
+    (at your option) any later version.
+ 
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
++   GNU Lesser General Public License for more details.
+ 
+-   You should have received a copy of the GNU General Public License
++   You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
+ 
+@@ -85,6 +85,19 @@
+ # define FILE_SYSTEM_PREFIX_LEN(P) 0
+ #endif
+ 
++/* Whether to enable the more costly support for relocatable libraries.
++   It allows libraries to be have been installed with a different original
++   prefix than the program.  But it is quite costly, especially on Cygwin
++   platforms, see below.  Therefore we enable it by default only on native
++   Win32 platforms.  */
++#ifndef ENABLE_COSTLY_RELOCATABLE
++# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
++#  define ENABLE_COSTLY_RELOCATABLE 1
++# else
++#  define ENABLE_COSTLY_RELOCATABLE 0
++# endif
++#endif
++
+ /* Original installation prefix.  */
+ static char *orig_prefix;
+ static size_t orig_prefix_len;
+@@ -154,7 +167,7 @@
+ #endif
+ }
+ 
+-#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
++#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE)
+ 
+ /* Convenience function:
+    Computes the current installation prefix, based on the original
+@@ -284,7 +297,7 @@
+ 
+ #endif /* !IN_LIBRARY || PIC */
+ 
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+ 
+ /* Full pathname of shared library, or NULL.  */
+ static char *shared_library_fullname;
+@@ -330,7 +343,9 @@
+ #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__
+   /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline()
+      function.
+-     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.  */
++     Cygwin >= 1.5 has /proc/self/maps and the getline() function too.
++     But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on
++     Cygwin 1.7.  */
+   FILE *fp;
+ 
+   /* Open the current process' maps file.  It describes one VMA per line.  */
+@@ -403,7 +418,7 @@
+ const char *
+ relocate (const char *pathname)
+ {
+-#if defined PIC && defined INSTALLDIR
++#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE
+   static int initialized;
+ 
+   /* Initialization code for a shared library.  */
+--- libiconv-1.14/srcm4/gnulib-comp.m4	2011-08-07 09:42:12.000000000 -0400
++++ libiconv-1.14/srcm4/gnulib-comp.m4	2011-08-30 02:40:45.597317000 -0400
+@@ -164,6 +164,7 @@ gl_UNISTD_MODULE_INDICATOR([readlink])
+ gl_RELOCATABLE([$gl_source_base])
+ if test $RELOCATABLE = yes; then
+   AC_LIBOBJ([progreloc])
++  AC_LIBOBJ([relocatable])
+ fi
+ gl_FUNC_READLINK_SEPARATE
+ gl_CANONICALIZE_LGPL_SEPARATE
diff --git a/pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch b/pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch
new file mode 100644
index 00000000000..0e4ddd931bb
--- /dev/null
+++ b/pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch
@@ -0,0 +1,102 @@
+--- libiconv-1.14/libcharset/lib/localcharset.c	2011-02-28 17:43:35.000000000 -0500
++++ libiconv-1.14/libcharset/lib/localcharset.c	2011-08-28 00:16:57.238000000 -0400
+@@ -54,10 +54,6 @@
+ #   include <locale.h>
+ #  endif
+ # endif
+-# ifdef __CYGWIN__
+-#  define WIN32_LEAN_AND_MEAN
+-#  include <windows.h>
+-# endif
+ #elif defined WIN32_NATIVE
+ # define WIN32_LEAN_AND_MEAN
+ # include <windows.h>
+@@ -124,7 +120,7 @@
+   cp = charset_aliases;
+   if (cp == NULL)
+     {
+-#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
++#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE)
+       const char *dir;
+       const char *base = "charset.alias";
+       char *file_name;
+@@ -309,7 +305,7 @@
+            "DECKOREAN" "\0" "EUC-KR" "\0";
+ # endif
+ 
+-# if defined WIN32_NATIVE || defined __CYGWIN__
++# if defined WIN32_NATIVE
+       /* To avoid the troubles of installing a separate file in the same
+          directory as the DLL and of retrieving the DLL's directory at
+          runtime, simply inline the aliases here.  */
+@@ -365,64 +361,12 @@
+ 
+ # if HAVE_LANGINFO_CODESET
+ 
+-  /* Most systems support nl_langinfo (CODESET) nowadays.  */
+-  codeset = nl_langinfo (CODESET);
+-
+-#  ifdef __CYGWIN__
+-  /* Cygwin < 1.7 does not have locales.  nl_langinfo (CODESET) always
+-     returns "US-ASCII".  Return the suffix of the locale name from the
+-     environment variables (if present) or the codepage as a number.  */
+-  if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0)
+-    {
+-      const char *locale;
+-      static char buf[2 + 10 + 1];
+-
+-      locale = getenv ("LC_ALL");
+-      if (locale == NULL || locale[0] == '\0')
+-        {
+-          locale = getenv ("LC_CTYPE");
+-          if (locale == NULL || locale[0] == '\0')
+-            locale = getenv ("LANG");
+-        }
+-      if (locale != NULL && locale[0] != '\0')
+-        {
+-          /* If the locale name contains an encoding after the dot, return
+-             it.  */
+-          const char *dot = strchr (locale, '.');
+-
+-          if (dot != NULL)
+-            {
+-              const char *modifier;
+-
+-              dot++;
+-              /* Look for the possible @... trailer and remove it, if any.  */
+-              modifier = strchr (dot, '@');
+-              if (modifier == NULL)
+-                return dot;
+-              if (modifier - dot < sizeof (buf))
+-                {
+-                  memcpy (buf, dot, modifier - dot);
+-                  buf [modifier - dot] = '\0';
+-                  return buf;
+-                }
+-            }
+-        }
+-
+-      /* Woe32 has a function returning the locale's codepage as a number:
+-         GetACP().  This encoding is used by Cygwin, unless the user has set
+-         the environment variable CYGWIN=codepage:oem (which very few people
+-         do).
+-         Output directed to console windows needs to be converted (to
+-         GetOEMCP() if the console is using a raster font, or to
+-         GetConsoleOutputCP() if it is using a TrueType font).  Cygwin does
+-         this conversion transparently (see winsup/cygwin/fhandler_console.cc),
+-         converting to GetConsoleOutputCP().  This leads to correct results,
+-         except when SetConsoleOutputCP has been called and a raster font is
+-         in use.  */
+-      sprintf (buf, "CP%u", GetACP ());
+-      codeset = buf;
+-    }
+-#  endif
++  /* Most systems support nl_langinfo (CODESET) nowadays.
++     POSIX allows that the returned pointer may point to a static area that
++     may be overwritten by subsequent calls to setlocale or nl_langinfo. */
++  static char codeset_buf[64];
++  codeset_buf[0] = '\0';
++  codeset = strncat (codeset_buf, nl_langinfo (CODESET), sizeof (codeset_buf));
+ 
+ # else
+ 

From 67ac12795a453b20288b8e28e83cdf5dc8cbf8da Mon Sep 17 00:00:00 2001
From: Marko Durkovic <marko@miding.de>
Date: Thu, 23 Oct 2014 14:38:54 +0200
Subject: [PATCH 0330/2322] cygwin: add cygwin compatible bash version.

---
 pkgs/shells/bash/bash-4.1-patches.nix    |  21 +
 pkgs/shells/bash/bash-4.1.17-9.src.patch | 987 +++++++++++++++++++++++
 pkgs/shells/bash/default.nix             |  21 +-
 3 files changed, 1025 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/shells/bash/bash-4.1-patches.nix
 create mode 100644 pkgs/shells/bash/bash-4.1.17-9.src.patch

diff --git a/pkgs/shells/bash/bash-4.1-patches.nix b/pkgs/shells/bash/bash-4.1-patches.nix
new file mode 100644
index 00000000000..2affe1efa60
--- /dev/null
+++ b/pkgs/shells/bash/bash-4.1-patches.nix
@@ -0,0 +1,21 @@
+# Automatically generated by `update-patch-set.sh'; do not edit.
+
+patch: [
+(patch "001" "0y02cbfnc5s3dnwr4fw2nz43f3b826f5084mk7qd0lzq12hpzr56")
+(patch "002" "1y3qzw6lx16vnb8hrw3zx01z25k773cbmgysvs3vvcw6w6fj4bij")
+(patch "003" "0v95ng8qa78dbh26rr6jpzkn3s6n78xymymkvvvkz35rpgfksxli")
+(patch "004" "17pzykkywh5jmdy1ikj9xyxm7qm29ii2fmrfpyjr1wy16jx67h3q")
+(patch "005" "06lwfgxx9kacz018nr4dmxqqrzipcg8pjn61gr6yfjv6s7c3k5ji")
+(patch "006" "0j9c1zhhwvc2p4cdxi77nxmcxa00cimaxwbhasyqgc606g7sp1jr")
+(patch "007" "19q5qba77hfda8g4xylh77awiakhr1d1asgbqcrbakxs50n2l0bl")
+(patch "008" "058j911q9wcbr93w59jnpgmdpx4qsq3gvd6m9nwgdk9j2hjjqb2f")
+(patch "009" "1lany70f0rx1i2xikzkahr1zskh8620j05ic0gc5x2p89ab0ch5x")
+(patch "010" "05fqv7w12g9izy332wypynilgxzdh87vy5q2pqq3bjdncyl5hxvr")
+(patch "011" "088n54yh5zp8aa917y1ng3802amchgal1acn0v0mdjqj0yi82aqv")
+(patch "012" "0vbvc1vxljyd882wk6rcd64xrf1lda6wirys41mqjbl0lalj8bi7")
+(patch "013" "1y7x62i0q3wkr9jdjzvm2rl9dp11vzp8fwkz2zb2x21l0pi25mya")
+(patch "014" "0gpizgbx1w712awpd11x5nvahpranl0aiq16nhp3xmm8vvz1wpar")
+(patch "015" "17nf6kw1vhmzn9nzb1vyn8r4wp2nl109f9yawzavjkf06670ln7c")
+(patch "016" "129hknigxhxrh1rbjhc4fm6argpjb6lp9fl616narbnzsv3qhc3l")
+(patch "017" "0vy02x6fmpd6i66n97r4fwrq9pncbgzya07iyca2bb6yyzmymgg5")
+]
diff --git a/pkgs/shells/bash/bash-4.1.17-9.src.patch b/pkgs/shells/bash/bash-4.1.17-9.src.patch
new file mode 100644
index 00000000000..f236946483c
--- /dev/null
+++ b/pkgs/shells/bash/bash-4.1.17-9.src.patch
@@ -0,0 +1,987 @@
+--- Makefile.in	2009-12-30 10:05:40.000000000 -0800
++++ Makefile.in	2014-10-08 13:50:27.419837900 -0700
+@@ -565,7 +565,7 @@ lint:
+ 	${MAKE} ${MFLAGS} CFLAGS='${GCC_LINT_FLAGS}' .made
+ 
+ version.h:  $(SOURCES) config.h Makefile 
+-	$(SHELL) $(SUPPORT_SRC)mkversion.sh -b -S ${topdir} -s $(RELSTATUS) -d $(Version) -o newversion.h \
++	$(SHELL) $(SUPPORT_SRC)mkversion.sh -S ${topdir} -s $(RELSTATUS) -d $(Version) -o newversion.h \
+ 		&& mv newversion.h version.h
+ 
+ bashversion$(EXEEXT):	patchlevel.h conftypes.h version.h buildversion.o $(SUPPORT_SRC)bashversion.c
+--- bashline.c	2014-10-08 13:45:09.240173500 -0700
++++ bashline.c	2014-10-08 13:50:27.419837900 -0700
+@@ -68,6 +68,12 @@
+ #  include "pcomplete.h"
+ #endif
+ 
++#ifdef __x86_64__
++#define IMP(x) __imp_##x
++#else
++#define IMP(x) _imp__##x
++#endif
++
+ /* These should agree with the defines for emacs_mode and vi_mode in
+    rldefs.h, even though that's not a public readline header file. */
+ #ifndef EMACS_EDITING_MODE
+@@ -239,6 +245,11 @@ int no_empty_command_completion;
+    are the only possible matches, even if FIGNORE says to. */
+ int force_fignore = 1;
+ 
++#if __CYGWIN__
++/* If set, shorten "foo.exe" to "foo" when they are the same file.  */
++int completion_strip_exe;
++#endif /* __CYGWIN__ */
++
+ /* Perform spelling correction on directory names during word completion */
+ int dircomplete_spelling = 0;
+ 
+@@ -446,11 +457,12 @@ initialize_readline ()
+   kseq[0] = CTRL('J');
+   kseq[1] = '\0';
+   func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL);
+-  if (func == rl_vi_editing_mode)
++  extern rl_command_func_t *IMP(rl_vi_editing_mode);
++  if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode))
+     rl_unbind_key_in_map (CTRL('J'), emacs_meta_keymap);
+   kseq[0] = CTRL('M');
+   func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL);
+-  if (func == rl_vi_editing_mode)
++  if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode))
+     rl_unbind_key_in_map (CTRL('M'), emacs_meta_keymap);
+ #if defined (VI_MODE)
+   rl_unbind_key_in_map (CTRL('E'), vi_movement_keymap);
+@@ -469,7 +481,8 @@ initialize_readline ()
+   kseq[0] = '~';
+   kseq[1] = '\0';
+   func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL);
+-  if (func == 0 || func == rl_tilde_expand)
++  extern rl_command_func_t *IMP(rl_tilde_expand);
++  if (func == 0 || func == rl_tilde_expand || func == IMP(rl_tilde_expand))
+     rl_bind_keyseq_in_map (kseq, bash_complete_username, emacs_meta_keymap);
+ 
+   rl_bind_key_if_unbound_in_map ('~', bash_possible_username_completions, emacs_ctlx_keymap);
+@@ -492,7 +505,8 @@ initialize_readline ()
+   kseq[0] = TAB;
+   kseq[1] = '\0';
+   func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL);
+-  if (func == 0 || func == rl_tab_insert)
++  extern rl_command_func_t *IMP(rl_tab_insert);
++  if (func == 0 || func == rl_tab_insert || func == IMP(rl_tab_insert))
+     rl_bind_key_in_map (TAB, dynamic_complete_history, emacs_meta_keymap);
+ 
+   /* Tell the completer that we want a crack first. */
+@@ -1826,6 +1840,14 @@ globword:
+       /* If we have found a match, and it is an executable file or a
+ 	 directory name, return it. */
+       if (match && executable_or_directory (val))
++#elif __CYGWIN__
++      /* executable_or_directory will do the right thing on //server,
++	 but calling stat("//server") is an order of magnitude slower
++	 than noting that readdir("//") only returns directories.  */
++      if (match && (searching_path ? executable_file (val)
++		    : ((val[0] == '/' && val[1] == '/'
++			&& ! strchr (&val[2], '/'))
++		       || executable_or_directory (val))))
+ #else
+       /* If we have found a match, and it is an executable file, return it.
+ 	 We don't return directory names when searching $PATH, since the
+@@ -1835,6 +1857,21 @@ globword:
+       if (match && (searching_path ? executable_file (val) : executable_or_directory (val)))
+ #endif
+ 	{
++#if __CYGWIN__
++          if (completion_strip_exe)
++            {
++              int val_len = strlen (val);
++              char *candidate;
++              if (val_len > 4 && !strcasecmp (&val[val_len - 4], ".exe")
++                  && (candidate = strdup (val)))
++                {
++                  candidate[val_len - 4] = '\0';
++                  if (same_file (val, candidate, NULL, NULL))
++                    temp[strlen (temp) - 4] = '\0';
++                  free (candidate);
++                }
++            }
++#endif
+ 	  free (val);
+ 	  val = "";		/* So it won't be NULL. */
+ 	  return (temp);
+@@ -2566,6 +2603,17 @@ test_for_directory (name)
+   int r;
+ 
+   fn = bash_tilde_expand (name, 0);
++#if __CYGWIN__
++  /* stat("//server") can only be successful as a directory, but takes
++     a several-second timeout to fail.  It is much faster to assume
++     that //server is a valid name than it is to wait for the stat,
++     even though it gives false positives on bad names.  */
++  if (fn[0] == '/' && fn[1] == '/' && ! strchr (&fn[2], '/'))
++    {
++      free (fn);
++      return 1;
++    }
++#endif /* __CYGWIN__ */
+   r = file_isdir (fn);
+   free (fn);
+ 
+--- builtins/evalfile.c	2009-10-19 14:38:21.000000000 -0700
++++ builtins/evalfile.c	2014-10-08 13:50:27.419837900 -0700
+@@ -148,10 +148,6 @@ file_error_and_exit:
+       return ((flags & FEVAL_BUILTIN) ? EXECUTION_FAILURE : -1);
+     }      
+ 
+-#if defined (__CYGWIN__) && defined (O_TEXT)
+-  setmode (fd, O_TEXT);
+-#endif
+-
+   if (S_ISREG (finfo.st_mode) && file_size <= SSIZE_MAX)
+     {
+       string = (char *)xmalloc (1 + file_size);
+--- builtins/set.def	2009-01-04 11:32:23.000000000 -0800
++++ builtins/set.def	2014-10-08 13:50:27.419837900 -0700
+@@ -56,6 +56,13 @@ extern int dont_save_function_defs;
+ #if defined (READLINE)
+ extern int no_line_editing;
+ #endif /* READLINE */
++#if __CYGWIN__
++extern int igncr;
++static int set_minus_o_option_maybe (int, const char *, int);
++# define INTERACTIVE_ONLY ,1
++#else /* ! __CYGWIN__ */
++# define INTERACTIVE_ONLY
++#endif
+ 
+ $BUILTIN set
+ $FUNCTION set_builtin
+@@ -92,6 +99,9 @@ Options:
+ #if defined (HISTORY)
+           history      enable command history
+ #endif
++#if __CYGWIN__
++          igncr        on cygwin, ignore \r in line endings
++#endif
+           ignoreeof    the shell will not exit upon reading EOF
+           interactive-comments
+                        allow comments to appear in interactive commands
+@@ -181,28 +191,40 @@ const struct {
+   int *variable;
+   setopt_set_func_t *set_func;
+   setopt_get_func_t *get_func;
++#if __CYGWIN__
++  /* Cygwin users have taken to exporting SHELLOPTS for the
++     cygwin-specific igncr.  As a result, we need to make sure
++     SHELLOPTS parsing does not turn on interactive options when
++     exported from an interactive shell, but parsed in a
++     non-interactive setting, since some interactive options violate
++     POSIX /bin/sh rules.  */
++  int interactive_only;
++#endif /* __CYGWIN__ */
+ } o_options[] = {
+   { "allexport",  'a', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+ #if defined (BRACE_EXPANSION)
+   { "braceexpand",'B', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+ #endif
+ #if defined (READLINE)
+-  { "emacs",     '\0', (int *)NULL, set_edit_mode, get_edit_mode },
++  { "emacs",     '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY},
+ #endif
+   { "errexit",	  'e', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+   { "errtrace",	  'E', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+   { "functrace",  'T', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+   { "hashall",    'h', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+ #if defined (BANG_HISTORY)
+-  { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
++  { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  INTERACTIVE_ONLY},
+ #endif /* BANG_HISTORY */
+ #if defined (HISTORY)
+-  { "history",   '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL },
++  { "history",   '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL INTERACTIVE_ONLY},
++#endif
++#if __CYGWIN__
++  { "igncr", '\0', &igncr, NULL, (setopt_get_func_t *)NULL },
+ #endif
+   { "ignoreeof", '\0', &ignoreeof, set_ignoreeof, (setopt_get_func_t *)NULL },
+   { "interactive-comments", '\0', &interactive_comments, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+   { "keyword",    'k', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+-  { "monitor",	  'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
++  { "monitor",	  'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  INTERACTIVE_ONLY},
+   { "noclobber",  'C', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+   { "noexec",	  'n', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+   { "noglob",	  'f', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+@@ -220,7 +242,7 @@ const struct {
+   { "privileged", 'p', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+   { "verbose",	  'v', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+ #if defined (READLINE)
+-  { "vi",        '\0', (int *)NULL, set_edit_mode, get_edit_mode },
++  { "vi",        '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY},
+ #endif
+   { "xtrace",	  'x', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+   {(char *)NULL, 0 , (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+@@ -407,6 +429,15 @@ int
+ set_minus_o_option (on_or_off, option_name)
+      int on_or_off;
+      char *option_name;
++#if __CYGWIN__
++{
++  /* See cygwin comments above.  */
++  return set_minus_o_option_maybe (on_or_off, option_name, 0);
++}
++static int
++set_minus_o_option_maybe (int on_or_off, const char *option_name,
++			  int avoid_interactive)
++#endif /* __CYGWIN__ */
+ {
+   register int i;
+ 
+@@ -414,6 +445,10 @@ set_minus_o_option (on_or_off, option_na
+     {
+       if (STREQ (option_name, o_options[i].name))
+ 	{
++#if __CYGWIN__
++	  if (o_options[i].interactive_only && avoid_interactive)
++	    return EXECUTION_SUCCESS;
++#endif /* __CYGWIN__ */
+ 	  if (o_options[i].letter == 0)
+ 	    {
+ 	      SET_BINARY_O_OPTION_VALUE (i, on_or_off, option_name);
+@@ -539,7 +574,11 @@ parse_shellopts (value)
+   vptr = 0;
+   while (vname = extract_colon_unit (value, &vptr))
+     {
++#if __CYGWIN__
++    set_minus_o_option_maybe (FLAG_ON, vname, !interactive_shell);
++#else /* !__CYGWIN__ */
+       set_minus_o_option (FLAG_ON, vname);
++#endif
+       free (vname);
+     }
+ }
+--- builtins/shopt.def	2009-12-22 13:25:32.000000000 -0800
++++ builtins/shopt.def	2014-10-08 13:50:27.435414600 -0700
+@@ -85,6 +85,10 @@ extern int check_jobs_at_exit;
+ extern int autocd;
+ extern int glob_star;
+ 
++#if defined(__CYGWIN__) && defined(READLINE)
++extern int completion_strip_exe;
++#endif
++
+ #if defined (EXTENDED_GLOB)
+ extern int extended_glob;
+ #endif
+@@ -146,6 +150,9 @@ static struct {
+   { "compat31", &shopt_compat31, set_compatibility_level },
+   { "compat32", &shopt_compat32, set_compatibility_level },
+   { "compat40", &shopt_compat40, set_compatibility_level },
++#if defined(__CYGWIN__) && defined(READLINE)
++ { "completion_strip_exe", &completion_strip_exe, NULL },
++#endif
+ #if defined (READLINE)
+   { "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL },
+ #endif
+--- config-top.h	2009-12-22 12:29:39.000000000 -0800
++++ config-top.h	2014-10-08 13:50:27.435414600 -0700
+@@ -75,10 +75,10 @@
+ #define KSH_COMPATIBLE_SELECT
+ 
+ /* System-wide .bashrc file for interactive shells. */
+-/* #define SYS_BASHRC "/etc/bash.bashrc" */
++//set by nix #define SYS_BASHRC "/etc/bash.bashrc"
+ 
+ /* System-wide .bash_logout for login shells. */
+-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
++//set by nix #define SYS_BASH_LOGOUT "/etc/bash.bash_logout"
+ 
+ /* Define this to make non-interactive shells begun with argv[0][0] == '-'
+    run the startup files when not in posix mode. */
+@@ -88,7 +88,7 @@
+    sshd and source the .bashrc if so (like the rshd behavior).  This checks
+    for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment,
+    which can be fooled under certain not-uncommon circumstances. */
+-/* #define SSH_SOURCE_BASHRC */
++//set by nix #define SSH_SOURCE_BASHRC
+ 
+ /* Define if you want the case-capitalizing operators (~[~]) and the
+    `capcase' variable attribute (declare -c). */
+--- doc/Makefile.in	2009-03-10 08:44:30.000000000 -0700
++++ doc/Makefile.in	2014-10-08 13:50:27.435414600 -0700
+@@ -170,7 +170,7 @@ bashref.html: $(BASHREF_FILES) $(HSUSER)
+ 	$(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/bashref.texi
+ 
+ bash.info: bashref.info
+-	${SHELL} ${INFOPOST} < $(srcdir)/bashref.info > $@ ; \
++	${SHELL} ${INFOPOST} < bashref.info > $@ ; \
+ 
+ bash.txt: bash.1
+ bash.ps: bash.1
+@@ -226,9 +226,9 @@ install: info installdirs bash.info
+ 	-$(INSTALL_DATA) $(srcdir)/bash.1 $(DESTDIR)$(man1dir)/bash${man1ext}
+ 	-$(INSTALL_DATA) $(srcdir)/bashbug.1 $(DESTDIR)$(man1dir)/bashbug${man1ext}
+ # uncomment the next lines to install the builtins man page
+-#	sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1
+-#	-$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext}
+-#	-$(RM) $${TMPDIR:-/var/tmp}/builtins.1
++	sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1
++	-$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext}
++	-$(RM) $${TMPDIR:-/var/tmp}/builtins.1
+ 	-if test -f bash.info; then d=.; else d=$(srcdir); fi; \
+ 	  $(INSTALL_DATA) $$d/bash.info $(DESTDIR)$(infodir)/bash.info
+ # run install-info if it is present to update the info directory
+--- doc/bash.1	2009-12-30 10:01:31.000000000 -0800
++++ doc/bash.1	2014-10-08 13:50:27.435414600 -0700
+@@ -1568,6 +1568,14 @@ subsequently reset.
+ Expands to the effective user ID of the current user, initialized at
+ shell startup.  This variable is readonly.
+ .TP
++.B EXECIGNORE
++A colon-separated list of extended glob (see \fBPattern Matching\fP)
++patterns. Files with full paths matching one of these patterns are
++not considered executable for the purposes of completion and PATH
++searching, but the \fB[\fP, \fB[[\fP, and \fBtest\fP builtins are not
++affected. Use this variable to deal with systems that set the
++executable bit on files that are not actually executable.
++.TP
+ .B FUNCNAME
+ An array variable containing the names of all shell functions
+ currently in the execution call stack.
+@@ -8772,6 +8780,10 @@ If set,
+ attempts spelling correction on directory names during word completion
+ if the directory name initially supplied does not exist.
+ .TP 8
++.B completion_strip_exe
++If set, whenever bash sees `foo.exe' during completion, it checks if
++`foo' is the same file and strips the suffix.
++.TP 8
+ .B dotglob
+ If set, 
+ .B bash
+--- doc/bashref.texi	2009-12-29 12:59:18.000000000 -0800
++++ doc/bashref.texi	2014-10-08 13:50:27.435414600 -0700
+@@ -4363,6 +4363,10 @@ If set, Bash
+ changes its behavior to that of version 3.1 with respect to quoted
+ arguments to the conditional command's =~ operator.
+ 
++@item completion_strip_exe
++If set, whenever bash sees `foo.exe' during completion, it checks if
++`foo' is the same file and strips the suffix.
++
+ @item dirspell
+ If set, Bash
+ attempts spelling correction on directory names during word completion 
+@@ -4892,6 +4896,14 @@ emacs shell buffer and disables line edi
+ The numeric effective user id of the current user.  This variable
+ is readonly.
+ 
++@item EXECIGNORE
++A colon-separated list of extended glob ((@pxref{Pattern Matching})
++patterns. Files with full paths matching one of these patterns are
++not considered executable for the purposes of completion and PATH
++searching, but the @code{[}, @code{[[}, and @code{test} builtins are
++not affected. Use this variable to deal with systems that set the
++executable bit on files that are not actually executable.
++
+ @item FCEDIT
+ The editor used as a default by the @option{-e} option to the @code{fc}
+ builtin command.
+--- doc/builtins.1	2008-08-12 06:24:40.000000000 -0700
++++ doc/builtins.1	2014-10-08 13:50:27.435414600 -0700
+@@ -12,6 +12,6 @@ shift, shopt, source, suspend, test, tim
+ ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1)
+ .SH BASH BUILTIN COMMANDS
+ .nr zZ 1
+-.so bash.1
++.so man1/bash.1
+ .SH SEE ALSO
+ bash(1), sh(1)
+--- execute_cmd.c	2009-12-30 09:55:37.000000000 -0800
++++ execute_cmd.c	2014-10-08 13:50:27.435414600 -0700
+@@ -4004,7 +4004,7 @@ execute_function (var, words, flags, fds
+   char *debug_trap, *error_trap, *return_trap;
+ #if defined (ARRAY_VARS)
+   SHELL_VAR *funcname_v, *nfv, *bash_source_v, *bash_lineno_v;
+-  ARRAY *funcname_a, *bash_source_a, *bash_lineno_a;
++  ARRAY *funcname_a, *volatile bash_source_a, *volatile bash_lineno_a;
+ #endif
+   FUNCTION_DEF *shell_fn;
+   char *sfile, *t;
+@@ -4571,6 +4571,12 @@ execute_disk_command (words, redirects,
+ 	  hookf = find_function (NOTFOUND_HOOK);
+ 	  if (hookf == 0)
+ 	    {
++#if __CYGWIN__
++              /* Point out \r use to clueless users. The memory leak
++                 is harmless - we're about to exit. */
++              if (ansic_shouldquote (pathname))
++                pathname = ansic_quote (pathname, 0, NULL);
++#endif /* __CYGWIN__ */
+ 	      internal_error (_("%s: command not found"), pathname);
+ 	      exit (EX_NOTFOUND);	/* Posix.2 says the exit status is 127 */
+ 	    }
+@@ -4990,6 +4996,10 @@ do_piping (pipe_in, pipe_out)
+ 	dup_error (pipe_in, 0);
+       if (pipe_in > 0)
+ 	close (pipe_in);
++#if __CYGWIN__
++      /* Let stdio know that fd may have changed from text to binary.  */
++      freopen (NULL, "r", stdin);
++#endif /* __CYGWIN__ */
+     }
+   if (pipe_out != NO_PIPE)
+     {
+@@ -5005,5 +5015,12 @@ do_piping (pipe_in, pipe_out)
+ 	  if (dup2 (1, 2) < 0)
+ 	    dup_error (1, 2);
+ 	}
++#if __CYGWIN__
++      extern int sh_setlinebuf (FILE *);
++      /* Let stdio know that fd may have changed from text to binary.  */
++      freopen (NULL, "w", stdout);
++      /* Bash builtins (foolishly) rely on line-buffering. */
++      sh_setlinebuf (stdout);
++#endif /* __CYGWIN__ */
+     }
+ }
+--- findcmd.c	2009-06-05 13:25:38.000000000 -0700
++++ findcmd.c	2014-10-08 13:50:27.451015900 -0700
+@@ -43,6 +43,8 @@
+ #include "hashcmd.h"
+ #include "findcmd.h"	/* matching prototypes and declarations */
+ 
++#include <glob/strmatch.h>
++
+ extern int posixly_correct;
+ 
+ /* Static functions defined and used in this file. */
+@@ -71,6 +73,38 @@ int check_hashed_filenames;
+    containing the file of interest. */
+ int dot_found_in_search = 0;
+ 
++static struct ignorevar execignore =
++{
++  "EXECIGNORE",
++  (struct ign *)0,
++  0,
++  (char *)0,
++  (sh_iv_item_func_t *)0,
++};
++
++void
++setup_exec_ignore (char *varname)
++{
++  setup_ignore_patterns (&execignore);
++}
++
++/* Return whether we should never consider file executable
++ * even if the system tells us it is. */
++static int
++is_on_exec_blacklist (char *name)
++{
++  struct ign *p;
++  int flags = FNM_EXTMATCH | FNM_CASEFOLD;
++
++  for (p = execignore.ignores; p && p->val; p++)
++    {
++      if (strmatch (p->val, (char *)name, flags) != FNM_NOMATCH)
++      return (1);
++    }
++
++  return (0);
++}
++
+ /* Return some flags based on information about this file.
+    The EXISTS bit is non-zero if the file is found.
+    The EXECABLE bit is non-zero the file is executble.
+@@ -98,7 +132,7 @@ file_status (name)
+      file access mechanisms into account.  eaccess uses the effective
+      user and group IDs, not the real ones.  We could use sh_eaccess,
+      but we don't want any special treatment for /dev/fd. */
+-  if (eaccess (name, X_OK) == 0)
++  if (!is_on_exec_blacklist (name) && eaccess (name, X_OK) == 0)
+     r |= FS_EXECABLE;
+   if (eaccess (name, R_OK) == 0)
+     r |= FS_READABLE;
+--- findcmd.h	2009-01-04 11:32:29.000000000 -0800
++++ findcmd.h	2014-10-08 13:50:27.451015900 -0700
+@@ -31,5 +31,6 @@ extern char *find_user_command __P((cons
+ extern char *find_path_file __P((const char *));
+ extern char *search_for_command __P((const char *));
+ extern char *user_command_matches __P((const char *, int, int));
++extern void setup_exec_ignore __P((char *));
+ 
+ #endif /* _FINDCMD_H_ */
+--- general.c	2009-11-28 18:44:46.000000000 -0800
++++ general.c	2014-10-08 13:50:27.451015900 -0700
+@@ -43,6 +43,10 @@
+ 
+ #include <tilde/tilde.h>
+ 
++#ifdef __CYGWIN__
++#include <sys/cygwin.h>
++#endif
++
+ #if !defined (errno)
+ extern int errno;
+ #endif /* !errno */
+@@ -601,7 +605,8 @@ make_absolute (string, dot_path)
+     {
+       char pathbuf[PATH_MAX + 1];
+ 
+-      cygwin_conv_to_full_posix_path (string, pathbuf);
++      cygwin_conv_path (CCP_WIN_A_TO_POSIX | CCP_ABSOLUTE, string, pathbuf,
++			PATH_MAX + 1);
+       result = savestring (pathbuf);
+     }
+ #else
+--- input.c	2009-01-04 11:32:29.000000000 -0800
++++ input.c	2014-10-08 13:50:27.451015900 -0700
+@@ -43,6 +43,10 @@
+ #include "externs.h"
+ #include "quit.h"
+ 
++#if __CYGWIN__
++int igncr;
++#endif /* __CYGWIN__ */
++
+ #if !defined (errno)
+ extern int errno;
+ #endif /* !errno */
+@@ -193,6 +197,10 @@ make_buffered_stream (fd, buffer, bufsiz
+   bp->b_used = bp->b_inputp = bp->b_flag = 0;
+   if (bufsize == 1)
+     bp->b_flag |= B_UNBUFF;
++#if __CYGWIN__
++  if ((fcntl (fd, F_GETFL) & O_TEXT) != 0)
++    bp->b_flag |= B_TEXT;
++#endif /* __CYGWIN__ */
+   return (bp);
+ }
+ 
+@@ -361,11 +369,7 @@ duplicate_buffered_stream (fd1, fd2)
+ }
+ 
+ /* Return 1 if a seek on FD will succeed. */
+-#ifndef __CYGWIN__
+ #  define fd_is_seekable(fd) (lseek ((fd), 0L, SEEK_CUR) >= 0)
+-#else
+-#  define fd_is_seekable(fd) 0
+-#endif /* __CYGWIN__ */
+ 
+ /* Take FD, a file descriptor, and create and return a buffered stream
+    corresponding to it.  If something is wrong and the file descriptor
+@@ -474,6 +478,25 @@ b_fill_buffer (bp)
+   ssize_t nr;
+ 
+   CHECK_TERMSIG;
++#ifdef __CYGWIN__
++  /* lseek'ing on text files is problematic; lseek reports the true
++     file offset, but read collapses \r\n and returns a character
++     count.  We cannot reliably seek backwards if nr is smaller than
++     the seek offset encountered during the read, and must instead
++     treat the stream as unbuffered.  */
++  if ((bp->b_flag & (B_TEXT | B_UNBUFF)) == B_TEXT)
++    {
++      off_t offset = lseek (bp->b_fd, 0, SEEK_CUR);
++      nr = zread (bp->b_fd, bp->b_buffer, bp->b_size);
++      if (nr > 0 && nr < lseek (bp->b_fd, 0, SEEK_CUR) - offset)
++	{
++	  lseek (bp->b_fd, offset, SEEK_SET);
++	  bp->b_flag |= B_UNBUFF;
++	  nr = zread (bp->b_fd, bp->b_buffer, bp->b_size = 1);
++	}
++    }
++  else
++#endif /* __CYGWIN__ */
+   nr = zread (bp->b_fd, bp->b_buffer, bp->b_size);
+   if (nr <= 0)
+     {
+@@ -486,15 +509,6 @@ b_fill_buffer (bp)
+       return (EOF);
+     }
+ 
+-#if defined (__CYGWIN__)
+-  /* If on cygwin, translate \r\n to \n. */
+-  if (nr >= 2 && bp->b_buffer[nr - 2] == '\r' && bp->b_buffer[nr - 1] == '\n')
+-    {
+-      bp->b_buffer[nr - 2] = '\n';
+-      nr--;
+-    }
+-#endif
+-
+   bp->b_used = nr;
+   bp->b_inputp = 0;
+   return (bp->b_buffer[bp->b_inputp++] & 0xFF);
+@@ -543,6 +557,19 @@ buffered_getchar ()
+ {
+   CHECK_TERMSIG;
+ 
++#if __CYGWIN__
++  /* shopt igncr means to discard carriage returns from input stream.
++     If cr is the only character in the buffer, then recurse to pick
++     up the next character; otherwise flatten the buffer.  */
++  if (igncr)
++    {
++      int ch;
++      while ((ch = bufstream_getc (buffers[bash_input.location.buffered_fd]))
++	     == '\r')
++	;
++      return ch;
++    }
++#endif /* __CYGWIN__ */
+ #if !defined (DJGPP)
+   return (bufstream_getc (buffers[bash_input.location.buffered_fd]));
+ #else
+--- input.h	2009-01-04 11:32:29.000000000 -0800
++++ input.h	2014-10-08 13:50:27.451015900 -0700
+@@ -48,6 +48,7 @@ enum stream_type {st_none, st_stdin, st_
+ #define B_ERROR		0x02
+ #define B_UNBUFF	0x04
+ #define B_WASBASHINPUT	0x08
++#define B_TEXT          0x10 /* Text stream, when O_BINARY is nonzero */
+ 
+ /* A buffered stream.  Like a FILE *, but with our own buffering and
+    synchronization.  Look in input.c for the implementation. */
+--- lib/sh/pathcanon.c	2008-08-12 11:01:37.000000000 -0700
++++ lib/sh/pathcanon.c	2014-10-08 13:50:27.451015900 -0700
+@@ -194,6 +194,8 @@ sh_canonpath (path, flags)
+ 	    *q++ = DIRSEP;
+ 	  while (*p && (ISDIRSEP(*p) == 0))
+ 	    *q++ = *p++;
++	}
++    }
+ 	  /* Check here for a valid directory with _path_isdir. */
+ 	  if (flags & PATH_CHECKEXISTS)
+ 	    {
+@@ -211,8 +213,7 @@ sh_canonpath (path, flags)
+ 		}
+ 	      *q = c;
+ 	    }
+-	}
+-    }
++
+ 
+   /* Empty string is really ``.'' or `/', depending on what we started with. */
+   if (q == result)
+--- lib/sh/pathphys.c	2008-08-12 11:01:23.000000000 -0700
++++ lib/sh/pathphys.c	2014-10-08 13:50:27.451015900 -0700
+@@ -35,6 +35,7 @@
+ #include <stdio.h>
+ #include <chartypes.h>
+ #include <errno.h>
++#include <stdlib.h>
+ 
+ #include "shell.h"
+ 
+@@ -76,6 +77,10 @@ sh_physpath (path, flags)
+      char *path;
+      int flags;
+ {
++#if __CYGWIN__
++  /* realpath does this right without all the hassle */
++  return realpath (path, NULL);
++#else
+   char tbuf[PATH_MAX+1], linkbuf[PATH_MAX+1];
+   char *result, *p, *q, *qsave, *qbase, *workpath;
+   int double_slash_path, linklen, nlink;
+@@ -249,6 +254,7 @@ error:
+     }
+ 
+   return (result);
++#endif /* !__CYGWIN__ */
+ }
+ 
+ char *
+--- lib/sh/tmpfile.c	2008-08-12 10:50:12.000000000 -0700
++++ lib/sh/tmpfile.c	2014-10-08 13:50:27.451015900 -0700
+@@ -40,7 +40,7 @@
+ extern int errno;
+ #endif
+ 
+-#define BASEOPENFLAGS	(O_CREAT | O_TRUNC | O_EXCL)
++#define BASEOPENFLAGS	(O_CREAT | O_TRUNC | O_EXCL | O_BINARY)
+ 
+ #define DEFAULT_TMPDIR		"."	/* bogus default, should be changed */
+ #define DEFAULT_NAMEROOT	"shtmp"
+@@ -94,7 +94,7 @@ get_tmpdir (flags)
+   if (tdir && (file_iswdir (tdir) == 0 || strlen (tdir) > PATH_MAX))
+     tdir = 0;
+ 
+-  if (tdir == 0)
++  if (tdir == 0 || !file_iswdir (tdir))
+     tdir = get_sys_tmpdir ();
+ 
+ #if defined (HAVE_PATHCONF) && defined (_PC_NAME_MAX)
+@@ -116,14 +116,15 @@ sh_mktmpname (nameroot, flags)
+   struct stat sb;
+   int r, tdlen;
+ 
+-  filename = (char *)xmalloc (PATH_MAX + 1);
++  filename = NULL;
+   tdir = get_tmpdir (flags);
+   tdlen = strlen (tdir);
+ 
+   lroot = nameroot ? nameroot : DEFAULT_NAMEROOT;
+ 
+ #ifdef USE_MKTEMP
+-  sprintf (filename, "%s/%s.XXXXXX", tdir, lroot);
++  if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0)
++    return NULL;
+   if (mktemp (filename) == 0)
+     {
+       free (filename);
+@@ -136,7 +137,9 @@ sh_mktmpname (nameroot, flags)
+ 		(unsigned long) time ((time_t *)0) ^
+ 		(unsigned long) dollar_dollar_pid ^
+ 		(unsigned long) ((flags & MT_USERANDOM) ? get_random_number () : ntmpfiles++);
+-      sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum);
++      free (filename);
++      if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0)
++        return NULL;
+       if (tmpnamelen > 0 && tmpnamelen < 32)
+ 	filename[tdlen + 1 + tmpnamelen] = '\0';
+ #  ifdef HAVE_LSTAT
+@@ -161,14 +164,19 @@ sh_mktmpfd (nameroot, flags, namep)
+   char *filename, *tdir, *lroot;
+   int fd, tdlen;
+ 
+-  filename = (char *)xmalloc (PATH_MAX + 1);
++  filename = NULL;
+   tdir = get_tmpdir (flags);
+   tdlen = strlen (tdir);
+ 
+   lroot = nameroot ? nameroot : DEFAULT_NAMEROOT;
+ 
+ #ifdef USE_MKSTEMP
+-  sprintf (filename, "%s/%s.XXXXXX", tdir, lroot);
++  if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0)
++    {
++      if (namep)
++        *namep = NULL;
++      return -1;
++    }
+   fd = mkstemp (filename);
+   if (fd < 0 || namep == 0)
+     {
+@@ -185,7 +193,13 @@ sh_mktmpfd (nameroot, flags, namep)
+ 		(unsigned long) time ((time_t *)0) ^
+ 		(unsigned long) dollar_dollar_pid ^
+ 		(unsigned long) ((flags & MT_USERANDOM) ? get_random_number () : ntmpfiles++);
+-      sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum);
++      free (filename);
++      if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0)
++        {
++          if (namep)
++            *namep = NULL;
++          return -1;
++        }
+       if (tmpnamelen > 0 && tmpnamelen < 32)
+ 	filename[tdlen + 1 + tmpnamelen] = '\0';
+       fd = open (filename, BASEOPENFLAGS | ((flags & MT_READWRITE) ? O_RDWR : O_WRONLY), 0600);
+--- parse.y	2014-10-08 13:45:10.394563700 -0700
++++ parse.y	2014-10-08 13:50:27.451015900 -0700
+@@ -1520,14 +1520,20 @@ yy_string_get ()
+   string = bash_input.location.string;
+ 
+   /* If the string doesn't exist, or is empty, EOF found. */
+-  if (string && *string)
++  while (string && *string)
+     {
+       c = *string++;
+       bash_input.location.string = string;
++#if __CYGWIN__
++      {
++        extern int igncr;
++        if (igncr && c == '\r')
++          continue;
++      }
++#endif /* __CYGWIN__ */
+       return (c);
+     }
+-  else
+-    return (EOF);
++  return (EOF);
+ }
+ 
+ static int
+@@ -5487,6 +5493,15 @@ report_syntax_error (message)
+      parser's complaining about by looking at current_token. */
+   if (current_token != 0 && EOF_Reached == 0 && (msg = error_token_from_token (current_token)))
+     {
++#if __CYGWIN__
++      /* Try to help clueless users. */
++      char *p = msg;
++      if (ansic_shouldquote (msg))
++        {
++          msg = ansic_quote (msg, 0, NULL);
++          free (p);
++        }
++#endif /* __CYGWIN__ */
+       parser_error (line_number, _("syntax error near unexpected token `%s'"), msg);
+       free (msg);
+ 
+--- pathexp.h	2009-01-04 11:32:40.000000000 -0800
++++ pathexp.h	2014-10-08 13:50:27.451015900 -0700
+@@ -86,7 +86,7 @@ struct ign {
+ typedef int sh_iv_item_func_t __P((struct ign *));
+ 
+ struct ignorevar {
+-  char *varname;	/* FIGNORE or GLOBIGNORE */
++  char *varname;	/* FIGNORE or GLOBIGNORE or EXECIGNORE */
+   struct ign *ignores;	/* Store the ignore strings here */
+   int num_ignores;	/* How many are there? */
+   char *last_ignoreval;	/* Last value of variable - cached for speed */
+--- redir.c	2009-09-17 07:04:18.000000000 -0700
++++ redir.c	2014-10-08 13:50:27.451015900 -0700
+@@ -437,7 +437,7 @@ here_document_to_fd (redirectee, ri)
+   /* In an attempt to avoid races, we close the first fd only after opening
+      the second. */
+   /* Make the document really temporary.  Also make it the input. */
+-  fd2 = open (filename, O_RDONLY, 0600);
++  fd2 = open (filename, O_RDONLY | O_BINARY, 0600);
+ 
+   if (fd2 < 0)
+     {
+@@ -453,14 +453,6 @@ here_document_to_fd (redirectee, ri)
+   if (unlink (filename) < 0)
+     {
+       r = errno;
+-#if defined (__CYGWIN__)
+-      /* Under CygWin 1.1.0, the unlink will fail if the file is
+-	 open. This hack will allow the previous action of silently
+-	 ignoring the error, but will still leave the file there. This
+-	 needs some kind of magic. */
+-      if (r == EACCES)
+-	return (fd2);
+-#endif /* __CYGWIN__ */
+       close (fd2);
+       free (filename);
+       errno = r;
+--- shell.c	2009-11-19 07:05:54.000000000 -0800
++++ shell.c	2014-10-08 13:50:27.466607600 -0700
+@@ -329,7 +329,10 @@ _cygwin32_check_tmp ()
+   struct stat sb;
+ 
+   if (stat ("/tmp", &sb) < 0)
+-    internal_warning (_("could not find /tmp, please create!"));
++    {
++      if (mkdir ("/tmp", S_IRWXU | S_IRWXG | S_IRWXO | S_ISVTX) != 0)
++        internal_warning (_("could not find /tmp, please create!"));
++    }
+   else
+     {
+       if (S_ISDIR (sb.st_mode) == 0)
+@@ -1471,10 +1474,6 @@ open_shell_script (script_name)
+      not match with ours. */
+   fd = move_to_high_fd (fd, 1, -1);
+ 
+-#if defined (__CYGWIN__) && defined (O_TEXT)
+-  setmode (fd, O_TEXT);
+-#endif
+-
+ #if defined (BUFFERED_INPUT)
+   default_buffered_input = fd;
+   SET_CLOSE_ON_EXEC (default_buffered_input);
+--- subst.c	2009-12-30 05:24:28.000000000 -0800
++++ subst.c	2014-10-08 13:50:27.466607600 -0700
+@@ -4921,10 +4921,6 @@ read_comsub (fd, quoted, rflag)
+   for (skip_ctlesc = skip_ctlnul = 0, s = ifs_value; s && *s; s++)
+     skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL;
+ 
+-#ifdef __CYGWIN__
+-  setmode (fd, O_TEXT);		/* we don't want CR/LF, we want Unix-style */
+-#endif
+-
+   /* Read the output of the command through the pipe.  This may need to be
+      changed to understand multibyte characters in the future. */
+   while (1)
+@@ -4947,6 +4943,13 @@ read_comsub (fd, quoted, rflag)
+ #endif
+ 	  continue;
+ 	}
++#if __CYGWIN__
++      {
++	extern int igncr;
++	if (igncr && c == '\r')
++	  continue;
++      }
++#endif /* __CYGWIN__ */
+ 
+       /* Add the character to ISTRING, possibly after resizing it. */
+       RESIZE_MALLOCED_BUFFER (istring, istring_index, 2, istring_size, DEFAULT_ARRAY_SIZE);
+@@ -5063,6 +5066,27 @@ command_substitute (string, quoted)
+       sys_error (_("cannot make pipe for command substitution"));
+       goto error_exit;
+     }
++#if __CYGWIN__
++  /* Passing a pipe through std fds can cause hangs when talking to a
++     non-cygwin child.  Move it.  */
++  if (fildes[0] < 3)
++    {
++      int fd = fcntl (fildes[0], F_DUPFD, 3);
++      close (fildes[0]);
++      fildes[0] = fd;
++    }
++  if (fildes[1] < 3)
++    {
++      int fd = fcntl (fildes[1], F_DUPFD, 3);
++      close (fildes[1]);
++      fildes[1] = fd;
++    }
++  if (fildes[0] < 0 || fildes[1] < 0)
++    {
++      sys_error (_("cannot make pipe for command substitution"));
++      goto error_exit;
++    }
++#endif /* __CYGWIN__ */
+ 
+   old_pid = last_made_pid;
+ #if defined (JOB_CONTROL)
+@@ -5130,6 +5154,12 @@ command_substitute (string, quoted)
+ 	  (fildes[0] != fileno (stdout)) &&
+ 	  (fildes[0] != fileno (stderr)))
+ 	close (fildes[0]);
++#if __CYGWIN__
++      /* Inform stdio if any text/binary changes happened. */
++      freopen (NULL, "w", stdout);
++      /* Bash builtins (foolishly) rely on line-buffering. */
++      sh_setlinebuf (stdout);
++#endif /* __CYGWIN__ */
+ 
+       /* The currently executing shell is not interactive. */
+       interactive = 0;
+--- variables.c	2014-10-08 13:45:10.285364600 -0700
++++ variables.c	2014-10-08 13:50:27.466607600 -0700
+@@ -4143,6 +4143,8 @@ static struct name_and_function special_
+   { "COMP_WORDBREAKS", sv_comp_wordbreaks },
+ #endif
+ 
++  { "EXECIGNORE", sv_execignore },
++
+   { "GLOBIGNORE", sv_globignore },
+ 
+ #if defined (HISTORY)
+@@ -4323,6 +4325,13 @@ sv_globignore (name)
+     setup_glob_ignore (name);
+ }
+ 
++/* What to do when EXECIGNORE changes. */
++void
++sv_execignore (char *name)
++{
++  setup_exec_ignore (name);
++}
++
+ #if defined (READLINE)
+ void
+ sv_comp_wordbreaks (name)
+--- variables.h	2009-08-16 13:10:15.000000000 -0700
++++ variables.h	2014-10-08 13:50:27.466607600 -0700
+@@ -351,6 +351,7 @@ extern void sv_ifs __P((char *));
+ extern void sv_path __P((char *));
+ extern void sv_mail __P((char *));
+ extern void sv_globignore __P((char *));
++extern void sv_execignore __P((char *));
+ extern void sv_ignoreeof __P((char *));
+ extern void sv_strict_posix __P((char *));
+ extern void sv_optind __P((char *));
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index af51ab4e766..8774db33b5a 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -3,8 +3,21 @@
 assert interactive -> readline != null;
 
 let
-  realName = "bash-4.3";
+  version = if stdenv.isCygwin then "4.1" else "4.3";
+  realName = "bash-${version}";
+  shortName = if stdenv.isCygwin then "bash41" else "bash43";
   baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline";
+  sha256 = if version == "4.1" then
+      "1np1ggp1lv8idwfx3mcxl9rhadqdf4h3x4isa3dk8v9wm0j72qiz"
+    else
+      "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg";
+
+  basePatchFun = if version == "4.1" then
+      ./bash-4.1-patches.nix
+    else
+      ./bash-4.3-patches.nix;
+
+  extraPatches = stdenv.lib.optional stdenv.isCygwin ./bash-4.1.17-9.src.patch;
 in
 
 stdenv.mkDerivation rec {
@@ -12,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/bash/${realName}.tar.gz";
-    sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg";
+    inherit sha256;
   };
 
   NIX_CFLAGS_COMPILE = ''
@@ -30,11 +43,11 @@ stdenv.mkDerivation rec {
     (let
       patch = nr: sha256:
         fetchurl {
-          url = "mirror://gnu/bash/bash-4.3-patches/bash43-${nr}";
+          url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}";
           inherit sha256;
         };
     in
-      import ./bash-4.3-patches.nix patch);
+      import basePatchFun patch) ++ extraPatches;
 
   crossAttrs = {
     configureFlags = baseConfigureFlags +

From 3f6949c3ef358f28b5f90d9766c33aed8a78a9de Mon Sep 17 00:00:00 2001
From: Marko Durkovic <marko@miding.de>
Date: Thu, 23 Oct 2014 16:28:20 +0200
Subject: [PATCH 0331/2322] cygwin: openssl for x86_64

---
 .../libraries/openssl/1.0.1-cygwin64.patch    | 136 ++++++++++++++++++
 .../development/libraries/openssl/default.nix |  12 +-
 2 files changed, 142 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/openssl/1.0.1-cygwin64.patch

diff --git a/pkgs/development/libraries/openssl/1.0.1-cygwin64.patch b/pkgs/development/libraries/openssl/1.0.1-cygwin64.patch
new file mode 100644
index 00000000000..63112abf3a3
--- /dev/null
+++ b/pkgs/development/libraries/openssl/1.0.1-cygwin64.patch
@@ -0,0 +1,136 @@
+--- openssl-1.0.1e/config      2014-10-23 15:53:23.436600000 +0200
++++ openssl-1.0.1e/config      2014-10-23 15:55:33.837000000 +0200
+@@ -832,6 +832,7 @@
+   # these are all covered by the catchall below
+   # *-dgux) OUT="dgux" ;;
+   mips-sony-newsos4) OUT="newsos4-gcc" ;;
++  x86_64-*-cygwin) OUT="Cygwin-x86_64" ;;
+   *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;
+   *-*-cygwin) OUT="Cygwin" ;;
+   t3e-cray-unicosmk) OUT="cray-t3e" ;;
+--- openssl-1.0.1e/Configure	2013-02-17 17:06:18.682058900 -0600
++++ openssl-1.0.1e/Configure	2013-02-17 16:38:08.000000000 -0600
+@@ -550,6 +550,7 @@ my %table=(
+ "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",
+ "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:coff:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
+ "debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
++"Cygwin-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -O3 -Wall:::CYGWIN32::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:mingw64:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
+ 
+ # NetWare from David Ward (dsward@novell.com)
+ # requires either MetroWerks NLM development tools, or gcc / nlmconv
+@@ -1128,7 +1129,7 @@ foreach (sort @experimental)
+ 
+ my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
+ 
+-$exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/);
++$exe_ext=".exe" if ($target =~ /^Cygwin/ || $target eq "DJGPP" || $target =~ /^mingw/);
+ $exe_ext=".nlm" if ($target =~ /netware/);
+ $exe_ext=".pm"  if ($target =~ /vos/);
+ $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq "");
+--- openssl-1.0.1e/Makefile.org	2013-02-11 09:26:04.000000000 -0600
++++ openssl-1.0.1e/Makefile.org	2013-02-17 16:38:08.000000000 -0600
+@@ -326,9 +326,9 @@ clean-shared:
+ 			done; \
+ 		fi; \
+ 		( set -x; rm -f lib$$i$(SHLIB_EXT) ); \
+-		if [ "$(PLATFORM)" = "Cygwin" ]; then \
++		case "$(PLATFORM)" in Cygwin*)  \
+ 			( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \
+-		fi; \
++		esac; \
+ 	done
+ 
+ link-shared:
+@@ -571,11 +571,7 @@ install_sw:
+ 		do \
+ 			if [ -f "$$i" -o -f "$$i.a" ]; then \
+ 			(       echo installing $$i; \
+-				if [ "$(PLATFORM)" != "Cygwin" ]; then \
+-					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+-					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+-					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+-				else \
++				case "$(PLATFORM)" in Cygwin*) \
+ 					c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
+ 					cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+ 					chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+@@ -583,7 +579,12 @@ install_sw:
+ 					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+ 					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+ 					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+-				fi ); \
++					;; \
++				*) \
++					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
++				esac ); \
+ 				if expr $(PLATFORM) : 'mingw' > /dev/null; then \
+ 				(	case $$i in \
+ 						*crypto*) i=libeay32.dll;; \
+@@ -643,9 +644,9 @@ install_docs:
+ 	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
+ 	here="`pwd`"; \
+ 	filecase=; \
+-	if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
++	case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*) \
+ 		filecase=-i; \
+-	fi; \
++	esac; \
+ 	set -e; for i in doc/apps/*.pod; do \
+ 		fn=`basename $$i .pod`; \
+ 		sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
+--- openssl-1.0.1e/engines/ccgost/Makefile	2013-02-11 09:26:04.000000000 -0600
++++ openssl-1.0.1e/engines/ccgost/Makefile	2013-02-17 17:05:47.759290200 -0600
+@@ -45,7 +45,11 @@ install:
+ 		set -e; \
+ 		echo installing $(LIBNAME); \
+ 		pfx=lib; \
+-		if [ "$(PLATFORM)" != "Cygwin" ]; then \
++		case "$(PLATFORM)" in Cygwin*) \
++			sfx=".so"; \
++			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
++			;; \
++		*) \
+ 			case "$(CFLAGS)" in \
+ 			*DSO_BEOS*) sfx=".so";; \
+ 			*DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \
+@@ -54,10 +58,7 @@ install:
+ 			*) sfx=".bad";; \
+ 			esac; \
+ 			cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
+-		else \
+-			sfx=".so"; \
+-			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
+-		fi; \
++		esac; \
+ 		chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
+ 		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \
+ 	fi
+--- openssl-1.0.1i/engines/Makefile	2014-10-23 16:08:19.360200000 +0200
++++ openssl-1.0.1i/engines/Makefile	2014-10-23 16:10:54.205800000 +0200
+@@ -111,7 +111,11 @@
+ 		for l in $(LIBNAMES); do \
+ 			( echo installing $$l; \
+ 			  pfx=lib; \
+-			  if [ "$(PLATFORM)" != "Cygwin" ]; then \
++			  case "$(PLATFORM)" in Cygwin*) \
++				sfx=".so"; \
++				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
++				;; \
++			  *) \
+ 				case "$(CFLAGS)" in \
+ 				*DSO_BEOS*)	sfx=".so";;	\
+ 				*DSO_DLFCN*)	sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;;	\
+@@ -120,10 +124,7 @@
+ 				*)		sfx=".bad";;	\
+ 				esac; \
+ 				cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+-			  else \
+-				sfx=".so"; \
+-				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+-			  fi; \
++			  esac; \
+ 			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+ 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
+ 		done; \
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 7255e91f282..7f428fd584b 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -35,6 +35,7 @@ let
 
     ++ stdenv.lib.optional isDarwin ./darwin-arch.patch;
 
+  extraPatches = stdenv.lib.optional stdenv.isCygwin ./1.0.1-cygwin64.patch;
 in
 
 stdenv.mkDerivation {
@@ -48,7 +49,7 @@ stdenv.mkDerivation {
     sha256 = "0x7gvyybmqm4lv62mlhlm80f1rn7il2qh8224rahqv0i15xhnpq9";
   };
 
-  patches = patchesCross false;
+  patches = (patchesCross false) ++ extraPatches;
 
   buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
 
@@ -62,12 +63,11 @@ stdenv.mkDerivation {
     else "./config";
 
   configureFlags = "shared --libdir=lib --openssldir=etc/ssl" +
-    stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" +
-    stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") " no-asm";
+    stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS";
 
-  preBuild = stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") ''
-    sed -i -e "s|-march=i486|-march=x86-64|g" Makefile
-  '';
+  # CYGXXX: used to be set for cygwin with optionalString. Not needed
+  # anymore but kept to prevent rebuild.
+  preBuild = "";
 
   makeFlags = "MANDIR=$(out)/share/man";
 

From 221b5a5be5eb698c696b728b0a9b6646422cd9c7 Mon Sep 17 00:00:00 2001
From: Marko Durkovic <marko@miding.de>
Date: Thu, 16 Oct 2014 22:06:51 +0200
Subject: [PATCH 0332/2322] cygwin: findutils fpending and coreutils patch

---
 .../coreutils/coreutils-8.23-4.cygwin.patch   | 1259 +++++++++++++++++
 pkgs/tools/misc/coreutils/default.nix         |    4 +
 pkgs/tools/misc/findutils/default.nix         |    4 +
 3 files changed, 1267 insertions(+)
 create mode 100644 pkgs/tools/misc/coreutils/coreutils-8.23-4.cygwin.patch

diff --git a/pkgs/tools/misc/coreutils/coreutils-8.23-4.cygwin.patch b/pkgs/tools/misc/coreutils/coreutils-8.23-4.cygwin.patch
new file mode 100644
index 00000000000..2f69347ffab
--- /dev/null
+++ b/pkgs/tools/misc/coreutils/coreutils-8.23-4.cygwin.patch
@@ -0,0 +1,1259 @@
+--- coreutils-8.23/ChangeLog	2014-07-18 15:22:24.000000000 -0700
++++ coreutils-8.23/ChangeLog	2014-10-13 08:56:50.775188900 -0700
+@@ -1,3 +1,220 @@
++2014-10-13  U-WIN-RSJ0SJPBR3E\Administrator  <Administrator@WIN-KQ1OCEBI2E8>
++
++	Cygwin release 8.23-4
++	* copy.c (copy_internal): Fix typo that broke recursive copy
++	when dealing with directories.
++
++2014-09-24  Eric Blake  <eblake@redhat.com>
++
++	Cygwin release 8.23-3
++	* lib/cygwin.c (cygwin_spelling): Skip .exe magic if .exe is
++	already present.  Also honor .exe magic on symlinks.
++	* lib/same.c (same_name): Treat files as same if only difference
++	is .exe magic.
++	* copy.c (copy): Move symlink special casing here.
++	* install.c (strip): Update caller.
++	* ls.c (gobble_file): Likewise.
++	* stat.c (do_statfs, do_stat): Likewise.
++
++2014-08-12  Eric Blake  <eblake@redhat.com>
++
++	Cygwin release 8.23-2.
++	Drop hostname.
++
++2014-08-01  Eric Blake  <eblake@redhat.com>
++
++	Cygwin release 8.23-1.
++	* configure.ac: Disable stdbuf.
++	* lib/local.mk: Upstream switched to flat make, impacting how
++	we build local cygwin.c code.
++	* lib/canonicalize.c: Accepted upstream.
++	* lib/file-has-acl.c: Likewise.
++	* realpath.c: Likewise.
++	* su.c: Upstream dropped su.
++	* Makefile.am: Drop su changes.
++	* chroot.c: Adapt to new upstream code.
++
++2012-02-04  Eric Blake  <eblake@redhat.com>
++
++	Cygwin release 8.15-1.
++	* lib/fts.c: Early gnulib fix is now upstream.
++	* lib/canonicalize.c: Backport gnulib fix for /// -> /.
++	* realpath.c: Backport gnulib fix for --relative-to.
++
++2011-10-27  Eric Blake  <eblake@redhat.com>
++
++	Cygwin release 8.14-1.
++	* lib/ftc.c: Backport gnulib fix to make rm close before rmdir.
++	* lib/cygwin.c (cygwin_spelling): Fix logic when 'f' and 'f.exe'
++	exist but are different files.
++	* stat.c: Fix --append-exe.
++
++2011-02-04  Eric Blake  <eblake@redhat.com>
++
++	Cygwin release 8.10-1.
++
++2010-12-24  Eric Blake  <eblake@redhat.com>
++
++	Cygwin release 8.8-1.
++	* lib/mountlist.c (ME_REMOTE): Restore previous cygwin hack to
++	determine remote drives, lost since 6.11-1.
++
++2010-04-29  Eric Blake  <eblake@redhat.com>
++
++	Cygwin release 8.5-1.
++
++2010-03-11  Eric Blake  <eblake@redhat.com>
++
++	Cygwin release 8.4-1.
++	* lib/xfreopen.c (xfreopen): Consolidate workaround for broken
++	freopen usage into one place.
++	* copy.c (copy): Reinstate .exe magic handling when copying
++	files with implicit .exe.
++
++2008-12-13  Eric Blake  <ebb9@byu.net>
++
++	Cygwin release 7.0-1.
++
++2008-06-02  Eric Blake  <ebb9@byu.net>
++
++	Cygwin release 6.12-1.
++
++2008-05-12  Eric Blake  <ebb9@byu.net>
++
++	Cygwin release 6.11-1, requires cygwin 1.7.0.
++	* lib/cygwin.h (CYGWIN_APPEND_EXE): Accomodate new PATH_MAX.
++	* lib/cygwin.c (cygwin_spelling): Accomodate new trailing
++	`.' semantics.
++	* lib/same.c (same_name): Accomodate new PATH_MAX.
++
++2008-01-24  Eric Blake  <ebb9@byu.net>
++
++	Cygwin release 6.10-1.
++	* lib/hash-triple.c (triple_hash): Hash case-insensitively.
++	* lib/hash-pjw.h (hash_pjw_case): New interface.
++	* lib/hash-pjw.c (hash_pjw_case): New function.
++	* chcon.c (main): Support my root_dev_ino tweaks.
++
++2007-08-21  Eric Blake  <ebb9@byu.net>
++
++	Cygwin release 6.9-5.
++	* same.c (same_name): Detect same file differing only by case.
++	* copy.c (same_file_ok): Add parameter to detect when case
++	change is being attempted.
++	(triple_hash): Hash names case-insensitively.
++	(copy_internal): Accommodate case-change attempts.
++	* mv.c (do_move): Allow 'mv foo/ Foo/' as shorthand for
++	'mv -T foo/ Foo/'.
++
++2007-07-23  Eric Blake  <ebb9@byu.net>
++
++	Cygwin release 6.9-4.
++	* dd.c (main): Fix typo in earlier cygwin patch.
++
++2007-05-29  Eric Blake  <ebb9@byu.net>
++
++	Cygwin release 6.9-3.
++	* cksum.c (main): Don't lose append mode.
++	* md5sum.c (main): Likewise.
++	* cat.c (main): Likewise.
++	* head.c (main): Likewise.
++	* tac.c (main): Likewise.
++	* tail.c (main): Likewise.
++	* tee.c (main): Likewise.
++	* tr.c (main): Likewise.
++
++2006-11-24  Eric Blake  <ebb9@byu.net>
++
++	Cygwin release 6.6-2.
++	* lib/cygwin.c (cygwin_spelling): Work even with old-style
++	symlinks, which lacked .lnk suffix.
++
++2006-04-14  Eric Blake  <ebb9@byu.net>
++
++	Cygwin release 5.94-5. Experimental only, depends on cygwin
++	snapshot 20060329 or later.
++	* dd.c (main): Default to binary mode.
++	* system.h (rpl_freopen): Remove this hack, now that cygwin
++	freopen(NULL) works.
++	* lib/quotearg.c (quote_eight_bit): New variable, so I can...
++	(quotearg_buffer_restyled): treat 8-bit	characters as printable
++	when outputting to a terminal.
++	* lib/quote.c (quote_n): Use it.
++
++2006-02-28  Eric Blake  <ebb9@byu.net>
++
++	Cygwin release 5.94-4. Experimental only, depends on cygwin
++	snapshot 20060227 or later.
++	* lib/root-dev-ino.h (struct root_dev_ino): New struct.
++	(ROOT_DEV_INO_CHECK, ROOT_DEV_INO_WARN): Also track //.
++	* lib/root-dev-ino.c (get_root_dev_ino): Also track //.
++	* chmod.c (root_dev_ino): Use new type.
++	(main): Ditto.
++	* chown-core.h (struct Chown_option): Ditto.
++	* chown.c (main): Ditto.
++	* remove.h (struct rm_options): Ditto.
++	* rm.c (main): Ditto.
++	* pwd.c (robust_getcwd): Ditto.  Also fix bug when in / or //.
++
++2006-01-24  Eric Blake  <ebb9@byu.net>
++
++	Cygwin release 5.93-3, depends on cygwin-1.5.19-1 or later.
++	* cksum.c (main): Always output binary files.
++	* md5sum.c (main): Likewise.
++	* su.c (correct_password): On NT machines, attempt
++	passwordless login first, and give better error message if
++	password check fails.  I still don't know how to distinguish
++	between insufficient privileges vs. incorrect password.
++	* dircolors.c (main): Silence warning from tcsh 6.14.00.
++
++2005-10-15  Eric Blake  <ebb9@byu.net>
++
++	Cygwin release 5.90-3, depends on snapshot 20051003 or later (will
++	become cygwin 1.5.19).
++	* doc/coreutils.texi (ls invocation, stat invocation): Document
++	--append-exe.
++	* ls.c (usage): Ditto.
++	(gobble_file): Append .exe as needed when requested.
++	* stat.c (usage): Document --append-exe.
++	(do_stat, do_statfs): Append .exe as needed when requested.
++
++2005-10-08  Eric Blake  <ebb9@byu.net>
++
++	Cygwin release 5.90-2, depends on snapshot 20051003 or later (will
++	become cygwin 1.5.19).
++	* lib/mkdir-p.c (make_dir_parents): Fix bug in last patch.
++	* lib/cygwin.h (CYGWIN_APPEND_EXE): Factor into common macro.
++	* copy.c (copy): Use new macro.
++	* install.c (strip): Ditto.
++	* ln.c (do_link): Ditto.
++
++2005-07-13  Eric Blake  <ebb9@byu.net>
++
++	* doc/coreutils.texi (ln invocation): Document --disable-exe-magic.
++	* ln.c (usage): Likewise.
++	(do_link): Skip .exe magic when requested.
++
++2005-07-12  Eric Blake  <ebb9@byu.net>
++
++	* lib/cygwin.c (cygwin_spelling): Don't append .exe to directories.
++	Make sure .exe exists before returning 1, because otherwise
++	virtual directories such as /cygdrive have problems.
++
++2005-07-07  Eric Blake  <ebb9@byu.net>
++
++	* lib/cygwin.h: New file, defining cygwin_spelling.
++	* lib/cygwin.c: New file.
++	* lib/Makefile.am: Compile it.
++	* copy.c (copy_internal, copy): Use new cygwin_spelling() to
++	undo .exe magic.
++	* link.c (do_link): Likewise.
++	* install.c (strip): Likewise.
++
++2005-01-03  Corinna Vinschen  <corinna@vinschen.de>
++
++	* install.c (strip): Check for .exe here since strip doesn't.
++
++
+ 2014-07-18  Pádraig Brady  <P@draigBrady.com>
+ 
+ 	version 8.23
+--- coreutils-8.23/configure.ac	2014-07-17 18:40:57.000000000 -0700
++++ coreutils-8.23/configure.ac	2014-10-13 08:30:37.165262300 -0700
+@@ -473,7 +473,7 @@ AC_COMPILE_IFELSE(
+   [stdbuf_supported=yes],
+   [stdbuf_supported=no])
+ AC_MSG_RESULT([$stdbuf_supported])
+-if test "$stdbuf_supported" = "yes"; then
++if test "$stdbuf_supported" = "yes" && test -z "$EXEEXT"; then
+   gl_ADD_PROG([optional_bin_progs], [stdbuf])
+ fi
+ 
+--- coreutils-8.23/doc/coreutils.texi	2014-07-13 15:09:52.000000000 -0700
++++ coreutils-8.23/doc/coreutils.texi	2014-10-13 08:30:37.180881200 -0700
+@@ -7838,6 +7838,14 @@ These options change how file names them
+ 
+ @table @samp
+ 
++@item --append-exe
++@opindex --append-exe
++@cindex appending exe on cygwin
++Cygwin only: Cygwin normally performs @samp{.exe} magic, where a
++command line argument typed without an .exe extension transparently
++refers to the existing file with an extension.  Specifying this option
++will make the .exe show if cygwin magic was involved.
++
+ @item -b
+ @itemx --escape
+ @itemx --quoting-style=escape
+@@ -11799,6 +11807,14 @@ With this option, @command{stat} acts on
+ by each symbolic link argument.
+ Without it, @command{stat} acts on any symbolic link argument directly.
+ 
++@item --append-exe
++@opindex --append-exe
++@cindex appending exe on cygwin
++Cygwin only: Cygwin normally performs .exe magic, where a command line
++argument typed without an .exe extension transparently refers to the
++existing file with an extension.  Specifying this option will make
++the .exe show if cygwin magic was involved.
++
+ @item -f
+ @itemx --file-system
+ @opindex -f
+--- coreutils-8.23/lib/cygwin.c	1969-12-31 16:00:00.000000000 -0800
++++ coreutils-8.23/lib/cygwin.c	2014-10-13 08:30:37.180881200 -0700
+@@ -0,0 +1,67 @@
++/* cygwin.c - helper functions unique to Cygwin
++
++   Copyright (C) 2005, 2006, 2008, 2011 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3, or (at your option)
++   any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software Foundation,
++   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++
++   Written by Eric Blake.  */
++
++#include <config.h>
++
++#include "cygwin.h"
++
++#include <errno.h>
++#include <limits.h>
++#include <string.h>
++#include <unistd.h>
++
++/* Return -1 if PATH is not found, 0 if PATH will not have .exe
++   appended (it is possible that a PATH that does not exist still
++   returns 0 instead of -1, or fails for a PATH that exists but cannot
++   be stat'ed), and positive if PATH has ".exe" automatically appended
++   by cygwin (1 if PATH is a symlink, 2 otherwise).  Won't change errno.  */
++
++int
++cygwin_spelling (char const *path)
++{
++  int saved_errno = errno;
++  int result = 0; /* Start with assumption that PATH is okay.  */
++  int len;
++  struct stat st1;
++  struct stat st2;
++  char *path_exe;
++
++  if (! path || ! *path || len > PATH_MAX)
++    /* PATH will cause EINVAL or ENAMETOOLONG, treat it as non-existing.  */
++    return -1;
++  len = strlen (path);
++  if (path[len - 1] == '/'
++      || (len > 4 && !strcasecmp (&path[len - 4], ".exe")))
++    /* Don't change spelling if there is a trailing `/' or '.exe'.  */
++    return 0;
++  if (lstat (path, &st1) < 0 || S_ISDIR(st1.st_mode))
++    {
++      errno = saved_errno;
++      return -1;
++    }
++  path_exe = malloca (len + 5); /* adding ".exe" and NUL.  */
++  strcat (stpcpy (path_exe, path), ".exe");
++  if (lstat (path_exe, &st2) == 0 && st1.st_ino == st2.st_ino)
++    result = 1 + !S_ISLNK(st1.st_mode);
++  freea (path_exe);
++
++  errno = saved_errno;
++  return result;
++}
+--- coreutils-8.23/lib/cygwin.h	1969-12-31 16:00:00.000000000 -0800
++++ coreutils-8.23/lib/cygwin.h	2014-10-13 08:30:37.180881200 -0700
+@@ -0,0 +1,38 @@
++/* cygwin.h - helper functions unique to Cygwin
++
++   Copyright (C) 2005, 2006, 2008, 2010, 2011 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3, or (at your option)
++   any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software Foundation,
++   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++
++   Written by Eric Blake.  */
++
++#ifndef CYGWIN_H
++# define CYGWIN_H 1
++
++#include "malloca.h"
++
++int cygwin_spelling (char const *);
++
++/* Append ".exe" to char *__NAME_ORIG, where __NAME is either NULL or
++   between __NAME_ORIG and the nul terminator.  Both params will be
++   evaluated more than once and assigned the new value.  The user must
++   later call freea(__NAME).  */
++#define CYGWIN_APPEND_EXE(__name, __name_orig)                          \
++  __name_orig = __name =                                                \
++    strcat (strcpy (malloca (strchr (__name ? __name : __name_orig, '\0') \
++                             - (__name_orig) + 5),                      \
++                    __name_orig), ".exe")
++
++#endif /* CYGWIN_H */
+--- coreutils-8.23/lib/hash-pjw.c	2014-05-29 05:05:50.000000000 -0700
++++ coreutils-8.23/lib/hash-pjw.c	2014-10-13 08:30:37.180881200 -0700
+@@ -19,6 +19,7 @@
+ 
+ #include "hash-pjw.h"
+ 
++#include <ctype.h>
+ #include <limits.h>
+ 
+ #define SIZE_BITS (sizeof (size_t) * CHAR_BIT)
+@@ -38,3 +39,16 @@ hash_pjw (const void *x, size_t tablesiz
+ 
+   return h % tablesize;
+ }
++
++/* Likewise, but case-insensitive.  */
++size_t
++hash_pjw_case (const void *x, size_t tablesize)
++{
++  const unsigned char *s;
++  size_t h = 0;
++
++  for (s = x; *s; s++)
++    h = tolower (*s) + ((h << 9) | (h >> (SIZE_BITS - 9)));
++
++  return h % tablesize;
++}
+--- coreutils-8.23/lib/hash-pjw.h	2014-05-29 05:05:50.000000000 -0700
++++ coreutils-8.23/lib/hash-pjw.h	2014-10-13 08:30:37.180881200 -0700
+@@ -21,3 +21,4 @@
+    The result is platform dependent: it depends on the size of the 'size_t'
+    type and on the signedness of the 'char' type.  */
+ extern size_t hash_pjw (void const *x, size_t tablesize) _GL_ATTRIBUTE_PURE;
++extern size_t hash_pjw_case (void const *x, size_t tablesize) _GL_ATTRIBUTE_PURE;
+--- coreutils-8.23/lib/hash-triple.c	2014-05-29 05:05:50.000000000 -0700
++++ coreutils-8.23/lib/hash-triple.c	2014-10-13 08:30:37.180881200 -0700
+@@ -34,7 +34,13 @@ size_t
+ triple_hash (void const *x, size_t table_size)
+ {
+   struct F_triple const *p = x;
++#if !__CYGWIN__
+   size_t tmp = hash_pjw (p->name, table_size);
++#else // cygwin
++  /* Hash case-insensitively, to force collisions on names that differ by
++     case; copy.c can then account for case-insensitive renames. */
++  size_t tmp = hash_pjw_case (p->name, table_size);
++#endif
+ 
+   /* Ignoring the device number here should be fine.  */
+   return (tmp ^ p->st_ino) % table_size;
+--- coreutils-8.23/lib/local.mk	2013-12-04 06:48:30.000000000 -0800
++++ coreutils-8.23/lib/local.mk	2014-10-13 08:30:37.180881200 -0700
+@@ -3,3 +3,6 @@ include lib/gnulib.mk
+ # Allow "make distdir" to succeed before "make all" has run.
+ dist-hook: $(noinst_LIBRARIES)
+ .PHONY: dist-hook
++
++# Hook in cygwin helper
++lib_libcoreutils_a_SOURCES += lib/cygwin.c lib/cygwin.h
+--- coreutils-8.23/lib/root-dev-ino.c	2014-07-11 04:00:07.000000000 -0700
++++ coreutils-8.23/lib/root-dev-ino.c	2014-10-13 08:30:37.180881200 -0700
+@@ -25,13 +25,17 @@
+ /* Call lstat to get the device and inode numbers for '/'.
+    Upon failure, return NULL.  Otherwise, set the members of
+    *ROOT_D_I accordingly and return ROOT_D_I.  */
+-struct dev_ino *
+-get_root_dev_ino (struct dev_ino *root_d_i)
++struct root_dev_ino *
++get_root_dev_ino (struct root_dev_ino *root_d_i)
+ {
+   struct stat statbuf;
+   if (lstat ("/", &statbuf))
+     return NULL;
+-  root_d_i->st_ino = statbuf.st_ino;
+-  root_d_i->st_dev = statbuf.st_dev;
++  root_d_i->single_slash.st_ino = statbuf.st_ino;
++  root_d_i->single_slash.st_dev = statbuf.st_dev;
++  if (lstat ("//", &statbuf))
++    return NULL;
++  root_d_i->double_slash.st_ino = statbuf.st_ino;
++  root_d_i->double_slash.st_dev = statbuf.st_dev;
+   return root_d_i;
+ }
+--- coreutils-8.23/lib/root-dev-ino.h	2014-07-11 04:00:07.000000000 -0700
++++ coreutils-8.23/lib/root-dev-ino.h	2014-10-13 08:30:37.180881200 -0700
+@@ -21,19 +21,26 @@
+ # include "dev-ino.h"
+ # include "same-inode.h"
+ 
+-struct dev_ino *
+-get_root_dev_ino (struct dev_ino *root_d_i);
++struct root_dev_ino
++{
++  struct dev_ino single_slash;
++  struct dev_ino double_slash;
++};
++
++struct root_dev_ino *
++get_root_dev_ino (struct root_dev_ino *root_d_i);
+ 
+ /* These macros are common to the programs that support the
+    --preserve-root and --no-preserve-root options.  */
+ 
+ # define ROOT_DEV_INO_CHECK(Root_dev_ino, Dir_statbuf) \
+-    (Root_dev_ino && SAME_INODE (*Dir_statbuf, *Root_dev_ino))
++  (Root_dev_ino && (SAME_INODE (*Dir_statbuf, (Root_dev_ino)->single_slash) \
++                    || SAME_INODE (*Dir_statbuf, (Root_dev_ino)->double_slash)))
+ 
+ # define ROOT_DEV_INO_WARN(Dirname)					\
+   do									\
+     {									\
+-      if (STREQ (Dirname, "/"))						\
++      if (STREQ (Dirname, "/") || STREQ (Dirname, "//"))                \
+         error (0, 0, _("it is dangerous to operate recursively on %s"),	\
+                quote (Dirname));					\
+       else								\
+--- coreutils-8.23/lib/same.c	2014-05-29 05:05:50.000000000 -0700
++++ coreutils-8.23/lib/same.c	2014-10-13 08:30:37.180881200 -0700
+@@ -40,6 +40,13 @@
+ #include "error.h"
+ #include "same-inode.h"
+ 
++#if __CYGWIN__
++# include <sys/cygwin.h>
++# include "cygwin.h"
++# include "malloca.h"
++# include "memcasecmp.h"
++#endif
++
+ #ifndef MIN
+ # define MIN(a, b) ((a) < (b) ? (a) : (b))
+ #endif
+@@ -59,6 +66,45 @@ same_name (const char *source, const cha
+     (source_baselen == dest_baselen
+      && memcmp (source_basename, dest_basename, dest_baselen) == 0);
+   bool compare_dirs = identical_basenames;
++#if __CYGWIN__
++  /* If two names differ case-insensitively by only an '.exe' suffix,
++     do some sleuthing to see if .exe magic matters on the shorter
++     name.  Swapping the longer name to dest avoids duplication.  */
++  if (source_baselen == dest_baselen + 4)
++    {
++      char const *tmp_basename = source_basename;
++      size_t tmp_baselen = source_baselen;
++      source_basename = dest_basename;
++      source_baselen = dest_baselen;
++      dest_basename = tmp_basename;
++      dest_baselen = tmp_baselen;
++    }
++  if (source_baselen + 4 == dest_baselen
++      && !memcasecmp (dest_basename - 4, ".exe", 4)
++      && !memcasecmp (source_basename, dest_basename, source_baselen)
++      && 0 < cygwin_spelling(source))
++    dest_baselen -= 4;
++  /* Some, but not all, files are case-insensitive (depending on mount
++     options, CYGWIN=case settings, and virtual file systems).  Do
++     some sleuthing to decide whether case-insensitivity matters.  */
++  if (! compare_dirs && source_baselen == dest_baselen)
++    {
++      ssize_t wsrclen = cygwin_conv_path (CCP_POSIX_TO_WIN_W,
++                                          source, NULL, 0);
++      ssize_t wdstlen = cygwin_conv_path (CCP_POSIX_TO_WIN_W,
++                                          dest, NULL, 0);
++      char *wsrc = malloca (wsrclen);
++      char *wdst = malloca (wdstlen);
++      if (cygwin_conv_path (CCP_POSIX_TO_WIN_W, source, wsrc, wsrclen))
++        error (EXIT_FAILURE, errno, "unable to convert path name %s", source);
++      if (cygwin_conv_path (CCP_POSIX_TO_WIN_W, dest, wdst, wdstlen))
++        error (EXIT_FAILURE, errno, "unable to convert path name %s", dest);
++      if (wsrclen == wdstlen && memcasecmp (wsrc, wdst, wsrclen) == 0)
++        compare_dirs = true;
++      freea (wsrc);
++      freea (wdst);
++    }
++#endif /* __CYGWIN__ */
+   bool same = false;
+ 
+ #if ! _POSIX_NO_TRUNC && HAVE_PATHCONF && defined _PC_NAME_MAX
+--- coreutils-8.23/lib/xfreopen.c	2014-05-29 05:05:50.000000000 -0700
++++ coreutils-8.23/lib/xfreopen.c	2014-10-13 08:30:37.180881200 -0700
+@@ -18,6 +18,7 @@
+ #include "xfreopen.h"
+ 
+ #include <errno.h>
++#include <fcntl.h>
+ #include "error.h"
+ #include "exitfail.h"
+ #include "quote.h"
+@@ -26,9 +27,17 @@
+ #include "gettext.h"
+ #define _(msgid) gettext (msgid)
+ 
++#define STREQ(s1, s2) (strcmp (s1, s2) == 0)
++
+ void
+ xfreopen (char const *filename, char const *mode, FILE *fp)
+ {
++  if (!filename && STREQ (mode, "wb"))
++    {
++      int flag = fcntl (fileno (fp), F_GETFL);
++      if (0 <= flag && (flag & O_APPEND))
++        mode = "ab";
++    }
+   if (!freopen (filename, mode, fp))
+     {
+       char const *f = (filename ? filename
+--- coreutils-8.23/chcon.c	2014-07-13 15:09:52.000000000 -0700
++++ coreutils-8.23/src/chcon.c	2014-10-13 08:30:37.180881200 -0700
+@@ -48,7 +48,7 @@ static bool verbose;
+ 
+ /* Pointer to the device and inode numbers of '/', when --recursive.
+    Otherwise NULL.  */
+-static struct dev_ino *root_dev_ino;
++static struct root_dev_ino *root_dev_ino;
+ 
+ /* The name of the context file is being given. */
+ static char const *specified_context;
+@@ -569,7 +569,7 @@ main (int argc, char **argv)
+ 
+   if (recurse && preserve_root)
+     {
+-      static struct dev_ino dev_ino_buf;
++      static struct root_dev_ino dev_ino_buf;
+       root_dev_ino = get_root_dev_ino (&dev_ino_buf);
+       if (root_dev_ino == NULL)
+         error (EXIT_FAILURE, errno, _("failed to get attributes of %s"),
+--- coreutils-8.23/chgrp.c	2014-07-11 04:00:07.000000000 -0700
++++ coreutils-8.23/src/chgrp.c	2014-10-13 08:30:37.180881200 -0700
+@@ -299,7 +299,7 @@ main (int argc, char **argv)
+ 
+   if (chopt.recurse && preserve_root)
+     {
+-      static struct dev_ino dev_ino_buf;
++      static struct root_dev_ino dev_ino_buf;
+       chopt.root_dev_ino = get_root_dev_ino (&dev_ino_buf);
+       if (chopt.root_dev_ino == NULL)
+         error (EXIT_FAILURE, errno, _("failed to get attributes of %s"),
+--- coreutils-8.23/chmod.c	2014-07-11 04:00:07.000000000 -0700
++++ coreutils-8.23/src/chmod.c	2014-10-13 08:30:37.180881200 -0700
+@@ -81,7 +81,7 @@ static enum Verbosity verbosity = V_off;
+ 
+ /* Pointer to the device and inode numbers of '/', when --recursive.
+    Otherwise NULL.  */
+-static struct dev_ino *root_dev_ino;
++static struct root_dev_ino *root_dev_ino;
+ 
+ /* For long options that have no equivalent short option, use a
+    non-character as a pseudo short option, starting with CHAR_MAX + 1.  */
+@@ -552,7 +552,7 @@ main (int argc, char **argv)
+ 
+   if (recurse && preserve_root)
+     {
+-      static struct dev_ino dev_ino_buf;
++      static struct root_dev_ino dev_ino_buf;
+       root_dev_ino = get_root_dev_ino (&dev_ino_buf);
+       if (root_dev_ino == NULL)
+         error (EXIT_FAILURE, errno, _("failed to get attributes of %s"),
+--- coreutils-8.23/chown-core.h	2014-07-11 04:00:07.000000000 -0700
++++ coreutils-8.23/src/chown-core.h	2014-10-13 08:30:37.196451900 -0700
+@@ -50,7 +50,7 @@ struct Chown_option
+ 
+   /* Pointer to the device and inode numbers of '/', when --recursive.
+      Need not be freed.  Otherwise NULL.  */
+-  struct dev_ino *root_dev_ino;
++  struct root_dev_ino *root_dev_ino;
+ 
+   /* This corresponds to the --dereference (opposite of -h) option.  */
+   bool affect_symlink_referent;
+--- coreutils-8.23/chown.c	2014-07-11 04:00:07.000000000 -0700
++++ coreutils-8.23/src/chown.c	2014-10-13 08:30:37.196451900 -0700
+@@ -312,7 +312,7 @@ main (int argc, char **argv)
+ 
+   if (chopt.recurse && preserve_root)
+     {
+-      static struct dev_ino dev_ino_buf;
++      static struct root_dev_ino dev_ino_buf;
+       chopt.root_dev_ino = get_root_dev_ino (&dev_ino_buf);
+       if (chopt.root_dev_ino == NULL)
+         error (EXIT_FAILURE, errno, _("failed to get attributes of %s"),
+--- coreutils-8.23/chroot.c	2014-07-13 16:59:20.000000000 -0700
++++ coreutils-8.23/src/chroot.c	2014-10-13 08:30:37.196451900 -0700
+@@ -163,7 +163,7 @@ parse_additional_groups (char const *gro
+ static bool
+ is_root (const char* dir)
+ {
+-  struct dev_ino root_ino;
++  struct root_dev_ino root_ino;
+   if (! get_root_dev_ino (&root_ino))
+     error (EXIT_CANCELED, errno, _("failed to get attributes of %s"),
+            quote ("/"));
+@@ -173,7 +173,7 @@ is_root (const char* dir)
+     error (EXIT_CANCELED, errno, _("failed to get attributes of %s"),
+            quote (dir));
+ 
+-  return SAME_INODE (root_ino, arg_st);
++  return ROOT_DEV_INO_CHECK (&root_ino, &arg_st);
+ }
+ 
+ void
+--- coreutils-8.23/cksum.c	2014-07-11 04:00:07.000000000 -0700
++++ coreutils-8.23/src/cksum.c	2014-10-13 08:30:37.196451900 -0700
+@@ -301,6 +301,9 @@ main (int argc, char **argv)
+ 
+   have_read_stdin = false;
+ 
++  if (O_BINARY)
++    xfreopen (NULL, "wb", stdout);
++
+   if (optind == argc)
+     ok = cksum ("-", false);
+   else
+--- coreutils-8.23/copy.c	2014-07-13 15:09:52.000000000 -0700
++++ coreutils-8.23/src/copy.c	2014-10-13 08:49:30.450181800 -0700
+@@ -70,6 +70,10 @@
+ # include "verror.h"
+ #endif
+ 
++#if __CYGWIN__
++# include "cygwin.h"
++#endif
++
+ #ifndef HAVE_FCHOWN
+ # define HAVE_FCHOWN false
+ # define fchown(fd, uid, gid) (-1)
+@@ -1313,7 +1317,11 @@ close_src_desc:
+ static bool
+ same_file_ok (char const *src_name, struct stat const *src_sb,
+               char const *dst_name, struct stat const *dst_sb,
+-              const struct cp_options *x, bool *return_now, bool *unlink_src)
++              const struct cp_options *x, bool *return_now, bool *unlink_src
++#if __CYGWIN__
++	      , bool *case_change
++#endif
++	      )
+ {
+   const struct stat *src_sb_link;
+   const struct stat *dst_sb_link;
+@@ -1461,6 +1469,18 @@ same_file_ok (char const *src_name, stru
+       if (S_ISLNK (dst_sb_link->st_mode))
+         return true;
+ 
++#if __CYGWIN__
++      /* If the files have the same name, but differ in case, then let
++        rename() change the case.  */
++      if (same_link && x->move_mode && same_name (src_name, dst_name)
++         && memcmp (last_component (src_name), last_component (dst_name),
++                    base_len (src_name)) != 0)
++       {
++         *case_change = true;
++         return true;
++       }
++#endif /* __CYGWIN__ */
++
+       if (same_link
+           && 1 < dst_sb_link->st_nlink
+           && ! same_name (src_name, dst_name))
+@@ -1813,10 +1833,20 @@ copy_internal (char const *src_name, cha
+          && ! (x->move_mode || x->symbolic_link || x->hard_link
+                || x->backup_type != no_backups
+                || x->unlink_dest_before_opening));
+-      if ((use_stat
+-           ? stat (dst_name, &dst_sb)
+-           : lstat (dst_name, &dst_sb))
+-          != 0)
++      int res = (use_stat
++                 ? stat (dst_name, &dst_sb)
++                 : lstat (dst_name, &dst_sb));
++#if __CYGWIN__
++      /* stat("a") succeeds even if it was really "a.exe".  */
++      if (! res && 0 < cygwin_spelling (dst_name))
++        {
++          /* Only DST_NAME.exe exists, but we want the non-existant
++             DST_NAME.  */
++          res = -1;
++          errno = ENOENT;
++        }
++#endif /* __CYGWIN__ */
++      if (res != 0)
+         {
+           if (errno != ENOENT)
+             {
+@@ -1833,10 +1863,17 @@ copy_internal (char const *src_name, cha
+              that it is stat'able or lstat'able.  */
+           bool return_now;
+           bool unlink_src;
++#if __CYGWIN__
++          bool case_change = false;
++#endif /* __CYGWIN__ */
+ 
+           have_dst_lstat = !use_stat;
+           if (! same_file_ok (src_name, &src_sb, dst_name, &dst_sb,
+-                              x, &return_now, &unlink_src))
++                              x, &return_now, &unlink_src
++#if __CYGWIN__
++                              , &case_change
++#endif
++))
+             {
+               error (0, 0, _("%s and %s are the same file"),
+                      quote_n (0, src_name), quote_n (1, dst_name));
+@@ -1895,6 +1932,9 @@ copy_internal (char const *src_name, cha
+              cp and mv treat -i and -f differently.  */
+           if (x->move_mode)
+             {
++#if __CYGWIN__
++              if (!case_change)
++#endif /* __CYGWIN__ */
+               if (abandon_move (x, dst_name, &dst_sb)
+                   || (unlink_src && unlink (src_name) == 0))
+                 {
+@@ -2058,7 +2098,11 @@ copy_internal (char const *src_name, cha
+                    /* Never unlink dst_name when in move mode.  */
+                    && ! x->move_mode
+                    && (x->unlink_dest_before_opening
+-                       || (x->preserve_links && 1 < dst_sb.st_nlink)
++                       || (x->preserve_links && 1 < dst_sb.st_nlink
++#if __CYGWIN__
++                           && !case_change
++#endif /* __CYGWIN__ */
++			   )
+                        || (x->dereference == DEREF_NEVER
+                            && ! S_ISREG (src_sb.st_mode))
+                        ))
+@@ -2816,6 +2860,21 @@ copy (char const *src_name, char const *
+ {
+   assert (valid_options (options));
+ 
++#if __CYGWIN__
++  /* .exe magic - if src exists with an implicit .exe suffix and is
++     not a symlink, but dst does not exist and was also specified
++     without a suffix, then append .exe to dst.  */
++  int cygwin = cygwin_spelling (src_name);
++  char *p;
++  if (cygwin == 2
++      && ((p = strchr (dst_name, '\0') - 4) <= dst_name
++          || strcasecmp (p, ".exe") != 0))
++    {
++      cygwin = 3;
++      CYGWIN_APPEND_EXE (p, dst_name);
++    }
++#endif /* __CYGWIN__ */
++
+   /* Record the file names: they're used in case of error, when copying
+      a directory into itself.  I don't like to make these tools do *any*
+      extra work in the common case when that work is solely to handle
+@@ -2827,10 +2886,15 @@ copy (char const *src_name, char const *
+   top_level_dst_name = dst_name;
+ 
+   bool first_dir_created_per_command_line_arg = false;
+-  return copy_internal (src_name, dst_name, nonexistent_dst, NULL, NULL,
++  bool result = copy_internal (src_name, dst_name, nonexistent_dst, NULL, NULL,
+                         options, true,
+                         &first_dir_created_per_command_line_arg,
+                         copy_into_self, rename_succeeded);
++#if __CYGWIN__
++  if (cygwin == 3)
++    freea ((char *) dst_name);
++#endif /* __CYGWIN__ */
++  return result;
+ }
+ 
+ /* Set *X to the default options for a value of type struct cp_options.  */
+--- coreutils-8.23/dd.c	2014-07-11 04:00:07.000000000 -0700
++++ coreutils-8.23/src/dd.c	2014-10-13 08:30:37.196451900 -0700
+@@ -37,6 +37,10 @@
+ #include "xstrtol.h"
+ #include "xtime.h"
+ 
++#if __CYGWIN__
++# include <io.h>
++#endif
++
+ /* The official name of this program (e.g., no 'g' prefix).  */
+ #define PROGRAM_NAME "dd"
+ 
+@@ -1862,6 +1866,13 @@ copy_with_unblock (char const *buf, size
+ static void
+ set_fd_flags (int fd, int add_flags, char const *name)
+ {
++#if __CYGWIN__
++  /* Cygwin does not allow fcntl to set the mode.  */
++  int mode_flags = add_flags & (O_BINARY | O_TEXT);
++  add_flags &= ~(O_BINARY | O_TEXT);
++  if (mode_flags && setmode (fd, mode_flags) == -1)
++    error (EXIT_FAILURE, errno, _("setting flags for %s"), quote (name));
++#endif /* __CYGWIN__ */
+   /* Ignore file creation flags that are no-ops on file descriptors.  */
+   add_flags &= ~ (O_NOCTTY | O_NOFOLLOW);
+ 
+@@ -2242,6 +2253,8 @@ main (int argc, char **argv)
+     }
+   else
+     {
++      if ((input_flags & (O_BINARY | O_TEXT)) == 0)
++	input_flags |= O_BINARY;
+       if (fd_reopen (STDIN_FILENO, input_file, O_RDONLY | input_flags, 0) < 0)
+         error (EXIT_FAILURE, errno, _("failed to open %s"), quote (input_file));
+     }
+@@ -2264,6 +2277,8 @@ main (int argc, char **argv)
+            | (conversions_mask & C_NOCREAT ? 0 : O_CREAT)
+            | (conversions_mask & C_EXCL ? O_EXCL : 0)
+            | (seek_records || (conversions_mask & C_NOTRUNC) ? 0 : O_TRUNC));
++      if ((opts & (O_BINARY | O_TEXT)) == 0)
++        opts |= O_BINARY;
+ 
+       /* Open the output file with *read* access only if we might
+          need to read to satisfy a 'seek=' request.  If we can't read
+--- coreutils-8.23/dircolors.c	2014-07-11 04:00:07.000000000 -0700
++++ coreutils-8.23/src/dircolors.c	2014-10-13 08:30:37.196451900 -0700
+@@ -494,8 +494,12 @@ main (int argc, char **argv)
+             }
+           else
+             {
++              /* tcsh treats LS_COLORS as a magic shell variable for its
++                 builtin ls-F, but does not recognize all the categories
++                 that coreutils ls does.  Therefore, silence stderr to
++                 avoid messages like "Unknown colorls variable `su'.".  */
+               prefix = "setenv LS_COLORS '";
+-              suffix = "'\n";
++              suffix = "' >&/dev/null\n";
+             }
+           fputs (prefix, stdout);
+           fwrite (s, 1, len, stdout);
+--- coreutils-8.23/install.c	2014-07-13 15:09:52.000000000 -0700
++++ coreutils-8.23/src/install.c	2014-10-13 08:30:37.196451900 -0700
+@@ -44,6 +44,10 @@
+ #include "utimens.h"
+ #include "xstrtol.h"
+ 
++#if __CYGWIN__
++# include "cygwin.h"
++#endif
++
+ /* The official name of this program (e.g., no 'g' prefix).  */
+ #define PROGRAM_NAME "install"
+ 
+@@ -531,6 +535,16 @@ strip (char const *name)
+       error (0, errno, _("fork system call failed"));
+       break;
+     case 0:			/* Child. */
++#if __CYGWIN__
++      {
++	/* Check for .exe here, since strip doesn't.  */
++	char *p;
++	if (((p = strchr (name, '\0') - 4) <= name
++	     || strcasecmp (p, ".exe") != 0)
++	    && 0 < cygwin_spelling (name))
++          CYGWIN_APPEND_EXE (p, name);
++      }
++#endif /* __CYGWIN__ */
+       execlp (strip_program, strip_program, name, NULL);
+       error (EXIT_FAILURE, errno, _("cannot run %s"), strip_program);
+       break;
+--- coreutils-8.23/ls.c	2014-07-13 15:09:52.000000000 -0700
++++ coreutils-8.23/src/ls.c	2014-10-13 08:30:37.196451900 -0700
+@@ -117,6 +117,10 @@
+ # include <sys/capability.h>
+ #endif
+ 
++#if __CYGWIN__
++# include "cygwin.h"
++#endif
++
+ #define PROGRAM_NAME (ls_mode == LS_LS ? "ls" \
+                       : (ls_mode == LS_MULTI_COL \
+                          ? "dir" : "vdir"))
+@@ -747,6 +751,11 @@ static char const *long_time_format[2] =
+     N_("%b %e %H:%M")
+   };
+ 
++#if __CYGWIN__
++/* Whether .exe should be appended to command-line args as needed.  */
++static bool append_exe;
++#endif /* __CYGWIN__ */
++
+ /* The set of signals that are caught.  */
+ 
+ static sigset_t caught_signals;
+@@ -782,6 +791,9 @@ enum
+ enum
+ {
+   AUTHOR_OPTION = CHAR_MAX + 1,
++#if __CYGWIN__
++  APPEND_EXE_OPTION,
++#endif /* __CYGWIN__ */
+   BLOCK_SIZE_OPTION,
+   COLOR_OPTION,
+   DEREFERENCE_COMMAND_LINE_SYMLINK_TO_DIR_OPTION,
+@@ -843,6 +855,9 @@ static struct option const long_options[
+   {"block-size", required_argument, NULL, BLOCK_SIZE_OPTION},
+   {"context", no_argument, 0, 'Z'},
+   {"author", no_argument, NULL, AUTHOR_OPTION},
++#if __CYGWIN__
++  {"append-exe", no_argument, NULL, APPEND_EXE_OPTION},
++#endif /* __CYGWIN__ */
+   {GETOPT_HELP_OPTION_DECL},
+   {GETOPT_VERSION_OPTION_DECL},
+   {NULL, 0, NULL, 0}
+@@ -1954,6 +1969,12 @@ decode_switches (int argc, char **argv)
+           print_scontext = true;
+           break;
+ 
++#if __CYGWIN__
++        case APPEND_EXE_OPTION:
++          append_exe = true;
++          break;
++#endif /* __CYGWIN__ */
++
+         case_GETOPT_HELP_CHAR;
+ 
+         case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+@@ -2924,6 +2945,12 @@ gobble_file (char const *name, enum file
+   uintmax_t blocks = 0;
+   struct fileinfo *f;
+ 
++#if __CYGWIN__
++  char *name_alt = NULL;
++  if (command_line_arg && append_exe && 0 < cygwin_spelling (name))
++    CYGWIN_APPEND_EXE (name_alt, name);
++#endif /* __CYGWIN__ */
++
+   /* An inode value prior to gobble_file necessarily came from readdir,
+      which is not used for command line arguments.  */
+   assert (! command_line_arg || inode == NOT_AN_INODE_NUMBER);
+@@ -3035,11 +3062,19 @@ gobble_file (char const *name, enum file
+           file_failure (command_line_arg,
+                         _("cannot access %s"), absolute_name);
+           if (command_line_arg)
+-            return 0;
++            {
++#if __CYGWIN__
++              freea (name_alt);
++#endif /* __CYGWIN__ */
++              return 0;
++            }
+ 
+           f->name = xstrdup (name);
+           cwd_n_used++;
+ 
++#if __CYGWIN__
++          freea (name_alt);
++#endif /* __CYGWIN__ */
+           return 0;
+         }
+ 
+@@ -3223,6 +3258,9 @@ gobble_file (char const *name, enum file
+   f->name = xstrdup (name);
+   cwd_n_used++;
+ 
++#if __CYGWIN__
++  freea (name_alt);
++#endif /* __CYGWIN__ */
+   return blocks;
+ }
+ 
+@@ -4923,6 +4961,11 @@ Sort entries alphabetically if none of -
+   -Z, --context              print any security context of each file\n\
+   -1                         list one file per line\n\
+ "), stdout);
++#if __CYGWIN__
++      fputs (_("\
++      --append-exe           append .exe if cygwin magic was needed\n\
++"), stdout);
++#endif /* __CYGWIN__ */
+       fputs (HELP_OPTION_DESCRIPTION, stdout);
+       fputs (VERSION_OPTION_DESCRIPTION, stdout);
+       emit_size_note ();
+--- coreutils-8.23/md5sum.c	2014-07-11 04:00:07.000000000 -0700
++++ coreutils-8.23/src/md5sum.c	2014-10-13 08:30:37.212072800 -0700
+@@ -813,6 +813,9 @@ main (int argc, char **argv)
+   if (optind == argc)
+     argv[argc++] = bad_cast ("-");
+ 
++  if (O_BINARY)
++    xfreopen (NULL, "wb", stdout);
++
+   for (; optind < argc; ++optind)
+     {
+       char *file = argv[optind];
+--- coreutils-8.23/mv.c	2014-07-11 04:00:07.000000000 -0700
++++ coreutils-8.23/src/mv.c	2014-10-13 08:30:37.212072800 -0700
+@@ -92,7 +92,7 @@ rm_option_init (struct rm_options *x)
+   x->require_restore_cwd = true;
+ 
+   {
+-    static struct dev_ino dev_ino_buf;
++    static struct root_dev_ino dev_ino_buf;
+     x->root_dev_ino = get_root_dev_ino (&dev_ino_buf);
+     if (x->root_dev_ino == NULL)
+       error (EXIT_FAILURE, errno, _("failed to get attributes of %s"),
+@@ -467,6 +467,16 @@ main (int argc, char **argv)
+   else if (!target_directory)
+     {
+       assert (2 <= n_files);
++#if __CYGWIN__
++      struct stat s1, s2;
++      if (2 == n_files
++	  && lstat (file[0], &s1) == 0 && lstat (file[1], &s2) == 0
++	  && s1.st_ino == s2.st_ino)
++	{
++	  /* Allow 'mv foo Foo' to change case of the directory foo.  */
++	}
++      else
++#endif /* __CYGWIN__ */
+       if (target_directory_operand (file[n_files - 1]))
+         target_directory = file[--n_files];
+       else if (2 < n_files)
+--- coreutils-8.23/pwd.c	2014-07-13 15:09:52.000000000 -0700
++++ coreutils-8.23/src/pwd.c	2014-10-13 08:30:37.212072800 -0700
+@@ -268,8 +268,8 @@ static void
+ robust_getcwd (struct file_name *file_name)
+ {
+   size_t height = 1;
+-  struct dev_ino dev_ino_buf;
+-  struct dev_ino *root_dev_ino = get_root_dev_ino (&dev_ino_buf);
++  struct root_dev_ino dev_ino_buf;
++  struct root_dev_ino *root_dev_ino = get_root_dev_ino (&dev_ino_buf);
+   struct stat dot_sb;
+ 
+   if (root_dev_ino == NULL)
+@@ -282,7 +282,7 @@ robust_getcwd (struct file_name *file_na
+   while (1)
+     {
+       /* If we've reached the root, we're done.  */
+-      if (SAME_INODE (dot_sb, *root_dev_ino))
++      if (ROOT_DEV_INO_CHECK (root_dev_ino, &dot_sb))
+         break;
+ 
+       find_dir_entry (&dot_sb, file_name, height++);
+@@ -291,6 +291,9 @@ robust_getcwd (struct file_name *file_na
+   /* See if a leading slash is needed; file_name_prepend adds one.  */
+   if (file_name->start[0] == '\0')
+     file_name_prepend (file_name, "", 0);
++  /* If we aren't in `/', we must be in `//'.  */
++  if (! SAME_INODE (root_dev_ino->single_slash, dot_sb))
++    file_name_prepend (file_name, "", 0);
+ }
+ 
+ 
+--- coreutils-8.23/remove.h	2014-07-11 04:00:07.000000000 -0700
++++ coreutils-8.23/src/remove.h	2014-10-13 08:30:37.212072800 -0700
+@@ -54,7 +54,7 @@ struct rm_options
+ 
+   /* Pointer to the device and inode numbers of '/', when --recursive
+      and preserving '/'.  Otherwise NULL.  */
+-  struct dev_ino *root_dev_ino;
++  struct root_dev_ino *root_dev_ino;
+ 
+   /* If nonzero, stdin is a tty.  */
+   bool stdin_tty;
+--- coreutils-8.23/rm.c	2014-07-11 04:00:07.000000000 -0700
++++ coreutils-8.23/src/rm.c	2014-10-13 08:30:37.212072800 -0700
+@@ -325,7 +325,7 @@ main (int argc, char **argv)
+ 
+   if (x.recursive && preserve_root)
+     {
+-      static struct dev_ino dev_ino_buf;
++      static struct root_dev_ino dev_ino_buf;
+       x.root_dev_ino = get_root_dev_ino (&dev_ino_buf);
+       if (x.root_dev_ino == NULL)
+         error (EXIT_FAILURE, errno, _("failed to get attributes of %s"),
+--- coreutils-8.23/stat.c	2014-07-11 04:00:07.000000000 -0700
++++ coreutils-8.23/src/stat.c	2014-10-13 08:30:37.212072800 -0700
+@@ -73,6 +73,13 @@
+ #include "find-mount-point.h"
+ #include "xvasprintf.h"
+ 
++#if __CYGWIN__
++# include "cygwin.h"
++/* Whether .exe should be appended to command-line args as needed.  */
++static bool append_exe;
++# define APPEND_EXE_OPTION 10000
++#endif
++
+ #if USE_STATVFS
+ # define STRUCT_STATVFS struct statvfs
+ # define STRUCT_STATXFS_F_FSID_IS_INTEGER STRUCT_STATVFS_F_FSID_IS_INTEGER
+@@ -189,6 +196,9 @@ static struct option const long_options[
+   {"format", required_argument, NULL, 'c'},
+   {"printf", required_argument, NULL, PRINTF_OPTION},
+   {"terse", no_argument, NULL, 't'},
++#if __CYGWIN__
++  {"append-exe", no_argument, NULL, APPEND_EXE_OPTION},
++#endif /* __CYGWIN__ */
+   {GETOPT_HELP_OPTION_DECL},
+   {GETOPT_VERSION_OPTION_DECL},
+   {NULL, 0, NULL, 0}
+@@ -1264,14 +1274,26 @@ do_statfs (char const *filename, char co
+       return false;
+     }
+ 
++#if __CYGWIN__
++  char *name_alt = NULL;
++  if (append_exe && 0 < cygwin_spelling (filename))
++    CYGWIN_APPEND_EXE (name_alt, filename);
++#endif /* __CYGWIN__ */
++
+   if (STATFS (filename, &statfsbuf) != 0)
+     {
+       error (0, errno, _("cannot read file system information for %s"),
+              quote (filename));
++#if __CYGWIN__
++      freea (name_alt);
++#endif /* __CYGWIN__ */
+       return false;
+     }
+ 
+   bool fail = print_it (format, -1, filename, print_statfs, &statfsbuf);
++#if __CYGWIN__
++  freea (name_alt);
++#endif /* __CYGWIN__ */
+   return ! fail;
+ }
+ 
+@@ -1282,6 +1304,7 @@ do_stat (char const *filename, char cons
+ {
+   int fd = STREQ (filename, "-") ? 0 : -1;
+   struct stat statbuf;
++  char *name_alt = NULL;
+ 
+   if (0 <= fd)
+     {
+@@ -1294,18 +1317,29 @@ do_stat (char const *filename, char cons
+   /* We can't use the shorter
+      (follow_links?stat:lstat) (filename, &statbug)
+      since stat might be a function-like macro.  */
+-  else if ((follow_links
+-            ? stat (filename, &statbuf)
+-            : lstat (filename, &statbuf)) != 0)
++  else
+     {
+-      error (0, errno, _("cannot stat %s"), quote (filename));
+-      return false;
++      if ((follow_links
++	   ? stat (filename, &statbuf)
++	   : lstat (filename, &statbuf)) != 0)
++	{
++	  error (0, errno, _("cannot stat %s"), quote (filename));
++	  return false;
++	}
++
++#if __CYGWIN__
++      if (append_exe && 0 < cygwin_spelling (filename))
++        CYGWIN_APPEND_EXE (name_alt, filename);
++#endif /* __CYGWIN__ */
+     }
+ 
+   if (S_ISBLK (statbuf.st_mode) || S_ISCHR (statbuf.st_mode))
+     format = format2;
+ 
+   bool fail = print_it (format, fd, filename, print_stat, &statbuf);
++#if __CYGWIN__
++  freea (name_alt);
++#endif /* __CYGWIN__ */
+   return ! fail;
+ }
+ 
+@@ -1427,6 +1461,11 @@ Display file or file system status.\n\
+                           if you want a newline, include \\n in FORMAT\n\
+   -t, --terse           print the information in terse form\n\
+ "), stdout);
++#if __CYGWIN__
++      fputs (_("\
++      --append-exe      append .exe if cygwin magic was needed\n\
++"), stdout);
++#endif /* __CYGWIN__ */
+       fputs (HELP_OPTION_DESCRIPTION, stdout);
+       fputs (VERSION_OPTION_DESCRIPTION, stdout);
+ 
+@@ -1547,6 +1586,12 @@ main (int argc, char *argv[])
+           terse = true;
+           break;
+ 
++#if __CYGWIN__
++        case APPEND_EXE_OPTION:
++          append_exe = true;
++          break;
++#endif /* __CYGWIN__ */
++
+         case_GETOPT_HELP_CHAR;
+ 
+         case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 1dc5bfaccfb..f8dda538fd7 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, perl, gmp ? null
 , aclSupport ? false, acl ? null
 , selinuxSupport? false, libselinux ? null, libsepol ? null
+, autoconf, automake114x
 }:
 
 assert aclSupport -> acl != null;
@@ -18,6 +19,8 @@ let
       sha256 = "0bdq6yggyl7nkc2pbl6pxhhyx15nyqhz3ds6rfn448n6rxdwlhzc";
     };
 
+    patches = if stdenv.isCygwin then [ ./coreutils-8.23-4.cygwin.patch ] else null;
+
     # The test tends to fail on btrfs and maybe other unusual filesystems.
     postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
       sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh
@@ -26,6 +29,7 @@ let
     nativeBuildInputs = [ perl ];
     buildInputs = [ gmp ]
       ++ optional aclSupport acl
+      ++ optionals stdenv.isCygwin [ autoconf automake114x ]   # due to patch
       ++ optionals selinuxSupport [ libselinux libsepol ];
 
     crossAttrs = {
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index eb8c026ab0f..188b573efec 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
     configureFlags = [ "gl_cv_func_wcwidth_works=yes" ];
   };
 
+  preConfigure = if stdenv.isCygwin then ''
+    sed -i gnulib/lib/fpending.h -e '/include <stdio_ext.h>/d'
+  '' else null;
+
   meta = {
     homepage = http://www.gnu.org/software/findutils/;
     description = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system";

From 6756d7cdf897aa038972a302957522fe5f596d64 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 23 Oct 2014 20:10:49 +0200
Subject: [PATCH 0333/2322] cygwin: gzip fpending

---
 pkgs/tools/compression/gzip/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index 44b121117ad..6772e21cb0c 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  preConfigure = if stdenv.isCygwin then ''
+    sed -i lib/fpending.h -e 's,include <stdio_ext.h>,,'
+  '' else null;
+
   # In stdenv-linux, prevent a dependency on bootstrap-tools.
   makeFlags = "SHELL=/bin/sh GREP=grep";
 

From 3961eb8a6cae5391d0c1648b35ba301bd03fc77e Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 16 Oct 2014 02:52:47 +0200
Subject: [PATCH 0334/2322] cygwin: gnutar fpending

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

diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 8c48417a819..00be3967768 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
   # cannot be used as a login shell for now.
   FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux" || stdenv.isSunOS) "1";
 
+  preConfigure = if stdenv.isCygwin then ''
+    sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
+  '' else null;
+
   meta = {
     homepage = http://www.gnu.org/software/tar/;
     description = "GNU implementation of the `tar' archiver";

From 387ad260c0aeb3b50497c665765fbd67168100d9 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 23 Oct 2014 20:10:12 +0200
Subject: [PATCH 0335/2322] cygwin: cpio fpending

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

diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix
index 6a61ded4b19..2cd65391216 100644
--- a/pkgs/tools/archivers/cpio/default.nix
+++ b/pkgs/tools/archivers/cpio/default.nix
@@ -27,6 +27,10 @@ stdenv.mkDerivation {
     # one "<" and one "&" sign get mangled in the patch
     in "cat ${pp} | sed 's/&lt;/</;s/&amp;/\\&/' | patch -p1";
 
+  preConfigure = if stdenv.isCygwin then ''
+    sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
+  '' else null;
+
   meta = {
     homepage = http://www.gnu.org/software/cpio/;
     description = "A program to create or extract from cpio archives";

From 447adb305fa00a1ab64ba5d51ed31ce914cfc833 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 23 Oct 2014 20:03:22 +0200
Subject: [PATCH 0336/2322] cygwin: mysql patches

---
 pkgs/servers/sql/mysql/5.5.17-cygwin.patch    | 44 +++++++++++++++++++
 .../sql/mysql/5.5.17-export-symbols.patch     | 22 ++++++++++
 pkgs/servers/sql/mysql/5.5.x.nix              |  5 +++
 3 files changed, 71 insertions(+)
 create mode 100644 pkgs/servers/sql/mysql/5.5.17-cygwin.patch
 create mode 100644 pkgs/servers/sql/mysql/5.5.17-export-symbols.patch

diff --git a/pkgs/servers/sql/mysql/5.5.17-cygwin.patch b/pkgs/servers/sql/mysql/5.5.17-cygwin.patch
new file mode 100644
index 00000000000..f5178cd3f39
--- /dev/null
+++ b/pkgs/servers/sql/mysql/5.5.17-cygwin.patch
@@ -0,0 +1,44 @@
+--- mysql-5.5.17/cmake/install_macros.cmake	2011-10-12 07:10:24.000000000 -0500
++++ mysql-5.5.17/cmake/install_macros.cmake	2011-11-07 23:19:35.772837800 -0600
+@@ -230,7 +230,13 @@ FUNCTION(MYSQL_INSTALL_TARGETS)
+   IF(ARG_COMPONENT)
+     SET(COMP COMPONENT ${ARG_COMPONENT})
+   ENDIF()
+-  INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP})
++  IF(${ARG_DESTINATION} STREQUAL "${INSTALL_LIBDIR}")
++    INSTALL(TARGETS ${TARGETS} LIBRARY DESTINATION ${ARG_DESTINATION}
++                               RUNTIME DESTINATION bin
++                               ARCHIVE DESTINATION ${ARG_DESTINATION} ${COMP})
++  ELSE()
++    INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP})
++  ENDIF()
+   SET(INSTALL_LOCATION ${ARG_DESTINATION} )
+   INSTALL_DEBUG_SYMBOLS("${TARGETS}")
+   SET(INSTALL_LOCATION)
+--- mysql-5.5.17/libmysql/CMakeLists.txt	2011-10-12 07:10:24.000000000 -0500
++++ mysql-5.5.17/libmysql/CMakeLists.txt	2011-11-08 03:19:31.379219300 -0600
+@@ -214,6 +214,7 @@ IF(NOT DISABLE_SHARED)
+     SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+ 
++    IF(NOT CYGWIN)
+     # Install links to libmysqlclient.so (client_r)
+     GET_VERSIONED_LIBNAME(
+       "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r"
+@@ -231,5 +232,6 @@ IF(NOT DISABLE_SHARED)
+         linkname)
+       INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries)
+     ENDFOREACH()
++    ENDIF(NOT CYGWIN)
+   ENDIF()
+ ENDIF()
+--- mysql-5.5.17/strings/dtoa.c	2011-10-12 07:10:25.000000000 -0500
++++ mysql-5.5.17/strings/dtoa.c	2011-11-07 20:38:05.064690100 -0600
+@@ -36,6 +36,7 @@
+ 
+  ***************************************************************/
+ 
++#define __STRICT_ANSI__
+ #include <my_base.h> /* for EOVERFLOW on Windows */
+ #include <my_global.h>
+ #include <m_string.h>  /* for memcpy and NOT_FIXED_DEC */
diff --git a/pkgs/servers/sql/mysql/5.5.17-export-symbols.patch b/pkgs/servers/sql/mysql/5.5.17-export-symbols.patch
new file mode 100644
index 00000000000..edc93c44dfe
--- /dev/null
+++ b/pkgs/servers/sql/mysql/5.5.17-export-symbols.patch
@@ -0,0 +1,22 @@
+--- mysql-5.5.17/libmysql/CMakeLists.txt	2011-10-12 07:10:24.000000000 -0500
++++ mysql-5.5.17/libmysql/CMakeLists.txt	2011-11-08 03:19:31.379219300 -0600
+@@ -25,6 +25,11 @@ INCLUDE_DIRECTORIES(
+ ADD_DEFINITIONS(${SSL_DEFINES})
+ 
+ SET(CLIENT_API_FUNCTIONS
++dynstr_free
++dynstr_append_mem
++dynstr_append_os_quoted
++dynstr_realloc
++init_dynamic_string
+ get_tty_password
+ handle_options
+ load_defaults
+@@ -131,6 +136,7 @@ mysql_server_end
+ mysql_set_character_set
+ mysql_get_character_set_info
+ mysql_stmt_next_result
++strfill
+ 
+ CACHE INTERNAL "Functions exported by client API"
+ 
diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index d25882b826e..778e2f58eb7 100644
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "0jn7py2wsq78rwi7vfihxs6z3h5hr338b9g46fl3z2g4ddki4yw8";
   };
 
+  patches = if stdenv.isCygwin then [
+    ./5.5.17-cygwin.patch
+    ./5.5.17-export-symbols.patch
+  ] else null;
+
   preConfigure = stdenv.lib.optional stdenv.isDarwin ''
     ln -s /bin/ps $TMPDIR/ps
     export PATH=$PATH:$TMPDIR

From feef088b396197a323d299417c2613777008a5f4 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 23 Oct 2014 20:09:09 +0200
Subject: [PATCH 0337/2322] cygwin: readline bash_cv_func_sigsetjmp=missing

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

diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix
index 93e24ed0c03..f770fabb35d 100644
--- a/pkgs/development/libraries/readline/6.3.nix
+++ b/pkgs/development/libraries/readline/6.3.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
 
   # Don't run the native `strip' when cross-compiling.
   dontStrip = stdenv ? cross;
+  bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null;
 
   meta = with stdenv.lib; {
     description = "Library for interactive line editing";

From d917f8c7c9fdd4b3679ebc7c9aeed6d176d4f712 Mon Sep 17 00:00:00 2001
From: Marko Durkovic <marko@miding.de>
Date: Fri, 24 Oct 2014 00:48:06 +0200
Subject: [PATCH 0338/2322] cygwin: w3m

---
 .../networking/browsers/w3m/cygwin.patch      | 1710 +++++++++++++++++
 .../networking/browsers/w3m/default.nix       |    3 +-
 2 files changed, 1712 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/browsers/w3m/cygwin.patch

diff --git a/pkgs/applications/networking/browsers/w3m/cygwin.patch b/pkgs/applications/networking/browsers/w3m/cygwin.patch
new file mode 100644
index 00000000000..767cc289b5f
--- /dev/null
+++ b/pkgs/applications/networking/browsers/w3m/cygwin.patch
@@ -0,0 +1,1710 @@
+diff -ur w3m-0.5.3/config.guess new/w3m-0.5.3/config.guess
+--- w3m-0.5.3/config.guess	2004-08-04 13:32:27.000000000 -0400
++++ w3m-0.5.3/config.guess	2013-04-28 18:43:59.480227700 -0400
+@@ -1,13 +1,14 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++#   2011, 2012, 2013 Free Software Foundation, Inc.
+ 
+-timestamp='2004-03-12'
++timestamp='2012-12-29'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
++# the Free Software Foundation; either version 3 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful, but
+@@ -16,24 +17,22 @@
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-# Originally written by Per Bothner <per@bothner.com>.
+-# Please send patches to <config-patches@gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# the same distribution terms that you use for the rest of that
++# program.  This Exception is an additional permission under section 7
++# of the GNU General Public License, version 3 ("GPLv3").
++#
++# Originally written by Per Bothner. 
+ #
+-# This script attempts to guess a canonical system name similar to
+-# config.sub.  If it succeeds, it prints the system name on stdout, and
+-# exits with 0.  Otherwise, it exits with 1.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# Please send patches with a ChangeLog entry to config-patches@gnu.org.
++
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+@@ -53,8 +52,9 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+-Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
++2012, 2013 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -66,11 +66,11 @@
+ while test $# -gt 0 ; do
+   case $1 in
+     --time-stamp | --time* | -t )
+-       echo "$timestamp" ; exit 0 ;;
++       echo "$timestamp" ; exit ;;
+     --version | -v )
+-       echo "$version" ; exit 0 ;;
++       echo "$version" ; exit ;;
+     --help | --h* | -h )
+-       echo "$usage"; exit 0 ;;
++       echo "$usage"; exit ;;
+     -- )     # Stop option processing
+        shift; break ;;
+     - )	# Use stdin as input.
+@@ -104,7 +104,7 @@
+ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+ : ${TMPDIR=/tmp} ;
+- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+@@ -123,7 +123,7 @@
+ 	;;
+  ,,*)   CC_FOR_BUILD=$CC ;;
+  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+-esac ;'
++esac ; set_cc_for_build= ;'
+ 
+ # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+ # (ghazi@noc.rutgers.edu 1994-08-24)
+@@ -141,7 +141,7 @@
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+     *:NetBSD:*:*)
+ 	# NetBSD (nbsd) targets should (where applicable) match one or
+-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+ 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+ 	# switched to ELF, *-*-netbsd* would select the old
+ 	# object file format.  This provides both forward
+@@ -158,6 +158,7 @@
+ 	    arm*) machine=arm-unknown ;;
+ 	    sh3el) machine=shl-unknown ;;
+ 	    sh3eb) machine=sh-unknown ;;
++	    sh5el) machine=sh5le-unknown ;;
+ 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ 	esac
+ 	# The Operating System including object format, if it has switched
+@@ -166,7 +167,7 @@
+ 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ 		eval $set_cc_for_build
+ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+-			| grep __ELF__ >/dev/null
++			| grep -q __ELF__
+ 		then
+ 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ 		    # Return netbsd for either.  FIX?
+@@ -176,7 +177,7 @@
+ 		fi
+ 		;;
+ 	    *)
+-	        os=netbsd
++		os=netbsd
+ 		;;
+ 	esac
+ 	# The OS release
+@@ -196,71 +197,34 @@
+ 	# contains redundant information, the shorter form:
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ 	echo "${machine}-${os}${release}"
+-	exit 0 ;;
+-    amd64:OpenBSD:*:*)
+-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    amiga:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    arc:OpenBSD:*:*)
+-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    cats:OpenBSD:*:*)
+-	echo arm-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    hp300:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mac68k:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    macppc:OpenBSD:*:*)
+-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mvme68k:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mvme88k:OpenBSD:*:*)
+-	echo m88k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mvmeppc:OpenBSD:*:*)
+-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    pegasos:OpenBSD:*:*)
+-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    pmax:OpenBSD:*:*)
+-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    sgi:OpenBSD:*:*)
+-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    sun3:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    wgrisc:OpenBSD:*:*)
+-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
++    *:Bitrig:*:*)
++	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
++	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++	exit ;;
+     *:OpenBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
++	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
++	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
++	exit ;;
+     *:ekkoBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
++    *:SolidBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++	exit ;;
+     macppc:MirBSD:*:*)
+-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+-	exit 0 ;;
++	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
++	exit ;;
+     *:MirBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     alpha:OSF1:*:*)
+ 	case $UNAME_RELEASE in
+ 	*4.0)
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ 		;;
+ 	*5.*)
+-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ 		;;
+ 	esac
+ 	# According to Compaq, /usr/sbin/psrinfo has been available on
+@@ -306,40 +270,46 @@
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
+ 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+-	exit 0 ;;
+-    Alpha*:OpenVMS:*:*)
+-	echo alpha-hp-vms
+-	exit 0 ;;
++	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
++	exitcode=$?
++	trap '' 0
++	exit $exitcode ;;
+     Alpha\ *:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# Should we change UNAME_MACHINE based on the output of uname instead
+ 	# of the specific Alpha model?
+ 	echo alpha-pc-interix
+-	exit 0 ;;
++	exit ;;
+     21064:Windows_NT:50:3)
+ 	echo alpha-dec-winnt3.5
+-	exit 0 ;;
++	exit ;;
+     Amiga*:UNIX_System_V:4.0:*)
+ 	echo m68k-unknown-sysv4
+-	exit 0;;
++	exit ;;
+     *:[Aa]miga[Oo][Ss]:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-amigaos
+-	exit 0 ;;
++	exit ;;
+     *:[Mm]orph[Oo][Ss]:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-morphos
+-	exit 0 ;;
++	exit ;;
+     *:OS/390:*:*)
+ 	echo i370-ibm-openedition
+-	exit 0 ;;
++	exit ;;
++    *:z/VM:*:*)
++	echo s390-ibm-zvmoe
++	exit ;;
+     *:OS400:*:*)
+-        echo powerpc-ibm-os400
+-	exit 0 ;;
++	echo powerpc-ibm-os400
++	exit ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+-	exit 0;;
++	exit ;;
++    arm*:riscos:*:*|arm*:RISCOS:*:*)
++	echo arm-unknown-riscos
++	exit ;;
+     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ 	echo hppa1.1-hitachi-hiuxmpp
+-	exit 0;;
++	exit ;;
+     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+@@ -347,32 +317,51 @@
+ 	else
+ 		echo pyramid-pyramid-bsd
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     NILE*:*:*:dcosx)
+ 	echo pyramid-pyramid-svr4
+-	exit 0 ;;
++	exit ;;
+     DRS?6000:unix:4.0:6*)
+ 	echo sparc-icl-nx6
+-	exit 0 ;;
+-    DRS?6000:UNIX_SV:4.2*:7*)
++	exit ;;
++    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+ 	case `/usr/bin/uname -p` in
+-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
++	    sparc) echo sparc-icl-nx7; exit ;;
+ 	esac ;;
++    s390x:SunOS:*:*)
++	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
+     sun4H:SunOS:5.*:*)
+ 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+-	exit 0 ;;
++	exit ;;
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+-	exit 0 ;;
+-    i86pc:SunOS:5.*:*)
+-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+-	exit 0 ;;
++	exit ;;
++    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++	echo i386-pc-auroraux${UNAME_RELEASE}
++	exit ;;
++    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
++	eval $set_cc_for_build
++	SUN_ARCH="i386"
++	# If there is a compiler, see if it is configured for 64-bit objects.
++	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
++	# This test works for both compilers.
++	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
++		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		grep IS_64BIT_ARCH >/dev/null
++	    then
++		SUN_ARCH="x86_64"
++	    fi
++	fi
++	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
+     sun4*:SunOS:6*:*)
+ 	# According to config.sub, this is the proper way to canonicalize
+ 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+ 	# it's likely to be more like Solaris than SunOS4.
+ 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+-	exit 0 ;;
++	exit ;;
+     sun4*:SunOS:*:*)
+ 	case "`/usr/bin/arch -k`" in
+ 	    Series*|S4*)
+@@ -381,10 +370,10 @@
+ 	esac
+ 	# Japanese Language versions have a version number like `4.1.3-JL'.
+ 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+-	exit 0 ;;
++	exit ;;
+     sun3*:SunOS:*:*)
+ 	echo m68k-sun-sunos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     sun*:*:4.2BSD:*)
+ 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+@@ -396,10 +385,10 @@
+ 		echo sparc-sun-sunos${UNAME_RELEASE}
+ 		;;
+ 	esac
+-	exit 0 ;;
++	exit ;;
+     aushp:SunOS:*:*)
+ 	echo sparc-auspex-sunos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     # The situation for MiNT is a little confusing.  The machine name
+     # can be virtually everything (everything which is not
+     # "atarist" or "atariste" at least should have a processor
+@@ -409,41 +398,41 @@
+     # MiNT.  But MiNT is downward compatible to TOS, so this should
+     # be no problem.
+     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+-        echo m68k-atari-mint${UNAME_RELEASE}
+-	exit 0 ;;
++	echo m68k-atari-mint${UNAME_RELEASE}
++	exit ;;
+     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ 	echo m68k-atari-mint${UNAME_RELEASE}
+-        exit 0 ;;
++	exit ;;
+     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+-        echo m68k-atari-mint${UNAME_RELEASE}
+-	exit 0 ;;
++	echo m68k-atari-mint${UNAME_RELEASE}
++	exit ;;
+     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+-        echo m68k-milan-mint${UNAME_RELEASE}
+-        exit 0 ;;
++	echo m68k-milan-mint${UNAME_RELEASE}
++	exit ;;
+     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+-        echo m68k-hades-mint${UNAME_RELEASE}
+-        exit 0 ;;
++	echo m68k-hades-mint${UNAME_RELEASE}
++	exit ;;
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+-        echo m68k-unknown-mint${UNAME_RELEASE}
+-        exit 0 ;;
++	echo m68k-unknown-mint${UNAME_RELEASE}
++	exit ;;
+     m68k:machten:*:*)
+ 	echo m68k-apple-machten${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     RISC*:Mach:*:*)
+ 	echo mips-dec-mach_bsd4.3
+-	exit 0 ;;
++	exit ;;
+     RISC*:ULTRIX:*:*)
+ 	echo mips-dec-ultrix${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     VAX*:ULTRIX*:*:*)
+ 	echo vax-dec-ultrix${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     2020:CLIX:*:* | 2430:CLIX:*:*)
+ 	echo clipper-intergraph-clix${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     mips:*:*:UMIPS | mips:*:*:RISCos)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+@@ -467,35 +456,36 @@
+ 	  exit (-1);
+ 	}
+ EOF
+-	$CC_FOR_BUILD -o $dummy $dummy.c \
+-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+-	  && exit 0
++	$CC_FOR_BUILD -o $dummy $dummy.c &&
++	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
++	  SYSTEM_NAME=`$dummy $dummyarg` &&
++	    { echo "$SYSTEM_NAME"; exit; }
+ 	echo mips-mips-riscos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     Motorola:PowerMAX_OS:*:*)
+ 	echo powerpc-motorola-powermax
+-	exit 0 ;;
++	exit ;;
+     Motorola:*:4.3:PL8-*)
+ 	echo powerpc-harris-powermax
+-	exit 0 ;;
++	exit ;;
+     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ 	echo powerpc-harris-powermax
+-	exit 0 ;;
++	exit ;;
+     Night_Hawk:Power_UNIX:*:*)
+ 	echo powerpc-harris-powerunix
+-	exit 0 ;;
++	exit ;;
+     m88k:CX/UX:7*:*)
+ 	echo m88k-harris-cxux7
+-	exit 0 ;;
++	exit ;;
+     m88k:*:4*:R4*)
+ 	echo m88k-motorola-sysv4
+-	exit 0 ;;
++	exit ;;
+     m88k:*:3*:R3*)
+ 	echo m88k-motorola-sysv3
+-	exit 0 ;;
++	exit ;;
+     AViiON:dgux:*:*)
+-        # DG/UX returns AViiON for all architectures
+-        UNAME_PROCESSOR=`/usr/bin/uname -p`
++	# DG/UX returns AViiON for all architectures
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
+ 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ 	then
+ 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+@@ -508,29 +498,29 @@
+ 	else
+ 	    echo i586-dg-dgux${UNAME_RELEASE}
+ 	fi
+- 	exit 0 ;;
++	exit ;;
+     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+ 	echo m88k-dolphin-sysv3
+-	exit 0 ;;
++	exit ;;
+     M88*:*:R3*:*)
+ 	# Delta 88k system running SVR3
+ 	echo m88k-motorola-sysv3
+-	exit 0 ;;
++	exit ;;
+     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+ 	echo m88k-tektronix-sysv3
+-	exit 0 ;;
++	exit ;;
+     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+ 	echo m68k-tektronix-bsd
+-	exit 0 ;;
++	exit ;;
+     *:IRIX*:*:*)
+ 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+-	exit 0 ;;
++	exit ;;
+     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
++	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
++	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+     i*86:AIX:*:*)
+ 	echo i386-ibm-aix
+-	exit 0 ;;
++	exit ;;
+     ia64:AIX:*:*)
+ 	if [ -x /usr/bin/oslevel ] ; then
+ 		IBM_REV=`/usr/bin/oslevel`
+@@ -538,7 +528,7 @@
+ 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ 	fi
+ 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+-	exit 0 ;;
++	exit ;;
+     *:AIX:2:3)
+ 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		eval $set_cc_for_build
+@@ -553,15 +543,19 @@
+ 			exit(0);
+ 			}
+ EOF
+-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+-		echo rs6000-ibm-aix3.2.5
++		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
++		then
++			echo "$SYSTEM_NAME"
++		else
++			echo rs6000-ibm-aix3.2.5
++		fi
+ 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		echo rs6000-ibm-aix3.2.4
+ 	else
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+-	exit 0 ;;
+-    *:AIX:*:[45])
++	exit ;;
++    *:AIX:*:[4567])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+@@ -574,28 +568,28 @@
+ 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ 	fi
+ 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+-	exit 0 ;;
++	exit ;;
+     *:AIX:*:*)
+ 	echo rs6000-ibm-aix
+-	exit 0 ;;
++	exit ;;
+     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ 	echo romp-ibm-bsd4.4
+-	exit 0 ;;
++	exit ;;
+     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+ 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+-	exit 0 ;;                           # report: romp-ibm BSD 4.3
++	exit ;;                             # report: romp-ibm BSD 4.3
+     *:BOSX:*:*)
+ 	echo rs6000-bull-bosx
+-	exit 0 ;;
++	exit ;;
+     DPX/2?00:B.O.S.:*:*)
+ 	echo m68k-bull-sysv3
+-	exit 0 ;;
++	exit ;;
+     9000/[34]??:4.3bsd:1.*:*)
+ 	echo m68k-hp-bsd
+-	exit 0 ;;
++	exit ;;
+     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ 	echo m68k-hp-bsd4.4
+-	exit 0 ;;
++	exit ;;
+     9000/[34678]??:HP-UX:*:*)
+ 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	case "${UNAME_MACHINE}" in
+@@ -604,52 +598,52 @@
+ 	    9000/[678][0-9][0-9])
+ 		if [ -x /usr/bin/getconf ]; then
+ 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+-                    case "${sc_cpu_version}" in
+-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+-                      532)                      # CPU_PA_RISC2_0
+-                        case "${sc_kernel_bits}" in
+-                          32) HP_ARCH="hppa2.0n" ;;
+-                          64) HP_ARCH="hppa2.0w" ;;
++		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++		    case "${sc_cpu_version}" in
++		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++		      532)                      # CPU_PA_RISC2_0
++			case "${sc_kernel_bits}" in
++			  32) HP_ARCH="hppa2.0n" ;;
++			  64) HP_ARCH="hppa2.0w" ;;
+ 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+-                        esac ;;
+-                    esac
++			esac ;;
++		    esac
+ 		fi
+ 		if [ "${HP_ARCH}" = "" ]; then
+ 		    eval $set_cc_for_build
+-		    sed 's/^              //' << EOF >$dummy.c
++		    sed 's/^		//' << EOF >$dummy.c
+ 
+-              #define _HPUX_SOURCE
+-              #include <stdlib.h>
+-              #include <unistd.h>
+-
+-              int main ()
+-              {
+-              #if defined(_SC_KERNEL_BITS)
+-                  long bits = sysconf(_SC_KERNEL_BITS);
+-              #endif
+-                  long cpu  = sysconf (_SC_CPU_VERSION);
+-
+-                  switch (cpu)
+-              	{
+-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+-              	case CPU_PA_RISC2_0:
+-              #if defined(_SC_KERNEL_BITS)
+-              	    switch (bits)
+-              		{
+-              		case 64: puts ("hppa2.0w"); break;
+-              		case 32: puts ("hppa2.0n"); break;
+-              		default: puts ("hppa2.0"); break;
+-              		} break;
+-              #else  /* !defined(_SC_KERNEL_BITS) */
+-              	    puts ("hppa2.0"); break;
+-              #endif
+-              	default: puts ("hppa1.0"); break;
+-              	}
+-                  exit (0);
+-              }
++		#define _HPUX_SOURCE
++		#include <stdlib.h>
++		#include <unistd.h>
++
++		int main ()
++		{
++		#if defined(_SC_KERNEL_BITS)
++		    long bits = sysconf(_SC_KERNEL_BITS);
++		#endif
++		    long cpu  = sysconf (_SC_CPU_VERSION);
++
++		    switch (cpu)
++			{
++			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++			case CPU_PA_RISC2_0:
++		#if defined(_SC_KERNEL_BITS)
++			    switch (bits)
++				{
++				case 64: puts ("hppa2.0w"); break;
++				case 32: puts ("hppa2.0n"); break;
++				default: puts ("hppa2.0"); break;
++				} break;
++		#else  /* !defined(_SC_KERNEL_BITS) */
++			    puts ("hppa2.0"); break;
++		#endif
++			default: puts ("hppa1.0"); break;
++			}
++		    exit (0);
++		}
+ EOF
+ 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ 		    test -z "$HP_ARCH" && HP_ARCH=hppa
+@@ -657,9 +651,19 @@
+ 	esac
+ 	if [ ${HP_ARCH} = "hppa2.0w" ]
+ 	then
+-	    # avoid double evaluation of $set_cc_for_build
+-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
++	    eval $set_cc_for_build
++
++	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
++	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
++	    # generating 64-bit code.  GNU and HP use different nomenclature:
++	    #
++	    # $ CC_FOR_BUILD=cc ./config.guess
++	    # => hppa2.0w-hp-hpux11.23
++	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
++	    # => hppa64-hp-hpux11.23
++
++	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
++		grep -q __LP64__
+ 	    then
+ 		HP_ARCH="hppa2.0w"
+ 	    else
+@@ -667,11 +671,11 @@
+ 	    fi
+ 	fi
+ 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+-	exit 0 ;;
++	exit ;;
+     ia64:HP-UX:*:*)
+ 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	echo ia64-hp-hpux${HPUX_REV}
+-	exit 0 ;;
++	exit ;;
+     3050*:HI-UX:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+@@ -699,224 +703,269 @@
+ 	  exit (0);
+ 	}
+ EOF
+-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
++	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
++		{ echo "$SYSTEM_NAME"; exit; }
+ 	echo unknown-hitachi-hiuxwe2
+-	exit 0 ;;
++	exit ;;
+     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ 	echo hppa1.1-hp-bsd
+-	exit 0 ;;
++	exit ;;
+     9000/8??:4.3bsd:*:*)
+ 	echo hppa1.0-hp-bsd
+-	exit 0 ;;
++	exit ;;
+     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ 	echo hppa1.0-hp-mpeix
+-	exit 0 ;;
++	exit ;;
+     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ 	echo hppa1.1-hp-osf
+-	exit 0 ;;
++	exit ;;
+     hp8??:OSF1:*:*)
+ 	echo hppa1.0-hp-osf
+-	exit 0 ;;
++	exit ;;
+     i*86:OSF1:*:*)
+ 	if [ -x /usr/sbin/sysversion ] ; then
+ 	    echo ${UNAME_MACHINE}-unknown-osf1mk
+ 	else
+ 	    echo ${UNAME_MACHINE}-unknown-osf1
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     parisc*:Lites*:*:*)
+ 	echo hppa1.1-hp-lites
+-	exit 0 ;;
++	exit ;;
+     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ 	echo c1-convex-bsd
+-        exit 0 ;;
++	exit ;;
+     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+-        exit 0 ;;
++	exit ;;
+     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ 	echo c34-convex-bsd
+-        exit 0 ;;
++	exit ;;
+     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ 	echo c38-convex-bsd
+-        exit 0 ;;
++	exit ;;
+     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ 	echo c4-convex-bsd
+-        exit 0 ;;
++	exit ;;
+     CRAY*Y-MP:*:*:*)
+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	exit ;;
+     CRAY*[A-Z]90:*:*:*)
+ 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ 	      -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	exit ;;
+     CRAY*TS:*:*:*)
+ 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	exit ;;
+     CRAY*T3E:*:*:*)
+ 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	exit ;;
+     CRAY*SV1:*:*:*)
+ 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	exit ;;
+     *:UNICOS/mp:*:*)
+-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit ;;
+     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+-        exit 0 ;;
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	exit ;;
+     5000:UNIX_System_V:4.*:*)
+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+-	exit 0 ;;
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	exit ;;
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     sparc*:BSD/OS:*:*)
+ 	echo sparc-unknown-bsdi${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:BSD/OS:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:FreeBSD:*:*)
+-	# Determine whether the default compiler uses glibc.
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#include <features.h>
+-	#if __GLIBC__ >= 2
+-	LIBC=gnu
+-	#else
+-	LIBC=
+-	#endif
+-EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+-	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
+-	# FreeBSD's kernel, but not the complete OS.
+-	case ${LIBC} in gnu) kernel_only='k' ;; esac
+-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+-	exit 0 ;;
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
++	case ${UNAME_PROCESSOR} in
++	    amd64)
++		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    *)
++		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	esac
++	exit ;;
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+-	exit 0 ;;
+-    i*:MINGW*:*)
++	exit ;;
++    *:MINGW64*:*)
++	echo ${UNAME_MACHINE}-pc-mingw64
++	exit ;;
++    *:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+-	exit 0 ;;
++	exit ;;
++    i*:MSYS*:*)
++	echo ${UNAME_MACHINE}-pc-msys
++	exit ;;
++    i*:windows32*:*)
++	# uname -m includes "-pc" on this system.
++	echo ${UNAME_MACHINE}-mingw32
++	exit ;;
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+-	exit 0 ;;
+-    x86:Interix*:[34]*)
+-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+-	exit 0 ;;
++	exit ;;
++    *:Interix*:*)
++	case ${UNAME_MACHINE} in
++	    x86)
++		echo i586-pc-interix${UNAME_RELEASE}
++		exit ;;
++	    authenticamd | genuineintel | EM64T)
++		echo x86_64-unknown-interix${UNAME_RELEASE}
++		exit ;;
++	    IA64)
++		echo ia64-unknown-interix${UNAME_RELEASE}
++		exit ;;
++	esac ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ 	echo i${UNAME_MACHINE}-pc-mks
+-	exit 0 ;;
++	exit ;;
++    8664:Windows_NT:*)
++	echo x86_64-pc-mks
++	exit ;;
+     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ 	# UNAME_MACHINE based on the output of uname instead of i386?
+ 	echo i586-pc-interix
+-	exit 0 ;;
++	exit ;;
+     i*:UWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-uwin
+-	exit 0 ;;
++	exit ;;
++    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
++	echo x86_64-unknown-cygwin
++	exit ;;
+     p*:CYGWIN*:*)
+ 	echo powerpcle-unknown-cygwin
+-	exit 0 ;;
++	exit ;;
+     prep*:SunOS:5.*:*)
+ 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+-	exit 0 ;;
++	exit ;;
+     *:GNU:*:*)
+ 	# the GNU system
+ 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+-	exit 0 ;;
++	exit ;;
+     *:GNU/*:*:*)
+ 	# other systems with GNU libc and userland
+ 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+-	exit 0 ;;
++	exit ;;
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+-	exit 0 ;;
++	exit ;;
++    aarch64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    aarch64_be:Linux:*:*)
++	UNAME_MACHINE=aarch64_be
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++	esac
++	objdump --private-headers /bin/sh | grep -q ld.so.1
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit ;;
+     arm*:Linux:*:*)
++	eval $set_cc_for_build
++	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
++	    | grep -q __ARM_EABI__
++	then
++	    echo ${UNAME_MACHINE}-unknown-linux-gnu
++	else
++	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
++		| grep -q __ARM_PCS_VFP
++	    then
++		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++	    else
++		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++	    fi
++	fi
++	exit ;;
++    avr32*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
+     cris:Linux:*:*)
+-	echo cris-axis-linux-gnu
+-	exit 0 ;;
+-    ia64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
+-    m32r*:Linux:*:*)
++	echo ${UNAME_MACHINE}-axis-linux-gnu
++	exit ;;
++    crisv32:Linux:*:*)
++	echo ${UNAME_MACHINE}-axis-linux-gnu
++	exit ;;
++    frv:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
+-    m68*:Linux:*:*)
++	exit ;;
++    hexagon:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
+-    mips:Linux:*:*)
++	exit ;;
++    i*86:Linux:*:*)
++	LIBC=gnu
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+-	#undef CPU
+-	#undef mips
+-	#undef mipsel
+-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mipsel
+-	#else
+-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips
+-	#else
+-	CPU=
+-	#endif
++	#ifdef __dietlibc__
++	LIBC=dietlibc
+ 	#endif
+ EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+-	;;
+-    mips64:Linux:*:*)
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++	exit ;;
++    ia64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    m32r*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    m68*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    mips:Linux:*:* | mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#undef CPU
+-	#undef mips64
+-	#undef mips64el
++	#undef ${UNAME_MACHINE}
++	#undef ${UNAME_MACHINE}el
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mips64el
++	CPU=${UNAME_MACHINE}el
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips64
++	CPU=${UNAME_MACHINE}
+ 	#else
+ 	CPU=
+ 	#endif
+ 	#endif
+ EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+-    ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
+-	exit 0 ;;
+-    ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
+-	exit 0 ;;
+-    alpha:Linux:*:*)
+-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+-	  EV5)   UNAME_MACHINE=alphaev5 ;;
+-	  EV56)  UNAME_MACHINE=alphaev56 ;;
+-	  PCA56) UNAME_MACHINE=alphapca56 ;;
+-	  PCA57) UNAME_MACHINE=alphapca56 ;;
+-	  EV6)   UNAME_MACHINE=alphaev6 ;;
+-	  EV67)  UNAME_MACHINE=alphaev67 ;;
+-	  EV68*) UNAME_MACHINE=alphaev68 ;;
+-        esac
+-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+-	exit 0 ;;
++    or32:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    padre:Linux:*:*)
++	echo sparc-unknown-linux-gnu
++	exit ;;
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
++	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -924,115 +973,71 @@
+ 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ 	  *)    echo hppa-unknown-linux-gnu ;;
+ 	esac
+-	exit 0 ;;
+-    parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-gnu
++	exit ;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-gnu
++	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+-	exit 0 ;;
++	exit ;;
+     sh64*:Linux:*:*)
+-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
+     sh*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
++    tile*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    vax:Linux:*:*)
++	echo ${UNAME_MACHINE}-dec-linux-gnu
++	exit ;;
+     x86_64:Linux:*:*)
+-	echo x86_64-unknown-linux-gnu
+-	exit 0 ;;
+-    i*86:Linux:*:*)
+-	# The BFD linker knows what the default object file format is, so
+-	# first see if it will tell us. cd to the root directory to prevent
+-	# problems with other programs or directories called `ld' in the path.
+-	# Set LC_ALL=C to ensure ld outputs messages in English.
+-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+-			 | sed -ne '/supported targets:/!d
+-				    s/[ 	][ 	]*/ /g
+-				    s/.*supported targets: *//
+-				    s/ .*//
+-				    p'`
+-        case "$ld_supported_targets" in
+-	  elf32-i386)
+-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+-		;;
+-	  a.out-i386-linux)
+-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+-		exit 0 ;;
+-	  coff-i386)
+-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+-		exit 0 ;;
+-	  "")
+-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+-		# one that does not give us useful --help.
+-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+-		exit 0 ;;
+-	esac
+-	# Determine whether the default compiler is a.out or elf
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#include <features.h>
+-	#ifdef __ELF__
+-	# ifdef __GLIBC__
+-	#  if __GLIBC__ >= 2
+-	LIBC=gnu
+-	#  else
+-	LIBC=gnulibc1
+-	#  endif
+-	# else
+-	LIBC=gnulibc1
+-	# endif
+-	#else
+-	#ifdef __INTEL_COMPILER
+-	LIBC=gnu
+-	#else
+-	LIBC=gnuaout
+-	#endif
+-	#endif
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+-	;;
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    xtensa*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ 	# earlier versions are messed up and put the nodename in both
+ 	# sysname and nodename.
+ 	echo i386-sequent-sysv4
+-	exit 0 ;;
++	exit ;;
+     i*86:UNIX_SV:4.2MP:2.*)
+-        # Unixware is an offshoot of SVR4, but it has its own version
+-        # number series starting with 2...
+-        # I am not positive that other SVR4 systems won't match this,
++	# Unixware is an offshoot of SVR4, but it has its own version
++	# number series starting with 2...
++	# I am not positive that other SVR4 systems won't match this,
+ 	# I just have to hope.  -- rms.
+-        # Use sysv4.2uw... so that sysv4* matches it.
++	# Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+-	exit 0 ;;
++	exit ;;
+     i*86:OS/2:*:*)
+ 	# If we were able to find `uname', then EMX Unix compatibility
+ 	# is probably installed.
+ 	echo ${UNAME_MACHINE}-pc-os2-emx
+-	exit 0 ;;
++	exit ;;
+     i*86:XTS-300:*:STOP)
+ 	echo ${UNAME_MACHINE}-unknown-stop
+-	exit 0 ;;
++	exit ;;
+     i*86:atheos:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-atheos
+-	exit 0 ;;
+-	i*86:syllable:*:*)
++	exit ;;
++    i*86:syllable:*:*)
+ 	echo ${UNAME_MACHINE}-pc-syllable
+-	exit 0 ;;
+-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++	exit ;;
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     i*86:*DOS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+-	exit 0 ;;
++	exit ;;
+     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+@@ -1040,15 +1045,16 @@
+ 	else
+ 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ 	fi
+-	exit 0 ;;
+-    i*86:*:5:[78]*)
++	exit ;;
++    i*86:*:5:[678]*)
++	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+ 	case `/bin/uname -X | grep "^Machine"` in
+ 	    *486*)	     UNAME_MACHINE=i486 ;;
+ 	    *Pentium)	     UNAME_MACHINE=i586 ;;
+ 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ 	esac
+ 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+-	exit 0 ;;
++	exit ;;
+     i*86:*:3.2:*)
+ 	if test -f /usr/options/cb.name; then
+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+@@ -1066,73 +1072,86 @@
+ 	else
+ 		echo ${UNAME_MACHINE}-pc-sysv32
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     pc:*:*:*)
+ 	# Left here for compatibility:
+-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+-        # the processor, so we play safe by assuming i386.
+-	echo i386-pc-msdosdjgpp
+-        exit 0 ;;
++	# uname -m prints for DJGPP always 'pc', but it prints nothing about
++	# the processor, so we play safe by assuming i586.
++	# Note: whatever this is, it MUST be the same as what config.sub
++	# prints for the "djgpp" host, or else GDB configury will decide that
++	# this is a cross-build.
++	echo i586-pc-msdosdjgpp
++	exit ;;
+     Intel:Mach:3*:*)
+ 	echo i386-pc-mach3
+-	exit 0 ;;
++	exit ;;
+     paragon:*:*:*)
+ 	echo i860-intel-osf1
+-	exit 0 ;;
++	exit ;;
+     i860:*:4.*:*) # i860-SVR4
+ 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ 	else # Add other i860-SVR4 vendors below as they are discovered.
+ 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     mini*:CTIX:SYS*5:*)
+ 	# "miniframe"
+ 	echo m68010-convergent-sysv
+-	exit 0 ;;
++	exit ;;
+     mc68k:UNIX:SYSTEM5:3.51m)
+ 	echo m68k-convergent-sysv
+-	exit 0 ;;
++	exit ;;
+     M680?0:D-NIX:5.3:*)
+ 	echo m68k-diab-dnix
+-	exit 0 ;;
+-    M68*:*:R3V[567]*:*)
+-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
++	exit ;;
++    M68*:*:R3V[5678]*:*)
++	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
++    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+ 	OS_REL=''
+ 	test -r /etc/.relid \
+ 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
++	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
++	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-          && echo i486-ncr-sysv4 && exit 0 ;;
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	  && { echo i486-ncr-sysv4; exit; } ;;
++    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
++	OS_REL='.3'
++	test -r /etc/.relid \
++	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ 	echo m68k-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     mc68030:UNIX_System_V:4.*:*)
+ 	echo m68k-atari-sysv4
+-	exit 0 ;;
++	exit ;;
+     TSUNAMI:LynxOS:2.*:*)
+ 	echo sparc-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     rs6000:LynxOS:2.*:*)
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
+-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++	exit ;;
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     SM[BE]S:UNIX_SV:*:*)
+ 	echo mips-dde-sysv${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     RM*:ReliantUNIX-*:*:*)
+ 	echo mips-sni-sysv4
+-	exit 0 ;;
++	exit ;;
+     RM*:SINIX-*:*:*)
+ 	echo mips-sni-sysv4
+-	exit 0 ;;
++	exit ;;
+     *:SINIX-*:*:*)
+ 	if uname -p 2>/dev/null >/dev/null ; then
+ 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+@@ -1140,68 +1159,97 @@
+ 	else
+ 		echo ns32k-sni-sysv
+ 	fi
+-	exit 0 ;;
+-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+-        echo i586-unisys-sysv4
+-        exit 0 ;;
++	exit ;;
++    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++			# says <Richard.M.Bartel@ccMail.Census.GOV>
++	echo i586-unisys-sysv4
++	exit ;;
+     *:UNIX_System_V:4*:FTX*)
+ 	# From Gerald Hewes <hewes@openmarket.com>.
+ 	# How about differentiating between stratus architectures? -djm
+ 	echo hppa1.1-stratus-sysv4
+-	exit 0 ;;
++	exit ;;
+     *:*:*:FTX*)
+ 	# From seanf@swdc.stratus.com.
+ 	echo i860-stratus-sysv4
+-	exit 0 ;;
++	exit ;;
++    i*86:VOS:*:*)
++	# From Paul.Green@stratus.com.
++	echo ${UNAME_MACHINE}-stratus-vos
++	exit ;;
+     *:VOS:*:*)
+ 	# From Paul.Green@stratus.com.
+ 	echo hppa1.1-stratus-vos
+-	exit 0 ;;
++	exit ;;
+     mc68*:A/UX:*:*)
+ 	echo m68k-apple-aux${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     news*:NEWS-OS:6*:*)
+ 	echo mips-sony-newsos6
+-	exit 0 ;;
++	exit ;;
+     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ 	if [ -d /usr/nec ]; then
+-	        echo mips-nec-sysv${UNAME_RELEASE}
++		echo mips-nec-sysv${UNAME_RELEASE}
+ 	else
+-	        echo mips-unknown-sysv${UNAME_RELEASE}
++		echo mips-unknown-sysv${UNAME_RELEASE}
+ 	fi
+-        exit 0 ;;
++	exit ;;
+     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+ 	echo powerpc-be-beos
+-	exit 0 ;;
++	exit ;;
+     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+ 	echo powerpc-apple-beos
+-	exit 0 ;;
++	exit ;;
+     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+ 	echo i586-pc-beos
+-	exit 0 ;;
++	exit ;;
++    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
++	echo i586-pc-haiku
++	exit ;;
++    x86_64:Haiku:*:*)
++	echo x86_64-unknown-haiku
++	exit ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     SX-5:SUPER-UX:*:*)
+ 	echo sx5-nec-superux${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     SX-6:SUPER-UX:*:*)
+ 	echo sx6-nec-superux${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
++    SX-7:SUPER-UX:*:*)
++	echo sx7-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-8:SUPER-UX:*:*)
++	echo sx8-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-8R:SUPER-UX:*:*)
++	echo sx8r-nec-superux${UNAME_RELEASE}
++	exit ;;
+     Power*:Rhapsody:*:*)
+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:Rhapsody:*:*)
+ 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:Darwin:*:*)
+-	case `uname -p` in
+-	    *86) UNAME_PROCESSOR=i686 ;;
+-	    powerpc) UNAME_PROCESSOR=powerpc ;;
++	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++	case $UNAME_PROCESSOR in
++	    i386)
++		eval $set_cc_for_build
++		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		      grep IS_64BIT_ARCH >/dev/null
++		  then
++		      UNAME_PROCESSOR="x86_64"
++		  fi
++		fi ;;
++	    unknown) UNAME_PROCESSOR=powerpc ;;
+ 	esac
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ 	UNAME_PROCESSOR=`uname -p`
+ 	if test "$UNAME_PROCESSOR" = "x86"; then
+@@ -1209,22 +1257,28 @@
+ 		UNAME_MACHINE=pc
+ 	fi
+ 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:QNX:*:4*)
+ 	echo i386-pc-qnx
+-	exit 0 ;;
++	exit ;;
++    NEO-?:NONSTOP_KERNEL:*:*)
++	echo neo-tandem-nsk${UNAME_RELEASE}
++	exit ;;
++    NSE-*:NONSTOP_KERNEL:*:*)
++	echo nse-tandem-nsk${UNAME_RELEASE}
++	exit ;;
+     NSR-?:NONSTOP_KERNEL:*:*)
+ 	echo nsr-tandem-nsk${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:NonStop-UX:*:*)
+ 	echo mips-compaq-nonstopux
+-	exit 0 ;;
++	exit ;;
+     BS2000:POSIX*:*:*)
+ 	echo bs2000-siemens-sysv
+-	exit 0 ;;
++	exit ;;
+     DS/*:UNIX_System_V:*:*)
+ 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:Plan9:*:*)
+ 	# "uname -m" is not consistent, so use $cputype instead. 386
+ 	# is converted to i386 for consistency with other x86
+@@ -1235,36 +1289,55 @@
+ 	    UNAME_MACHINE="$cputype"
+ 	fi
+ 	echo ${UNAME_MACHINE}-unknown-plan9
+-	exit 0 ;;
++	exit ;;
+     *:TOPS-10:*:*)
+ 	echo pdp10-unknown-tops10
+-	exit 0 ;;
++	exit ;;
+     *:TENEX:*:*)
+ 	echo pdp10-unknown-tenex
+-	exit 0 ;;
++	exit ;;
+     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ 	echo pdp10-dec-tops20
+-	exit 0 ;;
++	exit ;;
+     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+ 	echo pdp10-xkl-tops20
+-	exit 0 ;;
++	exit ;;
+     *:TOPS-20:*:*)
+ 	echo pdp10-unknown-tops20
+-	exit 0 ;;
++	exit ;;
+     *:ITS:*:*)
+ 	echo pdp10-unknown-its
+-	exit 0 ;;
++	exit ;;
+     SEI:*:*:SEIUX)
+-        echo mips-sei-seiux${UNAME_RELEASE}
+-	exit 0 ;;
++	echo mips-sei-seiux${UNAME_RELEASE}
++	exit ;;
+     *:DragonFly:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+-	exit 0 ;;
++	exit ;;
++    *:*VMS:*:*)
++	UNAME_MACHINE=`(uname -p) 2>/dev/null`
++	case "${UNAME_MACHINE}" in
++	    A*) echo alpha-dec-vms ; exit ;;
++	    I*) echo ia64-dec-vms ; exit ;;
++	    V*) echo vax-dec-vms ; exit ;;
++	esac ;;
++    *:XENIX:*:SysV)
++	echo i386-pc-xenix
++	exit ;;
++    i*86:skyos:*:*)
++	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
++	exit ;;
++    i*86:rdos:*:*)
++	echo ${UNAME_MACHINE}-pc-rdos
++	exit ;;
++    i*86:AROS:*:*)
++	echo ${UNAME_MACHINE}-pc-aros
++	exit ;;
++    x86_64:VMkernel:*:*)
++	echo ${UNAME_MACHINE}-unknown-esx
++	exit ;;
+ esac
+ 
+-#echo '(No uname command or uname output not recognized.)' 1>&2
+-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+-
+ eval $set_cc_for_build
+ cat >$dummy.c <<EOF
+ #ifdef _SEQUENT_
+@@ -1282,16 +1355,16 @@
+ #include <sys/param.h>
+   printf ("m68k-sony-newsos%s\n",
+ #ifdef NEWSOS4
+-          "4"
++	"4"
+ #else
+-	  ""
++	""
+ #endif
+-         ); exit (0);
++	); exit (0);
+ #endif
+ #endif
+ 
+ #if defined (__arm) && defined (__acorn) && defined (__unix)
+-  printf ("arm-acorn-riscix"); exit (0);
++  printf ("arm-acorn-riscix\n"); exit (0);
+ #endif
+ 
+ #if defined (hp300) && !defined (hpux)
+@@ -1380,11 +1453,12 @@
+ }
+ EOF
+ 
+-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
++	{ echo "$SYSTEM_NAME"; exit; }
+ 
+ # Apollos put the system type in the environment.
+ 
+-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+ 
+ # Convex versions that predate uname can use getsysinfo(1)
+ 
+@@ -1393,22 +1467,22 @@
+     case `getsysinfo -f cpu_type` in
+     c1*)
+ 	echo c1-convex-bsd
+-	exit 0 ;;
++	exit ;;
+     c2*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     c34*)
+ 	echo c34-convex-bsd
+-	exit 0 ;;
++	exit ;;
+     c38*)
+ 	echo c38-convex-bsd
+-	exit 0 ;;
++	exit ;;
+     c4*)
+ 	echo c4-convex-bsd
+-	exit 0 ;;
++	exit ;;
+     esac
+ fi
+ 
+@@ -1419,7 +1493,9 @@
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
+ 
+-    ftp://ftp.gnu.org/pub/gnu/config/
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++and
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+ 
+ If the version you run ($0) is already up to date, please
+ send the following data and any information you think might be
+diff -ur w3m-0.5.3/main.c new/w3m-0.5.3/main.c
+--- w3m-0.5.3/main.c	2011-01-04 04:42:19.000000000 -0500
++++ w3m-0.5.3/main.c	2013-04-28 18:42:08.408034100 -0400
+@@ -789,7 +789,8 @@
+     }
+ 
+ #ifdef USE_BINMODE_STREAM
+-    setmode(fileno(stdout), O_BINARY);
++  /* Seems to only be needed for old versions of Cygwin */
++  /***setmode(fileno(stdout), O_BINARY);***/
+ #endif
+     if (!w3m_dump && !w3m_backend) {
+ 	fmInit();
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index bf14e7e5341..5d9705cfe1b 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
   patches = [ ./glibc214.patch ]
     # Patch for the newer unstable boehm-gc 7.2alpha. Not all platforms use that
     # alpha. At the time of writing this, boehm-gc-7.1 is the last stable.
-    ++ stdenv.lib.optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ];
+    ++ stdenv.lib.optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ]
+    ++ stdenv.lib.optional stdenv.isCygwin ./cygwin.patch;
 
   buildInputs = [ncurses boehmgc gettext zlib]
     ++ stdenv.lib.optional sslSupport openssl

From c4efe32d4d824e0046d53de17401fd6cdd5132f1 Mon Sep 17 00:00:00 2001
From: Marko Durkovic <marko@miding.de>
Date: Thu, 23 Oct 2014 22:45:01 +0200
Subject: [PATCH 0339/2322] cygwin: pkgconfig

---
 .../misc/pkgconfig/2.36.3-not-win32.patch     | 311 ++++++++++++++++++
 .../tools/misc/pkgconfig/default.nix          |   8 +-
 2 files changed, 316 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch

diff --git a/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch b/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch
new file mode 100644
index 00000000000..246173d465a
--- /dev/null
+++ b/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch
@@ -0,0 +1,311 @@
+--- a/glib/configure.ac	2013-08-04 20:21:20.808722600 -0500
++++ b/glib/configure.ac	2013-08-04 18:30:21.852852200 -0500
+@@ -1880,7 +1880,7 @@ dnl ************************************
+ 
+ AC_MSG_CHECKING(for platform-dependent source)
+ case "$host" in
+-  *-*-cygwin*|*-*-mingw*)
++  *-*-mingw*)
+     PLATFORMDEP=gwin32.lo
+     ;;
+   *)
+@@ -2594,9 +2594,6 @@ dnl *** Win32 API libs ***
+ dnl **********************
+ 
+ case $host in
+-  *-*-cygwin*)
+-	G_LIBS_EXTRA="-luser32 -lkernel32"
+-    ;;
+   *-*-mingw*)
+ 	G_LIBS_EXTRA="-lws2_32 -lole32 -lwinmm -lshlwapi"
+     ;;
+--- a/glib/glib/gatomic.c	2013-08-04 20:21:20.907728300 -0500
++++ b/glib/glib/gatomic.c	2013-08-04 18:11:14.000000000 -0500
+@@ -464,7 +464,7 @@ gsize
+   return g_atomic_pointer_xor ((volatile gpointer *) atomic, val);
+ }
+ 
+-#elif defined (G_PLATFORM_WIN32)
++#elif defined (G_OS_WIN32)
+ 
+ #include <windows.h>
+ #if !defined(_M_AMD64) && !defined (_M_IA64) && !defined(_M_X64) && !(defined _MSC_VER && _MSC_VER <= 1200)
+--- a/glib/glib/gcharset.c	2013-08-04 20:21:20.925729300 -0500
++++ b/glib/glib/gcharset.c	2013-08-04 18:11:14.000000000 -0500
+@@ -496,7 +496,7 @@ guess_category_value (const gchar *categ
+   if ((retval != NULL) && (retval[0] != '\0'))
+     return retval;
+ 
+-#ifdef G_PLATFORM_WIN32
++#ifdef G_OS_WIN32
+   /* g_win32_getlocale() first checks for LC_ALL, LC_MESSAGES and
+    * LANG, which we already did above. Oh well. The main point of
+    * calling g_win32_getlocale() is to get the thread's locale as used
+--- a/glib/glib/gconvert.c	2013-08-04 20:21:20.933729800 -0500
++++ b/glib/glib/gconvert.c	2013-08-04 18:11:14.000000000 -0500
+@@ -33,9 +33,6 @@
+ 
+ #ifdef G_OS_WIN32
+ #include "win_iconv.c"
+-#endif
+-
+-#ifdef G_PLATFORM_WIN32
+ #define STRICT
+ #include <windows.h>
+ #undef STRICT
+@@ -1258,7 +1255,7 @@ g_locale_from_utf8 (const gchar *utf8str
+ 		      charset, "UTF-8", bytes_read, bytes_written, error);
+ }
+ 
+-#ifndef G_PLATFORM_WIN32
++#ifndef G_OS_WIN32
+ 
+ typedef struct _GFilenameCharsetCache GFilenameCharsetCache;
+ 
+@@ -1374,7 +1371,7 @@ g_get_filename_charsets (const gchar ***
+   return cache->is_utf8;
+ }
+ 
+-#else /* G_PLATFORM_WIN32 */
++#else /* G_OS_WIN32 */
+ 
+ gboolean
+ g_get_filename_charsets (const gchar ***filename_charsets) 
+@@ -1403,7 +1400,7 @@ g_get_filename_charsets (const gchar ***
+ #endif
+ }
+ 
+-#endif /* G_PLATFORM_WIN32 */
++#endif /* G_OS_WIN32 */
+ 
+ static gboolean
+ get_filename_charset (const gchar **filename_charset)
+--- a/glib/glib/gfileutils.c	2013-08-04 20:21:20.942730300 -0500
++++ b/glib/glib/gfileutils.c	2013-08-04 18:11:14.000000000 -0500
+@@ -2153,7 +2153,7 @@ g_path_skip_root (const gchar *file_name
+ {
+   g_return_val_if_fail (file_name != NULL, NULL);
+ 
+-#ifdef G_PLATFORM_WIN32
++#ifdef G_OS_WIN32
+   /* Skip \\server\share or //server/share */
+   if (G_IS_DIR_SEPARATOR (file_name[0]) &&
+       G_IS_DIR_SEPARATOR (file_name[1]) &&
+@@ -2163,7 +2163,6 @@ g_path_skip_root (const gchar *file_name
+       gchar *p;
+       p = strchr (file_name + 2, G_DIR_SEPARATOR);
+ 
+-#ifdef G_OS_WIN32
+       {
+         gchar *q;
+ 
+@@ -2171,7 +2170,6 @@ g_path_skip_root (const gchar *file_name
+         if (p == NULL || (q != NULL && q < p))
+         p = q;
+       }
+-#endif
+ 
+       if (p && p > file_name + 2 && p[1])
+         {
+--- a/glib/glib/glib.h	2013-08-04 20:21:20.949730700 -0500
++++ b/glib/glib/glib.h	2013-08-04 18:11:14.000000000 -0500
+@@ -96,7 +96,7 @@
+ #include <glib/gvariant.h>
+ #include <glib/gversion.h>
+ #include <glib/gversionmacros.h>
+-#ifdef G_PLATFORM_WIN32
++#ifdef G_OS_WIN32
+ #include <glib/gwin32.h>
+ #endif
+ 
+--- a/glib/glib/gutf8.c	2013-08-04 20:21:20.984732700 -0500
++++ b/glib/glib/gutf8.c	2013-08-04 18:11:14.000000000 -0500
+@@ -27,7 +27,7 @@
+ #endif
+ #include <string.h>
+ 
+-#ifdef G_PLATFORM_WIN32
++#ifdef G_OS_WIN32
+ #include <stdio.h>
+ #define STRICT
+ #include <windows.h>
+--- a/glib/glib/gutils.c	2013-08-04 20:21:21.015734500 -0500
++++ b/glib/glib/gutils.c	2013-08-04 18:11:14.000000000 -0500
+@@ -72,7 +72,7 @@
+ #include "garray.h"
+ #include "glibintl.h"
+ 
+-#ifdef G_PLATFORM_WIN32
++#ifdef G_OS_WIN32
+ #include "gconvert.h"
+ #include "gwin32.h"
+ #endif
+@@ -86,16 +86,13 @@
+  * These are portable utility functions.
+  */
+ 
+-#ifdef G_PLATFORM_WIN32
++#ifdef G_OS_WIN32
+ #  include <windows.h>
+ #  ifndef GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
+ #    define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT 2
+ #    define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS 4
+ #  endif
+ #  include <lmcons.h>		/* For UNLEN */
+-#endif /* G_PLATFORM_WIN32 */
+-
+-#ifdef G_OS_WIN32
+ #  include <direct.h>
+ #  include <shlobj.h>
+    /* older SDK (e.g. msvc 5.0) does not have these*/
+@@ -131,7 +128,7 @@
+ #include <langinfo.h>
+ #endif
+ 
+-#ifdef G_PLATFORM_WIN32
++#ifdef G_OS_WIN32
+ 
+ gchar *
+ _glib_get_dll_directory (void)
+--- a/glib/glib/gutils.h	2013-08-04 20:21:21.067737500 -0500
++++ b/glib/glib/gutils.h	2013-08-04 18:11:14.000000000 -0500
+@@ -350,7 +350,7 @@ g_bit_storage (gulong number)
+  * On non-Windows platforms, expands to nothing.
+  */
+ 
+-#ifndef G_PLATFORM_WIN32
++#ifndef G_OS_WIN32
+ # define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name)
+ #else
+ # define G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name)			\
+@@ -378,7 +378,7 @@ DllMain (HINSTANCE hinstDLL,						\
+ 
+ #endif	/* !G_DISABLE_DEPRECATED */
+ 
+-#endif /* G_PLATFORM_WIN32 */
++#endif /* G_OS_WIN32 */
+ 
+ G_END_DECLS
+ 
+--- a/glib/glib/gwin32.h	2013-08-04 20:21:21.081738300 -0500
++++ b/glib/glib/gwin32.h	2013-08-04 18:11:14.000000000 -0500
+@@ -33,7 +33,7 @@
+ 
+ #include <glib/gtypes.h>
+ 
+-#ifdef G_PLATFORM_WIN32
++#ifdef G_OS_WIN32
+ 
+ G_BEGIN_DECLS
+ 
+@@ -41,8 +41,6 @@ G_BEGIN_DECLS
+ #define MAXPATHLEN 1024
+ #endif
+ 
+-#ifdef G_OS_WIN32
+-
+ /*
+  * To get prototypes for the following POSIXish functions, you have to
+  * include the indicated non-POSIX headers. The functions are defined
+@@ -68,7 +66,6 @@ G_BEGIN_DECLS
+ GLIB_AVAILABLE_IN_ALL
+ gint		g_win32_ftruncate	(gint		 f,
+ 					 guint		 size);
+-#endif /* G_OS_WIN32 */
+ 
+ /* The MS setlocale uses locale names of the form "English_United
+  * States.1252" etc. We want the Unixish standard form "en", "zh_TW"
+@@ -112,7 +109,7 @@ gchar*          g_win32_locale_filename_
+ 
+ G_END_DECLS
+ 
+-#endif	 /* G_PLATFORM_WIN32 */
++#endif	 /* G_OS_WIN32 */
+ 
+ #ifdef G_OS_WIN32
+ #ifdef _WIN64
+--- a/glib/glib/libcharset/localcharset.c	2013-08-04 20:21:21.095739100 -0500
++++ b/glib/glib/libcharset/localcharset.c	2013-08-04 18:11:14.000000000 -0500
+@@ -46,10 +46,6 @@
+ #   include <locale.h>
+ #  endif
+ # endif
+-# ifdef __CYGWIN__
+-#  define WIN32_LEAN_AND_MEAN
+-#  include <windows.h>
+-# endif
+ #elif defined WIN32_NATIVE
+ # define WIN32_LEAN_AND_MEAN
+ # include <windows.h>
+@@ -111,7 +107,7 @@ _g_locale_get_charset_aliases (void)
+   cp = charset_aliases;
+   if (cp == NULL)
+     {
+-#if !(defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
++#if !(defined VMS || defined WIN32_NATIVE)
+       FILE *fp;
+       const char *dir;
+       const char *base = "charset.alias";
+@@ -237,7 +233,7 @@ _g_locale_get_charset_aliases (void)
+ 	   "DECKOREAN" "\0" "EUC-KR" "\0";
+ # endif
+ 
+-# if defined WIN32_NATIVE || defined __CYGWIN__
++# if defined WIN32_NATIVE
+       /* To avoid the troubles of installing a separate file in the same
+ 	 directory as the DLL and of retrieving the DLL's directory at
+ 	 runtime, simply inline the aliases here.  */
+@@ -292,53 +288,6 @@ _g_locale_charset_raw (void)
+   /* Most systems support nl_langinfo (CODESET) nowadays.  */
+   codeset = nl_langinfo (CODESET);
+ 
+-#  ifdef __CYGWIN__
+-  /* Cygwin 2006 does not have locales.  nl_langinfo (CODESET) always
+-     returns "US-ASCII".  As long as this is not fixed, return the suffix
+-     of the locale name from the environment variables (if present) or
+-     the codepage as a number.  */
+-  if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0)
+-    {
+-      const char *locale;
+-      static char buf[2 + 10 + 1];
+-
+-      locale = getenv ("LC_ALL");
+-      if (locale == NULL || locale[0] == '\0')
+-	{
+-	  locale = getenv ("LC_CTYPE");
+-	  if (locale == NULL || locale[0] == '\0')
+-	    locale = getenv ("LANG");
+-	}
+-      if (locale != NULL && locale[0] != '\0')
+-	{
+-	  /* If the locale name contains an encoding after the dot, return
+-	     it.  */
+-	  const char *dot = strchr (locale, '.');
+-
+-	  if (dot != NULL)
+-	    {
+-	      const char *modifier;
+-
+-	      dot++;
+-	      /* Look for the possible @... trailer and remove it, if any.  */
+-	      modifier = strchr (dot, '@');
+-	      if (modifier == NULL)
+-		return dot;
+-	      if (modifier - dot < sizeof (buf))
+-		{
+-		  memcpy (buf, dot, modifier - dot);
+-		  buf [modifier - dot] = '\0';
+-		  return buf;
+-		}
+-	    }
+-	}
+-
+-      /* Woe32 has a function returning the locale's codepage as a number.  */
+-      sprintf (buf, "CP%u", GetACP ());
+-      codeset = buf;
+-    }
+-#  endif
+-
+ # else
+ 
+   /* On old systems which lack it, use setlocale or getenv.  */
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index 2ce1fd7b6e4..f01b52cbba7 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, vanilla ? false}:
+{stdenv, fetchurl, automake, libiconv, vanilla ? false}:
 
 stdenv.mkDerivation (rec {
   name = "pkg-config-0.28";
@@ -10,13 +10,15 @@ stdenv.mkDerivation (rec {
     sha256 = "0igqq5m204w71m11y0nipbdf5apx87hwfll6axs12hn4dqfb6vkb";
   };
 
+  buildInputs = stdenv.lib.optional stdenv.isCygwin libiconv;
+
   configureFlags = [ "--with-internal-glib" ];
 
-  patches = if vanilla then [] else [
+  patches = (if vanilla then [] else [
     # Process Requires.private properly, see
     # http://bugs.freedesktop.org/show_bug.cgi?id=4738.
     ./requires-private.patch
-  ];
+  ]) ++ stdenv.lib.optional stdenv.isCygwin ./2.36.3-not-win32.patch;
 
   meta = {
     description = "A tool that allows packages to find out information about other packages";

From e45745f1f40efd1a510928c043530ab1c215762d Mon Sep 17 00:00:00 2001
From: Marko Durkovic <marko@miding.de>
Date: Thu, 23 Oct 2014 22:46:09 +0200
Subject: [PATCH 0340/2322] cygwin: libatomic_ops: add missing interlibrary dep

---
 .../libraries/libatomic_ops/default.nix         | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index 35ffe6d5fa5..cf74ed3b5f6 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl, autoconf, automake, libtool }:
 let
   s = # Generated upstream information
   rec {
@@ -9,15 +9,22 @@ let
     url="http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-7.4.2.tar.gz";
     sha256="1pdm0h1y7bgkczr8byg20r6bq15m5072cqm5pny4f9crc9gn3yh4";
   };
-  buildInputs = [
-  ];
-in
-stdenv.mkDerivation {
+  
+  buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
+
+in stdenv.mkDerivation {
   inherit (s) name version;
   inherit buildInputs;
+
   src = fetchurl {
     inherit (s) url sha256;
   };
+
+  preConfigure = if stdenv.isCygwin then ''
+      sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am
+      ./autogen.sh
+  '' else null;
+
   meta = {
     inherit (s) version;
     description = ''A library for semi-portable access to hardware-provided atomic memory update operations'';

From f33f2a7e827fb282198f2f429a57c738181c65dc Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 23 Oct 2014 20:18:57 +0200
Subject: [PATCH 0341/2322] cygwin: disable gnumake check because of hanging
 test

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

diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix
index fa7bb9e122a..ce5eff878ea 100644
--- a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   };
 
   /* On Darwin, there are 3 test failures that haven't been investigated
-     yet.  */
-  doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD;
+     yet. On cygwin at least parallelsim test hangs. */
+  doCheck = !stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.isCygwin;
 
   patches =
     [

From 15952587a0b84aaf1544a37d97f34fc782ee3c6d Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Fri, 24 Oct 2014 02:58:58 +0200
Subject: [PATCH 0342/2322] cygwin gnugrep: disable check due to
 multibyte-white-space

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

diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index e73458d0aba..d03db13ed42 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ pcre libiconv ];
 
-  doCheck = !stdenv.isDarwin;
+  # cygwin: FAIL: multibyte-white-space
+  doCheck = !stdenv.isDarwin && !stdenv.isCygwin;
 
   # On Mac OS X, force use of mkdir -p, since Grep's fallback
   # (./install-sh) is broken.

From 2904aa33bb4fd1b9444205d07842d6f1f29ab927 Mon Sep 17 00:00:00 2001
From: Marko Durkovic <marko@miding.de>
Date: Thu, 23 Oct 2014 19:15:56 +0200
Subject: [PATCH 0343/2322] cygwin: libffi

---
 pkgs/development/libraries/libffi/3.2.1-cygwin.patch | 10 ++++++++++
 pkgs/development/libraries/libffi/default.nix        |  2 ++
 2 files changed, 12 insertions(+)
 create mode 100644 pkgs/development/libraries/libffi/3.2.1-cygwin.patch

diff --git a/pkgs/development/libraries/libffi/3.2.1-cygwin.patch b/pkgs/development/libraries/libffi/3.2.1-cygwin.patch
new file mode 100644
index 00000000000..f3b38dbd1c1
--- /dev/null
+++ b/pkgs/development/libraries/libffi/3.2.1-cygwin.patch
@@ -0,0 +1,10 @@
+--- libffi-3.2.1/src/closures.c	2014-11-08 13:47:24.000000000 +0100
++++ libffi-3.2.1/src/closures.c	2015-05-19 10:15:50.059325900 +0200
+@@ -212,6 +212,7 @@
+ #include <sys/mman.h>
+ 
+ /* Cygwin is Linux-like, but not quite that Linux-like.  */
++#define is_emutramp_enabled() 0
+ #define is_selinux_enabled() 0
+ 
+ #endif /* !defined(X86_WIN32) && !defined(X86_WIN64) */
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index bc15e88ba2f..668ac138be8 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh";
   };
 
+  patches = if stdenv.isCygwin then [ ./3.2.1-cygwin.patch ] else null;
+
   buildInputs = stdenv.lib.optional doCheck dejagnu;
 
   configureFlags = [

From af5484a630c65564c27e31eb658ded80a7751808 Mon Sep 17 00:00:00 2001
From: Marko Durkovic <marko@miding.de>
Date: Fri, 24 Oct 2014 00:50:44 +0200
Subject: [PATCH 0344/2322] cygwin: opensp

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

diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix
index 4b807718baa..92b506aa2c3 100644
--- a/pkgs/tools/text/sgml/opensp/default.nix
+++ b/pkgs/tools/text/sgml/opensp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl }:
+{ lib, stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl, autoconf, automake, gettext, libiconv, libtool}:
 
 stdenv.mkDerivation {
   name = "opensp-1.5.2";
@@ -26,7 +26,11 @@ stdenv.mkDerivation {
     sed -i -e 's/name="idm.*"//g' $out/share/doc/OpenSP/releasenotes.html
     '';
 
-  buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ];
+  preConfigure = if stdenv.isCygwin then "autoreconf -fi" else null;
+
+  # need autoconf, automake, gettext, and libtool for reconfigure
+  buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake gettext libiconv libtool ]
+    ++ [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ];
 
   meta = {
     description = "A suite of SGML/XML processing tools";

From d2da94cc0bd8555b99bc54e2654208b5eeb54d94 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Fri, 24 Oct 2014 02:35:07 +0200
Subject: [PATCH 0345/2322] cygwin: zlib - we do not --disable-shared

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

diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 162bae54d37..419a2584ca8 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -40,8 +40,8 @@ stdenv.mkDerivation (rec {
     makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ];
   };
 
-  # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv.
-  cygwinConfigureEnableShared = true;
+  # CYGXXX: This is not needed anymore and non-functional, but left not to trigger rebuilds
+  cygwinConfigureEnableShared = if (!stdenv.isCygwin) then true else null;
 
   passthru.version = version;
 

From 5f4a9c3391bad23ffbb3e0a3b740115b7ebee11e Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Thu, 23 Oct 2014 21:25:57 +0200
Subject: [PATCH 0346/2322] cygwin: python-2.7

---
 .../2.7/2.5.2-ctypes-util-find_library.patch  | 34 ++++++++++++++
 .../python/2.7/2.5.2-tkinter-x11.patch        | 27 +++++++++++
 .../python/2.7/2.6.2-ssl-threads.patch        | 13 ++++++
 .../python/2.7/2.6.5-FD_SETSIZE.patch         | 41 +++++++++++++++++
 .../2.6.5-export-PySignal_SetWakeupFd.patch   | 11 +++++
 .../python/2.7/2.6.5-ncurses-abi6.patch       | 16 +++++++
 .../interpreters/python/2.7/2.7.3-dbm.patch   | 27 +++++++++++
 .../interpreters/python/2.7/2.7.3-dylib.patch | 10 +++++
 .../2.7/2.7.3-getpath-exe-extension.patch     | 31 +++++++++++++
 .../python/2.7/2.7.3-no-libm.patch            | 11 +++++
 .../2.7/2.7.5-export-PyNode_SizeOf.patch      | 13 ++++++
 .../interpreters/python/2.7/default.nix       | 45 ++++++++++++++-----
 12 files changed, 268 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/interpreters/python/2.7/2.5.2-ctypes-util-find_library.patch
 create mode 100644 pkgs/development/interpreters/python/2.7/2.5.2-tkinter-x11.patch
 create mode 100644 pkgs/development/interpreters/python/2.7/2.6.2-ssl-threads.patch
 create mode 100644 pkgs/development/interpreters/python/2.7/2.6.5-FD_SETSIZE.patch
 create mode 100644 pkgs/development/interpreters/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch
 create mode 100644 pkgs/development/interpreters/python/2.7/2.6.5-ncurses-abi6.patch
 create mode 100644 pkgs/development/interpreters/python/2.7/2.7.3-dbm.patch
 create mode 100644 pkgs/development/interpreters/python/2.7/2.7.3-dylib.patch
 create mode 100644 pkgs/development/interpreters/python/2.7/2.7.3-getpath-exe-extension.patch
 create mode 100644 pkgs/development/interpreters/python/2.7/2.7.3-no-libm.patch
 create mode 100644 pkgs/development/interpreters/python/2.7/2.7.5-export-PyNode_SizeOf.patch

diff --git a/pkgs/development/interpreters/python/2.7/2.5.2-ctypes-util-find_library.patch b/pkgs/development/interpreters/python/2.7/2.5.2-ctypes-util-find_library.patch
new file mode 100644
index 00000000000..22bc0f7ced0
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.7/2.5.2-ctypes-util-find_library.patch
@@ -0,0 +1,34 @@
+--- origsrc/Lib/ctypes/util.py	2007-09-14 15:05:26.000000000 -0500
++++ src/Lib/ctypes/util.py	2008-11-25 17:54:47.319296200 -0600
+@@ -41,6 +41,20 @@
+                 continue
+         return None
+ 
++elif sys.platform == "cygwin":
++    def find_library(name):
++        for libdir in ['/usr/lib', '/usr/local/lib']:
++            for libext in ['lib%s.dll.a' % name, 'lib%s.a' % name]:
++                implib = os.path.join(libdir, libext)
++                if not os.path.exists(implib):
++                    continue
++                cmd = "dlltool -I " + implib + " 2>/dev/null"
++                res = os.popen(cmd).read().replace("\n","")
++                if not res:
++                    continue
++                return res
++        return None
++
+ elif os.name == "posix":
+     # Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump
+     import re, tempfile, errno
+@@ -157,6 +173,10 @@
+             print cdll.LoadLibrary("libcrypto.dylib")
+             print cdll.LoadLibrary("libSystem.dylib")
+             print cdll.LoadLibrary("System.framework/System")
++        elif sys.platform == "cygwin":
++            print cdll.LoadLibrary("cygbz2-1.dll") 
++            print find_library("crypt")
++            print cdll.LoadLibrary("cygcrypt-0.dll") 
+         else:
+             print cdll.LoadLibrary("libm.so")
+             print cdll.LoadLibrary("libcrypt.so")
diff --git a/pkgs/development/interpreters/python/2.7/2.5.2-tkinter-x11.patch b/pkgs/development/interpreters/python/2.7/2.5.2-tkinter-x11.patch
new file mode 100644
index 00000000000..28b6dafc3f1
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.7/2.5.2-tkinter-x11.patch
@@ -0,0 +1,27 @@
+--- origsrc/setup.py	2008-02-04 17:41:02.000000000 -0600
++++ src/setup.py	2008-07-02 02:11:28.671875000 -0500
+@@ -1277,12 +1279,6 @@
+             include_dirs.append('/usr/X11/include')
+             added_lib_dirs.append('/usr/X11/lib')
+ 
+-        # If Cygwin, then verify that X is installed before proceeding
+-        if host_platform == 'cygwin':
+-            x11_inc = find_file('X11/Xlib.h', [], include_dirs)
+-            if x11_inc is None:
+-                return
+-
+         # Check for BLT extension
+         if self.compiler.find_library_file(lib_dirs + added_lib_dirs,
+                                            'BLT8.0'):
+@@ -1300,9 +1296,8 @@
+         if host_platform in ['aix3', 'aix4']:
+             libs.append('ld')
+ 
+-        # Finally, link with the X11 libraries (not appropriate on cygwin)
+-        if host_platform != "cygwin":
+-            libs.append('X11')
++        # Finally, link with the X11 libraries
++        libs.append('X11')
+ 
+         ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
+                         define_macros=[('WITH_APPINIT', 1)] + defs,
diff --git a/pkgs/development/interpreters/python/2.7/2.6.2-ssl-threads.patch b/pkgs/development/interpreters/python/2.7/2.6.2-ssl-threads.patch
new file mode 100644
index 00000000000..bef137efda7
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.7/2.6.2-ssl-threads.patch
@@ -0,0 +1,13 @@
+--- origsrc/Modules/_ssl.c	2009-01-26 10:55:41.000000000 -0600
++++ src/Modules/_ssl.c	2009-08-20 00:04:59.346816700 -0500
+@@ -15,6 +15,10 @@
+ 
+ #include "Python.h"
+ 
++#ifdef __CYGWIN__
++#undef WITH_THREAD
++#endif
++
+ #ifdef WITH_THREAD
+ #include "pythread.h"
+ #define PySSL_BEGIN_ALLOW_THREADS { \
diff --git a/pkgs/development/interpreters/python/2.7/2.6.5-FD_SETSIZE.patch b/pkgs/development/interpreters/python/2.7/2.6.5-FD_SETSIZE.patch
new file mode 100644
index 00000000000..d1dae8c47dc
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.7/2.6.5-FD_SETSIZE.patch
@@ -0,0 +1,41 @@
+--- Python-2.6.5.orig/Modules/selectmodule.c	2012-02-02 22:35:21.835125000 -0500
++++ Python-2.6.5/Modules/selectmodule.c	2012-02-02 22:41:41.210125000 -0500
+@@ -6,6 +6,21 @@
+    >= 0.
+ */
+ 
++/* Windows #defines FD_SETSIZE to 64 if FD_SETSIZE isn't already defined.
++   64 is too small (too many people have bumped into that limit).
++   Here we boost it.
++
++   Cygwin also defines FD_SETSIZE to 64, so also increase the limit on
++   Cygwin.  We must do this before sys/types.h is included, which otherwise
++   sets FD_SETSIZE to the default.
++
++   Users who want even more than the boosted limit should #define
++   FD_SETSIZE higher before this; e.g., via compiler /D switch.
++*/
++#if (defined(MS_WINDOWS) || defined(__CYGWIN__)) && !defined(FD_SETSIZE)
++#define FD_SETSIZE 512
++#endif
++
+ #include "Python.h"
+ #include <structmember.h>
+ 
+@@ -16,16 +31,6 @@
+ #undef HAVE_BROKEN_POLL
+ #endif
+ 
+-/* Windows #defines FD_SETSIZE to 64 if FD_SETSIZE isn't already defined.
+-   64 is too small (too many people have bumped into that limit).
+-   Here we boost it.
+-   Users who want even more than the boosted limit should #define
+-   FD_SETSIZE higher before this; e.g., via compiler /D switch.
+-*/
+-#if defined(MS_WINDOWS) && !defined(FD_SETSIZE)
+-#define FD_SETSIZE 512
+-#endif
+-
+ #if defined(HAVE_POLL_H)
+ #include <poll.h>
+ #elif defined(HAVE_SYS_POLL_H)
diff --git a/pkgs/development/interpreters/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch b/pkgs/development/interpreters/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch
new file mode 100644
index 00000000000..ea696978236
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch
@@ -0,0 +1,11 @@
+--- origsrc/Include/pyerrors.h	2008-06-08 23:58:54.000000000 -0500
++++ src/Include/pyerrors.h	2010-05-12 04:19:31.535297200 -0500
+@@ -232,7 +232,7 @@ PyAPI_FUNC(int) PyErr_CheckSignals(void)
+ PyAPI_FUNC(void) PyErr_SetInterrupt(void);
+ 
+ /* In signalmodule.c */
+-int PySignal_SetWakeupFd(int fd);
++PyAPI_FUNC(int) PySignal_SetWakeupFd(int fd);
+ 
+ /* Support for adding program text to SyntaxErrors */
+ PyAPI_FUNC(void) PyErr_SyntaxLocation(const char *, int);
diff --git a/pkgs/development/interpreters/python/2.7/2.6.5-ncurses-abi6.patch b/pkgs/development/interpreters/python/2.7/2.6.5-ncurses-abi6.patch
new file mode 100644
index 00000000000..e1cf5ad4bbf
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.7/2.6.5-ncurses-abi6.patch
@@ -0,0 +1,16 @@
+--- origsrc/Include/py_curses.h	2009-09-06 16:23:05.000000000 -0500
++++ src/Include/py_curses.h	2010-04-14 15:21:23.008971400 -0500
+@@ -17,6 +17,13 @@
+ #define NCURSES_OPAQUE 0
+ #endif /* __APPLE__ */
+ 
++#ifdef __CYGWIN__
++/* the following define is necessary for Cygwin; without it, the
++   Cygwin-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python
++   can't get at the WINDOW flags field. */
++#define NCURSES_INTERNALS
++#endif /* __CYGWIN__ */
++
+ #ifdef __FreeBSD__
+ /*
+ ** On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards
diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-dbm.patch b/pkgs/development/interpreters/python/2.7/2.7.3-dbm.patch
new file mode 100644
index 00000000000..bfaeb37c287
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.7/2.7.3-dbm.patch
@@ -0,0 +1,27 @@
+--- origsrc/setup.py.orig	2012-11-27 10:20:47.442395900 -0500
++++ src/setup.py	2012-11-27 10:53:15.583020900 -0500
+@@ -1141,7 +1141,7 @@
+ 
+         dbm_order = ['gdbm']
+         # The standard Unix dbm module:
+-        if host_platform not in ['cygwin']:
++        if host_platform not in ['win32']:
+             config_args = [arg.strip("'")
+                            for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
+             dbm_args = [arg for arg in config_args
+@@ -1192,6 +1192,15 @@
+                                     ],
+                                 libraries = gdbm_libs)
+                             break
++                        if find_file("ndbm.h", inc_dirs, []) is not None:
++                            print("building dbm using gdbm")
++                            dbmext = Extension(
++                                'dbm', ['dbmmodule.c'],
++                                define_macros=[
++                                    ('HAVE_NDBM_H', None),
++                                    ],
++                                libraries = gdbm_libs)
++                            break
+                 elif cand == "bdb":
+                     if db_incs is not None:
+                         print "building dbm using bdb"
diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-dylib.patch b/pkgs/development/interpreters/python/2.7/2.7.3-dylib.patch
new file mode 100644
index 00000000000..6e1fc8b53e8
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.7/2.7.3-dylib.patch
@@ -0,0 +1,10 @@
+--- origsrc/Lib/distutils/unixccompiler.py.orig	2012-11-27 07:44:15.409993500 -0500
++++ src/Lib/distutils/unixccompiler.py	2012-11-27 08:09:57.801770900 -0500
+@@ -141,6 +141,7 @@
+     static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s"
+     if sys.platform == "cygwin":
+         exe_extension = ".exe"
++        dylib_lib_extension = ".dll.a"
+ 
+     def preprocess(self, source,
+                    output_file=None, macros=None, include_dirs=None,
diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-getpath-exe-extension.patch b/pkgs/development/interpreters/python/2.7/2.7.3-getpath-exe-extension.patch
new file mode 100644
index 00000000000..68f6921ba6a
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.7/2.7.3-getpath-exe-extension.patch
@@ -0,0 +1,31 @@
+--- origsrc/Modules/getpath.c.orig	2012-11-27 12:07:56.098645900 -0500
++++ src/Modules/getpath.c	2012-11-27 12:10:11.254895900 -0500
+@@ -436,6 +436,28 @@
+                         if (isxfile(progpath))
+                                 break;
+ 
++#ifdef __CYGWIN__
++                        /*
++                         * Cygwin automatically removes the ".exe" extension from argv[0]
++                         * to make programs feel like they are in a more Unix-like
++                         * environment.  Unfortunately, this can make it problemmatic for
++                         * Cygwin to distinguish between a directory and an executable with
++                         * the same name excluding the ".exe" extension.  For example, the
++                         * Cygwin Python build directory has a "Python" directory and a
++                         * "python.exe" executable.  This causes isxfile() to erroneously
++                         * return false.  If isdir() returns true and there is enough space
++                         * to append the ".exe" extension, then we try again with the
++                         * extension appended.
++                         */
++#define EXE ".exe"
++                        if (isdir(progpath) && strlen(progpath) + strlen(EXE) <= MAXPATHLEN)
++                        {
++                            strcat(progpath, EXE);
++                            if (isxfile(progpath))
++                                break;
++                        }
++#endif /* __CYGWIN__ */
++
+                         if (!delim) {
+                                 progpath[0] = '\0';
+                                 break;
diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-no-libm.patch b/pkgs/development/interpreters/python/2.7/2.7.3-no-libm.patch
new file mode 100644
index 00000000000..55281db6768
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.7/2.7.3-no-libm.patch
@@ -0,0 +1,11 @@
+--- origsrc/setup.py.orig	2012-11-27 09:28:34.051770900 -0500
++++ src/setup.py	2012-11-27 09:28:47.239270900 -0500
+@@ -470,7 +470,7 @@
+ 
+         # Check for MacOS X, which doesn't need libm.a at all
+         math_libs = ['m']
+-        if host_platform in ['darwin', 'beos']:
++        if host_platform in ['darwin', 'beos', 'cygwin']:
+             math_libs = []
+ 
+         # XXX Omitted modules: gl, pure, dl, SGI-specific modules
diff --git a/pkgs/development/interpreters/python/2.7/2.7.5-export-PyNode_SizeOf.patch b/pkgs/development/interpreters/python/2.7/2.7.5-export-PyNode_SizeOf.patch
new file mode 100644
index 00000000000..e5efd626690
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.7/2.7.5-export-PyNode_SizeOf.patch
@@ -0,0 +1,13 @@
+For the parser extension
+
+--- origsrc/Include/node.h	2013-05-11 22:32:41.000000000 -0500
++++ src/Include/node.h	2013-06-04 02:55:03.949347500 -0500
+@@ -21,7 +21,7 @@ PyAPI_FUNC(int) PyNode_AddChild(node *n,
+                                       char *str, int lineno, int col_offset);
+ PyAPI_FUNC(void) PyNode_Free(node *n);
+ #ifndef Py_LIMITED_API
+-Py_ssize_t _PyNode_SizeOf(node *n);
++PyAPI_FUNC(Py_ssize_t) _PyNode_SizeOf(node *n);
+ #endif
+ 
+ /* Node access functions */
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 2b9e3c3736b..eebd4514571 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -7,6 +7,7 @@
 
 , tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? true
 , zlib ? null, zlibSupport ? true
+, expat, libffi
 }:
 
 assert zlibSupport -> zlib != null;
@@ -39,6 +40,18 @@ let
       # patch python to put zero timestamp into pyc
       # if DETERMINISTIC_BUILD env var is set
       ./deterministic-build.patch
+    ] ++ optionals stdenv.isCygwin [
+      ./2.5.2-ctypes-util-find_library.patch
+      ./2.5.2-tkinter-x11.patch
+      ./2.6.2-ssl-threads.patch
+      ./2.6.5-export-PySignal_SetWakeupFd.patch
+      ./2.6.5-FD_SETSIZE.patch
+      ./2.6.5-ncurses-abi6.patch
+      ./2.7.3-dbm.patch
+      ./2.7.3-dylib.patch
+      ./2.7.3-getpath-exe-extension.patch
+      ./2.7.3-no-libm.patch
+      ./2.7.5-export-PyNode_SizeOf.patch
     ];
 
   preConfigure = ''
@@ -50,19 +63,26 @@ let
       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";
+  configureFlags = [
+    "--enable-shared"
+    "--with-threads"
+    "--enable-unicode=ucs4"
+  ] ++ optionals stdenv.isCygwin [
+    "--with-system-ffi"
+    "--with-system-expat"
+    "ac_cv_func_bind_textdomain_codeset=yes"
+  ];
+
+  postConfigure = if stdenv.isCygwin then ''
+    sed -i Makefile -e 's,PYTHONPATH="$(srcdir),PYTHONPATH="$(abs_srcdir),'
+  '' else null;
 
   buildInputs =
     optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
     [ bzip2 openssl ]
+    ++ optionals stdenv.isCygwin [ expat libffi ]
     ++ optionals includeModules (
         [ db gdbm ncurses sqlite readline
         ] ++ optionals x11Support [ tcl tk x11 libX11 ]
@@ -150,14 +170,17 @@ let
     if includeModules then null else stdenv.mkDerivation rec {
       name = "python-${moduleName}-${python.version}";
 
-      inherit src patches preConfigure configureFlags;
+      inherit src patches preConfigure postConfigure configureFlags;
 
       buildInputs = [ python ] ++ deps;
 
       C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
       LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
 
-      buildPhase = ''
+      # non-python gdbm has a libintl dependency on i686-cygwin, not on x86_64-cygwin
+      buildPhase = (if (stdenv.system == "i686-cygwin" && moduleName == "gdbm") then ''
+          sed -i setup.py -e "s:libraries = \['gdbm'\]:libraries = ['gdbm', 'intl']:"
+      '' else '''') + ''
           substituteInPlace setup.py --replace 'self.extensions = extensions' \
             'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]'
 
@@ -212,10 +235,10 @@ let
 
   } // optionalAttrs x11Support {
 
-    tkinter = buildInternalPythonModule {
+    tkinter = if stdenv.isCygwin then null else (buildInternalPythonModule {
       moduleName = "tkinter";
       deps = [ tcl tk x11 libX11 ];
-    };
+    });
 
   } // {
 

From 2876b726bdd8070c3dbc2d01cae7318de854fae0 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Fri, 24 Oct 2014 03:16:12 +0200
Subject: [PATCH 0347/2322] cygwin: currently no libsigsegv for x86_64-cygwin

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

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 35e0b6d927b..c6eb7ba1101 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -10,10 +10,10 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1
 
-  buildInputs = [ libsigsegv ]
+  buildInputs = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv
     ++ stdenv.lib.optional readlineSupport readline;
 
-  configureFlags = [ "--with-libsigsegv-prefix=${libsigsegv}" ]
+  configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}"
     ++ stdenv.lib.optional readlineSupport "--with-readline=${readline}"
       # only darwin where reported, seems OK on non-chrooted Fedora (don't rebuild stdenv)
     ++ stdenv.lib.optional (!readlineSupport && stdenv.isDarwin) "--without-readline";

From 7f7aca4e16fc66c6900f0dc6ed03894fd079eec8 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Fri, 24 Oct 2014 17:20:39 +0200
Subject: [PATCH 0348/2322] cygwin: asciidoc otherwise tries to install to
 //nix and fails on cygwin

'//' on cygwin is the beginning of a SAMBA path
---
 pkgs/tools/typesetting/asciidoc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index 370f0efb32a..81a457d0d2d 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -255,6 +255,7 @@ stdenv.mkDerivation rec {
   '';
 
   preInstall = "mkdir -p $out/etc/vim";
+  makeFlags = if stdenv.isCygwin then "DESTDIR=/." else null;
 
   meta = with stdenv.lib; {
     description = "Text-based document generation system";

From 6c7899b1f6a376f6a666060e095bab7f226c7f55 Mon Sep 17 00:00:00 2001
From: "U-user-PC\\\\user" <flo@chaoflow.net>
Date: Sun, 26 Oct 2014 15:27:39 +0100
Subject: [PATCH 0349/2322] cygwin: popt patches

---
 .../libraries/popt/1.16-cygwin.patch          | 11 ++++++
 .../libraries/popt/1.16-vpath.patch           | 34 +++++++++++++++++++
 pkgs/development/libraries/popt/default.nix   |  7 +++-
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/popt/1.16-cygwin.patch
 create mode 100644 pkgs/development/libraries/popt/1.16-vpath.patch

diff --git a/pkgs/development/libraries/popt/1.16-cygwin.patch b/pkgs/development/libraries/popt/1.16-cygwin.patch
new file mode 100644
index 00000000000..9c084f0b8ea
--- /dev/null
+++ b/pkgs/development/libraries/popt/1.16-cygwin.patch
@@ -0,0 +1,11 @@
+--- origsrc/poptconfig.c	2009-05-20 08:18:07.000000000 -0500
++++ src/poptconfig.c	2012-03-29 18:13:46.869286100 -0500
+@@ -42,7 +42,7 @@ extern int glob_pattern_p (const char *_
+ /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
+ #endif	/* __LCLINT__ */
+ 
+-#if !defined(__GLIBC__)
++#if !defined(__GLIBC__) && !defined(__CYGWIN__)
+ /* Return nonzero if PATTERN contains any metacharacters.
+    Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
+ static int
diff --git a/pkgs/development/libraries/popt/1.16-vpath.patch b/pkgs/development/libraries/popt/1.16-vpath.patch
new file mode 100644
index 00000000000..4cfa1c8fb4d
--- /dev/null
+++ b/pkgs/development/libraries/popt/1.16-vpath.patch
@@ -0,0 +1,34 @@
+--- origsrc/Doxyfile.in	2008-04-26 16:57:32.000000000 -0500
++++ src/Doxyfile.in	2012-03-29 18:15:56.649709100 -0500
+@@ -460,14 +460,14 @@ WARN_LOGFILE           =
+ # with spaces.
+ 
+ INPUT                  = \
+-                        ./popt.c \
+-                        ./popt.h \
+-                        ./poptconfig.c \
+-                        ./popthelp.c \
+-                        ./poptint.c \
+-                        ./poptint.h \
+-                        ./poptparse.c \
+-			./system.h
++                        @srcdir@/popt.c \
++                        @srcdir@/popt.h \
++                        @srcdir@/poptconfig.c \
++                        @srcdir@/popthelp.c \
++                        @srcdir@/poptint.c \
++                        @srcdir@/poptint.h \
++                        @srcdir@/poptparse.c \
++			@srcdir@/system.h
+ 
+ # If the value of the INPUT tag contains directories, you can use the 
+ # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+@@ -658,7 +658,7 @@ HTML_HEADER            =
+ # each generated HTML page. If it is left blank doxygen will generate a 
+ # standard footer.
+ 
+-HTML_FOOTER            = footer_no_timestamp.html
++HTML_FOOTER            = @srcdir@/footer_no_timestamp.html
+ 
+ # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+ # style sheet that is used by each HTML page. It can be used to 
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index 03f917daa23..f99514f054a 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -2,12 +2,17 @@
 
 stdenv.mkDerivation rec {
   name = "popt-1.16";
-  
+
   src = fetchurl {
     url = "http://rpm5.org/files/popt/${name}.tar.gz";
     sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77";
   };
 
+  patches = if stdenv.isCygwin then [
+    ./1.16-cygwin.patch
+    ./1.16-vpath.patch
+  ] else null;
+
   meta = {
     description = "command line option parsing library";
   };

From 12b781a945aa4c6c8d95f36161780f693a43c73d Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sun, 26 Oct 2014 19:37:09 +0100
Subject: [PATCH 0350/2322] cygwin: zip

---
 pkgs/tools/archivers/zip/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index 92d8a22fa47..e4da0236cdf 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, enableNLS ? true, libnatspec ? null }:
+{ stdenv, fetchurl, enableNLS ? true, libnatspec ? null, libiconv }:
 
 assert enableNLS -> libnatspec != null;
 
@@ -13,13 +13,16 @@ stdenv.mkDerivation {
     sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h";
   };
 
+  # should be makeFlags on all archs, not changed yet to prevent rebuild
   buildFlags="-f unix/Makefile generic";
+  makeFlags = if stdenv.isCygwin then "-f unix/Makefile ${if stdenv.isCygwin then "cygwin" else "generic"}" else null;
 
   installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp";
 
-  patches = if enableNLS then [ ./natspec-gentoo.patch.bz2 ] else [];
+  patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else [];
 
-  buildInputs = if enableNLS then [ libnatspec ] else [];
+  buildInputs = stdenv.lib.optional enableNLS libnatspec
+    ++ stdenv.lib.optional stdenv.isCygwin libiconv;
 
   meta = {
     description = "Compressor/archiver for creating and modifying zipfiles";

From 90a97d32df1a7809d755c47ed84c25fd2d46b4fe Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 29 Oct 2014 23:44:53 +0100
Subject: [PATCH 0351/2322] cygwin cmake

---
 .../build-managers/cmake/2.8.11-cygwin.patch  | 237 ++++++++++++++++++
 .../tools/build-managers/cmake/default.nix    |   4 +-
 2 files changed, 239 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch

diff --git a/pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch b/pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch
new file mode 100644
index 00000000000..e16dab32632
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch
@@ -0,0 +1,237 @@
+--- cmake-2.8.10/Source/cmFileCommand.cxx	2012-10-31 10:32:06.000000000 -0500
++++ cmake-2.8.10/Source/cmFileCommand.cxx	2013-03-16 22:55:11.306681100 -0500
+@@ -1002,7 +1002,7 @@ protected:
+   MatchProperties CollectMatchProperties(const char* file)
+     {
+     // Match rules are case-insensitive on some platforms.
+-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
++#if defined(_WIN32) || defined(__APPLE__)
+     std::string lower = cmSystemTools::LowerCase(file);
+     const char* file_to_match = lower.c_str();
+ #else
+--- cmake-2.8.10/Source/cmInstallCommand.cxx	2012-10-31 10:32:06.000000000 -0500
++++ cmake-2.8.10/Source/cmInstallCommand.cxx	2013-03-16 22:56:21.008667800 -0500
+@@ -1090,7 +1090,7 @@ cmInstallCommand::HandleDirectoryMode(st
+       {
+       literal_args += " REGEX \"";
+     // Match rules are case-insensitive on some platforms.
+-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
++#if defined(_WIN32) || defined(__APPLE__)
+       std::string regex = cmSystemTools::LowerCase(args[i]);
+ #else
+       std::string regex = args[i];
+--- cmake-2.8.10/Source/kwsys/Glob.cxx	2012-10-31 10:32:06.000000000 -0500
++++ cmake-2.8.10/Source/kwsys/Glob.cxx	2013-03-16 22:58:54.192429400 -0500
+@@ -37,7 +37,7 @@
+ #include <string.h>
+ namespace KWSYS_NAMESPACE
+ {
+-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
++#if defined(_WIN32) || defined(__APPLE__)
+ // On Windows and apple, no difference between lower and upper case
+ # define KWSYS_GLOB_CASE_INDEPENDENT
+ #endif
+--- cmake-2.8.11/Source/kwsys/SystemInformation.cxx	2013-05-15 12:38:13.000000000 -0500
++++ cmake-2.8.11/Source/kwsys/SystemInformation.cxx	2013-07-08 01:57:31.216321800 -0500
+@@ -888,7 +888,7 @@ void SystemInformation::RunMemoryCheck()
+ // Hide implementation details in an anonymous namespace.
+ namespace {
+ // *****************************************************************************
+-#if defined(__linux) || defined(__APPLE__)
++#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__)
+ int LoadLines(
+       FILE *file,
+       kwsys_stl::vector<kwsys_stl::string> &lines)
+@@ -918,7 +918,7 @@ int LoadLines(
+   return nRead;
+ }
+ 
+-# if defined(__linux)
++# if defined(__linux) || defined(__CYGWIN__)
+ // *****************************************************************************
+ int LoadLines(
+       const char *fileName,
+@@ -957,7 +957,7 @@ int NameValue(
+ }
+ #endif
+ 
+-#if defined(__linux)
++#if defined(__linux) || defined(__CYGWIN__)
+ // ****************************************************************************
+ template<typename T>
+ int GetFieldsFromFile(
+@@ -2869,7 +2869,6 @@ bool SystemInformationImplementation::Re
+     pos = buffer.find("processor\t",pos+1);
+     }
+ 
+-#ifdef __linux
+   // Find the largest physical id.
+   int maxId = -1;
+   kwsys_stl::string idc =
+@@ -2893,14 +2892,6 @@ bool SystemInformationImplementation::Re
+   this->NumberOfPhysicalCPU=static_cast<unsigned int>(
+     numberOfCoresPerCPU*(maxId+1));
+ 
+-#else // __CYGWIN__
+-  // does not have "physical id" entries, neither "cpu cores"
+-  // this has to be fixed for hyper-threading.
+-  kwsys_stl::string cpucount =
+-    this->ExtractValueFromCpuInfoFile(buffer,"cpu count");
+-  this->NumberOfPhysicalCPU=
+-    this->NumberOfLogicalCPU = atoi(cpucount.c_str());
+-#endif
+   // gotta have one, and if this is 0 then we get a / by 0n
+   // better to have a bad answer than a crash
+   if(this->NumberOfPhysicalCPU <= 0)
+@@ -3086,7 +3077,7 @@ SystemInformationImplementation::GetHost
+   GlobalMemoryStatusEx(&statex);
+   return statex.ullTotalPhys/1024;
+ # endif
+-#elif defined(__linux)
++#elif defined(__linux) || defined(__CYGWIN__)
+   SystemInformation::LongLong memTotal=0;
+   int ierr=GetFieldFromFile("/proc/meminfo","MemTotal:",memTotal);
+   if (ierr)
+@@ -3217,7 +3208,7 @@ SystemInformationImplementation::GetHost
+   GlobalMemoryStatusEx(&statex);
+   return (statex.ullTotalPhys - statex.ullAvailPhys)/1024;
+ # endif
+-#elif defined(__linux)
++#elif defined(__linux) || defined(__CYGWIN__)
+   const char *names[3]={"MemTotal:","MemFree:",NULL};
+   SystemInformation::LongLong values[2]={SystemInformation::LongLong(0)};
+   int ierr=GetFieldsFromFile("/proc/meminfo",names,values);
+@@ -3276,7 +3267,7 @@ SystemInformationImplementation::GetProc
+     return -2;
+     }
+   return pmc.WorkingSetSize/1024;
+-#elif defined(__linux)
++#elif defined(__linux) || defined(__CYGWIN__)
+   SystemInformation::LongLong memUsed=0;
+   int ierr=GetFieldFromFile("/proc/self/status","VmRSS:",memUsed);
+   if (ierr)
+@@ -3328,7 +3319,7 @@ SystemInformationImplementation::GetProc
+ {
+ #if defined(_WIN32)
+   return GetCurrentProcessId();
+-#elif defined(__linux) || defined(__APPLE__)
++#elif defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__)
+   return getpid();
+ #else
+   return -1;
+--- cmake-2.8.10/Source/kwsys/SystemTools.cxx	2012-10-31 10:32:06.000000000 -0500
++++ cmake-2.8.10/Source/kwsys/SystemTools.cxx	2013-03-16 22:52:11.830415600 -0500
+@@ -75,19 +75,12 @@
+ // Windows API.
+ #if defined(_WIN32)
+ # include <windows.h>
+-#elif defined (__CYGWIN__)
+-# include <windows.h>
+-# undef _WIN32
+ #endif
+ 
+ #if !KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H
+ extern char **environ;
+ #endif
+ 
+-#ifdef __CYGWIN__
+-extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32_path);
+-#endif
+-
+ // getpwnam doesn't exist on Windows and Cray Xt3/Catamount
+ // same for TIOCGWINSZ
+ #if defined(_WIN32) || defined (__LIBCATAMOUNT__)
+@@ -1068,7 +1061,7 @@ bool SystemTools::SameFile(const char* f
+ }
+ 
+ //----------------------------------------------------------------------------
+-#if defined(_WIN32) || defined(__CYGWIN__)
++#if defined(_WIN32)
+ static bool WindowsFileExists(const char* filename)
+ {
+   WIN32_FILE_ATTRIBUTE_DATA fd;
+@@ -1083,7 +1076,7 @@ bool SystemTools::FileExists(const char*
+     {
+     return false;
+     }
+-#if defined(__CYGWIN__)
++#if 0
+   // Convert filename to native windows path if possible.
+   char winpath[MAX_PATH];
+   if(SystemTools::PathCygwinToWin32(filename, winpath))
+@@ -1111,7 +1104,7 @@ bool SystemTools::FileExists(const char*
+ }
+ 
+ //----------------------------------------------------------------------------
+-#ifdef __CYGWIN__
++#if 0
+ bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path)
+ {
+   SystemToolsTranslationMap::iterator i =
+@@ -3894,7 +3887,7 @@ bool SystemTools::LocateFileInDir(const
+ bool SystemTools::FileIsFullPath(const char* in_name)
+ {
+   kwsys_stl::string name = in_name;
+-#if defined(_WIN32) || defined(__CYGWIN__)
++#if defined(_WIN32)
+   // On Windows, the name must be at least two characters long.
+   if(name.length() < 2)
+     {
+@@ -4712,9 +4705,6 @@ bool SystemTools::ParseURL( const kwsys_
+ unsigned int SystemToolsManagerCount;
+ SystemToolsTranslationMap *SystemTools::TranslationMap;
+ SystemToolsTranslationMap *SystemTools::LongPathMap;
+-#ifdef __CYGWIN__
+-SystemToolsTranslationMap *SystemTools::Cyg2Win32Map;
+-#endif
+ 
+ // SystemToolsManager manages the SystemTools singleton.
+ // SystemToolsManager should be included in any translation unit
+@@ -4760,9 +4750,6 @@ void SystemTools::ClassInitialize()
+   // Allocate the translation map first.
+   SystemTools::TranslationMap = new SystemToolsTranslationMap;
+   SystemTools::LongPathMap = new SystemToolsTranslationMap;
+-#ifdef __CYGWIN__
+-  SystemTools::Cyg2Win32Map = new SystemToolsTranslationMap;
+-#endif
+ 
+   // Add some special translation paths for unix.  These are not added
+   // for windows because drive letters need to be maintained.  Also,
+@@ -4817,9 +4804,6 @@ void SystemTools::ClassFinalize()
+ {
+   delete SystemTools::TranslationMap;
+   delete SystemTools::LongPathMap;
+-#ifdef __CYGWIN__
+-  delete SystemTools::Cyg2Win32Map;
+-#endif
+ }
+ 
+ 
+--- cmake-2.8.10/Source/kwsys/SystemTools.hxx.in	2012-10-31 10:32:06.000000000 -0500
++++ cmake-2.8.10/Source/kwsys/SystemTools.hxx.in	2013-03-16 23:10:30.185237900 -0500
+@@ -277,15 +277,6 @@ public:
+   static bool FileExists(const char* filename);
+ 
+   /**
+-   * Converts Cygwin path to Win32 path. Uses dictionary container for
+-   * caching and calls to cygwin_conv_to_win32_path from Cygwin dll
+-   * for actual translation.  Returns true on success, else false.
+-   */
+-#ifdef __CYGWIN__
+-  static bool PathCygwinToWin32(const char *path, char *win32_path);
+-#endif
+-
+-  /**
+    * Return file length
+    */
+   static unsigned long FileLength(const char *filename);
+@@ -887,9 +878,6 @@ private:
+    */
+   static SystemToolsTranslationMap *TranslationMap;
+   static SystemToolsTranslationMap *LongPathMap;
+-#ifdef __CYGWIN__
+-  static SystemToolsTranslationMap *Cyg2Win32Map;
+-#endif
+   friend class SystemToolsManager;
+ };
+ 
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 45bdeece45e..9f2ed0a7352 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       url = "http://public.kitware.com/Bug/file_download.php?"
           + "file_id=4981&type=bug";
       sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
-    });
+    }) ++ stdenv.lib.optional stdenv.isCygwin ./2.8.11-cygwin.patch;
 
   buildInputs =
     [ bzip2 curl expat libarchive xz zlib ]
@@ -52,8 +52,8 @@ stdenv.mkDerivation rec {
     [
       "--docdir=/share/doc/${name}"
       "--mandir=/share/man"
-      "--system-libs"
     ]
+    ++ optional (!stdenv.isCygwin) "--system-libs"
     ++ optional (jsoncpp == null) "--no-system-jsoncpp"
     ++ optional useQt4 "--qt-gui"
     ++ ["--"]

From d6c4963bcb9d1f560838c216d2ca18a759ee65be Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Wed, 29 Oct 2014 23:45:15 +0100
Subject: [PATCH 0352/2322] cygwin libarchive

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

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index f0c3c0632a9..076d2240277 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz ] ++
     stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ];
 
+  preBuild = if stdenv.isCygwin then ''
+    echo "#include <windows.h>" >> config.h
+  '' else null;
+
   meta = {
     description = "Multi-format archive and compression library";
     longDescription = ''

From a02799cd78dcb8d956d13b57d0644c5a69e46f92 Mon Sep 17 00:00:00 2001
From: Marko Durkovic <marko@miding.de>
Date: Fri, 7 Nov 2014 14:42:59 +0100
Subject: [PATCH 0353/2322] cygwin: fix ncurses

1. Fix linking against ncurses.dll
2. Fix segfaults with threaded code
---
 .../development/libraries/ncurses/default.nix | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 4409dfc4eca..f0519fa981d 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -49,6 +49,15 @@ stdenv.mkDerivation rec {
     (mkEnable unicode     "widec"       null)
     (mkEnable true        "ext-colors"  null)
     (mkEnable true        "ext-mouse"   null)
+  ] ++ stdenv.lib.optionals stdenv.isCygwin [
+    "--enable-sp-funcs"
+    "--enable-term-driver"
+    "--enable-const"
+    "--enable-ext-colors"
+    "--enable-ext-mouse"
+    "--enable-reentrant"
+    "--enable-colorfgbg"
+    "--enable-tcap-names"
   ];
 
   # PKG_CONFIG_LIBDIR is where the *.pc files will be installed. If this
@@ -60,6 +69,8 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig"
     mkdir -p "$PKG_CONFIG_LIBDIR"
+  '' + stdenv.lib.optionalString stdenv.isCygwin ''
+    sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure
   '';
 
   selfNativeBuildInput = true;
@@ -71,7 +82,7 @@ stdenv.mkDerivation rec {
   # When building a wide-character (Unicode) build, create backward
   # compatibility links from the the "normal" libraries to the
   # wide-character libraries (e.g. libncurses.so to libncursesw.so).
-  postInstall = if unicode then ''
+  postInstall = if unicode then (''
     # Create a non-abi versioned config
     cfg=$(basename $out/bin/ncurses*-config)
     ln -svf $cfg $out/bin/ncursesw-config
@@ -95,7 +106,13 @@ stdenv.mkDerivation rec {
     # Create curses compatability
     ln -svf libncursesw.so $out/lib/libcursesw.so
     ln -svf libncursesw.so $out/lib/libcurses.so
-  '' else ''
+  '' + stdenv.lib.optionalString stdenv.isCygwin ''
+    for lib in $libs; do
+      if test -e $out/lib/lib''${lib}w.dll.a; then
+          ln -svf lib''${lib}w.dll.a $out/lib/lib$lib.dll.a
+      fi
+    done
+  '') else ''
     # Create a non-abi versioned config
     cfg=$(basename $out/bin/ncurses*-config)
     ln -svf $cfg $out/bin/ncurses-config

From 29475103be8934140e4c6e19cb3af560376e3d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 28 May 2015 11:10:08 +0200
Subject: [PATCH 0354/2322] gnome3.anjuta: fix hash

/cc @lethalman. I've got no idea if the hash has changed upstream or what.
I thought it remained from 3.12 version of anjuta, but that was a
different hash.
---
 pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix
index a55adf6d975..35315f67cad 100644
--- a/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz";
-    sha256 = "b1aac2d4c35891b23c9bc3f168bf2845e02d0a438742478c98e450950d82b5e5";
+    sha256 = "0g4lv6rzkwfz2wp4fg97qlbvyfh2k9gl7k7lidazaikvnc0jlhvp";
   };
 
   enableParallelBuilding = true;

From afea09936e4aae232e6c63794bb851d173f0fa90 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 26 May 2015 01:56:24 -0700
Subject: [PATCH 0355/2322] rocksdb: 3.10 -> 3.11

---
 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 88d94ec0f2c..9a720a35ff0 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 = "3.10";
+  version = "3.11";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "rocksdb";
     rev = "v${version}";
-    sha256 = "1px345x9cyaxyjlzsf3bcxixvfaxn9x3ysq7biajyfhk8wq1n4p0";
+    sha256 = "06gf0k6hjarc7iw0w0p8814d27f8vrc3s0laarh7qdd4wshw02s8";
   };
 
   buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ];

From 4389ae5208ec9b7e80b3b0e4ee10e2709333519f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 26 May 2015 02:45:34 -0700
Subject: [PATCH 0356/2322] libverto: Add derivation

---
 .../libraries/libverto/default.nix            | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/libraries/libverto/default.nix

diff --git a/pkgs/development/libraries/libverto/default.nix b/pkgs/development/libraries/libverto/default.nix
new file mode 100644
index 00000000000..e4097aa57d6
--- /dev/null
+++ b/pkgs/development/libraries/libverto/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, pkgconfig
+
+# Optional Dependencies
+, glib ? null, libev ? null, libevent ? null, tevent ? null, talloc ? null
+}:
+with stdenv;
+let
+  optGlib = shouldUsePkg glib;
+  optLibev = shouldUsePkg libev;
+  optLibevent = shouldUsePkg libevent;
+  optTevent = shouldUsePkg tevent;
+  optTalloc = shouldUsePkg talloc;
+in
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "libverto-0.2.6";
+
+  src = fetchurl {
+    url = "https://fedorahosted.org/releases/l/i/libverto/${name}.tar.gz";
+    sha256 = "17hwr55ga0rkm5cnyfiipyrk9n372x892ph9wzi88j2zhnisdv0p";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ optGlib optLibev optLibevent ]
+    ++ optionals (optTevent != null && optTalloc != null) [
+      optTevent optTalloc
+    ];
+
+  postInstall = ''
+    # In v0.2.6 the shipped pkg-config files have an out of order
+    # declaration of exec_prefix breaking them. This fixes that issue
+    sed -i 's,''${exec_prefix},''${prefix},g' $out/lib/pkgconfig/*.pc
+  '';
+
+  meta = {
+    homepage = https://fedorahosted.org/libverto/;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60cffbbf4d9..1d9ac42ac3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7170,6 +7170,10 @@ let
 
   libvdpau = callPackage ../development/libraries/libvdpau { };
 
+  libverto = callPackage ../development/libraries/libverto {
+    glib = null; # Don't include fairly heavy dependency
+  };
+
   libvirt = callPackage ../development/libraries/libvirt { };
 
   libvirt-glib = callPackage ../development/libraries/libvirt-glib { };

From 85932bc5a998060e76090273b51d35133a7a2dbb Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 28 May 2015 00:53:47 -0700
Subject: [PATCH 0357/2322] krb5: 1.13.1 -> 1.13.2

---
 .../core/gnome-control-center/default.nix     |   4 +-
 pkgs/development/compilers/hhvm/default.nix   |   4 +-
 pkgs/development/libraries/kerberos/krb5.nix  | 120 +++++++++++++++---
 pkgs/development/libraries/ti-rpc/default.nix |   4 +-
 pkgs/tools/system/rsyslog/default.nix         |   6 +-
 pkgs/top-level/all-packages.nix               |   3 +
 6 files changed, 115 insertions(+), 26 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
index c425f41e8e1..725aa6a6b12 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -2,7 +2,7 @@
 , libcanberra, libcanberra_gtk3, accountsservice, libpwquality, pulseaudio, fontconfig
 , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
-, cracklib, python, krb5, networkmanagerapplet, networkmanager
+, cracklib, python, libkrb5, networkmanagerapplet, networkmanager
 , libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev
 , docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
       libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
       gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality
-      accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile
+      accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
       shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
       gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
       gnome3.vino udev libcanberra_gtk3
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index 72bdabb4349..a5586117588 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached, pcre
 , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c
-, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, krb5
+, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
 , libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit
 , libvpx, imagemagick, fribidi
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb git perl
       libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
       oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
-      libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml krb5
+      libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5
       gmp libyaml libedit libvpx imagemagick fribidi
     ];
 
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 41c570ee554..c60ff03aa67 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -1,41 +1,127 @@
-{ stdenv, fetchurl, pkgconfig, perl, ncurses, yacc, openssl, openldap, bootstrap_cmds }:
+{ stdenv, fetchurl, pkgconfig, perl
+, yacc, bootstrap_cmds
 
+# Optional Dependencies
+, libedit ? null, readline ? null, ncurses ? null, libverto ? null
+, openldap ? null, db ? null
+
+# Crypto Dependencies
+, openssl ? null, nss ? null, nspr ? null
+
+# Extra Arguments
+, prefix ? ""
+}:
+
+with stdenv;
 let
-  pname = "krb5";
-  version = "1.13.1";
-  name = "${pname}-${version}";
-  webpage = http://web.mit.edu/kerberos/;
-in
+  libOnly = prefix == "lib";
 
-stdenv.mkDerivation (rec {
-  inherit name;
+  optOpenssl = shouldUsePkg openssl;
+  optNss = shouldUsePkg nss;
+  optNspr = shouldUsePkg nspr;
+  optLibedit = if libOnly then null else shouldUsePkg libedit;
+  optReadline = if libOnly then null else shouldUsePkg readline;
+  optNcurses = if libOnly then null else shouldUsePkg ncurses;
+  optLibverto = shouldUsePkg libverto;
+  optOpenldap = if libOnly then null else shouldUsePkg openldap;
+  optDb = if libOnly then null else shouldUsePkg db;
+
+  # Prefer the openssl implementation
+  cryptoStr = if optOpenssl != null then "openssl"
+    else if optNss != null && optNspr != null then "nss"
+    else "builtin";
+
+  cryptoInputs = {
+    "openssl" = [ optOpenssl ];
+    "nss" = [ optNss optNspr ];
+    "builtin" = [ ];
+  }.${cryptoStr};
+
+  tlsStr = if optOpenssl != null then "openssl"
+    else "no";
+
+  tlsInputs = {
+    "openssl" = [ optOpenssl ];
+    "no" = [ ];
+  }.${tlsStr};
+
+  # Libedit is less buggy in krb5, readline breaks tests
+  lineParserStr = if optLibedit != null then "libedit"
+    else if optReadline != null && optNcurses != null then "readline"
+    else "no";
+
+  lineParserInputs = {
+    "libedit" = [ optLibedit ];
+    "readline" = [ optReadline optNcurses ];
+    "no" = [ ];
+  }.${lineParserStr};
+in
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "${prefix}krb5-${version}";
+  version = "1.13.2";
 
   src = fetchurl {
-    url = "${webpage}dist/krb5/1.13/${name}-signed.tar";
-    sha256 = "0gk6jvr64rf6l4xcyxn8i3fr5d1j7dhqvwyv3vw2qdkzz7yjkxjd";
+    url = "${meta.homepage}dist/krb5/1.13/krb5-${version}-signed.tar";
+    sha256 = "1qbdzyrws7d0q4filsibh28z54pd5l987jr0ygv43iq9085w6a75";
   };
 
-  buildInputs = [ pkgconfig perl ncurses yacc openssl openldap ]
+  nativeBuildInputs = [ pkgconfig perl ];
+  buildInputs = [ yacc optOpenssl optLibverto optOpenldap ]
+    ++ cryptoInputs ++ tlsInputs ++ lineParserInputs
     # Provides the mig command used by the build scripts
-    ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds ;
+    ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds;
 
   unpackPhase = ''
     tar -xf $src
-    tar -xzf ${name}.tar.gz
-    cd ${name}/src
+    tar -xzf krb5-${version}.tar.gz
+    cd krb5-${version}/src
   '';
 
-  configureFlags = [ "--with-tcl=no" ];
+  configureFlags = [
+    (mkOther                                "sysconfdir"          "/etc")
+    (mkOther                                "localstatedir"       "/var")
+    (mkEnable false                         "athena"              null)
+    (mkWith   false                         "vague-errors"        null)
+    (mkWith   true                          "crypto-impl"         cryptoStr)
+    (mkWith   true                          "pkinit-crypto-impl"  cryptoStr)
+    (mkWith   true                          "tls-impl"            tlsStr)
+    (mkEnable true                          "aesni"               null)
+    (mkEnable true                          "kdc-lookaside-cache" null)
+    (mkEnable (optOpenssl != null)          "pkinit"              null)
+    (mkWith   (lineParserStr == "libedit")  "libedit"             null)
+    (mkWith   (lineParserStr == "readline") "readline"            null)
+    (mkWith   (optLibverto != null)         "system-verto"        null)
+    (mkWith   (optOpenldap != null)         "ldap"                null)
+    (mkWith   false                         "tcl"                 null)
+    (mkWith   (optDb != null)               "system-db"           null)
+  ];
+
+  buildPhase = optionalString libOnly ''
+    (cd util; make)
+    (cd include; make)
+    (cd lib; make)
+    (cd build-tools; make)
+  '';
+
+  installPhase = optionalString libOnly ''
+    mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}}
+    (cd util; make install)
+    (cd include; make install)
+    (cd lib; make install)
+    (cd build-tools; make install)
+    rm -rf $out/{bin,sbin,share}
+  '';
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
+    homepage = http://web.mit.edu/kerberos/;
     description = "MIT Kerberos 5";
-    homepage = webpage;
     license = "MPL";
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
   };
 
   passthru.implementation = "krb5";
-})
+}
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index b135e49f52b..eb795d6b28e 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, krb5 }:
+{ fetchurl, stdenv, libkrb5 }:
 
 stdenv.mkDerivation rec {
   name = "libtirpc-0.3.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "07d1wlfzf3ia09mjn3f3ay8isk7yx4a6ckfkzx5khnqlc7amkzna";
   };
 
-  propagatedBuildInputs = [ krb5 ];
+  propagatedBuildInputs = [ libkrb5 ];
 
   # http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf
   preConfigure = ''
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 195e6bc4329..e8abe0ef0d0 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libestr, json_c, zlib, pythonPackages
-, krb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null
+, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null
 , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null
 , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null
 , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig libestr json_c zlib pythonPackages.docutils
-    krb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls
+    libkrb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls
     libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka
     libmongo-client czmq rabbitmq-c hiredis
   ] ++ stdenv.lib.optional stdenv.isLinux systemd;
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     (mkWith   true                      "systemdsystemunitdir" "\${out}/etc/systemd/system")
     (mkEnable true                      "largefile"            null)
     (mkEnable true                      "regexp"               null)
-    (mkEnable (krb5 != null)            "gssapi-krb5"          null)
+    (mkEnable (libkrb5 != null)         "gssapi-krb5"          null)
     (mkEnable true                      "klog"                 null)
     (mkEnable true                      "kmsg"                 null)
     (mkEnable (systemd != null)         "imjournal"            null)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d9ac42ac3a..4b82e305651 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6464,6 +6464,9 @@ let
     };
     inherit (darwin) bootstrap_cmds;
   };
+  libkrb5 = krb5.override {
+    prefix = "lib";
+  };
 
   LASzip = callPackage ../development/libraries/LASzip { };
 

From 7a9e0a5ae4ea51b3d5719f8d25f623ff1c3d3739 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 28 May 2015 02:19:46 -0700
Subject: [PATCH 0358/2322] util-linux: 2.26.1 -> 2.26.2

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

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 13749d7eaa1..7f2aeca255c 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }:
 
 stdenv.mkDerivation rec {
-  name = "util-linux-2.26.1";
+  name = "util-linux-2.26.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/util-linux/v2.26/${name}.tar.xz";
-    sha256 = "0vmvk5khfwf71xbsnplvmk9ikwnlbhysc96mnkgwpqk2faairp12";
+    sha256 = "0rlnzmiqdannzf81fbh41541lrck63v9zhskm6h4i2jj8ahvsa8f";
   };
 
-  patches = [ ./rtcwake-search-PATH-for-shutdown.patch
-            ];
+  patches = [
+    ./rtcwake-search-PATH-for-shutdown.patch
+  ];
 
   #FIXME: make it also work on non-nixos?
   postPatch = ''

From fa89e79391bdb2e383df6017514028bed254d074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 28 May 2015 11:44:58 +0200
Subject: [PATCH 0359/2322] gnome3.anjuta: fix gsettings to be runnable at
 least

---
 pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix
index 35315f67cad..e488ab64047 100644
--- a/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
-  itstool, python }:
+  itstool, python, makeWrapper }:
 
 let
   major = gnome3.version;
@@ -17,7 +17,13 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
-    gnome3.libgda gnome3.gtksourceview intltool itstool python ];
+    gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper ];
+
+  preFixup = ''
+    wrapProgram $out/bin/anjuta \
+      --prefix XDG_DATA_DIRS : \
+        "$GSETTINGS_SCHEMAS_PATH"
+  '';
 
   meta = with stdenv.lib; {
     description = "Software development studio";

From 9f25762d29c0039cad81a139b5d79f6fc589509d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= <r.dahlen@gmail.com>
Date: Thu, 28 May 2015 10:52:50 +0100
Subject: [PATCH 0360/2322] apache-kafka: Treat exit code 143 as success.

JVMs exit with exit code 128+signal when receiving a (terminating)
signal. This means graceful termination of a JVM will result in 143, so
add that to `SuccessExitStatus` in systemd service unit.
---
 nixos/modules/services/misc/apache-kafka.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
index 168615153fe..90555ebc468 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -143,6 +143,7 @@ in {
         '';
         User = "apache-kafka";
         PermissionsStartOnly = true;
+        SuccessExitStatus = "0 143";
       };
       preStart = ''
         mkdir -m 0700 -p ${concatStringsSep " " cfg.logDirs}

From 026aa123a411d186614e3b7ce0092b2809394e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 28 May 2015 11:53:21 +0200
Subject: [PATCH 0361/2322] speexdsp: fix integer types not being included

Description in comments of https://aur.archlinux.org/packages/retroshare/
I'm not sure why their conditionals don't work, but this fix should be safe.

/cc maintainer @wkennington.
---
 pkgs/development/libraries/speexdsp/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix
index 1a9a6d486f3..7112afbea8a 100644
--- a/pkgs/development/libraries/speexdsp/default.nix
+++ b/pkgs/development/libraries/speexdsp/default.nix
@@ -2,14 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "speexdsp-1.2rc3";
-  
+
   src = fetchurl {
     url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz";
     sha256 = "1wcjyrnwlkayb20zdhp48y260rfyzg925qpjpljd5x9r01h8irja";
   };
 
   patches = [ ./build-fix.patch ];
-  
+  postPatch = "sed '3i#include <stdint.h>' -i ./include/speex/speexdsp_config_types.h.in";
+
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ fftw ];
 

From adea54614d848c8a85e700885ec95a93402bd72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 28 May 2015 13:10:47 +0200
Subject: [PATCH 0362/2322] fltk13, octave: expose fltk13 config and override
 in octave

Octave needs fltk with libxft, see #8007.

I'm not much familiar with composableDerivation,
so perhaps this change could be done in a better way...
---
 pkgs/development/libraries/fltk/fltk13.nix | 4 ++--
 pkgs/top-level/all-packages.nix            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix
index df89482536f..262ef8b865e 100644
--- a/pkgs/development/libraries/fltk/fltk13.nix
+++ b/pkgs/development/libraries/fltk/fltk13.nix
@@ -1,6 +1,6 @@
 { composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
 , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng
-
+, cfg ? {}
 , automake, autoconf, libtool
 }:
 
@@ -48,7 +48,7 @@ composableDerivation.composableDerivation {} {
     localpngSupport = false;
     sharedSupport = true;
     threadsSupport = true;
-  };
+  } // cfg;
 
   meta = {
     description = "A C++ cross-platform light-weight GUI library binding";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b82e305651..751e201cd82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4782,7 +4782,7 @@ let
   };
 
   octave = callPackage ../development/interpreters/octave {
-    fltk = fltk13;
+    fltk = fltk13.override { cfg.xftSupport = true; };
     qt = null;
     ghostscript = null;
     llvm = null;
@@ -4792,7 +4792,7 @@ let
     jdk = null;
   };
   octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
-    fltk = fltk13;
+    fltk = fltk13.override { cfg.xftSupport = true; };
     qt = qt4;
   }));
 

From 6cc8869f383a242c4c995e9c158cc03d5b2c5170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 28 May 2015 13:14:37 +0200
Subject: [PATCH 0363/2322] fltk13: fix a bug preventing use in octave

Fixes #8007 (together with the parent commit).
---
 pkgs/development/libraries/fltk/fltk13.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix
index 262ef8b865e..a5b65f09e61 100644
--- a/pkgs/development/libraries/fltk/fltk13.nix
+++ b/pkgs/development/libraries/fltk/fltk13.nix
@@ -15,6 +15,12 @@ composableDerivation.composableDerivation {} {
     sha256 = "15qd7lkz5d5ynz70xhxhigpz3wns39v9xcf7ggkl0792syc8sfgq";
   };
 
+  # http://www.fltk.org/str.php?L3156
+  postPatch = ''
+    substituteInPlace FL/x.H \
+      --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand'
+  '';
+
   propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
 
   enableParallelBilding = true;

From ec8babb4fd754eb64d538b8a1a3020b970fe63d5 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Thu, 28 May 2015 07:39:10 -0400
Subject: [PATCH 0364/2322] ffmpeg: include networking support add networking
 support to the default build, required by mpv

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

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 9a373c52278..13a339740f4 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
-, alsaLib, bzip2, fontconfig, freetype, libiconv, lame, libass, libogg, libtheora
-, libva, libvdpau, libvorbis, libvpx, lzma, pulseaudio, SDL, soxr, x264
-, xvidcore, zlib
+, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
+, libtheora, libva, libvdpau, libvorbis, libvpx, lzma, pulseaudio, SDL, soxr
+, x264, xvidcore, zlib
 , openglSupport ? false, mesa ? null
 # Build options
 , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
@@ -85,6 +85,7 @@ stdenv.mkDerivation rec {
        else
          "--disable-pthreads --disable-w32threads")
       (ifMinVer "0.9" "--disable-os2threads") # We don't support OS/2
+      "--enable-network"
       (ifMinVer "2.4" "--enable-pixelutils")
     # Executables
       "--enable-ffmpeg"
@@ -105,6 +106,7 @@ stdenv.mkDerivation rec {
       (ifMinVer "0.6" "--disable-doc")
     # External Libraries
       "--enable-bzlib"
+      "--enable-gnutls"
       (ifMinVer "1.0" "--enable-fontconfig")
       (ifMinVer "0.7" "--enable-libfreetype")
       "--enable-libmp3lame"
@@ -134,8 +136,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ perl pkgconfig texinfo yasm ];
 
   buildInputs = [
-    bzip2 fontconfig freetype libiconv lame libass libogg libtheora libvdpau
-    libvorbis lzma SDL soxr x264 xvidcore zlib
+    bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
+    libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib
   ] ++ optional openglSupport mesa
     ++ optionals (!isDarwin) [ libvpx pulseaudio ] # Need to be fixed on Darwin
     ++ optional (isLinux || isFreeBSD) libva

From 6a5126348bd29124f8d9846170edac5a463240d5 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 28 May 2015 13:49:17 +0200
Subject: [PATCH 0365/2322] rsyslog: krb5 -> libkrb5 argument changed few
 commits ago

---
 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 751e201cd82..8e80f64cfe0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -868,7 +868,7 @@ let
   };
 
   rsyslog-light = callPackage ../tools/system/rsyslog {
-    krb5 = null;
+    libkrb5 = null;
     systemd = null;
     jemalloc = null;
     libmysql = null;

From 831d597bfab70bf2952f9573b2cacc9d1c56de1c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 28 May 2015 01:23:55 +0200
Subject: [PATCH 0366/2322] perl-packages: Finance-Quote 1.35 -> 1.37

---
 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 e6556b0898a..cbab34adc03 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3977,12 +3977,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   FinanceQuote = buildPerlPackage rec {
-    name = "Finance-Quote-1.35";
+    name = "Finance-Quote-1.37";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/EC/ECOCODE/${name}.tar.gz";
-      sha256 = "0mxfhi1ndckj4w7fw20rwy6ymalg2yncnp9xn0v2bnk5ibqj439w";
+      sha256 = "1b6pbh7f76fb5sa4f0lhx085xy55pprz5v7z7li7pqiyw7i4f4bf";
     };
-    propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc JSON ];
+    propagatedBuildInputs = [ CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP DateCalc DateTime JSON ];
     meta = with stdenv.lib; {
       homepage = http://finance-quote.sourceforge.net/;
       description = "Get stock and mutual fund quotes from various exchanges";

From 633e73415207ad675af385c27ecbd75831c22c5c Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 27 May 2015 09:54:19 +0200
Subject: [PATCH 0367/2322] cygwin: libiconvReal is used during bootstrapping
 phase on cygwin

---
 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 8e80f64cfe0..1b8c86c5723 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6859,7 +6859,9 @@ let
   # standalone libiconv, just in case you want it
   libiconv = if stdenv.isGlibc then stdenv.cc.libc else libiconvReal;
 
-  libiconvReal = callPackage ../development/libraries/libiconv { };
+  libiconvReal = callPackage ../development/libraries/libiconv {
+    fetchurl = fetchurlBoot;
+  };
 
   # On non-GNU systems we need GNU Gettext for libintl.
   libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext;

From 52068e9b6eb6c2a1c74ea24ba404b948677de7e7 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 27 May 2015 15:10:41 +0200
Subject: [PATCH 0368/2322] cygwin: make perl LocaleGettext also build on
 cygwin

---
 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 cbab34adc03..b61618c9449 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5184,8 +5184,8 @@ let self = _self // overrides; _self = with self; {
 
   LocaleGettext = buildPerlPackage {
     name = "LocaleGettext-1.05";
-    buildInputs = stdenv.lib.optional stdenv.isDarwin pkgs.gettext;
-    NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lintl" else null;
+    buildInputs = stdenv.lib.optional (stdenv.isDarwin || stdenv.isCygwin) pkgs.gettext;
+    NIX_CFLAGS_LINK = if (stdenv.isDarwin || stdenv.isCygwin) then "-lintl" else null;
     src = fetchurl {
       url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz;
       sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7";

From c9a45f2f62bb3c7fc5e3f2374c26c91a478df8f7 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 27 May 2015 15:12:15 +0200
Subject: [PATCH 0369/2322] cygwin: make perl's XMLParser build on cygwin

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b61618c9449..b185e741490 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10673,6 +10673,9 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz;
       sha256 = "1sadi505g5qmxr36lgcbrcrqh3a5gcdg32b405gnr8k54b6rg0dl";
     };
+    patchPhase = if stdenv.isCygwin then ''
+      sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm
+    '' else null;
     makeMakerFlags = "EXPATLIBPATH=${pkgs.expat}/lib EXPATINCPATH=${pkgs.expat}/include";
   };
 

From 8bebcd5d40841baf7c8908606f6a6b46ae23605f Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 27 May 2015 15:13:39 +0200
Subject: [PATCH 0370/2322] cygwin: patch boehm-gc on cygwin

---
 .../libraries/boehm-gc/cygwin.patch           | 108 ++++++++++++++++++
 .../libraries/boehm-gc/default.nix            |   2 +
 2 files changed, 110 insertions(+)
 create mode 100644 pkgs/development/libraries/boehm-gc/cygwin.patch

diff --git a/pkgs/development/libraries/boehm-gc/cygwin.patch b/pkgs/development/libraries/boehm-gc/cygwin.patch
new file mode 100644
index 00000000000..25c6b9f06f3
--- /dev/null
+++ b/pkgs/development/libraries/boehm-gc/cygwin.patch
@@ -0,0 +1,108 @@
+--- gc-7.2/include/gc.h	2014-06-01 19:00:48.000000000 +0200
++++ gc-7.2/include/gc.h	2015-05-27 12:55:42.248984200 +0200
+@@ -1386,7 +1386,14 @@
+ /* THREAD_LOCAL_ALLOC defined and the initial allocation call is not    */
+ /* to GC_malloc() or GC_malloc_atomic().                                */
+ 
+-#ifdef __CYGWIN32__
++#ifdef __CYGWIN__
++#ifdef __x86_64__
++  extern int __data_start__[], __data_end__[], __bss_start__[], __bss_end__[];
++#define GC_DATASTART (__data_start__ < __bss_start__ ?\
++                      (void *)__data_start__ : (void *)__bss_start__)
++#define GC_DATAEND (__data_end__ < __bss_end__ ?\
++                      (void *)__data_end__ : (void *)__bss_end__)
++#else
+   /* Similarly gnu-win32 DLLs need explicit initialization from the     */
+   /* main program, as does AIX.                                         */
+   extern int _data_start__[], _data_end__[], _bss_start__[], _bss_end__[];
+@@ -1394,6 +1401,7 @@
+                        (void *)_data_start__ : (void *)_bss_start__)
+ # define GC_DATAEND (_data_end__ > _bss_end__ ? \
+                      (void *)_data_end__ : (void *)_bss_end__)
++#endif
+ # define GC_INIT_CONF_ROOTS GC_add_roots(GC_DATASTART, GC_DATAEND); \
+                                  GC_gcollect() /* For blacklisting. */
+         /* Required at least if GC is in a DLL.  And doesn't hurt. */
+--- gc-7.2/include/private/gcconfig.h	2014-06-01 19:00:48.000000000 +0200
++++ gc-7.2/include/private/gcconfig.h	2015-05-27 12:46:01.864338700 +0200
+@@ -441,10 +441,20 @@
+ #   endif
+ #   define mach_type_known
+ # endif
+-# if defined(__CYGWIN32__) || defined(__CYGWIN__)
++# if defined(__CYGWIN32__)
+ #   define I386
+ #   define CYGWIN32
+ #   define mach_type_known
++#if defined(__CYGWIN__)
++#  if defined(__LP64__)
++#    define X86_64
++#    define mach_type_known
++#  else
++#    define I386
++#  endif
++#  define CYGWIN32
++#  define mach_type_known
++#endif
+ # endif
+ # if defined(__MINGW32__) && !defined(mach_type_known)
+ #   define I386
+@@ -511,6 +521,16 @@
+ #    define mach_type_known
+ # endif
+ 
++#if defined(__CYGWIN__)
++#  if defined(__LP64__)
++#    define X86_64
++#    define mach_type_known
++#  else
++#    define I386
++#  endif
++#  define CYGWIN32
++#  define mach_type_known
++#endif
+ /* Feel free to add more clauses here */
+ 
+ /* Or manually define the machine type here.  A machine type is         */
+@@ -2279,6 +2299,20 @@
+ #       define GWW_VDB
+ #       define DATAEND  /* not needed */
+ #   endif
++
++#   ifdef CYGWIN32
++#       define OS_TYPE "CYGWIN32"
++#       define DATASTART ((ptr_t)GC_DATASTART)  /* From gc.h */
++#       define DATAEND   ((ptr_t)GC_DATAEND)
++#       define ALIGNMENT 8
++#       undef STACK_GRAN
++#       define STACK_GRAN 0x10000
++#       ifdef USE_MMAP
++#         define NEED_FIND_LIMIT
++#         define USE_MMAP_ANON
++#       endif
++#   endif
++
+ # endif /* X86_64 */
+ 
+ # ifdef HEXAGON
+--- gc-7.2/os_dep.c	2015-05-27 12:25:29.097698800 +0200
++++ gc-7.2/os_dep.c	2015-05-27 12:48:23.714600800 +0200
+@@ -764,10 +764,16 @@
+     /* gcc version of boehm-gc).                                        */
+     GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb)
+     {
++# ifdef __x86_64__
++      PNT_TIB pTib = NtCurrentTeb();
++      void * _tlsbase = pTib->StackBase;
++      /*void * _tlsbase = NtCurrentTeb()->pTib.StackBase;*/
++      /*extern void * _tlsbase __asm__ ("%gs:8");*/
++# else
+       void * _tlsbase;
+-
+       __asm__ ("movl %%fs:4, %0"
+                : "=r" (_tlsbase));
++# endif
+       sb -> mem_base = _tlsbase;
+       return GC_SUCCESS;
+     }
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index d71440a61d8..158f4b227dd 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "119x7p1cqw40mpwj80xfq879l9m1dkc7vbc1f3bz3kvkf8bf6p16";
   };
 
+  patches = if stdenv.isCygwin then [ ./cygwin.patch ] else null;
+
   configureFlags =
     [ "--enable-cplusplus" ]
     ++ lib.optional enableLargeConfig "--enable-large-config";

From 93d507cac874df274992c6038a07ca91994fc6d9 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 27 May 2015 15:16:53 +0200
Subject: [PATCH 0371/2322] cygwin: for 2.7.10 export-PyNode_SizeOf patch not
 needed anymore

---
 .../python/2.7/2.7.5-export-PyNode_SizeOf.patch     | 13 -------------
 .../development/interpreters/python/2.7/default.nix |  1 -
 2 files changed, 14 deletions(-)
 delete mode 100644 pkgs/development/interpreters/python/2.7/2.7.5-export-PyNode_SizeOf.patch

diff --git a/pkgs/development/interpreters/python/2.7/2.7.5-export-PyNode_SizeOf.patch b/pkgs/development/interpreters/python/2.7/2.7.5-export-PyNode_SizeOf.patch
deleted file mode 100644
index e5efd626690..00000000000
--- a/pkgs/development/interpreters/python/2.7/2.7.5-export-PyNode_SizeOf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-For the parser extension
-
---- origsrc/Include/node.h	2013-05-11 22:32:41.000000000 -0500
-+++ src/Include/node.h	2013-06-04 02:55:03.949347500 -0500
-@@ -21,7 +21,7 @@ PyAPI_FUNC(int) PyNode_AddChild(node *n,
-                                       char *str, int lineno, int col_offset);
- PyAPI_FUNC(void) PyNode_Free(node *n);
- #ifndef Py_LIMITED_API
--Py_ssize_t _PyNode_SizeOf(node *n);
-+PyAPI_FUNC(Py_ssize_t) _PyNode_SizeOf(node *n);
- #endif
- 
- /* Node access functions */
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index eebd4514571..e67c2682998 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -51,7 +51,6 @@ let
       ./2.7.3-dylib.patch
       ./2.7.3-getpath-exe-extension.patch
       ./2.7.3-no-libm.patch
-      ./2.7.5-export-PyNode_SizeOf.patch
     ];
 
   preConfigure = ''

From ea3748d5192d02e9f8856eacb21015248a9519ac Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 27 May 2015 15:20:32 +0200
Subject: [PATCH 0372/2322] cygwin: help2man patch for cygwin

---
 .../misc/help2man/1.40.4-cygwin-nls.patch     | 165 ++++++++++++++++++
 .../tools/misc/help2man/default.nix           |   2 +
 2 files changed, 167 insertions(+)
 create mode 100644 pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch

diff --git a/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch b/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch
new file mode 100644
index 00000000000..20b99998154
--- /dev/null
+++ b/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch
@@ -0,0 +1,165 @@
+LD_PRELOAD by itself only works with Cygwin builtin functions, but
+textdomain() and friends come from libintl.  In order to override
+those functions, we have to "replace" cygintl-?.dll since functions are
+bound to a DLL name at link time.  Our replacement will be used since
+it is loaded first by LD_PRELOAD.
+
+But as we are making this *the* libintl, we need to provide 
+pass-throughs for the other functions which we're not overriding,
+otherwise Locale::gettext won't load (not to mention the program
+that we're trying to help2man).
+
+--- help2man-1.46.5/Makefile.in	2014-10-09 13:03:01.000000000 +0200
++++ help2man-1.46.5/Makefile.in	2015-05-12 14:46:52.995521900 +0200
+@@ -76,7 +76,8 @@
+        fi
+
+ install_preload: install_dirs preload
+-	$(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(pkglibdir)
++	$(INSTALL_PROGRAM) lib/cygintl-8.dll $(DESTDIR)$(pkglibdir)
++	ln -sf cygintl-8.dll $(DESTDIR)$(pkglibdir)/$(preload).so
+
+ install_l10n: install_dirs msg_l10n man_l10n info_l10n
+        set -e; \
+@@ -144,7 +146,9 @@
+
+ preload: $(preload).so
+ $(preload).so: $(srcdir)/$(preload).c
+-	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS)
++	mkdir -p lib
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o lib/cygintl-8.dll -shared $? $(LIBS)
++	ln -sf lib/cygintl-8.dll $@
+
+ man: $(target).1
+ $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL
+--- help2man-1.46.5/bindtextdomain.c	2009-11-13 00:01:34.000000000 -0600
++++ help2man-1.46.5/bindtextdomain.c	2011-12-29 00:24:33.608078600 -0600
+@@ -27,12 +27,34 @@ static char *(*r_textdomain)(char const
+ static char *(*r_bindtextdomain)(char const *, char const *) = 0;
+ static char *(*r_bind_textdomain_codeset)(char const *, char const *) = 0;
+ 
++#ifdef __CYGWIN__
++static void *RTLD_NEXT = 0;
++static char *(*r_gettext)(const char *) = 0;
++static char *(*r_dgettext)(const char *, const char *) = 0;
++static char *(*r_dcgettext)(const char *, const char *, int) = 0;
++static char *(*r_ngettext)(const char *, const char *, unsigned long int) = 0;
++static char *(*r_dngettext)(const char *, const char *, const char *,
++                            unsigned long int) = 0;
++static char *(*r_dcngettext)(const char *, const char *, const char *,
++                             unsigned long int, int) = 0;
++static char *(*r_setlocale)(int, const char *) = 0;
++
++#define SYM(sym) libintl_ ## sym
++#else
++#define SYM(sym) sym
++#endif
++
+ void setup()
+ {
+     static int done = 0;
+     if (done++)
+         return;
+ 
++#ifdef __CYGWIN__
++    if (!(RTLD_NEXT = dlopen("/usr/bin/cygintl-8.dll", RTLD_LAZY)))
++        die("libintl8 not found");
++#endif
++
+     if (!(e_textdomain = getenv("TEXTDOMAIN")))
+ 	die("TEXTDOMAIN not set");
+ 
+@@ -48,9 +70,19 @@ void setup()
+     if (!(r_bind_textdomain_codeset = dlsym(RTLD_NEXT,
+     					    "bind_textdomain_codeset")))
+ 	die("can't find symbol \"bind_textdomain_codeset\"");
++
++#ifdef __CYGWIN__
++    r_gettext = dlsym(RTLD_NEXT, "libintl_gettext");
++    r_dgettext = dlsym(RTLD_NEXT, "libintl_dgettext");
++    r_dcgettext = dlsym(RTLD_NEXT, "libintl_dcgettext");
++    r_ngettext = dlsym(RTLD_NEXT, "libintl_ngettext");
++    r_dngettext = dlsym(RTLD_NEXT, "libintl_dngettext");
++    r_dcngettext = dlsym(RTLD_NEXT, "libintl_dcngettext");
++    r_setlocale = dlsym(RTLD_NEXT, "libintl_setlocale");
++#endif
+ }
+ 
+-char *textdomain(char const *domainname)
++char *SYM(textdomain)(char const *domainname)
+ {
+     char *r;
+     setup();
+@@ -61,7 +93,7 @@ char *textdomain(char const *domainname)
+     return r;
+ }
+ 
+-char *bindtextdomain(char const *domainname, char const *dirname)
++char *SYM(bindtextdomain)(char const *domainname, char const *dirname)
+ {
+     char const *dir = dirname;
+     setup();
+@@ -71,7 +103,7 @@ char *bindtextdomain(char const *domainn
+     return r_bindtextdomain(domainname, dir);
+ }
+ 
+-char *bind_textdomain_codeset(char const *domainname, char const *codeset)
++char *SYM(bind_textdomain_codeset)(char const *domainname, char const *codeset)
+ {
+     char *r;
+     setup();
+@@ -81,3 +113,54 @@ char *bind_textdomain_codeset(char const
+ 
+     return r;
+ }
++
++#ifdef __CYGWIN__
++
++char *libintl_gettext(const char *msgid)
++{
++    setup();
++    return r_gettext(msgid);
++}
++
++char *libintl_dgettext (const char *domainname, const char *msgid)
++{
++    setup();
++    return r_dgettext(domainname, msgid);
++}
++
++char *libintl_dcgettext (const char *domainname, const char *msgid,
++                         int category)
++{
++    setup();
++    return r_dcgettext (domainname, msgid, category);
++}
++
++char *libintl_ngettext (const char *msgid1, const char *msgid2,
++                        unsigned long int n)
++{
++    setup();
++    return r_ngettext (msgid1, msgid2, n);
++}
++
++char *libintl_dngettext (const char *domainname, const char *msgid1,
++                         const char *msgid2, unsigned long int n)
++{
++    setup();
++    return r_dngettext (domainname, msgid1, msgid2, n);
++}
++
++char *libintl_dcngettext (const char *domainname,
++                          const char *msgid1, const char *msgid2,
++                          unsigned long int n, int category)
++{
++    setup();
++    return r_dcngettext (domainname, msgid1, msgid2, n, category);
++}
++
++char *libintl_setlocale (int i, const char *s)
++{
++    setup();
++    return r_setlocale (i, s);
++}
++
++#endif
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index 088e1574ebe..f1b4f4f182e 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
 
   doCheck = false;                                # target `check' is missing
 
+  patches = if stdenv.isCygwin then [ ./1.40.4-cygwin-nls.patch ] else null;
+
   postInstall =
     '' wrapProgram "$out/bin/help2man" \
          --prefix PERL5LIB : "$(echo ${LocaleGettext}/lib/perl*/site_perl)"

From 08b5686cd768f6401c69915fa35a58e0f33dab0b Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 27 May 2015 15:36:25 +0200
Subject: [PATCH 0373/2322] cygwin: tetex patch to make it build on cygwin

---
 pkgs/tools/typesetting/tex/tetex/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix
index 79f768a086d..24ab02e97d7 100644
--- a/pkgs/tools/typesetting/tex/tetex/default.nix
+++ b/pkgs/tools/typesetting/tex/tetex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, bison, zlib, libpng, ncurses, ed }:
+{ stdenv, fetchurl, flex, bison, zlib, libpng, ncurses, ed, automake }:
 
 stdenv.mkDerivation {
   name = "tetex-3.0";
@@ -20,6 +20,10 @@ stdenv.mkDerivation {
     sed -i 57d texk/kpathsea/c-std.h
   '';
 
+  preConfigure = if stdenv.isCygwin then ''
+    find ./ -name "config.guess" -exec rm {} \; -exec ln -s ${automake}/share/automake-*/config.guess {} \;
+  '' else null;
+
   patches = [ ./environment.patch ./getline.patch ./clang.patch ];
 
   setupHook = ./setup-hook.sh;

From ba9867fb5b423241cc8635d8374cf6e14c2aab34 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Thu, 28 May 2015 09:30:36 -0400
Subject: [PATCH 0374/2322] mpv: refactor & fix youtube-dl support

---
 pkgs/applications/video/mpv/default.nix | 99 ++++++++++++++-----------
 pkgs/top-level/all-packages.nix         |  2 -
 2 files changed, 55 insertions(+), 46 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 0e0c71bd9e1..6bb7072a4a3 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,7 +1,5 @@
-{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass
-, lua, perl, libpthreadstubs
-, lua5_sockets
-, python3, docutils, which, lib
+{ stdenv, fetchurl, docutils, makeWrapper, perl, pkgconfig, python, which
+, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, lua, lua5_sockets
 , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
 , xineramaSupport ? true, libXinerama ? null
 , xvSupport ? true, libXv ? null
@@ -16,15 +14,19 @@
 , theoraSupport ? true, libtheora ? null
 , jackaudioSupport ? true, jack2 ? null
 , pulseSupport ? true, pulseaudio ? null
-, bs2bSupport ? false, libbs2b ? null
+, bs2bSupport ? true, libbs2b ? null
 # For screenshots
 , libpngSupport ? true, libpng ? null
 # for Youtube support
-, youtubeSupport ? false, youtubeDL ? null
-, cacaSupport ? false, libcaca ? null
+, youtubeSupport ? true, youtube-dl ? null
+, cacaSupport ? true, libcaca ? null
 , vaapiSupport ? false, libva ? null
 }:
 
+# TODO: Wayland support
+# TODO: investigate caca support
+# TODO: investigate lua5_sockets bug
+
 assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
 assert xineramaSupport -> (libXinerama != null && x11Support);
 assert xvSupport -> (libXv != null && x11Support);
@@ -41,22 +43,20 @@ assert jackaudioSupport -> jack2 != null;
 assert pulseSupport -> pulseaudio != null;
 assert bs2bSupport -> libbs2b != null;
 assert libpngSupport -> libpng != null;
-assert youtubeSupport -> youtubeDL != null;
+assert youtubeSupport -> youtube-dl != null;
 assert cacaSupport -> libcaca != null;
 
-# Purity problem: Waf needed to be is downloaded by bootstrap.py
-# but by purity reasons it should be avoided; thanks the-kenny to point it out!
-# Now, it will just download and package Waf, mimetizing bootstrap.py behaviour
-
 let
+  inherit (stdenv.lib) optional optionals optionalString;
+
+  # Purity: Waf is normally downloaded by bootstrap.py, but
+  # for purity reasons this behavior should be avoided.
   waf = fetchurl {
     url = http://ftp.waf.io/pub/release/waf-1.8.5;
     sha256 = "0gh266076pd9fzwkycskyd3kkv2kds9613blpxmn9w4glkiwmmh5";
   };
-
 in
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "mpv-${version}";
   version = "0.9.2";
@@ -66,9 +66,30 @@ stdenv.mkDerivation rec {
     sha256 = "0la7pmy75mq92kcrawdiw5idw6a46z7d15mlkgs0axyivdaqy560";
   };
 
-  buildInputs =
-    [ python3 lua perl freetype pkgconfig ffmpeg libass docutils which libpthreadstubs lua5_sockets ]
-    ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
+  patchPhase = ''
+    patchShebangs ./TOOLS/
+  '';
+
+  NIX_LDFLAGS = optionalString x11Support "-lX11 -lXext";
+
+  configureFlags = [
+    "--enable-libmpv-shared"
+    "--disable-libmpv-static"
+    "--disable-static-build"
+    "--enable-manpage-build"
+    "--disable-build-date" # Purity
+    "--enable-zsh-comp"
+  ] ++ optional vaapiSupport "--enable-vaapi";
+
+  configurePhase = ''
+    python ${waf} configure --prefix=$out $configureFlags
+  '';
+
+  nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python which ];
+
+  buildInputs = [
+    ffmpeg freetype libass libpthreadstubs lua lua5_sockets
+  ] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
     ++ optional alsaSupport alsaLib
     ++ optional xvSupport libXv
     ++ optional theoraSupport libtheora
@@ -83,49 +104,39 @@ stdenv.mkDerivation rec {
     ++ optional speexSupport speex
     ++ optional bs2bSupport libbs2b
     ++ optional libpngSupport libpng
-    ++ optional youtubeSupport youtubeDL
+    ++ optional youtubeSupport youtube-dl
     ++ optional sdl2Support SDL2
     ++ optional cacaSupport libcaca
-    ++ optional vaapiSupport libva
-    ;
-
-# There are almost no need of "configure flags", but some libraries
-# weren't detected; see the TODO comments below
-
-  NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext";
+    ++ optional vaapiSupport libva;
 
   enableParallelBuilding = true;
 
-  configurePhase = ''
-    python3 ${waf} configure --prefix=$out ${lib.optionalString vaapiSupport "--enable-vaapi"}
-    patchShebangs TOOLS
-  '';
-
   buildPhase = ''
-    python3 ${waf} build
+    python ${waf} build
   '';
 
   installPhase = ''
-    python3 ${waf} install
-    # Maybe not needed, but it doesn't hurt anyway: a standard font
+    python ${waf} install
+
+    # Use a standard font
     mkdir -p $out/share/mpv
     ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
-    '';
+  '' + optionalString youtubeSupport ''
+    # Ensure youtube-dl is available in $PATH for MPV
+    wrapProgram $out/bin/mpv --prefix PATH : "${youtube-dl}/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    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 ];
+    platforms = platforms.linux;
 
-  meta = with stdenv.lib;{
-    description = "A movie player that supports many video formats (MPlayer and mplayer2 fork)";
     longDescription = ''
       mpv is a free and open-source general-purpose video player,
       based on the MPlayer and mplayer2 projects, with great
       improvements above both.
     '';
-    homepage = http://mpv.io;
-    license = licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ AndersonTorres fuuzetsu ];
-    platforms = platforms.linux;
   };
 }
-
-# TODO: Wayland support
-# TODO: investigate caca support
-# TODO: investigate lua5_sockets bug
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b82e305651..7c47b1c2d27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11806,8 +11806,6 @@ let
     youtubeSupport = config.mpv.youtubeSupport or true;
     cacaSupport = config.mpv.cacaSupport or true;
     vaapiSupport = config.mpv.vaapiSupport or false;
-    # YouTube needs network support and potentially openssl/tls
-    ffmpeg = if youtubeSupport then ffmpeg-full else ffmpeg;
   };
 
   mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { };

From 3fa15c820f7a0992e2b8940bf45f04b5b13d658a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 28 May 2015 16:13:47 +0000
Subject: [PATCH 0375/2322] doclifter: add new package

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

diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix
new file mode 100644
index 00000000000..6c80e6faf5e
--- /dev/null
+++ b/pkgs/development/tools/misc/doclifter/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, python}:
+
+stdenv.mkDerivation {
+  name = "doclifter-2.15";
+  src = fetchurl {
+    url = http://www.catb.org/~esr/doclifter/doclifter-2.15.tar.gz;
+    sha256 = "14k750bxp0kpnm130pp22vx3vmppfnzwisc042din1416ka07yv0";
+  };
+  buildInputs = [ python ];
+  
+  makeFlags = "PREFIX=$(out)";
+  
+  preInstall = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/man/man1
+    cp manlifter $out/bin
+    cp manlifter.1 $out/share/man/man1
+  '';
+  
+  meta = {
+    description = "Lift documents in nroff markups to XML-DocBook";
+    homepage = http://www.catb.org/esr/doclifter;
+    license = "BSD";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a12d754954..2026141a7c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5280,6 +5280,8 @@ let
       binutils = binutils;
     };
 
+  doclifter = callPackage ../development/tools/misc/doclifter { };
+
   docutils = pythonPackages.docutils;
 
   doxygen = callPackage ../development/tools/documentation/doxygen {

From deec257852d8e41ecda6166f26adc926efecca90 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 28 May 2015 17:22:56 +0200
Subject: [PATCH 0376/2322] supertux: update from 0.1.3 to 0.3.5a

---
 pkgs/games/super-tux/default.nix | 42 ++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/pkgs/games/super-tux/default.nix b/pkgs/games/super-tux/default.nix
index c8e0d3f097f..11429cfadd2 100644
--- a/pkgs/games/super-tux/default.nix
+++ b/pkgs/games/super-tux/default.nix
@@ -1,28 +1,34 @@
-{ fetchurl, stdenv, SDL, SDL_image, SDL_mixer, curl, gettext, libogg, libvorbis, mesa, openal }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer
+, curl, gettext, libogg, libvorbis, mesa, openal, physfs, boost, glew
+, libiconv }:
 
-let
-
-    version = "0.1.3";
-
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "supertux-${version}";
+  version = "0.3.5a";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/supertux.berlios/supertux-${version}.tar.bz2";
-    sha256 = "15xdq99jy4hayr96jpqcp15rbr9cs5iamjirafajcrkpa61mi4h0";
+  src = fetchFromGitHub {
+    owner = "SuperTux";
+    repo = "supertux";
+    rev = "v${version}";
+    sha256 = "0f522wsv0gx7v1h70x8xznklaqr5bm2l9h7ls9vjywy0z4iy1ahp";
   };
 
-  buildInputs = [ SDL SDL_image SDL_mixer curl gettext libogg libvorbis mesa openal ];
+  buildInputs = [ pkgconfig cmake SDL2 SDL2_image SDL2_mixer curl gettext
+                  libogg libvorbis mesa openal physfs boost glew libiconv ];
 
-  patches = [ ./g++4.patch ];
+  preConfigure = ''
+    patchShebangs configure
+  '';
 
-  meta = {
+  postInstall = ''
+    mkdir $out/bin
+    ln -s $out/games/supertux2 $out/bin
+  '';
+
+  meta = with stdenv.lib; {
     description = "Classic 2D jump'n run sidescroller game";
-
-    homepage = http://supertux.lethargik.org/index.html;
-
-    license = stdenv.lib.licenses.gpl2;
+    homepage = http://supertux.github.io/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ pSub ];
   };
 }

From 8ac4521fee439637203c083d45f5f9768dbfc81e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 28 May 2015 18:40:33 +0200
Subject: [PATCH 0377/2322] mysql-workbench: fix references to /bin/bash and
 sudo

Closes #5226
---
 pkgs/applications/misc/mysql-workbench/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 4f2c2fba97c..eddf9b8ac71 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -3,7 +3,7 @@
 , libctemplate, libglade
 , libiodbc
 , libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql
-, pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite
+, pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite, sudo
 }:
 
 stdenv.mkDerivation rec {
@@ -29,6 +29,16 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
+    patchShebangs $out/share/mysql-workbench/extras/build_freetds.sh
+
+    for i in $out/lib/mysql-workbench/modules/wb_utils_grt.py \
+             $out/lib/mysql-workbench/modules/wb_server_management.py \
+             $out/lib/mysql-workbench/modules/wb_admin_grt.py; do
+      substituteInPlace $i \
+        --replace "/bin/bash" ${stdenv.shell} \
+        --replace "/usr/bin/sudo" ${sudo}/bin/sudo
+    done
+
     wrapProgram "$out/bin/mysql-workbench" \
       --prefix LD_LIBRARY_PATH : "${python}/lib" \
       --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \

From 1a3860e95a52a990043ca986e8f771fee6a090cb Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 28 May 2015 18:49:06 +0200
Subject: [PATCH 0378/2322] checkstyle: update from 6.5 to 6.6

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

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 4d47d513437..f757d0e9619 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.5";
+  version = "6.6";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz";
-    sha256 = "1231rzmk7kzv77hpa0jj227152br9ahjdvxvzifk0mdfw0b34rdl";
+    sha256 = "1pniql23f8fsr7yhcxvrc65rdynrwpwl6vxl2jdsj4a37br8mr0d";
   };
 
   installPhase = ''

From b57097b2fee86b28aa9b53c40944a5bebf7f4e17 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 28 May 2015 18:54:35 +0200
Subject: [PATCH 0379/2322] fswatch: update from 1.4.6 to 1.4.7

---
 .../tools/misc/fswatch/default.nix            | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index 8f7f9437d4e..487c57c5484 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetchFromGitHub
-, autoconf
-, automake
+, autoreconfHook
 , findutils                     # for xargs
 , gettext
 , libtool
@@ -9,26 +8,18 @@
 , texinfo
 }:
 
-let
-
- version = "1.4.6";
-
-in stdenv.mkDerivation {
-
+stdenv.mkDerivation rec {
   name = "fswatch-${version}";
+  version = "1.4.7";
 
   src = fetchFromGitHub {
     owner = "emcrisostomo";
     repo = "fswatch";
     rev = version;
-    sha256 = "0flq8baqzifhmf61zyiipdipvgy4h0kl551clxrhwa8gvzf75im4";
+    sha256 = "0f6aa14v31gy3j7qx563ml37r8mylpbqfjrz2v5g44zrrg6086w7";
   };
 
-  buildInputs = [ autoconf automake gettext libtool makeWrapper texinfo ];
-
-  preConfigure = ''
-    ./autogen.sh
-  '';
+  buildInputs = [ autoreconfHook gettext libtool makeWrapper texinfo ];
 
   postFixup = ''
     for prog in fswatch-run fswatch-run-bash; do

From 38bc63c60531ce37791b817223831e8a01c77d25 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 28 May 2015 18:56:12 +0200
Subject: [PATCH 0380/2322] help2man: update from 1.46.5 to 1.46.6

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

diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index f1b4f4f182e..79dbb533d03 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "help2man-1.46.5";
+  name = "help2man-1.46.6";
 
   src = fetchurl {
     url = "mirror://gnu/help2man/${name}.tar.xz";
-    sha256 = "1gqfqgxq3qgwnldjz3i5mxvzyx2w3j042r3fw1wygic3f6327nha";
+    sha256 = "1brccgnjf09f2zg70s6gv6gn68mi59kp3zf50wvxp79n72ngapv1";
   };
 
   buildInputs = [ makeWrapper perl gettext LocaleGettext ];

From f675c4d90db332d2b4c7f2f15918b3e5cdd1ce03 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 28 May 2015 18:57:32 +0200
Subject: [PATCH 0381/2322] icmake: update from 7.22.00 to 7.22.01

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

diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index a4e81864985..d83ae51aaaa 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "icmake-${version}";
-  version = "7.22.00";
+  version = "7.22.01";
 
   src = fetchurl {
     url = "mirror://sourceforge/icmake/icmake_${version}.orig.tar.gz";
-    sha256 = "013vxnilygad981zb2608f95q2h3svvbgpjvzvk16qyxjy4y4q6z";
+    sha256 = "1iv6p9cyvr9i2sjhklplr65llg1ycxqy7z4dfgn0nkwxgs9yf8mm";
   };
 
   preConfigure = ''

From 3ae285976e61965eed43a889d9386f09b295fa5b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 28 May 2015 19:02:41 +0200
Subject: [PATCH 0382/2322] parallel: update from 20150322 to 20150522

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 27d5e624589..c78bf748296 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20150322";
+  name = "parallel-20150522";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1zsj1bd4zbwb4n9i0jgzs7vd5wkyg3xvj6s1q6s5fyn0pff7j01c";
+    sha256 = "01pkckrad3d2i7mkw98zxymp22rsngyjknhh18i4m6hq82bijjjc";
   };
 
   patchPhase =
@@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Shell tool for executing jobs in parallel";
-
     longDescription =
       '' GNU Parallel is a shell tool for executing jobs in parallel.  A job
          is typically a single command or a small script that has to be run
@@ -40,11 +39,8 @@ stdenv.mkDerivation rec {
          it possible to use output from GNU Parallel as input for other
          programs.
       '';
-
     homepage = http://www.gnu.org/software/parallel/;
-
     license = licenses.gpl3Plus;
-
     platforms = platforms.all;
     maintainers = with maintainers; [ pSub ];
   };

From 8b3891226058116596fa00847ce5ed2b4dd2a9c4 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 28 May 2015 19:06:11 +0200
Subject: [PATCH 0383/2322] potrace: update from 1.11 to 1.12

---
 pkgs/applications/graphics/potrace/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix
index f58fe0e28c1..13636e1f1fe 100644
--- a/pkgs/applications/graphics/potrace/default.nix
+++ b/pkgs/applications/graphics/potrace/default.nix
@@ -1,16 +1,15 @@
 { stdenv, fetchurl, zlib }:
 
-let version = "1.11"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "potrace-${version}";
+  version = "1.12";
 
   src = fetchurl {
-    url = "http://potrace.sourceforge.net/download/potrace-${version}.tar.gz";
-    sha256 = "1bbyl7jgigawmwc8r14znv8lb6lrcxh8zpvynrl6s800dr4yp9as";
+    url = "http://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz";
+    sha256 = "0fqpfq5wwqz8j6pfh4p2pbflf6r86s4h63r8jawzrsyvpbbz3fxh";
   };
 
-  configureFlags = ["--with-libpotrace"];
+  configureFlags = [ "--with-libpotrace" ];
 
   buildInputs = [ zlib ];
 

From 7822640a185771fb03e3aa8e5b27f03903df82aa Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 28 May 2015 19:10:52 +0200
Subject: [PATCH 0384/2322] yodl: update from 3.05.00 to 3.05.01

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

diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index d6667b76759..e5862785717 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "yodl-${version}";
-  version = "3.05.00";
+  version = "3.05.01";
 
   buildInputs = [ perl icmake ];
 
   src = fetchurl {
     url = "mirror://sourceforge/yodl/yodl_${version}.orig.tar.gz";
-    sha256 = "12hv5ghrsk6kdi414glg888v3qk3m1nmicl8f0h5k4szm1i00dig";
+    sha256 = "0ghdzr3lzgfzvfymnjbj4mw8vpq098swvipxghhqgfmv58dhwgas";
   };
 
   preConfigure = ''

From 158e1cfdd0ddb8380e266dcf16a4167455335bc3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 28 May 2015 19:20:29 +0200
Subject: [PATCH 0385/2322] Don't use "with licenses;" for single licences

And don't use square brackets on such lines.
---
 pkgs/applications/audio/fmit/default.nix      |  2 +-
 .../audio/keyfinder-cli/default.nix           |  2 +-
 pkgs/applications/audio/keyfinder/default.nix |  2 +-
 pkgs/applications/editors/atom/default.nix    |  2 +-
 .../editors/emacs-modes/jabber/default.nix    |  2 +-
 .../editors/emacs-modes/nyan-mode/default.nix |  2 +-
 .../editors/lighttable/default.nix            |  2 +-
 .../applications/editors/vim/configurable.nix |  2 +-
 pkgs/applications/editors/vim/default.nix     |  2 +-
 pkgs/applications/editors/vim/macvim.nix      |  2 +-
 pkgs/applications/editors/vim/qvim.nix        |  2 +-
 .../graphics/apitrace/default.nix             |  2 +-
 .../graphics/simple-scan/default.nix          |  2 +-
 .../graphics/zgrviewer/default.nix            |  2 +-
 pkgs/applications/misc/eaglemode/default.nix  |  2 +-
 pkgs/applications/misc/grass/default.nix      |  2 +-
 pkgs/applications/misc/jekyll/default.nix     |  2 +-
 .../feedreaders/rsstail/default.nix           |  2 +-
 .../instant-messengers/baresip/default.nix    |  2 +-
 .../networking/mailreaders/sup/default.nix    |  2 +-
 .../networking/remote/x2goclient/default.nix  |  2 +-
 .../networking/syncthing/default.nix          |  2 +-
 .../science/logic/lci/default.nix             |  2 +-
 .../science/logic/stp/default.nix             |  2 +-
 .../science/math/pari/default.nix             |  2 +-
 .../science/math/speedcrunch/default.nix      |  2 +-
 .../molecular-dynamics/gromacs/default.nix    |  2 +-
 .../version-management/src/default.nix        |  2 +-
 pkgs/applications/video/clipgrab/default.nix  |  2 +-
 pkgs/applications/video/dvdauthor/default.nix |  2 +-
 .../virtualization/remotebox/default.nix      |  2 +-
 .../window-managers/awesome/default.nix       |  2 +-
 .../window-managers/tabbed/default.nix        |  2 +-
 .../window-managers/vwm/default.nix           |  2 +-
 pkgs/data/documentation/zeal/default.nix      |  2 +-
 pkgs/data/fonts/terminus-font/default.nix     |  2 +-
 pkgs/data/misc/geolite-legacy/default.nix     |  2 +-
 pkgs/data/misc/media-player-info/default.nix  |  2 +-
 .../gnome-3/3.16/devtools/gdl/default.nix     |  2 +-
 .../compilers/emscripten/default.nix          |  2 +-
 .../interpreters/picoc/default.nix            |  2 +-
 .../interpreters/ruby/ruby-1.9.3.nix          |  2 +-
 pkgs/development/libraries/bobcat/default.nix |  2 +-
 .../libraries/boost-process/default.nix       |  2 +-
 pkgs/development/libraries/git2/default.nix   |  2 +-
 pkgs/development/libraries/hwloc/default.nix  |  2 +-
 .../development/libraries/jsoncpp/default.nix |  2 +-
 .../libraries/kde-frameworks-5.10/default.nix |  2 +-
 pkgs/development/libraries/libcli/default.nix |  2 +-
 .../libraries/libkeyfinder/default.nix        |  2 +-
 .../libraries/libpseudo/default.nix           |  2 +-
 pkgs/development/libraries/libpsl/default.nix |  2 +-
 pkgs/development/libraries/libre/default.nix  |  2 +-
 pkgs/development/libraries/librem/default.nix |  2 +-
 .../libraries/libtermkey/default.nix          |  2 +-
 .../libraries/libviper/default.nix            |  2 +-
 .../libraries/libvterm/default.nix            |  2 +-
 .../libraries/libxcomp/default.nix            |  2 +-
 .../development/libraries/qca-qt5/default.nix |  2 +-
 .../libraries/qmltermwidget/default.nix       |  2 +-
 .../libraries/quesoglc/default.nix            |  2 +-
 pkgs/development/libraries/rabbitmq-c/0.4.nix |  2 +-
 pkgs/development/libraries/re2/default.nix    |  2 +-
 .../science/math/liblapack/3.5.0.nix          |  2 +-
 .../science/math/liblapack/default.nix        |  2 +-
 .../development/libraries/spandsp/default.nix |  2 +-
 .../libraries/unibilium/default.nix           |  2 +-
 pkgs/development/tools/alloy/default.nix      |  2 +-
 .../tools/analysis/coan/default.nix           |  2 +-
 .../analysis/include-what-you-use/default.nix |  2 +-
 pkgs/development/tools/atom-shell/default.nix |  2 +-
 pkgs/development/tools/chefdk/default.nix     |  2 +-
 pkgs/development/tools/java/cfr/default.nix   |  2 +-
 .../development/tools/misc/ccache/default.nix |  2 +-
 .../tools/parsing/flexc++/default.nix         |  2 +-
 .../tools/sauce-connect/default.nix           |  2 +-
 pkgs/development/tools/thrust/default.nix     |  2 +-
 pkgs/games/alienarena/default.nix             |  2 +-
 pkgs/games/blobby/default.nix                 |  2 +-
 pkgs/games/eduke32/default.nix                |  2 +-
 pkgs/games/gsb/default.nix                    |  2 +-
 pkgs/games/urbanterror/default.nix            |  2 +-
 pkgs/games/vessel/default.nix                 |  2 +-
 pkgs/games/warsow/default.nix                 |  2 +-
 pkgs/games/worldofgoo/default.nix             |  2 +-
 pkgs/games/xonotic/default.nix                |  2 +-
 pkgs/misc/vim-plugins/default.nix             |  2 +-
 pkgs/os-specific/linux/fatrace/default.nix    |  2 +-
 pkgs/os-specific/linux/freefall/default.nix   |  2 +-
 pkgs/os-specific/linux/ftop/default.nix       |  2 +-
 pkgs/os-specific/linux/jfbview/default.nix    |  2 +-
 pkgs/os-specific/linux/mcelog/default.nix     |  2 +-
 pkgs/os-specific/linux/phc-intel/default.nix  |  2 +-
 pkgs/os-specific/linux/sdparm/default.nix     |  2 +-
 pkgs/servers/dico/default.nix                 |  2 +-
 pkgs/servers/monitoring/sensu/default.nix     |  2 +-
 pkgs/servers/nosql/cassandra/2.0.nix          |  2 +-
 pkgs/servers/nosql/cassandra/2.1.nix          |  2 +-
 pkgs/servers/restund/default.nix              |  2 +-
 pkgs/shells/mksh/default.nix                  |  2 +-
 pkgs/tools/admin/nxproxy/default.nix          |  2 +-
 pkgs/tools/backup/bacula/default.nix          |  2 +-
 pkgs/tools/compression/xdelta/default.nix     |  2 +-
 pkgs/tools/filesystems/boxfs/default.nix      |  2 +-
 pkgs/tools/filesystems/duff/default.nix       |  2 +-
 pkgs/tools/filesystems/encfs/default.nix      |  2 +-
 .../tools/filesystems/exfat-utils/default.nix |  2 +-
 pkgs/tools/filesystems/fuse-exfat/default.nix |  2 +-
 pkgs/tools/filesystems/mp3fs/default.nix      |  2 +-
 pkgs/tools/filesystems/rdfind/default.nix     |  2 +-
 pkgs/tools/filesystems/s3fs/default.nix       |  2 +-
 pkgs/tools/misc/clex/default.nix              |  2 +-
 pkgs/tools/misc/fluentd/default.nix           |  2 +-
 pkgs/tools/misc/gparted/default.nix           |  2 +-
 pkgs/tools/misc/qjoypad/default.nix           |  2 +-
 pkgs/tools/misc/t/default.nix                 |  2 +-
 pkgs/tools/misc/tmuxinator/default.nix        |  2 +-
 pkgs/tools/networking/darkstat/default.nix    |  2 +-
 .../networking/dnscrypt-proxy/default.nix     |  2 +-
 pkgs/tools/networking/hans/default.nix        |  2 +-
 pkgs/tools/networking/ipv6calc/default.nix    |  2 +-
 pkgs/tools/networking/isync/default.nix       |  2 +-
 pkgs/tools/networking/maildrop/default.nix    |  2 +-
 pkgs/tools/networking/netsniff-ng/default.nix |  2 +-
 .../networking/nss-pam-ldapd/default.nix      |  2 +-
 pkgs/tools/networking/wicd/default.nix        |  2 +-
 .../tools/package-management/dpkg/default.nix |  2 +-
 pkgs/tools/security/eid-mw/default.nix        |  2 +-
 pkgs/tools/security/eid-viewer/default.nix    |  2 +-
 pkgs/tools/system/bootchart/default.nix       |  2 +-
 pkgs/tools/system/dog/default.nix             |  2 +-
 pkgs/tools/system/foremost/default.nix        |  2 +-
 pkgs/tools/system/stress-ng/default.nix       |  2 +-
 pkgs/tools/system/suid-chroot/default.nix     |  2 +-
 pkgs/tools/system/tm/default.nix              |  2 +-
 pkgs/tools/system/ts/default.nix              |  2 +-
 pkgs/tools/system/uptimed/default.nix         |  2 +-
 pkgs/top-level/perl-packages.nix              | 24 +++++++--------
 pkgs/top-level/python-packages.nix            | 30 +++++++++----------
 139 files changed, 164 insertions(+), 164 deletions(-)

diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 0c12778089b..ead15e9a918 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       ALSA or JACK as sound input library.
     '';
     homepage = http://home.gna.org/fmit/index.html;
-    license = with licenses; gpl3Plus;
+    license = licenses.gpl3Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix
index dca72f22b49..1f008e56c15 100644
--- a/pkgs/applications/audio/keyfinder-cli/default.nix
+++ b/pkgs/applications/audio/keyfinder-cli/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       used to estimate the musical key of many different audio formats.
     '';
     homepage = https://github.com/EvanPurkhiser/keyfinder-cli;
-    license = with licenses; gpl3Plus;
+    license = licenses.gpl3Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix
index 33ce627e56e..bea869ea318 100644
--- a/pkgs/applications/audio/keyfinder/default.nix
+++ b/pkgs/applications/audio/keyfinder/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       efficient workflow tool.
     '';
     homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
-    license = with licenses; gpl3Plus;
+    license = licenses.gpl3Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index a3cdbb6afb9..31142efcc89 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A hackable text editor for the 21st Century";
     homepage = https://atom.io/;
-    license = [ licenses.mit ];
+    license = licenses.mit;
     maintainers = [ maintainers.offline ];
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/applications/editors/emacs-modes/jabber/default.nix b/pkgs/applications/editors/emacs-modes/jabber/default.nix
index cb8a22a3c06..781806bedd6 100644
--- a/pkgs/applications/editors/emacs-modes/jabber/default.nix
+++ b/pkgs/applications/editors/emacs-modes/jabber/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
       a special case of text editing.
     '';
     homepage = http://emacs-jabber.sourceforge.net/;
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ astsmtl ];
     platforms = with platforms; linux;
   };
diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
index a21c73b7e8b..d57c591ec1e 100644
--- a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
+++ b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix
@@ -26,6 +26,6 @@ trivialBuild rec {
   meta = with lib; {
     description = "An analog indicator of the position in the buffer";
     homepage = https://github.com/TeMPOraL/nyan-mode/;
-    license = with licenses; gpl3Plus;
+    license = licenses.gpl3Plus;
   };
 }
diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix
index d4fa56898c3..6db7130896f 100644
--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/pkgs/applications/editors/lighttable/default.nix
@@ -53,6 +53,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "the next generation code editor";
     homepage = http://www.lighttable.com/;
-    license = [ licenses.gpl3 ];
+    license = licenses.gpl3;
   };
 }
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index b40e797f7ea..ee3edaaf61b 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -190,7 +190,7 @@ composableDerivation {
   meta = with stdenv.lib; {
     description = "The most popular clone of the VI editor";
     homepage    = http://www.vim.org;
-    license = with licenses; [ vim ];
+    license = licenses.vim;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
   };
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index b13925fe14e..7a1ce7aa1f2 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "The most popular clone of the VI editor";
     homepage    = http://www.vim.org;
-    license = with licenses; [ vim ];
+    license = licenses.vim;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
   };
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index 4519d4c2626..a63dd0ab9e2 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Vim - the text editor - for Mac OS X";
     homepage    = https://github.com/b4winckler/macvim;
-    license = with licenses; [ vim ];
+    license = licenses.vim;
     maintainers = with maintainers; [ cstrahan ];
     platforms   = platforms.darwin;
   };
diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix
index 42ed3daa688..482e59833b3 100644
--- a/pkgs/applications/editors/vim/qvim.nix
+++ b/pkgs/applications/editors/vim/qvim.nix
@@ -118,7 +118,7 @@ composableDerivation {
   meta = with stdenv.lib; {
     description = "The most popular clone of the VI editor (Qt GUI fork)";
     homepage    = https://bitbucket.org/equalsraf/vim-qt/wiki/Home;
-    license = with licenses; [ vim ];
+    license = licenses.vim;
     maintainers = with maintainers; [ smironov ttuegel ];
     platforms   = platforms.linux;
   };
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index af499c51f97..348ba5c3c2c 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = https://apitrace.github.io;
     description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs";
-    license = with licenses; mit;
+    license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index b47a8215fd4..43d717c58e5 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       interface is well tested.
     '';
     homepage = https://launchpad.net/simple-scan;
-    license = with licenses; gpl3Plus;
+    license = licenses.gpl3Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix
index a6c299d1ab3..724bddda6cf 100644
--- a/pkgs/applications/graphics/zgrviewer/default.nix
+++ b/pkgs/applications/graphics/zgrviewer/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     # Quicker to unpack locally than load Hydra
     hydraPlatforms = [];
     maintainers = with stdenv.lib.maintainers; [raskin];
-    license = with stdenv.lib.licenses; lgpl21Plus;
+    license = stdenv.lib.licenses.lgpl21Plus;
     description = "GraphViz graph viewer/navigator";
   };
 }
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index 47535ab6b90..4324a33d238 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "http://eaglemode.sourceforge.net";
     description = "Zoomable User Interface";
-    license = with licenses; gpl3;
+    license = licenses.gpl3;
     maintainers = with maintainers; [ viric ];
     platforms = with platforms; linux;
   };
diff --git a/pkgs/applications/misc/grass/default.nix b/pkgs/applications/misc/grass/default.nix
index 9875b3abf01..823b6cdf538 100644
--- a/pkgs/applications/misc/grass/default.nix
+++ b/pkgs/applications/misc/grass/default.nix
@@ -176,7 +176,7 @@ a.composableDerivation.composableDerivation {} (fix: {
   meta = {
     description = "free Geographic Information System (GIS) software used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization";
     homepage = http://grass.itc.it/index.php;
-    license = [ "GPL" ];
+    license = "GPL";
     broken = true;
   };
 
diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index cc1d4e7c659..5e9505e9f32 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -13,7 +13,7 @@ bundlerEnv {
   meta = with lib; {
     description = "Simple, blog aware, static site generator";
     homepage    =  http://jekyllrb.com/;
-    license     = with licenses; mit;
+    license     = licenses.mit;
     maintainers = with maintainers; [ pesterhazy ];
     platforms   = platforms.unix;
   };
diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index df5f7954182..ee9d1dbbf8d 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       detects a new entry it'll emit only that new entry.
     '';
     homepage = http://www.vanheusden.com/rsstail/;
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index db24670d969..ec269def5b4 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.creytiv.com/baresip.html";
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
-    license = with stdenv.lib.licenses; bsd3;
+    license = stdenv.lib.licenses.bsd3;
     inherit version;
     downloadPage = "http://www.creytiv.com/pub/";
     updateWalker = true;
diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix
index 19715d7b255..f7aff8a4d0c 100644
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ b/pkgs/applications/networking/mailreaders/sup/default.nix
@@ -12,7 +12,7 @@ bundlerEnv {
   meta = with lib; {
     description = "A curses threads-with-tags style email client";
     homepage    = http://supmua.org;
-    license     = with licenses; gpl2;
+    license     = licenses.gpl2;
     maintainers = with maintainers; [ cstrahan lovek323 ];
     platforms   = platforms.unix;
   };
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 446b65c9882..328a156260b 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Graphical NoMachine NX3 remote desktop client";
     homepage = http://x2go.org/;
-    license = with licenses; gpl2;
+    license = licenses.gpl2;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index cea9329d9c8..0837659983e 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -25,7 +25,7 @@ buildGoPackage rec {
   meta = {
     homepage = http://syncthing.net/;
     description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized";
-    license = with lib.licenses; mit;
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ matejc ];
     platforms = with lib.platforms; unix;
   };
diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/applications/science/logic/lci/default.nix
index e2aff9313e9..d7f047b84e0 100644
--- a/pkgs/applications/science/logic/lci/default.nix
+++ b/pkgs/applications/science/logic/lci/default.nix
@@ -11,6 +11,6 @@ stdenv.mkDerivation rec {
     description = ''Lambda calculus interpreter'';
     maintainers = with stdenv.lib.maintainers; [raskin];
     platforms = with stdenv.lib.platforms; linux;
-    license = with stdenv.lib.licenses; gpl3;
+    license = stdenv.lib.licenses.gpl3;
   };
 }
diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix
index cfe96bc6983..444bb06c4a0 100644
--- a/pkgs/applications/science/logic/stp/default.nix
+++ b/pkgs/applications/science/logic/stp/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     description = ''Simple Theorem Prover'';
     maintainers = with stdenv.lib.maintainers; [mornfall];
     platforms = with stdenv.lib.platforms; linux;
-    license = with stdenv.lib.licenses; mit;
+    license = stdenv.lib.licenses.mit;
   };
 }
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index b97314f02d1..9a3ab13c33e 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Computer algebra system for high-performance number theory computations";
     homepage    = "http://pari.math.u-bordeaux.fr/";
-    license     = with licenses; gpl2Plus;
+    license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ ertes raskin ];
     platforms   = platforms.linux;
 
diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix
index e2f34d48de2..66292499f2b 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/applications/science/math/speedcrunch/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage    = "http://speedcrunch.digitalfanatics.org";
-    license     = with licenses; gpl2Plus;
+    license     = licenses.gpl2Plus;
     description = "A fast power user calculator";
     longDescription = ''
       SpeedCrunch is a fast, high precision and powerful desktop calculator.
diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index bb851140b45..43ef4337d57 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage    = "http://www.gromacs.org";
-    license     = with licenses; gpl2;
+    license     = licenses.gpl2;
     description = "Molecular dynamics software package";
     longDescription = ''
       GROMACS is a versatile package to perform molecular dynamics,
diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index ced82dd45c0..eede33c2145 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.catb.org/~esr/src/;
 
-    license = [ stdenv.lib.licenses.bsd3 ];
+    license = stdenv.lib.licenses.bsd3;
 
     maintainers = [ stdenv.lib.maintainers.shlevy ];
 
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 1256572de7c..fd336dafb23 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       videos to MPEG4, MP3 or other formats in just one easy step.
     '';
     homepage = http://clipgrab.org/;
-    license = with licenses; gpl3Plus;
+    license = licenses.gpl3Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix
index 03ccb2664fc..1711503314e 100644
--- a/pkgs/applications/video/dvdauthor/default.nix
+++ b/pkgs/applications/video/dvdauthor/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec{
   meta = with stdenv.lib; {
     description = "Tools for generating DVD files to be played on standalone DVD players";
     homepage = http://dvdauthor.sourceforge.net/;
-    license = with licenses; gpl2;
+    license = licenses.gpl2;
   };
 }
diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix
index a257ef27e9f..14adddf8d1b 100644
--- a/pkgs/applications/virtualization/remotebox/default.nix
+++ b/pkgs/applications/virtualization/remotebox/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "VirtualBox client with remote management";
     homepage = http://remotebox.knobgoblin.org.uk/;
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
     longDescription = ''
       VirtualBox is traditionally considered to be a virtualization solution
       aimed at the desktop.  While it is certainly possible to install
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index a158dd8dcf4..c57a89193b5 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Highly configurable, dynamic window manager for X";
     homepage    = http://awesome.naquadah.org/;
-    license     = with licenses; gpl2Plus;
+    license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.linux;
   };
diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix
index 82539b940b8..4e6c9c9a83e 100644
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://tools.suckless.org/tabbed;
     description = "Simple generic tabbed fronted to xembed aware applications";
-    license = with licenses; mit;
+    license = licenses.mit;
     maintainers = with maintainers; [ viric ];
     platforms = with platforms; linux;
   };
diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix
index be0a946064b..1e6b53446aa 100644
--- a/pkgs/applications/window-managers/vwm/default.nix
+++ b/pkgs/applications/window-managers/vwm/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://vwm.sourceforge.net/;
     description = "Dynamic window manager for the console";
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ viric ];
     platforms = with platforms; linux;
   };
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 7bc1b9fa1fd..515f172b748 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
       app), available for Linux and Windows.
     '';
     homepage = "http://zealdocs.org/";
-    license = with stdenv.lib.licenses; [ gpl3 ];
+    license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
   };
diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix
index 6dab322b056..ad5fd1999ed 100644
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/pkgs/data/fonts/terminus-font/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       EGA/VGA-bold for 8x14 and 8x16.
     '';
     homepage = http://www.is-vn.bg/hamster/;
-    license = with licenses; [ gpl2Plus ];
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ astsmtl ];
     platforms = with platforms; linux;
   };
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index ef7511afb17..69baf7bda45 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     inherit version;
     description = "GeoLite Legacy IP geolocation databases";
     homepage = https://geolite.maxmind.com/download/geoip;
-    license = with licenses; cc-by-sa-30;
+    license = licenses.cc-by-sa-30;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix
index b2bfb7bd13d..9abe5d6ea8e 100644
--- a/pkgs/data/misc/media-player-info/default.nix
+++ b/pkgs/data/misc/media-player-info/default.nix
@@ -26,7 +26,7 @@ in
     meta = with stdenv.lib; {
       description = "A repository of data files describing media player capabilities";
       homepage = "http://www.freedesktop.org/wiki/Software/media-player-info/";
-      license = with licenses; [ bsd3 ];
+      license = licenses.bsd3;
       maintainer = with maintainers; [ ttuegel ];
     };
   }
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
index 8e0c35eda30..e12f41c9b7f 100644
--- a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
     description = "Gnome docking library";
     homepage = https://developer.gnome.org/gdl/;
     maintainers = [ maintainers.lethalman ];
-    license = [ licenses.gpl2 ];
+    license = licenses.gpl2;
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index efe8be2051f..b49884fad1c 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/kripken/emscripten;
     description = "An LLVM-to-JavaScript Compiler";
     maintainers = with maintainers; [ bosu ];
-    license = with licenses; ncsa;
+    license = licenses.ncsa;
   };
 }
diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix
index 8cad6dc369d..c9ec01703bf 100644
--- a/pkgs/development/interpreters/picoc/default.nix
+++ b/pkgs/development/interpreters/picoc/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://github.com/zsaleeba/picoc;
     downloadPage = https://code.google.com/p/picoc/downloads/list;
-    license = with licenses; bsd3;
+    license = licenses.bsd3;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix
index 5f6540d3ee2..c53a012d753 100644
--- a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix
+++ b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    license     = with licenses; [ ruby ];
+    license     = licenses.ruby;
     homepage    = "http://www.ruby-lang.org/en/";
     description = "The Ruby language";
     maintainers = with maintainers; [ lovek323 ];
diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index d89a2763834..abd8a284e62 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     inherit version;
     description = "Brokken's Own Base Classes And Templates";
     downloadPage = http://sourceforge.net/projects/bobcat/files/;
-    license = with licenses; gpl3;
+    license = licenses.gpl3;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix
index 86cdd08db64..92e02c6ca08 100644
--- a/pkgs/development/libraries/boost-process/default.nix
+++ b/pkgs/development/libraries/boost-process/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = "http://www.highscore.de/boost/process0.5/";
     description = "Library to manage system processes";
-    license = with licenses; boost;
+    license = licenses.boost;
     platforms = platforms.unix;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index 7ddbc408ca6..823f09b8bce 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "the Git linkable library";
     homepage = http://libgit2.github.com/;
-    license = with stdenv.lib.licenses; gpl2;
+    license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; all;
   };
 }
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index da658e398eb..c357d808cac 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     '';
 
     # http://www.open-mpi.org/projects/hwloc/license.php
-    license = with licenses; bsd3;
+    license = licenses.bsd3;
 
     homepage = http://www.open-mpi.org/projects/hwloc/;
 
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index 07563364e34..c90a2481648 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/open-source-parsers/jsoncpp;
     description = "A simple API to manipulate JSON data in C++";
     maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-    license = with stdenv.lib.licenses; [ mit ];
+    license = stdenv.lib.licenses.mit;
     branch = "1.6";
   };
 }
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix
index 397eec61a78..4423f9c157d 100644
--- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix
@@ -113,7 +113,7 @@ let
         meta =
           let inherit (builtins.parseDrvName super.extra-cmake-modules.name) version; in
           {
-            license = with stdenv.lib.licenses; [ bsd2 ];
+            license = stdenv.lib.licenses.bsd2;
             platforms = stdenv.lib.platforms.linux;
             maintainers = with stdenv.lib.maintainers; [ ttuegel ];
             homepage = "http://www.kde.org";
diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix
index dd0de49a4bd..bbeb75d0b8d 100644
--- a/pkgs/development/libraries/libcli/default.nix
+++ b/pkgs/development/libraries/libcli/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Emulate a Cisco-style telnet command-line interface";
     homepage = http://sites.dparrish.com/libcli;
-    license = with licenses; lgpl21Plus;
+    license = licenses.lgpl21Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix
index 40efafdea3d..6ab80d55a45 100644
--- a/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/pkgs/development/libraries/libkeyfinder/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Musical key detection for digital audio (C++ library)";
     homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
-    license = with licenses; gpl3Plus;
+    license = licenses.gpl3Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix
index 8a7054db20a..8d1288f98ce 100644
--- a/pkgs/development/libraries/libpseudo/default.nix
+++ b/pkgs/development/libraries/libpseudo/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://libpseudo.sourceforge.net/;
     description = "Simple, thread-safe messaging between threads";
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index d642309ed74..4a2d7be7b8b 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       the domain in a user interface or sorting domain lists by site.
     '';
     homepage = http://rockdaboot.github.io/libpsl/;
-    license = with licenses; mit;
+    license = licenses.mit;
     platforms = with platforms; linux ++ darwin;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index 56e7084292c..0b9b79f0c60 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.creytiv.com/re.html";
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
-    license = with stdenv.lib.licenses; bsd3;
+    license = stdenv.lib.licenses.bsd3;
     inherit version;
     downloadPage = "http://www.creytiv.com/pub/";
     updateWalker = true;
diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index 165e16a8823..817e1c79bc7 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.creytiv.com/rem.html";
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
-    license = with stdenv.lib.licenses; bsd3;
+    license = stdenv.lib.licenses.bsd3;
     inherit version;
     downloadPage = "http://www.creytiv.com/pub/";
     updateWalker = true;
diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix
index 4316b2dda6b..e5965a10f67 100644
--- a/pkgs/development/libraries/libtermkey/default.nix
+++ b/pkgs/development/libraries/libtermkey/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Terminal keypress reading library";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix
index 1dcd578da29..c0880ee896f 100644
--- a/pkgs/development/libraries/libviper/default.nix
+++ b/pkgs/development/libraries/libviper/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://libviper.sourceforge.net/;
     description = "Simple window creation and management facilities for the console";
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix
index b52db39042f..e58d964a625 100644
--- a/pkgs/development/libraries/libvterm/default.nix
+++ b/pkgs/development/libraries/libvterm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://libvterm.sourceforge.net/;
     description = "Terminal emulator library to mimic both vt100 and rxvt";
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix
index c900cfbc684..84dbb0c156f 100644
--- a/pkgs/development/libraries/libxcomp/default.nix
+++ b/pkgs/development/libraries/libxcomp/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "NX compression library";
     homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
-    license = with licenses; gpl2;
+    license = licenses.gpl2;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix
index 37b0db4ef6c..d0bcb73151f 100644
--- a/pkgs/development/libraries/qca-qt5/default.nix
+++ b/pkgs/development/libraries/qca-qt5/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     description = "Qt 5 Cryptographic Architecture";
     homepage = http://delta.affinix.com/qca;
     maintainers = with maintainers; [ ttuegel ];
-    license = with licenses; [ lgpl21Plus ];
+    license = licenses.lgpl21Plus;
   };
 }
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 32d9bd0a8e5..9c657ec52d7 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A QML port of qtermwidget";
     homepage = "https://github.com/Swordifish90/qmltermwidget";
-    license = with stdenv.lib.licenses; [ gpl2 ];
+    license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
   };
diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix
index 928095a4e29..46df5459dca 100644
--- a/pkgs/development/libraries/quesoglc/default.nix
+++ b/pkgs/development/libraries/quesoglc/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
       platform that supports both FreeType and the OpenGL API.
     '';
     homepage = http://quesoglc.sourceforge.net/;
-    license = with licenses; [ lgpl21Plus ];
+    license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ astsmtl ];
     platforms = with platforms; linux;
   };
diff --git a/pkgs/development/libraries/rabbitmq-c/0.4.nix b/pkgs/development/libraries/rabbitmq-c/0.4.nix
index 84a7a9b4ccf..2c92ba5618c 100644
--- a/pkgs/development/libraries/rabbitmq-c/0.4.nix
+++ b/pkgs/development/libraries/rabbitmq-c/0.4.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "RabbitMQ C AMQP client library";
     homepage = https://github.com/alanxz/rabbitmq-c;
-    license = with stdenv.lib.licenses; mit;
+    license = stdenv.lib.licenses.mit;
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix
index 301fcc84b9f..b2dfa8884e9 100644
--- a/pkgs/development/libraries/re2/default.nix
+++ b/pkgs/development/libraries/re2/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = https://code.google.com/p/re2/;
     description = "An efficient, principled regular expression library";
-    license = with stdenv.lib.licenses; bsd3;
+    license = stdenv.lib.licenses.bsd3;
     platforms = with stdenv.lib.platforms; all;
   };
 }
diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
index 3427bf1c4e9..35fca306d6c 100644
--- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
+++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     inherit version;
     description = "Linear Algebra PACKage";
     homepage = "http://www.netlib.org/lapack/";
-    license = with licenses; bsd3;
+    license = licenses.bsd3;
 
     platforms = platforms.all;
     maintainers = [ maintainers.simons ];
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index cbe03b8eb63..f2d64bbc9ba 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     inherit version;
     description = "Linear Algebra PACKage";
     homepage = "http://www.netlib.org/lapack/";
-    license = with licenses; bsd3;
+    license = licenses.bsd3;
 
     platforms = platforms.all;
     maintainers = [ maintainers.simons ];
diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index 24dc443ca70..16e7b09a0f2 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.creytiv.com/baresip.html";
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
-    license = with stdenv.lib.licenses; gpl2;
+    license = stdenv.lib.licenses.gpl2;
     downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
     inherit version;
     updateWalker = true;
diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix
index 11f3294b289..663432f8ec8 100644
--- a/pkgs/development/libraries/unibilium/default.nix
+++ b/pkgs/development/libraries/unibilium/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A very basic terminfo library";
-    license = with licenses; [ lgpl3Plus ];
+    license = licenses.lgpl3Plus;
   };
 }
diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix
index 2c16f1f6f6c..e0be56e5037 100644
--- a/pkgs/development/tools/alloy/default.nix
+++ b/pkgs/development/tools/alloy/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://alloy.mit.edu/;
     downloadPage = http://alloy.mit.edu/alloy/download.html;
-    license = with licenses; mit;
+    license = licenses.mit;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix
index cd8cde1ae52..ce9b8a9a59d 100644
--- a/pkgs/development/tools/analysis/coan/default.nix
+++ b/pkgs/development/tools/analysis/coan/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       application of this sort.
     '';
     homepage = http://coan2.sourceforge.net/;
-    license = with licenses; bsd3;
+    license = licenses.bsd3;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix
index c3381186aa8..9a8df0f4690 100644
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       replacing #includes with forward-declares when possible.
     '';
     homepage = http://include-what-you-use.com;
-    license = with licenses; bsd3;
+    license = licenses.bsd3;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/development/tools/atom-shell/default.nix b/pkgs/development/tools/atom-shell/default.nix
index 983c5c451d0..4e5413b5012 100644
--- a/pkgs/development/tools/atom-shell/default.nix
+++ b/pkgs/development/tools/atom-shell/default.nix
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Cross platform desktop application shell";
     homepage = https://github.com/atom/atom-shell;
-    license = [ licenses.mit ];
+    license = licenses.mit;
     maintainers = [ maintainers.fluffynukeit ];
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix
index f8e759b83ee..ee49423a8b1 100644
--- a/pkgs/development/tools/chefdk/default.nix
+++ b/pkgs/development/tools/chefdk/default.nix
@@ -13,7 +13,7 @@ bundlerEnv {
   meta = with lib; {
     description = "A streamlined development and deployment workflow for Chef platform";
     homepage    = https://downloads.chef.io/chef-dk/;
-    license     = with licenses; asl20;
+    license     = licenses.asl20;
     maintainers = with maintainers; [ offline ];
     platforms   = platforms.unix;
   };
diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
index a7be59a1fea..f6cf63afc2a 100644
--- a/pkgs/development/tools/java/cfr/default.nix
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
       entirely in Java 6.
     '';
     homepage = http://www.benf.org/other/cfr/;
-    license = with licenses; mit;
+    license = licenses.mit;
     platforms = with platforms; all;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index db02fef9f2a..f7d2dfc4957 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
     description = "Compiler cache for fast recompilation of C/C++ code";
     homepage = http://ccache.samba.org/;
     downloadPage = https://ccache.samba.org/download.html;
-    license = with licenses; gpl3Plus;
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ nckx ];
   };
 };
diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix
index 0d96c562c16..0a7e2530526 100644
--- a/pkgs/development/tools/parsing/flexc++/default.nix
+++ b/pkgs/development/tools/parsing/flexc++/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://flexcpp.sourceforge.net/;
     downloadPage = http://sourceforge.net/projects/flexcpp/files/;
-    license = with licenses; gpl3;
+    license = licenses.gpl3;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index 99e54e86a56..948e39f4b55 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A secure tunneling app for executing tests securely when testing behind firewalls";
-    license = with licenses; unfree;
+    license = licenses.unfree;
     homepage = https://docs.saucelabs.com/reference/sauce-connect/;
     maintainers = with maintainers; [offline];
     platforms = with platforms; platforms.linux;
diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix
index 7f50b816cc1..a5bfb8bfc59 100644
--- a/pkgs/development/tools/thrust/default.nix
+++ b/pkgs/development/tools/thrust/default.nix
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Chromium-based cross-platform / cross-language application framework";
     homepage = https://github.com/breach/thrust;
-    license = [ licenses.mit ];
+    license = licenses.mit;
     maintainers = [ maintainers.osener ];
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix
index 485b52d3d08..a7d6bbc63d9 100644
--- a/pkgs/games/alienarena/default.nix
+++ b/pkgs/games/alienarena/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://red.planetarena.org;
     # Engine is under GPLv2, everything else is under
-    license = with licenses; unfreeRedistributable;
+    license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [ astsmtl ];
     platforms = platforms.linux;
     hydraPlatforms = [];
diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
index 801b7ea7277..c577d65a559 100644
--- a/pkgs/games/blobby/default.nix
+++ b/pkgs/games/blobby/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = ''A blobby volleyball game'';
-    license = with stdenv.lib.licenses; bsd3;
+    license = stdenv.lib.licenses.bsd3;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
     homepage = "http://blobby.sourceforge.net/";
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index e7a420b894a..46cd66d22af 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     inherit version;
     description = "Enhanched port of Duke Nukem 3D for various platforms";
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
     homepage = http://eduke32.com;
     maintainers = with maintainers; [ nckx sander ];
   };
diff --git a/pkgs/games/gsb/default.nix b/pkgs/games/gsb/default.nix
index a0a25a2ff4b..4c1a385baaf 100644
--- a/pkgs/games/gsb/default.nix
+++ b/pkgs/games/gsb/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
       battle (or at least blow to bits in aesthetically pleasing ways).
     '';
     homepage = http://www.positech.co.uk/gratuitousspacebattles/index.html;
-    license = with licenses; unfree;
+    license = licenses.unfree;
     maintainers = with maintainers; [ jcumming ];
     platforms = [ "x86_64-linux" "i686-linux" ] ;
   };
diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix
index 925362be1c5..9224d5872c2 100644
--- a/pkgs/games/urbanterror/default.nix
+++ b/pkgs/games/urbanterror/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
       realism". This results in a very unique, enjoyable and addictive game.
     '';
     homepage = http://www.urbanterror.net;
-    license = with licenses; unfreeRedistributable;
+    license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [ astsmtl ];
     platforms = platforms.linux;
     hydraPlatforms = [];
diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix
index 4a845a3a17e..db389047ec7 100644
--- a/pkgs/games/vessel/default.nix
+++ b/pkgs/games/vessel/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
       to life, and all the consequences that ensue.
     '';
     homepage = http://www.strangeloopgames.com;
-    license = with licenses; unfree;
+    license = licenses.unfree;
     maintainers = with maintainers; [ jcumming ];
   };
 
diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix
index 83c9b5d52fa..95086d04630 100644
--- a/pkgs/games/warsow/default.nix
+++ b/pkgs/games/warsow/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.warsow.net;
     # Engine is under GPLv2, everything else is under
-    license = with licenses; unfreeRedistributable;
+    license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [ astsmtl ];
     platforms = with platforms; linux;
   };
diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix
index 2382da03453..ba887d91de1 100644
--- a/pkgs/games/worldofgoo/default.nix
+++ b/pkgs/games/worldofgoo/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
       game, or that they are extremely delicious.
     '';
     homepage = http://worldofgoo.com;
-    license = with licenses; unfree;
+    license = licenses.unfree;
     maintainers = with maintainers; [ jcumming ];
   };
 
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index ba8245bb700..7b68e1e3d36 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
       aims to become the best possible open-source FPS of its kind.
     '';
     homepage = http://www.xonotic.org;
-    license = with stdenv.lib.licenses; gpl2Plus;
+    license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [ astsmtl ];
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = [];
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 9b1c181c2a4..0ff38209867 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -540,7 +540,7 @@ rec {
     meta = with stdenv.lib; {
       description = "Analytics about your programming";
       homepage = https://wakatime.com;
-      license = with licenses; bsd3;
+      license = licenses.bsd3;
       platforms = with platforms; linux;
       maintainers = with maintainers; [ nckx ];
     };
diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix
index 39c606f3fb5..b8fc6e5f6ce 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     inherit version;
     description = "Report system-wide file access events";
     homepage = https://launchpad.net/fatrace/;
-    license = with licenses; gpl3Plus;
+    license = licenses.gpl3Plus;
     longDescription = ''
       fatrace reports file access events from all running processes.
       Its main purpose is to find processes which keep waking up the disk
diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix
index 7d5ed0cd3ee..4c1497367e3 100644
--- a/pkgs/os-specific/linux/freefall/default.nix
+++ b/pkgs/os-specific/linux/freefall/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       the internal hard drive and park its heads on the ramp when critical
       situations are anticipated. This has no effect on SSD devices!
     '';
-    license = with licenses; gpl2;
+    license = licenses.gpl2;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix
index 4733ce95bb2..e4165b08d7d 100644
--- a/pkgs/os-specific/linux/ftop/default.nix
+++ b/pkgs/os-specific/linux/ftop/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Show progress of open files and file systems";
     homepage = https://code.google.com/p/ftop/;
-    license = with licenses; gpl3Plus;
+    license = licenses.gpl3Plus;
     longDescription = ''
       Ftop is to files what top is to processes. The progress of all open files
       and file systems can be monitored. If run as a regular user, the set of
diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix
index 7672318392f..4b371097ee6 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/pkgs/os-specific/linux/jfbview/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       - Customizable multi-threaded caching
     '';
     homepage = http://seasonofcode.com/pages/jfbview.html;
-    license = with licenses; asl20;
+    license = licenses.asl20;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index a5f6242f84f..16f1331d320 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     inherit version;
     description = "Log machine checks (memory, IO, and CPU hardware errors)";
     homepage = http://mcelog.org/;
-    license = with licenses; gpl2;
+    license = licenses.gpl2;
     maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix
index ac60501929a..4b656967386 100644
--- a/pkgs/os-specific/linux/phc-intel/default.nix
+++ b/pkgs/os-specific/linux/phc-intel/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.linux-phc.org/;
     downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267";
-    license = with licenses; gpl2;
+    license = licenses.gpl2;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix
index 3b0f7c694ac..fab13a125c4 100644
--- a/pkgs/os-specific/linux/sdparm/default.nix
+++ b/pkgs/os-specific/linux/sdparm/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = http://sg.danny.cz/sg/sdparm.html;
     description = "A utility to access SCSI device parameters";
-    license = with licenses; bsd3;
+    license = licenses.bsd3;
     maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix
index ebabb1091ee..f898034719f 100644
--- a/pkgs/servers/dico/default.nix
+++ b/pkgs/servers/dico/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Flexible dictionary server and client implementing RFC 2229";
     homepage    = http://www.gnu.org/software/dico/;
-    license     = with licenses; gpl3Plus;
+    license     = licenses.gpl3Plus;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
 
diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix
index 38e59a39f38..2bb81d83337 100644
--- a/pkgs/servers/monitoring/sensu/default.nix
+++ b/pkgs/servers/monitoring/sensu/default.nix
@@ -11,7 +11,7 @@
     meta = with lib; {
       description = "A monitoring framework that aims to be simple, malleable, and scalable";
       homepage    = http://sensuapp.org/;
-      license     = with licenses; mit;
+      license     = licenses.mit;
       maintainers = with maintainers; [ theuni ];
       platforms   = platforms.unix;
     };
diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix
index adda65ce60a..a0392d0f95a 100644
--- a/pkgs/servers/nosql/cassandra/2.0.nix
+++ b/pkgs/servers/nosql/cassandra/2.0.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     homepage = http://cassandra.apache.org/;
     description = "A massively scalable open source NoSQL database";
     platforms = with platforms; all;
-    license = with licenses; asl20;
+    license = licenses.asl20;
     maintainers = with maintainers; [ nckx rushmorem ];
   };
 }
diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix
index 88a1d464b67..bbac243c7a0 100644
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/pkgs/servers/nosql/cassandra/2.1.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     homepage = http://cassandra.apache.org/;
     description = "A massively scalable open source NoSQL database";
     platforms = with platforms; all;
-    license = with licenses; asl20;
+    license = licenses.asl20;
     maintainers = with maintainers; [ nckx rushmorem ];
   };
 }
diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix
index 705a4ba43e7..8a831f7ff69 100644
--- a/pkgs/servers/restund/default.nix
+++ b/pkgs/servers/restund/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.creytiv.com/restund.html";
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
-    license = with stdenv.lib.licenses; bsd3;
+    license = stdenv.lib.licenses.bsd3;
     inherit version;
     downloadPage = "http://www.creytiv.com/pub/";
     updateWalker = true;
diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index e951c24e6a0..28359bb555d 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       systems.
     '';
     homepage = "https://www.mirbsd.org/mksh.htm";
-    license = with stdenv.lib.licenses; free;
+    license = stdenv.lib.licenses.free;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix
index 2422d2bb4f7..151cd68fdbc 100644
--- a/pkgs/tools/admin/nxproxy/default.nix
+++ b/pkgs/tools/admin/nxproxy/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "NX compression proxy";
     homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
-    license = with licenses; gpl2;
+    license = licenses.gpl2;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index fdc52eabd4b..0b29ca1f42a 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Enterprise ready, Network Backup Tool";
     homepage    = http://bacula.org/;
-    license     = with licenses; gpl2;
+    license     = licenses.gpl2;
     maintainers = with maintainers; [ iElectric lovek323 ];
     platforms   = platforms.all;
   };
diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index fcc3b373fd1..5355138ac8c 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     inherit version;
     description = "Binary differential compression in VCDIFF (RFC 3284) format";
     homepage = http://xdelta.org/;
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix
index c0a6c8400fd..f47107c85fb 100644
--- a/pkgs/tools/filesystems/boxfs/default.nix
+++ b/pkgs/tools/filesystems/boxfs/default.nix
@@ -51,7 +51,7 @@ in stdenv.mkDerivation {
       unmount the file system with `fusermount -u mountpoint`.
     '';
     homepage = https://github.com/drotiro/boxfs2;
-    license = with licenses; gpl3;
+    license = licenses.gpl3;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix
index 409e7a8c36f..59cb07dead0 100644
--- a/pkgs/tools/filesystems/duff/default.nix
+++ b/pkgs/tools/filesystems/duff/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Quickly find duplicate files";
     homepage = http://duff.dreda.org/;
-    license = with licenses; zlib;
+    license = licenses.zlib;
     longDescription = ''
       Duff is a Unix command-line utility for quickly finding duplicates in
       a given set of files.
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index 81a3b46cacb..211690606ef 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://vgough.github.io/encfs;
     description = "Provides an encrypted filesystem in user-space via FUSE";
-    license = with licenses; lgpl2;
+    license = licenses.lgpl2;
     maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/filesystems/exfat-utils/default.nix b/pkgs/tools/filesystems/exfat-utils/default.nix
index a767ba36b3f..3215b0d9174 100644
--- a/pkgs/tools/filesystems/exfat-utils/default.nix
+++ b/pkgs/tools/filesystems/exfat-utils/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       Unix-like systems.
     '';
     homepage = https://code.google.com/p/exfat;
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/tools/filesystems/fuse-exfat/default.nix b/pkgs/tools/filesystems/fuse-exfat/default.nix
index 983228e9de5..ae9f9e32fa8 100644
--- a/pkgs/tools/filesystems/fuse-exfat/default.nix
+++ b/pkgs/tools/filesystems/fuse-exfat/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = http://code.google.com/p/exfat/;
     description = "A FUSE-based filesystem that allows read and write access to exFAT devices";
     platforms = with platforms; linux;
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix
index 50242bb6388..23ee5558e14 100644
--- a/pkgs/tools/filesystems/mp3fs/default.nix
+++ b/pkgs/tools/filesystems/mp3fs/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
       simple drag-and-drop in a file browser.
     '';
     homepage = http://khenriks.github.io/mp3fs/;
-    license = with licenses; gpl3Plus;
+    license = licenses.gpl3Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix
index 5106af48917..853654c0f79 100644
--- a/pkgs/tools/filesystems/rdfind/default.nix
+++ b/pkgs/tools/filesystems/rdfind/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://rdfind.pauldreik.se/;
     description = "Removes or hardlinks duplicate files very swiftly";
-    license = with stdenv.lib.licenses; gpl2;
+    license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ wmertens ];
     platforms = with stdenv.lib.platforms; all;
   };
diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index f081f812169..7e880ffeeb9 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -11,6 +11,6 @@ stdenv.mkDerivation {
   
   meta = with stdenv.lib; {
     description = "Mount an S3 bucket as filesystem through FUSE";
-    license = with licenses; gpl2;
+    license = licenses.gpl2;
   };
 }
diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix
index 9c32d3c5466..47eacd9bdb0 100644
--- a/pkgs/tools/misc/clex/default.nix
+++ b/pkgs/tools/misc/clex/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       add-on to your favorite shell.
     '';
     homepage = http://www.clex.sk;
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix
index cfc1e9ab564..800e1c6f67a 100644
--- a/pkgs/tools/misc/fluentd/default.nix
+++ b/pkgs/tools/misc/fluentd/default.nix
@@ -13,7 +13,7 @@ bundlerEnv {
   meta = with lib; {
     description = "A data collector";
     homepage    = http://www.fluentd.org/;
-    license     = with licenses; asl20;
+    license     = licenses.asl20;
     maintainers = with maintainers; [ offline ];
     platforms   = platforms.unix;
   };
diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index e5c814faa4a..dd2798de272 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       while preserving the partition contents.
     '';
     homepage = http://gparted.sourceforge.net;
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix
index a3a34d95fb5..663c60d2856 100644
--- a/pkgs/tools/misc/qjoypad/default.nix
+++ b/pkgs/tools/misc/qjoypad/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       experience just a little bit nicer.
     '';
     homepage = http://qjoypad.sourceforge.net;
-    license = with stdenv.lib.licenses; gpl2;
+    license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ astsmtl ];
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix
index fd64f6694ee..ad9e0949ce8 100644
--- a/pkgs/tools/misc/t/default.nix
+++ b/pkgs/tools/misc/t/default.nix
@@ -11,7 +11,7 @@ bundlerEnv {
   meta = with lib; {
     description = "A command-line power tool for Twitter";
     homepage    = http://sferik.github.io/t/;
-    license     = with licenses; asl20;
+    license     = licenses.asl20;
     maintainers = with maintainers; [ offline ];
     platforms   = platforms.unix;
   };
diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix
index 96610c32167..f5ac891d8e6 100644
--- a/pkgs/tools/misc/tmuxinator/default.nix
+++ b/pkgs/tools/misc/tmuxinator/default.nix
@@ -11,7 +11,7 @@ bundlerEnv {
   meta = with lib; {
     description = "Manage complex tmux sessions easily";
     homepage    = https://github.com/tmuxinator/tmuxinator;
-    license     = with licenses; mit;
+    license     = licenses.mit;
     maintainers = with maintainers; [ auntie ];
     platforms   = platforms.unix;
   };
diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix
index bc48bb6cf47..ca0c5f5edf1 100644
--- a/pkgs/tools/networking/darkstat/default.nix
+++ b/pkgs/tools/networking/darkstat/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
       - Supports IPv6.
     '';
     homepage = http://unix4lyfe.org/darkstat;
-    license = with licenses; gpl2;
+    license = licenses.gpl2;
     maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index bdd2c4a0c24..11dadf9dcd8 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A tool for securing communications between a client and a DNS resolver";
     homepage = http://dnscrypt.org/;
-    license = with stdenv.lib.licenses; [ isc ];
+    license = stdenv.lib.licenses.isc;
     maintainers = with stdenv.lib.maintainers; [ joachifm ];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix
index fcb3e903753..c4f7c8da9d4 100644
--- a/pkgs/tools/networking/hans/default.nix
+++ b/pkgs/tools/networking/hans/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       allowed.
     '';
     homepage = http://code.gerade.org/hans/;
-    license = with licenses; gpl3Plus;
+    license = licenses.gpl3Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index 9b676c6b72e..f1abec0faf7 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       Now only one utiltity is needed to do a lot.
     '';
     homepage = http://www.deepspace6.net/projects/ipv6calc.html;
-    license = with licenses; gpl2;
+    license = licenses.gpl2;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix
index f16698ef3cd..5d05677bb29 100644
--- a/pkgs/tools/networking/isync/default.nix
+++ b/pkgs/tools/networking/isync/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://isync.sourceforge.net/;
     description = "Free IMAP and MailDir mailbox synchronizer";
-    license = with licenses; [ gpl2Plus ];
+    license = licenses.gpl2Plus;
 
     maintainers = with maintainers; [ the-kenny viric ];
     platforms = platforms.unix;
diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix
index cf9c3a4fa4e..fad99bbd7d7 100644
--- a/pkgs/tools/networking/maildrop/default.nix
+++ b/pkgs/tools/networking/maildrop/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://www.courier-mta.org/maildrop/;
     description = "Mail filter/mail delivery agent that is used by the Courier Mail Server";
-    license = with licenses; gpl3;
+    license = licenses.gpl3;
   };
 }
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 967504a0004..c391bb9ecb0 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
       development and analysis, debugging, auditing or network reconnaissance.
     '';
     homepage = http://netsniff-ng.org/;
-    license = with licenses; gpl2;
+    license = licenses.gpl2;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix
index 2368470b84d..150f60f8de4 100644
--- a/pkgs/tools/networking/nss-pam-ldapd/default.nix
+++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "LDAP identity and authentication for NSS/PAM";
     homepage = http://arthurdejong.org/nss-pam-ldapd/;
-    license = with licenses; [ lgpl21 ];
+    license = licenses.lgpl21;
   };
 }
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 7f6addc8629..70294820425 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -113,6 +113,6 @@ stdenv.mkDerivation rec {
       connect at startup to any preferred network within range.
     '';
     maintainers = [ maintainers.roconnor ];
-    license = with licenses; gpl2;
+    license = licenses.gpl2;
   };
 }
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index 624386f34f2..beb0e7d8678 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "The Debian package manager";
     homepage = http://wiki.debian.org/Teams/Dpkg;
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ mornfall nckx ];
   };
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index a8f6ae81e04..ef15967330d 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Belgian electronic identity card (eID) middleware";
     homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/;
-    license = with licenses; lgpl3;
+    license = licenses.lgpl3;
     longDescription = ''
       Allows user authentication and digital signatures with Belgian ID cards.
       Also requires a running pcscd service and compatible card reader.
diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix
index 45a314e13a6..06307263e52 100644
--- a/pkgs/tools/security/eid-viewer/default.nix
+++ b/pkgs/tools/security/eid-viewer/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Belgian electronic identity card (eID) viewer";
     homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/;
-    license = with licenses; lgpl3;
+    license = licenses.lgpl3;
     longDescription = ''
       A simple, graphical Java application to view, print and save data from
       Belgian electronic identity cards. Independent of the eid-mw package,
diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix
index 1e2f74e1b0a..ef0a6d251a3 100644
--- a/pkgs/tools/system/bootchart/default.nix
+++ b/pkgs/tools/system/bootchart/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://www.bootchart.org/;
     description = "Performance analysis and visualization of the GNU/Linux boot process";
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
   };
 
 }
diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix
index fd911142c21..ce29fc63553 100644
--- a/pkgs/tools/system/dog/default.nix
+++ b/pkgs/tools/system/dog/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "http://lwn.net/Articles/421072/";
     description = "cat replacement";
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ qknight ];
     platforms = with platforms; all;
   };
diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix
index baaa97b4b24..d560fdad51b 100644
--- a/pkgs/tools/system/foremost/default.nix
+++ b/pkgs/tools/system/foremost/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       reliable and faster recovery.
     '';
     homepage = http://foremost.sourceforge.net/;
-    license = with licenses; publicDomain;
+    license = licenses.publicDomain;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index a61835dbd0c..e624991dc42 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://kernel.ubuntu.com/~cking/stress-ng;
     downloadPage = http://kernel.ubuntu.com/~cking/tarballs/stress-ng/;
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix
index 62f7280a54a..4aba9f48b76 100644
--- a/pkgs/tools/system/suid-chroot/default.nix
+++ b/pkgs/tools/system/suid-chroot/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     inherit version;
     description = "Setuid-safe wrapper for chroot";
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix
index a1397cb6214..c443dc148f1 100644
--- a/pkgs/tools/system/tm/default.nix
+++ b/pkgs/tools/system/tm/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = "http://vicerveza.homeunix.net/~viric/soft/tm";
     description = "terminal mixer - multiplexer for the i/o of terminal applications";
-    license = with licenses; gpl2;
+    license = licenses.gpl2;
     maintainers = with maintainers; [ viric ];
     platforms = with platforms; all;
   };
diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix
index 6cd69a746f0..3bf4cea09f5 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/pkgs/tools/system/ts/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "http://vicerveza.homeunix.net/~viric/soft/ts";
     description = "task spooler - batch queue";
-    license = with licenses; gpl2;
+    license = licenses.gpl2;
     maintainers = with maintainers; [ viric ];
     platforms = with platforms; all;
   };
diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix
index c9cf05373b5..386e80a1376 100644
--- a/pkgs/tools/system/uptimed/default.nix
+++ b/pkgs/tools/system/uptimed/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
       which can also easily be used to show your records on a web page.
     '';
     homepage = https://github.com/rpodgorny/uptimed/;
-    license = with licenses; gpl2;
+    license = licenses.gpl2;
     platforms = with platforms; linux;
   };
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cbab34adc03..429da118b09 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -36,7 +36,7 @@ let self = _self // overrides; _self = with self; {
     meta = with stdenv.lib; {
       description = "A grep-like tool tailored to working with large trees of source code";
       homepage    = http://betterthangrep.com/;
-      license     = with licenses; artistic2;
+      license     = licenses.artistic2;
       maintainers = with maintainers; [ lovek323 ];
       platforms   = platforms.unix;
     };
@@ -607,7 +607,7 @@ let self = _self // overrides; _self = with self; {
       homepage = http://gtk2-perl.sourceforge.net/;
       description = "Perl interface to the cairo 2d vector graphics library";
       maintainers = with maintainers; [ nckx ];
-      license = with stdenv.lib.licenses; [ lgpl21Plus ];
+      license = stdenv.lib.licenses.lgpl21Plus;
     };
   };
 
@@ -3723,7 +3723,7 @@ let self = _self // overrides; _self = with self; {
       ++ stdenv.lib.optional stdenv.isLinux LinuxInotify2;
     meta = with stdenv.lib; {
       description = "Watch for changes to files, cross-platform style";
-      license = with licenses; artistic2;
+      license = licenses.artistic2;
     };
   };
 
@@ -3986,7 +3986,7 @@ let self = _self // overrides; _self = with self; {
     meta = with stdenv.lib; {
       homepage = http://finance-quote.sourceforge.net/;
       description = "Get stock and mutual fund quotes from various exchanges";
-      license = with licenses; gpl2;
+      license = licenses.gpl2;
     };
   };
 
@@ -4105,7 +4105,7 @@ let self = _self // overrides; _self = with self; {
       homepage = http://gtk2-perl.sourceforge.net/;
       description = "Perl wrappers for the GLib utility and Object libraries";
       maintainers = with maintainers; [ nckx ];
-      license = with stdenv.lib.licenses; [ lgpl3Plus ];
+      license = stdenv.lib.licenses.lgpl3Plus;
     };
   };
 
@@ -4160,7 +4160,7 @@ let self = _self // overrides; _self = with self; {
 
     meta = with stdenv.lib; {
       description = "Perl interface to the GraphViz graphing tool";
-      license = with licenses; artistic2;
+      license = licenses.artistic2;
       maintainers = [ ];
     };
   };
@@ -4185,7 +4185,7 @@ let self = _self // overrides; _self = with self; {
       homepage = http://gtk2-perl.sourceforge.net/;
       description = "Perl interface to the 2.x series of the Gimp Toolkit library";
       maintainers = with maintainers; [ nckx ];
-      license = with stdenv.lib.licenses; [ lgpl21Plus ];
+      license = stdenv.lib.licenses.lgpl21Plus;
     };
   };
 
@@ -7273,7 +7273,7 @@ let self = _self // overrides; _self = with self; {
       homepage = http://gtk2-perl.sourceforge.net/;
       description = "Layout and render international text";
       maintainers = with maintainers; [ nckx ];
-      license = with stdenv.lib.licenses; [ lgpl21Plus ];
+      license = stdenv.lib.licenses.lgpl21Plus;
     };
   };
 
@@ -7813,7 +7813,7 @@ let self = _self // overrides; _self = with self; {
     meta = with stdenv.lib; {
       homepage = http://user42.tuxfamily.org/podlinkcheck/index.html;
       description = "Check POD L<> link references";
-      license = with licenses; gpl3Plus;
+      license = licenses.gpl3Plus;
     };
   };
 
@@ -7923,7 +7923,7 @@ let self = _self // overrides; _self = with self; {
     };
     meta = with stdenv.lib; {
       description = "Provide commonly requested regular expressions";
-      license = with licenses; mit;
+      license = licenses.mit;
     };
   };
 
@@ -8435,7 +8435,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ParamsUtil SubExporter ];
     meta = with stdenv.lib; {
       description = "Build sprintf-like functions of your own";
-      license = with licenses; gpl2;
+      license = licenses.gpl2;
     };
   };
 
@@ -9335,7 +9335,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ ExceptionBase FatalException Moose namespaceclean TestAssert ];
     meta = with stdenv.lib; {
       description = "Simulating other classes";
-      license = with licenses; lgpl2Plus;
+      license = licenses.lgpl2Plus;
       maintainers = with maintainers; [ ocharles ];
       platforms   = platforms.unix;
     };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bc6b79a86e4..882ddad6815 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1766,7 +1766,7 @@ let
         A Python package for creating beautiful command line interfaces in a
         composable way, with as little code as necessary.
       '';
-      license = with licenses; [ bsd3 ];
+      license = licenses.bsd3;
       maintainers = with maintainers; [ nckx ];
     };
   };
@@ -5412,7 +5412,7 @@ let
         It's just one file and is implemented using ctypes.
       '';
       homepage = http://github.com/terencehonles/fusepy;
-      license = with licenses; isc;
+      license = licenses.isc;
       platforms = with platforms; linux;
       maintainers = with maintainers; [ nckx ];
     };
@@ -5513,7 +5513,7 @@ let
         - Allow for the same file at multiple paths.
       '';
       homepage = https://github.com/dsoprea/GDriveFS;
-      license = with licenses; gpl2;
+      license = licenses.gpl2;
       platforms = with platforms; linux;
       maintainers = with maintainers; [ nckx ];
     };
@@ -5664,7 +5664,7 @@ let
         anywhere within your gevent-powered application.
       '';
       homepage = http://gehrcke.de/gipc;
-      license = with licenses; mit;
+      license = licenses.mit;
       maintainers = with maintainers; [ nckx ];
     };
   };
@@ -8058,7 +8058,7 @@ let
         not a large parsing framework or a component of some larger system.
       '';
 
-      license = with licenses; bsd3;
+      license = licenses.bsd3;
 
       maintainers = [ ];
     };
@@ -8432,7 +8432,7 @@ let
         syntax highlighting.
       '';
       homepage = http://pgcli.com;
-      license = with licenses; [ bsd3 ];
+      license = licenses.bsd3;
       maintainers = with maintainers; [ nckx ];
     };
   };
@@ -8742,7 +8742,7 @@ let
         with a nice interactive Python shell (called ptpython) built on top.
       '';
       homepage = https://github.com/jonathanslenders/python-prompt-toolkit;
-      license = with licenses; [ bsd3 ];
+      license = licenses.bsd3;
       maintainers = with maintainers; [ nckx ];
     };
   };
@@ -9047,7 +9047,7 @@ let
     meta = {
       homepage = https://pypi.python.org/pypi/pygit2;
       description = "A set of Python bindings to the libgit2 shared library";
-      license = with licenses; gpl2;
+      license = licenses.gpl2;
       platforms = with platforms; all;
     };
   };
@@ -9489,7 +9489,7 @@ let
     meta = {
       homepage = http://pygments.org/;
       description = "A generic syntax highlighter";
-      license = with licenses; [ bsd2 ];
+      license = licenses.bsd2;
       maintainers = with maintainers; [ nckx ];
     };
   };
@@ -10190,7 +10190,7 @@ let
 
     meta = {
       homepage    = "https://github.com/rackspace/pyrax";
-      license     = with licenses; mit;
+      license     = licenses.mit;
       description = "Python API to interface with Rackspace";
     };
 
@@ -10266,7 +10266,7 @@ let
 
     meta = {
       homepage = "http://github.com/mongodb/mongo-python-driver";
-      license = with licenses; [ asl20 ];
+      license = licenses.asl20;
       description = "Python driver for MongoDB ";
     };
   };
@@ -10334,7 +10334,7 @@ let
         in Python.
       '';
 
-      license = with licenses; bsd3;
+      license = licenses.bsd3;
 
       maintainers = [ ];
     };
@@ -10726,7 +10726,7 @@ let
     meta = {
       description = "Check the status of code repositories under a root directory";
       homepage = https://github.com/kynikos/repocheck;
-      license = with licenses; gpl3Plus;
+      license = licenses.gpl3Plus;
       maintainers = with maintainers; [ nckx ];
     };
   };
@@ -12144,7 +12144,7 @@ let
         Provides support for parsing, splitting and formatting SQL statements.
       '';
       homepage = https://github.com/andialbrecht/sqlparse;
-      license = with licenses; [ bsd3 ];
+      license = licenses.bsd3;
       maintainers = with maintainers; [ nckx ];
     };
   };
@@ -13182,7 +13182,7 @@ let
         no 3rd-party dependencies.
       '';
       homepage = https://github.com/jquast/wcwidth;
-      license = with licenses; [ mit ];
+      license = licenses.mit;
       maintainers = with maintainers; [ nckx ];
     };
   };

From 2c125cf37ad8ed4d971325bf127745a2768a9872 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Thu, 28 May 2015 11:56:29 -0500
Subject: [PATCH 0386/2322] removed default dependency of liblapack on ATLAS.
 was causing an unnecessary double-build of atlas

---
 .../science/math/liblapack/3.5.0.nix          | 49 -------------------
 .../science/math/liblapack/default.nix        | 39 ++++++++++++---
 pkgs/top-level/all-packages.nix               |  5 +-
 3 files changed, 36 insertions(+), 57 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/liblapack/3.5.0.nix

diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
deleted file mode 100644
index 0b4badf26e7..00000000000
--- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }:
-let
-  atlasMaybeShared = atlas.override { inherit shared; };
-  usedLibExtension = if shared then ".so" else ".a";
-in
-stdenv.mkDerivation rec {
-  version = "3.5.0";
-  name = "liblapack-${version}";
-  src = fetchurl {
-    url = "http://www.netlib.org/lapack/lapack-${version}.tgz";
-    sha256 = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s";
-  };
-
-  propagatedBuildInputs = [ atlasMaybeShared ];
-  buildInputs = [ gfortran cmake ];
-  nativeBuildInputs = [ python ];
-
-  cmakeFlags = [
-    "-DUSE_OPTIMIZED_BLAS=ON"
-    "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
-    "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
-    "-DCMAKE_Fortran_FLAGS=-fPIC"
-  ]
-  ++ (stdenv.lib.optional shared "-DBUILD_SHARED_LIBS=ON")
-  ;
-
-  doCheck = ! shared;
-
-  checkPhase = "
-    sed -i 's,^#!.*,#!${python}/bin/python,' lapack_testing.py
-    ctest
-  ";
-
-  enableParallelBuilding = true;
-
-  passthru = {
-    blas = atlas;
-  };
-
-  meta = {
-    inherit version;
-    description = "Linear Algebra PACKage";
-    homepage = "http://www.netlib.org/lapack/";
-    license = "revised-BSD";
-
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
-  };
-}
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 25667e11264..18aceeba177 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -1,15 +1,38 @@
-{ stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }:
+{
+  stdenv,
+  fetchurl,
+  gfortran,
+  cmake,
+  python,
+  atlas ? null,
+  shared ? false,
+  version ? "3.4.1"
+}:
 let
-  atlasMaybeShared = atlas.override { inherit shared; };
+  atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }
+                     else null;
   usedLibExtension = if shared then ".so" else ".a";
-  version = "3.4.1";
-  inherit (stdenv.lib) optional;
+  inherit (stdenv.lib) optional optionals concatStringsSep;
+  inherit (builtins) hasAttr attrNames;
+  # Hashes of the versions of liblapack we know about.
+  versions2sha = {
+    "3.4.1" = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f";
+    "3.5.0" = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s";
+  };
 in
+
+if !(builtins.hasAttr version versions2sha)
+then throw ''
+  Unknown liblapack version ${version}.
+  Available versions: ${concatStringsSep ", " (attrNames versions2sha)}
+''
+else
+
 stdenv.mkDerivation rec {
   name = "liblapack-${version}";
   src = fetchurl {
     url = "http://www.netlib.org/lapack/lapack-${version}.tgz";
-    sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f";
+    sha256 = versions2sha."${version}";
   };
 
   propagatedBuildInputs = [ atlasMaybeShared ];
@@ -18,10 +41,12 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DUSE_OPTIMIZED_BLAS=ON"
-    "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
-    "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
     "-DCMAKE_Fortran_FLAGS=-fPIC"
   ]
+  ++ (optionals (atlas != null) [
+    "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
+    "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
+  ])
   ++ (optional shared "-DBUILD_SHARED_LIBS=ON")
   # If we're on darwin, CMake will automatically detect impure paths. This switch
   # prevents that.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 368ec616654..bb3b696e23a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13836,7 +13836,10 @@ let
   jags = callPackage ../applications/science/math/jags { };
 
   liblapack = callPackage ../development/libraries/science/math/liblapack { };
-  liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix { };
+
+  liblapackWithAtlas = liblapack.override { inherit atlas; };
+
+  liblapack_3_5_0 = liblapack.override { version = "3.5.0"; };
 
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 

From 385936f7d946c553abc78b408786e064242c1e0f Mon Sep 17 00:00:00 2001
From: Sami BOUHLEL <sami.bouhlel@predictix.com>
Date: Thu, 28 May 2015 20:53:57 +0100
Subject: [PATCH 0387/2322] added support for boto 2.38.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 bc6b79a86e4..b95c90efab3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1294,11 +1294,11 @@ let
 
   boto = buildPythonPackage rec {
     name = "boto-${version}";
-    version = "2.36.0";
+    version = "2.38.0";
 
     src = pkgs.fetchurl {
       url = "https://github.com/boto/boto/archive/${version}.tar.gz";
-      sha256 = "1zrlmri89q2090yh9ylx798q4yk54y39v7w7xj101fnwc1r6jlqr";
+      sha256 = "f2659f9b9d4f183a997ad0fc87f99f8cd3998df887fdadd3b776dada2b1df550";
     };
 
     checkPhase = ''

From 77c790fc0e5778a99718bd50e32cd671a154cc7f Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 28 May 2015 22:03:35 +0200
Subject: [PATCH 0388/2322] Bump ibus, ibus-anthy, and ibus-qt to their latest
 versions.

---
 pkgs/tools/inputmethods/ibus-anthy/default.nix | 10 +++++-----
 pkgs/tools/inputmethods/ibus-qt/default.nix    |  8 ++++----
 pkgs/tools/inputmethods/ibus/default.nix       | 14 +++++++-------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-anthy/default.nix
index df0790877ac..1b0201c4b17 100644
--- a/pkgs/tools/inputmethods/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-anthy/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, ibus, anthy, intltool, pkgconfig, glib, gobjectIntrospection, python, pythonPackages }:
 
-let version = "1.5.4";
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "ibus-anthy-${version}";
+  version = "1.5.6";
 
   meta = with stdenv.lib; {
     description = "IBus interface to the anthy input method";
-    homepace    = https://code.google.com/p/ibus/;
+    homepage    = http://wiki.github.com/fujiwarat/ibus-anthy;
     license     = licenses.gpl2Plus;
     platforms   = platforms.linux;
     maintainers = with maintainers; [ gebner ];
@@ -23,7 +23,7 @@ in stdenv.mkDerivation {
   '';
 
   src = fetchurl {
-    url = "https://ibus.googlecode.com/files/ibus-anthy-${version}.tar.gz";
-    sha256 = "4c0a8b88a2c547e72173a7d682d82797f6c65fe712abe5f3b89495d4eec7b031";
+    url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz";
+    sha256 = "0vl904l5862zxfi8fiiljwvqv4yvb3nfdbkmpcqk3zw4r1mn6p03";
   };
 }
diff --git a/pkgs/tools/inputmethods/ibus-qt/default.nix b/pkgs/tools/inputmethods/ibus-qt/default.nix
index c538d36ec59..95c32532e40 100644
--- a/pkgs/tools/inputmethods/ibus-qt/default.nix
+++ b/pkgs/tools/inputmethods/ibus-qt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-qt-${version}";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchurl {
-    url = "http://ibus.googlecode.com/files/${name}-Source.tar.gz";
-    sha256 = "070c8ef4e6c74eddf7ddf4385936aed730c2dfe2160162e5c56b5158d1061a76";
+    url = "https://github.com/ibus/ibus-qt/releases/download/${version}/${name}-Source.tar.gz";
+    sha256 = "1q9g7qghpcf07valc2ni7yf994xqx2pmdffknj7scxfidav6p19g";
   };
 
   buildInputs = [
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ];
 
   meta = with stdenv.lib; {
-    homepage    = https://code.google.com/p/ibus/;
+    homepage    = https://github.com/ibus/ibus-qt/;
     description = "Qt4 interface to the ibus input method";
     platforms   = platforms.linux;
     license     = licenses.gpl2Plus;
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 6b426169a70..97a8c3e7d1c 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-${version}";
-  version = "1.5.5";
+  version = "1.5.10";
 
   src = fetchurl {
-    url = "http://ibus.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1v4a9xv2k26g6ggk4282ynfvh68j2r5hg1cdpvnryfa8c2pkdaq2";
+    url = "https://github.com/ibus/ibus/releases/download/${version}/${name}.tar.gz";
+    sha256 = "152mdzi9hr246spnn7bkb4gy16x30082xwq460gmm1q2cs0bf08x";
   };
 
   configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library";
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
     libnotify isocodes gobjectIntrospection
   ];
 
-  preBuild = ''
-    patchShebangs ./scripts
-    substituteInPlace data/dconf/Makefile --replace "dconf update" "echo"
+  preConfigure = ''
+    substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo"
+    sed -i "s|PYTHON2_LIBDIR=.*|PYTHON2_LIBDIR=$out/lib/${python.libPrefix}|" configure
   '';
 
   preFixup = ''
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = https://code.google.com/p/ibus/;
+    homepage = https://github.com/ibus/ibus;
     description = "Intelligent Input Bus for Linux / Unix OS";
     platforms = stdenv.lib.platforms.linux;
   };

From fb310a6998fa39162fba94ddd205177a3c59710d Mon Sep 17 00:00:00 2001
From: Sami BOUHLEL <sami.bouhlel@predictix.com>
Date: Thu, 28 May 2015 21:15:16 +0100
Subject: [PATCH 0389/2322] added support for boto 2.38.0

---
 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 b95c90efab3..542555fdebd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1298,7 +1298,7 @@ let
 
     src = pkgs.fetchurl {
       url = "https://github.com/boto/boto/archive/${version}.tar.gz";
-      sha256 = "f2659f9b9d4f183a997ad0fc87f99f8cd3998df887fdadd3b776dada2b1df550";
+      sha256 = "0l7m3lmxmnknnz9svzc7z26rklwckzwqgz6hgackl62gkndryrgj";
     };
 
     checkPhase = ''

From aa3dee3a2dc27b2ebc6e7a0ae4340f63d27ed102 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 28 May 2015 16:23:46 -0700
Subject: [PATCH 0390/2322] lightdm: Update to stable 1.14.2

---
 pkgs/applications/display-managers/lightdm/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 4b04a6e7909..94337989055 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -4,15 +4,15 @@
 }:
 
 let
-  ver_branch = "1.15";
-  version = "1.15.0";
+  ver_branch = "1.14";
+  version = "1.14.2";
 in
 stdenv.mkDerivation rec {
   name = "lightdm-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
-    sha256 = "0f0c2irb7qq49dabxhh99bwyvkxpfpscy4vynm7y800sz15lm2hs";
+    sha256 = "18dvipdkp6hc1hysyiwpd5nwq6db3mg98rwi3am2ly3hk2bpic18";
   };
 
   patches = [ ./fix-paths.patch ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = http://launchpad.net/lightdm;
+    homepage = https://launchpad.net/lightdm;
     platforms = platforms.linux;
     license = licenses.gpl3;
     maintainers = with maintainers; [ ocharles wkennington ];

From 0761f81da71fc6a940c7f51129b6c7717db78e87 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 29 May 2015 01:52:02 +0200
Subject: [PATCH 0391/2322] debian-devscripts -> 2.15.4

Temporarily drop bash completions until fixed.
---
 pkgs/tools/misc/debian-devscripts/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index a6e383df91a..f8925d26bea 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -3,11 +3,11 @@
 , perlPackages
 }:
 stdenv.mkDerivation rec {
-  version = "2.15.3";
+  version = "2.15.4";
   name = "debian-devscripts-${version}";
   src = fetchurl {
     url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
-    sha256 = "f589e2e02c5e9a46a77b2516155631ac3ddfd8a39bcfc16c920862583850bc7d";
+    sha256 = "03ldbx07ga9df7z9yiq6grb6cms1dr8hlbis2hvbmfcs6gcr3q72";
   };
   buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile 
     FileDesktopEntry libxslt python3 setuptools makeWrapper
@@ -21,6 +21,9 @@ stdenv.mkDerivation rec {
     export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy"
     sed -re "s@/usr( |$|/)@$out\\1@" -i Makefile* */Makefile*
     sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile*
+
+    # Completion currently spams every shell startup with an error. Disable for now:
+    sed "/\/bash_completion\.d/d" -i scripts/Makefile
   '';
   postInstall = ''
     sed -re 's@(^|[ !`"])/bin/bash@\1${stdenv.shell}@g' -i "$out/bin"/*

From e001340cf659eb7f3c97d172710c21b3df35003c Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Thu, 28 May 2015 21:46:09 -0500
Subject: [PATCH 0392/2322] returned to two-file structure for liblapack

---
 .../science/math/liblapack/3.5.0.nix          | 66 +++++++++++++++++++
 .../science/math/liblapack/default.nix        | 18 +----
 pkgs/top-level/all-packages.nix               |  6 +-
 3 files changed, 73 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/libraries/science/math/liblapack/3.5.0.nix

diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
new file mode 100644
index 00000000000..510b18a5548
--- /dev/null
+++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
@@ -0,0 +1,66 @@
+{
+  stdenv,
+  fetchurl,
+  gfortran,
+  cmake,
+  python,
+  atlas ? null,
+  shared ? false
+}:
+let
+  atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }
+                     else null;
+  usedLibExtension = if shared then ".so" else ".a";
+  inherit (stdenv.lib) optional optionals concatStringsSep;
+  inherit (builtins) hasAttr attrNames;
+  version = "3.5.0";
+in
+
+stdenv.mkDerivation rec {
+  name = "liblapack-${version}";
+  src = fetchurl {
+    url = "http://www.netlib.org/lapack/lapack-${version}.tgz";
+    sha256 = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s";
+  };
+
+  propagatedBuildInputs = [ atlasMaybeShared ];
+  buildInputs = [ gfortran cmake ];
+  nativeBuildInputs = [ python ];
+
+  cmakeFlags = [
+    "-DUSE_OPTIMIZED_BLAS=ON"
+    "-DCMAKE_Fortran_FLAGS=-fPIC"
+  ]
+  ++ (optionals (atlas != null) [
+    "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
+    "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
+  ])
+  ++ (optional shared "-DBUILD_SHARED_LIBS=ON")
+  # If we're on darwin, CMake will automatically detect impure paths. This switch
+  # prevents that.
+  ++ (optional stdenv.isDarwin "-DCMAKE_OSX_SYSROOT:PATH=''")
+  ;
+
+  doCheck = ! shared;
+
+  checkPhase = "
+    sed -i 's,^#!.*,#!${python}/bin/python,' lapack_testing.py
+    ctest
+  ";
+
+  enableParallelBuilding = true;
+
+  passthru = {
+    blas = atlas;
+  };
+
+  meta = {
+    inherit version;
+    description = "Linear Algebra PACKage";
+    homepage = "http://www.netlib.org/lapack/";
+    license = "revised-BSD";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 18aceeba177..0487af4e9f4 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -5,8 +5,7 @@
   cmake,
   python,
   atlas ? null,
-  shared ? false,
-  version ? "3.4.1"
+  shared ? false
 }:
 let
   atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }
@@ -14,25 +13,14 @@ let
   usedLibExtension = if shared then ".so" else ".a";
   inherit (stdenv.lib) optional optionals concatStringsSep;
   inherit (builtins) hasAttr attrNames;
-  # Hashes of the versions of liblapack we know about.
-  versions2sha = {
-    "3.4.1" = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f";
-    "3.5.0" = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s";
-  };
+  version = "3.4.1";
 in
 
-if !(builtins.hasAttr version versions2sha)
-then throw ''
-  Unknown liblapack version ${version}.
-  Available versions: ${concatStringsSep ", " (attrNames versions2sha)}
-''
-else
-
 stdenv.mkDerivation rec {
   name = "liblapack-${version}";
   src = fetchurl {
     url = "http://www.netlib.org/lapack/lapack-${version}.tgz";
-    sha256 = versions2sha."${version}";
+    sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f";
   };
 
   propagatedBuildInputs = [ atlasMaybeShared ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb3b696e23a..1da4a9803e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13835,11 +13835,13 @@ let
 
   jags = callPackage ../applications/science/math/jags { };
 
-  liblapack = callPackage ../development/libraries/science/math/liblapack { };
+  liblapack = callPackage ../development/libraries/science/math/liblapack { 
+    atlas = null;
+  };
 
   liblapackWithAtlas = liblapack.override { inherit atlas; };
 
-  liblapack_3_5_0 = liblapack.override { version = "3.5.0"; };
+  liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix { };
 
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 

From 3d00848ace5ae948f049aa8aa0651a3de22f7040 Mon Sep 17 00:00:00 2001
From: Allen Nelson <ithinkican@gmail.com>
Date: Thu, 28 May 2015 12:30:29 -0700
Subject: [PATCH 0393/2322] using atlasWithLapack dependency. running test
 suites for numpy and scipy.

---
 pkgs/top-level/python-packages.nix | 64 ++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b33448fa944..33a76d8f264 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7802,6 +7802,49 @@ let
     };
   };
 
+  # Special check phase for numpy and scipy, following the same set of steps:
+  # First "install" the package, then import what was installed, and call the
+  # .test() function, which will run the test suite.
+  numpyScipyCheckPhase = python: pkgName: ''
+    runHook preCheck
+
+    _python=${python}/bin/${python.executable}
+
+    # We will "install" into a temp directory, so that we can run the numpy
+    # tests (see below).
+    install_dir="$TMPDIR/test_install"
+    install_lib="$install_dir/lib/${python.libPrefix}/site-packages"
+    mkdir -p $install_dir
+    $_python setup.py install \
+      --install-lib=$install_lib \
+      --old-and-unmanageable \
+      --prefix=$install_dir > /dev/null
+
+    # Create a directory in which to run tests (you get an error if you try to
+    # import the package when you're in the current directory).
+    mkdir $TMPDIR/run_tests
+    pushd $TMPDIR/run_tests > /dev/null
+    # Temporarily add the directory we installed in to the python path
+    # (not permanently, or this pythonpath will wind up getting exported),
+    # and run the test suite.
+    PYTHONPATH="$install_lib:$PYTHONPATH" $_python -c \
+      'import ${pkgName}; ${pkgName}.test("fast", verbose=10)'
+    popd > /dev/null
+
+    runHook postCheck
+  '';
+
+  # Special prebuild step for numpy and scipy. Creates a site.cfg telling
+  # the setup script where to find depended-on math libraries.
+  numpyScipyPrebuild = ''
+    echo "Creating site.cfg file..."
+    cat << EOF > site.cfg
+    [atlas]
+    include_dirs = ${pkgs.atlasWithLapack}/include
+    library_dirs = ${pkgs.atlasWithLapack}/lib
+    EOF
+  '';
+
   numpy = buildPythonPackage ( rec {
     name = "numpy-1.9.2";
 
@@ -7817,17 +7860,14 @@ let
       sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
     '';
 
-    preBuild = ''
-      export BLAS=${pkgs.openblas} LAPACK=${pkgs.openblas}
-    '';
+    preBuild = self.numpyScipyPrebuild;
 
     setupPyBuildFlags = ["--fcompiler='gnu95'"];
 
-    # error: invalid command 'test'
-    doCheck = false;
+    buildInputs = [ pkgs.gfortran self.nose ];
+    propagatedBuildInputs = [ pkgs.atlas ];
 
-    buildInputs = with self; [ pkgs.gfortran ];
-    propagatedBuildInputs = with self; [  pkgs.openblas ];
+    checkPhase = self.numpyScipyCheckPhase python "numpy";
 
     meta = {
       description = "Scientific tools for Python";
@@ -11187,19 +11227,19 @@ let
       sha256 = "16i5iksaas3m0hgbxrxpgsyri4a9ncbwbiazlhx5d6lynz1wn4m2";
     };
 
-    buildInputs = [ pkgs.gfortran ];
-    propagatedBuildInputs = with self; [ numpy ];
+    buildInputs = [ pkgs.gfortran self.nose ];
+    propagatedBuildInputs = [ self.numpy ];
 
     # TODO: add ATLAS=${pkgs.atlas}
     preConfigure = ''
-      export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack}
       sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
     '';
 
+    preBuild = self.numpyScipyPrebuild;
+
     setupPyBuildFlags = [ "--fcompiler='gnu95'" ];
 
-    # error: invalid command 'test'
-    doCheck = false;
+    checkPhase = self.numpyScipyCheckPhase python "scipy";
 
     meta = {
       description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. ";

From d9cc38757a4b1db60c0459e0759cdb085f0512dc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 May 2015 09:52:29 +0200
Subject: [PATCH 0394/2322] openssl: add version 1.0.2a as attribute
 'openssl_1_0_2'

We'll try switching our default version after the 15.06 release has been
branched off. Resolves https://github.com/NixOS/nixpkgs/issues/7970.
---
 .../development/libraries/openssl/1.0.2.x.nix | 114 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   8 ++
 2 files changed, 122 insertions(+)
 create mode 100644 pkgs/development/libraries/openssl/1.0.2.x.nix

diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix
new file mode 100644
index 00000000000..18c533ea188
--- /dev/null
+++ b/pkgs/development/libraries/openssl/1.0.2.x.nix
@@ -0,0 +1,114 @@
+{ stdenv, fetchurl, perl
+, withCryptodev ? false, cryptodevHeaders }:
+
+let
+  name = "openssl-1.0.2a";
+
+  opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
+    (throw "openssl needs its platform name cross building" null)
+    stdenv.cross;
+
+  patchesCross = isCross: let
+    isDarwin = stdenv.isDarwin || (isCross && stdenv.cross.libc == "libSystem");
+  in
+    [ # Allow the location of the X509 certificate file (the CA
+      # bundle) to be set through the environment variable
+      # ‘OPENSSL_X509_CERT_FILE’.  This is necessary because the
+      # default location ($out/ssl/cert.pem) doesn't exist, and
+      # hardcoding something like /etc/ssl/cert.pem is impure and
+      # cannot be overriden per-process.  For security, the
+      # environment variable is ignored for setuid binaries.
+      # FIXME: drop this patch; it really isn't necessary, because
+      # OpenSSL already supports a ‘SSL_CERT_FILE’ variable.
+      ./cert-file.patch
+    ]
+
+    ++ stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86")
+         [ ./cert-file-path-max.patch # merge with `cert-file.patch' eventually
+           ./gnu.patch                # submitted upstream
+         ]
+
+    ++ stdenv.lib.optionals (stdenv.system == "x86_64-kfreebsd-gnu")
+        [ ./gnu.patch
+          ./kfreebsd-gnu.patch
+        ]
+
+    ++ stdenv.lib.optional isDarwin ./darwin-arch.patch;
+
+  extraPatches = stdenv.lib.optional stdenv.isCygwin ./1.0.1-cygwin64.patch;
+in
+
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    urls = [
+      "http://www.openssl.org/source/${name}.tar.gz"
+      "http://openssl.linux-mirror.org/source/${name}.tar.gz"
+    ];
+    sha256 = "0jijgzf72659pikms2bc5w31h78xrd1h5zp2r01an2h340y3kdhm";
+  };
+
+  patches = (patchesCross false) ++ extraPatches;
+
+  buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
+
+  nativeBuildInputs = [ perl ];
+
+  # On x86_64-darwin, "./config" misdetects the system as
+  # "darwin-i386-cc".  So specify the system type explicitly.
+  configureScript =
+    if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc"
+    else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc"
+    else "./config";
+
+  configureFlags = "shared --libdir=lib --openssldir=etc/ssl" +
+    stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS";
+
+  # CYGXXX: used to be set for cygwin with optionalString. Not needed
+  # anymore but kept to prevent rebuild.
+  preBuild = "";
+
+  makeFlags = "MANDIR=$(out)/share/man";
+
+  # Parallel building is broken in OpenSSL.
+  enableParallelBuilding = false;
+
+  postInstall =
+    ''
+      # If we're building dynamic libraries, then don't install static
+      # libraries.
+      if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib)" ]; then
+          rm $out/lib/*.a
+      fi
+    ''; # */
+
+  crossAttrs = {
+    patches = patchesCross true;
+
+    preConfigure=''
+      # It's configure does not like --build or --host
+      export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}"
+    '';
+
+    postInstall = ''
+      # Openssl installs readonly files, which otherwise we can't strip.
+      # This could at some stdenv hash change be put out of crossAttrs, too
+      chmod -R +w $out
+
+      # Remove references to perl, to avoid depending on it at runtime
+      rm $out/bin/c_rehash $out/ssl/misc/CA.pl $out/ssl/misc/tsget
+    '';
+    configureScript = "./Configure";
+  } // stdenv.lib.optionalAttrs (opensslCrossSystem == "darwin64-x86_64-cc") {
+    CC = "gcc";
+  };
+
+  meta = {
+    homepage = http://www.openssl.org/;
+    description = "A cryptographic library that implements the SSL and TLS protocols";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+    priority = 10; # resolves collision with ‘man-pages’
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2026141a7c0..115afe2c3bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7540,6 +7540,14 @@ let
     };
   };
 
+  openssl_1_0_2 = callPackage ../development/libraries/openssl/1.0.2.x.nix {
+    fetchurl = fetchurlBoot;
+    cryptodevHeaders = linuxPackages.cryptodev.override {
+      fetchurl = fetchurlBoot;
+      onlyHeaders = true;
+    };
+  };
+
   ortp = callPackage ../development/libraries/ortp { };
 
   p11_kit = callPackage ../development/libraries/p11-kit { };

From bd59bf9a74797d03174ad7301405eff75b3cda9b Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 29 May 2015 09:46:37 +0200
Subject: [PATCH 0395/2322] cygwin: bash updated to 4.3 for cygwin platform

---
 pkgs/shells/bash/bash-4.1.17-9.src.patch      |  987 ------------
 .../bash/cygwin-bash-4.3.33-1.src.patch       | 1393 +++++++++++++++++
 pkgs/shells/bash/default.nix                  |   28 +-
 pkgs/top-level/all-packages.nix               |    1 +
 4 files changed, 1407 insertions(+), 1002 deletions(-)
 delete mode 100644 pkgs/shells/bash/bash-4.1.17-9.src.patch
 create mode 100644 pkgs/shells/bash/cygwin-bash-4.3.33-1.src.patch

diff --git a/pkgs/shells/bash/bash-4.1.17-9.src.patch b/pkgs/shells/bash/bash-4.1.17-9.src.patch
deleted file mode 100644
index f236946483c..00000000000
--- a/pkgs/shells/bash/bash-4.1.17-9.src.patch
+++ /dev/null
@@ -1,987 +0,0 @@
---- Makefile.in	2009-12-30 10:05:40.000000000 -0800
-+++ Makefile.in	2014-10-08 13:50:27.419837900 -0700
-@@ -565,7 +565,7 @@ lint:
- 	${MAKE} ${MFLAGS} CFLAGS='${GCC_LINT_FLAGS}' .made
- 
- version.h:  $(SOURCES) config.h Makefile 
--	$(SHELL) $(SUPPORT_SRC)mkversion.sh -b -S ${topdir} -s $(RELSTATUS) -d $(Version) -o newversion.h \
-+	$(SHELL) $(SUPPORT_SRC)mkversion.sh -S ${topdir} -s $(RELSTATUS) -d $(Version) -o newversion.h \
- 		&& mv newversion.h version.h
- 
- bashversion$(EXEEXT):	patchlevel.h conftypes.h version.h buildversion.o $(SUPPORT_SRC)bashversion.c
---- bashline.c	2014-10-08 13:45:09.240173500 -0700
-+++ bashline.c	2014-10-08 13:50:27.419837900 -0700
-@@ -68,6 +68,12 @@
- #  include "pcomplete.h"
- #endif
- 
-+#ifdef __x86_64__
-+#define IMP(x) __imp_##x
-+#else
-+#define IMP(x) _imp__##x
-+#endif
-+
- /* These should agree with the defines for emacs_mode and vi_mode in
-    rldefs.h, even though that's not a public readline header file. */
- #ifndef EMACS_EDITING_MODE
-@@ -239,6 +245,11 @@ int no_empty_command_completion;
-    are the only possible matches, even if FIGNORE says to. */
- int force_fignore = 1;
- 
-+#if __CYGWIN__
-+/* If set, shorten "foo.exe" to "foo" when they are the same file.  */
-+int completion_strip_exe;
-+#endif /* __CYGWIN__ */
-+
- /* Perform spelling correction on directory names during word completion */
- int dircomplete_spelling = 0;
- 
-@@ -446,11 +457,12 @@ initialize_readline ()
-   kseq[0] = CTRL('J');
-   kseq[1] = '\0';
-   func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL);
--  if (func == rl_vi_editing_mode)
-+  extern rl_command_func_t *IMP(rl_vi_editing_mode);
-+  if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode))
-     rl_unbind_key_in_map (CTRL('J'), emacs_meta_keymap);
-   kseq[0] = CTRL('M');
-   func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL);
--  if (func == rl_vi_editing_mode)
-+  if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode))
-     rl_unbind_key_in_map (CTRL('M'), emacs_meta_keymap);
- #if defined (VI_MODE)
-   rl_unbind_key_in_map (CTRL('E'), vi_movement_keymap);
-@@ -469,7 +481,8 @@ initialize_readline ()
-   kseq[0] = '~';
-   kseq[1] = '\0';
-   func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL);
--  if (func == 0 || func == rl_tilde_expand)
-+  extern rl_command_func_t *IMP(rl_tilde_expand);
-+  if (func == 0 || func == rl_tilde_expand || func == IMP(rl_tilde_expand))
-     rl_bind_keyseq_in_map (kseq, bash_complete_username, emacs_meta_keymap);
- 
-   rl_bind_key_if_unbound_in_map ('~', bash_possible_username_completions, emacs_ctlx_keymap);
-@@ -492,7 +505,8 @@ initialize_readline ()
-   kseq[0] = TAB;
-   kseq[1] = '\0';
-   func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL);
--  if (func == 0 || func == rl_tab_insert)
-+  extern rl_command_func_t *IMP(rl_tab_insert);
-+  if (func == 0 || func == rl_tab_insert || func == IMP(rl_tab_insert))
-     rl_bind_key_in_map (TAB, dynamic_complete_history, emacs_meta_keymap);
- 
-   /* Tell the completer that we want a crack first. */
-@@ -1826,6 +1840,14 @@ globword:
-       /* If we have found a match, and it is an executable file or a
- 	 directory name, return it. */
-       if (match && executable_or_directory (val))
-+#elif __CYGWIN__
-+      /* executable_or_directory will do the right thing on //server,
-+	 but calling stat("//server") is an order of magnitude slower
-+	 than noting that readdir("//") only returns directories.  */
-+      if (match && (searching_path ? executable_file (val)
-+		    : ((val[0] == '/' && val[1] == '/'
-+			&& ! strchr (&val[2], '/'))
-+		       || executable_or_directory (val))))
- #else
-       /* If we have found a match, and it is an executable file, return it.
- 	 We don't return directory names when searching $PATH, since the
-@@ -1835,6 +1857,21 @@ globword:
-       if (match && (searching_path ? executable_file (val) : executable_or_directory (val)))
- #endif
- 	{
-+#if __CYGWIN__
-+          if (completion_strip_exe)
-+            {
-+              int val_len = strlen (val);
-+              char *candidate;
-+              if (val_len > 4 && !strcasecmp (&val[val_len - 4], ".exe")
-+                  && (candidate = strdup (val)))
-+                {
-+                  candidate[val_len - 4] = '\0';
-+                  if (same_file (val, candidate, NULL, NULL))
-+                    temp[strlen (temp) - 4] = '\0';
-+                  free (candidate);
-+                }
-+            }
-+#endif
- 	  free (val);
- 	  val = "";		/* So it won't be NULL. */
- 	  return (temp);
-@@ -2566,6 +2603,17 @@ test_for_directory (name)
-   int r;
- 
-   fn = bash_tilde_expand (name, 0);
-+#if __CYGWIN__
-+  /* stat("//server") can only be successful as a directory, but takes
-+     a several-second timeout to fail.  It is much faster to assume
-+     that //server is a valid name than it is to wait for the stat,
-+     even though it gives false positives on bad names.  */
-+  if (fn[0] == '/' && fn[1] == '/' && ! strchr (&fn[2], '/'))
-+    {
-+      free (fn);
-+      return 1;
-+    }
-+#endif /* __CYGWIN__ */
-   r = file_isdir (fn);
-   free (fn);
- 
---- builtins/evalfile.c	2009-10-19 14:38:21.000000000 -0700
-+++ builtins/evalfile.c	2014-10-08 13:50:27.419837900 -0700
-@@ -148,10 +148,6 @@ file_error_and_exit:
-       return ((flags & FEVAL_BUILTIN) ? EXECUTION_FAILURE : -1);
-     }      
- 
--#if defined (__CYGWIN__) && defined (O_TEXT)
--  setmode (fd, O_TEXT);
--#endif
--
-   if (S_ISREG (finfo.st_mode) && file_size <= SSIZE_MAX)
-     {
-       string = (char *)xmalloc (1 + file_size);
---- builtins/set.def	2009-01-04 11:32:23.000000000 -0800
-+++ builtins/set.def	2014-10-08 13:50:27.419837900 -0700
-@@ -56,6 +56,13 @@ extern int dont_save_function_defs;
- #if defined (READLINE)
- extern int no_line_editing;
- #endif /* READLINE */
-+#if __CYGWIN__
-+extern int igncr;
-+static int set_minus_o_option_maybe (int, const char *, int);
-+# define INTERACTIVE_ONLY ,1
-+#else /* ! __CYGWIN__ */
-+# define INTERACTIVE_ONLY
-+#endif
- 
- $BUILTIN set
- $FUNCTION set_builtin
-@@ -92,6 +99,9 @@ Options:
- #if defined (HISTORY)
-           history      enable command history
- #endif
-+#if __CYGWIN__
-+          igncr        on cygwin, ignore \r in line endings
-+#endif
-           ignoreeof    the shell will not exit upon reading EOF
-           interactive-comments
-                        allow comments to appear in interactive commands
-@@ -181,28 +191,40 @@ const struct {
-   int *variable;
-   setopt_set_func_t *set_func;
-   setopt_get_func_t *get_func;
-+#if __CYGWIN__
-+  /* Cygwin users have taken to exporting SHELLOPTS for the
-+     cygwin-specific igncr.  As a result, we need to make sure
-+     SHELLOPTS parsing does not turn on interactive options when
-+     exported from an interactive shell, but parsed in a
-+     non-interactive setting, since some interactive options violate
-+     POSIX /bin/sh rules.  */
-+  int interactive_only;
-+#endif /* __CYGWIN__ */
- } o_options[] = {
-   { "allexport",  'a', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
- #if defined (BRACE_EXPANSION)
-   { "braceexpand",'B', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
- #endif
- #if defined (READLINE)
--  { "emacs",     '\0', (int *)NULL, set_edit_mode, get_edit_mode },
-+  { "emacs",     '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY},
- #endif
-   { "errexit",	  'e', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
-   { "errtrace",	  'E', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
-   { "functrace",  'T', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
-   { "hashall",    'h', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
- #if defined (BANG_HISTORY)
--  { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
-+  { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  INTERACTIVE_ONLY},
- #endif /* BANG_HISTORY */
- #if defined (HISTORY)
--  { "history",   '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL },
-+  { "history",   '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL INTERACTIVE_ONLY},
-+#endif
-+#if __CYGWIN__
-+  { "igncr", '\0', &igncr, NULL, (setopt_get_func_t *)NULL },
- #endif
-   { "ignoreeof", '\0', &ignoreeof, set_ignoreeof, (setopt_get_func_t *)NULL },
-   { "interactive-comments", '\0', &interactive_comments, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
-   { "keyword",    'k', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
--  { "monitor",	  'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
-+  { "monitor",	  'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  INTERACTIVE_ONLY},
-   { "noclobber",  'C', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
-   { "noexec",	  'n', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
-   { "noglob",	  'f', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
-@@ -220,7 +242,7 @@ const struct {
-   { "privileged", 'p', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
-   { "verbose",	  'v', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
- #if defined (READLINE)
--  { "vi",        '\0', (int *)NULL, set_edit_mode, get_edit_mode },
-+  { "vi",        '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY},
- #endif
-   { "xtrace",	  'x', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
-   {(char *)NULL, 0 , (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
-@@ -407,6 +429,15 @@ int
- set_minus_o_option (on_or_off, option_name)
-      int on_or_off;
-      char *option_name;
-+#if __CYGWIN__
-+{
-+  /* See cygwin comments above.  */
-+  return set_minus_o_option_maybe (on_or_off, option_name, 0);
-+}
-+static int
-+set_minus_o_option_maybe (int on_or_off, const char *option_name,
-+			  int avoid_interactive)
-+#endif /* __CYGWIN__ */
- {
-   register int i;
- 
-@@ -414,6 +445,10 @@ set_minus_o_option (on_or_off, option_na
-     {
-       if (STREQ (option_name, o_options[i].name))
- 	{
-+#if __CYGWIN__
-+	  if (o_options[i].interactive_only && avoid_interactive)
-+	    return EXECUTION_SUCCESS;
-+#endif /* __CYGWIN__ */
- 	  if (o_options[i].letter == 0)
- 	    {
- 	      SET_BINARY_O_OPTION_VALUE (i, on_or_off, option_name);
-@@ -539,7 +574,11 @@ parse_shellopts (value)
-   vptr = 0;
-   while (vname = extract_colon_unit (value, &vptr))
-     {
-+#if __CYGWIN__
-+    set_minus_o_option_maybe (FLAG_ON, vname, !interactive_shell);
-+#else /* !__CYGWIN__ */
-       set_minus_o_option (FLAG_ON, vname);
-+#endif
-       free (vname);
-     }
- }
---- builtins/shopt.def	2009-12-22 13:25:32.000000000 -0800
-+++ builtins/shopt.def	2014-10-08 13:50:27.435414600 -0700
-@@ -85,6 +85,10 @@ extern int check_jobs_at_exit;
- extern int autocd;
- extern int glob_star;
- 
-+#if defined(__CYGWIN__) && defined(READLINE)
-+extern int completion_strip_exe;
-+#endif
-+
- #if defined (EXTENDED_GLOB)
- extern int extended_glob;
- #endif
-@@ -146,6 +150,9 @@ static struct {
-   { "compat31", &shopt_compat31, set_compatibility_level },
-   { "compat32", &shopt_compat32, set_compatibility_level },
-   { "compat40", &shopt_compat40, set_compatibility_level },
-+#if defined(__CYGWIN__) && defined(READLINE)
-+ { "completion_strip_exe", &completion_strip_exe, NULL },
-+#endif
- #if defined (READLINE)
-   { "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL },
- #endif
---- config-top.h	2009-12-22 12:29:39.000000000 -0800
-+++ config-top.h	2014-10-08 13:50:27.435414600 -0700
-@@ -75,10 +75,10 @@
- #define KSH_COMPATIBLE_SELECT
- 
- /* System-wide .bashrc file for interactive shells. */
--/* #define SYS_BASHRC "/etc/bash.bashrc" */
-+//set by nix #define SYS_BASHRC "/etc/bash.bashrc"
- 
- /* System-wide .bash_logout for login shells. */
--/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
-+//set by nix #define SYS_BASH_LOGOUT "/etc/bash.bash_logout"
- 
- /* Define this to make non-interactive shells begun with argv[0][0] == '-'
-    run the startup files when not in posix mode. */
-@@ -88,7 +88,7 @@
-    sshd and source the .bashrc if so (like the rshd behavior).  This checks
-    for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment,
-    which can be fooled under certain not-uncommon circumstances. */
--/* #define SSH_SOURCE_BASHRC */
-+//set by nix #define SSH_SOURCE_BASHRC
- 
- /* Define if you want the case-capitalizing operators (~[~]) and the
-    `capcase' variable attribute (declare -c). */
---- doc/Makefile.in	2009-03-10 08:44:30.000000000 -0700
-+++ doc/Makefile.in	2014-10-08 13:50:27.435414600 -0700
-@@ -170,7 +170,7 @@ bashref.html: $(BASHREF_FILES) $(HSUSER)
- 	$(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/bashref.texi
- 
- bash.info: bashref.info
--	${SHELL} ${INFOPOST} < $(srcdir)/bashref.info > $@ ; \
-+	${SHELL} ${INFOPOST} < bashref.info > $@ ; \
- 
- bash.txt: bash.1
- bash.ps: bash.1
-@@ -226,9 +226,9 @@ install: info installdirs bash.info
- 	-$(INSTALL_DATA) $(srcdir)/bash.1 $(DESTDIR)$(man1dir)/bash${man1ext}
- 	-$(INSTALL_DATA) $(srcdir)/bashbug.1 $(DESTDIR)$(man1dir)/bashbug${man1ext}
- # uncomment the next lines to install the builtins man page
--#	sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1
--#	-$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext}
--#	-$(RM) $${TMPDIR:-/var/tmp}/builtins.1
-+	sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1
-+	-$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext}
-+	-$(RM) $${TMPDIR:-/var/tmp}/builtins.1
- 	-if test -f bash.info; then d=.; else d=$(srcdir); fi; \
- 	  $(INSTALL_DATA) $$d/bash.info $(DESTDIR)$(infodir)/bash.info
- # run install-info if it is present to update the info directory
---- doc/bash.1	2009-12-30 10:01:31.000000000 -0800
-+++ doc/bash.1	2014-10-08 13:50:27.435414600 -0700
-@@ -1568,6 +1568,14 @@ subsequently reset.
- Expands to the effective user ID of the current user, initialized at
- shell startup.  This variable is readonly.
- .TP
-+.B EXECIGNORE
-+A colon-separated list of extended glob (see \fBPattern Matching\fP)
-+patterns. Files with full paths matching one of these patterns are
-+not considered executable for the purposes of completion and PATH
-+searching, but the \fB[\fP, \fB[[\fP, and \fBtest\fP builtins are not
-+affected. Use this variable to deal with systems that set the
-+executable bit on files that are not actually executable.
-+.TP
- .B FUNCNAME
- An array variable containing the names of all shell functions
- currently in the execution call stack.
-@@ -8772,6 +8780,10 @@ If set,
- attempts spelling correction on directory names during word completion
- if the directory name initially supplied does not exist.
- .TP 8
-+.B completion_strip_exe
-+If set, whenever bash sees `foo.exe' during completion, it checks if
-+`foo' is the same file and strips the suffix.
-+.TP 8
- .B dotglob
- If set, 
- .B bash
---- doc/bashref.texi	2009-12-29 12:59:18.000000000 -0800
-+++ doc/bashref.texi	2014-10-08 13:50:27.435414600 -0700
-@@ -4363,6 +4363,10 @@ If set, Bash
- changes its behavior to that of version 3.1 with respect to quoted
- arguments to the conditional command's =~ operator.
- 
-+@item completion_strip_exe
-+If set, whenever bash sees `foo.exe' during completion, it checks if
-+`foo' is the same file and strips the suffix.
-+
- @item dirspell
- If set, Bash
- attempts spelling correction on directory names during word completion 
-@@ -4892,6 +4896,14 @@ emacs shell buffer and disables line edi
- The numeric effective user id of the current user.  This variable
- is readonly.
- 
-+@item EXECIGNORE
-+A colon-separated list of extended glob ((@pxref{Pattern Matching})
-+patterns. Files with full paths matching one of these patterns are
-+not considered executable for the purposes of completion and PATH
-+searching, but the @code{[}, @code{[[}, and @code{test} builtins are
-+not affected. Use this variable to deal with systems that set the
-+executable bit on files that are not actually executable.
-+
- @item FCEDIT
- The editor used as a default by the @option{-e} option to the @code{fc}
- builtin command.
---- doc/builtins.1	2008-08-12 06:24:40.000000000 -0700
-+++ doc/builtins.1	2014-10-08 13:50:27.435414600 -0700
-@@ -12,6 +12,6 @@ shift, shopt, source, suspend, test, tim
- ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1)
- .SH BASH BUILTIN COMMANDS
- .nr zZ 1
--.so bash.1
-+.so man1/bash.1
- .SH SEE ALSO
- bash(1), sh(1)
---- execute_cmd.c	2009-12-30 09:55:37.000000000 -0800
-+++ execute_cmd.c	2014-10-08 13:50:27.435414600 -0700
-@@ -4004,7 +4004,7 @@ execute_function (var, words, flags, fds
-   char *debug_trap, *error_trap, *return_trap;
- #if defined (ARRAY_VARS)
-   SHELL_VAR *funcname_v, *nfv, *bash_source_v, *bash_lineno_v;
--  ARRAY *funcname_a, *bash_source_a, *bash_lineno_a;
-+  ARRAY *funcname_a, *volatile bash_source_a, *volatile bash_lineno_a;
- #endif
-   FUNCTION_DEF *shell_fn;
-   char *sfile, *t;
-@@ -4571,6 +4571,12 @@ execute_disk_command (words, redirects,
- 	  hookf = find_function (NOTFOUND_HOOK);
- 	  if (hookf == 0)
- 	    {
-+#if __CYGWIN__
-+              /* Point out \r use to clueless users. The memory leak
-+                 is harmless - we're about to exit. */
-+              if (ansic_shouldquote (pathname))
-+                pathname = ansic_quote (pathname, 0, NULL);
-+#endif /* __CYGWIN__ */
- 	      internal_error (_("%s: command not found"), pathname);
- 	      exit (EX_NOTFOUND);	/* Posix.2 says the exit status is 127 */
- 	    }
-@@ -4990,6 +4996,10 @@ do_piping (pipe_in, pipe_out)
- 	dup_error (pipe_in, 0);
-       if (pipe_in > 0)
- 	close (pipe_in);
-+#if __CYGWIN__
-+      /* Let stdio know that fd may have changed from text to binary.  */
-+      freopen (NULL, "r", stdin);
-+#endif /* __CYGWIN__ */
-     }
-   if (pipe_out != NO_PIPE)
-     {
-@@ -5005,5 +5015,12 @@ do_piping (pipe_in, pipe_out)
- 	  if (dup2 (1, 2) < 0)
- 	    dup_error (1, 2);
- 	}
-+#if __CYGWIN__
-+      extern int sh_setlinebuf (FILE *);
-+      /* Let stdio know that fd may have changed from text to binary.  */
-+      freopen (NULL, "w", stdout);
-+      /* Bash builtins (foolishly) rely on line-buffering. */
-+      sh_setlinebuf (stdout);
-+#endif /* __CYGWIN__ */
-     }
- }
---- findcmd.c	2009-06-05 13:25:38.000000000 -0700
-+++ findcmd.c	2014-10-08 13:50:27.451015900 -0700
-@@ -43,6 +43,8 @@
- #include "hashcmd.h"
- #include "findcmd.h"	/* matching prototypes and declarations */
- 
-+#include <glob/strmatch.h>
-+
- extern int posixly_correct;
- 
- /* Static functions defined and used in this file. */
-@@ -71,6 +73,38 @@ int check_hashed_filenames;
-    containing the file of interest. */
- int dot_found_in_search = 0;
- 
-+static struct ignorevar execignore =
-+{
-+  "EXECIGNORE",
-+  (struct ign *)0,
-+  0,
-+  (char *)0,
-+  (sh_iv_item_func_t *)0,
-+};
-+
-+void
-+setup_exec_ignore (char *varname)
-+{
-+  setup_ignore_patterns (&execignore);
-+}
-+
-+/* Return whether we should never consider file executable
-+ * even if the system tells us it is. */
-+static int
-+is_on_exec_blacklist (char *name)
-+{
-+  struct ign *p;
-+  int flags = FNM_EXTMATCH | FNM_CASEFOLD;
-+
-+  for (p = execignore.ignores; p && p->val; p++)
-+    {
-+      if (strmatch (p->val, (char *)name, flags) != FNM_NOMATCH)
-+      return (1);
-+    }
-+
-+  return (0);
-+}
-+
- /* Return some flags based on information about this file.
-    The EXISTS bit is non-zero if the file is found.
-    The EXECABLE bit is non-zero the file is executble.
-@@ -98,7 +132,7 @@ file_status (name)
-      file access mechanisms into account.  eaccess uses the effective
-      user and group IDs, not the real ones.  We could use sh_eaccess,
-      but we don't want any special treatment for /dev/fd. */
--  if (eaccess (name, X_OK) == 0)
-+  if (!is_on_exec_blacklist (name) && eaccess (name, X_OK) == 0)
-     r |= FS_EXECABLE;
-   if (eaccess (name, R_OK) == 0)
-     r |= FS_READABLE;
---- findcmd.h	2009-01-04 11:32:29.000000000 -0800
-+++ findcmd.h	2014-10-08 13:50:27.451015900 -0700
-@@ -31,5 +31,6 @@ extern char *find_user_command __P((cons
- extern char *find_path_file __P((const char *));
- extern char *search_for_command __P((const char *));
- extern char *user_command_matches __P((const char *, int, int));
-+extern void setup_exec_ignore __P((char *));
- 
- #endif /* _FINDCMD_H_ */
---- general.c	2009-11-28 18:44:46.000000000 -0800
-+++ general.c	2014-10-08 13:50:27.451015900 -0700
-@@ -43,6 +43,10 @@
- 
- #include <tilde/tilde.h>
- 
-+#ifdef __CYGWIN__
-+#include <sys/cygwin.h>
-+#endif
-+
- #if !defined (errno)
- extern int errno;
- #endif /* !errno */
-@@ -601,7 +605,8 @@ make_absolute (string, dot_path)
-     {
-       char pathbuf[PATH_MAX + 1];
- 
--      cygwin_conv_to_full_posix_path (string, pathbuf);
-+      cygwin_conv_path (CCP_WIN_A_TO_POSIX | CCP_ABSOLUTE, string, pathbuf,
-+			PATH_MAX + 1);
-       result = savestring (pathbuf);
-     }
- #else
---- input.c	2009-01-04 11:32:29.000000000 -0800
-+++ input.c	2014-10-08 13:50:27.451015900 -0700
-@@ -43,6 +43,10 @@
- #include "externs.h"
- #include "quit.h"
- 
-+#if __CYGWIN__
-+int igncr;
-+#endif /* __CYGWIN__ */
-+
- #if !defined (errno)
- extern int errno;
- #endif /* !errno */
-@@ -193,6 +197,10 @@ make_buffered_stream (fd, buffer, bufsiz
-   bp->b_used = bp->b_inputp = bp->b_flag = 0;
-   if (bufsize == 1)
-     bp->b_flag |= B_UNBUFF;
-+#if __CYGWIN__
-+  if ((fcntl (fd, F_GETFL) & O_TEXT) != 0)
-+    bp->b_flag |= B_TEXT;
-+#endif /* __CYGWIN__ */
-   return (bp);
- }
- 
-@@ -361,11 +369,7 @@ duplicate_buffered_stream (fd1, fd2)
- }
- 
- /* Return 1 if a seek on FD will succeed. */
--#ifndef __CYGWIN__
- #  define fd_is_seekable(fd) (lseek ((fd), 0L, SEEK_CUR) >= 0)
--#else
--#  define fd_is_seekable(fd) 0
--#endif /* __CYGWIN__ */
- 
- /* Take FD, a file descriptor, and create and return a buffered stream
-    corresponding to it.  If something is wrong and the file descriptor
-@@ -474,6 +478,25 @@ b_fill_buffer (bp)
-   ssize_t nr;
- 
-   CHECK_TERMSIG;
-+#ifdef __CYGWIN__
-+  /* lseek'ing on text files is problematic; lseek reports the true
-+     file offset, but read collapses \r\n and returns a character
-+     count.  We cannot reliably seek backwards if nr is smaller than
-+     the seek offset encountered during the read, and must instead
-+     treat the stream as unbuffered.  */
-+  if ((bp->b_flag & (B_TEXT | B_UNBUFF)) == B_TEXT)
-+    {
-+      off_t offset = lseek (bp->b_fd, 0, SEEK_CUR);
-+      nr = zread (bp->b_fd, bp->b_buffer, bp->b_size);
-+      if (nr > 0 && nr < lseek (bp->b_fd, 0, SEEK_CUR) - offset)
-+	{
-+	  lseek (bp->b_fd, offset, SEEK_SET);
-+	  bp->b_flag |= B_UNBUFF;
-+	  nr = zread (bp->b_fd, bp->b_buffer, bp->b_size = 1);
-+	}
-+    }
-+  else
-+#endif /* __CYGWIN__ */
-   nr = zread (bp->b_fd, bp->b_buffer, bp->b_size);
-   if (nr <= 0)
-     {
-@@ -486,15 +509,6 @@ b_fill_buffer (bp)
-       return (EOF);
-     }
- 
--#if defined (__CYGWIN__)
--  /* If on cygwin, translate \r\n to \n. */
--  if (nr >= 2 && bp->b_buffer[nr - 2] == '\r' && bp->b_buffer[nr - 1] == '\n')
--    {
--      bp->b_buffer[nr - 2] = '\n';
--      nr--;
--    }
--#endif
--
-   bp->b_used = nr;
-   bp->b_inputp = 0;
-   return (bp->b_buffer[bp->b_inputp++] & 0xFF);
-@@ -543,6 +557,19 @@ buffered_getchar ()
- {
-   CHECK_TERMSIG;
- 
-+#if __CYGWIN__
-+  /* shopt igncr means to discard carriage returns from input stream.
-+     If cr is the only character in the buffer, then recurse to pick
-+     up the next character; otherwise flatten the buffer.  */
-+  if (igncr)
-+    {
-+      int ch;
-+      while ((ch = bufstream_getc (buffers[bash_input.location.buffered_fd]))
-+	     == '\r')
-+	;
-+      return ch;
-+    }
-+#endif /* __CYGWIN__ */
- #if !defined (DJGPP)
-   return (bufstream_getc (buffers[bash_input.location.buffered_fd]));
- #else
---- input.h	2009-01-04 11:32:29.000000000 -0800
-+++ input.h	2014-10-08 13:50:27.451015900 -0700
-@@ -48,6 +48,7 @@ enum stream_type {st_none, st_stdin, st_
- #define B_ERROR		0x02
- #define B_UNBUFF	0x04
- #define B_WASBASHINPUT	0x08
-+#define B_TEXT          0x10 /* Text stream, when O_BINARY is nonzero */
- 
- /* A buffered stream.  Like a FILE *, but with our own buffering and
-    synchronization.  Look in input.c for the implementation. */
---- lib/sh/pathcanon.c	2008-08-12 11:01:37.000000000 -0700
-+++ lib/sh/pathcanon.c	2014-10-08 13:50:27.451015900 -0700
-@@ -194,6 +194,8 @@ sh_canonpath (path, flags)
- 	    *q++ = DIRSEP;
- 	  while (*p && (ISDIRSEP(*p) == 0))
- 	    *q++ = *p++;
-+	}
-+    }
- 	  /* Check here for a valid directory with _path_isdir. */
- 	  if (flags & PATH_CHECKEXISTS)
- 	    {
-@@ -211,8 +213,7 @@ sh_canonpath (path, flags)
- 		}
- 	      *q = c;
- 	    }
--	}
--    }
-+
- 
-   /* Empty string is really ``.'' or `/', depending on what we started with. */
-   if (q == result)
---- lib/sh/pathphys.c	2008-08-12 11:01:23.000000000 -0700
-+++ lib/sh/pathphys.c	2014-10-08 13:50:27.451015900 -0700
-@@ -35,6 +35,7 @@
- #include <stdio.h>
- #include <chartypes.h>
- #include <errno.h>
-+#include <stdlib.h>
- 
- #include "shell.h"
- 
-@@ -76,6 +77,10 @@ sh_physpath (path, flags)
-      char *path;
-      int flags;
- {
-+#if __CYGWIN__
-+  /* realpath does this right without all the hassle */
-+  return realpath (path, NULL);
-+#else
-   char tbuf[PATH_MAX+1], linkbuf[PATH_MAX+1];
-   char *result, *p, *q, *qsave, *qbase, *workpath;
-   int double_slash_path, linklen, nlink;
-@@ -249,6 +254,7 @@ error:
-     }
- 
-   return (result);
-+#endif /* !__CYGWIN__ */
- }
- 
- char *
---- lib/sh/tmpfile.c	2008-08-12 10:50:12.000000000 -0700
-+++ lib/sh/tmpfile.c	2014-10-08 13:50:27.451015900 -0700
-@@ -40,7 +40,7 @@
- extern int errno;
- #endif
- 
--#define BASEOPENFLAGS	(O_CREAT | O_TRUNC | O_EXCL)
-+#define BASEOPENFLAGS	(O_CREAT | O_TRUNC | O_EXCL | O_BINARY)
- 
- #define DEFAULT_TMPDIR		"."	/* bogus default, should be changed */
- #define DEFAULT_NAMEROOT	"shtmp"
-@@ -94,7 +94,7 @@ get_tmpdir (flags)
-   if (tdir && (file_iswdir (tdir) == 0 || strlen (tdir) > PATH_MAX))
-     tdir = 0;
- 
--  if (tdir == 0)
-+  if (tdir == 0 || !file_iswdir (tdir))
-     tdir = get_sys_tmpdir ();
- 
- #if defined (HAVE_PATHCONF) && defined (_PC_NAME_MAX)
-@@ -116,14 +116,15 @@ sh_mktmpname (nameroot, flags)
-   struct stat sb;
-   int r, tdlen;
- 
--  filename = (char *)xmalloc (PATH_MAX + 1);
-+  filename = NULL;
-   tdir = get_tmpdir (flags);
-   tdlen = strlen (tdir);
- 
-   lroot = nameroot ? nameroot : DEFAULT_NAMEROOT;
- 
- #ifdef USE_MKTEMP
--  sprintf (filename, "%s/%s.XXXXXX", tdir, lroot);
-+  if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0)
-+    return NULL;
-   if (mktemp (filename) == 0)
-     {
-       free (filename);
-@@ -136,7 +137,9 @@ sh_mktmpname (nameroot, flags)
- 		(unsigned long) time ((time_t *)0) ^
- 		(unsigned long) dollar_dollar_pid ^
- 		(unsigned long) ((flags & MT_USERANDOM) ? get_random_number () : ntmpfiles++);
--      sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum);
-+      free (filename);
-+      if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0)
-+        return NULL;
-       if (tmpnamelen > 0 && tmpnamelen < 32)
- 	filename[tdlen + 1 + tmpnamelen] = '\0';
- #  ifdef HAVE_LSTAT
-@@ -161,14 +164,19 @@ sh_mktmpfd (nameroot, flags, namep)
-   char *filename, *tdir, *lroot;
-   int fd, tdlen;
- 
--  filename = (char *)xmalloc (PATH_MAX + 1);
-+  filename = NULL;
-   tdir = get_tmpdir (flags);
-   tdlen = strlen (tdir);
- 
-   lroot = nameroot ? nameroot : DEFAULT_NAMEROOT;
- 
- #ifdef USE_MKSTEMP
--  sprintf (filename, "%s/%s.XXXXXX", tdir, lroot);
-+  if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0)
-+    {
-+      if (namep)
-+        *namep = NULL;
-+      return -1;
-+    }
-   fd = mkstemp (filename);
-   if (fd < 0 || namep == 0)
-     {
-@@ -185,7 +193,13 @@ sh_mktmpfd (nameroot, flags, namep)
- 		(unsigned long) time ((time_t *)0) ^
- 		(unsigned long) dollar_dollar_pid ^
- 		(unsigned long) ((flags & MT_USERANDOM) ? get_random_number () : ntmpfiles++);
--      sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum);
-+      free (filename);
-+      if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0)
-+        {
-+          if (namep)
-+            *namep = NULL;
-+          return -1;
-+        }
-       if (tmpnamelen > 0 && tmpnamelen < 32)
- 	filename[tdlen + 1 + tmpnamelen] = '\0';
-       fd = open (filename, BASEOPENFLAGS | ((flags & MT_READWRITE) ? O_RDWR : O_WRONLY), 0600);
---- parse.y	2014-10-08 13:45:10.394563700 -0700
-+++ parse.y	2014-10-08 13:50:27.451015900 -0700
-@@ -1520,14 +1520,20 @@ yy_string_get ()
-   string = bash_input.location.string;
- 
-   /* If the string doesn't exist, or is empty, EOF found. */
--  if (string && *string)
-+  while (string && *string)
-     {
-       c = *string++;
-       bash_input.location.string = string;
-+#if __CYGWIN__
-+      {
-+        extern int igncr;
-+        if (igncr && c == '\r')
-+          continue;
-+      }
-+#endif /* __CYGWIN__ */
-       return (c);
-     }
--  else
--    return (EOF);
-+  return (EOF);
- }
- 
- static int
-@@ -5487,6 +5493,15 @@ report_syntax_error (message)
-      parser's complaining about by looking at current_token. */
-   if (current_token != 0 && EOF_Reached == 0 && (msg = error_token_from_token (current_token)))
-     {
-+#if __CYGWIN__
-+      /* Try to help clueless users. */
-+      char *p = msg;
-+      if (ansic_shouldquote (msg))
-+        {
-+          msg = ansic_quote (msg, 0, NULL);
-+          free (p);
-+        }
-+#endif /* __CYGWIN__ */
-       parser_error (line_number, _("syntax error near unexpected token `%s'"), msg);
-       free (msg);
- 
---- pathexp.h	2009-01-04 11:32:40.000000000 -0800
-+++ pathexp.h	2014-10-08 13:50:27.451015900 -0700
-@@ -86,7 +86,7 @@ struct ign {
- typedef int sh_iv_item_func_t __P((struct ign *));
- 
- struct ignorevar {
--  char *varname;	/* FIGNORE or GLOBIGNORE */
-+  char *varname;	/* FIGNORE or GLOBIGNORE or EXECIGNORE */
-   struct ign *ignores;	/* Store the ignore strings here */
-   int num_ignores;	/* How many are there? */
-   char *last_ignoreval;	/* Last value of variable - cached for speed */
---- redir.c	2009-09-17 07:04:18.000000000 -0700
-+++ redir.c	2014-10-08 13:50:27.451015900 -0700
-@@ -437,7 +437,7 @@ here_document_to_fd (redirectee, ri)
-   /* In an attempt to avoid races, we close the first fd only after opening
-      the second. */
-   /* Make the document really temporary.  Also make it the input. */
--  fd2 = open (filename, O_RDONLY, 0600);
-+  fd2 = open (filename, O_RDONLY | O_BINARY, 0600);
- 
-   if (fd2 < 0)
-     {
-@@ -453,14 +453,6 @@ here_document_to_fd (redirectee, ri)
-   if (unlink (filename) < 0)
-     {
-       r = errno;
--#if defined (__CYGWIN__)
--      /* Under CygWin 1.1.0, the unlink will fail if the file is
--	 open. This hack will allow the previous action of silently
--	 ignoring the error, but will still leave the file there. This
--	 needs some kind of magic. */
--      if (r == EACCES)
--	return (fd2);
--#endif /* __CYGWIN__ */
-       close (fd2);
-       free (filename);
-       errno = r;
---- shell.c	2009-11-19 07:05:54.000000000 -0800
-+++ shell.c	2014-10-08 13:50:27.466607600 -0700
-@@ -329,7 +329,10 @@ _cygwin32_check_tmp ()
-   struct stat sb;
- 
-   if (stat ("/tmp", &sb) < 0)
--    internal_warning (_("could not find /tmp, please create!"));
-+    {
-+      if (mkdir ("/tmp", S_IRWXU | S_IRWXG | S_IRWXO | S_ISVTX) != 0)
-+        internal_warning (_("could not find /tmp, please create!"));
-+    }
-   else
-     {
-       if (S_ISDIR (sb.st_mode) == 0)
-@@ -1471,10 +1474,6 @@ open_shell_script (script_name)
-      not match with ours. */
-   fd = move_to_high_fd (fd, 1, -1);
- 
--#if defined (__CYGWIN__) && defined (O_TEXT)
--  setmode (fd, O_TEXT);
--#endif
--
- #if defined (BUFFERED_INPUT)
-   default_buffered_input = fd;
-   SET_CLOSE_ON_EXEC (default_buffered_input);
---- subst.c	2009-12-30 05:24:28.000000000 -0800
-+++ subst.c	2014-10-08 13:50:27.466607600 -0700
-@@ -4921,10 +4921,6 @@ read_comsub (fd, quoted, rflag)
-   for (skip_ctlesc = skip_ctlnul = 0, s = ifs_value; s && *s; s++)
-     skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL;
- 
--#ifdef __CYGWIN__
--  setmode (fd, O_TEXT);		/* we don't want CR/LF, we want Unix-style */
--#endif
--
-   /* Read the output of the command through the pipe.  This may need to be
-      changed to understand multibyte characters in the future. */
-   while (1)
-@@ -4947,6 +4943,13 @@ read_comsub (fd, quoted, rflag)
- #endif
- 	  continue;
- 	}
-+#if __CYGWIN__
-+      {
-+	extern int igncr;
-+	if (igncr && c == '\r')
-+	  continue;
-+      }
-+#endif /* __CYGWIN__ */
- 
-       /* Add the character to ISTRING, possibly after resizing it. */
-       RESIZE_MALLOCED_BUFFER (istring, istring_index, 2, istring_size, DEFAULT_ARRAY_SIZE);
-@@ -5063,6 +5066,27 @@ command_substitute (string, quoted)
-       sys_error (_("cannot make pipe for command substitution"));
-       goto error_exit;
-     }
-+#if __CYGWIN__
-+  /* Passing a pipe through std fds can cause hangs when talking to a
-+     non-cygwin child.  Move it.  */
-+  if (fildes[0] < 3)
-+    {
-+      int fd = fcntl (fildes[0], F_DUPFD, 3);
-+      close (fildes[0]);
-+      fildes[0] = fd;
-+    }
-+  if (fildes[1] < 3)
-+    {
-+      int fd = fcntl (fildes[1], F_DUPFD, 3);
-+      close (fildes[1]);
-+      fildes[1] = fd;
-+    }
-+  if (fildes[0] < 0 || fildes[1] < 0)
-+    {
-+      sys_error (_("cannot make pipe for command substitution"));
-+      goto error_exit;
-+    }
-+#endif /* __CYGWIN__ */
- 
-   old_pid = last_made_pid;
- #if defined (JOB_CONTROL)
-@@ -5130,6 +5154,12 @@ command_substitute (string, quoted)
- 	  (fildes[0] != fileno (stdout)) &&
- 	  (fildes[0] != fileno (stderr)))
- 	close (fildes[0]);
-+#if __CYGWIN__
-+      /* Inform stdio if any text/binary changes happened. */
-+      freopen (NULL, "w", stdout);
-+      /* Bash builtins (foolishly) rely on line-buffering. */
-+      sh_setlinebuf (stdout);
-+#endif /* __CYGWIN__ */
- 
-       /* The currently executing shell is not interactive. */
-       interactive = 0;
---- variables.c	2014-10-08 13:45:10.285364600 -0700
-+++ variables.c	2014-10-08 13:50:27.466607600 -0700
-@@ -4143,6 +4143,8 @@ static struct name_and_function special_
-   { "COMP_WORDBREAKS", sv_comp_wordbreaks },
- #endif
- 
-+  { "EXECIGNORE", sv_execignore },
-+
-   { "GLOBIGNORE", sv_globignore },
- 
- #if defined (HISTORY)
-@@ -4323,6 +4325,13 @@ sv_globignore (name)
-     setup_glob_ignore (name);
- }
- 
-+/* What to do when EXECIGNORE changes. */
-+void
-+sv_execignore (char *name)
-+{
-+  setup_exec_ignore (name);
-+}
-+
- #if defined (READLINE)
- void
- sv_comp_wordbreaks (name)
---- variables.h	2009-08-16 13:10:15.000000000 -0700
-+++ variables.h	2014-10-08 13:50:27.466607600 -0700
-@@ -351,6 +351,7 @@ extern void sv_ifs __P((char *));
- extern void sv_path __P((char *));
- extern void sv_mail __P((char *));
- extern void sv_globignore __P((char *));
-+extern void sv_execignore __P((char *));
- extern void sv_ignoreeof __P((char *));
- extern void sv_strict_posix __P((char *));
- extern void sv_optind __P((char *));
diff --git a/pkgs/shells/bash/cygwin-bash-4.3.33-1.src.patch b/pkgs/shells/bash/cygwin-bash-4.3.33-1.src.patch
new file mode 100644
index 00000000000..e0959d0446a
--- /dev/null
+++ b/pkgs/shells/bash/cygwin-bash-4.3.33-1.src.patch
@@ -0,0 +1,1393 @@
+--- bashline.c	2015-02-06 17:12:55.823275600 -0700
++++ bashline.c	2015-02-06 17:14:11.000103800 -0700
+@@ -71,6 +71,16 @@
+ #  include "pcomplete.h"
+ #endif
+ 
++#if __CYGWIN__
++#  ifdef __x86_64__
++#    define IMP(x) __imp_##x
++#  else
++#    define IMP(x) _imp__##x
++#  endif
++#else
++#  define IMP(x) x
++#endif
++
+ /* These should agree with the defines for emacs_mode and vi_mode in
+    rldefs.h, even though that's not a public readline header file. */
+ #ifndef EMACS_EDITING_MODE
+@@ -264,6 +274,11 @@ int no_empty_command_completion;
+    are the only possible matches, even if FIGNORE says to. */
+ int force_fignore = 1;
+ 
++#if __CYGWIN__
++/* If set, shorten "foo.exe" to "foo" when they are the same file.  */
++int completion_strip_exe;
++#endif /* __CYGWIN__ */
++
+ /* Perform spelling correction on directory names during word completion */
+ int dircomplete_spelling = 0;
+ 
+@@ -491,11 +506,12 @@ initialize_readline ()
+   kseq[0] = CTRL('J');
+   kseq[1] = '\0';
+   func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL);
+-  if (func == rl_vi_editing_mode)
++  extern rl_command_func_t *IMP(rl_vi_editing_mode);
++  if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode))
+     rl_unbind_key_in_map (CTRL('J'), emacs_meta_keymap);
+   kseq[0] = CTRL('M');
+   func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL);
+-  if (func == rl_vi_editing_mode)
++  if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode))
+     rl_unbind_key_in_map (CTRL('M'), emacs_meta_keymap);
+ #if defined (VI_MODE)
+   rl_unbind_key_in_map (CTRL('E'), vi_movement_keymap);
+@@ -514,7 +530,8 @@ initialize_readline ()
+   kseq[0] = '~';
+   kseq[1] = '\0';
+   func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL);
+-  if (func == 0 || func == rl_tilde_expand)
++  extern rl_command_func_t *IMP(rl_tilde_expand);
++  if (func == 0 || func == rl_tilde_expand || func == IMP(rl_tilde_expand))
+     rl_bind_keyseq_in_map (kseq, bash_complete_username, emacs_meta_keymap);
+ 
+   rl_bind_key_if_unbound_in_map ('~', bash_possible_username_completions, emacs_ctlx_keymap);
+@@ -537,7 +554,8 @@ initialize_readline ()
+   kseq[0] = TAB;
+   kseq[1] = '\0';
+   func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL);
+-  if (func == 0 || func == rl_tab_insert)
++  extern rl_command_func_t *IMP(rl_tab_insert);
++  if (func == 0 || func == rl_tab_insert || func == IMP(rl_tab_insert))
+     rl_bind_key_in_map (TAB, dynamic_complete_history, emacs_meta_keymap);
+ 
+   /* Tell the completer that we want a crack first. */
+@@ -2109,6 +2127,21 @@ globword:
+ 
+       if (match && executable_completion ((searching_path ? val : cval), searching_path))
+ 	{
++#if __CYGWIN__
++          if (completion_strip_exe)
++            {
++              size_t val_len = strlen (val);
++              char *candidate;
++              if (val_len > 4 && !strcasecmp (&val[val_len - 4], ".exe")
++                  && (candidate = strdup (val)))
++                {
++                  candidate[val_len - 4] = '\0';
++                  if (same_file (val, candidate, NULL, NULL))
++                    temp[strlen (temp) - 4] = '\0';
++                  free (candidate);
++                }
++            }
++#endif
+ 	  if (cval != val)
+ 	    free (cval);
+ 	  free (val);
+@@ -2844,6 +2877,17 @@ test_for_directory (name)
+   int r;
+ 
+   fn = bash_tilde_expand (name, 0);
++#if __CYGWIN__
++  /* stat("//server") can only be successful as a directory, but takes
++     a several-second timeout to fail.  It is much faster to assume
++     that //server is a valid name than it is to wait for the stat,
++     even though it gives false positives on bad names.  */
++  if (fn[0] == '/' && fn[1] == '/' && ! strchr (&fn[2], '/'))
++    {
++      free (fn);
++      return 1;
++    }
++#endif /* __CYGWIN__ */
+   r = file_isdir (fn);
+   free (fn);
+ 
+--- builtins/evalstring.c	2015-02-06 17:12:55.682776800 -0700
++++ builtins/evalstring.c	2015-02-06 17:14:11.015662800 -0700
+@@ -195,7 +195,7 @@ parse_and_execute (string, from_file, fl
+   int code, lreset;
+   volatile int should_jump_to_top_level, last_result;
+   COMMAND *volatile command;
+-  volatile sigset_t pe_sigmask;
++  sigset_t pe_sigmask;
+ 
+   parse_prologue (string, flags, PE_TAG);
+ 
+@@ -451,7 +451,7 @@ parse_string (string, from_file, flags,
+   volatile int should_jump_to_top_level;
+   COMMAND *volatile command, *oglobal;
+   char *ostring;
+-  volatile sigset_t ps_sigmask;
++  sigset_t ps_sigmask;
+ 
+   parse_prologue (string, flags, PS_TAG);
+ 
+--- builtins/set.def	2013-04-19 05:20:34.000000000 -0600
++++ builtins/set.def	2015-02-06 17:14:11.015662800 -0700
+@@ -56,6 +56,13 @@ extern int dont_save_function_defs;
+ #if defined (READLINE)
+ extern int no_line_editing;
+ #endif /* READLINE */
++#if __CYGWIN__
++extern int igncr;
++static int set_minus_o_option_maybe (int, const char *, int);
++#  define INTERACTIVE_ONLY ,1
++#else /* ! __CYGWIN__ */
++#  define INTERACTIVE_ONLY
++#endif
+ 
+ $BUILTIN set
+ $FUNCTION set_builtin
+@@ -92,6 +99,9 @@ Options:
+ #if defined (HISTORY)
+           history      enable command history
+ #endif
++#if __CYGWIN__
++          igncr        on cygwin, ignore \r in line endings
++#endif
+           ignoreeof    the shell will not exit upon reading EOF
+           interactive-comments
+                        allow comments to appear in interactive commands
+@@ -188,29 +198,41 @@ const struct {
+   int *variable;
+   setopt_set_func_t *set_func;
+   setopt_get_func_t *get_func;
++#if __CYGWIN__
++  /* Cygwin users have taken to exporting SHELLOPTS for the
++     cygwin-specific igncr.  As a result, we need to make sure
++     SHELLOPTS parsing does not turn on interactive options when
++     exported from an interactive shell, but parsed in a
++     non-interactive setting, since some interactive options violate
++     POSIX /bin/sh rules.  */
++  int interactive_only;
++#endif /* __CYGWIN__ */
+ } o_options[] = {
+   { "allexport",  'a', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+ #if defined (BRACE_EXPANSION)
+   { "braceexpand",'B', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+ #endif
+ #if defined (READLINE)
+-  { "emacs",     '\0', (int *)NULL, set_edit_mode, get_edit_mode },
++  { "emacs",     '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY},
+ #endif
+   { "errexit",	  'e', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+   { "errtrace",	  'E', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+   { "functrace",  'T', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+   { "hashall",    'h', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+ #if defined (BANG_HISTORY)
+-  { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
++  { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY},
+ #endif /* BANG_HISTORY */
+ #if defined (HISTORY)
+-  { "history",   '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL },
++  { "history",   '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL INTERACTIVE_ONLY},
++#endif
++#if __CYGWIN__
++  { "igncr", '\0', &igncr, NULL, (setopt_get_func_t *)NULL },
+ #endif
+   { "ignoreeof", '\0', &ignoreeof, set_ignoreeof, (setopt_get_func_t *)NULL },
+   { "interactive-comments", '\0', &interactive_comments, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+   { "keyword",    'k', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+ #if defined (JOB_CONTROL)
+-  { "monitor",	  'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
++  { "monitor",	  'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY},
+ #endif
+   { "noclobber",  'C', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+   { "noexec",	  'n', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+@@ -229,7 +251,7 @@ const struct {
+   { "privileged", 'p', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+   { "verbose",	  'v', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+ #if defined (READLINE)
+-  { "vi",        '\0', (int *)NULL, set_edit_mode, get_edit_mode },
++  { "vi",        '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY},
+ #endif
+   { "xtrace",	  'x', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL  },
+   {(char *)NULL, 0 , (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL },
+@@ -416,6 +438,15 @@ int
+ set_minus_o_option (on_or_off, option_name)
+      int on_or_off;
+      char *option_name;
++#if __CYGWIN__
++{
++  /* See cygwin comments above.  */
++  return set_minus_o_option_maybe (on_or_off, option_name, 0);
++}
++static int
++set_minus_o_option_maybe (int on_or_off, const char *option_name,
++			  int avoid_interactive)
++#endif /* __CYGWIN__ */
+ {
+   register int i;
+ 
+@@ -423,6 +454,10 @@ set_minus_o_option (on_or_off, option_na
+     {
+       if (STREQ (option_name, o_options[i].name))
+ 	{
++#if __CYGWIN__
++	  if (o_options[i].interactive_only && avoid_interactive)
++	    return EXECUTION_SUCCESS;
++#endif /* __CYGWIN__ */
+ 	  if (o_options[i].letter == 0)
+ 	    {
+ 	      SET_BINARY_O_OPTION_VALUE (i, on_or_off, option_name);
+@@ -548,7 +583,11 @@ parse_shellopts (value)
+   vptr = 0;
+   while (vname = extract_colon_unit (value, &vptr))
+     {
++#if __CYGWIN__
++      set_minus_o_option_maybe (FLAG_ON, vname, !interactive_shell);
++#else /* !__CYGWIN__ */
+       set_minus_o_option (FLAG_ON, vname);
++#endif
+       free (vname);
+     }
+ }
+--- builtins/shopt.def	2013-02-27 07:43:20.000000000 -0700
++++ builtins/shopt.def	2015-02-06 17:14:11.015662800 -0700
+@@ -91,6 +91,11 @@ extern int glob_star;
+ extern int glob_asciirange;
+ extern int lastpipe_opt;
+ 
++#if __CYGWIN__
++extern int completion_strip_exe;
++#endif
++
++
+ #if defined (EXTENDED_GLOB)
+ extern int extended_glob;
+ #endif
+@@ -161,6 +166,9 @@ static struct {
+   { "compat40", &shopt_compat40, set_compatibility_level },
+   { "compat41", &shopt_compat41, set_compatibility_level },
+   { "compat42", &shopt_compat41, set_compatibility_level },
++#if __CYGWIN__
++  { "completion_strip_exe", &completion_strip_exe, NULL },
++#endif
+ #if defined (READLINE)
+   { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
+   { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand },
+--- config-top.h	2012-08-18 18:51:30.000000000 -0600
++++ config-top.h	2015-02-06 17:14:11.015662800 -0700
+@@ -80,10 +80,10 @@
+ #define KSH_COMPATIBLE_SELECT
+ 
+ /* System-wide .bashrc file for interactive shells. */
+-/* #define SYS_BASHRC "/etc/bash.bashrc" */
++#define SYS_BASHRC "/etc/bash.bashrc"
+ 
+ /* System-wide .bash_logout for login shells. */
+-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
++#define SYS_BASH_LOGOUT "/etc/bash.bash_logout"
+ 
+ /* Define this to make non-interactive shells begun with argv[0][0] == '-'
+    run the startup files when not in posix mode. */
+@@ -93,7 +93,7 @@
+    sshd and source the .bashrc if so (like the rshd behavior).  This checks
+    for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment,
+    which can be fooled under certain not-uncommon circumstances. */
+-/* #define SSH_SOURCE_BASHRC */
++#define SSH_SOURCE_BASHRC
+ 
+ /* Define if you want the case-capitalizing operators (~[~]) and the
+    `capcase' variable attribute (declare -c). */
+--- doc/Makefile.in	2013-10-30 14:18:12.000000000 -0600
++++ doc/Makefile.in	2015-02-06 17:14:11.015662800 -0700
+@@ -176,7 +176,7 @@ bashref.html: $(BASHREF_FILES) $(HSUSER)
+ 	$(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/bashref.texi
+ 
+ bash.info: bashref.info
+-	${SHELL} ${INFOPOST} < $(srcdir)/bashref.info > $@ ; \
++	${SHELL} ${INFOPOST} < bashref.info > $@ ; \
+ 
+ bash.txt: bash.1
+ bash.ps: bash.1
+@@ -237,9 +237,9 @@ install: info installdirs bash.info
+ 	-$(INSTALL_DATA) $(srcdir)/bashbug.1 $(DESTDIR)$(man1dir)/bashbug${man1ext}
+ 	-$(INSTALL_DATA) $(OTHER_DOCS) $(DESTDIR)$(docdir)
+ # uncomment the next lines to install the builtins man page
+-#	sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1
+-#	-$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext}
+-#	-$(RM) $${TMPDIR:-/var/tmp}/builtins.1
++	sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1
++	-$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext}
++	-$(RM) $${TMPDIR:-/var/tmp}/builtins.1
+ 	-if test -f bash.info; then d=.; else d=$(srcdir); fi; \
+ 	  $(INSTALL_DATA) $$d/bash.info $(DESTDIR)$(infodir)/bash.info
+ # run install-info if it is present to update the info directory
+--- doc/bash.1	2014-02-06 07:03:52.000000000 -0700
++++ doc/bash.1	2015-02-06 17:14:11.015662800 -0700
+@@ -1658,6 +1658,14 @@ subsequently reset.
+ Expands to the effective user ID of the current user, initialized at
+ shell startup.  This variable is readonly.
+ .TP
++.B EXECIGNORE
++A colon-separated list of extended glob (see \fBPattern Matching\fP)
++patterns. Files with full paths matching one of these patterns are
++not considered executable for the purposes of completion and PATH
++searching, but the \fB[\fP, \fB[[\fP, and \fBtest\fP builtins are not
++affected. Use this variable to deal with systems that set the
++executable bit on files that are not actually executable.
++.TP
+ .B FUNCNAME
+ An array variable containing the names of all shell functions
+ currently in the execution call stack.
+@@ -3308,6 +3316,10 @@ the character
+ .B ``.''
+ at the start of a name or immediately following a slash
+ must be matched explicitly, unless the shell option
++.B completion_strip_exe
++If set, whenever bash sees `foo.exe' during completion, it checks if
++`foo' is the same file and strips the suffix.
++.TP 8
+ .B dotglob
+ is set.
+ When matching a pathname, the slash character must always be
+--- doc/bashref.texi	2014-02-22 11:20:36.000000000 -0700
++++ doc/bashref.texi	2015-02-06 17:14:11.015662800 -0700
+@@ -4992,6 +4992,10 @@ filenames.
+ This variable is set by default, which is the default Bash behavior in
+ versions through 4.2.
+ 
++@item completion_strip_exe
++If set, whenever bash sees `foo.exe' during completion, it checks if
++`foo' is the same file and strips the suffix.
++
+ @item direxpand
+ If set, Bash
+ replaces directory names with the results of word expansion when performing
+@@ -5578,6 +5582,14 @@ Similar to @code{BASH_ENV}; used when th
+ The numeric effective user id of the current user.  This variable
+ is readonly.
+ 
++@item EXECIGNORE
++A colon-separated list of extended glob ((@pxref{Pattern Matching})
++patterns. Files with full paths matching one of these patterns are
++not considered executable for the purposes of completion and PATH
++searching, but the @code{[}, @code{[[}, and @code{test} builtins are
++not affected. Use this variable to deal with systems that set the
++executable bit on files that are not actually executable.
++
+ @item FCEDIT
+ The editor used as a default by the @option{-e} option to the @code{fc}
+ builtin command.
+--- doc/builtins.1	2012-02-21 12:32:05.000000000 -0700
++++ doc/builtins.1	2015-02-06 17:14:11.031260100 -0700
+@@ -19,6 +19,6 @@ shift, shopt, source, suspend, test, tim
+ ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1)
+ .SH BASH BUILTIN COMMANDS
+ .nr zZ 1
+-.so bash.1
++.so man1/bash.1
+ .SH SEE ALSO
+ bash(1), sh(1)
+--- execute_cmd.c	2015-02-06 17:12:55.261573700 -0700
++++ execute_cmd.c	2015-02-06 17:14:11.031260100 -0700
+@@ -58,6 +58,7 @@ extern int errno;
+ #endif
+ 
+ #define NEED_FPURGE_DECL
++#define NEED_SH_SETLINEBUF_DECL		/* used in externs.h */
+ 
+ #include "bashansi.h"
+ #include "bashintl.h"
+--- expr.c	2014-01-03 06:55:00.000000000 -0700
++++ expr.c	2015-02-06 17:14:11.031260100 -0700
+@@ -83,6 +83,7 @@
+ 
+ #include "shell.h"
+ #include "typemax.h"		/* INTMAX_MAX, INTMAX_MIN */
++#define exp2 exp2_
+ 
+ /* Because of the $((...)) construct, expressions may include newlines.
+    Here is a macro which accepts newlines, tabs and spaces as whitespace. */
+--- findcmd.c	2012-10-15 05:45:04.000000000 -0600
++++ findcmd.c	2015-02-06 17:14:11.031260100 -0700
+@@ -48,6 +48,8 @@
+ extern int errno;
+ #endif
+ 
++#include <glob/strmatch.h>
++
+ extern int posixly_correct;
+ extern int last_command_exit_value;
+ 
+@@ -77,6 +79,38 @@ int check_hashed_filenames;
+    containing the file of interest. */
+ int dot_found_in_search = 0;
+ 
++static struct ignorevar execignore =
++{
++  "EXECIGNORE",
++  (struct ign *)0,
++  0,
++  (char *)0,
++  (sh_iv_item_func_t *)0,
++};
++
++void
++setup_exec_ignore (char *varname)
++{
++  setup_ignore_patterns (&execignore);
++}
++
++/* Return whether we should never consider file executable
++ * even if the system tells us it is. */
++static int
++is_on_exec_blacklist (char *name)
++{
++  struct ign *p;
++  int flags = FNM_EXTMATCH | FNM_CASEFOLD;
++
++  for (p = execignore.ignores; p && p->val; p++)
++    {
++      if (strmatch (p->val, (char *)name, flags) != FNM_NOMATCH)
++      return (1);
++    }
++
++  return (0);
++}
++
+ /* Return some flags based on information about this file.
+    The EXISTS bit is non-zero if the file is found.
+    The EXECABLE bit is non-zero the file is executble.
+@@ -104,7 +138,7 @@ file_status (name)
+      file access mechanisms into account.  eaccess uses the effective
+      user and group IDs, not the real ones.  We could use sh_eaccess,
+      but we don't want any special treatment for /dev/fd. */
+-  if (eaccess (name, X_OK) == 0)
++  if (!is_on_exec_blacklist (name) && eaccess (name, X_OK) == 0)
+     r |= FS_EXECABLE;
+   if (eaccess (name, R_OK) == 0)
+     r |= FS_READABLE;
+--- findcmd.h	2012-01-14 16:56:25.000000000 -0700
++++ findcmd.h	2015-02-06 17:14:11.031260100 -0700
+@@ -31,5 +31,6 @@ extern char *find_user_command __P((cons
+ extern char *find_path_file __P((const char *));
+ extern char *search_for_command __P((const char *, int));
+ extern char *user_command_matches __P((const char *, int, int));
++extern void setup_exec_ignore __P((char *));
+ 
+ #endif /* _FINDCMD_H_ */
+--- general.c	2014-01-30 14:46:15.000000000 -0700
++++ general.c	2015-02-06 17:14:11.031260100 -0700
+@@ -44,6 +44,10 @@
+ 
+ #include <tilde/tilde.h>
+ 
++#ifdef __CYGWIN__
++# include <sys/cygwin.h>
++#endif
++
+ #if !defined (errno)
+ extern int errno;
+ #endif /* !errno */
+@@ -632,7 +636,8 @@ make_absolute (string, dot_path)
+     {
+       char pathbuf[PATH_MAX + 1];
+ 
+-      cygwin_conv_to_full_posix_path (string, pathbuf);
++      cygwin_conv_path (CCP_WIN_A_TO_POSIX | CCP_ABSOLUTE, string, pathbuf,
++			sizeof pathbuf);
+       result = savestring (pathbuf);
+     }
+ #else
+--- include/chartypes.h	2011-04-11 12:30:52.000000000 -0600
++++ include/chartypes.h	2015-02-06 17:14:11.031260100 -0700
+@@ -40,6 +40,7 @@
+ #else
+ #  define IN_CTYPE_DOMAIN(c) isascii(c)
+ #endif
++#define to_uchar(c) ((unsigned char)(c))
+ 
+ #if !defined (isspace) && !defined (HAVE_ISSPACE)
+ #  define isspace(c) ((c) == ' ' || (c) == '\t' || (c) == '\n' || (c) == '\f')
+@@ -67,16 +68,16 @@
+ 
+ #undef ISPRINT
+ 
+-#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c))
+-#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (c))
+-#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (c))
+-#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c))
+-#define ISCNTRL(c) (IN_CTYPE_DOMAIN (c) && iscntrl (c))
+-#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (c))
+-#define ISPUNCT(c) (IN_CTYPE_DOMAIN (c) && ispunct (c))
+-#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
+-#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c))
+-#define ISXDIGIT(c) (IN_CTYPE_DOMAIN (c) && isxdigit (c))
++#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (to_uchar (c)))
++#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (to_uchar (c)))
++#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (to_uchar (c)))
++#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (to_uchar (c)))
++#define ISCNTRL(c) (IN_CTYPE_DOMAIN (c) && iscntrl (to_uchar (c)))
++#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (to_uchar (c)))
++#define ISPUNCT(c) (IN_CTYPE_DOMAIN (c) && ispunct (to_uchar (c)))
++#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (to_uchar (c)))
++#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (to_uchar (c)))
++#define ISXDIGIT(c) (IN_CTYPE_DOMAIN (c) && isxdigit (to_uchar (c)))
+ 
+ #define ISLETTER(c)	(ISALPHA(c))
+ 
+--- include/posixjmp.h	2012-12-23 20:20:50.000000000 -0700
++++ include/posixjmp.h	2015-02-06 17:14:11.031260100 -0700
+@@ -27,13 +27,13 @@
+ 
+ #if defined (HAVE_POSIX_SIGSETJMP)
+ #  define procenv_t	sigjmp_buf
+-#  if !defined (__OPENNT)
++#  if !defined (__OPENNT) && !defined __CYGWIN__
+ #    undef setjmp
+ #    define setjmp(x)	sigsetjmp((x), 1)
+-#    define setjmp_nosigs(x)	sigsetjmp((x), 0)
+ #    undef longjmp
+ #    define longjmp(x, n)	siglongjmp((x), (n))
+ #  endif /* !__OPENNT */
++#  define setjmp_nosigs(x)	sigsetjmp((x), 0)
+ #else
+ #  define procenv_t	jmp_buf
+ #  define setjmp_nosigs	setjmp
+--- input.c	2014-02-07 07:13:08.000000000 -0700
++++ input.c	2015-02-06 17:14:11.031260100 -0700
+@@ -44,6 +44,10 @@
+ #include "quit.h"
+ #include "trap.h"
+ 
++#if __CYGWIN__
++int igncr;
++#endif
++
+ #if !defined (errno)
+ extern int errno;
+ #endif /* !errno */
+@@ -561,6 +565,19 @@ buffered_getchar ()
+ {
+   CHECK_TERMSIG;
+ 
++#if __CYGWIN__
++  /* shopt igncr means to discard carriage returns from input stream.
++     If cr is the only character in the buffer, then recurse to pick
++     up the next character; otherwise flatten the buffer.  */
++  if (igncr)
++    {
++      int ch;
++      while ((ch = bufstream_getc (buffers[bash_input.location.buffered_fd]))
++	     == '\r')
++	;
++      return ch;
++    }
++#endif /* __CYGWIN__ */
+ #if !defined (DJGPP)
+   return (bufstream_getc (buffers[bash_input.location.buffered_fd]));
+ #else
+--- lib/readline/bind.c	2013-04-06 15:46:38.000000000 -0600
++++ lib/readline/bind.c	2015-02-06 17:14:11.031260100 -0700
+@@ -452,7 +452,7 @@ rl_translate_keyseq (seq, array, len)
+ {
+   register int i, c, l, temp;
+ 
+-  for (i = l = 0; c = seq[i]; i++)
++  for (i = l = 0; (c = seq[i]); i++)
+     {
+       if (c == '\\')
+ 	{
+@@ -1210,7 +1210,7 @@ _rl_skip_to_delim (string, start, delim)
+ {
+   int i, c, passc;
+ 
+-  for (i = start,passc = 0; c = string[i]; i++)
++  for (i = start,passc = 0; (c = string[i]); i++)
+     {
+       if (passc)
+ 	{
+@@ -1297,7 +1297,6 @@ rl_parse_and_bind (string)
+   if (_rl_stricmp (string, "set") == 0)
+     {
+       char *var, *value, *e;
+-      int s;
+ 
+       var = string + i;
+       /* Make VAR point to start of variable name. */
+@@ -2198,7 +2197,7 @@ rl_function_dumper (print_readably)
+ 
+   fprintf (rl_outstream, "\n");
+ 
+-  for (i = 0; name = names[i]; i++)
++  for (i = 0; (name = names[i]); i++)
+     {
+       rl_command_func_t *function;
+       char **invokers;
+--- lib/readline/chardefs.h	2011-07-25 19:47:56.000000000 -0600
++++ lib/readline/chardefs.h	2015-02-06 17:14:11.046889800 -0700
+@@ -71,6 +71,7 @@
+ #else
+ #  define IN_CTYPE_DOMAIN(c) isascii(c)
+ #endif
++#define to_uchar(c) ((unsigned char)(c))
+ 
+ #if !defined (isxdigit) && !defined (HAVE_ISXDIGIT) && !defined (__cplusplus)
+ #  define isxdigit(c)   (isdigit((c)) || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))
+@@ -87,13 +88,13 @@
+ 
+ /* Beware:  these only work with single-byte ASCII characters. */
+ 
+-#define ISALNUM(c)	(IN_CTYPE_DOMAIN (c) && isalnum (c))
+-#define ISALPHA(c)	(IN_CTYPE_DOMAIN (c) && isalpha (c))
+-#define ISDIGIT(c)	(IN_CTYPE_DOMAIN (c) && isdigit (c))
+-#define ISLOWER(c)	(IN_CTYPE_DOMAIN (c) && islower (c))
+-#define ISPRINT(c)	(IN_CTYPE_DOMAIN (c) && isprint (c))
+-#define ISUPPER(c)	(IN_CTYPE_DOMAIN (c) && isupper (c))
+-#define ISXDIGIT(c)	(IN_CTYPE_DOMAIN (c) && isxdigit (c))
++#define ISALNUM(c)	(IN_CTYPE_DOMAIN (c) && isalnum (to_uchar (c)))
++#define ISALPHA(c)	(IN_CTYPE_DOMAIN (c) && isalpha (to_uchar (c)))
++#define ISDIGIT(c)	(IN_CTYPE_DOMAIN (c) && isdigit (to_uchar (c)))
++#define ISLOWER(c)	(IN_CTYPE_DOMAIN (c) && islower (to_uchar (c)))
++#define ISPRINT(c)	(IN_CTYPE_DOMAIN (c) && isprint (to_uchar (c)))
++#define ISUPPER(c)	(IN_CTYPE_DOMAIN (c) && isupper (to_uchar (c)))
++#define ISXDIGIT(c)	(IN_CTYPE_DOMAIN (c) && isxdigit (to_uchar (c)))
+ 
+ #define _rl_lowercase_p(c)	(NON_NEGATIVE(c) && ISLOWER(c))
+ #define _rl_uppercase_p(c)	(NON_NEGATIVE(c) && ISUPPER(c))
+--- lib/readline/complete.c	2013-10-14 07:27:10.000000000 -0600
++++ lib/readline/complete.c	2015-02-06 17:14:11.046889800 -0700
+@@ -1082,7 +1082,7 @@ _rl_find_completion_word (fp, dp)
+       /* We didn't find an unclosed quoted substring upon which to do
+          completion, so use the word break characters to find the
+          substring on which to complete. */
+-      while (rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY))
++      while ((rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY)))
+ 	{
+ 	  scan = rl_line_buffer[rl_point];
+ 
+@@ -2116,7 +2116,7 @@ rl_completion_matches (text, entry_funct
+   match_list = (char **)xmalloc ((match_list_size + 1) * sizeof (char *));
+   match_list[1] = (char *)NULL;
+ 
+-  while (string = (*entry_function) (text, matches))
++  while ((string = (*entry_function) (text, matches)))
+     {
+       if (RL_SIG_RECEIVED ())
+ 	{
+@@ -2190,7 +2190,7 @@ rl_username_completion_function (text, s
+     }
+ 
+ #if defined (HAVE_GETPWENT)
+-  while (entry = getpwent ())
++  while ((entry = getpwent ()))
+     {
+       /* Null usernames should result in all users as possible completions. */
+       if (namelen == 0 || (STREQN (username, entry->pw_name, namelen)))
+@@ -2723,7 +2723,7 @@ rl_menu_complete (count, ignore)
+   static int full_completion = 0;	/* set to 1 if menu completion should reinitialize on next call */
+   static int orig_start, orig_end;
+   static char quote_char;
+-  static int delimiter, cstate;
++  static int delimiter;
+ 
+   /* The first time through, we generate the list of matches and set things
+      up to insert them. */
+--- lib/readline/display.c	2015-02-06 17:12:54.793574600 -0700
++++ lib/readline/display.c	2015-02-06 17:14:11.046889800 -0700
+@@ -66,7 +66,6 @@ extern char *strchr (), *strrchr ();
+ static void update_line PARAMS((char *, char *, int, int, int, int));
+ static void space_to_eol PARAMS((int));
+ static void delete_chars PARAMS((int));
+-static void insert_some_chars PARAMS((char *, int, int));
+ static void open_some_spaces PARAMS((int));
+ static void cr PARAMS((void));
+ 
+@@ -1314,7 +1313,7 @@ update_line (old, new, current_line, oma
+      int current_line, omax, nmax, inv_botlin;
+ {
+   register char *ofd, *ols, *oe, *nfd, *nls, *ne;
+-  int temp, lendiff, wsatend, od, nd, twidth, o_cpos;
++  int temp, lendiff, wsatend, od, nd, o_cpos;
+   int current_invis_chars;
+   int col_lendiff, col_temp;
+   int bytes_to_insert;
+@@ -2485,6 +2484,7 @@ _rl_clear_screen ()
+ #endif /* __DJGPP__ */
+ }
+ 
++#if 0
+ /* Insert COUNT characters from STRING to the output stream at column COL. */
+ static void
+ insert_some_chars (string, count, col)
+@@ -2494,6 +2494,7 @@ insert_some_chars (string, count, col)
+   open_some_spaces (col);
+   _rl_output_some_chars (string, count);
+ }
++#endif
+ 
+ /* Insert COL spaces, keeping the cursor at the same position.  We follow the
+    ncurses documentation and use either im/ei with explicit spaces, or IC/ic
+--- lib/readline/histexpand.c	2013-12-02 07:22:30.000000000 -0700
++++ lib/readline/histexpand.c	2015-02-06 17:14:11.046889800 -0700
+@@ -204,7 +204,7 @@ get_history_event (string, caller_index,
+     }
+ 
+   /* Only a closing `?' or a newline delimit a substring search string. */
+-  for (local_index = i; c = string[i]; i++)
++  for (local_index = i; (c = string[i]); i++)
+     {
+ #if defined (HANDLE_MULTIBYTE)
+       if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+@@ -677,7 +677,7 @@ history_expand_internal (string, start,
+ 	case 's':
+ 	  {
+ 	    char *new_event;
+-	    int delimiter, failed, si, l_temp, ws, we;
++	    int delimiter, failed, si, l_temp, we;
+ 
+ 	    if (c == 's')
+ 	      {
+@@ -776,7 +776,6 @@ history_expand_internal (string, start,
+ 		  {
+ 		    for (; temp[si] && whitespace (temp[si]); si++)
+ 		      ;
+-		    ws = si;
+ 		    we = history_tokenize_word (temp, si);
+ 		  }
+ 
+--- lib/readline/histfile.c	2013-07-19 06:17:17.000000000 -0600
++++ lib/readline/histfile.c	2015-02-06 17:14:11.046889800 -0700
+@@ -104,7 +104,7 @@ int history_write_timestamps = 0;
+ 
+ /* Does S look like the beginning of a history timestamp entry?  Placeholder
+    for more extensive tests. */
+-#define HIST_TIMESTAMP_START(s)		(*(s) == history_comment_char && isdigit ((s)[1]) )
++#define HIST_TIMESTAMP_START(s)		(*(s) == history_comment_char && isdigit ((unsigned char) (s)[1]) )
+ 
+ /* Return the string that should be used in the place of this
+    filename.  This only matters when you don't specify the
+--- lib/readline/input.c	2015-02-06 17:12:55.027577800 -0700
++++ lib/readline/input.c	2015-02-06 17:14:11.046889800 -0700
+@@ -431,7 +431,7 @@ rl_read_key ()
+   else
+     {
+       /* If input is coming from a macro, then use that. */
+-      if (c = _rl_next_macro_key ())
++      if ((c = _rl_next_macro_key ()))
+ 	return (c);
+ 
+       /* If the user has an event function, then call it periodically. */
+--- lib/readline/isearch.c	2013-10-14 07:08:40.000000000 -0600
++++ lib/readline/isearch.c	2015-02-06 17:14:11.046889800 -0700
+@@ -740,7 +740,7 @@ rl_search_history (direction, invoking_k
+      int direction, invoking_key;
+ {
+   _rl_search_cxt *cxt;		/* local for now, but saved globally */
+-  int c, r;
++  int r;
+ 
+   RL_SETSTATE(RL_STATE_ISEARCH);
+   cxt = _rl_isearch_init (direction);
+@@ -755,7 +755,7 @@ rl_search_history (direction, invoking_k
+   r = -1;
+   for (;;)
+     {
+-      c = _rl_search_getchar (cxt);
++      _rl_search_getchar (cxt);
+       /* We might want to handle EOF here (c == 0) */
+       r = _rl_isearch_dispatch (cxt, cxt->lastc);
+       if (r <= 0)
+@@ -778,9 +778,9 @@ int
+ _rl_isearch_callback (cxt)
+      _rl_search_cxt *cxt;
+ {
+-  int c, r;
++  int r;
+ 
+-  c = _rl_search_getchar (cxt);
++  _rl_search_getchar (cxt);
+   /* We might want to handle EOF here */
+   r = _rl_isearch_dispatch (cxt, cxt->lastc);
+ 
+--- lib/readline/misc.c	2015-02-06 17:12:55.230384200 -0700
++++ lib/readline/misc.c	2015-02-06 17:14:11.046889800 -0700
+@@ -455,7 +455,7 @@ _rl_revert_all_lines ()
+   entry = (hpos == history_length) ? previous_history () : current_history ();
+   while (entry)
+     {
+-      if (ul = (UNDO_LIST *)entry->data)
++      if ((ul = (UNDO_LIST *)entry->data))
+ 	{
+ 	  if (ul == saved_undo_list)
+ 	    saved_undo_list = 0;
+@@ -502,7 +502,7 @@ rl_clear_history ()
+   for (i = 0; i < history_length; i++)
+     {
+       hent = hlist[i];
+-      if (ul = (UNDO_LIST *)hent->data)
++      if ((ul = (UNDO_LIST *)hent->data))
+ 	{
+ 	  if (ul == saved_undo_list)
+ 	    saved_undo_list = 0;
+--- lib/readline/nls.c	2013-03-09 12:51:10.000000000 -0700
++++ lib/readline/nls.c	2015-02-06 17:14:11.046889800 -0700
+@@ -80,7 +80,7 @@ static char *legal_lang_values[] =
+ static char *normalize_codeset PARAMS((char *));
+ #endif /* !HAVE_SETLOCALE */
+ 
+-static char *find_codeset PARAMS((char *, size_t *));
++static char *find_codeset PARAMS((char *, size_t *)) __attribute__ ((__unused__));
+ 
+ static char *_rl_get_locale_var PARAMS((const char *));
+ 
+@@ -104,12 +104,13 @@ utf8locale (lspec)
+      char *lspec;
+ {
+   char *cp;
+-  size_t len;
+ 
+ #if HAVE_LANGINFO_CODESET
+   cp = nl_langinfo (CODESET);
+   return (STREQ (cp, "UTF-8") || STREQ (cp, "utf8"));
+ #else
++  size_t len;
++
+   cp = find_codeset (lspec, &len);
+ 
+   if (cp == 0 || len < 4 || len > 5)
+--- lib/readline/parens.c	2009-04-19 11:12:06.000000000 -0600
++++ lib/readline/parens.c	2015-02-06 17:14:11.046889800 -0700
+@@ -106,7 +106,7 @@ rl_insert_close (count, invoking_key)
+   else
+     {
+ #if defined (HAVE_SELECT)
+-      int orig_point, match_point, ready;
++      int orig_point, match_point;
+       struct timeval timer;
+       fd_set readfds;
+ 
+@@ -126,7 +126,7 @@ rl_insert_close (count, invoking_key)
+       orig_point = rl_point;
+       rl_point = match_point;
+       (*rl_redisplay_function) ();
+-      ready = select (1, &readfds, (fd_set *)NULL, (fd_set *)NULL, &timer);
++      select (1, &readfds, (fd_set *)NULL, (fd_set *)NULL, &timer);
+       rl_point = orig_point;
+ #else /* !HAVE_SELECT */
+       _rl_insert_char (count, invoking_key);
+--- lib/readline/posixjmp.h	2012-12-23 20:20:50.000000000 -0700
++++ lib/readline/posixjmp.h	2015-02-06 17:14:11.046889800 -0700
+@@ -27,13 +27,13 @@
+ 
+ #if defined (HAVE_POSIX_SIGSETJMP)
+ #  define procenv_t	sigjmp_buf
+-#  if !defined (__OPENNT)
++#  if !defined (__OPENNT) && !defined __CYGWIN__
+ #    undef setjmp
+ #    define setjmp(x)	sigsetjmp((x), 1)
+-#    define setjmp_nosigs(x)	sigsetjmp((x), 0)
+ #    undef longjmp
+ #    define longjmp(x, n)	siglongjmp((x), (n))
+ #  endif /* !__OPENNT */
++#  define setjmp_nosigs(x)	sigsetjmp((x), 0)
+ #else
+ #  define procenv_t	jmp_buf
+ #  define setjmp_nosigs	setjmp
+--- lib/readline/readline.c	2015-02-06 17:12:54.310964200 -0700
++++ lib/readline/readline.c	2015-02-06 17:14:11.046889800 -0700
+@@ -95,7 +95,7 @@ static void bind_arrow_keys_internal PAR
+ static void bind_arrow_keys PARAMS((void));
+ 
+ static void readline_default_bindings PARAMS((void));
+-static void reset_default_bindings PARAMS((void));
++//static void reset_default_bindings PARAMS((void));
+ 
+ static int _rl_subseq_result PARAMS((int, Keymap, int, int));
+ static int _rl_subseq_getchar PARAMS((int));
+@@ -522,7 +522,7 @@ readline_internal_char ()
+ readline_internal_charloop ()
+ #endif
+ {
+-  static int lastc, eof_found;
++  static int lastc, eof_found __attribute__((unused));
+   int c, code, lk;
+ 
+   lastc = -1;
+@@ -1204,6 +1204,7 @@ readline_default_bindings ()
+     rl_tty_set_default_bindings (_rl_keymap);
+ }
+ 
++#if 0
+ /* Reset the default bindings for the terminal special characters we're
+    interested in back to rl_insert and read the new ones. */
+ static void
+@@ -1215,6 +1216,7 @@ reset_default_bindings ()
+       rl_tty_set_default_bindings (_rl_keymap);
+     }
+ }
++#endif
+ 
+ /* Bind some common arrow key sequences in MAP. */
+ static void
+--- lib/readline/rltty.c	2013-08-25 14:57:05.000000000 -0600
++++ lib/readline/rltty.c	2015-02-06 17:14:11.062454900 -0700
+@@ -30,6 +30,7 @@
+ #include <signal.h>
+ #include <errno.h>
+ #include <stdio.h>
++#include <sys/ioctl.h>
+ 
+ #if defined (HAVE_UNISTD_H)
+ #  include <unistd.h>
+--- lib/readline/shell.c	2013-03-13 08:17:00.000000000 -0600
++++ lib/readline/shell.c	2015-02-06 17:14:11.062454900 -0700
+@@ -123,8 +123,10 @@ sh_single_quote (string)
+ /* Set the environment variables LINES and COLUMNS to lines and cols,
+    respectively. */
+ static char setenv_buf[INT_STRLEN_BOUND (int) + 1];
++#  if !defined (HAVE_SETENV) && defined (HAVE_PUTENV)
+ static char putenv_buf1[INT_STRLEN_BOUND (int) + 6 + 1];	/* sizeof("LINES=") == 6 */
+ static char putenv_buf2[INT_STRLEN_BOUND (int) + 8 + 1];	/* sizeof("COLUMNS=") == 8 */
++#  endif
+ 
+ void
+ sh_set_lines_and_columns (lines, cols)
+--- lib/readline/signals.c	2014-01-10 13:06:48.000000000 -0700
++++ lib/readline/signals.c	2015-02-06 17:14:11.062454900 -0700
+@@ -576,7 +576,6 @@ rl_free_line_state ()
+ /* **************************************************************** */
+ 
+ #if defined (HAVE_POSIX_SIGNALS)
+-static sigset_t sigint_set, sigint_oset;
+ static sigset_t sigwinch_set, sigwinch_oset;
+ #else /* !HAVE_POSIX_SIGNALS */
+ #  if defined (HAVE_BSD_SIGNALS)
+--- lib/readline/terminal.c	2013-09-18 07:12:01.000000000 -0600
++++ lib/readline/terminal.c	2015-02-06 17:14:11.062454900 -0700
+@@ -31,6 +31,7 @@
+ #if defined (HAVE_SYS_FILE_H)
+ #  include <sys/file.h>
+ #endif /* HAVE_SYS_FILE_H */
++#include <sys/ioctl.h>
+ 
+ #if defined (HAVE_UNISTD_H)
+ #  include <unistd.h>
+--- lib/readline/text.c	2013-10-14 07:25:05.000000000 -0600
++++ lib/readline/text.c	2015-02-06 17:14:11.062454900 -0700
+@@ -859,11 +859,10 @@ _rl_overwrite_char (count, c)
+   int i;
+ #if defined (HANDLE_MULTIBYTE)
+   char mbkey[MB_LEN_MAX];
+-  int k;
+ 
+   /* Read an entire multibyte character sequence to insert COUNT times. */
+   if (count > 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+-    k = _rl_read_mbstring (c, mbkey, MB_LEN_MAX);
++    _rl_read_mbstring (c, mbkey, MB_LEN_MAX);
+ #endif
+ 
+   rl_begin_undo_group ();
+--- lib/readline/tilde.c	2010-07-25 15:42:13.000000000 -0600
++++ lib/readline/tilde.c	2015-02-06 17:14:11.062454900 -0700
+@@ -196,7 +196,7 @@ tilde_expand (string)
+   int result_size, result_index;
+ 
+   result_index = result_size = 0;
+-  if (result = strchr (string, '~'))
++  if ((result = strchr (string, '~')))
+     result = (char *)xmalloc (result_size = (strlen (string) + 16));
+   else
+     result = (char *)xmalloc (result_size = (strlen (string) + 1));
+--- lib/readline/undo.c	2014-02-02 13:47:46.000000000 -0700
++++ lib/readline/undo.c	2015-02-06 17:14:11.062454900 -0700
+@@ -124,7 +124,7 @@ _rl_free_undo_list (ul)
+ void
+ rl_free_undo_list ()
+ {
+-  UNDO_LIST *release, *orig_list;
++  UNDO_LIST *orig_list;
+ 
+   orig_list = rl_undo_list;
+   _rl_free_undo_list (rl_undo_list);
+--- lib/readline/vi_mode.c	2012-09-01 16:55:30.000000000 -0600
++++ lib/readline/vi_mode.c	2015-02-06 17:14:11.062454900 -0700
+@@ -1089,7 +1089,7 @@ static int
+ rl_domove_motion_callback (m)
+      _rl_vimotion_cxt *m;
+ {
+-  int c, save, r;
++  int c, r;
+   int old_end;
+ 
+   _rl_vi_last_motion = c = m->motion;
+@@ -1257,7 +1257,6 @@ int
+ rl_vi_domove (x, ignore)
+      int x, *ignore;
+ {
+-  int r;
+   _rl_vimotion_cxt *m;
+ 
+   m = _rl_vimvcxt;
+--- lib/sh/pathphys.c	2013-05-28 13:33:58.000000000 -0600
++++ lib/sh/pathphys.c	2015-02-06 17:14:11.062454900 -0700
+@@ -35,6 +35,7 @@
+ #include <stdio.h>
+ #include <chartypes.h>
+ #include <errno.h>
++#include <stdlib.h>
+ 
+ #include "shell.h"
+ 
+@@ -76,6 +77,10 @@ sh_physpath (path, flags)
+      char *path;
+      int flags;
+ {
++#if __CYGWIN__
++  /* realpath does this correctly without all the hassle */
++  return realpath (path, NULL);
++#else
+   char tbuf[PATH_MAX+1], linkbuf[PATH_MAX+1];
+   char *result, *p, *q, *qsave, *qbase, *workpath;
+   int double_slash_path, linklen, nlink;
+@@ -214,11 +219,7 @@ error:
+ 	    {
+ 	      q = result;
+ 	      /* Duplicating some code here... */
+-#if defined (__CYGWIN__)
+-	      qbase = (ISALPHA((unsigned char)workpath[0]) && workpath[1] == ':') ? workpath + 3 : workpath + 1;
+-#else
+ 	      qbase = workpath + 1;
+-#endif
+ 	      double_slash_path = DOUBLE_SLASH (workpath);
+ 	      qbase += double_slash_path;
+     
+@@ -249,6 +250,7 @@ error:
+     }
+ 
+   return (result);
++#endif /* ! __CYGWIN__ */
+ }
+ 
+ char *
+--- lib/sh/tmpfile.c	2013-12-18 15:50:13.000000000 -0700
++++ lib/sh/tmpfile.c	2015-02-06 17:14:11.062454900 -0700
+@@ -96,7 +96,7 @@ get_tmpdir (flags)
+   if (tdir && (file_iswdir (tdir) == 0 || strlen (tdir) > PATH_MAX))
+     tdir = 0;
+ 
+-  if (tdir == 0)
++  if (tdir == 0 || !file_iswdir (tdir))
+     tdir = get_sys_tmpdir ();
+ 
+ #if defined (HAVE_PATHCONF) && defined (_PC_NAME_MAX)
+@@ -118,14 +118,15 @@ sh_mktmpname (nameroot, flags)
+   struct stat sb;
+   int r, tdlen;
+ 
+-  filename = (char *)xmalloc (PATH_MAX + 1);
++  filename = NULL;
+   tdir = get_tmpdir (flags);
+   tdlen = strlen (tdir);
+ 
+   lroot = nameroot ? nameroot : DEFAULT_NAMEROOT;
+ 
+ #ifdef USE_MKTEMP
+-  sprintf (filename, "%s/%s.XXXXXX", tdir, lroot);
++  if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0)
++    return NULL;
+   if (mktemp (filename) == 0)
+     {
+       free (filename);
+@@ -138,7 +139,9 @@ sh_mktmpname (nameroot, flags)
+ 		(unsigned long) time ((time_t *)0) ^
+ 		(unsigned long) dollar_dollar_pid ^
+ 		(unsigned long) ((flags & MT_USERANDOM) ? random () : ntmpfiles++);
+-      sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum);
++      free (filename);
++      if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0)
++	return NULL;
+       if (tmpnamelen > 0 && tmpnamelen < 32)
+ 	filename[tdlen + 1 + tmpnamelen] = '\0';
+ #  ifdef HAVE_LSTAT
+@@ -163,14 +166,19 @@ sh_mktmpfd (nameroot, flags, namep)
+   char *filename, *tdir, *lroot;
+   int fd, tdlen;
+ 
+-  filename = (char *)xmalloc (PATH_MAX + 1);
++  filename = NULL;
+   tdir = get_tmpdir (flags);
+   tdlen = strlen (tdir);
+ 
+   lroot = nameroot ? nameroot : DEFAULT_NAMEROOT;
+ 
+ #ifdef USE_MKSTEMP
+-  sprintf (filename, "%s/%s.XXXXXX", tdir, lroot);
++  if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0)
++    {
++      if (namep)
++	*namep = NULL;
++      return -1;
++    }
+   fd = mkstemp (filename);
+   if (fd < 0 || namep == 0)
+     {
+@@ -187,7 +195,13 @@ sh_mktmpfd (nameroot, flags, namep)
+ 		(unsigned long) time ((time_t *)0) ^
+ 		(unsigned long) dollar_dollar_pid ^
+ 		(unsigned long) ((flags & MT_USERANDOM) ? random () : ntmpfiles++);
+-      sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum);
++      free (filename);
++      if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0)
++	{
++	  if (namep)
++	    *namep = NULL;
++	  return -1;
++	}
+       if (tmpnamelen > 0 && tmpnamelen < 32)
+ 	filename[tdlen + 1 + tmpnamelen] = '\0';
+       fd = open (filename, BASEOPENFLAGS | ((flags & MT_READWRITE) ? O_RDWR : O_WRONLY), 0600);
+--- mksyntax.c	2012-07-29 17:48:38.000000000 -0600
++++ mksyntax.c	2015-02-06 17:14:11.062454900 -0700
+@@ -29,13 +29,13 @@
+ 
+ #ifdef HAVE_UNISTD_H
+ #  include <unistd.h>
++#else
++extern int optind;
++extern char *optarg;
+ #endif
+ 
+ #include "syntax.h"
+ 
+-extern int optind;
+-extern char *optarg;
+-
+ #ifndef errno
+ extern int errno;
+ #endif
+--- parse.y	2015-02-06 17:12:55.682776800 -0700
++++ parse.y	2015-02-06 17:14:11.062454900 -0700
+@@ -1531,14 +1531,20 @@ yy_string_get ()
+   string = bash_input.location.string;
+ 
+   /* If the string doesn't exist, or is empty, EOF found. */
+-  if (string && *string)
++  while (string && *string)
+     {
+       c = *string++;
+       bash_input.location.string = string;
++#if __CYGWIN__
++      {
++	extern int igncr;
++	if (igncr && c == '\r')
++	  continue;
++      }
++#endif
+       return (c);
+     }
+-  else
+-    return (EOF);
++  return (EOF);
+ }
+ 
+ static int
+@@ -2305,7 +2311,7 @@ shell_getc (remove_quoted_newline)
+ 	      if (n <= 2)	/* we have to save 1 for the newline added below */
+ 		{
+ 		  if (truncating == 0)
+-		    internal_warning("shell_getc: shell_input_line_size (%zu) exceeds SIZE_MAX (%llu): line truncated", shell_input_line_size, SIZE_MAX);
++		    internal_warning("shell_getc: shell_input_line_size (%zu) exceeds SIZE_MAX (%zu): line truncated", shell_input_line_size, SIZE_MAX);
+ 		  shell_input_line[i] = '\0';
+ 		  truncating = 1;
+ 		}
+@@ -3582,7 +3588,6 @@ parse_comsub (qc, open, close, lenp, fla
+ 
+   while (count)
+     {
+-comsub_readchar:
+       ch = shell_getc (qc != '\'' && (tflags & (LEX_INCOMMENT|LEX_PASSNEXT)) == 0);
+ 
+       if (ch == EOF)
+--- pathexp.h	2009-01-04 12:32:40.000000000 -0700
++++ pathexp.h	2015-02-06 17:14:11.062454900 -0700
+@@ -86,7 +86,7 @@ struct ign {
+ typedef int sh_iv_item_func_t __P((struct ign *));
+ 
+ struct ignorevar {
+-  char *varname;	/* FIGNORE or GLOBIGNORE */
++  char *varname;	/* FIGNORE or GLOBIGNORE or EXECIGNORE */
+   struct ign *ignores;	/* Store the ignore strings here */
+   int num_ignores;	/* How many are there? */
+   char *last_ignoreval;	/* Last value of variable - cached for speed */
+--- redir.c	2013-10-14 07:19:59.000000000 -0600
++++ redir.c	2015-02-06 17:14:11.078059300 -0700
+@@ -156,7 +156,6 @@ redirection_error (temp, error)
+ #endif
+   else if (expandable_redirection_filename (temp))
+     {
+-expandable_filename:
+       oflags = temp->redirectee.filename->flags;
+       if (posixly_correct && interactive_shell == 0)
+ 	temp->redirectee.filename->flags |= W_NOGLOB;
+--- subst.c	2015-02-06 17:12:55.370841100 -0700
++++ subst.c	2015-02-06 17:14:11.078059300 -0700
+@@ -41,6 +41,7 @@
+ #include "posixstat.h"
+ #include "bashintl.h"
+ 
++#define NEED_SH_SETLINEBUF_DECL		/* used in externs.h */
+ #include "shell.h"
+ #include "parser.h"
+ #include "flags.h"
+@@ -5268,6 +5269,13 @@ read_comsub (fd, quoted, rflag)
+ #endif
+ 	  continue;
+ 	}
++#if __CYGWIN__
++      {
++	extern int igncr;
++	if (igncr && c == '\r')
++	  continue;
++      }
++#endif /* __CYGWIN__ */
+ 
+       /* Add the character to ISTRING, possibly after resizing it. */
+       RESIZE_MALLOCED_BUFFER (istring, istring_index, 2, istring_size, DEFAULT_ARRAY_SIZE);
+@@ -5385,6 +5393,28 @@ command_substitute (string, quoted)
+       goto error_exit;
+     }
+ 
++#if __CYGWIN__
++  /* Passing a pipe through std fds can cause hangs when talking to a
++     non-cygwin child.  Move it.  */
++  if (fildes[0] < 3)
++    {
++      int fd = fcntl (fildes[0], F_DUPFD, 3);
++      close (fildes[0]);
++      fildes[0] = fd;
++    }
++  if (fildes[1] < 3)
++    {
++      int fd = fcntl (fildes[1], F_DUPFD, 3);
++      close (fildes[1]);
++      fildes[1] = fd;
++    }
++  if (fildes[0] < 0 || fildes[1] < 0)
++    {
++      sys_error (_("cannot make pipe for command substitution"));
++      goto error_exit;
++    }
++#endif /* __CYGWIN__ */
++
+   old_pid = last_made_pid;
+ #if defined (JOB_CONTROL)
+   old_pipeline_pgrp = pipeline_pgrp;
+--- support/bashversion.c	2008-09-09 07:31:53.000000000 -0600
++++ support/bashversion.c	2015-02-06 17:14:11.078059300 -0700
+@@ -26,6 +26,9 @@
+ 
+ #if defined (HAVE_UNISTD_H)
+ #  include <unistd.h>
++#else
++extern int optind;
++extern char *optarg;
+ #endif
+ 
+ #include "bashansi.h"
+@@ -41,9 +44,6 @@
+ #define LFLAG	0x0020
+ #define XFLAG	0x0040
+ 
+-extern int optind;
+-extern char *optarg;
+-
+ extern char *dist_version;
+ extern int patch_level;
+ 
+@@ -65,7 +65,7 @@ main (argc, argv)
+      char **argv;
+ {
+   int opt, oflags;
+-  char dv[128], *rv;
++  char dv[128], *rv = NULL;
+ 
+   if (progname = strrchr (argv[0], '/'))
+     progname++;
+--- support/mkversion.sh	2008-08-13 06:25:57.000000000 -0600
++++ support/mkversion.sh	2015-02-06 17:14:11.078059300 -0700
+@@ -29,7 +29,7 @@ source_dir="."
+ while [ $# -gt 0 ]; do
+ 	case "$1" in
+ 	-o)	shift; OUTFILE=$1; shift ;;
+-	-b)	shift; inc_build=yes ;;
++	-b)	shift; ;;# inc_build=yes ;; # hacked out for cygport
+ 	-s)	shift; rel_status=$1; shift ;;
+ 	-p)	shift; patch_level=$1; shift ;;
+ 	-d)	shift; dist_version=$1; shift ;;
+--- variables.c	2015-02-06 17:12:55.729569600 -0700
++++ variables.c	2015-02-06 17:14:11.078059300 -0700
+@@ -2526,9 +2526,9 @@ bind_variable_internal (name, value, tab
+ 
+   newname = 0;
+ #if defined (ARRAY_VARS)
+-  if ((aflags & ASS_FROMREF) && (hflags & HASH_NOSRCH) == 0 && valid_array_reference (name))
++  if ((aflags & ASS_FROMREF) && (hflags & HASH_NOSRCH) == 0 && valid_array_reference ((char *)name))
+     {
+-      newname = array_variable_name (name, &subp, &sublen);
++      newname = array_variable_name ((char*)name, &subp, &sublen);
+       if (newname == 0)
+ 	return (SHELL_VAR *)NULL;	/* XXX */
+       entry = hash_lookup (newname, table);
+@@ -2573,13 +2573,13 @@ bind_variable_internal (name, value, tab
+       entry = make_new_array_variable (newname);	/* indexed array by default */
+       if (entry == 0)
+ 	return entry;
+-      ind = array_expand_index (name, subp, sublen);
++      ind = array_expand_index (entry, subp, sublen);
+       bind_array_element (entry, ind, value, aflags);
+     }
+ #endif
+   else if (entry == 0)
+     {
+-      entry = make_new_variable (name, table);
++      entry = make_new_variable ((char*)name, table);
+       var_setvalue (entry, make_variable_value (entry, value, 0)); /* XXX */
+     }
+   else if (entry->assign_func)	/* array vars have assign functions now */
+@@ -4679,6 +4679,8 @@ static struct name_and_function special_
+   { "COMP_WORDBREAKS", sv_comp_wordbreaks },
+ #endif
+ 
++  { "EXECIGNORE", sv_execignore },
++
+   { "FUNCNEST", sv_funcnest },
+ 
+   { "GLOBIGNORE", sv_globignore },
+@@ -4877,6 +4879,13 @@ sv_globignore (name)
+     setup_glob_ignore (name);
+ }
+ 
++/* What to do when EXECIGNORE changes. */
++void
++sv_execignore (char *name)
++{
++  setup_exec_ignore (name);
++}
++
+ #if defined (READLINE)
+ void
+ sv_comp_wordbreaks (name)
+@@ -4950,7 +4959,7 @@ sv_winsize (name)
+ /* Update the value of HOME in the export environment so tilde expansion will
+    work on cygwin. */
+ #if defined (__CYGWIN__)
+-sv_home (name)
++void sv_home (name)
+      char *name;
+ {
+   array_needs_making = 1;
+--- variables.h	2014-01-08 13:33:29.000000000 -0700
++++ variables.h	2015-02-06 17:14:11.078059300 -0700
+@@ -372,6 +372,7 @@ extern void sv_ifs __P((char *));
+ extern void sv_path __P((char *));
+ extern void sv_mail __P((char *));
+ extern void sv_funcnest __P((char *));
++extern void sv_execignore __P((char *));
+ extern void sv_globignore __P((char *));
+ extern void sv_ignoreeof __P((char *));
+ extern void sv_strict_posix __P((char *));
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index 8774db33b5a..014a3ad4a2c 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -3,21 +3,11 @@
 assert interactive -> readline != null;
 
 let
-  version = if stdenv.isCygwin then "4.1" else "4.3";
+  version = "4.3";
   realName = "bash-${version}";
-  shortName = if stdenv.isCygwin then "bash41" else "bash43";
+  shortName = "bash43";
   baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline";
-  sha256 = if version == "4.1" then
-      "1np1ggp1lv8idwfx3mcxl9rhadqdf4h3x4isa3dk8v9wm0j72qiz"
-    else
-      "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg";
-
-  basePatchFun = if version == "4.1" then
-      ./bash-4.1-patches.nix
-    else
-      ./bash-4.3-patches.nix;
-
-  extraPatches = stdenv.lib.optional stdenv.isCygwin ./bash-4.1.17-9.src.patch;
+  sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg";
 in
 
 stdenv.mkDerivation rec {
@@ -47,11 +37,19 @@ stdenv.mkDerivation rec {
           inherit sha256;
         };
     in
-      import basePatchFun patch) ++ extraPatches;
+      import ./bash-4.3-patches.nix patch) 
+      ++ stdenv.lib.optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch;
 
   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" +
+      stdenv.lib.optionalString stdenv.isCygwin ''
+        --without-libintl-prefix --without-libiconv-prefix
+        --with-installed-readline
+        bash_cv_dev_stdin=present
+        bash_cv_dev_fd=standard
+        bash_cv_termcap_lib=libncurses 
+      '';
   };
 
   configureFlags = baseConfigureFlags;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 115afe2c3bb..6c675ec1523 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3392,6 +3392,7 @@ let
 
   bash = lowPrio (callPackage ../shells/bash {
     texinfo = null;
+    interactive = stdenv.isCygwin; # patch for cygwin requires readline support
   });
 
   bashInteractive = appendToName "interactive" (callPackage ../shells/bash {

From c7ac0ed3ebf3a270e5e32659c65f8a88d6deccb5 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Thu, 28 May 2015 13:55:55 -0700
Subject: [PATCH 0396/2322] Add Debian 8.0

Had to add file type logic in debClosureGenerator because Packages.bz2
is not available for Jessie - only Packages.xz is.
---
 pkgs/build-support/vm/default.nix | 33 ++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index b96ac19177a..22782adc9e9 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -694,7 +694,17 @@ rec {
     runCommand "${name}.nix" { buildInputs = [ perl dpkg ]; } ''
       for i in ${toString packagesLists}; do
         echo "adding $i..."
-        bunzip2 < $i >> ./Packages
+        case $i in
+          *.xz | *.lzma)
+            xz -d < $i >> ./Packages
+            ;;
+          *.bz2)
+            bunzip2 < $i >> ./Packages
+            ;;
+          *.gz)
+            gzip -dc < $i >> ./Packages
+            ;;
+        esac
       done
 
       # Work around this bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452279
@@ -1698,6 +1708,27 @@ rec {
       packages = commonDebianPackages;
     };
 
+    debian8i386 = {
+      name = "debian-8.0-jessie-i386";
+      fullName = "Debian 8.0 Jessie (i386)";
+      packagesList = fetchurl {
+        url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz;
+        sha256 = "0lrv1lnd595c346ci7z8ja2b0rm2gx5r4hwp0wbp9lzxi8k5nk1d";
+      };
+      urlPrefix = mirror://debian;
+      packages = commonDebianPackages;
+    };
+
+    debian8x86_64 = {
+      name = "debian-8.0-jessie-amd64";
+      fullName = "Debian 8.0 Jessie (amd64)";
+      packagesList = fetchurl {
+        url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.xz;
+        sha256 = "0hhagvybciy89wr1cy9dgdfki668dvcywgbz4w01qwivyd6dsia4";
+      };
+      urlPrefix = mirror://debian;
+      packages = commonDebianPackages;
+    };
   };
 
 

From 1db5bafc94abd0807b5f8bc1f59951cef073e70b Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Fri, 29 May 2015 02:08:25 -0700
Subject: [PATCH 0397/2322] Typo fix! s/wheezy/jessie/

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

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 22782adc9e9..a9f9f0d184c 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1723,7 +1723,7 @@ rec {
       name = "debian-8.0-jessie-amd64";
       fullName = "Debian 8.0 Jessie (amd64)";
       packagesList = fetchurl {
-        url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.xz;
+        url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz;
         sha256 = "0hhagvybciy89wr1cy9dgdfki668dvcywgbz4w01qwivyd6dsia4";
       };
       urlPrefix = mirror://debian;

From c5d132c2eab7be4c2c16cd6120c1f9d63fa8afd1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 May 2015 11:25:26 +0200
Subject: [PATCH 0398/2322] Add "haskellPackages" binaries to the unstable
 channel.

---
 pkgs/top-level/release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index b2f1fb15262..8d26d08a2c9 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -214,6 +214,7 @@ let
       };
 
       haskell.compiler = packagePlatforms pkgs.haskell-ng.compiler;
+      haskellPackages = packagePlatforms pkgs.haskellPackages;
 
       strategoPackages = {
         sdf = linux;

From dfbef0d7703c59af4713151a95d6f23fb2204136 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 28 May 2015 21:53:27 +0200
Subject: [PATCH 0399/2322] coq-coqeal: fix installation

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

diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix
index bfe83a74aae..a9e69184c4e 100644
--- a/pkgs/development/coq-modules/coqeal/default.nix
+++ b/pkgs/development/coq-modules/coqeal/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchgit, coq, ssreflect, mathcomp}:
+{ stdenv, fetchgit, coq, mathcomp }:
 
 stdenv.mkDerivation rec {
 
@@ -11,10 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "1cvjz0yyqihdx1hp1h9x5x14kv9qf3rjhgqq4f7rv8bxcv9p1gv3";
   };
 
-  buildInputs = [ coq.ocaml coq.camlp5 ssreflect mathcomp ];
-  propagatedBuildInputs = [ coq ];
+  propagatedBuildInputs = [ mathcomp ];
 
-  preConfigure = "cd theory";
+  preConfigure = ''
+    cd theory
+    patch ./Make <<EOF
+    0a1
+    > -R . CoqEAL
+    EOF
+  '';
 
   installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
 

From e999716d1ef25fb0927512117af8d8f32f275fe8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 29 May 2015 12:57:07 +0200
Subject: [PATCH 0400/2322] calibre: update from 2.28.0 to 2.29.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 fc013e9125f..0e821e92703 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-2.28.0";
+  name = "calibre-2.29.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "15sb74v0nlj45fhlnw1afll35l90cxw78s15fb2nx3fih7ahv3cf";
+    sha256 = "1n3cfnjnghhhsgzcbcvbr0gh191lhl6az09q1s68jhlcc2lski6l";
   };
 
   inherit python;

From 27ffee363163f710bf526a7853c4dd2a475fe580 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 29 May 2015 13:14:44 +0200
Subject: [PATCH 0401/2322] owncloud: update from 7.0.4 to 7.0.5 (fixes
 CVE-2015-3012 and CVE-2014-9716)

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

diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix
index ef01a3976bc..449eee556c1 100644
--- a/pkgs/servers/owncloud/default.nix
+++ b/pkgs/servers/owncloud/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
   name= "owncloud-${version}";
-  version = "7.0.4";
+  version = "7.0.5";
 
   src = fetchurl {
     url = "https://download.owncloud.org/community/${name}.tar.bz2";
-    sha256 = "0djgqdyxkrh1wc4sn21fmdjr09dkmnjm3gs6lbkp6yn5fpbzhybi";
+    sha256 = "1j21b7ljvbhni9l0b1cpzlhsjy36scyas1l1j222mqdg2srfsi9y";
   };
 
   installPhase =

From 859ec9719b17654c29df2074832794f8e3076247 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Wed, 6 May 2015 02:08:11 +0200
Subject: [PATCH 0402/2322] guitarix: use system zita libs

---
 pkgs/applications/audio/guitarix/default.nix  |  6 ++--
 .../audio/zita-resampler/default.nix          | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/audio/zita-resampler/default.nix

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 984d666ab95..9c1859cacf4 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, gettext, intltool, pkgconfig, python
 , avahi, bluez, boost, eigen, fftw, glib, glibmm, gtk, gtkmm, jack2
 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
+,  zita-convolver, zita-resampler
 , optimizationSupport ? false # Enable support for native CPU extensions
 }:
 
@@ -22,15 +23,14 @@ stdenv.mkDerivation rec {
   buildInputs = [
     avahi bluez boost eigen fftw glib glibmm gtk gtkmm jack2
     ladspaH librdf libsndfile lilv lv2 serd sord sratom
+    zita-convolver zita-resampler
   ];
 
   configureFlags = [
     "--shared-lib"
     "--no-desktop-update"
-    "--no-faust" # Need to package a release of faust, 0.9.58 or 0.9.65
     "--enable-nls"
-    "--includeresampler" # Zita-resampler not packaged, use vendored version
-    "--includeconvolver" # Zita-convolver not packaged, use vendored version
+    "--no-faust" # todo: find out why --faust doesn't work
   ] ++ optional optimizationSupport "--optimization";
 
   configurePhase = ''python waf configure --prefix=$out $configureFlags'';
diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix
new file mode 100644
index 00000000000..8c7e82557ab
--- /dev/null
+++ b/pkgs/development/libraries/audio/zita-resampler/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "zita-resampler-${version}";
+  version = "1.3.0";
+  src = fetchurl {
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    sha256 = "0r9ary5sc3y8vba5pad581ha7mgsrlyai83w7w4x2fmhfy64q0wq";
+  };
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "SUFFIX="
+  ];
+
+  patchPhase = ''
+    cd libs
+    sed -e "s@ldconfig@@" -i Makefile
+  '';
+
+  fixupPhase = ''
+    ln -s $out/lib/libzita-resampler.so.$version $out/lib/libzita-resampler.so.1
+  '';
+
+  meta = {
+    description = "resample library by Fons Adriaensen";
+    version = "${version}";
+    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c675ec1523..65773332d05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8240,6 +8240,8 @@ let
 
   zita-alsa-pcmi = callPackage ../development/libraries/audio/zita-alsa-pcmi { };
 
+  zita-resampler = callPackage ../development/libraries/audio/zita-resampler { };
+
   zziplib = callPackage ../development/libraries/zziplib { };
 
   ### DEVELOPMENT / LIBRARIES / AGDA

From 0ff8e28b83c50f723c7fffc75ea7ba83ee072cca Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Fri, 29 May 2015 08:53:41 -0400
Subject: [PATCH 0403/2322] tetraproc: add missing Xorg libs & ensure Jack is
 in PATH

---
 pkgs/applications/audio/tetraproc/default.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix
index b1356d3c547..309a400c555 100644
--- a/pkgs/applications/audio/tetraproc/default.nix
+++ b/pkgs/applications/audio/tetraproc/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, fftwFloat, freetype, jack2, libclthreads, libclxclient, libsndfile, x11 }:
+{ stdenv, fetchurl, makeWrapper
+, expat, fftwFloat, fontconfig, freetype, jack2, libclthreads, libclxclient
+, libsndfile, libxcb, xlibs
+}:
 
 stdenv.mkDerivation rec {
   name = "tetraproc-${version}";
@@ -9,7 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "17y3vbm5f6h5cmh3yfxjgqz4xhfwpkla3lqfspnbm4ndlzmfpykv";
   };
 
-  buildInputs = [ jack2 libclthreads libclxclient fftwFloat libsndfile freetype x11 ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [
+    expat jack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype
+    libxcb xlibs.libX11 xlibs.libXau xlibs.libXdmcp xlibs.libXft xlibs.libXrender
+  ];
 
   makeFlags = [
     "PREFIX=$(out)"
@@ -20,6 +28,11 @@ stdenv.mkDerivation rec {
     cd ./source/
   '';
 
+  postInstall = ''
+    # Make sure Jack is avalable in $PATH for tetraproc
+    wrapProgram $out/bin/tetraproc --prefix PATH : "${jack2}/bin"
+  '';
+
   meta = with stdenv.lib; {
     description = "Converts the A-format signals from a tetrahedral Ambisonic microphone into B-format signals ready for recording";
     homepage = http://kokkinizita.linuxaudio.org/linuxaudio/;

From 0c5a7d5df2c5b23c5ca401825545b6b15a777b33 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 29 May 2015 09:41:28 -0400
Subject: [PATCH 0404/2322] nix-exec: build against nixUnstable

---
 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 6c675ec1523..2564a978007 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4780,6 +4780,8 @@ let
 
   nix-exec = callPackage ../development/interpreters/nix-exec {
     git = gitMinimal;
+
+    nix = nixUnstable;
   };
 
   octave = callPackage ../development/interpreters/octave {

From c04784dfd61cab73f23f51509a1b989415a8a3de Mon Sep 17 00:00:00 2001
From: _1126 <mail@elfsechsundzwanzig.de>
Date: Fri, 29 May 2015 16:41:13 +0200
Subject: [PATCH 0405/2322] rofi-pass: initial commit.

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

diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix
new file mode 100644
index 00000000000..791cd995adb
--- /dev/null
+++ b/pkgs/applications/misc/rofi/pass.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, wmctrl, xprop, xdotool}:
+
+stdenv.mkDerivation rec {
+  name = "rofi-${version}";
+  version = "2015-05-29";
+
+  src = fetchgit {
+    url = "https://github.com/carnager/rofi-pass";
+    rev = "92c26557ec4b0508c563d596291571bbef402899";
+    sha256 = "17k9jmmckqaw75i0qsay2gc8mrjrs6jjfwfxaggspj912sflmjng";
+  };
+
+  buildInputs = [ wmctrl xprop xdotool ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a $src/rofi-pass $out/bin/rofi-pass
+
+    mkdir -p $out/share/doc/rofi-pass/
+    cp -a $src/config.example $out/share/doc/rofi-pass/config.example
+  '';
+
+  meta = {
+      description = "Rofi script to work with password-store";
+      homepage = https://github.com/carnager/rofi-pass;
+      maintainers = [stdenv.lib.maintainers._1126];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b43fb9c7896..f58cdf7b08e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12067,6 +12067,8 @@ let
     automake = automake114x;
   };
 
+  rofi-pass = callPackage ../applications/misc/rofi/pass.nix { };
+
   rstudio = callPackage ../applications/editors/rstudio { };
 
   rsync = callPackage ../applications/networking/sync/rsync {

From 1b93d6416872fd88bb96cc57d2a03e0b850138c6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 29 May 2015 11:05:36 -0400
Subject: [PATCH 0406/2322] nix-exec: bump

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

diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix
index 6e7ffa656a0..92df954e5e0 100644
--- a/pkgs/development/interpreters/nix-exec/default.nix
+++ b/pkgs/development/interpreters/nix-exec/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, nix, git }: let
-  version = "4.0.0";
+  version = "4.1.0";
 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 = "0qw25v8pzx08mirhy46dmqj93nwnxfvgw2jsn8rvxh2d7x4nc8jv";
+    sha256 = "16hssxv6fwi5a6bz7dlvhjjr3ymiqrvq0xfd38gwhn9qhvynv2ak";
   };
 
   buildInputs = [ pkgconfig nix git ];

From eb0a21a51208927730607fd9166912d3f8e05435 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 29 May 2015 11:21:49 -0400
Subject: [PATCH 0407/2322] boto: Remove obsolete patch

---
 .../python-modules/boto/content-length-str.patch | 16 ----------------
 pkgs/top-level/python-packages.nix               |  2 --
 2 files changed, 18 deletions(-)
 delete mode 100644 pkgs/development/python-modules/boto/content-length-str.patch

diff --git a/pkgs/development/python-modules/boto/content-length-str.patch b/pkgs/development/python-modules/boto/content-length-str.patch
deleted file mode 100644
index 7895e223c6b..00000000000
--- a/pkgs/development/python-modules/boto/content-length-str.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Cherry-picked from https://github.com/boto/boto/pull/2932
-
-This fix is required for things like docker-registry to interact with S3. Will
-be obsolete after the next boto release (> 2.36.0)
-
---- a/boto/connection.py
-+++ b/boto/connection.py
-@@ -381,7 +381,7 @@ class HTTPRequest(object):
-         if 'Content-Length' not in self.headers:
-             if 'Transfer-Encoding' not in self.headers or \
-                     self.headers['Transfer-Encoding'] != 'chunked':
--                self.headers['Content-Length'] = len(self.body)
-+                self.headers['Content-Length'] = str(len(self.body))
-
-
- class HTTPResponse(http_client.HTTPResponse):
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f7f69d5c654..78ae505f1ff 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1308,8 +1308,6 @@ let
     buildInputs = [ self.nose self.mock ];
     propagatedBuildInputs = [ self.requests self.httpretty ];
 
-    patches = [ ../development/python-modules/boto/content-length-str.patch ];
-
     meta = {
       homepage = https://github.com/boto/boto;
 

From 9c7fae83eefd7693770d7ecf5a09ea68af3b3b31 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Mon, 25 May 2015 11:31:57 +0200
Subject: [PATCH 0408/2322] Make it easy to override the marathon framework
 user

Currently the module hardcodes the systemd service user to "marathon".
With this change one would not need to create an extra systemd config to
override the user.

So why would one need to override the Marathon user? Some apps require
root access to run. You can't run those with Marathon unless you
override the default user to root. Marathon also provides a
`--mesos_user` command line flag which allows you to run apps using
arbitrary users. You need to run the framework as root to enable this
functionality.
---
 .../modules/services/scheduling/marathon.nix  | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix
index ab93334f5fc..b9f4a808b0c 100644
--- a/nixos/modules/services/scheduling/marathon.nix
+++ b/nixos/modules/services/scheduling/marathon.nix
@@ -19,14 +19,6 @@ in {
       '';
     };
 
-    httpPort = mkOption {
-      type = types.int;
-      default = 8080;
-      description = ''
-	Marathon listening port for HTTP connections.
-      '';
-    };
-
     master = mkOption {
       type = types.str;
       default = "zk://${concatStringsSep "," cfg.zookeeperHosts}/mesos";
@@ -45,6 +37,25 @@ in {
       '';
     };
 
+    user = mkOption {
+      type = types.str;
+      default = "marathon";
+      example = "root";
+      description = ''
+	The user that the Marathon framework will be launched as. If the user doesn't exist it will be created.
+	If you want to run apps that require root access or you want to launch apps using arbitrary users, that
+	is using the `--mesos_user` flag then you need to change this to `root`.
+      '';
+    };
+
+    httpPort = mkOption {
+      type = types.int;
+      default = 8080;
+      description = ''
+	Marathon listening port for HTTP connections.
+      '';
+    };
+
     extraCmdLineOptions = mkOption {
       type = types.listOf types.str;
       default = [ ];
@@ -76,14 +87,12 @@ in {
 
       serviceConfig = {
         ExecStart = "${pkgs.marathon}/bin/marathon --master ${cfg.master} --zk zk://${concatStringsSep "," cfg.zookeeperHosts}/marathon --http_port ${toString cfg.httpPort} ${concatStringsSep " " cfg.extraCmdLineOptions}";
-        User = "marathon";
+        User = cfg.user;
         Restart = "always";
         RestartSec = "2";
       };
     };
 
-    users.extraUsers.marathon = {
-      description = "Marathon mesos framework user";
-    };
+    users.extraUsers.${cfg.user} = { };
   };
 }

From 6c238d1d5f4da8b20ecaeb0cec32cbbbec5be5e5 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Fri, 29 May 2015 11:03:18 -0500
Subject: [PATCH 0409/2322] moving non-packages into a separate file

---
 pkgs/top-level/python-packages.nix            | 68 +++++--------------
 .../python-support/numpy-scipy-support.nix    | 53 +++++++++++++++
 2 files changed, 69 insertions(+), 52 deletions(-)
 create mode 100644 pkgs/top-level/python-support/numpy-scipy-support.nix

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 33a76d8f264..38636840b9b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7802,50 +7802,13 @@ let
     };
   };
 
-  # Special check phase for numpy and scipy, following the same set of steps:
-  # First "install" the package, then import what was installed, and call the
-  # .test() function, which will run the test suite.
-  numpyScipyCheckPhase = python: pkgName: ''
-    runHook preCheck
-
-    _python=${python}/bin/${python.executable}
-
-    # We will "install" into a temp directory, so that we can run the numpy
-    # tests (see below).
-    install_dir="$TMPDIR/test_install"
-    install_lib="$install_dir/lib/${python.libPrefix}/site-packages"
-    mkdir -p $install_dir
-    $_python setup.py install \
-      --install-lib=$install_lib \
-      --old-and-unmanageable \
-      --prefix=$install_dir > /dev/null
-
-    # Create a directory in which to run tests (you get an error if you try to
-    # import the package when you're in the current directory).
-    mkdir $TMPDIR/run_tests
-    pushd $TMPDIR/run_tests > /dev/null
-    # Temporarily add the directory we installed in to the python path
-    # (not permanently, or this pythonpath will wind up getting exported),
-    # and run the test suite.
-    PYTHONPATH="$install_lib:$PYTHONPATH" $_python -c \
-      'import ${pkgName}; ${pkgName}.test("fast", verbose=10)'
-    popd > /dev/null
-
-    runHook postCheck
-  '';
-
-  # Special prebuild step for numpy and scipy. Creates a site.cfg telling
-  # the setup script where to find depended-on math libraries.
-  numpyScipyPrebuild = ''
-    echo "Creating site.cfg file..."
-    cat << EOF > site.cfg
-    [atlas]
-    include_dirs = ${pkgs.atlasWithLapack}/include
-    library_dirs = ${pkgs.atlasWithLapack}/lib
-    EOF
-  '';
-
-  numpy = buildPythonPackage ( rec {
+  numpy = let
+    support = import ./python-support/numpy-scipy-support.nix {
+      inherit python;
+      atlas = atlasWithLapack;
+      pkgName = "numpy";
+    };
+  in buildPythonPackage ( rec {
     name = "numpy-1.9.2";
 
     src = pkgs.fetchurl {
@@ -7860,15 +7823,13 @@ let
       sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
     '';
 
-    preBuild = self.numpyScipyPrebuild;
+    inherit (support) preBuild checkPhase;
 
     setupPyBuildFlags = ["--fcompiler='gnu95'"];
 
     buildInputs = [ pkgs.gfortran self.nose ];
     propagatedBuildInputs = [ pkgs.atlas ];
 
-    checkPhase = self.numpyScipyCheckPhase python "numpy";
-
     meta = {
       description = "Scientific tools for Python";
       homepage = "http://numpy.scipy.org/";
@@ -11219,7 +11180,13 @@ let
   };
 
 
-  scipy = buildPythonPackage rec {
+  scipy = let
+    support = import ./python-support/numpy-scipy-support.nix {
+      inherit python;
+      atlas = atlasWithLapack;
+      pkgName = "numpy";
+    };
+  in buildPythonPackage rec {
     name = "scipy-0.15.1";
 
     src = pkgs.fetchurl {
@@ -11230,17 +11197,14 @@ let
     buildInputs = [ pkgs.gfortran self.nose ];
     propagatedBuildInputs = [ self.numpy ];
 
-    # TODO: add ATLAS=${pkgs.atlas}
     preConfigure = ''
       sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
     '';
 
-    preBuild = self.numpyScipyPrebuild;
+    inherit (support) preBuild checkPhase;
 
     setupPyBuildFlags = [ "--fcompiler='gnu95'" ];
 
-    checkPhase = self.numpyScipyCheckPhase python "scipy";
-
     meta = {
       description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. ";
       homepage = http://www.scipy.org/;
diff --git a/pkgs/top-level/python-support/numpy-scipy-support.nix b/pkgs/top-level/python-support/numpy-scipy-support.nix
new file mode 100644
index 00000000000..d991a98925a
--- /dev/null
+++ b/pkgs/top-level/python-support/numpy-scipy-support.nix
@@ -0,0 +1,53 @@
+{
+  # Python package expression
+  python,
+  # Name of package (e.g. numpy or scipy)
+  pkgName,
+  # Atlas math library
+  atlas
+}:
+
+{
+
+  # First "install" the package, then import what was installed, and call the
+  # .test() function, which will run the test suite.
+  checkPhase = ''
+    runHook preCheck
+
+    _python=${python}/bin/${python.executable}
+
+    # We will "install" into a temp directory, so that we can run the numpy
+    # tests (see below).
+    install_dir="$TMPDIR/test_install"
+    install_lib="$install_dir/lib/${python.libPrefix}/site-packages"
+    mkdir -p $install_dir
+    $_python setup.py install \
+      --install-lib=$install_lib \
+      --old-and-unmanageable \
+      --prefix=$install_dir > /dev/null
+
+    # Create a directory in which to run tests (you get an error if you try to
+    # import the package when you're in the current directory).
+    mkdir $TMPDIR/run_tests
+    pushd $TMPDIR/run_tests > /dev/null
+    # Temporarily add the directory we installed in to the python path
+    # (not permanently, or this pythonpath will wind up getting exported),
+    # and run the test suite.
+    PYTHONPATH="$install_lib:$PYTHONPATH" $_python -c \
+      'import ${pkgName}; ${pkgName}.test("fast", verbose=10)'
+    popd > /dev/null
+
+    runHook postCheck
+  '';
+
+  # Creates a site.cfg telling the setup script where to find depended-on 
+  # math libraries.
+  preBuild = ''
+    echo "Creating site.cfg file..."
+    cat << EOF > site.cfg
+    [atlas]
+    include_dirs = ${atlas}/include
+    library_dirs = ${atlas}/lib
+    EOF
+  '';
+}

From 0ad7204c3d7bf2423a65f6eef164d6a2df1642d6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 29 May 2015 13:05:48 -0400
Subject: [PATCH 0410/2322] nixopsUnstable: bump

---
 pkgs/tools/package-management/nixops/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix
index 17532039d91..3400d72dea8 100644
--- a/pkgs/tools/package-management/nixops/unstable.nix
+++ b/pkgs/tools/package-management/nixops/unstable.nix
@@ -17,13 +17,13 @@ let
 in
 
 pythonPackages.buildPythonPackage rec {
-  name = "nixops-1.3pre1362_2a616f8";
+  name = "nixops-1.3pre1484_a932a9e";
   namePrefix = "";
 
   src = fetchgit {
     url = https://github.com/NixOS/nixops;
-    rev = "2a616f8ddc18800c9e1c7013632078a55c06c3e3";
-    sha256 = "12arppri2j9sblja73jlfdcbpz1z94cd35n9ypazcsw4irmya3k6";
+    rev = "a932a9ecec15336a55f2aa2c2a20f08264adb837";
+    sha256 = "010qqpa4yvsra1744afsaj9akqjxzla5p0i4zgan9306m8k3jnpk";
   };
 
   buildInputs = [ pythonPackages.nose pythonPackages.coverage ];

From 86e6e490ff324c6f5368aab24453ce2edfc39741 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 29 May 2015 19:07:20 +0200
Subject: [PATCH 0411/2322] nzbget: update from 14.2 to 15.0

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

diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix
index 13bd3a87845..8d47ab1e167 100644
--- a/pkgs/tools/networking/nzbget/default.nix
+++ b/pkgs/tools/networking/nzbget/default.nix
@@ -1,20 +1,19 @@
 { stdenv, fetchurl, pkgconfig, libxml2, ncurses, libsigcxx, libpar2
-, gnutls, libgcrypt }:
+, gnutls, libgcrypt, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "nzbget-14.2";
+  name = "nzbget-15.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/nzbget/${name}.tar.gz";
-    sha256 = "0xs620hjxi9fkab6bmgy7zhwd0h035jpabf0wp2nc5y0gnsay95v";
+    sha256 = "02nclq97gqr4zwww4j1l9sds2rwrwwvwvh2gkjhwvr0pb4z3zw9y";
   };
 
-  buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls libgcrypt ];
+  buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls
+                  libgcrypt zlib ];
 
   enableParallelBuilding = true;
 
-  NIX_LDFLAGS = "-lz";
-
   meta = with stdenv.lib; {
     homepage = http://nzbget.sourceforge.net/;
     license = licenses.gpl2Plus;

From a74e4863f351e4cd2e0ec487b24cb3d1a91ccb9d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 10:12:00 -0700
Subject: [PATCH 0412/2322] krb5: Fixes

---
 pkgs/development/libraries/kerberos/krb5.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index c60ff03aa67..6d3d8eec58f 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -3,7 +3,7 @@
 
 # Optional Dependencies
 , libedit ? null, readline ? null, ncurses ? null, libverto ? null
-, openldap ? null, db ? null
+, openldap ? null
 
 # Crypto Dependencies
 , openssl ? null, nss ? null, nspr ? null
@@ -24,7 +24,6 @@ let
   optNcurses = if libOnly then null else shouldUsePkg ncurses;
   optLibverto = shouldUsePkg libverto;
   optOpenldap = if libOnly then null else shouldUsePkg openldap;
-  optDb = if libOnly then null else shouldUsePkg db;
 
   # Prefer the openssl implementation
   cryptoStr = if optOpenssl != null then "openssl"
@@ -94,7 +93,7 @@ stdenv.mkDerivation rec {
     (mkWith   (optLibverto != null)         "system-verto"        null)
     (mkWith   (optOpenldap != null)         "ldap"                null)
     (mkWith   false                         "tcl"                 null)
-    (mkWith   (optDb != null)               "system-db"           null)
+    (mkWith   false                         "system-db"           null)  # Requires db v1.85
   ];
 
   buildPhase = optionalString libOnly ''
@@ -106,11 +105,14 @@ stdenv.mkDerivation rec {
 
   installPhase = optionalString libOnly ''
     mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}}
+
     (cd util; make install)
     (cd include; make install)
     (cd lib; make install)
     (cd build-tools; make install)
-    rm -rf $out/{bin,sbin,share}
+
+    rm -rf $out/{sbin,share}
+    find $out/bin -type f | grep -v 'krb5-config' | xargs rm
   '';
 
   enableParallelBuilding = true;

From ac2f05a50ae5113cbdd7e66599ff54b728ae10e4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 00:40:04 -0700
Subject: [PATCH 0413/2322] krb5: Make lib build parallel

---
 pkgs/development/libraries/kerberos/krb5.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 6d3d8eec58f..c4974c51e81 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -97,19 +97,19 @@ stdenv.mkDerivation rec {
   ];
 
   buildPhase = optionalString libOnly ''
-    (cd util; make)
-    (cd include; make)
-    (cd lib; make)
-    (cd build-tools; make)
+    (cd util; make -j $NIX_BUILD_CORES)
+    (cd include; make -j $NIX_BUILD_CORES)
+    (cd lib; make -j $NIX_BUILD_CORES)
+    (cd build-tools; make -j $NIX_BUILD_CORES)
   '';
 
   installPhase = optionalString libOnly ''
     mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}}
 
-    (cd util; make install)
-    (cd include; make install)
-    (cd lib; make install)
-    (cd build-tools; make install)
+    (cd util; make -j $NIX_BUILD_CORES install)
+    (cd include; make -j $NIX_BUILD_CORES install)
+    (cd lib; make -j $NIX_BUILD_CORES install)
+    (cd build-tools; make -j $NIX_BUILD_CORES install)
 
     rm -rf $out/{sbin,share}
     find $out/bin -type f | grep -v 'krb5-config' | xargs rm

From 9f0da5315b4595c45ace01727808e2ae8750efc0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 28 May 2015 20:31:22 -0700
Subject: [PATCH 0414/2322] Fix krb5 reference

---
 pkgs/servers/ldap/389/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index 685d365ed18..33d63f6ee03 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap, db, cyrus_sasl
-, svrcore, icu, net_snmp, kerberos, pcre, perlPackages
+, svrcore, icu, net_snmp, libkrb5, pcre, perlPackages
 }:
 let
   version = "1.3.3.9";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig perl pam nspr nss openldap db cyrus_sasl svrcore icu
-    net_snmp kerberos pcre
+    net_snmp libkrb5 pcre
   ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]);
 
   # TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2564a978007..fe37c734581 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8553,7 +8553,7 @@ let
   ### SERVERS
 
   "389-ds-base" = callPackage ../servers/ldap/389 {
-    kerberos = krb5;
+    kerberos = libkrb5;
   };
 
   rdf4store = callPackage ../servers/http/4store { };

From b1e4371a1cb5b8aa45ee3cd8b5ba5537f60d53b0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 10:26:25 -0700
Subject: [PATCH 0415/2322] 389-ds-base: Remove kerberos line as it is strictly
 dependent on krb5

---
 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 fe37c734581..b55ab8ae927 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8552,9 +8552,7 @@ let
 
   ### SERVERS
 
-  "389-ds-base" = callPackage ../servers/ldap/389 {
-    kerberos = libkrb5;
-  };
+  "389-ds-base" = callPackage ../servers/ldap/389 { };
 
   rdf4store = callPackage ../servers/http/4store { };
 

From 7e126ac83ee1689df4d22bb4ad9c4163acc734a0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 26 May 2015 17:51:10 -0700
Subject: [PATCH 0416/2322] audit: 2.9.1 -> 2.9.2

---
 pkgs/os-specific/linux/audit/default.nix      | 58 ++++++++++++++-----
 .../os-specific/linux/libsemanage/default.nix |  4 +-
 pkgs/top-level/all-packages.nix               |  8 ++-
 3 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix
index 05b9eb9e56f..8365017d13b 100644
--- a/pkgs/os-specific/linux/audit/default.nix
+++ b/pkgs/os-specific/linux/audit/default.nix
@@ -1,29 +1,61 @@
-{ stdenv, fetchurl, openldap
-, enablePython ? false, python ? null
+{ stdenv, fetchurl
+, libcap_ng
+
+# Optional Dependencies
+, openldap ? null, python ? null, go ? null, krb5 ? null, tcp_wrappers ? null
+
+# Extra arguments
+, prefix ? ""
 }:
 
-assert enablePython -> python != null;
+with stdenv;
+let
+  libOnly = prefix == "lib";
 
+  optOpenldap = if libOnly then null else shouldUsePkg openldap;
+  optPython = shouldUsePkg python;
+  optGo = shouldUsePkg go;
+  optKrb5 = if libOnly then null else shouldUsePkg krb5;
+  optTcp_wrappers = if libOnly then null else shouldUsePkg tcp_wrappers;
+in
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "audit-2.4.1";
+  name = "${prefix}audit-${version}";
+  version = "2.4.2";
 
   src = fetchurl {
-    url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz";
-    sha256 = "09ihn392pmac1pyjrs22966csia83yr84hq5ri6sybwj1vx4d4q5";
+    url = "http://people.redhat.com/sgrubb/audit/audit-${version}.tar.gz";
+    sha256 = "08j134s4509rxfi3hwsp8yyxzlqqxl8kqgv2rfv6p3qng5pjd80j";
   };
 
-  buildInputs = [ openldap ]
-            ++ stdenv.lib.optional enablePython python;
+  buildInputs = [ libcap_ng optOpenldap optPython optGo optKrb5 optTcp_wrappers ];
 
-  configureFlags = ''
-    ${if enablePython then "--with-python" else "--without-python"}
+  # For libs only build and install the lib portion
+  preBuild = optionalString libOnly ''
+    cd lib
   '';
 
+  configureFlags = [
+    (mkWith   (optPython != null)       "python"      null)
+    (mkWith   (optGo != null)           "golang"      null)
+    (mkEnable (!libOnly)                "listener"    null)
+    (mkEnable (optKrb5 != null)         "gssapi-krb5" null)
+    (mkEnable false                     "systemd"     null)
+    (mkWith   false                     "debug"       null)
+    (mkWith   false                     "warn"        null)
+    (mkWith   false                     "alpha"       null)  # TODO: Support
+    (mkWith   false                     "arm"         null)  # TODO: Support
+    (mkWith   false                     "aarch64"     null)  # TODO: Support
+    (mkWith   (!libOnly)                "apparmor"    null)
+    (mkWith   false                     "prelude"     null)
+    (mkWith   (optTcp_wrappers != null) "libwrap"     optTcp_wrappers)
+  ];
+
   meta = {
     description = "Audit Library";
     homepage = "http://people.redhat.com/sgrubb/audit/";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ fuuzetsu wkennington ];
   };
 }
diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index 599da9e4b3c..fbb4be53211 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex, audit }:
+{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex, libaudit }:
 stdenv.mkDerivation rec {
 
   name = "libsemanage-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-fstack-protector-all";
   NIX_CFLAGS_LINK = "-lsepol";
 
-  buildInputs = [ libsepol libselinux ustr bzip2 bison flex audit ];
+  buildInputs = [ libsepol libselinux ustr bzip2 bison flex libaudit ];
 
   meta = with stdenv.lib; {
     inherit (libsepol.meta) homepage platforms maintainers;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b55ab8ae927..f68a7cd6137 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9177,7 +9177,13 @@ let
 
   atop = callPackage ../os-specific/linux/atop { };
 
-  audit = callPackage ../os-specific/linux/audit { };
+  audit = callPackage ../os-specific/linux/audit {
+    python = null;
+    go = null;
+  };
+  libaudit = audit.override {
+    prefix = "lib";
+  };
 
   b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { };
 

From 023f0f79922eef4301f95cdd2d25f4de3c018b35 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 28 May 2015 20:30:51 -0700
Subject: [PATCH 0417/2322] ceph: 0.94.1.1 -> 0.94.1.2

---
 pkgs/tools/filesystems/ceph/0.94.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix
index b8d87506b7e..90c23665508 100644
--- a/pkgs/tools/filesystems/ceph/0.94.nix
+++ b/pkgs/tools/filesystems/ceph/0.94.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "0.94.1.1";
+  version = "0.94.1.2";
 
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1qvjj2iqzv2xz5037ksbk7mqjv6gsx2jsprizdzzzij3hnlricp5";
+    sha256 = "0ks5djgfhjpydjdlw7s940m3mlzrvz0xhhk75nqx7sbvymgcc73q";
   };
 
   patches = [ ./fix-pgrefdebugging.patch ];

From d7ebe7a4f3e3d1f4fdd450f8f80a005e6d80e8c5 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 29 May 2015 19:35:31 +0200
Subject: [PATCH 0418/2322] buildRustPackage: Accept `srcs` attribute as well

Add support for building Rust packages that have multiple sources, i.e.,
that use the `srcs` and `sourceRoot` attributes instead of just `src`.
---
 pkgs/build-support/rust/default.nix      | 10 ++++++++--
 pkgs/build-support/rust/fetch-builder.sh | 17 -----------------
 pkgs/build-support/rust/fetchcargo.nix   | 12 ++++++++----
 3 files changed, 16 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/build-support/rust/fetch-builder.sh

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 87115e392da..cd19782e611 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -1,5 +1,11 @@
 { stdenv, cacert, git, rustc, cargo, rustRegistry }:
-{ name, src, depsSha256, buildInputs ? [], cargoUpdateHook ? "", ... } @ args:
+{ name, depsSha256
+, src ? null
+, srcs ? null
+, sourceRoot ? null
+, buildInputs ? []
+, cargoUpdateHook ? ""
+, ... } @ args:
 
 let
   fetchDeps = import ./fetchcargo.nix {
@@ -7,7 +13,7 @@ let
   };
 
   cargoDeps = fetchDeps {
-    inherit name src cargoUpdateHook;
+    inherit name src srcs sourceRoot cargoUpdateHook;
     sha256 = depsSha256;
   };
 
diff --git a/pkgs/build-support/rust/fetch-builder.sh b/pkgs/build-support/rust/fetch-builder.sh
deleted file mode 100644
index faa17e65328..00000000000
--- a/pkgs/build-support/rust/fetch-builder.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-source $stdenv/setup
-
-# cargo-fetch needs to write to Cargo.lock, even to do nothing. We
-# create a fake checkout with symlinks and and editable Cargo.lock.
-mkdir copy
-cd copy
-for f in $(ls $src); do
-  ln -s $src/"$f" .
-done
-rm Cargo.lock
-cp $src/Cargo.lock .
-chmod +w Cargo.lock
-
-$fetcher . $out
-
-cd ..
-rm -rf copy
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 7ebd02a485d..575df64c6b2 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -1,12 +1,16 @@
 { stdenv, cacert, git, rustc, cargo, rustRegistry }:
-{ name ? "cargo-deps", src, sha256, cargoUpdateHook ? "" }:
+{ name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }:
 
 stdenv.mkDerivation {
   name = "${name}-fetch";
   buildInputs = [ rustc cargo git ];
-  builder = ./fetch-builder.sh;
-  fetcher = ./fetch-cargo-deps;
-  inherit src rustRegistry cargoUpdateHook;
+  inherit src srcs sourceRoot rustRegistry cargoUpdateHook;
+
+  phases = "unpackPhase installPhase";
+
+  installPhase = ''
+    ${./fetch-cargo-deps} . "$out"
+  '';
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";

From b59d52daf723d4d99330a05cf7c39fdc0b9fca7d Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 29 May 2015 19:49:28 +0200
Subject: [PATCH 0419/2322] grsecurity: Update stable and test patches

stable: 3.1-3.14.43-201505222221 -> 3.1-3.14.43-201505272112
test:   3.1-4.0.4-201505222222   -> 3.1-4.0.4-201505272113
---
 pkgs/os-specific/linux/kernel/patches.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 9072371d33c..000dfbd21c5 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -66,16 +66,16 @@ rec {
 
   grsecurity_stable = grsecPatch
     { kversion  = "3.14.43";
-      revision  = "201505222221";
+      revision  = "201505272112";
       branch    = "stable";
-      sha256    = "1qmlcp1lg9c56p0fx6ancavxqxpvkh6h8fpxnr2ks35s4wln5y7x";
+      sha256    = "06zwwzrqp59rkv5pi75iskznnlnmc6hsc91dqxymfgd533sbpxp9";
     };
 
   grsecurity_unstable = grsecPatch
     { kversion  = "4.0.4";
-      revision  = "201505222222";
+      revision  = "201505272113";
       branch    = "test";
-      sha256    = "0ampby10y3kr36f7rvzm5fdk9f2gcfmcdgkzf67b5kj78y52ypfz";
+      sha256    = "1aa8qc4g68ybdjc4gb1p0rk1m2bqhj8a5iz6cica6lrr54lda9hx";
     };
 
   grsec_fix_path =

From 2927efe62e02f3a397b105c7c7d7ae77f43d4d01 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 29 May 2015 19:50:09 +0200
Subject: [PATCH 0420/2322] cabextract: update from 1.4 to 1.6

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

diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix
index 79be818bfb3..7a1eec92bbe 100644
--- a/pkgs/tools/archivers/cabextract/default.nix
+++ b/pkgs/tools/archivers/cabextract/default.nix
@@ -1,16 +1,18 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "cabextract-1.4";
+  name = "cabextract-1.6";
 
   src = fetchurl {
     url = "http://www.cabextract.org.uk/${name}.tar.gz";
-    sha256 = "07p49053a727nwnw7vnx1bpj4xqa43cvx8mads2146fpqai8pfpp";
+    sha256 = "1ysmmz25fjghq7mxb2anyyvr1ljxqxzi4piwjhk0sdamcnsn3rnf";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.cabextract.org.uk/;
     description = "Free Software for extracting Microsoft cabinet files";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ pSub ];
   };
 }

From 18bb7a40478c883c539d7e268cf93fe0902899db Mon Sep 17 00:00:00 2001
From: Allen Nelson <ithinkican@gmail.com>
Date: Fri, 29 May 2015 11:02:21 -0700
Subject: [PATCH 0421/2322] fix undefined variable

---
 pkgs/top-level/python-packages.nix                    | 4 ++--
 pkgs/top-level/python-support/numpy-scipy-support.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 38636840b9b..bf5ee48579f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7805,7 +7805,7 @@ let
   numpy = let
     support = import ./python-support/numpy-scipy-support.nix {
       inherit python;
-      atlas = atlasWithLapack;
+      atlas = pkgs.atlasWithLapack;
       pkgName = "numpy";
     };
   in buildPythonPackage ( rec {
@@ -11183,7 +11183,7 @@ let
   scipy = let
     support = import ./python-support/numpy-scipy-support.nix {
       inherit python;
-      atlas = atlasWithLapack;
+      atlas = pkgs.atlasWithLapack;
       pkgName = "numpy";
     };
   in buildPythonPackage rec {
diff --git a/pkgs/top-level/python-support/numpy-scipy-support.nix b/pkgs/top-level/python-support/numpy-scipy-support.nix
index d991a98925a..6cca704dcda 100644
--- a/pkgs/top-level/python-support/numpy-scipy-support.nix
+++ b/pkgs/top-level/python-support/numpy-scipy-support.nix
@@ -16,7 +16,7 @@
 
     _python=${python}/bin/${python.executable}
 
-    # We will "install" into a temp directory, so that we can run the numpy
+    # We will "install" into a temp directory, so that we can run the
     # tests (see below).
     install_dir="$TMPDIR/test_install"
     install_lib="$install_dir/lib/${python.libPrefix}/site-packages"

From ce62e1c77f3896bbf827b38204797f5a72f3c9fa Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Thu, 28 May 2015 10:04:51 -0400
Subject: [PATCH 0422/2322] youtube-dl: refactor

Closes https://github.com/NixOS/nixpkgs/pull/8039.
---
 pkgs/tools/misc/youtube-dl/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 14d6dccb041..5171d5cec5a 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, makeWrapper, python, zip, pandoc, ffmpeg }:
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
   version = "2015.05.20";
@@ -10,7 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "1crfada7vq3d24062wr06sfam66cf14j06wnhg7w5ljzrbynvpll";
   };
 
-  buildInputs = [ python makeWrapper zip pandoc ];
+  nativeBuildInputs = [ pandoc ];
+
+  buildInputs = [ python makeWrapper zip ];
 
   patchPhase = ''
     rm youtube-dl
@@ -20,12 +21,12 @@ stdenv.mkDerivation rec {
     makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python )
   '';
 
+  # Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
   postInstall = ''
-    # ffmpeg is used for post-processing and fixups
     wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://rg3.github.com/youtube-dl/";
     repositories.git = https://github.com/rg3/youtube-dl.git;
     description = "Command-line tool to download videos from YouTube.com and other sites";

From f51d38214d55afae1e14a5e7875824267325f7f7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 11:48:20 -0700
Subject: [PATCH 0423/2322] nixUnstable: Bump

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 479915a9cee..bfa23325b39 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.9pre4100_4bbcfaf";
+  name = "nix-1.9pre4132_07c69aa";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/21565942/download/4/${name}.tar.xz";
-    sha256 = "1jcy0n8mi17k5vk89vammfh74lvsgnm4gjsk23cq1shspjnbbgxs";
+    url = "http://hydra.nixos.org/build/22635534/download/4/${name}.tar.xz";
+    sha256 = "adaf272b50fce0d8aec34b38b5b62cb3438eeb379f918f85f76f43a7314d23d6";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];

From 84208c3d0001c9a3f5d79d7512a2eeec07fd0d47 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 29 May 2015 20:51:33 +0200
Subject: [PATCH 0424/2322] mysql55: update from 5.5.42 to 5.5.43

---
 pkgs/servers/sql/mysql/5.5.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index 778e2f58eb7..8469ae4e948 100644
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mysql-${version}";
-  version = "5.5.42";
+  version = "5.5.43";
 
   src = fetchurl {
     url = "http://mysql.mirrors.pair.com/Downloads/MySQL-5.5/${name}.tar.gz";
-    sha256 = "0jn7py2wsq78rwi7vfihxs6z3h5hr338b9g46fl3z2g4ddki4yw8";
+    sha256 = "1kbl8xp6xi9yclc4q0q97s89rr498mm0avpbkmsa4ff8wmwxzls3";
   };
 
   patches = if stdenv.isCygwin then [

From c8e59a41b0c9b7e775013820d1b15715218bb846 Mon Sep 17 00:00:00 2001
From: "Ryan Scheel (Havvy)" <ryan.havvy@gmail.com>
Date: Fri, 29 May 2015 21:03:05 +0200
Subject: [PATCH 0425/2322] Updated: io.js from v1.6.4 to v.2.1.0

Closes #9707
---
 pkgs/development/web/iojs/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix
index fa9b680f281..b3b9881559d 100644
--- a/pkgs/development/web/iojs/default.nix
+++ b/pkgs/development/web/iojs/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv }:
+{ stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }:
 
 let
-  version = "1.6.4";
+  version = "2.1.0";
   inherit (stdenv.lib) optional maintainers licenses platforms;
 in stdenv.mkDerivation {
   name = "iojs-${version}";
 
   src = fetchurl {
     url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
-    sha256 = "1qzvf7g457dppzxn23wppjcm09vh1n6bhsvz5szhwgjvl0iv2pc7";
+    sha256 = "0v6jzsrq3ym0nqy7nb9chn8ij79agifwdvsp5nysgr609na7617i";
   };
 
   prePatch = ''
@@ -17,7 +17,11 @@ in stdenv.mkDerivation {
 
   configureFlags = [ "--shared-openssl" "--shared-http-parser" "--shared-zlib" "--shared-libuv" ];
 
-  buildInputs = [ python openssl http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux);
+  # iojs has --enable-static but no --disable-static. Automatically adding --disable-static
+  # causes configure to fail, so don't add --disable-static.
+  dontDisableStatic = true;
+
+  buildInputs = [ python openssl_1_0_2 http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux);
   setupHook = ../nodejs/setup-hook.sh;
 
   passthru.interpreterName = "iojs";

From 5273166f533a1050faee7f5301c8abb3a1982355 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 29 May 2015 15:16:40 -0400
Subject: [PATCH 0426/2322] Disable failing DBIxClass tests

Seems to be random
---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 94a00863740..6a007242487 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2565,6 +2565,7 @@ let self = _self // overrides; _self = with self; {
     };
     buildInputs = [ DBDSQLite PackageStash TestDeep TestException TestWarn ];
     propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ];
+    doCheck = false;
     meta = {
       homepage = http://www.dbix-class.org/;
       description = "Extensible and flexible object <-> relational mapper";

From fd1fb0403c406d1c3aca07735bb247e0643bdb0d Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 29 May 2015 19:36:16 +0000
Subject: [PATCH 0427/2322] Set boot.loader.grub.configurationLimit to 1 for
 gce/azure/amazon images. Setting to 0 results in empty grub config.

---
 nixos/modules/virtualisation/amazon-image.nix         | 2 +-
 nixos/modules/virtualisation/azure-common.nix         | 2 +-
 nixos/modules/virtualisation/google-compute-image.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 600a29f31bc..dc92e4f609f 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -170,7 +170,7 @@ in
 
     # Don't put old configurations in the GRUB menu.  The user has no
     # way to select them anyway.
-    boot.loader.grub.configurationLimit = 0;
+    boot.loader.grub.configurationLimit = 1;
 
     # Allow root logins only using the SSH key that the user specified
     # at instance creation time.
diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix
index 47022c6887c..a6368eb2c62 100644
--- a/nixos/modules/virtualisation/azure-common.nix
+++ b/nixos/modules/virtualisation/azure-common.nix
@@ -14,7 +14,7 @@ with lib;
 
   # Don't put old configurations in the GRUB menu.  The user has no
   # way to select them anyway.
-  boot.loader.grub.configurationLimit = 0;
+  boot.loader.grub.configurationLimit = 1;
 
   fileSystems."/".device = "/dev/disk/by-label/nixos";
 
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index ee5485071a3..eea6c646d48 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -106,7 +106,7 @@ in
 
   # Don't put old configurations in the GRUB menu.  The user has no
   # way to select them anyway.
-  boot.loader.grub.configurationLimit = 0;
+  boot.loader.grub.configurationLimit = 1;
 
   # Allow root logins only using the SSH key that the user specified
   # at instance creation time.

From 1badfabc4ddb6b487005cf4a8447b5d1111cd72c Mon Sep 17 00:00:00 2001
From: Russell O'Connor <oconnorr@google.com>
Date: Mon, 9 Mar 2015 18:28:34 +0000
Subject: [PATCH 0428/2322] Use mktemp to create temporary files to hold ssh
 host keys and authorized keys when downloading them from the metadata server.

---
 .../virtualisation/google-compute-image.nix   | 51 +++++++++++--------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index eea6c646d48..25bdd9569de 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -143,34 +143,41 @@ in
           umask 077
           # Don't download the SSH key if it has already been downloaded
           if ! [ -e /root/.ssh/authorized_keys ]; then
-                echo "obtaining SSH key..."
-                mkdir -m 0700 -p /root/.ssh
-                ${wget} -O /root/authorized-keys-metadata http://metadata.google.internal/0.1/meta-data/authorized-keys
-                if [ $? -eq 0 -a -e /root/authorized-keys-metadata ]; then
-                    cat /root/authorized-keys-metadata | cut -d: -f2- > /root/key.pub
-                    if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
-                        cat /root/key.pub >> /root/.ssh/authorized_keys
-                        echo "new key added to authorized_keys"
-                    fi
-                    chmod 600 /root/.ssh/authorized_keys
+              echo "obtaining SSH key..."
+              mkdir -m 0700 -p /root/.ssh
+              AUTH_KEYS=$(mktemp) && {
+                ${wget} -O $AUTH_KEYS http://metadata.google.internal/0.1/meta-data/authorized-keys
+                if [ $? -eq 0 -a -e $AUTH_KEYS ]; then
+                    KEY_PUB=$(mktemp) && {
+                      cat $AUTH_KEYS | cut -d: -f2- > $KEY_PUB
+                      if ! grep -q -f $KEY_PUB /root/.ssh/authorized_keys; then
+                          cat $KEY_PUB >> /root/.ssh/authorized_keys
+                          echo "new key added to authorized_keys"
+                      fi
+                      chmod 600 /root/.ssh/authorized_keys
+                      rm -f $KEY_PUB
+                    }
                 fi
-                rm -f /root/key.pub /root/authorized-keys-metadata
+                rm -f $AUTH_KEYS
+              }
           fi
 
           countKeys=0
           ${flip concatMapStrings config.services.openssh.hostKeys (k :
             let kName = baseNameOf k.path; in ''
-              echo "trying to obtain SSH private host key ${kName}"
-              ${wget} -O /root/${kName} http://metadata.google.internal/0.1/meta-data/attributes/${kName} && :
-              if [ $? -eq 0 -a -e /root/${kName} ]; then
-                  countKeys=$((countKeys+1))
-                  mv -f /root/${kName} ${k.path}
-                  echo "downloaded ${k.path}"
-                  chmod 600 ${k.path}
-                  ${config.programs.ssh.package}/bin/ssh-keygen -y -f ${k.path} > ${k.path}.pub
-                  chmod 644 ${k.path}.pub
-              fi
-              rm -f /root/${kName}
+              PRIV_KEY=$(mktemp) && {
+                echo "trying to obtain SSH private host key ${kName}"
+                ${wget} -O $PRIV_KEY http://metadata.google.internal/0.1/meta-data/attributes/${kName} && :
+                if [ $? -eq 0 -a -e $PRIV_KEY ]; then
+                    countKeys=$((countKeys+1))
+                    mv -f $PRIV_KEY ${k.path}
+                    echo "downloaded ${k.path}"
+                    chmod 600 ${k.path}
+                    ${config.programs.ssh.package}/bin/ssh-keygen -y -f ${k.path} > ${k.path}.pub
+                    chmod 644 ${k.path}.pub
+                fi
+                rm -f $PRIV_KEY
+              }
             ''
           )}
 

From 4744e3541ad2308625afd1d0ac53329efd947e6a Mon Sep 17 00:00:00 2001
From: Russell O'Connor <oconnorr@google.com>
Date: Mon, 23 Mar 2015 21:45:40 +0000
Subject: [PATCH 0429/2322] [GCE] Put temp files for fetch-ssh-keys service in
 /run

---
 nixos/modules/virtualisation/google-compute-image.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 25bdd9569de..cdcd7e5a126 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -137,7 +137,8 @@ in
       after = [ "network-online.target" "ip-up.target" ];
       wants = [ "network-online.target" "ip-up.target" ];
 
-      script = let wget = "${pkgs.wget}/bin/wget --retry-connrefused -t 15 --waitretry=10 --header='Metadata-Flavor: Google'"; in
+      script = let wget = "${pkgs.wget}/bin/wget --retry-connrefused -t 15 --waitretry=10 --header='Metadata-Flavor: Google'";
+                   mktemp = "mktemp --tmpdir=/run"; in
         ''
           # When dealing with cryptographic keys, we want to keep things private.
           umask 077
@@ -145,10 +146,10 @@ in
           if ! [ -e /root/.ssh/authorized_keys ]; then
               echo "obtaining SSH key..."
               mkdir -m 0700 -p /root/.ssh
-              AUTH_KEYS=$(mktemp) && {
+              AUTH_KEYS=$(${mktemp}) && {
                 ${wget} -O $AUTH_KEYS http://metadata.google.internal/0.1/meta-data/authorized-keys
                 if [ $? -eq 0 -a -e $AUTH_KEYS ]; then
-                    KEY_PUB=$(mktemp) && {
+                    KEY_PUB=$(${mktemp}) && {
                       cat $AUTH_KEYS | cut -d: -f2- > $KEY_PUB
                       if ! grep -q -f $KEY_PUB /root/.ssh/authorized_keys; then
                           cat $KEY_PUB >> /root/.ssh/authorized_keys
@@ -165,7 +166,7 @@ in
           countKeys=0
           ${flip concatMapStrings config.services.openssh.hostKeys (k :
             let kName = baseNameOf k.path; in ''
-              PRIV_KEY=$(mktemp) && {
+              PRIV_KEY=$(${mktemp}) && {
                 echo "trying to obtain SSH private host key ${kName}"
                 ${wget} -O $PRIV_KEY http://metadata.google.internal/0.1/meta-data/attributes/${kName} && :
                 if [ $? -eq 0 -a -e $PRIV_KEY ]; then

From 29b7d76ec81b1ba6536d72415a853ff596d7b6b2 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <oconnorr@google.com>
Date: Tue, 28 Apr 2015 21:28:16 +0000
Subject: [PATCH 0430/2322] Remove use of && in fetch-ssh-keys service. Scripts
 are run with -e so will abort when a command fails.

---
 .../virtualisation/google-compute-image.nix   | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index cdcd7e5a126..fcc71773dea 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -143,42 +143,44 @@ in
           # When dealing with cryptographic keys, we want to keep things private.
           umask 077
           # Don't download the SSH key if it has already been downloaded
-          if ! [ -e /root/.ssh/authorized_keys ]; then
+          if ! [ -s /root/.ssh/authorized_keys ]; then
               echo "obtaining SSH key..."
               mkdir -m 0700 -p /root/.ssh
-              AUTH_KEYS=$(${mktemp}) && {
-                ${wget} -O $AUTH_KEYS http://metadata.google.internal/0.1/meta-data/authorized-keys
-                if [ $? -eq 0 -a -e $AUTH_KEYS ]; then
-                    KEY_PUB=$(${mktemp}) && {
-                      cat $AUTH_KEYS | cut -d: -f2- > $KEY_PUB
-                      if ! grep -q -f $KEY_PUB /root/.ssh/authorized_keys; then
-                          cat $KEY_PUB >> /root/.ssh/authorized_keys
-                          echo "new key added to authorized_keys"
-                      fi
-                      chmod 600 /root/.ssh/authorized_keys
-                      rm -f $KEY_PUB
-                    }
-                fi
-                rm -f $AUTH_KEYS
-              }
+              AUTH_KEYS=$(${mktemp})
+              ${wget} -O $AUTH_KEYS http://metadata.google.internal/0.1/meta-data/authorized-keys
+              if [ -s $AUTH_KEYS ]; then
+                  KEY_PUB=$(${mktemp})
+                  cat $AUTH_KEYS | cut -d: -f2- > $KEY_PUB
+                  if ! grep -q -f $KEY_PUB /root/.ssh/authorized_keys; then
+                      cat $KEY_PUB >> /root/.ssh/authorized_keys
+                      echo "New key added to authorized_keys."
+                  fi
+                  chmod 600 /root/.ssh/authorized_keys
+                  rm -f $KEY_PUB
+              else
+                  echo "Downloading http://metadata.google.internal/0.1/meta-data/authorized-keys failed."
+                  false
+              fi
+              rm -f $AUTH_KEYS
           fi
 
           countKeys=0
           ${flip concatMapStrings config.services.openssh.hostKeys (k :
             let kName = baseNameOf k.path; in ''
-              PRIV_KEY=$(${mktemp}) && {
-                echo "trying to obtain SSH private host key ${kName}"
-                ${wget} -O $PRIV_KEY http://metadata.google.internal/0.1/meta-data/attributes/${kName} && :
-                if [ $? -eq 0 -a -e $PRIV_KEY ]; then
-                    countKeys=$((countKeys+1))
-                    mv -f $PRIV_KEY ${k.path}
-                    echo "downloaded ${k.path}"
-                    chmod 600 ${k.path}
-                    ${config.programs.ssh.package}/bin/ssh-keygen -y -f ${k.path} > ${k.path}.pub
-                    chmod 644 ${k.path}.pub
-                fi
-                rm -f $PRIV_KEY
-              }
+              PRIV_KEY=$(${mktemp})
+              echo "trying to obtain SSH private host key ${kName}"
+              ${wget} -O $PRIV_KEY http://metadata.google.internal/0.1/meta-data/attributes/${kName} && :
+              if [ $? -eq 0 -a -s $PRIV_KEY ]; then
+                  countKeys=$((countKeys+1))
+                  mv -f $PRIV_KEY ${k.path}
+                  echo "Downloaded ${k.path}"
+                  chmod 600 ${k.path}
+                  ${config.programs.ssh.package}/bin/ssh-keygen -y -f ${k.path} > ${k.path}.pub
+                  chmod 644 ${k.path}.pub
+              else
+                  echo "Downloading http://metadata.google.internal/0.1/meta-data/attributes/${kName} failed."
+              fi
+              rm -f $PRIV_KEY
             ''
           )}
 

From c9f5b8a2eecfb1fb11cfe0d2eab68b47f0502eb5 Mon Sep 17 00:00:00 2001
From: Siarhei Zirukin <ftrvxmtrx@gmail.com>
Date: Fri, 29 May 2015 21:55:53 +0200
Subject: [PATCH 0431/2322] chuck: 1.3.5.0 -> 1.3.5.1

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

diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix
index bbce758be8a..04cc8008ea8 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.0";
+  version = "1.3.5.1";
   name = "chuck-${version}";
 
   src = fetchurl {
     url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz";
-    sha256 = "0rj2l5k6ncm4jaiq0igwfc2bzryzchk1is1jhk1n7wifxcf3d3k5";
+    sha256 = "0lqzkphfd91kz95nf1wqy0z17r1m70c8inwvnb9fscbiaihwlhfi";
   };
 
   buildInputs = [ bison flex libsndfile which ]

From 8a965946cb9f9c8288da985050853aa715a9ca97 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Fri, 29 May 2015 15:16:12 -0500
Subject: [PATCH 0432/2322] switched to atlas as a dependency for liblapack by
 default

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1da4a9803e5..cc689f6177d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13819,7 +13819,7 @@ let
     # great feature, but it's of limited use with pre-built binaries
     # coming from a central build farm.
     tolerateCpuTimingInaccuracy = true;
-    liblapack = liblapack_3_5_0;
+    liblapack = liblapack_3_5_0WithoutAtlas;
     withLapack = false;
   };
 
@@ -13835,13 +13835,17 @@ let
 
   jags = callPackage ../applications/science/math/jags { };
 
-  liblapack = callPackage ../development/libraries/science/math/liblapack { 
-    atlas = null;
-  };
 
-  liblapackWithAtlas = liblapack.override { inherit atlas; };
-
-  liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix { };
+  # We have essentially 4 permutations of liblapack: version 3.4.1 or 3.5.0,
+  # and with or without atlas as a dependency. The default `liblapack` is 3.4.1
+  # with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0
+  # without atlas. Etc.
+  liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {};
+  liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; };
+  liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {};
+  liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; };
+  liblapack = liblapackWithAtlas;
+  liblapack_3_5_0 = liblapack_3_5_0WithAtlas;
 
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 

From e928a5379f4cefdaba455b16a2b9dfce03ee1e79 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 29 May 2015 20:55:59 +0200
Subject: [PATCH 0433/2322] ncdu: update from 1.10 to 1.11

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

diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix
index ff751eb40da..6ea9d71bddc 100644
--- a/pkgs/tools/misc/ncdu/default.nix
+++ b/pkgs/tools/misc/ncdu/default.nix
@@ -2,19 +2,20 @@
 
 stdenv.mkDerivation rec {
   name = "ncdu-${version}";
-  version = "1.10";
+  version = "1.11";
 
   src = fetchurl {
     url = "http://dev.yorhel.nl/download/${name}.tar.gz";
-    sha256 = "0rqc5wpqcbfqpcwxgh3jxwa0yw2py0hv0acpsf0a9g6v9144m6gm";
+    sha256 = "0yxv87hpal05p6nii6rlnai5a8958689l9vz020w4qvlwiragbnh";
   };
 
   buildInputs = [ ncurses ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Ncurses disk usage analyzer";
     homepage = http://dev.yorhel.nl/ncdu;
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ pSub ];
   };
 }

From c0a5ffc438b70598c868787723f55257032113f3 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 29 May 2015 22:16:08 +0200
Subject: [PATCH 0434/2322] wireshark: update from 1.12.4 to 1.12.5, fixes
 CVE-2015-3808

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

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index f3215e7befd..ac2d11a33f1 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -10,7 +10,7 @@ assert withQt -> !withGtk && qt4 != null;
 with stdenv.lib;
 
 let
-  version = "1.12.4";
+  version = "1.12.5";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 in
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.wireshark.org/download/src/wireshark-${version}.tar.bz2";
-    sha256 = "04n3xfakg6368ba49vj6n3csqnkzipac4sldsaavgr2jwac4x06y";
+    sha256 = "10mxgj916bwv92pfhk4kldcaanr9vndjklzp9ypdxr29xyr7gwfh";
   };
 
   buildInputs = [

From d4f3930201895534ccaa9ce4c5411ffb3da9fc51 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 12:01:50 -0700
Subject: [PATCH 0435/2322] nixos/grub: Fix defaultConfig

---
 nixos/modules/system/boot/loader/grub/grub.nix        | 2 +-
 nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index c790e05f51b..1fb2e20949a 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -354,7 +354,7 @@ in
         export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])}
         ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"}
       '' + flip concatMapStrings cfg.mirroredBoots (args: ''
-        ${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig args}
+        ${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig args} $@
       ''));
 
       system.build.grub = grub;
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index a0384d23f82..3ca30b58023 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -11,7 +11,7 @@ require List::Compare;
 use POSIX;
 use Cwd;
 
-my $defaultConfig = $ARGV[0] or die;
+my $defaultConfig = $ARGV[1] or die;
 
 my $dom = XML::LibXML->load_xml(location => $ARGV[0]);
 

From 159fed47bcfab67d36d4959fb3ac952a7ad9128c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 12:09:08 -0700
Subject: [PATCH 0436/2322] nixos/grub: Fix video display on efi

---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 3ca30b58023..fcf5871203d 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -254,10 +254,15 @@ else {
           set timeout=$timeout
         fi
 
+        # Setup the graphics stack for bios and efi systems
+        insmod vbe
+        insmod efi_gop
+        insmod efi_uga
+        insmod font
         if loadfont " . $grubBoot->path . "/grub/fonts/unicode.pf2; then
-          set gfxmode=640x480
           insmod gfxterm
-          insmod vbe
+          set gfxmode=auto
+          set gfxpayload=keep
           terminal_output gfxterm
         fi
     ";

From 1e98da6d992522ae26bc37bb670b09805f44b762 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 12:14:05 -0700
Subject: [PATCH 0437/2322] nixos/grub: Use nixos artwork

---
 nixos/modules/system/boot/loader/grub/grub.nix  |   2 +-
 .../loader/grub/winkler-gnu-blue-640x480.png    | Bin 74487 -> 0 bytes
 .../boot/loader/grub/winkler-gnu-blue.README    |   6 ------
 3 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 nixos/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png
 delete mode 100644 nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 1fb2e20949a..22af11b484e 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -337,7 +337,7 @@ in
           sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
         }
         # GRUB 1.97 doesn't support gzipped XPMs.
-        else ./winkler-gnu-blue-640x480.png);
+        else "${pkgs.nixos-artwork}/gnome/Gnome_Dark.png");
     }
 
     (mkIf cfg.enable {
diff --git a/nixos/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png b/nixos/modules/system/boot/loader/grub/winkler-gnu-blue-640x480.png
deleted file mode 100644
index 35bbb57b51ee147cb3dc32747ee31d7fb3cba3bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 74487
zcmeAS@N?(olHy`uVBq!ia0y~yU}|7sV0^&A#=yW}dhyN^1_lPk;vjb?hIQv;UNSH+
zuqAoByD<C*!3BGlPiA0X;4JWnEM{Qf76xHPhFNnY7#JAXOFVsD*>7_5@>xqn%7?sX
zU{GN2ba4!+xb<dl^dyy&7uTeVUA=pt{={Kl89}>3)jLe#hsF05iN|n%cTj9)spBzd
zKKSL1zHM`moy(5fN6*?St<K)HiQ($RN$XDa^hAd(vYWAU)yw~X_WxNgAQ*TzC0O*P
zOGrq`Z5NlNw(3kbx3LF?3I+yFeOxUVcy~LaOK88o<u>bWf>U#|?{B}p;=o=ufxuRd
z5SP2#l72I7_`l`pb5}We`N!I~>=OF7Uf<3x-@lqgp})WXuPH-cu3|&igFpt$a~}hr
z2r}I~zx=Oy#(LpKn=U)2Z_{rjzqPqtruA0h`1QwyaTRZl-(P=vo1o39eK!}|*mY^h
z{m%aO_y6VG;+Syjy!+=DKe(}8=67w)pXY`C3ZH&x+^_km{`2(zuk~I_|G%yOZ~tWf
z-~RuX>+Y5nug?E%y1n}LyUOa9i*35(_Gf>z{jmGp`mX#HC+hf1>g)c;UHh#S&;R}J
zkE+JGKda*3nZBFy@O^L09{+!Ta=ZV2zo>oZ`|9_N`=6Jco$*FnwxDqS^Y!P~-|Q;h
zIQ__Lne(hqOV8G&w-w*4kAC#KGAHkO^UrDy>-L9syRWaWm*4oKR<3@<dg0gKYku9_
z^<$^#m)|8{zpK2veSi7U_sxGkKf8b2y>iOh{cPRm*Z!}a@z-wApZgPjM6P`wc}HAr
z{_StSKGr)wvP`yk|FK^9*ysM|FaK{Z`e!ZjZt@zt?f*>w)o1J1ybJ%XS@Z7m`-I*8
zpRfPsPv0Z<{r86%?|QH7=Z}h0Z~NVT`uob-{~G=MQTzNa)yd0+Dtx}*{;OX8???Ie
z`|AJqNB`SA_5J5(6+R0Djxy%{ZGNq|A-6|X=<AK#-`^Ybnk}0Te&~L5Zw1?ww=&<}
zKmPw=``;gb!*6ZVtvUO@p?B4{+v^@H_z5;zyT81?^uiYT^7}^^4g0KDS$)X0tFsaJ
z?LS(*N9@qwoc$s1WUaR~R`-AZ{^D-^AO6dG|2?1oKYyV{*CLHqrCFZ^mTd~ZcR{=4
z(tasx^9L_gW<OXzaVfj7gSBt<gx9~{{9pgP!MXRtbW6V6_{0Cp`%3oY-ma4|Es^^#
zZz1#{vB95t$+!PZCUUW=g4-H5+TX7@#?JEYiR`!3=NGh={QRXXv5mdfRkVnyeb(yL
zKQ&Lt|359mVE_C4|LODPx)y14Rjp;naA;$axZ-%?S=2r@?}7!7GF*zTa$Z>YYkTuT
z52dqpbKYh+KR5cUHoJMd6k~h#&24-$!<Jr2jt_E5XbIh_wP4HZ3l%3{-dpIX@?}SQ
zm>`eCilddsqeUOQyHS{NF#P@O^jAD>zxUt%urHH6XllFp`(^tr>VJOzuguS%|ATXp
zM%SVh*Et%(o)%?)=rdck{*L69(6{m7vTw3k9^RV5CeEhxyY2zQG2Lv-1*+><Z*J37
z;7fVUu>9qI#$yj0E-=RJmRsVLz@Yb0V5>a;I^TWwyYDP>Ti>_s`Cr#nyN{Q-PI{M|
zwYUAbaE|%39Nl|$b#LFL1j*h$E5{KU`r(H~F7yAd`t_6A+u7@yz|mpK^x(&YUwtnb
ziwiez{JT2QFf&^HIpeDQ`_a3s%T{JE7%|()Ui;Vk{HBlKC0^luS~p%#cK^!j=9yQ!
z$T4Ac&abbfyd721yJL-Ib{tw&kvMl=bM(a<*Uk!<y-nrTTlf95s`K@@{P%NLS!>Jo
zU3a)5&(!eeq5Z$?$}RhAzo~~YXo8Z&R;C1#M3>2qdF^Q#pWfc*@Vj@XF~sxozBInn
z*Wv7oT}<3_l0^6ZosstI2H&!~PO2N`X6h^KDs8L%KVeZ<_{<Q6O}R;|W?O%=`o8A4
zx^RVY^OI!uWY2Zaj&dc|^()=++|j@7-K8_?eRugE+_gFF_2!cEy}ujT4&1N%9cowe
zW9EDXaI)xSxKVjxYhvi)yE`^jJ^!};NcydLIrmTIt#jxv`k2Q3!?ga~S}9-EYkYB`
zM{i}D-*oxXku`IM`JSCed*r3o{$yfb6Xy9Qkcab4l(a=z>{ZL=x3g|%+vv=m$b9&7
z!JGEF$X8L%XPtR3x9I!vlB~rS#d4JM|Npq}|Neda|4-`B*eGR6C^>p8>vjgu%g{}m
zzpeM^@cEd{8~v3(&o-ug^Wm?zc!aB~!wyB+oEAQ_QJ3}1g4h?$8Sg9dg>EmIbxl>t
zVZC{8g~8<uN#CCFrXP55#B?3=oDVZ&XBoTq+ur^*!79UBe~L(M@YZ?1&*#2<Ahzx?
zKR3gl+wuSHq1Kx+EePYg;-_+QhJxOrrH<}QD)W1<Gj0mqEwH+N-_g}Vi@ifaOhPy9
z;Y{IQ=9b|t-6MJB==CQOGj=g86T1B<ZH<M(_QO~6*e<ec4wc@qv4A~V^1AJ@?+0e5
zZ+lpIT6)WOZ&T;Fh4FdI%QvrIvaO)P^vT`&HChezacg3ifD>aLV*yLsoxVGZwjU65
z&HMkYD}L(z>oOa4vkkUbJ-qhjsE<R(6vqq8e;zkFG{LLI#i5NubbncZ>GssMzC4+)
z*`jY-N&D->Etlo#T<t7#=HemVes%Uz)=t4c7d|s+t8ZXTT)l1Asr05B-)5E9|5$%{
z_phV(|Hb&FKnf;Nh6LtSceZ_<Fws4(_wD^g7Uy?!wsp;3by{%B20s5;(&A}+GY{UI
zr@f<7-uO!Me1DdMJIo3hf-K$kD;|)sS@G@Ky4~q|vjXmZ{<tkH&{S#R9I<7KuIRq6
zvp?#b`uqB_sucANQ<YC|_kF}7A$s@Kj_LdBzNuH<c)_v^R3L<NHn4G>y>Q{ycD4xH
zymiyhzq+$4>}7VSYWBll1@@e;|A_3{wLQ{eOHZ3fvFdh@{Sh~#dh1_{>UmC7-{-3v
zw)D%+wrAhI9@+Bs^(TQB@7>pL`?}`9Vojd?`#zjtKJ$4ZtKz?-?w3uJJ(#n7u8CJI
zF39&<+}phQyGYVS>wmSZa?AZ5fb!$b8LS?GBCdh!`5BTUiXGUGyNPY+IoBjHXJ_?N
zep!_ZE4lN|%$XgeXr`KMe@*O>*B_Q{p4oLav8(_6Twf8#Y4Llj!nUSH#b3vm)8{R|
z-Mp|dSyy4sLe;g~Uw>b;mh(!0ppK|g5!bHI6P}An{krh#4U3%n$4t&s+oVK-l~2Um
zCrg;P28y`u^<p@4;CiE~wVU(z0-4)pmpb~pGAA3~^0~_#GUxF%QTFzasYM}&cv^Tu
zw)yt+94KtdUw7o^N~O0vw;t#E%niM-5_<p6u3aH_OL&8m*Ir;d_F}^Yi}}jWKK#r|
zxt*BEGLfh79%l}FwEI&D`D3q^&Ap(*_3Y#P{U^`c|3Bd`2zG%R!<X!@tIX0kJi|)k
z1bWzb|KHknKTa^@;@cVAH6j12R+PjCl`}-HFnA^SXik{Ys*Te^?{QtY%;A`OY=f_5
zXK~Tu#XA`1$BREdeqtx5qE>UHD^tSGu-x+dudX~uoEpGC-}K<m3(vXEGz;I@-cu`W
z<9g6UBQBNk-`mahpMzb%QNYVkoqaKMm(q_MMv+@DwyyfCosoUhX1+q`|8K3?8-G1N
zpmqFUNi)|YpS#Q{W(Oy}y1pvqxXJ`&rnD0N-P5#k*z(wIu5;bH{&Ht=gRj;}QR4`y
zVw1@kYtG%=wOiuI9rvqC&9)qTAl9+I<=CRN)>e&w&ph7tRV?c6ze>T#bjG@41{vT&
zv6SIP`T@BUmlBuGVwuE|c<tZUtM-j&kMJ%&;q;aNoX#S}<LjG43eIf{EwOU&ox^4`
zU*wW@(udy{4Y-ajD74<T{aRteE|Jqhen*_6nfHjfyuGzAc}1zQ^YIOHFFrPkn=f{K
z9%E39$eA3@B;~s^IhQa#I91^c^8OWBrUaH&k#lPbr>)EX`0HC%ou7=Hsk=VI#dEe|
ztir2`3Iq)cyYd>Or|SBi3~0>RE4Aa~oJ^a9qp6j%Q@^n$9A#{ty`@Zd!QWdZYg<F=
z|5;v%T)gwpt^Fsb+BD4F^|hnJFVX%N?^NN4c23Q(nP)D{d|3Ct>ihBkd3+7^e=iGc
z^94KNF7tz&zw;%0c1$bitAF`_*Ejtmd$+y)+>sM_(M0d8q?X8{2^N#i>V8>$=YW!{
z*!&|bdv~O5G>%nUn!xrk*zZk6L7LENyKj{;d)M|P+NShXO|%HI*jjkCY{fpS-C9?V
zUZ4I^pKCi?q0ODT{*oE?Yj*i=X0ZSN=6p{Rs6<+Eovq>NiinM-x%<A(IzIPi*`r(g
zllUGcKg)MEvcJm2S#za%V)jh4&z+XF#XM&g{pGlEMd)sob!m0MhpjhFBc|%kc2JSI
zJwdzGQTbp*!<joN;p`_iw!VF+!?byS`QeIbTlmA5ii+>Co#FXrm%-lNZk+@B|9Q%p
zF)4s^fEGhcuVl8vv(6=Qe;(f6UoDnkT))ENGy5XW<P$$$Z*J0+xpnTOq+867LgT6@
z>*tBcI!)naDlNY3X4bssjGIR`qwSh^e9sqede)bHvs3bgK$?<wp0oLnl8@#e?eZVm
za<z$Ff7R>vpm167KRdUB8BGuO9{ZU$mGwv4We0Fo5XzWvHH3#RKK<2-NAWxvF~7~N
z{r_rgm8&&6#Bpc8S?=1#3)d8%M(ms+vo87XsqMwzS1R^anKwHqoITuXSrj{4vWYQb
z=?v93w+~$F^9|I$<g`BaE3f9Xqj!&KT~ghf?5)0G%1gtepZ{*v<9fEi={$o#fB&b;
z{q`RwLvkM{gX)%y^pA?{Zxe+6y$OHNx-ny&R%@ZItU%*s<{9SJ9sD-$IM2>oCUZ_M
zUU1hP6aI~va=%$7K7M|-H==mq#kxtJYxdmSS9+1{Tsha|(i*$P=N0^!=lo2_36*U$
z*)Ps1b+|G-FG=Jz5C4hU@9nLEErA9iu7M(7cQITD@}Ka)kNJy9w43PPMR{%;nC>#(
z?&074+I)9-X#r!p#F^*G>-etA*`AYC4Y~Qtv3ct^rT1oXo0&{yvhzLJ(>F;4Y`u9h
zRC-4!^TSQ7t9AAth&dedC?{X?;l()z8Y^YLBwDOv%#UGS;ad3Nt`hf$_w(zI`3r&L
zT#aFi{pYZ?uSE@fT>{QNc{|ne%eVE59D8~KZpQ9-+_5Qv$+7HMn=bFPJ2DAJJ{(#Y
zzDjeNt6{wK^<KqWe@<xjEsOmh*vm8b;bPvNWZfkq%J;80u9bgzjd|t7H2%ZkGTRSv
z1X(wJ=CFOc?A7W(gWdP^7A5Ta@kjrU3OKW6GaWEG^5e(7>sPllvFwPLu{i44@+(qH
zp1wJ7k>!!>>cquUTr(7}{(j8(=a}O`<_&M}yC2wk_(_J8rPY0@<D0(n9NK1P6necz
zx?)9&QkcP9MU{1TPn-I-WW~)q7<<jp{rdWOE(d?)-WJaPZ?K-B?kB5u131K2F&Hql
zs4QQbJ=w|c*48l1&u%R98?WEp+@W`K$28yA*H`DRXx^FI?UD61$eeviWAe?kyF4s`
zTSJnww>!>jcbLudXnW~(AtRyB5!RgR9$!<tuU+kNvsS9DwCAJ#!!x>HDmkY537T0o
zJ<IcvT)laf7C(RS^7r@c|F6zLWb>mnkrOTEt!+{H!ti|G-0c5J9bq5Wg?qd)%D(wY
z_VA48tpY3G?(UD+yuS8-w6lytV{r4eXUC2f$jyD+ki;Ul#)I=sr9ovxtnrKv7w7Ko
zYQeik?Kf?`+W4ZKck+H;TEvvxad#r8%(0zE%HAJ!{Iz&b<@fk3hCh$=d78nEkLxTA
zY$5AJXMg%{;uyKksdd}>?rzEJD^!oK-|=HApJQ6ehjn-UM8yl{^gS{Qm&n!X+>sSN
z|9y6Wa_y}X*CfxU3IE>O^|mTuJ*TL*>@{|?RnCUl*V#IMOxrShaSX?=mhy6j_d9fg
zR%<B*eZ1<cG;=NUpGTk1OR#~<*!7$YYi%WV9^9^QRd*w|WaEShf*F0c_Dnm=s=57Z
z=?(1^-nqBx78tUrF-^@sZ>Di4<+fbk`nB~(Cp;Eokhpu`-pt!hi;`I{w0g-OSk)zR
z^^%Wtq3j~Dg*Uh5OP7hy-(Ig+cK>u)dFV~y*_?aYL$dd~vt7vx+GL&D^0AE9Z9Cr{
zfthXx_xwLDzR9*g&H$VXlo(_bT^A^?N%`>U?R_?(gMX#JUtAs2XZyy`_KX-?_~w=3
zYm2t?|BN_${Hw$6^@}%GNbUFU$(D;fdNJHx`by^dS34Ix-?mrTC}F;lkyT%B?_Vp2
z!q*J0dxOOjbr-T1G;gh0*Dc*-bvkhF$K_RjZ<iOVe<;6Sci3MTY`YqR%;PAjMJE}X
zSyjq%CMdJAX|mjUdwA`)%@unWU!5IwPRmLv$SH4b%SyS;k;lGC^l{%^^UUmtfLXBD
z8BLyNQ%pV{F%k-Xy1rrU$40Z*C6b|98EXx~yfo%XI=Lj7E#Q+pKaE*~d)m9mhWa1+
zm*bc0H|A;sbxGsI8PaBCI9zdB)IM#6#qx~k|I?V-mETqFvXI#v-JN6^wPDe^U(^4s
zJrEqqa{J*W(eA*T;_tprD=uCh_4Lz?9XU&rG8nsM3Z#1!5)Z8py(g1dntZHnv1&J8
z^4v=P=FU@Mt7hK2A}G7_r=8n|)7he1*N30^JnwbRp^xQ?Vea9P4baRG&eAY1Tj!9=
zojJEnq|P!2B+t9{iO0C^>hT|6FT9Zbw<LV-173B@<2#G*?vN93kN$pff5q)5FL;-q
zw((JZ7bE+1r&nBweaox(?Dt*0Q$GJ}T*xb<=hiH)Ea7r!g}LW(K4)hgKD8(6dUFmW
z&VRhaUY_-_o7!#bnl;^Da-VMR&Qypmkm3NxgB%0T+nY8smH$3DJgeF+;j!!0kfWb|
z7FlOFCe?V&mRb}PB5}0$ukYIk`PYm7maf#7vGDkPL?BRBdD`7Q5BsvaI3n`yOE_$N
z<u2{9_2v=d<_^~E?Z4YjRu?o^xt7>g-{|YlYx_9yj@*Or&kg_o{Y+Qq<_GnKyLL%4
z$T%>pG>vYx-@UX}OKMSkRHVS9YZrIcJZCGoaMnkW^TQVAz@DO)?f14ZMs0SEbP76s
zW6HPnr}>`W>EruomULa{tl_#vD=xAmUw^-<_udV`d+lqFe{9*aU*yG{xd)!v7fLqi
zeN($Lzhv%D6|HH}t+w?)kEScmY6m5P71nGAa>Op=1xOs<|I;hZ*!PXSw9S^V7Z)yx
zoW62<{{6mHv)C$LYI9isQS{;M%=MPF+LhUK=hBS^2Vc7dR=s}3p$=0%7axCLD;;q+
z=K({`JDV*tL!1mRO50!1UZ%8I`_@$-*)3hG8MYO?u;Nm?w_53yyNg2qr*Hgcn3jNg
zLG_FbE-VcEp-~pu%rO=RE_2AuN_)JGXRlca^Exew2fniwN31C-U$Z}0GV#0v>%(k;
zr0A>Z{9Z=36#?80Z_e>H7S(!(Usjp?c%!e@rLN@ncfLEQ$9?DPy}p!n%hUt2SIVsG
z)z6$}z%|2W-aN(!_wApX2!LC;t_&J0k8&JWv~rp#Vevy^>a^r^QK$E-a<eaPnQbC+
zqnJ7IxY36%x#x6!*aS0+8*fY5zU=?Go}ukG+rvNo%4%Jg3S}Q9Ovp4?<-Se6N_xk}
z$!z8uL&HK%*Os4YykItI?Nf!S9hc>%<mx_ODQvMfkHxL<{m#UVzsz<wA1iyG&hX>k
z>ixyg(npNp%j*+I4$eqO3^ULxcpJat+q&CwS<m_(Gk6$hyUJ*6GtFyPd?;Az_mD3*
zI^w?gfoBzG{8>M;Tsg3*T|QeXyuBj!+mFCmmt|sP@1B=aaE@DWVut*UcVE>KMWW|(
zDDAsy9hYot$7dVIp2>6n-(QPs=bHajIDaquv)g{%p#}S&se=M!Q5-V^pG)`_bLBr7
z9KO>;{$9GZpG~ME*huKWj|-{x>%+{ax+`o^JL}mUururRTeTOD8g$yd@@vn=uRc0+
zVG_H~{(Tn@1j~N=^_!jf#T3bmV^Y^IxbmEHV=R2ObEm<_6d_h&_v<e&SqLXyc)Ki>
zabI+cWBoyBkHeJV2CqWm+1XPjJor2>^pez;d;eUE__NIoSrl5<|J%9VckV;wb<Vfv
z++;k?I%BD#+pU!FRsRbM%;nETa%bAf>`j%H(G$L4T^cJL@n^<%o<)ys-?~ju{1bUh
z#wDhZsk=Dh`sPmNEVawNcecmgzP(vP0^(tI2DUOOrUiE^OeQW~`a12$t_2yQuNlps
zuRcHHb)c5S>iT4jj}j$0+M?%=t?L!lJIg2ZKly(8X$=>KM>mpu|K6?Xo7J4QCws@Q
z>&H$%J$w7ssRt~2ZiigeH`umcc_h0i;gU~MJrl?6+jZf(56=JpHUAH|op~jj;ebIN
zZ&1@ztJQi!%&Z1MJ9f(C`QH5))#}TAv++pOZr&s_U(qdTegd4qn%^d7nT3acUAX*y
z=FyhOd#P_u3X6p+D=pfPl_EFY{BEgK-lT`Ymuq<^S~p~K<g;#AH|GGS)={;U5(bA3
z=((Qq=-MIIzxXuQgWvTv2mL{fAJ@HX3~v}1wjbk5=DvP_ecLhr*gxDyTKQKq?_ieM
zuDh$zHR$#As0rI-49_#&W9oUM8|VA_MxTVl4c2*%z6(~|(c*RMKfIIs`2*f;3FVHT
zrrnpG{cT&7XtKBCL?X+@#C7YxnEgG)X|uX4i?<^xmGRd~m033{WZC{ceGY4RFg3{X
zTwyh|cDQu7Z5DfYMS0dYyA?+)cg=D;_;cHO$7B1p>CJaG&Us<r#hWNC&%D^q{DXw3
zxOQLNpPAX^?WZDQiqqXhzi1`SZ<=%KK*Rc!zSj)G*-JmXY*cma{<iI{bGG^im4B|M
zuf4yiV*XZJ|Nfre{YBmD_x+g@2x)IiF<dy*kgTvpKSS|gd)Kj3lO!9K1}<6OvCwgb
zN5M@diJ0ZNwsD`oRBc~(Uyr|Z_2K{%#z)Q8?<U5+_{`Po(tmx&&SQtIEc<tM7b?GF
z`>8Qq;5AcAZuN^2iMwr=v(NNr<{$i>vp>~#%MG@}=kwM49@KAOf{d^*GccDNaPQn<
zwsdvY)35b*VoU$8+4%Q%!jbiByA9H>+B1GrNR?!~*q|b<=W<FwRH4P-_Rpm+<$fBP
zpT2&7zQOJA8tI6(unqam$88RLtoUhrV)K^(w@(=tKV3C6-dOFkg<-ED_lCV`qHKTP
z@&7kuJg~nITCs^S^sEbFS#e=;ZS?y8ua}grDerE$cwM+lnpJ&g?{4Qii#xVPsXF!W
z6{@AB-I(LAbo}HGffom7zrOb9;M(db1|M0D_utT-Wb2;)`tAE`=e`BWYW%c_ujhYo
z?%>4fcXiFThcEMcP!ZF7z|K}x+WwOzTY}tn$62C04)^w~)ozfl`x&|JiD(cg@s+YO
zNaU<oxOdirMKfIwZ8r2?pYy*hzbot&<Fx91_jJNiPXzKkFp*7|$fIO8fBk>$j%U-^
z{5+CB9opp_A-Cw(`CUhUU#mTpW#9W|X`a%Fiv7nPsd-goUza$%b7{+qeYLF3SF0R9
zCSItY^UtZ)RUO>6yKB$TwrZku>NQ8lKV3#Vum4xQHeP%5^+o-o;U>N(;(j(CyD|NO
z($-D|xs+e7GROG&=UGZEm6z7kUO&_R(h*@^%X%|Il`YNIJ7nz-`%7L_bk2XC%k%xl
z!bFSj6=z=^yYbfV!HjZ=m$?i{A<rgCef#Ep{}7wpk^6rV?RcN8*0+DY99-7ClV#vl
zHZw0g6gAPVY01=oWeyG<`V+St<J}n}{^0Q1_t}Qpd0efH=W}Eis4SQ=F>Q(Tgy)}o
zjwWo1^(s(b&C~aE<EP3q=5{?YRxLiyJ+&wK=;WQ57tgO@wz)!vZMtLN+{C2}4<7wm
zyZ4RO98I4pF}A&@nEo8U|Nof3D5z<3*P6krVLgZcJXsS7&P6|+WH%gGyRiF5_?pSq
z4jfDuePiVwz7XpB&=yd7=J}h0dF<D1yeo24w~LjpxZ_xTZT|jkcdl*Qkj`Rpcm5n-
z#+gUfncTQ%v@>=-r_B59soyg~ziHo-o0_rX<onw?Y;G=3<o_qIP5`wn-pMhXeX_E)
zH@sldp<b=S_tfOHvaSkkVhDDXwg~63{wcZVtX939hEx;dlc>`rx8M8-;F-GN?i9i3
z<3%i<zl%f6*YCK?^)>gY+=La%Pj<}~;;zk1YG2l=FiEMnYKC`NcDDJdBae5jTHH6q
z{4|ry&jOz2y6p@O+ZsTvs#l^63H=Nu6Ezz6*qFX}&3ANL|I5@N%fV>P*3a!ZtM6{H
z&My7Td|&B{sl}J$!Qbci<V;owJG9NPZ)t9F_U9vx+BQF19xH?}?(ST2cd_qp7on+l
zg6{W=DpqyepSF-!ew`rW4dom$(aYR?4?gWZWFQg{;<BxM`{nEZAD`BT4yl&&H$39b
zU)*fk&@k;hpZ)49#ud)*;twxn{_r4vw)^ap9QCzP>@s}QUNhP5idcPnUsCJp{|Z9I
zJb!=fi=O0nN#cIaH3^pRqjPfRFJF+-(0!&$ai03N{elW|7W~a^4s!SY6*4u{KZdqv
zco{UJcKcU%2d?It<hEV=k;PVtYckirycKno-@V8zgGZxBWFOP@ljoQ9GZ=9<$vwzg
zVX$re*;_l`TK*77V^$R9Ww<GG#g=1NsHyXb&5Sen?|x$wJRu_x?)RXk|8l{7yQcGf
znnK5qXYP`BXEm0OUi0l|nGx?3Z9itnxD{hVU2P;s_Pc_FXYG-{4Rp(`B`wo7G+&65
zTb#=F<MorP9e%EI+x}|1?&+CO?y_yiOYv#5(}QgmNL_p4cqht3GP2};I?Eo0(<gkU
zN9}&}fN#>WO-mZ`IvXrznf$UAnD^Z`jeCRMz3DNvXA>_Rzjx1Xc_Xy%cGs4nFS1lF
zX3yl1M=OjypYdK4*=5tzQrLZQs#8<*jlS2*`ci&;7TFou7k8iUYE44+-$ly$ZWW>1
zv(C3V|9&+mt-+h`flHR*YyaY@m)+0&&{R}<+;?Q{Wtsc>4#B^#_urEK5FNJcf#w}~
z$NQVP9{AhW*>5xt1{Y@L3_JdZ-f!A$^8e%c%}LP}#m($zGZxO+Ucd0s^Pf%^nWr>c
z-)MFI-CD?IrzJ3bB0I;n-1)rAzs?c*?RR*;vcg;b73_(3T?C35Z3TWg#T(aGG+Z^f
zU!KR3S<PtT@;U#Hh&TguEkH!X*7X;%c;CI7^~$tmpU{hUnS9Im5-)r#PY`AOeD?bP
z2kPD6{3gk;nem8oqj{FfnT~TY5l?j{i*#+%S&-Wpn{j;G-%<(N2f-ydu}r%*%a!C<
z{@z-1yvjs@O?I_J!nV?4!)k%OyD}KUw&Wf?w%+r^|JN0|qMGloFXZI8&0)3mhgi?S
zOMTZ~Nr(%Y>qn|P-Y|S&ZD-#1Y4eUbwX?Uc)|dh7RKAm9NcYdk+J1=f&XI;&tJ56j
zwzr#X4re~FKxW~!)sqsPI!<g;)IEK=j5k}he6d^H@#TeQW9Cc}T%9w6A?(Cu?*-Z(
z_q%nP7uw1kYyLIo&@G*&gN89jPPEkaDxNQu*fJ&eiTUbG1!!Bsn%$vS`N6OKyv%(`
zb9vUf+Ux1M?X2LCy0!n+u@jyACf~BTmP*?urOCTJU$fp|*?*g@H!PQTrJb-j65yG`
zmyw(MU}4aT$vgM&7LG7_#@fEse8G`BcKqkqDvti_cYks9=!Skp?gH)y=Df}8Vs5TF
z&Glfq47)pM<mx+b!@)ZOX{VD4zRmJHytDM^ezRvE7%NR?`JM|%N!a*Os_BkZp971-
zwp{5xVUf%$lFpZ$4;~P7)RNyl|98^A4HhrH>ZP5wnNz9qXZC`_rsuU=XY4CC<Th~I
z_aw05s_FB`w>C9Y^7M3^2#*(nOqi}?G)O--_0;QMPTof8cXglqkx47~z$V~f>M!2$
z_Q9Q1clU2wyh-9Le}V1g4;FlnS?@gI&sgE-6tL6z*44IE^L_scyq+odnj!F+$Ti2)
zp%1$6-j;bKvwF$5vZq-~yk;fM*~HK<SbW+b!+K5EiNm*lnoRf}U#ofB4O)rnGOQ|Q
z_-?j%zWwS~Jq)vMO-{bkRemDN%++GY#)-uR>mCVa6&Y+<U$yl>;{4~+8M7znnonNA
zll$gcTP|<1z55Ndz8f>Pui24yQLcHmw9blK8w}UEUS1P-|6QNogT0d?T2t9?y#BuE
z9M_yrKb3f@?4POCMQqN?KlQif??3OrG)7S4;mTj81?{T*f~BFEbC%w|{@?MG%mI#Q
zKDnUPo3|!CJfJ$mP;7Hfw713frmN2%c(T^>$(dRg^Do|1A9F@#ar5fyJ2QWO+`f;`
z;K;F(j=QIROKUY8<diXHYb<^6?Zcki*BK^W-7wYD$1nQ5Wi<PbufO#zd0W7FN|vGa
z=*r#B)ep0;?)uVyWToh;Lf_fCh0aE076&rZxK|$3TCbV&ApD?P2CFl>`TB$L#=Cy3
zn!{Z`jVJeN?uAb^`gg6b7wK+qxqt4!m3dbfzZ5Z)-TSz!$ztA-4R1G|jud-vJ^pX3
znJNR=kFm@NEbWp@5>8BJ-ebu0^b0?$)rJ;<^zXH^UvqD){rZ<dG45z^2fxX?ex|?P
zOnbI2?!BqLH&*)AwXmf}HcnQ&=N1%dVlincyJNYz!J6J^z4f1uOUyYSac{B3OcyVX
zZCiVL|7DdIrgEKRe9*|vSo!%~|I@<z^<S6f@Uu988Y;V@8Ma6s$n3dsXr<K*o}z8>
zO#<?2ve$0P+J<GYbl<%o_;%MthNK7VH$L!RT^r7_R#hfB=~t4yLhR)GS7MiUuRFP5
zjmK0^_R|Fcnm3daA3VSRHC#c$@X$YR^#aS=Z!0pSul;}eJ+DTm)$#Y_X<0@+k}3E0
ztY!SL{eIol%Rh@irK;;*8HRI@910Ey{gK+U=_-deug_$?W8c<yoVa#Y{=<38ADzo4
z?`@i<J>mD~3Ax=<UHRMXw2pD-E%7K&YJXjDfU7jr`iS$&DdqvjC48^H9;@7!y?n#D
z<SdcHb#33BmYn$=-R|h!Zu{GwlWmnTgUCY*3$VAd8B8W*Z`3gIId~x@uj9dmZ8t9!
zZ#3L_n9pm^$B&wd(E&?L0&iFzUA4e|xx}TKgr3t<Ik|T~NPTRZb|z`pbBFF-5;9-@
z^0G~T^M^OoZ~wJ|?(aUl27wlhhkqUMOzCcnI>&Tox=6=<j^;i=`=9&PFnstMUjKYK
zq|g>;Fm*b*(a&cV;}QS89>NAvD~>oM#fx=s&e+^sF@H;=-Q?|u`I0`A^t5Cizr<j*
z?Z4KE2;~@453kqXstPun6}QeVf0M@X{WVYS<He=1PM;zd6q^)1$*f)~Ej}Ui+arz_
zRUui&U(Bmncli9#jUlC3OoD<xf34R4`4W`8S5&he;Nfcg&$RBytJsoxQWGlQeUkOg
zj#rWrDw=aDaaTk3->L&rGTViE<<l4(Iir5hm^kBOxy;35S6L0Lm69G9aozUy(oOgG
zTl?VV@!LD4(<Qs>x=zkW%sBVd@QNi%ly}x_>vRJz^`bo8aLe|$hCa<K;g28et2-|S
zX`Smb^wobkelh!E<txQ=S~WXaXFiYm!WF4KXJuQ$%YVBbZ{7DbTk*(o&wNAs^V0UW
z!q*kNUBA&wq2UUbUxWF9Wb5b2%i5y4x1RB7N!(J-94)Yo-EB!=-o%~FkE1>n-;J`F
zEBNNSW$`zu7^M*H(8n7j`2X>r7W*LnwZje+?~C3sGR$?}?%edvYXPHg)_pdQTX)vP
znn$gfF7P;Nx9$7$TG2a$u0~yy{I|yUjY9Fn^mN_C)g3>-HgP@Y`j(gYCij8BbS2%z
z7naq$c|P@;@2h7qr#(CLZWT;kTEukz*v6}cwxUZ~r!ToZ^`O<^hc!|s)@^?urZ!>y
zx>R0JZWs9~#4zLLp;ckBOf12NR$bfq_E<|_A)|!zpZJD79JU<Bjmj30R`EGslQM!2
zzm0bCTWFqU5oEf<IkBNo_x&}tHk}9`VVmEp<d<|*a+a@P*^#j9<a1@^C%l{IrB8N9
zSySVbvN2vT*5~(+U#s^QL;8YuwHesh3pRdQ|FPGK*(1kYY#Ed8wQn!4EpKp$joz{%
zZDsasvpt;-i)vTDO}LS@HztR5u|fNmxvw}j=lX4!ZFTAWImUtuX@4#hnHdR1gyy{x
z{Fx+B)^;oIpw5E5chl#yzBs(;>T{v6#0zrECSET{v$(T;-qyzZ`~Melc0h8s0s~+2
z`Mz(<=k#$)-=6xm+SoJU#J=0=)e&1bV+^$=G^?)WzkaaQ(jn)nE3?jtHea)wPTI!D
z4l1}ViTKjp*zdZYL+Q#-t7r+`=StxWo)1#rrtCPC$b9=o-1Uo`He2rXK8yKN64|;Y
z_QY3{DG7X%QCBy|Gp;#)Fqi*N3#j70Qp=R^Xfqp!oP@#5&)R7f4ou7;YZEta+~1UC
z<guKe*~IjW;Ug*c>82g63&L4d<LC76dFl6%W0F)-zT1Ps<qC?NYTuixTYP5C*ko!@
zHqmgi#`KfLJ6A<k>h3vQVRULc%Tb>0yBw3^i(|gr_GJC=`uqO`?irwr_D-7N_|HxE
z7?>n|IW>wN)~pU`|EBD8U`zaT@p;8<{k3;y^>zqPOk5H(uVUf4F4mdu3wW+KD``ZU
zoMoSO_&`(Rf*S4E;}bQG8vgyLrT(GtzG0Y=viY$SGb~TU2Ae!dn87yb{mnH@Kh9o<
zcfO<<7BlZCTEMrg@nQ7!)4pnb`=)09FFO*n|CvDIqjog`-UZ@3GDZ#ySuIXqVYzhu
z=t0YB=TC`d;TiG9E8H8l`rKZ_c1g<ZhuMOAIya=kSX=pH&%J(ktTX?m?+1am*K=<D
zjcj%N{;?wH?8MW>3vOHNu=lCoS@-t?w|ycgrc3)7EY5wK+Gx}^ZGk(>-K5iHOgYKF
zxASFvE3UOI`Brm4V4h8*V)-(`gk)3y%PGPfe97)w&1vO@yV>|NJ6>}<Jz=xv+|p_5
z4=8QjaXj+$qGzq&1Y%pQu7@6$vFXh`eY1|=jU%?Nx%zxz0oc0f3=-~3wuY7zAAj|4
z!PAGV={dJuGg6mb%PqRjb|Cu#3$NOgeech1Z4WK)%Xxiyi|ZVf9fhCkRePJbb)IhP
zzVOmlMJm4FigERVk`q!kc`o+rWsVCyEO^B-?H1>p_t~z8ig)NMB}6TIDDeA{`qZAq
z&n@`+K+zhf%3$@Fz3ZF4jf2IFmpY8$y-w@+`96eyO5v7ilho$nx+?3u$a3kyz{DFT
z8ZwXD_sH-W{4TuM)Gzp)-#bfQy}(4{Ys1#B*UO4~^R2h%x&)haTR%5z)9b(K{arEc
zepF~);<`6CzwZ9*_;=r0h7W)3BN)NM=DS%P_%$2(xgI;Z_a;_<k)Oc$jzM!ilkI_-
zRm@&J*^(SfjS4z?(_b%d4ym;H_c_?H=E4?V2~U9-zlhJF`>NI^?Mt7xqIAb~(}bz*
zwhsbUFRjv5F0^X%Z7=Tp9UIHcWZ--)n_>UYw$G5xv>xLIOFw3oB@dGMRWuZjGEF>t
z!Z0F>xxll@CB(R~_Nsn5uN4PR<M~$?%EZ=B(vI`cSRLAzP-1wvF<|{P)i_zLq7Qrt
zXF1dg=f=K$<+|d;GaZK|h6Pb9cHX}tv;BCFznM1ggOn}ff&Be-=PM6@Beb94#X<fk
zcCPBhE-8kl)3X;#>c%aP+NRFPqab<bSYJfWn&`W6=L9Y%$Fl8jj{hvte>d+WN1nt3
z_bZo}SuLh1sfn-uacU8d;(507MrT;~K5)-m|I?cH&AbC~mb^#U_wU%Y{YhYHS+KmA
z+JyZ5wJ=-PGrYLFZsA`}9#Ly~#YLP^Rw8;ayDI;^HJGW~%l`3v?rpJey)2X03Q6=z
zTuMw`pY<r>b%w*s>(4UTZ&$wQUHjJiwb1dEWkT~0?AV;R`*S-x^XW%BGg;S}^ye%;
z9^dZfUi<xQb(<ro|9HigX~EgKTdzHnuzqxFGN)9{@8E8;we#Cw-#$7mQ2hDZU(Ct}
z)6Iiq?BDLYnyj_<)_1X}JzvB7)OdVDEz>zH&t0ECn{9i^ysxh#J)Kj}&$fFMVP1Y-
zVD5ogu~#;iR_4XY1njPJfA6!-qHpcPvcl7q=aU?7^XK22x<BTA-RDqCS8(fgg*e-R
z1WySCh45KCQJ)_0ycb%R;3xL8>}UFyC(m}=JAa-jZ2Jj+*HrKSM>p=Ay)|~buET?h
ze?s3@yVmb+PR@_s{ot9y2`S~mOB-+5P29G5dbEg->W<xpX^e8`Ez39V6%1uL<I}#q
zdgIx{v#Vqun6F^~)q7WJnHF@c{hOuzl|f~BE*nRo;)$<PCcN>Lvs$J+xW4cGH8$6-
zg@Uuyiq3or%`sKj*{M*lHs}49t#fw2PJU=3A$ppdcjlE@CqJ(1xo&IGwE6R{h)FM^
zpKf2X$=J=c=_2b4^#@;SxDuq;{@&gG-jx$P<zG6V!9t+viD6FfiaUF5t;(|CdA3z7
zwIe$7SgXxT=cffK(XQIFtN*S^u$7!T?fAvFeyNsjS9e;?cawN^;q^7nZEKF$g!xs?
z-gQE=B=k%ki=eN<Gp@DwRGOsvR)5!$-+cU$NN!^C?U0pUp9zN;Pf5SPS6N}5&zPUX
z2#x6n8OJi}Z@liB>(<<n!}z3Xt8dJK680@Geyx4o#xd1u$EqhB-M<SaOcA=wSUNdZ
zKUnkB3dz~8XCFUwa%0N*ozo|3S4v$|{`GXy!oPPMqOz4e%9zT<H->y@`%&j3bAVM`
ztS9es4BLg%%lbDZ-M)2wf_eTc&``y{16&H=;Xh@DYm&!bEq;|E!~F1b+^cVjJ(Hbg
z8@lwXEMTyCkr6FBok#hg%AFM_XDZ&A{vd*Xg)5s})k@wIYa?AIy{<56esrY$!i4YB
zrB?+%&w04*-1n7LZ*OqqC0?l1KJtB;h?u|F=Z1~vnEre?eg4lBa3#B!@xcQhQO<^B
zzcAj&Lai6dF2`O;-f`h=IVsIH<EFu-N6{CGnH8-<{we*CRarbcLHK6L<lNgjd~U~9
zMRvOdUcH;DBeW>b>4R}jUBMa0Et%3~vB_8Ugp>MGPx>WzS~fF>EM6riHKS7EtD8Xc
zIlm{I4@@oh{nbnnK4ZaO5#8!o|5?;N6<msxGu-&U!@HwlqLE!5Ps?mchXtE@^bJ2;
z3JDEr*EMoj9M~uK)!TO3>y^I$17@GyZJU$ImU#Zt<ew7T`8wr70>c?T%XWM&`MZbz
ze@qF}aZl|Rx?e2Z{MEkSJ)E$QkNI$u_vx)uW>xK9b-PCHLy^p#>bg_lrA%^+0+%cI
z7p}dXapJ;*OK)?p`Z~|Q7{2e%uLCkO7fCH-zxi~QuiC!oNS@U%7Hof-HN7ot>-R@t
zm)#yca{Ln8S}U_I<I75gk8-VnrE+E7`o5>buGp?vzM_F?(z*IO{`<bGt`cKxP`$H=
z>G<D=PfaGQkAzkV%m;Gry)aN$o^vz)|DvF03@qnj0(+}puMcECT5ELtqS?2#q3=Hg
zoIdmV;d#+JFE}j3{>_<l@b*T&0F{tm-?FoEA8@2unYvn7L?z6eE8G@sHOp3KvcbD#
zG5z3H$LmkM=AM<F)}(Y-^cUB{t`oD(yTv|ihjtsS8FJ1f91B`fF^#9GJ-f6xH-tYY
z;Nn`*Q<pln`&mD__Isy7>P5zwny>3;Iuwb%pQV$Q)_#`5X4V4Dmbl-^rOjP^q6f-i
zXV1)VaxJ{HZL5t_b;xU@mC^hwN>_(}{x?_NdPjS(``xvlr<m|Zu($P=9&aySZQ20M
zUa?FGXZ}b#PdvWj!3ptXT`%ts+z!uk4hjBS^S0W>*7}FG(c3#xdo9>4m@-;qwq7jf
zyr6ZtQ-$xg|J|!LjFCJ{a^->#a%=7e)b2g9eb+BTNvmhit@`d++fLaNyN2;k9|L&y
z<~wJ@<_w{)j7L5EBJV%@Vz9YWq}hb&!<*fg=RKIDxODCE*HaBvF5tPO^z2X7!A3uJ
zfh_^A@+2&;ab#`$$A9DYfdG4Pi6qfOoI1RlE4H3_yPDBEwP&{DTvm;vpWM$18f;Gf
z_3cmCr`lS6<#l=d@0aaQxL^1C-!U&;Q2q_vZ_SX!n5pbgq46R6`LP!><f_(8UC6Ze
z=#5+Z6Pa9R9J<(}zF9(|d5PFxq3hD`a)V~;D80O8(lhJx>pv#_J1*OZTljzNSf9D}
z6;J&?xnG5a_c~WUx*pv3`eWO*?*{c1eAAQ<=+3#5xc_tIfoVRU1DGF}zxPk$1(jVQ
zUr#ayoVp^uKktp#o6hxI=T_IZS>$<bc(%=$sYmia<_b2m3#T4DKfYkArlK-SmB{K|
zednVWzaLcGot<3h-@vi*a_!D)+j}7*d@nxE-Q+&IGtJ_}8=ctDja<Lw`h%O*mIWHz
zulqYSXAYYasO0$0+F-}Tw)CfRyP~;`L;0IFu>!8jZwnIN#=gHdcY9v)SN(U#87>~!
z7|LY4;aOKAYlG=iC5HL=%+FuS=$^5Xa6H1AxxB1W^pQ;T9`_qxCh)(AetB<$koL6S
zcH2^3c`R67X<w?h;J&6xXm0<<Qe%cc?{0sGjp(s8Nd7rAzebkP;mEE1j~4%!6S*Wy
z+kD4_N0#y&xwmB*Pu~40{k>+!)ZbPP_qVN6oAo34*TkX^skYa*g_$cyJZ;#Yr5jsx
zpl9*Bq?W$!J96ht?}#th^_A~Z*T*B0F^98PWhw;8Ti<>CLNAPcdfEH5$cFoMpXZ4>
zfV!c(+!?NzxS!EV>#&%}+-oeK=cfMngmJgO;M%*#1P!EYG8-fci)**1Sp-hmFnwWW
z{o1mMOi{PiZwy)7MkV5rExywu8&)vfIxBUK^W3{<E2|{7GG{zEaI%HJ@yh3jH@%lx
zIy7#byK1px>YmLNx0wD-%Z3aozGDcG{cxmbCx;pH2L(xEm03=0nbLJExepCKCSN{t
zAn|i?blrUhyIU69`kFqji@d+~n{mxjX{%Kh;ub%=vPG*KlIBzht<K0j<T-o(n%2#c
zRw~!7diR7LY&>GJFkbdRY;Wc5^Of4=^Z%c3@R@UoUs(Nvef{rVy#%nA%^7-9b;X@@
z*1Bd1Dq5PKcRM0`b^Y3+C21?1;;);{u&-+6yIXqufr^wx8T&`IXp5Lu_v+t*d^$_F
zmz`a^+U(=w84O7iG}d{&;MEc<H(os_vUJm`^SK)zsT=9;IeNxH^X_4}Ew}&1xgPYf
zG@7%!{=Qh6s9<G<aevd#r_beodM*a7J^9V#@cZ=o<KM4F?J{mVz!K&3W3$Y&n<lH)
zN^7Wu%{jx;#3->{%%VbUUyVg8?=zP*y>FH^y@<Pd#mDLJhB)i^QbRK(DYd32`w9&#
z&im|dR^5HaLuc~(s_H$~lFk}sUysGkW#5zaG%x?2-~8YIe&<7Nt!6$TC-)|5+P)-n
zhT9WvKTmt^HF2@}3pEzmsQ#?Bp0s}!$4)+-nE$FNrC`dZZPy;Pt_{ywarr?0{St43
z$FWEL6>7guUB1b0S<#o;jJ|W4hZcAT^nKqG8ut5%(C+SqqH`bSw|wB46xHHz{u!hA
z=Xt^XJDNAYD&bwwapL>^+Qa@*pc3V-FvF^KZcRVU-mH-d?V0~|f<kF;-kgqy3sz>#
zPW$n?pnO6{-fRtp*(K@T8{hk`@|tm8>B~gjS?5oOek+kUx^Q7r`ph=I8xQjJT$XmN
zk#t;rib>{Pzsah+cdzoEFFG2v@3TNb#gF3mr?+J={{J8gS$0_(&hTQR;%xS`TxZ#w
zjr*L$kFWcAAYEi_O!ognGi}uTk~gkec>eU}8G@%*-R`=WnpUQv6)8I7RmT6d54=?U
zoev6CJUqYE=t#%31dHH#+l-js6~2jc{gV89`*Rm{^^NOS?ThSb{{62Sy1{52!-ZAV
zc0Ls*)hBcmcC<2P^Ju(F<CY8#wfW&vzRoyyN7+U%(U7%I_kDZ2eecsZe4I}L%dbiC
zCExBVTeHh-Lsm}s@88C|mQ3#6o-Sqf*}Fz>ePa%THB&Nc@#c+ru6ey{qAzYf{<}6<
z^ZV5=AIcbEbx|$jf@StE?3k8im8VJY+zasF%IynwoTiu5S#b5b@Vo=@s~OH+ySugc
zi>B5#x4=UhTekHDK2VBJVJc(Xn-iPTzbtcSbFjwhB7W^V-lE5jR-ReFcVOw;Q^)o5
zes73i{=w|40B+XAGg$m9-2VQoOcSfenW(<ko?C3M^DVAD82-Oz_4Q_v1|hdoJGW(7
zw(R86ki1}Xc9--e*^}%yZvI?QknkdjS1xFccb2>NMAnLXQ~3+@yr&%AaQJ5R?C8@o
znjYD(2ed%5s5OI2+ulePA13A>JNKOY`uh6+NC}fmcVavzo0`0<Hqu(VR`|^0qq7W;
zoM+DKf3EfX#ksplBE9QRy}Y_o;$@AY<+L9>`#;9@w+U>VSiQRVrRoiivX62v1(<Bl
zF_(RwDl5X2?0d!dr54+>_V@c!CBXYY?g}$J>zK-yx2TYBX3x3n6PlJQmt>^$Xc|;5
z|HzkP&C*s{mbCEHwqpf+YwDCZ?#y|_*Q&>S;n1>)3?X+#gs<-lvtNFLIbQVlCAY__
z20RCrzuU!CZu0E=`u*z;&OX6%x$EY+V2#<mzom1X1ess|t^I%3d=9%0xZ+`Hxb`g9
z;NcGkBbj9v^BGz9Xex(Jxbtg2kG|3DHbz+n{tG4tl@&RT%{OL|lJR2f7rgYwbe&aN
zaC5f7yx8eWeC*fuN<GqQ{d%`|@!dA(t<_WJ1)P0hHlN*QE@zL_w=X+xZZ2)8W}N_O
zOq4S>m?rS730R-0{p|m<y-#1w-(^|6lk3Lye_IO+67$yi_$Zk2+)C!NidGf4CmPdJ
z8(g|JP@K88X9e@IhbOcQ1)@tzK5zRv>GVnIbCPS6T-hF<v6;kR<ZJWM|J-xN*GCHv
zZ|`mX{cm^v4JPnv-)a_zng1Tf?=E<K{lK-Jm11jSuCFS|W_sv0C$&6}Mefa4!?Tku
zlg^%5V7SirOxpwx{{n?JsV#?Q?O|&Pnmpsl%ma%LF6OJhR&_UCuwd^oqr&5RAF=5f
z)N`#7R7hv|arpcFu1&0vU}SEv`n}jLws=}opEt9|>AuUFMLu(vp9tM~QDNaKC0-4w
z1*=XiOXl8u^j1Xb`Be#$6*a1t!cTu<i04(l`pLAj=e1V)l(t{DybfGuIH!8%A=d@b
z{<B7M51ZF2%N*ZW^t(7;O!Po6wAPeom?E$ur~b;?UnYL{KK%D%)OVb^o~i1C^sW7~
zo<G)Gm0+8DYvHwv_d{oHX%mi7-Msoori9#+HvzL`_DMMCGDns%_2=F!R5QF}Bgnf<
zy2aqds;fL}()rz!)|``1v`yMo{Z;=m3&Z~3@1)^nN`Q*ra*qiH%zI?63dQWv`uy`?
z`|0gXj<aVeI(G+#rYu<E;B#Yj(_8J(OG+hGA1*U7$ueg$wjaFk=$+)M6*C{%snzMe
z&z;C>VfZwx!uqVDOQM7(W8CW&_qhk;87e<7Gi&_w>!J882XG(a9)m$T16#~VzsM7<
ztbe7h@wHuFF0t!hm%!p6i#BQ9L>|9+7bZkRTer$GpWGv)J?SIM>bQ*-<=z+lr)Hg<
z!#z(fSzvi&1G7mQ2eXU0E#qO1-KQU`+?ZO@7qLb;CYABuuh;s2wt&+96<fvyTV2nt
z2r&KqOxIQN8Qb}7nZBX-h4LCtTjuM#pIoqB`^(Dmyx3X)t?nF2d^<1x@$#2d*6B)?
zO@B)l#M~D*Vmi7tJ2rJI*EY9P=37>+Rx2p^@cdo=)n`{X3+g<rp2;*{Jnz1Y|KsoG
z#*G~XkVTJoWf_zl1OD8$&s1O3=#a>8a>3&V8P~F=Zqaua`x}4#flb_&PN%g?_sGWU
z9&^2|x@bmv&lRS*YiD1sc$f9jd{Jqi+@0dwLmqzTW{2KiHo^9Mq+VIj+v2Uvv2yYc
zcc~m$)DdbD&hX=KIka_G&fH-4SwE!y+#T7!zi*{ko%_%`K}5YRBjYfe$K<dp#UFL{
z?J7SIxAoXM>nX0zU)Q~lPrl;avY=|o?ECxo3OQe!$CvlYV%gd}+5QQ8AM7%`uit8W
ze)Hc`Qup?3jW0RKdt>{)?d>O}90Vu6-=7X$`@+WXmcN=uS!}JcXN_6x>Laeq9kb^a
zPI7#7d%sxmqie5abMHSB_%`+E+ZEq_-tC+0P<7Hz#W9Wfj9KiF?bXiGH`cel-rO&^
zs%X~<hBtqeRQJKw0thUh-4c+sJ@?G-!yC?R>OC&~kYANY=}wk!+|0;z_pMwv<glwB
ziw$Mi|9cv=uwiXz$_R3p^<*Ni<V{AK%K{8@<=(rzln;KX8*4G=rlS{gJEzMwUZdo*
zxwkLvFn-IIYR$gmYu!fP9-$9+{;lGAafY*Jhn_&K^ZtMQ!WX2L_c;W4eC2(2uf}w>
z!0YU_ub5BC-}9*#ulq4i7t*v-X6PxnvcVzO$93+~?GgRUG#l23e_oZicc;;H?K11y
zEv9vs-1e#R-DX_Yc0j^)aZ($<@7l~Smsd8bZ)+)?aeZ~B>=OH(T&wv!gd-W`pRp|a
zY$3LLURCWQ1Km`v_fr=xImK&YtHbbN`TTv)m-m7OVc)Sc7*|M?DA?<Xi3>*^TzJWJ
zn`-FsgctvINICrM5L_W=*Y!lN?CREU_tkDQb_%|G6cf*GTi3gY`LN)Tq<!&m+jr={
zK7Ed(T9@g}!xM*2-)MiL(YK>Ri0}Fv^K(Dvo@L%<dECg_FY(t5*^1~b4fTH>ve(@L
zXVE-{fc1=SJt-444VJ9Te7IGkfAPk@-N|?7XS-ChzY>^Kb5-g#_biXcw{F=<%dB%;
z&Kx{rMo~jd{NWqfT|sv@Xg#sCpSOPV9B!FBlRv5R^0x2Ubyat+4QJ$f#y>Nmg`6_O
zoTk>J)gDgmX*n9pYhQ?IRo3dpKV)M&wl#MjGtc#DVS<fGQf@tulWJ_wZ=dtsY>T<$
zn+Gpn=U4hJ*zdM~o&NFrAzNPFeq!sk^vQa|o?VaD6uy;Xdwg8zUiy=LS8S}(R>(NH
zY;S)#ukO#sc6FKgpzvIApO-;8f#<S$mFt=9ZR(#ZRjnE}-@dYaa;>T1mavD}X=$fk
z<VF9uxyN9`?foyG^?keX?AiHWujbUszUCLay;N{c%!iWw`%+jOA5LpiJ964S<E32Q
zcitK4pLs7kc%7KN*MD>J_T#G!JaiRJ4!w|)sQ>e^`lcCV6WU!)2C>)oPX+Ad>|t?#
zAGpwaU1aI`$_HnZ??;vN99kc3?cjg$`k&NtLx!8%bZb&yyb)OO;@Wi%-xmj_vrSlX
zbHCIXB`w!h;mmzS7WW=HY_ksbzkb1INoJe$rDauY#UGy@{#_L`H#$`OZ|V6t2kifT
z_}ePj1Zq*a)+#ah)IT}RbD&t`!odtfYn3qTEe0aKGrA%=jRh{-zGF>hC}Q`@=XiO&
zouRTfs`N~V=FijiE4(8v&C!&VbGyOf`a1l1&OVlHKdZym7S35${U&Xq_F@kOe*UjE
z59ZhX`Dbu20A$hEM+_^3*L--^CirdD``2EH>&=!{9;jY@`C!Z!2KEWrm+d#bt~k$d
zMZhKZy!`Da-`2jHXcQ50f<ZEkF}oqkcGI_S!LB<aF15NUTP`%8zx+nrqJxGq4S#y(
zuD*G?`=$Kz4exH9c=zkGuhwRU`)3$FutRIEI0l3NiunqcuI>E!ZJo$v2P1)R9DCSO
zl}@Gvo@UUMGk4z^@pS#$%KZOfkDsyR>c(x{7Wilh&sSl)Bj<ImaRz+d{q$R}V2!NJ
z!dIX5uHEU4UT?&_HEqYfyJpV}yzcUSJMZ}H>aCA?4%^yqasGMS4;`2J%aG7%DjKkY
z$MR5+gBzP@Mr3@?;!<0eObKoF1cn`HK8#-?-lxC4lfjhvA<W_0#tRpi*2`|lJZrH+
z?B2^){|@@z%4pbeRw9?H`k-r!L$SrTo3l$k{Ze(Ex0i21yLrAC!wKjlvLHhi$G^MI
zeV0pk)<hj#Cp2wd_WG|=wf3jxpFG4W!hLBApK<yR3$fQ5R=r@mnEN`u|54kTl{>yR
zyN3#h$?#r3XZoS@W~JetsJWj**-rH6y}D7A8)&d`6~}Bz9iv!wiC0@(W&BL}E7)JY
z6?x@$qFTx%@3d*d8pv3-EaQV8$77i}dK3>mj@bTK{wrsp#_@$)#opc6<|?K5Jo-?t
zW8!5Gf#sbH%Fh&bl*+Qm>BeU?1((NJJ}-DWWo^+99b*Hgsd<Gu^IoxRXehYXcj55Q
zFJEW1R_{()CtDFHW&cTJ;?=KV{d;F_X{i7A^7y`Q6Tw;3n#tk+a#>9|Hg&ZL0zPxD
z9ejBq*muIkPd|>#*&Sy4d8&E#+ODn_X#o<qPo*in6g~8KKi@3gg>8HGWy#Ll{_)qh
z64o=jT2x+^n{PY0I{e7Dk59I8uT9KL{Z}z7#HA#Osj}}cWcbI2VMell&2GaMhts0!
z8~)Dx-WN9|`MQvB*Gy}ZgPyDZeKjjw&9O@`Pic0xbiQIi)tU{N4M*>>efuH3tp0>m
z@cRNLcZDyx4_^J26t~Q{-Nld*d*<z4t}Ls@OGoRXo}AOsTXuJMB;SG)ajc+uEsa-v
z3>R*#HaIoopcB`NU|psqcU?O8bQI4W?Ktj#cEhWA-y};`iHRGtm~y8~)(z3pHhU@A
znE7nos@}%exe3?v*1hmqTJ$TexNG)oo+B=z;s(8}1wSK?Y8Tx89(bO4A76de_w=v3
zZd&em9VA$J<C*9I`T8d|kXlQa!RN$+!naWwYhUeIn>kTGtFqMN^@S>LA=kPEVpARW
zhn+oee&KB+i`1U9&fHjAzmQa;ZD-eNn|NGeNcgxcL1ArSN;G4I#rj86&nw@vXMXpw
zjv+ja)&D@b<o(V5iFwgE-C`g7p~I!>3_fr7%6ys~v)cK$Iqzu>QNxLcTdh2&a0gcG
zmcHh;EOW-~+X`;hB`Y&lZ(-cXx6Jj}-5EK`7i#6V-LHsgzP#(zb%y}iJ5mL%cX;lv
z);X`eIAYz~wa*#TWzJqbR?)Y4SK^AaIF{oxxg%2KA?wwy$TB`~klCkXKKDPj=Jh_)
zWHzN8PbK$VT3x+iL;70g$>r?@)iZZ-DzS^?MYkW&edv=>=$*A+PK2d3RW_?Na9!`+
z^-G(SW<CgU*~xJ4QS1r9yRQVYWbaL`xM$f=UHscd{<+zNm45Y}ZS&>DK!K_R%^XY*
zB3^z<NMM-q@56VF89YwPA9g77Dl8Ogo|oGrQ&l$KcbfNPCz&~If1jUJI$r;~>{Wv1
zQ-!X!!crskr>z^Ep9h5AotU!grM|9qi};~=;>pv`Z=Lac&F8HQ{QS^D<}UMtn>mrI
z9VFi<Y-tkQmmg|bvE`DXOVlALM|<PzTdS^aO)E9qc19ul_O@iB4)r@{=a%zueR;m7
zAUCGx%T?=znYr^rg&wO+F8HsqYyQM}pZooc8O0yiEH$)cKlgC0dug2DhVX2r@N5Qf
zwf_iQ?aMK2VB$6Zak%k_jFADKrm(-U<egt4+*5`4u0Cb@rt@-<)br*A?gnQ?k23ph
zow4iU?E{7jH~334-da2Bafs#2#}V@^Zq|M1(OK5G#bUPAo}Dv3S7&KO#`?0}xc<d}
zvq@|rbjbi0L;L=(m1pm#n9OWn^Wo1nXR%YU;_q%GtTAYIsy<i5m@FC;ddlY@<D>^s
zN8Qun=WLx_wn$^s&ttFoFSMWBdm{11(lf5b^R~AK`#5LrxX9?U`tlCd;0--@BcCyB
zg6v5sXKh%OX&T3G_HBc4qeHKt%DiL0j`S?_cyViW(%YNUIB)nW3h|29vBdC3E8U(p
z@BLJ_+v}g5n!~?&GTYo&MqH|AzOHQ$unoC&>*UnPC4CK@ueG25?0#JHsA-A+{U2Jd
z3-+$s5G8H3tvy_ALVVpnPrbF!Q$H><B!n)N`gv%!RlvH^*Z+TQO?owV`|+CS9h}n6
zd(J%k<Qlzrd$S^wLSo5xwi`jw-=7z;R7Xd?l_`$#e!AzZ^1V+zaUsgLCLGXd%$8-F
zyC93LO3Pbf?R@R1qeU|%pC5QBQCcqJ&+uXT{MN@0z)`l2VS`YciwJ+j<mo$}t8*5+
z+TDL)*H(Nqi`}m9@%@rl2^%91+};*x>bGa3%D!dHF)w%MD)^?(=m|P_<;<1F$rrPC
zDp~B)zdB<_mhG~}k41+#rtN3TyT6OYL#OP^>GSq?ZMK1z1FX2u$gtP?TKLPJGfsQv
z@LbiLd1hJZWE-15A%@1e@`}O+jL{jqrzMy-|KGv6p?>Sv#*;s8$6t=VR-3!Ps^Q|M
zyU{bfwRUWNteS9WPUGsY<yyC%Yq(#C4*3}rdd_*xF2h>ytg{6+GqZx?tX)Fnvl#xg
zLYw%E4S(O8UAhx@xcAV;SJ69H_zH4*|9Y)Zdo917_ft)5OQ!rrsTV#9jEl-Lx?le{
zyJ@!C$*hMnP;JAHsWNYajxJmguWd2AM=5H}OdpA^<&6`rJ-uSd7iTzMr+<5e?JKcw
zXE;86_P2*FMU7)9IPu&&fl-`E_CRhB<C!Ik#2+46e{u6;H;$aCYvLkx4$XKh^YG%^
z)yB(P`z))?9_ca#+pnuHNm?H(nQ`mhhb5*J?@o1XE#Ecg-$uUe-xk!)b^AVlIm3_7
z{_>N3z&nJm6f-S2$SO1EB!_kQou#wC1s2FE1a0^fm+Qi4wpMDp>W|ZF@1-5;nC$SX
zYi|Bsv9%e6mG$2?9kH}HS2_9esz}DIVFoe1{j>X<Uq8=2JWKeG=dL`>s8faY2WBQ7
znVna_+|%`9TL$B07Ra0fb3-tPM1pb}gVQU8^!*IF5^`2=GG@+AUmGd9`j4yD?c0Y#
zSpyG?w{fanG`#ce+VMjxV<(p#DS7_-efN5?U11rfnu}-6F_WDTKEqFEzrnoYJLC#N
zOJ$k2ERW`UZSvLVkD~(rWUdGL&;rYrDM7Zr$yNKJ+y0|v8+HZmxorPybB&F{8sRUZ
zC+A7d*tM47P&m8(35K+T4v)?=&$V2yd-1YqMXJT>hOb;==W3-N|1M1vI(V|?fy~;^
zA}`Gt9iZa{e2f9FOXI7;7_&ZC*-m)5W>X8}vm!D1wr%TIiyhisarEH4Z;=P~EnSm$
z$|HaAudcg{jg{*PjpzQzx>2|8sE5VdDUmVT^%BIrwdT1Vb$Dc9`~QgLpOsTSPvLf`
zn*<tr6lR2M>fmEwuG*ogFs(ei-N8KK<c9~*+jp|YG#xPbcJ@)G(=4y~|D&C~8QdGQ
zITyR{XGwB2Iygn~f>gq$sh7?zO3><E8|o{1e)aFmNBbXN*m2W#f8$#x>*_G|J7U=k
znM~l#1lEiPHilaMn|rK>L(17=ar?4OQ?`~F-&lHT_K%5Kf>F1=2;7`icv!2%IH2p8
zAj{+SC8mvnXYQO|c=nC{mLhI(bN0)(#pD7un)U}b9}|4B=7O}wx#pjHwsv1O$*BG>
z^163hdzFk#^8)ZLkv;~2y=zwmOS}>=e8PC^du`B>2@}gB8bh6DZ;H{s-rcq?>w1r*
z=H91gj#~Y@&9v;{u>+YA&n2#3_^FW1AN{yxvf(pVZ<EVQZI$JU8`c|FIC++BE}8Xc
zZ`}L;kJ2u4Jy^fLP61LC?qx{WsguLjSakG6Ly@i`+l&JRGGCG-DmU(|bN#!^ezsha
zTfZRF?QOX-x6UozSahRrW#|s$tdQ61U2KId53O&E*rRwOx%k=+Q&#uwvnO-K7rwbU
zV_&ex9NGJP_R-80WwM~og=?)7!<>JK({J-IPGgktE;V*Ay0FnJ-YmE0ToTVjJv#}j
zCeBM%4*RDWY;{Xqa3%J9*GUup!jlH!@B6oZdSw~9_I=5Xw>Lc=UY#8A^_y+Xqc^wA
zyp86BFu1zd)%<9kZv~#YQD^Akc^bX`sEELVmLnUMop(#&5!F&yXKKQy&7&r8(YI>d
z{I!2SKe&GFyrM<(+nWCCrU6rD+!lY<+7k9PVl&rN=dF{!7@Api?|6A3%=zkuef&zB
z&fYmRgJJ6pr<2B0VtS@=XA6G4W%up3^?HVXe?IsBxdI-fie*svB>!1tSByZzvmHV!
zkDc_K!)7G1kE?@o4$DP`uAQkp0>ADgC2Y&pRxs%AIKAxV4WV-d!fAh!_OKf<u1tJ+
zZ_A@))1%%6ukh(lF6xoGQ*im;-+ilcx3yQYewZF#_iQ=10FRSm;1%n$NWY?-yL_1d
zzvkT^Qp(9v{AUx45(8Mczdm?zMpSD47lk0-$2a7^KkKW>Srf5xhq%=`@jLuN&lS{v
ztv+@za?hz3^V}+pEOg(^jq(jSv}8)f{Bu$NckS`Ky^86FFk~|1>mvq<M6Ip9+z(DK
ze)va%H$US;=)SN*ZoY)61#|XZYG=~npToi>aP<;PP=Ckgw^5vZPi&<F+7wbt|7L#K
zrl<6n*YQjpSKJ*A#s30_%MMPubWP81`T7LL<=G}Z#dXgU?3Ew!-B_VmoXYg`>Gb(O
zR)Xidsu>QfQd;Id$D6J9MO0|JQQj;U#-xjd)ei!){wn3LGjE#1xkB*JwzcOzNUxr8
z_r0`_^4*3YhY&Vd9^;P7rU@tGm;*wye?%R7$aPLh;@U*x)7SN{{nPdPBb2GfI6)LL
zl_|~;^XKMy2jh^FN2c#t_WO{K@gqm639VZ@79M@AUcKY`j=)2bOlx1U7Qg3n;|xDL
z#Ud+ruUuZ6*NmnoUg1jr&z)D{GtK;-&bNZ&`@6+;E5&pl#Mh-kht#AP$~$IAay>E=
zEc;^<&neK7d?u!1kNXCf<C)3J-dVKGzuNsk=iWBoTeo)PZvMRG<9>-bJKnykktkuU
zGTd<M{cYD9U#3+G)&^gGm~t-v?zdKjtxw&J@{7AxZ#HK>Q(?6BQ`JG^8m_rYuelza
zH)#ZQ*RRwvCWzk4`O?4`XArVu!h#FUvR+bB3*ToPQ)0SqF*n(cP0y+!nqf=Z*Iq5H
zT}v$w2pu%u95gq*qrts!&s@Hlt;!y^R%bVJ^xZtZi^VW@R+!#2;q`gnj(934LHmz)
z85jI5l+Rt2nwrBZJHycJs)}#FQrMD57Ut&K+jUuN_Fd1FcGTb5eD>|d1S7@?<;RkW
zSUIP>zBSWtXBOM7%MsJL9oTxxO}9;YuKUKg{M%1UwaaIj80u36Ou+Me(hN~Y*Zlfj
zcTHu@o$VUDijr^Cg56EF)&G4HSIBs7_K67(mrvGIxtY+Iw@ad!`E9zaR^8^xBd1?Q
z7*7!4i;>kdk*ROH{Nmly9n0Hxoj0q{wVd;OcH&K@e;>4=wE+ji`9Q|wZ=#IFLM|**
zwJDi#urZc7VCL`bOebr4<m4ZJ+vIs-E9delw>PZHd#m*5O?-Dk=Yhx91><&>?KOG!
zeaCVK#z*O&>tAo@o44xviMqM}cr2fuIkoxaDyAQe&;o~@VU5xMR}Yg{nyxZ7*!Z<^
z)rx61BaiC7_1K%~c-(8=s;;){zk+WzPut!WutB&tZHiQj(v&Q7uI&@vXntM6v-sVU
zlDqTU&UQ5xXO~<qz5R{r)>-EH-KA5jmiqQ2i`?19-~b&Y;bRC`&i(CK_9ZdVT}lCw
zU8myB-QQ?laBfRDY+2vKw<@c+UfO5T?yBU|;(2_s34BTNqKmDB=4$O?jx^u;Etk>H
z)@Ye&Z1Aa1R@a_>Q_FpLawkLS)w1xu(!CS!+`sM0{o{JPy^a4h9#F&t$}=|@a}<Vd
zoSDd2%%O9g`CNmd>)DcL4I*lN%8U6QZDKILxoz7veLk7I*Z*>qI{6dJIIb(jHVL|1
zp2Fw3KD+Uz;V#$J)iWeM%UsE8T@rbqn72M$;Y&`^i8udQa(3x5288}R3C{G>*&Xh`
zk}-Tz)YZ{^==I`bYHR(k7~D#@DDCtpq+eOX>d29Zk~0imS@R;V3V!HQZ4z!MT6if>
zUSs`Mvxy-GmS0eP7VGXjchM5N;3wVZqxLL{um7uXKEoGOQ)|3RX4tSjp}6{bBhM+F
z156SL7gg$VW2P>CE_<Lh>S$qt{jas`rrzspyx4c=I!kabKdd5X9RB6;!NZBtnbYSS
z2s*}k?A4O|eEtOz?^o!>><!Mix8?APbpisc2d2M&QS90N`PidBb$>r}Z-6v&zcV$+
zIRrSwHVa7JU3F5sdP~N`IlGcsdX`TuV)B^rtMHBgu~)O!zP`L+-TB91&4%4PE*tMM
z=3G8CXPH4(?^FjJ%QsW@$0YA^IacW8aVpp)(M7XSv|D&~sQP@aw#A?t4myCX&oG4}
zg>@-U_U}`dBK~Z<rPjRg?dlBY#S^2Y@2V}HnPQQzvcc5YBj<Ehr{k-}3a$|4j9=0V
z@@5pRFY*&8<aD(-nQ%n+LfN+YuM5md1(NOf`k)2}Gi<qVKl|N-n^Oc*CUd-cTf1*w
zzU=S7yt;3BXHHyB`Ep^C632@ztZ(CY+nZ(2xhA^lVO2`Z@9kWHlJDb7bk`^HJ-^Tv
z`Ndc2e7RBHJEIML&xJNa=H1E}8!p>FS)G}|Du3o%bAyTYgpTMZAM@u0MqPb>X5lSG
zkw*$f^0$rte=2p6YwB*w{Ae6>=G|NdrE}5ie?E&_c`WwS$K3*s#hT{7*v=k1So`Bc
z_XNlqkygflly@GnI|JLpc}zs^?woZh;Hj6n`TXnt#~jSlp2QrO@i@FU+&I2Fl;!Wf
z<)<I@6*s)tx^2a&)Qr;;qVDx}zq|c8cis7)wb$a;a5DV+_3-dZ4@XcdVv!vqgI}iG
zy7a4+&TcG{@{``Uud|%op>LnbV)Lc6e%7_WR}G%-U%;;7cz4%9%L_NFoOBrt*BI#B
z-hACDs$gMm_hfbL@UlwVaD^|*b&Uqh=TDkUh_C+(TkxpPu+0A1F5asL#16!KJTJo(
zzTwgZjmG8A1fID*D4h5G_MOd9%uy}ZLPYmWoM3X(J?;0QD}r+wJ|1!mza6vM<x$$7
z-A0)#i#FwM<$Q9uJwD<;I44yzICQLEwN~tE@BP(r(fMhu_EXY&ZaRLen3hq-QK;X&
zwN%$)*LzRFbINfiPPm1wwRv~`%`9v8Oop?Yf;guvo5)a~-m;|Xmq}j4#q!fB+p>@D
zc4eJlXaH)sef`An<JsBWDNME}Cpv#TzR$q2=U7;G$j8#<Zy3am1Y|h&)MnoP`nA=4
zzj&RYf`Np^npMkMFCNy)tFxKws4=Z%_0z6nt%@n05ynd<6&;DITX<D*>w(kJ3;4Rf
z%cuWQUo{!NSg!lk_IUdf-)`s2^CXKbe|>D4sI^XmVJh>f37zKK{A8z@uIoM?Dku}W
z&A0rBaHu64b9<-4wL|NYQdG9C`<|6p+PS#bm0Q6sYUxkWDyM4g!)}$c3mX-`x_y`}
zd*At=<pEz`h5i4Wgdr#DEV#F))||U(TI$5*YgqV%?M$9N)J+h&$S8Aep@n3z`0DP8
z!U+`?lm1qju83d0ecJu|T5_qCxktBsR$km+wR-+hQ;*60okfvz?v}nYuB)4|wZYzi
zeHLi=GcMvb59_y$`P)xMoZYG%-F>~)L0R9*`@@W0Ik9&+QymNKe?NXb@o&?I&DPTw
zvBvZVHcLC2OZlheUaqp+H1EUZ$Q7Tieor!a<`bN!*Jk(l+DnDw`WKdcmT_3e2pWc5
zv76yQR*3YxE2~a7EZ<zVh<#%6?+lZ9E$ZUgytP*i!UPh-mnUB^>ADog(Jr={;n(rk
zGk5JwjGg-~rB2^(!7mXZeTT>!&&w|VuAJOw+H^_=(lm-^nDepy*`KLgJPn##ek|W4
z>C{*iAK|>TH{-HWoa*r%88N}j|1ND`UD2Ym_uXuP_~_Nef6tYdy<(sFL^kaBP9ZMd
z2WtP1>V9B9^6EK{QKLJw-?x-;Lz_*!;BA+Hwa&9c56Q56)2)4~;}lyLcw3$ANAb>v
zx#AD?Ql!rxIolNc{x$FBR^=79Doqk*_MXr^w3hwJtp2Rs`{X|IOe;{VkGfkL)4cxa
zmtC4?ZrR?GyEjKc8(dlGvo}otw~N1{gi9m$i?mqcVde<MgDq|cm|{YM5*^PUoVfb<
z53?g5OC}`G%Wtut&1aOj`tliD+r^7GV`4cIkG<Ty_tmu9&zHwN{3(6++}k|?;mihN
z*Y%V>b-34k0uRsBF?`6Jtm^i-`IINSWls3VOM47f8s2kVGiil`yMxTRq!rOK&CgzR
z=B#<TZQoYgLZ|spGq)GVJ6)Y>b<=gz<&_g%@+;P__vgJ?Yw`Ji{>St6|Bm^~fn2`V
zgkf9A)XmfGZ@C(|E8}nWgu1c`S2H!Af41ClMDFjRy_=pZ#VREFZCD@ocCy0;=LK%&
z`V(%Sj$oK}i=|(fEoxWVdW)>Wy?<9NTK=GJcDHzU@_n|}Y=%GT_LbmVdx_!3f)`vG
zA-7BPtR$Jm7vz1kNjPwI_l|j{TUf1sm$pvGy`5t1w4hjW-R@k`n|XIGsE6KtR(OiR
zPpxQ9bAi&ChtK=xu$dn;j?L3n?@L+vjxo>vVEw;ikX74zbr_WXp0#6c@VuCwzB;ls
z;O?&N%-ciMf1fFsx;U!OYyRw+x3wA$)b-@v{&n=sr*~n>Jzt-=ow;tis#xp%g96vm
z>xwedy;`>4)Xn?QG3Q-<sVsB^!kc-48<TbE^0*E?&O2rgTOO>F{q$dDhRL_BHG1n@
z_f$I1U44CPX}>P7op$lbuFNY(ch7kuwe9%VoVhaV?(WXiEN#!RZCoF{x^ngFU9oR{
zA4$QI_nLn#`LDTz{T$u&TJA(Ho1efFv2Jxk`*ZP0%Ni2WZ$5sWdt0b~#fwZ=|I1rr
z7pga3xp;N<vfepwUtYT9Fty{g`K6z_4Bt0aM{aA_$p#y1u)Y%0F!7}t>(?Wu$zRvp
zT{&|}>P=O*jnh^;E?Mi}oV!XZ{qlJ&=2IV<G7H}+tChyQ*n3~(K@I!<2yfvN`TIXj
z25;Ba=WduBb&2cK7Pe*D0Vc*1Ew+`!@%Qqty1#g<H{<{HJU<&BeaOmJcNQ^Bh!Q>h
zxg}=xrK9u1(*)-vNFQOEv-P?7wenYC50&du_1q5T6f^wkh1BO&nG7+17am`#kdnY>
zeAQyJjoZ2YuI$&htG3Pe;x7xE@q5eK-?y*-c$s25zdye-o7uMF*|*%vv#%!}duqnr
zeS~$vo_V*+`=df#<RzKGN1%S^YT!F}?%$2qw|*3aeVy#NRG>EN_?w80y>pIl|H)%B
z-)@CaHMh3*JJ?!)lg-LM4}D#Gd)w7BcX{@NyKlP7RhvHbD7QlO%RSS!=iFra*9)y*
zHZiPtep1ESBUfAfaHZZnv8P5;V=5;v?47N+>^xVQsFS1j7CXHx?+Hxy$$p3Bidlo(
zpV;WGFSR?hcHcGWnP=wy&wYEVw(Rp--Fwmfg^XI}yCD05@)$o{lK;bIw&-=Eq|(yr
z3R^e7We1)<jy`r$_L6#W#f8fzQRnizr8RS=Za3#H`{sA|<=1;hqQehM=3mbZcFMc5
zi0Ow11GvQf&3=GSX;)vv%(X{%_r|JC-J0^|gWml(-YGU4m7OB*@Bd|55#jXe=MGbO
z`NiIQ_OM0IkV`K8bCqMKI?w9~k+;5ItvGmf>m|sD-g-8MyYk;I&pc>acIG*&`V+6U
z2^uckOF9!T=7|~Hy7PcTsm?Zm@4&ewizk11rK$1CQ{YT0^Ttz^mmbONSjW8MURl%f
z=w}>rLwR^0ot!uk275K1Cq5Rfdj%7+wrqH*aPv;0adWQNhkH_P>lvyJbUnOSS-Z%1
z>H;^JI~DKzcjudj1<fz`aeF%FBem@(gcx2zmSIh2by%!q^SW>OR|Aik^OFMFnZzbq
zs2o4DV8xfC6Z02Za%(g2Wec3<RPir9Whc5e-}c&C#VgixYR~+x{Z}tNWiezZ`y6Ay
zwYK(;{l8c7+E|r+zFeoberxgS3XvUegS$6BXIxdxc6@Wd-D0M{-yTXF7Mb)hD(!3p
z!*%WY6WN^CUuzWZv?=F4QX4Zh==`x2cN{iCXQYG~-h3#OR4?ERk-DI8IWn|X`-Y?H
zl=n>!lUp{H*afi9@^@UsY$Sf6EYsqI>bFC=YpyL6GH1LWeCw)zHScxE5Z7GhgjKg<
zH&@oNI5^DPbi&tGu`N?^<I~%T#s}~3^fzz1p|$4M&E`4zJt>Zbwc+=S9$fyDv=Q2V
z<!_MF+0brxdh4ru!XFRxJzrM-<#<9G|CT=oAHOj<%Y1C&-|O4Ba}%d?XXM^b`(trV
zxj{T7kEQT@>?+x~exIGY&OhJrefyp_D=ixxe#=5<pH?#*;7d0@(pj^HGfel?y8kjg
zJMX@fe*Syg+gmmX{O*PZR&hb^#a{oKGp{Okd(&mzwclrJzI&<vv%@?j<@O6ml!dc2
zupf!ZD?C-=<k2?gs@W=uze-h0AEhyH<xbS+Ff?pDlQ6-Ed261`L`}K)#0CBL7S+T*
z`Tp)<-JH)icT|~j{|JZHaB_?V><w?PyhyYuE!}cUrsa!C)RCAy)vf$`8oy?QEGi6{
zqvml(yX(69<*Nn7jAiQ??h9Z0yEba|_PPG0e&++#j+``v?ebtdaL!wN{(dIosz)v-
zCaloxQk`Yd_q8T3H*US#t3<ZKC(DHt119hO@#W9?Wrubyj`?))&YpMvd42D9{}I~D
zcS!rkWs^<o@4WgralQ?xDZVS6VGk?YI==1;$+7oqc%px7Z0X#Sw_&z}Q%;Xx{1(23
zbLk}?<?bZ?x}g2`P8P#G-T?DAkA(GE=KP!205PE|l3`E8*4<CI_WAX^-lo!ayog~7
z2g})yyT8}{z2+{kW$tgS<3F~1C>NT4X?6RKwXQXLnL7NZ-B<r1(f+aQ<uax<ko3dN
z{NVFpm!7=H3CI3qw04*CG+a|%a`nP2+3k;?@QMctt4(;plJ+d&XUrvOnVa7iU7h)0
zB4p61N|d1@I`zdG@m1!BeVYwWytsGPExx|vpOsI5sK)t+(=^1dPG?zvwPn(D7G3D+
zKwp_3Y|P`AH)VYC^7hKp%stCfD;q3#pO0F5eA-^049AAe$^Y{v+vPRL&v_TGzbA8h
z(d@cAuk|PVRgMPlPW<Y{@ZrbeI&GmCMit|JpQvrMTcWvY#AKJ1wk(tjdJ}y8s{0qo
z?ERNjru458d-ZhfyrAUWsYRaqGR<`bp@$>I2{PDq@}7I>;GcGj@1g<giWv_N&#v8?
zzk2FN=C3=?oIkD<cWi6(ch%a5&AOjOpcTY_F9r*@-7k!{^jP0vJiP69@r%a~9zABA
zzs0oPm8<uj#1`{;>-Rm1Z++et32n*N3p4ByZFr?~K+<>}+m@AX7A;FA7Ie>@8OZW!
zm*TtRdzODY42!ES?{<Y0!}XdBe<}(xvKd3S&Ik$H9{c^#g1E!{SC4LdFZ%C`u&k^7
zNljyRaNYcGEn|TnU$y9auca$?R(|)o_pkNomkIrB_H*X_Tg|X<x>Fc*SjCiS!M$%r
z4CkX_gP${HJ`hh%;OqEu*-_+t#h=^XzrMd7@k|ALB;&8?Ob3>`AGG0bIl8sh?gziK
z*n+43ZH1@Vil+Q`<t*5DtcbB;4zz&hXL#DFYa{E_R(QzAs`kz%X5C9m@5Eha2xC6;
znd#Kub-I84z6gQlmwH2n8m%i8S-ZFVRgzN6U9sxY|6mD?Qz;SpX&h13jrq1;`&*xe
zuV2d90!>X*8GhUe*l?@vDEF*KF*%dme?M<soi88wxB6~u^05N}BCdf~?lL_HR($;O
zSl{wJe3y?it~@-y^k|CKh1-1pcTNBI*Y3d98hNPgzgZ9T|9f2j`TnQnymRIrcAN8d
zwbb4Hf;RKa)WhQ$9)DTMT>GBIc`C%}UF8flzvQ2&pYPkTlVisUnP*&c&z;|JYWhCs
zx?j`9pp}sngT2w>_mekXG-O@E)3L8e=*Nnu75+A<f1jvLsGW7UR#-b0l148v{OGze
zXP<x9`)aH5eGH1VZ@S;hGC<s=!StY4W&82nd)Ou|<^XSzbY+l9==)X90y{tJzBqUU
zpli{JdS!+q-R~Q!6jy%wUk>*Eesu;r)8~9j0((5n<iEx+ocP`c>XrSoW&9xA{5ZIm
zUH?(|j|{tA?_X&^9Q}@gA%3!^@PU(4I@9eRy?*pqS^wj@^M%QfiS9TthWHgy&FWzv
zy>>LRFWB>baY}^^-<__KUxHVi_jvp{V|(TLhf|7E!FFtA{Ggigm~;KXlmDddT#a6R
zaN(Z5FOoK|J0G>`CGa)mFoV{uT+wDd(7&qZ?xF6>6SJyI&%e)KziX{_&-_ilO5{uR
zY8#ECn87<E1NAu?=8FV;_;b5_TEjuVIifxN_TsfOODFw^O?bQV+w14dnUHm9dkq-s
zE-il9tFrX@gpKxVnOe8}XSv0gnkI2k+R`JQh3V_mx90oxH!p_HDX!;dn7^sxzveRj
zolN!Hice$+b=og`zC~&3^VJh>THe|H@Zooh{l|~4=ZDS)ykhv^xnqH7kF6{V51--<
zPrr~a1v7pfe#FVJEPTc1_=xN43#;<OMIE4yv11Uisbkq-D?ES2#~b(Ng;v&xRMwQd
zX1coHWj=Q*|AReWP1nD??lk|QZqy8i8O-1fZ0iLW=5ytmAGow;(~?!JF$ZkzZyqmZ
zn(^<P`Gc;`r}vIRIvs)x>krFU1$?-<=YAf;K|h&^+6Fq$XRl??S@1(A`|F1_S2Xq?
zpLOKt%KBN4S3uVg{C~#K!NSgW#o$oly=!Jy60N5$ii&WUx2o~^-#eZDwQq_a?0b7A
zTsHw)9K`c5*z+YXo7ZF#c6L?S*Fr<<?XAr}EAQ;`zkmF6(!{z=_nDz(bn4e<!7@+Q
z>`HU%tJ?kd<JEuB@9r-?$g^r%TK4jF3I(hN7L0Bumgn5Ow|SZ+Z2v{~E4_b0+59!@
z9_riI`BcAN|Fz*dV-UZ{>w=25;^)tW3_kHi9Si>PizDOmbE{X6RLr2RDrJ0d)hu)M
zzSx`prd?aTo-J(s?YsMxJ2Ol}S>)RTE1s=X6U}g|_<Lol>z$Hit1rCexCyPaRx=*B
zJF}Ws=F6ik6IT0N*~Z-$`*lI)?Jb7+_X2I)R=;>@X=A>}j`QHOxA`?+YHQbtFH@bR
z&TxVs(mmy3*rTenq~t!|gGI|D3+2}7NG)^gk#g8_L+@>J#?xay2RFZ({mQ$)>azER
zuPcu#WPs}HU*Zf0Za2-*5Bn!Jb?v_HMR#u}$2IUt?OesunRsEwGsbyy^-o=2lknB@
z-T8v`^OzF-D;L^bz9KXWvZ{O@<A<!-pOZd+Z<=_Ztex{uCWBRd%@fP~_S@pF8#ceS
zw<<1em}7b%mTi&r^0_hh6W7$))pmV)U!eGKmYn|EW@vZf5kti%_t@)eZ_Q3jd2>~7
z{xQD_=CCg><=uBjx<38*WBtdtHD^>$cnj=U^{Dj8ky5)|CH{7d?6GCv?7Y86==+A=
zgl<f*W_5^J+!PmG-M6)%ip|(nRG+ck@4DDCIfHpAZU;`rZuC;|<9z+>_t!Vxf9lwU
zJ<D0nmw)*1p$*dR*yYafCbB%8qmjo>ong5#$4qJWKaZszIPv?1Hadyiy1Tz@k8GfG
zc*Vr4H9-sZ+<0^^d(!d`OXssO6$bPFz9U<k8{Q9T{#NBORD50kKU7@D@5IU~sT&K|
zSvQ#WwPdUDyRP}O^=-L8@q|@bYvaX5i-l8Pe!e@of5B@1Pm`9f*!cA^7sGu4a6$R%
z9m5B+%g2vTc0IT2^UOMrulDhGZ^tjLovXki`^Rea&#-ToUNkQM@LsB=;P0>eDE=QR
z{|>wFvG=by`*;=Wp99eG3LAz;p7n3%^VO%l2{^$pd)14zH|{?9DB-8Oo;64Nv(2Bk
z{l{+ZPy15v@IoTn#%ThxPI8~m|Ni#*|KEW#@BI;)eZJ=PL=(#<WBB?Wh6Y(jJ@G|(
zGh40mRx5QKW$6>05~9Y;Y+Wx?Q?hLCe5FPHP4Rp8ygfUmv?%xd&Ch#l<GmSbK2L)N
zusFk%*-_J~IK|QyRFwX?r4@E0{7+4p!kYS+dHGep{>)KRsFGy*`fE$y?NzJ%88<KA
z^NjPvjx`L>-5}+R4ckM$<Tdve&bQk5<k{QCztwwL7KmCng<PC(8g9IdXDXwotAE2+
ztyM?6o>o0x{r>P}F+Mw9rb6ioBephBY5z`|A>Xhz<~VOjMHSZ;mwnQTJe)pFpT9G>
zh`i>Web-_=e^2$**%jG*A^zEi?<FZzN?ovJ{C4<<i0xi8n@iBX1$V>#;|5(^8mnjS
zDeiD=vMuq}@8gs&a@o`2mcGHf+Qhiies;kR&!xPR1>XEKn8%Q~UCLly$$9&CwpPcF
ztv<g<y4;H)1u_L0C&rNf?{obj-qfqUV%g8QjGNzo*rs#fX4HWgPLZo3(zZ_g8+P{>
zF4UD$uiheA{8%!BYtymb3CsN5^jm&cOl3a4#wn)m?9`tIt4$m7cR&U?;<y=JnXLDd
zeQ@Vil*|KvcY!VS(WUxQwpNSIo>5zCB$1FFJ8@5$ZPdNR&vRGA-<-|nv72l9t`ec-
zDxKO>(y!}ZLXQNw&e-sLvQ1v;_D2SlDa9@qxvsG+d|3VE)O4$F1|Bx6!xKHdFQ0lK
zyt;CSMe@&E_tKt!{k_a9KGWR3h!<QJ-qmOL_y5h_^eM8}D|L7H->tEJE_2}p+XV+@
zbtQp>b4sd{7A^XkQ+ZNqfBN~)vo^k|G~WED>1}Gi?I!nclh=Oy95KyDD?mizh{6O8
z7EYz-ZZ8;0&RO2uxANRf`KgcBvR!z<8gV}=;>Et$QmuQzyT5&Z``6M_a+8SZf6deP
zeRN~4Sh!xj>-^7}RWV80VpTZz>Pr)aQau>FTI)|e>+lj#dg|U<dS&;L4K-?MXO5gI
zz96;1Fl|~~=*AKSzT405$~YK%2j0$qe(i_X<*m8F2lN<94)dDdDLCBgFUoN56~nX4
zpfqm2x3w(2I${$e>|_%}7?dtITE_leuuE-%Mnd3KbwBP@odbG_d=2`S86A`OXGzRy
za(JHb&hO~ihPt22KJPMZ$lLL-O*(JK#A6H>md&tN6-yLTIL*Xk`Q>JCw_V6C{%YZL
z-pv{N40E|H*%xuIW-i>)#Ze&pz;bQG<FXL3dv&MfKcBr}*pR0#0CE?v`JEpohqGBZ
zBxW3_5<Dm4T<}ea^ALkuPh5l7Zp*7>SM811lpY0D)^I8caZcgVE|@cgZ`!Q`nT&In
zF-_o%7MsqJ8p5_CNIv1%iZpv4$3?DocVtXf9V=m)k!xqX?WJ-<?^Q3Z9ktyIMx{5d
zG3?Sz09kr6$JJt~h=(bwp_`*7^V7-(fr2^gGS3+~4g@Yuw-(NBl1P4cvg9zYGJ{Fw
zkzlq*ie~X%oEA3)I@B`bbQ44-FX%ZT5&XkCeb<@>OI2yH&F^HM?QMM;w?{?v@v`m3
zfy_?T8<u{PGhxj?BUh$*JnJ?~WZKm=-`jMV7TuLP;BDLU)gmsO<x!h--i@<~J_eKD
zzuVDsaGu$h@>s`|yrMv5QIYElR@7K_oz4o3isWB^eRY-$!<~sf9nyJsbQva`lvSEj
zW7uK)tvDc7gF$(sUkEe*+^5}5y<3t5JPQ<S7S62P6|ujIOT(yieS$=N*bJw)mPYKA
zXC7KEo~B?R`c265^pu843=8Jpl3s7p7|on^?kgiGksSF@vB%@s<QMPvwVk_WJVWB8
zyON}H$~Bn}Kbs{_oYZ#JFh2f4#7pgQ#~I(msw9cW%6BE?U%H)UeVBi+Kx|K(y+yxx
zq-E=h%o`l_3O$=nRaMm5HHJQ!{EqeKl;+1aOn03v0*)nT<uG*qU}9*hD3P1ElT$^w
z@WV+94n>Z%Ckj(0a<4znZ=fJ>&M7Rf)8m0bz^U%@%HkiQ85{)t4ETDM6jix-SxXoP
zawIbxFSPpN?o*%Ili4M_)I>jd&Ifyoi5yp|e+o{un&Eh8)09;+9Hb3aHF(Wp+7TrY
z6|6qZ_}T^EjcYgF^fz#CxV-Yj5r!P`X6fAX%Wrev;5ENvFkjlDkNNq-3%4s-udkoy
zl>R#Nv5cF=6Y<bRyXu%fb)9<ny)_^xlD+>px0|NM<E>lou6iSIymEuU%%e97^d}WE
zihR4Xqhsey&NDuI$!SFre`CX+<cfxyD9oAIJnL8K3H?=08p_gBo*$HWAGcxY6D|v;
zzJdi)k`n8rJ{u>4LQzTX=$|hVV$YVJY3$Z#P+InPxjLKUPnI7kL7y2;pVDqUFYXdo
zXu7G$TkzZ&X2qn+NzsA}*c!?noE3?ba9F@%(UEDp@S5EW!(@J|ui}vhI$h>yl;|i-
z+_b6d|9lo5$;GS6wz~ZD5t}K%FoolF(BG8FPB&K_%54!iEoH7<*0(Ztt!Z=6+4oV0
zv#KY&Wnt-R?+$t4m&Dt7Sjh3GOvJl2dwF^M?{;40HMi?_<Z#Rn*S>fE`}bw_>m#;_
z@!S2K&2-`N*6&Mdg3?}UtcVa}2{@I))EKmI-R;L87cI$|X_NQ&)!I+zKSqd5KQHHY
z`siVXhKc{m7#zZHOIFSdm6khnYi<7y@i*J{GjPnbKU663YG2#8)AEh}N49+Dc<vgO
zXJ}(*Z?uUkAnI<%n>|5|XC@w9%C%ZOwpdf>qlVkBTLw33C54q^KRuVUJQ}g}qhSTJ
zqBzSc#sy4!<}~sLA3Lt}e)an&3mqr8__G;>n$GLX5t^cE^jZDSn%nA5CU3-(SzN9!
z@=apjs#?u+W>@xx%G!mR87XGZE~Y8378Dnrc_dotz7OM$!z(K%9=){khR^2*d*VJ6
ziZkqbcr0DjMowR8Vr0#qf7%kVudXdAXI`k2bL*o?5tmm$SR{W#!>Tv|@!PSdJby4d
z=G^*fvhB`)ourE#$J%xY%$$F)RrtNqHUn;kjGYA>y5f9_0;gQ^>NHQSlD@d(BV&La
z=RE&ioJU<*o_|!5i*`7^_3@1Pl84`1;h3cK;<Wxs$4Xz}J^vOk{My6V5csh2%#t3t
z)?#*Uw)OfApLUh5SaF-dpsn?1rpq%mL)(k}o8|ZMI9a4Tow{gEnJ$;t^hPz|`LPTq
zRKj$Ra&BX;cgeRqW3h8uzi{KiFJkT{37so~cFJ&EoYZs5%vF#*u#|nG;gTb6f-|cp
zU7z~B{e=0He-#>`8g8Xh;g{KG2m}VE^>69erM~{)_JEpTRtMdX!$QT!I+|xWRL%@J
zGmkmrL=fZcqX)fro9sIN*p<n!Jgnq!Z}qgNf|vGmy2vCS-n*mfqjJf%IbzSn`EFLK
zu87{r`qXrFK;&kwk4Km!mM+?L{gzsol(@nJj*0ViPp0skbn#*AQ(}Jcnf1X#n@zbA
z$rBE;Jk^v~`k|^;LvKC1B9Hd<cP{ba+{fB>UAS7ux3RVIh}biOJN2@M|6VWrdPi}}
z^>uE4U%fqXO0VI(yicUjmq=bG3m5TahPIYH2j8uhkbfm`)0W>!@@B-f9l}44UOjQ*
z9Q%5v1g68@z8sv(Cqy5T<mvg8kigMm^pHPIVf_xasi)18YgRBj+lF7L%CkQ-lXXSJ
zJ~_*uPe1%%^4j<}y_2!z$e)=v*rJy8s(wgMHa#J+@pH3T&sq+*D>ieJxO`n#i!8n8
zA1GzKXj{R><#97rtBkIEed(dEz07;}jBn=4HSdH>(=EDnZNrpp*Dg%dXt7u*dUo#m
zNUnI-!?zU*@6Wwk@OWNYjRjxq+v$ZL*2-rvT-x>4e{tqxITq(c!(8tP9qtDma%bAP
z?)5HM{8i>z`tk`r$1YYs7Fu?kJ!nI1qDc6a#T%ALwR~Q%t<Kizp^xyPW<|MZheS_a
zF7H(rcO>dNG`xF#_QmTAxA^C(N0L9k$g=I#+nBbo@N;s+&NOzLIQf`~jY6A)55L$^
zCG_~P?5y*rr>}KBJnQ$tN}C0XSZ~i2y65puRc<}MtEhHh$i;>frM7$Dj5GFEa4-aH
zeq}c$bp63}Rr@!l>i@RLFJUTr79Wutb^Xohg<s!J-Z-~S^h(e1O!jG6e5O8g>r~Ue
zNQdm-;3?d_tE@kAr+;*V^l7`3=9-f(<QbcKluX*Dx=13;u%UkA_2|#m=Wol*imrLs
zCjDLM_4DuS7wg`doU8jIrWSf2=e+QJhsv*BDQQnvUfO-6?9iv*%^iAY9v?dScZS5f
zV|U)DEK_e2|69;^T<OK@9WDF%ycrrk&)?Ho;HJ0fbGIN@dh*+A$0yE?S7Hb}<}4uG
zbzb6BK=6LCt=iX;>(aO;KmPk7&$>UZa7}jlefQHpn>Dmn9(`teURixT$H#~-n>l~k
z#`W-)E_(dRkXa*s>%&BmDOZ#PPK90CStZNx@Id7rg_gsA-dHR<&TeRJ+H~U0j-!ib
z9DL2KWW8P_vU2H(Q<^N#KX$FUzvM$uVqw2$q~3b{hNr&Y7q3a<b^E=3@$RQAZM)Vl
z+LC2@>h(3{nH_g8Z@8Bo`dhtO+l@8S%(%X1_U0z50`-F?YS)TARwhiHFMquA*j%6J
z&kNr*DPH}2(zNMO(IwYu|E7y3YCU8X?p<*8p24NrEANT9@lNBoxGdo84Qu1w60McZ
zyt^~bpI90u>YZ*bdU&}+>Sfmj2aYy4C{A71V3(%&Nuj0r^~qOl(%-`b`VL>Yq0lE=
zA<Arfoq=JW1IOxX?~a{o-`|p=q}5@u=1BY^r6~;wIXk$87yq^Rd(rO0$sd#6<fqhe
z2?i$Kx~ause=Vm{By}pUhEA*+2bb$a>13Xs=Yl-xi%hmKiEhn)@Ui0J%_=_G>wZa9
zMH0%*<{$2z|1T9;x%9@C&ypgY$u(jQ_75#|&iE~Q`$({7rG&kcjmFBD#?tS#ervub
zFN$!kxFO`Xp{nzYpOTSv<I0bYU&`ZHo{ER}o8P*>?5C~vdLGxOUpZQgCr*rPa4--K
z(a|^XwhZzTJaxkLYnQG@{5HO|&+Q$`Z*%tWY)PuT9G8;vtU0L8Gb_-(mhFPkZ_k|2
zgISl;{yv|>7bqmFVe+Z5>+I%d##euIsc#9Caq6(Vt;+24vg61kOJ(V0BBETY5_7vE
ze)=*jm@@O`P630-TQ<eo&J7WM@nQ9}Nt`9W(sX82=<^C|NTvsK|7NLIU=U~A_3)T2
z%Rdgs+gFV(K7F%4J^!jn&Y^qi`#^O;iqfl$o`dts=GbiF4^IBOz4X7)Chow1nASCO
zm<r<TEiN8Rs4Ekic+<0||BHfP{DG;)@()hU<ev~7(6=>O-o5gx*4;ULmZ_eTIYX|Q
zE!wnAutlJxJjSj5dFq$am_rlG|4Fi{n%>y;+_lBHxS@K-lU9MI&WCYxe*XxS<<NG$
zd`(@DC;fC1{|XK%CkvkM+ZOGA%#^0qp7+}BtRG)eSy8}0+wB{KSeKp-jM*8)^7YyE
z<{(AeJyoxRXUNIBoZk7p;O7x(jreVHp{LF7Pj0xE&3RH{^Ai93ce;%?_BpO7cMf~$
zq|Xwl^5o2t&F!;JDyPlQJRmW7t<MxSX)6bH@#dgr+xe0o_LK^w$CMRDoXjxEJ<YAh
z$d~*mFT$|FZvK5=#@!E(*&h0*^2qSb{qOw}uY@CJ^sK3|`SWIbKunnSnfaP7SyO^y
zZ2mId(w9H{=gkq{_ui#{*;twqL$0rNbt_}!aDVWbRgfp0>%3v0=c>0q_3R#U2p*B!
zSZQ#|z|yYa-D~lJzppq&M8cEbZgZdLb0jx@#p-FM3zy}|CheYo_~haJ2LkfB@7@1y
z8*;@g@o?YrhhJIWd44dza=YvF@_T`Hk8LtCZZ&u9+REg3WJa4rms@(l<4?zD%#(1i
zv8s3fR-CnlKRCJeMV>8Vy#e#o)8>m8tl{ffKFxpQn?FT4bq`*@$g=EfJl8!#;-%Z+
zUF`x~>Gy-r>%TwyK;)Rj884=-eg;XiLZ9<$tZ3?FY}9D*ntDw2RIhTU6^o+*qhO$1
zvdiHuf-7ftuKV16W%i8|S)R)bvo3a6dL(JyGz^W3+&(9D?gE|}Ggue9Z|N|*>bmK6
zpIn7-=&n0Wj#F~V#Jc0xGAy_+U+{POor1^f>VFi^m@9dB_xgXbX=?3^3`?i-{`hnK
zzeJ~tj%xIyj};d$S8~d~uaDdo8|m}p$#g|!ZT3>_?a4=Py?rp*>8$wE%3gJu$CXQ+
zVz&Ed8J&3iRr&C9R)+}_r?$U(`ugERo73MfErG2Cc=38?n|3<iqFss1PLemT<)7_o
z6kPE8mn+ZLZ5)q3dw#jMqhnTEuZG_G-Oqms8Z+cB>R%+X+T6Zv)2pj(A@+(an=dD4
z>@DDsThAY9>6&2a`k^51M^oaDKZ+H#j6eQ3GU}}M-Y&uX^l`@-zr@5if&U!O%^PnV
zl36rS(*5^r9}cgN+qmTq)ax>D?X{i|9m3jI;d4Ts?c8JM!@t@EdD0i}e{3_W|NY@p
zzWvI}7sR}9tj%Y1P~_GAa&t$gpMsWPJ6lgdO5pY>i+IBR{8lMgaje(HM^L!1y`_kE
z*}4B+_d_S%Q+DC@k-S<ZB=l^>v%aN&T4pq8voFpxkSOLjHFrtv+!Fi3FT2(+3J6}G
z5&HUZsicGXogJ@}bC!tz{`d9#ll$`355EWO&Dr{=U|Txx<BG5G|0F(Uq+GmxchmFA
zHTO1zZ|F`GnX^JEOxp3j)n?9{1-o|SNOrjzXYReZ;ggcDfvsf||F_!n2G=IX|Kn>~
zc&7T3oP_L-z6zh6ZN1X+u9;W0KJT1wn35)*@c5nnDYtVWs+SV1j85EPb7Opas51Ob
z)TB-et7yN39nV)SuI)em>|)tN28IQBXa8!fi%9gU3$SbabgNWjZPt;S%Jz=0cmCB_
z7t=ax>h1TO4*73bk`{iO>Z*8ThSaqsg;ygSn?+}?%Wk(?oBijLROpclO8zT11f=pa
ztm3ejXtsTw#@#aGByXlc@kN8F2`hUS&ty&uU7dAJPEWM|INvwJ=m|S!R5=S5OCFP9
z_Sa@R@SgupasHva9Umh(`yOAoSSI-X{ck&lgGYXTj{nWK>2sG4<0O;#AAcFYlx%(Q
z>#A_Z-jb5Q+cDd+q{H%WG%va&72q|s>Cf%BDD|xqg<l=)JY!`rQB~zZ2m9s8hiA-^
za8r_VO+TI4)Bi={h*qU*=#Af3^6y`+JzxCkw8{SK>u$Bp2#uO<@%@AHsx$MR2JN!1
z-eYI7=5Dv>YxyI0u5kRa(vv!(7<RGnY4VqC^ADct?N`#??y_a6;;h|=9)C^#+#K)z
z`J=hPrRz*~lJ2>W^;oO#yk(fsX{XZ?;bFqTxR~ci@;|mEaS>jBU+2b|G@R$^C=?11
zk+fO4x&1_sX0pK3@?$>lcuIFoKf#rJQXnKYcm<pJr+q6gZ<@rpg^|NkEAeFVgsgAP
zGd1#N^7c<Z)pg!0ca8kbDxT!t2T3y>p1lZ8I?3?s&pM7Hyyox1K9v8xWhqnfnVq5G
z&!a4xuSf5@8%#;ml1S-kd_MWb`#o*k%k2-`NN9hY%X&C+MeIh-*V}CSdU|qHCUbsR
z6hG%K^K=0|IevC0j!88_A8#;C`Y54t&hrtA#$pdOp$A6`CwEHxNMZU|A@VVT<>L*e
zMH4NLJPxe%>vmgaXm%xY_x+ict{JyJNo2jgzWUl;b7hHBPH$JeeUW9!$?zi6zWq^G
zRmGmVi@8mbLTy2o;W}3AUX=l>Viu<;wYey%&8RMB`R5=Zw_e_^UO?tK>qCnl%rh5p
zv*$bc1sKdznliIpR9epQYuDNrx%TZB|6QA+%GvpYNpF4)_tB}nD`NHu#>HQ#_%F<V
z?d=byTY7Rwegv=!bxKHGv&|^b+nFutusV6e>(ANSHq;pflrwKspWETJXCYH{zzol$
zZLU?p!EbjwW8jcjs4#^iOy|gn9L{9JfK?g|x(1UNpT8(nzuYtT)}EVYr}eh(E%uAF
za?LWxo1wevbNkMs$o%TFI<*Xc?e@=RC_CJ{+o0{2b?OK4Qzs5~@BdmKHR}i0*4uJ_
ze!TyGVIo(AZ0gn3AC7SESO2w>Q{mDTi+HW+f}Oj5-qbAF8hhYGfVvx-)r1b$cQ<w_
zwj5@j|J#hKOUpsiRY_3z+fTWD@)}PsUMR6wGM+3UnQ?fk@%x9TBo}N+<K^<sniw3=
z=AgiA^VG3Y?xYLP-`KM+GVP1GRTvyIze-(Mb4Q6QyGLJcQjoR48Hc~Keg{Tf?eISS
z-BPM{$$Kd`_FEf1{?nIiu|8C0VUkxT^xW>3X4<jeg-@^Cj@bQ}dz$I{a#4mYRu7%_
z%A_YOW;re5$IYCxCix7{veXIgD)${jPg^W{^;o-EE$M(`%Zy5XuebL@jQG<IMn&D&
zd1I#f?ECxA94yjdovdzDoA6D++I72BdTE)KLCxe~(TzLP&qzA#KMm^8$BOhYI{!8Q
z@a_CRF@}Jcxc2n@zuFh59q2J+t5<00zyDuTZ~o7Oz}qV`Z?vraZr{D;j?#ydEo#X}
z3T0~k2|U`!YBJxlW8pn99hWpiV@s}M6)a6NPiSg5$JJ?WD(;#vJ6>yp8%u|)@}vEh
zM-~aXJX<E%>vR8-rKa9`_p6__a<p%r7#+}8kT&l`K;5>gIl-rr53hS}U~1Q(z5IJ}
zT^Wz_-Ee~|wXU0EELJl--RgVdobJJ8cjH|YrZC1Uu=HPFKgHHF(t?90-bm10X<I|<
z37!n2zKj$$=UQEfS37$a&O6P((k)+a&@*f5cSZI6A*q&&UEKT>%j|yU`t<WJSpK)?
zn9{K?b<1te$^PVACADqAqCDjasqlHlEDwINTzg-`c>UZzsn5oXGwinUOTYU+X_?$7
zJ*I|59}X$bPXGPmx<T}!6)ta-7Huy{RLhyaL{f0y2bat25w9LC3tQ^dB)In|ckt9b
zo-30RC6|3<54mA>bV}s<!vVrgXZkpkSKhD`?iQP!C*Su(R&!VDifqH&qYAV7w6-(O
z5xlXi;jR>@605!-zf>fD@2Bew4G9*~`n8|!mD4_LNbYG2?Al)c&Gt)KOvxV3dIRR_
zc|X{)UR_t3+0pEu6};CtIQhlPjAJ_&=O22`uV}rVgEzY@@#ZPt6DQ6Hxk}q;Jbqet
z=+(-J9U==|*aiAJ+P*{?DV;nn*n6hYU+w6ZB?~n8+KdEvQky<kJ@uUKug3CpqlTJ~
zny{95_xW>w)Jz#poYFnEPQ70GvGd)Gy#)fDE+PjD#9m32FWix2nPJ2^&wte`7goWJ
z3#+fkusr%$aj?}$kR$b!Rdd(V*$+Qf7?@t`K9{Y&!N9)t=S)MNzAp?6udcsyjSCe0
zvrwmXs_@h!kvml*wm;^cA@S1b_fcofnJ@2sGwyIp+n95ekC$)KjJsE(=N~)jU)PwC
zA{FlUmrL8sW)hSBQbmR>r`>L8HAx1EJzV8_pvpLdms`W^dsw&al?4+7Oc#jMg&k4x
zQWxGDHN#MsA<5{&<$Y_tdghzhW^C*{#Vo+05VD4Q$}9e}l1|I4%{NK3&g9nq@;kL#
z*;g$#X+}xO@fk%rO4sc+-8N~A{LR4j;Maj250BjylsTSwfB#=m2F16(m*)Qs5B|W;
z5VxNH_rJIQ54||Rd;GEZlq-*3PXDLO;hu8MUx+&{-?II(dz^DlBA=<Y+2i8)zsXO;
zrko0vQ57)^^js6hn0-Wpr!Oa=<*VkOe+(<k7i2{#FxlBH47FH&v^}q5fkoe(rl6ea
zAK9~>`zvir@RibK%4jnDP{TCEUqN}dfbZ@3Ob!Aw=Q_Oq`dLCY<M`KS$_x#QKCxX{
zbBk}j{u;^V=fWq>=^tOlzOQSV@%uzIR%we{_q%Q!l94jEU$^q*^j}=-@BU;uCtJt5
zd2;iM{e^O(r_Jw%o;P1FyJ5qs+ncq1Y<(k@^qe(g+d9wqq=h<u4kcM)6Hb)rM}=-=
z%P~?;N>yX4f3@#Gm4I6GsXI@Ork;^IGLu*Ly+7C4{8L|a12-?!{PuX;2DT$^tZ&MV
z59IAA3~#XK@00t}s&lX6Q}=%U{q`AF;XnQ`?)iSpUWe<?+Wqe}bME|WIiTdY;yX9X
zVT<}lwOeBTaBL1%j@b9hZq2<N;;lzRqu5R!jm<pGk#&2CUTw?fPaBIaE3b&#$Qqpd
zcSqq*<sQB*$vG>SD_uh)_WsoTu<Bb;i-5qRgRkD6U-0@?Ax~-iHre{LMe?z_>H)j6
z*d=_W<kn_ytLK~Uzo&8GywfL6Xgc{h9=-cnb~{r}!VyUig=YsGC)cSwo2C;buw24g
zSc7eX(QUPNlRj7)?!4KNA?U#S`*6y8`^ADL$!^^urB+wYopW8UaP5Ka-}EDQ8ln=<
z@R(iJ+OM3%{K><sVdXx#Wz!7K<j4o#+;ii)Mo?Cq%)8I*G4c-PcRW5P^dy$-V4v>y
zSBl}o5$^wttw*O$bNG1XV)=!uW!FCbnEn30&9-;H=H%QuUnu9(%m47{`~QZ1@|C<j
zY9Eh?|7WP4_k;Jzv*}IGCzr=oo$a+2pYmLgBX!}HU4qr~f6ot$xysS^IU#8WxBLCS
z>^(dZx``4?SLEL5ymfVVP@nysYEk7{-DPj{n;+)f6nf_NIq}2EBeBKzENm4L%~r;y
z{ZKX*tjezD5N38>8WneWb@)~pWvSU>YL&kmGbQYgU2zC>{BHH#QFKS(n&cVBF3ebQ
zV2$O0OY-g4c2AJ#Gn~4#``=#=-Qxz#PgaWD_~sRtR`@reE>`U0gblZ*T|M`s2Hdc^
zWLxu3;ohH@<%|ra+UASPj#iys|MrH5ykGs6^B-?yZ?|jXjh1%|TJx1z@kP$=7W4Rj
z-Y(D70s~@t#rOY=4~Pj{E!e!{VcTEh0HfBv#GkW%Z_Io@ePVEcCevo+47-oZ80Q$C
zTD)bG;8pEy%VqX|zNOxA#&_1gwJY{Grv1C6FUxZLuI#`5IS&u!9+Zn@WH1iS*ec+{
zZ8d}E(2U6arqj6gbUg67e#nQH>FOGp=5NJLBKi)dpC)Dfe-dStv{9bzVyjritj%@L
zew>J#@{lEGrf%xh7qgZy<aRTZ`R(g4bGRhhxZ|PQEqkxRKOgi3<7YVg)oIGrecP@Z
z9bYJ?f3NE4dYS&1(CuQ;<@VasIygRmZh!w*+pgw!Jp+T(tg?qEr~f-}EaVoi`JDYn
zOmeH)R&TfAtyk#T`BHF><)3^B`Bzs=*DYAFBD%e6SFh&roZSTuUo5WJ8&~Q?*V^yd
zr=Vn<{NlYu|L%o;jlqjW(=I*hzS&?K{J>#N@T9Q$nO6=jdl@;gHM#5bypZS1*=9(6
zFJN*$bzQ?rvCG40t<tsfpBoO?yNT*;WXyUcr<9g6`_KWQq*nWxUHvV(7cTd$VqNMd
z$8aopOETZg-18~6;0f7FrV<)Y3%^a?&cM)b^Idmi+NnQBKmF;9pB<GSVLM@d&ByOg
zekJr@Z{K|Uo@4rJNrtAqXXdHzW9xey^Wpiiw>xKRy81a<n!WwYWwfdLfJXnfZgztk
zrIIqw12=U~S(Ns)jKwK(+vB5)i(l;d)_L-;=Yh&SD<Vtf84_0Pmb97g@jFF)d2NRD
z-j5u{>zlo&8k$I`u4Y)Gl()et?AF(mHh(W>=ezs@Z6+J`yl;_+I;YvQkg>{fg=xt0
z)U&Ivnyidpwtl+Gw5@$n1zF~-(Q{&wjz5UpT&8k#>&9&p3ope_mavt`^)alCn;*^i
zqD?weO0Hl0{hvqg88}wnUvw$!w55Vn?}IDt`%7%T8OQ(R6Z$wKW?Av8#kCoBd*vAf
zI8q<oTwm*+v+`M!y?I`_z?$11D?_g2GBK3I{$|O2&Yv;kK#Ee^SL=8W%S%TB*ps-Q
z>AwHemGvZ~;PlP%gOz(SYs2=eWRNv>70{Z-^Nj7nEGvh!&UaH%kBS*ideCT)w92H-
zOJL!TPX?3k9gNbJH2rZo_nt_v;oM7yH?hv*)VOTioOUbmbDz|<3ZJ-%fmzIQvURdK
zKI?K1u5Nz%=G*yHhPwsIzBh%A85r9({#&=2fn#3H$L~k_#L_;qw{M=m=WWHCWoP>r
zEm*-bMf}P><KW~ByR{Oo_P?*%2Q?nvEuK<gBUfR=qU;>op?^kMYVPqjUpN+Ve}2%x
z{x5;!X64ckKWjMJiUT5oc;|ge@cATC^8T>uP9r7Bkj+KXO_G*7F4jmqJ}mn{?{~oc
zE$(ScIgc+ayXsf6Rc5p7`p>u2BewqJbXJ$~stj3wqwksUdS$Vh2d`xCZ~AoV^0%eO
zw67+f$h|7klkV|*6>oEAluRPqzZ5kemZUk8q|{sr%grN>bmZP&6TFb8N1#AK>&&Xu
zyE7C;Pn#qJWLTU{S?^$4psZ%j_f*qihS$o~p&HqY0>-Z4X|j%29)un?6*3Op&{t}_
zb$Qs<S;Y+eYaKOqR|<F}ytw>=2~>Rl|4^~#$CC%E85-{P*STuUP=9tUyvJ~hseG|X
zp23{fwcqRg)+wvBJYe3qRE8m^{()*r+Vgu`w;pUMh?p_|$cY2IJm0n^E_mIwl6Ts5
z@rL8CnHP&p`Be03&zfC=OGC8-BX;pTJR`I5@U`Xq5*)`H{nZ4cXD}x_Wjg3cF+LS;
zayNM1dR|;$S7m{W)5Dz8Yz!}%m^7aT#%yF_InaCB-Qd=Ju5*tMZVI)2`qXQcl;Nf8
zO(*WOJdH3GW}YD@?+})^F;V(ofLfP!SmKiRQdPJ87iS*-ylu&e<>wiUq`3n67il)n
zJ<uxgaaPV1ohnP`^-^J3_dCjDSHA0=q1nCl|LtubQjfipe`T_c>D`P~Vv|;|=(@1Z
zSiz&PQm)z1HaI<n?d+;AGa^2$5#1$lIVo73XWp{=8xG$1m8KTSbSUGL=~A(>vdIni
zpO??ylDA`G+e9C=ix-Qe7&c@cpWKnnQ?vEr{kyMr9Dl#f_B^-#??->G-K-Ndo~+E!
zaOREEn%kcY9-VC6!eHCYxzhjR#Pa%%&WU-KQ%_}IUsQLtRzqXmBnu^vRAUB#-gApT
z-^z@!`Ddo#tE9c2rN8FkcZbO*{hwAWnK4(&)%~<4&)1kzKD8RhHTQqY6n#2<>DH!p
z!>&W0s#JsmOSa1#FE}6iMD(hH_4<%~ZlS!<7pv;_zqMeNeZDd4^JKRT=Os=}TYKE&
zzUh(0pJ&LtbjwQ&m11__{p_rxKkr|0@U(zcr;Ru21=<-m`DW@IteJH(_g=@j{r<dc
zzCAGvU+<gDD?7q)Y)0mN?rD#>opc1`gPOIa)B5kK1Z>_kThL*FPXES47TG-STjh)7
z`z0L}@@*@B#xQ^iA4zpPku@=LmG9~|vDVwgGqB(PrS6`b_I&Ds#II&Q6<>0*6n^<T
zpTo!7)mE<Z-E9w*q;lVz^2t1L^X31>h8I44<LJ|&dtyn%-k*XZBB6@wH^>|e5Yt%v
zsN2R^Q#6T#&3HrAW#@>!KND4i4SjmPEL!_hLujMKwcP4E->mLrRqU~=*kk9z^L@eM
zrz+2uxd%pUlexLml_T}Zg2KnmH+FoEe4DfW)#O<n?t;B%l#Hx7=lL(#zgaT9|BnpA
zgy@LQRlj^S)<(6a*vy)iuwhS`uF~em5^wXJPv88$A@BKTj<#Y44#&7c-a|8gZqs@2
z=88cQcku`I!^etWe_XhshV>ZRtqYf{n0_uTU6A>L|Ap_-X_*bO)1z2*%6|wnN*x!J
ztw>4exjaiodM%4+!b#0Hi#OFzieI=OErDT%*UbfK=f2!4|F!R+z}qC1vfyAbjqBf6
z2A{a%v~o?X|LR{?{~gg0n0?0Sm81Gb#)30aR|G44tm{e&eHIvQO}zB@Mjs>34$xW~
zkL@3RHt(p&vfuMhAZ+bk{*x|uif;bgDS2ek=e}cicl_l%+g*LW_q4|mWsdY`k3R4J
zIA0)o#`O3bmt}tx%Cx^cDQGgkO8#%G*Y}P;kFu_q<+wd=+uLzm>A}w>cgoJ}n=|`F
zkH}L^i*wCQlcYqZ>M|d%yiikRua$LOLE>E7dGQTz)=jCpCHDFyC;K#?q@pB&&Ip#+
z+;l_3OT32)Beo@3o4v1OG?~e;zN&HhFGcU)T3gOf-jpD7Xy#6ibgq}bFJ&F9*}40#
z4BPJY3w|Dn-ck5e*d(`-DRSr0q|AU{431uvCTr>?K1Q%yPOjZi_tN0n`zpaHY6sPY
zHP&W29iQ5tb6i4tSKp^wrOR}Z->#Y~A)UcIzb83s2Y2Mpr<vauJvQBa@@tP|VA1wx
z5zbC_S^2WO%q!Ncm-l?-$i3BR27}B)9wuSeui6YUeF6c?zOXKPRCMaB*U^wwI~`gC
zg{Q9PnAK9U?Cq2VR@PS-+B<$sp1HU8Y6Xjn=iOD3rl)c`t)?Y~YzT3GwB~oaWppOb
zyzOiajSeSjZ|!>MHp}&PsN&b%WuKir)ZWbO(tgfwEw{b!vD{AaHOF5c?&PoUOt9cS
z|9|&?XSVus=K`7bbJL0~N}q)O+<az^Q_juLN?l&795jU;KdyC*eE8Gtpt@$*y4%cs
zpC3G0`TYTZO2W-9-w(f-`Yx^h^tnwyMcD95sY!BL63gFM@u#U=URf6}Y+=8uZFcbW
zS7pimdzbbF+i{*!4~*L^_0)8=p}leAv&s7ptvtMbLE_!!6><CIUS3l-pV_gn?k%%L
z^^a80l7<VFoJ&o!85oXE)xLPUPO5W<DYx~Ft39Wl&i2_HH|3LtMr_~5h0+o)^IiQC
zMK!$FOL?xhJ)pSZ#EmX<#pMlZhn2X5RW~I0L<;OG*>ut@<sfJ9r2|<4E4DXI+-Jk(
z5O~8ix7%1$BAG=Y<jrJl&X^U9ku$f}Y<~CZm`~NOTa7EODDgNkoH7pGcYVe#Q3u1V
zGN-*-l$yhyJ$c$PQ*in*7mKZR4J=KdrFXq0T!#vG=rJ8Ajg}X^y5iYp#^)awtY3Zf
z;ttTLr;87RXxx1H_xrxp`t*H!I8(o#y{=v$GfF&v#-~Nxn=R@-q)UiaE3qH8yz%Wo
zw}#eA!Cbo+lMJE{eeOQKE7w1%s)ob;`+trp{fD3PD;jSXXg#|11H17P*{7QQH&+^-
z@!?Sro9mvFDA!pba?(YlHMNwZWz&YQjq4TWOy!=h&rz?S616BWg0oh|DRrZ1ZI59}
z%Jawj-2chCv8{Xj>1DaWrTcBB(eqmD1^lG98Y{Bc#WV1}mIsYOyvVced~|9m!^fsi
zHe9D(8C<D7`pZJIKO=?hpTmtWG9uw?5B<2nd&ZAXNwELGWAF7mGk6(P)O_YK#eLy@
z$YEi*|CGdml?P_*n$|CHZo;K0TaPCFihOtUbjJa)qFda{e3gZNrY)K>gTYbu`q7Zw
z`xTCXYnENRns%W};4se*&DWe~WUo4?`0icc`gXpR?z*%;Gd%f|GNrfWC~bBt+_p&Q
zS<lVlKWZM6!4a@qrDERkudCGqb|)zt8E?*!teLOha8NFtp}_SrU*Wrl1uwrSg64!a
zy>gopdM)!(PiE(DiRR;vk3PA<Q1|!N{ZsS9^`g6N{r^tm$dO!gWb&n73Nnkhi#yKv
zCnwfL&6Ey3KhZ&hxiLZQ(9E4pvQoZT)ptI7raTvY_)-5KW8dEYMjG=E{P|+hwk!I{
z^S&=V3Nnq?#U0$j>^2p32ZU{Ao4PfdWxw^Y2_ajrO%A%6rq6QuadU_68AZ)F_5Kxq
zzWj1NapqjR{R~E@6&q?Nv$q@RIT!vcdQ<aed%>#<+7`7xM04tYm_PW;ewp*};vGq<
zR_kTmjrKKMY%CKAH)}F%Ynt?Q8-oDDF}Aap5414Mv~>OSe(~R2jkU3}`xpX5VrMj{
zo;%Xr|03(vm(qHJD}No&{S{ihzGu}lKc+?nt(zUscw0{VUY@ioxWS%PCrE2a{nf`o
zUZFR0Of{618iWtZC2spyTV`81HBfY0-^?ljuhKp>A<@}pxo7@NSthn~#T1pI+NWz7
z9A>k7TzKMp613FwOVS4agl(^+x8G{AXONJVEig&*bhZ7&b=qOFXHW09$3GU%XJnXH
z^U*%T!Q<AZMJ<P)7Pnulc@@j}gU#v3o$&wW6?^Pd9tAG(N)>V{cyqx2;{B_8Zs;c8
z{kA+{bJApn7a`9z1-p|z|2^+q*co8^-bAH!iOICA+do~e^7EC&A3pjxe`$=K#5vd4
z$7NGO&6njEigKhSeV=^)P<wu@y!-v%>TfFE%>K}R>3QS<^~Vv{c6h%Kx>U=$^s4Uy
zla)bi(e5R6r#}7onZlG>Ds6D1kWu*XT#fa&GrT9%Xfa&qu`v4eVI^<)8M}5)-!-f`
zPNzc8F5ooRb?><0b2v$6S!~?-S)L9TUde@Q-w}L7UhNU9Y}BROn>d&R?ruAHMqr+0
z#O8osMw7V{ZfmNvCilns&fk~5=_bpRtW6%Nfyv96_*!DvF7TRP;(QTf`(KeE;p?xv
z9mf}$oo2eeeol!=-rZAY7t{#F&6hvU$93vL*Dccr9PD0~!apgltm&8kV`&xb&&Uv#
zTOsgzn{A$@zE{qDrxdZ;xo0zW{ty&<wmffE|E`ixvN2Xa`I;W)=tS=n72TRWVP>$#
z4<n|&gP+ef<n(=B5WI!Si?c>4ct=&4{knN~`RfgsMYm=LZmm)Nb8tgrtVqyFxi=MG
zwio<qu0MFP+5XtO<@<C$XlH&h3J8hoe|@%HFnY$p9|7z|-K!iWUERtApQXF$UY{-T
z&h4+&de)BzCqxHy9_-`paDSc`cVe^4K}{td)6eX}Pc<9sB9|_ezWjifNw<1w-pg!W
zhZ$*;eL|jlrJePXoqy$~bKowarYZR;OdcXLolk!67YLQM><l&0e2|>Q78qLYapd2T
zo|y*{m494GHcC=>u;sv6KZ~TftkZ;EHAH6HKi+YsWYP9_nQQC<KBvB^VQ9|dy1{FH
zNzF!1->tnWAZ)KzYSgsHHWF`kzstC@Y1Pz(o`u^#OS%1OEtR^K<Nx}KezMcD=YMPe
z%g$Z9`~iQ<#?<rT8w-yIFXPW!*?jfS8x_C$E&Thdo}MrKcO!Z`!@n;K*=*O($scLF
z{+}=1?w4xXa`%IkHr`n?d^P)<CcSc9FW!G{@#d#2c2&>iFIIgt5ZcHZTv~20r}x*g
zy$hxs|M=IQWogYVi3WAy!Yga<@iNSic|Gyw<u!92O<8c)FGKR2R>N`aEB|`=OP7c<
zTzSMYX_95o4Ws0{vof_USI*bD$mF)D$-63A)K@Bk$vGtR`JxTAE^HAltk2He(6n63
zrD5Bd=yz`=r(5#*n51+63`JiAHQE{Lr+xlCcV=>gbV2sNqlQeSGv0Id1Y9}!<Jy71
zf86i89PSi6&g(ewM`xKjTVUW_1!JEwk%U7FgSPBgBPDZu;onn*KQ~X!E?-jm>iX-i
z53le4Q{BT`+9bd~@8>J|#d%NFPDfdudwlTXU;W2>!}n`%ZuJ(el@<T^aD81vxBC65
zvHH`ryjF$XyYy@C_45y3RR3?;c+hY1871edpL$nh-sp0%X*#WbkL~%#C8xC+ijF@?
zXM?Q;;MQhjNM?TP#H-%WwCU-}{qDt+uPqMhDoB%KP}pWLxs5@<t?k?amzzsv)&|WD
z`&yy)!0Uc-#KeuOqk9~W9(dWvd%3~=uSM3h3q220j4r$T81~)ju~OA_=g9FiJ6x%@
z?70Km%pM)ChMDuf9A&auo`3cjm$NmSfj~(%XqX^2Da+}_iNN6fimDc$tM*8|+&{7C
z%%V+C7ffll7nsJFkmeV7Yun*TQ#R!9`6E7Kri@det8LtmXZ5Y;#SKdLe_(goQS(jV
z+uslS6BJq<9+bJ4zs`K~|LFask`?JE8xragSvP(5%B!5yef<7`mxt{Ijmx4YrT?5Y
zcg2d^9Va)&ZJA@s(0_fp*!L!T0XK`y3=9)|xZ-9+YALpdp7HCA_}3fM^=Fb5!+|du
z`W(+aXIIZRcH&yZs(Qw0@2bN0#_TLvtA%~5O*I&NxS75#JDW8*P4~6>(l$xqEBn3r
z<C8wJhKn4SbY6b*t@NvT0x!-iyt-gg=H=Vx8YlVo&Xe4*c}sz!*~+M*$(!Or+fz*g
zd^@YBu0EdA6>~SNAaBP+yNlOBqgAe{XS=TG9RIUsvDC6lT#ip~UtZX-c-K_v;9uNz
zvlu?C4gbgV+4%8_Rnh&&=l`!Q*wwz}Ny0>*BOku`|KqxTPJUAL&wDRBT%Q*_I?#Xd
zZXI9C?!TIe^Zb+k_NC{aj@W#8vBjTf-vwf4h~_?aVQPQAG3&AO3GH>q63&bAl$a^Y
z?n%^mIx#qak73448KHU2d<|tOWoN#zYR#C)%+TSs?BI_tADNy6B{jMlI0VJcUF2|S
zTaxm!gvptVOZ#M}TsrOY#dun7Do5~N9?1<e80}flc&tnjO!KUtEOOjO``reyXpO&3
zUvuO(Gu5Wq-p=7&6q%K<f@$8j!v?QKgIjjpyI3W8biUw*a7N=hb9wLIEqENq-S;_R
z!E)K7qNOV@?`K%1<}TYC9k`h*frt67m;B8~pR5#k_y6v6;d%f5ceRVMamKA*7G?I|
zLXRxsZfmzxlwsQy{oz>uKj~%aY?qVn>(8x`&Yf;o#1bGT{qRhT$(q~Mw~tx>`^Rs1
z<@%~m|3rCKnZK)(J6K>AbxwXm>cw{{Pei#*Cw#uF{Hb`(=Uc+!A7AWw)SV-wD9GTI
zV0e~6!C0{3MfRO7{2z|moS50?l)O!eJ&m(#2A9mOm33Di_}_Lq$HZee`IkL&!KLk)
z%FhbAUf!?`bzB(wa=tRFfg_h&|E&1}yJsDC^*NcQ`|gap$~2?$`RC`GvF-=0xZv-<
z-hS_#Hb?rij6Y9w_TRrESsWO$k4M2JSyTAj3E$Pp)35B4-}8@uhRo~Z&+f)MTwccB
z%cCxQ>&aaEe|&xK{$Jm+yKSvF|Kk0hKTVo5|LN-TjE2)|k4?S&e$n$^k*cg-40bb*
zY-_J)mRryN-2PW<#+tt`_e(H(c}E_TaC(??yL3s(#;4_H#T%}R`|SSRK3V>q4|maw
zbqc=cSp<EHLb4^+#`PH*D=4p7`0eZDOM55uEC_uwcLjS`gpKHoVEyz`<<*P}cch+8
zuiBjbwor3kb5*pAX^YV}cC}^C0|gIAY}mTVRXgp%G{ce`QYTnSwWe#gPP$c6-|HQD
z^8ibeB4{bO+bkBr%UVyTe%-ca@6A0K;*mEi6<QRw33#4<Jnhm>`8^-`XUvm0^6c*X
z<EKh@``kY^`6P?ojqmp_-uqK{EABY=@q11>R`t=(!<<-{UwyTnw>5Q}n6&vi8Q1dP
zl8HVmKQb%c*z?_+LDAy>$83h=A13m`57#iY?iQ4vFi(UhVO5RPQX8WqQHNT8W-9p3
zYo7B{yrtu1^s?mn9BVvvj5!>)G#qn@KX^qv`sfG2MOS!M9hAH{Q}_1P6@k&`UN}zO
zBzN(e@+!W`nU^j`?RU;pm*`+U5#-0{eN(DWa$BOMT!&j@F7L@1j^9^{o|DjXIdyx+
zfo(TC_Dm6Fmf+dR0BX;uE}6Aw(WcbCD?2Z?Rvu^IR_IV)lv#O4u3x<U-oJF7?^_ek
z3-50g^|d~z-pgPi7kyx#{69`Nw!9@@OH+D|pLDk0`__reiDT1euL~vjjklNHk)Cev
zbbRaMPqywHjvC71((mg9gOh7_l>KW~4Y#`88qWSrV#dSGvv+uKbm=77ShbhDY&|}6
zzwFHo?pDERyqhM>I>n@*m5?4IKTAaW;>!B3H~oCAqCQP&JG3s)E7Xa9t<;ST{5_Gk
z_D2-Q9Xl^^rcv0?GQB0DIheh?PgS7!i)z^}-bX3(BVKLnEahEbFW@)ZT;BZ7k2S}y
zJn7)+nB!7%Z)YoOvdF@Kv|F;9uRlMo&R*BH@LpKX&Cg6))7F|X+Bu};Nxk3q>+bGn
zQRn>ll8d&y-`4NV;pq9ZNMwrM?zNB0w$5{@f1cWVL(O_S%jxTP`Y--7>)|a+()^`u
zT`gr)AUFTp$BOPS(<12@hRzC|+;`IF7`!@e_6d70Sg=kuq?&QnNwvMLT$c@MvqJTQ
zXZ0GCO3moBt4^9VLz62e>5<C1dwnMB{>(gbXXQW7+d>hxt_)5cH|=JBn=v_^Z?C>$
z!m>qMS2bQ)c9oOm>t;)@)MW{$_>Qc+{46ZsqTGDT-%e3W8=UhXO{iySYT{dM&Rd6m
z<k~#LUSLmW>2y6CIsJ3<Z}gwLb~$4IU(Gc!yDwjvm6lZ_u>aS|c!g~S<>9gCTTi^1
z)Z@+3zP37^>G<7yzxI6dZa2JgdsWr9fDrQ>C)c}dF_wSN<r-hvXL-bJVcFpa!B>7*
zGG6-hd7|2->5L`~_8HN;4UhjTa+$}~5oO9P%At5{mk{q|_NAZOLpU`WEExYptgO5G
zGH&(fHMzlye=wZ-+Tb(&Q>)+?qp3wMcbA>B5k6zWyKnA&%WGOOOpkvmZ-|=rvhVtj
zpSd%2a)J&tCfs0c$lEbdO>m~L+=jaLdvmU=?4NJ(w<1L6)RBz;%j@>6o!-Cj=auS+
zy)P3@a_a<YCYeuQzt~#&=Ks_0?@qmr4BT9G^4PPVDrRr0-fioz{(7cbYJt0Ee_Ltw
z#F@b@m)qm~BCEHXG)!*@l2eS_;WA;*+%>UMKNE}8E}Y(Wc7~{fiFxz3gwq{jESU|0
z!K+)g{!S8@`QoOnue!h_rUkG1qfCn>&oLV^M4$a=`Jrvvw|KU$w9U(O+_!y-3vt-^
ziGA-*zQF#n;02d8)+B2FTeo|EtYC+9-jZ4m(^|RqV_U8)<cg?zy)Jrd=)V=~Kd(9%
z{oe1GL%z0O?GLGG>-U}CvQ=7<MY%b);_>nNs_Sw7n_5bXTLeU=UQfQc>UZAn8|wUj
zq?JAgf7;ym$usBHXCb5Fu7Xzw`VSV)v;K9*qvP*}rRx-01XS{pZMC0&T-vKFwESo)
zivX*F+e0Sfl2-y%e_tM86s>+D#QOTBbmWOU3m5~m8k{%IoVKgR;qvzBkv)nlyRIB<
z>&dL2Ch6pxHA~}E+Oh^m)uq|IAFgCAymDY>1ViT2ikYnnhwsU?N4}X|IaOIv=jn7U
z)d~~Sh1&!hS)AALFObe#;_0EE<=5DJe!qouche&-R)(_Jw(H+DOR5zPJozDDSM}aq
zV`a{PX?M?e9``MIuwK~x-e2+W%QjTY1;~Ydm7boI67!=%USs|hlb(!Q|9BQn%-j-d
zrE_m_`LmlF1q3BL;}vx7$;%{7ynX$UufXdi6S*S9>N<8bXFl2B=A2^c5V$-#SJKh6
zBgHCO<gSEI7{B&{Lm{fGC1*DoGI^=CP3@Tfa-q6$ZS>VCuMLg+ZPqeH1h3C1a+dz}
z(I|F)YP7zD^*5nq3$i!P>$-NkaFIdSxw(loN#_}MDG8Y0@epRvFskaj(X{v}bK}vi
zg+50XugJfn*TmlSbLUO#x}J-zl{FuZeHY|OeXvpgPj!Jzy2o$7KHi5HqW`}*!DBsF
zxr#kYta;%YRY`Nf{s&hUhNpaFRctsfe`uR~y|DA$>ldyT36*<^IQ>*HD((_7T-<!N
z>hHOeyoV|;Kb!Z^B<<veq#B(W>g+rH7ygyn%x0wah~vb)ny51GyTKD8C3v{@Hc2w9
zVs<-oW25urFjGspH2$_T(I;nS_RMVFxc1z7=BK%<3iB9?IW5X3GDplf1>UjgG5-U*
z)1kxW57!*HE6-yYm6w<1#WrJVsqd%fZ>RU)-S~e0l3g{=)9<rBom}zf=Y971J}(Z)
zA3pO$gKy8zztxYb_`Yt@`T5)Qp+!oHxZcSdA79Am$yUqCt@l3{_w%pgn!6u$s&1c8
z$XfHhFGGFV@m~|?#_R1@IJ)RF-#%~2KKU&&$CvW*AIdz)YUq1<)^_t`DdUXOVi~*6
z&*1!Yx$LdNrx$M8;&U4}uX=V~<I08aB5gO``N~W;G>B|mGs8yMZA)$Q%v&<ISu~7{
z1y<NQCB^g$D8{afI@06IT*~&s$NKEa*-E=g^rBh3R5ZP1uYNT-!nTMFk|ljvnk3Cx
zC4yb+{kv_-&DY&-?a4V9vHj~O&WiUT`US^6eDnXG@1nf9;!*4Wj)WU0Vsy`(e=s+E
zf47TGm4D3nl^Yoa@-hX5o=#p7wXg2vvH21&-EJQ}Ty$4HnaA>HDri|zhTTW8WygMR
znBt>wywbq(TKA)_&`Fvc%Z>+g&tO{U<IbzeBJkEzT(Ce(bb}n%ir@`V8$2W~FXr>r
z3JqJ{^)hDZ>h{12#p}-nzuulxCcE^%&P55YSN^+#R&z+c@GPx6!*C<y!4!$z6)zf%
z0vk1J(?wXXtXv?xQLOdFxjkhu!fKa3r6rpihc7EAS6jKORYT#fpXQ72>~};qNaro_
zY%y*%i|-4b&$oZqUfJ*z<@*&mjI+yZz+K+Mf9{-_BtQN5>%;$Q?;pSNgTd@=6<=j*
zs#?~4j(asf&+Bd$eJQe4d;7w|$I20#pK_YyRf+UU%e$q{6>KTpKA+K7ZMszW;-s5V
zOXuDea;ZPg%Cq`68#8FN-s5M-3x6Jo?r?uTJ?A#}XX6JJ{7gx!W-H4aYqyrEnf@u~
zzaPiMXw7>Yrz@~OyxPpQNRKU~{$r_pbm@Z$2WBmd^1tkN>;#jR&eV;^*BxSWO5+r5
zY%WR`TEsdrYatioWSdov5*Ob#Hx-zynKL6u?3i%yslH1OyP{1MH<@ocnzO2Cn;OI7
zBM*JNdup{8Zkc859cDcHWS`+)+n&GCJ)CYVtOs)b>|;7uaO;Qs&WFd+Z8v>xxfbI5
z*E}F<;;k3gS8}8j<uJ%RXFRWd@W6&mFYV^oe$#eIQ!o7Sw*H`T{J&<^)!RQ;?5X(w
zRX(9+hxFI%vZS-i*iBZ(ACp*gk>g&~PyI{3Zi!6OJwD5qU)gv!LtMSX)XYUj2QO`T
zTIiy5IV1m{MDyKnMh02k<pKMj?NhBi|IC6vY+XHr?sI;<n`Tkx_Vzm%FyH){`l(b~
zE1%(EjYaK?<2SZ^_vUEZod5dqk=LIeAG#QyP<dG{z>9Uy!NQ0c-f!I{PMz^*WU##X
zPHn=X^&gfWVvq{n>t$^*>CwaWp6|WX&INEg_k1n7<tP7Zoute4i-%tvUd~{fYU|0c
zsAd^!$E?!MRa+%5HW_OAu8Ezlu_|ru3)eKIP=`<p@iQL3Uxx0R^k|kw!$lL(94()X
z3{%hW%##eh(p~d?b3}M{Om6xQDX#Pbyyka2`cIq^i|BsXsORqW;LaZ*_s4y_rAnGc
zfi5+HcR$~_&dAWbS9gYlY|Nw}f&Sy|i{JleX|}yCz>}JIeQ`YF`Rv#KCY`jnSN%0V
z@8*s2m4_aGT$p)#@{QkD%qK<%u&qDOf9mt11rxiT`ib;>`cU!r#3{Wa*Y@fsp1-`m
zdCi=pk~r&?E2qXQ$qAee%Z)FJp5J{u&fQ2bSkOg;Rds8`y)EqN_J1@NO`Lh#OQYw@
z_Qp?~PsGAb&R0$1?$BK#rq3EwvRAQ1L2Bl-$fG7H3=3DL8=qr$IsQpAKV**HWSttd
ziP_I|78VJGd@WpcPQgg|gy+jprQ4flFk0_y>pyTP&TU6y$H4_rnO%MkJ~ypSN?Z!z
zI~a7xaHI3QTmLUOi8#;rT9I^Cq3}xdjh8G3@``MYBQ#mIGB!LcPy?MTU^4U1(R&*w
z{?sgJVdkIJr1(*3%EZ?zoDZK!5cfKj{q(+eR#?*6W$gt|?<m&%c*p<okNH1gq0ZaW
z*Qv1VDEK3LXGfV3!-p@^{|j_hghWsFX}Dhh=edVo;MsVCDXp*CdNtPPx#T5E+RQn=
z#B82ZtdX+sgUgqbXGlrAeEp<maBM<}#u>$yhEJX;Pel^X8{a?V@t-%wwwhtJx&5Xk
z-~EgP4<Gv-f8<5Na?h8dM-RPGabsV9|5KS?-3R42Rljb3a_$T2nzYKT#i*$8+u`|1
zcl*vOTkrp3cE?_3UA$F~Y4m)?r;m;FW=g$|6>&@|Z}wW5eQvUyR>FG53y!?+7?LLa
zy4vi#v%2l!6an7T%lvP9<wz^0F}NH}6V#n^$*9fcvHXg(Un29J(pG%FeC3*9rRItZ
zi@CCWKMb#OInJ2cbfbWSC1lBaPLcgCspqaPo4(enbOy6Y)~x-he7vi^3TrOa%uAcy
z_%_H|kNHKL^h@EMz#o4UdA@Gr=1Jh1pYB!p<jHgkriQcWd<(vO-p_n2xbohupBKb0
z-mGJMtZe(^$p!rlj~m73&i1~2#&yo|?rW#j3qD?{V>qxY*I#MMM9uPYCT5|N7IFVC
z&c7%2Aw1?{LxKi(YACOU#yU5*GC7M!g0Ih1o{oD__CUdUxq#(P*Q8eyb@ok*R<Y~S
zem!w!a6;swQfuY)8<>8&hDtHH|JG5NF;~W|KHNBMxtpP};f5Ev0ke*@_QxM?yQ{BJ
zx3@)M`2rc~?|WK4%kOPF^{aP9_MOHQqkS)ur+r~d@Bb$Q-rlG`Ir}Te^MfAo-lq(m
zW>#wMesadYU*mN8)7je;{)8|rSa^N?4Cz#!2Nr@Jo+Wb32LyfR$9T3Vo_x3U?c*g|
z6w_~Q^L^>7&E#yoKk*Qc&VsnRT9scsU8I}0d3Ss{x@dva0j+G?6(8CB-Y#9fWS{DR
z75@3!OoF26ZXpU2R_<<Cac$`%yVq9_UEvg0Z^+9wI3Bd5>8y1lM~=qUJz-bWwhEmq
z0Bxx8nEqh0=alPfoXUS!mXyc1x`yukdw9n4!0kzkZ|uKnS7klxpn7G2R-@c`^^cd#
z{~O2sYqvjiwYWWC>l#kctJ-;Xu_sv$9^cySUij(5YKDeGlcLt#{Ih^*3B!>`+!f!i
z?srt$R}eh=<4<P|t@VdDiADzmMe^4xaJa2}RDMcgQcck1?7zzzIP!ECd%6fIOqtkg
z{cz@TgIU+YG9+)ZMr?hkSTKjZ`10c!^JJX-e@mY6?YFvj?#&g0bM=3u%-;Vsnsl<|
z&z{pKP96Vtd|zX+{687)&%qHpA3mIIm9G2zzPpW8`_}KAY7ZyzDG7Eblx0~wm58)F
zYLu~MSD<i`mbLP7iI-Qn8!uZdT3u&U#vFKQe$>IXuAM<klO;nNmPqNms{M2(`=3Zz
zKvk=<P>QnJv5P^!%?1Ain#Ox<X%f_p)?{+KSQC}|Ux`uUY55|<MzxlR8+TV23U6i!
zs%lvAjVI(4^V;9PgwlAgFNnyzf5v1|Q|=Zkv8BEJrp%DFMA8f=)B|I;voRQ4D80&g
zvrW|ZTvTJAU1zuYedF2(`##LBXJWYV|MdRD0rk&)?FBd$ElQv8O8#LyU>yH5-sGIX
zl)ydz9@{&oloefkJUwLH0q*;Mf@>a{|7Y1P|J&+RcG#iE9~=DDa-Lh7mt0|4`d~6=
zi_xaQn0pOt`D;Y0=l`vJA~MBVE<LY`C0CqZ%BUkQpW(ahKi?yZKU;jeXWu!mmhbNm
zo47guUp${7_xkXwwf+Ymf6bP0ZQG@9oqRE<V=;%~48gT2n~J>i=6>BbmuG?OF7b1$
z%QuwFiMyA5anqTA<;Qt4<4V`gziJUBz_GK<@4l_ezfG^*jJ_6L`y!=Q^ea5JPW{Ro
z$Ky#+%@)-gTqbPV&9+%QL*rE3<b6kdPD{+njeOambTB#HD_K+4Cuq;sEP1Uw-UZTm
zcSQNqodROiR@7UsH-Eg3J>J16as9coXU>(|{M(uQKI!*8ae;nUliO!boH=&A?z{fS
zW2ftT%j5s*%`&rZn%lppCBkIVB+KNU#?KW7)~0>U`TrP<gPpQ;1<o7+1?<FtR0Xx;
zY#;vZd*3X6Q(QeTY_pX1wKoodH;sPOFn+kgTD4tXh)G8A#+K)*I%oV7H+<&Wb=!Y=
zO!0=_TtXiuuH{s-opkXjV_jGyBwc3P-#Jlkj^!64&~DYJy=+fUU*lquI@R3SV{p9E
zfumhI-2PZby!MY2nXlRM4t{m46{0KDTMj#1S9N!P!kx0@$GpOhGkvEMCN7yM+!oG!
z%B4YlbI>cZOr<mh8Ixsa%Sz0X8Pu=8FLe9ZVIU!45!iWpWzb5k;<V1A!N$pxI+_K7
z|9Nc_Qi)PvRl4>#kdec4?n{;rOZ2Kjm_xG|Y$xrSnRUZ~t@eLX?R3GHF-G%l?#q0=
z-z03B{;%ZaJu|Jvh19%nZ)M<DV%|05ui-!6s3U%{&y7GM25}Rk6+|xd^Otw8@~dX>
z$P{V}n5LYna-iVbjolI3pE@2sy~tkR*yi}($})c+h{o7eGdy1WcgOpK;u9vv^YjUC
zHq;8_Qk3CfKjY{B;MmsS9VJ=&=ag}$KYR2reSdF)1vd-Joa4<KC&tOte4d{onyIC>
zV#ON1*V}B{CVjFxl59Bj!};E&TwaqoSd2IB$rLyG>~*2+VZteszc(I~Zi%;PNnKrj
z@_hNqJqp`5Fh$G%W2?I5xA^m`z%TbL`p?`+dLj~b=sCB-%#OsYHS(8*nLUm?J6O4A
zMf`6DuG7*y=db@e$KBVjY`xy(s5ke~KW8Ku6!xb?M#VC(X9-bx>?iP;d7gmj(jz)k
z_i|Z0Ib!H~IQ7uVH4Lr`mM70jS=P@mA)8HfVux8T&(RB!yhT2eE~bfY4vwi?4O162
znkp9QC%PT6@|dgOEa<M0;IrveV7b=B*Y8voXd7lEy_K7&%Ptz&aj*V@SI5Hbo*~CB
zH2N<OYx>j~C~_=JXQ`{ZedVGlucpoP%~Fv$=Mky%x=lLo&Q6ZjLmGPP51(*g|5bfE
zFeD~*x6OQ?MXU07*Tq{t%=i=R9_L*9IINkWN1(|;p~c<qyY-9LnMWJ1@9)1}|0SIx
z{b};mU$z=+*NA^>We`qoe(^rf_59av3F%9-K1~Z<e<=C<f4xbZ8`=5=Vs;mZq}%;l
zy7=$v=&iES<u<JA^*NkYtl0PWi=@<6?PIoQ*}Km7AG#DJV*AtD;`_zbGiJ(ciA`Vd
zTIgAt+s3-<;yg)Q^$IP&wpMT0lgZDvdzRsiTGnK>tS6^_on5iww!*a9z_X(MM;5=>
zU3cuGVaw)EIY;}8jg$5&KYZ}HJ!f;ud?DtHq+dCIj>>!yTzTuvo_d2|$@M2pn_r0-
zbUd1_zFv({H))+*+Nz78rY%y2+&yu%M!%PbJ$|+K_l$XWlcuqq^y&&_{j{bg$%k>K
zXpnI5?K6Rk!Wfq9^3HfFl`(bIG;NjOD}N)sy^gTEa4ElNJs|^X6qY0=Ry+}%l9;l9
zxmI?1U`Wi&q;tzpoYRcBV#c@k@BfFN<NxzL+PLE7ozT$DLh(QE?ss|Ln<n%3fx1Qc
zm)<GK&z?+AK0WVwK<I4^F6Ne>PZ$4PzhLjrj8k8`wWT&>9>1)iv5skJP1f^fYsOy^
z&GrI^W-9MLaOVumq)v&Ne+pswbv!$NF5Tw#Pc!c0!|&{dW>;D#9`tK41l8GLd7TMU
zlV=`G{_yM12O&SZ<8|}-djb>Z?LVvkd5YS`#P6R$3%$OS-!LvP7H+mEe-fH=<L{!(
z^;O3tPEA|uTKU#W=ZwFy*j(nPlRx}w=170m{JFw0^HRYZndh$Ir#~KbxFM3{)%0?s
z9fLz+<zBV3bHo?|qURqsY3Man+EB4+Zns(M>W$rvVZ5g^ryLcCG%MZC7do9!EygJ^
z`dFW0Poa_VvKw0*4!dwUTs*R7#)@4vCr$+35?>Yc-zzhn%d69Es;g%3(t}6;E(`II
z?VcZ;s8G5;fmK24^{KZXOoBvBo87;1gfO;jc%_wOx^PCLL(-+`ku!VN9?=a_7nL>7
z`Xh9E@7*1_5AGBwpJh;Rz5J~G!mU4?>*9V$M3>d`)pV65*~KRW-j;ZkeYlhV{()<E
z&r8TPT&j8e`S->>h1^o+clu9$Oq}!kNqC3u8RdB$O`mLR<n;I0*&mv@^TwXvku8UA
zb{rQ!pf3Etg75O=<cjal>zhv+{@%Ct;TfBp+rODsO*dDR>$ddztd%FeDqT2nSy<xs
zLoH{|_B@^&UYAhOY4_<H|Axfp#Vc0c=ScXtKwE6?arWQ;<a=5Dsy_?17=7CCccH$r
zz$v3p`RYA(GL^soAN_M?$HV-q+S?W^S;T1h^J&DIuH$Fo{A%^rM0{u1V`slB+W%&s
zvAuCy^8SDF5!LrMpE##4yvaXmBcntrM~hMF;<RN|6EAL#>k0f4Yv0}Z(C_&1Nznm`
zs~Miz*!6tjVp`p^#%ak^7Kt(?fkoL*k11>~7T&{Pd3Ad8WPh8$wHn{=UG21eQe`iE
zYvRg=rbQ<%dRQO1W$)X}<C_(6YuOgjje>KQ#jm$ncH^1vD{-HY2A>;trcd|J;H*zK
z$w+(E<-qC{n6;|I%%H$!>l!W{qu9CfhI7Scs6Lx?R8}qF{K^@vGmK^&*~DfbaxNmN
zyvqDe!Q-?B_rOe3hJ>;z9%bjf8X7vAW0!APm3Z;?&Vom>Q$nvUUUTVQmYQ6&gT|cR
zyZyCi%ksR`k~V2<*uPtp{r(@vQ?(lFV|#7;>zP{w+*ihJJyDQYC&p~6+u^FL6#T@|
zEllnc*Qp5;r*bcidHL*_#XSE<kH7yrYSdix@W$*D=d>Nm@;)v){%&X8y(|9<66=K0
z?f$8Lv-zrfS-jkCrU7d`!-dObY__@S8xo&?*3elU`^DDW+O+4)9wpzGlS}qh+I7wn
zy?sDk_{HwRd;g>Y<)-)T?b~!~Ys9vy<vtg5_$CUuh^JjB`p4`dTM@HL*?9etfavw9
zTCDG#`;X6`$Fo4xak0|cC%3qG1CrCc;ukqx_F-OSV%O;MpY^fGY0*Xd6+7BaOlDA-
z*b(o$-E?hf?-89TM`3FLnm*1r_9OBy+oJTtXLjeT`1N&GgG#IU)vZS^D`$0zURhnP
zySu?4SnYz&+ttgTcT6+CB0F8PW-CKu&PCywnhZRt_e!`xC+S7(dcd(E?Q-*uqIU*S
zda_5~wa0I&jnrNrR~dY}^1b-|!^-pje_ydO`f-NdhHbZmrW`PSyx5}f!Ey=NP3bv%
z_A!*%e=7~Swr*SM9|>j~IlhanmOT7-9HKu5x`;oU(4m_#<xJb(CpH|ZDa{QBUh^x=
znb^K*mFSA7eSC8L=1X_VE3!=Ye>>gUHR9+;=KpQ!`+n`W7TUJr@VP%#d08wn&kb1{
z1les1Y8xLcde7{{VYN>7@RJOA8@v5)&Ny<gufN{DW{=UDJ0BFLt-s0YRmoGbEbK8~
znQ3y#0@+m4Y*3TUuAXDc$7QD&e(wA5%h2dT+rd6>uetY>l(n~qxCdl9CkcP<%69nq
zrTSl`Xc%YIG(Yw|9jBUHiymL=FtXsaU%rxSO2dLJGQxth4d<Q-IWuXRUfBL#&$+Hw
zs#m*~aTzQQk@Pb%RI_@sxWQlRi(#6`1xB|_`K3{Ux$1%u;%^L(&J5_~p1SYktIw;B
zRYy%YHbZdB%uTITetv1c|NZ}V&%|Th>pem?_fM~>)fWl4;n={yF-c)Z*AkD;B`$%R
z%5G1J+NN?lcem^(p@-Y7ZyCS);M0HiBHwLc;k%DtY)gOhF7sxtckb@glhf8*oures
za7Amk%fv_fCNns`iPoK2x&P<Kdwaj{zI}R)l0!)6cMXk@)O|JY_l57A^Jm}tIl|jo
z4s$K3@!9j~d6j9K>!A?tiU{k^=_x5|G&Is;c08B5Q~%xm;m7uO$FlQk^WTc^UldU{
z?WOp?cm0L8`~Pz3?I_Tnl9jk}?d3%mkG!1h{_)7+?+@0kuiNwb+u_BND=zP@6Fsc_
zc<Yn(H?OxJ*0<?hF85omuHgLiX<-gQvd7au{CN2H#{VzO6<^rPAC>0+Pw-^gEpSC$
z{#{=4rKlN)yMNC=@MIRRZTQX(j&APE)ZE24=c_#4D{vt7DdTHC+0_kmwuwJCsDH+C
zOf7vw<#Ev)d*6%AvDma<{qc)$k8I{uKDk}-Y+`=$<-XH~c6%BB{#AY<FQe(Hr@bYb
zdxmu_&)TD`HeVl@U&zz7mu%}|JGLxs^1KPIi#wgq+cPoDxVc4J=hhkyCXaOuO*W3M
z2Cv0!8E-r5ceyQPSayo-SnmB@;RjC6FfKEg^hK0)=FPo}G;CB2cIzhmFf(}SBj3Gh
z>Fd_#YAp>hpPsHL)C`@|edeNP={k>h8tLrTe2%_*&$r#zG;!<=)p*+U=>5u-Kle>)
zU$&Q5Q}a*9S<av!UQ-*JsAr1cco1mdE{kJpDEM_G(dPe~#Wyx&x)=TSs}{Un7Tda9
zZfAAm@!!Y${|lDI{>s{8cIlaK_;U%b(hvRh-_<QXoN2bTO*=fzw&HMq-G;Jdf%Oaj
zzW)Dd|F!e_`poKmG6y;rvm2TQ=U3Fc`S5Sv_sRz|*>}G?pR5_NVr5+3{uiMc+r<{o
zf4yAjZTxnoZDo?@&7GEe$J}dNUf;0RdcE87%g035SDNqpw(@_v=kbbnAKyRPd3=Ah
zU%YvASzNQ<a@nUPE-iok@3AlF>5`V4t@)QD{02|LLB`#k+Y_GFvZ%DMe2~-Lvf|#i
zr*?NV%!Te%`rTr4{=w|Dr0s@TW6wXsttYzvoSY))9rjS>^dv*Sus6Bt(`2XW9u%L~
zvHEFg@YCFLK8q$x3GLtZQF|>@nB4!_7mQ3Ku9)hbQ(v&s{Nllf6LpwQo`_hOp?mIe
zsQF%Dh7ULU|D}JqzC^mjN;anI=~?}k75#Vq^VWQE-rvl8-nMVi#gcn>y4)Jw7I*IZ
z=O|<UOKIPqm-dJ4|MdUomjAc7{;u)Q+tp`tD-QSnP5Q~``*8xJz=x^l|4IJ)<zN4K
z&1C!D&XqUU9r?CXec%1h|K?Raku#b7ckljY;l#psCD(Ho)j!u;`^>GFp*QWm(R!c1
z>5lRLH_W)M9#j3=fBlN<ryqP^xt4b;_SOm2RrSBMm0$MWUjIT!wA@a+Veh}4E<g3t
z{>h{<yv{v*Fygk;m(>NS{WF?!@4l^3esyK?j8^^b><2z_fkn6X?>eM$d&3(~7q9*M
zyJl#WpF1az9{VYEHH(_t7NKK|57%Auj(a10eBb`-E|)Czzs%ULp!`P9-G)=sjjy&_
z#%p^+yZhSriEeJkx(-jhzL)d<zgPE@6aR_KtNi4+=Jp2NTfQ2?E_xL&MK>kuKQjLR
z+5XX_)p<vkhTrRHZM{6hx>kt&yM1S}d)$GE&F8;OIr=L3`cm@;tEBHmg{B`mztU}S
z=VA8wN8ir>8Q`CL?rGBNbJ`a(%(7R{alLrp;^Fi9jVsP4zB}Xj<?HulN7NSG;!4Q%
z-{if!sG>ya!$a%n7xEG%c1PISk8k+cRBOAucuscCy~@&D>3=^KrZ2S86>${~e!cDL
zFP3@fOefy4S2+qU63PFYWx64RN&4yPEk2Aah1zo-i?XtYYFn0T+}>O;$uY)ALW1YE
zgy7;Op<b2w97*f^C)lly^V6vA?2+d_JeT*1zRcND8E%Oia~yqF<;?2%s`BPnZ)fa5
zcJ+M$y6UIR|N0%^T(ok|*&vpJj1-fORi{s!h;Wo=JFB*?>g(--@3Qlcyq*8s`_B{o
zKYhY$)eH?RT5@-<I}+S~=kuig-v{o-A7L)9|F~w(;iKXE_`>i1*tSGstp=CPm%r8@
z-`@WJ+;acC@R<MC*6F@;+syxaepQ0!Z`;~W9BS8dUhHMEnEx&At-MTR-bB8`i!VR-
zxpCdx;7yEm+Oc)D+aJ7GxZJRu&$C)zLN2=b<xTEMo9jbNKAbsx-^gWS&c^jV&hM4N
zGQC#@a+b#Kne}d)ew{<_^f>~O2FgKmn-l_1aps#TK3J5rqUC9qNmp6OezkRaeqA-9
zhDt{_Ioy=l%cr&GgX^l2O|^YdK@!T<cfMYYzQ4`?Pp+k_gsbSbXWEZH6ofIRr>sfQ
zSX%J4H=m6`#`1^Byvj$7Po(z+$;NzrwSCQsuj}vc;a*?$)_QTK^O>df5BJ{xbLX_v
zKeOEX-TxXFu6ut|y<a!Bc9)1@>~^lZ3BESztG&4^3M$^r;ru;IaJ}c!TQ^E?zCQQ+
zbI$X9*Hur-8$bT=@3?_|Ig{(+&eGZXhq{96PQ1=J8L!w8^EEJTruJ#ASkDcAUd4yb
zySy>$f^qItfh8T=CwL3Cm%UOhIH)1<V9_q$8Me0<iCZtx|Jr(VRjBP&y(JeG=hSc7
zHZ?I;lVy#ORUGFR&+r2K!XtC^L$1tX+Z@2HUSa4WVia;+CgH92ibdfowu=>NNPO(e
z=$Oyse3j=LA8+r29EoLVDJgTL1q6T1`n%)Nuk8=+S=;yO*F4()h<X2?>XUpIcJbcc
z@cx$h!|MCL?o`JAKJta_&xzgjqHjHp25qn1|7Rxu!<Ft;=PTYyOC0-h%U42n{=sc?
z!xPFr`>k$RXXo4}YuT|}{<mJ-o&OeoGPWJY%ln#E90)bvw>d=idPrRdm(8cY>vey|
z^vl-mOIJK`$f<VQy9XC4KJC2l>eCIk#gek@*3vKJJHpk})6A0ZF6%D%u(SQ#>CZWj
zznwNTu;>cO3R`^fh;jdvu6ME1?}vph3O8b0qxfOns<0XM)2r@2aCKWU^+0RI2DPBp
z%ihy|o4FnDYnPoVw(_w|980CD<Bd5rLce3&&b@3kEX(_Ceo)7Cw?vzT6<5OHKRTY1
zVxymTDtpcGlaA5u6kf9ayG+7fyS_;mBpjz2*J?ihd4Xxxg_k<ZI3Ik-P^*`eT)lwn
z$F1A<x~up9jGSXxD)RmQ=g>EMUu`|9^?-N#K6d`Q<?Le5{N`OR-T(1;J?q+QPE&dW
z1mErc?QJ`G|Gs~UZ+5@a-BEDf^j!3`$NR(gdh+%6B%a@QJ>mO3=|B<Id3A59ElNIQ
z^6>CX|M|)ExMmmA@%}gQpLWVw7db?1ySg~k`ae65igrUw+3wx<AMDJ^UAAiZs>=sm
z!}osNBXA(?zk*qOMQE=2>(+F6m))lQ3omN+_^o4JeXZ-7omgFKyJY6-iSvS$t9I<4
z)%n@8fAZSXIvlg-mL@Bo60k3x6Sw24eV;+OnO*%vRkbNQ=G1+xOycrf7V%GS_gm9<
zAJ17DR@O{ew8ZwC(%19ORodTvZTFVkoOMO;z{7_V|Gb<vaU<7-sF(wy*YB}0{P<;G
z$KuYve?raO?a|#8@Av<Z?eRZ9Z~NDM|K{%RXgv5(<!AMef7XTXW#_-yHUHvA$vywx
z${(?=f3<zX>q*(uJ@QWNe79CSu1$M=eYU?~F+;(R*5%V{_NDvD6(+yT+HhknlZC}B
zm9n)*^W-W|r<>i~;T-S#drm0(ZT)>8Q|srw-Tm+Qr6>K8-Q4LPzBu1!>Dci2((K8(
zk3_u~EG2gFT-juL?#;9NE!XGd9AEaXJ@0s!Psn8D?4LoQmm(%>dcPCV)JXl$ea*c<
zD>qHI;km6udSafp<&$_LW{Cw`f@U2$GI5uMr8#TM+-)C&;-{a{tddl&<`jx3W(a+}
z-PFWrmVKnLQ5fg4>v?AHdE@_GnZNMn_4yU^6~6HEJc_mdyg%`6+gttLR@c|uj#BMD
zVn5w)o<&ps{eKtN{k~au(X`??d!6uWvpn}elj)|nm)$p>`s#~|-0r7h^Lg)GjcvK)
zGtVb`qc>}TrP_t7%RRJ=uDscGdf)c9`<7)NI(75Nx9<F&bE>n9vrIl*;eW?);KsJ!
zRXjYs>mnYuyED99Gfz$Z$@!HN^F4jmt@Vmgk`at|nKwg4$nJpX&ed}3JNb4#@tN$9
ze9$SXL7_#VL9r>X`?_|taOmgqZGT^f@7dudbBX)$C6+0RShPcK95Xi1^g6fLUHw~&
zil)#B&P0Cw*Rm_md1sfD*wn8|OIaiIX74Mp&z}$e^?wk({lDxhH;b-C2dwY^m#+AJ
z{;%1$y{~#t8*#+(-TNi{pX+VQQMda43jhA;*KL1ockjo#`p)e9y7QKwnS35T`S|o`
z|Jn0%ZM2^x6;$ZFJma9SMeOzJc4p?or=Qkm=<DrSvUPh@_l`Haw(r-eUp|x9dSlt;
zceir+<SUre`(+P&cwuraZ(qjMC2^wL)=a+gw9K@2n#+dl)(fA%KEC2JE3xKKyZ@Q@
zoc`$=p~=^oeoFMG6wW$OxW*;@*M%t=pLeNr3+_udTE5P3!mRVFRWCH0Wn8CP{qp$i
z%u_DXGFNV!pEgRcb!0fM_Gx*R+cB+!j}FPi)xP$haex2kt^SX8E|*)ivTka=(B#Xn
z3-0RL_m%%Wlb@K8@@dYxk6q#Wb#HQNO7Ye_eE)yRymk@ZJ#TCGcbdL7+y6&?k89)e
zc{}PO`)!L~X{<Q@D*A5vw*wC%b}hZ>%)O(2Cd-5s2Ob@IDd)vi`kP_dwY-B5KJ3)h
z;pz2DJg&Olch$<7lAnv!KmPch?;dDUcri4eX?@eR_09}S3p))n)9mZbr!qN}p0}G`
zqpH=qi}lRJx1QVE4kjc83zm2+DCFt4pIl<9qmVWA_=2zhy9L7LHtJ|iTeHN}=kMj~
z+g7IjnX`6NRJnuWaSyrM7tY+u577}h(6>Wv#^3G`N5`#Mdh1kom8Gs)w#MFQ7H5Ln
zv8+S;R>!wb{Al{@`}u!w>kqvQKE6B5e9Ef@873e5zW;YS?~=Om#cTN^s^NE)oKMRd
zRekuW{xQe*klW^){pEEJwi}q))y4^Rb#ToQ`+3lAS-Sp;+CO(@-g7bMHoYC_yUds|
z_OkY`X`T$C<@5V<%yy-RXk0zkTAgo|UcdO@L(Z70x3_z(J-Sxem0V9}WZ1oa&)S-O
zmtP55i%m=4u)?Wy`Lm^^UM&WSbEOu=#xfPMMlOHe(2?=zWI>Dk647HCQ@5|tx-H5Y
zeJxD&qjtaNL7qixDu2C=zxiydalMja%agJ??>m!}FSC`OSfqL`BzS9a)ESZWMP>hQ
z9kH!n@3nX1<PAqA?%tsL@6-1(UPhVIq6d0<LRpy}UMv68^!LEqEg!?{f8}Q<KYCJq
z_{0mAyo$fo=TF`$iw#?qmn^@nH%)%uzt;XMcK^P<|KZBRH`hK<%K71ui_9l~m&X;=
zzJ2WfeZu8vp`(vaN5yYn6UXr4_3QX+`=URm@5&3#4$$3@RwmtceA)R^_ft-v%PzPp
zT`wp8ZZ9iC!O`sd+*(qeZXqJPe;!!Rcg!y2i!R&CrTo}<b<(@@mh96d1e$)Db!}&>
zjh;I1giFdc-K%WV4hie}U%R=}O*ckRlQlGq{b_yMO|Qmw?SBm?n7;Y<%{-DZZ^gu-
zPbG)Ak4#x}=Vq7eY)O~u#Mr5wTj#u#Q#~vAf7T828CAv^T^0XI|N1e6E@qOGJZ;<{
zDY?3bG3oI%?vJ~+|J|d?_LjBg1%JIPv$JxncB4y+_qsit*YAFs_u}v4;M3uJ@s)q0
zCmpYUFz<HZs$&U1Z$;m0-YUKAQO&KOxAnX39ZR`;j5~Yv^0{)M$3Ca~EwTU8?e^*O
zlB=`c?|Scc|G=hmwTTbk2p;fT-g|et{#lu-j4P@=!N$=aS6%;aV)kx_%o>qvYxXl-
z-}mtO#mw!K&MEb#*~{&E{@J4Vlfkw(`@~*vkKL8^?4J^gfg6X$8V}c2`HipUTfcw4
zt^DB`##hpjLQek+Q$iKi{W$1h|K{ygGm$y%%R|~!>Yr?>&&>|rvg7F6Ne5cnE-!kd
z9=0M~HznIVXJI>Y(<asYv)fe7*9lhzI6T<F-MH1o(pN87zsoB1dJxkYV<V$5wkbh3
zHovcmDP1hP!@l^H#J^Ad|9Mw%F|DYrS>CL@ZZGfjxYE_dzn{$Nonc*@6q$Xi_^0nu
zFOzA(F(x0HtM|=O3!7b*cs|v9-e#WL^H$ZLu_*d5)5KA7=8+2@B$lOJ+T7{RZ+Cg?
zWsi`Ae?C@hc?A_`(x&}7vg&H=l8X_~s(<}?`D>MmXzx7jOqZ6<m%S1%3dIUia@eZZ
zSF=l<tqZt#;1{>v;iK30Ej^R7F6eMa*OPRGRUcQfzyBrECtt@myDX;hYqY-Q`t!>-
zJ2527e|f`ccF4cJ-1@V=g%o$%$?ztRN!~V#i!);$H!VN8D4=zT&A&h2O4t0A-WGd0
zYi{K9{qd_l`m}^bZg$@0#3Xm*T&1SMn{SD&lf2a?A8FNn_d;I%^bFO`w|}L11EX%)
z8(3_~idT@7Twft{BlGdC>-%`k_dKk9wk^4R-r@WIZoa>EZer$^+ub|<O_M*|zvuaN
zhmeGV3Yq-6^ZQ-WXRf*}TOHSW#o~1H_d3?){&Jpn-`b+<7iAy0Y5D(xZr3fzeZ0}%
z7u?OeTJ=}f_Df8-zJt=CKQXfy`1t$PIcxN<uekXp`r6O)rHT#B&fcec-<L$)sQb9O
z`c~Q9X|@_tzI$F>n}2X?{*UK3w*8JOxuyFhhF9%Sb9ueoaX#DLUh8#7+PL-Nug=eP
z-M%WoK==96he2<)Z~C42Cg#iJKs!Tb*LCiHp42)Pwf#A--r#k!E3xUuuOsKxE2o|0
z{KygLu}MkP?fEW2n~y%bE<Im&czx0}!6Q2g6JK#pS(7yDz&?qez8o<UT0f&+s)QU+
zUi{dS-9kB8v^g^IzUlS{d;dSWKl65<Oby%rzxIE#O@6aibFtpolB!<!?fO3f`=1Bz
zAN}xwLvP=oX9>Gk&OG}<e$98DyBku&=S=wW_3^&l`)1VKd3QRldE&*7pY4{1n#|g&
z``}-r;tD_M%h~3t+bw_mS*%ed;I-gcZFxb7*3a_STXs+W{Isle*Ui%=zuT)M%8E9Y
z9X|I$=fRt4-UT18<{x{;z5dwI@cojTqxIsh-H#Vvzwh_g{zp$P{=HH9bM1{Swf9&3
zkIB9@Er~IF&VdVjRr?yIKL|azqM=7nd6UbjieD$altOz07cD5w>B~DJvhL@m$GR(4
z*Q&hjJh`#^qxOulXBTv(qBe0FE3de^DfLM7Qcc4gzhirLJ`$O`{B+0d=Px9-fBL1l
zgDd(WZ^Z09k5WHw;&PGtC|>Szc6P<anZ=4OeXrjxU&dr%WyQCZ>$$R#k<pvi`z{Ac
z%#Z4h|7HGP-tM3H{(k23c1^82gMVD8{}H<9t9l);@#}3NH<y3Rn(|)d<E!g?*~4T0
zr=2-J_t31;*$yG+O1|><Jm~-b*FX8W>iT1Sw&9OI%l|%~W-lIB6nkmjlPe#Ux4u0p
zomZQGJ%uNBVfDL{zt8S2yqJ-clqKtS{Q82sc{9&9KMiM)&bWGGLC%dbLxy9&bgL&t
z9^AXk=Zfm2o*ut_Dn>r8j3v{4t#~(|`E+FP^2>+L)oy=K9shqu@o(<)HVv}k_ZwDj
zjehgyf6)K9vvxApUv%X5{N9}LjW_A~)9pz`X`d}mJJv;VE?8K3?u|I>!Cijc<}-^N
z{Zcv4Xmqsn&bw~4_S;h9wv&b4dd>Au=R^li*lHl?6?gmGSM7M!%FA2{p%Y!hCVjcO
zrC!wX_Q8#L3uiswHhW>T(8^b4=kG1G>6=sOvguR0_?_S0-L5Qgv3v!;q-!!l-U^k(
zZq&Kpnd08p=levg!0i}6Gp~x%^2>*A*MEvntoz6F@7Ml6(K=`5A3FZ;&Hcx1x9|0P
z>+Rq8Jn=`_?$&?*7{7eyPe^>YrNUo#L*;L~J<ojKAO0gbUBlOJz5kIACjQ#@*(a0V
z?tR8<JJCMY^Utg2|7@!6`{w_&Jd=0p=cF~sezNvK)&IZTI-8-dmk>KWW$I#myI}1l
z3l}v8n`S+nr`3`E_h)dz#%_)!Il20OfA#sVJ$~bf)f}6$3p@W_{Jp<v?$k}?nW6R!
z0YA=7|IhXIs3lLo@8eCc>rH;DrkgG*@Sip(E5_Dv!Zw{E`E}}Z*GT+IQN1>amv_E)
zmsg(N2HkSisHtZdrYN><n&h!niKlCwcG6uL(S{qpHHz+uR5n#^7tWFw=CHc4`oT@<
zv(m}>`6u#>JS*nyop3CLwIC-cRBMTmk<ldy8JT0h>tB8^I4pgyec?pUJ0JVyk3F~h
z_dlub-5KvyJu=pxnBqz=TQ9VlyWm#%x&KE!Z!7cH82?l)yMFK9=H%BrZ})$C`M>S_
zpR@G`g8T2c@7vdyx_7;7)x(odYJ2z9U1wa(rvI*f&$l0|F29r7`E8T%fkiK}5{)fv
z_AQZg_*}Wf>PFqm>_e}=+&OGf@?c|Jc*mlPNB+D_uK4qB{eyM-^%8H7TISrYwbiS=
zdV8VO+|c;1#T*KX%YLcse=ymPxv=fF4Y!bU&!L%i%cD-ri<jG|(2=sLdQ#7nwNXZk
z8x{%6gsiW*Z{Md;b=oU&j>aU5d8%7JUe}NoEvi-Wy7d42X~{mp9SWOg)-Xv5g*}tF
z$=#Vc>rH9;gq7yACtfUEVZ%IQ;z#H9w9Wj}<4T3?KAhg)FP&d)|IPldfZd<t`y1Wm
zeway}UTa{OoV2QEQuW8y<!8<wP7aoko!@2m<io+|lcuRlZ+m<2MaKJ;Dj@;Wx$Y^}
zy!Nhd_5XkNf9&lf-@W~E_LIK-kKX@N>GHj|TcRWOe|_|1TXDMIl}Qt=7H2X@NJQ1y
zRnMHhX4=OcOzL~MVm%ntr-d@IG<3e?m6*wq%pw2tp1otKl}4A_QX{=H=Uu=4K6J<P
zP5mpon*ZngAMCTXZ#&E`clgMxvpar0`<`5uZEEddpRzuF`!7}l@ug8ybG)xEi`!vb
z+Pc_DD|*`*hro!ZtK`^IZiKC`F)eV}a3DcMBSx^*AaUE~%CGU0=5WnD9J;D(gJs#z
z-D(y8xTm$O+$`kd`@a3}yH(qo9jE>~cq+`m*F7{$da2f~S<YX47lh85u<?ZNvRTvp
zrtH3c?7>mvcYltDp8fS?qPu%Bw}tZKcF|v3_om<H-SOko^#>c}@3hwcx>64scP-xY
zfBHWLW@cw^4)+9}e!p247cif<$=UDG=c~?nz5Dm&(5>D2`**4*CkMA?e_57iTlOQe
z=8f}z_Iuy<-9K{RK}7zONh|D(iuc&KGdZs0Q(JcJ;epHc9eKb1O#c4()9d@wL~=^9
zxAOJ-sikwiz7{d*_{7vu`_mWN%C48P8fVxpx}2AIT-E&1zWhIP|EnA|-~Zu01B3J8
z><jh=A;)&iwd*_Dx+Cb<s@eD2)BZcyWPfXKWnf#fPT)xUr6XRG?ZrfmisnpeUD0wU
zYpSvP37HV4#)5NtQr_Xod2c4$-_JX`J>lZ+Ag}d}zA3Zyh5S6UW3=WzaDMo?W77R4
zNz2YX-2dTU!lqj%SA2bZ?dGwUQ>3Sx6kA#BiCruuEh+tfp~Q@{Cr+$TH$THA9#>;p
z_GTy7@A;Jy_5UCK7w&aq{=KeN_*>k^C>_0X&MS9i=n7q3#MZZO$NfKcW_GfFl_EuW
zZGN8Ed$RQGnLO7sTUYm8F#FAR;oU{OXYzKR*mpe5-QO_tX6{|>gkCj1*@{hV3}Kl<
zp%as<-d=mMt(!YN>v(aLsd0a^bMi;aZ(N^0FMqYVL|ORsDu!*<8J_$+{d<=@e*kJ|
z&bir?-2N!8yLdUD^3y)!-A{$i<m?bgp8R@Y$nW-lrqN5HCT^_QF7hzx+v5vLp*upl
zCnoIqdgiap`X?t#JubhnNEBk3c(}Ou_L7JD{@!%h>Bi*#CiBwuvpdx`{XJ!<B>um8
zM&+Tr{5d+EOYh8a<=f!z5W8q)^pTBfg|A%K-+F0&`r;hsITJs2DK#=A|9v+1#{vDn
za_e^gy!+#xxqbKkpBLUgYJ7jU@$&LMW|wWsM>IEGIMmH9XTCrGMp59^ot%7KWloYd
zcBZ?ZoY-EreCixipW5JmpX~o=`pMZ}x%}0#E~Wm{zpc{cJ6cjcue<eEw&vZ%7LB&7
zbl%;9JC5$W{8c5lpdvDK<73m0<z;V=dROsjUF|!^bd0l7o~>PdL*?_UJN~qlC;nD7
zPbf)B^Avr2HI{LTs7;{c<hxPNXEW_SYWq3+DO>XG%}beXRLZo9+89~xF%$CLZ}>uM
zLG(f$nWE?6%$9lG=~MPs)jr)G;3;*|WtpL2#6(YB&WH(I+7(ajZbod%C|&=xKk@hl
z$!EQjdS>?q3;Jl)=CTH_oS<=hO+wB6qql<Q*Yhu2UfAQu%P1px*04ZQa=nYuji{Id
z&$z!OoId~Wy+!RSmVF=n>$~%79x6*nNFBYGeXnD#czpB2hZ{50AN^b|UsgAN#=PDz
zzV1aHljc6Wcv7{0{)VJCJO8BF)ZD*5?aPkywO{NXx&Qx}U%fa`&(Gjh^L*G^02$Bo
z`%PytOGwTwS(V}%xFA14Vy%ny_m%GN4&CClUa;eF>}0mSy+3k%pDsW4Y(7VKtX2ba
zbMomdM)~TGGuPej@n6UM*;_H8W#L55GkJSi^zFWTe3+xz#da<CUUTEYz%_S^0;kG_
zExT7>D)r6F@$v?><1c0ibQtfswkGpp*3@;$#!6GSyQcD-Wt_R?_tbt}mud-5?O7A<
zY?$#-I5)24ZO-jaPZwND(~3>F{BLXIp;-;Bg5{b@q3^uqV=9kd&bhQTN^$+iGY9wW
zRBM)e`6_8kke2q;JHn1Vw)@Uml$bncNKe_*)S2LV%<WjgZR<KY_IcH^?{<DR-tl_1
z{NdR6zY=Z7ml+st<?D45o}6u#RP|QuOx_*_{yV=@)9sBnM=uUt9jt!&UVZkpytqvP
zi(_6})IGVozb{yw@3D3KUyEnY{l0zKalZZw|Ho_d|HMz)T-t4_cH(jH>n5)B<#!J~
zdprGMC;MZr=fdvs4i_^Vw%#pXvS`Ix558VMHSGqLS6MSJXP8a5yLR}_*L*_@leR?}
zd!BH~Xt&O-&OfwnuX(lc*I$bR8zW04-78oH9Bh@{muac)VNecLk^GwGp^$me`6YY$
z+UPBon>;ueXXl%J;%%CH(DHkP=A##3+q{fY`CU5#rS2!WhQELEH^@tHMril%6q|W-
zRx1lkQ7k*9nAUgT(8_fi7tDK;<DQ^#{$=ZlaM5bRf{CZ*%CB(Z_<yd>dxntN#ci!|
zax3!U(n@r;Hy9fkc_lyE`g;4Lwg2CQe|*9J?$GxApA6^N)N!P19euUg|Big^onL2n
zpMLYu&m-#G9Ghus4Yp^VF5Rc%?{hw>rb_nS*56(-HUBv8eBIiAJ?#h6ftkVXADgTH
zaaQZ?*NjqJ-5rtr?W_C!T=V?<vsD_F`^z1CIoaLt!PcFfTw9_)pG@}kS!;fCyJDjH
znYosQ*ZzOIlJV%q!sl7rXU6O<jcl>~XC9Ius#x#H_-bnRvN_txj$2O6-kHTN9{4#~
zC^zBLiOyWU!y(VRmQ-$8dr#1C0Y}V+3lmzF7%MFGYIKd9&2-Iqt1-W-qLM~Xf@`Qi
zyEezgnD9z}nLYt0mZ=umb9~mk?w-qGxcQO9)0LhbJ9ADRyD@j?%ADoPZynZ)fA(N@
zm1a|;`<mp7rBR-1wHr)NZM(yC?!*a!_p)!VDQ$aqqkFCRyQACp{o<6Vd-(E2`^I;h
z-rTBo-n1(0x}J>e?5dNmb9K)p7oDxz^U%GXwZG;+-<{&)>RH?W|0}oa_r3kytv}Yi
zVOg44qw<sVq$=mPA3;+$Tb*xDFY!w@WxJGC^HS!)jfd&k@8j3)vPhoE5>R(UylG9~
z3-+ALPAspBk1k(lxp~`JPGf5gfl`Uz!oD+hs8qW?<vQngrNE`jyUzBsctXLU7ZEw`
zZv?h&NaA>3CVMl?T}!a$_k$DHC(bCJFMssdMAPH@ZmQ&eY|+2vKijg*)@f3v^OrrA
zF00fVly@@Cm^e`|QHtfkRrCKAGmcdB$Q)j^%WX|a48x_j%<I<wf3s%Gtef|0Z}vuP
z&ePua<)nS%t0l+d_I*6c|JeQB*Vh@{xm}A6Toj-0Z<khe_u7izZkyN3PtG=bc;lf(
zWzDOJ?-R-{pG)A|!1s9a>sPDOW7+mkpR820h@H{nCF6{bMGG^`e)Cu-><E=lK6B>b
z>1lgs+FQPScK+GPnGOc-XBIHd2s7k-*f?)9_vad3O{FHMJy&0AwTR|qb@)Hhi2Ar`
zbK6y`1NV3q<rbb6Gh=_1G<}NT&)k^lGt@R$Hcy%K!`pmM{Fdo^zfAnGQDc^~&e`36
z&ACIv8PBj7C@U*7F1315aw}jiU&!)izpwc}iz|N@t#(S^J!?q_dvLb-qif}VlGbv*
z?Nru(@MEL+o`;_nl}#&1C{WqueKnK)Rl@dF+w2Y2ubX{RPdj(9>6SenU4ACNe!EZm
zQy%eRkq%qK%&+24#E+bA@mt=y=x$sIZ=LJv2^wpvj_zq*Gf%N+0(WfesjT=-la}uN
ze&X!LtCjoIxFwt>2rgAE`d_z;z4Py(ndV!LoqzZ%X<rLp<5!RADiyO7)P&1dF1xkj
z(Mq|0$t#prCxoxqG{^j8fo;rUzh$?$9yt6@sN0&FlCtN`4C~@gbKaCEovpg_qiz1G
zyU%vt|6$VQrd$#4E2N(v{qx_R#MAShJQjQA_vq*Hn9VPK?yM5cfBQ!I>Uk|DhyMpI
zT+;G&Wj=3T8GrpPTidZulfR`pExy=(=-I1XQ%${1Y?iLxV4nDm=bMHRKfAZb9WCia
zkGOK#ozv`9gpBTV&FT$#>>_<xby1nwMBgp5Cv(S4^q=rP@`Tx?BlU)x=g$#5{jRri
zrADFb1Az|`(yNVIx8+7^RxfNYaNCi}`?F=c9aqQZJ6fq9ZoYYa9#o}DKIaKBne<)O
z_RAkj&q4);+2t`^rkh`OU2RO4KXhkiFyBk7VlCZuGgf4t_B)%iDz(3z-|p?7eHQh<
zROd*mKG%I~8b2#M{$j?1FDI3^-tO@|=a#Nud`_0@q=47FH2Wu>E1DwDFnBF$KX72C
z&E~ZJO-qbgSsOQnT7FxT^ycxYLIENDbwzG2m7A5e*>)$$AM=q)z1eTMta9ty`0H<O
zs+RtW(VeOE{MH0_x7eWYiCX=&?8@Da?>4-z)lmQPYE|1p$t~WmVq7<_xpC^J-%1w0
zpA3Ed{_{3BKI-Y|>3KP`_vCNBclB$gDeMy|xuqLZ``9{ryXBul!G~6FJ8<Xaj-;LI
z>p6PUs^TWjEIhbw_2lpNUoVtjcq47F|N7Qh-ENz=86U9~*b^sY`{b6toc$D=^3UZl
z+ePPwJN!C!O1a@ue81Cb5oflftN`Dfl5W#qC7X&H{yn}sh2LSjU#{zgx$7@4&3=6P
zcwXzOxNE*~t_E}dUf$|H+azhf=+Doka_5`hPhVR<DO+jD$&6CA4^wXn)Hh0Wa=-4r
zyX0-os!bckwUwSrMV*S^W@MUVX7E@z7+jVVp1Y9qP4y^q@p6B?ol#edm-cW38%t-c
zZeX8ZeMTjEj^*5M+A@-}-wCZfCb2&7oz~T3CzIQcR4&)<J*+%AR>n}I&F$6mZO^mM
zsg}*<v-z8F{jJ)yoOQj+Pg|(7Ob}){5c<T+Ea|A?zQ!&4<ts$BzIzIG7Z#_nyK+Zu
z&&gfdrK~bRSoB!H6vf{Do6{fv>i2#6^yFWmoo^HN$G(k?=Zo4pWrlW&dgT(mUwSiz
zd2TvAm+<bb=Uwx3O444J7b-T(kEt!2{^rR1i4!MY)E3e1@m<q-ul&UUVT;;VH+EWY
zdzEngp7f;e^7g-)KJKv%-rTq7;)`3W?iGG4-TK}B?~A+7p1028dhp;xMfj$h8o#po
zufE(;r7qcPXY=#I+^x5H_<EDi{>uG%@=uYlgO>p3{b@^XOSqoQmRKX9llEdx*#?2w
zh$Qi-LkDIAW`BD0oM*K|&O>3PSj#QuJ2hoCt<9-n^;I>FnQgKnt!ZZHl+V?(bc~L7
z%n-SCB_{h*=c3y(+g^YBRK4`jO@UO=%&$Rnj?CoJR+@R(i2Y`DTnNjCZA>#b6WrX6
zSu$-tbRZ#WYSo9G$Irj~=$^Hg?WuTPXt>(zml49*m)^chm;XQS#6{ow1b&{rEA<PE
zFT7Z--f+BsPs5_=*Q^BP>L0w0HJ?4_X3aI81;*1H7?PP-?DNhp*1lRiv$<^J)yW%H
zUlUbXJV#yIlS_5A*S7splXUFY9)8z8^E8ir-`PE$i7b}IRZ)>^lwT=4`?M%Gh0j$d
zOhEBkw$JR;qm!5w+xOh#JNWf&i4xBp^FA@@NY`zf&mEBt`e3d4ZT0olO6&9IZeK3M
zvLQNKSy@^6v8sT>)q~%<*LmHm|GzihDOqw~>E6ZWpTdssWMg;VZDqE?Z+954P5m>L
zzCAy3OtWX?G4l8NT#;MtlfBY>nqAF<LX%mwvFCT*&3pJ!zGm_3ve{*CPS0KR*^yx`
z|DO|+uWoPZw0oX<dvdb>pDDqcwzd@Bn!N1kn@Q&0evC^W?L45k@#9pHeNkpH$t(Wx
zrhgQgcPZ3-#-d~A9;vojP0ib@wEf<vnTzUA|MJpPf6n;2W3lU8)-ykTgp`$?KXJlh
zIZMvjU29KP_si9Y`P-M>x3n}ezFzh0<oA76@_XWh4fJl*mcIRa-lj}n>a3lN)rTve
zW~`{YKQHQj>Fjj*|9M4c&-A!$=D+{zQGD6m^AA2)99w>U|D)ua=ad;sR{IHr+Ia5z
zV-tN-OeAoJpU#}s9AaWh#|rvgm-h7R+_ZAlMv;^qDgp~KstwhWIBnmutPGJk`^R*1
zpHiJ)mx@G;@nrFhYZSRwHCh$vJAFNK>&d^RoTcmav%)t@`^$dREqn8Lhc@Hd({p6z
z&p5SyQ%_G%aaZTdtr6Ql9(wXO{{N%@4MB4^|4N-Q^J0cc;d$BlK6%Dwmdr;}+h2WI
zxrNs&{=Y)QyKHF*nS)o(OndTI|6RSz*);oS=VjI_&R!hbZ@e|H_<F9~-+$Me4zT`>
zTo@vK|KBC|tm_LmX5ZJ1%}qBtr^q-Zu7N`%c1@LAlSyQo;OaT9t3z+OwQVh$?iwxL
zx5Ht*L-@8eygnX(LX`AQsAt}?TY6{vJb#|fS!V5Om3c0Q3L@`6QA@w^%|a;c%*0j8
zkKf4g;B-}futa~+=knzF{BA)GEo=Mzzn%DOeMR=(t{c0`dNVWB8YCqppG&<B;}(xE
zEdKQG+9An5cjN!W<rin$Hgyzym;K)``FOlf-sZ&DM-xK(49;HFNdNt-+Bht1u36gl
zH-7i*>wj6u?cKlc>8`TFt$Q~_=iILKeXI64-S5G<`ai|$Vtq3W%U^Ni{XZhFy7;w<
z+p+WwWrzFzu-L`3Y`8sV=K6Gw==pWoJ3`j(nx-0anT?M-QbaND7pr?){Isj~$CFww
znHii(UAImwFyp?HZ_47emsc#Fr*f$5dD{)Qy#+R{#)nqT+BmZ?P3!eO!BcONGq>m#
z_k>;-ubiV3{KVtkeaE=fe!7fv&Ou_ckGm{3E<4_+{u#@^e~0TECLiw)<COJY&-Ut2
zL(;Lm<#kg1HUG1>-u6GAV>I9Uv*}8ey=vJ84L5zQv$t11Sa<&VJ$oy|%a<$9<?UPX
zx-8vK_UPOBKa%f!KkNVS;`@5u^16rnAD@%EwNFYszEs+3=dbdA91HwQoQ|%YbNF*d
zpvxTr4iTHgMoHl-x^Wlt%$}WB+5X(1@QBM?#kVz08$P9Tm!@<|6>m9|X3O~ZTfXo1
z&^1T*x?SSARoxKj|8@O-<F@IS@1(k2Se$dG)%n=!j*s6q6tjH1VZ~%IO&b)6`pmc9
zisjWj{++$uvh<H@%_rsk?fLajg=fsSZgtztA0pE6`rn$y;)@xJZoYBOE|lZHU(WvT
zq4NHI_kHo}^J4d>^0&FGpS2Uqx@1|kmVqf%%R~0!+Sez(lm|0(>;E)<t^Y!ER&L=#
z6F$4|2J@<Z+_otG<Z(Vz?si#x_r{Z@mEYdmEQ+k#5S;Kg@yafR^`;(-&lh%OPHCH+
zqg67=TcmY*QDV`RlBa&>u8D?z-)vK+*lTmvN;05z>P7*X{WbwVE3O7!J^ygK#rK|=
z(^6|+sAjV1-r5)wdGAK;G;Rf@;7|Iz6JnE7SJmmizuX-(b;HrQjw%LI&S-|o*hYR|
z?{xB%eCwTcR(WsC{GR>$m9zV<-~NX_DWG1!N27+04T-1qa_&~L&a3-!?^dq-uX}GR
zUQ};yUUA@E?fRqpvh$oTW^@=XDXQoGoc`g-;`>LP@Bb~z<u;GHyKB*`+{K@mGYS*;
zrM=zze*5LPBW=3XAAU67kNISJYt!RT^KAdzTFd(8Ub*nQ-_Mqx`*lC7rb@Xirpmdm
zE}D}iKv-VL-hE|U=vU1XTq-7tpVe747fmXivMW(;=FZL*Nv@yQbX=MqYB~g#%IF{K
zeXBDsn)mUFtKRDmAJmz0>ZwfJ90~73M~-Pkg+3PzyK!Q1xQwv=>Cl25n@+Sn+Ou@y
zcKt~&RXXSGOsiUFyeMK_E~EcC$K6|J#AkxCw9K8C4@~oG?CpL&D&D%e^4nkUhYR1|
z>ucXv{W~)D__5sS329~8R-y+L1I}kXe3zZ}ruORWX|4?BaU0BYOT`qg%-$Z~c39u0
z_4)ii{~~vr1sg|icz^YM!>cXDU*Fp-X1Hq4nfgxKQl!;Ku*;S?^?CY^w@#O@i5?O(
z(~aGBQqJ+*I_a}v_w*LOo>DEJGPQs2XT{rXYDFA#s&!^JCABE|b#;6Zdvc1;|CjQw
zw}nMVqz~><`1v+$=Zg>dDeGoGp6_w>YuKW!(}G(I?|eJ1I#Wk$^SgadW?7qRJ=nMJ
z-yf~hCr(sU2JC(Q|AhVTtzMD8KP4BPRg0<qy!-A=GbJ6pbMr-+R@h%Ri!Hc0>6)pD
zQDf)Jo2nD_mRjw2^2+?%6|Q%zhZkQ4E&5r!fXVV}E~|ip<?3fr=BFbaxK=wwo#eiL
zC*s=Sn5TN3GVwyW3Hu+pEaTFc|G|)3<nBJ5{O_&YETM)WLZ7?SY6X9b-Tc=Y$NW>S
zd84Jnr}IvG#5ZP6{OuB)_j=3Bo%fiIRc`)#-BEGp=j$`?sjN}j<&-Ma8a;dNoGeEE
z{+`t0^F2L1(`9RG|5jW-|Ie(=J^r5Hl#`~jKkO>65pZ2B$szJuyTQA9eoEMmH@nRB
zUmA+X6){`Ay*BB5XGg*3+jcih<#$MLd$)`2`u>OM0VcnuUHg2_qMT)ex8#Y{9G3ed
zKdETdJ&8UP@OJZ!-`|`Uab>&=^qHe{ebE%PrhC6;?0GBM_gqou;+EI^tvY%?HwWef
z-FWyic+clmf&~(+1yAxFUarz<vMv9w_VTy#FT;Y5Hc1wq${YV)Id<Tw$OMqfC0$zF
zHg|6S`y@Z%^*QahY03LuJ^TJ(oBV%K<NfazUo`JHX*#<(>(;i|@Z_^^E)^I2{>8R2
z`@OGiuC;+l*I8@5=xzK;#*cSJ+c#{LF4wJ{``3BLr>*agt=qf4HE8aczhMGrcoG~#
zTu)3}#QiL&EAiIs7&dnIUCa1%i(aL)*#sV$vs0vZ$06?1W+}IK=#)(CRbKsVrO2v8
z=N&3u2FjU#lj_#p+L@;v9_nAR>G-<3FfU8XW1DpKwA)gTuG_?UVXFQ`yYO8_S@jMx
zikuo>T~{v%G7wUKC!$y@qu6_AYQm}P;FCdnwgwcj8Gy#^Qs!Le-?7i`&ZlYfj|%hO
z@7=xspXVIA$|pMS>lrrBE`NCJcAeC!%U)$RQQe;_uAl#Ft#Oqtka5wWJ^bZS-5L6e
zjh0V2q#Ay|i}}1=$K>OD*Yc{5uD%~AS3HwtLdS*s_8qI^f9J{E`Oh)0>WAJOn_o;~
z!l7sXH754>ok=)+ZSRdOe~q??JzsTx;+cP8S6(;EL_N5uk#uCyl^NQh`o<2eibkI}
zmrdQR^Ty|t`o7zFUq3f_D{jm^D#qHpbHiOf<$yp1tpyLNU+;Xf^v?cO&sgt%k`r{+
zG+NRdDaj-e_F&DYYf?7ayX9T<rV4J}aNm3FyQ`-X<2$wcJU#ZUJRy~t>9e+pYp!bd
zwf`3;pFVP%-|0i(s)?Z=&aRa?xFkjB#E&B-d5q~PDRcIFDR9g!<Br}I-<B&L*Vg{-
zzu3OdQ}@@Nd=;!Ebz|#y(;MY)rM)F%cZWvbR8ra^_IzQo!}%};&)r))!uLO1UhsSQ
zKN0TY!ubbfr{8HXeXalDkkquJOc(REZ%DfvwkC2r@0p&XKP_b{z8ze(^-P8d`-Z&7
zeqZ?cW@kC=Hl2S|PJ1eY(d3yt$wwD7HB}n_wzmEp@3xZL>s5kgmHP|+3=ZY!td!(O
zQ)W6}$x03N{pp%j-{cfo<Z|n?{}hAL*^%oH{*;Z&zUI%ot~1Fv)bV9;$Er;)W_nK#
zGyXOw^{C%DhBi@Km#7^D=Z^o3?#!*O681P_@hg8F!vdjgOgmZUOq{q;sUzX)$(yw&
zx8B(Ix@eAFCC_==uL^wfHBt-(PabTxsQpy%r#2_c_L$oBMK{eGdZWvdv)-oh@b)jf
znA2oE_p{Y`H<uUk5{F*j`*^zIO{4XPN1y#cqi7djygq)5*Lq{}`K>c%-3-|pcmAE#
zOv%5^&NsHb)>4=C(!9F)lEq^iVTX1fk=Eq%Nw3`AgugLax#_K!mQ<RW-}bVv!dKQV
zYmHN?+vJjXgy-SLrK!FC{}vr-JE@w{c+u3w%`jBd?dc5r&6$#ujn!AA3T$e6c1F`_
zOWog}mY2n+O?O$>t)uDUv*MB69FBl{U)Mgbtebj4DDCt2pgAh@pKY6!e+k@2-Z<&N
znhQDK5|gsngoDj*W>{zih_r-d3wC#NFa22@xS&3P!)xn7(Upd$;+}olo7*~Jj@#nS
zZoU1i;_;=cUmnrC+W2bA!RHNse$MCKcx7Ers1t*>`P55aZhU0c@hLqQT7T=+)W^!s
z8}%|&g$lK@L~K0oXf3!Kc3o`ovI`T{lU7VI<vFwF)~a?zA&)m7r^NqVZSzNFaz@zH
zNjsE!Wq+@Acfay;=FW3g4}XR2el2X=A{sa)O#fW>+1K*RS5+Upv%vksnO#S_yn{Mj
z_zEhM=W>3z@gt?KH8mw=jf23HB!lg%SBW;S_+xcfV^-Vslal6k(Y3dWi>(sEUTg`S
zxAk;{6l2d!qvP6cDVI*iD0ZwlGtrnmLnnOBTU%?9%=bZ4Ws=)2PKx=tx!Fa;+^^5=
z$j!^XPya{l-(R4fCvCpvAZOoFOO2mg393O651#2NpJCx!^j6?&8eiZ0jSp|-HZ2i2
za3=E9{zki^-N$Zc*(`5JNl8hW6FTF3)GD{xtIo%+KJZ2D5%<S`u^Vn~OECQI|M9#>
z+JfLv!O*YrtIejoT5vhfSu<5@$y~qNC7aH?=od4|3RJs2QQcZjrT9&$?czQ8XWx8N
zjee4%)5tI_)U^LGt5?F!x~ugYf;b)>TeWkl@%Bw_2}uXT4n>-+HJR3O>09*O6oLQg
zX>5k9F1;N-X88};PvrfPeyP4<g6EF74!N7FyYer6I;NP}QE}K|e!MBqo1DknX6T+=
zd_e!gG{d*|7l-I-2R4SB>s~Fg_eOR;=hpXYUr6~+4t!9s!8exc#E~mL;DAr5NM(B4
zx6uA^hs4`&N>*!Gx7_ZY%H3MaA2!$Q)?C*uV&V&Kb!Tji&d@!xaO;kSqeqQ1boDy)
zAIq4wB^-TG5*6@P%xbRd7VV_#ndLsacc>I=tIvB|YX9x^)|<y9(-$+XkgQMTj<sO%
z5t?lDditCy@y;oouhL({BnTF}iG&HW3QkrMa9T1~d*7rNw@*)7I@hpdP3E4mHKuLr
zI&&6h)j#5PpZW6jFXmT02_am`!H<;Ji$!o2cXAvtICkZe)sAllpN>Y?E?(^sSMu-N
zf7?L5DQ`12U$Htm%iyBk_29Y5PZ-u7-T9<$*|O`;!Xw<=j%ly7doIHF=ljcRhiv@j
z+H?sY=X>;}^RPwX8`n7&RRYWXWll}kd;CYxA>_(=9u~KivviJa6wH{gjw6gEP{?4i
z_L-P>vrc+QKZ%+DWe4*b@%cGlC&je<6I;sk-SPA8OHVwXeE+5I_j&gP|CW~;^Ij^t
zIQB4n+h;I!claUm{=3It?L3k7Y@OM0^CIr$Roi0ILSpjs_>LGnY;;}5eLU)Tj5M?P
zRB$h2^`s+Hl>{#RpZOyo;oTR`IW~nH%ll*xb}nWwc=V%t>QV2XX}fk<^j~{qBPRar
zLe!k*NfQesCAGU5!tAP>W;k>>3Mkh9<C*JxDQR=%tZ5tbn7xZLZYG5(WKFr<U=uB}
z+pZ{r`}R$%;vChPeV1pY>DRi1AD<E8kk@f1tYBv1nPa!yG-cD5pV=1na!v-j`htED
zQ6uZ@X|EDIA6Oh>KRiV^G*tYi;MR^(>#nq&4qaMRueBP4gN-w`i+x_LqpbYcCUEDc
zz58|CMEstpiMAYVwbao&<5+6NAhGtE&9ifJ4!sO^FZ}a?QO5ogQ{SE+K6%db*6+XX
zC3f$Rfq;YYb@xdfN2VUwbVyCRF?HbzfmY@1tT}U-xF^}1Rn#{#bO}{i|4A}se^7?n
z#inbUY6_=6Sz{%vwlHUFZlY$I#_e5GDlS#7^}nVPHj{6IN@Y-?^n{G1w>O9~2IuH7
zw-)-eG~WEYDJMq1dyb{^U-PT46@;%ow`41_nC?+07T2^c>(cF&fsEfxe;YBLIdQ@w
zUqRs99Lr8+_W6e|9{%mfvL#wqrsiLvjMaw<F^M$^XY%%1yfmC$IE`b$6BEDf#tV7)
zZZCRb7Uvp0@lV*MJm%`+=1Ce}m!4GrzuA=-(K)5&<g(4JO(OsA2c1!9k$>}B$W5zC
zMfCKCkUb0MbRE1_=F0b1(TAP0V!ln=_PusFXP7Uju6q=-Yg^~eG{d?q4pr@j$(M~S
z+4Pi^AMbh8SiQfg`rVHs+U+02e0g~I7Uw5${AG52@mk(3{=dSn-|QFP$h*YfXXskQ
zs3oPr#T0mWSC&ZX)F}&EHCqKL!c_TK8>YT3%RFjWJax&@XT^)YDCt~1cqen=<-En0
zGpGLFdOP5k*;TjYcbi^qDg1MyZi80zv)lT+?7|u1`Is`M9w<B%;_~bxSFm6Bf<=k*
zIHJxtI(6l(s@{;Bu>FFI-gN^`sT7-Z9sRAG;_r%`f3rH-B&L4l*<fh1a4mOcxAc3P
zNC~It)U~_gwyz44J-)@~E4N1^-?N<8X-vXPFWK1$t@HQNER?l4b$ib1HyRs-RRY4Q
zw3#xa&!xC1x_I0=;Ny4p3Alayxr;Zt{P8^Nuy?<@7B&7mnE2%@|HAe43}>G)tk`f)
z^6=wq0~?#hg%>$__<9oyDtMZm7r&5}_;PI1%?U=%N50tX4qDc*z~+2J;60DJXD|99
ze;W71FWO`KbLP|XnF(#XbK3o6_G(B)#LRHttY6+Ar^b}Ax^kV+4uRr=f~Z4_mZaC|
z)HtdBJ{5Y(EpTh2cT}jvqm`>0|LG`h)(Un#6U^qfXJ)d`*`;0AgT()Lo)r9aT<t3}
zU*y^jDZ_|LmH-itvvI4x2&Dfz|E9m!e{-g_@YHv2G(?XDG3uOLs#f{YYnEzis<x!}
ziZ_KzPKf(68eX%gOWeHc*jAPT)|;FuDJgqCZ73^y{qz5Xx6%jRJi8mQJCS|awY)<=
zp73-?aZWmVFnWvk0k6Qs>_k4Jjuu&_=R0FNc!Q09yIV?Kf~^J6=U>I86q+(6^n>ME
ztG8KOG7LR9PFt{__g(v>bxDyA-{Q~FYt1f)aT~2tm*EV4eBjN@*x(lnE@|u&t^8N_
zYr(o>(;xciO!EHoB>8Z1!P*;(o=n~)%i|~$dy&=iV#|ev1qT0*pA>KTzxnsul~L{g
zQ@zgc-8z2aO#IyWJkM`WpQ-D!q~Xd<FZMwDtNZ7c&0+BKU4Irbb0g}dd1lRihIT%i
z%4^?!uN-(YEjGjC*Tw7h4Ku&qHZa@A_P1GCW0hFe{|5%MYMYn+IyN=c<(a9Zb`wL?
zqla3Jks)V#G)n?4bZ=}rtF8JeCpR%*#x?`V>KTW&H9iz}lyJ^^?I>~X-N}6Guze3*
zw;wdE-1atU`T@h;?_Ta|T{ETV#MFE--9=TlMlVG#+q#$e?z*w^m!eU+dW+^I9jQ5g
z+*H0EbNM9mH8&=bYm@u0N7WP4u5{>4&f<)Vgv=2>wh=nuCoR4GU8EVKic(L{`GkrT
z8ROU6ldImQ35d>!+%M{U`0>=E+|HWotmIB{y#HdoYE{~;96`n7TT<63FlA`fIC1J^
zXV$H>5Qz^dZn#&g=HL`Ep=;HqW39K-$~@$5Ut5;PDxUU#muPnMR-@b_)jz{j+`>ME
zxVD{$oPSwK?PrCdu_MFENfxgdBW%Nud!0L;*>9gMl6z&}sjL~1-W|5A8$twk$JH)P
z-lMo#Mm>Mx_Kh$8s&c;RSi54*?aw-OF{NAY?z_j7=37^qnvyc7Jm*fC;lA%{&wtyJ
z8-HJ+EcTmJOvTBq5^{3iqgKDmnO*aLbL_RehjSz)wYwN5xi=~tJ9uMr<U~<Zv8lGx
zI|@wYJto|K^?S>jt)E!FxbSbB$?{q-LWN`HYs(e7{wj*5W*Q-(H%?p=+_|ZAqF}n?
zS8k_|PfQm7HCwm$Y)GJQl*ftdTUN(knPT}V?oeOkf_?KQnVbsSknNe=f7<qZSOjxk
zeVNc!%LBo|maHnu%8&mfr`>(_VB1aK-5YYRi%Q5y9lh|u!c9HRz`}xs;YG<5(V!<u
zvB&t08B20wO<r?&Hkc)poe<CdZNIwjtE)(Y(QS{{5}&@UzkS;1W3#BVYsk*n6^~N&
zrOv5Ooc3qu+Cbmr6D=XHg*P2JJITN7gp}5Khi86Iy)(2^&&VqCXht&|Of$Ll+dq_P
z0?SjQ<3WDk45AI$m{)m)YObES$n%U>1;ep#?`J#gc9INcozmie<iJdhB&J(yOIQnx
zz-`Vo90Gd#|LIE1o#7b&pTR8mZu26I3wc}5RxeytRODT%z3O|wtE>m}CvIHDxnSnm
z<aI~HrwYyRUS5*Sq+7N7>7IEr0+S<awL4t`GZro9oxAnDd<?(CUw-Z&wRA4o%bC~P
zFNki4_;l)`P0a0YS3@mzA0_O#YQOm0R-MhC^w(%jFY0sV+Rnsp>$pnE^1zvGOSP{a
zIwR=!VoO)-rWd--cal2i2rm^^oO4D+MmG6&%g4%6(E}%6`Y;$98J)AAA^I)uYnAc2
z!>gM6Ub)!W8yUq#YN#X@T-Ff!SN!DO^IK~?oE{nrm)%-*MrrS%3YpE5k7i$4$5Hz>
zCHkhi^ETF;vy*3@oOmYq>hsj|{u3UmWfi#o^IGg3K0(lSUh1lK`dfs4FRv;}{jZdm
z9icTLd1JmNlg=ZzM=4h=>(wJz7CukvEIZ5dAOt+xE-5LgJ)I%yapLN(ty$rH&p&zz
zsimF!^S0+z=Td!z*<K6!LXsc7vbW83<C|<K=XgrJ@t2+Iw#$YYr-XJysI50H&$#L5
zx#o-2+P~bKVJRn+gB=<quO$S_pFg&@Qd6#l<Dj=iB(q@C@wB>)zqfU$+|ulq|Fth5
z@v8qjl~hJ%hR4E}e_owB5d<~{aVl^#JztTO8tPa7L%7<7VV>WS@Vkc$3(K?{R<P;1
zu&uY;CRAoJt>#46e4AxKzjknWz5HMEOgP;&DmFUom(%4JpJv^dwz+5D<?Dyf{olCZ
zP~qwYI*;#Lgt>m5><}>_)bU$@`?o2V<@zT&w9WtjTFBO%)g^AP!So$dGZ?>r<xg3>
z8Z=?t(=*kFfw}3(x^t#^|GAwH-T2(MSvNf1ML<f^I_vHx$=6nYI$zEG8+m@)#PS$#
zpEb2UJ*t&G9P7-3YkJO~do9@}eYfz(?!FnD!}UeBx_o~)<52q%{iv&7`sBAf-&^VJ
zu;q)gry>jAp-YiRzAWW<5OR+3+zAkf_{nl1Y{4F%DC2CkTMPZ7!zLNeUvMK#qdGU?
z?a_3P(50(PA2;wU-}~zLbp{c|HjY027uz<9&L{}oRI+;Fo0+=KEV1EV?PCurJNgNF
zYG3T1>>5<OKg=?kv3s@Ov~1BQeGkIeJ>MVJDt>HSo6@;!-2<bhj=2}EU#zW}F*oMj
zmdOE(>B27{0TAlI!2GanpRZc#i)c+dc8#}TOCB&O72FcJUowefqxEOEYsKeId{C}z
zt>Z8?w%%?jvchUw*uzOX?yf3WI&sSiuSv=6xzjUW1io;65$E`HN&OBPe<|i&R|A(n
zJ*BwRc<WJ?kCWvZ>bA@g)c<YS{U*HV;aToerUD%k*D(0`tvzdbKoShJXELZ=UC^^c
z;K)*Cj+;&wEVgaaE82H%ebvjG7Qwbtrn=|%r>;}7*1i9tvSHzZRev%g54QMTRk*$F
z+LNoxa&KhK3%=VOx7lNd+0kn(>tBf{M?dMviJ2sM?&rzBEx+A9<tvLz3I7ggsd^Q^
zv&-Vs#Aukca~PPm1-XQF3psTNa5x_D-1J~u*25JAGjpVGn5Kz+(@G2Lo17^h_A>kI
z{I`WIRy&mHW;M(@E>vl`^T~}JGrs9}PFw#?S!M0NwX;s1IW$SlaPjeu31<4C%_o&3
z_j$N%(i3aDb8q9BZ%;I4|DCpO&sp=vzVl+c9*Ho#*djLBf7QvAGZV@{YiE>|m6KZq
z4>S}sC>JMPTM)U8qqoTHk>~R>Z!1GhD%Pf4x|pN(+3d@KV5_jjs~C25q};74Gg|t1
zw|m1Jk$#Wp(9W4Q6DK%sv|G7SB1?6HkKo3G1y6my#l$pahpCp$@5<xWP0%qcaW!~y
z<oM36EWVtSIqZk#s_NwD>CW@CTbXuko%^|fQ=o)-BH|#+g^gxnivq)29OTReBDXi*
zFn2nl@isSIyRoSyD^V+=LL@6Fx%|-?rfYMSRM*YhbwglLiRpPei;HQ~ngm*0ES`k6
z%wX*<SA1*gH#hvsjhR`p5wF$<=ZKm7TXD_l7E4uCn%VwMMqm(T#MlyC$+bF9;HCJP
zbvFwg>})<dCOi&W8L;(GxK_+rvqy$UHtvav=A06yZ<Xi!|9ra9y3P{UPdlva*IT94
zh3jZd3khY=6gcSd%<as)RX2niTs)?}{{K8o-LWopQnI0TT=%vAw>eZduCypKZk(25
zqB3u7YYA(?*)zZXoPzrIB+G@e^vET_6K1kcaS~_`;HbCuRd};wLCBOz-a9;2d!Lvj
zv%WSb$h;(Mv3c~0y{}6$w)-5p`rlZ6@f3sA-)?Q^`>5z1@+jh-faK)V@EJ-y3xpT(
zTxUAA?x1<CS?;y0e;2l#J($OMtz@fa#!}?~)zhz5`P*b`P4IgybxxdRZ|&}7taHHK
zTTt0Nhhf)5QN!Qqv0FcD#Xi}V@$_3_>Y3%@1x4*MZ_JcV@h#!Gzu|EDlMA+OlV0xa
z<7#1CdgtV^1LymWR_PWdJ<Iyin|1#1?U^?hE6zA&pRKaaxYDWj(=VYIN8X^CvlHHa
zc%LHwWP7=@(rLf17yjRzyEA9|CEW*|oh#vCagilJ*s$ni=bKljUd{KHI<w91Xh)OT
zhTHenYK6x|hY1;YdmLHV({xx!MCi4$`&WhJCsQ&C58vHx!@g1M^0RMe=Q0MrExvvE
zNsvvhl5XhvxJB-J-pcL#m%^!k!t_<y`uW+6htHh+>>U(*G3fb?3WulXcg&c<C?hBN
zdag-2XkaNNWsW@4isy$cK1_Rj>6=O_2XFo|9izi(J0&dtdu?)*<K}!5uVSfMB<~Wk
zs>E8$Vui7{$F<x3Lh6+|>VAA-7Z$C|xRoNc$U*Yl|DWP#fAJs7N&It#|G?Y+-D(%-
z8PAWXjS)QSS5}y>cHvT<o1EoUrg@RO<>uxv%>`9S6E|++T<|A?f6BH+T&lbaFN?|v
zt-4zh5^WHCLN9U(6RX(&%}e|_3%MedJVaFIg__^UjP`ziph%jvz3b$ao+nS0mrI>&
zRPOl@TJpN|Tw9Ty;gXwqX$IEU&z9C~>nzFp+LzSc`|s|NeS%Nh)8f}2tza#vI-BFi
zcoLHBcv%eO)YV!Po=7=m>nYxzeMx@8gS4MsN*Nv8H$K{?88$vsX>?dI;p_hrzm2P&
zvG1J~U12wM!yyj86UL3xP9>LVC(V0w-E{7?whJmsZ#>SpMG0{i+op;JNM&2U)BpHQ
z+d}H&#H_Es%!M{Cuef%^D38gP&oLxztxJoawjA^Jw6{7T>a!gnk+3F*DZ}P_jB0__
zxn9|z#GuT(TLkv!zUX_#+2pv4X+@`;quS&N7TYq+U(Zjqo_@+EVJ;6-{#P9vwzaoz
zhRJOG;lg)!>YZ+7RfD3a>u=g*n7R69&6v}|AANT7lT$yh2J%_!#;#-#TXNn1B}Yf%
z9_^kT=?P2jJYRS@OLcz0<?L&aDW0C5o~eEeYj?M=(s8p<TDbSy7KQ_>&0M3~m5hAv
z9anoC78&Hipk2PKm+`!KfA9JE%i>SHsMmG8TBdhP?bv#iChv!xs`WW1=EuhxiyE{U
z&*wP#HE3To=OY!}oSNvVQ;cQ=ZJwGITNMB6`vr9ak)9u0^vih4%{ELInecMvP0-Ot
zplFGB$s({wm&>0+$yMNz_qk_JtDf|^L`!&Rw52Y+AS5@9?UYP*>#eSZBJ%@O?uV_+
z@(I|k%e((`QQzFiqg`97vM1|izE0JcdWdDYT)1FVrLRmJdpv{E^>g!-`?D*Pi#ktk
z-LR15p-PwRVQarLEKvfLeI40BpX(hmnS7@tKL8hzMqwt5S6X#~Ym3v)<@l{#>0%gT
zEgZjb_4fWPiK?9jEfZH;+NrJ$Qc4j_6f<BCb=$2nyWRU(UR%cjzcvF_ZIdOT5$jJ>
zx)p}XOi!7t-V^XaY4Ni)q22MOTl%i$U0rXLUTeW6dLYeDcwKEz4C@{faqVp%wOgLd
zVGOhgzY%8<>&;*cb%zDx78ymm?XCsPO<SjS<X0v|t(kO`A+X<i(o|>lxy?^97K*E?
zcV^yD^3x1Ym7e;vMt*npW+su_zf!*$busST(Q%i1_D}ot<NuNqT_q>g91A`4<dQ|C
z<{H!1Z=Hs!|MqckZ2uTxVy~Uv`c?Em>CaGTL-7))Liop=RHm7|irlM1F8R4^)3Qu_
zdT5c+v17m2sU)d%NKdumzVUZMy0S9o+}p7#?J>u!`(;*&>|#5&D=G8V^(9j`%A~w}
zCF$n2GcQE)_`f&v@3Z;ec(>E?)YZCEi{_im+txE>j?ev$`|~&ZNfe#q=-ll6>q)5Z
zYzJnC-E9nhe&?Trhq{5lF)#IohV^fjPEhf5&NzJN&z0T|&P^G!y)GvkA9tT>%4O2H
zSRwJSdDgTPuV|)MW=lnC845%XDoGwW`(<n8;b&%^RlTpSyIq@k(_>QBvkO6Na*?X;
zSH1ZdOXULA9{lc7;*sC;%1vbNk-|sf%GG;kI0y#@u^3sH#6(X$14@ga(~(#%)I13G
zQq21QR7%vqMS6ztE0)U5UoSTsmZeQ9Og9vC(paFuDj%BKSKH*duF~kv5?-a<8o^tW
zR~`{HF4B3<tsLHY_;p&;DLziWA75Eb{B6#uSH^8M49Hji-&G}>7j6FUd(ZkcQ#%@?
zjVJpqfJA&4D`U#?wHlnQB262#O$weJUh{qa;;5;)3BEBW?#@?Jep+{Prg_Pu2TFmd
zc~@rF_Wbh?Fi4MGCDb@$rpx+EC*@XN3U%5kCbsOH$eR9^ho(x;5A+$$YSmo$Gg{+)
zRG9k9ZR=`xi+9~|U$=h2W<IW>`mgs7`etpcPhY#kFO*?<dfM5qXQAFd$ReP3mP4v%
z-&)y?q81kW%Gv@7G9+TpUY+=1P4VjLThXfTqQl?0u^#b1_g8SDVH4k(1(Knq0j<kU
zZhFcS`L{SX?8e5`jCZo)B353R>Qpw#l|v@**D@A`Fvc?%c@i==3wzspihhoneV`>O
z+9Gyy`meb@j58zW!)oW%tqg1`O-iDx7s$Ro&-g0$WEk_^x_s9tiy5CMi(P148t2DW
z;JIgtb3)B}2Va)X6ICKkQ5!3a+kVw=d|`1vV&>m$r)P6CGmihNRt}DJ_L=xPgyreZ
ziRvtZa;=9h`*-y{O^*FNokddQH0RW#MRgnYxR%~JseXA@3~0>t#EBCTwk!f0e)a7T
zU^&M#>*ELE{kK<`Mf)ayGR|4LKH<itEBk6g=e1kcyRTDUsFt?tk;>|ds<mE!bfQn)
zx-fG_jBv{J)|=<lh1#8Xr(AXV_MLI2;G6URCkB4sb>zCxi&HX&DmVHRl;_+n&Qw}-
z<a};6H@`#QjXN$L%ErkXk1>O4syf$Ha236Vjp@a9FULuTIE$3iuEe-D?Ui@x)DAZF
zS}nf%+tioBZ#ebd#Kc~GWTJU=)*jbYwNt}ogEQXD(WyNe6T%|6HD*ThR;l3h^+qqY
zEx#MK)3PN=KkD4J3u`;v?)Y;ox?2<2J$tUsnsSqg%Qj4U9uS!+t8BxNtaf3o6w{8p
z!_WS7L0fISEEf{%{buT~Et|Tp=;QzEpIhFjES#!xAvNyOlABu=h3*VJIaOz7VB0K>
z6PZV+sCu38z94VCB|Y`|o0L0qW^YsEkZ{b>zhh~+{4dXv&vk#}E#(-~uZc!(FIILJ
za=6q{nA~JP`{k-u@#onb58fPuTdT_wAgr@4qA@zXDA+`1y?wCc6}D3xR}Si|uF-kr
z-S*`tr-(tQ>B_(j`!{dPDD#-c)VM(F(4q&+GjG_$b39!y6zVo3CqB4W#cX4F;|b?A
zcemBs2D*iY8nXt4YEFF^b<yHUaPSi^h9s?pIh|P=zd9z`cf2!l4>_@}X{L;lHs_*z
zrrKp~40)&4uYh#kt~xNx{kAA4*UMUXy1&K5{C)AUFQ2P-C?^CtnCw(><ni_vohfiA
z%>7NL-ISoV9LdIx4YNL;F4|{kocTP%c>~MLsV!$DoU|=+3mhE|#%M0u%Qbh$(IVgN
zInTM{eMC2UF<g9pAZPZbzPCINZeIQ&SAUI(%~N%QpS7a-Vapj?x40_=yybcD;Y0*H
zaWI*vYA)PzdgI*B+VzGz4}_dOIn&ayqh34dXo#Rha%RxK7>irnhUv#u)E?{XEPnn$
z=Vh0)TlEqDWs_d)v@z5^z9?$>6w#eKmaMJe*_a(FysZ9+=#G7s+f+)<ochS@bHS|t
z!pawO=Izu=>)rP~X~*pY<pPH75>DBQag1lwE`WQIlB?NURm`{jdahl3S4&~`tLgt@
zg=B8Csp&iQNiJB$<eu}FDR${9Q~hOH<>B3yb51Eu&b+=X!A0rZhxyv;F8rP*X1I+@
z&2qgjSLbEbzq3X5bJ#ol;7YE~>u=F7U3zJ)S4WG~Z`u9@vuY>S>-1j<{8Q%al33iY
zC~|M@5uOLPZu-6`0nd_va;zy!z+{$a-=u{{rY`B0ZEfC`uDJZK<hI78@$;5UT6WWO
z(w5Mv_PJM`SdNyJ@d+MI^-Qu^mwvM^oq6%?6&$OI_BpuDW0#C`z1p+Dv{meKzn}N6
zMLSPD<FWo+@Ah`hs`-&Ro|EqFV7g(c9v_)|DLhHcK=9uw#e*eW`!y~^^#~s*-7H<q
z3h7-YZxwLpJ32Kp*r6!-w2tPABV2FPBW~y<WY!-N{F-m+tbTTe;+5^QVh*jC80)_`
z;NffG11C1!J<|W;>4bR=c|20p*6EL@KaN-4ew3SG&575mPl*}6_U?61mHE2-*$Gnt
zmS}+=H}q__Js0xq_xb(e$_$6|Yi@H)g_oSo497egLN<6A37omLaYm%^9gohgSsBdE
zlU0pAmxq1z@?+(etDLALa5#8|>$>&P8<i~gFQ0JY3GYcoZl^Aful>G94QlqRTO;Z9
ze8Qnix0bCF&9-It++b+l*t+=G*=d)oj{1~k<{4;9Y-zf?^Jv2nqs3bbw0^ooS?}K1
z{n7_icY}^(RBUj`b8=VlW_l>IK>e74|Ca@~5BRZeNRf6~cYi_1!c#j<>_6%#*s_Q;
z>1c&1ge^T4zEjsv{oUF3lGRJX)*sKWXSPzmu`Mb0YS4t3XGPYIO@b3_&D=Ms_?|N^
zI$)f7)N~nxUn-OEBTe}!3Wtw5%(`*o$(Lu0J65Ji8H1KqD=R0v3OYP*o_``@{f#;1
z^HX-DC~CDQybNbo_jKV>`C=$@>*PI|q!tFLYLUrhj3QC`Z!~B2-tGP(^`(vVY?X`a
zrSBRdTWyw`@)XW9EZB8lCino$bFYMQ_nhW;F-jd8Gr9ANd*_;}e~W(B$DYs{#>+S-
za=YUGS<u#-IAc%rii%Cl)$%zivvX%V&2Z9o<lHJAFL~81VF%y&rxCMHo>z@loGhlh
z%XG~Y6}=p;y2QM-MXsDI8XDe@=e(M4YMqw9?0kp4i)es!ymYzE-G8QLW-=-z6Fvy5
zSVpgufBo6oF^XB}l%ea!oa<gq?(=S%aR#z4UEMHgOPKxkO`Ij*csRz-&sY+*wN2un
zaZB4|?i^03PM^s9cfCvZ$3@1bq_3N>W~MRY5tT^>JCtfp&E&q)UcPJ3lYiMSdefzR
zH(ZKVGBR#?n*24YM(N46@|~Z!Tm)vat^T*RFM8glGdEhDue9{JL>xV$Rh=i*&M)L5
z#&<BS{Y>GDfZS{Py~`fny*runONLn^bO<h#<$|K&EP(^(9vt1XP<HjiC7lH-&DY-q
z3%Fct-eTN1C*aqn6?W5h9!O<98-9Ej`;;f=*Zx_U6{+o++Wh#GK;pL}Li-LDSNwaE
z%65B8ipPE1`)#TQJDz3i+Ze|1`-tut&27Kap4a_lxXvt4RwT@j<+I>=I%@$W5VDjS
z*8QKaz~Z#xpq!>rZeWtTE%%L_gzEXXKW)(sGP=1#M{<#1Xn@13l+X+6nW?9@hp@Rn
zf3zhjVw;00r)pWNQp4k;?8h}`pV?+)<>z*4W^riBNv%6(IxP|`^XBpyTR!4lC;f$6
z<iIrxtA7UmYaV~DFLQNF({>7C-BVVkY_&;cHn_tJ?(upn-I=z04s%cF$2VpvuU$i2
z_ZoKYF!TMwvQdF!(ILO5p7-^NGoS7+le@63{q#+%P$9jbWq#=yo+gj{gcU>29zMz`
z-2KpI-I5(C9@AG$>hx0R{D1jviO|~;<NxeWpRk@T-g^DuInP&>&Y33<2eP)S+?#jb
zw4LQr!vl>yr5`5+EZA!yUMsYA_E|a5N@7V#$<=)fMJ_L;U#hUF9Dep!twXpyW%ZI2
zv#_(bW_4^!K5}5DEYs8vpH@#f@XcQ0quUO%+C3q!!zbVKVsOf2%8A<gMArFe@0PQ3
z<YeO04cDvp%&|0?;n&#w@X!sjf4XIUoAPe^EuU)h?#!+^Oq0NYuyGZ~0^_FV6Qsnn
z0*jQ6#yrmWHf4RHbcB|_>?X|!HtE?Cd^g&?|D37{Il~fl?)pTP`Zu=@+z2ZQy(s+p
zQ9|^?Yffdob-&Fs*u7Qtc3$swIk&EQZjwsx9+?#H1<5IALm8Z1_V3(RckrXdQ^tsU
z`z-DsWtp{^7n&PZDK;2Q(pgcU`iw#KW|8ic$GHjD!(7i?^PJ@z7Roc9rRWCVG_|u{
zD;;#-d|A^eb9H^#&0nz(6<#h;$_^3KPE3D$W5<LIYgYR0?~-5U!5VPx&(BcXl~0yh
zTx`o@{Jr+$45l0ZizjEijN0hCXUB_g-O+b_7HHmvb@P>&BDPu{eIw7hGx5W!j3$;@
z9y~55cvwCvx3m2EJyAEV<EEo0)4^R;&xD+nyb2_WJQjUDBD_ue&8-I~ENzc(YTLza
zc;|lV(Myk)cKrNtGdZvz_tpQ7Qm%x`nDV2a^2NmGoY+<t%UY0j_t+mVXtT|iWrE7?
zrgRCNTe~+gi3>Ou?p~i`I@S2mflDsilxhQ;gA+@1(oJqJG}srWQnSJNPYUZrb%!Tg
z<}ZC|(z@nk<b3IV_1pU|75mR}&HmWEoa-CUf`cD@;%=W?duAzXB(KPUXN8+yt&~}m
zy?Wh;sC|mP`By6#*4^J>x_=V16clFcIXmy=lfFr_Ih=)-AC{`RGm|gHwWi~+mcqo@
z^IuQ4`<9ciX4bS^QNM%#bi|K030QR{Zaa2S<r&XOx2qc;E%==COjvNzl~3i>x;a4{
zb51E&huTTMUFNfU_QP!_o|=A(e(`HZVIyx#Z@16Cj^~WW^Ec(Dy*<qlu!-qL&bP#b
z0s|zM_yjafQ0}mFsF%}E(EBi{CUx6-cdn%e4u>o`5w_ARe*cDBY)2FO3U<6Gl2$zz
zv}D!_zS&#)4uq*r+VgN()&}Ppk9xY4ZlC&Tzin-<dR6bD>!u!Zj7r}p2Ctm5CsxS)
z{u!&C_h032F{n4H>b#zRXO?aPGz=tXE&K1G=cv)OD2ICyBimwy+y);$`$C<VBRUIu
zjaQ!t4c)r==Dya&9NV7wZ|~7&w^LfKn;o@4#WL<r%Z)XgA4PeUuHgy`HP_bMBA_Jt
z^16Brm+xuOq(2jNB~>rhnR#V#1i#VBZ4O<&%YS>x)W?6*S>%63tuT2xnJb}*OG8H4
z&OPJNj|kS9$tyxUg{PLD4qL>uqwaASqS+Lx@rGwcg5xBa31@by9=~)XpLzNtL5rIQ
zE}ie|wGngNw?Wlr+BSxUrmkQAH6LzFZ&5f`zezf0`{Pwg9!u|YzS_08EYJU({iNq-
zpRcY@{e4|E>&Z<ut35MWnWy$AS6CkUw`Q68Ji**-%g4*FdmC~~e9}$0^Ljyuy62|r
z`FAFPwsg6<rLQpJWnf_9_H=O!aXXf!-0;wM)7cY(c_M*K-M{Blnzdh;;G9-seRbuB
zjcYbcT%t2=&r8z@XIQsQOx^h3CQAIg8QX5J)DtQq7LT}RM+Mm)`^;DJ?bXDiliqgL
zvR=2@bByI~8NX*lh@y|oIXAWKt`<%it0vvGWk@&A@tt%S(zNdp^<r2$Kjs1J3QqCe
z`%h2PVVFKgQZU<fp4L}=#}&n_jm0hs54>(43~X9<RKaVKxXa|+w;b}zjZ0@Lw}h{r
z_jQ&}{2bY(deRfUDq{ZslF$}^_}|@+)kG!Z%)c{BLYRt=Y&KZNkhVGOB-6>8m-gDF
zJbL}6cI8idhKT)%-rpD?Lk<zSEEmo$P`%8wrMUK#qKb-7m$SEoS#E--_lYA*15?-d
zG!<0X3$v%371f)-p`R@HWSMr#)B2}8vp<FGescEg%bCupo(opGaIJUHzdhqXf`6y?
z#09a*0=@;`-iHWp6`FB3`}O2iB~yL>@G`M($UX0UTJo>|8Kz@5i%WyE^<o+CY|xB8
z0Pb|Atg&L!sC2wjaAPhrPgUCl!@PxSI~Te{-CfNxQ@PyEuPl)Hss8CNT)Wdef1hYO
zU>R3l)tegCamW1j|BbONaqDvv-QVQw`Fy?migA-n_WxhiU6K~NulVKo-jn+C@aU^M
zwyYcWyZ<ot{&sT7ePK2+@k=ZPe~;z<44ne0B2Iny&)g!{d%*Ng$!i7%1_n=8KbLh*
G2~7aYQKv=#

diff --git a/nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README b/nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README
deleted file mode 100644
index 9616362dce2..00000000000
--- a/nixos/modules/system/boot/loader/grub/winkler-gnu-blue.README
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a resized version of
-
-  http://www.gnu.org/graphics/winkler-gnu-blue.png
-
-by Kyle Winkler and released under the Free Art License
-(http://artlibre.org/licence.php/lalgb.html).

From aa5d6922c559d15ec8a17eccb23c0f5a27160946 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 13:26:51 -0700
Subject: [PATCH 0438/2322] Revert "Set boot.loader.grub.configurationLimit to
 1 for gce/azure/amazon images. Setting to 0 results in empty grub config."

The issue was that grub was not building the default entry which would
leave systems unbootable. This can now be safely reverted as the default
entry is being built once again.

This reverts commit fd1fb0403c406d1c3aca07735bb247e0643bdb0d.
---
 nixos/modules/virtualisation/amazon-image.nix         | 2 +-
 nixos/modules/virtualisation/azure-common.nix         | 2 +-
 nixos/modules/virtualisation/google-compute-image.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index dc92e4f609f..600a29f31bc 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -170,7 +170,7 @@ in
 
     # Don't put old configurations in the GRUB menu.  The user has no
     # way to select them anyway.
-    boot.loader.grub.configurationLimit = 1;
+    boot.loader.grub.configurationLimit = 0;
 
     # Allow root logins only using the SSH key that the user specified
     # at instance creation time.
diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix
index a6368eb2c62..47022c6887c 100644
--- a/nixos/modules/virtualisation/azure-common.nix
+++ b/nixos/modules/virtualisation/azure-common.nix
@@ -14,7 +14,7 @@ with lib;
 
   # Don't put old configurations in the GRUB menu.  The user has no
   # way to select them anyway.
-  boot.loader.grub.configurationLimit = 1;
+  boot.loader.grub.configurationLimit = 0;
 
   fileSystems."/".device = "/dev/disk/by-label/nixos";
 
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index eea6c646d48..ee5485071a3 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -106,7 +106,7 @@ in
 
   # Don't put old configurations in the GRUB menu.  The user has no
   # way to select them anyway.
-  boot.loader.grub.configurationLimit = 1;
+  boot.loader.grub.configurationLimit = 0;
 
   # Allow root logins only using the SSH key that the user specified
   # at instance creation time.

From d6cbb061e3bb5d2a93196a4543cfbd7c2359bd84 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 13:51:55 -0700
Subject: [PATCH 0439/2322] cacert: Build directly from nss instead of our own
 tarball

---
 nixos/modules/security/ca.nix     |  4 ++--
 pkgs/data/misc/cacert/default.nix | 32 ++++++++++++++++++-------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix
index e60cb5cdb67..595b9476fa5 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@@ -22,7 +22,7 @@ in
     security.pki.certificateFiles = mkOption {
       type = types.listOf types.path;
       default = [];
-      example = literalExample "[ \"\${pkgs.cacert}/etc/ca-bundle.crt\" ]";
+      example = literalExample "[ \"\${pkgs.cacert}/ca-bundle.crt\" ]";
       description = ''
         A list of files containing trusted root certificates in PEM
         format. These are concatenated to form
@@ -53,7 +53,7 @@ in
 
   config = {
 
-    security.pki.certificateFiles = [ "${pkgs.cacert}/etc/ca-bundle.crt" ];
+    security.pki.certificateFiles = [ "${pkgs.cacert}/ca-bundle.crt" ];
 
     # NixOS canonical location + Debian/Ubuntu/Arch/Gentoo compatibility.
     environment.etc."ssl/certs/ca-certificates.crt".source = caBundle;
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index 0a2c43fc581..205d051ddb2 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -1,23 +1,29 @@
-{ stdenv, fetchurl }:
+{ stdenv, nss, curl-full, perl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "cacert-20140715";
+  name = "nss-cacert-${nss.version}";
 
-  src = fetchurl {
-    url = "http://tarballs.nixos.org/${name}.pem.bz2";
-    sha256 = "1l4j7z6ysnllx99isjzlc8zc34rbbgj4kzlg1y5sy9bgphc8cssl";
-  };
+  src = nss.src;
 
-  unpackPhase = "true";
+  postPatch = ''
+    unpackFile ${curl-full.src};
+  '';
 
-  installPhase =
-    ''
-      mkdir -p $out/etc
-      bunzip2 < $src > $out/etc/ca-bundle.crt
-    '';
+  nativeBuildInputs = [ perl ] ++ (with perlPackages; [ LWP ]);
 
-  meta = {
+  buildPhase = ''
+    perl curl-*/lib/mk-ca-bundle.pl -d "file://$(pwd)/nss/lib/ckfw/builtins/certdata.txt" ca-bundle.crt
+  '';
+
+  installPhase = ''
+    mkdir -pv $out
+    cp -v ca-bundle.crt $out
+  '';
+
+  meta = with stdenv.lib; {
     homepage = http://curl.haxx.se/docs/caextract.html;
     description = "A bundle of X.509 certificates of public Certificate Authorities (CA)";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
   };
 }

From 14c1e0fa1f9eacf9b039662747d317f1afc24fea Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 14:03:34 -0700
Subject: [PATCH 0440/2322] Fix ca-bundle paths

---
 pkgs/applications/networking/cluster/panamax/api/default.nix  | 4 ++--
 .../networking/instant-messengers/fuze/default.nix            | 2 +-
 pkgs/applications/networking/irc/weechat/default.nix          | 2 +-
 pkgs/applications/version-management/bazaar/default.nix       | 4 ++--
 pkgs/build-support/fetchgit/default.nix                       | 2 +-
 pkgs/build-support/rust/fetchcargo.nix                        | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix     | 4 ++--
 pkgs/development/compilers/icedtea/default.nix                | 2 +-
 pkgs/development/compilers/openjdk/default.nix                | 2 +-
 pkgs/development/compilers/openjdk/openjdk8.nix               | 2 +-
 pkgs/development/interpreters/elixir/default.nix              | 2 +-
 pkgs/development/lisp-modules/lisp-packages.nix               | 4 ++--
 pkgs/tools/networking/aria2/default.nix                       | 2 +-
 13 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix
index 6cbec878a48..dae0315a31b 100644
--- a/pkgs/applications/networking/cluster/panamax/api/default.nix
+++ b/pkgs/applications/networking/cluster/panamax/api/default.nix
@@ -62,8 +62,8 @@ stdenv.mkDerivation rec {
       --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \
       --prefix "HOME" : "$out/share/panamax-api" \
       --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \
-      --prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/etc/ca-bundle.crt" \
-      --prefix "SSL_CERT_FILE" : "${cacert}/etc/ca-bundle.crt" \
+      --prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/ca-bundle.crt" \
+      --prefix "SSL_CERT_FILE" : "${cacert}/ca-bundle.crt" \
       --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}"
   '';
 
diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix
index bc9246d8845..77fe37481d8 100644
--- a/pkgs/applications/networking/instant-messengers/fuze/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fuze/default.nix
@@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux";
 let
   curl_custom =
     stdenv.lib.overrideDerivation curl (args: { 
-      configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/etc/ca-bundle.crt"] ; 
+      configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/ca-bundle.crt"] ; 
     } );
 in
 stdenv.mkDerivation {
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index d5cc3fb7718..bbad1587982 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
       cacert cmake ]
     ++ extraBuildInputs;
 
-  NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/etc/ca-bundle.crt";
+  NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/ca-bundle.crt";
 
   postInstall = ''
     NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index 648d59ac01c..ad6f0c50a37 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/pkgs/applications/version-management/bazaar/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1c6sj77h5f97qimjc14kr532kgc0jk3wq778xrkqi0pbh9qpk509";
   };
 
-  buildInputs = [ pythonPackages.python pythonPackages.wrapPython cacert ];
+  buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
 
   # Readline support is needed by bzrtools.
   pythonPath = [ pythonPackages.readline ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   patches = [ ./add_certificates.patch ];
   postPatch = ''
     substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \
-      --subst-var-by "certPath" "${cacert}/etc/ca-bundle.crt"
+      --subst-var-by "certPath" "${cacert}/ca-bundle.crt"
   '';
 
 
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index e5ad7200cec..7259fa8ff4c 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
 
   inherit url rev leaveDotGit fetchSubmodules deepClone branchName;
 
-  GIT_SSL_CAINFO = "${cacert}/etc/ca-bundle.crt";
+  GIT_SSL_CAINFO = "${cacert}/ca-bundle.crt";
 
   impureEnvVars = [
     # We borrow these environment variables from the caller to allow
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 575df64c6b2..1f5166d5c43 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   outputHashMode = "recursive";
   outputHash = sha256;
 
-  SSL_CERT_FILE = "${cacert}/etc/ca-bundle.crt";
+  SSL_CERT_FILE = "${cacert}/ca-bundle.crt";
 
   impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ];
   preferLocalBuild = true;
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
index aacc62a30a9..7afa2800105 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
 , intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper
-, docbook_xsl_ns, docbook_xsl, gnome3 }:
+, docbook_xsl_ns, docbook_xsl, gnome3, cacert }:
 
 let
   majVer = gnome3.version;
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];
 
   configureFlags = [
-    "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path
+    "--with-ca-certificates=${cacert}/ca-bundle.crt" # NixOS hardcoded path
     "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
     "--with-pkcs11-modules=$$out/lib/pkcs11/"
   ];
diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix
index 5e008821d95..fe7ec585155 100644
--- a/pkgs/development/compilers/icedtea/default.nix
+++ b/pkgs/development/compilers/icedtea/default.nix
@@ -135,7 +135,7 @@ let
       # Generate certificates.
       pushd $jre/lib/icedtea/jre/lib/security
       rm cacerts
-      perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/etc/ca-bundle.crt
+      perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/ca-bundle.crt
       popd
 
       ln -s $out/lib/icedtea/bin $out/bin
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index ec095bb4efa..d0ca85af0e0 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -142,7 +142,7 @@ let
       # Generate certificates.
       pushd $jre/lib/openjdk/jre/lib/security
       rm cacerts
-      perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ca-bundle.crt
+      perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/ca-bundle.crt
       popd
 
       ln -s $out/lib/openjdk/bin $out/bin
diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix
index 63d42e6e3d6..b0dae2512a5 100644
--- a/pkgs/development/compilers/openjdk/openjdk8.nix
+++ b/pkgs/development/compilers/openjdk/openjdk8.nix
@@ -134,7 +134,7 @@ let
     # Generate certificates.
     pushd $jre/lib/openjdk/jre/lib/security
     rm cacerts
-    perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ca-bundle.crt
+    perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/ca-bundle.crt
     popd
 
     ln -s $out/lib/openjdk/bin $out/bin
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 1166c7075c8..9d12d42cee8 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
       if [ $b == "mix" ]; then continue; fi
       wrapProgram $f \
       --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \
-      --set CURL_CA_BUNDLE "${cacert}/etc/ca-bundle.crt"
+      --set CURL_CA_BUNDLE "${cacert}/ca-bundle.crt"
     done
   '';
 
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 91c08419e70..910a082b88a 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -40,7 +40,7 @@ let lispPackages = rec {
       url = "https://common-lisp.net/project/iterate/darcs/iterate";
       sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25";
       context = ./iterate.darcs-context;
-    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";}));
+    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";}));
     overrides = x: {
       configurePhase="buildPhase(){ true; }";
     };
@@ -314,7 +314,7 @@ let lispPackages = rec {
     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/ca-bundle.crt";}));
+    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";}));
   };
 
   cl-fuse-meta-fs = buildLispPackage rec {
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 3167f7ffc22..df972a4287b 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ cacert ];
 
-  configureFlags = [ "--with-ca-bundle=${cacert}/etc/ca-bundle.crt" ];
+  configureFlags = [ "--with-ca-bundle=${cacert}/ca-bundle.crt" ];
 
   meta = with stdenv.lib; {
     homepage = http://aria2.sourceforge.net/;

From cd52c044568bdf1108428698048a9af92dc0b625 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 14:26:07 -0700
Subject: [PATCH 0441/2322] Fix more ca-bundle paths

---
 pkgs/applications/graphics/shotwell/default.nix              | 4 ++--
 pkgs/applications/networking/browsers/vimb/default.nix       | 4 ++--
 .../networking/browsers/vimprobable2/default.nix             | 4 ++--
 .../instant-messengers/telepathy/gabble/default.nix          | 4 ++--
 pkgs/applications/version-management/mercurial/default.nix   | 4 ++--
 pkgs/desktops/gnome-3/3.16/core/rest/default.nix             | 4 ++--
 pkgs/development/libraries/glib-networking/default.nix       | 4 ++--
 pkgs/servers/mail/opensmtpd/default.nix                      | 2 +-
 pkgs/tools/security/prey/default.nix                         | 5 +++--
 9 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index d438bb77b85..27dde61a08c 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkitgtk24x
 , pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils
-, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils, hicolor_icon_theme }:
+, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils, hicolor_icon_theme, cacert }:
 
 # for dependencies see http://www.yorba.org/projects/shotwell/install/
 
@@ -13,7 +13,7 @@ let
       sha256 = "0fmg7fq5fx0jg3ryk71kwdkspsvj42acxy9imk7vznkqj29a9zqn";
     };
     
-    configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
+    configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt";
     
     buildInputs = [ pkgconfig glib libsoup ];
   };
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index b30b2e260e3..24a43d95ca9 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk, glib_networking
-, gsettings_desktop_schemas, makeWrapper
+, gsettings_desktop_schemas, makeWrapper, cacert
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   # Nixos default ca bundle
   patchPhase = ''
-    sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/config.def.h
+    sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/ca-bundle.crt, src/config.def.h
   '';
 
   buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ];
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index 8e1e00795d2..7ab5c397abe 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk, libsoup, libX11, perl,
-  pkgconfig, webkit, gsettings_desktop_schemas }:
+  pkgconfig, webkit, gsettings_desktop_schemas, cacert }:
 
 stdenv.mkDerivation rec {
   version = "1.4.2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   # Nixos default ca bundle
   patchPhase = ''
-    sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, config.h
+    sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/ca-bundle.crt, config.h
   '';
 
   buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ];
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index e8e76c10ea5..b7cebd47cd7 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon
-, sqlite, libsoup, libnice, gnutls }:
+, sqlite, libsoup, libnice, gnutls, cacert }:
 
 stdenv.mkDerivation rec {
   name = "telepathy-gabble-0.18.2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ]
     ++ stdenv.lib.optional doCheck dbus_daemon;
 
-  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
+  configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt";
 
   enableParallelBuilding = true;
   doCheck = true;
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index a9fbd89f3fa..dee2abd2b1f 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, makeWrapper, docutils, unzip
-, guiSupport ? false, tk ? null, curses }:
+, guiSupport ? false, tk ? null, curses, cacert }:
 
 let
   version = "3.3.3";
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
       mkdir -p $out/etc/mercurial
       cat >> $out/etc/mercurial/hgrc << EOF
       [web]
-      cacerts = /etc/ssl/certs/ca-bundle.crt
+      cacerts = ${cacert}/ca-bundle.crt
       EOF
 
       # copy hgweb.cgi to allow use in apache
diff --git a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
index d1bfee5c14a..101dbb8cc48 100644
--- a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, cacerts }:
 
 stdenv.mkDerivation rec {
   name = "rest-0.7.92";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
 
-  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
+  configureFlags = "--with-ca-certificates=${cacerts}/ca-bundle.crt";
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 6f0394823a6..79c8ac03183 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy
-, gsettings_desktop_schemas }:
+, gsettings_desktop_schemas, cacert }:
 
 let
   ver_maj = "2.44";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346";
   };
 
-  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
+  configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt";
 
   preBuild = ''
     sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index b796e12e9f4..a22da36d2b6 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     "--with-sock-dir=/run"
     "--with-privsep-user=smtpd"
     "--with-queue-user=smtpq"
-    "--with-ca-file=/etc/ssl/certs/ca-bundle.crt"
+    "--with-ca-file=${cacert}/ca-bundle.crt"
   ];
 
   installFlags = [
diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix
index 0333e931858..c0951760f4f 100644
--- a/pkgs/tools/security/prey/default.nix
+++ b/pkgs/tools/security/prey/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils, makeWrapper, coreutils
+{ stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils
+, makeWrapper, coreutils, cacert
 , apiKey ? ""
 , deviceKey ? "" }:
 
@@ -35,7 +36,7 @@ in stdenv.mkDerivation rec {
     cp -R ${modulesSrc}/* $out/modules/
     wrapProgram "$out/prey.sh" \
       --prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \
-      --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-bundle.crt"
+      --set CURL_CA_BUNDLE "${cacert}/ca-bundle.crt"
   '';
 
   meta = with stdenv.lib; {

From b07929b0a389541a7272deacbd305de2b48cce90 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 27 May 2015 12:42:15 -0700
Subject: [PATCH 0442/2322] Use libpulseaudio instead of pulseaudio

---
 pkgs/applications/audio/bristol/default.nix            |  6 +++---
 pkgs/applications/audio/cmus/default.nix               |  4 ++--
 pkgs/applications/audio/csound/default.nix             |  4 ++--
 pkgs/applications/audio/deadbeef/default.nix           |  6 +++---
 pkgs/applications/audio/ekho/default.nix               |  4 ++--
 pkgs/applications/audio/fldigi/default.nix             |  4 ++--
 pkgs/applications/audio/fluidsynth/default.nix         |  4 ++--
 pkgs/applications/audio/lmms/default.nix               |  4 ++--
 pkgs/applications/audio/mhwaveedit/default.nix         |  4 ++--
 pkgs/applications/audio/minimodem/default.nix          |  4 ++--
 pkgs/applications/audio/pamixer/default.nix            |  4 ++--
 pkgs/applications/audio/paprefs/default.nix            |  4 ++--
 pkgs/applications/audio/pavucontrol/default.nix        |  4 ++--
 pkgs/applications/audio/projectm/default.nix           |  4 ++--
 pkgs/applications/audio/qmmp/default.nix               |  4 ++--
 pkgs/applications/audio/sonic-visualiser/default.nix   |  4 ++--
 pkgs/applications/misc/gqrx/default.nix                |  6 +++---
 .../networking/browsers/chromium/common.nix            |  4 ++--
 .../networking/browsers/firefox-bin/default.nix        |  4 ++--
 .../mozilla-plugins/google-talk-plugin/default.nix     |  4 ++--
 .../networking/instant-messengers/oneteam/default.nix  |  2 +-
 .../networking/instant-messengers/sflphone/default.nix |  4 ++--
 .../networking/instant-messengers/skype/default.nix    |  4 ++--
 .../networking/instant-messengers/teamspeak/client.nix |  4 ++--
 .../applications/networking/remote/freerdp/default.nix |  2 +-
 .../networking/remote/freerdp/unstable.nix             |  6 +++---
 .../applications/office/zotero/firefox-bin/default.nix |  4 ++--
 pkgs/applications/video/aegisub/default.nix            |  6 +++---
 pkgs/applications/video/bomi/default.nix               |  6 +++---
 pkgs/applications/video/kodi/default.nix               |  6 +++---
 pkgs/applications/video/mplayer/default.nix            |  6 +++---
 pkgs/applications/video/mpv/default.nix                |  6 +++---
 pkgs/applications/video/mythtv/default.nix             |  4 ++--
 .../video/simplescreenrecorder/default.nix             |  4 ++--
 pkgs/applications/video/vlc/default.nix                |  4 ++--
 pkgs/applications/virtualization/qemu/default.nix      | 10 ----------
 .../applications/virtualization/virtualbox/default.nix |  4 ++--
 pkgs/desktops/cinnamon/cinnamon-control-center.nix     |  4 ++--
 pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix    |  4 ++--
 pkgs/desktops/e19/efl.nix                              |  4 ++--
 .../gnome-2/desktop/gnome-settings-daemon/default.nix  |  4 ++--
 pkgs/desktops/gnome-3/3.16/core/empathy/default.nix    |  4 ++--
 .../gnome-3/3.16/core/gnome-control-center/default.nix |  4 ++--
 .../3.16/core/gnome-settings-daemon/default.nix        |  4 ++--
 .../desktops/gnome-3/3.16/core/gnome-shell/default.nix |  4 ++--
 pkgs/desktops/kde-4.14/kde-runtime.nix                 |  4 ++--
 pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix          |  4 ++--
 .../desktops/xfce/applications/xfce4-volumed-pulse.nix |  4 ++--
 pkgs/development/compilers/squeak/default.nix          |  4 ++--
 pkgs/development/haskell-modules/hackage-packages.nix  |  6 +++---
 pkgs/development/libraries/SDL/default.nix             |  6 +++---
 pkgs/development/libraries/SDL2/default.nix            |  6 +++---
 pkgs/development/libraries/despotify/default.nix       |  4 ++--
 pkgs/development/libraries/ffmpeg-full/default.nix     |  6 +++---
 pkgs/development/libraries/ffmpeg/generic.nix          |  4 ++--
 pkgs/development/libraries/gstreamer/good/default.nix  |  4 ++--
 .../gstreamer/legacy/gst-plugins-good/default.nix      |  4 ++--
 pkgs/development/libraries/libao/default.nix           |  4 ++--
 pkgs/development/libraries/libcanberra/default.nix     |  4 ++--
 pkgs/development/libraries/libmikmod/default.nix       |  6 +++---
 pkgs/development/libraries/mediastreamer/default.nix   |  4 ++--
 pkgs/development/libraries/openal-soft/default.nix     |  6 +++---
 pkgs/development/libraries/phonon/qt4/default.nix      |  4 ++--
 pkgs/development/libraries/phonon/qt5/default.nix      |  4 ++--
 pkgs/development/libraries/qt-5/5.3/default.nix        |  4 ++--
 pkgs/development/libraries/qt-5/5.4/default.nix        |  4 ++--
 pkgs/development/libraries/spice-gtk/default.nix       |  4 ++--
 pkgs/development/libraries/xine-lib/default.nix        |  4 ++--
 pkgs/games/adom/default.nix                            |  4 ++--
 pkgs/games/anki/default.nix                            |  4 ++--
 pkgs/games/minecraft/default.nix                       |  4 ++--
 pkgs/games/scrolls/default.nix                         |  4 ++--
 pkgs/games/stepmania/default.nix                       |  4 ++--
 pkgs/games/vessel/default.nix                          |  4 ++--
 pkgs/misc/emulators/dolphin-emu/default.nix            |  4 ++--
 pkgs/misc/emulators/dolphin-emu/master.nix             |  4 ++--
 pkgs/misc/emulators/higan/default.nix                  |  4 ++--
 pkgs/misc/emulators/retroarch/default.nix              |  4 ++--
 pkgs/misc/emulators/snes9x-gtk/default.nix             |  4 ++--
 pkgs/servers/mpd/default.nix                           |  4 ++--
 pkgs/servers/shairport-sync/default.nix                |  4 ++--
 pkgs/tools/admin/gtk-vnc/default.nix                   |  4 ++--
 pkgs/tools/audio/liquidsoap/full.nix                   |  4 ++--
 pkgs/tools/audio/pa-applet/default.nix                 |  4 ++--
 pkgs/tools/audio/pasystray/default.nix                 |  4 ++--
 pkgs/tools/bluetooth/blueman/default.nix               |  4 ++--
 pkgs/top-level/all-packages.nix                        |  2 +-
 87 files changed, 184 insertions(+), 194 deletions(-)

diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix
index b27ac058602..d45ab818273 100644
--- a/pkgs/applications/audio/bristol/default.nix
+++ b/pkgs/applications/audio/bristol/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, pulseaudio, xlibs }:
+{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, libpulseaudio, xlibs }:
 
 stdenv.mkDerivation  rec {
   name = "bristol-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation  rec {
   };
 
   buildInputs = [
-    alsaLib jack2 pkgconfig pulseaudio xlibs.libX11 xlibs.libXext
+    alsaLib jack2 pkgconfig libpulseaudio xlibs.libX11 xlibs.libXext
     xlibs.xproto
   ];
 
@@ -26,4 +26,4 @@ stdenv.mkDerivation  rec {
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index fd252754d66..a5cfdf227bb 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, pulseaudio}:
+{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, libpulseaudio}:
 
 stdenv.mkDerivation rec {
   name = "cmus-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   configurePhase = "./configure prefix=$out";
 
-  buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis libmpc mp4v2 libcue pulseaudio ];
+  buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis libmpc mp4v2 libcue libpulseaudio ];
 
   meta = {
     description = "Small, fast and powerful console music player for Linux and *BSD";
diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index 64f3f3586a3..693d8e2a6e5 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake, libsndfile, flex, bison
 , alsaLib ? null
-, pulseaudio ? null
+, libpulseaudio ? null
 , tcltk ? null
 
 # maybe csound can be compiled with support for those, see configure output
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     sha256 = "0w6ij57dbfjljpf05bb9r91jphwaq1v63rh0713vl2n11d73dy7m";
   };
 
-  buildInputs = [ cmake libsndfile flex bison alsaLib pulseaudio tcltk ];
+  buildInputs = [ cmake libsndfile flex bison alsaLib libpulseaudio tcltk ];
 
   meta = {
     description = "sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms";
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index ca8ce453e63..9dd4db68432 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -18,7 +18,7 @@
 , osdSupport ? true, dbus ? null
 # output plugins
 , alsaSupport ? true, alsaLib ? null
-, pulseSupport ? true, pulseaudio ? null
+, pulseSupport ? true, libpulseaudio ? null
 # effect plugins
 , resamplerSupport ? true, libsamplerate ? null
 , overloadSupport ? true, zlib ? null
@@ -41,7 +41,7 @@ assert artworkSupport -> imlib2 != null;
 assert hotkeysSupport -> libX11 != null;
 assert osdSupport -> dbus != null;
 assert alsaSupport -> alsaLib != null;
-assert pulseSupport -> pulseaudio != null;
+assert pulseSupport -> libpulseaudio != null;
 assert resamplerSupport -> libsamplerate != null;
 assert overloadSupport -> zlib != null;
 assert wavpackSupport -> wavpack != null;
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
     ++ optional hotkeysSupport libX11
     ++ optional osdSupport dbus
     ++ optional alsaSupport alsaLib
-    ++ optional pulseSupport pulseaudio
+    ++ optional pulseSupport libpulseaudio
     ++ optional resamplerSupport libsamplerate
     ++ optional overloadSupport zlib
     ++ optional wavpackSupport wavpack
diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix
index dd9b830be84..78383eec953 100644
--- a/pkgs/applications/audio/ekho/default.nix
+++ b/pkgs/applications/audio/ekho/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig
-, libsndfile, pulseaudio
+, libsndfile, libpulseaudio
 }:
 
 let
@@ -35,5 +35,5 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ libsndfile pulseaudio ];
+  buildInputs = [ libsndfile libpulseaudio ];
 }
diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix
index 5a4793a09c1..8e80992d7ca 100644
--- a/pkgs/applications/audio/fldigi/default.nix
+++ b/pkgs/applications/audio/fldigi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, hamlib, fltk13, libjpeg, libpng, portaudio, libsndfile,
-  libsamplerate, pulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
+  libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
 
 stdenv.mkDerivation rec {
   version = "3.22.02";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio
-                  libsndfile libsamplerate pulseaudio pkgconfig alsaLib ];
+                  libsndfile libsamplerate libpulseaudio pkgconfig alsaLib ];
 
   meta = {
     description = "Digital modem program";
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index 8cba482194e..339cccfca70 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, alsaLib, glib, jack2, libsndfile, pkgconfig
-, pulseaudio }:
+, libpulseaudio }:
 
 stdenv.mkDerivation  rec {
   name = "fluidsynth-${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation  rec {
     "-framework CoreAudio";
 
   buildInputs = [ glib libsndfile pkgconfig ]
-    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jack2 ];
+    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio jack2 ];
 
   meta = with stdenv.lib; {
     description = "Real-time software synthesizer based on the SoundFont 2 specifications";
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index 6d28c038f23..830d42eb91b 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, fluidsynth
 , fltk13, jack2, libvorbis , libsamplerate, libsndfile, pkgconfig
-, pulseaudio, qt4, freetype
+, libpulseaudio, qt4, freetype
 }:
 
 stdenv.mkDerivation  rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation  rec {
 
   buildInputs = [
     SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth jack2
-    libsamplerate libsndfile libvorbis pkgconfig pulseaudio qt4
+    libsamplerate libsndfile libvorbis pkgconfig libpulseaudio qt4
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix
index a1e81be3cb3..0234a1d3fe5 100644
--- a/pkgs/applications/audio/mhwaveedit/default.nix
+++ b/pkgs/applications/audio/mhwaveedit/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, SDL , alsaLib, gtk, jack2, ladspaH
-, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, pulseaudio }:
+, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio }:
 
 stdenv.mkDerivation  rec {
   name = "mhwaveedit-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation  rec {
 
   buildInputs =
    [ SDL alsaLib gtk jack2 ladspaH libsamplerate libsndfile
-     pkgconfig pulseaudio
+     pkgconfig libpulseaudio
    ];
 
   configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa";
diff --git a/pkgs/applications/audio/minimodem/default.nix b/pkgs/applications/audio/minimodem/default.nix
index 6f2bf8cdb1c..af4e887d167 100644
--- a/pkgs/applications/audio/minimodem/default.nix
+++ b/pkgs/applications/audio/minimodem/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, pulseaudio }:
+{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, linbpulseaudio }:
 
 stdenv.mkDerivation rec {
   version = "0.19";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g";
   };
 
-  buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile pulseaudio ];
+  buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ];
 
   meta = {
     description = "General-purpose software audio FSK modem";
diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix
index d665b83340c..31353cec6a9 100644
--- a/pkgs/applications/audio/pamixer/default.nix
+++ b/pkgs/applications/audio/pamixer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, pulseaudio }:
+{ stdenv, fetchurl, boost, libpulseaudio }:
 
 stdenv.mkDerivation rec {
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1ad6b46hh02hs1978pgihrm2bnq4z2v0imrfm3wy74xdkr6xjxy4";
   };
 
-  buildInputs = [ boost pulseaudio ];
+  buildInputs = [ boost libpulseaudio ];
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix
index f05c4068a60..06b4b44b596 100644
--- a/pkgs/applications/audio/paprefs/default.nix
+++ b/pkgs/applications/audio/paprefs/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm, libglademm
+{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm, libglademm
 , dbus_glib, gconfmm, intltool }:
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716";
   };
 
-  buildInputs = [ pulseaudio gtkmm libglademm dbus_glib gconfmm ];
+  buildInputs = [ libpulseaudio gtkmm libglademm dbus_glib gconfmm ];
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index 7e392679c71..8db0a94a990 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, intltool, pulseaudio, gtkmm3
+{ fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3
 , libcanberra_gtk3, makeWrapper, gnome3 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
   '';
 
-  buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 makeWrapper
+  buildInputs = [ libpulseaudio gtkmm3 libcanberra_gtk3 makeWrapper
                   gnome3.defaultIconTheme ];
 
   nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix
index 508b6743cc3..fcfde86f7ee 100644
--- a/pkgs/applications/audio/projectm/default.nix
+++ b/pkgs/applications/audio/projectm/default.nix
@@ -3,7 +3,7 @@
 , withQt ? true, qt4
 , withLibvisual ? false, libvisual, SDL
 , withJack ? false, jack2
-, withPulseAudio ? true, pulseaudio
+, withPulseAudio ? true, libpulseaudio
 }:
 
 assert withJack       -> withQt;
@@ -46,6 +46,6 @@ stdenv.mkDerivation {
     ++ optional withQt qt4
     ++ optionals withLibvisual [ libvisual SDL ]
     ++ optional withJack jack2
-    ++ optional withPulseAudio pulseaudio
+    ++ optional withPulseAudio libpulseaudio
     ;
 }
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index 1a447be56b4..1b9323c1a7b 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -5,7 +5,7 @@
 , libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile
 , libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi
 # output plugins
-, alsaLib, pulseaudio
+, alsaLib, libpulseaudio
 # effect plugins
 , libsamplerate
 }:
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
       libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile
       libcdio cdparanoia libcddb faad2 ffmpeg wildmidi
       # output plugins
-      alsaLib pulseaudio
+      alsaLib libpulseaudio
       # effect plugins
       libsamplerate
     ];
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index 104a458d6a0..9cd1a3d0345 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -2,7 +2,7 @@
 
 { stdenv, fetchurl, alsaLib, bzip2, fftw, jack2, libX11, liblo
 , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
-, libsndfile, pkgconfig, pulseaudio, qt5, redland
+, libsndfile, pkgconfig, libpulseaudio, qt5, redland
 , rubberband, serd, sord, vampSDK
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       # optional
       jack2
       # portaudio
-      pulseaudio
+      libpulseaudio
       libmad
       libogg # ?
       # fishsound
diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix
index 169331ceb73..440d2b790c2 100644
--- a/pkgs/applications/misc/gqrx/default.nix
+++ b/pkgs/applications/misc/gqrx/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, qt4, gnuradio, boost, gnuradio-osmosdr
 # drivers (optional):
 , rtl-sdr
-, pulseaudioSupport ? true, pulseaudio
+, pulseaudioSupport ? true, libpulseaudio
 }:
 
-assert pulseaudioSupport -> pulseaudio != null;
+assert pulseaudioSupport -> libpulseaudio != null;
 
 stdenv.mkDerivation rec {
   name = "gqrx-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     qt4 gnuradio boost gnuradio-osmosdr rtl-sdr
-  ] ++ stdenv.lib.optionals pulseaudioSupport [ pulseaudio ];
+  ] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ];
 
   configurePhase = ''qmake PREFIX="$out"'';
 
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 3d85afef8f4..1f6c272aceb 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -26,7 +26,7 @@
 , gnomeKeyringSupport ? false, libgnome_keyring3 ? null
 , proprietaryCodecs ? true
 , cupsSupport ? true
-, pulseSupport ? false, pulseaudio ? null
+, pulseSupport ? false, libpulseaudio ? null
 , hiDPISupport ? false
 
 , source
@@ -118,7 +118,7 @@ let
       ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
       ++ optional enableSELinux libselinux
       ++ optionals cupsSupport [ libgcrypt cups ]
-      ++ optional pulseSupport pulseaudio;
+      ++ optional pulseSupport libpulseaudio;
 
     # XXX: Wait for https://crbug.com/239107 and https://crbug.com/239181 to
     #      be fixed, then try again to unbundle everything into separate
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 23726f5c3d1..998ea95e8da 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -31,7 +31,7 @@
 , nss
 , pango
 , heimdal
-, pulseaudio
+, libpulseaudio
 , systemd
 }:
 
@@ -103,7 +103,7 @@ stdenv.mkDerivation {
       nss
       pango
       heimdal
-      pulseaudio
+      libpulseaudio
       systemd
     ] + ":" + stdenv.lib.makeSearchPath "lib64" [
       stdenv.cc.cc
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index bdccb932e1c..6fd953636a8 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo
 , libpng, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl
-, dbus_glib, alsaLib, pulseaudio, udev, pango
+, dbus_glib, alsaLib, libpulseaudio, udev, pango
 }:
 
 with stdenv.lib;
@@ -34,7 +34,7 @@ let
       xorg.libXrandr
       stdenv.cc.cc
       alsaLib
-      pulseaudio
+      libpulseaudio
       dbus_glib
       udev
       curl
diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix
index 14d01de3245..2ab0930842b 100644
--- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix
+++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix
@@ -1,6 +1,6 @@
 x@{builderDefsPackage
   , fetchgit, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig
-  , pulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver, scrnsaverproto
+  , libpulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver, scrnsaverproto
   , ...}:
 builderDefsPackage
 (a :  
diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix
index fb14782ef9f..8b259c90fe5 100644
--- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, pulseaudio, libsamplerate
+{ 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
@@ -43,7 +43,7 @@ rec {
     configureFlags = "--with-expat --with-expat-inc=${expat}/include " +
       "--with-expat-lib=-lexpat --with-opus ";
 
-    buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig pulseaudio libsamplerate 
+    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 ];
   };
diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix
index 218e7303807..1e84e015bc1 100644
--- a/pkgs/applications/networking/instant-messengers/skype/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skype/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libXv, libXi, libXrender, libXrandr, zlib, glib
 , libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig
-, pulseaudio, lib, ... }:
+, libpulseaudio, lib, ... }:
 
 assert stdenv.system == "i686-linux";
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     libXi
     libXrender
     libXrandr
-    pulseaudio
+    libpulseaudio
     freetype
     fontconfig
     zlib
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index df4f7054ad3..51707d2dca6 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg
-, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, pulseaudio ? null
+, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null
 , libredirect, quazip, less, which
 }:
 
@@ -12,7 +12,7 @@ let
   deps =
     [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
       xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
-      xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base pulseaudio
+      xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio
     ];
 
 in
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 092e6f53e49..f773cf6755e 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -15,7 +15,7 @@
 #, xmlto, docbook_xml_dtd_412, docbook_xml_xslt
 , libXinerama
 , libXv
-, pulseaudioSupport ? true, pulseaudio
+, pulseaudioSupport ? true, libpulseaudio
 }:
 
 assert printerSupport -> cups != null;
diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix
index e66f78f2602..cc6ec9bd231 100644
--- a/pkgs/applications/networking/remote/freerdp/unstable.nix
+++ b/pkgs/applications/networking/remote/freerdp/unstable.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor
 , libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv
 , substituteAll
-, pulseaudio ? null, cups ? null, pcsclite ? null
+, libpulseaudio ? null, cups ? null, pcsclite ? null
 , buildServer ? true, optimize ? true
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib
-    alsaLib ffmpeg libxkbfile libXinerama libXv cups pulseaudio pcsclite
+    alsaLib ffmpeg libxkbfile libXinerama libXv cups libpulseaudio pcsclite
   ];
 
   doCheck = false;
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DCMAKE_INSTALL_LIBDIR=lib"
     "-DWITH_CUNIT=OFF"
-  ] ++ stdenv.lib.optional (pulseaudio != null) "-DWITH_PULSE=ON"
+  ] ++ stdenv.lib.optional (libpulseaudio != null) "-DWITH_PULSE=ON"
     ++ stdenv.lib.optional (cups != null) "-DWITH_CUPS=ON"
     ++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON"
     ++ stdenv.lib.optional buildServer "-DWITH_SERVER=ON"
diff --git a/pkgs/applications/office/zotero/firefox-bin/default.nix b/pkgs/applications/office/zotero/firefox-bin/default.nix
index 0018f00a366..52751908fa7 100644
--- a/pkgs/applications/office/zotero/firefox-bin/default.nix
+++ b/pkgs/applications/office/zotero/firefox-bin/default.nix
@@ -31,7 +31,7 @@
 , nss
 , pango
 , heimdal
-, pulseaudio
+, libpulseaudio
 , systemd
 }:
 
@@ -103,7 +103,7 @@ stdenv.mkDerivation {
       nss
       pango
       heimdal
-      pulseaudio
+      libpulseaudio
       systemd
     ] + ":" + stdenv.lib.makeSearchPath "lib64" [
       stdenv.cc.cc
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index e7cc9b78195..a5c14d0888f 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -9,14 +9,14 @@
 , automationSupport ? true, lua ? null
 , openalSupport ? false, openal ? null
 , alsaSupport ? true, alsaLib ? null
-, pulseaudioSupport ? true, pulseaudio ? null
+, pulseaudioSupport ? true, libpulseaudio ? null
 , portaudioSupport ? false, portaudio ? null }:
 
 assert spellcheckSupport -> (hunspell != null);
 assert automationSupport -> (lua != null);
 assert openalSupport -> (openal != null);
 assert alsaSupport -> (alsaLib != null);
-assert pulseaudioSupport -> (pulseaudio != null);
+assert pulseaudioSupport -> (libpulseaudio != null);
 assert portaudioSupport -> (portaudio != null);
 
 with stdenv.lib;
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     ++ optional automationSupport lua
     ++ optional openalSupport openal
     ++ optional alsaSupport alsaLib
-    ++ optional pulseaudioSupport pulseaudio
+    ++ optional pulseaudioSupport libpulseaudio
     ++ optional portaudioSupport portaudio
     ;
 
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index be0517b6376..2f0c3070921 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -13,7 +13,7 @@
 , libbluray
 , jackSupport ? false, jack ? null
 , portaudioSupport ? false, portaudio ? null
-, pulseSupport ? true, pulseaudio ? null
+, pulseSupport ? true, libpulseaudio ? null
 , cddaSupport ? false, libcdda ? null
 , youtubeSupport ? true, youtube-dl ? null
 }:
@@ -22,7 +22,7 @@ with stdenv.lib;
 
 assert jackSupport -> jack != null;
 assert portaudioSupport -> portaudio != null;
-assert pulseSupport -> pulseaudio != null;
+assert pulseSupport -> libpulseaudio != null;
 assert cddaSupport -> libcdda != null;
 assert youtubeSupport -> youtube-dl != null;
 
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
                 ]
                 ++ optional jackSupport jack
                 ++ optional portaudioSupport portaudio
-                ++ optional pulseSupport pulseaudio
+                ++ optional pulseSupport libpulseaudio
                 ++ optional cddaSupport libcdda
                 ;
 
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 0b18705e6fb..dafa381d9ec 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -23,7 +23,7 @@
 # TODO: would be nice to have nfsSupport (needs libnfs library)
 # TODO: librtmp
 , libvdpau ? null, vdpauSupport ? true
-, pulseaudio ? null, pulseSupport ? true
+, libpulseaudio ? null, pulseSupport ? true
 , libcec ? null, cecSupport ? true
 }:
 
@@ -32,7 +32,7 @@ assert udevSupport  -> udev != null;
 assert usbSupport   -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable
 assert sambaSupport -> samba != null;
 assert vdpauSupport -> libvdpau != null;
-assert pulseSupport -> pulseaudio != null;
+assert pulseSupport -> libpulseaudio != null;
 assert cecSupport   -> libcec != null;
 
 let
@@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
     ++ lib.optional usbSupport libusb
     ++ lib.optional sambaSupport samba
     ++ lib.optional vdpauSupport libvdpau
-    ++ lib.optional pulseSupport pulseaudio
+    ++ lib.optional pulseSupport libpulseaudio
     ++ lib.optional cecSupport libcec;
 
     dontUseCmakeConfigure = true;
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index ac106431240..57f8289a1f9 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -18,7 +18,7 @@
 , theoraSupport ? true, libtheora ? null
 , x264Support ? false, x264 ? null
 , jackaudioSupport ? false, jack2 ? null
-, pulseSupport ? false, pulseaudio ? null
+, pulseSupport ? false, libpulseaudio ? null
 , bs2bSupport ? false, libbs2b ? null
 # For screenshots
 , libpngSupport ? true, libpng ? null
@@ -45,7 +45,7 @@ assert speexSupport -> speex != null;
 assert theoraSupport -> libtheora != null;
 assert x264Support -> x264 != null;
 assert jackaudioSupport -> jack2 != null;
-assert pulseSupport -> pulseaudio != null;
+assert pulseSupport -> libpulseaudio != null;
 assert bs2bSupport -> libbs2b != null;
 assert libpngSupport -> libpng != null;
 assert libjpegSupport -> libjpeg != null;
@@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
     ++ optional jackaudioSupport jack2
     ++ optionals amrSupport [ amrnb amrwb ]
     ++ optional x264Support x264
-    ++ optional pulseSupport pulseaudio
+    ++ optional pulseSupport libpulseaudio
     ++ optional screenSaverSupport libXScrnSaver
     ++ optional lameSupport lame
     ++ optional vdpauSupport libvdpau
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 6bb7072a4a3..03cb5154f85 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -13,7 +13,7 @@
 , speexSupport ? true, speex ? null
 , theoraSupport ? true, libtheora ? null
 , jackaudioSupport ? true, jack2 ? null
-, pulseSupport ? true, pulseaudio ? null
+, pulseSupport ? true, libpulseaudio ? null
 , bs2bSupport ? true, libbs2b ? null
 # For screenshots
 , libpngSupport ? true, libpng ? null
@@ -40,7 +40,7 @@ assert bluraySupport -> libbluray != null;
 assert speexSupport -> speex != null;
 assert theoraSupport -> libtheora != null;
 assert jackaudioSupport -> jack2 != null;
-assert pulseSupport -> pulseaudio != null;
+assert pulseSupport -> libpulseaudio != null;
 assert bs2bSupport -> libbs2b != null;
 assert libpngSupport -> libpng != null;
 assert youtubeSupport -> youtube-dl != null;
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
     ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
     ++ optional bluraySupport libbluray
     ++ optional jackaudioSupport jack2
-    ++ optional pulseSupport pulseaudio
+    ++ optional pulseSupport libpulseaudio
     ++ optional screenSaverSupport libXScrnSaver
     ++ optional vdpauSupport libvdpau
     ++ optional speexSupport speex
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 2bc635d510e..cd157a473e6 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, which, qt4, x11, pulseaudio, fftwSinglePrec
+{ stdenv, fetchurl, which, qt4, x11, libpulseaudio, fftwSinglePrec
 , lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig
 , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu
 , yasm, libuuid, taglib, libtool, autoconf, automake, file
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   sourceRoot = "${name}/mythtv";
 
   buildInputs = [
-    freetype qt4 lame zlib x11 mesa perl alsaLib pulseaudio fftwSinglePrec
+    freetype qt4 lame zlib x11 mesa perl alsaLib libpulseaudio fftwSinglePrec
     libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu
     libuuid taglib
   ];
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index 7320a7f6d74..453829bc580 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, alsaLib, ffmpeg, jack2, libX11, libXext
-, libXfixes, mesa, pkgconfig, pulseaudio, qt4
+, libXfixes, mesa, pkgconfig, libpulseaudio, qt4
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     alsaLib ffmpeg jack2 libX11 libXext libXfixes mesa pkgconfig
-    pulseaudio qt4
+    libpulseaudio qt4
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index a404ba0d1a8..85fc6f6b6ba 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -2,7 +2,7 @@
 , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
 , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska
 , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
-, libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
+, libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg
 , mpeg2dec, udev, gnutls, avahi, libcddb, jack2, SDL, SDL_image
 , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
 , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
       libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt
-      libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
+      libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
       udev gnutls avahi libcddb jack2 SDL SDL_image libmtp unzip taglib
       libkate libtiger libv4l samba liboggz libass libdvbpsi libva
       xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index bf722431d91..0d57a8d9f57 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -13,16 +13,6 @@
 # Audio libraries
 , libpulseaudio ? null, alsaLib ? null
 
-#, pixman ? null
-#, python, zlib, glib, ncurses, perl
-#, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy
-#, libseccomp, libaio, libcap_ng, gnutls
-#, makeWrapper
-#, pulseSupport ? true, pulseaudio
-#, sdlSupport ? true, SDL
-#, vncSupport ? true, libjpeg, libpng
-#, spiceSupport ? true, spice, spice_protocol, usbredir
-
 # Extra options
 , type ? ""
 }:
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 158d99f6488..31a14830034 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -5,7 +5,7 @@
 , javaBindings ? false, jdk ? null
 , pythonBindings ? false, python ? null
 , enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null
-, pulseSupport ? false, pulseaudio ? null
+, pulseSupport ? false, libpulseaudio ? null
 , enableHardening ? false
 }:
 
@@ -69,7 +69,7 @@ in stdenv.mkDerivation {
       pkgconfig which libXmu nukeReferences ]
     ++ optional javaBindings jdk
     ++ optional pythonBindings python
-    ++ optional pulseSupport pulseaudio;
+    ++ optional pulseSupport libpulseaudio;
 
   prePatch = ''
     set -x
diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center.nix b/pkgs/desktops/cinnamon/cinnamon-control-center.nix
index bb53ecfd901..97489a7ec08 100644
--- a/pkgs/desktops/cinnamon/cinnamon-control-center.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-control-center.nix
@@ -1,6 +1,6 @@
 
 { stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, libxslt, gtk3, libnotify,
-gnome-menus, libxml2, systemd, upower, cinnamon-settings-daemon, colord, polkit, ibus, libcanberra_gtk3, pulseaudio, isocodes, kerberos,
+gnome-menus, libxml2, systemd, upower, cinnamon-settings-daemon, colord, polkit, ibus, libcanberra_gtk3, libpulseaudio, isocodes, kerberos,
 libxkbfile}:
 
 let
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     intltool libxslt gtk3 cinnamon-desktop
     libnotify gnome-menus libxml2 systemd
     upower cinnamon-settings-daemon colord
-    polkit ibus libcanberra_gtk3 pulseaudio
+    polkit ibus libcanberra_gtk3 libpulseaudio
     isocodes kerberos libxkbfile ];
 
   preBuild = "patchShebangs ./scripts";
diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix
index ca220fd9d85..550a7acaf62 100644
--- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix
@@ -1,6 +1,6 @@
 
 { stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, gtk3,
-libnotify, lcms2, libxklavier, libgnomekbd, libcanberra, pulseaudio, upower, libcanberra_gtk3, colord,
+libnotify, lcms2, libxklavier, libgnomekbd, libcanberra, libpulseaudio, upower, libcanberra_gtk3, colord,
 systemd, libxslt, docbook_xsl, makeWrapper, gsettings_desktop_schemas}:
 
 let
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     glib gettext gnome_common
     intltool gtk3 libnotify lcms2
     libgnomekbd libxklavier colord
-    libcanberra pulseaudio upower
+    libcanberra libpulseaudio upower
     libcanberra_gtk3 cinnamon-desktop
     systemd libxslt docbook_xsl makeWrapper
     gsettings_desktop_schemas
diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix
index ada0f4650d2..6fb262ac50a 100644
--- a/pkgs/desktops/e19/efl.nix
+++ b/pkgs/desktops/e19/efl.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }:
+{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }:
 
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
     giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base
-    gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto
+    gst_all_1.gst-libav libpulseaudio libsndfile xlibs.libXcursor xlibs.printproto
     xlibs.libX11 udev utillinuxCurses ];
 
   propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix
index dca3b3a16a2..93dfa544ea9 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk
-, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, pulseaudio }:
+, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, libpulseaudio }:
 
 stdenv.mkDerivation {
   name = "gnome-settings-daemon-2.32.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   buildInputs =
     [ dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd polkit
-      pulseaudio
+      libpulseaudio
     ];
 
   nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
index ab5ea0cbcca..ef344c5bf55 100644
--- a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
@@ -2,7 +2,7 @@
 , file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf
 , dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream
 , clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts
-, gcr, libsecret, folks, pulseaudio, telepathy_mission_control
+, gcr, libsecret, folks, libpulseaudio, telepathy_mission_control
 , telepathy_logger, libnotify, clutter, libsoup, gnutls
 , evolution_data_server
 , libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
                   libxml2 libxslt icu file makeWrapper
                   telepathy_glib clutter_gtk clutter-gst cogl
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf
+                  gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf
                   libnotify clutter libsoup gnutls libgee p11_kit
                   libcanberra_gtk3 telepathy_farstream farstream
                   gnome3.adwaita-icon-theme hicolor_icon_theme 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
index 725aa6a6b12..0c676c38efa 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
-, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, pulseaudio, fontconfig
+, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio, fontconfig
 , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
 , cracklib, python, libkrb5, networkmanagerapplet, networkmanager
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   buildInputs = with gnome3;
     [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
       libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
-      gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality
+      gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality
       accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
       shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
       gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
index e4d2d80e9f4..76c770e51d6 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
-, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
+, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
 , geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool, networkmanager
 , docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with gnome3;
     [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager
-      libnotify gnome_desktop lcms2 libXtst libxkbfile pulseaudio
+      libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio
       libcanberra_gtk3 upower colord libgweather xkeyboard_config
       polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt
       libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
index f99c0c2b5a4..c49a4503d63 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
@@ -2,7 +2,7 @@
 , python3, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core
 , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
 , sqlite, libgweather, libcanberra_gtk3
-, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
+, libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
 , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
 
 # 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
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
       libcroco intltool libsecret pkgconfig python3 libsoup polkit libcanberra gdk_pixbuf librsvg
       clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
-      libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server
+      libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server
       libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm
       libcanberra_gtk3 gnome_control_center
       defaultIconTheme sqlite gnome3.gnome-bluetooth
diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix
index 2b8df4757de..ddda04fd370 100644
--- a/pkgs/desktops/kde-4.14/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.14/kde-runtime.nix
@@ -1,5 +1,5 @@
 { kde, kdelibs, bzip2, libssh, exiv2, attica, qca2
-, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, pulseaudio
+, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio
 , networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme
 }:
 
@@ -8,7 +8,7 @@ kde {
 
   buildInputs = [
     kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
-    qca2 samba libcanberra pulseaudio gpgme
+    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
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix
index 1dd8108166f..8d8bc84e16e 100644
--- a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix
+++ b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix
@@ -1,6 +1,6 @@
-{ kde, kdelibs, libcanberra, pulseaudio }:
+{ kde, kdelibs, libcanberra, libpulseaudio }:
 kde {
-  buildInputs = [ kdelibs libcanberra pulseaudio ];
+  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/xfce/applications/xfce4-volumed-pulse.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix
index 087ba0f2c81..8cbb4cca93c 100644
--- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pulseaudio
+{ stdenv, fetchurl, pkgconfig, libpulseaudio
 , gtk2, libnotify
 , keybinder, xfconf
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pulseaudio gtk2
+    [ libpulseaudio gtk2
       keybinder xfconf libnotify
     ];
 
diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix
index 4a6408d66d1..816803d4bd9 100644
--- a/pkgs/development/compilers/squeak/default.nix
+++ b/pkgs/development/compilers/squeak/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused
-, libpthreadstubs, pango, pkgconfig, pulseaudio, which }:
+, libpthreadstubs, pango, pkgconfig, libpulseaudio, which }:
 
 let version = "4.10.2.2614"; in
 stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ cmake coreutils dbus freetype glib gnused libpthreadstubs
-    pango pkgconfig pulseaudio which ];
+    pango pkgconfig libpulseaudio which ];
 
   postPatch = ''
     for i in squeak.in squeak.sh.in; do
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d24e5f44828..7ca94fe0499 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -101495,16 +101495,16 @@ self: {
      }) {};
 
   "pulse-simple" = callPackage
-    ({ mkDerivation, base, bytestring, pulseaudio }:
+    ({ mkDerivation, base, bytestring, libpulseaudio }:
      mkDerivation {
        pname = "pulse-simple";
        version = "0.1.14";
        sha256 = "1as1cnx50mqmib5llzy2w218rg7dxmhz6nfa9kryfjzk0n5rshl4";
        buildDepends = [ base bytestring ];
-       extraLibraries = [ pulseaudio ];
+       extraLibraries = [ libpulseaudio ];
        description = "binding to Simple API of pulseaudio";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) pulseaudio;};
+     }) { inherit (pkgs) libpulseaudio;};
 
   "punkt" = callPackage
     ({ mkDerivation, array, base, mtl, regex-tdfa, regex-tdfa-text
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index f23955228f7..3e00b21ad43 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -2,7 +2,7 @@
 , openglSupport ? false, mesa ? null
 , alsaSupport ? true, alsaLib ? null
 , x11Support ? true, x11 ? null, libXrandr ? null
-, pulseaudioSupport ? true, pulseaudio ? null
+, pulseaudioSupport ? true, libpulseaudio ? null
 }:
 
 # OSS is no longer supported, for it's much crappier than ALSA and
@@ -12,7 +12,7 @@ assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport
 assert openglSupport -> (mesa != null && x11Support);
 assert x11Support -> (x11 != null && libXrandr != null);
 assert alsaSupport -> alsaLib != null;
-assert pulseaudioSupport -> pulseaudio != null;
+assert pulseaudioSupport -> libpulseaudio != null;
 
 stdenv.mkDerivation rec {
   version = "1.2.15";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   propagatedNativeBuildInputs =
     stdenv.lib.optionals x11Support [ x11 libXrandr ] ++
     stdenv.lib.optional alsaSupport alsaLib ++
-    stdenv.lib.optional pulseaudioSupport pulseaudio;
+    stdenv.lib.optional pulseaudioSupport libpulseaudio;
 
   buildInputs = let
     notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index ade6bc620e4..bfd5ff65563 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -2,7 +2,7 @@
 , openglSupport ? false, mesa ? null
 , alsaSupport ? true, alsaLib ? null
 , x11Support ? true, x11 ? null, libXrandr ? null
-, pulseaudioSupport ? true, pulseaudio ? null
+, pulseaudioSupport ? true, libpulseaudio ? null
 }:
 
 # OSS is no longer supported, for it's much crappier than ALSA and
@@ -12,7 +12,7 @@ assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
 assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support);
 assert x11Support -> (x11 != null && libXrandr != null);
 assert alsaSupport -> alsaLib != null;
-assert pulseaudioSupport -> pulseaudio != null;
+assert pulseaudioSupport -> libpulseaudio != null;
 
 let
   configureFlagsFun = attrs: ''
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
   propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++
-    stdenv.lib.optional pulseaudioSupport pulseaudio;
+    stdenv.lib.optional pulseaudioSupport libpulseaudio;
 
   buildInputs = [ pkgconfig audiofile ] ++
     stdenv.lib.optional openglSupport [ mesa ] ++
diff --git a/pkgs/development/libraries/despotify/default.nix b/pkgs/development/libraries/despotify/default.nix
index 172a823cfdc..2cb241b0427 100644
--- a/pkgs/development/libraries/despotify/default.nix
+++ b/pkgs/development/libraries/despotify/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv, fetchsvn, openssl, zlib, libvorbis, pulseaudio, gstreamer, libao,
+  stdenv, fetchsvn, openssl, zlib, libvorbis, libpulseaudio, gstreamer, libao,
   libtool, ncurses, glibc
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    openssl zlib libvorbis pulseaudio gstreamer libao libtool ncurses glibc
+    openssl zlib libvorbis libpulseaudio gstreamer libao libtool ncurses glibc
   ];
 
   configurePhase = "cd src";
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index fd5ca0545a3..aee67f5cd77 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -108,7 +108,7 @@
 #, openh264 ? null # H.264/AVC encoder
 , openjpeg_1 ? null # JPEG 2000 de/encoder
 , opensslExtlib ? false, openssl ? null
-, pulseaudio ? null # Pulseaudio input support
+, libpulseaudio ? null # Pulseaudio input support
 , rtmpdump ? null # RTMP[E] support
 #, libquvi ? null # Quvi input support
 , samba ? null # Samba protocol
@@ -361,7 +361,7 @@ stdenv.mkDerivation rec {
     #(enableFeature (openh264 != null) "openh264")
     (enableFeature (openjpeg_1 != null) "libopenjpeg")
     (enableFeature (opensslExtlib && gplLicensing) "openssl")
-    (enableFeature (pulseaudio != null) "libpulse")
+    (enableFeature (libpulseaudio != null) "libpulse")
     #(enableFeature quvi "libquvi")
     (enableFeature (rtmpdump != null) "librtmp")
     #(enableFeature (schroedinger != null) "libschroedinger")
@@ -399,7 +399,7 @@ stdenv.mkDerivation rec {
     bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
     jack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
     libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11
-    libxcb libXext libXfixes libXv lzma openal openjpeg_1 pulseaudio rtmpdump
+    libxcb libXext libXfixes libXv lzma openal openjpeg_1 libpulseaudio rtmpdump
     samba SDL soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib
   ] ++ optional openglExtlib mesa
     ++ optionals x11grabExtlib [ libXext libXfixes ]
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 13a339740f4..99d8fe679ab 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
 , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
-, libtheora, libva, libvdpau, libvorbis, libvpx, lzma, pulseaudio, SDL, soxr
+, libtheora, libva, libvdpau, libvorbis, libvpx, lzma, libpulseaudio, SDL, soxr
 , x264, xvidcore, zlib
 , openglSupport ? false, mesa ? null
 # Build options
@@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
     bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
     libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib
   ] ++ optional openglSupport mesa
-    ++ optionals (!isDarwin) [ libvpx pulseaudio ] # Need to be fixed on Darwin
+    ++ optionals (!isDarwin) [ libvpx libpulseaudio ] # Need to be fixed on Darwin
     ++ optional (isLinux || isFreeBSD) libva
     ++ optional isLinux alsaLib;
 
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 51ad836b644..c999c65229e 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -3,7 +3,7 @@
 , libv4l, libdv, libavc1394, libiec61883
 , libvpx, speex, flac, taglib
 , cairo, gdk_pixbuf, aalib, libcaca
-, libsoup, pulseaudio, libintlOrEmpty
+, libsoup, libpulseaudio, libintlOrEmpty
 }:
 
 let
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     libsoup
   ]
   ++ libintlOrEmpty
-  ++ optionals stdenv.isLinux [ libv4l pulseaudio libavc1394 libiec61883 ];
+  ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];
 
   LDFLAGS = optionalString stdenv.isDarwin "-lintl";
 }
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 1db7e4dbd55..deca854008a 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
 , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
-, libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc
+, libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc
 , glib, gstreamer, bzip2, libsoup, libintlOrEmpty
 , # Whether to build no plugins that have external dependencies
   # (except the PulseAudio plugin).
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig glib gstreamer gst_plugins_base ]
-    ++ stdenv.lib.optional stdenv.isLinux [ pulseaudio ]
+    ++ stdenv.lib.optional stdenv.isLinux [ libpulseaudio ]
     ++ libintlOrEmpty
     ++ stdenv.lib.optionals (!minimalDeps)
       [ aalib libcaca cairo libdv flac libjpeg libpng speex
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index 72b364bb364..ee92da283a6 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib, libcap
+{ lib, stdenv, fetchurl, pkgconfig, libpulseaudio, alsaLib, libcap
 , usePulseAudio }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig libcap ] ++
-    lib.optional stdenv.isLinux (if usePulseAudio then [ pulseaudio ] else [ alsaLib ]);
+    lib.optional stdenv.isLinux (if usePulseAudio then [ libpulseaudio ] else [ alsaLib ]);
 
   meta = {
     longDescription = ''
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 0d9474e585e..2510e3b8621 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, pulseaudio, gstreamer, gst_plugins_base, libvorbis }:
+, alsaLib, libpulseaudio, gstreamer, gst_plugins_base, libvorbis }:
 
 stdenv.mkDerivation rec {
   name = "libcanberra-0.30";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig libtool alsaLib pulseaudio libvorbis gtk libcap
+    pkgconfig libtool alsaLib libpulseaudio libvorbis gtk libcap
     /*gstreamer gst_plugins_base*/      # ToDo: gstreamer not found (why?), add (g)udev?
   ];
 
diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix
index 2146562c5cb..0f3ea26eb04 100644
--- a/pkgs/development/libraries/libmikmod/default.nix
+++ b/pkgs/development/libraries/libmikmod/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, texinfo, alsaLib, pulseaudio }:
+{ stdenv, fetchurl, texinfo, alsaLib, libpulseaudio }:
 
 stdenv.mkDerivation rec {
   name = "libmikmod-3.3.7";
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ texinfo ]
-    ++ stdenv.lib.optional stdenv.isLinux [ alsaLib pulseaudio ];
+    ++ stdenv.lib.optional stdenv.isLinux [ alsaLib libpulseaudio ];
   propagatedBuildInputs =
-    stdenv.lib.optional stdenv.isLinux pulseaudio;
+    stdenv.lib.optional stdenv.isLinux libpulseaudio;
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lasound";
 
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index 586a10bd1a8..19e71fd66c1 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, alsaLib, pulseaudio, speex, gsm
+{ stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm
 , libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp
 , ortp, libv4l, libpcap, srtp, vim
 }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool ];
 
   propagatedBuildInputs = [
-    alsaLib pulseaudio speex gsm libopus
+    alsaLib libpulseaudio speex gsm libopus
     ffmpeg libX11 libXv mesa glew libtheora libvpx SDL libupnp
     ortp libv4l libpcap srtp
     vim
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index eedc9e9ff93..89dc32b61f2 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake
 , alsaSupport ? true, alsaLib ? null
-, pulseSupport ? true, pulseaudio ? null
+, pulseSupport ? true, libpulseaudio ? null
 }:
 
 with stdenv.lib;
 
 assert alsaSupport -> alsaLib != null;
-assert pulseSupport -> pulseaudio != null;
+assert pulseSupport -> libpulseaudio != null;
 
 stdenv.mkDerivation rec {
   version = "1.16.0";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake ]
     ++ optional alsaSupport alsaLib
-    ++ optional pulseSupport pulseaudio;
+    ++ optional pulseSupport libpulseaudio;
 
   NIX_LDFLAGS = []
     ++ optional alsaSupport "-lasound"
diff --git a/pkgs/development/libraries/phonon/qt4/default.nix b/pkgs/development/libraries/phonon/qt4/default.nix
index a127c063ffb..9875b216e06 100644
--- a/pkgs/development/libraries/phonon/qt4/default.nix
+++ b/pkgs/development/libraries/phonon/qt4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, automoc4, pulseaudio, qt4 }:
+{ stdenv, fetchurl, cmake, automoc4, libpulseaudio, qt4 }:
 
 with stdenv.lib;
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "1l97h1jj3gvl1chx1qbipizfvjgqc05wrhdcflc76c2krlk03jmn";
   };
 
-  buildInputs = [ qt4 pulseaudio ];
+  buildInputs = [ qt4 libpulseaudio ];
 
   nativeBuildInputs = [ cmake automoc4 ];
 
diff --git a/pkgs/development/libraries/phonon/qt5/default.nix b/pkgs/development/libraries/phonon/qt5/default.nix
index 248e0427709..94d3b0fc0de 100644
--- a/pkgs/development/libraries/phonon/qt5/default.nix
+++ b/pkgs/development/libraries/phonon/qt5/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, mesa, pkgconfig, pulseaudio, qt5, debug ? false }:
+{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio, qt5, debug ? false }:
 
 with stdenv.lib;
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551";
   };
 
-  buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools pulseaudio ];
+  buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools libpulseaudio ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix
index 907cec49020..693f62a63eb 100644
--- a/pkgs/development/libraries/qt-5/5.3/default.nix
+++ b/pkgs/development/libraries/qt-5/5.3/default.nix
@@ -5,7 +5,7 @@
 , gdk_pixbuf, python, gdb, xlibs, libX11, libxcb, xcbutil, xcbutilimage
 , xcbutilkeysyms, xcbutilwm, udev, libxml2, libxslt, pcre, libxkbcommon
 , alsaLib, gstreamer, gst_plugins_base
-, pulseaudio, bison, flex, gperf, ruby, libwebp, libXcursor
+, libpulseaudio, bison, flex, gperf, ruby, libwebp, libXcursor
 , flashplayerFix ? false
 , gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs
 , buildDocs ? false
@@ -148,7 +148,7 @@ stdenv.mkDerivation rec {
     xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
     fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre
     zlib libjpeg libpng libtiff sqlite icu
-    libwebp alsaLib gstreamer gst_plugins_base pulseaudio
+    libwebp alsaLib gstreamer gst_plugins_base libpulseaudio
     xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
   ]
   # Qt doesn't directly need GLU (just GL), but many apps use, it's small and
diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
index fe7e024ba4b..fce2c7f1b7b 100644
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/default.nix
@@ -147,14 +147,14 @@ let
       multimedia = callPackage
         (
           { qtSubmodule, base, declarative
-          , alsaLib, gstreamer, gst_plugins_base, pulseaudio
+          , alsaLib, gstreamer, gst_plugins_base, libpulseaudio
           }:
 
           qtSubmodule {
             name = "qtmultimedia";
             qtInputs = [ base declarative ];
             buildInputs = [
-              alsaLib gstreamer gst_plugins_base pulseaudio
+              alsaLib gstreamer gst_plugins_base libpulseaudio
             ];
           }
         )
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index e7a048f0a31..d525c143d9c 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, spice_protocol, intltool, celt_0_5_1
-, openssl, pulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
+, openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
 , cyrus_sasl, python, pygtk, autoconf, automake, libtool, usbredir, libsoup
 , gtk3, enableGTK3 ? false }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    spice_protocol celt_0_5_1 openssl pulseaudio pixman gobjectIntrospection
+    spice_protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection
     libjpeg_turbo zlib cyrus_sasl python pygtk usbredir
   ] ++ (if enableGTK3 then [ gtk3 ] else [ gtk ]);
 
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 11ba5df80ca..89b2d77db82 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, xorg, alsaLib, mesa, aalib
 , libvorbis, libtheora, speex, zlib, libdvdcss, perl, ffmpeg
-, flac, libcaca, pulseaudio, libmng, libcdio, libv4l, vcdimager
+, flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager
 , libmpcdec
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext
     alsaLib mesa aalib libvorbis libtheora speex perl ffmpeg flac
-    libcaca pulseaudio libmng libcdio libv4l vcdimager libmpcdec
+    libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec
   ];
 
   NIX_LDFLAGS = "-rpath ${libdvdcss}/lib -L${libdvdcss}/lib -ldvdcss";
diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix
index 25524528c5c..d44da3d41b7 100644
--- a/pkgs/games/adom/default.nix
+++ b/pkgs/games/adom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, pulseaudio
+{ stdenv, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, libpulseaudio
 , xlibs, plowshare }:
 
 assert stdenv.isLinux;
@@ -8,7 +8,7 @@ let
   inherit (xlibs) libXext libX11;
 
   lpath = "${stdenv.cc.cc}/lib64:" + stdenv.lib.makeSearchPath "lib" [
-      zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib pulseaudio];
+      zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio];
 
 in
 assert stdenv.is64bit;
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 8cb38c859ed..af90c826705 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, lame, mplayer, pulseaudio, portaudio
+{ stdenv, lib, fetchurl, lame, mplayer, libpulseaudio, portaudio
 , python, pyqt4, pythonPackages
 # This little flag adds a huge number of dependencies, but we assume that
 # everyone wants Anki to draw plots with statistics by default.
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy9 py.pyaudio ]
               ++ lib.optional plotsSupport py.matplotlib;
 
-    buildInputs = [ python py.wrapPython lame mplayer pulseaudio ];
+    buildInputs = [ python py.wrapPython lame mplayer libpulseaudio ];
 
     preConfigure = ''
       substituteInPlace anki \
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 3198ad785f0..9a19366a074 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
-, mesa, openal, alsaOss, pulseaudioSupport ? false, pulseaudio }:
+, mesa, openal, alsaOss, pulseaudioSupport ? false, libpulseaudio }:
 
 assert jre ? architecture;
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
     # wrapper for minecraft
     export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${jre}/lib/${jre.architecture}/:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/
-    ${if pulseaudioSupport then "${pulseaudio}/bin/padsp" else "${alsaOss}/bin/aoss" } \
+    ${if pulseaudioSupport then "${libpulseaudio}/bin/padsp" else "${alsaOss}/bin/aoss" } \
       ${jre}/bin/java -jar $out/minecraft.jar
     EOF
 
diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix
index 376d1e33473..899c851c667 100644
--- a/pkgs/games/scrolls/default.nix
+++ b/pkgs/games/scrolls/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, gcc
-, mesa_glu, libX11, libXext, libXcursor, pulseaudio
+, mesa_glu, libX11, libXext, libXcursor, libpulseaudio
 }:
 stdenv.mkDerivation {
   name = "scrolls-2014-03-08";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     libX11
     libXext
     libXcursor
-    pulseaudio
+    libpulseaudio
   ];
 
   phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
index 82cffc8dec6..99bafe95b75 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/pkgs/games/stepmania/default.nix
@@ -1,5 +1,5 @@
 { fetchFromGitHub, stdenv, pkgconfig, autoconf, automake, yasm, zlib, bzip2, alsaLib
-, pulseaudio, libmad, libtheora, libvorbis, libpng, libjpeg, gtk
+, libpulseaudio, libmad, libtheora, libvorbis, libpng, libjpeg, gtk
 , mesa, glew }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig autoconf automake yasm zlib bzip2 alsaLib pulseaudio libmad libtheora
+    pkgconfig autoconf automake yasm zlib bzip2 alsaLib libpulseaudio libmad libtheora
     libvorbis libpng libjpeg gtk mesa glew
   ];
 
diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix
index db389047ec7..f85fd267485 100644
--- a/pkgs/games/vessel/default.nix
+++ b/pkgs/games/vessel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, SDL, pulseaudio, alsaLib }:
+{ stdenv, requireFile, SDL, libpulseaudio, alsaLib }:
 
 stdenv.mkDerivation rec {
   name = "vessel-12082012";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   ld_preload = ./isatty.c;
 
   libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] 
-    + ":" + stdenv.lib.makeLibraryPath [ SDL pulseaudio alsaLib ] ;
+    + ":" + stdenv.lib.makeLibraryPath [ SDL libpulseaudio alsaLib ] ;
 
   installPhase = ''
     mkdir -p $out/libexec/strangeloop/vessel/
diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix
index 275e6f06520..461d3c11c3c 100644
--- a/pkgs/misc/emulators/dolphin-emu/default.nix
+++ b/pkgs/misc/emulators/dolphin-emu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
 , gettext, libpthreadstubs, libXrandr, libXext, readline
 , openal, libXdmcp, portaudio, SDL, wxGTK30, fetchurl
-, pulseaudio ? null }:
+, libpulseaudio ? null }:
 
 stdenv.mkDerivation rec {
   name = "dolphin-emu-4.0.2";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
                   gettext libpthreadstubs libXrandr libXext readline openal
-                  libXdmcp portaudio SDL wxGTK30 pulseaudio ];
+                  libXdmcp portaudio SDL wxGTK30 libpulseaudio ];
 
   meta = {
     homepage = http://dolphin-emu.org/;
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index cbff76610f1..fd293298b45 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -1,7 +1,7 @@
 { stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
 , gettext, git, libpthreadstubs, libXrandr, libXext, readline
 , openal, libXdmcp, portaudio, SDL, wxGTK30, fetchgit, libusb
-, pulseaudio ? null }:
+, libpulseaudio ? null }:
 
 stdenv.mkDerivation rec {
   name = "dolphin-emu-20150421";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
                   gettext libpthreadstubs libXrandr libXext readline openal
-                  git libXdmcp portaudio SDL wxGTK30 libusb pulseaudio ];
+                  git libXdmcp portaudio SDL wxGTK30 libusb libpulseaudio ];
 
   meta = {
     homepage = http://dolphin-emu.org/;
diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index 3eb60b81b81..95793de9884 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -3,7 +3,7 @@
 , libX11, libXv
 , udev
 , mesa, SDL
-, libao, openal, pulseaudio
+, libao, openal, libpulseaudio
 , profile ? "performance" # Options: accuracy, balanced, performance
 , guiToolkit ? "gtk" # can be gtk or qt4
 , gtk ? null, qt4 ? null }:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-  [ pkgconfig libX11 libXv udev mesa SDL libao openal pulseaudio ]
+  [ pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio ]
   ++ optionals (guiToolkit == "gtk") [ gtk ]
   ++ optionals (guiToolkit == "qt4") [ qt4 ];
 
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index faa143d9273..fa5e501c434 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit
 , freetype, libxml2, libv4l, coreutils, python34, which, udev, alsaLib
-, libX11, libXext, libXxf86vm, libXdmcp, SDL, pulseaudio ? null }:
+, libX11, libXext, libXxf86vm, libXdmcp, SDL, libpulseaudio ? null }:
 
 stdenv.mkDerivation rec {
   name = "retroarch-bare-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils
-                  python34 which udev alsaLib libX11 libXext libXxf86vm libXdmcp SDL pulseaudio ];
+                  python34 which udev alsaLib libX11 libXext libXxf86vm libXdmcp SDL libpulseaudio ];
 
   patchPhase = ''
     export GLOBAL_CONFIG_DIR=$out/etc
diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix
index 760821e3654..32d47093d68 100644
--- a/pkgs/misc/emulators/snes9x-gtk/default.nix
+++ b/pkgs/misc/emulators/snes9x-gtk/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, x11, pulseaudio}:
+{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, x11, libpulseaudio}:
 
 stdenv.mkDerivation rec {
   name = "snes9x-gtk-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3";
   };
 
-  buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 x11 pulseaudio];
+  buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 x11 libpulseaudio];
 
   sourceRoot = "snes9x-${version}-src/gtk";
 
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index cac346e946e..c1611952a1e 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -17,7 +17,7 @@
 , mmsSupport ? true, libmms
 , mpg123Support ? true, mpg123
 , aacSupport ? true, faad2
-, pulseaudioSupport ? true, pulseaudio
+, pulseaudioSupport ? true, libpulseaudio
 , jackSupport ? true, jack2
 , gmeSupport ? true, game-music-emu
 , icuSupport ? true, icu
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     ++ opt mpg123Support mpg123
     ++ opt aacSupport faad2
     ++ opt zipSupport zziplib
-    ++ opt pulseaudioSupport pulseaudio
+    ++ opt pulseaudioSupport libpulseaudio
     ++ opt jackSupport jack2
     ++ opt gmeSupport game-music-emu
     ++ opt icuSupport icu
diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix
index 16705433084..2bfe74900f6 100644
--- a/pkgs/servers/shairport-sync/default.nix
+++ b/pkgs/servers/shairport-sync/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, avahi, alsaLib, libdaemon, autoconf, automake, libtool, popt, unzip, pkgconfig, libconfig, pulseaudio }:
+{ stdenv, fetchurl, openssl, avahi, alsaLib, libdaemon, autoconf, automake, libtool, popt, unzip, pkgconfig, libconfig, libpulseaudio }:
 
 stdenv.mkDerivation rec {
   version = "2.3.0";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     popt
     unzip
     libconfig
-    pulseaudio
+    libpulseaudio
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index 9fc6d135625..15cb56926a8 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, gobjectIntrospection
 , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
-, libffi, cyrus_sasl, intltool, perl, perlPackages, pulseaudio
+, libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio
 , kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala
 , pygobject3, libogg, enableGTK3 ? false, libgpgerror }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     python gnutls cairo libtool pkgconfig glib libffi libgcrypt
-    intltool cyrus_sasl pulseaudio perl perlPackages.TextCSV
+    intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV
     gobjectIntrospection libogg libgpgerror
   ] ++ (if enableGTK3 then [ gtk3 vala pygobject3 ] else [ gtk pygtk pygobject ]);
 
diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix
index d310d5017ed..1da9a6f465c 100644
--- a/pkgs/tools/audio/liquidsoap/full.nix
+++ b/pkgs/tools/audio/liquidsoap/full.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, which, pkgconfig
 , ocaml, ocamlPackages
-, libao, portaudio, alsaLib, pulseaudio, jack2
+, libao, portaudio, alsaLib, libpulseaudio, jack2
 , libsamplerate, libmad, taglib, lame, libogg
 , libvorbis, speex, libtheora, libopus, fdk_aac
 , faad2, flac, ladspaH, ffmpeg, frei0r, dssi
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
 
   buildInputs =
     [ which ocaml ocamlPackages.findlib pkgconfig
-      libao portaudio alsaLib pulseaudio jack2
+      libao portaudio alsaLib libpulseaudio jack2
       libsamplerate libmad taglib lame libogg
       libvorbis speex libtheora libopus fdk_aac
       faad2 flac ladspaH ffmpeg frei0r dssi
diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix
index 6d5dd6ffca0..d6dcba32233 100644
--- a/pkgs/tools/audio/pa-applet/default.nix
+++ b/pkgs/tools/audio/pa-applet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
+{ stdenv, fetchgit, libpulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
 
 stdenv.mkDerivation rec {
   name = "pa-applet";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    gtk3 pulseaudio glibc pkgconfig automake autoconf libnotify libX11 xf86inputevdev
+    gtk3 libpulseaudio glibc pkgconfig automake autoconf libnotify libX11 xf86inputevdev
   ];
 
   preConfigure = ''
diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index c542386cb5a..d214a75b441 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig
-, gnome3, avahi, gtk3, libnotify, pulseaudio, x11}:
+, gnome3, avahi, gtk3, libnotify, libpulseaudio, x11}:
 
 stdenv.mkDerivation rec {
   name = "pasystray-0.5.2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ autoconf automake makeWrapper pkgconfig 
                   gnome3.defaultIconTheme
-                  avahi gtk3 libnotify pulseaudio x11 ];
+                  avahi gtk3 libnotify libpulseaudio x11 ];
 
   preConfigure = ''
     aclocal
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index a9a167355ed..5330dfb82bd 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, python, pyrex, pygobject, pygtk
 , notify, pythonDBus, bluez, glib, gtk, libstartup_notification
 , makeWrapper, xdg_utils, obex_data_server
-, pulseaudio
+, libpulseaudio
 }:
    
 stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       for i in $out/bin/* $out/libexec/*; do
           wrapProgram $i \
               --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH" \
-              --set LD_LIBRARY_PATH "${pulseaudio}/lib:" \
+              --set LD_LIBRARY_PATH "${libpulseaudio}/lib:" \
               --prefix PATH : ${xdg_utils}/bin
       done
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7bf44bf5404..ebd50429c54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5959,7 +5959,7 @@ let
     libvpx = if stdenv.isDarwin then null else libvpx;
     openal = if stdenv.isDarwin then null else openal;
     openjpeg_1 = if stdenv.isDarwin then null else openjpeg_1;
-    pulseaudio = if stdenv.isDarwin then null else pulseaudio;
+    libpulseaudio = if stdenv.isDarwin then null else libpulseaudio;
     samba = if stdenv.isDarwin then null else samba;
     vid-stab = if stdenv.isDarwin then null else vid-stab;
     x265 = if stdenv.isDarwin then null else x265;

From b9a366e5c4d0e9fdd92d9c2a1f7ef24bea5be656 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 11:41:17 -0700
Subject: [PATCH 0443/2322] Fix typo

---
 pkgs/applications/audio/minimodem/default.nix    | 2 +-
 pkgs/desktops/gnome-3/3.16/core/rest/default.nix | 4 ++--
 pkgs/servers/mail/opensmtpd/default.nix          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/minimodem/default.nix b/pkgs/applications/audio/minimodem/default.nix
index af4e887d167..025d216910e 100644
--- a/pkgs/applications/audio/minimodem/default.nix
+++ b/pkgs/applications/audio/minimodem/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, linbpulseaudio }:
+{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio }:
 
 stdenv.mkDerivation rec {
   version = "0.19";
diff --git a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
index 101dbb8cc48..9dbd46946c0 100644
--- a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, cacerts }:
+{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, cacert }:
 
 stdenv.mkDerivation rec {
   name = "rest-0.7.92";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
 
-  configureFlags = "--with-ca-certificates=${cacerts}/ca-bundle.crt";
+  configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt";
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index a22da36d2b6..ab8ec59ca8c 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoconf, automake, libtool, bison
-, libasr, libevent, zlib, openssl, db, pam
+, libasr, libevent, zlib, openssl, db, pam, cacert
 }:
 
 stdenv.mkDerivation rec {

From be5f4082fd817703e5ee17a2ebd2629811a56100 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 14:38:53 -0700
Subject: [PATCH 0444/2322] pulseaudio: Remove default derivation

---
 pkgs/applications/kde-apps-15.04/default.nix | 2 +-
 pkgs/desktops/plasma-5.3/default.nix         | 2 +-
 pkgs/games/steam/chrootenv.nix               | 2 +-
 pkgs/misc/emulators/wine/staging.nix         | 2 +-
 pkgs/top-level/all-packages.nix              | 4 +++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 9cab1775c42..661c8c3acb5 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -117,7 +117,7 @@ let
         OpenEXR = openexr;
         Poppler = poppler_qt4;
         Prison = prison;
-        PulseAudio = pulseaudio;
+        PulseAudio = libpulseaudio;
         PythonLibrary = python;
         Qalculate = libqalculate;
         QCA2 = qca2;
diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index 7ff2d5fe815..c4fb624a377 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -53,7 +53,7 @@ let
         GTK3 = gtk3;
         Libinput = libinput;
         LibSSH = libssh;
-        PulseAudio = pulseaudio;
+        PulseAudio = libpulseaudio;
         Taglib = taglib;
         USB = libusb;
         Wayland = wayland;
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index b8e5c646758..1876e81dc31 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -56,7 +56,7 @@ buildFHSUserEnv {
       pkgs.alsaLib
       pkgs.libvorbis
       pkgs.openal
-      pkgs.pulseaudio
+      pkgs.libpulseaudio
 
       pkgs.flashplayer
 
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index beea0bb3c12..1de37f56504 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -15,7 +15,7 @@ let v = (import ./versions.nix).staging;
 in assert (builtins.parseDrvName wine.name).version == version;
 
 stdenv.lib.overrideDerivation wine (self: {
-  nativeBuildInputs = build-inputs [ "pulseaudio" libtxc_dxtn_Name ] self.nativeBuildInputs; 
+  nativeBuildInputs = build-inputs [ "libpulseaudio" libtxc_dxtn_Name ] self.nativeBuildInputs; 
   buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs;
 
   name = "${self.name}-staging";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ebd50429c54..6c0e785846a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8794,7 +8794,9 @@ let
     prefix = "lib";
   };
 
-  pulseaudio = pulseaudioFull.override {
+  # Name is changed to prevent use in packages
+  # please use libpulseaudio instead
+  pulseaudioLight = pulseaudioFull.override {
     # The following are disabled in the default build, because if this
     # functionality is desired, they are only needed in the PulseAudio
     # server.

From 539a954955a452a90cb14f8fbf08a359c1730b16 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 27 May 2015 13:23:23 -0700
Subject: [PATCH 0445/2322] bdb: Build with dbm

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

diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index 013a7fd35b9..077bd4e03a3 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     (if cxxSupport then "--enable-cxx" else "--disable-cxx")
     (if compat185 then "--enable-compat185" else "--disable-compat185")
+    "--enable-dbm"
   ];
 
   preConfigure = ''

From 89d9a6079cfd88b27295aeac3da355d44620548f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 26 May 2015 17:52:17 -0700
Subject: [PATCH 0446/2322] libmicrohttpd: 0.9.41 -> 0.9.42

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

diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index c7892716c9d..d88b75440bc 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -17,11 +17,11 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libmicrohttpd-0.9.41";
+  name = "libmicrohttpd-0.9.42";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "0z3s3aplgxj8cj947i4rxk9wzvg68b8hbn71fyipc7aagmivx64p";
+    sha256 = "0nvxmm6z6wcq1vl6l92rids0i0va184y86bkc10dl0vh6rrj0d80";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
     (mkWith   true                 "threads"       "posix")
     (mkEnable true                 "doc"           null)
     (mkEnable false                "examples"      null)
+    (mkEnable true                 "poll"          "auto")
     (mkEnable true                 "epoll"         "auto")
     (mkEnable doCheck              "curl"          null)
     (mkEnable hasSpdy              "spdy"          null)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05d773ade45..6c93d103f59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6919,8 +6919,9 @@ let
 
   libmemcached = callPackage ../development/libraries/libmemcached { };
 
-  libmicrohttpd = callPackage ../development/libraries/libmicrohttpd {
-    openssl = null;
+  libmicrohttpd-full = callPackage ../development/libraries/libmicrohttpd { };
+
+  libmicrohttpd = libmicrohttpd-full.override {
     gnutls = null;
   };
 

From 7141d96bde218141ed73bd82cc806d075e0d07f4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 26 May 2015 18:00:04 -0700
Subject: [PATCH 0447/2322] pam: Factor out dependencies

---
 pkgs/os-specific/linux/pam/default.nix | 63 +++++++++++++++++---------
 1 file changed, 41 insertions(+), 22 deletions(-)

diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 29cfa64b22d..96debd66e5b 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -1,5 +1,16 @@
-{ stdenv, fetchurl, flex, cracklib }:
+{ stdenv, fetchurl, pkgconfig
 
+# Optional Depdencies
+, cracklib ? null, libaudit ? null, db ? null
+}:
+
+with stdenv;
+let
+  optCracklib = shouldUsePkg cracklib;
+  optLibaudit = shouldUsePkg libaudit;
+  optDb = shouldUsePkg db;
+in
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "linux-pam-${version}";
   version = "1.2.0";
@@ -9,37 +20,45 @@ stdenv.mkDerivation rec {
     sha256 = "192y2fgf24a5qsg7rl1mzgw5axs5lg8kqamkfff2x50yjv2ym2yd";
   };
 
-  nativeBuildInputs = [ flex ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ optCracklib optLibaudit optDb ];
 
-  buildInputs = [ cracklib ];
+  configureFlags = [
+    (mkOther                        "sysconfdir"      "/etc")
+    (mkOther                        "localstatedir"   "/var")
+    (mkOther                        "includedir"   "\${out}/include/security")
+    (mkEnable false                 "static-modules"  null)
+    (mkEnable true                  "pie"             null)
+    (mkEnable false                 "prelude"         null)
+    (mkEnable false                 "debug"           null)
+    (mkEnable false                 "pamlocking"      null)
+    (mkEnable true                  "read-both-confs" null)
+    (mkEnable true                  "lckpwdf"         null)
+    (mkWith   true                  "xauth"           "/run/current-system/sw/bin/xauth")
+    (mkEnable (optCracklib != null) "cracklib"        null)
+    (mkEnable (optLibaudit != null) "audit"           null)
+    (mkEnable (optDb != null)       "db"              "db")
+    (mkEnable true                  "nis"             null)  # TODO: Consider tirpc support here
+    (mkEnable false                 "selinux"         null)
+    (mkEnable false                 "regenerate-docu" null)
+  ];
 
-  crossAttrs = {
-    propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ];
-    preConfigure = preConfigure + ''
-      ar x ${flex.crossDrv}/lib/libfl.a
-      mv libyywrap.o libyywrap-target.o
-      ar x ${flex}/lib/libfl.a
-      mv libyywrap.o libyywrap-host.o
-      export LDFLAGS="$LDFLAGS $PWD/libyywrap-target.o"
-      sed -e 's/@CC@/gcc/' -i doc/specs/Makefile.in
-    '';
-    postConfigure = ''
-      sed -e "s@ $PWD/libyywrap-target.o@ $PWD/libyywrap-host.o@" -i doc/specs/Makefile
-    '';
-  };
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+    "SCONFIGDIR=\${out}/etc/security"
+  ];
 
   postInstall = ''
+    # Prepare unix_chkpwd for setuid wrapping
     mv -v $out/sbin/unix_chkpwd{,.orig}
     ln -sv /var/setuid-wrappers/unix_chkpwd $out/sbin/unix_chkpwd
   '';
 
-  preConfigure = ''
-    configureFlags="$configureFlags --includedir=$out/include/security"
-  '';
-
   meta = {
     homepage = http://ftp.kernel.org/pub/linux/libs/pam/;
     description = "Pluggable Authentication Modules, a flexible mechanism for authenticating user";
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
   };
 }

From 80648d7e242bcb9e9ed544a2561c433ee22fb5aa Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 28 May 2015 17:47:04 -0700
Subject: [PATCH 0448/2322] Use mit5 as kerberos since it is better supported

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c93d103f59..b307a54c85c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6328,9 +6328,9 @@ let
 
   hamlib = callPackage ../development/libraries/hamlib { };
 
-  # TODO : Add MIT Kerberos and let admin choose.
-  # TODO : Fix kerberos on Darwin
-  kerberos = if stdenv.isDarwin then null else heimdal;
+  # TODO : Add Heimdal Kerberos and let admin choose.
+  # Modularize heimdal into a library first
+  kerberos = libkrb5;
 
   heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
     openldap = openldap.override {
@@ -6464,9 +6464,6 @@ let
   kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
 
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
-    openldap = openldap.override {
-      cyrus_sasl = cyrus_sasl.override { kerberos = null; };
-    };
     inherit (darwin) bootstrap_cmds;
   };
   libkrb5 = krb5.override {

From 4fa5cc71f2d5c5b8f6b5d71cd321d9ba6805d5cd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 28 May 2015 20:51:36 -0700
Subject: [PATCH 0449/2322] heimdal: No need to override openldap anymore

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b307a54c85c..8bee00851e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6332,11 +6332,7 @@ let
   # Modularize heimdal into a library first
   kerberos = libkrb5;
 
-  heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
-    openldap = openldap.override {
-      cyrus_sasl = cyrus_sasl.override { kerberos = null; };
-    };
-  };
+  heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
 
   harfbuzz = callPackage ../development/libraries/harfbuzz { };
   harfbuzz-icu = callPackage ../development/libraries/harfbuzz {

From 1e14f0a055d987ab2beb0fc943b3aab02e9dc7cb Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 00:36:05 -0700
Subject: [PATCH 0450/2322] heimdal: 1.5.3 -> 2015-05-26

---
 .../libraries/kerberos/heimdal.nix            | 141 +++++++++++-------
 pkgs/top-level/all-packages.nix               |   3 +
 2 files changed, 89 insertions(+), 55 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 6050891ba27..dd1f7afdf23 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,95 +1,126 @@
-{ stdenv, fetchurl, pkgconfig, flex, yacc
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python, perl, yacc, flex
+, texinfo ? null, perlPackages
 
 # Optional Dependencies
 , openldap ? null, libcap_ng ? null, sqlite ? null, openssl ? null, db ? null
 , readline ? null, libedit ? null, pam ? null
 
-#, readline, openldap, libcap_ng
-#, sqlite, db, ncurses, openssl, cyrus_sasl
+# Extra Args
+, prefix ? ""
 }:
 
 with stdenv;
-with stdenv.lib;
 let
-  optOpenldap = shouldUsePkg openldap;
+  libOnly = prefix == "lib";
+
+  optTexinfo = if libOnly then null else shouldUsePkg texinfo;
+  optOpenldap = if libOnly then null else shouldUsePkg openldap;
   optLibcap_ng = shouldUsePkg libcap_ng;
   optSqlite = shouldUsePkg sqlite;
   optOpenssl = shouldUsePkg openssl;
   optDb = shouldUsePkg db;
   optReadline = shouldUsePkg readline;
   optLibedit = shouldUsePkg libedit;
-  optPam = shouldUsePkg pam;
-in
-stdenv.mkDerivation rec {
-  name = "heimdal-1.5.3";
+  optPam = if libOnly then null else shouldUsePkg pam;
 
-  src = fetchurl {
-    urls = [
-      "http://www.h5l.org/dist/src/${name}.tar.gz"
-      "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz"
-    ];
-    sha256 = "19gypf9vzfrs2bw231qljfl4cqc1riyg0ai0xmm1nd1wngnpphma";
+  lineParserStr = if optLibedit != null then "libedit"
+    else if optReadline != null then "readline"
+    else "no";
+
+  lineParserInputs = {
+    "libedit" = [ optLibedit ];
+    "readline" = [ optReadline ];
+    "no" = [ ];
+  }.${lineParserStr};
+in
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "${prefix}heimdal-${version}";
+  version = "2015-05-26";
+
+  src = fetchFromGitHub {
+    owner = "heimdal";
+    repo = "heimdal";
+    rev = "50e2a5ce95f42d4963d359c27a832e61991a12b1";
+    sha256 = "10104vm192r1i7ccs1fan16h9n31saaswsmywmrb0cxc7jv3rj8x";
   };
 
-  nativeBuildInputs = [ pkgconfig flex yacc ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig python perl yacc flex optTexinfo ]
+    ++ (with perlPackages; [ JSON ]);
   buildInputs = [
-    optOpenldap optLibcap_ng optSqlite optOpenssl optDb optReadline optLibedit
-    optPam
-  ];
+    optOpenldap optLibcap_ng optSqlite optOpenssl optDb optPam
+  ] ++ lineParserInputs;
 
   configureFlags = [
-    (mkOther                         "sysconfdir"            "/etc")
-    (mkOther                         "localstatedir"         "/var")
-    (mkWith   (optOpenldap != null)  "openldap"              optOpenldap)
-    (mkEnable (optOpenldap != null)  "hdb-openldap-module"   null)
-    (mkEnable true                   "pk-init"               null)
-    (mkEnable true                   "digest"                null)
-    (mkEnable true                   "kx509"                 null)
-    (mkWith   (optLibcap_ng != null) "capng"                 null)
-    (mkWith   (optSqlite != null)    "sqlite3"               sqlite)
-    (mkEnable (optSqlite != null)    "sqlite-cache"          null)
-    (mkWith   false                  "libintl"               null)               # TODO libintl fix
-    (mkWith   true                   "hdbdir"                "/var/lib/heimdal")
-    (mkWith   (optOpenssl != null)   "openssl"               optOpenssl)
-    (mkEnable true                   "pthread-support"       null)
-    (mkEnable false                  "dce"                   null)               # TODO: Add support
-    (mkEnable true                   "afs-support"           null)
-    (mkWith   (optDb != null)        "berkeley-db"           optDb)
-    (mkEnable false                  "nmdb"                  null)
-    (mkEnable false                  "developer"             null)
-    (mkWith   true                   "ipv6"                  null)
-    (mkEnable false                  "socket-wrapper"        null)
-    (mkEnable true                   "otp"                   null)
-    (mkEnable false                  "osfc2"                 null)
-    (mkEnable true                   "mmap"                  null)
-    (mkEnable true                   "afs-string-to-key"     null)
-    (mkWith   (optReadline != null)  "readline"              optReadline)
-    (mkWith   (optLibedit != null)   "libedit"               optLibedit)
-    (mkWith   false                  "x"                     null)
-    (mkEnable true                   "kcm"                   null)
-    (mkEnable true                   "heimdal-documentation" null)
+    (mkOther                                "sysconfdir"            "/etc")
+    (mkOther                                "localstatedir"         "/var")
+    (mkWith   (optOpenldap != null)         "openldap"              optOpenldap)
+    (mkEnable (optOpenldap != null)         "hdb-openldap-module"   null)
+    (mkEnable true                          "pk-init"               null)
+    (mkEnable true                          "digest"                null)
+    (mkEnable true                          "kx509"                 null)
+    (mkWith   (optLibcap_ng != null)        "capng"                 null)
+    (mkWith   (optSqlite != null)           "sqlite3"               sqlite)
+    (mkEnable (optSqlite != null)           "sqlite-cache"          null)
+    (mkWith   false                         "libintl"               null)               # TODO libintl fix
+    (mkWith   true                          "hdbdir"                "/var/lib/heimdal")
+    (mkEnable false                         "dce"                   null)               # TODO: Add support
+    (mkEnable (!libOnly)                    "afs-support"           null)
+    (mkEnable true                          "mmap"                  null)
+    (mkEnable (!libOnly)                    "afs-string-to-key"     null)
+    (mkWith   (lineParserStr == "readline") "readline"              optReadline)
+    (mkWith   (lineParserStr == "libedit")  "libedit"               optLibedit)
+    (mkWith   false                         "hesiod"                null)
+    (mkEnable (!libOnly)                    "kcm"                   null)
+    (mkEnable (optTexinfo != null)          "heimdal-documentation" null)
+    (mkWith   true                          "ipv6"                  null)
+    (mkEnable true                          "pthread-support"       null)
+    (mkEnable false                         "osfc2"                 null)
+    (mkEnable false                         "socket-wrapper"        null)
+    (mkEnable (!libOnly)                    "otp"                   null)
+    (mkEnable false                         "developer"             null)
+    (mkWith   (optDb != null)               "berkeley-db"           optDb)
+    (mkEnable true                          "ndbm-db"               null)
+    (mkEnable false                         "mdb-db"                null)
+    (mkWith   (optOpenssl != null)          "openssl"               optOpenssl)
   ];
 
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -pthread"
+  buildPhase = optionalString libOnly ''
+    (cd include; make -j $NIX_BUILD_CORES)
+    (cd lib; make -j $NIX_BUILD_CORES)
+    (cd tools; make -j $NIX_BUILD_CORES)
+    (cd include/hcrypto; make -j $NIX_BUILD_CORES)
+    (cd lib/hcrypto; make -j $NIX_BUILD_CORES)
+  '';
+
+  installPhase = optionalString libOnly ''
+    (cd include; make -j $NIX_BUILD_CORES install)
+    (cd lib; make -j $NIX_BUILD_CORES install)
+    (cd tools; make -j $NIX_BUILD_CORES install)
+    (cd include/hcrypto; make -j $NIX_BUILD_CORES install)
+    (cd lib/hcrypto; make -j $NIX_BUILD_CORES install)
+    rm -rf $out/{libexec,sbin,share}
+    find $out/bin -type f | grep -v 'krb5-config' | xargs rm
   '';
 
   # We need to build hcrypt for applications like samba
   postBuild = ''
-    (cd lib/hcrypto; make)
-    (cd include/hcrypto; make)
+    (cd include/hcrypto; make -j $NIX_BUILD_CORES)
+    (cd lib/hcrypto; make -j $NIX_BUILD_CORES)
   '';
 
   postInstall = ''
     # Install hcrypto
-    (cd lib/hcrypto; make install)
-    (cd include/hcrypto; make install)
+    (cd include/hcrypto; make -j $NIX_BUILD_CORES install)
+    (cd lib/hcrypto; make -j $NIX_BUILD_CORES install)
 
     # Doesn't succeed with --libexec=$out/sbin, so
     mv "$out/libexec/"* $out/sbin/
     rmdir $out/libexec
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "an implementation of Kerberos 5 (and some more stuff) largely written in Sweden";
     license = licenses.bsd3;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bee00851e6..cbac4657cf2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6333,6 +6333,9 @@ let
   kerberos = libkrb5;
 
   heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
+  libheimdal = heimdal.override {
+    prefix = "lib";
+  };
 
   harfbuzz = callPackage ../development/libraries/harfbuzz { };
   harfbuzz-icu = callPackage ../development/libraries/harfbuzz {

From 06c9915ed1db6ab505b869d240f75a6d53f2fcc9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 00:46:32 -0700
Subject: [PATCH 0451/2322] Use libheimdal instead of heimdal

---
 pkgs/development/libraries/libssh/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 8ea2ac72da0..a9117556a7f 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, cmake
 
 # Optional Dependencies
-, heimdal ? null, zlib ? null, libsodium ? null
+, libheimdal ? null, zlib ? null, libsodium ? null
 
 # Crypto Dependencies
 , openssl ? null, libgcrypt ? null
@@ -19,7 +19,7 @@ let
     none = null;
   }.${cryptoStr};
 
-  optHeimdal = shouldUsePkg heimdal;
+  optLibheimdal = shouldUsePkg libheimdal;
   optZlib = shouldUsePkg zlib;
   optLibsodium = shouldUsePkg libsodium;
 in
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   '';
 
   cmakeFlags = [
-    "-DWITH_GSSAPI=${if optHeimdal != null then "ON" else "OFF"}"
+    "-DWITH_GSSAPI=${if optLibheimdal != null then "ON" else "OFF"}"
     "-DWITH_ZLIB=${if optZlib != null then "ON" else "OFF"}"
     "-DWITH_SSH1=OFF"
     "-DWITH_SFTP=ON"
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ pkgconfig cmake ];
-  buildInputs = [ optHeimdal optZlib optLibsodium crypto ];
+  buildInputs = [ optLibheimdal optZlib optLibsodium crypto ];
 
   meta = with stdenv.lib; {
     description = "SSH client library";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cbac4657cf2..afe7947e4f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8973,7 +8973,7 @@ let
 
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
-    kerberos = heimdal;
+    kerberos = libheimdal;
     gnutls = gnutls33;
     cups = if stdenv.isDarwin then null else cups;
     pam = if stdenv.isDarwin then null else pam;

From 6b17264e08eaa96d0a1b24f635769ea80d4e8b16 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 10:53:57 -0700
Subject: [PATCH 0452/2322] samba: Use built in kerberos

---
 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 afe7947e4f1..4f6b4990286 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8973,7 +8973,8 @@ let
 
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
-    kerberos = libheimdal;
+    # Samba is tightly coupled to kerberos so let it provide its own
+    kerberos = null;
     gnutls = gnutls33;
     cups = if stdenv.isDarwin then null else cups;
     pam = if stdenv.isDarwin then null else pam;

From 7b1336d2f122dc67c27786eb8122afb4a185f839 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 15:21:22 -0700
Subject: [PATCH 0453/2322] heimdal: Remove more references

---
 pkgs/applications/networking/browsers/firefox-bin/default.nix | 4 ++--
 pkgs/applications/office/zotero/firefox-bin/default.nix       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 998ea95e8da..4da970528d5 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -30,7 +30,7 @@
 , nspr
 , nss
 , pango
-, heimdal
+, libheimdal
 , libpulseaudio
 , systemd
 }:
@@ -102,7 +102,7 @@ stdenv.mkDerivation {
       nspr
       nss
       pango
-      heimdal
+      libheimdal
       libpulseaudio
       systemd
     ] + ":" + stdenv.lib.makeSearchPath "lib64" [
diff --git a/pkgs/applications/office/zotero/firefox-bin/default.nix b/pkgs/applications/office/zotero/firefox-bin/default.nix
index 52751908fa7..edf56c3eb4d 100644
--- a/pkgs/applications/office/zotero/firefox-bin/default.nix
+++ b/pkgs/applications/office/zotero/firefox-bin/default.nix
@@ -30,7 +30,7 @@
 , nspr
 , nss
 , pango
-, heimdal
+, libheimdal
 , libpulseaudio
 , systemd
 }:
@@ -102,7 +102,7 @@ stdenv.mkDerivation {
       nspr
       nss
       pango
-      heimdal
+      libheimdal
       libpulseaudio
       systemd
     ] + ":" + stdenv.lib.makeSearchPath "lib64" [

From 5483697ab1d6dae2bc730946f368ee69b754e39f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 15:29:53 -0700
Subject: [PATCH 0454/2322] nss: 3.19 -> 3.19.1

---
 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 1b889c472f3..037ab3c03c0 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.19";
+  version = "3.19.1";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_RTM/src/${name}.tar.gz";
-    sha256 = "989ebdf79374f24181f060d332445b1a4baf3df39d08514c4349ba8573cefa9b";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_1_RTM/src/${name}.tar.gz";
+    sha256 = "b7be709551ec13206d8e3e8c065b894fa981c11573115e9478fa051029c52fff";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];

From b5019ffd72b9352c92727e161aa617ddc9480d41 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Sat, 30 May 2015 00:53:22 +0200
Subject: [PATCH 0455/2322] vdirsyncer: Use python2 instead of python3

---
 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 5ed23b48983..274a764af55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12432,9 +12432,7 @@ let
 
   vcprompt = callPackage ../applications/version-management/vcprompt { };
 
- vdirsyncer = callPackage ../tools/misc/vdirsyncer {
-   pythonPackages = python3Packages;
- };
+  vdirsyncer = callPackage ../tools/misc/vdirsyncer { };
 
   vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
 

From 2a0b05a238ad658dfec68d14ce5a55b9b58643cd Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Sat, 30 May 2015 01:03:48 +0200
Subject: [PATCH 0456/2322] vdirsyncer: Propagate dependencies and use
 requests2

---
 pkgs/tools/misc/vdirsyncer/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 5312445563a..bd3716af2b2 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -10,10 +10,9 @@ pythonPackages.buildPythonPackage rec {
     sha256 = "0jrxmq8lq0dvqflmh42hhyvc3jjrg1cg3gzfhdcsskj9zz0m6wai";
   };
 
-  pythonPath = with pythonPackages; [
+  propagatedBuildInputs = with pythonPackages; [
     icalendar
     click
-    requests
     lxml
     setuptools
     requests_toolbelt

From 446c9fefffd2de6c62c254b249d927d6ad16114f Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Sat, 30 May 2015 01:04:56 +0200
Subject: [PATCH 0457/2322] khal: Add sqlite3 to dependencies

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

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 85720f64483..4d09951060f 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -22,6 +22,7 @@ pythonPackages.buildPythonPackage rec {
     requests_toolbelt
     tzlocal
     urwid
+    python.modules.sqlite3
   ];
 
   meta = {

From afa5859716914cce8e3d8b13a6692c100bd96723 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 16:08:27 -0700
Subject: [PATCH 0458/2322] openssl: Cleanup some old, untested patches

---
 .../openssl/cert-file-path-max.patch          | 34 ----------------
 .../libraries/openssl/cert-file.patch         | 39 -------------------
 .../development/libraries/openssl/default.nix | 25 +-----------
 pkgs/development/libraries/openssl/gnu.patch  | 25 ------------
 .../libraries/openssl/hurd-target.patch       | 12 ------
 .../libraries/openssl/kfreebsd-gnu.patch      | 36 -----------------
 6 files changed, 1 insertion(+), 170 deletions(-)
 delete mode 100644 pkgs/development/libraries/openssl/cert-file-path-max.patch
 delete mode 100644 pkgs/development/libraries/openssl/cert-file.patch
 delete mode 100644 pkgs/development/libraries/openssl/gnu.patch
 delete mode 100644 pkgs/development/libraries/openssl/hurd-target.patch
 delete mode 100644 pkgs/development/libraries/openssl/kfreebsd-gnu.patch

diff --git a/pkgs/development/libraries/openssl/cert-file-path-max.patch b/pkgs/development/libraries/openssl/cert-file-path-max.patch
deleted file mode 100644
index 50621c5cb82..00000000000
--- a/pkgs/development/libraries/openssl/cert-file-path-max.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-This patch, to be applied after `cert-file.patch', fixes compilation
-on GNU/Hurd where `PATH_MAX' is not defined.
-
-diff -ubB --show-c-function openssl-1.0.0e/crypto/x509/x509_def.c.orig openssl-1.0.0e/crypto/x509/x509_def.c
---- openssl-1.0.0e/crypto/x509/x509_def.c.orig	2012-01-06 00:08:48.000000000 +0100
-+++ openssl-1.0.0e/crypto/x509/x509_def.c	2012-01-06 00:11:29.000000000 +0100
-@@ -58,6 +58,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <limits.h>
- #include <unistd.h>
- #include <sys/types.h>
-@@ -76,14 +77,16 @@ const char *X509_get_default_cert_dir(vo
- 
- const char *X509_get_default_cert_file(void)
- 	{
--	static char buf[PATH_MAX] = X509_CERT_FILE;
-+	static char *buf;
- 	static int init = 0;
- 	if (!init) {
- 	    init = 1;
- 	    char * s = getenv("OPENSSL_X509_CERT_FILE");
- 	    if (s && getuid() == geteuid()) {
--		strncpy(buf, s, sizeof(buf));
--		buf[sizeof(buf) - 1] = 0;
-+	         buf = strdup(s);
-+	    }
-+	    if (!s) {
-+	         buf = strdup(X509_CERT_FILE);
- 	    }
- 	}
- 	return buf;
diff --git a/pkgs/development/libraries/openssl/cert-file.patch b/pkgs/development/libraries/openssl/cert-file.patch
deleted file mode 100644
index e6e66111201..00000000000
--- a/pkgs/development/libraries/openssl/cert-file.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ru openssl-1.0.1m-orig/crypto/x509/x509_def.c openssl-1.0.1m/crypto/x509/x509_def.c
---- openssl-1.0.1m-orig/crypto/x509/x509_def.c	2015-03-19 14:19:00.000000000 +0100
-+++ openssl-1.0.1m/crypto/x509/x509_def.c	2015-03-19 15:50:44.676683616 +0100
-@@ -57,6 +57,10 @@
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <unistd.h>
-+#include <sys/types.h>
- #include "cryptlib.h"
- #include <openssl/crypto.h>
- #include <openssl/x509.h>
-@@ -78,7 +82,23 @@
- 
- const char *X509_get_default_cert_file(void)
- {
--    return (X509_CERT_FILE);
-+    static char buf[PATH_MAX] = X509_CERT_FILE;
-+    static int init = 0;
-+    if (!init) {
-+        init = 1;
-+        char * s = getenv("OPENSSL_X509_CERT_FILE");
-+        if (s) {
-+#ifndef OPENSSL_SYS_WINDOWS
-+            if (getuid() == geteuid()) {
-+#endif
-+                strncpy(buf, s, sizeof(buf));
-+                buf[sizeof(buf) - 1] = 0;
-+#ifndef OPENSSL_SYS_WINDOWS
-+            }
-+#endif
-+        }
-+    }
-+    return buf;
- }
- 
- const char *X509_get_default_cert_dir_env(void)
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 7f428fd584b..68ddcb68f47 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -10,30 +10,7 @@ let
 
   patchesCross = isCross: let
     isDarwin = stdenv.isDarwin || (isCross && stdenv.cross.libc == "libSystem");
-  in
-    [ # Allow the location of the X509 certificate file (the CA
-      # bundle) to be set through the environment variable
-      # ‘OPENSSL_X509_CERT_FILE’.  This is necessary because the
-      # default location ($out/ssl/cert.pem) doesn't exist, and
-      # hardcoding something like /etc/ssl/cert.pem is impure and
-      # cannot be overriden per-process.  For security, the
-      # environment variable is ignored for setuid binaries.
-      # FIXME: drop this patch; it really isn't necessary, because
-      # OpenSSL already supports a ‘SSL_CERT_FILE’ variable.
-      ./cert-file.patch
-    ]
-
-    ++ stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86")
-         [ ./cert-file-path-max.patch # merge with `cert-file.patch' eventually
-           ./gnu.patch                # submitted upstream
-         ]
-
-    ++ stdenv.lib.optionals (stdenv.system == "x86_64-kfreebsd-gnu")
-        [ ./gnu.patch
-          ./kfreebsd-gnu.patch
-        ]
-
-    ++ stdenv.lib.optional isDarwin ./darwin-arch.patch;
+  in stdenv.lib.optional isDarwin ./darwin-arch.patch;
 
   extraPatches = stdenv.lib.optional stdenv.isCygwin ./1.0.1-cygwin64.patch;
 in
diff --git a/pkgs/development/libraries/openssl/gnu.patch b/pkgs/development/libraries/openssl/gnu.patch
deleted file mode 100644
index 3cc6d049c94..00000000000
--- a/pkgs/development/libraries/openssl/gnu.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Patch to fix compilation on GNU/Hurd and GNU/kFreeBSD.
-
---- openssl-1.0.0e/Configure	2012-01-06 00:39:49.000000000 +0100
-+++ openssl-1.0.0e/Configure	2012-01-06 00:39:51.000000000 +0100
-@@ -563,7 +563,7 @@ my %table=(
- "newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",
- 
- ##### GNU Hurd
--"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
-+"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- 
- ##### OS/2 EMX
- "OS2-EMX", "gcc::::::::",
-
---- openssl-1.0.0e/crypto/dso/dso_dlfcn.c	2012-01-06 00:05:47.000000000 +0100
-+++ openssl-1.0.0e/crypto/dso/dso_dlfcn.c	2012-01-06 00:21:05.000000000 +0100
-@@ -60,7 +60,7 @@
-    that handle _GNU_SOURCE and other similar macros.  Defining it later
-    is simply too late, because those headers are protected from re-
-    inclusion.  */
--#ifdef __linux
-+#if defined __linux || defined __GNU__ || defined __GLIBC__
- # ifndef _GNU_SOURCE
- #  define _GNU_SOURCE	/* make sure dladdr is declared */
- # endif
diff --git a/pkgs/development/libraries/openssl/hurd-target.patch b/pkgs/development/libraries/openssl/hurd-target.patch
deleted file mode 100644
index 399a37a69ed..00000000000
--- a/pkgs/development/libraries/openssl/hurd-target.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur openssl-1.0.0d-orig/Configure openssl-1.0.0d/Configure
---- openssl-1.0.0d-orig/Configure	2010-11-30 17:19:26.000000000 -0500
-+++ openssl-1.0.0d/Configure	2011-11-16 13:52:57.614416683 -0500
-@@ -563,7 +563,7 @@
- "newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",
- 
- ##### GNU Hurd
--"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
-+"hurd-x86","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mtune=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- 
- ##### OS/2 EMX
- "OS2-EMX", "gcc::::::::",
diff --git a/pkgs/development/libraries/openssl/kfreebsd-gnu.patch b/pkgs/development/libraries/openssl/kfreebsd-gnu.patch
deleted file mode 100644
index 66cedf746ba..00000000000
--- a/pkgs/development/libraries/openssl/kfreebsd-gnu.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Allow compilation on GNU/kFreeBSD.  Ideally, there'd be a single way to process
-all glibc-based system, but the build system is soooo broken.
-
---- openssl-1.0.0i/config
-+++ openssl-1.0.0i/config
-@@ -170,6 +170,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
- 	echo "${MACHINE}-whatever-linux1"; exit 0
- 	;;
- 
-+    GNU/kFreeBSD*)
-+    	echo "kfreebsd-gnu"; exit 0;
-+    	;;
-+
-     GNU*)
- 	echo "hurd-x86"; exit 0;
- 	;;
-@@ -810,6 +814,7 @@ case "$GUESSOS" in
-   beos-*) OUT="$GUESSOS" ;;
-   x86pc-*-qnx6) OUT="QNX6-i386" ;;
-   *-*-qnx6) OUT="QNX6" ;;
-+  kfreebsd-gnu) OUT="kfreebsd-gnu";;
-   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
- esac
- 
-
---- openssl-1.0.0i/Configure
-+++ openssl-1.0.0i/Configure
-@@ -565,6 +565,9 @@ my %table=(
- ##### GNU Hurd
- "hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
- 
-+##### GNU/kFreeBSD on x86_64, copied from "linux-x86_64"
-+"kfreebsd-gnu",	"gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-+
- ##### OS/2 EMX
- "OS2-EMX", "gcc::::::::",

From 2e583a4963f03429ca5984946d1e7cad4326553b Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Sat, 30 May 2015 01:26:29 +0200
Subject: [PATCH 0459/2322] Add jgeerds to maintainers of khal and vdirsyncer

---
 pkgs/applications/misc/khal/default.nix |  7 +++----
 pkgs/tools/misc/vdirsyncer/default.nix  | 11 +++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 4d09951060f..7f7f1308eb1 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -25,11 +25,10 @@ pythonPackages.buildPythonPackage rec {
     python.modules.sqlite3
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://lostpackets.de/khal/;
     description = "CLI calendar application";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ matthiasbeyer jgeerds ];
   };
 }
-
diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index bd3716af2b2..86e424ad08b 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
   version = "0.4.3";
@@ -20,12 +20,11 @@ pythonPackages.buildPythonPackage rec {
     atomicwrites
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/untitaker/vdirsyncer;
     description = "Synchronize calendars and contacts";
-    maintainers = [ lib.maintainers.matthiasbeyer ];
-    platforms = lib.platforms.all;
-    license = lib.licenses.mit;
+    maintainers = with maintainers; [ matthiasbeyer jgeerds ];
+    platforms = platforms.all;
+    license = licenses.mit;
   };
 }
-

From 1a2f179c32cb59b152acc2e71c37c4a2a8a038d1 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Fri, 29 May 2015 17:57:47 -0700
Subject: [PATCH 0460/2322] goPackages.logrus: update to 0.8.2

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a205cb7f8fb..63df1012afd 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1592,7 +1592,7 @@ let
   };
 
   logrus = buildGoPackage rec {
-    rev = "v0.7.3";
+    rev = "v0.8.2";
     name = "logrus-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/Sirupsen/logrus";
 
@@ -1602,7 +1602,7 @@ let
       inherit rev;
       owner = "Sirupsen";
       repo = "logrus";
-      sha256 = "1sxksbarllmqb8wz5b2wbwr6q2i32vqasf7bpz4djywy3ig7jwk8";
+      sha256 = "0isihf185bw54yc72mbkf3cgfh7xj0x8ky04fs52xpj6vrmd72bv";
     };
 
     propagatedBuildInputs = [ airbrake-go bugsnag-go raven-go ];

From 3588cd8c4ebe3d648d5b949e06d78a724543e828 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 20:36:46 -0700
Subject: [PATCH 0461/2322] nixos/pulseaudio: Use libpulseaudio

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

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index c41e4ea604d..04f274e99e1 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -12,7 +12,7 @@ let
 
   # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps
   # using 32bit alsa on 64bit linux.
-  enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.pulseaudio != null);
+  enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.libpulseaudio != null);
 
   ids = config.ids;
 

From 81f705e98c45ca4a3dfb7e5fe16e9b45ced74f0d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 15:52:41 -0700
Subject: [PATCH 0462/2322] ceph: Add development version

---
 pkgs/tools/filesystems/ceph/dev.nix     | 14 +++++++++++++-
 pkgs/tools/filesystems/ceph/generic.nix | 13 ++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)
 mode change 120000 => 100644 pkgs/tools/filesystems/ceph/dev.nix

diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
deleted file mode 120000
index 31d5e95359c..00000000000
--- a/pkgs/tools/filesystems/ceph/dev.nix
+++ /dev/null
@@ -1 +0,0 @@
-0.94.nix
\ No newline at end of file
diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
new file mode 100644
index 00000000000..aec5d35b51a
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/dev.nix
@@ -0,0 +1,13 @@
+{ callPackage, fetchgit, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "9.0.0";
+
+  src = fetchgit {
+    url = "https://github.com/ceph/ceph.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "07x5riqxh2mjcvlblv900vclgh8glnb464s6ssdcgkp31fk1gybg";
+  };
+
+  patches = [ ./fix-pgrefdebugging.patch ];
+})
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 9dbc85a3243..43cbb75de6f 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -63,13 +63,13 @@ let
   hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null;
 
   hasXio = (stdenv.isLinux || stdenv.isFreeBSD) &&
-    versionAtLeast version "0.95" &&
+    versionAtLeast version "9.0.0" &&
     optAccelio != null && optLibibverbs != null && optLibrdmacm != null;
 
-  hasRocksdb = versionAtLeast version "0.95" && optRocksdb != null;
+  hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null;
 
   # TODO: Reenable when kinetic support is fixed
-  #hasKinetic = versionAtLeast version "0.95" && optKinetic-cpp-client != null;
+  #hasKinetic = versionAtLeast version "9.0.0" && optKinetic-cpp-client != null;
   hasKinetic = false;
 
   # Malloc implementation (can be jemalloc, tcmalloc or null)
@@ -124,6 +124,9 @@ stdenv.mkDerivation {
 
     # Fix seagate kinetic linking
     sed -i 's,libcrypto.a,-lcrypto,g' src/os/Makefile.am
+  '' + optionalString (versionAtLeast version "9.0.0") ''
+    # Fix gmock
+    patchShebangs src/gmock
   '';
 
   preConfigure = ''
@@ -186,6 +189,10 @@ stdenv.mkDerivation {
     (mkWith   false                        "valgrind"          null)
   ];
 
+  preBuild = optionalString (versionAtLeast version "9.0.0") ''
+    (cd src/gmock; make -j $NIX_BUILD_CORES)
+  '';
+
   installFlags = [ "sysconfdir=\${out}/etc" ];
 
   outputs = [ "out" "lib" ];

From 2154348ba0285b243a143114d87751ef744cfdc2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 15:56:28 -0700
Subject: [PATCH 0463/2322] ceph: Update git

---
 pkgs/tools/filesystems/ceph/generic.nix | 72 +++++++++++++------------
 pkgs/tools/filesystems/ceph/git.nix     |  6 +--
 2 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 43cbb75de6f..056440d4afe 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -98,7 +98,8 @@ stdenv.mkDerivation {
     ./0001-Makefile-env-Don-t-force-sbin.patch
   ];
 
-  nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ];
+  nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]
+    ++ optionals (versionAtLeast version "10.0.0") [ pythonPackages.setuptools ];
   buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
     boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib
   ] ++ optional (versionAtLeast version "9.0.0") [
@@ -151,42 +152,43 @@ stdenv.mkDerivation {
     "--libdir=\${lib}/lib"
     "--includedir=\${lib}/include"
 
-    (mkWith   true                         "rbd"               null)
-    (mkWith   true                         "cephfs"            null)
-    (mkWith   hasRadosgw                   "radosgw"           null)
-    (mkWith   true                         "radosstriper"      null)
-    (mkWith   hasServer                    "mon"               null)
-    (mkWith   hasServer                    "osd"               null)
-    (mkWith   hasServer                    "mds"               null)
-    (mkEnable true                         "client"            null)
-    (mkEnable hasServer                    "server"            null)
-    (mkWith   (cryptoStr == "cryptopp")    "cryptopp"          null)
-    (mkWith   (cryptoStr == "nss")         "nss"               null)
-    (mkEnable false                        "root-make-check"   null)
-    (mkWith   false                        "profiler"          null)
-    (mkWith   false                        "debug"             null)
-    (mkEnable false                        "coverage"          null)
-    (mkWith   (optFuse != null)            "fuse"              null)
-    (mkWith   (malloc == optJemalloc)      "jemalloc"          null)
-    (mkWith   (malloc == optGperftools)    "tcmalloc"          null)
-    (mkEnable false                        "pgrefdebugging"    null)
-    (mkEnable false                        "cephfs-java"       null)
-    (mkEnable hasXio                       "xio"               null)
-    (mkWith   (optLibatomic_ops != null)   "libatomic-ops"     null)
-    (mkWith   true                         "ocf"               null)
-    (mkWith   hasKinetic                   "kinetic"           null)
-    (mkWith   hasRocksdb                   "librocksdb"        null)
-    (mkWith   false                        "librocksdb-static" null)
-    (mkWith   (optLibs3 != null)           "system-libs3"      null)
-    (mkWith   true                         "rest-bench"        null)
+    (mkWith   true                         "rbd"                 null)
+    (mkWith   true                         "cephfs"              null)
+    (mkWith   hasRadosgw                   "radosgw"             null)
+    (mkWith   true                         "radosstriper"        null)
+    (mkWith   hasServer                    "mon"                 null)
+    (mkWith   hasServer                    "osd"                 null)
+    (mkWith   hasServer                    "mds"                 null)
+    (mkEnable true                         "client"              null)
+    (mkEnable hasServer                    "server"              null)
+    (mkWith   (cryptoStr == "cryptopp")    "cryptopp"            null)
+    (mkWith   (cryptoStr == "nss")         "nss"                 null)
+    (mkEnable false                        "root-make-check"     null)
+    (mkWith   false                        "profiler"            null)
+    (mkWith   false                        "debug"               null)
+    (mkEnable false                        "coverage"            null)
+    (mkWith   (optFuse != null)            "fuse"                null)
+    (mkWith   (malloc == optJemalloc)      "jemalloc"            null)
+    (mkWith   (malloc == optGperftools)    "tcmalloc"            null)
+    (mkEnable false                        "pgrefdebugging"      null)
+    (mkEnable false                        "cephfs-java"         null)
+    (mkEnable hasXio                       "xio"                 null)
+    (mkWith   (optLibatomic_ops != null)   "libatomic-ops"       null)
+    (mkWith   true                         "ocf"                 null)
+    (mkWith   hasKinetic                   "kinetic"             null)
+    (mkWith   hasRocksdb                   "librocksdb"          null)
+    (mkWith   false                        "librocksdb-static"   null)
+    (mkWith   (optLibs3 != null)           "system-libs3"        null)
+    (mkWith   true                         "rest-bench"          null)
   ] ++ optional stdenv.isLinux [
-    (mkWith   (optLibaio != null)             "libaio"            null)
-    (mkWith   (optLibxfs != null)             "libxfs"            null)
-    (mkWith   (optZfs != null)                "libzfs"            null)
+    (mkWith   (optLibaio != null)          "libaio"              null)
+    (mkWith   (optLibxfs != null)          "libxfs"              null)
+    (mkWith   (optZfs != null)             "libzfs"              null)
   ] ++ optional (versionAtLeast version "10.0.0") [
-    (mkWith   true                         "man-pages"         null)
-    (mkWith   false                        "tcmalloc-minimal"  null)
-    (mkWith   false                        "valgrind"          null)
+    (mkWith   true                         "man-pages"           null)
+    (mkWith   false                        "tcmalloc-minimal"    null)
+    (mkWith   false                        "valgrind"            null)
+    (mkWith   true                         "systemd-libexec-dir" "\${TMPDIR}")
   ];
 
   preBuild = optionalString (versionAtLeast version "9.0.0") ''
diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
index 8aa4bbd34bb..c964548b65e 100644
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ b/pkgs/tools/filesystems/ceph/git.nix
@@ -1,11 +1,11 @@
 { callPackage, fetchgit, git, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-04-22";
+  version = "2015-05-29";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
-    rev = "89262abc53e324f3ef4d504473a4f1d6eb337c20";
-    sha256 = "0d6hlk1nwgx9cdhvppggz6sbjc1jl8j26l9739qspw1sviac5lcb";
+    rev = "64096b870960d021ab5001b6a5cf3a999a9abeb7";
+    sha256 = "18lcn4misyvgjh7r0vkal480x23yr8pcjwzl4k4hbrpqmm97znp9";
   };
 })

From da4177c36ebe975f482bee9b4c4f3d2a7a81e045 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 29 May 2015 20:50:40 -0700
Subject: [PATCH 0464/2322] libpulse: Use glib

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

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 784b5a2ce94..3930c45a097 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -30,7 +30,7 @@ let
   optCoreaudio = if libOnly then null else shouldUsePkg coreaudio;
   optAlsaLib = if libOnly then null else shouldUsePkg alsaLib;
   optEsound = if libOnly then null else shouldUsePkg esound;
-  optGlib = if libOnly then null else shouldUsePkg glib;
+  optGlib = shouldUsePkg glib;
   optGtk3 = if libOnly || !hasXlibs then null else shouldUsePkg gtk3;
   optGconf = if libOnly then null else shouldUsePkg gconf;
   optAvahi = if libOnly then null else shouldUsePkg avahi;

From 292abec58e5c194c7f54566f19c1a39d65eeda8c Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Thu, 28 May 2015 00:24:06 +0200
Subject: [PATCH 0465/2322] mod-distortion init at git-2015-05-18

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

diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix
new file mode 100644
index 00000000000..7b17f21b613
--- /dev/null
+++ b/pkgs/applications/audio/mod-distortion/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, lv2 }:
+
+stdenv.mkDerivation rec {
+  name = "mod-distortion-${version}";
+  version = "git-2015-05-18";
+
+  src = fetchFromGitHub {
+    owner = "portalmod";
+    repo = "mod-distortion";
+    rev = "0cdf186abc2a9275890b57057faf5c3f6d86d84a";
+    sha256 = "1wmxgpcdcy9m7j78yq85824if0wz49wv7mw13bj3sw2s87dcmw19";
+  };
+
+  buildInputs = [ lv2 ];
+
+  installFlags = [ "LV2_PATH=$out/lib/lv2" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/portalmod/mod-distortion;
+    description = "Analog distortion emulation lv2 plugins";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c675ec1523..ea6c9a75e78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11749,6 +11749,8 @@ let
 
   moc = callPackage ../applications/audio/moc { };
 
+  mod-distortion = callPackage ../applications/audio/mod-distortion { };
+
   monero = callPackage ../applications/misc/monero { };
 
   monkeysAudio = callPackage ../applications/audio/monkeys-audio { };

From 12bfdb5ead03c9e889e303c3360e01f00546d416 Mon Sep 17 00:00:00 2001
From: _1126 <mail@elfsechsundzwanzig.de>
Date: Sat, 30 May 2015 10:44:47 +0200
Subject: [PATCH 0466/2322] rofi-pass: add rofi to deps, adjust description

---
 pkgs/applications/misc/rofi/pass.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix
index 791cd995adb..e20c511be91 100644
--- a/pkgs/applications/misc/rofi/pass.nix
+++ b/pkgs/applications/misc/rofi/pass.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, wmctrl, xprop, xdotool}:
+{ stdenv, fetchgit, rofi, wmctrl, xprop, xdotool}:
 
 stdenv.mkDerivation rec {
   name = "rofi-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "17k9jmmckqaw75i0qsay2gc8mrjrs6jjfwfxaggspj912sflmjng";
   };
 
-  buildInputs = [ wmctrl xprop xdotool ];
+  buildInputs = [ rofi wmctrl xprop xdotool ];
 
   dontBuild = true;
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-      description = "Rofi script to work with password-store";
+      description = "A script to make rofi work with password-store";
       homepage = https://github.com/carnager/rofi-pass;
       maintainers = [stdenv.lib.maintainers._1126];
   };

From 1ed1c3ec929fc9160e20e78e5ad32cdb2cadfa9c Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Thu, 28 May 2015 03:02:01 +0200
Subject: [PATCH 0467/2322] ardour: give it all the libs it asks for. ardour3:
 bugfix

The latest ardour3 release loses audio and midi
files under some conditions.
https://github.com/Ardour/ardour/commit/7024232855d268633760674d34c096ce447b7240
fixes that.
---
 pkgs/applications/audio/ardour/ardour3.nix | 42 +++++++++++-----------
 pkgs/applications/audio/ardour/default.nix | 35 +++++++-----------
 pkgs/top-level/all-packages.nix            |  1 +
 3 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix
index b6d1ce5bd5b..aca04f299c2 100644
--- a/pkgs/applications/audio/ardour/ardour3.nix
+++ b/pkgs/applications/audio/ardour/ardour3.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw
-, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2
+{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw
+, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, jack2
 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
-, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
-, perl, pkgconfig, python, serd, sord, sratom, suil }:
+, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango
+, perl, pkgconfig, python, rubberband, serd, sord-svn, sratom, suil, taglib, vampSDK }:
 
 let
 
@@ -15,49 +15,49 @@ let
   # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
 
   # Version to build.
-  tag = "3.5.403";
+  #tag = "3.5.403";
 
   # Version info that is built into the binary. Keep in sync with 'tag'. The
   # last 8 digits is a (fake) commit id.
-  revision = "3.5-403-00000000";
+  revision = "3.5-4539-g7024232";
 
+  # temporarily use a non tagged version, because 3.5.403 has a bug that
+  # causes loss of audio-files,  and it was decided that there won't be a
+  # hotfix release, and we should use 4.0 when it comes out.
+  # more info: http://comments.gmane.org/gmane.comp.audio.ardour.user/13665
+
+  version = "2015-02-20";
 in
 
 stdenv.mkDerivation rec {
-  name = "ardour-${tag}";
+  name = "ardour3-git-${version}";
 
   src = fetchgit {
     url = git://git.ardour.org/ardour/ardour.git;
-    rev = "refs/tags/${tag}";
-    sha256 = "0k1z8sbjf88dqn12kf9cykrqj38vkr879n2g6b4adk6cghn8wz3x";
+    rev = "7024232855d268633760674d34c096ce447b7240";
+    sha256 = "ede3730455c3c91b2fd612871fa7262bdacd3dff4ba77c5dfbc3c1f0de9b8a36";
   };
 
   buildInputs = 
-    [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
-      glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
+    [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc
+      glibmm graphviz gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
       libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
-      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
-      makeWrapper pango perl pkgconfig python serd sord sratom suil
+      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2
+      makeWrapper pango perl pkgconfig python rubberband serd sord-svn sratom suil taglib vampSDK
     ];
 
   patchPhase = ''
     printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
     sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
-    sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
-    sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
+    patchShebangs ./tools/
   '';
 
-  configurePhase = "python waf configure --optimize --prefix=$out";
+  configurePhase = "python waf configure --optimize --docs --with-backends=jack,alsa --prefix=$out";
 
   buildPhase = "python waf";
 
-  # For the custom ardour clearlooks gtk-engine to work, it must be
-  # moved to a directory called "engines" and added to GTK_PATH
   installPhase = ''
     python waf install
-    mkdir -pv $out/gtk2/engines
-    cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/
-    wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2
 
     # Install desktop file
     mkdir -p "$out/share/applications"
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 21dc1d70407..280cf6e8042 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -1,11 +1,9 @@
-{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, dbus, fftw
-, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2
+{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw
+, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, jack2
 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
-, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
-, perl, pkgconfig, python, rubberband, serd, sord, sratom, suil, taglib
-, vampSDK
-}:
+, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango
+, perl, pkgconfig, python, rubberband, serd, sord-svn, sratom, suil, taglib, vampSDK }:
 
 let
 
@@ -34,33 +32,26 @@ stdenv.mkDerivation rec {
     sha256 = "396668fb9116a68f5079f0d880930e890fd0cdf7ee5f3b97fcf44b88cf840b4c";
   };
 
-  buildInputs = [
-    alsaLib aubio boost cairomm curl dbus fftw fftwSinglePrec flac
-    glibc glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
-    libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
-    libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
-    makeWrapper pango perl pkgconfig python rubberband serd sord
-    sratom suil taglib vampSDK
-  ];
+  buildInputs = 
+    [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc
+      glibmm graphviz gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
+      libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
+      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2
+      makeWrapper pango perl pkgconfig python rubberband serd sord-svn sratom suil taglib vampSDK
+    ];
 
   patchPhase = ''
     printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
     sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
-    sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
-    sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
+    patchShebangs ./tools/
   '';
 
-  configurePhase = "python waf configure --with-backend=alsa,jack --optimize --prefix=$out";
+  configurePhase = "python waf configure --optimize --docs --with-backends=jack,alsa --prefix=$out";
 
   buildPhase = "python waf";
 
-  # For the custom ardour clearlooks gtk-engine to work, it must be
-  # moved to a directory called "engines" and added to GTK_PATH
   installPhase = ''
     python waf install
-    mkdir -pv $out/gtk2/engines
-    cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/
-    wrapProgram $out/bin/ardour4 --prefix GTK_PATH : $out/gtk2
 
     # Install desktop file
     mkdir -p "$out/share/applications"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c675ec1523..60e609ad8b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10443,6 +10443,7 @@ let
 
   ardour3 =  callPackage ../applications/audio/ardour/ardour3.nix {
     inherit (gnome) libgnomecanvas libgnomecanvasmm;
+    inherit (vamp) vampSDK;
   };
 
   ardour4 =  callPackage ../applications/audio/ardour {

From 2ee1ab955a2a95ca18657b311832662b851ec8bf Mon Sep 17 00:00:00 2001
From: Siarhei Zirukin <ftrvxmtrx@gmail.com>
Date: Fri, 29 May 2015 21:48:46 +0200
Subject: [PATCH 0468/2322] utf8proc: 1.1.6 -> 1.2

---
 .../libraries/utf8proc/default.nix            | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix
index 8c715fbd928..63de08b46dd 100644
--- a/pkgs/development/libraries/utf8proc/default.nix
+++ b/pkgs/development/libraries/utf8proc/default.nix
@@ -1,25 +1,25 @@
-{ fetchurl, stdenv }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "v1.1.6";
-
   name = "utf8proc-${version}";
+  version = "v1.2";
 
-  src = fetchurl {
-    url = "http://www.public-software-group.org/pub/projects/utf8proc/${version}/utf8proc-${version}.tar.gz";
-    sha256 = "1rwr84pw92ajjlbcxq0da7yxgg3ijngmrj7vhh2qzsr2h2kqzp7y";
+  src = fetchFromGitHub {
+    owner = "JuliaLang";
+    repo = "utf8proc";
+    rev = "${version}";
+    sha256 = "1ryjlcnpfm7fpkq6444ybi576hbnh2l0w7kjhbqady5lxwjyg3pf";
   };
 
   installPhase = ''
-    mkdir -pv $out/lib $out/include
-    cp libutf8proc.so libutf8proc.a $out/lib
-    cp utf8proc.h $out/include
+    make install prefix=$out
   '';
 
-  meta = {
-    description = "A library for processing UTF-8 encoded Unicode strings";
-    homepage = http://www.public-software-group.org/utf8proc;
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.all;
+  meta = with stdenv.lib; {
+    description = "A clean C library for processing UTF-8 Unicode data";
+    homepage = http://julialang.org/utf8proc;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ maintainers.ftrvxmtrx ];
   };
 }

From 24d2849dba5e868617b6d01e4b2a89a3d23daba6 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 30 May 2015 13:45:43 +0200
Subject: [PATCH 0469/2322] gtk-doc: update from 1.23 to 1.24

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

diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index 58c8214bd46..6d93dc6def0 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gtk-doc-${version}";
-  version = "1.23";
+  version = "1.24";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk-doc/${version}/${name}.tar.xz";
-    sha256 = "1i0q0zaj3f2xg478nxyfhaivkhi6mj0dn0s6qzshzhb625qj6p0b";
+    sha256 = "12xmmcnq4138dlbhmqa45wqza8dky4lf856sp80h6xjwl2g7a85l";
   };
 
   # maybe there is a better way to pass the needed dtd and xsl files

From 1d30557516d6287aaf49249ba70214bd794cc41d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 30 May 2015 15:14:10 +0200
Subject: [PATCH 0470/2322] Fixed meta.license: s/licence/license

---
 pkgs/data/fonts/symbola/default.nix            |  2 +-
 pkgs/development/libraries/libpfm/default.nix  | 10 +++++-----
 pkgs/development/tools/toluapp/default.nix     |  2 +-
 pkgs/games/scrolls/default.nix                 |  2 +-
 pkgs/misc/screensavers/rss-glx/default.nix     |  2 +-
 pkgs/os-specific/linux/openvswitch/default.nix |  4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix
index d70fe3ca3f8..390bf9f523a 100644
--- a/pkgs/data/fonts/symbola/default.nix
+++ b/pkgs/data/fonts/symbola/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode";
-    # In lieu of a licence:
+    # In lieu of a license:
     # Fonts in this site are offered free for any use;
     # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed.
     license = stdenv.lib.licenses.free;
diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix
index cbb314a7bb7..c08ff265194 100644
--- a/pkgs/development/libraries/libpfm/default.nix
+++ b/pkgs/development/libraries/libpfm/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Helper library to program the performance monitoring events";
     longDescription = ''
       This package provides a library, called libpfm4 which is used to
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
       events such as those provided by the Performance Monitoring Unit
       (PMU) of modern processors.
     '';
-    licence = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.pierron ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.pierron ];
+    platforms = platforms.all;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix
index 5edc57e2f81..73a8b64ed22 100644
--- a/pkgs/development/tools/toluapp/default.nix
+++ b/pkgs/development/tools/toluapp/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   installPhase = ''scons install'';
 
   meta = {
-    licence = stdenv.lib.licenses.mit;
+    license = stdenv.lib.licenses.mit;
   };
 
 }
diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix
index 899c851c667..da4a34cfec8 100644
--- a/pkgs/games/scrolls/default.nix
+++ b/pkgs/games/scrolls/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
     platforms = [ "x86_64-linux" ];
 
-    licence = stdenv.lib.licenses.unfree;
+    license = stdenv.lib.licenses.unfree;
   };
 
   src = fetchurl {
diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix
index 48d88ed40ce..56d176a710c 100644
--- a/pkgs/misc/screensavers/rss-glx/default.nix
+++ b/pkgs/misc/screensavers/rss-glx/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
       This package currently contains all of the screensavers from the
       original collection, plus a few others.
     '';
-    licence = stdenv.lib.licenses.gpl2;
+    license = stdenv.lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index 67cbbd13826..0e5dbeebf92 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
       --replace "self.cert_dir" "root_prefix + self.cert_dir"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     platforms = platforms.linux;
     description = "A multilayer virtual switch";
     longDescription =
@@ -60,6 +60,6 @@ in stdenv.mkDerivation rec {
       to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
       '';
     homepage = "http://openvswitch.org/";
-    licence = "Apache 2.0";
+    license = licenses.asl20;
   };
 }

From 6732b3b8adbe376c4ecad10193b845286e607f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 May 2015 15:41:34 +0200
Subject: [PATCH 0471/2322] clang-3.4: fix build by adding zlib

I didn't care enough to search for cause of the regression.
---
 pkgs/development/compilers/llvm/3.4/clang.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index cd060e3a65d..51e871f2ca4 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
+{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }:
 
 stdenv.mkDerivation {
   name = "clang-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   patches = [ ./clang-separate-build.patch ./clang-purity.patch ];
 
-  buildInputs = [ cmake libedit libxml2 ];
+  buildInputs = [ cmake libedit libxml2 zlib ];
 
   cmakeFlags = [
     "-DCMAKE_BUILD_TYPE=Release"

From c1f5748983ab0e71af4421030a40ac424e666b45 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 30 May 2015 15:10:30 +0000
Subject: [PATCH 0472/2322] agda: Provide a `.env` like Haskell instead of
 `.extras`

---
 pkgs/build-support/agda/default.nix | 32 ++++++++++++-----------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index 69c4897d1a4..a404bbcf634 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -22,9 +22,6 @@ in
         propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs;
         propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs;
         everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile;
-
-        passthru = { inherit (x) extras; };
-        extras = null;
       };
 
       defaults = self : {
@@ -81,22 +78,19 @@ in
           runHook postInstall
         '';
 
-        # Optionally-built conveniences
-        extras = {
-          # Makes a wrapper available to the user. Very useful in
-          # nix-shell where all dependencies are -i'd.
-          agdaWrapper = writeScriptBin "agda" ''
-            ${self.agdaWithArgs} "$@"
-          '';
-
-          # Use this to stick `agdaWrapper` at the front of the PATH:
-          #
-          # agda.mkDerivation (self: { PATH = self.extras.agdaWrapperPATH; })
-          #
-          # Not sure this is the best way to handle conflicts....
-          agdaWrapperPATH = "${self.extras.agdaWrapper}/bin:$PATH";
-
-          AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda;
+        passthru = {
+          env = stdenv.mkDerivation {
+            name = "interactive-${self.name}";
+            inherit (self) LANG LOCALE_ARCHIVE;
+            AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda;
+            buildInputs = let
+              # Makes a wrapper available to the user. Very useful in
+              # nix-shell where all dependencies are -i'd.
+              agdaWrapper = writeScriptBin "agda" ''
+                ${self.agdaWithArgs} "$@"
+              '';
+            in [agdaWrapper] ++ self.buildDepends;
+          };
         };
       };
     in stdenv.mkDerivation

From 45d859192b8f25fca6a1436bb5b4ad0a7391c2bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 May 2015 17:19:32 +0200
Subject: [PATCH 0473/2322] clutter-gst_3_0: fix build by using newer clutter

---
 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 6c0e785846a..778d011af6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5813,7 +5813,9 @@ let
 
   clutter-gst = callPackage ../development/libraries/clutter-gst { };
 
-  clutter-gst_3_0 = callPackage ../development/libraries/clutter-gst/3.0.nix { };
+  clutter-gst_3_0 = callPackage ../development/libraries/clutter-gst/3.0.nix {
+    clutter = clutter_1_22;
+  };
 
   clutter_gtk = callPackage ../development/libraries/clutter-gtk { };
   clutter_gtk_0_10 = callPackage ../development/libraries/clutter-gtk/0.10.8.nix { };

From 643c5154891032ec66555a43e205f671b84f40b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 May 2015 17:34:25 +0200
Subject: [PATCH 0474/2322] dillo: minor update to fix build (after fltk bump)

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

diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix
index c6c86263888..6760e123ccb 100644
--- a/pkgs/applications/networking/browsers/dillo/default.nix
+++ b/pkgs/applications/networking/browsers/dillo/default.nix
@@ -6,12 +6,12 @@
 , libXcursor, libXi, libXinerama }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.4";
+  version = "3.0.4.1";
   name = "dillo-${version}";
 
   src = fetchurl {
     url = "http://www.dillo.org/download/${name}.tar.bz2";
-    sha256 = "0ffz481vgl7f12f575pmbagm8swgxgv9s9c0p8c7plhd04jsnazf";
+    sha256 = "0iw617nnrz3541jkw5blfdlk4x8jxb382pshi8nfc7xd560c95zd";
   };
 
   buildInputs = with stdenv.lib;

From 080dc99df72072e146e0bbcf6e370cbb18dc2eb5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 30 May 2015 18:06:26 +0200
Subject: [PATCH 0475/2322] torque: update from 4.2.8 to 4.2.10, fixes
 CVE-2014-3684

---
 pkgs/servers/computing/torque/default.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix
index d95e929ff82..6d0037f74bd 100644
--- a/pkgs/servers/computing/torque/default.nix
+++ b/pkgs/servers/computing/torque/default.nix
@@ -1,19 +1,27 @@
-{ stdenv, fetchurl, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux }:
+{ stdenv, fetchurl, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux
+, file, libtool, which }:
 
 stdenv.mkDerivation rec {
-  name = "torque-4.2.8";
+  name = "torque-4.2.10";
 
   src = fetchurl {
     name = "${name}.tar.gz";
-    url = "http://www.adaptivecomputing.com/index.php?wpfb_dl=2730";
-    sha256 = "1sjpvndzm9ccdmfwdf9887ppmapawfsh5qdkzr92kadg5jxp796j";
+    url = "http://www.adaptivecomputing.com/index.php?wpfb_dl=2880";
+    sha256 = "1qpsk3bla6b6m7m0i1xpr183yj79liy3p34xhnz1grgq0776wg5l";
   };
 
-  buildInputs = [ openssl flex bison pkgconfig groff libxml2 utillinux ];
+  buildInputs = [ openssl flex bison pkgconfig groff libxml2 utillinux libtool
+                  which ];
 
   enableParallelBuilding = true;
 
   preConfigure = ''
+   substituteInPlace ./configure \
+     --replace '/usr/bin/file' '${file}/bin/file'
+
+   # fix broken libxml2 detection
+   sed -i '/xmlLib\=/c\xmlLib=xml2' ./configure
+
    for s in fifo cray_t3e dec_cluster msic_cluster sgi_origin umn_cluster; do
      substituteInPlace src/scheduler.cc/samples/$s/Makefile.in \
        --replace "schedprivdir = " "schedprivdir = $out/"

From 5d8981ee4d4c0e7a549c4578a5b8d58b92bad0c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 May 2015 19:16:38 +0200
Subject: [PATCH 0476/2322] opencascade-6.5: work around a build problem

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

diff --git a/pkgs/development/libraries/opencascade/6.5.nix b/pkgs/development/libraries/opencascade/6.5.nix
index b0ef9e83242..4228c285dfd 100644
--- a/pkgs/development/libraries/opencascade/6.5.nix
+++ b/pkgs/development/libraries/opencascade/6.5.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
   # -fpermissive helps building opencascade, although gcc detects a flaw in the code
   # and reports an error otherwise. Further versions may fix that.
   NIX_CFLAGS_COMPILE = "-fpermissive"
+  # https://bugzilla.redhat.com/show_bug.cgi?id=902561
+    + " -DUSE_INTERP_RESULT"
   # https://bugs.freedesktop.org/show_bug.cgi?id=83631
     + " -DGLX_GLXEXT_LEGACY";
 

From 593892a761371f3c7bb28d6118793811ff042ceb Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Sat, 30 May 2015 10:18:54 -0700
Subject: [PATCH 0477/2322] capnproto: bump to 0.5.1.2

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

diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix
index c6bd7e4f4d4..8a67206d5b4 100644
--- a/pkgs/development/libraries/capnproto/default.nix
+++ b/pkgs/development/libraries/capnproto/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "capnproto-${version}";
-  version = "0.5.0";
+  version = "0.5.1.2";
 
   src = fetchurl {
     url = "https://capnproto.org/capnproto-c++-${version}.tar.gz";
-    sha256 = "01fsf60zlyc6rlhnrh8gd9jj5gs52ancb50ml3w7gwq55zgx2rf7";
+    sha256 = "0a89v6sigsyj9vii0d5kqs2fdv73r71f8czzhdvqdvk3p0mlcgx2";
   };
 
   meta = with stdenv.lib; {

From f498d0110e45aef9ce7f2a9b6a4ee6bc67a67a59 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 30 May 2015 16:08:09 +0200
Subject: [PATCH 0478/2322] getdata: update from 0.8.6 to 0.8.8

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

diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix
index 6b53e07acdb..464d2f66e45 100644
--- a/pkgs/development/libraries/getdata/default.nix
+++ b/pkgs/development/libraries/getdata/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "getdata-0.8.6";
+  name = "getdata-0.8.8";
   src = fetchurl {
     url = "mirror://sourceforge/getdata/${name}.tar.bz2";
-    sha256 = "1cxmyqg6m7346q37wrr05zmyip1qcgi4vpy3xki20nxwkaw37lz8";
+    sha256 = "1p5sncbr0bjrx1ki57di0j9rl5ksv0hbfy7bkcb4vaz9z9mrn8xj";
   };
 
   meta = with stdenv.lib; {

From 20a36e412077cf652d17ee7f44f88bb6165e60db Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 30 May 2015 16:08:36 +0200
Subject: [PATCH 0479/2322] netcdf: update from 4.3.2 to 4.3.3.1

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

diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix
index 505c9b5c0d9..9659ae5273d 100644
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/pkgs/development/libraries/netcdf/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl,
-  zlib, hdf5,
+  zlib, hdf5, m4,
   curl # for DAP
 }:
     
 stdenv.mkDerivation rec {
-    name = "netcdf-4.3.2";
+    name = "netcdf-4.3.3.1";
     src = fetchurl {
         url = "http://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz";
-        sha256 = "57086b4383ce9232f05aad70761c2a6034b1a0c040260577d369b3bbfe6d248e";
+        sha256 = "06ds8zm4qvjlqvv4qb637cqr0xgvbhnghrddisad5vj81s5kvpmx";
     };
 
     buildInputs = [
-        zlib hdf5 curl
+        zlib hdf5 m4 curl
     ];
 
     configureFlags = [

From 3c09ff6d1544ddbf6db51977f48f55c4fe75edcb Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 30 May 2015 19:26:53 +0200
Subject: [PATCH 0480/2322] prevent accidentally installing unwrapped steam

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

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 0478e208da2..2f2ce921176 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, traceDeps ? false}:
 
 stdenv.mkDerivation rec {
-  name = "${program}-${version}";
+  name = "${program}-original-${version}";
   program = "steam";
   version = "1.0.0.49";
 

From 6bc372af6900073b077e6fb34f12f60fa0011e78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 May 2015 19:34:55 +0200
Subject: [PATCH 0481/2322] inadyn: fix build and typo in name

/cc maintainer @viric.
---
 pkgs/tools/networking/inadyn/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix
index f95bc49580d..0d9ac7f6475 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/pkgs/tools/networking/inadyn/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, gnutls33 }:
+{ stdenv, fetchFromGitHub, gnutls33, autoreconfHook }:
 
 let
   version = "1.99.13";
 in
 stdenv.mkDerivation {
-  name = "inadny-${version}";
+  name = "inadyn-${version}";
 
   src = fetchFromGitHub {
     repo = "inadyn";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     export makeFlags=prefix=$out
   '';
 
-  buildInputs = [ gnutls33 ];
+  buildInputs = [ gnutls33 autoreconfHook ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
 

From 223cfb82f4063d93bea34076952d8fd335a10ca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 May 2015 19:40:31 +0200
Subject: [PATCH 0482/2322] kde4.libkvkontakte: fix build by using pkgconfig

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

diff --git a/pkgs/development/libraries/libkvkontakte/default.nix b/pkgs/development/libraries/libkvkontakte/default.nix
index a56f5784b4d..2a346abed74 100644
--- a/pkgs/development/libraries/libkvkontakte/default.nix
+++ b/pkgs/development/libraries/libkvkontakte/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, qjson, kdelibs }:
+{ stdenv, fetchgit, pkgconfig, qjson, kdelibs }:
 
 stdenv.mkDerivation {
   name = "libkvkonatkte-1.0-pre20120103";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "0ryvjfrsws845k9s76715xid48y01h0ynb5wdx6ln8cm5z5wqj61";
   };
 
-  buildInputs = [ qjson kdelibs ];
+  buildInputs = [ pkgconfig qjson kdelibs ];
 
   meta = {
     homepage = https://projects.kde.org/projects/extragear/libs/libkvkontakte;

From 35b2be0d24342632bb351d1970770efec88741f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 27 May 2015 10:26:48 +0200
Subject: [PATCH 0483/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/19c8675e5d744065c03f60469d8ea2be0ba83bb8
 with hackage2nix revision 66f6b1336269ffa8e106822407e09e3dbadffcd1

---
 .../haskell-modules/hackage-packages.nix      | 1163 ++++++++++-------
 1 file changed, 705 insertions(+), 458 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 7ca94fe0499..ae94120305b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -720,13 +720,12 @@ self: {
     ({ mkDerivation, base, containers, mtl, pretty }:
      mkDerivation {
        pname = "AlgorithmW";
-       version = "0.1.0.1";
-       sha256 = "0qqdd8220h6h1j7i121h84wysjrmv633md3c7sk01i1p774d67k4";
+       version = "0.1.1.0";
+       sha256 = "0avkxhw5hp00znhmqw3kqxx165ba5y5kgq8b9ahp679p0qf84a3c";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base containers mtl pretty ];
-       jailbreak = true;
-       homepage = "http://hackage.haskell.org/package/AlgorithmW";
+       homepage = "https://github.com/mgrabmueller/AlgorithmW";
        description = "Example implementation of Algorithm W for Hindley-Milner type inference";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -1440,6 +1439,7 @@ self: {
          PrimitiveArray split text tuple vector vector-binary-instances
          vector-th-unbox
        ];
+       jailbreak = true;
        homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
        description = "Efficient RNA/DNA representations";
        license = stdenv.lib.licenses.gpl3;
@@ -1537,8 +1537,8 @@ self: {
      }:
      mkDerivation {
        pname = "BlogLiterately";
-       version = "0.7.1.10";
-       sha256 = "142m20523jd65s53w2myqc24sj6mi3kff8ziqqja3q0whh79n79w";
+       version = "0.8";
+       sha256 = "0sii2m3ha5z5di1flswd6c0xih652y73xdrzi3m662vhm9q94slv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -1547,7 +1547,6 @@ self: {
          hscolour lens mtl pandoc pandoc-citeproc pandoc-types parsec
          process split strict temporary transformers
        ];
-       jailbreak = true;
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
@@ -2195,7 +2194,6 @@ self: {
        homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CabalSearch" = callPackage
@@ -3424,19 +3422,18 @@ self: {
      }) {};
 
   "DefendTheKing" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, GLUT
-     , haskell98, HTTP, MaybeT, mtl, network, peakachu, random, time
-     , utility-ht, zlib
+    ({ mkDerivation, base, binary, bytestring, containers, GLUT, HTTP
+     , MaybeT, mtl, network, peakachu, random, time, utility-ht, zlib
      }:
      mkDerivation {
        pname = "DefendTheKing";
-       version = "0.3";
-       sha256 = "1qnf62c91q94galndi0f7pfyzvk0qwi3gzhwcazkwinildjy8zw6";
+       version = "0.3.1";
+       sha256 = "09wzab0343m55xq4dxfv0f9lwpd5v97mymd6408s6p82xa2vqlzw";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base binary bytestring containers GLUT haskell98 HTTP MaybeT mtl
-         network peakachu random time utility-ht zlib
+         base binary bytestring containers GLUT HTTP MaybeT mtl network
+         peakachu random time utility-ht zlib
        ];
        homepage = "http://github.com/yairchu/defend/tree";
        description = "A simple RTS game";
@@ -7414,10 +7411,9 @@ self: {
     ({ mkDerivation, base, template-haskell, th-lift }:
      mkDerivation {
        pname = "HaPy";
-       version = "0.1.1.0";
-       sha256 = "1gxxhyidcn3lcvmbjby364cypk6xmmsv5qdd0m16d06688cl9mq7";
+       version = "0.1.1.1";
+       sha256 = "0li04k27pkq7ci1dfx4sl022ivl4gjqy5ny25jszifwrx4n4pmwz";
        buildDepends = [ base template-haskell th-lift ];
-       jailbreak = true;
        homepage = "https://github.com/sakana/HaPy";
        description = "Haskell bindings for Python";
        license = stdenv.lib.licenses.mit;
@@ -8482,6 +8478,7 @@ self: {
        buildDepends = [
          aeson base containers lens lens-aeson mtl time transformers wreq
        ];
+       jailbreak = true;
        homepage = "https://github.com/sjoerdvisscher/HueAPI";
        description = "API for controlling Philips Hue lights";
        license = stdenv.lib.licenses.bsd3;
@@ -8931,6 +8928,7 @@ self: {
          aeson base HUnit language-typescript stack-prism test-framework
          test-framework-hunit text
        ];
+       jailbreak = true;
        homepage = "https://github.com/MedeaMelana/JsonGrammar2";
        description = "Combinators for bidirectional JSON parsing";
        license = stdenv.lib.licenses.bsd3;
@@ -11961,6 +11959,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
+       jailbreak = true;
        homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/";
        description = "Efficient multidimensional arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -14327,6 +14326,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Tainted" = callPackage
+    ({ mkDerivation, base, mtl }:
+     mkDerivation {
+       pname = "Tainted";
+       version = "0.1.0.2";
+       sha256 = "1mjr81z42qhwa6njlvlsslpzbbpiab88ns8g8amskwv159gk6mlb";
+       buildDepends = [ base mtl ];
+       homepage = "https://github.com/RossMeikleham/Tainted";
+       description = "Tainted type, and associated operations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Takusen" = callPackage
     ({ mkDerivation, base, mtl, old-time, time }:
      mkDerivation {
@@ -14585,14 +14596,13 @@ self: {
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
        pname = "TransformersStepByStep";
-       version = "0.1.0.1";
-       sha256 = "0dxxgwcn4in3rpfn77c4g8h6l7326m8ikcsrl7pm6gifw667qpmv";
+       version = "0.1.1.0";
+       sha256 = "1cd8sh6gi9zmvd70kzw1x9ycanfsyphjdy3r65xrph54ilwy511p";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base containers mtl ];
-       jailbreak = true;
-       homepage = "http://hackage.haskell.org/package/TransformersStepByStep";
-       description = "Tutorial to monad transformers";
+       homepage = "https://github.com/mgrabmueller/TransformersStepByStep";
+       description = "Tutorial on monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -15427,12 +15437,12 @@ self: {
      }) {};
 
   "Win32-services" = callPackage
-    ({ mkDerivation, Advapi32, base, Win32 }:
+    ({ mkDerivation, Advapi32, base, Win32, Win32-errors }:
      mkDerivation {
        pname = "Win32-services";
-       version = "0.2.5.1";
-       sha256 = "1biirmn4fmw9zdhvbwzj5lrw2ac5wn6zz2zvzqi4b0gz8hlywzr7";
-       buildDepends = [ base Win32 ];
+       version = "0.3";
+       sha256 = "07vby574s528g259zq8jby1327b6jqn4zlzs406ml99w1p02d9js";
+       buildDepends = [ base Win32 Win32-errors ];
        extraLibraries = [ Advapi32 ];
        homepage = "http://github.com/mikesteele81/win32-services";
        description = "Windows service applications";
@@ -15441,14 +15451,16 @@ self: {
      }) { Advapi32 = null;};
 
   "Win32-services-wrapper" = callPackage
-    ({ mkDerivation, base, directory, filepath, Win32, Win32-services
+    ({ mkDerivation, base, directory, filepath, Win32, Win32-errors
+     , Win32-services
      }:
      mkDerivation {
        pname = "Win32-services-wrapper";
-       version = "0.1.2.0";
-       sha256 = "01fvb9sraqw1ar5pvs8s23y8syix50wh6yifsm65fs4vy1nk3xfb";
-       buildDepends = [ base directory filepath Win32 Win32-services ];
-       jailbreak = true;
+       version = "0.1.3.0";
+       sha256 = "1nihf12bcgahs5220pdny1kf54973qxh7llhzv5d9s9lxias2jyd";
+       buildDepends = [
+         base directory filepath Win32 Win32-errors Win32-services
+       ];
        description = "Wrapper code for making a Win32 service";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16129,6 +16141,7 @@ self: {
          aeson base base64-bytestring bson bytestring data-default-class
          scientific text time unordered-containers uuid vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/abeson";
        description = "interconversion between aeson and bson";
        license = stdenv.lib.licenses.mit;
@@ -16896,8 +16909,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, mtl, transformers }:
      mkDerivation {
        pname = "acme-timemachine";
-       version = "0.0.0.0";
-       sha256 = "0sn20lz4bdrn7jz2ik4dr05h59qdjavnsp1z8656nbymndgi54iz";
+       version = "0.0.0.1";
+       sha256 = "06zhslaa7kp75gvnvh2ln15bqbdqgbgya6i4r2jkqxycnk8sczzl";
        buildDepends = [ base ghc-prim mtl transformers ];
        description = "An easy way to perform and unperform IO actions";
        license = stdenv.lib.licenses.bsd3;
@@ -16933,15 +16946,14 @@ self: {
      }:
      mkDerivation {
        pname = "active";
-       version = "0.2.0.2";
-       sha256 = "1xmm0xa4npdsbib5vmgzzqyq8b1abqx2j142zfal3b3nprfjpngk";
+       version = "0.2.0.3";
+       sha256 = "18z6gki5bjr4847r90aw89j8gkfs0w9dv1w2na4msd36i3jym3sc";
        buildDepends = [
          base lens linear semigroupoids semigroups vector
        ];
        testDepends = [
          base lens linear QuickCheck semigroupoids semigroups vector
        ];
-       jailbreak = true;
        description = "Abstractions for animation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17264,8 +17276,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson";
-       version = "0.8.1.1";
-       sha256 = "15fdicmgkcadgqiqql3f4iv2s01aiclny8hjz3d6ryivjsch7cyh";
+       version = "0.9.0.1";
+       sha256 = "1g7qdq7zpyvqwmh4sfhizqpb51cg24lrcj9vq5msz8k896y7vfcj";
        buildDepends = [
          attoparsec base blaze-builder bytestring containers deepseq dlist
          ghc-prim hashable mtl scientific syb template-haskell text time
@@ -17461,6 +17473,7 @@ self: {
          template-haskell temporary test-framework test-framework-hunit
          test-framework-quickcheck2 text unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/timjb/aeson-schema";
        description = "Haskell JSON schema validator and parser generator";
        license = stdenv.lib.licenses.mit;
@@ -17529,6 +17542,7 @@ self: {
          aeson aeson-qq base bytestring hspec text unordered-containers
          vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/begriffs/aeson-t";
        description = "Transform JSON";
        license = stdenv.lib.licenses.mit;
@@ -17552,8 +17566,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-utils";
-       version = "0.3.0.1";
-       sha256 = "1y6nm841y3bvd7kixhwqk7h0pf7ipvfwj2hdq15ij08nlr48dzyl";
+       version = "0.3.0.2";
+       sha256 = "07sbvmm158yqmw4hri9l66ag4r6l59x230gbjm9r97w4x0dlp0bi";
        buildDepends = [
          aeson attoparsec base bytestring scientific text
        ];
@@ -17764,23 +17778,26 @@ self: {
      }) {};
 
   "airship" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
-     , case-insensitive, either, http-date, http-media, http-types
-     , lifted-base, monad-control, mtl, network, old-locale, random
-     , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
-     , transformers-base, unordered-containers, wai, warp
+    ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
+     , bytestring, bytestring-trie, case-insensitive, cryptohash
+     , directory, either, filepath, http-date, http-media, http-types
+     , lifted-base, mime-types, monad-control, mtl, network, old-locale
+     , random, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , transformers, transformers-base, unix, unordered-containers, wai
+     , warp
      }:
      mkDerivation {
        pname = "airship";
-       version = "0.1.0.0";
-       sha256 = "0x99mwyhnhs89hcwi23pjcd6qwihr4ldli68f701ilqp7cxxyk16";
+       version = "0.3.0.0";
+       sha256 = "118valfn96mwdl8pfrvpqgp1rg9armcwlw2r4lvvzb6ci0nyp9n8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         attoparsec base blaze-builder bytestring case-insensitive either
-         http-date http-media http-types lifted-base monad-control mtl
-         network old-locale random text time transformers transformers-base
-         unordered-containers wai warp
+         attoparsec base base64-bytestring blaze-builder bytestring
+         bytestring-trie case-insensitive cryptohash directory either
+         filepath http-date http-media http-types lifted-base mime-types
+         monad-control mtl network old-locale random text time transformers
+         transformers-base unix unordered-containers wai warp
        ];
        testDepends = [
          base bytestring tasty tasty-hunit tasty-quickcheck text
@@ -20158,24 +20175,22 @@ self: {
 
   "approximate" = callPackage
     ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq
-     , directory, distributive, doctest, filepath, generic-deriving
-     , ghc-prim, hashable, hashable-extras, lens, log-domain, pointed
-     , safecopy, semigroupoids, semigroups, simple-reflect, vector
+     , directory, doctest, filepath, ghc-prim, hashable, hashable-extras
+     , lens, log-domain, pointed, safecopy, semigroupoids, semigroups
+     , simple-reflect, vector
      }:
      mkDerivation {
        pname = "approximate";
-       version = "0.2.1.1";
-       sha256 = "18ac2z1yqqksqmq9ch36ja3qjn9v6cgyzxs64lnnp98mgcwsmhwr";
+       version = "0.2.2";
+       sha256 = "1ym9f9vr83ks9lrdl54jaxw3ds2n943m6kqafwnzyypigcj3psxq";
        buildDepends = [
-         base binary bytes cereal comonad deepseq distributive
-         generic-deriving ghc-prim hashable hashable-extras lens log-domain
-         pointed safecopy semigroupoids semigroups vector
+         base binary bytes cereal comonad deepseq ghc-prim hashable
+         hashable-extras lens log-domain pointed safecopy semigroupoids
+         semigroups vector
        ];
        testDepends = [
-         base directory doctest filepath generic-deriving semigroups
-         simple-reflect
+         base directory doctest filepath semigroups simple-reflect
        ];
-       jailbreak = true;
        homepage = "http://github.com/analytics/approximate/";
        description = "Approximate discrete values and numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -20253,27 +20268,28 @@ self: {
   "arbtt" = callPackage
     ({ mkDerivation, aeson, array, base, binary, bytestring
      , bytestring-progress, containers, deepseq, directory, filepath
-     , HUnit, libXScrnSaver, old-locale, parsec, pcre-light
-     , process-extras, strict, tasty, tasty-golden, tasty-hunit
-     , terminal-progress-bar, time, transformers, unix, utf8-string, X11
+     , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty
+     , tasty-golden, tasty-hunit, terminal-progress-bar, time
+     , transformers, unix, utf8-string, X11
      }:
      mkDerivation {
        pname = "arbtt";
-       version = "0.9.0.2";
-       sha256 = "0ab5qrsrp6fcc2p1a4idbqazs7yrh957bfagdmw6b7rrydpig1lc";
+       version = "0.9.0.3";
+       sha256 = "1zki720s444qq22hxsbqmanpv379894l7xhql8p1fq8cdwmfj541";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          aeson array base binary bytestring bytestring-progress containers
-         deepseq directory filepath old-locale parsec pcre-light strict
+         deepseq directory filepath parsec pcre-light strict
          terminal-progress-bar time transformers unix utf8-string X11
        ];
        testDepends = [
-         base binary bytestring containers deepseq directory HUnit
-         old-locale parsec pcre-light process-extras tasty tasty-golden
-         tasty-hunit time transformers unix utf8-string
+         base binary bytestring containers deepseq directory parsec
+         pcre-light process-extras tasty tasty-golden tasty-hunit time
+         transformers unix utf8-string
        ];
        extraLibraries = [ libXScrnSaver ];
+       jailbreak = true;
        homepage = "http://arbtt.nomeata.de/";
        description = "Automatic Rule-Based Time Tracker";
        license = "GPL";
@@ -21225,6 +21241,7 @@ self: {
          http-types jwt mtl network network-api-support network-uri snap
          snap-core split text time time-units transformers
        ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/ajknoll/atlassian-connect-core";
        description = "Atlassian Connect snaplet for the Snap Framework and helper code";
        license = stdenv.lib.licenses.asl20;
@@ -21248,6 +21265,7 @@ self: {
          aeson base bytestring Cabal cases HUnit network network-uri
          scientific text time-units unordered-containers vector
        ];
+       jailbreak = true;
        description = "Code that helps you create a valid Atlassian Connect Descriptor";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22563,8 +22581,8 @@ self: {
      }:
      mkDerivation {
        pname = "b9";
-       version = "0.5.4";
-       sha256 = "1a7329c39m63knb5071ln2bpgb79q5gd3mpix6pm18dim20gciqj";
+       version = "0.5.7";
+       sha256 = "1ffj3ql27826dv20pz98xg3wsaylfsrwgggwxwipw6l2jypk3z7i";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -23091,6 +23109,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "base32string" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, hspec, text }:
+     mkDerivation {
+       pname = "base32string";
+       version = "0.9.1";
+       sha256 = "0cpa6bvam4zd2l2hb3sdngj0dx482c9rkz4jj87n6pxsmq9id4wy";
+       buildDepends = [ aeson base binary bytestring text ];
+       testDepends = [ base binary bytestring hspec text ];
+       homepage = "http://www.leonmergen.com/opensource.html";
+       description = "Fast and safe representation of a Base-32 string";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "base58-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, quickcheck-assertions
      , quickcheck-instances, tasty, tasty-quickcheck
@@ -23226,8 +23257,8 @@ self: {
      }:
      mkDerivation {
        pname = "basic-prelude";
-       version = "0.4.0";
-       sha256 = "10zr3fb12fis33q74988fipljcjlcr1c94cf9kg0rfby2dc1z6v4";
+       version = "0.4.1";
+       sha256 = "041wnym7b8p70kcbkxxbgszmi2y88xs0ww357jrn0v6cc21h60j9";
        buildDepends = [
          base bytestring containers filepath hashable lifted-base ReadArgs
          safe text transformers unordered-containers vector
@@ -23962,6 +23993,7 @@ self: {
          QuickCheck storable-tuple unordered-containers vector
          vector-binary-instances vector-th-unbox
        ];
+       jailbreak = true;
        homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
        description = "bijections with multiple implementations";
        license = stdenv.lib.licenses.bsd3;
@@ -26057,6 +26089,7 @@ self: {
          aeson base doctest QuickCheck scientific tasty tasty-quickcheck
          text unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/blaze-json";
        description = "tiny library for encoding json";
        license = stdenv.lib.licenses.mit;
@@ -26338,6 +26371,7 @@ self: {
          pointful text wai wai-extra wai-websockets warp websockets
          wl-pprint-text
        ];
+       jailbreak = true;
        homepage = "https://blunt.herokuapp.com";
        description = "Convert between pointfree and pointful expressions";
        license = stdenv.lib.licenses.mit;
@@ -27773,30 +27807,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "c2hs_0_20_1" = callPackage
-    ({ mkDerivation, array, base, containers, directory, dlist
-     , filepath, HUnit, language-c, pretty, process, shelly
-     , test-framework, test-framework-hunit, text, transformers
-     }:
-     mkDerivation {
-       pname = "c2hs";
-       version = "0.20.1";
-       sha256 = "1w2w9zxirzjd5lniwqakq59glgsh4mw3565x2l9qrin0bfjxkn3h";
-       isLibrary = false;
-       isExecutable = true;
-       buildDepends = [
-         array base containers directory dlist filepath language-c pretty
-         process
-       ];
-       testDepends = [
-         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;
-     }) {};
-
   "c2hs" = callPackage
     ({ mkDerivation, array, base, containers, directory, dlist
      , filepath, HUnit, language-c, pretty, process, shelly
@@ -30521,15 +30531,14 @@ self: {
      }:
      mkDerivation {
        pname = "cheapskate";
-       version = "0.1.0.3";
-       sha256 = "0my7dkaicdl95289s6li4qzjv9qvgddp51m8nh8lk7qmwx2x5kc6";
+       version = "0.1.0.4";
+       sha256 = "0drx1hlqvdcrij4097q6bxhbfcqm73jsqv1wwhd3hsnjdmr46ch2";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base blaze-html bytestring containers data-default http-types
          mtl syb text uniplate wai wai-extra xss-sanitize
        ];
-       jailbreak = true;
        homepage = "http://github.com/jgm/cheapskate";
        description = "Experimental markdown processor";
        license = stdenv.lib.licenses.bsd3;
@@ -31690,6 +31699,7 @@ self: {
          web-plugins web-routes web-routes-happstack web-routes-th
        ];
        buildTools = [ hsx2hs ];
+       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -32239,8 +32249,8 @@ self: {
     ({ mkDerivation, base, bytestring, HUnit, text }:
      mkDerivation {
        pname = "cmark";
-       version = "0.3.2";
-       sha256 = "0xf34i09m9a3mf6mzn48v6pdbkagsv5c0wmr64ih8d43n2figazk";
+       version = "0.3.3.1";
+       sha256 = "0l42l8bpn69zqz3s2jby1blqg7sx7cxmpnpwr8spkmh5vy8c8m5g";
        buildDepends = [ base bytestring text ];
        testDepends = [ base HUnit text ];
        homepage = "https://github.com/jgm/commonmark-hs";
@@ -32340,8 +32350,8 @@ self: {
     ({ mkDerivation, base, mtl, split, syb, transformers }:
      mkDerivation {
        pname = "cmdlib";
-       version = "0.3.5";
-       sha256 = "0218f4rl64wvvka95m969hg5y9vc29dqaawfcnk7d1qsv3hx9ydl";
+       version = "0.3.6";
+       sha256 = "0mxk7yy3sglxc97my5lnphisg6fawifrbdbpz31h7ybiqccx4hsn";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base mtl split syb transformers ];
@@ -33389,8 +33399,8 @@ self: {
     ({ mkDerivation, base, contravariant }:
      mkDerivation {
        pname = "composition-extra";
-       version = "0.0.0.2";
-       sha256 = "1vicnzxamxhvw824y5dyxf4b303h2jqxs3djc1y33l5ppik8w6fh";
+       version = "1.0.0.1";
+       sha256 = "0i7jzn3grc23nhnp1i4ppbh30nq8pvfn35vz2vdfsivmaa5fnp5v";
        buildDepends = [ base contravariant ];
        description = "Combinators for unorthodox structure composition";
        license = stdenv.lib.licenses.bsd3;
@@ -33599,6 +33609,7 @@ self: {
          aeson base binary bytestring cmdargs concraft containers lazy-io
          mtl network process sgd split tagset-positional text transformers
        ];
+       jailbreak = true;
        homepage = "http://zil.ipipan.waw.pl/Concraft";
        description = "Morphological tagger for Polish";
        license = stdenv.lib.licenses.bsd3;
@@ -34029,8 +34040,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-extra";
-       version = "1.1.8";
-       sha256 = "15ndbid0272izjd4mdhg0k5yaabwphav6m1amkndb7jjqls499zl";
+       version = "1.1.9";
+       sha256 = "1bs28gs0xfsqywhm8bchap9zr10wxfrlpdphflhzkm8am2bgz55i";
        buildDepends = [
          attoparsec base blaze-builder bytestring conduit directory filepath
          monad-control network primitive process resourcet stm
@@ -35462,6 +35473,7 @@ self: {
        isExecutable = true;
        buildDepends = [ aeson base shakespeare tagsoup text ];
        testDepends = [ aeson base HTF HUnit ];
+       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/country-codes";
        description = "ISO 3166 country codes and i18n names";
        license = stdenv.lib.licenses.bsd3;
@@ -35958,26 +35970,25 @@ self: {
 
   "creatur" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, cereal, cond
-     , directory, filepath, gray-extended, hdaemonize, HUnit
+     , directory, filepath, gray-extended, hdaemonize, hsyslog, HUnit
      , MonadRandom, mtl, old-locale, process, QuickCheck, random, split
      , temporary, test-framework, test-framework-hunit
      , test-framework-quickcheck2, time, transformers, unix, zlib
      }:
      mkDerivation {
        pname = "creatur";
-       version = "5.9.5";
-       sha256 = "0wzdggsgrxpifk8z8y4mqq029dmylvg16x19r28f688rgpz62y0j";
+       version = "5.9.6";
+       sha256 = "0lxmsd59sa37j8bc7y6v29s8wlscqa4xz15p60jiy5ks7am61wa5";
        buildDepends = [
          array base bytestring cereal cond directory filepath gray-extended
-         hdaemonize MonadRandom mtl old-locale process random split time
-         transformers unix zlib
+         hdaemonize hsyslog MonadRandom mtl old-locale process random split
+         time transformers unix zlib
        ];
        testDepends = [
-         array base binary cereal directory filepath HUnit MonadRandom mtl
-         QuickCheck temporary test-framework test-framework-hunit
-         test-framework-quickcheck2
+         array base binary cereal directory filepath hsyslog HUnit
+         MonadRandom mtl QuickCheck temporary test-framework
+         test-framework-hunit test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "https://github.com/mhwombat/creatur";
        description = "Framework for artificial life experiments";
        license = stdenv.lib.licenses.bsd3;
@@ -37606,8 +37617,8 @@ self: {
      }) {};
 
   "darcs-cabalized" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, curl, curses
-     , directory, html, HUnit, mtl, old-time, parsec, process
+    ({ mkDerivation, array, base, bytestring, containers, curl
+     , directory, html, HUnit, mtl, ncurses, old-time, parsec, process
      , QuickCheck, regex-compat, unix, zlib
      }:
      mkDerivation {
@@ -37620,12 +37631,13 @@ self: {
          array base bytestring containers directory html HUnit mtl old-time
          parsec process QuickCheck regex-compat unix
        ];
-       extraLibraries = [ curl curses zlib ];
+       extraLibraries = [ curl ncurses zlib ];
        homepage = "http://darcs.net/";
        description = "David's Advanced Version Control System";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) curl;  curses = null;  inherit (pkgs) zlib;};
+     }) { inherit (pkgs) curl;  inherit (pkgs) ncurses;
+          inherit (pkgs) zlib;};
 
   "darcs-fastconvert" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cmdlib, containers
@@ -38971,8 +38983,8 @@ self: {
      }:
      mkDerivation {
        pname = "datadog";
-       version = "0.1.0.0";
-       sha256 = "19f1lcd73rj2v23cpxjnhby80p3gzlvb92fizw884km26az8y684";
+       version = "0.1.0.1";
+       sha256 = "05hfpkaizbgqi998wa0l0hb8qph8y7gwyx05690ljr0883m5a663";
        buildDepends = [
          aeson auto-update base buffer-builder bytestring lens lifted-base
          monad-control network old-locale text time transformers-base
@@ -39096,12 +39108,19 @@ self: {
      }) {};
 
   "datetime-sb" = callPackage
-    ({ mkDerivation, base, old-locale, old-time, QuickCheck, time }:
+    ({ mkDerivation, base, HUnit, old-locale, old-time, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , time
+     }:
      mkDerivation {
        pname = "datetime-sb";
-       version = "0.2.2";
-       sha256 = "10c9anhlgzy7s0yvws7v0mf2ckxvwip74jl8izia76smhq9hf3sw";
-       buildDepends = [ base old-locale old-time QuickCheck time ];
+       version = "0.2.4";
+       sha256 = "1p2pn0jdidqcvmmi80njqm9z4amn1qp05nlxbnz1svpp6nc7amjf";
+       buildDepends = [ base old-locale old-time time ];
+       testDepends = [
+         base HUnit old-locale old-time QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 time
+       ];
        homepage = "http://github.com/stackbuilders/datetime";
        description = "Utilities to make Data.Time.* easier to use.";
        license = "GPL";
@@ -40335,6 +40354,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "derive-enumerable" = callPackage
+    ({ mkDerivation, base, data-default }:
+     mkDerivation {
+       pname = "derive-enumerable";
+       version = "0.1.1.0";
+       sha256 = "08zhyn9xcmhrrnh7y2a1r7v4nmgm2af0d41ns0wjqais67rzsxsp";
+       buildDepends = [ base data-default ];
+       jailbreak = true;
+       homepage = "https://github.com/mgoszcz2/derive-enumerable";
+       description = "Generic instances for enumerating complex data types";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "derive-gadt" = callPackage
     ({ mkDerivation, base, containers, haskell-src-exts
      , haskell-src-meta, pretty, template-haskell
@@ -40643,8 +40675,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-builder";
-       version = "0.7.0.1";
-       sha256 = "1a4qzrakvis560azbwx234i7882kax1qs212g5ckkr9yvnyanp76";
+       version = "0.7.0.2";
+       sha256 = "0gkfnanrim060f1g4brp6qxdiq81fni1kml7n9x79pfqdmfhlhgq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -40654,7 +40686,6 @@ self: {
          lucid-svg mtl split transformers
        ];
        configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -40669,15 +40700,14 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-cairo";
-       version = "1.3.0.1";
-       sha256 = "04zcyvirlwzg4zrdrassxhfpfmp0hg263pzdi904nv2qp1idayqi";
+       version = "1.3.0.2";
+       sha256 = "1ja089hnq24fx5sd5r3r2z76pmwk5w6j93b7hha7m4jylcdjcnpp";
        buildDepends = [
          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
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Cairo backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -40690,14 +40720,13 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-canvas";
-       version = "1.3";
-       sha256 = "1zqq77ka3p7y9szqvlazwwaamz1b7lg2l8dp2wz5wycignchl26b";
+       version = "1.3.0.1";
+       sha256 = "0ik2kfgs5fi1a51hn9g5sii0n4j9lb0xd9paydz342b7zizy0w70";
        buildDepends = [
          base blank-canvas cmdargs containers data-default-class
          diagrams-core diagrams-lib lens mtl NumInstances
          optparse-applicative statestack text
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -40713,8 +40742,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-contrib";
-       version = "1.3.0.2";
-       sha256 = "0zpga8x10xfbvicv26lwdcj5fcnsd5wifap7nsrw4dnvhmsmgsyc";
+       version = "1.3.0.3";
+       sha256 = "0sl99ikghfmiwa51iyacgrma844dqn44iw7c9ahx70r4l8j8is2q";
        buildDepends = [
          base circle-packing colour containers data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -40725,7 +40754,6 @@ self: {
          base containers diagrams-lib HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -40738,13 +40766,12 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-core";
-       version = "1.3";
-       sha256 = "1abf2pxs659bqhl6d803ny11gacfa1wy5c1g47k0h8q9nq6jg3q9";
+       version = "1.3.0.1";
+       sha256 = "1whig632hx03ysiqidaxf29r67xl2skw0pkx454s036gdwl7sqj2";
        buildDepends = [
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl semigroups unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -40772,8 +40799,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-haddock";
-       version = "0.3.0.3";
-       sha256 = "0cjl78swzsx7yx3ry2yv94gbn5mwc7gbrlldgqxxiw0ip3mbzk7r";
+       version = "0.3.0.4";
+       sha256 = "19dv368clrpjv2s0wd2ha61v80hlx4bkmy7qr9bgasaj3xxx3yqn";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -40786,7 +40813,6 @@ self: {
          base containers haskell-src-exts lens parsec QuickCheck tasty
          tasty-quickcheck
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
@@ -40821,14 +40847,13 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-html5";
-       version = "1.3";
-       sha256 = "1g9a7wg7rdzqz0bl476gq7hbmsn369jdi67k9ikbjw7z9w060l5f";
+       version = "1.3.0.1";
+       sha256 = "1b6qrhqangdd2j3hzgslkq2sgk9wgk9ll9znfcmxpzc9k04aanqc";
        buildDepends = [
          base cmdargs containers data-default-class diagrams-core
          diagrams-lib lens mtl NumInstances optparse-applicative split
          statestack static-canvas text
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -40845,8 +40870,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-lib";
-       version = "1.3";
-       sha256 = "0ap92ya3m74dq4x9zv1jx7cbb0cpzssgy8r7xqmzyq54grdxv01r";
+       version = "1.3.0.1";
+       sha256 = "04s21ms9w521fhm7hralq155lwisjv1pszz4cvpl3hc1jm1vwfa3";
        buildDepends = [
          active adjunctions array base colour containers data-default-class
          diagrams-core diagrams-solve directory distributive dual-tree
@@ -40855,7 +40880,6 @@ self: {
          process semigroups system-filepath tagged text transformers
          unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
@@ -40909,14 +40933,13 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-postscript";
-       version = "1.3.0.0";
-       sha256 = "1dbnmlwm6blkh8x5rvsvlm6is84bvy9aymayf5k7nhvz9qb82n8v";
+       version = "1.3.0.1";
+       sha256 = "0w6ck71hjjx0rl930v2wapznjvrg5jq538gnyidp2yshik8xh2rp";
        buildDepends = [
          base containers data-default-class diagrams-core diagrams-lib dlist
          filepath hashable lens monoid-extras mtl semigroups split
          statestack
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -40945,14 +40968,13 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-rasterific";
-       version = "1.3.1.0";
-       sha256 = "0as845zjd3wwixzgiy9vv68ginscsn5194966nhch9mbwxm32ljb";
+       version = "1.3.1.2";
+       sha256 = "1shkwhi7yv8cmv8697z7qqax0z7brcmjqlc17hldfflzwniiyk81";
        buildDepends = [
          base bytestring containers data-default-class diagrams-core
          diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl
          optparse-applicative Rasterific split unix
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
@@ -40990,15 +41012,14 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-svg";
-       version = "1.3.1.1";
-       sha256 = "1agfyxv98j14pz6lhk8v5fvm534j7d0923260mrnd5ma6dvpshsw";
+       version = "1.3.1.2";
+       sha256 = "1kz70v0nccswd4df3240gy6liln4hi165zn8rm6f3palkxcfw3m3";
        buildDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg
          monoid-extras mtl old-time optparse-applicative process split text
          time
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "SVG backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41741,9 +41762,10 @@ self: {
     ({ mkDerivation, array, base, containers, mtl, parsec }:
      mkDerivation {
        pname = "disassembler";
-       version = "0.2.0.0";
-       sha256 = "125191kzflzdj2wnghfc3dzpdxqc44iir5ypvhsz5xb773cdxwxv";
+       version = "0.2.0.1";
+       sha256 = "1yg1mb9w679m1iml0rx2i6gq1ps8s56da4dvn2knvkgg7m1cr39c";
        buildDepends = [ array base containers mtl parsec ];
+       homepage = "https://github.com/mgrabmueller/disassembler";
        description = "Disassembler for X86 & AMD64 machine code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -43696,6 +43718,7 @@ self: {
          base cairo colour either GLFW-b GLUtil OpenGL pango pipes
          transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/adamwalker/dynamic-graph";
        description = "Draw and update graphs in real time with OpenGL";
        license = stdenv.lib.licenses.bsd3;
@@ -44066,14 +44089,18 @@ self: {
      }) {};
 
   "eddie" = callPackage
-    ({ mkDerivation, base, cmdargs, hint }:
+    ({ mkDerivation, base, bifunctors, classy-prelude, hint
+     , optparse-applicative, safe
+     }:
      mkDerivation {
        pname = "eddie";
-       version = "0.5.1";
-       sha256 = "1kqrxv195r1dhrnizaml9v20jpwgxq66xdr7jfmri4ai0pvjpzmk";
+       version = "1.0.0";
+       sha256 = "1zq2xadpl33mxdn99aim5rscwqgpy5w0lk7pa3k3h9x3d3c3qzxx";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base cmdargs hint ];
+       buildDepends = [
+         base bifunctors classy-prelude hint optparse-applicative safe
+       ];
        homepage = "http://chiselapp.com/user/mwm/repository/eddie/";
        description = "Command line file filtering with haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -44513,17 +44540,18 @@ self: {
      }) {};
 
   "either" = callPackage
-    ({ mkDerivation, base, bifunctors, exceptions, free, monad-control
-     , MonadRandom, mtl, profunctors, semigroupoids, semigroups
-     , transformers, transformers-base
+    ({ mkDerivation, base, bifunctors, exceptions, free, mmorph
+     , monad-control, MonadRandom, mtl, profunctors, semigroupoids
+     , semigroups, transformers, transformers-base
      }:
      mkDerivation {
        pname = "either";
-       version = "4.3.4";
-       sha256 = "03gc4kl7cgww7y2qyg4y35zb43mamxnm41y4fi156yjgy1x0n7w8";
+       version = "4.4";
+       sha256 = "06519qw6y8ah168p2i03q1hmmrbmbai39fm6bna8rkp8zwlbkxww";
        buildDepends = [
-         base bifunctors exceptions free monad-control MonadRandom mtl
-         profunctors semigroupoids semigroups transformers transformers-base
+         base bifunctors exceptions free mmorph monad-control MonadRandom
+         mtl profunctors semigroupoids semigroups transformers
+         transformers-base
        ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/either/";
@@ -44567,6 +44595,7 @@ self: {
          aeson base bytestring ekg-core filepath network snap-core
          snap-server text time transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/tibbe/ekg";
        description = "Remote monitoring of processes";
        license = stdenv.lib.licenses.bsd3;
@@ -45031,18 +45060,19 @@ self: {
      }) {};
 
   "elocrypt" = callPackage
-    ({ mkDerivation, base, MonadRandom, QuickCheck, random, tasty
-     , tasty-quickcheck, tasty-th
+    ({ mkDerivation, base, MonadRandom, proctest, QuickCheck, random
+     , tasty, tasty-quickcheck, tasty-th
      }:
      mkDerivation {
        pname = "elocrypt";
-       version = "0.3.2";
-       sha256 = "0dz7xgg41gia57hism3dldd7w2xbnkj9kjs9kr2vkfkg5igrwvcx";
+       version = "0.4.0";
+       sha256 = "0n19364jzifnb08pxzlsb05hpqz327zsfz138g0py3zy38wibszx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base MonadRandom random ];
        testDepends = [
-         base MonadRandom QuickCheck random tasty tasty-quickcheck tasty-th
+         base MonadRandom proctest QuickCheck random tasty tasty-quickcheck
+         tasty-th
        ];
        homepage = "https://www.github.com/sgillespie/elocrypt";
        description = "Generate easy-to-remember, hard-to-guess passwords";
@@ -45115,10 +45145,8 @@ self: {
      }:
      mkDerivation {
        pname = "email-validate";
-       version = "2.1.2";
-       revision = "1";
-       sha256 = "13r67kk5rjl54mwk4shap1rf8jdp1hsd6wpg4hgkf10vzk5vara5";
-       editedCabalFile = "0add2fe9264e4307cb7d464ddaf54c8147396f36740228d124224f5a27689582";
+       version = "2.1.3";
+       sha256 = "1jw15hyj6p1155i3h5n4f728x33ym21ibpirkdiid0ksf6cpk5jv";
        buildDepends = [ attoparsec base bytestring ghc-prim ];
        testDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -45284,8 +45312,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io";
-       version = "1.2.5";
-       sha256 = "09hndfmgvganfj2y53zj5dpy1dn8rain3fyxknr14ln8c75jprah";
+       version = "1.2.6";
+       sha256 = "1vxbpfldnqrw42vm8c0rqy4b56yig38mca5b83pl79f2z722l3v4";
        buildDepends = [
          aeson async attoparsec base base64-bytestring bytestring either
          free monad-loops mwc-random stm stm-delay text transformers
@@ -45639,8 +45667,8 @@ self: {
      }:
      mkDerivation {
        pname = "epub-metadata";
-       version = "4.2";
-       sha256 = "1pj0z6avdwvqrnjgwn7x5ajc7nagr575cilxmvzj22zlzhz4if3p";
+       version = "4.3";
+       sha256 = "0gw5mfysvfqk9daa4807qq4xh190a1pzxmwwi2xbnpz7m4kyffyk";
        buildDepends = [
          base bytestring containers directory filepath hxt mtl regex-compat
          zip-archive
@@ -45649,7 +45677,7 @@ self: {
          base bytestring directory filepath HUnit hxt mtl regex-compat
          zip-archive
        ];
-       homepage = "http://ui3.info/d/proj/epub-metadata.html";
+       homepage = "http://hub.darcs.net/dino/epub-metadata";
        description = "Library for parsing epub document metadata";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45660,8 +45688,8 @@ self: {
      }:
      mkDerivation {
        pname = "epub-tools";
-       version = "2.5";
-       sha256 = "0ksnzh2j1xa5jvql7b37dnld3pv1lqf62rfww6wv58hh3d1zmzwj";
+       version = "2.6";
+       sha256 = "0ncyam72y5jvad73mbrcsv8y1hl5yybrx59vc8gxsyiy9mbrvs6v";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -45671,7 +45699,7 @@ self: {
        testDepends = [
          base directory epub-metadata filepath HUnit mtl parsec regex-compat
        ];
-       homepage = "http://ui3.info/d/proj/epub-tools.html";
+       homepage = "http://hub.darcs.net/dino/epub-tools";
        description = "Command line utilities for working with epub files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46399,6 +46427,7 @@ self: {
          aeson async attoparsec base bytestring cereal containers network
          protobuf random sodium stm text time unordered-containers uuid
        ];
+       jailbreak = true;
        homepage = "http://github.com/YoEight/eventstore";
        description = "EventStore TCP Client";
        license = stdenv.lib.licenses.bsd3;
@@ -47009,8 +47038,8 @@ self: {
      }:
      mkDerivation {
        pname = "extensible-effects";
-       version = "1.10.0.1";
-       sha256 = "0zj72lnwncy9diagicp1xkvryakal17p5fslv1pl731z8janal1s";
+       version = "1.11.0.0";
+       sha256 = "14f8x6gyq28n3lpap4f5bn290llj57my1k28km9r1nh14kxl1lp9";
        buildDepends = [
          base transformers transformers-base type-aligned void
        ];
@@ -47474,8 +47503,8 @@ self: {
      }:
      mkDerivation {
        pname = "fay";
-       version = "0.23.1.4";
-       sha256 = "1l8r7d4iwwkq0m9cskwfv38i89cr8sqxidrc59z62yp05ilcs5r6";
+       version = "0.23.1.5";
+       sha256 = "07x4v8nq9mg0ydir708mv1bhpg3n5f449vv9ihgpyfdvm4w1bm4r";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -48619,8 +48648,8 @@ self: {
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "first-class-patterns";
-       version = "0.3.2.1";
-       sha256 = "07ak85jkxli1yhj75mpvam0av8iz5qpbx6m5kzw04fqg3vcfrj8j";
+       version = "0.3.2.2";
+       sha256 = "0da7mayn8lcizwjv06rafkgrsj257fhkj5xsxk7nx00n3aazzr68";
        buildDepends = [ base transformers ];
        homepage = "https://github.com/reinerp/first-class-patterns";
        description = "First class patterns and pattern matching, using type families";
@@ -49295,6 +49324,7 @@ self: {
          lens lens-action mtl network pipes pipes-aeson pipes-http
          pipes-parse template-haskell text unordered-containers uuid
        ];
+       jailbreak = true;
        homepage = "https://github.com/brewtown/hs-flowdock";
        description = "Flowdock client library for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -49680,10 +49710,9 @@ self: {
      }:
      mkDerivation {
        pname = "force-layout";
-       version = "0.4.0.0";
-       sha256 = "0rmspkl8j1z2n8r6d3dcd573z73yzn6c9r49f57syfvalq0xrzdk";
+       version = "0.4.0.1";
+       sha256 = "1qchmhn6hp91gzds6yqjn4kssp7n3g7vqhl919wf8d3nn4ykz3av";
        buildDepends = [ base containers data-default-class lens linear ];
-       jailbreak = true;
        description = "Simple force-directed layout";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51476,8 +51505,8 @@ self: {
     ({ mkDerivation, base, List, transformers }:
      mkDerivation {
        pname = "generator";
-       version = "0.5.4";
-       sha256 = "1yphw9ira01c0989gq1hrh53xcd3qvq8fib5k1bpsmb313j7x8b8";
+       version = "0.5.5";
+       sha256 = "1rwz2ribijj5hb2isg0yz6hb2mwyjhzfg0ys041yb43qlcbhkhdd";
        buildDepends = [ base List transformers ];
        homepage = "http://github.com/yairchu/generator/tree";
        description = "Python-generators notation for creation of monadic lists";
@@ -51520,10 +51549,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-aeson";
-       version = "0.2.0.5";
-       revision = "1";
-       sha256 = "109jxrny3r1wsf2kr23vvgdid4rmq5lpqjlfbk4n7yxb9bvdbhy5";
-       editedCabalFile = "9b825c5d437c1a3a47dfb27781100229b7c535982ad42721414083cab309e461";
+       version = "0.2.0.6";
+       sha256 = "13jlr9dq3d0v9f7hjxq5qxs8llhj8mbnja14xjkxc28vdbnzv62l";
        buildDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
@@ -52891,6 +52918,7 @@ self: {
          aeson base bytestring cassava containers directory filepath shake
          split text unordered-containers vector yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
@@ -52940,7 +52968,7 @@ self: {
      , clientsession, conduit, conduit-extra, containers, crypto-api
      , cryptohash, curl, data-default, DAV, dbus, directory, dlist, dns
      , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath
-     , git, gnupg1, gnutls, hinotify, hslogger, http-client
+     , git, gnupg1, gnutls, hamlet, hinotify, hslogger, http-client
      , http-conduit, http-types, IfElse, json, lsof, MissingH
      , monad-control, monad-logger, mtl, network, network-info
      , network-multicast, network-protocol-xmpp, network-uri, openssh
@@ -52955,8 +52983,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "5.20150522";
-       sha256 = "0spczrg1rrg4qgyxpjqlcfpkcdph6d2m6dv1lbf77nbfc6cqh83p";
+       version = "5.20150528";
+       sha256 = "1d7760c3wq0zq9q1zs1y9hjlzjjqcdg88wfi0k5hsmwgiysn2pr2";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -52964,8 +52992,8 @@ self: {
          case-insensitive clientsession conduit conduit-extra containers
          crypto-api cryptohash data-default DAV dbus directory dlist dns
          edit-distance esqueleto exceptions fdo-notify feed filepath gnutls
-         hinotify hslogger http-client http-conduit http-types IfElse json
-         MissingH monad-control monad-logger mtl network network-info
+         hamlet hinotify hslogger http-client http-conduit http-types IfElse
+         json MissingH monad-control monad-logger mtl network network-info
          network-multicast network-protocol-xmpp network-uri
          optparse-applicative path-pieces persistent persistent-sqlite
          persistent-template process QuickCheck random regex-tdfa resourcet
@@ -53352,6 +53380,7 @@ self: {
          aeson base base64-bytestring bytestring http-conduit network safe
          text
        ];
+       jailbreak = true;
        homepage = "https://github.com/relrod/gitignore";
        description = "Apply GitHub .gitignore templates to already existing repositories.";
        license = stdenv.lib.licenses.bsd3;
@@ -54339,6 +54368,7 @@ self: {
        testDepends = [
          base bytestring hspec http-conduit http-types load-env
        ];
+       jailbreak = true;
        description = "Google OAuth2 token negotiation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -55177,14 +55207,13 @@ self: {
      }:
      mkDerivation {
        pname = "grid";
-       version = "7.8.2";
-       sha256 = "0bb9cykr47sbkccnfcxaq3fx2q0m4c3cvfjhdg2jqwvn0jsp98ik";
+       version = "7.8.4";
+       sha256 = "1jci2191l6k1qlch54id7z05zn9lp5lzyh7g6hm9s522z97lgb2k";
        buildDepends = [ base cereal containers ];
        testDepends = [
          base containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "https://github.com/mhwombat/grid";
        description = "Tools for working with regular grids (graphs, lattices)";
        license = stdenv.lib.licenses.bsd3;
@@ -55229,7 +55258,9 @@ self: {
      mkDerivation {
        pname = "groundhog";
        version = "0.7.0.3";
+       revision = "1";
        sha256 = "0n5c501wfyqcl1iy4017yyxp95kz7mb4lgc0mjjk9si36ixkww9r";
+       editedCabalFile = "dcf9bbeaf0fd7e7ac0809902a54779097e8935a07b1e7e43c404bc683c17e7f0";
        buildDepends = [
          aeson attoparsec base base64-bytestring blaze-builder bytestring
          containers monad-control monad-logger mtl scientific text time
@@ -57475,6 +57506,7 @@ self: {
          http-client http-client-tls http-types tagsoup text time
          transformers
        ];
+       jailbreak = true;
        description = "Mailgun REST api interface for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -57667,8 +57699,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.6.9.0";
-       sha256 = "0z0gfs7czqwrkgd43pcx6rjdsgwpkhan5pmgfbkiixih993f9s2l";
+       version = "4.7.0.0";
+       sha256 = "1c2awifpsplfr3x5aj7v9pymfmfj74i4j3djgggxr9vj5d372njq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -57885,6 +57917,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "halive" = callPackage
+    ({ mkDerivation, base, bin-package-db, directory, filepath
+     , foreign-store, fsnotify, ghc, ghc-paths, system-filepath
+     , transformers
+     }:
+     mkDerivation {
+       pname = "halive";
+       version = "0.1.0.1";
+       revision = "1";
+       sha256 = "0wzajzh7lihj5l906ia5ni12dih0ar7f8apnq4ncypkw4ym1d4j6";
+       editedCabalFile = "60b322e7402b0dc957944334003fdf00ae5cdf0233663904dc397409aa153598";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base bin-package-db directory filepath foreign-store fsnotify ghc
+         ghc-paths system-filepath transformers
+       ];
+       homepage = "https://github.com/lukexi/halive";
+       description = "A live recompiler";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "halma" = callPackage
     ({ mkDerivation, async, base, containers, data-default
      , diagrams-cairo, diagrams-gtk, diagrams-lib, grid, gtk, HUnit, mtl
@@ -59023,12 +59077,13 @@ self: {
      }:
      mkDerivation {
        pname = "harpy";
-       version = "0.6.0.0";
-       sha256 = "0vc6p72imiss9zwzbmkxl42lm21kzc33j4l6f5x8a6r95m85iwq8";
+       version = "0.6.0.2";
+       sha256 = "1rlbakwqfjfr3d71jc6d5nyw5ms0y9wmb79p8jax45rxk1a8cfry";
        buildDepends = [
          array base containers disassembler mtl parsec pretty
          template-haskell
        ];
+       homepage = "https://github.com/mgrabmueller/harpy";
        description = "Runtime code generation for x86 machine code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59281,10 +59336,8 @@ self: {
     ({ mkDerivation, base, bytestring, containers, split }:
      mkDerivation {
        pname = "hashids";
-       version = "1.0.2";
-       revision = "3";
-       sha256 = "07qrsabhb825jhdbc4ka35ss7ci07avgvi8jsr69r17bnp87wnma";
-       editedCabalFile = "58394f52df9a7e4427962fe1e59eb21cb751b3af58f997453f2b2f34cb9271dc";
+       version = "1.0.2.1";
+       sha256 = "03q0fcxiw4yncmbdirnh6kaz9jhyxqy348dnrvgkbn4mzkh8fi2z";
        buildDepends = [ base bytestring containers split ];
        homepage = "http://hashids.org/";
        description = "Hashids generates short, unique, non-sequential ids from numbers";
@@ -59927,8 +59980,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-neo4j-client";
-       version = "0.3.1.1";
-       sha256 = "1l5dpaa97h6qxlhq0rzk24p3l943zf3c948jvng4ajl3gmhniy1w";
+       version = "0.3.1.2";
+       sha256 = "1qb2m6bxpw24ll1r0hyicmddn9plm55ipdgbykd6yrw1cfrm9qz7";
        buildDepends = [
          aeson base bytestring containers data-default hashable HTTP
          http-conduit http-types lifted-base mtl network-uri resourcet
@@ -60781,8 +60834,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskellscript";
-       version = "0.1.2";
-       sha256 = "0d3h2pz8f1mi19il9p03dxrb5f973wr2zl7f6mjn3c565rs3nzgs";
+       version = "0.2.3";
+       sha256 = "0jrvvbpx35dhrwvknrxcwg1j1yi0mwzrnzrr2hsxja21drrqklf3";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -61332,6 +61385,7 @@ self: {
        buildDepends = [
          base-prelude bytestring either free list-t text transformers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/hasql-backend";
        description = "API for backends of \"hasql\"";
        license = stdenv.lib.licenses.mit;
@@ -61615,6 +61669,7 @@ self: {
          aeson base bytestring containers hashable HUnit text
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/facebook/Haxl";
        description = "A Haskell library for efficient, concurrent, and concise data access";
        license = stdenv.lib.licenses.bsd3;
@@ -62704,6 +62759,7 @@ self: {
          map-syntax MonadCatchIO-transformers mtl process random text time
          transformers unordered-containers vector xmlhtml
        ];
+       jailbreak = true;
        homepage = "http://snapframework.com/";
        description = "An Haskell template system supporting both HTML5 and XML";
        license = stdenv.lib.licenses.bsd3;
@@ -63269,7 +63325,8 @@ self: {
      }) {};
 
   "hetris" = callPackage
-    ({ mkDerivation, array, base, curses, hscurses, old-time, random }:
+    ({ mkDerivation, array, base, hscurses, ncurses, old-time, random
+     }:
      mkDerivation {
        pname = "hetris";
        version = "0.2";
@@ -63277,12 +63334,12 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ array base hscurses old-time random ];
-       extraLibraries = [ curses ];
+       extraLibraries = [ ncurses ];
        homepage = "http://web.comlab.ox.ac.uk/oucl/work/ian.lynagh/Hetris/";
        description = "Text Tetris";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { curses = null;};
+     }) { inherit (pkgs) ncurses;};
 
   "heukarya" = callPackage
     ({ mkDerivation, base, containers, deepseq, parallel, random, text
@@ -64121,8 +64178,8 @@ self: {
      }:
      mkDerivation {
        pname = "highlighting-kate";
-       version = "0.5.15";
-       sha256 = "0ig9yz7cd08wkvhbfw8rlg4flclsk2lqqx0zkl8721zgviqj9rg4";
+       version = "0.6";
+       sha256 = "16334fbiyq6017zbgc59qc00h0bk24xh4dcrbqx63dvf72ac37dk";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -64229,8 +64286,8 @@ self: {
      }:
      mkDerivation {
        pname = "hindent";
-       version = "4.4.2";
-       sha256 = "14g3sqkps2bg8fc8vp5f632hj7msbl4kj0baasykxvf0iylgj7ii";
+       version = "4.5.3";
+       sha256 = "0fnkqdxqnfmh4mg844vbgbp4s31pq4jkc00n7dkg81xq0983nsxc";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -64651,6 +64708,7 @@ self: {
        version = "0.1.0";
        sha256 = "0i13aj1xcwap0k3w48vyiiganbvj93zydawmw3gw7m0kr6nl5l9v";
        buildDepends = [ base binary text text-binary ];
+       jailbreak = true;
        homepage = "https://github.com/kawu/hist-pl/tree/master/types";
        description = "Types in the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
@@ -64849,6 +64907,7 @@ self: {
          aeson base http-types HUnit test-framework test-framework-hunit
          text unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/seagreen/hjsonpointer";
        description = "JSON Pointer library";
        license = stdenv.lib.licenses.mit;
@@ -65195,8 +65254,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "1.9.20";
-       sha256 = "1nm6z0v040ma5wkzfv8nhplpq7dnaf645bax2r3q5fj6j4cv1hzh";
+       version = "1.9.21";
+       sha256 = "14v3rdjjlml9nimdk7d5dvir2bw78ai49yylvms9lnzmw29s3546";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -65383,20 +65442,18 @@ self: {
      }) { inherit (pkgs) gsl;};
 
   "hmatrix-gsl-stats" = callPackage
-    ({ mkDerivation, base, binary, blas, hmatrix, lapack
-     , storable-complex
-     }:
+    ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex }:
      mkDerivation {
        pname = "hmatrix-gsl-stats";
-       version = "0.3.0.1";
-       sha256 = "0q5l82m6692isl9499q9szgmkxarkjkmwsdvg6frf7izkzrxx5l5";
+       version = "0.3.0.2";
+       sha256 = "1n0p7pg9rsdckcysczg7l8rqfm3xw1rc2jzp0khb1i33nhbr7bzn";
        buildDepends = [ base binary hmatrix storable-complex ];
-       extraLibraries = [ blas lapack ];
+       pkgconfigDepends = [ gsl ];
        homepage = "http://code.haskell.org/hmatrix-gsl-stats";
        description = "GSL Statistics interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) blas;  lapack = null;};
+     }) { inherit (pkgs) gsl;};
 
   "hmatrix-mmap" = callPackage
     ({ mkDerivation, base, hmatrix, mmap }:
@@ -65653,8 +65710,8 @@ self: {
 
   "hmp3" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , curses, directory, mersenne-random, old-time, pcre-light, process
-     , unix, zlib
+     , directory, mersenne-random, ncurses, old-time, pcre-light
+     , process, unix, zlib
      }:
      mkDerivation {
        pname = "hmp3";
@@ -65666,12 +65723,12 @@ self: {
          array base binary bytestring containers directory mersenne-random
          old-time pcre-light process unix zlib
        ];
-       extraLibraries = [ curses ];
+       extraLibraries = [ ncurses ];
        homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html";
        description = "An ncurses mp3 player written in Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { curses = null;};
+     }) { inherit (pkgs) ncurses;};
 
   "hmpfr" = callPackage
     ({ mkDerivation, base, integer-gmp, mpfr }:
@@ -65834,6 +65891,7 @@ self: {
        buildDepends = [
          aeson base bytestring http-conduit http-types text
        ];
+       jailbreak = true;
        homepage = "https://github.com/freizl/hoauth2";
        description = "hoauth2";
        license = stdenv.lib.licenses.bsd3;
@@ -67460,6 +67518,7 @@ self: {
        ];
        testDepends = [ aeson attoparsec base QuickCheck text vector ];
        extraLibraries = [ ruby ];
+       jailbreak = true;
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) ruby;};
@@ -68075,8 +68134,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsb2hs";
-       version = "0.2";
-       sha256 = "013n3l80449wxmbfmcidg8mdjk4nkxv7s3jcbfy5g4jps6gsg1fx";
+       version = "0.3";
+       sha256 = "16awid7ybqbnja77swphq3csg476pk8l6ygjl5r5ndprahzkdrh5";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -68966,24 +69025,25 @@ self: {
      }) {};
 
   "hsignal" = callPackage
-    ({ mkDerivation, array, base, binary, blas, bytestring, hmatrix
-     , hmatrix-gsl, hmatrix-gsl-stats, hstatistics, lapack, mtl
+    ({ mkDerivation, array, base, binary, blas, bytestring, gsl
+     , hmatrix, hmatrix-gsl, hmatrix-gsl-stats, hstatistics, lapack, mtl
      , storable-complex
      }:
      mkDerivation {
        pname = "hsignal";
-       version = "0.2.7";
-       sha256 = "1a75n22rk5lpzf1fnwdpw61azibavy9x45wz1cp0l1c49477fxs0";
+       version = "0.2.7.1";
+       sha256 = "1dzga1cgxrk7i65zrmpg22521islp4xzfc95ph7kla2acxzr6q0x";
        buildDepends = [
          array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats
          hstatistics mtl storable-complex
        ];
        extraLibraries = [ blas lapack ];
+       pkgconfigDepends = [ gsl ];
        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;  lapack = null;};
+     }) { inherit (pkgs) blas;  inherit (pkgs) gsl;  lapack = null;};
 
   "hsilop" = callPackage
     ({ mkDerivation, base, haskeline }:
@@ -71945,8 +72005,8 @@ self: {
     ({ mkDerivation, base, parsec, parsec-numbers }:
      mkDerivation {
        pname = "huttons-razor";
-       version = "0.1.0.1";
-       sha256 = "0iq377pbz3rpxj8zibavnjjck9f3xkl2ar2hy8jpj265rzm6lr7m";
+       version = "0.1.1.0";
+       sha256 = "1wwphyg2fm34gxn7s7a4q7p8fyab3c7am4fmw1x50gkrmkwgd72s";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base parsec parsec-numbers ];
@@ -72964,6 +73024,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "iap-verifier" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , conduit, http-conduit, monads-tf, text, transformers
+     }:
+     mkDerivation {
+       pname = "iap-verifier";
+       version = "0.1.0.1";
+       sha256 = "0mf55kx2y5q8qldgqcq805r3565nxngjm7nwq4q2xy54s7m2fsha";
+       buildDepends = [
+         aeson base base64-bytestring bytestring conduit http-conduit
+         monads-tf text transformers
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/tattsun/iap-verifier";
+       description = "A simple wrapper of In-App-Purchase receipt validate APIs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "iban" = callPackage
     ({ mkDerivation, base, containers, HUnit, iso3166-country-codes
      , tasty, tasty-hunit, text, unordered-containers
@@ -73026,9 +73104,9 @@ self: {
          template-haskell temporary test-framework test-framework-hunit text
          unix utf8-string
        ];
+       jailbreak = true;
        description = "An IDE backend library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ide-backend-common" = callPackage
@@ -73047,9 +73125,9 @@ self: {
          mtl pretty-show pureMD5 tagged template-haskell temporary text
          transformers unix
        ];
+       jailbreak = true;
        description = "Shared library used be ide-backend and ide-backend-server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ide-backend-rts" = callPackage
@@ -73083,7 +73161,6 @@ self: {
        ];
        description = "An IDE backend server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ideas" = callPackage
@@ -74352,6 +74429,7 @@ self: {
          base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck
          tasty-th text vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/maoe/influxdb-haskell";
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
@@ -74374,6 +74452,7 @@ self: {
          persistent persistent-postgresql shakespeare text time
          time-locale-compat yesod yesod-auth yesod-core yesod-form
        ];
+       jailbreak = true;
        homepage = "http://doomanddarkness.eu/pub/informative";
        description = "A yesod subsite serving a wiki";
        license = stdenv.lib.licenses.agpl3;
@@ -74429,8 +74508,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-c";
-       version = "0.5.2.0";
-       sha256 = "1i0x80g8sy7lb7wln22n4hbh3i553v1ky9gz7x72xf0gifszlr4y";
+       version = "0.5.3.1";
+       sha256 = "1n4w1lr3jwx4dwcks0c7rc79hdf4jwsgl3famivrdls01fqv9dhi";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -75265,6 +75344,7 @@ self: {
          aeson base bytestring cereal containers directory filepath mtl
          parsec SHA tar text transformers uuid zeromq4-haskell
        ];
+       jailbreak = true;
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for creating kernels for IPython frontends";
        license = stdenv.lib.licenses.mit;
@@ -76437,8 +76517,8 @@ self: {
      }:
      mkDerivation {
        pname = "jmacro";
-       version = "0.6.12";
-       sha256 = "08n00mmfixr6s3pgh6mccq1sk7932md8b36wdds3zb1p5icrrdpr";
+       version = "0.6.13";
+       sha256 = "0b7l4h3apkj41w69wg3ympflh2l53vbmyvs6xf20xn57d6p8lhn4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -76998,8 +77078,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc-client";
-       version = "0.1.3.0";
-       sha256 = "10wb9nv9ijqjn4w6mp306k58s2pqzc91529rgw29h72ww6q70ylq";
+       version = "0.1.4.0";
+       sha256 = "1lcjwf6j6j3azrrmbdhffm8a27d6gn48zrgp3w89x9ckgflyby22";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -77011,7 +77091,6 @@ self: {
          scientific test-framework test-framework-hunit
          test-framework-quickcheck2 text unordered-containers vector
        ];
-       jailbreak = true;
        description = "JSON-RPC 2.0 on the client side.";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -77023,8 +77102,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc-server";
-       version = "0.1.5.0";
-       sha256 = "1328366gdcsgfwqjzqgz07nnxn2j8gpbrcr6888wq1br0bxyczj5";
+       version = "0.1.6.0";
+       sha256 = "0qlmv4l0p70rij18m380myw2p1mhdq432kc0yky3n8rx8n29dlfq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -77046,8 +77125,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-schema";
-       version = "0.7.3.5";
-       sha256 = "1x7bm83745nsf947kb4m3h8zh4li1548dpbcm2yz16ppg5db182h";
+       version = "0.7.3.6";
+       sha256 = "0x1aj5scd0k0qapivn784y5np82fhr982sqvb64jw619aql5s6bv";
        buildDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -77072,6 +77151,7 @@ self: {
          aeson base generics-sop lens-sop tagged text time transformers
          unordered-containers vector
        ];
+       jailbreak = true;
        description = "Generics JSON (de)serialization using generics-sop";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77237,6 +77317,7 @@ self: {
        testDepends = [
          aeson base bytestring containers process tagged text
        ];
+       jailbreak = true;
        homepage = "https://github.com/yuga/jsonschema-gen";
        description = "JSON Schema generator from Algebraic data type";
        license = stdenv.lib.licenses.bsd3;
@@ -80278,7 +80359,9 @@ self: {
      mkDerivation {
        pname = "lens-aeson";
        version = "1.0.0.4";
+       revision = "1";
        sha256 = "0zjl645y4bwg3pvld8z4vj9rdpdy6fja2cx63d85k37zp5n98y7v";
+       editedCabalFile = "252661ca9f157ea5cb0aa6684c50fa1b84a2a3ed300c2eaec9ffb82eb18e7ddd";
        buildDepends = [
          aeson attoparsec base bytestring lens scientific text
          unordered-containers vector
@@ -80997,6 +81080,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "libpafe" = callPackage
+    ({ mkDerivation, base, bytestring, iconv, pafe }:
+     mkDerivation {
+       pname = "libpafe";
+       version = "0.1.0.0";
+       sha256 = "1qb67zb7fh582ws1j1hi704dkzp7am0jjxjnab29kpm6i3xmzprk";
+       buildDepends = [ base ];
+       testDepends = [ base bytestring iconv ];
+       extraLibraries = [ pafe ];
+       jailbreak = true;
+       description = "Wrapper for libpafe";
+       license = stdenv.lib.licenses.gpl2;
+     }) { pafe = null;};
+
   "libpq" = callPackage
     ({ mkDerivation, base, bytestring, postgresql, unix }:
      mkDerivation {
@@ -81602,8 +81699,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }:
      mkDerivation {
        pname = "linearscan";
-       version = "0.5.1.0";
-       sha256 = "123gs28vfb1lx9izzjran79caqj92p1l0v051pd0pf2nfm6iymgb";
+       version = "0.6.0.0";
+       sha256 = "0lprqpdrimrkdd2jmvbp9lpjnknr7a9bpiwh0rcx1jp5f777xfys";
        buildDepends = [ base containers ghc-prim mtl transformers ];
        homepage = "http://github.com/jwiegley/linearscan";
        description = "Linear scan register allocator, formally verified in Coq";
@@ -81612,19 +81709,21 @@ self: {
      }) {};
 
   "linearscan-hoopl" = callPackage
-    ({ mkDerivation, base, containers, deepseq, free, hoopl, hspec
-     , hspec-expectations, lens-family-core, linearscan, transformers
+    ({ mkDerivation, base, containers, deepseq, free, fuzzcheck, hoopl
+     , hspec, hspec-expectations, lens-family-core, linearscan
+     , QuickCheck, tardis, transformers
      }:
      mkDerivation {
        pname = "linearscan-hoopl";
-       version = "0.5.1.0";
-       sha256 = "147ryhliilbpmzy87bda7aapfpfhw4r6rcy6jla2ampy7qvvvbyk";
+       version = "0.6.0.0";
+       sha256 = "0sag9590df05fs46fv846hqwwiab85i9dsx4xn4y9w4islxi8hkb";
        buildDepends = [
-         base containers free hoopl linearscan transformers
+         base containers free hoopl linearscan QuickCheck tardis
+         transformers
        ];
        testDepends = [
-         base containers deepseq hoopl hspec hspec-expectations
-         lens-family-core linearscan transformers
+         base containers deepseq fuzzcheck hoopl hspec hspec-expectations
+         lens-family-core linearscan QuickCheck tardis transformers
        ];
        homepage = "http://github.com/jwiegley/linearscan-hoopl";
        description = "Makes it easy to use the linearscan register allocator with Hoopl";
@@ -82214,8 +82313,8 @@ self: {
      }:
      mkDerivation {
        pname = "list-t-libcurl";
-       version = "0.2.0.2";
-       sha256 = "1scvspy8kdyqyv2iv0alnh9qal5dlxy3pbcz5k7ib0v02acj9jhz";
+       version = "0.3.0.0";
+       sha256 = "1hcgxr87q7k6ixisj4p4gghm7nqb1l7bg361rcnqxf1145xmyyr5";
        buildDepends = [
          base base-prelude bytestring curlhs either list-t mtl-prelude
          resource-pool stm
@@ -82911,8 +83010,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-domain";
-       version = "0.10.0.1";
-       sha256 = "04k7k8p1p8fgzyms21ry4qf1l987k3pvs673sq9rh1h6hmk9bsg2";
+       version = "0.10.1";
+       sha256 = "0gbs902l5fh5pqhcj31g0a5d2irjx11sw3jhk69c9hcfssclnd8h";
        buildDepends = [
          base binary bytes cereal comonad deepseq distributive
          generic-deriving hashable hashable-extras safecopy semigroupoids
@@ -82922,7 +83021,6 @@ self: {
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
-       jailbreak = true;
        homepage = "http://github.com/analytics/log-domain/";
        description = "Log-domain arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -83479,6 +83577,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ltext" = callPackage
+    ({ mkDerivation, aeson, base, composition, composition-extra
+     , containers, data-default, directory, hspec, mtl
+     , optparse-applicative, parsec, pretty, text, transformers, yaml
+     }:
+     mkDerivation {
+       pname = "ltext";
+       version = "0.0.0.1";
+       sha256 = "1qz4gpdfjqrq6rgbf3zqcmwkf0x0kphnpr4y7q47wb12wq7xaqa1";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base composition composition-extra containers data-default
+         directory mtl optparse-applicative parsec pretty text transformers
+         yaml
+       ];
+       testDepends = [ base hspec ];
+       description = "Higher-order file applicator";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ltk" = callPackage
     ({ mkDerivation, base, Cabal, containers, filepath, ghc, glib, gtk3
      , mtl, parsec, pretty, text, transformers
@@ -84045,7 +84164,7 @@ self: {
      }) {};
 
   "mage" = callPackage
-    ({ mkDerivation, array, base, containers, curses, mtl, random }:
+    ({ mkDerivation, array, base, containers, mtl, ncurses, random }:
      mkDerivation {
        pname = "mage";
        version = "1.1.0";
@@ -84053,12 +84172,12 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ array base containers mtl random ];
-       extraLibraries = [ curses ];
+       extraLibraries = [ ncurses ];
        homepage = "http://www.scannedinavian.com/~shae/mage-1.0pre35.tar.gz";
        description = "Rogue-like";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { curses = null;};
+     }) { inherit (pkgs) ncurses;};
 
   "magic" = callPackage
     ({ mkDerivation, base, magic }:
@@ -84167,6 +84286,7 @@ self: {
          aeson base http-client http-client-tls http-types reflection scotty
          text transformers wai-extra
        ];
+       jailbreak = true;
        homepage = "https://github.com/mietek/mailchimp-subscribe/";
        description = "MailChimp subscription request handler";
        license = stdenv.lib.licenses.mit;
@@ -84704,6 +84824,7 @@ self: {
          aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
          tasty-quickcheck text
        ];
+       jailbreak = true;
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -84758,6 +84879,7 @@ self: {
          template-haskell text time tls transformers transformers-base
          unordered-containers utf8-string vector wai warp x509-system
        ];
+       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Bindings to the MangoPay API";
        license = stdenv.lib.licenses.bsd3;
@@ -85499,6 +85621,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ ansi-terminal base directory pandoc terminfo ];
+       jailbreak = true;
        homepage = "https://github.com/dorafmon/mdcat";
        description = "Markdown viewer in your terminal";
        license = stdenv.lib.licenses.mit;
@@ -85590,21 +85713,20 @@ self: {
 
   "meep" = callPackage
     ({ mkDerivation, base, bifunctors, doctest, hspec
-     , hspec-expectations-lens, lens, QuickCheck, semigroups
+     , hspec-expectations-lens, lens, QuickCheck, semigroupoids
+     , semigroups
      }:
      mkDerivation {
        pname = "meep";
-       version = "0.1.1.0";
-       sha256 = "1rk5mrvmk07m5zdayfvxirak58d1bxwb04sgg0gcx07w8q8k4yyq";
-       buildDepends = [ base bifunctors lens semigroups ];
+       version = "0.1.2.0";
+       sha256 = "1jr3zgja3m40ajygi1jqsxfwhsf7yf0lwblffd8z096w67pn4idr";
+       buildDepends = [ base bifunctors lens semigroupoids semigroups ];
        testDepends = [
          base bifunctors doctest hspec hspec-expectations-lens lens
-         QuickCheck semigroups
+         QuickCheck semigroupoids semigroups
        ];
-       jailbreak = true;
        description = "A silly container";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mega-sdist" = callPackage
@@ -85809,8 +85931,8 @@ self: {
      }:
      mkDerivation {
        pname = "memory";
-       version = "0.3";
-       sha256 = "17dry2yfnj7vldrdh0kynyaa4pfyy88k3035w3hxggh7n325dfir";
+       version = "0.4";
+       sha256 = "1n7w11w3c9qag17nx6ssp2ni2kym980dwrwdrpdf7668n1jkcjvr";
        buildDepends = [ base bytestring deepseq ghc-prim ];
        testDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        homepage = "https://github.com/vincenthz/hs-memory";
@@ -86718,6 +86840,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "minst-idx" = callPackage
+    ({ mkDerivation, base, binary, bytestring, directory, hspec, vector
+     }:
+     mkDerivation {
+       pname = "minst-idx";
+       version = "0.1.2.1";
+       sha256 = "149128cags685m463p92vzri9cr501dby2vs0aqmrka8sg0py7j9";
+       buildDepends = [ base binary bytestring vector ];
+       testDepends = [ base binary directory hspec vector ];
+       homepage = "https://github.com/kryoxide/minst-idx/";
+       description = "Read and write IDX data that is used in e.g. the MINST database.";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "mirror-tweet" = callPackage
     ({ mkDerivation, authenticate-oauth, base, bytestring, conduit
      , lens, monad-logger, text, transformers, twitter-conduit
@@ -87358,6 +87494,7 @@ self: {
        buildDepends = [
          base either monad-control mtl transformers transformers-base
        ];
+       jailbreak = true;
        homepage = "http://github.com/phaazon/monad-journal";
        description = "Pure logger typeclass and monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -87689,8 +87826,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim }:
      mkDerivation {
        pname = "monad-skeleton";
-       version = "0.1.1";
-       sha256 = "14rwxhjkp3msycrpxna0sdyfyy6r8v7rqrz476p07gsmd6avpsrx";
+       version = "0.1.2";
+       sha256 = "13lkbbvajfl4lr6r5plmxvqk6bxn7mp6acsyfxwh2yr6krzdlb82";
        buildDepends = [ base containers ghc-prim ];
        homepage = "https://github.com/fumieval/monad-skeleton";
        description = "An undead monad";
@@ -88237,10 +88374,9 @@ self: {
     ({ mkDerivation, base, groups, semigroupoids, semigroups }:
      mkDerivation {
        pname = "monoid-extras";
-       version = "0.4.0.0";
-       sha256 = "0j8lc03zamxplyw5k8kv8qa78j5xkmf581rz4iw2v9qhbx66cfpx";
+       version = "0.4.0.1";
+       sha256 = "0jcyjqmk4s64j05qisvibmy87m5xi5n837wsivq7lml8lfyrj7yf";
        buildDepends = [ base groups semigroupoids semigroups ];
-       jailbreak = true;
        description = "Various extra monoid-related definitions and utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -89063,6 +89199,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "muesli" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers, directory
+     , filepath, hashable, mtl, psqueues, time
+     }:
+     mkDerivation {
+       pname = "muesli";
+       version = "0.1.0.1";
+       sha256 = "10dyk5yz911lfdf11iizmpinha7h09gd7yrg67wjsb6myyvwbdg5";
+       buildDepends = [
+         base bytestring cereal containers directory filepath hashable mtl
+         psqueues time
+       ];
+       homepage = "https://github.com/clnx/muesli";
+       description = "A simple document-oriented database";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mueval" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory
      , extensible-exceptions, filepath, hint, mtl, process, show
@@ -90070,8 +90223,8 @@ self: {
      }:
      mkDerivation {
        pname = "nagios-check";
-       version = "0.2.1";
-       sha256 = "0qnzdljrdwzrsfapm2d6ykz2xzdhq5hzxy51gixsbmlvknglx5bh";
+       version = "0.3.1";
+       sha256 = "17ww3n2y6cmjc3n05cra43csk60sm5s07q2mn3zq1sjiiq2cw82c";
        buildDepends = [
          base bifunctors exceptions mtl nagios-perfdata text
        ];
@@ -90224,18 +90377,18 @@ self: {
      }) {};
 
   "nanocurses" = callPackage
-    ({ mkDerivation, base, bytestring, curses, unix }:
+    ({ mkDerivation, base, bytestring, ncurses, unix }:
      mkDerivation {
        pname = "nanocurses";
        version = "1.5.2";
        sha256 = "04kgf3vvjdx6d1fmfzp0xy5x42zlg0ij59ayi1zhz8hkwsfn5g1m";
        buildDepends = [ base bytestring unix ];
-       extraLibraries = [ curses ];
+       extraLibraries = [ ncurses ];
        homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html";
        description = "Simple Curses binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { curses = null;};
+     }) { inherit (pkgs) ncurses;};
 
   "nanomsg" = callPackage
     ({ mkDerivation, base, bytestring, nanomsg }:
@@ -90487,7 +90640,6 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-ncurses/";
        description = "Modernised bindings to GNU ncurses";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) ncurses;};
 
   "neat" = callPackage
@@ -91354,8 +91506,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "network-info";
-       version = "0.2.0.5";
-       sha256 = "0ggxnkjkbspynma0wjrc1wwwb9ygx2dhl0n9lfaq7l8r69z7pqwf";
+       version = "0.2.0.6";
+       sha256 = "1ymi2cw3914wvinw0wssmq8m2j4g92q1sd5vi9dxfyb7lrj1gga7";
        buildDepends = [ base ];
        homepage = "http://github.com/jystic/network-info";
        description = "Access the local computer's basic network configuration";
@@ -93003,12 +93155,13 @@ self: {
      }) {};
 
   "observable-sharing" = callPackage
-    ({ mkDerivation, base, unordered-containers }:
+    ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "observable-sharing";
-       version = "0.2.0.0";
-       sha256 = "01lri324xygda17nzc7bg6s3f52nivi8qjigbx9ack7zxhm9jyd7";
-       buildDepends = [ base unordered-containers ];
+       version = "0.2.1.0";
+       sha256 = "11k6wzk3k39d87zbxminz1ga7nw6r96lf5kki40y673n500i4vdc";
+       buildDepends = [ base containers ];
+       homepage = "https://github.com/atzeus/observable-sharing";
        description = "Simple observable sharing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -93745,10 +93898,11 @@ self: {
     ({ mkDerivation, base, opentheory-primitive, QuickCheck }:
      mkDerivation {
        pname = "opentheory";
-       version = "1.197";
-       sha256 = "0z21swy53yd7lwdwkqr5ypp9sz3whq04fl7rdyqln914c554hxw5";
+       version = "1.199";
+       sha256 = "1il1lyjmv7ij7clnbc57ajpfwlg5a5ld3m619hxylpafyrbr4v5y";
        buildDepends = [ base opentheory-primitive QuickCheck ];
        testDepends = [ base opentheory-primitive QuickCheck ];
+       homepage = "http://opentheory.gilith.com/?pkg=base";
        description = "The standard theory library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -93759,12 +93913,13 @@ self: {
      }:
      mkDerivation {
        pname = "opentheory-bits";
-       version = "1.65";
-       sha256 = "0qinq1i4pip8dqq2h5x9xs6bgrv29yngg0xywl03bsymccqvsd8d";
+       version = "1.66";
+       sha256 = "1qjgrmi05ay4qss6w5ld4pmksb3lsscqpw0x2dcdkja1i5hfpwfj";
        buildDepends = [
          base opentheory opentheory-primitive opentheory-probability
          QuickCheck
        ];
+       homepage = "http://opentheory.gilith.com/?pkg=natural-bits";
        description = "Natural number to bit-list conversions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -93775,12 +93930,13 @@ self: {
      }:
      mkDerivation {
        pname = "opentheory-byte";
-       version = "1.125";
-       sha256 = "1lbfd231cznz7sxg1bgkzcp389bg1lyzlnqyw9q1s1c5yxd6a026";
+       version = "1.126";
+       sha256 = "0zlfik0irikrwk706fdjqb10z5jck3ldlsw269mfwlz6s1d5j2qz";
        buildDepends = [
          base opentheory opentheory-bits opentheory-primitive
          opentheory-probability QuickCheck
        ];
+       homepage = "http://opentheory.gilith.com/?pkg=byte";
        description = "Bytes";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -93810,10 +93966,11 @@ self: {
      }:
      mkDerivation {
        pname = "opentheory-divides";
-       version = "1.57";
-       sha256 = "0g9p7y7s6ggs6sslv3bcjb4b7l0hnkx2z2xm23pp19piangpi1m8";
+       version = "1.62";
+       sha256 = "182c14c1j9m82pnx6crxgrry02yvixziap9ikhavx7krr52vdwbv";
        buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
        testDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       homepage = "http://opentheory.gilith.com/?pkg=natural-divides";
        description = "The divides relation on natural numbers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -93823,10 +93980,11 @@ self: {
      }:
      mkDerivation {
        pname = "opentheory-parser";
-       version = "1.157";
-       sha256 = "1ng772jinni54if2070rqqgvg67bijzvrpyb9y85nqs2r76mhhq2";
+       version = "1.158";
+       sha256 = "0325g7m5z64dg8sihmcgi9rmkms6r76hf1d7927v08dl5xh4dlhi";
        buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
        testDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       homepage = "http://opentheory.gilith.com/?pkg=parser";
        description = "Stream parsers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -93837,8 +93995,8 @@ self: {
      }:
      mkDerivation {
        pname = "opentheory-prime";
-       version = "1.81";
-       sha256 = "14br1cn9kifm1hm2ak1ydn8pvnr1pwhzgvy25xk41ysan613ix4g";
+       version = "1.82";
+       sha256 = "1x6sir4abr34cghmhbyv5qfd847xbbxg88qaw1vs3sa5lhb5dm8s";
        buildDepends = [
          base opentheory opentheory-divides opentheory-primitive
          opentheory-stream QuickCheck
@@ -93847,6 +94005,7 @@ self: {
          base opentheory opentheory-divides opentheory-primitive
          opentheory-stream QuickCheck
        ];
+       homepage = "http://opentheory.gilith.com/?pkg=natural-prime";
        description = "Prime natural numbers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -93855,10 +94014,11 @@ self: {
     ({ mkDerivation, base, QuickCheck, random }:
      mkDerivation {
        pname = "opentheory-primitive";
-       version = "1.5";
-       sha256 = "065xbgdw7c7bfvsns722ri6dxirxlnhxid0vj4628syn64frdgsw";
+       version = "1.7";
+       sha256 = "02lg02w4sds1489bfz4hwgnhd9l6a1l7r9pwjd3s16yj2hbmr6jn";
        buildDepends = [ base QuickCheck random ];
        testDepends = [ base QuickCheck random ];
+       homepage = "http://www.gilith.com/research/opentheory/";
        description = "Haskell primitives used by OpenTheory packages";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -93868,9 +94028,10 @@ self: {
      }:
      mkDerivation {
        pname = "opentheory-probability";
-       version = "1.48";
-       sha256 = "05hzdm5f96a4zr16hi5gg6nj9qiglsx66p9f2jss5j5rnw6n4i88";
+       version = "1.49";
+       sha256 = "0dszjszjdabgafpvxiailpgzm7y96f4a8zhjfhin3m36f3lb0dmy";
        buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       homepage = "http://opentheory.gilith.com/?pkg=probability";
        description = "Probability";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -93880,9 +94041,10 @@ self: {
      }:
      mkDerivation {
        pname = "opentheory-stream";
-       version = "1.44";
-       sha256 = "0j7vz4y15mv643rcclxmf68a2hlkfrjjk1lwj25fmwsi92l08l3z";
+       version = "1.45";
+       sha256 = "0gl7svhyrvi6bznfmc3jfar6hzlrywni6f7pvaykjzkf80xzljbr";
        buildDepends = [ base opentheory opentheory-primitive QuickCheck ];
+       homepage = "http://opentheory.gilith.com/?pkg=stream";
        description = "Infinite stream types";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -93894,8 +94056,8 @@ self: {
      }:
      mkDerivation {
        pname = "opentheory-unicode";
-       version = "1.139";
-       sha256 = "0dmd0a1gfw4f1jifgb6vb3n69gsl23m0wsxz68lh5q1pb18byk8d";
+       version = "1.140";
+       sha256 = "1w916hc6qn8bf5z95b43aqm25mbivlg7b4q91g5s6gy3q1f4iqna";
        buildDepends = [
          base opentheory opentheory-bits opentheory-byte opentheory-parser
          opentheory-primitive opentheory-probability QuickCheck
@@ -93904,6 +94066,7 @@ self: {
          base opentheory opentheory-bits opentheory-byte opentheory-parser
          opentheory-primitive opentheory-probability QuickCheck
        ];
+       homepage = "http://opentheory.gilith.com/?pkg=char";
        description = "Unicode characters";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -94708,6 +94871,7 @@ self: {
          time-locale-compat transformers transformers-base
          transformers-compat unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://github.com/brendanhay/pagerduty";
        description = "Client library for PagerDuty Integration and REST APIs";
        license = "unknown";
@@ -94776,31 +94940,31 @@ self: {
   "pandoc" = callPackage
     ({ mkDerivation, aeson, alex, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
-     , containers, data-default, deepseq-generics, Diff, directory
-     , executable-path, extensible-exceptions, filepath, haddock-library
-     , happy, highlighting-kate, hslua, HTTP, http-client
-     , http-client-tls, http-types, HUnit, JuicyPixels, mtl, network
-     , network-uri, old-locale, 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
+     , cmark, containers, css-text, data-default, deepseq-generics, Diff
+     , directory, executable-path, extensible-exceptions, filemanip
+     , filepath, haddock-library, happy, highlighting-kate, hslua, HTTP
+     , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl
+     , network, network-uri, old-locale, 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.13.2.1";
-       sha256 = "0pvqi52sh3ldnszrvxlcq1s4v19haqb0wqh5rzn43pmqj2v6xnk6";
+       version = "1.14";
+       sha256 = "0n4l3jzvd8jzbsi6n4wli2dhijgywbpbss4syjmfnds9pbk6mhz1";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson alex array base base64-bytestring binary blaze-html
-         blaze-markup bytestring containers data-default deepseq-generics
-         directory extensible-exceptions filepath haddock-library happy
-         highlighting-kate hslua HTTP http-client http-client-tls http-types
-         JuicyPixels mtl network network-uri old-locale old-time
-         pandoc-types parsec process random scientific SHA syb tagsoup
-         temporary texmath text time unordered-containers vector xml yaml
-         zip-archive zlib
+         blaze-markup bytestring cmark containers css-text data-default
+         deepseq-generics directory extensible-exceptions filemanip filepath
+         haddock-library happy highlighting-kate hslua HTTP http-client
+         http-client-tls http-types JuicyPixels mtl network network-uri
+         old-locale old-time pandoc-types parsec process random scientific
+         SHA syb tagsoup temporary texmath text time unordered-containers
+         vector xml yaml zip-archive zlib
        ];
        testDepends = [
          ansi-terminal base bytestring containers Diff directory
@@ -94838,6 +95002,7 @@ self: {
          aeson base bytestring directory filepath pandoc pandoc-types
          process temporary text yaml
        ];
+       jailbreak = true;
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -94899,14 +95064,14 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-types";
-       version = "1.12.4.2";
-       sha256 = "0j9zzlpwjyy8fqr91fsnzy507ylwrwk7hhl9nkxzk19iva2c42n9";
+       version = "1.12.4.3";
+       sha256 = "1aj741y28ci039gy9j16jc7v3vfrj0rc11jliahx4202dz6fdyb5";
        buildDepends = [
          aeson base bytestring containers deepseq-generics ghc-prim syb
        ];
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Types for representing a structured document";
-       license = stdenv.lib.licenses.bsd3;
+       license = "GPL";
      }) {};
 
   "pandoc-unlit" = callPackage
@@ -95691,8 +95856,8 @@ self: {
      }:
      mkDerivation {
        pname = "path";
-       version = "0.4.0";
-       sha256 = "1576dlzrachkrxspsx4rnssmhmicja1pfd8z63g3zmz0m450dkpj";
+       version = "0.5.0";
+       sha256 = "1fk1fpyrmdxym2qnjmlhkgn2kyn5j728hiqw94i8kg47c1xnihkk";
        buildDepends = [ base exceptions filepath template-haskell ];
        testDepends = [ base hspec HUnit mtl ];
        description = "Path";
@@ -96210,12 +96375,11 @@ self: {
      }:
      mkDerivation {
        pname = "peakachu";
-       version = "0.3.0";
-       sha256 = "0awj571rgcn69vl907b26j68azy7kyd3kki014lsfsngql9cp1pq";
+       version = "0.3.1";
+       sha256 = "1wmlainnbrzpwrsr4qhw7m39s4crhc67xg1mxam0rfj9c1cnimxp";
        buildDepends = [
          base derive GLUT List template-haskell time TypeCompose
        ];
-       jailbreak = true;
        description = "Experiemental library for composable interactive programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96559,8 +96723,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent";
-       version = "2.1.5";
-       sha256 = "10ln7x3i16a3mxi7j4489rbl50xi3zpjbr49y25hgk0zz7pngnkz";
+       version = "2.1.6";
+       sha256 = "17jcj5xvxnck93dk01ac31mbh1b5pk1266x1zqap40glqs247myl";
        buildDepends = [
          aeson attoparsec base base64-bytestring blaze-html blaze-markup
          bytestring conduit containers exceptions fast-logger lifted-base
@@ -96570,8 +96734,9 @@ self: {
        ];
        testDepends = [
          aeson attoparsec base base64-bytestring blaze-html bytestring
-         conduit containers hspec monad-control monad-logger old-locale
-         path-pieces resourcet scientific text time transformers
+         conduit containers fast-logger hspec lifted-base monad-control
+         monad-logger mtl old-locale path-pieces resource-pool resourcet
+         scientific tagged template-haskell text time transformers
          unordered-containers vector
        ];
        extraLibraries = [ sqlite ];
@@ -96709,8 +96874,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-postgresql";
-       version = "2.1.5.3";
-       sha256 = "1ir23x7b2hagpiiva45fmcyfdmi2cw7m0qf2zqdp22lpa41vlyvl";
+       version = "2.1.6";
+       sha256 = "1s3dzwxv1rzfg7f5l9qsypzvm7pk2jiqjzdfksiq0ji37f73v7l6";
        buildDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger persistent postgresql-libpq
@@ -96821,8 +96986,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-template";
-       version = "2.1.3.1";
-       sha256 = "09qzl0wjf5h8xgs8imq9q25ik8xkn7jgpy9wpmwvsr5wichdfgk5";
+       version = "2.1.3.3";
+       sha256 = "1p9vndchcd06ajqmqmf3pw5ql9r6jqbs9xl5jxv1x0pjvbq6yjy5";
        buildDepends = [
          aeson base bytestring containers ghc-prim monad-control
          monad-logger path-pieces persistent tagged template-haskell text
@@ -96831,6 +96996,7 @@ self: {
        testDepends = [
          aeson base bytestring hspec persistent QuickCheck text transformers
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, non-relational, multi-backend persistence";
        license = stdenv.lib.licenses.mit;
@@ -97334,6 +97500,7 @@ self: {
          http-client-tls network-info process random text text-format time
          xdg-basedir
        ];
+       jailbreak = true;
        homepage = "https://github.com/enolan/pia-forward";
        description = "Set up port forwarding with the Private Internet Access VPN service";
        license = stdenv.lib.licenses.gpl3;
@@ -97509,6 +97676,7 @@ self: {
          aeson attoparsec base bytestring pipes pipes-attoparsec
          pipes-bytestring pipes-parse transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/k0001/pipes-aeson";
        description = "Encode and decode JSON streams using Aeson and Pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -97704,18 +97872,6 @@ self: {
      }) {};
 
   "pipes-errors" = callPackage
-    ({ mkDerivation, base, errors, pipes }:
-     mkDerivation {
-       pname = "pipes-errors";
-       version = "0.2.1";
-       sha256 = "08i3rzqz7r5vkjfry0bdw3gpxjzhni8xmwwa6p8hdkixznjq7539";
-       buildDepends = [ base errors pipes ];
-       homepage = "https://github.com/jdnavarro/pipes-errors";
-       description = "Integration between pipes and errors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-errors_0_3" = callPackage
     ({ mkDerivation, base, errors, pipes }:
      mkDerivation {
        pname = "pipes-errors";
@@ -98691,6 +98847,7 @@ self: {
        version = "0.7.3";
        sha256 = "0vv7j1l0wnjwpd3hpxswq0k33izl0ck2njspcga885bkrd45lzdr";
        buildDepends = [ base binary containers text text-binary ];
+       jailbreak = true;
        homepage = "https://github.com/kawu/polimorf";
        description = "Working with the PoliMorf dictionary";
        license = stdenv.lib.licenses.bsd3;
@@ -99657,8 +99814,11 @@ self: {
      mkDerivation {
        pname = "pqueue";
        version = "1.2.1";
+       revision = "1";
        sha256 = "1fily60f4njby7zknmik7a2wxsm3y77ckr69w9bb3fgq22gbzky6";
+       editedCabalFile = "ea1de2ab89c2b8b16eb189910b568409e2a5b4af283cf19e179a6fd95fe15fa3";
        buildDepends = [ base deepseq ];
+       jailbreak = true;
        description = "Reliable, persistent, fast priority queues";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99952,7 +100112,9 @@ self: {
      mkDerivation {
        pname = "presburger";
        version = "1.3.1";
+       revision = "1";
        sha256 = "15yhqc6gk14dsqr4b0x87i1xw0sc3iscw28grg4vmcspsjxil0l6";
+       editedCabalFile = "7c88061e13bab0e63240c05dad36b9518ad50d7ad4ade0f8911efa7826eb4b5d";
        buildDepends = [ base containers pretty ];
        testDepends = [ base QuickCheck ];
        homepage = "http://github.com/yav/presburger";
@@ -101216,8 +101378,8 @@ self: {
      }:
      mkDerivation {
        pname = "pseudo-boolean";
-       version = "0.1.0.0";
-       sha256 = "1dqy8zpf7016rm3wyvgwipllm95wmrr9na04v4x402k1f8pvkdvc";
+       version = "0.1.0.1";
+       sha256 = "1a46dx6xxnzhf66kym9xbxxcbqkmqbadg7gxhd2clsahbwlm4w4d";
        buildDepends = [
          attoparsec base bytestring bytestring-builder containers deepseq
          dlist hashable parsec
@@ -101227,7 +101389,7 @@ self: {
          tasty-th temporary
        ];
        homepage = "https://github.com/msakai/pseudo-boolean";
-       description = "Reading\/Writing OPB\/WBO files used in pseudo boolean competition";
+       description = "Reading/Writing OPB/WBO files used in pseudo boolean competition";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -103327,10 +103489,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "rdtsc";
-       version = "1.3.0.0";
-       sha256 = "1j421cfyz35mkh78idw89b0gl7c810n04pfh0lvdprghlfk90adk";
+       version = "1.3.0.1";
+       sha256 = "0l6r5v6bgqf7lq9j6bf7w362bz7bv4xrsbz90ns60v4dyqjskjal";
        buildDepends = [ base ];
-       homepage = "http://code.haskell.org/rdtsc";
+       homepage = "https://github.com/mgrabmueller/rdtsc";
        description = "Binding for the rdtsc machine instruction";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103751,6 +103913,7 @@ self: {
        sha256 = "023g63y478k7mq8kk5xcxa3civs3hdhlvdb0qh3amvvybpj3g4av";
        buildDepends = [ aeson base base-prelude record template-haskell ];
        testDepends = [ aeson base-prelude hspec record ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/record-aeson";
        description = "Instances of \"aeson\" classes for the \"record\" types";
        license = stdenv.lib.licenses.mit;
@@ -105842,20 +106005,20 @@ self: {
 
   "rest-core" = callPackage
     ({ mkDerivation, aeson, aeson-utils, base, bytestring
-     , case-insensitive, either, errors, fclabels, HUnit, hxt
-     , hxt-pickle-utils, json-schema, mtl, mtl-compat, multipart, random
-     , rest-stringmap, rest-types, safe, split, test-framework
-     , test-framework-hunit, text, transformers, transformers-compat
-     , unordered-containers, uri-encode, utf8-string, uuid
+     , case-insensitive, errors, fclabels, HUnit, hxt, hxt-pickle-utils
+     , json-schema, mtl, mtl-compat, multipart, random, rest-stringmap
+     , rest-types, safe, split, test-framework, test-framework-hunit
+     , text, transformers, transformers-compat, unordered-containers
+     , uri-encode, utf8-string, uuid
      }:
      mkDerivation {
        pname = "rest-core";
-       version = "0.36.0.1";
-       sha256 = "0a4l1ll2a16ma1lzq7cdhrcf4ld8p40hysfkz2l4m80gf5khzmby";
+       version = "0.36.0.4";
+       sha256 = "07ypxsf15ghcnlb706cnl3jw275jlwa158dxb0gkr6ab8sq5f2zk";
        buildDepends = [
-         aeson aeson-utils base bytestring case-insensitive either errors
-         fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat multipart
-         random rest-stringmap rest-types safe split text transformers
+         aeson aeson-utils base bytestring case-insensitive errors fclabels
+         hxt hxt-pickle-utils json-schema mtl mtl-compat multipart random
+         rest-stringmap rest-types safe split text transformers
          transformers-compat unordered-containers uri-encode utf8-string
          uuid
        ];
@@ -105884,6 +106047,7 @@ self: {
          json-schema mtl rest-core rest-gen safe stm text time transformers
          transformers-base transformers-compat unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/silkapp/rest";
        description = "Example project for rest";
        license = stdenv.lib.licenses.bsd3;
@@ -105893,21 +106057,19 @@ self: {
     ({ mkDerivation, aeson, base, 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, tagged
-     , test-framework, test-framework-hunit, text, uniplate
-     , unordered-containers, vector
+     , rest-core, safe, scientific, semigroups, split, test-framework
+     , test-framework-hunit, text, uniplate, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "rest-gen";
-       version = "0.17.0.4";
-       revision = "1";
-       sha256 = "1ycdpqscdc8rxpj1fv6bjj7bvi6jww010c2rvcs6b155jxwdg5l2";
-       editedCabalFile = "b218da6eb2fd339d0d16ac67e441379824aaba7ef2b8b2cc3f9acbb88d7be778";
+       version = "0.17.0.5";
+       sha256 = "1pwn1ws6dcwa00y8dblaj7wnr51mv9hjrc05fiv7mzvl0j0v0iz7";
        buildDepends = [
          aeson base blaze-html Cabal code-builder directory fclabels
          filepath hashable haskell-src-exts HStringTemplate hxt json-schema
-         pretty process rest-core safe scientific semigroups split tagged
-         text uniplate unordered-containers vector
+         pretty process rest-core safe scientific semigroups split text
+         uniplate unordered-containers vector
        ];
        testDepends = [
          base fclabels haskell-src-exts HUnit rest-core test-framework
@@ -105950,14 +106112,14 @@ self: {
 
   "rest-stringmap" = callPackage
     ({ mkDerivation, aeson, base, containers, hashable, hxt
-     , json-schema, tagged, text, tostring, unordered-containers
+     , json-schema, tostring, unordered-containers
      }:
      mkDerivation {
        pname = "rest-stringmap";
-       version = "0.2.0.4";
-       sha256 = "0r9wmy5myysnw83000qlw547ny9lpshm09fi8hmfr14kd3mr9fb1";
+       version = "0.2.0.5";
+       sha256 = "0xnvzwwaxfl2iphpicprn0wvlfk3cg6vz53kl2gv1fi322jcjv3b";
        buildDepends = [
-         aeson base containers hashable hxt json-schema tagged text tostring
+         aeson base containers hashable hxt json-schema tostring
          unordered-containers
        ];
        description = "Maps with stringy keys that can be transcoded to JSON and XML";
@@ -105966,17 +106128,15 @@ self: {
 
   "rest-types" = callPackage
     ({ mkDerivation, aeson, base, case-insensitive, generic-aeson
-     , generic-xmlpickler, hxt, json-schema, mtl, rest-stringmap, text
-     , transformers, transformers-compat, uuid
+     , generic-xmlpickler, hxt, json-schema, rest-stringmap, text, uuid
      }:
      mkDerivation {
        pname = "rest-types";
-       version = "1.14";
-       sha256 = "02pixhkym28c9jc5w4bf3fjvpcid9vha3f5qd2v4kny4hfq47ybq";
+       version = "1.14.0.1";
+       sha256 = "0chb91gb3xvfp7k4sbsp07ri2m5x26qj4q2bq0ldkxpk06jicmb4";
        buildDepends = [
          aeson base case-insensitive generic-aeson generic-xmlpickler hxt
-         json-schema mtl rest-stringmap text transformers
-         transformers-compat uuid
+         json-schema rest-stringmap text uuid
        ];
        description = "Silk Rest Framework Types";
        license = stdenv.lib.licenses.bsd3;
@@ -108313,8 +108473,8 @@ self: {
      }:
      mkDerivation {
        pname = "scalpel";
-       version = "0.2.0.1";
-       sha256 = "13fg89klhw9lwirhglbn1cvky0gwaf0idanrvcrd9wv875kxisd4";
+       version = "0.2.1";
+       sha256 = "0lva7pi78ksbxcjd19dycn4ayxcma28wrjmx3x31hn01nvhsnqg0";
        buildDepends = [
          base bytestring curl regex-base regex-tdfa tagsoup text
        ];
@@ -108592,6 +108752,7 @@ self: {
        buildDepends = [
          aeson base bytestring containers deepseq-generics ghc-prim syb
        ];
+       jailbreak = true;
        homepage = "http://scholdoc.scholarlymarkdown.com";
        description = "Scholdoc fork of pandoc-types";
        license = "GPL";
@@ -108799,9 +108960,9 @@ self: {
      mkDerivation {
        pname = "scotty";
        version = "0.9.1";
-       revision = "1";
+       revision = "2";
        sha256 = "0w07ghnd7l8ibfbl8p74lwn8gxy3z28mp0rlv5crma3yh42irsqm";
-       editedCabalFile = "5a0fefbeb7107a096658d4f0743084bd26e9b0c84853fd560715b0aa46c5802a";
+       editedCabalFile = "e37bd4bbb4da4e6d20bd8a29a5c3ca13476643e796a3463a20cbcbd2437bfde7";
        buildDepends = [
          aeson base blaze-builder bytestring case-insensitive data-default
          http-types monad-control mtl regex-compat text transformers
@@ -109195,6 +109356,7 @@ self: {
          base primitive QuickCheck storable-complex test-framework
          test-framework-quickcheck2 vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/adamwalker/sdr";
        description = "A software defined radio library";
        license = stdenv.lib.licenses.bsd3;
@@ -112614,6 +112776,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smallcheck-lens" = callPackage
+    ({ mkDerivation, base, lens, smallcheck, smallcheck-series, tasty
+     , tasty-smallcheck, transformers
+     }:
+     mkDerivation {
+       pname = "smallcheck-lens";
+       version = "0.1";
+       sha256 = "19awz3gphvkmb54j3mqqmqjzdjywdrrvsb9lp46gbhjazn94sxdl";
+       buildDepends = [
+         base lens smallcheck smallcheck-series tasty tasty-smallcheck
+         transformers
+       ];
+       testDepends = [ base lens smallcheck tasty tasty-smallcheck ];
+       homepage = "https://github.com/jdnavarro/smallcheck-lens";
+       description = "SmallCheck lens laws";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "smallcheck-series" = callPackage
     ({ mkDerivation, base, bytestring, containers, doctest, Glob
      , logict, smallcheck, text, transformers
@@ -112915,6 +113095,7 @@ self: {
          stm syb template-haskell text time transformers
          unordered-containers vector vector-algorithms xmlhtml
        ];
+       jailbreak = true;
        homepage = "http://snapframework.com/";
        description = "Top-level package for the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -113111,6 +113292,7 @@ self: {
          base bytestring containers QuickCheck snap-core tasty tasty-hunit
          tasty-quickcheck
        ];
+       jailbreak = true;
        description = "A collection of useful helpers and utilities for Snap web applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113406,6 +113588,7 @@ self: {
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/faylang/snaplet-fay";
        description = "Fay integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
@@ -114271,6 +114454,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "socket" = callPackage
+    ({ mkDerivation, async, base, bytestring }:
+     mkDerivation {
+       pname = "socket";
+       version = "0.1.0.1";
+       revision = "1";
+       sha256 = "06c5vrpwrlp1ab8axvbmrar382d780a8m6zqvvjb6zjahgd5cl32";
+       editedCabalFile = "ef4027263ba8c3069f127839a7bace4b09d6d78714183b3faab935919c57e09c";
+       buildDepends = [ base bytestring ];
+       testDepends = [ async base bytestring ];
+       homepage = "https://github.com/lpeterse/haskell-socket";
+       description = "A binding to the POSIX sockets interface";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "socket-activation" = callPackage
     ({ mkDerivation, base, network, transformers, unix }:
      mkDerivation {
@@ -114289,13 +114487,12 @@ self: {
      }:
      mkDerivation {
        pname = "socket-io";
-       version = "1.3.1";
-       sha256 = "0ylb05lcgprvfdvhc71dqhh9azsp12vwx8zihdvcim0ax0ylrb20";
+       version = "1.3.2";
+       sha256 = "0bqrglnp54hd777lq92ia7z9vwmj1dq24m7lbiqhzvvb63p9mv4i";
        buildDepends = [
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114372,14 +114569,13 @@ self: {
      }:
      mkDerivation {
        pname = "som";
-       version = "8.0.4";
-       sha256 = "0jax009wbqlkkdhli5g0d01cgl7lvc8j2a86lp6p1msdk8rb6nls";
+       version = "8.0.5";
+       sha256 = "1cprlv1mbs722ap3cicgi0haph9xlz2xvcm374857d11ly31wav0";
        buildDepends = [ base containers grid MonadRandom ];
        testDepends = [
          base containers grid MonadRandom QuickCheck random test-framework
          test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "https://github.com/mhwombat/som";
        description = "Self-Organising Maps";
        license = stdenv.lib.licenses.bsd3;
@@ -114675,6 +114871,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "spaceprobe" = callPackage
+    ({ mkDerivation, base, clock, containers, erf, mtl, QuickCheck
+     , test-framework, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "spaceprobe";
+       version = "0.3.0";
+       sha256 = "09vpnq5mfdzr132cqm5i4xkxmpg2035pbs64a56lgq0asdzlhfmy";
+       buildDepends = [ base clock containers erf mtl ];
+       testDepends = [
+         base clock containers erf mtl QuickCheck test-framework
+         test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/SeanRBurton/spaceprobe";
+       description = "Optimization over arbitrary search spaces";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sparse" = callPackage
     ({ mkDerivation, base, bytestring, containers, contravariant
      , deepseq, directory, doctest, filepath, hlint, hybrid-vectors
@@ -117636,6 +117850,7 @@ self: {
          http-types template-haskell text time transformers
        ];
        testDepends = [ base bytestring hlint markdown-unlit time ];
+       jailbreak = true;
        homepage = "http://taylor.fausak.me/strive/";
        description = "A Haskell client for the Strava V3 API";
        license = stdenv.lib.licenses.mit;
@@ -117810,6 +118025,7 @@ self: {
          haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
          yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/jaspervdj/stylish-haskell";
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
@@ -119596,6 +119812,7 @@ self: {
        version = "0.3.0";
        sha256 = "0x1mwwlwhka12bzshy0j0w7iq9ka6kn1jgsifi26jmg7zf79zydf";
        buildDepends = [ base binary containers parsec text text-binary ];
+       jailbreak = true;
        homepage = "https://github.com/kawu/tagset-positional";
        description = "Positional tags and tagsets";
        license = stdenv.lib.licenses.bsd3;
@@ -120706,8 +120923,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "terminal-size";
-       version = "0.3.0";
-       sha256 = "0g8v08d20hlfsah9dlgv2v2pzj0m4dva0zp6zi4jrkxjhg6vi7bw";
+       version = "0.3.2";
+       sha256 = "0vm6xrm5j60h01lgn7srhsx2698aq6k5jkbc84bi5zh5w63fsdyp";
        buildDepends = [ base ];
        description = "Get terminal window height and width";
        license = stdenv.lib.licenses.bsd3;
@@ -121305,8 +121522,8 @@ self: {
      }:
      mkDerivation {
        pname = "text";
-       version = "1.2.1.0";
-       sha256 = "0mpv82v853jimshff8xg2429hr23lp81vlrps76ypndz5ilxzipi";
+       version = "1.2.1.1";
+       sha256 = "0l4lrpa216dblm1qk0qpykmx56a28h0hjgccq18sn1mr7n3wyhl8";
        buildDepends = [
          array base binary bytestring deepseq ghc-prim integer-gmp
        ];
@@ -121341,12 +121558,9 @@ self: {
     ({ mkDerivation, base, binary, text }:
      mkDerivation {
        pname = "text-binary";
-       version = "0.1.0";
-       revision = "1";
-       sha256 = "0wc501j8hqspnhf4d1hyb18f1wgc4kl2qx1b5s4bkxv0dfbwrk6z";
-       editedCabalFile = "73815941abe470b6d0e2287c054995c5ec59524bed9d2f6bfef2411a4397c48d";
+       version = "0.2.0";
+       sha256 = "09njl6afnj2yjqn3mg3ry4qsd5jjjh51malk6kn2zzihldb9z5b2";
        buildDepends = [ base binary text ];
-       jailbreak = true;
        homepage = "https://github.com/kawu/text-binary";
        description = "Binary instances for text types";
        license = stdenv.lib.licenses.bsd3;
@@ -122137,8 +122351,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-typegraph";
-       version = "0.17";
-       sha256 = "0k6bjf3r6g64h5al7gxcrkwb5b67kjpx8y4ib6f3a6l00p620297";
+       version = "0.17.1";
+       sha256 = "06hyyb1rjm8rvkllvjsgh56fwly99hv33brb4xycc1sc4452cslm";
        buildDepends = [
          base containers data-default haskell-src-exts lens mtl syb
          template-haskell th-desugar th-orphans
@@ -122170,6 +122384,7 @@ self: {
          transformers
        ];
        testDepends = [ base bytestring tasty tasty-hunit text time ];
+       jailbreak = true;
        homepage = "http://github.com/pjones/themoviedb";
        description = "Haskell API bindings for http://themoviedb.org";
        license = stdenv.lib.licenses.mit;
@@ -122463,6 +122678,7 @@ self: {
          template-haskell text transformers unordered-containers vault
          vector websockets websockets-snap
        ];
+       jailbreak = true;
        homepage = "http://wiki.haskell.org/Threepenny-gui";
        description = "GUI framework that uses the web browser as a display";
        license = stdenv.lib.licenses.bsd3;
@@ -124550,8 +124766,8 @@ self: {
      }:
      mkDerivation {
        pname = "ttrie";
-       version = "0.1.1";
-       sha256 = "1di4h0vqj0hyxy0zgxkr1zwfy901hfglh9da21kv7li88c2d51sp";
+       version = "0.1.2";
+       sha256 = "09nbba623nxnlg1957sgcrrva3ycwb31asxnxihwjh0wxrqhh1k0";
        buildDepends = [ atomic-primops base hashable primitive stm ];
        testDepends = [
          base containers hashable QuickCheck stm test-framework
@@ -124566,19 +124782,19 @@ self: {
   "tttool" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , directory, executable-path, filepath, hashable, haskeline
-     , JuicyPixels, mtl, parsec, process, process-extras, random
-     , template-haskell, time, vector, yaml
+     , JuicyPixels, mtl, parsec, process, random, template-haskell, time
+     , vector, yaml
      }:
      mkDerivation {
        pname = "tttool";
-       version = "1.4.0.1";
-       sha256 = "1adk3ngh88bm2mwycvpw3fsvzcrprkd34wyam6pan8yvw1jaz0lg";
+       version = "1.4.0.2";
+       sha256 = "0avn7011868nqibmdz07s27d8g46v9hwps5h04dg57vk9305j70g";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          aeson base binary bytestring containers directory executable-path
-         filepath hashable haskeline JuicyPixels mtl parsec process
-         process-extras random template-haskell time vector yaml
+         filepath hashable haskeline JuicyPixels mtl parsec process random
+         template-haskell time vector yaml
        ];
        homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
@@ -125155,6 +125371,7 @@ self: {
        testDepends = [
          base containers HUnit test-framework test-framework-hunit
        ];
+       jailbreak = true;
        homepage = "https://github.com/stackbuilders/twitter-feed";
        description = "Client for fetching Twitter timeline via Oauth";
        license = stdenv.lib.licenses.mit;
@@ -127549,7 +127766,9 @@ self: {
      mkDerivation {
        pname = "urlpath";
        version = "2.1.0";
+       revision = "1";
        sha256 = "1q8zj228ln9xmr3r0ggv6pi074l8ixchn81mw8664jikf2pjcqq9";
+       editedCabalFile = "a342b25d9ea3984cf20025d421f59629d7abdf4bd2b42a4e9ef53ba5729f13e1";
        buildDepends = [ base monoid-subclasses mtl transformers ];
        testDepends = [
          base hspec monoid-subclasses mtl QuickCheck quickcheck-instances
@@ -127711,6 +127930,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "users-persistent" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hspec, monad-logger, mtl
+     , persistent, persistent-sqlite, persistent-template, temporary
+     , text, time, users, users-test, uuid
+     }:
+     mkDerivation {
+       pname = "users-persistent";
+       version = "0.3.0.0";
+       sha256 = "0hdvsnjciw3a6gsz5lv5q6m5fs3hd60gmgfbzgx5n7md2ya5jimr";
+       buildDepends = [
+         aeson base bytestring mtl persistent persistent-template text time
+         users uuid
+       ];
+       testDepends = [
+         base hspec monad-logger persistent-sqlite temporary text users-test
+       ];
+       homepage = "https://github.com/agrafix/users";
+       description = "A persistent backend for the users package";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "users-postgresql-simple" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, mtl
      , postgresql-simple, text, time, users, users-test, uuid
@@ -129550,18 +129790,20 @@ self: {
 
   "waddle" = callPackage
     ({ mkDerivation, base, binary, bytestring, case-insensitive
-     , containers
+     , containers, directory, JuicyPixels
      }:
      mkDerivation {
        pname = "waddle";
-       version = "0.1.0.3";
-       sha256 = "1jvijw4bsg206cy8y49g1vz0y7j3p3xzq6jxz70w1gicrw5ja01c";
+       version = "0.1.0.5";
+       sha256 = "0v4qhr01bqz7hb5q8hf2rdk8fxrbbmvsighi5wv2gv5b3cwh28cv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base binary bytestring case-insensitive containers
+         base binary bytestring case-insensitive containers directory
+         JuicyPixels
        ];
        jailbreak = true;
+       homepage = "https://github.com/mgrabmueller/waddle";
        description = "DOOM WAD file utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -130306,8 +130548,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-request-spec";
-       version = "0.8.5.2";
-       sha256 = "1r51ib85krin61ggqgrir0igma80qryblqqrf38j01af1qnvvlxv";
+       version = "0.9.1.0";
+       sha256 = "1niszz8v8x4qkzssc5pmhpqsq3v9ad4gscx0dxxxpfz76fcs4f1k";
        buildDepends = [
          base bytestring case-insensitive containers http-types text wai
        ];
@@ -130362,16 +130604,16 @@ self: {
      }) {};
 
   "wai-routes" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, http-types
-     , mtl, template-haskell, text, wai, yesod-routes
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
+     , http-types, mtl, path-pieces, random, template-haskell, text, wai
      }:
      mkDerivation {
        pname = "wai-routes";
-       version = "0.5.1";
-       sha256 = "0xd4abccgnj793vbrf1a0m1ddcq8i4p8f7sxk6mz4d1lzb4y0sf0";
+       version = "0.6.1";
+       sha256 = "15j37h3a56fsgmznmw8b1ksp0pkrrqz3kyrwj69hba2bnjcq5n7q";
        buildDepends = [
-         aeson base blaze-builder bytestring http-types mtl template-haskell
-         text wai yesod-routes
+         aeson base blaze-builder bytestring containers http-types mtl
+         path-pieces random template-haskell text wai
        ];
        jailbreak = true;
        homepage = "https://github.com/ajnsit/wai-routes";
@@ -130677,8 +130919,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp-tls";
-       version = "3.0.3";
-       sha256 = "1ngprhmf58i80fkw2z750pxavyv05g3sr8j7hd24h47msmghq9mm";
+       version = "3.0.4";
+       sha256 = "03k8iynz586cdjjh4nyrlbs8c864d305swrf4xkf55r9l3klsbg4";
        buildDepends = [
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
@@ -134978,6 +135220,7 @@ self: {
          lifted-base network-uri random text transformers yesod-auth
          yesod-core yesod-form
        ];
+       jailbreak = true;
        homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
        description = "OAuth 2.0 authentication plugins";
        license = stdenv.lib.licenses.bsd3;
@@ -135452,6 +135695,7 @@ self: {
          wai-logger warp yaml yesod yesod-auth yesod-core yesod-form
          yesod-persistent yesod-static
        ];
+       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Yesod library for MangoPay API access";
        license = stdenv.lib.licenses.bsd3;
@@ -135471,6 +135715,7 @@ self: {
          base blaze-html blaze-markup bytestring directory pandoc persistent
          shakespeare texmath text xss-sanitize yesod-core yesod-form
        ];
+       jailbreak = true;
        homepage = "http://github.com/pbrisbin/yesod-markdown";
        description = "Tools for using markdown in a yesod application";
        license = stdenv.lib.licenses.gpl2;
@@ -135984,6 +136229,7 @@ self: {
          aeson base markdown persistent shakespeare text yesod-core
          yesod-form yesod-persistent
        ];
+       jailbreak = true;
        description = "Yesod support for Text.Markdown.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136539,6 +136785,7 @@ self: {
          HStringTemplate lucid old-locale old-time pandoc parsec scientific
          split text time unordered-containers yaml
        ];
+       jailbreak = true;
        homepage = "http://github.com/jgm/yst";
        description = "Builds a static website from templates and data in YAML or CSV files";
        license = "GPL";

From 9cc46aaa4a6493e464324bb8bb0eda0068e3c071 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 May 2015 13:09:01 +0200
Subject: [PATCH 0484/2322] git-annex: switch to the version built with GHC
 7.10.1

Also, this change renames the "gitAnnex" attribute to "git-annex". This
seems more in-line with recent additions to the git package family,
which all used dashed names instead of camel-caps.
---
 pkgs/applications/version-management/git-and-tools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 56a6618e531..669fe6dc890 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -46,7 +46,7 @@ rec {
     sendEmailSupport = !stdenv.isDarwin;
   };
 
-  gitAnnex = pkgs.haskell-ng.packages.ghc784.git-annex;
+  inherit (pkgs.haskellPackages) git-annex;
 
   qgit = import ./qgit {
     inherit fetchurl stdenv;

From 2e24bef56f2e811026c7412acca6a0115da0c7a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 27 May 2015 15:05:25 +0200
Subject: [PATCH 0485/2322] ghc-6.x: enable builds again now that
 5a89a87cc575f0d8 is in master

Resolves https://github.com/NixOS/nixpkgs/issues/7810.
---
 pkgs/development/compilers/ghc/6.10.2-binary.nix | 1 -
 pkgs/development/compilers/ghc/6.10.4.nix        | 1 -
 pkgs/development/compilers/ghc/6.12.3.nix        | 1 -
 3 files changed, 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index 3a649c2420a..4e660853f20 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -102,7 +102,6 @@ stdenv.mkDerivation rec {
     description = "The Glasgow Haskell Compiler";
     license = stdenv.lib.licenses.bsd3;
     platforms = ["x86_64-linux" "i686-linux"];
-    broken = true;              # https://github.com/NixOS/nixpkgs/issues/7810
   };
 
 }
diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix
index 0df0ef27ca0..d8157673fbc 100644
--- a/pkgs/development/compilers/ghc/6.10.4.nix
+++ b/pkgs/development/compilers/ghc/6.10.4.nix
@@ -25,6 +25,5 @@ stdenv.mkDerivation rec {
     description = "The Glasgow Haskell Compiler";
     platforms = ["x86_64-linux" "i686-linux"];  # Darwin is unsupported.
     inherit (ghc.meta) license;
-    broken = true;              # https://github.com/NixOS/nixpkgs/issues/7810
   };
 }
diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix
index 499f1db79ba..f6beaf3a006 100644
--- a/pkgs/development/compilers/ghc/6.12.3.nix
+++ b/pkgs/development/compilers/ghc/6.12.3.nix
@@ -39,6 +39,5 @@ stdenv.mkDerivation rec {
     maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
     platforms = ["x86_64-linux" "i686-linux"];  # Darwin is unsupported.
     inherit (ghc.meta) license;
-    broken = true;              # https://github.com/NixOS/nixpkgs/issues/7810
   };
 }

From 8c03484b3b7d03fe9d2971070526acb79e27077b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 May 2015 09:51:05 +0200
Subject: [PATCH 0486/2322] haskell-ncurses: remove obsolete override

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ce7b8b27d32..85d261c0c78 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -457,9 +457,6 @@ self: super: {
   # https://bitbucket.org/wuzzeb/webdriver-utils/issue/1/hspec-webdriver-101-cant-compile-its-test
   hspec-webdriver = markBroken super.hspec-webdriver;
 
-  # The build fails with the most recent version of c2hs.
-  ncurses = super.ncurses.override { c2hs = self.c2hs_0_20_1; };
-
   # Needs access to locale data, but looks for it in the wrong place.
   scholdoc-citeproc = dontCheck super.scholdoc-citeproc;
 

From 8b800621855027ff48221a415a77da7d53bda397 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 May 2015 09:52:05 +0200
Subject: [PATCH 0487/2322] haskell-configuration-ghc-7.10.x: remove obsolete
 override for old c2hs version

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 -
 1 file changed, 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 678faa1c54c..1329ad24f8f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -238,7 +238,6 @@ self: super: {
 
   # Broken with GHC 7.10.x.
   aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6;
-  c2hs_0_20_1 = markBroken super.c2hs_0_20_1;
   Cabal_1_20_0_3 = markBroken super.Cabal_1_20_0_3;
   cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0;
   containers_0_4_2_1 = markBroken super.containers_0_4_2_1;

From e5a1818745ec6e299d425282258301b1415090f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 May 2015 10:03:02 +0200
Subject: [PATCH 0488/2322] haskell-mueval is broken (and has been for a while)

---
 .../development/haskell-modules/configuration-common.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 85d261c0c78..86af3d220ad 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -747,13 +747,8 @@ self: super: {
   # Patch to consider NIX_GHC just like xmonad does
   dyre = appendPatch super.dyre ./dyre-nix.patch;
 
-  # Fix problems with GHC >=7.8 (in compatible way)
-  mueval = let pkg = appendPatch super.mueval (pkgs.fetchpatch {
-                       url = "https://patch-diff.githubusercontent.com/raw/gwern/mueval/pull/4.patch";
-                       sha256 = "1l0jn2lbzbhx9ifbpb5g617qa0fc8fwa6kyr87pjqfxpqminsgp5";
-                     });
-           # Nix-specific workaround
-           in appendPatch pkg ./mueval-nix.patch;
+  # https://github.com/gwern/mueval/issues/9
+  mueval = markBrokenVersion "0.9.1.1" super.mueval;
 
   # Test suite won't compile against tasty-hunit 0.9.x.
   zlib = dontCheck super.zlib;

From ef0d959fe9d2439a453863fdd0d58dea06895ade Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 May 2015 10:03:36 +0200
Subject: [PATCH 0489/2322] haskell-BNFC: build has been fixed, but the test
 suite still won't compile

---
 pkgs/development/haskell-modules/configuration-common.nix     | 3 +++
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 86af3d220ad..48f5dedce36 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -827,4 +827,7 @@ self: super: {
   # https://github.com/alphaHeavy/lzma-enumerator/issues/3
   lzma-enumerator = dontCheck super.lzma-enumerator;
 
+  # https://github.com/BNFC/bnfc/issues/140
+  BNFC = dontCheck super.BNFC;
+
 }
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 1329ad24f8f..470a944fa93 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -183,10 +183,6 @@ self: super: {
             in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
                                           self.webkitgtk3-javascriptcore ];
 
-  # https://github.com/BNFC/bnfc/issues/137
-  BNFC = markBrokenVersion "2.7.1" super.BNFC;
-  cubical = dontDistribute super.cubical;
-
   # contacted maintainer by e-mail
   cmdlib = markBrokenVersion "0.3.5" super.cmdlib;
   darcs-fastconvert = dontDistribute super.darcs-fastconvert;

From c139b0593c05204e9346d0c334742dc2f050db5d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 May 2015 10:34:13 +0200
Subject: [PATCH 0490/2322] Fix haskell-spaceprobe and llvm-general.

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 48f5dedce36..9241ce0908d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -739,7 +739,9 @@ self: super: {
   # Uses OpenGL in testing
   caramia = dontCheck super.caramia;
 
-  llvm-general = super.llvm-general.override { llvm-config = pkgs.llvmPackages_34.llvm; };
+  # Needs help finding LLVM.
+  llvm-general = super.llvm-general.override { llvm-config = self.llvmPackages.llvm; };
+  spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;
 
   # Tries to run GUI in tests
   leksah = dontCheck super.leksah;

From a1c0a00dace883ca42bc66a53bd1e70303fc3c18 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 28 May 2015 13:07:36 +0200
Subject: [PATCH 0491/2322] haskell-text-binary: remove patch that's contained
 in version 0.2.x

---
 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 9241ce0908d..31093a46340 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -820,12 +820,6 @@ self: super: {
   # https://github.com/hvr/token-bucket/issues/3
   token-bucket = dontCheck super.token-bucket;
 
-  # https://github.com/kawu/text-binary/issues/2
-  text-binary = appendPatch super.text-binary (pkgs.fetchpatch {
-    url = "https://github.com/RyanGlScott/text-binary/commit/608e0ce86a9a7591dbfe83f7cbb36b8d8ebd07b8.patch";
-    sha256 = "1rk5rgb5lsykpvylz77hzxyflxzlmi3fi06rf0yqg2vvrnri83f1";
-  });
-
   # https://github.com/alphaHeavy/lzma-enumerator/issues/3
   lzma-enumerator = dontCheck super.lzma-enumerator;
 

From 62d691b4cabe0837099af0bbbaa4fe4f6ca7d8f5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 May 2015 10:27:35 +0200
Subject: [PATCH 0492/2322] haskell-pandoc: don't use shared linking for
 executables

The build contains special magic surrounding the build of make-pandoc-man-pages,
and that magic fails in case we link binaries dynamically.
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 31093a46340..b22d3f736ce 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -675,8 +675,8 @@ self: super: {
   # https://github.com/junjihashimoto/test-sandbox-compose/issues/2
   test-sandbox-compose = dontCheck super.test-sandbox-compose;
 
-  # https://github.com/jgm/pandoc/issues/2036
-  pandoc = dontCheck super.pandoc;
+  # https://github.com/jgm/pandoc/issues/2190
+  pandoc = disableSharedExecutables super.pandoc;
 
   # Broken by GLUT update.
   Monadius = markBroken super.Monadius;

From d2496ba1429023189dd441596c7db2d1fe1907b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 May 2015 11:06:58 +0200
Subject: [PATCH 0493/2322] haskell-pandoc: install man pages

---
 pkgs/development/haskell-modules/configuration-common.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b22d3f736ce..ffee4900904 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -676,7 +676,13 @@ self: super: {
   test-sandbox-compose = dontCheck super.test-sandbox-compose;
 
   # https://github.com/jgm/pandoc/issues/2190
-  pandoc = disableSharedExecutables super.pandoc;
+  pandoc = overrideCabal super.pandoc (drv: {
+    enableSharedExecutables = false;
+    postInstall = ''            # install man pages
+      mv man $out/
+      find $out/man -type f ! -name "*.[0-9]" -exec rm {} +
+    '';
+  });
 
   # Broken by GLUT update.
   Monadius = markBroken super.Monadius;

From 2814e5ce1198b40cbc4eebfc3740d336e41f0379 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 May 2015 11:15:24 +0200
Subject: [PATCH 0494/2322] haskell-Cabal-ide-backend: like all Cabals, this
 fork can't run its test suite in Nix

---
 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 ffee4900904..c59a846583a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -832,4 +832,7 @@ self: super: {
   # https://github.com/BNFC/bnfc/issues/140
   BNFC = dontCheck super.BNFC;
 
+  # FPCO's fork of Cabal won't succeed its test suite.
+  Cabal-ide-backend = dontCheck super.Cabal-ide-backend;
+
 }

From 8732feab5a70115d118a7ca72f62ed32bc572cc3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 May 2015 11:20:12 +0200
Subject: [PATCH 0495/2322] haskell-llvm-general is broken with recent versions
 of LLVM.

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 +++
 pkgs/development/haskell-modules/configuration-ghc-head.nix   | 3 +++
 2 files changed, 6 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 470a944fa93..8165f1129d2 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -283,4 +283,7 @@ self: super: {
   HLearn-distributions = dontDistribute super.HLearn-distributions;
   HLearn-classification = dontDistribute super.HLearn-classification;
 
+  # Won't work with LLVM 3.5.
+  llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 291f050e174..73da57d7350 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -81,4 +81,7 @@ self: super: {
   # The compat library is empty in the presence of mtl 2.2.x.
   mtl-compat = dontHaddock super.mtl-compat;
 
+  # Won't work with LLVM 3.5.
+  llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
+
 }

From d55272a535fc1328c689768e0df21339109d0af3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 May 2015 14:00:07 +0200
Subject: [PATCH 0496/2322] haskell-pipes-errors: fix evaluation of override
 for latest 'errors'

---
 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 c59a846583a..fee992c72a7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -821,7 +821,7 @@ self: super: {
   language-puppet = dontDistribute super.language-puppet;
 
   # This needs the latest version of errors to compile.
-  pipes-errors_0_3 = super.pipes-errors_0_3.override { errors = self.errors_2_0_0; };
+  pipes-errors = super.pipes-errors.override { errors = self.errors_2_0_0; };
 
   # https://github.com/hvr/token-bucket/issues/3
   token-bucket = dontCheck super.token-bucket;

From 83f6a29266cc622b31ce68097ee7bce78649d09b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 30 May 2015 00:10:28 +0200
Subject: [PATCH 0497/2322] haskell-hslua: version 0.4.x still doesn't work
 with lua 5.2

---
 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 fee992c72a7..8696a9ab839 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -27,6 +27,7 @@ self: super: {
 
   # Doesn't compile with lua 5.2.
   hslua = super.hslua.override { lua = pkgs.lua5_1; };
+  hslua_0_4_0 = super.hslua_0_4_0.override { lua = pkgs.lua5_1; };
 
   # Use the default version of mysql to build this package (which is actually mariadb).
   mysql = super.mysql.override { mysql = pkgs.mysql.lib; };

From 413985fa345243257a7f0505dd479fb60e7601ec Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 30 May 2015 18:13:52 +0200
Subject: [PATCH 0498/2322] haskell-servant has been fixed upstream.

---
 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 8696a9ab839..5b7fc1b5415 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -815,12 +815,6 @@ self: super: {
   # https://github.com/kkardzis/curlhs/issues/6
   curlhs = dontCheck super.curlhs;
 
-  # https://github.com/haskell-servant/servant-server/issues/45
-  servant-server = markBroken super.servant-server;
-  servant-client = dontDistribute super.servant-client;
-  servant-jquery = dontDistribute super.servant-jquery;
-  language-puppet = dontDistribute super.language-puppet;
-
   # This needs the latest version of errors to compile.
   pipes-errors = super.pipes-errors.override { errors = self.errors_2_0_0; };
 

From b73c3c7d9ffd80384ccfd3907cee423e8a518fb9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 30 May 2015 18:16:20 +0200
Subject: [PATCH 0499/2322] haskell-cipher-aes fails its test suite.

---
 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 5b7fc1b5415..eb2c1e7c9c0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -830,4 +830,6 @@ self: super: {
   # FPCO's fork of Cabal won't succeed its test suite.
   Cabal-ide-backend = dontCheck super.Cabal-ide-backend;
 
+  # https://github.com/vincenthz/hs-cipher-aes/issues/35
+  cipher-aes = dontCheck super.cipher-aes;
 }

From 7c9cf6d6c254902f5e7e4cd7d8f870a09dbc6e3b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 30 May 2015 18:22:50 +0200
Subject: [PATCH 0500/2322] haskell-syb-with-class: remove obsolete patches

---
 .../development/haskell-modules/configuration-ghc-7.10.x.nix | 5 -----
 1 file changed, 5 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 8165f1129d2..61cccad75ba 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -116,11 +116,6 @@ self: super: {
   # support a moving target". Go figure.
   barecheck = doJailbreak super.barecheck;
 
-  syb-with-class = appendPatch super.syb-with-class (pkgs.fetchpatch {
-    url = "https://github.com/seereason/syb-with-class/compare/adc86a9...719e567.patch";
-    sha256 = "1lwwvxyhxcmppdapbgpfhwi7xc2z78qir03xjrpzab79p2qyq7br";
-  });
-
   # https://github.com/kazu-yamamoto/unix-time/issues/30
   unix-time = dontCheck super.unix-time;
 

From 1cc014fdae64e7149c386161781ba4dc11c60836 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 29 May 2015 13:39:20 +0200
Subject: [PATCH 0501/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/a0ad41c6f533938fb8250c39a18d1d3949ce2e52
 with hackage2nix revision 4d6361f0199d51068066c62bb0ca5c18530161f4

---
 .../configuration-ghc-7.10.x.nix              |   3 +
 .../haskell-modules/hackage-packages.nix      | 578 +++++++++++++-----
 2 files changed, 415 insertions(+), 166 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 61cccad75ba..ac24848b8fe 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -281,4 +281,7 @@ self: super: {
   # Won't work with LLVM 3.5.
   llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
 
+  # Ugly hack to trigger a rebuild to fix the broken package on Hydra.
+  crypto-api = appendConfigureFlag super.crypto-api "-fignore-me-1";
+
 }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ae94120305b..1eb15af14ee 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3191,26 +3191,24 @@ self: {
      }) {};
 
   "DSH" = callPackage
-    ({ mkDerivation, aeson, algebra-dag, algebra-sql, ansi-wl-pprint
-     , base, bytestring, containers, dlist, either, HDBC
-     , HDBC-postgresql, HUnit, kure, mtl, pretty, QuickCheck, semigroups
-     , set-monad, template-haskell, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text
+    ({ mkDerivation, aeson, algebra-dag, ansi-wl-pprint, base
+     , bytestring, containers, Decimal, dlist, either, hashable, HUnit
+     , kure, mtl, process, QuickCheck, random, semigroups
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "DSH";
-       version = "0.10.0.2";
-       sha256 = "02a8gfn5ji2n606ak1gs4syk0c97zvyi4146w5zy6gn21g4d3fa7";
+       version = "0.12.0.0";
+       sha256 = "0rv7jn6h5w2naz7h4psz258684rc2p2wyaqp1f6kqvk294mlmvrv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson algebra-dag algebra-sql ansi-wl-pprint base bytestring
-         containers dlist either HDBC HDBC-postgresql kure mtl pretty
-         semigroups set-monad template-haskell text
-       ];
-       testDepends = [
-         base containers HDBC HDBC-postgresql HUnit QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2 text
+         aeson algebra-dag ansi-wl-pprint base bytestring containers Decimal
+         dlist either hashable HUnit kure mtl process QuickCheck random
+         semigroups template-haskell test-framework test-framework-hunit
+         test-framework-quickcheck2 text time unordered-containers vector
        ];
        description = "Database Supported Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -7178,26 +7176,27 @@ self: {
   "HTF" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base
      , base64-bytestring, bytestring, containers, cpphs, Diff, directory
-     , filepath, haskell-lexer, haskell-src, HUnit, lifted-base
-     , monad-control, mtl, old-time, pretty, process, QuickCheck, random
-     , regex-compat, temporary, text, time, unix, unordered-containers
-     , vector, xmlgen
+     , filepath, haskell-src, HUnit, lifted-base, monad-control, mtl
+     , old-time, pretty, process, QuickCheck, random, regex-compat
+     , template-haskell, temporary, text, time, unix
+     , unordered-containers, vector, xmlgen
      }:
      mkDerivation {
        pname = "HTF";
-       version = "0.12.2.4";
-       sha256 = "0f538wqihj8i1ys3aciz7n1asxvg73bm9zg0p8qazzx9ghpcgy6m";
+       version = "0.13.0.0";
+       sha256 = "0lrc60ydqsizz3rdyijqywncr1bcj3b95mgn99bz5q4yb3l6dc54";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson array base base64-bytestring bytestring containers cpphs Diff
-         directory haskell-lexer haskell-src HUnit lifted-base monad-control
-         mtl old-time pretty process QuickCheck random regex-compat text
-         time unix vector xmlgen
+         directory haskell-src HUnit lifted-base monad-control mtl old-time
+         pretty process QuickCheck random regex-compat text time unix vector
+         xmlgen
        ];
        testDepends = [
          aeson aeson-pretty base bytestring directory filepath HUnit mtl
-         process random regex-compat temporary text unordered-containers
+         process random regex-compat template-haskell temporary text
+         unordered-containers
        ];
        homepage = "https://github.com/skogsbaer/HTF/";
        description = "The Haskell Test Framework";
@@ -8227,7 +8226,9 @@ self: {
      mkDerivation {
        pname = "HostAndPort";
        version = "0.1.0";
+       revision = "1";
        sha256 = "0rykpzp3vvc81ra917vicwsh8x1mr1ykw9a597ks959nmjy06mz8";
+       editedCabalFile = "5ad1783e80502877a1de17cb92308dd9e0cc003a1302c5d4c09103b1c98bd627";
        buildDepends = [ base parsec ];
        testDepends = [ base doctest hspec ];
        homepage = "https://github.com/bacher09/hostandport";
@@ -18049,8 +18050,8 @@ self: {
      }:
      mkDerivation {
        pname = "algebra-dag";
-       version = "0.1.0.0";
-       sha256 = "0sl3lsbjhnmnq49zf1irnijp7wfxixsv21vfknshi5hkl9757i89";
+       version = "0.1.1.1";
+       sha256 = "1pr6bbj67n13bw120l82zn5bj7bj0x00b754w852pbpij03fjay9";
        buildDepends = [
          aeson base containers fgl mtl parsec template-haskell transformers
        ];
@@ -18061,20 +18062,20 @@ self: {
 
   "algebra-sql" = callPackage
     ({ mkDerivation, aeson, algebra-dag, ansi-wl-pprint, base
-     , bytestring, containers, dlist, errors, fgl, filepath, ghc-prim
-     , mtl, multiset, parsec, pretty, process, template-haskell
-     , transformers
+     , bytestring, containers, Decimal, dlist, errors, fgl, filepath
+     , ghc-prim, mtl, multiset, parsec, pretty, process
+     , template-haskell, text, time, transformers
      }:
      mkDerivation {
        pname = "algebra-sql";
-       version = "0.1.0.1";
-       sha256 = "0das62ykwgyvj8qhk44i93b0w66wshdrdaylhvks03232pgpf8yp";
+       version = "0.3.0.0";
+       sha256 = "1wvm9qkixmyawwjd6ypshsmby7y7229zwidj3qhzkbmyi7p5sgzj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson algebra-dag ansi-wl-pprint base bytestring containers dlist
-         errors fgl filepath ghc-prim mtl multiset parsec pretty process
-         template-haskell transformers
+         aeson algebra-dag ansi-wl-pprint base bytestring containers Decimal
+         dlist errors fgl filepath ghc-prim mtl multiset parsec pretty
+         process template-haskell text time transformers
        ];
        description = "Relational Algebra and SQL Code Generation";
        license = stdenv.lib.licenses.bsd3;
@@ -20274,8 +20275,8 @@ self: {
      }:
      mkDerivation {
        pname = "arbtt";
-       version = "0.9.0.3";
-       sha256 = "1zki720s444qq22hxsbqmanpv379894l7xhql8p1fq8cdwmfj541";
+       version = "0.9.0.4";
+       sha256 = "02qz7qsk1kjavsdl8mq56blxzzjnnjlnyjvjnyfamq7j0rqzdq5v";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -20289,7 +20290,6 @@ self: {
          transformers unix utf8-string
        ];
        extraLibraries = [ libXScrnSaver ];
-       jailbreak = true;
        homepage = "http://arbtt.nomeata.de/";
        description = "Automatic Rule-Based Time Tracker";
        license = "GPL";
@@ -23045,6 +23045,18 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "base-noprelude" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "base-noprelude";
+       version = "4.8.0.0";
+       sha256 = "0kxpkahlwvmy86g94rawhv6x3kl761xf4s78jv1cjzglsb28q0zl";
+       buildDepends = [ base ];
+       homepage = "https://github.com/hvr/base-noprelude";
+       description = "\"base\" package sans \"Prelude\" module";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "base-orphans" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec }:
      mkDerivation {
@@ -25723,6 +25735,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bitx-bitcoin" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Decimal, hspec
+     , http-conduit, network, record, split, text, time
+     }:
+     mkDerivation {
+       pname = "bitx-bitcoin";
+       version = "0.1.0.0";
+       sha256 = "05k2cwkd9y327c75fhjqwyxhwrwxhalsx724xa0ng5dw3d30icc2";
+       buildDepends = [
+         aeson base bytestring Decimal http-conduit network record split
+         text time
+       ];
+       testDepends = [ aeson base bytestring hspec record time ];
+       description = "A Haskell library for working with the BitX bitcoin exchange";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "bk-tree" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -27533,8 +27562,8 @@ self: {
     ({ mkDerivation, alex, array, base, bytestring }:
      mkDerivation {
        pname = "bytestring-lexing";
-       version = "0.4.3.2";
-       sha256 = "09ymg1n21668wn4harxg0cqlz98fz990bangpy99w2z7d6cwbc05";
+       version = "0.4.3.3";
+       sha256 = "1gfbmxr91glzxmbl57f3ij9mapdfxal8pql0s7g3v4qxf7km2pq0";
        buildDepends = [ array base bytestring ];
        buildTools = [ alex ];
        homepage = "http://code.haskell.org/~wren/";
@@ -28119,7 +28148,6 @@ self: {
        testDepends = [ base ];
        description = "Simple interface to Cabal's configuration state used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-install_1_18_1_0" = callPackage
@@ -29501,6 +29529,7 @@ self: {
        testDepends = [
          base HTF HUnit loch-th placeholders QuickCheck text
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/cases";
        description = "A converter for spinal, snake and camel cases";
        license = stdenv.lib.licenses.mit;
@@ -30167,6 +30196,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cg" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers, deepseq
+     , directory, filepath, hashable, mtl, parallel, parsec, process
+     , split, text, unordered-containers, utf8-string, void
+     }:
+     mkDerivation {
+       pname = "cg";
+       version = "0.0.9.0";
+       sha256 = "0slsckr1xyn1b3vb2xhd2diqhr9cdbkn9g5hfsy0q6sjiy979vpl";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring cereal containers deepseq directory filepath
+         hashable mtl parallel parsec process split text
+         unordered-containers utf8-string void
+       ];
+       description = "Parser for categorial grammars";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "cgen" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, mtl, parsec
      , regex-posix, safe, template-haskell
@@ -32568,8 +32617,8 @@ self: {
      }:
      mkDerivation {
        pname = "codex";
-       version = "0.3.0.4";
-       sha256 = "1fk3cw37ng80mw6nxv089sadzyf2s0m90c5rz936qpda06rqng08";
+       version = "0.3.0.6";
+       sha256 = "1slgh54kvf01y991pqi51kj6lfq05l5gp8dkhwcya1l9gilfazr4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -38626,8 +38675,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "data-or";
-       version = "1.0.0.4";
-       sha256 = "17plwr0ayll8na73vhdsfxk86dnds4rpj8v6nww7shb6vk5v3hf5";
+       version = "1.0.0.5";
+       sha256 = "0wp6qqq6k1zbdw9bv9gkzdiz6y8wp8r7zsqbjh54c43j3i7vdvwx";
        buildDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "A data type for non-exclusive disjunction";
@@ -41880,8 +41929,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process";
-       version = "0.5.3";
-       sha256 = "1jp85dd7scizs03cslrbgmaly735l2rv9yl5hq573xj3mjwmv5nz";
+       version = "0.5.4";
+       sha256 = "1yx2vspnpa478bn7n82ii6m6x0z43xwbr5995l3mm64sd0nmxp2s";
        buildDepends = [
          base binary bytestring containers data-accessor deepseq
          distributed-static ghc-prim hashable mtl network-transport
@@ -43296,6 +43345,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dsh-sql" = callPackage
+    ({ mkDerivation, aeson, algebra-dag, algebra-sql, base, bytestring
+     , bytestring-lexing, containers, Decimal, DSH, either, HDBC
+     , HDBC-odbc, HUnit, mtl, process, QuickCheck, random, semigroups
+     , set-monad, template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, vector
+     }:
+     mkDerivation {
+       pname = "dsh-sql";
+       version = "0.2.0.0";
+       sha256 = "0f7r844d0jwn4vyfnj8nvksss16rwva63hsy22m2viv98nyyfyi2";
+       buildDepends = [
+         aeson algebra-dag algebra-sql base bytestring bytestring-lexing
+         containers Decimal DSH either HDBC HDBC-odbc mtl process random
+         semigroups set-monad template-haskell text vector
+       ];
+       testDepends = [
+         base bytestring bytestring-lexing containers DSH HDBC HDBC-odbc
+         HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 text vector
+       ];
+       description = "SQL backend for Database Supported Haskell (DSH)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dsmc" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, entropy
      , hslogger, mwc-random, parallel, primitive, repa, strict
@@ -43809,6 +43883,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dynamic-pp" = callPackage
+    ({ mkDerivation, ansi-terminal, base, blaze-builder, bytestring
+     , Cabal, hashable, HUnit-Plus, unordered-containers, utf8-string
+     }:
+     mkDerivation {
+       pname = "dynamic-pp";
+       version = "0.1.0";
+       sha256 = "1i01k8c75yxdmxz3db4kajpqbgl8lcbfsp9rb9q2kzbk44fc2zpc";
+       buildDepends = [
+         ansi-terminal base blaze-builder bytestring Cabal hashable
+         unordered-containers utf8-string
+       ];
+       testDepends = [
+         ansi-terminal base blaze-builder bytestring Cabal hashable
+         HUnit-Plus unordered-containers utf8-string
+       ];
+       homepage = "https://github.com/emc2/dynamic-pp";
+       description = "A pretty-print library that employs a dynamic programming algorithm for optimal rendering";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dynamic-state" = callPackage
     ({ mkDerivation, base, binary, bytestring, hashable
      , unordered-containers
@@ -44546,14 +44641,13 @@ self: {
      }:
      mkDerivation {
        pname = "either";
-       version = "4.4";
-       sha256 = "06519qw6y8ah168p2i03q1hmmrbmbai39fm6bna8rkp8zwlbkxww";
+       version = "4.4.1";
+       sha256 = "1jq9b7mwljyqxmcs09bnqzza6710sfk2x444p3aagjlvq3mpvrci";
        buildDepends = [
          base bifunctors exceptions free mmorph monad-control MonadRandom
          mtl profunctors semigroupoids semigroups transformers
          transformers-base
        ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/either/";
        description = "An either monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -45688,8 +45782,8 @@ self: {
      }:
      mkDerivation {
        pname = "epub-tools";
-       version = "2.6";
-       sha256 = "0ncyam72y5jvad73mbrcsv8y1hl5yybrx59vc8gxsyiy9mbrvs6v";
+       version = "2.7";
+       sha256 = "17r7p68mdrc7mla65xwb5g8inh94hncqkg09igha9fyhnax4m3dk";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -46485,8 +46579,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "exact-combinatorics";
-       version = "0.2.0.7";
-       sha256 = "05q31mh5x6i90n3ddxyqnhhjga7vbsbi947iywyqi53h2z2iw8f7";
+       version = "0.2.0.8";
+       sha256 = "0pj7sh6s1kawk39hb42q1sx20g2rmzanpmr3zri9yvmb16qj5a1j";
        buildDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Efficient exact computation of combinatoric functions";
@@ -47402,13 +47496,12 @@ self: {
      }:
      mkDerivation {
        pname = "fasta";
-       version = "0.7.1.0";
-       sha256 = "0dh0vqcwapia5kdcyr7j2qnz28bxnyxb8zmfz32zj5cgyf4635wc";
+       version = "0.7.2.0";
+       sha256 = "1zsghi7883y4ygl0iammfh1dmnsnh3x4ly77jhxg8xz8saw7dbir";
        buildDepends = [
          base bytestring containers foldl lens parsec pipes pipes-bytestring
          pipes-group pipes-text split text
        ];
-       jailbreak = true;
        homepage = "https://github.com/GregorySchwartz/fasta";
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl2;
@@ -52303,13 +52396,12 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-heap-view";
-       version = "0.5.3";
-       sha256 = "1jcqi4gahxmhd61hl75wgb9dp99kxld68860jnd9x4hnp5cd33q0";
+       version = "0.5.4";
+       sha256 = "02n414m1lb6lilrkmjss2pd1s7hd4lf2sga7ql2ahib69kygzhx1";
        buildDepends = [
          base binary bytestring containers ghc template-haskell transformers
        ];
        testDepends = [ base deepseq ];
-       jailbreak = true;
        postInstall = ''
          ensureDir "$out/share/ghci"
          ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
@@ -55604,8 +55696,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk";
-       version = "0.13.6";
-       sha256 = "1xj3vafk6rhy5nifixsp72n88i0idlknggcq1w626jfszx5anx2c";
+       version = "0.13.7";
+       sha256 = "1mrrd8hkpyhk40x9yg2b62i1d5d72p8g561wrhp80cd8f654cfij";
        buildDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
@@ -55881,8 +55973,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk3";
-       version = "0.13.6";
-       sha256 = "12fsbl56gf8inxvg7jqad2j689gpwp4bwznyz153y6xzgqs7vaq0";
+       version = "0.13.7";
+       sha256 = "15jgv5ci79r36jy6h5hq04zffryx5bbv2sknxnydn0cxng6kvgr9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -62740,6 +62832,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hein" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath
+     , http-conduit, process, transformers
+     }:
+     mkDerivation {
+       pname = "hein";
+       version = "0.1.0.2";
+       sha256 = "10g07m73iaq9v17hv2wx0mmza8vmlakyjjqfhb4rgf73pikfhvsf";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring directory filepath http-conduit process
+         transformers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/khanage/heineken";
+       description = "An extensible build helper for haskell, in the vein of leiningen";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "heist" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , bytestring, containers, directory, directory-tree, dlist, errors
@@ -68688,6 +68800,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hscuid" = callPackage
+    ({ mkDerivation, base, containers, formatting, hostname, random
+     , text, time, transformers, unix
+     }:
+     mkDerivation {
+       pname = "hscuid";
+       version = "1.0.0";
+       sha256 = "19py373zmfmfr52grvv4gimm4i0gnsiy6xxp60m8b6bb4cbiyj75";
+       buildDepends = [
+         base formatting hostname random text time transformers unix
+       ];
+       testDepends = [ base containers ];
+       homepage = "https://github.com/eightyeight/hscuid";
+       description = "Collision-resistant IDs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hscurses" = callPackage
     ({ mkDerivation, base, exceptions, mtl, old-locale, old-time, unix
      }:
@@ -69237,6 +69366,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) lua;};
 
+  "hslua_0_4_0" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, hspec-contrib, HUnit, lua
+     , text
+     }:
+     mkDerivation {
+       pname = "hslua";
+       version = "0.4.0";
+       sha256 = "0l50ppvnavs3lc1vmrpxhlb3ffl772n1hk8mdi9w4ml64ninba3p";
+       buildDepends = [ base bytestring ];
+       testDepends = [ base bytestring hspec hspec-contrib HUnit text ];
+       extraLibraries = [ lua ];
+       configureFlags = [ "-fsystem-lua" ];
+       description = "A Lua language interpreter embedding in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) { inherit (pkgs) lua;};
+
   "hsmagick" = callPackage
     ({ mkDerivation, base, bytestring, bzip2, directory, filepath
      , freetype2, GraphicsMagick, jasper, lcms, libjpeg, libpng, libxml2
@@ -73066,8 +73211,11 @@ self: {
      mkDerivation {
        pname = "iconv";
        version = "0.4.1.2";
+       revision = "1";
        sha256 = "0sd7by7idcnw368mdc1rs3j4xwbzdvgvkd5p1bwgw7wcd272c142";
+       editedCabalFile = "dec449ecde9679a092fc8513cec0bfe72031aa309b9b9795db572a726a976451";
        buildDepends = [ base bytestring ];
+       jailbreak = true;
        description = "String encoding conversion";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77308,8 +77456,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsonschema-gen";
-       version = "0.3.0.0";
-       sha256 = "0jjqn5y5rxgm92y26p00kd5rkh4z1kyavj0v5axpbs9a9a08aplx";
+       version = "0.3.0.1";
+       sha256 = "18hc6a7ihjpnnnjsx4r403w2zx2nzxa4qvj4picdw83r4sgjvv2d";
        buildDepends = [
          aeson base bytestring containers scientific tagged text time
          unordered-containers vector
@@ -77317,7 +77465,6 @@ self: {
        testDepends = [
          aeson base bytestring containers process tagged text
        ];
-       jailbreak = true;
        homepage = "https://github.com/yuga/jsonschema-gen";
        description = "JSON Schema generator from Algebraic data type";
        license = stdenv.lib.licenses.bsd3;
@@ -80429,10 +80576,9 @@ self: {
     ({ mkDerivation, base, lens, QuickCheck, transformers }:
      mkDerivation {
        pname = "lens-properties";
-       version = "4.7";
-       sha256 = "07acd6a9qp0z06nxb33ml8fa470i04v8bxyrhf7i30lvyy40gfik";
+       version = "4.11";
+       sha256 = "0cg0n75ss5ayy31igwyz9yz2sh0smcaiidbbm1wkrk1krzbws31w";
        buildDepends = [ base lens QuickCheck transformers ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/lens/";
        description = "QuickCheck properties for lens";
        license = stdenv.lib.licenses.bsd3;
@@ -80598,8 +80744,8 @@ self: {
      }:
      mkDerivation {
        pname = "lexer-applicative";
-       version = "1.1";
-       sha256 = "1yl4404w5pmmpa1l7j4zlm5lg24jglxff04qdc757bd1r0bklbw1";
+       version = "2.1";
+       sha256 = "1xryc4nnfs7vzvmdszksmzjmz0pi1gpip0qr3gf2lv0baayma7zj";
        buildDepends = [ base regex-applicative srcloc ];
        testDepends = [
          base deepseq regex-applicative srcloc tasty tasty-hunit
@@ -82156,8 +82302,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "list-extras";
-       version = "0.4.1.3";
-       sha256 = "16w10xgh2y76q8aj5pgw4zq5p2phjzf5g1bmkacrm8gbwkp4v71s";
+       version = "0.4.1.4";
+       sha256 = "15vjk6y3zwiffm1x8wlzv6203ykzm2phalqlq4zhmhcj2wd70viw";
        buildDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Common not-so-common functions for lists";
@@ -82240,6 +82386,7 @@ self: {
          transformers-base
        ];
        testDepends = [ base-prelude HTF mmorph mtl-prelude ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/list-t";
        description = "ListT done right";
        license = stdenv.lib.licenses.mit;
@@ -83064,8 +83211,8 @@ self: {
     ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "logfloat";
-       version = "0.13.3";
-       sha256 = "0m1d0g14p6yb4g4irhisfchx3241b2vlm4g527rhwpr8lxd3fqzp";
+       version = "0.13.3.1";
+       sha256 = "0rqnp2zkp247sb3parn3ywsk9clasy4l906a1wyrrybc3p72126s";
        buildDepends = [ array base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Log-domain floating point numbers";
@@ -85377,7 +85524,9 @@ self: {
      mkDerivation {
        pname = "matrix";
        version = "0.3.4.3";
+       revision = "1";
        sha256 = "1nshgxiza384xh7h22qgbwa75bylc1l3gh6dsm51axapr1ldi8gg";
+       editedCabalFile = "f586a9d89c7279218a0436d0b8a6adaabc22414caca30774904821bd40cc5ace";
        buildDepends = [ base deepseq loop primitive vector ];
        testDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A native implementation of matrix operations";
@@ -85931,8 +86080,8 @@ self: {
      }:
      mkDerivation {
        pname = "memory";
-       version = "0.4";
-       sha256 = "1n7w11w3c9qag17nx6ssp2ni2kym980dwrwdrpdf7668n1jkcjvr";
+       version = "0.5";
+       sha256 = "0lz3w1faxlgyx0sc7nk5wg83zfks5595mxmlrspmbd4d85jk4nvh";
        buildDepends = [ base bytestring deepseq ghc-prim ];
        testDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        homepage = "https://github.com/vincenthz/hs-memory";
@@ -86138,8 +86287,8 @@ self: {
      }:
      mkDerivation {
        pname = "metrics";
-       version = "0.2.1.0";
-       sha256 = "1q3j4ssij3v688yhn0zzs1bvyp21p0vnp2760qbvha1a7g0m8gif";
+       version = "0.3.0.0";
+       sha256 = "1g1nxb7q834nslrmgmqarbbq3ah60k2fqj71k55z9dj4waqgx2sg";
        buildDepends = [
          ansi-terminal base bytestring containers lens mtl mwc-random
          primitive text time unix unordered-containers vector
@@ -86845,8 +86994,8 @@ self: {
      }:
      mkDerivation {
        pname = "minst-idx";
-       version = "0.1.2.1";
-       sha256 = "149128cags685m463p92vzri9cr501dby2vs0aqmrka8sg0py7j9";
+       version = "0.1.2.2";
+       sha256 = "06ixg6bm55h1mjym3qp667gddy7f32inaxgyfbrh918zl283briv";
        buildDepends = [ base binary bytestring vector ];
        testDepends = [ base binary directory hspec vector ];
        homepage = "https://github.com/kryoxide/minst-idx/";
@@ -87489,12 +87638,11 @@ self: {
      }:
      mkDerivation {
        pname = "monad-journal";
-       version = "0.7";
-       sha256 = "1bfm5p027vf8dz92m6s47z06h05j2jv4pbwkl31svrz5pi5a9lz2";
+       version = "0.7.1";
+       sha256 = "1bfj9yy7hkixii31fbxdydjwx9ln6snm40w6l5vph2skcrms9bvr";
        buildDepends = [
          base either monad-control mtl transformers transformers-base
        ];
-       jailbreak = true;
        homepage = "http://github.com/phaazon/monad-journal";
        description = "Pure logger typeclass and monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -89205,8 +89353,8 @@ self: {
      }:
      mkDerivation {
        pname = "muesli";
-       version = "0.1.0.1";
-       sha256 = "10dyk5yz911lfdf11iizmpinha7h09gd7yrg67wjsb6myyvwbdg5";
+       version = "0.1.1.0";
+       sha256 = "0cysqy3g9zgvbzj9gnwlpqk63inkm26dvhhqx8qlzp1lan6f125w";
        buildDepends = [
          base bytestring cereal containers directory filepath hashable mtl
          psqueues time
@@ -90666,6 +90814,7 @@ self: {
        sha256 = "00xkhc25s675pcg5s3fiq3l57zsslc0vps44gmwwas4gnz27wdfy";
        buildDepends = [ base base-prelude parsec template-haskell ];
        testDepends = [ base-prelude HTF ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/neat-interpolation";
        description = "A quasiquoter for neat and simple multiline text interpolation";
        license = stdenv.lib.licenses.mit;
@@ -91203,8 +91352,8 @@ self: {
      }:
      mkDerivation {
        pname = "network";
-       version = "2.6.1.0";
-       sha256 = "0nx85kvrzjm258qr5blphli44gipc7nvxgvbyq8ifv42ll6w6jdj";
+       version = "2.6.2.0";
+       sha256 = "0szkzllpc6vs72fz7nykf5y7vc8mvqfv6h4sshfwmdazl2zv03n5";
        buildDepends = [ base bytestring unix ];
        testDepends = [
          base bytestring HUnit test-framework test-framework-hunit
@@ -91258,6 +91407,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "network-anonymous-tor" = callPackage
+    ({ mkDerivation, attoparsec, base, base32string, bytestring
+     , exceptions, hexstring, hspec, hspec-attoparsec
+     , hspec-expectations, network, network-attoparsec, network-simple
+     , socks, text, transformers
+     }:
+     mkDerivation {
+       pname = "network-anonymous-tor";
+       version = "0.9.0";
+       sha256 = "02ywcdjrrjivzmzj22nxx81xkcxplhcaxpz21196r3kni8qhi0h0";
+       buildDepends = [
+         attoparsec base base32string bytestring exceptions hexstring
+         network network-attoparsec network-simple socks text transformers
+       ];
+       testDepends = [
+         attoparsec base base32string bytestring exceptions hspec
+         hspec-attoparsec hspec-expectations network network-simple socks
+         text transformers
+       ];
+       homepage = "http://www.leonmergen.com/opensource.html";
+       description = "Haskell API for Tor anonymous networking";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "network-api-support" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
      , case-insensitive, http-client, http-client-tls, http-types, text
@@ -95013,8 +95186,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.1.0";
-       sha256 = "1z6q9sb5h0bbvkdlv6abvhgz0cgw4vixs3pv531l9jpkmvfri8r4";
+       version = "0.1.2.0";
+       sha256 = "0q9ia1nzmzv1q8hplrmxszwk49mlp4v8skbfv4ggsl8s0vxc1c6f";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -98136,8 +98309,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-vector";
-       version = "0.6.1";
-       sha256 = "12a50i6fhvri76sr0h3fz9ds5yvnapdyx4n3rcxz2rk543mdvhsp";
+       version = "0.6.2";
+       sha256 = "11nibsshxgnr2jw8lh8q9aygbmpfsq7mf7kdvaqzyggmrdsns2wn";
        buildDepends = [
          base monad-primitive pipes primitive transformers vector
        ];
@@ -98722,8 +98895,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "pointless-fun";
-       version = "1.1.0.5";
-       sha256 = "17gzh3w5j05l6ig1sdjqrl7br17zzpy9yh5k2lck0gjl5prcjclw";
+       version = "1.1.0.6";
+       sha256 = "0m5hwd0mr7bmb2sbs1qa7l65xrr5h2wjznknsrk1ga08qkd5jp6h";
        buildDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Some common point-free combinators";
@@ -99453,6 +99626,7 @@ self: {
          base-prelude bytestring HTF postgresql-libpq QuickCheck
          quickcheck-instances scientific text time uuid
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
@@ -100066,8 +100240,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "prelude-safeenum";
-       version = "0.1.1.1";
-       sha256 = "0cff77nbhy3dsamrwm2wxhbi1mf2bzkdd1pdzqv3klpbzjwkdszv";
+       version = "0.1.1.2";
+       sha256 = "09wp6b7bvnp2wz0kigwm4vfca74phh3bbpqybqdgm60isfaz3yfl";
        buildDepends = [ base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "A redefinition of the Prelude's Enum class in order to render it safe";
@@ -101456,6 +101630,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "publicsuffix" = callPackage
+    ({ mkDerivation, base, bytestring, filepath, hspec
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "publicsuffix";
+       version = "0.20150507";
+       sha256 = "1n1wns0n48rqva5zz4kyj84rw0lf7ih612cp0dhsdk9jgc1kapsj";
+       buildDepends = [ base bytestring filepath template-haskell text ];
+       testDepends = [ base hspec text ];
+       homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
+       description = "The publicsuffix list exposed as proper Haskell types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "publicsuffixlist" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, data-default
      , HUnit, idna, text, utf8-string
@@ -103400,8 +103589,8 @@ self: {
      }:
      mkDerivation {
        pname = "razom-text-util";
-       version = "0.1.0.0";
-       sha256 = "08f7cvipcdcn6s2rgf0n65g67fhkx36841dihzzsfalglfr9gn6m";
+       version = "0.1.1.0";
+       sha256 = "1zmqfjbhvszf2ky6556q1311x23y1h0v90yqaa1mynn8lqhplgkv";
        buildDepends = [ base regex-applicative smaoin text-position ];
        testDepends = [ base QuickCheck regex-applicative smaoin ];
        homepage = "http://rel4tion.org/projects/razom-text-util/";
@@ -104030,8 +104219,8 @@ self: {
      }:
      mkDerivation {
        pname = "redis";
-       version = "0.14";
-       sha256 = "0mnjx62q3nlgzspk75xg4zsyq5w8jxgh8gd32mc26xvyr0r02094";
+       version = "0.14.1";
+       sha256 = "02r97k08n9gyrfmbm6qgb8dddivaiprp50hs79a5bnxvvl6vmq9b";
        buildDepends = [
          base bytestring concurrent-extra containers exceptions mtl network
          old-time utf8-string
@@ -105112,8 +105301,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.4.0.1";
-       sha256 = "00ysy5lg0mpv5b1vcjlfi6nx72df3iqz5nmrfsrr0k7i65xp1fzi";
+       version = "0.5.0.0";
+       sha256 = "00q0z4bnic5phhm7xxv059380q23d0fhd8vh32aggjlggzlq01sx";
        buildDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -106116,8 +106305,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-stringmap";
-       version = "0.2.0.5";
-       sha256 = "0xnvzwwaxfl2iphpicprn0wvlfk3cg6vz53kl2gv1fi322jcjv3b";
+       version = "0.2.0.6";
+       sha256 = "0jjj0yam4d4w36lnxk0ci7ylb9ya48y0ag3b54k9ikyg0hps7rb6";
        buildDepends = [
          aeson base containers hashable hxt json-schema tostring
          unordered-containers
@@ -107415,10 +107604,9 @@ self: {
      }:
      mkDerivation {
        pname = "rss";
-       version = "3000.2.0.4";
-       sha256 = "1kq7bk3kl48699n2ri15im5ds8cd2pmcjglh06br1knxkli80kbq";
+       version = "3000.2.0.5";
+       sha256 = "0ydr6wqmac6bk3bn69fgay66rc2xap99jgz1gg5z09mhhv3bjmb1";
        buildDepends = [ base HaXml network network-uri old-locale time ];
-       jailbreak = true;
        homepage = "https://github.com/basvandijk/rss";
        description = "A library for generating RSS 2.0 feeds.";
        license = stdenv.lib.licenses.publicDomain;
@@ -108976,6 +109164,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scotty_0_10_0" = callPackage
+    ({ mkDerivation, aeson, async, base, blaze-builder, bytestring
+     , case-insensitive, data-default-class, directory, hspec, hspec-wai
+     , http-types, lifted-base, monad-control, mtl, network
+     , regex-compat, text, transformers, transformers-base
+     , transformers-compat, wai, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "scotty";
+       version = "0.10.0";
+       sha256 = "0r1k96cf5nykgg987hfqfayyix23rjfn73njqqsfxjiai1dgrnzn";
+       buildDepends = [
+         aeson base blaze-builder bytestring case-insensitive
+         data-default-class http-types monad-control mtl network
+         regex-compat text transformers transformers-base
+         transformers-compat wai wai-extra warp
+       ];
+       testDepends = [
+         async base data-default-class directory hspec hspec-wai http-types
+         lifted-base network text wai
+       ];
+       homepage = "https://github.com/scotty-web/scotty";
+       description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "scotty-binding-play" = callPackage
     ({ mkDerivation, base, bytestring, hspec, http-client, HUnit, mtl
      , scotty, template-haskell, text, transformers
@@ -109556,12 +109770,12 @@ self: {
      }) {};
 
   "securemem" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, ghc-prim }:
+    ({ mkDerivation, base, byteable, bytestring, ghc-prim, memory }:
      mkDerivation {
        pname = "securemem";
-       version = "0.1.7";
-       sha256 = "14mmis2y9xf3jzmf6s6g7g8ixgbrx99x0b422zv4ix3vpx2lj57r";
-       buildDepends = [ base byteable bytestring ghc-prim ];
+       version = "0.1.8";
+       sha256 = "14q5p464vks942k4q5dl4gyi9asg3d8rl8kd84qgbrvvr3ymhxb2";
+       buildDepends = [ base byteable bytestring ghc-prim memory ];
        homepage = "http://github.com/vincenthz/hs-securemem";
        description = "abstraction to an auto scrubbing and const time eq, memory chunk";
        license = stdenv.lib.licenses.bsd3;
@@ -110176,24 +110390,24 @@ self: {
 
   "servant" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
-     , bytestring-conversion, case-insensitive, doctest, filemanip
-     , hspec, http-media, http-types, network-uri, parsec, QuickCheck
-     , quickcheck-instances, string-conversions, text, url
+     , bytestring-conversion, case-insensitive, directory, doctest
+     , filemanip, filepath, hspec, http-media, http-types, network-uri
+     , parsec, QuickCheck, quickcheck-instances, string-conversions
+     , text, url
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.4.0";
-       revision = "1";
-       sha256 = "17954b85wj965wkhzr1jd34sia32px4qhnqjl2wn4rymj9lv25f5";
-       editedCabalFile = "b9f6399d21ba876a4e30cb8e48cb040a972fe82dbac93c62691dc6eae530c25b";
+       version = "0.4.1";
+       sha256 = "0rbbijy1y40msy0ficssfg0krylrma55z500anymjkmpyp3ymnls";
        buildDepends = [
          aeson attoparsec base bytestring bytestring-conversion
          case-insensitive http-media http-types network-uri
          string-conversions text
        ];
        testDepends = [
-         aeson attoparsec base bytestring doctest filemanip hspec parsec
-         QuickCheck quickcheck-instances string-conversions text url
+         aeson attoparsec base bytestring directory doctest filemanip
+         filepath hspec parsec QuickCheck quickcheck-instances
+         string-conversions text url
        ];
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs";
@@ -110204,8 +110418,8 @@ self: {
     ({ mkDerivation, base, blaze-html, http-media, servant }:
      mkDerivation {
        pname = "servant-blaze";
-       version = "0.4.0.0";
-       sha256 = "17l0fm296zg5nwfc6srnjl82qckabyac5yxm1dhqxwxq45kj42an";
+       version = "0.4.1";
+       sha256 = "0an5lb3p61i8iahs5rgfy97s3ivqa3q0034iz8zxa4rvhy7k56hp";
        buildDepends = [ base blaze-html http-media servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Blaze-html support for servant";
@@ -110221,10 +110435,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.4.0";
-       revision = "1";
-       sha256 = "0nvbhiakxfjkb9v5ijv6zapjfbppc6ygd3g8rv5i9paj59ifwxmm";
-       editedCabalFile = "9a7ca5856ef66a4345f4732e7ca5680f55502b899bbe1e2f1397b0e55d33ad37";
+       version = "0.4.1";
+       sha256 = "1h0w9dkngrz9pimz66bc2ij9ik316x0sliyyqf16mmkpn66wcl6r";
        buildDepends = [
          aeson attoparsec base bytestring either exceptions http-client
          http-client-tls http-media http-types network-uri safe servant
@@ -110247,8 +110459,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.4.0";
-       sha256 = "0fbbs4w0yz0kj3gvms0xbikzfqjdqbbi19z26z3zdmc06crkhn4m";
+       version = "0.4.1";
+       sha256 = "0xhj75nbsnlbzp3sf6qkfwh0x6a64lfzzq9m07wfg02nqzn22y92";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -110262,6 +110474,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-ede" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, ede, either, filepath
+     , http-media, http-types, semigroups, servant, servant-server, text
+     , transformers, unordered-containers, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-ede";
+       version = "0.4";
+       sha256 = "0h1kvgp0hzn5zmvc5gys3n3w20gmjmsgdw4lmpk7qwg16x2kriwd";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring ede either filepath http-media http-types
+         semigroups servant servant-server text transformers
+         unordered-containers wai warp
+       ];
+       homepage = "http://github.com/alpmestan/servant-ede";
+       description = "Combinators for rendering EDE templates in servant web applications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-jquery" = callPackage
     ({ mkDerivation, aeson, base, charset, filepath, hspec
      , hspec-expectations, language-ecmascript, lens, servant
@@ -110269,8 +110502,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-jquery";
-       version = "0.4.0";
-       sha256 = "1p8pdrqyj1pyrwghv3k26s4y4aprlkasbzcba9j5n528xvfg0zw5";
+       version = "0.4.1";
+       sha256 = "10w4fll46355w21l2jq3kd9lfsncdajc8s40j181s29kw6bq6r6n";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -110289,8 +110522,8 @@ self: {
     ({ mkDerivation, base, http-media, lucid, servant }:
      mkDerivation {
        pname = "servant-lucid";
-       version = "0.4.0.0";
-       sha256 = "05jadyh3msl2jlrq1d8bmazxb356qdv0gzwpj9gkvrsp4i6ldgcl";
+       version = "0.4.1";
+       sha256 = "02bggqwmpqznfnprfyfq6ia04byi23zgwvzigymaw1bykfi7z6h0";
        buildDepends = [ base http-media lucid servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Servant support for lucid";
@@ -110379,28 +110612,26 @@ self: {
   "servant-server" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
      , bytestring-conversion, directory, doctest, either, exceptions
-     , filemanip, hspec, hspec-wai, http-types, mmorph, mtl, network
-     , network-uri, parsec, QuickCheck, safe, servant, split
+     , filemanip, filepath, hspec, hspec-wai, http-types, mmorph, mtl
+     , network, network-uri, parsec, QuickCheck, safe, servant, split
      , string-conversions, system-filepath, temporary, text
      , transformers, wai, wai-app-static, wai-extra, warp
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.4.0";
-       revision = "1";
-       sha256 = "0wr1rn1gvbph07ycx97qcm4j4jp15xnhvrk5y49bsiv6w6d9xxgx";
-       editedCabalFile = "2e024f79e857aa5ad15cf171c1883b99eb45e901ec888eb68d9c6099c88bbbe8";
+       version = "0.4.1";
+       sha256 = "0bc82pn82ymv5wy1plmcgxb0ljkqj48rn9x8gdjdki06yvph63ga";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson attoparsec base bytestring either http-types mmorph mtl
-         network-uri safe servant split string-conversions system-filepath
-         text transformers wai wai-app-static warp
+         aeson attoparsec base bytestring either filepath http-types mmorph
+         mtl network-uri safe servant split string-conversions
+         system-filepath text transformers wai wai-app-static warp
        ];
        testDepends = [
          aeson base bytestring bytestring-conversion directory doctest
-         either exceptions filemanip hspec hspec-wai http-types mtl network
-         parsec QuickCheck servant string-conversions temporary text
+         either exceptions filemanip filepath hspec hspec-wai http-types mtl
+         network parsec QuickCheck servant string-conversions temporary text
          transformers wai wai-extra warp
        ];
        jailbreak = true;
@@ -114458,10 +114689,8 @@ self: {
     ({ mkDerivation, async, base, bytestring }:
      mkDerivation {
        pname = "socket";
-       version = "0.1.0.1";
-       revision = "1";
-       sha256 = "06c5vrpwrlp1ab8axvbmrar382d780a8m6zqvvjb6zjahgd5cl32";
-       editedCabalFile = "ef4027263ba8c3069f127839a7bace4b09d6d78714183b3faab935919c57e09c";
+       version = "0.2.0.0";
+       sha256 = "0z9hcbvsalmn7zmmks18v8pq3gnvf868kw44a9s6kp5h6npp05dw";
        buildDepends = [ base bytestring ];
        testDepends = [ async base bytestring ];
        homepage = "https://github.com/lpeterse/haskell-socket";
@@ -116905,8 +117134,8 @@ self: {
     ({ mkDerivation, base, stm }:
      mkDerivation {
        pname = "stm-chans";
-       version = "3.0.0.3";
-       sha256 = "058miz12xm21lghc4bi06grsddd8hf2x9x5qdh0dva6lk0h9y7mk";
+       version = "3.0.0.4";
+       sha256 = "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13";
        buildDepends = [ base stm ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Additional types of channels for STM";
@@ -118632,12 +118861,13 @@ self: {
      }:
      mkDerivation {
        pname = "syb-with-class";
-       version = "0.6.1.5";
-       sha256 = "1gn4p92jabgvbk7bg1nzjimyfzznl800bi9hw4ssvc7jqqnyw5zn";
+       version = "0.6.1.6";
+       revision = "1";
+       sha256 = "1c61hig293lxyr2kdri3rp6wkns921fiwwmml9zhrhrrryfr0p2n";
+       editedCabalFile = "e894d322dfc9c36c33058bfcbecbe6d36e620556a9713108b008120f7981cd7c";
        buildDepends = [
          array base bytestring containers template-haskell
        ];
-       jailbreak = true;
        description = "Scrap Your Boilerplate With Class";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122186,6 +122416,7 @@ self: {
          base containers HTF list-extras loch-th placeholders
          template-haskell th-expand-syns
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/th-instance-reification";
        description = "Fixed versions of instances reification functions";
        license = stdenv.lib.licenses.mit;
@@ -123158,6 +123389,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "time-qq" = callPackage
+    ({ mkDerivation, base, hspec, old-locale, template-haskell, time }:
+     mkDerivation {
+       pname = "time-qq";
+       version = "0.0.0.1";
+       sha256 = "11ib2i7693jvszbgzd2673953pklxphd0mhwkf67q47d6b5spdpq";
+       buildDepends = [ base old-locale template-haskell time ];
+       testDepends = [ base hspec ];
+       homepage = "https://github.com/christian-marie/time-qq";
+       description = "Quasi-quoter for UTCTime times";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "time-recurrence" = callPackage
     ({ mkDerivation, base, data-ordlist, HUnit, mtl, old-locale
      , test-framework, test-framework-hunit, time
@@ -124767,7 +125011,9 @@ self: {
      mkDerivation {
        pname = "ttrie";
        version = "0.1.2";
+       revision = "1";
        sha256 = "09nbba623nxnlg1957sgcrrva3ycwb31asxnxihwjh0wxrqhh1k0";
+       editedCabalFile = "60673b32699d1b010c285811c892a1aa7b8890733083c82148ecd033b4db1222";
        buildDepends = [ atomic-primops base hashable primitive stm ];
        testDepends = [
          base containers hashable QuickCheck stm test-framework
@@ -126782,8 +127028,8 @@ self: {
     ({ mkDerivation, base, containers, logict, mtl }:
      mkDerivation {
        pname = "unification-fd";
-       version = "0.10.0";
-       sha256 = "1jin4w4csy6vhjrqk4lwn6aa6ic3xqnk86fsasznp2x9jv3rzw2b";
+       version = "0.10.0.1";
+       sha256 = "15hrnmgr0pqq43fwgxc168r08xjgfhr2nchmz5blq46vwrh6gx2v";
        buildDepends = [ base containers logict mtl ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Simple generic unification algorithms";
@@ -127113,8 +127359,8 @@ self: {
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "unix-bytestring";
-       version = "0.3.7.2";
-       sha256 = "0n1i7pcdwhs0wz6spf3pndr8i74qn0cdzr3p46w4r4mvvwr76i2s";
+       version = "0.3.7.3";
+       sha256 = "1340zxy9w8nmmhhwgg9rznvz8iyfhinpycdpkryqp60ilhyjgv53";
        buildDepends = [ base bytestring ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Unix/Posix-specific functions for ByteStrings";
@@ -127554,8 +127800,8 @@ self: {
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.1.1";
-       sha256 = "19nqdv61bsp470m94vq9cdpcyw1q9rwfplmpj09dd5pkmp7f6m8s";
+       version = "0.1.2";
+       sha256 = "1rd166dsc5cl6bwvd43z08d6j6djnmskg1ddnv1js0z4xxpbs2qf";
        buildDepends = [ attoparsec base blaze-builder bytestring ];
        testDepends = [
          attoparsec base bytestring derive HUnit lens QuickCheck
@@ -130548,8 +130794,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-request-spec";
-       version = "0.9.1.0";
-       sha256 = "1niszz8v8x4qkzssc5pmhpqsq3v9ad4gscx0dxxxpfz76fcs4f1k";
+       version = "0.10.0.0";
+       sha256 = "1sjlajp79j9mj0xaz9srzvai86il95vzq7668ydzj9hllllf04bk";
        buildDepends = [
          base bytestring case-insensitive containers http-types text wai
        ];
@@ -131554,8 +131800,8 @@ self: {
      }:
      mkDerivation {
        pname = "webkit";
-       version = "0.13.1.2";
-       sha256 = "090gp3700dafb30jdf1bw1vcn7rj7cs4h0glbi5rqp2ssg5f78kc";
+       version = "0.13.1.3";
+       sha256 = "00h9465xl6rfnd72cmn68z3mpany63dxl6fm2gqjbdzbrssj7306";
        buildDepends = [ base bytestring cairo glib gtk mtl pango text ];
        buildTools = [ gtk2hs-buildtools ];
        pkgconfigDepends = [ webkit ];
@@ -131584,8 +131830,8 @@ self: {
      }:
      mkDerivation {
        pname = "webkitgtk3";
-       version = "0.13.1.2";
-       sha256 = "11b9n7q5xljjfnpfbh91kzs568y7nqdys5rm518cr4an20mbi47l";
+       version = "0.13.1.3";
+       sha256 = "0gfznb6n46576im72m6k9wrwc2n9f48nk4dsaz2llvzlzlzx4zfk";
        buildDepends = [ base bytestring cairo glib gtk3 mtl pango text ];
        buildTools = [ gtk2hs-buildtools ];
        pkgconfigDepends = [ webkit ];
@@ -132900,8 +133146,8 @@ self: {
      }:
      mkDerivation {
        pname = "x509";
-       version = "1.5.0.1";
-       sha256 = "03gj4190f0ql1ghn2mri8901xdydhhnwijyfn8lmpjyn7pgpl3ba";
+       version = "1.5.1";
+       sha256 = "1mxg3bill1zqxdn6x0ayf8dja7y3xqikjaj9dhwf22y24vsj6v2n";
        buildDepends = [
          asn1-encoding asn1-parse asn1-types base bytestring containers
          crypto-pubkey-types cryptohash directory filepath hourglass mtl pem

From c40c1be7987e0609fac5308e58cb672104418110 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Sat, 30 May 2015 11:50:59 -0700
Subject: [PATCH 0502/2322] prometheus-mesos-exporter: Fix misplaced
 dependencies

goPackages.mesos-stats doesn't actually have any dependencies of its
own; the mesos_exporter app does.
---
 .../monitoring/prometheus/mesos_exporter/default.nix        | 6 +++++-
 pkgs/top-level/go-packages.nix                              | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
index 5a62a46823b..fec66af2469 100644
--- a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
@@ -12,7 +12,11 @@ goPackages.buildGoPackage rec {
     sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm";
   };
 
-  buildInputs = [ goPackages.mesos-stats ];
+  buildInputs = [
+    goPackages.mesos-stats
+    goPackages.prometheus.client_golang
+    goPackages.glog
+  ];
 
   meta = with lib; {
     description = "Export Mesos metrics to Prometheus";
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 63df1012afd..9af04081000 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1674,8 +1674,6 @@ let
       repo = "mesos_stats";
       sha256 = "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4";
     };
-
-    propagatedBuildInputs = [ prometheus.client_golang glog ];
   };
 
   mgo = buildGoPackage rec {

From dd649df4e4d167a22c5641c956eda499873ae692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 May 2015 20:58:03 +0200
Subject: [PATCH 0503/2322] luaPackages: stabilize src hashes by using fetchzip

I was getting hash errors in some packages.
---
 pkgs/top-level/lua-packages.nix | 42 ++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 773ddd29521..273a0e7ecc1 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -5,7 +5,7 @@
    for each package in a separate file: the call to the function would
    be almost as must code as the function itself. */
 
-{ fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool
+{ fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool
 , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo
 , perl, gtk, python, glib, gobjectIntrospection, libevent, zlib
 }:
@@ -55,9 +55,9 @@ let
     name = "luaevent-${version}";
     disabled = isLua52;
 
-    src = fetchurl {
+    src = fetchzip {
       url = "https://github.com/harningt/luaevent/archive/v${version}.tar.gz";
-      sha256 = "1ifr949j9xaas0jk0nxpilb44dqvk4c5h4m7ccksz5da3iksfgls";
+      sha256 = "1c1n2zqx5rwfwkqaq1jj8gvx1vswvbihj2sy445w28icz1xfhpik";
     };
 
     preBuild = ''
@@ -107,9 +107,9 @@ let
 
   luafilesystem = buildLuaPackage rec {
     name = "filesystem-1.6.2";
-    src = fetchurl {
+    src = fetchzip {
       url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz";
-      sha256 = "1n8qdwa20ypbrny99vhkmx8q04zd2jjycdb5196xdhgvqzk10abz";
+      sha256 = "134azkxw84xp9g5qmzjsmcva629jm7plwcmjxkdzdg05vyd7kig1";
     };
     meta = {
       homepage = "https://github.com/keplerproject/luafilesystem";
@@ -144,9 +144,9 @@ let
   luasec = buildLuaPackage rec {
     version = "0.5";
     name = "sec-${version}";
-    src = fetchurl {
+    src = fetchzip {
       url = "https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz";
-      sha256 = "08rm12cr1gjdnbv2jpk7xykby9l292qmz2v0dfdlgb4jfj7mk034";
+      sha256 = "1zl6wwcyd4dfcw01qan7dkcw0rgzm69w819qbaddcr2ik147ccmq";
     };
 
     buildInputs = [ openssl ];
@@ -190,9 +190,9 @@ let
   luazip = buildLuaPackage rec {
     name = "zip-${version}";
     version = "1.2.3";
-    src = fetchurl {
+    src = fetchzip {
       url = "https://github.com/luaforge/luazip/archive/0b8f5c958e170b1b49f05bc267bc0351ad4dfc44.zip";
-      sha256 = "beb9260d606fdd5304aa958d95f0d3c20be7ca0a2cff44e7b75281c138a76a50";
+      sha256 = "0zrrwhmzny5zbpx91bjbl77gzkvvdi3qhhviliggp0aj8w3faxsr";
     };
     buildInputs = [ unzip zziplib ];
     patches = [ ../development/lua-modules/zip.patch ];
@@ -209,9 +209,9 @@ let
     name = "zlib-${version}";
     version = "0.4";
 
-    src = fetchurl {
+    src = fetchzip {
       url = "https://github.com/brimworks/lua-zlib/archive/v${version}.tar.gz";
-      sha256 = "1l32nwyh8b4vicxvlhbv9qhkhklbhvjfn8wd72bjk7ac9kz172rd";
+      sha256 = "1pgxnjc0gvk25wsr69nsm60y5ad86z1nlq7mzj3ckygzkgi782dd";
     };
 
     buildInputs = [ zlib ];
@@ -238,9 +238,9 @@ let
 
   luastdlib = buildLuaPackage {
     name = "stdlib";
-    src = fetchurl {
+    src = fetchzip {
       url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip";
-      sha256 = "1v3158g5050sdqfrqi6d2bjh0lmi1v01a6m2nwqpr527a2dqcf0c";
+      sha256 = "0636absdfjx8ybglwydmqxwfwmqz1c4b9s5mhxlgm4ci18lw3hms";
     };
     buildInputs = [ unzip ];
     meta = {
@@ -253,9 +253,9 @@ let
   lrexlib = buildLuaPackage rec {
     name = "lrexlib-${version}";
     version = "2.7.2";
-    src = fetchurl {
+    src = fetchzip {
       url = "https://github.com/rrthomas/lrexlib/archive/150c251be57c4e569da0f48bf6b01fbca97179fe.zip";
-      sha256 = "0i5brqbykc2nalp8snlq1r0wmf8y2wqp6drzr2xmq5phvj8913xh";
+      sha256 = "0acb3258681bjq61piz331r99bdff6cnkjaigq5phg3699iz5h75";
     };
     buildInputs = [ unzip luastdlib pcre luarocks oniguruma gnulib tre glibc ];
 
@@ -288,9 +288,9 @@ let
   luasqlite3 = buildLuaPackage rec {
     name = "sqlite3-${version}";
     version = "2.1.1";
-    src = fetchurl {
+    src = fetchzip {
       url = "https://github.com/LuaDist/luasql-sqlite3/archive/2acdb6cb256e63e5b5a0ddd72c4639d8c0feb52d.zip";
-      sha256 = "1yy1n1l1801j48rlf3bhxpxqfgx46ixrs8jxhhbf7x1hn1j4axlv";
+      sha256 = "17zsa0jzciildil9k4lb0rjn9s1nj80dy16pzx9bxqyi75pjf2d4";
     };
 
     buildInputs = [ unzip sqlite ];
@@ -356,9 +356,9 @@ let
   luaMessagePack = buildLuaPackage rec {
     name = "lua-MessagePack-${version}";
     version = "0.3.1";
-    src = fetchurl {
+    src = fetchzip {
       url = "https://github.com/fperrad/lua-MessagePack/archive/${version}.tar.gz";
-      sha256 = "185mrd6bagwwm94jxzanq01l72ama3x4hf160a7yw7hgim2y5h9c";
+      sha256 = "1xlif8fkwd8bb78wrvf2z309p7apms350lbg6qavylsvz57lkjm6";
     };
     buildInputs = [ unzip ];
 
@@ -373,9 +373,9 @@ let
     name = "lgi-${version}";
     version = "0.7.2";
 
-    src = fetchurl {
+    src = fetchzip {
       url    = "https://github.com/pavouk/lgi/archive/${version}.tar.gz";
-      sha256 = "0ihl7gg77b042vsfh0k7l53b7sl3d7mmrq8ns5lrsf71dzrr19bn";
+      sha256 = "10i2ssfs01d49fdmmriqzxc8pshys4rixhx30wzd9p1m1q47a5pn";
     };
 
     meta = with stdenv.lib; {

From b462c7908ff25cb0a9cc972ad376335fcb0f8811 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 30 May 2015 21:02:03 +0200
Subject: [PATCH 0504/2322] git-annex: on second thought, let's not break
 backwards compatibility for no apparent reason

---
 pkgs/applications/version-management/git-and-tools/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 669fe6dc890..a73d1637417 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -47,6 +47,7 @@ rec {
   };
 
   inherit (pkgs.haskellPackages) git-annex;
+  gitAnnex = git-annex;
 
   qgit = import ./qgit {
     inherit fetchurl stdenv;

From cbbd7230ac5252d52053d0b898321c7069da59f0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 29 May 2015 22:34:55 +0200
Subject: [PATCH 0505/2322] lz4 129 -> 130

Hotfix, solving issues with lz4cat.

- Fixed: incompatibility sparse mode vs console (#105)
- Fixed: LZ4IO exits too early when frame crc not present (#106)
- Fixed: incompatibility sparse mode vs append mode (#110)
- Performance fix: big compression speed boost for clang (+30%)
- New: cross-version test
---
 pkgs/tools/compression/lz4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 46b3b2fd7d7..8cf8677b377 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, valgrind }:
 
-let version = "129"; in
+let version = "130"; in
 stdenv.mkDerivation rec {
   name = "lz4-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0liq5gvnikchgvalpi52hq0npwlh84w94bj79dcbrcw19may5dwi";
+    sha256 = "1050hwnbqyz2m26vayv942dh92689qp73chrbnqlg8awhlb5kyi5";
     rev = "r${version}";
     repo = "lz4";
     owner = "Cyan4973";

From 1d4bfeacc58f9568f09ddcfaf3afe370b08e0126 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 29 May 2015 14:18:29 +0200
Subject: [PATCH 0506/2322] simple-scan 3.16.0.1 -> 3.17.2

---
 pkgs/applications/graphics/simple-scan/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 43d717c58e5..ad825eceec2 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, cairo, colord, glib, gtk3, intltool, itstool, libxml2
 , makeWrapper, pkgconfig, saneBackends, systemd, vala }:
 
-let version = "3.16.0.1"; in
+let version = "3.17.2"; in
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
 
   src = fetchurl {
-    sha256 = "0p1knmbrdwrnjjk5x0szh3ja2lfamaaynj2ai92zgci2ma5xh2ma";
-    url = "https://launchpad.net/simple-scan/3.16/${version}/+download/${name}.tar.xz";
+    sha256 = "07r32hsafb8is2fs0flk7dvi5agyzf9jqs96sbgia2pizmyl1s1m";
+    url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz";
   };
 
   meta = with stdenv.lib; {

From 3c6d34a5d9ef20f51fbf6fdbda38224321387aae Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 29 May 2015 14:35:14 +0200
Subject: [PATCH 0507/2322] dpkg 1.17.25 -> 1.18.0

---
 pkgs/tools/package-management/dpkg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index beb0e7d8678..d3a08f044d5 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }:
 
-let version = "1.17.25"; in
+let version = "1.18.0"; in
 
 stdenv.mkDerivation {
   name = "dpkg-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
-    sha256 = "1akblsdfblih7879gi5qagqpgy6zz866kcyvg5y11ywqmqw9s087";
+    sha256 = "0ni25w0cxfz3szccqxq7l1gvcwg48vdvl63aajmbigsvxnz6y5bv";
   };
 
   postPatch = ''

From d904b54c0edb4666a38a478438652a0d7c38832d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 30 May 2015 12:56:04 +0200
Subject: [PATCH 0508/2322] lz4: fix `make test`

I'll assume this is an oversight due to hasty releasing and can be
reverted in version 131.
---
 pkgs/tools/compression/lz4/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 8cf8677b377..fc3eca6ab10 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
   checkTarget = "test";
-  checkFlags = "-j1"; # required since version 128
+  checkFlags = "-j1 -C programs"; # -j1 required since version 128, -C should be temporary
 
   meta = with stdenv.lib; {
     description = "Extremely fast compression algorithm";

From 21015ea82f11cd4d42395a12016ad4add77655d7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 29 May 2015 21:10:36 +0200
Subject: [PATCH 0509/2322] Add bin_replace_string: edit precompiled binaries

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

diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix
new file mode 100644
index 00000000000..7d33d8ee3c3
--- /dev/null
+++ b/pkgs/development/tools/misc/bin_replace_string/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, libelf, txt2man }:
+
+let version = "0.2"; in
+stdenv.mkDerivation rec {
+  name = "bin_replace_string-${version}";
+
+  src = fetchurl {
+    sha256 = "1gnpddxwpsfrg4l76x5yplsvbcdbviybciqpn22yq3g3qgnr5c2a";
+    url = "ftp://ohnopub.net/mirror/bin_replace_string-0.2.tar.bz2";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Edit precompiled binaries";
+    longDescription = ''
+      bin_replace_string edits C-style strings in precompiled binaries. This is
+      intended to be useful to replace arbitrary strings in binaries whose
+      source code is not available. However, because of the nature of compiled
+      binaries, bin_replace_string may only replace a given C-string with a
+      shorter C-string.
+    '';
+    homepage = http://ohnopub.net/~ohnobinki/bin_replace_string/;
+    downloadPage = ftp://ohnopub.net/mirror/;
+    license = licenses.gpl3Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ libelf ];
+  nativeBuildInputs = [ txt2man ];
+
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9639087d67..4e1ac82c7d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5109,6 +5109,8 @@ let
 
   bazel = callPackage ../development/tools/build-managers/bazel { jdk = oraclejdk8; };
 
+  bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { };
+
   binutils = if stdenv.isDarwin
     then import ../build-support/native-darwin-cctools-wrapper {inherit stdenv;}
     else callPackage ../development/tools/misc/binutils {

From 3ca2bb3c039d19c047879e2af92b7b4b0a958666 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 30 May 2015 02:15:23 +0200
Subject: [PATCH 0510/2322] radeontop v0.8-8-g2499679 -> 2015-05-28 (new
 format)

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

diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix
index 7ec74c895c6..99100b85cb6 100644
--- a/pkgs/os-specific/linux/radeontop/default.nix
+++ b/pkgs/os-specific/linux/radeontop/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, pkgconfig, gettext, ncurses, libdrm, libpciaccess }:
 
-let version = "v0.8-8-g2499679"; in
+let version = "2015-05-28"; in
 stdenv.mkDerivation {
   name = "radeontop-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "112zf6ms0qpmr9h3l4lg5wik5j206mgij0nypba5lnqzksxh2f88";
-    rev = "2499679fda60c3f6239886296fd2a74155f45f77";
+    sha256 = "0s281fblqbvl7vgaqiwh3s16y0bah3z0i1ssf4mbwl2iayj1cliq";
+    rev = "b9428f18ea4631fdd5f9ccee81570aa7ac472c07";
     repo = "radeontop";
     owner = "clbr";
   };
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   patchPhase = ''
-    substituteInPlace getver.sh --replace ver=unknown ver=${version}
+    substituteInPlace getver.sh --replace ver=unknown ver=${version}-git
   '';
 
   makeFlags = "PREFIX=$(out)";

From 99626a6ba4d06603b77681d132664b1c2795a119 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 30 May 2015 01:27:35 +0200
Subject: [PATCH 0511/2322] accounts-qt 1.11 -> 1.13

Development has moved from Google Code to Gitlab.
---
 .../libraries/accounts-qt/default.nix         | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
index 9194339b3a4..c0e40472902 100644
--- a/pkgs/development/libraries/accounts-qt/default.nix
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -1,23 +1,27 @@
-{ stdenv, fetchurl, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }:
+{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }:
 
+let version = "1.13"; in
 stdenv.mkDerivation rec {
-  name = "accounts-qt-1.11";
-  src = fetchurl {
-    url = "https://accounts-sso.googlecode.com/files/${name}.tar.bz2";
-    sha256 = "07drh4s7zaz4bzg2xhwm50ig1g8vlphfv02nrzz1yi085az1fmch";
+  name = "accounts-qt-${version}";
+
+  src = fetchFromGitLab {
+    sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl";
+    rev = "${version}";
+    repo = "libaccounts-qt";
+    owner = "accounts-sso";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Qt library for accessing the online accounts database";
+    homepage = "http://code.google.com/p/accounts-sso/";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ nckx ];
   };
 
   buildInputs = [ glib libaccounts-glib qt5.base ];
   nativeBuildInputs = [ doxygen pkgconfig ];
 
   configurePhase = ''
-    qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/AccountsQt5
-  '';
-
-  postInstall = ''
-    mv $out/lib/cmake/AccountsQt5/AccountsQtConfig.cmake \
-       $out/lib/cmake/AccountsQt5/AccountsQt5Config.cmake
-    mv $out/lib/cmake/AccountsQt5/AccountsQtConfigVersion.cmake \
-       $out/lib/cmake/AccountsQt5/AccountsQt5ConfigVersion.cmake
+    qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake
   '';
 }

From 21b10ab44fa8f28f36990085853d9d2708d694db Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 30 May 2015 19:22:32 +0000
Subject: [PATCH 0512/2322] agda: `postprocess` and `defaults` need not be in
 the scope of args

---
 pkgs/build-support/agda/default.nix | 163 ++++++++++++++--------------
 1 file changed, 81 insertions(+), 82 deletions(-)

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index a404bbcf634..74debe79efc 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -14,87 +14,86 @@ let
   concatMapStrings = stdenv.lib.strings.concatMapStrings;
   unwords = stdenv.lib.strings.concatStringsSep " ";
   mapInside = xs: unwords (map (x: x + "/*") xs);
+
+  defaults = self : {
+    # There is no Hackage for Agda so we require src.
+    inherit (self) src name;
+
+    isAgdaPackage = true;
+
+    buildInputs = [ Agda ] ++ self.buildDepends;
+    buildDepends = [];
+
+    buildDependsAgda = filter
+      (dep: dep ? isAgdaPackage && dep.isAgdaPackage)
+      self.buildDepends;
+    buildDependsAgdaShareAgda = map (x: x + "/share/agda") self.buildDependsAgda;
+
+    # Not much choice here ;)
+    LANG = "en_US.UTF-8";
+    LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
+
+    everythingFile = "Everything.agda";
+
+    propagatedBuildInputs = self.buildDependsAgda;
+    propagatedUserEnvPkgs = self.buildDependsAgda;
+
+    # Immediate source directories under which modules can be found.
+    sourceDirectories = [ ];
+
+    # This is used if we have a top-level element that only serves
+    # as the container for the source and we only care about its
+    # contents. The directories put here will have their
+    # *contents* copied over as opposed to sourceDirectories which
+    # would make a direct copy of the whole thing.
+    topSourceDirectories = [ "src" ];
+
+    # FIXME: `dirOf self.everythingFile` is what we really want, not hardcoded "./"
+    includeDirs = self.buildDependsAgdaShareAgda
+                  ++ self.sourceDirectories ++ self.topSourceDirectories
+                  ++ [ "." ];
+    buildFlags = unwords (map (x: "-i " + x) self.includeDirs);
+
+    agdaWithArgs = "${Agda}/bin/agda ${self.buildFlags}";
+
+    buildPhase = ''
+      runHook preBuild
+      ${self.agdaWithArgs} ${self.everythingFile}
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out/share/agda
+      cp -pR ${unwords self.sourceDirectories} ${mapInside self.topSourceDirectories} $out/share/agda
+      runHook postInstall
+    '';
+
+    passthru = {
+      env = stdenv.mkDerivation {
+        name = "interactive-${self.name}";
+        inherit (self) LANG LOCALE_ARCHIVE;
+        AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda;
+        buildInputs = let
+          # Makes a wrapper available to the user. Very useful in
+          # nix-shell where all dependencies are -i'd.
+          agdaWrapper = writeScriptBin "agda" ''
+            ${self.agdaWithArgs} "$@"
+          '';
+        in [agdaWrapper] ++ self.buildDepends;
+      };
+    };
+  };
+
+  postprocess = x: x // {
+    sourceDirectories = filter (y: !(y == null)) x.sourceDirectories;
+    propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs;
+    propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs;
+    everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile;
+  };
 in
-{ mkDerivation = args:
-    let
-      postprocess = x: x // {
-        sourceDirectories = filter (y: !(y == null)) x.sourceDirectories;
-        propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs;
-        propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs;
-        everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile;
-      };
-
-      defaults = self : {
-        # There is no Hackage for Agda so we require src.
-        inherit (self) src name;
-
-        isAgdaPackage = true;
-
-        buildInputs = [ Agda ] ++ self.buildDepends;
-        buildDepends = [];
-
-        buildDependsAgda = filter
-          (dep: dep ? isAgdaPackage && dep.isAgdaPackage)
-          self.buildDepends;
-        buildDependsAgdaShareAgda = map (x: x + "/share/agda") self.buildDependsAgda;
-
-        # Not much choice here ;)
-        LANG = "en_US.UTF-8";
-        LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
-
-        everythingFile = "Everything.agda";
-
-        propagatedBuildInputs = self.buildDependsAgda;
-        propagatedUserEnvPkgs = self.buildDependsAgda;
-
-        # Immediate source directories under which modules can be found.
-        sourceDirectories = [ ];
-
-        # This is used if we have a top-level element that only serves
-        # as the container for the source and we only care about its
-        # contents. The directories put here will have their
-        # *contents* copied over as opposed to sourceDirectories which
-        # would make a direct copy of the whole thing.
-        topSourceDirectories = [ "src" ];
-
-        # FIXME: `dirOf self.everythingFile` is what we really want, not hardcoded "./"
-        includeDirs = self.buildDependsAgdaShareAgda
-                      ++ self.sourceDirectories ++ self.topSourceDirectories
-                      ++ [ "." ];
-        buildFlags = unwords (map (x: "-i " + x) self.includeDirs);
-
-        agdaWithArgs = "${Agda}/bin/agda ${self.buildFlags}";
-
-        buildPhase = ''
-          runHook preBuild
-          ${self.agdaWithArgs} ${self.everythingFile}
-          runHook postBuild
-        '';
-
-        installPhase = ''
-          runHook preInstall
-          mkdir -p $out/share/agda
-          cp -pR ${unwords self.sourceDirectories} ${mapInside self.topSourceDirectories} $out/share/agda
-          runHook postInstall
-        '';
-
-        passthru = {
-          env = stdenv.mkDerivation {
-            name = "interactive-${self.name}";
-            inherit (self) LANG LOCALE_ARCHIVE;
-            AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda;
-            buildInputs = let
-              # Makes a wrapper available to the user. Very useful in
-              # nix-shell where all dependencies are -i'd.
-              agdaWrapper = writeScriptBin "agda" ''
-                ${self.agdaWithArgs} "$@"
-              '';
-            in [agdaWrapper] ++ self.buildDepends;
-          };
-        };
-      };
-    in stdenv.mkDerivation
-         (postprocess (let super = defaults self // args self;
-                           self  = super // extension self super;
-                       in self));
+{ mkDerivation = args: let
+      super = defaults self // args self;
+      self  = super // extension self super;
+    in stdenv.mkDerivation (postprocess self);
 }

From ff2ccb2721d0487b976f16cf574af440d3e7f4ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 May 2015 22:07:40 +0200
Subject: [PATCH 0513/2322] linssid: fix build by using qt53

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

diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix
index de5dc849148..2b4c5f564be 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/pkgs/applications/networking/linssid/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
   };
 
-  buildInputs = [ qt5.base pkgconfig boost ];
+  buildInputs = [ qt5 pkgconfig boost ];
 
   postPatch = ''
     sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e1ac82c7d6..86a985d260a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11260,7 +11260,9 @@ let
 
   libquvi = callPackage ../applications/video/quvi/library.nix { };
 
-  linssid = callPackage ../applications/networking/linssid { };
+  linssid = callPackage ../applications/networking/linssid {
+    qt5 = qt53;
+  };
 
   mi2ly = callPackage ../applications/audio/mi2ly {};
 

From 3a1345189cdeaa5676585fd8aa139f06f1ea1a85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 May 2015 22:29:04 +0200
Subject: [PATCH 0514/2322] pantheon-terminal: fix build, schemas, icons

/cc maintainer @ollieh. BTW, it would be nice if the attribute names
under maintainers were the same as the github usernames.
---
 pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
index 7506ece43dc..b0958d232fc 100644
--- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
@@ -16,11 +16,14 @@ stdenv.mkDerivation rec {
   preFixup = ''
     for f in $out/bin/*; do
       wrapProgram $f \
-        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
+        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$XDG_ICON_DIRS:$out/share"
     done
   '';
 
-  buildInputs = [perl cmake vala pkgconfig glib gtk3 granite gnome3.vte gnome3.libgee libnotify gettext makeWrapper];
+  buildInputs = with gnome3; [
+    perl cmake vala pkgconfig glib gtk3 granite libnotify gettext makeWrapper
+    vte_290 libgee gsettings_desktop_schemas defaultIconTheme
+  ];
   meta = {
     description = "elementary OS's terminal";
     longDescription = "A super lightweight, beautiful, and simple terminal. It's designed to be setup with sane defaults and little to no configuration. It's just a terminal, nothing more, nothing less. Designed for elementary OS.";

From 1ea42506d1c66cee165f16ca8c256b0f06f80ab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 May 2015 22:35:04 +0200
Subject: [PATCH 0515/2322] sakura: fix build after gnome-3.16 bump

/cc maintainers: @astsmtl, @codyopel.
---
 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 86a985d260a..b71a070af80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12254,7 +12254,7 @@ let
   rxvt_unicode_with-plugins = rxvt_unicode-with-plugins;
 
   sakura = callPackage ../applications/misc/sakura {
-    inherit (gnome3) vte;
+    vte = gnome3.vte_290;
   };
 
   sbagen = callPackage ../applications/misc/sbagen { };

From 1f18764f473104da9d70f011f2ebe11463b1a8dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 May 2015 22:47:20 +0200
Subject: [PATCH 0516/2322] telepathy-salut: fix build - use openssl instead of
 gnutls

---
 .../networking/instant-messengers/telepathy/salut/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
index b1341af7a9d..5e4ad860687 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libxslt, glib, libxml2, telepathy_glib, avahi, libsoup
-, libuuid, gnutls, sqlite, pkgconfigUpstream }:
+, libuuid, openssl, sqlite, pkgconfigUpstream }:
 
 stdenv.mkDerivation rec {
   pname = "telepathy-salut";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh";
   };
 
-  buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls
+  buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid openssl
     sqlite ];
 
   nativeBuildInputs = [ libxslt pkgconfigUpstream ];

From 84cd11d54e3afaad443cb09aceea2016ed6a183a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 May 2015 22:50:09 +0200
Subject: [PATCH 0517/2322] tilda: fix build after gnome-3.16 bump

---
 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 b71a070af80..a47e7acd2c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12535,7 +12535,7 @@ let
   tig = gitAndTools.tig;
 
   tilda = callPackage ../applications/misc/tilda {
-    vte = gnome3.vte;
+    vte = gnome3.vte_290;
     gtk = gtk3;
   };
 

From 022f3067f0715b5be1ad4ec1b54523a2b518e3ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 May 2015 23:06:25 +0200
Subject: [PATCH 0518/2322] yoshimi: fix build, same as octave

---
 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 a47e7acd2c6..2ad327c6b55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13096,7 +13096,7 @@ let
   ykpers = callPackage ../applications/misc/ykpers {};
 
   yoshimi = callPackage ../applications/audio/yoshimi {
-    fltk = fltk13;
+    fltk = fltk13.override { cfg.xftSupport = true; };
   };
 
   zam-plugins = callPackage ../applications/audio/zam-plugins { inherit (xlibs) libX11; };

From 098277c2cb3649db463e794e72889fa101d02941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 May 2015 23:53:33 +0200
Subject: [PATCH 0519/2322] tulip: fix build by using older cmake

/cc maintainer @cillianderoiste.
---
 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 2ad327c6b55..2b94739b852 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14203,7 +14203,9 @@ let
 
   stellarium = callPackage ../applications/science/astronomy/stellarium { };
 
-  tulip = callPackage ../applications/science/misc/tulip { };
+  tulip = callPackage ../applications/science/misc/tulip {
+    cmake = cmake-2_8;
+  };
 
   vite = enableDebugging (callPackage ../applications/science/misc/vite { });
 

From 4c898aad5115b8e2967003b9b78cb9f4ff8f3843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 31 May 2015 00:05:33 +0200
Subject: [PATCH 0520/2322] spring: fix build by using older cmake

---
 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 2b94739b852..915a07ffca5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13381,6 +13381,7 @@ let
 
   spring = callPackage ../games/spring {
     boost = boost155;
+    cmake = cmake-2_8;
   };
 
   springLobby = callPackage ../games/spring/springlobby.nix { };

From 2ba1ab3ad16c4a2b4672ddd4ea014f79bd896bca Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Sat, 30 May 2015 16:37:18 -0500
Subject: [PATCH 0521/2322] supporting pandas on osx, added test suite

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c284839fb37..234c628ef6f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8100,21 +8100,69 @@ let
       sha256 = "1w3wjnn3v37hf3hrd24lfgk6vpykarv9mihhpcfq6y7rg586bgjk";
     };
 
-    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [ dateutil numpy pytz modules.sqlite3 ];
+    buildInputs = [ self.nose ];
+    propagatedBuildInputs = with self; [ 
+      dateutil 
+      numpy
+      scipy
+      numexpr
+      pytz
+      xlrd
+      bottleneck
+      sqlalchemy9
+      lxml
+      modules.sqlite3 
+    ];
 
-    # Tests require networking to pass
-    doCheck = false;
+    preCheck = ''
+      # Need to do this patch or tests will fail (swaps 1st and 2nd lines).
+      # See: https://github.com/pydata/pandas/commit/c4bcc2054bfd2f89b640bea0c9a109b0184d6710
+      first=$(sed -n '1p' < pandas/tests/test_format.py)
+      second=$(sed -n '2p' < pandas/tests/test_format.py)
+      rest=$(tail -n +3 pandas/tests/test_format.py)
+      echo $second > pandas/tests/test_format.py
+      echo $first >> pandas/tests/test_format.py
+      echo "$rest" >> pandas/tests/test_format.py
+    '';
+
+    checkPhase = ''
+      runHook preCheck
+      
+      # The flag `-A 'not network'` will disable tests that use internet.
+      # The `-e` flag disables a few problematic tests.
+      python setup.py nosetests -A 'not network' --stop -e 'test_clipboard|test_series' --verbosity=3
+
+      runHook postCheck
+    '';
 
     meta = {
       homepage = "http://pandas.pydata.org/";
       description = "Python Data Analysis Library";
       license = licenses.bsd3;
       maintainers = with maintainers; [ raskin ];
-      platforms = platforms.linux;
+      platforms = platforms.unix;
     };
   };
 
+  xlrd = buildPythonPackage rec {
+    name = "xlrd-${version}";
+    version = "0.9.3";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-${version}.tar.gz";
+      md5 = "6f3325132f246594988171bc72e1a385";
+    };
+  };
+
+  bottleneck = buildPythonPackage rec {
+    name = "Bottleneck-${version}";
+    version = "1.0.0";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/B/Bottleneck/Bottleneck-${version}.tar.gz";
+      md5 = "380fa6f275bd24f27e7cf0e0d752f5d2";
+    };
+    propagatedBuildInputs = [self.numpy];
+  };
+
   parsedatetime = buildPythonPackage rec {
     name = "parsedatetime-${version}";
     version = "1.4";

From 9b31a07b0de58b5996ecc6b953350af3838d1706 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 30 May 2015 19:30:24 +0000
Subject: [PATCH 0522/2322] agda: Just `with` all of the string helper
 functions

---
 pkgs/build-support/agda/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index 74debe79efc..0bdc049934a 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -7,12 +7,12 @@
 , extension ? (self: super: {})
 }:
 
+with stdenv.lib.strings;
+
 let
   optionalString = stdenv.lib.optionalString;
   filter = stdenv.lib.filter;
-  concatMapStringsSep = stdenv.lib.strings.concatMapStringsSep;
-  concatMapStrings = stdenv.lib.strings.concatMapStrings;
-  unwords = stdenv.lib.strings.concatStringsSep " ";
+  unwords = concatStringsSep " ";
   mapInside = xs: unwords (map (x: x + "/*") xs);
 
   defaults = self : {

From be2cba690ce6614768cae065d37ffffb9d4181d7 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 30 May 2015 19:33:20 +0000
Subject: [PATCH 0523/2322] agda: Remove unused/uneeded abstractions, including
 `postprocess`

---
 pkgs/build-support/agda/default.nix | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index 0bdc049934a..8a871cfeb51 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -10,11 +10,6 @@
 with stdenv.lib.strings;
 
 let
-  optionalString = stdenv.lib.optionalString;
-  filter = stdenv.lib.filter;
-  unwords = concatStringsSep " ";
-  mapInside = xs: unwords (map (x: x + "/*") xs);
-
   defaults = self : {
     # There is no Hackage for Agda so we require src.
     inherit (self) src name;
@@ -24,14 +19,16 @@ let
     buildInputs = [ Agda ] ++ self.buildDepends;
     buildDepends = [];
 
-    buildDependsAgda = filter
+    buildDependsAgda = stdenv.lib.filter
       (dep: dep ? isAgdaPackage && dep.isAgdaPackage)
       self.buildDepends;
     buildDependsAgdaShareAgda = map (x: x + "/share/agda") self.buildDependsAgda;
 
     # Not much choice here ;)
     LANG = "en_US.UTF-8";
-    LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
+    LOCALE_ARCHIVE = stdenv.lib.optionalString
+      stdenv.isLinux
+      "${glibcLocales}/lib/locale/locale-archive";
 
     everythingFile = "Everything.agda";
 
@@ -52,7 +49,7 @@ let
     includeDirs = self.buildDependsAgdaShareAgda
                   ++ self.sourceDirectories ++ self.topSourceDirectories
                   ++ [ "." ];
-    buildFlags = unwords (map (x: "-i " + x) self.includeDirs);
+    buildFlags = concatStringsSep " " (map (x: "-i " + x) self.includeDirs);
 
     agdaWithArgs = "${Agda}/bin/agda ${self.buildFlags}";
 
@@ -62,10 +59,13 @@ let
       runHook postBuild
     '';
 
-    installPhase = ''
+    installPhase = let
+      srcFiles = self.sourceDirectories
+                 ++ map (x: x + "/*") self.topSourceDirectories;
+    in ''
       runHook preInstall
       mkdir -p $out/share/agda
-      cp -pR ${unwords self.sourceDirectories} ${mapInside self.topSourceDirectories} $out/share/agda
+      cp -pR ${concatStringsSep " " srcFiles} $out/share/agda
       runHook postInstall
     '';
 
@@ -84,16 +84,9 @@ let
       };
     };
   };
-
-  postprocess = x: x // {
-    sourceDirectories = filter (y: !(y == null)) x.sourceDirectories;
-    propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs;
-    propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs;
-    everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile;
-  };
 in
 { mkDerivation = args: let
       super = defaults self // args self;
       self  = super // extension self super;
-    in stdenv.mkDerivation (postprocess self);
+    in stdenv.mkDerivation self;
 }

From 82bd3a558088f0abc7cf5af27b5fd9024fbc341a Mon Sep 17 00:00:00 2001
From: Ryan Trinkle <ryan.trinkle@gmail.com>
Date: Sun, 31 May 2015 03:18:13 -0400
Subject: [PATCH 0524/2322] Do not use install_name_tool on "executables" built
 by GHCJS

These executables are really .jsexe directories, and install_name_tool will fail
---
 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 d441b824842..edff84a0403 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -244,7 +244,7 @@ stdenv.mkDerivation ({
       mv $packageConfFile $packageConfDir/$pkgId.conf
     ''}
 
-    ${optionalString (enableSharedExecutables && isExecutable && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") ''
+    ${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"
       done

From c84a9d2d17975470908959eba32702c2eb94416b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 May 2015 11:01:51 +0300
Subject: [PATCH 0525/2322] Update Octave to 4.0.0

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

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index a0906a09a78..9ad8c2790da 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.8.2";
+  version = "4.0.0";
   name = "octave-${version}";
   src = fetchurl {
-    url = "mirror://gnu/octave/${name}.tar.bz2";
-    sha256 = "83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae";
+    url = "mirror://gnu/octave/${name}.tar.xz";
+    sha256 = "0x64b2lna4vrlm4wwx6h1qdlmki6s2b9q90yjxldlvvrqvxf4syg";
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11

From 608482f6130690db7b1ce17a5621d270490acefc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 May 2015 11:46:47 +0300
Subject: [PATCH 0526/2322] Update SBCL

---
 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 b9e3011194d..80f7ea8cc3c 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.2.11";
+  version = "1.2.12";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "0w1ymazyck5a8bjmsbnq1hps1n4824h3ajh849f1y09dwzd09al8";
+    sha256 = "1bf98wi3gz8n09prwmxa38b2mhq69rqq11s9h9swi3avy5wchnxn";
   };
 
   buildInputs = [ which ]

From 555ee2f7ba0d2dbe83db433ac21396106bbc42e0 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 31 May 2015 11:29:56 +0200
Subject: [PATCH 0527/2322] Add patch for haskell-iconv to support GHC 7.10.

---
 .../configuration-ghc-7.10.x.nix              |  3 ++
 .../haskell-modules/iconv-fix-ghc710.patch    | 41 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/iconv-fix-ghc710.patch

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 ac24848b8fe..2262819a779 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -284,4 +284,7 @@ self: super: {
   # Ugly hack to trigger a rebuild to fix the broken package on Hydra.
   crypto-api = appendConfigureFlag super.crypto-api "-fignore-me-1";
 
+  # Fix compilation under GHC 7.10, patch has been sent upstream.
+  iconv = appendPatch super.iconv ./iconv-fix-ghc710.patch;
+
 }
diff --git a/pkgs/development/haskell-modules/iconv-fix-ghc710.patch b/pkgs/development/haskell-modules/iconv-fix-ghc710.patch
new file mode 100644
index 00000000000..a7c35647a29
--- /dev/null
+++ b/pkgs/development/haskell-modules/iconv-fix-ghc710.patch
@@ -0,0 +1,41 @@
+Running command 'diff -urN old-iconv new-iconv'
+Fri May 29 00:42:30 CEST 2015  Robert Helgesson <robert@rycee.net>
+  * Add Functor and Applicative instances for IConv
+  
+  This makes iconv successfully build under GHC 7.10.
+diff -urN old-iconv/Codec/Text/IConv/Internal.hs new-iconv/Codec/Text/IConv/Internal.hs
+--- old-iconv/Codec/Text/IConv/Internal.hs	2015-05-31 11:26:06.410968449 +0200
++++ new-iconv/Codec/Text/IConv/Internal.hs	2015-05-31 11:26:06.410968449 +0200
+@@ -49,6 +49,7 @@
+ import System.IO.Unsafe (unsafeInterleaveIO, unsafePerformIO)
+ import System.IO (hPutStrLn, stderr)
+ import Control.Exception (assert)
++import Control.Monad (ap, liftM)
+ 
+ import Prelude hiding (length)
+ 
+@@ -192,8 +193,8 @@
+  -}
+ 
+ 
+-----------------------------
+--- IConv monad
++----------------------------------------
++-- IConv functor, applicative, and monad
+ --
+ 
+ newtype IConv a = I {
+@@ -202,6 +203,13 @@
+         -> IO (Buffers, a)
+   }
+ 
++instance Functor IConv where
++  fmap = liftM
++
++instance Applicative IConv where
++  pure = return
++  (<*>) = ap
++
+ instance Monad IConv where
+   (>>=)  = bindI
+ --  m >>= f = (m `bindI` \a -> consistencyCheck `thenI` returnI a) `bindI` f

From 289e8716b2871d535e1b61162890766e78518150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 31 May 2015 12:15:12 +0200
Subject: [PATCH 0528/2322] xfce4-power-manager: 1.4.3 -> 1.4.4

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

diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
index c75eb787757..9a3116463c6 100644
--- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix
+++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   p_name  = "xfce4-power-manager";
   ver_maj = "1.4";
-  ver_min = "3";
+  ver_min = "4";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "04909sfc2nrj2wg9cw6y9y2r9yrp3l3vc201sy1gaiap67fi33h1";
+    sha256 = "01rvqy1cif4s8lkidb7hhmsz7d9f2fwcwvc51xycaj3qgsmch3n5";
   };
 
   name = "${p_name}-${ver_maj}.${ver_min}";

From fe2d66ff655874e2990969ac8f7f939afe601c7b Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Sun, 31 May 2015 12:42:59 +0200
Subject: [PATCH 0529/2322] Update syncthing to 0.11.7

---
 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 0837659983e..1e26e61161c 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,12 +4,12 @@ with goPackages;
 
 buildGoPackage rec {
   name = "syncthing-${version}";
-  version = "0.11.6";
+  version = "0.11.7";
   goPackagePath = "github.com/syncthing/syncthing";
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "7fe7d7034c0e502036e2a0bb1b94b1701bd194cc82f07495da8a41c4b097c6a3";
+    sha256 = "7d928a255c61c7b89d460cc70c79bd8e85bef3e919c157f59d5709fef4153c8d";
   };
 
   subPackages = [ "cmd/syncthing" ];

From 36985e8b5af575805b7fb1d54e522c52b4be306f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 31 May 2015 13:08:41 +0200
Subject: [PATCH 0530/2322] aespipe: update from 2.4c to 2.4d

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

diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix
index 2fad2fe29e6..aefd6b7500c 100644
--- a/pkgs/tools/security/aespipe/default.nix
+++ b/pkgs/tools/security/aespipe/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "aespipe-${version}";
-  version = "2.4c";
+  version = "2.4d";
 
   src = fetchurl {
     url = "mirror://sourceforge/loop-aes/aespipe/aespipe-v${version}.tar.bz2";
-    sha256 = "0pl49jnjczjvfxwm9lw576qsjm1lxh8gc4g776l904cixaz90096";
+    sha256 = "03z5i41xv6p3m79lm04d7msda8878lsppv3324zbjjfy19p6bkn5";
   };
 
   meta = {

From 72b259f61edf5c0391d16adf5d27355eb48161ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 31 May 2015 13:09:03 +0200
Subject: [PATCH 0531/2322] darktable: update from 1.6.4 to 1.6.6

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

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 0589de8726a..3398fed6595 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -9,12 +9,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "1.6.4";
+  version = "1.6.6";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "0ald6qqg7abgr8hj2qk45260cqh3fddzqbxc1p7ll0ac2vl0bxy5";
+    sha256 = "1991zm0ly2j69vq9jsijfrjw0vnchh3il7m4ylsblzk73614nppq";
   };
 
   buildInputs =

From 8d6b8be952b18605603a5db5043e7e386c083a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 31 May 2015 13:09:19 +0200
Subject: [PATCH 0532/2322] drumkv1: update from 0.6.1 to 0.6.3

---
 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 d71845ead37..b3a496c26a1 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.6.1";
+  version = "0.6.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
-    sha256 = "082ml6g63n6s3w704fjkma8085g2l10az3f6r78y9hpgpw3042jw";
+    sha256 = "1f0vpwq7vydldrq9fdfipbkzqqndyxlx0n81ch1i9kw81xj3sxjq";
   };
 
   buildInputs = [ jack2 libsndfile lv2 qt4 ];

From b140effd2b2cd755d125cc41aaad870b4007ed49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 31 May 2015 13:09:51 +0200
Subject: [PATCH 0533/2322] qtractor: update from 0.6.6 to 0.6.7

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

diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
index 763501a7465..d3d3a71febc 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -4,12 +4,12 @@
 , sord, sratom, stdenv, suil }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.6";
+  version = "0.6.7";
   name = "qtractor-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qtractor/${name}.tar.gz";
-    sha256 = "1n70hs4bx4hq3cp2p35jq5vlcans4fk2c35w72244vlqlajx05c0";
+    sha256 = "0h5nblfkl4s412c9f02b40nb8c8jq8ypz67z2qn3hkvhx6i9yxsg";
   };
 
   buildInputs =

From 11526b23abc2cab1da563b12c6880afb9f2c4124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 31 May 2015 13:10:05 +0200
Subject: [PATCH 0534/2322] samplv1: update from 0.6.1 to 0.6.3

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

diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 10f0a4cec41..15bb1e0a17d 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "samplv1-${version}";
-  version = "0.6.1";
+  version = "0.6.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/samplv1/${name}.tar.gz";
-    sha256 = "18jh953a0480fnsflbm4j04xz02h7fqwk77v8hnv54vwwp5a1h08";
+    sha256 = "1c62fpfl9xv93m04hfh72vzbljr0c5p409vzf3xxmvj9x610yx1w";
   };
 
   buildInputs = [ jack2 libsndfile lv2 qt4 ];

From fe05de0a8e7293e8cd040319dd4f1a87f0ef5842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 31 May 2015 13:10:22 +0200
Subject: [PATCH 0535/2322] synthv1: update from 0.6.1 to 0.6.3

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

diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index 37fc45983d9..7b00e8ac060 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "synthv1-${version}";
-  version = "0.6.1";
+  version = "0.6.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/synthv1/${name}.tar.gz";
-    sha256 = "0v9zpa49cdj8ixpppgxz95dbn62v8mamxz6fpl7sdnzfn2l8jr4g";
+    sha256 = "19zyvrvnmi7ahwg121vl2q17j9y8ln6lvpj5wxxcwif5538q75iw";
   };
 
   buildInputs = [ qt4 jack2 lv2 ];

From 7df338675393fba7691aa2f272d0195a7ca4cb1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 31 May 2015 13:12:01 +0200
Subject: [PATCH 0536/2322] movit: update from 1.1.2 to 1.1.3

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

diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix
index 88f18003977..df084f0cc20 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/pkgs/development/libraries/movit/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "movit-${version}";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchurl {
     url = "http://movit.sesse.net/${name}.tar.gz";
-    sha256 = "0jka9l3cx7q09rpz5x6rv6ii8kbgm2vc419gx2rb9rc8sl81hzj1";
+    sha256 = "0q33h3gfw16gd9k6s3isd7ili2mifw7j1723xpdlc516gggsazw9";
   };
 
   GTEST_DIR = "${gtest}";

From 77fc22e6799585260427400f00aa20ef2a13d91d Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Sun, 31 May 2015 13:50:02 +0200
Subject: [PATCH 0537/2322] jaaa: refactor needed by libclthreads refactor

---
 pkgs/applications/audio/jaaa/default.nix | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix
index 0f29ce34cac..0b8f8863d6c 100644
--- a/pkgs/applications/audio/jaaa/default.nix
+++ b/pkgs/applications/audio/jaaa/default.nix
@@ -13,18 +13,6 @@ stdenv.mkDerivation rec {
     alsaLib libclthreads libclxclient libX11 libXft libXrender fftwFloat jack2 zita-alsa-pcmi
   ];
 
-  NIX_CFLAGS_COMPILE = [
-    "-I${xlibs.xproto}/include"
-    "-I${libX11}/include"
-    "-I${libXft}/include"
-    "-I${freetype}/include"
-    "-I${fontconfig}/include"
-    "-I${libXrender}/include"
-    "-I${xlibs.renderproto}/include"
-    "-I${alsaLib}/include"
-    "-I${zita-alsa-pcmi}/include"
-  ];
-
   makeFlags = [
     "PREFIX=$(out)"
     "SUFFIX=''"
@@ -38,7 +26,7 @@ stdenv.mkDerivation rec {
     homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html;
     description = "JACK and ALSA Audio Analyser";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ magnetophon ];
+    maintainers = [ maintainers.magnetophon ];
     platforms = platforms.linux;
   };
 }

From 7c09d9d2915317580e14733cde839f88b08a5718 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 31 May 2015 13:18:39 +0100
Subject: [PATCH 0538/2322] agda-stdlib: update to 2.4.2.3 branch

Required to work with the new Agda we have
---
 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 8f3d298306b..2a75b1fb700 100644
--- a/pkgs/development/libraries/agda/agda-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix
@@ -6,8 +6,8 @@ agda.mkDerivation (self: rec {
 
   src = fetchgit {
     url = "git://github.com/agda/agda-stdlib";
-    rev = "451446c5d849b8c5d6d34363e3551169eb126cfb";
-    sha256 = "40a55d3c22fb3462b110859f4cd63e79e086b25f23964b465768397b93c57701";
+    rev = "9c9b3cb28f9a7d39a256890a1469c1a3f7fc4faf";
+    sha256 = "521899b820e70abbae7cb30008b87a2f8676bc6265b78865e42982fc2e5c972f";
   };
 
   nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];

From 5d53b9d278b89c5e0a97bff92fc78023561ed9c8 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Sat, 30 May 2015 17:18:54 +0200
Subject: [PATCH 0539/2322] init VoiceOfFaust at v0.7

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

diff --git a/pkgs/applications/audio/VoiceOfFaust/default.nix b/pkgs/applications/audio/VoiceOfFaust/default.nix
new file mode 100644
index 00000000000..17cb680c58c
--- /dev/null
+++ b/pkgs/applications/audio/VoiceOfFaust/default.nix
@@ -0,0 +1,65 @@
+
+{ stdenv, pkgs, callPackage, fetchFromGitHub, faust2jack, helmholtz, mrpeach, puredata-with-plugins }:
+stdenv.mkDerivation rec {
+  name = "VoiceOfFaust-${version}";
+  version = "0.7";
+
+  src = fetchFromGitHub {
+    owner = "magnetophon";
+    repo = "VoiceOfFaust";
+    rev = "v${version}";
+    sha256 = "14jjs7cnhg20pzijgblr7caspcpx8p8lpkbvjzc656s9lqn6m9sn";
+  };
+
+  plugins = [ helmholtz mrpeach ];
+
+  pitchTracker = puredata-with-plugins plugins;
+
+  buildInputs = [ faust2jack ];
+
+  runtimeInputs = [ pitchTracker ];
+
+  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
+  '';
+
+  buildPhase = ''
+    faust2jack -osc classicVocoder.dsp
+    faust2jack -osc CZringmod.dsp
+    faust2jack -osc FMsinger.dsp
+    faust2jack -osc FOFvocoder.dsp
+    faust2jack -osc Karplus-StrongSinger.dsp
+    faust2jack -osc -sch -t 99999 Karplus-StrongSingerMaxi.dsp
+    faust2jack -osc PAFvocoder.dsp
+    faust2jack -osc -sch -t 99999 stringSinger.dsp
+    faust2jack -osc subSinger.dsp
+    # doesn't compile on most systems, too big:
+    #faust2jack -osc -sch -t 99999 VocSynthFull.dsp
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp launchers/* $out/bin/
+    cp classicVocoder $out/bin/
+    cp CZringmod $out/bin/
+    cp FMsinger $out/bin/
+    cp FOFvocoder $out/bin/
+    cp Karplus-StrongSinger $out/bin/
+    cp Karplus-StrongSingerMaxi $out/bin/
+    cp PAFvocoder $out/bin/
+    cp stringSinger $out/bin/
+    cp subSinger $out/bin/
+    #cp VocSynthFull $out/bin/
+    mkdir $out/PureData/
+    cp PureData/OscSendVoc.pd $out/PureData/OscSendVoc.pd
+  '';
+
+  meta = {
+    description = "Turn your voice into a synthesizer";
+    homepage = https://github.com/magnetophon/VoiceOfFaust;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 915a07ffca5..d67eff7004e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12742,6 +12742,8 @@ let
 
   vnstat = callPackage ../applications/networking/vnstat { };
 
+  VoiceOfFaust = callPackage ../applications/audio/VoiceOfFaust { };
+
   vorbisTools = callPackage ../applications/audio/vorbis-tools { };
 
   vue = callPackage ../applications/misc/vue { };

From 39a9f10ccdc429b828032cc67b3cb3efdd226c9a Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Sat, 30 May 2015 14:56:23 +0200
Subject: [PATCH 0540/2322] init LazyLimiter at v0.3.01

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

diff --git a/pkgs/applications/audio/LazyLimiter/default.nix b/pkgs/applications/audio/LazyLimiter/default.nix
new file mode 100644
index 00000000000..d400bea3379
--- /dev/null
+++ b/pkgs/applications/audio/LazyLimiter/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+stdenv.mkDerivation rec {
+  name = "LazyLimiter-${version}";
+  version = "0.3.01";
+
+  src = fetchFromGitHub {
+    owner = "magnetophon";
+    repo = "LazyLimiter";
+    rev = "v${version}";
+    sha256 = "1yx9d5cakmqbiwb1j9v2af9h5lqzahl3kaamnyk71cf4i8g7zp3l";
+  };
+
+  buildInputs = [ faust2jack faust2lv2 ];
+
+  buildPhase = ''
+    faust2jack -t 99999 LazyLimiter.dsp
+    faust2lv2 -t 99999 LazyLimiter.dsp
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp LazyLimiter $out/bin/
+    mkdir -p $out/lib/lv2
+    cp -r LazyLimiter.lv2/ $out/lib/lv2
+  '';
+
+  meta = {
+    description = "A fast yet clean lookahead limiter for jack and lv2";
+    homepage = https://magnetophon.github.io/LazyLimiter/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 915a07ffca5..739204310fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11601,6 +11601,8 @@ let
 
   caps = callPackage ../applications/audio/caps { };
 
+  LazyLimiter = callPackage ../applications/audio/LazyLimiter { };
+
   lastwatch = callPackage ../applications/audio/lastwatch { };
 
   lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { };

From 0eca39174b8b52e87ec25a2e55425cdb055b0948 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Sat, 30 May 2015 22:17:03 +0200
Subject: [PATCH 0541/2322] init CharacterCompressor CompBus RhythmDelay
 constant-detune-chorus

Basically the same pkg,but with different sources
---
 .../audio/CharacterCompressor/default.nix     | 33 ++++++++++++++++
 pkgs/applications/audio/CompBus/default.nix   | 39 +++++++++++++++++++
 .../audio/RhythmDelay/default.nix             | 33 ++++++++++++++++
 .../audio/constant-detune-chorus/default.nix  | 33 ++++++++++++++++
 pkgs/top-level/all-packages.nix               |  8 ++++
 5 files changed, 146 insertions(+)
 create mode 100644 pkgs/applications/audio/CharacterCompressor/default.nix
 create mode 100644 pkgs/applications/audio/CompBus/default.nix
 create mode 100644 pkgs/applications/audio/RhythmDelay/default.nix
 create mode 100644 pkgs/applications/audio/constant-detune-chorus/default.nix

diff --git a/pkgs/applications/audio/CharacterCompressor/default.nix b/pkgs/applications/audio/CharacterCompressor/default.nix
new file mode 100644
index 00000000000..3501e04aa97
--- /dev/null
+++ b/pkgs/applications/audio/CharacterCompressor/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+stdenv.mkDerivation rec {
+  name = "CharacterCompressor-${version}";
+  version = "0.2";
+
+  src = fetchFromGitHub {
+    owner = "magnetophon";
+    repo = "CharacterCompressor";
+    rev = "v${version}";
+    sha256 = "0fvi8m4nshcxypn4jgxhnh7pxp68wshhav3k8wn3il7qpw71pdxi";
+  };
+
+  buildInputs = [ faust2jack faust2lv2 ];
+
+  buildPhase = ''
+    faust2jack -t 99999 CharacterCompressor.dsp
+    faust2lv2 -t 99999 CharacterCompressor.dsp
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp CharacterCompressor $out/bin/
+    mkdir -p $out/lib/lv2
+    cp -r CharacterCompressor.lv2/ $out/lib/lv2
+  '';
+
+  meta = {
+    description = "A compressor with character. For jack and lv2";
+    homepage = https://github.com/magnetophon/CharacterCompressor;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+  };
+}
diff --git a/pkgs/applications/audio/CompBus/default.nix b/pkgs/applications/audio/CompBus/default.nix
new file mode 100644
index 00000000000..497d1ef5243
--- /dev/null
+++ b/pkgs/applications/audio/CompBus/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+stdenv.mkDerivation rec {
+  name = "CompBus-${version}";
+  version = "1.1.02";
+
+  src = fetchFromGitHub {
+    owner = "magnetophon";
+    repo = "CompBus";
+    rev = "v${version}";
+    sha256 = "025vi60caxk3j2vxxrgbc59xlyr88vgn7k3127s271zvpyy7apwh";
+  };
+
+  buildInputs = [ faust2jack faust2lv2 ];
+
+  buildPhase = ''
+    for f in *.dsp;
+    do
+      faust2jack -t 99999 $f
+      faust2lv2 -t 99999 $f
+    done
+  '';
+
+  installPhase = ''
+    mkdir -p $out/lib/lv2
+    mv *.lv2/ $out/lib/lv2
+    mkdir -p $out/bin
+    for f in $(find . -executable -type f);
+    do
+      cp $f $out/bin/
+    done
+  '';
+
+  meta = {
+    description = "A group of compressors mixed into a bus, sidechained from that mix bus. For jack and lv2";
+    homepage = https://github.com/magnetophon/CompBus;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+  };
+}
diff --git a/pkgs/applications/audio/RhythmDelay/default.nix b/pkgs/applications/audio/RhythmDelay/default.nix
new file mode 100644
index 00000000000..e0cfff7c906
--- /dev/null
+++ b/pkgs/applications/audio/RhythmDelay/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+stdenv.mkDerivation rec {
+  name = "RhythmDelay-${version}";
+  version = "2.0";
+
+  src = fetchFromGitHub {
+    owner = "magnetophon";
+    repo = "RhythmDelay";
+    rev = "v${version}";
+    sha256 = "0n938nm08mf3lz92k6v07k1469xxzmfkgclw40jgdssfcfa16bn7";
+  };
+
+  buildInputs = [ faust2jack faust2lv2 ];
+
+  buildPhase = ''
+    faust2jack -t 99999 RhythmDelay.dsp
+    faust2lv2 -t 99999 RhythmDelay.dsp
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp RhythmDelay $out/bin/
+    mkdir -p $out/lib/lv2
+    cp -r RhythmDelay.lv2/ $out/lib/lv2
+  '';
+
+  meta = {
+    description = "Tap a rhythm into your delay! For jack and lv2";
+    homepage = https://github.com/magnetophon/RhythmDelay;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+  };
+}
diff --git a/pkgs/applications/audio/constant-detune-chorus/default.nix b/pkgs/applications/audio/constant-detune-chorus/default.nix
new file mode 100644
index 00000000000..54fe4c866d5
--- /dev/null
+++ b/pkgs/applications/audio/constant-detune-chorus/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+stdenv.mkDerivation rec {
+  name = "constant-detune-chorus-${version}";
+  version = "0.1.01";
+
+  src = fetchFromGitHub {
+    owner = "magnetophon";
+    repo = "constant-detune-chorus";
+    rev = "v${version}";
+    sha256 = "1z8aj1a36ix9jizk9wl06b3i98hrkg47qxqp8vx930r624pc5z86";
+  };
+
+  buildInputs = [ faust2jack faust2lv2 ];
+
+  buildPhase = ''
+    faust2jack -t 99999 constant-detune-chorus.dsp
+    faust2lv2 -t 99999 constant-detune-chorus.dsp
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp constant-detune-chorus $out/bin/
+    mkdir -p $out/lib/lv2
+    cp -r constant-detune-chorus.lv2/ $out/lib/lv2
+  '';
+
+  meta = {
+    description = "A chorus algorithm that maintains constant and symmetric detuning depth (in cents), regardless of modulation rate. For jack and lv2";
+    homepage = https://github.com/magnetophon/constant-detune-chorus;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 915a07ffca5..4b58f90fcd3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10614,6 +10614,8 @@ let
     amdappsdk = amdappsdk28;
   };
 
+  CharacterCompressor = callPackage ../applications/audio/CharacterCompressor { };
+
   chatzilla = callPackage ../applications/networking/irc/chatzilla { };
 
   chromium = callPackage ../applications/networking/browsers/chromium {
@@ -10649,10 +10651,14 @@ let
 
   cmus = callPackage ../applications/audio/cmus { };
 
+  CompBus = callPackage ../applications/audio/CompBus { };
+
   compiz = callPackage ../applications/window-managers/compiz {
     inherit (gnome) GConf ORBit2 metacity;
   };
 
+  constant-detune-chorus = callPackage ../applications/audio/constant-detune-chorus { };
+
   coriander = callPackage ../applications/video/coriander {
     inherit (gnome) libgnomeui GConf;
   };
@@ -12216,6 +12222,8 @@ let
     qt = qt4;
   });
 
+  RhythmDelay = callPackage ../applications/audio/RhythmDelay { };
+
   rofi = callPackage ../applications/misc/rofi {
     automake = automake114x;
   };

From 5725d6ae7d0e197f02238f871ebbd66252bbd0a9 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Sat, 30 May 2015 17:44:33 +0200
Subject: [PATCH 0542/2322] init MBdistortion at v1.1

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

diff --git a/pkgs/applications/audio/MBdistortion/default.nix b/pkgs/applications/audio/MBdistortion/default.nix
new file mode 100644
index 00000000000..c70ab578259
--- /dev/null
+++ b/pkgs/applications/audio/MBdistortion/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }:
+stdenv.mkDerivation rec {
+  name = "MBdistortion-${version}";
+  version = "1.1";
+
+  src = fetchFromGitHub {
+    owner = "magnetophon";
+    repo = "MBdistortion";
+    rev = "v${version}";
+    sha256 = "1rmvfi48hg8ybfw517zgj3fjj2xzckrmv8x131i26vj0fv7svjsp";
+  };
+
+  buildInputs = [ faust2jack faust2lv2 ];
+
+  buildPhase = ''
+    faust2jack -t 99999 MBdistortion.dsp
+    faust2lv2 -t 99999 MBdistortion.dsp
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp MBdistortion $out/bin/
+    mkdir -p $out/lib/lv2
+    cp -r MBdistortion.lv2/ $out/lib/lv2
+  '';
+
+  meta = {
+    description = "Mid-side multiband distortion for jack and lv2";
+    homepage = https://github.com/magnetophon/MBdistortion;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 915a07ffca5..6f4fe3c33f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11703,6 +11703,8 @@ let
 
   matchbox = callPackage ../applications/window-managers/matchbox { };
 
+  MBdistortion = callPackage ../applications/audio/MBdistortion { };
+
   mcpp = callPackage ../development/compilers/mcpp { };
 
   mda_lv2 = callPackage ../applications/audio/mda-lv2 { };

From 8d924455c1ae81d35cdb3ed885984a96c31e9637 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 31 May 2015 15:51:01 +0200
Subject: [PATCH 0543/2322] idris-mode: update from 0.9.15 to 0.9.18

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

diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix
index a631939b55c..2e168b3abf7 100644
--- a/pkgs/applications/editors/emacs-modes/idris/default.nix
+++ b/pkgs/applications/editors/emacs-modes/idris/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "idris-mode";
-  version = "0.9.15";
+  version = "0.9.18";
 
   src = fetchurl {
     url = "https://github.com/idris-hackers/${pname}/archive/${version}.tar.gz";
-    sha256 = "0ag7qqsv64rifk9ncdxv4gyylfbw6c8y2wq610l4pabqv2qrlh9r";
+    sha256 = "06rw5lrxqqnw0kni3x9jm73x352d1vb683d41v8x3yzqfa2sxmwg";
   };
 
   buildInputs = [ emacs ];

From a35161177ecccb8676caa55f3e15395925caa581 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 31 May 2015 15:54:28 +0200
Subject: [PATCH 0544/2322] fbida: update from 2.09 to 2.10

add meta info and adpot it
---
 pkgs/applications/graphics/fbida/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix
index 927ca2ab679..bacfa500ede 100644
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/pkgs/applications/graphics/fbida/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "fbida-2.09";
+  name = "fbida-2.10";
   
   src = fetchurl {
     url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz";
-    sha256 = "1riia87v5nsx858xnlvc7sspr1p36adjqrdch1255ikr5xbv6h6x";
+    sha256 = "1dkc1d6qlfa1gn94wcbyr7ayiy728q52fvbipwmnl2mlc6n3lnks";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
@@ -29,7 +29,10 @@ stdenv.mkDerivation rec {
     makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP="];
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Image viewing and manipulation programs";
+    homepage = https://www.kraxel.org/blog/linux/fbida/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ pSub ];
   };
 }

From e0cc3efca250100bb7d821c4c564ec13f8a82921 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 31 May 2015 16:07:06 +0200
Subject: [PATCH 0545/2322] hevea: update from 1.07 to 2.23

add meta-information and adopt it
---
 pkgs/tools/typesetting/hevea/builder.sh  | 14 -------------
 pkgs/tools/typesetting/hevea/default.nix | 26 ++++++++++++++++++------
 2 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/tools/typesetting/hevea/builder.sh

diff --git a/pkgs/tools/typesetting/hevea/builder.sh b/pkgs/tools/typesetting/hevea/builder.sh
deleted file mode 100644
index 05c93fe7da7..00000000000
--- a/pkgs/tools/typesetting/hevea/builder.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-set -e
-
-source $stdenv/setup
-
-mkdir -p $out/bin $out/lib
-
-tar xvfz $src
-cd hevea-*
-
-sed s+/usr/local+$out+ Makefile > Makefile.new
-mv Makefile.new Makefile
-
-make
-make install
diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix
index dfa8a43974a..1acc395dc06 100644
--- a/pkgs/tools/typesetting/hevea/default.nix
+++ b/pkgs/tools/typesetting/hevea/default.nix
@@ -1,9 +1,23 @@
-{stdenv, fetchurl, ocaml}: stdenv.mkDerivation {
-  name = "hevea-1.07";
-  builder = ./builder.sh;
+{ stdenv, fetchurl, ocaml }:
+
+stdenv.mkDerivation rec {
+  name = "hevea-2.23";
+
   src = fetchurl {
-    url = http://pauillac.inria.fr/~maranget/hevea/distri/hevea-1.07.tar.gz;
-    md5 = "561d7a2c10ea9e6a5b352c24d9b65998";
+    url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz";
+    sha256 = "1f9pj48518ixhjxbviv2zx27v4anp92zgg3x704g1s5cki2w33nv";
+  };
+
+  buildInputs = [ ocaml ];
+
+  configurePhase = ''
+    export makeFlags="PREFIX=$out";
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A quite complete and fast LATEX to HTML translator";
+    homepage = http://pauillac.inria.fr/~maranget/hevea/;
+    license = licenses.qpl;
+    maintainers = with maintainers; [ pSub ];
   };
-  buildInputs = [ocaml];
 }

From 59943d69f990b177c4bf47bad564e001456ce7a9 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 31 May 2015 16:13:18 +0200
Subject: [PATCH 0546/2322] joe: update from 3.7 to 4.0, add meta-information

---
 pkgs/applications/editors/joe/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix
index 0e97a036905..9f4d56bf8ad 100644
--- a/pkgs/applications/editors/joe/default.nix
+++ b/pkgs/applications/editors/joe/default.nix
@@ -1,14 +1,16 @@
-{stdenv, fetchurl} :
+{ stdenv, fetchurl } :
 
 stdenv.mkDerivation rec {
-  name = "joe-3.7";
+  name = "joe-4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/joe-editor/${name}.tar.gz";
-    sha256 = "0vqhffdjn3xwsfa383i6kdrpfwilq8b382ljjhy1v32smphmdr6a";
+    sha256 = "0599xp90idl3dkplz72p33d2rfg0hb5yd38rhqdvz5zxfzzssmn5";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
+    description = "A full featured terminal-based screen editor";
     homepage = http://joe-editor.sourceforge.net;
+    license = licenses.gpl2;
   };
 }

From 66433822d3294e11dbe1735df151eaffa0b75684 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 31 May 2015 16:44:16 +0200
Subject: [PATCH 0547/2322] supertux: remove obsolete patch

---
 pkgs/games/super-tux/g++4.patch | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 pkgs/games/super-tux/g++4.patch

diff --git a/pkgs/games/super-tux/g++4.patch b/pkgs/games/super-tux/g++4.patch
deleted file mode 100644
index a7378c80a29..00000000000
--- a/pkgs/games/super-tux/g++4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/menu.h b/src/menu.h
-index 3c67c45..7c7ab8e 100644
---- a/src/menu.h
-+++ b/src/menu.h
-@@ -207,7 +207,7 @@ public:
-
-   bool isToggled(int id);
-
--  void Menu::get_controlfield_key_into_input(MenuItem *item);
-+  void get_controlfield_key_into_input(MenuItem *item);
-
-   void draw   ();
-   void draw_item(int index, int menu_width, int menu_height);

From bd62b7cd006e5cea4f442d341dd3236afa338df1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 31 May 2015 16:55:26 +0200
Subject: [PATCH 0548/2322] tomcat: update from 6.0.39 to 6.0.44

potentially fixes CVE-2014-0227, CVE-2014-0119, CVE-2014-0099, CVE-2014-0096, CVE-2014-0075
---
 pkgs/servers/http/tomcat/6.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix
index 19f20cc8823..71f1d62f4d8 100644
--- a/pkgs/servers/http/tomcat/6.0.nix
+++ b/pkgs/servers/http/tomcat/6.0.nix
@@ -1,6 +1,6 @@
 import ./recent.nix 
   {
     versionMajor = "6";
-    versionMinor = "0.39";
-    sha256 = "19qix6affhc252n03smjf482drg3nxd27shni1gvhphgj3zfmgfy";
+    versionMinor = "0.44";
+    sha256 = "0942f0ss6w9k23xg94nir2dbbkqrqp5k628jflk51ikm5qr95dxa";
   }

From bba6880aa67123f18b22fccce366c6864c4b8e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 31 May 2015 17:09:42 +0200
Subject: [PATCH 0549/2322] snort.org: switch downloads to SourceForge

On snort.org they only seem to keep the latest release, which is annoying.
Fixes #8065. /cc maintainer @aycanirican.
---
 pkgs/applications/networking/ids/daq/default.nix   | 2 +-
 pkgs/applications/networking/ids/snort/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix
index 81a94ec540d..c4a82966238 100644
--- a/pkgs/applications/networking/ids/daq/default.nix
+++ b/pkgs/applications/networking/ids/daq/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     name = "${name}.tar.gz";
-    url = "http://www.snort.org/downloads/snort/${name}.tar.gz";
+    url = "mirror://sourceforge/snort/${name}.tar.gz";
     sha256 = "0vdwb0r9kdlgj4g0i0swafbc7qik0zmks17mhqji8cl7hpdva13p";
   };
 
diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix
index 257b676686b..ea7e0962699 100644
--- a/pkgs/applications/networking/ids/snort/default.nix
+++ b/pkgs/applications/networking/ids/snort/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   
   src = fetchurl {
     name = "${name}.tar.gz";
-    url = "http://www.snort.org/downloads/snort/${name}.tar.gz";
+    url = "mirror://sourceforge/snort/${name}.tar.gz";
     sha256 = "1gmlrh9ygpd5h6nnrr4090wk5n2yq2yrvwi7q6xbm6lxj4rcamyv";
   };
   

From e75b6ac4683a6b1b874e7d0822932c7b51d26137 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 May 2015 18:56:50 +0300
Subject: [PATCH 0550/2322] Add CLX-XKeayboard; fix downloads for darcs over
 https

---
 .../development/lisp-modules/lisp-packages.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 910a082b88a..6e4bf8d9624 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -40,7 +40,7 @@ let lispPackages = rec {
       url = "https://common-lisp.net/project/iterate/darcs/iterate";
       sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25";
       context = ./iterate.darcs-context;
-    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";}));
+    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";}));
     overrides = x: {
       configurePhase="buildPhase(){ true; }";
     };
@@ -314,7 +314,7 @@ let lispPackages = rec {
     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 + "/ca-bundle.crt";}));
+    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";}));
   };
 
   cl-fuse-meta-fs = buildLispPackage rec {
@@ -563,5 +563,19 @@ let lispPackages = rec {
       rev = ''9d6f82f7121c87fb7e3b314987ba93900d300dc6'';
     };
   };
+
+  clx-xkeyboard = buildLispPackage rec {
+    baseName = "clx-xkeyboard";
+    version = "git-20150523";
+    description = "CLX support for X Keyboard extensions";
+    deps = [clx];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/filonenko-mikhail/clx-xkeyboard'';
+      sha256 = "11b34da7d354a709a24774032e85a8947be023594f8a333eaff6d4aa79f2b3db";
+      rev = ''11455d36283ef31c498bd58ffebf48c0f6b86ea6'';
+    };
+  };
+
 };
 in lispPackages

From 81a79f9d033fbd64f3868bf350ac2b0733c9e7ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 31 May 2015 17:52:41 +0200
Subject: [PATCH 0551/2322] ocropus: fix chrooted check phase by patchShebangs

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

diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix
index 821b362b365..b76852b035a 100644
--- a/pkgs/applications/misc/ocropus/default.nix
+++ b/pkgs/applications/misc/ocropus/default.nix
@@ -41,7 +41,7 @@ pythonPackages.buildPythonPackage {
   '';
 
   checkPhase = ''
-    patchShebangs ./run-test
+    patchShebangs .
     substituteInPlace ./run-test \
       --replace 'ocropus-rpred' 'ocropus-rpred -Q $NIX_BUILD_CORES'
     PATH=".:$PATH" ./run-test

From d780e48b3104cd5585a87665854803e42a664941 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 31 May 2015 18:01:23 +0200
Subject: [PATCH 0552/2322] openjdk8: fix build by applying the patch from
 debian

see https://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg389555.html

closes #8090
---
 .../compilers/openjdk/JDK-8074312-hotspot.patch       | 11 +++++++++++
 pkgs/development/compilers/openjdk/openjdk8.nix       |  2 ++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch

diff --git a/pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch b/pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch
new file mode 100644
index 00000000000..85722a1d365
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch
@@ -0,0 +1,11 @@
+diff -r 61edd5c7412e make/linux/Makefile
+--- a/hotspot/make/linux/Makefile	Mon Mar 02 18:12:06 2015 +0000
++++ b/hotspot/make/linux/Makefile	Tue Mar 03 15:58:13 2015 +0100
+@@ -233,7 +233,7 @@
+ # Solaris 2.5.1, 2.6).
+ # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
+
+-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
++SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4%
+ OS_VERSION := $(shell uname -r)
+ EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix
index b0dae2512a5..c2780866161 100644
--- a/pkgs/development/compilers/openjdk/openjdk8.nix
+++ b/pkgs/development/compilers/openjdk/openjdk8.nix
@@ -65,6 +65,8 @@ let
     ./fix-java-home-jdk8.patch
     ./read-truststore-from-env-jdk8.patch
     ./currency-date-range-jdk8.patch
+    ./JDK-8074312-hotspot.patch
+
   ];
   preConfigure = ''
     chmod +x configure

From c55ca3fd0b376fc4892e8a6b24691878b22a5a75 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 May 2015 18:29:46 +0200
Subject: [PATCH 0553/2322] cabal2nix: update to version 20150531

This update adds support for bash completion.
---
 pkgs/development/tools/haskell/cabal2nix/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index d14e2272614..7c36390b91e 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -2,16 +2,17 @@
 , deepseq, deepseq-generics, directory, doctest, filepath, gitMinimal
 , hackage-db, hspec, lens, monad-par, monad-par-extras, mtl, pretty
 , process, QuickCheck, regex-posix, SHA, split, stdenv, transformers
-, utf8-string, cartel, nix-prefetch-scripts, makeWrapper
+, utf8-string, cartel, nix-prefetch-scripts, optparse-applicative
+, makeWrapper
 }:
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20150525";
+  version = "20150531";
   src = fetchgit {
     url = "http://github.com/NixOS/cabal2nix.git";
-    rev = "a7998916868af0d09882468b3e43f5854082860f";
-    sha256 = "07bz2z4ramrs2dmvvf6a82fliq51m61c11vmhkkz31nr09l25k6y";
+    rev = "513a5fce6cfabe0b062424f6deb191a12f7e2187";
+    sha256 = "1j4x85cqj823d9swi473b4i9rz9wlm9m7c1il73h02dq5i67wida";
     deepClone = true;
   };
   isExecutable = true;
@@ -21,6 +22,7 @@ mkDerivation rec {
     aeson base bytestring Cabal containers deepseq-generics directory
     filepath hackage-db lens monad-par monad-par-extras mtl pretty
     process regex-posix SHA split transformers utf8-string cartel
+    optparse-applicative
   ];
   testDepends = [
     aeson base bytestring Cabal containers deepseq deepseq-generics
@@ -35,6 +37,8 @@ mkDerivation rec {
     install -D $out/bin/cabal2nix $exe
     rm -rf $out/{bin,lib,share}
     makeWrapper $exe $out/bin/cabal2nix --prefix PATH ":" "${nix-prefetch-scripts}/bin"
+    mkdir -p $out/share/bash-completion/completions
+    $exe --bash-completion-script $out/bin/cabal2nix >$out/share/bash-completion/completions/cabal2nix
   '';
   homepage = "http://github.com/NixOS/cabal2nix/";
   description = "Convert Cabal files into Nix build instructions";

From 5a993f8d0d175537ee341c720dfa433de39f0f0e Mon Sep 17 00:00:00 2001
From: Tanner Doshier <doshitan@gmail.com>
Date: Sun, 31 May 2015 11:36:56 -0500
Subject: [PATCH 0554/2322] minetest: LuaJIT, in-app mod store, better fonts
 and enable translations

cURL was already a dependency, but the build was having some trouble
finding the headers. Just give it a little help and the in-app mod store
store actually works.

The rest of the configuration brings us closer to other distros, like
Fedora (LuaJIT)[1] and Debian (LuaJIT, LevelDB, FreeType, gettext)[2][3]

[1] http://pkgs.fedoraproject.org/cgit/minetest.git/tree/minetest.spec#n28
[2] https://anonscm.debian.org/cgit/pkg-games/minetest-v04x.git/tree/debian/control#n9
[3] https://anonscm.debian.org/cgit/pkg-games/minetest-v04x.git/tree/debian/rules#n56
---
 pkgs/games/minetest/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 79d75011ff0..72673ea010c 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp
-, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, sqlite }:
+, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, sqlite, luajit, freetype
+, gettext
+}:
 
 let
   version = "0.4.12";
@@ -21,12 +23,15 @@ in stdenv.mkDerivation {
   src = sources.src;
 
   cmakeFlags = [
+    "-DENABLE_FREETYPE=1"
+    "-DENABLE_GETTEXT=1"
+    "-DCURL_INCLUDE_DIR=${curl}/include/curl"
     "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"
   ];
 
   buildInputs = [
-    cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp
-    libXxf86vm mesa openal libvorbis x11 sqlite
+    cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa
+    openal libvorbis x11 sqlite luajit freetype gettext
   ];
 
   postInstall = ''

From 7d2b98370f23461d5444a664af69ac3b8eb00c65 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 31 May 2015 19:37:23 +0300
Subject: [PATCH 0555/2322] ca-bundle.crt is now in the root irectory of the
 cacert package

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

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 6e4bf8d9624..32f5928cccd 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -40,7 +40,7 @@ let lispPackages = rec {
       url = "https://common-lisp.net/project/iterate/darcs/iterate";
       sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25";
       context = ./iterate.darcs-context;
-    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";}));
+    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";}));
     overrides = x: {
       configurePhase="buildPhase(){ true; }";
     };
@@ -314,7 +314,7 @@ let lispPackages = rec {
     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/ca-bundle.crt";}));
+    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";}));
   };
 
   cl-fuse-meta-fs = buildLispPackage rec {

From 53b5d946e15b7865d5aefb1bd566bca475727e7c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 31 May 2015 18:41:34 +0200
Subject: [PATCH 0556/2322] doc: add section ids

This commit also use enforces consistent use of the prefixes "sec" for
section and "ssec" for subsection.
---
 doc/coding-conventions.xml |  6 +++---
 doc/language-support.xml   | 28 ++++++++++++++--------------
 doc/meta.xml               |  3 ++-
 doc/package-notes.xml      |  2 +-
 doc/packageconfig.xml      |  3 ++-
 doc/stdenv.xml             | 30 +++++++++++++++++-------------
 6 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index 68b075959c9..b041a73d818 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -5,7 +5,7 @@
 <title>Coding conventions</title>
 
 
-<section><title>Syntax</title>
+<section xml:id="sec-syntax"><title>Syntax</title>
 
 <itemizedlist>
 
@@ -207,7 +207,7 @@ args.stdenv.mkDerivation (args // {
 </section>
 
 
-<section><title>Package naming</title>
+<section xml:id="sec-package-naming"><title>Package naming</title>
 
 <para>In Nixpkgs, there are generally three different names associated with a package:
 
@@ -292,7 +292,7 @@ dashes between words — not in camel case.  For instance, it should be
 <filename>allPackages.nix</filename> or
 <filename>AllPackages.nix</filename>.</para>
 
-<section><title>Hierarchy</title>
+<section xml:id="sec-hierarchy"><title>Hierarchy</title>
 
 <para>Each package should be stored in its own directory somewhere in
 the <filename>pkgs/</filename> tree, i.e. in
diff --git a/doc/language-support.xml b/doc/language-support.xml
index 1e1bdf75eda..14e8aa7a7ba 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -13,7 +13,7 @@ in Nixpkgs to easily build packages for other programming languages,
 such as Perl or Haskell.  These are described in this chapter.</para>
 
 
-<section xml:id="ssec-language-perl"><title>Perl</title>
+<section xml:id="sec-language-perl"><title>Perl</title>
 
 <para>Nixpkgs provides a function <varname>buildPerlPackage</varname>,
 a generic package builder function for any Perl package that has a
@@ -151,7 +151,7 @@ ClassC3Componentised = buildPerlPackage rec {
 
 </para>
 
-<section><title>Generation from CPAN</title>
+<section xml:id="ssec-generation-from-CPAN"><title>Generation from CPAN</title>
 
 <para>Nix expressions for Perl packages can be generated (almost)
 automatically from CPAN.  This is done by the program
@@ -191,7 +191,7 @@ you need it.</para>
 </section>
 
 
-<section xml:id="python"><title>Python</title>
+<section xml:id="sec-python"><title>Python</title>
 
 <para>
   Currently supported interpreters are <varname>python26</varname>, <varname>python27</varname>,
@@ -276,7 +276,7 @@ are provided with all modules included.</para>
   </varlistentry>
 
 </variablelist>
-<section xml:id="build-python-package"><title><varname>buildPythonPackage</varname> function</title>
+<section xml:id="ssec-build-python-package"><title><varname>buildPythonPackage</varname> function</title>
 
   <para>
   The function is implemented in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/generic/default.nix">
@@ -438,7 +438,7 @@ twisted = buildPythonPackage {
 
 </section>
 
-<section xml:id="python-build-env"><title><function>python.buildEnv</function> function</title>
+<section xml:id="ssec-python-build-env"><title><function>python.buildEnv</function> function</title>
   <para>
     Create Python environments using low-level <function>pkgs.buildEnv</function> function. Example <filename>default.nix</filename>:
 
@@ -484,7 +484,7 @@ python.buildEnv.override {
   </variablelist>
 </section>
 
-<section xml:id="python-tools"><title>Tools</title>
+<section xml:id="ssec-python-tools"><title>Tools</title>
 
 <para>Packages inside nixpkgs are written by hand. However many tools
 exist in community to help save time. No tool is preferred at the moment.
@@ -511,7 +511,7 @@ exist in community to help save time. No tool is preferred at the moment.
 
 </section>
 
-<section xml:id="python-development"><title>Development</title>
+<section xml:id="ssec-python-development"><title>Development</title>
 
   <para>
     To develop Python packages <function>buildPythonPackage</function> has
@@ -555,7 +555,7 @@ buildPythonPackage {
 
 </section>
 
-<section xml:id="python-faq"><title>FAQ</title>
+<section xml:id="ssec-python-faq"><title>FAQ</title>
 
 <variablelist>
 
@@ -597,7 +597,7 @@ sed -i '/ = data_files/d' setup.py</programlisting>
 </section>
 
 
-<section xml:id="python-contrib"><title>Contributing guidelines</title>
+<section xml:id="ssec-python-contrib"><title>Contributing guidelines</title>
 <para>
   Following rules are desired to be respected:
 </para>
@@ -625,7 +625,7 @@ sed -i '/ = data_files/d' setup.py</programlisting>
 </section>
 
 
-<section xml:id="ssec-language-ruby"><title>Ruby</title>
+<section xml:id="sec-language-ruby"><title>Ruby</title>
   <para>There currently is support to bundle applications that are packaged as Ruby gems. The utility "bundix" allows you to write a <filename>Gemfile</filename>, let bundler create a <filename>Gemfile.lock</filename>, and then convert
   this into a nix expression that contains all Gem dependencies automatically.</para>
 
@@ -666,7 +666,7 @@ and scalable.";
 
 </section>
 
-<section xml:id="ssec-language-go"><title>Go</title>
+<section xml:id="sec-language-go"><title>Go</title>
 
 <para>The function <varname>buildGoPackage</varname> builds
 standard Go packages.
@@ -787,7 +787,7 @@ done
 </section>
 
 
-<section xml:id="ssec-language-java"><title>Java</title>
+<section xml:id="sec-language-java"><title>Java</title>
 
 <para>Ant-based Java packages are typically built from source as follows:
 
@@ -868,7 +868,7 @@ Runtime) instead of the OpenJRE.</para>
 </section>
 
 
-<section xml:id="ssec-language-lua"><title>Lua</title>
+<section xml:id="sec-language-lua"><title>Lua</title>
 
 <para>
   Lua packages are built by the <varname>buildLuaPackage</varname> function.  This function is
@@ -915,7 +915,7 @@ fileSystem = buildLuaPackage {
 
 </section>
 
-<section xml:id="ssec-language-coq"><title>Coq</title>
+<section xml:id="sec-language-coq"><title>Coq</title>
   <para>
     Coq libraries should be installed in
     <literal>$(out)/lib/coq/${coq.coq-version}/user-contrib/</literal>.
diff --git a/doc/meta.xml b/doc/meta.xml
index a0ed3069b68..14a01ccb3c0 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -82,7 +82,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
 </para>
 
 
-<section><title>Standard meta-attributes</title>
+<section xml:id="sec-standard-meta-attributes"><title>Standard
+meta-attributes</title>
 
 <para>It is expected that each meta-attribute is one of the following:</para>
 
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 8a35e640324..ecaf619472d 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -141,7 +141,7 @@ $ make menuconfig ARCH=<replaceable>arch</replaceable></screen>
 
 <!--============================================================-->
 
-<section>
+<section xml:id="sec-xorg">
 
 <title>X.org</title>
 
diff --git a/doc/packageconfig.xml b/doc/packageconfig.xml
index 44ce1974c6c..4e0fcc3b6a4 100644
--- a/doc/packageconfig.xml
+++ b/doc/packageconfig.xml
@@ -67,7 +67,8 @@
 	<filename>lib/licenses.nix</filename> of the nix package tree.
     </para>
 
-<section><title>Modify packages via <literal>packageOverrides</literal></title>
+<section xml:id="sec-modify-via-packageOverrides"><title>Modify
+packages via <literal>packageOverrides</literal></title>
 
 <para>
 
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 6fdebda09f9..58310834fd2 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -15,7 +15,8 @@ environment does everything automatically.  If
 can easily customise or override the various build phases.</para>
 
 
-<section><title>Using <literal>stdenv</literal></title>
+<section xml:id="sec-using-stdenv"><title>Using
+<literal>stdenv</literal></title>
 
 <para>To build a package with the standard environment, you use the
 function <varname>stdenv.mkDerivation</varname>, instead of the
@@ -124,7 +125,8 @@ genericBuild
 </section>
 
 
-<section><title>Tools provided by <literal>stdenv</literal></title>
+<section xml:id="sec-tools-of-stdenv"><title>Tools provided by
+<literal>stdenv</literal></title>
 
 <para>The standard environment provides the following packages:
 
@@ -225,7 +227,7 @@ genericBuild
 </section>
 
 
-<section xml:id="ssec-stdenv-phases"><title>Phases</title>
+<section xml:id="sec-stdenv-phases"><title>Phases</title>
 
 <para>The generic builder has a number of <emphasis>phases</emphasis>.
 Package builds are split into phases to make it easier to override
@@ -243,7 +245,8 @@ is convenient to override a phase from the derivation, while the
 latter is convenient from a build script.</para>
 
 
-<section><title>Controlling phases</title>
+<section xml:id="ssec-controlling-phases"><title>Controlling
+phases</title>
 
 <para>There are a number of variables that control what phases are
 executed and in what order:
@@ -327,7 +330,7 @@ executed and in what order:
 </section>
 
 
-<section><title>The unpack phase</title>
+<section xml:id="ssec-unpack-phase"><title>The unpack phase</title>
 
 <para>The unpack phase is responsible for unpacking the source code of
 the package.  The default implementation of
@@ -434,7 +437,7 @@ Additional file types can be supported by setting the
 </section>
 
 
-<section><title>The patch phase</title>
+<section xml:id="ssec-patch-phase"><title>The patch phase</title>
 
 <para>The patch phase applies the list of patches defined in the
 <varname>patches</varname> variable.</para>
@@ -477,7 +480,7 @@ Additional file types can be supported by setting the
 </section>
 
 
-<section><title>The configure phase</title>
+<section xml:id="ssec-configure-phase"><title>The configure phase</title>
 
 <para>The configure phase prepares the source tree for building.  The
 default <function>configurePhase</function> runs
@@ -573,7 +576,7 @@ script) if it exists.</para>
 </section>
 
 
-<section><title>The build phase</title>
+<section xml:id="build-phase"><title>The build phase</title>
 
 <para>The build phase is responsible for actually building the package
 (e.g. compiling it).  The default <function>buildPhase</function>
@@ -657,7 +660,7 @@ called, respectively.</para>
 </section>
 
 
-<section><title>The check phase</title>
+<section xml:id="ssec-check-phase"><title>The check phase</title>
 
 <para>The check phase checks whether the package was built correctly
 by running its test suite.  The default
@@ -717,7 +720,7 @@ doCheck = true;</programlisting>
 </section>
 
 
-<section><title>The install phase</title>
+<section xml:id="ssec-install-phase"><title>The install phase</title>
 
 <para>The install phase is responsible for installing the package in
 the Nix store under <envar>out</envar>.  The default
@@ -772,7 +775,7 @@ installTargets = "install-bin install-doc";</programlisting>
 </section>
 
 
-<section><title>The fixup phase</title>
+<section xml:id="ssec-fixup-phase"><title>The fixup phase</title>
 
 <para>The fixup phase performs some (Nix-specific) post-processing
 actions on the files installed under <filename>$out</filename> by the
@@ -895,7 +898,8 @@ following:
 </section>
 
 
-<section><title>The distribution phase</title>
+<section xml:id="ssec-distribution-phase"><title>The distribution
+phase</title>
 
 <para>The distribution phase is intended to produce a source
 distribution of the package.  The default
@@ -1199,7 +1203,7 @@ echo @foo@
 </section>
 
 
-<section><title>Purity in Nixpkgs</title>
+<section xml:id="sec-purity-in-nixpkgs"><title>Purity in Nixpkgs</title>
 
 <para>[measures taken to prevent dependencies on packages outside the
 store, and what you can do to prevent them]</para>

From 3296b5e6b12b15d5bd298d684329cfdd7642e10a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 31 May 2015 18:59:38 +0200
Subject: [PATCH 0557/2322] luastdlib: fix build by adding autoreconfHook

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 273a0e7ecc1..84befe7f652 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -7,7 +7,7 @@
 
 { fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool
 , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo
-, perl, gtk, python, glib, gobjectIntrospection, libevent, zlib
+, perl, gtk, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook
 }:
 
 let
@@ -242,7 +242,7 @@ let
       url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip";
       sha256 = "0636absdfjx8ybglwydmqxwfwmqz1c4b9s5mhxlgm4ci18lw3hms";
     };
-    buildInputs = [ unzip ];
+    buildInputs = [ autoreconfHook unzip ];
     meta = {
       homepage = "https://github.com/lua-stdlib/lua-stdlib/";
       hydraPlatforms = stdenv.lib.platforms.linux;

From 9e68371f510fa87007b0c51ad3c58f12d7484030 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 30 May 2015 16:38:09 +0200
Subject: [PATCH 0558/2322] smtube: update from 15.5.10 to 15.5.17

---
 pkgs/applications/video/smtube/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index 37cae1cd0ed..3180a9e632a 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,11 +1,14 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "smtube-15.5.10";
+  versionMajor = "15.5";
+  versionMinor = "17";
+  version = "${versionMajor}.${versionMinor}";
+  name = "smtube-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "1if2b0h6snfmj5hnx4cs55zjbdvwagx95jv62f2jgh3m5gis0cbz";
+    url = "mirror://sourceforge/smtube/SMTube/${versionMajor}/${name}.tar.bz2";
+    sha256 = "0jbik41nb1b7381ybzblmmsl8b7ljl6a2zpn1dcg0cccjw5mnbyg";
   };
 
   makeFlags = [

From 2af5c8d75f3c905fdba59bc7a9970d586009ebfe Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 30 May 2015 16:54:43 +0200
Subject: [PATCH 0559/2322] qarte: minor update to rev. 147

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

diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix
index a7e8cd8c1b9..c8056512c79 100644
--- a/pkgs/applications/video/qarte/default.nix
+++ b/pkgs/applications/video/qarte/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "qarte-2.2.0";
+  name = "qarte-2.2.0-147";
   src = fetchbzr {
     url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk;
-    rev = "146";
-    sha256 = "0vqhxrzb3d7id81sr02h78hn0m7k2x0yxk9cl36pr5vx3vjnsyi9";
+    rev = "147";
+    sha256 = "0cl3k3vr3kmp5dls0lbv5pka4zrlyh5816pwl5rkgqmycl11pk51";
   };
 
   buildInputs = [ makeWrapper ];

From 3838f1d490d759f013072abe8bc1673b5c3c4907 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 31 May 2015 19:10:36 +0200
Subject: [PATCH 0560/2322] firestr: fix build (qt5.multimedia was missing)

---
 .../networking/p2p/firestr/default.nix        | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/p2p/firestr/default.nix b/pkgs/applications/networking/p2p/firestr/default.nix
index 65ec54cf0f7..e7be81def61 100644
--- a/pkgs/applications/networking/p2p/firestr/default.nix
+++ b/pkgs/applications/networking/p2p/firestr/default.nix
@@ -4,8 +4,6 @@
 stdenv.mkDerivation {
   name = "firestr-0.8";
 
-  buildInputs = [ cmake boost botan snappy libopus libuuid qt5.base libXScrnSaver openssl ];
-
   src = fetchFromGitHub {
     owner  = "mempko";
     repo   = "firestr";
@@ -13,23 +11,25 @@ stdenv.mkDerivation {
     sha256 = "0s2kdi8rw3i3f8gbiy0ykyi6xj5n8p80m0d1i86mhh8jpagvbfzb";
   };
 
+  buildInputs = [ cmake boost botan snappy libopus libuuid qt5.base qt5.multimedia
+                  libXScrnSaver openssl ];
+
   patches = ./return.patch;
 
-  postPatch =
-    ''
+  postPatch = ''
       substituteInPlace CMakeLists.txt \
         --replace "set(Boost_USE_STATIC_LIBS on)" "" \
         --replace "/usr/include/botan" "${botan}/include/botan" \
         --replace "libopus.a"       "libopus.so" \
         --replace "libsnappy.a"     "libsnappy.so" \
         --replace "libbotan-1.10.a" "libbotan-1.10.so.0"
-    '';
+  '';
 
-  meta = with stdenv.lib;
-    { description = "Grass computing platform";
-      homepage = http://firestr.com/;
-      license = licenses.gpl3;
-      maintainers = [ maintainers.emery ];
-      platforms = platforms.linux;
-    };
+  meta = with stdenv.lib; {
+    description = "Grass computing platform";
+    homepage = http://firestr.com/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.emery ];
+    platforms = platforms.linux;
+  };
 }

From ed9455838cff55b6b6cc118b38666bc28fb4d5b8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 31 May 2015 20:25:11 +0200
Subject: [PATCH 0561/2322] checkstyle: update from 6.6 to 6.7

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

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index f757d0e9619..3addd0f5a25 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.6";
+  version = "6.7";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz";
-    sha256 = "1pniql23f8fsr7yhcxvrc65rdynrwpwl6vxl2jdsj4a37br8mr0d";
+    sha256 = "0na3gfkxzgnnbjvr4sys4x3mb1s1hn9xy9krmvnxqq0wmm4lysjd";
   };
 
   installPhase = ''

From 27eeeb9acb434707eae4f39bda23ab8e33b93166 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 31 May 2015 22:01:11 +0200
Subject: [PATCH 0562/2322] libaccounts-glib 1.16 -> 1.18

Development has moved from Google Code to Gitlab.
---
 .../libraries/libaccounts-glib/default.nix    | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix
index b3217e66275..aa029ede953 100644
--- a/pkgs/development/libraries/libaccounts-glib/default.nix
+++ b/pkgs/development/libraries/libaccounts-glib/default.nix
@@ -1,15 +1,25 @@
-{ stdenv, fetchurl, glib, libxml2, libxslt, pkgconfig, sqlite }:
+{ stdenv, fetchFromGitLab, autoconf, automake, glib
+, gtk_doc, libtool, libxml2, libxslt, pkgconfig, sqlite }:
 
+let version = "1.18"; in
 stdenv.mkDerivation rec {
-  name = "libaccounts-glib-1.16";
-  src = fetchurl {
-    url = "https://accounts-sso.googlecode.com/files/${name}.tar.gz";
-    sha256 = "0hgvk9rdfvk47c54rvcp3hq74yy7v6w1ql71q2mik8lmsx22354a";
+  name = "libaccounts-glib-${version}";
+
+  src = fetchFromGitLab {
+    sha256 = "02p23vrqhw2l2w6nrwlk4bqxf7z9kplkc2d43716x9xakxr291km";
+    rev = version;
+    repo = "libaccounts-glib";
+    owner = "accounts-sso";
   };
 
   buildInputs = [ glib libxml2 libxslt sqlite ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ autoconf automake gtk_doc libtool pkgconfig ];
 
-  configurePhase = ''HAVE_GCOV_FALSE='#' ./configure $configureFlags --prefix=$out'';
+  postPatch = ''
+    NOCONFIGURE=1 ./autogen.sh
+  '';
 
+  configurePhase = ''
+    HAVE_GCOV_FALSE="#" ./configure $configureFlags --prefix=$out
+  '';
 }

From b43f5d388118e55d4b1090b41682c74ec16c4db1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 31 May 2015 22:01:52 +0200
Subject: [PATCH 0563/2322] accounts-qt: don't cast to string for no reason

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

diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
index c0e40472902..824a2949492 100644
--- a/pkgs/development/libraries/accounts-qt/default.nix
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitLab {
     sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl";
-    rev = "${version}";
+    rev = version;
     repo = "libaccounts-qt";
     owner = "accounts-sso";
   };

From e9f9d1c0293aaad0d3ef777eef9d38b3bf622f4c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 31 May 2015 22:38:44 +0200
Subject: [PATCH 0564/2322] Bump 'svtplay-dl' to version 0.10.2015.05.24.

Also switch to `fetchFromGitHub` from plain `fetchurl`.
---
 pkgs/tools/misc/svtplay-dl/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index a30f0277ec0..d84d00e2ba2 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl, makeWrapper, python, perl, zip
+{ stdenv, fetchFromGitHub, makeWrapper, python, perl, zip
 , rtmpdump, nose, mock, pycrypto, substituteAll }:
 
 stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "0.10.2015.03.25";
+  version = "0.10.2015.05.24";
 
-  src = fetchurl {
-    url = "https://github.com/spaam/svtplay-dl/archive/${version}.tar.gz";
-    sha256 = "0j0fg3qrldpaf880v488rr2snw6ghpdln4l9mbvmi70rjzzxv4ap";
+  src = fetchFromGitHub {
+    owner = "spaam";
+    repo = "svtplay-dl";
+    rev = version;
+    sha256 = "0dzd5n4zvrplvm3sx017ym7jlngp4pn8nra9qx9n4wq6h4c6n6a5";
   };
 
   pythonPaths = [ pycrypto ];

From bd3e1623116e8f23e70f85388905a14b04ae196b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <ikervagyok@gmail.com>
Date: Sun, 31 May 2015 22:49:15 +0200
Subject: [PATCH 0565/2322] Inital Commit for Gnu Talk Filters

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

diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/misc/talkfilters/default.nix
new file mode 100644
index 00000000000..f2fda02f9ae
--- /dev/null
+++ b/pkgs/misc/talkfilters/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+let 
+  name = "talkfilters";
+  version = "2.3.8";
+in
+
+stdenv.mkDerivation {
+  name = "${name}";
+
+  src = fetchurl {
+    url = "http://www.hyperrealm.com/${name}/${name}-${version}.tar.gz";
+    sha256 = "19nc5vq4bnkjvhk8srqddzhcs93jyvpm9r6lzjzwc1mgf08yg0a6";
+  };
+
+  meta = { 
+    description = "Converts English text into text that mimics a stereotyped or humorous dialect";
+    homepage = "http://http://www.hyperrealm.com/${name}";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ ikervagyok ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 915a07ffca5..357a318e433 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2935,6 +2935,8 @@ let
 
   t1utils = callPackage ../tools/misc/t1utils { };
 
+  talkfilters = callPackage ../misc/talkfilters {};
+
   tarsnap = callPackage ../tools/backup/tarsnap { };
 
   tcpcrypt = callPackage ../tools/security/tcpcrypt { };

From abecf4aca1e77cfcceb7f439ff7428f1146d8522 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 30 May 2015 21:25:03 -0700
Subject: [PATCH 0566/2322] bitlbee: 3.2.2 -> 3.4.0

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

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index 805a47fc058..43d11f0a8ff 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -2,11 +2,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "bitlbee-3.2.2";
+  name = "bitlbee-3.4";
 
   src = fetchurl {
     url = "mirror://bitlbee/src/${name}.tar.gz";
-    sha256 = "13jmcxxgli82wb2n4hs091159xk8rgh7nb02f478lgpjh6996f5s";
+    sha256 = "0plx4dryf8i6hz7vghg84z5f6w6rkw1l8ckl4c4wh5zxpd3ddfnf";
   };
 
   buildInputs = [ gnutls glib pkgconfig libotr ]

From 98fb54a6dc908705ef4cb4f8228640a512848e8f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 30 May 2015 21:25:13 -0700
Subject: [PATCH 0567/2322] gss: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index 71652e3cae3..a748d958269 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gss-1.0.2";
+  name = "gss-1.0.3";
 
   src = fetchurl {
     url = "mirror://gnu/gss/${name}.tar.gz";
-    sha256 = "1qa8lbkzi6ilfggx7mchfzjnchvhwi68rck3jf9j4425ncz7zsd9";
+    sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz";
   };
 
   buildInputs = [ shishi ];

From f99ec984d797b47f5a836e1bdf3ef344b5546072 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 30 May 2015 22:55:17 -0700
Subject: [PATCH 0568/2322] gnupg21: 2.1.3 -> 2.1.4

---
 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 71e5282e85b..31a6bd2c460 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -13,11 +13,11 @@ with stdenv.lib;
 assert x11Support -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.1.3";
+  name = "gnupg-2.1.4";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1vf8fmwcq81abzw2mypz5j7m4xy0vl4z6lri5lxfbd2bsyq7ygi1";
+    sha256 = "1c3c89b7ziknz6h1dnwmfjhgyy28g982rcncrhmhylb8v3npw4k4";
   };
 
   patches = [ ./socket-activate-2.1.1.patch ];

From 18237ff377156cad03c77cc954c746a242653dd3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 31 May 2015 14:17:09 -0700
Subject: [PATCH 0569/2322] musl: 1.1.8 -> 1.1.9

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

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index 1dae1d215ec..392a3c4049a 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "musl-${version}";
-  version = "1.1.8";
+  version = "1.1.9";
 
   src = fetchurl {
     url    = "http://www.musl-libc.org/releases/${name}.tar.gz";
-    sha256 = "04vq4a1hm81kbxfcqa30s6xpzbqf3568gbysfxcmb72v8438b4ps";
+    sha256 = "0gi8638c5gh9i4gsihfczigg78l2q0hd9c3ws26chwprr9rp3gq0";
   };
 
   enableParallelBuilding = true;

From f47d22a6f1e969b93868583af448e4cb1a1665c8 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 31 May 2015 17:07:44 -0500
Subject: [PATCH 0570/2322] nixpkgs: verilator 3.872

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/electronics/verilator/default.nix | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/science/electronics/verilator/default.nix

diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
new file mode 100644
index 00000000000..635e89dadc8
--- /dev/null
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, perl, flex, bison }:
+
+stdenv.mkDerivation rec {
+  name    = "verilator-${version}";
+  version = "3.872";
+
+  src = fetchurl {
+    url    = "http://www.veripool.org/ftp/${name}.tgz";
+    sha256 = "113ha7vy6lsi9zygiy3rnsd3dhi5y8lkfsfrh0nwzady7147l2yh";
+  };
+
+  enableParallelBuilding = true;
+  buildInputs = [ perl flex bison ];
+
+  meta = {
+    description = "Fast and robust (System)Verilog simulator/compiler";
+    homepage    = "http://www.veripool.org/wiki/verilator";
+    license     = stdenv.lib.licenses.lgpl3;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9a2f989113..36350480fb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3079,6 +3079,8 @@ let
 
   vcsh = callPackage ../applications/version-management/vcsh { };
 
+  verilator = callPackage ../applications/science/electronics/verilator {};
+
   verilog = callPackage ../applications/science/electronics/verilog {};
 
   vfdecrypt = callPackage ../tools/misc/vfdecrypt { };

From 867d2c5c464fd87268f71942beded17d7e1e5b9c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 31 May 2015 15:48:17 -0700
Subject: [PATCH 0571/2322] openssl: Remove References to
 OPENSSL_X509_CERT_FILE

---
 nixos/modules/programs/venus.nix              |  2 +-
 nixos/modules/security/ca.nix                 |  2 --
 .../cluster/panamax/api/default.nix           |  1 -
 .../instant-messengers/tkabber/default.nix    |  2 +-
 .../git-and-tools/git/cert-path.patch         |  2 +-
 .../development/libraries/openssl/1.0.2.x.nix | 25 +------------------
 .../lwp-protocol-https-cert-file.patch        |  6 ++---
 7 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix
index 2b70a795f4f..3b5ae07e82f 100644
--- a/nixos/modules/programs/venus.nix
+++ b/nixos/modules/programs/venus.nix
@@ -166,7 +166,7 @@ in
         script = "exec venus-planet ${configFile}";
         serviceConfig.User = "${cfg.user}";
         serviceConfig.Group = "${cfg.group}";
-        environment.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
+        environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
         startAt = cfg.dates;
       };
 
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix
index 595b9476fa5..dec5a62dcf0 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@@ -66,8 +66,6 @@ in
 
     environment.sessionVariables =
       { SSL_CERT_FILE          = "/etc/ssl/certs/ca-certificates.crt";
-        # FIXME: unneeded - remove eventually.
-        OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
         # FIXME: unneeded - remove eventually.
         GIT_SSL_CAINFO         = "/etc/ssl/certs/ca-certificates.crt";
       };
diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix
index dae0315a31b..8bb19cb3eb8 100644
--- a/pkgs/applications/networking/cluster/panamax/api/default.nix
+++ b/pkgs/applications/networking/cluster/panamax/api/default.nix
@@ -62,7 +62,6 @@ stdenv.mkDerivation rec {
       --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \
       --prefix "HOME" : "$out/share/panamax-api" \
       --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \
-      --prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/ca-bundle.crt" \
       --prefix "SSL_CERT_FILE" : "${cacert}/ca-bundle.crt" \
       --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}"
   '';
diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
index 2b3703bc279..d0cc333c71b 100644
--- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
@@ -43,7 +43,7 @@ in mkTkabber (main // {
   postPatch = ''
     substituteInPlace login.tcl --replace \
       "custom::defvar loginconf(sslcacertstore) \"\"" \
-      "custom::defvar loginconf(sslcacertstore) \$env(OPENSSL_X509_CERT_FILE)"
+      "custom::defvar loginconf(sslcacertstore) \$env(SSL_CERT_FILE)"
   '' + optionalString (theme != null) ''
     themePath="$out/share/doc/tkabber/examples/xrdb/${theme}.xrdb"
     sed -i '/^if.*load_default_xrdb/,/^}$/ {
diff --git a/pkgs/applications/version-management/git-and-tools/git/cert-path.patch b/pkgs/applications/version-management/git-and-tools/git/cert-path.patch
index 846752f5bfe..7d5dca9abfe 100644
--- a/pkgs/applications/version-management/git-and-tools/git/cert-path.patch
+++ b/pkgs/applications/version-management/git-and-tools/git/cert-path.patch
@@ -5,7 +5,7 @@ diff -ru -x '*~' git-1.9.2-orig/git-send-email.perl git-1.9.2/git-send-email.per
  		return;
  	}
  
-+	$smtp_ssl_cert_path //= $ENV{'OPENSSL_X509_CERT_FILE'};
++	$smtp_ssl_cert_path //= $ENV{'SSL_CERT_FILE'};
 +
  	if (!defined $smtp_ssl_cert_path) {
  		# use the OpenSSL defaults
diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix
index 18c533ea188..a1645189161 100644
--- a/pkgs/development/libraries/openssl/1.0.2.x.nix
+++ b/pkgs/development/libraries/openssl/1.0.2.x.nix
@@ -10,30 +10,7 @@ let
 
   patchesCross = isCross: let
     isDarwin = stdenv.isDarwin || (isCross && stdenv.cross.libc == "libSystem");
-  in
-    [ # Allow the location of the X509 certificate file (the CA
-      # bundle) to be set through the environment variable
-      # ‘OPENSSL_X509_CERT_FILE’.  This is necessary because the
-      # default location ($out/ssl/cert.pem) doesn't exist, and
-      # hardcoding something like /etc/ssl/cert.pem is impure and
-      # cannot be overriden per-process.  For security, the
-      # environment variable is ignored for setuid binaries.
-      # FIXME: drop this patch; it really isn't necessary, because
-      # OpenSSL already supports a ‘SSL_CERT_FILE’ variable.
-      ./cert-file.patch
-    ]
-
-    ++ stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86")
-         [ ./cert-file-path-max.patch # merge with `cert-file.patch' eventually
-           ./gnu.patch                # submitted upstream
-         ]
-
-    ++ stdenv.lib.optionals (stdenv.system == "x86_64-kfreebsd-gnu")
-        [ ./gnu.patch
-          ./kfreebsd-gnu.patch
-        ]
-
-    ++ stdenv.lib.optional isDarwin ./darwin-arch.patch;
+  in stdenv.lib.optional isDarwin ./darwin-arch.patch;
 
   extraPatches = stdenv.lib.optional stdenv.isCygwin ./1.0.1-cygwin64.patch;
 in
diff --git a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
index c0fa85ecce8..4a4b49a829d 100644
--- a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
+++ b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
@@ -1,4 +1,4 @@
-Use $OPENSSL_X509_CERT_FILE to get the CA certificates.
+Use $SSL_CERT_FILE to get the CA certificates.
 
 diff -ru -x '*~' LWP-Protocol-https-6.02-orig/lib/LWP/Protocol/https.pm LWP-Protocol-https-6.02/lib/LWP/Protocol/https.pm
 --- LWP-Protocol-https-6.02-orig/lib/LWP/Protocol/https.pm	2011-03-27 13:54:01.000000000 +0200
@@ -7,8 +7,8 @@ diff -ru -x '*~' LWP-Protocol-https-6.02-orig/lib/LWP/Protocol/https.pm LWP-Prot
      }
      if ($ssl_opts{SSL_verify_mode}) {
  	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
-+            if (defined $ENV{'OPENSSL_X509_CERT_FILE'}) {
-+                $ssl_opts{SSL_ca_file} = $ENV{'OPENSSL_X509_CERT_FILE'};
++            if (defined $ENV{'SSL_CERT_FILE'}) {
++                $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'};
 +            }
 +        }
 +	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {

From ec7f3fb516e7af55704f63c950c4c4aa256b0e0d Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sun, 31 May 2015 19:47:59 -0400
Subject: [PATCH 0572/2322] libass: 0.12.1 -> 0.12.2

---
 pkgs/development/libraries/libass/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index 77742c3d625..502f95dca9a 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, pkgconfig, yasm
-, freetype ? null
-, fribidi ? null
+, freetype, fribidi
 , encaSupport ? true, enca ? null # enca support
 , fontconfigSupport ? true, fontconfig ? null # fontconfig support
 , harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support
@@ -8,19 +7,18 @@
 , largeTilesSupport ? false # Use larger tiles in the rasterizer
 }:
 
-assert ((freetype != null) && (fribidi != null));
-assert encaSupport -> (enca != null);
-assert fontconfigSupport -> (fontconfig != null);
-assert harfbuzzSupport -> (harfbuzz != null);
+assert encaSupport -> enca != null;
+assert fontconfigSupport -> fontconfig != null;
+assert harfbuzzSupport -> harfbuzz != null;
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libass-${version}";
-  version = "0.12.1";
+  version = "0.12.2";
 
   src = fetchurl {
     url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz";
-    sha256 = "1mwj2nk9g6cq6f8m1hf0ijg1299rghhy9naahqq43sc2whblb1l7";
+    sha256 = "1qzibgqmnnqk2r116lpk1br764g0v74f2zp12y5id0p1plaing37";
   };
 
   configureFlags = [

From a9af62f38b39f3d88d5fb5514ab67d2c4ead5d7e Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sun, 31 May 2015 19:54:03 -0400
Subject: [PATCH 0573/2322] v4l-utils: 1.6.2 -> 1.6.3

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

diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index 1a27ae8f571..17b21f92c17 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -16,11 +16,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "v4l-utils-1.6.2";
+  name = "v4l-utils-1.6.3";
 
   src = fetchurl {
     url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
-    sha256 = "0zdyjrja2mkqlijpdb4gz1vw0g7pslswmgqqsgri3yq408gypmnk";
+    sha256 = "0k46z5gqjzg702m2vs4sv6sxynq1sj14m0pgwvl2gkgg3dfbyjhn";
   };
 
   configureFlags = [

From 2d1ac6669281b071674739adf4bc124dfaf30a3e Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sun, 31 May 2015 20:04:31 -0400
Subject: [PATCH 0574/2322] mopidy: 1.0.0 -> 1.0.5

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

diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index 08ccfc13302..7c236944892 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -5,11 +5,11 @@
 pythonPackages.buildPythonPackage rec {
   name = "mopidy-${version}";
 
-  version = "1.0.0";
+  version = "1.0.5";
 
   src = fetchurl {
     url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz";
-    sha256 = "15cz6mqw8ihqxhlssnbbssl3bi1xxbmq7krf3hv0zmmdj73ilsd6";
+    sha256 = "0lhmm2w2djf6mb3acw1yq1k4j74v1lf4kgx24dsdnpkgsycrv5q6";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 42be3c60975f890276875c802b96c0faeafbccff Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sun, 31 May 2015 20:06:18 -0400
Subject: [PATCH 0575/2322] mopidy-moped: 0.5.0 -> 0.6.0

---
 pkgs/applications/audio/mopidy-moped/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy-moped/default.nix
index a96a5c9d898..6bf73c02185 100644
--- a/pkgs/applications/audio/mopidy-moped/default.nix
+++ b/pkgs/applications/audio/mopidy-moped/default.nix
@@ -2,12 +2,11 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "mopidy-moped-${version}";
-
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchurl {
     url = "https://github.com/martijnboland/moped/archive/v${version}.tar.gz";
-    sha256 = "1bkx0c4yi48nxm1vzacdil9scn0ilwkbd1rgiga34p77lcg16qb2";
+    sha256 = "0xff8y1kc7rwwsd7ppgbvywf6i8lchjwbxjisfl1kmilwsb166yr";
   };
 
   propagatedBuildInputs = [ mopidy ];

From 846fa0b7e45991513da4ff037006b1ec46a72eec Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sun, 31 May 2015 20:08:38 -0400
Subject: [PATCH 0576/2322] mopidy-mopify: 1.4.1 -> 1.5.1

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

diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix
index 4616d3f7c64..770a1a79556 100644
--- a/pkgs/applications/audio/mopidy-mopify/default.nix
+++ b/pkgs/applications/audio/mopidy-mopify/default.nix
@@ -3,11 +3,11 @@
 pythonPackages.buildPythonPackage rec {
   name = "mopidy-mopify-${version}";
 
-  version = "1.4.1";
+  version = "1.5.1";
 
   src = fetchurl {
     url = "https://github.com/dirkgroenen/mopidy-mopify/archive/${version}.tar.gz";
-    sha256 = "1i752vnkgqfps5vym63rbsh1xm141z8r68d80bi076zr6zbzdjj9";
+    sha256 = "0hhdss4i5436dj37pndxk81a4g3g8f6zqjyv04lhpqcww01290as";
   };
 
   propagatedBuildInputs = [ mopidy ];

From 5de70f7badd9c5728e3c0e611852861b4018fb39 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sun, 31 May 2015 20:10:37 -0400
Subject: [PATCH 0577/2322] mopidy-spotify: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix
index 14818e60cca..8b67f38390e 100644
--- a/pkgs/applications/audio/mopidy-spotify/default.nix
+++ b/pkgs/applications/audio/mopidy-spotify/default.nix
@@ -2,12 +2,11 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "mopidy-spotify-${version}";
-
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz";
-    sha256 = "0pwgg9xw86sjhv6w735fm0k81v0lv3gqlidgw90hr47hc4wajnzx";
+    sha256 = "0cf97z9vnnp5l77xhwvmkbkqgpj5gwnm1pipiy66lbk4gn6va4z4";
   };
 
   propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ];

From 75f64a8bc4c112bb7a71409aea84c0bd05114356 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sun, 31 May 2015 20:28:31 -0400
Subject: [PATCH 0578/2322] tcpdump: 4.7.3 -> 4.7.4

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

diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index 231d7e293b8..4edfdf6af1e 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpcap, enableStatic ? false }:
 
 stdenv.mkDerivation rec {
-  name = "tcpdump-4.7.3";
+  name = "tcpdump-4.7.4";
 
   src = fetchurl {
     url = "http://www.tcpdump.org/release/${name}.tar.gz";
-    sha256 = "1kla3l7lja8cfwimp512x7z176x2dsy03ih6g8gd95p95ijzp1qz";
+    sha256 = "1byr8w6grk08fsq0444jmcz9ar89lq9nf4mjq2cny0w9k8k21rbb";
   };
 
   buildInputs = [ libpcap ];

From 7d42461e5d6d76d56b5de997d4e425c648f0cfc7 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sun, 31 May 2015 20:35:10 -0400
Subject: [PATCH 0579/2322] ncmpcpp: 0.6.3 -> 0.6.4

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

diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix
index bf437584559..5069795cafe 100644
--- a/pkgs/applications/audio/ncmpcpp/default.nix
+++ b/pkgs/applications/audio/ncmpcpp/default.nix
@@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "ncmpcpp-${version}";
-  version = "0.6.3";
+  version = "0.6.4";
 
   src = fetchurl {
     url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
-    sha256 = "00r2f7psd2jym2lxf3q3lz2lskz7091pz9glnxqam2bznwnlyxyp";
+    sha256 = "1w85r23s0b30vh03xybnjikslqcf02gsciib9v10jw71nw32wzkm";
   };
 
   configureFlags = [ "BOOST_LIB_SUFFIX=" ]
@@ -30,7 +30,9 @@ stdenv.mkDerivation rec {
     ++ optional curlSupport "--with-curl"
     ++ optional taglibSupport "--with-taglib";
 
-  buildInputs = [ boost mpd_clientlib ncurses pkgconfig readline libiconv ]
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ boost mpd_clientlib ncurses readline libiconv ]
     ++ optional curlSupport curl
     ++ optional visualizerSupport fftw
     ++ optional taglibSupport taglib;

From 987fb76dc1f991c6a7ffb12950884ead74895249 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sun, 31 May 2015 20:45:42 -0400
Subject: [PATCH 0580/2322] youtube-dl: 2015.05.20 -> 2015.05.29

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 5171d5cec5a..1a513cdaece 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
-  version = "2015.05.20";
+  version = "2015.05.29";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1crfada7vq3d24062wr06sfam66cf14j06wnhg7w5ljzrbynvpll";
+    sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij";
   };
 
   nativeBuildInputs = [ pandoc ];

From fbf7ff8b7f4f98ec758b35dc170e42fc23200159 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 1 Jun 2015 02:14:59 +0200
Subject: [PATCH 0581/2322] stress-ng 0.04.03 -> 0.04.03

---
 pkgs/tools/system/stress-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index e624991dc42..ebe6306120e 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, attr }:
 
-let version = "0.04.03"; in
+let version = "0.04.04"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "0slr7mk8yq9h8xsrmp6ysjhng0an30pj6p56q9ygabwymbp1a33l";
+    sha256 = "1rq78s4xrylm63xygakrvjg5g774qmm968p0v69x2c795dv3s8di";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  installFlags = [ "DESTDIR=$(out)" ];
+  installFlags = "DESTDIR=$(out)";
 
   meta = with stdenv.lib; {
     inherit version;

From 484e903da31e47d4db068419f418b1389a389f2e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 1 Jun 2015 04:00:43 +0200
Subject: [PATCH 0582/2322] vim-plugins: vim-wakatime -> 4.0.1

- upgrade wakatime cli to v4.0.14
- make sure config file has api_key
- only display setup complete message first time setting up cfg file
- don't log time towards git temporary files
- prevent slowness in quickfix window to fix #24
- reuse SSL connection across multiple processes for improved performance
- correctly display caller and lineno in log file when debug is true
- project passed with --project argument will always be used
- new --alternate-project argument
- fix bug with auto detecting project name
- correctly log message from py.warnings module
- handle plugin_directory containing spaces
---
 pkgs/misc/vim-plugins/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 0ff38209867..a1a78e9fb64 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -527,12 +527,12 @@ rec {
     '';
   };
 
-  wakatime = buildVimPlugin {
-    name = "wakatime-4.0.0";
+  vim-wakatime = buildVimPlugin {
+    name = "vim-wakatime-4.0.1";
 
     src = fetchFromGitHub {
-      sha256 = "0yfqcln1ah7a9hs6vl8llfyg5rzg1zbsf3y431wdgb0zvp9dlk25";
-      rev = "a7d48d3507499b8667bfca0b12f8865c01b26678";
+      sha256 = "0vhnfjl9qv6qwfvf106cw4mg4xss2nsafz5k2jadkryss6f3ga10";
+      rev = "1e2ba90f708965719ed52c4ea2728bc3cfa32f6d";
       repo = "vim-wakatime";
       owner = "wakatime";
     };

From cf8ea81fe4bd933abc8226e771dea44f2b533b90 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 1 Jun 2015 02:21:42 +0200
Subject: [PATCH 0583/2322] dpkg 1.18.0 -> 1.18.1

---
 pkgs/tools/package-management/dpkg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index d3a08f044d5..e5be41ed7f6 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }:
 
-let version = "1.18.0"; in
+let version = "1.18.1"; in
 
 stdenv.mkDerivation {
   name = "dpkg-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
-    sha256 = "0ni25w0cxfz3szccqxq7l1gvcwg48vdvl63aajmbigsvxnz6y5bv";
+    sha256 = "1nlr0djn5zl9cmlcxxmd7dk3fx0zw9gi4qm7cfz0r5qwl9yaj9nb";
   };
 
   postPatch = ''

From 8c4bf0f93184e5d836ef806e7d967f66e89c3168 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 1 Jun 2015 02:19:11 +0200
Subject: [PATCH 0584/2322] python-packages: prompt_toolkit 0.37 -> 0.38

---
 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 c284839fb37..ab452a562d9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8722,11 +8722,11 @@ let
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "0.37";
+    version = "0.38";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
-      sha256 = "0nb87j4dgv16wf998ga8ia4fwd3p9wizrx3m7h0rwqcpn2x0l3v8";
+      sha256 = "0rjy5n79h8sc6wpw6nwys52rin7i4qlfy51y7vws303mficjkvkc";
     };
 
     buildInputs = with self; [ jedi ipython pygments ];

From 13cc88f273f0cb6d13e39ecf61775c29dde6d21c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 1 Jun 2015 04:09:30 +0200
Subject: [PATCH 0585/2322] netsniff-ng -> 0.5.9-5-g107456c

Provides more detailed rtnl dumps.
---
 pkgs/tools/networking/netsniff-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index c391bb9ecb0..44c8bb45b72 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -2,7 +2,7 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-let version = "0.5.9"; in
+let version = "0.5.9-5-g107456c"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "9118e9e8673eb88ebf4f7af33d8ed9856f3ed554";
-    sha256 = "0zxwkpaad0mjgkhgnii4bj8sfji3inqqf1zqbv7807nk34bqr6qp";
+    rev = "107456c646ab38e5ccb6ee788389faced59c16ff";
+    sha256 = "0i0b2595x4cprf9d4crwjn3qvswz2qxr905zpcwxa3qan6hrmnsp";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

From b4a99530d1d9028f7b174bea3570885730dfd0ff Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sun, 31 May 2015 22:39:02 -0400
Subject: [PATCH 0586/2322] cookies: add python package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ab452a562d9..db4c2e70c92 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2008,6 +2008,23 @@ let
     };
   };
 
+  cookies = buildPythonPackage rec {
+    name = "cookies-2.2.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/c/cookies/${name}.tar.gz";
+      sha256 = "13pfndz8vbk4p2a44cfbjsypjarkrall71pgc97glk5fiiw9idnn";
+    };
+
+    doCheck = false;
+
+    meta = {
+      description = "Friendlier RFC 6265-compliant cookie parser/renderer";
+      homepage = https://github.com/sashahart/cookies;
+      license = licenses.mit;
+    };
+  };
+
   coverage = buildPythonPackage rec {
     name = "coverage-3.7.1";
 

From f70582e3341d84d3715d09d6d1a277be7d652c1c Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sun, 31 May 2015 22:42:53 -0400
Subject: [PATCH 0587/2322] responses: 0.2.2 -> 0.4.0

---
 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 db4c2e70c92..8805c49ead3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1057,17 +1057,17 @@ let
   };
 
   responses = self.buildPythonPackage rec {
-    name = "responses-0.2.2";
-
-    propagatedBuildInputs = with self; [ requests mock six pytest flake8 ];
-
-    doCheck = false;
+    name = "responses-0.4.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/responses/responses-0.2.2.tar.gz";
-      md5 = "5d79fd425cf8d858dfc8afa6475395d3";
+      url = "https://pypi.python.org/packages/source/r/responses/${name}.tar.gz";
+      sha256 = "0fs7a4cf4f12mjhcjd5vfh0f3ixcy2nawzxpgsfr3ahf0rg7ppx5";
     };
 
+    propagatedBuildInputs = with self; [ cookies mock requests2 six ];
+
+    doCheck = false;
+
   };
 
   rarfile = self.buildPythonPackage rec {

From cdf49bb47af6809ed3c51fa991c63233a0a602f5 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sun, 31 May 2015 22:47:31 -0400
Subject: [PATCH 0588/2322] requests2: 2.6.0 -> 2.7.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8805c49ead3..3327ed44a9d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10584,16 +10584,17 @@ let
 
   requests2 = buildPythonPackage rec {
     name = "requests-${version}";
-    version = "2.6.0";
+    version = "2.7.0";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz";
-      sha256 = "0xadnw27m257scrhjcc66zm4z3ikg8n9h6g9akpkavr31qgyvnqw";
+      sha256 = "0gdr9dxm24amxpbyqpbh3lbwxc2i42hnqv50sigx568qssv3v2ir";
     };
 
     meta = {
       description = "An Apache2 licensed HTTP library, written in Python, for human beings";
       homepage = http://docs.python-requests.org/en/latest/;
+      license = licenses.asl20;
     };
   };
 

From b49026ee98a7def8bb731c72b36ef33187648d78 Mon Sep 17 00:00:00 2001
From: "Ryan Scheel (Havvy)" <ryan.havvy@gmail.com>
Date: Mon, 1 Jun 2015 05:17:59 +0200
Subject: [PATCH 0589/2322] Added: Havvy as maintainer for iojs/nodejs.

---
 lib/maintainers.nix                     | 1 +
 pkgs/development/web/iojs/default.nix   | 1 +
 pkgs/development/web/nodejs/default.nix | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 059bfaecbb4..ee7f3eb873e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -93,6 +93,7 @@
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
   gridaphobe = "Eric Seidel <eric@seidel.io>";
   guibert = "David Guibert <david.guibert@gmail.com>";
+  havvy = "Ryan Scheel <ryan.havvy@gmail.com>";
   hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>";
   henrytill = "Henry Till <henrytill@gmail.com>";
   hinton = "Tom Hinton <t@larkery.com>";
diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix
index b3b9881559d..2fa2c0ddac5 100644
--- a/pkgs/development/web/iojs/default.nix
+++ b/pkgs/development/web/iojs/default.nix
@@ -31,5 +31,6 @@ in stdenv.mkDerivation {
     homepage = https://iojs.org/;
     license = licenses.mit;
     platforms = platforms.linux;
+    maintainers = [ maintainers.havvy ];
   };
 }
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 56b8e952e80..f91a7c3b41d 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -62,7 +62,7 @@ in stdenv.mkDerivation {
     description = "Event-driven I/O framework for the V8 JavaScript engine";
     homepage = http://nodejs.org;
     license = licenses.mit;
-    maintainers = [ maintainers.goibhniu maintainers.shlevy ];
+    maintainers = [ maintainers.goibhniu maintainers.shlevy maintainers.havvy ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }

From dd6946dcbba7e5501c2d7ac4f89641520c137d1e Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Sun, 31 May 2015 23:51:04 -0400
Subject: [PATCH 0590/2322] beets: 1.3.11 -> 1.3.13

---
 pkgs/tools/audio/beets/default.nix | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index dc859b49736..0af0b427bf2 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, writeScript, glibcLocales
-, buildPythonPackage, pythonPackages, python
+, buildPythonPackage, pythonPackages, python, imagemagick
 
 , enableAcoustid   ? true
 , enableDiscogs    ? true
@@ -45,8 +45,9 @@ let
     "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "embedart"
     "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate"
     "importadded" "importfeeds" "info" "inline" "keyfinder" "lyrics"
-    "mbcollection" "mbsync" "missing" "permissions" "play" "plexupdate" "random"
-    "rewrite" "scrub" "smartplaylist" "spotify" "the" "types" "zero"
+    "mbcollection" "mbsync" "metasync" "missing" "permissions" "play"
+    "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the"
+    "types" "zero"
   ];
 
   enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins);
@@ -59,18 +60,19 @@ let
 
 in buildPythonPackage rec {
   name = "beets-${version}";
-  version = "1.3.11";
+  version = "1.3.13";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "sampsyo";
     repo = "beets";
     rev = "v${version}";
-    sha256 = "16jb1frds9vl40n9hy18x9xipxfzln3ym823vx8jymhv3by8p62m";
+    sha256 = "05gnp0y3n1jl7fnyslx56x2lsp8f4mv3xwy7gbyghax0vs3ccfvl";
   };
 
   propagatedBuildInputs = [
     pythonPackages.enum34
+    pythonPackages.jellyfish
     pythonPackages.munkres
     pythonPackages.musicbrainzngs
     pythonPackages.mutagen
@@ -91,13 +93,10 @@ in buildPythonPackage rec {
 
   buildInputs = with pythonPackages; [
     beautifulsoup4
-    flask
+    imagemagick
     mock
     nose
-    pyechonest
-    pylast
     rarfile
-    requests2
     responses
   ];
 
@@ -165,9 +164,9 @@ in buildPythonPackage rec {
   '';
 
   meta = {
-    homepage = http://beets.radbox.org;
     description = "Music tagger and library organizer";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ iElectric aszlig pjones ];
+    homepage = http://beets.radbox.org;
+    license = licenses.mit;
+    maintainers = with maintainers; [ aszlig iElectric pjones ];
   };
 }

From 28bfbb55626085717f258f2abcffba51f921a1ac Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 22 May 2015 08:42:20 +0200
Subject: [PATCH 0591/2322] why3: update from 0.85 to 0.86.1

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

diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index 228d1a7c4d4..d1fb853ee9e 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   name    = "why3-${version}";
-  version = "0.85";
+  version = "0.86.1";
 
   src = fetchurl {
-    url    = "https://gforge.inria.fr/frs/download.php/34074/why3-0.85.tar.gz";
-    sha256 = "0sj1pd50lqvnvyss1f8ysgigdi64s91rrpdrmp7crmcy1npa8apf";
+    url    = https://gforge.inria.fr/frs/download.php/file/34797/why3-0.86.1.tar.gz;
+    sha256 = "129kzq79n8h480zrlphgh1ixvwp3wm18nbcky9bp4wdnr6zaibd7";
   };
 
   buildInputs = with ocamlPackages;
-    [ coq coq.camlp5 ocaml findlib lablgtk ocamlgraph zarith ];
+    [ coq coq.camlp5 ocaml findlib lablgtk ocamlgraph zarith menhir ];
 
   meta = with stdenv.lib; {
     description = "A platform for deductive program verification";

From a53ca334d67cf62e01ece7431215f41a3ddbca41 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Mon, 1 Jun 2015 01:27:46 -0400
Subject: [PATCH 0592/2322] libsass: 3.2.2 -> 3.2.4

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

diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index 69bae8abfeb..356891e7351 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libsass-${version}";
-  version = "3.2.2";
+  version = "3.2.4";
 
   src = fetchurl {
     url = "https://github.com/sass/libsass/archive/${version}.tar.gz";
-    sha256 = "022rvsnqslds1ss6ls1x1w93mrhq7nigd00wjlnd07qhfqpbnwax";
+    sha256 = "1v804r7k0iv97ihlr46hwfw88v874kfklsm616b85yzdz0105i8h";
   };
 
   patchPhase = ''
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     description = "A C/C++ implementation of a Sass compiler";
     homepage = https://github.com/sass/libsass;
     license = licenses.mit;
-    maintainers = with maintainers; [ offline ];
+    maintainers = with maintainers; [ codyopel offline ];
     platforms = platforms.unix;
   };
 }

From fcf850c99e2b0b2cc65980e8e13aa5226f55ba70 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Mon, 1 Jun 2015 01:28:18 -0400
Subject: [PATCH 0593/2322] sassc: 3.2.1 -> 3.2.4

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

diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix
index 451ee3a719c..256bd93f1ab 100644
--- a/pkgs/development/tools/sassc/default.nix
+++ b/pkgs/development/tools/sassc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sassc-${version}";
-  version = "3.2.1";
+  version = "3.2.4";
 
   src = fetchurl {
     url = "https://github.com/sass/sassc/archive/${version}.tar.gz";
-    sha256 = "18pp7ylcwfvfagvnpw660cdvv7cjl7pl9v8x7xr05fp2l6133rxw";
+    sha256 = "0ksdfv9ff5smba4vbwr1wqf3bp908rnprkp6lfssj85h9ciqq896";
   };
 
   patchPhase = ''
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     description = "A front-end for libsass";
     homepage = https://github.com/sass/sassc/;
     license = licenses.mit;
-    maintainers = with maintainers; [ pjones ];
+    maintainers = with maintainers; [ codyopel pjones ];
     platforms = platforms.unix;
   };
 }

From 8bea2bc5bb66dc1d9b916a6b41e9e3aa18a9247e Mon Sep 17 00:00:00 2001
From: Pavan Rikhi <pavan.rikhi+agit@gmail.com>
Date: Fri, 29 May 2015 04:41:30 -0400
Subject: [PATCH 0594/2322] pencil: v2.0.10 -> v2.0.11

---
 pkgs/applications/graphics/pencil/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index fc1b5795d40..e6e72cfd6e6 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchurl, xulrunner }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.10";
+  version = "2.0.11";
   name = "pencil-${version}";
 
   src = fetchurl {
     url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz";
-    sha256 = "b5dcb12986108bf3eb13cdd1ee1fc1f8d1a88c7fadf2a5c44e7a59a254f2b0dd";
+    sha256 = "a35d1353de6665cbd4a5bd821dcdf7439f2a3c1fcbccee0f01ec8dd1bb67c4f3";
+
   };
 
   buildPhase = "";

From 7edb27b7af6ebff7e35207f7fcf16e0e2bd8884a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 May 2015 14:47:08 +0200
Subject: [PATCH 0595/2322] Hide the option fonts.enableCoreFonts

We shouldn't have options that simply enable a package.
---
 nixos/modules/config/fonts/corefonts.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/config/fonts/corefonts.nix b/nixos/modules/config/fonts/corefonts.nix
index ad797087932..b9f69879a10 100644
--- a/nixos/modules/config/fonts/corefonts.nix
+++ b/nixos/modules/config/fonts/corefonts.nix
@@ -1,3 +1,6 @@
+# This module is deprecated, since you can just say ‘fonts.fonts = [
+# pkgs.corefonts ];’ instead.
+
 { config, lib, pkgs, ... }:
 
 with lib;
@@ -9,6 +12,7 @@ with lib;
     fonts = {
 
       enableCoreFonts = mkOption {
+        visible = false;
         default = false;
         description = ''
           Whether to include Microsoft's proprietary Core Fonts.  These fonts

From 5afa4f18d6173725d593e59f1c4a8f54b575f9fe Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 1 Jun 2015 01:49:57 -0700
Subject: [PATCH 0596/2322] qemu-nix: Build statically

---
 pkgs/applications/virtualization/qemu/default.nix | 10 +++++++---
 pkgs/development/libraries/glib/default.nix       |  7 +++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 0d57a8d9f57..f04ff311930 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -41,7 +41,7 @@ let
   optLibuuid = if isNix then null else shouldUsePkg libuuid;
   optVde2 = if isNix then null else shouldUsePkg vde2;
   optLibaio = shouldUsePkg libaio;
-  optLibcap_ng = shouldUsePkg libcap_ng;
+  optLibcap_ng = if isNix then null else shouldUsePkg libcap_ng;
   optSpice = if isNix then null else shouldUsePkg spice;
   optSpice_protocol = if isNix then null else shouldUsePkg spice_protocol;
   optLibceph = if isNix then null else shouldUsePkg libceph;
@@ -95,6 +95,8 @@ let
   targetList = if stdenv.system == "x86_64-linux" then "x86_64-softmmu,i386-softmmu"
     else if stdenv.system == "i686-linux" then "i386-softmmu"
     else null;
+
+  hasModules = if isNix then null else true;
 in
 
 stdenv.mkDerivation rec {
@@ -138,7 +140,7 @@ stdenv.mkDerivation rec {
     (mkOther                          "smbd"                "smbd")
     (mkOther                          "sysconfdir"          "/etc")
     (mkOther                          "localstatedir"       "/var")
-    (mkEnable true                    "modules"             null)
+    (mkEnable hasModules              "modules"             null)
     (mkEnable false                   "debug-tcg"           null)
     (mkEnable false                   "debug-info"          null)
     (mkEnable false                   "sparse"              null)
@@ -167,7 +169,7 @@ stdenv.mkDerivation rec {
     (mkEnable (!isNix)                "system"              null)
     (mkEnable (!isKvmOnly)            "user"                null)
     (mkEnable (!isKvmOnly)            "guest-base"          null)
-    (mkEnable true                    "pie"                 null)
+    (mkEnable (!isNix)                "pie"                 null)
     (mkEnable (optLibuuid != null)    "uuid"                null)
     (mkEnable (optVde2 != null)       "vde"                 null)
     (mkEnable false                   "netmap"              null)  # TODO(wkennington): Add Support
@@ -199,6 +201,8 @@ stdenv.mkDerivation rec {
     (mkEnable (optNumactl != null)    "numa"                null)
   ] ++ optionals isKvmOnly [
     (mkOther                          "target-list"         targetList)
+  ] ++ optionals isNix [
+    "--static"
   ];
 
   installFlags = [
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 7d61bea64e1..518d713026a 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -63,8 +63,9 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ pcre zlib libffi libiconv ]
     ++ libintlOrEmpty;
 
-  configureFlags =
-    optional stdenv.isDarwin "--disable-compile-warnings"
+  # Static is necessary for qemu-nix to support static userspace translators
+  configureFlags = [ "--enable-static" ]
+    ++ optional stdenv.isDarwin "--disable-compile-warnings"
     ++ optional stdenv.isSunOS "--disable-modular-tests";
 
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
@@ -75,6 +76,8 @@ stdenv.mkDerivation rec {
       export MACOSX_DEPLOYMENT_TARGET=
     '';
 
+  dontDisableStatic = true;
+
   enableParallelBuilding = true;
   DETERMINISTIC_BUILD = 1;
 

From 98e698fad2b7bc992d1320bcaf29d1a98ee0cd8b Mon Sep 17 00:00:00 2001
From: _1126 <mail@elfsechsundzwanzig.de>
Date: Mon, 1 Jun 2015 10:58:01 +0200
Subject: [PATCH 0597/2322] maintainers: change of nickname.

---
 lib/maintainers.nix                                   | 2 +-
 pkgs/applications/audio/caudec/default.nix            | 2 +-
 pkgs/applications/audio/ncmpc/default.nix             | 2 +-
 pkgs/applications/audio/pamixer/default.nix           | 2 +-
 pkgs/applications/misc/rofi/pass.nix                  | 2 +-
 pkgs/applications/window-managers/stumpwm/default.nix | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 059bfaecbb4..fb39e174b0b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -4,7 +4,6 @@
   /* Add your name and email address here.  Keep the list
      alphabetically sorted.  */
 
-  _1126 = "Christian Lask <mail@elfsechsundzwanzig.de>";
   abaldeau = "Andreas Baldeau <andreas@baldeau.net>";
   abbradar = "Nikolay Amiantov <ab@fmap.me>";
   aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
@@ -95,6 +94,7 @@
   guibert = "David Guibert <david.guibert@gmail.com>";
   hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>";
   henrytill = "Henry Till <henrytill@gmail.com>";
+  hiberno = "Christian Lask <mail@elfsechsundzwanzig.de>";
   hinton = "Tom Hinton <t@larkery.com>";
   hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";
   iand675 = "Ian Duncan <ian@iankduncan.com>";
diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix
index 24613d4dd96..978dd27facd 100644
--- a/pkgs/applications/audio/caudec/default.nix
+++ b/pkgs/applications/audio/caudec/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
     description = "A multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)";
     license     = licenses.gpl3;
     platforms   = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ _1126 ];
+    maintainers = with maintainers; [ hiberno ];
   };
 }
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index b5f84f536d0..6c53d1fe755 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "Curses-based interface for MPD (music player daemon)";
     homepage    = http://www.musicpd.org/clients/ncmpc/;
     license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ _1126 ];
+    maintainers = with maintainers; [ hiberno ];
     platforms   = platforms.all;
   };
 }
diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix
index 31353cec6a9..c2d32ea3dad 100644
--- a/pkgs/applications/audio/pamixer/default.nix
+++ b/pkgs/applications/audio/pamixer/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://github.com/cdemoulins/pamixer;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ _1126 ];
+    maintainers = with maintainers; [ hiberno ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix
index e20c511be91..c6b5666921c 100644
--- a/pkgs/applications/misc/rofi/pass.nix
+++ b/pkgs/applications/misc/rofi/pass.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
   meta = {
       description = "A script to make rofi work with password-store";
       homepage = https://github.com/carnager/rofi-pass;
-      maintainers = [stdenv.lib.maintainers._1126];
+      maintainers = [stdenv.lib.maintainers.hiberno];
   };
 }
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index fe62b8250ae..d44ac128d80 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     description = "A tiling window manager for X11";
     homepage    = https://github.com/stumpwm/;
     license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ _1126 the-kenny ];
+    maintainers = with maintainers; [ hiberno the-kenny ];
     platforms   = platforms.linux;
   };
 }

From 3aee39bb83337b586d0be702eb5dababc5f7ef29 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 12:39:32 +0200
Subject: [PATCH 0598/2322] openssl: Fix removal of the ssl/misc scripts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This drops the dependency of $out on Perl.

(cherry picked from commit a5fb18473e4178221e6a7a2264308678bd8234e3)
Signed-off-by: Domen Kožar <domen@dev.si>

Conflicts:
	pkgs/development/libraries/openssl/default.nix
---
 pkgs/development/libraries/openssl/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 68ddcb68f47..d475f7ae833 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -58,6 +58,9 @@ stdenv.mkDerivation {
       if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib)" ]; then
           rm $out/lib/*.a
       fi
+
+      # remove dependency on Perl at runtime
+      rm -rf $out/etc/ssl/misc
     ''; # */
 
   crossAttrs = {

From 4d70496ebb38796fea4f5c81079e031efb3fd959 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 1 Jun 2015 12:07:46 +0200
Subject: [PATCH 0599/2322] sails: don't treat warnings as errors to fix the
 build

Reported upstream as kragniz/sails/issues/18
---
 pkgs/misc/sails/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/misc/sails/default.nix b/pkgs/misc/sails/default.nix
index f6ccbf9ec76..ed965f73b92 100644
--- a/pkgs/misc/sails/default.nix
+++ b/pkgs/misc/sails/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake pkgconfig gtk3 librsvg ];
 
+  NIX_CFLAGS_COMPILE = "-Wno-error";
+
   meta = with stdenv.lib; {
     description = "Simulator for autonomous sailing boats";
     homepage = https://github.com/kragniz/sails;

From d866d4616dc41dac93f3c6c90383c205dae7e10a Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Mon, 1 Jun 2015 06:56:42 -0400
Subject: [PATCH 0600/2322] musescore: 2.0.0 -> 2.0.1

---
 pkgs/applications/audio/musescore/default.nix | 40 ++++++++++++++-----
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 9dbebe31a38..bfbfa577531 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -1,27 +1,47 @@
-{ stdenv, fetchurl, makeWrapper, cmake, qt5, pkgconfig, alsaLib, portaudio, jack2
-, lame, libsndfile, libvorbis }:
+{ stdenv, fetchurl, cmake, pkgconfig
+, alsaLib, freetype, jack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
+, portaudio, qt5 #, tesseract
+}:
 
 stdenv.mkDerivation rec {
   name = "musescore-${version}";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchurl {
     url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz";
-    sha256 = "1a4fz9pqwz59brfa7qn61364hyd07lsq3lflkzn1w2q21d7xd20w";
+    sha256 = "0n4xk35jggdq2dcizqjq1kdpclih4scpl93ymmxahvfa1vvwn5iw";
   };
 
-  buildInputs = [
-    makeWrapper cmake qt5.base pkgconfig alsaLib portaudio jack2 lame libsndfile libvorbis
+  makeFlags = [
+    "PREFIX=$(out)"
   ];
 
-  patchPhase = ''
-    sed s,"/usr/local",$out, -i Makefile
+  cmakeFlags = [
+    "-DAEOLUS=OFF"
+    "-DZERBERUS=ON"
+    "-DOSC=ON=ON"
+    "-DOMR=OFF" # TODO: add OMR support, CLEF_G not declared error
+    "-DOCR=OFF" # Not necessary without OMR
+    "-DSOUNDFONT3=ON"
+    "-DHAS_AUDIOFILE=ON"
+    "-DBUILD_JACK=ON"
+  ];
+
+  preBuild = ''
+    make lupdate
+    make lrelease
   '';
 
-  preBuild = "make lrelease";
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [
+    alsaLib jack2 freetype lame libogg libpulseaudio libsndfile libvorbis
+    portaudio qt5.base qt5.declarative qt5.enginio qt5.script qt5.svg qt5.tools
+    qt5.webkit qt5.xmlpatterns #tesseract
+  ];
 
   meta = with stdenv.lib; {
-    description = "Qt-based score editor";
+    description = "Music notation and composition software";
     homepage = http://musescore.org/;
     license = licenses.gpl2;
     platforms = platforms.linux;

From 3400fa038f8ef79690100d10eb9110e2fe264cee Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Mon, 1 Jun 2015 07:08:21 -0400
Subject: [PATCH 0601/2322] rtmpdump_gnutls: add missing lib nettle & use git
 date format

Close #8112.
---
 pkgs/tools/video/rtmpdump/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix
index 29f2a1c448d..9987d697cf0 100644
--- a/pkgs/tools/video/rtmpdump/default.nix
+++ b/pkgs/tools/video/rtmpdump/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchgit, zlib
-, gnutlsSupport ? false, gnutls ? null
+, gnutlsSupport ? false, gnutls ? null, nettle ? null
 , opensslSupport ? true, openssl ? null
 }:
 
 # Must have an ssl library enabled
 assert (gnutlsSupport || opensslSupport);
-assert gnutlsSupport -> ((gnutlsSupport != null) && (!opensslSupport));
-assert opensslSupport -> ((openssl != null) && (!gnutlsSupport));
+assert gnutlsSupport -> gnutlsSupport != null && nettle != null && !opensslSupport;
+assert opensslSupport -> openssl != null && !gnutlsSupport;
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "rtmpdump-${version}";
-  version = "2.4";
+  version = "2015-01-15";
 
   src = fetchgit {
     url = git://git.ffmpeg.org/rtmpdump;
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.cc.isClang "CC=clang";
 
   propagatedBuildInputs = [ zlib ]
-    ++ optional gnutlsSupport gnutls
+    ++ optionals gnutlsSupport [ gnutls nettle ]
     ++ optional opensslSupport openssl;
 
   meta = {

From 4f0d8460c0fa2328763c847a44ed1deb8dc047e0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jun 2015 14:43:40 +0200
Subject: [PATCH 0602/2322] nixos release notes: add an item about Haskell NG

---
 nixos/doc/manual/release-notes/rl-unstable.xml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 755b4bf4154..837fdf07cec 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -8,9 +8,21 @@
 
 <para>In addition to numerous new and upgraded packages, this release has the following highlights:
 
-<!--<itemizedlist>
+  <itemizedlist>
+    <listitem>
+      <para>
+        The Haskell packages infrastructure has been re-designed from the ground up.
+        NixOS now distributes the latest version of every single package registered on
+        <link xlink:href="http://hackage.haskell.org/">Hackage</link>, i.e. well over
+        8000 Haskell packages. Further information and usage instructions for the
+        improved infrastructure are available at <link
+        xlink:href="https://nixos.org/wiki/Haskell">https://nixos.org/wiki/Haskell</link>.
+        Users migrating from an earlier release will find also find helpful information
+        below, in the list of backwards-incompatible changes.
+      </para>
+    </listitem>
+  </itemizedlist>
 
-</itemizedlist>-->
 </para>
 
 <para>Following new services were added since the last release:

From d4412bf6c45ee5d4f9b00fed58c2ce15b783ce62 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jun 2015 15:19:53 +0200
Subject: [PATCH 0603/2322] nixos release notes: document incompatible changes
 due to Haskell NG

---
 .../doc/manual/release-notes/rl-unstable.xml  | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 837fdf07cec..a7ba1cb1ff5 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -83,6 +83,64 @@ was accordingly renamed to <literal>bomi</literal>
   </para>
 </listitem>
 
+<listitem>
+  <para>
+    Haskell packages can no longer be found by name, i.e. the commands
+    <literal>nix-env -qa cabal-install</literal> and <literal>nix-env -i
+    ghc</literal> will fail, even though we <emphasis>do</emphasis> ship
+    both <literal>cabal-install</literal> and <literal>ghc</literal>.
+    The reason for this inconvenience is the sheer size of the Haskell
+    package set: name-based lookups such as these would become much
+    slower than they are today if we'd add the entire Hackage database
+    into the top level attribute set. Instead, the list of Haskell
+    packages can be displayed by
+  </para>
+  <programlisting>
+nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A haskellPackages
+</programlisting>
+  <para>
+    and packages can be installed with:
+  </para>
+  <programlisting>
+nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.cabal-install
+</programlisting>
+</listitem>
+
+<listitem>
+  <para>
+    Previous versions of NixOS come with a feature called
+    <literal>ghc-wrapper</literal>, a small wrapper script that allows
+    GHC to transparently pick up on libraries installed in the user's
+    profile. This feature has been deprecated;
+    <literal>ghc-wrapper</literal> was removed from the distribution.
+    The proper way to register Haskell libraries with the compiler now
+    is the <literal>haskellPackages.ghcWithPackages</literal>
+    function.
+    <link xlink:href="https://nixos.org/wiki/Haskell">https://nixos.org/wiki/Haskell</link>
+    provides much information about this subject.
+  </para>
+</listitem>
+
+<listitem>
+  <para>
+    All Haskell builds that have been generated with version 1.x of
+    the <literal>cabal2nix</literal> utility are now invalid and need
+    to be re-generated with a current version of
+    <literal>cabal2nix</literal> to function. The most recent version
+    of this tool can be installed by running
+    <literal>nix-env -i cabal2nix</literal>.
+  </para>
+</listitem>
+
+<listitem>
+  <para>
+    The <literal>haskellPackages</literal> set in Nixpkgs used to have a
+    function attribute called <literal>extension</literal> that users
+    could override in their <literal>~/.nixpkgs/config.nix</literal>
+    files to configure additional attributes, etc. That function still
+    exists, but it's now called <literal>overrides</literal>.
+  </para>
+</listitem>
 
 </itemizedlist>
 </para>

From 789f20eba860b769d7153afab42a70fe50688185 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jun 2015 15:20:18 +0200
Subject: [PATCH 0604/2322] nixos release notes: document new
 services.openssh.moduliFile option

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

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index a7ba1cb1ff5..cf67014a69d 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -21,6 +21,17 @@
         below, in the list of backwards-incompatible changes.
       </para>
     </listitem>
+
+    <listitem>
+      <para>
+        Users running an SSH server who worry about the quality of their
+        <literal>/etc/ssh/moduli</literal> file with respect to the <link
+        xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html">vulnerabilities
+        discovered in the Diffie-Hellman key exchange</link> can now replace OpenSSH's
+        default version with one they generated themselves using the new
+        <literal>services.openssh.moduliFile</literal> option.
+      </para>
+    </listitem>
   </itemizedlist>
 
 </para>

From 9cb7239f1283c5a8d2498bef4e2ff1d6009946b2 Mon Sep 17 00:00:00 2001
From: "Ryan Scheel (Havvy)" <ryan.havvy@gmail.com>
Date: Mon, 1 Jun 2015 15:34:31 +0200
Subject: [PATCH 0605/2322] Update iojs to v.2.2.1

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

diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix
index 2fa2c0ddac5..2ed6e1adade 100644
--- a/pkgs/development/web/iojs/default.nix
+++ b/pkgs/development/web/iojs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }:
 
 let
-  version = "2.1.0";
+  version = "2.2.1";
   inherit (stdenv.lib) optional maintainers licenses platforms;
 in stdenv.mkDerivation {
   name = "iojs-${version}";
 
   src = fetchurl {
     url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
-    sha256 = "0v6jzsrq3ym0nqy7nb9chn8ij79agifwdvsp5nysgr609na7617i";
+    sha256 = "1ylmj69nwhqqwn1grphlrzny9dp4bspx4172q41izr6dyk29rrsm";
   };
 
   prePatch = ''

From 0645f5eab7b98e57cbbf51cab7fc77b4762b44b7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 15:28:05 +0200
Subject: [PATCH 0606/2322] samba: Revert style changes and get rid of some
 dependencies

Packages like glusterfs are now optional dependencies. A bunch of
dependencies like subunit are gone: as far as I can tell, these are
only used by Samba's test suite, which we're not even running, so
they're pointless.

Fixes #8067.
---
 pkgs/os-specific/gnu/default.nix |   3 +-
 pkgs/servers/samba/4.x.nix       | 166 +++++++++----------------------
 pkgs/top-level/all-packages.nix  |  52 +++-------
 3 files changed, 61 insertions(+), 160 deletions(-)

diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix
index 94bfec0a18e..457b670319e 100644
--- a/pkgs/os-specific/gnu/default.nix
+++ b/pkgs/os-specific/gnu/default.nix
@@ -1,7 +1,7 @@
 # Packages that make up the GNU/Hurd operating system (aka. GNU).
 
 args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
-, texinfo, glibcCross, hurdPartedCross, libuuid, samba_light
+, texinfo, glibcCross, hurdPartedCross, libuuid, samba
 , gccCrossStageStatic, gccCrossStageFinal
 , forceNativeDrv, forceSystem, newScope, platform, config, crossSystem
 , overrides ? {} }:
@@ -91,7 +91,6 @@ let
     mig_raw = callPackage ./mig {};
 
     smbfs = callPackage ./smbfs {
-      samba = samba_light;
       hurd = gnu.hurdCross;
     };
 
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 877850f532b..6a6e2469e78 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -1,48 +1,23 @@
-{ stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl
+{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl
 , docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc, ntdb, tdb, tevent
-, ldb, popt, iniparser, subunit, libbsd, nss_wrapper, socket_wrapper
-, uid_wrapper, libarchive
+, ldb, popt, iniparser, libbsd, libarchive, libiconv, gettext
+, kerberos, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs
+, gnutls, libgcrypt, libgpgerror
+, ncurses, libunwind, libibverbs, librdmacm, systemd
 
-# source3/wscript optionals
-, kerberos ? null
-, zlib ? null
-, openldap ? null
-, cups ? null
-, pam ? null
-, avahi ? null
-, acl ? null
-, libaio ? null
-, fam ? null
-, libceph ? null
-, glusterfs ? null
-
-# buildtools/wafsamba/wscript optionals
-, libiconv ? null
-, gettext ? null
-
-# source4/lib/tls/wscript optionals
-, gnutls ? null
-, libgcrypt ? null
-, libgpgerror ? null
-
-# other optionals
-, ncurses ? null
-, libunwind ? null
-, dbus ? null
-, libibverbs ? null
-, librdmacm ? null
-, systemd ? null
+, enableKerberos ? false
+, enableInfiniband ? false
+, enableLDAP ? false
+, enablePrinting ? false
+, enableMDNS ? false
+, enableDomainController ? false
+, enableRegedit ? true
+, enableCephFS ? false
+, enableGlusterFS ? false
 }:
 
-assert kerberos != null -> zlib != null;
+with lib;
 
-let
-  bundledLibs = if kerberos != null && kerberos.implementation == "heimdal" then "NONE" else "com_err";
-  hasGnutls = gnutls != null && libgcrypt != null && libgpgerror != null;
-  isKrb5OrNull = if kerberos != null && kerberos.implementation == "krb5" then true else null;
-  hasInfinibandOrNull = if libibverbs != null && librdmacm != null then true else null;
-in
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "samba-4.2.1";
 
@@ -51,25 +26,26 @@ stdenv.mkDerivation rec {
     sha256 = "1hsakc8h6rs48xr6i55m90pd53hpxcqjjnlwq8i2rp0nq4ws5sip";
   };
 
-  patches = [
-    ./4.x-no-persistent-install.patch
-    ./4.x-fix-ctdb-deps.patch
-  ] ++ optional (kerberos != null) ./4.x-heimdal-compat.patch;
+  patches =
+    [ ./4.x-no-persistent-install.patch
+      ./4.x-fix-ctdb-deps.patch
+    ] ++ stdenv.lib.optional enableKerberos ./4.x-heimdal-compat.patch;
 
-  buildInputs = [
-    python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42
-    docbook_xml_dtd_45 readline talloc ntdb tdb tevent ldb popt iniparser
-    subunit libbsd nss_wrapper socket_wrapper uid_wrapper
-    libarchive
-
-    kerberos zlib openldap cups pam avahi acl libaio fam libceph glusterfs
-
-    libiconv gettext
-
-    gnutls libgcrypt libgpgerror
-
-    ncurses libunwind dbus libibverbs librdmacm systemd
-  ];
+  buildInputs =
+    [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /*
+      docbook_xml_dtd_45 */ readline talloc ntdb tdb tevent ldb popt iniparser
+      libbsd libarchive zlib acl fam libiconv gettext libunwind
+    ]
+    ++ optionals stdenv.isLinux [ libaio pam systemd ]
+    ++ optional enableKerberos kerberos
+    ++ optionals (enableInfiniband && stdenv.isLinux) [ libibverbs librdmacm ]
+    ++ optional enableLDAP openldap
+    ++ optional (enablePrinting && stdenv.isLinux) cups
+    ++ optional enableMDNS avahi
+    ++ optional enableDomainController gnutls
+    ++ optional enableRegedit ncurses
+    ++ optional (enableCephFS && stdenv.isLinux) libceph
+    ++ optional (enableGlusterFS && stdenv.isLinux) glusterfs;
 
   postPatch = ''
     # Removes absolute paths in scripts
@@ -79,70 +55,24 @@ stdenv.mkDerivation rec {
     sed -i "s,\(XML_CATALOG_FILES=\"\),\1$XML_CATALOG_FILES ,g" buildtools/wafsamba/wafsamba.py
   '';
 
+  configureFlags =
+    [ "--with-static-modules=NONE"
+      "--with-shared-modules=ALL"
+      "--enable-fhs"
+      "--sysconfdir=/etc"
+      "--localstatedir=/var"
+      "--bundled-libraries=${if enableKerberos && kerberos.implementation == "heimdal" then "NONE" else "com_err"}"
+      "--private-libraries=NONE"
+      "--builtin-libraries=replace"
+    ]
+    ++ optional (enableKerberos != null && kerberos.implementation == "krb5") "--with-system-mitkrb5"
+    ++ optional (!enableDomainController) "--without-ad-dc"
+    ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ];
+
   enableParallelBuilding = true;
 
-  configureFlags = [
-    # source3/wscript options
-    (mkWith   true                 "static-modules"    "NONE")
-    (mkWith   true                 "shared-modules"    "ALL")
-    (mkWith   true                 "winbind"           null)
-    (mkWith   (openldap != null)   "ads"               null)
-    (mkWith   (openldap != null)   "ldap"              null)
-    (mkEnable (cups != null)       "cups"              null)
-    (mkEnable (cups != null)       "iprint"            null)
-    (mkWith   (pam != null)        "pam"               null)
-    (mkWith   (pam != null)        "pam_smbpass"       null)
-    (mkWith   true                 "quotas"            null)
-    (mkWith   true                 "sendfile-support"  null)
-    (mkWith   true                 "utmp"              null)
-    (mkWith   true                 "utmp"              null)
-    (mkEnable true                 "pthreadpool"       null)
-    (mkEnable (avahi != null)      "avahi"             null)
-    (mkWith   true                 "iconv"             null)
-    (mkWith   (acl != null)        "acl-support"       null)
-    (mkWith   true                 "dnsupdate"         null)
-    (mkWith   true                 "syslog"            null)
-    (mkWith   true                 "automount"         null)
-    (mkWith   (libaio != null)     "aio-support"       null)
-    (mkWith   (fam != null)        "fam"               null)
-    (mkWith   (libarchive != null) "libarchive"        null)
-    (mkWith   true                 "cluster-support"   null)
-    (mkWith   (ncurses != null)    "regedit"           null)
-    (mkWith   libceph              "libcephfs"         libceph)
-    (mkEnable (glusterfs != null)  "glusterfs"         null)
-
-    # dynconfig/wscript options
-    (mkEnable true                 "fhs"               null)
-    (mkOther                       "sysconfdir"        "/etc")
-    (mkOther                       "localstatedir"     "/var")
-
-    # buildtools/wafsamba/wscript options
-    (mkOther                       "bundled-libraries" bundledLibs)
-    (mkOther                       "private-libraries" "NONE")
-    (mkOther                       "builtin-libraries" "replace")
-    (mkWith   libiconv             "libiconv"          libiconv)
-    (mkWith   (gettext != null)    "gettext"           gettext)
-
-    # source4/lib/tls/wscript options
-    (mkEnable hasGnutls            "gnutls" null)
-
-    # wscript options
-    (mkWith   isKrb5OrNull         "system-mitkrb5"    null)
-    (if hasGnutls then null else "--without-ad-dc")
-
-    # ctdb/wscript
-    (mkEnable hasInfinibandOrNull  "infiniband"        null)
-    (mkEnable null                 "pmda"              null)
-  ];
-
   stripAllList = [ "bin" "sbin" ];
 
-  postInstall = ''
-    # Remove unecessary components
-    rm -r $out/{lib,share}/ctdb-tests
-    rm $out/bin/ctdb_run{_cluster,}_tests
-  '';
-
   postFixup = ''
     export SAMBA_LIBS="$(find $out -type f -name \*.so -exec dirname {} \; | sort | uniq)"
     read -r -d "" SCRIPT << EOF
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18a1a43c99c..d642c4188c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8986,15 +8986,7 @@ let
     python = python2;
     kerberos = heimdal;
     gnutls = gnutls33;
-    cups = if stdenv.isDarwin then null else cups;
-    pam = if stdenv.isDarwin then null else pam;
-    libaio = if stdenv.isDarwin then null else libaio;
-    libceph = if stdenv.isDarwin then null else libceph;
-    glusterfs = if stdenv.isDarwin then null else glusterfs;
-    dbus = if stdenv.isLinux then dbus else null;
-    libibverbs = if stdenv.isLinux then libibverbs else null;
-    librdmacm = if stdenv.isLinux then librdmacm else null;
-    systemd = if stdenv.isLinux then systemd else null;
+    # enableLDAP
   };
 
   samba = samba4;
@@ -9012,39 +9004,19 @@ let
     libunwind = null;
   });
 
-  samba4_light = lowPrio (samba4.override {
-    # source3/wscript optionals
-    kerberos = null;
-    zlib = null;
-    openldap = null;
-    cups = null;
-    pam = null;
-    avahi = null;
-    acl = null;
-    libaio = null;
-    fam = null;
-    libceph = null;
-    glusterfs = null;
-
-    # buildtools/wafsamba/wscript optionals
-    libiconv = null;
-    gettext = null;
-
-    # source4/lib/tls/wscript optionals
-    gnutls = null;
-    libgcrypt = null;
-    libgpgerror = null;
-
-    # other optionals
-    ncurses = null;
-    libunwind = null;
-    dbus = null;
-    libibverbs = null;
-    librdmacm = null;
-    systemd = null;
+  samba4Full = lowPrio (samba4.override {
+    enableKerberos  = true;
+    enableInfiniband = true;
+    enableLDAP = true;
+    enablePrinting = true;
+    enableMDNS = true;
+    enableDomainController = true;
+    enableRegedit = true;
+    enableCephFS = true;
+    enableGlusterFS = true;
   });
 
-  samba_light = samba4_light;
+  sambaFull = samba4Full;
 
   shairport-sync = callPackage ../servers/shairport-sync { };
 

From 23b19506037abacccfe18f668b0bf8e11290160f Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Mon, 1 Jun 2015 08:43:53 -0500
Subject: [PATCH 0607/2322] switch to sha256 hashes

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 234c628ef6f..332e32a0ddf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8101,8 +8101,8 @@ let
     };
 
     buildInputs = [ self.nose ];
-    propagatedBuildInputs = with self; [ 
-      dateutil 
+    propagatedBuildInputs = with self; [
+      dateutil
       numpy
       scipy
       numexpr
@@ -8111,7 +8111,7 @@ let
       bottleneck
       sqlalchemy9
       lxml
-      modules.sqlite3 
+      modules.sqlite3
     ];
 
     preCheck = ''
@@ -8127,7 +8127,7 @@ let
 
     checkPhase = ''
       runHook preCheck
-      
+
       # The flag `-A 'not network'` will disable tests that use internet.
       # The `-e` flag disables a few problematic tests.
       python setup.py nosetests -A 'not network' --stop -e 'test_clipboard|test_series' --verbosity=3
@@ -8149,7 +8149,7 @@ let
     version = "0.9.3";
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-${version}.tar.gz";
-      md5 = "6f3325132f246594988171bc72e1a385";
+      sha256 = "174ks80h0g9p67ahnakf0y7di3gvbhxvb1jlk097gvd7gpi3aflk";
     };
   };
 
@@ -8158,7 +8158,7 @@ let
     version = "1.0.0";
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/B/Bottleneck/Bottleneck-${version}.tar.gz";
-      md5 = "380fa6f275bd24f27e7cf0e0d752f5d2";
+      sha256 = "15dl0ll5xmfzj2fsvajzwxsb9dbw5i9fx9i4r6n4i5nzzba7m6wd";
     };
     propagatedBuildInputs = [self.numpy];
   };
@@ -9204,12 +9204,12 @@ let
     version = "1.5.3";
     # FAIL:test_generate_entry and test_time
     # both tests fail due to time issue that doesn't seem to matter in practice
-    doCheck = false; 
+    doCheck = false;
     src = pkgs.fetchurl {
       url = "https://github.com/pyblosxom/pyblosxom/archive/v${version}.tar.gz";
       sha256 = "0de9a7418f4e6d1c45acecf1e77f61c8f96f036ce034493ac67124626fd0d885";
     };
-  
+
     propagatedBuildInputs = with self; [ pygments markdown ];
 
     meta = {

From 51bb5e85dcca35ba503aa5ad9891f09059a15663 Mon Sep 17 00:00:00 2001
From: Emil Rangden <emil.rangden@chas.se>
Date: Mon, 1 Jun 2015 15:58:07 +0200
Subject: [PATCH 0608/2322] hashcat: fix build and update to 0.49

---
 pkgs/tools/security/hashcat/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix
index 806fcb613ca..3a4a6edef03 100644
--- a/pkgs/tools/security/hashcat/default.nix
+++ b/pkgs/tools/security/hashcat/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, p7zip, patchelf }:
+{ stdenv, fetchurl, p7zip, patchelf, gmp }:
 
 assert stdenv.isLinux;
 
 let
   bits    = if stdenv.system == "x86_64-linux" then "64" else "32";
-  libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
+  libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc gmp ];
 
   fixBin = x: ''
     patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
@@ -13,11 +13,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "hashcat-${version}";
-  version = "0.47";
+  version = "0.49";
 
   src = fetchurl {
     url    = "http://hashcat.net/files/${name}.7z";
-    sha256 = "0mc4lv4qfxabp794xfzgr63fhwk7lvbg12pry8a96lldp0jwp6i3";
+    sha256 = "0va07flncihgmnri5wj0jn636w86x5qwm4jmj2halcyg7qwqijh2";
   };
 
   buildInputs = [ p7zip patchelf ];

From 10acbd67164672d4334b7d5cb162157e9e9468bf Mon Sep 17 00:00:00 2001
From: Emil Rangden <emil.rangden@chas.se>
Date: Mon, 1 Jun 2015 16:15:19 +0200
Subject: [PATCH 0609/2322] new package: crackxls

---
 pkgs/tools/security/crackxls/default.nix | 28 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/security/crackxls/default.nix

diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix
new file mode 100644
index 00000000000..ba2bee2ffc2
--- /dev/null
+++ b/pkgs/tools/security/crackxls/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, autoconf, automake, openssl, libgsf }:
+
+stdenv.mkDerivation rec {
+
+  name = "crackxls-${version}";
+  version = "v0.4";
+
+  src = fetchgit {
+    url = https://github.com/GavinSmith0123/crackxls2003.git;
+    rev = "refs/tags/${version}";
+    sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz";
+  };
+
+  buildInputs = [ openssl libgsf automake autoconf ];
+
+  installPhase =
+  ''
+    mkdir $out/bin
+    cp crackxls2003 $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/GavinSmith0123/crackxls2003/;
+    description = "Used to break the encryption on old Microsoft Excel and Microsoft Word files";
+    platforms = platforms.none;
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d642c4188c7..73f2c3100e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1125,6 +1125,8 @@ let
 
   cpio = callPackage ../tools/archivers/cpio { };
 
+  crackxls = callPackage ../tools/security/crackxls { };
+
   cromfs = callPackage ../tools/archivers/cromfs { };
 
   cron = callPackage ../tools/system/cron { };

From ee8ac51986949522a51418b5ce650aaf2fe82da0 Mon Sep 17 00:00:00 2001
From: Emil Rangden <emil.rangden@chas.se>
Date: Mon, 1 Jun 2015 16:59:09 +0200
Subject: [PATCH 0610/2322] add linux to platforms

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

diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix
index ba2bee2ffc2..c593650dbd4 100644
--- a/pkgs/tools/security/crackxls/default.nix
+++ b/pkgs/tools/security/crackxls/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/GavinSmith0123/crackxls2003/;
     description = "Used to break the encryption on old Microsoft Excel and Microsoft Word files";
-    platforms = platforms.none;
+    platforms = platforms.linux;
     license = licenses.gpl3;
   };
 }

From 64a41b7a90bd99f532847ef1b6ad3c3c6a2a7120 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 10:49:37 +0200
Subject: [PATCH 0611/2322] Use nixUnstable by default

---
 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 6d25fef4576..42a9d46f1d6 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -63,7 +63,7 @@ in
 
       package = mkOption {
         type = types.package;
-        default = pkgs.nix;
+        default = pkgs.nixUnstable;
         description = ''
           This option specifies the Nix package instance to use throughout the system.
         '';

From e7f1038798d99beeda326aee016e2f84dca15fd8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 20:09:31 +0200
Subject: [PATCH 0612/2322] Fix typo in last merge

---
 pkgs/development/tools/build-managers/cmake/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 02847c749bf..27e7a884eaf 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
     [ "--docdir=/share/doc/${name}"
       "--mandir=/share/man"
       "--no-system-jsoncpp"
+    ]
     ++ optional (!stdenv.isCygwin) "--system-libs"
     ++ optional useQt4 "--qt-gui"
     ++ ["--"]

From 314c6847aa8d3b2335889c7ef3b26adb6c933375 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 1 Jun 2015 20:28:11 +0200
Subject: [PATCH 0613/2322] cpuminer: update from 2.4.1 to 2.4.2

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

diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix
index 0ca95127f11..713c0a92329 100644
--- a/pkgs/tools/misc/cpuminer/default.nix
+++ b/pkgs/tools/misc/cpuminer/default.nix
@@ -2,21 +2,22 @@
 
 stdenv.mkDerivation rec {
   name = "cpuminer-${version}";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz";
-    sha256 = "0grj0swh1q3c3bj3yxji80yhxb09yz62x1n5h8z7c3azq4rrv2w1";
+    sha256 = "1ds5yfxf25pd8y5z5gh689qb80m4dqw2dy3yx87hibnprlaiym0n";
   };
 
   buildInputs = [ curl jansson ];
 
   configureFlags = [ "CFLAGS=-O3" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/pooler/cpuminer;
     description = "CPU miner for Litecoin and Bitcoin";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ pSub ];
   };
 }

From 779ab6bfc79680d8d94c9685ae9f0f3fb42585bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 20:38:19 +0200
Subject: [PATCH 0614/2322] ncurses: Revert to normal style

Also re-enable building shared libraries on Mac OS X as these worked
fine in the past.
---
 .../development/libraries/ncurses/default.nix | 63 +++++--------------
 1 file changed, 14 insertions(+), 49 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index f0519fa981d..19f0ecb122d 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -1,19 +1,14 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 
-# Optional Dependencies
-, gpm ? null
+, mouseSupport ? false
+, unicode ? true
+
+, gpm
 
 # Extra Options
 , abiVersion ? "5"
-, unicode ? true
 }:
 
-with stdenv.lib;
-let
-  buildShared = !stdenv.isDarwin;
-
-  optGpm = stdenv.shouldUsePkg gpm;
-in
 stdenv.mkDerivation rec {
   name = "ncurses-5.9";
 
@@ -24,41 +19,11 @@ stdenv.mkDerivation rec {
 
   patches = [ ./clang.patch ];
 
-  buildInputs = [ optGpm ];
+  configureFlags =
+    [ "--with-shared" "--without-debug" "--enable-pc-files" "--enable-symlinks" ]
+    ++ lib.optional unicode "--enable-widec";
 
-  configureFlags = [
-    (mkWith   true        "abi-version" abiVersion)
-    (mkWith   true        "cxx"         null)
-    (mkWith   true        "cxx-binding" null)
-    (mkWith   false       "ada"         null)
-    (mkWith   true        "manpages"    null)
-    (mkWith   true        "progs"       null)
-    (mkWith   doCheck     "tests"       null)
-    (mkWith   true        "curses-h"    null)
-    (mkEnable true        "pc-files"    null)
-    (mkWith   buildShared "shared"      null)
-    (mkWith   true        "normal"      null)
-    (mkWith   false       "debug"       null)
-    (mkWith   false       "termlib"     null)
-    (mkWith   false       "ticlib"      null)
-    (mkWith   optGpm      "gpm"         null)
-    (mkEnable true        "overwrite"   null)
-    (mkEnable true        "database"    null)
-    (mkWith   true        "xterm-new"   null)
-    (mkEnable true        "symlinks"    null)
-    (mkEnable unicode     "widec"       null)
-    (mkEnable true        "ext-colors"  null)
-    (mkEnable true        "ext-mouse"   null)
-  ] ++ stdenv.lib.optionals stdenv.isCygwin [
-    "--enable-sp-funcs"
-    "--enable-term-driver"
-    "--enable-const"
-    "--enable-ext-colors"
-    "--enable-ext-mouse"
-    "--enable-reentrant"
-    "--enable-colorfgbg"
-    "--enable-tcap-names"
-  ];
+  buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
 
   # PKG_CONFIG_LIBDIR is where the *.pc files will be installed. If this
   # directory doesn't exist, the configure script will disable installation of
@@ -69,7 +34,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig"
     mkdir -p "$PKG_CONFIG_LIBDIR"
-  '' + stdenv.lib.optionalString stdenv.isCygwin ''
+  '' + lib.optionalString stdenv.isCygwin ''
     sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure
   '';
 
@@ -106,7 +71,7 @@ stdenv.mkDerivation rec {
     # Create curses compatability
     ln -svf libncursesw.so $out/lib/libcursesw.so
     ln -svf libncursesw.so $out/lib/libcurses.so
-  '' + stdenv.lib.optionalString stdenv.isCygwin ''
+  '' + lib.optionalString stdenv.isCygwin ''
     for lib in $libs; do
       if test -e $out/lib/lib''${lib}w.dll.a; then
           ln -svf lib''${lib}w.dll.a $out/lib/lib$lib.dll.a
@@ -143,9 +108,9 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/ncurses/;
 
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ wkennington ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.wkennington ];
   };
 
   passthru.ldflags = if unicode then "-lncursesw" else "-lncurses";

From cb9429bd3126e762f519bf408f56747f7ca50dba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 20:45:48 +0200
Subject: [PATCH 0615/2322] ncurses: Don't install static libraries

Nixpkgs convention is not to install static libraries.
---
 pkgs/development/libraries/ncurses/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 19f0ecb122d..d6c2ee4fade 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -89,6 +89,10 @@ stdenv.mkDerivation rec {
     ln -svf libncurses.so $out/lib/libcurses.so
   '';
 
+  preFixup = ''
+    rm $out/lib/*.a
+  '';
+
   meta = {
     description = "Free software emulation of curses in SVR4 and more";
 

From 727565279f94a77306f2a06040b82fd1f06c8097 Mon Sep 17 00:00:00 2001
From: Susan Potter <me@susanpotter.net>
Date: Mon, 1 Jun 2015 13:53:12 -0500
Subject: [PATCH 0616/2322] Fix dd-agent buildInputs to include
 pythonPackages.psutil

When deploying current master version journalctl showed ImportErrors in the logs with message:
'No module named psutil' and systemctl dd-agent service failed to start. To fix I added
pythonPackages.psutil as a buildInputs entry and this fixed the issue.

See this Gist for journalctl errors for reference:
https://gist.github.com/mbbx6spp/59eefabbe708c335a31f
---
 pkgs/tools/networking/dd-agent/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 911bb7197eb..8c340460b75 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -12,7 +12,17 @@ stdenv.mkDerivation rec {
     sha256 = "05flcbzpnmhf6qskkccbfk957sl9hhydlp4p5vqhs62hkpwmqwan";
   };
 
-  buildInputs = [ python unzip makeWrapper pythonPackages.psycopg2 pythonPackages.ntplib pythonPackages.simplejson pythonPackages.pyyaml pythonPackages.requests ];
+  buildInputs = [
+    python
+    unzip
+    makeWrapper
+    pythonPackages.psycopg2
+    pythonPackages.psutil
+    pythonPackages.ntplib
+    pythonPackages.simplejson
+    pythonPackages.pyyaml
+    pythonPackages.requests
+  ];
   propagatedBuildInputs = [ python tornado ];
 
   buildCommand = ''

From 217566ede466f8189f4c0f91784ac3143f9990c2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 1 Jun 2015 21:13:34 +0200
Subject: [PATCH 0617/2322] mcelog 117 -> 118

Changet to mcelog(8) to support new architectural extentions in
Intel CPUs.
---
 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 16f1331d320..0a4d3797ce2 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "117"; in
+let version = "118"; in
 stdenv.mkDerivation {
   name = "mcelog-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0szc5s0bag16ypna336spwb5fagwbxaparn0h78w73wv05kcvwqw";
+    sha256 = "04hzadxyqlnhjn328bv711lpkipfn5k3gszswydmvvjpis2vhbrr";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

From 70cb6e67c0a976f3e170e38b6b33777685f7c680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 1 Mar 2015 21:29:40 +0100
Subject: [PATCH 0618/2322] nixos/apcupsd: don't evaluate event hooks at build
 time

Better replace the double quotes in 'echo "${commands}"' with single
quotes, to prevent the shell from doing command substitution etc. at
configuration build time.
---
 nixos/modules/services/monitoring/apcupsd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix
index ffa7be7dd30..6cd0254dbe3 100644
--- a/nixos/modules/services/monitoring/apcupsd.nix
+++ b/nixos/modules/services/monitoring/apcupsd.nix
@@ -39,7 +39,7 @@ let
 
   shellCmdsForEventScript = eventname: commands: ''
     echo "#!${pkgs.stdenv.shell}" > "$out/${eventname}"
-    echo "${commands}" >> "$out/${eventname}"
+    echo '${commands}' >> "$out/${eventname}"
     chmod a+x "$out/${eventname}"
   '';
 

From 9835f18fbdc06fbaa7abf02726b2adb97a93143a Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Mon, 1 Jun 2015 15:16:51 -0500
Subject: [PATCH 0619/2322] Add myself as maintainer for skarnet software

---
 pkgs/development/libraries/skalibs/default.nix    | 1 +
 pkgs/os-specific/linux/s6-linux-utils/default.nix | 1 +
 pkgs/servers/s6/default.nix                       | 1 +
 pkgs/tools/misc/execline/default.nix              | 1 +
 pkgs/tools/misc/s6-portable-utils/default.nix     | 1 +
 pkgs/tools/networking/s6-dns/default.nix          | 1 +
 pkgs/tools/networking/s6-networking/default.nix   | 1 +
 7 files changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index fa1d4f4f984..32739b45576 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -30,6 +30,7 @@ in stdenv.mkDerivation rec {
     description = "A set of general-purpose C programming libraries";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ pmahoney ];
   };
 
 }
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
index 9bccedb0120..faf5106c67e 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -28,6 +28,7 @@ in stdenv.mkDerivation rec {
     description = "A set of minimalistic Linux-specific system utilities";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ pmahoney ];
   };
 
 }
diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix
index 73843b8c114..10d4520d912 100644
--- a/pkgs/servers/s6/default.nix
+++ b/pkgs/servers/s6/default.nix
@@ -38,6 +38,7 @@ in stdenv.mkDerivation rec {
     description = "skarnet.org's small & secure supervision software suite";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ pmahoney ];
   };
 
 }
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index a2edb1f842e..a7c555ee72b 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -32,6 +32,7 @@ in stdenv.mkDerivation rec {
     description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ pmahoney ];
   };
 
 }
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 9aaf928b7b0..4d8094d3a3b 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -27,6 +27,7 @@ in stdenv.mkDerivation rec {
     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 ];
   };
 
 }
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index 89c7642d0a5..d44f4554043 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -32,6 +32,7 @@ in stdenv.mkDerivation rec {
     description = "A suite of DNS client programs and libraries for Unix systems";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ pmahoney ];
   };
 
 }
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index d2c7ebd0345..acc620b6cc0 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -39,6 +39,7 @@ in stdenv.mkDerivation rec {
     description = "A suite of small networking utilities for Unix systems";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ pmahoney ];
   };
 
 }

From 74964c255e4153b9b4170914cdd19f8abc3e9786 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Mon, 1 Jun 2015 15:19:11 -0500
Subject: [PATCH 0620/2322] Update skarnet.org software

execline           2.1.2.0
s6-dns             2.0.0.3
s6-networking      2.1.0.1
s6-portable-utils  2.0.5.0
skalibs            2.3.4.0
---
 pkgs/development/libraries/skalibs/default.nix  | 4 ++--
 pkgs/tools/misc/execline/default.nix            | 4 ++--
 pkgs/tools/misc/s6-portable-utils/default.nix   | 4 ++--
 pkgs/tools/networking/s6-dns/default.nix        | 4 ++--
 pkgs/tools/networking/s6-networking/default.nix | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 32739b45576..cc49466d020 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.3.2.0";
+  version = "2.3.4.0";
 
 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 = "1l7f2zmas0w28j19g46bvm13j3cx7jimxifivd04zz5r7g79ik5a";
+    sha256 = "03kqcinb5sn1pk297nqg7w5hzgmkkhhcs3l9x99w1x9kgmw6wisp";
   };
 
   dontDisableStatic = true;
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index a7c555ee72b..162cc9a48ff 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.1.1.0";
+  version = "2.1.2.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 = "0yhxyih8p6p9135nifi655qk4gnhdarjzfp1lb4pxx9ar9ay5q7w";
+    sha256 = "0p9wp1rq8010k5yxlvamajhi6m24r9v7ikb7scvznf6zb2b0d9hf";
   };
 
   dontDisableStatic = true;
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 4d8094d3a3b..2f0a647f343 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.0.4.0";
+  version = "2.0.5.0";
 
 in stdenv.mkDerivation rec {
 
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz";
-    sha256 = "0gl4v6hslqkxdfxj3qzi1xpiiw52ic8y8l9nkl2z5gp893qb6yvx";
+    sha256 = "099c7isi5vynis4iaiz362rvr73w4rvjhv3c2f7ddxgfyvd2331l";
   };
 
   dontDisableStatic = true;
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index d44f4554043..e8ed6e68e41 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.2";
+  version = "2.0.0.3";
 
 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 = "0rsw19r9hwxb0xj9xs1rwb7fa21wwbsnfq3p2nfg4lf6cc64b39r";
+    sha256 = "0kabv1k5xn2vhwlq42913d22kd1f79nssmi7jkncgvsgv1zs0sym";
   };
 
   dontDisableStatic = true;
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index acc620b6cc0..5f24592f030 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.0";
+  version = "2.1.0.1";
 
 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 = "057xwh1dpwg2dz47s0badqhi66nhxgs5ps0xwn7s6hvba0lwyy4c";
+    sha256 = "0jdjxwqrp7lzdb85sp1gdkm7s478wyl7wqxb3jfxflgh2bgdgvy2";
   };
 
   dontDisableStatic = true;

From 2c9f03ff8188a418bb9329b5dbc4b75d168efd5a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 1 Jun 2015 22:36:00 +0200
Subject: [PATCH 0621/2322] ocaml-async: set attribute to null for unsupported
 OCaml versions

---
 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 6c28a6c98c7..2a7c9a087c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4104,7 +4104,10 @@ let
 
     async_unix = callPackage ../development/ocaml-modules/async_unix { };
 
-    async = callPackage ../development/ocaml-modules/async { };
+    async =
+      if lib.versionOlder "4.02" ocaml_version
+      then callPackage ../development/ocaml-modules/async { }
+      else null;
 
     atd = callPackage ../development/ocaml-modules/atd { };
 

From e361e700e160679579053574fd6cd9e15878b809 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 1 Jun 2015 22:35:34 +0200
Subject: [PATCH 0622/2322] ocaml-cstruct: assert minimal OCaml version (4.01)

---
 pkgs/development/ocaml-modules/cstruct/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix
index d62b9397a73..5b2eebed9e0 100644
--- a/pkgs/development/ocaml-modules/cstruct/default.nix
+++ b/pkgs/development/ocaml-modules/cstruct/default.nix
@@ -1,9 +1,7 @@
 {stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib, findlib,
  async ? null, lwt ? null, camlp4}:
 
-let
-  ocaml_version = (builtins.parseDrvName ocaml.name).version;
-in
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
 
 stdenv.mkDerivation {
   name = "ocaml-cstruct-1.6.0";

From b351009cca23584c6c8e17a334f252d96663b596 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 1 Jun 2015 20:41:50 +0200
Subject: [PATCH 0623/2322] ocaml-hex: update from 0.1.0 to 0.2.0

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

diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix
index 1be3b4cbfb7..7a060bd795a 100644
--- a/pkgs/development/ocaml-modules/hex/default.nix
+++ b/pkgs/development/ocaml-modules/hex/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchzip, ocaml, findlib }:
+{ stdenv, fetchzip, ocaml, findlib, cstruct }:
 
-let version = "0.1.0"; in
+let version = "0.2.0"; in
 
 stdenv.mkDerivation {
   name = "ocaml-hex-${version}";
 
   src = fetchzip {
     url = "https://github.com/mirage/ocaml-hex/archive/${version}.tar.gz";
-    sha256 = "1nna0v5wi1g8l9ywl43xda2lqbz3sa3ncpyg84bl9baxyfmw4p9n";
+    sha256 = "13vmpxwg5vb2qvkdqz37rx1ya19r9cp4dwylx8jj15mn77hpy7xg";
   };
 
   buildInputs = [ ocaml findlib ];
+  propagatedBuildInputs = [ cstruct ];
   createFindlibDestdir = true;
 
   meta = {

From 9cd797ff269efc749563547b24e68a241f11932c Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Mon, 1 Jun 2015 13:14:47 +0300
Subject: [PATCH 0624/2322] vim plugins: refactor and regenerate

---
 pkgs/misc/vim-plugins/default.nix      | 1499 ++++++++++++------------
 pkgs/misc/vim-plugins/vim-plugin-names |  137 ++-
 pkgs/misc/vim-plugins/vim-utils.nix    |    4 +-
 3 files changed, 814 insertions(+), 826 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index a1a78e9fb64..49935487afe 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -10,6 +10,12 @@ inherit (vimUtils.override {inherit vim;}) rtpPath addRtp buildVimPlugin
   buildVimPluginFrom2Nix vimHelpTags;
 in
 
+# TL;DR
+# Add your plugin to ./vim-plugin-names
+# Generate via `vim-plugin-names-to-nix`
+# If plugin is complicated then create a PR to
+# https://github.com/jagajaga/vim-addon-vim2nix/tree/master/additional-nix-code
+
 # This attrs contains two sections:
 # The first contains plugins added manually, the second contains plugins
 # generated by call nix#ExportPluginsForNix.
@@ -17,587 +23,662 @@ in
 # attribute names should be the same as used by vim-pi to make dependency
 # resolution work
 rec {
+  # This is not a plugin, it provides bin/vim-open-buffer-with-plugins-derivations
+  # which recreates this the following derivations based on ./vim-plugin-names
+  pluginnames2nix = vimUtils.pluginnames2Nix {
+    name = "vim-plugin-names-to-nix";
+    namefiles = [./vim-plugin-names];  };
 
-  ### section I: manually mantained plugins
-  airline = vim-airline;
-  alternative = a; # backwards compat, added 2014-10-21
-  command_T = command-t; # backwards compat, added 2014-10-18
-  gitgutter = vim-gitgutter;
-  haskellConceal = haskellconceal; # backwards compat, added 2014-10-18
-  necoGhc = neco-ghc; # backwards compat, added 2014-10-18
-  nerdcommenter = The_NERD_Commenter;
-  stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18
-  tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18
-  youcompleteme = YouCompleteMe;
+  # Section I
 
-  a = buildVimPlugin {
-    name = "a-git-2010-11-06";
+  # Section II
+  # Update with vimUtils.vimPlugins.pluginnames2Nix command
+
+  # aliasess
+  airline             = vim-airline;
+  alternative         = a-vim; # backwards compat, added 2014-10-21
+  coffee-script       = vim-coffee-script;
+  coffeeScript        = coffee-script; # backwards compat, added 2014-10-18
+  colors-solarized    = Solarized;
+  colorsamplerpack    = Colour_Sampler_Pack;
+  Colour_Sampler_Pack = Colour-Sampler-Pack;
+  command_T           = command-t; # backwards compat, added 2014-10-18
+  easy-align          = vim-easy-align;
+  easymotion          = vim-easymotion;
+  eighties            = vim-eighties;
+  ghc-mod-vim         = ghcmod;
+  gist-vim            = Gist;
+  gitgutter           = vim-gitgutter;
+  gundo               = Gundo;
+  haskellConceal      = haskellconceal; # backwards compat, added 2014-10-18
+  haskellconceal      = vim-haskellconceal;
+  hoogle              = Hoogle;
+  hier                = vim-hier;
+  ipython             = vim-ipython;
+  latex-live-preview  = vim-latex-live-preview;
+  necoGhc             = neco-ghc; # backwards compat, added 2014-10-18
+  nerdcommenter       = The_NERD_Commenter;
+  nerdtree            = The_NERD_tree;
+  quickrun            = vim-quickrun;
+  signature           = vim-signature;
+  "sourcemap.vim"     = sourcemap;
+  stylish-haskell     = vim-stylish-haskell;
+  stylishHaskell      = stylish-haskell; # backwards compat, added 2014-10-18
+  supertab            = Supertab;
+  syntastic           = Syntastic;
+  tabular             = Tabular;
+  tagbar              = Tagbar;
+  tmux-navigator      = vim-tmux-navigator;
+  tmuxNavigator       = tmux-navigator; # backwards compat, added 2014-10-18
+  watchdogs           = vim-watchdogs;
+  webapi-vim          = WebAPI;
+  yankring            = YankRing;
+  YouCompleteMe       = youcompleteme;
+  
+
+  Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Gist-2015-05-29";
     src = fetchgit {
-      url = "https://github.com/vim-scripts/a.vim.git";
-      rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
-      sha256 = "ca0982873ed81e7f6545a6623b735104c574fe580d5f21b0aa3dc1557edac240";
-     };
+      url = "git://github.com/mattn/gist-vim";
+      rev = "235955468c2d85e5d0ece46d84948acf2bedeb20";
+      sha256 = "50ac95e145d00631acb3ae53261c880920b40b208fed1aaae71ed31d070e381e";
+    };
+    dependencies = [];
+
+  };
+
+  Gundo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Gundo";
+    src = fetchhg {
+      url = "https://bitbucket.org/sjl/gundo.vim";
+      rev = "eb9fc8676b89";
+      sha256 = "05lcxrd9ibfi02ja4jvl5y5pp884b8kh9aarw045b0mlldygv6cp";
+    };
+    dependencies = [];
+
+  };
+
+  Hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Hoogle-2013-11-26";
+    src = fetchgit {
+      url = "git://github.com/Twinside/vim-hoogle";
+      rev = "81f28318b0d4174984c33df99db7752891c5c4e9";
+      sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0";
+    };
+    dependencies = [];
+
+  };
+
+  Solarized = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Solarized-2011-05-09";
+    src = fetchgit {
+      url = "git://github.com/altercation/vim-colors-solarized";
+      rev = "528a59f26d12278698bb946f8fb82a63711eec21";
+      sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315";
+    };
+    dependencies = [];
+
+  };
+
+  Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Supertab-2015-02-15";
+    src = fetchgit {
+      url = "git://github.com/ervandew/supertab";
+      rev = "c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7";
+      sha256 = "e9e4054c683435b36adf87bebb4895c06a7e85130a807d8c9307588d4744b04b";
+    };
+    dependencies = [];
+
+  };
+
+  Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Syntastic-2015-05-29";
+    src = fetchgit {
+      url = "git://github.com/scrooloose/syntastic";
+      rev = "5c6e78a2711aa5d04d116123d78684b620033c3d";
+      sha256 = "fa8781df0c37b5d120ab4b287a911a1545cd4342edf08f85d644097c50ff59b0";
+    };
+    dependencies = [];
+
+  };
+
+  Tabular = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Tabular-2013-05-16";
+    src = fetchgit {
+      url = "git://github.com/godlygeek/tabular";
+      rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb";
+      sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f";
+    };
+    dependencies = [];
+
+  };
+
+  Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Tagbar-2015-05-10";
+    src = fetchgit {
+      url = "git://github.com/majutsushi/tagbar";
+      rev = "399b75256ac7333d7119d11047f6b3aff8fa2828";
+      sha256 = "8562fac0f2d690537b4c1049ba67b440116135167b48b9feb21655c9931b875c";
+    };
+    dependencies = [];
+
+  };
+
+  The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "The_NERD_Commenter-2014-07-08";
+    src = fetchgit {
+      url = "git://github.com/scrooloose/nerdcommenter";
+      rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6";
+      sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e";
+    };
+    dependencies = [];
+
+  };
+
+  The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "The_NERD_tree-2015-05-13";
+    src = fetchgit {
+      url = "git://github.com/scrooloose/nerdtree";
+      rev = "af85499edace2acca27ce41790ac333f62b689bb";
+      sha256 = "12f68eb374ccc8cbfcf88b85cf44a4a18856be4e30a50850b8f3d0b186207f0c";
+    };
+    dependencies = [];
+
+  };
+
+  UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "UltiSnips-2015-05-11";
+    src = fetchgit {
+      url = "git://github.com/sirver/ultisnips";
+      rev = "188e00f7b87297ea7737f9494d531c7073637332";
+      sha256 = "9fb127b32bd0e2ae139b3b6008849f4566cfb1c29087e787570428c770a3430c";
+    };
+    dependencies = [];
+
+  };
+
+  VimOutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "VimOutliner-2015-01-09";
+    src = fetchgit {
+      url = "git://github.com/vimoutliner/vimoutliner";
+      rev = "7c995f973c54b0d026137615af28059890edb197";
+      sha256 = "9d1526ec99904fd2ccfdb4dd6763b4cd04048cb74bb7a0a4c9b4a7b1f5d75cb5";
+    };
+    dependencies = [];
+
+  };
+
+  WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "WebAPI-2015-05-14";
+    src = fetchgit {
+      url = "git://github.com/mattn/webapi-vim";
+      rev = "6d577e49aeb81b4ede280161ca1e550c9328d098";
+      sha256 = "cb57200ada38ff5388e043075e900d3794020bb6f063a2845c71993e5543862a";
+    };
+    dependencies = [];
+
+  };
+
+  YankRing = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "YankRing";
+    src = fetchurl {
+      url = "http://www.vim.org/scripts/download_script.php?src_id=20842";
+      name = "yankring_180.zip";
+      sha256 = "0bsq4pxagy12jqxzs7gcf25k5ahwif13ayb9k8clyhm0jjdkf0la";
+    };
+    buildInputs = [ unzip ];
+    dependencies = [];
     meta = {
-      homepage = https://github.com/vim-scripts/a.vim;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+       url = "http://www.vim.org/scripts/script.php?script_id=1234";
     };
+
+
   };
 
-  align = buildVimPlugin {
-    name = "align-git-2012-08-07";
+  commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "commentary-2014-11-10";
     src = fetchgit {
-      url = "https://github.com/vim-scripts/align.git";
-      rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77";
-      sha256 = "f7b5764357370f03546556bd45558837f3790b0e86afadb63cd04d714a668a29";
-     };
-    meta = {
-      homepage = https://github.com/vim-scripts/align;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/tpope/vim-commentary";
+      rev = "9c685131a5facfa0d643feca3a61b41c007d8170";
+      sha256 = "2a9f394d0669429469c2f1ddaf9a722c2773f35da08ea9496d3b4b4e85b6038d";
     };
+    dependencies = [];
+
   };
 
-  calendar = buildVimPlugin {
-    name = "calendar-git-2015-04-24";
+  ctrlp = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ctrlp-2013-07-29";
     src = fetchgit {
-      url = "https://github.com/itchyny/calendar.vim.git";
-      rev = "4149b7bdbe159d9a7670fea9238fe3acac618d67";
-      sha256 = "4a04a03343f94fcbdb0eca44ba1eef8e1669f31e7aa5bf411e6fca4e5b8cdb30";
-    };
-    meta = {
-      homepage = https://github.com/itchyny/calendar.vim.git; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/kien/ctrlp.vim";
+      rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f";
+      sha256 = "41f7884973770552395b96f8693da70999dc815462d4018c560d3ff6be462e76";
     };
+    dependencies = [];
+
   };
 
-
-  command-t = buildVimPlugin {
-    name = "command-t-git-2015-04-29";
+  extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "extradite-2015-01-26";
     src = fetchgit {
-      url = "https://github.com/wincent/Command-T";
-      rev = "f7344ebbe95c532b2ad01f19877d6d611db0193b";
-      sha256 = "0l0ajdi3dj2w0zfvgy5fkyl8wln6r8x6ikqvr31rxxzkpwmyxmr1";
+      url = "git://github.com/int3/vim-extradite";
+      rev = "a1dc4b63befd5032e65a0c94e7257d4636aa6a3f";
+      sha256 = "94e05bbe36c9d4cee9832530531eedff0da509d5a0a52beee4e524fd4ad96714";
     };
-    buildInputs = [ perl ruby ];
-    buildPhase = ''
-      pushd ruby/command-t
-      ruby extconf.rb
-      make
-      popd
-    '';
+    dependencies = [];
+
   };
 
-  easymotion = buildVimPlugin {
-    name = "easymotion-git-2015-04-21";
+  fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "fugitive-2015-05-31";
     src = fetchgit {
-      url = "https://github.com/lokaltog/vim-easymotion";
-      rev = "9f1c449edfce6d61c7f620e3a9c1389b7b7e334f";
-      sha256 = "ba358f3acc120d9cf1854205bde0fa345d156e7f69a1854987e74bb137889c54";
-    };
-    meta = {
-      homepage = https://github.com/lokaltog/vim-easymotion; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/tpope/vim-fugitive";
+      rev = "e065e4f841f4a033ac9a6156573a446007617b1d";
+      sha256 = "339e2418da5f7e04490e6732010abd2f287c935e7a20df5832611f94ed42013f";
     };
+    dependencies = [];
+
   };
 
-
-  eighties = buildVimPlugin {
-    name = "eighties-git-2015-04-16";
+  ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ghcmod-2015-03-17";
     src = fetchgit {
-      url = "https://github.com/justincampbell/vim-eighties";
-      rev = "d202e6015163bbb4f7c9973f2eac66c2351e8c24";
-      sha256 = "ad7341c8d7ab659b062a67f893962b08596466a6a3a3395f28a4f4031a36eb9c";
-    };
-    buildPhase = ":";
-    meta = with stdenv.lib; {
-      description = "Automatically resizes your windows to 80 characters";
-      homepage    = https://github.com/justincampbell/vim-eighties;
-      license     = licenses.publicDomain;
-      maintainers = with maintainers; [ lovek323 ];
-      platforms   = platforms.unix;
+      url = "git://github.com/eagletmt/ghcmod-vim";
+      rev = "7e5f6102aa709244f5d4cedec807eac4b901c4cb";
+      sha256 = "47c5f5c4bf73dca653550b460306fa3808d864a685903bdb95ba07a6e1cd2899";
     };
+    dependencies = [];
+
   };
 
-
-
-  golang = buildVimPlugin {
-    name = "golang-git-2014-08-06";
+  vim-addon-vim2nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-addon-vim2nix-2015-06-01";
     src = fetchgit {
-      url = "https://github.com/jnwhiteh/vim-golang.git";
-      rev = "e6d0c6a72a66af2674b96233c4747661e0f47a8c";
-      sha256 = "1231a2eff780dbff4f885fcb4f656f7dd70597e1037ca800470de03bf0c5e7af";
-     };
-    meta = {
-      homepage = https://github.com/jnwhiteh/vim-golang;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/JagaJaga/vim-addon-vim2nix";
+      rev = "fc2eeffca48b224ef15beda57586f6d1271ff68d";
+      sha256 = "b626dab117b9331b6f9ff0bf05ac1f479db82a60dd5cb87a0f3a8d3d7de9220e";
     };
+    dependencies = ["vim-addon-manager"];
+
   };
 
-  hardtime = buildVimPlugin {
-    name = "hardtime-git-2014-10-21";
+  lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "lushtags-2013-12-27";
     src = fetchgit {
-      url = "https://github.com/takac/vim-hardtime.git";
-      rev = "b401c72528d1c23e4cc9bc9585fda4361d0199bf";
-      sha256 = "65e4bda7531076147fc46f496c8e56c740d1fcf8fe85c18cb2d2070d0c3803cd";
-     };
-    meta = {
-      homepage = https://github.com/takac/vim-hardtime;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  haskellconceal = buildVimPlugin {
-    name = "haskellconceal-git-2014-08-07";
-    src = fetchgit {
-      url = "https://github.com/twinside/vim-haskellconceal.git";
-      rev = "1d85e8f10b675d38ec117368ec8032f486c27f98";
-      sha256 = "8ae762939ea435333031a094f3c63e6edd534ac849f0008fa0440440f1f2f633";
-     };
-    meta = {
-      homepage = https://github.com/twinside/vim-haskellconceal;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-
-  hasksyn = buildVimPlugin {
-    name = "hasksyn-git-2014-09-03";
-    src = fetchgit {
-      url = "https://github.com/travitch/hasksyn.git";
-      rev = "c434040bf13a17ca20a551223021b3ace7e453b9";
-      sha256 = "b1a735928aeca7011b83133959d59b9c95ab8535fd00ce9968fae4c3b1381931";
-     };
-    meta = {
-      homepage = https://github.com/travitch/hasksyn;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  hdevtools = buildVimPlugin {
-    name = "hdevtools-git-2012-12-29";
-    src = fetchgit {
-      url = "https://github.com/bitc/vim-hdevtools.git";
-      rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1";
-      sha256 = "bf5f096b665c51ce611c6c1bfddc3267c4b2f94af84b04482b07272a6a5a92f3";
-     };
-    meta = {
-      homepage = https://github.com/bitc/vim-hdevtools;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  hier = buildVimPlugin {
-    name = "hier-git-2011-08-27";
-    src = fetchgit {
-      url = "https://github.com/jceb/vim-hier.git";
-      rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7";
-      sha256 = "f62836545abfe379f9c5410da28409947407cd282ef784b2db89aed0756a1785";
-     };
-    buildInputs = [ vim ];
-    meta = {
-      homepage = https://github.com/jceb/vim-hier;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  idris-vim = buildVimPlugin {
-    name = "idris-vim-git-2014-12-29";
-    src = fetchgit {
-      url = "https://github.com/idris-hackers/idris-vim.git";
-      rev = "6bdb44b85406b75e3b3a4fa265deab1dbe8c6ff1";
-      sha256 = "87677f3aa81f15dbaf4337f709952fd47c9fa28e8086033f2cfbd5b1f256e5ff";
-    };
-    meta = {
-      homepage = https://github.com/idris-hackers/idris-vim; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  ipython = buildVimPlugin {
-    name = "ipython-git-2015-01-12";
-    src = fetchgit {
-      url = "https://github.com/ivanov/vim-ipython.git";
-      rev = "a47d92b371588a81f8501c66604d79e2827c60a8";
-      sha256 = "7cf2dbed5b404164199d4784331b21d90d371275b1d324298cde9eeda3c4eb53";
-    };
-    meta = {
-      homepage = https://github.com/ivanov/vim-ipython; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  latex-box = buildVimPlugin {
-    name = "latex-box-git-2015-05-11";
-    src = fetchgit {
-      url = "https://github.com/latex-box-team/latex-box";
-      rev = "ede8371663e89c6e033f8ae387590422b8ea6dd0";
-      sha256 = "1d0f5244e681cc5c972ad043ebc2b8b5f751ba216ca44d4c07821dcb641c5f3d";
-    };
-    meta = {
-      homepage = https://github.com/latex-box-team/latex-box; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  lushtags = buildVimPlugin {
-    name = "lushtags-git-2013-12-27";
-    src = fetchgit {
-      url = "https://github.com/bitc/lushtags.git";
+      url = "git://github.com/bitc/lushtags";
       rev = "429fab3b748ae04ee5de0cbf75d947f15441e798";
       sha256 = "5170019fbe64b15be30a0ba82e6b01364d115ccad6ef690a6df86f73af22a0a7";
-     };
-    meta = {
-      homepage = https://github.com/bitc/lushtags;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
     };
+    dependencies = [];
+
   };
 
-  neco-ghc = buildVimPlugin {
-    name = "neco-ghc-git-2015-04-07";
+  vim-hdevtools = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-hdevtools-2012-12-29";
     src = fetchgit {
-      url = "https://github.com/eagletmt/neco-ghc";
+      url = "git://github.com/bitc/vim-hdevtools";
+      rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1";
+      sha256 = "bf5f096b665c51ce611c6c1bfddc3267c4b2f94af84b04482b07272a6a5a92f3";
+    };
+    dependencies = [];
+
+  };
+
+  vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-tmux-navigator-2015-05-29";
+    src = fetchgit {
+      url = "git://github.com/christoomey/vim-tmux-navigator";
+      rev = "176452ead44118174ddad3502709a247d9c24bb4";
+      sha256 = "789c8b24b971a3b307ac296234230f1048ff2928c89302700bd4e5fc2edd2d8a";
+    };
+    dependencies = [];
+
+  };
+
+  neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neco-ghc-2015-04-07";
+    src = fetchgit {
+      url = "git://github.com/eagletmt/neco-ghc";
       rev = "a45f4f98ee3f25eaa64a39328c253d4f78cd5fda";
       sha256 = "50bd8530b435c3ba0e0f01b230d7717074002ec229ddcc0cb20ee59ef2a28d59";
     };
-    meta = {
-      homepage = https://github.com/eagletmt/neco-ghc; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
+    dependencies = [];
+
   };
 
-  neocomplete = buildVimPlugin {
-    name = "neocomplete-git-2015-05-11";
+  YUNOcommit-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "YUNOcommit-vim-2014-11-26";
     src = fetchgit {
-      url = "https://github.com/Shougo/neocomplete.vim";
-      rev = "425eaacdaa126db647c1fc24c3357e6326c48bdc";
-      sha256 = "bb7dac68562fa5456aad0f993ee2caf962d53425e29659b7c5ae3d33d815a3ed";
-    };
-    meta = {
-      homepage = https://github.com/Shougo/neocomplete.vim; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/esneider/YUNOcommit.vim";
+      rev = "981082055a73ef076d7e27477874d2303153a448";
+      sha256 = "4bfd80720c353884e5c373b5457397a63e5e2e4ab4a97d6ce86c1740ac3b4c56";
     };
+    dependencies = [];
+
   };
 
-
-  neosnippet = buildVimPlugin {
-    name = "neosnippet-git-2015-05-04";
+  idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "idris-vim-2014-12-29";
     src = fetchgit {
-      url = "https://github.com/Shougo/neosnippet.vim";
-      rev = "48689a972d41256b423aa635dff689868a48e5bd";
-      sha256 = "a46be238526e0e39b4561c9a53351bbb43a5fec3a912bdf0b86ab2f031ccc383";
-    };
-    meta = {
-      homepage = https://github.com/Shougo/neosnippet.vim; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/idris-hackers/idris-vim";
+      rev = "6bdb44b85406b75e3b3a4fa265deab1dbe8c6ff1";
+      sha256 = "87677f3aa81f15dbaf4337f709952fd47c9fa28e8086033f2cfbd5b1f256e5ff";
     };
+    dependencies = [];
+
   };
 
-
-  neosnippet-snippets = buildVimPlugin {
-    name = "neosnippet-snippets-git-2015-05-10";
+  calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "calendar-vim-2015-05-21";
     src = fetchgit {
-      url = "https://github.com/Shougo/neosnippet-snippets";
-      rev = "c35446a74d3a5c11838a96b9f2e3673e56ced384";
-      sha256 = "92be7af28c0a64e8e3f0c5c7973fee36f7401d943ff97bd5deffe3f0e2760e5d";
-    };
-    meta = {
-      homepage = https://github.com/Shougo/neosnippet-snippets; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/itchyny/calendar.vim";
+      rev = "394c789d2235a7a056ba527daf722e9119cac1c8";
+      sha256 = "dfefb8d479096baa755185546624fffdd9c843da9c4fdbf17f213cdba599c08e";
     };
+    dependencies = [];
+
   };
 
-
-  quickrun = buildVimPlugin {
-    name = "quickrun-git-2015-05-02";
+  thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "thumbnail-vim-2015-03-15";
     src = fetchgit {
-      url = "https://github.com/thinca/vim-quickrun";
-      rev = "b40cdc36c3600fd096323d3e08c3bbd5d55ec8a8";
-      sha256 = "32e5870ff9bb7ae3fdd2c279c6580935c0f3cd9b306ce34a9e14b227d59e193b";
-    };
-    meta = {
-      homepage = https://github.com/thinca/vim-quickrun; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/itchyny/thumbnail.vim";
+      rev = "19bd717307a8d0986a4a77116f47168fbe11e178";
+      sha256 = "c8c100e1b0ee9c75fc3b6db00b68c47d91bcca8979f6de046aade43fd09e3882";
     };
+    dependencies = [];
+
   };
 
-
-  racer = buildVimPlugin {
-    name = "racer-git-2015-05-04";
+  vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-ipython-2015-05-30";
     src = fetchgit {
-      url = "https://github.com/phildawes/racer";
-      rev = "bf2373ec08b0be03598283bd610c5b61bdb8738c";
-      sha256 = "938516aef0674053886fcf032faa5ae87d14e4412c77aadd981dbe145a01ae51";
+      url = "git://github.com/ivanov/vim-ipython";
+      rev = "5876b483902313143adc2dcdfd8de94036e191a6";
+      sha256 = "6c0f3011dca269d8c862abb5477bcdbe3ec2fbe4fc6cebeb38e7f0816cedaae5";
     };
+    dependencies = [];
+
+  };
+
+  vim-hier = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-hier-2011-08-27";
+    src = fetchgit {
+      url = "git://github.com/jceb/vim-hier";
+      rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7";
+      sha256 = "f62836545abfe379f9c5410da28409947407cd282ef784b2db89aed0756a1785";
+    };
+    dependencies = [];
+    buildInputs = [ vim ];
+  };
+
+  vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-buffergator-2015-03-31";
+    src = fetchgit {
+      url = "git://github.com/jeetsukumaran/vim-buffergator";
+      rev = "77cfdd127fcf026ea2d5e8f5aaf85502286b16b7";
+      sha256 = "2d3ce83b5ea7d0502cea3e91bf1e2a0b27a046879c1b5ff1854df47028dd4d48";
+    };
+    dependencies = [];
+
+  };
+
+  tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tslime-vim-2015-02-10";
+    src = fetchgit {
+      url = "git://github.com/jgdavey/tslime.vim";
+      rev = "71ec1cbe8f9ead9805f8e0c3b76c590aeb5ed0b7";
+      sha256 = "81f45f579dcc239ce0b9689044d0e92969f7538759ab0cd88596c7a010d8730b";
+    };
+    dependencies = [];
+
+  };
+
+  vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-nerdtree-tabs-2014-09-25";
+    src = fetchgit {
+      url = "git://github.com/jistr/vim-nerdtree-tabs";
+      rev = "0decec122e9bb3e9328b01fa20a9650e79cc6ca7";
+      sha256 = "ac4bfc3ae18e8a62ef8e20d0dd0a0f7c172d0ebd5fed58c533ccccec3ae7bdc2";
+    };
+    dependencies = [];
+
+  };
+
+  vim-golang = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-golang-2014-08-06";
+    src = fetchgit {
+      url = "git://github.com/jnwhiteh/vim-golang";
+      rev = "e6d0c6a72a66af2674b96233c4747661e0f47a8c";
+      sha256 = "1231a2eff780dbff4f885fcb4f656f7dd70597e1037ca800470de03bf0c5e7af";
+    };
+    dependencies = [];
+
+  };
+
+  vim-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-xdebug-2012-08-15";
+    src = fetchgit {
+      url = "git://github.com/joonty/vim-xdebug";
+      rev = "a4980fa65f7f159780593ee37c178281691ba2c4";
+      sha256 = "1ccb0e63eaf68548feb1c37b09c07c84b6bea9b350c4257549f091aa414601e2";
+    };
+    dependencies = [];
+    postInstall = false;
+  };
+
+  vim-eighties = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-eighties-2015-04-16";
+    src = fetchgit {
+      url = "git://github.com/justincampbell/vim-eighties";
+      rev = "d202e6015163bbb4f7c9973f2eac66c2351e8c24";
+      sha256 = "ad7341c8d7ab659b062a67f893962b08596466a6a3a3395f28a4f4031a36eb9c";
+    };
+    dependencies = [];
+
+  };
+
+  latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "latex-box-2015-05-16";
+    src = fetchgit {
+      url = "git://github.com/latex-box-team/latex-box";
+      rev = "55a88ed55a7631b91321916cf80c47077d478c9c";
+      sha256 = "96203a95d919db65574e187b793a7d846463d91fe641349732cc5d9aeb8242ac";
+    };
+    dependencies = [];
+
+  };
+
+  vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-jinja-2014-06-11";
+    src = fetchgit {
+      url = "git://github.com/lepture/vim-jinja";
+      rev = "4412484b410b15caecd71f2e52758b2a90ea124d";
+      sha256 = "650c7f23688e8982f30be3f7d45b73d9c1d283f10a6829e518e2583b4a52befc";
+    };
+    dependencies = [];
+
+  };
+
+  vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-easymotion-2015-04-21";
+    src = fetchgit {
+      url = "git://github.com/lokaltog/vim-easymotion";
+      rev = "9f1c449edfce6d61c7f620e3a9c1389b7b7e334f";
+      sha256 = "ba358f3acc120d9cf1854205bde0fa345d156e7f69a1854987e74bb137889c54";
+    };
+    dependencies = [];
+
+  };
+
+  vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-xkbswitch-2015-05-19";
+    src = fetchgit {
+      url = "git://github.com/lyokha/vim-xkbswitch";
+      rev = "0854ac6a810daae4a5c99bcae61613266ce75c26";
+      sha256 = "886a173d48340ad0ddeb3c852e4f2bdfc7b513a9d5a954115d081a3e276fa655";
+    };
+    dependencies = [];
+    buildInputs = [ xkb_switch ];
+  };
+
+  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";
+      rev = "c664376ba814de3f87cb7641f90b2c6a9dd53671";
+      sha256 = "12a9aad40112200060c3ee86f96589a264db287bdfeb3eb6fdf0f22a6656a5f6";
+    };
+    dependencies = [];
+
+  };
+
+  shabadou-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "shabadou-vim-2014-07-27";
+    src = fetchgit {
+      url = "git://github.com/osyo-manga/shabadou.vim";
+      rev = "c5af30bb0c028d53cfd89e00cab636c844034a9a";
+      sha256 = "392efa8a5e725219e478b571d9a30ddba88d47662467ed3123a168e8b55c4de6";
+    };
+    dependencies = [];
+
+  };
+
+  vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-watchdogs-2015-04-16";
+    src = fetchgit {
+      url = "git://github.com/osyo-manga/vim-watchdogs";
+      rev = "5e3d1db592297f7d4c563900a6d224ff559f533e";
+      sha256 = "3d4c9624d86815dd47d7655eb58a703574f2ecb92238ae4e65dc67fc9960820a";
+    };
+    dependencies = [];
+
+  };
+
+  racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "racer-2015-06-01";
+    src = fetchgit {
+      url = "git://github.com/phildawes/racer";
+      rev = "7425ae5299ed3f89817945fd867403e825070df6";
+      sha256 = "0721528de38e179ab887ccb06339dabcc5aa43c564f47fa06a372ace6e9ba457";
+    };
+    dependencies = [];
     buildPhase = ''
       find . -type f -not -name 'racer.vim' -exec rm -rf {} \;
       rm -rf editors images src
     '';
-    meta = {
-      homepage = https://github.com/phildawes/racer;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
   };
 
-  shabadou = buildVimPlugin {
-    name = "shabadou-git-2014-07-27";
+  neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neocomplete-vim-2015-05-26";
     src = fetchgit {
-      url = "https://github.com/osyo-manga/shabadou.vim.git";
-      rev = "c5af30bb0c028d53cfd89e00cab636c844034a9a";
-      sha256 = "392efa8a5e725219e478b571d9a30ddba88d47662467ed3123a168e8b55c4de6";
-     };
-    meta = {
-      homepage = https://github.com/osyo-manga/shabadou.vim;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/shougo/neocomplete.vim";
+      rev = "0a8a7e8a72a23459c2eda5116fe9b22b0dad7a3e";
+      sha256 = "fe75653939e1299b71708a26a9af2ca1e4ac0f1daed8aa98ce46b8bb26c9bd71";
     };
+    dependencies = [];
+
   };
 
-  stylish-haskell = buildVimPlugin {
-    name = "stylish-haskell-git-2015-05-10";
+  neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neosnippet-snippets-2015-05-28";
     src = fetchgit {
-      url = "https://github.com/nbouscal/vim-stylish-haskell";
-      rev = "c664376ba814de3f87cb7641f90b2c6a9dd53671";
-      sha256 = "12a9aad40112200060c3ee86f96589a264db287bdfeb3eb6fdf0f22a6656a5f6";
-    };
-    meta = {
-      homepage = https://github.com/nbouscal/vim-stylish-haskell; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/shougo/neosnippet-snippets";
+      rev = "842622af4ce0e559ba64f4b991d0de8b9cade6af";
+      sha256 = "5d9a3c2d06edb3146e0dbdbba7d8c411197914bea8192844a3c849987e23a72a";
     };
+    dependencies = [];
+
   };
 
-
-  tabmerge = buildVimPlugin {
-    name = "tabmerge-git-2010-10-17";
+  neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neosnippet-vim-2015-05-12";
     src = fetchgit {
-      url = "https://github.com/vim-scripts/tabmerge.git";
-      rev = "074e5f06f26e7108a0570071a0f938a821768c06";
-      sha256 = "b84501b0fc5cd51bbb58f12f4c2b3a7c97b03fe2a76446b56a2c111bd4f7335f";
-     };
-    meta = {
-      homepage = https://github.com/vim-scripts/tabmerge;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/shougo/neosnippet.vim";
+      rev = "e2c830db87e50e8cdb1128f3096664f68cb05cad";
+      sha256 = "bc950c1756d3c276dc231563749a9fbe7de0d5595e30428e1408bb530bc61e6f";
     };
+    dependencies = [];
+
   };
 
-  taglist = buildVimPlugin {
-    name = "taglist-4.6";
-    meta = with stdenv.lib; {
-      description = "Source code browser plugin";
-      homepage    = "http://www.vim.org/scripts/script.php?script_id=273";
-      license     = licenses.gpl3;
-      maintainers = with maintainers; [ lovek323 ];
-      platforms   = platforms.unix;
-    };
-    src = fetchurl {
-      url    = "http://www.vim.org/scripts/download_script.php?src_id=19574";
-      name   = "taglist_46.zip";
-      sha256 = "18cbv462vwg7vip2p99qlahm99hswav96cj4ki227kyi05q2lkjj";
-    };
-    setSourceRoot = ''
-      export sourceRoot=taglist
-      mkdir taglist
-      mv doc taglist
-      mv plugin taglist
-    '';
-    buildInputs = [ unzip ];
-  };
-
-  thumbnail = buildVimPlugin {
-    name = "thumbnail-git-2015-03-15";
+  vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vimproc-vim-2015-05-14";
     src = fetchgit {
-      url = "https://github.com/itchyny/thumbnail.vim.git";
-      rev = "19bd717307a8d0986a4a77116f47168fbe11e178";
-      sha256 = "c8c100e1b0ee9c75fc3b6db00b68c47d91bcca8979f6de046aade43fd09e3882";
-     };
-    meta = {
-      homepage = https://github.com/itchyny/thumbnail.vim;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  tmux-navigator = buildVimPlugin {
-    name = "tmux-navigator-git-2015-03-16";
-    src = fetchgit {
-      url = "https://github.com/christoomey/vim-tmux-navigator.git";
-      rev = "928a52fbda90ec70b2eb6edaf570654df4521af0";
-      sha256 = "6f6912960245664146ead711886aad216b74f4c6b1feec975cab199114afb13c";
-     };
-    meta = {
-      homepage = https://github.com/christoomey/vim-tmux-navigator;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-
-  tslime = buildVimPlugin {
-    name = "tslime-git-2015-02-10";
-    src = fetchgit {
-      url = "https://github.com/jgdavey/tslime.vim.git";
-      rev = "71ec1cbe8f9ead9805f8e0c3b76c590aeb5ed0b7";
-      sha256 = "81f45f579dcc239ce0b9689044d0e92969f7538759ab0cd88596c7a010d8730b";
-     };
-    meta = {
-      homepage = https://github.com/jgdavey/tslime.vim;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
-  };
-
-  vim-buffergator = buildVimPlugin {
-    name = "vim-buffergator-2015-03-31";
-    src = fetchFromGitHub {
-      owner = "jeetsukumaran";
-      repo = "vim-buffergator";
-      rev = "77cfdd127f";
-      sha256 = "11r9845kplwahf2d41whs2lg3bzy0dahs0mvmdbckp7ckq3gd3y4";
-      };
-     meta = with stdenv.lib; {
-      description = "Vim plugin to list, select and switch between buffers";
-      license = licenses.gpl3;
-      maintainers = with maintainers; [ hbunke ];
-     };
-  };
-
-  vim-jinja = buildVimPlugin {
-    name = "vim-jinja-git-2014-06-11";
-    src = fetchFromGitHub {
-      owner = "lepture";
-      repo = "vim-jinja";
-      rev = "4412484b41";
-      sha256="1z5ya953nn7233jjjs0ay61x5hfrfddx9xz31grq52cfd0ipy335";
-    };
-   meta = {
-    homepage = "https://github.com/lepture/vim-jinja";
-    maintainers = [ stdenv.lib.maintainers.hbunke ];
-    };
-  };
-
-  vim-nerdtree-tabs = buildVimPlugin {
-    name = "vim-nerdtree-tabs-2014-09-25";
-    src = fetchFromGitHub {
-      owner = "jistr";
-      repo = "vim-nerdtree-tabs";
-      rev = "0decec122e";
-      sha256 = "0m51vpxq0d3mxy9i18hczsbqsqi7vlzwgjnpryb8gb5wmy999d6l";
-    };
-    meta = with stdenv.lib; {
-      description = "NERDTree and tabs together in Vim, painlessly";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ hbunke ];
-    };
-  };
-
-  vimproc = buildVimPlugin {
-    name = "vimproc-git-2015-05-10";
-    src = fetchgit {
-      url = "https://github.com/shougo/vimproc.vim";
-      rev = "421827f0971a62ba3d67e2ed158a7d282c5d05bb";
-      sha256 = "158d6d3990528730dbf699326cfb402c33ab3322e5d7ab6c95d84b0bd6292aee";
+      url = "git://github.com/shougo/vimproc.vim";
+      rev = "c286dcbdfca9e0ee1a4cb90f09c3f03638112f5a";
+      sha256 = "884753f4f188cee5fb11e4dfb5aaf8b80d4809e637ab91068af1a5787acdcb19";
     };
+    dependencies = [];
     buildInputs = [ which ];
 
     buildPhase = ''
       sed -i 's/vimproc_mac\.so/vimproc_unix\.so/' autoload/vimproc.vim
       make -f make_unix.mak
     '';
-
-    meta = {
-      homepage = https://github.com/shougo/vimproc.vim;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
-    };
   };
 
-  vimshell = buildVimPlugin {
-    name = "vimshell-git-2015-05-01";
+  vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vimshell-vim-2015-05-01";
     src = fetchgit {
-      url = "https://github.com/Shougo/vimshell.vim";
+      url = "git://github.com/shougo/vimshell.vim";
       rev = "4939e10609c434becf6423b2f3876bb9c2be3464";
       sha256 = "72bc6ca7b8ebcdf1d4617c73fc2688486f71a9f8b8601627fbbada3a4cfb28ca";
     };
-    meta = with stdenv.lib; {
-      description = "An extreme shell that doesn't depend on external shells and is written completely in Vim script";
-      homepage    = https://github.com/Shougo/vimshell.vim;
-      repositories.git = https://github.com/Shougo/vimshell.vim.git;
-      license     = licenses.gpl3;
-      maintainers = with maintainers; [ lovek323 ];
-      platforms   = platforms.unix;
-    };
-    buildInputs = [ vimproc ];
-    preBuild = ''
-      sed -ie '1 i\
-      set runtimepath+=${vimproc}/${rtpPath}/vimproc\
-      ' autoload/vimshell.vim
-    '';
+    dependencies = [ "vimproc-vim" ];
   };
 
-  vim-wakatime = buildVimPlugin {
-    name = "vim-wakatime-4.0.1";
-
-    src = fetchFromGitHub {
-      sha256 = "0vhnfjl9qv6qwfvf106cw4mg4xss2nsafz5k2jadkryss6f3ga10";
-      rev = "1e2ba90f708965719ed52c4ea2728bc3cfa32f6d";
-      repo = "vim-wakatime";
-      owner = "wakatime";
-    };
-
-    meta = with stdenv.lib; {
-      description = "Analytics about your programming";
-      homepage = https://wakatime.com;
-      license = licenses.bsd3;
-      platforms = with platforms; linux;
-      maintainers = with maintainers; [ nckx ];
-    };
-
-    buildInputs = [ python ];
-  };
-
-  watchdogs = buildVimPlugin {
-    name = "watchdogs-git-2015-04-16";
+  vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-hardtime-2014-10-21";
     src = fetchgit {
-      url = "https://github.com/osyo-manga/vim-watchdogs";
-      rev = "5e3d1db592297f7d4c563900a6d224ff559f533e";
-      sha256 = "3d4c9624d86815dd47d7655eb58a703574f2ecb92238ae4e65dc67fc9960820a";
-    };
-    meta = {
-      homepage = https://github.com/osyo-manga/vim-watchdogs; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/takac/vim-hardtime";
+      rev = "b401c72528d1c23e4cc9bc9585fda4361d0199bf";
+      sha256 = "65e4bda7531076147fc46f496c8e56c740d1fcf8fe85c18cb2d2070d0c3803cd";
     };
+    dependencies = [];
+
   };
 
-  xdebug = buildVimPlugin {
-    name = "xdebug-git-2012-08-15";
+  vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-quickrun-2015-05-15";
     src = fetchgit {
-      url = "https://github.com/joonty/vim-xdebug.git";
-      rev = "a4980fa65f7f159780593ee37c178281691ba2c4";
-      sha256 = "1ccb0e63eaf68548feb1c37b09c07c84b6bea9b350c4257549f091aa414601e2";
-     };
-    postInstall = false;
-    meta = {
-      homepage = https://github.com/joonty/vim-xdebug;
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/thinca/vim-quickrun";
+      rev = "c7800ea3d01209da678708e4d3b5175009551807";
+      sha256 = "375668b6fd7cf64a26f752afcdd976f79a9dc12b045eed8afafce6486740f143";
     };
+    dependencies = [];
+
   };
 
-  xkbswitch = buildVimPlugin {
-    name = "xkbswitch-git-2015-01-18";
+  hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "hasksyn-2014-09-03";
     src = fetchgit {
-      url = "https://github.com/lyokha/vim-xkbswitch.git";
-      rev = "932765d8a45b0c8b994b920505b8f10cc7e8cad0";
-      sha256 = "20e1f7196b65d98687a27c8a3f2d0847701890a0818dfcfec13f24a3151b0e73";
-     };
-    buildInputs = [ xkb_switch ];
-    meta = {
-      homepage = https://github.com/lyokha/vim-xkbswitch; 
-      maintainers = [ stdenv.lib.maintainers.jagajaga ];
+      url = "git://github.com/travitch/hasksyn";
+      rev = "c434040bf13a17ca20a551223021b3ace7e453b9";
+      sha256 = "b1a735928aeca7011b83133959d59b9c95ab8535fd00ce9968fae4c3b1381931";
     };
+    dependencies = [];
+
   };
 
-
- YouCompleteMe = buildVimPlugin {
-    name = "YouCompleteMe-git-2015-05-07";
+  vim-haskellconceal = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-haskellconceal-2014-10-28";
     src = fetchgit {
-      url = "https://github.com/Valloric/YouCompleteMe";
-      rev = "295769ccfd304246c1fae847416a2a15771f7d98";
-      sha256 = "04qcbbxm3qhb2f3awhrwprffm3jh54z4ag6r49aa8xk0l9k8i8sp";
+      url = "git://github.com/twinside/vim-haskellconceal";
+      rev = "f73c5dd660b7009a050b131783d7c17b4954e4d9";
+      sha256 = "1ebf98b170642d342207eb8c16551f9969f884b3be975b8755f1018947053ba8";
     };
+    dependencies = [];
 
+  };
+
+  youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "youcompleteme-2015-05-29";
+    src = fetchgit {
+      url = "git://github.com/valloric/youcompleteme";
+      rev = "c2d962dddb4cc86f771722e9775d2345d31fe8bb";
+      sha256 = "2543d42662e99401ac8b4ff938fe5452b6d0215befc155e9b24590533a4bfe06";
+    };
+    dependencies = [];
     buildInputs = [
       python cmake
       llvmPackages.clang-unwrapped llvmPackages.llvm
@@ -635,275 +716,80 @@ rec {
     };
   };
 
-
-  YUNOcommit = buildVimPlugin {
-    name = "YUNOcommit";
+  Colour-Sampler-Pack = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "Colour-Sampler-Pack-2012-11-29";
     src = fetchgit {
-      url = "https://github.com/esneider/YUNOcommit.vim";
-      rev = "981082055a73ef076d7e27477874d2303153a448";
-      sha256 = "4bfd80720c353884e5c373b5457397a63e5e2e4ab4a97d6ce86c1740ac3b4c56";
-    
+      url = "git://github.com/vim-scripts/Colour-Sampler-Pack";
+      rev = "05cded87b2ef29aaa9e930230bb88e23abff4441";
+      sha256 = "e3dd18f9fd36543e0c87257b7eaa999a82d75cbfa6dce4dfea403fa751c8620f";
     };
     dependencies = [];
-  };
-
-
-  ### section II: automatically generated plugin derivations
-  # Update with vimUtils.vimPlugins.pluginnames2Nix command
-
-  # This is not a plugin, it provides bin/vim-open-buffer-with-plugins-derivations
-  # which recreates this the following derivations based on ./vim-plugin-names
-  pluginnames2nix = vimUtils.pluginnames2Nix {
-    name = "vim-plugin-names-to-nix";
-    namefiles = [./vim-plugin-names];
-  };
-
-  # aliasess
-  tabular = Tabular;
-  tagbar = Tagbar;
-  coffee-script = vim-coffee-script;
-  coffeeScript = coffee-script; # backwards compat, added 2014-10-18
-  colors-solarized = Solarized;
-  colorsamplerpack = Colour_Sampler_Pack;
-  easy-align = vim-easy-align;
-  ghc-mod-vim = ghcmod;
-  gist-vim = Gist;
-  gundo = Gundo;
-  hoogle = Hoogle;
-  latex-live-preview = vim-latex-live-preview;
-  nerdtree = The_NERD_tree;
-  signature = vim-signature;
-  supertab = Supertab;
-  syntastic = Syntastic;
-  webapi-vim = WebAPI;
-  yankring = YankRing;
-  "sourcemap.vim" = sourcemap;
-
-
-  ### The following derivations are generated by nix#ExportPluginsForNix
-
-  "Colour_Sampler_Pack" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Colour_Sampler_Pack";
-    src = fetchurl {
-      url = "http://www.vim.org/scripts/download_script.php?src_id=18915";
-      name = "ColorSamplerPack.zip";
-      sha256 = "1wsrb3vpqn9fncnalfpvc8r92wk1mcskm4shb3s2h9x5dyihf2rd";
-    };
-    buildInputs = [ unzip ];
-    dependencies = [];
-    meta = {
-       url = "http://www.vim.org/scripts/script.php?script_id=625";
-    };
-
 
   };
-  "Gist" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Gist-2015-05-06";
+
+  a-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "a-vim-git-2010-11-06";
     src = fetchgit {
-      url = "git://github.com/mattn/gist-vim";
-      rev = "6130b8ee438ad55572c5de1cb974ef824163a1f4";
-      sha256 = "5142abefc6f5eaf5f2cce4f5222782b7d9e1033a3e54db7bca0dcf2bd7575853";
+      url = "git://github.com/vim-scripts/a.vim";
+      rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
+      sha256 = "ca0982873ed81e7f6545a6623b735104c574fe580d5f21b0aa3dc1557edac240";
     };
     dependencies = [];
 
   };
-  "Gundo" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Gundo";
-    src = fetchhg {
-      url = "https://bitbucket.org/sjl/gundo.vim";
-      rev = "eb9fc8676b89";
-      sha256 = "05lcxrd9ibfi02ja4jvl5y5pp884b8kh9aarw045b0mlldygv6cp";
-    };
-    dependencies = [];
 
-  };
-  "Hoogle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Hoogle-2013-11-26";
+  align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "align-git-2012-08-07";
     src = fetchgit {
-      url = "git://github.com/Twinside/vim-hoogle";
-      rev = "81f28318b0d4174984c33df99db7752891c5c4e9";
-      sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0";
+      url = "git://github.com/vim-scripts/align";
+      rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77";
+      sha256 = "f7b5764357370f03546556bd45558837f3790b0e86afadb63cd04d714a668a29";
     };
     dependencies = [];
 
   };
-  "Solarized" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Solarized-2011-05-09";
+
+  tabmerge = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tabmerge-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/altercation/vim-colors-solarized";
-      rev = "528a59f26d12278698bb946f8fb82a63711eec21";
-      sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315";
+      url = "git://github.com/vim-scripts/tabmerge";
+      rev = "074e5f06f26e7108a0570071a0f938a821768c06";
+      sha256 = "b84501b0fc5cd51bbb58f12f4c2b3a7c97b03fe2a76446b56a2c111bd4f7335f";
     };
     dependencies = [];
 
   };
-  "Supertab" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Supertab-2015-02-15";
+
+  vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-wakatime-2015-05-31";
     src = fetchgit {
-      url = "git://github.com/ervandew/supertab";
-      rev = "c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7";
-      sha256 = "e9e4054c683435b36adf87bebb4895c06a7e85130a807d8c9307588d4744b04b";
+      url = "git://github.com/wakatime/vim-wakatime";
+      rev = "1e2ba90f708965719ed52c4ea2728bc3cfa32f6d";
+      sha256 = "ebd5a651554742727944f4a705ccbe990875d4ed656fc535183474091bcf1f1c";
     };
     dependencies = [];
-
+    buildInputs = [ python ];
   };
-  "Syntastic" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2015-05-09";
+
+  command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "command-t-2015-04-29";
     src = fetchgit {
-      url = "git://github.com/scrooloose/syntastic";
-      rev = "5dba05af4fb9e69472a994bb1228c6b86a47911a";
-      sha256 = "a6f2a77dec55d2bb2abe742e24865d2311c12f030290f31ad9219e4d787a6d3c";
+      url = "git://github.com/wincent/command-t";
+      rev = "f7344ebbe95c532b2ad01f19877d6d611db0193b";
+      sha256 = "21d7ee2bbff3f79ec3c81bcf683acac6528ea89faef8b7dd075cc83662930a50";
     };
     dependencies = [];
-
+    buildInputs = [ perl ruby ];
+    buildPhase = ''
+      pushd ruby/command-t
+      ruby extconf.rb
+      make
+      popd
+    '';
   };
-  "Tabular" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tabular-2013-05-16";
-    src = fetchgit {
-      url = "git://github.com/godlygeek/tabular";
-      rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb";
-      sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f";
-    };
-    dependencies = [];
 
-  };
-  "Tagbar" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tagbar-2015-05-10";
-    src = fetchgit {
-      url = "git://github.com/majutsushi/tagbar";
-      rev = "399b75256ac7333d7119d11047f6b3aff8fa2828";
-      sha256 = "8562fac0f2d690537b4c1049ba67b440116135167b48b9feb21655c9931b875c";
-    };
-    dependencies = [];
-
-  };
-  "The_NERD_Commenter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_Commenter-2014-07-08";
-    src = fetchgit {
-      url = "git://github.com/scrooloose/nerdcommenter";
-      rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6";
-      sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e";
-    };
-    dependencies = [];
-
-  };
-  "The_NERD_tree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2015-05-06";
-    src = fetchgit {
-      url = "git://github.com/scrooloose/nerdtree";
-      rev = "a87b1bf3c566c3f80090996a2a2a1201318478a8";
-      sha256 = "4422563a44f14aa008b5e7ef8b7df1f7fc1ffdca1323a3cb1c115409e325a87e";
-    };
-    dependencies = [];
-
-  };
-  "UltiSnips" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "UltiSnips-2015-05-11";
-    src = fetchgit {
-      url = "git://github.com/sirver/ultisnips";
-      rev = "188e00f7b87297ea7737f9494d531c7073637332";
-      sha256 = "9fb127b32bd0e2ae139b3b6008849f4566cfb1c29087e787570428c770a3430c";
-    };
-    dependencies = [];
-
-  };
-  "VimOutliner" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "VimOutliner-2015-01-09";
-    src = fetchgit {
-      url = "git://github.com/vimoutliner/vimoutliner";
-      rev = "7c995f973c54b0d026137615af28059890edb197";
-      sha256 = "9d1526ec99904fd2ccfdb4dd6763b4cd04048cb74bb7a0a4c9b4a7b1f5d75cb5";
-    };
-    dependencies = [];
-
-  };
-  "WebAPI" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "WebAPI-2014-10-27";
-    src = fetchgit {
-      url = "git://github.com/mattn/webapi-vim";
-      rev = "a7789abffe936db56e3152e23733847f94755753";
-      sha256 = "455b84d9fd13200ff5ced5d796075f434a7fb9c00f506769174579266ae2be80";
-    };
-    dependencies = [];
-
-  };
-  "YankRing" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "YankRing";
-    src = fetchurl {
-      url = "http://www.vim.org/scripts/download_script.php?src_id=20842";
-      name = "yankring_180.zip";
-      sha256 = "0bsq4pxagy12jqxzs7gcf25k5ahwif13ayb9k8clyhm0jjdkf0la";
-    };
-    buildInputs = [ unzip ];
-    dependencies = [];
-    meta = {
-       url = "http://www.vim.org/scripts/script.php?script_id=1234";
-    };
-
-
-  };
-  "commentary" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "commentary-2014-11-10";
-    src = fetchgit {
-      url = "git://github.com/tpope/vim-commentary";
-      rev = "9c685131a5facfa0d643feca3a61b41c007d8170";
-      sha256 = "2a9f394d0669429469c2f1ddaf9a722c2773f35da08ea9496d3b4b4e85b6038d";
-    };
-    dependencies = [];
-
-  };
-  "ctrlp" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-2013-07-29";
-    src = fetchgit {
-      url = "git://github.com/kien/ctrlp.vim";
-      rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f";
-      sha256 = "41f7884973770552395b96f8693da70999dc815462d4018c560d3ff6be462e76";
-    };
-    dependencies = [];
-
-  };
-  "extradite" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "extradite-2015-01-26";
-    src = fetchgit {
-      url = "git://github.com/int3/vim-extradite";
-      rev = "a1dc4b63befd5032e65a0c94e7257d4636aa6a3f";
-      sha256 = "94e05bbe36c9d4cee9832530531eedff0da509d5a0a52beee4e524fd4ad96714";
-    };
-    dependencies = [];
-
-  };
-  "fugitive" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2015-03-31";
-    src = fetchgit {
-      url = "git://github.com/tpope/vim-fugitive";
-      rev = "4cc201cbe3a0c3faa4cde1b82ba941d410e5e81c";
-      sha256 = "f7e79b5e823639d0b9e2c46c29cdae621b22b3bb0c601dce058083877dad2e13";
-    };
-    dependencies = [];
-
-  };
-  "ghcmod" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ghcmod-2015-03-17";
-    src = fetchgit {
-      url = "git://github.com/eagletmt/ghcmod-vim";
-      rev = "7e5f6102aa709244f5d4cedec807eac4b901c4cb";
-      sha256 = "47c5f5c4bf73dca653550b460306fa3808d864a685903bdb95ba07a6e1cd2899";
-    };
-    dependencies = [];
-
-  };
-  "github:JagaJaga/vim-addon-vim2nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "github-JagaJaga-vim-addon-vim2nix-2015-03-06";
-    src = fetchgit {
-      url = "git://github.com/JagaJaga/vim-addon-vim2nix";
-      rev = "343d8a4e43a5b40f134e73be7140f754ca74d2e5";
-      sha256 = "466ac56d4397d964cf21a63d31f2628fdea40bc94a54018affe8717de8514564";
-    };
-    dependencies = ["vim-addon-manager"];
-
-  };
-  "matchit.zip" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "matchit.zip";
+  matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "matchit-zip";
     src = fetchurl {
       url = "http://www.vim.org/scripts/download_script.php?src_id=8196";
       name = "matchit.zip";
@@ -915,15 +801,16 @@ rec {
        url = "http://www.vim.org/scripts/script.php?script_id=39";
     };
 
-  unpackPhase = ''
-    (
-     sourceRoot=d
-     mkdir $sourceRoot; cd $sourceRoot;
-     unzip $src
-    )
-  '';
+    unpackPhase = ''
+      (
+       sourceRoot=d
+       mkdir $sourceRoot; cd $sourceRoot;
+       unzip $src
+      )
+    '';
   };
-  "pathogen" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "pathogen-2014-11-06";
     src = fetchgit {
       url = "git://github.com/tpope/vim-pathogen";
@@ -933,7 +820,8 @@ rec {
     dependencies = [];
 
   };
-  "quickfixstatus" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "quickfixstatus-2011-09-02";
     src = fetchgit {
       url = "git://github.com/dannyob/quickfixstatus";
@@ -943,7 +831,8 @@ rec {
     dependencies = [];
 
   };
-  "rainbow_parentheses" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  rainbow_parentheses = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "rainbow_parentheses-2013-03-04";
     src = fetchgit {
       url = "git://github.com/kien/rainbow_parentheses.vim";
@@ -953,7 +842,8 @@ rec {
     dependencies = [];
 
   };
-  "rust" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "rust-2015-01-29";
     src = fetchgit {
       url = "git://github.com/wting/rust.vim";
@@ -963,7 +853,8 @@ rec {
     dependencies = [];
 
   };
-  "sensible" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "sensible-2015-04-04";
     src = fetchgit {
       url = "git://github.com/tpope/vim-sensible";
@@ -973,7 +864,8 @@ rec {
     dependencies = [];
 
   };
-  "snipmate" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "snipmate-2015-04-04";
     src = fetchgit {
       url = "git://github.com/garbas/vim-snipmate";
@@ -983,7 +875,8 @@ rec {
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
-  "sourcemap" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  sourcemap = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "sourcemap-2012-09-19";
     src = fetchgit {
       url = "git://github.com/chikatoike/sourcemap.vim";
@@ -993,7 +886,8 @@ rec {
     dependencies = [];
 
   };
-  "surround" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "surround-2015-03-15";
     src = fetchgit {
       url = "git://github.com/tpope/vim-surround";
@@ -1003,7 +897,8 @@ rec {
     dependencies = [];
 
   };
-  "table-mode" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "table-mode-2015-04-21";
     src = fetchgit {
       url = "git://github.com/dhruvasagar/vim-table-mode";
@@ -1013,17 +908,40 @@ rec {
     dependencies = [];
 
   };
-  "tlib" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tlib-2015-05-04";
+
+  taglist = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "taglist";
+    src = fetchurl {
+      url = "http://www.vim.org/scripts/download_script.php?src_id=19574";
+      name = "taglist_46.zip";
+      sha256 = "18cbv462vwg7vip2p99qlahm99hswav96cj4ki227kyi05q2lkjj";
+    };
+    buildInputs = [ unzip ];
+    dependencies = [];
+    meta = {
+       url = "http://www.vim.org/scripts/script.php?script_id=273";
+    };
+
+    setSourceRoot = ''
+      export sourceRoot=taglist
+      mkdir taglist
+      mv doc taglist
+      mv plugin taglist
+    '';
+  };
+
+  tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tlib-2015-05-20";
     src = fetchgit {
       url = "git://github.com/tomtom/tlib_vim";
-      rev = "ecf9e08de8b8ed8cf5e1f69f69471b04b7d55652";
-      sha256 = "5d3d5f066b23be90c3c4de54967056378fff931594154c4e5541a3bcd424b795";
+      rev = "c9ffbef0718a35bd30eb711456e2100e4adf79f7";
+      sha256 = "b0752538ee629c6f2c52d3b2b2fb61247bcd186ef9610ad8ae5c7d24ea41d971";
     };
     dependencies = [];
 
   };
-  "undotree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "undotree-2015-03-01";
     src = fetchgit {
       url = "git://github.com/mbbill/undotree";
@@ -1033,7 +951,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-addon-actions" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-actions-2014-09-22";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-actions";
@@ -1043,7 +962,8 @@ rec {
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
-  "vim-addon-async" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-async-2013-10-18";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-async";
@@ -1053,7 +973,8 @@ rec {
     dependencies = ["vim-addon-signs"];
 
   };
-  "vim-addon-background-cmd" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-background-cmd = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-background-cmd-2015-01-05";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-background-cmd";
@@ -1063,7 +984,8 @@ rec {
     dependencies = ["vim-addon-mw-utils"];
 
   };
-  "vim-addon-commenting" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-commenting = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-commenting-2013-06-10";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-commenting";
@@ -1073,7 +995,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-addon-completion" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-completion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-completion-2015-02-10";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-completion";
@@ -1083,7 +1006,8 @@ rec {
     dependencies = ["tlib"];
 
   };
-  "vim-addon-errorformats" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-errorformats = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-errorformats-2014-11-05";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-errorformats";
@@ -1093,7 +1017,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-addon-goto-thing-at-cursor" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-goto-thing-at-cursor-2012-01-11";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor";
@@ -1103,7 +1028,8 @@ rec {
     dependencies = ["tlib"];
 
   };
-  "vim-addon-local-vimrc" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-local-vimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-local-vimrc-2015-03-19";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-local-vimrc";
@@ -1113,7 +1039,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-addon-manager" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-manager-2014-12-03";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-manager";
@@ -1123,7 +1050,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-addon-mru" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-mru = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-mru-2013-08-08";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-mru";
@@ -1133,7 +1061,8 @@ rec {
     dependencies = ["vim-addon-other" "vim-addon-mw-utils"];
 
   };
-  "vim-addon-mw-utils" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-mw-utils = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-mw-utils-2012-11-05";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-mw-utils";
@@ -1143,7 +1072,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-addon-nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-nix-2015-03-10";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-nix";
@@ -1153,7 +1083,8 @@ rec {
     dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"];
 
   };
-  "vim-addon-other" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-other = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-other-2014-07-15";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-other";
@@ -1163,7 +1094,8 @@ rec {
     dependencies = ["vim-addon-actions" "vim-addon-mw-utils"];
 
   };
-  "vim-addon-php-manual" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-php-manual = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-php-manual-2015-01-01";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-php-manual";
@@ -1173,7 +1105,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-addon-signs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-signs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-signs-2013-04-19";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-signs";
@@ -1183,7 +1116,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-addon-sql" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-sql-2014-01-18";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-sql";
@@ -1193,7 +1127,8 @@ rec {
     dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"];
 
   };
-  "vim-addon-syntax-checker" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-syntax-checker = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-syntax-checker-2013-07-12";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-syntax-checker";
@@ -1203,7 +1138,8 @@ rec {
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
-  "vim-addon-toggle-buffer" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-toggle-buffer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-toggle-buffer-2012-01-13";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-toggle-buffer";
@@ -1213,7 +1149,8 @@ rec {
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
   };
-  "vim-addon-xdebug" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-addon-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-addon-xdebug-2014-08-29";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-xdebug";
@@ -1223,17 +1160,19 @@ rec {
     dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"];
 
   };
-  "vim-airline" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2015-03-24";
+
+  vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-airline-2015-05-25";
     src = fetchgit {
       url = "git://github.com/bling/vim-airline";
-      rev = "f45ecdac15d99ed2354873a8b4d40432fd0a85a3";
-      sha256 = "30176b06f13838fe7b0374e2ed529c0d26abe432ff7453c7443b2f204cf70012";
+      rev = "67de5f2257f8d5def7a31e3009d4298ce977cb80";
+      sha256 = "0ca13f68b22ce3112117d7194f3d6b4e1280f032bc7bbca6fba4df185ff1da2a";
     };
     dependencies = [];
 
   };
-  "vim-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-coffee-script-2015-04-20";
     src = fetchgit {
       url = "git://github.com/kchmck/vim-coffee-script";
@@ -1243,7 +1182,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-easy-align" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-easy-align-2014-12-14";
     src = fetchgit {
       url = "git://github.com/junegunn/vim-easy-align";
@@ -1253,7 +1193,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-gista" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-gista-2015-01-29";
     src = fetchgit {
       url = "git://github.com/lambdalisue/vim-gista";
@@ -1263,7 +1204,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-gitgutter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-gitgutter-2015-05-08";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
@@ -1273,7 +1215,8 @@ rec {
     dependencies = [];
 
   };
-  "vim-iced-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim-iced-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-iced-coffee-script-2013-12-27";
     src = fetchgit {
       url = "git://github.com/noc7c9/vim-iced-coffee-script";
@@ -1283,37 +1226,41 @@ rec {
     dependencies = [];
 
   };
-  "vim-latex-live-preview" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-latex-live-preview-2013-11-25";
+
+  vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-latex-live-preview-2015-05-11";
     src = fetchgit {
       url = "git://github.com/xuhdev/vim-latex-live-preview";
-      rev = "18625ceca4de5984f3df50cdd0202fc13eb9e37c";
-      sha256 = "261852d3830189a50176f997a4c6b4ec7e25893c5b7842a3eb57eb7771158722";
+      rev = "7695dd4ebddb735bec632d468e2202d070029cb8";
+      sha256 = "3551e2a84a98b07f5edce6e35bad5cd2a78da1ef60dd94202c623e238b05bfc8";
     };
     dependencies = [];
 
   };
-  "vim-signature" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2015-04-24";
+
+  vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-signature-2015-05-19";
     src = fetchgit {
       url = "git://github.com/kshenoy/vim-signature";
-      rev = "7586613e5dcfd2f09d32197aa5a10ed025da21f4";
-      sha256 = "0bce1c37adc06a386438e13c6e3e0af5829a13e4e65fbd703234680bc3d769fc";
+      rev = "7ab61e2a5101ec139a54735b432a6e95a22770d8";
+      sha256 = "041b906cd27bcb922732e324b671adbf6ea0106105230ea43111ca9f844b64c3";
     };
     dependencies = [];
 
   };
-  "vim-snippets" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2015-05-05";
+
+  vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-snippets-2015-05-31";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "1327c1ba54c8c367995b536b8cb7d8e7cc7c4c03";
-      sha256 = "fb6a7a2fa0939a64f8bac4411dfa36dc5a6e1385e5016978045614039ab89720";
+      rev = "0e9eff1bf36728b6423171f962a8d6e5de7a4621";
+      sha256 = "0d2342a184806ba9357871ef77229a29854a665fd4e75674638136d2054c0551";
     };
     dependencies = [];
 
   };
-  "vim2hs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim2hs-2014-04-16";
     src = fetchgit {
       url = "git://github.com/dag/vim2hs";
@@ -1323,7 +1270,8 @@ rec {
     dependencies = [];
 
   };
-  "vundle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vundle-2015-03-21";
     src = fetchgit {
       url = "git://github.com/gmarik/vundle";
@@ -1333,7 +1281,8 @@ rec {
     dependencies = [];
 
   };
-  "wombat256" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+
+  wombat256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "wombat256";
     src = fetchurl {
       url = "http://www.vim.org/scripts/download_script.php?src_id=13400";
@@ -1348,6 +1297,4 @@ rec {
 
 
   };
-
-
 }
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 39f6aa18904..c095237bc9a 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,57 +1,98 @@
-"vim-addon-syntax-checker"
-"vim-addon-other"
-"vim-addon-local-vimrc"
-"snipmate"
-"vim-snippets"
-"vim-addon-mru"
-"vim-addon-commenting"
-"vim-addon-sql"
-"vim-addon-async"
-"vim-addon-toggle-buffer"
-"vim-addon-mw-utils"
-"matchit.zip"
-"vim-addon-xdebug"
-"vim-addon-php-manual"
-"sourcemap"
-"vim-iced-coffee-script"
-"ctrlp"
-"commentary"
-"Colour_Sampler_Pack"
+"Gist"
+"Gundo"
+"Hoogle"
 "Solarized"
-"vim-coffee-script"
-"vim-easy-align"
-"Tagbar"
-"Tabular"
-"table-mode"
-"Syntastic"
-"vim-signature"
-"surround"
 "Supertab"
-"rust"
-"rainbow_parentheses"
-"pathogen"
-"quickfixstatus"
+"Syntastic"
+"Tabular"
+"Tagbar"
 "The_NERD_Commenter"
 "The_NERD_tree"
-"vim-latex-live-preview"
-"Hoogle"
-"Gundo"
-"vim-gitgutter"
-"Gist"
-"ghcmod"
-"fugitive"
-"extradite"
-"vim-airline"
-"VimOutliner"
-"vim2hs"
-"undotree"
 "UltiSnips"
-"wombat256"
-"vundle"
+"VimOutliner"
 "WebAPI"
 "YankRing"
-"vim-addon-manager"
-"vim-addon-nix"
-"vim-gista"
+"commentary"
+"ctrlp"
+"extradite"
+"fugitive"
+"ghcmod"
 "github:JagaJaga/vim-addon-vim2nix"
+"github:bitc/lushtags"
+"github:bitc/vim-hdevtools"
+"github:christoomey/vim-tmux-navigator"
+"github:eagletmt/neco-ghc"
+"github:esneider/YUNOcommit.vim"
+"github:idris-hackers/idris-vim"
+"github:itchyny/calendar.vim"
+"github:itchyny/thumbnail.vim"
+"github:ivanov/vim-ipython"
+"github:jceb/vim-hier"
+"github:jeetsukumaran/vim-buffergator"
+"github:jgdavey/tslime.vim"
+"github:jistr/vim-nerdtree-tabs"
+"github:jnwhiteh/vim-golang"
+"github:joonty/vim-xdebug"
+"github:justincampbell/vim-eighties"
+"github:latex-box-team/latex-box"
+"github:lepture/vim-jinja"
+"github:lokaltog/vim-easymotion"
+"github:lyokha/vim-xkbswitch"
+"github:nbouscal/vim-stylish-haskell"
+"github:osyo-manga/shabadou.vim"
+"github:osyo-manga/vim-watchdogs"
+"github:phildawes/racer"
+"github:shougo/neocomplete.vim"
+"github:shougo/neosnippet-snippets"
+"github:shougo/neosnippet.vim"
+"github:shougo/vimproc.vim"
+"github:shougo/vimshell.vim"
+"github:takac/vim-hardtime"
+"github:thinca/vim-quickrun"
+"github:travitch/hasksyn"
+"github:twinside/vim-haskellconceal"
+"github:valloric/youcompleteme"
+"github:vim-scripts/Colour-Sampler-Pack"
+"github:vim-scripts/a.vim"
+"github:vim-scripts/align"
+"github:vim-scripts/tabmerge"
+"github:wakatime/vim-wakatime"
+"github:wincent/command-t"
+"matchit.zip"
+"pathogen"
+"quickfixstatus"
+"rainbow_parentheses"
+"rust"
 "sensible"
+"snipmate"
+"sourcemap"
+"surround"
+"table-mode"
+"taglist"
+"undotree"
+"vim-addon-async"
+"vim-addon-commenting"
+"vim-addon-completion"
+"vim-addon-local-vimrc"
+"vim-addon-manager"
+"vim-addon-mru"
+"vim-addon-mw-utils"
+"vim-addon-nix"
+"vim-addon-other"
+"vim-addon-php-manual"
+"vim-addon-sql"
+"vim-addon-syntax-checker"
+"vim-addon-toggle-buffer"
+"vim-addon-xdebug"
+"vim-airline"
+"vim-coffee-script"
+"vim-easy-align"
+"vim-gista"
+"vim-gitgutter"
+"vim-iced-coffee-script"
+"vim-latex-live-preview"
+"vim-signature"
+"vim-snippets"
+"vim2hs"
+"vundle"
+"wombat256"
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 9140acffe0d..ec1724a9f9a 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -102,7 +102,7 @@ Then create a temp vim file and insert:
 
 Then ":source %" it.
 
-nix#ExportPluginsForNix is provided by github.com/MarcWeber/vim-addon-vim2nix
+nix#ExportPluginsForNix is provided by github.com/JagaJaga/vim-addon-vim2nix
 
 A buffer will open containing the plugin derivation lines as well list 
 fitting the vimrcConfig.vam.pluginDictionaries option.
@@ -296,7 +296,7 @@ rec {
   pluginnames2Nix = {name, namefiles} : vim_configurable.customize {
     inherit name;
     vimrcConfig.vam.knownPlugins = vimPlugins;
-    vimrcConfig.vam.pluginDictionaries = ["github:JagaJaga/vim-addon-vim2nix"]; # Using fork until patch is accepted by upstream
+    vimrcConfig.vam.pluginDictionaries = ["vim-addon-vim2nix"]; # Using fork until patch is accepted by upstream
     vimrcConfig.customRC = ''
       " Yes - this is impure and will create the cache file and checkout vim-pi
       " into ~/.vim/vim-addons

From 23bc70208c840a93f1bb67502f5e1f9910c8d7ae Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Fri, 29 May 2015 18:56:17 -0700
Subject: [PATCH 0625/2322] Prometheus: update to 0.14.0

---
 .../servers/monitoring/prometheus/default.nix | 97 +++++++++----------
 pkgs/top-level/go-packages.nix                | 36 ++++++-
 2 files changed, 78 insertions(+), 55 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 8180d24aa9e..4b8d1cdbe56 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,58 +1,55 @@
-{ stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }:
+{ stdenv, lib, goPackages, fetchFromGitHub, vim }:
 
 goPackages.buildGoPackage rec {
-   name = "prometheus-${version}";
-   version = "0.13.4";
-   goPackagePath = "github.com/prometheus/prometheus";
-   rev = "612da96c46f0b7ea6cc28a3fc614f14eae0189d0";
+  name = "prometheus-${version}";
+  version = "0.14.0";
+  goPackagePath = "github.com/prometheus/prometheus";
+  rev = "67e77411ba30b1b0ce0989c85b6684fb3adef430";
 
-   src = fetchFromGitHub {
-     inherit rev;
-     owner = "prometheus";
-     repo = "prometheus";
-     sha256 = "1r3pcnxs1cdh18lmqd60r3nh614cw543wzd4slkr2nzr73pn5x4j";
-   };
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "prometheus";
+    repo = "prometheus";
+    sha256 = "06xsxigimw5i1fla0k83pf5bpmybskvy50433hs8h876gyvgjxp9";
+  };
 
-   buildInputs = [
-     goPackages.dns
-     goPackages.glog
-     goPackages.protobuf
-     goPackages.goleveldb
-     goPackages.net
-     goPackages.prometheus.client_golang
-     protobuf  # the non-golang package, for protoc
-     vim  # for xxd, used in embed-static.sh
-   ];
+  buildInputs = [
+    goPackages.consul
+    goPackages.dns
+    goPackages.fsnotify.v1
+    goPackages.goleveldb
+    goPackages.logrus
+    goPackages.net
+    goPackages.prometheus.client_golang
+    goPackages.prometheus.log
+    goPackages.yaml-v2
+    vim  # for xxd, used in embed-static.sh
+  ];
 
-   # Metadata that gets embedded into the binary
-   buildFlagsArray = ''
-     -ldflags=
-         -X main.buildVersion ${version}
-         -X main.buildRevision ${builtins.substring 0 6 rev}
-         -X main.buildBranch master
-         -X main.buildUser nix@nixpkgs
-         -X main.buildDate 20150101-00:00:00
-         -X main.goVersion ${lib.getVersion goPackages.go}
-   '';
+  # Metadata that gets embedded into the binary
+  buildFlagsArray = ''
+    -ldflags=
+        -X main.buildVersion ${version}
+        -X main.buildRevision ${builtins.substring 0 6 rev}
+        -X main.buildBranch master
+        -X main.buildUser nix@nixpkgs
+        -X main.buildDate 20150101-00:00:00
+        -X main.goVersion ${lib.getVersion goPackages.go}
+  '';
 
-   preBuild = ''
-   (
-     cd "go/src/$goPackagePath"
-     protoc --proto_path=./config \
-            --go_out=./config/generated/ \
-            ./config/config.proto
+  preBuild = ''
+  (
+    cd "go/src/$goPackagePath/web"
+    ${stdenv.shell} ../utility/embed-static.sh static templates \
+      | gofmt > blob/files.go
+  )
+  '';
 
-     cd web
-     ${stdenv.shell} ../utility/embed-static.sh static templates \
-       | gofmt > blob/files.go
-   )
-   '';
-
-   meta = with lib; {
-     description = "Service monitoring system and time series database";
-     homepage = http://prometheus.github.io;
-     license = licenses.asl20;
-     maintainers = with maintainers; [ benley ];
-     platforms = platforms.unix;
-   };
+  meta = with lib; {
+    description = "Service monitoring system and time series database";
+    homepage = http://prometheus.io;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
 }
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 9af04081000..1181d8e2b60 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1991,6 +1991,19 @@ let
     buildInputs = [ protobuf ];
   };
 
+  prometheus.log = buildGoPackage rec {
+    name = "prometheus-log-${version}";
+    version = "git-2015-05-29";
+    goPackagePath = "github.com/prometheus/log";
+    src = fetchFromGitHub {
+      rev = "439e5db48fbb50ebbaf2c816030473a62f505f55";
+      owner = "prometheus";
+      repo = "log";
+      sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv";
+    };
+    propagatedBuildInputs = [ logrus ];
+  };
+
   prometheus.procfs = buildGoPackage rec {
     rev = "351fbfac67c8ae8bcacd468f678f5e8d5a585d3d";
     name = "prometheus-procfs-${stdenv.lib.strings.substring 0 7 rev}";
@@ -2413,16 +2426,29 @@ let
   };
 
   yaml-v1 = buildGoPackage rec {
-    rev = "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a";
-    name = "yaml-v1-${stdenv.lib.strings.substring 0 7 rev}";
+    name = "yaml-v1-${version}";
+    version = "git-2015-05-01";
     goPackagePath = "gopkg.in/yaml.v1";
-    src = fetchgit {
-      inherit rev;
-      url = "https://github.com/go-yaml/yaml.git";
+    src = fetchFromGitHub {
+      rev = "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a";
+      owner = "go-yaml";
+      repo = "yaml";
       sha256 = "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy";
     };
   };
 
+  yaml-v2 = buildGoPackage rec {
+    name = "yaml-v2-${version}";
+    version = "git-2015-05-19";
+    goPackagePath = "gopkg.in/yaml.v2";
+    src = fetchFromGitHub {
+      rev = "c1cd2254a6dd314c9d73c338c12688c9325d85c6";
+      owner = "go-yaml";
+      repo = "yaml";
+      sha256 = "0xhv0i700hh8lczrwxhn3c99npqma7k4337qrh6k36falm0jpp4s";
+    };
+  };
+
   yamux = buildGoPackage rec {
     rev = "b2e55852ddaf823a85c67f798080eb7d08acd71d";
     name = "yamux-${stdenv.lib.strings.substring 0 7 rev}";

From 3309a15be9d28a546184f1ffdc81bde2b6e2d8fd Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Mon, 1 Jun 2015 12:28:21 -0700
Subject: [PATCH 0626/2322] New package: prometheus-nginx-exporter

Adding to the growing collection of prometheus tools...
---
 .../prometheus/nginx_exporter/default.nix     | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/go-packages.nix                | 13 +++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix b/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix
new file mode 100644
index 00000000000..b45b2784042
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix
@@ -0,0 +1,27 @@
+{ lib, goPackages, fetchFromGitHub }:
+
+goPackages.buildGoPackage rec {
+  name = "prometheus-nginx-exporter-${version}";
+  version = "git-2015-06-01";
+  goPackagePath = "github.com/discordianfish/nginx_exporter";
+
+  src = fetchFromGitHub {
+    owner = "discordianfish";
+    repo = "nginx_exporter";
+    rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b";
+    sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc";
+  };
+
+  buildInputs = [
+    goPackages.prometheus.client_golang
+    goPackages.prometheus.log
+  ];
+
+  meta = with lib; {
+    description = "Metrics relay from nginx stats to Prometheus";
+    homepage = https://github.com/discordianfish/nginx_exporter;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ benley ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c28a6c98c7..b62f3be98cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8939,6 +8939,8 @@ let
     callPackage ../servers/monitoring/prometheus/mesos_exporter { };
   prometheus-mysqld-exporter =
     callPackage ../servers/monitoring/prometheus/mysqld_exporter { };
+  prometheus-nginx-exporter =
+    callPackage ../servers/monitoring/prometheus/nginx_exporter { };
   prometheus-node-exporter =
     callPackage ../servers/monitoring/prometheus/node_exporter { };
   prometheus-pushgateway =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 9af04081000..2df0439e4e2 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1991,6 +1991,19 @@ let
     buildInputs = [ protobuf ];
   };
 
+  prometheus.log = buildGoPackage rec {
+    name = "prometheus-log-${version}";
+    version = "git-2015-05-29";
+    goPackagePath = "github.com/prometheus/log";
+    src = fetchFromGitHub {
+      rev = "439e5db48fbb50ebbaf2c816030473a62f505f55";
+      owner = "prometheus";
+      repo = "log";
+      sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv";
+    };
+    propagatedBuildInputs = [ logrus ];
+  };
+
   prometheus.procfs = buildGoPackage rec {
     rev = "351fbfac67c8ae8bcacd468f678f5e8d5a585d3d";
     name = "prometheus-procfs-${stdenv.lib.strings.substring 0 7 rev}";

From 7cd8874aedaf3a6fb8f35a08213ec9d585e190b2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 2 Jun 2015 01:37:49 +0200
Subject: [PATCH 0627/2322] geolite-legacy -> 2015-06-02

---
 pkgs/data/misc/geolite-legacy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 69baf7bda45..08cf3b545b7 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-05-20";
+  version = "2015-06-02";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -22,9 +22,9 @@ stdenv.mkDerivation {
   srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
     "1jlxd60l7ic7md0d93fhiyd2vqms1fcirp6wkm0glh347j64srsb";
   srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz"
-    "09vv3jg6gnz2k30pkwgcakvfvklfrkwsj0xq5q2awcw6ik0vkfcm";
+    "0zccfd1wsny3n1f3wgkb071pp6z01nmk0p6nngha0gwnywchvbx4";
   srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz"
-    "1qdprh1idxa1l4s23lcjg33hi4i8qzlk4fjril2zcd3prff1xkz2";
+    "0asnmmirridiy57zm0kccb7g8h7ndliswfv3yfk7zm7dk98njnxs";
 
   meta = with stdenv.lib; {
     inherit version;

From 7db1aa06a53b9e65d5f9d453b43029b0e50faf29 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 2 Jun 2015 01:44:39 +0200
Subject: [PATCH 0628/2322] nxproxy & libxcomp: use lite instead of full
 nx-libs

---
 pkgs/development/libraries/libxcomp/default.nix | 4 ++--
 pkgs/tools/admin/nxproxy/default.nix            | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix
index 84dbb0c156f..3a7ca70a85f 100644
--- a/pkgs/development/libraries/libxcomp/default.nix
+++ b/pkgs/development/libraries/libxcomp/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation {
   name = "libxcomp-${version}";
 
   src = fetchurl {
-    url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-full.tar.gz";
-    sha256 = "0a31508wyfyblf6plag2djr4spra5kylcmgg99h83c60ylxxnc11";
+    sha256 = "1hi3xrjzr37zs72djw3k7gj6mn2bsihfw1iysl8l0i85jl6sdfkd";
+    url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix
index 151cd68fdbc..6da78f60630 100644
--- a/pkgs/tools/admin/nxproxy/default.nix
+++ b/pkgs/tools/admin/nxproxy/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation {
   name = "nxproxy-${version}";
 
   src = fetchurl {
-    url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-full.tar.gz";
-    sha256 = "0a31508wyfyblf6plag2djr4spra5kylcmgg99h83c60ylxxnc11";
+    sha256 = "1hi3xrjzr37zs72djw3k7gj6mn2bsihfw1iysl8l0i85jl6sdfkd";
+    url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
   };
 
   meta = with stdenv.lib; {
@@ -24,4 +24,6 @@ stdenv.mkDerivation {
   '';
 
   makeFlags = [ "exec_prefix=$(out)" ];
+
+  enableParallelBuilding = true;
 }

From 58f6da5cc6b96b65c3211fa5a1ab6eb6fc7d1305 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Tue, 2 Jun 2015 06:06:02 +0000
Subject: [PATCH 0629/2322] mwlib may use imagemagick (convert)

---
 nixos/modules/services/misc/mwlib.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/misc/mwlib.nix b/nixos/modules/services/misc/mwlib.nix
index fb4a24253df..fb349fbeab5 100644
--- a/nixos/modules/services/misc/mwlib.nix
+++ b/nixos/modules/services/misc/mwlib.nix
@@ -226,6 +226,7 @@ in
         chmod -Rc u=rwX,go= '${cfg.nslave.cachedir}'
       '';
 
+      path = with pkgs; [ imagemagick ];
       environment = {
         PYTHONPATH = concatMapStringsSep ":"
           (m: "${pypkgs.${m}}/lib/${python.libPrefix}/site-packages")

From 95c6b835cb064cfdbf06bcfed7341e54e6cd31ee Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Tue, 2 Jun 2015 06:14:34 +0000
Subject: [PATCH 0630/2322] mwlib may use pyfribidi

---
 nixos/modules/services/misc/mwlib.nix |  2 +-
 pkgs/top-level/python-packages.nix    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/mwlib.nix b/nixos/modules/services/misc/mwlib.nix
index fb349fbeab5..d02e1e021a7 100644
--- a/nixos/modules/services/misc/mwlib.nix
+++ b/nixos/modules/services/misc/mwlib.nix
@@ -230,7 +230,7 @@ in
       environment = {
         PYTHONPATH = concatMapStringsSep ":"
           (m: "${pypkgs.${m}}/lib/${python.libPrefix}/site-packages")
-          [ "mwlib-rl" "mwlib-ext" "pygments" ];
+          [ "mwlib-rl" "mwlib-ext" "pygments" "pyfribidi" ];
       };
 
       serviceConfig = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9a1eaf32ed..1f389a2833f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4991,6 +4991,22 @@ let
     };
   });
 
+  pyfribidi = buildPythonPackage rec {
+    version = "0.11.0";
+    name = "pyfribidi-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pyfribidi/${name}.zip";
+      md5 = "a3fc1f9d34571305782d1a54ee36f904";
+    };
+
+    meta = {
+      description = "simple wrapper around fribidi.";
+      homepage = "https://github.com/pediapress/pyfribidi";
+      license = stdenv.lib.licenses.gpl2;
+    };
+  };
+
   docker_compose = buildPythonPackage rec {
     name = "docker-compose-1.2.0rc2";
     disabled = isPy3k || isPyPy;

From 32757ef18492132200db5424c8dde0ad34e0b685 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 30 May 2015 22:38:32 +0200
Subject: [PATCH 0631/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/bfbb2bc96c267aaee41230c7c5bc7a974abd7dcb
 with hackage2nix revision d0ef14cd08973bdb61a29700ef07b1149c86b7a3

---
 .../haskell-modules/hackage-packages.nix      | 690 +++++++++++-------
 1 file changed, 431 insertions(+), 259 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1eb15af14ee..934fc10fc06 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -808,10 +808,10 @@ self: {
     ({ mkDerivation, base, mtl, multirec, parsec }:
      mkDerivation {
        pname = "Annotations";
-       version = "0.2";
-       sha256 = "0i6qicmvz1jryv4zkdcpclfwxg20yvwgx6vhf46mxjzs3kw1a6z3";
+       version = "0.2.1";
+       sha256 = "1iqcg47rklibps6xjs7zw76npycpa1jj3x68zz75np3r0fnwiqhj";
        buildDepends = [ base mtl multirec parsec ];
-       jailbreak = true;
+       testDepends = [ base mtl multirec parsec ];
        description = "Constructing, analyzing and destructing annotated trees";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1537,8 +1537,8 @@ self: {
      }:
      mkDerivation {
        pname = "BlogLiterately";
-       version = "0.8";
-       sha256 = "0sii2m3ha5z5di1flswd6c0xih652y73xdrzi3m662vhm9q94slv";
+       version = "0.8.1";
+       sha256 = "01k71scq4p7iw52m47f24xj21w0dsibhp4kyyl62g69h3iciyhm0";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -1554,21 +1554,19 @@ self: {
 
   "BlogLiterately-diagrams" = callPackage
     ({ mkDerivation, base, BlogLiterately, containers, diagrams-builder
-     , diagrams-cairo, diagrams-lib, directory, filepath, pandoc, safe
+     , diagrams-lib, diagrams-rasterific, directory, filepath
+     , JuicyPixels, pandoc, safe
      }:
      mkDerivation {
        pname = "BlogLiterately-diagrams";
-       version = "0.1.4.3";
-       revision = "1";
-       sha256 = "0p65nyslcvf4qzgrwsi59xil8i5sgh1xfyz431lf4f00nsqb0s2h";
-       editedCabalFile = "a9b96a72609bba1d29f628c22171dfb4e49e4c2ed7a8b3f5c2caf1127dff403d";
+       version = "0.2";
+       sha256 = "12idyzr560m921f4d83m3x2y2gcx9g8dvjbdh8rfjbsc7hqi60rb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base BlogLiterately containers diagrams-builder diagrams-cairo
-         diagrams-lib directory filepath pandoc safe
+         base BlogLiterately containers diagrams-builder diagrams-lib
+         diagrams-rasterific directory filepath JuicyPixels pandoc safe
        ];
-       jailbreak = true;
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1616,6 +1614,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
@@ -1997,6 +1996,7 @@ self: {
          array base containers CSPM-CoreLanguage CSPM-Frontend mtl
          prettyclass syb
        ];
+       jailbreak = true;
        description = "An interpreter for CSPM";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2035,6 +2035,7 @@ self: {
          CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel pretty
          prettyclass syb transformers xml
        ];
+       jailbreak = true;
        description = "cspm command line tool for analyzing CSPM specifications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2396,6 +2397,7 @@ self: {
        sha256 = "0z844mxvkhg114wvbs8z3cvhmhsrzx344yj7yh4fzfm4fcx5j3k9";
        buildDepends = [ base containers mtl QuickCheck random syb ];
        testDepends = [ array base containers mtl QuickCheck random syb ];
+       jailbreak = true;
        description = "For testing partial and infinite values";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -5708,12 +5710,12 @@ self: {
      }) {};
 
   "GroteTrap" = callPackage
-    ({ mkDerivation, base, mtl, parsec, QuickCheck }:
+    ({ mkDerivation, base, mtl, parsec, QuickCheck, syb }:
      mkDerivation {
        pname = "GroteTrap";
-       version = "0.5";
-       sha256 = "1a43iig84bvmgpjmk6lqzhm3fq5p5hac36icwj4yfyrvzyfn0x7m";
-       buildDepends = [ base mtl parsec QuickCheck ];
+       version = "0.5.1";
+       sha256 = "131i63paaapdbdnqvmacsfqbg1719xlbx8phjchw6zlh9njn727k";
+       buildDepends = [ base mtl parsec QuickCheck syb ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/GroteTrap";
        description = "Parser and selection library for expression languages";
@@ -11847,8 +11849,8 @@ self: {
      }:
      mkDerivation {
        pname = "Plot-ho-matic";
-       version = "0.5.0.3";
-       sha256 = "17zn4sqyfl48fp25wicp5vd518wn26g5qn071zhb989imiqbnvmq";
+       version = "0.5.0.4";
+       sha256 = "05pipj20bx9is5snwf5nhavrs8873br4xvs3b1ggrvxgvaf8qhqw";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -16569,6 +16571,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "acme-all-monad" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "acme-all-monad";
+       version = "0.1.0.0";
+       sha256 = "1qay7m16yjsjg8anbinkagb2v8r67k5wsppkrwyskn9jcb1wnbgv";
+       buildDepends = [ base transformers ];
+       jailbreak = true;
+       description = "A monad which is powerful enough to interpret any action";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "acme-cadre" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -17461,8 +17475,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-schema";
-       version = "0.3.0.5";
-       sha256 = "04hnllvvgpd941bgjymd0spqv31rww1khaidbvdnrqa3i9gpmvjp";
+       version = "0.3.0.6";
+       sha256 = "0q1ml5q99lwqgppih9zq24nx01z6idcflz30pvl6bljv0xr52wp2";
        buildDepends = [
          aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck
          regex-base regex-compat regex-pcre scientific syb template-haskell
@@ -17474,7 +17488,6 @@ self: {
          template-haskell temporary test-framework test-framework-hunit
          test-framework-quickcheck2 text unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/timjb/aeson-schema";
        description = "Haskell JSON schema validator and parser generator";
        license = stdenv.lib.licenses.mit;
@@ -18103,6 +18116,7 @@ self: {
        version = "0.6";
        sha256 = "0i34n1lmnw12xrnaqvmiydnnlm8m8ky12chwb9jmnsf3klv8qm61";
        buildDepends = [ base syb template-haskell ];
+       jailbreak = true;
        homepage = "https://github.com/sjoerdvisscher/algebraic-classes";
        description = "Conversions between algebraic classes and F-algebras";
        license = stdenv.lib.licenses.bsd3;
@@ -21319,6 +21333,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "atom-basic" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, network
+     , network-uri, old-locale, text, time
+     }:
+     mkDerivation {
+       pname = "atom-basic";
+       version = "0.0.1.1";
+       sha256 = "0i39rnrfpq4k2p107grhhv0rka8qpd9bb7pvhrbks1m2dxb6pq2v";
+       buildDepends = [
+         base base64-bytestring bytestring network network-uri old-locale
+         text time
+       ];
+       description = "Basic Atom feed construction";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "atom-msp430" = callPackage
     ({ mkDerivation, atom, base, mtl }:
      mkDerivation {
@@ -24011,15 +24042,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "binary_0_7_4_0" = callPackage
+  "binary_0_7_5_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, HUnit, QuickCheck, random, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "binary";
-       version = "0.7.4.0";
-       sha256 = "0zpyg1m5ihpdlglddnprxhx3pql0h866x5mz4qzfn7ppma6ahccb";
+       version = "0.7.5.0";
+       sha256 = "06gg61srfva7rvzf4s63c068s838i5jf33d6cnjb9769gjmca2a7";
        buildDepends = [ array base bytestring containers ];
        testDepends = [
          array base bytestring Cabal containers directory filepath HUnit
@@ -29727,8 +29758,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "catamorphism";
-       version = "0.4.0.1";
-       sha256 = "05mpw0dgn5f9gwnk7jkkm5k6fsfhi70i3fr96b6jca7w1b151hn9";
+       version = "0.5.0.1";
+       sha256 = "1zdjsd6dqkcpnm8w6macn0v5y48nycc4g2i4rz3gg57v1hlyqrh6";
        buildDepends = [ base template-haskell ];
        homepage = "http://github.com/frerich/catamorphism";
        description = "A package exposing a helper function for generating catamorphisms";
@@ -34242,20 +34273,20 @@ self: {
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base-unicode-symbols, base64-bytestring, bytestring, Cabal
      , case-insensitive, connection, data-default, deepseq, directory
-     , dlist, enclosed-exceptions, errors, http-client, http-client-tls
-     , http-types, monad-control, mtl, network-uri, optparse-applicative
-     , process, profunctors, text, tls, transformers
-     , unordered-containers, wai, warp, warp-tls, x509, x509-system
-     , x509-validation, yaml
+     , dlist, enclosed-exceptions, filepath, http-client
+     , http-client-tls, http-types, monad-control, mtl, network-uri
+     , optparse-applicative, process, profunctors, text, tls
+     , transformers, unordered-containers, wai, warp, warp-tls, x509
+     , x509-system, x509-validation, yaml
      }:
      mkDerivation {
        pname = "configuration-tools";
-       version = "0.2.12";
-       sha256 = "1cpdy3aizdba55mmq903s9p6az3zkkxm3h7jq0iz9s38r3srxij7";
+       version = "0.2.13";
+       sha256 = "0rhr5c91bk853zlgld2im0sm0pcss0q6g82c92p85vwkdgrgxlz2";
        buildDepends = [
          aeson ansi-wl-pprint attoparsec base base-unicode-symbols
          base64-bytestring bytestring Cabal case-insensitive connection
-         data-default deepseq directory dlist enclosed-exceptions errors
+         data-default deepseq directory dlist enclosed-exceptions filepath
          http-client http-client-tls http-types monad-control mtl
          network-uri optparse-applicative process profunctors text tls
          transformers unordered-containers x509 x509-system x509-validation
@@ -34263,8 +34294,8 @@ self: {
        ];
        testDepends = [
          base base-unicode-symbols bytestring Cabal enclosed-exceptions
-         errors http-types monad-control mtl text unordered-containers wai
-         warp warp-tls yaml
+         http-types monad-control mtl text transformers unordered-containers
+         wai warp warp-tls yaml
        ];
        homepage = "https://github.com/alephcloud/hs-configuration-tools";
        description = "Tools for specifying and parsing configurations";
@@ -36672,8 +36703,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptonite";
-       version = "0.1";
-       sha256 = "10rcz9547igjpg908cbgk5aws011g861ywprgf3x5yspml1nc6z5";
+       version = "0.2";
+       sha256 = "11mhfw3qpm71nq6wclj3g9vv66n6fhrvlmdr9byd08imxqlxb8kx";
        buildDepends = [
          base bytestring deepseq ghc-prim integer-gmp memory
        ];
@@ -37918,26 +37949,24 @@ self: {
      }) {};
 
   "dash-haskell" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, direct-sqlite
-     , directory, either, ghc, haddock-api, mtl, optparse-applicative
-     , parsec, pipes, process, sqlite-simple, system-fileio
-     , system-filepath, tagsoup, text, transformers
+    ({ mkDerivation, base, Cabal, containers, direct-sqlite, directory
+     , either, filepath, ghc, haddock-api, optparse-applicative, parsec
+     , pipes, sqlite-simple, tagsoup, text, transformers
      }:
      mkDerivation {
        pname = "dash-haskell";
-       version = "1.0.0.5";
-       sha256 = "1asfcifmvyrkw0nfb7g7djwzqlgw7l021a5q9i66wj598fgxqn1j";
+       version = "1.1.0.1";
+       sha256 = "1m82zpr37jdqr06ynqz4bbnvy1s81756frcgfiyk4wvlmmcl2fyk";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base bytestring Cabal containers direct-sqlite directory either ghc
-         haddock-api mtl optparse-applicative parsec pipes process
-         sqlite-simple system-fileio system-filepath tagsoup text
-         transformers
+         base Cabal containers direct-sqlite directory either filepath ghc
+         haddock-api optparse-applicative parsec pipes sqlite-simple tagsoup
+         text transformers
        ];
        jailbreak = true;
        homepage = "http://www.github.com/jfeltz/dash-haskell";
-       description = "Command line tool to generate Dash docsets (IDE docs) from package haddock";
+       description = "Convert package Haddock to Dash docsets (IDE docs)";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -38491,8 +38520,8 @@ self: {
      }:
      mkDerivation {
        pname = "data-lens";
-       version = "2.10.5";
-       sha256 = "11na4wx0f0ihk87d00njwrfc430nb25dkkadv1n47yvcyfc60i90";
+       version = "2.10.6";
+       sha256 = "0pnn84m6xvqvxmqpddsi4db1w65788yrwdkpfm9z1vkkajqixaxj";
        buildDepends = [
          base comonad containers semigroupoids transformers
        ];
@@ -40716,20 +40745,20 @@ self: {
      }) {};
 
   "diagrams-builder" = callPackage
-    ({ mkDerivation, base, bytestring, cmdargs, diagrams-cairo
-     , diagrams-lib, diagrams-postscript, diagrams-rasterific
-     , diagrams-svg, directory, exceptions, filepath, hashable
-     , haskell-src-exts, hint, JuicyPixels, lens, lucid-svg, mtl, split
-     , transformers
+    ({ mkDerivation, base, base-orphans, bytestring, cmdargs
+     , diagrams-cairo, diagrams-lib, diagrams-postscript
+     , diagrams-rasterific, diagrams-svg, directory, exceptions
+     , filepath, hashable, haskell-src-exts, hint, JuicyPixels, lens
+     , lucid-svg, mtl, split, transformers
      }:
      mkDerivation {
        pname = "diagrams-builder";
-       version = "0.7.0.2";
-       sha256 = "0gkfnanrim060f1g4brp6qxdiq81fni1kml7n9x79pfqdmfhlhgq";
+       version = "0.7.0.4";
+       sha256 = "1nxb6fpcjkcwyihhd0dj9zs72flhhg4g9g7r2xlbdi5l7j3kpkjg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base bytestring cmdargs diagrams-cairo diagrams-lib
+         base base-orphans bytestring cmdargs diagrams-cairo diagrams-lib
          diagrams-postscript diagrams-rasterific diagrams-svg directory
          exceptions filepath hashable haskell-src-exts hint JuicyPixels lens
          lucid-svg mtl split transformers
@@ -41033,8 +41062,8 @@ self: {
     ({ mkDerivation, base, data-default-class, diagrams-lib, lens }:
      mkDerivation {
        pname = "diagrams-rubiks-cube";
-       version = "0.1.1.0";
-       sha256 = "0fgyl0skn8z4d9kycdlmmd876v7yd2h3fyx1jqgmx4ygk0cch9z3";
+       version = "0.2.0.0";
+       sha256 = "1rymsiqwnd37mly5dlq5hkmy5vxvyvzwkn2rm2gwmxy3amk5g4db";
        buildDepends = [ base data-default-class diagrams-lib lens ];
        homepage = "https://github.com/timjb/rubiks-cube";
        description = "Library for drawing the Rubik's Cube";
@@ -42725,7 +42754,9 @@ self: {
      mkDerivation {
        pname = "doctest";
        version = "0.9.13";
+       revision = "1";
        sha256 = "0xl570ay5bw1rpd1aw59c092rnwjbp9qykh2rhpxyvl333p8mg00";
+       editedCabalFile = "592ab6d62eca8a0b43930f15c8fb653c54d60983bd232ecc505bd5a5aebe6f7f";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -43354,17 +43385,16 @@ self: {
      }:
      mkDerivation {
        pname = "dsh-sql";
-       version = "0.2.0.0";
-       sha256 = "0f7r844d0jwn4vyfnj8nvksss16rwva63hsy22m2viv98nyyfyi2";
+       version = "0.2.0.1";
+       sha256 = "0vr9wsad74735py2i2kqwqi4phf49ksw3d4w89jlcgi6xpsc02s1";
+       isLibrary = true;
+       isExecutable = true;
        buildDepends = [
          aeson algebra-dag algebra-sql base bytestring bytestring-lexing
-         containers Decimal DSH either HDBC HDBC-odbc mtl process random
-         semigroups set-monad template-haskell text vector
-       ];
-       testDepends = [
-         base bytestring bytestring-lexing containers DSH HDBC HDBC-odbc
-         HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 text vector
+         containers Decimal DSH either HDBC HDBC-odbc HUnit mtl process
+         QuickCheck random semigroups set-monad template-haskell
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         vector
        ];
        description = "SQL backend for Database Supported Haskell (DSH)";
        license = stdenv.lib.licenses.bsd3;
@@ -43902,6 +43932,7 @@ self: {
        homepage = "https://github.com/emc2/dynamic-pp";
        description = "A pretty-print library that employs a dynamic programming algorithm for optimal rendering";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-state" = callPackage
@@ -45001,8 +45032,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-init";
-       version = "0.1.1.1";
-       sha256 = "1qb61m0jd4c63x8av5v3iaxw1k4isi2yzrqjw0xznkf8m07hz4vb";
+       version = "0.1.2.0";
+       sha256 = "0s80x6r2h5cwng6x15xmwgpnjv0qgp360g11g2k3hsc5y8fvgmkd";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -46133,14 +46164,13 @@ self: {
      }:
      mkDerivation {
        pname = "ersatz-toysat";
-       version = "0.2.0.0";
-       sha256 = "0r7a8dcfpsjicndwlcgv1bc7jjjd8b2g9fds95y2cszprqkhjjh3";
+       version = "0.2.1.0";
+       sha256 = "1dpp4jl5mzc2z07f5670baxn95xvqgl9ynk0r0m83arpyp380fdq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          array base containers ersatz toysolver transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/msakai/ersatz-toysat";
        description = "toysat driver as backend for ersatz";
        license = stdenv.lib.licenses.bsd3;
@@ -47093,15 +47123,16 @@ self: {
      }) {};
 
   "extensible" = callPackage
-    ({ mkDerivation, base, constraints, profunctors, tagged
-     , template-haskell, transformers
+    ({ mkDerivation, base, constraints, monad-skeleton, profunctors
+     , tagged, template-haskell, transformers
      }:
      mkDerivation {
        pname = "extensible";
-       version = "0.3.4";
-       sha256 = "09bcynchvfjk0kp5r4609giyissppi08llv33m5j1d9qda6mxhxi";
+       version = "0.3.5";
+       sha256 = "0jff7vrmhj5sdd3migfi5p2bx35m6jbqlfai7rqpg0iqbxbp6pmy";
        buildDepends = [
-         base constraints profunctors tagged template-haskell transformers
+         base constraints monad-skeleton profunctors tagged template-haskell
+         transformers
        ];
        homepage = "https://github.com/fumieval/extensible";
        description = "Extensible, efficient, lens-friendly data types";
@@ -47401,13 +47432,10 @@ self: {
     ({ mkDerivation, base, bytestring, hspec, QuickCheck }:
      mkDerivation {
        pname = "farmhash";
-       version = "0.1.0.2";
-       revision = "1";
-       sha256 = "0k2x3si0px55widz3kgfdrm6y39lkwfahfqlfyr001vv6h4my0mq";
-       editedCabalFile = "cd08b430fb52fb06590611fdcc555d9056c2d982e8f3c7d6be7b17b0c4b19865";
+       version = "0.1.0.3";
+       sha256 = "0zqyp55grrkl4x4bhn13ng635zpsnd7g6vj2dqmvn3dg4zhyigf6";
        buildDepends = [ base bytestring ];
        testDepends = [ base bytestring hspec QuickCheck ];
-       jailbreak = true;
        homepage = "https://github.com/abhinav/farmhash";
        description = "Fast hash functions";
        license = stdenv.lib.licenses.bsd3;
@@ -47596,8 +47624,8 @@ self: {
      }:
      mkDerivation {
        pname = "fay";
-       version = "0.23.1.5";
-       sha256 = "07x4v8nq9mg0ydir708mv1bhpg3n5f449vv9ihgpyfdvm4w1bm4r";
+       version = "0.23.1.6";
+       sha256 = "02c4lxqmgac95nr00qwwxmq5a0lf46fxjiq4nqc3r6giz2m7i9ik";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -47918,8 +47946,8 @@ self: {
      }:
      mkDerivation {
        pname = "feed";
-       version = "0.3.9.5";
-       sha256 = "1kbi0hb2ywp5qbhjw65p86bj4cxag9ngi5dvjcjd63r673kwicv1";
+       version = "0.3.9.7";
+       sha256 = "01ssy7a1525cw72igpk1xksyafs7can68gmb81kvlzw8fddl4s0l";
        buildDepends = [
          base old-locale old-time time time-locale-compat utf8-string xml
        ];
@@ -48216,8 +48244,8 @@ self: {
      }:
      mkDerivation {
        pname = "fft";
-       version = "0.1.8";
-       sha256 = "073f0w3hm0zs0gi1s5adhd7z4xj3zq88s1d12mmby5ri3zr927k0";
+       version = "0.1.8.1";
+       sha256 = "00q1j6swi5y740n5dnbc73aw1nphsgyx7qnv59snqd48fcllhcww";
        buildDepends = [
          array base carray ix-shapable storable-complex syb
        ];
@@ -49619,13 +49647,13 @@ self: {
      }) {};
 
   "fold-debounce" = callPackage
-    ({ mkDerivation, base, data-default, hspec, stm, time }:
+    ({ mkDerivation, base, data-default, hspec, stm, stm-delay, time }:
      mkDerivation {
        pname = "fold-debounce";
-       version = "0.1.0.0";
-       sha256 = "1g22npjhjc35n05gyqrfk9cqr3m976cgdav3f8w1f2hbwvnfbxy7";
-       buildDepends = [ base data-default stm time ];
-       testDepends = [ base hspec stm ];
+       version = "0.2.0.0";
+       sha256 = "1nq0729wy3v29liwhy5rp706cpspv9jygh0pvxf398ng2plgfjmb";
+       buildDepends = [ base data-default stm stm-delay time ];
+       testDepends = [ base hspec stm time ];
        homepage = "https://github.com/debug-ito/fold-debounce";
        description = "Fold multiple events that happen in a given period of time";
        license = stdenv.lib.licenses.bsd3;
@@ -53458,6 +53486,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "github-webhook-handler" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cryptohash, github-types
+     , text, transformers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "github-webhook-handler";
+       version = "0.0.3";
+       sha256 = "1dwq1fccgnngh97kxyb3kp4f6xr8dsydlgkydl28lxkbwcapk39h";
+       buildDepends = [
+         aeson base bytestring cryptohash github-types text transformers
+         uuid vector
+       ];
+       description = "GitHub WebHook Handler";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "github-webhook-handler-snap" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, github-types
+     , github-webhook-handler, snap-core, uuid
+     }:
+     mkDerivation {
+       pname = "github-webhook-handler-snap";
+       version = "0.0.3";
+       sha256 = "0v9wman214rj81dfvkgng195s3gsvy5d7csshqwcw9x10giby9iy";
+       buildDepends = [
+         base bytestring case-insensitive github-types
+         github-webhook-handler snap-core uuid
+       ];
+       description = "GitHub WebHook Handler implementation for Snap";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "gitignore" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , http-conduit, network, safe, text
@@ -55379,6 +55439,7 @@ self: {
          groundhog-sqlite groundhog-th mtl regex-compat syb template-haskell
          text time transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/lykahb/groundhog";
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
@@ -58734,6 +58795,7 @@ self: {
          base bytestring happstack-server harp hsp hsx2hs mtl syb text
          utf8-string
        ];
+       jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Support for using HSP templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
@@ -58917,8 +58979,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-static-routing";
-       version = "0.4.0";
-       sha256 = "1dpi7nmax447ilagsjdpvnbj6xh27s7bcp69c8y39cs6bmjg42v1";
+       version = "0.4.2";
+       sha256 = "0g8b94mfhajgs99rgvzfrlc19cxm5a0j6cgrrlrdhgfx7lggc9h2";
        buildDepends = [
          base containers happstack-server list-tries transformers
        ];
@@ -59644,24 +59706,24 @@ self: {
      }) {};
 
   "haskdeep" = callPackage
-    ({ mkDerivation, attoparsec, attoparsec-conduit, base
-     , base16-bytestring, bytestring, cereal, conduit, containers
+    ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring
+     , cereal, conduit, conduit-combinators, conduit-extra, containers
      , crypto-api, crypto-conduit, cryptohash, cryptohash-cryptoapi
-     , filesystem-conduit, old-locale, optparse-applicative, regex-tdfa
-     , regex-tdfa-text, system-fileio, system-filepath, text, time
+     , directory, filepath, optparse-applicative, regex-tdfa
+     , regex-tdfa-text, resourcet, text, time, transformers, unix-compat
      }:
      mkDerivation {
        pname = "haskdeep";
-       version = "0.2.0.0";
-       sha256 = "1kfrnhcx4805aimb16ji5s9hpyfc113y8m3ajq2wws7phy401r5l";
+       version = "0.2.0.1";
+       sha256 = "0ncx9wx9ldynqwq0zwljwqzskm5mrq8rx74np43pm9qxvjc9f5vx";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         attoparsec attoparsec-conduit base base16-bytestring bytestring
-         cereal conduit containers crypto-api crypto-conduit cryptohash
-         cryptohash-cryptoapi filesystem-conduit old-locale
-         optparse-applicative regex-tdfa regex-tdfa-text system-fileio
-         system-filepath text time
+         attoparsec base base16-bytestring bytestring cereal conduit
+         conduit-combinators conduit-extra containers crypto-api
+         crypto-conduit cryptohash cryptohash-cryptoapi directory filepath
+         optparse-applicative regex-tdfa regex-tdfa-text resourcet text time
+         transformers unix-compat
        ];
        jailbreak = true;
        homepage = "https://github.com/maurotrb/haskdeep";
@@ -60335,6 +60397,7 @@ self: {
          base haskell-src-exts pretty syb template-haskell th-orphans
          uniplate
        ];
+       jailbreak = true;
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61449,8 +61512,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql";
-       version = "0.7.3.1";
-       sha256 = "1brd3k6v2irg6myp08gl859v5fmmdm2cgq3wqn367k388p3b58c4";
+       version = "0.7.3.2";
+       sha256 = "1hhqs4acq8g3331av1lm6l7mmd0sswym278wsn3i0p9khyafpkcm";
        buildDepends = [
          attoparsec base base-prelude either hasql-backend list-t mmorph
          monad-control mtl resource-pool template-haskell text transformers
@@ -61472,12 +61535,11 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-backend";
-       version = "0.4.1";
-       sha256 = "037ibla582gwsi17fsfrwlc0azh54iyyfawvy0nlabzg6lc38snm";
+       version = "0.4.1.1";
+       sha256 = "13llpvppkj2k6kfhmqyllm3m2h8g7lvm6gy8y2bnqq8y5jw9xdm5";
        buildDepends = [
          base-prelude bytestring either free list-t text transformers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/hasql-backend";
        description = "API for backends of \"hasql\"";
        license = stdenv.lib.licenses.mit;
@@ -61493,8 +61555,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-postgres";
-       version = "0.10.3.1";
-       sha256 = "0vdqmn7z9w530f2p5ajgfccr0prr2zcivzww0j574v3n9lbi7q1c";
+       version = "0.10.3.2";
+       sha256 = "1n5r46is6kh1mk20pkkmw3v8gnqlsk2riq2a39kv7j384is02dp3";
        buildDepends = [
          aeson attoparsec base-prelude bytestring either free hashable
          hashtables hasql-backend list-t loch-th mmorph placeholders
@@ -61815,18 +61877,20 @@ self: {
      }) {};
 
   "haxr" = callPackage
-    ({ mkDerivation, array, base, base64-bytestring, blaze-builder
-     , bytestring, HaXml, HTTP, mtl, mtl-compat, network, network-uri
+    ({ mkDerivation, array, base, base-compat, base64-bytestring
+     , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams
+     , http-types, io-streams, mtl, mtl-compat, network, network-uri
      , old-locale, old-time, template-haskell, time, utf8-string
      }:
      mkDerivation {
        pname = "haxr";
-       version = "3000.10.4.2";
-       sha256 = "1v9sx73lwnamynsjf51pjr84v6qli9jcql5kf8d7af27bm54j0ry";
+       version = "3000.11";
+       sha256 = "0gydwh9q76wk2qimy9i1ba6ii6a977nih534iz6rgqfhrkcck8mz";
        buildDepends = [
-         array base base64-bytestring blaze-builder bytestring HaXml HTTP
-         mtl mtl-compat network network-uri old-locale old-time
-         template-haskell time utf8-string
+         array base base-compat base64-bytestring blaze-builder bytestring
+         HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat
+         network network-uri old-locale old-time template-haskell time
+         utf8-string
        ];
        homepage = "http://www.haskell.org/haskellwiki/HaXR";
        description = "XML-RPC client and server library";
@@ -61907,6 +61971,7 @@ self: {
        homepage = "https://github.com/Gonzih/hayoo-cli";
        description = "Hayoo CLI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hback" = callPackage
@@ -62465,8 +62530,8 @@ self: {
      }:
      mkDerivation {
        pname = "hdevtools";
-       version = "0.1.0.8";
-       sha256 = "1a84in8ip037p1f10199g2mk87ymjchyraic8zmxn7vxm1b88217";
+       version = "0.1.0.9";
+       sha256 = "0wwwsh0fi16j5ybsqplwzr0srijjlqs8ywjakqnh25xsvjzmlh66";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -62838,15 +62903,14 @@ self: {
      }:
      mkDerivation {
        pname = "hein";
-       version = "0.1.0.2";
-       sha256 = "10g07m73iaq9v17hv2wx0mmza8vmlakyjjqfhb4rgf73pikfhvsf";
+       version = "0.1.0.4";
+       sha256 = "0agg7nsnhzg3ngiawa9899qg2pwa39dw6rkivdslsv2i67six832";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          base bytestring directory filepath http-conduit process
          transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/khanage/heineken";
        description = "An extensible build helper for haskell, in the vein of leiningen";
        license = stdenv.lib.licenses.asl20;
@@ -65347,16 +65411,15 @@ self: {
     ({ mkDerivation, base, hspec, sass }:
      mkDerivation {
        pname = "hlibsass";
-       version = "0.1.1.0";
-       revision = "1";
-       sha256 = "1dq09m5ag63zzhfa5xkvh3vzrn2ywamvdl41gjrirmbiziqa86l8";
-       editedCabalFile = "768c79fd71253719dfd74821dbf070bd3d1ff30a298fd76d9e6c616bd4b5799a";
+       version = "0.1.2.0";
+       sha256 = "18hby3vjnzfis2ixbkkrk1zwky4rymx5ai00wza9yx4ijnxrzc3z";
        buildDepends = [ base ];
        testDepends = [ base hspec ];
        extraLibraries = [ sass ];
        homepage = "https://github.com/jakubfijalkowski/hlibsass";
        description = "Low-level bindings to libsass";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { sass = null;};
 
   "hlint" = callPackage
@@ -65996,14 +66059,13 @@ self: {
      }:
      mkDerivation {
        pname = "hoauth2";
-       version = "0.4.7";
-       sha256 = "1y4bp6b7jxm4cx0xx27kff835jzxdnxiivf9kky2f2q65aj3q9xq";
+       version = "0.4.8";
+       sha256 = "14rhhk9667asdvdri9xm6jr4blrj5q1mb1g54mi94sz1vqh9hj3f";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base bytestring http-conduit http-types text
        ];
-       jailbreak = true;
        homepage = "https://github.com/freizl/hoauth2";
        description = "hoauth2";
        license = stdenv.lib.licenses.bsd3;
@@ -67110,21 +67172,22 @@ self: {
 
   "hpack" = callPackage
     ({ mkDerivation, aeson, base, base-compat, deepseq, directory
-     , filepath, hspec, interpolate, mockery, unordered-containers, yaml
+     , filepath, hspec, interpolate, mockery, text, unordered-containers
+     , yaml
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.1.2";
-       sha256 = "1rnsqgycnqp3z3hszq438h8hwm0s6gs5vykm620am36r6md3kmzh";
+       version = "0.2.0";
+       sha256 = "1a1kjawmf61znikdg9kw34rqhlqhijb00b1dk1w9s8nx52rcrlaa";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         aeson base base-compat deepseq directory filepath
+         aeson base base-compat deepseq directory filepath text
          unordered-containers yaml
        ];
        testDepends = [
          aeson base base-compat deepseq directory filepath hspec interpolate
-         mockery unordered-containers yaml
+         mockery text unordered-containers yaml
        ];
        homepage = "https://github.com/sol/hpack#readme";
        description = "An alternative format for Haskell packages";
@@ -68212,18 +68275,18 @@ self: {
      }:
      mkDerivation {
        pname = "hsass";
-       version = "0.1.0";
-       sha256 = "1hl0lpjkzxhd4svkfvzl6p8gg32qvkggqdphz14fi11p34ksf41i";
+       version = "0.2.0";
+       sha256 = "0s7p1mv8vwlpgrvnalsfkynd8ps1ndla2yssaq6v650f0vx36jsf";
        buildDepends = [
          base data-default-class filepath hlibsass monad-loops mtl
        ];
        testDepends = [
          base data-default-class hspec hspec-discover temporary
        ];
-       jailbreak = true;
        homepage = "https://github.com/jakubfijalkowski/hsass";
        description = "Integrating Sass into Haskell applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsay" = callPackage
@@ -69373,7 +69436,9 @@ self: {
      mkDerivation {
        pname = "hslua";
        version = "0.4.0";
+       revision = "1";
        sha256 = "0l50ppvnavs3lc1vmrpxhlb3ffl772n1hk8mdi9w4ml64ninba3p";
+       editedCabalFile = "a2019a0881b90b842dfa9c88e452a45bbadb25d9461d0549ab8fd328a82757ee";
        buildDepends = [ base bytestring ];
        testDepends = [ base bytestring hspec hspec-contrib HUnit text ];
        extraLibraries = [ lua ];
@@ -72630,6 +72695,7 @@ self: {
        homepage = "http://sourrust.github.io/hyakko/";
        description = "Literate-style Documentation Generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hybrid" = callPackage
@@ -73210,12 +73276,9 @@ self: {
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "iconv";
-       version = "0.4.1.2";
-       revision = "1";
-       sha256 = "0sd7by7idcnw368mdc1rs3j4xwbzdvgvkd5p1bwgw7wcd272c142";
-       editedCabalFile = "dec449ecde9679a092fc8513cec0bfe72031aa309b9b9795db572a726a976451";
+       version = "0.4.1.3";
+       sha256 = "0m5m0ph5im443xcz60wm1zp98bnmf8l1b5gfllxwhjriwdl52hin";
        buildDepends = [ base bytestring ];
-       jailbreak = true;
        description = "String encoding conversion";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74604,6 +74667,7 @@ self: {
        homepage = "http://doomanddarkness.eu/pub/informative";
        description = "A yesod subsite serving a wiki";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ini" = callPackage
@@ -77041,8 +77105,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-autotype";
-       version = "1.0.1";
-       sha256 = "0p06zv61giwbnwcdcg8fq7mmw3islcj807df4xhaxggr8r3dwywv";
+       version = "1.0.2";
+       sha256 = "00s25fy0w00sbxlgl04jfzipm419dl48mryv7k8pg91nks3vfvdw";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -77624,22 +77688,21 @@ self: {
      }) {};
 
   "kafka-client" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, digest, dlist, hspec
-     , hspec-discover, network, QuickCheck, snappy, time, zlib
+    ({ mkDerivation, base, bytestring, cereal, containers, digest
+     , dlist, hspec, hspec-discover, network, process, QuickCheck
+     , snappy, temporary, time, zlib
      }:
      mkDerivation {
        pname = "kafka-client";
-       version = "0.7.0.0";
-       revision = "1";
-       sha256 = "1qaz47qqrbg1k4jjvq30qy3j57vsa0pqz91dcgx67pvqqw13n7r2";
-       editedCabalFile = "2a9089e946bf6bbb67d9e464a672da4b958775a2572faf78554f1d2875eb7357";
+       version = "0.7.0.1";
+       sha256 = "1577s3s9lf3rdw7xf7snfhiw53h6pg85l5h9l29av5fsg051ifai";
        buildDepends = [
          base bytestring cereal digest dlist network snappy time zlib
        ];
        testDepends = [
-         base bytestring cereal hspec hspec-discover QuickCheck time
+         base bytestring cereal containers hspec hspec-discover network
+         process QuickCheck temporary time
        ];
-       jailbreak = true;
        homepage = "https://github.com/abhinav/kafka-client";
        description = "Low-level Haskell client library for Apache Kafka 0.7.";
        license = stdenv.lib.licenses.mit;
@@ -78403,6 +78466,19 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "ktx" = callPackage
+    ({ mkDerivation, base, bytestring, egl, glew, OpenGL }:
+     mkDerivation {
+       pname = "ktx";
+       version = "0.2";
+       sha256 = "1s7jw27p96spksja6ks2xdnhyds8diwc5y7h22bj6cq5kglskvxf";
+       buildDepends = [ base bytestring OpenGL ];
+       pkgconfigDepends = [ egl glew ];
+       homepage = "https://github.com/corngood/ktx";
+       description = "A binding for libktx from Khronos";
+       license = stdenv.lib.licenses.mit;
+     }) { egl = null;  inherit (pkgs) glew;};
+
   "kure" = callPackage
     ({ mkDerivation, base, dlist, transformers }:
      mkDerivation {
@@ -78663,12 +78739,12 @@ self: {
      }) {};
 
   "lambda-options" = callPackage
-    ({ mkDerivation, base, containers, mtl }:
+    ({ mkDerivation, base, containers, mtl, read-bounded }:
      mkDerivation {
        pname = "lambda-options";
-       version = "0.6.0.0";
-       sha256 = "12w53cpqlqcnx3f54xx14dj532xdwdrdp8yz2a43jb3rdf9ffz5c";
-       buildDepends = [ base containers mtl ];
+       version = "0.7.0.0";
+       sha256 = "0y8q9k3lk71703qzm0bvqh30y7r5ms392gfzh2lcrqkr0mhlf89j";
+       buildDepends = [ base containers mtl read-bounded ];
        jailbreak = true;
        homepage = "https://github.com/thomaseding/lambda-options";
        description = "A modern command-line parser for Haskell";
@@ -79702,8 +79778,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.1.1.2";
-       sha256 = "0d5510krnwfq4vfnq2vlzbjnyhnr13hx1jnm3gajznb2bzn6srx4";
+       version = "1.1.3.1";
+       sha256 = "1h6zsslp3szc3m2ki273a6w47gf9fizyjh0xxby694cmhspknn90";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -79719,7 +79795,6 @@ self: {
          ansi-wl-pprint base either Glob hspec HUnit lens parsec parsers
          strict-base-types temporary text unix unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
@@ -79846,10 +79921,9 @@ self: {
     ({ mkDerivation, base, mtl, parsers, text, trifecta }:
      mkDerivation {
        pname = "language-thrift";
-       version = "0.1.0.0";
-       sha256 = "17x6311mrijm1in78nbcgfq4gmhahqcrhf5yynq3g6b1hylgswsv";
+       version = "0.1.0.1";
+       sha256 = "11z8lkny9bhbbgchpy3jz1nn867ygqi4rq5vffxqpbj6qq2a8bxk";
        buildDepends = [ base mtl parsers text trifecta ];
-       jailbreak = true;
        homepage = "https://github.com/abhinav/language-thrift";
        description = "Parser for the Thrift IDL format";
        license = stdenv.lib.licenses.bsd3;
@@ -80565,7 +80639,9 @@ self: {
      mkDerivation {
        pname = "lens-family-th";
        version = "0.4.1.0";
+       revision = "1";
        sha256 = "084yng26xyhw6c6hij3p70zvjpvm1dlw6klphw51car9gi6dqkvm";
+       editedCabalFile = "13c96ddf2d410ec4e6671c8412710b7cdbbfc837ff5be1d09a6dbb9ecdb9285d";
        buildDepends = [ base template-haskell ];
        homepage = "http://github.com/DanBurton/lens-family-th#readme";
        description = "Generate lens-family style lenses";
@@ -80584,6 +80660,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-simple" = callPackage
+    ({ mkDerivation, base, lens-family, lens-family-core
+     , lens-family-th
+     }:
+     mkDerivation {
+       pname = "lens-simple";
+       version = "0.1.0.2";
+       sha256 = "1gsfij0n70wwvcrgr0lq98kwswghv16y1d0gxnyrfgxkpar47fhf";
+       buildDepends = [
+         base lens-family lens-family-core lens-family-th
+       ];
+       homepage = "https://github.com/michaelt/lens-simple";
+       description = "simplified import of elementary lens-family combinators";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lens-sop" = callPackage
     ({ mkDerivation, base, fclabels, generics-sop, transformers }:
      mkDerivation {
@@ -81238,6 +81330,7 @@ self: {
        jailbreak = true;
        description = "Wrapper for libpafe";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { pafe = null;};
 
   "libpq" = callPackage
@@ -83725,22 +83818,22 @@ self: {
      }) {};
 
   "ltext" = callPackage
-    ({ mkDerivation, aeson, base, composition, composition-extra
-     , containers, data-default, directory, hspec, mtl
-     , optparse-applicative, parsec, pretty, text, transformers, yaml
+    ({ mkDerivation, aeson, base, containers, data-default, deepseq
+     , directory, hspec, mtl, mtl-compat, optparse-applicative, parsec
+     , pretty, template-haskell, text, transformers, yaml
      }:
      mkDerivation {
        pname = "ltext";
-       version = "0.0.0.1";
-       sha256 = "1qz4gpdfjqrq6rgbf3zqcmwkf0x0kphnpr4y7q47wb12wq7xaqa1";
+       version = "0.0.2.1";
+       sha256 = "0dr99prlsbzisaz8jbiw297fw1fysr9zq0g5ywc959ar3nki039f";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson base composition composition-extra containers data-default
-         directory mtl optparse-applicative parsec pretty text transformers
-         yaml
+         aeson base containers data-default deepseq directory mtl mtl-compat
+         optparse-applicative parsec pretty template-haskell text
+         transformers yaml
        ];
-       testDepends = [ base hspec ];
+       testDepends = [ base hspec mtl ];
        description = "Higher-order file applicator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85774,6 +85867,7 @@ self: {
        homepage = "https://github.com/dorafmon/mdcat";
        description = "Markdown viewer in your terminal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mdo" = callPackage
@@ -86049,6 +86143,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "memo-ptr" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "memo-ptr";
+       version = "0.1.0.0";
+       sha256 = "1vy3673dvf0crs384vhi56i7bir9k8yk3cjcrcc7bn15qyclif19";
+       buildDepends = [ base containers ];
+       description = "Pointer equality memoization";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "memo-sqlite" = callPackage
     ({ mkDerivation, base, direct-sqlite }:
      mkDerivation {
@@ -86080,8 +86185,8 @@ self: {
      }:
      mkDerivation {
        pname = "memory";
-       version = "0.5";
-       sha256 = "0lz3w1faxlgyx0sc7nk5wg83zfks5595mxmlrspmbd4d85jk4nvh";
+       version = "0.6";
+       sha256 = "18r0rnh2x5sazn2i23v222vxrgsgyyzbfvasg21r2kh42i0vh2bw";
        buildDepends = [ base bytestring deepseq ghc-prim ];
        testDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        homepage = "https://github.com/vincenthz/hs-memory";
@@ -91415,8 +91520,10 @@ self: {
      }:
      mkDerivation {
        pname = "network-anonymous-tor";
-       version = "0.9.0";
-       sha256 = "02ywcdjrrjivzmzj22nxx81xkcxplhcaxpz21196r3kni8qhi0h0";
+       version = "0.9.1";
+       sha256 = "1p78xsi1i59z9jkyf182gvfx7qpiqs0l60mp2xl1d4jjwgdnni50";
+       isLibrary = true;
+       isExecutable = true;
        buildDepends = [
          attoparsec base base32string bytestring exceptions hexstring
          network network-attoparsec network-simple socks text transformers
@@ -92957,6 +93064,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "number" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "number";
+       version = "0.1.0.0";
+       sha256 = "1cl9s5qf7i0kixwqg27znmx4rvnckggpghs3hls77mq22igskd8p";
+       buildDepends = [ base ];
+       description = "A library for real numbers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "numbering" = callPackage
     ({ mkDerivation, base, containers, vector }:
      mkDerivation {
@@ -93315,8 +93433,8 @@ self: {
      }:
      mkDerivation {
        pname = "objective";
-       version = "1.0.4";
-       sha256 = "0wadqf19nd7ldh92nv20q20j6zdk7jfafvi3zr06i2jlm8gq9dsn";
+       version = "1.0.5";
+       sha256 = "07v1srbzd2sxwfwi1jrq63jycr46hwq4wh6wi7sgdpla5m28mhyh";
        buildDepends = [
          base containers either exceptions free hashable monad-skeleton
          monad-stm mtl profunctors stm template-haskell transformers
@@ -93743,9 +93861,9 @@ self: {
      mkDerivation {
        pname = "opaleye";
        version = "0.3.1.2";
-       revision = "2";
+       revision = "3";
        sha256 = "01ldghza5l1qgcpvsphajfkq7g09fw0dm4vnya9wbs0hla307av9";
-       editedCabalFile = "e428ce92e9fc225610dc60c4248dabb125cdb3dd3bf2cda228672cb01d9c6075";
+       editedCabalFile = "9ee83219b8bc26fe01cca7484513bc3373d2868855ba8757fd210482f0605852";
        buildDepends = [
          attoparsec base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
@@ -93755,7 +93873,6 @@ self: {
        testDepends = [
          base postgresql-simple product-profunctors profunctors time
        ];
-       jailbreak = true;
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
@@ -94460,8 +94577,8 @@ self: {
      }:
      mkDerivation {
        pname = "optparse-simple";
-       version = "0.0.2";
-       sha256 = "07zq89bhkfm08mq4wnnxafgvcv5y53fmjiamfj50mqskzv21i9i7";
+       version = "0.0.3";
+       sha256 = "0zlcvxhx98k1akbv5fzsvwcrmb1rxsmmyaiwkhfrp5dxq6kg0is5";
        buildDepends = [
          base either gitrev optparse-applicative template-haskell
          transformers
@@ -95117,16 +95234,16 @@ self: {
      , directory, executable-path, extensible-exceptions, filemanip
      , filepath, haddock-library, happy, highlighting-kate, hslua, HTTP
      , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl
-     , network, network-uri, old-locale, 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
+     , 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.14";
-       sha256 = "0n4l3jzvd8jzbsi6n4wli2dhijgywbpbss4syjmfnds9pbk6mhz1";
+       version = "1.14.0.3";
+       sha256 = "1nbicmngsdx9v4kvsswipf8w1l8rvfsll8fnp2ar5v65b0aba3ic";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -95135,9 +95252,9 @@ self: {
          deepseq-generics directory extensible-exceptions filemanip filepath
          haddock-library happy highlighting-kate hslua HTTP http-client
          http-client-tls http-types JuicyPixels mtl network network-uri
-         old-locale old-time pandoc-types parsec process random scientific
-         SHA syb tagsoup temporary texmath text time unordered-containers
-         vector xml yaml zip-archive zlib
+         old-time pandoc-types parsec process random scientific SHA syb
+         tagsoup temporary texmath text time unordered-containers vector xml
+         yaml zip-archive zlib
        ];
        testDepends = [
          ansi-terminal base bytestring containers Diff directory
@@ -95146,7 +95263,6 @@ self: {
          test-framework-quickcheck2 text zip-archive
        ];
        configureFlags = [ "-fhttps" "-fmake-pandoc-man-pages" ];
-       jailbreak = true;
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Conversion between markup formats";
        license = "GPL";
@@ -95216,6 +95332,7 @@ self: {
        homepage = "https://github.com/baig/pandoc-csv2table-filter";
        description = "Convert CSV to Pandoc Table Markdown";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-lens" = callPackage
@@ -95237,8 +95354,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-types";
-       version = "1.12.4.3";
-       sha256 = "1aj741y28ci039gy9j16jc7v3vfrj0rc11jliahx4202dz6fdyb5";
+       version = "1.12.4.4";
+       sha256 = "0qk62cn8j3ml0fc12ikfw0pp2b6gqlfn96n5jv9dvyajxqxrby5g";
        buildDepends = [
          aeson base bytestring containers deepseq-generics ghc-prim syb
        ];
@@ -99864,6 +99981,7 @@ self: {
          unordered-containers vector wai wai-cors wai-extra
          wai-middleware-static warp
        ];
+       jailbreak = true;
        homepage = "https://github.com/begriffs/postgrest";
        description = "REST API for any Postgres database";
        license = stdenv.lib.licenses.mit;
@@ -100970,12 +101088,11 @@ self: {
      mkDerivation {
        pname = "product-profunctors";
        version = "0.6.1";
-       revision = "2";
+       revision = "3";
        sha256 = "0phwjngndgsggw2f74k6q43cnnw5w4nvfrfrmkwyz6hgah2zv562";
-       editedCabalFile = "ac8ac15500d9a5f4c678489d77c6abea03b24a704ceb235eecf9f49ef08da757";
+       editedCabalFile = "01edcbebd6228c9fc9dbfbb173651e45cbca28cbd1dc55386a59dd24fb0a6ccd";
        buildDepends = [ base contravariant profunctors template-haskell ];
        testDepends = [ base profunctors ];
-       jailbreak = true;
        homepage = "https://github.com/tomjaguarpaw/product-profunctors";
        description = "product-profunctors";
        license = stdenv.lib.licenses.bsd3;
@@ -108411,15 +108528,14 @@ self: {
      }:
      mkDerivation {
        pname = "sandman";
-       version = "0.1.0.0";
-       sha256 = "02lgpcr70icq9cgxzpd79d60pbk2fsg6n7pn8zmvjks7dv86bdvn";
+       version = "0.1.0.1";
+       sha256 = "184gsdrw10h345ic1bdcdnfaac5fhr6dx77db790fl1lff7z5s1g";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          base Cabal containers directory filepath optparse-applicative
          process text unix-compat
        ];
-       jailbreak = true;
        homepage = "https://github.com/abhinav/sandman";
        description = "Manages Cabal sandboxes to avoid rebuilding packages";
        license = stdenv.lib.licenses.mit;
@@ -108577,8 +108693,8 @@ self: {
     ({ mkDerivation, array, base, containers, satchmo, toysolver }:
      mkDerivation {
        pname = "satchmo-toysat";
-       version = "0.2.0.0";
-       sha256 = "10prfalf8gic4p5sj35svnypzdgn69f6vwbj9dh55bcq70gqqgn2";
+       version = "0.2.1.0";
+       sha256 = "1g6hzgdiiczwk87928xi42lv2swm218i9hs39f3zqpcp8r7fxh61";
        buildDepends = [ array base containers satchmo toysolver ];
        jailbreak = true;
        homepage = "https://github.com/msakai/satchmo-toysat";
@@ -108805,17 +108921,18 @@ self: {
      }) {};
 
   "schedule-planner" = callPackage
-    ({ mkDerivation, base, containers, happstack-lite, json, mtl
-     , options, transformers
+    ({ mkDerivation, aeson, base, bytestring, containers, http-types
+     , mtl, options, text, transformers, wai, warp
      }:
      mkDerivation {
        pname = "schedule-planner";
-       version = "0.1.0.2";
-       sha256 = "0xpn5jgdbzkwysnjlzmvnrvk55wsffx9zbxd6hi1av4nbqz2269r";
+       version = "1.0.0.0";
+       sha256 = "0cbx6k3spsdsk8bjwyzyjw9iqdpc7z2vkds51iaxxn3wiwjkxwpq";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base containers happstack-lite json mtl options transformers
+         aeson base bytestring containers http-types mtl options text
+         transformers wai warp
        ];
        description = "Find the ideal lesson layout";
        license = stdenv.lib.licenses.gpl3;
@@ -109680,8 +109797,8 @@ self: {
      }:
      mkDerivation {
        pname = "second-transfer";
-       version = "0.5.2.2";
-       sha256 = "0zch87psqszg42rxwjd3px80j867xjqz06lgvndrd01sqzadw18g";
+       version = "0.5.3.1";
+       sha256 = "1ng3a384y3hsm6xgw8mhchkgz8xdgrk35b44lbifdfilcmmq7nrv";
        buildDepends = [
          attoparsec base base16-bytestring binary bytestring conduit
          containers exceptions hashable hashtables hslogger http2 lens
@@ -112903,6 +113020,7 @@ self: {
        ];
        description = "ws convert markdown to reveal-js";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sloane" = callPackage
@@ -113077,14 +113195,14 @@ self: {
      }) {};
 
   "smaoin" = callPackage
-    ({ mkDerivation, base, bytestring, QuickCheck, text }:
+    ({ mkDerivation, base, bytestring, QuickCheck, random, text, uuid
+     }:
      mkDerivation {
        pname = "smaoin";
-       version = "0.1.1.2";
-       sha256 = "0h8qqbggklw0vj5qf12114ki42kb7cilhd6i24fvlhaffpmpgv21";
-       buildDepends = [ base bytestring text ];
-       testDepends = [ base QuickCheck ];
-       jailbreak = true;
+       version = "0.2.0.0";
+       sha256 = "1zciyb1kknhnrnkw57bfi28sc80fbz6dq4vrnyq1b63b4nmhl2sd";
+       buildDepends = [ base bytestring random text uuid ];
+       testDepends = [ base bytestring QuickCheck ];
        homepage = "http://rel4tion.org/projects/smaoin-hs/";
        description = "Utilities for the Smaoin semantic information model";
        license = stdenv.lib.licenses.publicDomain;
@@ -116279,13 +116397,12 @@ self: {
      }:
      mkDerivation {
        pname = "stack-prism";
-       version = "0.1.3";
-       sha256 = "0v69gd81b7qaci3f9bmlvpvhnzdksqx4nvazxghrmdq04f28gfjm";
+       version = "0.1.4";
+       sha256 = "1lw42nkbzsc7mg8fnspjsply67ashrnbkml797fz2nvic84l8820";
        buildDepends = [
          base profunctors tagged template-haskell transformers
        ];
        testDepends = [ base template-haskell ];
-       jailbreak = true;
        homepage = "https://github.com/MedeaMelana/stack-prism";
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
@@ -116462,8 +116579,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-sandbox";
-       version = "0.1.4";
-       sha256 = "0y6m2ph1pgzlncirngbid7igdwkiv7yxcj27cgm0xpq8ii4lsq4x";
+       version = "0.1.5";
+       sha256 = "0d5i2wszn4sv797gzdv84abvdm3nzaa1lgn2gp4ywj1iqbbszbns";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -118833,8 +118950,8 @@ self: {
     ({ mkDerivation, base, containers, HUnit, mtl }:
      mkDerivation {
        pname = "syb";
-       version = "0.4.4";
-       sha256 = "11sc9kmfvcn9bfxf227fgmny502z2h9xs3z0m9ak66lk0dw6f406";
+       version = "0.5.1";
+       sha256 = "0iiqz5mamk1nsij99rypms7dhx5flm2n02k1x6miqgnhg075zc41";
        buildDepends = [ base ];
        testDepends = [ base containers HUnit mtl ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
@@ -122582,8 +122699,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-typegraph";
-       version = "0.17.1";
-       sha256 = "06hyyb1rjm8rvkllvjsgh56fwly99hv33brb4xycc1sc4452cslm";
+       version = "0.18";
+       sha256 = "0z47q4sj5z3ajv17d4rda8zaqbbay36x1z6vy8i5c1g6971y8vs5";
        buildDepends = [
          base containers data-default haskell-src-exts lens mtl syb
          template-haskell th-desugar th-orphans
@@ -123390,12 +123507,14 @@ self: {
      }) {};
 
   "time-qq" = callPackage
-    ({ mkDerivation, base, hspec, old-locale, template-haskell, time }:
+    ({ mkDerivation, base, hspec, template-haskell, time
+     , time-locale-compat
+     }:
      mkDerivation {
        pname = "time-qq";
-       version = "0.0.0.1";
-       sha256 = "11ib2i7693jvszbgzd2673953pklxphd0mhwkf67q47d6b5spdpq";
-       buildDepends = [ base old-locale template-haskell time ];
+       version = "0.0.0.2";
+       sha256 = "0zpgs5xmjq4fk5djg438fpyh3582v22rjrpqhdr3qy81gcqbgaz7";
+       buildDepends = [ base template-haskell time time-locale-compat ];
        testDepends = [ base hspec ];
        homepage = "https://github.com/christian-marie/time-qq";
        description = "Quasi-quoter for UTCTime times";
@@ -124295,34 +124414,35 @@ self: {
      }) {};
 
   "toysolver" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers
-     , data-default-class, data-interval, deepseq, exceptions
-     , extended-reals, filepath, finite-field, ghc-prim, hashable, heaps
-     , HUnit, intern, loop, mtl, multiset, OptDir, parse-dimacs, parsec
-     , prettyclass, primes, process, queue, QuickCheck, random, sign
-     , stm, temporary, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, test-framework-th, time
+    ({ mkDerivation, array, base, bytestring, bytestring-builder
+     , containers, data-default-class, data-interval, deepseq
+     , exceptions, extended-reals, filepath, finite-field, ghc-prim
+     , hashable, heaps, HUnit, intern, loop, mtl, multiset, OptDir
+     , parse-dimacs, parsec, prettyclass, primes, process
+     , pseudo-boolean, queue, QuickCheck, random, sign, stm, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-th, temporary, time
      , type-level-numbers, unbounded-delays, unordered-containers
      , vector-space
      }:
      mkDerivation {
        pname = "toysolver";
-       version = "0.2.0";
-       sha256 = "1lqm4b63cq6iq7f0s70ch6w0n03d2vdpb79ykdbgypvndwwfqy23";
+       version = "0.3.0";
+       sha256 = "01rhq7mz20bjzqpvwwf7z4v77p9kvwgk4pv7gr6264ha30sygbr8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         array base bytestring containers data-default-class data-interval
-         deepseq exceptions extended-reals filepath finite-field ghc-prim
-         hashable heaps intern loop mtl multiset OptDir parse-dimacs parsec
-         prettyclass primes process queue random sign stm temporary time
+         array base bytestring bytestring-builder containers
+         data-default-class data-interval deepseq exceptions extended-reals
+         filepath finite-field ghc-prim hashable heaps intern loop mtl
+         multiset OptDir parse-dimacs parsec prettyclass primes process
+         pseudo-boolean queue random sign stm temporary time
          type-level-numbers unbounded-delays unordered-containers
          vector-space
        ];
        testDepends = [
          array base containers data-interval finite-field HUnit mtl OptDir
-         prettyclass QuickCheck stm test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th vector-space
+         prettyclass QuickCheck random stm tasty tasty-hunit
+         tasty-quickcheck tasty-th vector-space
        ];
        description = "Assorted decision procedures for SAT, Max-SAT, PB, MIP, etc";
        license = stdenv.lib.licenses.bsd3;
@@ -125047,6 +125167,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tubes" = callPackage
+    ({ mkDerivation, base, free, mtl, transformers }:
+     mkDerivation {
+       pname = "tubes";
+       version = "0.1.0.0";
+       sha256 = "0xfpvffwp9nqkgc0j6qx6fkliaynhr8zvwzgg02y791hkjbn629k";
+       buildDepends = [ base free mtl transformers ];
+       homepage = "https://github.com/gatlin/tubes";
+       description = "Effectful, iteratee-inspired stream processing based on a free monad";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "tuntap" = callPackage
     ({ mkDerivation, base, bytestring, unix }:
      mkDerivation {
@@ -130794,8 +130926,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-request-spec";
-       version = "0.10.0.0";
-       sha256 = "1sjlajp79j9mj0xaz9srzvai86il95vzq7668ydzj9hllllf04bk";
+       version = "0.10.0.1";
+       sha256 = "13s86z82rcsy3ai4qzjbxinwxzd81zhsvf589mhn2fhfk8qm7wdg";
        buildDepends = [
          base bytestring case-insensitive containers http-types text wai
        ];
@@ -131093,6 +131225,7 @@ self: {
        homepage = "https://github.com/futurice/waitra";
        description = "A very simple Wai router";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp" = callPackage
@@ -131913,8 +132046,8 @@ self: {
      }:
      mkDerivation {
        pname = "websockets";
-       version = "0.9.4.0";
-       sha256 = "0wpiy5i5vs2506s8xy24rxs9szpzga73xdhf1kfmdhl3gka0q7g0";
+       version = "0.9.5.0";
+       sha256 = "016h213sk3n662ri8ns1sswcnaml61qckprdgxdp0m2a77amivmy";
        buildDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive containers entropy mtl network random SHA text
@@ -131936,8 +132069,8 @@ self: {
      }:
      mkDerivation {
        pname = "websockets-snap";
-       version = "0.9.1.0";
-       sha256 = "170bivzyqr46s9l7l6dd1nwx3wai9pv0qpf7bw3rxh2y6lxk2546";
+       version = "0.9.2.0";
+       sha256 = "03szycdvygw1zkv2s090wn2jii9sqbplgbycmpm5mfm3r0jhbhxp";
        buildDepends = [
          base bytestring enumerator mtl snap-core snap-server websockets
        ];
@@ -133291,8 +133424,8 @@ self: {
      }:
      mkDerivation {
        pname = "xcffib";
-       version = "0.2.2";
-       sha256 = "1h8rnpgzicn46i4narvmjgh4r46q90ch5wgwmxknksnqi55c7gs4";
+       version = "0.3.0";
+       sha256 = "1ih7wnsy38p7s14fnyg3pnm3hyp3nd6fprl2m66l09cj7ibvnxyc";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -135302,6 +135435,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-auth-account-fork" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, bytestring
+     , email-validate, hspec, http-types, monad-logger, mtl, nonce
+     , persistent, persistent-sqlite, pwstore-fast, random, resourcet
+     , tagged, text, xml-conduit, yesod, yesod-auth, yesod-auth-account
+     , yesod-core, yesod-form, yesod-persistent, yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-auth-account-fork";
+       version = "2.0";
+       sha256 = "0y3xd8iw15il05bpnkicnlv9xznqlirapbr6gmr7lxzjhgddrzyn";
+       buildDepends = [
+         aeson base blaze-html bytestring email-validate http-types mtl
+         nonce persistent pwstore-fast random tagged text yesod-auth
+         yesod-core yesod-form yesod-persistent
+       ];
+       testDepends = [
+         base bytestring hspec monad-logger mtl persistent-sqlite resourcet
+         text xml-conduit yesod yesod-auth yesod-auth-account yesod-test
+       ];
+       homepage = "https://github.com/meteficha/yesod-auth-account-fork";
+       description = "An account authentication plugin for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-basic" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, exceptions
      , hlint, hspec, text, wai, word8, yesod, yesod-test
@@ -135965,6 +136124,7 @@ self: {
        homepage = "http://github.com/pbrisbin/yesod-markdown";
        description = "Tools for using markdown in a yesod application";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-newsfeed" = callPackage
@@ -136802,6 +136962,18 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-solarized" = callPackage
+    ({ mkDerivation, base, yi }:
+     mkDerivation {
+       pname = "yi-solarized";
+       version = "0.1.1";
+       sha256 = "17ifjm9vgrhv00bll5zj9siz08fng1626bff9q5sfbvzd7y6i9nc";
+       buildDepends = [ base yi ];
+       homepage = "https://github.com/NorfairKing/yi-solarized";
+       description = "Solarized colour theme for the Yi text editor";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yi-spolsky" = callPackage
     ({ mkDerivation, base, yi }:
      mkDerivation {

From ecac359ccfecc10af6c0138fedf67db6a703f01c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jun 2015 11:33:37 +0200
Subject: [PATCH 0632/2322] ghc-7.10.x: trigger re-builds to recover from
 non-determinstic library ID

---
 .../haskell-modules/configuration-ghc-7.10.x.nix   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 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 2262819a779..964b221d38c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -92,9 +92,6 @@ self: super: {
   # https://bitbucket.org/FlorianHartwig/attobencode/issue/1
   AttoBencode = dontCheck super.AttoBencode;
 
-  # bos/attoparsec#92
-  attoparsec = dontCheck super.attoparsec;
-
   # Test suite fails with some (seemingly harmless) error.
   # https://code.google.com/p/scrapyourboilerplate/issues/detail?id=24
   syb = dontCheck super.syb;
@@ -282,7 +279,18 @@ self: super: {
   llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
 
   # Ugly hack to trigger a rebuild to fix the broken package on Hydra.
+  asn1-encoding = appendConfigureFlag super.asn1-encoding "-fignore-me-1";
+  asn1-types = appendConfigureFlag super.asn1-types "-fignore-me-1";
+  cmdargs = appendConfigureFlag super.cmdargs "-fignore-me-1";
   crypto-api = appendConfigureFlag super.crypto-api "-fignore-me-1";
+  crypto-pubkey-types = appendConfigureFlag super.crypto-pubkey-types "-fignore-me-1";
+  hourglass = appendConfigureFlag super.hourglass "-fignore-me-1";
+  math-functions = appendConfigureFlag super.math-functions "-fignore-me-1";
+  tagsoup = appendConfigureFlag super.tagsoup "-fignore-me-1";
+  X11 = appendConfigureFlag super.X11 "-fignore-me-1";
+  x509 = appendConfigureFlag super.x509 "-fignore-me-1";
+  x509-store = appendConfigureFlag super.x509-store "-fignore-me-1";
+  x509-system = appendConfigureFlag super.x509-system "-fignore-me-1";
 
   # Fix compilation under GHC 7.10, patch has been sent upstream.
   iconv = appendPatch super.iconv ./iconv-fix-ghc710.patch;

From 3e0513ea866f6844c17fcf11b31776c63bb169cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 May 2015 10:29:50 +0200
Subject: [PATCH 0633/2322] haskell-cabal-helper wants to store test suite data
 in $HOME

---
 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 eb2c1e7c9c0..a54ffc72a50 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -832,4 +832,8 @@ self: super: {
 
   # https://github.com/vincenthz/hs-cipher-aes/issues/35
   cipher-aes = dontCheck super.cipher-aes;
+
+  # https://github.com/DanielG/cabal-helper/issues/2
+  cabal-helper = overrideCabal super.cabal-helper (drv: { preCheck = "export HOME=$TMPDIR"; });
+
 }

From 0d484e999bd99c440cd94106cc8c4fb06828ce72 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 May 2015 19:46:31 +0200
Subject: [PATCH 0634/2322] haskell-binary: update to version 0.7.5.0

---
 pkgs/development/haskell-modules/configuration-common.nix     | 3 ---
 pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.0.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 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix  | 4 ++--
 7 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a54ffc72a50..715a6da5636 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -809,9 +809,6 @@ self: super: {
   # https://github.com/yaccz/saturnin/issues/3
   Saturnin = dontCheck super.Saturnin;
 
-  # https://github.com/kolmodin/binary/issues/74
-  binary_0_7_4_0 = dontCheck super.binary_0_7_4_0;
-
   # https://github.com/kkardzis/curlhs/issues/6
   curlhs = dontCheck super.curlhs;
 
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 2fecaa5a532..5299cefdc07 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;
 
   # binary is not a core library for this compiler.
-  binary = self.binary_0_7_4_0;
+  binary = self.binary_0_7_5_0;
 
   # deepseq is not a core library for this compiler.
   deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_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 f6b2b2304b9..a3ad255aab8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -35,7 +35,7 @@ self: super: {
   unix = null;
 
   # binary is not a core library for this compiler.
-  binary = self.binary_0_7_4_0;
+  binary = self.binary_0_7_5_0;
 
   # deepseq is not a core library for this compiler.
   deepseq = self.deepseq_1_4_1_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 98bad4fa1be..556b86f95eb 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -41,7 +41,7 @@ self: super: {
   transformers = self.transformers_0_4_3_0;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; };
+  Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_5_0; process = self.process_1_2_3_0; };
 
   # Newer versions don't compile.
   Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
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 2bad8d8b97d..d659406818c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -38,10 +38,10 @@ self: super: {
   transformers = self.transformers_0_4_3_0;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; };
+  Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_5_0; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_4_0; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_5_0; });
 
   # 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 a90c5f99173..b7129efb8a7 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_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; };
+  Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_5_0; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_4_0; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_5_0; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
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 84994bc683f..9327af856e8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -86,8 +86,8 @@ self: super: {
   seqid-streams = super.seqid-streams_0_1_0;
 
   # Need binary >= 0.7.2, but our compiler has only 0.7.1.0.
-  hosc = super.hosc.overrideScope (self: super: { binary = self.binary_0_7_4_0; });
-  tidal-midi = super.tidal-midi.overrideScope (self: super: { binary = self.binary_0_7_4_0; });
+  hosc = super.hosc.overrideScope (self: super: { binary = self.binary_0_7_5_0; });
+  tidal-midi = super.tidal-midi.overrideScope (self: super: { binary = self.binary_0_7_5_0; });
 
   # These packages need mtl 2.2.x directly or indirectly via dependencies.
   amazonka = markBroken super.amazonka;

From 873fa649e8e851ea255fe87c6a8f79097aee6d23 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 May 2015 20:22:42 +0200
Subject: [PATCH 0635/2322] cabal-install: break infinite recursion on ghc
 7.6.x and 7.4.x.

---
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 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 d659406818c..e012cda2da9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -38,10 +38,10 @@ self: super: {
   transformers = self.transformers_0_4_3_0;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_5_0; };
+  Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = dontCheck self.binary_0_7_5_0; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_5_0; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_5_0; });
 
   # 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 b7129efb8a7..16257dcc17b 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_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_5_0; };
+  Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = dontCheck self.binary_0_7_5_0; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = self.binary_0_7_5_0; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_5_0; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;

From 682e37e58653b6b41077a7a26b2c62f1789703a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jun 2015 17:32:37 +0200
Subject: [PATCH 0636/2322] haskell-iconv: GHC 7.10.x support was added
 upstream

---
 .../configuration-ghc-7.10.x.nix              |  3 --
 .../haskell-modules/iconv-fix-ghc710.patch    | 41 -------------------
 2 files changed, 44 deletions(-)
 delete mode 100644 pkgs/development/haskell-modules/iconv-fix-ghc710.patch

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 964b221d38c..ac02bbc8818 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -292,7 +292,4 @@ self: super: {
   x509-store = appendConfigureFlag super.x509-store "-fignore-me-1";
   x509-system = appendConfigureFlag super.x509-system "-fignore-me-1";
 
-  # Fix compilation under GHC 7.10, patch has been sent upstream.
-  iconv = appendPatch super.iconv ./iconv-fix-ghc710.patch;
-
 }
diff --git a/pkgs/development/haskell-modules/iconv-fix-ghc710.patch b/pkgs/development/haskell-modules/iconv-fix-ghc710.patch
deleted file mode 100644
index a7c35647a29..00000000000
--- a/pkgs/development/haskell-modules/iconv-fix-ghc710.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Running command 'diff -urN old-iconv new-iconv'
-Fri May 29 00:42:30 CEST 2015  Robert Helgesson <robert@rycee.net>
-  * Add Functor and Applicative instances for IConv
-  
-  This makes iconv successfully build under GHC 7.10.
-diff -urN old-iconv/Codec/Text/IConv/Internal.hs new-iconv/Codec/Text/IConv/Internal.hs
---- old-iconv/Codec/Text/IConv/Internal.hs	2015-05-31 11:26:06.410968449 +0200
-+++ new-iconv/Codec/Text/IConv/Internal.hs	2015-05-31 11:26:06.410968449 +0200
-@@ -49,6 +49,7 @@
- import System.IO.Unsafe (unsafeInterleaveIO, unsafePerformIO)
- import System.IO (hPutStrLn, stderr)
- import Control.Exception (assert)
-+import Control.Monad (ap, liftM)
- 
- import Prelude hiding (length)
- 
-@@ -192,8 +193,8 @@
-  -}
- 
- 
------------------------------
---- IConv monad
-+----------------------------------------
-+-- IConv functor, applicative, and monad
- --
- 
- newtype IConv a = I {
-@@ -202,6 +203,13 @@
-         -> IO (Buffers, a)
-   }
- 
-+instance Functor IConv where
-+  fmap = liftM
-+
-+instance Applicative IConv where
-+  pure = return
-+  (<*>) = ap
-+
- instance Monad IConv where
-   (>>=)  = bindI
- --  m >>= f = (m `bindI` \a -> consistencyCheck `thenI` returnI a) `bindI` f

From 921b000fa53b1ff747d6adebb85b70db752605c1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Jun 2015 10:14:04 +0200
Subject: [PATCH 0637/2322] haskell-base-noprelude: disable Haddock phase on
 empty library

---
 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 715a6da5636..391c0a02865 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -121,6 +121,7 @@ self: super: {
 
   # The Haddock phase fails for one reason or another.
   attoparsec-conduit = dontHaddock super.attoparsec-conduit;
+  base-noprelude = dontHaddock super.base-noprelude;
   blaze-builder-conduit = dontHaddock super.blaze-builder-conduit;
   BNFC-meta = dontHaddock super.BNFC-meta;
   bytestring-progress = dontHaddock super.bytestring-progress;

From 52829ce24a6fc6389364e46e9bf537d625aaa557 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Jun 2015 10:14:27 +0200
Subject: [PATCH 0638/2322] Disable broken builds for Haskell packages gitit
 and influxdb.

---
 pkgs/development/haskell-modules/configuration-common.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 391c0a02865..9a4979cd58d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -402,7 +402,6 @@ self: super: {
   http-client-openssl = dontCheck super.http-client-openssl;
   http-client-tls = dontCheck super.http-client-tls;
   ihaskell = dontCheck super.ihaskell;
-  influxdb = dontCheck (dontJailbreak super.influxdb);
   itanium-abi = dontCheck super.itanium-abi;
   katt = dontCheck super.katt;
   language-slice = dontCheck super.language-slice;
@@ -834,4 +833,11 @@ self: super: {
   # https://github.com/DanielG/cabal-helper/issues/2
   cabal-helper = overrideCabal super.cabal-helper (drv: { preCheck = "export HOME=$TMPDIR"; });
 
+  # https://github.com/jgm/gitit/issues/494
+  gitit = markBroken super.gitit;
+
+  # https://github.com/maoe/influxdb-haskell/issues/26
+  influxdb = markBroken (dontCheck super.influxdb);
+  snaplet-influxdb = dontDistribute super.snaplet-influxdb;
+
 }

From c86c1b79af8b3eb057c092bde15885ff48729171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 2 Jun 2015 11:02:11 +0200
Subject: [PATCH 0639/2322] libav(-11): maintenance update, including security

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

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 41a8b391eb3..23b1402e3e7 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -28,7 +28,7 @@ let
   result = {
     libav_0_8 = libavFun "0.8.17" "31ace2daeb8c105deed9cd3476df47318d417714";
     libav_9   = libavFun   "9.18" "e10cde4587c4d4d3bb11d30c7b47e953664cd714";
-    libav_11  = libavFun  "11.3"  "d9d4fd0ffeda7a244b31968c01d72f0042a56f7a";
+    libav_11  = libavFun  "11.4"  "c2ab12102de187f2675a56b828b4a5e9136ab747";
   };
 
   libavFun = version : sha1 : stdenv.mkDerivation rec {

From 1847e204e0236e09f9936103c3145ff1b7f4d496 Mon Sep 17 00:00:00 2001
From: Richard Zetterberg <richard.zetterberg@googlemail.com>
Date: Sun, 31 May 2015 21:18:17 +0200
Subject: [PATCH 0640/2322] Adds antimony 0.8.0b CAD program

---
 .../graphics/antimony/default.nix             | 41 ++++++++
 .../graphics/antimony/paths-fix.patch         | 99 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 142 insertions(+)
 create mode 100644 pkgs/applications/graphics/antimony/default.nix
 create mode 100644 pkgs/applications/graphics/antimony/paths-fix.patch

diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
new file mode 100644
index 00000000000..589d20cb126
--- /dev/null
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchgit, libpng, python3, boost, mesa, qt5, ncurses }:
+
+let
+  gitRev    = "745eca3a2d2657c495d5509e9083c884e021d09c";
+  gitBranch = "master";
+  gitTag    = "0.8.0b";
+in 
+  stdenv.mkDerivation rec {
+    name    = "antimony-${version}";
+    version = gitTag;
+
+    src  = fetchgit {
+      url         = "git://github.com/mkeeter/antimony.git";
+      rev         = gitRev;
+      sha256      = "19ir3y5ipmfyygcn8mbxika4j3af6dfrv54dvhn6maz7dy8h30f4";
+    };
+
+    patches = [ ./paths-fix.patch ];
+
+    buildInputs = [
+      libpng python3 (boost.override { python = python3; })
+      mesa qt5.base ncurses
+    ];
+
+    configurePhase = ''
+      export GITREV=${gitRev}
+      export GITBRANCH=${gitBranch}
+      export GITTAG=${gitTag}
+
+      cd qt
+      export sourceRoot=$sourceRoot/qt
+      qmake antimony.pro PREFIX=$out
+    '';
+
+    meta = with stdenv.lib; {
+      description = "A computer-aided design (CAD) tool from a parallel universe";
+      homepage    = "https://github.com/mkeeter/antimony";
+      license     = licenses.mit;
+      platforms   = platforms.linux;
+    };
+  }
diff --git a/pkgs/applications/graphics/antimony/paths-fix.patch b/pkgs/applications/graphics/antimony/paths-fix.patch
new file mode 100644
index 00000000000..de8d9e7beb0
--- /dev/null
+++ b/pkgs/applications/graphics/antimony/paths-fix.patch
@@ -0,0 +1,99 @@
+diff --git a/qt/antimony.pro b/qt/antimony.pro
+index 9d586f4..b055a6d 100644
+--- a/qt/antimony.pro
++++ b/qt/antimony.pro
+@@ -12,14 +12,9 @@ QMAKE_CXXFLAGS_RELEASE += -O3
+ 
+ QMAKE_CXXFLAGS += -Werror=switch
+ 
+-GITREV = $$system(git log --pretty=format:'%h' -n 1)
+-GITDIFF = $$system(git diff --quiet --exit-code || echo "+")
+-GITTAG = $$system(git describe --exact-match --tags 2> /dev/null)
+-GITBRANCH = $$system(git rev-parse --abbrev-ref HEAD)
+-
+-QMAKE_CXXFLAGS += "-D'GITREV=\"$${GITREV}$${GITDIFF}\"'"
+-QMAKE_CXXFLAGS += "-D'GITTAG=\"$${GITTAG}\"'"
+-QMAKE_CXXFLAGS += "-D'GITBRANCH=\"$${GITBRANCH}\"'"
++QMAKE_CXXFLAGS += "-D'GITREV=\"$$(GITREV)\"'"
++QMAKE_CXXFLAGS += "-D'GITTAG=\"$$(GITTAG)\"'"
++QMAKE_CXXFLAGS += "-D'GITBRANCH=\"$$(GITBRANCH)\"'"
+ 
+ OLD_GL_SET = $$(OLD_GL)
+ equals(OLD_GL_SET, "true") {
+@@ -125,11 +120,11 @@ macx {
+ }
+ 
+ linux {
+-    executable.path = /usr/local/bin
++    executable.path = $$(out)/bin
+     executable.files = antimony
+-    nodes_folder.path = /usr/local/bin/sb/nodes
++    nodes_folder.path = $$(out)/bin/sb/nodes
+     nodes_folder.files = ../py/nodes/*
+-    fab_folder.path = /usr/local/bin/sb/fab
++    fab_folder.path = $$(out)/bin/sb/fab
+     fab_folder.files = ../py/fab/*
+     INSTALLS += executable nodes_folder fab_folder
+ }
+diff --git a/qt/fab.pri b/qt/fab.pri
+index a54813b..b500536 100644
+--- a/qt/fab.pri
++++ b/qt/fab.pri
+@@ -54,7 +54,7 @@ DEFINES += '_STATIC_= '
+ 
+ linux {
+     QMAKE_CFLAGS += -std=gnu99
+-    QMAKE_CXXFLAGS += $$system(/usr/bin/python3-config --includes)
++    QMAKE_CXXFLAGS += $$system(python3-config --includes)
+     LIBS += -lpng
+ }
+ 
+diff --git a/qt/shared.pri b/qt/shared.pri
+index e7d0e3a..026eae3 100644
+--- a/qt/shared.pri
++++ b/qt/shared.pri
+@@ -39,41 +39,11 @@ macx {
+ }
+ 
+ linux {
+-    QMAKE_CXXFLAGS += $$system(/usr/bin/python3-config --includes)
+-    QMAKE_LFLAGS   += $$system(/usr/bin/python3-config --ldflags)
++    QMAKE_CXXFLAGS += $$system(python3-config --includes)
++    QMAKE_LFLAGS   += $$system(python3-config --ldflags)
+ 
+     # Even though this is in QMAKE_LFLAGS, the linker is picky about
+     # library ordering (so it needs to be here too).
+     LIBS += -lpython3.4m
+-
+-    # ldconfig is being used to find libboost_python, but it's in a different
+-    # place in different distros (and is not in the default $PATH on Debian).
+-    # First, check to see if it's on the default $PATH.
+-    system(which ldconfig > /dev/null) {
+-        LDCONFIG_BIN = "ldconfig"
+-    }
+-    # If that failed, then search for it in its usual places.
+-    isEmpty(LDCONFIG_BIN) {
+-        for(p, $$list(/sbin/ldconfig /usr/bin/ldconfig)) {
+-            exists($$p): LDCONFIG_BIN = $$p
+-        }
+-    }
+-    # If that search failed too, then exit with an error.
+-    isEmpty(LDCONFIG_BIN) {
+-        error("Could not find ldconfig!")
+-    }
+-
+-    # Check for different boost::python naming schemes
+-    LDCONFIG_OUT = $$system($$LDCONFIG_BIN -p|grep python)
+-    for (b, $$list(boost_python-py34 boost_python3)) {
+-        contains(LDCONFIG_OUT, "lib$${b}.so") {
+-            LIBS += "-l$$b"
+-            GOT_BOOST_PYTHON = True
+-        }
+-    }
+-
+-    # If we couldn't find boost::python, exit with an error.
+-    isEmpty(GOT_BOOST_PYTHON) {
+-        error("Could not find boost::python3")
+-    }
++    LIBS += -lboost_python3
+ }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78be647f15a..1eebdf8492d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10451,6 +10451,8 @@ let
 
   amsn = callPackage ../applications/networking/instant-messengers/amsn { };
 
+  antimony = callPackage ../applications/graphics/antimony {};
+
   antiword = callPackage ../applications/office/antiword {};
 
   ardour = ardour4;

From 9c983ade4d56f9585fd2a806c8ee1650e180b3eb Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 2 Jun 2015 11:21:22 +0200
Subject: [PATCH 0641/2322] doc: fix references

---
 doc/language-support.xml | 6 +++---
 doc/stdenv.xml           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/language-support.xml b/doc/language-support.xml
index 14e8aa7a7ba..def0de1d91f 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -257,7 +257,7 @@ are provided with all modules included.</para>
     <term><varname>buildEnv</varname></term>
     <listitem><para>
         Function to build python interpreter environments with extra packages bundled together.
-        See <xref linkend="python-build-env" /> for usage and documentation.
+        See <xref linkend="ssec-python-build-env" /> for usage and documentation.
     </para></listitem>
   </varlistentry>
 
@@ -587,7 +587,7 @@ sed -i '/ = data_files/d' setup.py</programlisting>
     <listitem><para>
       There is no need to have global site-packages in Nix. Each package has isolated
       dependency tree and installing any python package will only populate <varname>$PATH</varname>
-      inside user environment. See <xref linkend="python-build-env" /> to create self-contained
+      inside user environment. See <xref linkend="ssec-python-build-env" /> to create self-contained
       interpreter with a set of packages.
     </para></listitem>
   </varlistentry>
@@ -876,7 +876,7 @@ Runtime) instead of the OpenJRE.</para>
   in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules/generic/default.nix">
   <filename>pkgs/development/lua-modules/generic/default.nix</filename></link>
   and works similarly to <varname>buildPerlPackage</varname>. (See
-  <xref linkend="ssec-language-perl"/> for details.)
+  <xref linkend="sec-language-perl"/> for details.)
 </para>
 
 <para>
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 58310834fd2..4e51db73010 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -59,7 +59,7 @@ build.  To make this easier, the standard environment breaks the
 package build into a number of <emphasis>phases</emphasis>, all of
 which can be overridden or modified individually: unpacking the
 sources, applying patches, configuring, building, and installing.
-(There are some others; see <xref linkend="ssec-stdenv-phases"/>.)
+(There are some others; see <xref linkend="sec-stdenv-phases"/>.)
 For instance, a package that doesn’t supply a makefile but instead has
 to be compiled “manually” could be handled like this:
 

From 752528ac9cbe00120cd2f36b819f6d54ea2257fa Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 2 Jun 2015 13:14:51 +0200
Subject: [PATCH 0642/2322] add pdfpc, a presenter console with multi-monitor
 support for PDF files

---
 pkgs/applications/misc/pdfpc/default.nix | 31 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  6 +++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/misc/pdfpc/default.nix

diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
new file mode 100644
index 00000000000..a2cffdef58b
--- /dev/null
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee, poppler
+, libpthreadstubs, gstreamer, gst-plugins-base, librsvg }:
+
+stdenv.mkDerivation rec {
+  name = "${product}-${version}";
+  product = "pdfpc";
+  version = "4.0.0";
+
+  src = fetchurl {
+    url = "https://github.com/pdfpc/pdfpc/releases/download/v${version}/${product}-v${version}.tar.gz";
+    sha256 = "0qksci11pgvabfdnynkpj2av0iww8m9m41a0vwsqgvg3yiacb4f0";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ gstreamer gst-plugins-base vala gtk3 libgee poppler
+                  libpthreadstubs makeWrapper librsvg ];
+
+  postInstall = ''
+    wrapProgram $out/bin/pdfpc \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A presenter console with multi-monitor support for PDF files";
+    homepage = https://pdfpc.github.io/;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ pSub ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a7c9a087c8..590f80fa645 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12017,6 +12017,12 @@ let
   pdftk = callPackage ../tools/typesetting/pdftk { };
   pdfgrep  = callPackage ../tools/typesetting/pdfgrep { };
 
+  pdfpc = callPackage ../applications/misc/pdfpc {
+    vala = vala_0_26;
+    inherit (gnome3) libgee;
+    inherit (gst_all_1) gstreamer gst-plugins-base;
+  };
+
   photoqt = callPackage ../applications/graphics/photoqt { };
 
   pianobar = callPackage ../applications/audio/pianobar { };

From 6eb4fdeb4d87847f7196115043ffd11dd7ee2985 Mon Sep 17 00:00:00 2001
From: Emil Rangden <emil.rangden@chas.se>
Date: Tue, 2 Jun 2015 13:21:53 +0200
Subject: [PATCH 0643/2322] fix crackxls libgsf dependency

---
 pkgs/tools/security/crackxls/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix
index c593650dbd4..37e3e048a76 100644
--- a/pkgs/tools/security/crackxls/default.nix
+++ b/pkgs/tools/security/crackxls/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchgit, autoconf, automake, openssl, libgsf }:
+{ stdenv, fetchgit, pkgconfig, autoconf, automake, openssl, libgsf, gmp }:
 
 stdenv.mkDerivation rec {
 
   name = "crackxls-${version}";
-  version = "v0.4";
+  version = "0.4";
 
   src = fetchgit {
     url = https://github.com/GavinSmith0123/crackxls2003.git;
-    rev = "refs/tags/${version}";
+    rev = "refs/tags/v${version}";
     sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz";
   };
 
-  buildInputs = [ openssl libgsf automake autoconf ];
+  buildInputs = [ pkgconfig autoconf automake openssl libgsf gmp ];
 
   installPhase =
   ''

From d5a4c3d21daab86660b223bb9df0eab7880b5a1f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 2 Jun 2015 08:49:51 +0200
Subject: [PATCH 0644/2322] coq-tlc: fix package

---
 pkgs/development/coq-modules/tlc/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix
index b98ff613f9d..2d30db5a80d 100644
--- a/pkgs/development/coq-modules/tlc/default.nix
+++ b/pkgs/development/coq-modules/tlc/default.nix
@@ -13,6 +13,15 @@ stdenv.mkDerivation {
   buildInputs = [ coq.ocaml coq.camlp5 ];
   propagatedBuildInputs = [ coq ];
 
+  preConfigure = ''
+    patch Makefile <<EOF
+    105c105
+    < 	\$(COQC) \$<
+    ---
+    > 	\$(COQC) -R . Tlc \$<
+    EOF
+  '';
+
   installPhase = ''
     COQLIB=$out/lib/coq/${coq.coq-version}/
     mkdir -p $COQLIB/user-contrib/Tlc

From a36326d1974ebb25352d895be08eeaf3be0a9fe6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 2 Jun 2015 11:54:54 +0200
Subject: [PATCH 0645/2322] ocaml-asn1-combinators: update from 0.1.1 to 0.1.2

---
 .../ocaml-modules/asn1-combinators/default.nix       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
index bb4b5f7b312..41f73b2f834 100644
--- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix
+++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
@@ -1,22 +1,26 @@
-{ stdenv, fetchzip, ocaml, findlib, cstruct, zarith }:
+{ stdenv, fetchzip, ocaml, findlib, cstruct, zarith, ounit }:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
 
-let version = "0.1.1"; in
+let version = "0.1.2"; in
 
 stdenv.mkDerivation {
   name = "ocaml-asn1-combinators-${version}";
 
   src = fetchzip {
     url = "https://github.com/mirleft/ocaml-asn1-combinators/archive/${version}.tar.gz";
-    sha256 = "1wl5g2cqd4dk33w0ski6z425cs4sgj980fw0xkwgz1w1xzywh4i2";
+    sha256 = "13vpdgcyph4vq3gcp8b16756s4nz3crpxhxfhcqgc1ffz61gc0h5";
   };
 
-  buildInputs = [ ocaml findlib ];
+  buildInputs = [ ocaml findlib ounit ];
   propagatedBuildInputs = [ cstruct zarith ];
 
   createFindlibDestdir = true;
 
+  configureFlags = "--enable-tests";
+  doCheck = true;
+  checkTarget = "test";
+
   meta = {
     homepage = https://github.com/mirleft/ocaml-asn1-combinators;
     description = "Combinators for expressing ASN.1 grammars in OCaml";

From b812e5f0579a810b1adbd219b8a6d3ace9877e27 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 2 Jun 2015 12:23:50 +0200
Subject: [PATCH 0646/2322] ocaml-uri: update from 1.7.2 to 1.9.0

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

diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix
index a00a2408159..41cd2f64823 100644
--- a/pkgs/development/ocaml-modules/uri/default.nix
+++ b/pkgs/development/ocaml-modules/uri/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchgit, ocaml, findlib, re, sexplib, stringext }:
+{ stdenv, fetchzip, ocaml, findlib, re, sexplib, stringext }:
 
-let version = "1.7.2"; in
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4";
+
+let version = "1.9.0"; in
 
 stdenv.mkDerivation {
   name = "ocaml-uri-${version}";
 
-  src = fetchgit {
-    url = https://github.com/mirage/ocaml-uri.git;
-    rev = "refs/tags/v${version}";
-    sha256 = "19rq68dzvqzpqc2zvrk5sj1iklknnyrlbcps2vb8iw4cjlrnnaa1";
+  src = fetchzip {
+    url = "https://github.com/mirage/ocaml-uri/archive/v${version}.tar.gz";
+    sha256 = "13vbv6q7npl2bvvqfw03mav90jcrrvjbdpdp4y8mcjz0iax5ww9b";
   };
 
   buildInputs = [ ocaml findlib ];

From ba809cf9a3aa2aefe9721e003c07d53767f2032b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Jun 2015 13:58:57 +0200
Subject: [PATCH 0647/2322] haskell: add three new helper functions to the lib
 module

 - sdistTarball transforms a normal Haskell build into one that produces a
   release tarball by running "sdist". For example:

     $ nix-shell -p "haskell.lib.sdistTarball haskellPackages.mtl" --command 'tar tfv $nativeBuildInputs/*tar.gz'

 - buildFromSdist transforms a normal Haskell build into one that compiles the
   package the an sdist release tarball created by Nix. For example:

     $ nix-shell -p "haskell.lib.buildFromSdist haskellPackages.mtl" --command "exit 0"

 - buildStrictly transforms a normal Haskell build into one that (a) compiles
   the source code with "-Wall -Werror" flags and (b) uses as input a locally
   generated sdist release tarball. For example:

     $ nix-shell -p "haskell.lib.buildStrictly haskellPackages.mtl" --command "exit 0"

   This function is particularly useful for continuous Hydra builds of Haskell
   packages.
---
 pkgs/development/haskell-modules/lib.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 8f932c87023..e601c7665ac 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -58,4 +58,23 @@ rec {
   doHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = true; });
   dontHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = false; });
 
+  sdistTarball = pkg: pkgs.lib.overrideDerivation pkg (drv: {
+    name = "${drv.pname}-source-${drv.version}";
+    buildPhase = "./Setup sdist";
+    haddockPhase = ":";
+    checkPhase = ":";
+    installPhase = "install -D dist/${drv.pname}-${drv.version}.tar.gz $out/${drv.pname}-${drv.version}.tar.gz";
+    fixupPhase = ":";
+  });
+
+  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"
+      tar xf ${src}/${tarname}.tar.gz
+      cd ${tarname}
+    '';
+  });
+
+  buildStrictly = pkg: buildFromSdist (appendConfigureFlag pkg "--ghc-option=-Wall --ghc-option=-Werror");
+
 }

From c12e1d7278c6784da8571cb067dccd2fa9ede5eb Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 2 Jun 2015 16:55:36 +0200
Subject: [PATCH 0648/2322] minimal-iso: enable nixos-manual

---
 nixos/modules/installer/cd-dvd/installation-cd-minimal.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
index a7498906a86..f34e789e28c 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -1,11 +1,14 @@
 # This module defines a small NixOS installation CD.  It does not
 # contain any graphical stuff.
 
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   imports =
     [ ./installation-cd-base.nix
       ../../profiles/minimal.nix
     ];
+
+  # Enable in installer, even if minimal profile disables it
+  services.nixosManual.enable = lib.mkOverride 999 true;
 }

From 747c6e913f4cd6c1f1f55da4982ec5597b2602d6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Jun 2015 20:29:17 +0300
Subject: [PATCH 0649/2322] Add gtdialog tool

---
 .../libraries/gtdialog/default.nix            | 32 +++++++++++++++++++
 .../libraries/gtdialog/default.upstream       |  3 ++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/libraries/gtdialog/default.nix
 create mode 100644 pkgs/development/libraries/gtdialog/default.upstream

diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix
new file mode 100644
index 00000000000..8d8a018f1fe
--- /dev/null
+++ b/pkgs/development/libraries/gtdialog/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchurl, cdk, unzip, gtk, glib, ncurses, pkgconfig}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="gtdialog";
+    version="1.2";
+    name="${baseName}-${version}";
+    hash="0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0";
+    url="http://foicica.com/gtdialog/download/gtdialog_1.2.zip";
+    sha256="0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0";
+  };
+  buildInputs = [
+    cdk unzip gtk glib ncurses pkgconfig
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+  makeFlags = ["PREFIX=$(out)"];
+  meta = {
+    inherit (s) version;
+    description = ''Cross-platform helper for creating interactive dialogs'';
+    license = stdenv.lib.licenses.mit ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "http://foicica.com/gtdialog";
+    downloadPage = "http://foicica.com/gtdialog/download";
+  };
+}
diff --git a/pkgs/development/libraries/gtdialog/default.upstream b/pkgs/development/libraries/gtdialog/default.upstream
new file mode 100644
index 00000000000..843c88f55ff
--- /dev/null
+++ b/pkgs/development/libraries/gtdialog/default.upstream
@@ -0,0 +1,3 @@
+url http://foicica.com/gtdialog/download
+version_link '[.]zip'
+version '.*_([0-9.]*)[.]zip' '\1'
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0663813f69..bf9cbbb77bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1674,6 +1674,8 @@ let
 
   gtkdatabox = callPackage ../development/libraries/gtkdatabox {};
 
+  gtdialog = callPackage ../development/libraries/gtdialog {};
+
   gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { };
 
   gtkvnc = callPackage ../tools/admin/gtk-vnc {};

From 8daf4f5445133e097f3a08c14a3e551ba45db1bd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Jun 2015 20:30:59 +0300
Subject: [PATCH 0650/2322] Add Curses development kit

---
 pkgs/development/libraries/cdk/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/cdk/default.nix

diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix
new file mode 100644
index 00000000000..f998f464457
--- /dev/null
+++ b/pkgs/development/libraries/cdk/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, ncurses}:
+let
+  buildInputs = [
+    ncurses
+  ];
+in
+stdenv.mkDerivation {
+  name = "cdk";
+  inherit buildInputs;
+  src = fetchurl {
+    url = "http://invisible-island.net/datafiles/release/cdk.tar.gz";
+    sha256 = "00s87kq5x10x22azr6q17b663syk169y3dk3kaj8z6dlk2b8vknp";
+  };
+  meta = {
+    description = ''Curses development kit'';
+    license = stdenv.lib.licenses.bsdOriginal ;
+    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 bf9cbbb77bc..0b23f2382f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5772,6 +5772,8 @@ let
 
   ndn-cxx = callPackage ../development/libraries/ndn-cxx { };
 
+  cdk = callPackage ../development/libraries/cdk {};
+
   cimg = callPackage  ../development/libraries/cimg { };
 
   scmccid = callPackage ../development/libraries/scmccid { };

From e66294151a69921e3ce38267ebae3c33121e20ae Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Jun 2015 20:31:34 +0300
Subject: [PATCH 0651/2322] Adding Lua 5.3, seems to work

---
 pkgs/development/interpreters/lua-5/5.3.nix   | 102 ++++++++++++++++++
 .../interpreters/lua-5/lua-5.3-dso.make       |   8 ++
 pkgs/top-level/all-packages.nix               |   4 +
 3 files changed, 114 insertions(+)
 create mode 100644 pkgs/development/interpreters/lua-5/5.3.nix
 create mode 100644 pkgs/development/interpreters/lua-5/lua-5.3-dso.make

diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix
new file mode 100644
index 00000000000..faa4b7694ee
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/5.3.nix
@@ -0,0 +1,102 @@
+{ stdenv, fetchurl, readline, compat ? false }:
+
+stdenv.mkDerivation rec {
+  name = "lua-${version}";
+  luaversion = "5.3";
+  version = "${luaversion}.0";
+
+  src = fetchurl {
+    url = "http://www.lua.org/ftp/${name}.tar.gz";
+    sha1 = "1c46d1c78c44039939e820126b86a6ae12dadfba";
+  };
+
+  nativeBuildInputs = [ readline ];
+
+  patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else [];
+
+  configurePhase =
+    if stdenv.isDarwin
+    then ''
+    makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} )
+    installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' )
+  '' else ''
+    makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version})
+    installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}" INSTALL_DATA='cp -d' )
+    cat ${./lua-5.3-dso.make} >> src/Makefile
+    sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile
+  '';
+
+  postBuild = stdenv.lib.optionalString (! stdenv.isDarwin) ''
+    ( cd src; make liblua.so "''${makeFlagsArray[@]}" )
+  '';
+
+  postInstall = ''
+    mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig"
+    mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/"
+    rmdir $out/{share,lib}/lua/${luaversion} $out/{share,lib}/lua
+    mkdir -p "$out/lib/pkgconfig"
+    cat >"$out/lib/pkgconfig/lua.pc" <<EOF
+    prefix=$out
+    libdir=$out/lib
+    includedir=$out/include
+    INSTALL_BIN=$out/bin
+    INSTALL_INC=$out/include
+    INSTALL_LIB=$out/lib
+    INSTALL_MAN=$out/man/man1
+
+    Name: Lua
+    Description: An Extensible Extension Language
+    Version: ${version}
+    Requires:
+    Libs: -L$out/lib -llua -lm
+    Cflags: -I$out/include
+    EOF
+  '';
+
+  crossAttrs = let
+    isMingw = stdenv.cross.libc == "msvcrt";
+    isDarwin = stdenv.cross.libc == "libSystem";
+  in {
+    configurePhase = ''
+      makeFlagsArray=(
+        INSTALL_TOP=$out
+        INSTALL_MAN=$out/share/man/man1
+        CC=${stdenv.cross.config}-gcc
+        STRIP=:
+        RANLIB=${stdenv.cross.config}-ranlib
+        V=${luaversion}
+        R=${version}
+        ${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin ''
+        AR="${stdenv.cross.config}-ar rcu"
+        macosx
+        ''}
+      )
+    '' + stdenv.lib.optionalString isMingw ''
+      installFlagsArray=(
+        TO_BIN="lua.exe luac.exe"
+        TO_LIB="liblua.a lua52.dll"
+        INSTALL_DATA="cp -d"
+      )
+    '';
+  } // stdenv.lib.optionalAttrs isDarwin {
+    postPatch = ''
+      sed -i -e 's/-Wl,-soname[^ ]* *//' src/Makefile
+    '';
+  };
+
+  meta = {
+    homepage = "http://www.lua.org";
+    description = "Powerful, fast, lightweight, embeddable scripting language";
+    longDescription = ''
+      Lua combines simple procedural syntax with powerful data
+      description constructs based on associative arrays and extensible
+      semantics. Lua is dynamically typed, runs by interpreting bytecode
+      for a register-based virtual machine, and has automatic memory
+      management with incremental garbage collection, making it ideal
+      for configuration, scripting, and rapid prototyping.
+    '';
+    license = stdenv.lib.licenses.mit;
+    hydraPlatforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/development/interpreters/lua-5/lua-5.3-dso.make b/pkgs/development/interpreters/lua-5/lua-5.3-dso.make
new file mode 100644
index 00000000000..c70dbc4f9cc
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/lua-5.3-dso.make
@@ -0,0 +1,8 @@
+
+LUA_SO=liblua.so
+
+$(LUA_SO): $(CORE_O) $(LIB_O)
+	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
+	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
+	ln -sf $(LUA_SO).$(R) $(LUA_SO)
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b23f2382f9..7e231d76349 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4752,6 +4752,10 @@ let
   lua5_2_compat = callPackage ../development/interpreters/lua-5/5.2.nix {
     compat = true;
   };
+  lua5_3 = callPackage ../development/interpreters/lua-5/5.3.nix { };
+  lua5_3_compat = callPackage ../development/interpreters/lua-5/5.3.nix {
+    compat = true;
+  };
   lua5 = lua5_2_compat;
   lua = lua5;
 

From 969776564f09bec8d63c52475e4f42e14525978b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Jun 2015 20:31:57 +0300
Subject: [PATCH 0652/2322] Adding TextAdept

---
 .../editors/textadept/default.nix             | 68 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 70 insertions(+)
 create mode 100644 pkgs/applications/editors/textadept/default.nix

diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix
new file mode 100644
index 00000000000..9eb1bdc7e43
--- /dev/null
+++ b/pkgs/applications/editors/textadept/default.nix
@@ -0,0 +1,68 @@
+{stdenv, fetchhg, fetchurl, fetchzip, gtk, glib, pkgconfig, unzip, ncurses, zip}:
+let
+  buildInputs = [
+    gtk glib pkgconfig unzip ncurses zip
+  ];
+  cached_url = url: sha256: fetchurl {
+    inherit sha256 url;
+  };
+  get_url = url: sha256: ''
+    cp ${(cached_url url sha256)} $(basename ${(cached_url url sha256)} | sed -e 's@^[0-9a-z]\+-@@')
+    touch $(basename ${(cached_url url sha256)} | sed -e 's@^[0-9a-z]\+-@@')
+  '';
+  cached_url_zip = url: sha256: fetchzip {
+    inherit sha256 url;
+  };
+  get_url_zip = url: sha256: let zipdir = (cached_url_zip url sha256); in ''
+    ( d=$PWD; cd $TMPDIR; name=$(basename ${zipdir} .zip | sed -e 's/^[a-z0-9]*-//'); 
+      cp -r ${zipdir} $name; chmod u+rwX -R $name; zip -r $d/$name.zip $name )
+    touch $name
+  '';
+in
+stdenv.mkDerivation rec{
+  version = "8.0";
+  scintillua_version = "3.5.5-1";
+  name = "textadept-${version}";
+  inherit buildInputs;
+  src = fetchhg {
+    url = http://foicica.com/hg/textadept;
+    rev = "textadept_${version}";
+    sha256 = "18kcphqkn0l77dbcyvywy3wh13ib280bb0qsffaqy439gk5zr7ql";
+  };
+  preConfigure = ''
+    cd src
+    mkdir wget
+    echo '#! ${stdenv.shell}' > wget/wget
+    chmod a+x wget/wget
+    export PATH="$PATH:$PWD/wget"
+    ${get_url http://prdownloads.sourceforge.net/scintilla/scintilla355.tgz "11n49h58xh35vj1j85cxasl93rjiv699c5cs5lpv19skfsgs3sb4"}
+    ${get_url http://foicica.com/scinterm/download/scinterm_1.6.zip "0ixwj9il6ri1xl4nvb6f108z4qhrahysza6frbbaqmbdz21hnmcl"}
+    ${get_url http://foicica.com/scintillua/download/scintillua_3.5.5-1.zip "0bpz5rmgaisbimhm6rpn961mbv30cwqid7kh9lad94v3y9ppvf35"}
+    ${get_url http://www.lua.org/ftp/lua-5.3.0.tar.gz "00fv1p6dv4701pyjrlvkrr6ykzxqy9hy1qxzj6qmwlb0ssr5wjmf"}
+    ${get_url http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-0.12.2.tar.gz "01002avq90yc8rgxa5z9a1768jm054iid3pnfpywdcfij45jgbba"}
+    ${get_url_zip http://github.com/keplerproject/luafilesystem/archive/v_1_6_3.zip "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri"}
+    ${get_url http://foicica.com/lspawn/download/lspawn_1.2.zip "1fhfi274bxlsdvva5q5j0wv8hx68cmf3vnv9spllzad4jdvz82xv"}
+    ${get_url http://luajit.org/download/LuaJIT-2.0.3.tar.gz "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm"}
+    ${get_url http://foicica.com/gtdialog/download/gtdialog_1.2.zip "0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0"}
+    ${get_url http://invisible-island.net/datafiles/release/cdk.tar.gz "00s87kq5x10x22azr6q17b663syk169y3dk3kaj8z6dlk2b8vknp"}
+    ${get_url_zip http://foicica.com/hg/bombay/archive/d704272c3629.zip "19dg3ky87rfy0a3319vmv18hgn9spplpznvlqnk3djh239ddpplw"}
+    mv d704*.zip bombay.zip
+    ${get_url http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.17.tar.gz "12gkrv1ldwk945qbpprnyawh0jz7rmqh18fyndbxiajyxmj97538"}
+    make deps
+  '';
+  postBuild = ''
+    make curses
+  '';
+  postInstall = ''
+    make curses install PREFIX=$out MAKECMDGOALS=curses
+  '';
+  makeFlags = ["PREFIX=$(out)"];
+  meta = {
+    inherit version;
+    description = "An extensible text editor based on Scintilla with Lua scripting";
+    license = stdenv.lib.licenses.mit ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "http://foicica.com/textadept";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e231d76349..5a8a09cbf0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2977,6 +2977,8 @@ let
 
   texstudio = callPackage ../applications/editors/texstudio { };
 
+  textadept = callPackage ../applications/editors/textadept { };
+
   thc-hydra = callPackage ../tools/security/thc-hydra { };
 
   tiled = callPackage ../applications/editors/tiled { qt = qt4; };

From be03ca926239742932d05c8eb4a52bf3e3053a56 Mon Sep 17 00:00:00 2001
From: jzellner <jeffz@eml.cc>
Date: Tue, 2 Jun 2015 11:59:40 -0600
Subject: [PATCH 0653/2322] fix goimports build, use buildGoPackage

---
 pkgs/development/tools/goimports/default.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix
index 91bd207581d..2a8c897ce5b 100644
--- a/pkgs/development/tools/goimports/default.nix
+++ b/pkgs/development/tools/goimports/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, lib, go, fetchurl, fetchgit, fetchFromGitHub }:
+{ lib, goPackages, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
+with goPackages;
+
+buildGoPackage rec {
   rev = "7534f4943d94a318edde90212439e538ed54cdde";
   version = "git-2015-04-26";
   name = "goimports-${version}";
-
-  buildInputs = [ go ];
+  goPackagePath = "golang.org/x/tools";
 
   src = fetchFromGitHub {
     inherit rev;
@@ -14,15 +15,9 @@ stdenv.mkDerivation rec {
     sha256 = "12ybykrn92l7awav0wkx9yqpc5z0pdwwi29qs9mdr2xspx61rb50";
   };
 
-  buildPhase = ''
-    export GOPATH=$src
-    go build -v -o goimports golang.org/x/tools/cmd/goimports
-  '';
+  subPackages = [ "cmd/goimports" ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    mv goimports $out/bin
-  '';
+  dontInstallSrc = true;
 
   meta = with lib; {
     description = "Import management tool for go";

From 2f96621b6a9646da2e11f391e2c29694b9234a14 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 2 Jun 2015 11:03:51 -0700
Subject: [PATCH 0654/2322] linux-testing: 4.1-rc5 -> 4.1-rc6

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index f073a09dd0b..3a0d6a926d5 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, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1-rc5";
-  modDirVersion = "4.1.0-rc5";
+  version = "4.1-rc6";
+  modDirVersion = "4.1.0-rc6";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "0kqw5y5p8x1qyljlzj78vhg5zmj9ngn3m76c9qyji6izclh3y8vv";
+    sha256 = "0b8ylsrnvwf0fsq6i0iar7h92z7q3356rh1x3a5wb5p0q5j7lldr";
   };
 
   features.iwlwifi = true;

From 0307c27219ba43cc0a78cd370f825deca16eeaa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 2 Jun 2015 20:15:35 +0200
Subject: [PATCH 0655/2322] kmod-blacklist-ubuntu: update to Vivid

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

diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index c750006fcd2..b894908eb13 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, gnugrep, findutils }:
 let
-  version = "3ubuntu1"; # Saucy
+  version = "18-3ubuntu1"; # Vivid
 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 = "14ypc1ij9rjnkz4zklbxpgf0ac1bnqlx0mjv0pjjvrrf857fiq94";
   };
 
   installPhase = ''

From 99bf7f5698bdb2ba3e84c57d11e8fa19258c7549 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 2 Jun 2015 15:50:44 -0400
Subject: [PATCH 0656/2322] nixopsUnstable: Bump

---
 pkgs/tools/package-management/nixops/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix
index 3400d72dea8..e924cd1abe2 100644
--- a/pkgs/tools/package-management/nixops/unstable.nix
+++ b/pkgs/tools/package-management/nixops/unstable.nix
@@ -17,13 +17,13 @@ let
 in
 
 pythonPackages.buildPythonPackage rec {
-  name = "nixops-1.3pre1484_a932a9e";
+  name = "nixops-1.3pre1486_7489764";
   namePrefix = "";
 
   src = fetchgit {
     url = https://github.com/NixOS/nixops;
-    rev = "a932a9ecec15336a55f2aa2c2a20f08264adb837";
-    sha256 = "010qqpa4yvsra1744afsaj9akqjxzla5p0i4zgan9306m8k3jnpk";
+    rev = "7489764a2cc59d29b66b2cf5eea83b467affd982";
+    sha256 = "1qahqaj6536mnbz6xjj559j3zvsf2cwzhv7jmxcbib6ycxk2v7r0";
   };
 
   buildInputs = [ pythonPackages.nose pythonPackages.coverage ];

From 33a1b14b06b74e00f8c0cea29ec86b8f30cafc1f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 2 Jun 2015 16:23:46 -0400
Subject: [PATCH 0657/2322] nixopsUnstable: Bring in quick fix

---
 pkgs/tools/package-management/nixops/unstable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix
index e924cd1abe2..6f10989f3c7 100644
--- a/pkgs/tools/package-management/nixops/unstable.nix
+++ b/pkgs/tools/package-management/nixops/unstable.nix
@@ -22,8 +22,8 @@ pythonPackages.buildPythonPackage rec {
 
   src = fetchgit {
     url = https://github.com/NixOS/nixops;
-    rev = "7489764a2cc59d29b66b2cf5eea83b467affd982";
-    sha256 = "1qahqaj6536mnbz6xjj559j3zvsf2cwzhv7jmxcbib6ycxk2v7r0";
+    rev = "5c7663dfe1e2af9c0396c5c86d995452ef2efc8a";
+    sha256 = "01n2ykszrnqr3kqqdg1n2l8wm38yhri7r3d7b0abklsslz9dlvmy";
   };
 
   buildInputs = [ pythonPackages.nose pythonPackages.coverage ];

From f0fb53e63ef9ac64a64865338ab7767c64f9246a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 2 Jun 2015 09:08:32 -0500
Subject: [PATCH 0658/2322] Update to plasma-5.3.1

---
 pkgs/desktops/plasma-5.3/manifest.nix | 360 +++++++++++++-------------
 pkgs/desktops/plasma-5.3/manifest.sh  |   2 +-
 2 files changed, 181 insertions(+), 181 deletions(-)

diff --git a/pkgs/desktops/plasma-5.3/manifest.nix b/pkgs/desktops/plasma-5.3/manifest.nix
index 22649b7581e..a815327826a 100644
--- a/pkgs/desktops/plasma-5.3/manifest.nix
+++ b/pkgs/desktops/plasma-5.3/manifest.nix
@@ -2,327 +2,327 @@
 { stdenv, fetchurl, mirror }:
 [
   {
-    name = stdenv.lib.nameFromURL "kscreen-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/hjhbxv0vrv64r22z5zr15av8c6kpa2q3-kscreen-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "breeze-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/wksay8grc0ihprrjkvfwaa5n0v1dsn7p-breeze-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/kscreen-5.3.0.tar.xz";
-      sha256 = "1d9qlqszrkz8ia1k20xy645mngg3jwyc9mjvc27z5yx3l2bjdisq";
-      name = "kscreen-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/breeze-5.3.1.tar.xz";
+      sha256 = "0sh7vgg3dz0cs6mqs4c3ygw5qg4lcjm0vdh4mm4xfxnizagkqrr5";
+      name = "breeze-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-cli-tools-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/di83lwabjyf21g6bbww68xf3k89zdih5-kde-cli-tools-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "baloo-5.9.1.tar.xz" ".tar";
+    store = "/nix/store/yljbiij3svkkmmqpwqxyc5gf8p4gz9zl-baloo-5.9.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/kde-cli-tools-5.3.0.tar.xz";
-      sha256 = "12i74cq9kghcj7sfhxqdlqjd5n4lpxr8nvlzkh4n8pjrz1w3g9n7";
-      name = "kde-cli-tools-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/baloo-5.9.1.tar.xz";
+      sha256 = "0wx9n3l4f1ibddvhbiharhgd20s8hzs64b2c0686bm82qmbkkl7n";
+      name = "baloo-5.9.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "bluez-qt-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/7lpwpw24aahx81dq78vbk203w6xpapar-bluez-qt-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "ksshaskpass-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/8p1spxbb4iv5wrccipby7khh6r5pj4gb-ksshaskpass-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/bluez-qt-5.3.0.tar.xz";
-      sha256 = "0zcqb8fiawprl2qz1lnf875dnkg7nlb6hghqqzp4l5hby20kxnq5";
-      name = "bluez-qt-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/ksshaskpass-5.3.1.tar.xz";
+      sha256 = "0ids7vbi46bdd5dbjgv0wfv4rfv03kpln5vr3rwavah892q1dad2";
+      name = "ksshaskpass-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "plasma-nm-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/hbvm05kcmpc7fncx4padzqx2gqvra88p-plasma-nm-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kscreen-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/0gf4avv67cspclipvs1934fa9vn5bday-kscreen-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/plasma-nm-5.3.0.tar.xz";
-      sha256 = "1zldjrdr331shl4xk4yypr22lkav47bjsw4nzdia16x6nsh32yra";
-      name = "plasma-nm-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/kscreen-5.3.1.tar.xz";
+      sha256 = "008ys3glpvpcvjh7n2gls3m13q9qswmnc5l2lz4zs1dvcrk5z7yr";
+      name = "kscreen-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkscreen-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/cr0gg8a4asd3yyy5p0rx6r1m9ngww2f7-libkscreen-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kwayland-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/fqs8y8fmkk23biqlicq50m281jf45qbj-kwayland-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/libkscreen-5.3.0.tar.xz";
-      sha256 = "1hdgj3l51i277ar9af02sz27bb811amr6b6n4fmcym7ss1r3vljd";
-      name = "libkscreen-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/kwayland-5.3.1.tar.xz";
+      sha256 = "1vsdsf00py6i16zwbwpplq1v7m3fy1j0dskvkb080wm0fskz1r8f";
+      name = "kwayland-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "powerdevil-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/zjanbhr6ynx98sra3ibg86ajf2mxpw4v-powerdevil-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "muon-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/glhhnkdnn4sancq176mwd3pdw51xg58s-muon-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/powerdevil-5.3.0.tar.xz";
-      sha256 = "1pr53yzmra17h7vhp7h9ywsbgk7cm7f2srbdg3ikp2i8a1gzkchm";
-      name = "powerdevil-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/muon-5.3.1.tar.xz";
+      sha256 = "0k2c625d9i5gyyvdzlajkb0kcvss60lhs7qssil1a4w34ch3zfmk";
+      name = "muon-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libksysguard-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/k4ccrcbd33iknvamm1v56n2kz86hmcca-libksysguard-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "khelpcenter-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/s676r82b3lpr3fzrqcw0srl8zx9mj57l-khelpcenter-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/libksysguard-5.3.0.tar.xz";
-      sha256 = "16b8xrkm1b53nwhcr91hiz0nc1bj9yjz3k4ccfmc6nhyjma3n24v";
-      name = "libksysguard-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/khelpcenter-5.3.1.tar.xz";
+      sha256 = "0dik353w6ri6mfkvkz3v5xva6x59zlbz1sj522li0gbd73x4bzf2";
+      name = "khelpcenter-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/yws33kggkdqd5xpq065cbp0lzvgnn749-plasma-workspace-wallpapers-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kdeplasma-addons-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/his4ak4djxslvmrdznyzf3v6mr3aq40s-kdeplasma-addons-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/plasma-workspace-wallpapers-5.3.0.tar.xz";
-      sha256 = "0kci4f445624x93k521zva08kggffxqwcg5safzhxxrwyfw65nja";
-      name = "plasma-workspace-wallpapers-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/kdeplasma-addons-5.3.1.tar.xz";
+      sha256 = "1myk3508jqgalyqa1rlx1dq5afppvhvsnd7irf4wywpgls20nwnv";
+      name = "kdeplasma-addons-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "plasma-sdk-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/p02z3bzwd2zh62n9hj2mypvvsb0z0396-plasma-sdk-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "systemsettings-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/8fyfslw9ip7fsn6gb55v6i1cxajgxmjb-systemsettings-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/plasma-sdk-5.3.0.tar.xz";
-      sha256 = "1vbi45f8clpzx2hqpnzw4wamwzm4016mzh4q6yhwgappqsgn3x9f";
-      name = "plasma-sdk-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/systemsettings-5.3.1.tar.xz";
+      sha256 = "06m3r31dr0ivhn25fg0sg8pbxyzvm8slsmqkqsm4cbypg028axx0";
+      name = "systemsettings-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "plasma-desktop-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/livypzdcyjjiqs50varb9m2fbky6gwhm-plasma-desktop-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kinfocenter-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/flpcnl0mn3mma12nkgymabjgzm1yc4kf-kinfocenter-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/plasma-desktop-5.3.0.tar.xz";
-      sha256 = "0f8rs3p1cbvryg6z386kb9pb0ygbw7jqf63hnpcjkbg33rq14q9p";
-      name = "plasma-desktop-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/kinfocenter-5.3.1.tar.xz";
+      sha256 = "02gqlidh9pb924vhhaxnidpjz3cb32r6icikhcv7csrll13wgp1a";
+      name = "kinfocenter-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kinfocenter-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/w3dl539dn5jczrc50dmsywv79m3iyqxx-kinfocenter-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "libkscreen-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/3i82s0x8hsi0q9hyp8m42m8nxcm6cwx5-libkscreen-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/kinfocenter-5.3.0.tar.xz";
-      sha256 = "02znnw11j37f084bcjp160sm5fs7kc251w07rxly49jdjyy6ddiw";
-      name = "kinfocenter-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/libkscreen-5.3.1.tar.xz";
+      sha256 = "00g401yfiyqh09ajkinlkzhfpb7lsy0wpnrk1ba8vm4wmcvkp63l";
+      name = "libkscreen-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/v6wgn4l8brv3v4mdjgy0hfqxynwncy2p-polkit-kde-agent-1-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "libksysguard-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/8jaxispzwkpdy6kazyhdy6k00f0s7dla-libksysguard-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/polkit-kde-agent-1-5.3.0.tar.xz";
-      sha256 = "0z1c354sjm218w30x2whiij43jamfh4lclwcr14bqk2s8i9njhir";
-      name = "polkit-kde-agent-1-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/libksysguard-5.3.1.tar.xz";
+      sha256 = "115iwqq4y6pnhqsa5yn30q6wdpad5v48m7hjrn7jbpm3gsiwq1ym";
+      name = "libksysguard-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdecoration-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/8zx7y39rrcnmfdjkp7g5xrb7xkwn6mp7-kdecoration-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kmenuedit-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/p6x58nfjkml2125rpvkr7zcvrv11fn1l-kmenuedit-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/kdecoration-5.3.0.tar.xz";
-      sha256 = "1abwqd8cxf6gabc74pvhnqhwqkn8a7zszwf031ndicl3n3f93x3d";
-      name = "kdecoration-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/kmenuedit-5.3.1.tar.xz";
+      sha256 = "0vyy3xb32nb2qxfv3qvrrzlnck6gas0gwyncbn4rzimaygm2vzqz";
+      name = "kmenuedit-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-gtk-config-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/6hivcczg1gp31ayfz802dxdr89zpaqym-kde-gtk-config-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "plasma-mediacenter-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/g9r436iff0714c2ya9xbm0sgd4gdiaq5-plasma-mediacenter-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/kde-gtk-config-5.3.0.tar.xz";
-      sha256 = "1s7jkrb3750aw0cn5v0g7pdsbkb5ncxfhfclw8lr1nqgi03lphcf";
-      name = "kde-gtk-config-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/plasma-mediacenter-5.3.1.tar.xz";
+      sha256 = "0h8dpyszn7hk7b1y1m9qb83gzjnp8ymslpranxdan36r5bm2ayd8";
+      name = "plasma-mediacenter-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "systemsettings-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/vzxxqpvapq8fnbf88ljhhnrpzl7vl6wf-systemsettings-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "plasma-sdk-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/mifrpgvf29kzr7n4lk1xq8s1b3a1d29q-plasma-sdk-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/systemsettings-5.3.0.tar.xz";
-      sha256 = "0ryhm9d46r5691alnrrg88qxbdwm10y1k7jdk7czrnjm5jkg86vh";
-      name = "systemsettings-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/plasma-sdk-5.3.1.tar.xz";
+      sha256 = "157742d7wm21y4g7gs0483jd4sd6q2a0ppyk3mr544nagydvpqfs";
+      name = "plasma-sdk-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "muon-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/46mqwn6l763jq9qgvp9d6lg184760ff8-muon-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kwrited-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/agrv0yx7fzkjyx8b4bl0anbhi99v6l6y-kwrited-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/muon-5.3.0.tar.xz";
-      sha256 = "0f9bnp2pf0npil189a0g3pn6bnb9nwqdclrk7scrk4xck7c66v0r";
-      name = "muon-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/kwrited-5.3.1.tar.xz";
+      sha256 = "0qivfycr4ak5zsplnzv968sya2rc3vz9z6h8gv4b2scf99zjp2g8";
+      name = "kwrited-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "milou-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/zdx8hxf5w0yqypjk08w5hfhkzngdy6pm-milou-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "khotkeys-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/m1v47sjjn9hz8pdfzql5xx9r0j1zpd4q-khotkeys-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/milou-5.3.0.tar.xz";
-      sha256 = "089dvxpwiwa3sasah27n4yk8l3jbmi71p4080q8pslx6j4dhhmsq";
-      name = "milou-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/khotkeys-5.3.1.tar.xz";
+      sha256 = "11mzrjzk2j9x32mg77d2al19b4iin0rfxs710mhsjbgriq144smv";
+      name = "khotkeys-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmenuedit-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/1hjwhla1d23gbmmigxmm4w2ahkayyfr8-kmenuedit-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "plasma-nm-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/r8sbla68dniy9snbni1g4h9rwwm5bghh-plasma-nm-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/kmenuedit-5.3.0.tar.xz";
-      sha256 = "0jzzl043jq9afknj1pc75ywmbs5ff4rjnbqgim5xgrbr08bsam9j";
-      name = "kmenuedit-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/plasma-nm-5.3.1.tar.xz";
+      sha256 = "0jgrz9j2228aya7n1dg4npicsbgv93f8n80b9yjax8mrd6qhq55k";
+      name = "plasma-nm-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "plasma-workspace-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/sji2iki8crvy81q6mrc1dd3gibv88mrn-plasma-workspace-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kdecoration-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/g9163zl8sjxnr32mmy70cbw0a0arsm8c-kdecoration-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/plasma-workspace-5.3.0.tar.xz";
-      sha256 = "05kk8vnhsny3k8pn27pjawdfxcjf4c6pcl2k7s43zim0khqv5xcm";
-      name = "plasma-workspace-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/kdecoration-5.3.1.tar.xz";
+      sha256 = "19qxz5ivrjq9a1shk7mjin0r9v37g33l762nf7lb1xf29y13mhsn";
+      name = "kdecoration-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "oxygen-fonts-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/70mkx8jw7dhs1lvqgdjhcvr6y5y4bfck-oxygen-fonts-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "oxygen-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/8z7cjvfh9bw6402ccipzpgfh4a5rwvmd-oxygen-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/oxygen-fonts-5.3.0.tar.xz";
-      sha256 = "0wiqn91m5b421c46fbicmzhkp7lgzck0mrqn7ng0daw8aj6am94y";
-      name = "oxygen-fonts-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/oxygen-5.3.1.tar.xz";
+      sha256 = "03b8rxgspkv5p8mfb53v92bi62cqp7rcma2fjarmgw4ri5w6cwx9";
+      name = "oxygen-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kio-extras-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/g889cng2b9pwz2yhp3qyjyqzhs6h5jvx-kio-extras-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-gtk-config-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/safa43z9955m484jnfagz4rxby5jhn9l-kde-gtk-config-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/kio-extras-5.3.0.tar.xz";
-      sha256 = "0n6fb4cadp16m1ck11d2zp6lrsjmj1q4iav5gydg3i7bds9kwlhf";
-      name = "kio-extras-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/kde-gtk-config-5.3.1.tar.xz";
+      sha256 = "1frykdckgrfbiyjshdkjv6hp8mrpfz3g461w6snb65yly02qjb5l";
+      name = "kde-gtk-config-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "oxygen-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/3hdjzpgy699qpfxj17dq913nf8qw2wgg-oxygen-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "bluez-qt-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/s8k9h017za3z3j3h046ialysxxna2avs-bluez-qt-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/oxygen-5.3.0.tar.xz";
-      sha256 = "0a55zncpa156rlkpg26j2gwl8ibc1fjb014sm4j07c3q85zd7n73";
-      name = "oxygen-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/bluez-qt-5.3.1.tar.xz";
+      sha256 = "13i5ybmkf6xg49jh5fbbayxg3gp5h8g1gayc0mdc4cwzx1v6g70l";
+      name = "bluez-qt-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdeplasma-addons-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/qrhvjbik2vzxrln457kyl80yhpsk2byx-kdeplasma-addons-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/z9hb5dcjbvnrrkhba58vbhism9djavh9-polkit-kde-agent-1-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/kdeplasma-addons-5.3.0.tar.xz";
-      sha256 = "10h68sqm536j972mqn216b0304r2gpy76klgdr2d2pzqs0vwywll";
-      name = "kdeplasma-addons-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/polkit-kde-agent-1-5.3.1.tar.xz";
+      sha256 = "01ragaa1r144g25kqdc157d7lbq69cclanaljgwkvs2mn0ib031c";
+      name = "polkit-kde-agent-1-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksshaskpass-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/23bkyxca8ydz1g1zj8rlyd14xn073jlw-ksshaskpass-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-cli-tools-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/gfah83qmrzhfjxjvgaczz4bggyvxqq2l-kde-cli-tools-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/ksshaskpass-5.3.0.tar.xz";
-      sha256 = "1f7kn163hnxh47q6h73lqhzkzpjhlbhq670lkr89s5i7kxjnla54";
-      name = "ksshaskpass-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/kde-cli-tools-5.3.1.tar.xz";
+      sha256 = "0x4k3yi4qccvfp4ia75alihcivk4slwsx8i0wdb00qjl1nj7jbc1";
+      name = "kde-cli-tools-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "plasma-mediacenter-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/f3bwrgk52fj27b3bpgix8zy1vmwryh5f-plasma-mediacenter-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "sddm-kcm-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/mhvhgh8n3a6dzjsxzgp8ynsryv3y54kv-sddm-kcm-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/plasma-mediacenter-5.3.0.tar.xz";
-      sha256 = "1iw6v35mg6p8g7pxnqqm1sqs75kmk04jzaakmfs6xjn8h34s0kmp";
-      name = "plasma-mediacenter-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/sddm-kcm-5.3.1.tar.xz";
+      sha256 = "16viwz7b8s77g5fqw7g7asrrk44fif4fmmif7g3bkmq7rncd3hw9";
+      name = "sddm-kcm-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "breeze-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/3d28b0pqh4qjgbff556q475fgkhx0f5r-breeze-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "powerdevil-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/y571p4chd574qvzjbc7pbbixsb7g4g45-powerdevil-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/breeze-5.3.0.tar.xz";
-      sha256 = "12drbw4j7bk0yd7g45j1w70v3jnm4z323zsad3lnnzw448lm9vck";
-      name = "breeze-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/powerdevil-5.3.1.tar.xz";
+      sha256 = "07kcqd7qzblapxnwczfdj4vwb8s6s8mp7qhl4mb663f2a0z6fn8l";
+      name = "powerdevil-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "bluedevil-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/9wq45x6vk9kf9c01ba2xhsdibhaqq7hc-bluedevil-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "plasma-workspace-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/kxn9mq9hrqzwpw8ldxqjdaxm5zqnq1jb-plasma-workspace-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/bluedevil-5.3.0.tar.xz";
-      sha256 = "0bw03kkfzpcq6s2kx8zi66f308zc153m4ddknlvf5cnm7wvykx4q";
-      name = "bluedevil-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/plasma-workspace-5.3.1.tar.xz";
+      sha256 = "1cjg8rhwhm015fg36idn4shddcy6sjnb4y0x9vmxbsdvfx2nnhr1";
+      name = "plasma-workspace-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kfilemetadata-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/whv1mw43461l69j1qa2dp95953si4mcy-kfilemetadata-5.9.0.tar.xz";
+    name = stdenv.lib.nameFromURL "milou-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/02qx55q40iwpwwdr5dmnpdg5hhzcdb7a-milou-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/kfilemetadata-5.9.0.tar.xz";
-      sha256 = "0rgcdpys13qpv11sqrfjxxp75dlchnffvvz7bi7vps1xypnvk4jw";
-      name = "kfilemetadata-5.9.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/milou-5.3.1.tar.xz";
+      sha256 = "17xw62pngq3bb7vkbkn8c099ivsf1xmns0f65v7j112yqpz33b8a";
+      name = "milou-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "khelpcenter-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/7x373jrlqhj9jq6j3qcz9vimzzr3za5z-khelpcenter-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "ksysguard-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/m8q2mc88168lkh4j3jxqjyshf0h5d7gs-ksysguard-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/khelpcenter-5.3.0.tar.xz";
-      sha256 = "1zk70bc2zmnh37qp2w7rh6lzid5hmavm7amyzllsksakj6ba40ki";
-      name = "khelpcenter-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/ksysguard-5.3.1.tar.xz";
+      sha256 = "1z1qgf5qskzf4r524lf75pdyw7gdwrx2yr8nac9622hvgrfh7yhj";
+      name = "ksysguard-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "khotkeys-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/ml95kbmiczriikch5jgk6iwljinsb28b-khotkeys-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "plasma-desktop-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/bilfn2r9akz2mxyl03q1a9i8nndbabhg-plasma-desktop-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/khotkeys-5.3.0.tar.xz";
-      sha256 = "19dy7v67l2xb1x1fqjwljg940gcc9jrvywx2xxvv2lfxgc1i0da4";
-      name = "khotkeys-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/plasma-desktop-5.3.1.tar.xz";
+      sha256 = "079v2pbpgn1gr03l3qcxk3rsgbip318xpjbni4vxf08fhsh1ixlp";
+      name = "plasma-desktop-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kwrited-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/rfhx33pghmghr0kxlwijc6lfwpzs8a91-kwrited-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kwin-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/0b3mjqqacgl23xqkhimqpgswwvsqz7bc-kwin-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/kwrited-5.3.0.tar.xz";
-      sha256 = "0mv7nrlgwrb10dcf91mrnpjmrzwgdsylnd4b4grccc13c2f55lad";
-      name = "kwrited-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/kwin-5.3.1.tar.xz";
+      sha256 = "04bxf45lcbmnl8fks1k6j6i0sk7x5abzhmyrziliz2yx5kyi4m36";
+      name = "kwin-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kwayland-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/0bnhdabiq55i43gwcvpj52ysi2w0zvw0-kwayland-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/mfn2ga4yr0v8pgknsxsgnvxayn6p7sal-plasma-workspace-wallpapers-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/kwayland-5.3.0.tar.xz";
-      sha256 = "1ghxwhnk68nadj48r9cxl250ryylwqrarw26jvv7k7kxs6gqlncr";
-      name = "kwayland-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/plasma-workspace-wallpapers-5.3.1.tar.xz";
+      sha256 = "1y6gdzs0qxiw4hl9r6v3blcm8gq61wapagn6sj5ixagvwlhf2w5y";
+      name = "plasma-workspace-wallpapers-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "sddm-kcm-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/wfp80cwqkxifmdgqv8p6mgc1k6gf5shd-sddm-kcm-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kfilemetadata-5.9.1.tar.xz" ".tar";
+    store = "/nix/store/pshcx9qvc0z4w486q4a51ygm86p7w06a-kfilemetadata-5.9.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/sddm-kcm-5.3.0.tar.xz";
-      sha256 = "15x0ad6zlpdnc4z398ydpr5w0bfla3r5x6mkgakis0mx6vpyzwcc";
-      name = "sddm-kcm-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/kfilemetadata-5.9.1.tar.xz";
+      sha256 = "02gffgwbic4h8zdknp32cczplw3cc9ahg483aa3frhhgvgvrq8hs";
+      name = "kfilemetadata-5.9.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kwin-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/3mzgg28m89a0g0wlysil39g8lzzip46p-kwin-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "kio-extras-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/gy53gcnhk83ab62a2w1x0lm7lxxkn9wh-kio-extras-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/kwin-5.3.0.tar.xz";
-      sha256 = "1mvgmjmxjmv0vl0xfxyqa43rh5n65p3z5zz1ban7lbp16sn6qkqn";
-      name = "kwin-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/kio-extras-5.3.1.tar.xz";
+      sha256 = "1m1gc0m9xhapnchiicsn93spylczkggj8c79ixgk99b1ha7vbc87";
+      name = "kio-extras-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "baloo-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/kz17030nf6rifv84p2y08wrygbsl66xg-baloo-5.9.0.tar.xz";
+    name = stdenv.lib.nameFromURL "bluedevil-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/v3k1px6zx4dqz77s0l48lky1zh22c2ps-bluedevil-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/baloo-5.9.0.tar.xz";
-      sha256 = "1n6k6mznnjccqirr8371z0n0h2cpg6lk50n6dcx0cbqc5mfsckyn";
-      name = "baloo-5.9.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/bluedevil-5.3.1.tar.xz";
+      sha256 = "050hpiifrhm2vzab527anfncdf04cikz5149iabz3aflxcvabqpl";
+      name = "bluedevil-5.3.1.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksysguard-5.3.0.tar.xz" ".tar";
-    store = "/nix/store/ixm26iv7hhgkss8carpln178df1p56xv-ksysguard-5.3.0.tar.xz";
+    name = stdenv.lib.nameFromURL "oxygen-fonts-5.3.1.tar.xz" ".tar";
+    store = "/nix/store/lbvr2fw8361mmd8gpqk9m917qmg8h381-oxygen-fonts-5.3.1.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.0/ksysguard-5.3.0.tar.xz";
-      sha256 = "0pz2v2lxcgn2jp0nzci1yrnxlcs3sf3a2bipaz31w5bhz128k7wi";
-      name = "ksysguard-5.3.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.3.1/oxygen-fonts-5.3.1.tar.xz";
+      sha256 = "0zp81c4s0xvr1d0nvlssk3k3456farz157sqnjvgbsarxnzmgppv";
+      name = "oxygen-fonts-5.3.1.tar.xz";
     };
   }
 ]
diff --git a/pkgs/desktops/plasma-5.3/manifest.sh b/pkgs/desktops/plasma-5.3/manifest.sh
index befd14f0b12..3ccfc8da3da 100755
--- a/pkgs/desktops/plasma-5.3/manifest.sh
+++ b/pkgs/desktops/plasma-5.3/manifest.sh
@@ -6,5 +6,5 @@ KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
 # The extra slash at the end of the URL is necessary to stop wget
 # from recursing over the whole server! (No, it's not a bug.)
 $(nix-build ../../.. -A autonix.manifest) \
-    "${KDE_MIRROR}/stable/plasma/5.3.0/" \
+    "${KDE_MIRROR}/stable/plasma/5.3.1/" \
     $MANIFEST_EXTRA_ARGS -A '*.tar.xz'

From 7d2e419597bc2a716f1d8386eb44c4a662f5e8dc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 2 Jun 2015 16:23:00 -0500
Subject: [PATCH 0659/2322] plasma-5.3: run startkde with `set -x`

---
 .../0001-startkde-NixOS-patches.patch         | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
index 68f32862b21..a542fb7b87d 100644
--- a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
+++ b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
@@ -1,23 +1,25 @@
-From 9aa37de6cd887c6cdd7ea2356cbb6aecdb988b75 Mon Sep 17 00:00:00 2001
+From 37abdee4e25f6aff55da838864d1a67a7be758ad Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 3 May 2015 14:51:04 -0500
+Date: Tue, 2 Jun 2015 11:21:43 -0500
 Subject: [PATCH] startkde: NixOS patches
 
 ---
- startkde/startkde.cmake | 212 +++++++++++++++++++-----------------------------
- 1 file changed, 85 insertions(+), 127 deletions(-)
+ startkde/startkde.cmake | 214 ++++++++++++++++++++----------------------------
+ 1 file changed, 87 insertions(+), 127 deletions(-)
 
 diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 24e5c1b..d8642d3 100644
+index 24e5c1b..787d719 100644
 --- a/startkde/startkde.cmake
 +++ b/startkde/startkde.cmake
-@@ -1,8 +1,29 @@
+@@ -1,8 +1,31 @@
 -#!/bin/sh
 +#!@bash@/bin/bash
  #
  #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
  #
  
++set -x
++
 +# 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
@@ -42,7 +44,7 @@ index 24e5c1b..d8642d3 100644
  if test "x$1" = x--failsafe; then
      KDE_FAILSAFE=1 # General failsafe flag
      KWIN_COMPOSE=N # Disable KWin's compositing
-@@ -16,29 +37,16 @@ trap 'echo GOT SIGHUP' HUP
+@@ -16,29 +39,16 @@ trap 'echo GOT SIGHUP' HUP
  # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
  unset DYLD_FORCE_FLAT_NAMESPACE
  
@@ -75,7 +77,7 @@ index 24e5c1b..d8642d3 100644
  fi
  
  # Boot sequence:
-@@ -56,13 +64,8 @@ fi
+@@ -56,13 +66,8 @@ fi
  # * Then ksmserver is started which takes control of the rest of the startup sequence
  
  # We need to create config folder so we can write startupconfigkeys
@@ -91,7 +93,7 @@ index 24e5c1b..d8642d3 100644
  
  #This is basically setting defaults so we can use them with kstartupconfig5
  cat >$configDir/startupconfigkeys <<EOF
-@@ -106,53 +109,19 @@ toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0
+@@ -106,53 +111,19 @@ toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0
  EOF
  }
  
@@ -148,7 +150,7 @@ index 24e5c1b..d8642d3 100644
  
      kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
      if test $? -eq 10; then
-@@ -168,15 +137,33 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
+@@ -168,15 +139,33 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
      fi
  fi
  
@@ -187,7 +189,7 @@ index 24e5c1b..d8642d3 100644
  ksplash_pid=
  if test -z "$dl"; then
    # the splashscreen and progress indicator
-@@ -205,8 +192,7 @@ fi
+@@ -205,8 +194,7 @@ fi
  # For anything else (that doesn't set env vars, or that needs a window manager),
  # better use the Autostart folder.
  
@@ -197,7 +199,7 @@ index 24e5c1b..d8642d3 100644
  
  # Add /env/ to the directory to locate the scripts to be sourced
  for prefix in `echo $scriptpath`; do
-@@ -216,7 +202,7 @@ for prefix in `echo $scriptpath`; do
+@@ -216,7 +204,7 @@ for prefix in `echo $scriptpath`; do
  done
  
  # Set the path for Qt plugins provided by KDE
@@ -206,7 +208,7 @@ index 24e5c1b..d8642d3 100644
  # TODO: Do we really need this?
  QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
  export QT_PLUGIN_PATH
-@@ -242,7 +228,7 @@ usr_odir=$HOME/.fonts/kde-override
+@@ -242,7 +230,7 @@ usr_odir=$HOME/.fonts/kde-override
  usr_fdir=$HOME/.fonts
  
  if test -n "$KDEDIRS"; then
@@ -215,7 +217,7 @@ index 24e5c1b..d8642d3 100644
    sys_odir=$kdedirs_first/share/fonts/override
    sys_fdir=$kdedirs_first/share/fonts
  else
-@@ -255,23 +241,13 @@ fi
+@@ -255,23 +243,13 @@ fi
  # add the user's dirs to the font path, as they might simply have been made
  # read-only by the administrator, for whatever reason.
  
@@ -244,7 +246,7 @@ index 24e5c1b..d8642d3 100644
  
  # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
  if test -n "$GS_LIB" ; then
-@@ -284,30 +260,6 @@ fi
+@@ -284,30 +262,6 @@ fi
  
  echo 'startkde: Starting up...'  1>&2
  
@@ -275,7 +277,7 @@ index 24e5c1b..d8642d3 100644
  # Mark that full KDE session is running (e.g. Konqueror preloading works only
  # with full KDE running). The KDE_FULL_SESSION property can be detected by
  # any X client connected to the same X session, even if not launched
-@@ -332,11 +284,11 @@ fi
+@@ -332,11 +286,11 @@ fi
  #
  KDE_FULL_SESSION=true
  export KDE_FULL_SESSION
@@ -289,7 +291,7 @@ index 24e5c1b..d8642d3 100644
  
  KDE_SESSION_UID=`id -ru`
  export KDE_SESSION_UID
-@@ -346,30 +298,36 @@ export XDG_CURRENT_DESKTOP
+@@ -346,30 +300,36 @@ export XDG_CURRENT_DESKTOP
  
  # At this point all the environment is ready, let's send it to kwalletd if running
  if test -n "$PAM_KWALLET_LOGIN" ; then
@@ -331,7 +333,7 @@ index 24e5c1b..d8642d3 100644
  # finally, give the session control to the session manager
  # see kdebase/ksmserver for the description of the rest of the startup sequence
  # if the KDEWM environment variable has been set, then it will be used as KDE's
-@@ -385,27 +343,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
+@@ -385,27 +345,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
  # lock now and do the rest of the KDE startup underneath the locker.
  KSMSERVEROPTIONS=""
  test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
@@ -366,7 +368,7 @@ index 24e5c1b..d8642d3 100644
              done
              break
          fi
-@@ -417,21 +375,21 @@ echo 'startkde: Shutting down...'  1>&2
+@@ -417,21 +377,21 @@ echo 'startkde: Shutting down...'  1>&2
  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
  
  # Clean up
@@ -393,5 +395,5 @@ index 24e5c1b..d8642d3 100644
  
  echo 'startkde: Done.'  1>&2
 -- 
-2.3.6
+2.4.1
 

From 1a64d9251c39fc403802d53c7ae3a13b7171b1fd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 2 Jun 2015 23:56:56 +0200
Subject: [PATCH 0660/2322] Add git-hub: command line GitHub interface

Rather cool, actually.
---
 .../git-and-tools/git-hub/default.nix         | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-hub/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
new file mode 100644
index 00000000000..d9cf0b3d84d
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, docutils, python }:
+
+let version = "0.9.0"; in
+stdenv.mkDerivation {
+  name = "git-hub-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "0c4kq4a906lr8nzway7qh0560n2ydvidh9rlffh44902rd48kp0h";
+    rev = "v${version}";
+    repo = "git-hub";
+    owner = "sociomantic";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Git command line interface to GitHub";
+    longDescription = ''
+      A simple command line interface to GitHub, enabling most useful GitHub
+      tasks (like creating and listing pull request or issues) to be accessed
+      directly through the Git command line.
+    '';
+    homepage = https://github.com/sociomantic/git-hub;
+    license = licenses.gpl3Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ python ];
+  nativeBuildInputs = [ docutils ];
+
+  postPatch = ''
+    substituteInPlace Makefile --replace rst2man rst2man.py
+    patchShebangs .
+  '';
+
+  enableParallelBuilding = true;
+
+  installFlags = "prefix=$(out)";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a8a09cbf0e..0311f6ac7b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1519,6 +1519,8 @@ let
 
   gifsicle = callPackage ../tools/graphics/gifsicle { };
 
+  git-hub = callPackage ../applications/version-management/git-hub { };
+
   gitlab = callPackage ../applications/version-management/gitlab {
     ruby = ruby_2_1_3;
   };

From b4a3ec347ffe31dd48a06ad02dcf30625b23ba73 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 3 Jun 2015 01:05:48 +0200
Subject: [PATCH 0661/2322] git-hub: fix package path...

---
 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 0311f6ac7b8..a739a699641 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1519,7 +1519,7 @@ let
 
   gifsicle = callPackage ../tools/graphics/gifsicle { };
 
-  git-hub = callPackage ../applications/version-management/git-hub { };
+  git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { };
 
   gitlab = callPackage ../applications/version-management/gitlab {
     ruby = ruby_2_1_3;

From 26a7698116022072f2058a0045a44290a4984a34 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Tue, 2 Jun 2015 16:58:55 -0700
Subject: [PATCH 0662/2322] emacs-packages: haskell-mode 13.12 -> 13.14

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index d74d1840449..2662f94f0da 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -686,12 +686,12 @@ let self = _self // overrides;
 
   haskell-mode = melpaBuild rec {
     pname   = "haskell-mode";
-    version = "13.12";
+    version = "13.14";
     src = fetchFromGitHub {
       owner  = "haskell";
       repo   = pname;
       rev    = "v${version}";
-      sha256 = "1l8sby2626hpp0li23mic3qq8w7jirsp1hd08hkx2z84gvz4j6fz";
+      sha256 = "1mxr2cflgafcr8wkvgbq8l3wmc9qhhb7bn9zl1bkf10zspw9m58z";
     };
     meta = { license = gpl3Plus; };
   };

From df95d3eca7f6847b13f04a0dd2e6d4c47c699ce6 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Tue, 2 Jun 2015 16:59:25 -0700
Subject: [PATCH 0663/2322] emacs-packages: add perspective-el

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 2662f94f0da..f1581d83f0d 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -888,6 +888,18 @@ let self = _self // overrides;
     };
   };
 
+  perspective = melpaBuild rec {
+    pname   = "perspective";
+    version = "1.12";
+    src = fetchFromGitHub {
+      owner  = "nex3";
+      repo   = "${pname}-el";
+      rev    = version;
+      sha256 = "12c2rrhysrcl2arc6hpzv6lxbb1r3bzlvdp23hnp9sci6yc10k3q";
+    };
+    meta = { license = gpl3Plus; };
+  };
+
   pkg-info = melpaBuild rec {
     pname   = "pkg-info";
     version = "20140610";

From ef667f779fa27f61cbdc3063f7b80ce0b3e80baf Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Tue, 2 Jun 2015 16:59:41 -0700
Subject: [PATCH 0664/2322] emacs-packages: separate helm- and persp-projectile
 from projectile

mirrors current MELPA division
---
 pkgs/top-level/emacs-packages.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index f1581d83f0d..c2f06ee920c 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -934,7 +934,24 @@ let self = _self // overrides;
       rev    = "v${version}";
       sha256 = "1bl5wpkyv9xlf5v5hzkj8si1z4hjn3yywrjs1mx0g4irmq3mk29m";
     };
-    packageRequires = [ dash helm s pkg-info epl ];
+    fileSpecs = [ "projectile.el" ];
+    packageRequires = [ dash helm pkg-info ];
+    meta = { license = gpl3Plus; };
+  };
+  helm-projectile = melpaBuild rec {
+    pname   = "helm-projectile";
+    version = projectile.version;
+    src     = projectile.src;
+    fileSpecs = [ "helm-projectile.el" ];
+    packageRequires = [ helm projectile ];
+    meta = { license = gpl3Plus; };
+  };
+  persp-projectile = melpaBuild rec {
+    pname   = "persp-projectile";
+    version = projectile.version;
+    src     = projectile.src;
+    fileSpecs = [ "persp-projectile.el" ];
+    packageRequires = [ perspective projectile ];
     meta = { license = gpl3Plus; };
   };
 

From def4876d4133ce84864baf437846031b78b6c5b5 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 3 Jun 2015 09:32:11 +0900
Subject: [PATCH 0665/2322] firefox-bin: update to version 38.0.5

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

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index c5d82573a32..aaaeb354f40 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,185 +4,185 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "38.0.1";
+  version = "38.0.5";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "912fff124863aba8189cdb2f22a2c1cf96c5057a"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "72d9bf343fac24312faf42272553b37e7cb5df5e"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "c266d1ce84018e55f239c0cf692feab0b3d2bb58"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "28df7ec17c9008e59af3ba50225e2e6b53f9722a"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "2d254b3818afcc0510efba99fe469754076b8841"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "6428c38cd5c00c2a9c02e26b71945831c3c102d2"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "5477725a61b9479a90e76727eb9f69d19e282f83"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "e663608972b44aca2b08abcc2d92a3f8e8c92ed9"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "101da7d20a72980cdc5db7c4b2755edc3e0a5d66"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "9e6b94146534ec11d00ecd4f1e06680f0fd918b8"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "b5e195606434b4dd90818877e5aea05fa995f136"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "851276e8a86b27ad7b92e075e6e20a527284dd4e"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "48ed44ab60ca16fc39abce13a630d997dd5099c1"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "fb6b4ca689670a3d994e3c524490e46636a8cd59"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "6c4d9cdb9fb8aa0fb3ed8042306268600e3c385a"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "0795a804507837821fed591849169c13bf193302"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "3423b59b472eff5bdd0d16994a777c06de734b2b"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "5571d632e5dc7efea9fccae5035ed070542adc52"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "c9724715fa1036e872b09b4bc453c9ff9344831a"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "f99413c5716c4d45eee22cf1f547138b1ba3d044"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "76d5752e8bc131ece1a43a3376b99280545861bc"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b9ea600f884e50afc31d096697b54366186b1331"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "e72e62a49ebda9cadf032e2e90c14adb5a7db1c4"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "7c64d69d3510d06ccdf98fbf85f41d3b7f4b532f"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "c69f54bd537c9d16ce4ccf5169646c6f7dde98a5"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "abe0137bb0cb8536b6bdaf03246bfc97e7cba4bc"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "3c914e3f26a61568a220b8eed2742c70ee879fd5"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "b3aa2e0caa2b145df9b3c099bb5158eb6c21402d"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "bfc8733ee396bfa0dedfdffb5aa11bb4c8816be0"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "6de8e3bb0038676a906b75a9603b9f057251538a"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "125c53350f599e975b177db3e11ce367b2250fd8"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "4535f608f78f91014371b4b49ca5d73ba369e5be"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "860baa240c24453b55bb3c3273eee85821ab4a7f"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "2078e23dbeeeaad80ef55a07888a94958a8bce85"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "d3d6fbcfc622a303b932c6f9fed134d26fa3a32f"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "1e7e7608ad79337212d73fd72df189bcfbc08be5"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "aadd04915c3dd07b4fa257071382081531e910cb"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "ab57a27336d9b2b379dd9370781cbe38fb34f274"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "a96898e37be58096490ce26313760e9595eab0cb"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "fd83ef7ac7b6b44ca61737b85f4b2aa9e297566b"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "923e977c4a53e91ff0299271bfacf675d1c9f047"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "6250c59ec325ce9f2a6520cc326a500fe8a61106"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "11647b846463af53eebc70e5000c1b2072bcb08e"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "c65084273a4684898d1bd265714bcd2a577939a0"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "cbe33f717d3548913cc316adc4163824f63301dd"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "ddaa35f6f054184484856254927bb4b0c7009ec1"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "d8c0d5adbebac214be559354e6f83efc6c01c874"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "e2deaaea97169a50e50c7a3cd7963b7627fd0271"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "cee1c800c773dd784900e8e1d9efc7ae59764907"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "38efb3a002d3ffafd825b24d0aa5c55617f0a198"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "419ca07f1d5bb1d460ce22a7bf8488611b3efee3"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "4ccd1423a7840b9bc696dbe9f1edc1e1629e664e"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "9398c4714f01ce1a2420ad879fc710a84c19f666"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "79e8fff4b9390f3258a7ed78995759d0005e167e"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "c3b4d3496c08ec12f3dc96d2600b327f8d326377"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "d5ee06667437b1d2f56de89b5f5e5f2f007c4eb1"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "1c9a8326ca27152a4a8554c62d69784ad4f07ac6"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "f4002b8fa6734353d02e605bf870aa51d67940a8"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "39bf95af55156896df07a2a5f77909987095f567"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "99a70da03d31e8209e2818ef07d8d380c1521164"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "1346de9715783742fcafe60df6d1c37460c6db93"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "d2e0b04bbc4617e35a1d46f22801ecebdb6e873f"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "2ec4e8bd9cdaefe06c390a5e41b5a234a2b1d7e2"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "293dad19f7278909b216107c229e20a79bcfa1fd"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "15c2fe0d7c6a53ee5bc7d8284ff414dd6da6b883"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "09222ca13bc199c8c32fad00a638f335276ff44b"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "10a45fab960d898d65f0dc45a6d0e6368f6bde8e"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "e6ed3e2d6d8e272d6a82bd39a0986afe9f9d5b00"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "0222d1158829d06f3fee3314296ebe9126e0d9ab"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "a0c5529c5439c4a4ac29578dd0df6801310b1279"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "95e9d1636243553b72c8d5a6a653f5cd12539ca0"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c525824667f8fe9225fafd1c1bbe6d84413d3e30"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "d29e93647a906856033607ef15e88307cf98fab7"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "5473877025c6a4e57c286a7dc8c7550b71d4e156"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "350847f8853219234edb68b9316cbcf486191f2a"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "7e4c444870d24d9b5ce283bbbf0e2ecdd5ed4d85"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "6aa7416aeb84000778df3ff354f4efd2cd805d70"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "262b35a170b39750dc19579caa05df19c98cac94"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "e6a798072a9fb01e947e5d40e431d3e71256d3e3"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "6674ba9cad77bbc912f94084f8fd2403f0ce42fb"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "d10a236c1e8bc425cd8077b87816fe0a28405274"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "d67449c5cfe939ab5531cf5a27e1da6e5b9335d7"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "f5e151299b3da7788e40dadf1c1d0fab6e409a00"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "6f6b79f283f11414ba2344e83cfb1f0197011c2e"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "a56600d80d772d4009c8feeca7dc6d63c344c199"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "40a7724e59e002446c0a9cfd35de948fc5311e54"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "d1e68650ec713a0d24e159fe967b73b26198d33c"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "abac7894c98a55bb3f7f2ca02a439575c241ea7c"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "d45c305cb676c7456d8e8f4f803089d82077a8fa"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "473b7beca08bcbf8d443f6efbe3ac8752a6773c8"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "084dd83725e94a557e73d11f78633e1bf98e5d69"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "e173e4f47878070a98afde349d2fb93a6ae1c342"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "65b89daf623810a94bbaaaad301a2c3e9e6d4d5f"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "f108f862dafe32a047c08c6fe1135611728d3f4f"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "ba049d6eb3b455674caf424745607f49675a8ed6"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "006f094f2966358ec685b00033e640a94d809d53"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "95f6d91f882d9d0ab8ff5d4b7654a102d973543f"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "e2a70547561a1fed87e3308ebf857df6cc3a315e"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "c0d239c2220979dc0daa15ab1e9af510d7c09706"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "d23bdcacb5714b10f773381fb9c8e3d628d2e278"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "d9119536b4295fea892afd8ee1b46fd5eb881314"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "1c7eb6d62b050769634fb487c0161c5748b8e4a2"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "491269cc3bbd577d24cfe898b862cad008d2da41"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "9043341ce5c84064aa80f95545404f5415bea782"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "13cad5dea192e57b03a26c09254e6fb7cc4022d3"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "8b2f6551415637ff8c9d2de1e1643aa5cd721d48"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "b57d7e89e0cf548ab016867d468d5fa2e3b429aa"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "3246755855f5d869ddf5724cbd2fb6c237d3ad35"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "804ee921241432208c83bdf70986628c5fc1ce1d"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "c2bd411ddf33382afd091cda7f2f6c4cf3dfb5d4"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "89dfa9f319c1d6681deea122a3f23e8ea4bf6248"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "8b209580ff83965ebc27aa3f97eac1180fb82ffd"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "ff727fe52dac2468d430c5d8d734dca133693e9c"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "21844cd80358d5ac24bd9d9ea2a6daadd296e760"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "cbc4cb34957fde341affa780ea743fb30aa13aad"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "4e395325fd1550710197822495c8873a89ff014c"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "19f538b937a9f4a3ef2ee498c64de69b214b87d4"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "ebc164cd9cf4c3993270949a13c9cb1123379093"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "a942c265bedf537e59fcde8bff39c3addb4a2963"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "8967615af2f2efe359f0babe614d282569e44691"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "89f8a2bd49ff4793b2d69efb48aaa93b031dfa69"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "d2be6c9f62cc0615f9041470bae3b139b69ef55c"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "99afd0b77d350df671acbe403b9b19d975bcb91a"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b14f1b45617773a0e010d81ce83b493dd93dc03a"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "9a043691524087b9968aaac1b5d19a212ddffebb"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "f22f09a85bdd943c874a0b321ae1ec017200d0b4"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "1cdbd8319688ccd0af636e71568d7f2244ca0d1a"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "bf660208d072b92f4d961d63f6bfadf5d2848e97"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "fe1edc33462f5b31d76b7b39ef7de459b2260658"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "679eb537bd4007ef14b09dd705a0eaf5de6c29ff"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "cfa52529dcb953c5448d589845bf22343fc6339f"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "a603ec800745b17d7ef31ee4008b2ccfc6515a51"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "09e02683fa6fc34ff152533026824205f976b866"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "94ed7980eb737171e6d9a428a99cc1cbcfa98daa"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "2a73ca16724778da05aca6284b50f8ce6b2855c9"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "0c0fc357264ed7ef806729cf5f3a636829740c47"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "02a6ce278285830a1d9a2f092321d73755fc6b71"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "0bcf7133711b812d55e4c4f824f6cd53b83ce3ef"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "e314ce94c7f7f72882e4b2671f8a52488e293adc"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "878d2fa1fb737963bb93296d4e0f2e67cd58cb04"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "e4643626b93bacd2f2dae152228287aa0d84acf3"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "6e99ce189e18f7056720500cfa596c8caf8f5a17"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "cffab960763f296586e4bbbbc671409323844464"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "7455db46a81f99ba21d7a3ed0ae5a97246fae822"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "ba2a4ddaf8f8978d01f996b599f26801ce3c3a5b"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "8e5cf5885fe5e12e1cf28e7b77171ed23c4fd1c3"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "423e824526557309cb2ec007c41c57daf69e8b42"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "8205ce31e27a6595f2384a85f35f48610cd8b187"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "8766cf70ffd089e79d1eac1211bcc3255c86146d"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "f49ae94b77df1f038bae64f47f3ded0e4f10f349"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "dd07bb545505ce0251760d7960ddcfb235856b79"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "aa660969f12a316dd85f7e69678f583430e084aa"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "ea498b08ae2dceb0a103a7980ca086bc5ce94cb2"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "4e2d7c6098c3cc48cc7a3e5b1557b75e1a9c1958"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "e03a369d834c2a2a0a5bc9e539f2a007fa78641f"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "b8cc41734b718deb50654ccc24c20e5be0b767fd"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "358efd06a28a9ad43703335d190f4bea9b5ef95a"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "e63d4ad88ad45e1e4ed43906c4525a24c1b1cd1b"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "ce0fb4901e621dea2330cf80df632d9424ea46b6"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "5910ddf0f1bee1ae3e2ce5c2882ce93732edf586"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "367816038ddfbd11b7ad6cc2bae41fe4d82b132b"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "6e6c46db9e45bbe20861fc8d6f971daaaa63d181"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "0d4859a54ae11c114cb449b150373465d92b795b"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "16d95125a4c51df9ebd587df16cb428f560cb8e9"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "6bab2ad51c7cf6e761c147d0a0f748573b1683a2"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "ba660dbe60c4e95ac82f536313989933e1edddb6"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "1e1e5dd54da8e3b94da831909149721dd2766267"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "1f32f890d4a1ba2a672d25a005ef5daa76040e33"; }
-    { locale = "uz"; arch = "linux-i686"; sha1 = "49b36171729e3e0924d8398b62c22d5a02b36b8c"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha1 = "2336db0769fa921f2a50774791174565e6828978"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "2b40d9003eca218d235574d1ee7d6da73244d614"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "517d6269f4c2a98f4817be8a926b82c261a8d1f5"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "9d24460c7bcd1e8b36d900a130bb88ecda967678"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "e70d742aa94bb4678446a4b94edd915033a640fb"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "3eb4e076fc42e9cbd97dd82af8eb77d3ea6bb068"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "bdbf6abd8e86f6811d032b302818f15f343e8883"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "b7e4cf9bf9db13f3e2d92bdb91ede3f243232a0a"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "411cfc0033ac8edeb30d9d371738864e9401200c"; }
+    { locale = "ach"; arch = "linux-i686"; sha1 = "71e7e8194190bebcdde40a0e265b7dcb3d6173d1"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha1 = "eda799cc394838cf2a5eea4a182149ff2616bc00"; }
+    { locale = "af"; arch = "linux-i686"; sha1 = "9162c87b2d1f420ccc5475b59bca72d45918fed3"; }
+    { locale = "af"; arch = "linux-x86_64"; sha1 = "4f1d9f1bebea6a9adb085191b4bdb7b3367c4b9b"; }
+    { locale = "an"; arch = "linux-i686"; sha1 = "537e6ea08c546d1ed704b1e9dd28b1219e1e5e8a"; }
+    { locale = "an"; arch = "linux-x86_64"; sha1 = "34b9e09b3f29e1263105b713e743038b3a166cec"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "17b25623c086778caffd7ed45e10870a3d17baa1"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "4e35d4704dfd1218b783156d0a97340480eabe30"; }
+    { locale = "as"; arch = "linux-i686"; sha1 = "596d66e6b3a8818ddd07ea285c08ca6ad508e4f6"; }
+    { locale = "as"; arch = "linux-x86_64"; sha1 = "80b92c1881e2841dee4f955156237aadfdf37a33"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "7f6b67bbf751fb55419bb3893e121b50f4d5e34b"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "4705cda1e366b2be2be5164fedf22f5724454101"; }
+    { locale = "az"; arch = "linux-i686"; sha1 = "5fa3021fcb1c0f7317738dcdd95f0f76ca70eb55"; }
+    { locale = "az"; arch = "linux-x86_64"; sha1 = "b16d8a1e56ba3818f590952c19463b4eb08bb4a4"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "300fca8783d59df6b4459760d0aaa5ac6af2a6cc"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "d8d56febf53ed513628dc1604f65c60ac8460a37"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "4aad8ed44d69c3aecb9c629168f62d0e4711eea6"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "9eaddf470789ca0574ea07bbfdfbbcaca635c69d"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "873db2012724c313f956ee0aca72341d443ff201"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "3192ab016485d10abfb0dd7bccdbd94f3d33a706"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "bb7b5dee4134546ce341e324a53c77e35e95b627"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "057e4c7bc2a06c53209e87804516cb12a644be12"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "d3a08e420b46d17f702c5b4bf1ed52160e8532c8"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "e18d7a198b0bd1c08a3b0ef5ab453daacc7528a2"; }
+    { locale = "bs"; arch = "linux-i686"; sha1 = "5ccfa1e2e8058707c6d0428bab370f8517c4e231"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha1 = "98e7ae1ca507e58b297acb39b7aa026530b75974"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "ff54c24002b0b1161a859771497f9a31013c265b"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "781161113c8719d8932365f113c1bfa1994caa63"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "f697723873da7961159ef17318b1b64c2d021a7c"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "44d20f198bbeca2c69fccbfc8d21c2861145102e"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "8ae202815c3c60aef0287f18b857ba432f122a84"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "c06b25151929540760d2d10dcdb0f4087a9f531a"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "02690ab49d10976d5176c95f0cbc72509908fc1f"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "0a4733b4e56e99976a53d99e209f84527c2a3059"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "e3e067f028a018e4ae61542da9ae4e43c736f65b"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "8161109d11373b07626b563c4ca494feca3abd41"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "01fc9ebe4ac4a86a2bd4fedb6b07a9a832980a57"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "7de40c35552ce74b66bdcf56a5e4edb75995f8d5"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "f53b5bb439e882701dfe1efdcb7fb42ba15cc72d"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "05843b9324fc255a4123a70d460e6db421cf55a7"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "c93568ad64a96235aec83ff8740335b07191d2ef"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "536b58997a39aed71a985d9eb9ab96602c9ab057"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "8bfc35a45e9d0f2a2d4359ccaaee54c564d3b5e3"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "b86e07f455da243f1236b8044aeccf41c4ade1b0"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "cd3722feaebc63944e927ab244a95deb2a55aced"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "0daf7c897bf695338310050374d29c2acdaea553"; }
+    { locale = "eo"; arch = "linux-i686"; sha1 = "d79ecbf48f47a3e34e0bcf897d37d2a2abbf466a"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha1 = "95c616e21fe9d948d363db89c0a6a1a4e31301db"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "5ab97d5aebbde63477cf1868bf0cb5f1b79ee820"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "02d49650094d336e17f57fa43c9969d0b3221ca3"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha1 = "e8d10a3465e7efd01ee03e57316d60176710b124"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "f40a1ec33e5018d423b65bd26563ac8db100e50d"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "66a1bc0c31061d5738bc80e9254262ada65bfb71"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "8f22bab29fb4e7359aa1261f2333faecbafe4c08"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha1 = "34f60fef14360b754510a5378d4b5d6855d49326"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "9d024945473b55373c155dbbec8880f79ee2de5e"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "2fd526c6fd23e5b0e7b292d99a60cf1530bb84e1"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "15628af429866cac3a1604f587b08d4bbeccb7e9"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "ea55480fd572173c1461a9e41c2080af890c4667"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "1e7f8cd86df1cf74525f8d07d13bcd8ea2a22b87"; }
+    { locale = "fa"; arch = "linux-i686"; sha1 = "24982ebb6d6cac67673a9c39c91da7adc4c825c2"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha1 = "02f221c5526e03edadb2c36bfa5d9e35557d03a3"; }
+    { locale = "ff"; arch = "linux-i686"; sha1 = "f3b8962106a9a4bc5b4f1d2928255cfaaa9094b0"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha1 = "3a8ebe66407e6369ebc26757562b4f48a6773cdd"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "c8a838618b2a8d267e24596c6cbc25f539676762"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "3382937e58f6e244d3c6dcef1051aa6bdd38692c"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "6fefc6e8548fa8fcc7182a05b06b00a3b50bb5d6"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "5b58fe2c383d4d43d1731f25dc52754712bc207d"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "118c326cdedbc4e5a1bac1ff6b1bb92f5d054847"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "384e13b51d09e99b2abce566d06d7cd522a532a7"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "ae6002a1a9b1be4f29a56176aa4dfd2fee543bdd"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c87ac5ff79b4dbf3d8738cc3309c882d7573eb3b"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "2bfd0ccec6d84b22d3f6f471f4ad096e6dc1edd3"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "cc919edd60169de8167c9e9fcf32f94fe9df4f52"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "70cdf62012d3d98b028d6b9fb9adf077c37e7c0c"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "a090ce8a36f3182aba809823ba171a0702bf17b5"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "5698a36c3f1372446e38ada59e45468f07fd5d19"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "18b49c1004778b8b11d2f3961dfed29ba562430a"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "9edddef1ce1361d76917ce255f348e208bb16697"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "64136eeab22a5150a95bdc916ce81e2f1b42a6df"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "314f99e05cf58ec8a2c50f8fe93ebe648a62a570"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "2e9245f46a28c70aa5451011bd2c59e8100a1804"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "4cc1112e81ec7f8df2ef95bbab3b3eb398ea67eb"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "e9d643c799542b118ce8cf274ab36aaec89850b3"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "e525b1c0a77274c851417c1d3af887657d9dcb18"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "016e3fcbaeb7844e3639e1c2599172de5c3f7b2f"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "2234cff2bb19e849d1a6ace38dd63258a54c192f"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "9498c156b33d8a9f90ccef6ccc202c69e4ee6c3d"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "49e7923e60daea2e0df4c27d1f6baad70b24b030"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "c9bed347d74b399901ee3f8e745ed1832462357e"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "7fecad428f80346a6333aa6cdc912cec0644b306"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "7370cb725b9087e5bff8943208762bc5bf4d01d9"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "c1139da81e8e581e7ddd511d0ce16c0b169d46f0"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "63c64558cd22ac170b39e186c1dd0e77a09c3200"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "4eb39e3fc5c3847a85a618100d3a9edc9d3bfe78"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "37fa87367363d7e337e75da89f8e5ce8f762c755"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "47b6d53050cf10535a5f7d6a8cee78ab15ad36b7"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "48b20dd2a743a1b887d15179c87b266dbe89a1ae"; }
+    { locale = "kk"; arch = "linux-i686"; sha1 = "4046e0f75d4657d7423b4a0da53778348442ee5e"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha1 = "039f3c025f562e9278b16fb065d07511a3ca1f54"; }
+    { locale = "km"; arch = "linux-i686"; sha1 = "7baebf01741af616e69520f4bc95dd56187c12a2"; }
+    { locale = "km"; arch = "linux-x86_64"; sha1 = "f1a0557ac698f79bf926756cca2c33bd12a8ae83"; }
+    { locale = "kn"; arch = "linux-i686"; sha1 = "1d2c2f8d9f455e0b6c793749f2298436167c25e4"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha1 = "473abeac7637b82d910427cac7e6da8ece20a4e5"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "41fe278dc963a7464679f4ec8a9e586666e7ceb3"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "58563ea60e40b73d1d5c9b10797d05aba5d13c95"; }
+    { locale = "lij"; arch = "linux-i686"; sha1 = "dfa1c12416a9e7e6d04e5f4aaed3a03731d98372"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha1 = "75f9fb66b6610b65b402d3c8664096b4194ce1b0"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "667f035cb58c56967ed28f9cde44864cb15d5afa"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "d5709105b8255ee94c96358d2ac447dc5e4acc2d"; }
+    { locale = "lv"; arch = "linux-i686"; sha1 = "b090761ded023ed465fc9629873e08ecdbaf924b"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha1 = "529312d4e7109472bf5b97ed4a9fff58bb8adbd5"; }
+    { locale = "mai"; arch = "linux-i686"; sha1 = "d2ced083aefcdcd5aca84471bc382be8247e8745"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha1 = "be7a808a391a4fd1dde215834756bc61ae5e85fa"; }
+    { locale = "mk"; arch = "linux-i686"; sha1 = "8a079d8ee62e3bf8fb37f81385a270af5e474aef"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha1 = "c644e5c7a6506ab203d1be61264f6bcf9fa52946"; }
+    { locale = "ml"; arch = "linux-i686"; sha1 = "d3bd6308643ae805c69eeee8b716b97dc844ed9c"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha1 = "33f0f47e125f8a67a30d807775c7d0743135da84"; }
+    { locale = "mr"; arch = "linux-i686"; sha1 = "9d38caee6d6c0baa8a7ea6148c65e7a28362a0fe"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha1 = "3c3f93fd22c8ae7d7056bbfae3df0ecaa7d7dcaf"; }
+    { locale = "ms"; arch = "linux-i686"; sha1 = "8486b9a81265430e876410a6040e09f0bf6d4eed"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha1 = "6cd3c0ab1c33d8eb3de6f68ce7c7a219e80f49f9"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "bcd8e685a023c9919479ffe0f77c16df4fe3e2e8"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "8052c43680c9720783b6e1947c949030f1cfa51a"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "c0ae9e1fb361a7d085ef296f5afcc61a5b106c94"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "246213bd7baa7bb32b15c39237c0eece624a8dae"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "f5f7b590544228f110ddb1153f1c5354bea58656"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "c62e1e681736dbdf19d1a8c6a7f3eff01764d050"; }
+    { locale = "or"; arch = "linux-i686"; sha1 = "8008fd2095b86bd05daee4e48f95aa9003982ebf"; }
+    { locale = "or"; arch = "linux-x86_64"; sha1 = "a52d6d27d9612fe9b1aa3dac377d783bcc53baa1"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "a819a01f2968030cc2102640f50e31cb340e5044"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "2b8e58cf70e8cc841e720706a511e0626439b8ac"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "db1bb9bbf35166ba760274dd4c813bf4b52db2da"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "1a97efa01142188d282743bd3f97dec2bf51067a"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "d3b3f3de01e6970909d6083a2164eb840897d46e"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "e842275df31fa1202a6e5214424b870ed8e04789"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "86001510f93e7063442415325cea1772a8fe04e8"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "7090a6adb110be77527bca5a40ea5c44515e07d3"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "42087d61aed17ce567503cc944bbada7d5bc77a4"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "7b3a8078235ca307dc75b931b060d46a7b3e8e95"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "1ff6eb3feef71d37f943667945f4547fe9daca37"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "acf3f0c0ad5bd9b3c2edcafe7dd7b6e8e45a7ec4"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "3e9b32187704caec231fce83e5519d2b2fc066a7"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "065fee4f21ff6ebdc21a81aadc86a20ab3281dad"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "d742e451a73195d0445b393b0f1127835ad4684b"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "6341e742bfab7379d8a9de9545a126efa9f129ba"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "c714445df861c7073e8c840d904c91578c08db7a"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "a8fbdfa4c68092ff5258f88b7413d64fd0729ce6"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "dc4ef7a8aedbebcd3b9a0e6701c8b2fb245f784a"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "6165e3a1ef198eae25d56fa5b8dde4e37b037b9f"; }
+    { locale = "son"; arch = "linux-i686"; sha1 = "2dd5909759dc85ae7a9401eb4c759748805b0729"; }
+    { locale = "son"; arch = "linux-x86_64"; sha1 = "d09741294a24d80ddacb80676a2824cbd51a5585"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "1f2e3fa864c7c8f7f2d0ecca7812bfdfe7991d29"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "db5c95f01d258db2dfc04b7efecd1d7826663db8"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "54c0f91e41622e8263f7897d0b5a385870ae0d7a"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "b8b9c9001ed87429ce868144a50e6ab1ac7ccd5f"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "667ed9f21997fc79e9ce40b8bf5e607258292699"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "cb5abaca549b30ba5385ea3ef0a57be0bf446d44"; }
+    { locale = "ta"; arch = "linux-i686"; sha1 = "13fdda06ab9a36a24128e12651a06f0499fbe581"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha1 = "95cd3149f404cfd0beadcdece8dfd5c102dbc72a"; }
+    { locale = "te"; arch = "linux-i686"; sha1 = "4ec9f9b30078e70451bbf5bb06cc1c07530ed5a8"; }
+    { locale = "te"; arch = "linux-x86_64"; sha1 = "1d5cbfee0731dfe10e3eb3aafe102e73c9e9eede"; }
+    { locale = "th"; arch = "linux-i686"; sha1 = "a6809b082761293aca28b456b1489f270234f8bf"; }
+    { locale = "th"; arch = "linux-x86_64"; sha1 = "77dba4a3eec1474be026dfc9021420af889172ad"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "eaa7a43b155ffbfc23e72b48fe0e150695a779e7"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "dfc241131ef4e46801e86bfe10e80b4c2bb5fdb3"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "fa5346d0c36f88a6a50259f0e170bbe5167f2393"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "bb5d61d9c14997958af850d663d48b607aa3e43e"; }
+    { locale = "uz"; arch = "linux-i686"; sha1 = "d634d94bc28779757535d05295db33e186c15abc"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha1 = "0f469e0d5f2d92b4b3f2b47efef3aa44cd25803f"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "639aa1abebe1b670ecef9df6e9d06841124ddf0b"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "16f1319cb63cc4634a215a1c9b3e0e65c1833003"; }
+    { locale = "xh"; arch = "linux-i686"; sha1 = "960338fec19485c733ebd7fbacd9b55ebd1b9981"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha1 = "3a795ffee6d119741fceaa0a4825e72f5cc4e0f2"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "63dbb0328ea991b827fd5747d99aa3075486fce0"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "a1d047de7685d70750850cfb0084259041d33cd4"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "6f56944d2e31ab714d648bfd9262d39731e167b9"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "d3cd71c2ceeb1856bea66de8d7220a8529888e86"; }
   ];
 }

From 13ea5b65dbd081d395ed0d8e0bbf34762666b462 Mon Sep 17 00:00:00 2001
From: Robbin C <robbinch33@gmail.com>
Date: Wed, 3 Jun 2015 11:06:24 +0800
Subject: [PATCH 0666/2322] wavegain: Add package.

This adds wavegain which is a normalizer for WAV audio files.
---
 pkgs/applications/audio/wavegain/default.nix | 22 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/audio/wavegain/default.nix

diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/applications/audio/wavegain/default.nix
new file mode 100644
index 00000000000..2ce59f005fd
--- /dev/null
+++ b/pkgs/applications/audio/wavegain/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation {
+  name = "wavegain-1.3.1";
+  src = fetchgit {
+    url = "https://github.com/MestreLion/wavegain.git";
+    sha256 = "1h886xijc9d7h4p6qx12c6kgwmp6s1bdycnyylkayfncczzlbi24";
+  };
+
+  installPhase = ''
+    strip -s wavegain
+    install -vD wavegain "$out/bin/wavegain"
+  '';
+
+  meta = {
+    description = "ReplayGain for wave files";
+    homepage = https://github.com/MestreLion/wavegain;
+    license = stdenv.lib.licenses.lgpl21;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.devhell ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a739a699641..1687602fa3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14677,6 +14677,8 @@ let
 
   VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
 
+  wavegain = callPackage ../applications/audio/wavegain { };
+
   # Wine defaults to a mixed 64 / 32 build on x86_64 and to pure 32 on x86
   wine = callPackage ../misc/emulators/wine {
     wineRelease = config.wine.release or "stable";

From 9712e379da3bebe614474576dc30d461d1850eee Mon Sep 17 00:00:00 2001
From: Daniel Peebles <copumpkin@users.noreply.github.com>
Date: Wed, 3 Jun 2015 00:15:14 -0400
Subject: [PATCH 0667/2322] Rename microHttpd to micro-httpd

---
 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 a739a699641..0705f89d119 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8771,7 +8771,7 @@ let
 
   mpdscribble = callPackage ../tools/misc/mpdscribble { };
 
-  microHttpd = callPackage ../servers/http/micro-httpd { };
+  micro-httpd = callPackage ../servers/http/micro-httpd { };
 
   miniHttpd = callPackage ../servers/http/mini-httpd {};
 

From ac355ac095de56279bcf49ffcf8ec32a0138bb96 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Tue, 2 Jun 2015 23:30:30 +0200
Subject: [PATCH 0668/2322] Update version: jitsi: 2.4.4997 -> 2.8.5426

---
 .../networking/instant-messengers/jitsi/default.nix          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index e6dd6569a55..195c9588478 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -3,13 +3,14 @@
 stdenv.mkDerivation rec {
 
   name = "jitsi-${version}";
-  version = "2.4.4997";
+  version = "2.8.5426";
 
   src = fetchurl {
     url = "https://download.jitsi.org/jitsi/src/jitsi-src-${version}.zip";
-    sha256 = "f1c2688d7d6bf1916fed3b8b105a785662980c5b297dcab3c9e7d272647ef825";
+    sha256 = "0v7k16in2i57z5amr7k5c3fc8f0azrzrs5dvn729bwbc31z8cjg6";
   };
 
+
   patches = [ ./jitsi.patch ];
 
   jitsiItem = makeDesktopItem {

From 3af4c7065dfceb6e76537f2e9fe023a1e191c722 Mon Sep 17 00:00:00 2001
From: Marco <marco.maggesi@gmail.com>
Date: Wed, 3 Jun 2015 11:06:51 +0200
Subject: [PATCH 0669/2322] Update HOL Light to svn r232 (2015-05-31)

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

diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 212da932c28..86d7bfd8427 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -10,12 +10,12 @@ in
 
 stdenv.mkDerivation rec {
   name     = "hol_light-${version}";
-  version  = "218";
+  version  = "232";
 
   src = fetchsvn {
     url = http://hol-light.googlecode.com/svn/trunk;
     rev = version;
-    sha256 = "0lidcadyjpyqd2iw90gfrm8hb6g9gpabp54c0ps6z0lb6hdzln74";
+    sha256 = "1cips2cb5wqxb6n2qi28af2ap1vhklqbhjy7pnifgz4dilkz10m8";
   };
 
   buildInputs = [ ocaml findlib camlp5 ];

From 4564a0e5e223e647a504d57cd364778e1930ccb1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Jun 2015 11:35:06 +0200
Subject: [PATCH 0670/2322] firefox: Update to 38.0.5

---
 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 0fa1d2068f1..03b96acc712 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -15,14 +15,14 @@
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = "38.0.1"; in
+let version = "38.0.5"; in
 
 stdenv.mkDerivation rec {
   name = "firefox-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
-    sha1 = "20f52c37e099cb2b21f3a76c6e39fe698e1e79e8";
+    sha1 = "74da3e225d5b542e784549be63475802c45e1b02";
   };
 
   buildInputs =

From 3467aa462a47548f7db76ef641bf950e1420449f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 3 Jun 2015 01:43:07 +0200
Subject: [PATCH 0671/2322] stress-ng 0.04.04 -> 0.04.05

Changes:
- Ensure maximum sizes don't exceed 4GB-1 for 32 bit systems
- stress-crypt: only use re-entrant crypt_r on Linux for now
- Add perf reference in manual, update date
- stress-vm-rw: zero msg_wr just to be totally safe
- stress-crypt: use reentrant crypt_r to avoid any memory leaks
- stress-zombie: free items on list head on exit
- stress-lockf: free items on list head on exit
- stress-wcstr: fix incorrect wide string size
- Add int8, int16, int32 and int64 versions of mwc*()
- Increase various stressors upper memory limits
- Make --aggressive force more CPU migrations and context switches
- Fix comment for stress_get_ticks_per_second
- perf: enable inherit flag to trace children
- Add the new --getrandom stressor
- Fix sigq options, missing because not using STRESS_SIGQUEUE
- Fix help -h option, was --h, should be -h
- avoid builtins when libs shall be tested
- add stressor for wide character sting operations
- fix string names
- avoid compiler error in stress-vector
- fix EPOLL build
---
 pkgs/tools/system/stress-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index ebe6306120e..2a0b2816ba7 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, attr }:
 
-let version = "0.04.04"; in
+let version = "0.04.05"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "1rq78s4xrylm63xygakrvjg5g774qmm968p0v69x2c795dv3s8di";
+    sha256 = "1xj3rrcvpjl3sgvl22m0bdrkscxxnipzh4s1ivmrifw7lq2zq1kg";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 

From bcc8eeca48bc679077fb53b7c16005e27dc5db00 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 3 Jun 2015 13:38:25 +0200
Subject: [PATCH 0672/2322] geolite-legacy -> 2015-06-03

---
 pkgs/data/misc/geolite-legacy/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 08cf3b545b7..f1e48fff580 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,19 +8,19 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-06-02";
+  version = "2015-06-03";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
   srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz"
-    "15p8is7jml8xsy7a8afsjq7q20pkisbk5b7nj465ljaz5svq6rgv";
+    "1cd25xsw214bdmc657q3a1dcivjnh6ravdsgia2w7q8bq8g61yfp";
   srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz"
-    "0apiypf500k9k89x6zm1109gw6j9xs83c80iyl17rxlik1hhqf8g";
+    "1vi82p41vas18yp17yk236pn1xamsi9662aav79fa0hm43i3ydx3";
   srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz"
     "12j44586jmvk1jnxs345lgdgl9izn51xgh1m2jm7lklsyw13b2nk";
   srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
-    "1jlxd60l7ic7md0d93fhiyd2vqms1fcirp6wkm0glh347j64srsb";
+    "0xjzg76vdsayxyy1yyw64w781vad4c9nbhw61slh2qmazdr360g9";
   srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz"
     "0zccfd1wsny3n1f3wgkb071pp6z01nmk0p6nngha0gwnywchvbx4";
   srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz"

From 7b2448d0214cbde8149ccb0ff831bdc0e92c20e6 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 3 Jun 2015 15:21:40 +0200
Subject: [PATCH 0673/2322] cygwin: perl-Encode-Locale fix

disabling tests which test setting environment variable with a name outside
7-bit ASCII.  this causes a segmentation fault in cygwin.
---
 pkgs/top-level/perl-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6a007242487..891d72497b5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3384,6 +3384,11 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/modules/by-module/Encode/${name}.tar.gz";
       sha256 = "0m9d1vdphlyzybgmdanipwd9ndfvyjgk3hzw250r299jjgh3fqzp";
     };
+    preCheck = if stdenv.isCygwin then ''
+      sed -i"" -e "s@plan tests => 13@plan tests => 10@" t/env.t
+      sed -i"" -e "s@ok(env(\"\\\x@#ok(env(\"\\\x@" t/env.t
+      sed -i"" -e "s@ok(\$ENV{\"\\\x@#ok(\$ENV{\"\\\x@" t/env.t
+    '' else null;
   };
 
   EnvPath = buildPerlPackage {

From 7c6b935b60128e700630561424a8bb1b80f4afac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Jun 2015 16:38:52 +0200
Subject: [PATCH 0674/2322] Remove dead code

---
 nixos/tests/installer.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 603dfbe224f..fc65f392a1f 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -98,12 +98,6 @@ let
   channelContents = [ pkgs.rlwrap ];
 
 
-  efiBios = pkgs.runCommand "ovmf-bios" {} ''
-    mkdir $out
-    ln -s ${pkgs.OVMF}/FV/OVMF.fd $out/bios.bin
-  '';
-
-
   # The test script boots the CD, installs NixOS on an empty hard
   # disk, and then reboot from the hard disk.  It's parameterized with
   # a test script fragment `createPartitions', which must create

From 165cb05ea5f42866a5b38521a8266f10045d48b2 Mon Sep 17 00:00:00 2001
From: Emil Rangden <emil.rangden@chas.se>
Date: Wed, 3 Jun 2015 16:50:53 +0200
Subject: [PATCH 0675/2322] fix spotify by using older libgcrypt

---
 pkgs/development/libraries/libgcrypt/1.5.nix | 50 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  3 ++
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/libraries/libgcrypt/1.5.nix

diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix
new file mode 100644
index 00000000000..ebafd0747d8
--- /dev/null
+++ b/pkgs/development/libraries/libgcrypt/1.5.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl
+, libgpgerror
+
+# Optional Dependencies
+, libcap ? null
+}:
+
+let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkWith = mkFlag "with-" "without-";
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  optLibcap = shouldUsePkg libcap;
+in
+stdenv.mkDerivation rec {
+  name = "libgcrypt-1.5.4";
+
+  src = fetchurl {
+    url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
+    sha256 = "0czvqxkzd5y872ipy6s010ifwdwv29sqbnqc4pf56sd486gqvy6m";
+  };
+
+  buildInputs = [ libgpgerror optLibcap ];
+
+  configureFlags = [
+    (mkWith   (optLibcap != null) "capabilities"  null)
+  ];
+
+  # Make sure libraries are correct for .pc and .la files
+  # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
+  postInstall = ''
+    sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin && optLibcap != null) ''
+    sed -i 's,\(-lcap\),-L${optLibcap}/lib \1,' $out/lib/libgcrypt.la
+  '';
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://www.gnu.org/software/libgcrypt/;
+    description = "General-pupose cryptographic library";
+    license = licenses.lgpl2Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
+    repositories.git = git://git.gnupg.org/libgcrypt.git;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d642c4188c7..d22f7d15498 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6763,6 +6763,8 @@ let
     libcap = null;
   };
 
+  libgcrypt_1_5 = lowPrio (callPackage ../development/libraries/libgcrypt/1.5.nix { });
+
   libgdiplus = callPackage ../development/libraries/libgdiplus { };
 
   libgksu = callPackage ../development/libraries/libgksu { };
@@ -12384,6 +12386,7 @@ let
 
   spotify = callPackage ../applications/audio/spotify {
     inherit (gnome) GConf;
+    libgcrypt = libgcrypt_1_5;
     libpng = libpng12;
   };
 

From 35ff30c73fa312990d88a74aa5951094ecd1b461 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Jun 2015 17:03:07 +0200
Subject: [PATCH 0676/2322] Streamline contributing section

---
 doc/contributing.xml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/doc/contributing.xml b/doc/contributing.xml
index f622845bf1a..ee93be4447a 100644
--- a/doc/contributing.xml
+++ b/doc/contributing.xml
@@ -4,16 +4,17 @@
 
 <title>Contributing</title>
 
-<para>If you make modifications to the manual, it's important to build the manual before contributing:</para>
+<para>The DocBook sources of the Nixpkgs manual are in the <filename
+xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename>
+subdirectory of the Nixpkgs repository. If you make modifications to
+the manual, it's important to build it before committing. You can do that as follows:
 
-<orderedlist>
+<screen>
+$ cd /path/to/nixpkgs
+$ nix-build doc
+</screen>
 
-  <listitem><para><command>$ git clone git://github.com/NixOS/nixpkgs.git</command></para></listitem>
-
-  <listitem><para><command>$ nix-build -A manual nixpkgs/pkgs/top-level/release.nix</command></para></listitem>
-  
-  <listitem><para>Inside the built derivation you shall see <literal>manual/index.html</literal> file.</para></listitem>
-
-</orderedlist>
+If the build succeeds, the manual will be in
+<filename>./result/share/doc/nixpkgs/manual.html</filename>.</para>
 
 </chapter>

From 07b212b09dc15c983df28b91fd1323b172ac07c4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Jun 2015 17:04:26 +0200
Subject: [PATCH 0677/2322] Strip indentation from programlistings

---
 doc/coding-conventions.xml | 56 +++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index b041a73d818..4967295db08 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -620,33 +620,39 @@ evaluate correctly.</para>
     fetchers from <literal>pkgs/build-support/</literal>. As an example going
     from bad to good:
     <itemizedlist>
-      <listitem><para>Uses <literal>git://</literal> which won't be proxied.
-        <programlisting>
-          src = fetchgit {
-            url = "git://github.com/NixOS/nix.git";
-            rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
-            sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg";
-          }
-        </programlisting></para>
+      <listitem>
+        <para>Uses <literal>git://</literal> which won't be proxied.
+<programlisting>
+src = fetchgit {
+  url = "git://github.com/NixOS/nix.git";
+  rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
+  sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg";
+}
+</programlisting>
+        </para>
       </listitem>
-      <listitem><para>This is ok, but an archive fetch will still be faster.
-        <programlisting>
-          src = fetchgit {
-            url = "https://github.com/NixOS/nix.git";
-            rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
-            sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg";
-          }
-        </programlisting></para>
+      <listitem>
+        <para>This is ok, but an archive fetch will still be faster.
+<programlisting>
+src = fetchgit {
+  url = "https://github.com/NixOS/nix.git";
+  rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
+  sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg";
+}
+</programlisting>
+        </para>
       </listitem>
-      <listitem><para>Fetches a snapshot archive and you get the rev you want.
-        <programlisting>
-          src = fetchFromGitHub {
-            owner = "NixOS";
-            repo = "nix";
-            rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
-            sha256 = "04yri911rj9j19qqqn6m82266fl05pz98inasni0vxr1cf1gdgv9";
-          }
-        </programlisting></para>
+      <listitem>
+        <para>Fetches a snapshot archive and you get the rev you want.
+<programlisting>
+src = fetchFromGitHub {
+  owner = "NixOS";
+  repo = "nix";
+  rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
+  sha256 = "04yri911rj9j19qqqn6m82266fl05pz98inasni0vxr1cf1gdgv9";
+}
+</programlisting>
+        </para>
       </listitem>
     </itemizedlist>
   </para>

From a4ac0caa5257ffe1a281962a520c53d2d47529af Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 3 Jun 2015 17:08:45 +0200
Subject: [PATCH 0678/2322] Add signing-party (aka., gpg-tools)

---
 pkgs/tools/security/signing-party/default.nix | 37 +++++++++++++++++++
 .../signing-party/gpgwrap_makefile.patch      | 16 ++++++++
 pkgs/top-level/all-packages.nix               |  3 ++
 3 files changed, 56 insertions(+)
 create mode 100644 pkgs/tools/security/signing-party/default.nix
 create mode 100644 pkgs/tools/security/signing-party/gpgwrap_makefile.patch

diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix
new file mode 100644
index 00000000000..ec4197933ec
--- /dev/null
+++ b/pkgs/tools/security/signing-party/default.nix
@@ -0,0 +1,37 @@
+{stdenv, fetchurl, gnupg, perl, automake111x, autoconf}:
+
+stdenv.mkDerivation rec {
+  version = "2.0";
+  basename = "signing-party";
+  name = "${basename}-${version}";
+  src = fetchurl {
+    url = "mirror://debian/pool/main/s/${basename}/${basename}_${version}.orig.tar.gz";
+    sha256 = "0vn15sb2yyzd57xdblw48p5hi6fnpvgy83mqyz5ygph65y5y88yc";
+  };
+
+  sourceRoot = ".";
+
+  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"
+  '';
+
+  # - perl is required for its pod2man (used in caff)
+  buildInputs = [ automake111x autoconf perl gnupg ];
+
+  patches = [ ./gpgwrap_makefile.patch ];
+
+  installFlags = [ "DESTDIR=\${out}" ];
+
+  doCheck = false; # no check rule
+
+  meta = {
+    description = "PGP Tools is 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;
+    licence = stdenv.lib.licences.gpl2;
+  };
+}
diff --git a/pkgs/tools/security/signing-party/gpgwrap_makefile.patch b/pkgs/tools/security/signing-party/gpgwrap_makefile.patch
new file mode 100644
index 00000000000..4beaf5b8088
--- /dev/null
+++ b/pkgs/tools/security/signing-party/gpgwrap_makefile.patch
@@ -0,0 +1,16 @@
+--- a/gpgwrap/Makefile	2015-06-03 16:24:48.723129144 +0200
++++ b/gpgwrap/Makefile	2015-06-03 16:24:11.639744346 +0200
+@@ -1,9 +1,12 @@
+ MAKE=make
+ 
+-.PHONY: all clean
++.PHONY: all clean install
+ 
+ all:
+ 	cd src && ${MAKE} all DIET="${DIET}"
+ 
++install:
++
++
+ clean:
+ 	cd src && ${MAKE} clean
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c15f9ce0a4..3ceaafb3d36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2769,6 +2769,9 @@ let
 
   sigil = callPackage ../applications/editors/sigil { };
 
+  # aka., gpg-tools
+  signing-party = callPackage ../tools/security/signing-party { };
+
   silc_client = callPackage ../applications/networking/instant-messengers/silc-client { };
 
   silc_server = callPackage ../servers/silc-server { };

From 07c26ee6807b997a3d5412d3cb9a9784e19c38fc Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 3 Jun 2015 19:37:10 +0200
Subject: [PATCH 0679/2322] grsecurity: Update stable and test patches

stable: 3.1-3.14.43-201505272112 -> 3.1-3.14.43-201506021902
test:   3.1-4.0.4-201505272113   -> 3.1-4.0.4-201506021902
---
 pkgs/os-specific/linux/kernel/patches.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 000dfbd21c5..f622bf9c782 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -66,16 +66,16 @@ rec {
 
   grsecurity_stable = grsecPatch
     { kversion  = "3.14.43";
-      revision  = "201505272112";
+      revision  = "201506021902";
       branch    = "stable";
-      sha256    = "06zwwzrqp59rkv5pi75iskznnlnmc6hsc91dqxymfgd533sbpxp9";
+      sha256    = "1b8kp9q9kslxz4adv1h0qahd96wnidpaa3k1mqmcaf8ia1b63dsk";
     };
 
   grsecurity_unstable = grsecPatch
     { kversion  = "4.0.4";
-      revision  = "201505272113";
+      revision  = "201506021902";
       branch    = "test";
-      sha256    = "1aa8qc4g68ybdjc4gb1p0rk1m2bqhj8a5iz6cica6lrr54lda9hx";
+      sha256    = "03fbx2vmlvh0bng3l4nxkfdxkgl9sgjkmwd0irq2bvb3gwk2bp03";
     };
 
   grsec_fix_path =

From 142cf0de0d46fc9c03e640feb2e6060346b8416d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 3 Jun 2015 22:19:32 +0200
Subject: [PATCH 0680/2322] geolite-legacy: GeoLiteCity -> 2015-06-03

The update of this file seems to have been delayed.
---
 pkgs/data/misc/geolite-legacy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index f1e48fff580..a34c10630aa 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz"
     "1vi82p41vas18yp17yk236pn1xamsi9662aav79fa0hm43i3ydx3";
   srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz"
-    "12j44586jmvk1jnxs345lgdgl9izn51xgh1m2jm7lklsyw13b2nk";
+    "1z87ng2a2zmqnvxhcmapnarc9w2ycb18vpivvzx893y7fh39h34s";
   srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
     "0xjzg76vdsayxyy1yyw64w781vad4c9nbhw61slh2qmazdr360g9";
   srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz"

From a714ddcbd588432906497347b9613b6a32fca920 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 3 Jun 2015 22:40:10 +0200
Subject: [PATCH 0681/2322] signing-party: Americanise licence -> license

---
 pkgs/tools/security/signing-party/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix
index ec4197933ec..dd05030e712 100644
--- a/pkgs/tools/security/signing-party/default.nix
+++ b/pkgs/tools/security/signing-party/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     description = "PGP Tools is 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;
-    licence = stdenv.lib.licences.gpl2;
+    license = stdenv.lib.licenses.gpl2;
   };
 }

From 33ad641be9b97446320723bb604ce0fd449fcc03 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 3 Jun 2015 02:45:26 +0200
Subject: [PATCH 0682/2322] libnl 3.2.25 -> 3.2.26

Changes (also in project hosting):
<http://lists.infradead.org/pipermail/libnl/2015-March/001865.html>
---
 pkgs/os-specific/linux/libnl/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index fe844226a64..afd9695420e 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -1,16 +1,20 @@
-{stdenv, fetchurl, bison, flex}:
+{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig }:
 
-stdenv.mkDerivation rec {
-  name = "libnl-3.2.25";
+let version = "3.2.26"; in
+stdenv.mkDerivation {
+  name = "libnl-${version}";
 
-  src = fetchurl {
-    url = "${meta.homepage}files/${name}.tar.gz";
-    sha256 = "1icfrv8yihcb74as1gcgmp0wfpdq632q2zvbvqqvjms9cy87bswb";
+  src = fetchFromGitHub {
+    sha256 = "1cbqdhirn6hxmv8xkm8xp3n6ayyxw7sbi15fym167rdz0h9rkhmm";
+    rev = "libnl3_2_26";
+    repo = "libnl";
+    owner = "thom311";
   };
 
-  buildInputs = [ bison flex ];
+  nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ];
 
   meta = {
+    inherit version;
     homepage = "http://www.infradead.org/~tgr/libnl/";
     description = "Linux NetLink interface library";
     maintainers = [ stdenv.lib.maintainers.urkud ];

From 560d52f51e3ce412753ad98e7e864d996d662631 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Wed, 3 Jun 2015 15:43:08 -0500
Subject: [PATCH 0683/2322] switched to python.executable

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 332e32a0ddf..7033d102f85 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8123,6 +8123,15 @@ let
       echo $second > pandas/tests/test_format.py
       echo $first >> pandas/tests/test_format.py
       echo "$rest" >> pandas/tests/test_format.py
+
+      # Need to skip this test; insert a line here... hacky but oh well.
+      badtest=pandas/tseries/tests/test_timezones.py
+      fixed=$TMPDIR/fixed_test_timezones.py
+      touch $fixed
+      head -n 602 $badtest > $fixed
+      echo '        raise nose.SkipTest("Not working")' >> $fixed
+      tail -n +603 $badtest >> $fixed
+      mv $fixed $badtest
     '';
 
     checkPhase = ''
@@ -8130,7 +8139,8 @@ let
 
       # The flag `-A 'not network'` will disable tests that use internet.
       # The `-e` flag disables a few problematic tests.
-      python setup.py nosetests -A 'not network' --stop -e 'test_clipboard|test_series' --verbosity=3
+      ${python.executable} setup.py nosetests -A 'not network' --stop \
+        -e 'test_clipboard|test_series' --verbosity=3
 
       runHook postCheck
     '';

From 6214a521c91f697c7ed314d7c8e4a1d63381f108 Mon Sep 17 00:00:00 2001
From: Richard Larocque <richard.larocque@gmail.com>
Date: Wed, 3 Jun 2015 19:33:59 -0700
Subject: [PATCH 0684/2322] Fix firefox-bin icon path

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

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 23726f5c3d1..a71b158b74a 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -143,7 +143,7 @@ stdenv.mkDerivation {
       [Desktop Entry]
       Type=Application
       Exec=$out/bin/firefox
-      Icon=$out/lib/firefox-bin-${version}/chrome/icons/default/default256.png
+      Icon=$out/usr/lib/firefox-bin-${version}/browser/icons/mozicon128.png
       Name=Firefox
       GenericName=Web Browser
       Categories=Application;Network;

From 78f2410865195085eb88c16cd547682fda334f97 Mon Sep 17 00:00:00 2001
From: Richard Larocque <richard.larocque@gmail.com>
Date: Tue, 2 Jun 2015 22:33:27 -0700
Subject: [PATCH 0685/2322] kodi: Enable RTMP support

Ports over similar XBMC changes from
d221fd91a3d156bb3cdb4789ee8e068d0641ee8d.
---
 pkgs/applications/video/kodi/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index dafa381d9ec..cd24f2bfc2a 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -21,7 +21,7 @@
 , samba ? null, sambaSupport ? true
 , libmicrohttpd, bash
 # TODO: would be nice to have nfsSupport (needs libnfs library)
-# TODO: librtmp
+, rtmpdump ? null, rtmpSupport ? true
 , libvdpau ? null, vdpauSupport ? true
 , libpulseaudio ? null, pulseSupport ? true
 , libcec ? null, cecSupport ? true
@@ -34,6 +34,7 @@ assert sambaSupport -> samba != null;
 assert vdpauSupport -> libvdpau != null;
 assert pulseSupport -> libpulseaudio != null;
 assert cecSupport   -> libcec != null;
+assert rtmpSupport  -> rtmpdump != null;
 
 let
   rel = "Helix";
@@ -75,7 +76,8 @@ in stdenv.mkDerivation rec {
     ++ lib.optional sambaSupport samba
     ++ lib.optional vdpauSupport libvdpau
     ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional cecSupport libcec;
+    ++ lib.optional cecSupport libcec
+    ++ lib.optional rtmpSupport rtmpdump;
 
     dontUseCmakeConfigure = true;
 
@@ -96,7 +98,8 @@ in stdenv.mkDerivation rec {
     ]
     ++ lib.optional (!sambaSupport) "--disable-samba"
     ++ lib.optional vdpauSupport "--enable-vdpau"
-    ++ lib.optional pulseSupport "--enable-pulse";
+    ++ lib.optional pulseSupport "--enable-pulse"
+    ++ lib.optional rtmpSupport "--enable-rtmp";
 
     postInstall = ''
       for p in $(ls $out/bin/) ; do
@@ -108,7 +111,8 @@ in stdenv.mkDerivation rec {
           --prefix LD_LIBRARY_PATH ":" "${systemd}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \
-          --prefix LD_LIBRARY_PATH ":" "${libcec}/lib"
+          --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \
+          --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib"
       done
     '';
 

From 472642ebfffa0dca0284ae8b522e843025f555c2 Mon Sep 17 00:00:00 2001
From: Richard Larocque <richard.larocque@gmail.com>
Date: Wed, 3 Jun 2015 23:43:00 -0700
Subject: [PATCH 0686/2322] Make Loxodo into a real package

There's no reason to keep it hidden in python27Packages hierarchy.
Promote it to be a top-level package.
---
 pkgs/applications/misc/loxodo/default.nix | 27 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 pkgs/top-level/python-packages.nix        | 21 ------------------
 3 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/applications/misc/loxodo/default.nix

diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix
new file mode 100644
index 00000000000..81c6d3a4bc8
--- /dev/null
+++ b/pkgs/applications/misc/loxodo/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, python27Packages, fetchgit }:
+let
+  py = python27Packages;
+  python = py.python;
+in
+py.buildPythonPackage rec {
+  name = "loxodo-0.20150124";
+
+  src = fetchgit {
+    url = "https://github.com/sommer/loxodo.git";
+    rev = "6c56efb4511fd6f645ad0f8eb3deafc8071c5795";
+    sha256 = "02whmv4am8cz401rplplqzbipkyf0wd69z43sd3yw05rh7f3xbs2";
+  };
+
+  propagatedBuildInputs = with py; [ wxPython python.modules.readline ];
+
+  postInstall = ''
+    mv $out/bin/loxodo.py $out/bin/loxodo
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Password Safe V3 compatible password vault";
+    homepage = http://www.christoph-sommer.de/loxodo/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be12bcfe524..ecf2d68e9fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11674,6 +11674,8 @@ let
 
   lmms = callPackage ../applications/audio/lmms { };
 
+  loxodo = callPackage ../applications/misc/loxodo { };
+
   lrzsz = callPackage ../tools/misc/lrzsz { };
 
   luakit = callPackage ../applications/networking/browsers/luakit {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ac800873860..c87928ccf26 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6662,27 +6662,6 @@ let
     propagatedBuildInputs = with self; [ unittest2 six ];
   };
 
-  loxodo = buildPythonPackage {
-    name = "loxodo-0.20150124";
-    disabled = isPy3k;
-
-    src = pkgs.fetchgit {
-      url = "https://github.com/sommer/loxodo.git";
-      rev = "6c56efb4511fd6f645ad0f8eb3deafc8071c5795";
-      sha256 = "02whmv4am8cz401rplplqzbipkyf0wd69z43sd3yw05rh7f3xbs2";
-    };
-
-    propagatedBuildInputs = with self; [ wxPython modules.readline ];
-    postInstall = "mv $out/bin/loxodo.py $out/bin/loxodo";
-
-    meta = {
-      description = "A Password Safe V3 compatible password vault";
-      homepage = http://www.christoph-sommer.de/loxodo/;
-      license = licenses.gpl2Plus;
-      platforms = platforms.linux;
-    };
-  };
-
   lxml = buildPythonPackage ( rec {
     name = "lxml-3.3.6";
 

From 19108c1b6c6b8d0e1e67e3dc69f9a52d178840c8 Mon Sep 17 00:00:00 2001
From: Richard Larocque <richard.larocque@gmail.com>
Date: Wed, 3 Jun 2015 21:32:17 -0700
Subject: [PATCH 0687/2322] Add a .desktop file for Loxodo

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

diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix
index 81c6d3a4bc8..05d29ce7e09 100644
--- a/pkgs/applications/misc/loxodo/default.nix
+++ b/pkgs/applications/misc/loxodo/default.nix
@@ -16,6 +16,16 @@ py.buildPythonPackage rec {
 
   postInstall = ''
     mv $out/bin/loxodo.py $out/bin/loxodo
+    mkdir -p $out/share/applications
+    cat > $out/share/applications/loxodo.desktop <<EOF
+    [Desktop Entry]
+    Type=Application
+    Exec=$out/bin/loxodo
+    Icon=$out/lib/${python.libPrefix}/site-packages/resources/loxodo-icon.png
+    Name=Loxodo
+    GenericName=Password Vault
+    Categories=Application;Other;
+    EOF
   '';
 
   meta = with stdenv.lib; {

From 43ef7e29252faecd2e1d46c8bf7ac84b8910048e Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Wed, 3 Jun 2015 23:42:37 -0700
Subject: [PATCH 0688/2322] make a wrapper so that dunst can find dbus-launch

Prior to this change, the following would fail
  nix-shell --pure -p dunst --command dunst
while this would succeed
  nix-shell --pure -p dunst -p dbus_daemon --command dunst

because dunst tries to execve 'dbus-launch'. The same issue hit if dunst
was used inside a (user) systemd service (which is what I actually care
about).
---
 pkgs/applications/misc/dunst/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 33371c93b86..c398c3c43d0 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, coreutils , unzip, which, pkgconfig , dbus
-, freetype, xdg_utils , libXext, glib, pango , cairo, libX11, libnotify
-, libxdg_basedir , libXScrnSaver, xproto, libXinerama , perl, gdk_pixbuf
+{ stdenv, fetchurl, coreutils, unzip, which, pkgconfig, dbus
+, freetype, xdg_utils, libXext, glib, pango, cairo, libX11, libnotify
+, libxdg_basedir, libXScrnSaver, xproto, libXinerama, perl, gdk_pixbuf
+, dbus_daemon, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs =
   [ coreutils unzip which pkgconfig dbus freetype libnotify gdk_pixbuf
     xdg_utils libXext glib pango cairo libX11 libxdg_basedir
-    libXScrnSaver xproto libXinerama perl];
+    libXScrnSaver xproto libXinerama perl dbus_daemon makeWrapper ];
 
   buildPhase = ''
     export VERSION=${version};
@@ -23,6 +24,11 @@ stdenv.mkDerivation rec {
     make dunst;
   '';
 
+  postFixup = ''
+    wrapProgram "$out/bin/dunst" \
+      --prefix PATH : '${dbus_daemon}/bin'
+  '';
+
   meta = {
     description = "lightweight and customizable notification daemon";
     homepage = http://www.knopwob.org/dunst/;

From 9c2f2bc89334a0c824d83c0d50072580f77b365c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 3 Jun 2015 23:43:17 +0300
Subject: [PATCH 0689/2322] kernel-config: Enable FB_VESA and
 FRAMEBUFFER_CONSOLE

Commit 159fed47bc (nixos/grub: Fix video display on efi) changed BIOS
systems to start in non-text mode as well. Enable FB_VESA to get a
framebuffer console on BIOS systems. Change FRAMEBUFFER_CONSOLE to 'y'
instead of the default 'm' to so the user doesn't need to manually load
the fbcon module anymore.

Other distros have similar defaults, at least on Arch:
    CONFIG_FB_VESA=y
    CONFIG_FRAMEBUFFER_CONSOLE=y
and on Ubuntu (12.04):
    CONFIG_FB_VESA=m
    CONFIG_FRAMEBUFFER_CONSOLE=y

Fixes #8139
---
 nixos/doc/manual/installation/installing-uefi.xml       | 4 ----
 nixos/modules/installer/cd-dvd/installation-cd-base.nix | 3 ---
 pkgs/os-specific/linux/kernel/common-config.nix         | 2 ++
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/nixos/doc/manual/installation/installing-uefi.xml b/nixos/doc/manual/installation/installing-uefi.xml
index dbd5606c4a5..90d18695447 100644
--- a/nixos/doc/manual/installation/installing-uefi.xml
+++ b/nixos/doc/manual/installation/installing-uefi.xml
@@ -41,10 +41,6 @@ changes:
     <option>boot.loader.efi</option> and <option>boot.loader.gummiboot</option>
     as well.</para>
   </listitem>
-  <listitem>
-    <para>To see console messages during early boot, add <literal>"fbcon"</literal>
-    to your <option>boot.initrd.kernelModules</option>.</para>
-  </listitem>
 </itemizedlist>
 </para>
 
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index 446d79ce220..a660199cbe0 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -42,9 +42,6 @@ with lib;
   # Add Memtest86+ to the CD.
   boot.loader.grub.memtest86.enable = true;
 
-  # Get a console as soon as the initrd loads fbcon on EFI boot.
-  boot.initrd.kernelModules = [ "fbcon" ];
-
   # Allow the user to log in as root without a password.
   users.extraUsers.root.initialHashedPassword = "";
 }
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 25b707614ed..cfe77792f85 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -131,6 +131,8 @@ with stdenv.lib;
   FB_SIS_300 y
   FB_SIS_315 y
   FB_3DFX_ACCEL y
+  FB_VESA y
+  FRAMEBUFFER_CONSOLE y
   ${optionalString (versionOlder version "3.9" || stdenv.system == "i686-linux") ''
     FB_GEODE y
   ''}

From 6be70d17c0f43368b008f54e3c3f2aa093249e63 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 4 Jun 2015 11:15:31 +0300
Subject: [PATCH 0690/2322] kernel-config: Enable IKCONFIG so ARM gets
 /proc/config.gz

IKCONFIG must be enabled so IKCONFIG_PROC can be set. On x86 IKCONFIG
gets implicitly enabled by kernelAutoModules in platforms.nix. But ARM
doesn't use kernelAutoModules, so IKCONFIG_PROC won't get enabled
without this patch.
---
 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 cfe77792f85..a972c4e60f8 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -54,6 +54,7 @@ with stdenv.lib;
   STANDALONE n
 
   # Make /proc/config.gz available.
+  IKCONFIG y
   IKCONFIG_PROC y
 
   # Optimize with -O2, not -Os.

From 6bf18533878c751c2f630d16ccfec471441e8477 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jun 2015 10:33:52 +0200
Subject: [PATCH 0691/2322] Don't include 4 editors in the minimal installation
 CD

Emphasis on "minimal".
---
 .../cd-dvd/installation-cd-graphical.nix        | 17 ++++++++++++-----
 nixos/modules/profiles/base.nix                 |  5 -----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix
index 189cca9e23b..d14768bc107 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix
@@ -11,9 +11,16 @@ with lib;
   # Provide wicd for easy wireless configuration.
   #networking.wicd.enable = true;
 
-  # Include gparted for partitioning disks
-  environment.systemPackages = [ pkgs.gparted ];
-  
+  environment.systemPackages =
+    [ # Include gparted for partitioning disks.
+      pkgs.gparted
+
+      # Include some editors.
+      pkgs.vim
+      pkgs.bvi # binary editor
+      pkgs.joe
+    ];
+
   # Provide networkmanager for easy wireless configuration.
   networking.networkmanager.enable = true;
   networking.wireless.enable = mkForce false;
@@ -67,7 +74,7 @@ with lib;
       loadTemplate("org.kde.plasma-desktop.defaultPanel")
 
       for (var i = 0; i < screenCount; ++i) {
-      	var desktop = new Activity
+        var desktop = new Activity
         desktop.name = i18n("Desktop")
         desktop.screen = i
         desktop.wallpaperPlugin = 'image'
@@ -75,7 +82,7 @@ with lib;
 
         var folderview = desktop.addWidget("folderview");
         folderview.writeConfig("url", "desktop:/");
-        
+
         //Create more panels for other screens
         if (i > 0){
           var panel = new Panel
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 6c8e9994379..c207829aabd 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -44,11 +44,6 @@
     pkgs.zip
     pkgs.dar # disk archiver
     pkgs.cabextract
-
-    # Some editors.
-    pkgs.vim
-    pkgs.bvi # binary editor
-    pkgs.joe
   ];
 
   # Include support for various filesystems.

From 7318ff0e385fde083d3bd2a0dcf0aedf88376124 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jun 2015 10:34:48 +0200
Subject: [PATCH 0692/2322] =?UTF-8?q?Add=20option=20=E2=80=98system.extraD?=
 =?UTF-8?q?ependencies=E2=80=99=20for=20including=20stuff=20in=20the=20sys?=
 =?UTF-8?q?tem=20closure?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Mostly useful for installer tests that don't have network access. This
generalizes virtualisation.pathsInNixDB and isoImage.storeContents.
---
 nixos/modules/system/activation/top-level.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index d7a1e205b4d..b19fea57f6b 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -81,6 +81,8 @@ let
       substituteAll ${./switch-to-configuration.pl} $out/bin/switch-to-configuration
       chmod +x $out/bin/switch-to-configuration
 
+      echo -n "${toString config.system.extraDependencies}" > $out/extra-dependencies
+
       ${config.system.extraSystemBuilderCmds}
     '';
 
@@ -188,6 +190,16 @@ in
       '';
     };
 
+    system.extraDependencies = mkOption {
+      type = types.listOf types.package;
+      default = [];
+      description = ''
+        A list of packages that should be included in the system
+        closure but not otherwise made available to users. This is
+        primarily used by the installation tests.
+      '';
+    };
+
     system.replaceRuntimeDependencies = mkOption {
       default = [];
       example = lib.literalExample "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { ... }; }) ]";

From cdeb2711017b776a80d9e8adfb39963722a915bc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jun 2015 11:00:50 +0200
Subject: [PATCH 0693/2322] zfs: Nuke references to linux.dev in *.ko files

This prevents linux.dev being included in the installation CD.
---
 pkgs/os-specific/linux/zfs/generic.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
index 9a97bef22bb..b040201cf33 100644
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, utillinux
+{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences
 , configFile ? "all"
 
 # Userspace dependencies
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   inherit version src patches;
 
-  buildInputs = [ autoconf automake libtool ]
+  buildInputs = [ autoreconfHook nukeReferences ]
     ++ optionals buildKernel [ spl ]
     ++ optionals buildUser [ zlib libuuid python ];
 
@@ -68,8 +68,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  # Remove provided services as they are buggy
-  postInstall = optionalString buildUser ''
+  postInstall = ''
+    # Prevent kernel modules from depending on the Linux -dev output.
+    nuke-refs $(find $out -name "*.ko")
+  '' + optionalString buildUser ''
+    # Remove provided services as they are buggy
     rm $out/etc/systemd/system/zfs-import-*.service
 
     sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/*
@@ -78,7 +81,7 @@ stdenv.mkDerivation rec {
       substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"
     done
 
-    # Fix pkgconfig
+    # Fix pkgconfig.
     ln -s ../share/pkgconfig $out/lib/pkgconfig
   '';
 

From 1db87a34e9bcd9cb65328ed1a03d36d9275b8042 Mon Sep 17 00:00:00 2001
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Sat, 28 Feb 2015 10:24:07 +0000
Subject: [PATCH 0694/2322] Add xsettingsd.

---
 pkgs/tools/X11/xsettingsd/SConstruct.patch | 13 ++++++++
 pkgs/tools/X11/xsettingsd/default.nix      | 37 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 3 files changed, 52 insertions(+)
 create mode 100644 pkgs/tools/X11/xsettingsd/SConstruct.patch
 create mode 100644 pkgs/tools/X11/xsettingsd/default.nix

diff --git a/pkgs/tools/X11/xsettingsd/SConstruct.patch b/pkgs/tools/X11/xsettingsd/SConstruct.patch
new file mode 100644
index 00000000000..bae8d1efc14
--- /dev/null
+++ b/pkgs/tools/X11/xsettingsd/SConstruct.patch
@@ -0,0 +1,13 @@
+diff --git a/SConstruct b/SConstruct
+index bebc82e..3e0127b 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -59,6 +59,8 @@ srcs = Split('''\
+ ''')
+ libxsettingsd = env.Library('xsettingsd', srcs)
+ env['LIBS'] = libxsettingsd
++env['ENV']['PATH'] = os.environ.get('PATH', '')
++env['ENV']['PKG_CONFIG_PATH'] = os.environ.get('PKG_CONFIG_PATH', '')
+ env.ParseConfig('pkg-config --cflags --libs x11')
+ 
+ xsettingsd     = env.Program('xsettingsd', 'xsettingsd.cc')
diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix
new file mode 100644
index 00000000000..254cc8a4961
--- /dev/null
+++ b/pkgs/tools/X11/xsettingsd/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, scons, libX11, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "xsettingsd-${version}";
+  version = "0.0.1";
+
+  src = fetchFromGitHub {
+    owner = "derat";
+    repo = "xsettingsd";
+    rev = "2a516a91d8352b3b93a7a1ef5606dbd21fa06b7c";
+    sha256 = "0f9lc5w18x6xs9kf72jpixprp3xb7wqag23cy8zrm33n2bza9dj0";
+  };
+
+  patches = [
+    ./SConstruct.patch
+  ];
+
+  buildInputs = [ libX11 scons pkgconfig ];
+  buildPhase = ''
+    mkdir -p "$out"
+    scons \
+      -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
+      "prefix=$out"
+  '';
+  
+  installPhase = ''
+    mkdir -p "$out"/bin
+    install xsettingsd "$out"/bin
+    install dump_xsettings "$out"/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Provides settings to X11 applications via the XSETTINGS specification";
+    homepage = https://github.com/derat/xsettingsd;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be12bcfe524..72bf9c32495 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3223,6 +3223,8 @@ let
 
   xbrightness = callPackage ../tools/X11/xbrightness { };
 
+  xsettingsd = callPackage ../tools/X11/xsettingsd { };
+
   xcruiser = callPackage ../applications/misc/xcruiser { };
 
   unarj = callPackage ../tools/archivers/unarj { };

From c659105ef8b2fe87822acf52f191a189f62e4d8a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Jun 2015 13:33:57 +0200
Subject: [PATCH 0695/2322] cabal2nix: get rid of the '-dirty' version suffix

The fetchgit builder performs some freak magic in the name of deterministic
hashes that screws up git's idea of a clean directory tree.
---
 pkgs/development/tools/haskell/cabal2nix/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 7c36390b91e..240353b6e75 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -31,7 +31,10 @@ mkDerivation rec {
     split transformers utf8-string
   ];
   buildTools = [ gitMinimal makeWrapper ];
-  preConfigure = "runhaskell $setupCompileFlags generate-cabal-file --release >cabal2nix.cabal";
+  preConfigure = ''
+    sed -i -e 's|, "--dirty"||' generate-cabal-file.hs
+    runhaskell $setupCompileFlags generate-cabal-file --release >cabal2nix.cabal
+  '';
   postInstall = ''
     exe=$out/libexec/${pname}-${version}/cabal2nix
     install -D $out/bin/cabal2nix $exe

From 18b5bd8dcac19e040b34dd6393ac3bdf757c3566 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jun 2015 13:10:26 +0200
Subject: [PATCH 0696/2322] Add some info about editors

---
 nixos/doc/manual/installation/installing.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index c21759bc926..e40c15e8316 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -120,7 +120,11 @@ $ nixos-generate-config --root /mnt</screen>
 $ nano /mnt/etc/nixos/configuration.nix
 </screen>
 
-    The <command>vim</command> text editor is also available.</para>
+    If you’re using the graphical ISO image, other editors may be
+    available (such as <command>vim</command>). If you have network
+    access, you can also install other editors — for instance, you can
+    install Emacs by running <literal>nix-env -i
+    emacs</literal>.</para>
 
     <para>You <emphasis>must</emphasis> set the option
     <option>boot.loader.grub.device</option> to specify on which disk
@@ -189,11 +193,13 @@ $ reboot</screen>
 
   <listitem>
 
-    <para>You should now be able to boot into the installed NixOS. The GRUB boot menu shows a list
-                of <emphasis>available configurations</emphasis> (initially just one). Every time
-                you change the NixOS configuration (see<link linkend="sec-changing-config">Changing
-                    Configuration</link> ), a new item appears in the menu. This allows you to
-                easily roll back to another configuration if something goes wrong.</para>
+    <para>You should now be able to boot into the installed NixOS. The
+    GRUB boot menu shows a list of <emphasis>available
+    configurations</emphasis> (initially just one). Every time you
+    change the NixOS configuration (see <link
+    linkend="sec-changing-config">Changing Configuration</link> ), a
+    new item is added to the menu. This allows you to easily roll back
+    to a previous configuration if something goes wrong.</para>
 
     <para>You should log in and change the <literal>root</literal>
     password with <command>passwd</command>.</para>

From 4f60156afbb8d61d8d28db8ab594ec9328946d71 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 20:49:35 +0200
Subject: [PATCH 0697/2322] Revert "qemu-nix: Build statically"

This reverts commit 5afa4f18d6173725d593e59f1c4a8f54b575f9fe.
---
 pkgs/applications/virtualization/qemu/default.nix | 10 +++-------
 pkgs/development/libraries/glib/default.nix       |  7 ++-----
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index f04ff311930..0d57a8d9f57 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -41,7 +41,7 @@ let
   optLibuuid = if isNix then null else shouldUsePkg libuuid;
   optVde2 = if isNix then null else shouldUsePkg vde2;
   optLibaio = shouldUsePkg libaio;
-  optLibcap_ng = if isNix then null else shouldUsePkg libcap_ng;
+  optLibcap_ng = shouldUsePkg libcap_ng;
   optSpice = if isNix then null else shouldUsePkg spice;
   optSpice_protocol = if isNix then null else shouldUsePkg spice_protocol;
   optLibceph = if isNix then null else shouldUsePkg libceph;
@@ -95,8 +95,6 @@ let
   targetList = if stdenv.system == "x86_64-linux" then "x86_64-softmmu,i386-softmmu"
     else if stdenv.system == "i686-linux" then "i386-softmmu"
     else null;
-
-  hasModules = if isNix then null else true;
 in
 
 stdenv.mkDerivation rec {
@@ -140,7 +138,7 @@ stdenv.mkDerivation rec {
     (mkOther                          "smbd"                "smbd")
     (mkOther                          "sysconfdir"          "/etc")
     (mkOther                          "localstatedir"       "/var")
-    (mkEnable hasModules              "modules"             null)
+    (mkEnable true                    "modules"             null)
     (mkEnable false                   "debug-tcg"           null)
     (mkEnable false                   "debug-info"          null)
     (mkEnable false                   "sparse"              null)
@@ -169,7 +167,7 @@ stdenv.mkDerivation rec {
     (mkEnable (!isNix)                "system"              null)
     (mkEnable (!isKvmOnly)            "user"                null)
     (mkEnable (!isKvmOnly)            "guest-base"          null)
-    (mkEnable (!isNix)                "pie"                 null)
+    (mkEnable true                    "pie"                 null)
     (mkEnable (optLibuuid != null)    "uuid"                null)
     (mkEnable (optVde2 != null)       "vde"                 null)
     (mkEnable false                   "netmap"              null)  # TODO(wkennington): Add Support
@@ -201,8 +199,6 @@ stdenv.mkDerivation rec {
     (mkEnable (optNumactl != null)    "numa"                null)
   ] ++ optionals isKvmOnly [
     (mkOther                          "target-list"         targetList)
-  ] ++ optionals isNix [
-    "--static"
   ];
 
   installFlags = [
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 518d713026a..7d61bea64e1 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -63,9 +63,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ pcre zlib libffi libiconv ]
     ++ libintlOrEmpty;
 
-  # Static is necessary for qemu-nix to support static userspace translators
-  configureFlags = [ "--enable-static" ]
-    ++ optional stdenv.isDarwin "--disable-compile-warnings"
+  configureFlags =
+    optional stdenv.isDarwin "--disable-compile-warnings"
     ++ optional stdenv.isSunOS "--disable-modular-tests";
 
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
@@ -76,8 +75,6 @@ stdenv.mkDerivation rec {
       export MACOSX_DEPLOYMENT_TARGET=
     '';
 
-  dontDisableStatic = true;
-
   enableParallelBuilding = true;
   DETERMINISTIC_BUILD = 1;
 

From 3096d03435bb177af8c4868a8efa637b393f2715 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 20:52:03 +0200
Subject: [PATCH 0698/2322] Revert "Refactor mkFlag / shouldUsePkg into the
 nixpkgs libraries"

This reverts commit 25a148fa196b944b3f134527da87e43d88c066f9.
---
 lib/customisation.nix                         | 23 -----
 .../virtualization/qemu/default.nix           | 93 ++++++++++---------
 .../libraries/kerberos/heimdal.nix            | 13 ++-
 .../libraries/libgcrypt/default.nix           | 15 ++-
 .../libraries/libmicrohttpd/default.nix       | 10 +-
 pkgs/development/libraries/libssh/default.nix |  3 +-
 .../development/libraries/libssh2/default.nix | 10 +-
 .../development/libraries/libxml2/default.nix | 11 ++-
 .../development/libraries/ncurses/default.nix | 18 +++-
 .../development/libraries/nghttp2/default.nix | 15 ++-
 .../libraries/wiredtiger/default.nix          | 12 ++-
 pkgs/misc/jackaudio/default.nix               |  3 +-
 pkgs/misc/jackaudio/jack1.nix                 |  3 +-
 pkgs/os-specific/linux/ffado/default.nix      |  4 +-
 pkgs/servers/pulseaudio/default.nix           | 21 +++--
 pkgs/servers/shishi/default.nix               | 10 +-
 pkgs/stdenv/generic/default.nix               |  2 -
 pkgs/tools/networking/curl/default.nix        | 14 ++-
 18 files changed, 176 insertions(+), 104 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index ca3dd4980da..91a25055df2 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -158,27 +158,4 @@ rec {
       drv' = (lib.head outputsList).value;
     in lib.deepSeq drv' drv';
 
-
-  /* Tests whether a derivation can be used by the current platform
-     Returns the derivation if true, otherwise null. */
-  shouldUsePkgSystem = system: pkg_: let pkg = (builtins.tryEval pkg_).value;
-    in if lib.any (x: x == system) (pkg.meta.platforms or [])
-      then pkg
-      else null;
-
-  /* Returns a configure flag string in an autotools format
-     trueStr: Prepended when cond is true
-     falseStr: Prepended when cond is false
-     cond: The condition for the prepended string type and value
-     name: The flag name
-     val: The value of the flag only set when cond is true */
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}"
-      + "${if val != null && cond != false then "=${val}" else ""}";
-
-  /* Flag setting helpers for autotools like packages */
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
 }
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 0d57a8d9f57..f9433a1a409 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -17,60 +17,65 @@
 , type ? ""
 }:
 
-with stdenv;
 with stdenv.lib;
 let
   n = "qemu-2.3.0";
 
-  isKvmOnly = type == "kvm-only";
-  isNix = type == "nix";
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
 
-  optSDL2 = if isNix then null else shouldUsePkg SDL2;
-  optGtk = if isNix then null else shouldUsePkg gtk;
-  optLibcap = if isNix then null else shouldUsePkg libcap;
-  optAttr = if isNix then null else shouldUsePkg attr;
-  optGnutls = if isNix then null else shouldUsePkg gnutls;
-  optCyrus_sasl = if isNix then null else shouldUsePkg cyrus_sasl;
-  optLibjpeg = if isNix then null else shouldUsePkg libjpeg;
-  optLibpng = if isNix then null else shouldUsePkg libpng;
-  optNcurses = if isNix then null else shouldUsePkg ncurses;
-  optCurl = if isNix then null else shouldUsePkg curl;
-  optBluez = if isNix then null else shouldUsePkg bluez;
-  optLibibverbs = if isNix then null else shouldUsePkg libibverbs;
-  optLibrdmacm = if isNix then null else shouldUsePkg librdmacm;
-  optLibuuid = if isNix then null else shouldUsePkg libuuid;
-  optVde2 = if isNix then null else shouldUsePkg vde2;
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  optSDL2 = if type == "nix" then null else shouldUsePkg SDL2;
+  optGtk = if type == "nix" then null else shouldUsePkg gtk;
+  optLibcap = if type == "nix" then null else shouldUsePkg libcap;
+  optAttr = if type == "nix" then null else shouldUsePkg attr;
+  optGnutls = if type == "nix" then null else shouldUsePkg gnutls;
+  optCyrus_sasl = if type == "nix" then null else shouldUsePkg cyrus_sasl;
+  optLibjpeg = if type == "nix" then null else shouldUsePkg libjpeg;
+  optLibpng = if type == "nix" then null else shouldUsePkg libpng;
+  optNcurses = if type == "nix" then null else shouldUsePkg ncurses;
+  optCurl = if type == "nix" then null else shouldUsePkg curl;
+  optBluez = if type == "nix" then null else shouldUsePkg bluez;
+  optLibibverbs = if type == "nix" then null else shouldUsePkg libibverbs;
+  optLibrdmacm = if type == "nix" then null else shouldUsePkg librdmacm;
+  optLibuuid = if type == "nix" then null else shouldUsePkg libuuid;
+  optVde2 = if type == "nix" then null else shouldUsePkg vde2;
   optLibaio = shouldUsePkg libaio;
   optLibcap_ng = shouldUsePkg libcap_ng;
-  optSpice = if isNix then null else shouldUsePkg spice;
-  optSpice_protocol = if isNix then null else shouldUsePkg spice_protocol;
-  optLibceph = if isNix then null else shouldUsePkg libceph;
-  optLibxfs = if isNix then null else shouldUsePkg libxfs;
-  optNss = if isNix then null else shouldUsePkg nss;
-  optNspr = if isNix then null else shouldUsePkg nspr;
-  optLibusb = if isNix then null else shouldUsePkg libusb;
-  optUsbredir = if isNix then null else shouldUsePkg usbredir;
-  optMesa = if isNix then null else shouldUsePkg mesa;
-  optLzo = if isNix then null else shouldUsePkg lzo;
-  optSnappy = if isNix then null else shouldUsePkg snappy;
-  optBzip2 = if isNix then null else shouldUsePkg bzip2;
-  optLibseccomp = if isNix then null else shouldUsePkg libseccomp;
-  optGlusterfs = if isNix then null else shouldUsePkg glusterfs;
-  optLibssh2 = if isNix then null else shouldUsePkg libssh2;
-  optNumactl = if isNix then null else shouldUsePkg numactl;
+  optSpice = if type == "nix" then null else shouldUsePkg spice;
+  optSpice_protocol = if type == "nix" then null else shouldUsePkg spice_protocol;
+  optLibceph = if type == "nix" then null else shouldUsePkg libceph;
+  optLibxfs = if type == "nix" then null else shouldUsePkg libxfs;
+  optNss = if type == "nix" then null else shouldUsePkg nss;
+  optNspr = if type == "nix" then null else shouldUsePkg nspr;
+  optLibusb = if type == "nix" then null else shouldUsePkg libusb;
+  optUsbredir = if type == "nix" then null else shouldUsePkg usbredir;
+  optMesa = if type == "nix" then null else shouldUsePkg mesa;
+  optLzo = if type == "nix" then null else shouldUsePkg lzo;
+  optSnappy = if type == "nix" then null else shouldUsePkg snappy;
+  optBzip2 = if type == "nix" then null else shouldUsePkg bzip2;
+  optLibseccomp = if type == "nix" then null else shouldUsePkg libseccomp;
+  optGlusterfs = if type == "nix" then null else shouldUsePkg glusterfs;
+  optLibssh2 = if type == "nix" then null else shouldUsePkg libssh2;
+  optNumactl = if type == "nix" then null else shouldUsePkg numactl;
 
   hasSDLAbi = if optSDL2 != null then true else null;
 
   hasVirtfs = stdenv.isLinux && optLibcap != null && optAttr != null;
 
-  hasVnc = !isNix;
+  hasVnc = type != "nix";
   hasVncTls = hasVnc && optGnutls != null;
   hasVncSasl = hasVnc && optCyrus_sasl != null;
   hasVncJpeg = hasVnc && optLibjpeg != null;
   hasVncPng = hasVnc && optLibpng != null;
   hasVncWs = hasVnc && optGnutls != null;
 
-  hasFdt = !isNix;
+  hasFdt = type != "nix";
 
   hasRdma = optLibibverbs != null && optLibrdmacm != null;
 
@@ -80,8 +85,8 @@ let
 
   hasNss = optNss != null && optNspr != null;
 
-  optLibpulseaudio = if isNix then null else shouldUsePkg libpulseaudio;
-  optAlsaLib = if isNix then null else shouldUsePkg alsaLib;
+  optLibpulseaudio = if type == "nix" then null else shouldUsePkg libpulseaudio;
+  optAlsaLib = if type == "nix" then null else shouldUsePkg alsaLib;
   audio = concatStringsSep "," (
        optional (optSDL2 != null) "sdl"
     ++ optional (optLibpulseaudio != null) "pa"
@@ -164,9 +169,9 @@ stdenv.mkDerivation rec {
     (mkEnable (optBluez != null)      "bluez"               null)
     (mkEnable stdenv.isLinux          "kvm"                 null)
     (mkEnable hasRdma                 "rdma"                null)
-    (mkEnable (!isNix)                "system"              null)
-    (mkEnable (!isKvmOnly)            "user"                null)
-    (mkEnable (!isKvmOnly)            "guest-base"          null)
+    (mkEnable (type != "nix")         "system"              null)
+    (mkEnable (type != "kvm-only")    "user"                null)
+    (mkEnable (type != "kvm-only")    "guest-base"          null)
     (mkEnable true                    "pie"                 null)
     (mkEnable (optLibuuid != null)    "uuid"                null)
     (mkEnable (optVde2 != null)       "vde"                 null)
@@ -174,7 +179,7 @@ stdenv.mkDerivation rec {
     (mkEnable hasLinuxAio             "linux-aio"           null)
     (mkEnable (optLibcap_ng != null)  "cap-ng"              null)
     (mkEnable (optAttr != null)       "attr"                null)
-    (mkEnable (!isNix)                "docs"                null)
+    (mkEnable (type != "nix")         "docs"                null)
     (mkEnable stdenv.isLinux          "vhost-net"           null)
     (mkEnable hasSpice                "spice"               null)
     (mkEnable (optLibceph != null)    "rbd"                 null)
@@ -197,7 +202,7 @@ stdenv.mkDerivation rec {
     (mkEnable (optLibuuid != null)    "vhdx"                null)
     (mkEnable (optGnutls != null)     "quorum"              null)
     (mkEnable (optNumactl != null)    "numa"                null)
-  ] ++ optionals isKvmOnly [
+  ] ++ optionals (type == "kvm-only") [
     (mkOther                          "target-list"         targetList)
   ];
 
@@ -220,6 +225,6 @@ stdenv.mkDerivation rec {
     description = "A generic and open source machine emulator and virtualizer";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ viric shlevy eelco wkennington ];
-    platforms = if isKvmOnly then platforms.linux else platforms.all;
+    platforms = if type == "kvm-only" then platforms.linux else platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 6050891ba27..b0de8c15146 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -8,9 +8,16 @@
 #, sqlite, db, ncurses, openssl, cyrus_sasl
 }:
 
-with stdenv;
-with stdenv.lib;
 let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
   optOpenldap = shouldUsePkg openldap;
   optLibcap_ng = shouldUsePkg libcap_ng;
   optSqlite = shouldUsePkg sqlite;
@@ -90,7 +97,7 @@ stdenv.mkDerivation rec {
     rmdir $out/libexec
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "an implementation of Kerberos 5 (and some more stuff) largely written in Sweden";
     license = licenses.bsd3;
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 702d54392a6..7d327a499bc 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -5,9 +5,16 @@
 , libcap ? null, pth ? null
 }:
 
-with stdenv;
-with stdenv.lib;
 let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
   optLibcap = shouldUsePkg libcap;
   #optPth = shouldUsePkg pth;
   optPth = null; # Broken as of 1.6.3
@@ -31,13 +38,13 @@ stdenv.mkDerivation rec {
   # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
   postInstall = ''
     sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h
-  '' + optionalString (!stdenv.isDarwin && optLibcap != null) ''
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin && optLibcap != null) ''
     sed -i 's,\(-lcap\),-L${optLibcap}/lib \1,' $out/lib/libgcrypt.la
   '';
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://www.gnu.org/software/libgcrypt/;
     description = "General-pupose cryptographic library";
     license = licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index c7892716c9d..9eca6bd84b9 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -5,8 +5,16 @@
 , openssl ? null, zlib ? null, libgcrypt ? null, gnutls ? null
 }:
 
-with stdenv;
 let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
   optOpenssl = shouldUsePkg openssl;
   optZlib = shouldUsePkg zlib;
   hasSpdy = optOpenssl != null && optZlib != null;
diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 8ea2ac72da0..17bcf227c0e 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -7,8 +7,9 @@
 , openssl ? null, libgcrypt ? null
 }:
 
-with stdenv;
 let
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
   # Prefer openssl
   cryptoStr = if shouldUsePkg openssl != null then "openssl"
     else if shouldUsePkg libgcrypt != null then "libgcrypt"
diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index a8e8777f06c..3434fde1a62 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -7,8 +7,16 @@
 , openssl ? null, libgcrypt ? null
 }:
 
-with stdenv;
 let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
   # Prefer openssl
   cryptoStr = if shouldUsePkg openssl != null then "openssl"
     else if shouldUsePkg libgcrypt != null then "libgcrypt"
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 77050a1d3b3..0d70a6502fe 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -6,8 +6,16 @@
 
 #TODO: share most stuff between python and non-python builds, perhaps via multiple-output
 
-with stdenv;
 let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
   optIcu = shouldUsePkg icu;
   optPython = shouldUsePkg python;
   optReadline = shouldUsePkg readline;
@@ -17,7 +25,6 @@ let
   sitePackages = if optPython == null then null else
     "\${out}/lib/${python.libPrefix}/site-packages";
 in
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libxml2-${version}";
   version = "2.9.2";
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index f0519fa981d..bea4754a1f5 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -8,11 +8,23 @@
 , unicode ? true
 }:
 
-with stdenv.lib;
 let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg_: let
+    pkg = (builtins.tryEval pkg_).value;
+  in if stdenv.lib.any (x: x == stdenv.system) (pkg.meta.platforms or [])
+    then pkg
+    else null;
+
   buildShared = !stdenv.isDarwin;
 
-  optGpm = stdenv.shouldUsePkg gpm;
+  optGpm = shouldUsePkg gpm;
 in
 stdenv.mkDerivation rec {
   name = "ncurses-5.9";
@@ -124,7 +136,7 @@ stdenv.mkDerivation rec {
     ln -svf libncurses.so $out/lib/libcurses.so
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Free software emulation of curses in SVR4 and more";
 
     longDescription = ''
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index d8fd36ecba6..bc8c599a901 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -8,9 +8,16 @@
 , prefix ? ""
 }:
 
-with stdenv;
-with stdenv.lib;
 let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
   isLib = prefix == "lib";
 
   optOpenssl = if isLib then null else shouldUsePkg openssl;
@@ -43,7 +50,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ optJansson optBoost optLibxml2 optJemalloc ]
-    ++ optionals hasApp [ optOpenssl optLibev optZlib ];
+    ++ stdenv.lib.optionals hasApp [ optOpenssl optLibev optZlib ];
 
   configureFlags = [
     (mkEnable false                 "werror"          null)
@@ -61,7 +68,7 @@ stdenv.mkDerivation rec {
     (mkWith   false                 "cython"          null)
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://nghttp2.org/;
     description = "an implementation of HTTP/2 in C";
     license = licenses.mit;
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index 514dcd5972a..da4dc9d6bbc 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -5,8 +5,17 @@
 , gperftools ? null, leveldb ? null
 }:
 
-with stdenv;
+with stdenv.lib;
 let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
   optLz4 = shouldUsePkg lz4;
   optSnappy = shouldUsePkg snappy;
   optZlib = shouldUsePkg zlib;
@@ -15,7 +24,6 @@ let
   optGperftools = shouldUsePkg gperftools;
   optLeveldb = shouldUsePkg leveldb;
 in
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "wiredtiger-${version}";
   version = "2.6.0";
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index adddd3ac211..47511cf58b0 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -9,9 +9,10 @@
 , prefix ? ""
 }:
 
-with stdenv;
 with stdenv.lib;
 let
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
   libOnly = prefix == "lib";
 
   optDbus = shouldUsePkg dbus;
diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix
index 343c3af9cee..1c5c78548f5 100644
--- a/pkgs/misc/jackaudio/jack1.nix
+++ b/pkgs/misc/jackaudio/jack1.nix
@@ -4,8 +4,9 @@
 , alsaLib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null
 }:
 
-with stdenv;
 let
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
   optAlsaLib = shouldUsePkg alsaLib;
   optDb = shouldUsePkg db;
   optLibuuid = shouldUsePkg libuuid;
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 49a7d820a1c..b0f545b2171 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -9,8 +9,10 @@
 , prefix ? ""
 }:
 
-with stdenv;
 let
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
   libOnly = prefix == "lib";
 
   optLibjack2 = shouldUsePkg libjack2;
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 3930c45a097..8196caa08d9 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -15,8 +15,16 @@
 , prefix ? ""
 }:
 
-with stdenv;
 let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
   libOnly = prefix == "lib";
 
   hasXlibs = xlibs != null;
@@ -58,7 +66,6 @@ let
     simple = null;
   }.${databaseName};
 in
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "${prefix}pulseaudio-${version}";
   version = "6.0";
@@ -77,9 +84,9 @@ stdenv.mkDerivation rec {
     optLibcap valgrind optOss optCoreaudio optAlsaLib optEsound optGlib
     optGtk3 optGconf optAvahi optLibjack2 optLibasyncns optLirc optDbus optUdev
     optOpenssl optFftw optSpeexdsp optSystemd optWebrtc-audio-processing
-  ] ++ optionals hasXlibs (with xlibs; [
+  ] ++ stdenv.lib.optionals hasXlibs (with xlibs; [
       libX11 libxcb libICE libSM libXtst xextproto libXi
-    ]) ++ optionals (optBluez5 != null) [ optBluez5 optSbc ];
+    ]) ++ stdenv.lib.optionals (optBluez5 != null) [ optBluez5 optSbc ];
 
   preConfigure = ''
     # Performs and autoreconf
@@ -155,7 +162,7 @@ stdenv.mkDerivation rec {
   # the alternative is to copy the files from /usr/include to src, but there are
   # probably a large number of files that would need to be copied (I stopped
   # after the seventh)
-  NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
     "-I/usr/include";
 
   installFlags = [
@@ -163,11 +170,11 @@ stdenv.mkDerivation rec {
     "pulseconfdir=$(out)/etc/pulse"
   ];
 
-  postInstall = optionalString libOnly ''
+  postInstall = stdenv.lib.optionalString libOnly ''
     rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Sound server for POSIX and Win32 systems";
     homepage    = http://www.pulseaudio.org/;
     # Note: Practically, the server is under the GPL due to the
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index bc4e57ba116..a97e6847a45 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -5,8 +5,16 @@
 , pam ? null, libidn ? null, gnutls ? null
 }:
 
-with stdenv;
 let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
   optPam = shouldUsePkg pam;
   optLibidn = shouldUsePkg libidn;
   optGnutls = shouldUsePkg gnutls;
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index cca89487462..863acc31a61 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -232,8 +232,6 @@ let
            || system == "armv7l-linux";
       isBigEndian = system == "powerpc-linux";
 
-      shouldUsePkg = lib.shouldUsePkgSystem system;
-
       # Whether we should run paxctl to pax-mark binaries.
       needsPax = isLinux;
 
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 8a101e9845a..ad2c9ec6897 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -8,12 +8,19 @@
 , suffix ? ""
 }:
 
-with stdenv;
-with stdenv.lib;
 let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
   isLight = suffix == "light";
   isFull = suffix == "full";
-  nameSuffix = optionalString (suffix != "") "-${suffix}";
+  nameSuffix = stdenv.lib.optionalString (suffix != "") "-${suffix}";
 
   # Normal Depedencies
   optZlib = if isLight then null else shouldUsePkg zlib;
@@ -28,6 +35,7 @@ let
   optOpenldap = if !isFull then null else shouldUsePkg openldap;
   optLibidn = if !isFull then null else shouldUsePkg libidn;
 in
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "curl${nameSuffix}-${version}";
   version = "7.42.1";

From 98a4eabd99782484a3df73554bccc4a36af80bb4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 20:55:53 +0200
Subject: [PATCH 0699/2322] Revert "qemu: 2.2.2 -> 2.3.0"

This reverts commit 19c259161b987fcb5e1c3b7a87c746372ce017ee.
---
 .../virtualization/qemu/default.nix           | 252 ++++--------------
 pkgs/development/libraries/attr/default.nix   |   3 +-
 pkgs/development/libraries/mesa/default.nix   |   6 +-
 pkgs/development/libraries/nspr/default.nix   |   3 +-
 pkgs/development/libraries/nss/default.nix    |   3 +-
 pkgs/tools/networking/vde2/default.nix        |   3 +-
 pkgs/top-level/all-packages.nix               |  11 +-
 7 files changed, 55 insertions(+), 226 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index f9433a1a409..5fc502a5846 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,230 +1,70 @@
-{ stdenv, fetchurl, pkgconfig, libtool, python, perl, texinfo, flex, bison
-, gettext, makeWrapper, glib, zlib, pixman
-
-# Optional Arguments
-, SDL2 ? null, gtk ? null, gnutls ? null, cyrus_sasl ? null, libjpeg ? null
-, libpng ? null, ncurses ? null, curl ? null, libcap ? null, attr ? null
-, bluez ? null, libibverbs ? null, librdmacm ? null, libuuid ? null, vde2 ? null
-, libaio ? null, libcap_ng ? null, spice ? null, spice_protocol ? null
-, libceph ? null, libxfs ? null, nss ? null, nspr ? null, libusb ? null
-, usbredir ? null, mesa ? null, lzo ? null, snappy ? null, bzip2 ? null
-, libseccomp ? null, glusterfs ? null, libssh2 ? null, numactl ? null
-
-# Audio libraries
-, libpulseaudio ? null, alsaLib ? null
-
-# Extra options
-, type ? ""
+{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman
+, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy
+, libseccomp, libaio, libcap_ng, gnutls
+, makeWrapper
+, pulseSupport ? true, libpulseaudio
+, sdlSupport ? true, SDL
+, vncSupport ? true, libjpeg, libpng
+, spiceSupport ? true, spice, spice_protocol, usbredir
+, x86Only ? false
 }:
 
 with stdenv.lib;
 let
-  n = "qemu-2.3.0";
-
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
-  optSDL2 = if type == "nix" then null else shouldUsePkg SDL2;
-  optGtk = if type == "nix" then null else shouldUsePkg gtk;
-  optLibcap = if type == "nix" then null else shouldUsePkg libcap;
-  optAttr = if type == "nix" then null else shouldUsePkg attr;
-  optGnutls = if type == "nix" then null else shouldUsePkg gnutls;
-  optCyrus_sasl = if type == "nix" then null else shouldUsePkg cyrus_sasl;
-  optLibjpeg = if type == "nix" then null else shouldUsePkg libjpeg;
-  optLibpng = if type == "nix" then null else shouldUsePkg libpng;
-  optNcurses = if type == "nix" then null else shouldUsePkg ncurses;
-  optCurl = if type == "nix" then null else shouldUsePkg curl;
-  optBluez = if type == "nix" then null else shouldUsePkg bluez;
-  optLibibverbs = if type == "nix" then null else shouldUsePkg libibverbs;
-  optLibrdmacm = if type == "nix" then null else shouldUsePkg librdmacm;
-  optLibuuid = if type == "nix" then null else shouldUsePkg libuuid;
-  optVde2 = if type == "nix" then null else shouldUsePkg vde2;
-  optLibaio = shouldUsePkg libaio;
-  optLibcap_ng = shouldUsePkg libcap_ng;
-  optSpice = if type == "nix" then null else shouldUsePkg spice;
-  optSpice_protocol = if type == "nix" then null else shouldUsePkg spice_protocol;
-  optLibceph = if type == "nix" then null else shouldUsePkg libceph;
-  optLibxfs = if type == "nix" then null else shouldUsePkg libxfs;
-  optNss = if type == "nix" then null else shouldUsePkg nss;
-  optNspr = if type == "nix" then null else shouldUsePkg nspr;
-  optLibusb = if type == "nix" then null else shouldUsePkg libusb;
-  optUsbredir = if type == "nix" then null else shouldUsePkg usbredir;
-  optMesa = if type == "nix" then null else shouldUsePkg mesa;
-  optLzo = if type == "nix" then null else shouldUsePkg lzo;
-  optSnappy = if type == "nix" then null else shouldUsePkg snappy;
-  optBzip2 = if type == "nix" then null else shouldUsePkg bzip2;
-  optLibseccomp = if type == "nix" then null else shouldUsePkg libseccomp;
-  optGlusterfs = if type == "nix" then null else shouldUsePkg glusterfs;
-  optLibssh2 = if type == "nix" then null else shouldUsePkg libssh2;
-  optNumactl = if type == "nix" then null else shouldUsePkg numactl;
-
-  hasSDLAbi = if optSDL2 != null then true else null;
-
-  hasVirtfs = stdenv.isLinux && optLibcap != null && optAttr != null;
-
-  hasVnc = type != "nix";
-  hasVncTls = hasVnc && optGnutls != null;
-  hasVncSasl = hasVnc && optCyrus_sasl != null;
-  hasVncJpeg = hasVnc && optLibjpeg != null;
-  hasVncPng = hasVnc && optLibpng != null;
-  hasVncWs = hasVnc && optGnutls != null;
-
-  hasFdt = type != "nix";
-
-  hasRdma = optLibibverbs != null && optLibrdmacm != null;
-
-  hasLinuxAio = stdenv.isLinux && optLibaio != null;
-
-  hasSpice = optSpice != null && optSpice_protocol != null;
-
-  hasNss = optNss != null && optNspr != null;
-
-  optLibpulseaudio = if type == "nix" then null else shouldUsePkg libpulseaudio;
-  optAlsaLib = if type == "nix" then null else shouldUsePkg alsaLib;
-  audio = concatStringsSep "," (
-       optional (optSDL2 != null) "sdl"
-    ++ optional (optLibpulseaudio != null) "pa"
-    ++ optional (optAlsaLib != null) "alsa"
-  );
-
-  systemBinary = if stdenv.system == "x86_64-linux" then "x86_64"
-    else if stdenv.system == "i686-linux" then "i386"
-    else null;
-
-  targetList = if stdenv.system == "x86_64-linux" then "x86_64-softmmu,i386-softmmu"
-    else if stdenv.system == "i686-linux" then "i386-softmmu"
-    else null;
+  n = "qemu-2.2.1";
+  audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
+    + optionalString pulseSupport "pa,"
+    + optionalString sdlSupport "sdl,";
 in
 
 stdenv.mkDerivation rec {
-  name = "${n}${optionalString (type != null && type != "") "-${type}"}";
+  name = n + (if x86Only then "-x86-only" else "");
 
   src = fetchurl {
     url = "http://wiki.qemu.org/download/${n}.tar.bz2";
-    sha256 = "120m53c3p28qxmfzllicjzr8syjv6v4d9rsyrgkp7gnmcgvvgfmn";
+    sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6";
   };
 
-  nativeBuildInputs = [ pkgconfig libtool perl texinfo flex bison gettext makeWrapper ];
-
-  buildInputs = [
-    python glib zlib pixman optSDL2 optGtk optNcurses optCurl optBluez optVde2
-    optLibcap_ng optAttr optLibuuid optLibceph optLibxfs optLibusb optUsbredir
-    optMesa optLzo optSnappy optBzip2 optLibseccomp optGlusterfs optLibssh2
-    optNumactl optLibpulseaudio optAlsaLib
-  ] ++ optionals (hasVncTls || hasVncWs) [
-    optGnutls
-  ] ++ optionals hasVncSasl [
-    optCyrus_sasl
-  ] ++ optionals hasVncJpeg [
-    optLibjpeg
-  ] ++ optionals hasVncPng [
-    optLibpng
-  ] ++ optionals hasVirtfs [
-    optLibcap
-  ] ++ optionals hasRdma [
-    optLibibverbs optLibrdmacm
-  ] ++ optionals hasLinuxAio [
-    optLibaio
-  ] ++ optionals hasSpice [
-    optSpice optSpice_protocol
-  ] ++ optionals hasNss [
-    optNss optNspr
-  ];
+  buildInputs =
+    [ python zlib pkgconfig glib ncurses perl pixman attr libcap
+      vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp
+      libcap_ng gnutls
+    ]
+    ++ optionals pulseSupport [ libpulseaudio ]
+    ++ optionals sdlSupport [ SDL ]
+    ++ optionals vncSupport [ libjpeg libpng ]
+    ++ optionals spiceSupport [ spice_protocol spice usbredir ]
+    ++ optionals (hasSuffix "linux" stdenv.system) [ alsaLib libaio ];
 
   enableParallelBuilding = true;
 
-  configureFlags = [
-    (mkOther                          "smbd"                "smbd")
-    (mkOther                          "sysconfdir"          "/etc")
-    (mkOther                          "localstatedir"       "/var")
-    (mkEnable true                    "modules"             null)
-    (mkEnable false                   "debug-tcg"           null)
-    (mkEnable false                   "debug-info"          null)
-    (mkEnable false                   "sparse"              null)
-    (mkEnable false                   "werror"              null)
-    (mkEnable (optSDL2 != null)       "sdl"                 null)
-    (mkWith   hasSDLAbi               "sdlabi"              "2.0")
-    (mkEnable (optGtk != null)        "gtk"                 null)
-    (mkEnable hasVirtfs               "virtfs"              null)
-    (mkEnable hasVnc                  "vnc"                 null)
-    (mkEnable stdenv.isDarwin         "cocoa"               null)
-    (mkOther                          "audio-drv-list"      audio)
-    (mkEnable false                   "xen"                 null)
-    (mkEnable false                   "xen-pci-passthrough" null)
-    (mkEnable false                   "brlapi"              null)
-    (mkEnable hasVncTls               "vnc-tls"             null)
-    (mkEnable hasVncSasl              "vnc-sasl"            null)
-    (mkEnable hasVncJpeg              "vnc-jpeg"            null)
-    (mkEnable hasVncPng               "vnc-png"             null)
-    (mkEnable hasVncWs                "vnc-ws"              null)
-    (mkEnable (optNcurses != null)    "curses"              null)
-    (mkEnable (optCurl != null)       "curl"                null)
-    (mkEnable hasFdt                  "fdt"                 null)
-    (mkEnable (optBluez != null)      "bluez"               null)
-    (mkEnable stdenv.isLinux          "kvm"                 null)
-    (mkEnable hasRdma                 "rdma"                null)
-    (mkEnable (type != "nix")         "system"              null)
-    (mkEnable (type != "kvm-only")    "user"                null)
-    (mkEnable (type != "kvm-only")    "guest-base"          null)
-    (mkEnable true                    "pie"                 null)
-    (mkEnable (optLibuuid != null)    "uuid"                null)
-    (mkEnable (optVde2 != null)       "vde"                 null)
-    (mkEnable false                   "netmap"              null)  # TODO(wkennington): Add Support
-    (mkEnable hasLinuxAio             "linux-aio"           null)
-    (mkEnable (optLibcap_ng != null)  "cap-ng"              null)
-    (mkEnable (optAttr != null)       "attr"                null)
-    (mkEnable (type != "nix")         "docs"                null)
-    (mkEnable stdenv.isLinux          "vhost-net"           null)
-    (mkEnable hasSpice                "spice"               null)
-    (mkEnable (optLibceph != null)    "rbd"                 null)
-    (mkEnable false                   "libiscsi"            null)  # TODO(wkennington): Add support
-    (mkEnable false                   "libnfs"              null)  # TODO(wkennington): Add support
-    (mkEnable (optLibxfs != null)     "xfsctl"              null)
-    (mkEnable hasNss                  "smartcard-nss"       null)
-    (mkEnable (optLibusb != null)     "libusb"              null)
-    (mkEnable (optUsbredir != null)   "usb-redir"           null)
-    (mkEnable (optMesa != null)       "opengl"              null)
-    (mkEnable (optLzo != null)        "lzo"                 null)
-    (mkEnable (optSnappy != null)     "snappy"              null)
-    (mkEnable (optBzip2 != null)      "bzip2"               null)
-    (mkEnable true                    "guest-agent"         null)
-    (mkEnable (optLibseccomp != null) "seccomp"             null)
-    (mkEnable (optGlusterfs != null)  "glusterfs"           null)
-    (mkEnable false                   "archipelago"         null)
-    (mkEnable true                    "tpm"                 null)
-    (mkEnable (optLibssh2 != null)    "libssh2"             null)
-    (mkEnable (optLibuuid != null)    "vhdx"                null)
-    (mkEnable (optGnutls != null)     "quorum"              null)
-    (mkEnable (optNumactl != null)    "numa"                null)
-  ] ++ optionals (type == "kvm-only") [
-    (mkOther                          "target-list"         targetList)
-  ];
+  patches = [ ./no-etc-install.patch ];
 
-  installFlags = [
-    "sysconfdir=\${out}/etc"
-    "qemu_confdir=\${out}/etc/qemu"
-    "qemu_localstatedir=\${TMPDIR}"
-  ];
+  configureFlags =
+    [ "--enable-seccomp"
+      "--smbd=smbd" # use `smbd' from $PATH
+      "--audio-drv-list=${audio}"
+      "--sysconfdir=/etc"
+      "--localstatedir=/var"
+    ]
+    ++ optional spiceSupport "--enable-spice"
+    ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu"
+    ++ optional (hasSuffix "linux" stdenv.system) "--enable-linux-aio";
 
-  postInstall = optionalString (systemBinary != null) ''
-    # Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
-    p="$out/bin/qemu-system-${systemBinary}"
-    if [ -e "$p" ]; then
-      makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"
-    fi
-  '';
+  postInstall =
+    ''
+      # Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
+      p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}"
+      if [ -e "$p" ]; then
+        makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"
+      fi
+    '';
 
   meta = with stdenv.lib; {
     homepage = http://www.qemu.org/;
     description = "A generic and open source machine emulator and virtualizer";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ viric shlevy eelco wkennington ];
-    platforms = if type == "kvm-only" then platforms.linux else platforms.all;
+    maintainers = with maintainers; [ viric shlevy eelco ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix
index 75dd10d8caa..8d87e2ee50d 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/pkgs/development/libraries/attr/default.nix
@@ -14,9 +14,8 @@ stdenv.mkDerivation rec {
 
   installTargets = "install install-lib install-dev";
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = http://savannah.nongnu.org/projects/attr/;
     description = "Library and tools for manipulating extended attributes";
-    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index e444264b3a8..8364cab7623 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -182,11 +182,11 @@ stdenv.mkDerivation {
 
   passthru = { inherit libdrm version driverLink; };
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "An open source implementation of OpenGL";
     homepage = http://www.mesa3d.org/;
     license = "bsd";
-    platforms = platforms.mesaPlatforms;
-    maintainers = with maintainers; [ eduarrrd simons vcunat ];
+    platforms = stdenv.lib.platforms.mesaPlatforms;
+    maintainers = with stdenv.lib.maintainers; [ eduarrrd simons vcunat ];
   };
 }
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index dd508d68748..1494092fc47 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -21,9 +21,8 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = http://www.mozilla.org/projects/nspr/;
     description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions";
-    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 037ab3c03c0..f8822c9d0a4 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -79,9 +79,8 @@ in stdenv.mkDerivation rec {
     find $out/bin -type f \( -name nss-config -o -delete \)
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = https://developer.mozilla.org/en-US/docs/NSS;
     description = "A set of libraries for development of security-enabled client and server applications";
-    platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix
index 282b6666aa4..72a31262e26 100644
--- a/pkgs/tools/networking/vde2/default.nix
+++ b/pkgs/tools/networking/vde2/default.nix
@@ -10,9 +10,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl libpcap python ];
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = http://vde.sourceforge.net/;
     description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network";
-    platforms = platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcc861b5d4d..7162549565f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9896,7 +9896,7 @@ let
 
   watch = callPackage ../os-specific/linux/procps/watch.nix { };
 
-  qemu_kvm = lowPrio (qemu.override { type = "kvm-only"; });
+  qemu_kvm = lowPrio (qemu.override { x86Only = true; });
 
   firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { };
 
@@ -12144,14 +12144,7 @@ let
 
   eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; };
 
-  qemu = callPackage ../applications/virtualization/qemu {
-    gtk = gtk3;
-    bluez = bluez5;
-    libusb = libusb1;
-    mesa = mesa_noglu;
-  };
-
-  qemu-nix = qemu.override { type = "nix"; };
+  qemu = callPackage ../applications/virtualization/qemu { };
 
   qjackctl = callPackage ../applications/audio/qjackctl { };
 

From 80ebb879cd32e5a0ca8f5321a494bbea9612be1a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 20:57:15 +0200
Subject: [PATCH 0700/2322] Revert "e2fsprogs: 1.14.12 -> 1.14.13"

This reverts commit 3f4f90b58ba4d09352111c98a3e99019673ff64f.
---
 pkgs/tools/filesystems/e2fsprogs/default.nix | 66 +++++---------------
 1 file changed, 17 insertions(+), 49 deletions(-)

diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index c4b44b824f0..7617e82f1a8 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,66 +1,34 @@
-{ stdenv, fetchurl, pkgconfig
+{ stdenv, fetchurl, pkgconfig, libuuid }:
 
-# Optional Dependencies
-, libuuid
-}:
-
-with stdenv;
-let
-  optLibuuid = shouldUsePkg libuuid;
-in
-with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "e2fsprogs-1.42.13";
+  name = "e2fsprogs-1.42.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
-    sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar";
+    sha256 = "0v0qcfyls0dlrjy8gx9m3s2wbkp5z3lbsr5hb7x8kp8f3bclcy71";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ optLibuuid ];
+  buildInputs = [ pkgconfig libuuid ];
 
-  configureFlags = [
-    (mkEnable true                 "symlink-install"           null)
-    (mkEnable true                 "relative-symlinks"         null)
-    (mkEnable true                 "symlink-relative-symlinks" null)
-    (mkEnable false                "compression"               null)
-    (mkEnable true                 "htree"                     null)
-    (mkEnable true                 "elf-shlibs"                null)
-    (mkEnable false                "profile"                   null)
-    (mkEnable false                "gcov"                      null)
-    (mkEnable false                "jbd-debug"                 null)
-    (mkEnable false                "blkid-debug"               null)
-    (mkEnable false                "testio-debug"              null)
-    (mkEnable (optLibuuid == null) "libuuid"                   null)
-    (mkEnable (optLibuuid == null) "libblkid"                  null)
-    (mkEnable true                 "quota"                     null)
-    (mkEnable false                "backtrace"                 null)
-    (mkEnable false                "debugfs"                   null)
-    (mkEnable true                 "imager"                    null)
-    (mkEnable true                 "resizer"                   null)
-    (mkEnable true                 "defrag"                    null)
-    (mkEnable true                 "fsck"                      null)
-    (mkEnable false                "e2initrd-helper"           null)
-    (mkEnable true                 "tls"                       null)
-    (mkEnable false                 "uuidd"                    null)  # Build is broken in 1.42.13
-  ];
+  crossAttrs = {
+    preConfigure = ''
+      export CC=$crossConfig-gcc
+    '';
+  };
+
+  # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency).
+  configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck --enable-symlink-install";
 
   enableParallelBuilding = true;
 
-  installFlags = [
-    "LN=ln -s"
-  ];
+  preInstall = "installFlagsArray=('LN=ln -s')";
 
-  postInstall = ''
-    make install-libs
-  '';
+  postInstall = "make install-libs";
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = http://e2fsprogs.sourceforge.net/;
     description = "Tools for creating and checking ext2/ext3/ext4 filesystems";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ eelco wkennington ];
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }

From b5dea5c86a67593c6618f08429ec7c81c16622c2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:01:53 +0200
Subject: [PATCH 0701/2322] Fix wayland

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

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 00061e79fa5..16d2298279b 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchurl, pkgconfig
 , libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto
 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
 }:
@@ -6,7 +6,6 @@
 # Require the optional to be enabled until upstream fixes or removes the configure flag
 assert expat != null;
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "wayland-${version}";
   version = "1.7.0";
@@ -16,9 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "173w0pqzk2m7hjlg15bymrx7ynxgq1ciadg03hzybxwnvfi4gsmx";
   };
 
-  configureFlags = [
-    (mkEnable (expat != null) "scanner" null)
-  ];
+  configureFlags = "--with-scanner";
 
   nativeBuildInputs = [ pkgconfig ];
 
@@ -27,9 +24,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Reference implementation of the wayland protocol";
     homepage    = http://wayland.freedesktop.org/;
-    license     = licenses.mit;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ codyopel wkennington ];
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ codyopel wkennington ];
   };
 
   passthru.version = version;

From c449f292d2f3ff48432c367f0109346cab480225 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:03:32 +0200
Subject: [PATCH 0702/2322] Revert "krb5: Make lib build parallel"

This reverts commit ac2f05a50ae5113cbdd7e66599ff54b728ae10e4.
---
 pkgs/development/libraries/kerberos/krb5.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index c4974c51e81..6d3d8eec58f 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -97,19 +97,19 @@ stdenv.mkDerivation rec {
   ];
 
   buildPhase = optionalString libOnly ''
-    (cd util; make -j $NIX_BUILD_CORES)
-    (cd include; make -j $NIX_BUILD_CORES)
-    (cd lib; make -j $NIX_BUILD_CORES)
-    (cd build-tools; make -j $NIX_BUILD_CORES)
+    (cd util; make)
+    (cd include; make)
+    (cd lib; make)
+    (cd build-tools; make)
   '';
 
   installPhase = optionalString libOnly ''
     mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}}
 
-    (cd util; make -j $NIX_BUILD_CORES install)
-    (cd include; make -j $NIX_BUILD_CORES install)
-    (cd lib; make -j $NIX_BUILD_CORES install)
-    (cd build-tools; make -j $NIX_BUILD_CORES install)
+    (cd util; make install)
+    (cd include; make install)
+    (cd lib; make install)
+    (cd build-tools; make install)
 
     rm -rf $out/{sbin,share}
     find $out/bin -type f | grep -v 'krb5-config' | xargs rm

From 1b32ae03f3be8c5233ddd7f7d7db2db6ef4d2f18 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:03:44 +0200
Subject: [PATCH 0703/2322] Revert "krb5: Fixes"

This reverts commit a74e4863f351e4cd2e0ec487b24cb3d1a91ccb9d.
---
 pkgs/development/libraries/kerberos/krb5.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 6d3d8eec58f..c60ff03aa67 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -3,7 +3,7 @@
 
 # Optional Dependencies
 , libedit ? null, readline ? null, ncurses ? null, libverto ? null
-, openldap ? null
+, openldap ? null, db ? null
 
 # Crypto Dependencies
 , openssl ? null, nss ? null, nspr ? null
@@ -24,6 +24,7 @@ let
   optNcurses = if libOnly then null else shouldUsePkg ncurses;
   optLibverto = shouldUsePkg libverto;
   optOpenldap = if libOnly then null else shouldUsePkg openldap;
+  optDb = if libOnly then null else shouldUsePkg db;
 
   # Prefer the openssl implementation
   cryptoStr = if optOpenssl != null then "openssl"
@@ -93,7 +94,7 @@ stdenv.mkDerivation rec {
     (mkWith   (optLibverto != null)         "system-verto"        null)
     (mkWith   (optOpenldap != null)         "ldap"                null)
     (mkWith   false                         "tcl"                 null)
-    (mkWith   false                         "system-db"           null)  # Requires db v1.85
+    (mkWith   (optDb != null)               "system-db"           null)
   ];
 
   buildPhase = optionalString libOnly ''
@@ -105,14 +106,11 @@ stdenv.mkDerivation rec {
 
   installPhase = optionalString libOnly ''
     mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}}
-
     (cd util; make install)
     (cd include; make install)
     (cd lib; make install)
     (cd build-tools; make install)
-
-    rm -rf $out/{sbin,share}
-    find $out/bin -type f | grep -v 'krb5-config' | xargs rm
+    rm -rf $out/{bin,sbin,share}
   '';
 
   enableParallelBuilding = true;

From 1e6e52c2ac0549560f6ca0c11a4dc370e100c4e0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:09:42 +0200
Subject: [PATCH 0704/2322] Revert "krb5: 1.13.1 -> 1.13.2"

This reverts commit 85932bc5a998060e76090273b51d35133a7a2dbb.
---
 .../core/gnome-control-center/default.nix     |   4 +-
 pkgs/development/compilers/hhvm/default.nix   |   4 +-
 pkgs/development/libraries/kerberos/krb5.nix  | 120 +++---------------
 pkgs/development/libraries/ti-rpc/default.nix |   4 +-
 pkgs/tools/system/rsyslog/default.nix         |   6 +-
 pkgs/top-level/all-packages.nix               |   3 -
 6 files changed, 26 insertions(+), 115 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
index 0c676c38efa..e2ec96b5469 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -2,7 +2,7 @@
 , libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio, fontconfig
 , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
-, cracklib, python, libkrb5, networkmanagerapplet, networkmanager
+, cracklib, python, krb5, networkmanagerapplet, networkmanager
 , libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev
 , docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
       libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
       gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality
-      accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
+      accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile
       shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
       gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
       gnome3.vino udev libcanberra_gtk3
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index a5586117588..72bdabb4349 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached, pcre
 , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c
-, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
+, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, krb5
 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
 , libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit
 , libvpx, imagemagick, fribidi
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb git perl
       libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
       oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
-      libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5
+      libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml krb5
       gmp libyaml libedit libvpx imagemagick fribidi
     ];
 
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index c60ff03aa67..41c570ee554 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -1,127 +1,41 @@
-{ stdenv, fetchurl, pkgconfig, perl
-, yacc, bootstrap_cmds
+{ stdenv, fetchurl, pkgconfig, perl, ncurses, yacc, openssl, openldap, bootstrap_cmds }:
 
-# Optional Dependencies
-, libedit ? null, readline ? null, ncurses ? null, libverto ? null
-, openldap ? null, db ? null
-
-# Crypto Dependencies
-, openssl ? null, nss ? null, nspr ? null
-
-# Extra Arguments
-, prefix ? ""
-}:
-
-with stdenv;
 let
-  libOnly = prefix == "lib";
-
-  optOpenssl = shouldUsePkg openssl;
-  optNss = shouldUsePkg nss;
-  optNspr = shouldUsePkg nspr;
-  optLibedit = if libOnly then null else shouldUsePkg libedit;
-  optReadline = if libOnly then null else shouldUsePkg readline;
-  optNcurses = if libOnly then null else shouldUsePkg ncurses;
-  optLibverto = shouldUsePkg libverto;
-  optOpenldap = if libOnly then null else shouldUsePkg openldap;
-  optDb = if libOnly then null else shouldUsePkg db;
-
-  # Prefer the openssl implementation
-  cryptoStr = if optOpenssl != null then "openssl"
-    else if optNss != null && optNspr != null then "nss"
-    else "builtin";
-
-  cryptoInputs = {
-    "openssl" = [ optOpenssl ];
-    "nss" = [ optNss optNspr ];
-    "builtin" = [ ];
-  }.${cryptoStr};
-
-  tlsStr = if optOpenssl != null then "openssl"
-    else "no";
-
-  tlsInputs = {
-    "openssl" = [ optOpenssl ];
-    "no" = [ ];
-  }.${tlsStr};
-
-  # Libedit is less buggy in krb5, readline breaks tests
-  lineParserStr = if optLibedit != null then "libedit"
-    else if optReadline != null && optNcurses != null then "readline"
-    else "no";
-
-  lineParserInputs = {
-    "libedit" = [ optLibedit ];
-    "readline" = [ optReadline optNcurses ];
-    "no" = [ ];
-  }.${lineParserStr};
+  pname = "krb5";
+  version = "1.13.1";
+  name = "${pname}-${version}";
+  webpage = http://web.mit.edu/kerberos/;
 in
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  name = "${prefix}krb5-${version}";
-  version = "1.13.2";
+
+stdenv.mkDerivation (rec {
+  inherit name;
 
   src = fetchurl {
-    url = "${meta.homepage}dist/krb5/1.13/krb5-${version}-signed.tar";
-    sha256 = "1qbdzyrws7d0q4filsibh28z54pd5l987jr0ygv43iq9085w6a75";
+    url = "${webpage}dist/krb5/1.13/${name}-signed.tar";
+    sha256 = "0gk6jvr64rf6l4xcyxn8i3fr5d1j7dhqvwyv3vw2qdkzz7yjkxjd";
   };
 
-  nativeBuildInputs = [ pkgconfig perl ];
-  buildInputs = [ yacc optOpenssl optLibverto optOpenldap ]
-    ++ cryptoInputs ++ tlsInputs ++ lineParserInputs
+  buildInputs = [ pkgconfig perl ncurses yacc openssl openldap ]
     # Provides the mig command used by the build scripts
-    ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds;
+    ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds ;
 
   unpackPhase = ''
     tar -xf $src
-    tar -xzf krb5-${version}.tar.gz
-    cd krb5-${version}/src
+    tar -xzf ${name}.tar.gz
+    cd ${name}/src
   '';
 
-  configureFlags = [
-    (mkOther                                "sysconfdir"          "/etc")
-    (mkOther                                "localstatedir"       "/var")
-    (mkEnable false                         "athena"              null)
-    (mkWith   false                         "vague-errors"        null)
-    (mkWith   true                          "crypto-impl"         cryptoStr)
-    (mkWith   true                          "pkinit-crypto-impl"  cryptoStr)
-    (mkWith   true                          "tls-impl"            tlsStr)
-    (mkEnable true                          "aesni"               null)
-    (mkEnable true                          "kdc-lookaside-cache" null)
-    (mkEnable (optOpenssl != null)          "pkinit"              null)
-    (mkWith   (lineParserStr == "libedit")  "libedit"             null)
-    (mkWith   (lineParserStr == "readline") "readline"            null)
-    (mkWith   (optLibverto != null)         "system-verto"        null)
-    (mkWith   (optOpenldap != null)         "ldap"                null)
-    (mkWith   false                         "tcl"                 null)
-    (mkWith   (optDb != null)               "system-db"           null)
-  ];
-
-  buildPhase = optionalString libOnly ''
-    (cd util; make)
-    (cd include; make)
-    (cd lib; make)
-    (cd build-tools; make)
-  '';
-
-  installPhase = optionalString libOnly ''
-    mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}}
-    (cd util; make install)
-    (cd include; make install)
-    (cd lib; make install)
-    (cd build-tools; make install)
-    rm -rf $out/{bin,sbin,share}
-  '';
+  configureFlags = [ "--with-tcl=no" ];
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://web.mit.edu/kerberos/;
     description = "MIT Kerberos 5";
+    homepage = webpage;
     license = "MPL";
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
   };
 
   passthru.implementation = "krb5";
-}
+})
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index eb795d6b28e..b135e49f52b 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libkrb5 }:
+{ fetchurl, stdenv, krb5 }:
 
 stdenv.mkDerivation rec {
   name = "libtirpc-0.3.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "07d1wlfzf3ia09mjn3f3ay8isk7yx4a6ckfkzx5khnqlc7amkzna";
   };
 
-  propagatedBuildInputs = [ libkrb5 ];
+  propagatedBuildInputs = [ krb5 ];
 
   # http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf
   preConfigure = ''
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index e8abe0ef0d0..195e6bc4329 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libestr, json_c, zlib, pythonPackages
-, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null
+, krb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null
 , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null
 , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null
 , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig libestr json_c zlib pythonPackages.docutils
-    libkrb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls
+    krb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls
     libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka
     libmongo-client czmq rabbitmq-c hiredis
   ] ++ stdenv.lib.optional stdenv.isLinux systemd;
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     (mkWith   true                      "systemdsystemunitdir" "\${out}/etc/systemd/system")
     (mkEnable true                      "largefile"            null)
     (mkEnable true                      "regexp"               null)
-    (mkEnable (libkrb5 != null)         "gssapi-krb5"          null)
+    (mkEnable (krb5 != null)            "gssapi-krb5"          null)
     (mkEnable true                      "klog"                 null)
     (mkEnable true                      "kmsg"                 null)
     (mkEnable (systemd != null)         "imjournal"            null)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7162549565f..3bc4b6d11c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6503,9 +6503,6 @@ let
     };
     inherit (darwin) bootstrap_cmds;
   };
-  libkrb5 = krb5.override {
-    prefix = "lib";
-  };
 
   LASzip = callPackage ../development/libraries/LASzip { };
 

From aa2a0ff1d8899586b9d7d04d1f159640192b237d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:12:16 +0200
Subject: [PATCH 0705/2322] Revert "postgres: Fix maintainers"

This reverts commit e8392bb33f087912d6602b239fa836b05741c9b8.
---
 pkgs/servers/sql/postgresql/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index ded9247f42a..f8d1ad0a475 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
     license = licenses.postgresql;
-    maintainers = with maintainers; [ ocharles wkennington ];
+    maintainers = with maintaiers; [ ocharles wkennington ];
     platforms = platforms.unix;
     hydraPlatforms = platforms.linux;
   };

From c82da1ece689bfb6f18d8019ef0e64c67590c6b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:12:25 +0200
Subject: [PATCH 0706/2322] Revert "postgresql: 9.4.1 -> 9.4.2"

This reverts commit 6775c0696f9e8b2c148f9be382f30bce7a4ec4a0.
---
 pkgs/servers/sql/postgresql/9.4.x.nix   | 47 +++++++++++++++++++++----
 pkgs/servers/sql/postgresql/generic.nix |  8 ++---
 2 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix
index 0d8b573dcc5..73f416912a2 100644
--- a/pkgs/servers/sql/postgresql/9.4.x.nix
+++ b/pkgs/servers/sql/postgresql/9.4.x.nix
@@ -1,11 +1,44 @@
-{ callPackage, fetchurl, ... } @ args:
+{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl }:
 
-callPackage ./generic.nix (args // rec {
-  psqlSchema = "9.4";
-  version = "${psqlSchema}.2";
+with stdenv.lib;
+
+let version = "9.4.1"; in
+
+stdenv.mkDerivation rec {
+  name = "postgresql-${version}";
 
   src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
-    sha256 = "04adpfg2f7ip96rh3jjygx5cpgasrrp1dl2wswjivfk5q68s3zc1";
+    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+    sha256 = "19n3i14bhmw8dacd2kl3n1wzj362qv3fjmal5vsvi580h9ybgp99";
   };
-})
+
+  buildInputs = [ zlib readline openssl ]
+                ++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
+
+  enableParallelBuilding = true;
+
+  makeFlags = [ "world" ];
+
+  configureFlags = [ "--with-openssl" ]
+                   ++ optional (!stdenv.isDarwin) "--with-ossp-uuid";
+
+  patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ];
+
+  installTargets = [ "install-world" ];
+
+  LC_ALL = "C";
+
+  passthru = {
+    inherit readline;
+    psqlSchema = "9.4";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://www.postgresql.org/;
+    description = "A powerful, open source object-relational database system";
+    license = licenses.postgresql;
+    maintainers = with maintaiers; [ ocharles ];
+    platforms = platforms.unix;
+    hydraPlatforms = platforms.linux;
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index f8d1ad0a475..88e2b77cf83 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -69,12 +69,14 @@ stdenv.mkDerivation rec {
     (mkWith   false                     "perl"              null)  # Maybe enable some day
     (mkWith   false                     "python"            null)  # Maybe enable some day
     (mkWith   (optKerberos != null)     "gssapi"            null)
+    (mkWith   false                     "krb5"              null)
     (mkWith   (optPam != null)          "pam"               null)
     (mkWith   (optOpenldap != null)     "ldap"              null)
     (mkWith   false                     "bonjour"           null)
     (mkWith   (optOpenssl != null)      "openssl"           null)
     (mkWith   (optReadline != null)     "readline"          null)
     (mkWith   false                     "libedit-preferred" null)
+    (mkWith   (optLibossp_uuid != null) "ossp-uuid"         null)
     (mkWith   (optLibxml2 != null)      "libxml"            null)
     (mkWith   (optLibxslt != null)      "libxslt"           null)
     (mkWith   (optZlib != null)         "zlib"              null)
@@ -82,12 +84,6 @@ stdenv.mkDerivation rec {
     (mkWith   false                     "selinux"           null)
   ] ++ optionals (versionOlder version "9.3.0") [
     (mkEnable true                      "shared"            null)
-  ] ++ optionals (versionAtLeast version "9.4.0") [
-    (mkEnable false                     "tap-tests"         null)
-    (mkWith   (optLibossp_uuid != null) "uuid"              "ossp")
-  ] ++ optionals (versionOlder version "9.4.0") [
-    (mkWith   false                     "krb5"              null)
-    (mkWith   (optLibossp_uuid != null) "ossp-uuid"         null)
   ];
 
   enableParallelBuilding = true;

From f4b5cd8dde3cfc87bc5d344093fb91bc229eadcf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:14:17 +0200
Subject: [PATCH 0707/2322] Revert "postgresql: Fix sha256 for 9.3.7"

This reverts commit adcf1c7a90b48eda3eec707f164c64b38af27e41.
---
 pkgs/servers/sql/postgresql/9.3.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
index fabc6dbc1de..9671c316832 100644
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -6,6 +6,6 @@ callPackage ./generic.nix (args // rec {
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
-    sha256 = "0ggz0i91znv053zx9qas7pjf93s5by3dk84z1jxbjkg8yyrnlx4b";
+    sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw";
   };
 })

From ef5647d7570181ebf936ca3056145e809836428e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:15:43 +0200
Subject: [PATCH 0708/2322] Revert "postgresql: 9.3.6 -> 9.3.7"

This reverts commit 5486c08dc27c5cdc7b251adf6d50d306501ba3b1.
---
 pkgs/servers/sql/postgresql/9.3.x.nix   | 47 +++++++++++++++++++++----
 pkgs/servers/sql/postgresql/generic.nix |  3 +-
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
index 9671c316832..4406aecaa89 100644
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -1,11 +1,44 @@
-{ callPackage, fetchurl, ... } @ args:
+{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl}:
 
-callPackage ./generic.nix (args // rec {
-  psqlSchema = "9.3";
-  version = "${psqlSchema}.7";
+with stdenv.lib;
+
+let version = "9.3.6"; in
+
+stdenv.mkDerivation rec {
+  name = "postgresql-${version}";
 
   src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
-    sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw";
+    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+    sha256 = "056ass7nnfyv7blv02anv795kgpz77gipdpxggd835cdwrhwns13";
   };
-})
+
+  buildInputs = [ zlib readline openssl ]
+                ++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
+
+  enableParallelBuilding = true;
+
+  makeFlags = [ "world" ];
+
+  configureFlags = [ "--with-openssl" ]
+                   ++ optional (!stdenv.isDarwin) "--with-ossp-uuid";
+
+  patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ];
+
+  installTargets = [ "install-world" ];
+
+  LC_ALL = "C";
+
+  passthru = {
+    inherit readline;
+    psqlSchema = "9.3";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://www.postgresql.org/;
+    description = "A powerful, open source object-relational database system";
+    license = licenses.postgresql;
+    maintainers = with maintaiers; [ ocharles ];
+    platforms = platforms.unix;
+    hydraPlatforms = platforms.linux;
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 88e2b77cf83..46d2030224d 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
     (mkEnable true                      "integer-datetimes" null)
     (mkEnable true                      "nls"               null)
     (mkWith   true                      "pgport"            "5432")
+    (mkEnable true                      "shared"            null)
     (mkEnable true                      "rpath"             null)
     (mkEnable true                      "spinlocks"         null)
     (mkEnable false                     "debug"             null)
@@ -82,8 +83,6 @@ stdenv.mkDerivation rec {
     (mkWith   (optZlib != null)         "zlib"              null)
   ] ++ optionals (versionAtLeast version "9.1.0") [
     (mkWith   false                     "selinux"           null)
-  ] ++ optionals (versionOlder version "9.3.0") [
-    (mkEnable true                      "shared"            null)
   ];
 
   enableParallelBuilding = true;

From f1b8931cc9ff6264b80d842a5fea38e1c5122908 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:15:50 +0200
Subject: [PATCH 0709/2322] Revert "postgresql: Consolidate patches"

This reverts commit 7174391e5bff8206025d4c7c7107d11487c534f7.
---
 pkgs/servers/sql/postgresql/8.4.x.nix   |  2 ++
 pkgs/servers/sql/postgresql/9.0.x.nix   |  2 ++
 pkgs/servers/sql/postgresql/9.1.x.nix   |  2 ++
 pkgs/servers/sql/postgresql/9.2.x.nix   |  2 ++
 pkgs/servers/sql/postgresql/generic.nix | 12 ++++--------
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index 0254bbe951d..f946f9fc145 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw";
   };
+
+  patches = [ ./disable-resolve_symlinks.patch ];
 })
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index dba42e4fb11..b2a53bfc4b1 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02";
   };
+
+  patches = [ ./disable-resolve_symlinks.patch ];
 })
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 138bc4a3023..1debe457e1f 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b";
   };
+
+  patches = [ ./disable-resolve_symlinks.patch ];
 })
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index 9517b4e803c..477bb9d2484 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5";
   };
+
+  patches = [ ./disable-resolve_symlinks.patch ];
 })
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 46d2030224d..b7b2e3014ce 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -10,7 +10,7 @@
 , walBlockSizeKB ? 8, walSegmentSizeMB ? 16
 
 # Version specific arguments
-, psqlSchema , version, src
+, psqlSchema , version, src, patches ? [ ]
 , ...
 }:
 
@@ -25,6 +25,8 @@ let
   optLibxml2 = shouldUsePkg libxml2;
   optLibxslt = shouldUsePkg libxslt;
   optZlib = shouldUsePkg zlib;
+
+  patches' = [ ./less-is-more.patch ] ++ patches;
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -32,13 +34,7 @@ stdenv.mkDerivation rec {
 
   inherit src;
 
-  patches = [
-    ./less-is-more.patch
-  ] ++ optionals (versionOlder version "9.4.0") [
-    ./disable-resolve_symlinks.patch
-  ] ++ optionals (versionAtLeast version "9.4.0") [
-    ./disable-resolve_symlinks-94.patch
-  ];
+  patches = patches';
 
   nativeBuildInputs = [ bison flex ];
   buildInputs = [

From bcd9f792da65ecc35a9023124dd564fe915326f1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:16:00 +0200
Subject: [PATCH 0710/2322] Revert "postgresql: Correct propagated readline"

This reverts commit d9efd0676fec01fe0161b882a5f84f23b1c89f87.
---
 pkgs/servers/sql/postgresql/generic.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index b7b2e3014ce..40c5ff660ce 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -93,7 +93,6 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    inherit psqlSchema;
-    readline = optReadline;
+    inherit readline psqlSchema;
   };
 }

From 4d0156025d1c181c373f8278eef4996320fce56f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:16:07 +0200
Subject: [PATCH 0711/2322] Revert "postgresql: 9.2.10 -> 9.2.11"

This reverts commit 601e713bb84a9c4f27a38d7d4595b49301b98dcc.
---
 pkgs/servers/sql/postgresql/8.4.x.nix   |  2 --
 pkgs/servers/sql/postgresql/9.0.x.nix   |  2 --
 pkgs/servers/sql/postgresql/9.1.x.nix   |  2 --
 pkgs/servers/sql/postgresql/9.2.x.nix   | 43 ++++++++++++++++++++-----
 pkgs/servers/sql/postgresql/generic.nix | 10 +++---
 5 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index f946f9fc145..0254bbe951d 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw";
   };
-
-  patches = [ ./disable-resolve_symlinks.patch ];
 })
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index b2a53bfc4b1..dba42e4fb11 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02";
   };
-
-  patches = [ ./disable-resolve_symlinks.patch ];
 })
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 1debe457e1f..138bc4a3023 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
     sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b";
   };
-
-  patches = [ ./disable-resolve_symlinks.patch ];
 })
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index 477bb9d2484..3c21a96e9b2 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -1,13 +1,40 @@
-{ callPackage, fetchurl, ... } @ args:
+{ stdenv, fetchurl, zlib, readline, openssl }:
 
-callPackage ./generic.nix (args // rec {
-  psqlSchema = "9.2";
-  version = "${psqlSchema}.11";
+let version = "9.2.10"; in
+
+stdenv.mkDerivation rec {
+  name = "postgresql-${version}";
 
   src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
-    sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5";
+    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+    sha256 = "1bbkinqzb3c8i0vfzcy2g7djrq0kxz63jgvzda9p0vylxazmnm1m";
   };
 
-  patches = [ ./disable-resolve_symlinks.patch ];
-})
+  buildInputs = [ zlib readline openssl ];
+
+  enableParallelBuilding = true;
+
+  makeFlags = [ "world" ];
+
+  configureFlags = [ "--with-openssl" ];
+
+  patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ];
+
+  installTargets = [ "install-world" ];
+
+  LC_ALL = "C";
+
+  passthru = {
+    inherit readline;
+    psqlSchema = "9.2";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://www.postgresql.org/;
+    description = "A powerful, open source object-relational database system";
+    license = licenses.postgresql;
+    maintainers = with maintaiers; [ ocharles ];
+    platforms = platforms.unix;
+    hydraPlatforms = platforms.linux;
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 40c5ff660ce..74c7b2906b4 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -10,7 +10,7 @@
 , walBlockSizeKB ? 8, walSegmentSizeMB ? 16
 
 # Version specific arguments
-, psqlSchema , version, src, patches ? [ ]
+, version, src, psqlSchema
 , ...
 }:
 
@@ -25,8 +25,6 @@ let
   optLibxml2 = shouldUsePkg libxml2;
   optLibxslt = shouldUsePkg libxslt;
   optZlib = shouldUsePkg zlib;
-
-  patches' = [ ./less-is-more.patch ] ++ patches;
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -34,7 +32,7 @@ stdenv.mkDerivation rec {
 
   inherit src;
 
-  patches = patches';
+  patches = [ ./less-is-more.patch ];
 
   nativeBuildInputs = [ bison flex ];
   buildInputs = [
@@ -42,6 +40,8 @@ stdenv.mkDerivation rec {
     optLibossp_uuid optLibxml2 optLibxslt optZlib
   ];
 
+  #LC_ALL = "C";
+
   configureFlags = [
     (mkOther                            "sysconfdir"        "/etc")
     (mkOther                            "localstatedir"     "/var")
@@ -81,8 +81,6 @@ stdenv.mkDerivation rec {
     (mkWith   false                     "selinux"           null)
   ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";

From 3da0f6408844904bf490adb1b81dee1481374507 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:16:21 +0200
Subject: [PATCH 0712/2322] Revert "postgresql: Add myself as maintainer"

This reverts commit e9d0c395d1e9e1616ae07fa9eacbbfc9df52d4a8.
---
 pkgs/servers/sql/postgresql/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 74c7b2906b4..721a3b6323f 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
     license = licenses.postgresql;
-    maintainers = with maintaiers; [ ocharles wkennington ];
+    maintainers = with maintaiers; [ ocharles ];
     platforms = platforms.unix;
     hydraPlatforms = platforms.linux;
   };

From eb269336f1e2c691a9d9265d21ad64446c8a9c20 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:17:12 +0200
Subject: [PATCH 0713/2322] Revert "postgresql: Add schema version"

This reverts commit 243dc10b0b54fbc840ebae39bcb224d9e0717add.
---
 pkgs/servers/sql/postgresql/8.4.x.nix   | 3 +--
 pkgs/servers/sql/postgresql/9.0.x.nix   | 3 +--
 pkgs/servers/sql/postgresql/9.1.x.nix   | 3 +--
 pkgs/servers/sql/postgresql/generic.nix | 6 ++----
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index 0254bbe951d..66933f2ad42 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -1,8 +1,7 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  psqlSchema = "8.4";
-  version = "${psqlSchema}.22";
+  version = "8.4.22";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index dba42e4fb11..6c24e6aa4c4 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -1,8 +1,7 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  psqlSchema = "9.0";
-  version = "${psqlSchema}.20";
+  version = "9.0.20";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 138bc4a3023..b481f292ec5 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -1,8 +1,7 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  psqlSchema = "9.1";
-  version = "${psqlSchema}.16";
+  version = "9.1.16";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 721a3b6323f..06e6d1e79d6 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -10,7 +10,7 @@
 , walBlockSizeKB ? 8, walSegmentSizeMB ? 16
 
 # Version specific arguments
-, version, src, psqlSchema
+, version, src
 , ...
 }:
 
@@ -90,7 +90,5 @@ stdenv.mkDerivation rec {
     hydraPlatforms = platforms.linux;
   };
 
-  passthru = {
-    inherit readline psqlSchema;
-  };
+  passthru = { inherit readline; };
 }

From e3ab9804ba86bfca50e522ddfbdc7c3df9e79d64 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:17:19 +0200
Subject: [PATCH 0714/2322] Revert "postgresql: 9.1.15 -> 9.1.16"

This reverts commit be94d4bc25e27583ee36024dd9b45ead29c7f796.
---
 pkgs/servers/sql/postgresql/9.1.x.nix   | 44 +++++++++++++++++++++----
 pkgs/servers/sql/postgresql/generic.nix |  2 --
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index b481f292ec5..87ed9abe690 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -1,10 +1,42 @@
-{ callPackage, fetchurl, ... } @ args:
+{ stdenv, fetchurl, zlib, readline, openssl }:
 
-callPackage ./generic.nix (args // rec {
-  version = "9.1.16";
+let version = "9.1.15"; in
+
+stdenv.mkDerivation rec {
+  name = "postgresql-${version}";
 
   src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
-    sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b";
+    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+    sha256 = "0pyyw0cy91z9wkqf8qzkwsy8cyjps0s94c9czz6mzhyd2npxxmk7";
   };
-})
+
+  buildInputs = [ zlib readline openssl ];
+
+  enableParallelBuilding = true;
+
+  LC_ALL = "C";
+
+  configureFlags = [ "--with-openssl" ];
+
+  patches = [ ./less-is-more.patch ];
+
+  postInstall =
+    ''
+      mkdir -p $out/share/man
+      cp -rvd doc/src/sgml/man1 $out/share/man
+    '';
+
+  passthru = {
+    inherit readline;
+    psqlSchema = "9.1";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://www.postgresql.org/;
+    description = "A powerful, open source object-relational database system";
+    license = licenses.postgresql;
+    maintainers = with maintaiers; [ ocharles ];
+    platforms = platforms.unix;
+    hydraPlatforms = platforms.linux;
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 06e6d1e79d6..b2af6dd5331 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -77,8 +77,6 @@ stdenv.mkDerivation rec {
     (mkWith   (optLibxml2 != null)      "libxml"            null)
     (mkWith   (optLibxslt != null)      "libxslt"           null)
     (mkWith   (optZlib != null)         "zlib"              null)
-  ] ++ optionals (versionAtLeast version "9.1.0") [
-    (mkWith   false                     "selinux"           null)
   ];
 
   meta = with stdenv.lib; {

From 5efd73fce6f3e07fb255c4ad895994402beb034a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:17:27 +0200
Subject: [PATCH 0715/2322] Revert "postgresql: 9.0.19 -> 9.0.20"

This reverts commit 8c99f2e3d65add9bca5df66f7f2f3014ea337c85.
---
 pkgs/servers/sql/postgresql/9.0.x.nix   | 36 +++++++++++++---
 pkgs/servers/sql/postgresql/generic.nix | 56 ++++++++++++-------------
 2 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index 6c24e6aa4c4..a27bc012b6e 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -1,10 +1,34 @@
-{ callPackage, fetchurl, ... } @ args:
+{ stdenv, fetchurl, zlib, readline, openssl }:
 
-callPackage ./generic.nix (args // rec {
-  version = "9.0.20";
+let version = "9.0.19"; in
+
+stdenv.mkDerivation rec {
+  name = "postgresql-${version}";
 
   src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
-    sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02";
+    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+    sha256 = "1h45jdbzdcvprdsi9gija81s3ny46h3faf9f007gza4vm6y15bak";
   };
-})
+
+  buildInputs = [ zlib readline openssl ];
+
+  LC_ALL = "C";
+
+  configureFlags = [ "--with-openssl" ];
+
+  patches = [ ./less-is-more.patch ];
+
+  passthru = {
+    inherit readline;
+    psqlSchema = "9.0";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://www.postgresql.org/;
+    description = "A powerful, open source object-relational database system";
+    license = licenses.postgresql;
+    maintainers = with maintaiers; [ ocharles ];
+    platforms = platforms.unix;
+    hydraPlatforms = platforms.linux;
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index b2af6dd5331..d7fd28ccb68 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -43,34 +43,34 @@ stdenv.mkDerivation rec {
   #LC_ALL = "C";
 
   configureFlags = [
-    (mkOther                            "sysconfdir"        "/etc")
-    (mkOther                            "localstatedir"     "/var")
-    (mkEnable true                      "integer-datetimes" null)
-    (mkEnable true                      "nls"               null)
-    (mkWith   true                      "pgport"            "5432")
-    (mkEnable true                      "shared"            null)
-    (mkEnable true                      "rpath"             null)
-    (mkEnable true                      "spinlocks"         null)
-    (mkEnable false                     "debug"             null)
-    (mkEnable false                     "profiling"         null)
-    (mkEnable false                     "coverage"          null)
-    (mkEnable false                     "dtrace"            null)
-    (mkWith   true                      "blocksize"         (toString blockSizeKB))
-    (mkWith   true                      "segsize"           (toString segmentSizeGB))
-    (mkWith   true                      "wal-blocksize"     (toString walBlockSizeKB))
-    (mkWith   true                      "wal-segsize"       (toString walSegmentSizeMB))
-    (mkEnable true                      "depend"            null)
-    (mkEnable false                     "cassert"           null)
-    (mkEnable true                      "thread-safety"     null)
-    (mkWith   false                     "tcl"               null)  # Maybe enable some day
-    (mkWith   false                     "perl"              null)  # Maybe enable some day
-    (mkWith   false                     "python"            null)  # Maybe enable some day
-    (mkWith   (optKerberos != null)     "gssapi"            null)
-    (mkWith   false                     "krb5"              null)
-    (mkWith   (optPam != null)          "pam"               null)
-    (mkWith   (optOpenldap != null)     "ldap"              null)
-    (mkWith   false                     "bonjour"           null)
-    (mkWith   (optOpenssl != null)      "openssl"           null)
+    (mkOther                        "sysconfdir"        "/etc")
+    (mkOther                        "localstatedir"     "/var")
+    (mkEnable true                  "integer-datetimes" null)
+    (mkEnable true                  "nls"               null)
+    (mkWith   true                  "pgport"            "5432")
+    (mkEnable true                  "shared"            null)
+    (mkEnable true                  "rpath"             null)
+    (mkEnable true                  "spinlocks"         null)
+    (mkEnable false                 "debug"             null)
+    (mkEnable false                 "profiling"         null)
+    (mkEnable false                 "coverage"          null)
+    (mkEnable false                 "dtrace"            null)
+    (mkWith   true                  "blocksize"         (toString blockSizeKB))
+    (mkWith   true                  "segsize"           (toString segmentSizeGB))
+    (mkWith   true                  "wal-blocksize"     (toString walBlockSizeKB))
+    (mkWith   true                  "wal-segsize"       (toString walSegmentSizeMB))
+    (mkEnable true                  "autodepend"        null)
+    (mkEnable false                 "cassert"           null)
+    (mkEnable true                  "thread-safety"     null)
+    (mkWith   false                 "tcl"               null)  # Maybe enable some day
+    (mkWith   false                 "perl"              null)  # Maybe enable some day
+    (mkWith   false                 "python"            null)  # Maybe enable some day
+    (mkWith   (optKerberos != null) "gssapi"            null)
+    (mkWith   false                 "krb5"              null)
+    (mkWith   (optPam != null)      "pam"               null)
+    (mkWith   (optOpenldap != null) "ldap"              null)
+    (mkWith   false                 "bonjour"           null)
+    (mkWith   (optOpenssl != null)       "openssl"           null)
     (mkWith   (optReadline != null)     "readline"          null)
     (mkWith   false                     "libedit-preferred" null)
     (mkWith   (optLibossp_uuid != null) "ossp-uuid"         null)

From 05f1457c1e7bfa376e949ac196db0b0412faaa85 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:17:33 +0200
Subject: [PATCH 0716/2322] Revert "postgresql: Refactor 8.4 into generic"

This reverts commit 1bb67e514b2514b9267919784524821952cd73b3.
---
 pkgs/servers/sql/postgresql/8.4.x.nix   | 31 +++++++--
 pkgs/servers/sql/postgresql/generic.nix | 92 -------------------------
 2 files changed, 26 insertions(+), 97 deletions(-)
 delete mode 100644 pkgs/servers/sql/postgresql/generic.nix

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index 66933f2ad42..4c72dbfd448 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -1,10 +1,31 @@
-{ callPackage, fetchurl, ... } @ args:
+{ stdenv, fetchurl, zlib, ncurses, readline, openssl }:
 
-callPackage ./generic.nix (args // rec {
-  version = "8.4.22";
+let version = "8.4.22"; in
+
+stdenv.mkDerivation rec {
+  name = "postgresql-${version}";
 
   src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
+    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
     sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw";
   };
-})
+
+  buildInputs = [ zlib ncurses readline openssl ];
+
+  LC_ALL = "C";
+
+  configureFlags = [ "--with-openssl" ];
+
+  patches = [ ./less-is-more.patch ];
+
+  passthru = { inherit readline; };
+
+  meta = with stdenv.lib; {
+    homepage = http://www.postgresql.org/;
+    description = "A powerful, open source object-relational database system";
+    license = licenses.postgresql;
+    maintainers = with maintaiers; [ ocharles ];
+    platforms = platforms.unix;
+    hydraPlatforms = platforms.linux;
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
deleted file mode 100644
index d7fd28ccb68..00000000000
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{ stdenv, bison, flex
-, gettext
-
-# Optional Dependencies
-, kerberos ? null, pam ? null, openldap ? null, openssl ? null, readline ? null
-, libossp_uuid ? null, libxml2 ? null, libxslt ? null, zlib ? null
-
-# Extra Arguments
-, blockSizeKB ? 8, segmentSizeGB ? 1
-, walBlockSizeKB ? 8, walSegmentSizeMB ? 16
-
-# Version specific arguments
-, version, src
-, ...
-}:
-
-with stdenv;
-let
-  optKerberos = shouldUsePkg kerberos;
-  optPam = shouldUsePkg pam;
-  optOpenldap = shouldUsePkg openldap;
-  optOpenssl = shouldUsePkg openssl;
-  optReadline = shouldUsePkg readline;
-  optLibossp_uuid = shouldUsePkg libossp_uuid;
-  optLibxml2 = shouldUsePkg libxml2;
-  optLibxslt = shouldUsePkg libxslt;
-  optZlib = shouldUsePkg zlib;
-in
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  name = "postgresql-${version}";
-
-  inherit src;
-
-  patches = [ ./less-is-more.patch ];
-
-  nativeBuildInputs = [ bison flex ];
-  buildInputs = [
-    gettext optKerberos optPam optOpenldap optOpenssl optReadline
-    optLibossp_uuid optLibxml2 optLibxslt optZlib
-  ];
-
-  #LC_ALL = "C";
-
-  configureFlags = [
-    (mkOther                        "sysconfdir"        "/etc")
-    (mkOther                        "localstatedir"     "/var")
-    (mkEnable true                  "integer-datetimes" null)
-    (mkEnable true                  "nls"               null)
-    (mkWith   true                  "pgport"            "5432")
-    (mkEnable true                  "shared"            null)
-    (mkEnable true                  "rpath"             null)
-    (mkEnable true                  "spinlocks"         null)
-    (mkEnable false                 "debug"             null)
-    (mkEnable false                 "profiling"         null)
-    (mkEnable false                 "coverage"          null)
-    (mkEnable false                 "dtrace"            null)
-    (mkWith   true                  "blocksize"         (toString blockSizeKB))
-    (mkWith   true                  "segsize"           (toString segmentSizeGB))
-    (mkWith   true                  "wal-blocksize"     (toString walBlockSizeKB))
-    (mkWith   true                  "wal-segsize"       (toString walSegmentSizeMB))
-    (mkEnable true                  "autodepend"        null)
-    (mkEnable false                 "cassert"           null)
-    (mkEnable true                  "thread-safety"     null)
-    (mkWith   false                 "tcl"               null)  # Maybe enable some day
-    (mkWith   false                 "perl"              null)  # Maybe enable some day
-    (mkWith   false                 "python"            null)  # Maybe enable some day
-    (mkWith   (optKerberos != null) "gssapi"            null)
-    (mkWith   false                 "krb5"              null)
-    (mkWith   (optPam != null)      "pam"               null)
-    (mkWith   (optOpenldap != null) "ldap"              null)
-    (mkWith   false                 "bonjour"           null)
-    (mkWith   (optOpenssl != null)       "openssl"           null)
-    (mkWith   (optReadline != null)     "readline"          null)
-    (mkWith   false                     "libedit-preferred" null)
-    (mkWith   (optLibossp_uuid != null) "ossp-uuid"         null)
-    (mkWith   (optLibxml2 != null)      "libxml"            null)
-    (mkWith   (optLibxslt != null)      "libxslt"           null)
-    (mkWith   (optZlib != null)         "zlib"              null)
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = http://www.postgresql.org/;
-    description = "A powerful, open source object-relational database system";
-    license = licenses.postgresql;
-    maintainers = with maintaiers; [ ocharles ];
-    platforms = platforms.unix;
-    hydraPlatforms = platforms.linux;
-  };
-
-  passthru = { inherit readline; };
-}

From 24390ab377e036b55e4331b6aed89a9d068d1b11 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:28:45 +0200
Subject: [PATCH 0717/2322] Revert "ceph: Update git"

This reverts commit 2154348ba0285b243a143114d87751ef744cfdc2.
---
 pkgs/tools/filesystems/ceph/generic.nix | 72 ++++++++++++-------------
 pkgs/tools/filesystems/ceph/git.nix     |  6 +--
 2 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 056440d4afe..43cbb75de6f 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -98,8 +98,7 @@ stdenv.mkDerivation {
     ./0001-Makefile-env-Don-t-force-sbin.patch
   ];
 
-  nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]
-    ++ optionals (versionAtLeast version "10.0.0") [ pythonPackages.setuptools ];
+  nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ];
   buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
     boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib
   ] ++ optional (versionAtLeast version "9.0.0") [
@@ -152,43 +151,42 @@ stdenv.mkDerivation {
     "--libdir=\${lib}/lib"
     "--includedir=\${lib}/include"
 
-    (mkWith   true                         "rbd"                 null)
-    (mkWith   true                         "cephfs"              null)
-    (mkWith   hasRadosgw                   "radosgw"             null)
-    (mkWith   true                         "radosstriper"        null)
-    (mkWith   hasServer                    "mon"                 null)
-    (mkWith   hasServer                    "osd"                 null)
-    (mkWith   hasServer                    "mds"                 null)
-    (mkEnable true                         "client"              null)
-    (mkEnable hasServer                    "server"              null)
-    (mkWith   (cryptoStr == "cryptopp")    "cryptopp"            null)
-    (mkWith   (cryptoStr == "nss")         "nss"                 null)
-    (mkEnable false                        "root-make-check"     null)
-    (mkWith   false                        "profiler"            null)
-    (mkWith   false                        "debug"               null)
-    (mkEnable false                        "coverage"            null)
-    (mkWith   (optFuse != null)            "fuse"                null)
-    (mkWith   (malloc == optJemalloc)      "jemalloc"            null)
-    (mkWith   (malloc == optGperftools)    "tcmalloc"            null)
-    (mkEnable false                        "pgrefdebugging"      null)
-    (mkEnable false                        "cephfs-java"         null)
-    (mkEnable hasXio                       "xio"                 null)
-    (mkWith   (optLibatomic_ops != null)   "libatomic-ops"       null)
-    (mkWith   true                         "ocf"                 null)
-    (mkWith   hasKinetic                   "kinetic"             null)
-    (mkWith   hasRocksdb                   "librocksdb"          null)
-    (mkWith   false                        "librocksdb-static"   null)
-    (mkWith   (optLibs3 != null)           "system-libs3"        null)
-    (mkWith   true                         "rest-bench"          null)
+    (mkWith   true                         "rbd"               null)
+    (mkWith   true                         "cephfs"            null)
+    (mkWith   hasRadosgw                   "radosgw"           null)
+    (mkWith   true                         "radosstriper"      null)
+    (mkWith   hasServer                    "mon"               null)
+    (mkWith   hasServer                    "osd"               null)
+    (mkWith   hasServer                    "mds"               null)
+    (mkEnable true                         "client"            null)
+    (mkEnable hasServer                    "server"            null)
+    (mkWith   (cryptoStr == "cryptopp")    "cryptopp"          null)
+    (mkWith   (cryptoStr == "nss")         "nss"               null)
+    (mkEnable false                        "root-make-check"   null)
+    (mkWith   false                        "profiler"          null)
+    (mkWith   false                        "debug"             null)
+    (mkEnable false                        "coverage"          null)
+    (mkWith   (optFuse != null)            "fuse"              null)
+    (mkWith   (malloc == optJemalloc)      "jemalloc"          null)
+    (mkWith   (malloc == optGperftools)    "tcmalloc"          null)
+    (mkEnable false                        "pgrefdebugging"    null)
+    (mkEnable false                        "cephfs-java"       null)
+    (mkEnable hasXio                       "xio"               null)
+    (mkWith   (optLibatomic_ops != null)   "libatomic-ops"     null)
+    (mkWith   true                         "ocf"               null)
+    (mkWith   hasKinetic                   "kinetic"           null)
+    (mkWith   hasRocksdb                   "librocksdb"        null)
+    (mkWith   false                        "librocksdb-static" null)
+    (mkWith   (optLibs3 != null)           "system-libs3"      null)
+    (mkWith   true                         "rest-bench"        null)
   ] ++ optional stdenv.isLinux [
-    (mkWith   (optLibaio != null)          "libaio"              null)
-    (mkWith   (optLibxfs != null)          "libxfs"              null)
-    (mkWith   (optZfs != null)             "libzfs"              null)
+    (mkWith   (optLibaio != null)             "libaio"            null)
+    (mkWith   (optLibxfs != null)             "libxfs"            null)
+    (mkWith   (optZfs != null)                "libzfs"            null)
   ] ++ optional (versionAtLeast version "10.0.0") [
-    (mkWith   true                         "man-pages"           null)
-    (mkWith   false                        "tcmalloc-minimal"    null)
-    (mkWith   false                        "valgrind"            null)
-    (mkWith   true                         "systemd-libexec-dir" "\${TMPDIR}")
+    (mkWith   true                         "man-pages"         null)
+    (mkWith   false                        "tcmalloc-minimal"  null)
+    (mkWith   false                        "valgrind"          null)
   ];
 
   preBuild = optionalString (versionAtLeast version "9.0.0") ''
diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
index c964548b65e..8aa4bbd34bb 100644
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ b/pkgs/tools/filesystems/ceph/git.nix
@@ -1,11 +1,11 @@
 { callPackage, fetchgit, git, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-05-29";
+  version = "2015-04-22";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
-    rev = "64096b870960d021ab5001b6a5cf3a999a9abeb7";
-    sha256 = "18lcn4misyvgjh7r0vkal480x23yr8pcjwzl4k4hbrpqmm97znp9";
+    rev = "89262abc53e324f3ef4d504473a4f1d6eb337c20";
+    sha256 = "0d6hlk1nwgx9cdhvppggz6sbjc1jl8j26l9739qspw1sviac5lcb";
   };
 })

From 660e85a0d9a95373d0cc9610d3040cd8d3774df9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:28:51 +0200
Subject: [PATCH 0718/2322] Revert "ceph: Add development version"

This reverts commit 81f705e98c45ca4a3dfb7e5fe16e9b45ced74f0d.
---
 pkgs/tools/filesystems/ceph/dev.nix     | 14 +-------------
 pkgs/tools/filesystems/ceph/generic.nix | 13 +++----------
 2 files changed, 4 insertions(+), 23 deletions(-)
 mode change 100644 => 120000 pkgs/tools/filesystems/ceph/dev.nix

diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
deleted file mode 100644
index aec5d35b51a..00000000000
--- a/pkgs/tools/filesystems/ceph/dev.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ callPackage, fetchgit, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "9.0.0";
-
-  src = fetchgit {
-    url = "https://github.com/ceph/ceph.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "07x5riqxh2mjcvlblv900vclgh8glnb464s6ssdcgkp31fk1gybg";
-  };
-
-  patches = [ ./fix-pgrefdebugging.patch ];
-})
diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
new file mode 120000
index 00000000000..31d5e95359c
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/dev.nix
@@ -0,0 +1 @@
+0.94.nix
\ No newline at end of file
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 43cbb75de6f..9dbc85a3243 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -63,13 +63,13 @@ let
   hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null;
 
   hasXio = (stdenv.isLinux || stdenv.isFreeBSD) &&
-    versionAtLeast version "9.0.0" &&
+    versionAtLeast version "0.95" &&
     optAccelio != null && optLibibverbs != null && optLibrdmacm != null;
 
-  hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null;
+  hasRocksdb = versionAtLeast version "0.95" && optRocksdb != null;
 
   # TODO: Reenable when kinetic support is fixed
-  #hasKinetic = versionAtLeast version "9.0.0" && optKinetic-cpp-client != null;
+  #hasKinetic = versionAtLeast version "0.95" && optKinetic-cpp-client != null;
   hasKinetic = false;
 
   # Malloc implementation (can be jemalloc, tcmalloc or null)
@@ -124,9 +124,6 @@ stdenv.mkDerivation {
 
     # Fix seagate kinetic linking
     sed -i 's,libcrypto.a,-lcrypto,g' src/os/Makefile.am
-  '' + optionalString (versionAtLeast version "9.0.0") ''
-    # Fix gmock
-    patchShebangs src/gmock
   '';
 
   preConfigure = ''
@@ -189,10 +186,6 @@ stdenv.mkDerivation {
     (mkWith   false                        "valgrind"          null)
   ];
 
-  preBuild = optionalString (versionAtLeast version "9.0.0") ''
-    (cd src/gmock; make -j $NIX_BUILD_CORES)
-  '';
-
   installFlags = [ "sysconfdir=\${out}/etc" ];
 
   outputs = [ "out" "lib" ];

From 17b6a597fb36063e4832983d3470ce695f809b31 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:28:56 +0200
Subject: [PATCH 0719/2322] Revert "ceph: Now evaluate on darwin"

This reverts commit 54963fb5b7495ad3f63baa0b6d5d75d3f7c8a874.
---
 pkgs/tools/filesystems/ceph/generic.nix | 79 ++++++++-----------------
 1 file changed, 25 insertions(+), 54 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 9dbc85a3243..5d4932e36b4 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -26,61 +26,32 @@
 # We must have one crypto library
 assert cryptopp != null || (nss != null && nspr != null);
 
-with stdenv;
 with stdenv.lib;
 let
-  optSnappy = shouldUsePkg snappy;
-  optLeveldb = shouldUsePkg leveldb;
-  optYasm = shouldUsePkg yasm;
-  optFcgi = shouldUsePkg fcgi;
-  optExpat = shouldUsePkg expat;
-  optCurl = shouldUsePkg curl;
-  optFuse = shouldUsePkg fuse;
-  optAccelio = shouldUsePkg accelio;
-  optLibibverbs = shouldUsePkg libibverbs;
-  optLibrdmacm = shouldUsePkg librdmacm;
-  optLibedit = shouldUsePkg libedit;
-  optLibatomic_ops = shouldUsePkg libatomic_ops;
-  optKinetic-cpp-client = shouldUsePkg kinetic-cpp-client;
-  optRocksdb = shouldUsePkg rocksdb;
-  optLibs3 = shouldUsePkg libs3;
-
-  optJemalloc = shouldUsePkg jemalloc;
-  optGperftools = shouldUsePkg gperftools;
-
-  optCryptopp = shouldUsePkg cryptopp;
-  optNss = shouldUsePkg nss;
-  optNspr = shouldUsePkg nspr;
-
-  optLibaio = shouldUsePkg libaio;
-  optLibxfs = shouldUsePkg libxfs;
-  optZfs = shouldUsePkg zfs;
-
-  hasServer = optSnappy != null && optLeveldb != null;
+  hasServer = snappy != null && leveldb != null;
   hasMon = hasServer;
   hasMds = hasServer;
   hasOsd = hasServer;
-  hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null;
+  hasRadosgw = fcgi != null && expat != null && curl != null && libedit != null;
 
   hasXio = (stdenv.isLinux || stdenv.isFreeBSD) &&
     versionAtLeast version "0.95" &&
-    optAccelio != null && optLibibverbs != null && optLibrdmacm != null;
+    accelio != null && libibverbs != null && librdmacm != null;
 
-  hasRocksdb = versionAtLeast version "0.95" && optRocksdb != null;
+  hasRocksdb = versionAtLeast version "0.95" && rocksdb != null;
 
   # TODO: Reenable when kinetic support is fixed
-  #hasKinetic = versionAtLeast version "0.95" && optKinetic-cpp-client != null;
-  hasKinetic = false;
+  hasKinetic = versionAtLeast version "0.95" && kinetic-cpp-client != null && false;
 
   # Malloc implementation (can be jemalloc, tcmalloc or null)
-  malloc = if optJemalloc != null then optJemalloc else optGperftools;
+  malloc = if jemalloc != null then jemalloc else gperftools;
 
   # We prefer nss over cryptopp
-  cryptoStr = if optNss != null && optNspr != null then "nss" else
-    if optCryptopp != null then "cryptopp" else "none";
+  cryptoStr = if nss != null && nspr != null then "nss" else
+    if cryptopp != null then "cryptopp" else "none";
   cryptoLibsMap = {
-    nss = [ optNss optNspr ];
-    cryptopp = [ optCryptopp ];
+    nss = [ nss nspr ];
+    cryptopp = [ cryptopp ];
     none = [ ];
   };
 
@@ -100,22 +71,22 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ];
   buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
-    boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib
+    boost python libxml2 yasm libatomic_ops libs3 malloc pythonPackages.flask zlib
   ] ++ optional (versionAtLeast version "9.0.0") [
     git                   # Used for the gitversion string
     pythonPackages.sphinx # Used for docs
   ] ++ optional stdenv.isLinux [
-    linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs
+    linuxHeaders libuuid udev keyutils libaio libxfs zfs
   ] ++ optional hasServer [
-    optSnappy optLeveldb
+    snappy leveldb
   ] ++ optional hasRadosgw [
-    optFcgi optExpat optCurl optFuse optLibedit
+    fcgi expat curl fuse libedit
   ] ++ optional hasXio [
-    optAccelio optLibibverbs optLibrdmacm
+    accelio libibverbs librdmacm
   ] ++ optional hasRocksdb [
-    optRocksdb
+    rocksdb
   ] ++ optional hasKinetic [
-    optKinetic-cpp-client
+    kinetic-cpp-client
   ];
 
   postPatch = ''
@@ -163,23 +134,23 @@ stdenv.mkDerivation {
     (mkWith   false                        "profiler"          null)
     (mkWith   false                        "debug"             null)
     (mkEnable false                        "coverage"          null)
-    (mkWith   (optFuse != null)            "fuse"              null)
-    (mkWith   (malloc == optJemalloc)      "jemalloc"          null)
-    (mkWith   (malloc == optGperftools)    "tcmalloc"          null)
+    (mkWith   (fuse != null)               "fuse"              null)
+    (mkWith   (malloc == jemalloc)         "jemalloc"          null)
+    (mkWith   (malloc == gperftools)       "tcmalloc"          null)
     (mkEnable false                        "pgrefdebugging"    null)
     (mkEnable false                        "cephfs-java"       null)
     (mkEnable hasXio                       "xio"               null)
-    (mkWith   (optLibatomic_ops != null)   "libatomic-ops"     null)
+    (mkWith   (libatomic_ops != null)      "libatomic-ops"     null)
     (mkWith   true                         "ocf"               null)
     (mkWith   hasKinetic                   "kinetic"           null)
     (mkWith   hasRocksdb                   "librocksdb"        null)
     (mkWith   false                        "librocksdb-static" null)
-    (mkWith   (optLibs3 != null)           "system-libs3"      null)
+    (mkWith   (libs3 != null)              "system-libs3"      null)
     (mkWith   true                         "rest-bench"        null)
   ] ++ optional stdenv.isLinux [
-    (mkWith   (optLibaio != null)             "libaio"            null)
-    (mkWith   (optLibxfs != null)             "libxfs"            null)
-    (mkWith   (optZfs != null)                "libzfs"            null)
+    (mkWith   (libaio != null)             "libaio"            null)
+    (mkWith   (libxfs != null)             "libxfs"            null)
+    (mkWith   (zfs != null)                "libzfs"            null)
   ] ++ optional (versionAtLeast version "10.0.0") [
     (mkWith   true                         "man-pages"         null)
     (mkWith   false                        "tcmalloc-minimal"  null)

From 5d8fe045b6376851c33a1c772cfe46882411cd21 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:29:47 +0200
Subject: [PATCH 0720/2322] Revert "Refactor mkFlag out of old packages"

This reverts commit 3117e0c897522ec8431572de12449f676cc8c8be.

Conflicts:
	pkgs/development/libraries/wayland/default.nix
	pkgs/servers/samba/4.x.nix
---
 .../graphics/ImageMagick/default.nix          |  68 ++++-----
 pkgs/development/libraries/lame/default.nix   |  25 ++--
 pkgs/development/libraries/libass/default.nix |  14 +-
 .../libraries/libinput/default.nix            |  10 +-
 .../development/libraries/libwebp/default.nix |  30 ++--
 pkgs/development/libraries/stxxl/default.nix  |   6 +-
 pkgs/servers/mpd/default.nix                  |  64 ++++-----
 pkgs/servers/samba/4.x.nix                    |   2 +-
 pkgs/tools/filesystems/ceph/generic.nix       |   7 +
 pkgs/tools/security/pinentry/default.nix      |  15 +-
 pkgs/tools/system/rsyslog/default.nix         | 131 +++++++++---------
 11 files changed, 202 insertions(+), 170 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 011e75fbc1c..7ae24b38c01 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -17,6 +17,10 @@ let
     else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64"
     else throw "ImageMagick is not supported on this platform.";
 
+  mkFlag = trueStr: falseStr: cond: val: "--${if cond then trueStr else falseStr}-${val}";
+  mkWith = mkFlag "with" "without";
+  mkEnable = mkFlag "enable" "disable";
+
   hasX11 = libX11 != null && libXext != null && libXt != null;
 
 in
@@ -33,38 +37,38 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   configureFlags = [
-    (mkEnable (libcl != null)        "opencl"      null)
-    (mkWith   true                   "modules"     null)
-    (mkWith   true                   "gcc-arch"    arch)
-    #(mkEnable true                   "hdri"        null) This breaks some dependencies
-    (mkWith   (perl != null)         "perl"        null)
-    (mkWith   (jemalloc != null)     "jemalloc"    null)
-    (mkWith   true                   "frozenpaths" null)
-    (mkWith   (bzip2 != null)        "bzlib"       null)
-    (mkWith   hasX11                 "x"           null)
-    (mkWith   (zlib != null)         "zlib"        null)
-    (mkWith   false                  "dps"         null)
-    (mkWith   (fftw != null)         "fftw"        null)
-    (mkWith   (libfpx != null)       "fpx"         null)
-    (mkWith   (djvulibre != null)    "djvu"        null)
-    (mkWith   (fontconfig != null)   "fontconfig"  null)
-    (mkWith   (freetype != null)     "freetype"    null)
-    (mkWith   (ghostscript != null)  "gslib"       null)
-    (mkWith   (graphviz != null)     "gvc"         null)
-    (mkWith   (jbigkit != null)      "jbig"        null)
-    (mkWith   (libjpeg != null)      "jpeg"        null)
-    (mkWith   (lcms2 != null)        "lcms2"       null)
-    (mkWith   false                  "lcms"        null)
-    (mkWith   (openjpeg != null)     "openjp2"     null)
-    (mkWith   (liblqr1 != null)      "lqr"         null)
-    (mkWith   (xz != null)           "lzma"        null)
-    (mkWith   (openexr != null)      "openexr"     null)
-    (mkWith   (pango != null)        "pango"       null)
-    (mkWith   (libpng != null)       "png"         null)
-    (mkWith   (librsvg != null)      "rsvg"        null)
-    (mkWith   (libtiff != null)      "tiff"        null)
-    (mkWith   (libwebp != null)      "webp"        null)
-    (mkWith   (libxml2 != null)      "xml"         null)
+    (mkEnable (libcl != null)        "opencl")
+    (mkWith   true                   "modules")
+    (mkWith   true                   "gcc-arch=${arch}")
+    #(mkEnable true                   "hdri") This breaks some dependencies
+    (mkWith   (perl != null)         "perl")
+    (mkWith   (jemalloc != null)     "jemalloc")
+    (mkWith   true                   "frozenpaths")
+    (mkWith   (bzip2 != null)        "bzlib")
+    (mkWith   hasX11                 "x")
+    (mkWith   (zlib != null)         "zlib")
+    (mkWith   false                  "dps")
+    (mkWith   (fftw != null)         "fftw")
+    (mkWith   (libfpx != null)       "fpx")
+    (mkWith   (djvulibre != null)    "djvu")
+    (mkWith   (fontconfig != null)   "fontconfig")
+    (mkWith   (freetype != null)     "freetype")
+    (mkWith   (ghostscript != null)  "gslib")
+    (mkWith   (graphviz != null)     "gvc")
+    (mkWith   (jbigkit != null)      "jbig")
+    (mkWith   (libjpeg != null)      "jpeg")
+    (mkWith   (lcms2 != null)        "lcms2")
+    (mkWith   false                  "lcms")
+    (mkWith   (openjpeg != null)     "openjp2")
+    (mkWith   (liblqr1 != null)      "lqr")
+    (mkWith   (xz != null)           "lzma")
+    (mkWith   (openexr != null)      "openexr")
+    (mkWith   (pango != null)        "pango")
+    (mkWith   (libpng != null)       "png")
+    (mkWith   (librsvg != null)      "rsvg")
+    (mkWith   (libtiff != null)      "tiff")
+    (mkWith   (libwebp != null)      "webp")
+    (mkWith   (libxml2 != null)      "xml")
   ] ++ optional (dejavu_fonts != null) "--with-dejavu-font-dir=${dejavu_fonts}/share/fonts/truetype/"
     ++ optional (ghostscript != null) "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts/";
 
diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix
index 4a61d188ef6..562e292791a 100644
--- a/pkgs/development/libraries/lame/default.nix
+++ b/pkgs/development/libraries/lame/default.nix
@@ -17,7 +17,7 @@ assert sndfileFileIOSupport -> (libsndfile != null);
 #assert mp3xSupport -> (analyzerHooksSupport && (gtk1 != null));
 
 let
-  sndfileFileIO = if sndfileFileIOSupport then "sndfile" else "lame";
+  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
 in
 
 with stdenv.lib;
@@ -39,18 +39,17 @@ stdenv.mkDerivation rec {
     ++ optional sndfileFileIOSupport libsndfile;
 
   configureFlags = [
-    (mkEnable nasmSupport          "nasm"              null)
-    (mkEnable cpmlSupport          "cpml"              null)
-    #(mkEnable efenceSupport        "efence"            null)
-    (mkWith   true                 "fileio"            sndfileFileIO)
-    (mkEnable analyzerHooksSupport "analyzer-hooks"    null)
-    (mkEnable decoderSupport       "decoder"           null)
-    (mkEnable frontendSupport      "frontend"          null)
-    (mkEnable frontendSupport      "dynamic-frontends" null)
-    #(mkEnable mp3xSupport          "mp3x"              null)
-    (mkEnable mp3rtpSupport        "mp3rtp"            null)
-  ] ++ optional debugSupport [
-    (mkEnable true                 "debug"             "alot")
+    (mkFlag nasmSupport "nasm")
+    (mkFlag cpmlSupport "cpml")
+    #(mkFlag efenceSupport "efence")
+    (if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame")
+    (mkFlag analyzerHooksSupport "analyzer-hooks")
+    (mkFlag decoderSupport "decoder")
+    (mkFlag frontendSupport "frontend")
+    (mkFlag frontendSupport "dynamic-frontends")
+    #(mkFlag mp3xSupport "mp3x")
+    (mkFlag mp3rtpSupport "mp3rtp")
+    (if debugSupport then "--enable-debug=alot" else "")
   ];
 
   meta = {
diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index 502f95dca9a..ab300729acc 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -11,6 +11,10 @@ assert encaSupport -> enca != null;
 assert fontconfigSupport -> fontconfig != null;
 assert harfbuzzSupport -> harfbuzz != null;
 
+let
+  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
+in
+
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libass-${version}";
@@ -22,11 +26,11 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags = [
-    (mkEnable encaSupport       "enca"        null)
-    (mkEnable fontconfigSupport "fontconfig"  null)
-    (mkEnable harfbuzzSupport   "harfbuzz"    null)
-    (mkEnable rasterizerSupport "rasterizer"  null)
-    (mkEnable largeTilesSupport "large-tiles" null)
+    (mkFlag encaSupport "enca")
+    (mkFlag fontconfigSupport "fontconfig")
+    (mkFlag harfbuzzSupport "harfbuzz")
+    (mkFlag rasterizerSupport "rasterizer")
+    (mkFlag largeTilesSupport "large-tiles")
   ];
 
   nativeBuildInputs = [ pkgconfig yasm ];
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 3b8b7565e77..87d8154e5aa 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -9,6 +9,10 @@ assert documentationSupport -> doxygen != null && graphviz != null;
 assert eventGUISupport -> cairo != null && glib != null && gtk3 != null;
 assert testsSupport -> check != null && valgrind != null;
 
+let
+  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
+in
+
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libinput-0.15.0";
@@ -19,9 +23,9 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags = [
-    (mkEnable documentationSupport "documentation" null)
-    (mkEnable eventGUISupport      "event-gui"     null)
-    (mkEnable testsSupport         "tests"         null)
+    (mkFlag documentationSupport "documentation")
+    (mkFlag eventGUISupport "event-gui")
+    (mkFlag testsSupport "tests")
   ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index 871dff0aa8a..6da1b00ee81 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -20,6 +20,10 @@ assert jpegSupport -> (libjpeg != null);
 assert tiffSupport -> (libtiff != null);
 assert gifSupport -> (giflib != null);
 
+let
+  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
+in
+
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libwebp-${version}";
@@ -31,19 +35,19 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags = [
-    (mkEnable threadingSupport "threading" null)
-    (mkEnable openglSupport "gl" null)
-    (mkEnable pngSupport "png" null)
-    (mkEnable jpegSupport "jpeg" null)
-    (mkEnable tiffSupport "tiff" null)
-    (mkEnable gifSupport "gif" null)
-    #(mkEnable (wicSupport && stdenv.isCygwin) "wic" null)
-    (mkEnable alignedSupport "aligned" null)
-    (mkEnable swap16bitcspSupport "swap-16bit-csp" null)
-    (mkEnable experimentalSupport "experimental" null)
-    (mkEnable libwebpmuxSupport "libwebpmux" null)
-    (mkEnable libwebpdemuxSupport "libwebpdemux" null)
-    (mkEnable libwebpdecoderSupport "libwebpdecoder" null)
+    (mkFlag threadingSupport "threading")
+    (mkFlag openglSupport "gl")
+    (mkFlag pngSupport "png")
+    (mkFlag jpegSupport "jpeg")
+    (mkFlag tiffSupport "tiff")
+    (mkFlag gifSupport "gif")
+    #(mkFlag (wicSupport && stdenv.isCygwin) "wic")
+    (mkFlag alignedSupport "aligned")
+    (mkFlag swap16bitcspSupport "swap-16bit-csp")
+    (mkFlag experimentalSupport "experimental")
+    (mkFlag libwebpmuxSupport "libwebpmux")
+    (mkFlag libwebpdemuxSupport "libwebpdemux")
+    (mkFlag libwebpdecoderSupport "libwebpdecoder")
   ];
 
   buildInputs = [ ]
diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix
index 9ebd27e8277..9fb25aa36e0 100644
--- a/pkgs/development/libraries/stxxl/default.nix
+++ b/pkgs/development/libraries/stxxl/default.nix
@@ -2,6 +2,10 @@
 , parallel ? true
 }:
 
+let
+  mkFlag = optset: flag: if optset then "-D${flag}=ON" else "-D${flag}=OFF";
+in
+
 stdenv.mkDerivation rec {
   name = "stxxl-${version}";
   version = "1.4.1";
@@ -17,7 +21,7 @@ stdenv.mkDerivation rec {
     "-DBUILD_SHARED_LIBS=ON"
     "-DBUILD_STATIC_LIBS=OFF"
     "-DCMAKE_BUILD_TYPE=Release"
-    "-DUSE_GNU_PARALLEL=${if parallel then "ON" else "OFF"}"
+    (mkFlag parallel "USE_GNU_PARALLEL")
   ];
 
   passthru = {
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index c1611952a1e..90dd2040e5d 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -25,13 +25,13 @@
 , opusSupport ? true, libopus
 }:
 
-with stdenv.lib;
 let
-  opt = optional;
+  opt = stdenv.lib.optional;
+  mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
   major = "0.19";
   minor = "9";
-in
-stdenv.mkDerivation rec {
+
+in stdenv.mkDerivation rec {
   name = "mpd-${major}.${minor}";
   src = fetchurl {
     url    = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz";
@@ -68,33 +68,33 @@ stdenv.mkDerivation rec {
     ++ opt opusSupport libopus;
 
   configureFlags =
-    [ (mkEnable (!stdenv.isDarwin && alsaSupport) "alsa" null)
-      (mkEnable flacSupport "flac" null)
-      (mkEnable vorbisSupport "vorbis" null)
-      (mkEnable vorbisSupport "vorbis-encoder" null)
-      (mkEnable (!stdenv.isDarwin && madSupport) "mad" null)
-      (mkEnable mikmodSupport "mikmod" null)
-      (mkEnable id3tagSupport "id3" null)
-      (mkEnable shoutSupport "shout" null)
-      (mkEnable sqliteSupport "sqlite" null)
-      (mkEnable curlSupport "curl" null)
-      (mkEnable audiofileSupport "audiofile" null)
-      (mkEnable bzip2Support "bzip2" null)
-      (mkEnable ffmpegSupport "ffmpeg" null)
-      (mkEnable fluidsynthSupport "fluidsynth" null)
-      (mkEnable zipSupport "zzip" null)
-      (mkEnable samplerateSupport "lsr" null)
-      (mkEnable mmsSupport "mms" null)
-      (mkEnable mpg123Support "mpg123" null)
-      (mkEnable aacSupport "aac" null)
-      (mkEnable pulseaudioSupport "pulse" null)
-      (mkEnable jackSupport "jack" null)
-      (mkEnable stdenv.isDarwin "osx" null)
-      (mkEnable icuSupport "icu" null)
-      (mkEnable gmeSupport "gme" null)
-      (mkEnable clientSupport "libmpdclient" null)
-      (mkEnable opusSupport "opus" null)
-      (mkEnable true "debug" null)
+    [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa")
+      (mkFlag flacSupport "flac")
+      (mkFlag vorbisSupport "vorbis")
+      (mkFlag vorbisSupport "vorbis-encoder")
+      (mkFlag (!stdenv.isDarwin && madSupport) "mad")
+      (mkFlag mikmodSupport "mikmod")
+      (mkFlag id3tagSupport "id3")
+      (mkFlag shoutSupport "shout")
+      (mkFlag sqliteSupport "sqlite")
+      (mkFlag curlSupport "curl")
+      (mkFlag audiofileSupport "audiofile")
+      (mkFlag bzip2Support "bzip2")
+      (mkFlag ffmpegSupport "ffmpeg")
+      (mkFlag fluidsynthSupport "fluidsynth")
+      (mkFlag zipSupport "zzip")
+      (mkFlag samplerateSupport "lsr")
+      (mkFlag mmsSupport "mms")
+      (mkFlag mpg123Support "mpg123")
+      (mkFlag aacSupport "aac")
+      (mkFlag pulseaudioSupport "pulse")
+      (mkFlag jackSupport "jack")
+      (mkFlag stdenv.isDarwin "osx")
+      (mkFlag icuSupport "icu")
+      (mkFlag gmeSupport "gme")
+      (mkFlag clientSupport "libmpdclient")
+      (mkFlag opusSupport "opus")
+      "--enable-debug"
     ]
     ++ opt stdenv.isLinux
       "--with-systemdsystemunitdir=$(out)/etc/systemd/system";
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
     ${if shoutSupport then "-lshout" else ""}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A flexible, powerful daemon for playing music";
     homepage    = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
     license     = licenses.gpl2;
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 6a6e2469e78..269ba2ec186 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
     find $out -type f -exec $SHELL -c "$SCRIPT" \;
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.samba.org/;
     description = "The standard Windows interoperability suite of programs for Linux and Unix";
     license = licenses.gpl3;
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 5d4932e36b4..33d9b3dc64f 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -28,6 +28,13 @@ assert cryptopp != null || (nss != null && nspr != null);
 
 with stdenv.lib;
 let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
   hasServer = snappy != null && leveldb != null;
   hasMon = hasServer;
   hasMds = hasServer;
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 3849c773a3e..757959f5345 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -3,6 +3,9 @@
 }:
 
 let
+  mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}";
+  mkEnable = mkFlag "enable" "disable";
+  mkWith = mkFlag "with" "without";
   hasX = gtk2 != null || qt4 != null;
 in
 with stdenv.lib;
@@ -17,12 +20,12 @@ stdenv.mkDerivation rec {
   buildInputs = [ libcap gtk2 ncurses qt4 ];
 
   configureFlags = [
-    (mkWith   (libcap != null)  "libcap"          null)
-    (mkWith   (hasX)            "x"               null)
-    (mkEnable (ncurses != null) "pinentry-curses" null)
-    (mkEnable true              "pinentry-tty"    null)
-    (mkEnable (gtk2 != null)    "pinentry-gtk2"   null)
-    (mkEnable (qt4 != null)     "pinentry-qt4"    null)
+    (mkWith   (libcap != null)  "libcap")
+    (mkWith   (hasX)            "x")
+    (mkEnable (ncurses != null) "pinentry-curses")
+    (mkEnable true              "pinentry-tty")
+    (mkEnable (gtk2 != null)    "pinentry-gtk2")
+    (mkEnable (qt4 != null)     "pinentry-qt4")
   ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 195e6bc4329..a9fdcf6fa64 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -7,6 +7,9 @@
 }:
 
 with stdenv.lib;
+let
+  mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
+in
 stdenv.mkDerivation rec {
   name = "rsyslog-8.9.0";
 
@@ -23,70 +26,70 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optional stdenv.isLinux systemd;
 
   configureFlags = [
-    (mkOther                            "sysconfdir"           "/etc")
-    (mkOther                            "localstatedir"        "/var")
-    (mkWith   true                      "systemdsystemunitdir" "\${out}/etc/systemd/system")
-    (mkEnable true                      "largefile"            null)
-    (mkEnable true                      "regexp"               null)
-    (mkEnable (krb5 != null)            "gssapi-krb5"          null)
-    (mkEnable true                      "klog"                 null)
-    (mkEnable true                      "kmsg"                 null)
-    (mkEnable (systemd != null)         "imjournal"            null)
-    (mkEnable true                      "inet"                 null)
-    (mkEnable (jemalloc != null)        "jemalloc"             null)
-    (mkEnable true                      "unlimited-select"     null)
-    (mkEnable true                      "usertools"            null)
-    (mkEnable (libmysql != null)        "mysql"                null)
-    (mkEnable (postgresql != null)      "pgsql"                null)
-    (mkEnable (libdbi != null)          "libdbi"               null)
-    (mkEnable (net_snmp != null)        "snmp"                 null)
-    (mkEnable (libuuid != null)         "uuid"                 null)
-    (mkEnable (curl != null)            "elasticsearch"        null)
-    (mkEnable (gnutls != null)          "gnutls"               null)
-    (mkEnable (libgcrypt != null)       "libgcrypt"            null)
-    (mkEnable true                      "rsyslogrt"            null)
-    (mkEnable true                      "rsyslogd"             null)
-    (mkEnable true                      "mail"                 null)
-    (mkEnable (liblognorm != null)      "mmnormalize"          null)
-    (mkEnable true                      "mmjsonparse"          null)
-    (mkEnable true                      "mmaudit"              null)
-    (mkEnable true                      "mmanon"               null)
-    (mkEnable true                      "mmutf8fix"            null)
-    (mkEnable true                      "mmcount"              null)
-    (mkEnable true                      "mmsequence"           null)
-    (mkEnable true                      "mmfields"             null)
-    (mkEnable true                      "mmpstrucdata"         null)
-    (mkEnable (openssl != null)         "mmrfc5424addhmac"     null)
-    (mkEnable (librelp != null)         "relp"                 null)
-    (mkEnable (libgt != null)           "guardtime"            null)
-    (mkEnable (liblogging != null)      "liblogging-stdlog"    null)
-    (mkEnable (liblogging != null)      "rfc3195"              null)
-    (mkEnable true                      "imfile"               null)
-    (mkEnable false                     "imsolaris"            null)
-    (mkEnable true                      "imptcp"               null)
-    (mkEnable true                      "impstats"             null)
-    (mkEnable true                      "omprog"               null)
-    (mkEnable (libnet != null)          "omudpspoof"           null)
-    (mkEnable true                      "omstdout"             null)
-    (mkEnable (systemd != null)         "omjournal"            null)
-    (mkEnable true                      "pmlastmsg"            null)
-    (mkEnable true                      "pmcisconames"         null)
-    (mkEnable true                      "pmciscoios"           null)
-    (mkEnable true                      "pmaixforwardedfrom"   null)
-    (mkEnable true                      "pmsnare"              null)
-    (mkEnable true                      "omruleset"            null)
-    (mkEnable true                      "omuxsock"             null)
-    (mkEnable true                      "mmsnmptrapd"          null)
-    (mkEnable (hadoop != null)          "omhdfs"               null)
-    (mkEnable (rdkafka != null)         "omkafka"              null)
-    (mkEnable (libmongo-client != null) "ommongodb"            null)
-    (mkEnable (czmq != null)            "imzmq3"               null)
-    (mkEnable (czmq != null)            "imczmq"               null)
-    (mkEnable (czmq != null)            "omzmq3"               null)
-    (mkEnable (czmq != null)            "omczmq"               null)
-    (mkEnable (rabbitmq-c != null)      "omrabbitmq"           null)
-    (mkEnable (hiredis != null)         "omhiredis"            null)
-    (mkEnable true                      "generate-man-pages"   null)
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-systemdsystemunitdir=\${out}/etc/systemd/system"
+    (mkFlag true                      "largefile")
+    (mkFlag true                      "regexp")
+    (mkFlag (krb5 != null)            "gssapi-krb5")
+    (mkFlag true                      "klog")
+    (mkFlag true                      "kmsg")
+    (mkFlag (systemd != null)         "imjournal")
+    (mkFlag true                      "inet")
+    (mkFlag (jemalloc != null)        "jemalloc")
+    (mkFlag true                      "unlimited-select")
+    (mkFlag true                      "usertools")
+    (mkFlag (libmysql != null)        "mysql")
+    (mkFlag (postgresql != null)      "pgsql")
+    (mkFlag (libdbi != null)          "libdbi")
+    (mkFlag (net_snmp != null)        "snmp")
+    (mkFlag (libuuid != null)         "uuid")
+    (mkFlag (curl != null)            "elasticsearch")
+    (mkFlag (gnutls != null)          "gnutls")
+    (mkFlag (libgcrypt != null)       "libgcrypt")
+    (mkFlag true                      "rsyslogrt")
+    (mkFlag true                      "rsyslogd")
+    (mkFlag true                      "mail")
+    (mkFlag (liblognorm != null)      "mmnormalize")
+    (mkFlag true                      "mmjsonparse")
+    (mkFlag true                      "mmaudit")
+    (mkFlag true                      "mmanon")
+    (mkFlag true                      "mmutf8fix")
+    (mkFlag true                      "mmcount")
+    (mkFlag true                      "mmsequence")
+    (mkFlag true                      "mmfields")
+    (mkFlag true                      "mmpstrucdata")
+    (mkFlag (openssl != null)         "mmrfc5424addhmac")
+    (mkFlag (librelp != null)         "relp")
+    (mkFlag (libgt != null)           "guardtime")
+    (mkFlag (liblogging != null)      "liblogging-stdlog")
+    (mkFlag (liblogging != null)      "rfc3195")
+    (mkFlag true                      "imfile")
+    (mkFlag false                     "imsolaris")
+    (mkFlag true                      "imptcp")
+    (mkFlag true                      "impstats")
+    (mkFlag true                      "omprog")
+    (mkFlag (libnet != null)          "omudpspoof")
+    (mkFlag true                      "omstdout")
+    (mkFlag (systemd != null)         "omjournal")
+    (mkFlag true                      "pmlastmsg")
+    (mkFlag true                      "pmcisconames")
+    (mkFlag true                      "pmciscoios")
+    (mkFlag true                      "pmaixforwardedfrom")
+    (mkFlag true                      "pmsnare")
+    (mkFlag true                      "omruleset")
+    (mkFlag true                      "omuxsock")
+    (mkFlag true                      "mmsnmptrapd")
+    (mkFlag (hadoop != null)          "omhdfs")
+    (mkFlag (rdkafka != null)         "omkafka")
+    (mkFlag (libmongo-client != null) "ommongodb")
+    (mkFlag (czmq != null)            "imzmq3")
+    (mkFlag (czmq != null)            "imczmq")
+    (mkFlag (czmq != null)            "omzmq3")
+    (mkFlag (czmq != null)            "omczmq")
+    (mkFlag (rabbitmq-c != null)      "omrabbitmq")
+    (mkFlag (hiredis != null)         "omhiredis")
+    (mkFlag true                      "generate-man-pages")
   ];
 
   meta = {

From 93bd7f95aae0bc9f60c4e5cb5f50608bf57a3a13 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:33:47 +0200
Subject: [PATCH 0721/2322] Revert "389-ds-base: Remove kerberos line as it is
 strictly dependent on krb5"

This reverts commit b1e4371a1cb5b8aa45ee3cd8b5ba5537f60d53b0.
---
 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 3bc4b6d11c6..d90d75a8948 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8587,7 +8587,9 @@ let
 
   ### SERVERS
 
-  "389-ds-base" = callPackage ../servers/ldap/389 { };
+  "389-ds-base" = callPackage ../servers/ldap/389 {
+    kerberos = libkrb5;
+  };
 
   rdf4store = callPackage ../servers/http/4store { };
 

From 832aeb66f87fdd2fda341f2c58df570ac05e09c1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:33:51 +0200
Subject: [PATCH 0722/2322] Revert "Fix krb5 reference"

This reverts commit 9f0da5315b4595c45ace01727808e2ae8750efc0.
---
 pkgs/servers/ldap/389/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index 33d63f6ee03..685d365ed18 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap, db, cyrus_sasl
-, svrcore, icu, net_snmp, libkrb5, pcre, perlPackages
+, svrcore, icu, net_snmp, kerberos, pcre, perlPackages
 }:
 let
   version = "1.3.3.9";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig perl pam nspr nss openldap db cyrus_sasl svrcore icu
-    net_snmp libkrb5 pcre
+    net_snmp kerberos pcre
   ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]);
 
   # TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d90d75a8948..d3bf954a73b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8588,7 +8588,7 @@ let
   ### SERVERS
 
   "389-ds-base" = callPackage ../servers/ldap/389 {
-    kerberos = libkrb5;
+    kerberos = krb5;
   };
 
   rdf4store = callPackage ../servers/http/4store { };

From 5931932f05e0855785c309abdf5f147438bd3dfb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:34:42 +0200
Subject: [PATCH 0723/2322] Revert "rsyslog: krb5 -> libkrb5 argument changed
 few commits ago"

This reverts commit 6a5126348bd29124f8d9846170edac5a463240d5.
---
 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 d3bf954a73b..376b66431e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -868,7 +868,7 @@ let
   };
 
   rsyslog-light = callPackage ../tools/system/rsyslog {
-    libkrb5 = null;
+    krb5 = null;
     systemd = null;
     jemalloc = null;
     libmysql = null;

From 4c16c271f6730ca73e33a350208495c61aaf65a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:35:08 +0200
Subject: [PATCH 0724/2322] Revert "audit: 2.9.1 -> 2.9.2"

This reverts commit 7e126ac83ee1689df4d22bb4ad9c4163acc734a0.
---
 pkgs/os-specific/linux/audit/default.nix      | 58 +++++--------------
 .../os-specific/linux/libsemanage/default.nix |  4 +-
 pkgs/top-level/all-packages.nix               |  8 +--
 3 files changed, 16 insertions(+), 54 deletions(-)

diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix
index 8365017d13b..05b9eb9e56f 100644
--- a/pkgs/os-specific/linux/audit/default.nix
+++ b/pkgs/os-specific/linux/audit/default.nix
@@ -1,61 +1,29 @@
-{ stdenv, fetchurl
-, libcap_ng
-
-# Optional Dependencies
-, openldap ? null, python ? null, go ? null, krb5 ? null, tcp_wrappers ? null
-
-# Extra arguments
-, prefix ? ""
+{ stdenv, fetchurl, openldap
+, enablePython ? false, python ? null
 }:
 
-with stdenv;
-let
-  libOnly = prefix == "lib";
+assert enablePython -> python != null;
 
-  optOpenldap = if libOnly then null else shouldUsePkg openldap;
-  optPython = shouldUsePkg python;
-  optGo = shouldUsePkg go;
-  optKrb5 = if libOnly then null else shouldUsePkg krb5;
-  optTcp_wrappers = if libOnly then null else shouldUsePkg tcp_wrappers;
-in
-with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "${prefix}audit-${version}";
-  version = "2.4.2";
+  name = "audit-2.4.1";
 
   src = fetchurl {
-    url = "http://people.redhat.com/sgrubb/audit/audit-${version}.tar.gz";
-    sha256 = "08j134s4509rxfi3hwsp8yyxzlqqxl8kqgv2rfv6p3qng5pjd80j";
+    url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz";
+    sha256 = "09ihn392pmac1pyjrs22966csia83yr84hq5ri6sybwj1vx4d4q5";
   };
 
-  buildInputs = [ libcap_ng optOpenldap optPython optGo optKrb5 optTcp_wrappers ];
+  buildInputs = [ openldap ]
+            ++ stdenv.lib.optional enablePython python;
 
-  # For libs only build and install the lib portion
-  preBuild = optionalString libOnly ''
-    cd lib
+  configureFlags = ''
+    ${if enablePython then "--with-python" else "--without-python"}
   '';
 
-  configureFlags = [
-    (mkWith   (optPython != null)       "python"      null)
-    (mkWith   (optGo != null)           "golang"      null)
-    (mkEnable (!libOnly)                "listener"    null)
-    (mkEnable (optKrb5 != null)         "gssapi-krb5" null)
-    (mkEnable false                     "systemd"     null)
-    (mkWith   false                     "debug"       null)
-    (mkWith   false                     "warn"        null)
-    (mkWith   false                     "alpha"       null)  # TODO: Support
-    (mkWith   false                     "arm"         null)  # TODO: Support
-    (mkWith   false                     "aarch64"     null)  # TODO: Support
-    (mkWith   (!libOnly)                "apparmor"    null)
-    (mkWith   false                     "prelude"     null)
-    (mkWith   (optTcp_wrappers != null) "libwrap"     optTcp_wrappers)
-  ];
-
   meta = {
     description = "Audit Library";
     homepage = "http://people.redhat.com/sgrubb/audit/";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ fuuzetsu wkennington ];
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }
diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index fbb4be53211..599da9e4b3c 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex, libaudit }:
+{ stdenv, fetchurl, libsepol, libselinux, ustr, bzip2, bison, flex, audit }:
 stdenv.mkDerivation rec {
 
   name = "libsemanage-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-fstack-protector-all";
   NIX_CFLAGS_LINK = "-lsepol";
 
-  buildInputs = [ libsepol libselinux ustr bzip2 bison flex libaudit ];
+  buildInputs = [ libsepol libselinux ustr bzip2 bison flex audit ];
 
   meta = with stdenv.lib; {
     inherit (libsepol.meta) homepage platforms maintainers;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 376b66431e3..46cd16c1210 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9190,13 +9190,7 @@ let
 
   atop = callPackage ../os-specific/linux/atop { };
 
-  audit = callPackage ../os-specific/linux/audit {
-    python = null;
-    go = null;
-  };
-  libaudit = audit.override {
-    prefix = "lib";
-  };
+  audit = callPackage ../os-specific/linux/audit { };
 
   b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { };
 

From 0a4de71cb09a89f9f21591b01d81d86e16a5d0c8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:35:39 +0200
Subject: [PATCH 0725/2322] Revert "bind: Add propagatedBuildInputs"

This reverts commit 9f70b1ab313ecfd6322e488879deb32ab58ccaf3.
---
 pkgs/servers/dns/bind/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 604908a4522..70d88b2a968 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -55,11 +55,6 @@ stdenv.mkDerivation rec {
     optReadline optLibcap optIdnkit optLibiconv optPostgresql optLibmysql
     optDb optOpenldap
   ];
-  # TODO(wkennington): Remove this hack once we fix header / .la  / .pc files
-  propagatedBuildInputs = [
-    optKerberos optOpenssl optLibxml2 optJson_c
-    optLibseccomp optLibcap
-  ];
 
   configureFlags = [
     (mkOther                          "localstatedir"       "/var")

From 4fdf48907374c20a14d211bf16746091eb90f0d9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:35:41 +0200
Subject: [PATCH 0726/2322] Revert "dnsutils: Add smaller derivation of bind"

This reverts commit bb6ac771c40342d578aa5959d81454b3676b0e49.
---
 pkgs/servers/dns/bind/default.nix | 35 +++++++++----------------------
 pkgs/top-level/all-packages.nix   |  3 ---
 2 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 70d88b2a968..bb4e1a0f8d4 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -7,19 +7,15 @@
 
 # Optional DLZ Modules
 , postgresql ? null, libmysql ? null, db ? null, openldap ? null
-
-# Extra arguments
-, suffix ? ""
 }:
 
+assert postgresql != null;
 with stdenv;
 let
   version = "9.10.2";
 
-  toolsOnly = suffix == "tools";
-
   optLibseccomp = shouldUsePkg libseccomp;
-  optPython = if toolsOnly then null else shouldUsePkg python;
+  optPython = shouldUsePkg python;
   optKerberos = shouldUsePkg kerberos;
   optOpenssl = shouldUsePkg openssl;
   optLibxml2 = shouldUsePkg libxml2;
@@ -29,19 +25,18 @@ let
   optIdnkit = shouldUsePkg idnkit;
   optLibiconv = shouldUsePkg libiconv;
 
-  optPostgresql = if toolsOnly then null else shouldUsePkg postgresql;
-  optLibmysql = if toolsOnly then null else shouldUsePkg libmysql;
-  optDb = if toolsOnly then null else shouldUsePkg db;
-  optOpenldap = if toolsOnly then null else shouldUsePkg openldap;
-
-  pythonBin = if optPython == null then null else "${optPython}/bin/python";
+  optPostgresql = shouldUsePkg postgresql;
+  optLibmysql = shouldUsePkg libmysql;
+  optDb = shouldUsePkg db;
+  optOpenldap = shouldUsePkg openldap;
 in
+assert optPostgresql != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "bind${optionalString (suffix != "") "-${suffix}"}-${version}";
+  name = "bind-${version}";
 
   src = fetchurl {
-    url = "http://ftp.isc.org/isc/bind9/${version}/bind-${version}.tar.gz";
+    url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
     sha256 = "163s8pvqj4lyryvfzkc6acbys7gw1by5dqwilggiwp54ia8bg6vg";
   };
 
@@ -60,7 +55,7 @@ stdenv.mkDerivation rec {
     (mkOther                          "localstatedir"       "/var")
     (mkOther                          "sysconfdir"          "/etc")
     (mkEnable (optLibseccomp != null) "seccomp"             null)
-    (mkWith   (optPython != null)     "python"              pythonBin)
+    (mkWith   (optPython != null)     "python"              "${optPython}/bin/python")
     (mkEnable true                    "kqueue"              null)
     (mkEnable true                    "epoll"               null)
     (mkEnable true                    "devpoll"             null)
@@ -114,18 +109,8 @@ stdenv.mkDerivation rec {
   installFlags = [
     "sysconfdir=\${out}/etc"
     "localstatedir=\${TMPDIR}"
-  ] ++ optionals toolsOnly [
-    "DESTDIR=\${TMPDIR}"
   ];
 
-  postInstall = optionalString toolsOnly ''
-    mkdir -p $out/{bin,etc,lib,share/man/man1}
-    install -m 0755 $TMPDIR/$out/bin/{dig,nslookup,nsupdate} $out/bin
-    install -m 0644 $TMPDIR/$out/etc/bind.keys $out/etc
-    install -m 0644 $TMPDIR/$out/lib/*.so.* $out/lib
-    install -m 0644 $TMPDIR/$out/share/man/man1/{dig,nslookup,nsupdate}.1 $out/share/man/man1
-  '';
-
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46cd16c1210..0a7090ae4bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8642,9 +8642,6 @@ let
   sabnzbd = callPackage ../servers/sabnzbd { };
 
   bind = callPackage ../servers/dns/bind { };
-  dnsutils = bind.override {
-    suffix = "tools";
-  };
 
   bird = callPackage ../servers/bird { };
 

From 676fbc257872c0329ec7d4e42da4233d8629bba4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:35:49 +0200
Subject: [PATCH 0727/2322] Revert "bind: Enable parallel building"

This reverts commit e74b5704a854ad796b0df36d0d38f1ec1ba2da4e.
---
 pkgs/servers/dns/bind/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index bb4e1a0f8d4..b60998ce6aa 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -111,8 +111,6 @@ stdenv.mkDerivation rec {
     "localstatedir=\${TMPDIR}"
   ];
 
-  enableParallelBuilding = true;
-
   meta = {
     homepage = "http://www.isc.org/software/bind";
     description = "Domain name server";

From ab8b68cd9988a17ccda07b57dcc2c11c30056690 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:35:51 +0200
Subject: [PATCH 0728/2322] Revert "bind: Modify build"

This reverts commit 0a06b99d69000e5da2b6dc33abf91ab73961f1cf.
---
 pkgs/servers/dns/bind/default.nix | 118 +++++-------------------------
 1 file changed, 20 insertions(+), 98 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index b60998ce6aa..fbfa2d8d9b7 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,37 +1,7 @@
-{ stdenv, fetchurl, libtool, docbook5_xsl
+{ stdenv, fetchurl, openssl, libtool, perl, libxml2 }:
 
-# Optional Dependencies
-, libseccomp ? null, python ? null, kerberos ? null, openssl ? null
-, libxml2 ? null, json_c ? null, readline ? null, libcap ? null, idnkit ? null
-, libiconv ? null
+let version = "9.10.2"; in
 
-# Optional DLZ Modules
-, postgresql ? null, libmysql ? null, db ? null, openldap ? null
-}:
-
-assert postgresql != null;
-with stdenv;
-let
-  version = "9.10.2";
-
-  optLibseccomp = shouldUsePkg libseccomp;
-  optPython = shouldUsePkg python;
-  optKerberos = shouldUsePkg kerberos;
-  optOpenssl = shouldUsePkg openssl;
-  optLibxml2 = shouldUsePkg libxml2;
-  optJson_c = shouldUsePkg json_c;
-  optReadline = shouldUsePkg readline;
-  optLibcap = if !stdenv.isLinux then null else shouldUsePkg libcap;
-  optIdnkit = shouldUsePkg idnkit;
-  optLibiconv = shouldUsePkg libiconv;
-
-  optPostgresql = shouldUsePkg postgresql;
-  optLibmysql = shouldUsePkg libmysql;
-  optDb = shouldUsePkg db;
-  optOpenldap = shouldUsePkg openldap;
-in
-assert optPostgresql != null;
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
@@ -44,78 +14,30 @@ stdenv.mkDerivation rec {
     sed -i 's/^\t.*run/\t/' Makefile.in
   '';
 
-  nativeBuildInputs = [ optPython libtool docbook5_xsl ];
-  buildInputs = [
-    optLibseccomp optPython optKerberos optOpenssl optLibxml2 optJson_c
-    optReadline optLibcap optIdnkit optLibiconv optPostgresql optLibmysql
-    optDb optOpenldap
-  ];
+  buildInputs = [ openssl libtool perl libxml2 ];
 
   configureFlags = [
-    (mkOther                          "localstatedir"       "/var")
-    (mkOther                          "sysconfdir"          "/etc")
-    (mkEnable (optLibseccomp != null) "seccomp"             null)
-    (mkWith   (optPython != null)     "python"              "${optPython}/bin/python")
-    (mkEnable true                    "kqueue"              null)
-    (mkEnable true                    "epoll"               null)
-    (mkEnable true                    "devpoll"             null)
-    (mkWith   false                   "geoip"               null)  # TODO(wkennington): GeoDNS support
-    (mkWith   (optKerberos != null)   "gssapi"              optKerberos)
-    (mkWith   true                    "libtool"             null)
-    (mkEnable (optOpenssl == null)    "native-pkcs11"       null)
-    (mkWith   (optOpenssl != null)    "openssl"             optOpenssl)
-    (mkWith   true                    "pkcs11"              null)
-    (mkWith   true                    "ecdsa"               null)
-    (mkWith   false                   "gost"                null)  # Insecure cipher
-    (mkWith   true                    "aes"                 null)
-    (mkEnable (optOpenssl != null)    "openssl-hash"        null)
-    (mkEnable true                    "sit"                 null)
-    (mkWith   true                    "sit-alg"             "aes")
-    (mkWith   (optLibxml2 != null)    "libxml2"             optLibxml2)
-    (mkWith   (optJson_c != null)     "libjson"             optJson_c)
-    (mkEnable true                    "largefile"           null)
-    (mkWith   false                   "purify"              null)
-    (mkWith   false                   "gperftools-profiler" null)
-    (mkEnable false                   "backtrace"           null)
-    (mkEnable false                   "symtable"            null)
-    (mkEnable true                    "ipv6"                null)
-    (mkWith   false                   "kame"                null)
-    (mkWith   (optReadline != null)   "readline"            null)
-    (mkEnable (optKerberos == null)   "isc-spnego"          null)
-    (mkEnable true                    "chroot"              null)
-    (mkEnable (optLibcap != null)     "linux-caps"          null)
-    (mkEnable true                    "atomic"              null)
-    (mkEnable false                   "fixed-rrset"         null)
-    (mkEnable true                    "rpz-nsip"            null)
-    (mkEnable true                    "rpz-nsdname"         null)
-    (mkEnable true                    "filter-aaaa"         null)
-    (mkWith   true                    "docbook-xsl"         "${docbook5_xsl}/share/xsl/docbook")
-    (mkWith   (optIdnkit != null)     "idn"                 optIdnkit)
-    (mkWith   (optLibiconv != null)   "libiconv"            optLibiconv)
-    (mkWith   false                   "atf"                 null)
-    (mkWith   true                    "tuning"              "large")
-    (mkWith   true                    "dlopen"              null)
-    (mkWith   false                   "make-clean"          null)
-    (mkEnable true                    "full-report"         null)
-    (mkWith   (optPostgresql != null) "dlz-postgres"        optPostgresql)
-    (mkWith   (optLibmysql != null)   "dlz-mysql"           optLibmysql)
-    (mkWith   (optDb != null)         "dlz-bdb"             optDb)
-    (mkWith   true                    "dlz-filesystem"      null)
-    (mkWith   (optOpenldap != null)   "dlz-ldap"            optOpenldap)
-    (mkWith   false                   "dlz-odbc"            null)
-    (mkWith   true                    "dlz-stub"            null)
-  ];
-
-  installFlags = [
-    "sysconfdir=\${out}/etc"
-    "localstatedir=\${TMPDIR}"
+    "--localstatedir=/var"
+    "--with-libtool"
+    "--with-libxml2=${libxml2}"
+    "--with-openssl=${openssl}"
+    "--without-atf"
+    "--without-dlopen"
+    "--without-docbook-xsl"
+    "--without-gssapi"
+    "--without-idn"
+    "--without-idnlib"
+    "--without-pkcs11"
+    "--without-purify"
+    "--without-python"
   ];
 
   meta = {
     homepage = "http://www.isc.org/software/bind";
     description = "Domain name server";
-    license = licenses.isc;
-    maintainers = with maintainers; [ viric simons wkennington ];
-    platforms = platforms.unix;
+    license = stdenv.lib.licenses.isc;
+
+    maintainers = with stdenv.lib.maintainers; [viric simons];
+    platforms = with stdenv.lib.platforms; unix;
   };
 }

From 16f87d772f68840b342285f550565e74850ef42d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:37:16 +0200
Subject: [PATCH 0729/2322] Revert "libverto: Add derivation"

This reverts commit 4389ae5208ec9b7e80b3b0e4ee10e2709333519f.
---
 .../libraries/libverto/default.nix            | 41 -------------------
 pkgs/top-level/all-packages.nix               |  4 --
 2 files changed, 45 deletions(-)
 delete mode 100644 pkgs/development/libraries/libverto/default.nix

diff --git a/pkgs/development/libraries/libverto/default.nix b/pkgs/development/libraries/libverto/default.nix
deleted file mode 100644
index e4097aa57d6..00000000000
--- a/pkgs/development/libraries/libverto/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, pkgconfig
-
-# Optional Dependencies
-, glib ? null, libev ? null, libevent ? null, tevent ? null, talloc ? null
-}:
-with stdenv;
-let
-  optGlib = shouldUsePkg glib;
-  optLibev = shouldUsePkg libev;
-  optLibevent = shouldUsePkg libevent;
-  optTevent = shouldUsePkg tevent;
-  optTalloc = shouldUsePkg talloc;
-in
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  name = "libverto-0.2.6";
-
-  src = fetchurl {
-    url = "https://fedorahosted.org/releases/l/i/libverto/${name}.tar.gz";
-    sha256 = "17hwr55ga0rkm5cnyfiipyrk9n372x892ph9wzi88j2zhnisdv0p";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ optGlib optLibev optLibevent ]
-    ++ optionals (optTevent != null && optTalloc != null) [
-      optTevent optTalloc
-    ];
-
-  postInstall = ''
-    # In v0.2.6 the shipped pkg-config files have an out of order
-    # declaration of exec_prefix breaking them. This fixes that issue
-    sed -i 's,''${exec_prefix},''${prefix},g' $out/lib/pkgconfig/*.pc
-  '';
-
-  meta = {
-    homepage = https://fedorahosted.org/libverto/;
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ wkennington ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a7090ae4bd..a599eb12d5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7213,10 +7213,6 @@ let
 
   libvdpau = callPackage ../development/libraries/libvdpau { };
 
-  libverto = callPackage ../development/libraries/libverto {
-    glib = null; # Don't include fairly heavy dependency
-  };
-
   libvirt = callPackage ../development/libraries/libvirt { };
 
   libvirt-glib = callPackage ../development/libraries/libvirt-glib { };

From eae17c3743bd8ea710308db7fad4602c97ff7893 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:38:03 +0200
Subject: [PATCH 0730/2322] Revert "libxml2: Refactor and fix library
 propagation"

This reverts commit 287ec76b8fb2f670b068266d77edc8714d0d06df.
---
 .../development/libraries/libxml2/default.nix | 72 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 0d70a6502fe..153096ee45c 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,63 +1,49 @@
-{ stdenv, fetchurl, findXMLCatalogs
+{ stdenv, fetchurl, zlib, xz, python ? null, pythonSupport ? true, findXMLCatalogs }:
 
-# Optional Dependencies
-, icu ? null, python ? null, readline ? null, zlib ? null, xz ? null
-}:
+assert pythonSupport -> python != null;
 
 #TODO: share most stuff between python and non-python builds, perhaps via multiple-output
 
 let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
-  optIcu = shouldUsePkg icu;
-  optPython = shouldUsePkg python;
-  optReadline = shouldUsePkg readline;
-  optZlib = shouldUsePkg zlib;
-  optXz = shouldUsePkg xz;
-
-  sitePackages = if optPython == null then null else
-    "\${out}/lib/${python.libPrefix}/site-packages";
-in
-stdenv.mkDerivation rec {
-  name = "libxml2-${version}";
   version = "2.9.2";
+in
+
+stdenv.mkDerivation (rec {
+  name = "libxml2-${version}";
 
   src = fetchurl {
     url = "http://xmlsoft.org/sources/${name}.tar.gz";
     sha256 = "1g6mf03xcabmk5ing1lwqmasr803616gb2xhn7pll10x2l5w6y2i";
   };
 
-  buildInputs = [ optIcu optPython optReadline optZlib optXz ];
-  propagatedBuildInputs = [ findXMLCatalogs ];
+  buildInputs = stdenv.lib.optional pythonSupport python
+    # Libxml2 has an optional dependency on liblzma.  However, on impure
+    # platforms, it may end up using that from /usr/lib, and thus lack a
+    # RUNPATH for that, leading to undefined references for its users.
+    ++ (stdenv.lib.optional stdenv.isFreeBSD xz);
 
-  configureFlags = [
-    (mkWith (optIcu != null)      "icu"                optIcu)
-    (mkWith (optPython != null)   "python"             optPython)
-    (mkWith (optPython != null)   "python-install-dir" sitePackages)
-    (mkWith (optReadline != null) "readline"           optReadline)
-    (mkWith (optZlib != null)     "zlib"               optZlib)
-    (mkWith (optXz != null)       "lzma"               optXz)
-  ];
+  propagatedBuildInputs = [ zlib findXMLCatalogs ];
+
+  passthru = { inherit pythonSupport version; };
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = http://xmlsoft.org/;
     description = "An XML parsing library for C";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ eelco wkennington ];
+    license = "bsd";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 
-  passthru = {
-    inherit version;
-    pythonSupport = python != null;
-  };
-}
+} // stdenv.lib.optionalAttrs pythonSupport {
+  configureFlags = "--with-python=${python}";
+
+  # this is a pair of ugly hacks to make python stuff install into the right place
+  preInstall = ''substituteInPlace python/libxml2mod.la --replace "${python}" "$out"'';
+  installFlags = ''pythondir="$(out)/lib/${python.libPrefix}/site-packages"'';
+
+} // stdenv.lib.optionalAttrs (!pythonSupport) {
+  configureFlags = "--with-python=no"; # otherwise build impurity bites us
+})
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a599eb12d5f..853965959fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7259,11 +7259,11 @@ let
   libxmi = callPackage ../development/libraries/libxmi { };
 
   libxml2 = callPackage ../development/libraries/libxml2 {
-    python = null;
+    pythonSupport = false;
   };
 
   libxml2Python = lowPrio (libxml2.override {
-    inherit python;
+    pythonSupport = true;
   });
 
   libxmlxx = callPackage ../development/libraries/libxmlxx { };

From 513bd8bd2226c6191b8086e1c1dac9198d8b8a84 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:38:40 +0200
Subject: [PATCH 0731/2322] Revert "libmicrohttpd: Modernize"

This reverts commit c5d13d4fe96674a4fcb04b54ea552847302e13ee.
---
 .../libraries/libmicrohttpd/default.nix       | 69 ++++++-------------
 1 file changed, 21 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 9eca6bd84b9..8b9f6f1dca5 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -1,65 +1,38 @@
-{ stdenv, fetchurl, pkgconfig
-, curl
+{stdenv, fetchurl, curl, libgcrypt}:
 
-# Optional Dependencies
-, openssl ? null, zlib ? null, libgcrypt ? null, gnutls ? null
-}:
-
-let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
-  optOpenssl = shouldUsePkg openssl;
-  optZlib = shouldUsePkg zlib;
-  hasSpdy = optOpenssl != null && optZlib != null;
-
-  optLibgcrypt = shouldUsePkg libgcrypt;
-  optGnutls = shouldUsePkg gnutls;
-  hasHttps = optLibgcrypt != null && optGnutls != null;
-in
-with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libmicrohttpd-0.9.41";
+  name = "libmicrohttpd-0.9.38";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "0z3s3aplgxj8cj947i4rxk9wzvg68b8hbn71fyipc7aagmivx64p";
+    sha256 = "08g7p4l0p2fsjj8ayl68zq1bqgrn0pck19bm8yd7k61whvfv9wld";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = optional doCheck curl
-    ++ optionals hasSpdy [ optOpenssl optZlib ]
-    ++ optionals hasHttps [ optLibgcrypt optGnutls ];
+  buildInputs = [ curl libgcrypt ];
 
-  configureFlags = [
-    (mkWith   true                 "threads"       "posix")
-    (mkEnable true                 "doc"           null)
-    (mkEnable false                "examples"      null)
-    (mkEnable true                 "epoll"         "auto")
-    (mkEnable doCheck              "curl"          null)
-    (mkEnable hasSpdy              "spdy"          null)
-    (mkEnable true                 "messages"      null)
-    (mkEnable true                 "postprocessor" null)
-    (mkWith   hasHttps             "gnutls"        null)
-    (mkEnable hasHttps             "https"         null)
-    (mkEnable true                 "bauth"         null)
-    (mkEnable true                 "dauth"         null)
-  ];
+  preCheck =
+    # Since `localhost' can't be resolved in a chroot, work around it.
+    '' for i in "src/test"*"/"*.[ch]
+       do
+         sed -i "$i" -es/localhost/127.0.0.1/g
+       done
+    '';
 
   # Disabled because the tests can time-out.
   doCheck = false;
 
   meta = {
     description = "Embeddable HTTP server library";
+
+    longDescription = ''
+      GNU libmicrohttpd is a small C library that is supposed to make
+      it easy to run an HTTP server as part of another application.
+    '';
+
+    license = stdenv.lib.licenses.lgpl2Plus;
+
     homepage = http://www.gnu.org/software/libmicrohttpd/;
-    license = licenses.lgpl2Plus;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ wkennington ];
+
+    maintainers = [ ];
   };
 }

From 68493cd8dc25a1e2e4d1007305a39cc710855d86 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 11:32:16 +0200
Subject: [PATCH 0732/2322] Revert "curl: propagate inputs instead of patching
 pkgconfig"

This reverts commit 206d63edaccfccaeedbc5d7fb8828fe8fb6d8305.
---
 pkgs/tools/networking/curl/default.nix | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index ad2c9ec6897..f8b3ad9355a 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   # Use pkgconfig only when necessary
   nativeBuildInputs = optional (!isLight) pkgconfig;
-  propagatedBuildInputs = [
+  buildInputs = [
     optZlib optOpenssl optLibssh2 optLibnghttp2 optC-ares
     optGss optRtmpdump optOpenldap optLibidn
   ];
@@ -102,6 +102,27 @@ stdenv.mkDerivation rec {
     (mkEnable (optC-ares != null)     "ares"              null)
   ];
 
+  # Fix all broken refernces to dependencies in .la and .pc files
+  postInstall = optionalString (optZlib != null) ''
+    sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
+  '' + optionalString (optOpenssl != null) ''
+    sed -i 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+  '' + optionalString (optLibssh2 != null) ''
+    sed -i 's,\(-lssh2\),-L${optLibssh2}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+  '' + optionalString (optLibnghttp2 != null) ''
+    sed -i 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+  '' + optionalString (optC-ares != null) ''
+    sed -i 's,\(-lcares\),-L${optC-ares}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
+  '' + optionalString (optGss != null) ''
+    sed -i 's,\(-lgss\),-L${optGss}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
+  '' + optionalString (optRtmpdump != null) ''
+    sed -i 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+  '' + optionalString (optOpenldap != null) ''
+    sed -i 's,\(-lgss\),-L${optOpenldap}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
+  '' + optionalString (optLibidn != null) ''
+    sed -i 's,\(-lidn\),-L${optLibidn}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+  '';
+
   meta = {
     description = "A command line tool for transferring files with URL syntax";
     homepage    = http://curl.haxx.se/;

From cde5053d9a9affc2c60b7446f5d091296d8fa139 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 11:32:28 +0200
Subject: [PATCH 0733/2322] Revert "curl: Modernize build"

This reverts commit 5e3fe3916a1aef6c2b441d9009f8a8d7f14030d6.
---
 .../linux/make-bootstrap-tools-cross.nix      |  10 +-
 pkgs/stdenv/linux/make-bootstrap-tools.nix    |  10 +-
 pkgs/tools/networking/curl/default.nix        | 172 ++++++------------
 pkgs/top-level/all-packages.nix               |  16 +-
 4 files changed, 86 insertions(+), 122 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 520bdd208e3..bf060329be6 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -92,7 +92,11 @@ rec {
     aclSupport = false;
   })).crossDrv;
   
-  curl-light = pkgs.curl-light.crossDrv;
+  curlMinimal = (pkgs.curl.override {
+    zlibSupport = false;
+    sslSupport = false;
+    scpSupport = false;
+  }).crossDrv;
   
   busyboxMinimal = (pkgs.busybox.override {
     # TBD: uClibc is broken.
@@ -166,8 +170,8 @@ rec {
         cp -d ${gnumake}/bin/* $out/bin
         cp -d ${patch}/bin/* $out/bin
         cp ${patchelf}/bin/* $out/bin
-        cp ${curl-light}/bin/curl $out/bin
-        cp -d ${curl-light}/lib/libcurl* $out/lib
+        cp ${curlMinimal}/bin/curl $out/bin
+        cp -d ${curlMinimal}/lib/libcurl* $out/lib
 
         cp -d ${gnugrep.pcre.crossDrv}/lib/libpcre*.so* $out/lib # needed by grep
         
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 6bd67d8c7a0..a995606886f 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -10,6 +10,12 @@ rec {
     aclSupport = false;
   });
 
+  curlMinimal = curl.override {
+    zlibSupport = false;
+    sslSupport = false;
+    scpSupport = false;
+  };
+
   busyboxMinimal = busybox.override {
     useMusl = true;
     enableStatic = true;
@@ -77,8 +83,8 @@ rec {
         cp -d ${gnumake}/bin/* $out/bin
         cp -d ${patch}/bin/* $out/bin
         cp ${patchelf}/bin/* $out/bin
-        cp ${curl-light}/bin/curl $out/bin
-        cp -d ${curl-light}/lib/libcurl* $out/lib
+        cp ${curlMinimal}/bin/curl $out/bin
+        cp -d ${curlMinimal}/lib/libcurl* $out/lib
 
         cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep
 
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index f8b3ad9355a..28f28c9a4f9 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -1,133 +1,81 @@
-{ stdenv, fetchurl, pkgconfig
-
-# Optional Dependencies
-, zlib ? null, openssl ? null, libssh2 ? null, libnghttp2 ? null, c-ares ? null
-, gss ? null, rtmpdump ? null, openldap ? null, libidn ? null
-
-# Extra arguments
-, suffix ? ""
+{ stdenv, fetchurl
+, idnSupport ? false, libidn ? null
+, ldapSupport ? false, openldap ? null
+, zlibSupport ? false, zlib ? null
+, sslSupport ? false, openssl ? null
+, scpSupport ? false, libssh2 ? null
+, gssSupport ? false, gss ? null
+, c-aresSupport ? false, c-ares ? null
 }:
 
-let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
+assert idnSupport -> libidn != null;
+assert ldapSupport -> openldap != null;
+assert zlibSupport -> zlib != null;
+assert sslSupport -> openssl != null;
+assert scpSupport -> libssh2 != null;
+assert c-aresSupport -> c-ares != null;
 
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
-  isLight = suffix == "light";
-  isFull = suffix == "full";
-  nameSuffix = stdenv.lib.optionalString (suffix != "") "-${suffix}";
-
-  # Normal Depedencies
-  optZlib = if isLight then null else shouldUsePkg zlib;
-  optOpenssl = if isLight then null else shouldUsePkg openssl;
-  optLibssh2 = if isLight then null else shouldUsePkg libssh2;
-  optLibnghttp2 = if isLight then null else shouldUsePkg libnghttp2;
-  optC-ares = if isLight then null else shouldUsePkg c-ares;
-
-  # Full dependencies
-  optGss = if !isFull then null else shouldUsePkg gss;
-  optRtmpdump = if !isFull then null else shouldUsePkg rtmpdump;
-  optOpenldap = if !isFull then null else shouldUsePkg openldap;
-  optLibidn = if !isFull then null else shouldUsePkg libidn;
-in
-with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "curl${nameSuffix}-${version}";
-  version = "7.42.1";
+  name = "curl-7.42.1";
 
   src = fetchurl {
-    url = "http://curl.haxx.se/download/curl-${version}.tar.bz2";
+    url = "http://curl.haxx.se/download/${name}.tar.bz2";
     sha256 = "11y8racpj6m4j9w7wa9sifmqvdgf22nk901sfkbxzhhy75rmk472";
   };
 
-  # Use pkgconfig only when necessary
-  nativeBuildInputs = optional (!isLight) pkgconfig;
-  buildInputs = [
-    optZlib optOpenssl optLibssh2 optLibnghttp2 optC-ares
-    optGss optRtmpdump optOpenldap optLibidn
-  ];
+  # Zlib and OpenSSL must be propagated because `libcurl.la' contains
+  # "-lz -lssl", which aren't necessary direct build inputs of
+  # applications that use Curl.
+  propagatedBuildInputs = with stdenv.lib;
+    optional idnSupport libidn ++
+    optional ldapSupport openldap ++
+    optional zlibSupport zlib ++
+    optional gssSupport gss ++
+    optional c-aresSupport c-ares ++
+    optional sslSupport openssl ++
+    optional scpSupport libssh2;
 
-  # Make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE
+  # for the second line see http://curl.haxx.se/mail/tracker-2014-03/0087.html
+  preConfigure = ''
+    sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
+    rm src/tool_hugehelp.c
+  '';
+
+  # make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE
   postConfigure = ''
-    echo '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") ? getenv("CURL_CA_BUNDLE") : getenv("SSL_CERT_FILE"))' >> lib/curl_config.h
+    echo  '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") ? getenv("CURL_CA_BUNDLE") : getenv("SSL_CERT_FILE"))' >> lib/curl_config.h
   '';
 
   configureFlags = [
-    (mkEnable true                    "http"              null)
-    (mkEnable true                    "ftp"               null)
-    (mkEnable true                    "file"              null)
-    (mkEnable (optOpenldap != null)   "ldap"              null)
-    (mkEnable (optOpenldap != null)   "ldaps"             null)
-    (mkEnable true                    "rtsp"              null)
-    (mkEnable true                    "proxy"             null)
-    (mkEnable true                    "dict"              null)
-    (mkEnable true                    "telnet"            null)
-    (mkEnable true                    "tftp"              null)
-    (mkEnable true                    "pop3"              null)
-    (mkEnable true                    "imap"              null)
-    (mkEnable true                    "smb"               null)
-    (mkEnable true                    "smtp"              null)
-    (mkEnable true                    "gopher"            null)
-    (mkEnable (!isLight)              "manual"            null)
-    (mkEnable true                    "libcurl_option"    null)
-    (mkEnable false                   "libgcc"            null) # TODO: Enable on gcc
-    (mkWith   (optZlib != null)       "zlib"              null)
-    (mkEnable true                    "ipv4"              null)
-    (mkWith   (optGss != null)        "gssapi"            null)
-    (mkWith   false                   "winssl"            null)
-    (mkWith   false                   "darwinssl"         null)
-    (mkWith   (optOpenssl != null)    "ssl"               null)
-    (mkWith   false                   "gnutls"            null)
-    (mkWith   false                   "polarssl"          null)
-    (mkWith   false                   "cyassl"            null)
-    (mkWith   false                   "nss"               null)
-    (mkWith   false                   "axtls"             null)
-    (mkWith   false                   "libmetalink"       null)
-    (mkWith   (optLibssh2 != null)    "libssh2"           null)
-    (mkWith   (optRtmpdump!= null)    "librtmp"           null)
-    (mkEnable false                   "versioned-symbols" null)
-    (mkWith   false                   "winidn"            null)
-    (mkWith   (optLibidn != null)     "libidn"            null)
-    (mkWith   (optLibnghttp2 != null) "nghttp2"           null)
-    (mkEnable false                   "sspi"              null)
-    (mkEnable true                    "crypto-auth"       null)
-    (mkEnable (optOpenssl != null)    "tls-srp"           null)
-    (mkEnable true                    "unix-sockets"      null)
-    (mkEnable true                    "cookies"           null)
-    (mkEnable (optC-ares != null)     "ares"              null)
-  ];
+      ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
+      ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )
+      ( if ldapSupport then "--enable-ldap" else "--disable-ldap" )
+      ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" )
+      ( if idnSupport then "--with-libidn=${libidn}" else "--without-libidn" )
+    ]
+    ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
+    ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}";
 
-  # Fix all broken refernces to dependencies in .la and .pc files
-  postInstall = optionalString (optZlib != null) ''
-    sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
-  '' + optionalString (optOpenssl != null) ''
-    sed -i 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' $out/lib/pkgconfig/libcurl.pc
-  '' + optionalString (optLibssh2 != null) ''
-    sed -i 's,\(-lssh2\),-L${optLibssh2}/lib \1,' $out/lib/pkgconfig/libcurl.pc
-  '' + optionalString (optLibnghttp2 != null) ''
-    sed -i 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' $out/lib/pkgconfig/libcurl.pc
-  '' + optionalString (optC-ares != null) ''
-    sed -i 's,\(-lcares\),-L${optC-ares}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
-  '' + optionalString (optGss != null) ''
-    sed -i 's,\(-lgss\),-L${optGss}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
-  '' + optionalString (optRtmpdump != null) ''
-    sed -i 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' $out/lib/pkgconfig/libcurl.pc
-  '' + optionalString (optOpenldap != null) ''
-    sed -i 's,\(-lgss\),-L${optOpenldap}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
-  '' + optionalString (optLibidn != null) ''
-    sed -i 's,\(-lidn\),-L${optLibidn}/lib \1,' $out/lib/pkgconfig/libcurl.pc
-  '';
+  CXX = "g++";
+  CXXCPP = "g++ -E";
 
-  meta = {
+  crossAttrs = {
+    # We should refer to the cross built openssl
+    # For the 'urandom', maybe it should be a cross-system option
+    configureFlags = [
+        ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" )
+        "--with-random /dev/urandom"
+      ];
+  };
+
+  passthru = {
+    inherit sslSupport openssl;
+  };
+
+  meta = with stdenv.lib; {
     description = "A command line tool for transferring files with URL syntax";
     homepage    = http://curl.haxx.se/;
-    license     = licenses.mit;
+    maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.all;
-    maintainers = with maintainers; [ lovek323 wkennington ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 853965959fc..465717c6e40 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1145,12 +1145,18 @@ let
 
   cudatoolkit = cudatoolkit5;
 
-  curl-light = curl.override { suffix = "light"; };
-  curl = curl-full.override {
-    fetchurl = fetchurlBoot;
-    suffix = "";
+  curlFull = curl.override {
+    idnSupport = true;
+    ldapSupport = true;
+    gssSupport = true;
+  };
+
+  curl = callPackage ../tools/networking/curl rec {
+    fetchurl = fetchurlBoot;
+    zlibSupport = true;
+    sslSupport = zlibSupport;
+    scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
   };
-  curl-full = callPackage ../tools/networking/curl { suffix = "full"; };
 
   curl3 = callPackage ../tools/networking/curl/7.15.nix rec {
     zlibSupport = true;

From 6c878e0d0505ff02d583da405c6d3cf89851d05c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 11:33:56 +0200
Subject: [PATCH 0734/2322] Fix cacert

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

diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index 205d051ddb2..d743fc47b94 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, nss, curl-full, perl, perlPackages }:
+{ stdenv, nss, curl, perl, perlPackages }:
 
 stdenv.mkDerivation rec {
   name = "nss-cacert-${nss.version}";
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   src = nss.src;
 
   postPatch = ''
-    unpackFile ${curl-full.src};
+    unpackFile ${curl.src};
   '';
 
   nativeBuildInputs = [ perl ] ++ (with perlPackages; [ LWP ]);

From 6cfea50ad14b3225226e64bd77925dc05a593689 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 11:35:20 +0200
Subject: [PATCH 0735/2322] Revert "Explicitly pass -pthread flag to fix the
 build after some updates"

This reverts commit ed38a2d32b643e5ea545f09058d3774b097675b4.
---
 pkgs/development/libraries/kerberos/heimdal.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index b0de8c15146..a615854a6b2 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -77,10 +77,6 @@ stdenv.mkDerivation rec {
     (mkEnable true                   "heimdal-documentation" null)
   ];
 
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -pthread"
-  '';
-
   # We need to build hcrypt for applications like samba
   postBuild = ''
     (cd lib/hcrypto; make)

From 056e2c8d6aec835c72edd852d64a67da10451868 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 11:35:24 +0200
Subject: [PATCH 0736/2322] Revert "heimdal: Disable DCE as it was breaking the
 build"

This reverts commit 0f2de4c64e451a82ff5b7cbef3fead5c1cb01120.
---
 pkgs/development/libraries/kerberos/heimdal.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index a615854a6b2..c06fcdb384e 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -55,11 +55,11 @@ stdenv.mkDerivation rec {
     (mkWith   (optLibcap_ng != null) "capng"                 null)
     (mkWith   (optSqlite != null)    "sqlite3"               sqlite)
     (mkEnable (optSqlite != null)    "sqlite-cache"          null)
-    (mkWith   false                  "libintl"               null)               # TODO libintl fix
+    #(mkWith  true                   "libintl"               glibc)              # TODO libintl fix
     (mkWith   true                   "hdbdir"                "/var/lib/heimdal")
     (mkWith   (optOpenssl != null)   "openssl"               optOpenssl)
     (mkEnable true                   "pthread-support"       null)
-    (mkEnable false                  "dce"                   null)               # TODO: Add support
+    (mkEnable true                   "dce"                   null)
     (mkEnable true                   "afs-support"           null)
     (mkWith   (optDb != null)        "berkeley-db"           optDb)
     (mkEnable false                  "nmdb"                  null)

From 020cb43f551006173582d1f8b440865572770c84 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 11:35:28 +0200
Subject: [PATCH 0737/2322] Revert "kerberos: Modernize build"

This reverts commit 9740b0d12d467aaa0ddc1cc27559374250ae5549.
---
 .../libraries/kerberos/heimdal.nix            | 79 ++++---------------
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 16 insertions(+), 64 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index c06fcdb384e..aeea290bdb2 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,32 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, flex, yacc
-
-# Optional Dependencies
-, openldap ? null, libcap_ng ? null, sqlite ? null, openssl ? null, db ? null
-, readline ? null, libedit ? null, pam ? null
-
-#, readline, openldap, libcap_ng
-#, sqlite, db, ncurses, openssl, cyrus_sasl
+{ stdenv, fetchurl, pkgconfig, flex, yacc, readline, openldap, libcap_ng
+, sqlite, db, ncurses, openssl, cyrus_sasl
 }:
 
-let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
-  optOpenldap = shouldUsePkg openldap;
-  optLibcap_ng = shouldUsePkg libcap_ng;
-  optSqlite = shouldUsePkg sqlite;
-  optOpenssl = shouldUsePkg openssl;
-  optDb = shouldUsePkg db;
-  optReadline = shouldUsePkg readline;
-  optLibedit = shouldUsePkg libedit;
-  optPam = shouldUsePkg pam;
-in
 stdenv.mkDerivation rec {
   name = "heimdal-1.5.3";
 
@@ -38,43 +13,14 @@ stdenv.mkDerivation rec {
     sha256 = "19gypf9vzfrs2bw231qljfl4cqc1riyg0ai0xmm1nd1wngnpphma";
   };
 
-  nativeBuildInputs = [ pkgconfig flex yacc ];
-  buildInputs = [
-    optOpenldap optLibcap_ng optSqlite optOpenssl optDb optReadline optLibedit
-    optPam
-  ];
-
+  ## ugly, X should be made an option
   configureFlags = [
-    (mkOther                         "sysconfdir"            "/etc")
-    (mkOther                         "localstatedir"         "/var")
-    (mkWith   (optOpenldap != null)  "openldap"              optOpenldap)
-    (mkEnable (optOpenldap != null)  "hdb-openldap-module"   null)
-    (mkEnable true                   "pk-init"               null)
-    (mkEnable true                   "digest"                null)
-    (mkEnable true                   "kx509"                 null)
-    (mkWith   (optLibcap_ng != null) "capng"                 null)
-    (mkWith   (optSqlite != null)    "sqlite3"               sqlite)
-    (mkEnable (optSqlite != null)    "sqlite-cache"          null)
-    #(mkWith  true                   "libintl"               glibc)              # TODO libintl fix
-    (mkWith   true                   "hdbdir"                "/var/lib/heimdal")
-    (mkWith   (optOpenssl != null)   "openssl"               optOpenssl)
-    (mkEnable true                   "pthread-support"       null)
-    (mkEnable true                   "dce"                   null)
-    (mkEnable true                   "afs-support"           null)
-    (mkWith   (optDb != null)        "berkeley-db"           optDb)
-    (mkEnable false                  "nmdb"                  null)
-    (mkEnable false                  "developer"             null)
-    (mkWith   true                   "ipv6"                  null)
-    (mkEnable false                  "socket-wrapper"        null)
-    (mkEnable true                   "otp"                   null)
-    (mkEnable false                  "osfc2"                 null)
-    (mkEnable true                   "mmap"                  null)
-    (mkEnable true                   "afs-string-to-key"     null)
-    (mkWith   (optReadline != null)  "readline"              optReadline)
-    (mkWith   (optLibedit != null)   "libedit"               optLibedit)
-    (mkWith   false                  "x"                     null)
-    (mkEnable true                   "kcm"                   null)
-    (mkEnable true                   "heimdal-documentation" null)
+    "--enable-hdb-openldap-module"
+    "--with-capng"
+    "--with-openldap=${openldap}"
+    "--with-sqlite3=${sqlite}"
+    "--with-openssl-lib=${openssl}/lib"
+    "--without-x"
   ];
 
   # We need to build hcrypt for applications like samba
@@ -88,11 +34,16 @@ stdenv.mkDerivation rec {
     (cd lib/hcrypto; make install)
     (cd include/hcrypto; make install)
 
-    # Doesn't succeed with --libexec=$out/sbin, so
+    # dont succeed with --libexec=$out/sbin, so
     mv "$out/libexec/"* $out/sbin/
     rmdir $out/libexec
   '';
 
+  buildInputs = [
+    pkgconfig flex yacc readline openldap libcap_ng sqlite db ncurses
+    cyrus_sasl openssl
+  ];
+
   meta = with stdenv.lib; {
     description = "an implementation of Kerberos 5 (and some more stuff) largely written in Sweden";
     license = licenses.bsd3;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 465717c6e40..529a89befce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6376,6 +6376,7 @@ let
     openldap = openldap.override {
       cyrus_sasl = cyrus_sasl.override { kerberos = null; };
     };
+    cyrus_sasl = cyrus_sasl.override { kerberos = null; };
   };
 
   harfbuzz = callPackage ../development/libraries/harfbuzz { };

From f1f7bd9a931e4b1f2578ca0c8bc27a5bc2a00b47 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 11:41:30 +0200
Subject: [PATCH 0738/2322] libmicrohttpd: Fix build and drop curl dependency

Curl was only used for the test suite, which was disabled anyway.
---
 pkgs/development/libraries/libmicrohttpd/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                      | 5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 8b9f6f1dca5..f1d5a2c43b0 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, curl, libgcrypt}:
+{ lib, stdenv, fetchurl, libgcrypt }:
 
 stdenv.mkDerivation rec {
   name = "libmicrohttpd-0.9.38";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "08g7p4l0p2fsjj8ayl68zq1bqgrn0pck19bm8yd7k61whvfv9wld";
   };
 
-  buildInputs = [ curl libgcrypt ];
+  buildInputs = [ libgcrypt ];
 
   preCheck =
     # Since `localhost' can't be resolved in a chroot, work around it.
@@ -29,10 +29,10 @@ stdenv.mkDerivation rec {
       it easy to run an HTTP server as part of another application.
     '';
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
     homepage = http://www.gnu.org/software/libmicrohttpd/;
 
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 529a89befce..e7856b140cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6959,10 +6959,7 @@ let
 
   libmemcached = callPackage ../development/libraries/libmemcached { };
 
-  libmicrohttpd = callPackage ../development/libraries/libmicrohttpd {
-    openssl = null;
-    gnutls = null;
-  };
+  libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { };
 
   libmikmod = callPackage ../development/libraries/libmikmod { };
 

From 487736dc6227c67ac918e3df03a7484ae2f094f3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 11:43:11 +0200
Subject: [PATCH 0739/2322] Revert "libssh2: Fix for darwin"

This reverts commit 2c9481e0fdea4ce96053d6c0720adbdba21db334.
---
 pkgs/development/libraries/libssh2/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index 3434fde1a62..dfaee909620 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -55,17 +55,13 @@ stdenv.mkDerivation rec {
     (mkEnable false                      "examples-build" null)
   ];
 
-  postInstall = optionalString (!stdenv.isDarwin) (''
-    sed -i \
-  '' + optionalString (optZlib != null) ''
-      -e 's,\(-lz\),-L${optZlib}/lib \1,' \
+  postInstall = optionalString (optZlib != null) ''
+    sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/libssh2.la
   '' + optionalString (cryptoStr == "openssl") ''
-      -e 's,\(-lssl\|-lcrypto\),-L${openssl}/lib \1,' \
+    sed -i 's,\(-lssl\|-lcrypto\),-L${openssl}/lib \1,' $out/lib/libssh2.la
   '' + optionalString (cryptoStr == "libgcrypt") ''
-      -e 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' \
-  '' + ''
-      $out/lib/libssh2.la
-  '');
+    sed -i 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' $out/lib/libssh2.la
+  '';
 
   meta = {
     description = "A client-side C library implementing the SSH2 protocol";

From e3356b396d308264ab04cb3e997edc048af2fea2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 11:43:15 +0200
Subject: [PATCH 0740/2322] Revert "libssh2: Modernize Build"

This reverts commit e9ee5f99615d0980538e60b1079c8438f8d8135c.
---
 .../development/libraries/libssh2/default.nix | 64 ++-----------------
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 6 insertions(+), 62 deletions(-)

diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index dfaee909620..daeb39bc982 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -1,73 +1,19 @@
-{ stdenv, fetchurl
+{stdenv, fetchurlBoot, openssl, zlib}:
 
-# Optional Dependencies
-, zlib ? null
-
-# Crypto Dependencies
-, openssl ? null, libgcrypt ? null
-}:
-
-let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
-  # Prefer openssl
-  cryptoStr = if shouldUsePkg openssl != null then "openssl"
-    else if shouldUsePkg libgcrypt != null then "libgcrypt"
-      else "none";
-  crypto = {
-    openssl = openssl;
-    libgcrypt = libgcrypt;
-    none = null;
-  }.${cryptoStr};
-
-  optZlib = shouldUsePkg zlib;
-in
-
-assert crypto != null;
-
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libssh2-1.5.0";
 
-  src = fetchurl {
+  src = fetchurlBoot {
     url = "${meta.homepage}/download/${name}.tar.gz";
     sha256 = "1z6hfgak00yz0azx6lk6n688mywhdxx03j6sdf95p3w6ssnnn6c3";
   };
 
-  buildInputs = [ crypto optZlib ];
-
-  configureFlags = [
-    (mkWith   (cryptoStr == "openssl")   "openssl"        null)
-    (mkWith   (cryptoStr == "libgcrypt") "libgcrypt"      null)
-    (mkWith   false                      "wicng"          null)
-    (mkWith   optZlib                    "libz"           null)
-    (mkEnable false                      "crypt-none"     null)
-    (mkEnable false                      "mac-none"       null)
-    (mkEnable true                       "gex-new"        null)
-    (mkEnable false                      "debug"          null)
-    (mkEnable false                      "examples-build" null)
-  ];
-
-  postInstall = optionalString (optZlib != null) ''
-    sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/libssh2.la
-  '' + optionalString (cryptoStr == "openssl") ''
-    sed -i 's,\(-lssl\|-lcrypto\),-L${openssl}/lib \1,' $out/lib/libssh2.la
-  '' + optionalString (cryptoStr == "libgcrypt") ''
-    sed -i 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' $out/lib/libssh2.la
-  '';
+  buildInputs = [ openssl zlib ];
 
   meta = {
     description = "A client-side C library implementing the SSH2 protocol";
     homepage = http://www.libssh2.org;
-    license = licenses.gpl2;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ urkud wkennington ];
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7856b140cb..b06895ecb05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7115,9 +7115,7 @@ let
 
   libssh = callPackage ../development/libraries/libssh { };
 
-  libssh2 = callPackage ../development/libraries/libssh2 {
-    fetchurl = fetchurlBoot;
-  };
+  libssh2 = callPackage ../development/libraries/libssh2 { };
 
   libstartup_notification = callPackage ../development/libraries/startup-notification { };
 

From 7fae300ebc0d3ee36d8386c010eb9a1e4c497908 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 11:49:55 +0200
Subject: [PATCH 0741/2322] e2fsprogs: Update to 1.42.13

---
 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 7617e82f1a8..a53e93960ae 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.42.12";
+  name = "e2fsprogs-1.42.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
-    sha256 = "0v0qcfyls0dlrjy8gx9m3s2wbkp5z3lbsr5hb7x8kp8f3bclcy71";
+    sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar";
   };
 
   buildInputs = [ pkgconfig libuuid ];

From 5b7c6d044068e6e7f823b4804cd223909db0fb69 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 11:55:16 +0200
Subject: [PATCH 0742/2322] audit: Update to 2.4.2

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

diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix
index 05b9eb9e56f..8a7c573ac0e 100644
--- a/pkgs/os-specific/linux/audit/default.nix
+++ b/pkgs/os-specific/linux/audit/default.nix
@@ -5,11 +5,11 @@
 assert enablePython -> python != null;
 
 stdenv.mkDerivation rec {
-  name = "audit-2.4.1";
+  name = "audit-2.4.2";
 
   src = fetchurl {
     url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz";
-    sha256 = "09ihn392pmac1pyjrs22966csia83yr84hq5ri6sybwj1vx4d4q5";
+    sha256 = "08j134s4509rxfi3hwsp8yyxzlqqxl8kqgv2rfv6p3qng5pjd80j";
   };
 
   buildInputs = [ openldap ]

From c47e78bbeccd9b535140ca0a1157b48ca3def2d2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 11:55:30 +0200
Subject: [PATCH 0743/2322] libssh: Revert to old style

---
 pkgs/development/libraries/libssh/default.nix | 58 ++-----------------
 1 file changed, 5 insertions(+), 53 deletions(-)

diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 17bcf227c0e..ef4540db2b2 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,37 +1,10 @@
-{ stdenv, fetchurl, pkgconfig, cmake
-
-# Optional Dependencies
-, heimdal ? null, zlib ? null, libsodium ? null
-
-# Crypto Dependencies
-, openssl ? null, libgcrypt ? null
-}:
-
-let
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
-  # Prefer openssl
-  cryptoStr = if shouldUsePkg openssl != null then "openssl"
-    else if shouldUsePkg libgcrypt != null then "libgcrypt"
-      else "none";
-  crypto = {
-    openssl = openssl;
-    libgcrypt = libgcrypt;
-    none = null;
-  }.${cryptoStr};
-
-  optHeimdal = shouldUsePkg heimdal;
-  optZlib = shouldUsePkg zlib;
-  optLibsodium = shouldUsePkg libsodium;
-in
-
-assert crypto != null;
+{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }:
 
 stdenv.mkDerivation rec {
   name = "libssh-0.7.0";
 
   src = fetchurl {
-    url = "https://git.libssh.org/projects/libssh.git/snapshot/libssh-0.7.0.tar.gz";
+    url = "https://git.libssh.org/projects/libssh.git/snapshot/${name}.tar.gz";
     sha256 = "1wfrdqhv97f4ycd9bcpgb6gw47kr7b2iq8cz5knk8a6n9c6870k0";
   };
 
@@ -42,35 +15,14 @@ stdenv.mkDerivation rec {
     sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c
   '';
 
-  cmakeFlags = [
-    "-DWITH_GSSAPI=${if optHeimdal != null then "ON" else "OFF"}"
-    "-DWITH_ZLIB=${if optZlib != null then "ON" else "OFF"}"
-    "-DWITH_SSH1=OFF"
-    "-DWITH_SFTP=ON"
-    "-DWITH_SERVER=ON"
-    "-DWITH_STATIC_LIB=OFF"
-    "-DWITH_DEBUG_CRYPTO=OFF"
-    "-DWITH_DEBUG_CALLTRACE=OFF"
-    "-DWITH_GCRYPT=${if cryptoStr == "libgcrypt" then "ON" else "OFF"}"
-    "-DWITH_PCAP=ON"
-    "-DWITH_INTERNAL_DOC=OFF"
-    "-DWITH_TESTING=OFF"
-    "-DWITH_CLIENT_TESTING=OFF"
-    "-DWITH_BENCHMARKS=OFF"
-    "-DWITH_EXAMPLES=OFF"
-    "-DWITH_NACL=${if optLibsodium != null then "ON" else "OFF"}"
-  ] ++ stdenv.lib.optionals (optLibsodium != null) [
-    "-DNACL_LIBRARY=${optLibsodium}/lib/libsodium.so"
-    "-DNACL_INCLUDE_DIR=${optLibsodium}/include"
-  ];
+  buildInputs = [ zlib openssl libsodium ];
 
-  nativeBuildInputs = [ pkgconfig cmake ];
-  buildInputs = [ optHeimdal optZlib optLibsodium crypto ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
   meta = with stdenv.lib; {
     description = "SSH client library";
     license = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ sander urkud wkennington ];
+    maintainers = with maintainers; [ sander urkud ];
     platforms = platforms.all;
   };
 }

From 330d198be1b06c482f46545830e65bbeab3a35d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jun 2015 11:14:24 +0200
Subject: [PATCH 0744/2322] libgcrypt: Revert to old style

---
 pkgs/development/libraries/libgcrypt/1.5.nix  | 29 ++++---------
 .../libraries/libgcrypt/default.nix           | 42 +++++--------------
 pkgs/top-level/all-packages.nix               |  8 +---
 3 files changed, 20 insertions(+), 59 deletions(-)

diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix
index ebafd0747d8..990e73d0a63 100644
--- a/pkgs/development/libraries/libgcrypt/1.5.nix
+++ b/pkgs/development/libraries/libgcrypt/1.5.nix
@@ -1,20 +1,7 @@
-{ stdenv, fetchurl
-, libgpgerror
+{ lib, stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }:
 
-# Optional Dependencies
-, libcap ? null
-}:
+assert enableCapabilities -> stdenv.isLinux;
 
-let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkWith = mkFlag "with-" "without-";
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
-  optLibcap = shouldUsePkg libcap;
-in
 stdenv.mkDerivation rec {
   name = "libgcrypt-1.5.4";
 
@@ -23,18 +10,16 @@ stdenv.mkDerivation rec {
     sha256 = "0czvqxkzd5y872ipy6s010ifwdwv29sqbnqc4pf56sd486gqvy6m";
   };
 
-  buildInputs = [ libgpgerror optLibcap ];
-
-  configureFlags = [
-    (mkWith   (optLibcap != null) "capabilities"  null)
-  ];
+  buildInputs =
+    [ libgpgerror ]
+    ++ lib.optional enableCapabilities libcap;
 
   # Make sure libraries are correct for .pc and .la files
   # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
   postInstall = ''
     sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin && optLibcap != null) ''
-    sed -i 's,\(-lcap\),-L${optLibcap}/lib \1,' $out/lib/libgcrypt.la
+  '' + stdenv.lib.optionalString enableCapabilities ''
+    sed -i 's,\(-lcap\),-L${libcap}/lib \1,' $out/lib/libgcrypt.la
   '';
 
   doCheck = true;
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 7d327a499bc..b01caeb5dd3 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,24 +1,7 @@
-{ stdenv, fetchurl
-, libgpgerror
+{ lib, stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }:
 
-# Optional Dependencies
-, libcap ? null, pth ? null
-}:
+assert enableCapabilities -> stdenv.isLinux;
 
-let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
-  optLibcap = shouldUsePkg libcap;
-  #optPth = shouldUsePkg pth;
-  optPth = null; # Broken as of 1.6.3
-in
 stdenv.mkDerivation rec {
   name = "libgcrypt-1.6.3";
 
@@ -27,29 +10,26 @@ stdenv.mkDerivation rec {
     sha256 = "0pq2nwfqgggrsh8rk84659d80vfnlkbphwqjwahccd5fjdxr3d21";
   };
 
-  buildInputs = [ libgpgerror optLibcap optPth ];
-
-  configureFlags = [
-    (mkWith   (optLibcap != null) "capabilities"  null)
-    (mkEnable (optPth != null)    "random-daemon" null)
-  ];
+  buildInputs =
+    [ libgpgerror ]
+    ++ lib.optional enableCapabilities libcap;
 
   # Make sure libraries are correct for .pc and .la files
   # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
   postInstall = ''
     sed -i 's,#include <gpg-error.h>,#include "${libgpgerror}/include/gpg-error.h",g' $out/include/gcrypt.h
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin && optLibcap != null) ''
-    sed -i 's,\(-lcap\),-L${optLibcap}/lib \1,' $out/lib/libgcrypt.la
+  '' + stdenv.lib.optionalString enableCapabilities ''
+    sed -i 's,\(-lcap\),-L${libcap}/lib \1,' $out/lib/libgcrypt.la
   '';
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = https://www.gnu.org/software/libgcrypt/;
     description = "General-pupose cryptographic library";
-    license = licenses.lgpl2Plus;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ wkennington ];
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.wkennington ];
     repositories.git = git://git.gnupg.org/libgcrypt.git;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b06895ecb05..f39a2836a1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6787,13 +6787,9 @@ let
 
   libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { };
 
-  libgcrypt = callPackage ../development/libraries/libgcrypt {
-    # Breaks packages that expect to have elevated privileges
-    # Ex. Lightdm, cryptsetup
-    libcap = null;
-  };
+  libgcrypt = callPackage ../development/libraries/libgcrypt { };
 
-  libgcrypt_1_5 = lowPrio (callPackage ../development/libraries/libgcrypt/1.5.nix { });
+  libgcrypt_1_5 = callPackage ../development/libraries/libgcrypt/1.5.nix { };
 
   libgdiplus = callPackage ../development/libraries/libgdiplus { };
 

From fb2d45233a513bf9c7305ba507b0f5e6a4ee72e3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jun 2015 11:16:44 +0200
Subject: [PATCH 0745/2322] Fix typos

---
 pkgs/servers/sql/postgresql/8.4.x.nix | 2 +-
 pkgs/servers/sql/postgresql/9.0.x.nix | 2 +-
 pkgs/servers/sql/postgresql/9.1.x.nix | 2 +-
 pkgs/servers/sql/postgresql/9.2.x.nix | 2 +-
 pkgs/servers/sql/postgresql/9.3.x.nix | 2 +-
 pkgs/servers/sql/postgresql/9.4.x.nix | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index 4c72dbfd448..0dc556619b9 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
     license = licenses.postgresql;
-    maintainers = with maintaiers; [ ocharles ];
+    maintainers = [ maintainers.ocharles ];
     platforms = platforms.unix;
     hydraPlatforms = platforms.linux;
   };
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index a27bc012b6e..b997d4a3742 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
     license = licenses.postgresql;
-    maintainers = with maintaiers; [ ocharles ];
+    maintainers = [ maintainers.ocharles ];
     platforms = platforms.unix;
     hydraPlatforms = platforms.linux;
   };
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 87ed9abe690..6801c355c68 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
     license = licenses.postgresql;
-    maintainers = with maintaiers; [ ocharles ];
+    maintainers = [ maintainers.ocharles ];
     platforms = platforms.unix;
     hydraPlatforms = platforms.linux;
   };
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index 3c21a96e9b2..12afc998443 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
     license = licenses.postgresql;
-    maintainers = with maintaiers; [ ocharles ];
+    maintainers = [ maintainers.ocharles ];
     platforms = platforms.unix;
     hydraPlatforms = platforms.linux;
   };
diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
index 4406aecaa89..ad20a23f24c 100644
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
     license = licenses.postgresql;
-    maintainers = with maintaiers; [ ocharles ];
+    maintainers = [ maintainers.ocharles ];
     platforms = platforms.unix;
     hydraPlatforms = platforms.linux;
   };
diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix
index 73f416912a2..d51856b9853 100644
--- a/pkgs/servers/sql/postgresql/9.4.x.nix
+++ b/pkgs/servers/sql/postgresql/9.4.x.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.postgresql.org/;
     description = "A powerful, open source object-relational database system";
     license = licenses.postgresql;
-    maintainers = with maintaiers; [ ocharles ];
+    maintainers = [ maintainers.ocharles ];
     platforms = platforms.unix;
     hydraPlatforms = platforms.linux;
   };

From 22c627bf5bc432329236702665272215274b4c89 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jun 2015 11:17:41 +0200
Subject: [PATCH 0746/2322] Remove PostgreSQL 8.4 (EOL)

---
 pkgs/servers/sql/postgresql/8.4.x.nix | 31 ---------------------------
 pkgs/top-level/all-packages.nix       |  2 --
 2 files changed, 33 deletions(-)
 delete mode 100644 pkgs/servers/sql/postgresql/8.4.x.nix

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
deleted file mode 100644
index 0dc556619b9..00000000000
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, zlib, ncurses, readline, openssl }:
-
-let version = "8.4.22"; in
-
-stdenv.mkDerivation rec {
-  name = "postgresql-${version}";
-
-  src = fetchurl {
-    url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw";
-  };
-
-  buildInputs = [ zlib ncurses readline openssl ];
-
-  LC_ALL = "C";
-
-  configureFlags = [ "--with-openssl" ];
-
-  patches = [ ./less-is-more.patch ];
-
-  passthru = { inherit readline; };
-
-  meta = with stdenv.lib; {
-    homepage = http://www.postgresql.org/;
-    description = "A powerful, open source object-relational database system";
-    license = licenses.postgresql;
-    maintainers = [ maintainers.ocharles ];
-    platforms = platforms.unix;
-    hydraPlatforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f39a2836a1c..f99cf9f6bbd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8923,8 +8923,6 @@ let
 
   postgresql = postgresql92;
 
-  postgresql84 = callPackage ../servers/sql/postgresql/8.4.x.nix { };
-
   postgresql90 = callPackage ../servers/sql/postgresql/9.0.x.nix { };
 
   postgresql91 = callPackage ../servers/sql/postgresql/9.1.x.nix { };

From f08c8bc752825ddacb12bcaeea1b2744a45aafd7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jun 2015 11:49:37 +0200
Subject: [PATCH 0747/2322] postgresql: Latest versions

---
 pkgs/servers/sql/postgresql/9.0.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.1.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.2.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.3.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.4.x.nix | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index b997d4a3742..f1abfa3fb0f 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline, openssl }:
 
-let version = "9.0.19"; in
+let version = "9.0.20"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "1h45jdbzdcvprdsi9gija81s3ny46h3faf9f007gza4vm6y15bak";
+    sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02";
   };
 
   buildInputs = [ zlib readline openssl ];
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 6801c355c68..93bf5e1e716 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline, openssl }:
 
-let version = "9.1.15"; in
+let version = "9.1.16"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0pyyw0cy91z9wkqf8qzkwsy8cyjps0s94c9czz6mzhyd2npxxmk7";
+    sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b";
   };
 
   buildInputs = [ zlib readline openssl ];
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index 12afc998443..e04309fc466 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline, openssl }:
 
-let version = "9.2.10"; in
+let version = "9.2.11"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "1bbkinqzb3c8i0vfzcy2g7djrq0kxz63jgvzda9p0vylxazmnm1m";
+    sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5";
   };
 
   buildInputs = [ zlib readline openssl ];
diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
index ad20a23f24c..71f3d7a826f 100644
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -2,14 +2,14 @@
 
 with stdenv.lib;
 
-let version = "9.3.6"; in
+let version = "9.3.7"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "056ass7nnfyv7blv02anv795kgpz77gipdpxggd835cdwrhwns13";
+    sha256 = "0ggz0i91znv053zx9qas7pjf93s5by3dk84z1jxbjkg8yyrnlx4b";
   };
 
   buildInputs = [ zlib readline openssl ]
diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix
index d51856b9853..f1834d301de 100644
--- a/pkgs/servers/sql/postgresql/9.4.x.nix
+++ b/pkgs/servers/sql/postgresql/9.4.x.nix
@@ -2,14 +2,14 @@
 
 with stdenv.lib;
 
-let version = "9.4.1"; in
+let version = "9.4.2"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "19n3i14bhmw8dacd2kl3n1wzj362qv3fjmal5vsvi580h9ybgp99";
+    sha256 = "04adpfg2f7ip96rh3jjygx5cpgasrrp1dl2wswjivfk5q68s3zc1";
   };
 
   buildInputs = [ zlib readline openssl ]

From f1d465f429252d7c58a920ad9d7ee93e34e7fad9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jun 2015 12:57:12 +0200
Subject: [PATCH 0748/2322] pulseaudio: Revert to regular style

Also, the NixOS module uses pulseaudioLight in order to prevent
excessive dependency bloat.
---
 nixos/modules/config/pulseaudio.nix |   8 +-
 pkgs/servers/pulseaudio/default.nix | 210 ++++++++++------------------
 pkgs/top-level/all-packages.nix     |  38 ++---
 3 files changed, 86 insertions(+), 170 deletions(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 04f274e99e1..566130feb6d 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -89,12 +89,12 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pulseaudioFull;
+        default = pulseaudioLight;
         example = literalExample "pkgs.pulseaudioFull";
         description = ''
-          The PulseAudio derivation to use.  This can be used to disable
-          features (such as JACK support, Bluetooth) that are enabled in the
-          pulseaudioFull package in Nixpkgs.
+          The PulseAudio derivation to use.  This can be used to enable
+          features (such as JACK support, Bluetooth) via the
+          <literal>pulseaudioFull</literal> package.
         '';
       };
 
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 8196caa08d9..5de447da0dd 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,73 +1,39 @@
-{ stdenv, fetchurl, pkgconfig, intltool, automake, autoconf, libtool
-, json_c, libsndfile, gettext, check
-
-# Optional Dependencies
-, xlibs ? null, libcap ? null, valgrind ? null, oss ? null, coreaudio ? null
-, alsaLib ? null, esound ? null, glib ? null, gtk3 ? null, gconf ? null
-, avahi ? null, libjack2 ? null, libasyncns ? null, lirc ? null, dbus ? null
-, sbc ? null, bluez5 ? null, udev ? null, openssl ? null, fftw ? null
-, speexdsp ? null, systemd ? null, webrtc-audio-processing ? null
+{ lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook
+, json_c, libsndfile
+, xlibs, libcap, alsaLib, glib
+, avahi, libjack2, libasyncns, lirc, dbus
+, sbc, bluez5, udev, openssl, fftwFloat
+, speexdsp, systemd, webrtc-audio-processing, gconf ? null
 
 # Database selection
 , tdb ? null, gdbm ? null
 
-# Extra options
-, prefix ? ""
+, x11Support ? false
+
+, useSystemd ? true
+
+, # Whether to support the JACK sound system as a backend.
+  jackaudioSupport ? false
+
+, # Whether to build the OSS wrapper ("padsp").
+  ossWrapper ? true
+
+, airtunesSupport ? false
+
+, gconfSupport ? false
+
+, bluetoothSupport ? false
+
+, remoteControlSupport ? false
+
+, zeroconfSupport ? false
+
+, # Whether to build only the library.
+  libOnly ? false
 }:
 
-let
-  mkFlag = trueStr: falseStr: cond: name: val:
-    if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
-  mkEnable = mkFlag "enable-" "disable-";
-  mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
-
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
-  libOnly = prefix == "lib";
-
-  hasXlibs = xlibs != null;
-
-  optLibcap = shouldUsePkg libcap;
-  hasCaps = optLibcap != null || stdenv.isFreeBSD; # Built-in on FreeBSD
-
-  optOss = if libOnly then null else shouldUsePkg oss;
-  hasOss = optOss != null || stdenv.isFreeBSD; # Built-in on FreeBSD
-
-  optCoreaudio = if libOnly then null else shouldUsePkg coreaudio;
-  optAlsaLib = if libOnly then null else shouldUsePkg alsaLib;
-  optEsound = if libOnly then null else shouldUsePkg esound;
-  optGlib = shouldUsePkg glib;
-  optGtk3 = if libOnly || !hasXlibs then null else shouldUsePkg gtk3;
-  optGconf = if libOnly then null else shouldUsePkg gconf;
-  optAvahi = if libOnly then null else shouldUsePkg avahi;
-  optLibjack2 = if libOnly then null else shouldUsePkg libjack2;
-  optLibasyncns = shouldUsePkg libasyncns;
-  optLirc = if libOnly then null else shouldUsePkg lirc;
-  optDbus = shouldUsePkg dbus;
-  optSbc = if libOnly then null else shouldUsePkg sbc;
-  optBluez5 = if optDbus == null || optSbc == null then null
-    else shouldUsePkg bluez5;
-  optUdev = if libOnly then null else shouldUsePkg udev;
-  optOpenssl = if libOnly then null else shouldUsePkg openssl;
-  optFftw = shouldUsePkg fftw;
-  optSpeexdsp = shouldUsePkg speexdsp;
-  optSystemd = shouldUsePkg systemd;
-  optWebrtc-audio-processing = if libOnly then null else shouldUsePkg webrtc-audio-processing;
-  hasWebrtc = if libOnly then null else optWebrtc-audio-processing != null;
-
-  # Pick a database to use
-  databaseName = if tdb != null then "tdb" else
-    if gdbm != null then "gdbm" else "simple";
-  database = {
-    tdb = tdb;
-    gdbm = gdbm;
-    simple = null;
-  }.${databaseName};
-in
 stdenv.mkDerivation rec {
-  name = "${prefix}pulseaudio-${version}";
+  name = "${if libOnly then "lib" else ""}pulseaudio-${version}";
   version = "6.0";
 
   src = fetchurl {
@@ -77,16 +43,23 @@ stdenv.mkDerivation rec {
 
   patches = [ ./caps-fix.patch ];
 
-  nativeBuildInputs = [ pkgconfig intltool automake autoconf libtool ];
-  buildInputs = [
-    json_c libsndfile gettext check database
+  nativeBuildInputs = [ pkgconfig intltool autoreconfHook ];
 
-    optLibcap valgrind optOss optCoreaudio optAlsaLib optEsound optGlib
-    optGtk3 optGconf optAvahi optLibjack2 optLibasyncns optLirc optDbus optUdev
-    optOpenssl optFftw optSpeexdsp optSystemd optWebrtc-audio-processing
-  ] ++ stdenv.lib.optionals hasXlibs (with xlibs; [
-      libX11 libxcb libICE libSM libXtst xextproto libXi
-    ]) ++ stdenv.lib.optionals (optBluez5 != null) [ optBluez5 optSbc ];
+  buildInputs =
+    [ json_c libsndfile speexdsp fftwFloat ]
+    ++ lib.optionals stdenv.isLinux [ libcap glib dbus.libs ]
+    ++ lib.optionals (!libOnly) (
+      [ libasyncns webrtc-audio-processing ]
+      ++ lib.optional jackaudioSupport libjack2
+      ++ lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ]
+      ++ lib.optional useSystemd systemd
+      ++ lib.optionals stdenv.isLinux [ alsaLib udev ]
+      ++ lib.optional airtunesSupport openssl
+      ++ lib.optional gconfSupport gconf
+      ++ lib.optionals bluetoothSupport [ bluez5 sbc ]
+      ++ lib.optional remoteControlSupport lirc
+      ++ lib.optional zeroconfSupport  avahi
+    );
 
   preConfigure = ''
     # Performs and autoreconf
@@ -98,62 +71,24 @@ stdenv.mkDerivation rec {
     sed -i "src/Makefile.in" \
         -e "s|udevrulesdir[[:blank:]]*=.*$|udevrulesdir = $out/lib/udev/rules.d|g"
 
-   # don't install proximity-helper as root and setuid
-   sed -i "src/Makefile.in" \
-       -e "s|chown root|true |" \
-       -e "s|chmod r+s |true |"
+    # don't install proximity-helper as root and setuid
+    sed -i "src/Makefile.in" \
+        -e "s|chown root|true |" \
+        -e "s|chmod r+s |true |"
   '';
 
-  configureFlags = [
-    (mkOther                          "localstatedir"              "/var")
-    (mkOther                          "sysconfdir"                 "/etc")
-    (mkEnable false                   "atomic-arm-memory-barrier"  null)         # TODO: Enable on armv8
-    (mkEnable false                   "neon-opt"                   null)         # TODO: Enable on armv8
-    (mkEnable hasXlibs                "x11"                        null)
-    (mkWith   hasCaps                 "caps"                       optLibcap)
-    (mkEnable true                    "tests"                      null)
-    (mkEnable false                   "samplerate"                 null)         # Deprecated
-    (mkWith   true                    "database"                   databaseName)
-    (mkEnable hasOss                  "oss-output"                 null)
-    (mkEnable true                    "oss-wrapper"                null)         # Does not use OSS
-    (mkEnable (optCoreaudio != null)  "coreaudio-output"           null)
-    (mkEnable (optAlsaLib != null)    "alsa"                       null)
-    (mkEnable (optEsound != null)     "esound"                     null)
-    (mkEnable false                   "solaris"                    null)
-    (mkEnable false                   "waveout"                    null)         # Windows Only
-    (mkEnable (optGlib != null)       "glib2"                      null)
-    (mkEnable (optGtk3 != null)       "gtk3"                       null)
-    (mkEnable (optGconf != null)      "gconf"                      null)
-    (mkEnable (optAvahi != null)      "avahi"                      null)
-    (mkEnable (optLibjack2 != null)   "jack"                       null)
-    (mkEnable (optLibasyncns != null) "asyncns"                    null)
-    (mkEnable false                   "tcpwrap"                    null)
-    (mkEnable (optLirc != null)       "lirc"                       null)
-    (mkEnable (optDbus != null)       "dbus"                       null)
-    (mkEnable false                   "bluez4"                     null)
-    (mkEnable (optBluez5 != null)     "bluez5"                     null)
-    (mkEnable (optBluez5 != null)     "bluez5-ofono-headset"       null)
-    (mkEnable (optBluez5 != null)     "bluez5-native-headset"      null)
-    (mkEnable (optUdev != null)       "udev"                       null)
-    (mkEnable false                   "hal-compat"                 null)
-    (mkEnable true                    "ipv6"                       null)
-    (mkEnable (optOpenssl != null)    "openssl"                    null)
-    (mkWith   (optFftw != null)       "fftw"                       null)
-    (mkWith   (optSpeexdsp != null)   "speex"                      null)
-    (mkEnable false                   "xen"                        null)
-    (mkEnable false                   "gcov"                       null)
-    (mkEnable (optSystemd != null)    "systemd-daemon"             null)
-    (mkEnable (optSystemd != null)    "systemd-login"              null)
-    (mkEnable (optSystemd != null)    "systemd-journal"            null)
-    (mkEnable true                    "manpages"                   null)
-    (mkEnable hasWebrtc               "webrtc-aec"                 null)
-    (mkEnable true                    "adrian-aec"                 null)
-    (mkWith   true                    "system-user"                "pulse")
-    (mkWith   true                    "system-group"               "pulse")
-    (mkWith   true                    "access-group"               "audio")
-    (mkWith   true                    "systemduserunitdir"         "\${out}/lib/systemd/user")
-    (mkWith   stdenv.isDarwin         "mac-sysroot"                "/")
-  ];
+  configureFlags =
+    [ "--disable-solaris"
+      "--disable-jack"
+      "--disable-oss-output"
+    ] ++ lib.optional (!ossWrapper) "--disable-oss-wrapper" ++
+    [ "--localstatedir=/var"
+      "--sysconfdir=/etc"
+      "--with-access-group=audio"
+    ]
+    ++ lib.optional (jackaudioSupport && !libOnly) "--enable-jack"
+    ++ lib.optional stdenv.isDarwin "--with-mac-sysroot=/"
+    ++ lib.optional (stdenv.isLinux && useSystemd) "--with-systemduserunitdir=\${out}/lib/systemd/user";
 
   enableParallelBuilding = true;
 
@@ -162,26 +97,23 @@ stdenv.mkDerivation rec {
   # the alternative is to copy the files from /usr/include to src, but there are
   # probably a large number of files that would need to be copied (I stopped
   # after the seventh)
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
-    "-I/usr/include";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I/usr/include";
 
-  installFlags = [
-    "sysconfdir=$(out)/etc"
-    "pulseconfdir=$(out)/etc/pulse"
-  ];
+  installFlags =
+    [ "sysconfdir=$(out)/etc"
+      "pulseconfdir=$(out)/etc/pulse"
+    ];
 
-  postInstall = stdenv.lib.optionalString libOnly ''
+  postInstall = lib.optionalString libOnly ''
     rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}}
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Sound server for POSIX and Win32 systems";
     homepage    = http://www.pulseaudio.org/;
-    # Note: Practically, the server is under the GPL due to the
-    # dependency on `libsamplerate'.  See `LICENSE' for details.
-    licenses    = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ lovek323 wkennington ];
-    platforms   = platforms.unix;
+    licenses    = lib.licenses.lgpl2Plus;
+    maintainers = with lib.maintainers; [ lovek323 wkennington ];
+    platforms   = lib.platforms.unix;
 
     longDescription = ''
       PulseAudio is a sound server for POSIX and Win32 systems.  A
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f99cf9f6bbd..6b54674cb65 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8816,37 +8816,21 @@ let
 
   pshs = callPackage ../servers/http/pshs { };
 
-  libpulseaudio = pulseaudioFull.override {
-    prefix = "lib";
-  };
+  libpulseaudio = callPackage ../servers/pulseaudio { libOnly = true; };
 
-  # Name is changed to prevent use in packages
-  # please use libpulseaudio instead
-  pulseaudioLight = pulseaudioFull.override {
-    # The following are disabled in the default build, because if this
-    # functionality is desired, they are only needed in the PulseAudio
-    # server.
-    xlibs = null;
-    coreaudio = null;
-    esound = null;
-    libjack2 = null;
-    avahi = null;
-    lirc = null;
-    bluez5 = null;
-    tdb = null;
-    gdbm = null;
-    gtk3 = null;
-    webrtc-audio-processing = null;
-    gconf = null;
-    libasyncns = null;
-  };
+  # Name is changed to prevent use in packages;
+  # please use libpulseaudio instead.
+  pulseaudioLight = callPackage ../servers/pulseaudio { };
 
   pulseaudioFull = callPackage ../servers/pulseaudio {
     gconf = gnome3.gconf;
-    fftw = fftwFloat;
-
-    # Disabled unless debugging
-    valgrind = null;
+    x11Support = true;
+    jackaudioSupport = true;
+    airtunesSupport = true;
+    gconfSupport = true;
+    bluetoothSupport = true;
+    remoteControlSupport = true;
+    zeroconfSupport = true;
   };
 
   tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { };

From aaaa9f0041c28c465dcd0f5e524062025663b6f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 4 Jun 2015 15:32:19 +0200
Subject: [PATCH 0749/2322] lame: fix build on 32-bit with gcc 4.9

---
 pkgs/development/libraries/lame/default.nix   |  2 ++
 pkgs/development/libraries/lame/gcc-4.9.patch | 33 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/libraries/lame/gcc-4.9.patch

diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix
index 4a61d188ef6..1f8ad2e67c9 100644
--- a/pkgs/development/libraries/lame/default.nix
+++ b/pkgs/development/libraries/lame/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
     sha256 = "1zr3kadv35ii6liia0bpfgxpag27xcivp571ybckpbz4b10nnd14";
   };
 
+  patches = [ ./gcc-4.9.patch ];
+
   nativeBuildInputs = [ ]
     ++ optional nasmSupport nasm;
 
diff --git a/pkgs/development/libraries/lame/gcc-4.9.patch b/pkgs/development/libraries/lame/gcc-4.9.patch
new file mode 100644
index 00000000000..59f8e00e4a8
--- /dev/null
+++ b/pkgs/development/libraries/lame/gcc-4.9.patch
@@ -0,0 +1,33 @@
+fix sse optimizations build on 32-bit with gcc 4.9
+http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=351af417bae0d09bd5a3753d1237f03adf591933
+
+xmm_quantize_sub.c: In function 'init_xrpow_core_sse':
+xmm_quantize_sub.c:65:18: warning: SSE vector return without SSE enabled changes the ABI [-W
+psabi]
+     const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]);
+                  ^
+In file included from xmm_quantize_sub.c:37:0:
+/usr/lib/gcc/i686-w64-mingw32/4.9.0/include/xmmintrin.h:933:1: error: inlining failed in call to always_inline '_mm_loadu_ps': target specific option mismatch
+ _mm_loadu_ps (float const *__P)
+ ^
+xmm_quantize_sub.c:65:18: error: called from here
+     const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]);
+                  ^
+--- lame/libmp3lame/vector/xmm_quantize_sub.c.orig	2014-06-08 12:16:19.455468042 -0700
++++ lame/libmp3lame/vector/xmm_quantize_sub.c	2014-06-08 12:16:09.592356980 -0700
+@@ -35,6 +35,7 @@
+ #ifdef HAVE_XMMINTRIN_H
+ 
+ #include <xmmintrin.h>
++#pragma GCC target("sse")
+ 
+ typedef union {
+     int32_t _i_32[4]; /* unions are initialized by its first member */
+@@ -124,6 +125,7 @@
+ }
+ 
+ 
++#pragma GCC target("sse2")
+ void
+ fht_SSE2(FLOAT * fz, int n)
+ {

From 646ee283e803ca2daa90b2ba507928ec661f58f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 4 Jun 2015 16:15:35 +0200
Subject: [PATCH 0750/2322] gst-plugins-base-0.10: fix 32-bit build with
 gcc-4.9

---
 .../legacy/gst-plugins-base/default.nix       |  3 +-
 .../legacy/gst-plugins-base/gcc-4.9.patch     | 38 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch

diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
index 59ee86da86d..040cf20c4ea 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
@@ -18,9 +18,10 @@ stdenv.mkDerivation rec {
   };
 
   patchPhase = ''
-
     sed -i 's@/bin/echo@echo@g' configure
     sed -i -e 's/^   /\t/' docs/{libs,plugins}/Makefile.in
+
+    patch -p1 < ${./gcc-4.9.patch}
   '';
 
   # TODO : v4l, libvisual
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch
new file mode 100644
index 00000000000..fd9f6ea240d
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch
@@ -0,0 +1,38 @@
+https://bugzilla.gnome.org/show_bug.cgi?id=670690
+
+From 9bd5a7ae5435469c3557a3d70e762791cb3dc5c7 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Mon, 20 Jan 2014 15:44:09 +0100
+Subject: [PATCH] audioresample: fix build on BSD
+
+On i386, EMMINTRIN is defined but not usable without sse so check for
+__SSE__ and __SSE2__ as well.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=670690
+---
+ gst/audioresample/resample.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c
+index 98d006c..481fa01 100644
+--- a/gst/audioresample/resample.c
++++ b/gst/audioresample/resample.c
+@@ -77,13 +77,13 @@
+ #define EXPORT G_GNUC_INTERNAL
+ 
+ #ifdef _USE_SSE
+-#ifndef HAVE_XMMINTRIN_H
++#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H)
+ #undef _USE_SSE
+ #endif
+ #endif
+ 
+ #ifdef _USE_SSE2
+-#ifndef HAVE_EMMINTRIN_H
++#if !defined(__SSE2__) || !defined(HAVE_XMMINTRIN_H)
+ #undef _USE_SSE2
+ #endif
+ #endif
+-- 
+1.8.5.3
+

From 3afae4037b7deac7af54f45dc4b2e027c4335e48 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 4 Jun 2015 17:31:30 +0200
Subject: [PATCH 0751/2322] zfs: Fix systemd warning

The `zfs-share` service was trying to execute the `rm` binary, but it
was providing an invalid `/bin` path.

This should fix #8171.
---
 pkgs/os-specific/linux/zfs/generic.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
index b040201cf33..1613dcb311a 100644
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences
+{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils
 , configFile ? "all"
 
 # Userspace dependencies
@@ -46,7 +46,8 @@ stdenv.mkDerivation rec {
     substituteInPlace ./etc/zfs/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
     substituteInPlace ./cmd/zed/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
     substituteInPlace ./module/Makefile.in        --replace "/bin/cp"                 "cp"
-
+    substituteInPlace ./etc/systemd/system/zfs-share.service.in \
+        --replace "@bindir@/rm " "${coreutils}/bin/rm "
     ./autogen.sh
   '';
 

From 0ed91e1c4dc37b74943a076b972be33a58d13c18 Mon Sep 17 00:00:00 2001
From: Dario Bertini <dario.bertini@nccgroup.trust>
Date: Thu, 4 Jun 2015 16:36:53 +0100
Subject: [PATCH 0752/2322] Update redis to 3.0.2 (now that 3 is stable, squash
 it into default) include fix for
 http://benmmurphy.github.io/blog/2015/06/04/redis-eval-lua-sandbox-escape/

---
 pkgs/servers/nosql/redis/3.0.nix     | 23 -----------------------
 pkgs/servers/nosql/redis/default.nix |  5 +++--
 pkgs/top-level/all-packages.nix      |  1 -
 3 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/servers/nosql/redis/3.0.nix

diff --git a/pkgs/servers/nosql/redis/3.0.nix b/pkgs/servers/nosql/redis/3.0.nix
deleted file mode 100644
index 0e7a7d0f250..00000000000
--- a/pkgs/servers/nosql/redis/3.0.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  version = "3.0.1";
-  name = "redis-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/antirez/redis/archive/${version}.tar.gz";
-    sha256 = "1m34s60qvj1xyqw7x7ar0graw52wypx47dhvfb0br67vfb62l8sl";
-  };
-
-  makeFlags = "PREFIX=$(out)";
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = http://redis.io;
-    description = "An open source, advanced key-value store";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.berdario ];
-  };
-}
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 833a17246fc..6da7ec11e7c 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "redis-2.8.19";
+  version = "3.0.2";
+  name = "redis-${version}";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "29bb08abfc3d392b2f0c3e7f48ec46dd09ab1023f9a5575fc2a93546f4ca5145";
+    sha256 = "93e422c0d584623601f89b956045be158889ebe594478a2c24e1bf218495633f";
   };
 
   makeFlags = "PREFIX=$(out)";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b54674cb65..85a4d4fa188 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8959,7 +8959,6 @@ let
   radius = callPackage ../servers/radius { };
 
   redis = callPackage ../servers/nosql/redis { };
-  redis3 = callPackage ../servers/nosql/redis/3.0.nix { };
 
   redstore = callPackage ../servers/http/redstore { };
 

From 80e98ba00a308c5f5d0e212c07b82e889264f3d5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Jun 2015 10:38:18 +0200
Subject: [PATCH 0753/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/25f7b30351dfe1a8403f70bb5b9d1abebd6ac2fc
 with hackage2nix revision d8b7e62373ad16bdc2a5a93d0870bc05b814ac39

---
 .../haskell-modules/hackage-packages.nix      | 1028 ++++++++++++-----
 1 file changed, 723 insertions(+), 305 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 934fc10fc06..e049946d44a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -8,8 +8,8 @@ self: {
     ({ mkDerivation, base, GLUT, OpenGL, random }:
      mkDerivation {
        pname = "3d-graphics-examples";
-       version = "0.0.0.0";
-       sha256 = "1v2zv94npviggqfqabfzp7ab54nnw9wdb60y20f1lzw13an0a14q";
+       version = "0.0.0.1";
+       sha256 = "13b7n9mdx7f6a2ghikc7xvscbj8wp0dxcbm5alinnic433sandy5";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base GLUT OpenGL random ];
@@ -3202,8 +3202,8 @@ self: {
      }:
      mkDerivation {
        pname = "DSH";
-       version = "0.12.0.0";
-       sha256 = "0rv7jn6h5w2naz7h4psz258684rc2p2wyaqp1f6kqvk294mlmvrv";
+       version = "0.12.0.1";
+       sha256 = "1m69phqjrb4wg6fji5plw1mghyz7jzzqixljaa5gb5s0cy5gfkfy";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -3958,12 +3958,17 @@ self: {
      }) {};
 
   "Earley" = callPackage
-    ({ mkDerivation, base, containers, ListLike }:
+    ({ mkDerivation, base, containers, ListLike, tasty, tasty-hunit
+     , tasty-quickcheck, unordered-containers
+     }:
      mkDerivation {
        pname = "Earley";
-       version = "0.8.0";
-       sha256 = "0vg672jfj9a814pcbx19hkb2nsy0zndm1a98z5ygssy7m098cvgh";
-       buildDepends = [ base containers ListLike ];
+       version = "0.8.1";
+       sha256 = "0bzm6pwim3fv0d1fv6k3078661vlpc0pcrds4ywsqvgc4hd91myk";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base containers ListLike unordered-containers ];
+       testDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -6755,8 +6760,8 @@ self: {
     ({ mkDerivation, base, hashable, mtl, unordered-containers }:
      mkDerivation {
        pname = "HMap";
-       version = "1.2.3";
-       sha256 = "0gxs0l5v2kzgy8lfyz0l3ivv1w6cb8sm30h6yv91np1nvj231nf3";
+       version = "1.2.4";
+       sha256 = "087a7ykk84lxa0c75wid6bkjmd89krgyrilxgps1fzl142hyvl13";
        buildDepends = [ base hashable mtl unordered-containers ];
        homepage = "https://github.com/atzeus/HMap";
        description = "Fast heterogeneous maps and unconstrained typeable like functionality";
@@ -10078,6 +10083,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "MissingK" = callPackage
+    ({ mkDerivation, base, glib, template-haskell }:
+     mkDerivation {
+       pname = "MissingK";
+       version = "0.0.0.2";
+       sha256 = "0cynzg5piy14g5j576kf79dh4zqa5pcpwnpfl0fdkyy1rqm50q03";
+       buildDepends = [ base glib template-haskell ];
+       homepage = "http://www.keera.es/blog/community/";
+       description = "Useful types and definitions missing from other libraries";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "MissingM" = callPackage
     ({ mkDerivation, base, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2, transformers
@@ -17051,6 +17068,7 @@ self: {
          transformers
        ];
        testDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/ad";
        description = "Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
@@ -18536,14 +18554,15 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "0.3.4";
-       sha256 = "19fzhsrlsqrncngcmdl8wr0rbv8ff0k8y91dn6j1hacz0dv1whhk";
+       version = "0.3.5";
+       sha256 = "0i4wpkvf0yrgcdgz1pfmnig61d16lywh2mggf6xanp6pcrafh0xr";
        buildDepends = [
          amazonka-core base bytestring conduit conduit-extra cryptohash
          cryptohash-conduit exceptions http-conduit lens mmorph
          monad-control mtl resourcet retry text time transformers
          transformers-base transformers-compat
        ];
+       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Comprehensive Amazon Web Services SDK";
        license = "unknown";
@@ -18553,8 +18572,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-autoscaling";
-       version = "0.3.4";
-       sha256 = "0kndkj4x7wmmxpsr3a42ck2zq7amm33axxlhwzlgi1gnv8v2v4y4";
+       version = "0.3.5";
+       sha256 = "0xbvviy5rvwiq0nj3wd420bl9zrb3625sils5y6y4zg9qzy3a7vx";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Auto Scaling SDK";
@@ -18565,8 +18584,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudformation";
-       version = "0.3.4";
-       sha256 = "0nhy1qn8abhnmr85n1ddshwjwns0gc0l1syznfg6g6cmazwq7809";
+       version = "0.3.5";
+       sha256 = "0xhm9lkm80v7i5my8vz6dz1g7zvm0b7kgzsl4swk20359p3fcs84";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFormation SDK";
@@ -18577,8 +18596,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudfront";
-       version = "0.3.4";
-       sha256 = "1yp59hdxnnvjsdpaw4c311p30bg9xyj231hn2r1zis3awck8jlkk";
+       version = "0.3.5";
+       sha256 = "0aln5gk3gj2ma6s51rp4x3ygjsj6zn3abzns4qlb2r5cqcf7r9sb";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFront SDK";
@@ -18589,8 +18608,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudhsm";
-       version = "0.3.4";
-       sha256 = "1f26vpfxqkkm1yli42xhbhhzya07gvg9kjhq5p51p32500aax4my";
+       version = "0.3.5";
+       sha256 = "00n8bchifihhijzacs0dmw4bxgl1xb1avbvzk9ic7a025vyp2vh3";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudHSM SDK";
@@ -18601,8 +18620,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudsearch";
-       version = "0.3.4";
-       sha256 = "0lp09i3h527g8l7xcxqk6n1pjlbdhxncpgdsrd8bv91an39cnj12";
+       version = "0.3.5";
+       sha256 = "0jz5ibr170592mz94zimvan7pwli4sp6qimv6hxiqlz3p78qy492";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch SDK";
@@ -18613,8 +18632,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
-       version = "0.3.4";
-       sha256 = "06sb1zmgvsbshndix9gdx8vq4378p8sgwnnkwhzm1sr92yzfv4is";
+       version = "0.3.5";
+       sha256 = "1yv1q8bkwl1vmvyis2zj4ayy5lwvr5c0waaanaam640v8gnn7qli";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch Domain SDK";
@@ -18625,8 +18644,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudtrail";
-       version = "0.3.4";
-       sha256 = "125vn9vk4mk61r4r5c3parhrqdxkmlvqprly1x0chd044nx5ai80";
+       version = "0.3.5";
+       sha256 = "1k5hmd6vbfm9wndz6ycd8cipds2npdqcfiwi67hq6g8lnvwm3p82";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudTrail SDK";
@@ -18637,8 +18656,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudwatch";
-       version = "0.3.4";
-       sha256 = "1lsdy65cg3wrhpzsaiir0mq510dilia1m0lqwg1fnrcl62xlcsd9";
+       version = "0.3.5";
+       sha256 = "1hmckxa3bv1hdrmd097fljfjdpmg1w18bjarppbr1fxd86hdzfr8";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch SDK";
@@ -18649,8 +18668,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
-       version = "0.3.4";
-       sha256 = "1wxrxak7l8drba6hckhx0idqj26fbppnxw5hj4cnmjrg4pvjpnmn";
+       version = "0.3.5";
+       sha256 = "0b4s87p1d8zhj7fwi29cca472wynqa4nxiskvw3d1dvf37xbzasi";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Logs SDK";
@@ -18661,8 +18680,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-codedeploy";
-       version = "0.3.4";
-       sha256 = "1sws6d2a21r7wwd2dyf4k7g2n2f0r5azydj7pg6g5a2sjfazimi0";
+       version = "0.3.5";
+       sha256 = "03rcyqvsdc63sq9122s5a14gz210kbywv1jx9pqmdifmr2flap6c";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeDeploy SDK";
@@ -18673,8 +18692,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cognito-identity";
-       version = "0.3.4";
-       sha256 = "0vp1r171myahkx8n5mndjabggy219mzbzxyfz93mwpnyf1z7cdvm";
+       version = "0.3.5";
+       sha256 = "0l3izdln529kavybflf544xak510g336lzpkr6n323qjb8b6gjzc";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity SDK";
@@ -18685,8 +18704,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cognito-sync";
-       version = "0.3.4";
-       sha256 = "04mc8cjn1hdprki0hvbbyb7gzsdxdr7lci41vnmhw6ic3gcy2mhv";
+       version = "0.3.5";
+       sha256 = "12agwj1jhbb5dad2niycx8yahxhng02clfdpqakbyq7jqbdhrwlk";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Sync SDK";
@@ -18697,8 +18716,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-config";
-       version = "0.3.4";
-       sha256 = "1qxkzqvfid2g7hcc427zhy8llfa25wpimi7cfdzl9dqmmkqlxinm";
+       version = "0.3.5";
+       sha256 = "1h4037sbfxkf66z47rizyqbjwhy3c6ny993qcalpdy1lji3m86sp";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Config SDK";
@@ -18716,8 +18735,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-core";
-       version = "0.3.4";
-       sha256 = "0sih0wvncrz6v4xcn34ckhxc7b15bx87qbr7icwk1w6zs08809jz";
+       version = "0.3.5";
+       sha256 = "1m1nk4575ccdhx6ysw9n3x2xx6k8z1f0mqifccmry3fjc8nh90z7";
        buildDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bifunctors bytestring case-insensitive conduit conduit-extra
@@ -18738,8 +18757,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-datapipeline";
-       version = "0.3.4";
-       sha256 = "0f7y3wb9ijd8hjxbzav63zdwrjhzh000xqc4n2cnx0lrcrssvs2i";
+       version = "0.3.5";
+       sha256 = "180h89gzmszwqylibjxb7wmsilwfqwazanjcspwl6zf4wh3dy4hv";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Data Pipeline SDK";
@@ -18750,8 +18769,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-directconnect";
-       version = "0.3.4";
-       sha256 = "1y6nyjf8m2py5wnk3cbypi0ckqv7nyr2la3h8nm1wj8njwh359jn";
+       version = "0.3.5";
+       sha256 = "1icdc2nhp9fqslv96if5k30xjy60mj7hfidmfqy8126y7f9xg9ip";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Direct Connect SDK";
@@ -18762,8 +18781,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-dynamodb";
-       version = "0.3.4";
-       sha256 = "160nk75112sdnf834gpc0y1fzsbb0lrp98g9zim38rd4v7pz2ax9";
+       version = "0.3.5";
+       sha256 = "0qywmfhxjda55002pbcg23l187jnch23lrpdi0bkpm2r9m7f3jz1";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB SDK";
@@ -18774,8 +18793,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "0.3.4";
-       sha256 = "0chfyyryyk8vd1783021awvwwla5fdm04x3w500157xvazhk286m";
+       version = "0.3.5";
+       sha256 = "1qydhrld9zwjvcz1bcc12i1bxy34sg25q4czb2qg6vas4q17hd7r";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
@@ -18786,8 +18805,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ecs";
-       version = "0.3.4";
-       sha256 = "1pv79b0865gqpf89abjjk4y24d6nr2lk45xpn0n7ckri0b54dga4";
+       version = "0.3.5";
+       sha256 = "06v24ii7w0fs3b10lrjdqm4ij06h160vk10db0w7r69s5bcx97wd";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Service SDK";
@@ -18798,8 +18817,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elasticache";
-       version = "0.3.4";
-       sha256 = "01mg116sqxa4z7ss0fwzvsgkmxrqs52ac9z6mrsfymjspyd9fbli";
+       version = "0.3.5";
+       sha256 = "12acby04a090p11g40awhz2rln187vqlnsk347dapkh42pgjnd1f";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon ElastiCache SDK";
@@ -18810,8 +18829,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
-       version = "0.3.4";
-       sha256 = "13lzdnwg9x2jrhk251b0vrg4y2avg77ppq4wdgjzmbb2myp618ll";
+       version = "0.3.5";
+       sha256 = "16msbdxqgpf4hwym1jh2zdhsla50w3293m4rgjixgd6bbg3clrdl";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Beanstalk SDK";
@@ -18822,8 +18841,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elastictranscoder";
-       version = "0.3.4";
-       sha256 = "1wi1h07pp8n45ynn9lqvjfz265k0bp7qqxk5qmqlg93yajgjfkcl";
+       version = "0.3.5";
+       sha256 = "1cv6kvfbwswmlhds26xgxcf3gh7k8lrjw9gvrqckri4jbmksxmsv";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Transcoder SDK";
@@ -18834,8 +18853,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elb";
-       version = "0.3.4";
-       sha256 = "11ky0g8cgnd6lcjdc6a9087ka5f6hc3x08xnvjjfwipmdhps4k9r";
+       version = "0.3.5";
+       sha256 = "1yhmsmm2f2s1s4pziqyadl8wzygpdb0y0f1qdjajshd33pff4462";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
@@ -18846,8 +18865,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-emr";
-       version = "0.3.4";
-       sha256 = "1dq1xs7simxcag3c2bcr22k1595avl69jz6zv3nrsn1rvzj9milv";
+       version = "0.3.5";
+       sha256 = "0xlb9nry7a0grn9d3qwl135lgl7r5kxqidx9jq67v6sdjh5y0v7y";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic MapReduce SDK";
@@ -18858,8 +18877,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-glacier";
-       version = "0.3.4";
-       sha256 = "1dd635s0i9imj62dg9rqvfrx2aqw6593z61ckqixlb247jii82i6";
+       version = "0.3.5";
+       sha256 = "19dgjkggjirz9pbyzjw61ni3gkgbj2fl8y6cbdkazq2h9gg4dgbv";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Glacier SDK";
@@ -18870,8 +18889,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-iam";
-       version = "0.3.4";
-       sha256 = "1snh7xs2f2mjr3ln24xj73y5idmb45in1ykaz3v5wbqdb19m4w94";
+       version = "0.3.5";
+       sha256 = "0jr7wgs1hhbr4bara8q5xp1k40ffxjfrd79ncf2l6kzlh3vnsgcb";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Identity and Access Management SDK";
@@ -18882,8 +18901,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-importexport";
-       version = "0.3.4";
-       sha256 = "15xgfxlrjhn8inl5a0rfsyyy8sp0rinlwll9snpdl7nrnqvmn00s";
+       version = "0.3.5";
+       sha256 = "1ymlxs0icxlqb23jwx9wp3k6n3pld5n7ykzl7fp77c8pnyzq52ia";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export SDK";
@@ -18894,8 +18913,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-kinesis";
-       version = "0.3.4";
-       sha256 = "0fag3xr9w2gi038hh9kiqmqgbsn53x48h9jwj49cr1r9qrrs86wa";
+       version = "0.3.5";
+       sha256 = "0cqazzfcy1inhnb0g5nf2cqkglc4c9yvd3s1xiz2ihc2rfqanxyf";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis SDK";
@@ -18906,8 +18925,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-kms";
-       version = "0.3.4";
-       sha256 = "0ds97lk5ifc529199lmvijs5gif4bzh8lwczpz1xspin37bjiz62";
+       version = "0.3.5";
+       sha256 = "1lx7d5zdj6gqvmcrdmr6rbyj7wmh43d9dnmr755vzwgjk5y47pq5";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Key Management Service SDK";
@@ -18918,8 +18937,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-lambda";
-       version = "0.3.4";
-       sha256 = "1njdwml6mp8phd323cgyfw7v2iv8l4k7r6pi4vq4mygpa2gx0dn1";
+       version = "0.3.5";
+       sha256 = "15x8y41bjxg2jk6jajnax7nnjy247128zwwzp4j0lqcy3jx0djf2";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lambda SDK";
@@ -18930,8 +18949,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ml";
-       version = "0.3.4";
-       sha256 = "1sv6a74gk30rhsh98j2f6xsad6hfcr3cjyi8ahz1qjh4nqjrrssc";
+       version = "0.3.5";
+       sha256 = "1ysrlff1mqww5nxm5hlrphafnfisrifqd0czl3slpg0wq4jijpd1";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Machine Learning SDK";
@@ -18942,8 +18961,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-opsworks";
-       version = "0.3.4";
-       sha256 = "07l7a4v7s380vj8348bgv1m1hk1ldc41aphl67f17v2cndys3ml0";
+       version = "0.3.5";
+       sha256 = "1m47ymzakcnyjgg9fp6f0k270r6785z3q64g5qn3321sya8rfahz";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks SDK";
@@ -18954,8 +18973,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-rds";
-       version = "0.3.4";
-       sha256 = "1ji80nn9k10l9w5k5dqwhc0i2aaxa4l6bl995im5lrihilmazqgw";
+       version = "0.3.5";
+       sha256 = "196z77al765mxrjnilz6ph20nmvdks5mfaqdnfwgk8mvhcigbiwp";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Relational Database Service SDK";
@@ -18966,8 +18985,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-redshift";
-       version = "0.3.4";
-       sha256 = "18sd3abhpifwb4ylz35bnxzappgslpvzkrv9wh3hxqzs4mvxdj1n";
+       version = "0.3.5";
+       sha256 = "1kh5497azy2qyc6zbh4gznvmrf5hp6rpz5ksbbi78fngcanvfwn9";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Redshift SDK";
@@ -18978,8 +18997,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "0.3.4";
-       sha256 = "05a77qcjlkjk0mv2ry25dlci43h5b9hh50f32ngqccjqmg4128ky";
+       version = "0.3.5";
+       sha256 = "0gl0xygsq6vn2xw0ibpmqc2n3c7650756ldv8nxyfmwrxyv37vrv";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 SDK";
@@ -18990,8 +19009,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-route53-domains";
-       version = "0.3.4";
-       sha256 = "15qvmw6fgfcqgkqafywpai5i1in9iibl1r8m8pfxfdckmrbzaxz2";
+       version = "0.3.5";
+       sha256 = "0mawgxdvlhhvb2jzgsc5w62gfaf1wd0yiy2xzmk10vcrwawhfhig";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 Domains SDK";
@@ -19002,8 +19021,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-s3";
-       version = "0.3.4";
-       sha256 = "0miyf7nnkxwybps3yg5fyqpxq5hkz4kllks5w4r7c62hd7sjq9dn";
+       version = "0.3.5";
+       sha256 = "09fc51c3zsbpr9b9dbachhyr5v9f1b02w47yv382f70vdk7m7lky";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
@@ -19014,8 +19033,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sdb";
-       version = "0.3.4";
-       sha256 = "0jsg4g911qm3r8saxwax4rhdmg1kgfmagnnyzjv4rb02jkdfr7i1";
+       version = "0.3.5";
+       sha256 = "0x5v734q7srn8y7kfk5rrlbhvr1a51z2ak0dqd8qwjhpdam7wigb";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon SimpleDB SDK";
@@ -19026,8 +19045,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ses";
-       version = "0.3.4";
-       sha256 = "0s0aa3fryvqwmp0zzmlzd0mk591i1c63qds0si3svf85zgl3slr4";
+       version = "0.3.5";
+       sha256 = "0vk5hygw8z8cckmv5b95x265c8jkhnaz33n2dvrnyh29q3a5ag6d";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Email Service SDK";
@@ -19038,8 +19057,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sns";
-       version = "0.3.4";
-       sha256 = "1plrzqlvfn2aa0c4l2dh4nlygnv0biykz414yblcrj53w03yhqs2";
+       version = "0.3.5";
+       sha256 = "0hfl4fwf777l49r7sx85dkp34yy5xijry5z114pbf2mbf7v8pxvn";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Notification Service SDK";
@@ -19050,8 +19069,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sqs";
-       version = "0.3.4";
-       sha256 = "0bc0n71vhmcirij5agxy7h0zvqvm4psw5h3kzrnbib9wa2hkq8m4";
+       version = "0.3.5";
+       sha256 = "0jback1zw7n72pcrwv8d074xygk9hqlzpwfi2m905jz36f1jw889";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Queue Service SDK";
@@ -19062,8 +19081,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ssm";
-       version = "0.3.4";
-       sha256 = "03p76rska5gl2ic7vjyhhdb89ikl17n8xkiwcb4184jzsvnscqzi";
+       version = "0.3.5";
+       sha256 = "172wvhlk054wvp30f7vsfb6l94m0hbjsiwhnfxamnk7nwv8qzprr";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Systems Management Service SDK";
@@ -19074,8 +19093,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-storagegateway";
-       version = "0.3.4";
-       sha256 = "016wi9cq86z0giv68kzfdg2ia0m4kvlcsl6dj9d3cnvbcsg7s6xy";
+       version = "0.3.5";
+       sha256 = "0nxyc8bzphw1pdg9vz55fm9x9p57qd501112p5zykd08pgwaxzna";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Storage Gateway SDK";
@@ -19086,8 +19105,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sts";
-       version = "0.3.4";
-       sha256 = "1fmjsvcxjrls98jd3vcldjy9wvsdkyi614rzs1d5bi11b6db202z";
+       version = "0.3.5";
+       sha256 = "03gphzl87qrvi57sncng08sdqlxbxlm3z9q4yz7zwqdigy2r2aic";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Security Token Service SDK";
@@ -19098,8 +19117,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-support";
-       version = "0.3.4";
-       sha256 = "1kzy3nbc17dbbhi2k60da7rl6k2zbahzd9rjshvmn1fdsb61piq5";
+       version = "0.3.5";
+       sha256 = "1z9r6v1nvx5d6kda9kxgypwh4y90waxv7ybm6iknp19xqw7y2daz";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Support SDK";
@@ -19110,8 +19129,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-swf";
-       version = "0.3.4";
-       sha256 = "1w7ac4d7gj53hjvlk0sldww67gkgsbi8vmqhbcbqrbg2mrqr6l9d";
+       version = "0.3.5";
+       sha256 = "0hl9crncqs8sijzyppl3q54isq1w3205q716bwqi09g97zi0hik3";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
@@ -19122,8 +19141,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-workspaces";
-       version = "0.3.4";
-       sha256 = "00gdahix24cm3qan11a9n2l1n9x0cnnxgid2gf4zhjqmvc3342sa";
+       version = "0.3.5";
+       sha256 = "0afl7xwb45i70j025kmfh7s3v5my86h52zb55h4cxxdcnj9yvca5";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WorkSpaces SDK";
@@ -21324,11 +21343,11 @@ self: {
     ({ mkDerivation, base, bimap, containers, mtl, process, syb }:
      mkDerivation {
        pname = "atom";
-       version = "1.0.12";
-       sha256 = "0mavmgaw9wb7sjrmr49h2xw4xvzywgbflvvxym0l9wc91dd3zhrp";
+       version = "1.0.13";
+       sha256 = "111lz39q12rvh2iigxakcnf2firxgbgm462id805n3z7rmg8f807";
        buildDepends = [ base bimap containers mtl process syb ];
        homepage = "http://tomahawkins.org";
-       description = "A DSL for embedded hard realtime applications";
+       description = "An EDSL for embedded hard realtime applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -24941,8 +24960,8 @@ self: {
      }:
      mkDerivation {
        pname = "bindings-nettle";
-       version = "0.2";
-       sha256 = "1pk2gwd5wbs1bhna5npwrzrvd6cxss8sbigsa8lsqsarh8mbd5sr";
+       version = "0.4";
+       sha256 = "11fnyjxb6gvl2mfnsahzadd5xj0y1p25n98qbhrkzziaihsf01ph";
        buildDepends = [ base bindings-DSL ];
        testDepends = [
          base bytestring hspec HUnit QuickCheck quickcheck-io
@@ -26691,6 +26710,7 @@ self: {
        testDepends = [
          base directory doctest filepath prelude-extras transformers vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/bound/";
        description = "Making de Bruijn Succ Less";
        license = stdenv.lib.licenses.bsd3;
@@ -27321,22 +27341,22 @@ self: {
 
   "bustle" = callPackage
     ({ mkDerivation, base, bytestring, cairo, containers, dbus
-     , directory, filepath, glib, gtk, hgettext, HUnit, mtl, pango
+     , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango
      , parsec, pcap, process, QuickCheck, setlocale, test-framework
      , test-framework-hunit, text, time
      }:
      mkDerivation {
        pname = "bustle";
-       version = "0.4.8";
-       sha256 = "0ra4hvym5f4w8hy7p11apb5n0pdsq5iv56wab513dhb75562ipcq";
+       version = "0.5.0";
+       sha256 = "0wj3abvkpalr40zyqwxi2bwgrfzmnjjg7y577qj2fzv8l5bl2mn0";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base bytestring cairo containers dbus directory filepath glib gtk
-         hgettext mtl pango parsec pcap process setlocale text time
+         base bytestring cairo containers dbus directory filepath gio glib
+         gtk3 hgettext mtl pango parsec pcap process setlocale text time
        ];
        testDepends = [
-         base bytestring cairo containers dbus directory filepath gtk
+         base bytestring cairo containers dbus directory filepath gtk3
          hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework
          test-framework-hunit text
        ];
@@ -27664,6 +27684,7 @@ self: {
        sha256 = "19bq478066chy35fnfjq5bg2f196zl6qi2dssqwlr9bivgvk434g";
        buildDepends = [ base bytestring types-compat ];
        testDepends = [ base bytestring doctest tasty tasty-quickcheck ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/bytestring-read";
        description = "fast ByteString to number converting library";
        license = stdenv.lib.licenses.mit;
@@ -29617,20 +29638,22 @@ self: {
 
   "cassava" = callPackage
     ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring
-     , containers, deepseq, HUnit, QuickCheck, test-framework
+     , containers, deepseq, hashable, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "cassava";
-       version = "0.4.2.4";
-       sha256 = "1vf42v4n55i39zk5dimzk9z0l0jzyp9w9vhgrvzmi0f7nhfbv08a";
+       version = "0.4.3.0";
+       revision = "1";
+       sha256 = "0pwcxv1mdn0p6hw2w5fiw4w75mnxphngzj62jw3nbd80bswdp2x3";
+       editedCabalFile = "6410ddebd594ccd8c068cbfb6b064ac43bcebb48fb74cbc25078c89f55e051a7";
        buildDepends = [
          array attoparsec base blaze-builder bytestring containers deepseq
-         text unordered-containers vector
+         hashable text unordered-containers vector
        ];
        testDepends = [
-         attoparsec base bytestring HUnit QuickCheck test-framework
+         attoparsec base bytestring hashable HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text
          unordered-containers vector
        ];
@@ -29677,6 +29700,7 @@ self: {
        homepage = "https://github.com/pjones/cassava-streams";
        description = "io-streams interface for the cassava CSV library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cassette" = callPackage
@@ -29758,10 +29782,10 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "catamorphism";
-       version = "0.5.0.1";
-       sha256 = "1zdjsd6dqkcpnm8w6macn0v5y48nycc4g2i4rz3gg57v1hlyqrh6";
+       version = "0.5.1.0";
+       sha256 = "1lhqdr0l3wc59ms1i1xmwp6iy4n4xrd8pi0an0n0jgxw5j2sfbkq";
        buildDepends = [ base template-haskell ];
-       homepage = "http://github.com/frerich/catamorphism";
+       homepage = "https://github.com/frerich/catamorphism";
        description = "A package exposing a helper function for generating catamorphisms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31378,22 +31402,23 @@ self: {
 
   "clash-ghc" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib
-     , clash-prelude, clash-systemverilog, clash-vhdl, containers
-     , directory, filepath, ghc, ghc-typelits-natnormalise, hashable
-     , haskeline, lens, mtl, process, text, transformers
+     , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl
+     , containers, directory, filepath, ghc, ghc-typelits-natnormalise
+     , hashable, haskeline, lens, mtl, process, text, transformers
      , unbound-generics, unix, unordered-containers
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.5.6";
-       sha256 = "0x538nxibz4hiyij1s9ljrgjvsmizha4nacszil1530qh7ss34n9";
+       version = "0.5.7";
+       sha256 = "0bia1yqww40prj2n6x4chvfkx05la73056mlpsgilakxwqsab2m7";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          array base bifunctors bytestring clash-lib clash-prelude
-         clash-systemverilog clash-vhdl containers directory filepath ghc
-         ghc-typelits-natnormalise hashable haskeline lens mtl process text
-         transformers unbound-generics unix unordered-containers
+         clash-systemverilog clash-verilog clash-vhdl containers directory
+         filepath ghc ghc-typelits-natnormalise hashable haskeline lens mtl
+         process text transformers unbound-generics unix
+         unordered-containers
        ];
        jailbreak = true;
        homepage = "http://www.clash-lang.org/";
@@ -31411,8 +31436,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "0.5.5";
-       sha256 = "0k6k45fhkwrr3azqhp278abf4kr7is67zsqyabf71hdyp68242dx";
+       version = "0.5.6";
+       sha256 = "1dgcnxzk7l7hywv1p268xrm2dfbgfgcvjs5w14vmsfxv1rfzkad0";
        buildDepends = [
          aeson attoparsec base bytestring clash-prelude concurrent-supply
          containers deepseq directory errors fgl filepath hashable lens mtl
@@ -31426,16 +31451,18 @@ self: {
 
   "clash-prelude" = callPackage
     ({ mkDerivation, base, data-default, doctest, ghc-prim
-     , ghc-typelits-natnormalise, Glob, integer-gmp, singletons
-     , template-haskell, th-lift
+     , ghc-typelits-natnormalise, Glob, integer-gmp, lens, QuickCheck
+     , singletons, template-haskell, th-lift
      }:
      mkDerivation {
        pname = "clash-prelude";
-       version = "0.7.5";
-       sha256 = "0li9y6cb56yf28yrma2c1japhl6c4rk0x9d8wnf3wq9n499bj6iv";
+       version = "0.8";
+       revision = "1";
+       sha256 = "0hd8faq69wvm679gyplbzccz3k4iyp1108xm0hc4x7cdrkmg01r1";
+       editedCabalFile = "e549747128c6452eca30da937a03b8d0ff2577466a5a242f50754db3d3f6a648";
        buildDepends = [
          base data-default ghc-prim ghc-typelits-natnormalise integer-gmp
-         singletons template-haskell th-lift
+         lens QuickCheck singletons template-haskell th-lift
        ];
        testDepends = [ base doctest Glob ];
        homepage = "http://www.clash-lang.org/";
@@ -31451,6 +31478,7 @@ self: {
        version = "0.1.2.1";
        sha256 = "1fn5wlg2lmxl6rs2ygnf0m88bgcjf62jpprbp425pqbq6lvhw70w";
        buildDepends = [ base clash-prelude QuickCheck ];
+       jailbreak = true;
        description = "QuickCheck instances for various types in the CλaSH Prelude";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31462,8 +31490,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-systemverilog";
-       version = "0.5.4";
-       sha256 = "1n35k6mmwf8ky99kc22nw5zwkp75pasjs1yx175h46ln3cqlm289";
+       version = "0.5.5";
+       sha256 = "1dks6saxp24xm478bgx2bkzx4qq6yv79f92z8kw6a2y29c3bjfrg";
        buildDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -31474,14 +31502,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clash-verilog" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
+     , text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-verilog";
+       version = "0.5.5";
+       sha256 = "0wjnjdl9slcrxnd0vz7m6y5jhs6gcaij7f9jjrgfcljq4wmk05rf";
+       buildDepends = [
+         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;
+     }) {};
+
   "clash-vhdl" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
      mkDerivation {
        pname = "clash-vhdl";
-       version = "0.5.4";
-       sha256 = "1zmbgsvqa6mgz3aj6xpv3daiic57rccbav1c5dnsfjbsp8x2jgnc";
+       version = "0.5.5";
+       sha256 = "0mwzp12ag98sfspjlh2w9hd1zgsx2bi7bv0lx55x6nmn8gawn0mk";
        buildDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -31619,8 +31664,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks";
-       version = "0.23.7";
-       sha256 = "0bs7gcbb3xsq4b444jybilfvpxqm9xdwn135fdn1wchbiykqnwba";
+       version = "0.23.8";
+       sha256 = "0inhxyjs12990mngfx2n3m107wxnamgi4gby5lnvai5nz913qgzd";
        buildDepends = [
          acid-state aeson aeson-qq attoparsec base blaze-html bytestring
          cereal containers directory filepath happstack-authenticate
@@ -31634,7 +31679,6 @@ self: {
        ];
        buildTools = [ hsx2hs ];
        extraLibraries = [ openssl ];
-       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "A secure, reliable content management system (CMS) and blogging platform";
        license = stdenv.lib.licenses.bsd3;
@@ -31677,6 +31721,7 @@ self: {
          text web-plugins
        ];
        buildTools = [ hsx2hs ];
+       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "clckwrks.com";
        license = stdenv.lib.licenses.bsd3;
@@ -31719,8 +31764,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-plugin-ircbot";
-       version = "0.6.12";
-       sha256 = "1pi8qrm71zdszc1fkwyvdx0qnlj4gzsyajw70w4s6sgmn7mgny69";
+       version = "0.6.14";
+       sha256 = "1lrh2929ia6326vf9lyd5jy1a3nnavl8f27f9faw35871p1my1r2";
        buildDepends = [
          acid-state attoparsec base blaze-html bytestring clckwrks
          containers directory filepath happstack-hsp happstack-server hsp
@@ -31728,7 +31773,6 @@ self: {
          safecopy text web-plugins web-routes web-routes-th
        ];
        buildTools = [ hsx2hs ];
-       jailbreak = true;
        homepage = "http://clckwrks.com/";
        description = "ircbot plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -31769,8 +31813,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-plugin-page";
-       version = "0.3.10";
-       sha256 = "0871fz0h3vqwsjrk7pz69nm8gi5ycxnfv1pip8nnf11wfqfcqlgb";
+       version = "0.4.0";
+       sha256 = "0j82xzdgpy97s4xf6vx3an5ssbybcixhasmh0ca9bjmv9iqkjkws";
        buildDepends = [
          acid-state aeson attoparsec base clckwrks containers directory
          filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
@@ -31779,7 +31823,6 @@ self: {
          web-plugins web-routes web-routes-happstack web-routes-th
        ];
        buildTools = [ hsx2hs ];
-       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -32553,6 +32596,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "codec" = callPackage
+    ({ mkDerivation, aeson, base, binary, binary-bits, bytestring
+     , data-default-class, mtl, template-haskell, text, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "codec";
+       version = "0.1.1";
+       sha256 = "0fkcbdas270gad7d3k40q96w68iwfb8jgi866x3dp4mf8wvsll9k";
+       buildDepends = [
+         aeson base binary binary-bits bytestring data-default-class mtl
+         template-haskell text transformers unordered-containers
+       ];
+       testDepends = [
+         aeson base binary binary-bits bytestring data-default-class mtl
+         template-haskell text transformers unordered-containers
+       ];
+       homepage = "https://github.com/chpatrick/codec";
+       description = "First-class record construction and bidirectional serialization";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "codec-libevent" = callPackage
     ({ mkDerivation, array, base, binary, binary-strict, bytestring
      , containers, parsec, QuickCheck, regex-compat
@@ -33163,15 +33228,16 @@ self: {
      }:
      mkDerivation {
        pname = "comonad";
-       version = "4.2.6";
+       version = "4.2.7";
        revision = "1";
-       sha256 = "1dspysfyjk74di2wvv7xj8r92acqsynjl5gi3sh8m7hqb122m60i";
-       editedCabalFile = "7a617c03c1147d1955930ac77cf2395f853195c2331468822aa58a5813b49556";
+       sha256 = "03h36hr7vgxxyxfp9yc87vahbm3d6chvrkcrjh5abxg6i42aflma";
+       editedCabalFile = "70542238a847c5b973832fa7e5623a76a485df25b36d511bfd5f5116e4014619";
        buildDepends = [
          base containers contravariant distributive semigroups tagged
          transformers transformers-compat
        ];
        testDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/comonad/";
        description = "Comonads";
        license = stdenv.lib.licenses.bsd3;
@@ -34172,6 +34238,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "conduit-parse" = callPackage
+    ({ mkDerivation, base, conduit, exceptions, hlint, parsers
+     , resourcet, tasty, tasty-hunit, text, transformers
+     }:
+     mkDerivation {
+       pname = "conduit-parse";
+       version = "0.1.0.0";
+       sha256 = "093qc82nrn8ziza1bfp4xnz8k0cpm39k868a3rq4dhah3s40gsv3";
+       buildDepends = [
+         base conduit exceptions parsers text transformers
+       ];
+       testDepends = [
+         base conduit exceptions hlint parsers resourcet tasty tasty-hunit
+       ];
+       homepage = "https://github.com/k0ral/conduit-parse";
+       description = "Parsing framework based on conduit";
+       license = "unknown";
+     }) {};
+
   "conduit-resumablesink" = callPackage
     ({ mkDerivation, base, bytestring, conduit, hspec, transformers
      , void
@@ -34554,18 +34639,22 @@ self: {
 
   "consul-haskell" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , http-client, HUnit, network, tasty, tasty-hunit, text
+     , http-client, http-types, HUnit, lifted-async, lifted-base
+     , monad-control, network, stm, tasty, tasty-hunit, text
      , transformers
      }:
      mkDerivation {
        pname = "consul-haskell";
-       version = "0.1";
-       sha256 = "0i6xq7xd4bikb46mrcabiwwfga25wqcg7z45bh2hbqhf7yq8xjm6";
+       version = "0.2.1";
+       sha256 = "13c3yqn5nsx7r0hkgdwka6fis2ypg54k4damv3c22rdjyids17x7";
        buildDepends = [
-         aeson base base64-bytestring bytestring http-client network text
+         aeson base base64-bytestring bytestring http-client http-types
+         lifted-async lifted-base monad-control network stm text
          transformers
        ];
-       testDepends = [ base http-client HUnit network tasty tasty-hunit ];
+       testDepends = [
+         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;
@@ -36680,8 +36769,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptol";
-       version = "2.2.3";
-       sha256 = "0g8xf65v255z8qm30n3d1h4fval763lns14vb36cyrp1gp48rf2i";
+       version = "2.2.4";
+       sha256 = "07aai72kg66skdnbydy25a07124znvrixbw91gk4n9430gsvv26z";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -42550,8 +42639,8 @@ self: {
      }:
      mkDerivation {
        pname = "dns";
-       version = "1.4.5";
-       sha256 = "13s9ysa5hkjjc2a5290mbpnrk2mjg3w01mib62p65rywz26yc7g5";
+       version = "2.0.0";
+       sha256 = "1jq12jdidgz9nrcpnr362n6rwvxywd5v7j4fi18bqaq2f67ybjay";
        buildDepends = [
          attoparsec base binary blaze-builder bytestring conduit
          conduit-extra containers iproute mtl network random resourcet
@@ -42753,10 +42842,8 @@ self: {
      }:
      mkDerivation {
        pname = "doctest";
-       version = "0.9.13";
-       revision = "1";
-       sha256 = "0xl570ay5bw1rpd1aw59c092rnwjbp9qykh2rhpxyvl333p8mg00";
-       editedCabalFile = "592ab6d62eca8a0b43930f15c8fb653c54d60983bd232ecc505bd5a5aebe6f7f";
+       version = "0.10.0";
+       sha256 = "161k9brapz6hbwl3naar07kpfsgqp4b52i5nfsbxsqa2a9al40kb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -45032,8 +45119,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-init";
-       version = "0.1.2.0";
-       sha256 = "0s80x6r2h5cwng6x15xmwgpnjv0qgp360g11g2k3hsc5y8fvgmkd";
+       version = "0.1.2.1";
+       sha256 = "0x5p5jwxz07m515421xpcw777lgc3bx40mnl0y9fdw2gz4f3svs2";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -45042,6 +45129,7 @@ self: {
        ];
        description = "Set up basic structure for an elm project";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-make" = callPackage
@@ -49005,6 +49093,7 @@ self: {
        sha256 = "1hlg0rbi2phk7qr7nvjnazg344jqp5p13c3m8v5n01vw9bvjbnir";
        buildDepends = [ base deepseq primitive ];
        testDepends = [ base doctest filemanip primitive ];
+       jailbreak = true;
        description = "Generic vectors with statically known size";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49400,10 +49489,8 @@ self: {
     ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
      mkDerivation {
        pname = "flow";
-       version = "1.0.0";
-       revision = "1";
-       sha256 = "15vr7d1fyabr9v9r9vnh9m2x0r2i0ggg714cc7r6zxhjbrrc9rbn";
-       editedCabalFile = "acf5b2b49db56bf047774bc90e57e6c81c5c4d413849d4cdff9dfaf4c71246ab";
+       version = "1.0.1";
+       sha256 = "11i0p2f8zxpcpssga279hx8vy6a14xykmb8qxyfrrpvd6qg42i8y";
        buildDepends = [ base ];
        testDepends = [ base doctest QuickCheck template-haskell ];
        homepage = "http://taylor.fausak.me/flow/";
@@ -49661,15 +49748,15 @@ self: {
 
   "foldl" = callPackage
     ({ mkDerivation, base, bytestring, containers, mwc-random
-     , primitive, text, transformers, vector
+     , primitive, profunctors, text, transformers, vector
      }:
      mkDerivation {
        pname = "foldl";
-       version = "1.0.10";
-       sha256 = "04ghbn78hsqp92k9mljpa5xgjrmddwrhj90wb1f1v4lliw1inn9q";
+       version = "1.0.11";
+       sha256 = "0czavxjbf8vafkizw6sdvp2a19qdgpjvjb10f1f52jmd5z8k3rxr";
        buildDepends = [
-         base bytestring containers mwc-random primitive text transformers
-         vector
+         base bytestring containers mwc-random primitive profunctors text
+         transformers vector
        ];
        description = "Composable, streaming, and efficient left folds";
        license = stdenv.lib.licenses.bsd3;
@@ -50230,10 +50317,9 @@ self: {
     ({ mkDerivation, base, semigroups }:
      mkDerivation {
        pname = "fraction";
-       version = "0.1.0.3";
-       sha256 = "0kjpfqy528s11kfigp27kr5a4xw8kn11mpgjzb6fapdbip6y9579";
+       version = "0.1.0.4";
+       sha256 = "0blvvsc1rbn45nwgmkhd28bdz0awi5mk6h48yqbqy3ajm2gvpvdf";
        buildDepends = [ base semigroups ];
-       jailbreak = true;
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/fraction";
        description = "Fractions";
        license = stdenv.lib.licenses.bsd3;
@@ -50592,15 +50678,14 @@ self: {
      }:
      mkDerivation {
        pname = "friday";
-       version = "0.2.1.2";
-       sha256 = "08w97jbcg5641brd0pf1bnj6mk0lf7xa57v88y686mx6lsl80i3q";
+       version = "0.2.2.0";
+       sha256 = "0cw8mghygbd76l2nf0s1n0n1a7ymh2hv4dfm11hkv0gcdrqrp9fr";
        buildDepends = [
          base convertible deepseq primitive ratio-int transformers vector
        ];
        testDepends = [
          base QuickCheck test-framework test-framework-quickcheck2 vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/RaphaelJ/friday";
        description = "A functional image processing library for Haskell";
        license = stdenv.lib.licenses.gpl3;
@@ -51991,8 +52076,8 @@ self: {
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
        pname = "geniplate-mirror";
-       version = "0.6.0.7";
-       sha256 = "0az8q9jjakbi891ypzm4qg8ys78102zqxqpznk6mm08ng2hzb0wz";
+       version = "0.7.1";
+       sha256 = "0wz7fp0cgf7xn37mmy91scacihnr0fcd6lpbi28yx4qss2hb1m30";
        buildDepends = [ base mtl template-haskell ];
        homepage = "https://github.com/danr/geniplate";
        description = "Use Template Haskell to generate Uniplate-like functions";
@@ -52144,6 +52229,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "geom2d" = callPackage
+    ({ mkDerivation, base, ieee754, QuickCheck }:
+     mkDerivation {
+       pname = "geom2d";
+       version = "0.1.2.1";
+       sha256 = "0235p0gjwsklxynr84ak6zirbxirhwm9f2z7d6b31y5hc9pnrznj";
+       buildDepends = [ base ieee754 QuickCheck ];
+       testDepends = [ base ieee754 QuickCheck ];
+       jailbreak = true;
+       description = "package for geometry in euklidean 2d space";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "getemx" = callPackage
     ({ mkDerivation, base, curl, directory, filepath, haskell98, hxt
      , mtl, old-locale, process, time
@@ -52183,8 +52282,8 @@ self: {
      }:
      mkDerivation {
        pname = "getopt-generics";
-       version = "0.6.3";
-       sha256 = "18d9cbk87gx31fk1bdylllicbnxj2xmb5xzss27amy8xcmlb3qds";
+       version = "0.7";
+       sha256 = "1r1z13n0s5vxxcxwwfmk8dplah12qdyb0jnjx2hx239hvy2l1bzc";
        buildDepends = [
          base base-compat base-orphans generics-sop tagged
        ];
@@ -52192,6 +52291,7 @@ self: {
          base base-compat base-orphans generics-sop hspec hspec-expectations
          markdown-unlit QuickCheck silently tagged
        ];
+       homepage = "https://github.com/zalora/getopt-generics#readme";
        description = "Simple command line argument parsing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52707,6 +52807,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-tcplugins-extra" = callPackage
+    ({ mkDerivation, base, ghc }:
+     mkDerivation {
+       pname = "ghc-tcplugins-extra";
+       version = "0.1";
+       sha256 = "1lr3x3vg5aw8fjwz7skcisqg2hsls16abxp8p4w4940qnw5zznkf";
+       buildDepends = [ base ghc ];
+       jailbreak = true;
+       homepage = "http://www.clash-lang.org/";
+       description = "Utilities for writing GHC type-checker plugins";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "ghc-time-alloc-prof" = callPackage
     ({ mkDerivation, attoparsec, base, containers, text, time }:
      mkDerivation {
@@ -52722,12 +52835,13 @@ self: {
      }) {};
 
   "ghc-typelits-natnormalise" = callPackage
-    ({ mkDerivation, base, ghc, tasty, tasty-hunit }:
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit
+     }:
      mkDerivation {
        pname = "ghc-typelits-natnormalise";
-       version = "0.2.1";
-       sha256 = "0dflzqhqax06nx4qc5xw6k1aihny7d2pxg1ldyw1y57mjg44clah";
-       buildDepends = [ base ghc ];
+       version = "0.3";
+       sha256 = "169imqq6hch4lamsgz8s3cnszysvxvw9xlgd5bjldq09zvpy7i8r";
+       buildDepends = [ base ghc ghc-tcplugins-extra ];
        testDepends = [ base tasty tasty-hunit ];
        jailbreak = true;
        homepage = "http://www.clash-lang.org/";
@@ -53550,8 +53664,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitit";
-       version = "0.10.6.3";
-       sha256 = "1pzxk4zsk1992gsgyi0pfj8x0dggf56v78345jl282hvb2psm371";
+       version = "0.10.7";
+       sha256 = "1gj94z2c2jpdm9bkfnc6wbyhipgbss0j70ql26hn8g3fh1ykcpbj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -53563,7 +53677,6 @@ self: {
          random recaptcha safe SHA split syb tagsoup text time uri url
          utf8-string uuid xhtml xml xss-sanitize zlib
        ];
-       jailbreak = true;
        homepage = "http://gitit.net";
        description = "Wiki using happstack, git or darcs, and pandoc";
        license = "GPL";
@@ -53934,12 +54047,12 @@ self: {
      }) {};
 
   "gll" = callPackage
-    ({ mkDerivation, array, base, containers }:
+    ({ mkDerivation, array, base, containers, TypeCompose }:
      mkDerivation {
        pname = "gll";
-       version = "0.1.0.1";
-       sha256 = "09f5clmvn8icgsw73ysyalspy07llbg6lbiqidb4lvmznhg38rvv";
-       buildDepends = [ array base containers ];
+       version = "0.2.0.1";
+       sha256 = "0f5hiklia5fkddzahq0cjpwdjjk2d5sfs0hd7wwcylylsh0xicd7";
+       buildDepends = [ array base containers TypeCompose ];
        description = "GLL parser with simple combinator interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55769,6 +55882,22 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) { inherit (pkgs.gnome) gtk;};
 
+  "gtk-helpers" = callPackage
+    ({ mkDerivation, array, base, gio, glib, gtk, mtl, process
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "gtk-helpers";
+       version = "0.0.7";
+       sha256 = "0cx43z79r77ksicgz4ajg8b4hhllyfadcb46zdh6lg088zsgc6v7";
+       buildDepends = [
+         array base gio glib gtk mtl process template-haskell
+       ];
+       homepage = "http://keera.es/blog/community";
+       description = "A collection of auxiliary operations and widgets related to Gtk";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gtk-jsinput" = callPackage
     ({ mkDerivation, base, gtk, json, transformers }:
      mkDerivation {
@@ -56470,8 +56599,8 @@ self: {
      }:
      mkDerivation {
        pname = "hPDB";
-       version = "1.2.0.3";
-       sha256 = "1lciijgn137gmi190if41akj4pv9030rbbvys5lfh4q5kk8p2dsp";
+       version = "1.2.0.4";
+       sha256 = "0fzr6y19x7c47y3jl68zcrjnlc8j3b0xnvvrpmqm15qznlrdh41s";
        buildDepends = [
          AC-Vector base bytestring containers deepseq directory ghc-prim
          iterable mmap mtl Octree parallel QuickCheck tagged
@@ -62717,6 +62846,7 @@ self: {
        sha256 = "1g4nf361qfjyymwpyiiq0qk5brrsr4wz1pncij69pwda919b3j6b";
        buildDepends = [ base ];
        testDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/heaps/";
        description = "Asymptotically optimal Brodal/Okasaki heaps";
        license = stdenv.lib.licenses.bsd3;
@@ -65411,8 +65541,8 @@ self: {
     ({ mkDerivation, base, hspec, sass }:
      mkDerivation {
        pname = "hlibsass";
-       version = "0.1.2.0";
-       sha256 = "18hby3vjnzfis2ixbkkrk1zwky4rymx5ai00wza9yx4ijnxrzc3z";
+       version = "0.1.2.1";
+       sha256 = "1fipgxpzzc0jbb2xc2dslhc94xjvd1vkq564g4a1i7axnq90b6dv";
        buildDepends = [ base ];
        testDepends = [ base hspec ];
        extraLibraries = [ sass ];
@@ -66368,6 +66498,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "homplexity" = callPackage
+    ({ mkDerivation, base, containers, cpphs, deepseq, directory
+     , filepath, happy, haskell-src-exts, hflags, template-haskell
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "homplexity";
+       version = "0.4.2.0";
+       sha256 = "1jxq8fgm1ja0y3h5jj9d4wr96fpb6496xc9sb3q562bxssx6giay";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base containers cpphs deepseq directory filepath haskell-src-exts
+         hflags template-haskell uniplate
+       ];
+       buildTools = [ happy ];
+       homepage = "https://github.com/mgajda/homplexity";
+       description = "Haskell code quality tool";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "honi" = callPackage
     ({ mkDerivation, base, bytestring, freenect, hspec, HUnit, OpenNI2
      , text
@@ -67027,6 +67178,7 @@ self: {
        homepage = "https://github.com/yihuang/hosts-server";
        description = "An dns server which is extremely easy to config";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hothasktags" = callPackage
@@ -67990,8 +68142,8 @@ self: {
      }:
      mkDerivation {
        pname = "hs-mesos";
-       version = "0.20.2.0";
-       sha256 = "1vnfmb5mnp3wsbd7s1ls6rz0ywlirykdx7dclkxcc3rh1y0mxp1n";
+       version = "0.20.3.0";
+       sha256 = "1d9mf35i5nwpnr5l5v75rrcwihfkpfy3ji9jwhk9k0g285bfr5dh";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base bytestring lens managed template-haskell ];
@@ -72682,8 +72834,8 @@ self: {
      }:
      mkDerivation {
        pname = "hyakko";
-       version = "0.6.6";
-       sha256 = "1y0b5rxgiaygy0y42s2rnnw87br4d73nbjii9gpbf80rlvhdjagw";
+       version = "0.6.7";
+       sha256 = "1k81whay05mp9jb39gmb64l2xqxa90yrb7svbphj1cnsz0b76qwk";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -73103,6 +73255,7 @@ self: {
        testDepends = [
          base containers directory doctest filepath unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/hyphenation";
        description = "Configurable Knuth-Liang hyphenation";
        license = stdenv.lib.licenses.bsd3;
@@ -74420,12 +74573,9 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "index-core";
-       version = "1.0.1";
-       revision = "1";
-       sha256 = "01d7025js5a3373a8ixl3clvmd0blpkly6js3ggnp26p4h5ilhv4";
-       editedCabalFile = "dbc4c7390f6664ca0ad083bb005897e6f3ca5dca5e95709621c131d7a1a0f09f";
+       version = "1.0.2";
+       sha256 = "0sj69r9mavw1s17lhh7af9n5vrb60gk5lm6v593sp0rs77canldw";
        buildDepends = [ base ];
-       jailbreak = true;
        description = "Indexed Types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74627,8 +74777,8 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "0.9.1.2";
-       sha256 = "1nn1vflzb4c8xvvnnxl3ph947nxy5ibyh8bzrp2ddwjb62xm2l00";
+       version = "0.9.1.3";
+       sha256 = "0v092i592j5n31fl0vc5750pqjbgaj10n3dm314bkll6ld0gdbwx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -74640,7 +74790,6 @@ self: {
          base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck
          tasty-th text vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/maoe/influxdb-haskell";
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
@@ -74720,8 +74869,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-c";
-       version = "0.5.3.1";
-       sha256 = "1n4w1lr3jwx4dwcks0c7rc79hdf4jwsgl3famivrdls01fqv9dhi";
+       version = "0.5.3.2";
+       sha256 = "0sihzjscdrk02z2d22j0fcqgk05nhpg16zy2cdkxjj4cp09nbaac";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -75682,18 +75831,16 @@ self: {
 
   "ircbot" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , irc, mtl, network, old-locale, parsec, random, SafeSemaphore, stm
-     , time, unix
+     , irc, mtl, network, parsec, random, SafeSemaphore, stm, time, unix
      }:
      mkDerivation {
        pname = "ircbot";
-       version = "0.6.2";
-       sha256 = "0jl6sgm7bk4yi1l4s6j3yir3rpbxx8r4ri267xcw77b2vzbxq7l0";
+       version = "0.6.4";
+       sha256 = "024wmkp08rni9frflpjl0p30ql6k1kj956j5dysz40xygajk8fmd";
        buildDepends = [
          base bytestring containers directory filepath irc mtl network
-         old-locale parsec random SafeSemaphore stm time unix
+         parsec random SafeSemaphore stm time unix
        ];
-       jailbreak = true;
        homepage = "http://hub.darcs.net/stepcut/ircbot";
        description = "A library for writing irc bots";
        license = stdenv.lib.licenses.bsd3;
@@ -77955,6 +78102,242 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "keera-callbacks" = callPackage
+    ({ mkDerivation, base, mtl }:
+     mkDerivation {
+       pname = "keera-callbacks";
+       version = "0.1";
+       sha256 = "1xgxg30za69nfk8y83bmskjq2w3r3afg4gc507wkn91xdah93niq";
+       buildDepends = [ base mtl ];
+       description = "Mutable memory locations with callbacks";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "keera-hails-i18n" = callPackage
+    ({ mkDerivation, base, directory, filepath, glib, hgettext
+     , MissingK, setlocale, utf8-string
+     }:
+     mkDerivation {
+       pname = "keera-hails-i18n";
+       version = "0.0.3.3";
+       sha256 = "0aih2mxgyfnrfnvqqsdv5g7r4jgjg5cfqykgalcsb9wqv0gq6d4i";
+       buildDepends = [
+         base directory filepath glib hgettext MissingK setlocale
+         utf8-string
+       ];
+       homepage = "http://www.keera.es/blog/community/";
+       description = "Rapid Gtk Application Development - I18N";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "keera-hails-mvc-controller" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "keera-hails-mvc-controller";
+       version = "0.0.3.3";
+       sha256 = "00qr5czm0hq3jxwp42fc50v6r458rm9qq9fpri4rhnc41il79nzb";
+       buildDepends = [ base ];
+       homepage = "http://www.keera.es/blog/community/";
+       description = "Haskell on Gtk rails - Gtk-based controller for MVC applications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "keera-hails-mvc-environment-gtk" = callPackage
+    ({ mkDerivation, base, keera-hails-mvc-model-protectedmodel
+     , keera-hails-mvc-view, keera-hails-mvc-view-gtk
+     }:
+     mkDerivation {
+       pname = "keera-hails-mvc-environment-gtk";
+       version = "0.0.3.3";
+       sha256 = "0bk3191x8bsvmmnqyf7jzmrlg71q26z2kn4xfahdnpgxw3qskwmr";
+       buildDepends = [
+         base keera-hails-mvc-model-protectedmodel keera-hails-mvc-view
+         keera-hails-mvc-view-gtk
+       ];
+       homepage = "http://www.keera.es/blog/community/";
+       description = "Haskell on Gtk rails - Gtk-based global environment for MVC applications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "keera-hails-mvc-model-lightmodel" = callPackage
+    ({ mkDerivation, base, containers, keera-hails-reactivevalues
+     , MissingK, stm, template-haskell
+     }:
+     mkDerivation {
+       pname = "keera-hails-mvc-model-lightmodel";
+       version = "0.0.3.4";
+       sha256 = "085qppi68qf8jbkp674ldikhr5z4nrffzqa9kgdm1dngrgsib190";
+       buildDepends = [
+         base containers keera-hails-reactivevalues MissingK stm
+         template-haskell
+       ];
+       homepage = "http://www.keera.es/blog/community/";
+       description = "Rapid Gtk Application Development - Reactive Protected Light Models";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "keera-hails-mvc-model-protectedmodel" = callPackage
+    ({ mkDerivation, base, containers, keera-hails-reactivevalues
+     , MissingK, stm, template-haskell
+     }:
+     mkDerivation {
+       pname = "keera-hails-mvc-model-protectedmodel";
+       version = "0.0.3.5";
+       sha256 = "14jm1116j3plzglxygjdymfy8z3p5k8zinnh8wazkxgc5y9kkcsx";
+       buildDepends = [
+         base containers keera-hails-reactivevalues MissingK stm
+         template-haskell
+       ];
+       homepage = "http://www.keera.es/blog/community/";
+       description = "Rapid Gtk Application Development - Protected Reactive Models";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "keera-hails-mvc-solutions-config" = callPackage
+    ({ mkDerivation, base, directory, filepath, MissingK }:
+     mkDerivation {
+       pname = "keera-hails-mvc-solutions-config";
+       version = "0.0.3.3";
+       sha256 = "16c6nh5fqw2r42nxs3x27rqbpscypjzgqnprl99241giwcvy98x1";
+       buildDepends = [ base directory filepath MissingK ];
+       homepage = "http://www.keera.es/blog/community/";
+       description = "Haskell on Gtk rails - Easy handling of configuration files";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "keera-hails-mvc-solutions-gtk" = callPackage
+    ({ mkDerivation, base, gtk, hslogger, HTTP
+     , keera-hails-mvc-environment-gtk
+     , keera-hails-mvc-model-protectedmodel, keera-hails-mvc-view
+     , keera-hails-mvc-view-gtk, keera-hails-reactivevalues, MissingK
+     , mtl, network, network-uri, template-haskell
+     }:
+     mkDerivation {
+       pname = "keera-hails-mvc-solutions-gtk";
+       version = "0.0.3.3";
+       sha256 = "1j0821aysvzpa8qnnz9066gwxk1bwn0sykihb5p5br62n7xzhgkf";
+       buildDepends = [
+         base gtk hslogger HTTP keera-hails-mvc-environment-gtk
+         keera-hails-mvc-model-protectedmodel keera-hails-mvc-view
+         keera-hails-mvc-view-gtk keera-hails-reactivevalues MissingK mtl
+         network network-uri template-haskell
+       ];
+       homepage = "http://www.keera.es/blog/community/";
+       description = "Haskell on Gtk rails - Common solutions to recurrent problems in Gtk applications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "keera-hails-mvc-view" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "keera-hails-mvc-view";
+       version = "0.0.3.3";
+       sha256 = "0jkwbpw23ba5z83nfk51hp8wsfkrbbiwr0f6bvx39wzz1v81n58p";
+       buildDepends = [ base ];
+       homepage = "http://www.keera.es/blog/community/";
+       description = "Haskell on Gtk rails - Generic View for MVC applications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "keera-hails-mvc-view-gtk" = callPackage
+    ({ mkDerivation, base, gtk, gtk-helpers, keera-hails-mvc-view }:
+     mkDerivation {
+       pname = "keera-hails-mvc-view-gtk";
+       version = "0.0.3.3";
+       sha256 = "1yz4drm0r1831acg9y8glg7hgiqwgc5nqkz4hfgqgfngqs94jx4z";
+       buildDepends = [ base gtk gtk-helpers keera-hails-mvc-view ];
+       homepage = "http://www.keera.es/blog/community/";
+       description = "Haskell on Gtk rails - Gtk-based View for MVC applications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "keera-hails-reactive-fs" = callPackage
+    ({ mkDerivation, base, directory, fsnotify
+     , keera-hails-reactivevalues, system-filepath
+     }:
+     mkDerivation {
+       pname = "keera-hails-reactive-fs";
+       version = "0.0.3.3";
+       sha256 = "1j8nlzaalmf82jhri8m12hl6vmg6y4amwvb1gv5dld41cz6sdv08";
+       buildDepends = [
+         base directory fsnotify keera-hails-reactivevalues system-filepath
+       ];
+       homepage = "http://www.keera.es/blog/community/";
+       description = "Haskell on Rails - Files as Reactive Values";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "keera-hails-reactive-gtk" = callPackage
+    ({ mkDerivation, base, gtk, gtk-helpers, keera-hails-reactivevalues
+     , mtl, transformers
+     }:
+     mkDerivation {
+       pname = "keera-hails-reactive-gtk";
+       version = "0.0.3.5";
+       sha256 = "01hvakmxjm9vpfwp4s7c1s3jqiy21yqb9rgjs2drf2kb66ndvsq9";
+       buildDepends = [
+         base gtk gtk-helpers keera-hails-reactivevalues mtl transformers
+       ];
+       homepage = "http://www.keera.es/blog/community/";
+       description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "keera-hails-reactive-network" = callPackage
+    ({ mkDerivation, base, keera-hails-reactivevalues, network }:
+     mkDerivation {
+       pname = "keera-hails-reactive-network";
+       version = "0.0.3.3";
+       sha256 = "1379djvy5nn6k67ds7mk9jjh03zd6sj0v8sf5agmk3pf5cyp0xa3";
+       buildDepends = [ base keera-hails-reactivevalues network ];
+       homepage = "http://www.keera.es/blog/community/";
+       description = "Haskell on Rails - Sockets as Reactive Values";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "keera-hails-reactive-polling" = callPackage
+    ({ mkDerivation, base, keera-callbacks, keera-hails-reactivevalues
+     }:
+     mkDerivation {
+       pname = "keera-hails-reactive-polling";
+       version = "0.0.3.3";
+       sha256 = "1khkbhj94y6y5s2d56h718c8kh3y698wdryi2369mrw755dy6qh8";
+       buildDepends = [ base keera-callbacks keera-hails-reactivevalues ];
+       homepage = "http://www.keera.es/blog/community/";
+       description = "Haskell on Rails - Polling based Readable RVs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "keera-hails-reactive-wx" = callPackage
+    ({ mkDerivation, base, keera-hails-reactivevalues, wx, wxcore }:
+     mkDerivation {
+       pname = "keera-hails-reactive-wx";
+       version = "0.0.3.3";
+       sha256 = "02ikqqfgwr3nrr18qdd1jshqm0dlnwbybqpzpj2ba7zbwpabd5bw";
+       buildDepends = [ base keera-hails-reactivevalues wx wxcore ];
+       homepage = "http://www.keera.es/blog/community/";
+       description = "Haskell on Rails - Reactive Fields for WX widgets";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "keera-hails-reactive-yampa" = callPackage
+    ({ mkDerivation, base, keera-callbacks, keera-hails-reactivevalues
+     , time, Yampa
+     }:
+     mkDerivation {
+       pname = "keera-hails-reactive-yampa";
+       version = "0.0.3.3";
+       sha256 = "1n1xyr9pc1sw9gypwhh1rfdjshg7x1kvwr6v3hp0837zvdcz8gw1";
+       buildDepends = [
+         base keera-callbacks keera-hails-reactivevalues time Yampa
+       ];
+       homepage = "http://www.keera.es/blog/community/";
+       description = "Haskell on Rails - FRP Yampa Signal Functions as RVs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "keera-hails-reactivevalues" = callPackage
     ({ mkDerivation, base, contravariant }:
      mkDerivation {
@@ -79422,8 +79805,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-c-quote";
-       version = "0.10.2.1";
-       sha256 = "0klr7b4sdi8bsln9hw3xa56d3s1h869zkyqnm97fiyvzar91g532";
+       version = "0.10.2.2";
+       sha256 = "0y65mlx4zx1n7n6y3gjvzqzr2k8bxbbjn4wsjr8mzpib0gqfqpss";
        buildDepends = [
          array base bytestring containers exception-mtl
          exception-transformers filepath haskell-src-meta mainland-pretty
@@ -81840,6 +82223,7 @@ self: {
          base binary bytestring directory doctest filepath HUnit lens
          simple-reflect test-framework test-framework-hunit
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/linear/";
        description = "Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
@@ -83230,8 +83614,8 @@ self: {
      }:
      mkDerivation {
        pname = "log";
-       version = "0.2.0";
-       sha256 = "1mm41m8vg7n6hnnrg47qy2pbhsxgykclz3wypjsf1zj5wbqdd2w0";
+       version = "0.2.1";
+       sha256 = "0jply63w04pnkfv3s8lpnwvjf43sfhf3mk72p3wva4p28c6mql31";
        buildDepends = [
          aeson aeson-pretty base bytestring deepseq exceptions hpqtypes
          monad-control monad-time mtl old-locale split stm text time
@@ -84287,6 +84671,7 @@ self: {
          transformers void
        ];
        testDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/machines/";
        description = "Networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
@@ -86185,8 +86570,8 @@ self: {
      }:
      mkDerivation {
        pname = "memory";
-       version = "0.6";
-       sha256 = "18r0rnh2x5sazn2i23v222vxrgsgyyzbfvasg21r2kh42i0vh2bw";
+       version = "0.7";
+       sha256 = "1yj1v4xr3y3inrn1rzlh1lfmgxi8p15k4qm48bac76qg3a2wh8z1";
        buildDepends = [ base bytestring deepseq ghc-prim ];
        testDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        homepage = "https://github.com/vincenthz/hs-memory";
@@ -86392,8 +86777,8 @@ self: {
      }:
      mkDerivation {
        pname = "metrics";
-       version = "0.3.0.0";
-       sha256 = "1g1nxb7q834nslrmgmqarbbq3ah60k2fqj71k55z9dj4waqgx2sg";
+       version = "0.3.0.1";
+       sha256 = "1mj4x5pq9mch71vk5cqi2wjaqjhgsllvjbsz7yyv6sg4cps63d8l";
        buildDepends = [
          ansi-terminal base bytestring containers lens mtl mwc-random
          primitive text time unix unordered-containers vector
@@ -86802,8 +87187,8 @@ self: {
      }:
      mkDerivation {
        pname = "mime-mail";
-       version = "0.4.8.2";
-       sha256 = "19f2q4x8b19sc7y1yyxvl3fsyggjs07yhf1zjw42a875lp4mnvia";
+       version = "0.4.9";
+       sha256 = "1l638jr7914227mg8854i6xgyhq403kb1zc2py77yb0xifm20534";
        buildDepends = [
          base base64-bytestring blaze-builder bytestring filepath process
          random text
@@ -87403,6 +87788,7 @@ self: {
        sha256 = "005pbkrszgkbm0qx9hzn1f72l9z07qhqypmcw72fi5i5hppr45av";
        buildDepends = [ base ];
        testDepends = [ base doctest Glob ];
+       jailbreak = true;
        homepage = "https://github.com/TikhonJelvis/modular-arithmetic";
        description = "A type for integers modulo some constant";
        license = stdenv.lib.licenses.bsd3;
@@ -88219,8 +88605,11 @@ self: {
      mkDerivation {
        pname = "monad-unify";
        version = "0.2.2";
+       revision = "1";
        sha256 = "1icl4jaa4vc4lb75m6wv4vjvf8b2xx7aziqhsg2pshizdkfxmgwp";
+       editedCabalFile = "7d585b29bfa558cf59d169421d1ec3363b6ef56b88cf6a9a082192d609676ce2";
        buildDepends = [ base mtl unordered-containers ];
+       jailbreak = true;
        description = "Generic first-order unification";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91334,8 +91723,8 @@ self: {
      }:
      mkDerivation {
        pname = "nettle";
-       version = "0.1.0";
-       sha256 = "1ms96laa9d2ns39ymw6mlwm0mj03vss7855cs9npymhb4fmqkcas";
+       version = "0.1.1";
+       sha256 = "1l9515ks41b9rkcxv91d391lwl87k2ipl3j5qfjcdz1qaxrnjkyr";
        buildDepends = [
          base byteable bytestring crypto-cipher-types securemem tagged
        ];
@@ -91516,17 +91905,18 @@ self: {
     ({ mkDerivation, attoparsec, base, base32string, bytestring
      , exceptions, hexstring, hspec, hspec-attoparsec
      , hspec-expectations, network, network-attoparsec, network-simple
-     , socks, text, transformers
+     , socks, splice, text, transformers
      }:
      mkDerivation {
        pname = "network-anonymous-tor";
-       version = "0.9.1";
-       sha256 = "1p78xsi1i59z9jkyf182gvfx7qpiqs0l60mp2xl1d4jjwgdnni50";
+       version = "0.9.2";
+       sha256 = "1zssb8npwnzj8mra8pkvshni7h36wqhddva9rrwbq480492sck1w";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          attoparsec base base32string bytestring exceptions hexstring
-         network network-attoparsec network-simple socks text transformers
+         network network-attoparsec network-simple socks splice text
+         transformers
        ];
        testDepends = [
          attoparsec base base32string bytestring exceptions hspec
@@ -94678,15 +95068,21 @@ self: {
      }) {};
 
   "order-maintenance" = callPackage
-    ({ mkDerivation, base, containers, transformers }:
+    ({ mkDerivation, base, Cabal, cabal-test-quickcheck, containers
+     , QuickCheck, transformers
+     }:
      mkDerivation {
        pname = "order-maintenance";
-       version = "0.0.0.0";
-       sha256 = "1d416a277fcchcgyn4n5m7kpn0aky8gsi8fkk0gh3a4lcap18h2d";
+       version = "0.0.1.0";
+       sha256 = "01j8caxlmzz04qabinq5kcjdsr1855lmcdsi9sqn9zf79s16q97k";
        buildDepends = [ base containers transformers ];
+       testDepends = [
+         base Cabal cabal-test-quickcheck containers QuickCheck transformers
+       ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/order-maintenance";
        description = "Algorithms for the order maintenance problem with a safe interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "order-statistics" = callPackage
@@ -94928,6 +95324,7 @@ self: {
        sha256 = "0mv9iakq1yjawf7f0zckmxbzlcv2rlqngsllfsrcydi6lxazznzw";
        buildDepends = [ base ];
        testDepends = [ base doctest ];
+       jailbreak = true;
        description = "An alternative to some of the Prelude";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -95005,8 +95402,8 @@ self: {
      }:
      mkDerivation {
        pname = "packed-dawg";
-       version = "0.2.0.5";
-       sha256 = "1b8lhigpzj1zvah6f4ra7pczhpm8dxcwaqna8p1ifbbx2ys6x59p";
+       version = "0.2.0.7";
+       sha256 = "03wf6pnv2l7aydxzv0gx073324iy5j7pbfh5nl3p5xdpr8y8il7y";
        buildDepends = [
          base binary deepseq mtl unordered-containers vector
          vector-binary-instances
@@ -95242,8 +95639,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "1.14.0.3";
-       sha256 = "1nbicmngsdx9v4kvsswipf8w1l8rvfsll8fnp2ar5v65b0aba3ic";
+       version = "1.14.0.4";
+       sha256 = "1pzs4ysf7q3sxd8vyydzi5r4n8gjnkvjs3p1phmw4zir3zxmp581";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -95322,10 +95719,8 @@ self: {
     ({ mkDerivation, base, csv, pandoc, pandoc-types, text }:
      mkDerivation {
        pname = "pandoc-csv2table";
-       version = "1.0.0";
-       revision = "1";
-       sha256 = "0jr18sa5apvy8jckb5cxvsyr6c2drii6652ipwpd4xkdwrabwp5r";
-       editedCabalFile = "49799682e063ffa396f94dd2f91e9b252f0224544d2e7a9d1dc5b41a909efd3d";
+       version = "1.0.1";
+       sha256 = "0b4xszf9bzfhrjgy2cymryab58zhh4jwv9p8g2hiqgrxix8jr1qb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base csv pandoc pandoc-types text ];
@@ -98937,6 +99332,7 @@ self: {
        ];
        description = "Multi-backend (zookeeper and sqlite) DNS Server using persistent-library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pointed" = callPackage
@@ -99155,16 +99551,16 @@ self: {
      }) {};
 
   "poly-arity" = callPackage
-    ({ mkDerivation, base, constraints, hspec, QuickCheck
+    ({ mkDerivation, base, constraints, HList, hspec, QuickCheck
      , quickcheck-instances
      }:
      mkDerivation {
        pname = "poly-arity";
-       version = "0.0.4";
-       revision = "1";
-       sha256 = "0cg312hlfylablw4h840xhm72cs70xk9rla4wrmzpqm45g91fhyq";
-       editedCabalFile = "e099e3cdd06f5ab832bfc920265cd97304f92c2e89126306f7e1d9bff98cbe86";
-       buildDepends = [ base constraints ];
+       version = "0.0.4.1";
+       revision = "2";
+       sha256 = "15yl8mqwahbrwl0hmz6lb4k7i48qgnxhav7xalj4q541ghd7cnwp";
+       editedCabalFile = "0bce1ff7388433830c7824530bb9c4fe3f4545bad44683dec2a5780028d870af";
+       buildDepends = [ base constraints HList ];
        testDepends = [ base hspec QuickCheck quickcheck-instances ];
        description = "Tools for working with functions of undetermined arity";
        license = stdenv.lib.licenses.bsd3;
@@ -99957,8 +100353,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgrest";
-       version = "0.2.9.1";
-       sha256 = "0rgvqhhpg6q99q1bdbk3dhnlad8nfrl3xihcg3c0j55dlx3q1860";
+       version = "0.2.10.0";
+       sha256 = "0s1nmdpdjylqb6lmb9ijh83pfjyf8j6dkagl3rzl4dxc97w6fbpy";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -104204,6 +104600,7 @@ self: {
          attoparsec base base-prelude template-haskell text transformers
        ];
        testDepends = [ base base-prelude directory doctest filepath ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/record";
        description = "First class records implemented with quasi-quotation";
        license = stdenv.lib.licenses.mit;
@@ -104284,8 +104681,8 @@ self: {
     ({ mkDerivation, base, comonad, free, transformers }:
      mkDerivation {
        pname = "recursion-schemes";
-       version = "4.1.1";
-       sha256 = "00izjknk7g2546p35hrha413nji6013wfbjic8jgmlzzjlr1cjwl";
+       version = "4.1.2";
+       sha256 = "1z64r20qgf7n5c2529cpwhklb3nkmw01p2llq903dqkplmbi7z9n";
        buildDepends = [ base comonad free transformers ];
        homepage = "http://github.com/ekmett/recursion-schemes/";
        description = "Generalized bananas, lenses and barbed wire";
@@ -109675,8 +110072,8 @@ self: {
      }:
      mkDerivation {
        pname = "sdr";
-       version = "0.1.0.2";
-       sha256 = "17i16f9pgd8a2l9ywl516zh29mmk5z08j964blajl46wr38g320j";
+       version = "0.1.0.3";
+       sha256 = "1whw45vnns0f5iw9vlmfxw90y3l0gp0q5yar6p6dp1dn57gyrdkc";
        buildDepends = [
          array base bytestring cairo cereal Chart Chart-cairo colour
          containers Decimal dynamic-graph either fftwRaw GLFW-b OpenGL
@@ -109890,8 +110287,8 @@ self: {
     ({ mkDerivation, base, byteable, bytestring, ghc-prim, memory }:
      mkDerivation {
        pname = "securemem";
-       version = "0.1.8";
-       sha256 = "14q5p464vks942k4q5dl4gyi9asg3d8rl8kd84qgbrvvr3ymhxb2";
+       version = "0.1.9";
+       sha256 = "0dkhhjxa7njc3qbgvd5a23rkvr39vj2kn2a9nk6yjg7a8b2hvdpy";
        buildDepends = [ base byteable bytestring ghc-prim memory ];
        homepage = "http://github.com/vincenthz/hs-securemem";
        description = "abstraction to an auto scrubbing and const time eq, memory chunk";
@@ -110051,15 +110448,14 @@ self: {
      }:
      mkDerivation {
        pname = "semigroupoids";
-       version = "5.0.0.1";
-       revision = "1";
-       sha256 = "0njand5df3ri7pr0jd12z7dfvcfw6xdm7z5ap0b4xcpy47ndcw8l";
-       editedCabalFile = "30bb2d94a228945d3d719a7004d79c218479dbdf31f1e92f730378af57fd6575";
+       version = "5.0.0.2";
+       sha256 = "14q7284gq44h86j6jxi7pz1hxwfal0jgv6i2j1v2hdzqfnd8z5sw";
        buildDepends = [
          base base-orphans bifunctors comonad containers contravariant
          distributive semigroups tagged transformers transformers-compat
        ];
        testDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/semigroupoids";
        description = "Semigroupoids: Category sans id";
        license = stdenv.lib.licenses.bsd3;
@@ -110526,6 +110922,7 @@ self: {
          filepath hspec parsec QuickCheck quickcheck-instances
          string-conversions text url
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs";
        license = stdenv.lib.licenses.bsd3;
@@ -110598,8 +110995,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-ede";
-       version = "0.4";
-       sha256 = "0h1kvgp0hzn5zmvc5gys3n3w20gmjmsgdw4lmpk7qwg16x2kriwd";
+       version = "0.4.0.1";
+       sha256 = "1yxqjd6dk5bhh6qwjshm1fcizsm1vd5nk8sdbfdasgsfw6ynlgfp";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -110783,18 +111180,16 @@ self: {
 
   "ses-html" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-html, byteable
-     , bytestring, cryptohash, HsOpenSSL, http-streams, old-locale
-     , tagsoup, time
+     , bytestring, cryptohash, HsOpenSSL, http-streams, tagsoup, time
      }:
      mkDerivation {
        pname = "ses-html";
-       version = "0.2.0.2";
-       sha256 = "0dfrhsn6scwid7ycnq4j21nkq64s59hkc05ygcg4qsf7vcizgs0d";
+       version = "0.2.1.2";
+       sha256 = "0ndw2w8b8zkwsa3qgwr27k2qvv9zrcd6zb1ygf54wzw79v2zpg5f";
        buildDepends = [
          base base64-bytestring blaze-html byteable bytestring cryptohash
-         HsOpenSSL http-streams old-locale tagsoup time
+         HsOpenSSL http-streams tagsoup time
        ];
-       jailbreak = true;
        description = "Send HTML formatted emails using Amazon's SES REST API with blaze";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113426,14 +113821,14 @@ self: {
      , clientsession, comonad, configurator, containers, directory
      , directory-tree, dlist, errors, filepath, hashable, heist, lens
      , logict, MonadCatchIO-transformers, mtl, mwc-random, old-time
-     , pwstore-fast, regex-posix, snap-core, snap-server, stm, syb
+     , pwstore-fast, regex-posix, snap-core, snap-server, stm
      , template-haskell, text, time, transformers, unordered-containers
      , vector, vector-algorithms, xmlhtml
      }:
      mkDerivation {
        pname = "snap";
-       version = "0.14.0.4";
-       sha256 = "0z0w6dig658cbl6adwq738dr9z56a3sj8lfhh5zfnmmy7x1794xs";
+       version = "0.14.0.5";
+       sha256 = "0wifww6mry2lxj572j9gwjxpjz4z7z9hd9jzhfyfwv2c67b39iyr";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -113441,8 +113836,8 @@ self: {
          configurator containers directory directory-tree dlist errors
          filepath hashable heist lens logict MonadCatchIO-transformers mtl
          mwc-random old-time pwstore-fast regex-posix snap-core snap-server
-         stm syb template-haskell text time transformers
-         unordered-containers vector vector-algorithms xmlhtml
+         stm template-haskell text time transformers unordered-containers
+         vector vector-algorithms xmlhtml
        ];
        jailbreak = true;
        homepage = "http://snapframework.com/";
@@ -117990,8 +118385,8 @@ self: {
     ({ mkDerivation, base, bytestring, text, utf8-string }:
      mkDerivation {
        pname = "string-conversions";
-       version = "0.3.0.3";
-       sha256 = "0n2ifim9n5vm305r989lh5xlbd8qc6byip2nfavf6gd2bcscs84p";
+       version = "0.4";
+       sha256 = "1bi4mjnz0srb01n0k73asizp5h2ir7j3whxai9wprqvz7kdscr0s";
        buildDepends = [ base bytestring text utf8-string ];
        description = "Simplifies dealing with different types for strings";
        license = stdenv.lib.licenses.bsd3;
@@ -118358,8 +118753,8 @@ self: {
      }:
      mkDerivation {
        pname = "stylish-haskell";
-       version = "0.5.13.0";
-       sha256 = "1284x4g6k24v3k2ii5jfyly6b788477qih3lq81x72x22d36d168";
+       version = "0.5.14.0";
+       sha256 = "1z8fya123cldakf15fc4p9vp0gp9gxql4x7faz12gfp9d6ffj4f5";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -125350,6 +125745,7 @@ self: {
          system-filepath temporary text time transformers unix
        ];
        testDepends = [ base doctest ];
+       jailbreak = true;
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131577,8 +131973,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, stm, text }:
      mkDerivation {
        pname = "web-plugins";
-       version = "0.2.7";
-       sha256 = "0pvwhr5mr960lramlnz7sffxrr7mxqskqk5pqbspck7cabzwzsxd";
+       version = "0.2.8";
+       sha256 = "00w0v0q2i0jxwlav1qb967nf35bxbr6vwacs5mqficzg2d4pz969";
        buildDepends = [ base containers mtl stm text ];
        homepage = "http://www.happstack.com/";
        description = "dynamic plugin system for web applications";
@@ -131741,6 +132137,7 @@ self: {
          base bytestring primitive text types-compat unordered-containers
        ];
        testDepends = [ base doctest ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/web-routing";
        description = "simple routing library";
        license = stdenv.lib.licenses.mit;
@@ -133046,6 +133443,7 @@ self: {
        sha256 = "1nv8mkfbgfnlmni0rzlzq7ir27ya3lnhkksfbkywjkbwz2k3yykc";
        buildDepends = [ base bytestring connection network websockets ];
        testDepends = [ base doctest ];
+       jailbreak = true;
        homepage = "http://taylor.fausak.me/wuss/";
        description = "Secure WebSocket (WSS) clients";
        license = stdenv.lib.licenses.mit;
@@ -133424,8 +133822,8 @@ self: {
      }:
      mkDerivation {
        pname = "xcffib";
-       version = "0.3.0";
-       sha256 = "1ih7wnsy38p7s14fnyg3pnm3hyp3nd6fprl2m66l09cj7ibvnxyc";
+       version = "0.3.2";
+       sha256 = "0njsflaxz2l01vbwndsmqmq37i6nl4cfczy776jdpnv7043b1ynv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -133886,6 +134284,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xml-conduit-parse" = callPackage
+    ({ mkDerivation, base, conduit, conduit-parse, containers
+     , data-default, exceptions, hlint, parsers, resourcet, tasty
+     , tasty-hunit, text, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "xml-conduit-parse";
+       version = "0.1.0.0";
+       sha256 = "1vf8yxnfw3mr7sphj69y2yds6k5bj9cycflk6dzbx367j1cihc0v";
+       buildDepends = [
+         base conduit conduit-parse containers exceptions parsers text
+         xml-conduit xml-types
+       ];
+       testDepends = [
+         base conduit conduit-parse data-default hlint parsers resourcet
+         tasty tasty-hunit
+       ];
+       homepage = "https://github.com/k0ral/xml-conduit-parse";
+       description = "Streaming XML parser based on conduits";
+       license = "unknown";
+     }) {};
+
   "xml-conduit-writer" = callPackage
     ({ mkDerivation, base, containers, dlist, mtl, text, xml-conduit
      , xml-types
@@ -135774,8 +136194,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-core";
-       version = "1.4.9.1";
-       sha256 = "1fqla2cahqr51jgr0l8pl2wq4rai2dq6yky75qjg5a4xrxcdq6sc";
+       version = "1.4.10";
+       sha256 = "0wkicd71r87rnfiyx3264a1836mv8asnq2rvmp23qkjdp453ac7w";
        buildDepends = [
          aeson auto-update base blaze-builder blaze-html blaze-markup
          bytestring case-insensitive cereal clientsession conduit
@@ -135859,23 +136279,22 @@ self: {
      }) {};
 
   "yesod-dsl" = callPackage
-    ({ mkDerivation, alex, array, base, Cabal, containers, directory
-     , filepath, happy, MissingH, mtl, shakespeare, shakespeare-text
-     , strict, syb, text, transformers, uniplate
+    ({ mkDerivation, aeson, aeson-pretty, alex, array, base, bytestring
+     , Cabal, containers, directory, filepath, happy, MissingH, mtl
+     , shakespeare, strict, syb, text, transformers, uniplate, vector
      }:
      mkDerivation {
        pname = "yesod-dsl";
-       version = "0.1.1.23";
-       sha256 = "01rafa5klq1qjrl5w7ii4h27kiqhnacn95x7f2f7b1gxxp26psrx";
+       version = "0.1.1.24";
+       sha256 = "0pr5z3kg27j4fgyzs7ac263wd0qxfa3m45b6fn9hg18lwjb0fgd7";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         array base Cabal containers directory filepath MissingH mtl
-         shakespeare shakespeare-text strict syb text transformers uniplate
+         aeson aeson-pretty array base bytestring Cabal containers directory
+         filepath MissingH mtl shakespeare strict syb text transformers
+         uniplate vector
        ];
        buildTools = [ alex happy ];
-       jailbreak = true;
-       homepage = "https://github.com/tlaitinen/yesod-dsl";
        description = "DSL for generating Yesod subsite to manage an RDBMS;";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137194,8 +137613,8 @@ self: {
      }:
      mkDerivation {
        pname = "yst";
-       version = "0.5.0.2";
-       sha256 = "0spia0dma6ppqyns2g9ywd3pci87xzi1zkg03nxzbh8mxayq7js3";
+       version = "0.5.0.3";
+       sha256 = "15r381vsffqyzvgksipik0y9f41sy8ylsmvzw7hih4nrzp0w32ch";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -137203,7 +137622,6 @@ self: {
          HStringTemplate lucid old-locale old-time pandoc parsec scientific
          split text time unordered-containers yaml
        ];
-       jailbreak = true;
        homepage = "http://github.com/jgm/yst";
        description = "Builds a static website from templates and data in YAML or CSV files";
        license = "GPL";

From 6130aa2a4dccd68c18b02f690d775dc66d41a4a3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Jun 2015 15:41:09 +0200
Subject: [PATCH 0754/2322] haskell-cipher-aes: test suite has been fixed
 upstream

---
 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 9a4979cd58d..b16b95558df 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -827,9 +827,6 @@ self: super: {
   # FPCO's fork of Cabal won't succeed its test suite.
   Cabal-ide-backend = dontCheck super.Cabal-ide-backend;
 
-  # https://github.com/vincenthz/hs-cipher-aes/issues/35
-  cipher-aes = dontCheck super.cipher-aes;
-
   # https://github.com/DanielG/cabal-helper/issues/2
   cabal-helper = overrideCabal super.cabal-helper (drv: { preCheck = "export HOME=$TMPDIR"; });
 

From 697a80c004f65c7694c4cae33dd9f27513654dd8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Jun 2015 16:12:21 +0200
Subject: [PATCH 0755/2322] haskell-influxdb: build has been fixed upstream

---
 pkgs/development/haskell-modules/configuration-common.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b16b95558df..ca1ea03f903 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -402,6 +402,7 @@ self: super: {
   http-client-openssl = dontCheck super.http-client-openssl;
   http-client-tls = dontCheck super.http-client-tls;
   ihaskell = dontCheck super.ihaskell;
+  influxdb = dontCheck super.influxdb;
   itanium-abi = dontCheck super.itanium-abi;
   katt = dontCheck super.katt;
   language-slice = dontCheck super.language-slice;
@@ -833,8 +834,4 @@ self: super: {
   # https://github.com/jgm/gitit/issues/494
   gitit = markBroken super.gitit;
 
-  # https://github.com/maoe/influxdb-haskell/issues/26
-  influxdb = markBroken (dontCheck super.influxdb);
-  snaplet-influxdb = dontDistribute super.snaplet-influxdb;
-
 }

From dbf55842e89c35dcef7130705bcdc7001eba4960 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Jun 2015 16:13:09 +0200
Subject: [PATCH 0756/2322] haskell-comonad: disable test suite to work avoid
 doctest failure

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ca1ea03f903..5373a507ffb 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -834,4 +834,7 @@ self: super: {
   # https://github.com/jgm/gitit/issues/494
   gitit = markBroken super.gitit;
 
+  # https://github.com/ekmett/comonad/issues/25
+  comonad = dontCheck super.comonad;
+
 }

From a982892116d0a02cbaea595b006a6341e8b7d80a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Jun 2015 13:18:06 +0200
Subject: [PATCH 0757/2322] Fix evaluation errors on Hydra.

---
 pkgs/development/haskell-modules/configuration-common.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5373a507ffb..51aab68907a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -780,11 +780,12 @@ self: super: {
   # https://github.com/goldfirere/singletons/issues/116
   # https://github.com/goldfirere/singletons/issues/117
   # https://github.com/goldfirere/singletons/issues/118
-  singletons = markBroken super.singletons;
-  singleton-nats = dontDistribute super.singleton-nats;
+  clash-lib = dontDistribute super.clash-lib;
+  clash-verilog = dontDistribute super.clash-verilog;
   hgeometry = dontDistribute super.hgeometry;
   hipe = dontDistribute super.hipe;
-  clash-lib = dontDistribute super.clash-lib;
+  singleton-nats = dontDistribute super.singleton-nats;
+  singletons = markBroken super.singletons;
 
   # https://github.com/anton-k/temporal-music-notation/issues/1
   temporal-music-notation = markBroken super.temporal-music-notation;

From e0f7ab678acbaafe52640068df01804a5cfc2556 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Jun 2015 13:20:44 +0200
Subject: [PATCH 0758/2322] ghc-events: fix build of latest version with
 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 9327af856e8..2e95c78c625 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -131,4 +131,7 @@ self: super: {
     patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; }
   );
 
+  # Overriding mtl 2.2.x is fine here because ghc-events is an stand-alone executable.
+  ghc-events = super.ghc-events.override { mtl = self.mtl_2_2_1; };
+
 }

From 2db9a8289d6dc34cdb335b1acacd126bce42c88b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Jun 2015 13:25:00 +0200
Subject: [PATCH 0759/2322] haskell-semigroupoids: disable doctests suite to
 avoid version conflict with doctest 0.10.x

---
 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 51aab68907a..ade2055187d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -838,4 +838,7 @@ self: super: {
   # https://github.com/ekmett/comonad/issues/25
   comonad = dontCheck super.comonad;
 
+  # https://github.com/ekmett/semigroupoids/issues/35
+  semigroupoids = disableCabalFlag super.semigroupoids "doctests";
+
 }

From f5c5e4af74346687a2a5e7cd409056daac2af565 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 4 Jun 2015 14:51:51 +0200
Subject: [PATCH 0760/2322] perl-packages: IOSocketSSL -> 2.016

Many, many fixes. Too many to list here. See:
<https://github.com/noxxi/p5-io-socket-ssl/blob/master/Changes>
---
 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 891d72497b5..c166457add2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4761,10 +4761,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   IOSocketSSL = buildPerlPackage {
-    name = "IO-Socket-SSL-1.981";
+    name = "IO-Socket-SSL-2.016";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-1.981.tar.gz;
-      sha256 = "d78f3aac72888a350962c2da87b2b459513a175d7ac641cb1482bacbb81e76eb";
+      url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.016.tar.gz;
+      sha256 = "0hgyggdbw16nm85fds48m79lxy5318panqhpkh7r192jq6rnhqlk";
     };
     propagatedBuildInputs = [ URI NetSSLeay ];
     meta = {

From 5cb1af03ef698c2a8f70ec0ad63171dabd6a0414 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 4 Jun 2015 18:16:10 +0200
Subject: [PATCH 0761/2322] libkeyfinder -> 0.11 (final)

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

diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix
index 6ab80d55a45..f0e75b34059 100644
--- a/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/pkgs/development/libraries/libkeyfinder/default.nix
@@ -1,17 +1,18 @@
 { stdenv, fetchFromGitHub, boost, fftw, qt5 }:
 
-stdenv.mkDerivation rec {
-  version = "0.11.0-20141105";
+let version = "0.11"; in
+stdenv.mkDerivation {
   name = "libkeyfinder-${version}";
 
   src = fetchFromGitHub {
+    sha256 = "0674gykdi1nffvba5rv6fsp0zw02w1gkpn9grh8w983xf13ykbz9";
+    rev = "v${version}";
     repo = "libKeyFinder";
     owner = "ibsh";
-    rev = "592ef1f3d3ada489f80814d5ccfbc8de6029dc9d";
-    sha256 = "0xcqpizwbn6wik3w7h9k1lvgrp3r3w6yyy55flvnwwwgvkry48as";
   };
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Musical key detection for digital audio (C++ library)";
     homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
     license = licenses.gpl3Plus;

From 921249e13da448aedcec7d5f7698d22752c10284 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 4 Jun 2015 18:16:26 +0200
Subject: [PATCH 0762/2322] keyfinder -> 1.26

---
 pkgs/applications/audio/keyfinder/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix
index bea869ea318..d3438e1ada4 100644
--- a/pkgs/applications/audio/keyfinder/default.nix
+++ b/pkgs/applications/audio/keyfinder/default.nix
@@ -1,17 +1,18 @@
 { stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qt5, taglib }:
 
-stdenv.mkDerivation rec {
-  version = "1.25-17-gf670607";
+let version = "1.26"; in
+stdenv.mkDerivation {
   name = "keyfinder-${version}";
 
   src = fetchFromGitHub {
+    sha256 = "1sfnywc6jdpm03344i6i4pz13mqa4i5agagj4k6252m63cqmjkrc";
+    rev = version;
     repo = "is_KeyFinder";
     owner = "ibsh";
-    rev = "f6706074435ac14c5238ee3f0dd22ac22d72af9c";
-    sha256 = "1sfnywc6jdpm03344i6i4pz13mqa4i5agagj4k6252m63cqmjkrc";
   };
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Musical key detection for digital audio (graphical UI)";
     longDescription = ''
       KeyFinder is an open source key detection tool, for DJs interested in

From fcee71066b61fe5384caaa172ebdcf02d0cffedb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 4 Jun 2015 18:28:30 +0200
Subject: [PATCH 0763/2322] rsstail -> 1.9.1

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

diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index ee9d1dbbf8d..2d4b9741375 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, cppcheck, libmrss }:
 
-let version = "1.9"; in
+let version = "1.9.1"; in
 stdenv.mkDerivation rec {
   name = "rsstail-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0igkkhwzhi2cxbfirmq5xgaidnv0gdhmh2w7052xqpyvzg069faf";
-    rev = "aab4fbcc5cdf82e439ea6abe562e9b648fc1a6ef";
+    sha256 = "0jhf7vr7y56r751wy4ix80iwhgxhk6mbbin8gnx59i457gf6sjl1";
+    rev = "1220d63aaa233961636f859d9a406536fffb64f4";
     repo = "rsstail";
     owner = "flok99";
   };

From 3ede0a64a2a1997e0eb327885d29db1760ad5ecc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jun 2015 19:47:34 +0200
Subject: [PATCH 0764/2322] make: Don't segfault if we can't get a tty name

This happened in VM builds:

  make flags: SHELL=/nix/store/dbxpkswwc7rh6g1iy6dwqklzw39hihb1-bash-4.3-p33/bin/bash
  /nix/store/jm26xg0h3jcrg4bbrwiqx3jpirscdk0p-stdenv/setup: line 658:  5957 Segmentation fault      make ${makefile:+-f $makefile} ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} $makeFlags "${makeFlagsArray[@]}" $buildFlags "${buildFlagsArray[@]}"
---
 .../build-managers/gnumake/4.1/default.nix    |  3 ++
 .../gnumake/4.1/no-tty-name.patch             | 53 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch

diff --git a/pkgs/development/tools/build-managers/gnumake/4.1/default.nix b/pkgs/development/tools/build-managers/gnumake/4.1/default.nix
index 600f6f5759d..9ac20107018 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.1/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/4.1/default.nix
@@ -17,6 +17,9 @@ stdenv.mkDerivation {
     # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for
     # included Makefiles, don't look in /usr/include and friends.
     ./impure-dirs.patch
+
+    # Don't segfault if we can't get a tty name.
+    ./no-tty-name.patch
   ];
 
   meta = {
diff --git a/pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch b/pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch
new file mode 100644
index 00000000000..a84d7ab49d0
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnumake/4.1/no-tty-name.patch
@@ -0,0 +1,53 @@
+From 292da6f6867b75a5af7ddbb639a1feae022f438f Mon Sep 17 00:00:00 2001
+From: Paul Smith <psmith@gnu.org>
+Date: Mon, 20 Oct 2014 05:54:56 +0000
+Subject: * main.c (main): [SV 43434] Handle NULL returns from ttyname().
+
+---
+diff --git main.c main.c
+index b2d169c..0cdb8a8 100644
+--- main.c
++++ main.c
+@@ -1429,13 +1429,18 @@ main (int argc, char **argv, char **envp)
+ #ifdef HAVE_ISATTY
+     if (isatty (fileno (stdout)))
+       if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMOUT")))
+-        define_variable_cname ("MAKE_TERMOUT", TTYNAME (fileno (stdout)),
+-                               o_default, 0)->export = v_export;
+-
++        {
++          const char *tty = TTYNAME (fileno (stdout));
++          define_variable_cname ("MAKE_TERMOUT", tty ? tty : DEFAULT_TTYNAME,
++                                 o_default, 0)->export = v_export;
++        }
+     if (isatty (fileno (stderr)))
+       if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMERR")))
+-        define_variable_cname ("MAKE_TERMERR", TTYNAME (fileno (stderr)),
+-                               o_default, 0)->export = v_export;
++        {
++          const char *tty = TTYNAME (fileno (stderr));
++          define_variable_cname ("MAKE_TERMERR", tty ? tty : DEFAULT_TTYNAME,
++                                 o_default, 0)->export = v_export;
++        }
+ #endif
+ 
+   /* Reset in case the switches changed our minds.  */
+diff --git makeint.h makeint.h
+index 6223936..2009f41 100644
+--- makeint.h
++++ makeint.h
+@@ -436,10 +436,11 @@ extern struct rlimit stack_limit;
+ /* The number of bytes needed to represent the largest integer as a string.  */
+ #define INTSTR_LENGTH         CSTRLEN ("18446744073709551616")
+ 
++#define DEFAULT_TTYNAME "true"
+ #ifdef HAVE_TTYNAME
+ # define TTYNAME(_f) ttyname (_f)
+ #else
+-# define TTYNAME(_f) "true"
++# define TTYNAME(_f) DEFAULT_TTYNAME
+ #endif
+ 
+ 
+--
+cgit v0.9.0.2

From f1587a2d1ecfebdf9a8b20c2408adfec8806f879 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Jun 2015 19:59:46 +0200
Subject: [PATCH 0765/2322] Move numpy-scipy-support.nix file from the
 top-level to development/python-modules.

The top-level is not supposed to contain sub-directories, IMHO.
---
 .../python-modules}/numpy-scipy-support.nix                   | 0
 pkgs/top-level/python-packages.nix                            | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{top-level/python-support => development/python-modules}/numpy-scipy-support.nix (100%)

diff --git a/pkgs/top-level/python-support/numpy-scipy-support.nix b/pkgs/development/python-modules/numpy-scipy-support.nix
similarity index 100%
rename from pkgs/top-level/python-support/numpy-scipy-support.nix
rename to pkgs/development/python-modules/numpy-scipy-support.nix
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 38fda4ad406..fa01d1ef488 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7796,7 +7796,7 @@ let
   };
 
   numpy = let
-    support = import ./python-support/numpy-scipy-support.nix {
+    support = import ../development/python-modules/numpy-scipy-support.nix {
       inherit python;
       atlas = pkgs.atlasWithLapack;
       pkgName = "numpy";
@@ -11258,7 +11258,7 @@ let
 
 
   scipy = let
-    support = import ./python-support/numpy-scipy-support.nix {
+    support = import ../development/python-modules/numpy-scipy-support.nix {
       inherit python;
       atlas = pkgs.atlasWithLapack;
       pkgName = "numpy";

From 8bf170f280436cfdfda5ead492cf9ab5e04b4637 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Tue, 2 Jun 2015 10:58:17 -0500
Subject: [PATCH 0766/2322] Remove lingering dependence on atlas with numpy.

Closes https://github.com/NixOS/nixpkgs/pull/8133.
---
 pkgs/development/python-modules/numpy-scipy-support.nix | 5 ++++-
 pkgs/top-level/python-packages.nix                      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/numpy-scipy-support.nix b/pkgs/development/python-modules/numpy-scipy-support.nix
index 6cca704dcda..22be22633c2 100644
--- a/pkgs/development/python-modules/numpy-scipy-support.nix
+++ b/pkgs/development/python-modules/numpy-scipy-support.nix
@@ -8,6 +8,9 @@
 }:
 
 {
+  # Re-export atlas here so that it can be sure that the same one will be used
+  # in the propagatedBuildInputs.
+  inherit atlas;
 
   # First "install" the package, then import what was installed, and call the
   # .test() function, which will run the test suite.
@@ -40,7 +43,7 @@
     runHook postCheck
   '';
 
-  # Creates a site.cfg telling the setup script where to find depended-on 
+  # Creates a site.cfg telling the setup script where to find depended-on
   # math libraries.
   preBuild = ''
     echo "Creating site.cfg file..."
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fa01d1ef488..a5ad7e46f4f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7821,7 +7821,7 @@ let
     setupPyBuildFlags = ["--fcompiler='gnu95'"];
 
     buildInputs = [ pkgs.gfortran self.nose ];
-    propagatedBuildInputs = [ pkgs.atlas ];
+    propagatedBuildInputs = [ support.atlas ];
 
     meta = {
       description = "Scientific tools for Python";

From 99d2e80d973b7ab1c04754e1f270d4786c46f2a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jun 2015 20:08:24 +0200
Subject: [PATCH 0767/2322] In VM builds, connect stdin to /dev/null

This prevents programs from hanging while trying to read from stdin.
---
 pkgs/build-support/vm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index a9f9f0d184c..53a01365435 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -187,6 +187,7 @@ rec {
     # then don't start the build again, but instead drop the user into
     # an interactive shell.
     if test -n "$origBuilder" -a ! -e /.debug; then
+      exec < /dev/null
       ${coreutils}/bin/touch /.debug
       $origBuilder $origArgs
       echo $? > /tmp/xchg/in-vm-exit

From 860589227b17805902779c85e9879d00351e2412 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 4 Jun 2015 19:29:41 +0200
Subject: [PATCH 0768/2322] eid-mw: don't install useless about-eid-mw.desktop

---
 pkgs/tools/security/eid-mw/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index ef15967330d..1833d460081 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -22,6 +22,9 @@ stdenv.mkDerivation rec {
     install -D ${./eid-nssdb.in} $out/bin/eid-nssdb
     substituteInPlace $out/bin/eid-nssdb \
       --replace "modutil" "${nssTools}/bin/modutil"
+
+    # Only provides a useless "about-eid-mw.desktop" that doesn't even work:
+    rm -rf $out/share/applications
   '';
 
   meta = with stdenv.lib; {

From daf4ec39a5613d277706f0f559e074a06df2a23c Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Thu, 4 Jun 2015 20:22:36 +0300
Subject: [PATCH 0769/2322] fix: add missing versions

---
 pkgs/applications/audio/dirt/default.nix                      | 2 +-
 pkgs/applications/audio/pd-plugins/puremapping/default.nix    | 2 +-
 pkgs/applications/misc/cortex/default.nix                     | 2 +-
 .../misc/rxvt_unicode-plugins/urxvt-perls/default.nix         | 2 +-
 .../misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix      | 2 +-
 .../networking/instant-messengers/telegram-cli/default.nix    | 2 +-
 pkgs/applications/networking/p2p/opentracker/default.nix      | 4 ++--
 pkgs/development/interpreters/ruby/bundler-head.nix           | 2 +-
 pkgs/development/libraries/cppzmq/default.nix                 | 2 +-
 pkgs/development/libraries/nvidia-texture-tools/default.nix   | 2 +-
 pkgs/development/libraries/xcb-util-cursor/HEAD.nix           | 2 +-
 pkgs/development/ocaml-modules/optcomp/default.nix            | 2 +-
 pkgs/development/tools/misc/bossa/default.nix                 | 2 +-
 pkgs/games/thePenguinMachine/default.nix                      | 2 ++
 pkgs/misc/drivers/xwiimote/default.nix                        | 4 ++--
 pkgs/misc/screensavers/xss-lock/default.nix                   | 2 +-
 pkgs/os-specific/linux/android-udev-rules/default.nix         | 2 +-
 pkgs/os-specific/linux/disk-indicator/default.nix             | 2 +-
 pkgs/os-specific/linux/lightum/default.nix                    | 2 +-
 pkgs/os-specific/linux/seturgent/default.nix                  | 4 ++--
 pkgs/servers/sql/monetdb/default.nix                          | 2 +-
 pkgs/tools/audio/gvolicon/default.nix                         | 2 +-
 pkgs/tools/audio/pa-applet/default.nix                        | 2 +-
 pkgs/tools/audio/pnmixer/default.nix                          | 2 +-
 pkgs/tools/misc/vfdecrypt/default.nix                         | 3 ++-
 pkgs/tools/misc/xflux/default.nix                             | 2 +-
 pkgs/tools/networking/curl-unix-socket/default.nix            | 2 +-
 pkgs/tools/networking/openvpn/update-resolv-conf.nix          | 2 +-
 pkgs/tools/networking/p2p/libtorrent/git.nix                  | 4 ++--
 pkgs/tools/networking/p2p/rtorrent/git.nix                    | 4 ++--
 pkgs/tools/security/fprint_demo/default.nix                   | 2 +-
 31 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix
index b5436fde7e9..1db4515ae23 100644
--- a/pkgs/applications/audio/dirt/default.nix
+++ b/pkgs/applications/audio/dirt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, jack2 }:
 
 stdenv.mkDerivation rec {
-  name = "dirt-git";
+  name = "dirt-2015-04-28";
   src = fetchFromGitHub {
     repo = "Dirt";
     owner = "tidalcycles";
diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix
index fc7fc5ee3d0..2e9a37a2f0d 100644
--- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix
+++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip, puredata }:
 
 stdenv.mkDerivation rec {
-  name = "puremapping";
+  name = "puremapping-1.01";
 
   src = fetchurl {
     url = "http://www.chnry.net/ch/IMG/zip/puremapping-libdir-generic.zip";
diff --git a/pkgs/applications/misc/cortex/default.nix b/pkgs/applications/misc/cortex/default.nix
index 79d19f45a25..2aad3b20e22 100644
--- a/pkgs/applications/misc/cortex/default.nix
+++ b/pkgs/applications/misc/cortex/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, python3 }:
 
 stdenv.mkDerivation {
-  name = "cortex";
+  name = "cortex-2014-08-01";
 
   src = fetchgit {
     url = "https://github.com/gglucas/cortex";
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
index 3c5caeda789..6a1acca48d9 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation {
-  name = "urxvt-perls";
+  name = "urxvt-perls-2015-03-28";
 
   src = fetchgit {
     url = "git://github.com/muennich/urxvt-perls";
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
index ba68a46cf0c..e924c3127ab 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation {
-  name = "urxvt-tabbedex";
+  name = "urxvt-tabbedex-2015-03-03";
 
   src = fetchgit {
     url = "https://github.com/mina86/urxvt-tabbedex";
diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
index 812f00829e2..a68e0ee1104 100644
--- a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "telegram-cli";
+  name = "telegram-cli-2014-03-04";
 
   src = fetchgit {
     url = "https://github.com/vysheng/tg.git";
diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix
index 32ceeb6fc8d..29dbd086a77 100644
--- a/pkgs/applications/networking/p2p/opentracker/default.nix
+++ b/pkgs/applications/networking/p2p/opentracker/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, libowfat, zlib }:
 
 stdenv.mkDerivation {
-  name = "opentracker";
+  name = "opentracker-2014-08-03";
   src = fetchgit {
     url = "https://github.com/masroore/opentracker.git";
     rev = "9a26b3d203755577879315ecc2b515d0e22793cb";
@@ -21,4 +21,4 @@ stdenv.mkDerivation {
     platforms = platforms.linux;
     description = "Bittorrent tracker project aiminf for minimal resource usage and is intended to run at your wlan router";
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix
index 3e10a1e4b54..6edc01041f2 100644
--- a/pkgs/development/interpreters/ruby/bundler-head.nix
+++ b/pkgs/development/interpreters/ruby/bundler-head.nix
@@ -1,7 +1,7 @@
 { buildRubyGem, coreutils, fetchgit }:
 
 buildRubyGem {
-  name = "bundler-HEAD";
+  name = "bundler-2015-01-11";
   src = fetchgit {
     url = "https://github.com/bundler/bundler.git";
     rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157";
diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index 510af3df824..481c80994e8 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "cppzmq";
+  name = "cppzmq-2015-03-05";
 
   src = fetchgit {
     url = "git://github.com/zeromq/cppzmq";
diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix
index 78932259841..754ab4233e5 100644
--- a/pkgs/development/libraries/nvidia-texture-tools/default.nix
+++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix
@@ -5,7 +5,7 @@
 stdenv.mkDerivation rec {
   # No support yet for cg, cuda, glew, glut, openexr.
 
-  name = "nvidia-texture-tools";
+  name = "nvidia-texture-tools-1388";
 
   src = fetchsvn {
     url = "http://nvidia-texture-tools.googlecode.com/svn/trunk";
diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
index 9ca3474ce3b..e503ade3ebc 100644
--- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
+++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
@@ -2,7 +2,7 @@
 , git, xlibs, gnum4, libxcb, gperf }:
 
 stdenv.mkDerivation rec {
-  name = "xcb-util-cursor-HEAD";
+  name = "xcb-util-cursor-0.1.1-3-gf03cc27";
 
   src = fetchgit {
     url    = http://anongit.freedesktop.org/git/xcb/util-cursor.git;
diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix
index 4449766767c..b134a842c5c 100644
--- a/pkgs/development/ocaml-modules/optcomp/default.nix
+++ b/pkgs/development/ocaml-modules/optcomp/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, ocaml, findlib, camlp4}:
 
 stdenv.mkDerivation {
-  name = "ocaml-optcomp";
+  name = "ocaml-optcomp-1.6";
   src = fetchurl {
     url = https://github.com/diml/optcomp/archive/1.6.tar.gz;
     md5 = "d3587244dba1b8b10f24d0b60a8c700d";
diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix
index 71148755a75..8884021c3a3 100644
--- a/pkgs/development/tools/misc/bossa/default.nix
+++ b/pkgs/development/tools/misc/bossa/default.nix
@@ -14,7 +14,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "bossa";
+  name = "bossa-2014-08-18";
 
   src = fetchgit {
     url = https://github.com/shumatech/BOSSA;
diff --git a/pkgs/games/thePenguinMachine/default.nix b/pkgs/games/thePenguinMachine/default.nix
index e1a87f22538..479004a9af4 100644
--- a/pkgs/games/thePenguinMachine/default.nix
+++ b/pkgs/games/thePenguinMachine/default.nix
@@ -7,6 +7,8 @@ stdenv.mkDerivation {
 		sha256 = "09ljks8vj75g00h3azc83yllbfsrxwmv1c9g32gylcmsshik0dqv";
 	};
 
+  broken = true; # Not found
+
   buildInputs = [python pil pygame SDL];
 
   configurePhase = ''
diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix
index 75e071a05ef..9cf70db471c 100644
--- a/pkgs/misc/drivers/xwiimote/default.nix
+++ b/pkgs/misc/drivers/xwiimote/default.nix
@@ -1,9 +1,9 @@
 { stdenv, udev, ncurses, pkgconfig, fetchurl, bluez }:
 
 stdenv.mkDerivation rec {
-  name = "xwiimote";
+  name = "xwiimote-2";
   src = fetchurl {
-    url = "https://github.com/dvdhrm/xwiimote/releases/download/xwiimote-2/xwiimote-2.tar.xz";
+    url = "https://github.com/dvdhrm/xwiimote/releases/download/${name}/${name}.tar.xz";
     sha256 = "1g9cbhblll47l300zr999xr51x2g98y49l222f77fhswd12kjzhd";
   };
 
diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix
index a95f9ae8613..49dd8bebaed 100644
--- a/pkgs/misc/screensavers/xss-lock/default.nix
+++ b/pkgs/misc/screensavers/xss-lock/default.nix
@@ -2,7 +2,7 @@
 , libXau, libXdmcp, xcbutil }:
 
 stdenv.mkDerivation {
-  name = "xss-lock-git";
+  name = "xss-lock-git-2014-03-02";
 
   src = fetchgit {
     url = https://bitbucket.org/raymonad/xss-lock.git;
diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index b30e0f61b1b..7f0e345a2b0 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation {
-  name = "android-udev-rules";
+  name = "android-udev-rules-2015-02-28";
 
   src = fetchgit {
     url = "git://github.com/M0Rf30/android-udev-rules";
diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix
index 11c1e7ee8a2..406492db236 100644
--- a/pkgs/os-specific/linux/disk-indicator/default.nix
+++ b/pkgs/os-specific/linux/disk-indicator/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, libX11 }:
 
 stdenv.mkDerivation {
-  name = "disk-indicator";
+  name = "disk-indicator-2014-05-19";
 
   src = fetchgit {
     url = git://github.com/MeanEYE/Disk-Indicator.git;
diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix
index fea188f8949..62fbecf27d1 100644
--- a/pkgs/os-specific/linux/lightum/default.nix
+++ b/pkgs/os-specific/linux/lightum/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkgconfig, systemd }:
 
 stdenv.mkDerivation {
-  name = "lightum";
+  name = "lightum-2014-06-07";
   src = fetchgit {
     url = https://github.com/poliva/lightum;
     rev = "123e6babe0669b23d4c1dfa5511088608ff2baa8";
diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix
index ad77a7a1031..4491bb7bf93 100644
--- a/pkgs/os-specific/linux/seturgent/default.nix
+++ b/pkgs/os-specific/linux/seturgent/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libX11, xproto, xdotool, unzip }:
 
 stdenv.mkDerivation {
-  name = "seturgent";
+  name = "seturgent-2012-08-17";
 
   src = fetchurl {
     url = "https://github.com/hiltjo/seturgent/archive/ada70dcb15865391e5cdcab27a0739a304a17e03.zip";
@@ -24,4 +24,4 @@ stdenv.mkDerivation {
       homepage = https://github.com/hiltjo/seturgent;
       license = stdenv.lib.licenses.mit;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index ebc0cffb3aa..afd2222918e 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -4,7 +4,7 @@ let inherit (composableDerivation) edf; in
 
 composableDerivation.composableDerivation {} {
 
-  name = "monetdb-may-2009";
+  name = "monetdb-2009-05-01";
 
   src = fetchurl {
     url = http://monetdb.cwi.nl/downloads/sources/May2009-SP1/MonetDB-May2009-SuperBall-SP1.tar.bz2;
diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix
index d885a6ac902..c00efecc0b3 100644
--- a/pkgs/tools/audio/gvolicon/default.nix
+++ b/pkgs/tools/audio/gvolicon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg }:
 
 stdenv.mkDerivation {
-  name = "gvolicon";
+  name = "gvolicon-2014-04-28";
   src = fetchgit {
     url = "https://github.com/Unia/gvolicon";
     rev = "c04cafb88124e1e5edc61dd52f76bf13381d5167";
diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix
index d6dcba32233..b0dfda6bfc7 100644
--- a/pkgs/tools/audio/pa-applet/default.nix
+++ b/pkgs/tools/audio/pa-applet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, libpulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
 
 stdenv.mkDerivation rec {
-  name = "pa-applet";
+  name = "pa-applet-2012-04-11";
 
   src = fetchgit {
     url = "git://github.com/fernandotcl/pa-applet.git";
diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix
index d7964c0961c..f65a151905c 100644
--- a/pkgs/tools/audio/pnmixer/default.nix
+++ b/pkgs/tools/audio/pnmixer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, alsaLib, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "pnmixer";
+  name = "pnmixer-2014-07-24";
 
   src = fetchgit {
     url = "git://github.com/nicklan/pnmixer.git";
diff --git a/pkgs/tools/misc/vfdecrypt/default.nix b/pkgs/tools/misc/vfdecrypt/default.nix
index de7ee27d704..552fa0c763d 100644
--- a/pkgs/tools/misc/vfdecrypt/default.nix
+++ b/pkgs/tools/misc/vfdecrypt/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     rev = "4e2fa32816254907e82886b936afcae9859a876c";
     sha256 = "0b945805f7f60bf48556c2db45c9ab26485fb05acbc6160a563d529b20cb56a3";
   };
-  buildInputs = [openssl];
+  buildInputs = [ openssl ];
+  broken = true; # No such repo
   installPhase = ''
     mkdir -p $out/bin
     cp vfdecrypt $out/bin
diff --git a/pkgs/tools/misc/xflux/default.nix b/pkgs/tools/misc/xflux/default.nix
index 0032eb24c97..d0f35844695 100644
--- a/pkgs/tools/misc/xflux/default.nix
+++ b/pkgs/tools/misc/xflux/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, libXxf86vm, libXext, libX11, libXrandr, gcc}:
 stdenv.mkDerivation {
-  name = "xflux";
+  name = "xflux-2013-09-01";
   src = fetchurl {
     url = https://justgetflux.com/linux/xflux64.tgz;
     sha256 = "cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021";
diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix
index 88d75ba570e..4f0b68ce4be 100644
--- a/pkgs/tools/networking/curl-unix-socket/default.nix
+++ b/pkgs/tools/networking/curl-unix-socket/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, go }:
 
 stdenv.mkDerivation {
-  name = "curl-unix-socket";
+  name = "curl-unix-socket-2014-09-01";
 
   src = fetchFromGitHub {
     owner = "Soulou";
diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
index d6f67d065d9..de04c1419e2 100644
--- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix
+++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, makeWrapper, openresolv, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "update-resolv-conf";
+  name = "update-resolv-conf-2014-10-03";
 
   src = fetchgit {
     url = https://github.com/masterkorp/openvpn-update-resolv-conf/;
diff --git a/pkgs/tools/networking/p2p/libtorrent/git.nix b/pkgs/tools/networking/p2p/libtorrent/git.nix
index 9a46740de51..e187a96dc0a 100644
--- a/pkgs/tools/networking/p2p/libtorrent/git.nix
+++ b/pkgs/tools/networking/p2p/libtorrent/git.nix
@@ -1,7 +1,7 @@
 { stdenv, autoconf, automake, cppunit, fetchFromGitHub, pkgconfig, openssl, libsigcxx, libtool, zlib }:
 
 stdenv.mkDerivation {
-  name = "libtorrent-git";
+  name = "libtorrent-git-2014-08-20";
 
   src = fetchFromGitHub rec {
     owner = "rakshasa";
@@ -25,4 +25,4 @@ stdenv.mkDerivation {
     platforms = platforms.unix;
     maintainers = with maintainers; [ codyopel ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/networking/p2p/rtorrent/git.nix b/pkgs/tools/networking/p2p/rtorrent/git.nix
index 6320a75f726..dcdd2e68e15 100644
--- a/pkgs/tools/networking/p2p/rtorrent/git.nix
+++ b/pkgs/tools/networking/p2p/rtorrent/git.nix
@@ -9,7 +9,7 @@
 # https://github.com/codyopel/dotfiles/blob/master/dotfiles/rtorrent.rc
 
 stdenv.mkDerivation {
-  name = "rtorrent-git";
+  name = "rtorrent-git-2014-07-02";
 
   src = fetchFromGitHub {
     owner = "rakshasa";
@@ -60,4 +60,4 @@ stdenv.mkDerivation {
     platforms = platforms.linux;
     maintainers = with maintainers; [ codyopel ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/security/fprint_demo/default.nix b/pkgs/tools/security/fprint_demo/default.nix
index 20413ca626c..282c3541dde 100644
--- a/pkgs/tools/security/fprint_demo/default.nix
+++ b/pkgs/tools/security/fprint_demo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoreconfHook, pkgconfig, libfprint, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "fprint_demo";
+  name = "fprint_demo-2008-03-03";
 
   src = fetchgit {
     url = "git://github.com/dsd/fprint_demo";

From fdc1887a6ea15685ae725f5c8a33e1f699d98294 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Jun 2015 00:14:58 +0200
Subject: [PATCH 0770/2322] doc: add user's guide for the Haskell
 infrastructure

Resolves https://github.com/NixOS/nixpkgs/issues/4941.
---
 doc/haskell-users-guide.xml | 757 ++++++++++++++++++++++++++++++++++++
 doc/manual.xml              |   1 +
 2 files changed, 758 insertions(+)
 create mode 100644 doc/haskell-users-guide.xml

diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml
new file mode 100644
index 00000000000..ca6c387e8df
--- /dev/null
+++ b/doc/haskell-users-guide.xml
@@ -0,0 +1,757 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="users-guide-to-the-haskell-infrastructure">
+
+<title>User's Guide to the Haskell Infrastructure</title>
+
+<section xml:id="how-to-install-haskell-packages">
+  <title>How to install Haskell packages</title>
+  <para>
+    Nixpkgs distributes build instructions for all Haskell packages
+    registered on
+    <link xlink:href="http://hackage.haskell.org/">Hackage</link>, but
+    strangely enough normal Nix package lookups don't seem to discover
+    any of them:
+  </para>
+  <programlisting>
+$ nix-env -qa cabal-install
+error: selector ‘cabal-install’ matches no derivations
+
+$ nix-env -i ghc
+error: selector ‘ghc’ matches no derivations
+</programlisting>
+  <para>
+    The Haskell package set is not registered in the top-level namespace
+    because it is <emphasis>huge</emphasis>. If all Haskell packages
+    were visible to these commands, then name-based search/install
+    operations would be much slower than they are now. We avoided that
+    by keeping all Haskell-related packages in a separate attribute set
+    called <literal>haskellPackages</literal>, which the following
+    command will list:
+  </para>
+  <programlisting>
+$ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A haskellPackages
+haskellPackages.a50         a50-0.5
+haskellPackages.abacate     haskell-abacate-0.0.0.0
+haskellPackages.abcBridge   haskell-abcBridge-0.12
+haskellPackages.afv         afv-0.1.1
+haskellPackages.alex        alex-3.1.4
+haskellPackages.Allure      Allure-0.4.101.1
+haskellPackages.alms        alms-0.6.7
+[... some 8000 entries omitted  ...]
+</programlisting>
+  <para>
+    To install any of those packages into your profile, refer to them by
+    their attribute path (first column):
+  </para>
+  <programlisting>
+$ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.Allure ...
+</programlisting>
+  <para>
+    The attribute path of any Haskell packages corresponds to the name
+    of that particular package on Hackage: the package
+    <literal>cabal-install</literal> has the attribute
+    <literal>haskellPackages.cabal-install</literal>, and so on.
+    (Actually, this convention causes trouble with packages like
+    <literal>3dmodels</literal> and <literal>4Blocks</literal>, because
+    these names are invalid identifiers in the Nix language. The issue
+    of how to deal with these rare corner cases is currently
+    unresolved.)
+  </para>
+  <para>
+    Haskell packages who's Nix name (second column) begins with a
+    <literal>haskell-</literal> prefix are packages that provide a
+    library whereas packages without that prefix provide just
+    executables. Libraries may provide executables too, though: the
+    package <literal>haskell-pandoc</literal>, for example, installs
+    both a library and an application. You can install and use Haskell
+    executables just like any other program in Nixpkgs, but using
+    Haskell libraries for development is a bit trickier and we'll
+    address that subject in great detail in section
+    <link linkend="how-to-create-a-development-environment">How to
+    create a development environment</link>.
+  </para>
+  <para>
+    Attribute paths are deterministic inside of Nixpkgs, but the path
+    necessary to reach Nixpkgs varies from system to system. We dodged
+    that problem by giving <literal>nix-env</literal> an explicit
+    <literal>-f &quot;&lt;nixpkgs&gt;&quot;</literal> parameter, but if
+    you call <literal>nix-env</literal> without that flag, then chances
+    are the invocation fails:
+  </para>
+  <programlisting>
+$ nix-env -iA haskellPackages.cabal-install
+error: attribute ‘haskellPackages’ in selection path
+       ‘haskellPackages.cabal-install’ not found
+</programlisting>
+  <para>
+    On NixOS, for example, Nixpkgs does <emphasis>not</emphasis> exist
+    in the top-level namespace by default. To figure out the proper
+    attribute path, it's easiest to query for the path of a well-known
+    Nixpkgs package, i.e.:
+  </para>
+  <programlisting>
+$ nix-env -qaP coreutils
+nixos.pkgs.coreutils  coreutils-8.23
+</programlisting>
+  <para>
+    If your system responds like that (most NixOS installatios will),
+    then the attribute path to <literal>haskellPackages</literal> is
+    <literal>nixos.pkgs.haskellPackages</literal>. Thus, if you want to
+    use <literal>nix-env</literal> without giving an explicit
+    <literal>-f</literal> flag, then that's the way to do it:
+  </para>
+  <programlisting>
+$ nix-env -qaP -A nixos.pkgs.haskellPackages
+$ nix-env -iA nixos.pkgs.haskellPackages.cabal-install
+</programlisting>
+  <para>
+    Our current default compiler is GHC 7.10.x and the
+    <literal>haskellPackages</literal> set contains packages built with
+    that particular version. Nixpkgs contains the latest major release
+    of every GHC since 6.10.4, however, and there is a whole family of
+    package sets available that defines Hackage packages built with each
+    of those compilers, too:
+  </para>
+  <programlisting>
+$ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A haskell.packages.ghc6123
+$ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A haskell.packages.ghc763
+</programlisting>
+  <para>
+    The name <literal>haskellPackages</literal> is really just a synonym
+    for <literal>haskell.packages.ghc7101</literal>, because we prefer
+    that package set internally and recommend it to our users as their
+    default choice, but ultimately you are free to compile your Haskell
+    packages with any GHC version you please. The following command
+    displays the complete list of available compilers:
+  </para>
+  <programlisting>
+$ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A haskell.compiler
+haskell.compiler.ghc6104        ghc-6.10.4
+haskell.compiler.ghc6123        ghc-6.12.3
+haskell.compiler.ghc704         ghc-7.0.4
+haskell.compiler.ghc722         ghc-7.2.2
+haskell.compiler.ghc742         ghc-7.4.2
+haskell.compiler.ghc763         ghc-7.6.3
+haskell.compiler.ghc784         ghc-7.8.4
+haskell.compiler.ghc7101        ghc-7.10.1
+haskell.compiler.ghcHEAD        ghc-7.11.20150402
+haskell.compiler.ghcjs          ghcjs-0.1.0
+haskell.compiler.jhc            jhc-0.8.2
+haskell.compiler.uhc            uhc-1.1.9.0
+</programlisting>
+  <para>
+    We have no package sets for <literal>jhc</literal> or
+    <literal>uhc</literal> yet, unfortunately, but for every version of
+    GHC listed above, there exists a package set based on that compiler.
+    Also, the attributes <literal>haskell.compiler.ghcXYC</literal> and
+    <literal>haskell.packages.ghcXYC.ghc</literal> are synonymous for
+    the sake of convenience.
+  </para>
+</section>
+<section xml:id="how-to-create-a-development-environment">
+  <title>How to create a development environment</title>
+  <section xml:id="how-to-install-a-compiler">
+    <title>How to install a compiler</title>
+    <para>
+      A simple development environment consists of a Haskell compiler
+      and the tool <literal>cabal-install</literal>, and we saw in
+      section <link linkend="how-to-install-haskell-packages">How to
+      install Haskell packages</link> how you can install those programs
+      into your user profile:
+    </para>
+    <programlisting>
+$ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.ghc haskellPackages.cabal-install
+</programlisting>
+    <para>
+      Instead of the default package set
+      <literal>haskellPackages</literal>, you can also use the more
+      precise name <literal>haskell.compiler.ghc7101</literal>, which
+      has the advantage that it refers to the same GHC version
+      regardless of what Nixpkgs considers &quot;default&quot; at any
+      given time.
+    </para>
+    <para>
+      Once you've made those tools available in
+      <literal>$PATH</literal>, it's possible to build Hackage packages
+      the same way people without access to Nix do it all the time:
+    </para>
+    <programlisting>
+$ cabal get lens-4.11 &amp;&amp; cd lens-4.11
+$ cabal install -j --dependencies-only
+$ cabal configure
+$ cabal build
+</programlisting>
+    <para>
+      If you enjoy working with Cabal sandboxes, then that's entirely
+      possible too: just execute the command
+    </para>
+    <programlisting>
+$ cabal sandbox init
+</programlisting>
+    <para>
+      before installing the required dependencies.
+    </para>
+    <para>
+      The <literal>nix-shell</literal> utility makes it easy to switch
+      to a different compiler version; just enter the Nix shell
+      environment with the command
+    </para>
+    <programlisting>
+$ nix-shell -p haskell.compiler.ghc784
+</programlisting>
+    <para>
+      to bring GHC 7.8.4 into <literal>$PATH</literal>. Re-running
+      <literal>cabal configure</literal> switches your build to use that
+      compiler instead. If you're working on a project that doesn't
+      depend on any additional system libraries outside of GHC, then
+      it's sufficient even to run the <literal>cabal configure</literal>
+      command inside of the shell:
+    </para>
+    <programlisting>
+$ nix-shell -p haskell.compiler.ghc784 --command &quot;cabal configure&quot;
+</programlisting>
+    <para>
+      Afterwards, all other commands like <literal>cabal build</literal>
+      work just fine in any shell environment, because the configure
+      phase recorded the absolute paths to all required tools like GHC
+      in its build configuration inside of the <literal>dist/</literal>
+      directory. Please note, however, that
+      <literal>nix-collect-garbage</literal> can break such an
+      environment because the Nix store paths created by
+      <literal>nix-shell</literal> aren't &quot;alive&quot; anymore once
+      <literal>nix-shell</literal> has terminated. If you find that your
+      Haskell builds no longer work after garbage collection, then
+      you'll have to re-run <literal>cabal configure</literal> inside of
+      a new <literal>nix-shell</literal> environment.
+    </para>
+  </section>
+  <section xml:id="how-to-install-a-compiler-with-libraries">
+    <title>How to install a compiler with libraries</title>
+    <para>
+      GHC expects to find all installed libraries inside of its own
+      <literal>lib</literal> directory. This approach works fine on
+      traditional Unix systems, but it doesn't work for Nix, because
+      GHC's store path is immutable once it's built. We cannot install
+      additional libraries into that location. As a consequence, our
+      copies of GHC don't know any packages except their own core
+      libraries, like <literal>base</literal>,
+      <literal>containers</literal>, <literal>Cabal</literal>, etc.
+    </para>
+    <para>
+      We can register additional libraries to GHC, however, using a
+      special build function called <literal>ghcWithPackages</literal>.
+      That function expects one argument: a function that maps from an
+      attribute set of Haskell packages to a list of packages, which
+      determines the libraries known to that particular version of GHC.
+      For example, the Nix expression
+      <literal>ghcWithPackages (pkgs: [pkgs.mtl])</literal> generates a
+      copy of GHC that has the <literal>mtl</literal> library registered
+      in addition to its normal core packages:
+    </para>
+    <programlisting>
+$ nix-shell -p &quot;haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])&quot;
+
+[nix-shell:~]$ ghc-pkg list mtl
+/nix/store/zy79...-ghc-7.10.1/lib/ghc-7.10.1/package.conf.d:
+    mtl-2.2.1
+</programlisting>
+    <para>
+      This function allows users to define their own development
+      environment by means of an override. After adding the following
+      snippet to <literal>~/.nixpkgs/config.nix</literal>,
+    </para>
+    <programlisting>
+{
+  packageOverrides = super: let self = super.pkgs; in
+  {
+    myHaskellEnv = self.haskell.packages.ghc7101.ghcWithPackages
+                     (haskellPackages: with haskellPackages; [
+                       # libraries
+                       arrows async cgi criterion
+                       # tools
+                       cabal-install haskintex
+                     ]);
+  };
+}
+</programlisting>
+    <para>
+      it's possible to install that compiler with
+      <literal>nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA myHaskellEnv</literal>.
+      If you'd like to switch that development environment to a
+      different version of GHC, just replace the
+      <literal>ghc7101</literal> bit in the previous definition with the
+      appropriate name. Of course, it's also possible to define any
+      number of these development environments! (You can't install two
+      of them into the same profile at the same time, though, because
+      that would result in file conflicts.)
+    </para>
+    <para>
+      The generated <literal>ghc</literal> program is a wrapper script
+      that re-directs the real GHC executable to use a new
+      <literal>lib</literal> directory --- one that we specifically
+      constructed to contain all those packages the user requested:
+    </para>
+    <programlisting>
+$ cat $(type -p ghc)
+#! /nix/store/xlxj...-bash-4.3-p33/bin/bash -e
+export NIX_GHC=/nix/store/19sm...-ghc-7.10.1/bin/ghc
+export NIX_GHCPKG=/nix/store/19sm...-ghc-7.10.1/bin/ghc-pkg
+export NIX_GHC_DOCDIR=/nix/store/19sm...-ghc-7.10.1/share/doc/ghc/html
+export NIX_GHC_LIBDIR=/nix/store/19sm...-ghc-7.10.1/lib/ghc-7.10.1
+exec /nix/store/j50p...-ghc-7.10.1/bin/ghc &quot;-B$NIX_GHC_LIBDIR&quot; &quot;$@&quot;
+</programlisting>
+    <para>
+      The variables <literal>$NIX_GHC</literal>,
+      <literal>$NIX_GHCPKG</literal>, etc. point to the
+      <emphasis>new</emphasis> store path
+      <literal>ghcWithPackages</literal> constructed specifically for
+      this environment. The last line of the wrapper script then
+      executes the real <literal>ghc</literal>, but passes the path to
+      the new <literal>lib</literal> directory using GHC's
+      <literal>-B</literal> flag.
+    </para>
+    <para>
+      The purpose of those environment variables is to work around an
+      impurity in the popular
+      <link xlink:href="http://hackage.haskell.org/package/ghc-paths">ghc-paths</link>
+      library. That library promises to give its users access to GHC's
+      installation paths. Only, the library can't possible know that
+      path when it's compiled, because the path GHC considers its own is
+      determined only much later, when the user configures it through
+      <literal>ghcWithPackages</literal>. So we
+      <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/ghc-paths-nix.patch">patched
+      ghc-paths</link> to return the paths found in those environment
+      variables at run-time rather than trying to guess them at
+      compile-time.
+    </para>
+    <para>
+      To make sure that mechanism works properly all the time, we
+      recommend that you set those variables to meaningful values in
+      your shell environment, too, i.e. by adding the following code to
+      your <literal>~/.bashrc</literal>:
+    </para>
+    <programlisting>
+if type &gt;/dev/null 2&gt;&amp;1 -p ghc; then
+  eval &quot;$(egrep ^export &quot;$(type -p ghc)&quot;)&quot;
+fi
+</programlisting>
+    <para>
+      If you are certain that you'll use only one GHC environment which
+      is located in your user profile, then you can use the following
+      code, too, which has the advantage that it doesn't contain any
+      paths from the Nix store, i.e. those settings always remain valid
+      even if a <literal>nix-env -u</literal> operation updates the GHC
+      environment in your profile:
+    </para>
+    <programlisting>
+if [ -e ~/.nix-profile/bin/ghc ]; then
+  export NIX_GHC=&quot;$HOME/.nix-profile/bin/ghc&quot;
+  export NIX_GHCPKG=&quot;$HOME/.nix-profile/bin/ghc-pkg&quot;
+  export NIX_GHC_DOCDIR=&quot;$HOME/.nix-profile/share/doc/ghc/html&quot;
+  export NIX_GHC_LIBDIR=&quot;$HOME/.nix-profile/lib/ghc-$($NIX_GHC --numeric-version)&quot;
+fi
+</programlisting>
+  </section>
+  <section xml:id="how-to-create-ad-hoc-environments-for-nix-shell">
+    <title>How to create ad hoc environments for
+    <literal>nix-shell</literal></title>
+    <para>
+      The easiest way to create an ad hoc development environment is to
+      run <literal>nix-shell</literal> with the appropriate GHC
+      environment given on the command-line:
+    </para>
+    <programlisting>
+nix-shell -p &quot;haskellPackages.ghcWithPackages (pkgs: with pkgs; [mtl pandoc])&quot;
+</programlisting>
+    <para>
+      For more sophisticated use-cases, however, it's more convenient to
+      save the desired configuration in a file called
+      <literal>shell.nix</literal> that looks like this:
+    </para>
+    <programlisting>
+{ nixpkgs ? import &lt;nixpkgs&gt; {}, compiler ? &quot;ghc7101&quot; }:
+let
+  inherit (nixpkgs) pkgs;
+  ghc = pkgs.haskell.packages.${compiler}.ghcWithPackages (ps: with ps; [
+          monad-par mtl
+        ]);
+in
+pkgs.stdenv.mkDerivation {
+  name = &quot;my-haskell-env-0&quot;;
+  buildInputs = [ ghc ];
+  shellHook = &quot;eval $(egrep ^export ${ghc}/bin/ghc)&quot;;
+}
+</programlisting>
+    <para>
+      Now run <literal>nix-shell</literal> --- or even
+      <literal>nix-shell --pure</literal> --- to enter a shell
+      environment that has the appropriate compiler in
+      <literal>$PATH</literal>. If you use <literal>--pure</literal>,
+      then add all other packages that your development environment
+      needs into the <literal>buildInputs</literal> attribute. If you'd
+      like to switch to a different compiler version, then pass an
+      appropriate <literal>compiler</literal> argument to the
+      expression, i.e.
+      <literal>nix-shell --argstr compiler ghc784</literal>.
+    </para>
+    <para>
+      If you need such an environment because you'd like to compile a
+      Hackage package outside of Nix --- i.e. because you're hacking on
+      the latest version from Git ---, then the package set provides
+      suitable nix-shell environments for you already! Every Haskell
+      package has an <literal>env</literal> attribute that provides a
+      shell environment suitable for compiling that particular package.
+      If you'd like to hack the <literal>lens</literal> library, for
+      example, then you just have to check out the source code and enter
+      the appropriate environment:
+    </para>
+    <programlisting>
+  $ cabal get lens-4.11 &amp;&amp; cd lens-4.11
+  Downloading lens-4.11...
+  Unpacking to lens-4.11/
+
+  $ nix-shell &quot;&lt;nixpkgs&gt;&quot; -A haskellPackages.lens.env
+  [nix-shell:/tmp/lens-4.11]$
+</programlisting>
+    <para>
+      At point, you can run <literal>cabal configure</literal>,
+      <literal>cabal build</literal>, and all the other development
+      commands. Note that you need <literal>cabal-install</literal>
+      installed in your <literal>$PATH</literal> already to use it here
+      --- the <literal>nix-shell</literal> environment does not provide
+      it.
+    </para>
+  </section>
+</section>
+<section xml:id="how-to-create-nix-builds-for-your-own-private-haskell-packages">
+  <title>How to create Nix builds for your own private Haskell
+  packages</title>
+  <para>
+    If your own Haskell packages have build instructions for Cabal, then
+    you can convert those automatically into build instructions for Nix
+    using the <literal>cabal2nix</literal> utility, which you can
+    install into your profile by running
+    <literal>nix-env -i cabal2nix</literal>.
+  </para>
+  <section xml:id="how-to-build-a-stand-alone-project">
+    <title>How to build a stand-alone project</title>
+    <para>
+      For example, let's assume that you're working on a private project
+      called <literal>foo</literal>. To generate a Nix build expression
+      for it, change into the project's top-level directory and run the
+      command:
+    </para>
+    <programlisting>
+$ cabal2nix . &gt;foo.nix
+</programlisting>
+    <para>
+      Then write the following snippet into a file called
+      <literal>default.nix</literal>:
+    </para>
+    <programlisting>
+{ nixpkgs ? import &lt;nixpkgs&gt; {}, compiler ? &quot;ghc7101&quot; }:
+nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./foo.nix { }
+</programlisting>
+    <para>
+      Finally, store the following code in a file called
+      <literal>shell.nix</literal>:
+    </para>
+    <programlisting>
+{ nixpkgs ? import &lt;nixpkgs&gt; {}, compiler ? &quot;ghc7101&quot; }:
+(import ./default.nix { inherit nixpkgs compiler; }).env
+</programlisting>
+    <para>
+      At this point, you can run <literal>nix-build</literal> to have
+      Nix compile your project and install it into a Nix store path. The
+      local directory will contain a symlink called
+      <literal>result</literal> after <literal>nix-build</literal>
+      returns that points into that location. Of course, passing the
+      flag <literal>--argstr compiler ghc763</literal> allows switching
+      the build to any version of GHC currently supported.
+    </para>
+    <para>
+      Furthermore, you can call <literal>nix-shell</literal> to enter an
+      interactive development environment in which you can use
+      <literal>cabal configure</literal> and
+      <literal>cabal build</literal> to develop your code. That
+      environment will automatically contain a proper GHC derivation
+      with all the required libraries registered as well as all the
+      system-level libraries your package might need.
+    </para>
+    <para>
+      If your package does not depend on any system-level libraries,
+      then it's sufficient to run
+    </para>
+    <programlisting>
+$ nix-shell --command &quot;cabal configure&quot;
+</programlisting>
+    <para>
+      once to set up your build. <literal>cabal-install</literal>
+      determines the absolute paths to all resources required for the
+      build and writes them into a config file in the
+      <literal>dist/</literal> directory. Once that's done, you can run
+      <literal>cabal build</literal> and any other command for that
+      project even outside of the <literal>nix-shell</literal>
+      environment. This feature is particularly nice for those of us who
+      like to edit their code with an IDE, like Emacs'
+      <literal>haskell-mode</literal>, because it's not necessary to
+      start Emacs inside of nix-shell just to make it find out the
+      necessary settings for building the project;
+      <literal>cabal-install</literal> has already done that for us.
+    </para>
+    <para>
+      If you want to do some quick-and-dirty hacking and don't want to
+      bother setting up a <literal>default.nix</literal> and
+      <literal>shell.nix</literal> file manually, then you can use the
+      <literal>--shell</literal> flag offered by
+      <literal>cabal2nix</literal> to have it generate a stand-alone
+      <literal>nix-shell</literal> environment for you. With that
+      feature, running
+    </para>
+    <programlisting>
+$ cabal2nix --shell . &gt;shell.nix
+$ nix-shell --command &quot;cabal configure&quot;
+</programlisting>
+    <para>
+      is usually enough to set up a build environment for any given
+      Haskell package. You can even use that generated file to run
+      <literal>nix-build</literal>, too:
+    </para>
+    <programlisting>
+$ nix-build shell.nix
+</programlisting>
+  </section>
+  <section xml:id="how-to-build-projects-that-depend-on-each-other">
+    <title>How to build projects that depend on each other</title>
+    <para>
+      If you have multiple private Haskell packages that depend on each
+      other, then you'll have to register those packages in the Nixpkgs
+      set to make them visible for the dependency resolution performed
+      by <literal>callPackage</literal>. First of all, change into each
+      of your projects top-level directories and generate a
+      <literal>default.nix</literal> file with
+      <literal>cabal2nix</literal>:
+    </para>
+    <programlisting>
+$ cd ~/src/foo &amp;&amp; cabal2nix . &gt;default.nix
+$ cd ~/src/bar &amp;&amp; cabal2nix . &gt;default.nix
+</programlisting>
+    <para>
+      Then edit your <literal>~/.nixpkgs/config.nix</literal> file to
+      register those builds in the default Haskell package set:
+    </para>
+    <programlisting>
+  {
+    packageOverrides = super: let self = super.pkgs; in
+    {
+      haskellPackages = super.haskellPackages.override {
+        overrides = self: super: {
+          foo = self.callPackage ../src/foo {};
+          bar = self.callPackage ../src/bar {};
+        };
+      };
+    };
+  }
+</programlisting>
+    <para>
+      Once that's accomplished,
+      <literal>nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qA haskellPackages</literal>
+      will show your packages like any other package from Hackage, and
+      you can build them
+    </para>
+    <programlisting>
+$ nix-build &quot;&lt;nixpkgs&gt;&quot; -A haskellPackages.foo
+</programlisting>
+    <para>
+      or enter an interactive shell environment suitable for building
+      them:
+    </para>
+    <programlisting>
+$ nix-shell &quot;&lt;nixpkgs&gt;&quot; -A haskellPackages.bar.env
+</programlisting>
+  </section>
+</section>
+<section xml:id="miscellaneous-topics">
+  <title>Miscellaneous Topics</title>
+  <section xml:id="how-to-build-with-profiling-enabled">
+    <title>How to build with profiling enabled</title>
+    <para>
+      Every Haskell package set takes a function called
+      <literal>overrides</literal> that you can use to manipulate the
+      package as much as you please. One useful application of this
+      feature is to replace the default <literal>mkDerivation</literal>
+      function with one that enables library profiling for all packages.
+      To accomplish that, add configure the following snippet in your
+      <literal>~/.nixpkgs/config.nix</literal> file:
+    </para>
+    <programlisting>
+{
+  packageOverrides = super: let self = super.pkgs; in
+  {
+    profiledHaskellPackages = self.haskellPackages.override {
+      overrides = self: super: {
+        mkDerivation = args: super.mkDerivation (args // {
+          enableLibraryProfiling = true;
+        });
+      };
+    };
+  };
+}
+</programlisting>
+  </section>
+  <section xml:id="how-to-override-package-versions-in-a-compiler-specific-package-set">
+    <title>How to override package versions in a compiler-specific
+    package set</title>
+    <para>
+      Nixpkgs provides the latest version of
+      <link xlink:href="http://hackage.haskell.org/package/ghc-events"><literal>ghc-events</literal></link>,
+      which is 0.4.4.0 at the time of this writing. This is fine for
+      users of GHC 7.10.x, but GHC 7.8.4 cannot compile that binary.
+      Now, one way to solve that problem is to register an older version
+      of <literal>ghc-events</literal> in the 7.8.x-specific package
+      set. The first step is to generate Nix build instructions with
+      <literal>cabal2nix</literal>:
+    </para>
+    <programlisting>
+$ cabal2nix cabal://ghc-events-0.4.3.0 &gt;~/.nixpkgs/ghc-events-0.4.3.0.nix
+</programlisting>
+    <para>
+      Then add the override in <literal>~/.nixpkgs/config.nix</literal>:
+    </para>
+    <programlisting>
+{
+  packageOverrides = super: let self = super.pkgs; in
+  {
+    haskell = super.haskell // {
+      packages = super.haskell.packages // {
+        ghc784 = super.haskell.packages.ghc784.override {
+          overrides = self: super: {
+            ghc-events = self.callPackage ./ghc-events-0.4.3.0.nix {};
+          };
+        };
+      };
+    };
+  };
+}
+</programlisting>
+    <para>
+      This code is a little crazy, no doubt, but it's necessary because
+      the intuitive version
+    </para>
+    <programlisting>
+haskell.packages.ghc784 = super.haskell.packages.ghc784.override {
+  overrides = self: super: {
+    ghc-events = self.callPackage ./ghc-events-0.4.3.0.nix {};
+  };
+};
+</programlisting>
+    <para>
+      doesn't do what we want it to: that code replaces the
+      <literal>haskell</literal> package set in Nixpkgs with one that
+      contains only one entry,<literal>packages</literal>, which
+      contains only one entry <literal>ghc784</literal>. This override
+      loses the <literal>haskell.compiler</literal> set, and it loses
+      the <literal>haskell.packages.ghcXYZ</literal> sets for all
+      compilers but GHC 7.8.4. To avoid that problem, we have to perform
+      the convoluted little dance from above, iterating over each step
+      in hierarchy.
+    </para>
+    <para>
+      Once it's accomplished, however, we can install a variant of
+      <literal>ghc-events</literal> that's compiled with GHC 7.8.4:
+    </para>
+    <programlisting>
+nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskell.packages.ghc784.ghc-events
+</programlisting>
+    <para>
+      Unfortunately, it turns out that this build fails again while
+      executing the test suite! Apparently, the release archive on
+      Hackage is missing some data files that the test suite requires,
+      so we cannot run it. We accomplish that by re-generating the Nix
+      expression with the <literal>--no-check</literal> flag:
+    </para>
+    <programlisting>
+$ cabal2nix --no-check cabal://ghc-events-0.4.3.0 &gt;~/.nixpkgs/ghc-events-0.4.3.0.nix
+</programlisting>
+    <para>
+      Now the builds succeeds.
+    </para>
+    <para>
+      Of course, in the concrete example of
+      <literal>ghc-events</literal> this whole exercise is not an ideal
+      solution, because <literal>ghc-events</literal> can analyze the
+      output emitted by any version of GHC later than 6.12 regardless of
+      the compiler version that was used to build the `ghc-events'
+      executable, so strictly speaking there's no reason to prefer one
+      built with GHC 7.8.x in the first place. However, for users who
+      cannot use GHC 7.10.x at all for some reason, the approach of
+      downgrading to an older version might be useful.
+    </para>
+  </section>
+  <section xml:id="how-to-recover-from-ghcs-infamous-non-deterministic-library-id-bug">
+    <title>How to recover from GHC's infamous non-deterministic library
+    ID bug</title>
+    <para>
+      GHC and distributed build farms don't get along well:
+    </para>
+    <programlisting>
+https://ghc.haskell.org/trac/ghc/ticket/4012
+</programlisting>
+    <para>
+      When you see an error like this one
+    </para>
+    <programlisting>
+package foo-0.7.1.0 is broken due to missing package
+text-1.2.0.4-98506efb1b9ada233bb5c2b2db516d91
+</programlisting>
+    <para>
+      then you have to download and re-install <literal>foo</literal>
+      and all its dependents from scratch:
+    </para>
+    <programlisting>
+# nix-store -q --referrers /nix/store/*-haskell-text-1.2.0.4 \
+  | nix-store --repair-path --option binary-caches http://hydra.nixos.org
+</programlisting>
+    <para>
+      If you're using additional Hydra servers other than
+      <literal>hydra.nixos.org</literal>, then it might be necessary to
+      purge the local caches that store data from those machines to
+      disable these binary channels for the duration of the previous
+      command, i.e. by running:
+    </para>
+    <programlisting>
+rm /nix/var/nix/binary-cache-v3.sqlite
+rm /nix/var/nix/manifests/*
+rm /nix/var/nix/channel-cache/*
+</programlisting>
+  </section>
+  <section xml:id="builds-on-darwin-fail-with-math.h-not-found">
+    <title>Builds on Darwin fail with <literal>math.h</literal> not
+    found</title>
+    <para>
+      Users of GHC on Darwin have occasionally reported that builds
+      fail, because the compiler complains about a missing include file:
+    </para>
+    <programlisting>
+fatal error: 'math.h' file not found
+</programlisting>
+    <para>
+      The issue has been discussed at length in
+      <link xlink:href="https://github.com/NixOS/nixpkgs/issues/6390">ticket
+      6390</link>, and so far no good solution has been proposed. As a
+      work-around, users who run into this problem can configure the
+      environment variables
+    </para>
+    <programlisting>
+export NIX_CFLAGS_COMPILE=&quot;-idirafter /usr/include&quot;
+export NIX_CFLAGS_LINK=&quot;-L/usr/lib&quot;
+</programlisting>
+    <para>
+      in their <literal>~/.bashrc</literal> file to avoid the compiler
+      error.
+    </para>
+  </section>
+</section>
+
+</chapter>
diff --git a/doc/manual.xml b/doc/manual.xml
index 1b713b0c30c..a6400c98d6e 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -18,5 +18,6 @@
   <xi:include href="package-notes.xml" />
   <xi:include href="coding-conventions.xml" />
   <xi:include href="contributing.xml" />
+  <xi:include href="haskell-users-guide.xml" />
 
 </book>

From 8908471ecc1694fd09fa91bf18e88342986e3707 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 4 Jun 2015 18:45:17 +0200
Subject: [PATCH 0771/2322] cygwin: add needed patches for boost 1.57.0 to
 build

---
 pkgs/development/libraries/boost/1.57.nix     |   32 +-
 .../boost/cygwin-1.40.0-cstdint-cygwin.patch  |   20 +
 .../cygwin-1.40.0-iostreams-cygwin.patch      |   24 +
 .../boost/cygwin-1.40.0-python-cygwin.patch   |   35 +
 .../boost/cygwin-1.40.0-regex-cygwin.patch    |   15 +
 .../boost/cygwin-1.45.0-jam-cygwin.patch      |   12 +
 .../boost/cygwin-1.50.0-jam-pep3149.patch     |   11 +
 .../boost/cygwin-1.55.0-asio-MSG_EOR.patch    |   14 +
 .../cygwin-1.55.0-interlocked-cygwin.patch    |   11 +
 .../boost/cygwin-1.57.0-asio-cygwin.patch     | 1835 +++++++++++++++++
 .../boost/cygwin-1.57.0-config-cygwin.patch   |   76 +
 .../boost/cygwin-1.57.0-context-cygwin.patch  |  600 ++++++
 .../cygwin-1.57.0-filesystem-cygwin.patch     |   32 +
 .../boost/cygwin-1.57.0-locale-cygwin.patch   |   81 +
 .../boost/cygwin-1.57.0-log-cygwin.patch      |   46 +
 .../cygwin-1.57.0-smart_ptr-cygwin.patch      |   77 +
 .../boost/cygwin-1.57.0-system-cygwin.patch   |   22 +
 ...dora-boost-1.50.0-fix-non-utf8-files.patch |   22 +
 .../cygwin-fedora-boost-1.50.0-pool.patch     |  122 ++
 ...a-boost-1.54.0-locale-unused_typedef.patch |   11 +
 ...-boost-1.54.0-pool-max_chunks_shadow.patch |   14 +
 ...a-boost-1.54.0-python-unused_typedef.patch |   15 +
 ...in-fedora-boost-1.57.0-move-is_class.patch |   20 +
 ...cygwin-fedora-boost-1.57.0-mpl-print.patch |   31 +
 ...edora-boost-1.57.0-pool-test_linking.patch |   33 +
 ...edora-boost-1.57.0-signals2-weak_ptr.patch |   10 +
 ...a-boost-1.57.0-spirit-unused_typedef.patch |   19 +
 ...-fedora-boost-1.57.0-uuid-comparison.patch |   11 +
 28 files changed, 3250 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch
 create mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch

diff --git a/pkgs/development/libraries/boost/1.57.nix b/pkgs/development/libraries/boost/1.57.nix
index 6393c6e0d30..906f796b032 100644
--- a/pkgs/development/libraries/boost/1.57.nix
+++ b/pkgs/development/libraries/boost/1.57.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchurl, ... } @ args:
+{ stdenv, callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "1.57.0";
@@ -7,4 +7,34 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://sourceforge/boost/boost_1_57_0.tar.bz2";
     sha256 = "0rs94vdmg34bwwj23fllva6mhrml2i7mvmlb11zyrk1k5818q34i";
   };
+
+  patches = if stdenv.isCygwin then [
+      ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch
+      ./cygwin-fedora-boost-1.50.0-pool.patch
+      ./cygwin-fedora-boost-1.57.0-mpl-print.patch
+      ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch
+      ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch
+      ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch
+      ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch
+      ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch
+      ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch
+      ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch
+      ./cygwin-fedora-boost-1.57.0-move-is_class.patch
+      ./cygwin-1.40.0-cstdint-cygwin.patch
+      ./cygwin-1.57.0-asio-cygwin.patch
+      ./cygwin-1.55.0-asio-MSG_EOR.patch
+      ./cygwin-1.57.0-config-cygwin.patch
+      ./cygwin-1.57.0-context-cygwin.patch
+      ./cygwin-1.57.0-filesystem-cygwin.patch
+      ./cygwin-1.55.0-interlocked-cygwin.patch
+      ./cygwin-1.40.0-iostreams-cygwin.patch
+      ./cygwin-1.57.0-locale-cygwin.patch
+      ./cygwin-1.57.0-log-cygwin.patch
+      ./cygwin-1.40.0-python-cygwin.patch
+      ./cygwin-1.40.0-regex-cygwin.patch
+      ./cygwin-1.57.0-smart_ptr-cygwin.patch
+      ./cygwin-1.57.0-system-cygwin.patch
+      ./cygwin-1.45.0-jam-cygwin.patch
+      ./cygwin-1.50.0-jam-pep3149.patch
+    ] else null;
 })
diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch
new file mode 100644
index 00000000000..61791c60d9e
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch
@@ -0,0 +1,20 @@
+These were fixed in ~1.7.0-46
+
+--- boost_1_40_0/boost/cstdint.hpp	2009-01-14 04:18:19.000000000 -0600
++++ boost_1_40_0/boost/cstdint.hpp	2009-08-27 23:41:34.063543700 -0500
+@@ -40,15 +40,6 @@
+ #   include <inttypes.h>
+ # else
+ #   include <stdint.h>
+-
+-// There is a bug in Cygwin two _C macros
+-#   if defined(__STDC_CONSTANT_MACROS) && defined(__CYGWIN__)
+-#     undef INTMAX_C
+-#     undef UINTMAX_C
+-#     define INTMAX_C(c) c##LL
+-#     define UINTMAX_C(c) c##ULL
+-#   endif
+-
+ # endif
+ 
+ #ifdef __QNX__
diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch
new file mode 100644
index 00000000000..6641ba823b1
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch
@@ -0,0 +1,24 @@
+--- boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp	2008-03-22 16:45:55.000000000 -0500
++++ boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp	2009-08-27 23:41:34.082544800 -0500
+@@ -44,8 +44,7 @@
+ //------------------Locale support--------------------------------------------//
+ 
+ #ifndef BOOST_IOSTREAMS_NO_LOCALE
+-# if defined(BOOST_NO_STD_LOCALE) || \
+-     defined(__CYGWIN__) && \
++# if defined(BOOST_NO_STD_LOCALE) && \
+      ( !defined(__MSL_CPP__) || defined(_MSL_NO_WCHART_CPP_SUPPORT) ) \
+      /**/
+ #  define BOOST_IOSTREAMS_NO_LOCALE
+--- boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp	2008-03-22 16:45:55.000000000 -0500
++++ boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp	2009-08-27 23:41:34.087545100 -0500
+@@ -13,8 +13,7 @@
+ 
+ // BOOST_IOSTREAMS_POSIX or BOOST_IOSTREAMS_WINDOWS specify which API to use.
+ #if !defined( BOOST_IOSTREAMS_WINDOWS ) && !defined( BOOST_IOSTREAMS_POSIX )
+-# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && \
+-     !defined(__CYGWIN__) \
++# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32))
+      /**/
+ #  define BOOST_IOSTREAMS_WINDOWS
+ # else
diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch
new file mode 100644
index 00000000000..7932b0e124b
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch
@@ -0,0 +1,35 @@
+--- boost_1_40_0/boost/python/detail/config.hpp	2007-11-25 12:07:19.000000000 -0600
++++ boost_1_40_0/boost/python/detail/config.hpp	2009-08-27 23:41:34.092545400 -0500
+@@ -83,7 +83,7 @@
+ #     endif
+ #     define BOOST_PYTHON_DECL_FORWARD
+ #     define BOOST_PYTHON_DECL_EXCEPTION __attribute__ ((__visibility__("default")))
+-#  elif (defined(_WIN32) || defined(__CYGWIN__))
++#  elif defined(_WIN32)
+ #     if defined(BOOST_PYTHON_SOURCE)
+ #        define BOOST_PYTHON_DECL __declspec(dllexport)
+ #        define BOOST_PYTHON_BUILD_DLL
+--- boost_1_40_0/boost/python/detail/wrap_python.hpp	2007-04-27 17:16:47.000000000 -0500
++++ boost_1_40_0/boost/python/detail/wrap_python.hpp	2009-08-27 23:41:34.096545600 -0500
+@@ -82,8 +82,8 @@
+ // Some things we need in order to get Python.h to work with compilers other
+ // than MSVC on Win32
+ //
+-#if defined(_WIN32) || defined(__CYGWIN__)
+-# if defined(__GNUC__) && defined(__CYGWIN__)
++#if defined(_WIN32)
++# if defined(__GNUC__)
+ 
+ #  define SIZEOF_LONG 4
+ 
+--- boost_1_40_0/boost/python/module_init.hpp	2007-06-07 13:08:54.000000000 -0500
++++ boost_1_40_0/boost/python/module_init.hpp	2009-08-27 23:41:34.101545900 -0500
+@@ -15,7 +15,7 @@ BOOST_PYTHON_DECL void init_module(char 
+ 
+ }}}
+ 
+-#  if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(BOOST_PYTHON_STATIC_MODULE)
++#  if defined(_WIN32) && !defined(BOOST_PYTHON_STATIC_MODULE)
+ 
+ #   define BOOST_PYTHON_MODULE_INIT(name)               \
+ void init_module_##name();                              \
diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch
new file mode 100644
index 00000000000..969bb814bd1
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch
@@ -0,0 +1,15 @@
+--- boost_1_40_0/boost/regex/v4/fileiter.hpp	2007-11-25 12:07:19.000000000 -0600
++++ boost_1_40_0/boost/regex/v4/fileiter.hpp	2009-08-27 23:41:34.106546200 -0500
+@@ -28,11 +28,7 @@
+ 
+ #ifndef BOOST_REGEX_NO_FILEITER
+ 
+-#if (defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(BOOST_REGEX_NO_W32)
+-#error "Sorry, can't mix <windows.h> with STL code and gcc compiler: if you ran configure, try again with configure --disable-ms-windows"
+-#define BOOST_REGEX_FI_WIN32_MAP
+-#define BOOST_REGEX_FI_POSIX_DIR
+-#elif (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32)
++#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32)
+ #define BOOST_REGEX_FI_WIN32_MAP
+ #define BOOST_REGEX_FI_WIN32_DIR
+ #else
diff --git a/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch
new file mode 100644
index 00000000000..1a00851fa92
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch
@@ -0,0 +1,12 @@
+OS_CYGWIN is used to assume cygpath, Win32-isms
+
+--- boost_1_48_0/tools/build/src/engine/jam.h
++++ boost_1_48_0/tools/build/src/engine/jam.h
+@@ -245,7 +245,6 @@
+ #endif
+ #if defined(__cygwin__) || defined(__CYGWIN__)
+     #define OSMINOR "OS=CYGWIN"
+-    #define OS_CYGWIN
+ #endif
+ #if defined(__FreeBSD__) && !defined(__DragonFly__)
+     #define OSMINOR "OS=FREEBSD"
diff --git a/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch b/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch
new file mode 100644
index 00000000000..4bc6ec9d36e
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch
@@ -0,0 +1,11 @@
+--- a/tools/build/src/tools/python.jam	2012-04-25 22:35:55.000000000 -0500
++++ b/tools/build/src/tools/python.jam	2013-01-21 07:22:30.814373200 -0600
+@@ -376,7 +376,7 @@ local rule path-to-native ( paths * )
+ #
+ local rule split-version ( version )
+ {
+-    local major-minor = [ MATCH ^([0-9]+)\.([0-9]+)(.*)$ : $(version) : 1 2 3 ] ;
++    local major-minor = [ MATCH ^([0-9]+)\.([0-9]+[dmu]*)(.*)$ : $(version) : 1 2 3 ] ;
+     if ! $(major-minor[2]) || $(major-minor[3])
+     {
+         ECHO "Warning: \"using python\" expects a two part (major, minor) version number; got" $(version) instead ;
diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch
new file mode 100644
index 00000000000..46308a59cb0
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch
@@ -0,0 +1,14 @@
+--- boost_1_55_0/boost/asio/detail/socket_types.hpp	2014-08-31 12:43:54.186255800 -0500
++++ boost_1_55_0/boost/asio/detail/socket_types.hpp	2014-08-31 12:43:03.887868700 -0500
+@@ -332,7 +332,11 @@ typedef int signed_size_type;
+ # define BOOST_ASIO_OS_DEF_MSG_OOB MSG_OOB
+ # define BOOST_ASIO_OS_DEF_MSG_PEEK MSG_PEEK
+ # define BOOST_ASIO_OS_DEF_MSG_DONTROUTE MSG_DONTROUTE
++#ifdef MSG_EOR
+ # define BOOST_ASIO_OS_DEF_MSG_EOR MSG_EOR
++#else
++# define BOOST_ASIO_OS_DEF_MSG_EOR 0
++#endif
+ # define BOOST_ASIO_OS_DEF_SHUT_RD SHUT_RD
+ # define BOOST_ASIO_OS_DEF_SHUT_WR SHUT_WR
+ # define BOOST_ASIO_OS_DEF_SHUT_RDWR SHUT_RDWR
diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch
new file mode 100644
index 00000000000..df3edf51e7b
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch
@@ -0,0 +1,11 @@
+--- boost_1_55_0/boost/detail/interlocked.hpp	2013-10-24 09:01:53.000000000 -0500
++++ boost_1_55_0/boost/detail/interlocked.hpp	2014-08-31 13:01:33.830313500 -0500
+@@ -160,7 +160,7 @@ extern "C" void* __cdecl _InterlockedExc
+     ((void*)BOOST_INTERLOCKED_EXCHANGE((long volatile*)(dest),(long)(exchange)))
+ # endif
+ 
+-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ )
++#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
+ 
+ #define BOOST_INTERLOCKED_IMPORT __declspec(dllimport)
+ 
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch
new file mode 100644
index 00000000000..3702d475c8e
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch
@@ -0,0 +1,1835 @@
+--- boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp	2015-05-04 17:33:18.798985800 -0500
+@@ -42,7 +42,7 @@ protected:
+   BOOST_ASIO_DECL static void init_native_buffer(
+       native_buffer_type& buf,
+       const boost::asio::const_buffer& buffer);
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+   // The maximum number of buffers to support in a single operation.
+   enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len };
+ 
+@@ -61,7 +61,7 @@ protected:
+     buf.buf = const_cast<char*>(boost::asio::buffer_cast<const char*>(buffer));
+     buf.len = static_cast<ULONG>(boost::asio::buffer_size(buffer));
+   }
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   // The maximum number of buffers to support in a single operation.
+   enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len };
+ 
+@@ -92,7 +92,7 @@ protected:
+           boost::asio::buffer_cast<const void*>(buffer)));
+     iov.iov_len = boost::asio::buffer_size(buffer);
+   }
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ };
+ 
+ // Helper class to translate buffers into the native buffer representation.
+--- boost_1_57_0/boost/asio/detail/config.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/config.hpp	2015-05-04 17:34:30.756623300 -0500
+@@ -474,7 +474,7 @@
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ // Windows: target OS version.
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ # if !defined(_WIN32_WINNT) && !defined(_WIN32_WINDOWS)
+ #  if defined(_MSC_VER) || defined(__BORLANDC__)
+ #   pragma message( \
+@@ -512,29 +512,29 @@
+ #   error You must add -D__USE_W32_SOCKETS to your compiler options.
+ #  endif // !defined(__USE_W32_SOCKETS)
+ # endif // defined(__CYGWIN__)
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ // Windows: minimise header inclusion.
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ # if !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN)
+ #  if !defined(WIN32_LEAN_AND_MEAN)
+ #   define WIN32_LEAN_AND_MEAN
+ #  endif // !defined(WIN32_LEAN_AND_MEAN)
+ # endif // !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN)
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ // Windows: suppress definition of "min" and "max" macros.
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ # if !defined(BOOST_ASIO_NO_NOMINMAX)
+ #  if !defined(NOMINMAX)
+ #   define NOMINMAX 1
+ #  endif // !defined(NOMINMAX)
+ # endif // !defined(BOOST_ASIO_NO_NOMINMAX)
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ // Windows: IO Completion Ports.
+ #if !defined(BOOST_ASIO_HAS_IOCP)
+-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# if defined(BOOST_ASIO_WINDOWS)
+ #  if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400)
+ #   if !defined(UNDER_CE)
+ #    if !defined(BOOST_ASIO_DISABLE_IOCP)
+@@ -542,7 +542,7 @@
+ #    endif // !defined(BOOST_ASIO_DISABLE_IOCP)
+ #   endif // !defined(UNDER_CE)
+ #  endif // defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400)
+-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# endif // defined(BOOST_ASIO_WINDOWS)
+ #endif // !defined(BOOST_ASIO_HAS_IOCP)
+ 
+ // Linux: epoll, eventfd and timerfd.
+@@ -599,8 +599,7 @@
+ #if !defined(BOOST_ASIO_HAS_SERIAL_PORT)
+ # if defined(BOOST_ASIO_HAS_IOCP) \
+   || !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ #  if !defined(__SYMBIAN32__)
+ #   if !defined(BOOST_ASIO_DISABLE_SERIAL_PORT)
+ #    define BOOST_ASIO_HAS_SERIAL_PORT 1
+@@ -609,7 +608,6 @@
+ # endif // defined(BOOST_ASIO_HAS_IOCP)
+         //   || !defined(BOOST_ASIO_WINDOWS)
+         //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-        //   && !defined(__CYGWIN__)
+ #endif // !defined(BOOST_ASIO_HAS_SERIAL_PORT)
+ 
+ // Windows: stream handles.
+@@ -633,11 +631,11 @@
+ // Windows: object handles.
+ #if !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE)
+ # if !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE)
+-#  if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#  if defined(BOOST_ASIO_WINDOWS)
+ #   if !defined(UNDER_CE)
+ #    define BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE 1
+ #   endif // !defined(UNDER_CE)
+-#  endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#  endif // defined(BOOST_ASIO_WINDOWS)
+ # endif // !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE)
+ #endif // !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE)
+ 
+@@ -654,12 +652,10 @@
+ #if !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR)
+ # if !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR)
+ #  if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ #   define BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR 1
+ #  endif // !defined(BOOST_ASIO_WINDOWS)
+          //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-         //   && !defined(__CYGWIN__)
+ # endif // !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR)
+ #endif // !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR)
+ 
+@@ -667,12 +663,10 @@
+ #if !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
+ # if !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS)
+ #  if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ #   define BOOST_ASIO_HAS_LOCAL_SOCKETS 1
+ #  endif // !defined(BOOST_ASIO_WINDOWS)
+          //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-         //   && !defined(__CYGWIN__)
+ # endif // !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS)
+ #endif // !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
+ 
+@@ -680,12 +674,10 @@
+ #if !defined(BOOST_ASIO_HAS_SIGACTION)
+ # if !defined(BOOST_ASIO_DISABLE_SIGACTION)
+ #  if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ #   define BOOST_ASIO_HAS_SIGACTION 1
+ #  endif // !defined(BOOST_ASIO_WINDOWS)
+          //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-         //   && !defined(__CYGWIN__)
+ # endif // !defined(BOOST_ASIO_DISABLE_SIGACTION)
+ #endif // !defined(BOOST_ASIO_HAS_SIGACTION)
+ 
+@@ -700,7 +692,7 @@
+ 
+ // Can use getaddrinfo() and getnameinfo().
+ #if !defined(BOOST_ASIO_HAS_GETADDRINFO)
+-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# if defined(BOOST_ASIO_WINDOWS)
+ #  if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501)
+ #   define BOOST_ASIO_HAS_GETADDRINFO 1
+ #  elif defined(UNDER_CE)
+--- boost_1_57_0/boost/asio/detail/descriptor_ops.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/descriptor_ops.hpp	2015-05-04 17:33:18.826989400 -0500
+@@ -18,8 +18,7 @@
+ #include <boost/asio/detail/config.hpp>
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+ #include <cstddef>
+ #include <boost/system/error_code.hpp>
+@@ -114,6 +113,5 @@ BOOST_ASIO_DECL int poll_write(int d,
+ 
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ 
+ #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_OPS_HPP
+--- boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp	2015-05-04 17:33:18.830489800 -0500
+@@ -17,7 +17,7 @@
+ 
+ #include <boost/asio/detail/config.hpp>
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/addressof.hpp>
+ #include <boost/asio/detail/bind_handler.hpp>
+@@ -116,6 +116,6 @@ private:
+ 
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_READ_OP_HPP
+--- boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp	2015-05-04 17:33:18.833490200 -0500
+@@ -17,7 +17,7 @@
+ 
+ #include <boost/asio/detail/config.hpp>
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/addressof.hpp>
+ #include <boost/asio/detail/bind_handler.hpp>
+@@ -116,6 +116,6 @@ private:
+ 
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_WRITE_OP_HPP
+--- boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp	2015-05-04 17:33:18.836490600 -0500
+@@ -26,7 +26,7 @@ namespace boost {
+ namespace asio {
+ namespace detail {
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ typedef win_fd_set_adapter fd_set_adapter;
+ #else
+ typedef posix_fd_set_adapter fd_set_adapter;
+--- boost_1_57_0/boost/asio/detail/hash_map.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/hash_map.hpp	2015-05-04 17:33:18.839991000 -0500
+@@ -21,9 +21,9 @@
+ #include <boost/asio/detail/assert.hpp>
+ #include <boost/asio/detail/noncopyable.hpp>
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ # include <boost/asio/detail/socket_types.hpp>
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/push_options.hpp>
+ 
+@@ -42,12 +42,12 @@ inline std::size_t calculate_hash_value(
+     + (reinterpret_cast<std::size_t>(p) >> 3);
+ }
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ inline std::size_t calculate_hash_value(SOCKET s)
+ {
+   return static_cast<std::size_t>(s);
+ }
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ // Note: assumes K and V are POD types.
+ template <typename K, typename V>
+--- boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp	2015-05-04 17:33:18.843491500 -0500
+@@ -21,8 +21,7 @@
+ #include <boost/asio/error.hpp>
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+ #include <boost/asio/detail/push_options.hpp>
+ 
+@@ -448,6 +447,5 @@ int poll_write(int d, state_type state,
+ 
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ 
+ #endif // BOOST_ASIO_DETAIL_IMPL_DESCRIPTOR_OPS_IPP
+--- boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp	2015-05-04 17:33:18.846991900 -0500
+@@ -19,7 +19,6 @@
+ 
+ #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ #if !defined(BOOST_ASIO_WINDOWS)
+-#if !defined(__CYGWIN__)
+ #if !defined(__SYMBIAN32__)
+ #if !defined(BOOST_ASIO_HAS_EVENTFD)
+ 
+@@ -119,7 +118,6 @@ bool pipe_select_interrupter::reset()
+ 
+ #endif // !defined(BOOST_ASIO_HAS_EVENTFD)
+ #endif // !defined(__SYMBIAN32__)
+-#endif // !defined(__CYGWIN__)
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+ #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+--- boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp	2015-05-04 17:33:18.849992300 -0500
+@@ -18,8 +18,7 @@
+ #include <boost/asio/detail/config.hpp>
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+ #include <boost/asio/error.hpp>
+ #include <boost/asio/detail/reactive_descriptor_service.hpp>
+@@ -205,6 +204,5 @@ void reactive_descriptor_service::start_
+ 
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ 
+ #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_DESCRIPTOR_SERVICE_IPP
+--- boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp	2015-05-04 17:33:18.853492700 -0500
+@@ -19,7 +19,7 @@
+ #include <boost/asio/detail/config.hpp>
+ 
+ #if defined(BOOST_ASIO_HAS_SERIAL_PORT)
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <cstring>
+ #include <boost/asio/detail/reactive_serial_port_service.hpp>
+@@ -147,7 +147,7 @@ boost::system::error_code reactive_seria
+ 
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT)
+ 
+ #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_SERIAL_PORT_SERVICE_IPP
+--- boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp	2015-05-04 17:29:21.281324900 -0500
+@@ -187,7 +187,7 @@ void select_reactor::run(bool block, op_
+       max_fd = fd_sets_[i].max_descriptor();
+   }
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   // Connection operations on Windows use both except and write fd_sets.
+   have_work_to_do = have_work_to_do || !op_queue_[connect_op].empty();
+   fd_sets_[write_op].set(op_queue_[connect_op], ops);
+@@ -196,7 +196,7 @@ void select_reactor::run(bool block, op_
+   fd_sets_[except_op].set(op_queue_[connect_op], ops);
+   if (fd_sets_[except_op].max_descriptor() > max_fd)
+     max_fd = fd_sets_[except_op].max_descriptor();
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+   // We can return immediately if there's no work to do and the reactor is
+   // not supposed to block.
+@@ -226,11 +226,11 @@ void select_reactor::run(bool block, op_
+   // Dispatch all ready operations.
+   if (retval > 0)
+   {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+     // Connection operations on Windows use both except and write fd_sets.
+     fd_sets_[except_op].perform(op_queue_[connect_op], ops);
+     fd_sets_[write_op].perform(op_queue_[connect_op], ops);
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+     // Exception operations must be processed first to ensure that any
+     // out-of-band data is read before normal data.
+--- boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp	2015-05-04 17:33:18.857993300 -0500
+@@ -60,12 +60,10 @@ signal_state* get_signal_state()
+ void boost_asio_signal_handler(int signal_number)
+ {
+ #if defined(BOOST_ASIO_WINDOWS) \
+-  || defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  || defined(__CYGWIN__)
++  || defined(BOOST_ASIO_WINDOWS_RUNTIME)
+   signal_set_service::deliver_signal(signal_number);
+ #else // defined(BOOST_ASIO_WINDOWS)
+       //   || defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-      //   || defined(__CYGWIN__)
+   int saved_errno = errno;
+   signal_state* state = get_signal_state();
+   signed_size_type result = ::write(state->write_descriptor_,
+@@ -74,7 +72,6 @@ void boost_asio_signal_handler(int signa
+   errno = saved_errno;
+ #endif // defined(BOOST_ASIO_WINDOWS)
+        //   || defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   || defined(__CYGWIN__)
+ 
+ #if defined(BOOST_ASIO_HAS_SIGNAL) && !defined(BOOST_ASIO_HAS_SIGACTION)
+   ::signal(signal_number, boost_asio_signal_handler);
+@@ -82,8 +79,7 @@ void boost_asio_signal_handler(int signa
+ }
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ class signal_set_service::pipe_read_op : public reactor_op
+ {
+ public:
+@@ -115,30 +111,25 @@ public:
+ };
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ 
+ signal_set_service::signal_set_service(
+     boost::asio::io_service& io_service)
+   : io_service_(boost::asio::use_service<io_service_impl>(io_service)),
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+     reactor_(boost::asio::use_service<reactor>(io_service)),
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+     next_(0),
+     prev_(0)
+ {
+   get_signal_state()->mutex_.init();
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+   reactor_.init_task();
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ 
+   for (int i = 0; i < max_signal_number; ++i)
+     registrations_[i] = 0;
+@@ -174,8 +165,7 @@ void signal_set_service::fork_service(
+     boost::asio::io_service::fork_event fork_ev)
+ {
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+   signal_state* state = get_signal_state();
+   static_mutex::scoped_lock lock(state->mutex_);
+ 
+@@ -217,11 +207,9 @@ void signal_set_service::fork_service(
+   }
+ #else // !defined(BOOST_ASIO_WINDOWS)
+       //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-      //   && !defined(__CYGWIN__)
+   (void)fork_ev;
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ }
+ 
+ void signal_set_service::construct(
+@@ -281,12 +269,12 @@ boost::system::error_code signal_set_ser
+       if (::signal(signal_number, boost_asio_signal_handler) == SIG_ERR)
+ # endif // defined(BOOST_ASIO_HAS_SIGACTION)
+       {
+-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# if defined(BOOST_ASIO_WINDOWS)
+         ec = boost::asio::error::invalid_argument;
+-# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# else // defined(BOOST_ASIO_WINDOWS)
+         ec = boost::system::error_code(errno,
+             boost::asio::error::get_system_category());
+-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# endif // defined(BOOST_ASIO_WINDOWS)
+         delete new_registration;
+         return ec;
+       }
+@@ -351,12 +339,12 @@ boost::system::error_code signal_set_ser
+       if (::signal(signal_number, SIG_DFL) == SIG_ERR)
+ # endif // defined(BOOST_ASIO_HAS_SIGACTION)
+       {
+-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# if defined(BOOST_ASIO_WINDOWS)
+         ec = boost::asio::error::invalid_argument;
+-# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# else // defined(BOOST_ASIO_WINDOWS)
+         ec = boost::system::error_code(errno,
+             boost::asio::error::get_system_category());
+-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# endif // defined(BOOST_ASIO_WINDOWS)
+         return ec;
+       }
+     }
+@@ -405,12 +393,12 @@ boost::system::error_code signal_set_ser
+       if (::signal(reg->signal_number_, SIG_DFL) == SIG_ERR)
+ # endif // defined(BOOST_ASIO_HAS_SIGACTION)
+       {
+-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# if defined(BOOST_ASIO_WINDOWS)
+         ec = boost::asio::error::invalid_argument;
+-# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# else // defined(BOOST_ASIO_WINDOWS)
+         ec = boost::system::error_code(errno,
+             boost::asio::error::get_system_category());
+-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# endif // defined(BOOST_ASIO_WINDOWS)
+         return ec;
+       }
+     }
+@@ -500,11 +488,11 @@ void signal_set_service::add_service(sig
+   signal_state* state = get_signal_state();
+   static_mutex::scoped_lock lock(state->mutex_);
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+   // If this is the first service to be created, open a new pipe.
+   if (state->service_list_ == 0)
+     open_descriptors();
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+   // Insert service into linked list of all services.
+   service->next_ = state->service_list_;
+@@ -514,8 +502,7 @@ void signal_set_service::add_service(sig
+   state->service_list_ = service;
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+   // Register for pipe readiness notifications.
+   int read_descriptor = state->read_descriptor_;
+   lock.unlock();
+@@ -523,7 +510,6 @@ void signal_set_service::add_service(sig
+       read_descriptor, service->reactor_data_, new pipe_read_op);
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ }
+ 
+ void signal_set_service::remove_service(signal_set_service* service)
+@@ -534,8 +520,7 @@ void signal_set_service::remove_service(
+   if (service->next_ || service->prev_ || state->service_list_ == service)
+   {
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+     // Disable the pipe readiness notifications.
+     int read_descriptor = state->read_descriptor_;
+     lock.unlock();
+@@ -544,7 +529,6 @@ void signal_set_service::remove_service(
+     lock.lock();
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ 
+     // Remove service from linked list of all services.
+     if (state->service_list_ == service)
+@@ -556,19 +540,18 @@ void signal_set_service::remove_service(
+     service->next_ = 0;
+     service->prev_ = 0;
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+     // If this is the last service to be removed, close the pipe.
+     if (state->service_list_ == 0)
+       close_descriptors();
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+   }
+ }
+ 
+ void signal_set_service::open_descriptors()
+ {
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+   signal_state* state = get_signal_state();
+ 
+   int pipe_fds[2];
+@@ -593,14 +576,12 @@ void signal_set_service::open_descriptor
+   }
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ }
+ 
+ void signal_set_service::close_descriptors()
+ {
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+   signal_state* state = get_signal_state();
+ 
+   if (state->read_descriptor_ != -1)
+@@ -612,7 +593,6 @@ void signal_set_service::close_descripto
+   state->write_descriptor_ = -1;
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ }
+ 
+ void signal_set_service::start_wait_op(
+--- boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp	2015-05-04 17:32:20.048025400 -0500
+@@ -33,12 +33,12 @@
+ # include <string>
+ #endif // defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) \
++#if defined(BOOST_ASIO_WINDOWS) \
+   || defined(__MACH__) && defined(__APPLE__)
+ # if defined(BOOST_ASIO_HAS_PTHREADS)
+ #  include <pthread.h>
+ # endif // defined(BOOST_ASIO_HAS_PTHREADS)
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+        // || defined(__MACH__) && defined(__APPLE__)
+ 
+ #include <boost/asio/detail/push_options.hpp>
+@@ -50,9 +50,9 @@ namespace socket_ops {
+ 
+ #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ struct msghdr { int msg_namelen; };
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ #if defined(__hpux)
+ // HP-UX doesn't declare these functions extern "C", so they are declared again
+@@ -65,7 +65,7 @@ extern "C" unsigned int if_nametoindex(c
+ 
+ inline void clear_last_error()
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   WSASetLastError(0);
+ #else
+   errno = 0;
+@@ -78,7 +78,7 @@ template <typename ReturnType>
+ inline ReturnType error_wrapper(ReturnType return_value,
+     boost::system::error_code& ec)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   ec = boost::system::error_code(WSAGetLastError(),
+       boost::asio::error::get_system_category());
+ #else
+@@ -313,11 +313,11 @@ int close(socket_type s, state_type& sta
+     }
+ 
+     clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+     result = error_wrapper(::closesocket(s), ec);
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+     result = error_wrapper(::close(s), ec);
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+     if (result != 0
+         && (ec == boost::asio::error::would_block
+@@ -329,10 +329,10 @@ int close(socket_type s, state_type& sta
+       // current OS where this behaviour is seen, Windows, says that the socket
+       // remains open. Therefore we'll put the descriptor back into blocking
+       // mode and have another attempt at closing it.
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+       ioctl_arg_type arg = 0;
+       ::ioctlsocket(s, FIONBIO, &arg);
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+ # if defined(__SYMBIAN32__)
+       int flags = ::fcntl(s, F_GETFL, 0);
+       if (flags >= 0)
+@@ -341,15 +341,15 @@ int close(socket_type s, state_type& sta
+       ioctl_arg_type arg = 0;
+       ::ioctl(s, FIONBIO, &arg);
+ # endif // defined(__SYMBIAN32__)
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+       state &= ~non_blocking;
+ 
+       clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+       result = error_wrapper(::closesocket(s), ec);
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+       result = error_wrapper(::close(s), ec);
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+     }
+   }
+ 
+@@ -368,7 +368,7 @@ bool set_user_non_blocking(socket_type s
+   }
+ 
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   ioctl_arg_type arg = (value ? 1 : 0);
+   int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec);
+ #elif defined(__SYMBIAN32__)
+@@ -421,7 +421,7 @@ bool set_internal_non_blocking(socket_ty
+   }
+ 
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   ioctl_arg_type arg = (value ? 1 : 0);
+   int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec);
+ #elif defined(__SYMBIAN32__)
+@@ -543,7 +543,6 @@ bool non_blocking_connect(socket_type s,
+   // Check if the connect operation has finished. This is required since we may
+   // get spurious readiness notifications from the reactor.
+ #if defined(BOOST_ASIO_WINDOWS) \
+-  || defined(__CYGWIN__) \
+   || defined(__SYMBIAN32__)
+   fd_set write_fds;
+   FD_ZERO(&write_fds);
+@@ -556,7 +555,6 @@ bool non_blocking_connect(socket_type s,
+   zero_timeout.tv_usec = 0;
+   int ready = ::select(s + 1, 0, &write_fds, &except_fds, &zero_timeout);
+ #else // defined(BOOST_ASIO_WINDOWS)
+-      // || defined(__CYGWIN__)
+       // || defined(__SYMBIAN32__)
+   pollfd fds;
+   fds.fd = s;
+@@ -564,7 +562,6 @@ bool non_blocking_connect(socket_type s,
+   fds.revents = 0;
+   int ready = ::poll(&fds, 1, 0);
+ #endif // defined(BOOST_ASIO_WINDOWS)
+-       // || defined(__CYGWIN__)
+        // || defined(__SYMBIAN32__)
+   if (ready == 0)
+   {
+@@ -593,7 +590,7 @@ bool non_blocking_connect(socket_type s,
+ int socketpair(int af, int type, int protocol,
+     socket_type sv[2], boost::system::error_code& ec)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   (void)(af);
+   (void)(type);
+   (void)(protocol);
+@@ -619,11 +616,11 @@ bool sockatmark(socket_type s, boost::sy
+ 
+ #if defined(SIOCATMARK)
+   ioctl_arg_type value = 0;
+-# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# if defined(BOOST_ASIO_WINDOWS)
+   int result = error_wrapper(::ioctlsocket(s, SIOCATMARK, &value), ec);
+-# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# else // defined(BOOST_ASIO_WINDOWS)
+   int result = error_wrapper(::ioctl(s, SIOCATMARK, &value), ec);
+-# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++# endif // defined(BOOST_ASIO_WINDOWS)
+   if (result == 0)
+     ec = boost::system::error_code();
+ # if defined(ENOTTY)
+@@ -648,11 +645,11 @@ size_t available(socket_type s, boost::s
+   }
+ 
+   ioctl_arg_type value = 0;
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   int result = error_wrapper(::ioctlsocket(s, FIONREAD, &value), ec);
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   int result = error_wrapper(::ioctl(s, FIONREAD, &value), ec);
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+   if (result == 0)
+     ec = boost::system::error_code();
+ #if defined(ENOTTY)
+@@ -689,32 +686,32 @@ inline void init_buf_iov_base(T& base, v
+   base = static_cast<T>(addr);
+ }
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ typedef WSABUF buf;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+ typedef iovec buf;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ void init_buf(buf& b, void* data, size_t size)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   b.buf = static_cast<char*>(data);
+   b.len = static_cast<u_long>(size);
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   init_buf_iov_base(b.iov_base, data);
+   b.iov_len = size;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ void init_buf(buf& b, const void* data, size_t size)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   b.buf = static_cast<char*>(const_cast<void*>(data));
+   b.len = static_cast<u_long>(size);
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   init_buf_iov_base(b.iov_base, const_cast<void*>(data));
+   b.iov_len = size;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ inline void init_msghdr_msg_name(void*& name, socket_addr_type* addr)
+@@ -743,7 +740,7 @@ signed_size_type recv(socket_type s, buf
+     int flags, boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   // Receive some data.
+   DWORD recv_buf_count = static_cast<DWORD>(count);
+   DWORD bytes_transferred = 0;
+@@ -758,7 +755,7 @@ signed_size_type recv(socket_type s, buf
+     return socket_error_retval;
+   ec = boost::system::error_code();
+   return bytes_transferred;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   msghdr msg = msghdr();
+   msg.msg_iov = bufs;
+   msg.msg_iovlen = static_cast<int>(count);
+@@ -766,7 +763,7 @@ signed_size_type recv(socket_type s, buf
+   if (result >= 0)
+     ec = boost::system::error_code();
+   return result;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ size_t sync_recv(socket_type s, state_type state, buf* bufs,
+@@ -889,7 +886,7 @@ signed_size_type recvfrom(socket_type s,
+     boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   // Receive some data.
+   DWORD recv_buf_count = static_cast<DWORD>(count);
+   DWORD bytes_transferred = 0;
+@@ -906,7 +903,7 @@ signed_size_type recvfrom(socket_type s,
+     return socket_error_retval;
+   ec = boost::system::error_code();
+   return bytes_transferred;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   msghdr msg = msghdr();
+   init_msghdr_msg_name(msg.msg_name, addr);
+   msg.msg_namelen = static_cast<int>(*addrlen);
+@@ -917,7 +914,7 @@ signed_size_type recvfrom(socket_type s,
+   if (result >= 0)
+     ec = boost::system::error_code();
+   return result;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ size_t sync_recvfrom(socket_type s, state_type state, buf* bufs,
+@@ -1014,10 +1011,10 @@ signed_size_type recvmsg(socket_type s,
+     int in_flags, int& out_flags, boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   out_flags = 0;
+   return socket_ops::recv(s, bufs, count, in_flags, ec);
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   msghdr msg = msghdr();
+   msg.msg_iov = bufs;
+   msg.msg_iovlen = static_cast<int>(count);
+@@ -1030,7 +1027,7 @@ signed_size_type recvmsg(socket_type s,
+   else
+     out_flags = 0;
+   return result;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ size_t sync_recvmsg(socket_type s, state_type state,
+@@ -1126,7 +1123,7 @@ signed_size_type send(socket_type s, con
+     int flags, boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   // Send the data.
+   DWORD send_buf_count = static_cast<DWORD>(count);
+   DWORD bytes_transferred = 0;
+@@ -1141,7 +1138,7 @@ signed_size_type send(socket_type s, con
+     return socket_error_retval;
+   ec = boost::system::error_code();
+   return bytes_transferred;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   msghdr msg = msghdr();
+   msg.msg_iov = const_cast<buf*>(bufs);
+   msg.msg_iovlen = static_cast<int>(count);
+@@ -1152,7 +1149,7 @@ signed_size_type send(socket_type s, con
+   if (result >= 0)
+     ec = boost::system::error_code();
+   return result;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ size_t sync_send(socket_type s, state_type state, const buf* bufs,
+@@ -1253,7 +1250,7 @@ signed_size_type sendto(socket_type s, c
+     boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   // Send the data.
+   DWORD send_buf_count = static_cast<DWORD>(count);
+   DWORD bytes_transferred = 0;
+@@ -1268,7 +1265,7 @@ signed_size_type sendto(socket_type s, c
+     return socket_error_retval;
+   ec = boost::system::error_code();
+   return bytes_transferred;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   msghdr msg = msghdr();
+   init_msghdr_msg_name(msg.msg_name, addr);
+   msg.msg_namelen = static_cast<int>(addrlen);
+@@ -1281,7 +1278,7 @@ signed_size_type sendto(socket_type s, c
+   if (result >= 0)
+     ec = boost::system::error_code();
+   return result;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ size_t sync_sendto(socket_type s, state_type state, const buf* bufs,
+@@ -1358,7 +1355,7 @@ socket_type socket(int af, int type, int
+     boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   socket_type s = error_wrapper(::WSASocketW(af, type, protocol, 0, 0,
+         WSA_FLAG_OVERLAPPED), ec);
+   if (s == invalid_socket)
+@@ -1556,7 +1553,7 @@ int getsockopt(socket_type s, state_type
+   }
+   ec = boost::asio::error::fault;
+   return socket_error_retval;
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+   clear_last_error();
+   int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen,
+         s, level, optname, optval, optlen), ec);
+@@ -1574,7 +1571,7 @@ int getsockopt(socket_type s, state_type
+   if (result == 0)
+     ec = boost::system::error_code();
+   return result;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   clear_last_error();
+   int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen,
+         s, level, optname, optval, optlen), ec);
+@@ -1593,7 +1590,7 @@ int getsockopt(socket_type s, state_type
+   if (result == 0)
+     ec = boost::system::error_code();
+   return result;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ template <typename SockLenType>
+@@ -1615,7 +1612,7 @@ int getpeername(socket_type s, socket_ad
+     return socket_error_retval;
+   }
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   if (cached)
+   {
+     // Check if socket is still connected.
+@@ -1636,9 +1633,9 @@ int getpeername(socket_type s, socket_ad
+     ec = boost::system::error_code();
+     return 0;
+   }
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   (void)cached;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+   clear_last_error();
+   int result = error_wrapper(call_getpeername(
+@@ -1685,7 +1682,7 @@ int ioctl(socket_type s, state_type& sta
+   }
+ 
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   int result = error_wrapper(::ioctlsocket(s, cmd, arg), ec);
+ #elif defined(__MACH__) && defined(__APPLE__) \
+   || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+@@ -1726,7 +1723,7 @@ int select(int nfds, fd_set* readfds, fd
+     fd_set* exceptfds, timeval* timeout, boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   if (!readfds && !writefds && !exceptfds && timeout)
+   {
+     DWORD milliseconds = timeout->tv_sec * 1000 + timeout->tv_usec / 1000;
+@@ -1746,7 +1743,7 @@ int select(int nfds, fd_set* readfds, fd
+   if (timeout && timeout->tv_sec == 0
+       && timeout->tv_usec > 0 && timeout->tv_usec < 1000)
+     timeout->tv_usec = 1000;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ #if defined(__hpux) && defined(__SELECT)
+   timespec ts;
+@@ -1772,7 +1769,6 @@ int poll_read(socket_type s, state_type
+   }
+ 
+ #if defined(BOOST_ASIO_WINDOWS) \
+-  || defined(__CYGWIN__) \
+   || defined(__SYMBIAN32__)
+   fd_set fds;
+   FD_ZERO(&fds);
+@@ -1784,7 +1780,6 @@ int poll_read(socket_type s, state_type
+   clear_last_error();
+   int result = error_wrapper(::select(s + 1, &fds, 0, 0, timeout), ec);
+ #else // defined(BOOST_ASIO_WINDOWS)
+-      // || defined(__CYGWIN__)
+       // || defined(__SYMBIAN32__)
+   pollfd fds;
+   fds.fd = s;
+@@ -1794,7 +1789,6 @@ int poll_read(socket_type s, state_type
+   clear_last_error();
+   int result = error_wrapper(::poll(&fds, 1, timeout), ec);
+ #endif // defined(BOOST_ASIO_WINDOWS)
+-       // || defined(__CYGWIN__)
+        // || defined(__SYMBIAN32__)
+   if (result == 0)
+     ec = (state & user_set_non_blocking)
+@@ -1813,7 +1807,6 @@ int poll_write(socket_type s, state_type
+   }
+ 
+ #if defined(BOOST_ASIO_WINDOWS) \
+-  || defined(__CYGWIN__) \
+   || defined(__SYMBIAN32__)
+   fd_set fds;
+   FD_ZERO(&fds);
+@@ -1825,7 +1818,6 @@ int poll_write(socket_type s, state_type
+   clear_last_error();
+   int result = error_wrapper(::select(s + 1, 0, &fds, 0, timeout), ec);
+ #else // defined(BOOST_ASIO_WINDOWS)
+-      // || defined(__CYGWIN__)
+       // || defined(__SYMBIAN32__)
+   pollfd fds;
+   fds.fd = s;
+@@ -1835,7 +1827,6 @@ int poll_write(socket_type s, state_type
+   clear_last_error();
+   int result = error_wrapper(::poll(&fds, 1, timeout), ec);
+ #endif // defined(BOOST_ASIO_WINDOWS)
+-       // || defined(__CYGWIN__)
+        // || defined(__SYMBIAN32__)
+   if (result == 0)
+     ec = (state & user_set_non_blocking)
+@@ -1854,7 +1845,6 @@ int poll_connect(socket_type s, boost::s
+   }
+ 
+ #if defined(BOOST_ASIO_WINDOWS) \
+-  || defined(__CYGWIN__) \
+   || defined(__SYMBIAN32__)
+   fd_set write_fds;
+   FD_ZERO(&write_fds);
+@@ -1869,7 +1859,6 @@ int poll_connect(socket_type s, boost::s
+     ec = boost::system::error_code();
+   return result;
+ #else // defined(BOOST_ASIO_WINDOWS)
+-      // || defined(__CYGWIN__)
+       // || defined(__SYMBIAN32__)
+   pollfd fds;
+   fds.fd = s;
+@@ -1881,7 +1870,6 @@ int poll_connect(socket_type s, boost::s
+     ec = boost::system::error_code();
+   return result;
+ #endif // defined(BOOST_ASIO_WINDOWS)
+-       // || defined(__CYGWIN__)
+        // || defined(__SYMBIAN32__)
+ }
+ 
+@@ -1926,7 +1914,7 @@ const char* inet_ntop(int af, const void
+     ec = boost::asio::error::address_family_not_supported;
+     return 0;
+   }
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+   using namespace std; // For memcpy.
+ 
+   if (af != BOOST_ASIO_OS_DEF(AF_INET) && af != BOOST_ASIO_OS_DEF(AF_INET6))
+@@ -1981,7 +1969,7 @@ const char* inet_ntop(int af, const void
+     ec = boost::asio::error::invalid_argument;
+ 
+   return result == socket_error_retval ? 0 : dest;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   const char* result = error_wrapper(::inet_ntop(
+         af, src, dest, static_cast<int>(length)), ec);
+   if (result == 0 && !ec)
+@@ -2001,7 +1989,7 @@ const char* inet_ntop(int af, const void
+     strcat(dest, if_name);
+   }
+   return result;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ int inet_pton(int af, const char* src, void* dest,
+@@ -2152,7 +2140,7 @@ int inet_pton(int af, const char* src, v
+     ec = boost::asio::error::address_family_not_supported;
+     return -1;
+   }
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+   using namespace std; // For memcpy and strcmp.
+ 
+   if (af != BOOST_ASIO_OS_DEF(AF_INET) && af != BOOST_ASIO_OS_DEF(AF_INET6))
+@@ -2212,7 +2200,7 @@ int inet_pton(int af, const char* src, v
+     ec = boost::system::error_code();
+ 
+   return result == socket_error_retval ? -1 : 1;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   int result = error_wrapper(::inet_pton(af, src, dest), ec);
+   if (result <= 0 && !ec)
+     ec = boost::asio::error::invalid_argument;
+@@ -2234,7 +2222,7 @@ int inet_pton(int af, const char* src, v
+     }
+   }
+   return result;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ }
+ 
+ int gethostname(char* name, int namelen, boost::system::error_code& ec)
+@@ -2310,7 +2298,7 @@ inline hostent* gethostbyaddr(const char
+     hostent* result, char* buffer, int buflength, boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   (void)(buffer);
+   (void)(buflength);
+   hostent* retval = error_wrapper(::gethostbyaddr(addr, length, af), ec);
+@@ -2353,7 +2341,7 @@ inline hostent* gethostbyname(const char
+     char* buffer, int buflength, int ai_flags, boost::system::error_code& ec)
+ {
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   (void)(buffer);
+   (void)(buflength);
+   (void)(ai_flags);
+@@ -3153,7 +3141,7 @@ inline boost::system::error_code transla
+   case EAI_SOCKTYPE:
+     return boost::asio::error::socket_type_not_supported;
+   default: // Possibly the non-portable EAI_SYSTEM.
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+     return boost::system::error_code(
+         WSAGetLastError(), boost::asio::error::get_system_category());
+ #else
+@@ -3170,7 +3158,7 @@ boost::system::error_code getaddrinfo(co
+   host = (host && *host) ? host : 0;
+   service = (service && *service) ? service : 0;
+   clear_last_error();
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ # if defined(BOOST_ASIO_HAS_GETADDRINFO)
+   // Building for Windows XP, Windows Server 2003, or later.
+   int error = ::getaddrinfo(host, service, &hints, result);
+@@ -3213,7 +3201,7 @@ boost::system::error_code background_get
+ 
+ void freeaddrinfo(addrinfo_type* ai)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ # if defined(BOOST_ASIO_HAS_GETADDRINFO)
+   // Building for Windows XP, Windows Server 2003, or later.
+   ::freeaddrinfo(ai);
+@@ -3241,7 +3229,7 @@ boost::system::error_code getnameinfo(co
+     std::size_t addrlen, char* host, std::size_t hostlen,
+     char* serv, std::size_t servlen, int flags, boost::system::error_code& ec)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ # if defined(BOOST_ASIO_HAS_GETADDRINFO)
+   // Building for Windows XP, Windows Server 2003, or later.
+   clear_last_error();
+--- boost_1_57_0/boost/asio/detail/impl/socket_select_interrupter.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/socket_select_interrupter.ipp	2015-05-04 17:33:18.861493700 -0500
+@@ -20,7 +20,6 @@
+ #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+ #if defined(BOOST_ASIO_WINDOWS) \
+-  || defined(__CYGWIN__) \
+   || defined(__SYMBIAN32__)
+ 
+ #include <cstdlib>
+@@ -169,7 +168,6 @@ bool socket_select_interrupter::reset()
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+ #endif // defined(BOOST_ASIO_WINDOWS)
+-       // || defined(__CYGWIN__)
+        // || defined(__SYMBIAN32__)
+ 
+ #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+--- boost_1_57_0/boost/asio/detail/impl/winsock_init.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/impl/winsock_init.ipp	2015-05-04 17:33:18.864494100 -0500
+@@ -17,7 +17,7 @@
+ 
+ #include <boost/asio/detail/config.hpp>
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/socket_types.hpp>
+ #include <boost/asio/detail/winsock_init.hpp>
+@@ -79,6 +79,6 @@ void winsock_init_base::throw_on_error(d
+ 
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ #endif // BOOST_ASIO_DETAIL_IMPL_WINSOCK_INIT_IPP
+--- boost_1_57_0/boost/asio/detail/local_free_on_block_exit.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/local_free_on_block_exit.hpp	2015-05-04 17:33:18.867994600 -0500
+@@ -17,7 +17,7 @@
+ 
+ #include <boost/asio/detail/config.hpp>
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/noncopyable.hpp>
+ #include <boost/asio/detail/socket_types.hpp>
+@@ -54,6 +54,6 @@ private:
+ 
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ #endif // BOOST_ASIO_DETAIL_LOCAL_FREE_ON_BLOCK_EXIT_HPP
+--- boost_1_57_0/boost/asio/detail/null_signal_blocker.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/null_signal_blocker.hpp	2015-05-04 17:33:18.870994900 -0500
+@@ -20,7 +20,6 @@
+ #if !defined(BOOST_ASIO_HAS_THREADS) \
+   || defined(BOOST_ASIO_WINDOWS) \
+   || defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  || defined(__CYGWIN__) \
+   || defined(__SYMBIAN32__)
+ 
+ #include <boost/asio/detail/noncopyable.hpp>
+@@ -65,7 +64,6 @@ public:
+ #endif // !defined(BOOST_ASIO_HAS_THREADS)
+        // || defined(BOOST_ASIO_WINDOWS)
+        // || defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       // || defined(__CYGWIN__)
+        // || defined(__SYMBIAN32__)
+ 
+ #endif // BOOST_ASIO_DETAIL_NULL_SIGNAL_BLOCKER_HPP
+--- boost_1_57_0/boost/asio/detail/old_win_sdk_compat.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/old_win_sdk_compat.hpp	2015-05-04 17:33:18.874495400 -0500
+@@ -17,7 +17,7 @@
+ 
+ #include <boost/asio/detail/config.hpp>
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ 
+ // Guess whether we are building against on old Platform SDK.
+ #if !defined(IN6ADDR_ANY_INIT)
+@@ -211,6 +211,6 @@ struct addrinfo_emulation
+ # define IPPROTO_ICMPV6 58
+ #endif
+ 
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ #endif // BOOST_ASIO_DETAIL_OLD_WIN_SDK_COMPAT_HPP
+--- boost_1_57_0/boost/asio/detail/pipe_select_interrupter.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/pipe_select_interrupter.hpp	2015-05-04 17:33:18.877995800 -0500
+@@ -19,7 +19,6 @@
+ 
+ #if !defined(BOOST_ASIO_WINDOWS)
+ #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-#if !defined(__CYGWIN__)
+ #if !defined(__SYMBIAN32__)
+ #if !defined(BOOST_ASIO_HAS_EVENTFD)
+ 
+@@ -84,7 +83,6 @@ private:
+ 
+ #endif // !defined(BOOST_ASIO_HAS_EVENTFD)
+ #endif // !defined(__SYMBIAN32__)
+-#endif // !defined(__CYGWIN__)
+ #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+--- boost_1_57_0/boost/asio/detail/posix_fd_set_adapter.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/posix_fd_set_adapter.hpp	2015-05-04 17:33:18.881496300 -0500
+@@ -18,7 +18,6 @@
+ #include <boost/asio/detail/config.hpp>
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(__CYGWIN__) \
+   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+ #include <cstring>
+@@ -114,7 +113,6 @@ private:
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+-       // && !defined(__CYGWIN__)
+        // && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+ #endif // BOOST_ASIO_DETAIL_POSIX_FD_SET_ADAPTER_HPP
+--- boost_1_57_0/boost/asio/detail/reactive_descriptor_service.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/reactive_descriptor_service.hpp	2015-05-04 17:33:18.886496900 -0500
+@@ -18,8 +18,7 @@
+ #include <boost/asio/detail/config.hpp>
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+ #include <boost/asio/buffer.hpp>
+ #include <boost/asio/io_service.hpp>
+@@ -319,6 +318,5 @@ private:
+ 
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ 
+ #endif // BOOST_ASIO_DETAIL_REACTIVE_DESCRIPTOR_SERVICE_HPP
+--- boost_1_57_0/boost/asio/detail/reactive_serial_port_service.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/reactive_serial_port_service.hpp	2015-05-04 17:33:18.889497300 -0500
+@@ -19,7 +19,7 @@
+ #include <boost/asio/detail/config.hpp>
+ 
+ #if defined(BOOST_ASIO_HAS_SERIAL_PORT)
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <string>
+ #include <boost/asio/error.hpp>
+@@ -230,7 +230,7 @@ private:
+ # include <boost/asio/detail/impl/reactive_serial_port_service.ipp>
+ #endif // defined(BOOST_ASIO_HEADER_ONLY)
+ 
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT)
+ 
+ #endif // BOOST_ASIO_DETAIL_REACTIVE_SERIAL_PORT_SERVICE_HPP
+--- boost_1_57_0/boost/asio/detail/select_interrupter.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/select_interrupter.hpp	2015-05-04 17:33:18.892497700 -0500
+@@ -19,7 +19,7 @@
+ 
+ #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__)
++#if defined(BOOST_ASIO_WINDOWS) || defined(__SYMBIAN32__)
+ # include <boost/asio/detail/socket_select_interrupter.hpp>
+ #elif defined(BOOST_ASIO_HAS_EVENTFD)
+ # include <boost/asio/detail/eventfd_select_interrupter.hpp>
+@@ -31,7 +31,7 @@ namespace boost {
+ namespace asio {
+ namespace detail {
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__)
++#if defined(BOOST_ASIO_WINDOWS) || defined(__SYMBIAN32__)
+ typedef socket_select_interrupter select_interrupter;
+ #elif defined(BOOST_ASIO_HAS_EVENTFD)
+ typedef eventfd_select_interrupter select_interrupter;
+--- boost_1_57_0/boost/asio/detail/select_reactor.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/select_reactor.hpp	2015-05-04 17:33:18.895498100 -0500
+@@ -51,13 +51,13 @@ class select_reactor
+   : public boost::asio::detail::service_base<select_reactor>
+ {
+ public:
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   enum op_types { read_op = 0, write_op = 1, except_op = 2,
+     max_select_ops = 3, connect_op = 3, max_ops = 4 };
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+   enum op_types { read_op = 0, write_op = 1, except_op = 2,
+     max_select_ops = 3, connect_op = 1, max_ops = 3 };
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+   // Per-descriptor data.
+   struct per_descriptor_data
+--- boost_1_57_0/boost/asio/detail/signal_blocker.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/signal_blocker.hpp	2015-05-04 17:33:18.898498400 -0500
+@@ -19,7 +19,7 @@
+ 
+ #if !defined(BOOST_ASIO_HAS_THREADS) || defined(BOOST_ASIO_WINDOWS) \
+   || defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  || defined(__CYGWIN__) || defined(__SYMBIAN32__)
++  || defined(__SYMBIAN32__)
+ # include <boost/asio/detail/null_signal_blocker.hpp>
+ #elif defined(BOOST_ASIO_HAS_PTHREADS)
+ # include <boost/asio/detail/posix_signal_blocker.hpp>
+@@ -33,7 +33,7 @@ namespace detail {
+ 
+ #if !defined(BOOST_ASIO_HAS_THREADS) || defined(BOOST_ASIO_WINDOWS) \
+   || defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  || defined(__CYGWIN__) || defined(__SYMBIAN32__)
++  || defined(__SYMBIAN32__)
+ typedef null_signal_blocker signal_blocker;
+ #elif defined(BOOST_ASIO_HAS_PTHREADS)
+ typedef posix_signal_blocker signal_blocker;
+--- boost_1_57_0/boost/asio/detail/signal_init.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/signal_init.hpp	2015-05-04 17:33:18.901998900 -0500
+@@ -17,7 +17,7 @@
+ 
+ #include <boost/asio/detail/config.hpp>
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <csignal>
+ 
+@@ -44,6 +44,6 @@ public:
+ 
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ #endif // BOOST_ASIO_DETAIL_SIGNAL_INIT_HPP
+--- boost_1_57_0/boost/asio/detail/signal_set_service.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/signal_set_service.hpp	2015-05-04 17:33:18.904999300 -0500
+@@ -28,9 +28,9 @@
+ #include <boost/asio/detail/signal_op.hpp>
+ #include <boost/asio/detail/socket_types.hpp>
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ # include <boost/asio/detail/reactor.hpp>
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/push_options.hpp>
+ 
+@@ -183,8 +183,7 @@ private:
+   io_service_impl& io_service_;
+ 
+ #if !defined(BOOST_ASIO_WINDOWS) \
+-  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
+-  && !defined(__CYGWIN__)
++  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+   // The type used for registering for pipe reactor notifications.
+   class pipe_read_op;
+ 
+@@ -195,7 +194,6 @@ private:
+   reactor::per_descriptor_data reactor_data_;
+ #endif // !defined(BOOST_ASIO_WINDOWS)
+        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+-       //   && !defined(__CYGWIN__)
+ 
+   // A mapping from signal number to the registered signal sets.
+   registration* registrations_[max_signal_number];
+--- boost_1_57_0/boost/asio/detail/socket_ops.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/socket_ops.hpp	2015-05-04 17:33:18.907999600 -0500
+@@ -128,11 +128,11 @@ BOOST_ASIO_DECL size_t available(socket_
+ BOOST_ASIO_DECL int listen(socket_type s,
+     int backlog, boost::system::error_code& ec);
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ typedef WSABUF buf;
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+ typedef iovec buf;
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ BOOST_ASIO_DECL void init_buf(buf& b, void* data, size_t size);
+ 
+--- boost_1_57_0/boost/asio/detail/socket_select_interrupter.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/socket_select_interrupter.hpp	2015-05-04 17:33:18.912500200 -0500
+@@ -20,7 +20,6 @@
+ #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ 
+ #if defined(BOOST_ASIO_WINDOWS) \
+-  || defined(__CYGWIN__) \
+   || defined(__SYMBIAN32__)
+ 
+ #include <boost/asio/detail/socket_types.hpp>
+@@ -85,7 +84,6 @@ private:
+ #endif // defined(BOOST_ASIO_HEADER_ONLY)
+ 
+ #endif // defined(BOOST_ASIO_WINDOWS)
+-       // || defined(__CYGWIN__)
+        // || defined(__SYMBIAN32__)
+ 
+ #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME)
+--- boost_1_57_0/boost/asio/detail/socket_types.hpp	2015-05-04 17:16:30.021887400 -0500
++++ boost_1_57_0/boost/asio/detail/socket_types.hpp	2015-05-04 17:33:18.915500600 -0500
+@@ -19,7 +19,7 @@
+ 
+ #if defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ // Empty.
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+ # if defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_)
+ #  error WinSock.h has already been included
+ # endif // defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_)
+@@ -169,7 +169,7 @@ typedef int signed_size_type;
+ # define BOOST_ASIO_OS_DEF_AI_V4MAPPED 0x800
+ # define BOOST_ASIO_OS_DEF_AI_ALL 0x100
+ # define BOOST_ASIO_OS_DEF_AI_ADDRCONFIG 0x400
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+ typedef SOCKET socket_type;
+ const SOCKET invalid_socket = INVALID_SOCKET;
+ const int socket_error_retval = SOCKET_ERROR;
+--- boost_1_57_0/boost/asio/detail/win_fd_set_adapter.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/win_fd_set_adapter.hpp	2015-05-04 17:33:18.919001000 -0500
+@@ -17,7 +17,7 @@
+ 
+ #include <boost/asio/detail/config.hpp>
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/noncopyable.hpp>
+ #include <boost/asio/detail/reactor_op_queue.hpp>
+@@ -146,6 +146,6 @@ private:
+ 
+ #include <boost/asio/detail/pop_options.hpp>
+ 
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ #endif // BOOST_ASIO_DETAIL_WIN_FD_SET_ADAPTER_HPP
+--- boost_1_57_0/boost/asio/detail/winsock_init.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/detail/winsock_init.hpp	2015-05-04 17:33:18.923501600 -0500
+@@ -17,7 +17,7 @@
+ 
+ #include <boost/asio/detail/config.hpp>
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/push_options.hpp>
+ 
+@@ -125,6 +125,6 @@ static const winsock_init<>& winsock_ini
+ # include <boost/asio/detail/impl/winsock_init.ipp>
+ #endif // defined(BOOST_ASIO_HEADER_ONLY)
+ 
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+ 
+ #endif // BOOST_ASIO_DETAIL_WINSOCK_INIT_HPP
+--- boost_1_57_0/boost/asio/error.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/error.hpp	2015-05-04 17:33:18.926502000 -0500
+@@ -20,7 +20,6 @@
+ #include <boost/system/error_code.hpp>
+ #include <boost/system/system_error.hpp>
+ #if defined(BOOST_ASIO_WINDOWS) \
+-  || defined(__CYGWIN__) \
+   || defined(BOOST_ASIO_WINDOWS_RUNTIME)
+ # include <winerror.h>
+ #else
+@@ -45,7 +44,7 @@
+ # define BOOST_ASIO_NETDB_ERROR(e) __HRESULT_FROM_WIN32(WSA ## e)
+ # define BOOST_ASIO_GETADDRINFO_ERROR(e) __HRESULT_FROM_WIN32(WSA ## e)
+ # define BOOST_ASIO_WIN_OR_POSIX(e_win, e_posix) e_win
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+ # define BOOST_ASIO_NATIVE_ERROR(e) e
+ # define BOOST_ASIO_SOCKET_ERROR(e) WSA ## e
+ # define BOOST_ASIO_NETDB_ERROR(e) WSA ## e
+@@ -225,7 +224,7 @@ inline const boost::system::error_catego
+   return boost::system::system_category();
+ }
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ 
+ extern BOOST_ASIO_DECL
+ const boost::system::error_category& get_netdb_category();
+@@ -233,7 +232,7 @@ const boost::system::error_category& get
+ extern BOOST_ASIO_DECL
+ const boost::system::error_category& get_addrinfo_category();
+ 
+-#else // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#else // !defined(BOOST_ASIO_WINDOWS)
+ 
+ inline const boost::system::error_category& get_netdb_category()
+ {
+@@ -245,7 +244,7 @@ inline const boost::system::error_catego
+   return get_system_category();
+ }
+ 
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ extern BOOST_ASIO_DECL
+ const boost::system::error_category& get_misc_category();
+--- boost_1_57_0/boost/asio/impl/error.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/impl/error.ipp	2015-05-04 17:33:18.931002600 -0500
+@@ -25,7 +25,7 @@ namespace boost {
+ namespace asio {
+ namespace error {
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ 
+ namespace detail {
+ 
+@@ -87,7 +87,7 @@ const boost::system::error_category& get
+   return instance;
+ }
+ 
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ namespace detail {
+ 
+--- boost_1_57_0/boost/asio/impl/serial_port_base.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/impl/serial_port_base.ipp	2015-05-04 17:33:18.936503300 -0500
+@@ -27,7 +27,7 @@
+ 
+ #if defined(GENERATING_DOCUMENTATION)
+ # define BOOST_ASIO_OPTION_STORAGE implementation_defined
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+ # define BOOST_ASIO_OPTION_STORAGE DCB
+ #else
+ # define BOOST_ASIO_OPTION_STORAGE termios
+@@ -41,7 +41,7 @@ namespace asio {
+ boost::system::error_code serial_port_base::baud_rate::store(
+     BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   storage.BaudRate = value_;
+ #else
+   speed_t baud;
+@@ -128,7 +128,7 @@ boost::system::error_code serial_port_ba
+ boost::system::error_code serial_port_base::baud_rate::load(
+     const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   value_ = storage.BaudRate;
+ #else
+   speed_t baud = ::cfgetospeed(&storage);
+@@ -221,7 +221,7 @@ serial_port_base::flow_control::flow_con
+ boost::system::error_code serial_port_base::flow_control::store(
+     BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   storage.fOutxCtsFlow = FALSE;
+   storage.fOutxDsrFlow = FALSE;
+   storage.fTXContinueOnXoff = TRUE;
+@@ -288,7 +288,7 @@ boost::system::error_code serial_port_ba
+ boost::system::error_code serial_port_base::flow_control::load(
+     const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   if (storage.fOutX && storage.fInX)
+   {
+     value_ = software;
+@@ -339,7 +339,7 @@ serial_port_base::parity::parity(serial_
+ boost::system::error_code serial_port_base::parity::store(
+     BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   switch (value_)
+   {
+   case none:
+@@ -386,7 +386,7 @@ boost::system::error_code serial_port_ba
+ boost::system::error_code serial_port_base::parity::load(
+     const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   if (storage.Parity == EVENPARITY)
+   {
+     value_ = even;
+@@ -434,7 +434,7 @@ serial_port_base::stop_bits::stop_bits(
+ boost::system::error_code serial_port_base::stop_bits::store(
+     BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   switch (value_)
+   {
+   case one:
+@@ -470,7 +470,7 @@ boost::system::error_code serial_port_ba
+ boost::system::error_code serial_port_base::stop_bits::load(
+     const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   if (storage.StopBits == ONESTOPBIT)
+   {
+     value_ = one;
+@@ -507,7 +507,7 @@ serial_port_base::character_size::charac
+ boost::system::error_code serial_port_base::character_size::store(
+     BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   storage.ByteSize = value_;
+ #else
+   storage.c_cflag &= ~CSIZE;
+@@ -527,7 +527,7 @@ boost::system::error_code serial_port_ba
+ boost::system::error_code serial_port_base::character_size::load(
+     const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec)
+ {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   value_ = storage.ByteSize;
+ #else
+   if ((storage.c_cflag & CSIZE) == CS5) { value_ = 5; }
+--- boost_1_57_0/boost/asio/io_service.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/io_service.hpp	2015-05-04 17:33:18.940003700 -0500
+@@ -24,7 +24,7 @@
+ #include <boost/asio/detail/wrapped_handler.hpp>
+ #include <boost/system/error_code.hpp>
+ 
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+ # include <boost/asio/detail/winsock_init.hpp>
+ #elif defined(__sun) || defined(__QNX__) || defined(__hpux) || defined(_AIX) \
+   || defined(__osf__)
+@@ -600,7 +600,7 @@ public:
+   friend bool has_service(io_service& ios);
+ 
+ private:
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+   detail::winsock_init<> init_;
+ #elif defined(__sun) || defined(__QNX__) || defined(__hpux) || defined(_AIX) \
+   || defined(__osf__)
+--- boost_1_57_0/boost/asio/serial_port_base.hpp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/serial_port_base.hpp	2015-05-04 17:33:18.943004100 -0500
+@@ -21,16 +21,16 @@
+ #if defined(BOOST_ASIO_HAS_SERIAL_PORT) \
+   || defined(GENERATING_DOCUMENTATION)
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+ # include <termios.h>
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ #include <boost/asio/detail/socket_types.hpp>
+ #include <boost/system/error_code.hpp>
+ 
+ #if defined(GENERATING_DOCUMENTATION)
+ # define BOOST_ASIO_OPTION_STORAGE implementation_defined
+-#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#elif defined(BOOST_ASIO_WINDOWS)
+ # define BOOST_ASIO_OPTION_STORAGE DCB
+ #else
+ # define BOOST_ASIO_OPTION_STORAGE termios
+--- boost_1_57_0/boost/asio/ssl/detail/impl/openssl_init.ipp	2014-10-17 17:49:08.000000000 -0500
++++ boost_1_57_0/boost/asio/ssl/detail/impl/openssl_init.ipp	2015-05-04 17:33:18.946504500 -0500
+@@ -85,15 +85,15 @@ public:
+ private:
+   static unsigned long openssl_id_func()
+   {
+-#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_ASIO_WINDOWS)
+     return ::GetCurrentThreadId();
+-#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#else // defined(BOOST_ASIO_WINDOWS)
+     void* id = instance()->thread_id_;
+     if (id == 0)
+       instance()->thread_id_ = id = &id; // Ugh.
+     BOOST_ASIO_ASSERT(sizeof(unsigned long) >= sizeof(void*));
+     return reinterpret_cast<unsigned long>(id);
+-#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_ASIO_WINDOWS)
+   }
+ 
+   static void openssl_locking_func(int mode, int n, 
+@@ -109,10 +109,10 @@ private:
+   std::vector<boost::asio::detail::shared_ptr<
+         boost::asio::detail::mutex> > mutexes_;
+ 
+-#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#if !defined(BOOST_ASIO_WINDOWS)
+   // The thread identifiers to be used by openssl.
+   boost::asio::detail::tss_ptr<void> thread_id_;
+-#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
++#endif // !defined(BOOST_ASIO_WINDOWS)
+ 
+ #if !defined(SSL_OP_NO_COMPRESSION) \
+   && (OPENSSL_VERSION_NUMBER >= 0x00908000L)
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch
new file mode 100644
index 00000000000..97acc72689d
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch
@@ -0,0 +1,76 @@
+--- boost_1_57_0/boost/config/platform/cygwin.hpp	2015-05-04 18:02:21.742811600 -0500
++++ boost_1_57_0/boost/config/platform/cygwin.hpp	2015-05-04 17:16:30.183407900 -0500
+@@ -39,18 +39,8 @@
+ #define BOOST_HAS_STDINT_H
+ #endif
+ 
+-/// Cygwin has no fenv.h
+-#define BOOST_NO_FENV_H
+-
+ // boilerplate code:
+ #include <boost/config/posix_features.hpp>
+-
+-//
+-// Cygwin lies about XSI conformance, there is no nl_types.h:
+-//
+-#ifdef BOOST_HAS_NL_TYPES_H
+-#  undef BOOST_HAS_NL_TYPES_H
+-#endif
+  
+ 
+ 
+--- boost_1_57_0/boost/config/stdlib/libstdcpp3.hpp	2014-10-26 07:36:42.000000000 -0500
++++ boost_1_57_0/boost/config/stdlib/libstdcpp3.hpp	2015-05-04 17:54:44.835791700 -0500
+@@ -68,7 +68,7 @@
+ #endif
+ 
+ // Apple doesn't seem to reliably defined a *unix* macro
+-#if !defined(CYGWIN) && (  defined(__unix__)  \
++#if (  defined(__unix__)  \
+                         || defined(__unix)    \
+                         || defined(unix)      \
+                         || defined(__APPLE__) \
+--- boost_1_57_0/boost/config/stdlib/sgi.hpp	2014-10-26 07:36:42.000000000 -0500
++++ boost_1_57_0/boost/config/stdlib/sgi.hpp	2015-05-04 17:54:52.911817300 -0500
+@@ -41,7 +41,7 @@
+ #endif
+ 
+ // Apple doesn't seem to reliably defined a *unix* macro
+-#if !defined(CYGWIN) && (  defined(__unix__)  \
++#if (  defined(__unix__)  \
+                         || defined(__unix)    \
+                         || defined(unix)      \
+                         || defined(__APPLE__) \
+--- boost_1_57_0/boost/config/stdlib/stlport.hpp	2014-10-26 07:36:42.000000000 -0500
++++ boost_1_57_0/boost/config/stdlib/stlport.hpp	2015-05-04 17:55:00.621796300 -0500
+@@ -17,7 +17,7 @@
+ #endif
+ 
+ // Apple doesn't seem to reliably defined a *unix* macro
+-#if !defined(CYGWIN) && (  defined(__unix__)  \
++#if (  defined(__unix__)  \
+                         || defined(__unix)    \
+                         || defined(unix)      \
+                         || defined(__APPLE__) \
+--- boost_1_57_0/boost/config/stdlib/vacpp.hpp	2014-10-26 07:36:42.000000000 -0500
++++ boost_1_57_0/boost/config/stdlib/vacpp.hpp	2015-05-04 17:55:07.424660200 -0500
+@@ -13,7 +13,7 @@
+ #define BOOST_NO_STD_MESSAGES
+ 
+ // Apple doesn't seem to reliably defined a *unix* macro
+-#if !defined(CYGWIN) && (  defined(__unix__)  \
++#if (  defined(__unix__)  \
+                         || defined(__unix)    \
+                         || defined(unix)      \
+                         || defined(__APPLE__) \
+--- boost_1_57_0/boost/predef/os/cygwin.h	2014-07-10 08:53:53.000000000 -0500
++++ boost_1_57_0/boost/predef/os/cygwin.h	2015-05-04 17:57:31.634472500 -0500
+@@ -29,7 +29,7 @@ http://www.boost.org/LICENSE_1_0.txt)
+     defined(__CYGWIN__) \
+     )
+ #   undef BOOST_OS_CYGWIN
+-#   define BOOST_OS_CGYWIN BOOST_VERSION_NUMBER_AVAILABLE
++#   define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER_AVAILABLE
+ #endif
+ 
+ #if BOOST_OS_CYGWIN
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch
new file mode 100644
index 00000000000..3d9726179be
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch
@@ -0,0 +1,600 @@
+--- boost_1_57_0/libs/context/build/Jamfile.v2	2014-10-20 01:26:00.000000000 -0500
++++ boost_1_57_0/libs/context/build/Jamfile.v2	2015-05-04 17:43:10.812161900 -0500
+@@ -29,6 +29,7 @@ local rule default_binary_format ( )
+     local tmp = elf ;
+     if [ os.name ] = "MACOSX" { tmp = mach-o ; }
+     if [ os.name ] = "NT" { tmp = pe ; }
++    if [ os.name ] = "CYGWIN" { tmp = pe ; }
+     if [ os.name ] = "AIX" { tmp = xcoff ; }
+     return $(tmp) ;
+ }
+@@ -581,6 +582,16 @@ alias asm_context_sources
+    ;
+ 
+ alias asm_context_sources
++   : asm/make_i386_ms_pe_gas.S
++     asm/jump_i386_ms_pe_gas.S
++     dummy.cpp
++   : <address-model>32
++     <architecture>x86
++     <binary-format>pe
++     <toolset>gcc
++   ;
++
++alias asm_context_sources
+    : asm/make_i386_ms_pe_masm.asm
+      asm/jump_i386_ms_pe_masm.asm
+      dummy.cpp
+@@ -715,6 +726,16 @@ alias asm_context_sources
+    ;
+ 
+ alias asm_context_sources
++   : asm/make_x86_64_ms_pe_gas.S
++     asm/jump_x86_64_ms_pe_gas.S
++     dummy.cpp
++   : <address-model>64
++     <architecture>x86
++     <binary-format>pe
++     <toolset>gcc
++   ;
++
++alias asm_context_sources
+    : asm/make_x86_64_ms_pe_masm.asm
+      asm/jump_x86_64_ms_pe_masm.asm
+      dummy.cpp
+--- boost_1_57_0/libs/context/src/asm/jump_i386_ms_pe_gas.S	1969-12-31 18:00:00.000000000 -0600
++++ boost_1_57_0/libs/context/src/asm/jump_i386_ms_pe_gas.S	2015-05-04 17:43:10.821663100 -0500
+@@ -0,0 +1,108 @@
++/*
++            Copyright Oliver Kowalke 2009.
++            Copyright Thomas Sailer 2013.
++   Distributed under the Boost Software License, Version 1.0.
++      (See accompanying file LICENSE_1_0.txt or copy at
++            http://www.boost.org/LICENSE_1_0.txt)
++*/
++
++/********************************************************************
++ *                                                                  *
++ *  --------------------------------------------------------------  *
++ *  |    0    |    1    |    2    |    3    |    4     |    5    |  *
++ *  --------------------------------------------------------------  *
++ *  |    0h   |   04h   |   08h   |   0ch   |   010h   |   014h  |  *
++ *  --------------------------------------------------------------  *
++ *  |   EDI   |   ESI   |   EBX   |   EBP   |   ESP    |   EIP   |  *
++ *  --------------------------------------------------------------  *
++ *  --------------------------------------------------------------  *
++ *  |    6    |    7    |    8    |                              |  *
++ *  --------------------------------------------------------------  *
++ *  |   018h  |   01ch  |   020h  |                              |  *
++ *  --------------------------------------------------------------  *
++ *  |    sp   |   size  |  limit  |                              |  *
++ *  --------------------------------------------------------------  *
++ *  --------------------------------------------------------------  *
++ *  |    9    |                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  |  024h   |                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  |fc_execpt|                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  --------------------------------------------------------------  *
++ *  |   10    |                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  |  028h   |                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  |fc_strage|                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  --------------------------------------------------------------  *
++ *  |   11    |    12   |                                        |  *
++ *  --------------------------------------------------------------  *
++ *  |  02ch   |   030h  |                                        |  *
++ *  --------------------------------------------------------------  *
++ *  | fc_mxcsr|fc_x87_cw|                                        |  *
++ *  --------------------------------------------------------------  *
++ *                                                                  *
++ * *****************************************************************/
++
++.file	"jump_i386_ms_pe_gas.S"
++.text
++.p2align 4,,15
++.globl	_jump_fcontext
++.def	_jump_fcontext;	.scl	2;	.type	32;	.endef
++_jump_fcontext:
++    movl    0x04(%esp), %ecx        /* load address of the first fcontext_t arg */
++    movl    %edi,       (%ecx)      /* save EDI */
++    movl    %esi,       0x04(%ecx)  /* save ESI */
++    movl    %ebx,       0x08(%ecx)  /* save EBX */
++    movl    %ebp,       0x0c(%ecx)  /* save EBP */
++
++    movl    %fs:(0x18), %edx        /* load NT_TIB */
++    movl    (%edx),     %eax        /* load current SEH exception list */
++    movl    %eax,       0x24(%ecx)  /* save current exception list */
++    movl    0x04(%edx), %eax        /* load current stack base */
++    movl    %eax,       0x18(%ecx)  /* save current stack base */
++    movl    0x08(%edx), %eax        /* load current stack limit */
++    movl    %eax,       0x20(%ecx)  /* save current stack limit */
++    movl    0x10(%edx), %eax        /* load fiber local storage */
++    movl    %eax,       0x28(%ecx)  /* save fiber local storage */
++
++    leal    0x04(%esp), %eax        /* exclude the return address */
++    movl    %eax,       0x10(%ecx)  /* save as stack pointer */
++    movl    (%esp),     %eax        /* load return address */
++    movl    %eax,       0x14(%ecx)  /* save return address */
++
++    movl    0x08(%esp), %edx        /* load address of the second fcontext_t arg */
++    movl    (%edx),     %edi        /* restore EDI */
++    movl    0x04(%edx), %esi        /* restore ESI */
++    movl    0x08(%edx), %ebx        /* restore EBX */
++    movl    0x0c(%edx), %ebp        /* restore EBP */
++
++    movl    0x10(%esp), %eax        /* check if fpu enve preserving was requested */
++    testl   %eax,       %eax 
++    je      1f
++
++    stmxcsr 0x2c(%ecx)              /* save MMX control word */
++    fnstcw  0x30(%ecx)              /* save x87 control word */
++    ldmxcsr 0x2c(%edx)              /* restore MMX control word */
++    fldcw   0x30(%edx)              /* restore x87 control word */
++1:
++    movl    %edx,       %ecx        
++    movl    %fs:(0x18), %edx        /* load NT_TIB */
++    movl    0x24(%ecx), %eax        /* load SEH exception list */
++    movl    %eax,       (%edx)      /* restore next SEH item */
++    movl    0x18(%ecx), %eax        /* load stack base */
++    movl    %eax,       0x04(%edx)  /* restore stack base */
++    movl    0x20(%ecx), %eax        /* load stack limit */
++    movl    %eax,       0x08(%edx)  /* restore stack limit */
++    movl    0x28(%ecx), %eax        /* load fiber local storage */
++    movl    %eax,       0x10(%edx)  /* restore fiber local storage */
++			            
++    movl    0x0c(%esp), %eax        /* use third arg as return value after jump */
++			            
++    movl    0x10(%ecx), %esp        /* restore ESP */
++    movl    %eax,       0x04(%esp)  /* use third arg as first arg in context function */
++    movl    0x14(%ecx), %ecx        /* fetch the address to return to */
++
++    jmp     *%ecx                   /* indirect jump to context */
+--- boost_1_57_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.S	1969-12-31 18:00:00.000000000 -0600
++++ boost_1_57_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.S	2015-05-04 17:43:10.829664200 -0500
+@@ -0,0 +1,189 @@
++/*
++            Copyright Oliver Kowalke 2009.
++            Copyright Thomas Sailer 2013.
++   Distributed under the Boost Software License, Version 1.0.
++      (See accompanying file LICENSE_1_0.txt or copy at
++            http://www.boost.org/LICENSE_1_0.txt)
++*/
++
++/****************************************************************************************
++ *                                                                                      *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    0    |    1    |    2    |    3    |    4     |    5    |    6    |    7    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |        R12        |         R13       |         R14        |        R15        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    8    |    9    |   10    |   11    |    12    |    13   |    14   |    15   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x20  |   0x24  |   0x28  |  0x2c   |   0x30   |   0x34  |   0x38  |   0x3c  |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |        RDI        |        RSI        |         RBX        |        RBP        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    16   |    17   |    18   |    19   |                                        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x40  |   0x44  |   0x48  |   0x4c  |                                        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |        RSP        |        RIP        |                                        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    20   |    21   |    22   |    23   |    24    |    25   |                   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x50  |   0x54  |   0x58  |   0x5c  |   0x60   |   0x64  |                   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |        sp         |       size        |        limit       |                   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    26   |   27    |                                                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x68  |   0x6c  |                                                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |      fbr_strg     |                                                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    28   |   29    |    30   |    31   |    32    |    33   |   34    |   35    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x70  |   0x74  |   0x78  |   0x7c  |   0x80   |   0x84  |  0x88   |  0x8c   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  | fc_mxcsr|fc_x87_cw|      fc_xmm       |      SEE registers (XMM6-XMM15)        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   36    |    37   |    38   |    39   |    40    |    41   |   42    |   43    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |  0x90   |   0x94  |   0x98  |   0x9c  |   0xa0   |   0xa4  |  0xa8   |  0xac   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    44    |   45    |    46   |    47  |    48    |    49   |   50    |   51    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0xb0   |  0xb4   |  0xb8   |  0xbc  |   0xc0   |   0xc4  |  0xc8   |  0xcc   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    52    |   53    |    54   |   55   |    56    |    57   |   58    |   59    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0xd0   |  0xd4   |   0xd8  |  0xdc  |   0xe0   |  0xe4   |  0xe8   |  0xec   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    60   |    61   |    62    |    63  |    64    |    65   |   66    |   67    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |  0xf0   |  0xf4   |   0xf8   |  0xfc  |   0x100  |  0x104  |  0x108  |  0x10c  |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    68   |    69   |    70    |    71  |    72    |    73   |   74    |   75    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |  0x110  |  0x114  |   0x118  |  0x11c |   0x120  |  0x124  |  0x128  |  0x12c  |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *                                                                                      *
++ * *************************************************************************************/
++
++.file	"jump_x86_64_ms_pe_gas.S"
++.text
++.p2align 4,,15
++.globl	jump_fcontext
++.def	jump_fcontext;	.scl	2;	.type	32;	.endef
++.seh_proc	jump_fcontext
++jump_fcontext:
++.seh_endprologue
++    movq    %r12,       (%rcx)      /* save R12 */
++    movq    %r13,       0x08(%rcx)  /* save R13 */
++    movq    %r14,       0x10(%rcx)  /* save R14 */
++    movq    %r15,       0x18(%rcx)  /* save R15 */
++    movq    %rdi,       0x20(%rcx)  /* save RDI */
++    movq    %rsi,       0x28(%rcx)  /* save RSI */
++    movq    %rbx,       0x30(%rcx)  /* save RBX */
++    movq    %rbp,       0x38(%rcx)  /* save RBP */
++
++    movq    %gs:(0x30), %r10        /* load NT_TIB */
++    movq    0x08(%r10), %rax        /* load current stack base */
++    movq    %rax,       0x50(%rcx)  /* save current stack base */
++    movq    0x10(%r10), %rax        /* load current stack limit */
++    movq    %rax,       0x60(%rcx)  /* save current stack limit */
++    movq    0x18(%r10), %rax        /* load fiber local storage */
++    movq    %rax,       0x68(%rcx)  /* save fiber local storage */
++
++    testq   %r9,        %r9
++    je      1f
++
++    stmxcsr 0x70(%rcx)              /* save MMX control and status word */
++    fnstcw  0x74(%rcx)              /* save x87 control word */
++    /* save XMM storage */
++    /* save start address of SSE register block in R10 */
++    leaq    0x90(%rcx), %r10
++    /* shift address in R10 to lower 16 byte boundary */
++    /* == pointer to SEE register block */
++    andq    $-16,       %r10
++
++    movaps  %xmm6,      (%r10)
++    movaps  %xmm7,      0x10(%r10)
++    movaps  %xmm8,      0x20(%r10)
++    movaps  %xmm9,      0x30(%r10)
++    movaps  %xmm10,     0x40(%r10)
++    movaps  %xmm11,     0x50(%r10)
++    movaps  %xmm12,     0x60(%r10)
++    movaps  %xmm13,     0x70(%r10)
++    movaps  %xmm14,     0x80(%r10)
++    movaps  %xmm15,     0x90(%r10)
++
++    ldmxcsr 0x70(%rdx)              /* restore MMX control and status word */
++    fldcw   0x74(%rdx)              /* restore x87 control word */
++    /* restore XMM storage */
++	/* save start address of SSE register block in R10 */
++    leaq    0x90(%rdx), %r10
++    /* shift address in R10 to lower 16 byte boundary */
++    /* == pointer to SEE register block */
++    andq    $-16,       %r10
++
++    movaps  (%r10),     %xmm6
++    movaps  0x10(%r10), %xmm7
++    movaps  0x20(%r10), %xmm8
++    movaps  0x30(%r10), %xmm9
++    movaps  0x40(%r10), %xmm10
++    movaps  0x50(%r10), %xmm11
++    movaps  0x60(%r10), %xmm12
++    movaps  0x70(%r10), %xmm13
++    movaps  0x80(%r10), %xmm14
++    movaps  0x90(%r10), %xmm15
++
++1:
++    leaq    0x08(%rsp), %rax        /* exclude the return address */
++    movq    %rax,       0x40(%rcx)  /* save as stack pointer */
++    movq    (%rsp),     %rax        /* load return address */
++    movq    %rax,       0x48(%rcx)  /* save return address */
++
++    movq    (%rdx),     %r12        /* restore R12 */
++    movq    0x08(%rdx), %r13        /* restore R13 */
++    movq    0x10(%rdx), %r14        /* restore R14 */
++    movq    0x18(%rdx), %r15        /* restore R15 */
++    movq    0x20(%rdx), %rdi        /* restore RDI */
++    movq    0x28(%rdx), %rsi        /* restore RSI */
++    movq    0x30(%rdx), %rbx        /* restore RBX */
++    movq    0x38(%rdx), %rbp        /* restore RBP */
++
++    movq    %gs:(0x30), %r10        /* load NT_TIB */
++    movq    0x50(%rdx), %rax        /* load stack base */
++    movq    %rax,       0x08(%r10)  /* restore stack base */
++    movq    0x60(%rdx), %rax        /* load stack limit */
++    movq    %rax,       0x10(%r10)  /* restore stack limit */
++    movq    0x68(%rdx), %rax        /* load fiber local storage */
++    movq    %rax,       0x18(%r10)  /* restore fiber local storage */
++
++    movq    0x40(%rdx), %rsp        /* restore RSP */
++    movq    0x48(%rdx), %r10        /* fetch the address to returned to */
++
++    movq    %r8,        %rax        /* use third arg as return value after jump */
++    movq    %r8,        %rcx        /* use third arg as first arg in context function */
++
++    jmp     *%r10                   /* indirect jump to caller */
++.seh_endproc
+--- boost_1_57_0/libs/context/src/asm/make_i386_ms_pe_gas.S	1969-12-31 18:00:00.000000000 -0600
++++ boost_1_57_0/libs/context/src/asm/make_i386_ms_pe_gas.S	2015-05-04 17:43:10.836165000 -0500
+@@ -0,0 +1,115 @@
++/*
++            Copyright Oliver Kowalke 2009.
++            Copyright Thomas Sailer 2013.
++   Distributed under the Boost Software License, Version 1.0.
++      (See accompanying file LICENSE_1_0.txt or copy at
++            http://www.boost.org/LICENSE_1_0.txt)
++*/
++
++/********************************************************************
++ *                                                                  *
++ *  --------------------------------------------------------------  *
++ *  |    0    |    1    |    2    |    3    |    4     |    5    |  *
++ *  --------------------------------------------------------------  *
++ *  |    0h   |   04h   |   08h   |   0ch   |   010h   |   014h  |  *
++ *  --------------------------------------------------------------  *
++ *  |   EDI   |   ESI   |   EBX   |   EBP   |   ESP    |   EIP   |  *
++ *  --------------------------------------------------------------  *
++ *  --------------------------------------------------------------  *
++ *  |    6    |    7    |    8    |                              |  *
++ *  --------------------------------------------------------------  *
++ *  |   018h  |   01ch  |   020h  |                              |  *
++ *  --------------------------------------------------------------  *
++ *  |    sp   |   size  |  limit  |                              |  *
++ *  --------------------------------------------------------------  *
++ *  --------------------------------------------------------------  *
++ *  |    9    |                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  |  024h   |                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  |fc_execpt|                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  --------------------------------------------------------------  *
++ *  |   10    |                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  |  028h   |                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  |fc_strage|                                                  |  *
++ *  --------------------------------------------------------------  *
++ *  --------------------------------------------------------------  *
++ *  |   11    |    12   |                                        |  *
++ *  --------------------------------------------------------------  *
++ *  |  02ch   |   030h  |                                        |  *
++ *  --------------------------------------------------------------  *
++ *  | fc_mxcsr|fc_x87_cw|                                        |  *
++ *  --------------------------------------------------------------  *
++ *                                                                  *
++ * *****************************************************************/
++
++.file	"make_i386_ms_pe_gas.S"
++.text
++.p2align 4,,15
++.globl	_make_fcontext
++.def	_make_fcontext;	.scl	2;	.type	32;	.endef
++_make_fcontext:
++    movl    0x04(%esp), %eax        /* load 1. arg of make_fcontext, pointer to context stack (base) */
++    leal    -0x34(%eax),%eax        /* reserve space for fcontext_t at top of context stack */
++
++    /* shift address in EAX to lower 16 byte boundary */
++    /* == pointer to fcontext_t and address of context stack */
++    andl    $-16,       %eax
++
++    movl    0x04(%esp), %ecx        /* load 1. arg of make_fcontext, pointer to context stack (base) */
++    movl    %ecx,       0x18(%eax)  /* save address of context stack (base) in fcontext_t */
++    movl    0x08(%esp), %edx        /* load 2. arg of make_fcontext, context stack size */
++    movl    %edx,       0x1c(%eax)  /* save context stack size in fcontext_t */
++    negl    %edx                    /* negate stack size for LEA instruction (== substraction) */
++    leal    (%ecx,%edx),%ecx        /* compute bottom address of context stack (limit) */
++    movl    %ecx,       0x20(%eax)  /* save address of context stack (limit) in fcontext_t */
++    movl    0x0c(%esp), %ecx        /* load 3. arg of make_fcontext, pointer to context function */
++    movl    %ecx,       0x14(%eax)  /* save address of context function in fcontext_t */
++
++    stmxcsr 0x02c(%eax)             /* save MMX control word */
++    fnstcw  0x030(%eax)             /* save x87 control word */
++
++    leal    -0x1c(%eax),%edx        /* reserve space for last frame and seh on context stack, (ESP - 0x4) % 16 == 0 */
++    movl    %edx,       0x10(%eax)  /* save address in EDX as stack pointer for context function */
++
++    movl    $finish,    %ecx        /* abs address of finish */
++    movl    %ecx,       (%edx)      /* save address of finish as return address for context function */
++                                    /* entered after context function returns */
++
++    /* traverse current seh chain to get the last exception handler installed by Windows */
++    /* note that on Windows Server 2008 and 2008 R2, SEHOP is activated by default */
++    /* the exception handler chain is tested for the presence of ntdll.dll!FinalExceptionHandler */
++    /* at its end by RaiseException all seh andlers are disregarded if not present and the */
++    /* program is aborted */
++    movl    %fs:(0x18), %ecx        /* load NT_TIB into ECX */
++
++walk:
++    movl    (%ecx),     %edx        /* load 'next' member of current SEH into EDX */
++    incl    %edx                    /* test if 'next' of current SEH is last (== 0xffffffff) */
++    jz      found
++    decl    %edx
++    xchgl    %ecx,      %edx        /* exchange content; ECX contains address of next SEH */
++    jmp     walk                    /* inspect next SEH */
++
++found:
++    movl    0x04(%ecx), %ecx        /* load 'handler' member of SEH == address of last SEH handler installed by Windows */
++    movl    0x10(%eax), %edx        /* load address of stack pointer for context function */
++    movl    %ecx,       0x18(%edx)  /* save address in ECX as SEH handler for context */
++    movl    $0xffffffff,%ecx        /* set ECX to -1 */
++    movl    %ecx,       0x14(%edx)  /* save ECX as next SEH item */
++    leal    0x14(%edx), %ecx        /* load address of next SEH item */
++    movl    %ecx,       0x24(%eax)  /* save next SEH */
++
++    ret
++
++finish:
++    /* ESP points to same address as ESP on entry of context function + 0x4 */
++    xorl    %eax,       %eax
++    movl    %eax,       (%esp)      /* exit code is zero */
++    call    __exit                  /* exit application */
++    hlt
++
++.def	__exit;	.scl	2;	.type	32;	.endef  /* standard C library function */
+--- boost_1_57_0/libs/context/src/asm/make_x86_64_ms_pe_gas.S	1969-12-31 18:00:00.000000000 -0600
++++ boost_1_57_0/libs/context/src/asm/make_x86_64_ms_pe_gas.S	2015-05-04 17:43:10.843165900 -0500
+@@ -0,0 +1,132 @@
++/*
++            Copyright Oliver Kowalke 2009.
++            Copyright Thomas Sailer 2013.
++   Distributed under the Boost Software License, Version 1.0.
++      (See accompanying file LICENSE_1_0.txt or copy at
++            http://www.boost.org/LICENSE_1_0.txt)
++*/
++
++/****************************************************************************************
++ *                                                                                      *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    0    |    1    |    2    |    3    |    4     |    5    |    6    |    7    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |        R12        |         R13       |         R14        |        R15        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    8    |    9    |   10    |   11    |    12    |    13   |    14   |    15   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x20  |   0x24  |   0x28  |  0x2c   |   0x30   |   0x34  |   0x38  |   0x3c  |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |        RDI        |        RSI        |         RBX        |        RBP        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    16   |    17   |    18   |    19   |                                        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x40  |   0x44  |   0x48  |   0x4c  |                                        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |        RSP        |        RIP        |                                        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    20   |    21   |    22   |    23   |    24    |    25   |                   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x50  |   0x54  |   0x58  |   0x5c  |   0x60   |   0x64  |                   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |        sp         |       size        |        limit       |                   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    26   |   27    |                                                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x68  |   0x6c  |                                                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |      fbr_strg     |                                                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    28   |   29    |    30   |    31   |    32    |    33   |   34    |   35    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0x70  |   0x74  |   0x78  |   0x7c  |   0x80   |   0x84  |  0x88   |  0x8c   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  | fc_mxcsr|fc_x87_cw|      fc_xmm       |      SEE registers (XMM6-XMM15)        |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   36    |    37   |    38   |    39   |    40    |    41   |   42    |   43    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |  0x90   |   0x94  |   0x98  |   0x9c  |   0xa0   |   0xa4  |  0xa8   |  0xac   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    44    |   45    |    46   |    47  |    48    |    49   |   50    |   51    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0xb0   |  0xb4   |  0xb8   |  0xbc  |   0xc0   |   0xc4  |  0xc8   |  0xcc   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    52    |   53    |    54   |   55   |    56    |    57   |   58    |   59    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |   0xd0   |  0xd4   |   0xd8  |  0xdc  |   0xe0   |  0xe4   |  0xe8   |  0xec   |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    60   |    61   |    62    |    63  |    64    |    65   |   66    |   67    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |  0xf0   |  0xf4   |   0xf8   |  0xfc  |   0x100  |  0x104  |  0x108  |  0x10c  |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |    68   |    69   |    70    |    71  |    72    |    73   |   74    |   75    |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |  0x110  |  0x114  |   0x118  |  0x11c |   0x120  |  0x124  |  0x128  |  0x12c  |  *
++ *  ----------------------------------------------------------------------------------  *
++ *  |                          SEE registers (XMM6-XMM15)                            |  *
++ *  ----------------------------------------------------------------------------------  *
++ *                                                                                      *
++ * *************************************************************************************/
++
++.file	"make_x86_64_ms_pe_gas.S"
++.text
++.p2align 4,,15
++.globl	make_fcontext
++.def	make_fcontext;	.scl	2;	.type	32;	.endef
++.seh_proc	make_fcontext
++make_fcontext:
++.seh_endprologue
++    leaq    -0x130(%rcx),%rax       /* reserve space for fcontext_t at top of context stack */
++
++    /* shift address in RAX to lower 16 byte boundary */
++    /* == pointer to fcontext_t and address of context stack */
++    andq    $-16,       %rax
++
++    movq    %r8,        0x48(%rax)  /* save address of context function in fcontext_t */
++    movq    %rdx,       0x58(%rax)  /* save context stack size in fcontext_t */
++    movq    %rcx,       0x50(%rax)  /* save address of context stack pointer (base) in fcontext_t */
++
++    negq    %rdx                    /* negate stack size for LEA instruction (== substraction) */
++    leaq    (%rcx,%rdx),%rcx        /* compute bottom address of context stack (limit) */
++    movq    %rcx,       0x60(%rax)  /* save bottom address of context stack (limit) in fcontext_t */
++
++    stmxcsr 0x70(%rax)              /* save MMX control and status word */
++    fnstcw  0x74(%rax)              /* save x87 control word */
++
++    leaq    -0x28(%rax),%rdx        /* reserve 32byte shadow space + return address on stack, (RSP - 0x8) % 16 == 0 */
++    movq    %rdx,       0x40(%rax)  /* save address in RDX as stack pointer for context function */
++
++    leaq    finish(%rip),%rcx       /* compute abs address of label finish */
++    movq    %rcx,(%rdx)             /* save address of finish as return address for context function */
++                                    /* entered after context function returns */
++
++    ret
++
++finish:
++    /* RSP points to same address as RSP on entry of context function + 0x8 */
++    xorq    %rcx,       %rcx        /* exit code is zero */
++    call    _exit                   /* exit application */
++    hlt
++.seh_endproc
++
++.def	_exit;	.scl	2;	.type	32;	.endef  /* standard C library function */
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch
new file mode 100644
index 00000000000..cbb5757746d
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch
@@ -0,0 +1,32 @@
+--- boost_1_57_0/libs/filesystem/src/operations.cpp	2014-10-29 10:34:00.000000000 -0500
++++ boost_1_57_0/libs/filesystem/src/operations.cpp	2015-05-04 23:30:34.278446000 -0500
+@@ -1966,8 +1966,7 @@ namespace
+   {
+     errno = 0;
+ 
+-#   if !defined(__CYGWIN__)\
+-    && defined(_POSIX_THREAD_SAFE_FUNCTIONS)\
++#   if defined(_POSIX_THREAD_SAFE_FUNCTIONS)\
+     && defined(_SC_THREAD_SAFE_FUNCTIONS)\
+     && (_POSIX_THREAD_SAFE_FUNCTIONS+0 >= 0)\
+     && (!defined(__hpux) || defined(_REENTRANT)) \
+--- boost_1_57_0/libs/filesystem/src/path.cpp	2014-10-29 10:34:00.000000000 -0500
++++ boost_1_57_0/libs/filesystem/src/path.cpp	2015-05-04 17:45:45.582315200 -0500
+@@ -36,7 +36,7 @@
+ # include "windows_file_codecvt.hpp"
+ # include <windows.h>
+ #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \
+- || defined(__FreeBSD__) || defined(__OPEN_BSD__)
++ || defined(__FreeBSD__) || defined(__OPEN_BSD__) || defined(__CYGWIN__)
+ # include <boost/filesystem/detail/utf8_codecvt_facet.hpp>
+ #endif
+ 
+@@ -831,7 +831,7 @@ namespace
+     std::locale global_loc = std::locale();
+     return std::locale(global_loc, new windows_file_codecvt);
+ # elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \
+-  || defined(__FreeBSD__) || defined(__OpenBSD__)
++  || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__)
+     // "All BSD system functions expect their string parameters to be in UTF-8 encoding
+     // and nothing else." See
+     // http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPInternational/Articles/FileEncodings.html
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch
new file mode 100644
index 00000000000..16208385a9b
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch
@@ -0,0 +1,81 @@
+--- boost_1_57_0/libs/locale/build/Jamfile.v2	2014-04-06 08:11:49.000000000 -0500
++++ boost_1_57_0/libs/locale/build/Jamfile.v2	2015-05-04 18:11:52.956846500 -0500
+@@ -261,7 +261,7 @@ rule configure-full ( properties * : fla
+ 
+     }
+         
+-    if ! $(found-iconv) && ! $(found-icu) && ! <target-os>windows in $(properties) && ! <target-os>cygwin in $(properties) 
++    if ! $(found-iconv) && ! $(found-icu) && ! <target-os>windows in $(properties) 
+     {
+         ECHO "- Boost.Locale needs either iconv or ICU library to be built." ;
+         result += <build>no ;
+@@ -298,7 +298,6 @@ rule configure-full ( properties * : fla
+     if ! <boost.locale.winapi> in $(properties:G)
+     {
+         if <target-os>windows in $(properties) 
+-          || <target-os>cygwin in $(properties)
+         {
+             properties += <boost.locale.winapi>on ;
+         }      
+@@ -335,7 +334,7 @@ rule configure-full ( properties * : fla
+     }
+     
+     if ( ! <boost.locale.winapi>off in $(properties) || ! <boost.locale.std>off in $(properties) )
+-       && ( <target-os>windows in $(properties) || <target-os>cygwin in $(properties) )
++       && <target-os>windows in $(properties)
+     {
+         result += <source>win32/lcid.cpp ;
+     }
+--- boost_1_57_0/libs/locale/src/encoding/codepage.cpp	2014-04-06 08:11:49.000000000 -0500
++++ boost_1_57_0/libs/locale/src/encoding/codepage.cpp	2015-05-04 23:16:01.778652600 -0500
+@@ -8,7 +8,7 @@
+ #define BOOST_LOCALE_SOURCE
+ #include <boost/config.hpp>
+ 
+-#if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_WINDOWS)
+ #define BOOST_LOCALE_WITH_WCONV
+ #endif
+ 
+--- boost_1_57_0/libs/locale/src/encoding/conv.hpp	2014-04-06 08:11:49.000000000 -0500
++++ boost_1_57_0/libs/locale/src/encoding/conv.hpp	2015-05-04 23:16:08.454000300 -0500
+@@ -59,7 +59,7 @@ namespace boost {
+                     return normalize_encoding(l).compare(normalize_encoding(r));
+                 }
+             
+-                #if defined(BOOST_WINDOWS)  || defined(__CYGWIN__)
++                #if defined(BOOST_WINDOWS)
+                 int encoding_to_windows_codepage(char const *ccharset);
+                 #endif
+             
+--- boost_1_57_0/libs/locale/src/util/default_locale.cpp	2014-04-06 08:11:49.000000000 -0500
++++ boost_1_57_0/libs/locale/src/util/default_locale.cpp	2015-05-04 23:16:16.311998100 -0500
+@@ -15,7 +15,7 @@
+ #  pragma warning(disable : 4996)
+ #endif
+ 
+-#if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_WINDOWS)
+ #ifndef NOMINMAX
+ #define NOMINMAX
+ #endif
+--- boost_1_57_0/libs/locale/test/test_codepage.cpp	2014-04-06 08:11:49.000000000 -0500
++++ boost_1_57_0/libs/locale/test/test_codepage.cpp	2015-05-04 23:16:40.883618300 -0500
+@@ -23,7 +23,7 @@
+ # include <locale.h>
+ #endif
+ 
+-#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__))
++#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS)
+ #ifndef NOMINMAX
+ # define NOMINMAX
+ #endif
+@@ -395,7 +395,7 @@ int main()
+         def.push_back("posix");
+         #endif
+ 
+-        #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__))
++        #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS)
+         test_iso_8859_8 = IsValidCodePage(28598)!=0;
+         #endif
+ 
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch
new file mode 100644
index 00000000000..a7748ec58d8
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch
@@ -0,0 +1,46 @@
+--- boost_1_57_0/boost/log/detail/config.hpp	2014-10-29 19:19:00.000000000 -0500
++++ boost_1_57_0/boost/log/detail/config.hpp	2015-05-04 17:56:38.663746100 -0500
+@@ -96,11 +96,6 @@
+ #   define BOOST_LOG_BROKEN_CONSTANT_EXPRESSIONS
+ #endif
+ 
+-#if defined(__CYGWIN__)
+-    // Boost.ASIO is broken on Cygwin
+-#   define BOOST_LOG_NO_ASIO
+-#endif
+-
+ #if !defined(BOOST_LOG_USE_NATIVE_SYSLOG) && defined(BOOST_LOG_NO_ASIO)
+ #   ifndef BOOST_LOG_WITHOUT_SYSLOG
+ #       define BOOST_LOG_WITHOUT_SYSLOG
+--- boost_1_57_0/libs/log/build/Jamfile.v2	2014-10-29 19:19:00.000000000 -0500
++++ boost_1_57_0/libs/log/build/Jamfile.v2	2015-05-04 22:16:49.242537800 -0500
+@@ -170,10 +170,6 @@ project boost/log
+         <target-os>windows:<library>ws2_32
+         <target-os>windows:<library>mswsock
+ 
+-        <target-os>cygwin:<define>__USE_W32_SOCKETS
+-        <target-os>cygwin:<library>ws2_32
+-        <target-os>cygwin:<library>mswsock
+-
+         <target-os>linux:<library>rt
+         <target-os>linux:<define>_XOPEN_SOURCE=600
+         <target-os>linux:<define>_GNU_SOURCE=1
+--- boost_1_57_0/libs/log/src/windows_version.hpp	2014-10-29 19:19:00.000000000 -0500
++++ boost_1_57_0/libs/log/src/windows_version.hpp	2015-05-04 23:17:08.281597400 -0500
+@@ -18,7 +18,7 @@
+ 
+ #include <boost/log/detail/config.hpp>
+ 
+-#if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
++#if defined(BOOST_WINDOWS)
+ 
+ #if defined(BOOST_LOG_USE_WINNT6_API)
+ 
+@@ -50,6 +50,6 @@
+ #define WIN32_LEAN_AND_MEAN
+ #endif
+ 
+-#endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
++#endif // defined(BOOST_WINDOWS)
+ 
+ #endif // BOOST_LOG_WINDOWS_VERSION_HPP_INCLUDED_
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch
new file mode 100644
index 00000000000..35e6905b0f3
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch
@@ -0,0 +1,77 @@
+--- boost_1_57_0/boost/smart_ptr/detail/atomic_count.hpp	2014-08-21 15:48:32.000000000 -0500
++++ boost_1_57_0/boost/smart_ptr/detail/atomic_count.hpp	2015-05-04 17:47:15.556740500 -0500
+@@ -79,7 +79,7 @@
+ #elif defined( BOOST_SP_HAS_SYNC )
+ # include <boost/smart_ptr/detail/atomic_count_sync.hpp>
+ 
+-#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
++#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
+ # include <boost/smart_ptr/detail/atomic_count_win32.hpp>
+ 
+ #elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
+--- boost_1_57_0/boost/smart_ptr/detail/lightweight_mutex.hpp	2014-08-21 15:48:32.000000000 -0500
++++ boost_1_57_0/boost/smart_ptr/detail/lightweight_mutex.hpp	2015-05-04 17:47:45.234509100 -0500
+@@ -32,7 +32,7 @@
+ #  include <boost/smart_ptr/detail/lwm_nop.hpp>
+ #elif defined(BOOST_HAS_PTHREADS)
+ #  include <boost/smart_ptr/detail/lwm_pthreads.hpp>
+-#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
++#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
+ #  include <boost/smart_ptr/detail/lwm_win32_cs.hpp>
+ #else
+ // Use #define BOOST_DISABLE_THREADS to avoid the error
+--- boost_1_57_0/boost/smart_ptr/detail/sp_counted_base.hpp	2014-08-21 15:48:32.000000000 -0500
++++ boost_1_57_0/boost/smart_ptr/detail/sp_counted_base.hpp	2015-05-04 17:47:45.240009800 -0500
+@@ -65,7 +65,7 @@
+ #elif defined(__GNUC__) && ( defined( __sparcv9 ) || ( defined( __sparcv8 ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 402 ) ) )
+ # include <boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp>
+ 
+-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined(__CYGWIN__)
++#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
+ # include <boost/smart_ptr/detail/sp_counted_base_w32.hpp>
+ 
+ #elif defined( _AIX )
+--- boost_1_57_0/boost/smart_ptr/detail/sp_interlocked.hpp	2014-08-21 15:48:32.000000000 -0500
++++ boost_1_57_0/boost/smart_ptr/detail/sp_interlocked.hpp	2015-05-04 17:48:39.316376700 -0500
+@@ -119,7 +119,7 @@ extern "C" long __cdecl _InterlockedExch
+ # define BOOST_SP_INTERLOCKED_EXCHANGE _InterlockedExchange
+ # define BOOST_SP_INTERLOCKED_EXCHANGE_ADD _InterlockedExchangeAdd
+ 
+-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ )
++#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
+ 
+ namespace boost
+ {
+--- boost_1_57_0/boost/smart_ptr/detail/spinlock.hpp	2014-08-21 15:48:32.000000000 -0500
++++ boost_1_57_0/boost/smart_ptr/detail/spinlock.hpp	2015-05-04 17:47:45.247510800 -0500
+@@ -49,7 +49,7 @@
+ #elif defined( BOOST_SP_HAS_SYNC )
+ #  include <boost/smart_ptr/detail/spinlock_sync.hpp>
+ 
+-#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
++#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
+ #  include <boost/smart_ptr/detail/spinlock_w32.hpp>
+ 
+ #elif defined(BOOST_HAS_PTHREADS)
+--- boost_1_57_0/boost/smart_ptr/detail/yield_k.hpp	2014-08-21 15:48:32.000000000 -0500
++++ boost_1_57_0/boost/smart_ptr/detail/yield_k.hpp	2015-05-04 17:47:45.253511600 -0500
+@@ -47,7 +47,7 @@ extern "C" void _mm_pause();
+ 
+ //
+ 
+-#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ )
++#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
+ 
+ #if defined( BOOST_USE_WINDOWS_H )
+ # include <windows.h>
+--- boost_1_57_0/libs/smart_ptr/test/sp_interlocked_test.cpp	2014-08-21 15:48:32.000000000 -0500
++++ boost_1_57_0/libs/smart_ptr/test/sp_interlocked_test.cpp	2015-05-04 23:18:21.717422600 -0500
+@@ -8,7 +8,7 @@
+ //  http://www.boost.org/LICENSE_1_0.txt
+ //
+ 
+-#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ )
++#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
+ 
+ #include <boost/smart_ptr/detail/sp_interlocked.hpp>
+ #include <boost/detail/lightweight_test.hpp>
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch
new file mode 100644
index 00000000000..e241f37f203
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch
@@ -0,0 +1,22 @@
+--- boost_1_57_0/boost/system/api_config.hpp	2014-08-03 15:44:11.000000000 -0500
++++ boost_1_57_0/boost/system/api_config.hpp	2015-05-04 17:51:31.189701800 -0500
+@@ -33,7 +33,7 @@
+ //    Standalone MinGW and all other known Windows compilers do predefine _WIN32
+ //    Compilers that predefine _WIN32 or __MINGW32__ do so for Windows 64-bit builds too.
+ 
+-# if defined(_WIN32) || defined(__CYGWIN__) // Windows default, including MinGW and Cygwin
++# if defined(_WIN32) // Windows default, including MinGW and Cygwin
+ #   define BOOST_WINDOWS_API
+ # else
+ #   define BOOST_POSIX_API 
+--- boost_1_57_0/boost/system/detail/error_code.ipp	2014-08-03 15:44:11.000000000 -0500
++++ boost_1_57_0/boost/system/detail/error_code.ipp	2015-05-04 17:51:02.925112700 -0500
+@@ -97,7 +97,7 @@ namespace
+       char buf[64];
+       char * bp = buf;
+       std::size_t sz = sizeof(buf);
+-  #  if defined(__CYGWIN__) || defined(__USE_GNU)
++  #  if defined(__GNU_VISIBLE) || defined(__USE_GNU)
+       // Oddball version of strerror_r
+       const char * c_str = strerror_r( ev, bp, sz );
+       return  c_str
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch
new file mode 100644
index 00000000000..b60a3ac49d3
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch
@@ -0,0 +1,22 @@
+diff --git a/libs/units/example/autoprefixes.cpp b/libs/units/example/autoprefixes.cpp
+index 8b2bc43..d04f2fe 100644
+--- a/libs/units/example/autoprefixes.cpp
++++ b/libs/units/example/autoprefixes.cpp
+@@ -67,7 +67,7 @@ struct thing_base_unit : boost::units::base_unit<thing_base_unit, boost::units::
+ struct euro_base_unit : boost::units::base_unit<euro_base_unit, boost::units::dimensionless_type, 5>
+ {
+   static const char* name() { return("EUR"); }
+-  static const char* symbol() { return("�"); }
++  static const char* symbol() { return("€"); }
+ };
+ 
+ int main()
+@@ -140,7 +140,7 @@ int main()
+ 
+   quantity<euro_base_unit::unit_type> ce = 2048. * euro_base_unit::unit_type();
+   cout << name_format << engineering_prefix << ce << endl;  // 2.048 kiloEUR
+-  cout << symbol_format << engineering_prefix << ce << endl;  // 2.048 k�
++  cout << symbol_format << engineering_prefix << ce << endl;  // 2.048 k€
+ 
+ 
+     return 0;
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch
new file mode 100644
index 00000000000..15ce4007675
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch
@@ -0,0 +1,122 @@
+Index: boost/pool/pool.hpp
+===================================================================
+--- a/boost/pool/pool.hpp	(revision 78317)
++++ b/boost/pool/pool.hpp	(revision 78326)
+@@ -27,4 +27,6 @@
+ #include <boost/pool/poolfwd.hpp>
+ 
++// std::numeric_limits
++#include <boost/limits.hpp>
+ // boost::math::static_lcm
+ #include <boost/math/common_factor_ct.hpp>
+@@ -358,4 +360,13 @@
+     }
+ 
++    size_type max_chunks() const
++    { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
++      size_type partition_size = alloc_size();
++      size_type POD_size = math::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
++      size_type max_chunks = (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
++    
++      return max_chunks;
++    }
++
+     static void * & nextof(void * const ptr)
+     { //! \returns Pointer dereferenced.
+@@ -377,5 +388,7 @@
+       //!   the first time that object needs to allocate system memory.
+       //!   The default is 32. This parameter may not be 0.
+-      //! \param nmax_size is the maximum number of chunks to allocate in one block.
++      //! \param nmax_size is the maximum number of chunks to allocate in one block.			
++      set_next_size(nnext_size);
++      set_max_size(nmax_size);
+     }
+ 
+@@ -400,7 +413,7 @@
+     }
+     void set_next_size(const size_type nnext_size)
+-    { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.
+-      //! \returns nnext_size.
+-      next_size = start_size = nnext_size;
++    { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.     
++      BOOST_USING_STD_MIN();
++      next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks());
+     }
+     size_type get_max_size() const
+@@ -410,5 +423,6 @@
+     void set_max_size(const size_type nmax_size)
+     { //! Set max_size.
+-      max_size = nmax_size;
++      BOOST_USING_STD_MIN();
++      max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks());
+     }
+     size_type get_requested_size() const
+@@ -713,7 +727,7 @@
+   BOOST_USING_STD_MIN();
+   if(!max_size)
+-    next_size <<= 1;
++    set_next_size(next_size << 1);
+   else if( next_size*partition_size/requested_size < max_size)
+-    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
++    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
+ 
+   //  initialize it,
+@@ -753,7 +767,7 @@
+   BOOST_USING_STD_MIN();
+   if(!max_size)
+-    next_size <<= 1;
++    set_next_size(next_size << 1);
+   else if( next_size*partition_size/requested_size < max_size)
+-    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
++    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
+ 
+   //  initialize it,
+@@ -797,4 +811,6 @@
+   //! \returns Address of chunk n if allocated ok.
+   //! \returns 0 if not enough memory for n chunks.
++  if (n > max_chunks())
++    return 0;
+ 
+   const size_type partition_size = alloc_size();
+@@ -845,7 +861,7 @@
+   BOOST_USING_STD_MIN();
+   if(!max_size)
+-    next_size <<= 1;
++    set_next_size(next_size << 1);
+   else if( next_size*partition_size/requested_size < max_size)
+-    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
++    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
+ 
+   //  insert it into the list,
+Index: libs/pool/test/test_bug_6701.cpp
+===================================================================
+--- a/libs/pool/test/test_bug_6701.cpp	(revision 78326)
++++ b/libs/pool/test/test_bug_6701.cpp	(revision 78326)
+@@ -0,0 +1,27 @@
++/* Copyright (C) 2012 Étienne Dupuis
++* 
++* Use, modification and distribution is subject to the 
++* Boost Software License, Version 1.0. (See accompanying
++* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
++*/
++
++// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701)
++
++#include <boost/pool/object_pool.hpp>
++#include <boost/limits.hpp>
++
++int main()
++{
++  boost::pool<> p(1024, std::numeric_limits<size_t>::max() / 768);
++
++  void *x = p.malloc();
++  BOOST_ASSERT(!x);
++  
++  BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size());
++  BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size());
++
++  void *y = p.ordered_malloc(std::numeric_limits<size_t>::max() / 768);
++  BOOST_ASSERT(!y);
++
++  return 0;
++}
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch
new file mode 100644
index 00000000000..b7c91284d9b
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch
@@ -0,0 +1,11 @@
+diff -urp boost_1_54_0-orig/boost/locale/boundary/segment.hpp boost_1_54_0/boost/locale/boundary/segment.hpp
+--- boost_1_54_0-orig/boost/locale/boundary/segment.hpp	2013-07-23 00:47:27.020787174 +0200
++++ boost_1_54_0/boost/locale/boundary/segment.hpp	2013-07-23 00:50:40.382959016 +0200
+@@ -27,7 +27,6 @@ namespace boundary {
+         int compare_text(LeftIterator l_begin,LeftIterator l_end,RightIterator r_begin,RightIterator r_end)
+         {
+             typedef LeftIterator left_iterator;
+-            typedef RightIterator right_iterator;
+             typedef typename std::iterator_traits<left_iterator>::value_type char_type;
+             typedef std::char_traits<char_type> traits;
+             while(l_begin!=l_end && r_begin!=r_end) {
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch
new file mode 100644
index 00000000000..6c1d0a021ed
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch
@@ -0,0 +1,14 @@
+diff -up ./boost/pool/pool.hpp~ ./boost/pool/pool.hpp
+--- a/boost/pool/pool.hpp~	2013-08-21 17:49:56.023296922 +0200
++++ b/boost/pool/pool.hpp	2013-08-22 11:38:01.133912638 +0200
+@@ -361,9 +361,7 @@ class pool: protected simple_segregated_
+     { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
+       size_type partition_size = alloc_size();
+       size_type POD_size = math::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
+-      size_type max_chunks = (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
+-    
+-      return max_chunks;
++      return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
+     }
+ 
+     static void * & nextof(void * const ptr)
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch
new file mode 100644
index 00000000000..8adf8ed2080
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch
@@ -0,0 +1,15 @@
+diff -up boost_1_53_0/boost/python/to_python_value.hpp\~ boost_1_53_0/boost/python/to_python_value.hpp
+--- boost_1_53_0/boost/python/to_python_value.hpp~	2007-12-16 11:12:07.000000000 +0100
++++ boost_1_53_0/boost/python/to_python_value.hpp	2013-07-23 16:19:02.518904596 +0200
+@@ -147,8 +147,8 @@ namespace detail
+   template <class T>
+   inline PyObject* registry_to_python_value<T>::operator()(argument_type x) const
+   {
+-      typedef converter::registered<argument_type> r;
+ # if BOOST_WORKAROUND(__GNUC__, < 3)
++      typedef converter::registered<argument_type> r;
+       // suppresses an ICE, somehow
+       (void)r::converters;
+ # endif 
+
+Diff finished.  Tue Jul 23 16:19:05 2013
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch
new file mode 100644
index 00000000000..cf9756e40ea
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch
@@ -0,0 +1,20 @@
+diff -up ./move/core.hpp~ ./move/core.hpp
+--- a/boost/move/core.hpp~	2015-02-09 17:33:35.000000000 +0100
++++ b/boost/move/core.hpp	2015-02-13 13:54:52.012130813 +0100
+@@ -43,6 +43,7 @@
+ #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED)
+ 
+    #include <boost/move/detail/meta_utils.hpp>
++   #include <boost/type_traits/is_class.hpp>
+ 
+    //Move emulation rv breaks standard aliasing rules so add workarounds for some compilers
+    #if defined(__GNUC__) && (__GNUC__ >= 4) && \
+@@ -65,7 +66,7 @@
+    template <class T>
+    class rv
+       : public ::boost::move_detail::if_c
+-         < ::boost::move_detail::is_class_or_union<T>::value
++         < ::boost::is_class<T>::value
+          , T
+          , ::boost::move_detail::nat
+          >::type
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch
new file mode 100644
index 00000000000..561cef19eb2
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch
@@ -0,0 +1,31 @@
+diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp
+--- boost_1_57_0/boost/mpl/print.hpp~	2014-07-09 23:12:31.000000000 +0200
++++ boost_1_57_0/boost/mpl/print.hpp	2015-01-20 12:44:59.621400948 +0100
+@@ -52,16 +52,15 @@ struct print
+     enum { n = sizeof(T) + -1 };
+ #elif defined(__MWERKS__)
+     void f(int);
+-#else 
+-    enum {
+-        n =
+-# if defined(__EDG_VERSION__)
+-           aux::dependent_unsigned<T>::value > -1
+-# else 
+-           sizeof(T) > -1
+-# endif 
+-        };
+-#endif 
++#elif defined(__EDG_VERSION__)
++    enum { n = aux::dependent_unsigned<T>::value > -1 };
++#elif defined(BOOST_GCC)
++    enum { n1 };
++    enum { n2 };
++    enum { n = n1 != n2 };
++#else
++    enum { n = sizeof(T) > -1 };
++#endif
+ };
+ 
+ #if defined(BOOST_MSVC)
+
+Diff finished.  Tue Jan 20 12:45:03 2015
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch
new file mode 100644
index 00000000000..57e6206bba1
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch
@@ -0,0 +1,33 @@
+diff -up boost_1_57_0/libs/pool/test/Jamfile.v2\~ boost_1_57_0/libs/pool/test/Jamfile.v2
+--- boost_1_57_0/libs/pool/test/Jamfile.v2~	2014-07-10 06:36:10.000000000 +0200
++++ boost_1_57_0/libs/pool/test/Jamfile.v2	2015-01-20 13:59:10.818700586 +0100
+@@ -28,17 +28,17 @@ explicit valgrind_config_check ;
+ local use-valgrind = [ check-target-builds valgrind_config_check "valgrind" : <testing.launcher>"valgrind --error-exitcode=1" : <build>no ] ;
+ 
+ test-suite pool :
+-    [ run test_simple_seg_storage.cpp ]
+-    [ run test_pool_alloc.cpp ]
+-    [ run pool_msvc_compiler_bug_test.cpp ]
+-    [ run test_msvc_mem_leak_detect.cpp ]
+-    [ run test_bug_3349.cpp ]
+-    [ run test_bug_4960.cpp ]
+-    [ run test_bug_1252.cpp ]
+-    [ run test_bug_2696.cpp ]
+-    [ run test_bug_5526.cpp ]
++    [ run test_simple_seg_storage.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_pool_alloc.cpp : : : <library>/boost/system//boost_system ]
++    [ run pool_msvc_compiler_bug_test.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_msvc_mem_leak_detect.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_bug_3349.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_bug_4960.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_bug_1252.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_bug_2696.cpp : : : <library>/boost/system//boost_system ]
++    [ run test_bug_5526.cpp : : : <library>/boost/system//boost_system ]
+     [ run test_threading.cpp : : : <threading>multi <library>/boost/thread//boost_thread <toolset>gcc:<cxxflags>-Wno-attributes <toolset>gcc:<cxxflags>-Wno-missing-field-initializers ]
+-    [ run  ../example/time_pool_alloc.cpp ]
++    [ run  ../example/time_pool_alloc.cpp : : : <library>/boost/system//boost_system ]
+     [ compile test_poisoned_macros.cpp ]
+ 
+ #
+
+Diff finished.  Tue Jan 20 13:59:16 2015
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch
new file mode 100644
index 00000000000..eb9ea14011f
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch
@@ -0,0 +1,10 @@
+--- a/boost/signals2/trackable.hpp
++++ b/boost/signals2/trackable.hpp
+@@ -18,6 +18,7 @@
+ 
+ #include <boost/assert.hpp>
+ #include <boost/shared_ptr.hpp>
++#include <boost/weak_ptr.hpp>
+ 
+ namespace boost {
+   namespace signals2 {
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch
new file mode 100644
index 00000000000..282962987c5
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch
@@ -0,0 +1,19 @@
+diff -up boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp\~ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
+--- boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp~	2014-10-13 12:21:40.000000000 +0200
++++ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp	2015-01-20 13:25:50.069710766 +0100
+@@ -282,12 +282,12 @@ struct grammar_definition
+ #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
+         typedef impl::grammar_helper_base<GrammarT> helper_base_t;
+         typedef grammar_helper_list<GrammarT> helper_list_t;
+-        typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
+ 
+         helper_list_t&  helpers =
+         grammartract_helper_list::do_(self);
+ 
+ # if defined(BOOST_INTEL_CXX_VERSION)
++        typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
+         for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i)
+             (*i)->undefine(self);
+ # else
+
+Diff finished.  Tue Jan 20 13:25:53 2015
diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch
new file mode 100644
index 00000000000..30ebb981b70
--- /dev/null
+++ b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch
@@ -0,0 +1,11 @@
+--- a/boost/uuid/detail/uuid_x86.hpp
++++ b/boost/uuid/detail/uuid_x86.hpp
+@@ -100,7 +100,7 @@ inline bool operator< (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT
+     cmp = (cmp - 1u) ^ cmp;
+     rcmp = (rcmp - 1u) ^ rcmp;
+ 
+-    return static_cast< uint16_t >(cmp) < static_cast< uint16_t >(rcmp);
++    return cmp < rcmp;
+ }
+ 
+ } // namespace uuids

From 9e99a66c24509c9e4d5078ca6a1b1a222c248ec2 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 4 Jun 2015 19:26:30 +0200
Subject: [PATCH 0772/2322] cygwin: make flex building on cygwin

---
 pkgs/development/tools/parsing/flex/2.5.39.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/parsing/flex/2.5.39.nix b/pkgs/development/tools/parsing/flex/2.5.39.nix
index f12f89f6e24..93d54803e7c 100644
--- a/pkgs/development/tools/parsing/flex/2.5.39.nix
+++ b/pkgs/development/tools/parsing/flex/2.5.39.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   propagatedNativeBuildInputs = [ m4 ];
 
-  postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+  postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
     sed -i Makefile -e 's/-no-undefined//;'
   '';
 

From a84e6336bd185238d47ea94895660d49149559d5 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 4 Jun 2015 20:23:36 +0200
Subject: [PATCH 0773/2322] cygwin: make coreutils build on cygwin

---
 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 f8dda538fd7..c65ed30dd71 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl, gmp ? null
 , aclSupport ? false, acl ? null
 , selinuxSupport? false, libselinux ? null, libsepol ? null
-, autoconf, automake114x
+, autoconf, automake114x, texinfo
 }:
 
 assert aclSupport -> acl != null;
@@ -29,7 +29,7 @@ let
     nativeBuildInputs = [ perl ];
     buildInputs = [ gmp ]
       ++ optional aclSupport acl
-      ++ optionals stdenv.isCygwin [ autoconf automake114x ]   # due to patch
+      ++ optionals stdenv.isCygwin [ autoconf automake114x texinfo ]   # due to patch
       ++ optionals selinuxSupport [ libselinux libsepol ];
 
     crossAttrs = {

From 14ee766024a7d1cf97e215c66d2193012ee346ca Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 18:15:50 -0500
Subject: [PATCH 0774/2322] openblas: set NUM_THREADS and USE_OPENMP

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

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 67d95f97e07..0597cbae77a 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -14,6 +14,8 @@ let local = config.openblas.preferLocalBuild or false;
         "DYNAMIC_ARCH=1"
         "NUM_THREADS=64"
         "BINARY=${binary}"
+        "USE_OPENMP=1"
+        "NUM_THREADS=64"
       ];
     localFlags = config.openblas.flags or
       optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ];

From 86fb034008b007e4e9a4a595f6d789e105958772 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 18:16:06 -0500
Subject: [PATCH 0775/2322] openblas: build with native-width integers by
 default

---
 .../science/math/openblas/default.nix         | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 0597cbae77a..ef76c33fb6d 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchurl, gfortran, perl, liblapack, config, coreutils }:
+{ stdenv, fetchurl, gfortran, perl, liblapack, config, coreutils
+# Most packages depending on openblas expect integer width to match pointer width,
+# but some expect to use 32-bit integers always (for compatibility with reference BLAS).
+, blas64 ? null
+}:
 
 with stdenv.lib;
 
 let local = config.openblas.preferLocalBuild or false;
     binary =
-      {
-        i686-linux = "32";
+      { i686-linux = "32";
         x86_64-linux = "64";
         x86_64-darwin = "64";
       }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
     genericFlags =
-      [
-        "DYNAMIC_ARCH=1"
-        "NUM_THREADS=64"
-        "BINARY=${binary}"
-        "USE_OPENMP=1"
+      [ "DYNAMIC_ARCH=1"
         "NUM_THREADS=64"
       ];
     localFlags = config.openblas.flags or
       optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ];
+    blas64Orig = blas64;
 in
 stdenv.mkDerivation rec {
   version = "0.2.14";
@@ -45,9 +45,13 @@ stdenv.mkDerivation rec {
       # thus is not an explicit dependency.
       "CC=${if stdenv.isDarwin then "clang" else "gcc"}"
       ''PREFIX="''$(out)"''
-      "INTERFACE64=1"
+      "BINARY=${binary}"
+      "USE_OPENMP=1"
+      "INTERFACE64=${if blas64 then "1" else "0"}"
     ];
 
+  blas64 = if blas64Orig != null then blas64Orig else hasPrefix "x86_64" stdenv.system;
+
   meta = with stdenv.lib; {
     description = "Basic Linear Algebra Subprograms";
     license = licenses.bsd3;

From a376a68f74eebeeee85e5f7a876d14f449623a17 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 06:27:20 -0500
Subject: [PATCH 0776/2322] openblas: add openblasCompat

openblasCompat uses 32-bit integers on all platforms for compatibility
with standard BLAS and LAPACK.
---
 pkgs/top-level/all-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b54674cb65..076e34b263c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13877,6 +13877,10 @@ let
     liblapack = liblapack_3_5_0;
   };
 
+  # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with
+  # standard BLAS and LAPACK.
+  openblasCompat = openblas.override { blas64 = false; };
+
   mathematica = callPackage ../applications/science/math/mathematica { };
   mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { };
 

From a0a5fb46ff889be6b5c66521a896f3e206d76e36 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 06:27:57 -0500
Subject: [PATCH 0777/2322] openblas: use default liblapack

---
 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 076e34b263c..0e74825b67d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13873,9 +13873,7 @@ let
 
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 
-  openblas = callPackage ../development/libraries/science/math/openblas {
-    liblapack = liblapack_3_5_0;
-  };
+  openblas = callPackage ../development/libraries/science/math/openblas { };
 
   # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with
   # standard BLAS and LAPACK.

From b4eb8a5bc32c99b8ee7c3fcd2d414ce10d39b437 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 06:28:37 -0500
Subject: [PATCH 0778/2322] openblas: remove old expressions

---
 .../science/math/openblas/0.2.10.nix          | 37 -------------------
 .../libraries/science/math/openblas/0.2.2.nix | 37 -------------------
 2 files changed, 74 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/openblas/0.2.10.nix
 delete mode 100644 pkgs/development/libraries/science/math/openblas/0.2.2.nix

diff --git a/pkgs/development/libraries/science/math/openblas/0.2.10.nix b/pkgs/development/libraries/science/math/openblas/0.2.10.nix
deleted file mode 100644
index ec4422ce895..00000000000
--- a/pkgs/development/libraries/science/math/openblas/0.2.10.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, gfortran, perl, liblapack, config }:
-
-let local = config.openblas.preferLocalBuild or false;
-    localTarget = config.openblas.target or "";
-in
-stdenv.mkDerivation rec {
-  version = "0.2.10";
-
-  name = "openblas-${version}";
-  src = fetchurl {
-    url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}";
-    sha256 = "06i0q4qnd5q5xljzrgvda0gjsczc6l2pl9hw6dn2qjpw38al73za";
-    name = "openblas-${version}.tar.gz";
-  };
-
-  preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz";
-
-  buildInputs = [gfortran perl];
-
-  cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
-
-  target = if local then localTarget else
-    if cpu == "i686" then "P2" else
-    if cpu == "x86_64" then "CORE2" else
-     # allow autodetect
-      "";
-
-  makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1";
-
-  meta = with stdenv.lib; {
-    description = "Basic Linear Algebra Subprograms";
-    license = licenses.bsd3;
-    homepage = "https://github.com/xianyi/OpenBLAS";
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/science/math/openblas/0.2.2.nix b/pkgs/development/libraries/science/math/openblas/0.2.2.nix
deleted file mode 100644
index c476dac955a..00000000000
--- a/pkgs/development/libraries/science/math/openblas/0.2.2.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, gfortran, perl, liblapack, config }:
-
-let local = config.openblas.preferLocalBuild or false;
-    localTarget = config.openblas.target or "";
-in
-stdenv.mkDerivation rec {
-  version = "0.2.2";
-
-  name = "openblas-${version}";
-  src = fetchurl {
-    url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}";
-    sha256 = "13kdx3knff5ajnmgn419g0dnh83plin07p7akwamr3v7z5qfrzqr";
-    name = "openblas-${version}.tar.gz";
-  };
-
-  preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz";
-
-  buildInputs = [gfortran perl];
-
-  cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
-
-  target = if local then localTarget else
-    if cpu == "i686" then "P2" else
-    if cpu == "x86_64" then "CORE2" else
-     # allow autodetect
-      "";
-
-  makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\"";
-
-  meta = with stdenv.lib; {
-    description = "Basic Linear Algebra Subprograms";
-    license = licenses.bsd3;
-    homepage = "https://github.com/xianyi/OpenBLAS";
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ ttuegel ];
-  };
-}

From 982aabc5617f144626a108fa6dc57bdcb9592e87 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 17:31:34 -0500
Subject: [PATCH 0779/2322] suitesparse_4_2: build with openblas

Compared to ATLAS, OpenBLAS offers better performance, faster builds,
and dynamic architecture detection.
---
 .../science/math/suitesparse/4.2.nix          | 34 +++++++++++++++----
 .../math/suitesparse/disable-metis.patch      | 18 ----------
 2 files changed, 28 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/suitesparse/disable-metis.patch

diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix
index 4d27701b135..16174a80212 100644
--- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix
@@ -1,22 +1,44 @@
-{ stdenv, fetchurl, blas, liblapack, gfortran } :
+{ stdenv, fetchurl, gfortran, openblas }:
+
+let
+  int_t = if openblas.blas64 then "int64_t" else "int32_t";
+in
 stdenv.mkDerivation rec {
   version = "4.2.1";
   name = "suitesparse-${version}";
   src = fetchurl {
     url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ;
-    sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8";  			
+    sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8";
   };
-  buildInputs = [blas liblapack gfortran] ;
-  patches = [./disable-metis.patch];
+
+  nativeBuildInputs = [ gfortran ];
+  buildInputs = [ openblas ];
 
   preConfigure = ''
-    export PREFIX=$out
     mkdir -p $out/lib
     mkdir -p $out/include
+
+    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
+        -e 's/METIS .*$/METIS =/' \
+        -e 's/METIS_PATH .*$/METIS_PATH =/' \
+        -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \
+        -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/'
   '';
 
-  makeFlags = ''PREFIX=\"$(out)\" INSTALL_LIB=$(out)/lib INSTALL_INCLUDE=$(out)/include'';
+  makeFlags = [
+    "PREFIX=\"$(out)\""
+    "INSTALL_LIB=$(out)/lib"
+    "INSTALL_INCLUDE=$(out)/include"
+    "BLAS=-lopenblas"
+    "LAPACK="
+  ];
 
   NIX_CFLAGS = "-fPIC";
 
+  meta = with stdenv.lib; {
+    homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html;
+    description = "A suite of sparse matrix algorithms";
+    license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ];
+    maintainers = with maintainers; [ ttuegel ];
+  };
 }
diff --git a/pkgs/development/libraries/science/math/suitesparse/disable-metis.patch b/pkgs/development/libraries/science/math/suitesparse/disable-metis.patch
deleted file mode 100644
index 5b735eb7d3c..00000000000
--- a/pkgs/development/libraries/science/math/suitesparse/disable-metis.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nrc SuiteSparse/UMFPACK/Demo/Makefile SuiteSparse-new/UMFPACK/Demo/Makefile
-*** SuiteSparse/UMFPACK/Demo/Makefile	2009-11-11 21:09:45.000000000 +0100
---- SuiteSparse-new/UMFPACK/Demo/Makefile	2010-08-02 12:53:16.000000000 +0200
-***************
-*** 40,46 ****
-  ../../CAMD/Lib/libcamd.a:
-  	( cd ../../CAMD ; $(MAKE) library )
-  
-- $(METIS):
-- 	( cd $(METIS_PATH) && $(MAKE) )
-  
-  UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \
---- 40,44 ----
-  ../../CAMD/Lib/libcamd.a:
-  	( cd ../../CAMD ; $(MAKE) library )
-  
-  
-  UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \

From b02f300c445296c9580d9ccd1d7000a09ac10b0d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 17:33:11 -0500
Subject: [PATCH 0780/2322] suitesparse_4_4_1: build with openblas

Compared to ATLAS, OpenBLAS offers better performance, faster builds,
and dynamic architecture detection.
---
 .../math/suitesparse/0001-disable-metis.patch | 36 ------------------
 .../science/math/suitesparse/default.nix      | 38 +++++++++++--------
 2 files changed, 23 insertions(+), 51 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch

diff --git a/pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch b/pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch
deleted file mode 100644
index b0f7715f755..00000000000
--- a/pkgs/development/libraries/science/math/suitesparse/0001-disable-metis.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 456b26d0c9101adaa5876954baac0ca0e872dab6 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 15 Dec 2014 10:18:01 -0600
-Subject: [PATCH 1/3] disable metis
-
----
- SuiteSparse_config/SuiteSparse_config.mk | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk
-index ba2da23..e1514bf 100644
---- a/SuiteSparse_config/SuiteSparse_config.mk
-+++ b/SuiteSparse_config/SuiteSparse_config.mk
-@@ -212,8 +212,8 @@ XERBLA =
- # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
- # You may wish to use an absolute path.  METIS is optional.  Compile
- # CHOLMOD with -DNPARTITION if you do not wish to use METIS.
--METIS_PATH = ../../metis-4.0
--METIS = ../../metis-4.0/libmetis.a
-+# METIS_PATH = ../../metis-4.0
-+# METIS = ../../metis-4.0/libmetis.a
- 
- #------------------------------------------------------------------------------
- # UMFPACK configuration:
-@@ -273,7 +273,7 @@ UMFPACK_CONFIG =
- # -DNSUNPERF        for Solaris only.  If defined, do not use the Sun
- #                   Performance Library
- 
--CHOLMOD_CONFIG = $(GPU_CONFIG)
-+CHOLMOD_CONFIG = $(GPU_CONFIG) -DNPARTITION
- 
- # uncomment this line to compile CHOLMOD without METIS:
- # CHOLMOD_CONFIG = -DNPARTITION
--- 
-2.1.3
-
diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index add4ca9a08f..ccd0c378a81 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -1,33 +1,41 @@
-{ stdenv, fetchurl, substituteAll
-, atlasWithLapack, gfortran }:
+{ stdenv, fetchurl, gfortran, openblas }:
 
 let
-  name = "suitesparse-4.4.1";
+  version = "4.4.1";
+  name = "suitesparse-${version}";
+
+  int_t = if openblas.blas64 then "int64_t" else "int32_t";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.1.tar.gz";
+    url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz";
     sha256 = "0y8i6dizrr556xggpjyc7wijjv4jbizhssmjj4jv8n1s7zxy2z0n";
   };
 
-  patches = [
-    ./0001-disable-metis.patch
-    ./0002-set-install-dir.patch
-    (substituteAll {
-      src = ./0003-blas-lapack-flags.patch;
-      blasFlags = "-lf77blas -latlas -lcblas -lgfortran";
-      lapackFlags= "-llapack -latlas -lcblas";
-    })
-  ];
-
   preConfigure = ''
     substituteAllInPlace SuiteSparse_config/SuiteSparse_config.mk
     mkdir -p $out/lib
     mkdir -p $out/include
+
+    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
+        -e 's/METIS .*$/METIS =/' \
+        -e 's/METIS_PATH .*$/METIS_PATH =/' \
+        -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \
+        -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/'
   '';
 
+  makeFlags = [
+    "PREFIX=\"$(out)\""
+    "INSTALL_LIB=$(out)/lib"
+    "INSTALL_INCLUDE=$(out)/include"
+    "BLAS=-lopenblas"
+    "LAPACK="
+  ];
+
+  NIX_CFLAGS = "-fPIC";
+
   postInstall = ''
     # Install documentation
     outdoc=$out/share/doc/${name}
@@ -47,7 +55,7 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [ gfortran ];
-  buildInputs = [ atlasWithLapack ];
+  buildInputs = [ openblas ];
 
   meta = with stdenv.lib; {
     homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html;

From e5ee1a0577164d7e253ba69a2239f37b78a9c3c0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 17:34:31 -0500
Subject: [PATCH 0781/2322] suitesparse: remove unnecessary patches

---
 .../suitesparse/0002-set-install-dir.patch    |  27 --
 .../suitesparse/0003-blas-lapack-flags.patch  |  27 --
 .../math/suitesparse/SuiteSparse_config.mk    | 452 ------------------
 .../science/math/suitesparse/default.nix      |   1 -
 4 files changed, 507 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch
 delete mode 100644 pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch
 delete mode 100644 pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk

diff --git a/pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch b/pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch
deleted file mode 100644
index ef861f68091..00000000000
--- a/pkgs/development/libraries/science/math/suitesparse/0002-set-install-dir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e0fee492a315ce1ef8697b056af210beb1465334 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 15 Dec 2014 10:18:12 -0600
-Subject: [PATCH 2/3] set install dir
-
----
- SuiteSparse_config/SuiteSparse_config.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk
-index e1514bf..f1046a6 100644
---- a/SuiteSparse_config/SuiteSparse_config.mk
-+++ b/SuiteSparse_config/SuiteSparse_config.mk
-@@ -95,8 +95,8 @@ F77LIB =
- # LIB = -lm
- 
- # For "make install"
--INSTALL_LIB = /usr/local/lib
--INSTALL_INCLUDE = /usr/local/include
-+INSTALL_LIB = @out@/lib
-+INSTALL_INCLUDE = @out@/include
- 
- # Which version of MAKE you are using (default is "make")
- # MAKE = make
--- 
-2.1.3
-
diff --git a/pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch b/pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch
deleted file mode 100644
index db0b1c45655..00000000000
--- a/pkgs/development/libraries/science/math/suitesparse/0003-blas-lapack-flags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a99cca30cfd965683564ae024e8ecc615c61697a Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 15 Dec 2014 10:24:08 -0600
-Subject: [PATCH 3/3] blas lapack flags
-
----
- SuiteSparse_config/SuiteSparse_config.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk
-index f1046a6..1710162 100644
---- a/SuiteSparse_config/SuiteSparse_config.mk
-+++ b/SuiteSparse_config/SuiteSparse_config.mk
-@@ -119,8 +119,8 @@ INSTALL_INCLUDE = @out@/include
- # naming the BLAS and LAPACK library (*.a or *.so) files.
- 
- # This is probably slow ... it might connect to the Standard Reference BLAS:
--  BLAS = -lblas -lgfortran
--  LAPACK = -llapack
-+  BLAS = @blasFlags@
-+  LAPACK = @lapackFlags@
- 
- # MKL 
- # BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm
--- 
-2.1.3
-
diff --git a/pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk b/pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk
deleted file mode 100644
index 157a20d7b5a..00000000000
--- a/pkgs/development/libraries/science/math/suitesparse/SuiteSparse_config.mk
+++ /dev/null
@@ -1,452 +0,0 @@
-#===============================================================================
-# SuiteSparse_config.mk:  common configuration file for the SuiteSparse
-#===============================================================================
-
-# This file contains all configuration settings for all packages authored or
-# co-authored by Tim Davis:
-#
-# Package Version       Description
-# ------- -------       -----------
-# AMD     1.2 or later  approximate minimum degree ordering
-# COLAMD  2.4 or later  column approximate minimum degree ordering
-# CCOLAMD 1.0 or later  constrained column approximate minimum degree ordering
-# CAMD    any           constrained approximate minimum degree ordering
-# UMFPACK 4.5 or later  sparse LU factorization, with the BLAS
-# CHOLMOD any           sparse Cholesky factorization, update/downdate
-# KLU     0.8 or later  sparse LU factorization, BLAS-free
-# BTF     0.8 or later  permutation to block triangular form
-# LDL     1.2 or later  concise sparse LDL'
-# CXSparse any          extended version of CSparse (int/long, real/complex)
-# SuiteSparseQR any     sparse QR factorization
-# RBio    2.0 or later  read/write sparse matrices in Rutherford-Boeing format
-#
-# By design, this file is NOT included in the CSparse makefile.
-# That package is fully stand-alone.  CSparse is primarily for teaching;
-# production code should use CXSparse.
-#
-# The SuiteSparse_config directory and the above packages should all appear in
-# a single directory, in order for the Makefile's within each package to find
-# this file.
-#
-# To enable an option of the form "# OPTION = ...", edit this file and
-# delete the "#" in the first column of the option you wish to use.
-#
-# The use of METIS 4.0.1 is optional.  To exclude METIS, you must compile with
-# CHOLMOD_CONFIG set to -DNPARTITION.  See below for details.  However, if you
-# do not have a metis-4.0 directory inside the SuiteSparse directory, the
-# */Makefile's that optionally rely on METIS will automatically detect this
-# and compile without METIS.
-
-#------------------------------------------------------------------------------
-# Generic configuration
-#------------------------------------------------------------------------------
-
-# Using standard definitions from the make environment, typically:
-#
-#   CC              cc      C compiler
-#   CXX             g++     C++ compiler
-#   CFLAGS          [ ]     flags for C and C++ compiler
-#   CPPFLAGS        [ ]     flags for C and C++ compiler
-#   TARGET_ARCH     [ ]     target architecture
-#   FFLAGS          [ ]     flags for Fortran compiler
-#   RM              rm -f   delete a file
-#   AR              ar      create a static *.a library archive
-#   ARFLAGS         rv      flags for ar
-#   MAKE            make    make itself (sometimes called gmake)
-#
-# You can redefine them here, but by default they are used from the
-# default make environment.
-
-# To use OpenMP add -openmp to the CFLAGS
-# If OpenMP is used, it is recommended to define CHOLMOD_OMP_NUM_THREADS
-# as the number of cores per socket on the machine being used to maximize
-# memory performance
-  CFLAGS = 
-# CFLAGS = -g
-# for the icc compiler and OpenMP:
-# CFLAGS = -openmp
-
-# C and C++ compiler flags.  The first three are standard for *.c and *.cpp
-# Add -DNTIMER if you do use any timing routines (otherwise -lrt is required).
-# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
-  CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC
-# for the MKL BLAS:
-# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE
-# with no optimization:
-# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH)     -fexceptions -fPIC
-
-# ranlib, and ar, for generating libraries.  If you don't need ranlib,
-# just change it to RANLAB = echo
-RANLIB = ranlib
-ARCHIVE = $(AR) $(ARFLAGS)
-
-# copy and delete a file
-CP = cp -f
-MV = mv -f
-
-# Fortran compiler (not required for 'make' or 'make library')
-F77 = gfortran
-F77FLAGS = $(FFLAGS) -O
-F77LIB =
-
-# C and Fortran libraries.  Remove -lrt if you don't have it.
-  LIB = -lm -lrt
-# Using the following requires CF = ... -DNTIMER on POSIX C systems.
-# LIB = -lm
-
-# For "make install"
-INSTALL_LIB = @out@/lib
-INSTALL_INCLUDE = @out@/include
-
-# Which version of MAKE you are using (default is "make")
-# MAKE = make
-# MAKE = gmake
-
-#------------------------------------------------------------------------------
-# BLAS and LAPACK configuration:
-#------------------------------------------------------------------------------
-
-# UMFPACK and CHOLMOD both require the BLAS.  CHOLMOD also requires LAPACK.
-# See Kazushige Goto's BLAS at http://www.cs.utexas.edu/users/flame/goto/ or
-# http://www.tacc.utexas.edu/~kgoto/ for the best BLAS to use with CHOLMOD.
-# LAPACK is at http://www.netlib.org/lapack/ .  You can use the standard
-# Fortran LAPACK along with Goto's BLAS to obtain very good performance.
-# CHOLMOD gets a peak numeric factorization rate of 3.6 Gflops on a 3.2 GHz
-# Pentium 4 (512K cache, 4GB main memory) with the Goto BLAS, and 6 Gflops
-# on a 2.5Ghz dual-core AMD Opteron.
-
-# These settings will probably not work, since there is no fixed convention for
-# naming the BLAS and LAPACK library (*.a or *.so) files.
-
-# This is probably slow ... it might connect to the Standard Reference BLAS:
-  BLAS = -lf77blas -latlas -lcblas -lgfortran
-  LAPACK = -llapack -latlas -lcblas
-
-# MKL 
-# BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm
-# LAPACK = 
-
-# ACML
-# BLAS = -lacml -lgfortran
-# LAPACK =
-
-# OpenBLAS
-# BLAS = -lopenblas
-# LAPACK = 
-
-# NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto"
-# statement.  Rather, the Goto BLAS is written by Dr. Kazushige Goto.
-# Using the Goto BLAS:
-# BLAS = -lgoto -lgfortran -lgfortranbegin
-# BLAS = -lgoto2 -lgfortran -lgfortranbegin -lpthread
-
-# Using non-optimized versions:
-# BLAS = -lblas_plain -lgfortran -lgfortranbegin
-# LAPACK = -llapack_plain
-
-# BLAS = -lblas_plain -lgfortran -lgfortranbegin
-# LAPACK = -llapack
-
-# The BLAS might not contain xerbla, an error-handling routine for LAPACK and
-# the BLAS.  Also, the standard xerbla requires the Fortran I/O library, and
-# stops the application program if an error occurs.  A C version of xerbla
-# distributed with this software (SuiteSparse_config/xerbla/libcerbla.a)
-# includes a Fortran-callable xerbla routine that prints nothing and does not
-# stop the application program.  This is optional.
-
-# XERBLA = ../../SuiteSparse_config/xerbla/libcerbla.a 
-
-# If you wish to use the XERBLA in LAPACK and/or the BLAS instead,
-# use this option:
-XERBLA = 
-
-# If you wish to use the Fortran SuiteSparse_config/xerbla/xerbla.f instead,
-# use this:
-
-# XERBLA = ../../SuiteSparse_config/xerbla/libxerbla.a 
-
-#------------------------------------------------------------------------------
-# GPU configuration for CHOLMOD and SPQR
-#------------------------------------------------------------------------------
-
-# no cuda
-  CUDA_ROOT     =
-  GPU_BLAS_PATH =
-  GPU_CONFIG    =
-  CUDA_PATH     =
-  CUDART_LIB    =
-  CUBLAS_LIB    =
-  CUDA_INC_PATH =
-  NV20          =
-  NV30          =
-  NV35          =
-  NVCC          = echo
-  NVCCFLAGS     =
-
-# with cuda for CHOLMOD
-# CUDA_ROOT     = /usr/local/cuda
-# GPU_BLAS_PATH = $(CUDA_ROOT)
-# with 4 cores (default):
-# GPU_CONFIG    = -I$(CUDA_ROOT)/include -DGPU_BLAS
-# with 10 cores:
-# GPU_CONFIG    = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=10
-# CUDA_PATH     = $(CUDA_ROOT)
-# CUDART_LIB    = $(CUDA_ROOT)/lib64/libcudart.so
-# CUBLAS_LIB    = $(CUDA_ROOT)/lib64/libcublas.so
-# CUDA_INC_PATH = $(CUDA_ROOT)/include/
-# NV20          = -arch=sm_20 -Xcompiler -fPIC
-# NV30          = -arch=sm_30 -Xcompiler -fPIC
-# NV35          = -arch=sm_35 -Xcompiler -fPIC
-# NVCC          = $(CUDA_ROOT)/bin/nvcc
-# NVCCFLAGS     = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35
-
-# was NVCC      = $(CUDA_ROOT)/bin/nvcc $(NV35) $(NV30) $(NV20)
-
-#------------------------------------------------------------------------------
-# METIS, optionally used by CHOLMOD
-#------------------------------------------------------------------------------
-
-# If you do not have METIS, or do not wish to use it in CHOLMOD, you must
-# compile CHOLMOD with the -DNPARTITION flag.
-
-# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
-# You may wish to use an absolute path.  METIS is optional.  Compile
-# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
-# METIS_PATH = ../../metis-4.0
-# METIS = ../../metis-4.0/libmetis.a
-
-#------------------------------------------------------------------------------
-# UMFPACK configuration:
-#------------------------------------------------------------------------------
-
-# Configuration flags for UMFPACK.  See UMFPACK/Source/umf_config.h for details.
-#
-# -DNBLAS       do not use the BLAS.  UMFPACK will be very slow.
-# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
-#               LAPACK and the BLAS (defaults to 'int')
-# -DNSUNPERF    do not use the Sun Perf. Library (default is use it on Solaris)
-# -DNRECIPROCAL do not multiply by the reciprocal
-# -DNO_DIVIDE_BY_ZERO   do not divide by zero
-# -DNCHOLMOD    do not use CHOLMOD as a ordering method.  If -DNCHOLMOD is
-#               included in UMFPACK_CONFIG, then UMFPACK  does not rely on
-#               CHOLMOD, CAMD, CCOLAMD, COLAMD, and METIS.
-
-UMFPACK_CONFIG =
-
-# uncomment this line to compile UMFPACK without CHOLMOD:
-# UMFPACK_CONFIG = -DNCHOLMOD
-
-#------------------------------------------------------------------------------
-# CHOLMOD configuration
-#------------------------------------------------------------------------------
-
-# CHOLMOD Library Modules, which appear in libcholmod.a:
-# Core          requires: none
-# Check         requires: Core
-# Cholesky      requires: Core, AMD, COLAMD.  optional: Partition, Supernodal
-# MatrixOps     requires: Core
-# Modify        requires: Core
-# Partition     requires: Core, CCOLAMD, METIS.  optional: Cholesky
-# Supernodal    requires: Core, BLAS, LAPACK
-#
-# CHOLMOD test/demo Modules (all are GNU GPL, do not appear in libcholmod.a):
-# Tcov          requires: Core, Check, Cholesky, MatrixOps, Modify, Supernodal
-#               optional: Partition
-# Valgrind      same as Tcov
-# Demo          requires: Core, Check, Cholesky, MatrixOps, Supernodal
-#               optional: Partition
-#
-# Configuration flags:
-# -DNCHECK          do not include the Check module.       License GNU LGPL
-# -DNCHOLESKY       do not include the Cholesky module.    License GNU LGPL
-# -DNPARTITION      do not include the Partition module.   License GNU LGPL
-#                   also do not include METIS.
-# -DNCAMD           do not use CAMD, etc from Partition module.    GNU LGPL
-# -DNGPL            do not include any GNU GPL Modules in the CHOLMOD library:
-# -DNMATRIXOPS      do not include the MatrixOps module.   License GNU GPL
-# -DNMODIFY         do not include the Modify module.      License GNU GPL
-# -DNSUPERNODAL     do not include the Supernodal module.  License GNU GPL
-#
-# -DNPRINT          do not print anything.
-# -D'LONGBLAS=long' or -DLONGBLAS='long long' defines the integers used by
-#                   LAPACK and the BLAS (defaults to 'int')
-# -DNSUNPERF        for Solaris only.  If defined, do not use the Sun
-#                   Performance Library
-
-CHOLMOD_CONFIG = $(GPU_CONFIG) -DNPARTITION
-
-# uncomment this line to compile CHOLMOD without METIS:
-# CHOLMOD_CONFIG = -DNPARTITION
-
-#------------------------------------------------------------------------------
-# SuiteSparseQR configuration:
-#------------------------------------------------------------------------------
-
-# The SuiteSparseQR library can be compiled with the following options:
-#
-# -DNPARTITION      do not include the CHOLMOD partition module
-# -DNEXPERT         do not include the functions in SuiteSparseQR_expert.cpp
-# -DHAVE_TBB        enable the use of Intel's Threading Building Blocks (TBB)
-
-# default, without timing, without TBB:
-SPQR_CONFIG = $(GPU_CONFIG)
-# with TBB:
-# SPQR_CONFIG = -DHAVE_TBB
-
-# This is needed for IBM AIX: (but not for and C codes, just C++)
-# SPQR_CONFIG = -DBLAS_NO_UNDERSCORE
-
-# with TBB, you must select this:
-# TBB = -ltbb
-# without TBB:
-TBB =
-
-#------------------------------------------------------------------------------
-# code formatting
-#------------------------------------------------------------------------------
-
-# Use "grep" only, if you do not have "indent"  
-# PRETTY = grep -v "^\#"
-# PRETTY = grep -v "^\#" | indent -bl -nce -ss -bli0 -i4 -sob -l120
-  PRETTY = grep -v "^\#" | indent -bl -nce -bli0 -i4 -sob -l120
-
-#------------------------------------------------------------------------------
-# Linux
-#------------------------------------------------------------------------------
-
-# Using default compilers:
-# CC = gcc
-# CF = $(CFLAGS) -O3 -fexceptions
-
-# alternatives:
-# CF = $(CFLAGS) -g -fexceptions \
-#       -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
-#       -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi \
-#       -funit-at-a-time
-# CF = $(CFLAGS) -O3 -fexceptions \
-#       -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
-#       -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
-# CF = $(CFLAGS) -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-# CF = $(CFLAGS) -O3
-# CF = $(CFLAGS) -O3 -g -fexceptions
-# CF = $(CFLAGS) -g -fexceptions \
-#       -Wall -W -Wshadow \
-#       -Wredundant-decls -Wdisabled-optimization -ansi
-
-# consider:
-# -fforce-addr -fmove-all-movables -freduce-all-givs -ftsp-ordering
-# -frename-registers -ffast-math -funroll-loops
-
-# Using the Goto BLAS:
-# BLAS = -lgoto -lfrtbegin -lg2c $(XERBLA) -lpthread
-
-# Using Intel's icc and ifort compilers:
-#   (does not work for mexFunctions unless you add a mexopts.sh file)
-# F77 = ifort
-# CC = icc
-# CF = $(CFLAGS) -O3 -xN -vec_report=0
-# CF = $(CFLAGS) -g
-
-# 64bit:
-# F77FLAGS = -O -m64
-# CF = $(CFLAGS) -O3 -fexceptions -m64
-# BLAS = -lgoto64 -lfrtbegin -lg2c -lpthread $(XERBLA)
-# LAPACK = -llapack64
-
-# SUSE Linux 10.1, AMD Opteron, with GOTO Blas
-# F77 = gfortran
-# BLAS = -lgoto_opteron64 -lgfortran
-
-# SUSE Linux 10.1, Intel Pentium, with GOTO Blas
-# F77 = gfortran
-# BLAS = -lgoto -lgfortran
-
-#------------------------------------------------------------------------------
-# Mac
-#------------------------------------------------------------------------------
-
-# As recommended by macports, http://suitesparse.darwinports.com/
-# I've tested them myself on Mac OSX 10.6.1 and 10.6.8 (Snow Leopard),
-# on my MacBook Air, and they work fine.
-
-# F77 = gfortran
-# CF = $(CFLAGS) -O3 -fno-common -fexceptions -DNTIMER
-# BLAS = -framework Accelerate
-# LAPACK = -framework Accelerate
-# LIB = -lm
-
-#------------------------------------------------------------------------------
-# Solaris
-#------------------------------------------------------------------------------
-
-# 32-bit
-# CF = $(CFLAGS) -KPIC -dalign -xc99=%none -Xc -xlibmieee -xO5 -xlibmil -m32
-
-# 64-bit
-# CF = $(CFLAGS) -fast -KPIC -xc99=%none -xlibmieee -xlibmil -m64 -Xc
-
-# FFLAGS = -fast -KPIC -dalign -xlibmil -m64
-
-# The Sun Performance Library includes both LAPACK and the BLAS:
-# BLAS = -xlic_lib=sunperf
-# LAPACK =
-
-
-#------------------------------------------------------------------------------
-# Compaq Alpha
-#------------------------------------------------------------------------------
-
-# 64-bit mode only
-# CF = $(CFLAGS) -O2 -std1
-# BLAS = -ldxml
-# LAPACK =
-
-#------------------------------------------------------------------------------
-# IBM RS 6000
-#------------------------------------------------------------------------------
-
-# BLAS = -lessl
-# LAPACK =
-
-# 32-bit mode:
-# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -qproto
-# F77FLAGS = -O4 -qipa -qmaxmem=16384
-
-# 64-bit mode:
-# CF = $(CFLAGS) -O4 -qipa -qmaxmem=16384 -q64 -qproto
-# F77FLAGS = -O4 -qipa -qmaxmem=16384 -q64
-
-#------------------------------------------------------------------------------
-# SGI IRIX
-#------------------------------------------------------------------------------
-
-# BLAS = -lscsl
-# LAPACK =
-
-# 32-bit mode
-# CF = $(CFLAGS) -O
-
-# 64-bit mode (32 bit int's and 64-bit long's):
-# CF = $(CFLAGS) -64
-# F77FLAGS = -64
-
-# SGI doesn't have ranlib
-# RANLIB = echo
-
-#------------------------------------------------------------------------------
-# AMD Opteron (64 bit)
-#------------------------------------------------------------------------------
-
-# BLAS = -lgoto_opteron64 -lg2c
-# LAPACK = -llapack_opteron64
-
-# SUSE Linux 10.1, AMD Opteron
-# F77 = gfortran
-# BLAS = -lgoto_opteron64 -lgfortran
-# LAPACK = -llapack_opteron64
-
-#------------------------------------------------------------------------------
-# remove object files and profile output
-#------------------------------------------------------------------------------
-
-CLEAN = *.o *.obj *.ln *.bb *.bbg *.da *.tcov *.gcov gmon.out *.bak *.d *.gcda *.gcno
diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index ccd0c378a81..740ea3a09a6 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation {
   };
 
   preConfigure = ''
-    substituteAllInPlace SuiteSparse_config/SuiteSparse_config.mk
     mkdir -p $out/lib
     mkdir -p $out/include
 

From 4f98287afa7c20ae8d5316cad603f834a60a7b18 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 18:14:51 -0500
Subject: [PATCH 0782/2322] julia02: build with openblas

Compared to ATLAS, OpenBLAS offers better performance, faster builds,
and dynamic architecture detection.
---
 pkgs/development/compilers/julia/0.2.nix | 14 ++++++++------
 pkgs/top-level/all-packages.nix          |  1 -
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.2.nix b/pkgs/development/compilers/julia/0.2.nix
index cc1be3db8a5..9d585e07fe1 100644
--- a/pkgs/development/compilers/julia/0.2.nix
+++ b/pkgs/development/compilers/julia/0.2.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
  , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
- , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack
+ , ncurses, libunistring, lighttpd, patchelf, openblas
  , tcl, tk, xproto, libX11, git, mpfr
  } :
 let
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
     fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
-    openblas liblapack tcl tk xproto libX11 git mpfr
+    openblas tcl tk xproto libX11 git mpfr
     ];
 
   configurePhase = ''
@@ -91,14 +91,13 @@ stdenv.mkDerivation rec {
     copy_kill_hash "${dsfmt_src}" deps/random
 
     ${if realGcc ==null then "" else 
-    ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr"''}
+    ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -lopenblas -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr"''}
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC "
 
     export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia"
 
     export GLPK_PREFIX="${glpk}/include"
 
-    mkdir -p "$out/lib"
     sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
     sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile
 
@@ -111,9 +110,12 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     mkdir -p usr/lib
-    
-    echo "$out"
+
     mkdir -p "$out/lib"
+    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so"
+    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/liblapack.so"
+
+    echo "$out"
     (
     cd "$(mktemp -d)"
     for i in "${suitesparse}"/lib/lib*.a; do
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e74825b67d..fb089239f8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3990,7 +3990,6 @@ let
   jikes = callPackage ../development/compilers/jikes { };
 
   julia02 = callPackage ../development/compilers/julia/0.2.nix {
-    liblapack = liblapack.override {shared = true;};
     llvm = llvm_33;
     suitesparse = suitesparse_4_2;
   };

From 77a454b866633b6accd144a28c2616a2ea1fd8b0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 18:15:08 -0500
Subject: [PATCH 0783/2322] julia03: refactor and build with openblas

Compared to ATLAS, OpenBLAS offers better performance, faster builds,
and dynamic architecture detection.
---
 pkgs/development/compilers/julia/0.3.nix | 128 +++++++++++++----------
 pkgs/top-level/all-packages.nix          |   9 +-
 2 files changed, 73 insertions(+), 64 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 9f216c7207f..dc51441bb17 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -1,26 +1,24 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
- , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
- , ncurses, libunistring, patchelf, openblas, liblapack
- , tcl, tk, xproto, libX11, git, mpfr, which, wget
- } :
+, readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
+, ncurses, libunistring, patchelf, openblas
+, tcl, tk, xproto, libX11, git, mpfr, which
+}:
 
-assert stdenv.isLinux; 
+with stdenv.lib;
 
 let
   realGcc = stdenv.cc.cc;
-in
-stdenv.mkDerivation rec {
-  pname = "julia";
-  version = "0.3.6";
-  name = "${pname}-${version}";
+  arch = head (splitString "-" stdenv.system);
+  march =
+    {
+      "x86_64-linux" = "x86-64";
+      "i686-linux" = "i686";
+    }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
 
   dsfmt_ver = "2.2";
   grisu_ver = "1.1.1";
-  openblas_ver = "v0.2.13";
-  lapack_ver = "3.5.0";
   arpack_ver = "3.1.5";
   patchelf_ver = "0.8";
-  pcre_ver = "8.36";
   utf8proc_ver = "1.1.6";
 
   dsfmt_src = fetchurl {
@@ -32,33 +30,26 @@ stdenv.mkDerivation rec {
     url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
     md5 = "29b533ed4311161267bff1a9a97e2953";
   };
-  openblas_src = fetchurl {
-    url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}";
-    name = "openblas-${openblas_ver}.tar.gz";
-    md5 = "74adf4c0d0d82bff4774be5bf2134183";
-  };
   arpack_src = fetchurl rec {
     url = "https://github.com/opencollab/arpack-ng/archive/${arpack_ver}.tar.gz";
     md5 = "d84e1b6108d9ee67c0d21aba7099e953";
     name = "arpack-ng-${arpack_ver}.tar.gz";
   };
-  lapack_src = fetchurl {
-    url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz";
-    name = "lapack-${lapack_ver}.tgz";
-    md5 = "b1d3e3e425b2e44a06760ff173104bdf";
-  };
   patchelf_src = fetchurl {
     url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2";
     md5 = "5087261514b4b5814a39c3d3a36eb6ef";
   };
-  pcre_src = fetchurl {
-    url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_ver}.tar.bz2";
-    md5 = "b767bc9af0c20bc9c1fe403b0d41ad97";
-  };
   utf8proc_src = fetchurl {
     url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
     md5 = "2462346301fac2994c34f5574d6c3ca7";
   };
+in
+stdenv.mkDerivation rec {
+  pname = "julia";
+  version = "0.3.6";
+  name = "${pname}-${version}";
+
+  extraSrcs = [ dsfmt_src grisu_src arpack_src utf8proc_src ];
 
   src = fetchgit {
     url = "git://github.com/JuliaLang/julia.git";
@@ -67,59 +58,81 @@ stdenv.mkDerivation rec {
     name = "julia-git-v${version}";
   };
 
-  buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
-    fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
-    openblas liblapack tcl tk xproto libX11 git mpfr which wget
+  buildInputs =
+    [
+      gfortran perl m4 gmp pcre llvm readline zlib
+      fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
+      openblas tcl tk xproto libX11 git mpfr which
     ];
 
+  makeFlags =
+    [
+      "USE_SYSTEM_PATCHELF=1"
+      "USE_SYSTEM_OPENBLAS=1"
+      "USE_SYSTEM_BLAS=1"
+      "USE_SYSTEM_LAPACK=1"
+      "ARCH=${arch}"
+      "MARCH=${march}"
+      "JULIA_CPU_TARGET=${march}"
+      "PREFIX=$(out)"
+      "prefix=$(out)"
+      "SHELL=${stdenv.shell}"
+    ];
+
+  GLPK_PREFIX = "${glpk}/include";
+
+  NIX_CFLAGS_COMPILE = [ "-fPIC" ];
+  NIX_LDFLAGS =
+    optionals
+      (realGcc != null)
+      [
+        "-L${realGcc}/lib"
+        "-L${realGcc}/lib64"
+        "-lpcre" "-lm" "-lfftw3f" "-lfftw3" "-lglpk"
+        "-lunistring" "-lz" "-lgmp" "-lmpfr" "-lopenblas"
+      ];
+
+  postPatch = ''
+    sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
+    sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile
+
+    patchShebangs . contrib
+
+    # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache
+    # is probably not what we want anyway on non-NixOS
+    sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
+  '';
+
   configurePhase = ''
     for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK ZLIB MPFR;
     do
       makeFlags="$makeFlags USE_SYSTEM_$i=1 "
     done
-	makeFlags="$makeFlags JULIA_CPU_TARGET=core2";
 
     copy_kill_hash(){
       cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
     }
 
-    for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${patchelf_src}" \
-        "${pcre_src}" "${utf8proc_src}" "${lapack_src}" "${openblas_src}"; do
+    for i in $extraSrcs; do
       copy_kill_hash "$i" deps
     done
 
-    ${if realGcc ==null then "" else 
-    ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr -lblas -lopenblas -L$out/lib"''}
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC "
+    ${if realGcc ==null then "" else ''export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib"''}
 
     export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia"
 
-    export GLPK_PREFIX="${glpk}/include"
-
-    mkdir -p "$out/lib"
-    sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
-    sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile
-
-    export makeFlags="$makeFlags PREFIX=$out SHELL=${stdenv.shell} prefix=$out"
-
-    export dontPatchELF=1
-
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia"
 
-    patchShebangs . contrib
-
     export PATH="$PATH:${stdenv.cc.libc}/sbin"
-
-    # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache
-    # is probably not what we want anyway on non-NixOS
-    sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
-
-    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so"
   '';
 
   preBuild = ''
+    mkdir -p "$out/lib"
+    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so"
+    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/liblapack.so"
+
     mkdir -p usr/lib
-    
+
     echo "$out"
     mkdir -p "$out/lib"
     (
@@ -137,6 +150,7 @@ stdenv.mkDerivation rec {
   '';
 
   dontStrip = true;
+  dontPatchELF = true;
 
   enableParallelBuilding = true;
 
@@ -147,8 +161,8 @@ stdenv.mkDerivation rec {
     description = "High-level performance-oriented dynamical language for technical computing";
     homepage = "http://julialang.org/";
     license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [ raskin ttuegel ];
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
     broken = false;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb089239f8f..32c7cdbef23 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3994,13 +3994,8 @@ let
     suitesparse = suitesparse_4_2;
   };
 
-  julia03 = let
-    liblapack = liblapack_3_5_0.override {shared = true;};
-  in callPackage ../development/compilers/julia/0.3.nix {
-    inherit liblapack;
-    suitesparse = suitesparse_4_2.override {
-      inherit liblapack;
-    };
+  julia03 = callPackage ../development/compilers/julia/0.3.nix {
+    suitesparse = suitesparse_4_2;
     llvm = llvm_33;
   };
   julia = julia03;

From bbda7d427b0858be50236d99011de29416652c2d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 20:09:37 -0500
Subject: [PATCH 0784/2322] suitesparse: version derivations by major version
 only

---
 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 32c7cdbef23..5c600c47817 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13879,7 +13879,7 @@ let
   sage = callPackage ../applications/science/math/sage { };
 
   suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { };
-  suitesparse_4_4_1 = callPackage ../development/libraries/science/math/suitesparse {};
+  suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse {};
 
   ipopt = callPackage ../development/libraries/science/math/ipopt { };
 

From a17d8bcc4bbf3e74cacecf956cd06cb9a98b52ba Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 20:33:42 -0500
Subject: [PATCH 0785/2322] suitesparse_4_4: update to 4.4.4

---
 .../libraries/science/math/suitesparse/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index 740ea3a09a6..af9396ad900 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gfortran, openblas }:
 
 let
-  version = "4.4.1";
+  version = "4.4.4";
   name = "suitesparse-${version}";
 
   int_t = if openblas.blas64 then "int64_t" else "int32_t";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz";
-    sha256 = "0y8i6dizrr556xggpjyc7wijjv4jbizhssmjj4jv8n1s7zxy2z0n";
+    sha256 = "1zdn1y0ij6amj7smmcslkqgbqv9yy5cwmbyzqc9v6drzdzllgbpj";
   };
 
   preConfigure = ''

From 86c54040aa1fba0307eeaebe00968a0a81871127 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 20:33:59 -0500
Subject: [PATCH 0786/2322] julia03: build with suitesparse_4_4

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c600c47817..0e96c04b7d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3995,7 +3995,6 @@ let
   };
 
   julia03 = callPackage ../development/compilers/julia/0.3.nix {
-    suitesparse = suitesparse_4_2;
     llvm = llvm_33;
   };
   julia = julia03;
@@ -13880,6 +13879,7 @@ let
 
   suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { };
   suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse {};
+  suitesparse = suitesparse_4_4;
 
   ipopt = callPackage ../development/libraries/science/math/ipopt { };
 

From adcdec2e70905a35c99bd2ba0991dbdd13280f38 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 3 Jun 2015 20:34:30 -0500
Subject: [PATCH 0787/2322] julia03: use system patchelf

---
 pkgs/development/compilers/julia/0.3.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index dc51441bb17..c7cda274924 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -18,7 +18,6 @@ let
   dsfmt_ver = "2.2";
   grisu_ver = "1.1.1";
   arpack_ver = "3.1.5";
-  patchelf_ver = "0.8";
   utf8proc_ver = "1.1.6";
 
   dsfmt_src = fetchurl {
@@ -35,10 +34,6 @@ let
     md5 = "d84e1b6108d9ee67c0d21aba7099e953";
     name = "arpack-ng-${arpack_ver}.tar.gz";
   };
-  patchelf_src = fetchurl {
-    url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2";
-    md5 = "5087261514b4b5814a39c3d3a36eb6ef";
-  };
   utf8proc_src = fetchurl {
     url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
     md5 = "2462346301fac2994c34f5574d6c3ca7";

From e36b3ec0a56c3b06152a205a46804733b88695d6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 07:09:29 -0500
Subject: [PATCH 0788/2322] suitesparse: build shared libraries

---
 pkgs/development/compilers/julia/0.3.nix      | 19 +++----------------
 .../science/math/suitesparse/default.nix      | 12 ++++++++++++
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index c7cda274924..62a1f4f98cc 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -63,7 +63,6 @@ stdenv.mkDerivation rec {
   makeFlags =
     [
       "USE_SYSTEM_PATCHELF=1"
-      "USE_SYSTEM_OPENBLAS=1"
       "USE_SYSTEM_BLAS=1"
       "USE_SYSTEM_LAPACK=1"
       "ARCH=${arch}"
@@ -122,25 +121,13 @@ stdenv.mkDerivation rec {
   '';
 
   preBuild = ''
+    # Link dynamically loaded shared libraries into output so they are found at runtime.
     mkdir -p "$out/lib"
     ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so"
     ln -s "${openblas}/lib/libopenblas.so" "$out/lib/liblapack.so"
-
-    mkdir -p usr/lib
-
-    echo "$out"
-    mkdir -p "$out/lib"
-    (
-    cd "$(mktemp -d)"
-    for i in "${suitesparse}"/lib/lib*.a; do
-      ar -x $i
-    done
-    gcc *.o --shared -o "$out/lib/libsuitesparse.so"
-    )
-    cp "$out/lib/libsuitesparse.so" usr/lib
+    ln -s "${suitesparse}/lib/libsuitesparse.so" "$out/lib/libsuitesparse.so"
     for i in umfpack cholmod amd camd colamd spqr; do
-      ln -s libsuitesparse.so "$out"/lib/lib$i.so;
-      ln -s libsuitesparse.so "usr"/lib/lib$i.so;
+      ln -s libsuitesparse.so "$out/lib/lib$i.so";
     done
   '';
 
diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index af9396ad900..f30db472b0d 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -36,6 +36,18 @@ stdenv.mkDerivation {
   NIX_CFLAGS = "-fPIC";
 
   postInstall = ''
+    # Build and install shared library
+    (
+        cd "$(mktemp -d)"
+        for i in "$out"/lib/lib*.a; do
+          ar -x $i
+        done
+        gcc *.o --shared -o "$out/lib/libsuitesparse.so"
+    )
+    for i in umfpack cholmod amd camd colamd spqr; do
+      ln -s libsuitesparse.so "$out"/lib/lib$i.so;
+    done
+
     # Install documentation
     outdoc=$out/share/doc/${name}
     mkdir -p $outdoc

From fff0191f481c49320d5c540ed8ae491a44b59c8e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 07:17:30 -0500
Subject: [PATCH 0789/2322] arpack: build with openblas

---
 .../libraries/science/math/arpack/default.nix       | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 01bb3371f5e..c896ecca472 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, gfortran, atlasWithLapack }:
+{ stdenv, fetchurl, gfortran, openblas }:
+
+with stdenv.lib;
 
 let
   version = "3.2.0";
@@ -10,10 +12,15 @@ stdenv.mkDerivation {
     sha256 = "1fwch6vipms1ispzg2djvbzv5wag36f1dmmr3xs3mbp6imfyhvff";
   };
 
-  buildInputs = [ gfortran atlasWithLapack ];
+  buildInputs = [ gfortran openblas ];
 
   # Auto-detection fails because gfortran brings in BLAS by default
-  configureFlags="--with-blas=-latlas --with-lapack=-latlas";
+  configureFlags = [
+    "--with-blas=-lopenblas"
+    "--with-lapack=-lopenblas"
+  ];
+
+  FFLAGS = optional openblas.blas64 "-fdefault-integer-8";
 
   meta = {
     homepage = "http://forge.scilab.org/index.php/p/arpack-ng/";

From 5c9750e5bbf52977d6fb95d9ff07e09f10769b01 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 08:35:54 -0500
Subject: [PATCH 0790/2322] julia03: link shared libraries privately

---
 pkgs/development/compilers/julia/0.3.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 62a1f4f98cc..d5e763003b1 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -122,12 +122,12 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     # Link dynamically loaded shared libraries into output so they are found at runtime.
-    mkdir -p "$out/lib"
-    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so"
-    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/liblapack.so"
-    ln -s "${suitesparse}/lib/libsuitesparse.so" "$out/lib/libsuitesparse.so"
+    mkdir -p "$out/lib/julia"
+    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/libblas.so"
+    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/liblapack.so"
+    ln -s "${suitesparse}/lib/libsuitesparse.so" "$out/lib/julia/libsuitesparse.so"
     for i in umfpack cholmod amd camd colamd spqr; do
-      ln -s libsuitesparse.so "$out/lib/lib$i.so";
+      ln -s libsuitesparse.so "$out/lib/julia/lib$i.so";
     done
   '';
 

From 41cc06fd000293d2ce9eb81ab8ca5a3654f5ad73 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 07:17:38 -0500
Subject: [PATCH 0791/2322] julia03: use system arpack

---
 pkgs/development/compilers/julia/0.3.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index d5e763003b1..563e59a2f58 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
 , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
-, ncurses, libunistring, patchelf, openblas
+, ncurses, libunistring, patchelf, openblas, arpack
 , tcl, tk, xproto, libX11, git, mpfr, which
 }:
 
@@ -17,7 +17,6 @@ let
 
   dsfmt_ver = "2.2";
   grisu_ver = "1.1.1";
-  arpack_ver = "3.1.5";
   utf8proc_ver = "1.1.6";
 
   dsfmt_src = fetchurl {
@@ -29,11 +28,6 @@ let
     url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
     md5 = "29b533ed4311161267bff1a9a97e2953";
   };
-  arpack_src = fetchurl rec {
-    url = "https://github.com/opencollab/arpack-ng/archive/${arpack_ver}.tar.gz";
-    md5 = "d84e1b6108d9ee67c0d21aba7099e953";
-    name = "arpack-ng-${arpack_ver}.tar.gz";
-  };
   utf8proc_src = fetchurl {
     url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
     md5 = "2462346301fac2994c34f5574d6c3ca7";
@@ -44,7 +38,7 @@ stdenv.mkDerivation rec {
   version = "0.3.6";
   name = "${pname}-${version}";
 
-  extraSrcs = [ dsfmt_src grisu_src arpack_src utf8proc_src ];
+  extraSrcs = [ dsfmt_src grisu_src utf8proc_src ];
 
   src = fetchgit {
     url = "git://github.com/JuliaLang/julia.git";
@@ -57,7 +51,7 @@ stdenv.mkDerivation rec {
     [
       gfortran perl m4 gmp pcre llvm readline zlib
       fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
-      openblas tcl tk xproto libX11 git mpfr which
+      arpack openblas tcl tk xproto libX11 git mpfr which
     ];
 
   makeFlags =
@@ -65,6 +59,7 @@ stdenv.mkDerivation rec {
       "USE_SYSTEM_PATCHELF=1"
       "USE_SYSTEM_BLAS=1"
       "USE_SYSTEM_LAPACK=1"
+      "USE_SYSTEM_ARPACK=1"
       "ARCH=${arch}"
       "MARCH=${march}"
       "JULIA_CPU_TARGET=${march}"
@@ -126,6 +121,7 @@ stdenv.mkDerivation rec {
     ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/libblas.so"
     ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/liblapack.so"
     ln -s "${suitesparse}/lib/libsuitesparse.so" "$out/lib/julia/libsuitesparse.so"
+    ln -s "${arpack}/lib/libarpack.so" "$out/lib/julia/libarpack.so"
     for i in umfpack cholmod amd camd colamd spqr; do
       ln -s libsuitesparse.so "$out/lib/julia/lib$i.so";
     done

From bd280660f75b0da002a6faa456e10ea63d6851bf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 11:07:44 -0500
Subject: [PATCH 0792/2322] julia03: clean up LDFLAGS and LD_LIBRARY_PATH

There were a few unused LDFLAGS and LD_LIBRARY_PATH settings. There was
also an incorrect setting; Julia prefers to be linked to threaded
FFTW. The libary names are now set correctly so that it's not necessary
to link system libraries into $out/lib/julia as if they were private
libraries. The LDFLAGS were also moved out of NIX_LDFLAGS so they will
affect only the Julia build itself, and not all the individual private
libraries.
---
 pkgs/development/compilers/julia/0.3.nix | 117 ++++++++++++-----------
 1 file changed, 59 insertions(+), 58 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 563e59a2f58..3eb55ad8ac0 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -8,38 +8,12 @@ with stdenv.lib;
 
 let
   realGcc = stdenv.cc.cc;
-  arch = head (splitString "-" stdenv.system);
-  march =
-    {
-      "x86_64-linux" = "x86-64";
-      "i686-linux" = "i686";
-    }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
-
-  dsfmt_ver = "2.2";
-  grisu_ver = "1.1.1";
-  utf8proc_ver = "1.1.6";
-
-  dsfmt_src = fetchurl {
-    url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz";
-    name = "dsfmt-${dsfmt_ver}.tar.gz";
-    md5 = "cb61be3be7254eae39684612c524740d";
-  };
-  grisu_src = fetchurl {
-    url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
-    md5 = "29b533ed4311161267bff1a9a97e2953";
-  };
-  utf8proc_src = fetchurl {
-    url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
-    md5 = "2462346301fac2994c34f5574d6c3ca7";
-  };
 in
 stdenv.mkDerivation rec {
   pname = "julia";
   version = "0.3.6";
   name = "${pname}-${version}";
 
-  extraSrcs = [ dsfmt_src grisu_src utf8proc_src ];
-
   src = fetchgit {
     url = "git://github.com/JuliaLang/julia.git";
     rev = "refs/tags/v${version}";
@@ -47,6 +21,27 @@ stdenv.mkDerivation rec {
     name = "julia-git-v${version}";
   };
 
+  extraSrcs =
+    let
+      dsfmt_ver = "2.2";
+      grisu_ver = "1.1.1";
+      utf8proc_ver = "1.1.6";
+
+      dsfmt_src = fetchurl {
+        url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz";
+        name = "dsfmt-${dsfmt_ver}.tar.gz";
+        md5 = "cb61be3be7254eae39684612c524740d";
+      };
+      grisu_src = fetchurl {
+        url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
+        md5 = "29b533ed4311161267bff1a9a97e2953";
+      };
+      utf8proc_src = fetchurl {
+        url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
+        md5 = "2462346301fac2994c34f5574d6c3ca7";
+      };
+    in [ dsfmt_src grisu_src utf8proc_src ];
+
   buildInputs =
     [
       gfortran perl m4 gmp pcre llvm readline zlib
@@ -55,31 +50,37 @@ stdenv.mkDerivation rec {
     ];
 
   makeFlags =
-    [
-      "USE_SYSTEM_PATCHELF=1"
-      "USE_SYSTEM_BLAS=1"
-      "USE_SYSTEM_LAPACK=1"
-      "USE_SYSTEM_ARPACK=1"
+    let
+      arch = head (splitString "-" stdenv.system);
+      march =
+        {
+          "x86_64-linux" = "x86-64";
+          "i686-linux" = "i686";
+        }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
+    in [
       "ARCH=${arch}"
       "MARCH=${march}"
       "JULIA_CPU_TARGET=${march}"
       "PREFIX=$(out)"
       "prefix=$(out)"
       "SHELL=${stdenv.shell}"
+
+      "USE_SYSTEM_PATCHELF=1"
+
+      "USE_SYSTEM_BLAS=1"
+      "LIBBLAS=-lopenblas"
+      "LIBBLASNAME=libopenblas"
+
+      "USE_SYSTEM_LAPACK=1"
+      "LIBLAPACK=-lopenblas"
+      "LIBLAPACKNAME=libopenblas"
+
+      "USE_SYSTEM_ARPACK=1"
     ];
 
   GLPK_PREFIX = "${glpk}/include";
 
   NIX_CFLAGS_COMPILE = [ "-fPIC" ];
-  NIX_LDFLAGS =
-    optionals
-      (realGcc != null)
-      [
-        "-L${realGcc}/lib"
-        "-L${realGcc}/lib64"
-        "-lpcre" "-lm" "-lfftw3f" "-lfftw3" "-lglpk"
-        "-lunistring" "-lz" "-lgmp" "-lmpfr" "-lopenblas"
-      ];
 
   postPatch = ''
     sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
@@ -92,6 +93,24 @@ stdenv.mkDerivation rec {
     sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
   '';
 
+  # Julia tries to load these libraries dynamically at runtime, but they can't be found.
+  # Easier by far to link against them as usual.
+  # These go in LDFLAGS, where they affect only Julia itself, and not NIX_LDFLAGS,
+  # where they would also be used for all the private libraries Julia builds.
+  LDFLAGS = [
+    "-larpack"
+    "-lfftw3_threads"
+    "-lfftw3f_threads"
+    "-lglpk"
+    "-lgmp"
+    "-lmpfr"
+    "-lopenblas"
+    "-lpcre"
+    "-lsuitesparse"
+    "-lunistring"
+    "-lz"
+  ];
+
   configurePhase = ''
     for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK ZLIB MPFR;
     do
@@ -106,27 +125,9 @@ stdenv.mkDerivation rec {
       copy_kill_hash "$i" deps
     done
 
-    ${if realGcc ==null then "" else ''export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib"''}
-
-    export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia"
-
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia"
-
     export PATH="$PATH:${stdenv.cc.libc}/sbin"
   '';
 
-  preBuild = ''
-    # Link dynamically loaded shared libraries into output so they are found at runtime.
-    mkdir -p "$out/lib/julia"
-    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/libblas.so"
-    ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/liblapack.so"
-    ln -s "${suitesparse}/lib/libsuitesparse.so" "$out/lib/julia/libsuitesparse.so"
-    ln -s "${arpack}/lib/libarpack.so" "$out/lib/julia/libarpack.so"
-    for i in umfpack cholmod amd camd colamd spqr; do
-      ln -s libsuitesparse.so "$out/lib/julia/lib$i.so";
-    done
-  '';
-
   dontStrip = true;
   dontPatchELF = true;
 

From 2b525f60c9981f67eb6ebe662a8d9b1c51f552d1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 12:36:34 -0500
Subject: [PATCH 0793/2322] update julia-0.3.6 -> julia-0.3.9

Includes a workaround for the test suite suggested by
upstream (https://github.com/JuliaLang/julia/commit/b192bf0e2f0a0c5b232c3352c6e996e5f11053f2#commitcomment-11139348)
for a buggy system wcwidth.
---
 pkgs/development/compilers/julia/0.3.nix      |  6 +++--
 .../0001-work-around-buggy-wcwidth.patch      | 24 +++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 3eb55ad8ac0..9faeda21593 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -11,16 +11,18 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "julia";
-  version = "0.3.6";
+  version = "0.3.9";
   name = "${pname}-${version}";
 
   src = fetchgit {
     url = "git://github.com/JuliaLang/julia.git";
     rev = "refs/tags/v${version}";
-    md5 = "d28e8f428485219f756d80c011d5dd32";
+    sha256 = "ad0820affefd04eb6fba7deb2603756974711846a251900a9202b8d2665a37cf";
     name = "julia-git-v${version}";
   };
 
+  patches = [ ./0001-work-around-buggy-wcwidth.patch ];
+
   extraSrcs =
     let
       dsfmt_ver = "2.2";
diff --git a/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch b/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch
new file mode 100644
index 00000000000..7c4870fb2a8
--- /dev/null
+++ b/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch
@@ -0,0 +1,24 @@
+From b9070aeab0ab672ffe321089631f9afe263b0caa Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Thu, 4 Jun 2015 12:03:32 -0500
+Subject: [PATCH] work around buggy wcwidth
+
+---
+ test/unicode.jl | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/test/unicode.jl b/test/unicode.jl
+index 52c3e6a..f1ef698 100644
+--- a/test/unicode.jl
++++ b/test/unicode.jl
+@@ -103,5 +103,6 @@ end
+ 
+ # handling of embedded NUL chars (#10958)
+ @test length("\0w") == length("\0α") == 2
+-@test strwidth("\0w") == strwidth("\0α") == 1
++@test strwidth("\0w") == charwidth('\0') + charwidth('w')
++@test strwidth("\0α") == charwidth('\0') + charwidth('α')
+ @test normalize_string("\0W", casefold=true) == "\0w"
+-- 
+2.4.1
+

From 63be59abc75eb79eaeaf455608539001624ce420 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 12:37:57 -0500
Subject: [PATCH 0794/2322] utf8proc: use makeFlags instead of overriding
 installPhase

---
 pkgs/development/libraries/utf8proc/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix
index 63de08b46dd..c8a2fd6a4e9 100644
--- a/pkgs/development/libraries/utf8proc/default.nix
+++ b/pkgs/development/libraries/utf8proc/default.nix
@@ -11,9 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1ryjlcnpfm7fpkq6444ybi576hbnh2l0w7kjhbqady5lxwjyg3pf";
   };
 
-  installPhase = ''
-    make install prefix=$out
-  '';
+  makeFlags = [ "prefix=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "A clean C library for processing UTF-8 Unicode data";

From b255f8df2ed76e9696dbbcfefc126a6a84f7e6dc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 12:38:36 -0500
Subject: [PATCH 0795/2322] julia03: use system utf8proc

---
 pkgs/development/compilers/julia/0.3.nix | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 9faeda21593..560298243d2 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
 , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
-, ncurses, libunistring, patchelf, openblas, arpack
-, tcl, tk, xproto, libX11, git, mpfr, which
+, ncurses, patchelf, openblas, arpack
+, tcl, tk, xproto, libX11, git, mpfr, which, utf8proc
 }:
 
 with stdenv.lib;
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
     let
       dsfmt_ver = "2.2";
       grisu_ver = "1.1.1";
-      utf8proc_ver = "1.1.6";
 
       dsfmt_src = fetchurl {
         url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz";
@@ -38,19 +37,17 @@ stdenv.mkDerivation rec {
         url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
         md5 = "29b533ed4311161267bff1a9a97e2953";
       };
-      utf8proc_src = fetchurl {
-        url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
-        md5 = "2462346301fac2994c34f5574d6c3ca7";
-      };
-    in [ dsfmt_src grisu_src utf8proc_src ];
+    in [ dsfmt_src grisu_src ];
 
   buildInputs =
     [
-      gfortran perl m4 gmp pcre llvm readline zlib
-      fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
-      arpack openblas tcl tk xproto libX11 git mpfr which
+      gfortran gmp pcre llvm readline zlib
+      fftw fftwSinglePrec libunwind suitesparse glpk ncurses
+      arpack openblas tcl tk xproto libX11 mpfr utf8proc
     ];
 
+  nativeBuildInputs = [ patchelf perl m4 which git ];
+
   makeFlags =
     let
       arch = head (splitString "-" stdenv.system);
@@ -78,6 +75,8 @@ stdenv.mkDerivation rec {
       "LIBLAPACKNAME=libopenblas"
 
       "USE_SYSTEM_ARPACK=1"
+
+      "USE_SYSTEM_UTF8PROC=1"
     ];
 
   GLPK_PREFIX = "${glpk}/include";
@@ -109,7 +108,6 @@ stdenv.mkDerivation rec {
     "-lopenblas"
     "-lpcre"
     "-lsuitesparse"
-    "-lunistring"
     "-lz"
   ];
 

From 6f3dfc0cf886643b3a5e79b2eb7dc412ab9dc833 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 12:48:46 -0500
Subject: [PATCH 0796/2322] julia03: remove unused dependencies

---
 pkgs/development/compilers/julia/0.3.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 560298243d2..9f228212a3b 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -1,14 +1,11 @@
 { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
 , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
 , ncurses, patchelf, openblas, arpack
-, tcl, tk, xproto, libX11, git, mpfr, which, utf8proc
+, git, mpfr, which, utf8proc
 }:
 
 with stdenv.lib;
 
-let
-  realGcc = stdenv.cc.cc;
-in
 stdenv.mkDerivation rec {
   pname = "julia";
   version = "0.3.9";
@@ -43,7 +40,7 @@ stdenv.mkDerivation rec {
     [
       gfortran gmp pcre llvm readline zlib
       fftw fftwSinglePrec libunwind suitesparse glpk ncurses
-      arpack openblas tcl tk xproto libX11 mpfr utf8proc
+      arpack openblas mpfr utf8proc
     ];
 
   nativeBuildInputs = [ patchelf perl m4 which git ];

From 1a11b52ffab4c1832f0367fa15142f8b3ebda9c4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 13:18:45 -0500
Subject: [PATCH 0797/2322] julia03: use system double_conversion (grisu)

---
 pkgs/development/compilers/julia/0.3.nix | 43 ++++++++++++------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 9f228212a3b..fdf6ee1dec2 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -1,7 +1,11 @@
-{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
-, readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
-, ncurses, patchelf, openblas, arpack
-, git, mpfr, which, utf8proc
+{ stdenv, fetchgit, fetchurl
+# build tools
+, gfortran, git, m4, patchelf, perl, which
+# libjulia dependencies
+, libunwind, llvm, readline, utf8proc, zlib
+# standard library dependencies
+, double_conversion, fftwSinglePrec, fftw, glpk, gmp, mpfr, pcre
+, openblas, arpack, suitesparse
 }:
 
 with stdenv.lib;
@@ -23,34 +27,28 @@ stdenv.mkDerivation rec {
   extraSrcs =
     let
       dsfmt_ver = "2.2";
-      grisu_ver = "1.1.1";
 
       dsfmt_src = fetchurl {
         url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz";
         name = "dsfmt-${dsfmt_ver}.tar.gz";
         md5 = "cb61be3be7254eae39684612c524740d";
       };
-      grisu_src = fetchurl {
-        url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
-        md5 = "29b533ed4311161267bff1a9a97e2953";
-      };
-    in [ dsfmt_src grisu_src ];
+    in [ dsfmt_src ];
 
   buildInputs =
-    [
-      gfortran gmp pcre llvm readline zlib
-      fftw fftwSinglePrec libunwind suitesparse glpk ncurses
-      arpack openblas mpfr utf8proc
+    [ libunwind llvm readline utf8proc zlib
+      double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre
+      openblas arpack suitesparse
     ];
 
-  nativeBuildInputs = [ patchelf perl m4 which git ];
+  nativeBuildInputs = [ gfortran git m4 patchelf perl which ];
 
   makeFlags =
     let
       arch = head (splitString "-" stdenv.system);
       march =
-        {
-          "x86_64-linux" = "x86-64";
+        { "x86_64-linux" = "x86-64";
+          "x86_64-darwin" = "x86-64";
           "i686-linux" = "i686";
         }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
     in [
@@ -61,8 +59,6 @@ stdenv.mkDerivation rec {
       "prefix=$(out)"
       "SHELL=${stdenv.shell}"
 
-      "USE_SYSTEM_PATCHELF=1"
-
       "USE_SYSTEM_BLAS=1"
       "LIBBLAS=-lopenblas"
       "LIBBLASNAME=libopenblas"
@@ -72,7 +68,8 @@ stdenv.mkDerivation rec {
       "LIBLAPACKNAME=libopenblas"
 
       "USE_SYSTEM_ARPACK=1"
-
+      "USE_SYSTEM_GRISU=1"
+      "USE_SYSTEM_PATCHELF=1"
       "USE_SYSTEM_UTF8PROC=1"
     ];
 
@@ -81,8 +78,10 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = [ "-fPIC" ];
 
   postPatch = ''
-    sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
-    sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile
+    sed -i deps/Makefile \
+        -e "s@/usr/local/lib@$out/lib@g" \
+        -e "s@/usr/lib@$out/lib@g" \
+        -e "s@/usr/include/double-conversion@${double_conversion}/include/double-conversion@g"
 
     patchShebangs . contrib
 

From 6e3eac5c92036554974b34443e8157b7af9b67df Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 13:31:15 -0500
Subject: [PATCH 0798/2322] julia03: avoid opaque shell scripts

The old expression used a shell script to set some repetitive
makeFlags. The makeFlags settings were spread out over different parts
of the expression. This deters new contributors. The new expression is
clearer, at the cost of being slightly repetitive.
---
 pkgs/development/compilers/julia/0.3.nix | 61 +++++++++++++-----------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index fdf6ee1dec2..42b296c7b85 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -35,6 +35,29 @@ stdenv.mkDerivation rec {
       };
     in [ dsfmt_src ];
 
+  prePatch = ''
+    copy_kill_hash(){
+      cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
+    }
+
+    for i in $extraSrcs; do
+      copy_kill_hash "$i" deps
+    done
+  '';
+
+  postPatch = ''
+    sed -i deps/Makefile \
+        -e "s@/usr/local/lib@$out/lib@g" \
+        -e "s@/usr/lib@$out/lib@g" \
+        -e "s@/usr/include/double-conversion@${double_conversion}/include/double-conversion@g"
+
+    patchShebangs . contrib
+
+    # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache
+    # is probably not what we want anyway on non-NixOS
+    sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
+  '';
+
   buildInputs =
     [ libunwind llvm readline utf8proc zlib
       double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre
@@ -68,28 +91,25 @@ stdenv.mkDerivation rec {
       "LIBLAPACKNAME=libopenblas"
 
       "USE_SYSTEM_ARPACK=1"
+      "USE_SYSTEM_FFTW=1"
+      "USE_SYSTEM_GLPK=1"
+      "USE_SYSTEM_GMP=1"
       "USE_SYSTEM_GRISU=1"
+      "USE_SYSTEM_LIBUNWIND=1"
+      "USE_SYSTEM_LLVM=1"
+      "USE_SYSTEM_MPFR=1"
       "USE_SYSTEM_PATCHELF=1"
+      "USE_SYSTEM_PCRE=1"
+      "USE_SYSTEM_READLINE=1"
+      "USE_SYSTEM_SUITESPARSE=1"
       "USE_SYSTEM_UTF8PROC=1"
+      "USE_SYSTEM_ZLIB=1"
     ];
 
   GLPK_PREFIX = "${glpk}/include";
 
   NIX_CFLAGS_COMPILE = [ "-fPIC" ];
 
-  postPatch = ''
-    sed -i deps/Makefile \
-        -e "s@/usr/local/lib@$out/lib@g" \
-        -e "s@/usr/lib@$out/lib@g" \
-        -e "s@/usr/include/double-conversion@${double_conversion}/include/double-conversion@g"
-
-    patchShebangs . contrib
-
-    # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache
-    # is probably not what we want anyway on non-NixOS
-    sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
-  '';
-
   # Julia tries to load these libraries dynamically at runtime, but they can't be found.
   # Easier by far to link against them as usual.
   # These go in LDFLAGS, where they affect only Julia itself, and not NIX_LDFLAGS,
@@ -107,20 +127,7 @@ stdenv.mkDerivation rec {
     "-lz"
   ];
 
-  configurePhase = ''
-    for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK ZLIB MPFR;
-    do
-      makeFlags="$makeFlags USE_SYSTEM_$i=1 "
-    done
-
-    copy_kill_hash(){
-      cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
-    }
-
-    for i in $extraSrcs; do
-      copy_kill_hash "$i" deps
-    done
-
+  preConfigure = ''
     export PATH="$PATH:${stdenv.cc.libc}/sbin"
   '';
 

From 90b2afee040c8c20af58fdcec789e9bb73908b9a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 13:49:41 -0500
Subject: [PATCH 0799/2322] haskell-hmatrix: build with openblas

Fixes #6392.
---
 pkgs/development/haskell-modules/configuration-common.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ade2055187d..dbb7aadb4a2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -119,6 +119,11 @@ self: super: {
   # Help libconfig find it's C language counterpart.
   libconfig = (dontCheck super.libconfig).override { config = pkgs.libconfig; };
 
+  hmatrix = overrideCabal super.hmatrix (drv: {
+    configureFlags = (drv.configureFlags or []) ++ [ "-fopenblas" ];
+    extraLibraries = [ pkgs.openblasCompat ];
+  });
+
   # The Haddock phase fails for one reason or another.
   attoparsec-conduit = dontHaddock super.attoparsec-conduit;
   base-noprelude = dontHaddock super.base-noprelude;

From e729a88474da9e6cccd111a5f7c71f164ab8d784 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 16:49:04 -0500
Subject: [PATCH 0800/2322] R: build with openblas

Fixes #6393.
---
 pkgs/applications/science/math/R/default.nix | 12 ++++++------
 pkgs/top-level/all-packages.nix              |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index d0adb338207..72de0677e73 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, blas, bzip2, gfortran, liblapack, libX11, libXmu, libXt
+{ stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt
 , libjpeg, libpng, libtiff, ncurses, pango, pcre, perl, readline, tcl
 , texLive, tk, xz, zlib, less, texinfo, graphviz, icu, pkgconfig, bison
-, imake, which, jdk, atlas
+, imake, which, jdk, openblas
 , withRecommendedPackages ? true
 }:
 
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
     sha256 = "0dagyqgvi8i3nw158qi2zpwm04s4ffzvnmk5niaksvxs30zrbbpm";
   };
 
-  buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt
+  buildInputs = [ bzip2 gfortran libX11 libXmu libXt
     libXt libjpeg libpng libtiff ncurses pango pcre perl readline tcl
     texLive tk xz zlib less texinfo graphviz icu pkgconfig bison imake
-    which jdk atlas
+    which jdk openblas
   ];
 
   patches = [ ./no-usr-local-search-paths.patch ];
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
     configureFlagsArray=(
       --disable-lto
       --with${stdenv.lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages
-      --with-blas="-L${atlas}/lib -lf77blas -latlas"
-      --with-lapack="-L${liblapack}/lib -llapack"
+      --with-blas="-L${openblas}/lib -lopenblas"
+      --with-lapack="-L${openblas}/lib -lopenblas"
       --with-readline
       --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh"
       --with-cairo
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e96c04b7d8..9f95e32e951 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8556,6 +8556,7 @@ let
   R = callPackage ../applications/science/math/R {
     inherit (xlibs) libX11 libXt;
     texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; };
+    openblas = openblasCompat;
     withRecommendedPackages = false;
   };
 

From bfe106cfa6613c4ab5c6b7aa6a0650e11bc63267 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Jun 2015 17:17:40 -0500
Subject: [PATCH 0801/2322] Build numpy and scipy with openblas

Fixes #6772.
---
 .../python-modules/numpy-scipy-support.nix         | 14 +++++++-------
 pkgs/top-level/python-packages.nix                 |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/numpy-scipy-support.nix b/pkgs/development/python-modules/numpy-scipy-support.nix
index 22be22633c2..915b27cb4cd 100644
--- a/pkgs/development/python-modules/numpy-scipy-support.nix
+++ b/pkgs/development/python-modules/numpy-scipy-support.nix
@@ -3,14 +3,14 @@
   python,
   # Name of package (e.g. numpy or scipy)
   pkgName,
-  # Atlas math library
-  atlas
+  # OpenBLAS math library
+  openblas
 }:
 
 {
-  # Re-export atlas here so that it can be sure that the same one will be used
+  # Re-export openblas here so that it can be sure that the same one will be used
   # in the propagatedBuildInputs.
-  inherit atlas;
+  inherit openblas;
 
   # First "install" the package, then import what was installed, and call the
   # .test() function, which will run the test suite.
@@ -48,9 +48,9 @@
   preBuild = ''
     echo "Creating site.cfg file..."
     cat << EOF > site.cfg
-    [atlas]
-    include_dirs = ${atlas}/include
-    library_dirs = ${atlas}/lib
+    [openblas]
+    include_dirs = ${openblas}/include
+    library_dirs = ${openblas}/lib
     EOF
   '';
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a5ad7e46f4f..80931ecfe1f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7798,7 +7798,7 @@ let
   numpy = let
     support = import ../development/python-modules/numpy-scipy-support.nix {
       inherit python;
-      atlas = pkgs.atlasWithLapack;
+      openblas = pkgs.openblasCompat;
       pkgName = "numpy";
     };
   in buildPythonPackage ( rec {
@@ -7821,7 +7821,7 @@ let
     setupPyBuildFlags = ["--fcompiler='gnu95'"];
 
     buildInputs = [ pkgs.gfortran self.nose ];
-    propagatedBuildInputs = [ support.atlas ];
+    propagatedBuildInputs = [ support.openblas ];
 
     meta = {
       description = "Scientific tools for Python";
@@ -11260,7 +11260,7 @@ let
   scipy = let
     support = import ../development/python-modules/numpy-scipy-support.nix {
       inherit python;
-      atlas = pkgs.atlasWithLapack;
+      openblas = pkgs.openblasCompat;
       pkgName = "numpy";
     };
   in buildPythonPackage rec {

From daf0e6500d3adf71b43621eb0d2831facfdc5859 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Fri, 5 Jun 2015 09:20:46 +0200
Subject: [PATCH 0802/2322] python-packages: updates pyinotify 0.9.3 to 0.9.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b0a0325d903..5083d4d1032 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9697,22 +9697,15 @@ let
     };
   };
 
-  pyinotify = pkgs.stdenv.mkDerivation rec {
-    name = "python-pyinotify-${version}";
-    version = "0.9.3";
+  pyinotify = buildPythonPackage rec {
+    name = "pyinotify";
+    version = "0.9.5";
 
-    src = pkgs.fetchgit {
-      url = "git://github.com/seb-m/pyinotify.git";
-      rev = "refs/tags/${version}";
-      sha256 = "d38ce95e4af00391e58246a8d7fe42bdb51d63054b09809600b2faef2a803472";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/${name}/${name}-${version}.tar.gz";
+      sha256 = "06yblnif9v05xwsbs089n0bj60ndb4lzkv1i15fprqnf6sgjmig7";
     };
 
-    buildInputs = with self; [ python ];
-
-    installPhase = ''
-      ${python}/bin/${python.executable} setup.py install --prefix=$out
-    '';
-
     meta = {
       homepage = https://github.com/seb-m/pyinotify/wiki;
       description = "Monitor filesystems events on Linux platforms with inotify";

From 86a511a398d83a2e5374e8e8d6f9c64f38f6e5b3 Mon Sep 17 00:00:00 2001
From: Michael Phillips <michaelalanphillips@gmail.com>
Date: Thu, 4 Jun 2015 22:57:40 -0500
Subject: [PATCH 0803/2322] youtube-dl: remove unnecessary pandoc dependency

---
 pkgs/tools/misc/youtube-dl/default.nix | 10 ++++++++--
 pkgs/top-level/all-packages.nix        |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 1a513cdaece..18d6df1e272 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchurl, makeWrapper, python, zip, pandoc, ffmpeg }:
+{ manuals ? true
+, stdenv, fetchurl, makeWrapper, python, zip, 
+pandoc ? null 
+, ffmpeg }:
+
+assert manuals -> pandoc != null;
 
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
@@ -9,7 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij";
   };
 
-  nativeBuildInputs = [ pandoc ];
+  nativeBuildInputs = [ ]
+    ++ stdenv.lib.optional manuals pandoc;
 
   buildInputs = [ python makeWrapper zip ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b54674cb65..024f9cf7bcf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3384,7 +3384,9 @@ let
   # To expose more packages for Yi, override the extraPackages arg.
   yi = callPackage ../applications/editors/yi/wrapper.nix { };
 
-  youtube-dl = callPackage ../tools/misc/youtube-dl { };
+  youtube-dl = callPackage ../tools/misc/youtube-dl {
+  	manuals = false;
+   };
 
   zbar = callPackage ../tools/graphics/zbar {
     pygtk = lib.overrideDerivation pygtk (x: {

From c1c4ca08def84f339447e23b0ee4ead3c2568b6f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Jun 2015 10:38:35 +0200
Subject: [PATCH 0804/2322] youtube-dl: clean up the expression and document
 the pandoc situation

This patch resolves https://github.com/NixOS/nixpkgs/pull/8184.
---
 pkgs/tools/misc/youtube-dl/default.nix | 21 +++++++++------------
 pkgs/top-level/all-packages.nix        |  6 ++++--
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 18d6df1e272..3985f8a0c83 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,9 +1,11 @@
-{ manuals ? true
-, stdenv, fetchurl, makeWrapper, python, zip, 
-pandoc ? null 
-, ffmpeg }:
+{ stdenv, fetchurl, makeWrapper, python, zip, ffmpeg, pandoc ? null }:
 
-assert manuals -> pandoc != null;
+# Pandoc is required to build the package's man page. Release tarballs
+# contain a formatted man page already, though, so it's fine to pass
+# "pandoc = null" to this derivation; the man page will still be
+# installed. We keep the pandoc argument and build input in place in
+# case someone wants to use this derivation to build a Git version of
+# the tool that doesn't have the formatted man page included.
 
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
@@ -14,14 +16,9 @@ stdenv.mkDerivation rec {
     sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij";
   };
 
-  nativeBuildInputs = [ ]
-    ++ stdenv.lib.optional manuals pandoc;
+  buildInputs = [ python makeWrapper zip pandoc ];
 
-  buildInputs = [ python makeWrapper zip ];
-
-  patchPhase = ''
-    rm youtube-dl
-  '';
+  patchPhase = "rm youtube-dl";
 
   configurePhase = ''
     makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python )
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 024f9cf7bcf..a3262dc7943 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3385,8 +3385,10 @@ let
   yi = callPackage ../applications/editors/yi/wrapper.nix { };
 
   youtube-dl = callPackage ../tools/misc/youtube-dl {
-  	manuals = false;
-   };
+    # Release versions don't need pandoc because the formatted man page
+    # is included in the tarball.
+    pandoc = null;
+  };
 
   zbar = callPackage ../tools/graphics/zbar {
     pygtk = lib.overrideDerivation pygtk (x: {

From 7acb77ca2bfd54578ad4a37c05666ea5da967457 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Jun 2015 12:42:34 +0200
Subject: [PATCH 0805/2322] cabal2nix: run "git reset --hard" to clean up the
 source to avoid the "-dirty" tag

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

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 240353b6e75..3da457bdf76 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -32,7 +32,7 @@ mkDerivation rec {
   ];
   buildTools = [ gitMinimal makeWrapper ];
   preConfigure = ''
-    sed -i -e 's|, "--dirty"||' generate-cabal-file.hs
+    git reset --hard # Re-create the index that fetchgit destroyed in the name of predictable hashes.
     runhaskell $setupCompileFlags generate-cabal-file --release >cabal2nix.cabal
   '';
   postInstall = ''
@@ -41,7 +41,7 @@ mkDerivation rec {
     rm -rf $out/{bin,lib,share}
     makeWrapper $exe $out/bin/cabal2nix --prefix PATH ":" "${nix-prefetch-scripts}/bin"
     mkdir -p $out/share/bash-completion/completions
-    $exe --bash-completion-script $out/bin/cabal2nix >$out/share/bash-completion/completions/cabal2nix
+    $exe --bash-completion-script $exe >$out/share/bash-completion/completions/cabal2nix
   '';
   homepage = "http://github.com/NixOS/cabal2nix/";
   description = "Convert Cabal files into Nix build instructions";

From a70d0275e27d5a26719cd53fa279a854819caf16 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Jun 2015 13:53:49 +0200
Subject: [PATCH 0806/2322] nixUnstable: Bump

This should fix the NixOS installer tests.
---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index bfa23325b39..f8d4c1fd119 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.9pre4132_07c69aa";
+  name = "nix-1.9pre4153_b64988b";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/22635534/download/4/${name}.tar.xz";
-    sha256 = "adaf272b50fce0d8aec34b38b5b62cb3438eeb379f918f85f76f43a7314d23d6";
+    url = "http://hydra.nixos.org/build/22838666/download/4/${name}.tar.xz";
+    sha256 = "51b4870305724aa7b26c92b43cb22a0e9b6798ac2534db493079bfc383244e31";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];

From 45cad45e4dfb3f0652882781f97ff90167cff83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= <r.dahlen@gmail.com>
Date: Fri, 5 Jun 2015 15:15:21 +0100
Subject: [PATCH 0807/2322] wrk: Update from 3.1.2 to 4.0.0 (master)

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

diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix
index f4cdb7eaddb..312d4c6fe9b 100644
--- a/pkgs/tools/networking/wrk/default.nix
+++ b/pkgs/tools/networking/wrk/default.nix
@@ -1,20 +1,19 @@
 { stdenv, fetchgit, openssl }:
 
 let
-  version = "3.1.2";
+  version = "4.0.0";
 
 in stdenv.mkDerivation rec {
   name = "wrk-${version}";
 
   src = fetchgit {
     url = "https://github.com/wg/wrk.git";
-    rev = "a52c770204a732aa63e1bb6eb241a70949e3a2a9";
-    sha256 = "0b81lg251ivi94f7kfgz8ws4xns5p7hw5qiwjwwlc3dimjgrg387";
+    rev = "7cdede916a53da253c995767a92eec36a245a2cc";
+    sha256 = "0m8i5pk2rj40v28bzrskkzw54v9jqdby52dwfcypannhlhgqnhy2";
   };
 
-  NIX_CFLAGS_COMPILE = "-I${openssl}/include";
-  NIX_CFLAGS_LINK = "-L${openssl}/lib";
-
+  buildInputs = [ openssl ];
+  
   installPhase = ''
     mkdir -p $out/bin
     cp wrk $out/bin

From 714377f8dc41e505b8039bae5870ce724a29da9a Mon Sep 17 00:00:00 2001
From: Timofey Lagutin <lostdj@gmail.com>
Date: Fri, 5 Jun 2015 18:39:01 +0300
Subject: [PATCH 0808/2322] bittorrentsync: fix storage_path.

If this path is a symlink, btsync won't be able to read it if it's not ending with "/".

As seen in https://github.com/NixOS/nixpkgs/commit/f02d4ec9ed39694e04aa52937a9f73e217aff7f8
Broken in https://github.com/NixOS/nixpkgs/commit/0539ed477151a3adfff5012cabff0527a9a8c0bb
---
 nixos/modules/services/networking/btsync.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix
index d0123b79e3f..bd7a5bcebe6 100644
--- a/nixos/modules/services/networking/btsync.nix
+++ b/nixos/modules/services/networking/btsync.nix
@@ -208,8 +208,8 @@ in
 
       storagePath = mkOption {
         type = types.path;
-        default = "/var/lib/btsync";
-        example = "/var/lib/btsync";
+        default = "/var/lib/btsync/";
+        example = "/var/lib/btsync/";
         description = ''
           Where to store the bittorrent sync files.
         '';

From 9176f73ceed438857e8c503a1a34fd0161db6297 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 5 Jun 2015 19:17:50 +0200
Subject: [PATCH 0809/2322] buildRustPackage: Cosmetic improvement

---
 pkgs/build-support/rust/fetch-cargo-deps | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps
index 69eb404e644..ae1ca62050f 100755
--- a/pkgs/build-support/rust/fetch-cargo-deps
+++ b/pkgs/build-support/rust/fetch-cargo-deps
@@ -24,10 +24,12 @@ export CARGO_HOME=$out
 cd $src
 
 if [[ ! -f Cargo.lock ]]; then
+    echo
     echo "ERROR: The Cargo.lock file doesn't exist"
     echo
     echo "Cargo.lock is needed to make sure that depsSha256 doesn't change"
     echo "when the registry is updated."
+    echo
 
     exit 1
 fi

From ffd0539eba473348f752fa8ab1f1f55388634f8f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 5 Jun 2015 13:00:52 -0700
Subject: [PATCH 0810/2322] cacert: store ca-bundle.crt in $out/etc/ssl/certs
 instead of $out

---
 nixos/modules/security/ca.nix                                 | 4 ++--
 pkgs/applications/graphics/shotwell/default.nix               | 2 +-
 pkgs/applications/networking/browsers/vimb/default.nix        | 2 +-
 .../applications/networking/browsers/vimprobable2/default.nix | 2 +-
 pkgs/applications/networking/cluster/panamax/api/default.nix  | 4 ++--
 .../networking/instant-messengers/fuze/default.nix            | 2 +-
 .../instant-messengers/telepathy/gabble/default.nix           | 2 +-
 pkgs/applications/networking/irc/weechat/default.nix          | 2 +-
 pkgs/applications/version-management/bazaar/default.nix       | 2 +-
 pkgs/applications/version-management/mercurial/default.nix    | 2 +-
 pkgs/build-support/fetchgit/default.nix                       | 2 +-
 pkgs/build-support/rust/fetchcargo.nix                        | 2 +-
 pkgs/data/misc/cacert/default.nix                             | 4 ++--
 pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix     | 2 +-
 pkgs/desktops/gnome-3/3.16/core/rest/default.nix              | 2 +-
 pkgs/development/compilers/icedtea/default.nix                | 2 +-
 pkgs/development/compilers/openjdk/default.nix                | 2 +-
 pkgs/development/compilers/openjdk/openjdk8.nix               | 2 +-
 pkgs/development/interpreters/elixir/default.nix              | 2 +-
 pkgs/development/libraries/glib-networking/default.nix        | 2 +-
 pkgs/development/lisp-modules/lisp-packages.nix               | 4 ++--
 pkgs/servers/mail/opensmtpd/default.nix                       | 2 +-
 pkgs/tools/networking/aria2/default.nix                       | 2 +-
 pkgs/tools/security/prey/default.nix                          | 2 +-
 24 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix
index 595b9476fa5..31caab97a65 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@@ -22,7 +22,7 @@ in
     security.pki.certificateFiles = mkOption {
       type = types.listOf types.path;
       default = [];
-      example = literalExample "[ \"\${pkgs.cacert}/ca-bundle.crt\" ]";
+      example = literalExample "[ \"\${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt\" ]";
       description = ''
         A list of files containing trusted root certificates in PEM
         format. These are concatenated to form
@@ -53,7 +53,7 @@ in
 
   config = {
 
-    security.pki.certificateFiles = [ "${pkgs.cacert}/ca-bundle.crt" ];
+    security.pki.certificateFiles = [ "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ];
 
     # NixOS canonical location + Debian/Ubuntu/Arch/Gentoo compatibility.
     environment.etc."ssl/certs/ca-certificates.crt".source = caBundle;
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 27dde61a08c..94131cbf4ff 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -13,7 +13,7 @@ let
       sha256 = "0fmg7fq5fx0jg3ryk71kwdkspsvj42acxy9imk7vznkqj29a9zqn";
     };
     
-    configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt";
+    configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt";
     
     buildInputs = [ pkgconfig glib libsoup ];
   };
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index 24a43d95ca9..3222e87ac65 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   # Nixos default ca bundle
   patchPhase = ''
-    sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/ca-bundle.crt, src/config.def.h
+    sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/etc/ssl/certs/ca-bundle.crt, src/config.def.h
   '';
 
   buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ];
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index 7ab5c397abe..ad5f8aa4691 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   # Nixos default ca bundle
   patchPhase = ''
-    sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/ca-bundle.crt, config.h
+    sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/etc/ssl/certs/ca-bundle.crt, config.h
   '';
 
   buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ];
diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix
index dae0315a31b..a212ab5347c 100644
--- a/pkgs/applications/networking/cluster/panamax/api/default.nix
+++ b/pkgs/applications/networking/cluster/panamax/api/default.nix
@@ -62,8 +62,8 @@ stdenv.mkDerivation rec {
       --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \
       --prefix "HOME" : "$out/share/panamax-api" \
       --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \
-      --prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/ca-bundle.crt" \
-      --prefix "SSL_CERT_FILE" : "${cacert}/ca-bundle.crt" \
+      --prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/etc/ssl/certs/ca-bundle.crt" \
+      --prefix "SSL_CERT_FILE" : "${cacert}/etc/ssl/certs/ca-bundle.crt" \
       --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}"
   '';
 
diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix
index 77fe37481d8..6b85e107d06 100644
--- a/pkgs/applications/networking/instant-messengers/fuze/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fuze/default.nix
@@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux";
 let
   curl_custom =
     stdenv.lib.overrideDerivation curl (args: { 
-      configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/ca-bundle.crt"] ; 
+      configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt"] ; 
     } );
 in
 stdenv.mkDerivation {
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index b7cebd47cd7..a74885b2ce3 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ]
     ++ stdenv.lib.optional doCheck dbus_daemon;
 
-  configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt";
+  configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt";
 
   enableParallelBuilding = true;
   doCheck = true;
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index bbad1587982..fd200af0a42 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
       cacert cmake ]
     ++ extraBuildInputs;
 
-  NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/ca-bundle.crt";
+  NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt";
 
   postInstall = ''
     NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index ad6f0c50a37..c3b238eeb0a 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/pkgs/applications/version-management/bazaar/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   patches = [ ./add_certificates.patch ];
   postPatch = ''
     substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \
-      --subst-var-by "certPath" "${cacert}/ca-bundle.crt"
+      --subst-var-by "certPath" "${cacert}/etc/ssl/certs/ca-bundle.crt"
   '';
 
 
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index dee2abd2b1f..2409e8e2240 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
       mkdir -p $out/etc/mercurial
       cat >> $out/etc/mercurial/hgrc << EOF
       [web]
-      cacerts = ${cacert}/ca-bundle.crt
+      cacerts = ${cacert}/etc/ssl/certs/ca-bundle.crt
       EOF
 
       # copy hgweb.cgi to allow use in apache
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 7259fa8ff4c..8ddb6a85d0c 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
 
   inherit url rev leaveDotGit fetchSubmodules deepClone branchName;
 
-  GIT_SSL_CAINFO = "${cacert}/ca-bundle.crt";
+  GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
   impureEnvVars = [
     # We borrow these environment variables from the caller to allow
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 1f5166d5c43..5dd80bd4aa5 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   outputHashMode = "recursive";
   outputHash = sha256;
 
-  SSL_CERT_FILE = "${cacert}/ca-bundle.crt";
+  SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
   impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ];
   preferLocalBuild = true;
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index d743fc47b94..7bcb499aab4 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir -pv $out
-    cp -v ca-bundle.crt $out
+    mkdir -pv $out/etc/ssl/certs
+    cp -v ca-bundle.crt $out/etc/ssl/certs
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
index 7afa2800105..4ed0f6c521b 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];
 
   configureFlags = [
-    "--with-ca-certificates=${cacert}/ca-bundle.crt" # NixOS hardcoded path
+    "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path
     "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
     "--with-pkcs11-modules=$$out/lib/pkcs11/"
   ];
diff --git a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
index 9dbd46946c0..ee22cd97f6e 100644
--- a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
 
-  configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt";
+  configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt";
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix
index fe7ec585155..8a96d1c380d 100644
--- a/pkgs/development/compilers/icedtea/default.nix
+++ b/pkgs/development/compilers/icedtea/default.nix
@@ -135,7 +135,7 @@ let
       # Generate certificates.
       pushd $jre/lib/icedtea/jre/lib/security
       rm cacerts
-      perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/ca-bundle.crt
+      perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
       popd
 
       ln -s $out/lib/icedtea/bin $out/bin
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index d0ca85af0e0..beab781c88d 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -142,7 +142,7 @@ let
       # Generate certificates.
       pushd $jre/lib/openjdk/jre/lib/security
       rm cacerts
-      perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/ca-bundle.crt
+      perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
       popd
 
       ln -s $out/lib/openjdk/bin $out/bin
diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix
index c2780866161..132f0f31b87 100644
--- a/pkgs/development/compilers/openjdk/openjdk8.nix
+++ b/pkgs/development/compilers/openjdk/openjdk8.nix
@@ -136,7 +136,7 @@ let
     # Generate certificates.
     pushd $jre/lib/openjdk/jre/lib/security
     rm cacerts
-    perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/ca-bundle.crt
+    perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
     popd
 
     ln -s $out/lib/openjdk/bin $out/bin
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 9d12d42cee8..6bb8c0565d5 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
       if [ $b == "mix" ]; then continue; fi
       wrapProgram $f \
       --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \
-      --set CURL_CA_BUNDLE "${cacert}/ca-bundle.crt"
+      --set CURL_CA_BUNDLE "${cacert}/etc/ssl/certs/ca-bundle.crt"
     done
   '';
 
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 79c8ac03183..79b31b1365b 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346";
   };
 
-  configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt";
+  configureFlags = "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt";
 
   preBuild = ''
     sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 32f5928cccd..5e2bdd0cc54 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -40,7 +40,7 @@ let lispPackages = rec {
       url = "https://common-lisp.net/project/iterate/darcs/iterate";
       sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25";
       context = ./iterate.darcs-context;
-    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";}));
+    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ssl/certs/ca-bundle.crt";}));
     overrides = x: {
       configurePhase="buildPhase(){ true; }";
     };
@@ -314,7 +314,7 @@ let lispPackages = rec {
     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 + "/ca-bundle.crt";}));
+    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ssl/certs/ca-bundle.crt";}));
   };
 
   cl-fuse-meta-fs = buildLispPackage rec {
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index ab8ec59ca8c..810012fb60a 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     "--with-sock-dir=/run"
     "--with-privsep-user=smtpd"
     "--with-queue-user=smtpq"
-    "--with-ca-file=${cacert}/ca-bundle.crt"
+    "--with-ca-file=${cacert}/etc/ssl/certs/ca-bundle.crt"
   ];
 
   installFlags = [
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index df972a4287b..8d7f4541cad 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ cacert ];
 
-  configureFlags = [ "--with-ca-bundle=${cacert}/ca-bundle.crt" ];
+  configureFlags = [ "--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt" ];
 
   meta = with stdenv.lib; {
     homepage = http://aria2.sourceforge.net/;
diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix
index c0951760f4f..d04f48c0f31 100644
--- a/pkgs/tools/security/prey/default.nix
+++ b/pkgs/tools/security/prey/default.nix
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
     cp -R ${modulesSrc}/* $out/modules/
     wrapProgram "$out/prey.sh" \
       --prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \
-      --set CURL_CA_BUNDLE "${cacert}/ca-bundle.crt"
+      --set CURL_CA_BUNDLE "${cacert}/etc/ssl/certs/ca-bundle.crt"
   '';
 
   meta = with stdenv.lib; {

From 217506aca14a3d5811d590d54f1b17bd69c78e7f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 5 Jun 2015 07:01:34 -0500
Subject: [PATCH 0811/2322] Update kde-applications-15.04.1 ->
 kde-applications-15.04.2

---
 pkgs/applications/kde-apps-15.04/manifest.nix | 2043 +++++++++++++++++
 pkgs/applications/kde-apps-15.04/manifest.sh  |    1 +
 2 files changed, 2044 insertions(+)

diff --git a/pkgs/applications/kde-apps-15.04/manifest.nix b/pkgs/applications/kde-apps-15.04/manifest.nix
index bdf5b3cfc56..d59a3d66966 100644
--- a/pkgs/applications/kde-apps-15.04/manifest.nix
+++ b/pkgs/applications/kde-apps-15.04/manifest.nix
@@ -2548,6 +2548,15 @@
       name = "kde-l10n-id-15.04.1.tar.xz";
     };
   }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.1.tar.xz" ".tar";
+    store = "/nix/store/j3xp083a1ggngx4rkbg7jzvci8nmpwkh-kde-l10n-ca_valencia-15.04.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ca_valencia-15.04.1.tar.xz";
+      sha256 = "0gm5aljn22jf5vpanvmhxviyqr3wbi5rn3m6dkx552j2rw2qkazd";
+      name = "kde-l10n-ca_valencia-15.04.1.tar.xz";
+    };
+  }
   {
     name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.1.tar.xz" ".tar";
     store = "/nix/store/hslbisaanz2z17mvspp4jbsx95pgwsgh-kde-l10n-lt-15.04.1.tar.xz";
@@ -6112,4 +6121,2038 @@
       name = "kjumpingcube-15.04.0.tar.xz";
     };
   }
+  {
+    name = stdenv.lib.nameFromURL "kajongg-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/8j49syr25zv04wxivlj2r50blfkiih8p-kajongg-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kajongg-15.04.2.tar.xz";
+      sha256 = "1ih2gz0i4r1pbx0ys6wi0fgwwh6c5mlq1hy8qfhbb1kanpl0v30k";
+      name = "kajongg-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksnapshot-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/xbh4flc44pyhmd9wfm14zjr8vz58447c-ksnapshot-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ksnapshot-15.04.2.tar.xz";
+      sha256 = "1zpc9pasw5r68rmkaz8la75hbp9na4114j7w0a9fcgjlvllaij57";
+      name = "ksnapshot-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kfourinline-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/8fnj1fgszjbr1cjcds8wd0bzbyw09zll-kfourinline-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kfourinline-15.04.2.tar.xz";
+      sha256 = "1r53xqvgsvy1las85jccya2xxfk43bwzbzr6lp2vny1624g3vhdc";
+      name = "kfourinline-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "khangman-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/a04bnnsv7r4bhnq3pbsv8nk77749d9vn-khangman-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/khangman-15.04.2.tar.xz";
+      sha256 = "0wpgm0ipm9n6lhyiymf0ncmw8lgz2pc0fh4ghs4n692ihipiw4xf";
+      name = "khangman-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeedu-data-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/nsxh9zscy67b1srj8asi1jc2x9mdwdhh-kdeedu-data-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdeedu-data-15.04.2.tar.xz";
+      sha256 = "04m14g1b8bkngawjx3x9sdla7p10dhxqwvfv29nkm1lblmc547ia";
+      name = "kdeedu-data-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-runtime-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/cj5sh5gsz4hvg7y5rfjw24bbfrgs133m-kde-runtime-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-runtime-15.04.2.tar.xz";
+      sha256 = "1bcg5g6b8vij6zf1s6y4m5296yqiaavgbfcg1xzfcs8b5l7pckrn";
+      name = "kde-runtime-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kblocks-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/x3j7xjkpkd7v61ismj3ids9m4910yv7f-kblocks-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kblocks-15.04.2.tar.xz";
+      sha256 = "1bpvw5sghg7qiqs97p0xn7b23jgmzk590kmdjcwigfz788ac4ylv";
+      name = "kblocks-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kfloppy-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/76qvy4lfsqyk4qnc1n5cd4wbahfhc6ci-kfloppy-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kfloppy-15.04.2.tar.xz";
+      sha256 = "0r8cgmwa0b9r6dl5vslw4g03mm3qvrswqhk4pdbph3iw1qykxypw";
+      name = "kfloppy-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/bvgf4ym7568ig6mnk4x3jwcfgx1qp51y-kdesdk-thumbnailers-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdesdk-thumbnailers-15.04.2.tar.xz";
+      sha256 = "048i3xy580gpgbk9m42wv2v0cf1gk2zlx52dvf4izczracsvl2n7";
+      name = "kdesdk-thumbnailers-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkexiv2-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/s6g8walp07ncl0xmkv0lkw5dmykjz49n-libkexiv2-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/libkexiv2-15.04.2.tar.xz";
+      sha256 = "0nycanbbk50flb92bgk9zddpny8fb74k2b5fb26x33msx04854vb";
+      name = "libkexiv2-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdf-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/2nnqn0syqqm4j4k3z33vx8mhzcis1rx3-kdf-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdf-15.04.2.tar.xz";
+      sha256 = "17mb2hmbm1r0rq5nnh0xmrv3gqcs0ywan8jvxagvli350xgrn2ck";
+      name = "kdf-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pl-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/81ca4iky2x83laf1wls5v5mvsfvvj9pz-kde-l10n-pl-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-pl-15.04.2.tar.xz";
+      sha256 = "1zs799470abqq9hxgik0wka2im6fi12057jg6id7fi9d58h3lyap";
+      name = "kde-l10n-pl-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ia-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/6l77zbzh2rdrrg3y329i1rbii74dd66f-kde-l10n-ia-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ia-15.04.2.tar.xz";
+      sha256 = "0rg8zwwmwwm373fnsrcj3cdx88c1z674n398kyv3v6xdi31j2f5p";
+      name = "kde-l10n-ia-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-he-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/1py0dsvx6lr9ww09qskvx0pdlg82rcjd-kde-l10n-he-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-he-15.04.2.tar.xz";
+      sha256 = "04kayv647nj3hrxl0863gks5z53v1ax9pafncm70ls79rzz95zsa";
+      name = "kde-l10n-he-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nn-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/1sjw15pmf6v8fbrmrrxrp3ifafskhgzh-kde-l10n-nn-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-nn-15.04.2.tar.xz";
+      sha256 = "0j0nn7qk7shq5xi9zma0fl7fibsaindsai8lrvfvaphrbdylp3cx";
+      name = "kde-l10n-nn-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fr-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/qg6j8j8gcx7vglnxyr2f3lnzsrdzvadd-kde-l10n-fr-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-fr-15.04.2.tar.xz";
+      sha256 = "1rgy0qw313wk39f8lxb812kfh7i0b3fqgdz1dv22mpd143ywz0xr";
+      name = "kde-l10n-fr-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ja-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/qawjvxq649zk7lnr3wb8kgw93pm9szfw-kde-l10n-ja-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ja-15.04.2.tar.xz";
+      sha256 = "02b3243zbnrkygnbiq7nxrl2sq6ssi27kpn9382aa8b19w96gcsz";
+      name = "kde-l10n-ja-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-el-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/klmfi9iwf6jzg2aq04bg4l011m46snk4-kde-l10n-el-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-el-15.04.2.tar.xz";
+      sha256 = "1y2q5vqm9xkv2yxzwqxrsyqnd8zdfzz5vyza3g4aisawh3xhwq25";
+      name = "kde-l10n-el-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pa-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/sd55g871lxn0isd486flqhaikaaa00rs-kde-l10n-pa-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-pa-15.04.2.tar.xz";
+      sha256 = "1wi9l74fln9q92l1qmxgb2223gwkb6x2v753mzm7607hbcx9y8dx";
+      name = "kde-l10n-pa-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/cklv18g85z9irf5drphwndjpya812yl1-kde-l10n-pt_BR-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-pt_BR-15.04.2.tar.xz";
+      sha256 = "0xfcid4xqcjnlq83ql4rlhb8swn2y9ixzfyx3zbdwjjlkaaqmnr4";
+      name = "kde-l10n-pt_BR-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sv-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/br5h37sf6ynlvspbn03lifqhwmqbiica-kde-l10n-sv-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-sv-15.04.2.tar.xz";
+      sha256 = "11mnbalw3lpdgv3bbhhh658cs34impi7gymhcw129il0jsc5yz53";
+      name = "kde-l10n-sv-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-is-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/wkxyp7415d8q79wjp8sjkkn9bcf8d5i4-kde-l10n-is-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-is-15.04.2.tar.xz";
+      sha256 = "0xf361dsvlg525w10y1p638ksrb5x381sw322rs14dlpqn89ywl0";
+      name = "kde-l10n-is-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/20sv7j17wyswmiwy24p34hgm75wkfiv2-kde-l10n-uk-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-uk-15.04.2.tar.xz";
+      sha256 = "1hbwwj1k4g4z6wkrxd3aalbhvsqvnzgv56s1m748vp7196d7h6wk";
+      name = "kde-l10n-uk-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-it-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/kb9xr7rxa8w6lcrm8yc3nqvvyiwjmzcl-kde-l10n-it-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-it-15.04.2.tar.xz";
+      sha256 = "156j8dj9c44j6mbqka3d0rpkdp2wg5hj7l1kzd2lb0ybvk7vr0r0";
+      name = "kde-l10n-it-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-da-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/7arrlm64k6n3fc4f9glgy8synk5mri64-kde-l10n-da-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-da-15.04.2.tar.xz";
+      sha256 = "1np194cir3wh9sm8pqr4s3sx3k8p4rdndvpx7vgw63jlazrw4rlj";
+      name = "kde-l10n-da-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/7x2sq5fhsb84slfylvsg9ds8rkfln7xb-kde-l10n-zh_CN-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-zh_CN-15.04.2.tar.xz";
+      sha256 = "08p3nlyigw1mxqajm2z0gs2ils8aymizmb3iiprnzi3zgcnbg45y";
+      name = "kde-l10n-zh_CN-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-bs-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/s5k7qadd3n5l1zipxylll7qnig20clla-kde-l10n-bs-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-bs-15.04.2.tar.xz";
+      sha256 = "0vlsij3zfbqlcl9xg3iwvyi112d8i00rjbrpwc15lyhw19xzjakb";
+      name = "kde-l10n-bs-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-km-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/crk06pmaf55p78z6pi4fi8hbp0bkf4qm-kde-l10n-km-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-km-15.04.2.tar.xz";
+      sha256 = "1bs10bgnzqwj9adq6xl1y534br74hcvickf2ylw27wqgszwzvd18";
+      name = "kde-l10n-km-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/vldyy2rw01z1qbcd256qapbpxwpqa7ci-kde-l10n-lt-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-lt-15.04.2.tar.xz";
+      sha256 = "03vwx16wwihq0qlzs8w1rdlld0951x0yr9w36bvjsrl985n500ip";
+      name = "kde-l10n-lt-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-lv-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/bkr5x2mq2cp5zb950p81hkdjg844zlmw-kde-l10n-lv-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-lv-15.04.2.tar.xz";
+      sha256 = "1skw7d5yxdy7vd2z6fnslcp7xpwjrvxzgl7kd9shvj7px988bfng";
+      name = "kde-l10n-lv-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sk-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/zzspql9rdl8v5jxajkzg00zz29v9g0wv-kde-l10n-sk-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-sk-15.04.2.tar.xz";
+      sha256 = "1nhvb2kdlxfvch0hly80lm4z17kijy860z2pk23n65r8lmhngf07";
+      name = "kde-l10n-sk-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-kk-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/525xf0fhgxxi9hxy3nlp911a65pwk9v2-kde-l10n-kk-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-kk-15.04.2.tar.xz";
+      sha256 = "0xgncx5xbhnzxzpzaawvj9d19s8zzdrc76qa986xf37zahjv7v1r";
+      name = "kde-l10n-kk-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/2qq4c0yr5hpfffwqddcxkqkzp2dr6zcb-kde-l10n-ca_valencia-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ca@valencia-15.04.2.tar.xz";
+      sha256 = "0cg2is4lzy9fxz37ciy3ddjd5z1i2ni8gg5pq7v7hz7fqa8bb3w6";
+      name = "kde-l10n-ca_valencia-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nl-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/gda3hz81ilizglmrc1m03gy40n1rp89f-kde-l10n-nl-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-nl-15.04.2.tar.xz";
+      sha256 = "0l4frxfrpii14iisjnnpzz0yja6mb6qlz05v1wn6sqqqvv8snq17";
+      name = "kde-l10n-nl-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-wa-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/hm8y22jy2dhnpdhyp0g3m8fz8mf7dhjy-kde-l10n-wa-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-wa-15.04.2.tar.xz";
+      sha256 = "10vzzwhgnxx5rj7h99b63kgpak2mkmdjr7381w7q1iwq816qxxy8";
+      name = "kde-l10n-wa-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sl-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/193h8asiqnbfnhackzybxbqgwhghsdb2-kde-l10n-sl-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-sl-15.04.2.tar.xz";
+      sha256 = "03chmprkais0cq3z4j9xzy3lq91imf3q4mcaccpknla247a8viqf";
+      name = "kde-l10n-sl-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ca-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/p6h22zlpyglzksa6rb1xc042lmpn0hds-kde-l10n-ca-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ca-15.04.2.tar.xz";
+      sha256 = "00imm41b9769j0pwgcgavdcwmy59qwnab3qkf8xq22899fvadq7b";
+      name = "kde-l10n-ca-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hu-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/mmdpma42n33irvf9hs4frn1y60q0r4mh-kde-l10n-hu-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-hu-15.04.2.tar.xz";
+      sha256 = "1ilhnp6x3lahhc0rkhn2zv6g9ck8w7b9qaw8fgqkiz0n19hv564f";
+      name = "kde-l10n-hu-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hi-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/sgcdmfnga8nmyg1pq19cjn5dzdm14c6g-kde-l10n-hi-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-hi-15.04.2.tar.xz";
+      sha256 = "1yqk7wva2r6smasgxzw6f1pw43z1jddf4br1rzq3k7f18np89im7";
+      name = "kde-l10n-hi-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ga-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/sf5s50gzjamhmzvbdsymscm0y63k1vsk-kde-l10n-ga-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ga-15.04.2.tar.xz";
+      sha256 = "0wn2q9vbaqkhb60q7x70b2j3yh8k21y4isk5js2ardzz1gpzmrxk";
+      name = "kde-l10n-ga-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-hr-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/5wri2078sl0r7xv1j2b8x182v2ilpny1-kde-l10n-hr-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-hr-15.04.2.tar.xz";
+      sha256 = "0r5hfhdnjj9j0zzs6yr7a6hc1aidki5far9njn88c78ialw4y9kn";
+      name = "kde-l10n-hr-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-gl-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/970bcajr5cmcq01z4pkglgw9dpwigpz3-kde-l10n-gl-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-gl-15.04.2.tar.xz";
+      sha256 = "1mnyc9ms863s3x6l85kfglz7q8h9faqgkv7vcf8qfjs1vs6qbh6x";
+      name = "kde-l10n-gl-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-es-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/60k5g06hvgpx407f6zbd1q5jm12rzqwv-kde-l10n-es-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-es-15.04.2.tar.xz";
+      sha256 = "1clrjb4wgwx8ijykrdylfgscwimkawpaq13a32m6dka4ipk58399";
+      name = "kde-l10n-es-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-pt-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/vrhsyhk9sz6117hgbjgy6498nvcprxdd-kde-l10n-pt-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-pt-15.04.2.tar.xz";
+      sha256 = "0bkdm2skvkaqspfq7rsqwahm6h17j46fd97wkqrkmdswgnbn14fw";
+      name = "kde-l10n-pt-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-bg-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/w9nhhcra2rjpjsc6apgfrlzwqgp7sx77-kde-l10n-bg-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-bg-15.04.2.tar.xz";
+      sha256 = "1jap82rz52a43rad33hidsyvvzm3s4ma5yk75clv5f8fhnjc946k";
+      name = "kde-l10n-bg-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fa-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/3lqnb375jd1z7ky7y8nrnpgx93ncassv-kde-l10n-fa-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-fa-15.04.2.tar.xz";
+      sha256 = "0kb7lxvgbdwlyi1rli7xrk4ykdnljdcm0clkgl1bla6vgxhlc7mj";
+      name = "kde-l10n-fa-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-id-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/2xsadiy29hblc06v6n3ax9y72k2a32vi-kde-l10n-id-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-id-15.04.2.tar.xz";
+      sha256 = "1vadznjjy32brc76d2wzq31xf69dq2fxipg8rhvjh2f8cy068blf";
+      name = "kde-l10n-id-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ar-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/h7838chap1cxjw66pw6914jpl48n6knf-kde-l10n-ar-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ar-15.04.2.tar.xz";
+      sha256 = "05wspvz4fk6xy3d9zjgrj7kzj213hhkv7fvs43iy2l4vm8b3vski";
+      name = "kde-l10n-ar-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-de-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/qzx5vs924pzqyxj6mxmn3p9wq0q05vw1-kde-l10n-de-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-de-15.04.2.tar.xz";
+      sha256 = "0fvb169pl9ibppiinc2sq164i7cikn7qxvycdv1whk3bcv376rrh";
+      name = "kde-l10n-de-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-eu-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/6rs8knkgfs23qa2cwm5s9yp661z37ws1-kde-l10n-eu-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-eu-15.04.2.tar.xz";
+      sha256 = "18bry21g828n0rvaq4510pj8fb4f49jn5yxvf1jm6qn3wcfg5qws";
+      name = "kde-l10n-eu-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/1kl0887wqmnvhiw9318ihvfwwdkxjhrj-kde-l10n-en_GB-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-en_GB-15.04.2.tar.xz";
+      sha256 = "10db8pnbbxc35shx0f7vfiz0glm9kb521b99iksjkwnxpss9kyvx";
+      name = "kde-l10n-en_GB-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nds-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/h8r3j2113d0h034vbgz0d61ybnicc5g6-kde-l10n-nds-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-nds-15.04.2.tar.xz";
+      sha256 = "0ryjlw2d9lrzzf08v1vscjr6mp2ckpbd0f2hkxg0ck8wgn7c2mxd";
+      name = "kde-l10n-nds-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-fi-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/namy5fby5nck67cdgk4ywb7khd43cacr-kde-l10n-fi-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-fi-15.04.2.tar.xz";
+      sha256 = "0zpkcs64g5si5r5q075vkva41sx39qp30hycdzhvbs72hkjkp6m8";
+      name = "kde-l10n-fi-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ro-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/zyb7zb7w4y79s5kl6d2p5awpbn3912mv-kde-l10n-ro-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ro-15.04.2.tar.xz";
+      sha256 = "05pgpshvs08inygighi3ya0bl49238l96sgqql0377cm9cw2hj9l";
+      name = "kde-l10n-ro-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-mr-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/cy7mih4b17vvbfmw86n6bl103xcixhpv-kde-l10n-mr-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-mr-15.04.2.tar.xz";
+      sha256 = "1clmi1vflqi63kihv9ljkbns4r0v7yb65zkdv642kdcfmwz9kgw8";
+      name = "kde-l10n-mr-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-eo-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/ngffzrfy1r1x9rlx1h6ivfhif79g6fpx-kde-l10n-eo-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-eo-15.04.2.tar.xz";
+      sha256 = "020zq1ygjkpx5y2isqqp3chk0s1jcd29zy6fwr6jyxvj0260fa8q";
+      name = "kde-l10n-eo-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-cs-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/l46m8w2hl6wrdns1qwvm5hd4dlbyxpkj-kde-l10n-cs-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-cs-15.04.2.tar.xz";
+      sha256 = "0ks75clbhywql9pgchxi5phc50n9qama5v4crngwkxfbs2lhp05d";
+      name = "kde-l10n-cs-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/7q7ws7qcbnrm5ivxiq1kdfjih1aa44g1-kde-l10n-zh_TW-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-zh_TW-15.04.2.tar.xz";
+      sha256 = "1gvr4k48qjwgw9qsv3rlz210slqdvsxvqxwsy7j5ndcjfs2724wi";
+      name = "kde-l10n-zh_TW-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ru-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/nzql394zszp4wan26pr336i20ipirh9q-kde-l10n-ru-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ru-15.04.2.tar.xz";
+      sha256 = "155mbg25anmdy6vgz3fsn4p8m7c8syfwiy70jsgqv9751dvkajlk";
+      name = "kde-l10n-ru-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-tr-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/z0ncv2c97if41g7qln16vx9kr166zvc5-kde-l10n-tr-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-tr-15.04.2.tar.xz";
+      sha256 = "1ddbxlf9bqd3zqwxfhygfmy15prhh0albp83saprk94bbdirp0lq";
+      name = "kde-l10n-tr-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ko-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/s8sr6jzaydgc64r1dbgqzns682avkd7p-kde-l10n-ko-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ko-15.04.2.tar.xz";
+      sha256 = "1knsgxhgz0cvxk0y460zyzk5n9q0rk8p3cdf0wlpxf7z8wvxcab0";
+      name = "kde-l10n-ko-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-ug-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/rsdm9ds9pn5iqsk6dgbr6mnpliisby3c-kde-l10n-ug-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ug-15.04.2.tar.xz";
+      sha256 = "0ck01ygnz7ycfpff7g2zyix0zv19ia8csmggvyv07lp0k84asxr1";
+      name = "kde-l10n-ug-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-nb-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/5dhk16y2w9sibzqlv50w5d18js7mjrpf-kde-l10n-nb-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-nb-15.04.2.tar.xz";
+      sha256 = "16ya60pxn30rpwidijcycmjxm8c61hiykzfirba73i0pkzq13nij";
+      name = "kde-l10n-nb-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-sr-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/cpfz2g7z1al6p5yadjj6y314ws0fmpg4-kde-l10n-sr-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-sr-15.04.2.tar.xz";
+      sha256 = "1pwwvj7s6ivmx6c5gh6dvfrvi5xp66b40fsnn04zwsp0iamxkdqi";
+      name = "kde-l10n-sr-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-l10n-et-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/7n1ka8pz70xfznm3q3qvmcbrr74yb6by-kde-l10n-et-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-et-15.04.2.tar.xz";
+      sha256 = "1w08blhf6adlj0yanfac2b3kk0ag3gbazjdywz9cf21ks6ni6bsn";
+      name = "kde-l10n-et-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkcompactdisc-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/lniq3v7dr7wqagi4c7cjwdig0ds5bndp-libkcompactdisc-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/libkcompactdisc-15.04.2.tar.xz";
+      sha256 = "14qryxim0fhx7npbicv1pvkr42544jzplfmng7z2cjxx4c636j9v";
+      name = "libkcompactdisc-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksaneplugin-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/v1mywghcpyff25izr0iimzyr9vh3pfnj-ksaneplugin-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ksaneplugin-15.04.2.tar.xz";
+      sha256 = "0s69h4swdcxagv45v8y0kbg4ik3pyl7asiryvz9dip7yznwlxlz9";
+      name = "ksaneplugin-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kamera-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/s9h0gx53bwvg5f8z34drzwkf0ybg602h-kamera-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kamera-15.04.2.tar.xz";
+      sha256 = "01r16868mdmpfjwzz7wa1qykc6lif9yi7fp0zxyk5hy77wp4jwdy";
+      name = "kamera-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kubrick-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/scjxw225n4i6s702ggd5mnblyfgaf9sh-kubrick-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kubrick-15.04.2.tar.xz";
+      sha256 = "16ndnx92mb307qjkwljdbgp69aamk268yqn2w9w8y4yjhmvsmx3d";
+      name = "kubrick-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "jovie-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/ja9lwsb9crzqd8q5vnhw66f5ianimzg7-jovie-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/jovie-15.04.2.tar.xz";
+      sha256 = "0lc751p2s96qjqh7dccjm498m7c370dcsm5bxqks9imyi9l7syyx";
+      name = "jovie-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ark-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/cbpf87yihk31gjc5glvfbsb1r470n0zy-ark-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ark-15.04.2.tar.xz";
+      sha256 = "0pssyyk8kf0qy9vh71kx3h5f1fs26k21cql97mfsl4hz181mfxkq";
+      name = "ark-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdiamond-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/cdw9y1cx7gjfsj6b1hd43mmjjd2k715d-kdiamond-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdiamond-15.04.2.tar.xz";
+      sha256 = "1k0w2d0ysvwhvmsn0smi1s5dwrcwdnqfzny5dgblc3p62xw1wm1j";
+      name = "kdiamond-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klettres-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/x4147vkla2llia02yj1m1rrjs425lm4a-klettres-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/klettres-15.04.2.tar.xz";
+      sha256 = "1rmf5hpc9zwaham157xzn3dvh0z6scpr2i38i513b0ji0kdizikc";
+      name = "klettres-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bomber-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/9w7iv272z8lkpp66di0l0f3z79hjvahg-bomber-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/bomber-15.04.2.tar.xz";
+      sha256 = "1xn52p5apfbm3iyjq1hw2mg5isl3jcbq4x8wfzil2vp3ir16f1j3";
+      name = "bomber-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "superkaramba-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/gsrfn2v5lli7fykmq0864j95mxkdn22r-superkaramba-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/superkaramba-15.04.2.tar.xz";
+      sha256 = "1x8kxj2ndpnpfbxk33rqyq64y1chlll8j3331skzss9117fsp7z1";
+      name = "superkaramba-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkgeomap-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/fsr2vij54z8zwj9rzgfy1x22ivcs2i3s-libkgeomap-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/libkgeomap-15.04.2.tar.xz";
+      sha256 = "091jl7zdcvj91xqr6fh8vvn5wrbg86ykczj43lgvnnph28h1xpyh";
+      name = "libkgeomap-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kteatime-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/fqm7q93457lrg91b5w8jr2lfx3ypa18p-kteatime-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kteatime-15.04.2.tar.xz";
+      sha256 = "0cpy6z6nxys307247l9rcms9f4n2qpnvij1c20s0bcb03n5ya0vp";
+      name = "kteatime-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "granatier-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/3flm8w829k0ygcs24j5smhsq69r1isdp-granatier-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/granatier-15.04.2.tar.xz";
+      sha256 = "1jcxnm1hy6s6g6yls8ljcrhhp3qsp58gcs46hy4s25nacx5m4kh6";
+      name = "granatier-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkeduvocdocument-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/aj12ls0r62c66f0gv1w0dv37a9wbx0mm-libkeduvocdocument-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/libkeduvocdocument-15.04.2.tar.xz";
+      sha256 = "13hzs4lrlrnyya3321iqky2nxjlh65fs2lr0nbl3g6k9wxdxlqfw";
+      name = "libkeduvocdocument-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "blinken-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/nh2kasqpz3iwhc2hwv6di51vp7xnnfd3-blinken-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/blinken-15.04.2.tar.xz";
+      sha256 = "1k0idsbqnhmrlnsl8l45wkipb6hch1imrkxglxl1xw0pr0s7c8rg";
+      name = "blinken-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpat-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/hasm2996yj2yljjc6wk50naqm1bal8mh-kpat-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kpat-15.04.2.tar.xz";
+      sha256 = "0vhrq3ssfqwpkrx355v91gg1kdl8sjfpkp4fqyi9h36nps7qdiqj";
+      name = "kpat-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapman-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/wfi3wjr0yyn72aqh31hvfinghl73z7ay-kapman-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kapman-15.04.2.tar.xz";
+      sha256 = "1jxxs2ljfci9llfv1pyybrw10nbajk06k8yhw4yswn23j544049a";
+      name = "kapman-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kscd-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/vzwm2r7kypa7vmvxldsqmm27gw0a7bl8-kscd-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kscd-15.04.2.tar.xz";
+      sha256 = "1066yavabxax059fwgp0rmspfsy065x0nisci0ybyfh0y9m8m48j";
+      name = "kscd-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdelibs-4.14.9.tar.xz" ".tar";
+    store = "/nix/store/5wy5pdqpd3c3zhwm93dnasw605abglz3-kdelibs-4.14.9.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdelibs-4.14.9.tar.xz";
+      sha256 = "07klv3hxgq1w85lx2myw131r4v3fd726fljipkd7arwzp8mbwcix";
+      name = "kdelibs-4.14.9.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepim-4.14.9.tar.xz" ".tar";
+    store = "/nix/store/bskv830n49z3ib444qh1vb87d712q0iw-kdepim-4.14.9.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdepim-4.14.9.tar.xz";
+      sha256 = "0l4nfcf0k958w37bzmbfpvs96yba0r22q16z4d1ksqbyrr6v7ycf";
+      name = "kdepim-4.14.9.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-wallpapers-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/p0n3h5a2p5wh5l31ldn2cslbvfbvlwl4-kde-wallpapers-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-wallpapers-15.04.2.tar.xz";
+      sha256 = "1qcj8qdryqsqv430bmzv0hir7gbqbfw9sc3x7i4692h8cwvzkw5d";
+      name = "kde-wallpapers-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmix-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/sdwpx6s19zjckj3lgzc5isiab0cigy8n-kmix-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kmix-15.04.2.tar.xz";
+      sha256 = "0g601dmd7f0j70y50xkw4y8vpb5xgjz938m266sklkkwjdcf2fg9";
+      name = "kmix-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krdc-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/3x1axf8f8qcpg3898r90yi35sh06vsh6-krdc-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/krdc-15.04.2.tar.xz";
+      sha256 = "0m7jmwrzihzm8iswzvw5ajz4yiaxdsprdkhgl1a59hgm7wgrp8yg";
+      name = "krdc-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "konsole-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/h70w08hzqsnp9rs11mr5m7yizc8yzdgw-konsole-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/konsole-15.04.2.tar.xz";
+      sha256 = "1cy71kfv1f9bq3y3n73brm6wzl03qgcvx5rg0kflx3ihjl1aclgc";
+      name = "konsole-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kanagram-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/73v4cznbqfpidrdg6gbra0qlpf43hb3q-kanagram-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kanagram-15.04.2.tar.xz";
+      sha256 = "1zqjms2ai4bpfmbf136q94gbl59vjszlfsp8xi0pmpp138yii9a8";
+      name = "kanagram-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "umbrello-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/va7y8idm0hjzhfhicl6xlsyz61cp37gz-umbrello-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/umbrello-15.04.2.tar.xz";
+      sha256 = "08bz8lg2arrwsnf0gjjjrf6bihrv9bdz8n4hdvilhpy0ls78v2va";
+      name = "umbrello-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktux-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/6rn0kw9p0vxk4hd60l6ksyxrlczksbac-ktux-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ktux-15.04.2.tar.xz";
+      sha256 = "0pdgbqbk3iwjywvhm6bzwqc6acfnyjixj2j3yxczn2k6fy5k0vkf";
+      name = "ktux-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krfb-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/70w7yfkg79g199z7sb5nk3xaknwjirwm-krfb-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/krfb-15.04.2.tar.xz";
+      sha256 = "1ynvwvhkshjrh1d1rifawzwv0srqj9wlqhhiv5nr8lwd4m29pdj2";
+      name = "krfb-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwalletmanager-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/59i6az9vcq1b9vqx9rwibv7i0iwj2wc5-kwalletmanager-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kwalletmanager-15.04.2.tar.xz";
+      sha256 = "0wch3bm2c7xjbrjvn1ka3iyawi6h6snfab7dzp6na8n4ck7y9s4p";
+      name = "kwalletmanager-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "palapeli-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/kigl3wjr17nq1mh6wqfd3kc4sbh8dqfm-palapeli-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/palapeli-15.04.2.tar.xz";
+      sha256 = "0jsgbddk631z010dam8khbcq9qphkgax9rbgn26r9cv29cfd0h5j";
+      name = "palapeli-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/3r1ibr6rqz6lmgxxscgbkx7ffkpiad0y-kdenetwork-strigi-analyzers-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdenetwork-strigi-analyzers-15.04.2.tar.xz";
+      sha256 = "13bc2a1m64k6iki12kpynf3f1wijxch8rg9nn7xc8rl3bjms8x9k";
+      name = "kdenetwork-strigi-analyzers-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "gwenview-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/zv987ag77hm9wx1gk7nqrrk629dr1q4m-gwenview-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/gwenview-15.04.2.tar.xz";
+      sha256 = "1c1fqwgq91s0c9f85g3i3dwaq16r260jj4wx4xcr3qi4bm12lq5k";
+      name = "gwenview-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kruler-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/ps63vs05fy6jk669grmm3ddb5f0hl00m-kruler-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kruler-15.04.2.tar.xz";
+      sha256 = "0rl81v1lhljfqvz98zfvnfbnylxn3l9qzy7b33hfkpmm9bjkp0i2";
+      name = "kruler-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knavalbattle-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/ajmnqxshv1vg44acwgyy1k3l5fjiadga-knavalbattle-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/knavalbattle-15.04.2.tar.xz";
+      sha256 = "15pmbj230rhiyxx2cz1wsx29zp0p4my54i8099yv943w8wswwy8x";
+      name = "knavalbattle-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgoldrunner-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/j9gqvnw6d4qaf09vsiinzdnpiy3nrgl4-kgoldrunner-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kgoldrunner-15.04.2.tar.xz";
+      sha256 = "1x5pza747k69wx54fiparqx43pk112cma2pq6c4ndycrm5lqxg5v";
+      name = "kgoldrunner-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmag-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/1cz44lqkfc63qgxap5qi59qviwrszif9-kmag-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kmag-15.04.2.tar.xz";
+      sha256 = "1kbxhq9mfjxswds60pa6v1ixc8grn0m1f84da7s18ph5r1wdpkr3";
+      name = "kmag-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-send-file-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/x1p55ssi0cx67z1q2pbqkzaxpaps3lv6-ktp-send-file-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ktp-send-file-15.04.2.tar.xz";
+      sha256 = "1jygvxc8ajy6p6qhpfwj0chc0571x50h7n2nzwqiz3nhs3avqxnx";
+      name = "ktp-send-file-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/jma476qyvnw2qr4fhsx0kdmif55inr4p-kdesdk-strigi-analyzers-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdesdk-strigi-analyzers-15.04.2.tar.xz";
+      sha256 = "0wbm6q02zkqbvcq716v468mjxw3zd8xcjqyc3vvz80zfgpbm2dnd";
+      name = "kdesdk-strigi-analyzers-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-text-ui-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/1c0qqm7946lgjk4p8am0dd54x9q59jdk-ktp-text-ui-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ktp-text-ui-15.04.2.tar.xz";
+      sha256 = "15kh8jwysvzlxrp4r4vhnla0lmwpxcyaf3gyy2lz0lb1k2k368n4";
+      name = "ktp-text-ui-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "dolphin-plugins-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/5cxhms6vyqxx75cqv6b0899585hq06np-dolphin-plugins-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/dolphin-plugins-15.04.2.tar.xz";
+      sha256 = "19hyki0k06bma2a236w45hip6gb8fzwcm51qx8xxbii4di6qrkvx";
+      name = "dolphin-plugins-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjumpingcube-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/41gx49qgr229s409f1nfjv0s0xc0rr7w-kjumpingcube-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kjumpingcube-15.04.2.tar.xz";
+      sha256 = "04c0klbgsnp6brf8zml8sz6iyi9m7gidwpgdzrrnnhzwfpgaf9zc";
+      name = "kjumpingcube-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/676j87fj0mj0aqyz62729l7fwnl3dvnm-ktp-desktop-applets-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ktp-desktop-applets-15.04.2.tar.xz";
+      sha256 = "00jlhfm7sbg73y9zbkjicz7wr8740qi3ifm493m2f37cndljllhn";
+      name = "ktp-desktop-applets-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdcraw-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/nkjk53cfw4lm95jgwxvccsk4ln4dp5yx-libkdcraw-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/libkdcraw-15.04.2.tar.xz";
+      sha256 = "1j277ydzn35hzk5v0vf50giw1j3yibskpkb4kr5kirszs8m2yqkf";
+      name = "libkdcraw-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcharselect-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/x07k1rddjvi45jdbn6r1bgrc8a6pcbn5-kcharselect-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kcharselect-15.04.2.tar.xz";
+      sha256 = "084qzv8x6262xsl5n4ynkm3zsqf2wdlj5gn4y9jql7in1b92w293";
+      name = "kcharselect-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgpg-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/x5w1brmq7c4jkfx2dj335akvc7bqwhkv-kgpg-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kgpg-15.04.2.tar.xz";
+      sha256 = "1z3p0131hvnj3mm53n3q1hdkpvi77x1k8gv1bi3wblqin41dgmfx";
+      name = "kgpg-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/qf4pgkwm97jp6m634xaagz95l371qzrm-signon-kwallet-extension-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/signon-kwallet-extension-15.04.2.tar.xz";
+      sha256 = "0bp1j0hc0a7lwmzi97hymd83vb5x8ks4m4a1k3h2h86wq3gnnfyj";
+      name = "signon-kwallet-extension-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kshisen-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/l868j4vsnxzdjxx4albmff4532pk5x5y-kshisen-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kshisen-15.04.2.tar.xz";
+      sha256 = "0syx9x96zm4hlmpz644sn2rfb4phyzrgvcr0kl38l9aj1i56q81a";
+      name = "kshisen-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "lokalize-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/jxqly6p40ss9aprr12zmabghxphhid17-lokalize-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/lokalize-15.04.2.tar.xz";
+      sha256 = "1hj36k0arfqbyyxccbk6n9skc38a7g6vs3l4r0pdz40b4s65l4hz";
+      name = "lokalize-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kaccounts-integration-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/b7ckd23lzwf8xhrc6qpmyrha6dibk5k2-kaccounts-integration-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kaccounts-integration-15.04.2.tar.xz";
+      sha256 = "1586bv0h98rqbigrcsqx51nvzxk0zzxvqcxgncnjxknn4rhdkk86";
+      name = "kaccounts-integration-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-contact-list-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/7kn6vi1rmf7nddb0xcy3njyf0fhzgicy-ktp-contact-list-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ktp-contact-list-15.04.2.tar.xz";
+      sha256 = "10zjv2imp03p2wh9vj217skx5fmmscb5l8nwlcv7mlh0b74mlx5n";
+      name = "ktp-contact-list-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kremotecontrol-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/acyvv1x0q022axz5l6xz65cs54xqpq4q-kremotecontrol-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kremotecontrol-15.04.2.tar.xz";
+      sha256 = "0npdbdjcfa8y7lmzl80fgbvv94hj2v0fc1lfmii0k0xnb6jv8cvl";
+      name = "kremotecontrol-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-workspace-4.11.20.tar.xz" ".tar";
+    store = "/nix/store/kfm7vk5zlq9rpak25j4gkdaw1hsq6ap5-kde-workspace-4.11.20.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-workspace-4.11.20.tar.xz";
+      sha256 = "06n4aq0mi36d1ssqbvwxgy6jc18q70xp772i58ni0akw0ckrp33c";
+      name = "kde-workspace-4.11.20.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kalgebra-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/jvkznsklm87lnyvwkvn06wzp7irzlj80-kalgebra-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kalgebra-15.04.2.tar.xz";
+      sha256 = "1h8rpikyigx9804pn0624g83ja1wlb2m4hfc29jpi4j6va4h8j4f";
+      name = "kalgebra-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmplot-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/qln1l2y7b5nnwnvgis2ms2cp4iqz7672-kmplot-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kmplot-15.04.2.tar.xz";
+      sha256 = "0p1qkhmdn7wqggk1z4c8mwbgrk7daxgfjg6yhhscaj13ikg2l4qc";
+      name = "kmplot-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kate-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/vzxl3wf0dr7rnzb2xr9pkbdwirjryrv4-kate-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kate-15.04.2.tar.xz";
+      sha256 = "1llsg7ywl9mwl4gc25vw44v708r9k960c2lgqkfjpxnxpjlwk5vp";
+      name = "kate-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwordquiz-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/a2rnncjw6jn5si9pjcg4gv3fy0fd9pd8-kwordquiz-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kwordquiz-15.04.2.tar.xz";
+      sha256 = "0irs4nchd0fwxvv4c9wxww6vbi97ffz4rihwg1p5jipcad2l13ch";
+      name = "kwordquiz-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbounce-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/707rjgg0a9m8bpizypgkzp1g09zyd1hh-kbounce-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kbounce-15.04.2.tar.xz";
+      sha256 = "094cwq972h36mznl9snc52248vag1myxlndykagv13kdj7jwynx8";
+      name = "kbounce-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "marble-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/3cr2qy4k771c14nfm98zmash1s6p8f0c-marble-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/marble-15.04.2.tar.xz";
+      sha256 = "1jwh0vqdzj7r039pg84rh6jk4dznyanirv286v8anf23s3mjwf6a";
+      name = "marble-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.9.tar.xz" ".tar";
+    store = "/nix/store/h1g3dk80b67dqbx33zg1v3wb9141ic2j-kdepim-runtime-4.14.9.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdepim-runtime-4.14.9.tar.xz";
+      sha256 = "0h6q08j5i2lhvlv92daxdyf7vncisbx0ya11vh45wmbv30xv2cl0";
+      name = "kdepim-runtime-4.14.9.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiriki-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/7sp21hpwl9dbr9h4nqn6xpmqb74zvmcc-kiriki-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kiriki-15.04.2.tar.xz";
+      sha256 = "0sdpswz6gvk03sza5n7n9kf6xi0p7azkgkn27hn0ydh5fm7rfi98";
+      name = "kiriki-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "okteta-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/lzis9waz781v2n789qy6cc5za4xxb6hp-okteta-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/okteta-15.04.2.tar.xz";
+      sha256 = "00y3kcl57crwkycd7ahf9cw20bnjwzjrxnlkvdpqansmcqvmmih5";
+      name = "okteta-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "amor-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/g5a3dbqpf454c7lxi1k1r5d2sgdicl8q-amor-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/amor-15.04.2.tar.xz";
+      sha256 = "1kbdarrf2jxr5f458m28fg19g29xpj5n7fb9w2311052xaywf0rr";
+      name = "amor-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-approver-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/wxfmvnsjxnaiiflbcc7v38h2ax27m5fi-ktp-approver-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ktp-approver-15.04.2.tar.xz";
+      sha256 = "1qik158frx7208adk7r573a85y8xjd1q8r9yw4fb592hvlkdk3i7";
+      name = "ktp-approver-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-base-artwork-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/wdi23i8hk6c4fnvkw6bs75s8jkc0wxc0-kde-base-artwork-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-base-artwork-15.04.2.tar.xz";
+      sha256 = "0if4i3zag7hzgrf89bswfg7c95m066phjs89fk4ss45ak25rgddy";
+      name = "kde-base-artwork-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.9.tar.xz" ".tar";
+    store = "/nix/store/75yrqw2cr3b7kv1hsvlz4m9j6gm36akk-kdepimlibs-4.14.9.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdepimlibs-4.14.9.tar.xz";
+      sha256 = "0mjbaszc14ilvcjmr7aqy41py7yfriz1glvwpbr89z9nqjvy62yj";
+      name = "kdepimlibs-4.14.9.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kstars-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/mqk73kl61afzbysc7isfli9ashgl29j9-kstars-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kstars-15.04.2.tar.xz";
+      sha256 = "01mzd0qbfjx6fzbaii6al6r62frygf9psi4av1227p3drwmnxrz6";
+      name = "kstars-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kaccessible-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/yrs4k4mal8rdpy1781jblbapf9xz201v-kaccessible-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kaccessible-15.04.2.tar.xz";
+      sha256 = "1aa4c5r0bm0azm8dhkvnrk87669vp397xzz0v0d3ih7ffmh72il1";
+      name = "kaccessible-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksnakeduel-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/0zkd1qcv6k52avkv235108rrqn2fifd8-ksnakeduel-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ksnakeduel-15.04.2.tar.xz";
+      sha256 = "1zzwkc6k6315a02il4sp4zswz0i1031bcvsvxrpxb45s4rqhds3b";
+      name = "ksnakeduel-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kalzium-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/l50svmrk7acq79f1ab284q61jm1164li-kalzium-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kalzium-15.04.2.tar.xz";
+      sha256 = "1mcfw1l0qqzr212ysgppva8s4dn3dfhzqh712fc3kd416azz985x";
+      name = "kalzium-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "oxygen-icons-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/wlna2q3x6crc3xj7a7x09r0fxzsxfl27-oxygen-icons-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/oxygen-icons-15.04.2.tar.xz";
+      sha256 = "1xwa8y6alrk6faf6bw3wc0y2vxjx32wzl9ncywisb4823xc8njbi";
+      name = "oxygen-icons-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "cervisia-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/h9i6iisfnqyz340z2izl02n8nyz2l82b-cervisia-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/cervisia-15.04.2.tar.xz";
+      sha256 = "10a6k6x5mxcp3ark71rjcsbvi9q7r7sqc0pqx6wqg8wrvqng776i";
+      name = "cervisia-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmahjongg-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/yhhpl1hamlamb7kfi1njlp60fg59xiqn-kmahjongg-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kmahjongg-15.04.2.tar.xz";
+      sha256 = "17jlb1nr2i79s4m3srv0fm4zwqqknabfa0zwb6y5bdlk9bjpphaq";
+      name = "kmahjongg-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdegames-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/qffj5v8rmrlnqm7y7l68kwhy4cx9hhqa-libkdegames-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/libkdegames-15.04.2.tar.xz";
+      sha256 = "0r3mnbc4ka8whmdjadnr6wyac4bwfv6w01l6nm2k7gsq2n38q2yj";
+      name = "libkdegames-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kspaceduel-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/zsrxzn4zp9a4v9xfaqr27d4nnmgycdc2-kspaceduel-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kspaceduel-15.04.2.tar.xz";
+      sha256 = "07pgrdywj0jbvqw21qkblax30jym9x8y94ig5jn3jl19ax7a8wqy";
+      name = "kspaceduel-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmouth-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/pybi47055hcdlpliqari9p8gki1yj8iz-kmouth-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kmouth-15.04.2.tar.xz";
+      sha256 = "1hjn1fb5c7a5yw0yzsb7v3wdgq1wyqj7zs7jw71gsgkq3sy0as47";
+      name = "kmouth-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-dev-utils-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/2y66l1759ipk2dk46b0imh1r6vwb3yrx-kde-dev-utils-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-dev-utils-15.04.2.tar.xz";
+      sha256 = "100kia4fd6gc10mh1nmadrm60wwnciyq5nlm0m4c1cjbp9ypyfh5";
+      name = "kde-dev-utils-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "mplayerthumbs-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/3ywzsbp1lvq98ikalwlxs57x9w2zh47x-mplayerthumbs-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/mplayerthumbs-15.04.2.tar.xz";
+      sha256 = "0lgag714pqpqnf6v9dz5xlriswcyqvjnj309gk0wji523hny3mim";
+      name = "mplayerthumbs-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "konquest-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/sqjrx2z8pig68sfifdcykksys2kifi2h-konquest-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/konquest-15.04.2.tar.xz";
+      sha256 = "1w03w8nxkbz9ng2spa3pc5gmigajm7k8dcz2j1nly44a6g85rxnn";
+      name = "konquest-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcolorchooser-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/3cz810cqihfw4jyfi8bdg9fi5bzs1rga-kcolorchooser-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kcolorchooser-15.04.2.tar.xz";
+      sha256 = "1hypa5q9vfk3imc6fng7li3jkh51phsk2cq1sjri1czl547ij38h";
+      name = "kcolorchooser-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ffmpegthumbs-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/fzz2pwgl8jx0flydbv67f494rqs2lrdd-ffmpegthumbs-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ffmpegthumbs-15.04.2.tar.xz";
+      sha256 = "122mfd85yzkmyg1wzz7fz4v0jnxxifinckc9rb5ydjlj3c85y9qg";
+      name = "ffmpegthumbs-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "print-manager-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/zfiqwh08ccppyzvqd8wrlmc0zf7nbj54-print-manager-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/print-manager-15.04.2.tar.xz";
+      sha256 = "0hry52ypcchzbsvg5y4mw2h494l3cp4lqflhw48pilgzmz6pa1rk";
+      name = "print-manager-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "step-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/b51g9dz39d5raxgvl9fbmdbmsxjpniyg-step-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/step-15.04.2.tar.xz";
+      sha256 = "0skcnrdb3gcl8z2krmhi38dz5gr9a0bzvfgiv953bbr93hkjsscf";
+      name = "step-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "poxml-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/s9c62j11m3rc9w3i586hjwk1k29lhxwa-poxml-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/poxml-15.04.2.tar.xz";
+      sha256 = "09rvf4yzrncc0q3975mwj37a3pm0l07r3jnqzhbapdkkwjqs9ad3";
+      name = "poxml-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/dwy5s9x602rr1m5cdjigk7mjvkab7h1c-ktp-filetransfer-handler-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ktp-filetransfer-handler-15.04.2.tar.xz";
+      sha256 = "15y53z3kbbvk6vg1f3ns88mq6c9hmd41s2ayixhg109nwp7q0177";
+      name = "ktp-filetransfer-handler-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/bxd782i7kh5ssxcsvd7b25rx9mwywlpj-zeroconf-ioslave-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/zeroconf-ioslave-15.04.2.tar.xz";
+      sha256 = "0129dc6r1sfxjg3bdfbnprgvf7iricshw1l879cw2lzb7wmqdpm9";
+      name = "zeroconf-ioslave-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgeography-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/7fh80id5rynq5wigvx95r5jldyj09f8a-kgeography-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kgeography-15.04.2.tar.xz";
+      sha256 = "1iddjjpvyimbc9p0z2qzqc2v1q48pvm1d6qd4pdbycshpcm4wjwd";
+      name = "kgeography-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkcddb-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/wqlwval30d2jii0cpcnhyr7hvhn18yck-libkcddb-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/libkcddb-15.04.2.tar.xz";
+      sha256 = "1yrmvy8kldhh312dk4kipr15hr4zhsg2yj645naybfh2dya89q6m";
+      name = "libkcddb-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkmahjongg-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/i1rmk34a0bl0088ypi1vr3zgm22s0qxq-libkmahjongg-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/libkmahjongg-15.04.2.tar.xz";
+      sha256 = "1xrdv1p5gjzg4cs35y2kmd49lwiinl1wqaw76y5lq3p303k7vvm1";
+      name = "libkmahjongg-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksquares-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/091km97cfa95lqa9ll2bmy1j4ayijc94-ksquares-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ksquares-15.04.2.tar.xz";
+      sha256 = "01h8kcahn72lh9hdqljz9fx9wdh3gx7rk7fk0xpc7fh0qqwcdv9i";
+      name = "ksquares-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksudoku-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/6056jj6bns8mgr6ss3jqfdrwm1nlmvm2-ksudoku-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ksudoku-15.04.2.tar.xz";
+      sha256 = "1xn2d7aiqv0q3lg5iwhjp2abwq2ssxa8gdjawvj40xq4zffr0wna";
+      name = "ksudoku-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kollision-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/47lslszl9rlnpiw1ic2lxkrd5302kswb-kollision-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kollision-15.04.2.tar.xz";
+      sha256 = "0jqjg6dr2ff5qb5f23kfd017m1lm7h2rim6q8dkbxk4xm92f5kqi";
+      name = "kollision-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcron-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/ilz3z9pv0axrikakkrl1ibkv496r34ys-kcron-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kcron-15.04.2.tar.xz";
+      sha256 = "0fszrwgsib82glm0hi2iq11b8z3w8j14vp8hqfxp8ccggk1a0xaf";
+      name = "kcron-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bovo-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/4lz289bp3agyw5igfvpdzi123m7qmiy4-bovo-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/bovo-15.04.2.tar.xz";
+      sha256 = "00w5d9mapy4f634ys1k45fhpa50h5299y9q6wann9phrmf8kj8y2";
+      name = "bovo-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "filelight-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/654c7xpn6kvbvglh0sxg5qz75w52nfsi-filelight-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/filelight-15.04.2.tar.xz";
+      sha256 = "0ynrirvrisswaia9894wd4b6f97h04bd3w9zlv28nc9ck1p2d5zv";
+      name = "filelight-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "picmi-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/1xlxqdznc1w89hvz6ykzpbd4pkrxifmh-picmi-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/picmi-15.04.2.tar.xz";
+      sha256 = "06dz8552rfydirvmnibvpw0ahg4f2za82qkv2j2crfqm2iigp9rv";
+      name = "picmi-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kig-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/0g5k9zx2d4fxpsa4pifpilrm9xamq40g-kig-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kig-15.04.2.tar.xz";
+      sha256 = "19wv15ji7f0m0zzymw11g28sa5n1kyhpnqbcgpfkaqxynv2fn4cv";
+      name = "kig-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksirk-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/81c1aijibwhrdhn149m3wx2zxv3l2r8f-ksirk-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ksirk-15.04.2.tar.xz";
+      sha256 = "0w6j3z8vzj3wnnwkpm2gv533jkjwdx8f2m6hnqa3ckzashmlqx7w";
+      name = "ksirk-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "okular-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/9i3ma5arv1bfij2f92lmrg4z1fz7jr2v-okular-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/okular-15.04.2.tar.xz";
+      sha256 = "0cqqh4f4ymyx7204ba0afy2hscayd8aqg8dpbv13xxhs8m1aa3p7";
+      name = "okular-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksystemlog-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/635srb7rlzyzlii3qf1j9p85fn18cdw6-ksystemlog-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ksystemlog-15.04.2.tar.xz";
+      sha256 = "00il9r3n5756n0n6k515fdm9z7mfa1gd1n6kac4vr7yldvll9wh1";
+      name = "ksystemlog-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmousetool-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/fchxy0dfggh8hgd1z8yp13qgn1xrhxvl-kmousetool-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kmousetool-15.04.2.tar.xz";
+      sha256 = "1nkn25zg6bb4pc7s93f6igcpspy1a1wlzh2ckmm2613594jh1qr9";
+      name = "kmousetool-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/ah5gjm6qdj22i62i1davbd88hwpp7bb0-kdegraphics-mobipocket-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdegraphics-mobipocket-15.04.2.tar.xz";
+      sha256 = "1y3w477bws206fx1rymvp9dr7z8bxy1l2p0cdawlnbir9bamsnnc";
+      name = "kdegraphics-mobipocket-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-kded-module-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/n874w08k1vfkinc01hr4hlvd4qg9ln8r-ktp-kded-module-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ktp-kded-module-15.04.2.tar.xz";
+      sha256 = "1a7jfa8lqb24dpckiix13lhdgb18rv4v9ib908jqqqnk8rphac5n";
+      name = "ktp-kded-module-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klines-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/6wl8yszqa313v9w1b8l05qc2ajdxn9vj-klines-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/klines-15.04.2.tar.xz";
+      sha256 = "11ksr0khyj29bbzcavpxm4kc109m2g2gbhi4qhsyanfj8a0811az";
+      name = "klines-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/hdkpbx4z3d9wx6zmhcdfsj8rmxsyh3ay-kdenetwork-filesharing-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdenetwork-filesharing-15.04.2.tar.xz";
+      sha256 = "0l7s9a8ngwvz11bk5d5q4vxi0xvqc2jk62zcqq0mjiznd3vwiqdy";
+      name = "kdenetwork-filesharing-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "klickety-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/4k68344zgzdb3a11zgjlv4npcc16gxag-klickety-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/klickety-15.04.2.tar.xz";
+      sha256 = "149jka949jcpd75kg9rk2xa6m3hvkaiif57a35bg2pdzs41dqnn5";
+      name = "klickety-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-contact-runner-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/79xzz7i1yspf2mlzzbzzgaxk8szx0a8p-ktp-contact-runner-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ktp-contact-runner-15.04.2.tar.xz";
+      sha256 = "00r8z9zg9g1lpr6jmkr5l0n4w7zsskl35spral6ibbnnvfcv7jrf";
+      name = "ktp-contact-runner-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdenlive-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/5q0r2446rj0dkxc3k5m96rjbbcgvyg4a-kdenlive-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdenlive-15.04.2.tar.xz";
+      sha256 = "1q17b5gihcgi5svs123h0vl25ij4ajybk16is9hjyfpmhkl7nyfa";
+      name = "kdenlive-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "lskat-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/6gskfm2ymh6mnv2irgj5v21r3hhypf9s-lskat-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/lskat-15.04.2.tar.xz";
+      sha256 = "1ydmglbihijpsgq29nz3sg3g8sja9nzqd7czpg8z8zy9gylh6cl4";
+      name = "lskat-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kblackbox-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/16pvgzgzp6y44n3cmpnajgw74m92wd9i-kblackbox-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kblackbox-15.04.2.tar.xz";
+      sha256 = "1ib9a9pp9mdp2kbz2gb4lnrlf66v7170y4qrg24vmvpsa7csgmx3";
+      name = "kblackbox-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapptemplate-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/33rnc300y683cxcp50mi1awdk4rxpp18-kapptemplate-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kapptemplate-15.04.2.tar.xz";
+      sha256 = "092wysas8zfhz8af4fvizbn148c4jhj4vk2cy6z94qih8hnry294";
+      name = "kapptemplate-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbreakout-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/s3ni25fyw0i7jykk0bdybq4jq60yfgi5-kbreakout-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kbreakout-15.04.2.tar.xz";
+      sha256 = "1wrggwcgyc6vlxy0zx8y69lvz0njalbfw54sgnrnc8ka65mjr0pg";
+      name = "kbreakout-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktimer-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/wr8lj1871w99ffd0dgjyn3rgr2kix9sm-ktimer-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ktimer-15.04.2.tar.xz";
+      sha256 = "19ah9r92i8r4059apvv1aj25hvkhq3dw9vmvi5r8sxrdbd3m0yw0";
+      name = "ktimer-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "juk-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/rcckq4x2wvg7rgm4nbwlmzqhxsasmbd4-juk-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/juk-15.04.2.tar.xz";
+      sha256 = "08lwi7yakry6cwrr0hxmrb9h2nm5xkx39bwfsphrd4vkyfd94awp";
+      name = "juk-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdewebdev-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/1b0cd8ahc9841k5f3yp8mnfi43gmca5b-kdewebdev-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdewebdev-15.04.2.tar.xz";
+      sha256 = "0cq2zyi4j6z70ghy8x1hhi3bgph6ql2k71vllfc37gb5h8gqpfh4";
+      name = "kdewebdev-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "pairs-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/8n1ls70j6sp30v5172f8b4pni77h612w-pairs-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/pairs-15.04.2.tar.xz";
+      sha256 = "11hbzh8nk38m1n61vcyzz1v6q1fpwyiv9l6s05mrsm4krny2bi4a";
+      name = "pairs-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kopete-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/qxv3q0s8qvkmw3gv186zb5h8ds9qif9c-kopete-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kopete-15.04.2.tar.xz";
+      sha256 = "1zvf0y7f8r97lvwcspp2bwph5wsh1rcac9hp6vg0hkama3iqfbk3";
+      name = "kopete-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kreversi-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/1d78nc8bn6q9pya6fmbvpv1j504h2p74-kreversi-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kreversi-15.04.2.tar.xz";
+      sha256 = "0qzwk8yj5dk01n6w1jmrqncy48cpg2xriqqiachx4gh878f2y4cs";
+      name = "kreversi-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knetwalk-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/40vin5w140gna791rbdvgiqv6gmdy5a6-knetwalk-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/knetwalk-15.04.2.tar.xz";
+      sha256 = "0j2zkh87wd2xhd0aaad40cjq1na4kg18y0bnpiqdgwgmvvss18cn";
+      name = "knetwalk-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeartwork-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/nfikvnas8aa532z85hra7d5lbdcp0sjb-kdeartwork-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdeartwork-15.04.2.tar.xz";
+      sha256 = "0dhm6n5x8pq4nl8f5gnr2cdgy3fjkqyhij9gdxqan5s7rhfq7j4n";
+      name = "kdeartwork-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "artikulate-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/ch4qds4ksc7bxc7qvnp594bcq15f7lfg-artikulate-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/artikulate-15.04.2.tar.xz";
+      sha256 = "1hi57rl5ibs28l5w3gwciv9yi9gw7q22say8w5b34b5kjw0cyg2v";
+      name = "artikulate-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kaccounts-providers-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/br9b5cwnam0xgh9pm3sa1gf6r4wmr2pf-kaccounts-providers-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kaccounts-providers-15.04.2.tar.xz";
+      sha256 = "1a2mwv1lvmnw7apb94w4620ip3d3p8xxp3ff0yg633x60g0wnkiv";
+      name = "kaccounts-providers-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiten-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/kpd3k77yxizdi9x0063m6dwjlw002xmh-kiten-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kiten-15.04.2.tar.xz";
+      sha256 = "0yr7i1k3qpifwy2a58b899nfglkyf8gdrbakhdd9j2rlyyk3hya3";
+      name = "kiten-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libksane-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/3058pvg2jwnd405awd0ajk78qbn3pgr2-libksane-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/libksane-15.04.2.tar.xz";
+      sha256 = "0s2jmp1596qnjff2fqmlmg3qzfhf2wjfvazkrrndfr6dzn4sz72s";
+      name = "libksane-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/jw8kq5lv729dyz48fr0ynck8l1fi5lz9-kdegraphics-strigi-analyzer-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdegraphics-strigi-analyzer-15.04.2.tar.xz";
+      sha256 = "1gf6n1bdhbizfgpbn1p81gzz09a028dadij7gn016vkfczjkl1k8";
+      name = "kdegraphics-strigi-analyzer-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "cantor-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/kay8y3b2yqw6x5n6d0bjh86x76p1pvr3-cantor-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/cantor-15.04.2.tar.xz";
+      sha256 = "0y7gs13s38swvicfw9wlxgqr96bvny4d2rsvnkb0cn1d68vmb7jm";
+      name = "cantor-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "dragon-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/v0ig7hdlixwprlrjpirxsj3mqg3mzj34-dragon-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/dragon-15.04.2.tar.xz";
+      sha256 = "0kf692d3wsj32iry3dl148f4i04y9y26nc9v4skpwf5pvsgp2d5s";
+      name = "dragon-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-auth-handler-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/58nbpzqmcw17152bs24lh6h3mj6c6nlf-ktp-auth-handler-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ktp-auth-handler-15.04.2.tar.xz";
+      sha256 = "1fp1yks0k2mfn9kqfsy5y27ibpfjvmlx4h1ah6sy5mmqvh96s04h";
+      name = "ktp-auth-handler-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "katomic-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/hxhzw8r4ji2z6m1scybs90q3n4sf0p34-katomic-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/katomic-15.04.2.tar.xz";
+      sha256 = "1gpg01ngqmfkiwzfcx686x2yzd4sjlp5xkdrgdwy20czl1i6rras";
+      name = "katomic-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "svgpart-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/9kjmy8gy1lybbgv45m3jpi5dg2f0d9xl-svgpart-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/svgpart-15.04.2.tar.xz";
+      sha256 = "09f9zfppa82zxzrm7b1c7q6hn3dry0rwzz3xpx26dsh219qaax29";
+      name = "svgpart-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/bg5g9qpbzwrp50ipg3x9mi54dmp04hnw-kdegraphics-thumbnailers-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdegraphics-thumbnailers-15.04.2.tar.xz";
+      sha256 = "15w0bli83ykqdxv37zpmdgf66gkqmb3gf1wxqfhw241pfcqbsxc3";
+      name = "kdegraphics-thumbnailers-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/2ws9qacikk9az2dj6lxmg1swm7kwvyk4-ktp-accounts-kcm-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ktp-accounts-kcm-15.04.2.tar.xz";
+      sha256 = "1icmsax7abwfjavmq9vn2l3hj7hbjdhky60hga52sdnw7hy58n01";
+      name = "ktp-accounts-kcm-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktuberling-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/qvbh4g988977fqahh0vdy6y2mcsa03sq-ktuberling-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ktuberling-15.04.2.tar.xz";
+      sha256 = "1kf2gwxwh0v9lai5lwbgd9d8d27d9p6vxj6i4291w5wv9plld9my";
+      name = "ktuberling-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-baseapps-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/y8fy3h6ypqnzr883hq02c8p0rfilizs5-kde-baseapps-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-baseapps-15.04.2.tar.xz";
+      sha256 = "0yqg1z6c9ma8cfhpb21jgk5hcpg0dscm89sy5jxwflg1n355jkhv";
+      name = "kde-baseapps-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcalc-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/q36zxbwxvwhmccqsqvjp7s0amc56ci9g-kcalc-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kcalc-15.04.2.tar.xz";
+      sha256 = "0sk431vrz8xc12fc6qfdlxcnkr5yl729pk450pj90xm6x0jj24lp";
+      name = "kcalc-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "sweeper-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/ailfyyak31rbjd1syva34lh8ldqa589i-sweeper-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/sweeper-15.04.2.tar.xz";
+      sha256 = "0nyl587zrmz4aynbp7g7415gczilmb02h79s4xpfxilmxc9910w3";
+      name = "sweeper-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kuser-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/841sa28hlcjqbh223vfyhf90xk2v7fwk-kuser-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kuser-15.04.2.tar.xz";
+      sha256 = "0b2q616nzqjb0q9as71x2njdjlcd3576rkwnyv5acjgb5bq7wgg4";
+      name = "kuser-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kturtle-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/b7v36hd1nplcfjn9j4sphxh08mw366l8-kturtle-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kturtle-15.04.2.tar.xz";
+      sha256 = "0xgb2ahzyg88iz1dgvbc5n17fbds56mixcfk4mmi2hgycckjk910";
+      name = "kturtle-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkface-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/gpvb35d3ri6z7bxvczhhq4d04a59aa32-libkface-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/libkface-15.04.2.tar.xz";
+      sha256 = "08xc93jjplqc6y0m9q6krwplfjj2cklvbw8m9dhhv1w6mn8qp8r3";
+      name = "libkface-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "audiocd-kio-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/92qgv319y1sypkgcgzhr8k2m2ii992kb-audiocd-kio-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/audiocd-kio-15.04.2.tar.xz";
+      sha256 = "1vxqabysh3mjmrzaxz2kldx2a6w07rxf1adka1fwp2yhajb1bzlh";
+      name = "audiocd-kio-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kppp-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/jw9l8530fgdkkzyxdmf90g1p3s7phhs2-kppp-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kppp-15.04.2.tar.xz";
+      sha256 = "0g89b800v06p1ymxdm7g04ajdmdh86y740hnzr0r64rdhsxq0wn9";
+      name = "kppp-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kget-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/57ri311sxq7bq64by12vgjqsgmajrfk7-kget-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kget-15.04.2.tar.xz";
+      sha256 = "0cc7rva5yig01kfih1im0ncf0jk7hq1pwyqr9486n024161fc1n0";
+      name = "kget-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kolourpaint-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/1n2511qxgqb7prz2l85psdq1dypq3qms-kolourpaint-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kolourpaint-15.04.2.tar.xz";
+      sha256 = "04rly3wrh8hibaps90mphvbb35d9c308czfmnhqxyk6np4bfvrk6";
+      name = "kolourpaint-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktouch-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/fbf91j6jf0f3ws7sa8spsk2zkm08s5j4-ktouch-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ktouch-15.04.2.tar.xz";
+      sha256 = "18f0r9d0hs1prrwj33iwik9ipdf3hyf316yz7jbg3iyygp8xa1wf";
+      name = "ktouch-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbruch-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/zf38d9iax1bnwga069a921zc7156f6sy-kbruch-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kbruch-15.04.2.tar.xz";
+      sha256 = "0w1fw3lydp5znk3n5fhg30gj7mxi7v6y7hv46wl01cysd73m7825";
+      name = "kbruch-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kolf-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/mbfh9c9jrs8a8xb6srhny9ipjs52nx01-kolf-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kolf-15.04.2.tar.xz";
+      sha256 = "0fifvpsp6nbr58r1pammynw4zh4k9z51vgm5xbcl1k6pblh6hn6l";
+      name = "kolf-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kgamma-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/i6k8yvh7rf1dqd2kn6aqmyzzcayxp3sy-kgamma-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kgamma-15.04.2.tar.xz";
+      sha256 = "08ia2skz3w6zwzm9jlgiyrlxnn7mx83d78350plr5k6qrszn483l";
+      name = "kgamma-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kigo-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/9ca8cpnw78bnlrqi1yyy192qbb93y82q-kigo-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kigo-15.04.2.tar.xz";
+      sha256 = "00hhdhv905l1y79i2vsz65r7vqbz2vlzl57y4sdcjpk65ababcrc";
+      name = "kigo-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/vdwv4ww6n28gpc2rkylml28yalihy1q6-kdesdk-kioslaves-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kdesdk-kioslaves-15.04.2.tar.xz";
+      sha256 = "0fpmn0cv95jicxq6zbxivarlyhmjbi3a2brnz9xb4jznx06c2cz8";
+      name = "kdesdk-kioslaves-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-dev-scripts-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/qc0mhibyrkipf7ryl45d0caaj5xsvmpc-kde-dev-scripts-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kde-dev-scripts-15.04.2.tar.xz";
+      sha256 = "07lliwm96m2nvwa52vsch9x85vxxj7cqlvfm3ynv8nw49pmlkdi5";
+      name = "kde-dev-scripts-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcachegrind-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/l7vgzgq9zh2q3nm6lvvxg57p86qr6z8a-kcachegrind-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kcachegrind-15.04.2.tar.xz";
+      sha256 = "1f3iqjd4dk3agk6kw096199yrd8ag3zjx9zz58gvlkdww9rlap13";
+      name = "kcachegrind-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkomparediff2-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/ayx65a6hvxxyw4cclvw8f9c79pixbklf-libkomparediff2-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/libkomparediff2-15.04.2.tar.xz";
+      sha256 = "0qj9ih96v3r2l9nq68z4y175nhizl8rmd4nypswy5lzi7k8m9q99";
+      name = "libkomparediff2-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "killbots-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/v7qcb9dvh0sg031y8s7qlhjj7bfi0hba-killbots-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/killbots-15.04.2.tar.xz";
+      sha256 = "1xr7857fi5l5h6d6fsyqsb803h29gprfsxz4h73scnnn70bkkm9q";
+      name = "killbots-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "rocs-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/llzpz351096v1jq26pnpq38s353rijfk-rocs-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/rocs-15.04.2.tar.xz";
+      sha256 = "0zgxgbmmc3wy0k0s6dx7gprw4dl1rgdrq2ah98zr658bpwkkm9aw";
+      name = "rocs-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmines-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/678x21vwippxpjg2bsv79127s6852clb-kmines-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kmines-15.04.2.tar.xz";
+      sha256 = "1n49vzbyiiya0inxp0kydh47mm5m2qgm8x3n6yj9hjhllvjm885s";
+      name = "kmines-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkdeedu-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/ykck6cw92ddmlcarb2b5rkqcsshrk54w-libkdeedu-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/libkdeedu-15.04.2.tar.xz";
+      sha256 = "1pvipdv3zhqpnmz4x68jdfml2hjamlb591r9qcibw1pzgx7bz77q";
+      name = "libkdeedu-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktp-common-internals-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/aifqj9bdnahhjisqbiamcx8mq8fkw234-ktp-common-internals-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/ktp-common-internals-15.04.2.tar.xz";
+      sha256 = "0b255d8yf8xi426kpsqb3s1dqsqvypk485pw327kvqg2jj2jdmiq";
+      name = "ktp-common-internals-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kompare-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/3z0xfsx62crxyp35in81zz5y84dcrfgr-kompare-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kompare-15.04.2.tar.xz";
+      sha256 = "0c3kyfqz6mp4mj0ryhjgqwp2x93bj0nsbgp2vf9rgvkcdvhd6fqk";
+      name = "kompare-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "analitza-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/qfq2a23wsl1lws544pp5p0hgmprr2kaj-analitza-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/analitza-15.04.2.tar.xz";
+      sha256 = "117mw7c74vxh6mp76lxw1jc231b2zvif8d721dl5nshggkxhmf9j";
+      name = "analitza-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "parley-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/fcj9c30mhz0s2qhlch2sc1bsy52vp1hk-parley-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/parley-15.04.2.tar.xz";
+      sha256 = "1xzjpm8vfxp7g5497n95r3x4pbs6s29jaf6rlkb3lm72x7yml7fc";
+      name = "parley-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkipi-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/3c6adpvdmw4yvwqa4ivn3mqf0himjf1f-libkipi-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/libkipi-15.04.2.tar.xz";
+      sha256 = "1fn671kjmin20bgi6h34fvcn3811ms34i9xbpxc3vv2s4sgn2v72";
+      name = "libkipi-15.04.2.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kqtquickcharts-15.04.2.tar.xz" ".tar";
+    store = "/nix/store/q3m5pc6n5f7l2hipmfplsjbswzg8n0vh-kqtquickcharts-15.04.2.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/15.04.2/src/kqtquickcharts-15.04.2.tar.xz";
+      sha256 = "02fclmqa845cd6gll89m2fi382syani9r84w0hnnsyc77dqrlqi6";
+      name = "kqtquickcharts-15.04.2.tar.xz";
+    };
+  }
 ]
diff --git a/pkgs/applications/kde-apps-15.04/manifest.sh b/pkgs/applications/kde-apps-15.04/manifest.sh
index 2aa3cee8c85..d74d9cbbfbc 100755
--- a/pkgs/applications/kde-apps-15.04/manifest.sh
+++ b/pkgs/applications/kde-apps-15.04/manifest.sh
@@ -10,6 +10,7 @@ if [ $# -eq 0 ]; then
   $(nix-build ../../.. -A autonix.manifest) \
       "${KDE_MIRROR}/stable/applications/15.04.0/" \
       "${KDE_MIRROR}/stable/applications/15.04.1/" \
+      "${KDE_MIRROR}/stable/applications/15.04.2/" \
       $MANIFEST_EXTRA_ARGS -A '*.tar.xz'
 
 else

From fbcdb662641395901f43f19f151f5654e9d345da Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 5 Jun 2015 16:35:06 -0500
Subject: [PATCH 0812/2322] kdeApps_15_04.ktp-text-ui: add missing kdbusaddons
 dependency

---
 pkgs/applications/kde-apps-15.04/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 661c8c3acb5..91583d75ead 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -350,6 +350,12 @@ let
           ++ [ pkgs.libotr ]; # needed for ktp-text-ui
       };
 
+      ktp-text-ui = super.ktp-text-ui // {
+        buildInputs =
+          super.ktp-text-ui.buildInputs
+          ++ (with kf5; [ kdbusaddons ]);
+      };
+
       lokalize = super.lokalize // {
         buildInputs =
           super.lokalize.buildInputs

From 7e04b7319c54bf0a4c0b6b55caca80a3b7434a87 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 5 Jun 2015 23:55:01 +0200
Subject: [PATCH 0813/2322] haskell: disable parallel compilation for libraries
 to mitigate the effects of GHC's non-deterministic library ID bug

Further details can be found at <https://github.com/peti/ghc-library-id-bug>
and <https://ghc.haskell.org/trac/ghc/ticket/4012>.
---
 pkgs/development/haskell-modules/generic-builder.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index edff84a0403..c0505d6e3c6 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -72,7 +72,10 @@ let
 
   hasActiveLibrary = isLibrary && (enableStaticLibraries || enableSharedLibraries || enableLibraryProfiling);
 
-  enableParallelBuilding = versionOlder "7.10" ghc.version || (versionOlder "7.8" ghc.version && !hasActiveLibrary);
+  # We cannot enable -j<n> parallelism for libraries because GHC is far more
+  # likely to generate a non-determistic library ID in that case. Further
+  # details are at <https://github.com/peti/ghc-library-id-bug>.
+  enableParallelBuilding = versionOlder "7.8" ghc.version && !hasActiveLibrary;
 
   defaultConfigureFlags = [
     "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid"

From 52184b53c05464fc9ccd3dd8200cb78c41ec8cc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 6 Jun 2015 09:21:21 +0200
Subject: [PATCH 0814/2322] Revert "Revert "Explicitly pass -pthread flag to
 fix the build after some updates""

This reverts commit 6cfea50ad14b3225226e64bd77925dc05a593689.

I think the reason for the revert was because of patch dependencies. We really
need this patch to fix heimdal build.

Or else:

  $ nix-build -A heimdal
  ...
  /tmp/nix-build-heimdal-1.5.3.drv-0/heimdal-1.5.3/base/.libs/libheimbase.so: undefined reference to `pthread_getspecific'
  /tmp/nix-build-heimdal-1.5.3.drv-0/heimdal-1.5.3/base/.libs/libheimbase.so: undefined reference to `pthread_key_create'
  /tmp/nix-build-heimdal-1.5.3.drv-0/heimdal-1.5.3/base/.libs/libheimbase.so: undefined reference to `pthread_setspecific'
  collect2: error: ld returned 1 exit status
  Makefile:509: recipe for target 'tc' failed
  make[2]: *** [tc] Error 1
---
 pkgs/development/libraries/kerberos/heimdal.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index aeea290bdb2..320e161d3da 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -23,6 +23,10 @@ stdenv.mkDerivation rec {
     "--without-x"
   ];
 
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -pthread"
+  '';
+
   # We need to build hcrypt for applications like samba
   postBuild = ''
     (cd lib/hcrypto; make)

From 08c4a192e23681d31cf88c1509ddf29cf802492a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 6 Jun 2015 09:43:15 +0200
Subject: [PATCH 0815/2322] ghc-7.10.x.nix: remove obsolete re-build hacks from
 the package set configuration

---
 .../haskell-modules/configuration-ghc-7.10.x.nix   | 14 --------------
 1 file changed, 14 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 ac02bbc8818..335b133f555 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -278,18 +278,4 @@ self: super: {
   # Won't work with LLVM 3.5.
   llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
 
-  # Ugly hack to trigger a rebuild to fix the broken package on Hydra.
-  asn1-encoding = appendConfigureFlag super.asn1-encoding "-fignore-me-1";
-  asn1-types = appendConfigureFlag super.asn1-types "-fignore-me-1";
-  cmdargs = appendConfigureFlag super.cmdargs "-fignore-me-1";
-  crypto-api = appendConfigureFlag super.crypto-api "-fignore-me-1";
-  crypto-pubkey-types = appendConfigureFlag super.crypto-pubkey-types "-fignore-me-1";
-  hourglass = appendConfigureFlag super.hourglass "-fignore-me-1";
-  math-functions = appendConfigureFlag super.math-functions "-fignore-me-1";
-  tagsoup = appendConfigureFlag super.tagsoup "-fignore-me-1";
-  X11 = appendConfigureFlag super.X11 "-fignore-me-1";
-  x509 = appendConfigureFlag super.x509 "-fignore-me-1";
-  x509-store = appendConfigureFlag super.x509-store "-fignore-me-1";
-  x509-system = appendConfigureFlag super.x509-system "-fignore-me-1";
-
 }

From 6aa10201ccbc81b055094a87f3e45aa2aa850f5e Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 6 Jun 2015 18:38:18 +0900
Subject: [PATCH 0816/2322] flashplayer: Update from 11.2.202.457 ->
 11.2.202.460

---
 .../browsers/mozilla-plugins/flashplayer-11/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index 35541b39ee8..79d95571f2f 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -36,7 +36,7 @@
 
 let
   # -> http://get.adobe.com/flashplayer/
-  version = "11.2.202.457";
+  version = "11.2.202.460";
 
   src =
     if stdenv.system == "x86_64-linux" then
@@ -47,7 +47,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "0nkr6p4h5l03ywsj1sbap359cl1x9rq3m12j9gvwvbvn935rmyr2";
+        sha256 = "152hhxismgvz6hkh5m8z5x1drpwflymd2zk3v96nszpkb2xxirnr";
       }
     else if stdenv.system == "i686-linux" then
       if debug then
@@ -60,7 +60,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "0qil5rb61bkn80fij31nv29q2wa7bxiwwxgy5zlkm2hsyrz3y4kc";
+        sha256 = "15655c3kzk1mk00737wgc52i4zz5jh9fkjgjs747qwiik5pnh7x1";
       }
     else throw "Flash Player is not supported on this platform";
 

From 5f890ceca186baefc1dfde14f7a84e609d31e294 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 6 Jun 2015 19:05:57 +0900
Subject: [PATCH 0817/2322] firefox-bin, thunderbird-bin: update patchelf
 arguments

---
 .../networking/browsers/firefox-bin/default.nix           | 8 +++++++-
 .../networking/mailreaders/thunderbird-bin/default.nix    | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 998ea95e8da..749e4226cd7 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -131,7 +131,13 @@ stdenv.mkDerivation {
 
       for executable in \
         firefox firefox-bin plugin-container \
-        updater crashreporter webapprt-stub libxul.so
+        updater crashreporter webapprt-stub \
+        components/libdbusservice.so components/libmozgnome.so \
+        gmp-clearkey/0.1/libclearkey.so \
+        browser/components/libbrowsercomps.so \
+        libnssdbm3.so libsmime3.so libxul.so  libnss3.so libplc4.so \
+        libfreebl3.so libmozsqlite3.so libmozalloc.so libnspr4.so libssl3.so \
+        libsoftokn3.so libnssutil3.so libnssckbi.so libplds4.so
       do
         patchelf --set-rpath "$libPath" \
           "$out/usr/lib/firefox-bin-${version}/$executable"
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index be276a4cfa2..23e4f397e82 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -121,7 +121,12 @@ stdenv.mkDerivation {
 
       for executable in \
         thunderbird mozilla-xremote-client thunderbird-bin plugin-container \
-        updater libxul.so
+        updater \
+        components/libdbusservice.so components/libmozgnome.so \
+        libnssdbm3.so libsmime3.so libxul.so libprldap60.so libnss3.so \
+        libplc4.so libfreebl3.so libmozsqlite3.so libmozalloc.so libnspr4.so \
+        libssl3.so libldif60.so libsoftokn3.so libldap60.so libnssutil3.so \
+        libnssckbi.so libplds4.so
       do
         patchelf --set-rpath "$libPath" \
           "$out/usr/lib/thunderbird-bin-${version}/$executable"

From e32d6f6b52bef6aa515e3f12740ea5ab8bd8ba80 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 5 Jun 2015 14:00:24 +0200
Subject: [PATCH 0818/2322] ocaml-re: update from 1.3.1 to 1.4.0

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

diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix
index b2dd0609a0e..457b45a575e 100644
--- a/pkgs/development/ocaml-modules/re/default.nix
+++ b/pkgs/development/ocaml-modules/re/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchzip, ocaml, findlib }:
 
 stdenv.mkDerivation rec {
-  name = "ocaml-re-1.3.1";
+  name = "ocaml-re-1.4.0";
 
   src = fetchzip {
     url = "https://github.com/ocaml/ocaml-re/archive/${name}.tar.gz";
-    sha256 = "11d4k43pc97kvdbjgjcxpc0gq6yal4galkxlrfdp1iypwdcni92g";
+    sha256 = "1xcfmhjgd7prqx2g1addlrk84xpfafmqnpjkqrvg7mw0hn1p7v2m";
   };
 
   buildInputs = [ ocaml findlib ];

From 8c0389ac01baddeb16a233e9bde6958eec45bf0b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 6 Jun 2015 12:28:48 +0200
Subject: [PATCH 0819/2322] python-packages: prompt_toolkit -> 0.39

Fixes:
- Fixed layout.py example.
- Fixed eventloop for Python 64bit on Windows.
- Fix in history.
- Fix in key bindings.
---
 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 5083d4d1032..d3ddc879a17 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8494,6 +8494,10 @@ let
 
     propagatedBuildInputs = with self; [ click jedi prompt_toolkit psycopg2 pygments sqlparse ];
 
+    postPatch = ''
+      substituteInPlace setup.py --replace "==" ">="
+    '';
+
     meta = {
       description = "Command-line interface for PostgreSQL";
       longDescription = ''
@@ -8792,11 +8796,11 @@ let
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "0.38";
+    version = "0.39";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
-      sha256 = "0rjy5n79h8sc6wpw6nwys52rin7i4qlfy51y7vws303mficjkvkc";
+      sha256 = "1046fhgqd1171n8xyzcxwzcxgkcwa77r08g7iih8k5x7z59l94lb";
     };
 
     buildInputs = with self; [ jedi ipython pygments ];

From 90f4843f45c1a6c75d294a9313b0012d347c8be6 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sat, 6 Jun 2015 15:21:08 +0300
Subject: [PATCH 0820/2322] f2fs-tools: 1.3.0 -> 1.4.1

---
 pkgs/tools/filesystems/f2fs-tools/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix
index f52ead32acd..f8fa5cc264d 100644
--- a/pkgs/tools/filesystems/f2fs-tools/default.nix
+++ b/pkgs/tools/filesystems/f2fs-tools/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "f2fs-tools-${version}";
-  version = "1.3.0";
+  version = "1.4.1";
 
   src = fetchgit {
     url = git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git;
     rev = "refs/tags/v${version}";
-    sha256 = "1r97k91qaf42jz623jqy0wm97yjq1ym034q4fdhfirq27s46sn6i";
+    sha256 = "16i74r2656q6x4gg5kgjy2fxipr5czbm10r66s34pi2lfczbwhjr";
   };
 
   buildInputs = [ autoconf automake libtool pkgconfig libuuid ];
@@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
     autoreconf --install
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/";
     description = "Userland tools for the f2fs filesystem";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.emery ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ emery jagajaga ];
   };
 }

From d4681bf62672083f92545e02e00b8cf040247e8d Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Fri, 22 May 2015 14:25:02 +0100
Subject: [PATCH 0821/2322] Lay down the foundation for packaging the .NET
 echosystem

- fetchNuGet can fetch binaries from nuget servers
- buildDotnetPackage can build .NET packages using mono/xbuild
  - Places nuget & paket as they would clash with nix
  - Patch project files because F# targets are expected to be found in
    the mono directory (and we know that's not going to happen on nix)
  - Find DLLs that were copied from buildInputs and replace by symlink
    for sharing
  - Export produced DLL via the pkg-config mechanism
  - Create wrappers for produced EXEs
- Repackaged this new infrastructure: keepass, monodevelop
- Newly packaged: ExtCore, UnionArgParser, FSharp.Data, Paket, and a
  bunch more..

This is a combination of 73 commits.
---
 .../editors/monodevelop/default.nix           |  77 +--
 ...10fb3f6dce121df538e36f21d8c2eeb0a6e3.patch |  57 ++
 pkgs/applications/misc/keepass/default.nix    |  30 +-
 pkgs/applications/misc/keepass/keepass.patch  |  89 ++++
 .../build-dotnet-package/default.nix          | 109 ++++
 .../create-pkg-config-for-dll.sh              |  23 +
 .../dotnetbuildhelpers/default.nix            |  18 +
 .../patch-fsharp-targets.sh                   |  20 +
 .../dotnetbuildhelpers/placate-nuget.sh       |   7 +
 .../dotnetbuildhelpers/placate-paket.sh       |   7 +
 .../remove-duplicated-dlls.sh                 |  22 +
 pkgs/build-support/fetchnuget/default.nix     |  40 ++
 pkgs/development/compilers/fsharp/default.nix |  10 +-
 pkgs/development/compilers/mono/default.nix   |  15 +-
 .../compilers/mono/pkgconfig-before-gac.patch |  65 +++
 .../monodevelop-fsharpbinding.addin-xml.patch |  88 ++++
 ...monodevelop-fsharpbinding.references.patch |  43 ++
 .../patches/newtonsoft-json.references.patch  |  11 +
 pkgs/top-level/all-packages.nix               |   9 +
 pkgs/top-level/dotnet-packages.nix            | 495 ++++++++++++++++++
 20 files changed, 1159 insertions(+), 76 deletions(-)
 create mode 100644 pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch
 create mode 100644 pkgs/applications/misc/keepass/keepass.patch
 create mode 100644 pkgs/build-support/build-dotnet-package/default.nix
 create mode 100644 pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh
 create mode 100644 pkgs/build-support/dotnetbuildhelpers/default.nix
 create mode 100644 pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh
 create mode 100644 pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh
 create mode 100644 pkgs/build-support/dotnetbuildhelpers/placate-paket.sh
 create mode 100644 pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh
 create mode 100644 pkgs/build-support/fetchnuget/default.nix
 create mode 100644 pkgs/development/compilers/mono/pkgconfig-before-gac.patch
 create mode 100644 pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch
 create mode 100644 pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch
 create mode 100644 pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch
 create mode 100644 pkgs/top-level/dotnet-packages.nix

diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index b04e37746e0..b27bc75ed59 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, fetchgit
+{ stdenv, fetchurl, fetchgit, fetchNuGet
 , autoconf, automake, pkgconfig, shared_mime_info, intltool
 , glib, mono, gtk-sharp, gnome, gnome-sharp, unzip
+, dotnetPackages
 }:
 
 stdenv.mkDerivation rec {
@@ -13,79 +14,33 @@ stdenv.mkDerivation rec {
     sha256 = "1bgqvlfi6pilj2zxsviqilh63qq98wsijqdiqwpkqchcw741zlyn";
   };
 
-  srcNugetBinary = fetchgit {
-    url = "https://github.com/mono/nuget-binary.git";
-    rev = "da1f2102f8172df6f7a1370a4998e3f88b91c047";
-    sha256 = "1hbnckc4gvqkknf8gh1k7iwqb4vdzifdjd19i60fnczly5v8m1c3";
-  };
-
-  srcNUnit = fetchurl {
-    url = "https://www.nuget.org/api/v2/package/NUnit/2.6.3";
-    sha256 = "0bb16i4ggwz32wkxsh485wf014cqqzhbyx0b3wbpmqjw7p4canph";
-  };
-
-  srcNUnitRunners = fetchurl {
-    url = "https://www.nuget.org/api/v2/package/NUnit.Runners/2.6.3";
-    sha256 = "0qwx1i9lxkp9pijj2bsczzgsamz651hngkxraqjap1v4m7d09a3b";
-  };
-
-  srcNUnit2510 = fetchurl {
+  nunit2510 = fetchurl {
     url = "http://launchpad.net/nunitv2/2.5/2.5.10/+download/NUnit-2.5.10.11092.zip";
     sha256 = "0k5h5bz1p2v3d0w0hpkpbpvdkcszgp8sr9ik498r1bs72w5qlwnc";
   };
 
-  srcNugetSystemWebMvcExtensions = fetchurl {
-    url = https://www.nuget.org/api/v2/package/System.Web.Mvc.Extensions.Mvc.4/1.0.9;
-    sha256 = "19wi662m8primpimzifv8k560m6ymm73z0mf1r8ixl0xqag1hx6j";
-  };
-
-  srcNugetMicrosoftAspNetMvc = fetchurl {
-    url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.Mvc/5.2.2;
-    sha256 = "1jwfmz42kw2yb1g2hgp2h34fc4wx6s8z71da3mw5i4ivs25w9n2b";
-  };
-
-  srcNugetMicrosoftAspNetRazor = fetchurl {
-    url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.Razor/3.2.2;
-    sha256 = "1db3apn4vzz1bx6q5fyv6nyx0drz095xgazqbw60qnhfs7z45axd";
-  };
-
-  srcNugetMicrosoftAspNetWebPages = fetchurl {
-    url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.WebPages/3.2.2;
-    sha256 = "17fwb5yj165sql80i47zirjnm0gr4n8ypz408mz7p8a1n40r4i5l";
-  };
-
-  srcNugetMicrosoftWebInfrastructure = fetchurl {
-    url = https://www.nuget.org/api/v2/package/Microsoft.Web.Infrastructure/1.0.0.0;
-    sha256 = "1mxl9dri5729d0jl84gkpqifqf4xzb6aw1rzcfh6l0r24bix9afn";
-  };
-
   postPatch = ''
     # From https://bugzilla.xamarin.com/show_bug.cgi?id=23696#c19
 
-    # it seems parts of MonoDevelop 5.2+ need NUnit 2.6.4, which isn't included
-    # (?), so download it and put it in the right place in the tree
-    mkdir packages
-    unzip ${srcNUnit} -d packages/NUnit.2.6.3
-    unzip ${srcNUnitRunners} -d packages/NUnit.Runners.2.6.3
-
     # cecil needs NUnit 2.5.10 - this is also missing from the tar
-    unzip -j ${srcNUnit2510} -d external/cecil/Test/libs/nunit-2.5.10 NUnit-2.5.10.11092/bin/net-2.0/framework/\*
+    unzip -j ${nunit2510} -d external/cecil/Test/libs/nunit-2.5.10 NUnit-2.5.10.11092/bin/net-2.0/framework/\*
 
     # the tar doesn't include the nuget binary, so grab it from github and copy it
     # into the right place
-    cp -vfR ${srcNugetBinary}/* external/nuget-binary/
-
-    # AspNet plugin requires these packages
-    unzip ${srcNugetSystemWebMvcExtensions} -d packages/System.Web.Mvc.Extensions.Mvc.4.1.0.9
-    unzip ${srcNugetMicrosoftAspNetMvc} -d packages/Microsoft.AspNet.Mvc.5.2.2
-    unzip ${srcNugetMicrosoftAspNetRazor} -d packages/Microsoft.AspNet.Razor.3.2.2
-    unzip ${srcNugetMicrosoftAspNetWebPages} -d packages/Microsoft.AspNet.WebPages.3.2.2
-    unzip ${srcNugetMicrosoftWebInfrastructure} -d packages/Microsoft.Web.Infrastructure.1.0.0.0
+    cp -vfR "$(dirname $(pkg-config NuGet.Core --variable=Libraries))"/* external/nuget-binary/
   '';
 
+  # Revert this commit which broke the ability to use pkg-config to locate dlls
+  patchFlags = [ "-p2" ];
+  patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ];
+
   buildInputs = [
     autoconf automake pkgconfig shared_mime_info intltool
     mono gtk-sharp gnome-sharp unzip
+    pkgconfig
+    dotnetPackages.NUnit
+    dotnetPackages.NUnitRunners
+    dotnetPackages.Nuget
   ];
 
   preConfigure = "patchShebangs ./configure";
@@ -108,6 +63,12 @@ stdenv.mkDerivation rec {
     > 
     EOF
     done
+
+    # Without this, you get a missing DLL error any time you install an addin..
+    ln -sv `pkg-config nunit.core --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit
+    ln -sv `pkg-config nunit.core.interfaces --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit
+    ln -sv `pkg-config nunit.framework --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit
+    ln -sv `pkg-config nunit.util --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit
   '';
 
   dontStrip = true;
diff --git a/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch b/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch
new file mode 100644
index 00000000000..969aad33ec0
--- /dev/null
+++ b/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch
@@ -0,0 +1,57 @@
+diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj
+index 02d3a01..c6daaad 100644
+--- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj
++++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj
+@@ -452,34 +452,6 @@
+     <None Include="Templates\Projects\WebApplication.xpt.xml">
+       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+     </None>
+-    <None Include="..\..\..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll">
+-      <Link>System.Web.Mvc.dll</Link>
+-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+-    </None>
+-    <None Include="..\..\..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll">
+-      <Link>System.Web.Razor.dll</Link>
+-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+-    </None>
+-    <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll">
+-      <Link>System.Web.Helpers.dll</Link>
+-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+-    </None>
+-    <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll">
+-      <Link>System.Web.WebPages.Deployment.dll</Link>
+-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+-    </None>
+-    <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll">
+-      <Link>System.Web.WebPages.dll</Link>
+-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+-    </None>
+-    <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll">
+-      <Link>System.Web.WebPages.Razor.dll</Link>
+-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+-    </None>
+-    <None Include="..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll">
+-      <Link>Microsoft.Web.Infrastructure.dll</Link>
+-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+-    </None>
+     <None Include="packages.config" />
+   </ItemGroup>
+   <ItemGroup>
+diff --git a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
+index eab7c32..4a75311 100644
+--- a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
++++ b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
+@@ -1,13 +1,6 @@
+ <ExtensionModel>
+ 	
+ 	<Runtime>
+-		<Import assembly = "System.Web.Helpers.dll" />
+-		<Import assembly = "System.Web.Mvc.dll" />
+-		<Import assembly = "System.Web.Razor.dll" />
+-		<Import assembly = "System.Web.WebPages.Deployment.dll" />
+-		<Import assembly = "System.Web.WebPages.dll" />
+-		<Import assembly = "System.Web.WebPages.Razor.dll" />
+-
+ 		<Import file = "Html/Schemas/xhtml1-strict.xsd" />
+ 		<Import file = "Html/Schemas/xhtml1-transitional.xsd" />
+ 		<Import file = "Html/Schemas/xhtml1-frameset.xsd" />
diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index d46efc4e5e8..f659e4f6c2d 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchurl, unzip, makeDesktopItem, mono }:
+{ stdenv, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem }:
 
-stdenv.mkDerivation rec {
-  name = "keepass-${version}";
+buildDotnetPackage rec {
+  baseName = "keepass";
   version = "2.29";
 
   src = fetchurl {
-    url = "mirror://sourceforge/keepass/KeePass-${version}.zip";
-    sha256 = "16x7m899akpi036c0wlr41w7fz9q0b69yac9q97rqkixb03l4g9d";
+    url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
+    sha256 = "051s0aznyyhbpdbly6h5rs0ax0zvkp45dh93nmq6lwhicswjwn5m";
   };
 
   sourceRoot = ".";
 
-  phases = [ "unpackPhase" "installPhase" ];
+  buildInputs = [ unzip ];
+
+  patches = [ ./keepass.patch ];
+
+  preConfigure = "rm -rvf Build/*";
 
   desktopItem = makeDesktopItem {
     name = "keepass";
@@ -22,23 +26,19 @@ stdenv.mkDerivation rec {
     categories = "Application;Other;";
   };
 
+  outputFiles = [ "Build/KeePass/Release/*" "Build/KeePassLib/Release/*" ];
+  dllFiles = [ "KeePassLib.dll" ];
+  exeFiles = [ "KeePass.exe" ];
 
-  installPhase = ''
-    mkdir -p "$out/bin"
-    echo "${mono}/bin/mono $out/KeePass.exe" > $out/bin/keepass
-    chmod +x $out/bin/keepass
-    echo $out
-    cp -r ./* $out/
+  postInstall = ''
     mkdir -p "$out/share/applications"
     cp ${desktopItem}/share/applications/* $out/share/applications
   '';
 
-  buildInputs = [ unzip ];
-
   meta = {
     description = "GUI password manager with strong cryptography";
     homepage = http://www.keepass.info/;
-    maintainers = with stdenv.lib.maintainers; [amorsillo];
+    maintainers = with stdenv.lib.maintainers; [ amorsillo obadz ];
     platforms = with stdenv.lib.platforms; all;
     license = stdenv.lib.licenses.gpl2;
   };
diff --git a/pkgs/applications/misc/keepass/keepass.patch b/pkgs/applications/misc/keepass/keepass.patch
new file mode 100644
index 00000000000..6ecf0bb074d
--- /dev/null
+++ b/pkgs/applications/misc/keepass/keepass.patch
@@ -0,0 +1,89 @@
+diff -Naur old/KeePass/KeePass.csproj new/KeePass/KeePass.csproj
+--- old/KeePass/KeePass.csproj	2015-04-10 11:00:46.000000000 +0100
++++ new/KeePass/KeePass.csproj	2015-05-27 16:35:52.196177593 +0100
+@@ -1,4 +1,4 @@
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+   <PropertyGroup>
+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+@@ -10,7 +10,7 @@
+     <RootNamespace>KeePass</RootNamespace>
+     <AssemblyName>KeePass</AssemblyName>
+     <ApplicationIcon>KeePass.ico</ApplicationIcon>
+-    <SignAssembly>true</SignAssembly>
++    <SignAssembly>false</SignAssembly>
+     <AssemblyOriginatorKeyFile>KeePass.pfx</AssemblyOriginatorKeyFile>
+     <FileUpgradeFlags>
+     </FileUpgradeFlags>
+@@ -1316,6 +1316,5 @@
+   </Target>
+   -->
+   <PropertyGroup>
+-    <PostBuildEvent>"$(FrameworkSDKDir)bin\sgen.exe" /assembly:"$(TargetPath)" /force /nologo /compiler:/keycontainer:VS_KEY_33430356D8D7D1B8 /compiler:/delaysign-</PostBuildEvent>
+   </PropertyGroup>
+-</Project>
+\ No newline at end of file
++</Project>
+diff -Naur old/KeePassLib/KeePassLib.csproj new/KeePassLib/KeePassLib.csproj
+--- old/KeePassLib/KeePassLib.csproj	2014-05-08 15:00:24.000000000 +0100
++++ new/KeePassLib/KeePassLib.csproj	2015-05-27 16:35:52.197177562 +0100
+@@ -1,4 +1,4 @@
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+   <PropertyGroup>
+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+@@ -9,7 +9,7 @@
+     <AppDesignerFolder>Properties</AppDesignerFolder>
+     <RootNamespace>KeePassLib</RootNamespace>
+     <AssemblyName>KeePassLib</AssemblyName>
+-    <SignAssembly>true</SignAssembly>
++    <SignAssembly>false</SignAssembly>
+     <AssemblyOriginatorKeyFile>KeePassLib.pfx</AssemblyOriginatorKeyFile>
+     <FileUpgradeFlags>
+     </FileUpgradeFlags>
+diff -Naur old/KeePass.sln new/KeePass.sln
+--- old/KeePass.sln	2009-08-31 19:47:28.000000000 +0100
++++ new/KeePass.sln	2015-05-27 16:35:59.568953518 +0100
+@@ -1,11 +1,9 @@
+-Microsoft Visual Studio Solution File, Format Version 10.00
++Microsoft Visual Studio Solution File, Format Version 12.00
+ # Visual Studio 2008
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib", "KeePassLib\KeePassLib.csproj", "{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}"
+ EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePass", "KeePass\KeePass.csproj", "{10938016-DEE2-4A25-9A5A-8FD3444379CA}"
+ EndProject
+-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLibSD", "KeePassLibSD\KeePassLibSD.csproj", "{DC15F71A-2117-4DEF-8C10-AA355B5E5979}"
+-EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrlUtil", "Translation\TrlUtil\TrlUtil.csproj", "{B7E890E7-BF50-4450-9A52-C105BD98651C}"
+ EndProject
+ Global
+@@ -44,18 +42,6 @@
+ 		{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ 		{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Win32.ActiveCfg = Release|Any CPU
+ 		{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|x64.ActiveCfg = Release|Any CPU
+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.Build.0 = Debug|Any CPU
+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Win32.ActiveCfg = Debug|Any CPU
+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|x64.ActiveCfg = Debug|Any CPU
+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.ActiveCfg = Release|Any CPU
+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.Build.0 = Release|Any CPU
+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Win32.ActiveCfg = Release|Any CPU
+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|x64.ActiveCfg = Release|Any CPU
+ 		{B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ 		{B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ 		{B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+diff -Naur old/Translation/TrlUtil/TrlUtil.csproj new/Translation/TrlUtil/TrlUtil.csproj
+--- old/Translation/TrlUtil/TrlUtil.csproj	2013-07-21 10:06:38.000000000 +0100
++++ new/Translation/TrlUtil/TrlUtil.csproj	2015-05-27 16:35:52.197177562 +0100
+@@ -1,4 +1,4 @@
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+   <PropertyGroup>
+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix
new file mode 100644
index 00000000000..00be987af75
--- /dev/null
+++ b/pkgs/build-support/build-dotnet-package/default.nix
@@ -0,0 +1,109 @@
+{ stdenv, lib, makeWrapper, pkgconfig, mono, dotnetbuildhelpers }:
+
+attrsOrig @
+{ baseName
+, version
+, buildInputs ? []
+, xBuildFiles ? [ ]
+, xBuildFlags ? [ "/p:Configuration=Release" ]
+, outputFiles ? [ "bin/Release/*" ]
+, dllFiles ? [ "*.dll" ]
+, exeFiles ? [ "*.exe" ]
+, ... }:
+  let
+    arrayToShell = (a: toString (map (lib.escape (lib.stringToCharacters "\\ ';$`()|<>\t") ) a));
+
+    attrs = {
+      name = "${baseName}-${version}";
+
+      buildInputs = [
+        pkgconfig
+        mono
+        dotnetbuildhelpers
+        makeWrapper
+      ] ++ buildInputs;
+
+      configurePhase = ''
+        runHook preConfigure
+
+        [ -z "$dontPlacateNuget" ] && placate-nuget.sh
+        [ -z "$dontPlacatePaket" ] && placate-paket.sh
+        [ -z "$dontPatchFSharpTargets" ] && patch-fsharp-targets.sh
+
+        runHook postConfigure
+      '';
+
+      buildPhase = ''
+        runHook preBuild
+
+        echo Building dotNET packages...
+
+        # Probably needs to be moved to fsharp
+        if pkg-config FSharp.Core
+        then
+          export FSharpTargetsPath="$(dirname $(pkg-config FSharp.Core --variable=Libraries))/Microsoft.FSharp.Targets"
+        fi
+
+        ran=""
+        for xBuildFile in ${arrayToShell xBuildFiles} ''${xBuildFilesExtra}
+        do
+          ran="yes"
+          xbuild ${arrayToShell xBuildFlags} ''${xBuildFlagsArray} $xBuildFile
+        done
+
+        [ -z "$ran" ] && xbuild ${arrayToShell xBuildFlags} ''${xBuildFlagsArray}
+
+        runHook postBuild
+      '';
+
+      dontStrip = true;
+
+      installPhase = ''
+        runHook preInstall
+
+        target="$out/lib/dotnet/${baseName}"
+        mkdir -p "$target"
+
+        cp -rv ${arrayToShell outputFiles} "''${outputFilesArray[@]}" "$target"
+
+        if [ -z "$dontRemoveDuplicatedDlls" ]
+        then
+          pushd "$out"
+          remove-duplicated-dlls.sh
+          popd
+        fi
+
+        set -f
+        for dllPattern in ${arrayToShell dllFiles} ''${dllFilesArray[@]}
+        do
+          set +f
+          for dll in "$target"/$dllPattern
+          do
+            [ -f "$dll" ] || continue
+            if pkg-config $(basename -s .dll "$dll")
+            then
+              echo "$dll already exported by a buildInputs, not re-exporting"
+            else
+              ${dotnetbuildhelpers}/bin/create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll"
+            fi
+          done
+        done
+
+        set -f
+        for exePattern in ${arrayToShell exeFiles} ''${exeFilesArray[@]}
+        do
+          set +f
+          for exe in "$target"/$exePattern
+          do
+            [ -f "$exe" ] || continue
+            mkdir -p "$out"/bin
+            commandName="$(basename -s .exe "$(echo "$exe" | tr "[A-Z]" "[a-z]")")"
+            makeWrapper "${mono}/bin/mono \"$exe\"" "$out"/bin/"$commandName"
+          done
+        done
+
+        runHook postInstall
+      '';
+    };
+  in
+    stdenv.mkDerivation (attrs // (builtins.removeAttrs attrsOrig [ "buildInputs" ] ))
diff --git a/pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh b/pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh
new file mode 100644
index 00000000000..37914170452
--- /dev/null
+++ b/pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+targetDir="$1"
+dllFullPath="$2"
+
+dllVersion="$(monodis --assembly "$dllFullPath" | grep ^Version: | cut -f 2 -d : | xargs)"
+[ -z "$dllVersion" ] && echo "Defaulting dllVersion to 0.0.0" && dllVersion="0.0.0"
+dllFileName="$(basename $dllFullPath)"
+dllRootName="$(basename -s .dll $dllFileName)"
+targetPcFile="$targetDir"/"$dllRootName".pc
+
+mkdir -p "$targetDir"
+
+cat > $targetPcFile << EOF
+Libraries=$dllFullPath
+
+Name: $dllRootName
+Description: $dllRootName
+Version: $dllVersion
+Libs: -r:$dllFileName
+EOF
+
+echo "Created $targetPcFile"
diff --git a/pkgs/build-support/dotnetbuildhelpers/default.nix b/pkgs/build-support/dotnetbuildhelpers/default.nix
new file mode 100644
index 00000000000..ed0d4f790c8
--- /dev/null
+++ b/pkgs/build-support/dotnetbuildhelpers/default.nix
@@ -0,0 +1,18 @@
+{ helperFunctions, mono, pkgconfig }:
+  helperFunctions.runCommand
+    "dotnetbuildhelpers"
+    { preferLocalBuild = true; }
+    ''
+      target="$out/bin"
+      mkdir -p "$target"
+
+      for script in ${./create-pkg-config-for-dll.sh} ${./patch-fsharp-targets.sh} ${./remove-duplicated-dlls.sh} ${./placate-nuget.sh} ${./placate-paket.sh}
+      do
+        scriptName="$(basename "$script" | cut -f 2- -d -)"
+        cp -v "$script" "$target"/"$scriptName"
+        chmod 755 "$target"/"$scriptName"
+        patchShebangs "$target"/"$scriptName"
+        substituteInPlace "$target"/"$scriptName" --replace pkg-config ${pkgconfig}/bin/pkg-config
+        substituteInPlace "$target"/"$scriptName" --replace monodis ${mono}/bin/monodis
+      done
+    ''
diff --git a/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh b/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh
new file mode 100644
index 00000000000..3f81cc73e80
--- /dev/null
+++ b/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Some project files look for F# targets in $(FSharpTargetsPath)
+# so it's a good idea to add something like this to your ~/.bash_profile:
+
+# export FSharpTargetsPath=$(dirname $(which fsharpc))/../lib/mono/4.0/Microsoft.FSharp.Targets
+
+# In build scripts, you would add somehting like this:
+
+# export FSharpTargetsPath="${fsharp}/lib/mono/4.0/Microsoft.FSharp.Targets"
+
+# However, some project files look for F# targets in the main Mono directory. When that happens
+# patch the project files using this script so they will look in $(FSharpTargetsPath) instead.
+
+echo "Patching F# targets in fsproj files..."
+
+find -iname \*.fsproj -print -exec \
+  sed --in-place=.bak \
+    -e 's,<FSharpTargetsPath>\([^<]*\)</FSharpTargetsPath>,<FSharpTargetsPath Condition="Exists('\'\\1\'')">\1</FSharpTargetsPath>,'g \
+    {} \;
diff --git a/pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh b/pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh
new file mode 100644
index 00000000000..8a7f36522a3
--- /dev/null
+++ b/pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+echo Placating Nuget in nuget.targets
+find -iname nuget.targets -print -exec sed --in-place=bak -e 's,mono --runtime[^<]*,true NUGET PLACATED BY buildDotnetPackage,g' {} \;
+
+echo Just to be sure, replacing Nuget executables by empty files.
+find . -iname nuget.exe \! -size 0 -exec mv -v {} {}.bak \; -exec touch {} \;
diff --git a/pkgs/build-support/dotnetbuildhelpers/placate-paket.sh b/pkgs/build-support/dotnetbuildhelpers/placate-paket.sh
new file mode 100644
index 00000000000..0dbf1eecbad
--- /dev/null
+++ b/pkgs/build-support/dotnetbuildhelpers/placate-paket.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+echo Placating Paket in paket.targets
+find -iname paket.targets -print -exec sed --in-place=bak -e 's,mono --runtime[^<]*,true PAKET PLACATED BY buildDotnetPackage,g' {} \;
+
+echo Just to be sure, replacing Paket executables by empty files.
+find . -iname paket\*.exe \! -size 0 -exec mv -v {} {}.bak \; -exec touch {} \;
diff --git a/pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh b/pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh
new file mode 100644
index 00000000000..d8d29912c8f
--- /dev/null
+++ b/pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+IFS="
+"
+
+for dll in $(find -iname \*.dll)
+do
+    baseName="$(basename "$dll" | sed "s/.dll$//i")"
+    if pkg-config "$baseName"
+    then
+        candidateDll="$(pkg-config "$baseName" --variable=Libraries)"
+
+        if diff "$dll" "$candidateDll" >/dev/null
+        then
+            echo "$dll is identical to $candidateDll. Substituting..."
+            rm -vf "$dll"
+            ln -sv "$candidateDll" "$dll"
+        else
+            echo "$dll and $candidateDll share the same name but have different contents, leaving alone."
+        fi
+    fi
+done
diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix
new file mode 100644
index 00000000000..803db27c9d5
--- /dev/null
+++ b/pkgs/build-support/fetchnuget/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, buildDotnetPackage, unzip }:
+
+attrs @
+{ baseName
+, version
+, url ? "https://www.nuget.org/api/v2/package/${baseName}/${version}"
+, sha256 ? ""
+, md5 ? ""
+, ...
+}:
+  buildDotnetPackage ({
+    src = fetchurl {
+      inherit url sha256 md5;
+      name = "${baseName}.${version}.zip";
+    };
+
+    sourceRoot = ".";
+
+    buildInputs = [ unzip ];
+
+    phases = [ "unpackPhase" "installPhase" ];
+
+    preInstall = ''
+      function traverseRename () {
+        for e in *
+        do
+          t="$(echo "$e" | sed -e "s/%20/\ /g" -e "s/%2B/+/g")"
+          [ "$t" != "$e" ] && mv -vn "$e" "$t"
+          if [ -d "$t" ]
+          then
+            cd "$t"
+            traverseRename
+            cd ..
+          fi
+        done
+      }
+
+      traverseRename
+   '';
+  } // attrs)
diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index 82742cf9af6..92d80deb532 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, mono, pkgconfig, autoconf, automake, which }:
+# Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it
+
+{ stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }:
 
 stdenv.mkDerivation rec {
   name = "fsharp-${version}";
@@ -9,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "16kqgdx0y0lmxv59mc4g7l5ll60nixg5b8bg07vxfnqrf7i6dffd";
   };
 
-  buildInputs = [ mono pkgconfig autoconf automake which ];
+  buildInputs = [ mono pkgconfig dotnetbuildhelpers autoconf automake which ];
   configurePhase = ''
     substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "/bin/sh"
     ./autogen.sh --prefix $out
@@ -23,6 +25,10 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/fsharpiAnyCpu --replace " mono " " ${mono}/bin/mono "
     ln -s $out/bin/fsharpc $out/bin/fsc
     ln -s $out/bin/fsharpi $out/bin/fsi
+    for dll in "$out/lib/mono/4.5"/FSharp*.dll
+    do
+      create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll"
+    done
   '';
 
   # To fix this error when running:
diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index ba2ce00cfb5..66939ff1a02 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? true }:
+{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert }:
 
 let
   llvm     = callPackage ./llvm.nix { };
@@ -31,11 +31,16 @@ stdenv.mkDerivation rec {
   # Parallel building doesn't work, as shows http://hydra.nixos.org/build/2983601
   enableParallelBuilding = false;
 
+  # We want pkg-config to take priority over the dlls in the Mono framework and the GAC
+  # because we control pkg-config
+  patches = [ ./pkgconfig-before-gac.patch ];
+
   # Patch all the necessary scripts. Also, if we're using LLVM, we fix the default
   # LLVM path to point into the Mono LLVM build, since it's private anyway.
   preBuild = ''
     makeFlagsArray=(INSTALL=`type -tp install`)
     patchShebangs ./
+    substituteInPlace mcs/class/corlib/System/Environment.cs --replace /usr/share "$out/share"
   '' + stdenv.lib.optionalString withLLVM ''
     substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")"
   '';
@@ -50,6 +55,14 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  # Without this, any Mono application attempting to open an SSL connection will throw with 
+  # The authentication or decryption has failed.
+  # ---> Mono.Security.Protocol.Tls.TlsException: Invalid certificate received from server.
+  postInstall = ''
+    echo "Updating Mono key store"
+    $out/bin/cert-sync ${cacert}/etc/ssl/certs/ca-bundle.crt
+  '';
+
   meta = {
     homepage = http://mono-project.com/;
     description = "Cross platform, open source .NET development framework";
diff --git a/pkgs/development/compilers/mono/pkgconfig-before-gac.patch b/pkgs/development/compilers/mono/pkgconfig-before-gac.patch
new file mode 100644
index 00000000000..7632d850391
--- /dev/null
+++ b/pkgs/development/compilers/mono/pkgconfig-before-gac.patch
@@ -0,0 +1,65 @@
+diff -Naur mono-4.0.1.old/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets mono-4.0.1/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets
+--- mono-4.0.1.old/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets	2015-04-24 02:26:18.000000000 +0100
++++ mono-4.0.1/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets	2015-05-26 00:52:33.997847464 +0100
+@@ -229,8 +229,8 @@
+ 			$(ReferencePath);
+ 			@(AdditionalReferencePath);
+ 			{HintPathFromItem};
+-			{TargetFrameworkDirectory};
+ 			{PkgConfig};
++			{TargetFrameworkDirectory};
+ 			{GAC};
+ 			{RawFileName};
+ 			$(OutDir)
+diff -Naur mono-4.0.1.old/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets mono-4.0.1/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets
+--- mono-4.0.1.old/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets	2015-04-24 02:26:18.000000000 +0100
++++ mono-4.0.1/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets	2015-05-26 00:52:41.832612748 +0100
+@@ -214,8 +214,8 @@
+ 			$(ReferencePath);
+ 			@(AdditionalReferencePath);
+ 			{HintPathFromItem};
+-			{TargetFrameworkDirectory};
+ 			{PkgConfig};
++			{TargetFrameworkDirectory};
+ 			{GAC};
+ 			{RawFileName};
+ 			$(OutDir)
+diff -Naur mono-4.0.1.old/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets mono-4.0.1/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets
+--- mono-4.0.1.old/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets	2015-04-24 02:26:18.000000000 +0100
++++ mono-4.0.1/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets	2015-05-26 00:52:46.298478961 +0100
+@@ -139,8 +139,8 @@
+ 			$(ReferencePath);
+ 			@(AdditionalReferencePath);
+ 			{HintPathFromItem};
+-			{TargetFrameworkDirectory};
+ 			{PkgConfig};
++			{TargetFrameworkDirectory};
+ 			{GAC};
+ 			{RawFileName};
+ 			$(OutDir)
+diff -Naur mono-4.0.1.old/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets mono-4.0.1/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets
+--- mono-4.0.1.old/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets	2015-04-24 02:26:18.000000000 +0100
++++ mono-4.0.1/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets	2015-05-26 00:52:52.119304583 +0100
+@@ -167,8 +167,8 @@
+ 			$(ReferencePath);
+ 			@(AdditionalReferencePath);
+ 			{HintPathFromItem};
+-			{TargetFrameworkDirectory};
+ 			{PkgConfig};
++			{TargetFrameworkDirectory};
+ 			{GAC};
+ 			{RawFileName};
+ 			$(OutDir)
+diff -Naur mono-4.0.1.old/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets mono-4.0.1/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets
+--- mono-4.0.1.old/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets	2015-04-24 02:26:18.000000000 +0100
++++ mono-4.0.1/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets	2015-05-26 00:52:56.519172776 +0100
+@@ -229,8 +229,8 @@
+ 			$(ReferencePath);
+ 			@(AdditionalReferencePath);
+ 			{HintPathFromItem};
+-			{TargetFrameworkDirectory};
+ 			{PkgConfig};
++			{TargetFrameworkDirectory};
+ 			{GAC};
+ 			{RawFileName};
+ 			$(OutDir)
diff --git a/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch b/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch
new file mode 100644
index 00000000000..a3b2f87f378
--- /dev/null
+++ b/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch
@@ -0,0 +1,88 @@
+--- fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml.orig.old	2015-06-03 19:53:00.116849746 +0100
++++ fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml.orig	2015-06-03 19:56:30.112579384 +0100
+@@ -130,6 +130,11 @@
+   <!-- New projects will be created with this targets file. -->
+   <Extension path="/MonoDevelop/ProjectModel/MSBuildItemTypes">
+     <!--  If FSharp 3.1 is available, use it. Note XS looks for the first DotNetProject node under 'Extension' -->
++	<Condition id="MSBuildTargetIsAvailable" target="$(FSharpTargetsPath)" >
++        <DotNetProject language="F#" extension="fsproj" guid="{f2a71f9b-5d33-465a-a702-920d77279786}" import="$(FSharpTargetsPath)"  resourceHandler="MonoDevelop.FSharp.FSharpResourceIdBuilder"/>
++	</Condition>
++
++    <!--  If FSharp 3.1 is available, use it. Note XS looks for the first DotNetProject node under 'Extension' -->
+ 	<Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" >
+       <DotNetProject language="F#" extension="fsproj" guid="{f2a71f9b-5d33-465a-a702-920d77279786}" import="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets"  resourceHandler="MonoDevelop.FSharp.FSharpResourceIdBuilder"/>
+ 	</Condition>
+@@ -182,14 +187,7 @@
+     <ProjectTemplate id="FSharpConsoleProject" file="Templates/FSharpConsoleProject.xpt.xml"/>
+     <ProjectTemplate id="FSharpLibraryProject" file="Templates/FSharpLibraryProject.xpt.xml"/>
+     <!-- Only include the tutorial project if an F# 3.0 or 3.1 target is available as this includes F# 3.0 specific features -->
+-	<ComplexCondition>
+-		<Or>
+-			<Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" />
+-			<Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
+-		</Or>
+ 		<ProjectTemplate id="FSharpTutorialProject" file="Templates/FSharpTutorialProject.xpt.xml"/>
+-	</ComplexCondition>
+-
+     <ProjectTemplate id="FSharpGtkProject" file="Templates/FSharpGtkProject.xpt.xml"/>
+     <ProjectTemplate id="FSharpNUnitLibraryProject" file="Templates/FSharpNUnitLibraryProject.xpt.xml"/>
+   </Extension>
+@@ -267,13 +265,7 @@
+   <!-- F# interactive -->
+ 
+   <Extension path="/MonoDevelop/Ide/Pads">
+-    <ComplexCondition>
+-      <Or>
+-        <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" />
+-        <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
+-      </Or>
+       <Pad id="MonoDevelop.FSharp.FSharpInteractivePad" defaultPlacement="Bottom" _label="F# Interactive" icon="md-project" class="MonoDevelop.FSharp.FSharpInteractivePad" />
+-    </ComplexCondition>
+   </Extension>
+ 
+   <Extension path = "/MonoDevelop/Ide/Pads/ProjectPad">
+@@ -281,11 +273,6 @@
+   </Extension>
+ 
+   <Extension path="/MonoDevelop/Ide/Commands">
+-    <ComplexCondition>
+-      <Or>
+-        <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" />
+-        <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
+-      </Or>
+       <Category _name = "F# Integration" id="F# Integration">
+         <Command id="MonoDevelop.FSharp.FSharpCommands.ShowFSharpInteractive"
+             _label = "F# Interactive"
+@@ -330,32 +317,19 @@
+             macShortcut="Meta|Control|C"
+             shortcut="Ctrl|Alt|C" />
+       </Category>
+-    </ComplexCondition>
+   </Extension>
+ 
+   <Extension path = "/MonoDevelop/SourceEditor2/ContextMenu/Editor">
+-    <ComplexCondition>
+-      <Or>
+-        <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" />
+-        <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
+-      </Or>
+       <SeparatorItem id = "FSharpInteractiveStart" />
+       <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendSelection" />
+       <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendLine" />
+       <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendReferences" />
+-    </ComplexCondition>
+   </Extension>
+ 
+   <Extension path = "/MonoDevelop/Ide/MainMenu/Edit">
+-    <ComplexCondition>
+-      <Or>
+-        <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" />
+-        <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
+-      </Or>
+       <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendSelection" />
+       <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendLine" />
+       <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendReferences" />
+-    </ComplexCondition>
+   </Extension>
+ 
+   <!--- F# Android -->
diff --git a/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch b/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch
new file mode 100644
index 00000000000..e53482e0c00
--- /dev/null
+++ b/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch
@@ -0,0 +1,43 @@
+--- fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj.orig.old	2015-06-03 18:48:55.345385084 +0100
++++ fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj.orig	2015-06-03 19:00:11.453399028 +0100
+@@ -185,19 +185,19 @@
+       <Private>False</Private>
+       <HintPath>INSERT_FSPROJ_MDROOT\AddIns\NUnit\MonoDevelop.NUnit.dll</HintPath>
+     </Reference>
+-    <ProjectReference Include="..\..\FSharp.CompilerBinding\FSharp.CompilerBinding.fsproj">
+-      <Project>{88F6940F-D300-474C-B2A7-E2ECD5B04B57}</Project>
+-      <Name>FSharp.CompilerBinding</Name>
+-    </ProjectReference>
++    <Reference Include="FSharp.CompilerBinding">
++      <Private>True</Private>
++    </Reference>
+     <ProjectReference Include="Gui\MonoDevelop.FSharp.Gui.csproj">
+       <Project>{FD0D1033-9145-48E5-8ED8-E2365252878C}</Project>
+       <Name>MonoDevelop.FSharp.Gui</Name>
+     </ProjectReference>
+-    <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
++    <Reference Include="FSharp.Core">
+       <Private>True</Private>
+     </Reference>
+     <Reference Include="FSharp.Compiler.Service">
+       <HintPath>packages\FSharp.Compiler.Service.0.0.85\lib\net45\FSharp.Compiler.Service.dll</HintPath>
++      <Private>True</Private>
+     </Reference>
+     <Reference Include="Mono.Cecil">
+       <HintPath>packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.dll</HintPath>
+@@ -213,12 +213,15 @@
+     </Reference>
+     <Reference Include="FantomasLib">
+       <HintPath>packages\Fantomas.1.6.0\lib\FantomasLib.dll</HintPath>
++      <Private>True</Private>
+     </Reference>
+     <Reference Include="FSharp.Compiler.CodeDom">
+       <HintPath>packages\FSharp.Compiler.CodeDom.0.9.1\lib\net40\FSharp.Compiler.CodeDom.dll</HintPath>
++      <Private>True</Private>
+     </Reference>
+     <Reference Include="ExtCore">
+       <HintPath>packages\ExtCore.0.8.45\lib\net40\ExtCore.dll</HintPath>
++      <Private>True</Private>
+     </Reference>
+   </ItemGroup>
+   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
diff --git a/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch b/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch
new file mode 100644
index 00000000000..ed9b7adbef2
--- /dev/null
+++ b/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch
@@ -0,0 +1,11 @@
+--- Newtonsoft.Json-6.0.8/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj.old	2015-01-11 06:46:39.000000000 +0000
++++ Newtonsoft.Json-6.0.8/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj	2015-05-25 21:29:40.546808622 +0100
+@@ -52,6 +52,8 @@
+     <Reference Include="System.Data.Linq" />
+     <Reference Include="System.Drawing" />
+     <Reference Include="System.Numerics" />
++    <Reference Include="System.Collections" />
++    <Reference Include="System.Runtime" />
+     <Reference Include="System.Runtime.Serialization" />
+     <Reference Include="System.Web" />
+     <Reference Include="System.Web.Extensions" />
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a3262dc7943..46b5b7fd146 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -285,6 +285,10 @@ let
     dotnetfx = dotnetfx40;
   };
 
+  dotnetbuildhelpers = import ../build-support/dotnetbuildhelpers {
+    inherit mono helperFunctions pkgconfig;
+  };
+
   scatterOutputHook = makeSetupHook {} ../build-support/setup-hooks/scatter_output.sh;
 
   vsenv = callPackage ../build-support/vsenv {
@@ -409,6 +413,9 @@ let
     meta.homepage = "http://repo.or.cz/${repo}.git/";
   };
 
+  fetchNuGet = import ../build-support/fetchnuget { inherit stdenv fetchurl buildDotnetPackage unzip; };
+  buildDotnetPackage = import ../build-support/build-dotnet-package { inherit stdenv lib makeWrapper mono pkgconfig dotnetbuildhelpers; };
+
   resolveMirrorURLs = {url}: fetchurl {
     showURLs = true;
     inherit url;
@@ -3872,6 +3879,8 @@ let
 
   fsharp = callPackage ../development/compilers/fsharp {};
 
+  dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { inherit stdenv fetchNuGet; });
+
   go_1_0 = callPackage ../development/compilers/go { };
 
   go_1_1 =
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
new file mode 100644
index 00000000000..852856d4c69
--- /dev/null
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -0,0 +1,495 @@
+{ stdenv
+, pkgs
+, buildDotnetPackage
+, fetchurl
+, fetchFromGitHub
+, fetchNuGet
+, pkgconfig
+, mono
+, monodevelop
+, fsharp
+, unzip
+, overrides ? {}
+}:
+
+let self = dotnetPackages // overrides; dotnetPackages = with self; {
+
+  Autofac = fetchNuGet {
+    baseName = "Autofac";
+    version = "3.5.2";
+    sha256 = "194cs8ybn5xjqnzy643w5i62m0d5s34d3nshwxp2v4fcb94wa4ri";
+    outputFiles = [ "lib/portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1/*" ];
+  };
+
+  Fake = fetchNuGet {
+    baseName = "FAKE";
+    version = "3.33.0";
+    sha256 = "04gllx9d1w8zn9gq9p5k76b79ix07rilk3apdi72dmz6h3yylcdm";
+    outputFiles = [ "tools/*" ];
+    dllFiles = [ "Fake*.dll" ];
+  };
+
+  Fantomas = fetchNuGet {
+    baseName = "Fantomas";
+    version = "1.6.0";
+    sha256 = "1b9rd3i76b5xzv0j62dvfr1ksdwvb59vxw6jhzpi018axjn6757q";
+    outputFiles = [ "lib/*" ];
+    dllFiles = [ "Fantomas*.dll" ];
+  };
+
+  FSharpCompilerCodeDom = fetchNuGet {
+    baseName = "FSharp.Compiler.CodeDom";
+    version = "0.9.2";
+    sha256 = "0cy9gbvmfx2g74m7bgp6x9mr4avb6s560yjii7cyyxb7jlwabfcj";
+    outputFiles = [ "lib/net40/*" ];
+  };
+
+  FsCheck = fetchNuGet {
+    baseName = "FsCheck";
+    version = "1.0.4";
+    sha256 = "1q2wk4d4d1q94qzcccgmxb2lh0b8qkmpyz0p7lfphkw2gx6cy5ad";
+    outputFiles = [ "lib/net45/*" ];
+  };
+
+  FsCheckNunit = fetchNuGet {
+    baseName = "FsCheck.Nunit";
+    version = "1.0.4";
+    sha256 = "1s62jrsa5hxqy1ginl8r29rjdc8vbkwmz7mb0hglhwccdqfyr5xy";
+    outputFiles = [ "lib/net45/*" ];
+  };
+
+  FsUnit = fetchNuGet {
+    baseName = "FsUnit";
+    version = "1.3.0.1";
+    sha256 = "1k7w8pc81aplsfn7n46617khmzingd2v7hcgdhh7vgsssibwms64";
+    outputFiles = [ "Lib/Net40/*" ];
+  };
+
+  NUnit = fetchNuGet {
+    baseName = "NUnit";
+    version = "2.6.4";
+    sha256 = "1acwsm7p93b1hzfb83ia33145x0w6fvdsfjm9xflsisljxpdx35y";
+    outputFiles = [ "lib/*" ];
+  };
+
+  NUnitRunners = fetchNuGet {
+    baseName = "NUnit.Runners";
+    version = "2.6.4";
+    sha256 = "11nmi7vikn9idz8qcad9z7f73arsh5rw18fc1sri9ywz77mpm1s4";
+    outputFiles = [ "tools/*" ];
+    preInstall = "mv -v tools/lib/* tools && rmdir -v tools/lib";
+  };
+
+  SystemCollectionsImmutable = fetchNuGet {
+    baseName = "System.Collections.Immutable";
+    version = "1.1.36";
+    sha256 = "0760kzf5s771pnvnxsgas446kqdh1b71w6g3k75jpzldfmsd3vyq";
+    outputFiles = [ "lib/portable-net45+win8+wp8+wpa81/*" ];
+  };
+
+  ExtCore = buildDotnetPackage rec {
+    baseName = "ExtCore";
+    version = "0.8.46";
+
+    src = fetchFromGitHub {
+      owner = "jack-pappas";
+      repo = "ExtCore";
+      rev = "0269b6d3c479f45abd7aa983aaeca08d07473943";
+      sha256 = "1kxkiszpvqisffhd6wciha8j3dhkq06w9c540bmq8zixa4xaj83p";
+    };
+
+    buildInputs = [
+      fsharp
+      dotnetPackages.NUnit
+      dotnetPackages.FsCheck
+    ];
+
+    postConfigure = ''
+      # Fix case
+      sed -i -e s,nuget.targets,NuGet.targets, ExtCore.Tests/ExtCore.Tests.fsproj
+    '';
+
+    xBuildFlags = [ "/p:Configuration=Release (net45)" ];
+    outputFiles = [ "ExtCore/bin/net45/Release/*" ];
+
+    meta = {
+      description = "ExtCore is an extended core library for F#";
+      homepage = "https://github.com/jack-pappas/ExtCore";
+      license = stdenv.lib.licenses.asl20;
+      maintainers = with stdenv.lib.maintainers; [ obadz ];
+      platforms = with stdenv.lib.platforms; linux;
+    };
+  };
+
+  FSharpAutoComplete = buildDotnetPackage rec {
+    baseName = "FSharp.AutoComplete";
+    version = "0.16.0";
+
+    src = fetchurl {
+      name = "${baseName}-${version}.tar.gz";
+      url = "https://github.com/fsharp/FSharp.AutoComplete/archive/${version}.tar.gz";
+      sha256 = "0mwp456zfw1sjy2mafz2shx0sjn4f858pfnsmawy50g8l2znw8qg";
+    };
+
+    buildInputs = [
+      fsharp
+      dotnetPackages.FSharpCompilerService
+      dotnetPackages.NewtonsoftJson
+      dotnetPackages.NDeskOptions
+    ];
+
+    outputFiles = [ "FSharp.AutoComplete/bin/Release/*" ];
+
+    meta = {
+      description = "This project provides a command-line interface to the FSharp.Compiler.Service project. It is intended to be used as a backend service for rich editing or 'intellisense' features for editors.";
+      homepage = "https://github.com/fsharp/FSharp.AutoComplete";
+      license = stdenv.lib.licenses.asl20;
+      maintainers = with stdenv.lib.maintainers; [ obadz ];
+      platforms = with stdenv.lib.platforms; linux;
+    };
+  };
+
+  FSharpCompilerService = buildDotnetPackage rec {
+    baseName = "FSharp.Compiler.Service";
+    version = "0.0.89";
+
+    src = fetchFromGitHub {
+      owner = "fsharp";
+      repo = "FSharp.Compiler.Service";
+      rev = "55a8143a82bb31c3e8c1ad2af64eb64162fed0d7";
+      sha256 = "1f5f97382h8v9p0j7c2gksrps12d869m752n692b3g0k8h4zpial";
+    };
+
+    buildInputs = [
+      fsharp
+      dotnetPackages.NUnit
+    ];
+
+    outputFiles = [ "bin/v4.5/*" ];
+
+    meta = {
+      description = "The F# compiler services package is a component derived from the F# compiler source code that exposes additional functionality for implementing F# language bindings";
+      homepage = "http://fsharp.github.io/FSharp.Compiler.Service/";
+      license = stdenv.lib.licenses.asl20;
+      maintainers = with stdenv.lib.maintainers; [ obadz ];
+      platforms = with stdenv.lib.platforms; linux;
+    };
+  };
+
+  FSharpData = buildDotnetPackage rec {
+    baseName = "FSharp.Data";
+    version = "2.2.2";
+
+    src = fetchurl {
+      name = "${baseName}-${version}.tar.gz";
+      url = "https://github.com/fsharp/FSharp.Data/archive/${version}.tar.gz";
+      sha256 = "1li33ydjxz18v8siw53vv1nmkp5w7sdlsjcrfp6dzcynpvwbjw3s";
+    };
+
+    buildInputs = [ fsharp ];
+
+    fileProvidedTypes = fetchurl {
+      name = "ProvidedTypes.fs";
+      url = https://raw.githubusercontent.com/fsprojects/FSharp.TypeProviders.StarterPack/877014bfa6244ac382642e113d7cd6c9bc27bc6d/src/ProvidedTypes.fs;
+      sha256 = "1lb056v1xld1rfx6a8p8i2jz8i6qa2r2823n5izsf1qg1qgf2980";
+    };
+
+    fileDebugProvidedTypes = fetchurl {
+      name = "DebugProvidedTypes.fs";
+      url = https://raw.githubusercontent.com/fsprojects/FSharp.TypeProviders.StarterPack/877014bfa6244ac382642e113d7cd6c9bc27bc6d/src/DebugProvidedTypes.fs;
+      sha256 = "1whyrf2jv6fs7kgysn2086v15ggjsd54g1xfs398mp46m0nxp91f";
+    };
+
+    preConfigure = ''
+       # Copy single-files-in-git-repos
+       mkdir -p "paket-files/fsprojects/FSharp.TypeProviders.StarterPack/src"
+       cp -v "${fileProvidedTypes}" "paket-files/fsprojects/FSharp.TypeProviders.StarterPack/src/ProvidedTypes.fs"
+       cp -v "${fileDebugProvidedTypes}" "paket-files/fsprojects/FSharp.TypeProviders.StarterPack/src/DebugProvidedTypes.fs"
+    '';
+
+    xBuildFiles = [ "src/FSharp.Data.fsproj" "src/FSharp.Data.DesignTime.fsproj" ];
+    outputFiles = [ "bin/*.dll" "bin/*.xml" ];
+
+    meta = {
+      description = "F# Data: Library for Data Access";
+      homepage = "http://fsharp.github.io/FSharp.Data/";
+      license = stdenv.lib.licenses.asl20;
+      maintainers = with stdenv.lib.maintainers; [ obadz ];
+      platforms = with stdenv.lib.platforms; linux;
+    };
+  };
+
+  # FSharpxExtras = buildDotnetPackage rec {
+  #   baseName = "FSharpx.Extras";
+  #   version = "1.8.41";
+  #
+  #   src = fetchurl {
+  #     name = "${baseName}-${version}.tar.gz";
+  #     url = "https://github.com/fsprojects/FSharpx.Extras/archive/${version}.tar.gz";
+  #     sha256 = "102z5bvk3ffi1crgyp51488vamv41fsf61n8x8pdiznq155zydhl";
+  #   };
+  #
+  #   buildInputs = [
+  #     fsharp
+  #     dotnetPackages.NUnit
+  #     dotnetPackages.FsCheck
+  #     dotnetPackages.FsCheckNunit
+  #     dotnetPackages.FsUnit
+  #   ];
+  #
+  #   patches = [ ./disable_excel.patch ];
+  #
+  #   xBuildFiles = [ "FSharpx.WithTypeProviders.sln" ];
+  #   outputFiles = [ "build/*" ];
+  #
+  #   meta = {
+  #     description = "FSharpx.Extras is a collection of libraries and tools for use with F#.";
+  #     homepage = "http://fsprojects.github.io/FSharpx.Extras/";
+  #     license = stdenv.lib.licenses.asl20;
+  #     maintainers = with stdenv.lib.maintainers; [ obadz ];
+  #     platforms = with stdenv.lib.platforms; linux;
+  #   };
+  # };
+
+  MonoDevelopFSharpBinding = buildDotnetPackage rec {
+    baseName = "MonoDevelop.FSharpBinding";
+    version = "git-a09c8185eb";
+
+    src = fetchFromGitHub {
+      owner = "fsharp";
+      repo = "fsharpbinding";
+      rev = "a09c8185ebf23fe2f7d22b14b4af2e3268d4f011";
+      sha256 = "1zp5gig42s1h681kch0rw5ykbbj0mcsmdvpyz1319wy9s7n2ng91";
+    };
+
+    buildInputs = [
+      fsharp
+      monodevelop
+      pkgs.gtk-sharp
+      pkgs.gnome-sharp
+      dotnetPackages.ExtCore
+      dotnetPackages.FSharpCompilerService
+      dotnetPackages.FSharpCompilerCodeDom
+      dotnetPackages.FSharpAutoComplete
+      dotnetPackages.Fantomas
+    ];
+
+    patches = [
+      ../development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch
+      ../development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch
+    ];
+
+    preConfigure = ''
+      substituteInPlace monodevelop/configure.fsx --replace /usr/lib/monodevelop ${monodevelop}/lib/monodevelop
+      substituteInPlace monodevelop/configure.fsx --replace bin/MonoDevelop.exe ../../bin/monodevelop
+      (cd monodevelop; fsharpi ./configure.fsx)
+    '';
+
+    # This will not work as monodevelop probably looks in absolute nix store path rather than path
+    # relative to its executable. Need to ln -s /run/current-system/sw/lib/dotnet/MonoDevelop.FSharpBinding
+    # ~/.local/share/MonoDevelop-5.0/LocalInstall/Addins/ to install until we have a better way
+
+    # postInstall = ''
+    #   mkdir -p "$out/lib/monodevelop/AddIns"
+    #   ln -sv "$out/lib/dotnet/${baseName}" "$out/lib/monodevelop/AddIns"
+    # '';
+
+    xBuildFiles = [ "monodevelop/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.mac-linux.fsproj" ];
+    outputFiles = [ "monodevelop/bin/mac-linux/Release/*" ];
+
+    meta = {
+      description = "F# addin for MonoDevelop 5.9";
+      homepage = "https://github.com/fsharp/fsharpbinding/tree/5.9";
+      license = stdenv.lib.licenses.asl20;
+      maintainers = with stdenv.lib.maintainers; [ obadz ];
+      platforms = with stdenv.lib.platforms; linux;
+    };
+  };
+
+  NDeskOptions = stdenv.mkDerivation rec {
+    baseName = "NDesk.Options";
+    version = "0.2.1";
+    name = "${baseName}-${version}";
+
+    src = fetchurl {
+      name = "${baseName}-${version}.tar.gz";
+      url = "http://www.ndesk.org/archive/ndesk-options/ndesk-options-0.2.1.tar.gz";
+      sha256 = "1y25bfapafwmifakjzyb9c70qqpvza8g5j2jpf08j8wwzkrb6r28";
+    };
+
+    buildInputs = [
+      mono
+      pkgconfig
+    ];
+
+    preConfigure = ''
+      substituteInPlace configure --replace gmcs mcs
+    '';
+
+    postInstall = ''
+      # Otherwise pkg-config won't find it and the DLL will get duplicated
+      ln -sv $out/lib/pkgconfig/ndesk-options.pc $out/lib/pkgconfig/NDesk.Options.pc
+    '';
+
+    dontStrip = true;
+
+    meta = {
+      description = "NDesk.Options is a callback-based program option parser for C#.";
+      homepage = "http://www.ndesk.org/Options";
+      license = stdenv.lib.licenses.mit;
+      maintainers = with stdenv.lib.maintainers; [ obadz ];
+      platforms = with stdenv.lib.platforms; linux;
+    };
+  };
+
+  NewtonsoftJson = buildDotnetPackage rec {
+    baseName = "Newtonsoft.Json";
+    version = "6.0.8";
+
+    src = fetchurl {
+      name = "${baseName}-${version}.tar.gz";
+      url = "https://github.com/JamesNK/Newtonsoft.Json/archive/${version}.tar.gz";
+      sha256 = "14znf5mycka578bxjnlnz6a3f9nfkc682hgmgg42gdzksnarvhlm";
+    };
+
+    buildInputs = [
+      fsharp
+      dotnetPackages.NUnit
+      dotnetPackages.SystemCollectionsImmutable
+      dotnetPackages.Autofac
+    ];
+
+    patches = [ ../development/dotnet-modules/patches/newtonsoft-json.references.patch ];
+
+    postConfigure = ''
+       # Just to make sure there's no attempt to call these executables
+       rm -rvf Tools
+    '';
+
+    xBuildFiles = [ "Src/Newtonsoft.Json.sln" ];
+    outputFiles = [ "Src/Newtonsoft.Json/bin/Release/Net45/*" ];
+
+    meta = {
+      description = "Popular high-performance JSON framework for .NET";
+      homepage = "http://www.newtonsoft.com/json";
+      license = stdenv.lib.licenses.mit;
+      maintainers = with stdenv.lib.maintainers; [ obadz ];
+      platforms = with stdenv.lib.platforms; linux;
+    };
+  };
+
+  Nuget = buildDotnetPackage {
+    baseName = "Nuget";
+    version = "2.8.5";
+
+    src = fetchFromGitHub {
+      owner = "mono";
+      repo = "nuget-binary";
+      rev = "da1f2102f8172df6f7a1370a4998e3f88b91c047";
+      sha256 = "1hbnckc4gvqkknf8gh1k7iwqb4vdzifdjd19i60fnczly5v8m1c3";
+    };
+
+    buildInputs = [ unzip ];
+
+    phases = [ "unpackPhase" "installPhase" ];
+
+    outputFiles = [ "*" ];
+    dllFiles = [ "NuGet*.dll" ];
+    exeFiles = [ "NuGet.exe" ];
+  };
+
+  Paket = buildDotnetPackage rec {
+    baseName = "Paket";
+    version = "1.6.2";
+
+    src = fetchurl {
+      name = "${baseName}-${version}.tar.gz";
+      url = "https://github.com/fsprojects/Paket/archive/${version}.tar.gz";
+      sha256 = "1ryslxdgc3r7kcn1gq4bqcyrqdi8z6364aj3lr7yjz71wi22fca8";
+    };
+
+    buildInputs = [
+      fsharp
+      dotnetPackages.NewtonsoftJson
+      dotnetPackages.UnionArgParser
+      dotnetPackages.NUnit
+    ];
+
+    fileFsUnit = fetchurl {
+      name = "FsUnit.fs";
+      url = https://raw.githubusercontent.com/forki/FsUnit/81d27fd09575a32c4ed52eadb2eeac5f365b8348/FsUnit.fs;
+      sha256 = "1zxigqgb2s2v755622jbbzibvf91990x2dijhbdgg646vsybkpdp";
+    };
+
+    # fileOctokit = fetchurl {
+    #   name = "Octokit.fsx";
+    #   url = https://raw.githubusercontent.com/fsharp/FAKE/8e65e2fc1406f326b44f3f87ec9ca9b3127a6e78/modules/Octokit/Octokit.fsx;
+    #   sha256 = "16qxwmgyg3fn3z9a8hppv1m579828x7lvfj8qflcgs2g6ciagsir";
+    # };
+
+    fileGlobbing = fetchurl {
+      name = "Globbing.fs";
+      url = https://raw.githubusercontent.com/fsharp/FAKE/8e65e2fc1406f326b44f3f87ec9ca9b3127a6e78/src/app/FakeLib/Globbing/Globbing.fs;
+      sha256 = "1v7d7666a61j6f8ksh0q40hfsc5b03448viq17xa91xgb7skhyx7";
+    };
+
+    fileErrorHandling = fetchurl {
+      name = "ErrorHandling.fs";
+      url = https://raw.githubusercontent.com/fsprojects/Chessie/3017092260b4a59a3b4b25bf8fca6be6eb7487eb/src/Chessie/ErrorHandling.fs;
+      sha256 = "0ka9ilfbl4izxc1wqd5vlfjnp7n2xcckfhp13gzhqbdx7464van9";
+    };
+
+    postConfigure = ''
+       # Copy said single-files-in-git-repos
+       mkdir -p "paket-files/forki/FsUnit"
+       cp -v "${fileFsUnit}" "paket-files/forki/FsUnit/FsUnit.fs"
+
+       mkdir -p "paket-files/fsharp/FAKE/src/app/FakeLib/Globbing"
+       cp -v "${fileGlobbing}" "paket-files/fsharp/FAKE/src/app/FakeLib/Globbing/Globbing.fs"
+
+       mkdir -p "paket-files/fsprojects/Chessie/src/Chessie"
+       cp -v "${fileErrorHandling}" "paket-files/fsprojects/Chessie/src/Chessie/ErrorHandling.fs"
+    '';
+
+    xBuildFiles = [ ];
+
+    outputFiles = [ "bin/*" ];
+    exeFiles = [ "paket.exe" ];
+
+    meta = {
+      description = "A dependency manager for .NET and Mono projects";
+      homepage = "http://fsprojects.github.io/Paket/";
+      license = stdenv.lib.licenses.mit;
+      maintainers = with stdenv.lib.maintainers; [ obadz ];
+      platforms = with stdenv.lib.platforms; linux;
+    };
+  };
+
+  UnionArgParser = buildDotnetPackage rec {
+    baseName = "UnionArgParser";
+    version = "0.8.7";
+
+    src = fetchFromGitHub {
+      owner = "nessos";
+      repo = "UnionArgParser";
+      rev = "acaeb946e53cbb0bd9768977c656b3242146070a";
+      sha256 = "1yrs7ycf2hg7h8z6vm9lr7i3gr9s30k74fr2maigdydnnls93als";
+    };
+
+    buildInputs = [
+      fsharp
+      dotnetPackages.NUnit
+      dotnetPackages.FsUnit
+    ];
+
+    outputFiles = [ "bin/net40/*" ];
+
+    meta = {
+      description = "A declarative CLI argument/XML configuration parser for F# applications.";
+      homepage = "http://nessos.github.io/UnionArgParser/";
+      license = stdenv.lib.licenses.mit;
+      maintainers = with stdenv.lib.maintainers; [ obadz ];
+      platforms = with stdenv.lib.platforms; linux;
+    };
+  };
+}; in self

From 142400b8d5f2d05506df38d9212d91ab0eca8fc5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 5 Jun 2015 11:28:45 +0200
Subject: [PATCH 0822/2322] ocaml-merlin: update from 2.1.2 to 2.2

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

diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 2d02bf054b7..8b93650743d 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -3,7 +3,7 @@
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
 
-let version = "2.1.2"; in
+let version = "2.2"; in
 
 stdenv.mkDerivation {
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/the-lambda-church/merlin/archive/v${version}.tar.gz";
-    sha256 = "0l6s4bvspjl1l26bf33xf4k5imdzryas15s1isn6998aiakxq20n";
+    sha256 = "19n4gwpqav2kax5rl61bq354g7ycdahl4f3ihjp418hwi1phwbzz";
   };
 
   buildInputs = [ ocaml findlib yojson menhir ]

From ee8825935f771d7c9c1a68a089b396995d683cc4 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sat, 6 Jun 2015 20:42:37 +0300
Subject: [PATCH 0823/2322] google-music: beta_1.0.129.6633 ->
 beta_1.0.182.3607

---
 .../audio/google-musicmanager/default.nix         | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix
index e7c513febf5..2edc1c00ce6 100644
--- a/pkgs/applications/audio/google-musicmanager/default.nix
+++ b/pkgs/applications/audio/google-musicmanager/default.nix
@@ -2,10 +2,11 @@
 , libvorbis }:
 
 assert stdenv.system == "x86_64-linux" || stdenv.system == "1686-linux";
-
+let
+  archUrl = name: arch: "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/${name}_${arch}.deb";
+in
 stdenv.mkDerivation rec {
-  debversion = "beta_1.0.129.6633-r0";
-  version = "beta_1.0.129.6633-r0"; # friendly to nix-env version sorting algo
+  version = "beta_1.0.182.3607-r0"; # friendly to nix-env version sorting algo
   product = "google-musicmanager";
   name    = "${product}-${version}";
 
@@ -16,12 +17,12 @@ stdenv.mkDerivation rec {
 
   src = if stdenv.system == "x86_64-linux"
     then fetchurl {
-      url    = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-${version}_amd64.deb";
-      sha256 = "1fq2p721mzv8nd4dq6i9xiqvvqd5ak3v142vsxchg6yn14a9kbvr";
+      url    = archUrl name "amd64";
+      sha256 = "141x986haxg3r72ggh8prz0qg298jkad1ys8sdvsac92p4adcqx4";
     }
     else fetchurl {
-        url    = "http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-${version}_i386.deb";
-        sha256 = "7914e3e6e2adb2e952ebaf383db5e04727c29cfa83401007f29977f6c5ff6873";
+        url    = archUrl name "i386";
+        sha256 = "076iaa7pxhj8b1hlg5ah9jfm4qgzgjc9ivvg2l18wp045gnycv1l";
     };
 
   unpackPhase = ''

From c6175f8161068bf48c221074d5c17419efcf290a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Jun 2015 12:01:42 -0700
Subject: [PATCH 0824/2322] Revert "heimdal: Remove more references"

This reverts commit 7b1336d2f122dc67c27786eb8122afb4a185f839.
---
 pkgs/applications/networking/browsers/firefox-bin/default.nix | 4 ++--
 pkgs/applications/office/zotero/firefox-bin/default.nix       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 4da970528d5..998ea95e8da 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -30,7 +30,7 @@
 , nspr
 , nss
 , pango
-, libheimdal
+, heimdal
 , libpulseaudio
 , systemd
 }:
@@ -102,7 +102,7 @@ stdenv.mkDerivation {
       nspr
       nss
       pango
-      libheimdal
+      heimdal
       libpulseaudio
       systemd
     ] + ":" + stdenv.lib.makeSearchPath "lib64" [
diff --git a/pkgs/applications/office/zotero/firefox-bin/default.nix b/pkgs/applications/office/zotero/firefox-bin/default.nix
index edf56c3eb4d..52751908fa7 100644
--- a/pkgs/applications/office/zotero/firefox-bin/default.nix
+++ b/pkgs/applications/office/zotero/firefox-bin/default.nix
@@ -30,7 +30,7 @@
 , nspr
 , nss
 , pango
-, libheimdal
+, heimdal
 , libpulseaudio
 , systemd
 }:
@@ -102,7 +102,7 @@ stdenv.mkDerivation {
       nspr
       nss
       pango
-      libheimdal
+      heimdal
       libpulseaudio
       systemd
     ] + ":" + stdenv.lib.makeSearchPath "lib64" [

From cfd831a40a2c101c6faa5aca4361518c391516a2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Jun 2015 12:01:50 -0700
Subject: [PATCH 0825/2322] Revert "samba: Use built in kerberos"

This reverts commit 6b17264e08eaa96d0a1b24f635769ea80d4e8b16.
---
 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 87c4267e764..8aac40f0723 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8981,8 +8981,7 @@ let
 
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
-    # Samba is tightly coupled to kerberos so let it provide its own
-    kerberos = null;
+    kerberos = libheimdal;
     gnutls = gnutls33;
     cups = if stdenv.isDarwin then null else cups;
     pam = if stdenv.isDarwin then null else pam;

From b073b563251fc6fc0d055812f049621801808313 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Jun 2015 12:01:59 -0700
Subject: [PATCH 0826/2322] Revert "Use libheimdal instead of heimdal"

This reverts commit 06c9915ed1db6ab505b869d240f75a6d53f2fcc9.
---
 pkgs/development/libraries/libssh/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index a9117556a7f..8ea2ac72da0 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, cmake
 
 # Optional Dependencies
-, libheimdal ? null, zlib ? null, libsodium ? null
+, heimdal ? null, zlib ? null, libsodium ? null
 
 # Crypto Dependencies
 , openssl ? null, libgcrypt ? null
@@ -19,7 +19,7 @@ let
     none = null;
   }.${cryptoStr};
 
-  optLibheimdal = shouldUsePkg libheimdal;
+  optHeimdal = shouldUsePkg heimdal;
   optZlib = shouldUsePkg zlib;
   optLibsodium = shouldUsePkg libsodium;
 in
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   '';
 
   cmakeFlags = [
-    "-DWITH_GSSAPI=${if optLibheimdal != null then "ON" else "OFF"}"
+    "-DWITH_GSSAPI=${if optHeimdal != null then "ON" else "OFF"}"
     "-DWITH_ZLIB=${if optZlib != null then "ON" else "OFF"}"
     "-DWITH_SSH1=OFF"
     "-DWITH_SFTP=ON"
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ pkgconfig cmake ];
-  buildInputs = [ optLibheimdal optZlib optLibsodium crypto ];
+  buildInputs = [ optHeimdal optZlib optLibsodium crypto ];
 
   meta = with stdenv.lib; {
     description = "SSH client library";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8aac40f0723..af5d0f586d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8981,7 +8981,7 @@ let
 
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
-    kerberos = libheimdal;
+    kerberos = heimdal;
     gnutls = gnutls33;
     cups = if stdenv.isDarwin then null else cups;
     pam = if stdenv.isDarwin then null else pam;

From d5ac5c00d8e7356048b10d7f28da13974cfb44f9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Jun 2015 12:02:06 -0700
Subject: [PATCH 0827/2322] Revert "heimdal: 1.5.3 -> 2015-05-26"

This reverts commit 1e14f0a055d987ab2beb0fc943b3aab02e9dc7cb.
---
 .../libraries/kerberos/heimdal.nix            | 139 +++++++-----------
 pkgs/top-level/all-packages.nix               |   3 -
 2 files changed, 54 insertions(+), 88 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index dd1f7afdf23..6050891ba27 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,126 +1,95 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python, perl, yacc, flex
-, texinfo ? null, perlPackages
+{ stdenv, fetchurl, pkgconfig, flex, yacc
 
 # Optional Dependencies
 , openldap ? null, libcap_ng ? null, sqlite ? null, openssl ? null, db ? null
 , readline ? null, libedit ? null, pam ? null
 
-# Extra Args
-, prefix ? ""
+#, readline, openldap, libcap_ng
+#, sqlite, db, ncurses, openssl, cyrus_sasl
 }:
 
 with stdenv;
+with stdenv.lib;
 let
-  libOnly = prefix == "lib";
-
-  optTexinfo = if libOnly then null else shouldUsePkg texinfo;
-  optOpenldap = if libOnly then null else shouldUsePkg openldap;
+  optOpenldap = shouldUsePkg openldap;
   optLibcap_ng = shouldUsePkg libcap_ng;
   optSqlite = shouldUsePkg sqlite;
   optOpenssl = shouldUsePkg openssl;
   optDb = shouldUsePkg db;
   optReadline = shouldUsePkg readline;
   optLibedit = shouldUsePkg libedit;
-  optPam = if libOnly then null else shouldUsePkg pam;
-
-  lineParserStr = if optLibedit != null then "libedit"
-    else if optReadline != null then "readline"
-    else "no";
-
-  lineParserInputs = {
-    "libedit" = [ optLibedit ];
-    "readline" = [ optReadline ];
-    "no" = [ ];
-  }.${lineParserStr};
+  optPam = shouldUsePkg pam;
 in
-with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "${prefix}heimdal-${version}";
-  version = "2015-05-26";
+  name = "heimdal-1.5.3";
 
-  src = fetchFromGitHub {
-    owner = "heimdal";
-    repo = "heimdal";
-    rev = "50e2a5ce95f42d4963d359c27a832e61991a12b1";
-    sha256 = "10104vm192r1i7ccs1fan16h9n31saaswsmywmrb0cxc7jv3rj8x";
+  src = fetchurl {
+    urls = [
+      "http://www.h5l.org/dist/src/${name}.tar.gz"
+      "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz"
+    ];
+    sha256 = "19gypf9vzfrs2bw231qljfl4cqc1riyg0ai0xmm1nd1wngnpphma";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig python perl yacc flex optTexinfo ]
-    ++ (with perlPackages; [ JSON ]);
+  nativeBuildInputs = [ pkgconfig flex yacc ];
   buildInputs = [
-    optOpenldap optLibcap_ng optSqlite optOpenssl optDb optPam
-  ] ++ lineParserInputs;
-
-  configureFlags = [
-    (mkOther                                "sysconfdir"            "/etc")
-    (mkOther                                "localstatedir"         "/var")
-    (mkWith   (optOpenldap != null)         "openldap"              optOpenldap)
-    (mkEnable (optOpenldap != null)         "hdb-openldap-module"   null)
-    (mkEnable true                          "pk-init"               null)
-    (mkEnable true                          "digest"                null)
-    (mkEnable true                          "kx509"                 null)
-    (mkWith   (optLibcap_ng != null)        "capng"                 null)
-    (mkWith   (optSqlite != null)           "sqlite3"               sqlite)
-    (mkEnable (optSqlite != null)           "sqlite-cache"          null)
-    (mkWith   false                         "libintl"               null)               # TODO libintl fix
-    (mkWith   true                          "hdbdir"                "/var/lib/heimdal")
-    (mkEnable false                         "dce"                   null)               # TODO: Add support
-    (mkEnable (!libOnly)                    "afs-support"           null)
-    (mkEnable true                          "mmap"                  null)
-    (mkEnable (!libOnly)                    "afs-string-to-key"     null)
-    (mkWith   (lineParserStr == "readline") "readline"              optReadline)
-    (mkWith   (lineParserStr == "libedit")  "libedit"               optLibedit)
-    (mkWith   false                         "hesiod"                null)
-    (mkEnable (!libOnly)                    "kcm"                   null)
-    (mkEnable (optTexinfo != null)          "heimdal-documentation" null)
-    (mkWith   true                          "ipv6"                  null)
-    (mkEnable true                          "pthread-support"       null)
-    (mkEnable false                         "osfc2"                 null)
-    (mkEnable false                         "socket-wrapper"        null)
-    (mkEnable (!libOnly)                    "otp"                   null)
-    (mkEnable false                         "developer"             null)
-    (mkWith   (optDb != null)               "berkeley-db"           optDb)
-    (mkEnable true                          "ndbm-db"               null)
-    (mkEnable false                         "mdb-db"                null)
-    (mkWith   (optOpenssl != null)          "openssl"               optOpenssl)
+    optOpenldap optLibcap_ng optSqlite optOpenssl optDb optReadline optLibedit
+    optPam
   ];
 
-  buildPhase = optionalString libOnly ''
-    (cd include; make -j $NIX_BUILD_CORES)
-    (cd lib; make -j $NIX_BUILD_CORES)
-    (cd tools; make -j $NIX_BUILD_CORES)
-    (cd include/hcrypto; make -j $NIX_BUILD_CORES)
-    (cd lib/hcrypto; make -j $NIX_BUILD_CORES)
-  '';
+  configureFlags = [
+    (mkOther                         "sysconfdir"            "/etc")
+    (mkOther                         "localstatedir"         "/var")
+    (mkWith   (optOpenldap != null)  "openldap"              optOpenldap)
+    (mkEnable (optOpenldap != null)  "hdb-openldap-module"   null)
+    (mkEnable true                   "pk-init"               null)
+    (mkEnable true                   "digest"                null)
+    (mkEnable true                   "kx509"                 null)
+    (mkWith   (optLibcap_ng != null) "capng"                 null)
+    (mkWith   (optSqlite != null)    "sqlite3"               sqlite)
+    (mkEnable (optSqlite != null)    "sqlite-cache"          null)
+    (mkWith   false                  "libintl"               null)               # TODO libintl fix
+    (mkWith   true                   "hdbdir"                "/var/lib/heimdal")
+    (mkWith   (optOpenssl != null)   "openssl"               optOpenssl)
+    (mkEnable true                   "pthread-support"       null)
+    (mkEnable false                  "dce"                   null)               # TODO: Add support
+    (mkEnable true                   "afs-support"           null)
+    (mkWith   (optDb != null)        "berkeley-db"           optDb)
+    (mkEnable false                  "nmdb"                  null)
+    (mkEnable false                  "developer"             null)
+    (mkWith   true                   "ipv6"                  null)
+    (mkEnable false                  "socket-wrapper"        null)
+    (mkEnable true                   "otp"                   null)
+    (mkEnable false                  "osfc2"                 null)
+    (mkEnable true                   "mmap"                  null)
+    (mkEnable true                   "afs-string-to-key"     null)
+    (mkWith   (optReadline != null)  "readline"              optReadline)
+    (mkWith   (optLibedit != null)   "libedit"               optLibedit)
+    (mkWith   false                  "x"                     null)
+    (mkEnable true                   "kcm"                   null)
+    (mkEnable true                   "heimdal-documentation" null)
+  ];
 
-  installPhase = optionalString libOnly ''
-    (cd include; make -j $NIX_BUILD_CORES install)
-    (cd lib; make -j $NIX_BUILD_CORES install)
-    (cd tools; make -j $NIX_BUILD_CORES install)
-    (cd include/hcrypto; make -j $NIX_BUILD_CORES install)
-    (cd lib/hcrypto; make -j $NIX_BUILD_CORES install)
-    rm -rf $out/{libexec,sbin,share}
-    find $out/bin -type f | grep -v 'krb5-config' | xargs rm
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -pthread"
   '';
 
   # We need to build hcrypt for applications like samba
   postBuild = ''
-    (cd include/hcrypto; make -j $NIX_BUILD_CORES)
-    (cd lib/hcrypto; make -j $NIX_BUILD_CORES)
+    (cd lib/hcrypto; make)
+    (cd include/hcrypto; make)
   '';
 
   postInstall = ''
     # Install hcrypto
-    (cd include/hcrypto; make -j $NIX_BUILD_CORES install)
-    (cd lib/hcrypto; make -j $NIX_BUILD_CORES install)
+    (cd lib/hcrypto; make install)
+    (cd include/hcrypto; make install)
 
     # Doesn't succeed with --libexec=$out/sbin, so
     mv "$out/libexec/"* $out/sbin/
     rmdir $out/libexec
   '';
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "an implementation of Kerberos 5 (and some more stuff) largely written in Sweden";
     license = licenses.bsd3;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af5d0f586d1..d345e72d588 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6341,9 +6341,6 @@ let
   kerberos = libkrb5;
 
   heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
-  libheimdal = heimdal.override {
-    prefix = "lib";
-  };
 
   harfbuzz = callPackage ../development/libraries/harfbuzz { };
   harfbuzz-icu = callPackage ../development/libraries/harfbuzz {

From 3d92654e137637be2c5c8907e1d6164849ce2ece Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Jun 2015 12:02:18 -0700
Subject: [PATCH 0828/2322] Revert "heimdal: No need to override openldap
 anymore"

This reverts commit 4fa5cc71f2d5c5b8f6b5d71cd321d9ba6805d5cd.
---
 pkgs/top-level/all-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d345e72d588..412e4be2295 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6340,7 +6340,11 @@ let
   # Modularize heimdal into a library first
   kerberos = libkrb5;
 
-  heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
+  heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
+    openldap = openldap.override {
+      cyrus_sasl = cyrus_sasl.override { kerberos = null; };
+    };
+  };
 
   harfbuzz = callPackage ../development/libraries/harfbuzz { };
   harfbuzz-icu = callPackage ../development/libraries/harfbuzz {

From 9882cecb10bd570b4cd33d34ba4ababbe4c0fc83 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Jun 2015 12:02:26 -0700
Subject: [PATCH 0829/2322] Revert "Use mit5 as kerberos since it is better
 supported"

This reverts commit 80648d7e242bcb9e9ed544a2561c433ee22fb5aa.
---
 pkgs/top-level/all-packages.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 412e4be2295..97b79530fa6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6336,9 +6336,9 @@ let
 
   hamlib = callPackage ../development/libraries/hamlib { };
 
-  # TODO : Add Heimdal Kerberos and let admin choose.
-  # Modularize heimdal into a library first
-  kerberos = libkrb5;
+  # TODO : Add MIT Kerberos and let admin choose.
+  # TODO : Fix kerberos on Darwin
+  kerberos = if stdenv.isDarwin then null else heimdal;
 
   heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
     openldap = openldap.override {
@@ -6472,6 +6472,9 @@ let
   kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
 
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
+    openldap = openldap.override {
+      cyrus_sasl = cyrus_sasl.override { kerberos = null; };
+    };
     inherit (darwin) bootstrap_cmds;
   };
   libkrb5 = krb5.override {

From d30d0c783d7b403efe547a5420316d611a180135 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Jun 2015 12:02:38 -0700
Subject: [PATCH 0830/2322] Revert "pam: Factor out dependencies"

This reverts commit 7141d96bde218141ed73bd82cc806d075e0d07f4.
---
 pkgs/os-specific/linux/pam/default.nix | 63 +++++++++-----------------
 1 file changed, 22 insertions(+), 41 deletions(-)

diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 96debd66e5b..29cfa64b22d 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -1,16 +1,5 @@
-{ stdenv, fetchurl, pkgconfig
+{ stdenv, fetchurl, flex, cracklib }:
 
-# Optional Depdencies
-, cracklib ? null, libaudit ? null, db ? null
-}:
-
-with stdenv;
-let
-  optCracklib = shouldUsePkg cracklib;
-  optLibaudit = shouldUsePkg libaudit;
-  optDb = shouldUsePkg db;
-in
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "linux-pam-${version}";
   version = "1.2.0";
@@ -20,45 +9,37 @@ stdenv.mkDerivation rec {
     sha256 = "192y2fgf24a5qsg7rl1mzgw5axs5lg8kqamkfff2x50yjv2ym2yd";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ optCracklib optLibaudit optDb ];
+  nativeBuildInputs = [ flex ];
 
-  configureFlags = [
-    (mkOther                        "sysconfdir"      "/etc")
-    (mkOther                        "localstatedir"   "/var")
-    (mkOther                        "includedir"   "\${out}/include/security")
-    (mkEnable false                 "static-modules"  null)
-    (mkEnable true                  "pie"             null)
-    (mkEnable false                 "prelude"         null)
-    (mkEnable false                 "debug"           null)
-    (mkEnable false                 "pamlocking"      null)
-    (mkEnable true                  "read-both-confs" null)
-    (mkEnable true                  "lckpwdf"         null)
-    (mkWith   true                  "xauth"           "/run/current-system/sw/bin/xauth")
-    (mkEnable (optCracklib != null) "cracklib"        null)
-    (mkEnable (optLibaudit != null) "audit"           null)
-    (mkEnable (optDb != null)       "db"              "db")
-    (mkEnable true                  "nis"             null)  # TODO: Consider tirpc support here
-    (mkEnable false                 "selinux"         null)
-    (mkEnable false                 "regenerate-docu" null)
-  ];
+  buildInputs = [ cracklib ];
 
-  installFlags = [
-    "sysconfdir=\${out}/etc"
-    "SCONFIGDIR=\${out}/etc/security"
-  ];
+  crossAttrs = {
+    propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ];
+    preConfigure = preConfigure + ''
+      ar x ${flex.crossDrv}/lib/libfl.a
+      mv libyywrap.o libyywrap-target.o
+      ar x ${flex}/lib/libfl.a
+      mv libyywrap.o libyywrap-host.o
+      export LDFLAGS="$LDFLAGS $PWD/libyywrap-target.o"
+      sed -e 's/@CC@/gcc/' -i doc/specs/Makefile.in
+    '';
+    postConfigure = ''
+      sed -e "s@ $PWD/libyywrap-target.o@ $PWD/libyywrap-host.o@" -i doc/specs/Makefile
+    '';
+  };
 
   postInstall = ''
-    # Prepare unix_chkpwd for setuid wrapping
     mv -v $out/sbin/unix_chkpwd{,.orig}
     ln -sv /var/setuid-wrappers/unix_chkpwd $out/sbin/unix_chkpwd
   '';
 
+  preConfigure = ''
+    configureFlags="$configureFlags --includedir=$out/include/security"
+  '';
+
   meta = {
     homepage = http://ftp.kernel.org/pub/linux/libs/pam/;
     description = "Pluggable Authentication Modules, a flexible mechanism for authenticating user";
-    license = licenses.bsd3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ wkennington ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From dac5a45acf5962e4b5c07240e352fed7f09be007 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont" <antoine.romain.dumont@gmail.com>
Date: Fri, 5 Jun 2015 10:48:37 +0200
Subject: [PATCH 0831/2322] Add apvlv pdf reader

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

diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix
new file mode 100644
index 00000000000..aa312f4c8a9
--- /dev/null
+++ b/pkgs/applications/misc/apvlv/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, cmake, pkgconfig,
+  gtk2 , poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence
+}:
+
+stdenv.mkDerivation rec {
+  version = "0.1.f7f7b9c";
+  name = "apvlv-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/downloads/naihe2010/apvlv/${name}-Source.tar.gz";
+    sha256 = "125nlcfjdhgzi9jjxh9l2yc9g39l6jahf8qh2555q20xkxf4rl0w";
+  };
+
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${poppler}/include/poppler"
+  '';
+
+  buildInputs = [
+    pkgconfig cmake
+     poppler
+     freetype gtk2
+     libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation
+   ];
+
+  installPhase = ''
+    # binary
+    mkdir -p $out/bin
+    cp src/apvlv $out/bin/apvlv
+
+    # displays pdfStartup.pdf as default pdf entry
+    mkdir -p $out/share/doc/apvlv/
+    cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://naihe2010.github.io/apvlv/";
+    description = "PDF viewer with Vim-like behaviour";
+    longDescription = ''
+      apvlv is a PDF/DJVU/UMD/TXT Viewer Under Linux/WIN32
+      with Vim-like behaviour.
+    '';
+
+    license = licenses.lgpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.ardumont ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcc861b5d4d..dc94c51e50a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13031,6 +13031,8 @@ let
     inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas;
   };
 
+  apvlv = callPackage ../applications/misc/apvlv { };
+
   xpdf = callPackage ../applications/misc/xpdf {
     motif = lesstif;
     base14Fonts = "${ghostscript}/share/ghostscript/fonts";

From 40b66f613181844dc48a8ef4b0d958687c2cfa31 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Jun 2015 12:02:49 -0700
Subject: [PATCH 0832/2322] Revert "libmicrohttpd: 0.9.41 -> 0.9.42"

This reverts commit 89d9a6079cfd88b27295aeac3da355d44620548f.
---
 pkgs/development/libraries/libmicrohttpd/default.nix | 5 ++---
 pkgs/top-level/all-packages.nix                      | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index d88b75440bc..c7892716c9d 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -17,11 +17,11 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libmicrohttpd-0.9.42";
+  name = "libmicrohttpd-0.9.41";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "0nvxmm6z6wcq1vl6l92rids0i0va184y86bkc10dl0vh6rrj0d80";
+    sha256 = "0z3s3aplgxj8cj947i4rxk9wzvg68b8hbn71fyipc7aagmivx64p";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -33,7 +33,6 @@ stdenv.mkDerivation rec {
     (mkWith   true                 "threads"       "posix")
     (mkEnable true                 "doc"           null)
     (mkEnable false                "examples"      null)
-    (mkEnable true                 "poll"          "auto")
     (mkEnable true                 "epoll"         "auto")
     (mkEnable doCheck              "curl"          null)
     (mkEnable hasSpdy              "spdy"          null)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97b79530fa6..7d87d2ac7d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6927,9 +6927,8 @@ let
 
   libmemcached = callPackage ../development/libraries/libmemcached { };
 
-  libmicrohttpd-full = callPackage ../development/libraries/libmicrohttpd { };
-
-  libmicrohttpd = libmicrohttpd-full.override {
+  libmicrohttpd = callPackage ../development/libraries/libmicrohttpd {
+    openssl = null;
     gnutls = null;
   };
 

From 1adef3db3d656393baa446407d498e839428e23e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Jun 2015 12:21:31 -0700
Subject: [PATCH 0833/2322] kernel: 3.10.79 -> 3.10.80

---
 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 b270f0852f6..6365e133c10 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, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.79";
+  version = "3.10.80";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0m30c9v4pvim72ha8ya8w6y691a8zkcrhxhj43kh668q1yqpqvkp";
+    sha256 = "09x4931p2s0m7cngw4wcpiij2392js60ivki476pdyndxi0wh2nm";
   };
 
   features.iwlwifi = true;

From 24042f3803c778511cc179d104c853bce4a5deba Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Jun 2015 12:21:34 -0700
Subject: [PATCH 0834/2322] kernel: 3.14.43 -> 3.14.44

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 52fa5eba109..66f6d8293ee 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.43";
+  version = "3.14.44";
   # Remember to update grsecurity!
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1m5gdzff46xm24p5x5ajxka99g0maf1y50nj59mbjccbqx3s7kvf";
+    sha256 = "1kgzvdrxslrmb10cwx64qvzijq41kgiz8qy5xpa858mkynq8ydg8";
   };
 
   features.iwlwifi = true;

From 0a8e8301964ae73e9077fd5810ddcf6015725897 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Jun 2015 12:21:36 -0700
Subject: [PATCH 0835/2322] kernel: 4.0.4 -> 4.0.5

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix
index 9c7fb2c3bd8..b919fc7d901 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.0.4";
+  version = "4.0.5";
   # Remember to update grsecurity!
   extraMeta.branch = "4.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1j5l87z6gd05cqzg680id0x1nk38kd6sjffd2lifl0fz5k6iqr9h";
+    sha256 = "1l9kxicadn980wrypi2qm3nx12g513acvryq58m7a0xjdf6ksjz2";
   };
 
   features.iwlwifi = true;

From 4991e622857bd17b9afb15fbbe1291e207074bc2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Jun 2015 12:55:54 -0700
Subject: [PATCH 0836/2322] musl: 1.1.9 -> 1.1.10

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

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index 392a3c4049a..db7017edd43 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "musl-${version}";
-  version = "1.1.9";
+  version = "1.1.10";
 
   src = fetchurl {
     url    = "http://www.musl-libc.org/releases/${name}.tar.gz";
-    sha256 = "0gi8638c5gh9i4gsihfczigg78l2q0hd9c3ws26chwprr9rp3gq0";
+    sha256 = "0z4b3j1r0v4zr3v1cpl1v56zx6w8nq1y3wbs8x1zg87pqyqykfs5";
   };
 
   enableParallelBuilding = true;

From a818dba90bcaaa86176d485703e7e653204d8393 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sat, 6 Jun 2015 17:18:04 +0200
Subject: [PATCH 0837/2322] added zopfli package

---
 pkgs/tools/compression/zopfli/default.nix | 33 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/tools/compression/zopfli/default.nix

diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix
new file mode 100644
index 00000000000..93da9b15a9e
--- /dev/null
+++ b/pkgs/tools/compression/zopfli/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "zopfli-${version}";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "zopfli";
+    rev = name;
+    name = "${name}-src";
+    sha256 = "0r2k3md24y5laslzsph7kh4synm5az4ppv64idrvjk5yh2qwwb62";
+  };
+
+  installPhase = ''
+    install -D zopfli $out/bin/zopfli
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/google/zopfli;
+    description = "A compression tool to perform very good, but slow, deflate or zlib compression";
+    longDescription =
+      ''Zopfli Compression Algorithm is a compression library programmed
+        in C to perform very good, but slow, deflate or zlib compression.
+
+        This library can only compress, not decompress. Existing zlib or
+        deflate libraries can decompress the data.
+      '';
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.asl20;
+    maintainers = with maintainers; [ roconnor bobvanderlinden ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ee71adff23..c12fb6d53dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14185,6 +14185,8 @@ let
 
   zdfmediathk = callPackage ../applications/video/zdfmediathk { };
 
+  zopfli = callPackage ../tools/compression/zopfli { };
+
   myEnvFun = import ../misc/my-env {
     inherit substituteAll pkgs;
     inherit (stdenv) mkDerivation;

From 14cf76bb846d2b27194cb8aae6344770f651481f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Jun 2015 18:38:49 +0200
Subject: [PATCH 0838/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/7e9d164c834c18b614c1f9ec717d42a8ff3a83d6
 with hackage2nix revision d827dc6865dcad7d4890f27985383cc6d7cd1236

---
 .../haskell-modules/hackage-packages.nix      | 510 +++++++++++-------
 1 file changed, 307 insertions(+), 203 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e049946d44a..1136364e73e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -8949,8 +8949,8 @@ self: {
      }:
      mkDerivation {
        pname = "JuicyPixels";
-       version = "3.2.5.1";
-       sha256 = "11wpk4lr7h7s7mhl48i27dq1wwvzjviv2fnq3yl8dnikcl00k6dq";
+       version = "3.2.5.2";
+       sha256 = "07fyn0ns3g66aqpa1jg1v694yvf5idf7cknrkh30hs312lwm1sjl";
        buildDepends = [
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
@@ -11866,8 +11866,8 @@ self: {
      }:
      mkDerivation {
        pname = "Plot-ho-matic";
-       version = "0.5.0.4";
-       sha256 = "05pipj20bx9is5snwf5nhavrs8873br4xvs3b1ggrvxgvaf8qhqw";
+       version = "0.5.0.5";
+       sha256 = "0x8mq7368yjb1q4xmkj6iqrxkf81d0vslfdrhp8cr12k83ydg3g3";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -12917,8 +12917,10 @@ self: {
     ({ mkDerivation, base, SDL }:
      mkDerivation {
        pname = "SDL";
-       version = "0.6.5";
-       sha256 = "1vlf1bvp4cbgr31qk6aqikhgn9jbgj7lrvnjzv3ibykm1hhd6vdb";
+       version = "0.6.5.1";
+       revision = "1";
+       sha256 = "1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46";
+       editedCabalFile = "233e3fde4727ca7b597e0bf86619c6b862c32445191a37b7a536a3188634473e";
        buildDepends = [ base ];
        extraLibraries = [ SDL ];
        description = "Binding to libSDL";
@@ -12930,8 +12932,8 @@ self: {
     ({ mkDerivation, base, SDL }:
      mkDerivation {
        pname = "SDL-gfx";
-       version = "0.6.0";
-       sha256 = "14d8fz576rwi6x0dxgc29cdmwn48afja3v5qx3x8q5y61fv8w9v1";
+       version = "0.6.0.1";
+       sha256 = "1ay72r29ybxf4icaqadly02xi03ifz82a8jz3xkvlk26c9bxl4c3";
        buildDepends = [ base SDL ];
        description = "Binding to libSDL_gfx";
        license = stdenv.lib.licenses.bsd3;
@@ -12942,8 +12944,8 @@ self: {
     ({ mkDerivation, base, SDL, SDL_image }:
      mkDerivation {
        pname = "SDL-image";
-       version = "0.6.1";
-       sha256 = "18n6al40db7xalqqr4hp0l26qxxv1kmd8mva0n7vmhg05zypf6ni";
+       version = "0.6.1.1";
+       sha256 = "1m02q2426qp8m8pzz2jkk4srk2vb3j3ickiaga5jx9rkkhz732zq";
        buildDepends = [ base SDL ];
        extraLibraries = [ SDL_image ];
        description = "Binding to libSDL_image";
@@ -12955,8 +12957,8 @@ self: {
     ({ mkDerivation, base, SDL, SDL_mixer }:
      mkDerivation {
        pname = "SDL-mixer";
-       version = "0.6.1";
-       sha256 = "1fxp5sz0w6pr5047jjvh81wkljxsl7fca239364i50m44mpcsyn1";
+       version = "0.6.1.1";
+       sha256 = "0md3238hx79mxb9a7l43kg3b3d28x4mqvj0hjsbsh15ajnvy9x2z";
        buildDepends = [ base SDL ];
        extraLibraries = [ SDL_mixer ];
        description = "Binding to libSDL_mixer";
@@ -12981,8 +12983,8 @@ self: {
     ({ mkDerivation, base, SDL, SDL_ttf }:
      mkDerivation {
        pname = "SDL-ttf";
-       version = "0.6.2";
-       sha256 = "0jajnbqnhdd4i8pj8j27m53zwgfs1v06kiwy0s0zml02fdkq8j4a";
+       version = "0.6.2.1";
+       sha256 = "1ld551jgrcs3c7n53zyzlkrxkf01rp81wwvf9ynkm0c5kgll779s";
        buildDepends = [ base SDL ];
        extraLibraries = [ SDL_ttf ];
        description = "Binding to libSDL_ttf";
@@ -18554,15 +18556,14 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "0.3.5";
-       sha256 = "0i4wpkvf0yrgcdgz1pfmnig61d16lywh2mggf6xanp6pcrafh0xr";
+       version = "0.3.6";
+       sha256 = "1snzrclzs275gks19glrrayiysvywzwpzx6y5hnwmm48z4lh4gsb";
        buildDepends = [
          amazonka-core base bytestring conduit conduit-extra cryptohash
          cryptohash-conduit exceptions http-conduit lens mmorph
          monad-control mtl resourcet retry text time transformers
          transformers-base transformers-compat
        ];
-       jailbreak = true;
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Comprehensive Amazon Web Services SDK";
        license = "unknown";
@@ -18572,8 +18573,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-autoscaling";
-       version = "0.3.5";
-       sha256 = "0xbvviy5rvwiq0nj3wd420bl9zrb3625sils5y6y4zg9qzy3a7vx";
+       version = "0.3.6";
+       sha256 = "11dkcf0arjimvdzdin690811hs9klhr4xbhmjxcvqmwjr0z0sbb9";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Auto Scaling SDK";
@@ -18584,8 +18585,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudformation";
-       version = "0.3.5";
-       sha256 = "0xhm9lkm80v7i5my8vz6dz1g7zvm0b7kgzsl4swk20359p3fcs84";
+       version = "0.3.6";
+       sha256 = "0m64p8xgwskv5vyzkkd5cxcwg5a7qa86a8sndan7yffap5b4nzq3";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFormation SDK";
@@ -18596,8 +18597,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudfront";
-       version = "0.3.5";
-       sha256 = "0aln5gk3gj2ma6s51rp4x3ygjsj6zn3abzns4qlb2r5cqcf7r9sb";
+       version = "0.3.6";
+       sha256 = "09kl01agnmq24r1ip2f047ayrlf95x51nm80l3g40lx91n3mc7rp";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFront SDK";
@@ -18608,8 +18609,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudhsm";
-       version = "0.3.5";
-       sha256 = "00n8bchifihhijzacs0dmw4bxgl1xb1avbvzk9ic7a025vyp2vh3";
+       version = "0.3.6";
+       sha256 = "0m17yjilg4d7hm8d5mbs3bqsm9hlxcybk9b49bj06266jcd9rxff";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudHSM SDK";
@@ -18620,8 +18621,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudsearch";
-       version = "0.3.5";
-       sha256 = "0jz5ibr170592mz94zimvan7pwli4sp6qimv6hxiqlz3p78qy492";
+       version = "0.3.6";
+       sha256 = "1hyapllcv5g2s8qxmyigy2k0fha9k07dd2jax69hkwi2qv88cks5";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch SDK";
@@ -18632,8 +18633,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
-       version = "0.3.5";
-       sha256 = "1yv1q8bkwl1vmvyis2zj4ayy5lwvr5c0waaanaam640v8gnn7qli";
+       version = "0.3.6";
+       sha256 = "0dfi0flb77zjbjzdsfybr0hxwwdh2qd1pc5pry88l57iibjhmxym";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch Domain SDK";
@@ -18644,8 +18645,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudtrail";
-       version = "0.3.5";
-       sha256 = "1k5hmd6vbfm9wndz6ycd8cipds2npdqcfiwi67hq6g8lnvwm3p82";
+       version = "0.3.6";
+       sha256 = "07b47dy9r1f7dl5zq6z1zx1xa9q4qlack49zy8y48x1im90dnc9x";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudTrail SDK";
@@ -18656,8 +18657,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudwatch";
-       version = "0.3.5";
-       sha256 = "1hmckxa3bv1hdrmd097fljfjdpmg1w18bjarppbr1fxd86hdzfr8";
+       version = "0.3.6";
+       sha256 = "14vx5v9iicxv768637v8smzwj04nhd80dcrwrxq3yqqlq9mbk9nk";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch SDK";
@@ -18668,8 +18669,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
-       version = "0.3.5";
-       sha256 = "0b4s87p1d8zhj7fwi29cca472wynqa4nxiskvw3d1dvf37xbzasi";
+       version = "0.3.6";
+       sha256 = "15xpyfifqm6c5s4ysak1y0sgn6h5g9bapl69s9dpacg7nfpajqvb";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Logs SDK";
@@ -18680,8 +18681,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-codedeploy";
-       version = "0.3.5";
-       sha256 = "03rcyqvsdc63sq9122s5a14gz210kbywv1jx9pqmdifmr2flap6c";
+       version = "0.3.6";
+       sha256 = "1cp99l1kjm0w0jb1c4brq00dy4mn53pycra5gvlvz9k210g72ndm";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeDeploy SDK";
@@ -18692,8 +18693,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cognito-identity";
-       version = "0.3.5";
-       sha256 = "0l3izdln529kavybflf544xak510g336lzpkr6n323qjb8b6gjzc";
+       version = "0.3.6";
+       sha256 = "1ig50w3z85y8g7hiq1hahbv529kq5pfrcpqwsrpf1zwynl50jjkz";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity SDK";
@@ -18704,8 +18705,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cognito-sync";
-       version = "0.3.5";
-       sha256 = "12agwj1jhbb5dad2niycx8yahxhng02clfdpqakbyq7jqbdhrwlk";
+       version = "0.3.6";
+       sha256 = "1m6nw80ls7rl55ci36y2xvw8a1wfqiv64wm3q4anzmyybl50s133";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Sync SDK";
@@ -18716,8 +18717,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-config";
-       version = "0.3.5";
-       sha256 = "1h4037sbfxkf66z47rizyqbjwhy3c6ny993qcalpdy1lji3m86sp";
+       version = "0.3.6";
+       sha256 = "0aa73cmlaydayvy6vxbxdz5br8a6hsns3dn3s06r4nzxxy7zmfzg";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Config SDK";
@@ -18735,8 +18736,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-core";
-       version = "0.3.5";
-       sha256 = "1m1nk4575ccdhx6ysw9n3x2xx6k8z1f0mqifccmry3fjc8nh90z7";
+       version = "0.3.6";
+       sha256 = "1l60z0fcfbyrhi7r4lfy2a6b2vwc4bn1swd6ddna19qyq9fn67l2";
        buildDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bifunctors bytestring case-insensitive conduit conduit-extra
@@ -18757,8 +18758,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-datapipeline";
-       version = "0.3.5";
-       sha256 = "180h89gzmszwqylibjxb7wmsilwfqwazanjcspwl6zf4wh3dy4hv";
+       version = "0.3.6";
+       sha256 = "0p0k76hiif5nd4kxm1ww6p0srjfmmq8q3xln4sbkq8ss448zfymh";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Data Pipeline SDK";
@@ -18769,8 +18770,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-directconnect";
-       version = "0.3.5";
-       sha256 = "1icdc2nhp9fqslv96if5k30xjy60mj7hfidmfqy8126y7f9xg9ip";
+       version = "0.3.6";
+       sha256 = "0q258fxwklm5xwyzram3kdq3ylayk498a02xzs7v2vb2vd3pmdb6";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Direct Connect SDK";
@@ -18781,8 +18782,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-dynamodb";
-       version = "0.3.5";
-       sha256 = "0qywmfhxjda55002pbcg23l187jnch23lrpdi0bkpm2r9m7f3jz1";
+       version = "0.3.6";
+       sha256 = "1k6kzip69sjakcw1y7n0xjd0qjpbrk604fs4hng8n6az107vbdjq";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB SDK";
@@ -18793,8 +18794,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "0.3.5";
-       sha256 = "1qydhrld9zwjvcz1bcc12i1bxy34sg25q4czb2qg6vas4q17hd7r";
+       version = "0.3.6";
+       sha256 = "050gspxplhch66awd7gmxyyy3s466ca3jbzp2yq4qh32dn7n1hvi";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
@@ -18805,8 +18806,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ecs";
-       version = "0.3.5";
-       sha256 = "06v24ii7w0fs3b10lrjdqm4ij06h160vk10db0w7r69s5bcx97wd";
+       version = "0.3.6";
+       sha256 = "1md59pdqir5prlfwlmlgd78g6c9gq0dszm2lxpa3kbv9zxs1kgfr";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Service SDK";
@@ -18817,8 +18818,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elasticache";
-       version = "0.3.5";
-       sha256 = "12acby04a090p11g40awhz2rln187vqlnsk347dapkh42pgjnd1f";
+       version = "0.3.6";
+       sha256 = "0hapj08jj89gl934zgkfj2lg9bsc71y1mvdl5dmv4vk8qrwp912a";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon ElastiCache SDK";
@@ -18829,8 +18830,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
-       version = "0.3.5";
-       sha256 = "16msbdxqgpf4hwym1jh2zdhsla50w3293m4rgjixgd6bbg3clrdl";
+       version = "0.3.6";
+       sha256 = "1bpixxvj4rdx3v07f2pdky0xbz0kz5p3afjazwv8w588sj2i6773";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Beanstalk SDK";
@@ -18841,8 +18842,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elastictranscoder";
-       version = "0.3.5";
-       sha256 = "1cv6kvfbwswmlhds26xgxcf3gh7k8lrjw9gvrqckri4jbmksxmsv";
+       version = "0.3.6";
+       sha256 = "1rfnzwl6z0ym2ln5nbcx6an2iiqcwnb3rjki2jnxpqkv6hj8d1p8";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Transcoder SDK";
@@ -18853,8 +18854,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elb";
-       version = "0.3.5";
-       sha256 = "1yhmsmm2f2s1s4pziqyadl8wzygpdb0y0f1qdjajshd33pff4462";
+       version = "0.3.6";
+       sha256 = "0yriv45wrxw9jns17idiqwxxvh086g3bg2hclzaanzxllir4jb59";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
@@ -18865,8 +18866,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-emr";
-       version = "0.3.5";
-       sha256 = "0xlb9nry7a0grn9d3qwl135lgl7r5kxqidx9jq67v6sdjh5y0v7y";
+       version = "0.3.6";
+       sha256 = "0pv0li7823alrgl9w1fjx9i02ndk4k12fbb6z5z50krypcxp8819";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic MapReduce SDK";
@@ -18877,8 +18878,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-glacier";
-       version = "0.3.5";
-       sha256 = "19dgjkggjirz9pbyzjw61ni3gkgbj2fl8y6cbdkazq2h9gg4dgbv";
+       version = "0.3.6";
+       sha256 = "0i3j1yha1hjj7imqn6m42329p3637v09hbjampq0c500dvy1j5dl";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Glacier SDK";
@@ -18889,8 +18890,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-iam";
-       version = "0.3.5";
-       sha256 = "0jr7wgs1hhbr4bara8q5xp1k40ffxjfrd79ncf2l6kzlh3vnsgcb";
+       version = "0.3.6";
+       sha256 = "0nzs9xn70f2a0n3xdnprwdk0mwnr23cgq0rwwxc83gf08i19nl8j";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Identity and Access Management SDK";
@@ -18901,8 +18902,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-importexport";
-       version = "0.3.5";
-       sha256 = "1ymlxs0icxlqb23jwx9wp3k6n3pld5n7ykzl7fp77c8pnyzq52ia";
+       version = "0.3.6";
+       sha256 = "1qcqzqg9sxqaf5kb3l91n7zp5brdpyv2mhy7da08wxb16f1v1r9x";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export SDK";
@@ -18913,8 +18914,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-kinesis";
-       version = "0.3.5";
-       sha256 = "0cqazzfcy1inhnb0g5nf2cqkglc4c9yvd3s1xiz2ihc2rfqanxyf";
+       version = "0.3.6";
+       sha256 = "0r4s5qfpirapg2gsgk9gbyp3ap4pz3cpnz4wdidlc4ys9v4vfhay";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis SDK";
@@ -18925,8 +18926,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-kms";
-       version = "0.3.5";
-       sha256 = "1lx7d5zdj6gqvmcrdmr6rbyj7wmh43d9dnmr755vzwgjk5y47pq5";
+       version = "0.3.6";
+       sha256 = "1x68jg5m79rapwvb6nb9xmf2hwdv34r63r0aar742igpjwssxzn9";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Key Management Service SDK";
@@ -18937,8 +18938,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-lambda";
-       version = "0.3.5";
-       sha256 = "15x8y41bjxg2jk6jajnax7nnjy247128zwwzp4j0lqcy3jx0djf2";
+       version = "0.3.6";
+       sha256 = "1g6gf64k60zanmv787rsg8zxnv6vxzdwv3dibwm5b00fzw7cshlp";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lambda SDK";
@@ -18949,8 +18950,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ml";
-       version = "0.3.5";
-       sha256 = "1ysrlff1mqww5nxm5hlrphafnfisrifqd0czl3slpg0wq4jijpd1";
+       version = "0.3.6";
+       sha256 = "0ma60mdn14xs3999yg98dzlx96arlwrc9wsvgf0gq6s6c0gnrc04";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Machine Learning SDK";
@@ -18961,8 +18962,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-opsworks";
-       version = "0.3.5";
-       sha256 = "1m47ymzakcnyjgg9fp6f0k270r6785z3q64g5qn3321sya8rfahz";
+       version = "0.3.6";
+       sha256 = "1d9qgazp4qk6lc4isggb0rm50crp0s1qmz6m0s3wwfdwd6lvhaql";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks SDK";
@@ -18973,8 +18974,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-rds";
-       version = "0.3.5";
-       sha256 = "196z77al765mxrjnilz6ph20nmvdks5mfaqdnfwgk8mvhcigbiwp";
+       version = "0.3.6";
+       sha256 = "105xj8zrjha5yvpj8m0r7asy0hys17g1gglf95kgnkwdh9zhj3yl";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Relational Database Service SDK";
@@ -18985,8 +18986,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-redshift";
-       version = "0.3.5";
-       sha256 = "1kh5497azy2qyc6zbh4gznvmrf5hp6rpz5ksbbi78fngcanvfwn9";
+       version = "0.3.6";
+       sha256 = "195lawjhy6hmfwk05cm9wi2x8pn6f3zr8rhcvrwa0igg8xi39fpr";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Redshift SDK";
@@ -18997,8 +18998,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "0.3.5";
-       sha256 = "0gl0xygsq6vn2xw0ibpmqc2n3c7650756ldv8nxyfmwrxyv37vrv";
+       version = "0.3.6";
+       sha256 = "1xk44z5zp8pr2hyhdshzgwm572y33f9lvjz6yrglc4vpangslcx3";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 SDK";
@@ -19009,8 +19010,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-route53-domains";
-       version = "0.3.5";
-       sha256 = "0mawgxdvlhhvb2jzgsc5w62gfaf1wd0yiy2xzmk10vcrwawhfhig";
+       version = "0.3.6";
+       sha256 = "13dykx5w35dj3fn7nqs3znisjzqczpsxxyyghh2kfsgfhxna0kqv";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 Domains SDK";
@@ -19021,8 +19022,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-s3";
-       version = "0.3.5";
-       sha256 = "09fc51c3zsbpr9b9dbachhyr5v9f1b02w47yv382f70vdk7m7lky";
+       version = "0.3.6";
+       sha256 = "1q45d6g4wrfjmw9d65bvrin1p9vcfv5xyz47158p9zxm2cvpvcv9";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
@@ -19033,8 +19034,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sdb";
-       version = "0.3.5";
-       sha256 = "0x5v734q7srn8y7kfk5rrlbhvr1a51z2ak0dqd8qwjhpdam7wigb";
+       version = "0.3.6";
+       sha256 = "1wswsirmjq1zvhppv4bk4h9k2b94hdl1w8q18c7mh5i4j6kx41lc";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon SimpleDB SDK";
@@ -19045,8 +19046,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ses";
-       version = "0.3.5";
-       sha256 = "0vk5hygw8z8cckmv5b95x265c8jkhnaz33n2dvrnyh29q3a5ag6d";
+       version = "0.3.6";
+       sha256 = "1f7k13mpf1hs27li4fdfv4wsbckyljmhwf9i6r176h6lkkb24vxx";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Email Service SDK";
@@ -19057,8 +19058,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sns";
-       version = "0.3.5";
-       sha256 = "0hfl4fwf777l49r7sx85dkp34yy5xijry5z114pbf2mbf7v8pxvn";
+       version = "0.3.6";
+       sha256 = "00bln36dmxikxgjyib009i3y56nln4i4j58nj89sclc87mdbzbma";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Notification Service SDK";
@@ -19069,8 +19070,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sqs";
-       version = "0.3.5";
-       sha256 = "0jback1zw7n72pcrwv8d074xygk9hqlzpwfi2m905jz36f1jw889";
+       version = "0.3.6";
+       sha256 = "04qz8d81xz5pj3ib7cpxrig61n70val2vgjjy3xc0wjki3sk7xw8";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Queue Service SDK";
@@ -19081,8 +19082,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ssm";
-       version = "0.3.5";
-       sha256 = "172wvhlk054wvp30f7vsfb6l94m0hbjsiwhnfxamnk7nwv8qzprr";
+       version = "0.3.6";
+       sha256 = "1xzz82hxh0am6mgzgqx0w8lxm5q8d3zpny2qyyl7bjyjh8k7v370";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Systems Management Service SDK";
@@ -19093,8 +19094,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-storagegateway";
-       version = "0.3.5";
-       sha256 = "0nxyc8bzphw1pdg9vz55fm9x9p57qd501112p5zykd08pgwaxzna";
+       version = "0.3.6";
+       sha256 = "1cjajpwf0lfvn3r62n7y4ly16496cn7qhs17grjxv3c9i8pikq2z";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Storage Gateway SDK";
@@ -19105,8 +19106,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sts";
-       version = "0.3.5";
-       sha256 = "03gphzl87qrvi57sncng08sdqlxbxlm3z9q4yz7zwqdigy2r2aic";
+       version = "0.3.6";
+       sha256 = "096av2p79b4vnb3zzmkbjspvxkcgzx77w96mrziggfj8mxh3x5f1";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Security Token Service SDK";
@@ -19117,8 +19118,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-support";
-       version = "0.3.5";
-       sha256 = "1z9r6v1nvx5d6kda9kxgypwh4y90waxv7ybm6iknp19xqw7y2daz";
+       version = "0.3.6";
+       sha256 = "0igaq8538vrbwn7pqap5500alx3lp1c37imq75gk9nx7q846gqy6";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Support SDK";
@@ -19129,8 +19130,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-swf";
-       version = "0.3.5";
-       sha256 = "0hl9crncqs8sijzyppl3q54isq1w3205q716bwqi09g97zi0hik3";
+       version = "0.3.6";
+       sha256 = "0mijdc797ybdz7g0nkyncahspsl0dpy3g8hkhcj2jdhhdbqn7qfc";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
@@ -19141,8 +19142,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-workspaces";
-       version = "0.3.5";
-       sha256 = "0afl7xwb45i70j025kmfh7s3v5my86h52zb55h4cxxdcnj9yvca5";
+       version = "0.3.6";
+       sha256 = "1hwlm2a5fn4hrqqv79iw39xrrgfhl1d1p6236lqqfdyycnq4x5wk";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WorkSpaces SDK";
@@ -19261,8 +19262,8 @@ self: {
      }:
      mkDerivation {
        pname = "anansi";
-       version = "0.4.7";
-       sha256 = "0am6c4chbysgs63n3wbd4lfxdzkg6fzj4xgp6i26z4vhj49qk890";
+       version = "0.4.8";
+       sha256 = "1fzrry9axri0wcff0zbxq0dbq0pxyq6x6bzw426xkm3ayzfd825a";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -22932,8 +22933,8 @@ self: {
      }:
      mkDerivation {
        pname = "banwords";
-       version = "0.1.0.0";
-       sha256 = "0r35w2kv9nfsz67bmcc9k9pg7k1d1k00cz5y16cpjra200mz847z";
+       version = "0.2.0.0";
+       sha256 = "18k39zgc5n9bxabv0wkiay9h3phx75mfr4kqpcp1hlpikn4h6wxx";
        buildDepends = [
          attoparsec base bytestring data-default text vector
        ];
@@ -26342,23 +26343,25 @@ self: {
      }) {};
 
   "bloodhound" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, containers
-     , directory, doctest, doctest-prop, filepath, hspec, http-client
-     , http-types, QuickCheck, semigroups, text, time
-     , unordered-containers, vector
+    ({ mkDerivation, aeson, base, bytestring, containers
+     , data-default-class, directory, doctest, doctest-prop, exceptions
+     , filepath, hspec, http-client, http-types, mtl, QuickCheck
+     , quickcheck-properties, semigroups, text, time, transformers
+     , unordered-containers, uri-bytestring, vector
      }:
      mkDerivation {
        pname = "bloodhound";
-       version = "0.5.0.1";
-       sha256 = "1wvqj8fz3b6jvhmmi3calx6fsqjyvcpznks67bd0iiz9z0igh0ha";
+       version = "0.6.0.0";
+       sha256 = "0qybsmfkip5cjanmhj2av4rl5hig6x4wn97cmlajhszqd5ddsis9";
        buildDepends = [
-         aeson base bytestring conduit containers http-client http-types
-         semigroups text time vector
+         aeson base bytestring containers data-default-class exceptions
+         http-client http-types mtl semigroups text time transformers
+         uri-bytestring vector
        ];
        testDepends = [
          aeson base containers directory doctest doctest-prop filepath hspec
-         http-client http-types QuickCheck semigroups text time
-         unordered-containers vector
+         http-client http-types mtl QuickCheck quickcheck-properties
+         semigroups text time unordered-containers vector
        ];
        jailbreak = true;
        homepage = "https://github.com/bitemyapp/bloodhound";
@@ -31525,8 +31528,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-vhdl";
-       version = "0.5.5";
-       sha256 = "0mwzp12ag98sfspjlh2w9hd1zgsx2bi7bv0lx55x6nmn8gawn0mk";
+       version = "0.5.6";
+       sha256 = "02pjy1l3irn67jaqy6sp2a8cjy2sw100kssyd0nxsz9k0imjzizy";
        buildDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -32987,9 +32990,10 @@ self: {
      mkDerivation {
        pname = "colors";
        version = "0.3.0.2";
+       revision = "1";
        sha256 = "0gbdqn5wrh9711j5hs5ypbd3w7a3mh37g6aadqiq4m5n7jna6phm";
+       editedCabalFile = "b49946d81e0089d4d80191523839f934802975ede3b9fd9521ead9e591142560";
        buildDepends = [ base lens linear profunctors ];
-       jailbreak = true;
        homepage = "https://github.com/fumieval/colors";
        description = "A type for colors";
        license = stdenv.lib.licenses.bsd3;
@@ -44891,8 +44895,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-push";
-       version = "0.0.2";
-       sha256 = "1z41x3i7hvrnca3clrrz62kah3a4lik0f3gxhw3vnyqgszzb46l5";
+       version = "0.0.3";
+       sha256 = "1yxp0s3i87zc205bqkw8arq8n0y225gin94x98csldb9rd0k0s5y";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -44932,12 +44936,11 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-statsd";
-       version = "0.2.0.2";
-       sha256 = "1jblrhwpv579d51i66bin9zxmwkl899lxwygg4qqpm3cnx5vf859";
+       version = "0.2.0.3";
+       sha256 = "02sknwz5cqwy5byqjiyc6nfppmbmfnxndp3dcs4lz276221h91hn";
        buildDepends = [
          base bytestring ekg-core network text time unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/tibbe/ekg-statsd";
        description = "Push metrics to statsd";
        license = stdenv.lib.licenses.bsd3;
@@ -47618,6 +47621,7 @@ self: {
          base bytestring containers foldl lens parsec pipes pipes-bytestring
          pipes-group pipes-text split text
        ];
+       jailbreak = true;
        homepage = "https://github.com/GregorySchwartz/fasta";
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl2;
@@ -49752,8 +49756,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl";
-       version = "1.0.11";
-       sha256 = "0czavxjbf8vafkizw6sdvp2a19qdgpjvjb10f1f52jmd5z8k3rxr";
+       version = "1.1.0";
+       sha256 = "184arkpffi2z7dayplc47nvyabzr5sig4zs8hc4lilcklv4q9zn6";
        buildDepends = [
          base bytestring containers mwc-random primitive profunctors text
          transformers vector
@@ -51739,8 +51743,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-accessors";
-       version = "0.1.0.1";
-       sha256 = "0lkzwbz2kmv7nl6hlys2iqn5nq1a11n18q2apymp517pvkq3if95";
+       version = "0.4.0";
+       sha256 = "0wpv9i80lai771fws5yg5ri05iskbq2vgar66f72xqwvz3nm44i7";
        buildDepends = [ base linear spatial-math ];
        testDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -54050,8 +54054,8 @@ self: {
     ({ mkDerivation, array, base, containers, TypeCompose }:
      mkDerivation {
        pname = "gll";
-       version = "0.2.0.1";
-       sha256 = "0f5hiklia5fkddzahq0cjpwdjjk2d5sfs0hd7wwcylylsh0xicd7";
+       version = "0.2.0.3";
+       sha256 = "1w2z5071idac1jn367dymphqvayd580jlnhapmfrd3s40b6z6xaf";
        buildDepends = [ array base containers TypeCompose ];
        description = "GLL parser with simple combinator interface";
        license = stdenv.lib.licenses.bsd3;
@@ -58241,6 +58245,7 @@ self: {
          base containers grid HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "https://github.com/timjb/halma";
        description = "Library implementing Halma rules";
        license = stdenv.lib.licenses.mit;
@@ -63033,8 +63038,8 @@ self: {
      }:
      mkDerivation {
        pname = "hein";
-       version = "0.1.0.4";
-       sha256 = "0agg7nsnhzg3ngiawa9899qg2pwa39dw6rkivdslsv2i67six832";
+       version = "0.1.0.5";
+       sha256 = "0z3c9pvhnfx9zizzwkyawvzvs4zl7i5w5zkrjpax8rkrh8ai1060";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -70169,18 +70174,17 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-snap";
-       version = "0.3.2.9";
-       sha256 = "1m324bjln2i6qz7ym26m82s1qiaq0i0sq4yfscc3bh1s6p8r5vva";
+       version = "0.3.3.0";
+       sha256 = "1ch58zz5yhvp4dq91ls05bgraf2p36aixl189zm3ipc9naidjrg4";
        buildDepends = [
-         base bytestring containers digestive-functors HandsomeSoup hspec
-         hspec-core hxt lens mtl snap snap-core text transformers
+         aeson base bytestring containers digestive-functors HandsomeSoup
+         hspec hspec-core hxt lens mtl snap snap-core text transformers
        ];
        testDepends = [
          aeson base bytestring containers digestive-functors directory
          HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text
          transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/dbp/hspec-snap";
        description = "A library for testing with Hspec and the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -71312,8 +71316,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.11.2";
-       sha256 = "074qh0yj3i4q6m88jccp59vpv5prdwglrrcglsr5k89g06hx4xb2";
+       version = "0.4.11.3";
+       sha256 = "04f9xb1hz5i9sm14nlasia86vjwsx0nmjh1kpk21axvvkbgcnrrq";
        buildDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -86947,6 +86951,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mida" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, haskeline
+     , HCodecs, mersenne-random-pure64, mtl, optparse-applicative
+     , parsec, process, QuickCheck, test-framework
+     , test-framework-quickcheck2, text, text-format, transformers
+     }:
+     mkDerivation {
+       pname = "mida";
+       version = "0.4.3";
+       sha256 = "0x71qih8r48kp2anvdnwfkja3sz8iigzprsqkaqi259mn58qd9ch";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base containers directory filepath haskeline HCodecs
+         mersenne-random-pure64 mtl optparse-applicative parsec process text
+         text-format transformers
+       ];
+       testDepends = [
+         base containers HCodecs mersenne-random-pure64 mtl parsec
+         QuickCheck test-framework test-framework-quickcheck2 text
+         transformers
+       ];
+       homepage = "https://github.com/mrkkrp/mida";
+       description = "Language for algorithmic generation of MIDI files";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "midi" = callPackage
     ({ mkDerivation, base, binary, bytestring, event-list
      , explicit-exception, monoid-transformer, non-negative, QuickCheck
@@ -88452,10 +88483,9 @@ self: {
     ({ mkDerivation, base, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "monad-resumption";
-       version = "0.1.1.4";
-       sha256 = "0zrzxkzg6fzxiqr9k4kw6r1ivw22qwz2dhl1nd5xqr7lfsqc00zs";
+       version = "0.1.1.5";
+       sha256 = "08h750qbvzvlw5hyp1d44rkhiqlhgnsfy8sya2ya7p62l80w96sf";
        buildDepends = [ base mmorph mtl transformers ];
-       jailbreak = true;
        homepage = "https://github.com/igraves/resumption_monads";
        description = "Resumption and reactive resumption monads for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -89065,8 +89095,8 @@ self: {
      }:
      mkDerivation {
        pname = "monoid-subclasses";
-       version = "0.4.0.4";
-       sha256 = "1wg5yx49gx8j9hxcr3mp3pq40wqpwhh4cccsg7m2fgdnangxd6rh";
+       version = "0.4.1";
+       sha256 = "0wgy0cqi2x12xn1sbxwfbwzj6bii2b6rhf8gi4q2jja5nh04a4vz";
        buildDepends = [ base bytestring containers primes text vector ];
        testDepends = [
          base bytestring containers primes QuickCheck quickcheck-instances
@@ -90597,8 +90627,8 @@ self: {
      }:
      mkDerivation {
        pname = "mvc";
-       version = "1.0.5";
-       sha256 = "1lrq0nkxi0ljs6pxf7p4awhrf9ix9dqwvwsydph6fw356ypc39r2";
+       version = "1.1.0";
+       sha256 = "115cg7xlkk0zj3qdhwm35397vbp1s28h3j0ipw2a9i9ap16d7x1i";
        buildDepends = [
          async base contravariant foldl managed mmorph pipes
          pipes-concurrency transformers
@@ -90614,6 +90644,7 @@ self: {
        version = "1.2.0";
        sha256 = "125bwc79qcmwb8dn8yqkrxlbqf3vwdzhjx66c69j2jbrp70061n6";
        buildDepends = [ async base foldl mvc ];
+       jailbreak = true;
        description = "Concurrent and combinable updates";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -94033,6 +94064,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "old-version" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "old-version";
+       version = "1.0.1";
+       sha256 = "1h5kln84658036sqap9fxxj464gmw8i6dqiba52577055apl62xv";
+       buildDepends = [ base ];
+       jailbreak = true;
+       description = "Basic versioning library";
+       license = "unknown";
+     }) {};
+
   "olwrapper" = callPackage
     ({ mkDerivation, base, bytestring, fay, fay-jquery, fay-text, lens
      , mtl, snap, snap-core, snap-loader-dynamic, snap-loader-static
@@ -94778,27 +94821,28 @@ self: {
 
   "opml-conduit" = callPackage
     ({ mkDerivation, base, case-insensitive, conduit
-     , conduit-combinators, containers, data-default, exceptions
-     , hashable, hashable-time, hlint, lens, mono-traversable
-     , monoid-subclasses, mtl, network-uri, QuickCheck
-     , quickcheck-instances, resourcet, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, timerep, unordered-containers
-     , xml-conduit, xml-types
+     , conduit-combinators, conduit-parse, containers, data-default
+     , exceptions, hashable, hashable-time, hlint, lens
+     , mono-traversable, monoid-subclasses, mtl, network-uri, parsers
+     , QuickCheck, quickcheck-instances, resourcet, semigroups, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, timerep
+     , unordered-containers, xml-conduit, xml-conduit-parse, xml-types
      }:
      mkDerivation {
        pname = "opml-conduit";
-       version = "0.2.0.1";
-       sha256 = "1c787c8hq68g2zl1jji6bh2p8hm9fmpdcs898kr8n7b8xbw9jxfk";
+       version = "0.3.0.0";
+       sha256 = "00kknysgzv1cbrgx1sgb2qg99lr3715mhdx2wcjsi65msk67ngiz";
        buildDepends = [
-         base case-insensitive conduit containers data-default exceptions
-         hashable hashable-time lens mono-traversable monoid-subclasses
-         network-uri QuickCheck quickcheck-instances semigroups text time
-         timerep unordered-containers xml-conduit xml-types
+         base case-insensitive conduit conduit-parse containers data-default
+         exceptions hashable hashable-time lens mono-traversable
+         monoid-subclasses network-uri parsers QuickCheck
+         quickcheck-instances semigroups text time timerep
+         unordered-containers xml-conduit xml-conduit-parse xml-types
        ];
        testDepends = [
-         base conduit conduit-combinators containers exceptions hlint lens
-         mtl network-uri resourcet tasty tasty-hunit tasty-quickcheck
-         xml-conduit
+         base conduit conduit-combinators conduit-parse containers
+         data-default exceptions hlint lens mtl network-uri parsers
+         resourcet tasty tasty-hunit tasty-quickcheck xml-conduit-parse
        ];
        homepage = "https://github.com/k0ral/opml-conduit";
        description = "Streaming parser/renderer for the OPML 2.0 format.";
@@ -96673,8 +96717,8 @@ self: {
      }:
      mkDerivation {
        pname = "paypal-adaptive-hoops";
-       version = "0.11.0.0";
-       sha256 = "0v72ny33mfi29vv4kzld5x01qr9k6i9vdyk9v83dy9zbfb7vkmzv";
+       version = "0.11.0.1";
+       sha256 = "061vzsncyl0is2d3p8sh3a1wb46g2v6vqgdh390b8d41max1wabg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -98014,15 +98058,14 @@ self: {
      }:
      mkDerivation {
        pname = "phash";
-       version = "0.0.3";
-       sha256 = "0w3c7i4n4f12nkg0bqvm568s2y1fdgaicxqr3ky80lygbz1h20hw";
+       version = "0.0.4";
+       sha256 = "1bfikigj8bxgqwqz0lxi35s8sck41kjkz2ww1s10bim867h97si0";
        buildDepends = [ base ];
        testDepends = [
          base doctest HUnit pHash smallcheck tasty tasty-hunit
          tasty-smallcheck
        ];
        extraLibraries = [ pHash ];
-       jailbreak = true;
        homepage = "http://github.com/michaelxavier/phash";
        description = "Haskell bindings to pHash, the open source perceptual hash library";
        license = stdenv.lib.licenses.gpl3;
@@ -100151,13 +100194,12 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-config";
-       version = "0.0.1";
-       sha256 = "1hp6ki078d4hvb910403ppvcb8q6ji79z3ccv6alkpnd494wd4wr";
+       version = "0.0.2";
+       sha256 = "1b7rppzarnmndmgwkcahcrcnxzigfldm50iqd81vj0zkii6w0i43";
        buildDepends = [
          aeson base bytestring monad-control mtl postgresql-simple
          resource-pool time
        ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/s9gf4ult/postgresql-config";
        description = "Types for easy adding postgresql configuration to your program";
        license = stdenv.lib.licenses.bsd3;
@@ -100316,6 +100358,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "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 = "1878zcfgis931nn5pnbixzfj2sbp790rxq294cwjy6g1ab35w5ng";
+       buildDepends = [ base network-uri postgresql-simple split ];
+       testDepends = [ base postgresql-simple tasty tasty-quickcheck ];
+       homepage = "https://github.com/futurice/postgresql-simple-url";
+       description = "PostgreSQL";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "postgresql-typed" = callPackage
     ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
      , containers, cryptohash, haskell-src-meta, network, old-locale
@@ -103640,6 +103697,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "raml" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, text
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "raml";
+       version = "0.1.0";
+       sha256 = "02c1rki7azfwfiawi29z5gp1zwfdx46rw17bifpklw7zya525pr9";
+       buildDepends = [
+         aeson base bytestring text unordered-containers yaml
+       ];
+       homepage = "https://github.com/fnoble/raml";
+       description = "RESTful API Modeling Language (RAML) library for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "rand-vars" = callPackage
     ({ mkDerivation, array, base, IntervalMap, mtl, random }:
      mkDerivation {
@@ -103998,8 +104071,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasterific-svg";
-       version = "0.2.3";
-       sha256 = "1gr050dlvq8pfp77g21ywc6cknbgmkw8bcc4d8klw8jpf0ppar45";
+       version = "0.2.3.1";
+       sha256 = "00p3l8czj7l9jm6ibn9c6wb99v5j5x9ivgh3pamznqcri3lqy7kk";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -105815,8 +105888,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.5.0.0";
-       sha256 = "00q0z4bnic5phhm7xxv059380q23d0fhd8vh32aggjlggzlq01sx";
+       version = "0.5.0.1";
+       sha256 = "1yhcdc0m839pdwhb2vv25wz1vbhk5ynfkb9d6xgkjymsjvqlp78n";
        buildDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -113081,8 +113154,8 @@ self: {
      }:
      mkDerivation {
        pname = "singletons";
-       version = "1.1.2";
-       sha256 = "102pxml8k1f94q8vmbsjhv6sjxa316xblfcl8czagcxkpz0sil4d";
+       version = "1.1.2.1";
+       sha256 = "1lxbajfwq65bkl73cr3zqzcqy67vqbq9sf8w9ckrik4713sx0mhb";
        buildDepends = [ base containers mtl template-haskell th-desugar ];
        testDepends = [
          base Cabal constraints filepath process tasty tasty-golden
@@ -115754,6 +115827,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "spdx" = callPackage
+    ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }:
+     mkDerivation {
+       pname = "spdx";
+       version = "0.0.1.0";
+       sha256 = "0k4lpny0fl6yz92m3040dmsqjcyb5gslf0306hlsqbsbn1gzjjmm";
+       buildDepends = [ base transformers ];
+       testDepends = [ base tasty tasty-quickcheck ];
+       homepage = "https://github.com/phadej/spdx";
+       description = "SPDX license expression language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "spe" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -118584,14 +118670,13 @@ self: {
      }:
      mkDerivation {
        pname = "strive";
-       version = "1.0.1";
-       sha256 = "0c9zwgsy1s64c2kl1agirm8616rjpp2z9r73ch0ixrf200l6rw0d";
+       version = "2.1.0";
+       sha256 = "08jirx24wnfpknlgkcz605sn9nwb0g5hv75vgrms5gbq65gkg9s2";
        buildDepends = [
          aeson base bytestring data-default gpolyline http-conduit
          http-types template-haskell text time transformers
        ];
        testDepends = [ base bytestring hlint markdown-unlit time ];
-       jailbreak = true;
        homepage = "http://taylor.fausak.me/strive/";
        description = "A Haskell client for the Strava V3 API";
        license = stdenv.lib.licenses.mit;
@@ -123610,8 +123695,8 @@ self: {
      }:
      mkDerivation {
        pname = "tidal";
-       version = "0.4.32";
-       sha256 = "1vb3ziin58gxf8jpjgv1c04bqa0vhkmib4h3v2s1k66gdkj1sxk2";
+       version = "0.4.33";
+       sha256 = "0xx02wbclq6hh50gz6vj3wmq7d5y7l4d6h48yxg3nwv4kwf44gf6";
        buildDepends = [
          base binary bytestring colour containers hashable hmt hosc
          mersenne-random-pure64 mtl parsec process text time transformers
@@ -127431,8 +127516,8 @@ self: {
      }:
      mkDerivation {
        pname = "uni-uDrawGraph";
-       version = "2.2.0.3";
-       sha256 = "0sh504l3xi9xlmwb28wzsana6c9ahmbdhx05s55w2ffwzbz0ca8a";
+       version = "2.2.1.3";
+       sha256 = "1gblb969s9al67srxf7rd9dajy6hji91aw5zaxxhaj0vgqsdb90j";
        buildDepends = [
          base containers uni-events uni-graphs uni-posixutil uni-reactor
          uni-util
@@ -130678,18 +130763,23 @@ self: {
 
   "wai-cors" = callPackage
     ({ mkDerivation, attoparsec, base, base-unicode-symbols, bytestring
-     , case-insensitive, charset, http-types, mtl, parsers, transformers
-     , wai
+     , case-insensitive, charset, directory, filepath, http-types, mtl
+     , network, parsers, process, text, transformers, wai
+     , wai-websockets, warp, websockets
      }:
      mkDerivation {
        pname = "wai-cors";
-       version = "0.2.2";
-       sha256 = "174ld61b2hl890m591qfwclnb1jdssi9minksvhp34dmawnfwgvc";
+       version = "0.2.3";
+       sha256 = "1mnybcf50d0ijbg2a40kf4sl55rb1m4p02nqqid4g7vcanmfjw92";
        buildDepends = [
          attoparsec base base-unicode-symbols bytestring case-insensitive
          charset http-types mtl parsers transformers wai
        ];
-       homepage = "https://github.com/alephcloud/wai-cors";
+       testDepends = [
+         base base-unicode-symbols directory filepath http-types network
+         process text wai wai-websockets warp websockets
+       ];
+       homepage = "https://github.com/larskuhtz/wai-cors";
        description = "CORS for WAI";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -131383,8 +131473,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-routes";
-       version = "0.6.1";
-       sha256 = "15j37h3a56fsgmznmw8b1ksp0pkrrqz3kyrwj69hba2bnjcq5n7q";
+       version = "0.6.2";
+       sha256 = "04h0npgg6jfpzgg7g6kwbpkg3k148aq9jb3561r8j7fm6jmmynab";
        buildDepends = [
          aeson base blaze-builder bytestring containers http-types mtl
          path-pieces random template-haskell text wai
@@ -133439,11 +133529,10 @@ self: {
      }:
      mkDerivation {
        pname = "wuss";
-       version = "1.0.0";
-       sha256 = "1nv8mkfbgfnlmni0rzlzq7ir27ya3lnhkksfbkywjkbwz2k3yykc";
+       version = "1.0.2";
+       sha256 = "0i4ln8pvjv1cgqcwid111azrls00g1jdhls3wrhnkw8wjcbiiqps";
        buildDepends = [ base bytestring connection network websockets ];
        testDepends = [ base doctest ];
-       jailbreak = true;
        homepage = "http://taylor.fausak.me/wuss/";
        description = "Secure WebSocket (WSS) clients";
        license = stdenv.lib.licenses.mit;
@@ -134291,8 +134380,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-conduit-parse";
-       version = "0.1.0.0";
-       sha256 = "1vf8yxnfw3mr7sphj69y2yds6k5bj9cycflk6dzbx367j1cihc0v";
+       version = "0.2.0.0";
+       sha256 = "08dvaqfwi9gaa6xihyh2mksplid3xlfa3qb22glnmrcn37vxpphx";
        buildDepends = [
          base conduit conduit-parse containers exceptions parsers text
          xml-conduit xml-types
@@ -136984,6 +137073,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-table" = callPackage
+    ({ mkDerivation, base, containers, contravariant, text, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-table";
+       version = "0.1.1";
+       sha256 = "0glbdm19bf0pxp0y2831yi0yxjwc3b9xfhsdimxyc5ppm2dqdxsj";
+       buildDepends = [ base containers contravariant text yesod-core ];
+       jailbreak = true;
+       homepage = "https://github.com/andrewthad/yesod-table";
+       description = "HTML tables for Yesod";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-tableview" = callPackage
     ({ mkDerivation, base, hamlet, persistent, yesod }:
      mkDerivation {
@@ -137200,6 +137303,7 @@ self: {
        homepage = "https://github.com/alephcloud/hs-yet-another-logger";
        description = "Yet Another Logger";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yhccore" = callPackage

From 820c87af1f0a9da2ccb0998c538bafce7cb2e60c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 6 Jun 2015 15:14:47 +0200
Subject: [PATCH 0839/2322] haskell-webwebsockets: disable spuriously failing
 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 ade2055187d..e33e0fe2590 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/ekmett/semigroupoids/issues/35
   semigroupoids = disableCabalFlag super.semigroupoids "doctests";
 
+  # https://github.com/jaspervdj/websockets/issues/104
+  websockets = dontCheck super.websockets;
+
 }

From 05205400186ed5925eb211a7d91b30a831223056 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 7 Jun 2015 00:05:17 +0200
Subject: [PATCH 0840/2322] haskell-bytestring-builder: trigger rebuild with
 GHC 7.8.x to mitiagate broken library ID

---
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 2 +-
 pkgs/development/haskell-modules/lib.nix                     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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 2e95c78c625..4fbb5056837 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -52,7 +52,7 @@ self: super: {
   haddock-api = super.haddock-api_2_15_0_2;
 
   # This is part of bytestring in our compiler.
-  bytestring-builder = dontHaddock super.bytestring-builder;
+  bytestring-builder = triggerRebuild (dontHaddock super.bytestring-builder) 1;
 
   # Won't compile against mtl 2.1.x.
   imports = super.imports.override { mtl = self.mtl_2_2_1; };
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index e601c7665ac..9b47b047bf6 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -77,4 +77,6 @@ rec {
 
   buildStrictly = pkg: buildFromSdist (appendConfigureFlag pkg "--ghc-option=-Wall --ghc-option=-Werror");
 
+  triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; });
+
 }

From d57ef6b523838cf161dbc9fb01173caf3e84954b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 7 Jun 2015 09:21:20 +0200
Subject: [PATCH 0841/2322] liferea: fix build problem hidden by #7524

---
 pkgs/applications/networking/newsreaders/liferea/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 26078c8e583..b260be42d5b 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
   ];
 
   preFixup = ''
-    rm $out/share/icons/hicolor/icon-theme.cache
-
     for f in "$out"/bin/*; do
       wrapProgram "$f" \
         --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \

From deb33d513fd8053d59eeff2a76724247776de8af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 27 May 2015 23:09:13 +0200
Subject: [PATCH 0842/2322] dbus: small update

---
 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 84a18f2a0b5..d114cf17c4e 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -7,8 +7,8 @@ assert x11Support -> libX11 != null
                   && libSM != null;
 
 let
-  version = "1.8.16";
-  sha256 = "01rba8mp8kqvmy6ibdmi806kjr3m14swnskqk02gyhykxxl54ybz";
+  version = "1.8.18";
+  sha256 = "1wn4k142m68d8yqd4i6dmx1ac0798yhkdnkk4mb72g3sfyffpwin";
 
   inherit (stdenv) lib;
 

From 0b216645bd4d9b5460a51476c2e709191f582c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 27 May 2015 23:10:59 +0200
Subject: [PATCH 0843/2322] gtk+ stack: leftover "major" updates

---
 pkgs/development/libraries/at-spi2-atk/default.nix          | 6 +++---
 pkgs/development/libraries/at-spi2-core/default.nix         | 4 ++--
 .../development/libraries/gobject-introspection/default.nix | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index b562a2e5d3d..940fc2bb6cc 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -2,14 +2,14 @@
 , intltool, dbus_glib, at_spi2_core, libSM }:
 
 stdenv.mkDerivation rec {
-  versionMajor = "2.12";
-  versionMinor = "1";
+  versionMajor = "2.16";
+  versionMinor = "0";
   moduleName   = "at-spi2-atk";
   name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "5fa9c527bdec028e06797563cd52d49bcf06f638549df983424d88db89bb1336";
+    sha256 = "1y9gfz1iz3wpja7s000f0bmyyvc6im5fcdl6bxwbz0v3qdgc9vvq";
   };
 
   buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 7128e4d3f2b..a3632bc13fd 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -2,14 +2,14 @@
 , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  versionMajor = "2.12";
+  versionMajor = "2.16";
   versionMinor = "0";
   moduleName   = "at-spi2-core";
   name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "12gvsgdaxnxskndlhlmdkc50cfqgmzfc4n8la9944fz5k3fhwmfv";
+    sha256 = "1l3l39mw23zyjlcqidvkyqlr4gwbhplzw2hcv3qvn6p8ikxpf2qw";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 200c0d4e01d..50fddd9da9f 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -5,7 +5,7 @@
 # In that case its about 6MB which could be separated
 
 let
-  ver_maj = "1.42";
+  ver_maj = "1.44";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
-    sha256 = "3ba2edfad4f71d4f0de16960b5d5f2511335fa646b2c49bbb93ce5942b3f95f7";
+    sha256 = "1b972qg2yb51sdavfvb6kc19akwc15c1bwnbg81vadxamql2q33g";
   };
 
   buildInputs = [ flex bison pkgconfig python ]

From 5df1aadd68a157997c5ff419a8f4e1db23e5a5ae 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 Apr 2015 21:20:54 +0200
Subject: [PATCH 0844/2322] glib hooks: move gsettings-schemas if on wrong
 place

Fixes #7325.
---
 pkgs/development/libraries/glib/setup-hook.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh
index f173744e5ca..8d63af6b9b4 100644
--- a/pkgs/development/libraries/glib/setup-hook.sh
+++ b/pkgs/development/libraries/glib/setup-hook.sh
@@ -10,8 +10,15 @@ make_glib_find_gsettings_schemas() {
 
 envHooks+=(make_glib_find_gsettings_schemas)
 
-glibPreFixupPhase() {
-    addToSearchPath GSETTINGS_SCHEMAS_PATH "$out/share/gsettings-schemas/$name"
+glibFixupPhase() {
+    # Move gschemas in case the install flag didn't help
+    if [ -d "$prefix/share/glib-2.0/schemas" ]; then
+        mkdir -p "$prefix/share/gsettings-schemas/$name/glib-2.0"
+        mv "$prefix/share/glib-2.0/schemas" "$prefix/share/gsettings-schemas/$name/glib-2.0/"
+    fi
+
+    addToSearchPath GSETTINGS_SCHEMAS_PATH "$prefix/share/gsettings-schemas/$name"
 }
 
-preFixupPhases="$preFixupPhases glibPreFixupPhase"
+fixupOutputHooks+=(glibFixupPhase)
+

From 4c475520d9561242fdaf403129b0226010677169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 3 Jun 2015 08:44:12 +0200
Subject: [PATCH 0845/2322] spidermonkey_17: remove *.a to save 8 MB

The sole user (polkit) still builds fine.
Inspired by #8147.
---
 pkgs/development/interpreters/spidermonkey/17.0.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix
index 74f0fe2b83a..41757244c00 100644
--- a/pkgs/development/interpreters/spidermonkey/17.0.nix
+++ b/pkgs/development/interpreters/spidermonkey/17.0.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
     paxmark mr jsapi-tests/jsapi-tests
   '';
 
+  postInstall = ''rm "$out"/lib/*.a''; # halve the output size
+
   meta = with stdenv.lib; {
     description = "Mozilla's JavaScript engine written in C/C++";
     homepage = https://developer.mozilla.org/en/SpiderMonkey;

From 317f4ea72df6f4ec07ef9967a8d286f0ba3de04b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 3 Jun 2015 20:02:03 +0200
Subject: [PATCH 0846/2322] ncurses: header location fixes

- move headers directly to $out/include and set up symlinks.
Some packages were failing to find them (e.g. mariadb).
- postInstall was failing, only it was ignored due to a bug;
now it succeeds.
---
 pkgs/development/libraries/ncurses/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index d6c2ee4fade..19b1b5fe33b 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -54,6 +54,8 @@ stdenv.mkDerivation rec {
     ln -svf $cfg $out/bin/ncurses-config
 
     # Allow for end users who #include <ncurses?w/*.h>
+    mv "$out"/include/ncursesw/* "$out"/include/
+    rmdir "$out"/include/ncursesw
     ln -svf . $out/include/ncursesw
     ln -svf . $out/include/ncurses
 
@@ -83,6 +85,8 @@ stdenv.mkDerivation rec {
     ln -svf $cfg $out/bin/ncurses-config
 
     # Allow for end users who #include <ncurses/*.h>
+    mv "$out"/include/ncurses/* "$out"/include/
+    rmdir "$out"/include/ncurses
     ln -svf . $out/include/ncurses
 
     # Create curses compatability

From 12e84c63784116ee9c4e69516d68c6661ffd5eb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 7 Jun 2015 10:22:20 +0200
Subject: [PATCH 0847/2322] nixos/postfix: make symlink /var/mail ->
 /var/spool/mail

This solves the problem of e.g. mutt not finding mail unless the user
sets MAIL=/var/spool/mail/$USER.

The default MAIL variable seems come from bash. Reasons for adding
symlink instead of changing MAIL default in bash:

- No need to rebuild world
- FHS recommends /var/mail over /var/spool/mail anyway[1]. Better fix
  NixOS mail location than change MAIL in bash to something that doesn't
  work on non-NixOS (however unlikely that users run nixpkgs bash on a
  non-NixOS distro...).

[1] http://www.pathname.com/fhs/pub/fhs-2.3.html#VARMAILUSERMAILBOXFILES
---
 nixos/modules/services/mail/postfix.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 839da7407ef..24bcc6bb57c 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -380,6 +380,7 @@ in
             ${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue
             ${pkgs.coreutils}/bin/chown root:root /var/spool/mail
             ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
+            ${pkgs.coreutils}/bin/ln -sf /var/spool/mail /var/mail
 
             ln -sf "${pkgs.postfix}/share/postfix/conf/"* /var/postfix/conf
 

From dbec88f5643b5fa01e5d9dcf1f039e10acf05ac0 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 7 Jun 2015 12:05:11 +0200
Subject: [PATCH 0848/2322] update caps to 0.9.24

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

diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix
index 49880f6c0f3..b5004291271 100644
--- a/pkgs/applications/audio/caps/default.nix
+++ b/pkgs/applications/audio/caps/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
   name = "caps-${version}";
-  version = "0.9.16";
+  version = "0.9.24";
   src = fetchurl {
     url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2";
-    sha256 = "117l04w2zwqak856lihmaxg6f22vlz71knpxy0axiyri0x82lbwv";
+    sha256 = "081zx0i2ysw5nmy03j60q9j11zdlg1fxws81kwanncdgayxgwipp";
   };
   configurePhase = ''
     echo "PREFIX = $out" > defines.make

From f63a9f25340b8f2a0d4beef7d2f5af3544987bac Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 7 Jun 2015 11:06:54 +0000
Subject: [PATCH 0849/2322] fix libcap for packages depending on pulseaudio

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

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 5de447da0dd..856a22d7bb8 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -45,9 +45,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool autoreconfHook ];
 
+  propagatedBuildInputs =
+    lib.optionals stdenv.isLinux [ libcap ];
+
   buildInputs =
     [ json_c libsndfile speexdsp fftwFloat ]
-    ++ lib.optionals stdenv.isLinux [ libcap glib dbus.libs ]
+    ++ lib.optionals stdenv.isLinux [ glib dbus.libs ]
     ++ lib.optionals (!libOnly) (
       [ libasyncns webrtc-audio-processing ]
       ++ lib.optional jackaudioSupport libjack2

From 8b0b9be025ba5dcc40197c99629e5271b8e0c9ce Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 18 May 2015 10:39:18 +0200
Subject: [PATCH 0850/2322] emacs24: add options for acl and gpm

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

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index 01895647a6b..e0439f45a9c 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
 , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
 , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
-, alsaLib, cairo
+, alsaLib, cairo, acl, gpm
 , withX ? !stdenv.isDarwin
 , withGTK3 ? false, gtk3 ? null
 , withGTK2 ? true, gtk2
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs =
-    [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ]
+    [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm ]
     ++ stdenv.lib.optional stdenv.isLinux dbus
     ++ stdenv.lib.optionals withX
       [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4efc4f3fdb2..b49c2e3b59d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10792,6 +10792,8 @@ let
     gconf = null;
     alsaLib = null;
     imagemagick = null;
+    acl = null;
+    gpm = null;
   };
 
   emacs24-nox = lowPrio (appendToName "nox" (emacs24.override {

From 261dfad8a788d65b204761ab5cfa08fe6dc2323e Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 7 Jun 2015 14:34:43 +0200
Subject: [PATCH 0851/2322] clamav: build mail filter

Provides clamav-milter, a mail filter for sendmail compatible
MTAs.
---
 pkgs/tools/security/clamav/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 350a6f369f0..62ebeb10f48 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl }:
+{ stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl
+, libmilter }:
 stdenv.mkDerivation rec {
   name = "clamav-${version}";
   version = "0.98.6";
@@ -8,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0l99a0shgzpl8rvrrgbm1ki2zxlb7g1n82bhq7f2snj4amfj94b5";
   };
 
-  buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv ];
+  buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter ];
 
   configureFlags = [
     "--with-zlib=${zlib}"
@@ -18,6 +19,7 @@ stdenv.mkDerivation rec {
     "--with-openssl=${openssl}"
     "--with-libncurses-prefix=${ncurses}"
     "--with-libcurl=${curl}"
+    "--enable-milter"
     "--disable-clamav"
   ];
 

From ab8561e3e53081114f0e168aebfa8ce17980faa2 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sun, 7 Jun 2015 15:59:38 +0300
Subject: [PATCH 0852/2322] fix: vim-xkbswitch proper lib

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 49935487afe..d693d9df857 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -294,8 +294,8 @@ rec {
     name = "vim-addon-vim2nix-2015-06-01";
     src = fetchgit {
       url = "git://github.com/JagaJaga/vim-addon-vim2nix";
-      rev = "fc2eeffca48b224ef15beda57586f6d1271ff68d";
-      sha256 = "b626dab117b9331b6f9ff0bf05ac1f479db82a60dd5cb87a0f3a8d3d7de9220e";
+      rev = "cfa1f191b9e427dee77f8054a911a327c3cf4f79";
+      sha256 = "9960dd3248ffc8d2d3b9bf322df2369feb7a6bf54d47253bd65de1988d2e5ec3";
     };
     dependencies = ["vim-addon-manager"];
 
@@ -517,6 +517,10 @@ rec {
       rev = "0854ac6a810daae4a5c99bcae61613266ce75c26";
       sha256 = "886a173d48340ad0ddeb3c852e4f2bdfc7b513a9d5a954115d081a3e276fa655";
     };
+    patchPhase = ''
+      substituteInPlace plugin/xkbswitch.vim \
+              --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so
+    '';
     dependencies = [];
     buildInputs = [ xkb_switch ];
   };

From c25027f2106ab153d71cab1f4db2a60bcba9e276 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 7 Jun 2015 14:57:29 +0200
Subject: [PATCH 0853/2322] openttd: update from 1.4.4 to 1.5.1

---
 pkgs/games/openttd/default.nix              | 10 ++-----
 pkgs/games/openttd/fix-freetype-1.4.4.patch | 31 ---------------------
 2 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/games/openttd/fix-freetype-1.4.4.patch

diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index afef33cce2d..903466524fb 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "openttd-${version}";
-  version = "1.4.4";
+  version = "1.5.1";
 
   src = fetchurl {
     url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz";
-    sha256 = "1xykqb5bx2dzffxhvm4cbn1nf72f7zcdz8hy25i5wky4hfw31x3h";
+    sha256 = "0jcg8b0jbiw5kg7rqqw74hdh675r08pgm95grk9ch4z2gpjpd3n9";
   };
 
   buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ];
@@ -17,12 +17,6 @@ stdenv.mkDerivation rec {
     "--without-liblzo2"
   ];
 
-  # NOTE: Remove this patch in 1.4.5 or greater
-  patches = [
-    # Adapted from svn r27079
-    ./fix-freetype-1.4.4.patch
-  ];
-
   makeFlags = "INSTALL_PERSONAL_DIR=";
 
   postInstall = ''
diff --git a/pkgs/games/openttd/fix-freetype-1.4.4.patch b/pkgs/games/openttd/fix-freetype-1.4.4.patch
deleted file mode 100644
index 37706ce05c9..00000000000
--- a/pkgs/games/openttd/fix-freetype-1.4.4.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/fontcache.cpp b/src/fontcache.cpp
-===================================================================
---- a/src/fontcache.cpp
-+++ b/src/fontcache.cpp
-@@ -537,6 +537,6 @@
- 
- 	/* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */
--	int width  = max(1, slot->bitmap.width + (this->fs == FS_NORMAL));
--	int height = max(1, slot->bitmap.rows  + (this->fs == FS_NORMAL));
-+	unsigned int width  = max(1U, (unsigned int)slot->bitmap.width + (this->fs == FS_NORMAL));
-+	unsigned int height = max(1U, (unsigned int)slot->bitmap.rows  + (this->fs == FS_NORMAL));
- 
- 	/* Limit glyph size to prevent overflows later on. */
-@@ -554,6 +554,6 @@
- 	/* Draw shadow for medium size */
- 	if (this->fs == FS_NORMAL && !aa) {
--		for (int y = 0; y < slot->bitmap.rows; y++) {
--			for (int x = 0; x < slot->bitmap.width; x++) {
-+		for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) {
-+			for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) {
- 				if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) {
- 					sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR;
-@@ -564,6 +564,6 @@
- 	}
- 
--	for (int y = 0; y < slot->bitmap.rows; y++) {
--		for (int x = 0; x < slot->bitmap.width; x++) {
-+	for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) {
-+		for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) {
- 			if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) {
- 				sprite.data[x + y * sprite.width].m = FACE_COLOUR;

From 2a74e84992659c4cea3129d8dde6bd5d346b0779 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 7 Jun 2015 15:18:55 +0200
Subject: [PATCH 0854/2322] pngcrush: update from 1.7.83 to 1.7.85

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

diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix
index f9b7ad8fe64..cc086da5a13 100644
--- a/pkgs/tools/graphics/pngcrush/default.nix
+++ b/pkgs/tools/graphics/pngcrush/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "pngcrush-1.7.83";
+  name = "pngcrush-1.7.85";
 
   src = fetchurl {
     url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
-    sha256 = "0324l1czflplz49i1i3xs72pzi9p4f8h6yk626q5y81fn29kg5mj";
+    sha256 = "1hvcync32x2ign694scafkj7xc73gzyy8n2l5z026yxckilyyv19";
   };
 
   configurePhase = ''

From f68ab19ff54fb6b754350e53094cb5b21127ff53 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sun, 7 Jun 2015 15:19:54 +0200
Subject: [PATCH 0855/2322] slic3r: Update to 1.2.7.

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

diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
index 36669dd8ae8..bfbc66cc0b9 100644
--- a/pkgs/applications/misc/slic3r/default.nix
+++ b/pkgs/applications/misc/slic3r/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.6";
+  version = "1.2.7";
   name = "slic3r-${version}";
 
   src = fetchgit {
     url = "git://github.com/alexrj/Slic3r";
     rev = "refs/tags/${version}";
-    sha256 = "1ymk2n9dw1mpizwg6bxbzq60mg1cwljxlncaasdyakqrkkr22r8k";
+    sha256 = "1bybbl8b0lfh9wkn1k9cxd11hlc5064wzh0fk6zdmc9vnnay399i";
   };
 
   buildInputs = with perlPackages; [ perl makeWrapper which

From 389820e798aeb4f149a7844618e4547657cf96a6 Mon Sep 17 00:00:00 2001
From: Nixpkgs Monitor <none@none>
Date: Sun, 7 Jun 2015 15:21:00 +0200
Subject: [PATCH 0856/2322] weechat: update from 1.1.1 to 1.2, potentially
 fixes CVE-2012-6047, CVE-2012-6554

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

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index fd200af0a42..8825e16b90f 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -4,12 +4,12 @@
 , extraBuildInputs ? [] }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.1";
+  version = "1.2";
   name = "weechat-${version}";
 
   src = fetchurl {
-    url = "http://weechat.org/files/src/weechat-${version}.tar.gz";
-    sha256 = "0j8kc2zsv7ybgq6wi0r8siyd3adl3528gymgmidijd78smbpwbx3";
+    url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
+    sha256 = "0kb8mykhzm7zcxsl6l6cia2n4nc9akiysg0v6d8xb51p3x002ibw";
   };
 
   buildInputs = 

From 4ae0815d3bf068f05aad961adf179d781e4c5829 Mon Sep 17 00:00:00 2001
From: fro_ozen <fro_ozen@gmx.de>
Date: Thu, 4 Jun 2015 23:09:32 +0200
Subject: [PATCH 0857/2322] Add the tewi font

---
 lib/maintainers.nix              |  1 +
 pkgs/data/fonts/tewi/default.nix | 47 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 3 files changed, 50 insertions(+)
 create mode 100644 pkgs/data/fonts/tewi/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 174eced43c2..7f755154814 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -79,6 +79,7 @@
   fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>";
   forkk = "Andrew Okin <forkk@forkk.net>";
   fpletz = "Franz Pletz <fpletz@fnordicwalking.de>";
+  fro_ozen = "fro_ozen <fro_ozen@gmx.de>";
   ftrvxmtrx = "Siarhei Zirukin <ftrvxmtrx@gmail.com>";
   funfunctor = "Edward O'Callaghan <eocallaghan@alterapraxis.com>";
   fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>";
diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix
new file mode 100644
index 00000000000..dfcc0578f00
--- /dev/null
+++ b/pkgs/data/fonts/tewi/default.nix
@@ -0,0 +1,47 @@
+{stdenv, fetchgit, bdftopcf, mkfontdir, mkfontscale}:
+
+stdenv.mkDerivation rec {
+  date = "2015-06-07";
+  name = "tewi-font-${date}";
+
+  src = fetchgit {
+    url = "https://github.com/lucy/tewi-font";
+    rev = "ff930e66ae471da4fdc226ffe65fd1ccd13d4a69";
+    sha256 = "d641b911cc2132a00c311e3d978c1ca454b0fb3bc3ff4b4742b9f765b765a94b";
+  };
+
+  buildInputs = [ bdftopcf mkfontdir mkfontscale ];
+  buildPhase = ''
+    for i in *.bdf; do
+        bdftopcf -o ''${i/bdf/pcf} $i
+    done
+
+    gzip *.pcf
+  '';
+
+  installPhase = ''
+    fontDir="$out/share/fonts/misc"
+    mkdir -p "$fontDir"
+    mv *.pcf.gz "$fontDir"
+
+    cd "$fontDir"
+    mkfontdir
+    mkfontscale
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A nice bitmap font, readable even at small sizes";
+    longDescription = ''
+      Tewi is a bitmap font, readable even at very small font sizes. This is
+      particularily useful while programming, to fit a lot of code on your
+      screen.
+    '';
+    homepage = "https://github.com/lucy/tewi-font";
+    license = {
+      fullName = "GNU General Public License with a font exception";
+      url = "https://www.gnu.org/licenses/gpl-faq.html#FontException";
+    };
+    maintainers = [ maintainers.fro_ozen ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b54674cb65..164b7dee77e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14529,6 +14529,8 @@ let
 
   tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
 
+  tewi-font = callPackage ../data/fonts/tewi  {};
+
   tex4ht = callPackage ../tools/typesetting/tex/tex4ht { };
 
   texFunctions = import ../tools/typesetting/tex/nix pkgs;

From c5993a1988d78bf924701d0b6f42aab2cdbffbd4 Mon Sep 17 00:00:00 2001
From: fro_ozen <fro_ozen@gmx.de>
Date: Fri, 5 Jun 2015 11:04:06 +0200
Subject: [PATCH 0858/2322] Change dina-font's platform to platform.unix

---
 pkgs/data/fonts/dina/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix
index e79dcd014d3..be420df4886 100644
--- a/pkgs/data/fonts/dina/default.nix
+++ b/pkgs/data/fonts/dina/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
     downloadPage = https://www.donationcoder.com/Software/Jibz/Dina/;
     license = licenses.free;
     maintainers = [ maintainers.prikhi ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From fa290cb741cb23a04024f09e2018d5ea7bc0e3a3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 7 Jun 2015 13:44:24 -0500
Subject: [PATCH 0859/2322] qrupdate: build with openblas

Replaces ATLAS and LAPACK with OpenBLAS. Also builds both static and
shared libraries. (Octave upstream recommends the shared library.)
---
 .../libraries/qrupdate/default.nix            | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix
index 465ec7eebb2..aaa9ab8a61a 100644
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ b/pkgs/development/libraries/qrupdate/default.nix
@@ -1,29 +1,34 @@
 { stdenv
 , fetchurl
 , gfortran
-, liblapack
+, openblas
 }:
 stdenv.mkDerivation {
   name = "qrupdate-1.1.2";
   src = fetchurl {
     url = mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz ;
-    sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2";  			
+    sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2";
   };
-  
-  configurePhase = ''
-    export PREFIX=$out
-    sed -i -e 's,^BLAS=.*,BLAS=-L${liblapack}/lib -L${liblapack.blas} -lcblas -lf77blas -latlas,' \
-      -e 's,^LAPACK=.*,LAPACK=-L${liblapack}/lib -llapack -lcblas -lf77blas -latlas,' \
-      Makeconf
-  '';
+
+  configurePhase =
+    ''
+      export PREFIX=$out
+      sed -i -e 's,^BLAS=.*,BLAS=-L${openblas}/lib -lopenblas,' \
+          -e 's,^LAPACK=.*,LAPACK=-L${openblas}/lib -lopenblas,' \
+          Makeconf
+    ''
+    + stdenv.lib.optionalString openblas.blas64
+    ''
+      sed -i Makeconf -e '/^FFLAGS=.*/ s/$/-fdefault-integer-8/'
+    '';
 
   doCheck = true;
 
   checkTarget = "test";
 
-  buildTarget = "lib";
+  buildFlags = [ "lib" "solib" ];
 
-  installTarget = "install-staticlib";
-  
-  buildInputs = [ gfortran liblapack ];
+  installTargets = "install";
+
+  buildInputs = [ gfortran openblas ];
 }

From 614c867b29299668dced9ab705bacebcd433bef3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 7 Jun 2015 13:45:36 -0500
Subject: [PATCH 0860/2322] octave: build with openblas

The expression inherits integer width from OpenBLAS, so Octave will use
64-bit integers if OpenBLAS supports it. However, this feature in Octave
is experimental, so we continue to use OpenBLAS with 32-bit integers by
default. (This only applies to the integer width, the pointer width is
always the platform-native width.)
---
 .../interpreters/octave/default.nix           | 26 ++++++++++++++++---
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 9ad8c2790da..bdf6f775277 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,10 +1,22 @@
 { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull
-, libX11, graphicsmagick, pcre, liblapack, pkgconfig, mesa, fltk
-, fftw, fftwSinglePrec, zlib, curl, qrupdate
+, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk
+, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas
 , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
 , suitesparse ? null, gnuplot ? null, jdk ? null, python ? null
 }:
 
+let
+  suitesparseOrig = suitesparse;
+  qrupdateOrig = qrupdate;
+in
+# integer width is determined by openblas, so all dependencies must be built
+# with exactly the same openblas
+let
+  suitesparse =
+    if suitesparseOrig != null then suitesparseOrig.override { inherit openblas; } else null;
+  qrupdate = if qrupdateOrig != null then qrupdateOrig.override { inherit openblas; } else null;
+in
+
 stdenv.mkDerivation rec {
   version = "4.0.0";
   name = "octave-${version}";
@@ -14,7 +26,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
-    graphicsmagick pcre liblapack pkgconfig mesa fltk zlib curl
+    graphicsmagick pcre pkgconfig mesa fltk zlib curl openblas
     fftw fftwSinglePrec qrupdate ]
     ++ (stdenv.lib.optional (qt != null) qt)
     ++ (stdenv.lib.optional (qscintilla != null) qscintilla)
@@ -34,7 +46,13 @@ stdenv.mkDerivation rec {
   # problems on Hydra
   enableParallelBuilding = false;
 
-  configureFlags = [ "--enable-readline" "--enable-dl" ];
+  configureFlags =
+    [ "--enable-readline"
+      "--enable-dl"
+      "--with-blas=openblas"
+      "--with-lapack=openblas"
+    ]
+    ++ stdenv.lib.optional openblas.blas64 "--enable-64";
 
   # Keep a copy of the octave tests detailed results in the output
   # derivation, because someone may care
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f95e32e951..69c46414c9e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4820,6 +4820,7 @@ let
     glpk = null;
     suitesparse = null;
     jdk = null;
+    openblas = openblasCompat;
   };
   octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
     fltk = fltk13.override { cfg.xftSupport = true; };

From bbf0f7e16f4fa33f9973c413dc52453fd61823be Mon Sep 17 00:00:00 2001
From: Tomasz Kontusz <tomasz.kontusz@gmail.com>
Date: Mon, 8 Jun 2015 00:10:48 +0200
Subject: [PATCH 0861/2322] Bump d-feet to 0.3.9

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

diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix
index df26db519dc..e13145ee71a 100644
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@@ -3,7 +3,7 @@
 , pygobject3, gobjectIntrospection, libwnck3 }:
 
 let
-  version = "${major}.8";
+  version = "${major}.9";
   major = "0.3";
 in
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz";
-    sha256 = "e8423feb18fdff9b1465bf8442b78994ba13c12f8fa3b08e6a2f05768b4feee5";
+    sha256 = "0lvrrbxkvw495jn4vj64r8vd3hng5v0lvagfzcbk5x1f3ky1gybd";
   };
 
   buildInputs = [

From 380c7d1f721b7d5dbb9647906ef318cdcd5d319f Mon Sep 17 00:00:00 2001
From: Tomasz Kontusz <tomasz.kontusz@gmail.com>
Date: Mon, 8 Jun 2015 00:23:46 +0200
Subject: [PATCH 0862/2322] Bump sstp to 1.0.10

---
 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 52ca9ad494f..ed28db45f10 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.9";
+  version = "1.0.10";
 
   src = fetchurl {
     url = "mirror://sourceforge/sstp-client/sstp-client/${version}/sstp-client-${version}.tar.gz";
-    sha256 = "0kpwywbavmlgid07rk8ff0bxp75bnfa1nc28w4j0pkxjhmja5n6k";
+    sha256 = "096lw3a881hjqnffms3bl077pjyq77870kjaf83chhjcakc8942z";
   };
 
   patchPhase =

From 09b95b88a5e4c59d17f44da4c5418bbf2bebddf2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 8 Jun 2015 01:19:07 +0200
Subject: [PATCH 0863/2322] python-packages: add buttersink 0.6.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d3ddc879a17..604f6a91c43 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -974,6 +974,32 @@ let
     };
   };
 
+  buttersink = buildPythonPackage rec {
+    name = "buttersink-0.6.6";
+
+    src = pkgs.fetchurl {
+      sha256 = "1vi0pz8r3d17bsn5g7clkyph7sc0rjzbzqk6rwglaxcah7sfj2mj";
+      url = "https://pypi.python.org/packages/source/b/buttersink/${name}.tar.gz";
+    };
+
+    meta = {
+      description = "Synchronise btrfs snapshots";
+      longDescription = ''
+        ButterSink is like rsync, but for btrfs subvolumes instead of files,
+        which makes it much more efficient for things like archiving backup
+        snapshots. It is built on top of btrfs send and receive capabilities.
+        Sources and destinations can be local btrfs file systems, remote btrfs
+        file systems over SSH, or S3 buckets.
+      '';
+      homepage = https://github.com/AmesCornish/buttersink/wiki;
+      license = licenses.gpl3;
+      platforms = platforms.linux;
+      maintainers = with maintainers; [ nckx ];
+    };
+
+    propagatedBuildInputs = with self; [ boto crcmod psutil ];
+  };
+
   circus = buildPythonPackage rec {
     name = "circus-0.11.1";
 

From b13cb5461433ccf7ae1a2e8d2691c3111441e984 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 6 Jun 2015 22:38:08 +0000
Subject: [PATCH 0864/2322] Bring an importable modulesPath back from the dead,
 in the only way I know

---
 lib/modules.nix                        | 8 ++++++--
 nixos/lib/eval-config.nix              | 1 +
 nixos/modules/misc/extra-arguments.nix | 2 --
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index dcede0c46c6..3561dd0d1d3 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -17,6 +17,10 @@ rec {
      evalModules) and the less declarative the module set is. */
   evalModules = { modules
                 , 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.
+                  specialArgs ? {}
                 , # This would be remove in the future, Prefer _module.args option instead.
                   args ? {}
                 , # This would be remove in the future, Prefer _module.check option instead.
@@ -51,7 +55,7 @@ rec {
         };
       };
 
-      closed = closeModules (modules ++ [ internalModule ]) { inherit config options; lib = import ./.; };
+      closed = closeModules (modules ++ [ internalModule ]) (specialArgs // { inherit config options; lib = import ./.; });
 
       # Note: the list of modules is reversed to maintain backward
       # compatibility with the old module system.  Not sure if this is
@@ -118,7 +122,7 @@ rec {
         config = removeAttrs m ["key" "_file" "require" "imports"];
       };
 
-  applyIfFunction = f: arg@{ config, options, lib }: if isFunction f then
+  applyIfFunction = f: arg@{ config, options, lib, ... }: if isFunction f then
     let
       # Module arguments are resolved in a strict manner when attribute set
       # deconstruction is used.  As the arguments are now defined with the
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index adacbd0863e..97cb85a957f 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -47,6 +47,7 @@ in rec {
     inherit prefix check;
     modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ];
     args = extraArgs;
+    specialArgs = { modulesPath = ../modules; };
   }) config options;
 
   # These are the extra arguments passed to every module.  In
diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix
index c2c8903546d..ff2ff7cd432 100644
--- a/nixos/modules/misc/extra-arguments.nix
+++ b/nixos/modules/misc/extra-arguments.nix
@@ -2,8 +2,6 @@
 
 {
   _module.args = {
-    modulesPath = ../.;
-
     pkgs_i686 = import ../../lib/nixpkgs.nix {
       system = "i686-linux";
       config.allowUnfree = true;

From 757942ddbfdbedcd47d79baef7281f0d27248aaa Mon Sep 17 00:00:00 2001
From: Robbin C <robbinch33@gmail.com>
Date: Mon, 8 Jun 2015 10:31:30 +0800
Subject: [PATCH 0865/2322] wavegain: show correct maintainer

---
 lib/maintainers.nix                          | 1 +
 pkgs/applications/audio/wavegain/default.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 174eced43c2..4b7d48564d9 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -186,6 +186,7 @@
   rickynils = "Rickard Nilsson <rickynils@gmail.com>";
   rob = "Rob Vermaas <rob.vermaas@gmail.com>";
   robberer = "Longrin Wischnewski <robberer@freakmail.de>";
+  robbinch = "Robbin C. <robbinch33@gmail.com>";
   roconnor = "Russell O'Connor <roconnor@theorem.ca>";
   roelof = "Roelof Wobben <rwobben@hotmail.com>";
   romildo = "José Romildo Malaquias <malaquias@gmail.com>";
diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/applications/audio/wavegain/default.nix
index 2ce59f005fd..caf579d8765 100644
--- a/pkgs/applications/audio/wavegain/default.nix
+++ b/pkgs/applications/audio/wavegain/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation {
     homepage = https://github.com/MestreLion/wavegain;
     license = stdenv.lib.licenses.lgpl21;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.devhell ];
+    maintainers = [ stdenv.lib.maintainers.robbinch ];
   };
 }

From e0db2213fc4412176ec06a23db25dcd13cb25d21 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 7 Jun 2015 22:18:02 -0500
Subject: [PATCH 0866/2322] Update qt-5.4.1 -> qt-5.4.2

---
 .../libraries/qt-5/5.4/default.nix            |   2 +-
 .../libraries/qt-5/5.4/manifest.nix           | 300 +++++++++---------
 .../libraries/qt-5/5.4/manifest.sh            |   2 +-
 3 files changed, 152 insertions(+), 152 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
index fce2c7f1b7b..c7e3a5c6123 100644
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/default.nix
@@ -30,7 +30,7 @@ let
     importManifest ./manifest.nix { mirror = "http://download.qt.io"; };
   srcs = mapAttrs (name: manifest: manifest.src) manifest;
 
-  version = "5.4.1";
+  version = "5.4.2";
 
   callPackage = newScope (self // { inherit qtSubmodule; });
 
diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.nix b/pkgs/development/libraries/qt-5/5.4/manifest.nix
index 4647c0eef88..5fdda35f76a 100644
--- a/pkgs/development/libraries/qt-5/5.4/manifest.nix
+++ b/pkgs/development/libraries/qt-5/5.4/manifest.nix
@@ -2,273 +2,273 @@
 { stdenv, fetchurl, mirror }:
 [
   {
-    name = stdenv.lib.nameFromURL "qtwayland-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/32jn5sn8im7andkd6m15s95n48ald7pw-qtwayland-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtbase-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/60xy2xnsl5kwraqkgh8d950nj1pk3kmi-qtbase-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwayland-opensource-src-5.4.1.tar.xz";
-      sha256 = "14npf3lclkb83s8ywla67a1129ia1mbib145s1sk5gqw1dh5wfv5";
-      name = "qtwayland-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz";
+      sha256 = "0x2szpjjvsrpcqw0dd3gsim7b1jv9p716pnllzjbia5mp0hggi4z";
+      name = "qtbase-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtandroidextras-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/604ifwwrzpm96rffszyl11xjirm0w65j-qtandroidextras-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtenginio-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/4iprnq6sm0b1pnxmxb5krip7kk40xqmr-qtenginio-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtandroidextras-opensource-src-5.4.1.tar.xz";
-      sha256 = "0s12hmn2lnlbp7y47v344lyli6wh670dwazl3kkzv9vdv52df4wp";
-      name = "qtandroidextras-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtenginio-opensource-src-5.4.2.tar.xz";
+      sha256 = "082i3fapjw6xs0jkz7x529dn3pb6w1pfli3cjrgvggff86gwlgwn";
+      name = "qtenginio-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtgraphicaleffects-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/wcwaylvnlrfy6d6pc0ka7mkcam846cqb-qtgraphicaleffects-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtserialport-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/l9k1v23ddnhjch5b2p3l28xbqkhz63yl-qtserialport-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtgraphicaleffects-opensource-src-5.4.1.tar.xz";
-      sha256 = "071mz2w25g5svknb97y6yw55sq9171qqd92n3dp4w2qg2blg1qms";
-      name = "qtgraphicaleffects-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtserialport-opensource-src-5.4.2.tar.xz";
+      sha256 = "1h6p5rb0ldxgzd4md3n79gy0j9blhj736670xqjd9vlvh1743kck";
+      name = "qtserialport-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtenginio-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/k7gayy35qqwbaf2yyr1lfydmsp6p9k3i-qtenginio-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtscript-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/n4ixnakw3fiflyimshkp43h7ijlpiif6-qtscript-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtenginio-opensource-src-5.4.1.tar.xz";
-      sha256 = "0yjpx43qy6yc6hblcrkp6g9jv2ipg2hdd27q86y7s30q54f17nxf";
-      name = "qtenginio-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtscript-opensource-src-5.4.2.tar.xz";
+      sha256 = "0izsmy0cr8iii78r10ndkidyljxqd2k9g03f5xb9nxacvr2f8hp0";
+      name = "qtscript-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtwebengine-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/0y1p0ssxbd8wp4vyq5ad2f77inh07p1b-qtwebengine-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtwebchannel-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/qbkqkn4ck0fqbndl9fzp7iaz6c475xq8-qtwebchannel-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebengine-opensource-src-5.4.1.tar.xz";
-      sha256 = "1c5akxh6wxgc72md6802fbvd601n03assv6i542siwmmnp5anhij";
-      name = "qtwebengine-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebchannel-opensource-src-5.4.2.tar.xz";
+      sha256 = "0vy1zjbghfa1wirxd8fd2n2n8yryykzr09913qm2nlfbcxdsgqsn";
+      name = "qtwebchannel-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtmacextras-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/0mdhndcp51g2160559kgd5a93c0c3317-qtmacextras-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtwinextras-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/9kmig3lg8d8s5r1jl3xj5q3jrkp3p8sx-qtwinextras-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtmacextras-opensource-src-5.4.1.tar.xz";
-      sha256 = "0hivjn3yfidzj4la3rlrqzjawrakxyhc886w2jcf0bjz3vzl9xp2";
-      name = "qtmacextras-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwinextras-opensource-src-5.4.2.tar.xz";
+      sha256 = "0sgybvr1y2xsddlqc95ninxj3rfmd4gv7a8f7rqcxdynjan5gij0";
+      name = "qtwinextras-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qttranslations-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/hhana1500hq2h2l8815wq8rfrp7nizpb-qttranslations-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtwebsockets-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/zk4s5pgp3mh6xdq6z3svi305vn0pli27-qtwebsockets-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qttranslations-opensource-src-5.4.1.tar.xz";
-      sha256 = "0hchmz7hjdjx0wn2v9sbgilvi0pigiriklw5pdvfxjabjxgh8k9w";
-      name = "qttranslations-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebsockets-opensource-src-5.4.2.tar.xz";
+      sha256 = "0lv1la8333qnirxmscs42xnnra0xry1gjbhi3bxrf1hrfs2im9j4";
+      name = "qtwebsockets-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtwebchannel-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/qfa1hycl1lh8pm2x65frxlms3waqbsfg-qtwebchannel-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtmultimedia-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/n8wpy6b8jw1rf51z1qhxbbym7j8rr8ay-qtmultimedia-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebchannel-opensource-src-5.4.1.tar.xz";
-      sha256 = "0ldjyyp0ym3hndd0bq5mwjry2yilf1cv9iddqb8adz46k3nbkb64";
-      name = "qtwebchannel-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtmultimedia-opensource-src-5.4.2.tar.xz";
+      sha256 = "0h29cs8ajnjarhjx1aczdnxqwvg6pqs9s8w28hw488s149wqqrnj";
+      name = "qtmultimedia-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtdoc-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/hif7dg37sz0yjj09844f0gyqqsf9cpxx-qtdoc-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtgraphicaleffects-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/2q2vk530mf32zzd1v8bpax8iixviw6q5-qtgraphicaleffects-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtdoc-opensource-src-5.4.1.tar.xz";
-      sha256 = "1afg2lxyxgqhq02a58c9yshvkinlk5mw19yff1421fma6j925c8q";
-      name = "qtdoc-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtgraphicaleffects-opensource-src-5.4.2.tar.xz";
+      sha256 = "02p8xm5ajicjam30ry3g1lm2p4nja2q0sls8dzimqrxhw5xlg3xs";
+      name = "qtgraphicaleffects-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtwebkit-examples-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/shz5132xvpp2hvmsyl1mhps0qanrgw43-qtwebkit-examples-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtxmlpatterns-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/3fqgpa668hb1xmwjw056cw58qzb3r0g4-qtxmlpatterns-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-examples-opensource-src-5.4.1.tar.xz";
-      sha256 = "02kj4rw40s7xhdz1ixfy5fc7n5pr2ipqkpwj1kwng71l3jrpn60r";
-      name = "qtwebkit-examples-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtxmlpatterns-opensource-src-5.4.2.tar.xz";
+      sha256 = "0ar7znqp1i02ha5ngy2kzk3hlgkafjbn2xa8j2k78gzmwsmdhzxa";
+      name = "qtxmlpatterns-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtbase-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/nl8rm1q2sqyq5y91h6d9dbks82krykn1-qtbase-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qttranslations-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/mg9b5z2nznzxrz501hm06b7l27jjwaca-qttranslations-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz";
-      sha256 = "1dxigzgv6xj5lybs654y57ssfbl38dxff3s3wpvw0n89hf9sax45";
-      name = "qtbase-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qttranslations-opensource-src-5.4.2.tar.xz";
+      sha256 = "0b4l69c16z8gjd4mq75zz3lj2gxarr9wyk0vk60jg1mi62vxvdls";
+      name = "qttranslations-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qttools-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/f9cbf92nhmfkz1q2n4nidh432s5d3pls-qttools-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtdeclarative-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/bjmv4fgphx9bggzcwy4lcdas9phbwjsg-qtdeclarative-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qttools-opensource-src-5.4.1.tar.xz";
-      sha256 = "0whzcwgzwh1m6fqb7h2gvkx9hi2ijjaz8ap36jqr8cc4ff2hzphi";
-      name = "qttools-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtdeclarative-opensource-src-5.4.2.tar.xz";
+      sha256 = "1bj1wwms6lpj8s70y8by3j0hjsw6g9v8m6fybx68krzzizbj2c5p";
+      name = "qtdeclarative-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qt5-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/hl5gzwaq43afs2z7ga10161myzz3xrwb-qt5-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtwebkit-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/pfhq8ask8jhzdh2x882d014b10ddywma-qtwebkit-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qt5-opensource-src-5.4.1.tar.xz";
-      sha256 = "01xgf3531q60vrkg1pp07q4p0ildj42zgnw63v8fnwjg7c5m59rd";
-      name = "qt5-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-opensource-src-5.4.2.tar.xz";
+      sha256 = "0vffbpiczag2n2hp5gc0nii8n7vkidr8f8pp8a47px0183hl6hiy";
+      name = "qtwebkit-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtquick1-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/9y9qhciiqys5sm502bbflqzrjmvxpqh6-qtquick1-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtquick1-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/n807cxddkvhbzw3ciqs29zc5mw47z2qs-qtquick1-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtquick1-opensource-src-5.4.1.tar.xz";
-      sha256 = "0ba3r89j75vrjgh8h3ik64x84bhgbckc4bvy1wympwgfhk3j8lzb";
-      name = "qtquick1-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtquick1-opensource-src-5.4.2.tar.xz";
+      sha256 = "0178z15a31fw3l6933fwxs7sk0csifpwckydp3rqnn3fg5f2fwvp";
+      name = "qtquick1-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtwebsockets-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/cmvv503q10qnmmbb8yxvvjlxpqqaswyb-qtwebsockets-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtquickcontrols-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/gq8afk8zr2vrrsfmp4caqv02209qk9xb-qtquickcontrols-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebsockets-opensource-src-5.4.1.tar.xz";
-      sha256 = "0i5bcxlwxbzq9k0kq1m90cbslby05x3j3r6js8xjarz2qnc6zxfs";
-      name = "qtwebsockets-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtquickcontrols-opensource-src-5.4.2.tar.xz";
+      sha256 = "137z3c3drxlvkdfc7zgcl0xqmavw0ladzqy0i3bq51h756qdc877";
+      name = "qtquickcontrols-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtsensors-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/9c4zpbngylc7cqqyai2ysglajapphxp7-qtsensors-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtimageformats-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/cmpx0338z1j0wzk6scfpay5k10023d46-qtimageformats-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtsensors-opensource-src-5.4.1.tar.xz";
-      sha256 = "1y6vbvvcgph466whcc896lkyk2lx8lyyqj1qnm76f3jjywp8wjxc";
-      name = "qtsensors-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtimageformats-opensource-src-5.4.2.tar.xz";
+      sha256 = "1nny6j9pm5ri3n1vwl5lrfrdz0fl81rx127wa49rkg2rjai2aawb";
+      name = "qtimageformats-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtx11extras-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/njkpa0ahd4l5307b4qmqlqiv4nw1by7z-qtx11extras-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtdoc-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/jv4wgs6pz9xqmin9m4q4mifr2vfcjn3h-qtdoc-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtx11extras-opensource-src-5.4.1.tar.xz";
-      sha256 = "0blcdqccxhdqj4v5zp6m34b74nw5n6pfgldyb6wrlpljkzdir9i0";
-      name = "qtx11extras-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtdoc-opensource-src-5.4.2.tar.xz";
+      sha256 = "15lamv6jvd7v33ldpcrazcdksv6qibdcgh4ncbyh774k8avgrlh8";
+      name = "qtdoc-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtmultimedia-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/q2ji7ilipdvx0p6iyrwhhfczzw1j11ws-qtmultimedia-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtwayland-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/qa3yi9lyx2dm4wqzb3qzvzba1sgnj74z-qtwayland-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtmultimedia-opensource-src-5.4.1.tar.xz";
-      sha256 = "0kjk3q7y2lr8a62rdidhn783jrq1rpj11p1jmfiw8z3j255dsc1q";
-      name = "qtmultimedia-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwayland-opensource-src-5.4.2.tar.xz";
+      sha256 = "14pmpkfq70plw07igxjaiji4vnjg5kg7izlb0wwym1lisg7bwkg0";
+      name = "qtwayland-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtactiveqt-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/ikxpk38h1arms4x0qlnd7g5g3fg26fg4-qtactiveqt-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtmacextras-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/wdq1z3bzr9n11yln8avx10sgzgyvp8cl-qtmacextras-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtactiveqt-opensource-src-5.4.1.tar.xz";
-      sha256 = "14984cvh9cfnrgls40i28fjdhs015izzlvwck9va4167y3ix4zbx";
-      name = "qtactiveqt-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtmacextras-opensource-src-5.4.2.tar.xz";
+      sha256 = "0h0p3s0rvd3g9rgr4hwcggdbsav2g30vijqwmdxgxd8c00yply80";
+      name = "qtmacextras-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtxmlpatterns-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/0a30a874s507fmrsd1jlggbh9j953jb9-qtxmlpatterns-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtactiveqt-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/0ik7vc3zwdjvrp4fpyqf1zpyqdxvvqvq-qtactiveqt-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtxmlpatterns-opensource-src-5.4.1.tar.xz";
-      sha256 = "062kqs8m9js8mlld1lsm01prq57zs88g7p8fad84a5gisgs2y57m";
-      name = "qtxmlpatterns-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtactiveqt-opensource-src-5.4.2.tar.xz";
+      sha256 = "014kwficqydciwdm1yw88yms81qm8pmi6xfhhfpbc9k85pc6jlla";
+      name = "qtactiveqt-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtscript-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/cbb46kpmk6radk9v8cyngxcxr11g06f6-qtscript-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtlocation-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/sa4dawsw2wv45ld3afbz9nfc64qkyx1s-qtlocation-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtscript-opensource-src-5.4.1.tar.xz";
-      sha256 = "1bybzcp9smasw0syvb7vrz85jq124r7gywz2msgjg1kb6z4aqcpl";
-      name = "qtscript-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtlocation-opensource-src-5.4.2.tar.xz";
+      sha256 = "1v43hl2zzi90vaw11y8dvsksrjn0r2v0br7pw6njl8lqadpg4jnw";
+      name = "qtlocation-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtquickcontrols-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/h5hg9z346lh2w8whf0zgq5kbwffpmnkk-qtquickcontrols-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtconnectivity-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/v2aiscvf582azyzg696rglway56l7xl2-qtconnectivity-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtquickcontrols-opensource-src-5.4.1.tar.xz";
-      sha256 = "1hpvbjr76q9i2idgmblr80khhjgkn78q0s0d648r3axp232m427y";
-      name = "qtquickcontrols-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtconnectivity-opensource-src-5.4.2.tar.xz";
+      sha256 = "1nj68bzgm3r1gg171kj0acnifzb3jx0m5pf4f81xb7zl4hfxasrs";
+      name = "qtconnectivity-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtimageformats-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/7vxgal1cag6cakigc7h3rjvvr64b7sd3-qtimageformats-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtx11extras-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/nz62qld9h96z5a0b7fg52fsh5d6q0kqw-qtx11extras-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtimageformats-opensource-src-5.4.1.tar.xz";
-      sha256 = "0vw4bg68kwp48v49ds2vxvgjc82i5q5scff4013y5gpbd2smnv1z";
-      name = "qtimageformats-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtx11extras-opensource-src-5.4.2.tar.xz";
+      sha256 = "0jgyywjxavfpiz8202g3s0g9izfl185mmak4fs9h80w1i3gn5zzn";
+      name = "qtx11extras-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtserialport-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/pgcv75a5x56s88qclqvbw04dzywcxm73-qtserialport-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qttools-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/i8n6xrhalg3z4i0min4w79rq9h9hch0x-qttools-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtserialport-opensource-src-5.4.1.tar.xz";
-      sha256 = "1zyhlpmh7yisk9qpk8map0myam4bkm4jvp0wcnd4d7pldf19xnbr";
-      name = "qtserialport-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz";
+      sha256 = "1d5nx01r7wxhdg9f1i9xhsvsbwgaz3yv516s068riy970bhdgwzd";
+      name = "qttools-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtwebkit-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/p8jka7s4la8f83xqnl1a4ivdw95dajb8-qtwebkit-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtsensors-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/0ar28gp8klqxynjnc1r4kj9x7g8cknk2-qtsensors-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-opensource-src-5.4.1.tar.xz";
-      sha256 = "1gqrf5g07q5bgr3vnfnsw5qwqd0fjyh4pgqphrvxq4x9z0g221v6";
-      name = "qtwebkit-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtsensors-opensource-src-5.4.2.tar.xz";
+      sha256 = "1yawvjbdymgw8af7ir9zcin89xxck9dm2l6hnc43lwrky0frcvcf";
+      name = "qtsensors-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtconnectivity-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/ggn5pkvp89qh12vzhhk572s38vg3zn72-qtconnectivity-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtwebengine-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/ikr8cc3bn62jlv9afpzhxvqs5qhsc2yc-qtwebengine-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtconnectivity-opensource-src-5.4.1.tar.xz";
-      sha256 = "0q13gg7fmfb7cfq403ql8s5qi6s9a4fd86i7v9r6cwgnj2szzi42";
-      name = "qtconnectivity-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebengine-opensource-src-5.4.2.tar.xz";
+      sha256 = "06cyl733prakniqrn8sd807lclk5im2vmysjdcijry2mcyah2ih8";
+      name = "qtwebengine-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtlocation-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/pnblj6ncfvz4id84asjlnrxb2papsn1v-qtlocation-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtsvg-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/0llm31zpiaqig940a8dsp1dk2npxsnjc-qtsvg-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtlocation-opensource-src-5.4.1.tar.xz";
-      sha256 = "113rx43349f7yn4crhgg6ciz6lyvfvfnc0vkdaz09a2r461hr7w8";
-      name = "qtlocation-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtsvg-opensource-src-5.4.2.tar.xz";
+      sha256 = "1dsyncp154xvb7d82nmnfjm0ngymnhqmliq58ljwxsjmpjlncakz";
+      name = "qtsvg-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtdeclarative-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/0bz5yxqc9yg94jyjkvsgn7h7lph99a5v-qtdeclarative-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qt5-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/0jrx1clg8vqid9b2n9z8f0xbwjm0yynr-qt5-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtdeclarative-opensource-src-5.4.1.tar.xz";
-      sha256 = "05s4imk7whm2qir9byb35dn2ndqb7c5r2cnxpv2qyjla58j4w4hm";
-      name = "qtdeclarative-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qt5-opensource-src-5.4.2.tar.xz";
+      sha256 = "17a0pybr4bpyv9pj7cr5hl4g31biv89bjr8zql723h0b12ql1w44";
+      name = "qt5-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtwinextras-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/xdbwakyhif8cjwyii7v32zkxlrbrksmc-qtwinextras-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtwebkit-examples-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/6pmmi9bjbdxkbw2xkkc1srk5ambnjcxv-qtwebkit-examples-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwinextras-opensource-src-5.4.1.tar.xz";
-      sha256 = "01ddgvq8wny162njlzqnbphiiw565xsqy6h3s39cipa05c6mxblv";
-      name = "qtwinextras-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-examples-opensource-src-5.4.2.tar.xz";
+      sha256 = "0pm9ik1j09jfb5xflc16449nff2xsfyfms7vxlcdjg4dhcqfmll8";
+      name = "qtwebkit-examples-opensource-src-5.4.2.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "qtsvg-opensource-src-5.4.1.tar.xz" ".tar";
-    store = "/nix/store/m3wk5r1ihbrjz9zpi57nllzqzha06c8j-qtsvg-opensource-src-5.4.1.tar.xz";
+    name = stdenv.lib.nameFromURL "qtandroidextras-opensource-src-5.4.2.tar.xz" ".tar";
+    store = "/nix/store/grrsklibvplaj5pdwjp2zirxmqnq10hf-qtandroidextras-opensource-src-5.4.2.tar.xz";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtsvg-opensource-src-5.4.1.tar.xz";
-      sha256 = "0b71kngnq7c5ry8bkb0rjlr6xx49h1sd25m4i4s3v1rfrv6912my";
-      name = "qtsvg-opensource-src-5.4.1.tar.xz";
+      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtandroidextras-opensource-src-5.4.2.tar.xz";
+      sha256 = "0krfm0wg26x7575p8isswdhrkb0jxyp169grwklil7mfw8yg3xhx";
+      name = "qtandroidextras-opensource-src-5.4.2.tar.xz";
     };
   }
 ]
diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.sh b/pkgs/development/libraries/qt-5/5.4/manifest.sh
index 0da13f204ba..d4441cecbb3 100755
--- a/pkgs/development/libraries/qt-5/5.4/manifest.sh
+++ b/pkgs/development/libraries/qt-5/5.4/manifest.sh
@@ -5,7 +5,7 @@ if [ $# -eq 0 ]; then
   # The extra slash at the end of the URL is necessary to stop wget
   # from recursing over the whole server! (No, it's not a bug.)
   $(nix-build ../../../../.. -A autonix.manifest) \
-    http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/ \
+    http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/ \
       -A '*.tar.xz'
 
 else

From bdcb721546f81c4b2c31eb84d94f10d91f1031ca Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Jun 2015 16:14:43 -0700
Subject: [PATCH 0867/2322] java: Refactor top level and build ordering

---
 .../compilers/openjdk/bootstrap.nix           | 41 +++++++------
 .../development/compilers/openjdk/default.nix |  6 +-
 .../compilers/openjdk/openjdk8.nix            |  7 ++-
 pkgs/top-level/all-packages.nix               | 61 ++++++++-----------
 4 files changed, 56 insertions(+), 59 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix
index 890064538cc..bc63292a145 100644
--- a/pkgs/development/compilers/openjdk/bootstrap.nix
+++ b/pkgs/development/compilers/openjdk/bootstrap.nix
@@ -4,30 +4,33 @@ let
   # !!! These should be on nixos.org
   src = if glibc.system == "x86_64-linux" then
     fetchurl {
-      url = http://tarballs.nixos.org/openjdk-bootstrap-x86_64-linux-2012-08-24.tar.xz;
-      sha256 = "0gla9dxrfq2w1hvgsnn8jg8a60k27im6z43a6iidi0qmwa0wah32";
+      url = http://pub.wak.io/nixos/tarballs/openjdk-bootstrap-x86_64-linux.tar.xz;
+      sha256 = "13m3df54mnr2nb67284s2zf5n8y502ck47gc39lcafrh40hzjil5";
     }
   else if glibc.system == "i686-linux" then
     fetchurl {
-      url = http://tarballs.nixos.org/openjdk-bootstrap-i686-linux-2012-08-24.tar.xz;
-      sha256 = "184wq212bycwbbq4ix8cc6jwjxkrqw9b01zb86q95kqpa8zy5206";
+      url = http://pub.wak.io/nixos/tarballs/openjdk-bootstrap-i686-linux.tar.xz;
+      sha256 = "18kzv4h9skxg5g5c7ar2ji3qny880h5svcn207b4d6xv4sa0a6ks";
     }
   else throw "No bootstrap for system";
-in
 
-runCommand "openjdk-bootstrap" {} ''
-  tar xvf ${src}
-  mv openjdk-bootstrap $out
+  bootstrap = runCommand "openjdk-bootstrap" {
+    passthru.home = "${bootstrap}/lib/openjdk";
+  } ''
+    tar xvf ${src}
+    mv openjdk-bootstrap $out
 
-  for i in $out/bin/*; do
-    patchelf --set-interpreter ${glibc}/lib/ld-linux*.so.2 $i
-  done
+    for i in $out/bin/*; do
+      patchelf --set-interpreter ${glibc}/lib/ld-linux*.so.2 $i || true
+      patchelf --set-rpath ${glibc}/lib:$out/lib $i || true
+    done
 
-  # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings:
-  exes=$(${file}/bin/file $out/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
-  for file in $exes; do
-    paxmark m "$file"
-    # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
-    ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''}
-  done
-''
+    # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings:
+    exes=$(${file}/bin/file $out/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
+    for file in $exes; do
+      paxmark m "$file"
+      # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
+      ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''}
+    done
+  '';
+in bootstrap
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index beab781c88d..323bf78ec59 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype
-, which, jdk, nettools, xorg, file
+, which, bootjdk, nettools, xorg, file
 , fontconfig, cpio, cacert, perl, setJavaClassPath }:
 
 let
@@ -15,7 +15,7 @@ let
     else
       throw "openjdk requires i686-linux or x86_64 linux";
 
-  update = "65";
+  update = "80";
 
   build = "32";
 
@@ -81,7 +81,7 @@ let
       "COMPILER_PATH="
       "DEVTOOLS_PATH="
       "UNIXCOMMAND_PATH="
-      "BOOTDIR=${jdk}"
+      "BOOTDIR=${bootjdk.home}"
       "STATIC_CXX=false"
       "UNLIMITED_CRYPTO=1"
       "FULL_DEBUG_SYMBOLS=0"
diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix
index 132f0f31b87..4406c72e229 100644
--- a/pkgs/development/compilers/openjdk/openjdk8.nix
+++ b/pkgs/development/compilers/openjdk/openjdk8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, openjdk, cacert, perl, liberation_ttf, fontconfig } :
+{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig } :
 let
   update = "40";
   build = "27";
@@ -44,7 +44,7 @@ let
   buildInputs = [ cpio file which unzip zip
                   xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst
                   xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir
-                  cups freetype alsaLib openjdk perl liberation_ttf fontconfig ];
+                  cups freetype alsaLib perl liberation_ttf fontconfig bootjdk ];
   setSourceRoot = ''
     sourceRoot="jdk8u${update}-jdk8u${update}-b${build}";
   '';
@@ -82,10 +82,11 @@ let
     "--with-override-jaxws=../jaxws-${repover}"
     "--with-override-jaxp=../jaxp-${repover}"
     "--with-override-nashorn=../nashorn-${repover}"
-    "--with-boot-jdk=${openjdk}/lib/openjdk/"
+    "--with-boot-jdk=${bootjdk.home}"
     "--with-update-version=${update}"
     "--with-build-number=b${build}"
     "--with-milestone=fcs"
+    "--disable-debug-symbols"
   ];
   NIX_LDFLAGS= "-lfontconfig";
   buildFlags = "all";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b49c2e3b59d..18e0f49499d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3905,23 +3905,25 @@ let
 
   gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };
 
-  icedtea7_jdk = callPackage ../development/compilers/icedtea rec {
-    jdk = openjdk;
+  icedtea7 = callPackage ../development/compilers/icedtea rec {
+    bootjdk = openjdk-bootstrap;
     giflib = giflib_5_0;
-  } // { outputs = [ "out" ]; };
+  };
 
-  icedtea7_jre = (lib.setName "icedtea7-${lib.getVersion pkgs.icedtea7_jdk.jre}" (lib.addMetaAttrs
-    { description = "Free Java runtime environment based on OpenJDK 7.0 and the IcedTea project"; }
-    pkgs.icedtea7_jdk.jre)) // { outputs = [ "jre" ]; };
+  # There will not likely be an icedtea8 so users should move to openjdk
+  icedtea = icedtea7;
 
   icedtea7_web = callPackage ../development/compilers/icedtea-web {
-    jdk = icedtea7_jdk;
+    jdk = jdk7;
     xulrunner = firefox;
   };
 
-  icedtea_jdk = icedtea7_jdk;
-  icedtea_jre = icedtea7_jre;
-  icedtea_web = icedtea7_web;
+  icedtea8_web = callPackage ../development/compilers/icedtea-web {
+    jdk = jdk8;
+    xulrunner = firefox;
+  };
+
+  icedtea_web = icedtea8_web;
 
   ikarus = callPackage ../development/compilers/ikarus { };
 
@@ -3929,34 +3931,25 @@ let
 
   path64 = callPackage ../development/compilers/path64 { };
 
-  openjdk =
-    if stdenv.isDarwin then
-      callPackage ../development/compilers/openjdk-darwin { }
-    else
-      let
-        openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { };
-      in (callPackage ../development/compilers/openjdk {
-        jdk = openjdkBootstrap;
-      }) // { outputs = [ "out" ]; };
+  openjdk-bootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { };
 
-  openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix { } // { outputs = [ "out" ]; };
+  openjdk-darwin = callPackage ../development/compilers/openjdk-darwin { };
 
-  # FIXME: Need a way to set per-output meta attributes.
-  openjre = (lib.setName "openjre-${lib.getVersion pkgs.openjdk.jre}" (lib.addMetaAttrs
-    { description = "The open-source Java Runtime Environment"; }
-    pkgs.openjdk.jre)) // { outputs = [ "jre" ]; };
+  openjdk7 = callPackage ../development/compilers/openjdk {
+    bootjdk = openjdk-bootstrap;
+  };
 
-  jdk = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
-    then pkgs.icedtea_jdk
-    else if stdenv.isDarwin
-      then pkgs.openjdk # TODO: Use icedtea for darwin
-      else pkgs.oraclejdk;
+  openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix {
+    bootjdk = openjdk-bootstrap;
+  };
 
-  jre = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
-    then pkgs.icedtea_jre
-    else if stdenv.isDarwin
-      then pkgs.openjre # TODO: Use icedtea for darwin
-      else pkgs.oraclejre;
+  openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8;
+
+  jdk7 = icedtea7;
+
+  jdk8 = openjdk8;
+
+  jdk = if stdenv.isDarwin then openjdk-darwin else jdk8;
 
   oraclejdk = pkgs.jdkdistro true false;
 

From 0cc68fa478f26b802d1c82ef13ba055a745efbca Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Jun 2015 21:55:09 -0700
Subject: [PATCH 0868/2322] openjdk-make-bootstrap: Use openjdk8

---
 .../compilers/openjdk/make-bootstrap.nix      | 39 +++++++++++--------
 .../compilers/openjdk/openjdk8.nix            | 12 +++---
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/make-bootstrap.nix b/pkgs/development/compilers/openjdk/make-bootstrap.nix
index 090a1479741..aac54417e2a 100644
--- a/pkgs/development/compilers/openjdk/make-bootstrap.nix
+++ b/pkgs/development/compilers/openjdk/make-bootstrap.nix
@@ -1,26 +1,31 @@
 { runCommand, openjdk, nukeReferences }:
 
-let arch = openjdk.architecture; in
-
 runCommand "${openjdk.name}-bootstrap.tar.xz" {} ''
-  mkdir -p openjdk-bootstrap/bin
-  mkdir -p openjdk-bootstrap/lib
-  mkdir -p openjdk-bootstrap/jre/lib/{security,ext,${arch}/{jli,server,client,headless}}
-  cp ${openjdk}/bin/{idlj,ja{va{,c,p,h},r},rmic} openjdk-bootstrap/bin
-  cp ${openjdk}/lib/tools.jar openjdk-bootstrap/lib
-  cp ${openjdk}/jre/lib/{meta-index,{charsets,jce,jsse,rt,resources}.jar,currency.data} openjdk-bootstrap/jre/lib
-  cp ${openjdk}/jre/lib/security/java.security openjdk-bootstrap/jre/lib/security
-  cp ${openjdk}/jre/lib/ext/{meta-index,sunjce_provider.jar} openjdk-bootstrap/jre/lib/ext
-  cp ${openjdk}/jre/lib/${arch}/{jvm.cfg,lib{awt,java,verify,zip,nio,net}.so} openjdk-bootstrap/jre/lib/${arch}
-  cp ${openjdk}/jre/lib/${arch}/jli/libjli.so openjdk-bootstrap/jre/lib/${arch}/jli
-  cp ${openjdk}/jre/lib/${arch}/server/libjvm.so openjdk-bootstrap/jre/lib/${arch}/server
-  cp ${openjdk}/jre/lib/${arch}/client/libjvm.so openjdk-bootstrap/jre/lib/${arch}/client ||
-    rmdir openjdk-bootstrap/jre/lib/${arch}/client
-  cp ${openjdk}/jre/lib/${arch}/headless/libmawt.so openjdk-bootstrap/jre/lib/${arch}/headless
-  cp -a ${openjdk}/include openjdk-bootstrap
+  mkdir -pv openjdk-bootstrap/lib
+
+  # Do a deep copy of the openjdk
+  cp -vrL ${openjdk.home} openjdk-bootstrap/lib
+
+  # Includes are needed for building the native jvm
+  cp -vrL ${openjdk}/include openjdk-bootstrap
+
+  # The binaries are actually stored in the openjdk lib
+  ln -sv lib/openjdk/bin openjdk-bootstrap/bin
+  find . -name libjli.so
+  (cd openjdk-bootstrap/lib; find . -name libjli.so -exec ln -sfv {} libjli.so \;)
 
   chmod -R +w openjdk-bootstrap
+
+  # Remove components we don't need
+  find openjdk-bootstrap -name \*.diz -exec rm {} \;
+  find openjdk-bootstrap -name \*.ttf -exec rm {} \;
+  find openjdk-bootstrap -name \*.gif -exec rm {} \;
+  find openjdk-bootstrap -name src.zip -exec rm {} \;
+  rm -rf openjdk-bootstrap/lib/openjdk/jre/bin
+
+  # Remove all of the references to the native nix store
   find openjdk-bootstrap -print0 | xargs -0 ${nukeReferences}/bin/nuke-refs
 
+  # Create the output tarball
   tar cv openjdk-bootstrap | xz > $out
 ''
diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix
index 4406c72e229..8226f2ea146 100644
--- a/pkgs/development/compilers/openjdk/openjdk8.nix
+++ b/pkgs/development/compilers/openjdk/openjdk8.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig } :
+{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig
+
+, minimal ? false } :
 let
   update = "40";
   build = "27";
@@ -66,7 +68,6 @@ let
     ./read-truststore-from-env-jdk8.patch
     ./currency-date-range-jdk8.patch
     ./JDK-8074312-hotspot.patch
-
   ];
   preConfigure = ''
     chmod +x configure
@@ -84,11 +85,11 @@ let
     "--with-override-nashorn=../nashorn-${repover}"
     "--with-boot-jdk=${bootjdk.home}"
     "--with-update-version=${update}"
-    "--with-build-number=b${build}"
+    "--with-build-number=${build}"
     "--with-milestone=fcs"
     "--disable-debug-symbols"
-  ];
-  NIX_LDFLAGS= "-lfontconfig";
+  ] ++ stdenv.lib.optional minimal "--disable-headful";
+  NIX_LDFLAGS= if minimal then null else "-lfontconfig";
   buildFlags = "all";
   installPhase = ''
     mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
@@ -142,7 +143,6 @@ let
 
     ln -s $out/lib/openjdk/bin $out/bin
     ln -s $jre/lib/openjdk/jre/bin $jre/bin
-
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18e0f49499d..51dc6609660 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3933,6 +3933,10 @@ let
 
   openjdk-bootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { };
 
+  openjdk-make-bootstrap = callPackage ../development/compilers/openjdk/make-bootstrap.nix {
+    openjdk = openjdk.override { minimal = true; };
+  };
+
   openjdk-darwin = callPackage ../development/compilers/openjdk-darwin { };
 
   openjdk7 = callPackage ../development/compilers/openjdk {

From a8d10100279636146b8d66da582e1f23d9d91742 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 7 Jun 2015 02:53:12 -0700
Subject: [PATCH 0869/2322] icedtea: Remove

---
 .../icedtea/cppflags-include-fix.patch        |  17 -
 .../development/compilers/icedtea/default.nix | 181 ---------
 .../compilers/icedtea/fix-java-home.patch     |  17 -
 .../compilers/icedtea/generate-cacerts.pl     | 366 ------------------
 .../development/compilers/icedtea/sources.nix |  48 ---
 pkgs/development/compilers/icedtea/update.py  | 261 -------------
 pkgs/top-level/all-packages.nix               |  10 +-
 7 files changed, 1 insertion(+), 899 deletions(-)
 delete mode 100644 pkgs/development/compilers/icedtea/cppflags-include-fix.patch
 delete mode 100644 pkgs/development/compilers/icedtea/default.nix
 delete mode 100644 pkgs/development/compilers/icedtea/fix-java-home.patch
 delete mode 100644 pkgs/development/compilers/icedtea/generate-cacerts.pl
 delete mode 100644 pkgs/development/compilers/icedtea/sources.nix
 delete mode 100755 pkgs/development/compilers/icedtea/update.py

diff --git a/pkgs/development/compilers/icedtea/cppflags-include-fix.patch b/pkgs/development/compilers/icedtea/cppflags-include-fix.patch
deleted file mode 100644
index 731a8d07548..00000000000
--- a/pkgs/development/compilers/icedtea/cppflags-include-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk
-index c6ab06d..23a14da 100644
---- openjdk-orig/jdk/make/sun/awt/mawt.gmk
-+++ openjdk/jdk/make/sun/awt/mawt.gmk
-@@ -270,12 +270,6 @@ LDFLAGS  += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
- endif # !HEADLESS
- endif # PLATFORM
- 
--ifeq ($(PLATFORM), linux)
--  # Checking for the X11/extensions headers at the additional location
--  CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
--                        $(wildcard /usr/include/X11/extensions))
--endif
--
- ifeq ($(PLATFORM), macosx)
-   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
-               -I$(OPENWIN_HOME)/include 
diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix
deleted file mode 100644
index 8a96d1c380d..00000000000
--- a/pkgs/development/compilers/icedtea/default.nix
+++ /dev/null
@@ -1,181 +0,0 @@
-{ stdenv, fetchurl, jdk, ant, wget, zip, unzip, cpio, file, libxslt
-, xorg, zlib, pkgconfig, libjpeg, libpng, giflib, lcms2, gtk2, kerberos, attr
-, alsaLib, procps, automake, autoconf, cups, which, perl, coreutils, binutils
-, cacert, setJavaClassPath
-}:
-
-let
-
-  /**
-   * The JRE libraries are in directories that depend on the CPU.
-   */
-  architecture =
-    if stdenv.system == "i686-linux" then
-      "i386"
-    else if stdenv.system == "x86_64-linux" then
-      "amd64"
-    else
-      throw "icedtea requires i686-linux or x86_64 linux";
-
-  srcInfo = (import ./sources.nix).icedtea7;
-
-  pkgName = "icedtea7-${srcInfo.version}";
-
-  defSrc = name:
-    with (builtins.getAttr name srcInfo.bundles); fetchurl {
-      inherit url sha256;
-      name = "${pkgName}-${baseNameOf url}";
-    };
-
-  bundleNames = builtins.attrNames srcInfo.bundles;
-
-  sources = stdenv.lib.genAttrs bundleNames (name: defSrc name);
-
-  bundleFun = name: "--with-${name}-src-zip=" + builtins.getAttr name sources;
-  bundleFlags = map bundleFun bundleNames;
-
-  icedtea = stdenv.mkDerivation (with srcInfo; {
-    name = pkgName;
-
-    src = fetchurl {
-      inherit url sha256;
-    };
-
-    outputs = [ "out" "jre" ];
-
-    # TODO: Probably some more dependencies should be on this list but are being
-    # propagated instead
-    buildInputs = [
-      jdk ant wget zip unzip cpio file libxslt pkgconfig procps automake
-      autoconf which perl coreutils xorg.lndir
-      zlib libjpeg libpng giflib lcms2 kerberos attr alsaLib cups
-      xorg.libX11 xorg.libXtst gtk2
-    ];
-
-    configureFlags = bundleFlags ++ [
-      "--disable-bootstrap"
-      "--disable-downloading"
-
-      "--without-rhino"
-      "--with-pax=paxctl"
-      "--with-jdk-home=${jdk.home}"
-    ];
-
-    preConfigure = ''
-      unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-      substituteInPlace javac.in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
-      substituteInPlace javah.in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
-
-      ./autogen.sh
-    '';
-
-    preBuild = ''
-      make stamps/extract.stamp
-
-      substituteInPlace openjdk/jdk/make/common/shared/Defs-utils.gmk --replace '/bin/echo' '${coreutils}/bin/echo'
-      substituteInPlace openjdk/corba/make/common/shared/Defs-utils.gmk --replace '/bin/echo' '${coreutils}/bin/echo'
-
-      patch -p0 < ${./cppflags-include-fix.patch}
-      patch -p0 < ${./fix-java-home.patch}
-    '';
-
-    NIX_NO_SELF_RPATH = true;
-
-    makeFlags = [
-      "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h"
-      "ALT_UNIXCOMMAND_PATH="
-      "ALT_USRBIN_PATH="
-      "ALT_DEVTOOLS_PATH="
-      "ALT_COMPILER_PATH="
-      "ALT_CUPS_HEADERS_PATH=${cups}/include"
-      "ALT_OBJCOPY=${binutils}/bin/objcopy"
-      "SORT=${coreutils}/bin/sort"
-      "UNLIMITED_CRYPTO=1"
-    ];
-
-    installPhase = ''
-      mkdir -p $out/lib/icedtea $out/share $jre/lib/icedtea
-
-      cp -av openjdk.build/j2sdk-image/* $out/lib/icedtea
-
-      # Move some stuff to top-level.
-      mv $out/lib/icedtea/include $out/include
-      mv $out/lib/icedtea/man $out/share/man
-
-      # jni.h expects jni_md.h to be in the header search path.
-      ln -s $out/include/linux/*_md.h $out/include/
-
-      # Remove some broken manpages.
-      rm -rf $out/share/man/ja*
-
-      # Remove crap from the installation.
-      rm -rf $out/lib/icedtea/demo $out/lib/icedtea/sample
-
-      # Move the JRE to a separate output.
-      mv $out/lib/icedtea/jre $jre/lib/icedtea/
-      mkdir $out/lib/icedtea/jre
-      lndir $jre/lib/icedtea/jre $out/lib/icedtea/jre
-
-      # The following files cannot be symlinked, as it seems to violate Java security policies
-      rm $out/lib/icedtea/jre/lib/ext/*
-      cp $jre/lib/icedtea/jre/lib/ext/* $out/lib/icedtea/jre/lib/ext/
-
-      rm -rf $out/lib/icedtea/jre/bin
-      ln -s $out/lib/icedtea/bin $out/lib/icedtea/jre/bin
-
-      # Remove duplicate binaries.
-      for i in $(cd $out/lib/icedtea/bin && echo *); do
-        if [ "$i" = java ]; then continue; fi
-        if cmp -s $out/lib/icedtea/bin/$i $jre/lib/icedtea/jre/bin/$i; then
-          ln -sfn $jre/lib/icedtea/jre/bin/$i $out/lib/icedtea/bin/$i
-        fi
-      done
-
-      # Generate certificates.
-      pushd $jre/lib/icedtea/jre/lib/security
-      rm cacerts
-      perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
-      popd
-
-      ln -s $out/lib/icedtea/bin $out/bin
-      ln -s $jre/lib/icedtea/jre/bin $jre/bin
-    '';
-
-    # FIXME: this is unnecessary once the multiple-outputs branch is merged.
-    preFixup = ''
-      prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}"
-      patchELF $jre
-      propagatedNativeBuildInputs+=" $jre"
-
-      # Propagate the setJavaClassPath setup hook from the JRE so that
-      # any package that depends on the JRE has $CLASSPATH set up
-      # properly.
-      mkdir -p $jre/nix-support
-      echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs
-
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat <<EOF > $out/nix-support/setup-hook
-      if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/icedtea; fi
-      EOF
-    '';
-
-    meta = {
-      description = "Free Java development kit based on OpenJDK 7.0 and the IcedTea project";
-      longDescription = ''
-        Free Java environment based on OpenJDK 7.0 and the IcedTea project.
-        - Full Java runtime environment
-        - Needed for executing Java Webstart programs and the free Java web browser plugin.
-      '';
-      homepage = http://icedtea.classpath.org;
-      maintainers = with stdenv.lib.maintainers; [ wizeman ];
-      platforms = stdenv.lib.platforms.linux;
-    };
-
-    passthru = {
-      inherit architecture;
-      home = "${icedtea}/lib/icedtea";
-    };
-  });
-in icedtea
diff --git a/pkgs/development/compilers/icedtea/fix-java-home.patch b/pkgs/development/compilers/icedtea/fix-java-home.patch
deleted file mode 100644
index 5def344f171..00000000000
--- a/pkgs/development/compilers/icedtea/fix-java-home.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ru -x '*~' openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
---- openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp	2013-09-06 20:22:03.000000000 +0200
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2014-01-24 22:44:08.223857012 +0100
-@@ -2358,12 +2358,10 @@
-                 CAST_FROM_FN_PTR(address, os::jvm_path),
-                 dli_fname, sizeof(dli_fname), NULL);
-   assert(ret, "cannot locate libjvm");
-   char *rp = NULL;
-   if (ret && dli_fname[0] != '\0') {
--    rp = realpath(dli_fname, buf);
-+    snprintf(buf, buflen, "%s", dli_fname);
-   }
--  if (rp == NULL)
--    return;
- 
-   if (Arguments::created_by_gamma_launcher()) {
-     // Support for the gamma launcher.  Typical value for buf is
diff --git a/pkgs/development/compilers/icedtea/generate-cacerts.pl b/pkgs/development/compilers/icedtea/generate-cacerts.pl
deleted file mode 100644
index 3bdd42f7274..00000000000
--- a/pkgs/development/compilers/icedtea/generate-cacerts.pl
+++ /dev/null
@@ -1,366 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2007, 2008 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# generate-cacerts.pl generates a JKS keystore named 'cacerts' from
-# OpenSSL's certificate bundle using OpenJDK's keytool.
-
-# First extract each of OpenSSL's bundled certificates into its own
-# aliased filename.
-
-# Downloaded from http://cvs.fedoraproject.org/viewvc/rpms/ca-certificates/F-12/generate-cacerts.pl?revision=1.2
-# Check and prevention of duplicate aliases added by Vlastimil Babka <caster@gentoo.org>
-
-$file = $ARGV[1];
-open(CERTS, $file);
-@certs = <CERTS>;
-close(CERTS);
-
-$pem_file_count = 0;
-$in_cert_block = 0;
-$write_current_cert = 1;
-foreach $cert (@certs)
-{
-    if ($cert =~ /Issuer: /)
-    {
-        $_ = $cert;
-        if ($cert =~ /personal-freemail/)
-        {
-            $cert_alias = "thawtepersonalfreemailca";
-        }
-        elsif ($cert =~ /personal-basic/)
-        {
-            $cert_alias = "thawtepersonalbasicca";
-        }
-        elsif ($cert =~ /personal-premium/)
-        {
-            $cert_alias = "thawtepersonalpremiumca";
-        }
-        elsif ($cert =~ /server-certs/)
-        {
-            $cert_alias = "thawteserverca";
-        }
-        elsif ($cert =~ /premium-server/)
-        {
-            $cert_alias = "thawtepremiumserverca";
-        }
-        elsif ($cert =~ /Class 1 Public Primary Certification Authority$/)
-        {
-            $cert_alias = "verisignclass1ca";
-        }
-        elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/)
-        {
-            $cert_alias = "verisignclass1g2ca";
-        }
-        elsif ($cert =~
-               /VeriSign Class 1 Public Primary Certification Authority - G3/)
-        {
-            $cert_alias = "verisignclass1g3ca";
-        }
-        elsif ($cert =~ /Class 2 Public Primary Certification Authority$/)
-        {
-            $cert_alias = "verisignclass2ca";
-        }
-        elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/)
-        {
-            $cert_alias = "verisignclass2g2ca";
-        }
-        elsif ($cert =~
-               /VeriSign Class 2 Public Primary Certification Authority - G3/)
-        {
-            $cert_alias = "verisignclass2g3ca";
-        }
-        elsif ($cert =~ /Class 3 Public Primary Certification Authority$/)
-        {
-            $cert_alias = "verisignclass3ca";
-        }
-        # Version 1 of Class 3 Public Primary Certification Authority
-        # - G2 is added.  Version 3 is excluded.  See below.
-        elsif ($cert =~
-               /VeriSign Class 3 Public Primary Certification Authority - G3/)
-        {
-            $cert_alias = "verisignclass3g3ca";
-        }
-        elsif ($cert =~
-               /RSA Data Security.*Secure Server Certification Authority/)
-        {
-            $cert_alias = "verisignserverca";
-        }
-        elsif ($cert =~ /GTE CyberTrust Global Root/)
-        {
-            $cert_alias = "gtecybertrustglobalca";
-        }
-        elsif ($cert =~ /Baltimore CyberTrust Root/)
-        {
-            $cert_alias = "baltimorecybertrustca";
-        }
-        elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/)
-        {
-            $cert_alias = "entrustclientca";
-        }
-        elsif ($cert =~ /www.entrust.net\/GCCA_CPS/)
-        {
-            $cert_alias = "entrustglobalclientca";
-        }
-        elsif ($cert =~ /www.entrust.net\/CPS_2048/)
-        {
-            $cert_alias = "entrust2048ca";
-        }
-        elsif ($cert =~ /www.entrust.net\/CPS /)
-        {
-            $cert_alias = "entrustsslca";
-        }
-        elsif ($cert =~ /www.entrust.net\/SSL_CPS/)
-        {
-            $cert_alias = "entrustgsslca";
-        }
-        elsif ($cert =~ /The Go Daddy Group/)
-        {
-            $cert_alias = "godaddyclass2ca";
-        }
-        elsif ($cert =~ /Starfield Class 2 Certification Authority/)
-        {
-            $cert_alias = "starfieldclass2ca";
-        }
-        elsif ($cert =~ /ValiCert Class 2 Policy Validation Authority/)
-        {
-            $cert_alias = "valicertclass2ca";
-        }
-        elsif ($cert =~ /GeoTrust Global CA$/)
-        {
-            $cert_alias = "geotrustglobalca";
-        }
-        elsif ($cert =~ /Equifax Secure Certificate Authority/)
-        {
-            $cert_alias = "equifaxsecureca";
-        }
-        elsif ($cert =~ /Equifax Secure eBusiness CA-1/)
-        {
-            $cert_alias = "equifaxsecureebusinessca1";
-        }
-        elsif ($cert =~ /Equifax Secure eBusiness CA-2/)
-        {
-            $cert_alias = "equifaxsecureebusinessca2";
-        }
-        elsif ($cert =~ /Equifax Secure Global eBusiness CA-1/)
-        {
-            $cert_alias = "equifaxsecureglobalebusinessca1";
-        }
-        elsif ($cert =~ /Sonera Class1 CA/)
-        {
-            $cert_alias = "soneraclass1ca";
-        }
-        elsif ($cert =~ /Sonera Class2 CA/)
-        {
-            $cert_alias = "soneraclass2ca";
-        }
-        elsif ($cert =~ /AAA Certificate Services/)
-        {
-            $cert_alias = "comodoaaaca";
-        }
-        elsif ($cert =~ /AddTrust Class 1 CA Root/)
-        {
-            $cert_alias = "addtrustclass1ca";
-        }
-        elsif ($cert =~ /AddTrust External CA Root/)
-        {
-            $cert_alias = "addtrustexternalca";
-        }
-        elsif ($cert =~ /AddTrust Qualified CA Root/)
-        {
-            $cert_alias = "addtrustqualifiedca";
-        }
-        elsif ($cert =~ /UTN-USERFirst-Hardware/)
-        {
-            $cert_alias = "utnuserfirsthardwareca";
-        }
-        elsif ($cert =~ /UTN-USERFirst-Client Authentication and Email/)
-        {
-            $cert_alias = "utnuserfirstclientauthemailca";
-        }
-        elsif ($cert =~ /UTN - DATACorp SGC/)
-        {
-            $cert_alias = "utndatacorpsgcca";
-        }
-        elsif ($cert =~ /UTN-USERFirst-Object/)
-        {
-            $cert_alias = "utnuserfirstobjectca";
-        }
-        elsif ($cert =~ /America Online Root Certification Authority 1/)
-        {
-            $cert_alias = "aolrootca1";
-        }
-        elsif ($cert =~ /DigiCert Assured ID Root CA/)
-        {
-            $cert_alias = "digicertassuredidrootca";
-        }
-        elsif ($cert =~ /DigiCert Global Root CA/)
-        {
-            $cert_alias = "digicertglobalrootca";
-        }
-        elsif ($cert =~ /DigiCert High Assurance EV Root CA/)
-        {
-            $cert_alias = "digicerthighassuranceevrootca";
-        }
-        elsif ($cert =~ /GlobalSign Root CA$/)
-        {
-            $cert_alias = "globalsignca";
-        }
-        elsif ($cert =~ /GlobalSign Root CA - R2/)
-        {
-            $cert_alias = "globalsignr2ca";
-        }
-        elsif ($cert =~ /Elektronik.*Kas.*2005/)
-        {
-            $cert_alias = "extra-elektronikkas2005";
-        }
-        elsif ($cert =~ /Elektronik/)
-        {
-            $cert_alias = "extra-elektronik2005";
-        }
-        # Mozilla does not provide these certificates:
-        #   baltimorecodesigningca
-        #   gtecybertrust5ca
-        #   trustcenterclass2caii
-        #   trustcenterclass4caii
-        #   trustcenteruniversalcai
-        else
-        {
-            # Generate an alias using the OU and CN attributes of the
-            # Issuer field if both are present, otherwise use only the
-            # CN attribute.  The Issuer field must have either the OU
-            # or the CN attribute.
-            $_ = $cert;
-            if ($cert =~ /OU=/)
-            {
-                s/Issuer:.*?OU=//;
-                # Remove other occurrences of OU=.
-                s/OU=.*CN=//;
-                # Remove CN= if there were not other occurrences of OU=.
-                s/CN=//;
-                s/\/emailAddress.*//;
-                s/Certificate Authority/ca/g;
-                s/Certification Authority/ca/g;
-            }
-            elsif ($cert =~ /CN=/)
-            {
-                s/Issuer:.*CN=//;
-                s/\/emailAddress.*//;
-                s/Certificate Authority/ca/g;
-                s/Certification Authority/ca/g;
-            }
-            s/\W//g;
-            tr/A-Z/a-z/;
-            $cert_alias = "extra-$_";
-
-        }
-        while (-e "$cert_alias.pem")
-        {
-            $cert_alias = "$cert_alias" . "_";
-        }
-    }
-    # When it attempts to parse:
-    #
-    # Class 3 Public Primary Certification Authority - G2, Version 3
-    #
-    # keytool says:
-    #
-    # #2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false
-    # Unparseable AuthorityInfoAccess extension due to
-    # java.io.IOException: Invalid encoding of URI
-    #
-    # If we do not exclude this file
-    # openjdk/jdk/test/lib/security/cacerts/VerifyCACerts.java fails
-    # on this cert, printing:
-    #
-    # Couldn't verify: java.security.SignatureException: Signature
-    # does not match.
-    #
-    elsif ($cert =~
-           /A6:0F:34:C8:62:6C:81:F6:8B:F7:7D:A9:F6:67:58:8A:90:3F:7D:36/)
-    {
-        $write_current_cert = 0;
-        $pem_file_count--;
-    }
-    elsif ($cert eq "-----BEGIN CERTIFICATE-----\n")
-    {
-        $_ = $cert;
-        s/\W//g;
-        tr/A-Z/a-z/;
-        $cert_alias = "extra-$_";
-        while (-e "$cert_alias.pem")
-        {
-            $cert_alias = "$cert_alias" . "_";
-        }
-        if ($in_cert_block != 0)
-        {
-            die "$file is malformed.";
-        }
-        $in_cert_block = 1;
-        if ($write_current_cert == 1)
-        {
-            $pem_file_count++;
-            if (-e "$cert_alias.pem")
-            {
-                print "$cert_alias";
-                die "already exists"
-            }
-            open(PEM, ">$cert_alias.pem");
-            print PEM $cert;
-        }
-    }
-    elsif ($cert eq "-----END CERTIFICATE-----\n")
-    {
-        $in_cert_block = 0;
-        if ($write_current_cert == 1)
-        {
-            print PEM $cert;
-            close(PEM);
-        }
-        $write_current_cert = 1
-    }
-    else
-    {
-        if ($in_cert_block == 1 && $write_current_cert == 1)
-        {
-            print PEM $cert;
-        }
-    }
-}
-
-# Check that the correct number of .pem files were produced.
-@pem_files = <*.pem>;
-if (@pem_files != $pem_file_count)
-{
-    print "$pem_file_count";
-    die "Number of .pem files produced does not match".
-        " number of certs read from $file.";
-}
-
-# Now store each cert in the 'cacerts' file using keytool.
-$certs_written_count = 0;
-foreach $pem_file (@pem_files)
-{
-    system "$ARGV[0] -noprompt -import".
-        " -alias `basename $pem_file .pem`".
-        " -keystore cacerts -storepass 'changeit' -file $pem_file";
-    unlink($pem_file);
-    $certs_written_count++;
-}
-
-# Check that the correct number of certs were added to the keystore.
-if ($certs_written_count != $pem_file_count)
-{
-    die "Number of certs added to keystore does not match".
-        " number of certs read from $file.";
-}
diff --git a/pkgs/development/compilers/icedtea/sources.nix b/pkgs/development/compilers/icedtea/sources.nix
deleted file mode 100644
index 80d96b4660a..00000000000
--- a/pkgs/development/compilers/icedtea/sources.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-# This file is autogenerated from update.py in the same directory.
-{
-  icedtea7 = rec {
-    version = "2.5.5";
-
-    url = "http://icedtea.wildebeest.org/download/source/icedtea-${version}.tar.xz";
-    sha256 = "1irxk2ndwsfk4c1zbzb5h3rpwv2bc9bhfjvz6p4dws5476vsxrq9";
-
-    common_url = "http://icedtea.classpath.org/download/drops/icedtea7/${version}";
-
-    bundles = {
-      openjdk = rec {
-        url = "${common_url}/openjdk.tar.bz2";
-        sha256 = "5301baacfb6b4ee28a3469b8429a0017898615532f727bb50d94777682c5fd0d";
-      };
-
-      corba = rec {
-        url = "${common_url}/corba.tar.bz2";
-        sha256 = "f0576599b474f56e58068071242cedbbf2f181b58c9010b614c9096be764ac51";
-      };
-
-      jaxp = rec {
-        url = "${common_url}/jaxp.tar.bz2";
-        sha256 = "293218d595763f7e02a91ea88860e5314e42330cbc21b73dc5de32e7e26fd256";
-      };
-
-      jaxws = rec {
-        url = "${common_url}/jaxws.tar.bz2";
-        sha256 = "76d6d0670ede806b01d39e07c644e423a50984f1cf0ec560afa23f0fedf575be";
-      };
-
-      jdk = rec {
-        url = "${common_url}/jdk.tar.bz2";
-        sha256 = "c1bc0d25457ccf40fcaeb5311052f6d2fbab8ef316b0381995835827711da483";
-      };
-
-      langtools = rec {
-        url = "${common_url}/langtools.tar.bz2";
-        sha256 = "71b269ea930da36d751c6183816ef53a65c0587b7cf0195f87759b4c02c3b660";
-      };
-
-      hotspot = rec {
-        url = "${common_url}/hotspot.tar.bz2";
-        sha256 = "d724a9749f51a3c66351ad8a27bc4570640720eace33cd03f1a52e2e45731dfb";
-      };
-    };
-  };
-}
diff --git a/pkgs/development/compilers/icedtea/update.py b/pkgs/development/compilers/icedtea/update.py
deleted file mode 100755
index c41cf3d38d2..00000000000
--- a/pkgs/development/compilers/icedtea/update.py
+++ /dev/null
@@ -1,261 +0,0 @@
-#!/usr/bin/env python3
-
-import subprocess, urllib.request, re, os, tarfile
-from html.parser import HTMLParser
-
-URL = 'http://icedtea.classpath.org/download/drops/icedtea{}/{}'
-DOWNLOAD_URL = 'http://icedtea.wildebeest.org/download/source/'
-DOWNLOAD_HTML = DOWNLOAD_URL + '?C=M;O=D'
-
-ICEDTEA_JDKS = [7]
-
-BUNDLES = ['openjdk', 'corba', 'jaxp', 'jaxws', 'jdk', 'langtools', 'hotspot']
-
-SRC_PATH = './sources.nix'
-
-def get_output(cmd, env = None):
-	try:
-		proc = subprocess.Popen(cmd, env = env, stdout = subprocess.PIPE)
-		out = proc.communicate()[0]
-	except subprocess.CalledProcessError as e:
-		return None
-
-	return out.decode('utf-8').strip()
-
-def nix_prefetch_url(url):
-	env = os.environ.copy()
-	env['PRINT_PATH'] = '1'
-	out = get_output(['nix-prefetch-url', url], env = env)
-
-	return out.split('\n')
-
-def get_nix_attr(path, attr):
-	out = get_output(['nix-instantiate', '--eval-only', '-A', attr, path])
-
-	if len(out) < 2 or out[0] != '"' or out[-1] != '"':
-		raise Exception('Cannot find Nix attribute "{}" (parsing failure?)'.format(attr))
-
-	# Strip quotes
-	return out[1:-1]
-
-def get_jdk_attr(jdk, attr):
-	return get_nix_attr(SRC_PATH, 'icedtea{}.{}'.format(jdk, attr))
-
-class Parser(HTMLParser):
-	def __init__(self, link_regex):
-		HTMLParser.__init__(self)
-
-		self.regex = link_regex
-		self.href = None
-		self.version = None
-
-	def handle_starttag(self, tag, attrs):
-		if self.href != None or tag != 'a':
-			return
-
-		href = None
-		for attr in attrs:
-			if attr[0] == 'href':
-				href = attr[1]
-		if href == None:
-			return
-
-		m = re.match(self.regex, href)
-		if m != None:
-			self.href = href
-			self.version = m.group(1)
-
-def get_latest_version_url(major):
-	f = urllib.request.urlopen(DOWNLOAD_HTML)
-	html = f.read().decode('utf-8')
-	f.close()
-
-	parser = Parser(r'^icedtea\d?-({}\.\d[\d.]*)\.tar\.xz$'.format(major))
-	parser.feed(html)
-	parser.close()
-
-	if parser.href == None:
-		raise Exception('Error: could not find download url for major version "{}"'.format(major))
-
-	return parser.version, DOWNLOAD_URL + parser.href
-
-def get_old_bundle_attrs(jdk, bundle):
-	attrs = {}
-	for attr in ('url', 'sha256'):
-		attrs[attr] = get_jdk_attr(jdk, 'bundles.{}.{}'.format(bundle, attr))
-
-	return attrs
-
-def get_old_attrs(jdk):
-	attrs = {}
-
-	for attr in ('version', 'url', 'sha256'):
-		attrs[attr] = get_jdk_attr(jdk, attr)
-
-	attrs['bundles'] = {}
-
-	for bundle in BUNDLES:
-		attrs['bundles'][bundle] = get_old_bundle_attrs(jdk, bundle)
-
-	return attrs
-
-def get_member_filename(tarball, name):
-	for fname in tarball.getnames():
-		m = re.match(r'^icedtea\d?-\d[\d.]*/{}$'.format(name), fname)
-		if m != None:
-			return m.group(0)
-
-	return None
-
-def get_member_file(tarball, name):
-	path = get_member_filename(tarball, name)
-	if path == None:
-		raise Exception('Could not find "{}" inside tarball'.format(name))
-
-	f = tarball.extractfile(path)
-	data = f.read().decode('utf-8')
-	f.close()
-
-	return data
-
-def get_new_bundle_attr(makefile, bundle, attr):
-	var = '{}_{}'.format(bundle.upper(), attr.upper())
-	regex = r'^{} = (.*?)$'.format(var)
-
-	m = re.search(regex, makefile, re.MULTILINE)
-	if m == None:
-		raise Exception('Could not find variable "{}" in Makefile.am'.format(var))
-
-	return m.group(1)
-
-def get_new_bundle_attrs(jdk, version, path):
-	url = URL.format(jdk, version)
-
-	attrs = {}
-
-	print('Opening file: "{}"'.format(path))
-	tar = tarfile.open(name = path, mode = 'r:xz')
-
-	makefile = get_member_file(tar, 'Makefile.am')
-	hotspot_map = get_member_file(tar, 'hotspot.map.in')
-
-	hotspot_map = hotspot_map.replace('@ICEDTEA_RELEASE@', version)
-
-	for bundle in BUNDLES:
-		battrs = {}
-
-		battrs['url'] = '{}/{}.tar.bz2'.format(url, bundle)
-		if bundle == 'hotspot':
-			m = re.search(r'^default (.*?) (.*?) (.*?) (.*?)$', hotspot_map, re.MULTILINE)
-			if m == None:
-				raise Exception('Could not find info for hotspot bundle in hotspot.map.in')
-
-			battrs['sha256'] = m.group(4)
-		else:
-			battrs['sha256'] = get_new_bundle_attr(makefile, bundle, 'sha256sum')
-
-		attrs[bundle] = battrs
-
-	tar.close()
-
-	return attrs
-
-def get_new_attrs(jdk):
-	print('Getting old attributes for JDK {}...'.format(jdk))
-	old_attrs = get_old_attrs(jdk)
-	attrs = {}
-
-	# The major version corresponds to a specific JDK (1 = OpenJDK6, 2 = OpenJDK7, 3 = OpenJDK8)
-	major = jdk - 5
-
-	print('Getting latest version for JDK {}...'.format(jdk))
-	version, url = get_latest_version_url(major)
-
-	print()
-	print('Old version: {}'.format(old_attrs['version']))
-	print('New version: {}'.format(version))
-	print()
-
-	if version == old_attrs['version']:
-		print('No update available, skipping...')
-		print()
-		return old_attrs
-
-	print('Update available, generating new attributes for JDK {}...'.format(jdk))
-
-	attrs['version'] = version
-	attrs['url'] = url
-
-	print('Downloading tarball from url "{}"...'.format(url))
-	print()
-	attrs['sha256'], path = nix_prefetch_url(url)
-	print()
-
-	print('Inspecting tarball for bundle information...')
-
-	attrs['bundles'] = get_new_bundle_attrs(jdk, attrs['version'], path)
-
-	print('Done!')
-
-	return attrs
-
-def generate_jdk(jdk):
-	attrs = get_new_attrs(jdk)
-
-	version = attrs['version']
-	src_url = attrs['url'].replace(version, '${version}')
-
-	common_url = URL.format(jdk, version)
-	src_common_url = URL.format(jdk, '${version}')
-
-	src =  '  icedtea{} = rec {{\n'.format(jdk)
-	src += '    version = "{}";\n'.format(version)
-	src += '\n'
-	src += '    url = "{}";\n'.format(src_url)
-	src += '    sha256 = "{}";\n'.format(attrs['sha256'])
-	src += '\n'
-	src += '    common_url = "{}";\n'.format(src_common_url)
-	src += '\n'
-	src += '    bundles = {\n'
-
-	for bundle in BUNDLES:
-		battrs = attrs['bundles'][bundle]
-
-		b_url = battrs['url']
-		b_url = b_url.replace(common_url, '${common_url}')
-
-		src += '      {} = rec {{\n'.format(bundle)
-		src += '        url = "{}";\n'.format(b_url)
-		src += '        sha256 = "{}";\n'.format(battrs['sha256'])
-		src += '      };\n'
-
-		if bundle != BUNDLES[-1]:
-			src += '\n'
-
-	src += '    };\n'
-	src += '  };\n'
-
-	return src
-
-def generate_sources(jdks):
-	src = '# This file is autogenerated from update.py in the same directory.\n'
-	src += '{\n'
-
-	for jdk in jdks:
-		print()
-		print('Generating sources for JDK {}...'.format(jdk))
-		src += generate_jdk(jdk)
-
-	src += '}\n'
-	return src
-
-if __name__ == '__main__':
-	print('Generating {}...'.format(SRC_PATH))
-	src = generate_sources(ICEDTEA_JDKS)
-
-	f = open(SRC_PATH, 'w', encoding = 'utf-8')
-	f.write(src)
-	f.close()
-
-	print()
-	print('Update complete!')
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51dc6609660..60c941a7e27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3905,14 +3905,6 @@ let
 
   gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };
 
-  icedtea7 = callPackage ../development/compilers/icedtea rec {
-    bootjdk = openjdk-bootstrap;
-    giflib = giflib_5_0;
-  };
-
-  # There will not likely be an icedtea8 so users should move to openjdk
-  icedtea = icedtea7;
-
   icedtea7_web = callPackage ../development/compilers/icedtea-web {
     jdk = jdk7;
     xulrunner = firefox;
@@ -3949,7 +3941,7 @@ let
 
   openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8;
 
-  jdk7 = icedtea7;
+  jdk7 = openjdk7;
 
   jdk8 = openjdk8;
 

From a5ef488b11734c16151ddad5105c84fc155babf2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 7 Jun 2015 21:01:17 -0700
Subject: [PATCH 0870/2322] opendjk: Make boostraps for each major version and
 update openjdk7

---
 .../compilers/openjdk/bootstrap.nix           |  44 +++-
 .../development/compilers/openjdk/default.nix |  57 ++++-
 .../compilers/openjdk/openjdk8.nix            | 212 +++++++++---------
 pkgs/top-level/all-packages.nix               |  19 +-
 4 files changed, 203 insertions(+), 129 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix
index bc63292a145..a9ca7673dfe 100644
--- a/pkgs/development/compilers/openjdk/bootstrap.nix
+++ b/pkgs/development/compilers/openjdk/bootstrap.nix
@@ -1,17 +1,34 @@
-{ stdenv, runCommand, glibc, fetchurl, file }:
+{ stdenv, runCommand, glibc, fetchurl, file
+
+, version
+}:
 
 let
   # !!! These should be on nixos.org
   src = if glibc.system == "x86_64-linux" then
-    fetchurl {
-      url = http://pub.wak.io/nixos/tarballs/openjdk-bootstrap-x86_64-linux.tar.xz;
-      sha256 = "13m3df54mnr2nb67284s2zf5n8y502ck47gc39lcafrh40hzjil5";
-    }
+    (if version == "8" then
+      fetchurl {
+        url = "https://www.dropbox.com/s/a0lsq2ig4uguky5/openjdk8-bootstrap-x86_64-linux.tar.xz?dl=1";
+        sha256 = "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks";
+      }
+    else if version == "7" then
+      fetchurl {
+        url = "https://www.dropbox.com/s/rssfbeommrfbsjf/openjdk7-bootstrap-x86_64-linux.tar.xz?dl=1";
+        sha256 = "024gg2sgg4labxbc1nhn8lxls2p7d9h3b82hnsahwaja2pm1hbra";
+      }
+    else throw "No bootstrap for version")
   else if glibc.system == "i686-linux" then
-    fetchurl {
-      url = http://pub.wak.io/nixos/tarballs/openjdk-bootstrap-i686-linux.tar.xz;
-      sha256 = "18kzv4h9skxg5g5c7ar2ji3qny880h5svcn207b4d6xv4sa0a6ks";
-    }
+    (if version == "8" then
+      fetchurl {
+        url = "https://www.dropbox.com/s/rneqjhlerijsw74/openjdk8-bootstrap-i686-linux.tar.xz?dl=1";
+        sha256 = "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9";
+      }
+    else if version == "7" then
+      fetchurl {
+        url = "https://www.dropbox.com/s/6xe64td7eg2wurs/openjdk7-bootstrap-i686-linux.tar.xz?dl=1";
+        sha256 = "0xwqjk1zx8akziw8q9sbjc1rs8s7c0w6mw67jdmmi26cwwp8ijnx";
+      }
+    else throw "No bootstrap for version")
   else throw "No bootstrap for system";
 
   bootstrap = runCommand "openjdk-bootstrap" {
@@ -20,9 +37,16 @@ let
     tar xvf ${src}
     mv openjdk-bootstrap $out
 
+    LIBDIRS="$(find $out -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':')"
+
     for i in $out/bin/*; do
       patchelf --set-interpreter ${glibc}/lib/ld-linux*.so.2 $i || true
-      patchelf --set-rpath ${glibc}/lib:$out/lib $i || true
+      patchelf --set-rpath "${glibc}/lib:$LIBDIRS" $i || true
+    done
+
+    find $out -name \*.so\* | while read lib; do
+      patchelf --set-interpreter ${glibc}/lib/ld-linux*.so.2 $lib || true
+      patchelf --set-rpath "${glibc}/lib:${stdenv.cc.cc}/lib:$LIBDIRS" $lib || true
     done
 
     # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings:
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 323bf78ec59..9bdea7bc7ab 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,6 +1,8 @@
 { stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype
 , which, bootjdk, nettools, xorg, file
-, fontconfig, cpio, cacert, perl, setJavaClassPath }:
+, fontconfig, cpio, cacert, perl, setJavaClassPath
+, minimal ? false
+}:
 
 let
 
@@ -27,13 +29,41 @@ let
     md5 = "de3006e5cf1ee78a9c6145ce62c4e982";
   };
 
+  baseurl = "http://hg.openjdk.java.net/jdk7u/jdk7u";
+  repover = "jdk7u${update}-b${build}";
+  jdk7 = fetchurl {
+    url = "${baseurl}/archive/${repover}.tar.gz";
+    sha256 = "1r8xnn87nmqaq2f8i3cp3i9ngq66k0c0wgkdq5cf59lkgs8wkcdi";
+  };
+  langtools = fetchurl {
+    url = "${baseurl}/langtools/archive/${repover}.tar.gz";
+    sha256 = "01alj6pfrjqyf4irll9wg34h4w9nmb3973lvbacs528qm1nxgh9r";
+  };
+  hotspot = fetchurl {
+    url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
+    sha256 = "14zla8axmg5344zf45i4cj7yyli0kmdjsh9yalmzqaphpkqjqpf2";
+  };
+  corba = fetchurl {
+    url = "${baseurl}/corba/archive/${repover}.tar.gz";
+    sha256 = "19z3ay3f2q7r2ra03c6wy8b5rbdbrkq5g2dzhrqcg0n4iydd3c40";
+  };
+  jdk = fetchurl {
+    url = "${baseurl}/jdk/archive/${repover}.tar.gz";
+    sha256 = "1q0r2l9bz2cyx4fq79x6cb2f5xycw83hl5cn1d1mazgsckp590lb";
+  };
+  jaxws = fetchurl {
+    url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
+    sha256 = "1lp0mww2x3b6xavb7idrzckh6iw8jd6s1fvqgfvzs853z4ifksqj";
+  };
+  jaxp = fetchurl {
+    url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
+    sha256 = "0pd874dkgxkb7frxg4n9py61kkhhck4x33dcynynwb3vl6k6iy79";
+  };
   openjdk = stdenv.mkDerivation rec {
     name = "openjdk-7u${update}b${build}";
 
-    src = fetchurl {
-      url = "http://tarballs.nixos.org/openjdk-7u${update}-b${build}.tar.xz";
-      sha256 = "0lyp75sl5w4b9azphb2nq5cwzli85inpksq4943q4j349rkmdprx";
-    };
+    srcs = [ jdk7 langtools hotspot corba jdk jaxws jaxp ];
+    sourceRoot = ".";
 
     outputs = [ "out" "jre" ];
 
@@ -41,18 +71,23 @@ let
       [ unzip procps ant which zip cpio nettools alsaLib
         xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst
         xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir
-        fontconfig perl file
+        fontconfig perl file bootjdk
       ];
 
-    NIX_LDFLAGS = "-lfontconfig -lXcursor -lXinerama";
+    NIX_LDFLAGS = if minimal then null else "-lfontconfig -lXcursor -lXinerama";
 
     postUnpack = ''
+      ls | grep jdk | grep -v '^jdk7u' | awk -F- '{print $1}' | while read p; do
+        mv $p-* $(ls | grep '^jdk7u')/$p
+      done
+      cd jdk7u-*
+
       sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \
         -e "s@/bin/ls@${coreutils}/bin/ls@" \
-        openjdk*/hotspot/make/linux/makefiles/sa.make
+        hotspot/make/linux/makefiles/sa.make
 
       sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \
-        openjdk*/{jdk,corba}/make/common/shared/Defs-utils.gmk
+        {jdk,corba}/make/common/shared/Defs-utils.gmk
 
       tar xf ${cupsSrc}
       cupsDir=$(echo $(pwd)/cups-*)
@@ -75,7 +110,7 @@ let
       "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h"
       "FREETYPE_HEADERS_PATH=${freetype}/include"
       "FREETYPE_LIB_PATH=${freetype}/lib"
-      "MILESTONE=u${update}"
+      "MILESTONE=${update}"
       "BUILD_NUMBER=b${build}"
       "USRBIN_PATH="
       "COMPILER_PATH="
@@ -85,7 +120,7 @@ let
       "STATIC_CXX=false"
       "UNLIMITED_CRYPTO=1"
       "FULL_DEBUG_SYMBOLS=0"
-    ];
+    ] ++ stdenv.lib.optional minimal "BUILD_HEADLESS=1";
 
     configurePhase = "true";
 
diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix
index 8226f2ea146..dfac59d859f 100644
--- a/pkgs/development/compilers/openjdk/openjdk8.nix
+++ b/pkgs/development/compilers/openjdk/openjdk8.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig
+{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype
+, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib
 
 , minimal ? false } :
 let
@@ -40,118 +41,123 @@ let
              sha256 = "1llf3l4483kd8m1a77n7y9fgvm6fa63nim3qhp5z4gnw68ldbhra";
           };
   openjdk8 = stdenv.mkDerivation {
-  name = "openjdk-8u${update}b${build}";
-  srcs = [ jdk8 langtools hotspot corba jdk jaxws jaxp nashorn ];
-  outputs = [ "out" "jre" ];
-  buildInputs = [ cpio file which unzip zip
-                  xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst
-                  xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir
-                  cups freetype alsaLib perl liberation_ttf fontconfig bootjdk ];
-  setSourceRoot = ''
-    sourceRoot="jdk8u${update}-jdk8u${update}-b${build}";
-  '';
-  prePatch = ''
-    # despite --with-override-jdk the build still searchs here
-    # GNU Patch bug, --follow-symlinks only follow the last dir part symlink
-    mv "../jdk-${repover}" "jdk";
-    mv "../hotspot-${repover}" "hotspot";
-  '';
-  postPatch = ''
-    mv jdk "../jdk-${repover}";
-    mv hotspot "../hotspot-${repover}";
-    # Patching is over, lets re-add the links
-    ln -s "../jdk-${repover}" "jdk"
-    ln -s "../hotspot-${repover}" "hotspot"
-  '';
-  patches = [
-    ./fix-java-home-jdk8.patch
-    ./read-truststore-from-env-jdk8.patch
-    ./currency-date-range-jdk8.patch
-    ./JDK-8074312-hotspot.patch
-  ];
-  preConfigure = ''
-    chmod +x configure
-    substituteInPlace configure --replace /bin/bash "$shell"
-    substituteInPlace ../hotspot-${repover}/make/linux/adlc_updater --replace /bin/sh "$shell"
-  '';
-  configureFlags = [
-    "--with-freetype=${freetype}"
-    "--with-override-langtools=../langtools-${repover}"
-    "--with-override-hotspot=../hotspot-${repover}"
-    "--with-override-corba=../corba-${repover}"
-    "--with-override-jdk=../jdk-${repover}"
-    "--with-override-jaxws=../jaxws-${repover}"
-    "--with-override-jaxp=../jaxp-${repover}"
-    "--with-override-nashorn=../nashorn-${repover}"
-    "--with-boot-jdk=${bootjdk.home}"
-    "--with-update-version=${update}"
-    "--with-build-number=${build}"
-    "--with-milestone=fcs"
-    "--disable-debug-symbols"
-  ] ++ stdenv.lib.optional minimal "--disable-headful";
-  NIX_LDFLAGS= if minimal then null else "-lfontconfig";
-  buildFlags = "all";
-  installPhase = ''
-    mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
+    name = "openjdk-8u${update}b${build}";
 
-    cp -av build"/"*/images/j2sdk-image"/"* $out/lib/openjdk
+    srcs = [ jdk8 langtools hotspot corba jdk jaxws jaxp nashorn ];
+    sourceRoot = ".";
 
-    # Move some stuff to top-level.
-    mv $out/lib/openjdk/include $out/include
-    mv $out/lib/openjdk/man $out/share/man
+    outputs = [ "out" "jre" ];
 
-    # jni.h expects jni_md.h to be in the header search path.
-    ln -s $out/include/linux"/"*_md.h $out/include/
+    buildInputs = [
+      cpio file which unzip zip
+      xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst
+      xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir
+      cups freetype alsaLib perl liberation_ttf fontconfig bootjdk zlib
+    ];
 
-    # Remove some broken manpages.
-    rm -rf $out/share/man/ja*
+    prePatch = ''
+      ls | grep jdk | grep -v '^jdk8u' | awk -F- '{print $1}' | while read p; do
+        mv $p-* $(ls | grep '^jdk8u')/$p
+      done
+      cd $(ls | grep '^jdk8u')
+    '';
 
-    # Remove crap from the installation.
-    rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample
+    patches = [
+      ./fix-java-home-jdk8.patch
+      ./read-truststore-from-env-jdk8.patch
+      ./currency-date-range-jdk8.patch
+      ./JDK-8074312-hotspot.patch
+    ];
 
-    # Move the JRE to a separate output and setup fallback fonts
-    mv $out/lib/openjdk/jre $jre/lib/openjdk/
-    mkdir $out/lib/openjdk/jre
-    mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback
-    lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
-    lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
+    preConfigure = ''
+      chmod +x configure
+      substituteInPlace configure --replace /bin/bash "$shell"
+      substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "$shell"
+    '';
 
-    rm -rf $out/lib/openjdk/jre/bina
-    ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin
+    configureFlags = [
+      "--with-freetype=${freetype}"
+      "--with-boot-jdk=${bootjdk.home}"
+      "--with-update-version=${update}"
+      "--with-build-number=${build}"
+      "--with-milestone=fcs"
+      "--enable-unlimited-crypto"
+      "--disable-debug-symbols"
+      "--disable-freetype-bundling"
+    ] ++ (if minimal then [
+      "--disable-headful"
+      "--with-zlib=bundled"
+      "--with-giflib=bundled"
+    ] else [
+      "--with-zlib=system"
+    ]);
 
-    # Set PaX markings
-    exes=$(file $out/lib/openjdk/bin"/"* $jre/lib/openjdk/jre/bin"/"* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
-    echo "to mark: *$exes*"
-    for file in $exes; do
-      echo "marking *$file*"
-      paxmark ${paxflags} "$file"
-    done
+    NIX_LDFLAGS= if minimal then null else "-lfontconfig";
 
-    # Remove duplicate binaries.
-    for i in $(cd $out/lib/openjdk/bin && echo *); do
-      if [ "$i" = java ]; then continue; fi
-      if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
-        ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
-      fi
-    done
+    buildFlags = "all";
 
-    # Generate certificates.
-    pushd $jre/lib/openjdk/jre/lib/security
-    rm cacerts
-    perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
-    popd
+    installPhase = ''
+      mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
 
-    ln -s $out/lib/openjdk/bin $out/bin
-    ln -s $jre/lib/openjdk/jre/bin $jre/bin
-  '';
+      cp -av build"/"*/images/j2sdk-image"/"* $out/lib/openjdk
 
-  meta = with stdenv.lib; {
-    homepage = http://openjdk.java.net/;
-    license = licenses.gpl2;
-    description = "The open-source Java Development Kit";
-    maintainers = with maintainers; [ edwtjo ];
-    platforms = platforms.linux;
+      # Move some stuff to top-level.
+      mv $out/lib/openjdk/include $out/include
+      mv $out/lib/openjdk/man $out/share/man
+
+      # jni.h expects jni_md.h to be in the header search path.
+      ln -s $out/include/linux"/"*_md.h $out/include/
+
+      # Remove some broken manpages.
+      rm -rf $out/share/man/ja*
+
+      # Remove crap from the installation.
+      rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample
+
+      # Move the JRE to a separate output and setup fallback fonts
+      mv $out/lib/openjdk/jre $jre/lib/openjdk/
+      mkdir $out/lib/openjdk/jre
+      mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback
+      lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
+      lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
+
+      rm -rf $out/lib/openjdk/jre/bina
+      ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin
+
+      # Set PaX markings
+      exes=$(file $out/lib/openjdk/bin"/"* $jre/lib/openjdk/jre/bin"/"* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
+      echo "to mark: *$exes*"
+      for file in $exes; do
+        echo "marking *$file*"
+        paxmark ${paxflags} "$file"
+      done
+
+      # Remove duplicate binaries.
+      for i in $(cd $out/lib/openjdk/bin && echo *); do
+        if [ "$i" = java ]; then continue; fi
+        if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
+          ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
+        fi
+      done
+
+      # Generate certificates.
+      pushd $jre/lib/openjdk/jre/lib/security
+      rm cacerts
+      perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
+      popd
+
+      ln -s $out/lib/openjdk/bin $out/bin
+      ln -s $jre/lib/openjdk/jre/bin $jre/bin
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = http://openjdk.java.net/;
+      license = licenses.gpl2;
+      description = "The open-source Java Development Kit";
+      maintainers = with maintainers; [ edwtjo ];
+      platforms = platforms.linux;
+    };
+
+    passthru.home = "${openjdk8}/lib/openjdk";
   };
-
-  passthru.home = "${openjdk8}/lib/openjdk";
-}; in openjdk8
+in openjdk8
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60c941a7e27..6daa4b07595 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3923,29 +3923,38 @@ let
 
   path64 = callPackage ../development/compilers/path64 { };
 
-  openjdk-bootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { };
+  openjdk7-bootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
+  openjdk8-bootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
 
-  openjdk-make-bootstrap = callPackage ../development/compilers/openjdk/make-bootstrap.nix {
-    openjdk = openjdk.override { minimal = true; };
+  openjdk7-make-bootstrap = callPackage ../development/compilers/openjdk/make-bootstrap.nix {
+    openjdk = openjdk7.override { minimal = true; };
+  };
+  openjdk8-make-bootstrap = callPackage ../development/compilers/openjdk/make-bootstrap.nix {
+    openjdk = openjdk8.override { minimal = true; };
   };
 
   openjdk-darwin = callPackage ../development/compilers/openjdk-darwin { };
 
   openjdk7 = callPackage ../development/compilers/openjdk {
-    bootjdk = openjdk-bootstrap;
+    bootjdk = openjdk7-bootstrap;
   };
+  openjdk7_jre = openjdk7.jre;
 
   openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix {
-    bootjdk = openjdk-bootstrap;
+    bootjdk = openjdk8-bootstrap;
   };
+  openjdk8_jre = openjdk8.jre;
 
   openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8;
 
   jdk7 = openjdk7;
+  jre7 = jdk7.jre;
 
   jdk8 = openjdk8;
+  jre8 = jdk8.jre;
 
   jdk = if stdenv.isDarwin then openjdk-darwin else jdk8;
+  jre = jdk.jre;
 
   oraclejdk = pkgs.jdkdistro true false;
 

From 6e68e874b54849a7fe6d9be10dde24d203bfc90d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 8 Jun 2015 00:00:12 -0700
Subject: [PATCH 0871/2322] openjdk8: Fix refernces to the bootstrap

---
 .../compilers/openjdk/openjdk8.nix            | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix
index dfac59d859f..530391c8e7d 100644
--- a/pkgs/development/compilers/openjdk/openjdk8.nix
+++ b/pkgs/development/compilers/openjdk/openjdk8.nix
@@ -150,6 +150,32 @@ let
       ln -s $jre/lib/openjdk/jre/bin $jre/bin
     '';
 
+    postFixup = ''
+      # Build the set of output library directories to rpath against
+      LIBDIRS=""
+      for output in $outputs; do
+        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':'):$LIBDIRS"
+      done
+
+      # Add the local library paths to remove dependencies on the bootstrap
+      for output in $outputs; do
+        OUTPUTDIR="$(eval echo \$$output)"
+        BINLIBS="$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)"
+        echo "$BINLIBS" | while read i; do
+          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
+          patchelf --shrink-rpath "$i" || true
+        done
+      done
+
+      # Test to make sure that we don't depend on the bootstrap
+      for output in $outputs; do
+        if grep -q -r '${bootjdk}' $(eval echo \$$output); then
+          echo "Extraneous references to ${bootjdk} detected"
+          exit 1
+        fi
+      done
+    '';
+
     meta = with stdenv.lib; {
       homepage = http://openjdk.java.net/;
       license = licenses.gpl2;

From c3d9e90f0eeac0fc0f182ffb87d9e074d9d52b0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <ikervagyok@gmail.com>
Date: Mon, 8 Jun 2015 08:52:06 +0200
Subject: [PATCH 0872/2322] Updated apcupsd to version 3.14.13

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

diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index ad8685d3d42..e60f6173c0f 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -6,11 +6,11 @@ assert enableCgiScripts -> gd != null;
 
 stdenv.mkDerivation rec {
   pname = "apcupsd";
-  name = "${pname}-3.14.12";
+  name = "${pname}-3.14.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "0h54ahj65nqrgmdcg81h1gp0zlxg9hwwhg8pmx6z9zcwn4y70kqv";
+    sha256 = "1y83bly5bgpjbfaxxwmdk2mndbi4cw0svq5z9n6byj043phbvv2p";
   };
 
   buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd;

From b9de32de5bd26dd7279622f6a4c6aa336e044d1b Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Mon, 8 Jun 2015 00:48:13 -0700
Subject: [PATCH 0873/2322] update GHC HEAD and configuration

---
 pkgs/development/compilers/ghc/head.nix       |  6 +++---
 .../configuration-ghc-head.nix                | 21 +++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 45bb4342088..bc59a53bc17 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -17,14 +17,14 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "7.11.20150402";
+  version = "7.11.20150607";
   name = "ghc-${version}";
-  rev = "47f821a1a24553dc29b9581b1a259a9b1394c955";
+  rev = "89223ce1340654455a9f3aa9cbf25f30884227fd";
 
   src = fetchgit {
     url = "git://git.haskell.org/ghc.git";
     inherit rev;
-    sha256 = "111a2z6bgn966g04a9n2ns9n2a401rd0zqgndznn2w4fv8a4qzgj";
+    sha256 = "1qsv2n5js21kqphq92xlyc91f11fnr9sh1glqzsirc8xr60dg5cs";
   };
 
   postUnpack = ''
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 73da57d7350..dabdeec3a23 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -42,10 +42,31 @@ self: super: {
 
   # haddock: No input file(s).
   nats = dontHaddock super.nats;
+  bytestring-builder = dontHaddock super.bytestring-builder;
+
+  alex = dontCheck super.alex;
 
   # We have time 1.5
   aeson = disableCabalFlag super.aeson "old-locale";
 
+  # Show works differently for record syntax now, breaking haskell-src-exts' parser tests
+  # https://github.com/haskell-suite/haskell-src-exts/issues/224
+  haskell-src-exts = dontCheck super.haskell-src-exts;
+
+  process-extras = appendPatch super.process-extras (pkgs.fetchpatch {
+    url = "https://github.com/seereason/process-extras/pull/4.patch";
+    sha256 = "0wfd8dmr0a4dvgp6nhmkznxq1nq8ciprsacn1canmkzjkdidn6kj";
+  });
+  mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch {
+    url = "https://github.com/snoyberg/mono-traversable/pull/77.patch";
+    sha256 = "1qrvrh3cqfkymi5yb9y9z88rq4n7ag0ac2k00mcnqh4dz1vh4fg1";
+  });
+  yesod-auth = appendPatch super.yesod-auth (pkgs.fetchpatch {
+    url = "https://github.com/yesodweb/yesod/pull/1006.patch";
+    sha256 = "0l6wjj8cfz6jy6j92kywsccafyffhlm5240q82bzirb278adqvar";
+    stripLen = 1;
+  });
+
   # Setup: At least the following dependencies are missing: base <4.8
   hspec-expectations = overrideCabal super.hspec-expectations (drv: {
     patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";

From 50e9fa5719b233c6c679033871a20427fd619949 Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Thu, 4 Jun 2015 13:01:01 -0700
Subject: [PATCH 0874/2322] dirt: include sound samples (close #8179)

also add self as maintainer
---
 lib/maintainers.nix                      |  1 +
 pkgs/applications/audio/dirt/default.nix | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 174eced43c2..3ae9d5ceb94 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -16,6 +16,7 @@
   amiddelk = "Arie Middelkoop <amiddelk@gmail.com>";
   amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>";
   AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>";
+  anderspapitto = "Anders Papitto <anderspapitto@gmail.com>";
   andres = "Andres Loeh <ksnixos@andres-loeh.de>";
   antono = "Antono Vasiljev <self@antono.info>";
   ardumont = "Antoine R. Dumont <eniotna.t@gmail.com>";
diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix
index 1db4515ae23..74adf4533fa 100644
--- a/pkgs/applications/audio/dirt/default.nix
+++ b/pkgs/applications/audio/dirt/default.nix
@@ -9,13 +9,21 @@ stdenv.mkDerivation rec {
     sha256 = "1shbyp54q64g6bsl6hhch58k3z1dyyy9ph6cq2xvdf8syy00sisz";
   };
   buildInputs = [ libsndfile libsamplerate liblo jack2 ];
+  postPatch = ''
+    sed -i "s|./samples|$out/share/dirt/samples|" file.h
+  '';
   configurePhase = ''
     export DESTDIR=$out
   '';
+  postInstall = ''
+    mkdir -p $out/share/dirt/
+    cp -r samples $out/share/dirt/
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An unimpressive thingie for playing bits of samples with some level of accuracy";
     homepage = "https://github.com/tidalcycles/Dirt";
-    license = stdenv.lib.licenses.gpl3;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ anderspapitto ];
   };
 }

From d85be1cfa3e5e2c50e57e8e143b562b91541ea77 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Mon, 8 Jun 2015 08:35:12 +0000
Subject: [PATCH 0875/2322] mwlib uses pdftk to create books

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

diff --git a/nixos/modules/services/misc/mwlib.nix b/nixos/modules/services/misc/mwlib.nix
index d02e1e021a7..a8edecff2a1 100644
--- a/nixos/modules/services/misc/mwlib.nix
+++ b/nixos/modules/services/misc/mwlib.nix
@@ -226,7 +226,7 @@ in
         chmod -Rc u=rwX,go= '${cfg.nslave.cachedir}'
       '';
 
-      path = with pkgs; [ imagemagick ];
+      path = with pkgs; [ imagemagick pdftk ];
       environment = {
         PYTHONPATH = concatMapStringsSep ":"
           (m: "${pypkgs.${m}}/lib/${python.libPrefix}/site-packages")

From 043a8478c35e5bf1ba53448aa7652b333f8e8ee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 8 Jun 2015 11:13:46 +0200
Subject: [PATCH 0876/2322] SDL: propagate libcap and fixup native inputs

Close #8205.
All inputs except pkgconfig shouldn't be native but rather disabled on
cygwin, I suppose.
---
 pkgs/development/libraries/SDL/default.nix  | 21 ++++++++++++---------
 pkgs/development/libraries/SDL2/default.nix |  2 +-
 pkgs/top-level/all-packages.nix             | 10 +++++-----
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 3e00b21ad43..a62fc837dd0 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -14,6 +14,9 @@ assert x11Support -> (x11 != null && libXrandr != null);
 assert alsaSupport -> alsaLib != null;
 assert pulseaudioSupport -> libpulseaudio != null;
 
+let
+  inherit (stdenv.lib) optional optionals;
+in
 stdenv.mkDerivation rec {
   version = "1.2.15";
   name    = "SDL-${version}";
@@ -23,19 +26,19 @@ stdenv.mkDerivation rec {
     sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
+
   # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
-  propagatedNativeBuildInputs =
-    stdenv.lib.optionals x11Support [ x11 libXrandr ] ++
-    stdenv.lib.optional alsaSupport alsaLib ++
-    stdenv.lib.optional pulseaudioSupport libpulseaudio;
+  propagatedBuildInputs =
+    optionals x11Support [ x11 libXrandr ] ++
+    optional alsaSupport alsaLib ++
+    optional stdenv.isLinux libcap ++
+    optional openglSupport mesa ++
+    optional pulseaudioSupport libpulseaudio;
 
   buildInputs = let
     notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
-  in stdenv.lib.optional stdenv.isLinux libcap
-    ++ (stdenv.lib.optional notMingw audiofile);
-
-  nativeBuildInputs = [ pkgconfig ] ++
-    stdenv.lib.optional openglSupport [ mesa ];
+  in optional notMingw audiofile;
 
   # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
   # we must arrange to add it to its RPATH; however, `patchelf' seems
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index bfd5ff65563..f5bd144a717 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     stdenv.lib.optional pulseaudioSupport libpulseaudio;
 
   buildInputs = [ pkgconfig audiofile ] ++
-    stdenv.lib.optional openglSupport [ mesa ] ++
+    stdenv.lib.optional openglSupport mesa ++
     stdenv.lib.optional alsaSupport alsaLib;
 
   # https://bugzilla.libsdl.org/show_bug.cgi?id=1431
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5be85900fec..a95784353b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7841,9 +7841,9 @@ let
 
   SDL = callPackage ../development/libraries/SDL {
     openglSupport = mesaSupported;
-    alsaSupport = (!stdenv.isDarwin);
-    x11Support = true;
-    pulseaudioSupport = (!stdenv.isDarwin);
+    alsaSupport = stdenv.isLinux;
+    x11Support = !stdenv.isCygwin;
+    pulseaudioSupport = stdenv.isLinux;
   };
 
   SDL_gfx = callPackage ../development/libraries/SDL_gfx { };
@@ -7862,8 +7862,8 @@ let
 
   SDL2 = callPackage ../development/libraries/SDL2 {
     openglSupport = mesaSupported;
-    alsaSupport = (!stdenv.isDarwin);
-    x11Support = (!stdenv.isDarwin);
+    alsaSupport = stdenv.isLinux;
+    x11Support = !stdenv.isCygwin;
     pulseaudioSupport = false; # better go through ALSA
   };
 

From 02b79010234cc6ed670ab6c0353f2b08283bdec6 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Tue, 10 Feb 2015 10:40:36 +0100
Subject: [PATCH 0877/2322] New flag for compiling libyaml-cpp as PIC.

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

diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
index 1ba31a7a6d5..f56bf77abfe 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, boost }:
+{ stdenv, fetchurl, cmake, boost, makePIC ? false }:
 
 stdenv.mkDerivation {
   name = "libyaml-cpp-0.5.1";
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ cmake boost ];
 
+  cmakeFlags = stdenv.lib.optionals makePIC [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ];
+
   meta = with stdenv.lib; {
     homepage = http://code.google.com/p/yaml-cpp/;
     description = "A YAML parser and emitter for C++";

From d3435d7ce006436a4056d0800083daffbfa8bca6 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 8 Jun 2015 11:18:26 +0200
Subject: [PATCH 0878/2322] New package: Calamares

Add Calamares, a distribution independent installer framework.
---
 pkgs/tools/misc/calamares/default.nix | 35 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  7 ++++++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/tools/misc/calamares/default.nix

diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
new file mode 100644
index 00000000000..c8fe39f6a7a
--- /dev/null
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchgit, cmake, qt5, polkit_qt5, libyamlcpp, python, boost, parted
+, extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart }:
+
+stdenv.mkDerivation rec {
+  name = "calamares-${version}";
+  version = "1.0";
+
+  src = fetchgit {
+    url = "https://github.com/calamares/calamares.git";
+    rev = "dabfb68a68cb012a90cd7b94a22e1ea08f7dd8ad";
+    sha256 = "2851ce487aaac61d2df342a47f91ec87fe52ff036227ef697caa7056fe5f188c";
+  };
+
+  buildInputs = [
+    cmake qt5.base qt5.tools libyamlcpp python boost polkit_qt5 parted
+    extra-cmake-modules kconfig ki18n kcoreaddons solid utillinux libatasmart
+  ];
+
+  cmakeFlags = [
+    "-DPYTHON_LIBRARY=${python}/lib/libpython${python.majorVersion}m.so"
+    "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"
+    "-DWITH_PARTITIONMANAGER=1"
+  ];
+
+  preInstall = ''
+    substituteInPlace cmake_install.cmake --replace "${polkit_qt5}" "$out"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Distribution-independent installer framework";
+    license = licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0311f6ac7b8..17f05d0eaad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1639,6 +1639,13 @@ let
     ghostscript = null;
   };
 
+  calamares = callPackage ../tools/misc/calamares rec {
+    python = python3;
+    boost = callPackage ../development/libraries/boost/1.57.nix { python=python3; };
+    libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; };
+    inherit (kf5_stable) extra-cmake-modules kconfig ki18n kcoreaddons solid;
+  };
+
   grub = callPackage_i686 ../tools/misc/grub {
     buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
     automake = automake112x; # fails with 13 and 14

From 8e7f4d3c336088dfe1ec6d6d3c2b64d5dd361151 Mon Sep 17 00:00:00 2001
From: "Kovacsics Robert (NixOS-SSD2)" <kovirobi@gmail.com>
Date: Mon, 8 Jun 2015 10:36:18 +0100
Subject: [PATCH 0879/2322] Remind update to 3.1.14, changes:

* Version 3.1 Patch 14 - 2014-04-24

- NEW FEATURE: Putting the line __EOF__ in a .rem file causes Remind to
  treat it as end-of-file.

- IMPROVEMENT: Use better PNG images for moons in the HTML display

- CHANGE: Author name updated from "David" to "Dianne"

- BUG FIX: The "-n" command-line option should really run in
  "ADVANCE_MODE" rather than "CAL_MODE" internally; otherwise, the
  substitution sequences may be misinterpreted.

- BUG FIX: A typo in clearing out MD5 sum context has been fixed.

- BUG FIX: Typo in Spanish translation was fixed.
---
 pkgs/tools/misc/remind/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix
index 18137312a3d..574178222c6 100644
--- a/pkgs/tools/misc/remind/default.nix
+++ b/pkgs/tools/misc/remind/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl} :
 
 stdenv.mkDerivation {
-  name = "remind-3.1.13";
+  name = "remind-3.1.14";
   src = fetchurl {
-    url = http://www.roaringpenguin.com/files/download/remind-03.01.13.tar.gz;
-    sha256 = "0kzw1d53nlj90qfsibbs2gkzp1hamqqxpj57ip4kz1j1xgan69ng";
+    url = http://www.roaringpenguin.com/files/download/remind-03.01.14.tar.gz;
+    sha256 = "1b9ij3r95lf14q6dyh8ilzc3y5yxxc1iss8wj3i49n6zjvklml8a";
   };
 
   meta = {

From f4dce11c19783d73e18b55c10c556da9341a4fca Mon Sep 17 00:00:00 2001
From: "Kovacsics Robert (NixOS-SSD2)" <kovirobi@gmail.com>
Date: Mon, 8 Jun 2015 10:56:00 +0100
Subject: [PATCH 0880/2322] Major update to vips and nip2 to 8.0.2, changes:

- Much better conversion to greyscale
- More efficient use of file descriptors
- Rewritten TIFF pyramid creator
- Removed old stuff

See http://libvips.blogspot.co.uk/2015/05/whats-new-in-80.html
and https://github.com/jcupitt/libvips/blob/master/ChangeLog
---
 pkgs/tools/graphics/nip2/default.nix | 4 ++--
 pkgs/tools/graphics/vips/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix
index 81222cde2ed..e61488e202d 100644
--- a/pkgs/tools/graphics/nip2/default.nix
+++ b/pkgs/tools/graphics/nip2/default.nix
@@ -2,11 +2,11 @@
 fftw, gsl, goffice_0_8, libgsf }:
 
 stdenv.mkDerivation rec {
-  name = "nip2-7.42.1";
+  name = "nip2-8.0";
 
   src = fetchurl {
     url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz";
-    sha256 = "14lfyn0azswrz8r81ign9lbpxzk7ibmnnp03a3l8wgxvm2j9a7jl";
+    sha256 = "10ybac0qrz63x1yk1d0gpv9z1vzpadyii2qhrai6lllplzw6jqx7";
   };
 
   buildInputs =
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index 28b65da24a5..a411080c390 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "vips-7.42.1";
+  name = "vips-8.0.2";
 
   src = fetchurl {
     url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz";
-    sha256 = "1gvazsyfa8w9wdwz89rpa1xmfpyk3b0cp4kkila1r9jc3sqp5qjy";
+    sha256 = "0fpshv71sxbkbycxgd2hvwn7fyq9rm0rsgq0b1zld1an88mi0v8y";
   };
 
   buildInputs =

From 98d5b81dadcb7ee6156910ac460a5a30f8f535fe Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 25 Apr 2015 16:02:44 +0200
Subject: [PATCH 0881/2322] nixos: add grafana module

---
 nixos/modules/misc/ids.nix                    |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/monitoring/grafana.nix | 335 ++++++++++++++++++
 3 files changed, 338 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/grafana.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index cc1976e236b..280e8d7238b 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -217,6 +217,7 @@
       asterisk = 192;
       plex = 193;
       bird = 195;
+      grafana = 196;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -412,6 +413,7 @@
       plex = 193;
       sabnzbd = 194;
       bird = 195;
+      #grafana = 196; #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/module-list.nix b/nixos/modules/module-list.nix
index d7b8b34aefe..6225c568dfc 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -225,6 +225,7 @@
   ./services/monitoring/collectd.nix
   ./services/monitoring/das_watchdog.nix
   ./services/monitoring/dd-agent.nix
+  ./services/monitoring/grafana.nix
   ./services/monitoring/graphite.nix
   ./services/monitoring/monit.nix
   ./services/monitoring/munin.nix
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
new file mode 100644
index 00000000000..ef0cc68a535
--- /dev/null
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -0,0 +1,335 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.grafana;
+
+  b2s = val: if val then "true" else "false";
+
+  cfgFile = pkgs.writeText "grafana.ini" ''
+    app_name = grafana
+    app_mode = production
+
+    [server]
+    ; protocol (http or https)
+    protocol = ${cfg.protocol}
+    ; the ip address to bind to, empty will bind to all interfaces
+    http_addr = ${cfg.addr}
+    ; the http port  to use
+    http_port = ${toString cfg.port}
+    ; The public facing domain name used to access grafana from a browser
+    domain = ${cfg.domain}
+    ; the full public facing url
+    root_url = ${cfg.rootUrl}
+    router_logging = false
+    ; the path relative to the binary where the static (html/js/css) files are placed
+    static_root_path = ${cfg.staticRootPath}
+    ; enable gzip
+    enable_gzip = false
+    ; https certs & key file
+    cert_file = ${cfg.certFile}
+    cert_key = ${cfg.certKey}
+
+    [analytics]
+    # Server reporting, sends usage counters to stats.grafana.org every 24 hours.
+    # No ip addresses are being tracked, only simple counters to track
+    # running instances, dashboard and error counts. It is very helpful to us.
+    # Change this option to false to disable reporting.
+    reporting_enabled = true
+    ; Google Analytics universal tracking code, only enabled if you specify an id here
+    google_analytics_ua_id =
+
+    [database]
+    ; Either "mysql", "postgres" or "sqlite3", it's your choice
+    type = ${cfg.database.type}
+    host = ${cfg.database.host}
+    name = ${cfg.database.name}
+    user = ${cfg.database.user}
+    password = ${cfg.database.password}
+    ; For "postgres" only, either "disable", "require" or "verify-full"
+    ssl_mode = disable
+    ; For "sqlite3" only
+    path = ${cfg.database.path}
+
+    [session]
+    ; Either "memory", "file", "redis", "mysql", default is "memory"
+    provider = file
+    ; Provider config options
+    ; memory: not have any config yet
+    ; file: session file path, e.g. `data/sessions`
+    ; redis: config like redis server addr, poolSize, password, e.g. `127.0.0.1:6379,100,grafana`
+    ; mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1)/database_name`
+    provider_config = data/sessions
+    ; Session cookie name
+    cookie_name = grafana_sess
+    ; If you use session in https only, default is false
+    cookie_secure = false
+    ; Session life time, default is 86400
+    session_life_time = 86400
+    ; session id hash func, Either "sha1", "sha256" or "md5" default is sha1
+    session_id_hashfunc = sha1
+    ; Session hash key, default is use random string
+    session_id_hashkey =
+
+    [security]
+    ; default admin user, created on startup
+    admin_user = ${cfg.security.adminUser}
+    ; default admin password, can be changed before first start of grafana,  or in profile settings
+    admin_password = ${cfg.security.adminPassword}
+    ; used for signing
+    secret_key = ${cfg.security.secretKey}
+    ; Auto-login remember days
+    login_remember_days = 7
+    cookie_username = grafana_user
+    cookie_remember_name = grafana_remember
+
+    [users]
+    ; disable user signup / registration
+    allow_sign_up = ${b2s cfg.users.allowSignUp}
+    ; Allow non admin users to create organizations
+    allow_org_create = ${b2s cfg.users.allowOrgCreate}
+    # Set to true to automatically assign new users to the default organization (id 1)
+    auto_assign_org = ${b2s cfg.users.autoAssignOrg}
+    ; Default role new users will be automatically assigned (if disabled above is set to true)
+    auto_assign_org_role = ${cfg.users.autoAssignOrgRole}
+
+    [auth.anonymous]
+    ; enable anonymous access
+    enabled = ${b2s cfg.auth.anonymous.enable}
+    ; specify organization name that should be used for unauthenticated users
+    org_name = Main Org.
+    ; specify role for unauthenticated users
+    org_role = Viewer
+
+    [auth.github]
+    enabled = false
+    client_id = some_id
+    client_secret = some_secret
+    scopes = user:email
+    auth_url = https://github.com/login/oauth/authorize
+    token_url = https://github.com/login/oauth/access_token
+
+    [auth.google]
+    enabled = false
+    client_id = some_client_id
+    client_secret = some_client_secret
+    scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
+    auth_url = https://accounts.google.com/o/oauth2/auth
+    token_url = https://accounts.google.com/o/oauth2/token
+
+    [log]
+    root_path = data/log
+    ; Either "console", "file", default is "console"
+    ; Use comma to separate multiple modes, e.g. "console, file"
+    mode = console
+    ; Buffer length of channel, keep it as it is if you don't know what it is.
+    buffer_len = 10000
+    ; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace"
+    level = Info
+
+    ; For "console" mode only
+    [log.console]
+    level =
+
+    ; For "file" mode only
+    [log.file]
+    level =
+    ; This enables automated log rotate(switch of following options), default is true
+    log_rotate = true
+    ; Max line number of single file, default is 1000000
+    max_lines = 1000000
+    ; Max size shift of single file, default is 28 means 1 << 28, 256MB
+    max_lines_shift = 28
+    ; Segment log daily, default is true
+    daily_rotate = true
+    ; Expired days of log file(delete after max days), default is 7
+    max_days = 7
+
+    [event_publisher]
+    enabled = false
+    rabbitmq_url = amqp://localhost/
+    exchange = grafana_events
+  '';
+
+in {
+  options.services.grafana = {
+    enable = mkEnableOption "Whether to enable grafana.";
+
+    protocol = mkOption {
+      description = "Which protocol to listen.";
+      default = "http";
+      type = types.enum ["http" "https"];
+    };
+
+    addr = mkOption {
+      description = "Listening address.";
+      default = "127.0.0.1";
+      type = types.str;
+    };
+
+    port = mkOption {
+      description = "Listening port.";
+      default = 3000;
+      type = types.int;
+    };
+
+    domain = mkOption {
+      description = "The public facing domain name used to access grafana from a browser.";
+      default = "localhost";
+      type = types.str;
+    };
+
+    rootUrl = mkOption {
+      description = "Full public facing url.";
+      default = "%(protocol)s://%(domain)s:%(http_port)s/";
+      type = types.str;
+    };
+
+    certFile = mkOption {
+      description = "Cert file for ssl.";
+      default = "";
+      type = types.str;
+    };
+
+    certKey = mkOption {
+      description = "Cert key for ssl.";
+      default = "";
+      type = types.str;
+    };
+
+    staticRootPath = mkOption {
+      description = "Root path for static assets.";
+      default = "${cfg.package}/share/go/src/github.com/grafana/grafana/public";
+      type = types.str;
+    };
+
+    package = mkOption {
+      description = "Package to use.";
+      default = pkgs.goPackages.grafana;
+      type = types.package;
+    };
+
+    dataDir = mkOption {
+      description = "Data directory.";
+      default = "/var/lib/grafana";
+      type = types.path;
+    };
+
+    database = {
+      type = mkOption {
+        description = "Database type.";
+        default = "sqlite3";
+        type = types.enum ["mysql" "sqlite3" "postgresql"];
+      };
+
+      host = mkOption {
+        description = "Database host.";
+        default = "127.0.0.1:3306";
+        type = types.str;
+      };
+
+      name = mkOption {
+        description = "Database name.";
+        default = "grafana";
+        type = types.str;
+      };
+
+      user = mkOption {
+        description = "Database user.";
+        default = "root";
+        type = types.str;
+      };
+
+      password = mkOption {
+        description = "Database password.";
+        default = "";
+        type = types.str;
+      };
+
+      path = mkOption {
+        description = "Database path.";
+        default = "${cfg.dataDir}/data/grafana.db";
+        type = types.path;
+      };
+    };
+
+    security = {
+      adminUser = mkOption {
+        description = "Default admin username.";
+        default = "admin";
+        type = types.str;
+      };
+
+      adminPassword = mkOption {
+        description = "Default admin password.";
+        default = "admin";
+        type = types.str;
+      };
+
+      secretKey = mkOption {
+        description = "Secret key used for signing.";
+        default = "SW2YcwTIb9zpOOhoPsMm";
+        type = types.str;
+      };
+    };
+
+    users = {
+      allowSignUp = mkOption {
+        description = "Disable user signup / registration";
+        default = false;
+        type = types.bool;
+      };
+
+      allowOrgCreate = mkOption {
+        description = "Whether user is allowed to create organizations.";
+        default = false;
+        type = types.bool;
+      };
+
+      autoAssignOrg = mkOption {
+        description = "Whether to automatically assign new users to default org.";
+        default = true;
+        type = types.bool;
+      };
+
+      autoAssignOrgRole = mkOption {
+        description = "Default role new users will be auto assigned.";
+        default = "Viewer";
+        type = types.enum ["Viewer" "Editor"];
+      };
+    };
+
+    auth.anonymous = {
+      enable = mkOption {
+        description = "Whether to allow anonymous access";
+        default = false;
+        type = types.bool;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    warnings = [
+      "Grafana passwords will be stored as plaintext in nix store!"
+    ];
+
+    systemd.services.grafana = {
+      description = "Grafana Service Daemon";
+      wantedBy = ["multi-user.target"];
+      after = ["networking.target"];
+      serviceConfig = {
+        ExecStart = "${cfg.package}/bin/grafana --config ${cfgFile} web";
+        WorkingDirectory = cfg.dataDir;
+        User = "grafana";
+      };
+    };
+
+    users.extraUsers.grafana = {
+      uid = config.ids.uids.grafana;
+      description = "Grafana user";
+      home = cfg.dataDir;
+      createHome = true;
+    };
+  };
+}

From eac4f2aa313466855843143571879d61061571c9 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 8 Jun 2015 12:16:34 +0200
Subject: [PATCH 0882/2322] calibre: update from 2.29.0 to 2.30.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 0e821e92703..b5dbfe207fe 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-2.29.0";
+  name = "calibre-2.30.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "1n3cfnjnghhhsgzcbcvbr0gh191lhl6az09q1s68jhlcc2lski6l";
+    sha256 = "1k2rpn06nfzqjy5k6fh8pwfj8vbhpn7rgkpkkpz5n2fqg3z8ph1j";
   };
 
   inherit python;

From ef1c9cdeef21c2c1b11931182662f644701367f1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 8 Jun 2015 12:29:53 +0200
Subject: [PATCH 0883/2322] llpp: update to HEAD

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

diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index bbae8aca2b8..601ffe25200 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -4,12 +4,12 @@
 let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
 in stdenv.mkDerivation rec {
   name = "llpp-${version}";
-  version = "21-git-2015-04-27";
+  version = "21-git-2015-06-06";
 
   src = fetchgit {
     url = "git://repo.or.cz/llpp.git";
-    rev = "66868744188151eaa433d42c807e1efc5f623aa4";
-    sha256 = "04hjbkzxixw88xmrpbr1smq486wfw3q9hvy7b4bfcb9j32mazk5c";
+    rev = "492d761c0c7c8c4ccdd4f0d3fa7c51434ce8acf2";
+    sha256 = "14dp5sw7cd6bja9d3zpxmswbk0k0b7x2fzb1fflhnnnhjc39irk9";
   };
 
   buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl

From 9f7d7adb052ceed89d817b46facbe7c192e36ce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 8 Jun 2015 11:22:36 +0200
Subject: [PATCH 0884/2322] Revert "kmod-blacklist-ubuntu: update to Vivid"

This reverts commit 0307c27219ba43cc0a78cd370f825deca16eeaa2.

The only change was blacklisting bochs-drm, but that breaks our VM setup
and I don't see a good reason to do that on the Ubuntu issue
(just some PowerPC failure).

Defaulting to qxl driver might be better anyway, but I'm not venturing
such changes now.
---
 pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index b894908eb13..c750006fcd2 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, gnugrep, findutils }:
 let
-  version = "18-3ubuntu1"; # Vivid
+  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 = "14ypc1ij9rjnkz4zklbxpgf0ac1bnqlx0mjv0pjjvrrf857fiq94";
+    url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_9-${version}.debian.tar.gz";
+    sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67";
   };
 
   installPhase = ''

From 6ceecb5548f67640efe9fb350789d206a30ea01a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 8 Jun 2015 12:54:29 +0200
Subject: [PATCH 0885/2322] zsh: update from 5.0.7 to 5.0.8

add myself as maintainer
---
 pkgs/shells/zsh/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index ada34030034..b755d28c851 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -2,11 +2,11 @@
 
 let
 
-  version = "5.0.7";
+  version = "5.0.8";
 
   documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2";
-    sha256 = "1wgw16r7z6k3mbr94mwfc8f13yc4ds2d9qk41hvsiv6rm5dnds23";
+    sha256 = "0h4y6f0fjb1lf83j4cixl0h5jgyy5q7y1iw7w33flp7s8y60ir8f";
   };
 
 in
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2";
-    sha256 = "1cq4cz7ngvmbg399dva3g6njcz5d92gprmyi2swqc0klh7g2fkjl";
+    sha256 = "08vxw74v8cx6hcynz0cdf7s2z5p6nqmxfsxmhhpz5vwbrc4cyyc0";
   };
 
   buildInputs = [ ncurses coreutils pcre ];
@@ -69,7 +69,7 @@ EOF
     '';
     license = "MIT-like";
     homepage = "http://www.zsh.org/";
-    maintainers = with stdenv.lib.maintainers; [ chaoflow ];
+    maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ];
     platforms = stdenv.lib.platforms.unix;
   };
 }

From 392fc849e41e4d9175c185bac4a8fa480bf832b2 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 8 Jun 2015 13:10:32 +0200
Subject: [PATCH 0886/2322] Update kubernetes to 0.18.0, fix module

---
 nixos/modules/services/cluster/kubernetes.nix | 49 +++++++++----------
 .../networking/cluster/kubernetes/default.nix | 12 +++--
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index 6a775bb159f..8362589f155 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -343,26 +343,25 @@ in {
                 (concatImapStringsSep "\n" (i: v: v + "," + (toString i))
                     (mapAttrsToList (name: token: token + "," + name) cfg.apiserver.tokenAuth));
           in ''${cfg.package}/bin/kube-apiserver \
-            --etcd_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \
-            --address=${cfg.apiserver.address} \
-            --port=${toString cfg.apiserver.port} \
-            --read_only_port=${toString cfg.apiserver.readOnlyPort} \
-            --public_address_override=${cfg.apiserver.publicAddress} \
-            --allow_privileged=${if cfg.apiserver.allowPrivileged then "true" else "false"} \
+            --etcd-servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \
+            --insecure-bind-address=${cfg.apiserver.address} \
+            --insecure-port=${toString cfg.apiserver.port} \
+            --read-only-port=${toString cfg.apiserver.readOnlyPort} \
+            --bind-address=${cfg.apiserver.publicAddress} \
+            --allow-privileged=${if cfg.apiserver.allowPrivileged then "true" else "false"} \
             ${optionalString (cfg.apiserver.tlsCertFile!="")
-              "--tls_cert_file=${cfg.apiserver.tlsCertFile}"} \
+              "--tls-cert-file=${cfg.apiserver.tlsCertFile}"} \
             ${optionalString (cfg.apiserver.tlsPrivateKeyFile!="")
-              "--tls_private_key_file=${cfg.apiserver.tlsPrivateKeyFile}"} \
+              "--tls-private-key-file=${cfg.apiserver.tlsPrivateKeyFile}"} \
             ${optionalString (cfg.apiserver.tokenAuth!=[])
-              "--token_auth_file=${tokenAuthFile}"} \
-            --authorization_mode=${cfg.apiserver.authorizationMode} \
+              "--token-auth-file=${tokenAuthFile}"} \
+            --authorization-mode=${cfg.apiserver.authorizationMode} \
             ${optionalString (cfg.apiserver.authorizationMode == "ABAC")
-              "--authorization_policy_file=${authorizationPolicyFile}"} \
-            --secure_port=${toString cfg.apiserver.securePort} \
-            --portal_net=${cfg.apiserver.portalNet} \
+              "--authorization-policy-file=${authorizationPolicyFile}"} \
+            --secure-port=${toString cfg.apiserver.securePort} \
+            --service-cluster-ip-range=${cfg.apiserver.portalNet} \
             --logtostderr=true \
-            --runtime_config=api/v1beta3 \
-            ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \
+            ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
             ${cfg.apiserver.extraOpts}
           '';
           User = "kubernetes";
@@ -386,7 +385,7 @@ in {
             --port=${toString cfg.scheduler.port} \
             --master=${cfg.scheduler.master} \
             --logtostderr=true \
-            ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \
+            ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
             ${cfg.scheduler.extraOpts}
           '';
           User = "kubernetes";
@@ -406,7 +405,7 @@ in {
             --master=${cfg.controllerManager.master} \
             --machines=${concatStringsSep "," cfg.controllerManager.machines} \
             --logtostderr=true \
-            ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \
+            ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
             ${cfg.controllerManager.extraOpts}
           '';
           User = "kubernetes";
@@ -423,17 +422,17 @@ in {
         script = ''
           export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH"
           exec ${cfg.package}/bin/kubelet \
-            --api_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers}  \
+            --api-servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers}  \
             --address=${cfg.kubelet.address} \
             --port=${toString cfg.kubelet.port} \
-            --hostname_override=${cfg.kubelet.hostname} \
-            --allow_privileged=${if cfg.kubelet.allowPrivileged then "true" else "false"} \
-            --root_dir=${cfg.dataDir} \
+            --hostname-override=${cfg.kubelet.hostname} \
+            --allow-privileged=${if cfg.kubelet.allowPrivileged then "true" else "false"} \
+            --root-dir=${cfg.dataDir} \
             --cadvisor_port=${toString cfg.kubelet.cadvisorPort} \
             ${optionalString (cfg.kubelet.clusterDns != "")
-                ''--cluster_dns=${cfg.kubelet.clusterDns}''} \
+                ''--cluster-dns=${cfg.kubelet.clusterDns}''} \
             ${optionalString (cfg.kubelet.clusterDomain != "")
-                ''--cluster_domain=${cfg.kubelet.clusterDomain}''} \
+                ''--cluster-domain=${cfg.kubelet.clusterDomain}''} \
             --logtostderr=true \
             ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \
             ${cfg.kubelet.extraOpts}
@@ -450,9 +449,9 @@ in {
         serviceConfig = {
           ExecStart = ''${cfg.package}/bin/kube-proxy \
             --master=${cfg.proxy.master} \
-            --bind_address=${cfg.proxy.address} \
+            --bind-address=${cfg.proxy.address} \
             --logtostderr=true \
-            ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \
+            ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
             ${cfg.proxy.extraOpts}
           '';
         };
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index fbfe4de23b8..a096d43b11c 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -2,27 +2,33 @@
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "0.15.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "1jiczhx01i8czm1gzd232z2ds2f1lvs5ifa9zjabhzw5ykfzdjg8";
+    sha256 = "1adbd5n2fs1278f6kz6pd23813w2k4pgcxjl21idflh8jafxsyj7";
   };
 
   buildInputs = [ makeWrapper which go iptables rsync ];
 
   buildPhase = ''
+    GOPATH=$(pwd):$(pwd)/Godeps/_workspace
+    mkdir -p $(pwd)/Godeps/_workspace/src/github.com/GoogleCloudPlatform
+    ln -s $(pwd) $(pwd)/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes
+
     substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
-    GOPATH=$(pwd)
     patchShebangs ./hack
     hack/build-go.sh --use_go_build
+
+    (cd cluster/addons/dns/kube2sky && go build ./kube2sky.go)
   '';
 
   installPhase = ''
     mkdir -p "$out/bin"
     cp _output/local/go/bin/* "$out/bin/"
+    cp cluster/addons/dns/kube2sky/kube2sky "$out/bin/"
   '';
 
   preFixup = ''

From 92725618b2f859b27037fd4ef14bf56b4d9fb924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 8 Jun 2015 13:12:18 +0200
Subject: [PATCH 0887/2322] Revert "glib hooks: move gsettings-schemas if on
 wrong place"

This reverts commit 5df1aadd68a157997c5ff419a8f4e1db23e5a5ae.

It introduced some problems.
---
 pkgs/development/libraries/glib/setup-hook.sh | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh
index 8d63af6b9b4..f173744e5ca 100644
--- a/pkgs/development/libraries/glib/setup-hook.sh
+++ b/pkgs/development/libraries/glib/setup-hook.sh
@@ -10,15 +10,8 @@ make_glib_find_gsettings_schemas() {
 
 envHooks+=(make_glib_find_gsettings_schemas)
 
-glibFixupPhase() {
-    # Move gschemas in case the install flag didn't help
-    if [ -d "$prefix/share/glib-2.0/schemas" ]; then
-        mkdir -p "$prefix/share/gsettings-schemas/$name/glib-2.0"
-        mv "$prefix/share/glib-2.0/schemas" "$prefix/share/gsettings-schemas/$name/glib-2.0/"
-    fi
-
-    addToSearchPath GSETTINGS_SCHEMAS_PATH "$prefix/share/gsettings-schemas/$name"
+glibPreFixupPhase() {
+    addToSearchPath GSETTINGS_SCHEMAS_PATH "$out/share/gsettings-schemas/$name"
 }
 
-fixupOutputHooks+=(glibFixupPhase)
-
+preFixupPhases="$preFixupPhases glibPreFixupPhase"

From f7a452c8c14ca4f9c384482eec89e7a758310352 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 8 Jun 2015 13:15:26 +0200
Subject: [PATCH 0888/2322] nixos/kubernetes: skydns integration

---
 nixos/modules/services/cluster/kubernetes.nix | 57 +++++++++++++++++--
 1 file changed, 51 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index 8362589f155..a7f4ec7b008 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -286,7 +286,7 @@ in {
 
       clusterDomain = mkOption {
         description = "Use alternative domain.";
-        default = "";
+        default = "kubernetes.io";
         type = types.str;
       };
 
@@ -322,13 +322,35 @@ in {
         type = types.str;
       };
     };
+
+    kube2sky = {
+      enable = mkEnableOption "Whether to enable kube2sky dns service.";
+
+      domain = mkOption  {
+        description = "Kuberntes kube2sky domain under which all DNS names will be hosted.";
+        default = cfg.kubelet.clusterDomain;
+        type = types.str;
+      };
+
+      master = mkOption {
+        description = "Kubernetes apiserver address";
+        default = "${cfg.apiserver.address}:${toString cfg.apiserver.port}";
+        type = types.str;
+      };
+
+      extraOpts = mkOption {
+        description = "Kubernetes kube2sky extra command line options.";
+        default = "";
+        type = types.str;
+      };
+    };
   };
 
   ###### implementation
 
   config = mkMerge [
     (mkIf cfg.apiserver.enable {
-      systemd.services.kubernetes-apiserver = {
+      systemd.services.kube-apiserver = {
         description = "Kubernetes Api Server";
         wantedBy = [ "multi-user.target" ];
         requires = ["kubernetes-setup.service"];
@@ -375,7 +397,7 @@ in {
     })
 
     (mkIf cfg.scheduler.enable {
-      systemd.services.kubernetes-scheduler = {
+      systemd.services.kube-scheduler = {
         description = "Kubernetes Scheduler Service";
         wantedBy = [ "multi-user.target" ];
         after = [ "network-interfaces.target" "kubernetes-apiserver.service" ];
@@ -394,7 +416,7 @@ in {
     })
 
     (mkIf cfg.controllerManager.enable {
-      systemd.services.kubernetes-controller-manager = {
+      systemd.services.kube-controller-manager = {
         description = "Kubernetes Controller Manager Service";
         wantedBy = [ "multi-user.target" ];
         after = [ "network-interfaces.target" "kubernetes-apiserver.service" ];
@@ -414,7 +436,7 @@ in {
     })
 
     (mkIf cfg.kubelet.enable {
-      systemd.services.kubernetes-kubelet = {
+      systemd.services.kubelet = {
         description = "Kubernetes Kubelet Service";
         wantedBy = [ "multi-user.target" ];
         requires = ["kubernetes-setup.service"];
@@ -442,7 +464,7 @@ in {
     })
 
     (mkIf cfg.proxy.enable {
-      systemd.services.kubernetes-proxy = {
+      systemd.services.kube-proxy = {
         description = "Kubernetes Proxy Service";
         wantedBy = [ "multi-user.target" ];
         after = [ "network-interfaces.target" "etcd.service" ];
@@ -458,10 +480,33 @@ in {
       };
     })
 
+    (mkIf cfg.kube2sky.enable {
+      systemd.services.kube2sky = {
+        description = "Kubernetes Dns Bridge Service";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" "skydns.service" "etcd.service" "kubernetes-apiserver.service" ];
+        serviceConfig = {
+          ExecStart = ''${cfg.package}/bin/kube2sky \
+            -etcd-server=http://${head cfg.etcdServers} \
+            -domain=${cfg.kube2sky.domain} \
+            -kube_master_url=http://${cfg.kube2sky.master} \
+            -logtostderr=true \
+            ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
+            ${cfg.kube2sky.extraOpts}
+          '';
+          User = "kubernetes";
+        };
+      };
+
+      services.skydns.enable = mkDefault true;
+      services.skydns.domain = mkDefault cfg.kubelet.clusterDomain;
+    })
+
     (mkIf (any (el: el == "master") cfg.roles) {
       services.kubernetes.apiserver.enable = mkDefault true;
       services.kubernetes.scheduler.enable = mkDefault true;
       services.kubernetes.controllerManager.enable = mkDefault true;
+      services.kubernetes.kube2sky.enable = mkDefault true;
     })
 
     (mkIf (any (el: el == "node") cfg.roles) {

From 9cd6786acb2091a59b3647543cbb1197693b28f9 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 8 Jun 2015 13:21:58 +0200
Subject: [PATCH 0889/2322] elasticsearch: update from 1.4.4 to 1.4.5,
 potenially fixes CVE-2015-3337

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

diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix
index 635934db23c..be30e12258b 100644
--- a/pkgs/servers/search/elasticsearch/default.nix
+++ b/pkgs/servers/search/elasticsearch/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "elasticsearch-1.4.4";
+  name = "elasticsearch-1.4.5";
 
   src = fetchurl {
     url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz";
-    sha256 = "11l57r0pnx20v6zy047lw5zgq9r3w95k1smsvrj0clk89r3qs5d3";
+    sha256 = "1qjnffbxa1fz5f3sqahhgf45b4r1xa5lkjy9xj135g0w8jgala6w";
   };
 
   patches = [ ./es-home.patch ];

From 8895716869e49f0a9d370e73d40a0df71010b154 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 8 Jun 2015 13:28:25 +0200
Subject: [PATCH 0890/2322] zeromq: update from 4.0.5 to 4.0.6, fixes
 CVE-2014-9721

---
 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 eaa719b92c9..744703adb24 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libuuid }:
 
 stdenv.mkDerivation rec {
-  name = "zeromq-4.0.5";
+  name = "zeromq-4.0.6";
 
   src = fetchurl {
     url = "http://download.zeromq.org/${name}.tar.gz";
-    sha256 = "0arl8fy8d03xd5h0mgda1s5bajwg8iyh1kk4hd1420rpcxgkrj9v";
+    sha256 = "0arl8fy8d03xd5h0mgda1s5bajwg8iyh1kk4hd1420rpcxgkrj91";
   };
 
   buildInputs = [ libuuid ];

From 23504e5bf20d5df882c7ea9199299967be02ec10 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 8 Jun 2015 13:36:05 +0200
Subject: [PATCH 0891/2322] Add skydns module

---
 nixos/modules/misc/ids.nix                   |  2 +
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/networking/skydns.nix | 91 ++++++++++++++++++++
 3 files changed, 94 insertions(+)
 create mode 100644 nixos/modules/services/networking/skydns.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 280e8d7238b..5b4cb54517c 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -218,6 +218,7 @@
       plex = 193;
       bird = 195;
       grafana = 196;
+      skydns = 197;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -414,6 +415,7 @@
       sabnzbd = 194;
       bird = 195;
       #grafana = 196; #unused
+      #skydns = 197; #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/module-list.nix b/nixos/modules/module-list.nix
index 6225c568dfc..fa39a5d9432 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -318,6 +318,7 @@
   ./services/networking/sabnzbd.nix
   ./services/networking/searx.nix
   ./services/networking/seeks.nix
+  ./services/networking/skydns.nix
   ./services/networking/spiped.nix
   ./services/networking/sslh.nix
   ./services/networking/ssh/lshd.nix
diff --git a/nixos/modules/services/networking/skydns.nix b/nixos/modules/services/networking/skydns.nix
new file mode 100644
index 00000000000..2d0129d6310
--- /dev/null
+++ b/nixos/modules/services/networking/skydns.nix
@@ -0,0 +1,91 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.skydns;
+
+in {
+  options.services.skydns = {
+    enable = mkEnableOption "Whether to enable skydns service.";
+
+    etcd = {
+      machines = mkOption {
+        default = [ "http://localhost:4001" ];
+        type = types.listOf types.str;
+        description = "Skydns list of etcd endpoints to connect to.";
+      };
+
+      tlsKey = mkOption {
+        default = null;
+        type = types.nullOr types.path;
+        description = "Skydns path of TLS client certificate - private key.";
+      };
+
+      tlsPem = mkOption {
+        default = null;
+        type = types.nullOr types.path;
+        description = "Skydns path of TLS client certificate - public key.";
+      };
+
+      caCert = mkOption {
+        default = null;
+        type = types.nullOr types.path;
+        description = "Skydns path of TLS certificate authority public key.";
+      };
+    };
+
+    address = mkOption {
+      default = "0.0.0.0:53";
+      type = types.str;
+      description = "Skydns address to bind to.";
+    };
+
+    domain = mkOption {
+      default = "skydns.local.";
+      type = types.str;
+      description = "Skydns default domain if not specified by etcd config.";
+    };
+
+    nameservers = mkOption {
+      default = map (n: n + ":53") config.networking.nameservers;
+      type = types.listOf types.str;
+      description = "Skydns list of nameservers to forward DNS requests to when not authoritative for a domain.";
+      example = ["8.8.8.8:53" "8.8.4.4:53"];
+    };
+
+    package = mkOption {
+      default = pkgs.goPackages.skydns;
+      type = types.package;
+      description = "Skydns package to use.";
+    };
+
+    extraConfig = mkOption {
+      default = {};
+      type = types.attrsOf types.str;
+      description = "Skydns attribute set of extra config options passed as environemnt variables.";
+    };
+  };
+
+  config = mkIf (cfg.enable) {
+    systemd.services.skydns = {
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" "etcd.service" ];
+      description = "Skydns Service";
+      environment = {
+        ETCD_MACHINES = concatStringsSep "," cfg.etcd.machines;
+        ETCD_TLSKEY = cfg.etcd.tlsKey;
+        ETCD_TLSPEM = cfg.etcd.tlsPem;
+        ETCD_CACERT = cfg.etcd.caCert;
+        SKYDNS_ADDR = cfg.address;
+        SKYDNS_DOMAIN = cfg.domain;
+        SKYDNS_NAMESERVER = concatStringsSep "," cfg.nameservers;
+      };
+      serviceConfig = {
+        ExecStart = "${cfg.package}/bin/skydns";
+      };
+    };
+
+    environment.systemPackages = [ cfg.package ];
+  };
+}

From c9da002a07a835bef8b6e7e3eeeb5f4a85b39ba3 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 8 Jun 2015 13:41:43 +0200
Subject: [PATCH 0892/2322] nixos/consul: fix consul alerts enable

---
 nixos/modules/services/networking/consul.nix | 189 ++++++++++---------
 1 file changed, 100 insertions(+), 89 deletions(-)

diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index 53a9f462625..31bae628050 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -106,6 +106,12 @@ in
       alerts = {
         enable = mkEnableOption "Whether to enable consul-alerts";
 
+        package = mkOption {
+          description = "Package to use for consul-alerts.";
+          default = pkgs.consul-alerts;
+          type = types.package;
+        };
+
         listenAddr = mkOption {
           description = "Api listening address.";
           default = "localhost:9000";
@@ -135,96 +141,101 @@ in
 
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf cfg.enable (
+    mkMerge [{
 
-    users.extraUsers."consul" = {
-      description = "Consul agent daemon user";
-      uid = config.ids.uids.consul;
-      # The shell is needed for health checks
-      shell = "/run/current-system/sw/bin/bash";
-    };
-
-    environment = {
-      etc."consul.json".text = builtins.toJSON configOptions;
-      # We need consul.d to exist for consul to start
-      etc."consul.d/dummy.json".text = "{ }";
-      systemPackages = with pkgs; [ consul ];
-    };
-
-    systemd.services.consul = {
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ] ++ systemdDevices;
-      bindsTo = systemdDevices;
-      restartTriggers = [ config.environment.etc."consul.json".source ]
-        ++ mapAttrsToList (_: d: d.source)
-          (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc);
-
-      serviceConfig = {
-        ExecStart = "@${pkgs.consul}/bin/consul consul agent -config-dir /etc/consul.d"
-          + concatMapStrings (n: " -config-file ${n}") configFiles;
-        ExecReload = "${pkgs.consul}/bin/consul reload";
-        PermissionsStartOnly = true;
-        User = if cfg.dropPrivileges then "consul" else null;
-        TimeoutStartSec = "0";
-      } // (optionalAttrs (cfg.leaveOnStop) {
-        ExecStop = "${pkgs.consul}/bin/consul leave";
-      });
-
-      path = with pkgs; [ iproute gnugrep gawk consul ];
-      preStart = ''
-        mkdir -m 0700 -p ${dataDir}
-        chown -R consul ${dataDir}
-
-        # Determine interface addresses
-        getAddrOnce () {
-          ip addr show dev "$1" \
-            | grep 'inet${optionalString (cfg.forceIpv4) " "}.*scope global' \
-            | awk -F '[ /\t]*' '{print $3}' | head -n 1
-        }
-        getAddr () {
-          ADDR="$(getAddrOnce $1)"
-          LEFT=60 # Die after 1 minute
-          while [ -z "$ADDR" ]; do
-            sleep 1
-            LEFT=$(expr $LEFT - 1)
-            if [ "$LEFT" -eq "0" ]; then
-              echo "Address lookup timed out"
-              exit 1
-            fi
-            ADDR="$(getAddrOnce $1)"
-          done
-          echo "$ADDR"
-        }
-        echo "{" > /etc/consul-addrs.json
-        delim=" "
-      ''
-      + concatStrings (flip mapAttrsToList cfg.interface (name: i:
-        optionalString (i != null) ''
-          echo "$delim \"${name}_addr\": \"$(getAddr "${i}")\"" >> /etc/consul-addrs.json
-          delim=","
-        ''))
-      + ''
-        echo "}" >> /etc/consul-addrs.json
-      '';
-    };
-
-    systemd.services.consul-alerts = mkIf (cfg.alerts.enable) {
-      wantedBy = [ "multi-user.target" ];
-      after = [ "consul.service" ];
-
-      path = [ pkgs.consul ];
-
-      serviceConfig = {
-        ExecStart = ''
-          ${pkgs.consul-alerts}/bin/consul-alerts start \
-            --alert-addr=${cfg.alerts.listenAddr} \
-            --consul-addr=${cfg.alerts.consulAddr} \
-            ${optionalString cfg.alerts.watchChecks "--watch-checks"} \
-            ${optionalString cfg.alerts.watchEvents "--watch-events"}
-        '';
-        User = if cfg.dropPrivileges then "consul" else null;
+      users.extraUsers."consul" = {
+        description = "Consul agent daemon user";
+        uid = config.ids.uids.consul;
+        # The shell is needed for health checks
+        shell = "/run/current-system/sw/bin/bash";
       };
-    };
 
-  };
+      environment = {
+        etc."consul.json".text = builtins.toJSON configOptions;
+        # We need consul.d to exist for consul to start
+        etc."consul.d/dummy.json".text = "{ }";
+        systemPackages = with pkgs; [ consul ];
+      };
+
+      systemd.services.consul = {
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ] ++ systemdDevices;
+        bindsTo = systemdDevices;
+        restartTriggers = [ config.environment.etc."consul.json".source ]
+          ++ mapAttrsToList (_: d: d.source)
+            (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc);
+
+        serviceConfig = {
+          ExecStart = "@${pkgs.consul}/bin/consul consul agent -config-dir /etc/consul.d"
+            + concatMapStrings (n: " -config-file ${n}") configFiles;
+          ExecReload = "${pkgs.consul}/bin/consul reload";
+          PermissionsStartOnly = true;
+          User = if cfg.dropPrivileges then "consul" else null;
+          TimeoutStartSec = "0";
+        } // (optionalAttrs (cfg.leaveOnStop) {
+          ExecStop = "${pkgs.consul}/bin/consul leave";
+        });
+
+        path = with pkgs; [ iproute gnugrep gawk consul ];
+        preStart = ''
+          mkdir -m 0700 -p ${dataDir}
+          chown -R consul ${dataDir}
+
+          # Determine interface addresses
+          getAddrOnce () {
+            ip addr show dev "$1" \
+              | grep 'inet${optionalString (cfg.forceIpv4) " "}.*scope global' \
+              | awk -F '[ /\t]*' '{print $3}' | head -n 1
+          }
+          getAddr () {
+            ADDR="$(getAddrOnce $1)"
+            LEFT=60 # Die after 1 minute
+            while [ -z "$ADDR" ]; do
+              sleep 1
+              LEFT=$(expr $LEFT - 1)
+              if [ "$LEFT" -eq "0" ]; then
+                echo "Address lookup timed out"
+                exit 1
+              fi
+              ADDR="$(getAddrOnce $1)"
+            done
+            echo "$ADDR"
+          }
+          echo "{" > /etc/consul-addrs.json
+          delim=" "
+        ''
+        + concatStrings (flip mapAttrsToList cfg.interface (name: i:
+          optionalString (i != null) ''
+            echo "$delim \"${name}_addr\": \"$(getAddr "${i}")\"" >> /etc/consul-addrs.json
+            delim=","
+          ''))
+        + ''
+          echo "}" >> /etc/consul-addrs.json
+        '';
+      };
+    }
+
+    (mkIf (cfg.alerts.enable) {
+      systemd.services.consul-alerts = {
+        wantedBy = [ "multi-user.target" ];
+        after = [ "consul.service" ];
+
+        path = [ pkgs.consul ];
+
+        serviceConfig = {
+          ExecStart = ''
+            ${cfg.alerts.package}/bin/consul-alerts start \
+              --alert-addr=${cfg.alerts.listenAddr} \
+              --consul-addr=${cfg.alerts.consulAddr} \
+              ${optionalString cfg.alerts.watchChecks "--watch-checks"} \
+              ${optionalString cfg.alerts.watchEvents "--watch-events"}
+          '';
+          User = if cfg.dropPrivileges then "consul" else null;
+          Restart = "on-failure";
+        };
+      };
+    })
+
+  ]);
 }

From 2e5dbc474637e092392b376be0c64a37dfc1cc99 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 8 Jun 2015 12:58:33 +0200
Subject: [PATCH 0893/2322] Add ripple rest module

---
 nixos/modules/misc/ids.nix                  |    2 +
 nixos/modules/module-list.nix               |    1 +
 nixos/modules/services/misc/ripple-rest.nix |  110 +
 pkgs/servers/rippled/package.nix            | 4912 +++++++++++++------
 pkgs/servers/rippled/ripple-rest.nix        |   26 +
 5 files changed, 3655 insertions(+), 1396 deletions(-)
 create mode 100644 nixos/modules/services/misc/ripple-rest.nix
 create mode 100644 pkgs/servers/rippled/ripple-rest.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 5b4cb54517c..d283a633734 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -219,6 +219,7 @@
       bird = 195;
       grafana = 196;
       skydns = 197;
+      ripple-rest = 198;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -416,6 +417,7 @@
       bird = 195;
       #grafana = 196; #unused
       #skydns = 197; #unused
+      #ripple-rest = 198; #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/module-list.nix b/nixos/modules/module-list.nix
index fa39a5d9432..d33d3ca91d4 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -212,6 +212,7 @@
   ./services/misc/plex.nix
   ./services/misc/redmine.nix
   ./services/misc/rippled.nix
+  ./services/misc/ripple-rest.nix
   ./services/misc/ripple-data-api.nix
   ./services/misc/rogue.nix
   ./services/misc/siproxd.nix
diff --git a/nixos/modules/services/misc/ripple-rest.nix b/nixos/modules/services/misc/ripple-rest.nix
new file mode 100644
index 00000000000..dc07ee132fa
--- /dev/null
+++ b/nixos/modules/services/misc/ripple-rest.nix
@@ -0,0 +1,110 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.rippleRest;
+
+  configFile = pkgs.writeText "ripple-rest-config.json" (builtins.toJSON {
+    config_version = "2.0.3";
+    debug = cfg.debug;
+    port = cfg.port;
+    host = cfg.host;
+    ssl_enabled = cfg.ssl.enable;
+    ssl = {
+      key_path = cfg.ssl.keyPath;
+      cert_path = cfg.ssl.certPath;
+      reject_unathorized = cfg.ssl.rejectUnathorized;
+    };
+    db_path = cfg.dbPath;
+    max_transaction_fee = cfg.maxTransactionFee;
+    rippled_servers = cfg.rippleds;
+  });
+
+in {
+  options.services.rippleRest = {
+    enable = mkEnableOption "Whether to enable ripple rest.";
+
+    debug = mkEnableOption "Wheter to enable debug for ripple-rest.";
+
+    host = mkOption {
+      description = "Ripple rest host.";
+      default = "localhost";
+      type = types.str;
+    };
+
+    port = mkOption {
+      description = "Ripple rest port.";
+      default = 5990;
+      type = types.int;
+    };
+
+    ssl = {
+      enable = mkEnableOption "Whether to enable ssl.";
+
+      keyPath = mkOption {
+        description = "Path to the ripple rest key file.";
+        default = null;
+        type = types.nullOr types.path;
+      };
+
+
+      certPath = mkOption {
+        description = "Path to the ripple rest cert file.";
+        default = null;
+        type = types.nullOr types.path;
+      };
+
+      rejectUnathorized = mkOption {
+        description = "Whether to reject unatohroized.";
+        default = true;
+        type = types.bool;
+      };
+    };
+
+    dbPath = mkOption {
+      description = "Ripple rest database path.";
+      default = "${cfg.dataDir}/ripple-rest.db";
+      type = types.path;
+    };
+
+    maxTransactionFee = mkOption {
+      description = "Ripple rest max transaction fee.";
+      default = 1000000;
+      type = types.int;
+    };
+
+    rippleds = mkOption {
+      description = "List of rippled servers.";
+      default = [
+        "wss://s1.ripple.com:443"
+      ];
+      type = types.listOf types.str;
+    };
+
+    dataDir = mkOption {
+      description = "Ripple rest data directory.";
+      default = "/var/lib/ripple-rest";
+      type = types.path;
+    };
+  };
+
+  config = mkIf (cfg.enable) {
+    systemd.services.ripple-rest = {
+      wantedBy = [ "multi-user.target"];
+      after = ["network.target" ];
+      environment.NODE_PATH="${pkgs.ripple-rest}/lib/node_modules/ripple-rest/node_modules";
+      serviceConfig = {
+        ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.ripple-rest}/lib/node_modules/ripple-rest/server/server.js --config ${configFile}";
+        User = "ripple-rest";
+      };
+    };
+
+    users.extraUsers.postgres = {
+      name = "ripple-rest";
+      uid = config.ids.uids.ripple-rest;
+      createHome = true;
+      home = cfg.dataDir;
+    };
+  };
+}
diff --git a/pkgs/servers/rippled/package.nix b/pkgs/servers/rippled/package.nix
index fd318c979fe..6f5bb1d3a71 100644
--- a/pkgs/servers/rippled/package.nix
+++ b/pkgs/servers/rippled/package.nix
@@ -1,20 +1,226 @@
 { self, fetchurl, fetchgit ? null, lib }:
 
 {
-  by-spec."accepts"."~1.2.5" =
-    self.by-version."accepts"."1.2.5";
-  by-version."accepts"."1.2.5" = self.buildNodePackage {
-    name = "accepts-1.2.5";
-    version = "1.2.5";
+  by-spec."abbrev"."1" =
+    self.by-version."abbrev"."1.0.5";
+  by-version."abbrev"."1.0.5" = self.buildNodePackage {
+    name = "abbrev-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/accepts/-/accepts-1.2.5.tgz";
-      name = "accepts-1.2.5.tgz";
-      sha1 = "bb07dc52c141ae562611a836ff433bcec8871ce9";
+      url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz";
+      name = "abbrev-1.0.5.tgz";
+      sha1 = "5d8257bd9ebe435e698b2fa431afde4fe7b10b03";
     };
     deps = {
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
-      "negotiator-0.5.1" = self.by-version."negotiator"."0.5.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."abbrev"."1.0.x" =
+    self.by-version."abbrev"."1.0.5";
+  by-spec."accepts"."~1.2.5" =
+    self.by-version."accepts"."1.2.7";
+  by-version."accepts"."1.2.7" = self.buildNodePackage {
+    name = "accepts-1.2.7";
+    version = "1.2.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/accepts/-/accepts-1.2.7.tgz";
+      name = "accepts-1.2.7.tgz";
+      sha1 = "efea24e36e0b5b93d001a7598ac441c32ef56003";
+    };
+    deps = {
+      "mime-types-2.0.11" = self.by-version."mime-types"."2.0.11";
+      "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."accepts"."~1.2.7" =
+    self.by-version."accepts"."1.2.7";
+  by-spec."amdefine".">=0.0.4" =
+    self.by-version."amdefine"."0.1.0";
+  by-version."amdefine"."0.1.0" = self.buildNodePackage {
+    name = "amdefine-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz";
+      name = "amdefine-0.1.0.tgz";
+      sha1 = "3ca9735cf1dde0edf7a4bf6641709c8024f9b227";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi"."^0.3.0" =
+    self.by-version."ansi"."0.3.0";
+  by-version."ansi"."0.3.0" = self.buildNodePackage {
+    name = "ansi-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz";
+      name = "ansi-0.3.0.tgz";
+      sha1 = "74b2f1f187c8553c7f95015bcb76009fb43d38e0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi"."~0.3.0" =
+    self.by-version."ansi"."0.3.0";
+  by-spec."ansi-regex"."^0.2.0" =
+    self.by-version."ansi-regex"."0.2.1";
+  by-version."ansi-regex"."0.2.1" = self.buildNodePackage {
+    name = "ansi-regex-0.2.1";
+    version = "0.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz";
+      name = "ansi-regex-0.2.1.tgz";
+      sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi-regex"."^0.2.1" =
+    self.by-version."ansi-regex"."0.2.1";
+  by-spec."ansi-regex"."^1.0.0" =
+    self.by-version."ansi-regex"."1.1.1";
+  by-version."ansi-regex"."1.1.1" = self.buildNodePackage {
+    name = "ansi-regex-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz";
+      name = "ansi-regex-1.1.1.tgz";
+      sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi-regex"."^1.1.0" =
+    self.by-version."ansi-regex"."1.1.1";
+  by-spec."ansi-styles"."^1.1.0" =
+    self.by-version."ansi-styles"."1.1.0";
+  by-version."ansi-styles"."1.1.0" = self.buildNodePackage {
+    name = "ansi-styles-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz";
+      name = "ansi-styles-1.1.0.tgz";
+      sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi-styles"."^2.0.1" =
+    self.by-version."ansi-styles"."2.0.1";
+  by-version."ansi-styles"."2.0.1" = self.buildNodePackage {
+    name = "ansi-styles-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz";
+      name = "ansi-styles-2.0.1.tgz";
+      sha1 = "b033f57f93e2d28adeb8bc11138fa13da0fd20a3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."are-we-there-yet"."~1.0.0" =
+    self.by-version."are-we-there-yet"."1.0.4";
+  by-version."are-we-there-yet"."1.0.4" = self.buildNodePackage {
+    name = "are-we-there-yet-1.0.4";
+    version = "1.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz";
+      name = "are-we-there-yet-1.0.4.tgz";
+      sha1 = "527fe389f7bcba90806106b99244eaa07e886f85";
+    };
+    deps = {
+      "delegates-0.1.0" = self.by-version."delegates"."0.1.0";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."argparse"."~ 0.1.11" =
+    self.by-version."argparse"."0.1.16";
+  by-version."argparse"."0.1.16" = self.buildNodePackage {
+    name = "argparse-0.1.16";
+    version = "0.1.16";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz";
+      name = "argparse-0.1.16.tgz";
+      sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c";
+    };
+    deps = {
+      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+      "underscore.string-2.4.0" = self.by-version."underscore.string"."2.4.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."argparse"."~1.0.2" =
+    self.by-version."argparse"."1.0.2";
+  by-version."argparse"."1.0.2" = self.buildNodePackage {
+    name = "argparse-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/argparse/-/argparse-1.0.2.tgz";
+      name = "argparse-1.0.2.tgz";
+      sha1 = "bcfae39059656d1973d0b9e6a1a74154b5a9a136";
+    };
+    deps = {
+      "lodash-3.8.0" = self.by-version."lodash"."3.8.0";
+      "sprintf-js-1.0.2" = self.by-version."sprintf-js"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -41,6 +247,47 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."assert-diff"."^0.0.4" =
+    self.by-version."assert-diff"."0.0.4";
+  by-version."assert-diff"."0.0.4" = self.buildNodePackage {
+    name = "assert-diff-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/assert-diff/-/assert-diff-0.0.4.tgz";
+      name = "assert-diff-0.0.4.tgz";
+      sha1 = "bf181c1575d5ad7c73df8076a689f4ae19951608";
+    };
+    deps = {
+      "assert-plus-0.1.4" = self.by-version."assert-plus"."0.1.4";
+      "json-diff-0.3.1" = self.by-version."json-diff"."0.3.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "assert-diff" = self.by-version."assert-diff"."0.0.4";
+  by-spec."assert-plus"."0.1.4" =
+    self.by-version."assert-plus"."0.1.4";
+  by-version."assert-plus"."0.1.4" = self.buildNodePackage {
+    name = "assert-plus-0.1.4";
+    version = "0.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.4.tgz";
+      name = "assert-plus-0.1.4.tgz";
+      sha1 = "283eff8b140ecd768529fbf3730a4c09ebec61f7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."assert-plus"."^0.1.5" =
     self.by-version."assert-plus"."0.1.5";
   by-version."assert-plus"."0.1.5" = self.buildNodePackage {
@@ -60,16 +307,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."async"."0.2.x" =
-    self.by-version."async"."0.2.10";
-  by-version."async"."0.2.10" = self.buildNodePackage {
-    name = "async-0.2.10";
-    version = "0.2.10";
+  by-spec."assertion-error"."1.0.0" =
+    self.by-version."assertion-error"."1.0.0";
+  by-version."assertion-error"."1.0.0" = self.buildNodePackage {
+    name = "assertion-error-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
-      name = "async-0.2.10.tgz";
-      sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
+      url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz";
+      name = "assertion-error-1.0.0.tgz";
+      sha1 = "c7f85438fdd466bc7ca16ab90c81513797a5d23b";
     };
     deps = {
     };
@@ -79,14 +326,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."async"."^0.2.10" =
-    self.by-version."async"."0.2.10";
-  by-spec."async"."~0.2.7" =
-    self.by-version."async"."0.2.10";
-  by-spec."async"."~0.2.9" =
-    self.by-version."async"."0.2.10";
-  "async" = self.by-version."async"."0.2.10";
-  by-spec."async"."~0.9.0" =
+  by-spec."async"."0.2.9" =
+    self.by-version."async"."0.2.9";
+  by-version."async"."0.2.9" = self.buildNodePackage {
+    name = "async-0.2.9";
+    version = "0.2.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
+      name = "async-0.2.9.tgz";
+      sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async"."0.9.x" =
     self.by-version."async"."0.9.0";
   by-version."async"."0.9.0" = self.buildNodePackage {
     name = "async-0.9.0";
@@ -105,16 +364,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."aws-sign"."~0.2.0" =
-    self.by-version."aws-sign"."0.2.0";
-  by-version."aws-sign"."0.2.0" = self.buildNodePackage {
-    name = "aws-sign-0.2.0";
-    version = "0.2.0";
+  by-spec."async"."^0.2.9" =
+    self.by-version."async"."0.2.10";
+  by-version."async"."0.2.10" = self.buildNodePackage {
+    name = "async-0.2.10";
+    version = "0.2.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz";
-      name = "aws-sign-0.2.0.tgz";
-      sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5";
+      url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
+      name = "async-0.2.10.tgz";
+      sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
     };
     deps = {
     };
@@ -124,6 +383,13 @@
     os = [ ];
     cpu = [ ];
   };
+  "async" = self.by-version."async"."0.2.10";
+  by-spec."async"."~0.2.6" =
+    self.by-version."async"."0.2.10";
+  by-spec."async"."~0.2.9" =
+    self.by-version."async"."0.2.10";
+  by-spec."async"."~0.9.0" =
+    self.by-version."async"."0.9.0";
   by-spec."aws-sign2"."~0.5.0" =
     self.by-version."aws-sign2"."0.5.0";
   by-version."aws-sign2"."0.5.0" = self.buildNodePackage {
@@ -143,16 +409,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."base64-url"."1.2.1" =
-    self.by-version."base64-url"."1.2.1";
-  by-version."base64-url"."1.2.1" = self.buildNodePackage {
-    name = "base64-url-1.2.1";
-    version = "1.2.1";
+  by-spec."balanced-match"."^0.2.0" =
+    self.by-version."balanced-match"."0.2.0";
+  by-version."balanced-match"."0.2.0" = self.buildNodePackage {
+    name = "balanced-match-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz";
-      name = "base64-url-1.2.1.tgz";
-      sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78";
+      url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz";
+      name = "balanced-match-0.2.0.tgz";
+      sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674";
     };
     deps = {
     };
@@ -162,16 +428,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."basic-auth"."1.0.0" =
-    self.by-version."basic-auth"."1.0.0";
-  by-version."basic-auth"."1.0.0" = self.buildNodePackage {
-    name = "basic-auth-1.0.0";
-    version = "1.0.0";
+  by-spec."basic-auth"."~1.0.1" =
+    self.by-version."basic-auth"."1.0.1";
+  by-version."basic-auth"."1.0.1" = self.buildNodePackage {
+    name = "basic-auth-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz";
-      name = "basic-auth-1.0.0.tgz";
-      sha1 = "111b2d9ff8e4e6d136b8c84ea5e096cb87351637";
+      url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.0.1.tgz";
+      name = "basic-auth-1.0.1.tgz";
+      sha1 = "4bae1dbfbf0aec4dc5dc47a8d3675b50140f3bf8";
     };
     deps = {
     };
@@ -181,16 +447,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."basic-auth-connect"."1.0.0" =
-    self.by-version."basic-auth-connect"."1.0.0";
-  by-version."basic-auth-connect"."1.0.0" = self.buildNodePackage {
-    name = "basic-auth-connect-1.0.0";
-    version = "1.0.0";
+  by-spec."bignumber.js"."^1.4.0" =
+    self.by-version."bignumber.js"."1.5.0";
+  by-version."bignumber.js"."1.5.0" = self.buildNodePackage {
+    name = "bignumber.js-1.5.0";
+    version = "1.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz";
-      name = "basic-auth-connect-1.0.0.tgz";
-      sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122";
+      url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-1.5.0.tgz";
+      name = "bignumber.js-1.5.0.tgz";
+      sha1 = "ff41453ac7b19ee15cda7977e179ff1b0d11956d";
     };
     deps = {
     };
@@ -200,16 +466,17 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."batch"."0.5.2" =
-    self.by-version."batch"."0.5.2";
-  by-version."batch"."0.5.2" = self.buildNodePackage {
-    name = "batch-0.5.2";
-    version = "0.5.2";
+  "bignumber.js" = self.by-version."bignumber.js"."1.5.0";
+  by-spec."bignumber.js"."^2.0.3" =
+    self.by-version."bignumber.js"."2.0.7";
+  by-version."bignumber.js"."2.0.7" = self.buildNodePackage {
+    name = "bignumber.js-2.0.7";
+    version = "2.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/batch/-/batch-0.5.2.tgz";
-      name = "batch-0.5.2.tgz";
-      sha1 = "546543dbe32118c83c7c7ca33a1f5c5d5ea963e9";
+      url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-2.0.7.tgz";
+      name = "bignumber.js-2.0.7.tgz";
+      sha1 = "86eb0707cf6a5110909d23e6ea7434c14f500f1c";
     };
     deps = {
     };
@@ -219,16 +486,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bignumber.js"."^2.0.0" =
-    self.by-version."bignumber.js"."2.0.3";
-  by-version."bignumber.js"."2.0.3" = self.buildNodePackage {
-    name = "bignumber.js-2.0.3";
-    version = "2.0.3";
+  by-spec."bignumber.js"."~1.4.0" =
+    self.by-version."bignumber.js"."1.4.1";
+  by-version."bignumber.js"."1.4.1" = self.buildNodePackage {
+    name = "bignumber.js-1.4.1";
+    version = "1.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-2.0.3.tgz";
-      name = "bignumber.js-2.0.3.tgz";
-      sha1 = "1328f1d618f4bfe23587af73577a5a1e4f3cf105";
+      url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-1.4.1.tgz";
+      name = "bignumber.js-1.4.1.tgz";
+      sha1 = "3d19ac321f8db4ba07aace23ebd4ac976fae6bfa";
     };
     deps = {
     };
@@ -277,47 +544,71 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."body-parser"."~1.12.2" =
-    self.by-version."body-parser"."1.12.2";
-  by-version."body-parser"."1.12.2" = self.buildNodePackage {
-    name = "body-parser-1.12.2";
-    version = "1.12.2";
+  by-spec."block-stream"."*" =
+    self.by-version."block-stream"."0.0.7";
+  by-version."block-stream"."0.0.7" = self.buildNodePackage {
+    name = "block-stream-0.0.7";
+    version = "0.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.2.tgz";
-      name = "body-parser-1.12.2.tgz";
-      sha1 = "698368fb4dfc57a05bff1ddb1bebeba3bd2c0e87";
+      url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz";
+      name = "block-stream-0.0.7.tgz";
+      sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bluebird"."^2.0.0" =
+    self.by-version."bluebird"."2.9.25";
+  by-version."bluebird"."2.9.25" = self.buildNodePackage {
+    name = "bluebird-2.9.25";
+    version = "2.9.25";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.25.tgz";
+      name = "bluebird-2.9.25.tgz";
+      sha1 = "6e36bd04064d9534c07160b9f7f26c5a738fe16a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bluebird"."^2.3.4" =
+    self.by-version."bluebird"."2.9.25";
+  "bluebird" = self.by-version."bluebird"."2.9.25";
+  by-spec."bluebird"."^2.9.25" =
+    self.by-version."bluebird"."2.9.25";
+  by-spec."body-parser"."^1.7.0" =
+    self.by-version."body-parser"."1.12.4";
+  by-version."body-parser"."1.12.4" = self.buildNodePackage {
+    name = "body-parser-1.12.4";
+    version = "1.12.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.4.tgz";
+      name = "body-parser-1.12.4.tgz";
+      sha1 = "090700c4ba28862a8520ef378395fdee5f61c229";
     };
     deps = {
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
       "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
-      "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7";
-      "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
-      "qs-2.4.1" = self.by-version."qs"."2.4.1";
-      "raw-body-1.3.3" = self.by-version."raw-body"."1.3.3";
-      "type-is-1.6.1" = self.by-version."type-is"."1.6.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."boom"."0.3.x" =
-    self.by-version."boom"."0.3.8";
-  by-version."boom"."0.3.8" = self.buildNodePackage {
-    name = "boom-0.3.8";
-    version = "0.3.8";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz";
-      name = "boom-0.3.8.tgz";
-      sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea";
-    };
-    deps = {
-      "hoek-0.7.6" = self.by-version."hoek"."0.7.6";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
+      "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8";
+      "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
+      "qs-2.4.2" = self.by-version."qs"."2.4.2";
+      "raw-body-2.0.1" = self.by-version."raw-body"."2.0.1";
+      "type-is-1.6.2" = self.by-version."type-is"."1.6.2";
     };
     optionalDependencies = {
     };
@@ -325,6 +616,7 @@
     os = [ ];
     cpu = [ ];
   };
+  "body-parser" = self.by-version."body-parser"."1.12.4";
   by-spec."boom"."0.4.x" =
     self.by-version."boom"."0.4.2";
   by-version."boom"."0.4.2" = self.buildNodePackage {
@@ -346,18 +638,18 @@
     cpu = [ ];
   };
   by-spec."boom"."2.x.x" =
-    self.by-version."boom"."2.6.1";
-  by-version."boom"."2.6.1" = self.buildNodePackage {
-    name = "boom-2.6.1";
-    version = "2.6.1";
+    self.by-version."boom"."2.7.1";
+  by-version."boom"."2.7.1" = self.buildNodePackage {
+    name = "boom-2.7.1";
+    version = "2.7.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/boom/-/boom-2.6.1.tgz";
-      name = "boom-2.6.1.tgz";
-      sha1 = "4dc8ef9b6dfad9c43bbbfbe71fa4c21419f22753";
+      url = "http://registry.npmjs.org/boom/-/boom-2.7.1.tgz";
+      name = "boom-2.7.1.tgz";
+      sha1 = "fb165c348d337977c61d4363c21e9e1abf526705";
     };
     deps = {
-      "hoek-2.11.1" = self.by-version."hoek"."2.11.1";
+      "hoek-2.13.0" = self.by-version."hoek"."2.13.0";
     };
     optionalDependencies = {
     };
@@ -365,18 +657,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."browser-request"."~0.3.0" =
-    self.by-version."browser-request"."0.3.3";
-  by-version."browser-request"."0.3.3" = self.buildNodePackage {
-    name = "browser-request-0.3.3";
-    version = "0.3.3";
+  by-spec."brace-expansion"."^1.0.0" =
+    self.by-version."brace-expansion"."1.1.0";
+  by-version."brace-expansion"."1.1.0" = self.buildNodePackage {
+    name = "brace-expansion-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz";
-      name = "browser-request-0.3.3.tgz";
-      sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17";
+      url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz";
+      name = "brace-expansion-1.1.0.tgz";
+      sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9";
     };
     deps = {
+      "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0";
+      "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1";
     };
     optionalDependencies = {
     };
@@ -424,16 +718,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."caseless"."~0.6.0" =
-    self.by-version."caseless"."0.6.0";
-  by-version."caseless"."0.6.0" = self.buildNodePackage {
-    name = "caseless-0.6.0";
-    version = "0.6.0";
+  by-spec."bytes"."2.0.1" =
+    self.by-version."bytes"."2.0.1";
+  by-version."bytes"."2.0.1" = self.buildNodePackage {
+    name = "bytes-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz";
-      name = "caseless-0.6.0.tgz";
-      sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4";
+      url = "http://registry.npmjs.org/bytes/-/bytes-2.0.1.tgz";
+      name = "bytes-2.0.1.tgz";
+      sha1 = "673743059be43d929f9c225dd7363ee0f8b15d97";
     };
     deps = {
     };
@@ -462,18 +756,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."clone"."~0.1.11" =
-    self.by-version."clone"."0.1.19";
-  by-version."clone"."0.1.19" = self.buildNodePackage {
-    name = "clone-0.1.19";
-    version = "0.1.19";
+  by-spec."chai".">=1.9.2 <3" =
+    self.by-version."chai"."2.3.0";
+  by-version."chai"."2.3.0" = self.buildNodePackage {
+    name = "chai-2.3.0";
+    version = "2.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/clone/-/clone-0.1.19.tgz";
-      name = "clone-0.1.19.tgz";
-      sha1 = "613fb68639b26a494ac53253e15b1a6bd88ada85";
+      url = "http://registry.npmjs.org/chai/-/chai-2.3.0.tgz";
+      name = "chai-2.3.0.tgz";
+      sha1 = "8a2f6a34748da801090fd73287b2aa739a4e909a";
     };
     deps = {
+      "assertion-error-1.0.0" = self.by-version."assertion-error"."1.0.0";
+      "deep-eql-0.1.3" = self.by-version."deep-eql"."0.1.3";
     };
     optionalDependencies = {
     };
@@ -481,17 +777,106 @@
     os = [ ];
     cpu = [ ];
   };
-  "clone" = self.by-version."clone"."0.1.19";
-  by-spec."colors"."0.6.x" =
-    self.by-version."colors"."0.6.2";
-  by-version."colors"."0.6.2" = self.buildNodePackage {
-    name = "colors-0.6.2";
-    version = "0.6.2";
+  by-spec."chai"."^1.10.0" =
+    self.by-version."chai"."1.10.0";
+  by-version."chai"."1.10.0" = self.buildNodePackage {
+    name = "chai-1.10.0";
+    version = "1.10.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
-      name = "colors-0.6.2.tgz";
-      sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
+      url = "http://registry.npmjs.org/chai/-/chai-1.10.0.tgz";
+      name = "chai-1.10.0.tgz";
+      sha1 = "e4031cc87654461a75943e5a35ab46eaf39c1eb9";
+    };
+    deps = {
+      "assertion-error-1.0.0" = self.by-version."assertion-error"."1.0.0";
+      "deep-eql-0.1.3" = self.by-version."deep-eql"."0.1.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "chai" = self.by-version."chai"."1.10.0";
+  by-spec."chalk"."^1.0.0" =
+    self.by-version."chalk"."1.0.0";
+  by-version."chalk"."1.0.0" = self.buildNodePackage {
+    name = "chalk-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz";
+      name = "chalk-1.0.0.tgz";
+      sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc";
+    };
+    deps = {
+      "ansi-styles-2.0.1" = self.by-version."ansi-styles"."2.0.1";
+      "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
+      "has-ansi-1.0.3" = self.by-version."has-ansi"."1.0.3";
+      "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
+      "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."chalk"."~0.5.1" =
+    self.by-version."chalk"."0.5.1";
+  by-version."chalk"."0.5.1" = self.buildNodePackage {
+    name = "chalk-0.5.1";
+    version = "0.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz";
+      name = "chalk-0.5.1.tgz";
+      sha1 = "663b3a648b68b55d04690d49167aa837858f2174";
+    };
+    deps = {
+      "ansi-styles-1.1.0" = self.by-version."ansi-styles"."1.1.0";
+      "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
+      "has-ansi-0.1.0" = self.by-version."has-ansi"."0.1.0";
+      "strip-ansi-0.3.0" = self.by-version."strip-ansi"."0.3.0";
+      "supports-color-0.2.0" = self.by-version."supports-color"."0.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cli-color"."~0.1.6" =
+    self.by-version."cli-color"."0.1.7";
+  by-version."cli-color"."0.1.7" = self.buildNodePackage {
+    name = "cli-color-0.1.7";
+    version = "0.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cli-color/-/cli-color-0.1.7.tgz";
+      name = "cli-color-0.1.7.tgz";
+      sha1 = "adc3200fa471cc211b0da7f566b71e98b9d67347";
+    };
+    deps = {
+      "es5-ext-0.8.2" = self.by-version."es5-ext"."0.8.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."colors"."1.0.x" =
+    self.by-version."colors"."1.0.3";
+  by-version."colors"."1.0.3" = self.buildNodePackage {
+    name = "colors-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
+      name = "colors-1.0.3.tgz";
+      sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
     };
     deps = {
     };
@@ -523,16 +908,76 @@
   };
   by-spec."combined-stream"."~0.0.5" =
     self.by-version."combined-stream"."0.0.7";
-  by-spec."commander"."2.6.0" =
-    self.by-version."commander"."2.6.0";
-  by-version."commander"."2.6.0" = self.buildNodePackage {
-    name = "commander-2.6.0";
-    version = "2.6.0";
+  by-spec."commander"."0.6.1" =
+    self.by-version."commander"."0.6.1";
+  by-version."commander"."0.6.1" = self.buildNodePackage {
+    name = "commander-0.6.1";
+    version = "0.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz";
-      name = "commander-2.6.0.tgz";
-      sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d";
+      url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
+      name = "commander-0.6.1.tgz";
+      sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."commander"."2.3.0" =
+    self.by-version."commander"."2.3.0";
+  by-version."commander"."2.3.0" = self.buildNodePackage {
+    name = "commander-2.3.0";
+    version = "2.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
+      name = "commander-2.3.0.tgz";
+      sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."commander"."^2.2.0" =
+    self.by-version."commander"."2.8.1";
+  by-version."commander"."2.8.1" = self.buildNodePackage {
+    name = "commander-2.8.1";
+    version = "2.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz";
+      name = "commander-2.8.1.tgz";
+      sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
+    };
+    deps = {
+      "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."commander"."^2.8.1" =
+    self.by-version."commander"."2.8.1";
+  by-spec."commander"."~2.1.0" =
+    self.by-version."commander"."2.1.0";
+  by-version."commander"."2.1.0" = self.buildNodePackage {
+    name = "commander-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
+      name = "commander-2.1.0.tgz";
+      sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
     };
     deps = {
     };
@@ -573,7 +1018,7 @@
       sha1 = "d0474a6ba6590a43d39c2ce9a6cfbb6479be76a5";
     };
     deps = {
-      "mime-db-1.8.0" = self.by-version."mime-db"."1.8.0";
+      "mime-db-1.9.1" = self.by-version."mime-db"."1.9.1";
     };
     optionalDependencies = {
     };
@@ -581,22 +1026,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."compression"."~1.4.3" =
-    self.by-version."compression"."1.4.3";
-  by-version."compression"."1.4.3" = self.buildNodePackage {
-    name = "compression-1.4.3";
-    version = "1.4.3";
+  by-spec."compression"."^1.3.0" =
+    self.by-version."compression"."1.4.4";
+  by-version."compression"."1.4.4" = self.buildNodePackage {
+    name = "compression-1.4.4";
+    version = "1.4.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/compression/-/compression-1.4.3.tgz";
-      name = "compression-1.4.3.tgz";
-      sha1 = "7161bc0441df629273e5c31dd631b8e41e886b4d";
+      url = "http://registry.npmjs.org/compression/-/compression-1.4.4.tgz";
+      name = "compression-1.4.4.tgz";
+      sha1 = "2f9994ca476e4d9ba5fdc67ac929942837d0b6a4";
     };
     deps = {
-      "accepts-1.2.5" = self.by-version."accepts"."1.2.5";
+      "accepts-1.2.7" = self.by-version."accepts"."1.2.7";
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
       "compressible-2.0.2" = self.by-version."compressible"."2.0.2";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
     };
@@ -606,72 +1051,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."connect"."2.29.1" =
-    self.by-version."connect"."2.29.1";
-  by-version."connect"."2.29.1" = self.buildNodePackage {
-    name = "connect-2.29.1";
-    version = "2.29.1";
+  "compression" = self.by-version."compression"."1.4.4";
+  by-spec."concat-map"."0.0.1" =
+    self.by-version."concat-map"."0.0.1";
+  by-version."concat-map"."0.0.1" = self.buildNodePackage {
+    name = "concat-map-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect/-/connect-2.29.1.tgz";
-      name = "connect-2.29.1.tgz";
-      sha1 = "e0456742d25ed232b573ce156883dd4e6f208538";
+      url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+      name = "concat-map-0.0.1.tgz";
+      sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
     };
     deps = {
-      "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0";
-      "body-parser-1.12.2" = self.by-version."body-parser"."1.12.2";
-      "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4";
-      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
-      "compression-1.4.3" = self.by-version."compression"."1.4.3";
-      "connect-timeout-1.6.1" = self.by-version."connect-timeout"."1.6.1";
-      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
-      "csurf-1.7.0" = self.by-version."csurf"."1.7.0";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
-      "errorhandler-1.3.5" = self.by-version."errorhandler"."1.3.5";
-      "express-session-1.10.4" = self.by-version."express-session"."1.10.4";
-      "finalhandler-0.3.4" = self.by-version."finalhandler"."0.3.4";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
-      "method-override-2.3.2" = self.by-version."method-override"."2.3.2";
-      "morgan-1.5.2" = self.by-version."morgan"."1.5.2";
-      "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "qs-2.4.1" = self.by-version."qs"."2.4.1";
-      "response-time-2.3.0" = self.by-version."response-time"."2.3.0";
-      "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0";
-      "serve-index-1.6.3" = self.by-version."serve-index"."1.6.3";
-      "serve-static-1.9.2" = self.by-version."serve-static"."1.9.2";
-      "type-is-1.6.1" = self.by-version."type-is"."1.6.1";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
-      "vhost-3.0.0" = self.by-version."vhost"."3.0.0";
-      "pause-0.0.1" = self.by-version."pause"."0.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."connect-timeout"."~1.6.1" =
-    self.by-version."connect-timeout"."1.6.1";
-  by-version."connect-timeout"."1.6.1" = self.buildNodePackage {
-    name = "connect-timeout-1.6.1";
-    version = "1.6.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.1.tgz";
-      name = "connect-timeout-1.6.1.tgz";
-      sha1 = "1de3a2b853734820a232080b95742494ba4cd067";
-    };
-    deps = {
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
-      "ms-0.7.0" = self.by-version."ms"."0.7.0";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -736,46 +1128,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cookie-jar"."~0.2.0" =
-    self.by-version."cookie-jar"."0.2.0";
-  by-version."cookie-jar"."0.2.0" = self.buildNodePackage {
-    name = "cookie-jar-0.2.0";
-    version = "0.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz";
-      name = "cookie-jar-0.2.0.tgz";
-      sha1 = "64ecc06ac978db795e4b5290cbe48ba3781400fa";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."cookie-parser"."~1.3.4" =
-    self.by-version."cookie-parser"."1.3.4";
-  by-version."cookie-parser"."1.3.4" = self.buildNodePackage {
-    name = "cookie-parser-1.3.4";
-    version = "1.3.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.4.tgz";
-      name = "cookie-parser-1.3.4.tgz";
-      sha1 = "193035a5be97117a21709b3aa737f6132717bda6";
-    };
-    deps = {
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."cookie-signature"."1.0.6" =
     self.by-version."cookie-signature"."1.0.6";
   by-version."cookie-signature"."1.0.6" = self.buildNodePackage {
@@ -795,16 +1147,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cookiejar"."2.0.1" =
-    self.by-version."cookiejar"."2.0.1";
-  by-version."cookiejar"."2.0.1" = self.buildNodePackage {
-    name = "cookiejar-2.0.1";
-    version = "2.0.1";
+  by-spec."cookiejar"."1.3.2" =
+    self.by-version."cookiejar"."1.3.2";
+  by-version."cookiejar"."1.3.2" = self.buildNodePackage {
+    name = "cookiejar-1.3.2";
+    version = "1.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz";
-      name = "cookiejar-2.0.1.tgz";
-      sha1 = "3d12752f6adf68a892f332433492bd5812bb668f";
+      url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.2.tgz";
+      name = "cookiejar-1.3.2.tgz";
+      sha1 = "61d3229e2da20c859032233502958a9b7df58249";
     };
     deps = {
     };
@@ -833,21 +1185,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."couch-compile"."^1.0.1" =
-    self.by-version."couch-compile"."1.2.0";
-  by-version."couch-compile"."1.2.0" = self.buildNodePackage {
-    name = "couch-compile-1.2.0";
-    version = "1.2.0";
+  by-spec."coveralls"."^2.10.0" =
+    self.by-version."coveralls"."2.11.2";
+  by-version."coveralls"."2.11.2" = self.buildNodePackage {
+    name = "coveralls-2.11.2";
+    version = "2.11.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/couch-compile/-/couch-compile-1.2.0.tgz";
-      name = "couch-compile-1.2.0.tgz";
-      sha1 = "c4f7396f3dea38516b4e51d3edc3196de4f2d69c";
+      url = "http://registry.npmjs.org/coveralls/-/coveralls-2.11.2.tgz";
+      name = "coveralls-2.11.2.tgz";
+      sha1 = "d4d982016cb2f9da89d77ab204d86a8537e6a12d";
     };
     deps = {
-      "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "async-0.2.10" = self.by-version."async"."0.2.10";
-      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "js-yaml-3.0.1" = self.by-version."js-yaml"."3.0.1";
+      "lcov-parse-0.0.6" = self.by-version."lcov-parse"."0.0.6";
+      "log-driver-1.2.4" = self.by-version."log-driver"."1.2.4";
+      "request-2.40.0" = self.by-version."request"."2.40.0";
     };
     optionalDependencies = {
     };
@@ -855,7 +1208,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "couch-compile" = self.by-version."couch-compile"."1.2.0";
+  "coveralls" = self.by-version."coveralls"."2.11.2";
   by-spec."crc"."3.2.1" =
     self.by-version."crc"."3.2.1";
   by-version."crc"."3.2.1" = self.buildNodePackage {
@@ -875,45 +1228,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cron-parser"."~0.3.0" =
-    self.by-version."cron-parser"."0.3.6";
-  by-version."cron-parser"."0.3.6" = self.buildNodePackage {
-    name = "cron-parser-0.3.6";
-    version = "0.3.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/cron-parser/-/cron-parser-0.3.6.tgz";
-      name = "cron-parser-0.3.6.tgz";
-      sha1 = "1e4734ebd5fa054f5766693c52468b17df9681c9";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."cryptiles"."0.1.x" =
-    self.by-version."cryptiles"."0.1.3";
-  by-version."cryptiles"."0.1.3" = self.buildNodePackage {
-    name = "cryptiles-0.1.3";
-    version = "0.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz";
-      name = "cryptiles-0.1.3.tgz";
-      sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c";
-    };
-    deps = {
-      "boom-0.3.8" = self.by-version."boom"."0.3.8";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."cryptiles"."0.2.x" =
     self.by-version."cryptiles"."0.2.2";
   by-version."cryptiles"."0.2.2" = self.buildNodePackage {
@@ -946,53 +1260,7 @@
       sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285";
     };
     deps = {
-      "boom-2.6.1" = self.by-version."boom"."2.6.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."csrf"."~2.0.6" =
-    self.by-version."csrf"."2.0.6";
-  by-version."csrf"."2.0.6" = self.buildNodePackage {
-    name = "csrf-2.0.6";
-    version = "2.0.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/csrf/-/csrf-2.0.6.tgz";
-      name = "csrf-2.0.6.tgz";
-      sha1 = "a90a9d88fc7411423cb0c5c13e901a8cc588132e";
-    };
-    deps = {
-      "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1";
-      "rndm-1.1.0" = self.by-version."rndm"."1.1.0";
-      "scmp-1.0.0" = self.by-version."scmp"."1.0.0";
-      "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."csurf"."~1.7.0" =
-    self.by-version."csurf"."1.7.0";
-  by-version."csurf"."1.7.0" = self.buildNodePackage {
-    name = "csurf-1.7.0";
-    version = "1.7.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/csurf/-/csurf-1.7.0.tgz";
-      name = "csurf-1.7.0.tgz";
-      sha1 = "f24dc53753fccbdce0505f2abc5b57167b65ff18";
-    };
-    deps = {
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
-      "csrf-2.0.6" = self.by-version."csrf"."2.0.6";
-      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
+      "boom-2.7.1" = self.by-version."boom"."2.7.1";
     };
     optionalDependencies = {
     };
@@ -1038,6 +1306,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."debug"."2.0.0" =
+    self.by-version."debug"."2.0.0";
+  by-version."debug"."2.0.0" = self.buildNodePackage {
+    name = "debug-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz";
+      name = "debug-2.0.0.tgz";
+      sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef";
+    };
+    deps = {
+      "ms-0.6.2" = self.by-version."ms"."0.6.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."debug"."~0.7.2" =
     self.by-version."debug"."0.7.4";
   by-version."debug"."0.7.4" = self.buildNodePackage {
@@ -1057,26 +1345,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."debug"."~1.0.1" =
-    self.by-version."debug"."1.0.4";
-  by-version."debug"."1.0.4" = self.buildNodePackage {
-    name = "debug-1.0.4";
-    version = "1.0.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
-      name = "debug-1.0.4.tgz";
-      sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
-    };
-    deps = {
-      "ms-0.6.2" = self.by-version."ms"."0.6.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."debug"."~2.1.3" =
     self.by-version."debug"."2.1.3";
   by-version."debug"."2.1.3" = self.buildNodePackage {
@@ -1097,16 +1365,56 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."deep-diff"."^0.1.4" =
-    self.by-version."deep-diff"."0.1.7";
-  by-version."deep-diff"."0.1.7" = self.buildNodePackage {
-    name = "deep-diff-0.1.7";
-    version = "0.1.7";
+  by-spec."debug"."~2.2.0" =
+    self.by-version."debug"."2.2.0";
+  by-version."debug"."2.2.0" = self.buildNodePackage {
+    name = "debug-2.2.0";
+    version = "2.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/deep-diff/-/deep-diff-0.1.7.tgz";
-      name = "deep-diff-0.1.7.tgz";
-      sha1 = "d36da978b64429c268116cea941f490e7949cd3d";
+      url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
+      name = "debug-2.2.0.tgz";
+      sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
+    };
+    deps = {
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."deep-eql"."0.1.3" =
+    self.by-version."deep-eql"."0.1.3";
+  by-version."deep-eql"."0.1.3" = self.buildNodePackage {
+    name = "deep-eql-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz";
+      name = "deep-eql-0.1.3.tgz";
+      sha1 = "ef558acab8de25206cd713906d74e56930eb69f2";
+    };
+    deps = {
+      "type-detect-0.1.1" = self.by-version."type-detect"."0.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."deep-extend"."~0.2.5" =
+    self.by-version."deep-extend"."0.2.11";
+  by-version."deep-extend"."0.2.11" = self.buildNodePackage {
+    name = "deep-extend-0.2.11";
+    version = "0.2.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz";
+      name = "deep-extend-0.2.11.tgz";
+      sha1 = "7a16ba69729132340506170494bc83f7076fe08f";
     };
     deps = {
     };
@@ -1116,7 +1424,6 @@
     os = [ ];
     cpu = [ ];
   };
-  "deep-diff" = self.by-version."deep-diff"."0.1.7";
   by-spec."delayed-stream"."0.0.5" =
     self.by-version."delayed-stream"."0.0.5";
   by-version."delayed-stream"."0.0.5" = self.buildNodePackage {
@@ -1136,16 +1443,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."depd"."~1.0.0" =
-    self.by-version."depd"."1.0.0";
-  by-version."depd"."1.0.0" = self.buildNodePackage {
-    name = "depd-1.0.0";
-    version = "1.0.0";
+  by-spec."delegates"."^0.1.0" =
+    self.by-version."delegates"."0.1.0";
+  by-version."delegates"."0.1.0" = self.buildNodePackage {
+    name = "delegates-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz";
-      name = "depd-1.0.0.tgz";
-      sha1 = "2fda0d00e98aae2845d4991ab1bf1f2a199073d5";
+      url = "http://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz";
+      name = "delegates-0.1.0.tgz";
+      sha1 = "b4b57be11a1653517a04b27f0949bdc327dfe390";
     };
     deps = {
     };
@@ -1155,6 +1462,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."depd"."~1.0.0" =
+    self.by-version."depd"."1.0.1";
+  by-version."depd"."1.0.1" = self.buildNodePackage {
+    name = "depd-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz";
+      name = "depd-1.0.1.tgz";
+      sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."depd"."~1.0.1" =
+    self.by-version."depd"."1.0.1";
   by-spec."destroy"."1.0.3" =
     self.by-version."destroy"."1.0.3";
   by-version."destroy"."1.0.3" = self.buildNodePackage {
@@ -1174,6 +1502,65 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."diff"."1.0.8" =
+    self.by-version."diff"."1.0.8";
+  by-version."diff"."1.0.8" = self.buildNodePackage {
+    name = "diff-1.0.8";
+    version = "1.0.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz";
+      name = "diff-1.0.8.tgz";
+      sha1 = "343276308ec991b7bc82267ed55bc1411f971666";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."difflib"."~0.2.1" =
+    self.by-version."difflib"."0.2.4";
+  by-version."difflib"."0.2.4" = self.buildNodePackage {
+    name = "difflib-0.2.4";
+    version = "0.2.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/difflib/-/difflib-0.2.4.tgz";
+      name = "difflib-0.2.4.tgz";
+      sha1 = "b5e30361a6db023176d562892db85940a718f47e";
+    };
+    deps = {
+      "heap-0.2.6" = self.by-version."heap"."0.2.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."dreamopt"."~0.6.0" =
+    self.by-version."dreamopt"."0.6.0";
+  by-version."dreamopt"."0.6.0" = self.buildNodePackage {
+    name = "dreamopt-0.6.0";
+    version = "0.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dreamopt/-/dreamopt-0.6.0.tgz";
+      name = "dreamopt-0.6.0.tgz";
+      sha1 = "d813ccdac8d39d8ad526775514a13dda664d6b4b";
+    };
+    deps = {
+      "wordwrap-1.0.0" = self.by-version."wordwrap"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."ee-first"."1.1.0" =
     self.by-version."ee-first"."1.1.0";
   by-version."ee-first"."1.1.0" = self.buildNodePackage {
@@ -1193,37 +1580,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."errorhandler"."~1.3.5" =
-    self.by-version."errorhandler"."1.3.5";
-  by-version."errorhandler"."1.3.5" = self.buildNodePackage {
-    name = "errorhandler-1.3.5";
-    version = "1.3.5";
+  by-spec."es5-ext"."0.8.x" =
+    self.by-version."es5-ext"."0.8.2";
+  by-version."es5-ext"."0.8.2" = self.buildNodePackage {
+    name = "es5-ext-0.8.2";
+    version = "0.8.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.3.5.tgz";
-      name = "errorhandler-1.3.5.tgz";
-      sha1 = "4ef655dd2c30e1fc1bf9c24805fa34ba20d4f69a";
-    };
-    deps = {
-      "accepts-1.2.5" = self.by-version."accepts"."1.2.5";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."errs"."~0.3.0" =
-    self.by-version."errs"."0.3.2";
-  by-version."errs"."0.3.2" = self.buildNodePackage {
-    name = "errs-0.3.2";
-    version = "0.3.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/errs/-/errs-0.3.2.tgz";
-      name = "errs-0.3.2.tgz";
-      sha1 = "798099b2dbd37ca2bc749e538a7c1307d0b50499";
+      url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.8.2.tgz";
+      name = "es5-ext-0.8.2.tgz";
+      sha1 = "aba8d9e1943a895ac96837a62a39b3f55ecd94ab";
     };
     deps = {
     };
@@ -1252,6 +1618,183 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."escape-string-regexp"."1.0.2" =
+    self.by-version."escape-string-regexp"."1.0.2";
+  by-version."escape-string-regexp"."1.0.2" = self.buildNodePackage {
+    name = "escape-string-regexp-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz";
+      name = "escape-string-regexp-1.0.2.tgz";
+      sha1 = "4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."escape-string-regexp"."^1.0.0" =
+    self.by-version."escape-string-regexp"."1.0.3";
+  by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage {
+    name = "escape-string-regexp-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz";
+      name = "escape-string-regexp-1.0.3.tgz";
+      sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."escape-string-regexp"."^1.0.2" =
+    self.by-version."escape-string-regexp"."1.0.3";
+  by-spec."escodegen"."1.3.x" =
+    self.by-version."escodegen"."1.3.3";
+  by-version."escodegen"."1.3.3" = self.buildNodePackage {
+    name = "escodegen-1.3.3";
+    version = "1.3.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz";
+      name = "escodegen-1.3.3.tgz";
+      sha1 = "f024016f5a88e046fd12005055e939802e6c5f23";
+    };
+    deps = {
+      "esutils-1.0.0" = self.by-version."esutils"."1.0.0";
+      "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1";
+      "esprima-1.1.1" = self.by-version."esprima"."1.1.1";
+    };
+    optionalDependencies = {
+      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."esprima"."1.2.x" =
+    self.by-version."esprima"."1.2.5";
+  by-version."esprima"."1.2.5" = self.buildNodePackage {
+    name = "esprima-1.2.5";
+    version = "1.2.5";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz";
+      name = "esprima-1.2.5.tgz";
+      sha1 = "0993502feaf668138325756f30f9a51feeec11e9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."esprima"."~ 1.0.2" =
+    self.by-version."esprima"."1.0.4";
+  by-version."esprima"."1.0.4" = self.buildNodePackage {
+    name = "esprima-1.0.4";
+    version = "1.0.4";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
+      name = "esprima-1.0.4.tgz";
+      sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."esprima"."~1.1.1" =
+    self.by-version."esprima"."1.1.1";
+  by-version."esprima"."1.1.1" = self.buildNodePackage {
+    name = "esprima-1.1.1";
+    version = "1.1.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
+      name = "esprima-1.1.1.tgz";
+      sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."esprima"."~2.2.0" =
+    self.by-version."esprima"."2.2.0";
+  by-version."esprima"."2.2.0" = self.buildNodePackage {
+    name = "esprima-2.2.0";
+    version = "2.2.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima/-/esprima-2.2.0.tgz";
+      name = "esprima-2.2.0.tgz";
+      sha1 = "4292c1d68e4173d815fa2290dc7afc96d81fcd83";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."estraverse"."~1.5.0" =
+    self.by-version."estraverse"."1.5.1";
+  by-version."estraverse"."1.5.1" = self.buildNodePackage {
+    name = "estraverse-1.5.1";
+    version = "1.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz";
+      name = "estraverse-1.5.1.tgz";
+      sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."esutils"."~1.0.0" =
+    self.by-version."esutils"."1.0.0";
+  by-version."esutils"."1.0.0" = self.buildNodePackage {
+    name = "esutils-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz";
+      name = "esutils-1.0.0.tgz";
+      sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."etag"."~1.5.1" =
     self.by-version."etag"."1.5.1";
   by-version."etag"."1.5.1" = self.buildNodePackage {
@@ -1272,67 +1815,41 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."express"."^3.4.8" =
-    self.by-version."express"."3.20.2";
-  by-version."express"."3.20.2" = self.buildNodePackage {
-    name = "express-3.20.2";
-    version = "3.20.2";
-    bin = true;
+  by-spec."express"."^4.8.7" =
+    self.by-version."express"."4.12.3";
+  by-version."express"."4.12.3" = self.buildNodePackage {
+    name = "express-4.12.3";
+    version = "4.12.3";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-3.20.2.tgz";
-      name = "express-3.20.2.tgz";
-      sha1 = "c604027746e60f3da0a4b43063375d21c3235858";
+      url = "http://registry.npmjs.org/express/-/express-4.12.3.tgz";
+      name = "express-4.12.3.tgz";
+      sha1 = "6b9d94aec5ae03270d86d390c277a8c5a5ad0ee2";
     };
     deps = {
-      "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
-      "connect-2.29.1" = self.by-version."connect"."2.29.1";
+      "accepts-1.2.7" = self.by-version."accepts"."1.2.7";
       "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
       "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
-      "commander-2.6.0" = self.by-version."commander"."2.6.0";
       "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
       "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
       "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "etag-1.5.1" = self.by-version."etag"."1.5.1";
+      "finalhandler-0.3.4" = self.by-version."finalhandler"."0.3.4";
       "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
       "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0";
       "methods-1.1.1" = self.by-version."methods"."1.1.1";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "proxy-addr-1.0.7" = self.by-version."proxy-addr"."1.0.7";
+      "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
+      "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8";
+      "qs-2.4.1" = self.by-version."qs"."2.4.1";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
       "send-0.12.2" = self.by-version."send"."0.12.2";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+      "serve-static-1.9.2" = self.by-version."serve-static"."1.9.2";
+      "type-is-1.6.2" = self.by-version."type-is"."1.6.2";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "express" = self.by-version."express"."3.20.2";
-  by-spec."express-session"."~1.10.4" =
-    self.by-version."express-session"."1.10.4";
-  by-version."express-session"."1.10.4" = self.buildNodePackage {
-    name = "express-session-1.10.4";
-    version = "1.10.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/express-session/-/express-session-1.10.4.tgz";
-      name = "express-session-1.10.4.tgz";
-      sha1 = "04e1d92e00593893e1f76569eb3ad63113daf94c";
-    };
-    deps = {
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
-      "crc-3.2.1" = self.by-version."crc"."3.2.1";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
     optionalDependencies = {
@@ -1341,6 +1858,7 @@
     os = [ ];
     cpu = [ ];
   };
+  "express" = self.by-version."express"."4.12.3";
   by-spec."extend"."~1.2.1" =
     self.by-version."extend"."1.2.1";
   by-version."extend"."1.2.1" = self.buildNodePackage {
@@ -1360,6 +1878,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."extend"."~1.3.0" =
+    self.by-version."extend"."1.3.0";
+  by-version."extend"."1.3.0" = self.buildNodePackage {
+    name = "extend-1.3.0";
+    version = "1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extend/-/extend-1.3.0.tgz";
+      name = "extend-1.3.0.tgz";
+      sha1 = "d1516fb0ff5624d2ebf9123ea1dac5a1994004f8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."eyes"."0.1.x" =
     self.by-version."eyes"."0.1.8";
   by-version."eyes"."0.1.8" = self.buildNodePackage {
@@ -1379,6 +1916,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."fileset"."0.1.x" =
+    self.by-version."fileset"."0.1.5";
+  by-version."fileset"."0.1.5" = self.buildNodePackage {
+    name = "fileset-0.1.5";
+    version = "0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fileset/-/fileset-0.1.5.tgz";
+      name = "fileset-0.1.5.tgz";
+      sha1 = "acc423bfaf92843385c66bf75822264d11b7bd94";
+    };
+    deps = {
+      "minimatch-0.4.0" = self.by-version."minimatch"."0.4.0";
+      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."finalhandler"."0.3.4" =
     self.by-version."finalhandler"."0.3.4";
   by-version."finalhandler"."0.3.4" = self.buildNodePackage {
@@ -1393,7 +1951,7 @@
     deps = {
       "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
+      "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
     };
     optionalDependencies = {
     };
@@ -1401,38 +1959,37 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."follow"."~0.11.2" =
-    self.by-version."follow"."0.11.4";
-  by-version."follow"."0.11.4" = self.buildNodePackage {
-    name = "follow-0.11.4";
-    version = "0.11.4";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/follow/-/follow-0.11.4.tgz";
-      name = "follow-0.11.4.tgz";
-      sha1 = "87e9a50d443f921d05704ebac412a14ab9d9232f";
-    };
-    deps = {
-      "request-2.53.0" = self.by-version."request"."2.53.0";
-      "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3";
-      "debug-0.7.4" = self.by-version."debug"."0.7.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."forever-agent"."~0.2.0" =
-    self.by-version."forever-agent"."0.2.0";
-  by-version."forever-agent"."0.2.0" = self.buildNodePackage {
-    name = "forever-agent-0.2.0";
-    version = "0.2.0";
+  by-spec."findup-sync"."~0.1.2" =
+    self.by-version."findup-sync"."0.1.3";
+  by-version."findup-sync"."0.1.3" = self.buildNodePackage {
+    name = "findup-sync-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz";
-      name = "forever-agent-0.2.0.tgz";
-      sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f";
+      url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz";
+      name = "findup-sync-0.1.3.tgz";
+      sha1 = "7f3e7a97b82392c653bf06589bd85190e93c3683";
+    };
+    deps = {
+      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."flagged-respawn"."~0.3.0" =
+    self.by-version."flagged-respawn"."0.3.1";
+  by-version."flagged-respawn"."0.3.1" = self.buildNodePackage {
+    name = "flagged-respawn-0.3.1";
+    version = "0.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz";
+      name = "flagged-respawn-0.3.1.tgz";
+      sha1 = "397700925df6e12452202a71e89d89545fbbbe9d";
     };
     deps = {
     };
@@ -1461,21 +2018,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."form-data"."0.1.3" =
-    self.by-version."form-data"."0.1.3";
-  by-version."form-data"."0.1.3" = self.buildNodePackage {
-    name = "form-data-0.1.3";
-    version = "0.1.3";
+  by-spec."forever-agent"."~0.6.0" =
+    self.by-version."forever-agent"."0.6.1";
+  by-version."forever-agent"."0.6.1" = self.buildNodePackage {
+    name = "forever-agent-0.6.1";
+    version = "0.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz";
-      name = "form-data-0.1.3.tgz";
-      sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea";
+      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+      name = "forever-agent-0.6.1.tgz";
+      sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
     };
     deps = {
-      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "async-0.9.0" = self.by-version."async"."0.9.0";
     };
     optionalDependencies = {
     };
@@ -1483,16 +2037,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."form-data"."~0.0.3" =
-    self.by-version."form-data"."0.0.10";
-  by-version."form-data"."0.0.10" = self.buildNodePackage {
-    name = "form-data-0.0.10";
-    version = "0.0.10";
+  by-spec."form-data"."0.1.2" =
+    self.by-version."form-data"."0.1.2";
+  by-version."form-data"."0.1.2" = self.buildNodePackage {
+    name = "form-data-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz";
-      name = "form-data-0.0.10.tgz";
-      sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed";
+      url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz";
+      name = "form-data-0.1.2.tgz";
+      sha1 = "1143c21357911a78dd7913b189b4bab5d5d57445";
     };
     deps = {
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
@@ -1541,7 +2095,47 @@
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
+      "mime-types-2.0.11" = self.by-version."mime-types"."2.0.11";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."formatio"."1.1.1" =
+    self.by-version."formatio"."1.1.1";
+  by-version."formatio"."1.1.1" = self.buildNodePackage {
+    name = "formatio-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz";
+      name = "formatio-1.1.1.tgz";
+      sha1 = "5ed3ccd636551097383465d996199100e86161e9";
+    };
+    deps = {
+      "samsam-1.1.2" = self.by-version."samsam"."1.1.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."formatio"."~1.0" =
+    self.by-version."formatio"."1.0.2";
+  by-version."formatio"."1.0.2" = self.buildNodePackage {
+    name = "formatio-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/formatio/-/formatio-1.0.2.tgz";
+      name = "formatio-1.0.2.tgz";
+      sha1 = "e7991ca144ff7d8cff07bb9ac86a9b79c6ba47ef";
+    };
+    deps = {
+      "samsam-1.1.2" = self.by-version."samsam"."1.1.2";
     };
     optionalDependencies = {
     };
@@ -1606,7 +2200,202 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."glob"."^3.2.11" =
+  by-spec."fstream"."^1.0.2" =
+    self.by-version."fstream"."1.0.6";
+  by-version."fstream"."1.0.6" = self.buildNodePackage {
+    name = "fstream-1.0.6";
+    version = "1.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fstream/-/fstream-1.0.6.tgz";
+      name = "fstream-1.0.6.tgz";
+      sha1 = "817e50312fb4ed90da865c8eb5ecd1d1d7aed0ec";
+    };
+    deps = {
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "rimraf-2.3.3" = self.by-version."rimraf"."2.3.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."fstream"."~0.1.17" =
+    self.by-version."fstream"."0.1.31";
+  by-version."fstream"."0.1.31" = self.buildNodePackage {
+    name = "fstream-0.1.31";
+    version = "0.1.31";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
+      name = "fstream-0.1.31.tgz";
+      sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
+    };
+    deps = {
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "rimraf-2.3.3" = self.by-version."rimraf"."2.3.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."fstream"."~0.1.22" =
+    self.by-version."fstream"."0.1.31";
+  by-spec."fstream"."~0.1.28" =
+    self.by-version."fstream"."0.1.31";
+  by-spec."fstream-ignore"."0.0.7" =
+    self.by-version."fstream-ignore"."0.0.7";
+  by-version."fstream-ignore"."0.0.7" = self.buildNodePackage {
+    name = "fstream-ignore-0.0.7";
+    version = "0.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz";
+      name = "fstream-ignore-0.0.7.tgz";
+      sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63";
+    };
+    deps = {
+      "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+      "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."gauge"."~1.2.0" =
+    self.by-version."gauge"."1.2.0";
+  by-version."gauge"."1.2.0" = self.buildNodePackage {
+    name = "gauge-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/gauge/-/gauge-1.2.0.tgz";
+      name = "gauge-1.2.0.tgz";
+      sha1 = "3094ab1285633f799814388fc8f2de67b4c012c5";
+    };
+    deps = {
+      "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
+      "has-unicode-1.0.0" = self.by-version."has-unicode"."1.0.0";
+      "lodash.pad-3.1.0" = self.by-version."lodash.pad"."3.1.0";
+      "lodash.padleft-3.1.1" = self.by-version."lodash.padleft"."3.1.1";
+      "lodash.padright-3.1.1" = self.by-version."lodash.padright"."3.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."generate-function"."^2.0.0" =
+    self.by-version."generate-function"."2.0.0";
+  by-version."generate-function"."2.0.0" = self.buildNodePackage {
+    name = "generate-function-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
+      name = "generate-function-2.0.0.tgz";
+      sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."generate-object-property"."^1.1.0" =
+    self.by-version."generate-object-property"."1.1.1";
+  by-version."generate-object-property"."1.1.1" = self.buildNodePackage {
+    name = "generate-object-property-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.1.1.tgz";
+      name = "generate-object-property-1.1.1.tgz";
+      sha1 = "8fda6b4cb69b34a189a6cebee7c4c268af47cc93";
+    };
+    deps = {
+      "is-property-1.0.2" = self.by-version."is-property"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."generic-pool-redux"."~0.1.0" =
+    self.by-version."generic-pool-redux"."0.1.0";
+  by-version."generic-pool-redux"."0.1.0" = self.buildNodePackage {
+    name = "generic-pool-redux-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/generic-pool-redux/-/generic-pool-redux-0.1.0.tgz";
+      name = "generic-pool-redux-0.1.0.tgz";
+      sha1 = "326c2594e17fba4d4f0622cfe09acc3c84cb3a82";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."get-stdin"."^4.0.1" =
+    self.by-version."get-stdin"."4.0.1";
+  by-version."get-stdin"."4.0.1" = self.buildNodePackage {
+    name = "get-stdin-4.0.1";
+    version = "4.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
+      name = "get-stdin-4.0.1.tgz";
+      sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."glob"."3.2.3" =
+    self.by-version."glob"."3.2.3";
+  by-version."glob"."3.2.3" = self.buildNodePackage {
+    name = "glob-3.2.3";
+    version = "3.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
+      name = "glob-3.2.3.tgz";
+      sha1 = "e313eeb249c7affaa5c475286b0e115b59839467";
+    };
+    deps = {
+      "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."glob"."3.x" =
     self.by-version."glob"."3.2.11";
   by-version."glob"."3.2.11" = self.buildNodePackage {
     name = "glob-3.2.11";
@@ -1627,6 +2416,232 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."glob"."^4.4.2" =
+    self.by-version."glob"."4.5.3";
+  by-version."glob"."4.5.3" = self.buildNodePackage {
+    name = "glob-4.5.3";
+    version = "4.5.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz";
+      name = "glob-4.5.3.tgz";
+      sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f";
+    };
+    deps = {
+      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimatch-2.0.7" = self.by-version."minimatch"."2.0.7";
+      "once-1.3.2" = self.by-version."once"."1.3.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."glob"."~3.2.9" =
+    self.by-version."glob"."3.2.11";
+  by-spec."graceful-fs"."1.2" =
+    self.by-version."graceful-fs"."1.2.3";
+  by-version."graceful-fs"."1.2.3" = self.buildNodePackage {
+    name = "graceful-fs-1.2.3";
+    version = "1.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+      name = "graceful-fs-1.2.3.tgz";
+      sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."graceful-fs"."3" =
+    self.by-version."graceful-fs"."3.0.6";
+  by-version."graceful-fs"."3.0.6" = self.buildNodePackage {
+    name = "graceful-fs-3.0.6";
+    version = "3.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz";
+      name = "graceful-fs-3.0.6.tgz";
+      sha1 = "dce3a18351cb94cdc82e688b2e3dd2842d1b09bb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."graceful-fs"."~2.0.0" =
+    self.by-version."graceful-fs"."2.0.3";
+  by-version."graceful-fs"."2.0.3" = self.buildNodePackage {
+    name = "graceful-fs-2.0.3";
+    version = "2.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz";
+      name = "graceful-fs-2.0.3.tgz";
+      sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."graceful-fs"."~3.0.2" =
+    self.by-version."graceful-fs"."3.0.6";
+  by-spec."graceful-readlink".">= 1.0.0" =
+    self.by-version."graceful-readlink"."1.0.1";
+  by-version."graceful-readlink"."1.0.1" = self.buildNodePackage {
+    name = "graceful-readlink-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
+      name = "graceful-readlink-1.0.1.tgz";
+      sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."growl"."1.8.1" =
+    self.by-version."growl"."1.8.1";
+  by-version."growl"."1.8.1" = self.buildNodePackage {
+    name = "growl-1.8.1";
+    version = "1.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/growl/-/growl-1.8.1.tgz";
+      name = "growl-1.8.1.tgz";
+      sha1 = "4b2dec8d907e93db336624dcec0183502f8c9428";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."handlebars"."1.3.x" =
+    self.by-version."handlebars"."1.3.0";
+  by-version."handlebars"."1.3.0" = self.buildNodePackage {
+    name = "handlebars-1.3.0";
+    version = "1.3.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/handlebars/-/handlebars-1.3.0.tgz";
+      name = "handlebars-1.3.0.tgz";
+      sha1 = "9e9b130a93e389491322d975cf3ec1818c37ce34";
+    };
+    deps = {
+      "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+    };
+    optionalDependencies = {
+      "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."har-validator"."^1.4.0" =
+    self.by-version."har-validator"."1.7.0";
+  by-version."har-validator"."1.7.0" = self.buildNodePackage {
+    name = "har-validator-1.7.0";
+    version = "1.7.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/har-validator/-/har-validator-1.7.0.tgz";
+      name = "har-validator-1.7.0.tgz";
+      sha1 = "563f8c58edca6410e2e408b0e540161da580dc46";
+    };
+    deps = {
+      "bluebird-2.9.25" = self.by-version."bluebird"."2.9.25";
+      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
+      "commander-2.8.1" = self.by-version."commander"."2.8.1";
+      "is-my-json-valid-2.11.0" = self.by-version."is-my-json-valid"."2.11.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-ansi"."^0.1.0" =
+    self.by-version."has-ansi"."0.1.0";
+  by-version."has-ansi"."0.1.0" = self.buildNodePackage {
+    name = "has-ansi-0.1.0";
+    version = "0.1.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz";
+      name = "has-ansi-0.1.0.tgz";
+      sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e";
+    };
+    deps = {
+      "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-ansi"."^1.0.3" =
+    self.by-version."has-ansi"."1.0.3";
+  by-version."has-ansi"."1.0.3" = self.buildNodePackage {
+    name = "has-ansi-1.0.3";
+    version = "1.0.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz";
+      name = "has-ansi-1.0.3.tgz";
+      sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538";
+    };
+    deps = {
+      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
+      "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-unicode"."^1.0.0" =
+    self.by-version."has-unicode"."1.0.0";
+  by-version."has-unicode"."1.0.0" = self.buildNodePackage {
+    name = "has-unicode-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz";
+      name = "has-unicode-1.0.0.tgz";
+      sha1 = "bac5c44e064c2ffc3b8fcbd8c71afe08f9afc8cc";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."hawk"."1.1.1" =
     self.by-version."hawk"."1.1.1";
   by-version."hawk"."1.1.1" = self.buildNodePackage {
@@ -1650,29 +2665,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."hawk"."~0.10.2" =
-    self.by-version."hawk"."0.10.2";
-  by-version."hawk"."0.10.2" = self.buildNodePackage {
-    name = "hawk-0.10.2";
-    version = "0.10.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz";
-      name = "hawk-0.10.2.tgz";
-      sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2";
-    };
-    deps = {
-      "hoek-0.7.6" = self.by-version."hoek"."0.7.6";
-      "boom-0.3.8" = self.by-version."boom"."0.3.8";
-      "cryptiles-0.1.3" = self.by-version."cryptiles"."0.1.3";
-      "sntp-0.1.4" = self.by-version."sntp"."0.1.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."hawk"."~2.3.0" =
     self.by-version."hawk"."2.3.1";
   by-version."hawk"."2.3.1" = self.buildNodePackage {
@@ -1685,8 +2677,8 @@
       sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f";
     };
     deps = {
-      "hoek-2.11.1" = self.by-version."hoek"."2.11.1";
-      "boom-2.6.1" = self.by-version."boom"."2.6.1";
+      "hoek-2.13.0" = self.by-version."hoek"."2.13.0";
+      "boom-2.7.1" = self.by-version."boom"."2.7.1";
       "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4";
       "sntp-1.0.9" = self.by-version."sntp"."1.0.9";
     };
@@ -1696,16 +2688,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."hoek"."0.7.x" =
-    self.by-version."hoek"."0.7.6";
-  by-version."hoek"."0.7.6" = self.buildNodePackage {
-    name = "hoek-0.7.6";
-    version = "0.7.6";
+  by-spec."heap".">= 0.2.0" =
+    self.by-version."heap"."0.2.6";
+  by-version."heap"."0.2.6" = self.buildNodePackage {
+    name = "heap-0.2.6";
+    version = "0.2.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz";
-      name = "hoek-0.7.6.tgz";
-      sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a";
+      url = "http://registry.npmjs.org/heap/-/heap-0.2.6.tgz";
+      name = "heap-0.2.6.tgz";
+      sha1 = "087e1f10b046932fc8594dd9e6d378afc9d1e5ac";
     };
     deps = {
     };
@@ -1735,15 +2727,15 @@
     cpu = [ ];
   };
   by-spec."hoek"."2.x.x" =
-    self.by-version."hoek"."2.11.1";
-  by-version."hoek"."2.11.1" = self.buildNodePackage {
-    name = "hoek-2.11.1";
-    version = "2.11.1";
+    self.by-version."hoek"."2.13.0";
+  by-version."hoek"."2.13.0" = self.buildNodePackage {
+    name = "hoek-2.13.0";
+    version = "2.13.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hoek/-/hoek-2.11.1.tgz";
-      name = "hoek-2.11.1.tgz";
-      sha1 = "3839a8b72f86aade3312100afaf80648af155b38";
+      url = "http://registry.npmjs.org/hoek/-/hoek-2.13.0.tgz";
+      name = "hoek-2.13.0.tgz";
+      sha1 = "cc86b5c1c344b41a7271be449e232fac8d6f450c";
     };
     deps = {
     };
@@ -1753,27 +2745,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."http-errors"."~1.3.1" =
-    self.by-version."http-errors"."1.3.1";
-  by-version."http-errors"."1.3.1" = self.buildNodePackage {
-    name = "http-errors-1.3.1";
-    version = "1.3.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz";
-      name = "http-errors-1.3.1.tgz";
-      sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
-    };
-    deps = {
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."http-signature"."~0.10.0" =
     self.by-version."http-signature"."0.10.1";
   by-version."http-signature"."0.10.1" = self.buildNodePackage {
@@ -1796,16 +2767,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."iconv-lite"."0.4.7" =
-    self.by-version."iconv-lite"."0.4.7";
-  by-version."iconv-lite"."0.4.7" = self.buildNodePackage {
-    name = "iconv-lite-0.4.7";
-    version = "0.4.7";
+  by-spec."iconv-lite"."0.4.8" =
+    self.by-version."iconv-lite"."0.4.8";
+  by-version."iconv-lite"."0.4.8" = self.buildNodePackage {
+    name = "iconv-lite-0.4.8";
+    version = "0.4.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.7.tgz";
-      name = "iconv-lite-0.4.7.tgz";
-      sha1 = "89d32fec821bf8597f44609b4bc09bed5c209a23";
+      url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz";
+      name = "iconv-lite-0.4.8.tgz";
+      sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
     };
     deps = {
     };
@@ -1815,6 +2786,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."inflight"."^1.0.4" =
+    self.by-version."inflight"."1.0.4";
+  by-version."inflight"."1.0.4" = self.buildNodePackage {
+    name = "inflight-1.0.4";
+    version = "1.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz";
+      name = "inflight-1.0.4.tgz";
+      sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a";
+    };
+    deps = {
+      "once-1.3.2" = self.by-version."once"."1.3.2";
+      "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."inherits"."2" =
     self.by-version."inherits"."2.0.1";
   by-version."inherits"."2.0.1" = self.buildNodePackage {
@@ -1834,18 +2826,104 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."inherits"."2.0.1" =
+    self.by-version."inherits"."2.0.1";
+  by-spec."inherits"."~2.0.0" =
+    self.by-version."inherits"."2.0.1";
   by-spec."inherits"."~2.0.1" =
     self.by-version."inherits"."2.0.1";
-  by-spec."ipaddr.js"."0.1.9" =
-    self.by-version."ipaddr.js"."0.1.9";
-  by-version."ipaddr.js"."0.1.9" = self.buildNodePackage {
-    name = "ipaddr.js-0.1.9";
-    version = "0.1.9";
+  by-spec."ini"."1.x.x" =
+    self.by-version."ini"."1.3.3";
+  by-version."ini"."1.3.3" = self.buildNodePackage {
+    name = "ini-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.9.tgz";
-      name = "ipaddr.js-0.1.9.tgz";
-      sha1 = "a9c78ccc12dc9010f296ab9aef2f61f432d69efa";
+      url = "http://registry.npmjs.org/ini/-/ini-1.3.3.tgz";
+      name = "ini-1.3.3.tgz";
+      sha1 = "c07e34aef1de06aff21d413b458e52b21533a11e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ini"."~1.3.0" =
+    self.by-version."ini"."1.3.3";
+  by-spec."interpret"."^0.3.2" =
+    self.by-version."interpret"."0.3.10";
+  by-version."interpret"."0.3.10" = self.buildNodePackage {
+    name = "interpret-0.3.10";
+    version = "0.3.10";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz";
+      name = "interpret-0.3.10.tgz";
+      sha1 = "088c25de731c6c5b112a90f0071cfaf459e5a7bb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ipaddr.js"."1.0.1" =
+    self.by-version."ipaddr.js"."1.0.1";
+  by-version."ipaddr.js"."1.0.1" = self.buildNodePackage {
+    name = "ipaddr.js-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz";
+      name = "ipaddr.js-1.0.1.tgz";
+      sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-my-json-valid"."^2.10.1" =
+    self.by-version."is-my-json-valid"."2.11.0";
+  by-version."is-my-json-valid"."2.11.0" = self.buildNodePackage {
+    name = "is-my-json-valid-2.11.0";
+    version = "2.11.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.11.0.tgz";
+      name = "is-my-json-valid-2.11.0.tgz";
+      sha1 = "11f130d52c6c0b2ee132a72feb8e3e4c61a2c54f";
+    };
+    deps = {
+      "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0";
+      "generate-object-property-1.1.1" = self.by-version."generate-object-property"."1.1.1";
+      "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0";
+      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-property"."^1.0.0" =
+    self.by-version."is-property"."1.0.2";
+  by-version."is-property"."1.0.2" = self.buildNodePackage {
+    name = "is-property-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
+      name = "is-property-1.0.2.tgz";
+      sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
     };
     deps = {
     };
@@ -1874,7 +2952,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."isstream"."~0.1.1" =
+  by-spec."isstream"."0.1.x" =
     self.by-version."isstream"."0.1.2";
   by-version."isstream"."0.1.2" = self.buildNodePackage {
     name = "isstream-0.1.2";
@@ -1893,18 +2971,159 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."json-stringify-safe"."~3.0.0" =
-    self.by-version."json-stringify-safe"."3.0.0";
-  by-version."json-stringify-safe"."3.0.0" = self.buildNodePackage {
-    name = "json-stringify-safe-3.0.0";
-    version = "3.0.0";
-    bin = false;
+  by-spec."isstream"."~0.1.1" =
+    self.by-version."isstream"."0.1.2";
+  by-spec."istanbul"."^0.2.10" =
+    self.by-version."istanbul"."0.2.16";
+  by-version."istanbul"."0.2.16" = self.buildNodePackage {
+    name = "istanbul-0.2.16";
+    version = "0.2.16";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz";
-      name = "json-stringify-safe-3.0.0.tgz";
-      sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3";
+      url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.16.tgz";
+      name = "istanbul-0.2.16.tgz";
+      sha1 = "870545a0d4f4b4ce161039e9e805a98c2c700bd9";
     };
     deps = {
+      "esprima-1.2.5" = self.by-version."esprima"."1.2.5";
+      "escodegen-1.3.3" = self.by-version."escodegen"."1.3.3";
+      "handlebars-1.3.0" = self.by-version."handlebars"."1.3.0";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
+      "fileset-0.1.5" = self.by-version."fileset"."0.1.5";
+      "which-1.0.9" = self.by-version."which"."1.0.9";
+      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+      "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3";
+      "resolve-0.7.4" = self.by-version."resolve"."0.7.4";
+      "js-yaml-3.3.1" = self.by-version."js-yaml"."3.3.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "istanbul" = self.by-version."istanbul"."0.2.16";
+  by-spec."jade"."0.26.3" =
+    self.by-version."jade"."0.26.3";
+  by-version."jade"."0.26.3" = self.buildNodePackage {
+    name = "jade-0.26.3";
+    version = "0.26.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
+      name = "jade-0.26.3.tgz";
+      sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c";
+    };
+    deps = {
+      "commander-0.6.1" = self.by-version."commander"."0.6.1";
+      "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jayschema"."^0.3.1" =
+    self.by-version."jayschema"."0.3.1";
+  by-version."jayschema"."0.3.1" = self.buildNodePackage {
+    name = "jayschema-0.3.1";
+    version = "0.3.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz";
+      name = "jayschema-0.3.1.tgz";
+      sha1 = "76f4769f9b172ef7d5dcde4875b49cb736179b58";
+    };
+    deps = {
+      "when-3.4.6" = self.by-version."when"."3.4.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "jayschema" = self.by-version."jayschema"."0.3.1";
+  by-spec."jayschema-error-messages"."^1.0.2" =
+    self.by-version."jayschema-error-messages"."1.0.3";
+  by-version."jayschema-error-messages"."1.0.3" = self.buildNodePackage {
+    name = "jayschema-error-messages-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jayschema-error-messages/-/jayschema-error-messages-1.0.3.tgz";
+      name = "jayschema-error-messages-1.0.3.tgz";
+      sha1 = "8bac6e52ae89d406fbe1a7db4ae44debfd289066";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "jayschema-error-messages" = self.by-version."jayschema-error-messages"."1.0.3";
+  by-spec."js-yaml"."3.0.1" =
+    self.by-version."js-yaml"."3.0.1";
+  by-version."js-yaml"."3.0.1" = self.buildNodePackage {
+    name = "js-yaml-3.0.1";
+    version = "3.0.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz";
+      name = "js-yaml-3.0.1.tgz";
+      sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe";
+    };
+    deps = {
+      "argparse-0.1.16" = self.by-version."argparse"."0.1.16";
+      "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."js-yaml"."3.x" =
+    self.by-version."js-yaml"."3.3.1";
+  by-version."js-yaml"."3.3.1" = self.buildNodePackage {
+    name = "js-yaml-3.3.1";
+    version = "3.3.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.3.1.tgz";
+      name = "js-yaml-3.3.1.tgz";
+      sha1 = "ca1acd3423ec275d12140a7bab51db015ba0b3c0";
+    };
+    deps = {
+      "argparse-1.0.2" = self.by-version."argparse"."1.0.2";
+      "esprima-2.2.0" = self.by-version."esprima"."2.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."json-diff"."0.3.1" =
+    self.by-version."json-diff"."0.3.1";
+  by-version."json-diff"."0.3.1" = self.buildNodePackage {
+    name = "json-diff-0.3.1";
+    version = "0.3.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json-diff/-/json-diff-0.3.1.tgz";
+      name = "json-diff-0.3.1.tgz";
+      sha1 = "6dbc3ae2d25e075a7fd71bcd9874458666fb681b";
+    };
+    deps = {
+      "dreamopt-0.6.0" = self.by-version."dreamopt"."0.6.0";
+      "difflib-0.2.4" = self.by-version."difflib"."0.2.4";
+      "cli-color-0.1.7" = self.by-version."cli-color"."0.1.7";
     };
     optionalDependencies = {
     };
@@ -1931,16 +3150,136 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."jsonpointer"."^1.1.0" =
+    self.by-version."jsonpointer"."1.1.0";
+  by-version."jsonpointer"."1.1.0" = self.buildNodePackage {
+    name = "jsonpointer-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz";
+      name = "jsonpointer-1.1.0.tgz";
+      sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."knex"."^0.7.6" =
+    self.by-version."knex"."0.7.6";
+  by-version."knex"."0.7.6" = self.buildNodePackage {
+    name = "knex-0.7.6";
+    version = "0.7.6";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/knex/-/knex-0.7.6.tgz";
+      name = "knex-0.7.6.tgz";
+      sha1 = "325d18174b0625658ff0d35aaf1cd9e631696992";
+    };
+    deps = {
+      "bluebird-2.9.25" = self.by-version."bluebird"."2.9.25";
+      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
+      "commander-2.8.1" = self.by-version."commander"."2.8.1";
+      "generic-pool-redux-0.1.0" = self.by-version."generic-pool-redux"."0.1.0";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "interpret-0.3.10" = self.by-version."interpret"."0.3.10";
+      "liftoff-0.13.6" = self.by-version."liftoff"."0.13.6";
+      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
+      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "tildify-1.0.0" = self.by-version."tildify"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "knex" = self.by-version."knex"."0.7.6";
+  by-spec."lcov-parse"."0.0.6" =
+    self.by-version."lcov-parse"."0.0.6";
+  by-version."lcov-parse"."0.0.6" = self.buildNodePackage {
+    name = "lcov-parse-0.0.6";
+    version = "0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz";
+      name = "lcov-parse-0.0.6.tgz";
+      sha1 = "819e5da8bf0791f9d3f39eea5ed1868187f11175";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."liftoff"."~0.13.2" =
+    self.by-version."liftoff"."0.13.6";
+  by-version."liftoff"."0.13.6" = self.buildNodePackage {
+    name = "liftoff-0.13.6";
+    version = "0.13.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/liftoff/-/liftoff-0.13.6.tgz";
+      name = "liftoff-0.13.6.tgz";
+      sha1 = "600e8966b92d1e0150eab5b577652569f4c7d1d8";
+    };
+    deps = {
+      "findup-sync-0.1.3" = self.by-version."findup-sync"."0.1.3";
+      "resolve-1.0.0" = self.by-version."resolve"."1.0.0";
+      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
+      "extend-1.3.0" = self.by-version."extend"."1.3.0";
+      "flagged-respawn-0.3.1" = self.by-version."flagged-respawn"."0.3.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash".">= 3.2.0 < 4.0.0" =
+    self.by-version."lodash"."3.8.0";
+  by-version."lodash"."3.8.0" = self.buildNodePackage {
+    name = "lodash-3.8.0";
+    version = "3.8.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz";
+      name = "lodash-3.8.0.tgz";
+      sha1 = "376eb98bdcd9382a9365c33c4cb8250de1325b91";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."lodash"."^3.1.0" =
-    self.by-version."lodash"."3.5.0";
-  by-version."lodash"."3.5.0" = self.buildNodePackage {
-    name = "lodash-3.5.0";
-    version = "3.5.0";
+    self.by-version."lodash"."3.8.0";
+  by-spec."lodash"."^3.6" =
+    self.by-version."lodash"."3.8.0";
+  "lodash" = self.by-version."lodash"."3.8.0";
+  by-spec."lodash"."^3.6.0" =
+    self.by-version."lodash"."3.8.0";
+  by-spec."lodash"."~2.4.0" =
+    self.by-version."lodash"."2.4.2";
+  by-version."lodash"."2.4.2" = self.buildNodePackage {
+    name = "lodash-2.4.2";
+    version = "2.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz";
-      name = "lodash-3.5.0.tgz";
-      sha1 = "19bb3f4d51278f0b8c818ed145c74ecf9fe40e6d";
+      url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
+      name = "lodash-2.4.2.tgz";
+      sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
     };
     deps = {
     };
@@ -1950,16 +3289,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash"."~1.3.1" =
-    self.by-version."lodash"."1.3.1";
-  by-version."lodash"."1.3.1" = self.buildNodePackage {
-    name = "lodash-1.3.1";
-    version = "1.3.1";
+  by-spec."lodash"."~2.4.1" =
+    self.by-version."lodash"."2.4.2";
+  by-spec."lodash._basetostring"."^3.0.0" =
+    self.by-version."lodash._basetostring"."3.0.0";
+  by-version."lodash._basetostring"."3.0.0" = self.buildNodePackage {
+    name = "lodash._basetostring-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz";
-      name = "lodash-1.3.1.tgz";
-      sha1 = "a4663b53686b895ff074e2ba504dfb76a8e2b770";
+      url = "http://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz";
+      name = "lodash._basetostring-3.0.0.tgz";
+      sha1 = "75a9a4aaaa2b2a8761111ff5431e7d83c1daf0e2";
     };
     deps = {
     };
@@ -1969,17 +3310,138 @@
     os = [ ];
     cpu = [ ];
   };
-  "lodash" = self.by-version."lodash"."1.3.1";
-  by-spec."long-timeout"."~0.0.1" =
-    self.by-version."long-timeout"."0.0.2";
-  by-version."long-timeout"."0.0.2" = self.buildNodePackage {
-    name = "long-timeout-0.0.2";
-    version = "0.0.2";
+  by-spec."lodash._createpadding"."^3.0.0" =
+    self.by-version."lodash._createpadding"."3.6.0";
+  by-version."lodash._createpadding"."3.6.0" = self.buildNodePackage {
+    name = "lodash._createpadding-3.6.0";
+    version = "3.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/long-timeout/-/long-timeout-0.0.2.tgz";
-      name = "long-timeout-0.0.2.tgz";
-      sha1 = "f36449ba89629d13a7a2b2523a4db9dd66e3ff68";
+      url = "http://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.0.tgz";
+      name = "lodash._createpadding-3.6.0.tgz";
+      sha1 = "c466850dd1a05e6bfec54fd0cf0db28b68332d5e";
+    };
+    deps = {
+      "lodash.repeat-3.0.0" = self.by-version."lodash.repeat"."3.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.pad"."^3.0.0" =
+    self.by-version."lodash.pad"."3.1.0";
+  by-version."lodash.pad"."3.1.0" = self.buildNodePackage {
+    name = "lodash.pad-3.1.0";
+    version = "3.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.0.tgz";
+      name = "lodash.pad-3.1.0.tgz";
+      sha1 = "9f18b1f3749a95e197b5ff2ae752ea9851ada965";
+    };
+    deps = {
+      "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
+      "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.padleft"."^3.0.0" =
+    self.by-version."lodash.padleft"."3.1.1";
+  by-version."lodash.padleft"."3.1.1" = self.buildNodePackage {
+    name = "lodash.padleft-3.1.1";
+    version = "3.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz";
+      name = "lodash.padleft-3.1.1.tgz";
+      sha1 = "150151f1e0245edba15d50af2d71f1d5cff46530";
+    };
+    deps = {
+      "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
+      "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.padright"."^3.0.0" =
+    self.by-version."lodash.padright"."3.1.1";
+  by-version."lodash.padright"."3.1.1" = self.buildNodePackage {
+    name = "lodash.padright-3.1.1";
+    version = "3.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz";
+      name = "lodash.padright-3.1.1.tgz";
+      sha1 = "79f7770baaa39738c040aeb5465e8d88f2aacec0";
+    };
+    deps = {
+      "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
+      "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.repeat"."^3.0.0" =
+    self.by-version."lodash.repeat"."3.0.0";
+  by-version."lodash.repeat"."3.0.0" = self.buildNodePackage {
+    name = "lodash.repeat-3.0.0";
+    version = "3.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.0.tgz";
+      name = "lodash.repeat-3.0.0.tgz";
+      sha1 = "c340f4136c99dc5b2e397b3fd50cffbd172a94b0";
+    };
+    deps = {
+      "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."log-driver"."1.2.4" =
+    self.by-version."log-driver"."1.2.4";
+  by-version."log-driver"."1.2.4" = self.buildNodePackage {
+    name = "log-driver-1.2.4";
+    version = "1.2.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz";
+      name = "log-driver-1.2.4.tgz";
+      sha1 = "2d62d7faef45d8a71341961a04b0761eca99cfa3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lolex"."1.1.0" =
+    self.by-version."lolex"."1.1.0";
+  by-version."lolex"."1.1.0" = self.buildNodePackage {
+    name = "lolex-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lolex/-/lolex-1.1.0.tgz";
+      name = "lolex-1.1.0.tgz";
+      sha1 = "5dbbbc850395e7523c74b3586f7fbd2626d25b1b";
     };
     deps = {
     };
@@ -1990,15 +3452,15 @@
     cpu = [ ];
   };
   by-spec."lru-cache"."2" =
-    self.by-version."lru-cache"."2.5.0";
-  by-version."lru-cache"."2.5.0" = self.buildNodePackage {
-    name = "lru-cache-2.5.0";
-    version = "2.5.0";
+    self.by-version."lru-cache"."2.6.2";
+  by-version."lru-cache"."2.6.2" = self.buildNodePackage {
+    name = "lru-cache-2.6.2";
+    version = "2.6.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz";
-      name = "lru-cache-2.5.0.tgz";
-      sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb";
+      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz";
+      name = "lru-cache-2.6.2.tgz";
+      sha1 = "77741638c6dc972e503dbe41dcb6bfdfba499a38";
     };
     deps = {
     };
@@ -2009,7 +3471,24 @@
     cpu = [ ];
   };
   by-spec."lru-cache"."~2.5.0" =
-    self.by-version."lru-cache"."2.5.0";
+    self.by-version."lru-cache"."2.5.2";
+  by-version."lru-cache"."2.5.2" = self.buildNodePackage {
+    name = "lru-cache-2.5.2";
+    version = "2.5.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz";
+      name = "lru-cache-2.5.2.tgz";
+      sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."media-typer"."0.3.0" =
     self.by-version."media-typer"."0.3.0";
   by-version."media-typer"."0.3.0" = self.buildNodePackage {
@@ -2048,22 +3527,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."method-override"."~2.3.2" =
-    self.by-version."method-override"."2.3.2";
-  by-version."method-override"."2.3.2" = self.buildNodePackage {
-    name = "method-override-2.3.2";
-    version = "2.3.2";
+  by-spec."methods"."0.0.1" =
+    self.by-version."methods"."0.0.1";
+  by-version."methods"."0.0.1" = self.buildNodePackage {
+    name = "methods-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/method-override/-/method-override-2.3.2.tgz";
-      name = "method-override-2.3.2.tgz";
-      sha1 = "f2433fb27b6c087efb8812628727fb8cfd93a793";
+      url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
+      name = "methods-0.0.1.tgz";
+      sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c";
     };
     deps = {
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "methods-1.1.1" = self.by-version."methods"."1.1.1";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "vary-1.0.0" = self.by-version."vary"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -2071,16 +3546,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."methods"."1.0.1" =
-    self.by-version."methods"."1.0.1";
-  by-version."methods"."1.0.1" = self.buildNodePackage {
-    name = "methods-1.0.1";
-    version = "1.0.1";
+  by-spec."methods"."1.0.0" =
+    self.by-version."methods"."1.0.0";
+  by-version."methods"."1.0.0" = self.buildNodePackage {
+    name = "methods-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz";
-      name = "methods-1.0.1.tgz";
-      sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b";
+      url = "http://registry.npmjs.org/methods/-/methods-1.0.0.tgz";
+      name = "methods-1.0.0.tgz";
+      sha1 = "9a73d86375dfcef26ef61ca3e4b8a2e2538a80e3";
     };
     deps = {
     };
@@ -2109,16 +3584,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mime"."1.2.11" =
-    self.by-version."mime"."1.2.11";
-  by-version."mime"."1.2.11" = self.buildNodePackage {
-    name = "mime-1.2.11";
-    version = "1.2.11";
+  by-spec."mime"."1.2.5" =
+    self.by-version."mime"."1.2.5";
+  by-version."mime"."1.2.5" = self.buildNodePackage {
+    name = "mime-1.2.5";
+    version = "1.2.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
-      name = "mime-1.2.11.tgz";
-      sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+      url = "http://registry.npmjs.org/mime/-/mime-1.2.5.tgz";
+      name = "mime-1.2.5.tgz";
+      sha1 = "9eed073022a8bf5e16c8566c6867b8832bfbfa13";
     };
     deps = {
     };
@@ -2147,24 +3622,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mime"."^1.2.11" =
-    self.by-version."mime"."1.3.4";
   by-spec."mime"."~1.2.11" =
     self.by-version."mime"."1.2.11";
-  by-spec."mime"."~1.2.2" =
-    self.by-version."mime"."1.2.11";
-  by-spec."mime"."~1.2.7" =
-    self.by-version."mime"."1.2.11";
-  by-spec."mime-db".">= 1.1.2 < 2" =
-    self.by-version."mime-db"."1.8.0";
-  by-version."mime-db"."1.8.0" = self.buildNodePackage {
-    name = "mime-db-1.8.0";
-    version = "1.8.0";
+  by-version."mime"."1.2.11" = self.buildNodePackage {
+    name = "mime-1.2.11";
+    version = "1.2.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz";
-      name = "mime-db-1.8.0.tgz";
-      sha1 = "82a9b385f22b0f5954dec4d445faba0722c4ad25";
+      url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+      name = "mime-1.2.11.tgz";
+      sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
     };
     deps = {
     };
@@ -2174,8 +3641,27 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mime-db"."~1.8.0" =
-    self.by-version."mime-db"."1.8.0";
+  by-spec."mime-db".">= 1.1.2 < 2" =
+    self.by-version."mime-db"."1.9.1";
+  by-version."mime-db"."1.9.1" = self.buildNodePackage {
+    name = "mime-db-1.9.1";
+    version = "1.9.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.9.1.tgz";
+      name = "mime-db-1.9.1.tgz";
+      sha1 = "1431049a71791482c29f37bafc8ea2cb3a6dd3e8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-db"."~1.9.1" =
+    self.by-version."mime-db"."1.9.1";
   by-spec."mime-types"."~1.0.1" =
     self.by-version."mime-types"."1.0.2";
   by-version."mime-types"."1.0.2" = self.buildNodePackage {
@@ -2196,18 +3682,18 @@
     cpu = [ ];
   };
   by-spec."mime-types"."~2.0.1" =
-    self.by-version."mime-types"."2.0.10";
-  by-version."mime-types"."2.0.10" = self.buildNodePackage {
-    name = "mime-types-2.0.10";
-    version = "2.0.10";
+    self.by-version."mime-types"."2.0.11";
+  by-version."mime-types"."2.0.11" = self.buildNodePackage {
+    name = "mime-types-2.0.11";
+    version = "2.0.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz";
-      name = "mime-types-2.0.10.tgz";
-      sha1 = "eacd81bb73cab2a77447549a078d4f2018c67b4d";
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.11.tgz";
+      name = "mime-types-2.0.11.tgz";
+      sha1 = "bf3449042799d877c815c29929d1e74760e72007";
     };
     deps = {
-      "mime-db-1.8.0" = self.by-version."mime-db"."1.8.0";
+      "mime-db-1.9.1" = self.by-version."mime-db"."1.9.1";
     };
     optionalDependencies = {
     };
@@ -2215,10 +3701,10 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mime-types"."~2.0.10" =
-    self.by-version."mime-types"."2.0.10";
+  by-spec."mime-types"."~2.0.11" =
+    self.by-version."mime-types"."2.0.11";
   by-spec."mime-types"."~2.0.3" =
-    self.by-version."mime-types"."2.0.10";
+    self.by-version."mime-types"."2.0.11";
   by-spec."minimatch"."0.3" =
     self.by-version."minimatch"."0.3.0";
   by-version."minimatch"."0.3.0" = self.buildNodePackage {
@@ -2231,7 +3717,7 @@
       sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
     };
     deps = {
-      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+      "lru-cache-2.6.2" = self.by-version."lru-cache"."2.6.2";
       "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
     };
     optionalDependencies = {
@@ -2240,6 +3726,70 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."minimatch"."0.x" =
+    self.by-version."minimatch"."0.4.0";
+  by-version."minimatch"."0.4.0" = self.buildNodePackage {
+    name = "minimatch-0.4.0";
+    version = "0.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz";
+      name = "minimatch-0.4.0.tgz";
+      sha1 = "bd2c7d060d2c8c8fd7cde7f1f2ed2d5b270fdb1b";
+    };
+    deps = {
+      "lru-cache-2.6.2" = self.by-version."lru-cache"."2.6.2";
+      "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."minimatch"."^2.0.1" =
+    self.by-version."minimatch"."2.0.7";
+  by-version."minimatch"."2.0.7" = self.buildNodePackage {
+    name = "minimatch-2.0.7";
+    version = "2.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz";
+      name = "minimatch-2.0.7.tgz";
+      sha1 = "d23652ab10e663e7d914602e920e21f9f66492be";
+    };
+    deps = {
+      "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."minimatch"."~0.2.0" =
+    self.by-version."minimatch"."0.2.14";
+  by-version."minimatch"."0.2.14" = self.buildNodePackage {
+    name = "minimatch-0.2.14";
+    version = "0.2.14";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
+      name = "minimatch-0.2.14.tgz";
+      sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
+    };
+    deps = {
+      "lru-cache-2.6.2" = self.by-version."lru-cache"."2.6.2";
+      "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."minimatch"."~0.2.11" =
+    self.by-version."minimatch"."0.2.14";
   by-spec."minimist"."0.0.8" =
     self.by-version."minimist"."0.0.8";
   by-version."minimist"."0.0.8" = self.buildNodePackage {
@@ -2259,6 +3809,85 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."minimist"."~0.0.1" =
+    self.by-version."minimist"."0.0.10";
+  by-version."minimist"."0.0.10" = self.buildNodePackage {
+    name = "minimist-0.0.10";
+    version = "0.0.10";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
+      name = "minimist-0.0.10.tgz";
+      sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."minimist"."~0.0.7" =
+    self.by-version."minimist"."0.0.10";
+  by-spec."minimist"."~1.1.0" =
+    self.by-version."minimist"."1.1.1";
+  by-version."minimist"."1.1.1" = self.buildNodePackage {
+    name = "minimist-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz";
+      name = "minimist-1.1.1.tgz";
+      sha1 = "1bc2bc71658cdca5712475684363615b0b4f695b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mkdirp"."0.3.0" =
+    self.by-version."mkdirp"."0.3.0";
+  by-version."mkdirp"."0.3.0" = self.buildNodePackage {
+    name = "mkdirp-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
+      name = "mkdirp-0.3.0.tgz";
+      sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mkdirp"."0.5" =
+    self.by-version."mkdirp"."0.5.1";
+  by-version."mkdirp"."0.5.1" = self.buildNodePackage {
+    name = "mkdirp-0.5.1";
+    version = "0.5.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+      name = "mkdirp-0.5.1.tgz";
+      sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+    };
+    deps = {
+      "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."mkdirp"."0.5.0" =
     self.by-version."mkdirp"."0.5.0";
   by-version."mkdirp"."0.5.0" = self.buildNodePackage {
@@ -2279,18 +3908,35 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mkdirp"."~0.3.5" =
-    self.by-version."mkdirp"."0.3.5";
-  by-version."mkdirp"."0.3.5" = self.buildNodePackage {
-    name = "mkdirp-0.3.5";
-    version = "0.3.5";
-    bin = false;
+  by-spec."mkdirp"."0.5.x" =
+    self.by-version."mkdirp"."0.5.1";
+  by-spec."mkdirp".">=0.5 0" =
+    self.by-version."mkdirp"."0.5.1";
+  by-spec."mkdirp"."^0.5.0" =
+    self.by-version."mkdirp"."0.5.1";
+  by-spec."mkdirp"."~0.5.0" =
+    self.by-version."mkdirp"."0.5.1";
+  by-spec."mocha"."^2.1.0" =
+    self.by-version."mocha"."2.2.4";
+  by-version."mocha"."2.2.4" = self.buildNodePackage {
+    name = "mocha-2.2.4";
+    version = "2.2.4";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
-      name = "mkdirp-0.3.5.tgz";
-      sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+      url = "http://registry.npmjs.org/mocha/-/mocha-2.2.4.tgz";
+      name = "mocha-2.2.4.tgz";
+      sha1 = "192b0edc0e17e56613bc66e5fc7e81c00413a98d";
     };
     deps = {
+      "commander-2.3.0" = self.by-version."commander"."2.3.0";
+      "debug-2.0.0" = self.by-version."debug"."2.0.0";
+      "diff-1.0.8" = self.by-version."diff"."1.0.8";
+      "escape-string-regexp-1.0.2" = self.by-version."escape-string-regexp"."1.0.2";
+      "glob-3.2.3" = self.by-version."glob"."3.2.3";
+      "growl-1.8.1" = self.by-version."growl"."1.8.1";
+      "jade-0.26.3" = self.by-version."jade"."0.26.3";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "supports-color-1.2.1" = self.by-version."supports-color"."1.2.1";
     };
     optionalDependencies = {
     };
@@ -2298,18 +3944,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."moment"."~2.1.0" =
-    self.by-version."moment"."2.1.0";
-  by-version."moment"."2.1.0" = self.buildNodePackage {
-    name = "moment-2.1.0";
-    version = "2.1.0";
+  "mocha" = self.by-version."mocha"."2.2.4";
+  by-spec."morgan"."^1.3.0" =
+    self.by-version."morgan"."1.5.3";
+  by-version."morgan"."1.5.3" = self.buildNodePackage {
+    name = "morgan-1.5.3";
+    version = "1.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz";
-      name = "moment-2.1.0.tgz";
-      sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567";
+      url = "http://registry.npmjs.org/morgan/-/morgan-1.5.3.tgz";
+      name = "morgan-1.5.3.tgz";
+      sha1 = "8adb4e72f9e5c5436e5d93f42910835f79da9fdf";
     };
     deps = {
+      "basic-auth-1.0.1" = self.by-version."basic-auth"."1.0.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
+      "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
     };
     optionalDependencies = {
     };
@@ -2317,30 +3968,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "moment" = self.by-version."moment"."2.1.0";
-  by-spec."morgan"."~1.5.2" =
-    self.by-version."morgan"."1.5.2";
-  by-version."morgan"."1.5.2" = self.buildNodePackage {
-    name = "morgan-1.5.2";
-    version = "1.5.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/morgan/-/morgan-1.5.2.tgz";
-      name = "morgan-1.5.2.tgz";
-      sha1 = "34c1a0e7c2d5ad3ed78f0ef3257b8ac7c35d7cff";
-    };
-    deps = {
-      "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
-      "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+  "morgan" = self.by-version."morgan"."1.5.3";
   by-spec."ms"."0.6.2" =
     self.by-version."ms"."0.6.2";
   by-version."ms"."0.6.2" = self.buildNodePackage {
@@ -2379,20 +4007,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."multiparty"."3.3.2" =
-    self.by-version."multiparty"."3.3.2";
-  by-version."multiparty"."3.3.2" = self.buildNodePackage {
-    name = "multiparty-3.3.2";
-    version = "3.3.2";
+  by-spec."ms"."0.7.1" =
+    self.by-version."ms"."0.7.1";
+  by-version."ms"."0.7.1" = self.buildNodePackage {
+    name = "ms-0.7.1";
+    version = "0.7.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz";
-      name = "multiparty-3.3.2.tgz";
-      sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f";
+      url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
+      name = "ms-0.7.1.tgz";
+      sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
     };
     deps = {
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-      "stream-counter-0.2.0" = self.by-version."stream-counter"."0.2.0";
     };
     optionalDependencies = {
     };
@@ -2419,42 +4045,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."~1.6.2" =
-    self.by-version."nan"."1.6.2";
-  by-spec."nano"."^5.8.0" =
-    self.by-version."nano"."5.12.2";
-  by-version."nano"."5.12.2" = self.buildNodePackage {
-    name = "nano-5.12.2";
-    version = "5.12.2";
+  by-spec."nan"."~1.0.0" =
+    self.by-version."nan"."1.0.0";
+  by-version."nan"."1.0.0" = self.buildNodePackage {
+    name = "nan-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nano/-/nano-5.12.2.tgz";
-      name = "nano-5.12.2.tgz";
-      sha1 = "b51c9c5e4045c4a71fe3bf6a1f46f0ac2426a17c";
-    };
-    deps = {
-      "request-2.42.0" = self.by-version."request"."2.42.0";
-      "follow-0.11.4" = self.by-version."follow"."0.11.4";
-      "errs-0.3.2" = self.by-version."errs"."0.3.2";
-      "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "nano" = self.by-version."nano"."5.12.2";
-  by-spec."native-or-bluebird"."~1.1.2" =
-    self.by-version."native-or-bluebird"."1.1.2";
-  by-version."native-or-bluebird"."1.1.2" = self.buildNodePackage {
-    name = "native-or-bluebird-1.1.2";
-    version = "1.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz";
-      name = "native-or-bluebird-1.1.2.tgz";
-      sha1 = "3921e110232d1eb790f3dac61bb370531c7d356e";
+      url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
+      name = "nan-1.0.0.tgz";
+      sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
     };
     deps = {
     };
@@ -2464,16 +4064,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."negotiator"."0.5.1" =
-    self.by-version."negotiator"."0.5.1";
-  by-version."negotiator"."0.5.1" = self.buildNodePackage {
-    name = "negotiator-0.5.1";
-    version = "0.5.1";
+  by-spec."nan"."~1.8.4" =
+    self.by-version."nan"."1.8.4";
+  by-version."nan"."1.8.4" = self.buildNodePackage {
+    name = "nan-1.8.4";
+    version = "1.8.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.1.tgz";
-      name = "negotiator-0.5.1.tgz";
-      sha1 = "498f661c522470153c6086ac83019cb3eb66f61c";
+      url = "http://registry.npmjs.org/nan/-/nan-1.8.4.tgz";
+      name = "nan-1.8.4.tgz";
+      sha1 = "3c76b5382eab33e44b758d2813ca9d92e9342f34";
     };
     deps = {
     };
@@ -2483,41 +4083,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-dogstatsd"."0.0.5" =
-    self.by-version."node-dogstatsd"."0.0.5";
-  by-version."node-dogstatsd"."0.0.5" = self.buildNodePackage {
-    name = "node-dogstatsd-0.0.5";
-    version = "0.0.5";
+  by-spec."nconf"."^0.6.9" =
+    self.by-version."nconf"."0.6.9";
+  by-version."nconf"."0.6.9" = self.buildNodePackage {
+    name = "nconf-0.6.9";
+    version = "0.6.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-dogstatsd/-/node-dogstatsd-0.0.5.tgz";
-      name = "node-dogstatsd-0.0.5.tgz";
-      sha1 = "5b1bc12e7c2f1cab65c6081f43cee27eb359316e";
+      url = "http://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz";
+      name = "nconf-0.6.9.tgz";
+      sha1 = "9570ef15ed6f9ae6b2b3c8d5e71b66d3193cd661";
     };
     deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ "linux" "darwin" "freebsd" ];
-    cpu = [ ];
-  };
-  "node-dogstatsd" = self.by-version."node-dogstatsd"."0.0.5";
-  by-spec."node-persist"."0.0.2" =
-    self.by-version."node-persist"."0.0.2";
-  by-version."node-persist"."0.0.2" = self.buildNodePackage {
-    name = "node-persist-0.0.2";
-    version = "0.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/node-persist/-/node-persist-0.0.2.tgz";
-      name = "node-persist-0.0.2.tgz";
-      sha1 = "a4999e81d5f3f605df267abf314b7f03b8e6823b";
-    };
-    deps = {
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
-      "sugar-1.3.9" = self.by-version."sugar"."1.3.9";
+      "async-0.2.9" = self.by-version."async"."0.2.9";
+      "ini-1.3.3" = self.by-version."ini"."1.3.3";
+      "optimist-0.6.0" = self.by-version."optimist"."0.6.0";
     };
     optionalDependencies = {
     };
@@ -2525,39 +4105,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-persist" = self.by-version."node-persist"."0.0.2";
-  by-spec."node-schedule"."^0.1.13" =
-    self.by-version."node-schedule"."0.1.16";
-  by-version."node-schedule"."0.1.16" = self.buildNodePackage {
-    name = "node-schedule-0.1.16";
-    version = "0.1.16";
+  "nconf" = self.by-version."nconf"."0.6.9";
+  by-spec."negotiator"."0.5.3" =
+    self.by-version."negotiator"."0.5.3";
+  by-version."negotiator"."0.5.3" = self.buildNodePackage {
+    name = "negotiator-0.5.3";
+    version = "0.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-schedule/-/node-schedule-0.1.16.tgz";
-      name = "node-schedule-0.1.16.tgz";
-      sha1 = "1bbc74bd03141b9bb8c1135978d3b63995ddbf94";
-    };
-    deps = {
-      "cron-parser-0.3.6" = self.by-version."cron-parser"."0.3.6";
-      "long-timeout-0.0.2" = self.by-version."long-timeout"."0.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "node-schedule" = self.by-version."node-schedule"."0.1.16";
-  by-spec."node-statsd"."^0.1.0" =
-    self.by-version."node-statsd"."0.1.1";
-  by-version."node-statsd"."0.1.1" = self.buildNodePackage {
-    name = "node-statsd-0.1.1";
-    version = "0.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/node-statsd/-/node-statsd-0.1.1.tgz";
-      name = "node-statsd-0.1.1.tgz";
-      sha1 = "27a59348763d0af7a037ac2a031fef3f051013d3";
+      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz";
+      name = "negotiator-0.5.3.tgz";
+      sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8";
     };
     deps = {
     };
@@ -2567,8 +4125,35 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-statsd" = self.by-version."node-statsd"."0.1.1";
-  by-spec."node-uuid"."~1.4.0" =
+  by-spec."node-pre-gyp"."~0.6.7" =
+    self.by-version."node-pre-gyp"."0.6.7";
+  by-version."node-pre-gyp"."0.6.7" = self.buildNodePackage {
+    name = "node-pre-gyp-0.6.7";
+    version = "0.6.7";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.7.tgz";
+      name = "node-pre-gyp-0.6.7.tgz";
+      sha1 = "4c3ee4ac2934b0b27fead6bc76391c0dccf38ea8";
+    };
+    deps = {
+      "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
+      "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "semver-4.3.4" = self.by-version."semver"."4.3.4";
+      "tar-2.1.1" = self.by-version."tar"."2.1.1";
+      "tar-pack-2.0.0" = self.by-version."tar-pack"."2.0.0";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "rc-1.0.1" = self.by-version."rc"."1.0.1";
+      "rimraf-2.3.3" = self.by-version."rimraf"."2.3.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-uuid"."^1.4.1" =
     self.by-version."node-uuid"."1.4.3";
   by-version."node-uuid"."1.4.3" = self.buildNodePackage {
     name = "node-uuid-1.4.3";
@@ -2587,18 +4172,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."oauth-sign"."~0.2.0" =
-    self.by-version."oauth-sign"."0.2.0";
-  by-version."oauth-sign"."0.2.0" = self.buildNodePackage {
-    name = "oauth-sign-0.2.0";
-    version = "0.2.0";
-    bin = false;
+  "node-uuid" = self.by-version."node-uuid"."1.4.3";
+  by-spec."node-uuid"."~1.4.0" =
+    self.by-version."node-uuid"."1.4.3";
+  by-spec."nopt"."3.x" =
+    self.by-version."nopt"."3.0.1";
+  by-version."nopt"."3.0.1" = self.buildNodePackage {
+    name = "nopt-3.0.1";
+    version = "3.0.1";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz";
-      name = "oauth-sign-0.2.0.tgz";
-      sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2";
+      url = "http://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz";
+      name = "nopt-3.0.1.tgz";
+      sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd";
     };
     deps = {
+      "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
     };
     optionalDependencies = {
     };
@@ -2606,16 +4195,40 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."oauth-sign"."~0.4.0" =
-    self.by-version."oauth-sign"."0.4.0";
-  by-version."oauth-sign"."0.4.0" = self.buildNodePackage {
-    name = "oauth-sign-0.4.0";
-    version = "0.4.0";
+  by-spec."nopt"."~3.0.1" =
+    self.by-version."nopt"."3.0.1";
+  by-spec."npmlog"."~1.2.0" =
+    self.by-version."npmlog"."1.2.0";
+  by-version."npmlog"."1.2.0" = self.buildNodePackage {
+    name = "npmlog-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz";
-      name = "oauth-sign-0.4.0.tgz";
-      sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69";
+      url = "http://registry.npmjs.org/npmlog/-/npmlog-1.2.0.tgz";
+      name = "npmlog-1.2.0.tgz";
+      sha1 = "b512f18ae8696a0192ada78ba00c06dbbd91bafb";
+    };
+    deps = {
+      "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
+      "are-we-there-yet-1.0.4" = self.by-version."are-we-there-yet"."1.0.4";
+      "gauge-1.2.0" = self.by-version."gauge"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."oauth-sign"."~0.3.0" =
+    self.by-version."oauth-sign"."0.3.0";
+  by-version."oauth-sign"."0.3.0" = self.buildNodePackage {
+    name = "oauth-sign-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
+      name = "oauth-sign-0.3.0.tgz";
+      sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
     };
     deps = {
     };
@@ -2645,15 +4258,15 @@
     cpu = [ ];
   };
   by-spec."on-finished"."~2.2.0" =
-    self.by-version."on-finished"."2.2.0";
-  by-version."on-finished"."2.2.0" = self.buildNodePackage {
-    name = "on-finished-2.2.0";
-    version = "2.2.0";
+    self.by-version."on-finished"."2.2.1";
+  by-version."on-finished"."2.2.1" = self.buildNodePackage {
+    name = "on-finished-2.2.1";
+    version = "2.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.0.tgz";
-      name = "on-finished-2.2.0.tgz";
-      sha1 = "e6ba6a09a3482d6b7969bc3da92c86f0a967605e";
+      url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz";
+      name = "on-finished-2.2.1.tgz";
+      sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029";
     };
     deps = {
       "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0";
@@ -2664,6 +4277,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."on-finished"."~2.2.1" =
+    self.by-version."on-finished"."2.2.1";
   by-spec."on-headers"."~1.0.0" =
     self.by-version."on-headers"."1.0.0";
   by-version."on-headers"."1.0.0" = self.buildNodePackage {
@@ -2683,6 +4298,88 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."once"."^1.3.0" =
+    self.by-version."once"."1.3.2";
+  by-version."once"."1.3.2" = self.buildNodePackage {
+    name = "once-1.3.2";
+    version = "1.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/once/-/once-1.3.2.tgz";
+      name = "once-1.3.2.tgz";
+      sha1 = "d8feeca93b039ec1dcdee7741c92bdac5e28081b";
+    };
+    deps = {
+      "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."once"."~1.1.1" =
+    self.by-version."once"."1.1.1";
+  by-version."once"."1.1.1" = self.buildNodePackage {
+    name = "once-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz";
+      name = "once-1.1.1.tgz";
+      sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."optimist"."0.6.0" =
+    self.by-version."optimist"."0.6.0";
+  by-version."optimist"."0.6.0" = self.buildNodePackage {
+    name = "optimist-0.6.0";
+    version = "0.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
+      name = "optimist-0.6.0.tgz";
+      sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200";
+    };
+    deps = {
+      "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3";
+      "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."optimist"."~0.3" =
+    self.by-version."optimist"."0.3.7";
+  by-version."optimist"."0.3.7" = self.buildNodePackage {
+    name = "optimist-0.3.7";
+    version = "0.3.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
+      name = "optimist-0.3.7.tgz";
+      sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
+    };
+    deps = {
+      "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."optimist"."~0.3.5" =
+    self.by-version."optimist"."0.3.7";
   by-spec."options".">=0.0.5" =
     self.by-version."options"."0.0.6";
   by-version."options"."0.0.6" = self.buildNodePackage {
@@ -2721,16 +4418,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."pause"."0.0.1" =
-    self.by-version."pause"."0.0.1";
-  by-version."pause"."0.0.1" = self.buildNodePackage {
-    name = "pause-0.0.1";
-    version = "0.0.1";
+  by-spec."path-to-regexp"."0.1.3" =
+    self.by-version."path-to-regexp"."0.1.3";
+  by-version."path-to-regexp"."0.1.3" = self.buildNodePackage {
+    name = "path-to-regexp-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
-      name = "pause-0.0.1.tgz";
-      sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
+      url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
+      name = "path-to-regexp-0.1.3.tgz";
+      sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
     };
     deps = {
     };
@@ -2759,41 +4456,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."posix"."^2.0.0" =
-    self.by-version."posix"."2.0.0";
-  by-version."posix"."2.0.0" = self.buildNodePackage {
-    name = "posix-2.0.0";
-    version = "2.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/posix/-/posix-2.0.0.tgz";
-      name = "posix-2.0.0.tgz";
-      sha1 = "90fd0ec73968d805c890b61ae6cc95ae5803a87d";
-    };
-    deps = {
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "posix" = self.by-version."posix"."2.0.0";
   by-spec."proxy-addr"."~1.0.7" =
-    self.by-version."proxy-addr"."1.0.7";
-  by-version."proxy-addr"."1.0.7" = self.buildNodePackage {
-    name = "proxy-addr-1.0.7";
-    version = "1.0.7";
+    self.by-version."proxy-addr"."1.0.8";
+  by-version."proxy-addr"."1.0.8" = self.buildNodePackage {
+    name = "proxy-addr-1.0.8";
+    version = "1.0.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.7.tgz";
-      name = "proxy-addr-1.0.7.tgz";
-      sha1 = "6e2655aa9c56b014f09734a7e6d558cc77751939";
+      url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz";
+      name = "proxy-addr-1.0.8.tgz";
+      sha1 = "db54ec878bcc1053d57646609219b3715678bafe";
     };
     deps = {
       "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0";
-      "ipaddr.js-0.1.9" = self.by-version."ipaddr.js"."0.1.9";
+      "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -2801,45 +4477,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."punycode".">=0.2.0" =
-    self.by-version."punycode"."1.3.2";
-  by-version."punycode"."1.3.2" = self.buildNodePackage {
-    name = "punycode-1.3.2";
-    version = "1.3.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz";
-      name = "punycode-1.3.2.tgz";
-      sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."q"."~1.0.0" =
-    self.by-version."q"."1.0.1";
-  by-version."q"."1.0.1" = self.buildNodePackage {
-    name = "q-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/q/-/q-1.0.1.tgz";
-      name = "q-1.0.1.tgz";
-      sha1 = "11872aeedee89268110b10a718448ffb10112a14";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "q" = self.by-version."q"."1.0.1";
   by-spec."qs"."0.6.6" =
     self.by-version."qs"."0.6.6";
   by-version."qs"."0.6.6" = self.buildNodePackage {
@@ -2878,16 +4515,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."qs"."~0.5.4" =
-    self.by-version."qs"."0.5.6";
-  by-version."qs"."0.5.6" = self.buildNodePackage {
-    name = "qs-0.5.6";
-    version = "0.5.6";
+  by-spec."qs"."2.4.2" =
+    self.by-version."qs"."2.4.2";
+  by-version."qs"."2.4.2" = self.buildNodePackage {
+    name = "qs-2.4.2";
+    version = "2.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz";
-      name = "qs-0.5.6.tgz";
-      sha1 = "31b1ad058567651c526921506b9a8793911a0384";
+      url = "http://registry.npmjs.org/qs/-/qs-2.4.2.tgz";
+      name = "qs-2.4.2.tgz";
+      sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a";
     };
     deps = {
     };
@@ -2897,35 +4534,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."qs"."~1.2.0" =
-    self.by-version."qs"."1.2.2";
-  by-version."qs"."1.2.2" = self.buildNodePackage {
-    name = "qs-1.2.2";
-    version = "1.2.2";
+  by-spec."qs"."~1.0.0" =
+    self.by-version."qs"."1.0.2";
+  by-version."qs"."1.0.2" = self.buildNodePackage {
+    name = "qs-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-1.2.2.tgz";
-      name = "qs-1.2.2.tgz";
-      sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."qs"."~2.3.1" =
-    self.by-version."qs"."2.3.3";
-  by-version."qs"."2.3.3" = self.buildNodePackage {
-    name = "qs-2.3.3";
-    version = "2.3.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
-      name = "qs-2.3.3.tgz";
-      sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
+      url = "http://registry.npmjs.org/qs/-/qs-1.0.2.tgz";
+      name = "qs-1.0.2.tgz";
+      sha1 = "50a93e2b5af6691c31bcea5dae78ee6ea1903768";
     };
     deps = {
     };
@@ -2935,6 +4553,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."qs"."~2.4.0" =
+    self.by-version."qs"."2.4.2";
   by-spec."range-parser"."~1.0.2" =
     self.by-version."range-parser"."1.0.2";
   by-version."range-parser"."1.0.2" = self.buildNodePackage {
@@ -2954,20 +4574,43 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."raw-body"."1.3.3" =
-    self.by-version."raw-body"."1.3.3";
-  by-version."raw-body"."1.3.3" = self.buildNodePackage {
-    name = "raw-body-1.3.3";
-    version = "1.3.3";
+  by-spec."raw-body"."~2.0.1" =
+    self.by-version."raw-body"."2.0.1";
+  by-version."raw-body"."2.0.1" = self.buildNodePackage {
+    name = "raw-body-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.3.tgz";
-      name = "raw-body-1.3.3.tgz";
-      sha1 = "8841af3f64ad50a351dc77f229118b40c28fa58c";
+      url = "http://registry.npmjs.org/raw-body/-/raw-body-2.0.1.tgz";
+      name = "raw-body-2.0.1.tgz";
+      sha1 = "2b70a3ffd1681c0521bae73454e0ccbc785d378e";
     };
     deps = {
-      "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
-      "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7";
+      "bytes-2.0.1" = self.by-version."bytes"."2.0.1";
+      "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."rc"."~1.0.1" =
+    self.by-version."rc"."1.0.1";
+  by-version."rc"."1.0.1" = self.buildNodePackage {
+    name = "rc-1.0.1";
+    version = "1.0.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rc/-/rc-1.0.1.tgz";
+      name = "rc-1.0.1.tgz";
+      sha1 = "f919c25e804cb0aa60f6fd92d929fc86b45013e8";
+    };
+    deps = {
+      "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
+      "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11";
+      "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3";
+      "ini-1.3.3" = self.by-version."ini"."1.3.3";
     };
     optionalDependencies = {
     };
@@ -2998,30 +4641,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."readable-stream"."~1.0.26" =
-    self.by-version."readable-stream"."1.0.33";
-  by-version."readable-stream"."1.0.33" = self.buildNodePackage {
-    name = "readable-stream-1.0.33";
-    version = "1.0.33";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
-      name = "readable-stream-1.0.33.tgz";
-      sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c";
-    };
-    deps = {
-      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."readable-stream"."~1.1.8" =
+  by-spec."readable-stream"."^1.1.12" =
     self.by-version."readable-stream"."1.1.13";
   by-version."readable-stream"."1.1.13" = self.buildNodePackage {
     name = "readable-stream-1.1.13";
@@ -3044,20 +4664,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."readable-stream"."~1.1.9" =
+  by-spec."readable-stream"."^1.1.13" =
     self.by-version."readable-stream"."1.1.13";
-  by-spec."redis"."^0.10.1" =
-    self.by-version."redis"."0.10.3";
-  by-version."redis"."0.10.3" = self.buildNodePackage {
-    name = "redis-0.10.3";
-    version = "0.10.3";
+  by-spec."readable-stream"."~1.0.2" =
+    self.by-version."readable-stream"."1.0.33";
+  by-version."readable-stream"."1.0.33" = self.buildNodePackage {
+    name = "readable-stream-1.0.33";
+    version = "1.0.33";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz";
-      name = "redis-0.10.3.tgz";
-      sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6";
+      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
+      name = "readable-stream-1.0.33.tgz";
+      sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c";
     };
     deps = {
+      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -3065,7 +4689,8 @@
     os = [ ];
     cpu = [ ];
   };
-  "redis" = self.by-version."redis"."0.10.3";
+  by-spec."readable-stream"."~1.0.26" =
+    self.by-version."readable-stream"."1.0.33";
   by-spec."reduce-component"."1.0.1" =
     self.by-version."reduce-component"."1.0.1";
   by-version."reduce-component"."1.0.1" = self.buildNodePackage {
@@ -3085,101 +4710,30 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."request"."2.16.x" =
-    self.by-version."request"."2.16.6";
-  by-version."request"."2.16.6" = self.buildNodePackage {
-    name = "request-2.16.6";
-    version = "2.16.6";
+  by-spec."request"."2.40.0" =
+    self.by-version."request"."2.40.0";
+  by-version."request"."2.40.0" = self.buildNodePackage {
+    name = "request-2.40.0";
+    version = "2.40.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz";
-      name = "request-2.16.6.tgz";
-      sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad";
+      url = "http://registry.npmjs.org/request/-/request-2.40.0.tgz";
+      name = "request-2.40.0.tgz";
+      sha1 = "4dd670f696f1e6e842e66b4b5e839301ab9beb67";
     };
     deps = {
-      "form-data-0.0.10" = self.by-version."form-data"."0.0.10";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "hawk-0.10.2" = self.by-version."hawk"."0.10.2";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "cookie-jar-0.2.0" = self.by-version."cookie-jar"."0.2.0";
-      "aws-sign-0.2.0" = self.by-version."aws-sign"."0.2.0";
-      "oauth-sign-0.2.0" = self.by-version."oauth-sign"."0.2.0";
-      "forever-agent-0.2.0" = self.by-version."forever-agent"."0.2.0";
-      "tunnel-agent-0.2.0" = self.by-version."tunnel-agent"."0.2.0";
-      "json-stringify-safe-3.0.0" = self.by-version."json-stringify-safe"."3.0.0";
-      "qs-0.5.6" = self.by-version."qs"."0.5.6";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."request"."^2.34.0" =
-    self.by-version."request"."2.53.0";
-  by-version."request"."2.53.0" = self.buildNodePackage {
-    name = "request-2.53.0";
-    version = "2.53.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.53.0.tgz";
-      name = "request-2.53.0.tgz";
-      sha1 = "180a3ae92b7b639802e4f9545dd8fcdeb71d760c";
-    };
-    deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
-      "caseless-0.9.0" = self.by-version."caseless"."0.9.0";
-      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "qs-2.3.3" = self.by-version."qs"."2.3.3";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
-      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
-      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
-      "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0";
-      "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
-      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
-      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
-      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
-      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "request" = self.by-version."request"."2.53.0";
-  by-spec."request"."^2.44.0" =
-    self.by-version."request"."2.53.0";
-  by-spec."request"."~2.42.0" =
-    self.by-version."request"."2.42.0";
-  by-version."request"."2.42.0" = self.buildNodePackage {
-    name = "request-2.42.0";
-    version = "2.42.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.42.0.tgz";
-      name = "request-2.42.0.tgz";
-      sha1 = "572bd0148938564040ac7ab148b96423a063304a";
-    };
-    deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
-      "caseless-0.6.0" = self.by-version."caseless"."0.6.0";
-      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "qs-1.2.2" = self.by-version."qs"."1.2.2";
+      "qs-1.0.2" = self.by-version."qs"."1.0.2";
       "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
       "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
+      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
       "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
     };
     optionalDependencies = {
-      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
+      "tough-cookie-1.1.0" = self.by-version."tough-cookie"."1.1.0";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
+      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
-      "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0";
+      "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
       "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
       "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
@@ -3188,20 +4742,36 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."response-time"."~2.3.0" =
-    self.by-version."response-time"."2.3.0";
-  by-version."response-time"."2.3.0" = self.buildNodePackage {
-    name = "response-time-2.3.0";
-    version = "2.3.0";
+  by-spec."request"."2.x" =
+    self.by-version."request"."2.55.0";
+  by-version."request"."2.55.0" = self.buildNodePackage {
+    name = "request-2.55.0";
+    version = "2.55.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/response-time/-/response-time-2.3.0.tgz";
-      name = "response-time-2.3.0.tgz";
-      sha1 = "27cf2194fa373ef02c04781287416a3138060b68";
+      url = "http://registry.npmjs.org/request/-/request-2.55.0.tgz";
+      name = "request-2.55.0.tgz";
+      sha1 = "d75c1cdf679d76bb100f9bffe1fe551b5c24e93d";
     };
     deps = {
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "caseless-0.9.0" = self.by-version."caseless"."0.9.0";
+      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
+      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
+      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+      "mime-types-2.0.11" = self.by-version."mime-types"."2.0.11";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "qs-2.4.2" = self.by-version."qs"."2.4.2";
+      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
+      "tough-cookie-1.1.0" = self.by-version."tough-cookie"."1.1.0";
+      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
+      "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0";
+      "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
+      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
+      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "har-validator-1.7.0" = self.by-version."har-validator"."1.7.0";
     };
     optionalDependencies = {
     };
@@ -3209,44 +4779,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ripple-lib"."0.12.0" =
-    self.by-version."ripple-lib"."0.12.0";
-  by-version."ripple-lib"."0.12.0" = self.buildNodePackage {
-    name = "ripple-lib-0.12.0";
-    version = "0.12.0";
-    bin = false;
+  by-spec."require-directory"."^1.2.0" =
+    self.by-version."require-directory"."1.2.0";
+  by-version."require-directory"."1.2.0" = self.buildNodePackage {
+    name = "require-directory-1.2.0";
+    version = "1.2.0";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ripple-lib/-/ripple-lib-0.12.0.tgz";
-      name = "ripple-lib-0.12.0.tgz";
-      sha1 = "8bbefa8250bf09e148c4997c27bbca70c7030b55";
-    };
-    deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "bignumber.js-2.0.3" = self.by-version."bignumber.js"."2.0.3";
-      "extend-1.2.1" = self.by-version."extend"."1.2.1";
-      "lodash-3.5.0" = self.by-version."lodash"."3.5.0";
-      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
-      "ripple-wallet-generator-1.0.1" = self.by-version."ripple-wallet-generator"."1.0.1";
-      "ws-0.7.1" = self.by-version."ws"."0.7.1";
-      "superagent-0.18.2" = self.by-version."superagent"."0.18.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "ripple-lib" = self.by-version."ripple-lib"."0.12.0";
-  by-spec."ripple-wallet-generator"."1.0.1" =
-    self.by-version."ripple-wallet-generator"."1.0.1";
-  by-version."ripple-wallet-generator"."1.0.1" = self.buildNodePackage {
-    name = "ripple-wallet-generator-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ripple-wallet-generator/-/ripple-wallet-generator-1.0.1.tgz";
-      name = "ripple-wallet-generator-1.0.1.tgz";
-      sha1 = "fd9311c0c620c1bd51808a76a3f2a946293d459a";
+      url = "http://registry.npmjs.org/require-directory/-/require-directory-1.2.0.tgz";
+      name = "require-directory-1.2.0.tgz";
+      sha1 = "35ff45a82ab73ca6ca35c746c0a17014371e1afd";
     };
     deps = {
     };
@@ -3256,16 +4798,17 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."rndm"."~1.1.0" =
-    self.by-version."rndm"."1.1.0";
-  by-version."rndm"."1.1.0" = self.buildNodePackage {
-    name = "rndm-1.1.0";
-    version = "1.1.0";
+  "require-directory" = self.by-version."require-directory"."1.2.0";
+  by-spec."resolve"."0.7.x" =
+    self.by-version."resolve"."0.7.4";
+  by-version."resolve"."0.7.4" = self.buildNodePackage {
+    name = "resolve-0.7.4";
+    version = "0.7.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rndm/-/rndm-1.1.0.tgz";
-      name = "rndm-1.1.0.tgz";
-      sha1 = "01d1a8f1fb9b471181925b627b9049bf33074574";
+      url = "http://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz";
+      name = "resolve-0.7.4.tgz";
+      sha1 = "395a9ef9e873fbfe12bd14408bd91bb936003d69";
     };
     deps = {
     };
@@ -3275,16 +4818,163 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."scmp"."1.0.0" =
-    self.by-version."scmp"."1.0.0";
-  by-version."scmp"."1.0.0" = self.buildNodePackage {
-    name = "scmp-1.0.0";
+  by-spec."resolve"."~1.0.0" =
+    self.by-version."resolve"."1.0.0";
+  by-version."resolve"."1.0.0" = self.buildNodePackage {
+    name = "resolve-1.0.0";
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz";
-      name = "scmp-1.0.0.tgz";
-      sha1 = "a0b272c3fc7292f77115646f00618b0262514e04";
+      url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz";
+      name = "resolve-1.0.0.tgz";
+      sha1 = "2a6e3b314dcd57c6519e8e2282af8687e8de61c6";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."rimraf"."2" =
+    self.by-version."rimraf"."2.3.3";
+  by-version."rimraf"."2.3.3" = self.buildNodePackage {
+    name = "rimraf-2.3.3";
+    version = "2.3.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz";
+      name = "rimraf-2.3.3.tgz";
+      sha1 = "d0073d8b3010611e8f3ad377b08e9a3c18b98f06";
+    };
+    deps = {
+      "glob-4.5.3" = self.by-version."glob"."4.5.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."rimraf"."~2.2.0" =
+    self.by-version."rimraf"."2.2.8";
+  by-version."rimraf"."2.2.8" = self.buildNodePackage {
+    name = "rimraf-2.2.8";
+    version = "2.2.8";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
+      name = "rimraf-2.2.8.tgz";
+      sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."rimraf"."~2.3.2" =
+    self.by-version."rimraf"."2.3.3";
+  by-spec."ripple-lib"."^0.12.3" =
+    self.by-version."ripple-lib"."0.12.4";
+  by-version."ripple-lib"."0.12.4" = self.buildNodePackage {
+    name = "ripple-lib-0.12.4";
+    version = "0.12.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ripple-lib/-/ripple-lib-0.12.4.tgz";
+      name = "ripple-lib-0.12.4.tgz";
+      sha1 = "97675f9ae92bda1397deaaad70a76955d14f91fd";
+    };
+    deps = {
+      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "bignumber.js-2.0.7" = self.by-version."bignumber.js"."2.0.7";
+      "extend-1.2.1" = self.by-version."extend"."1.2.1";
+      "lodash-3.8.0" = self.by-version."lodash"."3.8.0";
+      "lru-cache-2.5.2" = self.by-version."lru-cache"."2.5.2";
+      "ripple-wallet-generator-1.0.3" = self.by-version."ripple-wallet-generator"."1.0.3";
+      "ws-0.7.1" = self.by-version."ws"."0.7.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "ripple-lib" = self.by-version."ripple-lib"."0.12.4";
+  by-spec."ripple-lib-transactionparser"."^0.3.2" =
+    self.by-version."ripple-lib-transactionparser"."0.3.2";
+  by-version."ripple-lib-transactionparser"."0.3.2" = self.buildNodePackage {
+    name = "ripple-lib-transactionparser-0.3.2";
+    version = "0.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ripple-lib-transactionparser/-/ripple-lib-transactionparser-0.3.2.tgz";
+      name = "ripple-lib-transactionparser-0.3.2.tgz";
+      sha1 = "cf85e44f9f623798b68f664244e026956092f874";
+    };
+    deps = {
+      "bignumber.js-1.4.1" = self.by-version."bignumber.js"."1.4.1";
+      "lodash-3.8.0" = self.by-version."lodash"."3.8.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "ripple-lib-transactionparser" = self.by-version."ripple-lib-transactionparser"."0.3.2";
+  by-spec."ripple-wallet-generator"."^1.0.3" =
+    self.by-version."ripple-wallet-generator"."1.0.3";
+  by-version."ripple-wallet-generator"."1.0.3" = self.buildNodePackage {
+    name = "ripple-wallet-generator-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ripple-wallet-generator/-/ripple-wallet-generator-1.0.3.tgz";
+      name = "ripple-wallet-generator-1.0.3.tgz";
+      sha1 = "2a1f0f6e2a39998fcf8fa89a55cb5c999cdb86ca";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."samsam"."~1.1" =
+    self.by-version."samsam"."1.1.2";
+  by-version."samsam"."1.1.2" = self.buildNodePackage {
+    name = "samsam-1.1.2";
+    version = "1.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz";
+      name = "samsam-1.1.2.tgz";
+      sha1 = "bec11fdc83a9fda063401210e40176c3024d1567";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."semver"."~4.3.2" =
+    self.by-version."semver"."4.3.4";
+  by-version."semver"."4.3.4" = self.buildNodePackage {
+    name = "semver-4.3.4";
+    version = "4.3.4";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/semver/-/semver-4.3.4.tgz";
+      name = "semver-4.3.4.tgz";
+      sha1 = "bf43a1aae304de040e12a13f84200ca7aeab7589";
     };
     deps = {
     };
@@ -3307,14 +4997,14 @@
     };
     deps = {
       "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
       "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "etag-1.5.1" = self.by-version."etag"."1.5.1";
       "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
       "ms-0.7.0" = self.by-version."ms"."0.7.0";
-      "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
+      "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
     };
     optionalDependencies = {
@@ -3323,55 +5013,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."serve-favicon"."~2.2.0" =
-    self.by-version."serve-favicon"."2.2.0";
-  by-version."serve-favicon"."2.2.0" = self.buildNodePackage {
-    name = "serve-favicon-2.2.0";
-    version = "2.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.2.0.tgz";
-      name = "serve-favicon-2.2.0.tgz";
-      sha1 = "a0c25ee8a652e1a638a67db46269cd52a8705858";
-    };
-    deps = {
-      "etag-1.5.1" = self.by-version."etag"."1.5.1";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "ms-0.7.0" = self.by-version."ms"."0.7.0";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."serve-index"."~1.6.3" =
-    self.by-version."serve-index"."1.6.3";
-  by-version."serve-index"."1.6.3" = self.buildNodePackage {
-    name = "serve-index-1.6.3";
-    version = "1.6.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/serve-index/-/serve-index-1.6.3.tgz";
-      name = "serve-index-1.6.3.tgz";
-      sha1 = "639056494ea59470a2c9518c28e7f225a342fd79";
-    };
-    deps = {
-      "accepts-1.2.5" = self.by-version."accepts"."1.2.5";
-      "batch-0.5.2" = self.by-version."batch"."0.5.2";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."serve-static"."~1.9.2" =
     self.by-version."serve-static"."1.9.2";
   by-version."serve-static"."1.9.2" = self.buildNodePackage {
@@ -3414,19 +5055,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."sntp"."0.1.x" =
-    self.by-version."sntp"."0.1.4";
-  by-version."sntp"."0.1.4" = self.buildNodePackage {
-    name = "sntp-0.1.4";
-    version = "0.1.4";
+  by-spec."sinon".">=1.4.0 <2" =
+    self.by-version."sinon"."1.14.1";
+  by-version."sinon"."1.14.1" = self.buildNodePackage {
+    name = "sinon-1.14.1";
+    version = "1.14.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz";
-      name = "sntp-0.1.4.tgz";
-      sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84";
+      url = "http://registry.npmjs.org/sinon/-/sinon-1.14.1.tgz";
+      name = "sinon-1.14.1.tgz";
+      sha1 = "d82797841918734507c94b7a73e3f560904578ad";
     };
     deps = {
-      "hoek-0.7.6" = self.by-version."hoek"."0.7.6";
+      "formatio-1.1.1" = self.by-version."formatio"."1.1.1";
+      "util-0.10.3" = self.by-version."util"."0.10.3";
+      "lolex-1.1.0" = self.by-version."lolex"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -3434,6 +5077,50 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."sinon"."~1.10.0" =
+    self.by-version."sinon"."1.10.3";
+  by-version."sinon"."1.10.3" = self.buildNodePackage {
+    name = "sinon-1.10.3";
+    version = "1.10.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sinon/-/sinon-1.10.3.tgz";
+      name = "sinon-1.10.3.tgz";
+      sha1 = "c063e0e99d8327dc199113aab52eb83a2e9e3c2c";
+    };
+    deps = {
+      "formatio-1.0.2" = self.by-version."formatio"."1.0.2";
+      "util-0.10.3" = self.by-version."util"."0.10.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "sinon" = self.by-version."sinon"."1.10.3";
+  by-spec."sinon-chai"."^2.5.0" =
+    self.by-version."sinon-chai"."2.7.0";
+  by-version."sinon-chai"."2.7.0" = self.buildNodePackage {
+    name = "sinon-chai-2.7.0";
+    version = "2.7.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sinon-chai/-/sinon-chai-2.7.0.tgz";
+      name = "sinon-chai-2.7.0.tgz";
+      sha1 = "493df3a3d758933fdd3678d011a4f738d5e72540";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [
+      self.by-version."chai"."2.3.0"
+      self.by-version."sinon"."1.14.1"];
+    os = [ ];
+    cpu = [ ];
+  };
+  "sinon-chai" = self.by-version."sinon-chai"."2.7.0";
   by-spec."sntp"."0.2.x" =
     self.by-version."sntp"."0.2.4";
   by-version."sntp"."0.2.4" = self.buildNodePackage {
@@ -3466,7 +5153,7 @@
       sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
     };
     deps = {
-      "hoek-2.11.1" = self.by-version."hoek"."2.11.1";
+      "hoek-2.13.0" = self.by-version."hoek"."2.13.0";
     };
     optionalDependencies = {
     };
@@ -3474,6 +5161,69 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."source-map"."~0.1.33" =
+    self.by-version."source-map"."0.1.43";
+  by-version."source-map"."0.1.43" = self.buildNodePackage {
+    name = "source-map-0.1.43";
+    version = "0.1.43";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
+      name = "source-map-0.1.43.tgz";
+      sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
+    };
+    deps = {
+      "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."source-map"."~0.1.7" =
+    self.by-version."source-map"."0.1.43";
+  by-spec."sprintf-js"."~1.0.2" =
+    self.by-version."sprintf-js"."1.0.2";
+  by-version."sprintf-js"."1.0.2" = self.buildNodePackage {
+    name = "sprintf-js-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz";
+      name = "sprintf-js-1.0.2.tgz";
+      sha1 = "11e4d84ff32144e35b0bf3a66f8587f38d8f9978";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sqlite3"."^3.0.2" =
+    self.by-version."sqlite3"."3.0.8";
+  by-version."sqlite3"."3.0.8" = self.buildNodePackage {
+    name = "sqlite3-3.0.8";
+    version = "3.0.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sqlite3/-/sqlite3-3.0.8.tgz";
+      name = "sqlite3-3.0.8.tgz";
+      sha1 = "662d6507426ba2af0cdaf894a1766c8099c0e435";
+    };
+    deps = {
+      "nan-1.8.4" = self.by-version."nan"."1.8.4";
+      "node-pre-gyp-0.6.7" = self.by-version."node-pre-gyp"."0.6.7";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "sqlite3" = self.by-version."sqlite3"."3.0.8";
   by-spec."stack-trace"."0.0.x" =
     self.by-version."stack-trace"."0.0.9";
   by-version."stack-trace"."0.0.9" = self.buildNodePackage {
@@ -3493,45 +5243,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."statuses"."1" =
-    self.by-version."statuses"."1.2.1";
-  by-version."statuses"."1.2.1" = self.buildNodePackage {
-    name = "statuses-1.2.1";
-    version = "1.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz";
-      name = "statuses-1.2.1.tgz";
-      sha1 = "dded45cc18256d51ed40aec142489d5c61026d28";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."stream-counter"."~0.2.0" =
-    self.by-version."stream-counter"."0.2.0";
-  by-version."stream-counter"."0.2.0" = self.buildNodePackage {
-    name = "stream-counter-0.2.0";
-    version = "0.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz";
-      name = "stream-counter-0.2.0.tgz";
-      sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de";
-    };
-    deps = {
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."string_decoder"."~0.10.x" =
     self.by-version."string_decoder"."0.10.31";
   by-version."string_decoder"."0.10.31" = self.buildNodePackage {
@@ -3570,16 +5281,56 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."sugar"."~1.3.8" =
-    self.by-version."sugar"."1.3.9";
-  by-version."sugar"."1.3.9" = self.buildNodePackage {
-    name = "sugar-1.3.9";
-    version = "1.3.9";
-    bin = false;
+  by-spec."strip-ansi"."^0.3.0" =
+    self.by-version."strip-ansi"."0.3.0";
+  by-version."strip-ansi"."0.3.0" = self.buildNodePackage {
+    name = "strip-ansi-0.3.0";
+    version = "0.3.0";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sugar/-/sugar-1.3.9.tgz";
-      name = "sugar-1.3.9.tgz";
-      sha1 = "f879c6c87721252b51fd0b6520412d98d83cb179";
+      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz";
+      name = "strip-ansi-0.3.0.tgz";
+      sha1 = "25f48ea22ca79187f3174a4db8759347bb126220";
+    };
+    deps = {
+      "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."strip-ansi"."^2.0.1" =
+    self.by-version."strip-ansi"."2.0.1";
+  by-version."strip-ansi"."2.0.1" = self.buildNodePackage {
+    name = "strip-ansi-2.0.1";
+    version = "2.0.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz";
+      name = "strip-ansi-2.0.1.tgz";
+      sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e";
+    };
+    deps = {
+      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."strip-json-comments"."0.1.x" =
+    self.by-version."strip-json-comments"."0.1.3";
+  by-version."strip-json-comments"."0.1.3" = self.buildNodePackage {
+    name = "strip-json-comments-0.1.3";
+    version = "0.1.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz";
+      name = "strip-json-comments-0.1.3.tgz";
+      sha1 = "164c64e370a8a3cc00c9e01b539e569823f0ee54";
     };
     deps = {
     };
@@ -3589,28 +5340,28 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."superagent"."^0.18.0" =
-    self.by-version."superagent"."0.18.2";
-  by-version."superagent"."0.18.2" = self.buildNodePackage {
-    name = "superagent-0.18.2";
-    version = "0.18.2";
+  by-spec."superagent"."0.18.0" =
+    self.by-version."superagent"."0.18.0";
+  by-version."superagent"."0.18.0" = self.buildNodePackage {
+    name = "superagent-0.18.0";
+    version = "0.18.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/superagent/-/superagent-0.18.2.tgz";
-      name = "superagent-0.18.2.tgz";
-      sha1 = "9afc6276a9475f4bdcd535ac6a0685ebc4b560eb";
+      url = "http://registry.npmjs.org/superagent/-/superagent-0.18.0.tgz";
+      name = "superagent-0.18.0.tgz";
+      sha1 = "9d4375a3ae2c4fbd55fd20d5b12a2470d2fc8f62";
     };
     deps = {
       "qs-0.6.6" = self.by-version."qs"."0.6.6";
       "formidable-1.0.14" = self.by-version."formidable"."1.0.14";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "mime-1.2.5" = self.by-version."mime"."1.2.5";
       "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
-      "methods-1.0.1" = self.by-version."methods"."1.0.1";
-      "cookiejar-2.0.1" = self.by-version."cookiejar"."2.0.1";
-      "debug-1.0.4" = self.by-version."debug"."1.0.4";
+      "methods-0.0.1" = self.by-version."methods"."0.0.1";
+      "cookiejar-1.3.2" = self.by-version."cookiejar"."1.3.2";
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
       "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1";
       "extend-1.2.1" = self.by-version."extend"."1.2.1";
-      "form-data-0.1.3" = self.by-version."form-data"."0.1.3";
+      "form-data-0.1.2" = self.by-version."form-data"."0.1.2";
       "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1";
     };
     optionalDependencies = {
@@ -3619,19 +5370,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."tough-cookie".">=0.12.0" =
-    self.by-version."tough-cookie"."0.12.1";
-  by-version."tough-cookie"."0.12.1" = self.buildNodePackage {
-    name = "tough-cookie-0.12.1";
-    version = "0.12.1";
+  by-spec."supertest"."^0.13.0" =
+    self.by-version."supertest"."0.13.0";
+  by-version."supertest"."0.13.0" = self.buildNodePackage {
+    name = "supertest-0.13.0";
+    version = "0.13.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz";
-      name = "tough-cookie-0.12.1.tgz";
-      sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62";
+      url = "http://registry.npmjs.org/supertest/-/supertest-0.13.0.tgz";
+      name = "supertest-0.13.0.tgz";
+      sha1 = "4892bafd9beaa9bbcc95fd5a9f04949aef1ce06f";
     };
     deps = {
-      "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
+      "superagent-0.18.0" = self.by-version."superagent"."0.18.0";
+      "methods-1.0.0" = self.by-version."methods"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -3639,16 +5391,185 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."tunnel-agent"."~0.2.0" =
-    self.by-version."tunnel-agent"."0.2.0";
-  by-version."tunnel-agent"."0.2.0" = self.buildNodePackage {
-    name = "tunnel-agent-0.2.0";
+  "supertest" = self.by-version."supertest"."0.13.0";
+  by-spec."supports-color"."^0.2.0" =
+    self.by-version."supports-color"."0.2.0";
+  by-version."supports-color"."0.2.0" = self.buildNodePackage {
+    name = "supports-color-0.2.0";
     version = "0.2.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz";
+      name = "supports-color-0.2.0.tgz";
+      sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."supports-color"."^1.3.0" =
+    self.by-version."supports-color"."1.3.1";
+  by-version."supports-color"."1.3.1" = self.buildNodePackage {
+    name = "supports-color-1.3.1";
+    version = "1.3.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz";
+      name = "supports-color-1.3.1.tgz";
+      sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."supports-color"."~1.2.0" =
+    self.by-version."supports-color"."1.2.1";
+  by-version."supports-color"."1.2.1" = self.buildNodePackage {
+    name = "supports-color-1.2.1";
+    version = "1.2.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/supports-color/-/supports-color-1.2.1.tgz";
+      name = "supports-color-1.2.1.tgz";
+      sha1 = "12ee21507086cd98c1058d9ec0f4ac476b7af3b2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tar"."~0.1.17" =
+    self.by-version."tar"."0.1.20";
+  by-version."tar"."0.1.20" = self.buildNodePackage {
+    name = "tar-0.1.20";
+    version = "0.1.20";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz";
-      name = "tunnel-agent-0.2.0.tgz";
-      sha1 = "6853c2afb1b2109e45629e492bde35f459ea69e8";
+      url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
+      name = "tar-0.1.20.tgz";
+      sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
+    };
+    deps = {
+      "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
+      "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tar"."~2.1.0" =
+    self.by-version."tar"."2.1.1";
+  by-version."tar"."2.1.1" = self.buildNodePackage {
+    name = "tar-2.1.1";
+    version = "2.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tar/-/tar-2.1.1.tgz";
+      name = "tar-2.1.1.tgz";
+      sha1 = "ac0649e135fa4546e430c7698514e1da2e8a7cc4";
+    };
+    deps = {
+      "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
+      "fstream-1.0.6" = self.by-version."fstream"."1.0.6";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tar-pack"."~2.0.0" =
+    self.by-version."tar-pack"."2.0.0";
+  by-version."tar-pack"."2.0.0" = self.buildNodePackage {
+    name = "tar-pack-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz";
+      name = "tar-pack-2.0.0.tgz";
+      sha1 = "c2c401c02dd366138645e917b3a6baa256a9dcab";
+    };
+    deps = {
+      "uid-number-0.0.3" = self.by-version."uid-number"."0.0.3";
+      "once-1.1.1" = self.by-version."once"."1.1.1";
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
+      "tar-0.1.20" = self.by-version."tar"."0.1.20";
+      "fstream-ignore-0.0.7" = self.by-version."fstream-ignore"."0.0.7";
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+    };
+    optionalDependencies = {
+      "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tildify"."~1.0.0" =
+    self.by-version."tildify"."1.0.0";
+  by-version."tildify"."1.0.0" = self.buildNodePackage {
+    name = "tildify-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz";
+      name = "tildify-1.0.0.tgz";
+      sha1 = "2a021db5e8fbde0a8f8b4df37adaa8fb1d39d7dd";
+    };
+    deps = {
+      "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tinycolor"."0.x" =
+    self.by-version."tinycolor"."0.0.1";
+  by-version."tinycolor"."0.0.1" = self.buildNodePackage {
+    name = "tinycolor-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
+      name = "tinycolor-0.0.1.tgz";
+      sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tough-cookie".">=0.12.0" =
+    self.by-version."tough-cookie"."1.1.0";
+  by-version."tough-cookie"."1.1.0" = self.buildNodePackage {
+    name = "tough-cookie-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz";
+      name = "tough-cookie-1.1.0.tgz";
+      sha1 = "126d2490e66ae5286b6863debd4a341076915954";
     };
     deps = {
     };
@@ -3677,20 +5598,39 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."type-is"."~1.6.1" =
-    self.by-version."type-is"."1.6.1";
-  by-version."type-is"."1.6.1" = self.buildNodePackage {
-    name = "type-is-1.6.1";
-    version = "1.6.1";
+  by-spec."type-detect"."0.1.1" =
+    self.by-version."type-detect"."0.1.1";
+  by-version."type-detect"."0.1.1" = self.buildNodePackage {
+    name = "type-detect-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/type-is/-/type-is-1.6.1.tgz";
-      name = "type-is-1.6.1.tgz";
-      sha1 = "49addecb0f6831cbc1d34ba929f0f3a4f21b0f2e";
+      url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz";
+      name = "type-detect-0.1.1.tgz";
+      sha1 = "0ba5ec2a885640e470ea4e8505971900dac58822";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."type-is"."~1.6.1" =
+    self.by-version."type-is"."1.6.2";
+  by-version."type-is"."1.6.2" = self.buildNodePackage {
+    name = "type-is-1.6.2";
+    version = "1.6.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/type-is/-/type-is-1.6.2.tgz";
+      name = "type-is-1.6.2.tgz";
+      sha1 = "694e83e5d110417e681cea278227f264ae406e33";
     };
     deps = {
       "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
+      "mime-types-2.0.11" = self.by-version."mime-types"."2.0.11";
     };
     optionalDependencies = {
     };
@@ -3698,20 +5638,42 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."uid-safe"."1.1.0" =
-    self.by-version."uid-safe"."1.1.0";
-  by-version."uid-safe"."1.1.0" = self.buildNodePackage {
-    name = "uid-safe-1.1.0";
-    version = "1.1.0";
-    bin = false;
+  by-spec."type-is"."~1.6.2" =
+    self.by-version."type-is"."1.6.2";
+  by-spec."uglify-js"."~2.3" =
+    self.by-version."uglify-js"."2.3.6";
+  by-version."uglify-js"."2.3.6" = self.buildNodePackage {
+    name = "uglify-js-2.3.6";
+    version = "2.3.6";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.1.0.tgz";
-      name = "uid-safe-1.1.0.tgz";
-      sha1 = "58d6c5dabf8dfbd8d52834839806c03fd6143232";
+      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
+      name = "uglify-js-2.3.6.tgz";
+      sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
+    };
+    deps = {
+      "async-0.2.10" = self.by-version."async"."0.2.10";
+      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
+      "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."uid-number"."0.0.3" =
+    self.by-version."uid-number"."0.0.3";
+  by-version."uid-number"."0.0.3" = self.buildNodePackage {
+    name = "uid-number-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz";
+      name = "uid-number-0.0.3.tgz";
+      sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc";
     };
     deps = {
-      "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1";
-      "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2";
     };
     optionalDependencies = {
     };
@@ -3719,8 +5681,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."uid-safe"."~1.1.0" =
-    self.by-version."uid-safe"."1.1.0";
   by-spec."ultron"."1.0.x" =
     self.by-version."ultron"."1.0.1";
   by-version."ultron"."1.0.1" = self.buildNodePackage {
@@ -3740,25 +5700,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."underscore"."~1.4.4" =
-    self.by-version."underscore"."1.4.4";
-  by-version."underscore"."1.4.4" = self.buildNodePackage {
-    name = "underscore-1.4.4";
-    version = "1.4.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
-      name = "underscore-1.4.4.tgz";
-      sha1 = "61a6a32010622afa07963bf325203cf12239d604";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."underscore"."~1.7.0" =
     self.by-version."underscore"."1.7.0";
   by-version."underscore"."1.7.0" = self.buildNodePackage {
@@ -3778,6 +5719,44 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."underscore.string"."~2.4.0" =
+    self.by-version."underscore.string"."2.4.0";
+  by-version."underscore.string"."2.4.0" = self.buildNodePackage {
+    name = "underscore.string-2.4.0";
+    version = "2.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz";
+      name = "underscore.string-2.4.0.tgz";
+      sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."user-home"."^1.0.0" =
+    self.by-version."user-home"."1.1.1";
+  by-version."user-home"."1.1.1" = self.buildNodePackage {
+    name = "user-home-1.1.1";
+    version = "1.1.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz";
+      name = "user-home-1.1.1.tgz";
+      sha1 = "2b5be23a32b63a7c9deb8d0f28d485724a3df190";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."utf-8-validate"."1.0.x" =
     self.by-version."utf-8-validate"."1.0.1";
   by-version."utf-8-validate"."1.0.1" = self.buildNodePackage {
@@ -3799,6 +5778,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."util".">=0.10.3 <1" =
+    self.by-version."util"."0.10.3";
+  by-version."util"."0.10.3" = self.buildNodePackage {
+    name = "util-0.10.3";
+    version = "0.10.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/util/-/util-0.10.3.tgz";
+      name = "util-0.10.3.tgz";
+      sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."utils-merge"."1.0.0" =
     self.by-version."utils-merge"."1.0.0";
   by-version."utils-merge"."1.0.0" = self.buildNodePackage {
@@ -3837,16 +5836,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."vhost"."~3.0.0" =
-    self.by-version."vhost"."3.0.0";
-  by-version."vhost"."3.0.0" = self.buildNodePackage {
-    name = "vhost-3.0.0";
-    version = "3.0.0";
+  by-spec."when"."~3.4.6" =
+    self.by-version."when"."3.4.6";
+  by-version."when"."3.4.6" = self.buildNodePackage {
+    name = "when-3.4.6";
+    version = "3.4.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/vhost/-/vhost-3.0.0.tgz";
-      name = "vhost-3.0.0.tgz";
-      sha1 = "2d0ec59a3e012278b65adbe17c1717a5a5023045";
+      url = "http://registry.npmjs.org/when/-/when-3.4.6.tgz";
+      name = "when-3.4.6.tgz";
+      sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c";
     };
     deps = {
     };
@@ -3856,24 +5855,43 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."winston"."~0.7.2" =
-    self.by-version."winston"."0.7.3";
-  by-version."winston"."0.7.3" = self.buildNodePackage {
-    name = "winston-0.7.3";
-    version = "0.7.3";
-    bin = false;
+  by-spec."which"."1.0.x" =
+    self.by-version."which"."1.0.9";
+  by-version."which"."1.0.9" = self.buildNodePackage {
+    name = "which-1.0.9";
+    version = "1.0.9";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/winston/-/winston-0.7.3.tgz";
-      name = "winston-0.7.3.tgz";
-      sha1 = "7ae313ba73fcdc2ecb4aa2f9cd446e8298677266";
+      url = "http://registry.npmjs.org/which/-/which-1.0.9.tgz";
+      name = "which-1.0.9.tgz";
+      sha1 = "460c1da0f810103d0321a9b633af9e575e64486f";
     };
     deps = {
-      "async-0.2.10" = self.by-version."async"."0.2.10";
-      "colors-0.6.2" = self.by-version."colors"."0.6.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."winston"."^1.0.0" =
+    self.by-version."winston"."1.0.0";
+  by-version."winston"."1.0.0" = self.buildNodePackage {
+    name = "winston-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/winston/-/winston-1.0.0.tgz";
+      name = "winston-1.0.0.tgz";
+      sha1 = "30e36e0041fc0a864b0029565719e4dc41d026a4";
+    };
+    deps = {
+      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "colors-1.0.3" = self.by-version."colors"."1.0.3";
       "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
       "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
-      "request-2.16.6" = self.by-version."request"."2.16.6";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
     optionalDependencies = {
@@ -3882,7 +5900,90 @@
     os = [ ];
     cpu = [ ];
   };
-  "winston" = self.by-version."winston"."0.7.3";
+  "winston" = self.by-version."winston"."1.0.0";
+  by-spec."wordwrap"."0.0.x" =
+    self.by-version."wordwrap"."0.0.3";
+  by-version."wordwrap"."0.0.3" = self.buildNodePackage {
+    name = "wordwrap-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
+      name = "wordwrap-0.0.3.tgz";
+      sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."wordwrap".">=0.0.2" =
+    self.by-version."wordwrap"."1.0.0";
+  by-version."wordwrap"."1.0.0" = self.buildNodePackage {
+    name = "wordwrap-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
+      name = "wordwrap-1.0.0.tgz";
+      sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."wordwrap"."~0.0.2" =
+    self.by-version."wordwrap"."0.0.3";
+  by-spec."wrappy"."1" =
+    self.by-version."wrappy"."1.0.1";
+  by-version."wrappy"."1.0.1" = self.buildNodePackage {
+    name = "wrappy-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz";
+      name = "wrappy-1.0.1.tgz";
+      sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ws"."^0.4.32" =
+    self.by-version."ws"."0.4.32";
+  by-version."ws"."0.4.32" = self.buildNodePackage {
+    name = "ws-0.4.32";
+    version = "0.4.32";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
+      name = "ws-0.4.32.tgz";
+      sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
+    };
+    deps = {
+      "commander-2.1.0" = self.by-version."commander"."2.1.0";
+      "nan-1.0.0" = self.by-version."nan"."1.0.0";
+      "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1";
+      "options-0.0.6" = self.by-version."options"."0.0.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "ws" = self.by-version."ws"."0.4.32";
   by-spec."ws"."~0.7.1" =
     self.by-version."ws"."0.7.1";
   by-version."ws"."0.7.1" = self.buildNodePackage {
@@ -3906,4 +6007,23 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."xtend"."^4.0.0" =
+    self.by-version."xtend"."4.0.0";
+  by-version."xtend"."4.0.0" = self.buildNodePackage {
+    name = "xtend-4.0.0";
+    version = "4.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz";
+      name = "xtend-4.0.0.tgz";
+      sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
 }
diff --git a/pkgs/servers/rippled/ripple-rest.nix b/pkgs/servers/rippled/ripple-rest.nix
new file mode 100644
index 00000000000..01fd098c920
--- /dev/null
+++ b/pkgs/servers/rippled/ripple-rest.nix
@@ -0,0 +1,26 @@
+{ lib, fetchFromGitHub, nodePackages }:
+
+with lib;
+
+let
+  np = nodePackages.override { generated = ./package.nix; self = np; };
+in nodePackages.buildNodePackage rec {
+  name = "ripple-rest-${version}";
+  version = "1.7.0-rc1";
+
+  src = fetchFromGitHub {
+    repo = "ripple-rest";
+    owner = "ripple";
+    rev = version;
+    sha256 = "19ixgrz40iawd927jan0g1ac8w56wxh2vy3n3sa3dn9cmjd4k2r3";
+  };
+
+  deps = (filter (v: nixType v == "derivation") (attrValues np));
+
+  meta = {
+    description = " RESTful API for submitting payments and monitoring accounts on the Ripple Network";
+    homepage = https://github.com/ripple/ripple-rest;
+    maintainers = with maintainers; [ offline ];
+    license = [ licenses.mit ];
+  };
+}

From c46889ea4227418fb31a0562626ffcab20d90890 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 8 Jun 2015 13:55:20 +0200
Subject: [PATCH 0894/2322] ipsec-tools: apply debians patch to fix
 CVE-2015-4047

---
 .../linux/ipsec-tools/CVE-2015-4047.patch        | 16 ++++++++++++++++
 pkgs/os-specific/linux/ipsec-tools/default.nix   |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch

diff --git a/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch b/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch
new file mode 100644
index 00000000000..00c23c6cac1
--- /dev/null
+++ b/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch
@@ -0,0 +1,16 @@
+Index: pkg-ipsec-tools/src/racoon/gssapi.c
+===================================================================
+--- pkg-ipsec-tools.orig/src/racoon/gssapi.c
++++ pkg-ipsec-tools/src/racoon/gssapi.c
+@@ -192,6 +192,11 @@ gssapi_init(struct ph1handle *iph1)
+	gss_name_t princ, canon_princ;
+	OM_uint32 maj_stat, min_stat;
+
++	if (iph1->rmconf == NULL) {
++		plog(LLV_ERROR, LOCATION, NULL, "no remote config\n");
++		return -1;
++	}
++
+	gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state));
+	if (gps == NULL) {
+		plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n");
diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix
index a6042b1e33b..fc3b0500fed 100644
--- a/pkgs/os-specific/linux/ipsec-tools/default.nix
+++ b/pkgs/os-specific/linux/ipsec-tools/default.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ readline openssl flex kerberos pam ];
 
-  patches = [ ./dont-create-localstatedir-during-install.patch ];
+  patches = [ ./dont-create-localstatedir-during-install.patch
+              ./CVE-2015-4047.patch ];
 
   # fix build with newer gcc versions
   preConfigure = ''substituteInPlace configure --replace "-Werror" "" '';

From 161418537cb09440d83426ad0a0c01aa4b277ebe Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 8 Jun 2015 14:15:07 +0200
Subject: [PATCH 0895/2322] rippled: Update to 0.28.1

---
 nixos/modules/services/misc/rippled.nix | 12 ++++++------
 pkgs/servers/rippled/default.nix        |  6 +++---
 pkgs/top-level/all-packages.nix         |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix
index 03fcc003a40..045330eb551 100644
--- a/nixos/modules/services/misc/rippled.nix
+++ b/nixos/modules/services/misc/rippled.nix
@@ -27,7 +27,7 @@ let
     protocol=${concatStringsSep "," p.protocol}
     ${optionalString (p.user != "") "user=${p.user}"}
     ${optionalString (p.password != "") "user=${p.password}"}
-    admin=${if p.admin then "allow" else "no"}
+    admin=${concatStringsSep "," p.admin}
     ${optionalString (p.ssl.key != null) "ssl_key=${p.ssl.key}"}
     ${optionalString (p.ssl.cert != null) "ssl_cert=${p.ssl.cert}"}
     ${optionalString (p.ssl.chain != null) "ssl_chain=${p.ssl.chain}"}
@@ -118,9 +118,9 @@ let
       };
 
       admin = mkOption {
-	description = "Controls whether or not administrative commands are allowed.";
-	type = types.bool;
-	default = false;
+	description = "A comma-separated list of admin IP addresses.";
+	type = types.listOf types.str;
+	default = ["127.0.0.1"];
       };
 
       ssl = {
@@ -156,7 +156,7 @@ let
   dbOptions = {
     type = mkOption {
       description = "Rippled database type.";
-      type = types.enum ["rocksdb" "nudb" "sqlite" "hyperleveldb"];
+      type = types.enum ["rocksdb" "nudb"];
       default = "rocksdb";
     };
 
@@ -217,7 +217,7 @@ in
 	default = {
 	  rpc = {
 	    port = 5005;
-	    admin = true;
+	    admin = ["127.0.0.1"];
 	    protocol = ["http"];
 	  };
 
diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix
index 6a09d683f8d..99a6879ab92 100644
--- a/pkgs/servers/rippled/default.nix
+++ b/pkgs/servers/rippled/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "rippled-${version}";
-  version = "0.27.4";
+  version = "0.28.1";
 
   src = fetchFromGitHub {
     owner = "ripple";
     repo = "rippled";
     rev = version;
-    sha256 = "13xg2baqcf2h1ww2yk371r27726iq8xb4brsj9rqv692aviblqs3";
+    sha256 = "0wh8dwdg0gp7smcx40cpqanl2m2hihmx3irqh692svakbl3df3vz";
   };
 
   postPatch = ''
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ scons pkgconfig openssl protobuf boost zlib ];
 
-  buildPhase = "scons build/rippled";
+  buildPhase = "scons";
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 486c443630c..ef48cc39c37 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8988,7 +8988,7 @@ let
   };
 
   rippled = callPackage ../servers/rippled {
-    boost = boost155;
+    boost = boost157;
   };
 
   ripple-data-api = callPackage ../servers/rippled/data-api.nix { };

From 43c916225553e7003956f29ea38a93328358b036 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 8 Jun 2015 14:32:19 +0200
Subject: [PATCH 0896/2322] ripple-rest: commit forgotten changes

---
 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 0d6df939bc3..5fa53334037 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8991,7 +8991,7 @@ let
     boost = boost155;
   };
 
-  ripple-data-api = callPackage ../servers/rippled/data-api.nix { };
+  ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { };
 
   s6 = callPackage ../servers/s6 { };
 

From 87b9cceefd8ad04a6189b41032b55aff8233f31a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 8 Jun 2015 15:00:50 +0200
Subject: [PATCH 0897/2322] linux-testing: Update to new version 4.1-rc7.

Includes fixes for DRM, MIPS, iSCSI, ALSA, USB, bna and wireless and
more. Full diff can be found here:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/diff/?id=v4.1-rc7&id2=v4.1-rc6

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 3a0d6a926d5..60bc4e51209 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, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1-rc6";
-  modDirVersion = "4.1.0-rc6";
+  version = "4.1-rc7";
+  modDirVersion = "4.1.0-rc7";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "0b8ylsrnvwf0fsq6i0iar7h92z7q3356rh1x3a5wb5p0q5j7lldr";
+    sha256 = "09bxkm0nl9vzlfb14500bl6zjzhgacy7y32b3mw1d9hx62yknk2f";
   };
 
   features.iwlwifi = true;

From 48006ee291dfd9450155b6606ad10c7c92865ca6 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 8 Jun 2015 15:53:21 +0200
Subject: [PATCH 0898/2322] cherrytree: update from 0.35.7 to 0.35.8

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

diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index fa5ae99f4fb..eb73f48559a 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, pythonPackages, gettext, pygtksourceview, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "cherrytree-0.35.7";
+  name = "cherrytree-0.35.8";
 
   src = fetchurl {
     url = "http://www.giuspen.com/software/${name}.tar.xz";
-    sha256 = "03p3bx7skc361rmh0axhm0fa0inmxv4bpa9l566wskb3zq4sy4g3";
+    sha256 = "0vqc1idzd73f4q5f4zwwypj4jiivwnb4y0r3041h2pm08y1wgsd8";
   };
 
   propagatedBuildInputs = [ pythonPackages.sqlite3 ];

From 0ed4ad8c6343f5f6877c67828f5a4d9e26737871 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 8 Jun 2015 16:09:03 +0200
Subject: [PATCH 0899/2322] pdf2djvu: update from 0.7.17 to 0.7.21, adopt it

---
 pkgs/tools/typesetting/pdf2djvu/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix
index b97252e74de..a85aa045b66 100644
--- a/pkgs/tools/typesetting/pdf2djvu/default.nix
+++ b/pkgs/tools/typesetting/pdf2djvu/default.nix
@@ -1,20 +1,21 @@
-{stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
+{ stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.17";
+  version = "0.7.21";
   name = "pdf2djvu-${version}";
 
   src = fetchurl {
-    url = "http://pdf2djvu.googlecode.com/files/pdf2djvu_${version}.tar.gz";
-    sha256 = "1nplcabb8526bs5707k9212pi000wnskq3c9hbq9acgmdlnnwvgy";
+    url = "https://bitbucket.org/jwilk/pdf2djvu/downloads/${name}.tar.xz";
+    sha256 = "1fc7nrc8z5z66ifjjqbqn3c52hxlzgkgbdrr3cgrwdp27k681m0j";
   };
 
   buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Creates djvu files from PDF files";
     homepage = http://code.google.com/p/pdf2djvu/;
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ pSub ];
     inherit version;
   };
 }

From 794feb7879bdf4af140904afe8c6d55ac97ba6e1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 8 Jun 2015 16:17:49 +0200
Subject: [PATCH 0900/2322] opkg: update from 0.2.4 to 3.0.0

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

diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix
index 67c4578ac9a..2a9d167cfcd 100644
--- a/pkgs/tools/package-management/opkg/default.nix
+++ b/pkgs/tools/package-management/opkg/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, curl, gpgme }:
+{ stdenv, fetchurl, pkgconfig, curl, gpgme, libarchive, bzip2, lzma, attr, acl }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.4";
+  version = "0.3.0";
   name = "opkg-${version}";
   src = fetchurl {
     url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz";
-    sha256 = "11ih8lay1v7sk5czk3m3cfqil4cp8s7pfz60xnddy7nqazjcfh0g";
+    sha256 = "13wqai7lgyfjlqvly0bz786wk9frl16a9yzrn27p3wwfvcf5swvz";
   };
 
-  buildInputs = [ pkgconfig curl gpgme ];
+  buildInputs = [ pkgconfig curl gpgme libarchive bzip2 lzma attr acl ];
 
   meta = with stdenv.lib; {
     description = "A lightweight package management system based upon ipkg";

From dd6ceb61fa72df71152ae9329b4a1918844b7c54 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 8 Jun 2015 16:37:27 +0200
Subject: [PATCH 0901/2322] netsniff-ng -> 0.5.9-10-gb7ece46

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

diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 44c8bb45b72..a9591a3ecde 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -2,7 +2,7 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-let version = "0.5.9-5-g107456c"; in
+let version = "0.5.9-10-gb7ece46"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "107456c646ab38e5ccb6ee788389faced59c16ff";
-    sha256 = "0i0b2595x4cprf9d4crwjn3qvswz2qxr905zpcwxa3qan6hrmnsp";
+    rev = "b7ece46f62b1fbece160cc7bd2905a6d0d3970a9";
+    sha256 = "1m44ssvkzp4xrkwc61gsmn2vkbmf9r5mp1zjz8cj8w120703cljj";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

From b2d300e59bdbcd013d8f65e06fee162f8ae6ec28 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 8 Jun 2015 16:48:42 +0200
Subject: [PATCH 0902/2322] boxfs: work around box.com breaking their API

See <https://github.com/drotiro/boxfs2/issues/11>.

This should soon be fixed upstream. Until then, any bugs are mine.
---
 pkgs/tools/filesystems/boxfs/default.nix          |  2 ++
 .../boxfs/work-around-API-borkage.patch           | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch

diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix
index f47107c85fb..69c2d046f1c 100644
--- a/pkgs/tools/filesystems/boxfs/default.nix
+++ b/pkgs/tools/filesystems/boxfs/default.nix
@@ -32,6 +32,8 @@ in stdenv.mkDerivation {
     cp -a --no-preserve=mode ${libjson} libjson
   '';
 
+  patches = [ ./work-around-API-borkage.patch ];
+
   buildInputs = [ curl fuse libxml2 pkgconfig ];
 
   buildFlags = "static";
diff --git a/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch b/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch
new file mode 100644
index 00000000000..b74e7f32466
--- /dev/null
+++ b/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch
@@ -0,0 +1,15 @@
+diff --git a/boxapi.c b/boxapi.c
+index 4964273..1a32e0d 100644
+--- a/boxapi.c
++++ b/boxapi.c
+@@ -38,8 +38,8 @@
+ //    AUTH
+ #define API_KEY_VAL "f9ss11y2w0hg5r04jsidxlhk4pil28cf"
+ #define API_SECRET  "r3ZHAIhsOL2FoHjgERI9xf74W5skIM0w"
+-#define API_OAUTH_URL "https://app.box.com/api/oauth2/" //"https://www.box.com/api/oauth2/"
+-#define API_OAUTH_AUTHORIZE API_OAUTH_URL "authorize?response_type=code&client_id=" API_KEY_VAL /*"&redirect_uri=http%3A//localhost"*/
++#define API_OAUTH_URL "https://api.box.com/oauth2/" //"https://www.box.com/api/oauth2/"
++#define API_OAUTH_AUTHORIZE "https://app.box.com/api/oauth2/authorize?response_type=code&client_id=" API_KEY_VAL /*"&redirect_uri=http%3A//localhost"*/
+ #define API_OAUTH_TOKEN     API_OAUTH_URL "token"
+ //    CALLS
+ #define API_ENDPOINT	"https://api.box.com/2.0/"

From d07373c632a7a6346ce15abcb154d7b8534f7616 Mon Sep 17 00:00:00 2001
From: hiberno <mail@elfsechsundzwanzig.de>
Date: Mon, 8 Jun 2015 17:45:17 +0200
Subject: [PATCH 0903/2322] rofi-pass: bump to latest revision

---
 pkgs/applications/misc/rofi/pass.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix
index c6b5666921c..8a7382ae737 100644
--- a/pkgs/applications/misc/rofi/pass.nix
+++ b/pkgs/applications/misc/rofi/pass.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "rofi-${version}";
-  version = "2015-05-29";
+  version = "2015-06-08";
 
   src = fetchgit {
     url = "https://github.com/carnager/rofi-pass";
-    rev = "92c26557ec4b0508c563d596291571bbef402899";
-    sha256 = "17k9jmmckqaw75i0qsay2gc8mrjrs6jjfwfxaggspj912sflmjng";
+    rev = "7e376b5ec64974c4e8478acf3ada8d111896f391";
+    sha256 = "1ywsxdgy5m63a2f5vd7np2f1qffz7y95z7s1gq5d87s8xd8myadl";
   };
 
   buildInputs = [ rofi wmctrl xprop xdotool ];

From 5647c894c64d69cdc633f4b17fa3242c7f083944 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Mon, 8 Jun 2015 18:03:41 +0200
Subject: [PATCH 0904/2322] Add carddav-util

---
 .../tools/networking/carddav-util/default.nix | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/networking/carddav-util/default.nix

diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix
new file mode 100644
index 00000000000..e6fb4e0130b
--- /dev/null
+++ b/pkgs/tools/networking/carddav-util/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchgit, python, pythonPackages, makeWrapper }:
+
+stdenv.mkDerivation rec {
+
+  name = "carddav-0.1-2014-02-26";
+
+  src = fetchgit {
+    url = git://github.com/ljanyst/carddav-util;
+    rev = "53b181faff5f154bcd180467dd04c0ce69405564";
+    sha256 = "0f0raffdy032wlnxfck6ky60r163nhqfbr311y4ry55l60s4497n";
+  };
+
+  buildInputs = [makeWrapper];
+
+  propagatedBuildInputs = with pythonPackages; [ requests vobject lxml ];
+
+  doCheck = false; # no test
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp $src/carddav-util.py $out/bin
+
+    pythondir="$out/lib/${python.libPrefix}/site-packages"
+    mkdir -p "$pythondir"
+    cp $src/carddav.py "$pythondir"
+  '';
+
+  preFixup = ''
+    wrapProgram "$out/bin/carddav-util.py" \
+      --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" \
+      --prefix PATH : "$prefix/bin:$PATH"
+  '';
+
+  meta = {
+    homepage = https://github.com/ljanyst/carddav-util;
+    description = "A CardDAV import/export utility";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c15f9ce0a4..82c9fe6c239 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10400,6 +10400,8 @@ let
 
   canto-daemon = callPackage ../applications/networking/feedreaders/canto-daemon { };
 
+  carddav-util = callPackage ../tools/networking/carddav-util { };
+
   carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
       gtkspell aspell gettext ncurses avahi dbus dbus_glib python

From db10561313613e9f09dc15ffc3fbecaef7f7a1b0 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 6 Jun 2015 18:23:23 +0200
Subject: [PATCH 0905/2322] init AMB-plugins at 0.8.1

---
 .../audio/AMB-plugins/default.nix             | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/audio/AMB-plugins/default.nix

diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/applications/audio/AMB-plugins/default.nix
new file mode 100644
index 00000000000..3ea7b90f84a
--- /dev/null
+++ b/pkgs/applications/audio/AMB-plugins/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, ladspaH
+}:
+
+stdenv.mkDerivation rec {
+  name = "AMB-plugins-${version}";
+  version = "0.8.1";
+  src = fetchurl {
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    sha256 = "0x4blm4visjqj0ndqr0cg776v3b7lvplpc8cgi9n51llhavn0jpl";
+  };
+
+  buildInputs = [ ladspaH ];
+
+  patchPhase = ''
+    sed -i 's@/usr/bin/install@install@g' Makefile
+    sed -i 's@/bin/rm@rm@g' Makefile
+    sed -i 's@/usr/lib/ladspa@$(out)/lib/ladspa@g' Makefile
+  '';
+
+  preInstall="mkdir -p $out/lib/ladspa";
+
+  meta = {
+    description = ''A set of ambisonics ladspa plugins'';
+    longDescription = ''
+      Mono and stereo to B-format panning, horizontal rotator, square, hexagon and cube decoders.
+    '';
+    version = "${version}";
+    homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85d8eb924b5..c7a08a42898 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10437,6 +10437,8 @@ let
     tcl = tcl-8_5;
   };
 
+  AMB-plugins = callPackage ../applications/audio/AMB-plugins { };
+
   ams-lv2 = callPackage ../applications/audio/ams-lv2 { };
 
   amsn = callPackage ../applications/networking/instant-messengers/amsn { };

From 16165ddc38630d7da0e0bf4a6b3b9347b923b7b4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 8 Jun 2015 19:11:46 +0300
Subject: [PATCH 0906/2322] install-cd: Include nixos-artwork to fix installer
 tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Should fix at least nixos.tests.installer.simple.x86_64-linux
http://hydra.nixos.org/build/23001712:

machine# error: cannot download Encode-Locale-1.03.tar.gz from any mirror
machine# builder for ‘/nix/store/y8gbx2d2fdcvvjy1z53xksfgq66ydlx0-Encode-Locale-1.03.tar.gz.drv’ failed with exit code 1
machine# cannot build derivation ‘/nix/store/y1knci7rix3asnh2b4kfv8jhl2j99xih-perl-Encode-Locale-1.03.drv’: 1 dependencies couldn't be built
machine# cannot build derivation ‘/nix/store/7xspjwh48kg16drv1jjg5cffaqbxbp8p-perl-libwww-perl-6.05.drv’: 1 dependencies couldn't be built
machine# cannot build derivation ‘/nix/store/8qsmz3bbk1jwhh50c3i9700bkmn8ns5c-nss-cacert-3.19.1.drv’: 1 dependencies couldn't be built
machine# cannot build derivation ‘/nix/store/0rgf2l3mdszs4a989ympwc9gk2k8wq6z-nixos-artwork-e71b684.drv’: 1 dependencies couldn't be built
...
---
 nixos/modules/installer/cd-dvd/installation-cd-base.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index a660199cbe0..5bd10823108 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -30,8 +30,8 @@ with lib;
 
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.  Archive::Cpio is needed for the
-  # initrd builder.
-  isoImage.storeContents = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio ];
+  # initrd builder.  nixos-artwork is needed for the GRUB background.
+  isoImage.storeContents = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio pkgs.nixos-artwork ];
 
   # EFI booting
   isoImage.makeEfiBootable = true;

From e593a8d3bf8cbc3b3f97b148a2902e970658b3e3 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Mon, 8 Jun 2015 19:41:45 +0200
Subject: [PATCH 0907/2322] zopfli: removed roconnor as a maintainer

roconnor was added as a maintainer by accident
---
 pkgs/tools/compression/zopfli/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix
index 93da9b15a9e..354afb8d178 100644
--- a/pkgs/tools/compression/zopfli/default.nix
+++ b/pkgs/tools/compression/zopfli/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
       '';
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.asl20;
-    maintainers = with maintainers; [ roconnor bobvanderlinden ];
+    maintainers = with maintainers; [ bobvanderlinden ];
   };
 }

From 240338638e064b786e85a549aa70cb9a5caabc29 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 8 Jun 2015 13:56:14 -0700
Subject: [PATCH 0908/2322] openjdk7: Fix refernces to the bootstrap

---
 .../development/compilers/openjdk/default.nix | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 9bdea7bc7ab..be4ca84bd8d 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -203,6 +203,32 @@ let
       EOF
     '';
 
+    postFixup = ''
+      # Build the set of output library directories to rpath against
+      LIBDIRS=""
+      for output in $outputs; do
+        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':'):$LIBDIRS"
+      done
+
+      # Add the local library paths to remove dependencies on the bootstrap
+      for output in $outputs; do
+        OUTPUTDIR="$(eval echo \$$output)"
+        BINLIBS="$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)"
+        echo "$BINLIBS" | while read i; do
+          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
+          patchelf --shrink-rpath "$i" || true
+        done
+      done
+
+      # Test to make sure that we don't depend on the bootstrap
+      for output in $outputs; do
+        if grep -q -r '${bootjdk}' $(eval echo \$$output); then
+          echo "Extraneous references to ${bootjdk} detected"
+          exit 1
+        fi
+      done
+    '';
+
     meta = {
       homepage = http://openjdk.java.net/;
       license = stdenv.lib.licenses.gpl2;

From b79a5e812a7f8e15c2af167442fb89da01213041 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 8 Jun 2015 15:36:47 -0700
Subject: [PATCH 0909/2322] nixos/quassel: Use qt5 instead of qt4

This really speeds up building quassel daemon since qt5 can be built in
parallel while qt4 cannot.
---
 nixos/modules/services/networking/quassel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index 579d62884c7..005eb7bd761 100644
--- a/nixos/modules/services/networking/quassel.nix
+++ b/nixos/modules/services/networking/quassel.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  quassel = pkgs.kde4.quasselDaemon;
+  quassel = pkgs.quasselDaemon_qt5;
   cfg = config.services.quassel;
   user = if cfg.user != null then cfg.user else "quassel";
 in

From 6c00f2105ac8cf5fff4661bc803db2b763e74318 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 8 Jun 2015 17:41:10 -0700
Subject: [PATCH 0910/2322] iw: 3.15 -> 4.1

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

diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix
index 262b673822b..3cd2567d96f 100644
--- a/pkgs/os-specific/linux/iw/default.nix
+++ b/pkgs/os-specific/linux/iw/default.nix
@@ -1,18 +1,16 @@
 {stdenv, fetchurl, libnl, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  name = "iw-3.15";
+  name = "iw-4.1";
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz";
-    sha256 = "12jby9nv5nypadgdksbqw0y2kfm3j47zw7a3rwmy56d7rs90lp5x";
+    sha256 = "0jx3s5wdvm2qxd3h883fnyjsb1c29qcsz1r19bc029g8v2nalr2i";
   };
 
   buildInputs = [ libnl pkgconfig ];
 
-  preBuild = "
-    makeFlagsArray=(PREFIX=$out)
-  ";
+  makeFlags = [ "PREFIX=\${out}" ];
 
   meta = {
     description = "Tool to use nl80211";

From 8d4c5c956df525e72d4533be1f7d19789b705477 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 8 Jun 2015 17:45:31 -0700
Subject: [PATCH 0911/2322] ethtool: 3.18 -> 4.0

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

diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index e29c5effbdb..16af347e551 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ethtool-3.18";
+  name = "ethtool-4.0";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
-    sha256 = "1xj20fr44dk01hghyy5sq962sbiywc88ni3qqliv8bfxzmczwgw1";
+    sha256 = "1zzcwn6pk8qfasalqkxg8vrhacksfa50xsq4xifw7yfjqyn8fj4h";
   };
 
   meta = with stdenv.lib; {

From ddafa487fccea819c8e88c83c7faf7a1f3708f13 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 8 Jun 2015 17:59:09 -0700
Subject: [PATCH 0912/2322] dnstop: Update to 20140915

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

diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix
index c1a41d98f4b..c19dcae965b 100644
--- a/pkgs/tools/networking/dnstop/default.nix
+++ b/pkgs/tools/networking/dnstop/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpcap, ncurses }:
 
-stdenv.mkDerivation {
-  name = "dnstop-20121017";
+stdenv.mkDerivation rec {
+  name = "dnstop-20140915";
 
   src = fetchurl {
-    url = http://dns.measurement-factory.com/tools/dnstop/src/dnstop-20121017.tar.gz;
-    sha256 = "1xjrz4dzwshfrlc226s390sbwd10j0pl2al09d62955b6xh2vvba";
+    url = "http://dns.measurement-factory.com/tools/dnstop/src/${name}.tar.gz";
+    sha256 = "0yn5s2825l826506gclbcfk3lzllx9brk9rzja6yj5jv0013vc5l";
   };
 
   buildInputs = [ libpcap ncurses ];

From 48381b7621a51512fa0a87f019d5d5915d9f3d20 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 8 Jun 2015 18:32:32 -0700
Subject: [PATCH 0913/2322] nixos-artwork: Make into a derivation and use
 fetchfromgithub

---
 .../services/x11/display-managers/lightdm.nix |  2 +-
 .../modules/system/boot/loader/grub/grub.nix  |  2 +-
 pkgs/data/misc/nixos-artwork/default.nix      | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  7 +-----
 4 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/data/misc/nixos-artwork/default.nix

diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index f6de8c02b18..d05edabca62 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -104,7 +104,7 @@ in
       };
 
       background = mkOption {
-        default = "${pkgs.nixos-artwork}/gnome/Gnome_Dark.png";
+        default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
         description = ''
           The background image or color to use.
         '';
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 22af11b484e..0b6333ab573 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -337,7 +337,7 @@ in
           sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
         }
         # GRUB 1.97 doesn't support gzipped XPMs.
-        else "${pkgs.nixos-artwork}/gnome/Gnome_Dark.png");
+        else "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png");
     }
 
     (mkIf cfg.enable {
diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix
new file mode 100644
index 00000000000..99f3e8b1177
--- /dev/null
+++ b/pkgs/data/misc/nixos-artwork/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  name = "nixos-artwork-2015-02-27";
+  # Remember to check the default lightdm wallpaper when updating
+
+  src = fetchFromGitHub {
+    owner = "NixOS";
+    repo = "nixos-artwork";
+    rev = "e71b6846023919136795ede22b16d73b2cf1693d";
+    sha256 = "167yvhm2qy7qgyrqqs4hv98mmlarhgxpcsyv0r8a9g3vkblfdczb";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/artwork
+    cp -r * $out/share/artwork
+    find $out -name \*.xcf -exec rm {} \;
+  '';
+  
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/NixOS/nixos-artwork";
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7a08a42898..4a20518363e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14422,12 +14422,7 @@ let
 
   nix-serve = callPackage ../tools/package-management/nix-serve { };
 
-  # Remember to check the default lightdm wallpaper
-  nixos-artwork = fetchgit {
-    url = "git://github.com/NixOS/nixos-artwork";
-    rev = "e71b6846023919136795ede22b16d73b2cf1693d";
-    sha256 = "167yvhm2qy7qgyrqqs4hv98mmlarhgxpcsyv0r8a9g3vkblfdczb";
-  };
+  nixos-artwork = callPackage ../data/misc/nixos-artwork { };
 
   nut = callPackage ../applications/misc/nut { };
 

From e7c2a58250dfbbfae574ac2d2c04e761174b6fda Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Tue, 9 Jun 2015 03:24:18 -0700
Subject: [PATCH 0914/2322] bump dolphinEmuMaster, now needs gcc5 to compile

also removed wxGTK30 as that was unnecessary, and actually causes compilation errors with gcc5 in the mix
---
 pkgs/misc/emulators/dolphin-emu/master.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index fd293298b45..f742973c08d 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -1,14 +1,14 @@
-{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
+{ stdenv, gcc5, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
 , gettext, git, libpthreadstubs, libXrandr, libXext, readline
-, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchgit, libusb
+, openal, libXdmcp, portaudio, SDL, fetchgit, libusb
 , libpulseaudio ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dolphin-emu-20150421";
+  name = "dolphin-emu-20150609";
   src = fetchgit {
     url = git://github.com/dolphin-emu/dolphin.git;
-    rev = "4340927b7f17fa43c5f6c0f204c4bfc2b17a47d5";
-    sha256 = "0pc18n88yckmvli27p09xj5kyv4k8bqv92ric8xvi7cqznmmiv9d";
+    rev = "e47e4c677ad22895f8c8bc78676dd295e36f2695";
+    sha256 = "0g176x0rw9lssw68alr83cakldq1q38mzjwxdaf524bkvnn7fl3r";
     fetchSubmodules = false;
   };
 
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
+  buildInputs = [ gcc5 pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
                   gettext libpthreadstubs libXrandr libXext readline openal
-                  git libXdmcp portaudio SDL wxGTK30 libusb libpulseaudio ];
+                  git libXdmcp portaudio SDL libusb libpulseaudio ];
 
   meta = {
     homepage = http://dolphin-emu.org/;

From 9485bb3fefb802d7ef1ce281ce8fba5279b51291 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Tue, 9 Jun 2015 02:36:11 +0200
Subject: [PATCH 0915/2322] gnome-pomodoro: Fix build for 3.16

---
 .../gnome-3/3.16/apps/pomodoro/default.nix    | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
index bce514364ce..ad95b76b2a3 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
@@ -1,34 +1,33 @@
 { stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
-  dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3, gtk3, gst_plugins_base,
-  glib, gobjectIntrospection, hicolor_icon_theme
+  dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base,
+  glib, gobjectIntrospection, hicolor_icon_theme, telepathy_glib
 }:
 
 stdenv.mkDerivation rec {
-  rev = "0.10.3";
-  name = "gnome-shell-pomodoro-${rev}-61df3fa";
+  rev = "624945d";
+  name = "gnome-shell-pomodoro-${gnome3.version}-${rev}";
 
   src = fetchFromGitHub {
       owner = "codito";
-      repo = "gnome-shell-pomodoro";
+      repo = "gnome-pomodoro";
       rev = "${rev}";
-      sha256 = "0i0glmijalppb5hdb1xd6xnmv824l2w831rpkqmhxi0iqbvaship";
+      sha256 = "0vjy95zvd309n8g13fa80qhqlv7k6wswhrjw7gddxrnmr662xdqq";
   };
 
   configureScript = ''./autogen.sh'';
 
   buildInputs = [
     which automake113x intltool glib gobjectIntrospection pkgconfig libtool
-    makeWrapper dbus_glib libcanberra upower vala gst_all_1.gstreamer
+    makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer
     gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
     gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
     gnome3.gnome_common gnome3.gnome_shell hicolor_icon_theme gtk3
+    telepathy_glib
   ];
 
   preBuild = ''
-    sed -i \
-        -e 's|/usr\(/share/gir-1.0/UPowerGlib\)|${upower}\1|' \
-        -e 's|/usr\(/share/gir-1.0/GnomeDesktop\)|${gnome3.gnome_desktop}\1|' \
-        vapi/Makefile
+    sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \
+      vapi/Makefile
   '';
 
   preFixup = ''
@@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
     description =
       "Personal information management application that provides integrated " + 
       "mail, calendaring and address book functionality";
-    maintainers = with maintainers; [ DamienCassou ];
+    maintainers = with maintainers; [ DamienCassou jgeerds ];
     license = licenses.gpl3;
     platforms = platforms.linux;
   };

From 71b848b45dc58d7e75eb7f07b214fb8c62e5f58d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 9 Jun 2015 06:34:52 -0500
Subject: [PATCH 0916/2322] openblas: build with USE_OPENMP=0 on Darwin

Darwin's clang does not support OpenMP yet. OpenMP is required on other
platforms for e.g. Julia.
---
 pkgs/development/libraries/science/math/openblas/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index ef76c33fb6d..a4bf1efbb73 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
       "CC=${if stdenv.isDarwin then "clang" else "gcc"}"
       ''PREFIX="''$(out)"''
       "BINARY=${binary}"
-      "USE_OPENMP=1"
+      "USE_OPENMP=${if stdenv.isDarwin then "0" else "1"}"
       "INTERFACE64=${if blas64 then "1" else "0"}"
     ];
 

From 9b417df916b3069df306b88849f1b53da5e0825b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 9 Jun 2015 14:27:13 +0200
Subject: [PATCH 0917/2322] tomcat7: update from 7.0.55 to 7.0.62, fixes
 CVE-2014-7810

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

diff --git a/pkgs/servers/http/tomcat/7.0.nix b/pkgs/servers/http/tomcat/7.0.nix
index 87bc57eb2b6..221feb9c30e 100644
--- a/pkgs/servers/http/tomcat/7.0.nix
+++ b/pkgs/servers/http/tomcat/7.0.nix
@@ -1,6 +1,6 @@
 import ./recent.nix 
   {
     versionMajor = "7";
-    versionMinor = "0.55";
-    sha256 = "c20934fda63bc7311e2d8e067d67f886890c8be72280425c5f6f8fdd7a376c15";
+    versionMinor = "0.62";
+    sha256 = "0v8zvyd4h85ynnday58x0ppplw4flxyjsrmrpg78rrv3w49fm1x7";
   }

From 023be720821c1631ac6902f61132cdddbabd1594 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 9 Jun 2015 14:28:39 +0200
Subject: [PATCH 0918/2322] tomcat8: update from 8.0.9 to 8.0.23, fixes
 CVE-2014-7810

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

diff --git a/pkgs/servers/http/tomcat/8.0.nix b/pkgs/servers/http/tomcat/8.0.nix
index 63b8d2bbc94..a6da1198c9a 100644
--- a/pkgs/servers/http/tomcat/8.0.nix
+++ b/pkgs/servers/http/tomcat/8.0.nix
@@ -1,6 +1,6 @@
 import ./recent.nix 
   {
     versionMajor = "8";
-    versionMinor = "0.9";
-    sha256 = "5ea3c8260088ee4fd223a532a4b0c23a10e549c34705e2f190279a1a7f1f83d9";
+    versionMinor = "0.23";
+    sha256 = "0f0s35iqs1zpifya0qvdrk55r77jr074sc0zk5cjivxaxnhik2y9";
   }

From 49d4342f1baf9fb39016a33b78919c5e801f596d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 7 Jun 2015 02:40:00 +0200
Subject: [PATCH 0919/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/c8b207efe75afc7f7bbef9d102d392d19f5f6ddd
 with hackage2nix revision c3122d617e69efe091549cec44d578bba41515f1

---
 .../haskell-modules/hackage-packages.nix      | 527 ++++++++++++------
 1 file changed, 356 insertions(+), 171 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1136364e73e..add826cd139 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1046,6 +1046,7 @@ self: {
        ];
        description = "Big Contact Map Tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BNFC" = callPackage
@@ -1078,13 +1079,12 @@ self: {
      }:
      mkDerivation {
        pname = "BNFC-meta";
-       version = "0.4.0.2";
-       sha256 = "0d59kmbcwsdh34hagmhhcq0d0x49wmzl6kycm9p55i7cf0zw0a5l";
+       version = "0.4.0.3";
+       sha256 = "10rfljhygdl75ibmj0xqj7qwdk0ppjr8iw4wmvzdpl28mqjshny2";
        buildDepends = [
          alex-meta array base happy-meta haskell-src-meta syb
          template-haskell
        ];
-       jailbreak = true;
        description = "Deriving Parsers and Quasi-Quoters from BNF Grammars";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9069,6 +9069,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "KSP" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "KSP";
+       version = "0.1";
+       sha256 = "19sjr9vavxnbv5yp2c01gy6iz1q2abllcsf378n15f3z064ffqn6";
+       buildDepends = [ base ];
+       jailbreak = true;
+       homepage = "https://github.com/frosch03/kerbal";
+       description = "A library with the kerbal space program universe and demo code";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "Kalman" = callPackage
     ({ mkDerivation, base, hmatrix }:
      mkDerivation {
@@ -16943,10 +16956,10 @@ self: {
     ({ mkDerivation, base, ghc-prim, mtl, transformers }:
      mkDerivation {
        pname = "acme-timemachine";
-       version = "0.0.0.1";
-       sha256 = "06zhslaa7kp75gvnvh2ln15bqbdqgbgya6i4r2jkqxycnk8sczzl";
+       version = "0.0.1.0";
+       sha256 = "1dfwn0n4hg6zs4ikz6jzkn2spwsvchs1jgq7662aq4ljyp7f1rvb";
        buildDepends = [ base ghc-prim mtl transformers ];
-       description = "An easy way to perform and unperform IO actions";
+       description = "An easy way to perform and unperform IO and other stateful actions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -17979,8 +17992,8 @@ self: {
     ({ mkDerivation, base, stm, time, unbounded-delays }:
      mkDerivation {
        pname = "alarmclock";
-       version = "0.2.0.6";
-       sha256 = "1jr4pxrgz6gq1dcnkkggbaq3gnj0gr1g14mf174f2b4qzgl63cq1";
+       version = "0.2.0.8";
+       sha256 = "1g06bnbp0y6dcz7zgbh828klk7xc1spwzw3ff6jpqh74cm82vq6f";
        buildDepends = [ base stm time unbounded-delays ];
        testDepends = [ base time ];
        homepage = "https://bitbucket.org/davecturner/alarmclock";
@@ -18027,13 +18040,12 @@ self: {
      }:
      mkDerivation {
        pname = "alex-meta";
-       version = "0.3.0.7";
-       sha256 = "05a290b997kxm2rl0w98c3fzq33866pi69pmmahqvw631cp2c6ni";
+       version = "0.3.0.8";
+       sha256 = "1ja5y2dyil4h6j7q9dhrxzhry018fqc7vy3v5mrkvxyp7bhw1n9f";
        buildDepends = [
          array base containers haskell-src-meta QuickCheck template-haskell
        ];
        buildTools = [ alex happy ];
-       jailbreak = true;
        description = "Quasi-quoter for Alex lexers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19948,6 +19960,7 @@ self: {
          resource-pool resourcet transformers transformers-base types-compat
          web-routing
        ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/apiary";
        description = "persistent support for apiary web framework";
        license = stdenv.lib.licenses.mit;
@@ -22087,10 +22100,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws";
-       version = "0.12";
-       revision = "1";
-       sha256 = "1vjqrj3hj92vvik2c3qlld9gyh0an4xl2hx01hnpypgawa1j1180";
-       editedCabalFile = "c40b53aee98659e34f2383439dacd26bb98228056283a05d25e55b3c8226f4a7";
+       version = "0.12.1";
+       sha256 = "0aykch71qakmxn47i6h23h52dp41x7kwcibv527xg57ab71vm1bc";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -22106,7 +22117,6 @@ self: {
          mtl QuickCheck quickcheck-instances resourcet tagged tasty
          tasty-quickcheck text time transformers transformers-base
        ];
-       jailbreak = true;
        homepage = "http://github.com/aristidb/aws";
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -25405,8 +25415,8 @@ self: {
      }:
      mkDerivation {
        pname = "bitcoin-api";
-       version = "0.11.1";
-       sha256 = "16slfsqwmpr8c5sl2zpf763d21sqgii7jgmw0ra1nidv6zl01glb";
+       version = "0.12.0";
+       sha256 = "09sh56wmkkgm0gzsai94q1qa2dlf1s7nfxl0yzim0s10p71bw7wr";
        buildDepends = [
          aeson base base58string binary bitcoin-block bitcoin-script
          bitcoin-tx bitcoin-types bytestring hexstring lens lens-aeson text
@@ -27599,30 +27609,28 @@ self: {
      }:
      mkDerivation {
        pname = "bytestring-handle";
-       version = "0.1.0.2";
-       sha256 = "1nnqqcl9zp14q49jwcxhbm85hxk48higpr63qs675802sz0fs01v";
+       version = "0.1.0.3";
+       sha256 = "0dakwnpymxj2nghqsnq09862czby8hy0xl8m74yzqdnd9ky22g0z";
        buildDepends = [ base bytestring ];
        testDepends = [
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "http://hub.darcs.net/ganesh/bytestring-handle";
        description = "ByteString-backed Handles";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "bytestring-lexing" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring }:
+    ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "bytestring-lexing";
-       version = "0.4.3.3";
-       sha256 = "1gfbmxr91glzxmbl57f3ij9mapdfxal8pql0s7g3v4qxf7km2pq0";
-       buildDepends = [ array base bytestring ];
-       buildTools = [ alex ];
+       version = "0.5.0.2";
+       sha256 = "0wrzniawhgpphc6yx1v972gyqxdbv0pizaz9bafahrshyb9svy81";
+       buildDepends = [ base bytestring ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Parse and produce literals efficiently from strict or lazy bytestrings";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "bytestring-mmap" = callPackage
@@ -27847,8 +27855,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "c-storable-deriving";
-       version = "0.1.1";
-       sha256 = "19scaffyinyblc3vw3ga22j2z81gd7l2l3nnrsy3k9nsal1rbz3z";
+       version = "0.1.2";
+       sha256 = "0cdy3fy8lpz5layc0qzixfpbx2jksl9smrf012l5rpl994dwc9x1";
        buildDepends = [ base ghc-prim ];
        homepage = "https://github.com/maurer/c-storable-deriving";
        description = "Generate C-like storable instances from datatypes";
@@ -28065,8 +28073,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-debian";
-       version = "4.27.2";
-       sha256 = "1dmxs06x82pb0x4cyf5lhhgjf5mf0yx2yzl5r6g69awlkq5ylalz";
+       version = "4.29";
+       sha256 = "1kx8mivm2vm0bgnrzvccnd2x3ww913h64bwcawzpbcgjv7cpihlj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -28187,20 +28195,20 @@ self: {
 
   "cabal-helper" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, data-default, directory
-     , filepath, ghc-prim, mtl, process, template-haskell, temporary
-     , transformers
+     , extra, filepath, ghc-prim, mtl, process, template-haskell
+     , temporary, transformers, unix
      }:
      mkDerivation {
        pname = "cabal-helper";
-       version = "0.3.4.0";
-       sha256 = "1c96zwiz7jn55ijjjy8ip5axk7g0mv7b10bs25b5y3z7iqbblw6c";
+       version = "0.3.5.0";
+       sha256 = "02qzji8jzbg19pmhmqg0kylvmm0libq7v99rws67bh015gb829kk";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base bytestring Cabal data-default directory filepath ghc-prim mtl
          process template-haskell temporary transformers
        ];
-       testDepends = [ base ];
+       testDepends = [ base extra unix ];
        description = "Simple interface to Cabal's configuration state used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -28713,9 +28721,9 @@ self: {
      mkDerivation {
        pname = "cabal2nix";
        version = "1.73";
-       revision = "4";
+       revision = "5";
        sha256 = "1nskcr8k5a8wm9q5is0b1kww574q2nq45f16agya8z44hgk97xiv";
-       editedCabalFile = "29ac70f26f4996e06945649693d71c217ed9e5f9b3ec72637c13153961d8f2d9";
+       editedCabalFile = "54866b8081ddfc72761c1f38cc96df6782682058cd09b465300562910f57e2ea";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -32375,8 +32383,8 @@ self: {
     ({ mkDerivation, base, bytestring, HUnit, text }:
      mkDerivation {
        pname = "cmark";
-       version = "0.3.3.1";
-       sha256 = "0l42l8bpn69zqz3s2jby1blqg7sx7cxmpnpwr8spkmh5vy8c8m5g";
+       version = "0.3.4";
+       sha256 = "0cmrh524s2in66vb51hzfrbxq7z8afh243c8x1378s9hxk0r6xya";
        buildDepends = [ base bytestring text ];
        testDepends = [ base HUnit text ];
        homepage = "https://github.com/jgm/commonmark-hs";
@@ -33107,6 +33115,7 @@ self: {
        homepage = "http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellCombinatorialProblems";
        description = "A number of data structures to represent and allow the manipulation of standard combinatorial problems, used as test problems in computer science";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinatorics" = callPackage
@@ -36380,8 +36389,8 @@ self: {
      }:
      mkDerivation {
        pname = "cron";
-       version = "0.2.5";
-       sha256 = "0337dq2fqjikdn2fayad66rq8xyh2y6ywn18fn5q5vvrhmvmyrja";
+       version = "0.2.6";
+       sha256 = "1klxhk12c08ig7n8n8drnvqmggfghr8i9j5bfhakj58bk1x8xfvg";
        buildDepends = [ attoparsec base mtl old-locale text time ];
        testDepends = [
          attoparsec base derive hspec hspec-expectations QuickCheck text
@@ -43489,6 +43498,7 @@ self: {
        ];
        description = "SQL backend for Database Supported Haskell (DSH)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dsmc" = callPackage
@@ -46330,6 +46340,7 @@ self: {
          persistent persistent-sqlite persistent-template QuickCheck
          resourcet text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/esqueleto";
        description = "Type-safe EDSL for SQL queries on persistent backends";
        license = stdenv.lib.licenses.bsd3;
@@ -47844,8 +47855,8 @@ self: {
      }:
      mkDerivation {
        pname = "fb";
-       version = "1.0.10";
-       sha256 = "11h2z8idndhvm1ijp6qylaqyg173qk1rybv9v0d73s2sq7jxbcx7";
+       version = "1.0.11";
+       sha256 = "19kvsc6ap56b3h1z6wnjqmxgnqs7jqlhd3zx08h6nxkip3ddnzh5";
        buildDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring cereal conduit conduit-extra crypto-api cryptohash
@@ -47871,6 +47882,7 @@ self: {
        version = "0.3.4";
        sha256 = "07hrifzwvv7fzqh70igfbxzn854yvyx7406s8byn0arhmp21ka3b";
        buildDepends = [ base cereal fb persistent text time ];
+       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/fb-persistent";
        description = "Provides Persistent instances to Facebook types";
        license = stdenv.lib.licenses.bsd3;
@@ -48802,8 +48814,8 @@ self: {
      }:
      mkDerivation {
        pname = "fingertree";
-       version = "0.1.0.2";
-       sha256 = "1krsymv66lnz30hv3j2427vl1wh7vczjb66qviq8mfxgfxf2q8z6";
+       version = "0.1.1.0";
+       sha256 = "1w6x3kp3by5yjmam6wlrf9vap5l5rrqaip0djbrdp0fpf2imn30n";
        buildDepends = [ base ];
        testDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -50436,8 +50448,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-game";
-       version = "1.1.80";
-       sha256 = "1vpwrviwxib22mkaqmwndzfly8iicr85sh1y914gwp5n83lmkava";
+       version = "1.1.81";
+       sha256 = "1z8l9k70rbcc9jbrnh7xhrnny6wd5l0jfb1a6ki7dnq6m5klivyp";
        buildDepends = [
          array base boundingboxes colors containers control-bool directory
          filepath free freetype2 GLFW-b hashable JuicyPixels
@@ -52956,22 +52968,23 @@ self: {
      }) {};
 
   "ghcid" = callPackage
-    ({ mkDerivation, ansi-terminal, base, cmdargs, directory, extra
-     , filepath, process, tasty, tasty-hunit, terminal-size, time
+    ({ mkDerivation, ansi-terminal, base, cmdargs, containers
+     , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
+     , terminal-size, time
      }:
      mkDerivation {
        pname = "ghcid";
-       version = "0.3.6";
-       sha256 = "15aasq3f8h5nimgd5zz0mhkflslmcadl2f0srbw4q0462flvmjm8";
+       version = "0.4";
+       sha256 = "0z54444ygxc3irnqjkd9cdzg2b6df9d87lkkazj1cl2qy1x5kbv0";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         ansi-terminal base cmdargs directory extra filepath process
-         terminal-size time
+         ansi-terminal base cmdargs containers directory extra filepath
+         fsnotify process terminal-size time
        ];
        testDepends = [
-         ansi-terminal base cmdargs directory extra filepath process tasty
-         tasty-hunit terminal-size time
+         ansi-terminal base cmdargs containers directory extra filepath
+         fsnotify process tasty tasty-hunit terminal-size time
        ];
        homepage = "https://github.com/ndmitchell/ghcid#readme";
        description = "GHCi based bare bones IDE";
@@ -55195,12 +55208,15 @@ self: {
      }) {};
 
   "graph-wrapper" = callPackage
-    ({ mkDerivation, array, base, containers }:
+    ({ mkDerivation, array, base, containers, deepseq, hspec
+     , QuickCheck
+     }:
      mkDerivation {
        pname = "graph-wrapper";
-       version = "0.2.4.4";
-       sha256 = "0ks4mj1f3ky8h8p9kc1djslbzs2vvlh9frab8jl09x63b15f8xzd";
+       version = "0.2.5.1";
+       sha256 = "04z1qbsf1c31r0mhn8bgr8hisffxacq3j61y4fym28idr8zqaqc3";
        buildDepends = [ array base containers ];
+       testDepends = [ array base containers deepseq hspec QuickCheck ];
        homepage = "https://github.com/soenkehahn/graph-wrapper";
        description = "A wrapper around the standard Data.Graph with a less awkward interface";
        license = stdenv.lib.licenses.bsd3;
@@ -59194,13 +59210,12 @@ self: {
      }:
      mkDerivation {
        pname = "happy-meta";
-       version = "0.2.0.7";
-       sha256 = "12599233lh0ffmvlim0gs5jzg8lly1g11i1cg44lb37bz3l7psh9";
+       version = "0.2.0.8";
+       sha256 = "0hnj039vspqvym70c59y80ygb8ciz5bf18sqm0dbvzr5v2mixbag";
        buildDepends = [
          array base containers haskell-src-meta mtl template-haskell
        ];
        buildTools = [ happy ];
-       jailbreak = true;
        description = "Quasi-quoter for Happy parsers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61918,6 +61933,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haverer" = callPackage
+    ({ mkDerivation, base, basic-prelude, containers, errors, lens
+     , MonadRandom, mtl, random-shuffle, tasty, tasty-hunit
+     , tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "haverer";
+       version = "0.3.0.0";
+       sha256 = "1p4llwjab7h2zg10585jp5a5bfrzmmkziq7in164wk15rb2z5y0p";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base basic-prelude containers errors lens MonadRandom mtl
+         random-shuffle tasty tasty-quickcheck text
+       ];
+       testDepends = [
+         base basic-prelude containers errors mtl random-shuffle tasty
+         tasty-hunit tasty-quickcheck text
+       ];
+       description = "Implementation of the rules of Love Letter";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hawitter" = callPackage
     ({ mkDerivation, base, base64-string, bytestring, clock, containers
      , gconf, glade, gtk, hoauth, HTTP, json, mtl, network, old-locale
@@ -62908,8 +62947,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedis";
-       version = "0.6.5";
-       sha256 = "1kn8i49yxms1bpjwpy4m8vyycgi755zvy4zc66w068nmnd1kiykh";
+       version = "0.6.7";
+       sha256 = "181anz8f2qi08f96ns0kxy09y18q4854brdycwhdij5yn7fl9kdg";
        buildDepends = [
          attoparsec base BoundedChan bytestring bytestring-lexing mtl
          network resource-pool time vector
@@ -65546,8 +65585,8 @@ self: {
     ({ mkDerivation, base, hspec, sass }:
      mkDerivation {
        pname = "hlibsass";
-       version = "0.1.2.1";
-       sha256 = "1fipgxpzzc0jbb2xc2dslhc94xjvd1vkq564g4a1i7axnq90b6dv";
+       version = "0.1.3.0";
+       sha256 = "10mrvpiwmcaijckrcg45zw2zb17fgx43rm4qfi32glvgkakd2zqf";
        buildDepends = [ base ];
        testDepends = [ base hspec ];
        extraLibraries = [ sass ];
@@ -65911,6 +65950,7 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hmeap";
        description = "Haskell Meapsoft Parser";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmeap-utils" = callPackage
@@ -66510,14 +66550,15 @@ self: {
      }:
      mkDerivation {
        pname = "homplexity";
-       version = "0.4.2.0";
-       sha256 = "1jxq8fgm1ja0y3h5jj9d4wr96fpb6496xc9sb3q562bxssx6giay";
+       version = "0.4.3.0";
+       sha256 = "0xw3fkbzb3jqi5sr28a69ga632c30g4xwykgd0cq8imrz70jlvam";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          base containers cpphs deepseq directory filepath haskell-src-exts
          hflags template-haskell uniplate
        ];
+       testDepends = [ base haskell-src-exts uniplate ];
        buildTools = [ happy ];
        homepage = "https://github.com/mgajda/homplexity";
        description = "Haskell code quality tool";
@@ -67603,8 +67644,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpqtypes";
-       version = "1.4.1";
-       sha256 = "00ira3zsw9m5vm6pqdgf4v276b7y0crqiwlw3nw99f74xj5qds19";
+       version = "1.4.2";
+       sha256 = "0jmc7m47gidmhnf2dz7hqzlypw1l72n948naccab6j58hkn683kk";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -69880,6 +69921,7 @@ self: {
        homepage = "http://rd.slavepianos.org/?t=hspear";
        description = "Haskell Spear Parser";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec" = callPackage
@@ -70258,17 +70300,19 @@ self: {
      }) {};
 
   "hspec-wai-json" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec
-     , hspec-wai, template-haskell
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring
+     , case-insensitive, hspec, hspec-wai, template-haskell
      }:
      mkDerivation {
        pname = "hspec-wai-json";
-       version = "0.6.0";
-       sha256 = "0r9p8v3cynyx5gnan86cc0l5hrmnm3mx7w2kkc1npv6zq0cj1bgq";
+       version = "0.6.1";
+       sha256 = "0sbw6iddywxdg4n8npnz6m0lmcf9nrq3ib7kckpx7shpq9khwgih";
        buildDepends = [
-         aeson aeson-qq base bytestring hspec-wai template-haskell
+         aeson aeson-qq base bytestring case-insensitive hspec-wai
+         template-haskell
        ];
        testDepends = [ base hspec hspec-wai ];
+       homepage = "https://github.com/hspec/hspec-wai#readme";
        description = "Testing JSON APIs with hspec-wai";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -73486,7 +73530,9 @@ self: {
      mkDerivation {
        pname = "ide-backend-common";
        version = "0.9.1.2";
+       revision = "1";
        sha256 = "1cj594vq0x87h9mvwsj9mplacrdn999bbsknjwdpvrpsbadlx5q7";
+       editedCabalFile = "cdbec9d6422b6888b23622286333a5119e9913f82e49f85676bb56d6ca850b38";
        buildDepends = [
          aeson async attoparsec base binary bytestring bytestring-trie
          containers crypto-api data-accessor directory filepath fingertree
@@ -73772,24 +73818,22 @@ self: {
      }) {};
 
   "ig" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , bytestring, conduit, conduit-extra, crypto-api, cryptohash
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , conduit, conduit-extra, crypto-api, cryptohash
      , cryptohash-cryptoapi, data-default, http-conduit, http-types
      , lifted-base, monad-control, resourcet, text, time, transformers
      , transformers-base, unordered-containers
      }:
      mkDerivation {
        pname = "ig";
-       version = "0.2.1";
-       sha256 = "0kl44fv3djcrr87gqpcdbsvqiliwxz2iw5fd07h8xrvmls3b1lgj";
+       version = "0.2.2";
+       sha256 = "0qg9786sih7bcmdvmih5qg8p0j8r7vh78cp5yaw2f9rldica9a4k";
        buildDepends = [
-         aeson attoparsec base base16-bytestring bytestring conduit
-         conduit-extra crypto-api cryptohash cryptohash-cryptoapi
-         data-default http-conduit http-types lifted-base monad-control
-         resourcet text time transformers transformers-base
-         unordered-containers
+         aeson base base16-bytestring bytestring conduit conduit-extra
+         crypto-api cryptohash cryptohash-cryptoapi data-default
+         http-conduit http-types lifted-base monad-control resourcet text
+         time transformers transformers-base unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/ig";
        description = "Bindings to Instagram's API";
        license = stdenv.lib.licenses.bsd3;
@@ -75286,8 +75330,8 @@ self: {
      }:
      mkDerivation {
        pname = "intricacy";
-       version = "0.4.1";
-       sha256 = "1gv2kgm3r5b4nh8d58nwrilyzxr7l4awn1qlwl7wnkfi99h5nlz8";
+       version = "0.4.3";
+       sha256 = "07ha7vl8qzvfyk776f0pr6wb9fjcwmmqplp91bfpmzslifw2k01r";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -81053,8 +81097,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens-simple";
-       version = "0.1.0.2";
-       sha256 = "1gsfij0n70wwvcrgr0lq98kwswghv16y1d0gxnyrfgxkpar47fhf";
+       version = "0.1.0.3";
+       sha256 = "17s7fjggajlamqi2lc2lrhswykbyba6zv5rf0kr24hn3mv8a6yrk";
        buildDepends = [
          base lens-family lens-family-core lens-family-th
        ];
@@ -82178,6 +82222,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lindenmayer" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "lindenmayer";
+       version = "0.1.0.1";
+       sha256 = "07gz4lbvyzahffcp6f1f87zl20kf834iswh671vb8vxffigrz5y1";
+       buildDepends = [ base ];
+       homepage = "https://github.com/reinh/hs-lindenmayer";
+       description = "L-systems in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "line-break" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -83520,6 +83576,7 @@ self: {
        homepage = "http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellLocalSearch";
        description = "Generalised local search within Haskell, for applications in combinatorial optimisation";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "locators" = callPackage
@@ -86976,6 +87033,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;
      }) {};
 
   "midi" = callPackage
@@ -90647,6 +90705,7 @@ self: {
        jailbreak = true;
        description = "Concurrent and combinable updates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mvclient" = callPackage
@@ -91315,6 +91374,18 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) { inherit (pkgs) ncurses;};
 
+  "ndjson-conduit" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit }:
+     mkDerivation {
+       pname = "ndjson-conduit";
+       version = "0.1.0.2";
+       sha256 = "0fxxnbccasyhxd5yykzkvrj09zci8is7yqfjw0wg11n1p00hzahj";
+       buildDepends = [ aeson attoparsec base bytestring conduit ];
+       homepage = "https://github.com/srijs/haskell-ndjson-conduit";
+       description = "Conduit-based parsing and serialization for newline delimited JSON";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "neat" = callPackage
     ({ mkDerivation, base, filepath, parsec }:
      mkDerivation {
@@ -91559,6 +91630,23 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "nestedmap" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, containers
+     , data-ordlist, hspec, QuickCheck
+     }:
+     mkDerivation {
+       pname = "nestedmap";
+       version = "0.1.0.3";
+       sha256 = "1his95sqzyr5xb7iihz62vp9y32smf5wy4ck81yrxdvkn6zvhajl";
+       buildDepends = [ base base-unicode-symbols containers ];
+       testDepends = [
+         base base-unicode-symbols containers data-ordlist hspec QuickCheck
+       ];
+       jailbreak = true;
+       description = "A library for nested maps";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "net-concurrent" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghc-binary, hslogger
      , monad-loops, network
@@ -94847,6 +94935,7 @@ self: {
        homepage = "https://github.com/k0ral/opml-conduit";
        description = "Streaming parser/renderer for the OPML 2.0 format.";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opn" = callPackage
@@ -97452,8 +97541,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent";
-       version = "2.1.6";
-       sha256 = "17jcj5xvxnck93dk01ac31mbh1b5pk1266x1zqap40glqs247myl";
+       version = "2.2";
+       sha256 = "04l5394yrnm0d5cz7nq2phmsbm5vxbggn4wp8n0i0ms0y7blfh0p";
        buildDepends = [
          aeson attoparsec base base64-bytestring blaze-html blaze-markup
          bytestring conduit containers exceptions fast-logger lifted-base
@@ -97561,8 +97650,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-mysql";
-       version = "2.1.3.1";
-       sha256 = "1q1h3yrrpw9qzc7myfhwjxn5kxky5bxf918fyllpnprdagf98gd1";
+       version = "2.2";
+       sha256 = "09hajfvwgjkrmk1qmjfx3z6qkisv4gj0qjcmd1m8n9nb76bmdfz9";
        buildDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger mysql mysql-simple persistent resourcet
@@ -97603,8 +97692,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-postgresql";
-       version = "2.1.6";
-       sha256 = "1s3dzwxv1rzfg7f5l9qsypzvm7pk2jiqjzdfksiq0ji37f73v7l6";
+       version = "2.2";
+       sha256 = "0ydwc2jb8w3wma8f0v7i16pzglx0gv1ffikfvislw3c6wkangwby";
        buildDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger persistent postgresql-libpq
@@ -97691,8 +97780,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-sqlite";
-       version = "2.1.4.2";
-       sha256 = "0g0j8yhbr960lvph49x5knwvx86b7kxlihk8n0xvdqbaq04fgiqa";
+       version = "2.2";
+       sha256 = "1567ja3f87syw6x6x6gl6xzdl3pl8ammlrqy2500gbgr7ni0a47i";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -101318,8 +101407,8 @@ self: {
      }:
      mkDerivation {
        pname = "process-extras";
-       version = "0.3.3.4";
-       sha256 = "1cnq7lzrwckyhd829ir8h1rbh404yw0m40lka7sl23i7mak51mbp";
+       version = "0.3.3.5";
+       sha256 = "18fyv47xhvw5881is2hk9a1x35fr21jvw36irlc5cxc3vfmnym6s";
        buildDepends = [ base bytestring deepseq ListLike process text ];
        homepage = "https://github.com/seereason/process-extras";
        description = "Process extras";
@@ -102055,8 +102144,8 @@ self: {
      }:
      mkDerivation {
        pname = "proton-haskell";
-       version = "0.6";
-       sha256 = "0g73lspx5rk8d6axn229im7r8ch5d7afn8fb51haazaqmcw906qg";
+       version = "0.7";
+       sha256 = "1gn4h8xprq8gkngccyqbbqn8nidwlczlwckxzjgnb190yy3kd7hi";
        buildDepends = [ base containers directory filepath ];
        testDepends = [
          base containers directory filepath HUnit test-framework
@@ -104904,20 +104993,18 @@ self: {
      }) {};
 
   "reducers" = callPackage
-    ({ mkDerivation, array, base, bytestring, comonad, containers
-     , fingertree, hashable, keys, pointed, semigroupoids, semigroups
-     , text, transformers, unordered-containers
+    ({ mkDerivation, array, base, bytestring, containers, fingertree
+     , hashable, semigroupoids, semigroups, text, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "reducers";
-       version = "3.10.3.1";
-       sha256 = "0qmd93jdh0qjyc9if9hr2yjanrqx5nlbz5j0daiywzxcb0hi7ri8";
+       version = "3.10.3.2";
+       sha256 = "1zfryrmz5ajahs4d6dj3fzzkqbgdzqz358jvj4rhqiwa61ylhb42";
        buildDepends = [
-         array base bytestring comonad containers fingertree hashable keys
-         pointed semigroupoids semigroups text transformers
-         unordered-containers
+         array base bytestring containers fingertree hashable semigroupoids
+         semigroups text transformers unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/reducers/";
        description = "Semigroups, specialized containers and a general map/reduce framework";
        license = stdenv.lib.licenses.bsd3;
@@ -109396,8 +109483,8 @@ self: {
      }:
      mkDerivation {
        pname = "schedule-planner";
-       version = "1.0.0.0";
-       sha256 = "0cbx6k3spsdsk8bjwyzyjw9iqdpc7z2vkds51iaxxn3wiwjkxwpq";
+       version = "1.0.0.1";
+       sha256 = "0p2k67g281f08njhann4yv0vhfbjh4m6rr2x58smxhwqxgpjg399";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -110983,8 +111070,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.4.1";
-       sha256 = "0rbbijy1y40msy0ficssfg0krylrma55z500anymjkmpyp3ymnls";
+       version = "0.4.2";
+       sha256 = "0zna0x70jlxa2nis4v6knqlyxxkyvv2lmwyixp31xhdcp1yl2lqh";
        buildDepends = [
          aeson attoparsec base bytestring bytestring-conversion
          case-insensitive http-media http-types network-uri
@@ -110995,7 +111082,6 @@ self: {
          filepath hspec parsec QuickCheck quickcheck-instances
          string-conversions text url
        ];
-       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs";
        license = stdenv.lib.licenses.bsd3;
@@ -111005,8 +111091,8 @@ self: {
     ({ mkDerivation, base, blaze-html, http-media, servant }:
      mkDerivation {
        pname = "servant-blaze";
-       version = "0.4.1";
-       sha256 = "0an5lb3p61i8iahs5rgfy97s3ivqa3q0034iz8zxa4rvhy7k56hp";
+       version = "0.4.2";
+       sha256 = "0jank0v3cp6cbr571q4pqdfxfbfzm5v8r6rq8csz9yfkhg6x97bg";
        buildDepends = [ base blaze-html http-media servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Blaze-html support for servant";
@@ -111022,8 +111108,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.4.1";
-       sha256 = "1h0w9dkngrz9pimz66bc2ij9ik316x0sliyyqf16mmkpn66wcl6r";
+       version = "0.4.2";
+       sha256 = "0rcjqvx76mih4pfhxgrm30czznz68agdhflanqsslv2g33vzls55";
        buildDepends = [
          aeson attoparsec base bytestring either exceptions http-client
          http-client-tls http-media http-types network-uri safe servant
@@ -111046,8 +111132,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.4.1";
-       sha256 = "0xhj75nbsnlbzp3sf6qkfwh0x6a64lfzzq9m07wfg02nqzn22y92";
+       version = "0.4.2";
+       sha256 = "1s70zrs8hiphz94vkcm9gim1xs4dj943a73d2jypyijd4p0k5q5j";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -111082,6 +111168,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-examples" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, either
+     , http-types, js-jquery, lucid, random, servant, servant-client
+     , servant-docs, servant-jquery, servant-lucid, servant-server, text
+     , time, transformers, wai, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "servant-examples";
+       version = "0.4.2";
+       sha256 = "1nmgzkn0nv3p0bzr5ny0yx0g45fzf5qx7s868jp1nq7wbfd3yc0i";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring directory either http-types js-jquery lucid
+         random servant servant-client servant-docs servant-jquery
+         servant-lucid servant-server text time transformers wai wai-extra
+         warp
+       ];
+       homepage = "http://haskell-servant.github.io/";
+       description = "Example programs for servant";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-jquery" = callPackage
     ({ mkDerivation, aeson, base, charset, filepath, hspec
      , hspec-expectations, language-ecmascript, lens, servant
@@ -111089,8 +111198,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-jquery";
-       version = "0.4.1";
-       sha256 = "10w4fll46355w21l2jq3kd9lfsncdajc8s40j181s29kw6bq6r6n";
+       version = "0.4.2";
+       sha256 = "14ixqnxwm24gc457y0z7rw6z31w2s29sg913vvax641nazfr6yfm";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -111109,8 +111218,8 @@ self: {
     ({ mkDerivation, base, http-media, lucid, servant }:
      mkDerivation {
        pname = "servant-lucid";
-       version = "0.4.1";
-       sha256 = "02bggqwmpqznfnprfyfq6ia04byi23zgwvzigymaw1bykfi7z6h0";
+       version = "0.4.2";
+       sha256 = "1aapj4fwjijg9k56x5n9andfwfkffcv37rfvsbpdxhkvwzvmmdpq";
        buildDepends = [ base http-media lucid servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Servant support for lucid";
@@ -111206,8 +111315,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.4.1";
-       sha256 = "0bc82pn82ymv5wy1plmcgxb0ljkqj48rn9x8gdjdki06yvph63ga";
+       version = "0.4.2";
+       sha256 = "054xfkl6pxc39ahhch8i9s1aj2p3sd10ah9cknknbkjcyhynjzk4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -111221,7 +111330,6 @@ self: {
          network parsec QuickCheck servant string-conversions temporary text
          transformers wai wai-extra warp
        ];
-       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
@@ -111257,8 +111365,8 @@ self: {
      }:
      mkDerivation {
        pname = "ses-html";
-       version = "0.2.1.2";
-       sha256 = "0ndw2w8b8zkwsa3qgwr27k2qvv9zrcd6zb1ygf54wzw79v2zpg5f";
+       version = "0.3.0.0";
+       sha256 = "1clf24kyyp9b8r22bacp44q0gf83zr6k1b33dz4bfy935wbnlshy";
        buildDepends = [
          base base64-bytestring blaze-html byteable bytestring cryptohash
          HsOpenSSL http-streams tagsoup time
@@ -114319,17 +114427,18 @@ self: {
   "snaplet-auth-acid" = callPackage
     ({ mkDerivation, acid-state, aeson, attoparsec, base, cereal
      , clientsession, directory, errors, filepath, hashable, lens
-     , MonadCatchIO-transformers, mtl, safecopy, snap, snap-core, text
-     , time, unordered-containers, vector
+     , MonadCatchIO-transformers, mtl, safecopy, scientific, snap
+     , snap-core, text, time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "snaplet-auth-acid";
-       version = "0.0.1";
-       sha256 = "1f6p8iqb5cq2yz6c6zdd71p6cfkvnhqkczqiyb7080xira9w5ia3";
+       version = "0.1.0";
+       sha256 = "0i0py2rj2vkivl97fxnv87bpbsbms2ncdqbq4zs0777nbr717swm";
        buildDepends = [
          acid-state aeson attoparsec base cereal clientsession directory
          errors filepath hashable lens MonadCatchIO-transformers mtl
-         safecopy snap snap-core text time unordered-containers vector
+         safecopy scientific snap snap-core text time unordered-containers
+         vector
        ];
        jailbreak = true;
        description = "Provides an Acid-State backend for the Auth Snaplet";
@@ -114855,18 +114964,17 @@ self: {
      }) {};
 
   "snaplet-ses-html" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, configurator
-     , ses-html, snap, text, transformers
+    ({ mkDerivation, adjunctions, base, blaze-html, bytestring
+     , configurator, lens, ses-html, snap, text, transformers
      }:
      mkDerivation {
        pname = "snaplet-ses-html";
-       version = "0.1.0.0";
-       sha256 = "14q577mnyf9r113v4sbfcpqlfd47wcdnbwvz70w5bqp996627jyl";
+       version = "0.1.1.0";
+       sha256 = "1s5pyhwdnpw1ijy67h4kw052jz4pp73bpjcqii31passybvfd7k6";
        buildDepends = [
-         base blaze-html bytestring configurator ses-html snap text
-         transformers
+         adjunctions base blaze-html bytestring configurator lens ses-html
+         snap text transformers
        ];
-       jailbreak = true;
        description = "Snaplet for the ses-html package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115275,13 +115383,14 @@ self: {
     ({ mkDerivation, async, base, bytestring }:
      mkDerivation {
        pname = "socket";
-       version = "0.2.0.0";
-       sha256 = "0z9hcbvsalmn7zmmks18v8pq3gnvf868kw44a9s6kp5h6npp05dw";
+       version = "0.3.0.1";
+       sha256 = "01fz3lng41i9q4r2wh6nsyx27yc7jbhglzb10lg06d2ll7gxakx0";
        buildDepends = [ base bytestring ];
        testDepends = [ async base bytestring ];
        homepage = "https://github.com/lpeterse/haskell-socket";
-       description = "A binding to the POSIX sockets interface";
+       description = "A portable and extensible sockets library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socket-activation" = callPackage
@@ -116860,16 +116969,50 @@ self: {
      }) {};
 
   "stack" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring
+     , bifunctors, binary, bytestring, Cabal, conduit, conduit-extra
+     , containers, cpphs, cryptohash, cryptohash-conduit, deepseq
+     , directory, either, enclosed-exceptions, exceptions, fast-logger
+     , filepath, hashable, hspec, http-client, http-client-tls
+     , http-conduit, http-types, lifted-base, monad-control
+     , monad-logger, monad-loops, mtl, old-locale, optparse-applicative
+     , optparse-simple, path, persistent, persistent-sqlite
+     , persistent-template, pretty, process, resourcet, safe, split, stm
+     , streaming-commons, tar, template-haskell, temporary, text, time
+     , transformers, transformers-base, unix, unordered-containers
+     , vector, vector-binary-instances, void, yaml, zlib
+     }:
      mkDerivation {
        pname = "stack";
-       version = "0.0.0";
-       sha256 = "0829d2yb32gfnn22idhwzpyc2gy3d7lyj19kh20fbq73fp7k9kmb";
-       isLibrary = false;
+       version = "0.0.1";
+       sha256 = "04bb0wih2nzqrq8si48w1p6zc4b7nzrgrg4cbnly63hgx64vyhq3";
+       isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base ];
+       buildDepends = [
+         aeson async attoparsec base base64-bytestring bifunctors binary
+         bytestring Cabal conduit conduit-extra containers cryptohash
+         cryptohash-conduit deepseq directory either enclosed-exceptions
+         exceptions fast-logger filepath hashable http-client
+         http-client-tls http-conduit http-types lifted-base monad-control
+         monad-logger monad-loops mtl old-locale optparse-applicative
+         optparse-simple path persistent persistent-sqlite
+         persistent-template pretty process resourcet safe split stm
+         streaming-commons tar template-haskell temporary text time
+         transformers transformers-base unix unordered-containers vector
+         vector-binary-instances void yaml zlib
+       ];
+       testDepends = [
+         base Cabal conduit conduit-extra containers cryptohash directory
+         exceptions filepath hspec http-conduit monad-logger path resourcet
+         temporary transformers
+       ];
+       buildTools = [ cpphs ];
+       homepage = "https://github.com/commercialhaskell/stack
+test/package-dump/ghc-7.8.txt
+test/package-dump/ghc-7.10.txt";
        description = "The Haskell Tool Stack";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-prism" = callPackage
@@ -123106,14 +123249,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "th-orphans_0_12_0" = callPackage
+  "th-orphans_0_12_1" = callPackage
     ({ mkDerivation, base, hspec, mtl, nats, template-haskell, th-lift
      , th-reify-many
      }:
      mkDerivation {
        pname = "th-orphans";
-       version = "0.12.0";
-       sha256 = "0dgbk8w81k8d5a9y4nq7h2rz6rvz3vhc0bs0vff7c0iiaglgajvp";
+       version = "0.12.1";
+       sha256 = "11vndilqcx9scbb988xzpaj823g65a7b7vx6jzf9r3nb808kyb2j";
        buildDepends = [
          base mtl nats template-haskell th-lift th-reify-many
        ];
@@ -124206,6 +124349,7 @@ self: {
        ];
        description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timers" = callPackage
@@ -125823,14 +125967,13 @@ self: {
      }:
      mkDerivation {
        pname = "turtle";
-       version = "1.1.0";
-       sha256 = "0qpw366hyvprgcmxr83in2ay07f7br7bff2zqw9pnm7lkmkxrlkw";
+       version = "1.1.1";
+       sha256 = "1dgzzsylbri2p8wyf1xfww8la9vccb7yac0b0g2lf0b1ix4gphym";
        buildDepends = [
          async base clock directory foldl managed process system-fileio
          system-filepath temporary text time transformers unix
        ];
        testDepends = [ base doctest ];
-       jailbreak = true;
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128413,14 +128556,13 @@ self: {
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.1.2";
-       sha256 = "1rd166dsc5cl6bwvd43z08d6j6djnmskg1ddnv1js0z4xxpbs2qf";
+       version = "0.1.3";
+       sha256 = "19zsjvn977rwmlgc062wwzbmdgxxxcf4ad6g64ih4n3q707r6gka";
        buildDepends = [ attoparsec base blaze-builder bytestring ];
        testDepends = [
          attoparsec base bytestring derive HUnit lens QuickCheck
          quickcheck-instances tasty tasty-hunit tasty-quickcheck
        ];
-       jailbreak = true;
        homepage = "https://github.com/Soostone/uri-bytestring";
        description = "Haskell URI parsing as ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -129596,8 +129738,8 @@ self: {
      }:
      mkDerivation {
        pname = "vcache";
-       version = "0.2.5";
-       sha256 = "0jinysgn4rzh0b4a97wjac6md74vafb7avzprr6yddksmkylkayl";
+       version = "0.2.6";
+       sha256 = "08vg106dhzam5h0a6pzz4cbyzfg6pfgcgvn6xm1266kj1ipla18d";
        buildDepends = [
          base bytestring containers direct-murmur-hash easy-file filelock
          lmdb random stm transformers
@@ -130782,6 +130924,7 @@ self: {
        homepage = "https://github.com/larskuhtz/wai-cors";
        description = "CORS for WAI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-digestive-functors" = callPackage
@@ -131062,8 +131205,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-logger";
-       version = "2.2.4";
-       sha256 = "0l7jd3fczn1hp5d7bbhkk0qflw320sr2yw9gb10jvsv42rs1kdbv";
+       version = "2.2.4.1";
+       sha256 = "1s6svvy3ci4j1dj1jaw8hg628miwj8f5gpy9n8d8hpsaxav6nzgk";
        buildDepends = [
          auto-update base blaze-builder byteorder bytestring
          case-insensitive easy-file fast-logger http-types network unix
@@ -131220,6 +131363,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wai-middleware-gunzip" = callPackage
+    ({ mkDerivation, base, bytestring, http-types, streaming-commons
+     , wai
+     }:
+     mkDerivation {
+       pname = "wai-middleware-gunzip";
+       version = "0.0.2";
+       sha256 = "0rbvpw4y4qr2mhijlybzwwd12mkhrwmxlrhj2q0mq9diwhp597dx";
+       buildDepends = [
+         base bytestring http-types streaming-commons wai
+       ];
+       homepage = "https://github.com/twittner/wai-middleware-gunzip";
+       description = "WAI middleware to unzip request bodies";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "wai-middleware-headers" = callPackage
     ({ mkDerivation, base, bytestring, http-types, wai }:
      mkDerivation {
@@ -131784,8 +131943,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp-tls";
-       version = "3.0.4";
-       sha256 = "03k8iynz586cdjjh4nyrlbs8c864d305swrf4xkf55r9l3klsbg4";
+       version = "3.0.4.1";
+       sha256 = "0p9472j9sa584gw8i1jg89rhbl0kv6r1d6naiqfmmirxii4pmp4y";
        buildDepends = [
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
@@ -134393,6 +134552,7 @@ self: {
        homepage = "https://github.com/k0ral/xml-conduit-parse";
        description = "Streaming XML parser based on conduits";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-conduit-writer" = callPackage
@@ -135545,6 +135705,7 @@ self: {
        testDepends = [ base doctest ];
        description = "Lens interface to yaml-light";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml-rpc" = callPackage
@@ -135916,6 +136077,7 @@ self: {
          resourcet safe shakespeare template-haskell text time transformers
          unordered-containers wai yesod-core yesod-form yesod-persistent
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/";
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
@@ -135939,6 +136101,7 @@ self: {
          base bytestring hspec monad-logger mtl persistent-sqlite resourcet
          text xml-conduit yesod yesod-auth yesod-test
        ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/wuzzeb/yesod-auth-account";
        description = "An account authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
@@ -135964,6 +136127,7 @@ self: {
          base bytestring hspec monad-logger mtl persistent-sqlite resourcet
          text xml-conduit yesod yesod-auth yesod-auth-account yesod-test
        ];
+       jailbreak = true;
        homepage = "https://github.com/meteficha/yesod-auth-account-fork";
        description = "An account authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
@@ -136052,8 +136216,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-hashdb";
-       version = "1.4.2.1";
-       sha256 = "1gc8049xvzrkqb91fpdrzr54byxag6rkqvb8650q4scpr09vzdpl";
+       version = "1.4.2.2";
+       sha256 = "0s2qmpn4iwzdpps7yqcwb63cp8v1za9fp4amg0qc6b0pllzr616r";
        buildDepends = [
          base bytestring cryptohash persistent pwstore-fast text yesod-auth
          yesod-core yesod-form yesod-persistent
@@ -136283,8 +136447,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-core";
-       version = "1.4.10";
-       sha256 = "0wkicd71r87rnfiyx3264a1836mv8asnq2rvmp23qkjdp453ac7w";
+       version = "1.4.11";
+       sha256 = "1lfbpfv43vjxx8r1yf8py64sai14abwwq7395gs45vk059zi5hfs";
        buildDepends = [
          aeson auto-update base blaze-builder blaze-html blaze-markup
          bytestring case-insensitive cereal clientsession conduit
@@ -136326,6 +136490,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "yesod-crud-persist" = callPackage
+    ({ mkDerivation, base, lens, persistent, text, transformers, wai
+     , yesod-core, yesod-form, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-crud-persist";
+       version = "0.1.0.0";
+       sha256 = "0kzigyggzxv4ps8a15bhk8ngxn15inp630x0v3kn0j1xdmj7inpw";
+       buildDepends = [
+         base lens persistent text transformers wai yesod-core yesod-form
+         yesod-persistent
+       ];
+       homepage = "google.com";
+       description = "Flexible CRUD subsite usable with Yesod and Persistent";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-datatables" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, data-default
      , HUnit, monad-control, persistent, persistent-sqlite
@@ -136719,6 +136901,7 @@ self: {
          base blaze-builder conduit hspec persistent persistent-sqlite text
          wai-extra yesod-core
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/";
        description = "Some helpers for using Persistent from Yesod";
        license = stdenv.lib.licenses.mit;
@@ -137085,6 +137268,7 @@ self: {
        homepage = "https://github.com/andrewthad/yesod-table";
        description = "HTML tables for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-tableview" = callPackage
@@ -138118,10 +138302,11 @@ self: {
      mkDerivation {
        pname = "zippers";
        version = "0.2";
+       revision = "1";
        sha256 = "1rlf01dc6dcy9sx89npsisdz1yg9v4h2byd6ms602bxnmjllm1ls";
+       editedCabalFile = "3e27022f7ed27e35e73ed36f3aa6b396c7e7b52e864965b8d3cd4dab8394e960";
        buildDepends = [ base lens profunctors semigroupoids ];
        testDepends = [ base directory doctest filepath ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/zippers/";
        description = "Traversal based zippers";
        license = stdenv.lib.licenses.bsd3;

From 62f2b24c8379d8f3c25a7e44b178de9f28903f4d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 9 Jun 2015 15:13:00 +0200
Subject: [PATCH 0920/2322] haskell-fft: disable failing 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 e33e0fe2590..8ee927f6fb8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -844,4 +844,7 @@ self: super: {
   # https://github.com/jaspervdj/websockets/issues/104
   websockets = dontCheck super.websockets;
 
+  # Avoid spurious test suite failures.
+  fft = dontCheck super.fft;
+
 }

From 6455404f1b6cb59f1f0b5af22be374d3a7b965a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Tue, 9 Jun 2015 11:48:43 +0200
Subject: [PATCH 0921/2322] mlt-qt4: update from 0.9.2 to 0.9.6

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

diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 389e2385f98..7cfbc8dfb87 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mlt-${version}";
-  version = "0.9.2";
+  version = "0.9.6";
 
   src = fetchurl {
     url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz";
-    sha256 = "0vk1i2yrny6dbip4aha25ibgv4m2rdhpxmz6a74q9wz1cgzbb766";
+    sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh";
   };
 
   buildInputs = [

From 651e83ac1049e16e8311be3796a315d907e740cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 1 Jun 2015 21:33:47 +0200
Subject: [PATCH 0922/2322] gnutls: set certificate location (close #8121)

This is a fast fix; it might be best to use $SSL_CERT_FILE.
Tested on vlc with youtube https URLs.
Discussed also on #8118. Feel free to discuss further improvements on #8247.
---
 pkgs/development/libraries/gnutls/generic.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 6f2361f1658..8c169153a66 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
   inherit src patches;
 
   configureFlags = [
+    # FIXME: perhaps use $SSL_CERT_FILE instead
+    "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
     "--disable-dependency-tracking"
     "--enable-fast-install"
   ] ++ stdenv.lib.optional guileBindings

From fdc8e6beff9564b00b89871e0f432b9ee61f5c36 Mon Sep 17 00:00:00 2001
From: Paulus Esterhazy <pesterhazy@gmail.com>
Date: Tue, 9 Jun 2015 17:45:00 +0200
Subject: [PATCH 0923/2322] httpie: bump version to fix ImportError

Fixes https://github.com/jakubroztocil/httpie/issues/314
---
 pkgs/tools/networking/httpie/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index a31511beeab..cc1531961b3 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "httpie-0.8.0";
+  name = "httpie-0.9.2";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/h/httpie/${name}.tar.gz";
-    sha256 = "16f3scm794plxbyw7a5b4541hb2psa85kfi98g83785i2qwz98ag";
+    sha256 = "0s0dsj1iimn17h0xyziwk4kz4ga9s0vy9rhzixh8dna32za84fdg";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ pygments requests2 ];
+  propagatedBuildInputs = with pythonPackages; [ pygments requests2 curses ];
 
   doCheck = false;
 

From b120a737fd3f2871af7d57c88c010884041ce6d4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 9 Jun 2015 11:43:00 -0500
Subject: [PATCH 0924/2322] rPackages.BayesLogit: build with openblas

---
 pkgs/development/r-modules/default.nix                    | 1 +
 pkgs/development/r-modules/patches/BayesLogit_cblas.patch | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 11d7193edee..4bad1224cc1 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1087,6 +1087,7 @@ let
 
     BayesLogit = old.BayesLogit.overrideDerivation (attrs: {
       patches = [ ./patches/BayesLogit.patch ];
+      buildInputs = (attrs.buildInputs or []) ++ [ pkgs.openblasCompat ];
     });
 
     BayesBridge = old.BayesBridge.overrideDerivation (attrs: {
diff --git a/pkgs/development/r-modules/patches/BayesLogit_cblas.patch b/pkgs/development/r-modules/patches/BayesLogit_cblas.patch
index 4c8778c4697..ef776f3531d 100644
--- a/pkgs/development/r-modules/patches/BayesLogit_cblas.patch
+++ b/pkgs/development/r-modules/patches/BayesLogit_cblas.patch
@@ -6,7 +6,7 @@ diff -ru -x '*~' BayesLogit_orig/src/Makevars BayesLogit/src/Makevars
  OBJECTS = Matrix.o MatrixFrame.o RRNG.o RNG.o FSF_nmix.o LogitWrapper.o \
  	PolyaGamma.o PolyaGammaAlt.o PolyaGammaSP.o InvertY.o
 -PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) 
-+PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -llapack -lf77blas -lcblas -latlas -lgfortran
++PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -lopenblas
  # PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW -Wall -pedantic -Wextra
  PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW 
  

From 77aa1c990ec673446c38b4c733f8ad7db9e66af1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 9 Jun 2015 11:47:12 -0500
Subject: [PATCH 0925/2322] rPackages.Mposterior: build with openblas

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 4bad1224cc1..2f387599d6d 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -997,7 +997,7 @@ let
     });
 
     Mposterior = old.Mposterior.overrideDerivation (attrs: {
-      PKG_LIBS = "-L${pkgs.atlas}/lib -lf77blas -latlas";
+      PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas";
     });
 
     qtbase = old.qtbase.overrideDerivation (attrs: {

From 58754130cc3f34169de05f7ef14a9102221f5f13 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 9 Jun 2015 11:47:26 -0500
Subject: [PATCH 0926/2322] rPackages.slfm: build with openblas

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 2f387599d6d..2d211ed9a5b 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1037,7 +1037,7 @@ let
     });
 
     slfm = old.slfm.overrideDerivation (attrs: {
-      PKG_LIBS = "-L${pkgs.atlas}/lib -lf77blas -latlas";
+      PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas";
     });
 
     SamplerCompare = old.SamplerCompare.overrideDerivation (attrs: {

From 8245caedf158ca91997412f8797f1802e2c8a925 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 9 Jun 2015 11:47:40 -0500
Subject: [PATCH 0927/2322] rPackages.SamplerCompare: build with openblas

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 2d211ed9a5b..2f8c22fe865 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1041,7 +1041,7 @@ let
     });
 
     SamplerCompare = old.SamplerCompare.overrideDerivation (attrs: {
-      PKG_LIBS = "-L${pkgs.atlas}/lib -lf77blas -latlas";
+      PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas";
     });
 
     gputools = old.gputools.overrideDerivation (attrs: {

From 746df7b034458c0ae27ebc99c0236f0d88807304 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 9 Jun 2015 10:26:05 -0700
Subject: [PATCH 0928/2322] remove now-applied process-extras patch

---
 pkgs/development/haskell-modules/configuration-ghc-head.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index dabdeec3a23..37cb69160b0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -53,10 +53,6 @@ self: super: {
   # https://github.com/haskell-suite/haskell-src-exts/issues/224
   haskell-src-exts = dontCheck super.haskell-src-exts;
 
-  process-extras = appendPatch super.process-extras (pkgs.fetchpatch {
-    url = "https://github.com/seereason/process-extras/pull/4.patch";
-    sha256 = "0wfd8dmr0a4dvgp6nhmkznxq1nq8ciprsacn1canmkzjkdidn6kj";
-  });
   mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch {
     url = "https://github.com/snoyberg/mono-traversable/pull/77.patch";
     sha256 = "1qrvrh3cqfkymi5yb9y9z88rq4n7ag0ac2k00mcnqh4dz1vh4fg1";

From cae833255f6e1d95fed6fb162764aba81cb7b84e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 1 Jun 2015 16:17:02 +0200
Subject: [PATCH 0929/2322] add minitube: stand-alone Youtube video player

Close #8118.
---
 pkgs/applications/video/minitube/default.nix | 43 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/video/minitube/default.nix

diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
new file mode 100644
index 00000000000..b9c4de0811d
--- /dev/null
+++ b/pkgs/applications/video/minitube/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon_backend_vlc, qt4
+# "Free" API key generated by nckx <tobias.geerinckx.rice@gmail.com>
+, withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
+
+let version = "2.4"; in
+stdenv.mkDerivation {
+  name = "minitube-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "0mm8v2vpspwxh2fqaykb381v6r9apywc1b0x8jkcbp7s43w10lp5";
+    rev = version;
+    repo = "minitube";
+    owner = "flaviotordini";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Stand-alone YouTube video player";
+    longDescription = ''
+      Watch YouTube videos in a new way: you type a keyword, Minitube gives
+      you an endless video stream. Minitube is not about cloning the YouTube
+      website, it aims to create a new TV-like experience.
+    '';
+    homepage = http://flavio.tordini.org/minitube;
+    license = licenses.gpl3Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ phonon phonon_backend_vlc qt4 ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  configurePhase = ''
+    qmake PREFIX=$out "DEFINES += APP_GOOGLE_API_KEY=${withAPIKey}"
+  '';
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    wrapProgram $out/bin/minitube \
+      --prefix QT_PLUGIN_PATH : "${phonon_backend_vlc}/lib/kde4/plugins"
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a95784353b4..37045d696e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11732,6 +11732,8 @@ let
 
   minidjvu = callPackage ../applications/graphics/minidjvu { };
 
+  minitube = callPackage ../applications/video/minitube { };
+
   mimms = callPackage ../applications/audio/mimms {};
 
   mirage = callPackage ../applications/graphics/mirage {};

From 0b68b920624bb2ea1d09db2a45e598c0bec7e552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 9 Jun 2015 20:11:41 +0200
Subject: [PATCH 0930/2322] nixos i18n.consoleFont: choose a different default

Distros often choose Terminus as the default, and it supports some
non-ASCII characters that we use in config. Fixes #8107.
---
 nixos/modules/config/i18n.nix                          | 2 +-
 nixos/modules/installer/tools/nixos-generate-config.pl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index f2aacf9b292..3622b21626b 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -43,7 +43,7 @@ in
 
       consoleFont = mkOption {
         type = types.str;
-        default = "lat9w-16";
+        default = "Lat2-Terminus16";
         example = "LatArCyrHeb-16";
         description = ''
           The font used for the virtual consoles.  Leave empty to use
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index ec3137ede4f..a929e1eb826 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -495,7 +495,7 @@ $bootLoaderConfig
 
   # Select internationalisation properties.
   # i18n = {
-  #   consoleFont = "lat9w-16";
+  #   consoleFont = "Lat2-Terminus16";
   #   consoleKeyMap = "us";
   #   defaultLocale = "en_US.UTF-8";
   # };

From 21f8130dda30f74cdd399b445b687f43f86cf1a5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 9 Jun 2015 14:58:34 +0200
Subject: [PATCH 0931/2322] cassandra 2.1.5 -> 2.1.6

---
 pkgs/servers/nosql/cassandra/2.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix
index bbac243c7a0..5d99af41cb2 100644
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/pkgs/servers/nosql/cassandra/2.1.nix
@@ -10,8 +10,8 @@
 
 let
 
-  version = "2.1.5";
-  sha256 = "1zrnmwyxcrdphcbi82ps0qp81yrn1gny4iv2wa4n4mwwp8pqwxid";
+  version = "2.1.6";
+  sha256 = "1xq96h33f4xmld114mrd57z396f9ykcj0xy50fnnhy5mhafkn4n2";
 
 in
 

From b229cfc89489ab6ed9c1897ce6fc134748b086fa Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 9 Jun 2015 20:20:52 +0200
Subject: [PATCH 0932/2322] mcelog -> 119

- Fix clobbered status variable in server_ping
- Avoid prefilling memory database when DMI is disabled
---
 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 0a4d3797ce2..1706b8b87fa 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "118"; in
+let version = "119"; in
 stdenv.mkDerivation {
   name = "mcelog-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "04hzadxyqlnhjn328bv711lpkipfn5k3gszswydmvvjpis2vhbrr";
+    sha256 = "04zm8pa7r6awjgza8m048srvqcyayzdzw93vl8yrjzhh37p5m4gp";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

From e1af50c4c4c0332136283e9231f0a32ac11f2b90 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 9 Jun 2015 20:37:03 +0200
Subject: [PATCH 0933/2322] byzanz: add -Wno-error for deprecated declarations
 to fix the build

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

diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix
index 79b9ab92ad9..abacdf7a2d5 100644
--- a/pkgs/applications/video/byzanz/default.nix
+++ b/pkgs/applications/video/byzanz/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
     ./autogen.sh --prefix=$out
   '';
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
   buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
 
   meta = with stdenv.lib; {

From 406428d6a4641f0a1a05e58a3b09f7d183059cfd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 9 Jun 2015 13:48:36 -0500
Subject: [PATCH 0934/2322] haskellPackages.bindings-levmar: build with
 openblas

---
 pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index dbb7aadb4a2..7f55abc4dda 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -124,6 +124,14 @@ self: super: {
     extraLibraries = [ pkgs.openblasCompat ];
   });
 
+  bindings-levmar = overrideCabal super.bindings-levmar (drv: {
+    preConfigure = ''
+      sed -i bindings-levmar.cabal \
+          -e 's,extra-libraries: lapack blas,extra-libraries: openblas,'
+    '';
+    extraLibraries = [ pkgs.openblas ];
+  });
+
   # The Haddock phase fails for one reason or another.
   attoparsec-conduit = dontHaddock super.attoparsec-conduit;
   base-noprelude = dontHaddock super.base-noprelude;

From 7a87a1e73f951cc84181a6d5a0e39c6523d2576c Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lancelot@lancelotsix.com>
Date: Tue, 9 Jun 2015 20:49:24 +0200
Subject: [PATCH 0935/2322] Fix pythonPackages.networkx

---
 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 c324ae1c00c..4e99e61114c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15564,7 +15564,7 @@ let
       sha256 = "6380eb38d0b5770d7e50813c8a48ff7c373b2187b4220339c1adce803df01c59";
     };
 
-    buildInputs = with self; [ nose decorator ];
+    propagatedBuildInputs = with self; [ nose decorator ];
 
     meta = {
       homepage = "https://networkx.github.io/";

From 661ce66483b8f8850f50452531e34e5b7d553389 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 9 Jun 2015 14:31:19 -0500
Subject: [PATCH 0936/2322] haskellPackages.hmatrix: remove impure openblas
 path

---
 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 7f55abc4dda..03359133a5f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -122,6 +122,9 @@ self: super: {
   hmatrix = overrideCabal super.hmatrix (drv: {
     configureFlags = (drv.configureFlags or []) ++ [ "-fopenblas" ];
     extraLibraries = [ pkgs.openblasCompat ];
+    preConfigure = ''
+      sed -i hmatrix.cabal -e 's@/usr/lib/openblas/lib@${pkgs.openblasCompat}/lib@'
+    '';
   });
 
   bindings-levmar = overrideCabal super.bindings-levmar (drv: {

From 62b75c64d440d3102777470cf8cb7173cc805b01 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 10 Jun 2015 00:27:33 +0300
Subject: [PATCH 0937/2322] kernel-config: Fix 4.0 build on 32-bit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

KVM_COMPAT apparently enables 32-bit compability syscalls for KVM, and
as such can be enabled only on a 64-bit system.

Resolves error http://hydra.nixos.org/build/23014132/nixlog/1/raw:
GOT: #
GOT: # configuration written to .config
GOT: #
GOT: make[1]: Leaving directory '/tmp/nix-build-linux-config-4.0.5.drv-0/build'
GOT: make: Leaving directory '/tmp/nix-build-linux-config-4.0.5.drv-0/linux-4.0.5'
unused option: KVM_COMPAT
builder for ‘/nix/store/7kskdvmzs116f1fm55ghm0crjniw9q0a-linux-config-4.0.5.drv’ failed with exit code 255
---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index a972c4e60f8..cb7423f293a 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -396,7 +396,7 @@ with stdenv.lib;
     KVM_CLOCK? y
   ''}
   ${optionalString (versionAtLeast version "4.0") ''
-    KVM_COMPAT y
+    KVM_COMPAT? y
   ''}
   ${optionalString (versionAtLeast version "3.10") ''
     KVM_DEVICE_ASSIGNMENT? y

From ef9454709313cbebdf1263a63de220b39c0f670a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 10 Jun 2015 00:50:35 +0200
Subject: [PATCH 0938/2322] neovim -> 2015-06-09

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

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index f19c1b65e13..814b05ced36 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -3,18 +3,18 @@
 , luabitop, ncurses, perl, pkgconfig, unibilium
 , withJemalloc ? true, jemalloc }:
 
-let version = "2015-05-26"; in
+let version = "2015-06-09"; in
 stdenv.mkDerivation rec {
   name = "neovim-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0sszpqlq0yp6r62zgcjcmnllc058wzzh9ccvgb2jh9k19ksszyhc";
-    rev = "5a9ad68b258f33ebd7fa0a5da47b308f50f1e5e7";
+    sha256 = "1lycql0lwi7ynrsaln4kxybwvxb9fvganiq3ba4pnpcfgl155k1j";
+    rev = "6270d431aaeed71e7a8782411f36409ab8e0ee35";
     repo = "neovim";
     owner = "neovim";
   };
 
-  # FIXME: this is NOT the libvterm already in nixpkgs, but some NIH silliness:
+  # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness:
   neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation rec {
     name = "neovim-libvterm-${version}";
 

From d5b8dda0436a20c186728890dd0edf43c8911669 Mon Sep 17 00:00:00 2001
From: Anders Lundstedt <anders@anderslundstedt.se>
Date: Wed, 10 Jun 2015 02:32:33 +0200
Subject: [PATCH 0939/2322] mediatomb: fix hardcoded paths

---
 nixos/modules/services/misc/mediatomb.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix
index 23227548039..3f70bceb23b 100644
--- a/nixos/modules/services/misc/mediatomb.nix
+++ b/nixos/modules/services/misc/mediatomb.nix
@@ -49,10 +49,10 @@ let
     </server>
     <import hidden-files="no">
       <scripting script-charset="UTF-8">
-        <common-script>/nix/store/cngbzn39vidd6jm4wgzxfafqll74ybfa-mediatomb-0.12.1/share/mediatomb/js/common.js</common-script>
-        <playlist-script>/nix/store/cngbzn39vidd6jm4wgzxfafqll74ybfa-mediatomb-0.12.1/share/mediatomb/js/playlists.js</playlist-script>
+        <common-script>${pkgs.mediatomb}/share/mediatomb/js/common.js</common-script>
+        <playlist-script>${pkgs.mediatomb}/share/mediatomb/js/playlists.js</playlist-script>
         <virtual-layout type="builtin">
-          <import-script>/nix/store/cngbzn39vidd6jm4wgzxfafqll74ybfa-mediatomb-0.12.1/share/mediatomb/js/import.js</import-script>
+          <import-script>${pkgs.mediatomb}/share/mediatomb/js/import.js</import-script>
         </virtual-layout>
       </scripting>
       <mappings>

From 556562173cef5f499c46d664ebf26d99d90a66ad Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 10 Jun 2015 08:53:33 +0200
Subject: [PATCH 0940/2322] t1utils: update from 1.38 to 1.39, fixes
 CVE-2015-3905

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

diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix
index 5e473a5cd09..c00db07ed1f 100644
--- a/pkgs/tools/misc/t1utils/default.nix
+++ b/pkgs/tools/misc/t1utils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "t1utils-1.38";
+  name = "t1utils-1.39";
 
   src = fetchurl {
     url = "http://www.lcdf.org/type/${name}.tar.gz";
-    sha256 = "1pnxpjabjyzfjrp319wsq4acxw99c8nnsaalbz7nwamj8kkim7zw";
+    sha256 = "1i6ln194ns2g4j5zjlj4bfzxpkfpnxvy37n9baq3hywjqkjz7bhg";
   };
 
   meta = with stdenv.lib; {

From 7829a2c92e0aac11391af121504097be50d991c6 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 10 Jun 2015 09:00:47 +0200
Subject: [PATCH 0941/2322] chocolate-doom: update from 2.1.0 to 2.2.0

---
 pkgs/games/chocolate-doom/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix
index 75cee19c680..8bb55702c59 100644
--- a/pkgs/games/chocolate-doom/default.nix
+++ b/pkgs/games/chocolate-doom/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }:
+{ stdenv, autoreconfHook, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "chocolate-doom-2.1.0";
+  name = "chocolate-doom-2.2.0";
   src = fetchurl {
     url = "https://github.com/chocolate-doom/chocolate-doom/archive/${name}.tar.gz";
-    sha256 = "1qwnc5j3n99jk35c487mxsij04m4kpkqzkbrb8qwqlsnqllyh1s1";
+    sha256 = "0har8zcg3j41byxc3dx6a00aly8vpysf1q7h2qbw39nlrcghag7b";
   };
-  buildInputs = [ autoconf automake pkgconfig SDL SDL_mixer SDL_net ];
+  buildInputs = [ autoreconfHook pkgconfig SDL SDL_mixer SDL_net ];
   patchPhase = ''
     sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am
-    ./autogen.sh --prefix=$out
   '';
 
   enableParallelBuilding = true;

From da9115128cd5a200a82fc1d30c6ae1849fae2fb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 10 Jun 2015 09:16:04 +0200
Subject: [PATCH 0942/2322] qt4: disable parallel building again

There are still occasional problems on Hydra.
---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 8715af062c7..e4d1bae636c 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ perl pkgconfig which ];
 
-  enableParallelBuilding = true;
+  enableParallelBuilding = false;
 
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin
     "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";

From 957d9f6d574ac62d698424befb466e9b1376f82c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 10 Jun 2015 10:07:46 +0200
Subject: [PATCH 0943/2322] zeromq: update to version 4.1.1

Version 4.0.6 is "retired" and also failed to compile because its sha256
hash changed on the upstream site for some reason.
---
 pkgs/development/libraries/zeromq/4.x.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index 744703adb24..87417d1b77a 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, libuuid }:
+{ stdenv, fetchurl, libuuid, pkgconfig, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "zeromq-4.0.6";
+  name = "zeromq-4.1.1";
 
   src = fetchurl {
     url = "http://download.zeromq.org/${name}.tar.gz";
-    sha256 = "0arl8fy8d03xd5h0mgda1s5bajwg8iyh1kk4hd1420rpcxgkrj91";
+    sha256 = "1nxqvb1n8yy6953nv095riirrpmw4w340qd6sjm4cfdl0rbixmj3";
   };
 
-  buildInputs = [ libuuid ];
+  buildInputs = [ libuuid pkgconfig libsodium ];
 
   meta = with stdenv.lib; {
     branch = "4";

From 24a218b1cc114fea2a68c3215ed03f4af073ff9c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 10 Jun 2015 09:19:16 +0200
Subject: [PATCH 0944/2322] mcabber: enable tests

---
 .../networking/instant-messengers/mcabber/default.nix           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index 6c7e4797841..17ad6c25da7 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ];
 
   configureFlags = "--with-openssl=${openssl} --enable-modules --enable-otr";
+
+  doCheck = true;
   
   meta = with stdenv.lib; {
     homepage = http://mcabber.com/;

From bc4be1909918b1d962f488788091eb5dbc3fadb3 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 10 Jun 2015 10:16:01 +0200
Subject: [PATCH 0945/2322] sonic-visualiser: fix build

---
 pkgs/applications/audio/sonic-visualiser/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                      | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index 9cd1a3d0345..70162b9d185 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -3,7 +3,7 @@
 { stdenv, fetchurl, alsaLib, bzip2, fftw, jack2, libX11, liblo
 , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
 , libsndfile, pkgconfig, libpulseaudio, qt5, redland
-, rubberband, serd, sord, vampSDK
+, rubberband, serd, sord, vampSDK, fftwFloat
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ libsndfile qt5.base fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
+    [ libsndfile qt5.base fftw fftwFloat bzip2 librdf rubberband
       libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
       serd
       sord
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cf9fed11ae..edde05d0ea4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12405,7 +12405,6 @@ let
   sonic-visualiser = callPackage ../applications/audio/sonic-visualiser {
     inherit (pkgs.vamp) vampSDK;
     inherit (pkgs.xlibs) libX11;
-    fftw = pkgs.fftwSinglePrec;
   };
 
   sox = callPackage ../applications/misc/audio/sox { };

From 6d859229e143f76a5cd5769be4d8acc97f0afa1b Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 10 Jun 2015 08:36:55 +0000
Subject: [PATCH 0946/2322] Remove unnecessary option. My mistake...

---
 nixos/modules/services/databases/mysql.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index fec238b8645..1cdecedfc77 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -77,14 +77,6 @@ in
         description = "Location of the file which stores the PID of the MySQL server";
       };
 
-      enableSocketAccess = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Whether to grant local processes access to the mysqld socket.
-        '';
-      };
-
       extraOptions = mkOption {
         default = "";
         example = ''

From 43a7006495a364d122b23b2f2b140a0db2442aaf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 9 Jun 2015 16:38:53 +0200
Subject: [PATCH 0947/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/31af6a881c6bbed08ca3abedc96c5bd9fe95878d
 with hackage2nix revision c3122d617e69efe091549cec44d578bba41515f1

---
 .../haskell-modules/hackage-packages.nix      | 127 ++++++++++++------
 1 file changed, 88 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index add826cd139..936ec025a60 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7628,8 +7628,8 @@ self: {
      }:
      mkDerivation {
        pname = "HandsomeSoup";
-       version = "0.4";
-       sha256 = "0h760vfqgg40h50ybqpgpzh0skgbggx4xj1zaag3ca6l22950w36";
+       version = "0.4.2";
+       sha256 = "1yzfrvivvxwlaiqwbjx27rxwq9mmnnpb512vwklzw7nyzg9xmqha";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -25415,8 +25415,8 @@ self: {
      }:
      mkDerivation {
        pname = "bitcoin-api";
-       version = "0.12.0";
-       sha256 = "09sh56wmkkgm0gzsai94q1qa2dlf1s7nfxl0yzim0s10p71bw7wr";
+       version = "0.12.1";
+       sha256 = "0c1ydggik4k3vj93bqk53privyblkwhd32jizw25qk5j34axwy69";
        buildDepends = [
          aeson base base58string binary bitcoin-block bitcoin-script
          bitcoin-tx bitcoin-types bytestring hexstring lens lens-aeson text
@@ -36402,6 +36402,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cron-compat" = callPackage
+    ({ mkDerivation, attoparsec, base, cron, derive, hspec
+     , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text
+     , time, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "cron-compat";
+       version = "0.2.6";
+       sha256 = "0km70j3xfqvpra9mvbxpvpqd7arjjfcpazmilvmj6kjxk6cw7pfx";
+       buildDepends = [
+         attoparsec base mtl mtl-compat old-locale text time
+         transformers-compat
+       ];
+       testDepends = [
+         attoparsec base cron derive hspec hspec-expectations QuickCheck
+         text time transformers
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/michaelxavier/cron";
+       description = "Cron datatypes and Attoparsec parser";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "cruncher-types" = callPackage
     ({ mkDerivation, aeson, base, containers, hlint, lens, text }:
      mkDerivation {
@@ -46647,13 +46670,12 @@ self: {
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "0.7.2.1";
-       sha256 = "0zhasybpvmi3f0kb2pipb03jnv4d710gcr6mphszgkj5179wvad2";
+       version = "0.8.0.0";
+       sha256 = "0p1z7xs3412s2hnv7pc18y1gx65p5hf09038n96vl22kvc9d84ww";
        buildDepends = [
          aeson async attoparsec base bytestring cereal containers network
          protobuf random sodium stm text time unordered-containers uuid
        ];
-       jailbreak = true;
        homepage = "http://github.com/YoEight/eventstore";
        description = "EventStore TCP Client";
        license = stdenv.lib.licenses.bsd3;
@@ -64845,17 +64867,18 @@ self: {
      , either, exceptions, http-client, http-client-tls, http-types, jwt
      , lens, mtl, network-uri, postgresql-simple, resource-pool, safe
      , stm, text, time, transformers, unordered-containers, utf8-string
-     , wai, wai-lens, webcrank-wai, wreq
+     , wai, wai-lens, webcrank, webcrank-wai, wreq
      }:
      mkDerivation {
        pname = "hipbot";
-       version = "0.3.0.2";
-       sha256 = "04czq0ix78amd217cf5yj8yvkr4hpsaa38rdmjish40b63crnba3";
+       version = "0.5";
+       sha256 = "0acy9bp2dwszd01l514nx2crdxgb356k18pm9ravddljxr24n1hs";
        buildDepends = [
          aeson base bifunctors blaze-builder bytestring either exceptions
          http-client http-client-tls http-types jwt lens mtl network-uri
          postgresql-simple resource-pool safe stm text time transformers
-         unordered-containers utf8-string wai wai-lens webcrank-wai wreq
+         unordered-containers utf8-string wai wai-lens webcrank webcrank-wai
+         wreq
        ];
        jailbreak = true;
        homepage = "https://github.com/purefn/hipbot";
@@ -75489,8 +75512,8 @@ self: {
      }:
      mkDerivation {
        pname = "io-streams";
-       version = "1.3.0.0";
-       sha256 = "029qp0jfap6jczxdi2my1g4vcp8pr4zkxp64xfl7cyiigbapkimw";
+       version = "1.3.1.0";
+       sha256 = "1fic83lgvyji75gyx8c9ik9lj6jf65wbqmzp30siqmkhdp9y1rxf";
        buildDepends = [
          attoparsec base bytestring bytestring-builder network primitive
          process text time transformers vector zlib-bindings
@@ -81169,6 +81192,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lentil" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
+     , filepath, hspec, natural-sort, optparse-applicative, parsec
+     , regex-tdfa
+     }:
+     mkDerivation {
+       pname = "lentil";
+       version = "0.1.0.2";
+       revision = "2";
+       sha256 = "104f1hyd9fp0b0ibqr292bpx8zgmw8gi7m3br2zv8m19rrnwgn4v";
+       editedCabalFile = "fb144e396ba79b4418a347b981356f5d15a1c33179bc8c7c154de7c5cb0d3d4c";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         ansi-wl-pprint base csv directory filemanip filepath natural-sort
+         optparse-applicative parsec regex-tdfa
+       ];
+       testDepends = [
+         ansi-wl-pprint base csv directory filemanip filepath hspec
+         natural-sort optparse-applicative parsec regex-tdfa
+       ];
+       homepage = "http://www.ariis.it/static/articles/lentil/page.html";
+       description = "frugal issue tracker";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "level-monad" = callPackage
     ({ mkDerivation, base, fmlist }:
      mkDerivation {
@@ -95853,7 +95902,9 @@ self: {
      mkDerivation {
        pname = "pandoc-csv2table";
        version = "1.0.1";
+       revision = "1";
        sha256 = "0b4xszf9bzfhrjgy2cymryab58zhh4jwv9p8g2hiqgrxix8jr1qb";
+       editedCabalFile = "0924cc418394f855f93486ee6fb3bae991112c3e63df74f95afa6c2d62b09299";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base csv pandoc pandoc-types text ];
@@ -101921,8 +101972,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "2.4.0";
-       sha256 = "1l2zhj12jwsavljx0r6qmz44w7k5bwckwg2wcz38qd6km4wy3ppw";
+       version = "2.5.0";
+       sha256 = "120pamm3rg2iahbl23y90wbcwdhgjvvsfzlkhi61c97xfybvb08c";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -107099,8 +107150,8 @@ self: {
      }:
      mkDerivation {
        pname = "rethinkdb";
-       version = "1.16.0.0";
-       sha256 = "125gg719isf60yv5yj0frkg92bp42cb43d4qzs7jqic1wvhx32yy";
+       version = "2.0.0.0";
+       sha256 = "09digdn4a9vsmanpj6d2wn6kh59r05cfwjk4xq22iszzjrxami6d";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -107109,9 +107160,8 @@ self: {
          unordered-containers utf8-string vector
        ];
        testDepends = [ base doctest ];
-       jailbreak = true;
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
-       description = "A driver for RethinkDB 1.16";
+       description = "A driver for RethinkDB 2.0";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -128556,12 +128606,12 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.1.3";
-       sha256 = "19zsjvn977rwmlgc062wwzbmdgxxxcf4ad6g64ih4n3q707r6gka";
+       version = "0.1.4";
+       sha256 = "19ryx71hyv1jg24yn19nfn6x1956a3a8bjhbdl4fnjnln3h7xkmv";
        buildDepends = [ attoparsec base blaze-builder bytestring ];
        testDepends = [
-         attoparsec base bytestring derive HUnit lens QuickCheck
-         quickcheck-instances tasty tasty-hunit tasty-quickcheck
+         attoparsec base blaze-builder bytestring derive HUnit lens
+         QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/Soostone/uri-bytestring";
        description = "Haskell URI parsing as ByteStrings";
@@ -131632,8 +131682,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "wai-routes";
-       version = "0.6.2";
-       sha256 = "04h0npgg6jfpzgg7g6kwbpkg3k148aq9jb3561r8j7fm6jmmynab";
+       version = "0.7.0";
+       sha256 = "1adiijvnwgm7j3qdr5ngxcc59amzcphgww3drj308hq278fpac08";
        buildDepends = [
          aeson base blaze-builder bytestring containers http-types mtl
          path-pieces random template-haskell text wai
@@ -132401,8 +132451,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "webcrank";
-       version = "0.2.1";
-       sha256 = "0px4dy4crivkga0h2ca9j6fxlzwyl8qm8xzd2xyllqm2gzvcc3l7";
+       version = "0.2.2";
+       sha256 = "1rgvpp2526lmly2fli65mygplfc6wzqcw5fkn7gq4fcrmql2cisj";
        buildDepends = [
          attoparsec base blaze-builder bytestring case-insensitive either
          exceptions http-date http-media http-types lens mtl semigroups text
@@ -132442,8 +132492,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "webcrank-wai";
-       version = "0.2";
-       sha256 = "02d6hsgx70mcghz1xrszf1jnl62alki3ch7wacp35s8jz79xrccw";
+       version = "0.2.1";
+       sha256 = "13db2hpyvzpx9i43d8pryq7f87zlajpfpf0h6biva28l9qamy1yv";
        buildDepends = [
          base bytestring exceptions lens mtl unix-compat
          unordered-containers wai wai-lens webcrank webcrank-dispatch
@@ -134539,8 +134589,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "xml-conduit-parse";
-       version = "0.2.0.0";
-       sha256 = "08dvaqfwi9gaa6xihyh2mksplid3xlfa3qb22glnmrcn37vxpphx";
+       version = "0.2.0.1";
+       sha256 = "04cs7bfdyia56vp9khdszxap1ri2riymmhsdb8shkcypf4ndhyyw";
        buildDepends = [
          base conduit conduit-parse containers exceptions parsers text
          xml-conduit xml-types
@@ -136769,15 +136819,15 @@ test/package-dump/ghc-7.10.txt";
      , containers, country-codes, data-default, directory, fast-logger
      , hamlet, hjsmin, http-conduit, http-types, lifted-base, mangopay
      , monad-control, monad-logger, persistent, persistent-postgresql
-     , persistent-template, resourcet, shakespeare, shakespeare-css
-     , shakespeare-js, shakespeare-text, template-haskell, text, time
-     , wai, wai-extra, wai-logger, warp, yaml, yesod, yesod-auth
-     , yesod-core, yesod-form, yesod-persistent, yesod-static
+     , persistent-template, resourcet, shakespeare, template-haskell
+     , text, time, wai, wai-extra, wai-logger, warp, yaml, yesod
+     , yesod-auth, yesod-core, yesod-form, yesod-persistent
+     , yesod-static
      }:
      mkDerivation {
        pname = "yesod-mangopay";
-       version = "1.11";
-       sha256 = "1j6dibg7l0g3hykwvhxm9n898gg06mrgyg89yjbv31pm4mfvycsn";
+       version = "1.11.1";
+       sha256 = "0haz7zd9s9c12fcz11wkhw50hni08g2an1f65bd6cj871zzz3mnl";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -136785,8 +136835,7 @@ test/package-dump/ghc-7.10.txt";
          country-codes data-default directory fast-logger hamlet hjsmin
          http-conduit http-types lifted-base mangopay monad-control
          monad-logger persistent persistent-postgresql persistent-template
-         resourcet shakespeare shakespeare-css shakespeare-js
-         shakespeare-text template-haskell text time wai wai-extra
+         resourcet shakespeare template-haskell text time wai wai-extra
          wai-logger warp yaml yesod yesod-auth yesod-core yesod-form
          yesod-persistent yesod-static
        ];

From 07579409cc6919ff0dc09955844349c3bd461246 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 10 Jun 2015 02:38:23 +0200
Subject: [PATCH 0948/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/cf0a9dd31e738583eaf35ecfa6064360efa55673
 with hackage2nix revision c3122d617e69efe091549cec44d578bba41515f1

---
 .../haskell-modules/hackage-packages.nix      | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 936ec025a60..d29bddf0c39 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -30191,8 +30191,8 @@ self: {
      }:
      mkDerivation {
        pname = "cf";
-       version = "0.3";
-       sha256 = "06r289lb3aq9wh2xggpg7pbxf60wkz1fmdy7ibyawa1sxpprrs07";
+       version = "0.4";
+       sha256 = "172nm38gvjriznnyks958bfzwd2zy59662i6zjzvj3nr0kdkiiap";
        buildDepends = [ base ];
        testDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -52320,8 +52320,8 @@ self: {
      }:
      mkDerivation {
        pname = "getopt-generics";
-       version = "0.7";
-       sha256 = "1r1z13n0s5vxxcxwwfmk8dplah12qdyb0jnjx2hx239hvy2l1bzc";
+       version = "0.7.1";
+       sha256 = "0jrnasd9lw7ffim0ski5b1mdislvs27n0i37lcbv51rgsl5wm458";
        buildDepends = [
          base base-compat base-orphans generics-sop tagged
        ];
@@ -67398,8 +67398,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.2.0";
-       sha256 = "1a1kjawmf61znikdg9kw34rqhlqhijb00b1dk1w9s8nx52rcrlaa";
+       version = "0.3.0";
+       sha256 = "0hvnb3svs7rh8c6afsp5rs6wdld2pllr5fvjhmlc143p40akck25";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -71863,8 +71863,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-streams";
-       version = "0.8.3.1";
-       sha256 = "13fdwyq50d5gipvdxmi125bn7aqhc3zqbi8jikir3l8bigfby5w0";
+       version = "0.8.3.2";
+       sha256 = "1hyg3fyhysxfbqks3y7rkbzx8j0hxkxlqdcbx77cihvz9j3ddzyk";
        buildDepends = [
          aeson attoparsec base base64-bytestring blaze-builder bytestring
          case-insensitive directory HsOpenSSL http-common io-streams mtl
@@ -78329,8 +78329,8 @@ self: {
      }:
      mkDerivation {
        pname = "keera-hails-reactive-fs";
-       version = "0.0.3.3";
-       sha256 = "1j8nlzaalmf82jhri8m12hl6vmg6y4amwvb1gv5dld41cz6sdv08";
+       version = "0.0.3.4";
+       sha256 = "1yinlhp08xxdlbnm90gnwbr1h9sp8r741ihd8kihy1yfqzkp85cy";
        buildDepends = [
          base directory fsnotify keera-hails-reactivevalues system-filepath
        ];
@@ -133204,13 +133204,12 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "wl-pprint-extras";
-       version = "3.5.0.4";
-       sha256 = "0mvg5vff574xvrdbdwnyy71kxv0cp0q5vv8fb12fbgydnvsy3mbl";
+       version = "3.5.0.5";
+       sha256 = "13wdx7l236yyv9wqsgcjlbrm5gk1bmw1z2lk4b21y699ly2imhm9";
        buildDepends = [
          base containers nats semigroupoids semigroups text utf8-string
        ];
        testDepends = [ base HUnit test-framework test-framework-hunit ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/wl-pprint-extras/";
        description = "A free monad based on the Wadler/Leijen pretty printer";
        license = stdenv.lib.licenses.bsd3;

From 085a0e8d242765c1ab348f12cd606c281223fc73 Mon Sep 17 00:00:00 2001
From: Robbin C <robbinch33@gmail.com>
Date: Wed, 10 Jun 2015 17:34:51 +0800
Subject: [PATCH 0949/2322] dvd-slideshow: Add package.

This adds dvd-slideshow, a suite of command line programs that creates a
slideshow-style video from groups of pictures.
---
 .../video/dvd-slideshow/default.nix           | 69 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 71 insertions(+)
 create mode 100644 pkgs/applications/video/dvd-slideshow/default.nix

diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix
new file mode 100644
index 00000000000..94e19cb7327
--- /dev/null
+++ b/pkgs/applications/video/dvd-slideshow/default.nix
@@ -0,0 +1,69 @@
+{ stdenv, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbisTools }:
+
+let
+  wrapper = writeScript "dvd-slideshow.sh" ''
+      #!/bin/bash
+      # wrapper script for dvd-slideshow programs
+      export PATH=${cdrtools}/bin:${dvdauthor}/bin:${ffmpeg}/bin:${imagemagick}/bin:${lame}/bin:${mjpegtools}/bin:${sox}/bin:${transcode}/bin:${vorbisTools}/bin:$PATH
+
+      dir=`dirname "$0"`
+      exe=`basename "$0"`
+      case "$exe" in
+        dvd-slideshow)
+          # use mpeg2enc by default as ffmpeg is known to crash.
+          # run dvd-slideshow.ffmpeg to force ffmpeg.
+          "$dir/dvd-slideshow.real" -mpeg2enc $@
+          ;;
+
+        dvd-slideshow.ffmpeg)
+          "$dir/dvd-slideshow.real" $@
+          ;;
+
+        *)
+          "$dir/$exe.real" $@
+          ;;
+      esac
+    '';
+
+in stdenv.mkDerivation rec {
+  name = "dvd-slideshow";
+  version = "0.8.4-2";
+  src = fetchurl {
+    url = "mirror://sourceforge/dvd-slideshow/files/${name}-${version}.tar.gz";
+    sha256 = "17c09aqvippiji2sd0pcxjg3nb1mnh9k5nia4gn5lhcvngjcp1q5";
+  };
+
+  patchPhase = ''
+    # fix upstream typos
+    substituteInPlace dvd-slideshow \
+      --replace "version='0.8.4-1'" "version='0.8.4-2'" \
+      --replace "mymyecho" "myecho" 
+  '';
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp dvd-slideshow         "$out/bin/dvd-slideshow.real"
+    cp dvd-menu              "$out/bin/dvd-menu.real"
+    cp dir2slideshow         "$out/bin/dir2slideshow.real"
+    cp gallery1-to-slideshow "$out/bin/gallery1-to-slideshow.real"
+    cp jigl2slideshow        "$out/bin/jigl2slideshow.real"
+
+    cp ${wrapper} "$out/bin/dvd-slideshow.sh"
+    ln -s dvd-slideshow.sh "$out/bin/dvd-slideshow"
+    ln -s dvd-slideshow.sh "$out/bin/dvd-slideshow.ffmpeg"
+    ln -s dvd-slideshow.sh "$out/bin/dvd-menu"
+    ln -s dvd-slideshow.sh "$out/bin/dir2slideshow"
+    ln -s dvd-slideshow.sh "$out/bin/gallery1-to-slideshow"
+    ln -s dvd-slideshow.sh "$out/bin/jigl2slideshow"
+
+    cp -a man "$out/"
+  '';
+
+  meta = {
+    description = "Suite of command line programs that creates a slideshow-style video from groups of pictures.";
+    homepage = http://dvd-slideshow.sourceforge.net/wiki/Main_Page;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.robbinch ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a20518363e..58dce0a4f20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10767,6 +10767,8 @@ let
 
   dvdauthor = callPackage ../applications/video/dvdauthor { };
 
+  dvd-slideshow = callPackage ../applications/video/dvd-slideshow { };
+
   dwb = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; };
 
   dwbWrapper = wrapFirefox

From deb0ed081072215f09b827ddf4668c886ddadf9f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 10 Jun 2015 12:02:13 +0200
Subject: [PATCH 0950/2322] opencascade: fix build

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index edde05d0ea4..6616c76f9a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7526,7 +7526,9 @@ let
 
   openbr = callPackage ../development/libraries/openbr { };
 
-  opencascade = callPackage ../development/libraries/opencascade { };
+  opencascade = callPackage ../development/libraries/opencascade {
+    tcl = tcl-8_5;
+  };
 
   opencascade_6_5 = callPackage ../development/libraries/opencascade/6.5.nix {
     automake = automake111x;

From 1c22734cd2e67842090f5d59a6c7b2fb39c1cf66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 10 Jun 2015 12:16:25 +0200
Subject: [PATCH 0951/2322] Forcing the load of atkbd in initrd.

In some computers, having the module available does not really load it,
therefore, it results in not having the keyboard avaiable in initrd.
---
 nixos/modules/system/boot/kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 0cae9cb844c..63a095be631 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -159,7 +159,7 @@ in
 
     boot.kernel.sysctl."kernel.printk" = config.boot.consoleLogLevel;
 
-    boot.kernelModules = [ "loop" "configs" ];
+    boot.kernelModules = [ "loop" "configs" "atkbd" ];
 
     boot.initrd.availableKernelModules =
       [ # Note: most of these (especially the SATA/PATA modules)

From b62f02f751f6b67916fff7ab8922d0cba14a4cb1 Mon Sep 17 00:00:00 2001
From: Robbin C <robbinch33@gmail.com>
Date: Wed, 10 Jun 2015 18:40:25 +0800
Subject: [PATCH 0952/2322] wavegain: Use fetchFromGitHub instead of fetchgit.

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

diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/applications/audio/wavegain/default.nix
index caf579d8765..5f56fb7297f 100644
--- a/pkgs/applications/audio/wavegain/default.nix
+++ b/pkgs/applications/audio/wavegain/default.nix
@@ -1,10 +1,12 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   name = "wavegain-1.3.1";
-  src = fetchgit {
-    url = "https://github.com/MestreLion/wavegain.git";
-    sha256 = "1h886xijc9d7h4p6qx12c6kgwmp6s1bdycnyylkayfncczzlbi24";
+  src = fetchFromGitHub {
+    owner = "MestreLion";
+    repo = "wavegain";
+    rev = "c928eaf97aeec5732625491b64c882e08e314fee";
+    sha256 = "0wghqnsbypmr4xcrhb568bfjdnxzzp8qgnws3jslzmzf34dpk5ls";
   };
 
   installPhase = ''

From 62d62b658835d675f483d1ff78517216f75bcc5d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 10 Jun 2015 13:00:11 +0200
Subject: [PATCH 0953/2322] Fixed some licenses

---
 pkgs/development/compilers/go/1.1-darwin.nix     |  8 ++++----
 pkgs/development/compilers/go/1.1.nix            |  8 ++++----
 pkgs/development/compilers/go/1.2.nix            |  8 ++++----
 pkgs/development/compilers/go/1.3.nix            |  8 ++++----
 pkgs/development/compilers/go/1.4.nix            |  8 ++++----
 pkgs/servers/felix/default.nix                   |  6 +++---
 pkgs/servers/http/jboss/default.nix              | 10 +++++-----
 pkgs/servers/memcached/default.nix               |  8 ++++----
 pkgs/servers/monitoring/zabbix/2.0.nix           |  8 ++++----
 pkgs/servers/monitoring/zabbix/2.2.nix           |  8 ++++----
 pkgs/servers/monitoring/zabbix/default.nix       |  8 ++++----
 pkgs/servers/sql/postgresql/jdbc/default.nix     |  4 ++--
 pkgs/servers/sql/postgresql/psqlodbc/default.nix |  4 ++--
 pkgs/tools/compression/lzop/default.nix          |  4 ++--
 pkgs/tools/graphics/optipng/default.nix          |  4 ++--
 pkgs/tools/graphics/pdfread/default.nix          |  4 ++--
 pkgs/tools/security/muscleframework/default.nix  |  6 +++---
 pkgs/tools/security/muscletool/default.nix       |  6 +++---
 18 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/pkgs/development/compilers/go/1.1-darwin.nix b/pkgs/development/compilers/go/1.1-darwin.nix
index 5b17f56ac37..776c1e04f08 100644
--- a/pkgs/development/compilers/go/1.1-darwin.nix
+++ b/pkgs/development/compilers/go/1.1-darwin.nix
@@ -69,11 +69,11 @@ stdenv.mkDerivation {
     cp ./misc/emacs/* $out/share/emacs/site-lisp/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://golang.org/;
     description = "The Go Programming language";
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [ zef ];
-    platforms = stdenv.lib.platforms.darwin;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ zef ];
+    platforms = platforms.darwin;
   };
 }
diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix
index 11640f2393d..de34e3e3cda 100644
--- a/pkgs/development/compilers/go/1.1.nix
+++ b/pkgs/development/compilers/go/1.1.nix
@@ -90,12 +90,12 @@ stdenv.mkDerivation {
     cp ./misc/emacs/* $out/share/emacs/site-lisp/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     branch = "1.1";
     homepage = http://golang.org/;
     description = "The Go Programming language";
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [ pierron viric ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ pierron viric ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
index 113e2118efb..bbedea812b8 100644
--- a/pkgs/development/compilers/go/1.2.nix
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -81,12 +81,12 @@ stdenv.mkDerivation {
     cp ./misc/emacs/* $out/share/emacs/site-lisp/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     branch = "1.2";
     homepage = http://golang.org/;
     description = "The Go Programming language";
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [ pierron viric ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ pierron viric ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix
index 6d88049cfbe..52a388aff1f 100644
--- a/pkgs/development/compilers/go/1.3.nix
+++ b/pkgs/development/compilers/go/1.3.nix
@@ -102,12 +102,12 @@ stdenv.mkDerivation {
 
   setupHook = ./setup-hook.sh;
 
-  meta = {
+  meta = with stdenv.lib; {
     branch = "1.3";
     homepage = http://golang.org/;
     description = "The Go Programming language";
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [ cstrahan ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ cstrahan ];
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 1feaf68930a..12642eeace5 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -88,12 +88,12 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
-  meta = {
+  meta = with stdenv.lib; {
     branch = "1.4";
     homepage = http://golang.org/;
     description = "The Go Programming language";
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [ cstrahan wkennington ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ cstrahan wkennington ];
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix
index c1114232ea8..17a50506fa9 100644
--- a/pkgs/servers/felix/default.nix
+++ b/pkgs/servers/felix/default.nix
@@ -13,10 +13,10 @@ stdenv.mkDerivation {
     mkdir -p $out
     cp -av * $out
   '';
-  meta = {
+  meta = with stdenv.lib; {
     description = "An OSGi gateway";
     homepage = http://felix.apache.org;
-    license = "ASF";
-    maintainers = [ stdenv.lib.maintainers.sander ];
+    license = licenses.asl20;
+    maintainers = [ maintainers.sander ];
   };
 }
diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix
index 86d37189887..d0d336ad08e 100644
--- a/pkgs/servers/http/jboss/default.nix
+++ b/pkgs/servers/http/jboss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, jdk, lib }:
+{ stdenv, fetchurl, unzip, jdk }:
 
 stdenv.mkDerivation {
   name = "jboss-as-7.1.1.Final";
@@ -16,10 +16,10 @@ stdenv.mkDerivation {
     find $out/bin -name \*.sh -print0 | xargs -0 sed -i -e '/#!\/bin\/sh/aJAVA_HOME=${jdk}'
   '';
   
-  meta = {
-    homepage = "http://www.jboss.org/";
+  meta = with stdenv.lib; {
+    homepage = http://www.jboss.org/;
     description = "Open Source J2EE application server";
-    license = "GPL/LGPL";
-    maintainers = [ lib.maintainers.sander ];
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.sander ];
   };
 }
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index 74033be8cf8..294cb003ab4 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [cyrus_sasl libevent];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A distributed memory object caching system";
     repositories.git = https://github.com/memcached/memcached.git;
     homepage = http://memcached.org/;
-    license = "bsd";
-    maintainers = [ stdenv.lib.maintainers.coconnor ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.coconnor ];
+    platforms = platforms.linux;
   };
 }
 
diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix
index 9ce027409fd..0aa32a66f0a 100644
--- a/pkgs/servers/monitoring/zabbix/2.0.nix
+++ b/pkgs/servers/monitoring/zabbix/2.0.nix
@@ -78,13 +78,13 @@ in
 
     configureFlags = "--enable-agent";
 
-    meta = {
+    meta = with stdenv.lib; {
       inherit branch;
       description = "An enterprise-class open source distributed monitoring solution (client-side agent)";
       homepage = http://www.zabbix.com/;
-      license = "GPL";
-      maintainers = [ stdenv.lib.maintainers.eelco ];
-      platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+      license = licenses.gpl2;
+      maintainers = [ maintainers.eelco ];
+      platforms = platforms.linux ++ platforms.darwin;
     };
   };
 
diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix
index 1e8d03ec2b6..139786ba59d 100644
--- a/pkgs/servers/monitoring/zabbix/2.2.nix
+++ b/pkgs/servers/monitoring/zabbix/2.2.nix
@@ -90,13 +90,13 @@ in
 
     configureFlags = "--enable-agent";
 
-    meta = {
+    meta = with stdenv.lib; {
       inherit branch;
       description = "An enterprise-class open source distributed monitoring solution (client-side agent)";
       homepage = http://www.zabbix.com/;
-      license = "GPL";
-      maintainers = [ stdenv.lib.maintainers.eelco ];
-      platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+      license = licenses.gpl2;
+      maintainers = [ maintainers.eelco ];
+      platforms = platforms.linux ++ platforms.darwin;
     };
   };
 
diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix
index 5d8541ab870..0aa74599c3a 100644
--- a/pkgs/servers/monitoring/zabbix/default.nix
+++ b/pkgs/servers/monitoring/zabbix/default.nix
@@ -57,12 +57,12 @@ in
 
     configureFlags = "--enable-agent";
 
-    meta = {
+    meta = with stdenv.lib; {
       description = "An enterprise-class open source distributed monitoring solution (client-side agent)";
       homepage = http://www.zabbix.com/;
-      license = "GPL";
-      maintainers = [ stdenv.lib.maintainers.eelco ];
-      platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+      license = licenses.gpl2;
+      maintainers = [ maintainers.eelco ];
+      platforms = platforms.linux ++ platforms.darwin;
     };
   };
 
diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix
index 61b12164f24..ba5a9ead698 100644
--- a/pkgs/servers/sql/postgresql/jdbc/default.nix
+++ b/pkgs/servers/sql/postgresql/jdbc/default.nix
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
       cp jars/*.jar $out/share/java
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://jdbc.postgresql.org/;
     description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database";
-    license = "bsd";
+    license = licenses.bsd3;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/psqlodbc/default.nix b/pkgs/servers/sql/postgresql/psqlodbc/default.nix
index ce57c214183..72221c0eec0 100644
--- a/pkgs/servers/sql/postgresql/psqlodbc/default.nix
+++ b/pkgs/servers/sql/postgresql/psqlodbc/default.nix
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-iodbc=${libiodbc}";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://psqlodbc.projects.postgresql.org/;
     description = "ODBC driver for PostgreSQL";
-    license = "LGPL";
+    license = licenses.lgpl2;
   };
 }
diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix
index 383b7a0e079..7d49bde68c1 100644
--- a/pkgs/tools/compression/lzop/default.nix
+++ b/pkgs/tools/compression/lzop/default.nix
@@ -9,9 +9,9 @@ stdenv.mkDerivation {
 
   buildInputs = [ lzo ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.lzop.org;
     description = "Fast file compressor";
-    license = "GPL";
+    license = licenses.gpl2;
   };
 }
diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix
index bc1f86e3661..08f99469d25 100644
--- a/pkgs/tools/graphics/optipng/default.nix
+++ b/pkgs/tools/graphics/optipng/default.nix
@@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://optipng.sourceforge.net/;
     description = "A PNG optimizer";
-    license = "bsd";
+    license = licenses.zlib;
   };
 }
diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix
index fd26174f197..f35553ea168 100644
--- a/pkgs/tools/graphics/pdfread/default.nix
+++ b/pkgs/tools/graphics/pdfread/default.nix
@@ -40,9 +40,9 @@ stdenv.mkDerivation {
       --prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre}/bin:${unrar}/bin:${optipng}/bin
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "PDF/DJVU to ebook format converter";
     homepage = http://www.mobileread.com/forums/showthread.php?t=21906;
-    license = "bsd";
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/tools/security/muscleframework/default.nix b/pkgs/tools/security/muscleframework/default.nix
index 97b0617d396..c1b9dad91ff 100644
--- a/pkgs/tools/security/muscleframework/default.nix
+++ b/pkgs/tools/security/muscleframework/default.nix
@@ -20,11 +20,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ libmusclecard pkgconfig pcsclite];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "MUSCLE smart card framework - mcard plugin";
     homepage = http://muscleplugins.alioth.debian.org/;
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric];
+    license = licenses.bsd3;
+    maintainers = with maintainers; [viric];
     # XXX: don't build before libmusclecard is fixed
     # platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/pkgs/tools/security/muscletool/default.nix b/pkgs/tools/security/muscletool/default.nix
index cc369835f25..34f75609e4f 100644
--- a/pkgs/tools/security/muscletool/default.nix
+++ b/pkgs/tools/security/muscletool/default.nix
@@ -9,11 +9,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ libmusclecard pcsclite pkgconfig ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Smart card applications for use with MUSCLE plugins";
     homepage = http://muscleapps.alioth.debian.org/;
-    license = "BSD"; # http://anonscm.debian.org/viewvc/muscleapps/trunk/muscleTool/COPYING?view=markup
-    maintainers = with stdenv.lib.maintainers; [viric];
+    license = licenses.bsd3;
+    maintainers = with maintainers; [viric];
     # XXX: don't build before libmusclecard is fixed
     # platforms = with stdenv.lib.platforms; linux;
   };

From 9d749881d68949107b127cbf44843ed9a1ea2de8 Mon Sep 17 00:00:00 2001
From: Robbin C <robbinch33@gmail.com>
Date: Wed, 10 Jun 2015 19:02:09 +0800
Subject: [PATCH 0954/2322] dvd-slideshow: Removed dot at the end.

---
 pkgs/applications/video/dvd-slideshow/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix
index 94e19cb7327..a6197c2e6e1 100644
--- a/pkgs/applications/video/dvd-slideshow/default.nix
+++ b/pkgs/applications/video/dvd-slideshow/default.nix
@@ -60,7 +60,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Suite of command line programs that creates a slideshow-style video from groups of pictures.";
+    description = "Suite of command line programs that creates a slideshow-style video from groups of pictures";
     homepage = http://dvd-slideshow.sourceforge.net/wiki/Main_Page;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;

From e3b3dff1d5af035e27a560d2736414f94d134085 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Wed, 10 Jun 2015 11:18:55 +0000
Subject: [PATCH 0955/2322] dfc: 3.0.4 -> 3.0.5

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

diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix
index 84150b46837..63a6e7e1fa3 100644
--- a/pkgs/tools/system/dfc/default.nix
+++ b/pkgs/tools/system/dfc/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, cmake, gettext}:
 
 stdenv.mkDerivation rec {
-  name = "dfc-3.0.4";
+  name = "dfc-3.0.5";
 
   src = fetchurl {
-    url = "http://projects.gw-computing.net/attachments/download/79/dfc-3.0.4.tar.gz";
-    sha256 = "0bdc2edb92c7f740a0b7d3fa75eb134adf197ba711bfa589ab51c691fabd617e";
+    url = "http://projects.gw-computing.net/attachments/download/467/${name}.tar.gz";
+    sha256 = "0yl5dl1nydinji71zz37c7myg3vg9jzxq89rcjqlfcy5dcfpm51w";
   };
 
   buildInputs = [ cmake gettext ];

From 8fc618503795a161ab6a261c8b4cac799b3f23b4 Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Wed, 10 Jun 2015 13:33:59 +0200
Subject: [PATCH 0956/2322] Update syncthing to 0.11.8

(Also should fix failing test on i686 as per its Changelog)
---
 pkgs/applications/networking/syncthing/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 1e26e61161c..30fda1e0fac 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,12 +4,12 @@ with goPackages;
 
 buildGoPackage rec {
   name = "syncthing-${version}";
-  version = "0.11.7";
+  version = "0.11.8";
   goPackagePath = "github.com/syncthing/syncthing";
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "7d928a255c61c7b89d460cc70c79bd8e85bef3e919c157f59d5709fef4153c8d";
+    sha256 = "fed98ac47fd84aecee7770dd59e5e68c5bc429d50b361f13b9ea2e28c3be62cf";
   };
 
   subPackages = [ "cmd/syncthing" ];
@@ -26,7 +26,7 @@ buildGoPackage rec {
     homepage = http://syncthing.net/;
     description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ matejc ];
+    maintainers = with lib.maintainers; [ matejc theuni ];
     platforms = with lib.platforms; unix;
   };
 }

From 429461c3e2d7646eee913b5541f0c830d2edfa5f Mon Sep 17 00:00:00 2001
From: hiberno <mail@elfsechsundzwanzig.de>
Date: Wed, 10 Jun 2015 14:37:49 +0200
Subject: [PATCH 0957/2322] xcape: bump to latest revision

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

diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix
index 272f1ca0907..35d353d9861 100644
--- a/pkgs/tools/X11/xcape/default.nix
+++ b/pkgs/tools/X11/xcape/default.nix
@@ -3,7 +3,7 @@
 let
   s = rec {
     baseName = "xcape";
-    version = "git-2013-05-30";
+    version = "git-2015-03-01";
     name = "${baseName}-${version}";
   };
   buildInputs = [
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
   inherit buildInputs;
   src = fetchgit {
     url = https://github.com/alols/xcape;
-    rev = "39aa08c5da354a8fe495eba8787a01957cfa5fcb";
-    sha256 = "1yh0vbaj4c5lflxm3d4xrfaric1lp0gfcyzq33bqphpsba439bmg";
+    rev = "f3802fc086ce9d961d644a5d29ad5b650db56215";
+    sha256 = "05mm4ap69ncwl4hhzf2dvbazqxjf27477cd3chpfc7qi7srqasvz";
   };
   preConfigure = ''
     makeFlags="$makeFlags PREFIX=$out"

From 38b58bab62d60c3cd8a1cb0d3ccf3ade5d9cb2ee Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 10 Jun 2015 15:00:20 +0200
Subject: [PATCH 0958/2322] gcr: propagate p11_kit required in the pc file

---
 pkgs/desktops/gnome-3/3.16/core/gcr/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
index b3acdee072d..f9d87298fff 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
@@ -11,10 +11,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig intltool gnupg p11_kit glib gobjectIntrospection libxslt
+    pkgconfig intltool gnupg glib gobjectIntrospection libxslt
     libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala
   ];
 
+  propagatedBuildInputs = [ p11_kit ];
+
   #doCheck = true;
 
   preFixup = ''

From 0f35f9bb69daea0ba2a69a806d8f472cf9ab3b92 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jun 2015 12:02:48 +0200
Subject: [PATCH 0959/2322] Drop obsolete boot=on parameter

---
 nixos/lib/test-driver/Machine.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index db2c1a68692..6df8ddb9e95 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -21,7 +21,7 @@ sub new {
     my ($class, $args) = @_;
 
     my $startCommand = $args->{startCommand};
-    
+
     my $name = $args->{name};
     if (!$name) {
         $startCommand =~ /run-(.*)-vm$/ if defined $startCommand;
@@ -34,7 +34,7 @@ sub new {
             "qemu-kvm -m 384 " .
             "-net nic,model=virtio \$QEMU_OPTS ";
         my $iface = $args->{hdaInterface} || "virtio";
-        $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,boot=on,werror=report "
+        $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,werror=report "
             if defined $args->{hda};
         $startCommand .= "-cdrom $args->{cdrom} "
             if defined $args->{cdrom};
@@ -171,7 +171,7 @@ sub start {
 
     eval {
         local $SIG{CHLD} = sub { die "QEMU died prematurely\n"; };
-        
+
         # Wait until QEMU connects to the monitor.
         accept($self->{monitor}, $monitorS) or die;
 
@@ -182,11 +182,11 @@ sub start {
         $self->{socket}->autoflush(1);
     };
     die "$@" if $@;
-    
+
     $self->waitForMonitorPrompt;
 
     $self->log("QEMU running (pid $pid)");
-    
+
     $self->{pid} = $pid;
     $self->{booted} = 1;
 }
@@ -241,7 +241,7 @@ sub connect {
         alarm 300;
         readline $self->{socket} or die "the VM quit before connecting\n";
         alarm 0;
-        
+
         $self->log("connected to guest root shell");
         $self->{connected} = 1;
 
@@ -270,7 +270,7 @@ sub isUp {
 
 sub execute_ {
     my ($self, $command) = @_;
-    
+
     $self->connect;
 
     print { $self->{socket} } ("( $command ); echo '|!=EOF' \$?\n");
@@ -453,7 +453,7 @@ sub shutdown {
 sub crash {
     my ($self) = @_;
     return unless $self->{booted};
-    
+
     $self->log("forced crash");
 
     $self->sendMonitorCommand("quit");

From e5db79a8597873472c49d18061f6fd9e6f3e7437 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jun 2015 12:04:26 +0200
Subject: [PATCH 0960/2322] Move stuff to
 modules/profiles/installation-device.nix

---
 .../installer/cd-dvd/installation-cd-base.nix | 15 +-----------
 .../cd-dvd/installation-cd-minimal.nix        |  5 +---
 .../modules/profiles/installation-device.nix  | 23 +++++++++++++++++--
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index 5bd10823108..bc3bd872d2a 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -7,8 +7,7 @@ with lib;
 
 {
   imports =
-    [ ./channel.nix
-      ./iso-image.nix
+    [ ./iso-image.nix
 
       # Profiles of this basic installation CD.
       ../../profiles/all-hardware.nix
@@ -21,18 +20,6 @@ with lib;
 
   isoImage.volumeID = substring 0 11 "NIXOS_ISO";
 
-  # Make the installer more likely to succeed in low memory
-  # environments.  The kernel's overcommit heustistics bite us
-  # fairly often, preventing processes such as nix-worker or
-  # download-using-manifests.pl from forking even if there is
-  # plenty of free memory.
-  boot.kernel.sysctl."vm.overcommit_memory" = "1";
-
-  # To speed up installation a little bit, include the complete stdenv
-  # in the Nix store on the CD.  Archive::Cpio is needed for the
-  # initrd builder.  nixos-artwork is needed for the GRUB background.
-  isoImage.storeContents = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio pkgs.nixos-artwork ];
-
   # EFI booting
   isoImage.makeEfiBootable = true;
 
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
index f34e789e28c..4641b8fcf9d 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -1,14 +1,11 @@
 # This module defines a small NixOS installation CD.  It does not
 # contain any graphical stuff.
 
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   imports =
     [ ./installation-cd-base.nix
       ../../profiles/minimal.nix
     ];
-
-  # Enable in installer, even if minimal profile disables it
-  services.nixosManual.enable = lib.mkOverride 999 true;
 }
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index a41d17e5182..946032781f4 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -1,5 +1,5 @@
 # Provide a basic configuration for installation devices like CDs.
-{ config, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
@@ -13,10 +13,17 @@ with lib;
       # Allow "nixos-rebuild" to work properly by providing
       # /etc/nixos/configuration.nix.
       ./clone-config.nix
+
+      # Include a copy of Nixpkgs so that nixos-install works out of
+      # the box.
+      ../installer/cd-dvd/channel.nix
     ];
 
   config = {
 
+    # Enable in installer, even if the minimal profile disables it.
+    services.nixosManual.enable = mkForce true;
+
     # Show the manual.
     services.nixosManual.showManual = true;
 
@@ -43,7 +50,7 @@ with lib;
     systemd.services.sshd.wantedBy = mkOverride 50 [];
 
     # Enable wpa_supplicant, but don't start it by default.
-    networking.wireless.enable = true;
+    networking.wireless.enable = mkDefault true;
     jobs.wpa_supplicant.startOn = mkOverride 50 "";
 
     # Tell the Nix evaluator to garbage collect more aggressively.
@@ -51,5 +58,17 @@ with lib;
     # (yet) have swap set up.
     environment.variables.GC_INITIAL_HEAP_SIZE = "100000";
 
+    # Make the installer more likely to succeed in low memory
+    # environments.  The kernel's overcommit heustistics bite us
+    # fairly often, preventing processes such as nix-worker or
+    # download-using-manifests.pl from forking even if there is
+    # plenty of free memory.
+    boot.kernel.sysctl."vm.overcommit_memory" = "1";
+
+    # To speed up installation a little bit, include the complete
+    # stdenv in the Nix store on the CD.  Archive::Cpio is needed for
+    # the initrd builder.
+    system.extraDependencies = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio ];
+
   };
 }

From d906939e74b79318b4493c2085bcfe3f7dd92bb7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jun 2015 13:14:40 +0200
Subject: [PATCH 0961/2322] Installer tests: Don't use the ISO

We already have separate tests for checking whether the ISO boots
correctly, so it's not necessary to do that here. So now
tests/installer.nix just tests nixos-install, from a regular NixOS VM
that uses the host's Nix store. This makes running the tests more
convenient because we don't have to build a new ISO after every
change.
---
 nixos/modules/virtualisation/qemu-vm.nix |  34 ++--
 nixos/release.nix                        |   1 -
 nixos/tests/installer.nix                | 208 +++++++----------------
 3 files changed, 85 insertions(+), 158 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 8c7e840910d..dcb498493fa 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -61,8 +61,8 @@ let
       idx=2
       extraDisks=""
       ${flip concatMapStrings cfg.emptyDiskImages (size: ''
-        ${pkgs.qemu_kvm}/bin/qemu-img create -f raw "empty$idx" "${toString size}M"
-        extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx,if=virtio,werror=report"
+        ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M"
+        extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx.qcow2,if=virtio,werror=report"
         idx=$((idx + 1))
       '')}
 
@@ -83,7 +83,7 @@ let
             '' else ''
             ''}
           '' else ''
-            -drive file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
+            -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
             -kernel ${config.system.build.toplevel}/kernel \
             -initrd ${config.system.build.toplevel}/initrd \
             -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
@@ -165,7 +165,7 @@ let
           ${config.system.build.toplevel}/bin/switch-to-configuration boot
 
           umount /boot
-        ''
+        '' # */
     );
 
 in
@@ -204,17 +204,25 @@ in
           '';
       };
 
+    virtualisation.bootDevice =
+      mkOption {
+        type = types.str;
+        default = "/dev/vda";
+        description =
+          ''
+            The disk to be used for the root filesystem.
+          '';
+      };
+
     virtualisation.emptyDiskImages =
       mkOption {
         default = [];
         type = types.listOf types.int;
         description =
           ''
-            Additional disk images to provide to the VM, the value is a list of
-            sizes in megabytes the empty disk should be.
-
-            These disks are writeable by the VM and will be thrown away
-            afterwards.
+            Additional disk images to provide to the VM. The value is
+            a list of size in megabytes of each disk. These disks are
+            writeable by the VM.
           '';
       };
 
@@ -341,7 +349,7 @@ in
 
   config = {
 
-    boot.loader.grub.device = mkVMOverride "/dev/vda";
+    boot.loader.grub.device = mkVMOverride cfg.bootDevice;
 
     boot.initrd.extraUtilsCommands =
       ''
@@ -353,9 +361,9 @@ in
       ''
         # If the disk image appears to be empty, run mke2fs to
         # initialise.
-        FSTYPE=$(blkid -o value -s TYPE /dev/vda || true)
+        FSTYPE=$(blkid -o value -s TYPE ${cfg.bootDevice} || true)
         if test -z "$FSTYPE"; then
-            mke2fs -t ext4 /dev/vda
+            mke2fs -t ext4 ${cfg.bootDevice}
         fi
       '';
 
@@ -396,7 +404,7 @@ in
     # attribute should be disregarded for the purpose of building a VM
     # test image (since those filesystems don't exist in the VM).
     fileSystems = mkVMOverride (
-      { "/".device = "/dev/vda";
+      { "/".device = cfg.bootDevice;
         ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} =
           { device = "store";
             fsType = "9p";
diff --git a/nixos/release.nix b/nixos/release.nix
index 3559926eefa..51a58da4454 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -256,7 +256,6 @@ in rec {
   tests.installer.grub1 = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).grub1.test);
   tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test);
   tests.installer.luksroot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).luksroot.test);
-  tests.installer.rebuildCD = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).rebuildCD.test);
   tests.installer.separateBoot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBoot.test);
   tests.installer.simple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simple.test);
   tests.installer.simpleLabels = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleLabels.test);
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index fc65f392a1f..187543ab8e3 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -6,45 +6,8 @@ with pkgs.lib;
 
 let
 
-  # Build the ISO.  This is the regular minimal installation CD but
-  # with test instrumentation.
-  iso =
-    (import ../lib/eval-config.nix {
-      inherit system;
-      modules =
-        [ ../modules/installer/cd-dvd/installation-cd-minimal.nix
-          ../modules/testing/test-instrumentation.nix
-          { key = "serial";
-            boot.loader.grub.timeout = mkOverride 0 0;
-
-            # The test cannot access the network, so any sources we
-            # need must be included in the ISO.
-            isoImage.storeContents =
-              [ pkgs.glibcLocales
-                pkgs.sudo
-                pkgs.docbook5
-                pkgs.docbook5_xsl
-                pkgs.unionfs-fuse
-
-                # Bootloader support
-                pkgs.grub
-                pkgs.grub2
-                pkgs.grub2_efi
-                pkgs.gummiboot
-                pkgs.perlPackages.XMLLibXML
-                pkgs.perlPackages.ListCompare
-              ];
-
-            # Don't use https://cache.nixos.org since the fake
-            # cache.nixos.org doesn't do https.
-            nix.binaryCaches = [ http://cache.nixos.org/ ];
-          }
-        ];
-    }).config.system.build.isoImage;
-
-
   # The configuration to install.
-  makeConfig = { testChannel, grubVersion, grubDevice, grubIdentifier
+  makeConfig = { grubVersion, grubDevice, grubIdentifier
                , extraConfig, readOnly ? true, forceGrubReinstallCount ? 0
                }:
     pkgs.writeText "configuration.nix" ''
@@ -53,7 +16,6 @@ let
       { imports =
           [ ./hardware-configuration.nix
             <nixpkgs/nixos/modules/testing/test-instrumentation.nix>
-            <nixpkgs/nixos/modules/profiles/minimal.nix>
           ];
 
         boot.loader.grub.version = ${toString grubVersion};
@@ -68,94 +30,39 @@ let
 
         ${optionalString (!readOnly) "nix.readOnlyStore = false;"}
 
-        environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ];
+        hardware.enableAllFirmware = lib.mkForce false;
 
-        nix.binaryCaches = [ http://cache.nixos.org/ ];
         ${replaceChars ["\n"] ["\n  "] extraConfig}
       }
     '';
 
 
-  # Configuration of a web server that simulates the Nixpkgs channel
-  # distribution server.
-  webserver =
-    { config, lib, pkgs, ... }:
-
-    { services.httpd.enable = true;
-      services.httpd.adminAddr = "foo@example.org";
-      services.httpd.servedDirs = singleton
-        { urlPath = "/";
-          dir = "/tmp/channel";
-        };
-
-      virtualisation.writableStore = true;
-      virtualisation.pathsInNixDB = channelContents ++ [ pkgs.hello.src ];
-      virtualisation.memorySize = 768;
-
-      networking.firewall.allowedTCPPorts = [ 80 ];
-    };
-
   channelContents = [ pkgs.rlwrap ];
 
 
-  # The test script boots the CD, installs NixOS on an empty hard
+  # The test script boots a NixOS VM, installs NixOS on an empty hard
   # disk, and then reboot from the hard disk.  It's parameterized with
   # a test script fragment `createPartitions', which must create
   # partitions and filesystems.
-  testScriptFun = { createPartitions, testChannel, grubVersion, grubDevice
+  testScriptFun = { createPartitions, grubVersion, grubDevice
                   , grubIdentifier, preBootCommands, extraConfig
                   }:
     let
-      # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html
       iface = if grubVersion == 1 then "scsi" else "virtio";
       qemuFlags =
-        (if iso.system == "x86_64-linux" then "-m 768 " else "-m 512 ") +
-        (optionalString (iso.system == "x86_64-linux") "-cpu kvm64 ");
-      hdFlags =''hda => "harddisk", hdaInterface => "${iface}", '';
+        (if system == "x86_64-linux" then "-m 768 " else "-m 512 ") +
+        (optionalString (system == "x86_64-linux") "-cpu kvm64 ");
+      hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", '';
     in
     ''
-      createDisk("harddisk", 8 * 1024);
-
-      my $machine = createMachine({ ${hdFlags}
-        cdrom => glob("${iso}/iso/*.iso"),
-        qemuFlags => "${qemuFlags} " . '${optionalString testChannel (toString (qemuNICFlags 1 1 2))}' });
       $machine->start;
 
-      ${optionalString testChannel ''
-        # Create a channel on the web server containing a few packages
-        # to simulate the Nixpkgs channel.
-        $webserver->start;
-        $webserver->waitForUnit("httpd");
-        $webserver->succeed(
-            "nix-push --bzip2 --dest /tmp/channel --manifest --url-prefix http://nixos.org/channels/nixos-unstable " .
-            "${toString channelContents} >&2");
-        $webserver->succeed("mkdir /tmp/channel/sha256");
-        $webserver->succeed("cp ${pkgs.hello.src} /tmp/channel/sha256/${pkgs.hello.src.outputHash}");
-      ''}
-
       # Make sure that we get a login prompt etc.
       $machine->succeed("echo hello");
       #$machine->waitForUnit('getty@tty2');
       $machine->waitForUnit("rogue");
       $machine->waitForUnit("nixos-manual");
 
-      ${optionalString testChannel ''
-        $machine->waitForUnit("dhcpcd");
-
-        # Allow the machine to talk to the fake nixos.org.
-        $machine->succeed(
-            "rm /etc/hosts",
-            "echo 192.168.1.1 nixos.org cache.nixos.org tarballs.nixos.org > /etc/hosts",
-            "ifconfig eth1 up 192.168.1.2",
-        );
-
-        # Test nix-env.
-        $machine->fail("hello");
-        $machine->succeed("nix-env -i hello");
-        $machine->succeed("hello") =~ /Hello, world/
-            or die "bad `hello' output";
-      ''}
-
       # Wait for hard disks to appear in /dev
       $machine->succeed("udevadm settle");
 
@@ -163,14 +70,12 @@ let
       ${createPartitions}
 
       # Create the NixOS configuration.
-      $machine->succeed(
-          "nixos-generate-config --root /mnt",
-      );
+      $machine->succeed("nixos-generate-config --root /mnt");
 
       $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2");
 
       $machine->copyFileFromHost(
-          "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; } }",
+          "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; } }",
           "/mnt/etc/nixos/configuration.nix");
 
       # Perform the installation.
@@ -188,7 +93,7 @@ let
       # Now see if we can boot the installation.
       $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" });
 
-      # For example to enter LUKS passphrase
+      # For example to enter LUKS passphrase.
       ${preBootCommands}
 
       # Did /boot get mounted?
@@ -209,9 +114,9 @@ let
       $machine->succeed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/
           or die "nix-env failed";
 
-      # We need to a writable nix-store on next boot
+      # We need to a writable nix-store on next boot.
       $machine->copyFileFromHost(
-          "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 1; } }",
+          "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 1; } }",
           "/etc/nixos/configuration.nix");
 
       # Check whether nixos-rebuild works.
@@ -220,7 +125,7 @@ let
       # Test nixos-option.
       $machine->succeed("nixos-option boot.initrd.kernelModules | grep virtio_console");
       $machine->succeed("nixos-option boot.initrd.kernelModules | grep 'List of modules'");
-      $machine->succeed("nixos-option  boot.initrd.kernelModules | grep qemu-guest.nix");
+      $machine->succeed("nixos-option boot.initrd.kernelModules | grep qemu-guest.nix");
 
       $machine->shutdown;
 
@@ -229,7 +134,7 @@ let
       ${preBootCommands}
       $machine->waitForUnit("multi-user.target");
       $machine->copyFileFromHost(
-          "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 2; } }",
+          "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 2; } }",
           "/etc/nixos/configuration.nix");
       $machine->succeed("nixos-rebuild boot >&2");
       $machine->shutdown;
@@ -245,16 +150,60 @@ let
 
   makeInstallerTest = name:
     { createPartitions, preBootCommands ? "", extraConfig ? ""
-    , testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda"
+    , grubVersion ? 2, grubDevice ? "/dev/vda"
     , grubIdentifier ? "uuid", enableOCR ? false
     }:
     makeTest {
-      inherit iso;
-      name = "installer-" + name;
-      nodes = if testChannel then { inherit webserver; } else { };
       inherit enableOCR;
+      name = "installer-" + name;
+
+      nodes = {
+
+        # The configuration of the machine used to run "nixos-install". It
+        # also has a web server that simulates cache.nixos.org.
+        machine =
+          { config, lib, pkgs, ... }:
+
+          { imports =
+              [ ../modules/profiles/installation-device.nix
+                ../modules/profiles/base.nix
+              ];
+
+            virtualisation.diskSize = 8 * 1024;
+            virtualisation.memorySize = 768;
+            virtualisation.writableStore = true;
+
+            # Use a small /dev/vdb as the root disk for the
+            # installer. This ensures the target disk (/dev/vda) is
+            # the same during and after installation.
+            virtualisation.emptyDiskImages = [ 512 ];
+            virtualisation.bootDevice = "/dev/vdb";
+
+            hardware.enableAllFirmware = mkForce false;
+
+            # The test cannot access the network, so any packages we
+            # need must be included in the VM.
+            system.extraDependencies =
+              [ pkgs.sudo
+                pkgs.docbook5
+                pkgs.docbook5_xsl
+                pkgs.unionfs-fuse
+                pkgs.ntp
+                pkgs.nixos-artwork
+                pkgs.gummiboot
+                pkgs.perlPackages.XMLLibXML
+                pkgs.perlPackages.ListCompare
+              ]
+              ++ optional (grubVersion == 1) pkgs.grub
+              ++ optionals (grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ];
+
+            nix.binaryCaches = mkForce [ ];
+          };
+
+      };
+
       testScript = testScriptFun {
-        inherit createPartitions preBootCommands testChannel grubVersion
+        inherit createPartitions preBootCommands grubVersion
                 grubDevice grubIdentifier extraConfig;
       };
     };
@@ -281,7 +230,6 @@ in {
               "mount LABEL=nixos /mnt",
           );
         '';
-      testChannel = true;
     };
 
   # Same as the previous, but now with a separate /boot partition.
@@ -413,40 +361,11 @@ in {
               "mkfs.ext3 -L nixos /dev/sda2",
               "mount LABEL=nixos /mnt",
           );
-
         '';
       grubVersion = 1;
       grubDevice = "/dev/sda";
     };
 
-  # Rebuild the CD configuration with a little modification.
-  rebuildCD = makeTest
-    { inherit iso;
-      name = "rebuild-cd";
-      nodes = { };
-      testScript =
-        ''
-          my $machine = createMachine({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '-m 768' });
-          $machine->start;
-
-          # Enable sshd service.
-          $machine->succeed(
-            "sed -i 's,^}\$,systemd.services.sshd.wantedBy = pkgs.lib.mkOverride 0 [\"multi-user.target\"]; },' /etc/nixos/configuration.nix"
-          );
-
-          $machine->succeed("cat /etc/nixos/configuration.nix >&2");
-
-          # Apply the new CD configuration.
-          $machine->succeed("nixos-rebuild test");
-
-          # Connect to it-self.
-          $machine->waitForUnit("sshd");
-          $machine->waitForOpenPort(22);
-
-          $machine->shutdown;
-        '';
-    };
-
   # Test using labels to identify volumes in grub
   simpleLabels = makeInstallerTest "simpleLabels" {
     createPartitions = ''
@@ -545,4 +464,5 @@ in {
       );
     '';
   };
+
 }

From 8e88710693910f8bac1a6db388113d8a894adac4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jun 2015 15:18:54 +0200
Subject: [PATCH 0962/2322] Installer test: Remove apparently useless setting
 of nix.readOnlyStore

---
 nixos/tests/installer.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 187543ab8e3..4feed56cd67 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -8,7 +8,7 @@ let
 
   # The configuration to install.
   makeConfig = { grubVersion, grubDevice, grubIdentifier
-               , extraConfig, readOnly ? true, forceGrubReinstallCount ? 0
+               , extraConfig, forceGrubReinstallCount ? 0
                }:
     pkgs.writeText "configuration.nix" ''
       { config, lib, pkgs, modulesPath, ... }:
@@ -28,8 +28,6 @@ let
 
         boot.loader.grub.configurationLimit = 100 + ${toString forceGrubReinstallCount};
 
-        ${optionalString (!readOnly) "nix.readOnlyStore = false;"}
-
         hardware.enableAllFirmware = lib.mkForce false;
 
         ${replaceChars ["\n"] ["\n  "] extraConfig}
@@ -116,7 +114,7 @@ let
 
       # We need to a writable nix-store on next boot.
       $machine->copyFileFromHost(
-          "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 1; } }",
+          "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 1; } }",
           "/etc/nixos/configuration.nix");
 
       # Check whether nixos-rebuild works.
@@ -134,7 +132,7 @@ let
       ${preBootCommands}
       $machine->waitForUnit("multi-user.target");
       $machine->copyFileFromHost(
-          "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 2; } }",
+          "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 2; } }",
           "/etc/nixos/configuration.nix");
       $machine->succeed("nixos-rebuild boot >&2");
       $machine->shutdown;

From 8cf5d48d0333c791143362b7286aa82aed7ea5d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jun 2015 15:27:50 +0200
Subject: [PATCH 0963/2322] Make the boot test release-critical

---
 nixos/release-combined.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index d501c2e7c53..ddedcd9fe97 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -62,6 +62,7 @@ in rec {
         (all nixos.tests.installer.btrfsSimple)
         (all nixos.tests.installer.btrfsSubvols)
         (all nixos.tests.installer.btrfsSubvolDefault)
+        (all nixos.tests.bootBiosCdrom)
         (all nixos.tests.ipv6)
         (all nixos.tests.kde4)
         (all nixos.tests.lightdm)

From 6fa0db5a31bd2eb19d574af8dd57f252c4223dd3 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 10 Jun 2015 16:13:34 +0200
Subject: [PATCH 0964/2322] coqPackages.fiat: disable parallel build to fix
 build

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

diff --git a/pkgs/development/coq-modules/fiat/default.nix b/pkgs/development/coq-modules/fiat/default.nix
index 92b69319e0b..df4ea133cd9 100644
--- a/pkgs/development/coq-modules/fiat/default.nix
+++ b/pkgs/development/coq-modules/fiat/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ coq.ocaml coq.camlp5 ];
   propagatedBuildInputs = [ coq ];
 
-  enableParallelBuilding = true;
+  enableParallelBuilding = false;
   doCheck = true;
 
   unpackPhase = ''

From 330758e7886a7e1520056637dc4fa2a5bed4755a Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 10 Jun 2015 17:21:48 +0100
Subject: [PATCH 0965/2322] cran: remove bad mirror
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Gives ‘welcome to nginix’ pages
---
 pkgs/build-support/fetchurl/mirrors.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 7f61ddc77db..1453af3a62a 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -339,7 +339,6 @@ rec {
     http://cran.hafro.is/
     http://ftp.iitm.ac.in/cran/
     http://cran.repo.bppt.go.id/
-    http://cran.unej.ac.id/
     http://cran.um.ac.ir/
     http://ftp.heanet.ie/mirrors/cran.r-project.org/
     http://cran.mirror.garr.it/mirrors/CRAN/

From 5a64cc1dc8e6fc3f832cc3f88cbb37b23b0137f5 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Wed, 10 Jun 2015 16:22:23 +0000
Subject: [PATCH 0966/2322] git: 2.4.1 -> 2.4.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 60bfaa86199..29ec3b50786 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "2.4.1";
+  version = "2.4.2";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "195d61f98jj53jq0w3kfphpyk51h7fylpahc558id79ccc4ii1bj";
+    sha256 = "1rf942v2yk49xgy0asgk4vi4mmshpz823iyvrxc5n5y2v0ffq0a8";
   };
 
   patches = [

From e26bfbe26f21da0c54ee584955400ea491bb6268 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 10 Jun 2015 18:08:43 +0200
Subject: [PATCH 0967/2322] grsecurity: Update stable and test patches

stable: 3.1-3.14.43-201506021902 -> 3.1-3.14.44-201506082249
test:   3.1-4.0.4-201506021902   -> 3.1-4.0.5-201506082251
---
 pkgs/os-specific/linux/kernel/patches.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index f622bf9c782..4815cae259b 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -65,17 +65,17 @@ rec {
   };
 
   grsecurity_stable = grsecPatch
-    { kversion  = "3.14.43";
-      revision  = "201506021902";
+    { kversion  = "3.14.44";
+      revision  = "201506082249";
       branch    = "stable";
-      sha256    = "1b8kp9q9kslxz4adv1h0qahd96wnidpaa3k1mqmcaf8ia1b63dsk";
+      sha256    = "11lclmiyg37bq3sgf6d6lky5yngr15hgmgkilrhy3081ifnsf7ax";
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "4.0.4";
-      revision  = "201506021902";
+    { kversion  = "4.0.5";
+      revision  = "201506082251";
       branch    = "test";
-      sha256    = "03fbx2vmlvh0bng3l4nxkfdxkgl9sgjkmwd0irq2bvb3gwk2bp03";
+      sha256    = "03im0gq8b2n6fdxvrdd5iyi1viwl83zfjwqbamqyvkhmi2vbvhwk";
     };
 
   grsec_fix_path =

From 0ac1de60e93568524873d1bb1c69f06a1bcb6033 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Wed, 10 Jun 2015 16:34:45 +0000
Subject: [PATCH 0968/2322] lsof: 4.87 -> 4.88

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

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 1ef292407a4..6370e7447f2 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "lsof-4.87";
+  name = "lsof-4.88";
 
   src = fetchurl {
-    url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.87.tar.bz2;
-    sha256 = "0b6si72sml7gr9784ak491cxxbm9mx5bh174yg6rrirbv04kgpfz";
+    url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.88.tar.bz2;
+    sha256 = "16y9wm26rg81mihnzcbdg8h8vhxmq8kn62ssxb8cqydp4q79nvzy";
   };
 
   unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";

From ffdb7ab9a2b4fb4cb454c260919fe5244c2f0a00 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Wed, 10 Jun 2015 17:03:10 +0000
Subject: [PATCH 0969/2322] mpc: 0.26 -> 0.27

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

diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix
index 9224e21185b..2f798fff7b9 100644
--- a/pkgs/applications/audio/mpc/default.nix
+++ b/pkgs/applications/audio/mpc/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, mpd_clientlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.26";
+  version = "0.27";
   name = "mpc-${version}";
 
   src = fetchurl {
     url = "http://www.musicpd.org/download/mpc/0/${name}.tar.xz";
-    sha256 = "0hp2qv6w2v902dhrmck5hg32s1ai6xiv9n61a3n6prfcfdqmywr0";
+    sha256 = "0r10wsqxsi07gns6mfnicvpci0sbwwj4qa9iyr1ysrgadl5bx8j5";
   };
 
   buildInputs = [ mpd_clientlib ];

From 4387cd58417ced3eb24abe8ce9d3da576e81d034 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Wed, 10 Jun 2015 17:16:31 +0000
Subject: [PATCH 0970/2322] glances: 2.3 -> 2.4.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 ac800873860..84c5d181c17 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5708,14 +5708,14 @@ let
 
   glances = buildPythonPackage rec {
     name = "glances-${version}";
-    version = "2.3";
+    version = "2.4.2";
     disabled = isPyPy;
 
     src = pkgs.fetchFromGitHub {
       owner = "nicolargo";
       repo = "glances";
       rev = "v${version}";
-      sha256 = "09x9g4wzfxfhpby3aa1fbhw3iqv1vyd6h526nrm9612ba5d0myh9";
+      sha256 = "1ghx62z63yyf8wv4bcvfxwxs5mc7b4nrcss6lc1i5s0yjvzvyi6h";
     };
 
     doCheck = false;

From aece1407d5a568e90d0c680fbc58266759cf6db4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 10 Jun 2015 11:48:52 -0700
Subject: [PATCH 0971/2322] pulseaudio: Add a flag for supporting 32-bit

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

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 566130feb6d..bd010738500 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -12,7 +12,7 @@ let
 
   # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps
   # using 32bit alsa on 64bit linux.
-  enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.libpulseaudio != null);
+  enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.libpulseaudio != null);
 
   ids = config.ids;
 
@@ -78,6 +78,12 @@ in {
         '';
       };
 
+      support32Bit = mkOption {
+        type = types.bool;
+        default = false;
+        description = "no";
+      };
+
       configFile = mkOption {
         type = types.path;
         description = ''

From c891134b77c05b98d1fc89f2bac394dbe4382fe8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 10 Jun 2015 11:50:21 -0700
Subject: [PATCH 0972/2322] nixos/grub: Prevent module errors and make gfxmode
 configurable

---
 .../modules/system/boot/loader/grub/grub.nix  | 22 +++++++++++++++++--
 .../system/boot/loader/grub/install-grub.pl   | 20 ++++++++++++-----
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 0b6333ab573..cb01774f9ab 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -28,7 +28,7 @@ let
   f = x: if x == null then "" else "" + x;
 
   grubConfig = args: pkgs.writeText "grub-config.xml" (builtins.toXML
-    { splashImage = f config.boot.loader.grub.splashImage;
+    { splashImage = f cfg.splashImage;
       grub = f grub;
       grubTarget = f (grub.grubTarget or "");
       shell = "${pkgs.stdenv.shell}";
@@ -42,7 +42,7 @@ let
       inherit (cfg)
         version extraConfig extraPerEntryConfig extraEntries
         extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout
-        default fsIdentifier efiSupport;
+        default fsIdentifier efiSupport gfxmodeEfi gfxmodeBios;
       path = (makeSearchPath "bin" ([
         pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfsProgs
         pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else [])
@@ -242,6 +242,24 @@ in
         '';
       };
 
+      gfxmodeEfi = mkOption {
+        default = "auto";
+        example = "1024x768";
+        type = types.str;
+        description = ''
+          The gfxmode to pass to grub when loading a graphical boot interface under efi.
+        '';
+      };
+
+      gfxmodeBios = mkOption {
+        default = "1024x768";
+        example = "auto";
+        type = types.str;
+        description = ''
+          The gfxmode to pass to grub when loading a graphical boot interface under bios.
+        '';
+      };
+
       configurationLimit = mkOption {
         default = 100;
         example = 120;
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index fcf5871203d..016b5a23ed4 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -57,6 +57,8 @@ my $grubTargetEfi = get("grubTargetEfi");
 my $bootPath = get("bootPath");
 my $canTouchEfiVariables = get("canTouchEfiVariables");
 my $efiSysMountPoint = get("efiSysMountPoint");
+my $gfxmodeEfi = get("gfxmodeEfi");
+my $gfxmodeBios = get("gfxmodeBios");
 $ENV{'PATH'} = get("path");
 
 die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2;
@@ -255,14 +257,22 @@ else {
         fi
 
         # Setup the graphics stack for bios and efi systems
-        insmod vbe
-        insmod efi_gop
-        insmod efi_uga
+        if [ \"\${grub_platform}\" = \"efi\" ]; then
+          insmod efi_gop
+          insmod efi_uga
+        else
+          insmod vbe
+        fi
         insmod font
         if loadfont " . $grubBoot->path . "/grub/fonts/unicode.pf2; then
           insmod gfxterm
-          set gfxmode=auto
-          set gfxpayload=keep
+          if [ \"\${grub_platform}\" = \"efi\" ]; then
+            set gfxmode=$gfxmodeEfi
+            set gfxpayload=keep
+          else
+            set gfxmode=$gfxmodeBios
+            set gfxpayload=text
+          fi
           terminal_output gfxterm
         fi
     ";

From 93ddc18a59bec4107a00c2c26ac144fdf68ebd15 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 10 Jun 2015 14:24:23 -0700
Subject: [PATCH 0973/2322] Make jdk / jre derivations installable

---
 pkgs/top-level/all-packages.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6616c76f9a5..70d38f76e60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3945,23 +3945,28 @@ let
   openjdk7 = callPackage ../development/compilers/openjdk {
     bootjdk = openjdk7-bootstrap;
   };
-  openjdk7_jre = openjdk7.jre;
+  openjdk7_jdk = openjdk7 // { outputs = [ "out" ]; };
+  openjdk7_jre = openjdk7 // { outputs = [ "jre" ]; };
 
   openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix {
     bootjdk = openjdk8-bootstrap;
   };
-  openjdk8_jre = openjdk8.jre;
+  openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; };
+  openjdk8_jre = openjdk8 // { outputs = [ "jre" ]; };
 
   openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8;
 
-  jdk7 = openjdk7;
-  jre7 = jdk7.jre;
+  java7 = openjdk7;
+  jdk7 = java7 // { outputs = [ "out" ]; };
+  jre7 = java7 // { outputs = [ "jre" ]; };
 
-  jdk8 = openjdk8;
-  jre8 = jdk8.jre;
+  java8 = openjdk8;
+  jdk8 = java8 // { outputs = [ "out" ]; };
+  jre8 = java8 // { outputs = [ "jre" ]; };
 
-  jdk = if stdenv.isDarwin then openjdk-darwin else jdk8;
-  jre = jdk.jre;
+  java = if stdenv.isDarwin then openjdk-darwin else jdk8;
+  jdk = java // { outputs = [ "out" ]; };
+  jre = java // { outputs = [ "jre" ]; };
 
   oraclejdk = pkgs.jdkdistro true false;
 

From adbed3fb6af990d480e1b83eaf0a636260ee6a91 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 10 Jun 2015 18:18:04 +0200
Subject: [PATCH 0974/2322] pythonPackages.neovim: new package added

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c324ae1c00c..94e26068252 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5509,18 +5509,18 @@ let
   };
 
   futures = buildPythonPackage rec {
-    name = "futures-2.1.6";
-
+    name = "futures-3.0.2";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/futures/futures-2.1.6.tar.gz";
-      md5 = "cfab9ac3cd55d6c7ddd0546a9f22f453";
+      url = "https://pypi.python.org/packages/source/f/futures/${name}.tar.gz";
+      md5 = "42aaf1e4de48d6e871d77dc1f9d96d5a";
     };
 
     meta = with pkgs.stdenv.lib; {
       description = "Backport of the concurrent.futures package from Python 3.2";
-      homepage = http://code.google.com/p/pythonfutures;
+      homepage = "https://github.com/agronholm/pythonfutures";
       license = licenses.bsd2;
+      maintainers = with maintainers; [ garbas ];
     };
   };
 
@@ -15718,4 +15718,50 @@ let
     };
   };
 
+  trollius = buildPythonPackage rec {
+    version = "1.0.4";
+    name = "trollius-${version}";
+    disabled = ! isPy27;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/t/trollius/${name}.tar.gz";
+      md5 = "3631a464d49d0cbfd30ab2918ef2b783";
+    };
+
+    buildInputs = [ self.mock ];
+
+    propagatedBuildInputs = [ self.futures ];
+
+    meta = {
+      description = "Port of the Tulip project (asyncio module, PEP 3156) on Python 2";
+      homepage = "https://bitbucket.org/enovance/trollius";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ garbas ];
+    };
+  };
+
+  neovim = buildPythonPackage rec {
+    version = "0.0.36";
+    name = "neovim-${version}";
+    disabled = ! isPy27;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/n/neovim/${name}.tar.gz";
+      md5 = "8cdad23402e29c7c5a1e85770e976edf";
+    };
+
+    propagatedBuildInputs = with self; [
+      msgpack
+      trollius
+      greenlet
+    ];
+
+    meta = {
+      description = "Python client for Neovim";
+      homepage = "https://github.com/neovim/python-client";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ garbas ];
+    };
+  };
+
 }; in pythonPackages

From 4970aa6f46d50516c27da6645a8b10072521bba8 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 10 Jun 2015 23:23:52 +0200
Subject: [PATCH 0975/2322] pythonPackages: fix apscheduler

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 94e26068252..f974529930c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -522,17 +522,54 @@ let
     };
   };
 
+  funcsigs = buildPythonPackage rec {
+    name = "funcsigs-0.4";
+    disabled = ! (isPy26 || isPy27 || isPy33 || isPyPy);
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/f/funcsigs/${name}.tar.gz";
+      md5 = "fb1d031f284233e09701f6db1281c2a5";
+    };
+
+    buildInputs = with self; [
+      unittest2
+    ];
+
+    meta = with pkgs.stdenv.lib; {
+      description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+";
+      homepage = "https://github.com/aliles/funcsigs";
+      maintainers = with maintainers; [ garbas ];
+      license = licenses.asl20;
+    };
+  };
 
   apscheduler = buildPythonPackage rec {
     name = "APScheduler-3.0.1";
-
-    propagatedBuildInputs = with self; [ futures tzlocal six pytest mock sqlalchemy9 ];
+    disabled = !isPy27;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/A/APScheduler/${name}.tar.gz";
-      sha256 = "1dcyk58svhhd7flpq0fbyzcp0z3a1as4ddmdv1rxqvqng0sxhwaf";
+      md5 = "7c3687b3dcd645fe9df48e34eb7a7592";
     };
 
+    buildInputs = with self; [
+      pytest
+      sqlalchemy9
+      tornado
+      twisted
+      mock
+      trollius
+      funcsigs
+      gevent
+    ];
+
+    propagatedBuildInputs = with self; [
+      six
+      pytz
+      tzlocal
+      futures
+    ];
+
     meta = with pkgs.stdenv.lib; {
       description = "A Python library that lets you schedule your Python code to be executed";
       homepage = http://pypi.python.org/pypi/APScheduler/;
@@ -540,7 +577,6 @@ let
     };
   };
 
-
   area53 = buildPythonPackage (rec {
     name = "Area53-0.94";
 

From 1c3585e411fa4f2f47c38454da2cb825ebd7b3e7 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 10 Jun 2015 23:50:01 +0200
Subject: [PATCH 0976/2322] pythonPackages.livestreamer: fix builds for py33
 and py34

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f974529930c..a6515c7b13a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7943,8 +7943,13 @@ let
       sha256 = "1fp3d3z2grb1ls97smjkraazpxnvajda2d1g1378s6gzmda2jvjd";
     };
 
-    buildInputs = with self; [ pkgs.makeWrapper ];
-    propagatedBuildInputs = with self; [ requests2 pkgs.rtmpdump pycrypto singledispatch futures ];
+    buildInputs = [ pkgs.makeWrapper ];
+
+    propagatedBuildInputs = with self; [ pkgs.rtmpdump pycrypto requests2 ]
+      ++ optionals isPy26 [ singledispatch futures argparse ]
+      ++ optionals isPy27 [ singledispatch futures ]
+      ++ optionals isPy33 [ singledispatch ];
+
     postInstall = ''
       wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin
     '';

From 50bf92623df5ec88de6fb63d8a83ba6e39049f03 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 10 Jun 2015 23:57:13 +0200
Subject: [PATCH 0977/2322] Update package 'fira' to version 4.103.

---
 pkgs/data/fonts/fira/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix
index 151c945ee9e..6646fcb86b1 100644
--- a/pkgs/data/fonts/fira/default.nix
+++ b/pkgs/data/fonts/fira/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "fira-4.1";
+  name = "fira-4.103";
 
   src = fetchurl {
-    url = "http://www.carrois.com/downloads/fira_4_1/FiraFonts4100.zip";
-    sha256 = "0mqmmq1m2p0hb0x4mr74gghqr75iglilah7psfb3vdc80fc9h6yk";
+    url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4103.zip;
+    sha256 = "1nw5icg3134qq2qfspvj2kclsv3965szby2lfcr65imf7lj4k52z";
   };
 
   buildInputs = [unzip];
   phases = [ "unpackPhase" "installPhase" ];
-  sourceRoot = "FiraFonts4100";
+  sourceRoot = "FiraFonts4103";
 
   installPhase = ''
     mkdir -p $out/share/fonts/opentype

From 3b95f897359cb63270a0c34df300a5f447dd15d0 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 11 Jun 2015 00:06:44 +0200
Subject: [PATCH 0978/2322] Update package 'fira-mono' to version 3.203.

---
 pkgs/data/fonts/fira-mono/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix
index 92d6b1e25b5..a01f2a62424 100644
--- a/pkgs/data/fonts/fira-mono/default.nix
+++ b/pkgs/data/fonts/fira-mono/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "fira-mono-3.2";
+  name = "fira-mono-3.203";
 
   src = fetchurl {
-    url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3200.zip;
-    sha256 = "0g3i54q8czf3vylgasj62w2n7l1a2yrbyibjlx1qk3awh7fr1r7p";
+    url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3203.zip;
+    sha256 = "0qaplpmsqys42a49x8d15ca2gqw1v6a6k2d56ja1j38dmr2qmpv4";
   };
 
   buildInputs = [ unzip ];
   phases = [ "unpackPhase" "installPhase" ];
-  sourceRoot = "FiraMonoFonts3200";
+  sourceRoot = "FiraMonoFonts3203";
 
   installPhase = ''
     mkdir -p $out/share/fonts/opentype

From fcf99efcd226dd75f40452ee6dcdaeab67627123 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Jun 2015 00:26:24 +0200
Subject: [PATCH 0979/2322] Reduce dependency bloat

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

diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 668ac138be8..824b909f1d9 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, dejagnu }:
+{ fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "libffi-3.2.1";
@@ -10,15 +10,11 @@ stdenv.mkDerivation rec {
 
   patches = if stdenv.isCygwin then [ ./3.2.1-cygwin.patch ] else null;
 
-  buildInputs = stdenv.lib.optional doCheck dejagnu;
-
   configureFlags = [
     "--with-gcc-arch=generic" # no detection of -march= or -mtune=
     "--enable-pax_emutramp"
   ];
 
-  doCheck = stdenv.isLinux; # until we solve dejagnu problems on darwin and expect on BSD
-
   dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling.
 
   # Install headers in the right place.

From bb23251c90068e849c447830f6b6bd52565239f1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 10 Jun 2015 15:33:22 -0700
Subject: [PATCH 0980/2322] java: Fix jre derivations

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70d38f76e60..fc66f38a755 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3946,27 +3946,27 @@ let
     bootjdk = openjdk7-bootstrap;
   };
   openjdk7_jdk = openjdk7 // { outputs = [ "out" ]; };
-  openjdk7_jre = openjdk7 // { outputs = [ "jre" ]; };
+  openjdk7_jre = openjdk7.jre // { outputs = [ "jre" ]; };
 
   openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix {
     bootjdk = openjdk8-bootstrap;
   };
   openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; };
-  openjdk8_jre = openjdk8 // { outputs = [ "jre" ]; };
+  openjdk8_jre = openjdk8.jre // { outputs = [ "jre" ]; };
 
   openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8;
 
   java7 = openjdk7;
   jdk7 = java7 // { outputs = [ "out" ]; };
-  jre7 = java7 // { outputs = [ "jre" ]; };
+  jre7 = java7.jre // { outputs = [ "jre" ]; };
 
   java8 = openjdk8;
   jdk8 = java8 // { outputs = [ "out" ]; };
-  jre8 = java8 // { outputs = [ "jre" ]; };
+  jre8 = java8.jre // { outputs = [ "jre" ]; };
 
   java = if stdenv.isDarwin then openjdk-darwin else jdk8;
   jdk = java // { outputs = [ "out" ]; };
-  jre = java // { outputs = [ "jre" ]; };
+  jre = java.jre // { outputs = [ "jre" ]; };
 
   oraclejdk = pkgs.jdkdistro true false;
 

From 502a19b2b47418393ff00c38622285207884d460 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 10 Jun 2015 15:47:08 -0700
Subject: [PATCH 0981/2322] nixos/grub: Support labeling efi bootloaders with
 independent id's

---
 .../modules/system/boot/loader/grub/grub.nix  | 21 +++++++++++++++++--
 .../system/boot/loader/grub/install-grub.pl   |  3 ++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index cb01774f9ab..449f58ae4dd 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -27,7 +27,12 @@ let
 
   f = x: if x == null then "" else "" + x;
 
-  grubConfig = args: pkgs.writeText "grub-config.xml" (builtins.toXML
+  grubConfig = args:
+    let
+      efiSysMountPoint = if args.efiSysMountPoint == null then args.path else args.efiSysMountPoint;
+      efiSysMountPoint' = replaceChars [ "/" ] [ "-" ] efiSysMountPoint;
+    in
+    pkgs.writeText "grub-config.xml" (builtins.toXML
     { splashImage = f cfg.splashImage;
       grub = f grub;
       grubTarget = f (grub.grubTarget or "");
@@ -36,7 +41,8 @@ let
       grubEfi = f grubEfi;
       grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else "";
       bootPath = args.path;
-      efiSysMountPoint = if args.efiSysMountPoint == null then args.path else args.efiSysMountPoint;
+      bootloaderId = if args.efiBootloaderId == null then "NixOS${efiSysMountPoint'}" else args.efiBootloaderId;
+      inherit efiSysMountPoint;
       inherit (args) devices;
       inherit (efi) canTouchEfiVariables;
       inherit (cfg)
@@ -141,6 +147,17 @@ in
             '';
           };
 
+          efiBootloaderId = mkOption {
+            default = null;
+            example = "NixOS-fsid";
+            type = types.nullOr types.str;
+            description = ''
+              The id of the bootloader to store in efi nvram.
+              The default is to name it NixOS and append the path or efiSysMountPoint.
+              This is only used if <literal>boot.loader.efi.canTouchEfiVariables</literal> is true.
+            '';
+          };
+
           devices = mkOption {
             default = [ ];
             example = [ "/dev/sda" "/dev/sdb" ];
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 016b5a23ed4..66d82e091d1 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -59,6 +59,7 @@ my $canTouchEfiVariables = get("canTouchEfiVariables");
 my $efiSysMountPoint = get("efiSysMountPoint");
 my $gfxmodeEfi = get("gfxmodeEfi");
 my $gfxmodeBios = get("gfxmodeBios");
+my $bootloaderId = get("bootloaderId");
 $ENV{'PATH'} = get("path");
 
 die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2;
@@ -521,7 +522,7 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) {
 if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both")) {
     print STDERR "installing the GRUB $grubVersion EFI boot loader into $efiSysMountPoint...\n";
     if ($canTouchEfiVariables eq "true") {
-        system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint") == 0
+        system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint", "--bootloader-id=$bootloaderId") == 0
                 or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n";
     } else {
         system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint", "--no-nvram") == 0

From 51ce29718750fb34c0d849942a9462e520081577 Mon Sep 17 00:00:00 2001
From: William Giokas <1007380@gmail.com>
Date: Sun, 7 Jun 2015 11:34:29 -0700
Subject: [PATCH 0982/2322] youtube-dl: make a python package

This allows youtube-dl to support all versions of python, and be built
correctly even when the python version is overridden by the user.

An alias to youtube-dl has been added which points to the default python
version's youtube-dl.

Also, ffmpeg has been made into an optional dependency. If ffmpeg is set
to 'null' then it will not be built and there will be no wrapper for it
either. An extra package, youtube-dl-light, is the same as youtube-dl
but without the ffmpeg dependency.
---
 pkgs/tools/misc/youtube-dl/default.nix | 18 ++++++------------
 pkgs/top-level/all-packages.nix        |  7 +------
 pkgs/top-level/python-packages.nix     | 13 +++++++++++++
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 3985f8a0c83..eb337573018 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, makeWrapper, python, zip, ffmpeg, pandoc ? null }:
+{ stdenv, fetchurl, makeWrapper, buildPythonPackage, zip, ffmpeg
+, pandoc ? null }:
 
 # Pandoc is required to build the package's man page. Release tarballs
 # contain a formatted man page already, though, so it's fine to pass
@@ -7,7 +8,7 @@
 # case someone wants to use this derivation to build a Git version of
 # the tool that doesn't have the formatted man page included.
 
-stdenv.mkDerivation rec {
+buildPythonPackage rec {
   name = "youtube-dl-${version}";
   version = "2015.05.29";
 
@@ -16,18 +17,11 @@ stdenv.mkDerivation rec {
     sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij";
   };
 
-  buildInputs = [ python makeWrapper zip pandoc ];
-
-  patchPhase = "rm youtube-dl";
-
-  configurePhase = ''
-    makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python )
-  '';
+  buildInputs = [ makeWrapper zip pandoc ];
 
   # Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
-  postInstall = ''
-    wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"
-  '';
+  postInstall = stdenv.lib.optionalString (ffmpeg != null) 
+    ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"'';
 
   meta = with stdenv.lib; {
     homepage = "http://rg3.github.com/youtube-dl/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b49c2e3b59d..3eb1ef1fddd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3391,12 +3391,6 @@ let
   # To expose more packages for Yi, override the extraPackages arg.
   yi = callPackage ../applications/editors/yi/wrapper.nix { };
 
-  youtube-dl = callPackage ../tools/misc/youtube-dl {
-    # Release versions don't need pandoc because the formatted man page
-    # is included in the tarball.
-    pandoc = null;
-  };
-
   zbar = callPackage ../tools/graphics/zbar {
     pygtk = lib.overrideDerivation pygtk (x: {
       gtk = gtk2;
@@ -14774,6 +14768,7 @@ let
   lttngUst = lttng-ust;  # added 2014-07-31
   jquery_ui = jquery-ui;  # added 2014-09-07
   youtubeDL = youtube-dl;  # added 2014-10-26
+  youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07
   rdiff_backup = rdiff-backup;  # added 2014-11-23
   htmlTidy = html-tidy;  # added 2014-12-06
   libtidy = html-tidy;  # added 2014-12-21
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d3ddc879a17..c602200e81f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13466,6 +13466,19 @@ let
     };
   });
 
+  youtube-dl = callPackage ../tools/misc/youtube-dl {
+    # Release versions don't need pandoc because the formatted man page
+    # is included in the tarball.
+    pandoc = null;
+  };
+
+  youtube-dl-light = callPackage ../tools/misc/youtube-dl {
+    # Release versions don't need pandoc because the formatted man page
+    # is included in the tarball.
+    ffmpeg = null;
+    pandoc = null;
+  };
+
   zbase32 = buildPythonPackage (rec {
     name = "zbase32-1.1.2";
 

From 117dfac3d1f07e3958cd20843177d95fdc174c58 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 11 Jun 2015 00:58:23 +0200
Subject: [PATCH 0983/2322] gnome-pomodoro: Fix meta description

---
 pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
index ad95b76b2a3..650d978277b 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
@@ -38,9 +38,11 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://github.com/codito/gnome-shell-pomodoro;
-    description =
-      "Personal information management application that provides integrated " + 
-      "mail, calendaring and address book functionality";
+    description = "A time management utility for GNOME based on the pomodoro technique";
+    longDescription = ''
+      This GNOME utility helps to manage time according to Pomodoro Technique.
+      It intends to improve productivity and focus by taking short breaks.
+    '';
     maintainers = with maintainers; [ DamienCassou jgeerds ];
     license = licenses.gpl3;
     platforms = platforms.linux;

From 8b2f226a96b90f4040af8235d158a87ada49687e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Jun 2015 01:22:37 +0200
Subject: [PATCH 0984/2322] Fix Samba build

---
 pkgs/servers/samba/4.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 269ba2ec186..aa28a3fca78 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     export SAMBA_LIBS="$(find $out -type f -name \*.so -exec dirname {} \; | sort | uniq)"
-    read -r -d "" SCRIPT << EOF
+    read -r -d "" SCRIPT << EOF || true
     [ -z "\$SAMBA_LIBS" ] && exit 1;
     BIN='{}';
     OLD_LIBS="\$(patchelf --print-rpath "\$BIN" 2>/dev/null | tr ':' '\n')";

From d21b6702a3fae4c0c5003b08741f1a1d4d6c815a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Jun 2015 02:17:00 +0200
Subject: [PATCH 0985/2322] mesa: Reduce dependency bloat

In particular, don't depend on clang. It's really bad to have a core
package like Mesa pull in multiple C compilers.
---
 pkgs/development/libraries/mesa/default.nix | 13 ++++---------
 pkgs/top-level/all-packages.nix             |  1 -
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 6fe65ca25df..f2b36dd8c3e 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, flex, bison, autoreconfHook, substituteAll
 , python, libxml2Python, file, expat, makedepend, pythonPackages
 , libdrm, xorg, wayland, udev, llvmPackages, libffi, libomxil-bellagio
-, libvdpau, libelf, libva, libclc
+, libvdpau, libelf, libva
 , grsecEnabled
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
 , enableExtraFeatures ? false # not maintained
@@ -26,7 +26,6 @@ let
   version = "10.5.6";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
-  clang = if llvmPackages ? clang-unwrapped then llvmPackages.clang-unwrapped else llvmPackages.clang;
 in
 with { inherit (stdenv.lib) optional optionals optionalString; };
 
@@ -63,7 +62,6 @@ stdenv.mkDerivation {
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
-    "--with-clang-libdir=${clang}/lib"
     "--with-dri-driverdir=$(drivers)/lib/dri"
     "--with-dri-searchpath=${driverLink}/lib/dri"
 
@@ -81,13 +79,11 @@ stdenv.mkDerivation {
     ++ [
     "--enable-xvmc"
     "--enable-vdpau"
-    "--enable-omx"
-    "--enable-va"
+    #"--enable-omx"
+    #"--enable-va"
 
     # TODO: Figure out how to enable opencl without having a runtime dependency on clang
     "--disable-opencl"
-    #"--enable-opencl"
-    #"--enable-opencl-icd"
 
     "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast"
     "--enable-shared-glapi"
@@ -111,8 +107,7 @@ stdenv.mkDerivation {
     autoreconfHook intltool expat libxml2Python llvmPackages.llvm
     glproto dri2proto dri3proto presentproto
     libX11 libXext libxcb libXt libXfixes libxshmfence
-    libffi wayland libvdpau libelf libXvMC libomxil-bellagio libva
-    libclc clang
+    libffi wayland libvdpau libelf libXvMC /* libomxil-bellagio libva */
   ] ++ optional stdenv.isLinux udev;
 
   enableParallelBuilding = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f3c48eba32..f1e8d9e37f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7340,7 +7340,6 @@ let
     # makes it slower, but during runtime we link against just mesa_drivers
     # through /run/opengl-driver*, which is overriden according to config.grsecurity
     grsecEnabled = true;
-    libva = libva.override { mesa = null; };
     llvmPackages = llvmPackages_36;
   });
   mesa_glu =  mesaDarwinOr (callPackage ../development/libraries/mesa-glu { });

From f2d7f573af9063a3a484c80e426490e5093afe32 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 11 Jun 2015 02:42:20 +0200
Subject: [PATCH 0986/2322] neovim: adding python2 and python3 support

neovim:
- possibility to extend neovim (via .override) and passing extraPythonPackages
  or extraPython3Packages
- neovim's python interpreter can be found as nvim-python / nvim-python3
- wrapping nvim binary and setting `g:python_host_prog` and
  `g:python3_host_prog` via --cmd flag

python-packages.nix fixes:
- ordereddict builds for py26 and uses disabled argument to tell this
- trollius builds on all python platforms except 3.4 (where is included in
  standard librarary)
- neovim builds on all python platforms
---
 pkgs/applications/editors/neovim/default.nix | 61 +++++++++++++++-----
 pkgs/top-level/python-packages.nix           | 37 +++++++-----
 2 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 814b05ced36..e2dbc4abc56 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,18 +1,16 @@
 { stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack
 , libtermkey, libtool, libuv, lpeg, lua, luajit, luaMessagePack
-, luabitop, ncurses, perl, pkgconfig, unibilium
-, withJemalloc ? true, jemalloc }:
+, luabitop, ncurses, perl, pkgconfig, unibilium, makeWrapper
+, withPython ? true, pythonPackages, extraPythonPackages ? []
+, withPython3 ? true, python3Packages, extraPython3Packages ? []
+, withJemalloc ? true, jemalloc
+}:
 
-let version = "2015-06-09"; in
-stdenv.mkDerivation rec {
-  name = "neovim-${version}";
+with stdenv.lib;
 
-  src = fetchFromGitHub {
-    sha256 = "1lycql0lwi7ynrsaln4kxybwvxb9fvganiq3ba4pnpcfgl155k1j";
-    rev = "6270d431aaeed71e7a8782411f36409ab8e0ee35";
-    repo = "neovim";
-    owner = "neovim";
-  };
+let
+
+  version = "2015-06-09";
 
   # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness:
   neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation rec {
@@ -31,7 +29,7 @@ stdenv.mkDerivation rec {
 
     enableParallelBuilding = true;
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "VT220/xterm/ECMA-48 terminal emulator library";
       homepage = http://www.leonerd.org.uk/code/libvterm/;
       license = licenses.mit;
@@ -40,9 +38,30 @@ stdenv.mkDerivation rec {
     };
   };
 
+  pythonEnv = pythonPackages.python.buildEnv.override {
+    extraLibs = [ pythonPackages.neovim ] ++ extraPythonPackages;
+    ignoreCollisions = true;
+  };
+
+  python3Env = python3Packages.python.buildEnv.override {
+    extraLibs = [ python3Packages.neovim ] ++ extraPython3Packages;
+    ignoreCollisions = true;
+  };
+
+in stdenv.mkDerivation rec {
+  name = "neovim-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "1lycql0lwi7ynrsaln4kxybwvxb9fvganiq3ba4pnpcfgl155k1j";
+    rev = "6270d431aaeed71e7a8782411f36409ab8e0ee35";
+    repo = "neovim";
+    owner = "neovim";
+  };
+
   enableParallelBuilding = true;
 
   buildInputs = [
+    makeWrapper
     cmake
     glib
     libtermkey
@@ -57,7 +76,8 @@ stdenv.mkDerivation rec {
     neovimLibvterm
     pkgconfig
     unibilium
-  ] ++ stdenv.lib.optional withJemalloc jemalloc;
+  ] ++ optional withJemalloc jemalloc;
+
   nativeBuildInputs = [
     gettext
   ];
@@ -65,7 +85,20 @@ stdenv.mkDerivation rec {
   LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so";
   LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua";
 
-  meta = with stdenv.lib; {
+  postInstall = optionalString withPython ''
+    ln -s ${pythonEnv}/bin/python $out/bin/nvim-python
+  '' + optionalString withPython3 ''
+    ln -s ${python3Env}/bin/python $out/bin/nvim-python3
+  '' + optionalString (withPython || withPython3) ''
+      wrapProgram $out/bin/nvim --add-flags "${
+        (optionalString withPython
+          ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" '') +
+        (optionalString withPython3
+          ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\"'')
+      }"
+  '';
+
+  meta = {
     description = "Vim text editor fork focused on extensibility and agility";
     longDescription = ''
       Neovim is a project that seeks to aggressively refactor Vim in order to:
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b47aa36f2c7..4da6cdbcf78 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8100,14 +8100,21 @@ let
   #   };
   # });
 
-  ordereddict = if isPy26 then (buildPythonPackage {
+  ordereddict = buildPythonPackage rec {
     name = "ordereddict-1.1";
+    disabled = !isPy26;
+
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/o/ordereddict/ordereddict-1.1.tar.gz";
+      url = "http://pypi.python.org/packages/source/o/ordereddict/${name}.tar.gz";
       md5 = "a0ed854ee442051b249bfad0f638bbec";
     };
-    doCheck = false;
-  }) else null;
+
+    meta = {
+      description = "A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6.";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ garbas ];
+    };
+  };
 
   ply = buildPythonPackage (rec {
     name = "ply-3.4";
@@ -15775,16 +15782,23 @@ let
   trollius = buildPythonPackage rec {
     version = "1.0.4";
     name = "trollius-${version}";
-    disabled = ! isPy27;
+    disabled = isPy34;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/t/trollius/${name}.tar.gz";
       md5 = "3631a464d49d0cbfd30ab2918ef2b783";
     };
 
-    buildInputs = [ self.mock ];
+    buildInputs = with self; [ mock ]
+      ++ optional isPy26 unittest2;
 
-    propagatedBuildInputs = [ self.futures ];
+    propagatedBuildInputs = with self; []
+      ++ optional isPy26 ordereddict
+      ++ optional (isPy26 || isPy27 || isPyPy) futures;
+
+    patchPhase = optionalString isPy26 ''
+      sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|" tests/test_tasks.py
+    '';
 
     meta = {
       description = "Port of the Tulip project (asyncio module, PEP 3156) on Python 2";
@@ -15797,18 +15811,15 @@ let
   neovim = buildPythonPackage rec {
     version = "0.0.36";
     name = "neovim-${version}";
-    disabled = ! isPy27;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/n/neovim/${name}.tar.gz";
       md5 = "8cdad23402e29c7c5a1e85770e976edf";
     };
 
-    propagatedBuildInputs = with self; [
-      msgpack
-      trollius
-      greenlet
-    ];
+    propagatedBuildInputs = with self; [ msgpack ]
+      ++ optional (!isPyPy) greenlet
+      ++ optional (!isPy34) trollius;
 
     meta = {
       description = "Python client for Neovim";

From 11f0f3cba9bfade848a89a292797cdc0363d6c39 Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <e.bachmakov@gmail.com>
Date: Wed, 10 Jun 2015 21:36:51 -0400
Subject: [PATCH 0987/2322] photoqt: 1.1.0.1 -> 1.2

remove no longer necessary patch
---
 .../applications/graphics/photoqt/default.nix |  6 +--
 .../photoqt/graphicsmagick-path.patch         | 46 -------------------
 2 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100644 pkgs/applications/graphics/photoqt/graphicsmagick-path.patch

diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index 9e2c3a18a63..2d41cfe5189 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -1,19 +1,17 @@
 { stdenv, fetchurl, cmake, qt5, exiv2, graphicsmagick }:
 
 let
-  version = "1.1.0.1";
+  version = "1.2";
 in
 stdenv.mkDerivation rec {
   name = "photoqt-${version}";
   src = fetchurl {
     url = "http://photoqt.org/pkgs/photoqt-${version}.tar.gz";
-    sha256 = "1y59ys1dgjppahs7v7kxwva7ik23s0x7j2f6glv6sn23l9cfq9rp";
+    sha256 = "1dnnj2h3j517hcbjxlzk035fis44wdmqq7dvhwpmq1rcr0v32aaa";
   };
 
   buildInputs = [ cmake qt5.base qt5.tools exiv2 graphicsmagick ];
 
-  patches = [ ./graphicsmagick-path.patch ];
-
   preConfigure = ''
     export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
   '';
diff --git a/pkgs/applications/graphics/photoqt/graphicsmagick-path.patch b/pkgs/applications/graphics/photoqt/graphicsmagick-path.patch
deleted file mode 100644
index da9b70e31ed..00000000000
--- a/pkgs/applications/graphics/photoqt/graphicsmagick-path.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/CMake/FindMagick.cmake	2014-10-13 19:24:30.000000000 +0200
-+++ b/CMake/FindMagick.cmake	2014-12-27 18:54:19.611759021 +0100
-@@ -19,28 +19,11 @@
- SET(MAGICK++_FOUND "NO" )
- 
- FIND_PATH( MAGICK_INCLUDE_DIR magick/magick.h
--  "$ENV{MAGICK_LOCATION}/magick"
--  "$ENV{MAGICK_LOCATION}/include/magick"
--  "$ENV{MAGICK_HOME}/include/magick"
--  /usr/include/magick
--  /usr/include/
--  /usr/include/GraphicsMagick
--  /opt/local/include/GraphicsMagick/magick
--  /opt/local/include/GraphicsMagick
-+  "$ENV{MAGICK_LOCATION}"
-   )
- 
- FIND_PATH( MAGICK++_INCLUDE_DIR Magick++.h
--  "$ENV{MAGICK++_LOCATION}/Magick++"
--  "$ENV{MAGICK++_LOCATION}/include/"
--  "$ENV{MAGICK_LOCATION}/Magick++"
--  "$ENV{MAGICK_LOCATION}/include/Magick++"
--  "$ENV{MAGICK_LOCATION}/include/"
--  "$ENV{MAGICK_HOME}/include/"
--  /usr/include/Magick++
--  /usr/include/GraphicsMagick
--  /usr/include/
--  /opt/local/include/GraphicsMagick/Magick++
--  /opt/local/include/GraphicsMagick
-+  "$ENV{MAGICK_LOCATION}"
-   )
-   
- FIND_LIBRARY( Magick GraphicsMagick
-@@ -55,12 +38,7 @@
- 
- FIND_LIBRARY( Magick++ GraphicsMagick++
-   PATHS 
--  "$ENV{MAGICK++_LOCATION}/.libs"
--  "$ENV{MAGICK_LOCATION}/.libs"
--  "$ENV{MAGICK++_LOCATION}/lib"
-   "$ENV{MAGICK_LOCATION}/lib"
--  "$ENV{MAGICK_HOME}/lib"
--  /opt/local/lib
-   DOC   "GraphicsMagick Magick++ library"
- )
- 

From 2b99951f995a0c110197137b131c68a62eb57f83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 11 Jun 2015 09:02:56 +0200
Subject: [PATCH 0988/2322] gnutls: don't set cert location except on Linux

Also refactor lib.optional*. Preserves .drv hashes on Linux.
---
 pkgs/development/libraries/gnutls/generic.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 8c169153a66..07760933935 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -7,17 +7,21 @@
 
 assert guileBindings -> guile != null;
 
+let
+  inherit (stdenv.lib) optional optionals optionalString;
+in
 stdenv.mkDerivation rec {
   name = "gnutls-${version}";
 
   inherit src patches;
 
-  configureFlags = [
+  configureFlags =
     # FIXME: perhaps use $SSL_CERT_FILE instead
-    "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
+    optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
+  ++ [
     "--disable-dependency-tracking"
     "--enable-fast-install"
-  ] ++ stdenv.lib.optional guileBindings
+  ] ++ optionals guileBindings
     [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ];
 
   # Build of the Guile bindings is not parallel-safe.  See
@@ -26,9 +30,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = !guileBindings;
 
   buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp ]
-    ++ stdenv.lib.optional stdenv.isLinux trousers
+    ++ optional stdenv.isLinux trousers
     ++ [ unbound ]
-    ++ stdenv.lib.optional guileBindings guile;
+    ++ optional guileBindings guile;
 
   nativeBuildInputs = [ perl pkgconfig autoreconfHook ];
 
@@ -37,7 +41,7 @@ stdenv.mkDerivation rec {
   doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
 
   # Fixup broken libtool and pkgconfig files
-  preFixup = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  preFixup = optionalString (!stdenv.isDarwin) ''
     sed -e 's,-ltspi,-L${trousers}/lib -ltspi,' \
         -e 's,-lz,-L${zlib}/lib -lz,' \
         -e 's,-lgmp,-L${gmp}/lib -lgmp,' \

From 4227b13af6d37225cbbca8fb91a64cc6da1f3d51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 1 Jun 2015 18:48:24 +0200
Subject: [PATCH 0989/2322] pypy: 2.5.1 -> 2.6.0

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

diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix
index c5abefc6a78..a453fd3e1a9 100644
--- a/pkgs/development/interpreters/pypy/default.nix
+++ b/pkgs/development/interpreters/pypy/default.nix
@@ -6,8 +6,8 @@ assert zlibSupport -> zlib != null;
 
 let
 
-  majorVersion = "2.5";
-  version = "${majorVersion}.1";
+  majorVersion = "2.6";
+  version = "${majorVersion}.0";
   libPrefix = "pypy${majorVersion}";
 
   pypy = stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ let
 
     src = fetchurl {
       url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2";
-      sha256 = "0gzhgc0rh5ywpkvzishpvkninl41r5k207y8afa8vxwpfx03vcrj";
+      sha256 = "0xympj874cnjpxj68xm5gllq2f8bbvz8hr0md8mh1yd6fgzzxibh";
     };
 
     buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ]

From fdc83edd08bf72a68efa52697e4b9e1ed586468c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 11 Jun 2015 10:39:39 +0200
Subject: [PATCH 0990/2322] Removing python-packages-generated.nix

It was an experiment by @garbas in 2014 that has been forgotten
because of other, newer experiments.

Packages also weren't updated so we shouldn't let them rot in nixpkgs.
---
 pkgs/top-level/python-packages-generated.nix | 5317 ------------------
 pkgs/top-level/python-packages.json          |  150 -
 pkgs/top-level/python-packages.nix           |    7 +-
 3 files changed, 1 insertion(+), 5473 deletions(-)
 delete mode 100644 pkgs/top-level/python-packages-generated.nix
 delete mode 100644 pkgs/top-level/python-packages.json

diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
deleted file mode 100644
index 3876476623b..00000000000
--- a/pkgs/top-level/python-packages-generated.nix
+++ /dev/null
@@ -1,5317 +0,0 @@
-{ pkgs, stdenv, fetchurl, python, self }:
-
-let
-in
-{
-
-} // pkgs.lib.optionalAttrs (python.majorVersion == "2.7") {
-
-
-  "plone.uuid-1.0.3" = self.buildPythonPackage {
-    name = "plone.uuid-1.0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.uuid/plone.uuid-1.0.3.zip";
-        md5 = "183fe2911a7d6c9f6b3103855e98ad8a";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.browserpage-3.12.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        UUIDs for content items
-        '';
-      homepage = "http://plone.org";
-      license = "BSD";
-    };
-  };
-
-
-  "six-1.2.0" = self.buildPythonPackage {
-    name = "six-1.2.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/s/six/six-1.2.0.tar.gz";
-        md5 = "2a5d1afc79912832ac78fd38e3d75d7e";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Python 2 and 3 compatibility utilities
-        '';
-      homepage = "http://pypi.python.org/pypi/six/";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "Products.ZopeVersionControl-1.1.3" = self.buildPythonPackage {
-    name = "Products.ZopeVersionControl-1.1.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ZopeVersionControl/Products.ZopeVersionControl-1.1.3.zip";
-        md5 = "238239102f3ac798ee4f4c53343a561f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Version Control
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ZopeVersionControl";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "Products.Archetypes-1.9.7" = self.buildPythonPackage {
-    name = "Products.Archetypes-1.9.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.9.7.zip";
-        md5 = "35060c0ed8faf76c3c488fa642bb9715";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.6" self."plone.folder-1.0.5" self."plone.uuid-1.0.3" self."Products.CMFCalendar-2.2.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.Marshall-2.1.2" self."Products.MimetypesRegistry-2.0.5" self."Products.PlacelessTranslationService-2.0.4" self."Products.PortalTransforms-2.1.3" self."Products.statusmessages-4.0" self."Products.validation-2.0" self."Products.ZSQLMethods-2.13.4" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contenttype-3.5.5" self."zope.datetime-3.4.1" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.tal-3.5.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Archetypes is a developers framework for rapidly developing and deploying rich, full featured content types within the context of Zope/CMF and Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.Archetypes";
-      license = "GPL";
-    };
-  };
-
-
-  "cssselect-0.9.1" = self.buildPythonPackage {
-    name = "cssselect-0.9.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/c/cssselect/cssselect-0.9.1.tar.gz";
-        md5 = "c74f45966277dc7a0f768b9b0f3522ac";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        cssselect parses CSS3 Selectors and translates them to XPath 1.0
-        '';
-      homepage = "http://packages.python.org/cssselect/";
-      license = "BSD";
-    };
-  };
-
-
-  "Products.Marshall-2.1.2" = self.buildPythonPackage {
-    name = "Products.Marshall-2.1.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.Marshall/Products.Marshall-2.1.2.zip";
-        md5 = "bde4d7f75195c1ded8371554b04d2541";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."transaction-1.1.1" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Configurable Marshallers for Archetypes
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.Marshall";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.folder-1.0.5" = self.buildPythonPackage {
-    name = "plone.folder-1.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.folder/plone.folder-1.0.5.zip";
-        md5 = "2722124a411e2d267b08d6f4d81e262c";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        BTree-based folder implementation with order support
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.folder";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.CMFPlone-4.3.3" = self.buildPythonPackage {
-    name = "Products.CMFPlone-4.3.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.3.zip";
-        md5 = "e6638766d7bf59d27517174e9d67ea6b";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.querywidget-1.0.10" self."archetypes.referencebrowserwidget-2.4.20" self."borg.localrole-3.0.2" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."five.customerize-1.1" self."five.localsitemanager-2.0.5" self."Pillow-2.3.0" self."plone.app.blob-1.5.9" self."plone.app.collection-1.0.11" self."plone.app.content-2.1.4" self."plone.app.contentlisting-1.0.5" self."plone.app.contentmenu-2.0.10" self."plone.app.contentrules-3.0.6" self."plone.app.controlpanel-2.3.8" self."plone.app.customerize-1.2.2" self."plone.app.discussion-2.2.12" self."plone.app.folder-1.0.6" self."plone.app.form-2.2.4" self."plone.app.i18n-2.0.2" self."plone.app.jquery-1.7.2" self."plone.app.jquerytools-1.5.7" self."plone.app.layout-2.3.11" self."plone.app.linkintegrity-1.5.4" self."plone.app.locales-4.3.3" self."plone.app.portlets-2.4.8" self."plone.app.redirector-1.2" self."plone.app.search-1.1.7" self."plone.app.upgrade-1.3.6" self."plone.app.users-1.2" self."plone.app.uuid-1.1" self."plone.app.viewletmanager-2.0.5" self."plone.app.vocabularies-2.1.14" self."plone.app.workflow-2.1.7" self."plone.batching-1.0.1" self."plone.browserlayer-2.1.3" self."plone.contentrules-2.0.4" self."plone.fieldsets-2.0.2" self."plone.i18n-2.0.9" self."plone.indexer-1.0.2" self."plone.intelligenttext-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlet.collection-2.1.5" self."plone.portlet.static-2.0.2" self."plone.portlets-2.2" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."plone.session-3.5.3" self."plone.theme-2.1.1" self."plonetheme.classic-1.3.3" self."plonetheme.sunburst-1.4.6" self."Products.Archetypes-1.9.7" self."Products.ATContentTypes-2.1.14" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDiffTool-2.1" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.9" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.DCWorkflow-2.2.4" self."Products.ExtendedPathIndex-3.1" self."Products.ExternalEditor-1.1.0" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PasswordResetTool-2.0.16" self."Products.PlacelessTranslationService-2.0.4" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self."Products.PluginRegistry-1.3" self."Products.PortalTransforms-2.1.3" self."Products.ResourceRegistries-2.2.10" self."Products.statusmessages-4.0" self."Products.TinyMCE-1.3.6" self.setuptools self."transaction-1.1.1" self."z3c.autoinclude-0.3.5" self."ZODB3-3.10.5" self."zope.app.locales-3.6.2" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.site-3.9.2" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        The Plone Content Management System (core)
-        '';
-      homepage = "http://plone.org/";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "waitress-0.8.9" = self.buildPythonPackage {
-    name = "waitress-0.8.9";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/w/waitress/waitress-0.8.9.tar.gz";
-        md5 = "da3f2e62b3676be5dd630703a68e2a04";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Waitress WSGI server
-        '';
-      homepage = "https://github.com/Pylons/waitress";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.deferredimport-3.5.3" = self.buildPythonPackage {
-    name = "zope.deferredimport-3.5.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.deferredimport/zope.deferredimport-3.5.3.tar.gz";
-        md5 = "68fce3bf4f011d4a840902fd763884ee";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.proxy-3.6.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        zope.deferredimport allows you to perform imports names that will only be resolved when used in the code.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.deferredimport";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "six-1.6.1" = self.buildPythonPackage {
-    name = "six-1.6.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/s/six/six-1.6.1.tar.gz";
-        md5 = "07d606ac08595d795bf926cc9985674f";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Python 2 and 3 compatibility utilities
-        '';
-      homepage = "http://pypi.python.org/pypi/six/";
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-
-  "zope.deprecation-4.1.1" = self.buildPythonPackage {
-    name = "zope.deprecation-4.1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-4.1.1.tar.gz";
-        md5 = "ce261b9384066f7e13b63525778430cb";
-    };
-    doCheck = true;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Deprecation Infrastructure
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.deprecation";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFUid-2.2.1" = self.buildPythonPackage {
-    name = "Products.CMFUid-2.2.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFUid/Products.CMFUid-2.2.1.tar.gz";
-        md5 = "e20727959351dffbf0bac80613eee110";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" self."eggtestinfo-0.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Uid product for the Zope Content Management Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFUid";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.autoform-1.6" = self.buildPythonPackage {
-    name = "plone.autoform-1.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.6.zip";
-        md5 = "27412ab43f728064a60e2aeb564726b5";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.supermodel-1.2.4" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Tools to construct z3c.form forms
-        '';
-      homepage = "http://code.google.com/p/dexterity";
-      license = "LGPL";
-    };
-  };
-
-
-  "roman-1.4.0" = self.buildPythonPackage {
-    name = "roman-1.4.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/r/roman/roman-1.4.0.tar.gz";
-        md5 = "4f8832ed4108174b159c2afb4bd1d1dd";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Integer to Roman numerals converter
-        '';
-      homepage = "http://pypi.python.org/pypi/roman";
-      license = "Python 2.1.1";
-    };
-  };
-
-
-  "archetypes.referencebrowserwidget-2.4.20" = self.buildPythonPackage {
-    name = "archetypes.referencebrowserwidget-2.4.20";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.20.zip";
-        md5 = "352ea75e5dbdcdca8897f88fd77ecd3e";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.form-2.2.4" self."plone.app.jquerytools-1.5.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A referencebrowser implementation for Archetypes
-        '';
-      homepage = "http://pypi.python.org/pypi/archetypes.referencebrowserwidget";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.fieldsets-2.0.2" = self.buildPythonPackage {
-    name = "plone.fieldsets-2.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.fieldsets/plone.fieldsets-2.0.2.zip";
-        md5 = "4158c8a1f784fcb5cecbd63deda7222f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."five.formlib-1.0.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        An extension to zope.formlib, which allows to group fields into different fieldsets.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.fieldsets";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.app.redirector-1.2" = self.buildPythonPackage {
-    name = "plone.app.redirector-1.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.2.zip";
-        md5 = "bc0508844f276ac7a7b9556d37281cc8";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        redirection tool
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.redirector";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "nose-1.3.3" = self.buildPythonPackage {
-    name = "nose-1.3.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/n/nose/nose-1.3.3.tar.gz";
-        md5 = "42776061bf5206670cb819176dc78654";
-    };
-    doCheck = true;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        nose extends unittest to make testing easier
-        '';
-      homepage = "http://readthedocs.org/docs/nose/";
-      license = "GNU LGPL";
-    };
-  };
-
-
-  "plone.app.blob-1.5.9" = self.buildPythonPackage {
-    name = "plone.app.blob-1.5.9";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.blob/plone.app.blob-1.5.9.zip";
-        md5 = "3ac753daa2758e3e8290e1e3a1887183";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."archetypes.schemaextender-2.1.3" self."plone.app.imaging-1.0.10" self."plone.scale__storage-1.3.3" self.setuptools self."ZODB3-3.10.5" self."zope.proxy-3.6.1" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        ZODB blob support for Plone
-        '';
-      homepage = "http://plone.org/products/plone.app.blob";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "suds" = self."suds-0.4";
-
-  "suds-0.4" = self.buildPythonPackage {
-    name = "suds-0.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/s/suds/suds-0.4.tar.gz";
-        md5 = "b7502de662341ed7275b673e6bd73191";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Lightweight SOAP client
-        '';
-      homepage = "https://fedorahosted.org/suds";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "zope.testbrowser-3.11.1" = self.buildPythonPackage {
-    name = "zope.testbrowser-3.11.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.testbrowser/zope.testbrowser-3.11.1.tar.gz";
-        md5 = "64abbee892121e7f1a91aed12cfc155a";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."mechanize-0.2.5" self."pytz-2013b" self.setuptools self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Programmable browser for functional black-box tests
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.testbrowser";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.ZCTextIndex-2.13.5" = self.buildPythonPackage {
-    name = "Products.ZCTextIndex-2.13.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.5.zip";
-        md5 = "9a3717674b33d1d7c11b2c3728663d5b";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Full text indexing for ZCatalog / Zope 2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ZCTextIndex";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.outputfilters-1.12" = self.buildPythonPackage {
-    name = "plone.outputfilters-1.12";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.12.zip";
-        md5 = "ed76b9cf028cf7e04f3aa408e22b61ca";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PortalTransforms-2.1.3" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Transformations applied to HTML in Plone text fields as they are rendered
-        '';
-      homepage = "http://github.com/plone/plone.outputfilters";
-      license = "GPL";
-    };
-  };
-
-
-  "zope.site-3.9.2" = self.buildPythonPackage {
-    name = "zope.site-3.9.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.site/zope.site-3.9.2.tar.gz";
-        md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Local registries for zope component architecture
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.site";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.contentmenu-2.0.10" = self.buildPythonPackage {
-    name = "plone.app.contentmenu-2.0.10";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.contentmenu/plone.app.contentmenu-2.0.10.zip";
-        md5 = "d28bc995bbe5a6f4aeabad07438ffb85";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.content-2.1.4" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone's content menu implementation
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.contentmenu";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "mechanize-0.2.5" = self.buildPythonPackage {
-    name = "mechanize-0.2.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz";
-        md5 = "32657f139fc2fb75bcf193b63b8c60b2";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Stateful programmatic web browsing.
-        '';
-      homepage = "http://wwwsearch.sourceforge.net/mechanize/";
-      license = "BSD";
-    };
-  };
-
-
-  "Products.PlacelessTranslationService-2.0.4" = self.buildPythonPackage {
-    name = "Products.PlacelessTranslationService-2.0.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/Products.PlacelessTranslationService-2.0.4.zip";
-        md5 = "4b5a1ddc66eeaa02d32ee4a685905c10";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."python-gettext-1.2" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        PTS provides a way of internationalizing (i18n'ing) and localizing (l10n'ing) software for Zope 2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.PlacelessTranslationService";
-      license = "GPL";
-    };
-  };
-
-
-  "ZConfig-2.9.1" = self.buildPythonPackage {
-    name = "ZConfig-2.9.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/Z/ZConfig/ZConfig-2.9.1.tar.gz";
-        md5 = "4738de641d90b992de5b89ff1bc2fe49";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Structured Configuration Library
-        '';
-      homepage = "http://www.zope.org/Members/fdrake/zconfig/";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.deprecation-3.4.1" = self.buildPythonPackage {
-    name = "zope.deprecation-3.4.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-3.4.1.tar.gz";
-        md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Deprecation Infrastructure
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.deprecation";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFFormController-3.0.3" = self.buildPythonPackage {
-    name = "Products.CMFFormController-3.0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFFormController/Products.CMFFormController-3.0.3.zip";
-        md5 = "6573df7dcb39e3b63ba22abe2acd639e";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."transaction-1.1.1" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."zope.tales-3.5.3" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        CMFFormController provides a form validation mechanism for CMF.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFFormController";
-      license = "BSD";
-    };
-  };
-
-
-  "Products.validation-2.0" = self.buildPythonPackage {
-    name = "Products.validation-2.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.validation/Products.validation-2.0.zip";
-        md5 = "afa217e2306637d1dccbebf337caa8bf";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Data validation package for Archetypes
-        '';
-      homepage = "UNKNOWN";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "zope.event-4.0.3" = self.buildPythonPackage {
-    name = "zope.event-4.0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-4.0.3.tar.gz";
-        md5 = "9a3780916332b18b8b85f522bcc3e249";
-    };
-    doCheck = true;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Very basic event publishing system
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.event";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.caching-1.0" = self.buildPythonPackage {
-    name = "plone.caching-1.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.caching/plone.caching-1.0.zip";
-        md5 = "2c2e3b27d13b9101c92dfed222fde36c";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self."plone.transformchain-1.0.3" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope 2 integration for z3c.caching
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.caching";
-      license = "GPL";
-    };
-  };
-
-
-  "zope.proxy-3.6.1" = self.buildPythonPackage {
-    name = "zope.proxy-3.6.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-3.6.1.zip";
-        md5 = "a400b0a26624b17fa889dbcaa989d440";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Generic Transparent Proxies
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.proxy";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.componentvocabulary-1.0.1" = self.buildPythonPackage {
-    name = "zope.componentvocabulary-1.0.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.componentvocabulary/zope.componentvocabulary-1.0.1.tar.gz";
-        md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Component vocabularies
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.componentvocabulary";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFCore-2.2.7" = self.buildPythonPackage {
-    name = "Products.CMFCore-2.2.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.7.tar.gz";
-        md5 = "9320a4023b8575097feacfd4a400e930";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self."Products.GenericSetup-1.7.4" self."Products.ZSQLMethods-2.13.4" self.setuptools self."zope.app.publication-3.12.0" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Content Management Framework core components
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFCore";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.PlonePAS-4.1.3" = self.buildPythonPackage {
-    name = "Products.PlonePAS-4.1.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PlonePAS/Products.PlonePAS-4.1.3.zip";
-        md5 = "785c10242b77bfb0612c76b0262e361e";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.session-3.5.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.PluggableAuthService-1.10.0" self.setuptools self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        PlonePAS adapts the PluggableAuthService for use by Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.PlonePAS";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "mock-1.0.1" = self.buildPythonPackage {
-    name = "mock-1.0.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/m/mock/mock-1.0.1.tar.gz";
-        md5 = "c3971991738caa55ec7c356bbc154ee2";
-    };
-    doCheck = true;
-    buildInputs = [ self."unittest2-0.5.1" ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        A Python Mocking and Patching Library for Testing
-        '';
-      homepage = "http://www.voidspace.org.uk/python/mock/";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "Products.ATReferenceBrowserWidget-3.0" = self.buildPythonPackage {
-    name = "Products.ATReferenceBrowserWidget-3.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/Products.ATReferenceBrowserWidget-3.0.zip";
-        md5 = "157bdd32155c8353450c17c649aad042";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."archetypes.referencebrowserwidget-2.4.20" self.setuptools self."zope.deprecation-3.4.1" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        ATReferenceBrowserWidget is reference widget for Archetypes.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ATReferenceBrowserWidget";
-      license = "GPL";
-    };
-  };
-
-
-  "MultiMapping-2.13.0" = self.buildPythonPackage {
-    name = "MultiMapping-2.13.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/M/MultiMapping/MultiMapping-2.13.0.zip";
-        md5 = "d69c5904c105b9f2f085d4103e0f0586";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Special MultiMapping objects used in Zope2.
-        '';
-      homepage = "http://pypi.python.org/pypi/MultiMapping";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.ZSQLMethods-2.13.4" = self.buildPythonPackage {
-    name = "Products.ZSQLMethods-2.13.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ZSQLMethods/Products.ZSQLMethods-2.13.4.zip";
-        md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Record-2.13.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        SQL method support for Zope 2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ZSQLMethods";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.transformchain-1.0.3" = self.buildPythonPackage {
-    name = "plone.transformchain-1.0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.transformchain/plone.transformchain-1.0.3.zip";
-        md5 = "f5fb7ca894249e3e666501c4fae52a6c";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Hook into repoze.zope2 that allows third party packages to register a sequence of hooks that will be allowed to modify the response before it is returned to the browser
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.transformchain";
-      license = "BSD";
-    };
-  };
-
-
-  "Products.CMFQuickInstallerTool-3.0.6" = self.buildPythonPackage {
-    name = "Products.CMFQuickInstallerTool-3.0.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/Products.CMFQuickInstallerTool-3.0.6.tar.gz";
-        md5 = "af34adb87ddf2b6da48eff8b70ca2989";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" self."eggtestinfo-0.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        CMFQuickInstallerTool is a facility for comfortable activation/deactivation of CMF compliant products.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFQuickInstallerTool";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.recipe.zope2instance" = self."plone.recipe.zope2instance-4.2.14";
-
-  "plone.recipe.zope2instance-4.2.14" = self.buildPythonPackage {
-    name = "plone.recipe.zope2instance-4.2.14";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.14.zip";
-        md5 = "e5e76023d357592ee7b0236bb9764b9d";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."mailinglogger-3.7.0" self.setuptools self."zc.buildout-1.7.1" self."zc.recipe.egg-1.3.2" self."ZODB3-3.10.5" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Buildout recipe for creating a Zope 2 instance
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.recipe.zope2instance";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.event-3.5.2" = self.buildPythonPackage {
-    name = "zope.event-3.5.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz";
-        md5 = "6e8af2a16157a74885d4f0d88137cefb";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Very basic event publishing system
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.event";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFEditions-2.2.9" = self.buildPythonPackage {
-    name = "Products.CMFEditions-2.2.9";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.9.zip";
-        md5 = "4cd9db460f4056b14d425ff2fdc34952";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDiffTool-2.1" self."Products.CMFUid-2.2.1" self."Products.GenericSetup-1.7.4" self."Products.ZopeVersionControl-1.1.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.copy-3.5.0" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Versioning for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFEditions";
-      license = "GPL";
-    };
-  };
-
-
-  "zope.processlifetime-1.0" = self.buildPythonPackage {
-    name = "zope.processlifetime-1.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.processlifetime/zope.processlifetime-1.0.tar.gz";
-        md5 = "69604bfd668a01ebebdd616a8f26ccfe";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope process lifetime events
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.processlifetime";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFDefault-2.2.4" = self.buildPythonPackage {
-    name = "Products.CMFDefault-2.2.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.4.tar.gz";
-        md5 = "3d4444a8c4b486a2d769060e35a3ee01";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."five.formlib-1.0.4" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" self."eggtestinfo-0.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Default product for the Zope Content Management Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFDefault";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.form-2.2.4" = self.buildPythonPackage {
-    name = "plone.app.form-2.2.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.4.zip";
-        md5 = "1784f608dcb3a1701d91d4985ca31e63";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."five.formlib-1.0.4" self."plone.app.vocabularies-2.1.14" self."plone.locking-2.0.4" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        zope.formlib integration for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.form";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.PasswordResetTool-2.0.16" = self.buildPythonPackage {
-    name = "Products.PasswordResetTool-2.0.16";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.16.zip";
-        md5 = "c9069dff718878a32b1ef91875acf240";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Password reset tool for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.PasswordResetTool";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.synchronize-1.0.1" = self.buildPythonPackage {
-    name = "plone.synchronize-1.0.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.synchronize/plone.synchronize-1.0.1.zip";
-        md5 = "d25e86ace8daa0816861296c3288c4fb";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Simple decorators to support synchronized methods
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.synchronize";
-      license = "BSD";
-    };
-  };
-
-
-  "collective.monkeypatcher-1.0.1" = self.buildPythonPackage {
-    name = "collective.monkeypatcher-1.0.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/c/collective.monkeypatcher/collective.monkeypatcher-1.0.1.zip";
-        md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Support for applying monkey patches late in the startup cycle by using ZCML configuration actions
-        '';
-      homepage = "http://pypi.python.org/pypi/collective.monkeypatcher";
-      license = "BSD";
-    };
-  };
-
-
-  "lxml-3.3.5" = self.buildPythonPackage {
-    name = "lxml-3.3.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/l/lxml/lxml-3.3.5.tar.gz";
-        md5 = "88c75f4c73fc8f59c9ebb17495044f2f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.
-        '';
-      homepage = "http://lxml.de/";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "PasteDeploy-1.5.2" = self.buildPythonPackage {
-    name = "PasteDeploy-1.5.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-1.5.2.tar.gz";
-        md5 = "352b7205c78c8de4987578d19431af3b";
-    };
-    doCheck = true;
-    buildInputs = [ self."nose-1.3.3" ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Load, configure, and compose WSGI applications and servers
-        '';
-      homepage = "http://pythonpaste.org/deploy/";
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-
-  "plonetheme.sunburst-1.4.6" = self.buildPythonPackage {
-    name = "plonetheme.sunburst-1.4.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.6.zip";
-        md5 = "6e236f7d2ab944b708fb26de6f343ceb";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        The default theme for Plone 4.
-        '';
-      homepage = "http://pypi.python.org/pypi/plonetheme.sunburst";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.openid-2.0.2" = self.buildPythonPackage {
-    name = "plone.openid-2.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.openid/plone.openid-2.0.2.zip";
-        md5 = "046133795cf232ab6d19db940f02197a";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.PluggableAuthService-1.10.0" self."python-openid-2.2.5" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        OpenID authentication support for PAS
-        '';
-      homepage = "http://svn.plone.org/svn/plone/plone.openid";
-      license = "BSD";
-    };
-  };
-
-
-  "zope.sequencesort-3.4.0" = self.buildPythonPackage {
-    name = "zope.sequencesort-3.4.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.sequencesort/zope.sequencesort-3.4.0.tar.gz";
-        md5 = "cfc35fc426a47f5c0ee43c416224b864";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Sequence Sorting
-        '';
-      homepage = "http://cheeseshop.python.org/pypi/zope.sequencesort";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.PortalTransforms-2.1.3" = self.buildPythonPackage {
-    name = "Products.PortalTransforms-2.1.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.3.zip";
-        md5 = "a2f1f9e0388ed081028bb4c93fd24317";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Markdown-2.0.3" self."plone.intelligenttext-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.MimetypesRegistry-2.0.5" self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        MIME based content transformations
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.PortalTransforms";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "zope.interface-4.1.1" = self.buildPythonPackage {
-    name = "zope.interface-4.1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.interface/zope.interface-4.1.1.tar.gz";
-        md5 = "edcd5f719c5eb2e18894c4d06e29b6c6";
-    };
-    doCheck = true;
-    buildInputs = [ self."zope.event-4.0.3" ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Interfaces for Python
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.interface";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.app.publication-3.12.0" = self.buildPythonPackage {
-    name = "zope.app.publication-3.12.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.app.publication/zope.app.publication-3.12.0.zip";
-        md5 = "d8c521287f52fb9f40fa9b8c2acb4675";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.authentication-3.7.1" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.error-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope publication
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.app.publication";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.component-4.2.1" = self.buildPythonPackage {
-    name = "zope.component-4.2.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-4.2.1.tar.gz";
-        md5 = "cf55d496428d976f9329a4a2330a8b54";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.3" self."zope.interface-4.1.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Component Architecture
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.component";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.content-2.1.4" = self.buildPythonPackage {
-    name = "plone.app.content-2.1.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.4.zip";
-        md5 = "6930a2376e2d856e4f24e17f789568e5";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.batching-1.0.1" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Content Views for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.content";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.alterego-1.0" = self.buildPythonPackage {
-    name = "plone.alterego-1.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.alterego/plone.alterego-1.0.zip";
-        md5 = "b7b6dbcbba00505d98d5aba83e016408";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Low level support for dynamic modules
-        '';
-      homepage = "http://code.google.com/p/dexterity";
-      license = "LGPL";
-    };
-  };
-
-
-  "Products.ExternalEditor-1.1.0" = self.buildPythonPackage {
-    name = "Products.ExternalEditor-1.1.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip";
-        md5 = "475fea6e0b958c0c51cfdbfef2f4e623";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope External Editor
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ExternalEditor";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFDiffTool-2.1" = self.buildPythonPackage {
-    name = "Products.CMFDiffTool-2.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFDiffTool/Products.CMFDiffTool-2.1.zip";
-        md5 = "7513d954294e9f318182f9d61660abdb";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Diff tool for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFDiffTool";
-      license = "GPL";
-    };
-  };
-
-
-  "repoze.lru-0.6" = self.buildPythonPackage {
-    name = "repoze.lru-0.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/r/repoze.lru/repoze.lru-0.6.tar.gz";
-        md5 = "2c3b64b17a8e18b405f55d46173e14dd";
-    };
-    doCheck = true;
-    buildInputs = [ self."nose-1.3.3" ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        A tiny LRU cache implementation and decorator
-        '';
-      homepage = "http://www.repoze.org";
-      license = "BSD-derived (http://www.repoze.org/LICENSE.txt)";
-    };
-  };
-
-
-  "Markdown-2.0.3" = self.buildPythonPackage {
-    name = "Markdown-2.0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.3.tar.gz";
-        md5 = "751e8055be2433dfd1a82e0fb1b12f13";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Python implementation of Markdown.
-        '';
-      homepage = "http://www.freewisdom.org/projects/python-markdown";
-      license = "BSD License";
-    };
-  };
-
-
-  "z3c.formwidget.query-0.10" = self.buildPythonPackage {
-    name = "z3c.formwidget.query-0.10";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/z3c.formwidget.query/z3c.formwidget.query-0.10.zip";
-        md5 = "912773ecfa4409bc8911e9e8dd981e58";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."z3c.form-3.1.1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A source query widget for z3c.form.
-        '';
-      homepage = "http://pypi.python.org/pypi/z3c.formwidget.query";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.DCWorkflow-2.2.4" = self.buildPythonPackage {
-    name = "Products.DCWorkflow-2.2.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz";
-        md5 = "c90a16c4f3611015592ba8173a5f1863";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" self."eggtestinfo-0.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        DCWorkflow product for the Zope Content Management Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.DCWorkflow";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.behavior-1.0.2" = self.buildPythonPackage {
-    name = "plone.behavior-1.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.behavior/plone.behavior-1.0.2.zip";
-        md5 = "4459b91287ebc2f2cf4fa38728b2a739";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Infrastructure for maintaining a registry of available behaviors
-        '';
-      homepage = "http://code.google.com/p/dexterity";
-      license = "BSD";
-    };
-  };
-
-
-  "diazo-1.0.5" = self.buildPythonPackage {
-    name = "diazo-1.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/d/diazo/diazo-1.0.5.zip";
-        md5 = "9b304d079eab7c9dd6d10487f2fc94a4";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."experimental.cssselect-0.3" self."lxml-2.3.6" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Diazo implements a Deliverance like language using a pure
-        XSLT engine. With Diazo, you "compile" your theme and ruleset in one
-        step, then use a superfast/simple transform on each request thereafter.
-        Alternatively, compile your theme during development, check it into
-        version control, and not touch Diazo during deployment.
-        '';
-      homepage = "http://diazo.org";
-      license = "New BSD";
-    };
-  };
-
-
-  "zope.tales-3.5.3" = self.buildPythonPackage {
-    name = "zope.tales-3.5.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.tales/zope.tales-3.5.3.tar.gz";
-        md5 = "a2dbc6e41140c29de81b66a4d703fc3f";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.tal-3.5.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Template Application Language Expression Syntax (TALES)
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.tales";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "feedparser-5.0.1" = self.buildPythonPackage {
-    name = "feedparser-5.0.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/f/feedparser/feedparser-5.0.1.tar.bz2";
-        md5 = "702835de74bd4a578524f311e62c2877";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-
-        '';
-      homepage = "https://code.google.com/p/feedparser/";
-      license = "";
-    };
-  };
-
-
-  "DateTime-3.0.3" = self.buildPythonPackage {
-    name = "DateTime-3.0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/D/DateTime/DateTime-3.0.3.zip";
-        md5 = "5ebf0a8e3775b744c5de2e6685b37ae9";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."pytz-2013b" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        This package provides a DateTime data type, as known from Zope 2.Unless you need to communicate with Zope 2 APIs, you're probablybetter off using Python's built-in datetime module.
-        '';
-      homepage = "http://pypi.python.org/pypi/DateTime";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Missing-2.13.1" = self.buildPythonPackage {
-    name = "Missing-2.13.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip";
-        md5 = "9823cff54444cbbcaef8fc45d8e42572";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Special Missing objects used in Zope2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Missing";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "z3c.autoinclude-0.3.5" = self.buildPythonPackage {
-    name = "z3c.autoinclude-0.3.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/z3c.autoinclude/z3c.autoinclude-0.3.5.zip";
-        md5 = "44f113a1c280dd238ab9b8490ae88857";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zc.buildout-1.7.1" self."zope.configuration-3.7.4" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Automatically include ZCML
-        '';
-      homepage = "http://pypi.python.org/pypi/z3c.autoinclude";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "pytz-2013b" = self.buildPythonPackage {
-    name = "pytz-2013b";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/pytz/pytz-2013b.tar.bz2";
-        md5 = "34f47470eedd5cd1faf6c3da2741967b";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        World timezone definitions, modern and historical
-        '';
-      homepage = "http://pytz.sourceforge.net";
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-
-  "zope.configuration-3.7.4" = self.buildPythonPackage {
-    name = "zope.configuration-3.7.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-3.7.4.zip";
-        md5 = "5b0271908ef26c05059eda76928896ea";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Configuration Markup Language (ZCML)
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.configuration";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.iterate-2.1.12" = self.buildPythonPackage {
-    name = "plone.app.iterate-2.1.12";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.iterate/plone.app.iterate-2.1.12.zip";
-        md5 = "1d05316d4e9a68ed738e890aafa3c9e2";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.7" self."Products.CMFCore-2.2.7" self."Products.CMFEditions-2.2.9" self."Products.CMFPlacefulWorkflow-1.5.10" self."Products.DCWorkflow-2.2.4" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        check-out/check-in staging for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.iterate";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.app.theming-1.1.1" = self.buildPythonPackage {
-    name = "plone.app.theming-1.1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip";
-        md5 = "a694b7a050b6e7c25d720d1e99bb73fa";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."diazo-1.0.5" self."docutils-0.9.1" self."five.globalrequest-1.0" self."lxml-2.3.6" self."plone.app.registry-1.2.3" self."plone.resource-1.0.2" self."plone.resourceeditor-1.0" self."plone.subrequest-1.6.8" self."plone.transformchain-1.0.3" self."Products.CMFPlone-4.3.3" self."repoze.xmliter-0.5" self."roman-1.4.0" self.setuptools self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Integrates the Diazo theming engine with Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.theming";
-      license = "GPL";
-    };
-  };
-
-
-  "python-openid-2.2.5" = self.buildPythonPackage {
-    name = "python-openid-2.2.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.tar.gz";
-        md5 = "393f48b162ec29c3de9e2973548ea50d";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        OpenID support for servers and consumers.
-        '';
-      homepage = "http://github.com/openid/python-openid";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "Products.MailHost-2.13.1" = self.buildPythonPackage {
-    name = "Products.MailHost-2.13.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.MailHost/Products.MailHost-2.13.1.zip";
-        md5 = "1102e523435d8bf78a15b9ddb57478e1";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        zope.sendmail integration for Zope 2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.MailHost";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.broken-3.6.0" = self.buildPythonPackage {
-    name = "zope.broken-3.6.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.broken/zope.broken-3.6.0.zip";
-        md5 = "eff24d7918099a3e899ee63a9c31bee6";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Broken Object Interfaces
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.broken";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "DocumentTemplate-2.13.2" = self.buildPythonPackage {
-    name = "DocumentTemplate-2.13.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip";
-        md5 = "07bb086c77c1dfe94125ad2efbba94b7";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."RestrictedPython-3.6.0" self."zExceptions-2.13.0" self."zope.sequencesort-3.4.0" self."zope.structuredtext-3.5.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Document Templating Markup Language (DTML)
-        '';
-      homepage = "http://pypi.python.org/pypi/DocumentTemplate";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.PythonScripts-2.13.2" = self.buildPythonPackage {
-    name = "Products.PythonScripts-2.13.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PythonScripts/Products.PythonScripts-2.13.2.zip";
-        md5 = "04c86f2c45a29a162297a80dac61d14f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Provides support for restricted execution of Python scripts in Zope 2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.PythonScripts";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.ptresource-3.9.0" = self.buildPythonPackage {
-    name = "zope.ptresource-3.9.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.ptresource/zope.ptresource-3.9.0.tar.gz";
-        md5 = "f4645e51c15289d3fdfb4139039e18e9";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.browserresource-3.10.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Page template resource plugin for zope.browserresource
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.ptresource/";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "plone.namedfile__scales-2.0.5" = self.buildPythonPackage {
-    name = "plone.namedfile__scales-2.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.5.zip";
-        md5 = "54f73c5961cbdf5020cf59ae780601ea";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.rfc822-1.1" self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" self."plone.scale__storage-1.3.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        File types and fields for images, files and blob files with filenames
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.namedfile";
-      license = "BSD";
-    };
-  };
-
-
-  "docutils-0.9.1" = self.buildPythonPackage {
-    name = "docutils-0.9.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/d/docutils/docutils-0.9.1.tar.gz";
-        md5 = "b0d5cd5298fedf9c62f5fd364a274d56";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Docutils -- Python Documentation Utilities
-        '';
-      homepage = "http://docutils.sourceforge.net/";
-      license = "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)";
-    };
-  };
-
-
-  "plone.app.controlpanel-2.3.8" = self.buildPythonPackage {
-    name = "plone.app.controlpanel-2.3.8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.8.zip";
-        md5 = "230fa6df467f5bcc0b987d1cd66ccd9f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.form-2.2.4" self."plone.app.vocabularies-2.1.14" self."plone.app.workflow-2.1.7" self."plone.fieldsets-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.PlonePAS-4.1.3" self."Products.PortalTransforms-2.1.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.cachedescriptors-3.5.1" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.ramcache-1.0" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Formlib-based controlpanels for Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.controlpanel";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "beautifulsoup4-4.3.2" = self.buildPythonPackage {
-    name = "beautifulsoup4-4.3.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.3.2.tar.gz";
-        md5 = "b8d157a204d56512a4cc196e53e7d8ee";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Screen-scraping library
-        '';
-      homepage = "http://www.crummy.com/software/BeautifulSoup/bs4/";
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-
-  "WebOb-1.4" = self.buildPythonPackage {
-    name = "WebOb-1.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/W/WebOb/WebOb-1.4.tar.gz";
-        md5 = "8437607c0cc00c35f658f972516ffb55";
-    };
-    doCheck = true;
-    buildInputs = [ self."nose-1.3.3" ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        WSGI request and response object
-        '';
-      homepage = "http://webob.org/";
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-
-  "zope.error-3.7.4" = self.buildPythonPackage {
-    name = "zope.error-3.7.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.error/zope.error-3.7.4.tar.gz";
-        md5 = "281445a906458ff5f18f56923699a127";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.exceptions-3.6.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        An error reporting utility for Zope3
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.error";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.openid-2.0.2" = self.buildPythonPackage {
-    name = "plone.app.openid-2.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.openid/plone.app.openid-2.0.2.tar.gz";
-        md5 = "ae0748f91cab0612a498926d405d8edd";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."plone.app.portlets-2.4.8" self."plone.openid-2.0.2" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone OpenID authentication support
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.openid";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.indexer-1.0.2" = self.buildPythonPackage {
-    name = "plone.indexer-1.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip";
-        md5 = "538aeee1f9db78bc8c85ae1bcb0153ed";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Hooks to facilitate managing custom index values in Zope 2/CMF applications
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.indexer";
-      license = "BSD";
-    };
-  };
-
-
-  "plone.app.portlets-2.4.8" = self.buildPythonPackage {
-    name = "plone.app.portlets-2.4.8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.8.zip";
-        md5 = "7d25027d89d871a50aba91c95b798bb2";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."feedparser-5.0.1" self."five.customerize-1.1" self."five.formlib-1.0.4" self."plone.app.form-2.2.4" self."plone.app.i18n-2.0.2" self."plone.app.vocabularies-2.1.14" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.PluggableAuthService-1.10.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone integration for the basic plone.portlets package
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.portlets";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.keyring-2.0.1" = self.buildPythonPackage {
-    name = "plone.keyring-2.0.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.keyring/plone.keyring-2.0.1.zip";
-        md5 = "f3970e9bddb2cc65e461a2c62879233f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Manage secrets
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.keyring";
-      license = "BSD";
-    };
-  };
-
-
-  "plone.formwidget.namedfile-1.0.9" = self.buildPythonPackage {
-    name = "plone.formwidget.namedfile-1.0.9";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.9.zip";
-        md5 = "96f2634a8c4c1d98c2f39646a77c87fc";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.namedfile__scales-2.0.5" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Image widget for z3c.form and Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.formwidget.namedfile";
-      license = "GPL";
-    };
-  };
-
-
-  "Persistence-2.13.2" = self.buildPythonPackage {
-    name = "Persistence-2.13.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip";
-        md5 = "92693648ccdc59c8fc71f7f06b1d228c";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."ZODB3-3.10.5" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Persistent ExtensionClass
-        '';
-      homepage = "http://pypi.python.org/pypi/Persistence";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFPlacefulWorkflow-1.5.10" = self.buildPythonPackage {
-    name = "Products.CMFPlacefulWorkflow-1.5.10";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.10.zip";
-        md5 = "997648c5bed6d5a54ac922c6ba9351a9";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.3" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Workflow policies for CMF and Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFPlacefulWorkflow";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.dexterity-2.2.1" = self.buildPythonPackage {
-    name = "plone.dexterity-2.2.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.2.1.zip";
-        md5 = "c62d427e3f6c24da1cca58d7cb152e1f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.alterego-1.0" self."plone.autoform-1.6" self."plone.behavior-1.0.2" self."plone.folder-1.0.5" self."plone.memoize-1.1.1" self."plone.rfc822-1.1" self."plone.supermodel-1.2.4" self."plone.synchronize-1.0.1" self."plone.uuid-1.0.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.dottedname-3.4.6" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Flexible CMF content
-        '';
-      homepage = "http://code.google.com/p/dexterity";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zc.recipe.egg-1.3.2" = self.buildPythonPackage {
-    name = "zc.recipe.egg-1.3.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-1.3.2.tar.gz";
-        md5 = "1cb6af73f527490dde461d3614a36475";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zc.buildout-1.7.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Recipe for installing Python package distributions as eggs
-        '';
-      homepage = "http://cheeseshop.python.org/pypi/zc.recipe.egg";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.dexterity-2.0.11" = self.buildPythonPackage {
-    name = "plone.app.dexterity-2.0.11";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.11.zip";
-        md5 = "649f08fd008908121f5f70dfd33e513a";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.6" self."lxml-2.3.6" self."plone.app.content-2.1.4" self."plone.app.layout-2.3.11" self."plone.app.textfield-1.2.3" self."plone.app.uuid-1.1" self."plone.app.z3cform-0.7.6" self."plone.autoform-1.6" self."plone.behavior-1.0.2" self."plone.contentrules-2.0.4" self."plone.dexterity-2.2.1" self."plone.formwidget.namedfile-1.0.9" self."plone.namedfile__scales-2.0.5" self."plone.portlets-2.2" self."plone.rfc822-1.1" self."plone.schemaeditor-1.3.7" self."plone.supermodel-1.2.4" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.3" self."Products.GenericSetup-1.7.4" self.setuptools self."z3c.form-3.1.1" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Dexterity is a content type framework for CMF applications, with particular emphasis on Plone. It can be viewed as an alternative to Archetypes that is more light-weight and modular.
-        '';
-      homepage = "http://plone.org/products/dexterity";
-      license = "GPL";
-    };
-  };
-
-
-  "mailinglogger-3.7.0" = self.buildPythonPackage {
-    name = "mailinglogger-3.7.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/m/mailinglogger/mailinglogger-3.7.0.tar.gz";
-        md5 = "f865f0df6059ce23062b7457d01dbac5";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Enhanced emailing handlers for the python logging package.
-        '';
-      homepage = "http://www.simplistix.co.uk/software/python/mailinglogger";
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-
-  "Products.BTreeFolder2-2.13.3" = self.buildPythonPackage {
-    name = "Products.BTreeFolder2-2.13.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.BTreeFolder2/Products.BTreeFolder2-2.13.3.tar.gz";
-        md5 = "f57c85673036af7ccd34c3fa251f6bb2";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.lifecycleevent-3.6.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A BTree based implementation for Zope 2's OFS.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.BTreeFolder2";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.locking-2.0.4" = self.buildPythonPackage {
-    name = "plone.locking-2.0.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip";
-        md5 = "a7f8b8db78f57272d351d7fe0d067eb2";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        webdav locking support
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.locking";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.app.viewletmanager-2.0.5" = self.buildPythonPackage {
-    name = "plone.app.viewletmanager-2.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.5.zip";
-        md5 = "e923d0a9a087ef79a6f0303f64a0f853";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.vocabularies-2.1.14" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        configurable viewlet manager
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zope.testing-3.9.7" = self.buildPythonPackage {
-    name = "zope.testing-3.9.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.testing/zope.testing-3.9.7.tar.gz";
-        md5 = "8999f3d143d416dc3c8b2a5bd6f33e28";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.exceptions-3.6.2" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope testing framework, including the testrunner script.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.testing";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.lifecycleevent-3.6.2" = self.buildPythonPackage {
-    name = "zope.lifecycleevent-3.6.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.lifecycleevent/zope.lifecycleevent-3.6.2.tar.gz";
-        md5 = "3ba978f3ba7c0805c81c2c79ea3edb33";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Object life-cycle events
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.lifecycleevent";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.imaging-1.0.10" = self.buildPythonPackage {
-    name = "plone.app.imaging-1.0.10";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.10.zip";
-        md5 = "511ed465cef112bac3d074f09810ca80";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.scale__storage-1.3.3" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        User-configurable, blob-aware image scaling for Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.imaging";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.app.contentrules-3.0.6" = self.buildPythonPackage {
-    name = "plone.app.contentrules-3.0.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.6.zip";
-        md5 = "95eeb55a9489c85c93eb11a87467d867";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.formlib-1.0.4" self."plone.app.form-2.2.4" self."plone.app.vocabularies-2.1.14" self."plone.contentrules-2.0.4" self."plone.memoize-1.1.1" self."plone.stringinterp-1.0.11" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone integration for plone.contentrules
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.contentrules";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "translationstring-1.1" = self.buildPythonPackage {
-    name = "translationstring-1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/t/translationstring/translationstring-1.1.tar.gz";
-        md5 = "0979b46d8f0f852810c8ec4be5c26cf2";
-    };
-    doCheck = true;
-    buildInputs = [ self."nose-1.3.3" ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Utility library for i18n relied on by various Repoze and Pyramid packages
-        '';
-      homepage = "http://pylonsproject.org";
-      license = "BSD-like (http://repoze.org/license.html)";
-    };
-  };
-
-
-  "zope.pagetemplate-3.6.3" = self.buildPythonPackage {
-    name = "zope.pagetemplate-3.6.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.pagetemplate/zope.pagetemplate-3.6.3.zip";
-        md5 = "834a4bf702c05fba1e669677b4dc871f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.security__untrustedpython-3.7.4" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Page Templates
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.pagetemplate";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.users-1.2" = self.buildPythonPackage {
-    name = "plone.app.users-1.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.users/plone.app.users-1.2.zip";
-        md5 = "c94682960a960da6d75c8bfba587a836";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."five.formlib-1.0.4" self."plone.app.controlpanel-2.3.8" self."plone.app.layout-2.3.11" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A package for all things users and groups related (specific to plone)
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.users";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zc.buildout-1.7.1" = self.buildPythonPackage {
-    name = "zc.buildout-1.7.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-1.7.1.tar.gz";
-        md5 = "8834a21586bf2be53dc412002241a996";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        System for managing development buildouts
-        '';
-      homepage = "http://pypi.python.org/pypi/zc.buildout";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "archetypes.schemaextender-2.1.3" = self.buildPythonPackage {
-    name = "archetypes.schemaextender-2.1.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/a/archetypes.schemaextender/archetypes.schemaextender-2.1.3.zip";
-        md5 = "105f2f8e9c18f34bd09d1a90a10c91d2";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Dynamically extend Archetypes schemas with named adapters.
-        '';
-      homepage = "http://pypi.python.org/pypi/archetypes.schemaextender";
-      license = "GPL";
-    };
-  };
-
-
-  "ZopeUndo-2.12.0" = self.buildPythonPackage {
-    name = "ZopeUndo-2.12.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/Z/ZopeUndo/ZopeUndo-2.12.0.zip";
-        md5 = "2b8da09d1b98d5558f62e12f6e52c401";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        ZODB undo support for Zope2.
-        '';
-      homepage = "http://pypi.python.org/pypi/ZopeUndo";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.tal-3.5.2" = self.buildPythonPackage {
-    name = "zope.tal-3.5.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.tal/zope.tal-3.5.2.zip";
-        md5 = "13869f292ba36b294736b7330b1396fd";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope 3 Template Application Languate (TAL)
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.tal";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.OFSP-2.13.2" = self.buildPythonPackage {
-    name = "Products.OFSP-2.13.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.OFSP/Products.OFSP-2.13.2.zip";
-        md5 = "c76d40928753c2ee56db873304e65bd5";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Persistence-2.13.2" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        General Zope 2 help screens.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.OFSP";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "pyramid" = self."pyramid-1.5";
-
-  "pyramid-1.5" = self.buildPythonPackage {
-    name = "pyramid-1.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/pyramid/pyramid-1.5.tar.gz";
-        md5 = "8747658dcbab709a9c491e43d3b0d58b";
-    };
-    doCheck = true;
-    buildInputs = [ self."nose-1.3.3" self."WebTest-2.0.15" self."zope.component-4.2.1" self."zope.interface-4.1.1" ];
-    propagatedBuildInputs = [ self."PasteDeploy-1.5.2" self."repoze.lru-0.6" self.setuptools self."translationstring-1.1" self."venusian-1.0a8" self."WebOb-1.4" self."zope.deprecation-4.1.1" self."zope.interface-4.1.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        The Pyramid Web Framework, a Pylons project
-        '';
-      homepage = "http://pylonsproject.org";
-      license = "BSD-derived (http://www.repoze.org/LICENSE.txt)";
-    };
-  };
-
-
-  "plone.app.search-1.1.7" = self.buildPythonPackage {
-    name = "plone.app.search-1.1.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.7.zip";
-        md5 = "fc3c8d3f64300f6a02770027d7d14136";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.contentlisting-1.0.5" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Search user interface for Plone CMS.
-        '';
-      homepage = "http://github.com/plone/plone.app.search";
-      license = "GPL";
-    };
-  };
-
-
-  "zope.container-3.11.2" = self.buildPythonPackage {
-    name = "zope.container-3.11.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.container/zope.container-3.11.2.tar.gz";
-        md5 = "fc66d85a17b8ffb701091c9328983dcc";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.broken-3.6.0" self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.filerepresentation-3.6.1" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Container
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.container";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "unittest2-0.5.1" = self.buildPythonPackage {
-    name = "unittest2-0.5.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/u/unittest2/unittest2-0.5.1.tar.gz";
-        md5 = "a0af5cac92bbbfa0c3b0e99571390e0f";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        The new features in unittest for Python 2.7 backported to Python 2.3+.
-        '';
-      homepage = "http://pypi.python.org/pypi/unittest2";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "zope.schema-4.2.2" = self.buildPythonPackage {
-    name = "zope.schema-4.2.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz";
-        md5 = "e7e581af8193551831560a736a53cf58";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        zope.interface extension for defining data schemas
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.schema";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.schema-4.4.1" = self.buildPythonPackage {
-    name = "zope.schema-4.4.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.4.1.tar.gz";
-        md5 = "afb9281217b79840e1679abeb302467a";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.3" self."zope.interface-4.1.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        zope.interface extension for defining data schemas
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.schema";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zExceptions-2.13.0" = self.buildPythonPackage {
-    name = "zExceptions-2.13.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zExceptions/zExceptions-2.13.0.zip";
-        md5 = "4c679696c959040d8e656ef85ae40136";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        zExceptions contains common exceptions used in Zope2.
-        '';
-      homepage = "http://pypi.python.org/pypi/zExceptions";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFDynamicViewFTI-4.0.5" = self.buildPythonPackage {
-    name = "Products.CMFDynamicViewFTI-4.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.5.zip";
-        md5 = "2d31b1700ed8b1441adc737b454af693";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        CMFDynamicViewFTI is a product for dynamic views in CMF.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFDynamicViewFTI";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "zope.publisher-3.12.6" = self.buildPythonPackage {
-    name = "zope.publisher-3.12.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.publisher/zope.publisher-3.12.6.tar.gz";
-        md5 = "495131970cc7cb14de8e517fb3857ade";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        The Zope publisher publishes Python objects on the web.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.publisher";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.browserpage-3.12.2" = self.buildPythonPackage {
-    name = "zope.browserpage-3.12.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz";
-        md5 = "a543ef3cb1b42f7233b3fca23dc9ea60";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        ZCML directives for configuring browser views for Zope.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.browserpage/";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.i18n-2.0.2" = self.buildPythonPackage {
-    name = "plone.app.i18n-2.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.i18n/plone.app.i18n-2.0.2.zip";
-        md5 = "a10026573463dfc1899bf4062cebdbf2";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone specific i18n extensions.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.i18n";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zope.security__untrustedpython-3.7.4" = self.buildPythonPackage {
-    name = "zope.security__untrustedpython-3.7.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz";
-        md5 = "072ab8d11adc083eace11262da08630c";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.schema-4.2.2" self."RestrictedPython-3.6.0" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Security Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.security";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.cachepurging-1.0.5" = self.buildPythonPackage {
-    name = "plone.cachepurging-1.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.cachepurging/plone.cachepurging-1.0.5.zip";
-        md5 = "ae893d47c424cb8a4cd688f6d9b46dc0";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Cache purging support for Zope 2 applications
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.cachepurging";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "psycopg2" = self."psycopg2-2.5.3";
-
-  "psycopg2-2.5.3" = self.buildPythonPackage {
-    name = "psycopg2-2.5.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.3.tar.gz";
-        md5 = "09dcec70f623a9ef774f1aef75690995";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.postgresql ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Python-PostgreSQL Database Adapter
-        '';
-      homepage = "http://initd.org/psycopg/";
-      license = with stdenv.lib.licenses; [ lgpl3Plus zpt20 ];
-    };
-  };
-
-
-  "zope.component__zcml-3.9.5" = self.buildPythonPackage {
-    name = "zope.component__zcml-3.9.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-3.9.5.tar.gz";
-        md5 = "22780b445b1b479701c05978055d1c82";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Component Architecture
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.component";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Acquisition-2.13.8" = self.buildPythonPackage {
-    name = "Acquisition-2.13.8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip";
-        md5 = "8c33160c157b50649e2b2b3224622579";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in.
-        '';
-      homepage = "http://pypi.python.org/pypi/Acquisition";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Unidecode-0.04.1" = self.buildPythonPackage {
-    name = "Unidecode-0.04.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/U/Unidecode/Unidecode-0.04.1.tar.gz";
-        md5 = "c4c9ed8d40cff25c390ff5d5112b9308";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        US-ASCII transliterations of Unicode text
-        '';
-      homepage = "http://code.zemanta.com/tsolc/unidecode/";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "plone.rfc822-1.1" = self.buildPythonPackage {
-    name = "plone.rfc822-1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.rfc822/plone.rfc822-1.1.zip";
-        md5 = "ba3e26cab9e751fb1cf40639d661d2f0";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."python-dateutil-1.5" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        RFC822 marshalling for zope.schema fields
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.rfc822";
-      license = "BSD";
-    };
-  };
-
-
-  "zope.viewlet-3.7.2" = self.buildPythonPackage {
-    name = "zope.viewlet-3.7.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.viewlet/zope.viewlet-3.7.2.tar.gz";
-        md5 = "367e03096df57e2f9b74fff43f7901f9";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Viewlets
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.viewlet";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.ATContentTypes-2.1.14" = self.buildPythonPackage {
-    name = "Products.ATContentTypes-2.1.14";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.14.zip";
-        md5 = "7e777ed4034ffc23688f2a8072a6c109";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.referencebrowserwidget-2.4.20" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.6" self."plone.app.layout-2.3.11" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.7" self."Products.ATReferenceBrowserWidget-3.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PortalTransforms-2.1.3" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."ZConfig-2.9.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.tal-3.5.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Default Content Types for Plone
-        '';
-      homepage = "http://plone.org/";
-      license = "GPL";
-    };
-  };
-
-
-  "coverage-3.7.1" = self.buildPythonPackage {
-    name = "coverage-3.7.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/c/coverage/coverage-3.7.1.tar.gz";
-        md5 = "c47b36ceb17eaff3ecfab3bcd347d0df";
-    };
-    doCheck = true;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Code coverage measurement for Python
-        '';
-      homepage = "http://nedbatchelder.com/code/coverage";
-      license = "BSD";
-    };
-  };
-
-
-  "zope.i18n__zcml-3.7.4" = self.buildPythonPackage {
-    name = "zope.i18n__zcml-3.7.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.i18n/zope.i18n-3.7.4.tar.gz";
-        md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."pytz-2013b" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.schema-4.2.2" self."zope.configuration-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Internationalization Support
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.i18n";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.browserresource-3.10.3" = self.buildPythonPackage {
-    name = "zope.browserresource-3.10.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-3.10.3.zip";
-        md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Browser resources implementation for Zope.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.browserresource/";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "RelStorage" = self."RelStorage-1.5.1";
-
-  "RelStorage-1.5.1" = self.buildPythonPackage {
-    name = "RelStorage-1.5.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/R/RelStorage/RelStorage-1.5.1.tar.gz";
-        md5 = "2454211d086ac02a4af10f7292e260ec";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."zc.lockfile-1.0.2" self."ZODB3-3.10.5" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        A backend for ZODB that stores pickles in a relational database.
-        '';
-      homepage = "http://pypi.python.org/pypi/RelStorage";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "five.formlib-1.0.4" = self.buildPythonPackage {
-    name = "five.formlib-1.0.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/f/five.formlib/five.formlib-1.0.4.zip";
-        md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self.setuptools self."transaction-1.1.1" self."zope.app.form-4.0.2" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        zope.formlib integration for Zope 2
-        '';
-      homepage = "http://pypi.python.org/pypi/five.formlib";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "xlrd" = self."xlrd-0.9.3";
-
-  "xlrd-0.9.3" = self.buildPythonPackage {
-    name = "xlrd-0.9.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-0.9.3.tar.gz";
-        md5 = "6f3325132f246594988171bc72e1a385";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Library for developers to extract data from Microsoft Excel (tm) spreadsheet files
-        '';
-      homepage = "http://www.python-excel.org/";
-      license = "BSD";
-    };
-  };
-
-
-  "Products.statusmessages-4.0" = self.buildPythonPackage {
-    name = "Products.statusmessages-4.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.statusmessages/Products.statusmessages-4.0.zip";
-        md5 = "265324b0a58a032dd0ed038103ed0473";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        statusmessages provides an easy way of handling internationalized status messages managed via an BrowserRequest adapter storing status messages in client-side cookies.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.statusmessages";
-      license = "BSD";
-    };
-  };
-
-
-  "Products.MimetypesRegistry-2.0.5" = self.buildPythonPackage {
-    name = "Products.MimetypesRegistry-2.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.5.zip";
-        md5 = "1be555ad13648e139174c034631fce34";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        MIME type handling for Zope
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.MimetypesRegistry";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "plone.app.upgrade-1.3.6" = self.buildPythonPackage {
-    name = "plone.app.upgrade-1.3.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.6.zip";
-        md5 = "36703e1085f0d5d1d0f6e635e72fd5c1";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."borg.localrole-3.0.2" self."five.localsitemanager-2.0.5" self."plone.app.folder-1.0.6" self."plone.app.portlets-2.4.8" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.7" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDiffTool-2.1" self."Products.CMFEditions-2.2.9" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.contentmigration-2.1.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self."Products.PortalTransforms-2.1.3" self."Products.ResourceRegistries-2.2.10" self."Products.SecureMailHost-1.1.2" self."Products.ZCatalog-2.13.27" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.ramcache-1.0" self."zope.site-3.9.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Upgrade machinery for Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.upgrade";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.PloneLanguageTool-3.2.7" = self.buildPythonPackage {
-    name = "Products.PloneLanguageTool-3.2.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip";
-        md5 = "bd9eb6278bf76e8cbce99437ca362164";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        PloneLanguageTool allows you to set the available languages in your Plone site, select various fallback mechanisms, and control the use of flags for language selection and translations.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.PloneLanguageTool";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.intelligenttext-2.0.2" = self.buildPythonPackage {
-    name = "plone.intelligenttext-2.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.intelligenttext/plone.intelligenttext-2.0.2.zip";
-        md5 = "51688fa0815b49e00334e3ef948328ba";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Provides transforms from text/x-web-intelligent to text/html and vice versa.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.intelligenttext";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zope.contenttype-3.5.5" = self.buildPythonPackage {
-    name = "zope.contenttype-3.5.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.contenttype/zope.contenttype-3.5.5.zip";
-        md5 = "c6ac80e6887de4108a383f349fbdf332";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope contenttype
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.contenttype";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.proxy-4.1.4" = self.buildPythonPackage {
-    name = "zope.proxy-4.1.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-4.1.4.tar.gz";
-        md5 = "3bcaf8b8512a99649ecf2f158c11d05b";
-    };
-    doCheck = true;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-4.1.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Generic Transparent Proxies
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.proxy";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.globalrequest-1.0" = self.buildPythonPackage {
-    name = "zope.globalrequest-1.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.globalrequest/zope.globalrequest-1.0.zip";
-        md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Global way of retrieving the currently active request.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.globalrequest";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "zope.sendmail-3.7.5" = self.buildPythonPackage {
-    name = "zope.sendmail-3.7.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.sendmail/zope.sendmail-3.7.5.tar.gz";
-        md5 = "8a513ecf2b41cad849f6607bf16d6818";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope sendmail
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.sendmail";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.annotation-3.5.0" = self.buildPythonPackage {
-    name = "zope.annotation-3.5.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.annotation/zope.annotation-3.5.0.tar.gz";
-        md5 = "4238153279d3f30ab5613438c8e76380";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Object annotation mechanism
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.annotation";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.customerize-1.2.2" = self.buildPythonPackage {
-    name = "plone.app.customerize-1.2.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.customerize/plone.app.customerize-1.2.2.zip";
-        md5 = "6a3802c4e8fbd955597adc6a8298febf";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.customerize-1.1" self."plone.browserlayer-2.1.3" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Integrate five.customerize into Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.customerize/";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.app.registry-1.2.3" = self.buildPythonPackage {
-    name = "plone.app.registry-1.2.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.2.3.zip";
-        md5 = "b2269e10516e8f2faf83545e3d0163d8";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."lxml-2.3.6" self."plone.app.z3cform-0.7.6" self."plone.autoform-1.6" self."plone.registry-1.0.1" self."plone.supermodel-1.2.4" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.3" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope 2 and Plone  integration for plone.registry
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.registry";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.session-3.5.3" = self.buildPythonPackage {
-    name = "plone.session-3.5.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.session/plone.session-3.5.3.zip";
-        md5 = "f95872454735abc8f27c3dcbc9434c11";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.keyring-2.0.1" self."plone.protect-2.0.2" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Session based authentication for Zope
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.session";
-      license = "BSD";
-    };
-  };
-
-
-  "z3c.caching__zcml-2.0a1" = self.buildPythonPackage {
-    name = "z3c.caching__zcml-2.0a1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/z3c.caching/z3c.caching-2.0a1.tar.gz";
-        md5 = "17f250b5084c2324a7d15c6810ee628e";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.configuration-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Caching infrastructure for web apps
-        '';
-      homepage = "UNKNOWN";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "zope.filerepresentation-3.6.1" = self.buildPythonPackage {
-    name = "zope.filerepresentation-3.6.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.filerepresentation/zope.filerepresentation-3.6.1.tar.gz";
-        md5 = "4a7a434094f4bfa99a7f22e75966c359";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        File-system Representation Interfaces
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.filerepresentation";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.memoize-1.1.1" = self.buildPythonPackage {
-    name = "plone.memoize-1.1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.memoize/plone.memoize-1.1.1.zip";
-        md5 = "d07cd14b976160e1f26a859e3370147e";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.ramcache-1.0" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Decorators for caching the values of functions and methods
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.memoize";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zope.interface-3.6.7" = self.buildPythonPackage {
-    name = "zope.interface-3.6.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.6.7.zip";
-        md5 = "9df962180fbbb54eb1875cff9fe436e5";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Interfaces for Python
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.interface";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.size-3.4.1" = self.buildPythonPackage {
-    name = "zope.size-3.4.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.size/zope.size-3.4.1.tar.gz";
-        md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Interfaces and simple adapter that give the size of an object
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.size";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "five.customerize-1.1" = self.buildPythonPackage {
-    name = "five.customerize-1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/f/five.customerize/five.customerize-1.1.zip";
-        md5 = "80772212a2d55150a6c070fc4638b0c7";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.portlets-2.2" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        TTW customization of template-based Zope views
-        '';
-      homepage = "http://pypi.python.org/pypi/five.customerize";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.dottedname-3.4.6" = self.buildPythonPackage {
-    name = "zope.dottedname-3.4.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.dottedname/zope.dottedname-3.4.6.tar.gz";
-        md5 = "62d639f75b31d2d864fe5982cb23959c";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Resolver for Python dotted names.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.dottedname";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.resource-1.0.2" = self.buildPythonPackage {
-    name = "plone.resource-1.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.resource/plone.resource-1.0.2.zip";
-        md5 = "594d41e3acd913ae92f2e9ef96503b9f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.caching-1.0" self."python-dateutil-1.5" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        UNKNOWN
-        '';
-      homepage = "https://svn.plone.org/svn/plone/plone.resource";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.app.locales-4.3.3" = self.buildPythonPackage {
-    name = "plone.app.locales-4.3.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.3.zip";
-        md5 = "d774b4de1d16bed639c22c306ad0ada7";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Translation files for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.locales";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "collective.z3cform.datetimewidget-1.2.6" = self.buildPythonPackage {
-    name = "collective.z3cform.datetimewidget-1.2.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.6.zip";
-        md5 = "b8101e810c552a5afb8b57144ab6338a";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."z3c.form-3.1.1" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        z3c.form date and datetime widgets
-        '';
-      homepage = "https://github.com/collective/collective.z3cform.datetimewidget";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.app.contentlisting-1.0.5" = self.buildPythonPackage {
-    name = "plone.app.contentlisting-1.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.5.zip";
-        md5 = "9fc15b8ecad1c918778c3ea9a75bf533";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Listing of content for the Plone CMS
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.contentlisting";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Zope2-2.13.22" = self.buildPythonPackage {
-    name = "Zope2-2.13.22";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.22.zip";
-        md5 = "4322d37b5ca63b2e4fe43cfc67960819";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."docutils-0.9.1" self."ExtensionClass-2.13.2" self."initgroups-2.13.0" self."Missing-2.13.1" self."MultiMapping-2.13.0" self."Persistence-2.13.2" self."Products.BTreeFolder2-2.13.3" self."Products.ExternalMethod-2.13.0" self."Products.MailHost-2.13.1" self."Products.MIMETools-2.13.0" self."Products.OFSP-2.13.2" self."Products.PythonScripts-2.13.2" self."Products.StandardCacheManagers-2.13.0" self."Products.ZCatalog-2.13.27" self."Products.ZCTextIndex-2.13.5" self."pytz-2013b" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."tempstorage-2.12.2" self."transaction-1.1.1" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zExceptions-2.13.0" self."zLOG-2.11.1" self."ZODB3-3.10.5" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.contenttype-3.5.5" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.processlifetime-1.0" self."zope.proxy-3.6.1" self."zope.ptresource-3.9.0" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.sendmail-3.7.5" self."zope.sequencesort-3.4.0" self."zope.site-3.9.2" self."zope.size-3.4.1" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.testbrowser-3.11.1" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."ZopeUndo-2.12.0" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope2 application server / web framework
-        '';
-      homepage = "http://zope2.zope.org";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.textfield-1.2.3" = self.buildPythonPackage {
-    name = "plone.app.textfield-1.2.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.3.zip";
-        md5 = "1a018fa11ea21de5894f85b67161bcf1";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Text field with MIME type support
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.textfield";
-      license = "GPL";
-    };
-  };
-
-
-  "Products.ExternalMethod-2.13.0" = self.buildPythonPackage {
-    name = "Products.ExternalMethod-2.13.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip";
-        md5 = "15ba953ef6cb632eb571977651252ea6";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        This package provides support for external Python methods within a Zope 2 environment.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ExternalMethod";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.browserlayer-2.1.3" = self.buildPythonPackage {
-    name = "plone.browserlayer-2.1.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.browserlayer/plone.browserlayer-2.1.3.zip";
-        md5 = "41df50201e912fa10286c63687aaec3d";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Browser layer management for Zope 2 applications
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.browserlayer";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.app.workflow-2.1.7" = self.buildPythonPackage {
-    name = "plone.app.workflow-2.1.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.7.zip";
-        md5 = "269dc3dfdb8dae195ca6e1dff26a51da";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        workflow and security settings for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.workflow";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.app.folder-1.0.6" = self.buildPythonPackage {
-    name = "plone.app.folder-1.0.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.folder/plone.app.folder-1.0.6.zip";
-        md5 = "78e76f9d20e0c0e6e8edef7cb7e5d8f1";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.folder-1.0.5" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Integration package for `plone.folder` into Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.folder/";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zc.lockfile-1.0.2" = self.buildPythonPackage {
-    name = "zc.lockfile-1.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.2.tar.gz";
-        md5 = "f099d4cf2583a0c7bea0146a44dc4d59";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Basic inter-process locks
-        '';
-      homepage = "http://www.python.org/pypi/zc.lockfile";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.StandardCacheManagers-2.13.0" = self.buildPythonPackage {
-    name = "Products.StandardCacheManagers-2.13.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.StandardCacheManagers/Products.StandardCacheManagers-2.13.0.zip";
-        md5 = "c5088b2b62bd26d63d9579a04369cb73";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Cache managers for Zope 2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.StandardCacheManagers";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "RestrictedPython-3.6.0" = self.buildPythonPackage {
-    name = "RestrictedPython-3.6.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/R/RestrictedPython/RestrictedPython-3.6.0.zip";
-        md5 = "aa75a7dcc7fbc966357837cc66cacec6";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        RestrictedPython provides a restricted execution environment for Python, e.g. for running untrusted code.
-        '';
-      homepage = "http://pypi.python.org/pypi/RestrictedPython";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.stringinterp-1.0.11" = self.buildPythonPackage {
-    name = "plone.stringinterp-1.0.11";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.11.zip";
-        md5 = "e54dfa87b20a72f9b1465fcee1fd7ecd";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.i18n__zcml-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Adaptable string interpolation
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.stringinterp";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "tempstorage-2.12.2" = self.buildPythonPackage {
-    name = "tempstorage-2.12.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.2.zip";
-        md5 = "7a2b76b39839e229249b1bb175604480";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.testing-3.9.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        A RAM-based storage for ZODB
-        '';
-      homepage = "http://pypi.python.org/pypi/tempstorage";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.uuid-1.1" = self.buildPythonPackage {
-    name = "plone.app.uuid-1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.uuid/plone.app.uuid-1.1.zip";
-        md5 = "12ab2dee1a23d1c731b563686cf7b59f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.indexer-1.0.2" self."plone.uuid-1.0.3" self.setuptools self."zope.interface-3.6.7" self."zope.publisher-3.12.6" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone integration for the basic plone.uuid package
-        '';
-      homepage = "http://plone.org";
-      license = "GPL";
-    };
-  };
-
-
-  "zope.datetime-3.4.1" = self.buildPythonPackage {
-    name = "zope.datetime-3.4.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.datetime/zope.datetime-3.4.1.tar.gz";
-        md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope datetime
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.datetime";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "lxml-2.3.6" = self.buildPythonPackage {
-    name = "lxml-2.3.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/l/lxml/lxml-2.3.6.tar.gz";
-        md5 = "d5d886088e78b1bdbfd66d328fc2d0bc";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.
-        '';
-      homepage = "http://lxml.de/";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "zope.location-4.0.3" = self.buildPythonPackage {
-    name = "zope.location-4.0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.3.tar.gz";
-        md5 = "201416f4eb72a9cf61c7d6d37bb87f24";
-    };
-    doCheck = true;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-4.1.1" self."zope.proxy-4.1.4" self."zope.schema-4.4.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Location
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.location/";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "WSGIProxy2-0.4.1" = self.buildPythonPackage {
-    name = "WSGIProxy2-0.4.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/W/WSGIProxy2/WSGIProxy2-0.4.1.zip";
-        md5 = "fb8937620dc24270916678f6f07e337b";
-    };
-    doCheck = true;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."six-1.6.1" self."WebOb-1.4" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        UNKNOWN
-        '';
-      homepage = "https://github.com/gawel/WSGIProxy2/";
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-
-  "zope.app.locales-3.6.2" = self.buildPythonPackage {
-    name = "zope.app.locales-3.6.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.app.locales/zope.app.locales-3.6.2.tar.gz";
-        md5 = "bd2b4c6040e768f33004b1210d3207fa";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope locale extraction and management utilities
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.app.locales";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "five.globalrequest-1.0" = self.buildPythonPackage {
-    name = "five.globalrequest-1.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz";
-        md5 = "87f8996bd21d4aa156aa26e7d21b8744";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.globalrequest-1.0" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope 2 integration for zope.globalrequest
-        '';
-      homepage = "http://pypi.python.org/pypi/five.globalrequest";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "zope.app.content-3.5.1" = self.buildPythonPackage {
-    name = "zope.app.content-3.5.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.app.content/zope.app.content-3.5.1.tar.gz";
-        md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.componentvocabulary-1.0.1" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Content Type
-        '';
-      homepage = "http://cheeseshop.python.org/pypi/zope.app.content";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.discussion-2.2.12" = self.buildPythonPackage {
-    name = "plone.app.discussion-2.2.12";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.12.zip";
-        md5 = "410d25455ff13100aa7ef2eca9f28ac4";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."collective.monkeypatcher-1.0.1" self."plone.app.layout-2.3.11" self."plone.app.uuid-1.1" self."plone.app.z3cform-0.7.6" self."plone.indexer-1.0.2" self."plone.registry-1.0.1" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.site-3.9.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Enhanced discussion support for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.discussion";
-      license = "GPL";
-    };
-  };
-
-
-  "Products.MIMETools-2.13.0" = self.buildPythonPackage {
-    name = "Products.MIMETools-2.13.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip";
-        md5 = "ad5372fc1190599a19493db0864448ec";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."DocumentTemplate-2.13.2" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        MIMETools provides the &lt;!--#mime--&gt; tag for DocumentTemplate.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.MIMETools";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.z3cform-0.7.6" = self.buildPythonPackage {
-    name = "plone.app.z3cform-0.7.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.6.zip";
-        md5 = "292367803fafba716f04fa7a546e7064";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.6" self."plone.protect-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."z3c.formwidget.query-0.10" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A collection of widgets, templates and other components for use with z3c.form and Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.z3cform";
-      license = "GPL";
-    };
-  };
-
-
-  "python-dateutil-1.5" = self.buildPythonPackage {
-    name = "python-dateutil-1.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz";
-        md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Extensions to the standard python 2.3+ datetime module
-        '';
-      homepage = "http://labix.org/python-dateutil";
-      license = "PSF License";
-    };
-  };
-
-
-  "plone.i18n-2.0.9" = self.buildPythonPackage {
-    name = "plone.i18n-2.0.9";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.9.zip";
-        md5 = "8e8ceffc64f04beecf1579a24edc2670";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."Unidecode-0.04.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Advanced i18n/l10n features
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.i18n";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.contentmigration-2.1.7" = self.buildPythonPackage {
-    name = "Products.contentmigration-2.1.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.7.zip";
-        md5 = "50cefdb73c88e15d331dff50086c109e";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A generic content migration framework for Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.contentmigration";
-      license = "LGPL";
-    };
-  };
-
-
-  "zope.browsermenu-3.9.1" = self.buildPythonPackage {
-    name = "zope.browsermenu-3.9.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.browsermenu/zope.browsermenu-3.9.1.zip";
-        md5 = "a47c7b1e786661c912a1150bf8d1f83f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Browser menu implementation for Zope.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.browsermenu/";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "ZODB3-3.10.5" = self.buildPythonPackage {
-    name = "ZODB3-3.10.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz";
-        md5 = "6f180c6897a1820948fee2a6290503cd";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."transaction-1.1.1" self."zc.lockfile-1.0.2" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Object Database: object database and persistence
-        '';
-      homepage = "UNKNOWN";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.jquery-1.7.2" = self.buildPythonPackage {
-    name = "plone.app.jquery-1.7.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.jquery/plone.app.jquery-1.7.2.tar.gz";
-        md5 = "e204cf45456d26217263531832b5bdac";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        jQuery integration for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.jquery";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "venusian-1.0a8" = self.buildPythonPackage {
-    name = "venusian-1.0a8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/v/venusian/venusian-1.0a8.tar.gz";
-        md5 = "a1a72166fd7cccf0f30e3305e09ce5cf";
-    };
-    doCheck = false;
-    buildInputs = [ self."nose-1.3.3" ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        A library for deferring decorator actions
-        '';
-      homepage = "http://pylonsproject.org";
-      license = "BSD-derived (http://www.repoze.org/LICENSE.txt)";
-    };
-  };
-
-
-  "plone.contentrules-2.0.4" = self.buildPythonPackage {
-    name = "plone.contentrules-2.0.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.4.zip";
-        md5 = "21b189c2139ec7baea63a1e7ee187c55";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone ContentRules Engine
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.contentrules";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.protect-2.0.2" = self.buildPythonPackage {
-    name = "plone.protect-2.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.protect/plone.protect-2.0.2.zip";
-        md5 = "74925ffb08782e72f9b1e850fa78fffa";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.keyring-2.0.1" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Security for browser forms
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.protect";
-      license = "BSD";
-    };
-  };
-
-
-  "zope.i18nmessageid-3.5.3" = self.buildPythonPackage {
-    name = "zope.i18nmessageid-3.5.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-3.5.3.tar.gz";
-        md5 = "cb84bf61c2b7353e3b7578057fbaa264";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Message Identifiers for internationalization
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.i18nmessageid";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "transaction-1.1.1" = self.buildPythonPackage {
-    name = "transaction-1.1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/t/transaction/transaction-1.1.1.tar.gz";
-        md5 = "30b062baa34fe1521ad979fb088c8c55";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Transaction management for Python
-        '';
-      homepage = "http://www.zope.org/Products/ZODB";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.cachedescriptors-3.5.1" = self.buildPythonPackage {
-    name = "zope.cachedescriptors-3.5.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip";
-        md5 = "263459a95238fd61d17e815d97ca49ce";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Method and property caching decorators
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.cachedescriptors";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.theme-2.1.1" = self.buildPythonPackage {
-    name = "plone.theme-2.1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.theme/plone.theme-2.1.1.zip";
-        md5 = "28f06c6486059221648e38b5da1d304d";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Tools for managing themes in CMF and Plone sites
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.theme";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "borg.localrole-3.0.2" = self.buildPythonPackage {
-    name = "borg.localrole-3.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/b/borg.localrole/borg.localrole-3.0.2.zip";
-        md5 = "04082694dfda9ae5cda62747b8ac7ccf";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A PAS plugin which can manage local roles via an adapter lookup on the current context
-        '';
-      homepage = "http://pypi.python.org/pypi/borg.localrole";
-      license = "LGPL";
-    };
-  };
-
-
-  "Products.ZCatalog-2.13.27" = self.buildPythonPackage {
-    name = "Products.ZCatalog-2.13.27";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ZCatalog/Products.ZCatalog-2.13.27.zip";
-        md5 = "49cad3f1c408973cc9a1430acc9e1432";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Products.ZCTextIndex-2.13.5" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope 2's indexing and search solution.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ZCatalog";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.TinyMCE-1.3.6" = self.buildPythonPackage {
-    name = "Products.TinyMCE-1.3.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.6.zip";
-        md5 = "c9e7aa751768f88f3647c5881cc84603";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.imaging-1.0.10" self."plone.app.layout-2.3.11" self."plone.caching-1.0" self."plone.namedfile__scales-2.0.5" self."plone.outputfilters-1.12" self."Products.ResourceRegistries-2.2.10" self.setuptools self."zope.app.content-3.5.1" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Adds support for TinyMCE, a platform independent web based Javascript HTML WYSIWYG editor, to Plone.
-        '';
-      homepage = "http://plone.org/products/tinymce";
-      license = "LGPL";
-    };
-  };
-
-
-  "plone.app.layout-2.3.11" = self.buildPythonPackage {
-    name = "plone.app.layout-2.3.11";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.11.zip";
-        md5 = "641297ae21cba8fc6cbf03bbbb81c11f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.app.content-2.1.4" self."plone.app.portlets-2.4.8" self."plone.app.viewletmanager-2.0.5" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.9" self.setuptools self."zope.component__zcml-3.9.5" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Layout mechanisms for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.layout";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Pillow-2.3.0" = self.buildPythonPackage {
-    name = "Pillow-2.3.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Pillow/Pillow-2.3.0.zip";
-        md5 = "56b6614499aacb7d6b5983c4914daea7";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    configurePhase = ''
-      sed -i "setup.py" \
-          -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ;
-              s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ;
-              s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ;
-              s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ;
-              s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;'
-    '';
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Python Imaging Library (Fork)
-        '';
-      homepage = "http://python-imaging.github.io/";
-      license = "Standard PIL License";
-    };
-  };
-
-
-  "plone.supermodel-1.2.4" = self.buildPythonPackage {
-    name = "plone.supermodel-1.2.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.4.zip";
-        md5 = "f07134bc7ff1ab30735a61bc6f7d4c47";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools self."z3c.zcmlhook-1.0b1" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Serialize Zope schema definitions to and from XML
-        '';
-      homepage = "http://code.google.com/p/dexterity";
-      license = "BSD";
-    };
-  };
-
-
-  "plone.app.caching-1.1.8" = self.buildPythonPackage {
-    name = "plone.app.caching-1.1.8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.8.zip";
-        md5 = "f74d9f293ba3a89b9dd91589ab6672b5";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.registry-1.2.3" self."plone.app.z3cform-0.7.6" self."plone.cachepurging-1.0.5" self."plone.caching-1.0" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self."python-dateutil-1.5" self.setuptools self."z3c.form-3.1.1" self."z3c.zcmlhook-1.0b1" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone UI and default rules for plone.caching/z3c.caching
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.caching";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zope.exceptions-3.6.2" = self.buildPythonPackage {
-    name = "zope.exceptions-3.6.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-3.6.2.tar.gz";
-        md5 = "d7234d99d728abe3d9275346e8d24fd9";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Exceptions
-        '';
-      homepage = "http://cheeseshop.python.org/pypi/zope.exceptions";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.z3cform-0.8.0" = self.buildPythonPackage {
-    name = "plone.z3cform-0.8.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.8.0.zip";
-        md5 = "bdb23dd162544964d2f8f8f5f002e874";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.batching-1.0.1" self.setuptools self."z3c.form-3.1.1" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.z3cform";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "AccessControl-3.0.8" = self.buildPythonPackage {
-    name = "AccessControl-3.0.8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/A/AccessControl/AccessControl-3.0.8.zip";
-        md5 = "06bea3be59d1ce76c815661180b7ffd9";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self."Record-2.13.0" self."RestrictedPython-3.6.0" self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.testing-3.9.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Security framework for Zope2.
-        '';
-      homepage = "http://pypi.python.org/pypi/AccessControl";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Record-2.13.0" = self.buildPythonPackage {
-    name = "Record-2.13.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/R/Record/Record-2.13.0.zip";
-        md5 = "cfed6a89d4fb2c9cb995e9084c3071b7";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Special Record objects used in Zope2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Record";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "python-gettext-1.2" = self.buildPythonPackage {
-    name = "python-gettext-1.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/python-gettext/python-gettext-1.2.zip";
-        md5 = "cd4201d440126d1296d1d2bc2b4795f3";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."unittest2-0.5.1" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Python Gettext po to mo file compiler.
-        '';
-      homepage = "http://pypi.python.org/pypi/python-gettext";
-      license = "BSD";
-    };
-  };
-
-
-  "plone.resourceeditor-1.0" = self.buildPythonPackage {
-    name = "plone.resourceeditor-1.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip";
-        md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.resource-1.0.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        UNKNOWN
-        '';
-      homepage = "https://github.com/plone/plone.resourceeditor";
-      license = "GPL";
-    };
-  };
-
-
-  "Products.ResourceRegistries-2.2.10" = self.buildPythonPackage {
-    name = "Products.ResourceRegistries-2.2.10";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.10.zip";
-        md5 = "207878a7c4b1583fe3cd609116e40bee";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Registry for managing CSS and JS
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ResourceRegistries";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "pyquery-1.2.8" = self.buildPythonPackage {
-    name = "pyquery-1.2.8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.8.zip";
-        md5 = "a2a9c23a88f7b2615b41722a3ddebeb7";
-    };
-    doCheck = true;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."cssselect-0.9.1" self."lxml-3.3.5" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        A jquery-like library for python
-        '';
-      homepage = "https://github.com/gawel/pyquery";
-      license = "BSD";
-    };
-  };
-
-
-  "initgroups-2.13.0" = self.buildPythonPackage {
-    name = "initgroups-2.13.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/i/initgroups/initgroups-2.13.0.zip";
-        md5 = "38e842dcab8445f65e701fec75213acd";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Convenience uid/gid helper function used in Zope2.
-        '';
-      homepage = "http://pypi.python.org/pypi/initgroups";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zdaemon-2.0.7" = self.buildPythonPackage {
-    name = "zdaemon-2.0.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zdaemon/zdaemon-2.0.7.tar.gz";
-        md5 = "291a875f82e812110557eb6704af8afe";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."ZConfig-2.9.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Daemon process control library and tools for Unix-based systems
-        '';
-      homepage = "http://www.python.org/pypi/zdaemon";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.querystring-1.1.1" = self.buildPythonPackage {
-    name = "plone.app.querystring-1.1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.querystring/plone.app.querystring-1.1.1.zip";
-        md5 = "845c1a4fc37f615022b536667281b80e";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."DateTime-3.0.3" self."plone.app.contentlisting-1.0.5" self."plone.app.layout-2.3.11" self."plone.app.vocabularies-2.1.14" self."plone.batching-1.0.1" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.globalrequest-1.0" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        UNKNOWN
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.querystring";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "z3c.zcmlhook-1.0b1" = self.buildPythonPackage {
-    name = "z3c.zcmlhook-1.0b1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/z3c.zcmlhook/z3c.zcmlhook-1.0b1.tar.gz";
-        md5 = "7b6c80146f5930409eb0b355ddf3daeb";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Easily hook into the ZCML processing machinery
-        '';
-      homepage = "UNKNOWN";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "zope.authentication-3.7.1" = self.buildPythonPackage {
-    name = "zope.authentication-3.7.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.authentication/zope.authentication-3.7.1.zip";
-        md5 = "7d6bb340610518f2fc71213cfeccda68";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Definition of authentication basics for the Zope Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.authentication";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "eggtestinfo-0.3" = self.buildPythonPackage {
-    name = "eggtestinfo-0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/e/eggtestinfo/eggtestinfo-0.3.tar.gz";
-        md5 = "6f0507aee05f00c640c0d64b5073f840";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Add test information to .egg-info
-        '';
-      homepage = "http://pypi.python.org/pypi/eggtestinfo";
-      license = with stdenv.lib.licenses; [ psfl zpt20 ];
-    };
-  };
-
-
-  "plone.batching-1.0.1" = self.buildPythonPackage {
-    name = "plone.batching-1.0.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0.1.zip";
-        md5 = "4b57b660082683ad66910b3c6725c141";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Batching facilities used in Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.batching";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.portlet.collection-2.1.5" = self.buildPythonPackage {
-    name = "plone.portlet.collection-2.1.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.1.5.zip";
-        md5 = "065f0d9141860229cf66d0ff2ed6d4ea";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.form-2.2.4" self."plone.app.portlets-2.4.8" self."plone.app.vocabularies-2.1.14" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A portlet that fetches results from a collection
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.portlet.collection";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zope.browser-1.3" = self.buildPythonPackage {
-    name = "zope.browser-1.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.browser/zope.browser-1.3.zip";
-        md5 = "4ff0ddbf64c45bfcc3189e35f4214ded";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Shared Zope Toolkit browser components
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.browser";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.collection-1.0.11" = self.buildPythonPackage {
-    name = "plone.app.collection-1.0.11";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.11.zip";
-        md5 = "3f97abc0cd5e370c4bbb1a73f7ee05a7";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."archetypes.querywidget-1.0.10" self."plone.app.contentlisting-1.0.5" self."plone.app.form-2.2.4" self."plone.app.portlets-2.4.8" self."plone.app.vocabularies-2.1.14" self."plone.portlet.collection-2.1.5" self."plone.portlets-2.2" self."Products.Archetypes-1.9.7" self."Products.CMFCore-2.2.7" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        This package adds 'saved search' functionality to Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.collection";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.CMFCalendar-2.2.3" = self.buildPythonPackage {
-    name = "Products.CMFCalendar-2.2.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.3.tar.gz";
-        md5 = "75659630aa12cfe86cc740db64ef294f";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.app.form-4.0.2" self."Zope2-2.13.22" self."eggtestinfo-0.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Calendar product for the Zope Content Management Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFCalendar";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Plone" = self."Plone-4.3.3";
-
-  "Plone-4.3.3" = self.buildPythonPackage {
-    name = "Plone-4.3.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.3.zip";
-        md5 = "ce8ab3b3033e05b9544a8127dc67e09a";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.caching-1.1.8" self."plone.app.dexterity-2.0.11" self."plone.app.iterate-2.1.12" self."plone.app.openid-2.0.2" self."plone.app.theming-1.1.1" self."Products.CMFPlacefulWorkflow-1.5.10" self."Products.CMFPlone-4.3.3" self.setuptools self."wicked-1.1.10" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        The Plone Content Management System
-        '';
-      homepage = "http://plone.org/";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.PluggableAuthService-1.10.0" = self.buildPythonPackage {
-    name = "Products.PluggableAuthService-1.10.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PluggableAuthService/Products.PluggableAuthService-1.10.0.tar.gz";
-        md5 = "1a1db6b1d9dd34f8b93a8a3104385a37";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self."Products.PluginRegistry-1.3" self.setuptools self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Pluggable Zope2 authentication / authorization framework
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.PluggableAuthService";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "wicked-1.1.10" = self.buildPythonPackage {
-    name = "wicked-1.1.10";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip";
-        md5 = "f65611f11d547d7dc8e623bf87d3929d";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.container-3.11.2" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        wicked is a compact syntax for doing wiki-like content linking and creation in zope and plone
-        '';
-      homepage = "http://pypi.python.org/pypi/wicked";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.app.jquerytools-1.5.7" = self.buildPythonPackage {
-    name = "plone.app.jquerytools-1.5.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.7.zip";
-        md5 = "f87fe3088f5258a8dae1490d7d989988";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        jQuery Tools integration for Plone plus overlay and AJAX form helpers.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.jquerytools";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.GenericSetup-1.7.4" = self.buildPythonPackage {
-    name = "Products.GenericSetup-1.7.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.4.tar.gz";
-        md5 = "f93251ed519e8c4aea0bc001416027b1";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self.setuptools self."zope.formlib-4.0.6" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Read Zope configuration state from profile dirs / tarballs
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.GenericSetup";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "ExtensionClass-2.13.2" = self.buildPythonPackage {
-    name = "ExtensionClass-2.13.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip";
-        md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Metaclass for subclassable extension types
-        '';
-      homepage = "http://pypi.python.org/pypi/ExtensionClass";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.schemaeditor-1.3.7" = self.buildPythonPackage {
-    name = "plone.schemaeditor-1.3.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.schemaeditor/plone.schemaeditor-1.3.7.zip";
-        md5 = "94535ff5b8d8d871fbbd9806912c4c00";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.autoform-1.6" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Provides through-the-web editing of a zope schema/interface.
-        '';
-      homepage = "http://svn.plone.org/svn/plone/plone.schemaeditor";
-      license = "BSD";
-    };
-  };
-
-
-  "zope.structuredtext-3.5.1" = self.buildPythonPackage {
-    name = "zope.structuredtext-3.5.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.structuredtext/zope.structuredtext-3.5.1.tar.gz";
-        md5 = "eabbfb983485d0879322bc878d2478a0";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        StructuredText parser
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.structuredtext";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.ramcache-1.0" = self.buildPythonPackage {
-    name = "zope.ramcache-1.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.ramcache/zope.ramcache-1.0.zip";
-        md5 = "87289e15f0e51f50704adda1557c02a7";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.testing-3.9.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope RAM Cache
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.ramcache";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.traversing-3.13.2" = self.buildPythonPackage {
-    name = "zope.traversing-3.13.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.traversing/zope.traversing-3.13.2.zip";
-        md5 = "eaad8fc7bbef126f9f8616b074ec00aa";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Resolving paths in the object hierarchy
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.traversing";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.contentprovider-3.7.2" = self.buildPythonPackage {
-    name = "zope.contentprovider-3.7.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.contentprovider/zope.contentprovider-3.7.2.tar.gz";
-        md5 = "1bb2132551175c0123f17939a793f812";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.tales-3.5.3" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Content Provider Framework for Zope Templates
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.contentprovider";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plonetheme.classic-1.3.3" = self.buildPythonPackage {
-    name = "plonetheme.classic-1.3.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.3.zip";
-        md5 = "5bcf588a8998f4a1c5aecb99c3d9ecf4";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        The classic Plone 3 default theme.
-        '';
-      homepage = "http://pypi.python.org/pypi/plonetheme.classic";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.scale__storage-1.3.3" = self.buildPythonPackage {
-    name = "plone.scale__storage-1.3.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.3.zip";
-        md5 = "f2d56ec944e5677a4998b3b9e21534e3";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."Persistence-2.13.2" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Image scaling
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.scale";
-      license = "BSD";
-    };
-  };
-
-
-  "plone.portlet.static-2.0.2" = self.buildPythonPackage {
-    name = "plone.portlet.static-2.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip";
-        md5 = "ec0dc691b4191a41ff97779b117f9985";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.form-2.2.4" self."plone.app.portlets-2.4.8" self."plone.i18n-2.0.9" self."plone.portlets-2.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A simple static HTML portlet for Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.portlet.static";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.SecureMailHost-1.1.2" = self.buildPythonPackage {
-    name = "Products.SecureMailHost-1.1.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.SecureMailHost/Products.SecureMailHost-1.1.2.zip";
-        md5 = "7db0f1fa867bd0df972082f502a7a707";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        SecureMailHost is a reimplementation of the standard Zope2 MailHost with some security and usability enhancements.
-        '';
-      homepage = "http://svn.plone.org/svn/collective/SecureMailHost/trunk";
-      license = stdenv.lib.licenses.zpt20;
-    };
-  };
-
-
-  "plone.portlets-2.2" = self.buildPythonPackage {
-    name = "plone.portlets-2.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.portlets/plone.portlets-2.2.zip";
-        md5 = "5b7e06bee6e40af83694b82e1fee8c2d";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        An extension of zope.viewlet to support dynamic portlets
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.portlets";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "Products.PluginRegistry-1.3" = self.buildPythonPackage {
-    name = "Products.PluginRegistry-1.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz";
-        md5 = "5b166193ca1eb84dfb402051f779ebab";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Configure application plugins based on interfaces
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.PluginRegistry";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "repoze.xmliter-0.5" = self.buildPythonPackage {
-    name = "repoze.xmliter-0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/r/repoze.xmliter/repoze.xmliter-0.5.zip";
-        md5 = "99da76bcbad6fbaced4a273bde29b10e";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Wrapper for ``lxml`` trees which serializes to string upon iteration.
-        '';
-      homepage = "http://www.repoze.org";
-      license = "BSD-derived (http://www.repoze.org/LICENSE.txt)";
-    };
-  };
-
-
-  "zLOG-2.11.1" = self.buildPythonPackage {
-    name = "zLOG-2.11.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zLOG/zLOG-2.11.1.tar.gz";
-        md5 = "68073679aaa79ac5a7b6a5c025467147";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."ZConfig-2.9.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        A general logging facility
-        '';
-      homepage = "http://cheeseshop.python.org/pypi/zLOG";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.location-3.9.1" = self.buildPythonPackage {
-    name = "zope.location-3.9.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-3.9.1.tar.gz";
-        md5 = "1684a8f986099d15296f670c58e713d8";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.proxy-3.6.1" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Location
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.location/";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "experimental.cssselect-0.3" = self.buildPythonPackage {
-    name = "experimental.cssselect-0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/e/experimental.cssselect/experimental.cssselect-0.3.zip";
-        md5 = "3fecdcf1fbc3ea6025e115a56a262957";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Experimental version of lxml.cssselect
-        '';
-      homepage = "https://github.com/lrowe/experimental.cssselect";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "zope.formlib-4.0.6" = self.buildPythonPackage {
-    name = "zope.formlib-4.0.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.formlib/zope.formlib-4.0.6.zip";
-        md5 = "eed9c94382d11a4dececd0a48ac1d3f2";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."pytz-2013b" self.setuptools self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.datetime-3.4.1" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Form generation and validation library for Zope
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.formlib";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "zope.copy-3.5.0" = self.buildPythonPackage {
-    name = "zope.copy-3.5.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.copy/zope.copy-3.5.0.tar.gz";
-        md5 = "a9836a5d36cd548be45210eb00407337";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Pluggable object copying mechanism
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.copy";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "plone.app.vocabularies-2.1.14" = self.buildPythonPackage {
-    name = "plone.app.vocabularies-2.1.14";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.14.zip";
-        md5 = "c3ce7028fd0e3f70588167b8d3c002d5";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A collection of generally useful vocabularies.
-        '';
-      homepage = "https://github.com/plone/plone.app.vocabularies";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "archetypes.querywidget-1.0.10" = self.buildPythonPackage {
-    name = "archetypes.querywidget-1.0.10";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.10.zip";
-        md5 = "6b65a6ff701ebcb6e9550d27c7e2a855";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.jquerytools-1.5.7" self."plone.app.querystring-1.1.1" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        UNKNOWN
-        '';
-      homepage = "http://pypi.python.org/pypi/archetypes.querywidget";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.registry-1.0.1" = self.buildPythonPackage {
-    name = "plone.registry-1.0.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.registry/plone.registry-1.0.1.zip";
-        md5 = "6be3d2ec7e2d170e29b8c0bc65049aff";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A debconf-like (or about:config-like) registry for storing application settings
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.registry";
-      license = "GPL";
-    };
-  };
-
-
-  "Products.ExtendedPathIndex-3.1" = self.buildPythonPackage {
-    name = "Products.ExtendedPathIndex-3.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/Products.ExtendedPathIndex-3.1.zip";
-        md5 = "00c048a4b103200bdcbda61fa22c66df";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope catalog index for paths
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ExtendedPathIndex";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "plone.subrequest-1.6.8" = self.buildPythonPackage {
-    name = "plone.subrequest-1.6.8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.subrequest/plone.subrequest-1.6.8.zip";
-        md5 = "6ea93bc17d56612d41a497cdc5f2960b";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."five.globalrequest-1.0" self.setuptools self."zope.globalrequest-1.0" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Subrequests for Zope2
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.subrequest/";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "z3c.form-3.1.1" = self.buildPythonPackage {
-    name = "z3c.form-3.1.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.1.1.zip";
-        md5 = "0b54d848d6a1be9eab867255e10f5504";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."six-1.2.0" self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.site-3.9.2" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        An advanced form and widget framework for Zope 3
-        '';
-      homepage = "https://launchpad.net/z3c.form";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "Products.CMFActionIcons-2.1.3" = self.buildPythonPackage {
-    name = "Products.CMFActionIcons-2.1.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFActionIcons/Products.CMFActionIcons-2.1.3.tar.gz";
-        md5 = "ab1dc62404ed11aea84dc0d782b2235e";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."eggtestinfo-0.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Action icons product for the Zope Content Management Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFActionIcons";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "WebTest-2.0.15" = self.buildPythonPackage {
-    name = "WebTest-2.0.15";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/W/WebTest/WebTest-2.0.15.zip";
-        md5 = "49314bdba23f4d0bd807facb2a6d3f90";
-    };
-    doCheck = true;
-    buildInputs = [ self."nose-1.3.3" self."unittest2-0.5.1" self."pyquery-1.2.8" self."WSGIProxy2-0.4.1" self."PasteDeploy-1.5.2" self."mock-1.0.1" self."coverage-3.7.1" pkgs.unzip ];
-    propagatedBuildInputs = [ self."beautifulsoup4-4.3.2" self."six-1.6.1" self."waitress-0.8.9" self."WebOb-1.4" ];
-    preConfigure = ''substituteInPlace setup.py --replace "nose<1.3.0" "nose"'';
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Helper to test WSGI applications
-        '';
-      homepage = "http://webtest.pythonpaste.org/";
-      license = stdenv.lib.licenses.mit;
-    };
-  };
-
-
-  "plone.app.linkintegrity-1.5.4" = self.buildPythonPackage {
-    name = "plone.app.linkintegrity-1.5.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.4.zip";
-        md5 = "f82e73603ade6f588bc27f01c5aea404";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Manage link integrity in Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.linkintegrity";
-      license = stdenv.lib.licenses.gpl2;
-    };
-  };
-
-
-  "zope.app.form-4.0.2" = self.buildPythonPackage {
-    name = "zope.app.form-4.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.app.form/zope.app.form-4.0.2.tar.gz";
-        md5 = "3d2b164d9d37a71490a024aaeb412e91";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."transaction-1.1.1" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.datetime-3.4.1" self."zope.exceptions-3.6.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.proxy-3.6.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        The Original Zope 3 Form Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.app.form";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-  "five.localsitemanager-2.0.5" = self.buildPythonPackage {
-    name = "five.localsitemanager-2.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/f/five.localsitemanager/five.localsitemanager-2.0.5.zip";
-        md5 = "5e3a658e6068832bd802018ebc83f2d4";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.22" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Local site manager implementation for Zope 2
-        '';
-      homepage = "http://pypi.python.org/pypi/five.localsitemanager";
-      license = stdenv.lib.licenses.zpt21;
-    };
-  };
-
-
-}
diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json
deleted file mode 100644
index 8dbd010b9b6..00000000000
--- a/pkgs/top-level/python-packages.json
+++ /dev/null
@@ -1,150 +0,0 @@
-[
-  { "name": "pyramid",
-    "buildInputs": [ "pkgs.libxml2", "pkgs.libxslt" ],
-    "override": {
-      "pyramid": {
-        "buildInputs": [
-          "nose",
-          "WebTest",
-          "zope.component",
-          "zope.interface"
-        ]
-      },
-      "cssselect": {
-        "doCheck": false
-      },
-      "lxml": {
-        "buildInputs": [ "pkgs.libxml2", "pkgs.libxslt" ],
-        "doCheck": false
-      },
-      "six": {
-        "doCheck": false
-      },
-      "beautifulsoup4": {
-        "doCheck": false
-      },
-      "zope.exceptions": {
-        "doCheck": false
-      },
-      "zope.component": {
-        "doCheck": false
-      },
-      "zope.schema": {
-        "doCheck": false
-      },
-      "zope.testing": {
-        "buildInputs": [ "zope.location" ]
-      },
-      "waitress": {
-        "doCheck": false
-      },
-      "venusian": {
-        "buildInputs": [ "nose" ],
-        "doCheck": false
-      },
-      "Mako": {
-        "buildInputs": [ "nose" ]
-      },
-      "WebOb": {
-        "buildInputs": [ "nose" ],
-        "propagatedBuildInputs": [ "python.modules.ssl" ]
-      },
-      "WebTest": {
-        "buildInputs": [
-          "nose",
-          "unittest2",
-          "pyquery",
-          "WSGIProxy2",
-          "PasteDeploy",
-          "mock",
-          "coverage"
-        ]
-      },
-      "mock": {
-        "buildInputs": [ "unittest2" ]
-      },
-      "PasteDeploy": {
-        "buildInputs": [ "nose" ]
-      },
-      "Chameleon": {
-        "buildInputs": [ "zope.event" ],
-        "doCheck": false
-      },
-      "zope.interface": {
-        "buildInputs": [ "zope.event" ]
-      },
-      "translationstring": {
-        "buildInputs": [ "nose" ]
-      },
-      "repoze.lru": {
-        "buildInputs": [ "nose" ]
-      }
-    }
-  },
-  { "name": "Plone",
-    "extends": "http://dist.plone.org/release/4.3.3/versions.cfg",
-    "doCheck": false,
-    "installCommand": "easy_install --always-unzip --no-deps --prefix=\"$out\" .",
-    "override": {
-      "Products.DCWorkflow": {
-        "propagatedBuildInputs": [ "eggtestinfo" ]
-      },
-      "lxml": {
-        "buildInputs": [ "pkgs.libxml2", "pkgs.libxslt" ],
-        "doCheck": false
-      },
-      "Products.CMFDefault": {
-        "propagatedBuildInputs": [ "eggtestinfo" ]
-      },
-      "Products.CMFQuickInstallerTool": {
-        "propagatedBuildInputs": [ "eggtestinfo" ]
-      },
-      "Products.CMFUid": {
-        "propagatedBuildInputs": [ "eggtestinfo" ]
-      },
-      "Products.CMFActionIcons": {
-        "propagatedBuildInputs": [ "eggtestinfo" ]
-      },
-      "Products.CMFCalendar": {
-        "propagatedBuildInputs": [ "eggtestinfo" ]
-      },
-      "Pillow": {
-        "buildInputs": [
-          "pkgs.freetype",
-          "pkgs.libjpeg",
-          "pkgs.zlib",
-          "pkgs.libtiff",
-          "pkgs.libwebp"
-        ],
-        "configurePhase": [
-          "sed -i \"setup.py\" \\",
-          "    -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include(\"${pkgs.freetype}\")|g ;",
-          "        s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include(\"${pkgs.libjpeg}\")|g ;",
-          "        s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include(\"${pkgs.zlib}\")|g ;",
-          "        s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include(\"${pkgs.libwebp}\")|g ;",
-          "        s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include(\"${pkgs.libtiff}\")|g ;'"
-        ]
-      }
-    }
-  },
-  { "name": "plone.recipe.zope2instance",
-    "extends": "http://dist.plone.org/release/4.3.3/versions.cfg",
-    "doCheck": false
-  },
-  { "name": "RelStorage",
-    "extends": "http://dist.plone.org/release/4.3.3/versions.cfg",
-    "doCheck": false
-  },
-  { "name": "psycopg2",
-    "buildInputs": [ "pkgs.postgresql" ],
-    "doCheck": false
-  },
-  { "name": "xlrd",
-    "doCheck": false
-  },
-  { "name": "suds",
-    "doCheck": false
-  },
-  { "name": "html2text"
-  }
-]
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4da6cdbcf78..95655002afa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -32,12 +32,7 @@ let
     crypt = null;
   };
 
-  pythonPackages = modules // import ./python-packages-generated.nix {
-    inherit pkgs python;
-    inherit (pkgs) stdenv fetchurl;
-    self = pythonPackages;
-  }
-// {
+  pythonPackages = modules // {
 
   inherit python isPy26 isPy27 isPy33 isPy34 isPyPy isPy3k pythonName buildPythonPackage;
 

From 27007155670c2ac739d0ac5fb945cff13c21b4c5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 11 Jun 2015 10:37:49 +0200
Subject: [PATCH 0991/2322] global: update from 6.4 to 6.5

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

diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 0fa54709788..13903b4c7b9 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "global-6.4";
+  name = "global-6.5";
 
   src = fetchurl {
     url = "mirror://gnu/global/${name}.tar.gz";
-    sha256 = "13i4zwx6gaibc4j79wd0hgxysw8ibxz9c018zxhydnxlyadzcnri";
+    sha256 = "1af6lhwhrpdnigd3707fnk3dd6y53pbc4g0i75xjf0563bdi5zaa";
   };
 
   nativeBuildInputs = [ libtool makeWrapper ];

From 6125f583e636afbf636ba85eb230008640f73f6d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 11 Jun 2015 10:46:12 +0200
Subject: [PATCH 0992/2322] redis: update from 3.0.1 to 3.0.2, fixes
 CVE-2015-4335

---
 pkgs/servers/nosql/redis/3.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/redis/3.0.nix b/pkgs/servers/nosql/redis/3.0.nix
index 0e7a7d0f250..ae5a98d5f0a 100644
--- a/pkgs/servers/nosql/redis/3.0.nix
+++ b/pkgs/servers/nosql/redis/3.0.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.1";
+  version = "3.0.2";
   name = "redis-${version}";
 
   src = fetchurl {
     url = "https://github.com/antirez/redis/archive/${version}.tar.gz";
-    sha256 = "1m34s60qvj1xyqw7x7ar0graw52wypx47dhvfb0br67vfb62l8sl";
+    sha256 = "00gazq98ccz64l4l5vzpynyk5wg15iwmwwvznaarkwm99b9rsz4g";
   };
 
   makeFlags = "PREFIX=$(out)";

From 19248c309ac08d314805d7c717beb998c018cf9c Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 11 Jun 2015 10:48:29 +0200
Subject: [PATCH 0993/2322] neovim: uses vimUtils to make it configurable like
 vim_configurable is

- vimAlias argument , when true, will create a @out/bin/vim symlink
- configure argument, which will configure neovim the same way as it does
  vim_configurable. eg.: ~/.nixpkgs/config.nix

    {

      packageOverrides = pkgs : with pkgs; rec {
        vimg = neovim.override {
          vimAlias = true;
          configure = {
            customRC = ''
              set spell
            '';
            vam.pluginDictionaries = [
              { names = [ "youcompleteme" "ctrlp"]; }
            ];
          };
        };
      };

     }

Enjoy!
---
 pkgs/applications/editors/neovim/default.nix | 149 +++++++++++--------
 1 file changed, 84 insertions(+), 65 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index e2dbc4abc56..599b04e1028 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,9 +1,13 @@
-{ stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack
-, libtermkey, libtool, libuv, lpeg, lua, luajit, luaMessagePack
-, luabitop, ncurses, perl, pkgconfig, unibilium, makeWrapper
+{ stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack, libtermkey
+, libtool, libuv, lpeg, lua, luajit, luaMessagePack, luabitop, ncurses, perl
+, pkgconfig, unibilium, makeWrapper, vimUtils
+
 , withPython ? true, pythonPackages, extraPythonPackages ? []
 , withPython3 ? true, python3Packages, extraPython3Packages ? []
 , withJemalloc ? true, jemalloc
+
+, vimAlias ? false
+, configure ? null
 }:
 
 with stdenv.lib;
@@ -48,74 +52,89 @@ let
     ignoreCollisions = true;
   };
 
-in stdenv.mkDerivation rec {
-  name = "neovim-${version}";
+  neovim = stdenv.mkDerivation rec {
+    name = "neovim-${version}";
 
-  src = fetchFromGitHub {
-    sha256 = "1lycql0lwi7ynrsaln4kxybwvxb9fvganiq3ba4pnpcfgl155k1j";
-    rev = "6270d431aaeed71e7a8782411f36409ab8e0ee35";
-    repo = "neovim";
-    owner = "neovim";
-  };
+    src = fetchFromGitHub {
+      sha256 = "1lycql0lwi7ynrsaln4kxybwvxb9fvganiq3ba4pnpcfgl155k1j";
+      rev = "6270d431aaeed71e7a8782411f36409ab8e0ee35";
+      repo = "neovim";
+      owner = "neovim";
+    };
 
-  enableParallelBuilding = true;
+    enableParallelBuilding = true;
 
-  buildInputs = [
-    makeWrapper
-    cmake
-    glib
-    libtermkey
-    libuv
-    luajit
-    lua
-    lpeg
-    luaMessagePack
-    luabitop
-    libmsgpack
-    ncurses
-    neovimLibvterm
-    pkgconfig
-    unibilium
-  ] ++ optional withJemalloc jemalloc;
+    buildInputs = [
+      makeWrapper
+      cmake
+      glib
+      libtermkey
+      libuv
+      luajit
+      lua
+      lpeg
+      luaMessagePack
+      luabitop
+      libmsgpack
+      ncurses
+      neovimLibvterm
+      pkgconfig
+      unibilium
+    ] ++ optional withJemalloc jemalloc;
 
-  nativeBuildInputs = [
-    gettext
-  ];
+    nativeBuildInputs = [
+      gettext
+    ];
 
-  LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so";
-  LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua";
+    LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so";
+    LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua";
 
-  postInstall = optionalString withPython ''
-    ln -s ${pythonEnv}/bin/python $out/bin/nvim-python
-  '' + optionalString withPython3 ''
-    ln -s ${python3Env}/bin/python $out/bin/nvim-python3
-  '' + optionalString (withPython || withPython3) ''
-      wrapProgram $out/bin/nvim --add-flags "${
-        (optionalString withPython
-          ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" '') +
-        (optionalString withPython3
-          ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\"'')
-      }"
-  '';
-
-  meta = {
-    description = "Vim text editor fork focused on extensibility and agility";
-    longDescription = ''
-      Neovim is a project that seeks to aggressively refactor Vim in order to:
-      - Simplify maintenance and encourage contributions
-      - Split the work between multiple developers
-      - Enable the implementation of new/modern user interfaces without any
-        modifications to the core source
-      - Improve extensibility with a new plugin architecture
+    postInstall = optionalString withPython ''
+      ln -s ${pythonEnv}/bin/python $out/bin/nvim-python
+    '' + optionalString withPython3 ''
+      ln -s ${python3Env}/bin/python $out/bin/nvim-python3
+    '' + optionalString (withPython || withPython3) ''
+        wrapProgram $out/bin/nvim --add-flags "${
+          (optionalString withPython
+            ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" '') +
+          (optionalString withPython3
+            ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\" '')
+        }"
     '';
-    homepage    = http://www.neovim.io;
-    # "Contributions committed before b17d96 by authors who did not sign the
-    # Contributor License Agreement (CLA) remain under the Vim license.
-    # Contributions committed after b17d96 are licensed under Apache 2.0 unless
-    # those contributions were copied from Vim (identified in the commit logs
-    # by the vim-patch token). See LICENSE for details."
-    license = with licenses; [ asl20 vim ];
-    maintainers = with maintainers; [ manveru nckx ];
-    platforms   = platforms.unix;
+
+    meta = {
+      description = "Vim text editor fork focused on extensibility and agility";
+      longDescription = ''
+        Neovim is a project that seeks to aggressively refactor Vim in order to:
+        - Simplify maintenance and encourage contributions
+        - Split the work between multiple developers
+        - Enable the implementation of new/modern user interfaces without any
+          modifications to the core source
+        - Improve extensibility with a new plugin architecture
+      '';
+      homepage    = http://www.neovim.io;
+      # "Contributions committed before b17d96 by authors who did not sign the
+      # Contributor License Agreement (CLA) remain under the Vim license.
+      # Contributions committed after b17d96 are licensed under Apache 2.0 unless
+      # those contributions were copied from Vim (identified in the commit logs
+      # by the vim-patch token). See LICENSE for details."
+      license = with licenses; [ asl20 vim ];
+      maintainers = with maintainers; [ manveru nckx garbas ];
+      platforms   = platforms.unix;
+    };
   };
+
+in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation rec {
+  name = "neovim-${version}-configured";
+  buildInputs = [ makeWrapper ];
+  buildCommand = ''
+    mkdir -p $out/bin
+    for item in ${neovim}/bin/*; do
+      ln -s $item $out/bin/
+    done
+  '' + optionalString vimAlias ''
+    ln -s $out/bin/nvim $out/bin/vim
+  '' + optionalString (configure != null) ''
+    wrapProgram $out/bin/nvim --add-flags "-u ${vimUtils.vimrcFile configure}"
+  '';
 }

From d9461e945f6dda78ce51f797ea09ba83613855d1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 10 Jun 2015 12:40:14 +0200
Subject: [PATCH 0994/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/bab92d665cf0dc5c4cc74cc6b8afe84080cb426a
 with hackage2nix revision c3122d617e69efe091549cec44d578bba41515f1

---
 .../haskell-modules/hackage-packages.nix      | 315 +++++++++++++++---
 1 file changed, 268 insertions(+), 47 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d29bddf0c39..4794ec73879 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -10657,9 +10657,9 @@ self: {
      }:
      mkDerivation {
        pname = "Neks";
-       version = "0.3.0.0";
-       sha256 = "1nqww81d9hdm4d2kgv5k4vhp3wavlpa39vym4x7bddcxg1g5drmv";
-       isLibrary = false;
+       version = "0.4.0.0";
+       sha256 = "0xi5d9wvk2xzsn500d61b6mmvwd36fs2n92l5qy4hzhww5lmkrrb";
+       isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base bytestring cereal containers directory hashable messagepack
@@ -14442,6 +14442,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "TestExplode" = callPackage
+    ({ mkDerivation, base, containers, directory, fgl, graphviz
+     , interpolatedstring-perl6, mtl, process, text
+     }:
+     mkDerivation {
+       pname = "TestExplode";
+       version = "0.1.0.0";
+       sha256 = "0r4nwzwdila9p05g5y99rp06dbh1k2yl5jsc6yn6dwvxkvvdjcs1";
+       buildDepends = [
+         base containers directory fgl graphviz interpolatedstring-perl6 mtl
+         process text
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/testexplode/testexplode";
+       description = "Generates testcases from program-snippets";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "Theora" = callPackage
     ({ mkDerivation, base, ogg, theora }:
      mkDerivation {
@@ -25018,6 +25036,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bindings-potrace" = callPackage
+    ({ mkDerivation, base, bindings-DSL, potrace }:
+     mkDerivation {
+       pname = "bindings-potrace";
+       version = "0.1";
+       sha256 = "0vb889f49li0lwy3zsji0f1cwzriizh9x6kg3r8676q5j08p7znd";
+       buildDepends = [ base bindings-DSL ];
+       extraLibraries = [ potrace ];
+       homepage = "https://github.com/rwbarton/bindings-potrace";
+       description = "Low-level bindings to the potrace bitmap tracing library";
+       license = stdenv.lib.licenses.gpl2;
+     }) { inherit (pkgs) potrace;};
+
   "bindings-ppdev" = callPackage
     ({ mkDerivation, base, bindings-DSL, ioctl }:
      mkDerivation {
@@ -25797,18 +25828,19 @@ self: {
      }) {};
 
   "bitx-bitcoin" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, Decimal, hspec
-     , http-conduit, network, record, split, text, time
+    ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit
+     , network, record, scientific, split, text, time
      }:
      mkDerivation {
        pname = "bitx-bitcoin";
-       version = "0.1.0.0";
-       sha256 = "05k2cwkd9y327c75fhjqwyxhwrwxhalsx724xa0ng5dw3d30icc2";
+       version = "0.2.0.0";
+       sha256 = "1n0hp16rpddm74q2rfldga7vpvvsqfn099qdp8qd5pqh8swkmwq8";
        buildDepends = [
-         aeson base bytestring Decimal http-conduit network record split
+         aeson base bytestring http-conduit network record scientific split
          text time
        ];
        testDepends = [ aeson base bytestring hspec record time ];
+       homepage = "https://github.com/tebello-thejane/bitx-haskell";
        description = "A Haskell library for working with the BitX bitcoin exchange";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -30565,31 +30597,29 @@ self: {
 
   "chatter" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers
-     , deepseq, directory, filepath, fullstop, ghc-prim, HUnit, mbox
-     , MonadRandom, parsec, QuickCheck, quickcheck-instances
-     , random-shuffle, regex-base, regex-tdfa, regex-tdfa-text, safe
-     , split, test-framework, test-framework-hunit
+     , deepseq, directory, filepath, fullstop, HUnit, mbox, MonadRandom
+     , parsec, QuickCheck, quickcheck-instances, random-shuffle
+     , regex-tdfa, regex-tdfa-text, test-framework, test-framework-hunit
      , test-framework-quickcheck2, test-framework-skip, text, tokenize
      , transformers, zlib
      }:
      mkDerivation {
        pname = "chatter";
-       version = "0.5.0.1";
-       sha256 = "0saavfnxd6l6w3ybvdmi14ia06ssc4lndb0ba8hhyqb3qzz7l7zs";
+       version = "0.5.0.2";
+       sha256 = "1nbdc4np4hmvnsh1rfpldi2j1wm1klmfm9szi2kz9fa8g8n3kxxl";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          array base bytestring cereal containers deepseq directory filepath
-         fullstop ghc-prim mbox MonadRandom parsec QuickCheck
-         quickcheck-instances random-shuffle regex-base regex-tdfa
-         regex-tdfa-text safe split text tokenize transformers zlib
+         fullstop mbox MonadRandom parsec QuickCheck quickcheck-instances
+         random-shuffle regex-tdfa regex-tdfa-text text tokenize
+         transformers zlib
        ];
        testDepends = [
          base cereal containers filepath HUnit parsec QuickCheck
          quickcheck-instances test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-skip text tokenize
        ];
-       jailbreak = true;
        homepage = "http://github.com/creswick/chatter";
        description = "A library of simple NLP algorithms";
        license = stdenv.lib.licenses.bsd3;
@@ -32800,8 +32830,8 @@ self: {
      }:
      mkDerivation {
        pname = "coinbase-exchange";
-       version = "0.1.0.0";
-       sha256 = "0l09gjn0lk7v51s1gw52p0m9i8amhci93qpi98p1r1nlxx09xj3v";
+       version = "0.2.0.0";
+       sha256 = "1x9cgdj38z1zhrx464rj3qhh8rxqs98mfpqfsnn5yill037p1ig8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -32815,7 +32845,6 @@ self: {
          base bytestring http-client-tls http-conduit old-locale tasty
          tasty-hunit tasty-quickcheck tasty-th time transformers uuid
        ];
-       jailbreak = true;
        description = "Connector library for the coinbase exchange";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43508,8 +43537,8 @@ self: {
      }:
      mkDerivation {
        pname = "dsh-sql";
-       version = "0.2.0.1";
-       sha256 = "0vr9wsad74735py2i2kqwqi4phf49ksw3d4w89jlcgi6xpsc02s1";
+       version = "0.2.0.2";
+       sha256 = "00r1wbgbkpnza1jjd14vqr4hwgfkhnz7yivkx4bla5frfdlv5q58";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -44398,8 +44427,8 @@ self: {
     ({ mkDerivation, base, edenmodules, parallel }:
      mkDerivation {
        pname = "edenskel";
-       version = "2.0.0.2";
-       sha256 = "0dkvbdy04w4zbbc3q11hzzg3h5d8azka11yiiz3rvy1nkhp9wv5l";
+       version = "2.1.0.0";
+       sha256 = "1bf5zw1x4f6a801ig2b8b84kbnmp0asn804gkm18v9fjcchz3j9q";
        buildDepends = [ base edenmodules parallel ];
        description = "Semi-explicit parallel programming skeleton library";
        license = stdenv.lib.licenses.bsd3;
@@ -47805,6 +47834,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fay-geoposition" = callPackage
+    ({ mkDerivation, fay-base, fay-text }:
+     mkDerivation {
+       pname = "fay-geoposition";
+       version = "0.1.0.1";
+       sha256 = "1qmkwfqgvj6a8fan1l3i18ggpl00vrfd2mhqj13g0gh9yhvgxv1q";
+       buildDepends = [ fay-base fay-text ];
+       homepage = "https://github.com/victoredwardocallaghan/fay-geoposition";
+       description = "W3C compliant implementation of GeoPosition API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fay-hsx" = callPackage
     ({ mkDerivation, fay-base, fay-jquery }:
      mkDerivation {
@@ -52808,6 +52849,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ghc-simple" = callPackage
+    ({ mkDerivation, base, data-default, ghc, ghc-paths }:
+     mkDerivation {
+       pname = "ghc-simple";
+       version = "0.1.0.0";
+       sha256 = "0a8xla80al1glxpf0dsbzdgwbzwxmk9cr6xwfmmz237q7dv4pjhf";
+       buildDepends = [ base data-default ghc ghc-paths ];
+       homepage = "https://github.com/valderman/ghc-simple";
+       description = "Simplified interface to the GHC API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ghc-srcspan-plugin" = callPackage
     ({ mkDerivation, array, base, containers, ghc, hpc }:
      mkDerivation {
@@ -52996,8 +53049,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghcid";
-       version = "0.4";
-       sha256 = "0z54444ygxc3irnqjkd9cdzg2b6df9d87lkkazj1cl2qy1x5kbv0";
+       version = "0.4.2";
+       sha256 = "094ffwwlxg7qgrcgw35rmzincfrwyhxkh6iw9bqdib5l8w9gcr6d";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -74970,6 +75023,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inline-c-win32" = callPackage
+    ({ mkDerivation, base, containers, inline-c, template-haskell
+     , Win32
+     }:
+     mkDerivation {
+       pname = "inline-c-win32";
+       version = "0.1";
+       sha256 = "14255dn7smmm1rpnjifn7gn2amcncnf3j45ah22bblyb4h27iikm";
+       buildDepends = [ base containers inline-c template-haskell Win32 ];
+       homepage = "https://github.com/anton-dessiatov/inline-c-win32";
+       description = "Win32 API Context for the inline-c library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "inquire" = callPackage
     ({ mkDerivation, aether, base, text }:
      mkDerivation {
@@ -75598,6 +75665,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ip-quoter" = callPackage
+    ({ mkDerivation, base, network, split, tasty, tasty-hunit
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "ip-quoter";
+       version = "1.0.0.0";
+       revision = "1";
+       sha256 = "1idi03f6l9nwnsfp2mvkxz4sgwqlpa8ag3h5drb3i4hwgx0mkhfg";
+       editedCabalFile = "5cd6b449c4acd24b27d27a839acdab85f65b5556dd7bc8be115b7e2f6dc5df11";
+       buildDepends = [ base network split template-haskell ];
+       testDepends = [ base network tasty tasty-hunit ];
+       homepage = "https://github.com/shlevy/ip-quoter";
+       description = "Quasiquoter for IP addresses";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ip6addr" = callPackage
     ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
      mkDerivation {
@@ -81116,14 +81200,14 @@ self: {
 
   "lens-simple" = callPackage
     ({ mkDerivation, base, lens-family, lens-family-core
-     , lens-family-th
+     , lens-family-th, transformers
      }:
      mkDerivation {
        pname = "lens-simple";
-       version = "0.1.0.3";
-       sha256 = "17s7fjggajlamqi2lc2lrhswykbyba6zv5rf0kr24hn3mv8a6yrk";
+       version = "0.1.0.4";
+       sha256 = "0cr1jghg8dnyclih21zlm9190j2dyl6mwc0gw216l5yj67c5aly3";
        buildDepends = [
-         base lens-family lens-family-core lens-family-th
+         base lens-family lens-family-core lens-family-th transformers
        ];
        homepage = "https://github.com/michaelt/lens-simple";
        description = "simplified import of elementary lens-family combinators";
@@ -82370,6 +82454,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "linear-grammar" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck, quickcheck-instances }:
+     mkDerivation {
+       pname = "linear-grammar";
+       version = "0.0.0.5";
+       sha256 = "0cw0w1fz3m2kwnbff543h5as9zvl66y1ry1q3ppvy9lc409570ry";
+       buildDepends = [ base ];
+       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       description = "A simple grammar for building linear equations and inclusive inequalities";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "linear-maps" = callPackage
     ({ mkDerivation, base, containers, HUnit }:
      mkDerivation {
@@ -84756,9 +84852,12 @@ self: {
      mkDerivation {
        pname = "machinecell";
        version = "1.3.1";
+       revision = "1";
        sha256 = "1v4rrjszh6sm2x1nwq33f4xwa41bnls0awhy9qfkap62bpad8fxg";
+       editedCabalFile = "5a7ee43c327694ac753228da8f16d681a60d23b4926132726e2a093ecacb4725";
        buildDepends = [ arrows base free mtl profunctors semigroups ];
        testDepends = [ base hspec mtl profunctors QuickCheck ];
+       jailbreak = true;
        homepage = "http://github.com/as-capabl/machinecell";
        description = "Arrow based stream transducers";
        license = stdenv.lib.licenses.bsd3;
@@ -90266,16 +90365,17 @@ self: {
      }) {};
 
   "multistate" = callPackage
-    ({ mkDerivation, base, mtl, transformers }:
+    ({ mkDerivation, base, hspec, mtl, tagged, transformers }:
      mkDerivation {
        pname = "multistate";
-       version = "0.3.0.0";
-       sha256 = "1sqaxvvs94max8gw1sz3kkgnp8y9zwrjdclnzv1kkkhciix9a1d1";
+       version = "0.6.0.0";
+       sha256 = "17b54qy4dgacj0lwy61nf3hbppd950xk9c1yphjn6i6jcr8z66li";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl transformers ];
+       buildDepends = [ base mtl tagged transformers ];
+       testDepends = [ base hspec transformers ];
        homepage = "https://github.com/lspitzner/multistate";
-       description = "like mtl's ReaderT/WriterT/StateT, but more than one contained value/type";
+       description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -95856,8 +95956,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.7.1.1";
-       sha256 = "1n96g7l16cn1qcp9xsbdmp844078lpcjsz3lg1x81drnzax9fpa1";
+       version = "0.7.2";
+       sha256 = "0dpr74alkz9vy5yc09bnqb968hcrqys2xlydjda1g3qsarjg7p9y";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -95870,7 +95970,6 @@ self: {
          aeson base bytestring directory filepath pandoc pandoc-types
          process temporary text yaml
        ];
-       jailbreak = true;
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95881,8 +95980,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.2.0";
-       sha256 = "0q9ia1nzmzv1q8hplrmxszwk49mlp4v8skbfv4ggsl8s0vxc1c6f";
+       version = "0.1.2.1";
+       sha256 = "1hr2jfbzanpqbkvsfcbzvlfsnzba11hdrmvc3j63fwqk931qi2jm";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -98829,6 +98928,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-mongodb" = callPackage
+    ({ mkDerivation, base, monad-control, mongoDB, pipes, text }:
+     mkDerivation {
+       pname = "pipes-mongodb";
+       version = "0.1.0.0";
+       sha256 = "0h4334fajrza7r8jrr78nqhs522kxnbzdj0gnbp7ndvzvx5ij888";
+       buildDepends = [ base monad-control mongoDB pipes ];
+       testDepends = [ base monad-control mongoDB pipes text ];
+       homepage = "http://github.com/jb55/pipes-mongodb";
+       description = "Stream results from MongoDB";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pipes-network" = callPackage
     ({ mkDerivation, base, bytestring, network, network-simple, pipes
      , pipes-safe, transformers
@@ -100642,6 +100754,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) adns;  inherit (pkgs) openssl;};
 
+  "potrace" = callPackage
+    ({ mkDerivation, base, bindings-potrace, bytestring, containers
+     , data-default, JuicyPixels, vector
+     }:
+     mkDerivation {
+       pname = "potrace";
+       version = "0.1.0.0";
+       sha256 = "1frxf3jzjyyp3bfj6b2mi29fxwcml4bya6sn4c5aizg741dhphng";
+       buildDepends = [
+         base bindings-potrace bytestring containers data-default
+         JuicyPixels vector
+       ];
+       description = "Trace bitmap images to paths using potrace";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
+  "potrace-diagrams" = callPackage
+    ({ mkDerivation, base, diagrams-lib, JuicyPixels, potrace }:
+     mkDerivation {
+       pname = "potrace-diagrams";
+       version = "0.1.0.0";
+       sha256 = "0ys70a5k384czz0c6bpyy0cqrk35wa1yg6ph19smhm3ag9d8161v";
+       buildDepends = [ base diagrams-lib JuicyPixels potrace ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "Potrace bindings for the diagrams library";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "powermate" = callPackage
     ({ mkDerivation, base, directory, network, unix }:
      mkDerivation {
@@ -108719,6 +108859,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "safe-printf" = callPackage
+    ({ mkDerivation, base, doctest, haskell-src-meta, hspec, QuickCheck
+     , template-haskell, th-lift
+     }:
+     mkDerivation {
+       pname = "safe-printf";
+       version = "0.1.0.0";
+       sha256 = "19nw306q7xlj6s132qxlfskg67x6rx3zhsk2n6lbz2kryr7v99g6";
+       buildDepends = [ base haskell-src-meta template-haskell th-lift ];
+       testDepends = [
+         base doctest haskell-src-meta hspec QuickCheck template-haskell
+         th-lift
+       ];
+       homepage = "https://github.com/konn/safe-printf";
+       description = "Well-typed, flexible and variadic printf for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "safecopy" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers, lens
      , lens-action, old-time, quickcheck-instances, tasty
@@ -109533,8 +109691,8 @@ self: {
      }:
      mkDerivation {
        pname = "schedule-planner";
-       version = "1.0.0.1";
-       sha256 = "0p2k67g281f08njhann4yv0vhfbjh4m6rr2x58smxhwqxgpjg399";
+       version = "1.0.1.0";
+       sha256 = "0vlr4wwazpr7xf5pym2f42gwniy017h02wwymn0zn80wypiv6dz1";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -118894,8 +119052,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "structural-induction";
-       version = "0.2";
-       sha256 = "1lr91wc1m655pi3ljw3n89svfazrb16785s9mfx361jgn335m8rd";
+       version = "0.2.0.1";
+       sha256 = "0ac5yhx6cbxzcdqy74lp791xwgammsnd8jazx0xy3ngxn4wwf23r";
        buildDepends = [ base containers genifunctors mtl pretty safe ];
        testDepends = [
          base geniplate language-haskell-extract mtl pretty QuickCheck safe
@@ -124568,6 +124726,46 @@ test/package-dump/ghc-7.10.txt";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tip-haskell-frontend" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , geniplate-mirror, ghc, ghc-paths, mtl, pretty, pretty-show
+     , QuickCheck, split, tip-lib
+     }:
+     mkDerivation {
+       pname = "tip-haskell-frontend";
+       version = "0.1.1";
+       sha256 = "0za8ls980f98qj3k6pgmzaidmnrlk0nzg1r7skif6jmhh1snqc5h";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring containers directory filepath geniplate-mirror ghc
+         ghc-paths mtl pretty pretty-show QuickCheck split tip-lib
+       ];
+       homepage = "http://tip-org.github.io";
+       description = "Convert from Haskell to Tip";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "tip-lib" = callPackage
+    ({ mkDerivation, alex, array, base, containers, geniplate-mirror
+     , happy, mtl, optparse-applicative, pretty, pretty-show, split
+     }:
+     mkDerivation {
+       pname = "tip-lib";
+       version = "0.1.1";
+       sha256 = "0xvsr6hh7r6y82linkpvbby6jkxw744y3mh82kma4cbpwc84gxhi";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         array base containers geniplate-mirror mtl optparse-applicative
+         pretty pretty-show split
+       ];
+       buildTools = [ alex happy ];
+       homepage = "http://tip-org.github.io";
+       description = "tons of inductive problems - support library and tools";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "titlecase" = callPackage
     ({ mkDerivation, base, blaze-markup, semigroups, tasty, tasty-hunit
      , tasty-quickcheck, text
@@ -125699,6 +125897,28 @@ test/package-dump/ghc-7.10.txt";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "trurl" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, hastache
+     , http-conduit, MissingH, scientific, tar, tasty, tasty-hunit, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "trurl";
+       version = "0.1.0.0";
+       sha256 = "0lq4x3vkif6sldcw07llmhwixgk1x2bfyzi0zq32jardp7ah0rc5";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring directory hastache http-conduit MissingH
+         scientific tar text unordered-containers
+       ];
+       testDepends = [ base hastache tasty tasty-hunit ];
+       jailbreak = true;
+       homepage = "http://github.com/dbushenko/trurl";
+       description = "Haskell template code generator";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tsession" = callPackage
     ({ mkDerivation, base, containers, mtl, time, transformers }:
      mkDerivation {
@@ -127361,6 +127581,7 @@ test/package-dump/ghc-7.10.txt";
          hashable mtl network old-locale primitive process syb transformers
          uhc-util uulib vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/UU-ComputerScience/uhc";
        description = "Part of UHC packaged as cabal/hackage installable library";
        license = stdenv.lib.licenses.bsd3;
@@ -127373,8 +127594,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "uhc-util";
-       version = "0.1.5.5";
-       sha256 = "00b1ycdnm0gm01izs96qwsx3c3p1mrcimzamscaimyr1y14jvfc1";
+       version = "0.1.5.6";
+       sha256 = "1axg2apkvg3xk1cq78shbnc68i0h6fqcpjg8z3l4nc49kl5dywwz";
        buildDepends = [
          array base binary bytestring containers directory fclabels fgl
          hashable ListLike mtl process syb time time-compat uulib

From 1c31a4660a53b631ccaa4a45befbcdaa1121ec74 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 11 Jun 2015 11:02:53 +0200
Subject: [PATCH 0995/2322] haskell-pipes-mongodb: disable the test suite which
 tries to access the network

---
 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 8ee927f6fb8..c58d047ae8f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -305,6 +305,7 @@ self: super: {
   marmalade-upload = dontCheck super.marmalade-upload;  # http://hydra.cryp.to/build/501904/nixlog/1/raw
   network-transport-tcp = dontCheck super.network-transport-tcp;
   network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30
+  pipes-mongodb = dontCheck super.pipes-mongodb;        # http://hydra.cryp.to/build/926195/log/raw
   raven-haskell = dontCheck super.raven-haskell;        # http://hydra.cryp.to/build/502053/log/raw
   riak = dontCheck super.riak;                          # http://hydra.cryp.to/build/498763/log/raw
   scotty-binding-play = dontCheck super.scotty-binding-play;

From 9e04c74d9580abe76f0e153d55ad1279db728a5d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 11 Jun 2015 11:04:19 +0200
Subject: [PATCH 0996/2322] haskell-bitx-bitcoin: disable the test suite which
 tries to access the network

---
 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 c58d047ae8f..420050147aa 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -293,6 +293,7 @@ self: super: {
   amqp-conduit = dontCheck super.amqp-conduit;
   bitcoin-api = dontCheck super.bitcoin-api;
   bitcoin-api-extra = dontCheck super.bitcoin-api-extra;
+  bitx-bitcoin = dontCheck super.bitx-bitcoin;          # http://hydra.cryp.to/build/926187/log/raw
   concurrent-dns-cache = dontCheck super.concurrent-dns-cache;
   dbus = dontCheck super.dbus;                          # http://hydra.cryp.to/build/498404/log/raw
   hadoop-rpc = dontCheck super.hadoop-rpc;              # http://hydra.cryp.to/build/527461/nixlog/2/raw

From 2f6c8127f5c00ef8ee2f2cd53411e66cf39004aa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 11 Jun 2015 11:06:41 +0200
Subject: [PATCH 0997/2322] uhc: update to version 1.1.9.1

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

diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index c788112fb91..64d51f971b9 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -2,13 +2,13 @@
 
 let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [shuffle hashable mtl network uhc-util uulib] );
 in stdenv.mkDerivation rec {
-  version = "1.1.9.0";
+  version = "1.1.9.1";
   name = "uhc-${version}";
 
   src = fetchgit {
     url = "https://github.com/UU-ComputerScience/uhc.git";
-    rev = "0363bbcf4cf8c47d30c3a188e3e53b3f8454bbe4";
-    sha256 = "0sa9b341mm5ggmbydc33ja3h7k9w65qnki9gsaagb06gkvvqc7c2";
+    rev = "c4955d01089485cdcfec785fe2bbcdf2253bee4b";
+    sha256 = "1n2bfbzni2hwv90z3mgn0x3l3jwc7sy8ryk81p5mlvlis1wzxnq3";
   };
 
   postUnpack = "sourceRoot=\${sourceRoot}/EHC";

From 283b75910a62ec3b07ed642a7ce6f981d76a3223 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 11 Jun 2015 11:11:15 +0200
Subject: [PATCH 0998/2322] haskell-Win32: mark broken on systems other than
 Cygwin

---
 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 420050147aa..e5f41f2d9bc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -849,4 +849,8 @@ self: super: {
   # Avoid spurious test suite failures.
   fft = dontCheck super.fft;
 
+  # This package can't be built on non-Windows systems.
+  Win32 = overrideCabal super.Win32 (drv: { broken = !pkgs.stdenv.isCygwin; });
+  inline-c-win32 = dontDistribute super.inline-c-win32;
+
 }

From 414d71c4995a49bdd21abf41fd027adcb48375c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 11 Jun 2015 11:43:22 +0200
Subject: [PATCH 0999/2322] haskell-cron-compat: unnecessary fork of 'cron'
 that doesn't compile anyway

---
 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 e5f41f2d9bc..7835ed7d96f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -853,4 +853,7 @@ self: super: {
   Win32 = overrideCabal super.Win32 (drv: { broken = !pkgs.stdenv.isCygwin; });
   inline-c-win32 = dontDistribute super.inline-c-win32;
 
+  # Doesn't work with recent versions of mtl.
+  cron-compat = markBroken super.cron-compat;
+
 }

From 84dfce0bc07991a128d4e6162b12c1bfc15fecda Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 11 Jun 2015 12:07:15 +0200
Subject: [PATCH 1000/2322] mercurial: install bash completion

---
 pkgs/applications/version-management/mercurial/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 2409e8e2240..565c95af508 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -51,6 +51,9 @@ stdenv.mkDerivation {
       mkdir -p $out/share/cgi-bin
       cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin
       chmod u+x $out/share/cgi-bin/hgweb.cgi
+
+      # install bash completion
+      install -D -v contrib/bash_completion $out/share/bash-completion/completions/mercurial
     '';
 
   meta = {

From 84327822e1ada2a73b67f23ebc238ab07bf6c185 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 11 Jun 2015 12:27:39 +0200
Subject: [PATCH 1001/2322] gnome-latest.sh: use bash, it doesn't work with sh

---
 maintainers/scripts/gnome-latest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/gnome-latest.sh b/maintainers/scripts/gnome-latest.sh
index 9290b6deaff..63b309c5a77 100755
--- a/maintainers/scripts/gnome-latest.sh
+++ b/maintainers/scripts/gnome-latest.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 GNOME_FTP="ftp.gnome.org/pub/GNOME/sources"
 

From 9aa07ac846ddd8c89b8e6924e861133de1758a5c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 11 Jun 2015 12:27:57 +0200
Subject: [PATCH 1002/2322] sourceforge: remove unreachable mirrors

---
 pkgs/build-support/fetchurl/mirrors.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 1453af3a62a..0e2a6e756f6 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -14,8 +14,6 @@ rec {
     http://heanet.dl.sourceforge.net/sourceforge/
     http://surfnet.dl.sourceforge.net/sourceforge/
     http://dfn.dl.sourceforge.net/sourceforge/
-    http://mesh.dl.sourceforge.net/sourceforge/
-    http://ovh.dl.sourceforge.net/sourceforge/
     http://osdn.dl.sourceforge.net/sourceforge/
     http://kent.dl.sourceforge.net/sourceforge/
   ];

From 623401788df6b9f2c91fb43f4d569ea4c0c66116 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Jun 2015 12:32:31 +0200
Subject: [PATCH 1003/2322] Net::HTTP: Disable tests

https://github.com/NixOS/nixpkgs/commit/4970574409ea15bcd769c4e999e8d272ae629b1b#commitcomment-11626433
---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c166457add2..a9168e3bdd2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6967,6 +6967,7 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/G/GA/GAAS/Net-HTTP-6.06.tar.gz;
       sha256 = "1m1rvniffadq99gsy25298ia3lixwymr6kan64jd3ylyi7nkqkhx";
     };
+    doCheck = false; # binds to TCP ports
     meta = {
       description = "Low-level HTTP connection (client)";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From 8a7c23456d78858051c9d4dadf9983ec831d490a Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 10 Jun 2015 22:40:42 +0200
Subject: [PATCH 1004/2322] jetty: Update from 9.2.5 to 9.2.11

---
 pkgs/servers/http/jetty/9.2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/jetty/9.2.nix b/pkgs/servers/http/jetty/9.2.nix
index 41afc9b40af..4ac38e8d3cb 100644
--- a/pkgs/servers/http/jetty/9.2.nix
+++ b/pkgs/servers/http/jetty/9.2.nix
@@ -4,9 +4,9 @@ stdenv.mkDerivation rec {
   name = "jetty-9.2.5";
 
   src = fetchurl {
-    url = "http://eclipse.org/downloads/download.php?file=/jetty/stable-9/dist/jetty-distribution-9.2.5.v20141112.tar.gz&r=1";
-    name = "jetty-distribution-9.2.5.v20141112.tar.gz";
-    sha256 = "1azqhvvqm9il5n07vms5vv27vr3qhmsy44nmqcgsaggq7p37swf1";
+    url = "http://eclipse.org/downloads/download.php?file=/jetty/stable-9/dist/jetty-distribution-9.2.11.v20150529.tar.gz&r=1";
+    name = "jetty-distribution-9.2.11.v20150529.tar.gz";
+    sha256 = "1d9s9l64b1l3x6vkx8qwgzfqwm55iq5g9xjjm2h2akf494yx1mrd";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

From 63bb4f919c59c3024f71b7f9c0fb6914340960e4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 11 Jun 2015 14:31:44 +0200
Subject: [PATCH 1005/2322] Update evolution and evolution-data-server

---
 pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix         | 4 ++--
 .../gnome-3/3.16/core/evolution-data-server/default.nix       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
index af60d890673..b4240a35a68 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
@@ -7,11 +7,11 @@
 let
   majVer = gnome3.version;
 in stdenv.mkDerivation rec {
-  name = "evolution-${majVer}.1";
+  name = "evolution-${majVer}.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${majVer}/${name}.tar.xz";
-    sha256 = "1lm877rrcfy98mpp4iq7m9p8r1nr9kir916n4qin2ygas9zx0qlb";
+    sha256 = "1mh769adz40r22x0jw5z4carkcbhx36qy2j8kl2djjbp1jf5vhnd";
   };
 
   doCheck = true;
diff --git a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
index 7193b845468..82397b385d5 100644
--- a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
@@ -4,11 +4,11 @@
 
 
 stdenv.mkDerivation rec {
-  name = "evolution-data-server-${gnome3.version}.1";
+  name = "evolution-data-server-${gnome3.version}.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0lgb8jvn8kx50692gg1m9klvwm7msvk4f7wm0yl7rj880wbxzvh4";
+    sha256 = "19dcvhlqh25pkkd29hhm9yik8xxfy01hcakikrai0x1a04aa2s7f";
   };
 
   buildInputs = with gnome3;

From a51e9610e76ec2e45cdbb9f9802ba8b4519d5c1c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 10 Jun 2015 10:02:44 +0200
Subject: [PATCH 1006/2322] fix libtermkey on darwin

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

diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix
index e5965a10f67..c59542fdfed 100644
--- a/pkgs/development/libraries/libtermkey/default.nix
+++ b/pkgs/development/libraries/libtermkey/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "085mdshgqsn76gfnnzfns7awv6lals9mgv5a6bybd9f9aj7lvrm5";
   };
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [ "PREFIX=$(out)" ]
+    ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
 
   buildInputs = [ libtool pkgconfig ncurses ];
 

From 414d6d9e87b8e74944f4124969633fc45f1e2dac Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 10 Jun 2015 10:03:23 +0200
Subject: [PATCH 1007/2322] fix unibilium on darwin

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

diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix
index 663432f8ec8..369e271191f 100644
--- a/pkgs/development/libraries/unibilium/default.nix
+++ b/pkgs/development/libraries/unibilium/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "143j7qrqjxxmdf3yzhn6av2qwiyjjk4cnskkgz6ir2scjfd5gvja";
   };
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [ "PREFIX=$(out)" ]
+    ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
 
   buildInputs = [ libtool pkgconfig ];
 

From 8ffce0888c3f6138fa915e1a3c5d94b0056de940 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 10 Jun 2015 10:04:51 +0200
Subject: [PATCH 1008/2322] fix luaPackages.luabitop on darwin

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 84befe7f652..c5fbaf6df2a 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -33,8 +33,15 @@ let
       sha256 = "16fffbrgfcw40kskh2bn9q7m3gajffwd2f35rafynlnd7llwj1qj";
     };
 
+    buildFlags = stdenv.lib.optionalString stdenv.isDarwin "macosx";
+
+    patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+      sed -e "s,MACOSX_DEPLOYMENT_TARGET=10.4,MACOSX_DEPLOYMENT_TARGET=10.10," -i Makefile
+    '';
+
     preBuild = ''
       makeFlagsArray=(
+        ${stdenv.lib.optionalString stdenv.cc.isClang "CC=clang"}
         INCLUDES="-I${lua}/include"
         LUA="${lua}/bin/lua");
     '';

From c7f36cb5f0ddc86d50774ba7181064372e417f85 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 10 Jun 2015 10:05:59 +0200
Subject: [PATCH 1009/2322] fix neovim on darwin

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

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 599b04e1028..3943a9910a4 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -29,7 +29,8 @@ let
 
     buildInputs = [ libtool perl ];
 
-    makeFlags = "PREFIX=$(out)";
+    makeFlags = [ "PREFIX=$(out)" ]
+      ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
 
     enableParallelBuilding = true;
 
@@ -89,7 +90,16 @@ let
     LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so";
     LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua";
 
-    postInstall = optionalString withPython ''
+    preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+      export DYLD_LIBRARY_PATH=${jemalloc}/lib
+    '';
+
+    postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+      echo patching $out/bin/nvim
+      install_name_tool -change libjemalloc.1.dylib \
+                ${jemalloc}/lib/libjemalloc.1.dylib \
+                $out/bin/nvim
+    '' + optionalString withPython ''
       ln -s ${pythonEnv}/bin/python $out/bin/nvim-python
     '' + optionalString withPython3 ''
       ln -s ${python3Env}/bin/python $out/bin/nvim-python3

From c7a73dbbdbd2a303f5d1e26726adfd66e6e294de Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 10 Jun 2015 14:30:00 +0200
Subject: [PATCH 1010/2322] removed unnecessary patch

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index c5fbaf6df2a..d53bd43a800 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -35,10 +35,6 @@ let
 
     buildFlags = stdenv.lib.optionalString stdenv.isDarwin "macosx";
 
-    patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
-      sed -e "s,MACOSX_DEPLOYMENT_TARGET=10.4,MACOSX_DEPLOYMENT_TARGET=10.10," -i Makefile
-    '';
-
     preBuild = ''
       makeFlagsArray=(
         ${stdenv.lib.optionalString stdenv.cc.isClang "CC=clang"}

From 020f466ef4b3f1fe5906169569ed82ef5145b227 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 11 Jun 2015 10:35:40 +0200
Subject: [PATCH 1011/2322] disable tests for pythonPackages.trollius

---
 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 7af8b7e0052..e2e35a1aa04 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15795,6 +15795,8 @@ let
       sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|" tests/test_tasks.py
     '';
 
+    doCheck = !stdenv.isDarwin;
+
     meta = {
       description = "Port of the Tulip project (asyncio module, PEP 3156) on Python 2";
       homepage = "https://bitbucket.org/enovance/trollius";

From 61531556d8d69db7c4677245b26c2f7a0e8b8b6d Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 11 Jun 2015 10:47:27 +0200
Subject: [PATCH 1012/2322] remove hardcoded clang

---
 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 d53bd43a800..c1b04afba38 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -37,7 +37,7 @@ let
 
     preBuild = ''
       makeFlagsArray=(
-        ${stdenv.lib.optionalString stdenv.cc.isClang "CC=clang"}
+        ${stdenv.lib.optionalString stdenv.cc.isClang "CC=$CC"}
         INCLUDES="-I${lua}/include"
         LUA="${lua}/bin/lua");
     '';

From e1683eeff1a3bffa7837a162b58fda648ff95c08 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 11 Jun 2015 14:54:30 +0200
Subject: [PATCH 1013/2322] lsof: url is behind auth. changed downloaded url
 for lsof

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

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 6370e7447f2..af9145bc409 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "lsof-4.88";
 
   src = fetchurl {
-    url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.88.tar.bz2;
+    url = "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/lsof_4.88.tar.bz2";
     sha256 = "16y9wm26rg81mihnzcbdg8h8vhxmq8kn62ssxb8cqydp4q79nvzy";
   };
 

From fbfdc71e1ffd555fe47eff8ff28688308feaac99 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 11 Jun 2015 15:46:50 +0200
Subject: [PATCH 1014/2322] libical: fix crash when TZDIR is empty, and add
 non-nixos zoneinfo paths. Closes #8285

---
 .../libraries/libical/respect-env-tzdir.patch     | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch
index 980a0d5c71a..fad78c2fb8a 100644
--- a/pkgs/development/libraries/libical/respect-env-tzdir.patch
+++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch
@@ -1,28 +1,25 @@
-diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c
-index fe984c9..22ba0a1 100644
---- a/src/libical/icaltz-util.c
-+++ b/src/libical/icaltz-util.c
-@@ -107,7 +107,7 @@ typedef struct
+--- a/src/libical/icaltz-util.c	2015-06-11 15:40:58.843138630 +0200
++++ b/src/libical/icaltz-util.c	2015-06-11 15:43:12.722046252 +0200
+@@ -107,7 +107,7 @@
  	char	charcnt[4];			
  } tzinfo; 
  
 -static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"};
-+static char *search_paths [] = {"/etc/zoneinfo"};
++static char *search_paths [] = {"/etc/zoneinfo","/usr/share/zoneinfo","/usr/lib/zoneinfo","/usr/share/lib/zoneinfo"};
  static char *zdir = NULL;
  
  #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0]))
-@@ -194,6 +194,16 @@ set_zonedir (void)
+@@ -194,6 +194,15 @@
  	const char *fname = ZONES_TAB_SYSTEM_FILENAME;
  	unsigned int i;
  
-+	const char *env_tzdir = strdup (getenv ("TZDIR"));
++	const char *env_tzdir = getenv ("TZDIR");
 +	if (env_tzdir) {
 +		sprintf (file_path, "%s/%s", env_tzdir, fname);
 +		if (!access (file_path, F_OK|R_OK)) {
 +			zdir = env_tzdir;
 +			return;
 +		}
-+		free (env_tzdir);
 +	}
 +
  	for (i = 0; i < NUM_SEARCH_PATHS; i++) {

From fb19019af7c122b145eb3403dae3fc0a8287671a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 11 Jun 2015 16:01:24 +0200
Subject: [PATCH 1015/2322] pythonPackages.trollius: disable the tests that
 fail on darwin

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e2e35a1aa04..c65fe86c382 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15791,12 +15791,38 @@ let
       ++ optional isPy26 ordereddict
       ++ optional (isPy26 || isPy27 || isPyPy) futures;
 
-    patchPhase = optionalString isPy26 ''
+    # Some of the tests fail on darwin with `error: AF_UNIX path too long'
+    # because of the *long* path names for sockets
+    patchPhase = optionalString stdenv.isDarwin ''
+      sed -i -e "s|test_create_ssl_unix_connection|skip_test_create_ssl_unix_connection|" tests/test_events.py
+      sed -i -e "s|test_create_unix_connection|skip_test_create_unix_connection|" tests/test_events.py
+      sed -i -e "s|test_create_unix_connection|skip_test_create_unix_connection|" tests/test_events.py
+      sed -i -e "s|test_create_unix_connection|skip_test_create_unix_connection|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_existing_path_nonsock|skip_test_create_unix_server_existing_path_nonsock|" tests/test_unix_events.py
+      sed -i -e "s|test_create_unix_server_existing_path_sock|skip_test_create_unix_server_existing_path_sock|" tests/test_unix_events.py
+      sed -i -e "s|test_create_unix_server_ssl_verified|skip_test_create_unix_server_ssl_verified|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl_verified|skip_test_create_unix_server_ssl_verified|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl_verified|skip_test_create_unix_server_ssl_verified|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl_verify_failed|skip_test_create_unix_server_ssl_verify_failed|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl_verify_failed|skip_test_create_unix_server_ssl_verify_failed|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl_verify_failed|skip_test_create_unix_server_ssl_verify_failed|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl|skip_test_create_unix_server_ssl|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl|skip_test_create_unix_server_ssl|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server_ssl|skip_test_create_unix_server_ssl|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server|skip_test_create_unix_server|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server|skip_test_create_unix_server|" tests/test_events.py
+      sed -i -e "s|test_create_unix_server|skip_test_create_unix_server|" tests/test_events.py
+      sed -i -e "s|test_open_unix_connection_error|skip_test_open_unix_connection_error|" tests/test_streams.py
+      sed -i -e "s|test_open_unix_connection_no_loop_ssl|skip_test_open_unix_connection_no_loop_ssl|" tests/test_streams.py
+      sed -i -e "s|test_open_unix_connection|skip_test_open_unix_connection|" tests/test_streams.py
+      sed -i -e "s|test_start_unix_server|skip_test_start_unix_server|" tests/test_streams.py
+      sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py
+      sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py
+      sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|" tests/test_events.py
+    '' + optionalString isPy26 ''
       sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|" tests/test_tasks.py
     '';
 
-    doCheck = !stdenv.isDarwin;
-
     meta = {
       description = "Port of the Tulip project (asyncio module, PEP 3156) on Python 2";
       homepage = "https://bitbucket.org/enovance/trollius";

From 7a0ca5226727911bc6f3e7148407701d611d783d Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 11 Jun 2015 16:49:43 +0200
Subject: [PATCH 1016/2322] scollector: Change type of collectors to allow
 proper merging

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

diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix
index 0143d2e327b..179c587431e 100644
--- a/nixos/modules/services/monitoring/scollector.nix
+++ b/nixos/modules/services/monitoring/scollector.nix
@@ -73,7 +73,7 @@ in {
       };
 
       collectors = mkOption {
-        type = types.attrs;
+        type = with types; attrsOf (listOf path);
         default = {};
         example = literalExample "{ 0 = [ \"\${postgresStats}/bin/collect-stats\" ]; }";
         description = ''

From 58fd4f672f08a323f86a6a2eb57069be83893084 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Thu, 11 Jun 2015 18:23:58 +0200
Subject: [PATCH 1017/2322] Chromium: Update and build fixes.

Changes included:
- Update versions.
- Use gyp package not gyp_svn1977.
- Remove icu from buildInputs, since this causes a build error due to inferference with use_system_icu=false.
- Remove the hack that inserts the absolute path into gyp files, and pass `--depth .` to gyp. This resolves the `third_party/angle` gyp error.
- Do a normal copy of the source code not a symlink copy. This resolves some link error where the symlinks interfere with relative paths (seems like because gyp resolves symlinks first). Note, this used to be worked around with the absolute path insertion hack.
- Change the bucketURL in update.nix to https (for more secure updates).
---
 .../networking/browsers/chromium/common.nix   | 17 +++++--------
 .../browsers/chromium/source/sources.nix      | 24 +++++++++----------
 .../browsers/chromium/source/update.nix       |  2 +-
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 1f6c272aceb..d3a0c86daf4 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ninja, which
 
 # default dependencies
-, bzip2, flac, speex, icu, libopus
+, bzip2, flac, speex, libopus
 , libevent, expat, libjpeg, snappy
 , libpng, libxml2, libxslt, libcap
 , xdg_utils, yasm, minizip, libwebp
@@ -84,7 +84,7 @@ let
   };
 
   defaultDependencies = [
-    bzip2 flac speex icu opusWithCustomModes
+    bzip2 flac speex opusWithCustomModes
     libevent expat libjpeg snappy
     libpng libxml2 libxslt libcap
     xdg_utils yasm minizip libwebp
@@ -113,7 +113,7 @@ let
       glib gtk dbus_glib
       libXScrnSaver libXcursor libXtst mesa
       pciutils protobuf speechd libXdamage
-      pythonPackages.gyp_svn1977 pythonPackages.ply pythonPackages.jinja2
+      pythonPackages.gyp pythonPackages.ply pythonPackages.jinja2
     ] ++ optional gnomeKeyringSupport libgnome_keyring3
       ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
       ++ optional enableSELinux libselinux
@@ -124,15 +124,10 @@ let
     #      be fixed, then try again to unbundle everything into separate
     #      derivations.
     prePatch = ''
-      cp -dsr --no-preserve=mode "${source.main}"/* .
-      cp -dsr --no-preserve=mode "${source.sandbox}" sandbox
+      cp -dr --no-preserve=mode "${source.main}"/* .
+      cp -dr --no-preserve=mode "${source.sandbox}" sandbox
       cp -dr "${source.bundled}" third_party
       chmod -R u+w third_party
-
-      # Hardcode source tree root in all gyp files
-      find -iname '*.gyp*' \( -type f -o -type l \) \
-        -exec sed -i -e 's|<(DEPTH)|'"$(pwd)"'|g' {} + \
-        -exec chmod u+w {} +
     '';
 
     postPatch = optionalString (versionOlder version "42.0.0.0") ''
@@ -200,7 +195,7 @@ let
       # This is to ensure expansion of $out.
       libExecPath="${libExecPath}"
       python build/linux/unbundle/replace_gyp_files.py ${gypFlags}
-      python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags}
+      python build/gyp_chromium -f ninja --depth . ${gypFlags}
     '';
 
     buildPhase = let
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index e1144a44afb..3adbbab8392 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,21 +1,21 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
-    version = "43.0.2327.5";
-    sha256 = "0k9jpzm1n7d3zv6f77vz33jcvmnbxnl6plabvlrf8w83kbzhi76n";
-    sha256bin32 = "1dm4xp0x02kqj82giw45qd2z12wf22h2bs0d3hnlz050innxgcb6";
-    sha256bin64 = "1b13g44y704llsnw68840zmaahj1hwzram50v8fqmff44w1b0bxb";
+    version = "45.0.2421.0";
+    sha256 = "1qc80y0mhwnvxrvpc3csskgb536wq34c0fgk19h1qb4xc62lxhsk";
+    sha256bin32 = "1xqhyrlmh00md6i1q4wr0xihqbvcpshzscnjclrn53dlw5zs2s89";
+    sha256bin64 = "0akdhwwdfcbqfh65a82zigbhsi8sbhhw6904cjprb3bmv4l3c598";
   };
   beta = {
-    version = "42.0.2311.39";
-    sha256 = "0qiyg8bg9f1daf8v2jlrv54lis7156h44ak42jdx96xanvj2rvj0";
-    sha256bin32 = "0v4dr2a3n51dais2mg0dml0rmqfmalfj0zgp20a4kkarbpih1x0v";
-    sha256bin64 = "19638ik9qgfmxpzdry0qwkwpzvhlbs2h2nn1kwsjja5j49817ksx";
+    version = "44.0.2403.39";
+    sha256 = "15c4adg0r9ym3pxya7vv4d148gv2pdwaaymxvvw511fjwffdv71n";
+    sha256bin32 = "1gaypkah10y31gb5f7vnyv0v73z5zjznmsp6vh2m4hfajx7s55jn";
+    sha256bin64 = "1j1ma6asl3ibjv3apyw24vhyi1qy64f586w8jizqzp4h962gj95c";
   };
   stable = {
-    version = "41.0.2272.89";
-    sha256 = "1saxcyqp8pz496qwdgl4dqxll6l9icbljm56w1rrkxgwrrvl4iwk";
-    sha256bin32 = "19srg0isp1k4fwixwjxm1j88bnqx9sb349n992i038c3h8raa1v4";
-    sha256bin64 = "1fb8ffgbsjsij7bd1qawa03z9pybasfig1cmdzwybmlwg2fdlvfv";
+    version = "43.0.2357.124";
+    sha256 = "09m8bb5f17mx6cd3h5irslw07h2s0drda35v17vcr7qfhk8jdh92";
+    sha256bin32 = "15n2fla1ixrqzi0in0vyl8n5wkv20fpd96lff65rwr9diylz287p";
+    sha256bin64 = "0x6igpcf29zmwqgphvy9nm527k9g7na2cvgc5nimw4fs5dakzzjr";
   };
 }
diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix
index 27af85de546..e639cdb087b 100644
--- a/pkgs/applications/networking/browsers/chromium/source/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/update.nix
@@ -9,7 +9,7 @@ let
             then import ./sources.nix
             else null;
 
-  bucketURL = "http://commondatastorage.googleapis.com/"
+  bucketURL = "https://commondatastorage.googleapis.com/"
             + "chromium-browser-official";
 
   debURL = "https://dl.google.com/linux/chrome/deb/pool/main/g";

From 415407bd9328f9685d5abe5f0ff841af42dec017 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Jun 2015 18:32:13 +0200
Subject: [PATCH 1018/2322] openssl: Update to 1.0.1n

CVE-2015-4000, CVE-2015-1788, CVE-2015-1789, CVE-2015-1790, CVE-2015-1792, CVE-2015-1791, CVE-2014-8176
---
 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 d475f7ae833..e8ecb5a5775 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -2,7 +2,7 @@
 , withCryptodev ? false, cryptodevHeaders }:
 
 let
-  name = "openssl-1.0.1m";
+  name = "openssl-1.0.1n";
 
   opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
     (throw "openssl needs its platform name cross building" null)
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
       "http://www.openssl.org/source/${name}.tar.gz"
       "http://openssl.linux-mirror.org/source/${name}.tar.gz"
     ];
-    sha256 = "0x7gvyybmqm4lv62mlhlm80f1rn7il2qh8224rahqv0i15xhnpq9";
+    sha1 = "2f6ea1e0f2724aca1805392e4387df8361442ace";
   };
 
   patches = (patchesCross false) ++ extraPatches;

From 6a8afa4bb35ee9cffb8e62f5a294adc781b9d348 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 11 Jun 2015 19:34:29 +0200
Subject: [PATCH 1019/2322] chromium: Fix plugin_paths patch for version 44.

The pepper effects plugin has been removed and migrated to NaCl, so I'm
just dropping the hunk of that patch.

Upstream reviow URL: https://codereview.chromium.org/1085393003

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../browsers/chromium/source/default.nix      | 13 ++-
 .../chromium/source/nix_plugin_paths_44.patch | 84 +++++++++++++++++++
 2 files changed, 90 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch

diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index 54430bb5be9..a3a46631484 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -18,7 +18,7 @@ let
     "s,^/,,"
   ]);
 
-  pre42 = versionOlder version "42.0.0.0";
+  pre44 = versionOlder version "44.0.0.0";
 
 in stdenv.mkDerivation {
   name = "chromium-source-${version}";
@@ -47,10 +47,10 @@ in stdenv.mkDerivation {
     done
   '';
 
-  patches = if pre42 then [
-    ./sandbox_userns_36.patch ./nix_plugin_paths.patch
-  ] else [
+  patches = if pre44 then [
     ./nix_plugin_paths_42.patch
+  ] else [
+    ./nix_plugin_paths_44.patch
   ];
 
   patchPhase = let
@@ -73,11 +73,10 @@ in stdenv.mkDerivation {
       -e 's|/bin/echo|echo|' \
       -e "/python_arch/s/: *'[^']*'/: '""'/" \
       "$out/build/common.gypi" "$main/chrome/chrome_tests.gypi"
-  '' + optionalString useOpenSSL ''
-    cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl"
-  '' + optionalString (!pre42) ''
     sed -i -e '/LOG.*no_suid_error/d' \
       "$main/content/browser/browser_main_loop.cc"
+  '' + optionalString useOpenSSL ''
+    cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl"
   '';
 
   preferLocalBuild = true;
diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch
new file mode 100644
index 00000000000..326da7f420a
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_44.patch
@@ -0,0 +1,84 @@
+diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
+index 8a205a6..d5c24e1 100644
+--- a/chrome/common/chrome_paths.cc
++++ b/chrome/common/chrome_paths.cc
+@@ -97,21 +97,14 @@ static base::LazyInstance<base::FilePath>
+     g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER;
+ 
+ // Gets the path for internal plugins.
+-bool GetInternalPluginsDirectory(base::FilePath* result) {
+-#if defined(OS_MACOSX) && !defined(OS_IOS)
+-  // If called from Chrome, get internal plugins from a subdirectory of the
+-  // framework.
+-  if (base::mac::AmIBundled()) {
+-    *result = chrome::GetFrameworkBundlePath();
+-    DCHECK(!result->empty());
+-    *result = result->Append("Internet Plug-Ins");
+-    return true;
+-  }
+-  // In tests, just look in the module directory (below).
+-#endif
+-
+-  // The rest of the world expects plugins in the module directory.
+-  return PathService::Get(base::DIR_MODULE, result);
++bool GetInternalPluginsDirectory(base::FilePath* result,
++                                 const std::string& ident) {
++  std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident;
++  const char* value = getenv(full_env.c_str());
++  if (value == NULL)
++      return PathService::Get(base::DIR_MODULE, result);
++  else
++      *result = base::FilePath(value);
+ }
+ 
+ }  // namespace
+@@ -248,11 +241,11 @@ bool PathProvider(int key, base::FilePath* result) {
+       create_dir = true;
+       break;
+     case chrome::DIR_INTERNAL_PLUGINS:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "ALL"))
+         return false;
+       break;
+     case chrome::DIR_PEPPER_FLASH_PLUGIN:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH"))
+         return false;
+       cur = cur.Append(kPepperFlashBaseDirectory);
+       break;
+@@ -285,7 +278,7 @@ bool PathProvider(int key, base::FilePath* result) {
+       cur = cur.Append(FILE_PATH_LITERAL("script.log"));
+       break;
+     case chrome::FILE_FLASH_PLUGIN:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "FILEFLASH"))
+         return false;
+       cur = cur.Append(kInternalFlashPluginFileName);
+       break;
+@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) {
+     // We currently need a path here to look up whether the plugin is disabled
+     // and what its permissions are.
+     case chrome::FILE_NACL_PLUGIN:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "NACL"))
+         return false;
+       cur = cur.Append(kInternalNaClPluginFileName);
+       break;
+@@ -343,7 +336,7 @@ bool PathProvider(int key, base::FilePath* result) {
+         cur = cur.DirName();
+       }
+ #else
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "PNACL"))
+         return false;
+ #endif
+       cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
+@@ -372,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) {
+     // In the component case, this is the source adapter. Otherwise, it is the
+     // actual Pepper module that gets loaded.
+     case chrome::FILE_WIDEVINE_CDM_ADAPTER:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "WIDEVINE"))
+         return false;
+       cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
+       break;

From af54ddf8b635e2897db64d775317e33a42c259e2 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 11 Jun 2015 19:36:28 +0200
Subject: [PATCH 1020/2322] chromium: Drop plugin_paths patch for old versions.

The patch was for versions prior to version 22, so we no longer need it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../chromium/source/nix_plugin_paths.patch    | 99 -------------------
 1 file changed, 99 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch

diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch
deleted file mode 100644
index 0220d042941..00000000000
--- a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
-index 8a205a6..d5c24e1 100644
---- a/chrome/common/chrome_paths.cc
-+++ b/chrome/common/chrome_paths.cc
-@@ -97,21 +97,14 @@ static base::LazyInstance<base::FilePath>
-     g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER;
- 
- // Gets the path for internal plugins.
--bool GetInternalPluginsDirectory(base::FilePath* result) {
--#if defined(OS_MACOSX) && !defined(OS_IOS)
--  // If called from Chrome, get internal plugins from a subdirectory of the
--  // framework.
--  if (base::mac::AmIBundled()) {
--    *result = chrome::GetFrameworkBundlePath();
--    DCHECK(!result->empty());
--    *result = result->Append("Internet Plug-Ins");
--    return true;
--  }
--  // In tests, just look in the module directory (below).
--#endif
--
--  // The rest of the world expects plugins in the module directory.
--  return PathService::Get(base::DIR_MODULE, result);
-+bool GetInternalPluginsDirectory(base::FilePath* result,
-+                                 const std::string& ident) {
-+  std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident;
-+  const char* value = getenv(full_env.c_str());
-+  if (value == NULL)
-+      return PathService::Get(base::DIR_MODULE, result);
-+  else
-+      *result = base::FilePath(value);
- }
- 
- }  // namespace
-@@ -248,11 +241,11 @@ bool PathProvider(int key, base::FilePath* result) {
-       create_dir = true;
-       break;
-     case chrome::DIR_INTERNAL_PLUGINS:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "ALL"))
-         return false;
-       break;
-     case chrome::DIR_PEPPER_FLASH_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH"))
-         return false;
-       cur = cur.Append(kPepperFlashBaseDirectory);
-       break;
-@@ -285,7 +278,7 @@ bool PathProvider(int key, base::FilePath* result) {
-       cur = cur.Append(FILE_PATH_LITERAL("script.log"));
-       break;
-     case chrome::FILE_FLASH_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "FILEFLASH"))
-         return false;
-       cur = cur.Append(kInternalFlashPluginFileName);
-       break;
-@@ -295,12 +288,12 @@ bool PathProvider(int key, base::FilePath* result) {
-       cur = cur.Append(chrome::kPepperFlashPluginFilename);
-       break;
-     case chrome::FILE_PDF_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "PDF"))
-         return false;
-       cur = cur.Append(kInternalPDFPluginFileName);
-       break;
-     case chrome::FILE_EFFECTS_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "FILE_EFFECTS"))
-         return false;
-       cur = cur.Append(kEffectsPluginFileName);
-       break;
-@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) {
-     // We currently need a path here to look up whether the plugin is disabled
-     // and what its permissions are.
-     case chrome::FILE_NACL_PLUGIN:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "NACL"))
-         return false;
-       cur = cur.Append(kInternalNaClPluginFileName);
-       break;
-@@ -343,7 +336,7 @@ bool PathProvider(int key, base::FilePath* result) {
-         cur = cur.DirName();
-       }
- #else
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "PNACL"))
-         return false;
- #endif
-       cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
-@@ -372,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) {
-     // In the component case, this is the source adapter. Otherwise, it is the
-     // actual Pepper module that gets loaded.
-     case chrome::FILE_WIDEVINE_CDM_ADAPTER:
--      if (!GetInternalPluginsDirectory(&cur))
-+      if (!GetInternalPluginsDirectory(&cur, "WIDEVINE"))
-         return false;
-       cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
-       break;

From 03e4e3e92a25386ed559e3c4a70782c7f07fa355 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 11 Jun 2015 17:33:11 +0200
Subject: [PATCH 1021/2322] bosun: Update to 0.2.0

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

diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix
index 807ee702267..dfb2ffbb838 100644
--- a/pkgs/servers/monitoring/bosun/default.nix
+++ b/pkgs/servers/monitoring/bosun/default.nix
@@ -3,14 +3,14 @@
 with goPackages;
 
 buildGoPackage rec {
-  rev = "20150506172827";
+  rev = "0.2.0";
   name = "bosun-${rev}";
   goPackagePath = "bosun.org";
   src = fetchFromGitHub {
     inherit rev;
     owner = "bosun-monitor";
     repo = "bosun";
-    sha256 = "0rnfiv9b835b8j8r9qh9j2mz9mm9q45vfg9cqa4nngrgfd0cqvl8";
+    sha256 = "146k37zg4l01l10vwhnhjs6jv8d35zf5l5rljmvy9ydq2npadsjd";
   };
   subPackages = [ "cmd/bosun" ];
 

From 85da7792b8bfa6be2f8d72d2cd51d1429b1f6ba8 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Thu, 11 Jun 2015 10:52:00 -0700
Subject: [PATCH 1022/2322] openconnect: update to version 7.06 and support
 openssl or gnutls

---
 pkgs/tools/networking/openconnect.nix | 15 +++++++++++----
 pkgs/top-level/all-packages.nix       | 11 ++++++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/openconnect.nix b/pkgs/tools/networking/openconnect.nix
index d53af5c9e40..54239b76617 100644
--- a/pkgs/tools/networking/openconnect.nix
+++ b/pkgs/tools/networking/openconnect.nix
@@ -1,13 +1,19 @@
-{ stdenv, fetchurl, pkgconfig, vpnc, openssl, libxml2, zlib } :
+{ stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, libxml2, zlib } :
+
+let
+  xor = a: b: (a || b) && (!(a && b));
+in
+
+assert xor (openssl != null) (gnutls != null);
 
 stdenv.mkDerivation rec {
-  name = "openconnect-5.02";
+  name = "openconnect-7.06";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz"
     ];
-    sha256 = "1y7dn42gd3763sgwv2j72xy9hsikd6y9x142g84kwdbn0y0psgi4";
+    sha256 = "1wkhmgfxkdkhy2p9w9idrgipxmxij2z4f88flfk3fifwd19nkkzs";
   };
 
   preConfigure = ''
@@ -22,5 +28,6 @@ stdenv.mkDerivation rec {
     "--without-openssl-version-check"
   ];
 
-  propagatedBuildInputs = [ vpnc openssl libxml2 zlib ];
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ vpnc openssl gnutls libxml2 zlib ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 991928ae5db..a9d9848904d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3144,7 +3144,16 @@ let
 
   vpnc = callPackage ../tools/networking/vpnc { };
 
-  openconnect = callPackage ../tools/networking/openconnect.nix { };
+  openconnect = openconnect_openssl;
+
+  openconnect_openssl = callPackage ../tools/networking/openconnect.nix {
+    gnutls = null;
+  };
+
+  openconnect_gnutls = lowPrio (openconnect.override {
+    openssl = null;
+    gnutls = gnutls;
+  });
 
   vtun = callPackage ../tools/networking/vtun { };
 

From f3ca1cc2382acdeaa992ea599d34086b32605b92 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Thu, 11 Jun 2015 20:58:05 +0200
Subject: [PATCH 1023/2322] gyp: 2015-05-17 -> 2015-06-11

---
 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 c65fe86c382..58b2a9ee213 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5920,12 +5920,12 @@ let
 
   gyp = buildPythonPackage rec {
     name = "gyp-${version}";
-    version = "2015-05-15";
+    version = "2015-06-11";
 
     src = pkgs.fetchgit {
       url = "https://chromium.googlesource.com/external/gyp.git";
-      rev = "9f594095c5b14f8bc518081a660e77890c294861";
-      sha256 = "1xqi44alnw9c31jg2hz7flz5nabq003b4jyin12h3s9zl82y6vd5";
+      rev = "fdc7b812f99e48c00e9a487bd56751bbeae07043";
+      sha256 = "176sdxkva2irr1v645nn4q6rwc6grbb1wxj82n7x9hh09q4bxqcz";
     };
 
     patches = optionals pkgs.stdenv.isDarwin [

From 39902b01bfb583621d4844f23a1ff7d069a7d763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 11 Jun 2015 20:50:43 +0200
Subject: [PATCH 1024/2322] goffice: separate from gnome3

It's got practically no coupling with gnome, except for gtk3.
---
 pkgs/applications/office/gnumeric/default.nix             | 4 ++--
 pkgs/desktops/gnome-3/3.16/default.nix                    | 8 --------
 .../3.16/misc => development/libraries}/goffice/0.8.nix   | 4 ++--
 .../misc => development/libraries}/goffice/default.nix    | 0
 .../libraries}/goffice/pcre_info.patch                    | 0
 pkgs/top-level/all-packages.nix                           | 8 +++++++-
 6 files changed, 11 insertions(+), 13 deletions(-)
 rename pkgs/{desktops/gnome-3/3.16/misc => development/libraries}/goffice/0.8.nix (91%)
 rename pkgs/{desktops/gnome-3/3.16/misc => development/libraries}/goffice/default.nix (100%)
 rename pkgs/{desktops/gnome-3/3.16/misc => development/libraries}/goffice/pcre_info.patch (100%)

diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index 02a78a2b2d1..e54dd591cfd 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser
-, gnome3, makeWrapper, gtk3
+, goffice, gnome3, makeWrapper, gtk3
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   # ToDo: optional libgda, python, introspection?
   buildInputs = [
     pkgconfig intltool perl perlXMLParser
-    gnome3.goffice gtk3 makeWrapper gnome3.defaultIconTheme
+    goffice gtk3 makeWrapper gnome3.defaultIconTheme
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 15f4a210e04..be60a58db26 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -273,14 +273,6 @@ rec {
 
   gfbgraph = callPackage ./misc/gfbgraph { };
 
-  goffice = callPackage ./misc/goffice { };
-
-  goffice_0_8 = callPackage ./misc/goffice/0.8.nix { 
-    inherit (pkgs.gnome2) libglade libgnomeui;
-    gconf = pkgs.gnome2.GConf;
-    libart = pkgs.gnome2.libart_lgpl;
-  };
-
   gitg = callPackage ./misc/gitg { 
     webkitgtk = webkitgtk24x;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix b/pkgs/development/libraries/goffice/0.8.nix
similarity index 91%
rename from pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix
rename to pkgs/development/libraries/goffice/0.8.nix
index 02520a9f121..75a7dfb4898 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix
+++ b/pkgs/development/libraries/goffice/0.8.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2
 , pango, libgsf, libxml2, libart, intltool, gettext
-, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }:
+, cairo, gconf, libgnomeui, pcre, goffice/*just meta*/ }:
 
 stdenv.mkDerivation rec {
   name = "goffice-0.8.17";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = gnome3.goffice.meta // {
+  meta = goffice.meta // {
     maintainers = [ ];
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix
rename to pkgs/development/libraries/goffice/default.nix
diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/pcre_info.patch b/pkgs/development/libraries/goffice/pcre_info.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.16/misc/goffice/pcre_info.patch
rename to pkgs/development/libraries/goffice/pcre_info.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 991928ae5db..bff25e186c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11260,7 +11260,13 @@ let
     goffice = goffice_0_8;
   };
 
-  goffice_0_8 = gnome3.goffice_0_8;
+  goffice = callPackage ../development/libraries/goffice { };
+
+  goffice_0_8 = callPackage ../development/libraries/goffice/0.8.nix {
+    inherit (pkgs.gnome2) libglade libgnomeui;
+    gconf = pkgs.gnome2.GConf;
+    libart = pkgs.gnome2.libart_lgpl;
+  };
 
   idea = recurseIntoAttrs (callPackage ../applications/editors/idea { androidsdk = androidsdk_4_4; });
 

From cfc753478e9e32714364d1c7463f5a59318c9755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 11 Jun 2015 20:52:03 +0200
Subject: [PATCH 1025/2322] abiword: support goffice

/cc maintainer @pSub.
---
 pkgs/applications/office/abiword/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index 2aaf1e8f032..c17a4910f44 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gtk3, libglade, libgnomecanvas, fribidi
 , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl
-, boost, libxslt
+, boost, libxslt, goffice
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
-      libgsf enchant wv libjpeg perl boost libxslt
+      libgsf enchant wv libjpeg perl boost libxslt goffice
     ];
 
   meta = with stdenv.lib; {

From 3a90a80a9dbd9d228ffd0c247bb365e52bc02f2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 11 Jun 2015 21:06:35 +0200
Subject: [PATCH 1026/2322] abiword: fix gschemas crash and missing icons

The gtk3 file dialogs were crashing, as always without wrapping.
/cc maintainer @pSub.
---
 pkgs/applications/office/abiword/default.nix | 9 +++++++--
 pkgs/top-level/all-packages.nix              | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index c17a4910f44..18ece7a7401 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gtk3, libglade, libgnomecanvas, fribidi
 , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl
-, boost, libxslt, goffice
+, boost, libxslt, goffice, makeWrapper, iconTheme
 }:
 
 stdenv.mkDerivation rec {
@@ -16,9 +16,14 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig gtk3 libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
-      libgsf enchant wv libjpeg perl boost libxslt goffice
+      libgsf enchant wv libjpeg perl boost libxslt goffice makeWrapper iconTheme
     ];
 
+  postFixup = ''
+    wrapProgram "$out/bin/abiword" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
   meta = with stdenv.lib; {
     description = "Word processing program, similar to Microsoft Word";
     homepage = http://www.abisource.com/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bff25e186c7..4a4e2182f33 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10413,6 +10413,7 @@ let
 
   abiword = callPackage ../applications/office/abiword {
     inherit (gnome) libglade libgnomecanvas;
+    iconTheme = gnome3.defaultIconTheme;
   };
 
   abook = callPackage ../applications/misc/abook { };

From e5b56cdfff989b2e1afce09fe0ab0a3f59946617 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Thu, 7 May 2015 14:28:36 +0300
Subject: [PATCH 1027/2322] firefox: add option to build with GTK3 (close
 #7743)

---
 pkgs/applications/networking/browsers/firefox/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix                           | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 03b96acc712..727f89fe668 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -1,9 +1,10 @@
-{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
+{ lib, stdenv, fetchurl, pkgconfig, gtk, gtk3, pango, perl, python, zip, libIDL
 , libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs
 , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
 , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
 , hunspell, libevent, libstartup_notification, libvpx
 , cairo, gstreamer, gst_plugins_base, icu
+, enableGTK3 ? false
 , debugBuild ? false
 , # If you want the resulting program to call itself "Firefox" instead
   # of "Shiretoko" or whatever, enable this option.  However, those
@@ -34,7 +35,8 @@ stdenv.mkDerivation rec {
       xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
       hunspell libevent libstartup_notification libvpx cairo
       gstreamer gst_plugins_base icu
-    ];
+    ]
+    ++ lib.optional enableGTK3 gtk3;
 
   configureFlags =
     [ "--enable-application=browser"
@@ -64,6 +66,7 @@ stdenv.mkDerivation rec {
       "--disable-updater"
       "--disable-pulseaudio"
     ]
+    ++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3"
     ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
                       else [ "--disable-debug" "--enable-release"
                              "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a4e2182f33..c10bf661571 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11150,6 +11150,7 @@ let
   firefox = callPackage ../applications/networking/browsers/firefox {
     inherit (gnome) libIDL;
     inherit (pythonPackages) pysqlite;
+    enableGTK3 = false;
   };
 
   firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };

From d15777fac98f26d5f7ab599a86bc418105ebcd4f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 11 Jun 2015 21:28:16 +0200
Subject: [PATCH 1028/2322] gyp: Remove old SVN version to build Chromium.

This reverts commit b26de392522176b9a176eb21bb5be4a5ac8d9062.

We no longer need this version because Chromium now builds with the
latest gyp version, see 58fd4f672f08a323f86a6a2eb57069be83893084.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 58b2a9ee213..c625301926b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5941,28 +5941,6 @@ let
     };
   };
 
-  # Needed to build Chromium until #7402 is fixed.
-  gyp_svn1977 = pkgs.lowPrio (buildPythonPackage rec {
-    rev = "1977";
-    name = "gyp-r${rev}";
-
-    src = pkgs.fetchsvn {
-      url = "http://gyp.googlecode.com/svn/trunk";
-      inherit rev;
-      sha256 = "0vnr75yd3bidysiwl9lljvf1dv6v9m9xqdnx0hdgyl92w689n9j8";
-    };
-
-    patches = optionals pkgs.stdenv.isDarwin [
-      ../development/python-modules/gyp/no-darwin-cflags.patch
-    ];
-
-    meta = {
-      homepage = http://code.google.com/p/gyp;
-      license = licenses.bsd3;
-      description = "Generate Your Projects";
-    };
-  });
-
   guessit = buildPythonPackage rec {
     version = "0.9.4";
     name = "guessit-${version}";

From 69945a8701457a9e58020aee5f2e281731ce0e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 11 Jun 2015 21:34:32 +0200
Subject: [PATCH 1029/2322] ffmpeg: remove 0.11 and replace by 0.10

That branch is better supported, and 0.11 only had one user -
minidlna still builds
---
 pkgs/development/libraries/ffmpeg/0.11.nix |  7 -------
 pkgs/top-level/all-packages.nix            | 13 ++++++-------
 2 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100644 pkgs/development/libraries/ffmpeg/0.11.nix

diff --git a/pkgs/development/libraries/ffmpeg/0.11.nix b/pkgs/development/libraries/ffmpeg/0.11.nix
deleted file mode 100644
index abdb2666877..00000000000
--- a/pkgs/development/libraries/ffmpeg/0.11.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "${branch}.5";
-  branch = "0.11";
-  sha256 = "1h5qwn4h7sppqw36hri5p6zlv2387vwaxh2pyj070xfn8hgrk4ll";
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c10bf661571..3acdd30a0e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5995,12 +5995,11 @@ let
   fcgi = callPackage ../development/libraries/fcgi { };
 
   ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { };
-  ffmpeg_0_11 = callPackage ../development/libraries/ffmpeg/0.11.nix { };
   ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { };
   ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { };
   ffmpeg_2_6 = callPackage ../development/libraries/ffmpeg/2.6.nix { };
   # Aliases
-  ffmpeg_0 = ffmpeg_0_11;
+  ffmpeg_0 = ffmpeg_0_10;
   ffmpeg_1 = ffmpeg_1_2;
   ffmpeg_2 = ffmpeg_2_6;
   ffmpeg = ffmpeg_2;
@@ -6253,7 +6252,7 @@ let
   gst_plugins_ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {};
 
   gst_ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg {
-    ffmpeg = ffmpeg_0_10;
+    ffmpeg = ffmpeg_0;
   };
 
   gst_python = callPackage ../development/libraries/gstreamer/legacy/gst-python {};
@@ -7572,7 +7571,7 @@ let
 
   openscenegraph = callPackage ../development/libraries/openscenegraph {
     giflib = giflib_4_1;
-    ffmpeg = ffmpeg_0_10;
+    ffmpeg = ffmpeg_0;
   };
 
   openspades = callPackage ../games/openspades {};
@@ -10476,7 +10475,7 @@ let
   audacious = callPackage ../applications/audio/audacious { };
 
   audacity = callPackage ../applications/audio/audacity {
-    ffmpeg = ffmpeg_0_10;
+    ffmpeg = ffmpeg_0;
   };
 
   milkytracker = callPackage ../applications/audio/milkytracker { };
@@ -11107,7 +11106,7 @@ let
       blas liblapack libjpeg libpng mysql unixODBC mesa postgresql python
       readline sqlite tcl tk libtiff freetype makeWrapper wxGTK;
     fftw = fftwSinglePrec;
-    ffmpeg = ffmpeg_0_10;
+    ffmpeg = ffmpeg_0;
     motif = lesstif;
     opendwg = libdwg;
     wxPython = wxPython28;
@@ -13473,7 +13472,7 @@ let
   ultimatestunts = callPackage ../games/ultimatestunts { };
 
   ultrastardx = callPackage ../games/ultrastardx {
-    ffmpeg = ffmpeg_0_10;
+    ffmpeg = ffmpeg_0;
     lua = lua5;
   };
 

From cdc70b69f518ff2317cdb6b402c4a4d07437de71 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 11 Jun 2015 21:35:22 +0200
Subject: [PATCH 1030/2322] steam-original: Mark package as lowPrio.

This is to avoid accidentally installing it via "nix-env -i", which
leads to a non-working Steam on NixOS.

Thanks to srhh and Pamelloes on IRC for bringing this up.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 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 3acdd30a0e7..362af5d3e17 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13418,7 +13418,7 @@ let
 
   stardust = callPackage ../games/stardust {};
 
-  steam-original = callPackage ../games/steam { };
+  steam-original = lowPrio (callPackage ../games/steam { });
 
   steam = callPackage ../games/steam/chrootenv.nix { };
 

From 6a76633bb6e2fd49fbe264a55b39ce0a5166605f Mon Sep 17 00:00:00 2001
From: Matthew Maurer <maurer@matthewmaurer.org>
Date: Thu, 11 Jun 2015 00:45:24 +0200
Subject: [PATCH 1031/2322] llvm-3.4: enable RTTI (close #8289)

---
 pkgs/development/compilers/llvm/3.4/llvm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index d3beb2e7461..a44f157a13e 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -44,6 +44,7 @@ in stdenv.mkDerivation rec {
     "-DCMAKE_BUILD_TYPE=Release"
     "-DLLVM_BUILD_TESTS=ON"
     "-DLLVM_ENABLE_FFI=ON"
+    "-DLLVM_REQUIRES_RTTI=1"
     "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
     "-DCMAKE_CXX_FLAGS=-std=c++11"
   ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";

From 885808a8d910ea54a899e9b82042413e401ff638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 11 Jun 2015 22:11:21 +0200
Subject: [PATCH 1032/2322] liferea: maintenance update

---
 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 26078c8e583..28baa2f7b67 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -6,14 +6,14 @@
 }:
 
 let pname = "liferea";
-    version = "1.10.14";
+    version = "1.10.15";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "0szazfknarw6ivnr4flr928ar309pz2mv6alc6pk6l1i9jchcnfs";
+    sha256 = "0iicw42rf0vhq4xs81awlj5v3v7xfid3h5fh87f3bqbpn9pmifdg";
   };
 
   buildInputs = with gst_all_1; [

From 2e0373ee660bb51882ee3d0eaf87a1304773a404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 11 Jun 2015 22:12:33 +0200
Subject: [PATCH 1033/2322] gtk3: maintenance update

---
 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 4bc31b99e82..ac0fc53e755 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -10,7 +10,7 @@ assert cupsSupport -> cups != null;
 
 let
   ver_maj = "3.16";
-  ver_min = "3";
+  ver_min = "4";
   version = "${ver_maj}.${ver_min}";
 in
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "195ykv53sl2gsc847wcnd79zilm1yzcc2cfjxnrakhh2dd5gshr9";
+    sha256 = "13pwj12m55mbhdaiar57q2ivdsm3lm5ycyhvm8gak0fblkbxpr8y";
   };
 
   nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];

From 95def7e4f03b19295060dcfd27a8c97c48baadd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 11 Jun 2015 22:19:20 +0200
Subject: [PATCH 1034/2322] lib/maintainers: recommend to re-use github
 usernames

---
 lib/maintainers.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index df7a442ac52..1a0a3b832e3 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -1,8 +1,11 @@
 /* -*- coding: utf-8; -*- */
 
 {
-  /* Add your name and email address here.  Keep the list
-     alphabetically sorted.  */
+  /* Add your name and email address here.
+     Keep the list alphabetically sorted.
+     Prefer the same attrname as your github username, please,
+     so it's easy to ping a package @maintainer.
+  */
 
   abaldeau = "Andreas Baldeau <andreas@baldeau.net>";
   abbradar = "Nikolay Amiantov <ab@fmap.me>";

From f12a466730c835633354d486f6bc9fbf311359ed Mon Sep 17 00:00:00 2001
From: Adrien Devresse <adrien.devresse@epfl.ch>
Date: Mon, 1 Jun 2015 10:05:53 +0200
Subject: [PATCH 1035/2322] New expression for the davix toolkit

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index df7a442ac52..62e7a33db8b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -6,6 +6,7 @@
 
   abaldeau = "Andreas Baldeau <andreas@baldeau.net>";
   abbradar = "Nikolay Amiantov <ab@fmap.me>";
+  adev	   = "Adrien Devresse <adev@adev.name>";
   aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
   aflatter = "Alexander Flatter <flatter@fastmail.fm>";
   aherrmann = "Andreas Herrmann <andreash87@gmx.ch>";
diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix
new file mode 100644
index 00000000000..748e28407b2
--- /dev/null
+++ b/pkgs/tools/networking/davix/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, libxml2, boost }:
+
+stdenv.mkDerivation rec {
+  name = "davix-0.4.0";
+  buildInputs = [ stdenv pkgconfig cmake openssl libxml2 boost ];
+
+  src = fetchFromGitHub {
+    owner = "cern-it-sdc-id";
+    repo = "davix";
+    rev = "R_0_4_0-1";
+    sha256 = "0i6ica7rmpc3hbybjql5mr500cd43w4qzc69cj1djkc6bqqb752v";
+  };
+
+
+  meta = with stdenv.lib; {
+    description = "Toolkit for Http-based file management";
+
+    longDescription = "Davix is a toolkit designed for file 
+    operations with Http based protocols (WebDav, Amazon S3, ...).
+    Davix provides an API and a set of command line tools";
+
+    license     = licenses.lgpl2Plus;
+    homepage    = http://dmc.web.cern.ch/projects/davix/home;
+    maintainers = [ maintainers.adev ];
+    platforms   = platforms.all;
+  };  
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cf9fed11ae..f91bc9a71eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -988,6 +988,8 @@ let
 
   cadaver = callPackage ../tools/networking/cadaver { };
 
+  davix = callPackage ../tools/networking/davix { };
+
   cantata = callPackage ../applications/audio/cantata { };
 
   can-utils = callPackage ../os-specific/linux/can-utils { };

From 838c8f252023f19b05d25f7ab4376d9023d89a6a Mon Sep 17 00:00:00 2001
From: Siarhei Zirukin <ftrvxmtrx@gmail.com>
Date: Thu, 11 Jun 2015 23:42:14 +0200
Subject: [PATCH 1036/2322] wavpack: 4.70.0 -> 4.75.0

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

diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix
index 08465861f27..b205519eea1 100644
--- a/pkgs/development/libraries/wavpack/default.nix
+++ b/pkgs/development/libraries/wavpack/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "wavpack-${version}";
-  version = "4.70.0";
+  version = "4.75.0";
 
   enableParallelBuilding = true;
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.wavpack.com/${name}.tar.bz2";
-    sha256 = "191h8hv8qk72hfh1crg429i9yq3cminwqb249sy9zadbn1wy7b9c";
+    sha256 = "0bmgwcvch3cjcivk7pyasqysj0s81wkg40j3zfrcd7bl0qhmqgn6";
   };
 
   meta = with stdenv.lib; {

From 4e49773d266bdb6fb60030c9f2d46c85402a673d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Jun 2015 02:01:48 +0300
Subject: [PATCH 1037/2322] sdl-jstest: add package

---
 pkgs/tools/misc/sdl-jstest/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/tools/misc/sdl-jstest/default.nix

diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix
new file mode 100644
index 00000000000..3da62874c13
--- /dev/null
+++ b/pkgs/tools/misc/sdl-jstest/default.nix
@@ -0,0 +1,21 @@
+{ fetchgit, stdenv, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl }:
+
+stdenv.mkDerivation rec {
+  name = "sdl-jstest-20150611";
+  src = fetchgit {
+    url = "https://github.com/Grumbel/sdl-jstest";
+    rev = "684d168e5526da16760dcfc6d40da0103ab284cc";
+    sha256 = "fc110a858edc2defc5cd8b176a5ce74666d3957d0268b861d0f9669362a1bd03";
+  };
+
+  buildInputs = [ SDL SDL2 ncurses ];
+  nativeBuildInputs = [ cmake pkgconfig docbook_xsl ];
+  
+  meta = with stdenv.lib; {
+    homepage = https://github.com/Grumbel/sdl-jstest;
+    description = "Simple SDL joystick test application for the console";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43f679bc55a..2f5df67d078 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2815,6 +2815,8 @@ let
 
   sdcv = callPackage ../applications/misc/sdcv { };
 
+  sdl-jstest = callPackage ../tools/misc/sdl-jstest { };
+
   sec = callPackage ../tools/admin/sec { };
 
   seccure = callPackage ../tools/security/seccure { };

From 9a517da2b19f9c1165fcee7665d80fdcac1f00f7 Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <e.bachmakov@gmail.com>
Date: Wed, 10 Jun 2015 21:20:40 -0400
Subject: [PATCH 1038/2322] Add dfilemanager/dfm

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

diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix
new file mode 100644
index 00000000000..40bb2e8fe56
--- /dev/null
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchgit, cmake, qt5, file, kde5}:
+
+let
+  version = "git-2015-06-10";
+in
+stdenv.mkDerivation rec {
+  name = "dfilemanager-${version}";
+  src = fetchgit {
+    url = "git://git.code.sf.net/p/dfilemanager/code";
+    rev = "806a28aa8fed30941a2fd6784c7c9c240bca30e3";
+    sha256 = "1k15qzjmqg9ffv4cl809b071dpyckf8jspkhfhpbmfd9wasr0m7i";
+  };
+
+  buildInputs = [ cmake qt5.base qt5.tools qt5.x11extras file kde5.solid];
+
+  cmakeFlags = "-DQT5BUILD=true";
+
+  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";
+    #license = stdenv.lib.licenses; # license not specified
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.eduarrrd ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b43fb9c7896..6566e899446 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -800,6 +800,8 @@ let
 
   ddate = callPackage ../tools/misc/ddate { };
 
+  dfilemanager = callPackage ../applications/misc/dfilemanager { };
+
   diagrams-builder = callPackage ../tools/graphics/diagrams-builder {
     inherit (haskellngPackages) ghcWithPackages diagrams-builder;
   };

From cd28c5517c224c0c969f6bccb1f85dcc280ed7f2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Jun 2015 01:37:45 +0200
Subject: [PATCH 1039/2322] Revert "Drop tests.installer.grub1 as release
 critical"

This reverts commit 1907ca8a2aaa51d3e6910bb086dd75efffa81a6b. See

https://github.com/NixOS/nixpkgs/commit/1907ca8a2aaa51d3e6910bb086dd75efffa81a6b#commitcomment-9719007
---
 nixos/release-combined.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index ddedcd9fe97..191d5044341 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -52,6 +52,7 @@ in rec {
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         (all nixos.tests.gnome3)
+        (all nixos.tests.installer.grub1)
         (all nixos.tests.installer.lvm)
         (all nixos.tests.installer.luksroot)
         (all nixos.tests.installer.separateBoot)

From 99a7bc241df79c791fbf0f17ffdfd19572680b91 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 11 Jun 2015 19:52:19 +0300
Subject: [PATCH 1040/2322] stdenv/linux: Link statically against isl & cloog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Otherwise this fails on ARM:

/nix/store/jipqp9739n7wrjz40igbk85pqk13s0ad-binutils-2.23.1/bin/ld: /nix/store/92pdpqrqkdf8wjciq1cisvsp8kdz8p2i-gmp-5.1.3/lib/libgmp.a(mp_get_fns.o): relocation R_ARM_MOVW_ABS_NC against `__gmp_allocate_func' can not be used when making a shared object; recompile with -fPIC
/nix/store/92pdpqrqkdf8wjciq1cisvsp8kdz8p2i-gmp-5.1.3/lib/libgmp.a: could not read symbols: Bad value
collect2: error: ld returned 1 exit status
make[2]: *** [libisl.la] Error 1
make[2]: *** Waiting for unfinished jobs....
make[2]: Leaving directory `/tmp/nix-build-isl-0.11.1.drv-3/isl-0.11.1'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/tmp/nix-build-isl-0.11.1.drv-3/isl-0.11.1'
make: *** [all] Error 2
builder for ‘/nix/store/a8ghniifd8d8agqx0cqsh41daa08v11c-isl-0.11.1.drv’ failed with exit code 2
---
 pkgs/stdenv/linux/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 861b7930b71..1bcf74afa32 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -202,7 +202,7 @@ rec {
     coreutils = bootstrapTools;
     name = "bootstrap-gcc-wrapper";
 
-    overrides = pkgs: {
+    overrides = pkgs: rec {
       inherit (stage2.pkgs) binutils glibc perl patchelf linuxHeaders;
       # Link GCC statically against GMP etc.  This makes sense because
       # these builds of the libraries are only used by GCC, so it
@@ -210,9 +210,15 @@ rec {
       gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
       mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
       libmpc = pkgs.libmpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
-      isl = pkgs.isl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
-      cloog = pkgs.cloog.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
-      gccPlain = pkgs.gcc.cc;
+      isl_0_11 = pkgs.isl_0_11.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
+      cloog_0_18_0 = pkgs.cloog_0_18_0.override {
+        stdenv = pkgs.makeStaticLibraries pkgs.stdenv;
+        isl = isl_0_11;
+      };
+      gccPlain = pkgs.gcc.cc.override {
+        isl = isl_0_11;
+        cloog = cloog_0_18_0;
+      };
     };
     extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ];
   };
@@ -287,7 +293,6 @@ rec {
       [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
         glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl
         paxctl zlib pcre linuxHeaders ed gcc gcc.cc libsigsegv
-        stage3.pkgs.isl_0_11 stage3.pkgs.cloog_0_18_0
       ];
 
     overrides = pkgs: {

From bc3217251e4fb8dd9d648b41d963d8804a0d8f67 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 11 Jun 2015 19:23:25 -0500
Subject: [PATCH 1041/2322] pythonPackages.scikitlearn: build with openblas

---
 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 80931ecfe1f..c05aff22a5d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11298,15 +11298,14 @@ let
     };
 
     buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];
-    propagatedBuildInputs = with self; [ numpy scipy pkgs.atlas ];
+    propagatedBuildInputs = with self; [ numpy scipy pkgs.openblas ];
 
     buildPhase = ''
-      export ATLAS=${pkgs.atlas}
       ${self.python.executable} setup.py build_ext -i --fcompiler='gnu95'
     '';
 
     checkPhase = ''
-      LC_ALL="en_US.UTF-8" HOME=$TMPDIR ATLAS="" nosetests
+      LC_ALL="en_US.UTF-8" HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests
     '';
 
     meta = {

From 3859f7bdabe8ec56c1eef832bd5b74280d8298e1 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Thu, 22 Jan 2015 18:10:08 -0500
Subject: [PATCH 1042/2322] haskell-ng: hoogleLocal support

---
 pkgs/development/haskell-modules/default.nix  |   1 +
 .../haskell-modules/hoogle-local-wrapper.sh   |   6 +
 pkgs/development/haskell-modules/hoogle.nix   | 107 ++++++++++++++++++
 pkgs/development/haskell-modules/lib.nix      |   6 +
 .../haskell-modules/with-packages-wrapper.nix |   9 +-
 5 files changed, 126 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/hoogle-local-wrapper.sh
 create mode 100644 pkgs/development/haskell-modules/hoogle.nix

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 62d74b0ac7d..04158ae8e9b 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -56,6 +56,7 @@ let
 
         ghcWithPackages = pkgs: callPackage ./with-packages-wrapper.nix {
           inherit (self) llvmPackages;
+          haskellPackages = self;
           packages = pkgs self;
         };
 
diff --git a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh
new file mode 100644
index 00000000000..13ea889119c
--- /dev/null
+++ b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh
@@ -0,0 +1,6 @@
+#! @shell@
+
+COMMAND=$1
+shift
+HOOGLE_DOC_PATH=@out@/share/hoogle/doc exec @hoogle@/bin/hoogle \
+    "$COMMAND" -d @out@/share/hoogle "$@"
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
new file mode 100644
index 00000000000..822c2bdd82e
--- /dev/null
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -0,0 +1,107 @@
+# Install not only the Hoogle library and executable, but also a local Hoogle
+# database which provides "Source" links to all specified 'packages' -- or the
+# current Haskell Platform if no custom package set is provided.
+#
+# It is intended to be used in config.nix similarly to:
+#
+# { packageOverrides = pkgs: rec {
+#
+#   haskellPackages =
+#     let callPackage = pkgs.lib.callPackageWith haskellPackages;
+#     in pkgs.recurseIntoAttrs (pkgs.haskellPackages.override {
+#         extension = self: super: {
+#           hoogleLocal = pkgs.haskellPackages.hoogleLocal.override {
+#             packages = with pkgs.haskellPackages; [
+#               mmorph
+#               monadControl
+#             ];
+#           };
+#         };
+#       });
+# }}
+#
+# This will build mmorph and monadControl, and have the hoogle installation
+# refer to their documentation via symlink so they are not garbage collected.
+
+{ stdenv, hoogle, rehoo
+, ghc, packages ? [ ghc.ghc ]
+}:
+
+let
+  inherit (stdenv.lib) optional;
+  wrapper = ./hoogle-local-wrapper.sh;
+in
+stdenv.mkDerivation {
+  name = "hoogle-local-0.1";
+  buildInputs = [hoogle rehoo];
+
+  phases = [ "installPhase" ];
+
+  docPackages = packages;
+  installPhase = ''
+    if [ -z "$docPackages" ]; then
+        echo "ERROR: The packages attribute has not been set"
+        exit 1
+    fi
+
+    mkdir -p $out/share/hoogle/doc
+    export HOOGLE_DOC_PATH=$out/share/hoogle/doc
+
+    cd $out/share/hoogle
+
+    function import_dbs() {
+        find $1 -name '*.txt' | while read f; do
+          newname=$(basename "$f" | tr '[:upper:]' '[:lower:]')
+          if [[ -f $f && ! -f ./$newname ]]; then
+            cp -p $f ./$newname
+            hoogle convert -d "$(dirname $f)" "./$newname"
+          fi
+        done
+    }
+
+    for i in $docPackages; do
+        findInputs $i docPackages propagated-native-build-inputs
+        findInputs $i docPackages propagated-build-inputs
+    done
+
+    for i in $docPackages; do
+      if [[ ! $i == $out ]]; then
+        for docdir in $i/share/doc/*-ghc-*/* $i/share/doc/*; do
+          if [[ -d $docdir ]]; then
+            import_dbs $docdir
+            ln -sf $docdir $out/share/hoogle/doc
+          fi
+        done
+      fi
+    done
+
+    import_dbs ${ghc}/share/doc/ghc*/html/libraries
+    ln -sf ${ghc}/share/doc/ghc*/html/libraries/* $out/share/hoogle/doc
+
+    chmod 644 *.hoo *.txt
+    rehoo -j4 -c64 .
+
+    rm -fr downloads *.dep *.txt
+    mv default.hoo x || exit 0
+    rm -f *.hoo
+    mv x default.hoo || exit 1
+
+    if [ ! -f default.hoo ]; then
+        echo "Unable to build the default Hoogle database"
+        exit 1
+    fi
+
+    mkdir -p $out/bin
+    substitute ${wrapper} $out/bin/hoogle \
+        --subst-var out --subst-var-by shell ${stdenv.shell} \
+        --subst-var-by hoogle ${hoogle}
+    chmod +x $out/bin/hoogle
+  '';
+
+  meta = {
+    description = "A local Hoogle database";
+    platforms = ghc.meta.platforms;
+    hydraPlatforms = with stdenv.lib.platforms; none;
+    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+  };
+}
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 9b47b047bf6..9ee12cdde37 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -79,4 +79,10 @@ rec {
 
   triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; });
 
+  withHoogle = haskellEnv: with haskellEnv.haskellPackages;
+    import ./hoogle.nix {
+      inherit (pkgs) stdenv;
+      inherit hoogle rehoo ghc;
+      packages = haskellEnv.paths;
+    };
 }
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 4362bacb9ee..740047e2c27 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, ghc, llvmPackages, packages, buildEnv, makeWrapper
 , ignoreCollisions ? false, withLLVM ? false
 , postBuild ? ""
+, haskellPackages
 }:
 
 # This wrapper works only with GHC 6.12 or later.
@@ -94,7 +95,9 @@ buildEnv {
     ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"}
     $out/bin/${ghcCommand}-pkg check
   '' + postBuild;
-} // {
-  preferLocalBuild = true;
-  inherit (ghc) version meta;
+  passthru = {
+    preferLocalBuild = true;
+    inherit (ghc) version meta;
+    inherit haskellPackages;
+  };
 }

From ffcd8acee643994dd1de65fa567e1213006e8ab7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 11 Jun 2015 13:44:57 -0700
Subject: [PATCH 1043/2322] nixos/pulseaudio: Fix description

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

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index bd010738500..2ebc6126055 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -81,7 +81,10 @@ in {
       support32Bit = mkOption {
         type = types.bool;
         default = false;
-        description = "no";
+        description = ''
+          Whether to include the 32-bit pulseaudio libraries in the systemn or not.
+          This is only useful on 64-bit systems and currently limited to x86_64-linux.
+        '';
       };
 
       configFile = mkOption {

From 776608a332656d970fcdebb9103f3f8be2a30dac Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 10 Jun 2015 13:02:16 +0200
Subject: [PATCH 1044/2322] aha: remove default GitHub downloadPage

---
 pkgs/tools/text/aha/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix
index a0be19607ea..4ae8048623c 100644
--- a/pkgs/tools/text/aha/default.nix
+++ b/pkgs/tools/text/aha/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
       aha takes ANSI SGR-coloured input and produces W3C-conformant HTML code.
     '';
     homepage = https://github.com/theZiz/aha;
-    downloadPage = https://github.com/theZiz/aha/releases;
     license = with licenses; [ lgpl2Plus mpl11 ];
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];

From 21569371662a891b0837257508a3cf1c7cc1dd66 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 12 Jun 2015 00:17:11 +0200
Subject: [PATCH 1045/2322] include-what-you-use 3.6 -> 0.4 (sic)

Not a downgrade. Upstream's weird.
---
 .../analysis/include-what-you-use/default.nix  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix
index 9a8df0f4690..36164bffebf 100644
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, cmake, llvmPackages_35 }:
+{ stdenv, fetchurl, cmake, llvmPackages_36 }:
 
-let version = "3.5"; in with llvmPackages_35;
-stdenv.mkDerivation rec {
+let
+  version = "0.4";
+  llvmPackages = llvmPackages_36;
+in stdenv.mkDerivation rec {
   name = "include-what-you-use-${version}";
 
   src = fetchurl {
-    sha256 = "1wfl78wkg8m2ssjnkb2rwcqy35nhc8fa63mk3sa60jrshpy7b15w";
+    sha256 = "19pwhgwvfr86n8ks099p9r02v7zh8d3qs7g7snzkhpdgq1azww85";
     url = "${meta.homepage}/downloads/${name}.src.tar.gz";
   };
 
@@ -19,14 +21,16 @@ stdenv.mkDerivation rec {
       actually needed for this file (for both .cc and .h files), and by
       replacing #includes with forward-declares when possible.
     '';
-    homepage = http://include-what-you-use.com;
+    homepage = http://include-what-you-use.org;
     license = licenses.bsd3;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ clang cmake llvm ];
+  buildInputs = with llvmPackages; [ clang llvm ];
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}";
 
-  cmakeFlags = [ "-DLLVM_PATH=${llvm}" ];
   enableParallelBuilding = true;
 }

From db1054b61639b00b853d04a4a8b61120bc95ee4c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 11 Jun 2015 17:34:51 -0700
Subject: [PATCH 1046/2322] isl: Remove the default version to keep it in sync

---
 pkgs/development/libraries/isl/default.nix | 24 ----------------------
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 pkgs/development/libraries/isl/default.nix

diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix
deleted file mode 100644
index 5fa009277e1..00000000000
--- a/pkgs/development/libraries/isl/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, gmp }:
-
-stdenv.mkDerivation rec {
-  name = "isl-0.14";
-
-  src = fetchurl {
-    url = "http://isl.gforge.inria.fr/${name}.tar.bz2";
-    sha256 = "0dlg4b85nw4w534525h0fvb7yhb8i4am8kskhmm0ym7qabzh4g3y";
-  };
-
-  buildInputs = [ gmp ];
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-
-  meta = {
-    homepage = http://www.kotnet.org/~skimo/isl/;
-    license = stdenv.lib.licenses.lgpl21;
-    description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1e8d9e37f0..59d463a90d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1846,7 +1846,7 @@ let
 
   ised = callPackage ../tools/misc/ised {};
 
-  isl = callPackage ../development/libraries/isl { };
+  isl = isl_0_14;
   isl_0_11 = callPackage ../development/libraries/isl/0.11.1.nix { };
   isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { };
   isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { };

From 29db05132b5e0921e3fae35d62c30634e85a271f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 11 Jun 2015 19:35:35 -0500
Subject: [PATCH 1047/2322] pythonPackages.cvxopt: build with openblas

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c05aff22a5d..cb649a2ec97 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1011,7 +1011,12 @@ let
       sha256 = "f856ea2e9e2947abc1a6557625cc6b0e45228984f397a90c420b2f468dc4cb97";
     };
     doCheck = false;
-    buildInputs = with pkgs; [ liblapack blas ];
+    buildInputs = with pkgs; [ openblasCompat ];
+    preConfigure = ''
+      export CVXOPT_BLAS_LIB_DIR=${pkgs.openblasCompat}/lib
+      export CVXOPT_BLAS_LIB=openblas
+      export CVXOPT_LAPACK_LIB=openblas
+    '';
     meta = {
       homepage = "http://cvxopt.org/";
       description = "Python Software for Convex Optimization";

From 370fc79b948438694dc4767570afe43c5b1fb7c4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 11 Jun 2015 17:35:53 -0700
Subject: [PATCH 1048/2322] gmp: Use version 6 as the default

---
 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 59d463a90d5..0d3804c8c2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6191,7 +6191,8 @@ let
 
   gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions
   gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { };
-  gmp = gmp5;
+  gmp6 = callPackage ../development/libraries/gmp/6.x.nix { };
+  gmp = gmp6;
   gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; });
 
   #GMP ex-satellite, so better keep it near gmp

From 6cc817cf516159efa48f5322bfb1bf258ae01501 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Jun 2015 03:22:50 +0300
Subject: [PATCH 1049/2322] mueval: add patch until release is pushed to
 Hackage

---
 .../haskell-modules/configuration-common.nix  |  2 +-
 .../configuration-ghc-7.10.x.nix              |  5 --
 .../haskell-modules/mueval-fix.patch          | 90 +++++++++++++++++++
 3 files changed, 91 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/mueval-fix.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7835ed7d96f..e1f45351a78 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -760,7 +760,7 @@ self: super: {
   dyre = appendPatch super.dyre ./dyre-nix.patch;
 
   # https://github.com/gwern/mueval/issues/9
-  mueval = markBrokenVersion "0.9.1.1" super.mueval;
+  mueval = appendPatch super.mueval ./mueval-fix.patch;
 
   # Test suite won't compile against tasty-hunit 0.9.x.
   zlib = dontCheck super.zlib;
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 335b133f555..28c74f61925 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -116,11 +116,6 @@ self: super: {
   # https://github.com/kazu-yamamoto/unix-time/issues/30
   unix-time = dontCheck super.unix-time;
 
-  # Until the changes have been pushed to Hackage
-  mueval = appendPatch super.mueval (pkgs.fetchpatch {
-    url = "https://github.com/gwern/mueval/commit/c41aa40ed63b74c069d1e4e3caa8c8d890cde960.patch";
-    sha256 = "0h1lx4z15imq009k0qmwkn5l3hmigw463ahvwffdnszi2n618kpg";
-  });
   present = appendPatch super.present (pkgs.fetchpatch {
     url = "https://github.com/chrisdone/present/commit/6a61f099bf01e2127d0c68f1abe438cd3eaa15f7.patch";
     sha256 = "1vn3xm38v2f4lzyzkadvq322f3s2yf8c88v56wpdpzfxmvlzaqr8";
diff --git a/pkgs/development/haskell-modules/mueval-fix.patch b/pkgs/development/haskell-modules/mueval-fix.patch
new file mode 100644
index 00000000000..62a8f8f61e2
--- /dev/null
+++ b/pkgs/development/haskell-modules/mueval-fix.patch
@@ -0,0 +1,90 @@
+diff --git a/Mueval/ArgsParse.hs b/Mueval/ArgsParse.hs
+index 05c8fd9..0c32e27 100644
+--- a/Mueval/ArgsParse.hs
++++ b/Mueval/ArgsParse.hs
+@@ -1,10 +1,9 @@
++{-# LANGUAGE CPP #-}
+ module Mueval.ArgsParse (Options(..), interpreterOpts, getOptions) where
+ 
+ import Control.Monad (liftM)
+ import System.Console.GetOpt
+ 
+-import qualified Codec.Binary.UTF8.String as Codec (decodeString)
+-
+ import Mueval.Context (defaultModules, defaultPackages)
+ 
+ -- | See the results of --help for information on what each option means.
+@@ -98,4 +97,11 @@ header = "Usage: mueval [OPTION...] --expression EXPRESSION..."
+ -- | Just give us the end result options; this parsing for
+ --   us. Bonus points for handling UTF.
+ getOptions :: [String] -> Either (Bool, String) Options
+-getOptions = interpreterOpts . map Codec.decodeString
+\ No newline at end of file
++getOptions = interpreterOpts . map decodeString
++
++decodeString :: String -> String
++#if __GLASGOW_HASKELL__ >= 702
++decodeString = id
++#else
++decodeString = Codec.decodeString
++#endif
+diff --git a/Mueval/Context.hs b/Mueval/Context.hs
+index 78925cf..548514c 100644
+--- a/Mueval/Context.hs
++++ b/Mueval/Context.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ module Mueval.Context (
+   cleanModules,
+   defaultModules,
+@@ -32,7 +33,9 @@ defaultModules = ["Prelude",
+                   "Control.Monad.Error",
+                   "Control.Monad.Fix",
+                   "Control.Monad.Identity",
++#if !MIN_VERSION_base(4,7,0)
+                   "Control.Monad.Instances",
++#endif
+                   "Control.Monad.RWS",
+                   "Control.Monad.Reader",
+                   "Control.Monad.State",
+diff --git a/Mueval/Interpreter.hs b/Mueval/Interpreter.hs
+index 29b771f..6c39482 100644
+--- a/Mueval/Interpreter.hs
++++ b/Mueval/Interpreter.hs
+@@ -1,4 +1,5 @@
+ {-# LANGUAGE PatternGuards #-}
++{-# LANGUAGE FlexibleContexts #-}
+ -- TODO: suggest the convenience functions be put into Hint proper?
+ module Mueval.Interpreter where
+ 
+@@ -12,8 +13,6 @@ import System.Exit (exitFailure)
+ import System.FilePath.Posix (takeFileName)
+ import qualified Control.Exception.Extensible as E (evaluate,catch,SomeException(..))
+ 
+-import qualified System.IO.UTF8 as UTF (putStrLn)
+-
+ import Language.Haskell.Interpreter (eval, set, reset, setImportsQ, loadModules, liftIO,
+                                      installedModulesInScope, languageExtensions,
+                                      typeOf, setTopLevelModules, runInterpreter, glasgowExtensions,
+@@ -100,7 +99,7 @@ mvload lfl = do canonfile <- makeRelativeToCurrentDirectory lfl
+ -- flooding. Lambdabot has a similar limit.
+ sayIO :: String -> IO ()
+ sayIO str = do (out,b) <- render 1024 str
+-               UTF.putStrLn out
++               putStrLn out
+                when b exitFailure
+ 
+ -- | Oh no, something has gone wrong. If it's a compilation error pretty print
+diff --git a/mueval.cabal b/mueval.cabal
+index 3f9406d..b86d796 100644
+--- a/mueval.cabal
++++ b/mueval.cabal
+@@ -32,7 +32,7 @@ library
+         exposed-modules:     Mueval.Parallel, Mueval.Context, Mueval.Interpreter,
+                              Mueval.ArgsParse, Mueval.Resources
+         build-depends:       base>=4 && < 5, containers, directory, mtl>2, filepath, unix, process,
+-                             hint>=0.3.1, show>=0.3, utf8-string, Cabal, extensible-exceptions, simple-reflect
++                             hint>=0.3.1, show>=0.3, Cabal, extensible-exceptions, simple-reflect
+         ghc-options:         -Wall -static
+ 
+ executable mueval-core

From bb6e504d6b75b9e21beed9a55037ac2ff9a9427c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Jun 2015 03:30:47 +0300
Subject: [PATCH 1050/2322] thermald: update and adopt

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

diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index 86d121f0c22..85bc40caa27 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -1,13 +1,16 @@
-{ stdenv, fetchurl, unzip, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus_glib, libxml2 }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus_glib, libxml2 }:
 
 stdenv.mkDerivation rec {
-  version = "1.3";
+  version = "1.4.2";
   name = "thermald-${version}";
-  src = fetchurl {
-    url = "https://github.com/01org/thermal_daemon/archive/v${version}.zip";
-    sha256 = "0jqxc8vvd4lx4z0kcdisk8lpdf823nysvjcfjxlr5wzla1xysqwc";
+  src = fetchFromGitHub {
+    owner = "01org";
+    repo = "thermal_daemon";
+    rev = "v${version}";
+    sha256 = "051119wb0n31rn15pnx56d1r58a2d1fmj030q991mcv7pcy6c8mg";
   };
-  buildInputs = [ unzip autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ];
+
+  buildInputs = [ autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ];
 
   patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am'';
 
@@ -25,12 +28,11 @@ stdenv.mkDerivation rec {
   preInstall = "sysconfdir=$out/etc";
 
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Thermal Daemon";
-    longDescription = ''
-         Thermal Daemon
-    '';
     homepage = https://01.org/linux-thermal-daemon;
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
   };
 }

From 9bb5e7edbdbe4631a4129f3fc0da2d52c30cd9bd Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Jun 2015 03:39:48 +0300
Subject: [PATCH 1051/2322] generate-cran-packages: make executable

---
 pkgs/development/r-modules/generate-cran-packages.R | 2 ++
 1 file changed, 2 insertions(+)
 mode change 100644 => 100755 pkgs/development/r-modules/generate-cran-packages.R

diff --git a/pkgs/development/r-modules/generate-cran-packages.R b/pkgs/development/r-modules/generate-cran-packages.R
old mode 100644
new mode 100755
index 3510a2fa92c..ad6c103513f
--- a/pkgs/development/r-modules/generate-cran-packages.R
+++ b/pkgs/development/r-modules/generate-cran-packages.R
@@ -1,3 +1,5 @@
+#!/usr/bin/env Rscript
+
 library(data.table)
 library(parallel)
 cl <- makeCluster(10)

From 29779ae6425e2e6d5f4cbe0671243b6b85e853b4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Jun 2015 03:41:13 +0300
Subject: [PATCH 1052/2322] R: regenerate CRAN packages

---
 pkgs/development/r-modules/cran-packages.nix | 1035 ++++++++++--------
 1 file changed, 583 insertions(+), 452 deletions(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 79770b6a620..77c075397e1 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -17,9 +17,9 @@ ADDT = derive { name="ADDT"; version="1.0"; sha256="1jx7rxi0yfn34pf3cf9zpf434rap
 ADGofTest = derive { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; };
 ADM3 = derive { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; };
 ADPclust = derive { name="ADPclust"; version="0.6.3"; sha256="0lr4zkjhqr9azqxnxpxp9i0ppn8wi8ndb61ki7h2dzfgv27fingk"; depends=[dplyr cluster fields knitr]; };
-AER = derive { name="AER"; version="1.2-3"; sha256="0823zjpl0b7fzhszi28lg1paa41vbxq2xpjil1d4f6dxdysalxlx"; depends=[car lmtest sandwich survival zoo Formula]; };
+AER = derive { name="AER"; version="1.2-4"; sha256="0cfhnh6ijwvbywk6falfq852jgx969v35j2l1q3cghwj9yggapbh"; depends=[car lmtest sandwich survival zoo Formula]; };
 AFLPsim = derive { name="AFLPsim"; version="0.3-4"; sha256="0xqp1d3cn8rcrsx0yipqh0k4xynv446acxpcammbflsz01xsgx9v"; depends=[adegenet introgress]; };
-AGD = derive { name="AGD"; version="0.32"; sha256="1jjkclqylh43vm1bj1g4cml7a84sxdl94kmhxgmk04rdkmgf8c47"; depends=[gamlss gamlss_dist]; };
+AGD = derive { name="AGD"; version="0.35"; sha256="1dk8m3zqvapwhz0677d3b2cbrin14p9adn5annzgjrxgw7ms4mg0"; depends=[gamlss gamlss_dist]; };
 AGSDest = derive { name="AGSDest"; version="2.2"; sha256="00kf786i72bc4a80qswq1iazwqi709pxvzadgfih511plgir6ik2"; depends=[ldbounds]; };
 AICcmodavg = derive { name="AICcmodavg"; version="2.0-3"; sha256="1a9jbf3vd77hsf98smjgqchhkc9z8qqp12c1mflln3l0pxx0vk8q"; depends=[lattice MASS Matrix nlme unmarked VGAM xtable]; };
 AID = derive { name="AID"; version="1.5"; sha256="0fpgq2ahl0mdj0sb0p39z2ksslsiwm3hma8d09jmggi3yjbrgqq7"; depends=[MASS tseries nortest]; };
@@ -34,11 +34,13 @@ AMGET = derive { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy4
 AMOEBA = derive { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[snowfall rlecuyer spdep]; };
 AMORE = derive { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; };
 AOfamilies = derive { name="AOfamilies"; version="1.01"; sha256="0v3b83k12lsrdcrkjl2ff38d0g8sbrnm5pmm9xphyrk3lfgap76k"; depends=[lqmm quantreg]; };
+APSIM = derive { name="APSIM"; version="0.8.0"; sha256="0ph4wl6c9jy2w0w3yh8ba12nqbsldicpn2aii675vrvdrx36vwn7"; depends=[data_table lubridate stringr plyr sirad]; };
 APSIMBatch = derive { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; };
 AR1seg = derive { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; };
 ARPobservation = derive { name="ARPobservation"; version="1.1"; sha256="1cdhn11jf1nf03jyvs17ygmjq9pb5rvmyyrq9fp7ifmvcgbkwsms"; depends=[]; };
+ARTIVA = derive { name="ARTIVA"; version="1.2.3"; sha256="1jdvsslc8parz7wibcv51fx62brl2mc6i482hz43j1npsms2z1hl"; depends=[MASS igraph gplots]; };
 ARTP = derive { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; };
-ARTool = derive { name="ARTool"; version="0.9.3"; sha256="188k3whgm93jm2kpvh711d4l73gickn9iwidz95srwdcdlf9cf1y"; depends=[lme4 car plyr pbkrtest]; };
+ARTool = derive { name="ARTool"; version="0.9.5"; sha256="1wfan4v3498libqgjdgn4l4ihf1khp3smj0lmyxd7vb4iaawlzci"; depends=[lme4 car plyr pbkrtest]; };
 ASMap = derive { name="ASMap"; version="0.4-1"; sha256="0nslmzhf99vl1zkp702xgcrd36xvis45yb5b0hx0mvf4dfv233lm"; depends=[qtl gtools fields lattice]; };
 ASPBay = derive { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp Rcpp RcppArmadillo]; };
 ATE = derive { name="ATE"; version="0.2.0"; sha256="1i46ivb7q61kq11z9v1rlnwad914nsdjcz9bagqx17vjk160mc0a"; depends=[]; };
@@ -68,13 +70,14 @@ AnglerCreelSurveySimulation = derive { name="AnglerCreelSurveySimulation"; versi
 AnnotLists = derive { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; };
 AntWeb = derive { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[rjson plyr assertthat httr leafletR]; };
 AnthropMMD = derive { name="AnthropMMD"; version="0.9.9"; sha256="10wn0fkcli5yz3fhngsz8sg1mfllqkvjrpjggd9qynay2zrpiw1n"; depends=[tcltk2]; };
-Anthropometry = derive { name="Anthropometry"; version="1.1"; sha256="1yqdps5n07jl05nv7136jwhfndn01vim2kx9s76mk4alvsw7s8ls"; depends=[shapes rgl archetypes nnls depth FNN ICGE cluster biclust]; };
-ApacheLogProcessor = derive { name="ApacheLogProcessor"; version="0.1"; sha256="0wdf9438c5rww0fm5k44ahvivg95vzn3dpnhf4mhpvrjd1am546z"; depends=[foreach doParallel]; };
+Anthropometry = derive { name="Anthropometry"; version="1.2"; sha256="15689jy85kf8j9w8yhffjfjw3lsdlv2w99za32p33shp32f3rvjz"; depends=[shapes rgl archetypes nnls depth FNN ICGE cluster biclust]; };
+ApacheLogProcessor = derive { name="ApacheLogProcessor"; version="0.1.5"; sha256="1xnx6syn365s4w4pks7xq6rng7hk30xln8hvszxwhwfnkzr8qqn2"; depends=[foreach doParallel]; };
 AppliedPredictiveModeling = derive { name="AppliedPredictiveModeling"; version="1.1-6"; sha256="004d2k3mhl45inb7kx1ph8xc8h9bgm7f7l3prmvqrl5792400cn4"; depends=[CORElearn MASS plyr reshape2]; };
 AquaEnv = derive { name="AquaEnv"; version="1.0-3"; sha256="1hkygw09w70im9f6l6q5yxk86mdl5pkczqfqrwc4wl1yhz7z1gjb"; depends=[minpack_lm deSolve]; };
 ArArRedux = derive { name="ArArRedux"; version="0.1"; sha256="1fgll399plraijbh1xrhf1nmc308daqhhsi5krq2lm7q2cn584pc"; depends=[]; };
 ArDec = derive { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; };
 ArfimaMLM = derive { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[lme4 fractal fracdiff]; };
+ArgumentCheck = derive { name="ArgumentCheck"; version="0.9.0"; sha256="1gyc6bx6sfp7k8cp43l6fic4rfn729h6kl5zqs3ypf4425s7jm3f"; depends=[]; };
 ArrayBin = derive { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[]; };
 AssetPricing = derive { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[polynom deSolve]; };
 AssotesteR = derive { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; };
@@ -83,7 +86,7 @@ AtelieR = derive { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58
 AtmRay = derive { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; };
 AutoSEARCH = derive { name="AutoSEARCH"; version="1.5"; sha256="1s2ldhxijd8n9ba78faik6gn4f07pdzksy0030pqyafxlr3v1qdj"; depends=[zoo lgarch]; };
 B2Z = derive { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[numDeriv coda mvtnorm]; };
-BACA = derive { name="BACA"; version="0.99.0"; sha256="19n6ajq6szpzwj36lfg7wrh2j3d3ikn13a1j3g2xvfy275qdmmm4"; depends=[ggplot2 rJava]; };
+BACA = derive { name="BACA"; version="1.3"; sha256="1vbip7wbzix1s2izbm4058wmwar7w5rv3q8bmj9pm7hcapfi19k0"; depends=[ggplot2 rJava]; };
 BACCO = derive { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[emulator calibrator approximator]; };
 BACprior = derive { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[mvtnorm leaps boot]; };
 BAEssd = derive { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; };
@@ -113,7 +116,7 @@ BEST = derive { name="BEST"; version="0.2.2"; sha256="160lvrd0zjm1lr8llra6lyz3qs
 BGLR = derive { name="BGLR"; version="1.0.4"; sha256="1bvk8iifvrcvnb0f1k3v9xxajljsz79ck95191p8alnda64cz0zf"; depends=[]; };
 BGPhazard = derive { name="BGPhazard"; version="1.2.2"; sha256="1v89pjigrjkin9vsf6sa0qhwxvn1a3dy2gqwq3sd9v6y0hrld6ng"; depends=[survival]; };
 BGSIMD = derive { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; };
-BH = derive { name="BH"; version="1.55.0-3"; sha256="0p3xbbnj4l844sgg59ply5ng8z42lbs6z8cghsr3bxbbv4w9lkbs"; depends=[]; };
+BH = derive { name="BH"; version="1.58.0-1"; sha256="17rnwyw9ib2pvm60iixzkbz7ff4fslpifp1nlx4czp42hy67kqpf"; depends=[]; };
 BHH2 = derive { name="BHH2"; version="2012.04-0"; sha256="10ixvjpkqamlddrndpnw5gsdm4gdhp693jdvc0f774ngmf32rbaa"; depends=[]; };
 BHMSMAfMRI = derive { name="BHMSMAfMRI"; version="1.0"; sha256="0j5ivknsr441clgm0b95f2rz4pr29ixvw3dgsi8nb0ffh52dgz7q"; depends=[fmri AnalyzeFMRI wavethresh]; };
 BIFIEsurvey = derive { name="BIFIEsurvey"; version="1.2-6"; sha256="1fin5dr1xxr617i4ysfx39gaw6ygbcm4h7j1l38kqnfz18hn6xsq"; depends=[Rcpp miceadds mitools TAM Rcpp RcppArmadillo]; };
@@ -127,11 +130,11 @@ BMS = derive { name="BMS"; version="0.3.3"; sha256="1yj9vi8jvhkwpcjkclf0zbah0day
 BMhyd = derive { name="BMhyd"; version="1.2-2"; sha256="09gb1pq9y3gq9avpaqrlxdsm9iqsxpbnr0bg2mw1vkhc0d5z8zv7"; depends=[corpcor numDeriv]; };
 BNDataGenerator = derive { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; };
 BNPTSclust = derive { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[mvtnorm MASS]; };
-BNPdensity = derive { name="BNPdensity"; version="2013.8"; sha256="1qlhav764ji289kcibbmqjj62mmxiw3zsiwjz1gkifzgpmzyar85"; depends=[]; };
-BNSP = derive { name="BNSP"; version="1.0.2"; sha256="0hbrx02mybfrzfab5g7kwi6g68jdzj2dc69zxkn3hpyf4rqwbw4x"; depends=[]; };
+BNPdensity = derive { name="BNPdensity"; version="2015.5"; sha256="0jgdc9dayc57y77bb2yjcn1pb5ahrvbrsmyjkhyl4365sn5njzl8"; depends=[]; };
+BNSP = derive { name="BNSP"; version="1.0.3"; sha256="1q7nxl1lx57dzb5yfpb0966ylyl15x22y9r78r6pxrprrbsnv931"; depends=[]; };
 BOG = derive { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[hash DIME]; };
 BOIN = derive { name="BOIN"; version="1.1"; sha256="1ffr6w9ml0mkffgg1vds8fmf8ww7rs375pxk2dqv9nlb9061m97r"; depends=[]; };
-BRugs = derive { name="BRugs"; version="0.8-3"; sha256="1qjwm6qizg70nvpl5p2yx65ynghazchqw7d2iadhdjz7dd293sqi"; depends=[coda]; };
+BRugs = derive { name="BRugs"; version="0.8-4"; sha256="0bd5m4nfj25bhjy0d96kna50h5a5a2mdxrl21c1kvxmiwxcx4wrs"; depends=[coda]; };
 BSDA = derive { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; };
 BSGS = derive { name="BSGS"; version="1.0"; sha256="11r7bx9ax84iv3gam02p1hg174ni3d3gv6yj64n0gp2gaj438hv7"; depends=[MASS pscl plyr]; };
 BSGW = derive { name="BSGW"; version="0.9"; sha256="0df5d0d0kfvwavxbxra36jjs9044q1szq1xm37dvh4wfvvv6igmb"; depends=[survival]; };
@@ -156,7 +159,7 @@ BayesCR = derive { name="BayesCR"; version="2.0"; sha256="0cafind5vz81ryw1c7324h
 BayesComm = derive { name="BayesComm"; version="0.1-0"; sha256="17hnq4z451g2j3p73awllihhwsdy3grh6ki3qy9bkr064wvzbvcj"; depends=[Rcpp RcppArmadillo coda Rcpp RcppArmadillo]; };
 BayesDA = derive { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; };
 BayesFactor = derive { name="BayesFactor"; version="0.9.11-1"; sha256="0vq656q38vlf0ba8g23psk8as1y48y6s8yrvqrppbjx5d9wlm9wv"; depends=[coda Matrix pbapply mvtnorm stringr gtools MatrixModels Rcpp Rcpp RcppEigen]; };
-BayesGESM = derive { name="BayesGESM"; version="1.3"; sha256="0lw593hqava5bhr8nfbh3qw63ilfr06zh58p2rw3nnv1ldrrzncv"; depends=[truncdist GIGrvg normalp Formula]; };
+BayesGESM = derive { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[GIGrvg normalp Formula]; };
 BayesLCA = derive { name="BayesLCA"; version="1.7"; sha256="0lsqgjqal9092v1wr07p8g5cqm24k2d80sp7hlr7r1xknakmm1b6"; depends=[e1071 coda fields nlme MCMCpack]; };
 BayesLogit = derive { name="BayesLogit"; version="0.5.1"; sha256="0nr215wzhqlfi32617mmqb6i3w5x1kh5fiy68k0xzdqjsyjr65m0"; depends=[]; };
 BayesMed = derive { name="BayesMed"; version="1.0.1"; sha256="1ysc7sh0drqxbisi2dz6gj4jlw6qsd879bbhr5pra7nxgmk4h650"; depends=[R2jags QRM polspline MCMCpack]; };
@@ -191,6 +194,7 @@ BinNonNor = derive { name="BinNonNor"; version="1.2"; sha256="15bzpi2q2428661v8z
 BinNor = derive { name="BinNor"; version="2.0"; sha256="0c1qy93ccgzg8g25wm1j4ninsa0ck4y3jjh25za92w070cqhkd8m"; depends=[mvtnorm corpcor psych Matrix]; };
 BinOrdNonNor = derive { name="BinOrdNonNor"; version="1.0"; sha256="1x231xxdiyp6nwj2dx9w1shi5w6mdyzg43g5zc4r2bpvzccgj0l0"; depends=[GenOrd OrdNor BB corpcor Matrix mvtnorm]; };
 Binarize = derive { name="Binarize"; version="1.0"; sha256="1yfr87s1hgjhc8ah81sfrgr1hpp0vd5clqayrz1i698h1c34amkh"; depends=[diptest]; };
+BinaryEPPM = derive { name="BinaryEPPM"; version="1.0"; sha256="088yg07966g09gv9hznhwfdka4yk0c9j0viy9x4ldmhxl9w9scv5"; depends=[Formula expm numDeriv]; };
 BioGeoBEARS = derive { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[rexpokit cladoRcpp ape phylobase optimx FD xtable plotrix gdata]; };
 BioMark = derive { name="BioMark"; version="0.4.2"; sha256="17r4q2migmdk2vqfbr69q07cgdzwpjgs3ijmnm42srs5d3brw8cr"; depends=[pls glmnet MASS st]; };
 BioPhysConnectoR = derive { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[snow matrixcalc]; };
@@ -213,7 +217,7 @@ BoomSpikeSlab = derive { name="BoomSpikeSlab"; version="0.5.2"; sha256="0n7kf0nk
 BootPR = derive { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; };
 Boruta = derive { name="Boruta"; version="4.0.0"; sha256="1r7bl4ab6swhks9cijhqn9gdhp2vjfhwb65fi5rzz0yvzxx97xi8"; depends=[randomForest rFerns]; };
 BradleyTerry2 = derive { name="BradleyTerry2"; version="1.0-6"; sha256="1080q7fw4yfl2y0jh3w2xz342i5yhhhavq40i3902bsmjj8g531d"; depends=[lme4 brglm gtools]; };
-BrailleR = derive { name="BrailleR"; version="0.18-1"; sha256="0v5y5v6b52kh4146bbhwpsnb5p435dk5nhv28sxi7r89fixbc20q"; depends=[nortest xtable moments knitr gridGraphics gridSVG]; };
+BrailleR = derive { name="BrailleR"; version="0.20"; sha256="1cfg5jfhal77n1pmwcj0awhnprqw6bha7q7z3s2m3q4g1ar49shv"; depends=[knitr gridGraphics gridSVG moments nortest rmarkdown xtable]; };
 Brobdingnag = derive { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; };
 Brq = derive { name="Brq"; version="1.0"; sha256="0m01qw0mh9za1gx1vkbyvwny4k5fvmvs9dbp0504q8jqfqf4l1vj"; depends=[quantreg truncnorm]; };
 BsMD = derive { name="BsMD"; version="2013.0718"; sha256="1yvazqlbmm221r7nkhrhi309gkk6vx7ji5xlvf07klya2zg20gcj"; depends=[]; };
@@ -235,14 +239,14 @@ CARrampsOcl = derive { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1
 CAvariants = derive { name="CAvariants"; version="2.1"; sha256="105bj6r6i7xz95lr5g4ld9xfgyq1dn15lw117jivx76z3k2zpi59"; depends=[]; };
 CBPS = derive { name="CBPS"; version="0.9"; sha256="08pc50fndpx6xvxkvqdklrp6v98w2j387frq08nlglcbfjk22i6x"; depends=[MASS MatchIt nnet numDeriv]; };
 CCA = derive { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; };
-CCAGFA = derive { name="CCAGFA"; version="1.0.4"; sha256="159gh0mx4da1gpqf5swyhg8ksclpi59p4zmzsiq5ywfpy5cjr71z"; depends=[]; };
+CCAGFA = derive { name="CCAGFA"; version="1.0.6"; sha256="19il9i7ybjg2qchmpjwkyx48l4fl7lb1zdkfpiaw3fng6ndasp1k"; depends=[]; };
 CCM = derive { name="CCM"; version="1.1"; sha256="0gya1109w61ia6cq3jg2z5gmvjkv9xg71l2rxhrrf6bx1c2nsrq6"; depends=[]; };
 CCP = derive { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; };
 CCTpack = derive { name="CCTpack"; version="1.4"; sha256="09s2ysqsz158lrah44rwvs3nlhyqlvwcj6aar2p79flf4xxdwsvk"; depends=[R2jags rjags psych mvtnorm polycor MASS]; };
 CCpop = derive { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; };
 CDFt = derive { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; };
 CDLasso = derive { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; };
-CDM = derive { name="CDM"; version="4.2-12"; sha256="18ix2l3mlk9vzv7iks16mdi4h0194bfjcvsxmya5219dfmw5vqfz"; depends=[mvtnorm Rcpp psych MASS polycor sfsmisc plyr WrightMap lattice Rcpp RcppArmadillo]; };
+CDM = derive { name="CDM"; version="4.3-0"; sha256="0xryd4l0fqa2m39zcgd6jyi6shlqxc98qgwdpg38csqmbpny4bvm"; depends=[mvtnorm Rcpp psych MASS polycor sfsmisc plyr lattice Rcpp RcppArmadillo]; };
 CDNmoney = derive { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; };
 CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[MASS mvtnorm igraph]; };
 CEC = derive { name="CEC"; version="0.9.3"; sha256="05cgd281p0hxkni4nqb0d4l71aah3f3s6jxdnzgw8lqxaxz4194i"; depends=[]; };
@@ -252,7 +256,7 @@ CFC = derive { name="CFC"; version="0.7.0"; sha256="1sl0gsx4gcbcf7bc6xf84g3lx58z
 CGP = derive { name="CGP"; version="2.0-2"; sha256="1mggv3c8525vbdfdc3yhpp4vm4zzdvbwyxim29zj0lzwjf9fkgqk"; depends=[]; };
 CHAT = derive { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DPpackage]; };
 CHCN = derive { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; };
-CHNOSZ = derive { name="CHNOSZ"; version="1.0.3.1"; sha256="0cmirnb8jkaxnscpkwm2a8yyzl9zaf3q323avpgg7fwwhr6c1l19"; depends=[]; };
+CHNOSZ = derive { name="CHNOSZ"; version="1.0.5"; sha256="19kh4fnf6myn072hrjcibw7bhm4qbjp039vdqjq1qx3bmz28an1k"; depends=[]; };
 CHsharp = derive { name="CHsharp"; version="0.3"; sha256="0aa9v6yih6qmqsmc8zsl8k1wqsp3sp2bfwri3d37k06vfj7gwbh0"; depends=[scatterplot3d KernSmooth]; };
 CIDnetworks = derive { name="CIDnetworks"; version="0.8.1"; sha256="0k75mdlvm0rccag42pnhsni1kihpqsnj5bsrwlj7hdf7n8k1xb77"; depends=[mvtnorm msm Rcpp igraph numDeriv pbivnorm MASS Rcpp]; };
 CIFsmry = derive { name="CIFsmry"; version="1.0.1"; sha256="118vyiiy4iqn86n9xf84n5hrwrhzhr1mdsmyg9sm6qq6dm7zg6la"; depends=[]; };
@@ -265,6 +269,7 @@ CLSOCP = derive { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphj
 CMC = derive { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; };
 CMF = derive { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp Rcpp]; };
 CMPControl = derive { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; };
+CMplot = derive { name="CMplot"; version="1.0.1"; sha256="04pkpv0sl0aijp6b4sgn27bq54cn95zazikjlx5pwiyc8p0bzz86"; depends=[]; };
 CNOGpro = derive { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; };
 CNVassoc = derive { name="CNVassoc"; version="2.1"; sha256="0gwyhipkvvnivdahr9mkj1b8j9wzg6g8mcsvk5rq28xdzrskz0i8"; depends=[CNVassocData mixdist mclust survival]; };
 CNVassocData = derive { name="CNVassocData"; version="1.0"; sha256="17r3b1w9i9v6llawnjnrjns6jkd82m2cn9c90aif8j0bf4dmgdli"; depends=[]; };
@@ -275,7 +280,7 @@ COMPoissonReg = derive { name="COMPoissonReg"; version="0.3.4"; sha256="1mf2q7ph
 COP = derive { name="COP"; version="1.0-2"; sha256="1gynknplvx97hjhi7adsgq9r9lqismch1q1pqvgmz0x1wkg4jj40"; depends=[dr MASS]; };
 COPASutils = derive { name="COPASutils"; version="0.1.6"; sha256="0vi7x14ma3i4gabdb04byr4ba0209lklj3d5ql2f2vaxyb4a1hj9"; depends=[ggplot2 reshape2 dplyr kernlab stringr knitr]; };
 CORE = derive { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; };
-CORElearn = derive { name="CORElearn"; version="0.9.45"; sha256="0j2lhzikh96ky4n52x0rwhknx5zdk9h78x9ygzfpr6p9x80w850f"; depends=[cluster rpart]; };
+CORElearn = derive { name="CORElearn"; version="0.9.46"; sha256="1jwc3sqkbhhmn67x44iyqzvpjsnbrwhgq6yam6h6gf086nv0lmic"; depends=[cluster rpart]; };
 CORM = derive { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster]; };
 COSINE = derive { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[MASS genalg]; };
 COUNT = derive { name="COUNT"; version="1.3.2"; sha256="1lb67gwznva5p046f4gjjisip5a12icp7d2g1ipizixw99c5lll8"; depends=[msme sandwich MASS]; };
@@ -288,7 +293,6 @@ CRAC = derive { name="CRAC"; version="1.0"; sha256="0vnqmmmwakx5jnzqp20dng35p7rv
 CRF = derive { name="CRF"; version="0.3-8"; sha256="0w9wfjlx6hvd07k0iszfyip0vn0ca5ax2d5g7hsg6pm2isnzap8a"; depends=[Rglpk Matrix]; };
 CRM = derive { name="CRM"; version="1.1.1"; sha256="09h6xvqc2h2gxhdhc7592z93cnw16l549pn9i26ml0f0n20hljmf"; depends=[]; };
 CRTSize = derive { name="CRTSize"; version="1.0"; sha256="1d45zx26bf0zk0piham69gvb8djqf48g6iisbldv0ds3s2hhcsin"; depends=[]; };
-CSS = derive { name="CSS"; version="1.0.2"; sha256="0p0c3gfj6p58hd4398kkpjg7rhx6wh5z6qddpqnvbm24acq7nrvh"; depends=[XML stringr]; };
 CTT = derive { name="CTT"; version="2.1"; sha256="0v8k54x9pib6hq3nz3m80g1a3p003f7bn8wnj9swwvacc90d6n44"; depends=[]; };
 CUMP = derive { name="CUMP"; version="1.0"; sha256="0dbpgm75nbd4h8rf3ca5n4mgdn3qm4yyf2d48vlihakzw6rqbpka"; depends=[]; };
 CVST = derive { name="CVST"; version="0.2-1"; sha256="17xacyi8cf37rr2xswx96qy7pwkaqq394awdlswykz3qlyzx4zx2"; depends=[kernlab Matrix]; };
@@ -298,8 +302,9 @@ CVcalibration = derive { name="CVcalibration"; version="1.0-1"; sha256="0ca582fn
 CaDENCE = derive { name="CaDENCE"; version="1.2.2"; sha256="1rbwm3s63dxd366bs7pdxl0zpv7svsfr3ayznach9bjjrnjk3z3g"; depends=[pso]; };
 Cairo = derive { name="Cairo"; version="1.5-6"; sha256="0x5xd2xq5q8a3kzmz7f9bawg3j131rhyb3s7w34acg7rd79l1935"; depends=[]; };
 CarletonStats = derive { name="CarletonStats"; version="1.1"; sha256="18pd1hi8bnbv0sdixw746xvdg9szvng422yj12mk0k50v60403xg"; depends=[]; };
-CatDyn = derive { name="CatDyn"; version="1.0-6"; sha256="07n7qwpq8b70i2f48npy0pd87w0fj5xzjg00xw53m2idikqf82pn"; depends=[optimx BB]; };
+CatDyn = derive { name="CatDyn"; version="1.1-0"; sha256="0bdixcf1iwbmjd2axi6csrzms25ghdj4r6223qhk2b54wlmbzaiz"; depends=[optimx BB]; };
 CateSelection = derive { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; };
+CausalFX = derive { name="CausalFX"; version="1.0.1"; sha256="0v0diqq9fa1v9n3v5m5shvwlgmj91cbbb78243rwib1h3pyacihf"; depends=[igraph rcdd rje]; };
 CausalGAM = derive { name="CausalGAM"; version="0.1-3"; sha256="0g68m2kxixwr7rx65r57m1n0qa161igc428zh9rj91fg6h4pdq4w"; depends=[gam]; };
 Causata = derive { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[XML R_utils rjson RMySQL RCurl stringr yaml boot foreach data_table glmnet ggplot2]; };
 CePa = derive { name="CePa"; version="0.5"; sha256="1y2q72j8bqx509i62a2x9j40rj5bkpgx4z6fwj05ibazc1441asd"; depends=[igraph snow]; };
@@ -316,6 +321,7 @@ ChemometricsWithRData = derive { name="ChemometricsWithRData"; version="0.1.3";
 ChoiceModelR = derive { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; };
 CircE = derive { name="CircE"; version="1.1"; sha256="14bja3zv9wg389m6khmsy3q12hhnfcp49rvrmw47y6fh5m7ihrz2"; depends=[]; };
 CircNNTSR = derive { name="CircNNTSR"; version="2.1"; sha256="1rl17kw6bl5xf7pgsc4im12i2kqz4a3b11vzzlb6wfl5yck6iff5"; depends=[]; };
+CircOutlier = derive { name="CircOutlier"; version="3.1.3"; sha256="103d5fbwzbj9ribl2vzrj1lxv0n3hcygjrf5k4kqm0kfnql91k2s"; depends=[CircStats circular]; };
 CircStats = derive { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa82s2qxm3xlcv6zpi578zc4pl0d7qyxqnh603s"; depends=[MASS boot]; };
 CityPlot = derive { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; };
 Ckmeans_1d_dp = derive { name="Ckmeans.1d.dp"; version="3.3.1"; sha256="0gzwcg6f3p1vr30lyniqiq4893kjxri4y2vjzh6qrldnay42kqf9"; depends=[]; };
@@ -323,12 +329,14 @@ Claddis = derive { name="Claddis"; version="0.1"; sha256="1dxsz62x856lpapw5xpvvr
 ClickClust = derive { name="ClickClust"; version="1.1.4"; sha256="17r8jzhzwqa5h04bxdcyv31jhk6c709sx5m1z53jh3yf9zmkilvi"; depends=[]; };
 ClimClass = derive { name="ClimClass"; version="1.0"; sha256="07jl8vwqyyj4q2hav8qbg69yjs73s3kbms5bd9hqs1y938rrp2l5"; depends=[geosphere ggplot2 reshape2]; };
 ClueR = derive { name="ClueR"; version="1.0"; sha256="1ak8pgbzm5xrk7pjnkbiqdwyvvyvrm6k6h50ycc86w3zy7fnqhds"; depends=[e1071]; };
+ClustMMDD = derive { name="ClustMMDD"; version="1.0.1"; sha256="0pzascdiadhvx4xjxa6kjw5kkmj3izphz2f86jnimyn5fid7cl02"; depends=[Rcpp Rcpp]; };
 ClustOfVar = derive { name="ClustOfVar"; version="0.8"; sha256="17y8q2g4yjxs2jl1s8n5svxi021nlm0phs1g5hcnfxzpadq84wbs"; depends=[]; };
-ClustVarLV = derive { name="ClustVarLV"; version="1.3.2"; sha256="0lnrpvfkhsmjjaimxqjrvwv4wrh6mxl6ifr9dj1kfkmnparyp6fp"; depends=[Rcpp Rcpp]; };
+ClustVarLV = derive { name="ClustVarLV"; version="1.4.0"; sha256="1dm4vyfq4mf9y2ha32fhirqyss4yjk5zxrb9i3fx4i8kbaw6160z"; depends=[Rcpp Rcpp]; };
 CoClust = derive { name="CoClust"; version="0.3-1"; sha256="00i0dghd35s91kkkxj1ywa5i93752mfa5527ifclw4xxxshppva8"; depends=[copula gtools]; };
 CoImp = derive { name="CoImp"; version="0.2-3"; sha256="04n0drx98hi8hmlb5xwl87ylv03j1ld04vp9d8s5sphvm9bbx690"; depends=[copula nnet gtools locfit]; };
 CoinMinD = derive { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; };
 CollocInfer = derive { name="CollocInfer"; version="1.0.1"; sha256="0wfk3qw28msz3wqm5xmivjgi18kqv1s6w76vh71zq777d6a7al6i"; depends=[fda deSolve MASS Matrix spam]; };
+ColorPalette = derive { name="ColorPalette"; version="1.0-0"; sha256="0mh1fjcl80fc5prrypl42aqj1svzs6600n250a5sah276bd0zzk9"; depends=[]; };
 CombMSC = derive { name="CombMSC"; version="1.4.2"; sha256="1wkawxisn9alpwrymja8dla8n25z2fhai3l2xhin0b914y2kai09"; depends=[]; };
 CombinS = derive { name="CombinS"; version="1.1"; sha256="18wanir5vqk5i65hd6gr2za1xd26yfa0c3c029dbxsrsczwmb9xi"; depends=[]; };
 CombinePValue = derive { name="CombinePValue"; version="1.0"; sha256="0mlngyz2nq7s39javnnjbb5db93c5sg9daw2szng83mbyfza4hv2"; depends=[]; };
@@ -355,7 +363,7 @@ Copula_Markov = derive { name="Copula.Markov"; version="1.0"; sha256="028rmpihyz
 CopulaREMADA = derive { name="CopulaREMADA"; version="0.5-1"; sha256="1lrqx07986f7cv0ws1dd9p0dza0qkc67p8mp7rdq58b9f1h7yk2r"; depends=[statmod]; };
 CopulaRegression = derive { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; };
 CopyDetect = derive { name="CopyDetect"; version="1.1"; sha256="0h9bf7ay5yr6dwk7q28b6xxfzy6smljkq6qwjkzfscy5hnmwxkpa"; depends=[irtoys]; };
-CorReg = derive { name="CorReg"; version="1.0"; sha256="061lb443wydlrgrnrpi9ibrwa0xw328wcyhsx7lndzjrni9mhcbp"; depends=[Rcpp lars Rmixmod elasticnet corrplot Matrix ridge rpart MASS mvtnorm mclust Rcpp RcppEigen]; };
+CorReg = derive { name="CorReg"; version="1.0.5"; sha256="1b7l17i33bqvdzgqw5vc73fnpdgqbr01456qgmxls80ji8qjiv9x"; depends=[Rcpp lars Rmixmod elasticnet corrplot Matrix ridge rpart MASS mvtnorm mclust Rcpp RcppEigen]; };
 CorrBin = derive { name="CorrBin"; version="1.5"; sha256="1kg8kms76z127j2vmf7v162n0sh2jqylw4i7c35x5sig4q22m9gy"; depends=[boot combinat geepack dirmult mvtnorm]; };
 CorrMixed = derive { name="CorrMixed"; version="0.1-11"; sha256="18n70yx6yysvcn3wsf1zmnp4z2hs3783mr1n0pjp2ph5yd9xk4mg"; depends=[nlme psych]; };
 Correlplot = derive { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; };
@@ -377,6 +385,7 @@ DAAG = derive { name="DAAG"; version="1.20"; sha256="05jlsrs0frk9ky20h17c5vj9d4j
 DAAGbio = derive { name="DAAGbio"; version="0.62"; sha256="18m4vq8vv0yi79na62nrm0cy1nlk7bg0xbddzxv5gpkmzi1i6m9s"; depends=[]; };
 DAAGxtras = derive { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; };
 DAGGER = derive { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpdcjwg5lj33i6pb884l1kx92svjfr7"; depends=[Rglpk quadprog Matrix]; };
+DAISIE = derive { name="DAISIE"; version="1.0.1"; sha256="1dhfkjgksxy39siz5mf97sw2gyb0jvy44ndy0asdmplwhmqrc4md"; depends=[deSolve]; };
 DAKS = derive { name="DAKS"; version="2.1-2"; sha256="1817s7xd4h2zzaagmnw423qaxpa5fmxi3fh4h9hm2ra9w7nh6ljj"; depends=[relations sets]; };
 DALY = derive { name="DALY"; version="1.4.0"; sha256="1gx4q24149q1ipsrinswrm37z1nf4swgq188zsc1xifmw9l28v11"; depends=[]; };
 DAMOCLES = derive { name="DAMOCLES"; version="1.1"; sha256="07z8mynhqnk1zcvm84w09xzkiy2dfxwhmnpi6gaddr3p0waql4gj"; depends=[geiger caper ape deSolve matrixStats expm picante]; };
@@ -403,12 +412,12 @@ DIFlasso = derive { name="DIFlasso"; version="1.0-1"; sha256="048d5x9nzksphsdk9l
 DIFtree = derive { name="DIFtree"; version="1.0.0"; sha256="08s6ba44517xq783fysksb1h53zkqsk7zakaibi1c2npq1gzny9p"; depends=[penalized plotrix]; };
 DIME = derive { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; };
 DIRECT = derive { name="DIRECT"; version="1.0"; sha256="129bx45zmd6h7j6ilbzj2hjg4bcdc08dvm2igggi8ajndl1l5q9j"; depends=[]; };
-DLMtool = derive { name="DLMtool"; version="1.34"; sha256="0ir1131r408ya235k7syg854bfgsim39hh2k1498n5hrbaa99xfx"; depends=[snowfall boot MASS]; };
+DLMtool = derive { name="DLMtool"; version="1.35"; sha256="1qcc5q35a68m468ip1mhij2g0qzz5fhcjzax11a8n2fl9x2s9d57"; depends=[snowfall boot MASS]; };
 DMR = derive { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; };
 DMwR = derive { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[lattice xts quantmod zoo abind rpart class ROCR]; };
 DNAprofiles = derive { name="DNAprofiles"; version="0.3.1"; sha256="0chsndrmanb2swmhfan9iz1bzz3jsvk24n7j9fnjxibckmn2fdpv"; depends=[RcppProgress Rcpp bit Rcpp RcppProgress]; };
 DNAtools = derive { name="DNAtools"; version="0.1-21"; sha256="1ncx2rmxb0ip804x6xznfv8brjpp518fhnm1653mlrsl3hpzrh88"; depends=[Rsolnp multicool Rcpp Rcpp]; };
-DNMF = derive { name="DNMF"; version="1.0"; sha256="0s484hzzvvkqdh4s5cb6znz26wx07f9k7y940ghx3dkdc7rb0hrx"; depends=[]; };
+DNMF = derive { name="DNMF"; version="1.3"; sha256="09yp6x6vd44ahklcag96fpjgyphyn45rkqkbwr1n36a2d8vxk9nc"; depends=[foreach Matrix gplots doParallel]; };
 DOBAD = derive { name="DOBAD"; version="1.0.4"; sha256="1hslwgs4q05xm29my5cq6g3vvjc0arvdmlx734wardj9dy29p1v5"; depends=[numDeriv lattice]; };
 DOvalidation = derive { name="DOvalidation"; version="0.1.0"; sha256="0vm4sxbchkj2hk91xnzj6lpj05jg2zcinlbcamy0x1lrbjffn9zk"; depends=[]; };
 DPpackage = derive { name="DPpackage"; version="1.1-6"; sha256="01qdl6cp6wkddl9fwwpxwvyhb7lpjxis6wnbm2s288y2n9wi4j24"; depends=[MASS nlme survival]; };
@@ -418,6 +427,8 @@ DSL = derive { name="DSL"; version="0.1-5"; sha256="0k320cmim9mvi5cmr6964h9i2jbs
 DSpat = derive { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[spatstat RandomFields rgeos mgcv sp]; };
 DSsim = derive { name="DSsim"; version="1.0.3"; sha256="01kkpzs0prcq43y4nmyaw39bgjabr99xxs2hn3fmb4ka46xj0bfb"; depends=[shapefiles splancs mrds mgcv]; };
 DStree = derive { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[rpart pec Ecdat rpart_plot survival Rcpp Rcpp]; };
+DSviaDRM = derive { name="DSviaDRM"; version="1.0"; sha256="1hj2pgnldrpgapwwz1kf4k6mvyzwdvb1i6czd7sbimsx5hafwps8"; depends=[igraph ppcor]; };
+DT = derive { name="DT"; version="0.1"; sha256="0mj7iiy1gglw7kixybmb7kr1bcl5r006zcb3klkw7p6vvvzdm6qj"; depends=[htmltools htmlwidgets magrittr]; };
 DTComPair = derive { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; };
 DTDA = derive { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; };
 DTK = derive { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; };
@@ -426,6 +437,7 @@ DTR = derive { name="DTR"; version="1.6"; sha256="186qgrx9alzmj1vdy2yvfqs5xgidmw
 DVHmetrics = derive { name="DVHmetrics"; version="0.3"; sha256="1ndrzd5q12kabpk3yj95s24kn7ri61w1h4aa50zw9qb12f5dzc98"; depends=[ggplot2 reshape2 shiny KernSmooth markdown]; };
 Daim = derive { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; };
 DandEFA = derive { name="DandEFA"; version="1.5"; sha256="0d82rjkgqf4w7qg7irlqvzzav1f23i2gmygkbf8jycaa6xhli80d"; depends=[gplots polycor]; };
+Dark = derive { name="Dark"; version="0.9.4"; sha256="0paw34zhbi8k6pjgykxxqhpjgl8qr340dv091r9931q4mm215j2n"; depends=[]; };
 DatABEL = derive { name="DatABEL"; version="0.9-6"; sha256="1w0w3gwacqrbqjdcngdp44d2gb16pq9grq2f8j2bhbxc4nkx12n1"; depends=[]; };
 DataCombine = derive { name="DataCombine"; version="0.2.9"; sha256="1yvpv28fwkifiiyzj121dhzwzp06fncms5jbwpvc3nkq1bpzm2mk"; depends=[data_table dplyr]; };
 Davies = derive { name="Davies"; version="1.1-8"; sha256="1wp7ifbs4vqfrn4vwh09lc53yiagpww91m5mxmcr62mjbw8q7zhr"; depends=[]; };
@@ -441,14 +453,14 @@ Demerelate = derive { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmi
 DendSer = derive { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; };
 Density_T_HoldOut = derive { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; };
 DepthProc = derive { name="DepthProc"; version="1.0.3"; sha256="0xil3pl33224sizn1wy9x3lcngw017qjl22hfqzss9iy73cmxqnc"; depends=[ggplot2 Rcpp rrcov MASS np lattice sm geometry colorspace Rcpp RcppArmadillo]; };
-Deriv = derive { name="Deriv"; version="3.4"; sha256="03fawwlcc3lxp7y3labbhvhpzcp9yfxhbwq7bq8av1fvq92l4xi6"; depends=[]; };
-DescTools = derive { name="DescTools"; version="0.99.10"; sha256="0sfjx1bmp0864l55yj7f0zgf4s9kyi2y1p1dajaaxq8mnclqdfz2"; depends=[manipulate boot mvtnorm]; };
+Deriv = derive { name="Deriv"; version="3.5.4"; sha256="07a3pm79mv8wiapjdb2n6scgl3hc7pvz9inalm80aqlhpqrvp3hs"; depends=[]; };
+DescTools = derive { name="DescTools"; version="0.99.11"; sha256="0ccqgx6w7x55h5pd76hjyq79g0cdyw2m0w1h55kw4chqj0ibqizy"; depends=[manipulate boot mvtnorm foreign]; };
 DescribeDisplay = derive { name="DescribeDisplay"; version="0.2.4"; sha256="13npxq1314n4n08j6hbmij7qinl1xrxrgc5hxpbbpbd16d75c7iw"; depends=[proto reshape2 ggplot2 plyr scales GGally]; };
 DetMCD = derive { name="DetMCD"; version="0.0.2"; sha256="0z4zs0k8c8gsd2fry984p06l3p17fdyfky8fv9kvypk7xdg52whc"; depends=[robustbase Rcpp RcppEigen]; };
 DetSel = derive { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; };
 Devore7 = derive { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[MASS lattice]; };
 DiagTest3Grp = derive { name="DiagTest3Grp"; version="1.6"; sha256="04dxyyqv333rkjf2vlfpal59m7klhw6y7qilym6nw78qb1kqqys7"; depends=[car KernSmooth gplots]; };
-DiagrammeR = derive { name="DiagrammeR"; version="0.6"; sha256="021i1nvw5airli3392rwz9vq1zxwm2pdlw1y6wqw4968g8yc0k9f"; depends=[htmlwidgets rstudioapi]; };
+DiagrammeR = derive { name="DiagrammeR"; version="0.7"; sha256="0cfxhxs4b5kknp1xsq2gg0dnyyv9vrj3bfswlvc5np7pkxankr2r"; depends=[htmlwidgets rstudioapi stringr]; };
 DiceDesign = derive { name="DiceDesign"; version="1.6"; sha256="1djq7clga3cvpgfycs3zjj106213yhfj9909sqrni70nj1nwdpj9"; depends=[]; };
 DiceEval = derive { name="DiceEval"; version="1.3"; sha256="1vp9zwd09cwl3c8066jr9d3w4yic70fvd40r7hsj2y8d0bhiwl82"; depends=[DiceKriging]; };
 DiceKriging = derive { name="DiceKriging"; version="1.5.5"; sha256="035kbk633v4kfb44wiyb556sayl73c24fc1w09r3f33shqgidzjm"; depends=[]; };
@@ -480,6 +492,7 @@ DoubleExpSeq = derive { name="DoubleExpSeq"; version="1.0"; sha256="0y797iqmxihr
 DunnettTests = derive { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; };
 DynClust = derive { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; };
 DynNom = derive { name="DynNom"; version="1.0.1"; sha256="0gdy3kqj63khm74cdjhfmlnd06ard97h1598rkqwm7c3cng7b98c"; depends=[ggplot2 stargazer shiny compare]; };
+DynTxRegime = derive { name="DynTxRegime"; version="2.1"; sha256="0dxf16zpj6cyx7afbvr4w4d76w4vshbvvkkqla68dbav0yvy7z7i"; depends=[modelObj]; };
 DynamicDistribution = derive { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; };
 EBEN = derive { name="EBEN"; version="1.1.1"; sha256="12nh96avcx4rrbmlr1q046i5ymrsnqvf0ra5ynh58akajfx7wy49"; depends=[]; };
 EBMAforecast = derive { name="EBMAforecast"; version="0.42"; sha256="161l6jxbzli2g5lcmlp74z320rsvsi80pxk1vc1ypa1hgwz3q80x"; depends=[separationplot ensembleBMA plyr Hmisc abind]; };
@@ -519,9 +532,9 @@ ESG = derive { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500b
 ESGtoolkit = derive { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahini5yhgc43msdxwvn45l57xbfszahsnr3b3aq"; depends=[CDVine ggplot2 gridExtra reshape2 ycinterextra Rcpp Rcpp]; };
 ETAS = derive { name="ETAS"; version="0.0-1"; sha256="1p38ay3vnca8b8wszm66whxap8k58c004l1nlsk7zkynyia0im6c"; depends=[spatstat]; };
 ETC = derive { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; };
-ETLUtils = derive { name="ETLUtils"; version="1.2"; sha256="0mlfq23v7nl6lslscknk9mdx4dxk8xyc5imnvzlhzhag0k50mqj2"; depends=[ff]; };
+ETLUtils = derive { name="ETLUtils"; version="1.3"; sha256="13xq9i9fr34kx1nym7nr02gynshzm4jjn4qzx6ydg044b7xl57jp"; depends=[ff bit]; };
 EW = derive { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; };
-EWGoF = derive { name="EWGoF"; version="2.0"; sha256="07kpzaqfd7ihpmh2y5806mz5h64dcajia5v36pp9myl04fvpjapp"; depends=[Rcpp maxLik miscTools Rcpp]; };
+EWGoF = derive { name="EWGoF"; version="2.1"; sha256="10p392n003sxn8l9sfnksi789k1w191rmkah6gxhji5f41gib5rh"; depends=[Rcpp Rcpp]; };
 EasyABC = derive { name="EasyABC"; version="1.4"; sha256="0v3i7vlx2pnfkcqxka4g7ss8k8zphyx3vq5l0c1b433qp0fnjwf3"; depends=[abc pls mnormt MASS lhs]; };
 EasyHTMLReport = derive { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc markdown knitr ggplot2 scales xtable reshape2]; };
 EasyMARK = derive { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[MASS stringr rjags coda foreach doParallel random]; };
@@ -529,11 +542,12 @@ EasyStrata = derive { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8i
 EbayesThresh = derive { name="EbayesThresh"; version="1.3.2"; sha256="0n7cr917jrvmgwfqki7shvz9g9zpmbz9z8hm5ax7s8nnfzphrh4g"; depends=[]; };
 Ecdat = derive { name="Ecdat"; version="0.2-7"; sha256="1z9mxx3mvn3vi5drxlzss7gs7vpzg7shinl529bx4jpxqpci90jy"; depends=[Ecfun]; };
 Ecfun = derive { name="Ecfun"; version="0.1-4"; sha256="0h3351pcahrn578lz1pcb7h3chmh0vmwbn9iqll98vibck847gai"; depends=[fda gdata RCurl XML tis jpeg MASS TeachingDemos stringi]; };
-EcoGenetics = derive { name="EcoGenetics"; version="1.1.0"; sha256="1a7dsjvkxaa37nfha07fgfas9zygsj9hrsllgf4b67rkqihrzz87"; depends=[adegenet ggplot2 gstudio hierfstat party raster rgdal rkt sp vegan]; };
+EcoGenetics = derive { name="EcoGenetics"; version="1.2.0"; sha256="090vcbl8gl23335rga1126w6jqvql62kk9wxlfpjz4q11czgdclq"; depends=[adegenet ggplot2 hierfstat party raster rgdal rkt SoDA sp vegan]; };
 EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[operators topmodel DEoptim XML]; };
 EcoSimR = derive { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; };
 EcoTroph = derive { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; };
 EcoVirtual = derive { name="EcoVirtual"; version="0.1"; sha256="1c815kxljk4qhw0zs28w16ggasfyyyb6aggffx1m1q21s63h6c8h"; depends=[]; };
+EditImputeCont = derive { name="EditImputeCont"; version="1.0.0"; sha256="1ghrax514hm8zymmaifwbls4wpic8qqzlf83p615k3d96p4lb304"; depends=[Rcpp editrules Rcpp]; };
 EffectLiteR = derive { name="EffectLiteR"; version="0.3-3"; sha256="14v5samvkzpiy0gq6lq1vs5jqi084sq1if2sih0lk57qxz2647qh"; depends=[lavaan shiny foreign ggplot2 nnet survey lavaan_survey car]; };
 EffectStars = derive { name="EffectStars"; version="1.5"; sha256="0j2jxxxpcsrsjzszz4mfk3892ain3qkswa1dkpsmfsk4zs06g0s4"; depends=[VGAM]; };
 EffectTreat = derive { name="EffectTreat"; version="0.1-11"; sha256="1ps3jac3wc1v325maf4vx9jkirxbc1dfflr218xbzbgrj0zx9diz"; depends=[]; };
@@ -548,15 +562,15 @@ EnsembleCV = derive { name="EnsembleCV"; version="0.7.1"; sha256="14mvwfjbhsrq9q
 EnsemblePCReg = derive { name="EnsemblePCReg"; version="0.6"; sha256="0amswx7x08hpfvsrkjyfz3adkfshl7d1knyvk9nrnrrpy65rilc3"; depends=[EnsembleBase]; };
 EnsemblePenReg = derive { name="EnsemblePenReg"; version="0.6"; sha256="0fjp50jbnbhvyd7srvhy0ipysm192d8ikg9yra2vch33zrid2xbm"; depends=[EnsembleBase glmnet]; };
 EntropyEstimation = derive { name="EntropyEstimation"; version="1.2"; sha256="13kb83lfpkw6yq687j0ci23yn5c9dqjibybyyaplk6jixy08lrvy"; depends=[]; };
-EntropyExplorer = derive { name="EntropyExplorer"; version="1.0"; sha256="0daj7g209nk8lsalk51kf8kkr6lbnnlzf7xd2mmv1axm7y5rppl2"; depends=[]; };
+EntropyExplorer = derive { name="EntropyExplorer"; version="1.1"; sha256="02ljnq9ayxg4lrrnb6nlxr1k5ki8dd5i8hjb9fvvb19hwr2id5h4"; depends=[]; };
 EnvNicheR = derive { name="EnvNicheR"; version="1.0"; sha256="1vw21gsdrx8gkf1rf8cnazv8l9ddcdmy2gckyf33fz7z2mbzgbkk"; depends=[]; };
-EnvStats = derive { name="EnvStats"; version="2.0.0"; sha256="1yjm1lm9hsq5gw6j8wqxxgc72p7c6prr5fx8vk9v6bb2hgf2bm8i"; depends=[MASS]; };
-EnviroStat = derive { name="EnviroStat"; version="0.4-0"; sha256="05sa63z6yzny2ncxpm5d3x0bx8snkn0x5pzpj2a7y6rwf6al5q4r"; depends=[MASS]; };
+EnvStats = derive { name="EnvStats"; version="2.0.1"; sha256="1z909p56dlhr00a5ir55sn5ny51h1wwi85as6arv3cn8c0zqyi74"; depends=[MASS]; };
+EnviroStat = derive { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; };
 Epi = derive { name="Epi"; version="1.1.67"; sha256="12wbzv21whjnzlyqacgqmsgrjbkgj2495y9fwvav5mr21yfrjds3"; depends=[]; };
 EpiContactTrace = derive { name="EpiContactTrace"; version="0.8.8"; sha256="1vlr2xxnyq1i6ky39g8j3pf3m5775bmhii7vpskb0x7nnq161yzb"; depends=[Rcpp plyr R2HTML Rcpp]; };
 EpiDynamics = derive { name="EpiDynamics"; version="0.2"; sha256="1hqbfysvw2ln8z3as6lfcjlhkzccksngwh2vm25zsgy93gxw3mcc"; depends=[deSolve reshape2 ggplot2]; };
 EpiEstim = derive { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; };
-EpiModel = derive { name="EpiModel"; version="1.1.4"; sha256="0gyj80xmhwa3a7k12m3lla9rkpfv1n307vjf8lka1bd1rvwipg2c"; depends=[deSolve network networkDynamic tergm doParallel ergm foreach RColorBrewer statnet_common]; };
+EpiModel = derive { name="EpiModel"; version="1.1.6"; sha256="0h3bbvk9qyhc0jml2jd21dahi1v00alar67jkzpwnavvmcgd8a3s"; depends=[deSolve network networkDynamic tergm doParallel ergm foreach RColorBrewer statnet_common]; };
 Eplot = derive { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; };
 EstCRM = derive { name="EstCRM"; version="1.3"; sha256="0fmnlh0pnprskq01iq3rfassyxq7fywiprvqw0xdlh8yxl3w2c9n"; depends=[Hmisc lattice]; };
 EstSimPDMP = derive { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; };
@@ -565,19 +579,20 @@ EvalEst = derive { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd
 Evapotranspiration = derive { name="Evapotranspiration"; version="1.5"; sha256="181s9wwil07740n79gz2ar9c1bjxy45v4fyxxkqjmdfly72la542"; depends=[zoo]; };
 EvoRAG = derive { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; };
 ExPosition = derive { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; };
-Exact = derive { name="Exact"; version="1.5"; sha256="14469wfm5g28ajlpcrqkmvhbqps8wvrh5lsi0rcrwbwybfv435vn"; depends=[]; };
+Exact = derive { name="Exact"; version="1.6"; sha256="0d5g5p98yrcd6v56iadsq448hl522shdqln2icmc3yfnya326as7"; depends=[]; };
 ExactCIdiff = derive { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; };
 ExactPath = derive { name="ExactPath"; version="1.0"; sha256="0ngvalmgdswf73q0jr4psg0ihnb7qwkamm6h64l01k5rmgd5nm16"; depends=[ncvreg lars]; };
 ExceedanceTools = derive { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[splancs SpatialTools]; };
-ExomeDepth = derive { name="ExomeDepth"; version="1.1.4"; sha256="0a4y6y1zi1jn1g14f3wsl2pfbmp58afwkvrk7x7s1wp16vwgq0xb"; depends=[aod VGAM]; };
+ExomeDepth = derive { name="ExomeDepth"; version="1.1.5"; sha256="11ff89c080855wmvglapif7h3wmk6zrgfqcb0kshy4jglpwkz52x"; depends=[aod VGAM]; };
 ExpDes = derive { name="ExpDes"; version="1.1.2"; sha256="0qfigbx06b3p04x5v7wban139mp8hg8x77x6nzwa4v6dr226qbkv"; depends=[]; };
 ExpDes_pt = derive { name="ExpDes.pt"; version="1.1.2"; sha256="0khw2jhg2vxcivgr20ybvrsqhd8l8bir5xjmr4m44za9nhap43bz"; depends=[]; };
+ExtDist = derive { name="ExtDist"; version="0.6-3"; sha256="1vsxm578bb70wnz3mxm7y1n5vs0x5pby99hvxg5y5ksh2g2ascwa"; depends=[numDeriv optimx]; };
 ExtremeBounds = derive { name="ExtremeBounds"; version="0.1.5"; sha256="1fsrp2dm1bdg5p0qsi2wa8qxrlq065jlazsxzixpjsni910mrb2k"; depends=[Formula]; };
 FACTscorer = derive { name="FACTscorer"; version="0.1.0"; sha256="1gbfpm5szi6w8iyp7ywpqrmdq0wrv5axj29sj9gxjwmjfh5qgqjx"; depends=[]; };
 FADA = derive { name="FADA"; version="1.2"; sha256="1wpjqvhhgvirzcvl8r23iaw63wr8rys19mjy71mn24wg3zwnc2qz"; depends=[MASS elasticnet sparseLDA sda glmnet mnormt crossval]; };
 FAMILY = derive { name="FAMILY"; version="0.1.18"; sha256="1f1s0p721sl27b9xp2wrdyx03kv1bdin4wfknmw1k0nnc94dcnp2"; depends=[pheatmap pROC]; };
 FAMT = derive { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[mnormt]; };
-FAOSTAT = derive { name="FAOSTAT"; version="1.9"; sha256="0gff60vlv35m5sjmz7glbdrd6ijy6n32a9xd26z2ix839qgywvqj"; depends=[RJSONIO plyr data_table MASS classInt ggplot2 labeling scales]; };
+FAOSTAT = derive { name="FAOSTAT"; version="2.0"; sha256="06z8c964sf73ld4v9vybqjsdxskxp3ssyv0a3mpcs9la5y7n9jaz"; depends=[RJSONIO plyr data_table MASS classInt ggplot2 labeling scales]; };
 FAdist = derive { name="FAdist"; version="2.1"; sha256="1y66ymg0k6kmyq4bclwwlqkp8brkq925ajpp0jqqn39f749c2kji"; depends=[]; };
 FAiR = derive { name="FAiR"; version="0.4-15"; sha256="18nj95fiy3j7kf4nzf692dxja3msnaaj5csg745bnajb48l606wz"; depends=[rgenoud gWidgetsRGtk2 rrcov Matrix]; };
 FAmle = derive { name="FAmle"; version="1.3.3"; sha256="125m2hvl603avg9h9x5gfb7l9clpg7p0ir8fdypxyjiqggdr8hxa"; depends=[mvtnorm]; };
@@ -594,7 +609,7 @@ FField = derive { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dw
 FGN = derive { name="FGN"; version="2.0-12"; sha256="0jxawb4wm1vcp0131mdnc0r24dw8sd29ih0fc2wh6ahy7mxzajqn"; depends=[akima ltsa]; };
 FGSG = derive { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; };
 FGalgorithm = derive { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; };
-FHtest = derive { name="FHtest"; version="1.1"; sha256="0yqy3lvxjhk7biqfikxqlgs9zsy1vlld9pqxhgxmq04gbnjn2jfk"; depends=[interval MLEcens MASS KMsurv]; };
+FHtest = derive { name="FHtest"; version="1.2"; sha256="033p90zzlgx2galzp2iwwpg29hhhgscqmqkwpr69y2ck3nj3hz0v"; depends=[interval KMsurv survival perm MASS]; };
 FI = derive { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; };
 FITSio = derive { name="FITSio"; version="2.0-0"; sha256="1gf3i1q9g81gydag2gj1wsy6wi5jj2v4j3lyrnh1n2g4kxd6s3cp"; depends=[]; };
 FKF = derive { name="FKF"; version="0.1.3"; sha256="01ibihca39zng4wrvhq8h28bmb2rnsjm21xy22b85kpn3mbnh7f1"; depends=[RUnit]; };
@@ -612,9 +627,10 @@ FRB = derive { name="FRB"; version="1.8"; sha256="13rp4gqldx84mngrdv5fa9xamkng7b
 FRCC = derive { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[CCP MASS calibrate corpcor]; };
 FREQ = derive { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; };
 FRESA_CAD = derive { name="FRESA.CAD"; version="2.0.2"; sha256="1clnv18d6f747725ayksas3c2hng1bkb4zss44avfqh9q1y0z1iy"; depends=[Rcpp stringr miscTools Hmisc pROC Rcpp RcppArmadillo]; };
+FSInteract = derive { name="FSInteract"; version="0.1.1"; sha256="0hlmz0sc4l9vmb4b2y3j95gh39m1jqrp9bvqsjjqdr0ly1lb7mvm"; depends=[Rcpp Matrix Rcpp]; };
 FSelector = derive { name="FSelector"; version="0.20"; sha256="0gbnm48x5myhxxw8gz7ck9sl41nj5rxq4gwifqk3l4kiqphywlpi"; depends=[randomForest RWeka digest entropy]; };
 FTICRMS = derive { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[Matrix lattice]; };
-FWDselect = derive { name="FWDselect"; version="1.1"; sha256="1snamrzf0cqcm6sc5vr1b0scgy83jgr5hgsf2cjb3vi3j01hz9wd"; depends=[mgcv]; };
+FWDselect = derive { name="FWDselect"; version="2.0"; sha256="12hhb2vysg3c9fzh56xy3kwhwbgcn1yx4afhlpydnavp3aclrqrg"; depends=[cvTools mgcv]; };
 FacPad = derive { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[Rlab MASS]; };
 FactMixtAnalysis = derive { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
 FactoClass = derive { name="FactoClass"; version="1.1.1"; sha256="0m5108g2nhdwqqmkn04l1x0kx32ikkhcz6gki0hpj9hlzrkya5w6"; depends=[ade4 xtable]; };
@@ -622,14 +638,14 @@ FactoMineR = derive { name="FactoMineR"; version="1.29"; sha256="08pyp8z9xhy9f1m
 Factoshiny = derive { name="Factoshiny"; version="1.0"; sha256="0r8xnnmf2c0nhddgzwsfb86ajpirkr1788phhcjdap1w9k67nsy9"; depends=[FactoMineR shiny]; };
 Fahrmeir = derive { name="Fahrmeir"; version="2012.04-0"; sha256="1axx6r4g6gj1inih41i2az4y0d3jq9x1a6nyj8k7wp51z4z2nbmk"; depends=[]; };
 Familias = derive { name="Familias"; version="2.2"; sha256="1nhjxn3f063gvi4jvwb8r4fap7f1zbcvb6qa30153yh31yprljls"; depends=[kinship2 paramlink]; };
-FastHCS = derive { name="FastHCS"; version="0.0.4"; sha256="11ddp1xy1cmnfbsvabyw0y2wdj4z1brqykji75y7wwchf71m2bps"; depends=[matrixStats rrcov Rcpp RcppEigen]; };
+FastHCS = derive { name="FastHCS"; version="0.0.5"; sha256="02ds9syqh8wpjrqibdv3kqxcyijclm572daqrj262b4b6211v46x"; depends=[matrixStats robustbase Rcpp RcppEigen]; };
 FastImputation = derive { name="FastImputation"; version="1.2"; sha256="04bz623kcanxcl9z8zl6m7m47pk0szcjrjlgs5v1yl3jnq9m2n7g"; depends=[]; };
 FastKNN = derive { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp1zvy9xlmyjid441mf62dq08a0zncnyss"; depends=[pdist assertthat]; };
 FastPCS = derive { name="FastPCS"; version="0.1.2"; sha256="1lqb6g65vna2p7kc2y4kc5piy3280nlxl41bdkxkng2icmq14l58"; depends=[matrixStats Rcpp RcppEigen]; };
 FastRCS = derive { name="FastRCS"; version="0.0.6"; sha256="0wjsh37jas8hcb9554ijvwj0k8dx96fjf88bzgy7nbim2byiy8p8"; depends=[matrixStats Rcpp RcppEigen]; };
 FastRWeb = derive { name="FastRWeb"; version="1.1-0"; sha256="1hiabi7ibp69n5wi5x4kwznxhc2i7dxdrqf1fm6ppv7ix0wkjs07"; depends=[Cairo]; };
 FatTailsR = derive { name="FatTailsR"; version="1.0-3"; sha256="0r9n18qlr70p6y4v1xv1lxi1lzm9qp29qy4w51chllqjn15kmv7l"; depends=[minpack_lm]; };
-FeaLect = derive { name="FeaLect"; version="1.8"; sha256="04vmf89kgn7hh9wzj6b654546d3jvz0zz675xhcd11gjzlsp8pgc"; depends=[lars rms]; };
+FeaLect = derive { name="FeaLect"; version="1.10"; sha256="1r7rgcadrqjhxn2g2w16axygsck82fprxg7l14ai11bn4b7h4pmb"; depends=[lars rms]; };
 FeatureHashing = derive { name="FeatureHashing"; version="0.9"; sha256="1xbzmyah22kjrkd7ln1pjzwyn5w0zmhdhs9w1a3p8rjxrwmx6ssf"; depends=[Rcpp Matrix digest magrittr Rcpp digest BH]; };
 FedData = derive { name="FedData"; version="1.1.0"; sha256="0s5blfhlizl4lv22lxjhqrwrf10mxgy2cd5z4a9xg05k419q7alr"; depends=[sp rgdal raster RCurl rgeos igraph data_table devtools soilDB]; };
 FeedbackTS = derive { name="FeedbackTS"; version="1.3.1"; sha256="1zx64wbl5pzqn69bjhshd3nayxx4wlg7n1zwv7ilh68raxfxnbbx"; depends=[maps mapdata proj4 geoR sp]; };
@@ -681,7 +697,7 @@ GANPA = derive { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gac
 GANPAdata = derive { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; };
 GAR = derive { name="GAR"; version="1.0"; sha256="1278rdln23pl5ay87nb6w15ywdh6ls8hx8k0nb48ab4ysjqf6r04"; depends=[httr jsonlite]; };
 GAabbreviate = derive { name="GAabbreviate"; version="1.0"; sha256="0c9407i6dq7psw744fpkf190as99fssd9n9k0xbvwif10agm278l"; depends=[GA psych]; };
-GB2 = derive { name="GB2"; version="1.2"; sha256="1b5mkgn8c26bmi9ndzsqqp22vxqssy4nya1yysrl5wssjgicpdzs"; depends=[cubature hypergeo laeken numDeriv]; };
+GB2 = derive { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; };
 GCAI_bias = derive { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; };
 GCD = derive { name="GCD"; version="3.0.5"; sha256="1ami5xw5xx464pxr9y1z9bb3dvj46vx3wrbh19w4g7sk8yjvh5nl"; depends=[]; };
 GCPM = derive { name="GCPM"; version="1.1.1"; sha256="1wm7nmqj88j1pd2s1lvi6z1fizm3q3cl7vbzp88vbhpij4rnk4jl"; depends=[Rcpp RcppProgress Rcpp RcppProgress]; };
@@ -696,7 +712,7 @@ GEVStableGarch = derive { name="GEVStableGarch"; version="1.0"; sha256="007s7lbf
 GEVcdn = derive { name="GEVcdn"; version="1.1.3"; sha256="13p6hkdybs8s2i363z2a65yijqarwj9swvy22ljk61shf2nzbk80"; depends=[VGAM]; };
 GExMap = derive { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[]; };
 GGEBiplotGUI = derive { name="GGEBiplotGUI"; version="1.0-8"; sha256="0bkagsm9mkcghc2q46cc86kjajzgjbq9588v0v2bp71qw8m97mbh"; depends=[rgl tkrplot]; };
-GGIR = derive { name="GGIR"; version="1.1-4"; sha256="1z1dwnx8lpj3xk7fdfm6sidbxpfgxjw9righ1kdnjw9g1nnkp29x"; depends=[]; };
+GGIR = derive { name="GGIR"; version="1.1-5"; sha256="0lanza1i7bqa0z745hbxkkyjhf6jy578jjva6nbisbbfsrbf7ydj"; depends=[]; };
 GGMselect = derive { name="GGMselect"; version="0.1-9"; sha256="18l98v6hv0sjhany275lsbdjwclx3abqfi924n9qlcnap1rvsfwz"; depends=[mvtnorm lars gtools]; };
 GGally = derive { name="GGally"; version="0.5.0"; sha256="00ix8qafi71l7vhj6268f9srqbgr9iw1qk0202y59mhfrj6c6f5i"; depends=[ggplot2 gtable plyr reshape stringr]; };
 GHQp = derive { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; };
@@ -727,12 +743,12 @@ GRaF = derive { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy
 GSA = derive { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; };
 GSAgm = derive { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[survival]; };
 GSE = derive { name="GSE"; version="3.1"; sha256="08xr7w6dsmgs3l8ayihadcvwy0xdzn78fllxa42sk7nfz6waadr3"; depends=[Rcpp MASS ggplot2 Rcpp RcppArmadillo]; };
-GSIF = derive { name="GSIF"; version="0.4-5"; sha256="041w4jvg7cwf90l03wl0jff24vf3lkzm3xqvl15117piix82lsf4"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat plyr]; };
+GSIF = derive { name="GSIF"; version="0.4-6"; sha256="00m5djgc443678nwnmvgqv070g67pbvp1ci1x8gp7van8knjn5zq"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat plyr]; };
 GSM = derive { name="GSM"; version="1.3.1"; sha256="1ay6znw31qnhz5k6fa0aiccr2xxmnj7v3vzrvlk6y5v5smlvybd0"; depends=[gtools]; };
 GUIDE = derive { name="GUIDE"; version="1.0.9"; sha256="1y0y6rwv1khd9bdaz5rl9nmxiangx0jckgihg16wb6hx6kf8kzc1"; depends=[rpanel tkrplot]; };
 GUILDS = derive { name="GUILDS"; version="1.2.1"; sha256="1z90qjgrx16yk956phbifcr7jd3w59h7akzz7p6g5ymrcjzih4qf"; depends=[Rcpp pracma subplex Rcpp]; };
 GUIProfiler = derive { name="GUIProfiler"; version="0.1.2"; sha256="1k56clda6xr649xfacnigi3c2s7ih1whchwcfqm7aa2d44vv3axz"; depends=[Nozzle_R1 MASS]; };
-GUTS = derive { name="GUTS"; version="0.9.1"; sha256="1rxgvhpy8ss2a5vaidv1ay3rvq3msv7hv3rcyykmdxj34nvz19bb"; depends=[Rcpp Rcpp BH]; };
+GUTS = derive { name="GUTS"; version="0.9.3"; sha256="0gyi5vlr1r35qn3gj788lh9xrb7dz03r57hxk11x8w72kv415pih"; depends=[Rcpp Rcpp]; };
 GUniFrac = derive { name="GUniFrac"; version="1.0"; sha256="0xr68yv3h2lwn7sxy8l5p9g1z3q9hihg9jamsyl70jj9b2ic80jn"; depends=[vegan ape]; };
 GWAF = derive { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[geepack coxme lme4]; };
 GWASExactHW = derive { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; };
@@ -786,7 +802,7 @@ GroupSeq = derive { name="GroupSeq"; version="1.3.2"; sha256="16n06jw7f97jhafgl9
 GuardianR = derive { name="GuardianR"; version="0.5"; sha256="0m5arxz4ih84zg8sf2wy2kg38adraa098gb52vwz93dzdm1dhslw"; depends=[RCurl RJSONIO]; };
 Guerry = derive { name="Guerry"; version="1.6-1"; sha256="1hpp49w2kd1npsd709cwg125pw6mrqxfv2nn3lcs1mg2r49ki2bl"; depends=[]; };
 GxM = derive { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[Rcpp minqa nlme]; };
-HAC = derive { name="HAC"; version="1.0-2"; sha256="0f4him7qpam4s0xxm49xqx0g3nrj87rszm52l376xi63z7r02wbv"; depends=[copula]; };
+HAC = derive { name="HAC"; version="1.0-3"; sha256="084i123fj5vnhn08fa1qzbk93khsi3r60s52d6pqkqvzbxc572jr"; depends=[copula numDeriv]; };
 HAP_ROR = derive { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[hash ape]; };
 HAPim = derive { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; };
 HBSTM = derive { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[MASS fBasics maps]; };
@@ -826,13 +842,13 @@ HWxtest = derive { name="HWxtest"; version="1.0.5"; sha256="01pvi87g5sfglbdv38ik
 HadoopStreaming = derive { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; };
 HandTill2001 = derive { name="HandTill2001"; version="0.2-9"; sha256="1j4ivxarm3k9sj05824lv6b03apyabpciv4mp253vv0yzjcp2bzf"; depends=[]; };
 Hankel = derive { name="Hankel"; version="0.0-1"; sha256="0g3b0ji8hw29k0wxxvlnbcm0z91p4vbajbrhm6cqbccjq85lg4si"; depends=[]; };
-HapEstXXR = derive { name="HapEstXXR"; version="0.1-7"; sha256="1jarb0465yymb08r8dr0mn6qlwbf0y0c4ipvxvcfwlvqalbp2kd6"; depends=[survival]; };
-Haplin = derive { name="Haplin"; version="5.3"; sha256="1gfg9dhgw42yjd1i8knnjvc2y2fbdc2ypa396g48hmsnislqffsd"; depends=[MASS mgcv GenABEL DatABEL filehash]; };
+HapEstXXR = derive { name="HapEstXXR"; version="0.1-8"; sha256="00p8pziy8q6vki7brpd57c7ckc9zw41c90h47yp9vb3ndanfqavp"; depends=[survival]; };
+Haplin = derive { name="Haplin"; version="5.5"; sha256="12wkj5x1s920xs0xzhxk0dswmwan7x20fw5sj6cx29n013h1gkam"; depends=[GenABEL DatABEL mgcv MASS SuppDists snow]; };
 HaploSim = derive { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; };
 HardyWeinberg = derive { name="HardyWeinberg"; version="1.5.5"; sha256="1kz12301bi2880i9ds7wvc6yb5hvrs3fr5689fm1yygkqfq8zc56"; depends=[mice]; };
 HarmonicRegression = derive { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; };
-HelpersMG = derive { name="HelpersMG"; version="1.0"; sha256="11bjzkbdrysnryxriqk3wj8npk42i8rpc5b0c07q1zvk39png3lk"; depends=[coda]; };
-HiClimR = derive { name="HiClimR"; version="1.2.0"; sha256="10ick0311nc4zcqswlk3lhi9k5bv96nicqxqcq706cmlfk0qd0c7"; depends=[]; };
+HelpersMG = derive { name="HelpersMG"; version="1.1"; sha256="0pk8bcad9dnza803cq1428qlgb74vzq0vzx2q6f2j2hwmfpn13dx"; depends=[coda]; };
+HiClimR = derive { name="HiClimR"; version="1.2.1"; sha256="12qq3w20xzw2ih15hw5pzn0h58wv8rczhb4zxcdzc7zbg6i8qas4"; depends=[]; };
 HiCseg = derive { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; };
 HiDimDA = derive { name="HiDimDA"; version="0.2-3"; sha256="0pk7hf8cnwv22p5cbpsh5wd94i1an87ddv80qycgypx4wi0v57hh"; depends=[]; };
 HiDimMaxStable = derive { name="HiDimMaxStable"; version="0.1.1"; sha256="0gscdjm48yyf8h3bn6xjbjlfc1hwbbh5j6v64c0z3d04h9q35c24"; depends=[copula mnormt partitions maxLik mnormpow VGAM]; };
@@ -856,6 +872,7 @@ HydroMe = derive { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650
 HyperbolicDist = derive { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; };
 IASD = derive { name="IASD"; version="1.0.7"; sha256="0a25sd82fxnmz3f4iaxhc69cdfb7xmh7wi79wv11sbw9cv2pl7kr"; depends=[]; };
 IAT = derive { name="IAT"; version="0.2"; sha256="0byivq2298sjvpsz5z1w7r31h6z2jqpip40z8r2alygbgwwa48pd"; depends=[data_table ggplot2]; };
+IATscores = derive { name="IATscores"; version="0.1-2"; sha256="0grl5m4ccwaxvhg1bziy3vv5jffkvr24z268ws5m4ia20haif0dm"; depends=[stringr dplyr reshape2 qgraph]; };
 IBDLabels = derive { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; };
 IBDhaploRtools = derive { name="IBDhaploRtools"; version="1.8"; sha256="1754239pdil6b383mpzyi8zb9l9hzg15dwgn5246v97g1y3mlp5r"; depends=[]; };
 IBDsim = derive { name="IBDsim"; version="0.9-4"; sha256="0cpabz7mnhsrmjrgb23zs5anjrkhwc2005b2inl6p93l47i81fps"; depends=[paramlink]; };
@@ -873,7 +890,7 @@ ICSNP = derive { name="ICSNP"; version="1.0-9"; sha256="0kisk7wk0zjsr47hgrmz5c8f
 ICsurv = derive { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; };
 IDPSurvival = derive { name="IDPSurvival"; version="1.0"; sha256="1v1w0i74b065b4qc302xbdl5df7qx9z8jmbc9cn46fqm1hh2b6d7"; depends=[Rsolnp gtools survival]; };
 IDPmisc = derive { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; };
-IFP = derive { name="IFP"; version="0.1.2"; sha256="1sgjyxjfw3i1k02wy2lc7w9gnrs5g4wnp8kd78ks77f9j0sah2j8"; depends=[haplo_stats coda]; };
+IFP = derive { name="IFP"; version="0.2.0"; sha256="02dm2qbnrs2yi6c64j90hdfimmdsld46k1wdkay8pfg62jy9rrwa"; depends=[haplo_stats coda]; };
 IM = derive { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[png jpeg bmp]; };
 IMIS = derive { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; };
 INLABMA = derive { name="INLABMA"; version="0.1-6"; sha256="0rij3y89yyj25xz8r9n8cnq7rg9b7hf0n9nxxrrnm86w3n4r66in"; depends=[sp Matrix spdep]; };
@@ -887,10 +904,10 @@ ISLR = derive { name="ISLR"; version="1.0"; sha256="0gmhvsivhpq3x8a240lgcbv1qzdg
 ISOcodes = derive { name="ISOcodes"; version="2015.04.04"; sha256="1mg7mifcqh0g0ra4f1skng6fyp2rhfv2xd9m7nyih39inzdjkcdf"; depends=[]; };
 ISOpureR = derive { name="ISOpureR"; version="1.0.8"; sha256="0jjamyj4rf078rfa2qqrn4i55025sc5968lq95yadbw0izxb51i8"; depends=[Rcpp Rcpp RcppEigen]; };
 ISOweek = derive { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; };
-ISwR = derive { name="ISwR"; version="2.0-6"; sha256="1ms4lm1skfqaq4mnm03kvjb7kaxdzv72s6i77zp7z17gzfa40c9h"; depends=[]; };
+ISwR = derive { name="ISwR"; version="2.0-7"; sha256="1rd1wrvl8wlc8ya5lndk74gnfvj9wp29z8617v3kbf32gqhby7ng"; depends=[]; };
 IUPS = derive { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[R2jags Matching boot]; };
 Iboot = derive { name="Iboot"; version="0.1-1"; sha256="1fahh86kgv2axj2qg14n87v888sc0kb567s6zr3fh5zv361phwkq"; depends=[]; };
-IgorR = derive { name="IgorR"; version="0.7.1"; sha256="1ahj1ckzjffsskicdy2b70pzx5cn2r0s22yg1ajwiyy4ykwcg4pk"; depends=[bitops]; };
+IgorR = derive { name="IgorR"; version="0.8"; sha256="1khm7mbs497ybaw428ziwlxxygg1vcn5kx77w2cwm4mg8w95f4na"; depends=[bitops]; };
 Imap = derive { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; };
 ImpactIV = derive { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; };
 InPosition = derive { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[prettyGraphs ExPosition]; };
@@ -904,18 +921,18 @@ InteractiveIGraph = derive { name="InteractiveIGraph"; version="1.0.6.1"; sha256
 Interatrix = derive { name="Interatrix"; version="1.0"; sha256="1lkkjckxc0fc8hg1livgzrgphqwcp53cib0r0vii5jp4zkcna595"; depends=[MASS tkrplot]; };
 Interpol = derive { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; };
 Interpol_T = derive { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[date chron]; };
-InvariantCausalPrediction = derive { name="InvariantCausalPrediction"; version="0.3-2"; sha256="09s6jwcb6wyi6p1nqxvyfvv4140fq6svfv7w681nk8g57xlgc1h1"; depends=[glmnet mboost jointDiag]; };
+InvariantCausalPrediction = derive { name="InvariantCausalPrediction"; version="0.3-3"; sha256="00sxfgnzqikp92haqnqi4asq904dcsqqnxmz23lx7508qbfx3vhn"; depends=[glmnet mboost]; };
 InventorymodelPackage = derive { name="InventorymodelPackage"; version="1.0.2"; sha256="1w35idsagl9v93ci3qmal3xbf11sy6h1k7xnv25c59ivfnpjpkva"; depends=[e1071]; };
 IsingFit = derive { name="IsingFit"; version="0.3.0"; sha256="0imgj3g6sankzmycjkzzz3bgai3jjycgsinhs5zy9k4vgqjg27d6"; depends=[qgraph Matrix glmnet]; };
 IsingSampler = derive { name="IsingSampler"; version="0.2"; sha256="16vwb5pcqjvvsk9wsgj10mzhgh72iz1q6n8nmkva6y1l7xv54c8w"; depends=[Rcpp plyr magrittr nnet Rcpp]; };
-Iso = derive { name="Iso"; version="0.0-15"; sha256="18ig772xxsbj1vhrv7b20hrglnnz742s1mjzhwx02bpjhica4a46"; depends=[]; };
+Iso = derive { name="Iso"; version="0.0-17"; sha256="0lljc99sdzdqj6d56qbsggibr6pkdwkh821bj70ianikyvmdc1y0"; depends=[]; };
 IsoCI = derive { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; };
 IsoGene = derive { name="IsoGene"; version="1.0-23"; sha256="18sl1qki2dn4ldycpqazj23zcibs3zqwp355q24nwr802xx3y4a6"; depends=[Iso xtable ff]; };
 IsotopeR = derive { name="IsotopeR"; version="0.4.7"; sha256="18gwmh4nprj4z0ar1w8npj2ymxihw5ydwa33g25mimjk8y2cs0x5"; depends=[coda fgui runjags]; };
 JADE = derive { name="JADE"; version="1.9-92"; sha256="0ki3jpz4npjikn3jjb7ppiyx0flhxx3p8aghjxlm3klhkm0k6ix4"; depends=[clue]; };
 JAGUAR = derive { name="JAGUAR"; version="2.0"; sha256="1c9pyg9jph95161g6zz0jlv5hlyvr9z960by7x3pv7plfkppjy7m"; depends=[Rcpp plyr lme4 doParallel Rcpp]; };
 JASPAR = derive { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; };
-JBTools = derive { name="JBTools"; version="0.7.2.6"; sha256="1wpkv8841kzpw2iqacp6k0y182lsvfl1ri54aq1hg4ypb51b8ibb"; depends=[foreach gplots colorspace plotrix]; };
+JBTools = derive { name="JBTools"; version="0.7.2.9"; sha256="0bynqn3daqgmi3l9asy34mfwyfjkn35k465dfqqi3xwx6cbzlg5k"; depends=[foreach gplots colorspace plotrix]; };
 JGL = derive { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; };
 JGR = derive { name="JGR"; version="1.7-16"; sha256="0iv659mjsv7apzpzvmq23w514h6yq50hi70ym7jrv948qrzh64pg"; depends=[rJava JavaGD iplots]; };
 JM = derive { name="JM"; version="1.3-0"; sha256="0yn33dvy9kp7xaxlqk11f86qaichdcxpmq04gpnbcs8w8cdjjz3m"; depends=[MASS nlme survival]; };
@@ -956,7 +973,7 @@ LCAextend = derive { name="LCAextend"; version="1.2"; sha256="1y9azq9v42a3z5fq6g
 LCFdata = derive { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; };
 LDAvis = derive { name="LDAvis"; version="0.2"; sha256="18fbnk5qd7icn3mgwwb3ld3c9n3j1z4ydc2pg2zizkrahhqxdswi"; depends=[proxy RJSONIO]; };
 LDOD = derive { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rsolnp Rmpfr]; };
-LDPD = derive { name="LDPD"; version="1.0.2"; sha256="0bs3s6x6f9rpp53x8ird6qnz9rfayf64askrr04hdjhlgw7cs0n7"; depends=[MASS nleqslv]; };
+LDPD = derive { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; };
 LDRTools = derive { name="LDRTools"; version="0.1"; sha256="1cr0v6qsdldy89p44lhr6hisqaz99qzab32kd1srdnnwnwl1q2y4"; depends=[]; };
 LDcorSV = derive { name="LDcorSV"; version="1.3.1"; sha256="0i4npl90mkj8vry6ckq8bc4ydbl44vxichgsxyn80r6k9i71yl67"; depends=[MASS]; };
 LDheatmap = derive { name="LDheatmap"; version="0.99-1"; sha256="1bj42chw1xyf8yg6cfv9p4yzsggng7zy6wrw6q22559pwm6c6vr0"; depends=[genetics]; };
@@ -985,13 +1002,13 @@ LSAfun = derive { name="LSAfun"; version="0.4"; sha256="178lbk5f2vjcpxand15l1dlq
 LSC = derive { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[LICORS RColorBrewer fields gam Matrix]; };
 LSD = derive { name="LSD"; version="3.0"; sha256="069p33aw6iwikp82b7b8wa77wlyjqwr4hcwvrgaxgwqdgn6jjg3k"; depends=[]; };
 LSMonteCarlo = derive { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[mvtnorm fBasics]; };
-LTPDvar = derive { name="LTPDvar"; version="1.1"; sha256="0zb3ffz5vw1zabgzhpcw1mzfqh4g7r0sq4iy31nzyv8smdwddqzw"; depends=[]; };
+LTPDvar = derive { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; };
 LTR = derive { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; };
 LVMMCOR = derive { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[nlme MASS]; };
 LVQTools = derive { name="LVQTools"; version="1.2"; sha256="06mninrrr49xsh00gfsp0vc418r6pdvq3m6sbnj0ywdyki106mni"; depends=[]; };
 LaF = derive { name="LaF"; version="0.6.2"; sha256="180xsqilpkql8my0dimsxj1kpmb3jl19l6bz8li8m63zii4xmwmp"; depends=[Rcpp Rcpp]; };
 Lahman = derive { name="Lahman"; version="3.0-1"; sha256="0w7vp3vjxhigyyqmmka4bw5v4pp5z3jzmf0krq8biwzrpx5qp86x"; depends=[]; };
-LakeMetabolizer = derive { name="LakeMetabolizer"; version="1.3.1"; sha256="1k764w8f30jfz1xkq9xjm9rwfdll5kp7jv3zc4932ck8cgqam3jv"; depends=[rLakeAnalyzer plyr]; };
+LakeMetabolizer = derive { name="LakeMetabolizer"; version="1.3.3"; sha256="06mgn5dgdw0gaw1za20cabs4bx6q5bgv0x09imxhskik76kini01"; depends=[rLakeAnalyzer plyr]; };
 Lambda4 = derive { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; };
 LambertW = derive { name="LambertW"; version="0.5.1"; sha256="0mhw748nkikaq96azps7yyzkz5glibhb8rh6f748vj9lrq3wa5mn"; depends=[moments MASS gsl]; };
 Laterality = derive { name="Laterality"; version="0.9.3"; sha256="0pl5bfbkzhgxjjzzh99s6rh4jsq0pbcgc902i0z2lmmivgs5qmd6"; depends=[ade4]; };
@@ -1017,11 +1034,11 @@ LogitNet = derive { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24
 LogrankA = derive { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; };
 LoopAnalyst = derive { name="LoopAnalyst"; version="1.2-3"; sha256="0xbiy1xa2c6acfrzh6p9pa6wrds8ipskxq0f86ia9g5zkp1rjk2j"; depends=[nlme]; };
 LowRankQP = derive { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; };
-Luminescence = derive { name="Luminescence"; version="0.4.3"; sha256="11nrgi403ryjj7y1p995fxcyqz117qawyharv1yad8f33l610d5m"; depends=[XML shape rgl matrixStats raster sp zoo bbmle data_table Rcpp minpack_lm Rcpp]; };
+Luminescence = derive { name="Luminescence"; version="0.4.4"; sha256="0b7a55aqishi6jwxlpkbakfr38brjd4c61n4mcbsg6nwg7qiz1v7"; depends=[XML shape rgl matrixStats raster zoo bbmle data_table Rcpp minpack_lm Rcpp]; };
 M3 = derive { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[ncdf4 rgdal maps mapdata]; };
 MADAM = derive { name="MADAM"; version="1.2.2"; sha256="09w5liqa3mpkbyvkwlabcgyg2b4316qpzq7pbpl0wxl74bsh76vq"; depends=[]; };
 MAINT_Data = derive { name="MAINT.Data"; version="0.4"; sha256="0338q1yh7b0mbnmh3rbli8vq0fzxyx4qxx0143p615ahsf68jw1c"; depends=[]; };
-MALDIquant = derive { name="MALDIquant"; version="1.11"; sha256="1jnpmv44j9zry64wvnv37hcda61570hypnv16z99arjazpi4nzmn"; depends=[]; };
+MALDIquant = derive { name="MALDIquant"; version="1.12"; sha256="1grlqplcz41xdr3wlmn246xs3vk8y6qqq0n92srv2crlr8fw2yg2"; depends=[]; };
 MALDIquantForeign = derive { name="MALDIquantForeign"; version="0.9"; sha256="0bs6frqz462hrad16kjvbmq2s66bv3kpriav4hdz5a4klra389gl"; depends=[MALDIquant base64enc digest downloader readBrukerFlexData readMzXmlData XML]; };
 MAMA = derive { name="MAMA"; version="2.2.1"; sha256="1dcyfir6jv28jzvphiqrjns3jh2zg2201iwcvjzbmddl2isk9h0i"; depends=[metaMA xtable gtools xtable]; };
 MAMS = derive { name="MAMS"; version="0.4"; sha256="0v4sa8cyjdkg7lrznl7jv8xqm6qf67jf946fd6ymbd0wpd7gxrgp"; depends=[mvtnorm]; };
@@ -1051,7 +1068,7 @@ MCAvariants = derive { name="MCAvariants"; version="1.0"; sha256="08c5qpklilj41a
 MCDA = derive { name="MCDA"; version="0.0.8"; sha256="0zpjbshvv88dvqf6a6yw9zhzzh2j90b9yx8yg7q52c3l7a9lks6w"; depends=[Rglpk Kendall glpkAPI]; };
 MCL = derive { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; };
 MCMC_OTU = derive { name="MCMC.OTU"; version="1.0.8"; sha256="1bdmvwxkm162m3237bgf42dm5kp3q0giwf0avrkla8qd834gqch0"; depends=[MCMCglmm ggplot2]; };
-MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.1.7"; sha256="0hqbl38r2acvwmxkx7j6lab6an90ykia4bffjmy9a319l0dps5l4"; depends=[MCMCglmm ggplot2 coda]; };
+MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.2"; sha256="1v8jkxxy7z1r3l9jlshhsq6634chf30d9bb1w80iqrjfn6aamn69"; depends=[MCMCglmm ggplot2 coda]; };
 MCMC4Extremes = derive { name="MCMC4Extremes"; version="1.0"; sha256="1ib3rllvqjni9xg3634ankrr66f1lj376kl3xhfwnwbfsbi4a8pw"; depends=[evir]; };
 MCMCglmm = derive { name="MCMCglmm"; version="2.21"; sha256="1mjjp65w7pg2kxrx2qf0lh1kdi9d21xxj7s39zhi3q8ixw35h95r"; depends=[Matrix coda ape corpcor tensorA]; };
 MCMCpack = derive { name="MCMCpack"; version="1.3-3"; sha256="0s1j3047qp2fkwdix9galm05lp7jk7qxyic6lwpbd70hmj8ggs76"; depends=[coda MASS]; };
@@ -1059,6 +1076,7 @@ MCPAN = derive { name="MCPAN"; version="1.1-15"; sha256="0811wrbp0nf4nj8kvq62ks8
 MCPMod = derive { name="MCPMod"; version="1.0-8"; sha256="1kkak9x66dmannhxfdp6cybbjh2g43p03kyp7a4x1az7h4bnc92f"; depends=[mvtnorm lattice]; };
 MCPerm = derive { name="MCPerm"; version="1.1.4"; sha256="0g65vzn43k6qrsglxd2kz245f662gl3c2gdz6qvvxa96v6q9lhh1"; depends=[metafor]; };
 MCS = derive { name="MCS"; version="0.1.1"; sha256="0fxc5ri4ci3r5w1hdicqm1j0g6fwrl3wng7qwc2c0isagrn3vp4n"; depends=[]; };
+MCTM = derive { name="MCTM"; version="1.0"; sha256="14xjfskyrqi0m58lkwjfjpss5j7wy3ajr148n526czrrpccg108j"; depends=[]; };
 MChtest = derive { name="MChtest"; version="1.0-2"; sha256="01lflilrp42m236cznn6qgzvv5v9fzpx6wcfxp3q545bw2xmbdvj"; depends=[]; };
 MConjoint = derive { name="MConjoint"; version="0.1"; sha256="02yik28mhvd4rfqwrprdbdjx9c49ds55fh042bsjajs2ip467w5c"; depends=[]; };
 MDM = derive { name="MDM"; version="1.3"; sha256="1bvjhl243rf19829ly1qc20ik937hb82lq23aiysj7ya55z8hdpf"; depends=[nnet]; };
@@ -1076,18 +1094,21 @@ MGRASTer = derive { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sab
 MGSDA = derive { name="MGSDA"; version="1.1"; sha256="09z066sfjvx7awxc86gfw066wlz6svj7nxkhlas63a7zfbkiz7hl"; depends=[glmnet MASS]; };
 MHadaptive = derive { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; };
 MIICD = derive { name="MIICD"; version="2.1"; sha256="1lh3pbpxn7lbs68741ydw264qn9rap7kmcw49vnjvvzdp7hf24in"; depends=[survival MASS mstate]; };
-MIIVsem = derive { name="MIIVsem"; version="0.1"; sha256="098ybi5xdz7vvgd4vczqxm54gaq6cjsg0lxk319bx3z0da1a0bx5"; depends=[lavaan]; };
+MIIVsem = derive { name="MIIVsem"; version="0.2"; sha256="15sv6fskhdm70vyz6y6wbxw9ghwinvqad7414qkn7lgymn5fm767"; depends=[lavaan Matrix]; };
 MILC = derive { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; };
 MIPHENO = derive { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; };
 MImix = derive { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; };
+MInt = derive { name="MInt"; version="1.0.1"; sha256="1nk02baainxk7z083yyajxrnadg2y1dnhr51fianibvph1pjjkl6"; depends=[glasso trust MASS testthat]; };
 MKLE = derive { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; };
 MKmisc = derive { name="MKmisc"; version="0.98"; sha256="0ng6n1x2x1bg60byhpk212pihh7hirbjr4s89lzrwj854z93bv5l"; depends=[RColorBrewer robustbase]; };
+MLCIRTwithin = derive { name="MLCIRTwithin"; version="1.0"; sha256="01fp2pyiwpzsby3iwn9w9ry4nksy2llwzawrmba80s5m7mrcljbn"; depends=[MASS limSolve MultiLCIRT]; };
 MLCM = derive { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3y4928chxkggnfwwxp8hqw4r6px"; depends=[]; };
 MLDS = derive { name="MLDS"; version="0.4.3"; sha256="1vql92y2dy1ba5l5xdysqzkzvkrr4bhclmjabn49c8qb2xc2rl40"; depends=[MASS]; };
 MLEcens = derive { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; };
 MLRMPA = derive { name="MLRMPA"; version="1.0"; sha256="0gfbi70b15ivv76l3i0zlm14cq398nlny40aci3vqxxd0m2lyyx5"; depends=[ClustOfVar]; };
 MLmetrics = derive { name="MLmetrics"; version="1.0.0"; sha256="05j8hwcvfrsslib5k4w3xwkllb3rxdxazsld26zpjf3dc643ag9a"; depends=[]; };
 MM = derive { name="MM"; version="1.6-2"; sha256="1z7i8ggd54qjmlxw9ks686hqgm272lwwhgw2s00d9946rxhb3ffi"; depends=[magic partitions emulator Oarray]; };
+MM2S = derive { name="MM2S"; version="1.0.0"; sha256="0g5x375c58xsihj43dh19hx6vh87f8ppjibik5sb7lxvl1xms49c"; depends=[kknn lattice pheatmap]; };
 MMIX = derive { name="MMIX"; version="1.2"; sha256="02c74qp48ixqh5cjp2006zgg4xz4bgxxq3csyhjl219if19kmj5m"; depends=[]; };
 MMMS = derive { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[survival glmnet]; };
 MMS = derive { name="MMS"; version="3.00"; sha256="06909912v2hr52s8k0a0830lbmdh05dcd7k47vydhbwq3rzf3ahg"; depends=[glmnet Matrix mht]; };
@@ -1106,7 +1127,7 @@ MPV = derive { name="MPV"; version="1.38"; sha256="1w3b0lszqmsz0yqvaz56x08xmy1m5
 MRCE = derive { name="MRCE"; version="2.0"; sha256="0fnd7ykcxi04pv1af5zbmavsp577vkw6pcrh011na5pzy2xrc49z"; depends=[QUIC]; };
 MRCV = derive { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; };
 MRH = derive { name="MRH"; version="2.0"; sha256="0d6zfhyy8a0pjrr74lj0mcagh49pjh15yp4wa7g7j4qv8wfw5pkv"; depends=[survival KMsurv coda]; };
-MRIaggr = derive { name="MRIaggr"; version="1.1"; sha256="0yq5qjc04rgssjb8pskvrcnr3xv1dlzakily39p9ya526zm9lrmv"; depends=[Rcpp spam Matrix Rcpp RcppArmadillo]; };
+MRIaggr = derive { name="MRIaggr"; version="1.1.2"; sha256="0z410xkfyaqfrdiwkw29z7l6n15hdwd4dwbjn211sj6s90fa4q2w"; depends=[Rcpp Rcpp RcppArmadillo]; };
 MRMR = derive { name="MRMR"; version="0.1.3"; sha256="1b3a4bkpcncl4sh7d81nk6b2dzhzqn9zhqdxv31jgippsqm2s3k2"; depends=[reshape2 ggplot2 lubridate lmtest plyr]; };
 MRSP = derive { name="MRSP"; version="0.4.3"; sha256="0zv22xiq3qh9x3r2ckkvq1vv0vkcirh8y87053bqvw1m20j7q1by"; depends=[matrixcalc Formula]; };
 MRsurv = derive { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[survival mvtnorm]; };
@@ -1120,14 +1141,14 @@ MSeasy = derive { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4
 MSeasyTkGUI = derive { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; };
 MSwM = derive { name="MSwM"; version="1.2"; sha256="01l23ia20y3nchykha4vz6sa757zmbvgx2315cacxfcqk9rgs08c"; depends=[nlme]; };
 MTS = derive { name="MTS"; version="0.33"; sha256="0i7kpgsw56vvgrdgddn83i9lzjlb72z4llffqai29qq0m1i7hm65"; depends=[Rcpp fGarch mvtnorm Rcpp]; };
-MTurkR = derive { name="MTurkR"; version="0.6"; sha256="0kmi1x9xsqwi7llgwmkmnkn2hir5r9nryhqh8lrh41fwps4la9x8"; depends=[RCurl digest XML]; };
+MTurkR = derive { name="MTurkR"; version="0.6.5.1"; sha256="0yg2ycramz0rpac4bfyq8wciyv9jl93al0qsdbzrl7c37z151w3l"; depends=[RCurl digest XML]; };
 MUCflights = derive { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[XML geosphere sp RSQLite NightDay]; };
 MVA = derive { name="MVA"; version="1.0-5"; sha256="18x075hjqhrjwxivvrixgs6yc67il3n5p1m7v2wymcf8h2mkki91"; depends=[HSAUR2]; };
 MVB = derive { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
-MVN = derive { name="MVN"; version="3.9"; sha256="1l6bib1gl5nj7p1dk6mbmflp9p5sgm405q3l53pqmq09jm55flh6"; depends=[nortest moments MASS robustbase mvoutlier plyr psych]; };
+MVN = derive { name="MVN"; version="4.0"; sha256="1ql50ch6qig7r0xnfv5f74k3vc32k04jgmvjbndgyzbacn2ibrm7"; depends=[nortest moments MASS robustbase mvoutlier plyr psych]; };
 MVR = derive { name="MVR"; version="1.20.0"; sha256="1wwzws9116ck14g6xd1svmwc9wkr8piwb24bddnzri388p8qkgb4"; depends=[statmod]; };
-MVar_pt = derive { name="MVar.pt"; version="1.0"; sha256="0wzc2r5psla8khyrkd7p8y23cxyn5bsy8vxglh2p3mpayfzi8k2a"; depends=[]; };
-MXM = derive { name="MXM"; version="0.3"; sha256="14kw4shc0jp6jrs8afimy13jssah0agwa3p5ay2py1zfid43k63y"; depends=[gRbase VGAM MASS pcalg survival]; };
+MVar_pt = derive { name="MVar.pt"; version="1.1"; sha256="0jcxsf0c9klnj19j8shiadxrbh3wa7da2vywk352ylirl5vdv2yl"; depends=[]; };
+MXM = derive { name="MXM"; version="0.3.1"; sha256="06sp6hy0dparya6fcfbiyhh0h10r8ai8fmh4rq2fz0dq6prk95ic"; depends=[]; };
 MaXact = derive { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; };
 Maeswrap = derive { name="Maeswrap"; version="1.4.11"; sha256="15i36xj2bdzhly78614077s8k2z75a1gmzl2crsfgvhyyjdax8r7"; depends=[rgl lattice geometry]; };
 ManyTests = derive { name="ManyTests"; version="1.1"; sha256="11xk3j2q7w6b6ljmp7b8gni0khpmpvcvzwxypy0w8ihi2gaczsxj"; depends=[]; };
@@ -1139,11 +1160,11 @@ MasterBayes = derive { name="MasterBayes"; version="2.52"; sha256="12ka2l4x6psij
 MatchIt = derive { name="MatchIt"; version="2.4-21"; sha256="02kii2143i8zywxlf049l841b1y4hqjwkr1cnyv6b8b7y7lz2m5v"; depends=[MASS]; };
 Matching = derive { name="Matching"; version="4.8-3.4"; sha256="04m647342j4yi74ds7ddwnyrf58qdy7k3mc067k3p779qavq2ka1"; depends=[MASS]; };
 MatchingFrontier = derive { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[MASS igraph segmented]; };
-Matrix = derive { name="Matrix"; version="1.2-0"; sha256="0ywz213p6cpwnklxd81hzdyxjzagaj6cn32ycc5rcnhxy30d7kk5"; depends=[lattice]; };
+Matrix = derive { name="Matrix"; version="1.2-1"; sha256="0farq1x1qhgzdwqqd4bn3g6hbv91hk5sm2v00vphf0zgj2fg2qm6"; depends=[lattice]; };
 MatrixEQTL = derive { name="MatrixEQTL"; version="2.1.1"; sha256="1bvfhzhvm1psgq51kpjcpp7bidaxcrxdigmv6abfi3jk5kyzn5ik"; depends=[]; };
 MatrixModels = derive { name="MatrixModels"; version="0.4-0"; sha256="1jcjsyha0xmz264g1haj7x8zpzjmp1m0jl39h5bf8r45hhlaxcsa"; depends=[Matrix]; };
 MaxPro = derive { name="MaxPro"; version="3.1-2"; sha256="1y2g8a8yvzb24dj0z82nzfr6ylplb9sbi2dmj7f3pb4s3yr5zm8y"; depends=[nloptr]; };
-MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.2.3"; sha256="09a7zd0jkf5gx0zybbnlzcmzhzdiwh15mjg2nfyy00lrjbhvq83i"; depends=[dplyr rgdal rgeos rvest sp stringr]; };
+MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.2.4"; sha256="04ljjzcqfgy136wviz92gdavqzjhbai1v69nj4kg6vc6nwvkhnbx"; depends=[dplyr rgdal rgeos rvest sp stringr]; };
 McParre = derive { name="McParre"; version="1.0.1"; sha256="16bfca867drbknzc6bylg8paa8p72l23wgjpyvy4pd9z6lpgmhdy"; depends=[MASS]; };
 McSpatial = derive { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
 Mcomp = derive { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[tseries forecast]; };
@@ -1167,6 +1188,7 @@ MethComp = derive { name="MethComp"; version="1.22.2"; sha256="0f9l36d00x054yqgb
 Methplot = derive { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; };
 Metrics = derive { name="Metrics"; version="0.1.1"; sha256="1yqhlsmhh9sl7qngl85b7qb980s54h13wwznpakyvvwlar64yqrw"; depends=[]; };
 MfUSampler = derive { name="MfUSampler"; version="0.9.1"; sha256="0fw1jw2ljsxmvnaayn7zdrrsnbbkkb5n9nm396321p36bqkf1pk3"; depends=[ars]; };
+MiRSEA = derive { name="MiRSEA"; version="1.0"; sha256="1azabfwd83x6g3fpwdqss5b0rxj8zfmj9972bd0brk8z39wggsrr"; depends=[]; };
 MiST = derive { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; };
 MicSim = derive { name="MicSim"; version="1.0.8"; sha256="0i9vyim7wfnaf1zcs1vz6yc7xkr1hzhqcccbcvg15vkzhr23f8lg"; depends=[chron snowfall rlecuyer]; };
 MicroDatosEs = derive { name="MicroDatosEs"; version="0.6.3.1"; sha256="17ka9bdic8vdr0aabmgm216zm9a8jppxll042b5ric4vzplah17d"; depends=[memisc Hmisc]; };
@@ -1178,9 +1200,9 @@ MissMech = derive { name="MissMech"; version="1.0.2"; sha256="1b7i1balfl1cqr3l4l
 MissingDataGUI = derive { name="MissingDataGUI"; version="0.2-2"; sha256="07a3y8l0r7a0f7zmp5pg2aqkf7hyk8cf562x3m8b38w96vir4vr0"; depends=[gWidgetsRGtk2 ggplot2 GGally cairoDevice reshape]; };
 MitISEM = derive { name="MitISEM"; version="1.0"; sha256="03305ds3rgr29z4idaxzsm83igiygna2sqd5vpixklngsrp8w341"; depends=[mvtnorm]; };
 MixAll = derive { name="MixAll"; version="1.0.2"; sha256="10jwiri659i2h0gkaxc41gjvff4v465syxr0nppn1qqz5910jql0"; depends=[rtkpp Rcpp rtkpp]; };
-MixGHD = derive { name="MixGHD"; version="1.5"; sha256="1wjjz300yr9mj5kwrpybdji0znqrh26i2jlhbjcxkn3j4frkhlh3"; depends=[MASS mclust Bessel mvtnorm ghyp numDeriv mixture]; };
+MixGHD = derive { name="MixGHD"; version="1.6"; sha256="0lmv1yspjn9m5kw0zd2sabgy33zd77p0nqfvs9cvy3ldvz35095i"; depends=[MASS mclust Bessel mvtnorm ghyp numDeriv mixture]; };
 MixMAP = derive { name="MixMAP"; version="1.3.1"; sha256="0m6m9wi0ain7z96s6z6kmwjisfqm3al6m459y5zr2l1cdbdpxfpv"; depends=[lme4]; };
-MixSim = derive { name="MixSim"; version="1.0-9"; sha256="16kg12784z82x8f1vscv9d5yakmki2m8gqr4hy9417c31xfkk3zy"; depends=[MASS]; };
+MixSim = derive { name="MixSim"; version="1.1-1"; sha256="1a1hrsnm6zv9vag7hq8plrkjr4ak26w7k58wdkgxsjb9r6qzm1yf"; depends=[MASS]; };
 MixedTS = derive { name="MixedTS"; version="1.0.1"; sha256="0ljal2jxscwrv439blavf5gjxbi3k3jfqqmwblzfvc05dqgvdk0b"; depends=[MASS]; };
 MixtureInf = derive { name="MixtureInf"; version="1.0-1"; sha256="1cq8zzhhb6vg545n9aw1b9fhx025zy75dd6pw161svsb5776py5d"; depends=[]; };
 Mobilize = derive { name="Mobilize"; version="2.16-4"; sha256="16vdvpwspa0igb52zvzyk0if9l4wq1hm8y42572i8sh1m82wyyfs"; depends=[Ohmage ggplot2 wordcloud reshape2]; };
@@ -1196,15 +1218,15 @@ MortalitySmooth = derive { name="MortalitySmooth"; version="2.3.4"; sha256="1clx
 MplusAutomation = derive { name="MplusAutomation"; version="0.6-3"; sha256="1zb4drqaswzwssky1bp69p3p8inqfdvxg2ji9bjrzf3vf0b5fl4p"; depends=[boot plyr gsubfn coda xtable lattice texreg]; };
 Mposterior = derive { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp Rcpp RcppArmadillo]; };
 MuFiCokriging = derive { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; };
-MuMIn = derive { name="MuMIn"; version="1.13.4"; sha256="1zk8glw5laismhhfgkbxk05qjmzv80bkp3ib45x7i05s2mqy1yxn"; depends=[]; };
+MuMIn = derive { name="MuMIn"; version="1.14.0"; sha256="0zwwwp7979kss5871vp6975maqm8gsc0hn75fxq90l0xcyipxvcy"; depends=[Matrix]; };
 MultEq = derive { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; };
 MultNonParam = derive { name="MultNonParam"; version="1.0"; sha256="0xff81wjmyw2d38r0v3n7vv0dasg9rlrc0zrdwsmfd83zpvxqj5m"; depends=[]; };
 MultiCNVDetect = derive { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; };
-MultiJoin = derive { name="MultiJoin"; version="0.1"; sha256="02wdn2rcci4n553jjd7ivw3afp6w6zcjc002yj0pvi0ai3jw6p92"; depends=[]; };
 MultiLCIRT = derive { name="MultiLCIRT"; version="2.9"; sha256="0anb041nd56rrryhv5w1pb0axxsfkqas177r6yf5h5gbc4vn3758"; depends=[MASS limSolve]; };
 MultiMeta = derive { name="MultiMeta"; version="0.1"; sha256="0gj0wk39fqd21xjcah20jk16jlfrcjarspbjk5xv74c9k4p5gmak"; depends=[gtable mvtnorm expm ggplot2 reshape2]; };
 MultiOrd = derive { name="MultiOrd"; version="2.1"; sha256="12y5cg06qyaz72gk3bi5pqkd55n72rz056y9va49znlsqph09x2x"; depends=[mvtnorm corpcor Matrix psych]; };
 MultiPhen = derive { name="MultiPhen"; version="2.0.0"; sha256="05w7khzyxswlsz4sxhaakbz828zrdya1y8qcsdfc6w7wgl8qpmj9"; depends=[MASS abind epitools meta HardyWeinberg RColorBrewer gplots]; };
+MultiRR = derive { name="MultiRR"; version="1.0"; sha256="0m2v13cygabjbsz0fwxwh03csd3yfdpzk4yfvx8lrim9m90026hz"; depends=[MASS lme4]; };
 MultiSV = derive { name="MultiSV"; version="0.0-67"; sha256="0924lvkx12aqjxxz8bwqdi4h9xc2acf8aynllx0m45ip5r4gh1g2"; depends=[nlme reshape]; };
 Multiclasstesting = derive { name="Multiclasstesting"; version="1.3.9"; sha256="09y3gnarqv15wgmk545qrwpjwb2ilv2b2kc74cxzcb2p1lflfjzm"; depends=[]; };
 MultinomialCI = derive { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; };
@@ -1217,17 +1239,18 @@ NB = derive { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx
 NBDdirichlet = derive { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; };
 NBPSeq = derive { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[]; };
 NCmisc = derive { name="NCmisc"; version="1.1.4"; sha256="0hbrad72lzp0vi0j9lvpmvdih7vijqghqng1f0hjd8fg8hjvcflg"; depends=[proftools dplyr]; };
-NEff = derive { name="NEff"; version="1.0"; sha256="0ksnmxjy2ms2z7rq4rddnykydwlb4f9c13nak5f8m65pfjcgv3sk"; depends=[msm bit]; };
-NHANES = derive { name="NHANES"; version="1.0"; sha256="18sy2x61bnily3fz0rs61y44kn6y2ikgrzr6nhgm6fkqv02ffdg8"; depends=[]; };
+NEff = derive { name="NEff"; version="1.1"; sha256="16ys1fi28kbzg3am9vz1c5pc9x0ac47pl6za04h63lspk99yplzk"; depends=[msm bit]; };
+NHANES = derive { name="NHANES"; version="2.0"; sha256="0bdsccr1g2vnisllnmj2z4sma5hdp2iqm1fpr0kmbv1dnkpmxd41"; depends=[]; };
 NHEMOtree = derive { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[partykit emoa sets rpart]; };
 NHMM = derive { name="NHMM"; version="3.5"; sha256="03il5y6vz5zyadydhk3qg6sd6fmsw7md9if1igyy9643mxxm1g0f"; depends=[BayesLogit msm MCMCpack MASS Rcpp Rcpp]; };
+NHMSAR = derive { name="NHMSAR"; version="1.1"; sha256="1qbgxb684qwcb29x95a48r6bndqwdi1drwzimkhkb2ldm98yga3z"; depends=[ucminf lars SIS caTools glasso]; };
 NHPoisson = derive { name="NHPoisson"; version="3.1"; sha256="1gr682kxgw227yqw9w0iw9lrijsz5iszhnfk0mdhi6m1w9s28kcn"; depends=[car]; };
 NISTnls = derive { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; };
 NISTunits = derive { name="NISTunits"; version="1.0.0"; sha256="156rk3wams52lw3inf55s9v7mi5x29mmb41p8kvryimnzgi904ca"; depends=[]; };
 NLP = derive { name="NLP"; version="0.1-7"; sha256="1r7m6mq7i6xcf2qxzwvwx129fq89gx6f8kxqn76iw5a5nfarq87w"; depends=[]; };
 NLPutils = derive { name="NLPutils"; version="0.0-2"; sha256="1ny1q4b4pd1pl6d3lgv9zfkrw5wjd6pvhwlahj82fr1z3nq46bwb"; depends=[NLP SnowballC qdap]; };
 NLRoot = derive { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; };
-NMF = derive { name="NMF"; version="0.20.5"; sha256="1j91vklzi4qjlix5sn9qh86dwx6vxnla2p4ag81apkr441jkvynr"; depends=[pkgmaker registry rngtools cluster stringr digest gridBase colorspace RColorBrewer foreach doParallel ggplot2 reshape2]; };
+NMF = derive { name="NMF"; version="0.20.6"; sha256="0mmh9bz0zjwd8h9jplz4rq3g94npaqj8s4px51vcv47csssd9k6z"; depends=[pkgmaker registry rngtools cluster stringr digest gridBase colorspace RColorBrewer foreach doParallel ggplot2 reshape2]; };
 NMFN = derive { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; };
 NMOF = derive { name="NMOF"; version="0.34-2"; sha256="1hqq0gypry614jfc8hcagwkf6xz6z98pb9hzkl9ygykv4rfs5bms"; depends=[]; };
 NNTbiomarker = derive { name="NNTbiomarker"; version="0.28"; sha256="1y9lkn12a7p1qwi10pzzidhjgkzazn6lfflihnc46phf6yzgdrs6"; depends=[shiny xtable stringr]; };
@@ -1293,9 +1316,10 @@ OligoSpecificitySystem = derive { name="OligoSpecificitySystem"; version="1.3";
 OmicKriging = derive { name="OmicKriging"; version="1.3"; sha256="1fj131684faj75jdipmsvb8s684x72is6zz79hwb5wszklk00ind"; depends=[doParallel ROCR irlba]; };
 Oncotree = derive { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; };
 OneTwoSamples = derive { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; };
-OpasnetUtils = derive { name="OpasnetUtils"; version="1.1.0"; sha256="1a7j96pg0v8j527m0w48k8lxwb2ynrqq1y7140bi1ciq0466azx3"; depends=[rjson RCurl reshape2 triangle httpRequest digest xtable ggplot2 rgdal sp]; };
+OpasnetUtils = derive { name="OpasnetUtils"; version="1.2.0"; sha256="1ckagq14w9923a4x7pk9mfzqcfayi00apwd2kvqzgd0s6355r1q7"; depends=[rjson RCurl reshape2 triangle httpRequest digest xtable ggplot2 rgdal sp plyr]; };
 OpenCL = derive { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; };
 OpenMPController = derive { name="OpenMPController"; version="0.1-2"; sha256="1cpsbjmqql0fsjc1xv323pfkhfr9vrcv5g4j3p1qc5zn4z9pq7r6"; depends=[]; };
+OpenMx = derive { name="OpenMx"; version="2.2.4"; sha256="1w72ikysda45zbvwlr297fqqjl3law2r6m3c9n9j5d8r3clfhqyl"; depends=[digest MASS RcppEigen StanHeaders BH]; };
 OpenRepGrid = derive { name="OpenRepGrid"; version="0.1.9"; sha256="1s40c2yfd4a4khs0ghlbzii94x8cidg851bivanplg2s51j5jrhk"; depends=[pvclust colorspace plyr stringr abind rgl GPArotation psych XML]; };
 OpenStreetMap = derive { name="OpenStreetMap"; version="0.3.1"; sha256="009xiqsbgqb3lba6msyzq7ncripmvpymxynkga8pqc8npv8g7fzb"; depends=[rJava raster rgdal rJava]; };
 OptHedging = derive { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; };
@@ -1312,7 +1336,7 @@ OutbreakTools = derive { name="OutbreakTools"; version="0.1-13"; sha256="0wwb43n
 OutlierDC = derive { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[survival quantreg Formula]; };
 OutlierDM = derive { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[quantreg MatrixModels outliers pcaPP]; };
 OutrankingTools = derive { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; };
-P2C2M = derive { name="P2C2M"; version="0.6"; sha256="00m4dmvnvbjbxxqi9ai2zd33cwlsb7ghjbswz256w5iab4c0ls02"; depends=[ape apTreeshape ggplot2 rPython stringr]; };
+P2C2M = derive { name="P2C2M"; version="0.7.6"; sha256="07ycl22v03b2xdaw4v0l6layqhab431ma38qywzm96hkl3ywvl49"; depends=[ape ggplot2 rPython stringr]; };
 PAFit = derive { name="PAFit"; version="0.7.2"; sha256="047ajzb9xnhxqa9v5dggznix9rd9z66g0mzanzwqb8ds5f8gm8ls"; depends=[Rcpp Rcpp]; };
 PAGI = derive { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; };
 PAGWAS = derive { name="PAGWAS"; version="1.0"; sha256="1zwq4b0bgsskzvlapffh30ys9y4wlcfwpjqw8m2i9zabib5knx9i"; depends=[lars doMC mnormt]; };
@@ -1339,7 +1363,7 @@ PCS = derive { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kw
 PCovR = derive { name="PCovR"; version="2.6"; sha256="0b1bbf6namll2afxh61qz4xz4ipzipdnfhbcqlragmyj9pisaf45"; depends=[GPArotation ThreeWay MASS Matrix]; };
 PDQutils = derive { name="PDQutils"; version="0.1.1"; sha256="0klzh7ilgs02i0cvb5j6jd65dxyg2c3yk5rc82wcjn9ixhr8ks9b"; depends=[orthopolynom moments]; };
 PDSCE = derive { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; };
-PEIP = derive { name="PEIP"; version="1.7"; sha256="1bagi1kr8vd3b3r524vrk747bqmd9insny1nxj8bdvdk0a9yr949"; depends=[bvls Matrix RSEIS pracma]; };
+PEIP = derive { name="PEIP"; version="2.0-1"; sha256="0zfvp3ngc4320sh6r6y746zxigr2wqgaqasnlkv3hxhzpzxq08lj"; depends=[bvls Matrix RSEIS pracma]; };
 PEMM = derive { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; };
 PERregress = derive { name="PERregress"; version="1.0-8"; sha256="1rhridhfgvrz14h61psfyr5ll13fvxj4b9fwrnlnc6lyqi01wjlc"; depends=[]; };
 PET = derive { name="PET"; version="0.4.9"; sha256="1ijg6mfh3xrc1gjh6a4nq64psk9yh16yc8nfp7c9837xbjigqq7f"; depends=[adimpro]; };
@@ -1367,7 +1391,7 @@ PMA = derive { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3m
 PMCMR = derive { name="PMCMR"; version="1.1"; sha256="0f3882rjyxlcr183qa9y22bxh8nqp307v065aiy61ii0kizj9f70"; depends=[]; };
 PP = derive { name="PP"; version="0.5.3"; sha256="17y1v2536n7ap0kvllwkmndmdjf4wgwl171c053ph45krv37mscf"; depends=[Rcpp Rcpp]; };
 PPtree = derive { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
-PPtreeViz = derive { name="PPtreeViz"; version="1.0.1"; sha256="0010ixyxgal7q5vwpsslvw6p6bb8qkhbysh41rf0ymdwn37p085p"; depends=[gridExtra ggplot2 Rcpp reshape2 Rcpp RcppArmadillo]; };
+PPtreeViz = derive { name="PPtreeViz"; version="1.0.3"; sha256="0m0nw6kh8ybgdih2d10b8q8q0wknrbppad8nq8jmq85sm0xrrysj"; depends=[gridExtra ggplot2 Rcpp reshape2 Rcpp RcppArmadillo]; };
 PRISMA = derive { name="PRISMA"; version="0.2-5"; sha256="06z4z1rbsk5a8kpbs6ymm0m02i8dwbmv783c3l2pn4q3pf6ncmd5"; depends=[Matrix gplots ggplot2]; };
 PROFANCY = derive { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[Matrix lattice igraph]; };
 PROTOLIDAR = derive { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; };
@@ -1383,6 +1407,7 @@ PTAk = derive { name="PTAk"; version="1.2-9"; sha256="1wbjak8dp53601z39kkpa4ysm2
 PTE = derive { name="PTE"; version="1.0"; sha256="10if2hh69yysi2y82m7is74hmzw2xpxijgb8bhy1d4g9n9lqidfs"; depends=[doParallel]; };
 PVAClone = derive { name="PVAClone"; version="0.1-2"; sha256="0afl2il5wdcwzpyhjkgq8iz16q1086c3ndr4cjlyspgbss9h5l24"; depends=[dcmle dclone]; };
 PVR = derive { name="PVR"; version="0.2.1"; sha256="1p87pj9g0qlc8ja6xdj2amny9pbkaqb34x2y9nkl1nj1pkwjq2s5"; depends=[ape splancs]; };
+Pade = derive { name="Pade"; version="0.1-2"; sha256="144wzwh5wy9hmxd4ng6k601ppvdbqn6hrx210kj266dlapwyg8l2"; depends=[]; };
 PairViz = derive { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[TSP gtools]; };
 PairedData = derive { name="PairedData"; version="1.0.1"; sha256="025h5wjsh9c78bg6gmg6p6kvv2s6d5x7fzn3mp42mlybq0ry78p0"; depends=[MASS gld mvtnorm lattice ggplot2]; };
 Paneldata = derive { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; };
@@ -1397,7 +1422,7 @@ PearsonDS = derive { name="PearsonDS"; version="0.97"; sha256="0bsdj4zir12zkv8yh
 PearsonICA = derive { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; };
 PedCNV = derive { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[Rcpp RcppArmadillo ggplot2 Rcpp RcppArmadillo]; };
 PepPrep = derive { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[stringr]; };
-Peptides = derive { name="Peptides"; version="1.0.4"; sha256="0qpppbdsz7c3dw6l5m3sxggma4xxdx0vflwlxpa0d7wynqpsn3wn"; depends=[]; };
+Peptides = derive { name="Peptides"; version="1.1.0"; sha256="0nfldckrb9cvxnzqkhqr06d8a5nna5b900439x49r8njcwr4xpcg"; depends=[]; };
 PerFit = derive { name="PerFit"; version="1.3.1"; sha256="0zmhafr5fk3z66cp46gasgcxcza2q02821sg8zcs0vk5k80md9a7"; depends=[ltm mirt fda Hmisc irtoys MASS Matrix]; };
 PerMallows = derive { name="PerMallows"; version="1.8"; sha256="1p0rnphhjc0rr1zpbff71mk75lnyph994k4p5whwn2fyfzi1pn0f"; depends=[Rcpp Rcpp]; };
 PerfMeas = derive { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[]; };
@@ -1416,6 +1441,8 @@ PogromcyDanych = derive { name="PogromcyDanych"; version="1.5"; sha256="1m6sycca
 PoiClaClu = derive { name="PoiClaClu"; version="1.0.2"; sha256="1j593sc344h9iy7if1ppihx2qd73dv32d77d8ckac43i7b2lig24"; depends=[]; };
 PoisBinNonNor = derive { name="PoisBinNonNor"; version="1.0"; sha256="0a2v5iwrglg4r6zj5qbbg66638kcf45mxw2gs3qv2zpnfkabadnq"; depends=[BB corpcor Matrix mvtnorm]; };
 PoisBinOrd = derive { name="PoisBinOrd"; version="1.1"; sha256="151qqxd2rgh6jxzpclxxa51apiif77j122r2w23bdijkb85sqy9z"; depends=[corpcor GenOrd Matrix mvtnorm]; };
+PoisBinOrdNonNor = derive { name="PoisBinOrdNonNor"; version="1.0"; sha256="1x41mwvdria48cjr3dyq4d0l8v8kp3v9aayfl6jfxy6dhjwdg4vz"; depends=[Matrix corpcor MASS GenOrd BB]; };
+PoisBinOrdNor = derive { name="PoisBinOrdNor"; version="1.0"; sha256="0big81yvbz9qyw4h6h1ak2wzvn56g1d1809m7lnmd2kx780i2hsf"; depends=[Matrix corpcor mvtnorm psych GenOrd]; };
 PoisNonNor = derive { name="PoisNonNor"; version="1.0"; sha256="1i00knyv5m6p9rllkc440cg2agzs36am5b5w9n90506nq36xp8qm"; depends=[BB corpcor MASS Matrix]; };
 PoisNor = derive { name="PoisNor"; version="1.0"; sha256="147ma6qg6nwxzp022jm5mpijhg3jz489qclr9g2mli5mhgm31f8j"; depends=[mvtnorm corpcor Matrix]; };
 PoissonSeq = derive { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; };
@@ -1432,12 +1459,12 @@ PortfolioAnalytics = derive { name="PortfolioAnalytics"; version="1.0.3636"; sha
 PottsUtils = derive { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; };
 PoweR = derive { name="PoweR"; version="1.0.4"; sha256="00y0dvrsbvz8mr8mdw7fk17s5dfgm0f641qg96039y6g3hk2rn77"; depends=[Rcpp Rcpp RcppArmadillo]; };
 Power2Stage = derive { name="Power2Stage"; version="0.3-1"; sha256="0a5llzbhl6s71bh21ka2x50pjissl9gg7f5sskailzcmi60yz2zk"; depends=[PowerTOST]; };
-PowerTOST = derive { name="PowerTOST"; version="1.2-06"; sha256="1amzc0229cwydvnbw59aah52krswdx4k20n6i23vqimmxb26kc64"; depends=[mvtnorm]; };
-PracTools = derive { name="PracTools"; version="0.1"; sha256="0d8m326p41xqr4ndizp5x6qq5h55wgc7yinb6jsxi4xhfd2kiwq5"; depends=[]; };
+PowerTOST = derive { name="PowerTOST"; version="1.2-07"; sha256="0d8nbha0jwkz4phiddpfm32kf8hjrkck05y3w60f40110j9f8yy7"; depends=[mvtnorm]; };
+PracTools = derive { name="PracTools"; version="0.2"; sha256="1njnm0rk2z9p3p8wsj881mddqhpayh56gyyis4cwb5b6pc344s9p"; depends=[]; };
 PredictABEL = derive { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[Hmisc ROCR epitools PBSmodelling]; };
 PredictiveRegression = derive { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; };
 PresenceAbsence = derive { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; };
-PrevMap = derive { name="PrevMap"; version="1.1.4"; sha256="1m5a71s6j6x4kmqij1v7wikblk0a0l9lbskrj6q2znwj0hnbk1wy"; depends=[geoR maxLik raster pdist splancs]; };
+PrevMap = derive { name="PrevMap"; version="1.1.5"; sha256="0bzk09ygz4i3v8s39p0n157wrylp38h5xz32f18py8gr776x311n"; depends=[geoR maxLik raster pdist splancs]; };
 PrivateLR = derive { name="PrivateLR"; version="1.2-21"; sha256="1jwq8f0dnngj8sfbmcmxy34nkkq6yjw0mq3w1f8rasz67v3bwzp3"; depends=[]; };
 ProDenICA = derive { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; };
 ProbForecastGOP = derive { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[RandomFields fields]; };
@@ -1457,7 +1484,7 @@ PwrGSD = derive { name="PwrGSD"; version="2.000"; sha256="0qxvws9mfrnqw5s24qhqk6
 QCA = derive { name="QCA"; version="1.1-4"; sha256="0wg2yfg61bmcxmkxvm9zjrnz4766f176y4gyqvfp5hsp9pp0h2lm"; depends=[lpSolve]; };
 QCA3 = derive { name="QCA3"; version="0.0-7"; sha256="0i9i2i633sjnzsywq51r2l7fkbd4ip217hp0vnkj78sfl7zf1270"; depends=[lpSolveAPI]; };
 QCAGUI = derive { name="QCAGUI"; version="1.9-6"; sha256="020ngni02j2w2ylhyidimm51d426pym2g1hg7gnpb7aplxx67n6x"; depends=[abind QCA]; };
-QCAfalsePositive = derive { name="QCAfalsePositive"; version="1.0"; sha256="0rv2pfaj5fh8zva47k2r2rwzpnilj48jigaazkw2ibs8zq5f3qwz"; depends=[]; };
+QCAfalsePositive = derive { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; };
 QCAtools = derive { name="QCAtools"; version="0.1"; sha256="1fcssxpyw0kfm6xgihkv4qxqmg628ahfr1bk36b9di9d29w6vgn9"; depends=[stringr QCA ggplot2 directlabels]; };
 QCGWAS = derive { name="QCGWAS"; version="1.0-8"; sha256="1wn1kddgfmqv326pihnavbgsbd2yxrlq5s2xgi6kbprssxvj8bk1"; depends=[]; };
 QRM = derive { name="QRM"; version="0.4-10"; sha256="1fkxjqyb9yqki4qwk393ra66wg5dnbr5b5sgypm8wk973crbhcj0"; depends=[gsl Matrix mvtnorm numDeriv timeSeries Rcpp mgcv Rcpp]; };
@@ -1471,18 +1498,18 @@ QualInt = derive { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdc
 Quandl = derive { name="Quandl"; version="2.6.0"; sha256="1mz39sj7dxfh9p5kdq7bxlifbg9izqz04l3ilnfchva7qq1ij01q"; depends=[xts httr zoo]; };
 QuantPsyc = derive { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; };
 QuantifQuantile = derive { name="QuantifQuantile"; version="2.1"; sha256="1d3dcpri8d98mn2c0nfipp1pdr67a8h35p0y7bdil6il71h4qldm"; depends=[rgl]; };
-QuasiSeq = derive { name="QuasiSeq"; version="1.0-6"; sha256="0hv6fmw8kqdg82nwdiqb9naryw4x42rv9xw1zmahgqyxr9ffnrgr"; depends=[Matrix mgcv]; };
+QuasiSeq = derive { name="QuasiSeq"; version="1.0-8"; sha256="113pxmvwwn331g5dcv2zwsvvi5jgc1v41f38sw9gms06i8x3a7q6"; depends=[mgcv pracma]; };
 Quor = derive { name="Quor"; version="0.1"; sha256="1ncl4pj472m881fqndcm6jzn4jkwbnzpc639c9vy5mxa4z569i1g"; depends=[combinat]; };
 R_cache = derive { name="R.cache"; version="0.10.0"; sha256="0y8q3w9z9cyzsg60x95kkc81ksc2d5vpdaqg5njq5bgjyw7yjqvs"; depends=[R_methodsS3 R_oo R_utils]; };
 R_devices = derive { name="R.devices"; version="2.13.0"; sha256="1ys4sxns2y5cgqb18scclsv99jfkyy3l9mq0jcnh76c48gpzaisp"; depends=[R_methodsS3 R_oo R_utils base64enc]; };
-R_filesets = derive { name="R.filesets"; version="2.7.1"; sha256="0awvjqkk5h8wzbdgn255m3gy3w5dsnlqp4wj7gzqgqm5mwg4jdyh"; depends=[R_oo R_methodsS3 R_utils R_cache digest]; };
+R_filesets = derive { name="R.filesets"; version="2.7.2"; sha256="0jlbpvj1ijjknjrb48x26c1ngkv7gl42fmk5g9sqaivm69d76nav"; depends=[R_oo R_methodsS3 R_utils R_cache digest]; };
 R_huge = derive { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; };
 R_matlab = derive { name="R.matlab"; version="3.2.0"; sha256="1c87m6pv62ciqwpmsp8l7rkixcv04s9nkdn4yjbgyqvcslfaw26m"; depends=[R_methodsS3 R_oo R_utils]; };
 R_methodsS3 = derive { name="R.methodsS3"; version="1.7.0"; sha256="1dg4bbrwr8jcsqisjrrwxs942mrjq72zw8yvl2br4djdm0md8zz5"; depends=[]; };
 R_oo = derive { name="R.oo"; version="1.19.0"; sha256="15rm1qb9a212bqazhcpk7m48hcp7jq8rh4yhd9c6zfyvdqszfmsb"; depends=[R_methodsS3]; };
 R_rsp = derive { name="R.rsp"; version="0.20.0"; sha256="06vq9qq5hdz3hqc99q82622mab6ix7jwap20h4za6ap6gnwqs0fv"; depends=[R_methodsS3 R_oo R_utils R_cache]; };
-R_utils = derive { name="R.utils"; version="2.0.2"; sha256="1bqykygqbgx2wwqypvgj9siyiqa77cbchjnqw0qgg1rg8q2ldw65"; depends=[R_oo R_methodsS3]; };
-R0 = derive { name="R0"; version="1.2-5"; sha256="13f0dvxf1gz9j8ih1n8giyhb4s7nrh1r7ncc5smvh06kjgr5b341"; depends=[MASS]; };
+R_utils = derive { name="R.utils"; version="2.1.0"; sha256="03pi6pkcsq65fv7cn4x74cj050dc8x5d4xyg930p6f7flk788xaz"; depends=[R_oo R_methodsS3]; };
+R0 = derive { name="R0"; version="1.2-6"; sha256="1yvcgchxlj7hkgqkw6g8pxnracxkld1grgykkcr6wbhminbylqv8"; depends=[MASS]; };
 R1magic = derive { name="R1magic"; version="0.3.2"; sha256="1xfldr5y7pfdi6qljjvckknsv2wi9rnzwmqxkpgnyc96md2fvwjr"; depends=[]; };
 R2BayesX = derive { name="R2BayesX"; version="1.0-0"; sha256="1p60n14gaqciskzah5haskflpms1g5lh4n57653yysa7fvmfgdhw"; depends=[BayesXsrc colorspace mgcv]; };
 R2Cuba = derive { name="R2Cuba"; version="1.0-11"; sha256="1kgcxqn83yskh0dv6vyz66d0z32qy55par36jj987qglpl25zmax"; depends=[]; };
@@ -1493,7 +1520,7 @@ R2MLwiN = derive { name="R2MLwiN"; version="0.8-1"; sha256="0gkp5jvvbf9rppxirs1s
 R2OpenBUGS = derive { name="R2OpenBUGS"; version="3.2-3.1"; sha256="1nnyfhpqgx6wd4n039c4d42png80b2xcwalyj08bmq0cgl32cjgk"; depends=[coda boot]; };
 R2STATS = derive { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[proto Matrix lattice lme4 cairoDevice gWidgets gWidgetsRGtk2 RGtk2Extras MASS latticeExtra statmod]; };
 R2SWF = derive { name="R2SWF"; version="0.9"; sha256="0c3lkmm8wgpix3fv7dxql6zpklwbcsv1y30r26yws12fnavw4y1k"; depends=[sysfonts]; };
-R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-19"; sha256="03bvxv46lhhnbfjq3w5ig50icncwn1bdq7lsh6w1szdk90ah2zgh"; depends=[coda boot]; };
+R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-20"; sha256="052frb3qlqfy6zl0qd2a9d4w2s7prfvdb0vn45rns68q03dma1ml"; depends=[coda boot]; };
 R2admb = derive { name="R2admb"; version="0.7.13"; sha256="0sjli498pz1vk5wmw65mca08mramwhzlfli2aih15xj7qzvp0nky"; depends=[coda lattice]; };
 R2jags = derive { name="R2jags"; version="0.5-6"; sha256="0zknl9qrypp96qz6rx7bkxg7bslvsnlhrgh749q4q566fz944n1g"; depends=[rjags abind coda R2WinBUGS]; };
 R330 = derive { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[s20x leaps rgl lattice]; };
@@ -1503,7 +1530,7 @@ R4dfp = derive { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0a
 R6 = derive { name="R6"; version="2.0.1"; sha256="0ngm3hl0q3aj067q6q0iqh729z8jx3ydvasj1jw9qrr7bzjh1jn5"; depends=[]; };
 RAD = derive { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[mvtnorm MASS]; };
 RADami = derive { name="RADami"; version="1.0-3"; sha256="0rg07dsh2rlldajcj0gq5sgsl1i3qa28bsrmq88xcljg5hnr4iqn"; depends=[ape geiger phangorn]; };
-RAM = derive { name="RAM"; version="1.2.0"; sha256="1xf296a2xqv9nq3m5lswnbfy023s6dp0yv8y0hr8xq0mw9mym3v3"; depends=[vegan ggplot2 gridExtra RColorBrewer gplots plyr reshape2 scales labdsv ggmap permute VennDiagram data_table FD MASS RgoogleMaps ape lattice reshape]; };
+RAM = derive { name="RAM"; version="1.2.1"; sha256="11ymhx0nk113cy068s52hjj38y8glv8nh24yljqqvr1fd9fmy64g"; depends=[vegan ggplot2 ape gridExtra RColorBrewer gplots plyr reshape2 scales labdsv ggmap permute VennDiagram data_table FD MASS RgoogleMaps lattice reshape ade4 phangorn phytools Hmisc]; };
 RAMP = derive { name="RAMP"; version="1.0"; sha256="18cz8gvb49j1hic71dzfcl17hz5gjdcabqvq84yr1h7iqkrq95cq"; depends=[]; };
 RAMpath = derive { name="RAMpath"; version="0.3.8"; sha256="1p1l6iirb314n5246kyyz0r3ja4v05xb5a6aq9k26wsb5m42x85k"; depends=[lavaan ellipse]; };
 RANN = derive { name="RANN"; version="2.5"; sha256="007cgqg9bybg2zlljbv5m6cmlm3r6i251018rpgjcn0xnm9sjsj7"; depends=[]; };
@@ -1530,7 +1557,7 @@ RCryptsy = derive { name="RCryptsy"; version="0.2"; sha256="1sm6l2jbaxia53dqivii
 RCurl = derive { name="RCurl"; version="1.95-4.6"; sha256="145li081kqa07w3bzb5zaad6jkr3zr0hcpkjwar76ybrvc4jyi4s"; depends=[bitops]; };
 RDIDQ = derive { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
 RDML = derive { name="RDML"; version="0.8-4"; sha256="0zrzi81rlxz8hrpz19g7v470fh930n5y6brn6mjq52shn0ap742m"; depends=[R6 assertthat XML plyr dplyr]; };
-RDS = derive { name="RDS"; version="0.7-1"; sha256="1vkrplzak95yqykrxgzjxgvyb4g255rnk6msh1yi5mgrd32f0gdl"; depends=[gridExtra ggplot2 Hmisc igraph reshape2 scales]; };
+RDS = derive { name="RDS"; version="0.7-2"; sha256="143pb13wg0ms9zaiilb3ylqj6r6bcy4iqbq19j57z33i1q6ll51c"; depends=[gridExtra ggplot2 igraph reshape2 scales]; };
 RDSTK = derive { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr rjson RCurl]; };
 RDataCanvas = derive { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; };
 RDieHarder = derive { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; };
@@ -1541,12 +1568,13 @@ REDCapR = derive { name="REDCapR"; version="0.7-1"; sha256="1r5vvl52z5gpqhq949fz
 REEMtree = derive { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; };
 REPPlab = derive { name="REPPlab"; version="0.9.1"; sha256="1yrw03p7rk5dbr23z343kxn7vbac8khcz4c718wq9w6sykhgv8d0"; depends=[rJava lattice]; };
 REQS = derive { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; };
-RESS = derive { name="RESS"; version="1.0"; sha256="0p6zfvakq4c02qp26l8zqcmi95na408rv6j6ibaxbcyf5vq9rhcs"; depends=[]; };
+RESS = derive { name="RESS"; version="1.1"; sha256="1g4g15m29cb6c60ah86si6ibi8sb2j7spqml6lmcflk4rrnyi4pc"; depends=[]; };
 REST = derive { name="REST"; version="1.0.1"; sha256="16v89z7p9qkg7bsypf9vkrnbmb2n7gw3fqnfzbyxwj496wzxdv1x"; depends=[Rcmdr]; };
 REdaS = derive { name="REdaS"; version="0.9.2"; sha256="0w1b2996b0sdpxklkxylnk18dx8vgssn5avh7pnrvdqa464ci4f8"; depends=[]; };
 RFGLS = derive { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; };
 RFLPtools = derive { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; };
 RFOC = derive { name="RFOC"; version="3.3-3"; sha256="101d7nf4zjni5kdk54w3afdaqnjzl7y90zygybkqpd0vi82q602b"; depends=[RPMG GEOmap RSEIS MASS splancs]; };
+RFgroove = derive { name="RFgroove"; version="1.0"; sha256="13cf2grp87j7mm0lqf8f65d1pzypjp3b7g09f35x6dfirvc7lkdy"; depends=[randomForest wmtsa fda]; };
 RFinanceYJ = derive { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0zckjkspsajzh8m10cf75ixjlgd0nj8rm41fngm3"; depends=[XML xts]; };
 RFmarkerDetector = derive { name="RFmarkerDetector"; version="1.0"; sha256="0p8dnqwhsjh1gwxvqpicdbsjs9gczqi5j4av786l9g18f5djsv6m"; depends=[AUCRF randomForest ggplot2 UsingR WilcoxCV ROCR]; };
 RForcecom = derive { name="RForcecom"; version="0.7"; sha256="0rjav2rwanzqgi1yasbm9lj18f0mfxwd8w8x41skf656gfcpi0i4"; depends=[XML RCurl plyr]; };
@@ -1572,7 +1600,7 @@ RISmed = derive { name="RISmed"; version="2.1.5"; sha256="03c2b6iqq147kwrpx6wh44
 RImageJROI = derive { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; };
 RImpala = derive { name="RImpala"; version="0.1.6"; sha256="03f4cq4bcrydpy78ypir7smj7abrcfynz0zzlgwgc60vh7vl79lz"; depends=[rJava]; };
 RInSp = derive { name="RInSp"; version="1.2"; sha256="0zg46qw44wx17ydcz592gl4k9qq08dycmsshxxqkjf92r3g3l6wm"; depends=[]; };
-RInside = derive { name="RInside"; version="0.2.12"; sha256="09dx9md5i4vdgadmqfzcchs5nhkml4nwr8ckgmmqll0y3xph2f3h"; depends=[Rcpp Rcpp]; };
+RInside = derive { name="RInside"; version="0.2.13"; sha256="0cfhljdai9kkw5m01mjaya0s02g4g1cy1g4i0qpjkhgqyihsh7dy"; depends=[Rcpp Rcpp]; };
 RItools = derive { name="RItools"; version="0.1-12"; sha256="0zdwj5y355d8jnwmjic3djwn6zy7h1iyl58j9hmnmc3m369cir0s"; depends=[lattice SparseM xtable svd abind]; };
 RJDBC = derive { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vpd662nmw4hr7qkq6510gk4l375ab2"; depends=[DBI rJava]; };
 RJSDMX = derive { name="RJSDMX"; version="1.3"; sha256="1z4l6iw404qn3syk2877msywkr8369nic5zzvnx1qj0gj9x2mm2p"; depends=[rJava zoo]; };
@@ -1592,14 +1620,14 @@ RMOAjars = derive { name="RMOAjars"; version="1.0"; sha256="0k3w37dwyyvfxh7a9l76
 RMRAINGEN = derive { name="RMRAINGEN"; version="1.0"; sha256="175kd803a44yblq2jw5mrn2qv4piiy249577lf684bmmajf4ird4"; depends=[copula RGENERATE RMAWGEN blockmatrix Matrix]; };
 RMTstat = derive { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; };
 RMallow = derive { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; };
-RMark = derive { name="RMark"; version="2.1.12"; sha256="0b8yzng9c74yxl1a1nkc4knf2a9114mjkis19b1pdnclyxcnx45z"; depends=[snowfall matrixcalc msm coda]; };
+RMark = derive { name="RMark"; version="2.1.13"; sha256="04wrl4i3d6kwy4masqc17qab24jv8p3kbfcx2z5l11wyf84xaqgx"; depends=[snowfall matrixcalc msm coda]; };
 RMediation = derive { name="RMediation"; version="1.1.3"; sha256="07ck74dl1wwb88229fhkh2czlynddff7zvjyhisxk53qmdb0wvmw"; depends=[MASS lavaan e1071]; };
 RMongo = derive { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; };
 RMySQL = derive { name="RMySQL"; version="0.10.3"; sha256="0791pshzr7rjjcnlm9md7gfsqkzizhzr9vwgnk2acc7sw5hikga6"; depends=[DBI]; };
 RNCBIEUtilsLibs = derive { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; };
 RNCEP = derive { name="RNCEP"; version="1.0.7"; sha256="0yvddsdpdrsg2dafmba081q4a34q15d7g2z5zr4qnzqb8wjwh6q2"; depends=[maps RColorBrewer abind fields fossil tgp sp]; };
 RND = derive { name="RND"; version="1.1"; sha256="1rbnjkfrsvm68xp90l4awixbvpid9nxnhg6i6fndpdmqwly2fwdp"; depends=[]; };
-RNeXML = derive { name="RNeXML"; version="2.0.2"; sha256="1giqwpcvr3v7na0z25qwps3qlrnffji0frcx694ifdfa89fn0s4d"; depends=[ape XML plyr taxize reshape2 httr uuid]; };
+RNeXML = derive { name="RNeXML"; version="2.0.3"; sha256="02aaacd2vs2iccjabx1bcrimhzr1kpzhkx9l50amwilj8q8ackr0"; depends=[ape XML plyr taxize reshape2 httr uuid]; };
 RNetCDF = derive { name="RNetCDF"; version="1.7-3"; sha256="1blpwkmdi7scm876mvk9m23k4kfx83rc6hcy342236rbmxdzahhg"; depends=[]; };
 RNetLogo = derive { name="RNetLogo"; version="1.0-1"; sha256="051yx7l8qbnvb4gn67m00wnl6v0jrmavmp7n7zygjn7p1xi3w22c"; depends=[rJava igraph]; };
 RNiftyReg = derive { name="RNiftyReg"; version="1.1.3"; sha256="1z980rwlq7wg4zjslppzs9d2cxhj7l63sgg8x8g6zgs5ag3pzgi7"; depends=[reportr oro_nifti]; };
@@ -1639,14 +1667,15 @@ RRTCS = derive { name="RRTCS"; version="0.0.1"; sha256="05ws5n2ajisdh4gfzmilvkz6
 RRreg = derive { name="RRreg"; version="0.3.0"; sha256="0pip05wk76h436mvcsddhn2p25ihms3yf1lb23k7ygpx6jx4mdn3"; depends=[doParallel foreach]; };
 RSA = derive { name="RSA"; version="0.9.8"; sha256="1pqblhimhj79ss8js0nf8w24ga2kdmgw64rh496iib36g27asn8n"; depends=[lavaan ggplot2 lattice tkrplot plyr RColorBrewer aplpack]; };
 RSADBE = derive { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; };
-RSAGA = derive { name="RSAGA"; version="0.93-6"; sha256="0wqiww0rx5fz4rbsb1x6pr2q0wz5dacj5fc0asj70igxwmh5x0p8"; depends=[gstat shapefiles plyr]; };
+RSAGA = derive { name="RSAGA"; version="0.94-1"; sha256="0zr3rm3s5pf2l2gkvbsr60srj6s1xx7kn26krpbzz3xqgbfgmz6k"; depends=[gstat shapefiles plyr]; };
 RSAP = derive { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[yaml reshape]; };
 RSDA = derive { name="RSDA"; version="1.2"; sha256="06sa3x0abm2gnf4i4y3d5mlqj1wl7mzzal27sa1x65awzi6rs2kz"; depends=[sqldf XML scales FactoMineR ggplot2 glmnet abind scatterplot3d]; };
 RSEIS = derive { name="RSEIS"; version="3.4-5"; sha256="0wh7977vm721hb566lh721mwn6b4x0p7x6xb7gv0nvrd3kpsw9zn"; depends=[RPMG Rwave]; };
-RSGHB = derive { name="RSGHB"; version="1.0.2"; sha256="0ffdx9lscbgknfqhvjdh3rwnlhiqxbpqa55jkn111a1vfv726v3d"; depends=[]; };
+RSGHB = derive { name="RSGHB"; version="1.1.0"; sha256="08ir7460mg0f414j69s7ffj35drip9qbbzwva1ps6x0gjjdnmzcq"; depends=[]; };
 RSKC = derive { name="RSKC"; version="2.4.1"; sha256="1dvzxf001a9dg71l4bh8z3aia7mymqy800268qf7qzy9n6552g59"; depends=[flexclust]; };
 RSNNS = derive { name="RSNNS"; version="0.4-6"; sha256="1p4gv2v9vzbgaksiibg66l9l9nabnm5lblc17md2cdcb6rygh3hp"; depends=[Rcpp Rcpp]; };
 RSNPset = derive { name="RSNPset"; version="0.4"; sha256="1asrl75jlkdp829phjfza10fcl9akiqspbxncd8zf2a23f2r54sy"; depends=[fastmatch foreach doRNG Rcpp Rcpp RcppEigen]; };
+RSPS = derive { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[lattice plyr gridExtra]; };
 RSQLServer = derive { name="RSQLServer"; version="0.1.1"; sha256="0xaw8a06xgc78hjg4bndip0jpc7l4glk28pggm2l3j31ybx81kw7"; depends=[DBI rJava RJDBC]; };
 RSQLite = derive { name="RSQLite"; version="1.0.0"; sha256="08b1syv8z887gxiw8i09dpqh0zisfb6ihq6qqr01zipvkahzq34f"; depends=[DBI]; };
 RSVGTipsDevice = derive { name="RSVGTipsDevice"; version="1.0-4"; sha256="1ybk5q4dhskrh7h1sy86ilchdwi6rivy3vv3lph6pms2virgm854"; depends=[]; };
@@ -1673,7 +1702,7 @@ RVAideMemoire = derive { name="RVAideMemoire"; version="0.9-45-2"; sha256="1c2hm
 RVFam = derive { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme survival lme4 kinship2 MASS Matrix]; };
 RVideoPoker = derive { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap tkrplot rpanel]; };
 RVowpalWabbit = derive { name="RVowpalWabbit"; version="0.0.6"; sha256="06f2lmls92qkbscss00c99xkzpx83mgjah6ds0sixv1b2qi216ap"; depends=[Rcpp Rcpp]; };
-RVsharing = derive { name="RVsharing"; version="1.1.0"; sha256="0gcas4rb8pms470dhbm2c2x87an0j594xsziglgd84nqn4gq095d"; depends=[kinship2]; };
+RVsharing = derive { name="RVsharing"; version="1.3.4"; sha256="0v267m7gfvc6fvfh4i53jk2xcr21kih6ddlgvb600j5ck6mi14vf"; depends=[kinship2]; };
 RVtests = derive { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet spls pls]; };
 RWBP = derive { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[RANN igraph lsa SnowballC]; };
 RWeather = derive { name="RWeather"; version="0.4"; sha256="1vm8w07gsxwxvg1gpdzn6mpnh8g9kp0ln9fxjw5rl2f1zz80bxpy"; depends=[XML]; };
@@ -1692,17 +1721,19 @@ Rambo = derive { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc
 Ramd = derive { name="Ramd"; version="0.2"; sha256="0a64rp4dwhfr6vxsmya16x7wy7rxj4n98sdhhyy0ll850rdzlxd8"; depends=[]; };
 RandVar = derive { name="RandVar"; version="0.9.2"; sha256="04hw4v2d9aa8z9f8wvwbzhbfy8zjl5q8mpl9b91q86fhh1yq5cz4"; depends=[distr distrEx]; };
 RandomFields = derive { name="RandomFields"; version="3.0.62"; sha256="1v2dmwl3nq3mw88439z6hjaf3gkz9sf7dqm9iipgk333qw1s6sfk"; depends=[sp]; };
-RandomFieldsUtils = derive { name="RandomFieldsUtils"; version="0.0.2"; sha256="12vja6ilihy2xq78h6nj1i60vgd5b6pqr2knpw7yq1nix22v4qn9"; depends=[]; };
+RandomFieldsUtils = derive { name="RandomFieldsUtils"; version="0.0.7"; sha256="1rdhc81gd0y5ss1ap74y1n8g2d7z4gjryviw86z53aznn3ddnbhg"; depends=[]; };
 RankAggreg = derive { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l24wgai2xg817wv218fzp7w1r3rcshxf0dcz2i"; depends=[gtools]; };
 RankResponse = derive { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; };
 Rankcluster = derive { name="Rankcluster"; version="0.92.9"; sha256="172jjsyc6a5y32s2fb8z6lgcq6rcwjbk3xnc5vvkhj64amlyxla6"; depends=[Rcpp Rcpp RcppEigen]; };
 RapidPolygonLookup = derive { name="RapidPolygonLookup"; version="0.1"; sha256="0m6r11ksryzcfcm265wr9fhwb867j9ppfhalvvygzig5j85sg92k"; depends=[sp RANN PBSmapping RgoogleMaps]; };
 Rarity = derive { name="Rarity"; version="1.3-4"; sha256="0zz1axr8a1r6js0la2ncls0l6jnjvx807ay2ngzb52hqbijifghx"; depends=[]; };
 RaschSampler = derive { name="RaschSampler"; version="0.8-7"; sha256="11vkb5gvr1r2a7fpxyygkixc62ms53dpik9jdg7vrb9k43v82ggj"; depends=[]; };
-RbioRXN = derive { name="RbioRXN"; version="1.5"; sha256="1w4g8a72a7f5m7g43hcybkahn3p51m6jnkydwgrchp53pby8ljxy"; depends=[plyr RCurl gdata data_table stringr]; };
+RbioRXN = derive { name="RbioRXN"; version="1.5.1"; sha256="0lc43wm986y3xbdh1xihn7w583cql9kvj6rb018pn06ghz153i0d"; depends=[plyr RCurl gdata data_table stringr]; };
 Rbitcoin = derive { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table RCurl digest RJSONIO]; };
 Rborist = derive { name="Rborist"; version="0.1-0"; sha256="1irb9scl68m7skqdwny9kvnzg7f1r0q1c0whzqyhhj9l4lw16hmr"; depends=[Rcpp Rcpp RcppArmadillo]; };
 Rcapture = derive { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; };
+Rcell = derive { name="Rcell"; version="1.3-2"; sha256="1gfbwarbnv70sawaxv71har1m099icc2347wdvrz3hwmfgw6qm8n"; depends=[proto plyr reshape ggplot2 digest]; };
+RcellData = derive { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; };
 Rcgmin = derive { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; };
 Rchoice = derive { name="Rchoice"; version="0.3"; sha256="1ac2nw03g66z2rgxzv8jqad74cp4c9ry0hvnw77d57ddaxszkrva"; depends=[Formula maxLik msm plm plotrix]; };
 Rclusterpp = derive { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen Rcpp RcppEigen]; };
@@ -1712,7 +1743,7 @@ RcmdrPlugin_BCA = derive { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xki
 RcmdrPlugin_DoE = derive { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base FrF2 DoE_wrapper relimp Rcmdr RcmdrMisc]; };
 RcmdrPlugin_EACSPIR = derive { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[R2HTML abind ez nortest reshape Rcmdr RcmdrMisc]; };
 RcmdrPlugin_EBM = derive { name="RcmdrPlugin.EBM"; version="1.0-8"; sha256="0lkj869xdacvnma0qq20fqdsq59jqka2fv5h78f99lybzcb95i11"; depends=[Rcmdr epiR abind]; };
-RcmdrPlugin_EZR = derive { name="RcmdrPlugin.EZR"; version="1.27"; sha256="00yk41f8d7z602xb3hpkk0zr2r17d9ap6sx78ni8wl7rkvmn0c7r"; depends=[Rcmdr]; };
+RcmdrPlugin_EZR = derive { name="RcmdrPlugin.EZR"; version="1.28"; sha256="0by00cnfs0yciy1azqvmcbkbf6r8mr2451xjqqxfd4jwmhg3nrxl"; depends=[Rcmdr]; };
 RcmdrPlugin_EcoVirtual = derive { name="RcmdrPlugin.EcoVirtual"; version="0.1"; sha256="00yk09c1d1frwpfq12zvhg4gnc3p63r61abnil623jpr6wh4b2x8"; depends=[Rcmdr EcoVirtual]; };
 RcmdrPlugin_FactoMineR = derive { name="RcmdrPlugin.FactoMineR"; version="1.5-0"; sha256="1hfnn12l3jljqpczpxz4m9ywbmw5rc1c8dpfl4cabrxnh6ymnk1a"; depends=[FactoMineR Rcmdr]; };
 RcmdrPlugin_HH = derive { name="RcmdrPlugin.HH"; version="1.1-42"; sha256="0ra5glv2p4ii2c1b3dyxbdjl4ps6idjpl6ni8ridrfb391qlmyrk"; depends=[HH lattice latticeExtra rgl mgcv Rcmdr]; };
@@ -1728,7 +1759,7 @@ RcmdrPlugin_SLC = derive { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzm
 RcmdrPlugin_SM = derive { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[Rcmdr car RColorBrewer colorspace vcd]; };
 RcmdrPlugin_StatisticalURV = derive { name="RcmdrPlugin.StatisticalURV"; version="1.0-1"; sha256="04pqqgy12rnhwm8l0752hb9p5h4l11mm7flm6n9kkcvbkvagsbrz"; depends=[agricolae multcomp car Rcmdr]; };
 RcmdrPlugin_TeachingDemos = derive { name="RcmdrPlugin.TeachingDemos"; version="1.0-7"; sha256="0d473p0df99x9a3jfwb49gxsrcvslcw9yandramwq82cwy3sdcxw"; depends=[rgl TeachingDemos Rcmdr]; };
-RcmdrPlugin_UCA = derive { name="RcmdrPlugin.UCA"; version="1.0-2"; sha256="11a8jaz5vycq8hnpxzrbv1g8vyh0ic1y48952ah633b2j1m1ay8i"; depends=[Rcmdr]; };
+RcmdrPlugin_UCA = derive { name="RcmdrPlugin.UCA"; version="2.0-4"; sha256="066h5idmmjng4i1n84rbvqgjnj7f1xrj32l1icm1dw3gsh2ipa5l"; depends=[Rcmdr randtests tseries]; };
 RcmdrPlugin_coin = derive { name="RcmdrPlugin.coin"; version="1.0-22"; sha256="0qmdjnjmgq52wgl4llg69q9x7hvwd73mz3swv0sv88v8zqg7xj93"; depends=[Rcmdr coin survival multcomp]; };
 RcmdrPlugin_depthTools = derive { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[Rcmdr depthTools]; };
 RcmdrPlugin_doex = derive { name="RcmdrPlugin.doex"; version="0.2.0"; sha256="0l3c8vwifyl8a7qkfaqxm7cws2cg1g501qa93w5svcgp03yf98mj"; depends=[Rcmdr multcomp]; };
@@ -1751,7 +1782,7 @@ Rcpp = derive { name="Rcpp"; version="0.11.6"; sha256="153gwzg2inxmzs5qrr87r3zab
 Rcpp11 = derive { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
 RcppAPT = derive { name="RcppAPT"; version="0.0.1"; sha256="0fyya80bd3w22qbsbznj9y21dwlj30a16d8a8kww4x8bpvmyil5z"; depends=[Rcpp Rcpp]; };
 RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.6"; sha256="1n4wrllhxn95lgkralvw5jjgff93nay5wdlyihih7f195fq5wqms"; depends=[Rcpp Rcpp]; };
-RcppArmadillo = derive { name="RcppArmadillo"; version="0.5.100.1.0"; sha256="0126g932fq24ns4yzj3z2dwagdy9qb7ckprk30zs7alq6rayfmn5"; depends=[Rcpp Rcpp]; };
+RcppArmadillo = derive { name="RcppArmadillo"; version="0.5.200.1.0"; sha256="0vz0yl5k0q57xrnjpz1bxs6j3hpysp1mkcxf5fs6xdy6nzaqsr7x"; depends=[Rcpp Rcpp]; };
 RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[Rcpp Rcpp BH]; };
 RcppCNPy = derive { name="RcppCNPy"; version="0.2.4"; sha256="1cawaxghbliy7hgvqz3y69asl43bl9mxf46nwpbxc0vx3cq15fnk"; depends=[Rcpp Rcpp]; };
 RcppClassic = derive { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy7nagnx1y1pkqffrq8iyplllcar24vxr0zirgi1xi"; depends=[Rcpp Rcpp]; };
@@ -1760,10 +1791,11 @@ RcppDE = derive { name="RcppDE"; version="0.1.2"; sha256="0ji5csfygqvrcahgx5gxy7
 RcppDL = derive { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp Rcpp]; };
 RcppEigen = derive { name="RcppEigen"; version="0.3.2.4.0"; sha256="1p6lfylj0mh059pxbp198r8nci8f89h0gb11x2pi0jgg7cqbxgh6"; depends=[Matrix Rcpp Rcpp]; };
 RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp Rcpp]; };
+RcppFaddeeva = derive { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[Rcpp knitr Rcpp]; };
 RcppGSL = derive { name="RcppGSL"; version="0.2.4"; sha256="1nw1984siwxvihp68g7khr2c4a4nwyb4ll04r5302kksz4nh7mpi"; depends=[Rcpp Rcpp]; };
 RcppMLPACK = derive { name="RcppMLPACK"; version="1.0.10-2"; sha256="1hdvdk6ni2iganmldarklv635yzgzja36zcpflh5w45c5y3ysqvj"; depends=[Rcpp Rcpp RcppArmadillo BH]; };
 RcppOctave = derive { name="RcppOctave"; version="0.14.5"; sha256="0dplc2x9fq2jfzfbcxdd45pmiimapqb3xhyjkzd4k6q8xmqjw95p"; depends=[Rcpp pkgmaker digest stringr Rcpp]; };
-RcppParallel = derive { name="RcppParallel"; version="4.3.8"; sha256="0gk42v2qxjgz34ispcyr0mizbp3l9l0p6jpw3y59vafpbkgdk0yg"; depends=[]; };
+RcppParallel = derive { name="RcppParallel"; version="4.3.14"; sha256="04kch598fqxkclv7ys8s9mqsd9wbzjqk1yjc66drzyycjc8jl9qi"; depends=[]; };
 RcppProgress = derive { name="RcppProgress"; version="0.2.1"; sha256="1dah99679hs6pcaazxyc52xpx5wawk95r2bpx9fx0i33fqs1s4ng"; depends=[Rcpp Rcpp]; };
 RcppRedis = derive { name="RcppRedis"; version="0.1.3"; sha256="0xpldiny2n121dp7vpj9l3bjvjhbfkdim5cassvvj2wms9q4jvh5"; depends=[Rcpp RApiSerialize Rcpp RApiSerialize]; };
 RcppRoll = derive { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp Rcpp]; };
@@ -1781,10 +1813,10 @@ Rdsm = derive { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla
 ReCiPa = derive { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; };
 ReacTran = derive { name="ReacTran"; version="1.4.2"; sha256="1yc0k3wgg4yb6cqmjkyl25sfkbfcfxi5ria106w5jyx7dr5lfvdi"; depends=[rootSolve deSolve shape]; };
 RealVAMS = derive { name="RealVAMS"; version="0.3-1"; sha256="04d4sc3lhlklx1y016rmh3x27m8caxlp53qn2ks5wz52w26pfdhn"; depends=[Matrix numDeriv Rcpp Rcpp RcppArmadillo]; };
-RecordLinkage = derive { name="RecordLinkage"; version="0.4-7"; sha256="18v9jihp00xfz80vkg054v93w6grnp3aaf7prlzckwxs5i5lff70"; depends=[DBI RSQLite ff ffbase e1071 rpart ada ipred evd data_table nnet xtable RSQLite]; };
+RecordLinkage = derive { name="RecordLinkage"; version="0.4-8"; sha256="0wjjrgmz7m11hhsw7dcg3745255xckdgrqp3xlqkyh2kzbyr9rp4"; depends=[DBI RSQLite ff ffbase e1071 rpart ada ipred evd data_table nnet xtable RSQLite]; };
 Records = derive { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; };
 RefFreeEWAS = derive { name="RefFreeEWAS"; version="1.3"; sha256="1cb1q2nki0d18ia4cmi1sp7qih9hv7g1jk1kyp7vya5gp572z3cd"; depends=[isva]; };
-RefManageR = derive { name="RefManageR"; version="0.8.45"; sha256="16smvd25gdssiry2i8gs24km83hnsq2v6m225i7qadcmn9pyj4yh"; depends=[XML RCurl RJSONIO plyr bibtex lubridate stringr]; };
+RefManageR = derive { name="RefManageR"; version="0.8.63"; sha256="17gmdyaqg8swfhpa1n8h1rj7aamrgdcprf56vx643ivhih8kgdj4"; depends=[XML RCurl RJSONIO plyr bibtex lubridate stringr]; };
 RegClust = derive { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; };
 RegressionFactory = derive { name="RegressionFactory"; version="0.7.1"; sha256="1zx885x49ncp2cl1v8hxzc3r2njka9cjsadjykbvqp9pdbm4ga5l"; depends=[]; };
 RelValAnalysis = derive { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; };
@@ -1799,13 +1831,14 @@ ReporteRs = derive { name="ReporteRs"; version="0.7.8"; sha256="1gzsdrkmz2g59m26
 ReporteRsjars = derive { name="ReporteRsjars"; version="0.0.2"; sha256="1abvgzxipg0cgiy26z14i99qydzqva6j2v7pnrxapysg7ml5cnjc"; depends=[rJava]; };
 ResistorArray = derive { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; };
 ResourceSelection = derive { name="ResourceSelection"; version="0.2-4"; sha256="01r1w03paazyix5jjxww89falba1qfiqcznx79a6fmsiv8gm2x5w"; depends=[]; };
+RevEcoR = derive { name="RevEcoR"; version="0.99.2"; sha256="100sman51vvwg5xkypmksyyjqdb6g858z29vn7x4kvly8ncw4hfd"; depends=[Matrix igraph XML stringr magrittr gtools plyr]; };
 Rfacebook = derive { name="Rfacebook"; version="0.5"; sha256="0cl4s815i4yxp805j8nhqmva31imbd1xp3yxgi53qwjhagh4i57a"; depends=[httr rjson httpuv]; };
 Rfit = derive { name="Rfit"; version="0.21"; sha256="129z5ivwfxbh3rfwk98jnm6ibq5z9z3r9mhy9gv61jfr4ig78dcn"; depends=[quantreg]; };
 Rglpk = derive { name="Rglpk"; version="0.6-0"; sha256="0g0s63skabr0yqk5s9p66p77z8v3pr3hbnirbgdddlvkpphi08xx"; depends=[slam]; };
 RgoogleMaps = derive { name="RgoogleMaps"; version="1.2.0.7"; sha256="04k7h8hgxvgsccdiysbblplwjvn8m7g8h3anzdlxmmjaamd8l9lw"; depends=[png RJSONIO]; };
 Rhh = derive { name="Rhh"; version="1.0.2"; sha256="0blxim8yrb0qnbkc1z2q24q6ryakggq2zhaa223swla99ahmsny3"; depends=[]; };
-Rhpc = derive { name="Rhpc"; version="0.14-261"; sha256="09rb68dys283gqmgn00v5skz6y5mcychg7hjrmi59pcfl5i7sk71"; depends=[]; };
-RhpcBLASctl = derive { name="RhpcBLASctl"; version="0.14-256"; sha256="1s9mwwh269wwdqnb98jxsmpjm2bdf5dj4c3wkj5i81w2p1sm8qx3"; depends=[]; };
+Rhpc = derive { name="Rhpc"; version="0.15-147"; sha256="1cb60vsvv6vj0sa1p9p05d16xi446qqckjzbiz0lmiy7k43nyccm"; depends=[]; };
+RhpcBLASctl = derive { name="RhpcBLASctl"; version="0.15-148"; sha256="1carylfz9gafradbdyg7fz2bypr7n72fbm8vhyiinmp0k4s5ipvc"; depends=[]; };
 RidgeFusion = derive { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; };
 Ridit = derive { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; };
 Ritc = derive { name="Ritc"; version="1.0.1"; sha256="1h41s4jihzj0yj8xyan0zhhyyiq8m5567vw4gvmmr81p1qfzvva8"; depends=[minpack_lm]; };
@@ -1832,6 +1865,7 @@ RobPer = derive { name="RobPer"; version="1.2.1"; sha256="1impcp2yfxxh439a70s2gq
 RobRSVD = derive { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; };
 RobRex = derive { name="RobRex"; version="0.9"; sha256="0ii539mjq462n1lbnyv3whl8b1agvhvlz31wwyz911gb40isl639"; depends=[ROptRegTS]; };
 RobustAFT = derive { name="RobustAFT"; version="1.3"; sha256="0cxyvq75bwhjh3qzfj6ynmy8mby6yjy4r851sx80b8ls6rv4cf3z"; depends=[robustbase survival]; };
+RobustEM = derive { name="RobustEM"; version="1.0"; sha256="1li9r3bk7zhpxljgqvr2zila8nb05nasvlzqlswwgi9443i740zi"; depends=[mvtnorm e1071 ggplot2 ellipse doParallel foreach]; };
 RobustRankAggreg = derive { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; };
 RockFab = derive { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[rgl]; };
 Rook = derive { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; };
@@ -1841,10 +1875,11 @@ RoughSetKnowledgeReduction = derive { name="RoughSetKnowledgeReduction"; version
 RoughSets = derive { name="RoughSets"; version="1.2-1"; sha256="06bykfd26qdll0xadvvp0lljcibg613xi02gq5q8x3h0l9qa4c2x"; depends=[Rcpp Rcpp]; };
 Rpdb = derive { name="Rpdb"; version="2.2"; sha256="0gf6qab05a3ky8skbbjiadizi1gs4pcw3zp25qj5gn82lb6382pd"; depends=[rgl]; };
 Rphylip = derive { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; };
+Rphylopars = derive { name="Rphylopars"; version="0.1.1"; sha256="04qd6zzgjgrfnv3ffv3jzlcl4ilfb67fxza49qq4rzinxc2s392b"; depends=[ape Rcpp doBy geiger phylolm phytools mvnmle Rcpp RcppArmadillo]; };
 Rpoppler = derive { name="Rpoppler"; version="0.0-1"; sha256="01zsbm538yhwm1cyz5j6x2ngz05yqj16yxyvyxqhn6jp8d0885jh"; depends=[]; };
 Rquake = derive { name="Rquake"; version="2.3-1"; sha256="0xb8j76jjv6k3r8nzjxdddic4rq1yj7qsh85asl38qwj7483cyc4"; depends=[RPMG RSEIS GEOmap MBA minpack_lm rgl cda]; };
 Rramas = derive { name="Rramas"; version="0.1-4"; sha256="191rm2ylvf3ffc9i4wpjvfbsinmw7s1m0wcq24j4qs4fxg8qqzyq"; depends=[diagram]; };
-Rrdrand = derive { name="Rrdrand"; version="0.1-10"; sha256="1j72v44scmghm29jxjdy0651qlkhsnrb3bb5qff82451mbd17bzb"; depends=[]; };
+Rrdrand = derive { name="Rrdrand"; version="0.1-14"; sha256="18ry07pi9iwskbxcimvp91fgpvrlaf44z0hp7k90dnyaa8qpbwjx"; depends=[]; };
 Rsampletrees = derive { name="Rsampletrees"; version="0.1"; sha256="02wh99nxlhyrivr655825nqcl3w0mvppnmvc9yrkdbkjw0l1zsjd"; depends=[haplo_stats ape]; };
 Rserve = derive { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5bm5ig09xam8zlqv63n9wf36v3kdmpn"; depends=[]; };
 RsimMosaic = derive { name="RsimMosaic"; version="1.0.2"; sha256="0d5z5dffi2prz0r31x08c8gw83448bhkma5mzcmrdlg6kx5y7dp8"; depends=[jpeg fields RANN]; };
@@ -1852,9 +1887,10 @@ Rsolnp = derive { name="Rsolnp"; version="1.15"; sha256="10w9gd1l62r638sh00fbgcp
 Rsomoclu = derive { name="Rsomoclu"; version="1.4.1"; sha256="0yr0nsm2b7wg1x57db9zclqnqqbmhyax9vgw13ynqirq2ysxxsg6"; depends=[Rcpp]; };
 Rssa = derive { name="Rssa"; version="0.13"; sha256="1prcivlwxky4h33ybky7n3wpn4vj1wm898ifsrhs1j9ywla1m2zf"; depends=[svd forecast lattice]; };
 Rsundials = derive { name="Rsundials"; version="1.6"; sha256="0vrvxsznbclgls4jljc59lyli6cw9k1a3wapfrs6xbkqi8865iif"; depends=[]; };
-Rsymphony = derive { name="Rsymphony"; version="0.1-19"; sha256="0m9xbyp4hxz9rbc8nd7q0fwzgl6126iv0sxwifamxkc9z8vr86js"; depends=[]; };
-Rtsne = derive { name="Rtsne"; version="0.9"; sha256="1b3ilfirlhmbv1914rwnj9mamn6clzi86csp3szfwg93gk23yymn"; depends=[Rcpp Rcpp]; };
+Rsymphony = derive { name="Rsymphony"; version="0.1-20"; sha256="10l3z9b51c8xsdfnscwn6g868xn84pfw3dlyj3vrsw3vs7qbi0gl"; depends=[]; };
+Rtsne = derive { name="Rtsne"; version="0.10"; sha256="14270gg0fp3imq9rafqj56ld56kzby7yyf5rg9z0wlimm7s72hy5"; depends=[Rcpp Rcpp]; };
 Rttf2pt1 = derive { name="Rttf2pt1"; version="1.3.3"; sha256="16bnhrg86rzi4g4zf235m1g8amyhcwxpw0wgcxynfiinm2fl4y1n"; depends=[]; };
+Rtts = derive { name="Rtts"; version="0.3.1"; sha256="1zgrkj4y7267d1n8iw1q3pgf2lmmklkslf5211kl7v788zxqr9c5"; depends=[RCurl]; };
 Ruchardet = derive { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp Rcpp]; };
 Runiversal = derive { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; };
 Runuran = derive { name="Runuran"; version="0.21.0"; sha256="1p33z9h2zj6fx42rlq6yajd6lwvzy4a1a5gs67dz5k1zbza8avw0"; depends=[]; };
@@ -1867,7 +1903,7 @@ RxCEcolInf = derive { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjb
 RxnSim = derive { name="RxnSim"; version="1.0.1"; sha256="17agz3kw7pj4mpl25y1n8l9lqfj63wn70rqpdkcpnx7j6s6933vx"; depends=[rJava fingerprint data_table rcdk]; };
 Ryacas = derive { name="Ryacas"; version="0.2-12.1"; sha256="18dpnr6kj0a8f2jcbj9f6ahd0mg7bm1qm8dcs1wh8kmjl3klr1y8"; depends=[XML]; };
 Rz = derive { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign memisc psych ggplot2 RGtk2 formatR]; };
-SAENET = derive { name="SAENET"; version="1.0"; sha256="0mnzv1a3xmbf4w9mgsi2kf20kyhcsadaih63wb0zvraqv5ijdd31"; depends=[autoencoder neuralnet]; };
+SAENET = derive { name="SAENET"; version="1.1"; sha256="13mfmmjqbkdr6j48smdlqvb83dkb34kx3i16gx0gmmafk3avdaxx"; depends=[autoencoder neuralnet]; };
 SAFD = derive { name="SAFD"; version="0.4"; sha256="1zbja8bgva2j24ks4m14hbf4s0n674lj89nfxkkmwrljzsmjrjhv"; depends=[]; };
 SAM = derive { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; };
 SAMUR = derive { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; };
@@ -1876,7 +1912,6 @@ SAPP = derive { name="SAPP"; version="1.0.4"; sha256="0a86vz390v2g5lz1r33qrmhgva
 SASPECT = derive { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; };
 SAScii = derive { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; };
 SASmixed = derive { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; };
-SASxport = derive { name="SASxport"; version="1.5.0"; sha256="0sgxpjv9ilz2zb13kkb0fqjfbamrczxpy9rwvfhh46bmx4i038iq"; depends=[chron Hmisc]; };
 SAVE = derive { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; };
 SBRect = derive { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; };
 SBSA = derive { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp Rcpp RcppArmadillo]; };
@@ -1940,6 +1975,7 @@ SOD = derive { name="SOD"; version="1.0"; sha256="0f0rh1qsjzxb3zzr440kvl6fnnj7dv
 SODC = derive { name="SODC"; version="1.0"; sha256="18s4rcp5dzchvwrzzbfhbs3x91zlg1rymjarxjk5i429mfrn0krx"; depends=[magic ppls psych MASS]; };
 SOLOMON = derive { name="SOLOMON"; version="1.0-1"; sha256="0z91wsrgdir25ks4dnirzsg4f1ngal7n40235m3w43j6y6dhkqrc"; depends=[]; };
 SOMbrero = derive { name="SOMbrero"; version="1.0"; sha256="10d2fakjkfk3p4dfh0cw1sp7i95f7lqdvz8b7x7sc5pg82dpffy7"; depends=[knitr igraph wordcloud scatterplot3d RColorBrewer shiny]; };
+SOPIE = derive { name="SOPIE"; version="1.4"; sha256="0kmzw0plr5bhc65g7aggf8g1i38aw9v2fw7x4vgdgb7zi5qmn5mx"; depends=[circular]; };
 SOR = derive { name="SOR"; version="0.22"; sha256="1njwlsvdnwxidvwrx18h6h4dhrsdgy0fikkhn20pip42qqwd96gz"; depends=[Matrix]; };
 SOUP = derive { name="SOUP"; version="1.1"; sha256="0k8nlvl4681cz07xjazprcc0jhknfa5hgr7w1qxxmgrp3sprr8r4"; depends=[tensor]; };
 SPA3G = derive { name="SPA3G"; version="1.0"; sha256="15f38imwqn1zifym2821q7xysvws9vhlif4g16w0pnvk0wlhyb92"; depends=[]; };
@@ -1997,7 +2033,7 @@ SelvarMix = derive { name="SelvarMix"; version="1.0"; sha256="0yysmf854xz5l0lf2x
 SemiCompRisks = derive { name="SemiCompRisks"; version="2.0"; sha256="0in3pv66nhb0ar4xfxskvf24c7bqkr9ik069a4nynwnc3idpsq32"; depends=[]; };
 SemiMarkov = derive { name="SemiMarkov"; version="1.4.1"; sha256="048hmbcmhqkvqw8nbzm0136mc9w7b27jy8q9r3rvc3banh854d1m"; depends=[numDeriv MASS Rsolnp]; };
 SemiPar = derive { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[MASS cluster nlme]; };
-SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.3"; sha256="12zjpyl79kx750xgra06zbw5vnaq8mis39cm8672w3d9giy2fxr5"; depends=[mgcv mvtnorm magic VineCopula VGAM survey trust Matrix sn]; };
+SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.4"; sha256="038k5vvgrk20n2cbji8qrp9nkg0ck5dcbxnd7wc5hy1l780g4k5g"; depends=[mgcv magic VGAM survey trust VineCopula]; };
 SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.2"; sha256="1k9xmby8hy4k0qn7pjj0rypxj4iqb206ixv92bz7ga0q8zd0nxbr"; depends=[copula mgcv mvtnorm gamlss_dist magic trust VGAM Matrix]; };
 SenSrivastava = derive { name="SenSrivastava"; version="2012-04-0"; sha256="0ki0kl18cj8lkad6q48piyvslkirs8y5rnfa8bvgjxsisxg2ahhp"; depends=[]; };
 SensitivityCaseControl = derive { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; };
@@ -2005,8 +2041,9 @@ SensoMineR = derive { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29
 SensusR = derive { name="SensusR"; version="1.0"; sha256="1b5yrb3iiijr7x0r4ga5dlx6yqqk4bvmh1377655s6c7j36sn1xd"; depends=[jsonlite lubridate rworldmap plyr sp]; };
 SeqFeatR = derive { name="SeqFeatR"; version="0.1.7"; sha256="195pkpk9sh99v01mk827axsynwaccygx19i1x0h0ma7bsqlmw1qc"; depends=[tcltk2 plotrix ape plyr phangorn calibrate ggplot2]; };
 SeqGrapheR = derive { name="SeqGrapheR"; version="0.4.8.3"; sha256="03plwa3sc1pg34p1szbz3d0z8y53w7iqm7qn9q6fj72rsnk5spxc"; depends=[igraph rggobi gWidgets gWidgetsRGtk2 cairoDevice]; };
-Sequential = derive { name="Sequential"; version="1.1"; sha256="1fr4n6qbxwj6hs01h07wdj5v4c7af5q8ccnm33yzcrx845qf8fiv"; depends=[]; };
+Sequential = derive { name="Sequential"; version="2.0"; sha256="0dndy4a1waxgwj43gq1zb6cqwvrafcr729hhr7qckw5crcmm0iph"; depends=[]; };
 SetMethods = derive { name="SetMethods"; version="1.0"; sha256="0zizvrzyk01w4ncazvifmjm4h5zrpsf6n68n11sc8f5kzny9ia48"; depends=[lattice betareg lattice betareg]; };
+ShapeSelectForest = derive { name="ShapeSelectForest"; version="1.0"; sha256="0jy40aql33xwl4s7y2s3wb6yig4vr6ly6fhz7hn2d59b8428p04q"; depends=[coneproj raster rgdal]; };
 SharpeR = derive { name="SharpeR"; version="0.1501"; sha256="138faypgrfph48wvz600l20ypqzxdir4q43bl9s7vndysya3vsnl"; depends=[matrixcalc]; };
 ShrinkCovMat = derive { name="ShrinkCovMat"; version="1.1.0"; sha256="1v2rr97wz5521cjy41j5vdqq29xd7696pc1rzw4angsfjrq3fnh4"; depends=[]; };
 SiZer = derive { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; };
@@ -2043,14 +2080,14 @@ SoundexBR = derive { name="SoundexBR"; version="1.1"; sha256="1rhmwbf7687lgwwx1q
 SparseGrid = derive { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; };
 SparseM = derive { name="SparseM"; version="1.6"; sha256="1296snm3481259xwhj97vffwjb2v8367ivf2g5amd4pzqzwx6p1k"; depends=[]; };
 SparseTSCGM = derive { name="SparseTSCGM"; version="2.1.1"; sha256="0xr3l049kssi7k074wggvc96p2zlca076j2hwpwpmna42xl3dmqv"; depends=[glasso longitudinal flare MASS mvtnorm network abind]; };
-SpatPCA = derive { name="SpatPCA"; version="1.0.0.1"; sha256="1j2zhm0xlm5w1p4yhg60qwa0r2hai7nv1n25ski5x2nfnpb5fiij"; depends=[fields Rcpp Rcpp RcppArmadillo]; };
+SpatPCA = derive { name="SpatPCA"; version="1.0.0.2"; sha256="0f8byi4zhrjj8fdka93r22kbjjqgkx3p06a65sppgvq65v8lff0l"; depends=[fields Rcpp Rcpp RcppArmadillo]; };
 SpatialEpi = derive { name="SpatialEpi"; version="1.2.1"; sha256="02mvahpbrlcnxmf272fk46wykv9s2lcjqd5yhd80dfs78qjwly77"; depends=[sp Rcpp MASS maptools spdep Rcpp RcppArmadillo]; };
-SpatialExtremes = derive { name="SpatialExtremes"; version="2.0-0"; sha256="0fjh4cjzljwzxk4bhcrff9wnkskaiawbj7z6swrj1xl35mq4dljx"; depends=[]; };
+SpatialExtremes = derive { name="SpatialExtremes"; version="2.0-2"; sha256="0ywybk9gziy2hzb1ks88q4rzs3lzzy6y3fzhja2s39ngg195hi6l"; depends=[maps fields]; };
 SpatialNP = derive { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; };
 SpatialPack = derive { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; };
 SpatialPosition = derive { name="SpatialPosition"; version="0.9"; sha256="0w09yrn32pis4w3hkbghkgwpyy7mnnzzkhhp289xl738lymv207a"; depends=[raster sp]; };
 SpatialTools = derive { name="SpatialTools"; version="0.5.8"; sha256="18zchr8bfjqdr9j6vh6365mhrj2n0ns1ixvmas5s0ppiim59jl7j"; depends=[spBayes Rcpp Rcpp RcppArmadillo]; };
-SpatialVx = derive { name="SpatialVx"; version="0.2-2"; sha256="16qww58az1523pk8b4b5hzqnpb8djgvph2ykf6bjp8zz5qdfyhjs"; depends=[spatstat fields smoothie smatr turboEM distillery maps boot CircStats fastcluster waveslim]; };
+SpatialVx = derive { name="SpatialVx"; version="0.2-4"; sha256="0nm3mripq1fiqn7ydl854azwpl1sdh2ls8gj1k432xsvi02m05y3"; depends=[spatstat fields smoothie smatr turboEM distillery maps boot CircStats fastcluster waveslim]; };
 SpatioTemporal = derive { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[Matrix MASS]; };
 SpecHelpers = derive { name="SpecHelpers"; version="0.1.6"; sha256="1h14a1rsk7x5qafn4hcpmannkdf2wdphkzaa3b6nbb9jqjs1szi0"; depends=[gsubfn]; };
 SpeciesMix = derive { name="SpeciesMix"; version="0.3.1"; sha256="0wl15k00d7n9pmnp1kr28p05z4vrziprcdndw77kwkcgv51cvllk"; depends=[MASS numDeriv]; };
@@ -2060,6 +2097,7 @@ SphericalCubature = derive { name="SphericalCubature"; version="1.0.1"; sha256="
 SphericalK = derive { name="SphericalK"; version="1.1"; sha256="18h1k0gy65jvzfpsda0ifv3nn3pvzx5ifllxbwh0my6w75c4biqn"; depends=[]; };
 SportsAnalytics = derive { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; };
 StAMPP = derive { name="StAMPP"; version="1.3"; sha256="1igf6arp7glihkv60zc7c0zwfqaf5kcm2d1xr856fj194zxww9ad"; depends=[pegas doParallel foreach adegenet]; };
+StMoMo = derive { name="StMoMo"; version="0.2.0"; sha256="1pddlwf3kns9fzmqddfak6bir0mc1i4bv9cswj5pbhpavsd08r1c"; depends=[gnm forecast MASS rootSolve fanplot reshape2 fields]; };
 StMoSim = derive { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[RcppParallel Rcpp RcppParallel Rcpp]; };
 StableEstim = derive { name="StableEstim"; version="2.0"; sha256="080khfix88j4656hmdy9l0xpbk9zzw7z7d7f6yvwsbalk3ag18i5"; depends=[Matrix stabledist testthat numDeriv xtable fBasics MASS]; };
 Stack = derive { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[plyr stringr ff ffbase bit]; };
@@ -2082,11 +2120,12 @@ StreamMetabolism = derive { name="StreamMetabolism"; version="1.1.1"; sha256="1r
 StressStrength = derive { name="StressStrength"; version="1.0.1"; sha256="15sgdisgz8zcq4i9z4zm7isr5ckyd7bk6yl1g7a5kngams282ipx"; depends=[]; };
 SubCultCon = derive { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; };
 SubLasso = derive { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet psych gplots]; };
+SubpathwayGMir = derive { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[XML igraph]; };
 Sunder = derive { name="Sunder"; version="0.0.4"; sha256="1na41nnscyc4v1qbwzfgqk503r39xxbi6f446pscrz3v0v121f1a"; depends=[mnormt]; };
 SunterSampling = derive { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; };
 SuperLearner = derive { name="SuperLearner"; version="2.0-15"; sha256="1sk45419awk8aahylmqbardx8lglx0d7hrwc0k2prnksk5r3549l"; depends=[nnls]; };
 SuppDists = derive { name="SuppDists"; version="1.1-9.1"; sha256="1jqsv1lzjblc7sdb4gh8pkww9ar174bpbjl7mmdi59fixymwz87s"; depends=[]; };
-Surrogate = derive { name="Surrogate"; version="0.1-5"; sha256="0g66yzbirkxs6f69zbfaw61ki25qgdxwkd3zhmymmgxhbix77n11"; depends=[MASS nlme msm lme4 rgl lattice latticeExtra]; };
+Surrogate = derive { name="Surrogate"; version="0.1-61"; sha256="0jifjns0v22risy783a0s71v6sn165wn7w6a47sb7dsdimrvnn9d"; depends=[MASS nlme msm lme4 rgl lattice latticeExtra]; };
 SurvCorr = derive { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[survival fields]; };
 SurvLong = derive { name="SurvLong"; version="1.0"; sha256="000ywg0sdk9kailiy7ckhq4mkaawl9hh88w6apj5khgpxsyj8aw3"; depends=[]; };
 SurvRegCensCov = derive { name="SurvRegCensCov"; version="1.3"; sha256="1sl17x984ww07aakz6dambn5kznw4hvj4b8ahy2r4mr6wf2dpg5a"; depends=[survival numDeriv]; };
@@ -2098,12 +2137,13 @@ SyNet = derive { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfm
 SynchWave = derive { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; };
 SynergizeR = derive { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RJSONIO RCurl]; };
 Synth = derive { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
-TAM = derive { name="TAM"; version="1.6-0"; sha256="0wca6ry29k422q8x4qwpd9myc6xnd2p2z05dqlmb2gwzgbj3wcbk"; depends=[CDM MASS Rcpp mirt lavaan WrightMap tensor sfsmisc GPArotation psych mvtnorm msm lattice plyr Rcpp RcppArmadillo]; };
+TAM = derive { name="TAM"; version="1.7-1"; sha256="1zsgdilxh7j7ay74a5id7iwm0mz3vf1rcgw7fvclic1ndwwj68z3"; depends=[CDM MASS Rcpp mirt lavaan WrightMap tensor sfsmisc GPArotation psych mvtnorm msm lattice plyr Rcpp RcppArmadillo]; };
 TANOVA = derive { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; };
 TAQMNGR = derive { name="TAQMNGR"; version="2015.2-1"; sha256="0j7qb15xy4g4ff0cmyjyz4lsalaxxf6zdwbq49j3y80ld0pvwhbk"; depends=[Rcpp]; };
 TBEST = derive { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[signal fdrtool]; };
 TBSSurvival = derive { name="TBSSurvival"; version="1.2"; sha256="12ipgffympqjjg8l9gbich5pgz0pqr5g07b0il26rr721xiyxk5v"; depends=[normalp survival mcmc R_utils coda Rsolnp BMS]; };
 TDA = derive { name="TDA"; version="1.3"; sha256="1f9f5v8c0ynxz8p4kr9w08c4icf0840h7iay8k1ydh5zmr43d7lk"; depends=[FNN igraph scales]; };
+TDAmapper = derive { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; };
 TDCor = derive { name="TDCor"; version="0.1-1"; sha256="001rmwi2v4vy1b2d7wwvvca4xnkizz8dmys3q3xbjv7wrfxyvai8"; depends=[deSolve]; };
 TDD = derive { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[signal RSEIS pracma]; };
 TDMR = derive { name="TDMR"; version="1.3"; sha256="0bbd2an18ayxaxprsjqrybb877lkk74dpxbvbv7qdwc1ivqm8g96"; depends=[SPOT twiddler testit adabag]; };
@@ -2121,6 +2161,7 @@ TH_data = derive { name="TH.data"; version="1.0-6"; sha256="1kx6z8lj1l2vxi7vhx47
 TIMP = derive { name="TIMP"; version="1.12.1"; sha256="06zjpa9j4sr62f2lspa75i7n8xcf4xdgxq2zjbzsx4f0p0nf5ymj"; depends=[fields vcd gplots colorspace gclus nnls deSolve minpack_lm MASS]; };
 TInPosition = derive { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[prettyGraphs TExPosition ExPosition InPosition]; };
 TKF = derive { name="TKF"; version="0.0.8"; sha256="1db87lwx26ayv1x2k8qd9dfr6j3jkvdl9ykisaxr42l6akqy21nr"; depends=[expm numDeriv ape phytools phangorn]; };
+TOC = derive { name="TOC"; version="0.0-2"; sha256="0zkwbjyi5dc6y0fzmwkbyrf32h0r5vhxxz67zjrhqc06vyasai8w"; depends=[raster bit rgdal]; };
 TPmsm = derive { name="TPmsm"; version="1.2.0"; sha256="1670b9g6sqlg5xk76x77cph1wzp44yp957sn8px5k7kkb1hgi0pl"; depends=[KernSmooth]; };
 TR8 = derive { name="TR8"; version="0.9.13"; sha256="07wrqwa5gf1l1y3b07mganr5xkzxdzrh6lrv7gf01m9b7bsz564m"; depends=[RCurl XML taxize plyr rappdirs gWidgets gWidgetstcltk gdata]; };
 TRAMPR = derive { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; };
@@ -2131,14 +2172,14 @@ TSA = derive { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86
 TSEN = derive { name="TSEN"; version="1.0"; sha256="1pn313g2ylbjc37rqcakd797vffnh7v0rgg1xl5wjyvcgmm5mxix"; depends=[ncdf]; };
 TSHRC = derive { name="TSHRC"; version="0.1-3"; sha256="18ygg7bqwg1pdqi52l1lf33gcd277895rlf5853yzh7ln2ivssmi"; depends=[]; };
 TSMySQL = derive { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[TSdbi DBI tframe TSsql RMySQL]; };
-TSP = derive { name="TSP"; version="1.1-0"; sha256="0d38n6z531jcg34q39fv0qsmccjbx5yil14fw5pmvyympyjsf5kq"; depends=[foreach]; };
+TSP = derive { name="TSP"; version="1.1-1"; sha256="0wwzmkgfy55dba9jl3mpbyqciia71px0x0s6708k8kz9vr03m2zs"; depends=[foreach]; };
 TSPostgreSQL = derive { name="TSPostgreSQL"; version="2015.4-1"; sha256="11201zpbrva6gwc9hg8pynadrps6d8pb3syzba9nyjpv2ck6x3ry"; depends=[TSdbi DBI tframe tframePlus TSsql RPostgreSQL]; };
 TSPred = derive { name="TSPred"; version="2.0"; sha256="0p4msk12n8jc1ss8p7m15rxd0ip7v83c5p78v26nk5dz21a4xprp"; depends=[forecast]; };
 TSSQLite = derive { name="TSSQLite"; version="2015.4-1"; sha256="10z8s967wmapkb56hh2brb5bafgqr8flwh0sr72yqqv0ca2d06sc"; depends=[TSdbi DBI tframe tframePlus TSsql RSQLite]; };
 TSTutorial = derive { name="TSTutorial"; version="1.2.3"; sha256="0hpk6k3lc72p8pdz5aad04lcjsz9k443h5gs09dc3i10wqw3yhxs"; depends=[MASS]; };
 TSclust = derive { name="TSclust"; version="1.2.3"; sha256="0m04svw4z2rhvzyckn8l4pg4rmwfn8xlzd9k839c47ldbzgb4z6l"; depends=[wmtsa pdc cluster locpol KernSmooth dtw longitudinalData]; };
 TScompare = derive { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[TSdbi tframe tfplot DBI]; };
-TSdata = derive { name="TSdata"; version="2015.4-1"; sha256="0h8gxgfal4ak2jmxmql02qpq4lcgj8m263aq9h83l5gmvzd173q7"; depends=[]; };
+TSdata = derive { name="TSdata"; version="2015.4-2"; sha256="1c0ly1gs6p3fspwvk1f6c2xgzvc7p7pkzakm44lisbyjklacnilp"; depends=[]; };
 TSdbi = derive { name="TSdbi"; version="2015.1-1"; sha256="1bqxpd4g0ppm1261srgwjzghfwwl53vybkihz99azckky0539m1s"; depends=[DBI tframe]; };
 TSdist = derive { name="TSdist"; version="2.2"; sha256="1zqqy2pxjzxlj1d32d086qrkf9rlgj9vn9smzbcfix8wlgvxfi1l"; depends=[proxy zoo xts dtw TSclust KernSmooth locpol pdc longitudinalData cluster]; };
 TSfame = derive { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[TSdbi DBI tframe tframePlus fame tis]; };
@@ -2148,6 +2189,7 @@ TSsdmx = derive { name="TSsdmx"; version="2015.2-2"; sha256="1xwriyg0raqd6812r6v
 TSsql = derive { name="TSsql"; version="2015.1-2"; sha256="1hpi2cssnkzqgnaj91wrvb94fs8zpfg8hi4m1zwswzyl3az0l9sc"; depends=[DBI tframe TSdbi tframePlus zoo]; };
 TTAinterfaceTrendAnalysis = derive { name="TTAinterfaceTrendAnalysis"; version="1.5.1"; sha256="1i9p5s7xj3py8465yjjaqs2m7krjxzzqd86lkpbgzxnxjdnxcx5i"; depends=[Hmisc pastecs reshape wq e1071 timeSeries fBasics relimp multcomp nlme lubridate tcltk2]; };
 TTR = derive { name="TTR"; version="0.22-0"; sha256="0aackwmmakjcynpq4nxi8xw1x3688rkg6kypgd5jiprzzdhsz5rq"; depends=[xts xts]; };
+TTmoment = derive { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; };
 TUWmodel = derive { name="TUWmodel"; version="0.1-4"; sha256="1xxbrcs3dddzcya15pj4k86z05vnv06fnwblfvygx0zkw0m292av"; depends=[]; };
 Table1Heatmap = derive { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; };
 TableMonster = derive { name="TableMonster"; version="1.2"; sha256="1cl70d0svzx8nsg6kw5dv50s9d6wxqkyg39d2d4vissbpilq6arn"; depends=[xtable]; };
@@ -2167,7 +2209,7 @@ Thinknum = derive { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95a
 ThreeArmedTrials = derive { name="ThreeArmedTrials"; version="0.1-0"; sha256="1pafm8k90yv0hrk5a9adfv37087l2in0psslhkxha6mkmdh6a5f6"; depends=[MASS]; };
 ThreeWay = derive { name="ThreeWay"; version="1.1.2"; sha256="1vf71im3bs2b2v05j12l8qn181kah0mch4h13n71zqik1ykly6jf"; depends=[]; };
 ThresholdROC = derive { name="ThresholdROC"; version="1.0"; sha256="1w7bjw1w09skxyc5w3d72wivljlvnck6vbchihjx7m5k6djn7pxi"; depends=[]; };
-TickExec = derive { name="TickExec"; version="1.0"; sha256="0ylmf0mxp9hnijnq9rq6l4xahzsyrh8pfjjbgzz6v77ycvzzz5sh"; depends=[]; };
+TickExec = derive { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; };
 TiddlyWikiR = derive { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; };
 Tides = derive { name="Tides"; version="1.1"; sha256="0w2xjnw2zv4s49kvzbnfvy30mfkn8hqdz6p155xm1kfqwvyb28qq"; depends=[]; };
 TilePlot = derive { name="TilePlot"; version="1.3.1"; sha256="0yfzjyzc743rv5piw9mb7y0rr558hkxszgz49lya2w3i1mqvxbzy"; depends=[]; };
@@ -2213,16 +2255,16 @@ VGAM = derive { name="VGAM"; version="0.9-8"; sha256="0wizv2r1k79ifg9m0z9m2l80bs
 VGAMdata = derive { name="VGAMdata"; version="0.9-7"; sha256="0fkm90nbmj0gjzxmh54qbf90alcbaiz27rs0zc0i5jhh2cv716y6"; depends=[]; };
 VHDClassification = derive { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; };
 VIF = derive { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; };
-VIFCP = derive { name="VIFCP"; version="1.0"; sha256="19jpwhbw5ml46ic8mzkl0ll7qaa0slw608c790dpbch8hx1r5i7s"; depends=[]; };
+VIGoR = derive { name="VIGoR"; version="1.0"; sha256="1c24s917aafqy46b3xlsw8v3afs11nd5bq83vlygpgnz1612jpga"; depends=[]; };
 VIM = derive { name="VIM"; version="4.1.0"; sha256="15nmywg8mhknvivg9bfszif2allim5vf1hjfbfyl053jphjpax26"; depends=[colorspace data_table car robustbase sp vcd MASS nnet e1071 Rcpp Rcpp]; };
 VIMGUI = derive { name="VIMGUI"; version="0.9.0"; sha256="195lakyik597sjkq6c5v3881p35111gzmj2r5f5nr53vi6bn4pzm"; depends=[tkrplot VIM survey gWidgetsRGtk2 foreign RGtk2 Cairo Hmisc]; };
 VLF = derive { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; };
 VLMC = derive { name="VLMC"; version="1.4-1"; sha256="0y91cl9pv1d5s8956grdx3y4xa5l1fabrh1wl5hn11fjgyz1dcij"; depends=[MASS]; };
 VNM = derive { name="VNM"; version="4.0"; sha256="0dc2wvj8f09yrsf5lhg6djhfnkgslngs6a13g54d5q9aa4nnxm8w"; depends=[]; };
 VPdtw = derive { name="VPdtw"; version="2.1-10"; sha256="1sipiqbk766czd1jxam3bc2hfq7wsn72x51j5ssn2s2q0gvpl7m1"; depends=[]; };
-VSURF = derive { name="VSURF"; version="0.8.2"; sha256="1d9irh8s49i8i9q8psmfl41jnr95wvm3libxin0ir8r297rq82z3"; depends=[randomForest rpart doParallel]; };
+VSURF = derive { name="VSURF"; version="1.0.0"; sha256="1hqn22k66v9zb2qr7sig0zgki9hbfr5442d7mlldnyj3m012m22j"; depends=[doParallel foreach randomForest rpart]; };
 VaRES = derive { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; };
-VarSelLCM = derive { name="VarSelLCM"; version="1.0"; sha256="1i0s4kdqgfh79bk5ipd9fn6m3yl1qgn9gzn62kxx7vfiy683x0a2"; depends=[Rcpp mclust Rcpp RcppArmadillo]; };
+VarSelLCM = derive { name="VarSelLCM"; version="1.2"; sha256="1pzcadzg1snv2nkdrbhgi6scrd70cawprncm8hs82gcl3r9dscic"; depends=[Rcpp Rcpp RcppArmadillo]; };
 VarSwapPrice = derive { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; };
 VariABEL = derive { name="VariABEL"; version="0.9-2"; sha256="0vlr6zxl75i49p35jxrc5fwfrb55n91hqdan2ikcix3r2k4qs5k0"; depends=[]; };
 VarianceGamma = derive { name="VarianceGamma"; version="0.3-1"; sha256="0h424hdphbgi9i84bgzdwmsq05w61q8300x8f9y4szbxa5k2dnar"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
@@ -2232,7 +2274,7 @@ VecStatGraphs2D = derive { name="VecStatGraphs2D"; version="1.7"; sha256="08f9ix
 VecStatGraphs3D = derive { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[rgl misc3d MASS]; };
 VennDiagram = derive { name="VennDiagram"; version="1.6.9"; sha256="0sxgspqsn15y3pipd9wy4wh2n5rkb9bazqkfwkf88p483azpjxw9"; depends=[]; };
 VideoComparison = derive { name="VideoComparison"; version="0.11"; sha256="04jc9br4ddck2sh9bhy02jx34cqxvh904lr46sid6dnmaqfn80l7"; depends=[RJSONIO RCurl zoo pracma Rcpp Rcpp]; };
-VineCopula = derive { name="VineCopula"; version="1.4"; sha256="03bjpnpq8zj1h4z35m2xkgrislvp7lmvpxm905xxn1r3r944kflz"; depends=[MASS mvtnorm igraph copula ADGofTest]; };
+VineCopula = derive { name="VineCopula"; version="1.5"; sha256="1ifb7y0y1b5kha9nv395mlf3h3cczlqkvk782a2z0xy5vf0frfhi"; depends=[MASS mvtnorm igraph copula ADGofTest lattice]; };
 VizOR = derive { name="VizOR"; version="0.7-9"; sha256="1xw06y86nsrwpri6asrwh8kccjsqzzidgbpld6d6l7vrglp8m6sr"; depends=[lattice rms]; };
 Voss = derive { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
 VoxR = derive { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; };
@@ -2255,19 +2297,21 @@ WaveletComp = derive { name="WaveletComp"; version="1.0"; sha256="16ghxqjbv39pmg
 WeightedCluster = derive { name="WeightedCluster"; version="1.2"; sha256="1d0df284fzfa34fi7b3d7f4zzm9ppyah46rj865446l5pjvl9np3"; depends=[TraMineR cluster RColorBrewer]; };
 WeightedPortTest = derive { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; };
 WhatIf = derive { name="WhatIf"; version="1.5-6"; sha256="02lqvirnf24jn8b2s08z5fjmpilp2z08lww1s793n3pn783adbky"; depends=[lpSolve]; };
-WhiteStripe = derive { name="WhiteStripe"; version="1.0"; sha256="0j8f10dwc14a0yfnjw73i6mrh0y9iyjbxmhklz2hlxv1k53pppbg"; depends=[oro_nifti mgcv fslr]; };
+WhiteStripe = derive { name="WhiteStripe"; version="1.1.1"; sha256="1naavgkvgky3lzg5vlz11g589cxr0fgiqz2waz86da1ksk4a19gw"; depends=[oro_nifti mgcv]; };
 WhopGenome = derive { name="WhopGenome"; version="0.9.2"; sha256="0nhl3qanwvyxvkrdc0wngzdx6id0yfzbf9wp170mcsyd4qh7pxzs"; depends=[]; };
 WideLM = derive { name="WideLM"; version="0.1-1"; sha256="0spxl960pgzh0cn1gkw2ayixpi982rr85qajcdqahmn9msk877h8"; depends=[Rcpp Rcpp]; };
-WikipediR = derive { name="WikipediR"; version="1.1.0"; sha256="19hc1vmyv0bnf00q8vwmfr6jxrcd1h5xzb9pphy5grghbj01bcl8"; depends=[httr jsonlite]; };
+WikidataR = derive { name="WikidataR"; version="1.0.0"; sha256="061745pz4j9gldbwy6pa5pbxmin84csqpv7r5r8lanvc0m7kgcgx"; depends=[httr jsonlite WikipediR]; };
+WikipediR = derive { name="WikipediR"; version="1.2.0"; sha256="1l9q9yg4z4j0lch9r8xr9q0f8mr0lpzf50ygmkkcvfd5sp7hirmi"; depends=[httr jsonlite]; };
 WikipediaR = derive { name="WikipediaR"; version="1.0"; sha256="0kx966q5zn7jq1m7b8w1y1zllxvslr66bz6ji1lr11vk0fykl3kn"; depends=[XML]; };
 WilcoxCV = derive { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; };
 WordPools = derive { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; };
 WrightMap = derive { name="WrightMap"; version="1.1"; sha256="0dmximp549gr37ps56vz8mnlii7753dc5v0wl3s78cymjmnmyr0z"; depends=[]; };
 WriteXLS = derive { name="WriteXLS"; version="3.5.1"; sha256="0grhwwlibdpvzjlm1vc5ykl54jcz0jmg6rkhis00rjn5yqccx0in"; depends=[]; };
 XBRL = derive { name="XBRL"; version="0.99.16"; sha256="1wrcm8srn185qrba7rig3fvwjz1n2ab296i0jr71vhyp9417h40q"; depends=[Rcpp Rcpp]; };
+XHWE = derive { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; };
 XLConnect = derive { name="XLConnect"; version="0.2-11"; sha256="02wxnr6h06h125dqszs8mzq4av842g445ndr59xgscxr03fyvi8p"; depends=[XLConnectJars rJava]; };
 XLConnectJars = derive { name="XLConnectJars"; version="0.2-9"; sha256="0js79297himq628cwx5cc3pcq3iv6p16bn4bpd5diyjaya4x27g3"; depends=[rJava]; };
-XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[]; };
+XML = derive { name="XML"; version="3.98-1.2"; sha256="13rhl534l0cnklxf6zb9y8ykg0k5idg9dxy0nv1vbliz6rw3dr00"; depends=[]; };
 XML2R = derive { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[XML RCurl plyr]; };
 XNomial = derive { name="XNomial"; version="1.0.1"; sha256="134bwglqhgah7v3w6ir65dch2dwp5h4vldw521ba74l5v9b2j2h4"; depends=[]; };
 XiMpLe = derive { name="XiMpLe"; version="0.03-21"; sha256="1j387jzxh0z9dmhvc0kpjjjzf781sgrw57nwzdqwx6bn09bw509d"; depends=[]; };
@@ -2287,25 +2331,27 @@ ZeligMultilevel = derive { name="ZeligMultilevel"; version="0.7-1"; sha256="00zl
 aCRM = derive { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[dummies randomForest kernelFactory ada]; };
 aLFQ = derive { name="aLFQ"; version="1.3.2"; sha256="1963np2b2x7gbpgwcx0rqxd2psfdfmh72ap1y4p7f37ibjm8g45m"; depends=[data_table plyr caret seqinr lattice randomForest ROCR reshape2 protiq]; };
 aRpsDCA = derive { name="aRpsDCA"; version="1.0.0"; sha256="035888scbl5333sz25f9n6xh1zis7l2752p4nhsbs2g44q38l9h6"; depends=[]; };
-aRxiv = derive { name="aRxiv"; version="0.5.8"; sha256="0kwphz9x4ljsznvxxvm03mmbrv3ipyy2fh8lgik4zvv4c63mlxsh"; depends=[httr XML]; };
+aRxiv = derive { name="aRxiv"; version="0.5.10"; sha256="1q8nblb0kfdidcj1nwxn0fap87wpkg49z0bgmwayskwv1p860wrh"; depends=[httr XML]; };
+aSPU = derive { name="aSPU"; version="1.35"; sha256="0wlp47wc75mmgh3986npqa72d4jia1jgalfvz7sq62wjsh1wkrbv"; depends=[]; };
 abc = derive { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data nnet quantreg MASS locfit]; };
 abc_data = derive { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; };
 abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[Rglpk rgl corrplot lattice]; };
-abctools = derive { name="abctools"; version="1.0"; sha256="0kaw2saghjyysj2bcsij2018ls3lrzh9188m0yqhmv71k5vh68rd"; depends=[abc abind plyr]; };
+abctools = derive { name="abctools"; version="1.0.2"; sha256="1wdm42g2maab700fq2shpr1kajpj9m4c4z6k49gghrdzpk1kqxsa"; depends=[abc abind plyr]; };
 abd = derive { name="abd"; version="0.2-7"; sha256="0zkqwdcpz1v9k509vvzfbf9732v43q919hwd9yq3q0dg67d32ai7"; depends=[nlme lattice mosaic]; };
 abf2 = derive { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; };
 abind = derive { name="abind"; version="1.4-3"; sha256="1km61qygl4g3f91ar15r55b13gl8dra387vhmq0igf0sij3mbhmn"; depends=[]; };
 abn = derive { name="abn"; version="0.85"; sha256="1ml4l4fiqscc1ikv0wsi73rymb9599mpnhmzlfnvv4zp3fkfm6qm"; depends=[Cairo]; };
 abundant = derive { name="abundant"; version="1.0"; sha256="0n2yvq057vq5idi7mynnp15cbsijyyipgbl4p7rqfbbgpk5hy3qb"; depends=[QUIC]; };
-accelerometry = derive { name="accelerometry"; version="2.2.4"; sha256="0jk3dirk7bbddqh5j6nw2k1wm1i3k3xnz1mcb6lb5qyf1b642miw"; depends=[Rcpp Rcpp]; };
-accrual = derive { name="accrual"; version="1.0"; sha256="0gw418i9nlrm7nkg6d4m2icd4a04a7avqfjj7nidhl6vy4nflg3k"; depends=[fgui SMPracticals]; };
+acc = derive { name="acc"; version="1.0.2"; sha256="1z7hncgd43mc84v3wdcqpkp3gxsdyvh7h8s6qvgap2lp04m1j74l"; depends=[zoo PhysicalActivity mhsmm timeDate]; };
+accelerometry = derive { name="accelerometry"; version="2.2.5"; sha256="00mn09j7y39sc7h5srnnfk2l73vhh6zq7rzc0vckfvs72lncmwv5"; depends=[Rcpp Rcpp]; };
+accrual = derive { name="accrual"; version="1.1"; sha256="12zlv34pgmhcvisqk3x09hjpmfj91pn56pkjyj483mcf634m9ha4"; depends=[fgui SMPracticals]; };
 accrued = derive { name="accrued"; version="1.2"; sha256="0xkar6kpxf7sq36xqf6cvns2sp5qgqxqjb8hindp59gvlcd2r5a7"; depends=[]; };
 acepack = derive { name="acepack"; version="1.3-3.3"; sha256="13ry3vyys12iplb14jfhmkrl9g5fxg3iijiggq4s4zb5m5436b1y"; depends=[]; };
 acid = derive { name="acid"; version="1.0"; sha256="0m59xnz6435n7j3fggv274g5rap7cpr0zby3aqbaycfdfrp78d1h"; depends=[gamlss gamlss_dist Hmisc]; };
 acm4r = derive { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; };
 acnr = derive { name="acnr"; version="0.2.4"; sha256="1nry927zqhb34h9lcixr344n3sxvq1142zwgj8hadlw69dv8m59y"; depends=[R_utils xtable]; };
 acopula = derive { name="acopula"; version="0.9.2"; sha256="1z8bs4abbfsdxfpbczdrf1ma84bmh7akwx2ki9070zavrhbf00cf"; depends=[]; };
-acp = derive { name="acp"; version="1.1"; sha256="0bdyaab2zalqaq5m4zr86mj92wqq520wqbdb5bkvs7skq6xd1zq9"; depends=[tseries]; };
+acp = derive { name="acp"; version="2.0"; sha256="11ij2xhnkhy7lnzj8fld7habidb9av8a2bk22ycf62f556pqf533"; depends=[tseries quantmod]; };
 acs = derive { name="acs"; version="1.2"; sha256="1vw4ghqcz53m3qy7hy2j7nrdinbbqjpwvr1hsvglq31fq7wss3bd"; depends=[stringr plyr XML]; };
 acss = derive { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; };
 acss_data = derive { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; };
@@ -2320,7 +2366,7 @@ adaptTest = derive { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jva
 adaptivetau = derive { name="adaptivetau"; version="2.2"; sha256="1xqvbbdmn70fmycpn0680q1l9s34kcmkjl812d7yrfxwm1bjfif5"; depends=[]; };
 adaptsmoFMRI = derive { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[Matrix coda mvtnorm MCMCpack spatstat]; };
 additivityTests = derive { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; };
-addreg = derive { name="addreg"; version="1.2"; sha256="1xgf9q0z3prvchyba1vaai6ij72nzvj2dqyr6y2wzb96jfqv19kl"; depends=[combinat glm2]; };
+addreg = derive { name="addreg"; version="2.0"; sha256="1lc8p70di466i061jrbahq4hir4g5a8rns6044jjjg8v7b1y8alc"; depends=[combinat glm2]; };
 ade4 = derive { name="ade4"; version="1.7-2"; sha256="01pchn70jpz8v9l86ng34a2vgn3pv4v5iwxz5n39f685p9lkc2nn"; depends=[]; };
 ade4TkGUI = derive { name="ade4TkGUI"; version="0.2-6"; sha256="010ggsxcmljh0cdba4lcfnsd9r49pwqs6kbw88syfn2qv65hh5kq"; depends=[ade4]; };
 adegenet = derive { name="adegenet"; version="1.4-2"; sha256="13fglxy40rnwi5hsmmvwlfcvfn8dybxyy3k5qhpml8jgpbl3fsdb"; depends=[ade4 MASS igraph ape shiny ggplot2]; };
@@ -2358,7 +2404,7 @@ alleHap = derive { name="alleHap"; version="0.7.2"; sha256="1x10grrv732a0iidr2c9
 allelematch = derive { name="allelematch"; version="2.5"; sha256="1kws6y3igq6l85cfjrck2dzcfpgr56ridbc6w071h8kjw19mlzas"; depends=[dynamicTreeCut]; };
 allelic = derive { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; };
 alm = derive { name="alm"; version="0.4.0"; sha256="125cl5b1sps33ipsh2pygrw79mhin1qj374lq56ny7c9rp4n9w7p"; depends=[ggplot2 plyr stringr reshape reshape2 httr jsonlite lubridate]; };
-alphaOutlier = derive { name="alphaOutlier"; version="1.0.0"; sha256="1f4jma487sp5csrvp5z7rx7k78kj8d4rkw7i3ql764rmm0pbk1h8"; depends=[Rsolnp nleqslv quantreg]; };
+alphaOutlier = derive { name="alphaOutlier"; version="1.0.1"; sha256="1zl80q08vcyvyakfv6cd444m6l5z14p7bv9jf8kpg4dad3d63mhz"; depends=[Rsolnp nleqslv quantreg]; };
 alphahull = derive { name="alphahull"; version="2.0"; sha256="1z8kbh3y5clh3hn018g0fci2psd0l36nz4a08pgg7md2bbhripbl"; depends=[ggplot2 tripack sgeostat spatstat splancs]; };
 alphashape3d = derive { name="alphashape3d"; version="1.1"; sha256="1hfxvzqgirc587vxyggxdqii90nvypzi3wddvd2zdw2h95v9kfyg"; depends=[geometry rgl]; };
 alr3 = derive { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; };
@@ -2368,7 +2414,7 @@ amei = derive { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj5
 amen = derive { name="amen"; version="1.0"; sha256="17kaknfgi39qcg5mhkdyf6cn2l3nn9n2xzvyz1c4piy6inhmj36c"; depends=[]; };
 aml = derive { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; };
 anacor = derive { name="anacor"; version="1.0-5"; sha256="1m2r5x5spb5nahd9cvnsxwqi0ay2kasmha21rbwj3r99jz1vxkql"; depends=[rgl car scatterplot3d colorspace fda]; };
-analogue = derive { name="analogue"; version="0.16-0"; sha256="1izbqzmnw4hmirjlvwp15imzaai2kxbv2gzc58y5awwbfdrg314m"; depends=[vegan mgcv MASS brglm princurve lattice]; };
+analogue = derive { name="analogue"; version="0.16-3"; sha256="0lv8ljf10jdrgrd59pcjdi1wvjfd0j6qb87xzfx5k8kcp9awx4h6"; depends=[vegan mgcv MASS brglm princurve lattice]; };
 analogueExtra = derive { name="analogueExtra"; version="0.1-0"; sha256="0hyl0vn2i594r5czzha7y9a1n4dpznfpmh2j46mci2r57p2s3qr2"; depends=[vegan3d analogue rgl]; };
 analyz = derive { name="analyz"; version="1.4"; sha256="0qdh1gld2dkl0krbhm2vcqg8dfs03dn51rclgsw02554s06dlgxw"; depends=[]; };
 anametrix = derive { name="anametrix"; version="1.6"; sha256="14xrrnvz7jn1jqds48l5pvzlx6hsaxrjc932lqnvv70sfypinjkm"; depends=[RCurl XML pastecs]; };
@@ -2389,7 +2435,7 @@ aoristic = derive { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43
 apTreeshape = derive { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; };
 apc = derive { name="apc"; version="1.1"; sha256="0gnjniy7gm5fh4wn7vwml3z5bw6ydd1xxq5npvqljbzy4vhh8k5a"; depends=[]; };
 apcluster = derive { name="apcluster"; version="1.4.1"; sha256="1s7wsgimpln5kiy1ai8clq2r0i6vh8mr5v4xjha9phdbm8l8yfbg"; depends=[Rcpp Matrix Rcpp]; };
-ape = derive { name="ape"; version="3.2"; sha256="015ibyri6r2xdmy644pb1p6xn0rzxaz49sr96859jfvafzi7p2ny"; depends=[nlme lattice]; };
+ape = derive { name="ape"; version="3.3"; sha256="1zdgszyi5kwfj3kccx35q8z57p53zdp819hjqdw5z8y6q7b49j1c"; depends=[nlme lattice]; };
 apex = derive { name="apex"; version="1.0.0"; sha256="1y4y1kji5nvbk0igbv9xjwsjrnz7bsjj23cczydywg9nppsi9df0"; depends=[ape phangorn adegenet]; };
 aplore3 = derive { name="aplore3"; version="0.7"; sha256="1xj3k13wjpsydcrai474b94kyj298islzfpfwn8n51k67h8r4l08"; depends=[]; };
 aplpack = derive { name="aplpack"; version="1.3.0"; sha256="0i6jy6aygkqk5gagngdw9h9l579lf0qkiy5v8scq5c015w000aaq"; depends=[]; };
@@ -2407,19 +2453,20 @@ aqp = derive { name="aqp"; version="1.8-6"; sha256="03gwvb5sm9l4vyl0jh9rzjs3ka2q
 aqr = derive { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[xts RCurl]; };
 archdata = derive { name="archdata"; version="0.1"; sha256="1k7cpqwgvkwfz25a9db0c8g6ii6xsbhkj3c9alghhaafs7x8n47w"; depends=[]; };
 archetypes = derive { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; };
-archiDART = derive { name="archiDART"; version="1.0"; sha256="0fahcw3032rvz1qd2vv872k8d7845zjfm2byrk1nk5b34z25wm2b"; depends=[]; };
+archiDART = derive { name="archiDART"; version="1.1"; sha256="1md8y3nq575y9v4gj963y92as54h6bzaysnmjirk634rravps9ja"; depends=[XML]; };
 archivist = derive { name="archivist"; version="1.3"; sha256="1did4s9afmbd4b2xcs674fyk2vz0r08vchjfar1q3ri2mfq4p7x5"; depends=[RSQLite DBI shiny lubridate RCurl digest httr]; };
 arf3DS4 = derive { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; };
 arfima = derive { name="arfima"; version="1.2-7"; sha256="00mc50hssnv7qj6dn1l3jgx8ca4vjkqirc38rv538xwjgw9mm1ms"; depends=[ltsa]; };
 argosfilter = derive { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; };
 argparse = derive { name="argparse"; version="1.0.1"; sha256="03p8dpwc26xz01lfbnmckcx6wzky43dyq71085b0anzsavgx0786"; depends=[proto findpython getopt rjson]; };
 argparser = derive { name="argparser"; version="0.1"; sha256="0x4wm8hjzb779pp39v8q210npg7kzh9m8wwqmd17aaqaa3l2al9f"; depends=[]; };
-arm = derive { name="arm"; version="1.8-4"; sha256="17kg5z8spndn41gak9hx7a8dfdx6yrqbsd30lajkgc23x3sd6j1r"; depends=[MASS Matrix lme4 abind coda nlme]; };
+arm = derive { name="arm"; version="1.8-5"; sha256="0mjsjqrim2a6ds8gxrbdyp96b6sz1vjsqic80a5izrc2z9bml5p5"; depends=[MASS Matrix lme4 abind coda nlme]; };
 arnie = derive { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; };
-aroma_affymetrix = derive { name="aroma.affymetrix"; version="2.13.0"; sha256="0rb4qijsqzrv47i30fpcngw50a1gk10zn1r13lszxcsm5i8vjqf7"; depends=[R_utils aroma_core R_methodsS3 R_oo R_cache R_devices R_filesets aroma_apd MASS matrixStats]; };
+aroma_affymetrix = derive { name="aroma.affymetrix"; version="2.13.2"; sha256="0km1mhy8p6pksa0wnwx0cxbfgipi6c7xn7913agsqdpfbfphhm8j"; depends=[R_utils aroma_core R_methodsS3 R_oo R_cache R_devices R_filesets aroma_apd MASS matrixStats]; };
 aroma_apd = derive { name="aroma.apd"; version="0.6.0"; sha256="1l9p5qww71h6wlg2z15wirsfz2i7hmf637l17zaf3n7fp9s3flc7"; depends=[R_methodsS3 R_oo R_utils R_huge]; };
 aroma_cn = derive { name="aroma.cn"; version="1.6.0"; sha256="090qqvv6sk0508knmh2qr1lvpc2vr8s17mj6siblzc66ldp22dj7"; depends=[R_utils aroma_core R_methodsS3 R_oo R_filesets R_cache matrixStats PSCBS]; };
-aroma_core = derive { name="aroma.core"; version="2.13.0"; sha256="1r3r0hrw8akdpjmzhnc0fg6nyd9hccvv4kfbms38qll70lac4910"; depends=[R_utils R_filesets R_devices R_methodsS3 R_oo R_cache R_rsp matrixStats RColorBrewer PSCBS]; };
+aroma_core = derive { name="aroma.core"; version="2.13.1"; sha256="1085qh092sij4c3wl3g10wc8agr13bnqbrq3k4fnm53jpa786qsx"; depends=[R_utils R_filesets R_devices R_methodsS3 R_oo R_cache R_rsp matrixStats RColorBrewer PSCBS]; };
+arqas = derive { name="arqas"; version="1.0"; sha256="1wqrvrmwpgkccr8vi0kn6xiy191ib1zxzrclb6v564bkj16s2w5q"; depends=[distr ggplot2 reshape iterators doParallel foreach fitdistrplus gridExtra]; };
 arrayhelpers = derive { name="arrayhelpers"; version="0.76-20120816"; sha256="1q80dykcbqbcigv2f9xg1brfm3835i0zvs0810q6kh682a3hpqbi"; depends=[]; };
 ars = derive { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; };
 arules = derive { name="arules"; version="1.1-6"; sha256="0xq0j4phwqw9cx2yzxx8xx4srnjjlv75cd463x959bycsp6fzb5r"; depends=[Matrix]; };
@@ -2434,12 +2481,13 @@ asd = derive { name="asd"; version="2.0"; sha256="1nnsbh6g0bhvhp6644zf2l6frr3qnl
 ash = derive { name="ash"; version="1.0-14"; sha256="15x16ld25i160asqf4z4difa6zn2yfgl04j8y8nqb0djymdx7a1f"; depends=[]; };
 aspace = derive { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[splancs Hmisc shapefiles]; };
 aspect = derive { name="aspect"; version="1.0-3"; sha256="12wyyr0ms8g3y96jz1x0y52dlma00j20h7hmm8m6y5p1lgk9kmcd"; depends=[]; };
+asremlPlus = derive { name="asremlPlus"; version="1.10-16"; sha256="17k1syfdsg097pawldw5mgy3a325p8k7xk99qpcivcl3pzsmw79q"; depends=[dae ggplot2]; };
 assertive = derive { name="assertive"; version="0.2-4"; sha256="0xc561fi322qd5z7ss2zi69nl3i8i56w8bksgd38fpjigg0x9fwl"; depends=[knitr]; };
 assertr = derive { name="assertr"; version="0.4.1"; sha256="1h77iisvyakccm7v1iqva04s1hn197sjcy28832cagqg89qlsg31"; depends=[dplyr]; };
 assertthat = derive { name="assertthat"; version="0.1"; sha256="0dwsqajyglfscqilj843qfqn1ndbqpswa7b4l1d633qjk9d68qqk"; depends=[]; };
 assist = derive { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[nlme lattice]; };
 aster = derive { name="aster"; version="0.8-30"; sha256="0vdlimkkmd9ar5v3xrbi9gshvj980l7641brd7cqs78sqf0v71fn"; depends=[trust]; };
-aster2 = derive { name="aster2"; version="0.1"; sha256="1qbh1l2cnhvdfxaw1bv8cpj96nv03g155b1xh1vdigniwc04mssw"; depends=[]; };
+aster2 = derive { name="aster2"; version="0.2-1"; sha256="1gr9hx0mhyan0jy7wsl4ccsx9ahlvhfiq0j1xnffa4m3hzazisn5"; depends=[]; };
 astro = derive { name="astro"; version="1.2"; sha256="1c7zrycgj2n8gz50m94ys1dspilds91s1b2pwaq6df1va17pznby"; depends=[MASS plotrix]; };
 astroFns = derive { name="astroFns"; version="4.1-0"; sha256="0g5q0y067xf1ah91b4lg8mr9imj0d6lgig7gbj3b69fn335k363g"; depends=[]; };
 astrochron = derive { name="astrochron"; version="0.4.2"; sha256="1wrpcngny2b4k0p3xagh5967yvvgxcsp87xcdp4raf4n1v3nk2xx"; depends=[multitaper IDPmisc fields]; };
@@ -2466,6 +2514,7 @@ bReeze = derive { name="bReeze"; version="0.4-0"; sha256="1znhmb2inbfv574adhwjwk
 babar = derive { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; };
 babel = derive { name="babel"; version="0.2-6"; sha256="1dsxjnhr0cky7wlzz8pr8rn3cldfcyrh8v6gn2ba4abr0df7i4dd"; depends=[]; };
 babynames = derive { name="babynames"; version="0.1"; sha256="0qq0303mmcnpfy5630d7rqmb8rl36p7hg2z842rzd4lkhy8c2l07"; depends=[]; };
+backShift = derive { name="backShift"; version="0.1.1"; sha256="11mr2pdg63xa5yrybv91fxz69jizpshs67i7a8lb84n6ydaq1pj3"; depends=[jointDiag clue pcalg igraph matrixcalc reshape2]; };
 backtest = derive { name="backtest"; version="0.3-2"; sha256="06q488pynxgis1m6rxc8hgscpy8vimffpi4aamviwb089sjzilnn"; depends=[lattice]; };
 bagRboostR = derive { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; };
 bamdit = derive { name="bamdit"; version="1.1-1"; sha256="0f865yfwd2pvbkcx8jm4iyilldmprsgyqnscp1n28rp3sbdii4bl"; depends=[coda rjags]; };
@@ -2480,7 +2529,7 @@ basicspace = derive { name="basicspace"; version="0.15"; sha256="11aqrai26kdwszz
 batade = derive { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; };
 batch = derive { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; };
 batchmeans = derive { name="batchmeans"; version="1.0-2"; sha256="126q7gyb1namhb56pi0rv9hchlghjr95pflmmpwhblqfq27djss2"; depends=[]; };
-bayesDccGarch = derive { name="bayesDccGarch"; version="1.0"; sha256="1xgznixi0wdpqbqjacf5viyz69fjd0xbsdgvkgq2d8pjbgp18s0a"; depends=[coda]; };
+bayesDccGarch = derive { name="bayesDccGarch"; version="1.1"; sha256="1gjba5c9vfgvhlard6k47rc2f4r497qy4ybjwr57rm3n3jb0vkl1"; depends=[numDeriv coda]; };
 bayesDem = derive { name="bayesDem"; version="2.4-1"; sha256="0s2dhy8c90smvaxcng6ixhjm7kvwwz2c4lgplynrggrm8rfb19ay"; depends=[gWidgets gWidgetsRGtk2 bayesTFR bayesLife bayesPop RGtk2 wpp2012]; };
 bayesGARCH = derive { name="bayesGARCH"; version="2.0.1"; sha256="1gz18wjikkg3yf71b1g21cx918dyz89f5m295iv8ah807cdx7vjk"; depends=[mvtnorm coda]; };
 bayesGDS = derive { name="bayesGDS"; version="0.6.1"; sha256="0134x5knwp9pmkjyzgi1k7hjj92sym1p0zq98sizlbs0mff2p2s4"; depends=[Matrix]; };
@@ -2507,7 +2556,7 @@ bcp = derive { name="bcp"; version="3.0.1"; sha256="08sa1az1ljsi00zmj3l7z8p1j5im
 bcpa = derive { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[Rcpp plyr Rcpp]; };
 bcpmeta = derive { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; };
 bcrm = derive { name="bcrm"; version="0.4.4"; sha256="0gcigc7505fsk1m70df3n0dz553adkbs8yz2bhskb4qrw4gbmvr7"; depends=[mvtnorm ggplot2]; };
-bcv = derive { name="bcv"; version="1.0"; sha256="053if27miv46mbkni6pcpdpz0l336r5l95k7927dqalnri894xwz"; depends=[]; };
+bcv = derive { name="bcv"; version="1.0.1"; sha256="0yqcfariw9sw0b8cpljcr7vf5rf0cwr1wbif23icchfaxk2m42gj"; depends=[]; };
 bda = derive { name="bda"; version="5.1.3"; sha256="0v2xki9a1j6y42x03a3rrm746xx4qd3ris1m0k7alh25j3ayhs3p"; depends=[]; };
 bde = derive { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[shiny ggplot2]; };
 bdoc = derive { name="bdoc"; version="1.2"; sha256="15d7grc0a1hakkxhgbm2gp0awggzlmsp8zf8abj5bgfih63gcmj2"; depends=[]; };
@@ -2527,7 +2576,7 @@ benchmark = derive { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nz
 benford_analysis = derive { name="benford.analysis"; version="0.1.1"; sha256="00ynk1af5nbq8bn8y77sckx4w32g5zxcp06pdpcxwvp38d7hxhvc"; depends=[data_table]; };
 bentcableAR = derive { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; };
 ber = derive { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; };
-berryFunctions = derive { name="berryFunctions"; version="1.7.1"; sha256="1xpmpbls0vjyi51k7sd1v8s7lp4s1549javcg3yinmvxp9xhwfkx"; depends=[]; };
+berryFunctions = derive { name="berryFunctions"; version="1.8.1"; sha256="0plksyprbc5537005aw0yswwpahxk23c16lrq77zspzfa60i2vf0"; depends=[]; };
 bestglm = derive { name="bestglm"; version="0.34"; sha256="0b6lj91v0vww0fy50sqdn99izkxqbhv83y3zkyrrpvdzwia4dg9w"; depends=[leaps]; };
 betafam = derive { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; };
 betapart = derive { name="betapart"; version="1.3"; sha256="0h2y2c3q6njzh2rlxh8izgkrq9y7abkbb0b13f2iyj9pnalvdv52"; depends=[ape geometry picante rcdd]; };
@@ -2545,7 +2594,7 @@ bglm = derive { name="bglm"; version="1.0"; sha256="1ln5clsfhpzjkm6cjil0lfqg687b
 bgmm = derive { name="bgmm"; version="1.7"; sha256="00bjwmgqvz053yczvllf1nxy1g88fgwrrzhnw309f2yjr1qvjbgg"; depends=[mvtnorm car lattice combinat]; };
 biasbetareg = derive { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; };
 bibtex = derive { name="bibtex"; version="0.4.0"; sha256="0sy1czwjff3kdfnmlkp036qlnw8dzdl5al7izy1cc0535hsijv0d"; depends=[]; };
-biclust = derive { name="biclust"; version="1.1.0"; sha256="0ffsgjg7dvr5nh238abhawz9k775szh8lxl75bqjvxgqiv07f3hc"; depends=[MASS colorspace lattice flexclust]; };
+biclust = derive { name="biclust"; version="1.2.0"; sha256="03vkj7zp3dl4zbv2gzv9pahcd1018lbv4ixghvv1g0fsbndrybdg"; depends=[MASS colorspace lattice flexclust]; };
 bifactorial = derive { name="bifactorial"; version="1.4.7"; sha256="187zlsqph7m63wf6wajvs6a4a08aax9hiqssgvma6cpkpisfiz4k"; depends=[mvtnorm multcomp lattice Rcpp Rcpp]; };
 bigGP = derive { name="bigGP"; version="0.1-5"; sha256="0hlfylwinkwz2s8wgqf6qwxrrdx5a02ln13y4arfwwlqi1kw0s4q"; depends=[Rmpi]; };
 bigRR = derive { name="bigRR"; version="1.3-10"; sha256="08m77r9br6wb9i21smaj4pwwpq3nxdirs542gnkrpakl7bvyp6s3"; depends=[hglm DatABEL]; };
@@ -2556,6 +2605,7 @@ biglars = derive { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f
 biglm = derive { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; };
 bigmemory = derive { name="bigmemory"; version="4.4.6"; sha256="1pplnpxqg380l5mjgz0ak4ipsx7x54339n2wr3dd29xv3w2fb5rp"; depends=[bigmemory_sri BH BH]; };
 bigmemory_sri = derive { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; };
+bigml = derive { name="bigml"; version="0.1.2"; sha256="0vl5krjbgckknxwl26b2hn63jhb80zbn7abpckhxzxfxzncpnfz9"; depends=[RJSONIO RCurl plyr]; };
 bigpca = derive { name="bigpca"; version="1.0"; sha256="1s4qmg7xl8z0sv1b1vfqw0r5cvlbrxx1n0m03ira8fpykcck2clm"; depends=[reader NCmisc bigmemory biganalytics bigmemory_sri BH irlba]; };
 bigrf = derive { name="bigrf"; version="0.1-11"; sha256="0lazi8jk8aapdyyynd5yfcbn4jpjyxh8l64ayd0jj3nisl6hvmdh"; depends=[bigmemory foreach bigmemory BH]; };
 bigrquery = derive { name="bigrquery"; version="0.1.0"; sha256="15ibgi6bqvn0ydq8jx1xhwkwpwwyd7w4f2ams2gpafpysc2f2ks6"; depends=[httr jsonlite assertthat R6 dplyr]; };
@@ -2580,13 +2630,13 @@ binseqtest = derive { name="binseqtest"; version="1.0"; sha256="103nbi3zq9m63266
 bio_infer = derive { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; };
 bio3d = derive { name="bio3d"; version="2.2-2"; sha256="0sqwl27n15sbablw4mcqgf0w2k28jc59wf8yqxrmqbg8cckfsh9j"; depends=[]; };
 bioPN = derive { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
-biogas = derive { name="biogas"; version="1.0"; sha256="0c7ayhmy69k08f32i1agri349wm1addibw4xp9rjq9cmkdhazvbd"; depends=[]; };
+biogas = derive { name="biogas"; version="1.0.1"; sha256="0fjxfj4c4clyp4gkzm0dl5ls7pbyaxmff56dw59wswijm4na2il7"; depends=[]; };
 biogram = derive { name="biogram"; version="1.1"; sha256="04nkm972x1nzlacfjfk3i4gsqbfhrfaygmmw13hrp47j8snv8r26"; depends=[slam bit]; };
 biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[plyr RJSONIO Matrix]; };
 biomod2 = derive { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl256ws9namqdcdxq3w5g79ymfpymfav10h3a"; depends=[sp raster reshape ggplot2 abind rasterVis pROC nnet gbm mda randomForest rpart MASS]; };
 bionetdata = derive { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; };
 biopara = derive { name="biopara"; version="1.5"; sha256="1fhhs6lkm3iphlkx6wklh9sgr1mkjkka9wv2m8fnk0xw01bdsyl5"; depends=[]; };
-biorxivr = derive { name="biorxivr"; version="0.1.0"; sha256="0277kand29vsxczjg1wnlvx494w67x6pd1ybg735ni62is567adg"; depends=[XML]; };
+biorxivr = derive { name="biorxivr"; version="0.1.1"; sha256="0v2jmqpdcci3wwpcrakqcssahy3yx07s265axs14615w74dgd4kl"; depends=[XML]; };
 bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap e1071 scales cluster rgl]; };
 biosignalEMG = derive { name="biosignalEMG"; version="1.0.2"; sha256="0ywb59w3rgac59gif1jba8qi7rjdsdj7y5czj7kv8lf01vd5dl3l"; depends=[]; };
 biotools = derive { name="biotools"; version="2.1"; sha256="15ncx700v5ignr3gggz5zfspskzpj3kpzsy6rg2y4pnjm1vlndgj"; depends=[rpanel tkrplot MASS boot]; };
@@ -2607,7 +2657,7 @@ blender = derive { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cq
 blighty = derive { name="blighty"; version="3.1-4"; sha256="1fkz3vfcnciy6rfybddcp5j744dcsdpmf7cln2jky0krag8pjzpn"; depends=[]; };
 blkergm = derive { name="blkergm"; version="1.1"; sha256="0giknhcl14b4djn5k5v5n33b7bc3f8x6lx2h4jr25kpd89aynhq5"; depends=[network ergm statnet_common ergm]; };
 blm = derive { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; };
-blme = derive { name="blme"; version="1.0-2"; sha256="11m98j9xr6w0hfcss4bbx2aa34gnc5p9if9r8ilw9ify18by77np"; depends=[lme4]; };
+blme = derive { name="blme"; version="1.0-3"; sha256="0kr2svvjbsravvahg96f6q2whfgyx2y4wgbpj9caf3rc2bd5s4nj"; depends=[lme4]; };
 blmeco = derive { name="blmeco"; version="1.0"; sha256="0shhyvqq88i0nr6wdf78rlqk4c91jv26nrb19jcjcw2wxv1mnazq"; depends=[MASS MuMIn arm lme4]; };
 blockTools = derive { name="blockTools"; version="0.6-2"; sha256="0h04179ybklwbs69rg73p5h09fi3vzagh845r00ivw4iv18anq40"; depends=[MASS]; };
 blockcluster = derive { name="blockcluster"; version="3.0.2"; sha256="1qd92lj3ckrj7cvl9zs85igb0974wy5s4zwdnvfyvrsi2bqi3qp8"; depends=[Rcpp Rcpp RcppEigen]; };
@@ -2624,7 +2674,7 @@ bmk = derive { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834l
 bmmix = derive { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; };
 bmp = derive { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; };
 bmrm = derive { name="bmrm"; version="3.0"; sha256="0ix5hfsvs2vnca0l1aflynddw6z85cqdyxn0y7xynkkapk182g4p"; depends=[lpSolve LowRankQP]; };
-bnlearn = derive { name="bnlearn"; version="3.8"; sha256="1jy47sy8pqjwjykdrcfrrdjzrgwgvmzpjxcnh73pgaa2scm9lpk6"; depends=[]; };
+bnlearn = derive { name="bnlearn"; version="3.8.1"; sha256="07lh67nw7wpjimim44zpw8h1rq4yqa2sdjcwj95bmyc25hlzv1s1"; depends=[]; };
 bnormnlr = derive { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; };
 bnpmr = derive { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; };
 boa = derive { name="boa"; version="1.1.7-2"; sha256="1n7i0i8jq2sa1kzhbgyqzl9d53wja7fsxd7rligc8xjm0sdsb386"; depends=[]; };
@@ -2633,11 +2683,11 @@ bold = derive { name="bold"; version="0.2.6"; sha256="15hnbspp5s293v2jykmirf9rvd
 boolean3 = derive { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[optimx numDeriv lattice rgenoud mvtnorm rlecuyer]; };
 boostSeq = derive { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; };
 boostr = derive { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; };
-boot = derive { name="boot"; version="1.3-15"; sha256="0pyznvhbb8237nqab6ylmis73q0s3fgmf65fmh0rr3ryljvzp6sq"; depends=[]; };
+boot = derive { name="boot"; version="1.3-16"; sha256="1fdp3yccsffqpm209dy11085i81cj7g36l34bb94rmd27mqiwrfi"; depends=[]; };
 bootES = derive { name="bootES"; version="1.01"; sha256="00y901d5cjdpzras5w6mv851h5zgp36m5ib6dazs4vqrfpqymva8"; depends=[boot]; };
 bootLR = derive { name="bootLR"; version="0.9"; sha256="0p4hq8nfdd8jw8r8dmlb6va4g7jjnkbsah69hissa9lqawbj9pi7"; depends=[boot]; };
 bootRes = derive { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; };
-bootSVD = derive { name="bootSVD"; version="0.2"; sha256="1b31gxlbysng5ysa18mzlp3vlc9jhn51hia0z1j9g47wi0r0f274"; depends=[ff]; };
+bootSVD = derive { name="bootSVD"; version="0.5"; sha256="14xwbrpqj3j1xpsppgjxpn9ggsns2n1kmni9vn30vgy68zwvs2wy"; depends=[ff]; };
 bootStepAIC = derive { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; };
 bootnet = derive { name="bootnet"; version="0.1"; sha256="18bx0za81z8za0hswj1qwl7a721xbvfpjz0hsih7glf6n5hn0cyp"; depends=[ggplot2 IsingFit qgraph dplyr gtools corpcor]; };
 bootruin = derive { name="bootruin"; version="1.2-1"; sha256="1ii1fcj8sn9x82w23yfzxkgngrgsncnyrik4gcqn6kv7sl58f4r3"; depends=[]; };
@@ -2649,9 +2699,9 @@ boral = derive { name="boral"; version="0.6"; sha256="0ldd5slj90xsch498brll6sjbl
 boss = derive { name="boss"; version="2.1"; sha256="1knsnf19b1xvvq20pjiv56anbnk0d51aq6z3ikhi8y92ijkzh0y8"; depends=[lme4 geepack Matrix ncdf]; };
 boussinesq = derive { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; };
 boxplotdbl = derive { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; };
-boxr = derive { name="boxr"; version="0.2.5"; sha256="03lxdhjajjdpf58c50j1dn4i4bqy8s7h5xgr6m87r7g1v91x23y4"; depends=[httr httpuv assertthat stringr dplyr digest jsonlite]; };
+boxr = derive { name="boxr"; version="0.2.6"; sha256="1b7xvblw2a1p8sr1gxrak404d43haa4kk7blnyir1pql8dcw24jd"; depends=[httr httpuv assertthat stringr dplyr digest jsonlite]; };
 bpca = derive { name="bpca"; version="1.2-2"; sha256="05ldz6b2s379mymj8jzvia9x6gj047gwsxvnv3zj9x8b1hvndnd6"; depends=[scatterplot3d rgl]; };
-bpcp = derive { name="bpcp"; version="1.2.4"; sha256="06q8zkf7z31ax3pb2xmww3l3axcmhvmgrfri1aikhi7ifgcfc979"; depends=[]; };
+bpcp = derive { name="bpcp"; version="1.2.5"; sha256="0dzsj0xhvn7jc8nb54191hwpw4sm7g13af5y3sgp9bhvcym8p31q"; depends=[]; };
 bpkde = derive { name="bpkde"; version="1.0-7"; sha256="1ls6rwmbgb2vzsjn34r87ab8rnz3ls61g6f4x3jpglbk0j91f0h8"; depends=[]; };
 bqtl = derive { name="bqtl"; version="1.0-30"; sha256="1v1p3wvqm5hmwpnjqaz8vlpzm036gpzpxsvy7m0v4x7nc5vrq7g6"; depends=[]; };
 brainR = derive { name="brainR"; version="1.2"; sha256="1515v6kk73p4s3vrnkpkilfxfyqrf7b762sq6j364ygsyfybvh2z"; depends=[rgl misc3d oro_nifti]; };
@@ -2664,7 +2714,7 @@ brew = derive { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6y
 brewdata = derive { name="brewdata"; version="0.4"; sha256="1i8i3yhyph212m6jjsij61hz65a5rplxw8y2xqf6daqiisam5q6i"; depends=[RCurl XML stringdist]; };
 brglm = derive { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; };
 bride = derive { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; };
-brms = derive { name="brms"; version="0.1.0"; sha256="0cx01d65vwsrxlhvxwwlaviz1lvxhl0hd8qw0bna99w8ypsqfp3i"; depends=[ggplot2 Rcpp coda ggmcmc gridExtra]; };
+brms = derive { name="brms"; version="0.2.0"; sha256="1i515sz3paiwwkmgglqzb2gzb2y6m99kp95xaarpawsja8nxi2j0"; depends=[ggplot2 Rcpp abind coda ggmcmc gridExtra]; };
 brnn = derive { name="brnn"; version="0.5"; sha256="0kf2fdgshk8i3jlxjfgpdfq08kzlz3k9s7rdp4bg4lg3khmah9d1"; depends=[Formula]; };
 broman = derive { name="broman"; version="0.55-2"; sha256="04pg362gmxg5lvrv333mjq06lv0q3a1mq6wrbmy87jch6f10lazi"; depends=[assertthat RPushbullet jsonlite ggplot2]; };
 broom = derive { name="broom"; version="0.3.7"; sha256="00z4kwxdqp6g35g4x6js9rc96z8i40hzgvhf5frj9dwfpxclk145"; depends=[plyr dplyr tidyr psych stringr]; };
@@ -2683,7 +2733,7 @@ bvpSolve = derive { name="bvpSolve"; version="1.2.4"; sha256="1ss25md3q59cm40rxw
 c060 = derive { name="c060"; version="0.2-4"; sha256="1yzy0p6041rygqfwzb8dpyc7jq12javmhlvdcmmc7p59bbk7wv3j"; depends=[glmnet survival mlegp tgp peperr penalizedSVM lattice]; };
 c3net = derive { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; };
 cAIC4 = derive { name="cAIC4"; version="0.2"; sha256="13sp3wywv82wgi1vsbxwn68v9xigy0fi3mcwyxjmmgmnsxns2fza"; depends=[lme4 Matrix]; };
-cOde = derive { name="cOde"; version="0.1"; sha256="1cjp63lya2r82fgjwz8mnzs50x7hyzg87dkm006m76xs1iyv988i"; depends=[]; };
+cOde = derive { name="cOde"; version="0.2"; sha256="0741ghg0cqxvgwgvrvsgi75qlkirnm8cjc6bw6xbmkg97scrs5ck"; depends=[]; };
 cSFM = derive { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[sn mgcv mnormt MASS moments]; };
 ca = derive { name="ca"; version="0.58"; sha256="10dp261sq56ixrrr8qq4filxpzszcinz5qv50g40dan0k75n7isb"; depends=[]; };
 caTools = derive { name="caTools"; version="1.17.1"; sha256="1x4szsn2qmbzpyjfdaiz2q7jwhap2gky9wq0riah74q0pzz76ank"; depends=[bitops]; };
@@ -2716,7 +2766,7 @@ catIrt = derive { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybsp
 catR = derive { name="catR"; version="3.4"; sha256="0rgzcnqp18wb8m7f3m8mm7pv04a1irlknkrsrr4hhnzs0phf06yz"; depends=[]; };
 catdata = derive { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; };
 catenary = derive { name="catenary"; version="1.1"; sha256="0khdk61fh8ngr70qf9i2655h5nblj98r8zl724ljv1cjb5x1vphv"; depends=[ggplot2 boot]; };
-cati = derive { name="cati"; version="0.96"; sha256="07vvhar1skcmx0sqkp4bcrrlmb88llqpgg4vmdi4nqhw48kjyjqn"; depends=[nlme ade4 ape e1071 mice rasterVis hypervolume FD geometry vegan]; };
+cati = derive { name="cati"; version="0.99"; sha256="1xghdqmqfwi0wnzvrd896z4snyjqqs9kw3whmkd3cph8zf0jl931"; depends=[nlme ade4 ape e1071 mice rasterVis hypervolume FD geometry vegan]; };
 catnet = derive { name="catnet"; version="1.14.8"; sha256="03y7ddjyra3cjq7savdgickmw82ncx4k01rn752sks6rpl6bjslc"; depends=[]; };
 catspec = derive { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
 causaleffect = derive { name="causaleffect"; version="1.1.1"; sha256="1rsn3zfi24vv1s03ki0aghw4kjls95dr25473fpbmsrmm8n48cqi"; depends=[ggm igraph XML]; };
@@ -2724,7 +2774,7 @@ causalsens = derive { name="causalsens"; version="0.1"; sha256="1v72zjplsa073f92
 cba = derive { name="cba"; version="0.2-14"; sha256="067rm1rfz0rrq8xkzibd81pwvc9rx7ki46bncim4j5ra6i9pn24n"; depends=[proxy]; };
 ccChooser = derive { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; };
 ccaPP = derive { name="ccaPP"; version="0.3.0"; sha256="1wj5yij02372xarhvxsnh43v0l6xb2p8rflmskw6x86vpcdqd6zw"; depends=[Rcpp pcaPP robustbase RcppArmadillo Rcpp RcppArmadillo]; };
-cccd = derive { name="cccd"; version="1.04"; sha256="0mhqv9hzvw3w6wp23kvw4py54ij6x9r19b87i97wwgqr5rhhh1f3"; depends=[igraph plotrix proxy]; };
+cccd = derive { name="cccd"; version="1.5"; sha256="0m364zsrgr7mh1yhl2lqxpaf71gzq3y3pp9qgnj4spiy4iadyy7i"; depends=[igraph proxy deldir FNN]; };
 cccp = derive { name="cccp"; version="0.2-4"; sha256="1hw0xzfdycrnhkym5va430jk1b9ywf7wbm9qyj4a62n210hk4nzc"; depends=[Rcpp Rcpp RcppArmadillo]; };
 cccrm = derive { name="cccrm"; version="1.1"; sha256="0q7vxzj3lblz5ddgzm8z99k0b0z194963hx96bbkqm4rv705dgb0"; depends=[nlme gdata]; };
 ccda = derive { name="ccda"; version="1.1"; sha256="0ya9x1b41l0pjyyfdswjyip0c2v8z7gncbj7cdz0486ad75229x7"; depends=[MASS]; };
@@ -2737,10 +2787,10 @@ cdcsis = derive { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8
 cds = derive { name="cds"; version="1.0.1"; sha256="1vw8ghvwsrpsq89yc4vjyfcw2wsz9dhqv1nlaqmv9b4wqm8gsb5h"; depends=[MASS limSolve clue colorspace copula]; };
 cec2005benchmark = derive { name="cec2005benchmark"; version="1.0.4"; sha256="0bwv63l31hiy63372nvnyfkpqp61cqjag0gczd2v2iwsy3hyivpd"; depends=[]; };
 cec2013 = derive { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; };
-celestial = derive { name="celestial"; version="1.2"; sha256="1bwxr37vkgxavl230jmvk1yp3acnkcpc8im10fsxh1nfxys254ap"; depends=[]; };
+celestial = derive { name="celestial"; version="1.3"; sha256="0icsrpw8y7r0ls8ch5b25fl4rnvs6x5y2wscmcmpp4fa4x64qqg6"; depends=[RANN]; };
 cellVolumeDist = derive { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[minpack_lm gplots]; };
 cellranger = derive { name="cellranger"; version="0.1.0"; sha256="1nfvh0bd99q7cili0hj6ifcg8r57fxv5k4634b7vkshy5rbc5fw1"; depends=[]; };
-cem = derive { name="cem"; version="1.1.10"; sha256="0lykr7sksii30nk4z8pvn4bdmvhm5952grrsvb63qblazg3b84qc"; depends=[nlme lattice randomForest combinat]; };
+cem = derive { name="cem"; version="1.1.16"; sha256="1crljw5ry3hynmfg9xfnbm3ypy57m33885xg39m88gzi6ydrnsvk"; depends=[lattice MatchIt combinat randomForest nlme]; };
 censNID = derive { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; };
 censReg = derive { name="censReg"; version="0.5-20"; sha256="15k7iq4275dyah3r47vgxsx6g6mr7ma53lkv6d1n89bczzys72kx"; depends=[maxLik glmmML sandwich miscTools]; };
 cents = derive { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; };
@@ -2758,7 +2808,7 @@ cghseg = derive { name="cghseg"; version="1.0.2"; sha256="1x7j62aq5c1xj8ss3pys51
 changepoint = derive { name="changepoint"; version="1.1.5"; sha256="090rak3ydlh92w0mpp2sjjx4m9x33clcs77waj20gzxbq38mqdci"; depends=[zoo]; };
 cheb = derive { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; };
 chebpol = derive { name="chebpol"; version="1.3-1367"; sha256="0w1yfnag0sjqjn7g5yn3wd19kkwzcchb491335h70rm360m1kr0y"; depends=[]; };
-checkmate = derive { name="checkmate"; version="1.5.2"; sha256="0sllckm82lxiar3mm3sl4zcf9nhp7x7hfhpz1kiawaxfq7z9436g"; depends=[]; };
+checkmate = derive { name="checkmate"; version="1.5.3"; sha256="1d9szbszql0nz1zxplsr0w9f1c9vi11mjr5xg5960slb5v086x0g"; depends=[]; };
 checkpoint = derive { name="checkpoint"; version="0.3.10"; sha256="147phhsv5g8k23fd355jqjqpjjj8n3s0bblm8mv5c3d0322li7ac"; depends=[]; };
 cheddar = derive { name="cheddar"; version="0.1-629"; sha256="13fmr37jj7dky5jrpr20z1iai9jbnpmwsh2pbzjwvib7561pyd6x"; depends=[]; };
 chemCal = derive { name="chemCal"; version="0.1-34"; sha256="0sn0mhp2d9a9rddfpkiv1pkrmvnv4sy18c1x2ks0lwpaklg78fbs"; depends=[]; };
@@ -2796,23 +2846,24 @@ classify = derive { name="classify"; version="1.3"; sha256="0134h12h6v06d7ldj9qg
 classyfire = derive { name="classyfire"; version="0.1-2"; sha256="0rar3mi2m1wf14lmahjbpdh1jlnisvgsbx86xbqlb8c0f8zfzxq3"; depends=[snowfall e1071 boot neldermead ggplot2 optimbase]; };
 clere = derive { name="clere"; version="1.1"; sha256="1jna5dqy47mldd557qxl7vr59v5lalhligvm3c4k6b2dfararhfr"; depends=[Rcpp Rcpp RcppEigen]; };
 clhs = derive { name="clhs"; version="0.5-4"; sha256="0535mpl1dbm9ij1dvj8dsmv4fickdg47by1mvf71lgfk5mjxy5nc"; depends=[ggplot2 sp raster reshape2 plyr scales]; };
-clickstream = derive { name="clickstream"; version="1.1.3"; sha256="0vhwhklyxpirza6j7cq8rcv7mli2w1pkvld70ih8i1xb1dx3y19x"; depends=[igraph plyr reshape2 Rsolnp]; };
+clickstream = derive { name="clickstream"; version="1.1.4"; sha256="0z73phz31j7n49xmwdgv293qbg6ldfgibpd5713qyk7qkhk8hvl7"; depends=[igraph plyr Rsolnp data_table arules]; };
 clifro = derive { name="clifro"; version="2.4-0"; sha256="1bjsfk4m7hgq8k1mw07zx34ibgmpxjw8sig9jjzsr5mp3v13kwp8"; depends=[lubridate XML selectr RCurl ggplot2 scales RColorBrewer reshape2]; };
 climdex_pcic = derive { name="climdex.pcic"; version="1.1-5.1"; sha256="0sq5l5dmnwbq9y6zfrq7zp81c8bmxwkvl7y9iq6wi3qcr78ga6zy"; depends=[PCICt caTools Rcpp]; };
 clime = derive { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; };
 climwin = derive { name="climwin"; version="0.0.1"; sha256="1ajkqk6lj2d8gx7arkwrznrkrjvdc5g9789vwaawwczbdavyi8kd"; depends=[ggplot2 gridExtra evd lme4 lubridate MuMIn reshape]; };
 clinUtiDNA = derive { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; };
-clinfun = derive { name="clinfun"; version="1.0.9"; sha256="1igj48kp8898inxp6ynz0sgrc54s6k8whzgf5d349z4dn2jvizsb"; depends=[mvtnorm]; };
+clinfun = derive { name="clinfun"; version="1.0.10"; sha256="1q69qn7ib0mzpx5cv69fcgflp9rfmys5j33lqdj4b3g1z036bqrr"; depends=[mvtnorm]; };
 clinsig = derive { name="clinsig"; version="1.0-5"; sha256="1jb2qk6hfvms85whymrfpgvjp8pv33fbllpl8jg80yg1ppmg2jcg"; depends=[]; };
+clisymbols = derive { name="clisymbols"; version="1.0.0"; sha256="1g68kh1js6nssyzw4lpxp4d2h4rhlayhahaykxw4a4bd67fkw20p"; depends=[]; };
 clogitL1 = derive { name="clogitL1"; version="1.4"; sha256="0m9yrg9mzzfv5qkdf6w55xyrjdghyrf27kk7b4x2gyvwvi5b7dkm"; depends=[Rcpp Rcpp]; };
 cloudUtil = derive { name="cloudUtil"; version="0.1.10"; sha256="1j86vpd4ngrdpfjk44wb1mp0l88dxia64pjd2idfcd276giplh6s"; depends=[]; };
 clpAPI = derive { name="clpAPI"; version="1.2.6"; sha256="1kgzmzf87b0j43ch21anmm2d73bj2d16slmyavpbkdwg72dg1sjb"; depends=[]; };
 clue = derive { name="clue"; version="0.3-49"; sha256="1gz9imirwlvmvzn9j0rmdrrax2girf78xfrxw6mrhal66g48bsrj"; depends=[cluster]; };
 clues = derive { name="clues"; version="0.5.6"; sha256="1g0pjj4as5wfc7qr3nwkzgxxxp3mrdq7djn8p8qjba6kcdjxak1i"; depends=[]; };
-clustMD = derive { name="clustMD"; version="1.0"; sha256="1i3c790k300a7y5xhqanp8f1bid2q3a0ajwgf5qsr6dv3ld4h7vj"; depends=[tmvtnorm mvtnorm truncnorm MASS mclust msm]; };
+clustMD = derive { name="clustMD"; version="1.1"; sha256="192li0nx2hwhh5y21xs70vrnzw3wxbzr95f06makaxcrwf4xlp16"; depends=[tmvtnorm mvtnorm truncnorm MASS mclust msm]; };
 cluster = derive { name="cluster"; version="2.0.1"; sha256="09l2vydyabk7x19bblxbjm68vnmifz46m5k3csb1snpbhq6qx52c"; depends=[]; };
 cluster_datasets = derive { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; };
-clusterCrit = derive { name="clusterCrit"; version="1.2.4"; sha256="150iq5gp5czb8m7niyi294jjy3dbfpwccgak7scahd5kz2vs07c7"; depends=[]; };
+clusterCrit = derive { name="clusterCrit"; version="1.2.5"; sha256="1xwbvvzrh2dz47y4snmhb96mriblk3czy7dp5bmyvckh5papr2xv"; depends=[]; };
 clusterGeneration = derive { name="clusterGeneration"; version="1.3.4"; sha256="1ak8p2sxz3y9scyva7niywyadmppg3yhvn6mwjq7z7cabbcilnbw"; depends=[MASS]; };
 clusterGenomics = derive { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; };
 clusterPower = derive { name="clusterPower"; version="0.5"; sha256="1g2qpvizyk4q3qlgvar436nrfqxwp5y8yi2y6rch9ak5mbg3yzqb"; depends=[lme4]; };
@@ -2822,6 +2873,7 @@ clusterSim = derive { name="clusterSim"; version="0.44-2"; sha256="1xf3byri6mwlf
 clusterfly = derive { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[rggobi e1071 reshape2 plyr RGtk2]; };
 clustergas = derive { name="clustergas"; version="1.0"; sha256="1vf4czpwk71yxd26vm5sal0ml20ssjrq4bmk31yzxydpxn495fg8"; depends=[cluster]; };
 clustering_sc_dp = derive { name="clustering.sc.dp"; version="1.0"; sha256="0cppka7613cbjjf1q2yp6fln511wbqdhh8d4gs6p0fbq379kzmvc"; depends=[]; };
+clustertend = derive { name="clustertend"; version="1.4"; sha256="1aqg8cy1hk3lmzvyqh9qc1mcknrva2i0c77hyd0yff9whz80ik4j"; depends=[]; };
 clusteval = derive { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp Rcpp]; };
 clustrd = derive { name="clustrd"; version="0.1.2"; sha256="022lzp1wvbaa20d8hribgq9miy6i7jxm5m1p3p52h9b7bzga3q6g"; depends=[corpcor e1071 ggplot2 irlba]; };
 clustsig = derive { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; };
@@ -2846,9 +2898,9 @@ coda = derive { name="coda"; version="0.17-1"; sha256="1qjsqf4xi6xii60dscn577gmh
 codadiags = derive { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; };
 codep = derive { name="codep"; version="0.4-1"; sha256="1jkd6k80d6vyriwmq1car5zjms304zrdrfbjib664zxzx1wadf8z"; depends=[]; };
 codetools = derive { name="codetools"; version="0.2-11"; sha256="1mal1xa7san28l6rssvanndsgm90qhvbskz840ybfwwix8bqnbmh"; depends=[]; };
-coefficientalpha = derive { name="coefficientalpha"; version="0.3.3"; sha256="1r38jlcl3z16xc410bcgcw1ck6nnby1mqwx5sk6g0lm3jbjcka57"; depends=[rsem lavaan]; };
+coefficientalpha = derive { name="coefficientalpha"; version="0.5"; sha256="0pfw64z7f0gp415nn7519rcw829a7wnwnjx94sc55jsvgb1di3kc"; depends=[rsem lavaan]; };
 coefplot = derive { name="coefplot"; version="1.2.0"; sha256="1v6c3fk2wrjgs3b31vajmig6dvmp5acfm72wh0iffpg0qgvf5hh7"; depends=[ggplot2 plyr reshape2 useful scales proto]; };
-coenocliner = derive { name="coenocliner"; version="0.1-0"; sha256="0hys1a4ai09pax5ydcaq39ll3rdjzyhgvz72z0iv9fwv4fbmwbr9"; depends=[]; };
+coenocliner = derive { name="coenocliner"; version="0.2-0"; sha256="1ndz7nhkzb8y0akyf1ja39m60c1afk4sb8qk7m4xd3srd71wb35z"; depends=[]; };
 coexist = derive { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; };
 coin = derive { name="coin"; version="1.0-24"; sha256="1h1d6pi957qkmlk2j8f280sc6jkg328wnyxjk43yxj2zwmdnmgpd"; depends=[survival modeltools mvtnorm]; };
 cold = derive { name="cold"; version="1.0-4"; sha256="00rl2h4pirzvgwi28pr94kkn233wvm2z8yyfsz6andbkjsihp6jw"; depends=[]; };
@@ -2864,11 +2916,12 @@ combinat = derive { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7l
 comclim = derive { name="comclim"; version="0.9.4"; sha256="0m6ynccscsrrq70p0drwrwxp4skc630kv1l5smh48pi8kagahj1g"; depends=[]; };
 commandr = derive { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; };
 commentr = derive { name="commentr"; version="0.1"; sha256="0kyi7xd2f2b1avk78bmkbagyjqwwx21hca670n38k1a28kvnjpix"; depends=[stringr]; };
+commonmark = derive { name="commonmark"; version="0.4"; sha256="0canhzzc91fpcg53zms12k382zj4db652vh5cn74xrp73z8yvabk"; depends=[]; };
 compHclust = derive { name="compHclust"; version="1.0-2"; sha256="1h39krvz516xwsvn5987i1zbzan8vx2411qz6dad112hpss0vyk9"; depends=[]; };
 compactr = derive { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; };
 compare = derive { name="compare"; version="0.2-5"; sha256="073apjmw5hwslhnjwhff0m8lwszv29n6vbqy0wxl39pyzg7q2x41"; depends=[]; };
 compareC = derive { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; };
-compareGroups = derive { name="compareGroups"; version="3.0"; sha256="0dgh72virrx9bwls5z9wbdh8rk0q1i08pmyh7wma532mx0yv8mzq"; depends=[Hmisc gdata xtable SNPassoc survival epitools HardyWeinberg]; };
+compareGroups = derive { name="compareGroups"; version="3.0.1"; sha256="185lz69al72p4s354vn6gvha3zbhyvf2fsfym0knyspgl08q3m2g"; depends=[Hmisc gdata xtable SNPassoc survival epitools HardyWeinberg]; };
 compareODM = derive { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; };
 comparison = derive { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; };
 compeir = derive { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[lattice etm]; };
@@ -2884,7 +2937,7 @@ cond = derive { name="cond"; version="1.2-3"; sha256="0y7m7valk7zn40y62348czmdvf
 condGEE = derive { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; };
 condMVNorm = derive { name="condMVNorm"; version="2015.2-1"; sha256="04563jljnjhbiaiq33gn5dxjfvv05xp3lhl3w942v0smy0cdhrh4"; depends=[mvtnorm]; };
 condmixt = derive { name="condmixt"; version="1.0"; sha256="05q1fj7akf6lsq9rbcqqkzlx82jvk6mlvmwx6jzk8j228fwqmg90"; depends=[evd]; };
-coneproj = derive { name="coneproj"; version="1.5"; sha256="1xk6v5hp5v5hcxnl8fhb9ccv343yjpswrgm65p4046sw0b764pny"; depends=[Rcpp RcppArmadillo Rcpp]; };
+coneproj = derive { name="coneproj"; version="1.6"; sha256="1bx0j9r83c944aklyq4lxdhmskyiwh4f6i2fim5fi6hpf6n9ajds"; depends=[Rcpp RcppArmadillo Rcpp]; };
 conf_design = derive { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; };
 confidence = derive { name="confidence"; version="1.1-0"; sha256="11y2mjh9ykmsgf6km6f2w5rql1vqwick4jzmxg5gkfkiisvsq1cp"; depends=[knitr markdown plyr xtable ggplot2]; };
 conformal = derive { name="conformal"; version="0.1"; sha256="0syb1p35r6fir7qimp2k51hpvl3xw45ma2hi7qz2xzw8cwhlii3a"; depends=[caret ggplot2 randomForest e1071]; };
@@ -2907,6 +2960,7 @@ corHMM = derive { name="corHMM"; version="1.16"; sha256="048bvnw2ib9x7yijlgp4d1l
 corTools = derive { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; };
 corclass = derive { name="corclass"; version="0.1"; sha256="02mxypdrjwf8psk0j9ggbw14889a87c6lw11qki3s3biq52qsx3y"; depends=[igraph]; };
 corcounts = derive { name="corcounts"; version="1.4"; sha256="0irlx62ql5rp5s7nnjdy6jh723wl4039wn10zxri8ihxwqsyyz3f"; depends=[]; };
+coreNLP = derive { name="coreNLP"; version="0.4-1"; sha256="0a6pc588ddi9qyi5gsnzzvm4k0p5sp5bnjrlsskaymzdq4rp6miz"; depends=[rJava XML plotrix]; };
 coreTDT = derive { name="coreTDT"; version="1.0"; sha256="14rnh61gk3m6g8rq77hm9ybds0px15di2mxm3jiyfdfynx5ng58f"; depends=[]; };
 corpcor = derive { name="corpcor"; version="1.6.7"; sha256="1vfzi17vkvzbqgzhmpdhybb6lli0z9vm9p31cwb8bn8ddlkn5ll4"; depends=[]; };
 corpora = derive { name="corpora"; version="0.4-3"; sha256="0zh8mabfy9yqgx7asi4yqv4c0kj59yvyxxaxjgdjy5kkr17zd4g4"; depends=[]; };
@@ -2925,27 +2979,31 @@ countrycode = derive { name="countrycode"; version="0.18"; sha256="1by3xws2c43ry
 covLCA = derive { name="covLCA"; version="1.0"; sha256="15jsjrlaws1cqyrwvh4lzbhxkb11jmgpmddg98nfrzmjpczn2iw3"; depends=[Matrix mlogit poLCA]; };
 covRobust = derive { name="covRobust"; version="1.1-0"; sha256="1nvy5cqs4g565qj2hhgk5spr58ps2bhas3i752rf7wvrskb89fk7"; depends=[]; };
 covTest = derive { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[lars glmnet glmpath MASS]; };
+covr = derive { name="covr"; version="1.0.0"; sha256="1svq2dcqnd5iwq75nk38lxa3dshiwil2ksd3666713agbqzikgcz"; depends=[jsonlite rex devtools httr crayon htmltools]; };
 covreg = derive { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; };
+cowplot = derive { name="cowplot"; version="0.3.1"; sha256="0sqnirrwm0x2gbmblrvpdghd4v76mhczkhlhr4nd7yjz4947gfcp"; depends=[ggplot2]; };
 coxinterval = derive { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[survival timereg Matrix]; };
 coxme = derive { name="coxme"; version="2.2-4"; sha256="186867w9lcx6il2nfa79g4fbljhak2imjn7hcwczmwz7k7sfa4nk"; depends=[survival bdsmatrix nlme Matrix bdsmatrix]; };
 coxphf = derive { name="coxphf"; version="1.11"; sha256="0494szmhc7qp1qynrqf3kmna26h4ams40qr6w7qj4al54mkp0346"; depends=[survival]; };
 coxphw = derive { name="coxphw"; version="3.0.0"; sha256="11pyd09dwkbixjz1riv8rz3jrp1ix6cbn1fw9nm8vnrc19x5lkz5"; depends=[survival]; };
 coxrobust = derive { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; };
 coxsei = derive { name="coxsei"; version="0.1"; sha256="1agr0gmyy1f2x6yspj04skgpi1drpbc1fcbwhhhjsz1j6c64xagy"; depends=[]; };
+cp4p = derive { name="cp4p"; version="0.2"; sha256="1rm6dgfiv2dx17svlzyaiqiqkpip24ns5wp8lddr6gmpws581ywl"; depends=[MESS]; };
 cpa = derive { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; };
 cpca = derive { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; };
 cpk = derive { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; };
 cplexAPI = derive { name="cplexAPI"; version="1.2.11"; sha256="1rfvq2a561dz3szvrs9s5gsizwwp0b5rn4059v9divzw23clr2a9"; depends=[]; };
 cplm = derive { name="cplm"; version="0.7-2"; sha256="0vwj130r5wbax9ixcn0fdznh1zrr0wq48iivmlymqbhbqajmv8fb"; depends=[coda Matrix biglm ggplot2 minqa nlme reshape2 statmod tweedie Matrix]; };
+cpm = derive { name="cpm"; version="2.0"; sha256="0k27r3bfqrdy3iwpzyh8mp8lr3ndcsc688g6mp5ha4blxiwgciyb"; depends=[]; };
 cqrReg = derive { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[Rcpp quantreg Rcpp RcppArmadillo]; };
-cquad = derive { name="cquad"; version="1.0"; sha256="0pfga45lpq5lgw0jbvp5wasj5m6maj2xr00adsab4c0c5rm7x2wf"; depends=[]; };
+cquad = derive { name="cquad"; version="1.1"; sha256="09rzqdv59q81nsrpjhjbdwm3p803q51w18arjg8x8l2jcgk3zcga"; depends=[]; };
 crackR = derive { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[Hmisc evd]; };
 cramer = derive { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; };
 crank = derive { name="crank"; version="1.0-7"; sha256="1ni5icg1c9ypvcvcxrr7dcp1zbk4iwyns421rrqsgmpns06s59w6"; depends=[]; };
 cranlogs = derive { name="cranlogs"; version="2.0.0"; sha256="13c8sa3s1xvb5naj4cy7d5azcbf716l0gp4x086sqd5dg1hqdy8b"; depends=[httr jsonlite]; };
 crantastic = derive { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; };
 crawl = derive { name="crawl"; version="1.4-1"; sha256="175w5933h5hhhjnrc0l1kg5q24b8pclnf5sf36gj1pmg8s58d1gp"; depends=[mvtnorm sp raster]; };
-crayon = derive { name="crayon"; version="1.2.0"; sha256="1qgc1bakj5hp4fwmm2m6bzqf0mi84v6zcvw04dgck3lk00dxd0k9"; depends=[memoise]; };
+crayon = derive { name="crayon"; version="1.3.0"; sha256="1s51ijdsss02d6wwbx2r14vz03w8b17757rh43i7nc1vh36ylbjk"; depends=[memoise]; };
 crblocks = derive { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; };
 crch = derive { name="crch"; version="0.1-0"; sha256="1f4y2dd6lxsryyjjv569bxh1b4ymcnma0m9k7j150anzvkbrgnjn"; depends=[Formula ordinal]; };
 crimCV = derive { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; };
@@ -2961,7 +3019,7 @@ crqa = derive { name="crqa"; version="1.0.5"; sha256="0kiw90p89mf207mmky98g2d4l9
 crrSC = derive { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; };
 crrstep = derive { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; };
 crs = derive { name="crs"; version="0.15-24"; sha256="08k8vim4n85ll16zpkwbf3riz641kafn699qsg0h746zqzi1kfn7"; depends=[boot np quantreg rgl]; };
-crunch = derive { name="crunch"; version="1.1.1"; sha256="0a1nja6nnhga4f9kq4wy330pdrl8mj9c2mr75fdqkqgdll7dd96j"; depends=[httr jsonlite RCurl]; };
+crunch = derive { name="crunch"; version="1.2.1"; sha256="0p3d7iwphywyfb0m9s3fnqhdhf9klgf1cswilaz9ngxfzh5g3df2"; depends=[httr jsonlite RCurl]; };
 csSAM = derive { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
 csampling = derive { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; };
 cshapes = derive { name="cshapes"; version="0.4-2"; sha256="015mkh0iwdbhpbk8gpnq48pp026mfidd69rj70arpmg3knd2jvff"; depends=[sp maptools plyr]; };
@@ -2979,7 +3037,7 @@ cudaBayesregData = derive { name="cudaBayesregData"; version="0.3-11"; sha256="1
 cudia = derive { name="cudia"; version="0.1"; sha256="1ms3bc8sp6l3bm75j418mmb707sy3gyvxznhfias3nd4sw7i074x"; depends=[MCMCpack mvtnorm]; };
 cumSeg = derive { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; };
 cumplyr = derive { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; };
-curl = derive { name="curl"; version="0.5"; sha256="1fws0402amazfa9wihgydrwrl19rmhi67shc3r1g8hvzfvax5ham"; depends=[]; };
+curl = derive { name="curl"; version="0.8"; sha256="1j24w2hswcs3hl47b60rz3scbqpd2s2dfa2fbf1c9xxb3fi1m38w"; depends=[]; };
 currentSurvival = derive { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[survival cmprsk]; };
 curvHDR = derive { name="curvHDR"; version="1.0-3"; sha256="0rq72prxv2r5nicss9mh4wpkfjvlbb885w85ag4qrqijzq6y8q04"; depends=[feature geometry hdrcde ks misc3d ptinpoly rgl]; };
 curvetest = derive { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_oo R_methodsS3]; };
@@ -2997,6 +3055,7 @@ cycloids = derive { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bf
 cyphid = derive { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; };
 cytoDiv = derive { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; };
 d3Network = derive { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; };
+dMod = derive { name="dMod"; version="0.1"; sha256="0170hvgngwxr0qfl7knmj0l2gg053xj5yfd5hkfyjnl6ivcsw3c9"; depends=[cOde trust ggplot2]; };
 dae = derive { name="dae"; version="2.7-0"; sha256="1pfd3zyvs29ij8xa1ngz2din4srl45rjnjc576h1mz16l7h5kx53"; depends=[ggplot2]; };
 daewr = derive { name="daewr"; version="1.1-4"; sha256="0pmz4721999vf023hpvsf17k5fgqpwnisnwssmav46glhmzl2cyj"; depends=[lattice FrF2 BsMD]; };
 daff = derive { name="daff"; version="0.1.4"; sha256="1g08m9qyrlwxdy9w18132dc9klz6ayw5jbn700vkzvqibfc1l7cx"; depends=[V8 jsonlite]; };
@@ -3016,9 +3075,9 @@ dataframes2xls = derive { name="dataframes2xls"; version="0.4.6"; sha256="18m4cb
 datalist = derive { name="datalist"; version="0.2"; sha256="0q82wira0sfi63cn66f5cfyd15f19ig7pbmpk56j38a3115l2fmn"; depends=[assertthat]; };
 datamap = derive { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; };
 datamart = derive { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[RJSONIO XML RCurl base64 gsubfn markdown]; };
-datamerge = derive { name="datamerge"; version="1.0-1"; sha256="03xb48igkh0f91iq6qc2j5xzqfy2n51ci5i850gn09mm9k4lxij1"; depends=[xtermStyle]; };
+datastepr = derive { name="datastepr"; version="0.0.1"; sha256="1dzx7mw9hl2f8q638m3vwva7mdlb59bgjc5rmpcjb5nxmylpx0vk"; depends=[dplyr lazyeval R6 magrittr rlist]; };
 datautils = derive { name="datautils"; version="0.1.4"; sha256="0adg87p9rzz62cm0s80x71mhsg3yfg93gskv1hs1l8gaj78zd1y1"; depends=[deldir gplots gtools]; };
-dataview = derive { name="dataview"; version="2.0-9"; sha256="0519h2c33v04vwdd8nz9xmqha15svhxdj761d68qmi52jrw6858d"; depends=[xtermStyle]; };
+dataview = derive { name="dataview"; version="2.1.1"; sha256="1nn33h5c1h4a3zm1xm7sdz4s6sy0f3r53jhm7bv6qk7aiylwqf6v"; depends=[data_table xtermStyle]; };
 date = derive { name="date"; version="1.2-34"; sha256="066zsddpw87x1bhl3479k6fd1wrl3x91n5rd454diwmwq2s8i5qb"; depends=[]; };
 dave = derive { name="dave"; version="1.5"; sha256="0sw9hc4y9wdfbnnk6isg7z7sky6ni68pkjxdlrph5m7jcyqphz96"; depends=[labdsv vegan]; };
 dawai = derive { name="dawai"; version="1.1"; sha256="0icf8iys980z0agyba94xa16400p2vdvg8hg52vvlgfc85ikqfkx"; depends=[mvtnorm ibdreg boot]; };
@@ -3036,7 +3095,7 @@ dclone = derive { name="dclone"; version="2.0-0"; sha256="1j8g955rvdgcmc9vnz3xiz
 dcmle = derive { name="dcmle"; version="0.2-4"; sha256="0ddb0x0lwk8jgx05k747sa33d2rrj4g2p4aj0m5bw1c9d5gril0m"; depends=[dclone rjags coda lattice]; };
 dcmr = derive { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; };
 dcv = derive { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; };
-ddalpha = derive { name="ddalpha"; version="1.1.0"; sha256="0kij4s24v4zchlfk4za5373ispapd1yzkp9ld2bwv4w562amnl5w"; depends=[MASS class robustbase Rcpp BH Rcpp]; };
+ddalpha = derive { name="ddalpha"; version="1.1.1"; sha256="1i0zchgp5pdfa9p1mpd9svbigbn01jqfl47nnqixzlgz1808929c"; depends=[MASS class robustbase Rcpp BH Rcpp]; };
 ddeploy = derive { name="ddeploy"; version="1.0.2"; sha256="115k379l39gzddvn0l45l0sr0wyd7r486i28qs2hfyjnk1288vrs"; depends=[httr jsonlite]; };
 ddst = derive { name="ddst"; version="1.03"; sha256="0zbqw4qmrh80jjgn8jzbnq3kykj1v5bsg6k751vircc0x9vnig3j"; depends=[orthopolynom evd]; };
 deSolve = derive { name="deSolve"; version="1.11"; sha256="014fbrgzlarg2w27kq9qy7631hvhlf7ldrn5g8x2xibb260832s1"; depends=[]; };
@@ -3044,29 +3103,31 @@ deTestSet = derive { name="deTestSet"; version="1.1.2"; sha256="142261xjlz6h9vak
 deal = derive { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmabbyivc25cbfhcf814avrhpysvpxa"; depends=[]; };
 deamer = derive { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; };
 debug = derive { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; };
-decctools = derive { name="decctools"; version="0.2.0"; sha256="0k5w49s9s51m7w1h5adk26nw1ypwv5g1mlal78qmx5a4jzaf5bw9"; depends=[XLConnect stringr XML reshape2 RCurl lubridate plyr]; };
+decctools = derive { name="decctools"; version="0.2.1"; sha256="01h119gdvvbfnqfxaca7ca0yhpp6wggq0b69k6ww5lnkfnlj0sgi"; depends=[XLConnect stringr XML reshape2 RCurl lubridate plyr]; };
+decisionSupport = derive { name="decisionSupport"; version="1.101.1"; sha256="08qcvdwp0wgspnfnlhkpxz3p6y43pjf32p185knw8g81wr1950ip"; depends=[msm mvtnorm]; };
 decode = derive { name="decode"; version="1.1"; sha256="06c6l2s32s1vri51hbnl17sxgkl7x8537prk0zzq6zlqhkwy6j77"; depends=[]; };
-decompr = derive { name="decompr"; version="3.0.0"; sha256="06m2k3rjna6nii1fc9b3v2wijkjrknyhskr1ampbdgwligddnzay"; depends=[]; };
+decompr = derive { name="decompr"; version="4.0.0"; sha256="161y5fyy5yqbsl68q9bd4b0s87c3qzv7x9jrzb2k9lxhm4h8qh0w"; depends=[]; };
 decon = derive { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; };
 deducorrect = derive { name="deducorrect"; version="1.3-5"; sha256="06lcqnay36fgkzvgbiq7b67r9lfgll3lxfr1pmx14vmivshb6mmm"; depends=[editrules]; };
 deepnet = derive { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; };
 degenes = derive { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; };
 degreenet = derive { name="degreenet"; version="1.3-1"; sha256="0k0a1c1bv7zclrarfzf0d6avbd8zjnc3zd155jzmhi8dacr6r73w"; depends=[igraph network]; };
 deldir = derive { name="deldir"; version="0.1-9"; sha256="0shzyqfqdkbhpf4hcwjjfzzizh6z56iamx2blhj79izg8xkvl2h9"; depends=[]; };
+delt = derive { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; };
 deltaPlotR = derive { name="deltaPlotR"; version="1.5"; sha256="0hbaibl4b50pg9ypyhz4700w6kir4jiyyl0230a8hjmb92aqn303"; depends=[MASS]; };
 demi = derive { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[R_utils plyr devtools]; };
 deming = derive { name="deming"; version="1.0-1"; sha256="00v59qb6qwbwsvcwi59d0c0g3czfz1190ccj4dx6yarizr4g6cy8"; depends=[boot]; };
 demoKde = derive { name="demoKde"; version="0.9-3"; sha256="1nkvsjms1gfvjz5l7zza0cgx4yqmn2kgnax44pysn0zqmhfny8bw"; depends=[]; };
 demography = derive { name="demography"; version="1.18"; sha256="17r7sz5ikngc4qg495wmn99xawmllpx7rw2gpv8q8bypbc47wlfv"; depends=[forecast rainbow ftsa cobs mgcv strucchange RCurl]; };
 dendextend = derive { name="dendextend"; version="0.18.3"; sha256="1s6bdkibb066yima31sn8ddp8qrwyx2zc84wf2kixs37ynhw1xi1"; depends=[magrittr whisker]; };
-dendextendRcpp = derive { name="dendextendRcpp"; version="0.5.1"; sha256="062f7yjsg196v8c09h6gvbhi0fzgwg40a8xhi751avkjc68z30cq"; depends=[Rcpp dendextend Rcpp]; };
+dendextendRcpp = derive { name="dendextendRcpp"; version="0.6.1"; sha256="125kjlfcj7y282j5g62c6j5hflvwngrm70waxym0lzr7xldwx7bk"; depends=[Rcpp dendextend Rcpp]; };
 dendroextras = derive { name="dendroextras"; version="0.2.1"; sha256="0k1w374r4fvfcbzhrgcvklccjggyz755z7wc2vqfi3c5hvdb9ns4"; depends=[]; };
 dendsort = derive { name="dendsort"; version="0.3.2"; sha256="0qj65jraj6ksmsfsrc4f3y8m7x5lqg9bqc9yb5s3bav2r8qjyhv6"; depends=[]; };
 denovolyzeR = derive { name="denovolyzeR"; version="0.1.0"; sha256="0ys8pi3wp2cvywsnh07wldv6vcb8sn7f1divpaw8f6gnw7mnhimd"; depends=[dplyr reshape]; };
-denpro = derive { name="denpro"; version="0.9.1"; sha256="0ihgk300njhp6dzm1gsmknlx4c5h6kiwprgv3l3f29s6gdxx4f6n"; depends=[]; };
+denpro = derive { name="denpro"; version="0.9.2"; sha256="19hrpfd44jaavq81dbyj3frris4aflfc8lig0471whv0pc6jci2k"; depends=[]; };
 densityClust = derive { name="densityClust"; version="0.1-1"; sha256="1apv9n871dshln5ccg8x3pwqi8yfx73ijfqsvzcljqnv36qpqpqd"; depends=[]; };
 denstrip = derive { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; };
-depend_truncation = derive { name="depend.truncation"; version="2.3"; sha256="1n0v5cwmgpdyapr185s9przdsrxwaqf32038zm1na0yna8qmj8wl"; depends=[mvtnorm]; };
+depend_truncation = derive { name="depend.truncation"; version="2.4"; sha256="09jcg6gr4dy0ayayn8qvbgncnw6v76xzif90c7v64a09snhh8qv6"; depends=[mvtnorm]; };
 depmix = derive { name="depmix"; version="0.9.13"; sha256="1dkwc1bjq19hjzichh78b41qslklgwib8mglbn23q9dsys8a3ccz"; depends=[MASS]; };
 depmixS4 = derive { name="depmixS4"; version="1.3-2"; sha256="18xmn5fv9wszh86ph91yypfnyrxy7j2gqrzzgkb84986fjp2sxlq"; depends=[nnet MASS Rsolnp]; };
 depth = derive { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6jp2qs39g8lxi2nmpbi3m7a6qrgr2q"; depends=[abind rgl circular]; };
@@ -3093,6 +3154,7 @@ dglm = derive { name="dglm"; version="1.8.1"; sha256="12q49nf30ji4c7vysf2s48bif7
 dgmb = derive { name="dgmb"; version="1.1"; sha256="134ckgq7rsdypg3c586kkhr9rx5ya34smp38i9lzvbdanzrpf33w"; depends=[MASS abind]; };
 dgof = derive { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; };
 dhglm = derive { name="dhglm"; version="1.2"; sha256="14wa0xkwb1qvkynk95aw6y4rx3jjdki19wdydg3wv5nfagcc4vdz"; depends=[Matrix numDeriv boot]; };
+diagonals = derive { name="diagonals"; version="0.2.0"; sha256="185nibadqvi6cvablh84ijs52wn2vg0xrc2idizll6lcxhf441yq"; depends=[]; };
 diagram = derive { name="diagram"; version="1.6.3"; sha256="1iga574r31hz7g50nmicbah4rj4l46w6lgw3sz1b69iv6hpp7sq1"; depends=[shape]; };
 diaplt = derive { name="diaplt"; version="1.2.1"; sha256="0pya6rqzsvc5nd3smhydvabarglc4nn04q605vbllmbhq9rv00pa"; depends=[]; };
 dice = derive { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; };
@@ -3110,11 +3172,11 @@ digest = derive { name="digest"; version="0.6.8"; sha256="0m9grqv67hhf51lz10whym
 digitalPCR = derive { name="digitalPCR"; version="1.0"; sha256="0gjxlw0f2msh2x5jpzkpq8xc67zpv560q4vql5nwifm44dwar753"; depends=[]; };
 dils = derive { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp Rcpp]; };
 dinamic = derive { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; };
-diptest = derive { name="diptest"; version="0.75-6"; sha256="158azvdf76h5mp26lw2mjzwp4hwc2psqd9kn5989y4a1jmzxp2bg"; depends=[]; };
+diptest = derive { name="diptest"; version="0.75-7"; sha256="0rcgycgp0bf8vhga1wwgfcz3pqs5l26hgzsgf2f97dwfna40i1p1"; depends=[]; };
 directPA = derive { name="directPA"; version="1.1"; sha256="0sri3981vk997qjl3c3zchn3vx0h3pdbnagcvds4bnrpycvn4bz8"; depends=[rgl calibrate]; };
 directlabels = derive { name="directlabels"; version="2013.6.15"; sha256="083cwahz320r4w4jbh62pxmzn1i1hixp398zm8f2fpzh4qp5y44g"; depends=[quadprog]; };
 dirmult = derive { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; };
-discSurv = derive { name="discSurv"; version="1.0.0"; sha256="0yq0vpdg6n21ar2r3jbgv2kxy7jn6gssyrrs6vfw4rk1q0bw6b2w"; depends=[functional Matrix matrixcalc mvtnorm numDeriv caret mgcv]; };
+discSurv = derive { name="discSurv"; version="1.1.0"; sha256="0jj055w0m749fdd90cqlyklxnjxfjhly179lmg9xfl69w4xrjc2l"; depends=[functional Matrix matrixcalc mvtnorm numDeriv caret mgcv]; };
 disclap = derive { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; };
 disclapmix = derive { name="disclapmix"; version="1.6"; sha256="0g1yg4n4pfy0295faw2scfh45m978ymmlx9bl3h8849kfaizkysi"; depends=[Rcpp disclap cluster Rcpp]; };
 discreteMTP = derive { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; };
@@ -3130,6 +3192,7 @@ displayHTS = derive { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204
 dispmod = derive { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; };
 disposables = derive { name="disposables"; version="1.0.0"; sha256="0xd8war6vav8swpwgmyi9hd6xv0j6j72yrk4sdcwiwzgs4l8cbfj"; depends=[]; };
 dissUtils = derive { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; };
+distcomp = derive { name="distcomp"; version="0.25.1"; sha256="04cq4hsv1yl65cchhran9s3844w4knsbfja5wxfib5gh4dadriwk"; depends=[survival shiny httr digest jsonlite stringr R6]; };
 distfree_cr = derive { name="distfree.cr"; version="1.0"; sha256="13y714l6b3kkpp75fdrsbdclgj1vw1xsvbj9pxi4lkwf11wwmrqr"; depends=[]; };
 distillery = derive { name="distillery"; version="1.0-1"; sha256="0hfj4qbfb5219dm7yrgf2h4jrh2qsjhwrbv8gbrxcr0xf6gqbxmv"; depends=[]; };
 distory = derive { name="distory"; version="1.4.2"; sha256="12j19cb1b4prm8m43gya15kia1ii1k0yy7hkngpn2vsyk7n2z65m"; depends=[ape]; };
@@ -3149,7 +3212,7 @@ diveRsity = derive { name="diveRsity"; version="1.9.73"; sha256="07lln4fkphwk8kg
 diversitree = derive { name="diversitree"; version="0.9-7"; sha256="0hr3hzrrbmfqbzcwn18lnqmychs9f21j1x214zry0jmw9pnai0s0"; depends=[deSolve ape subplex Rcpp Rcpp]; };
 divo = derive { name="divo"; version="0.1.1"; sha256="10kymbvp46rzdd6a6p2fri9424sdxj2bhhv0fld7ikk71xgpfdrp"; depends=[RcppCNPy cluster]; };
 dixon = derive { name="dixon"; version="0.0-5"; sha256="0x7x0l7p8kmkfqqqah8hck2r96b3w8padd41skd3q35vq8kmnsqc"; depends=[splancs spatstat]; };
-dkDNA = derive { name="dkDNA"; version="0.1.0"; sha256="1waqj8l48yqlzi3rb3ilxyx79n5d4w0sp02flvynwaxck6jvh8gc"; depends=[]; };
+dkDNA = derive { name="dkDNA"; version="0.1.1"; sha256="0ycyzn5bmhjl5idp0lndffkninpm9n23wrkrzi59ac8z8ghsnhf4"; depends=[]; };
 dlm = derive { name="dlm"; version="1.1-4"; sha256="0hyphl90bqc16j7in750pmiyq28hmc46kxgv7gj17c8xl9c9xqxm"; depends=[]; };
 dlmap = derive { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[qtl ibdreg wgaim nlme mgcv]; };
 dlmodeler = derive { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; };
@@ -3168,24 +3231,25 @@ doRedis = derive { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9b
 doSNOW = derive { name="doSNOW"; version="1.0.12"; sha256="0j71n0l9lbvwllw9iigvjgv0x8z2j57grl3yazkgcyzy0mcgf741"; depends=[foreach iterators snow]; };
 docopt = derive { name="docopt"; version="0.4.3.3"; sha256="1vpq5q3kfgwijrgblvfipxqkw0m75rahnlmddpiyfgziyszbmidm"; depends=[stringr]; };
 documair = derive { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; };
-domino = derive { name="domino"; version="0.2-6"; sha256="0xbp9gb38gxfdxfbzm792g4fnjsfp2ncncm8cmyra5wja6qwcwl8"; depends=[]; };
+domino = derive { name="domino"; version="0.2-7"; sha256="1wp2rikyggjvqpg29qjn3zcydyplmzhmbgq3xxrlq92swdyzmyy5"; depends=[]; };
 dosresmeta = derive { name="dosresmeta"; version="1.3.0"; sha256="0yfm8dkds8abdl6jrib5vvgkyrd5cl5a99qs27safxx0fcpdiz4k"; depends=[mvmeta aod Matrix]; };
-dostats = derive { name="dostats"; version="1.3.1"; sha256="0xcp9arpvqb7am6caiazlgllvd3hhk4gqjd2wizr2jc5dkwfl4qn"; depends=[]; };
+dostats = derive { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; };
 dotenv = derive { name="dotenv"; version="1.0"; sha256="1lxwvrhqcwj9q24x30xzrw8qqhxgyr88ja3fajm5hf3pwbw85yls"; depends=[magrittr falsy]; };
 downloader = derive { name="downloader"; version="0.3"; sha256="0jpq8z3i9fkgs8wwjrq5qd7qfi5w3rxmzmsi1c1dxlnxzzhg6kxq"; depends=[digest]; };
 dpa = derive { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[sem igraph]; };
 dpcR = derive { name="dpcR"; version="0.1.4.0"; sha256="0fv17vzlsjb5cy1f0ll5gi5y8npavp2y7frzc595na5g15xphmxc"; depends=[binom chipPCR e1071 dgof multcomp qpcR pracma rateratio_test signal shiny spatstat]; };
 dpglasso = derive { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; };
-dplR = derive { name="dplR"; version="1.6.2"; sha256="1w8p4pfzpvarwx9an3zm158pybif6p86k87gxqr2m2fgjsxzf9nb"; depends=[gmp digest lattice png stringi stringr XML]; };
+dplR = derive { name="dplR"; version="1.6.3"; sha256="0w94rdkpw5pbl9ywfvgpmzkwc88m5d5dwii5kw312nfhkb549q4x"; depends=[lattice Matrix digest gmp matrixStats png R_utils stringi stringr XML]; };
 dplRCon = derive { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; };
 dplyr = derive { name="dplyr"; version="0.4.1"; sha256="0kcwg922gzvwz1vfazwknb2sn2z9wfg9xhndi4280lg8cjdllcmw"; depends=[assertthat R6 Rcpp magrittr lazyeval DBI Rcpp BH]; };
 dpmixsim = derive { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[oro_nifti cluster]; };
+dpmr = derive { name="dpmr"; version="0.1.7-1"; sha256="0nh45hg9za9w4w4syrrg54s1fpn6iikv431qkdjyinv8y1a3klga"; depends=[digest httr jsonlite magrittr rio]; };
 dr = derive { name="dr"; version="3.0.9"; sha256="0gmxa5mbmkz54l75ss6kj5ka5kingf02pqj0xsfjxfv0311hwm52"; depends=[MASS]; };
-drat = derive { name="drat"; version="0.0.3"; sha256="1dxgicvjdkhiwkyadxwb6lfvvidx0w2y5sd5dm49chlv6zgjaa2i"; depends=[]; };
+drat = derive { name="drat"; version="0.0.4"; sha256="0pq74a0f1pkgfzgrh0r2xa2xkgxbanp8a5v13bmma09ghy5vnrhm"; depends=[]; };
 drawExpression = derive { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; };
 drc = derive { name="drc"; version="2.5-12"; sha256="1gw78n0w262wl6mdm5wvyp3f0hvrb2kj714acdxz84h2znxr9879"; depends=[MASS car gtools multcomp plotrix scales]; };
 drfit = derive { name="drfit"; version="0.6.3"; sha256="0vx5niw6mfg85937sbjmc0z0gdgf9aj43rmkn1gljky7pq4j3hfn"; depends=[MASS RODBC drc]; };
-drgee = derive { name="drgee"; version="1.1.1"; sha256="0fb5k26c76d5hh09z97mhzx02fr52y2wixgxfgndbp48w826iqpc"; depends=[nleqslv survival]; };
+drgee = derive { name="drgee"; version="1.1.2"; sha256="1idnwa9yy1bijwbz9ffvc4q4lynhisgjvp3jcik3z3r96wfmz2ks"; depends=[nleqslv survival]; };
 drm = derive { name="drm"; version="0.5-8"; sha256="1p6ixd7hnv41gfmvan3rv9xzz1279hmrnvfrl6pxwzs9zcnbb53a"; depends=[]; };
 drmdel = derive { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn9jd750p27qa84vdfxpacm5r0mggnys"; depends=[]; };
 dropR = derive { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; };
@@ -3206,11 +3270,11 @@ dunn_test = derive { name="dunn.test"; version="1.2.4"; sha256="01z9rxhp9mli9b21
 dupiR = derive { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; };
 dvfBm = derive { name="dvfBm"; version="1.0"; sha256="0gx11dxkbnh759ysd1lxdarlddgr3l5gwd5b0klwvwsgck6jv529"; depends=[wmtsa]; };
 dvn = derive { name="dvn"; version="0.3.3"; sha256="14ncna67qgknh20xdvxqddjhagj61niwpvz4ava9k0z68rgzmk5h"; depends=[RCurl XML]; };
-dygraphs = derive { name="dygraphs"; version="0.4.3"; sha256="1pg23lsmjg46nlb17r4shmr6aal3c3pqzkcznfadcc6cgm0afqp2"; depends=[magrittr htmlwidgets zoo xts]; };
+dygraphs = derive { name="dygraphs"; version="0.4.5"; sha256="08bc41d0f8adfnhv668p9sk4507i63xlfs3yswig1g7c0cnyaba9"; depends=[magrittr htmlwidgets zoo xts]; };
 dyn = derive { name="dyn"; version="0.2-9"; sha256="16zd32567aj0gqv9chbcdgi6sj78pnnfy5k8si15v5pnfvkkwslp"; depends=[zoo]; };
 dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.1.3"; sha256="1wgxxn0nlmza7npvjbkfq6nmp30n719yqrav6jzxcp00dk3ymg6g"; depends=[tcltk2 tkrplot]; };
 dynCorr = derive { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; };
-dynRB = derive { name="dynRB"; version="0.1"; sha256="16klhc3lrz9jnpd2br4niqsxzcbqri5y8qr2pr1fnqm64dvhnc8x"; depends=[]; };
+dynRB = derive { name="dynRB"; version="0.2"; sha256="00xpigx1bxjm03fz7x19wws7vqyaa6mgfp3zdb8f0mvw3hjkrvr0"; depends=[]; };
 dynaTree = derive { name="dynaTree"; version="1.2-7"; sha256="06pw78j6wwx7yc175bns1m2p5kg5400vg8x14v4hbrz3ydagx4dn"; depends=[]; };
 dynamicGraph = derive { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; };
 dynamicTreeCut = derive { name="dynamicTreeCut"; version="1.62"; sha256="1y11gg6k32wpsyb10kdv176ivczx2jlizs1xsrjrs6iwbncwzrkp"; depends=[]; };
@@ -3225,7 +3289,7 @@ eRm = derive { name="eRm"; version="0.15-5"; sha256="0g4avcr709brvzcbmqmq35c7zvg
 eVenn = derive { name="eVenn"; version="2.2"; sha256="0k6m61z902spxxrc38504l73h022w5v74g39h4azd1ibr35yrl7j"; depends=[]; };
 eaf = derive { name="eaf"; version="1.07"; sha256="0310lrqfm1l0lifak7wa6xn21bzzn27kbrrx0bidj4hibwv7sa4l"; depends=[modeltools]; };
 earlywarnings = derive { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[ggplot2 moments tgp tseries fields nortest quadprog Kendall KernSmooth lmtest som spam]; };
-earth = derive { name="earth"; version="4.3.0"; sha256="1i52gm0ib1n6ffamb29np88b665l8vdigv482kvzh545kxc1z0jh"; depends=[plotmo]; };
+earth = derive { name="earth"; version="4.4.0"; sha256="1dsqyp93z8a2afvnhms4453cmhn7zbqf5fy18sl43gn616miarpv"; depends=[plotmo TeachingDemos]; };
 easyanova = derive { name="easyanova"; version="4.0"; sha256="1d8fkgyqzphipvla7x8ipcf0by07iqx8xran15d2q82yq9iik5g9"; depends=[car nlme]; };
 easynls = derive { name="easynls"; version="4.0"; sha256="1j2crqvgsf84bpwzf4qh5xkzn5mhxhfx9c0y3p8dbyn8bg7zc2rf"; depends=[]; };
 ebGenotyping = derive { name="ebGenotyping"; version="1.0"; sha256="07dpvxl9xspkzvzkywclg8whgcw7vyakls38pshfypjpyd6iv8ga"; depends=[]; };
@@ -3244,17 +3308,17 @@ ecoretriever = derive { name="ecoretriever"; version="0.1"; sha256="1iwds81pyn9c
 ecosim = derive { name="ecosim"; version="1.2"; sha256="1lzjd6kl2864ngyiqyfnnra5ag9bj42pxb793gwp45r7z95k32rf"; depends=[deSolve stoichcalc]; };
 ecospat = derive { name="ecospat"; version="1.1"; sha256="070vvx00gm36rwjz2g188jn7bkljs1c7j6ap6ssrl3ihzqvc1zdz"; depends=[ade4 ape gam gbm sp adehabitatHR adehabitatMA biomod2 dismo ecodist maptools randomForest spatstat raster rms]; };
 ecoval = derive { name="ecoval"; version="1.0"; sha256="1szvr2ipb7bd0cyslhwwwyx5kw7yx3kpqcyzxfd9pk263bny323g"; depends=[utility rivernet]; };
-ecp = derive { name="ecp"; version="1.6.2"; sha256="0j416ns93m7vrb7dnyr4prqm213cg19hbgffvscnb67y3qwj6lic"; depends=[Rcpp Rcpp]; };
+ecp = derive { name="ecp"; version="2.0.0"; sha256="0cr3rzvd4bahg5idd857mgp005n075xql5kvjw0smsjbjh4p84wq"; depends=[Rcpp Rcpp]; };
 edcc = derive { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; };
 edeR = derive { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; };
 edgeRun = derive { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table]; };
-editrules = derive { name="editrules"; version="2.7.2"; sha256="19g07caacwphvrqn900chrz3k6x4z8gmvlcvna5x2mqidcjkf25i"; depends=[igraph lpSolveAPI]; };
+editrules = derive { name="editrules"; version="2.9.0"; sha256="14mfa8flkym2rx9n7bq9icc9fsrk3szib3amx5l0008rxll9qnxm"; depends=[igraph lpSolveAPI]; };
 edrGraphicalTools = derive { name="edrGraphicalTools"; version="2.1"; sha256="09y63xj3gqrz66mym20g4pmfwrb0wnc2n67692hnqq8dz31q7p3i"; depends=[rgl mvtnorm MASS lasso2]; };
 eegAnalysis = derive { name="eegAnalysis"; version="0.0"; sha256="1lrwjbhm5fnf5fhyyga2b21j2snnmj3zfvfxfkvgsbdnzr3qxaxb"; depends=[e1071 wmtsa fields splus2R]; };
 eegkit = derive { name="eegkit"; version="1.0-2"; sha256="10dksmc5lrl0ypifvmmv96xnndl2zx191sl79qif0gfs3wq3w4s0"; depends=[bigsplines eegkitdata ica rgl]; };
 eegkitdata = derive { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; };
 eeptools = derive { name="eeptools"; version="0.3.1"; sha256="0m6i0hiw565wgziknlf19rh2fq8zvzq2v5a0ppnwcv8vhbhyph3g"; depends=[ggplot2 MASS stringr maptools arm data_table memisc]; };
-effects = derive { name="effects"; version="3.0-3"; sha256="10v99rv18jl10q0zhd4rvkx7dgab3b8w46jv1npqk9lx172iaf1y"; depends=[pbkrtest lme4 nnet lattice colorspace]; };
+effects = derive { name="effects"; version="3.0-4"; sha256="0ypw49gighmg2azc2872y8r9rx9v3x0r2gsidgkwqlaqg95vfcd7"; depends=[lme4 nnet lattice colorspace]; };
 effsize = derive { name="effsize"; version="0.5.4"; sha256="1dc90avbnb83nrm70wh0h45g3c6dcg8zh2ynklc2x86cqk7b264b"; depends=[]; };
 ega = derive { name="ega"; version="1.0.1"; sha256="02mbadv505jz6nk1yp9xl12c9l9wnwpl5bajfbhgs837pdca438g"; depends=[ggplot2]; };
 egcm = derive { name="egcm"; version="1.0.6"; sha256="1j499f94ibr9rx544mwbpwjrwhzbdlvv1p156kj8pfnd7qin26xl"; depends=[zoo xts TTR ggplot2 tseries MASS urca fArma]; };
@@ -3282,12 +3346,12 @@ emdatr = derive { name="emdatr"; version="0.3"; sha256="1ccm45al90wa467n19dqs33q
 emdbook = derive { name="emdbook"; version="1.3.8"; sha256="10qmppacfww8wg1hhd9fpadrvrivrvfgfn1qgm87xlf3a8jpffjj"; depends=[MASS lattice plyr rgl coda bbmle]; };
 emdist = derive { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; };
 emg = derive { name="emg"; version="1.0.6"; sha256="1kzmxs224m6scmk8gg5ckx5c7is99hwgwv28yl26hnrbkm59skyh"; depends=[]; };
-emil = derive { name="emil"; version="1.1-6"; sha256="1qk655swpl8f492y9smzlfxf7aysbwashfs6whnsi7f9dbigw6cd"; depends=[]; };
+emil = derive { name="emil"; version="2.0.2"; sha256="16fkf5ns6pw0nrpysr1yy5hwwg59mkfa84skajchfvq75aw6hwbi"; depends=[dplyr data_table ggplot2 lazyeval magrittr tidyr]; };
 emma = derive { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[earth clusterSim]; };
 emme2 = derive { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; };
 emoa = derive { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; };
 emov = derive { name="emov"; version="0.1"; sha256="1jzssxk7c26ylfb70p9s631bz63fgvrqc105p7536n0kgxy21f7b"; depends=[]; };
-empiricalFDR_DESeq2 = derive { name="empiricalFDR.DESeq2"; version="1.0.1"; sha256="12w3ald2ngaj01rm98k445ai3xl3ggr58y27mfxzlsg697yrx83c"; depends=[]; };
+empiricalFDR_DESeq2 = derive { name="empiricalFDR.DESeq2"; version="1.0.3"; sha256="0h2mcdw4v3ac6dn0s4z37l4sdzbi12sxrnn0f0gc9z207dyyf6w3"; depends=[]; };
 emplik = derive { name="emplik"; version="1.0-1"; sha256="1kwgikdnxh52wsmzrzqv7sp8s55w9q40aq9kpfd3zshkflx7w8g1"; depends=[quantreg]; };
 emplik2 = derive { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; };
 emulator = derive { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; };
@@ -3300,18 +3364,17 @@ english = derive { name="english"; version="1.0-1"; sha256="1413axjp2icj9wwnkz3v
 enigma = derive { name="enigma"; version="0.1.1"; sha256="1309w9nwh7kd1iivj5kq6sgi10k9ac69n3yl6a52ajqnm9rsg3lm"; depends=[httr jsonlite plyr]; };
 enpls = derive { name="enpls"; version="1.0"; sha256="1grnabrb0kzjvjvwp9rx1xqfljla0jd5xrkcbwfzmy2ymmbvh6ma"; depends=[pls foreach doParallel]; };
 enrichvs = derive { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; };
-ensembleBMA = derive { name="ensembleBMA"; version="5.1.1"; sha256="1apzfapzycpjhdn4f2cj77rifc9xrxshq35b1j53rb6qqns7ydyz"; depends=[chron]; };
+ensembleBMA = derive { name="ensembleBMA"; version="5.1.2"; sha256="0cfasrs1paz60na8by9zk0c5jc48l9djvn6c64ygjl1rapz389d4"; depends=[chron]; };
 ensembleMOS = derive { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[ensembleBMA chron]; };
 ensurer = derive { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; };
 entropart = derive { name="entropart"; version="1.2.1"; sha256="14cn0zkfk6w8qrbzis9nxhs0vmhpxn4ksa95j5zxr7lxn77piznz"; depends=[ade4]; };
 entropy = derive { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; };
-enviPat = derive { name="enviPat"; version="1.9"; sha256="0xm23gv4ixmsal9rf0cbq0lwvlpagpmapskz3c4d8qzvhr8qrl3b"; depends=[]; };
+enviPat = derive { name="enviPat"; version="2.0"; sha256="10fzzwlcmrfcppsj06pma8jkp5pfrb2ys70ggb9q4frc5irg5lha"; depends=[]; };
 enviPick = derive { name="enviPick"; version="1.3"; sha256="01wkijvhr8wqjzrhgkvxbnnmb9qsnq0lhkgw93s8nrf8yr3z3awj"; depends=[shiny readMzXmlData]; };
 epade = derive { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; };
 epi2loc = derive { name="epi2loc"; version="1.0-1"; sha256="16abk1v177sg7gmaw42ldf6hf20l7dvyq295zwbq76nxj467khdv"; depends=[pwr]; };
 epiR = derive { name="epiR"; version="0.9-62"; sha256="04r0inaa04pc4nj5dippl2qxa4nysk0sabdgp4bzp5zxw33mf55v"; depends=[survival]; };
 epibasix = derive { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; };
-epicalc = derive { name="epicalc"; version="2.15.1.0"; sha256="11x9q990hc7rf5xfvba47axdy7vld76xcf3kd9lkr0c8nbl5ss9v"; depends=[foreign survival MASS nnet]; };
 epinet = derive { name="epinet"; version="2.0.9"; sha256="071svl1zcjjb3gvk3vg8xf660bvlz0ypkxy88n3d3f3ir2k26s7b"; depends=[]; };
 episensr = derive { name="episensr"; version="0.6.0"; sha256="005cxrwszgqar52zdrliwgg0p8j7rh2msvjd4s028z8ns334zwsb"; depends=[triangle trapezoid]; };
 episplineDensity = derive { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; };
@@ -3327,16 +3390,16 @@ erboost = derive { name="erboost"; version="1.2"; sha256="0afgh0zkl3h3ab4s7wl0cn
 erer = derive { name="erer"; version="2.3"; sha256="165hngfzbzn403gwdcjkhvlm7jygl57nbpwdmlya2rd43z09kp77"; depends=[lmtest systemfit tseries urca ggplot2]; };
 ergm = derive { name="ergm"; version="3.2.4"; sha256="004d3wrv271i0czqkp7abz9lba8g68z350b21f94ad0xfp0cwlp2"; depends=[statnet_common network robustbase coda trust Matrix Rglpk]; };
 ergm_count = derive { name="ergm.count"; version="3.1.1"; sha256="0l66shy5p7h9j3h5gpkn48ps069mdaqbscnnkvmwjfvcc7k5vr8m"; depends=[statnet_common ergm network ergm]; };
-ergm_graphlets = derive { name="ergm.graphlets"; version="1.0.2"; sha256="1wfk8kh4rqw1f7dg4vsjq8nirgwyyk21r0x7x2hrd4v4ci0mcz6j"; depends=[statnet ergm]; };
+ergm_graphlets = derive { name="ergm.graphlets"; version="1.0.3"; sha256="0xk45ialjckvjs96k19skk7imilcahgyzfwc74h6yand5q3mg6fz"; depends=[network ergm statnet_common ergm]; };
 ergm_userterms = derive { name="ergm.userterms"; version="3.1.1"; sha256="0pvklvyxi7sjc5041zl8vcisni0jz1283gyjw5mhas9bl47g1cwc"; depends=[network ergm statnet_common ergm]; };
 ergmharris = derive { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; };
 erpR = derive { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; };
-esaBcv = derive { name="esaBcv"; version="1.1.1"; sha256="0bsdxd0spfpzkaxyv1qh5n3x31qr75wgb1lizifl5j9mfi4ks7h1"; depends=[corpcor svd]; };
+esaBcv = derive { name="esaBcv"; version="1.2.1"; sha256="0hgjcdbiy1a71vsb2vcyp0xmhy6wi4nlh1sqsfb2vxckc95i9i21"; depends=[corpcor svd]; };
 esotericR = derive { name="esotericR"; version="1.0"; sha256="0kl9c2z2mpg3mk8jnl0ssgcf6y0i9jpczms746j8f07ydrcxpf41"; depends=[]; };
 estimability = derive { name="estimability"; version="1.1"; sha256="1inw2ir83bzz40gynwfcjzx7f6v99pqlphq7p3rmql01ikd2b6r9"; depends=[]; };
 estout = derive { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; };
 etable = derive { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[xtable Hmisc]; };
-etasFLP = derive { name="etasFLP"; version="1.2.1"; sha256="1jkkpzvnkf3n3jalqj90brk5n4r4znc521kgx13n45y9j8b6ni50"; depends=[mapdata rgl fields maps]; };
+etasFLP = derive { name="etasFLP"; version="1.3.0"; sha256="1qh8s9ikd2lpchpp4h9z4zvcd9l2gi15dg0i54nxg9acn92yn3hi"; depends=[mapdata rgl fields maps]; };
 etm = derive { name="etm"; version="0.6-2"; sha256="0sdsm6h502bkrxc9admshkrkqjczivh3av55sha7542pr6nhl085"; depends=[survival lattice]; };
 eulerian = derive { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[]; };
 eurostat = derive { name="eurostat"; version="1.0.16"; sha256="017ri3vvlp60r9h5b0y4j2adggkrkjbapkjynpl0vg92islspqkz"; depends=[plyr tidyr]; };
@@ -3347,9 +3410,10 @@ eventInterval = derive { name="eventInterval"; version="1.2"; sha256="15g934n7fl
 events = derive { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; };
 eventstudies = derive { name="eventstudies"; version="1.1"; sha256="13l2yhmlpiid9r3njnmvja231l00ym7gvwfbv0m9fk2k5j6gm5id"; depends=[zoo xts boot]; };
 evir = derive { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; };
-evmix = derive { name="evmix"; version="2.5"; sha256="0v1raxxxj0qhampaia2q00asprl7ra7vk3s7vvcfpzmg4476vm50"; depends=[MASS gsl SparseM]; };
+evmix = derive { name="evmix"; version="2.6"; sha256="1rc52mqmzl05n5n1lr990czqgpq9h2x8shnv6s7hvr8896kjasjm"; depends=[MASS gsl SparseM]; };
 evobiR = derive { name="evobiR"; version="1.0"; sha256="12j01qzc4yrjpxbj39bl29f5ypxwk33c6qf0mjjbgpwn5g6fgsi4"; depends=[seqinr ape stringr geiger taxize]; };
-evolvability = derive { name="evolvability"; version="1.0"; sha256="17vkmb5208q4lx6jslx96nbhsl9m2c4ra6264bparbgrg34byg9x"; depends=[coda]; };
+evolqg = derive { name="evolqg"; version="0.1-5"; sha256="1s9jh14ycymlajc285cczr9m529vv6la4bkv0lgk3dc0557m7q5w"; depends=[plyr Rcpp reshape2 ggplot2 magrittr tidyr vegan ape phytools mvtnorm Rcpp]; };
+evolvability = derive { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; };
 evora = derive { name="evora"; version="1.0"; sha256="0blq28ldynbq3v6rh0yk89wy1sjp4621h6iwnyyiipqwzihwrhz2"; depends=[Hmisc]; };
 evt0 = derive { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; };
 evtree = derive { name="evtree"; version="1.0-0"; sha256="0i37lkdfzvgby98888ndd5wzxs7y11sxf9mh6pqpqgwif05p4z3i"; depends=[partykit]; };
@@ -3425,10 +3489,10 @@ faraway = derive { name="faraway"; version="1.0.6"; sha256="10vj38chfnlz595pdi16
 farsi = derive { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; };
 fast = derive { name="fast"; version="0.63"; sha256="00ag9d0dwn9al104y93m8dclbjqabr9liif8gr19v3gv6k2k6p2c"; depends=[zoo]; };
 fastGHQuad = derive { name="fastGHQuad"; version="0.2"; sha256="0yv3wdyj7hs1gr3rq08k520v0ldmv5zzng709xjx2kchhwhmy8ah"; depends=[Rcpp Rcpp]; };
-fastHICA = derive { name="fastHICA"; version="1.0"; sha256="02lqqni7j2sp3ndb3kq785d7jf08p2s3ch30di8ffhwn57indald"; depends=[fastICA energy]; };
+fastHICA = derive { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[fastICA energy]; };
 fastICA = derive { name="fastICA"; version="1.2-0"; sha256="0ykk78fsk5da2g16i4wji85bvji7nayjvkfp07hyaxq9d15jmf0r"; depends=[]; };
 fastM = derive { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5ajb8fjbf7xam75scp0mg3czswnfn"; depends=[Rcpp Rcpp RcppArmadillo]; };
-fastR = derive { name="fastR"; version="0.8-1"; sha256="08p03i72zn0cbwjsxpnsknk0148dx3pfwkw740x7f52c3jgbb1gi"; depends=[mosaic lattice mosaicData]; };
+fastR = derive { name="fastR"; version="0.10"; sha256="0bd164lij12yfqjykxj1m4rma7x2y4kpv4fspjlp1vpwqn3h4lb9"; depends=[mosaic lattice mosaicData]; };
 fastSOM = derive { name="fastSOM"; version="0.9"; sha256="03501d5289lrlr4qcgxciz160hqc6nhqb9ab266fr132fkbiv4id"; depends=[]; };
 fastclime = derive { name="fastclime"; version="1.2.5"; sha256="12k7bkq4gkkyh8lr2whmi73mzcy7wmfzwgi20kli7r4g39n3a1kv"; depends=[lattice igraph MASS Matrix]; };
 fastcluster = derive { name="fastcluster"; version="1.1.16"; sha256="0x2prrsnqi5iqx23ki6y2agndjq8058ph6s703i4avrqi1q1w1q8"; depends=[]; };
@@ -3438,14 +3502,14 @@ fastpseudo = derive { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j
 fat2Lpoly = derive { name="fat2Lpoly"; version="1.1.1"; sha256="0xgxlx9m6lgcn784892g2xvnabyq8k45wi3xrszrbdxxa7zqd1i4"; depends=[kinship2 multgee]; };
 fbRanks = derive { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; };
 fbati = derive { name="fbati"; version="1.0-1"; sha256="1ia67dg9b61kc14mjg7065v0c6n6agdp8cjdviasyzga00wzsyxj"; depends=[pbatR fgui rootSolve]; };
-fbroc = derive { name="fbroc"; version="0.1.0"; sha256="1zpg796day8qlvah3d4qy8118knxx7vfa3gf50jcsv97b8r15dmz"; depends=[ggplot2 Rcpp Rcpp]; };
+fbroc = derive { name="fbroc"; version="0.2.1"; sha256="06qpdnh86klkbwiv593l57wnbamrmcj5ysabyrbjf9mr8mjzhkkj"; depends=[ggplot2 Rcpp Rcpp]; };
 fcd = derive { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[glmnet MASS combinat]; };
-fclust = derive { name="fclust"; version="1.1"; sha256="1nimfgirpcff5dqqx2jqn25ma9j0agffimymrv9x5ivfdncdflbg"; depends=[]; };
+fclust = derive { name="fclust"; version="1.1.1"; sha256="0gxgyvz6nzqp5sdjhfdjmm3r4lf1b4min3s5rfddwdqiswzxg8m8"; depends=[]; };
 fcros = derive { name="fcros"; version="1.3"; sha256="1ylkma69gfc5ij3vvf1axyasya31qm5bwj2bjlvj12byf52wsiy8"; depends=[]; };
 fda = derive { name="fda"; version="2.4.4"; sha256="05rvrp29ip1wrk2wly06wdry2a2riynkx677nx5lg240lz12d6yw"; depends=[Matrix]; };
 fda_usc = derive { name="fda.usc"; version="1.2.1"; sha256="1w0dw06vgviia4yy2v5mrq0jvnfvdp7y8f2x246v3xliqgjmg7as"; depends=[fda MASS mgcv rpart]; };
 fdaMixed = derive { name="fdaMixed"; version="0.4"; sha256="15m13v71kqxd9gqiymgfkq0dvcpzp05576m8zkg08m0k067ga9bd"; depends=[Formula Rcpp Rcpp RcppArmadillo]; };
-fdakma = derive { name="fdakma"; version="1.2"; sha256="17nbaal3m2rz423fq34fia8pb75dzdzsj5d8w6g2iwckqbapszn0"; depends=[]; };
+fdakma = derive { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; };
 fdasrvf = derive { name="fdasrvf"; version="1.4.2"; sha256="12x04fi0sxs9yh1mf9iykk69zlz6m31j7s01in28p5hgk6wqf8fi"; depends=[foreach mvtnorm matrixcalc numDeriv]; };
 fdatest = derive { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; };
 fdrDiscreteNull = derive { name="fdrDiscreteNull"; version="1.0"; sha256="1388a9hjbgblmhx5f3ddk16kigzsik9bvw179d1szk33kadfq2vp"; depends=[MCMCpack]; };
@@ -3457,8 +3521,9 @@ feature = derive { name="feature"; version="1.2.11"; sha256="0dgiv9gwyklnw8w0cpc
 features = derive { name="features"; version="2011.8-2"; sha256="0yshwqv2mzl5jj323jwxscpz2ygb4ywxh6q0zwphb24bhv7h9lwd"; depends=[lokern]; };
 fechner = derive { name="fechner"; version="1.0-2"; sha256="0yhiqr0wlka3wq0nhwy9n02ax3x5b0y803iadbsr3xb54pxbfbqd"; depends=[]; };
 federalregister = derive { name="federalregister"; version="0.1.2"; sha256="0f73jhzhqi3a97iyfx5c5i09vxwnyypgw6668z7nch8lvq337s8x"; depends=[RCurl RJSONIO]; };
+fermicatsR = derive { name="fermicatsR"; version="1.3"; sha256="0vv3i1f01rjsd17a8z2wcf3iv6xlwg7fki99z3p5h8m4g6jwljfk"; depends=[]; };
 ff = derive { name="ff"; version="2.2-13"; sha256="1nvd6kx46xzyc99a44mgynd94pvd2h495m5a7b1g67k5w2phiywb"; depends=[bit]; };
-ffbase = derive { name="ffbase"; version="0.11.3"; sha256="0n65i2a91jjjpzfw3placf6j6sbf8azzd1sck4adha6iiwpi8b1n"; depends=[ff bit fastmatch]; };
+ffbase = derive { name="ffbase"; version="0.12.1"; sha256="1qgmk1cn8s89amfmzzr2zhg6w4wwn4k79i92ib15j02i4csvykjj"; depends=[ff fastmatch bit]; };
 ffmanova = derive { name="ffmanova"; version="0.2-2"; sha256="0sw8br73mx552m4b5zi4qgjcrwxflmgsnvs4mlnxh8g2gaf5bx4j"; depends=[]; };
 fftw = derive { name="fftw"; version="1.0-3"; sha256="01nncrf2p0yq49lhd5aq4hvhp87f25r0x7siqnaldv5zq24krl30"; depends=[]; };
 fftwtools = derive { name="fftwtools"; version="0.9-7"; sha256="1pd6ri9qh8rj5dahznl38l6haa1x6f2w91mxi83lic76lpddnxly"; depends=[]; };
@@ -3478,18 +3543,19 @@ fingerprint = derive { name="fingerprint"; version="3.5.2"; sha256="042aycxs00rg
 finiteruinprob = derive { name="finiteruinprob"; version="0.4"; sha256="0wcllbqkryll3v3fjb6k210pcgkskzrpa78gg8nda0jvkij11zb7"; depends=[sdprisk numDeriv]; };
 fishMod = derive { name="fishMod"; version="0.25"; sha256="0mg1bziz2ia406m4ilc7hw1bghrgdibm537hnlf9ffhfayjc4kid"; depends=[]; };
 fisheyeR = derive { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; };
-fishmethods = derive { name="fishmethods"; version="1.7-0"; sha256="0kgfv78f8a460nfvpfrrqfiy3ipbl3775axydal3vm1zf4l6k2z3"; depends=[MASS boot bootstrap]; };
+fishmethods = derive { name="fishmethods"; version="1.8-0"; sha256="1n5wwwnggflq2y7j3m3kf324mwdhf45ihi25gbqyv79qklg5xcai"; depends=[MASS boot bootstrap]; };
 fishmove = derive { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[ggplot2 plyr MASS boot]; };
 fit_models = derive { name="fit.models"; version="0.5-10"; sha256="06pj26dbnq6mf9wxinvjzwyn36656f66a4bmky36r7fzi92gf3d8"; depends=[lattice]; };
 fit4NM = derive { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[gWidgets tkrplot RGtk2 gWidgetsRGtk2 cairoDevice]; };
 fitDRC = derive { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; };
 fitTetra = derive { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; };
-fitbitScraper = derive { name="fitbitScraper"; version="0.1.2"; sha256="10qm5j4g0vs7yg5nchwza73dpr7w3zqrkffpyl60ginvl0qlqj9j"; depends=[httr stringr RJSONIO]; };
+fitbitScraper = derive { name="fitbitScraper"; version="0.1.3"; sha256="0fh8qm4ws9idx0868rda7v1cs8g61q8zdx1ncyxijbvijhdslfgj"; depends=[httr stringr RJSONIO]; };
 fitdistrplus = derive { name="fitdistrplus"; version="1.0-4"; sha256="02ds5vmxc3rk50c33rxdnpqf2hbx186ss6br29n6538q7734nra9"; depends=[survival]; };
 flam = derive { name="flam"; version="1.0"; sha256="0jyx0wff5zdpnhgxz74k6fxgwdnl7khanahv63af22y0mqpd066f"; depends=[MASS]; };
 flare = derive { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[lattice MASS Matrix igraph]; };
 flashClust = derive { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
 flexCWM = derive { name="flexCWM"; version="1.5"; sha256="1q6nkw6al56wc53sj719c94iv20a9a82pq4s62jnb2flq1pwdaml"; depends=[numDeriv mnormt mclust ellipse mixture Flury adehabitat MASS statmod]; };
+flexPM = derive { name="flexPM"; version="1.0"; sha256="0zchcqsjinf3fpw5ijnygh1ywn2fdj9a6rgv7vfb44dcjgy4k74f"; depends=[]; };
 flexclust = derive { name="flexclust"; version="1.3-4"; sha256="1x9gyg69kb3wn02w885kl6hcwpf2ki66gzfayvc83jisrwxvdfvv"; depends=[lattice modeltools]; };
 flexmix = derive { name="flexmix"; version="2.3-13"; sha256="1i205yw3kkxs27gqcs6zx0c2mh16p332a2p06wq6fdzb20bazg3z"; depends=[lattice modeltools nnet]; };
 flexsurv = derive { name="flexsurv"; version="0.6"; sha256="10y6v1m8w5h92y37pi26xqsb4l6wk6dz43593dngpfr9ww1j4aaa"; depends=[survival muhaz mvtnorm deSolve]; };
@@ -3497,7 +3563,6 @@ flip = derive { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1
 flora = derive { name="flora"; version="0.2.4"; sha256="1rdwdx7mphfr7sk3yba0vhbsh3xggz2k6ip8dmfiqjjhv2vxji5k"; depends=[shiny]; };
 flower = derive { name="flower"; version="1.0"; sha256="1h2fvpjrvpbyrqb8hd51sslr1ibpwa7h9fiqy9anvf2yim5j11yq"; depends=[]; };
 flowfield = derive { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; };
-flowr = derive { name="flowr"; version="0.9.6.5"; sha256="0nb715cgq9zgr7vr094q6y1j4dq77ckldn0f203jr368b9wqbqkh"; depends=[diagram knitr ggplot2 RSQLite reshape2]; };
 flsa = derive { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; };
 flux = derive { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; };
 fma = derive { name="fma"; version="2.01"; sha256="1j5mvhbrdnkyj4svibpahnz7d4221nkhja5b7fnh68mbmil607fc"; depends=[tseries forecast]; };
@@ -3510,17 +3575,18 @@ foodweb = derive { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28
 forams = derive { name="forams"; version="2.0-4"; sha256="1kvxlqdyzb3rqa45hp7jxjm009w0r6h78nr3yh9bqcz594zqidbq"; depends=[vegan]; };
 foreach = derive { name="foreach"; version="1.4.2"; sha256="097zk7cwyjxgw2i8i547y437y0gg2fmyc5g4i8bbkn99004qzzfl"; depends=[codetools iterators]; };
 forecTheta = derive { name="forecTheta"; version="1.0"; sha256="1ip6l27d37xqnmg8w285lq1y5j6akrjrviq4338c8sq075d8hckn"; depends=[forecast]; };
-forecast = derive { name="forecast"; version="6.0"; sha256="13pim2jz14jy9czjjaliv8x86iqcdaglzvdl9dz3xjj47c5nhhac"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; };
+forecast = derive { name="forecast"; version="6.1"; sha256="1hwv3arcpkkhpj5n2dvpw2fyx687b6x6yakxx55cw9rrka70rx1k"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; };
 foreign = derive { name="foreign"; version="0.8-63"; sha256="1g5hl8drcmh2c9kpkr4443nw7dsxjwqsqs1q4bnhvw2lizs8bfb2"; depends=[]; };
 forensic = derive { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[genetics combinat]; };
 forensim = derive { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; };
+forestFloor = derive { name="forestFloor"; version="1.4"; sha256="152b5pq9901bdik3dqmn4gb0aiyl8zf8mg88d8xnz839aildp2fw"; depends=[Rcpp randomForest rgl kknn trimTrees Rcpp]; };
 forestplot = derive { name="forestplot"; version="1.1"; sha256="1h28lwqdizs450bm5hb8zfbmx633n8v5bj2p8mi4cl814sjjylr0"; depends=[]; };
 formatR = derive { name="formatR"; version="1.2"; sha256="0dlj728qdm7wmxcxvw1ip64pl4ajgmi8ax69zafrn3306pg9y136"; depends=[]; };
-formula_tools = derive { name="formula.tools"; version="1.3.4"; sha256="1xxl45x88fpskwvfj6sbcbfng84plpf8sjrkwawzki9a41ydhwaq"; depends=[operator_tools]; };
+formula_tools = derive { name="formula.tools"; version="1.5.2"; sha256="1n2rw9zhrgcsjxrm108fs7sysk9jk1gmq0jmg9s7pm7ff76insnj"; depends=[operator_tools]; };
 fortunes = derive { name="fortunes"; version="1.5-2"; sha256="1wv1x055v388ay4gnd1l8y6dgvamyfvmsd0ik9fziygwsaljb049"; depends=[]; };
 forward = derive { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; };
 fossil = derive { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[sp maps shapefiles]; };
-fpCompare = derive { name="fpCompare"; version="0.1.0"; sha256="1b5jbw6rlrx3qdn0mcga4n4505jqqr2pbz77x0vxcyn35qv9d9ql"; depends=[]; };
+fpCompare = derive { name="fpCompare"; version="0.2.0"; sha256="0s8gfnyj6kjwy3ymiy232bb5wzgkd1ainaqzlki7mcafa3dyzq0a"; depends=[]; };
 fpc = derive { name="fpc"; version="2.1-9"; sha256="01x7zcsbz9n10dxx8plb37c7z7pfz1xd5dvfrij3na327mny3pxs"; depends=[MASS cluster mclust flexmix prabclus class diptest mvtnorm robustbase kernlab trimcluster]; };
 fpca = derive { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; };
 fpow = derive { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; };
@@ -3534,7 +3600,7 @@ fractalrock = derive { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8k
 frailtyHL = derive { name="frailtyHL"; version="1.1"; sha256="1xjdph0ixanf9w4b6hx6igfhkcp8h93sclrg0pgqgmbvm41lhb1x"; depends=[Matrix numDeriv survival]; };
 frailtypack = derive { name="frailtypack"; version="2.7.5"; sha256="1wjb8l6aj1lsmbgczfag8a96r0z235yj315kr7dpkqkninn2bqwk"; depends=[survival boot MASS survC1]; };
 frair = derive { name="frair"; version="0.4"; sha256="1g52ykj1m9znpp0pvry7dnmhg4m73nbkw0bp31zl6pcsdgmxxqjr"; depends=[bbmle emdbook boot]; };
-frbs = derive { name="frbs"; version="3.0-0"; sha256="0v2l8s5jla8jsl9izqfpxhcd1dnrxsa0czlhq1wmx5k06jvbvpdw"; depends=[]; };
+frbs = derive { name="frbs"; version="3.1-0"; sha256="0ngvi7lg6aviwic8f4ya03khyzh3ksglpmsnrdjjznwj874y2wim"; depends=[]; };
 freeknotsplines = derive { name="freeknotsplines"; version="1.0"; sha256="19zs42q9njknirdbrbnp8bv4vr32kd8wxmkqj0a0nh06i5fcx67r"; depends=[]; };
 freestats = derive { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; };
 freqMAP = derive { name="freqMAP"; version="0.2"; sha256="02hpkqqrxifrr1cxn5brp166jwa8lgl1mcgmq7s8csrbbd900ziv"; depends=[]; };
@@ -3549,7 +3615,7 @@ frontiles = derive { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34w
 frt = derive { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; };
 fscaret = derive { name="fscaret"; version="0.9.4"; sha256="0cna1cixq021lka7c8jgfqr6h8vvyvylckkbfay10ng7cxpqa44c"; depends=[caret gsubfn hmeasure]; };
 fsia = derive { name="fsia"; version="1.0"; sha256="0qa4avd1xiwh1ih1cj067r7vipab2ngspq7hfd0xbapwx87fggrg"; depends=[]; };
-fslr = derive { name="fslr"; version="1.3"; sha256="0668fpr3avqhyq42an9la71ln40kfjnf108nmkrwndvwl864i99w"; depends=[stringr oro_nifti matrixStats]; };
+fslr = derive { name="fslr"; version="1.4.4"; sha256="0k6973hd1q54q6243lir4xi3wlrsiqb526qsh9gryx9ha4iv0rmc"; depends=[stringr oro_nifti matrixStats R_utils scales]; };
 fso = derive { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; };
 ftnonpar = derive { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; };
 fts = derive { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[zoo BH]; };
@@ -3561,7 +3627,7 @@ funFEM = derive { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl
 funHDDC = derive { name="funHDDC"; version="1.0"; sha256="038m64yv27wz7ki2gcn94q011p8mv0ggmli5n27y0f5bnkfh6d6w"; depends=[fda]; };
 functional = derive { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; };
 funreg = derive { name="funreg"; version="1.1"; sha256="1sxr4mylcpbya197d55yi6d7g5pfspaf59xxbwjgmwgjw06rl76r"; depends=[MASS mgcv mvtnorm]; };
-funtimes = derive { name="funtimes"; version="1.0"; sha256="0jdl09x0fvfz08xyg1yfyhn0lgg8ycqbli4ag9js0yva8pwab7lh"; depends=[Jmisc]; };
+funtimes = derive { name="funtimes"; version="1.1"; sha256="0z478b57l7hg8b42jyzcdjzs3nn62m2y117xmgbw1gbyf3rcnjkw"; depends=[Jmisc]; };
 futile_any = derive { name="futile.any"; version="1.3.0"; sha256="1c7pj64kz09qzwrxvkp1w1w8mvxwq36zkj6w4b7yyi8v7x3daq2a"; depends=[lambda_r]; };
 futile_logger = derive { name="futile.logger"; version="1.4.1"; sha256="1plld1icxrcay7llplbd4i8inpg97crpnczk58mbk26j8glqbr51"; depends=[lambda_r futile_options]; };
 futile_matrix = derive { name="futile.matrix"; version="1.2.2"; sha256="1cb975n93ck5fma0gvvbzainp7hv3nr8fc6b3qi8gnxy0d2i029m"; depends=[lambda_r lambda_tools futile_logger RMTstat]; };
@@ -3578,7 +3644,7 @@ g_data = derive { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydl
 gCat = derive { name="gCat"; version="0.1"; sha256="10990ilsjk52kqkcdngj4nq0kcbn4w1syxl1mqjq2n5g1l002yjy"; depends=[]; };
 gIPFrm = derive { name="gIPFrm"; version="2.0"; sha256="1syjsnna7b7y27yf7zsxjwq8z5f4wxf2hfadhgjaw898gvfcnrbc"; depends=[]; };
 gMCP = derive { name="gMCP"; version="0.8-8"; sha256="0568pqvcbrpqbppvpvmgxf23rzy1fgl892asq9lhcjslzsz89an5"; depends=[rJava JavaGD xlsxjars MASS PolynomF multcomp mvtnorm Matrix CommonJavaJars]; };
-gMWT = derive { name="gMWT"; version="0.9"; sha256="0c91bwwfm0qyqrrd3n9g6l8kackqm58hmamypn1awzpz1p13axyv"; depends=[clinfun Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
+gMWT = derive { name="gMWT"; version="1.0"; sha256="12ryjpq0k3brw4xy4f6j89zm94j6phbzn9ga0nr9bzfvslhqjhna"; depends=[clinfun Rcpp Rcpp RcppArmadillo]; };
 gPCA = derive { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; };
 gPdtest = derive { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; };
 gProfileR = derive { name="gProfileR"; version="0.5.3"; sha256="0kv01b1ihwggzjd9plznz3il3b97pja11nqki3378zvpgfy5wzdn"; depends=[RCurl plyr]; };
@@ -3597,7 +3663,7 @@ gWidgetsRGtk2 = derive { name="gWidgetsRGtk2"; version="0.0-83"; sha256="1kn2095
 gWidgetstcltk = derive { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[gWidgets digest]; };
 gains = derive { name="gains"; version="1.1"; sha256="1mn8db8yxgkf8z6nm6k76g5l3i3vnw750ksg3w9ysd2pcabb65g1"; depends=[]; };
 galts = derive { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgggjr5b8kvjnbxrf6r23qsdk43mn"; depends=[genalg DEoptim]; };
-gam = derive { name="gam"; version="1.09.1"; sha256="09p83ki821x57kc74klh6i1h8bz3acsrvibz3mzzcgq6sa8gzr5i"; depends=[]; };
+gam = derive { name="gam"; version="1.12"; sha256="00rx8y7pcxabwjvg0ch6c76xqs43drjg3ih3kflqxdcl2rmaapnd"; depends=[foreach]; };
 gamair = derive { name="gamair"; version="0.0-8"; sha256="11qwmhrzks8gi9is2n9xcy6cviy7a8mwh2v78fw78x7g7ccd8i9x"; depends=[]; };
 gambin = derive { name="gambin"; version="1.1"; sha256="197k8j6mvf8236gwg8vvfnskf4hic9y075chsd8214n1nk7i6jmz"; depends=[]; };
 gamboostLSS = derive { name="gamboostLSS"; version="1.1-3"; sha256="1gdsrizr4q5zyfs2g8c8fdwriqz0xrpq9vyy4wd2ywdh5lbi995b"; depends=[mboost]; };
@@ -3619,7 +3685,7 @@ gamlss_util = derive { name="gamlss.util"; version="4.3-2"; sha256="13facgyd14jl
 gamm4 = derive { name="gamm4"; version="0.2-3"; sha256="19vy5wik9nh77cm25gp3j3j8w8vinwzx5pv90nzdzvx84yvvf0y3"; depends=[Matrix lme4 mgcv]; };
 gammSlice = derive { name="gammSlice"; version="1.3"; sha256="1vw8d0v0awyflh4gmbcf1g9nfx52cys8gpqvag5djri59p0y945a"; depends=[KernSmooth lattice mgcv]; };
 gaoptim = derive { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; };
-gap = derive { name="gap"; version="1.1-12"; sha256="1760jwfrlfmb8crk8kba0swpazcznlv80c6j8fiyd9zxjhnq7zf5"; depends=[]; };
+gap = derive { name="gap"; version="1.1-16"; sha256="0xyln7ffapm31cvx4n86ncyg3cdz5d2149qb5h5xx3kf0a8r7gpz"; depends=[]; };
 gapmap = derive { name="gapmap"; version="0.0.2"; sha256="0xykpy3cmbiwwa3s8f4777585r7l441qb9ks6ajym01scqcj3nwl"; depends=[ggplot2 reshape2]; };
 gapminder = derive { name="gapminder"; version="0.1.0"; sha256="06hi4m9i86nkdyz7w9wa4qkpbsl2178qskzzy8168wlzayx820ad"; depends=[]; };
 gaselect = derive { name="gaselect"; version="1.0.5"; sha256="0xzx00n46x6x7w1xbx8nvabkkrna45pv1i70787m8h05q1yrjjij"; depends=[Rcpp Rcpp RcppArmadillo]; };
@@ -3634,7 +3700,7 @@ gbs = derive { name="gbs"; version="1.0"; sha256="19zcsvd258ibrj356zlwgryjqylcs5
 gcbd = derive { name="gcbd"; version="0.2.5"; sha256="0fkg6vk0jkl6680n1hljyv783j4hd84mql0k4pfblvqafwv4nhm3"; depends=[RSQLite plyr reshape lattice]; };
 gcdnet = derive { name="gcdnet"; version="1.0.4"; sha256="0fmy0li06rahch4ir0xa81yilvrd0zqyhmpl4hfxjahhl3npw370"; depends=[Matrix]; };
 gclus = derive { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; };
-gcmr = derive { name="gcmr"; version="0.7.0"; sha256="17wv1qgshakn390719r8zzd8fbbvnkfjhlbcwk2rd2pic05x8msm"; depends=[nlme sandwich geoR betareg Formula car sp]; };
+gcmr = derive { name="gcmr"; version="0.7.5"; sha256="1z1hdgdasmw3drld8nmkw6cc1xls1gaaym1mlr8lyida4gb3giv8"; depends=[betareg car Formula geoR lmtest nlme sandwich sp]; };
 gconcord = derive { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; };
 gcookbook = derive { name="gcookbook"; version="1.0"; sha256="0hb52zfi5bl2j0h8lazz4gzhhcvpicb4ld6xm2vkvi4cj47piyy8"; depends=[]; };
 gdalUtils = derive { name="gdalUtils"; version="0.3.1"; sha256="1a6sg3x5yfffa9xrkvc98i2hm3lvna4jw7p89gn2bf74kzphqpmy"; depends=[sp foreach R_utils]; };
@@ -3643,12 +3709,12 @@ gdimap = derive { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd0
 gdistance = derive { name="gdistance"; version="1.1-7"; sha256="1wcpjx76pnkpc6kmqx7bq73qbvzfzjb9s46qb7gi7kabpkya97il"; depends=[raster igraph Matrix sp]; };
 gdm = derive { name="gdm"; version="1.0"; sha256="08wafxvds4sxaxv7mbbkbzilkpfz1xnzdc5jdw3pldvmbgk861vd"; depends=[Rcpp raster reshape2 vegan plyr Rcpp]; };
 gee = derive { name="gee"; version="4.13-18"; sha256="1s2cjgg4ypw72g710m93g6az763xz6sxw91nd6cwm5jjvr9vb91f"; depends=[]; };
-geeM = derive { name="geeM"; version="0.7.3"; sha256="15qbfki7ds75ws0ymwncr0y26ddnky5a882d7vh04145s1prl6xw"; depends=[Matrix]; };
+geeM = derive { name="geeM"; version="0.7.4"; sha256="0vxgwx6qx2xhhj217d6x7m5y89r0b9xxdd4k3sw0zgfga133ij7w"; depends=[Matrix]; };
 geepack = derive { name="geepack"; version="1.2-0"; sha256="1pxh9nsyj9a40znm4zza4nbi3dkhb96s3azi43p9ivvfj3l21m74"; depends=[]; };
-geesmv = derive { name="geesmv"; version="1.0"; sha256="1xxsiz6rwqxx113vmlddx89g190nmv1yaimmibz8ai0sam5hqnp9"; depends=[nlme gee matrixcalc MASS]; };
+geesmv = derive { name="geesmv"; version="1.1"; sha256="1xijdjmkg6nw2y1556zbaic969dg23np0wrb9ncknsrhq4aa28pa"; depends=[nlme gee matrixcalc MASS]; };
 geigen = derive { name="geigen"; version="1.5"; sha256="06k4fc7j8asqv1winmz28hb3r8fvlgikrvi064ysvj2fqwh7jnq1"; depends=[]; };
 geiger = derive { name="geiger"; version="2.0.3"; sha256="1wqihvscmq44i34205fzv79wk7j2a72qd8y6ycgrv74plql0316c"; depends=[ape MASS mvtnorm subplex deSolve digest Rcpp coda Rcpp]; };
-gelnet = derive { name="gelnet"; version="1.0"; sha256="06cyd5g5yxmyqiqjvp02f2k2ha50sk8qjqmmwcfxhaxysk9vbaag"; depends=[]; };
+gelnet = derive { name="gelnet"; version="1.1"; sha256="1d77v44azqpk6hzi7fl2ba6z3nyzh33xn0yp7ydp86nmf1gcgwlh"; depends=[]; };
 gems = derive { name="gems"; version="1.0.0"; sha256="0h8z3ih24hxdv8bah4xf8f797pnwihby8hj93z6zw5sq9dyszxwa"; depends=[MASS msm plyr data_table]; };
 gemtc = derive { name="gemtc"; version="0.6-2"; sha256="0bkcbyh71aq3p7w75w78l472gfschfb2qf9wcv7s2vyy6ypbvh2q"; depends=[coda igraph meta XML plyr]; };
 gemtc_jar = derive { name="gemtc.jar"; version="0.14.3"; sha256="18hbiygpsv67flc4v6z6mir0rfq41v1vsh11dg9phmdr8bx4kcl1"; depends=[rJava]; };
@@ -3677,11 +3743,11 @@ geocodeHERE = derive { name="geocodeHERE"; version="0.1.2"; sha256="0sr8r6f41bpi
 geojsonio = derive { name="geojsonio"; version="0.1.0"; sha256="17nv7xn80sf2nn6fvmlbnbcgg66n6bh8x725wdfnhk3gg1rb64g5"; depends=[sp rgdal rgeos httr maptools jsonlite magrittr V8]; };
 geomapdata = derive { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
 geometry = derive { name="geometry"; version="0.3-5"; sha256="1x1dhdbqnq1wi1r4njj3l1g8yag2dig19rna3a5pwf1j1gxbl0i8"; depends=[magic]; };
-geomorph = derive { name="geomorph"; version="2.1.4"; sha256="19zf9g0lpkrdl3pkkjryzas42h3ng9q01ap182xxd36vr8p55sd8"; depends=[rgl jpeg ape geiger phytools]; };
+geomorph = derive { name="geomorph"; version="2.1.5"; sha256="0xys2gwin16h4ahcjy3m49sslypilxlcgrnky19vv4aagrydq776"; depends=[rgl jpeg ape geiger phytools]; };
 geonames = derive { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; };
 geophys = derive { name="geophys"; version="1.3-8"; sha256="0nw4m30r46892cf1n575jkfjgdjc14wic9xzmzcnskbk8cd50hp2"; depends=[RPMG RSEIS RFOC GEOmap cluster]; };
 georob = derive { name="georob"; version="0.1-5"; sha256="0awcqcpv82pn2z7lgir73pg2b0whvrrfy55gi0jrjn7lzyakhqaq"; depends=[sp constrainedKriging lmtest nlme nleqslv quantreg RandomFields robustbase snowfall]; };
-geoscale = derive { name="geoscale"; version="1.1"; sha256="1xmn8y33jz1f16sjbzrld20gy7w54awrr79lhs9s4r8k1gmn0zqg"; depends=[]; };
+geoscale = derive { name="geoscale"; version="2.0"; sha256="0gisds0in32xhw54fxfyxvwxgrfjs871wmqf6l915nr896rlx0bm"; depends=[]; };
 geospacom = derive { name="geospacom"; version="0.5-7"; sha256="00yi2wwnjh2z8xhzfbp1jhh5fhq2z885s0gv937xsin4a63m76fd"; depends=[rgeos classInt sp maptools geosphere]; };
 geosphere = derive { name="geosphere"; version="1.3-13"; sha256="124l1mfqf4qq5qsa0k3r5hkky9q2m2waq2rp4xcym49wr3jysf6c"; depends=[sp]; };
 geospt = derive { name="geospt"; version="1.0-1"; sha256="1nv5wn8s4vlbyyzi8is7zsa1vrijp1va0vhi8l2yny8fh22qhjij"; depends=[gstat genalg MASS sp minqa limSolve fields gsl plyr TeachingDemos sgeostat]; };
@@ -3693,7 +3759,7 @@ getopt = derive { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz
 gets = derive { name="gets"; version="0.2"; sha256="0vdg8g588asyzkld9v3rmscx3k727ncxnjzi8qxinlr2zhw9nbcq"; depends=[zoo]; };
 gettingtothebottom = derive { name="gettingtothebottom"; version="3.2"; sha256="1cz2vidh7k346qc38wszs2dg6lvya249hvcsn6zdpbx0c0qs3y72"; depends=[ggplot2 Matrix]; };
 gfcanalysis = derive { name="gfcanalysis"; version="1.2"; sha256="147vgv4z14xn0j94g7z0y099gz8xj2yb02r6j3mfi4412dg5f5fp"; depends=[raster rgdal geosphere RCurl rgeos plyr ggplot2 sp stringr animation rasterVis]; };
-ggExtra = derive { name="ggExtra"; version="0.1.0"; sha256="12b2bd8n3hyp5azdxh14dslq6mwaplvxph90dhiydkhzmya27i7i"; depends=[ggplot2]; };
+ggExtra = derive { name="ggExtra"; version="0.1.5.2"; sha256="0lad58245x5gn1yqx65rqpbjwy17yrisns6lqnaw5w1ff5bh7s9i"; depends=[ggplot2]; };
 ggROC = derive { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; };
 ggRandomForests = derive { name="ggRandomForests"; version="1.1.4"; sha256="0h55593mr2x0kvp97rrm1spj17zbr1p9pqrpngsxmp11iahhccqh"; depends=[randomForestSRC ggplot2 survival reshape2]; };
 ggdendro = derive { name="ggdendro"; version="0.1-15"; sha256="1xa1pswkf7xnrxs1zqw71ws0r6r0nmc2gnc76bd372czfdn4npci"; depends=[MASS ggplot2]; };
@@ -3708,7 +3774,7 @@ ggsubplot = derive { name="ggsubplot"; version="0.3.2"; sha256="1rrq47rf95hnwz8c
 ggswissmaps = derive { name="ggswissmaps"; version="0.0.2"; sha256="1cl8m9j3d2kf8dbpq09q36v7nwkgz7khqds431l0kmkzq02qhddf"; depends=[ggplot2]; };
 ggtern = derive { name="ggtern"; version="1.0.5.0"; sha256="0ykgz3268381glkrv1gbn9qnyrkxsmihc3srv8zrldbq18zbr0a8"; depends=[ggplot2 plyr gtable scales reshape2 proto MASS sp]; };
 ggthemes = derive { name="ggthemes"; version="2.1.2"; sha256="049fjk0f960sjsnqns2kgk7dvr6jr5rrpxgl8qbxx4idz95bvdi7"; depends=[ggplot2 colorspace proto scales]; };
-ggvis = derive { name="ggvis"; version="0.4.1"; sha256="1sl6ygglgsg7xhzzkxaap8pzb2zmfw0y481w7r7s1nyg7pdgr0r2"; depends=[assertthat jsonlite shiny magrittr dplyr lazyeval htmltools]; };
+ggvis = derive { name="ggvis"; version="0.4.2"; sha256="07arzhczvh2sgqv9h30n32s6l2a3rc98rid2fpz6kp7vlin2pk1g"; depends=[assertthat jsonlite shiny magrittr dplyr lazyeval htmltools]; };
 ghyp = derive { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ijhmzyz4qsmy7vfijlilkz0ynn20"; depends=[numDeriv gplots]; };
 giRaph = derive { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; };
 gibbs_met = derive { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; };
@@ -3745,13 +3811,14 @@ glmx = derive { name="glmx"; version="0.1-0"; sha256="0i0p1xk5yk1l274gfr4ijmqnnb
 globalGSA = derive { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; };
 globalOptTests = derive { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; };
 globalboosttest = derive { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; };
+globals = derive { name="globals"; version="0.3.1"; sha256="1fjbs75m07r8gvj5pjqj8dv1xm558h4g2cpg5l1psqzs567gkcxv"; depends=[codetools]; };
 glogis = derive { name="glogis"; version="1.0-0"; sha256="19h0d3x5lcjipkdvx4ppq5lyj2xzizayidx0gjg9ggb1qljpyw9m"; depends=[zoo sandwich]; };
 glpkAPI = derive { name="glpkAPI"; version="1.3.0"; sha256="0173wljx13jali2jxz4k5za89hc64n2j9djz5bcryrqhq4rmkp87"; depends=[]; };
 glrt = derive { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; };
 gmailr = derive { name="gmailr"; version="0.6.0"; sha256="1l0lnlq5vrxrab8d9b5hwm8krg8zgx8f8m0kfnryyyrqkjrksky5"; depends=[httr base64enc magrittr jsonlite mime]; };
 gmatrix = derive { name="gmatrix"; version="0.2"; sha256="1w83m6q8xflifqqgkkg2my4fkjfjyv0qq4ly8yqk12k77lb03hxq"; depends=[]; };
 gmm = derive { name="gmm"; version="1.5-2"; sha256="1phd8mmfyhjb72a45gavckb3g8qi927hdq0i8c7iw1d28f04lc70"; depends=[sandwich]; };
-gmnl = derive { name="gmnl"; version="1.0"; sha256="1nvk6x5412bfqdg54051hnisbnfm3d4yv9l2568jcz49pa8lay4d"; depends=[maxLik Formula plotrix msm mlogit truncnorm]; };
+gmnl = derive { name="gmnl"; version="1.1"; sha256="1dz7fhacys88hpf13pbqc9ba37qhwspq7j5zqfy1bg4py1hsx1q7"; depends=[maxLik Formula plotrix msm mlogit truncnorm]; };
 gmodels = derive { name="gmodels"; version="2.15.4.1"; sha256="1yizjw181bg0ml6j96calflz3k3wpvpxh61hfd3pdba013ixjib5"; depends=[MASS gdata]; };
 gmp = derive { name="gmp"; version="0.5-12"; sha256="10fpvcli526a8j6jaryn0mwk78c24xy7whdpcvqzzvb41l6nnkma"; depends=[]; };
 gmt = derive { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; };
@@ -3785,6 +3852,7 @@ graphicalVAR = derive { name="graphicalVAR"; version="0.1.2"; sha256="0vc2x58z4w
 graphicsQC = derive { name="graphicsQC"; version="1.0-6"; sha256="07kzz0r8rh4m7qqxnlab0d4prr56jz5kspx782byspkcm5l4xrsl"; depends=[XML]; };
 graphscan = derive { name="graphscan"; version="1.0"; sha256="15kdpp2k2gpfr8qq6wr08gva5hlxqha2h48zi1j3p6r766j07082"; depends=[ape sp snowfall rgl]; };
 greport = derive { name="greport"; version="0.5-3"; sha256="0cd7rqzrk1yb22ksbmva1fl9k388bxxm586c20j8k8z5zympi9g1"; depends=[Hmisc data_table rms lattice latticeExtra ggplot2 Formula survival]; };
+greyzoneSurv = derive { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[survival Hmisc survAUC]; };
 gridBase = derive { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
 gridDebug = derive { name="gridDebug"; version="0.4-0"; sha256="1nbcdjip6ghnlv0j7cf45bpqdpirwn636pg324f0hgiqj4rifn09"; depends=[gridGraphviz gridSVG]; };
 gridExtra = derive { name="gridExtra"; version="0.9.1"; sha256="15pj5w5wlrf8gw4z01i9j88gk6bm4kni64fpip9icmxkn887y3hx"; depends=[]; };
@@ -3794,6 +3862,7 @@ gridSVG = derive { name="gridSVG"; version="1.4-3"; sha256="1jgrhckjbvccp5zqbkki
 grnn = derive { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; };
 groc = derive { name="groc"; version="1.0.5"; sha256="1kqcdyq1y80gd62jpn38yz6q1qmg84b7k8qcniip5h948vfzkddg"; depends=[rrcov pls mgcv robust robustbase MASS]; };
 grofit = derive { name="grofit"; version="1.1.1-1"; sha256="1rnym5fxbg3bin2idmymrwvf1fcd646bipbgjd6wby8my69zy4c5"; depends=[]; };
+gromovlab = derive { name="gromovlab"; version="0.6-16"; sha256="0ndi4i91fnndvpp3xmr405a62vq5gjagw2qrvcmq1q6cgg7bj17q"; depends=[igraph phangorn glpkAPI quadprog cluster]; };
 groupRemMap = derive { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; };
 grouped = derive { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; };
 growcurves = derive { name="growcurves"; version="0.2.3.9"; sha256="1f8hh8ppp6bgrb8crm46xrria3vdnz62aya9lhwcdaggfmy7j25l"; depends=[Rcpp RcppArmadillo reshape2 scales ggplot2 Formula testthat Rcpp RcppArmadillo]; };
@@ -3802,7 +3871,7 @@ growthmodels = derive { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819
 growthrate = derive { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[Matrix clime mvtnorm]; };
 grplasso = derive { name="grplasso"; version="0.4-5"; sha256="15bqckq9qjdlllhfpb21vzgi9msbl544alkrz01w1vvb3hk1847y"; depends=[]; };
 grppenalty = derive { name="grppenalty"; version="2.1-0"; sha256="12hbghmg96dwlscjy6nspgkmqqj4vwq2qcwcz1gp50a08qbmdcrk"; depends=[]; };
-grpreg = derive { name="grpreg"; version="2.8-0"; sha256="1mfd3hzzv720zhl8s6ghw0vfpqkz8q050dwnvmmb0smhdvahd2zj"; depends=[Matrix]; };
+grpreg = derive { name="grpreg"; version="2.8-1"; sha256="0n6j4mx2f0khdqz7c7yhmsh6gcxha2ypknqa421qir1nvp0x57c9"; depends=[Matrix]; };
 grt = derive { name="grt"; version="0.2"; sha256="0cqjk7yqk2ryx1pgvjd3x8l25hqv92p8rvdr7xw4jkzillllwmhz"; depends=[MASS rgl misc3d]; };
 gsDesign = derive { name="gsDesign"; version="2.9-3"; sha256="0dd96hciiksf436lpm1q35in06b82p4h09spklf28n0p5hgc9225"; depends=[ggplot2 xtable stringr RUnit plyr]; };
 gsalib = derive { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; };
@@ -3816,14 +3885,13 @@ gsl = derive { name="gsl"; version="1.9-10"; sha256="06n21p0k2ki6nb725a6sxwlb4p7
 gsmoothr = derive { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; };
 gss = derive { name="gss"; version="2.1-4"; sha256="0vmyz3q7b2chzmvrwx6bk2yj5kmaxym6lznyrddxgf7xzjipvlii"; depends=[]; };
 gsscopu = derive { name="gsscopu"; version="0.9-2"; sha256="0hg2ry9rhnn51g368fg1zxswx826y3m0yn2wjb2g5rw4a4zn1frr"; depends=[gss]; };
-gstat = derive { name="gstat"; version="1.0-22"; sha256="1jbjl2irg0a2jdxwk7nr3c33jf3dzbcydpxxjmld23zzx94qy1iv"; depends=[lattice sp zoo spacetime FNN]; };
-gstudio = derive { name="gstudio"; version="1.3"; sha256="1ddifizswm41y4sxnnfw8j90clba6zf022x0z4xipccaznim2gy9"; depends=[ggplot2 raster sp reshape2 ggmap popgraph]; };
+gstat = derive { name="gstat"; version="1.0-23"; sha256="0as4afwlwzmi37k8sbm0kssin8mikrny88smb71c0wf616yba4xi"; depends=[lattice sp zoo spacetime FNN]; };
 gsubfn = derive { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"; depends=[proto]; };
 gsw = derive { name="gsw"; version="1.0-3"; sha256="0ca3h567r23bdldic7labk1vbz8hhslw568lacbdcikm8q16hk72"; depends=[]; };
 gtable = derive { name="gtable"; version="0.1.2"; sha256="0k9hfj6r5y238gqh92s3cbdn34biczx3zfh79ix5xq0c5vkai2xh"; depends=[]; };
 gtcorr = derive { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; };
 gte = derive { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rdi4cqy28qhsfr2dwvxzxchl6h"; depends=[survival]; };
-gtools = derive { name="gtools"; version="3.4.2"; sha256="1s0vfi07gxaqvllidsws4f9admvc61sw19g2hvffa74sccqiwr6a"; depends=[]; };
+gtools = derive { name="gtools"; version="3.5.0"; sha256="1xknwk9xlsj027pg0nwiizigcrsc84hdrig0jn0cgcyxj8dabdl6"; depends=[]; };
 gtop = derive { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts quadprog lassoshooting]; };
 gtx = derive { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; };
 gumbel = derive { name="gumbel"; version="1.05"; sha256="0d7isx7bhvryhaa25kxb4fm58ph81xaqscj19aaqzs8yg79ac2ar"; depends=[]; };
@@ -3870,7 +3938,7 @@ heavy = derive { name="heavy"; version="0.2-35"; sha256="04aw0r2hgnxf9nsd18q2b5d
 helloJavaWorld = derive { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; };
 helsinki = derive { name="helsinki"; version="0.9.27"; sha256="1vhzlxjkk2hgzjlin9ksvjk3bi2ly5nm4361777m49lb84ncs7dr"; depends=[maptools RCurl rjson sp]; };
 heplots = derive { name="heplots"; version="1.0-15"; sha256="0sl5pqc57lhhh8s8hym0l874saq974hms6vsq7ll6g60rifx4lbq"; depends=[car MASS]; };
-hergm = derive { name="hergm"; version="2.2-1"; sha256="0pii3dgpjgh4s5a1cjj0nyw3p8g0b7f0hhfbfc9mwr5mz84yidlh"; depends=[ergm latentnet network sna]; };
+hergm = derive { name="hergm"; version="2.2-2"; sha256="0jshhf57kybrayk94vv7p1sjvhlfcdya6jllaj9kgn46kkvci54p"; depends=[ergm latentnet network sna]; };
 heritability = derive { name="heritability"; version="1.1"; sha256="05vcprf3rk65197njnhw7n5l19hvy7hfp4fdigkwzvch4rnicidf"; depends=[MASS]; };
 hermite = derive { name="hermite"; version="1.1.0"; sha256="184f7iixsmpli5hp4f0frjxfwpxpicjn1yrk6sf8y4il49cx0s4v"; depends=[maxLik]; };
 het_test = derive { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; };
@@ -3880,7 +3948,7 @@ hexbin = derive { name="hexbin"; version="1.27.0"; sha256="0fs5nsaalic6fj7b347yj
 hflights = derive { name="hflights"; version="0.1"; sha256="1rb6finck13i6949i6hsgfk90q4ybxh1m3is2mlw2m6087bpzfbd"; depends=[]; };
 hgam = derive { name="hgam"; version="0.1-2"; sha256="1flcc67n8kbh9m5phdfl587xg1x935zbp305y0gdmkc8vpkiwpcf"; depends=[grplasso lattice rgl]; };
 hglasso = derive { name="hglasso"; version="1.2"; sha256="1qq41ma33wz7qjs5zx72yvngpsiq62z9sd6d5hvvl83brq0fcr4b"; depends=[glasso mvtnorm igraph fields]; };
-hglm = derive { name="hglm"; version="2.0-11"; sha256="0yqnky2p5avxn7nv8wnk57xkd0dpk89jas6d577q50ms4dpwdl6z"; depends=[Matrix MASS hglm_data]; };
+hglm = derive { name="hglm"; version="2.1-0"; sha256="02d5m7j7c1z40kih1ywvnd32sdlshgsgagsbh9avhhpcg7lxswj9"; depends=[Matrix MASS hglm_data]; };
 hglm_data = derive { name="hglm.data"; version="1.0-0"; sha256="1hrq1jac658z5xjsg03nfkb4kwm9z44bhciv5chk74ww8gjr9j9q"; depends=[Matrix MASS]; };
 hgm = derive { name="hgm"; version="1.11"; sha256="1p6391bcvsgf2mvkdrwc3fj3h6hkzshqmzb6f31kmpiihjwv3392"; depends=[deSolve]; };
 hht = derive { name="hht"; version="2.1.2"; sha256="10lpndwpddcqxyrk9pq9dwaqpj4apxdic971nd68cn3pql6fssdn"; depends=[EMD fields spatstat]; };
@@ -3924,15 +3992,15 @@ hpcwld = derive { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgz
 hpoPlot = derive { name="hpoPlot"; version="2.0"; sha256="080jzi1zw510clbbkmf2wkwbfgna06kfz91i7d90b9pqi7krj28j"; depends=[functional magrittr]; };
 hqmisc = derive { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; };
 hrr = derive { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; };
-hsdar = derive { name="hsdar"; version="0.1.3"; sha256="0vwiavzzfxz81iskgjy0af8gwh8fkjiyzhql82s2n9snvy7d36fk"; depends=[sp raster rgdal rootSolve signal]; };
+hsdar = derive { name="hsdar"; version="0.1.5"; sha256="1ii83dpndshq8d00f3dxrzcxqplcc5b85b9cixxbda5bpvrlkpg1"; depends=[sp raster rgdal rootSolve signal]; };
 hsicCCA = derive { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
 hsmm = derive { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; };
 hsphase = derive { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[snowfall Rcpp RcppArmadillo Rcpp]; };
 htmlTable = derive { name="htmlTable"; version="1.3"; sha256="00zcismapanyb68657gng5l6g3hsmpls84naracshj4gfk2l1cfs"; depends=[stringr knitr magrittr]; };
 htmltools = derive { name="htmltools"; version="0.2.6"; sha256="1gp6f6388xy3cvnb08q08vraidjp740gfxlafdd19m2s04v5hncz"; depends=[digest]; };
-htmlwidgets = derive { name="htmlwidgets"; version="0.3.2"; sha256="1r0n3c2xvj9k7x892nbqyclpc66lq5wyxc2y0nybs5wcz3jx9s2p"; depends=[htmltools RJSONIO yaml]; };
+htmlwidgets = derive { name="htmlwidgets"; version="0.4"; sha256="079y3b3d4na582a1wmb5nc5cyrmmld4v7c1vc08cbfsg43w026zn"; depends=[htmltools jsonlite yaml]; };
 hts = derive { name="hts"; version="4.4"; sha256="1dpm669lc4khjkcs49m1nh7i61sclsqy7xbcn4mqqjhfgs7sg7sk"; depends=[forecast SparseM]; };
-httk = derive { name="httk"; version="1.1"; sha256="198zxzap9m8c6rlzqjfrg6b9pvgbksk2myq5cw7j37j63lfnblki"; depends=[deSolve msm]; };
+httk = derive { name="httk"; version="1.2"; sha256="016njh1cm21bmdrn94cbsmf36gzcwfg21bqp8nl100qb16d6yqq6"; depends=[deSolve msm]; };
 httpRequest = derive { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; };
 httpuv = derive { name="httpuv"; version="1.3.2"; sha256="0vp3bz1nxi0ladlgi1r6wd480y0m2m0gsba2hrs73s9b8afrfh6v"; depends=[Rcpp Rcpp]; };
 httr = derive { name="httr"; version="0.6.1"; sha256="111l6ygwnrzcqwny6ds62np0r2f6x0il7abapq00j1y86nk4p6l6"; depends=[digest jsonlite mime RCurl R6 stringr]; };
@@ -3942,7 +4010,7 @@ hwde = derive { name="hwde"; version="0.64"; sha256="1is39zknssqm98577sdjg8gn3h9
 hwriter = derive { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; };
 hwriterPlus = derive { name="hwriterPlus"; version="1.0-3"; sha256="1sk95qgpyxwk1cfkkp91qvn1iklad9glrnljdpidj20lnmpwyikx"; depends=[hwriter TeachingDemos]; };
 hwwntest = derive { name="hwwntest"; version="1.3"; sha256="1b5wfbiwc542vlmn0l2aka75ss1673z8bcszfrlibg9wwqjxlwk5"; depends=[polynom wavethresh]; };
-hybridEnsemble = derive { name="hybridEnsemble"; version="0.1.1"; sha256="1hn6zfz22mgxv5qpwdgmn7a9snha7hdkbbqq3xicy37j8xypsab5"; depends=[kernelFactory ada rpart ROCR nnet e1071 NMOF GenSA Rmalschains pso AUC soma genalg reportr nnls quadprog tabuSearch glmnet]; };
+hybridEnsemble = derive { name="hybridEnsemble"; version="1.0.0"; sha256="08y11cmlhnl456wxsvh3ll1f9ywkmgqjwlwr3v3qhm54nlanwvkr"; depends=[randomForest kernelFactory ada rpart ROCR nnet e1071 NMOF GenSA Rmalschains pso AUC soma genalg reportr nnls quadprog tabuSearch rotationForest FNN glmnet]; };
 hybridHclust = derive { name="hybridHclust"; version="1.0-4"; sha256="1967p6crkrbnlfghd9x1alr2x57nqjl1zh58hhyshgla3xmdmhx5"; depends=[cluster]; };
 hydroApps = derive { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; };
 hydroGOF = derive { name="hydroGOF"; version="0.3-8"; sha256="1ljk2dk5ydsg7qdizyzkbw0b2zdhnb3x9h965d94ygzg8nw5kbak"; depends=[zoo hydroTSM xts]; };
@@ -3954,7 +4022,7 @@ hyperSpec = derive { name="hyperSpec"; version="0.98-20150304"; sha256="0fjww2h6
 hyperdirichlet = derive { name="hyperdirichlet"; version="1.4-9"; sha256="03c2xgfhfbpn1za84ajhvm0i5cpmfnz1makidrr2222addgyp9zx"; depends=[aylmer abind mvtnorm cubature]; };
 hypergea = derive { name="hypergea"; version="1.2.3"; sha256="13a8r7f2qq7wi0h7jrg29mn573njzi1rwna0ch9sj8sdy8w26r6w"; depends=[]; };
 hypergeo = derive { name="hypergeo"; version="1.2-9"; sha256="0ydwza0h8ykzbrsvvp4wd5jiy05rx5bj93c7bplx68j3c68c9f1q"; depends=[elliptic contfrac]; };
-hypervolume = derive { name="hypervolume"; version="1.2.2"; sha256="1nc5hybw5aa5pdrf9j1jv6d69q1im7whz0d05rmyskcayy2x3pyi"; depends=[Rcpp rgl MASS geometry pdist Rcpp]; };
+hypervolume = derive { name="hypervolume"; version="1.3.0"; sha256="07pnbkdqm4jssv6h31q68mawckiyxczsjfw4gndpyvxnl44p0qrz"; depends=[Rcpp rgl MASS geometry ks fastcluster Rcpp RcppArmadillo]; };
 hypothesestest = derive { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; };
 hysteresis = derive { name="hysteresis"; version="2.5"; sha256="1b1dd2367pjbg4jnn65l2jcj38ljz7adpdg8f5b9rj1rw7qgikfl"; depends=[car msm MASS]; };
 hzar = derive { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[MCMCpack foreach coda]; };
@@ -3974,7 +4042,7 @@ iWeigReg = derive { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6q
 ibd = derive { name="ibd"; version="1.2"; sha256="0681v7lgx697yj2d60cw3p5axbbaxanzj291vdf7ailn7300p1ms"; depends=[lpSolve MASS car lsmeans multcompView]; };
 ibdreg = derive { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; };
 ibeemd = derive { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[fields deldir rgeos sp spdep]; };
-ibelief = derive { name="ibelief"; version="1.0"; sha256="1mcmq1zpj1f6alhnsznb27iknp7dzdsd25di8a64hw5c3cnx3xay"; depends=[]; };
+ibelief = derive { name="ibelief"; version="1.1"; sha256="164cd68qq0z68n5j0b192krpk73y8cy15wr5wnb52rzxv5k7rfd4"; depends=[]; };
 ibmdbR = derive { name="ibmdbR"; version="1.36.7"; sha256="0v6l8cm0sww2gm8yal4ffk2wcxfnvfsd76i92f2khank7bhga06r"; depends=[RODBC MASS]; };
 ibr = derive { name="ibr"; version="1.4.5"; sha256="0nw2j232br06l30v3cn4qcr25vbh911v2mz7nfail40sqxc6wwc4"; depends=[]; };
 ic_infer = derive { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j4321g5g5nawzll8srf302grc39npvv1q17jyz"; depends=[quadprog mvtnorm boot kappalab]; };
@@ -3985,13 +4053,15 @@ icamix = derive { name="icamix"; version="1.0.2"; sha256="0rpqx9q5p3nb5gd76zlkql
 icapca = derive { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; };
 iccbeta = derive { name="iccbeta"; version="1.0"; sha256="0zsf2b5nrv39pssi5walf82892fr8p1f802c96hjjknh78q7gh0h"; depends=[lme4 Rcpp Rcpp RcppArmadillo]; };
 icd9 = derive { name="icd9"; version="1.2"; sha256="0d0dgd5951chyfimzjb00cphdvqzml8p8wr7sad3qfhv44dsypn7"; depends=[Rcpp checkmate Rcpp]; };
-icenReg = derive { name="icenReg"; version="1.1.1"; sha256="0q1h94r6sv56jxrg1lxc8ms1drrcrqf7k888jb63qmg4wscp33bi"; depends=[survival foreach]; };
+icenReg = derive { name="icenReg"; version="1.2.4"; sha256="0fqwg1xmks9zkmbnr1dala4b13l85ibqfd96w4vvrfhmvakqra1r"; depends=[survival foreach]; };
 icensmis = derive { name="icensmis"; version="1.2.1"; sha256="1h4l9irip4hv34hr92j8756qgmy455mfdblr7ypgsgvr27cgax8h"; depends=[Rcpp Rcpp]; };
 idbg = derive { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; };
 identity = derive { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; };
+idm = derive { name="idm"; version="1.0"; sha256="001zvhw38qgq1l66yxz5kchvjspijdvqwgrdvh5ykiqifi8kc5xm"; depends=[corpcor ggplot2 dummies animation ca]; };
 idr = derive { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; };
 ieeeround = derive { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; };
 ifa = derive { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; };
+ifctools = derive { name="ifctools"; version="0.3.1"; sha256="0lr1d4z2gzninqchfzmmmymd0ngywrjpbh7bvd6qgxkzabf9yxxx"; depends=[]; };
 ifs = derive { name="ifs"; version="0.1.4"; sha256="0fzani8rnn4rdwlghq967hhi4zfjnk3gwpk3v6wys738xj7yfwp1"; depends=[]; };
 ifultools = derive { name="ifultools"; version="2.0-1"; sha256="16lrmajyfa15akgjq71w9xlfsr4y9aqfw7y0jf6gydaz4y6jq9b9"; depends=[splus2R MASS]; };
 ig_vancouver_2014_topcolour = derive { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; };
@@ -4015,19 +4085,21 @@ indicoio = derive { name="indicoio"; version="0.3"; sha256="04c2j4l103fiiibf83z7
 indicspecies = derive { name="indicspecies"; version="1.7.5"; sha256="16m4pnfnmaskin4aaalm2cmv3vwzg94045max8nhkgw02kpskz1r"; depends=[permute]; };
 ineq = derive { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; };
 inference = derive { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; };
-inferference = derive { name="inferference"; version="0.4.61"; sha256="02rsirwh4arqkgxpw3vnd0m2k055ir2074mlz27gbzmwz0ycpfzk"; depends=[numDeriv lme4 Formula]; };
+inferference = derive { name="inferference"; version="0.4.62"; sha256="12iag6l2digxb056qc765xi27ayc4qyqdqzbhxscr8a5lxfkdn4p"; depends=[numDeriv lme4 Formula]; };
 inflection = derive { name="inflection"; version="1.1"; sha256="1nb1pf07c371vwgplfyjs3q1iqgb5hyk9czxqrjiy18g8p7zdln2"; depends=[]; };
 influence_ME = derive { name="influence.ME"; version="0.9-5"; sha256="0sjrajhc198g391xa78l4gicmpyq4h7dnrnncji3qpgbqi772pkn"; depends=[lme4 Matrix lattice]; };
-influence_SEM = derive { name="influence.SEM"; version="1.4"; sha256="1grsnp8xwmhh9qx0yc5fy8b3g4i4cfqbg6sfzbmn39si2z34wrxw"; depends=[lavaan]; };
+influence_SEM = derive { name="influence.SEM"; version="1.5"; sha256="0h920pxa3sk6y7ipkihxm78i06alm5rmlmn5pr937j7abgypkk3p"; depends=[lavaan]; };
 infoDecompuTE = derive { name="infoDecompuTE"; version="0.5.1"; sha256="1aigd1fvpdqjplq1s1js0sy8px68q73lbp5q591rn52c77smdhaj"; depends=[MASS]; };
 informR = derive { name="informR"; version="1.0-5"; sha256="16pz47wlr1gr8z5hdnrjpczm967khqiqgdfiw15a0bby6qdvni2y"; depends=[abind relevent]; };
 infotheo = derive { name="infotheo"; version="1.2.0"; sha256="18xacczfq3z3xpy434js4nf3l19lczngzd0lq26wh22pvg1yniwv"; depends=[]; };
 infra = derive { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; };
+infuser = derive { name="infuser"; version="0.2"; sha256="1x585glkffw4kq8d13md4ksbrmqvp11pr05w5pp2z6rcxldaf5vd"; depends=[]; };
 infutil = derive { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; };
 inline = derive { name="inline"; version="0.3.14"; sha256="0cf9vya9h4znwgp6s1nayqqmh6mwyw7jl0isk1nx4j2ijszxcd7x"; depends=[]; };
 inlinedocs = derive { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; };
 insideRODE = derive { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve nlme lattice]; };
 insol = derive { name="insol"; version="1.1.1"; sha256="0zbawkp4qb0kqb7y9ibiyy8sa9rfgbzwmcdswx6s87p0h7brrqn6"; depends=[]; };
+install_load = derive { name="install.load"; version="1.0.3"; sha256="0fvync9v712r4l6053bncl8a0rgjq0nfnrnpc0yxc2m3mxf5hzvr"; depends=[]; };
 insuranceData = derive { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; };
 intReg = derive { name="intReg"; version="0.2-8"; sha256="0cqf6lbn8aiyj5j7gg1qz80i477bfxbmxp7fjs25ish4bcdsbjja"; depends=[miscTools maxLik sets]; };
 intRegGOF = derive { name="intRegGOF"; version="0.85-1"; sha256="0fyvhl6jmi6krfbimsq61dhixlz9h9jxk4yjvwbx2vl8d9fnnr54"; depends=[]; };
@@ -4094,13 +4166,13 @@ ivprobit = derive { name="ivprobit"; version="1.0"; sha256="1kijq7k6iv2ybaxb08kq
 jSonarR = derive { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[RCurl jsonlite]; };
 jaatha = derive { name="jaatha"; version="2.7.0"; sha256="1ibk84x38j03hbdrf9pi0bi025fxlk2ysqxmfrqiqr4zq2rzhbvp"; depends=[phyclust Rcpp reshape2 Rcpp]; };
 jackstraw = derive { name="jackstraw"; version="1.0"; sha256="1irfzivy7c9fb2pr98flx05s5hkk6sid1hkd5b3k9m9mgs6ixbfy"; depends=[corpcor]; };
-jagsUI = derive { name="jagsUI"; version="1.3.1"; sha256="18g755dxmlwv5abjdv3sip5qxpd13sx79f85wb0ji5i4fjax26ky"; depends=[lattice rjags coda]; };
+jagsUI = derive { name="jagsUI"; version="1.3.7"; sha256="1zdrqxzjip4lgf99b4z76gvlhbmh0gcbkpghrlrj3j25wqzgn5y0"; depends=[lattice rjags coda]; };
 james_analysis = derive { name="james.analysis"; version="1.0.0"; sha256="01nbwhph22nfl0biwcgvb1q76jp79qj7qfn2fxpyx2dkkhzxzrmv"; depends=[rjson naturalsort]; };
 jiebaR = derive { name="jiebaR"; version="0.5"; sha256="1x41jqc1ai3v1fn9f65dk7k4g2llf3pk9z3bwqihb95qf80mhd4v"; depends=[jiebaRD Rcpp Rcpp]; };
 jiebaRD = derive { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; };
 jmetrik = derive { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; };
 joineR = derive { name="joineR"; version="1.0-3"; sha256="0q98nswbxk5dz8sazzd66jhlg7hv5x7wyzcvjc6zkr6ffvrl8xj7"; depends=[nlme MASS boot survival lattice statmod gdata]; };
-joint_Cox = derive { name="joint.Cox"; version="1.0"; sha256="1460i8ydwd0ix3slm9bn8jca5b1vs0w2wwx1md4npbmf5ly5x42l"; depends=[]; };
+joint_Cox = derive { name="joint.Cox"; version="1.1"; sha256="1zkj9ynxq521s23dz93m63valjf4amm19dcmcm8844fvnzbr7z4h"; depends=[]; };
 jointDiag = derive { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; };
 jointPm = derive { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; };
 jomo = derive { name="jomo"; version="0.2-0"; sha256="09vccbvy9y5p5w049l2v5qr1xbs915sihpddnrrjr4cc1w17ifzs"; depends=[]; };
@@ -4118,11 +4190,13 @@ kedd = derive { name="kedd"; version="1.0.2"; sha256="11mfgjr1pl56y4rcychs8xjgaz
 kelvin = derive { name="kelvin"; version="1.2-2"; sha256="0fl2yxc0dpmkhq3f7711gd08i7jlzlfncin1d6q251dfnmwd7rzf"; depends=[Bessel]; };
 kequate = derive { name="kequate"; version="1.4.0"; sha256="0vr45y4f6x3080pf3k53nifavf8mfhikz54nis66c53fs9rp0jwf"; depends=[ltm equateIRT]; };
 kerdiest = derive { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[date chron evir]; };
-kernelFactory = derive { name="kernelFactory"; version="0.2.0"; sha256="1ihghqrrndgif6kh6n0f4g3bfy5miskn3mk5ynxfcnnrfvp9h3xj"; depends=[randomForest AUC genalg kernlab]; };
+kernelFactory = derive { name="kernelFactory"; version="0.2.2"; sha256="1ms6732s17vx120xr2l423qmj0h880r522zsgp474pq3fxc0mr48"; depends=[randomForest AUC genalg kernlab]; };
 kernlab = derive { name="kernlab"; version="0.9-20"; sha256="0gwl3v8gxidzfmvwa2icqla8ypdgnmvcwxf54iwrvvy2csjx0w27"; depends=[]; };
+keypress = derive { name="keypress"; version="1.0.0"; sha256="16msbanmbv2kf09qvl8bd9rf1vr7xgcjzjhzngyfyxv90va3k86b"; depends=[]; };
 kfigr = derive { name="kfigr"; version="1.1.0"; sha256="1mnnd603s741h1vp99q6d8lwvc46k9hmbhylng66wc7a5j6k8psz"; depends=[knitr]; };
 kimisc = derive { name="kimisc"; version="0.2-1"; sha256="1nbhw1q0p87w4z326wj5b4k0xdv0ybkgcc59b3cqbqhrdx8zsvql"; depends=[plyr]; };
 kin_cohort = derive { name="kin.cohort"; version="0.6"; sha256="13gnjk58m5kya9wj87klwm6h7cdqi61ba6y0cg9k1hgbc1ajy3s8"; depends=[survival]; };
+kineticF = derive { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm splancs sp plotrix MASS]; };
 kinfit = derive { name="kinfit"; version="1.1.13"; sha256="1av33f4wns6qp79wyww70f7fsfybcqm83nby1ia65sjp2dz04dk1"; depends=[]; };
 kinship2 = derive { name="kinship2"; version="1.6.0"; sha256="06f544yk61i1xq0rm0r5gpzwfl6rvzyg7gz8z86bjyxg0z44h3vy"; depends=[Matrix quadprog]; };
 kintone = derive { name="kintone"; version="0.1.1"; sha256="13c82vkapks9j2crrb4awnhl60ld8b1r7xmy9yv4zzch868kcl5g"; depends=[RCurl rjson]; };
@@ -4136,11 +4210,11 @@ km_ci = derive { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwg
 kmc = derive { name="kmc"; version="0.1-2"; sha256="16lv8wk24cp91qg5202zhfmdhg83qw8bwiycknaml5ki820ffdlx"; depends=[rootSolve emplik Rcpp Rcpp]; };
 kmconfband = derive { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; };
 kmi = derive { name="kmi"; version="0.5.1"; sha256="0519mi7kwrsfpili7y8nmyiky6qwf8xkd0n7cwj02c8d119bk9sa"; depends=[survival mitools]; };
-kml = derive { name="kml"; version="2.2"; sha256="1g8wgmvs31r3hp7y8n9pkxc9qy5fxvb3nicmzgacmghaiwbwc8g3"; depends=[clv longitudinalData]; };
-kml3d = derive { name="kml3d"; version="2.2"; sha256="1n94kfi49rgb9149bgc9043f0y5xpaclmfjr8fkwairqz5nnmgbv"; depends=[clv rgl misc3d longitudinalData kml]; };
+kml = derive { name="kml"; version="2.3.1"; sha256="1bnd8ssbhijxd9c9x7qn96jdkj1f1jnm46nw86164issxc6ypm5a"; depends=[clv longitudinalData]; };
+kml3d = derive { name="kml3d"; version="2.3"; sha256="0dlpxp8bbrwgblrl1hnc1ip592abc6sdcl87s4m6jwgfaxjcq7a8"; depends=[clv rgl misc3d longitudinalData kml]; };
 kmlcov = derive { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; };
 kmodR = derive { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; };
-knitcitations = derive { name="knitcitations"; version="1.0.5"; sha256="1a9lw9gdb31akdwiif5xzbs4s0s9xkhm3n735xnkiyc9n6afwzn3"; depends=[RefManageR digest httr]; };
+knitcitations = derive { name="knitcitations"; version="1.0.6"; sha256="18jfrzazbk8cy9i7qvmmrn8c5cmkxvmdd894jpvak2gplxvsdx91"; depends=[RefManageR digest httr]; };
 knitr = derive { name="knitr"; version="1.10.5"; sha256="1qxpsnjwb4bdq44k3nglfrznpvqaqj18njx4imbpk3njzcjif7a7"; depends=[evaluate digest formatR highr markdown stringr yaml]; };
 knitrBootstrap = derive { name="knitrBootstrap"; version="0.9.0"; sha256="1cw5dvhjiypk6847qypxphfl9an54qjvd6qv029znhwijsg56mmg"; depends=[knitr markdown]; };
 knnGarden = derive { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; };
@@ -4161,12 +4235,13 @@ kst = derive { name="kst"; version="0.2-1"; sha256="1wy9cvvln994qgr0p7qa9qs1jd7g
 ktsolve = derive { name="ktsolve"; version="1.1"; sha256="0b5myr093v3qaj9gzbw1w728i5ij418whxxpicj51w657dcy647k"; depends=[]; };
 ktspair = derive { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[]; };
 kulife = derive { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; };
-kyotil = derive { name="kyotil"; version="2015.2-27"; sha256="0xx54b332bfg0b69m80d2qafcy7bwc5b7paq3x02rkh6xllsnq4y"; depends=[]; };
+kwb_hantush = derive { name="kwb.hantush"; version="0.2.1"; sha256="0rjnhhzvjhhl0r2ixz9vkgnqkrnnk772253zy7xkpadj7ws69jsf"; depends=[lattice hydroGOF]; };
+kyotil = derive { name="kyotil"; version="2015.5-20"; sha256="08rpprs58c100x7sjxhvxm76msy888pvr1hy40k1b8gw0yw7fks7"; depends=[]; };
 kza = derive { name="kza"; version="3.0.0"; sha256="0v811ln9vg7msvks9lpgmdi39p01342yi8fj180aclha3mfk6gfw"; depends=[polynom]; };
 kzft = derive { name="kzft"; version="0.17"; sha256="1y6almhs1x21cr4bbf5fj3mnhp65ivzs869660cyg70sva853sv7"; depends=[polynom]; };
 kzs = derive { name="kzs"; version="1.4"; sha256="1srffwfg0ps8zx0c6hs2rc2y2p01qjl5g1ypqsbhq88vkcppx1w9"; depends=[lattice]; };
 l2boost = derive { name="l2boost"; version="1.0"; sha256="1p0sbvlnax4ba4wjkh3r0bmjs601k590g7bdfk6wxvlj42jxcnkl"; depends=[MASS]; };
-laGP = derive { name="laGP"; version="1.1-3"; sha256="11blzdnil0nw3q5vf4y1rv7l4zxjx8ilynv9jpkm14azv5dsr8jw"; depends=[tgp]; };
+laGP = derive { name="laGP"; version="1.1-5"; sha256="15p958c95a68gr2xs8aw0l0sp0appv6islfbidlvxm8ph252hw6d"; depends=[tgp]; };
 labdsv = derive { name="labdsv"; version="1.7-0"; sha256="1r5vbmdijcrw0n3phdmfv8wiy7s08pidvhac4pnsxfmf98f74jby"; depends=[mgcv MASS rgl cluster]; };
 label_switching = derive { name="label.switching"; version="1.3"; sha256="05kbxvrp0lm5913lhy7pgxr9cq64sm5hiz6ydmmgfmbmfirrcqyx"; depends=[combinat lpSolve]; };
 labeledLoop = derive { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; };
@@ -4177,8 +4252,9 @@ laeken = derive { name="laeken"; version="0.4.6"; sha256="1rhkv1kk508pwln1d325iq
 laercio = derive { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; };
 lakemorpho = derive { name="lakemorpho"; version="1.0"; sha256="0kxd493cccs24qqyw58110d2v5w8560qfnbm6qz7aki0xa7kaqrg"; depends=[maptools rgdal raster rgeos sp geosphere]; };
 laketemps = derive { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; };
+lamW = derive { name="lamW"; version="0.1-1"; sha256="1ndf3rkkp87pivhymyqa3n5ng5y1kaa79ay84p4yk4z4h2887nq3"; depends=[Rcpp Rcpp]; };
 lambda_r = derive { name="lambda.r"; version="1.1.7"; sha256="1lxzrwyminc3dfb07pbn1rmj45kplxgsb17b06pzflj728knbqwa"; depends=[]; };
-lambda_tools = derive { name="lambda.tools"; version="1.0.6"; sha256="13yxrgsam47adv08zl01harjq37pccfsar105b6ccf2qv3lrkdk7"; depends=[lambda_r]; };
+lambda_tools = derive { name="lambda.tools"; version="1.0.7"; sha256="1hskmsd51lvfc634r6bb23vfz1vdkpbs9zac3a022cgqvhvnbmxb"; depends=[lambda_r]; };
 landpred = derive { name="landpred"; version="1.0"; sha256="1bl17xkx18i8i7arccnjmxvhjn4yiy7w64hg4n0xmhk8pg0l3mrg"; depends=[survival]; };
 landsat = derive { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[rgdal sp lmodel2 mgcv]; };
 languageR = derive { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; };
@@ -4197,6 +4273,7 @@ lava = derive { name="lava"; version="1.4.0"; sha256="0zf62xk2j1gbwxqglq6lsxs3f7
 lava_tobit = derive { name="lava.tobit"; version="0.4-7"; sha256="1da98d5pndlbbw37k64fmr2mi1hvkhjxsmm3y9p4b772pz9i1pvj"; depends=[lava mvtnorm survival]; };
 lavaan = derive { name="lavaan"; version="0.5-18"; sha256="0ih5wvhmxln3w5h7q5w6gsmbs3w8118l9hc2afgsnzpg8a5jy1n3"; depends=[MASS mnormt pbivnorm quadprog]; };
 lavaan_survey = derive { name="lavaan.survey"; version="1.1"; sha256="1vscv165kilkc00pgs2s9qn404l3rv45zc9kzmrghxz42jsy04zc"; depends=[lavaan survey MASS Matrix]; };
+lawn = derive { name="lawn"; version="0.1.0"; sha256="0vv2qmz6a692ammh3jxnpq3b669s8cx61krmb97jlwjy2nb6r81i"; depends=[V8 jsonlite magrittr]; };
 lawstat = derive { name="lawstat"; version="2.5"; sha256="01y00jfapmh3bmrmz740flkahw0b8im8sp5ac8hsp4pf9k09cvws"; depends=[mvtnorm VGAM Kendall Hmisc]; };
 lazy = derive { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; };
 lazyData = derive { name="lazyData"; version="1.0.3"; sha256="1i4jry54id8hhfla77pwk3rj2cci6na36hxj7k35k8lx666fdam2"; depends=[]; };
@@ -4215,7 +4292,7 @@ ldbounds = derive { name="ldbounds"; version="1.1-1"; sha256="15ixrq615x64zmi6dr
 ldlasso = derive { name="ldlasso"; version="3.2"; sha256="0ij68zvgm8dfd2qwx6h6ygndac29qa0ddpf11z959v06n8jsnk11"; depends=[GenABEL quadprog]; };
 ldr = derive { name="ldr"; version="1.3.3"; sha256="1c48qm388zlya186qmsbxxdcg1mdv3nc3i96lqb40yhcx2yshbip"; depends=[GrassmannOptim Matrix]; };
 leaderCluster = derive { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; };
-leafletR = derive { name="leafletR"; version="0.3-2"; sha256="183qrfmcanb4c5n3w0vd9xb5mcygjfjc4qr1mzz5jxgjd039g28n"; depends=[brew jsonlite]; };
+leafletR = derive { name="leafletR"; version="0.3-3"; sha256="00xdmlv6wc47lzlm43d2klyzcqljsgrfrmd5cv8brkvvcsyj57kq"; depends=[brew jsonlite]; };
 leapp = derive { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[MASS corpcor]; };
 leaps = derive { name="leaps"; version="2.9"; sha256="1ax9v983401hvb6cdswkc1k7j62j8yk6ds22qdj24vdidhdz5979"; depends=[]; };
 learningr = derive { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; };
@@ -4226,15 +4303,15 @@ lessR = derive { name="lessR"; version="3.3.1"; sha256="1nwvkxi9q7fsjgrfpa16ry54
 lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; };
 letsR = derive { name="letsR"; version="2.1"; sha256="0jgc6k2hbpbr7kl42n01mff7pzjz60zd8mchrfhzgd797pwcqlbq"; depends=[raster maps XML geosphere fields maptools sp rgdal]; };
 lfactors = derive { name="lfactors"; version="0.4.0"; sha256="1f4p5mp6m11njrj421vjl5398laicgyg8m04srshfmpi74hf1nb9"; depends=[]; };
-lfe = derive { name="lfe"; version="2.2-1699"; sha256="1a2y4f25isvnvk0yg6j36s729makr8b1bzwivx4x67aqg8fd09rv"; depends=[Matrix Formula xtable]; };
-lfl = derive { name="lfl"; version="1.0"; sha256="10ypsnzjzygihz019clwnf3gv5b64d873231pjkp772k1n3wgv9a"; depends=[Rcpp foreach forecast plyr tseries e1071 zoo Rcpp]; };
+lfe = derive { name="lfe"; version="2.3-1709"; sha256="0q6va05n38225a7sbk0ykdrygzjk6js6afm2vyy5fac1hbvihb05"; depends=[Matrix Formula xtable]; };
+lfl = derive { name="lfl"; version="1.1"; sha256="1hrdhp2r17qwns5hya9sl03q93h934whqyqsn8mdrsavc64i649v"; depends=[Rcpp foreach forecast plyr tseries e1071 zoo Rcpp]; };
 lfstat = derive { name="lfstat"; version="0.6.1"; sha256="0i3zrinvjxlg9w5zqrv8wzy15vxvi2gw3jrlfs4rddkxnp98ya9d"; depends=[lattice lmom lmomRFA latticeExtra]; };
 lga = derive { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; };
 lgarch = derive { name="lgarch"; version="0.5"; sha256="01y5p3w4i1yfxb647pkdazqn9yac1p6jp7rk92ddxnvvjb6fdp59"; depends=[zoo]; };
 lgcp = derive { name="lgcp"; version="1.3-9"; sha256="093rxvb4irmf04nx1j5zrgh8k0jw78zl9qrmkn314vaqyn3b4608"; depends=[spatstat sp raster RandomFields iterators ncdf rpanel fields maptools Matrix rgeos]; };
 lgtdl = derive { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypdky9rypy607mr8brwimjn8k1f0gx4"; depends=[]; };
 lhs = derive { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; };
-libamtrack = derive { name="libamtrack"; version="0.5.5"; sha256="0v2h4ficf87ai3h2liw8j7428k0bzzb59zini2vskwhcqb7ky7yw"; depends=[]; };
+libamtrack = derive { name="libamtrack"; version="0.6.1"; sha256="0kg3lp1f40hymr2nxq7immxnqryavad91xp6l6x4qyp0cb02870a"; depends=[]; };
 lifecontingencies = derive { name="lifecontingencies"; version="1.1.6"; sha256="07gvq93p2f8s4a43h596xmzifnx1jwnfyg5giqhlfvxnq6wdbvrr"; depends=[markovchain Rcpp Rcpp]; };
 likeLTD = derive { name="likeLTD"; version="5.5.0"; sha256="111wdszkk2bdi9sz6gfih32kib0ig9bp4xlq6wl5r5zx3nrlj5zb"; depends=[DEoptim ggplot2 gtools rtf gdata]; };
 likelihood = derive { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; };
@@ -4253,13 +4330,14 @@ lintr = derive { name="lintr"; version="0.2.0"; sha256="14jaghvd0kz271j6wl8j0y31
 liso = derive { name="liso"; version="0.2"; sha256="072l7ac1fbkh8baiiwx2psiv1sd7h8ggmgk5xkzml069ihhldj5i"; depends=[MASS Iso]; };
 lisp = derive { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; };
 lisrelToR = derive { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; };
-list = derive { name="list"; version="7.1"; sha256="1avbps4di6rhy6rvfyky336zqab65ibfjw2hwp1r713psbmf9z16"; depends=[sandwich VGAM magic gamlss_dist MASS quadprog arm corpcor mvtnorm coda]; };
+list = derive { name="list"; version="8.0"; sha256="09qpcsygs2clbgd42v6klgh1vjhv64s56ixxqlcpg9v7xqnms56j"; depends=[sandwich VGAM magic gamlss_dist MASS quadprog corpcor mvtnorm coda]; };
+listenv = derive { name="listenv"; version="0.3.0"; sha256="14zi2zs6jxcq0j5knf5nlr06xk7n0vvfgbh2lqdjq0pvjbm8j08b"; depends=[]; };
 llama = derive { name="llama"; version="0.8.1"; sha256="0pv411kj4n3pi2yg35jzjd4zfxkqksbp049v6d9xd2q14i9kphv2"; depends=[mlr rJava parallelMap ggplot2 checkmate]; };
 lle = derive { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[scatterplot3d MASS snowfall]; };
 lllcrc = derive { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[data_table combinat VGAM plyr]; };
 lm_beta = derive { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; };
 lm_br = derive { name="lm.br"; version="2.6"; sha256="1f7cxd6ksspgpz2lnppyb466lgis5isk0bj8z4bjiwk4abg4lg3i"; depends=[Rcpp Rcpp]; };
-lmSupport = derive { name="lmSupport"; version="2.9.1"; sha256="11c86ji7srv80zlrp6c8ark312xzvajig8flc5qm77dgacik8daq"; depends=[car psych gvlma AICcmodavg lme4 pbkrtest]; };
+lmSupport = derive { name="lmSupport"; version="2.9.2"; sha256="0mdl5ih7zzxynawxx4prh08nq451x74bfw4ga7cygl2ahi6vqq50"; depends=[car psych gvlma AICcmodavg lme4 pbkrtest]; };
 lme4 = derive { name="lme4"; version="1.1-7"; sha256="0v9vl9rspakyw2dmcl5lbhv1nlg10yhgdvi3gpfnizln7xw9ksyp"; depends=[Matrix Rcpp MASS nlme lattice minqa nloptr Rcpp RcppEigen]; };
 lmeNB = derive { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[numDeriv statmod lmeNBBayes]; };
 lmeNBBayes = derive { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; };
@@ -4279,7 +4357,7 @@ lmodel2 = derive { name="lmodel2"; version="1.7-2"; sha256="0dyzxflr82k7ns824zly
 lmom = derive { name="lmom"; version="2.5"; sha256="0s2x8k6p71hxdqggy8ajk7p9p040b9xr3lm49g31z3kcsmzvk23q"; depends=[]; };
 lmomRFA = derive { name="lmomRFA"; version="3.0-1"; sha256="0lf8n6bhdv3px6p60smghvmwsbgawvjrmgy2dfhs517n67pxg30i"; depends=[lmom]; };
 lmomco = derive { name="lmomco"; version="2.1.4"; sha256="02c2yhfr08hzlyn2nmfdfvmc3xrc3pp4agc6nkg4w6kk74r003h1"; depends=[]; };
-lmtest = derive { name="lmtest"; version="0.9-33"; sha256="1ycmxjrxf41mnbgakdmn4y2kmgp4rkj7v3nqwqnlc6gdfdmac73s"; depends=[zoo]; };
+lmtest = derive { name="lmtest"; version="0.9-34"; sha256="0bhdfwrrwjkmlw0wwx7rh6lhdjp68p7db5zfzginnv3dxmksvvl6"; depends=[zoo]; };
 loa = derive { name="loa"; version="0.2.22"; sha256="13j4d4d35nd2ssmkghpd6azysmy7g8mc9y3glkzjnddp1xxz8icn"; depends=[lattice MASS png RgoogleMaps RColorBrewer]; };
 localdepth = derive { name="localdepth"; version="0.5-7"; sha256="0h0y74xnhdqa7y51ljmpz7ayznppvy2ll06wfds6200lb9cxgr7k"; depends=[circular]; };
 localgauss = derive { name="localgauss"; version="0.34"; sha256="04bn777kcxaa5s4zf0r9gclar32y9wpzqnx2rxxhqrxyy419gw37"; depends=[ggplot2 MASS foreach matrixStats]; };
@@ -4290,10 +4368,10 @@ locpol = derive { name="locpol"; version="0.6-0"; sha256="1zpdh3g7yx3rcn3rhlc3dm
 lodGWAS = derive { name="lodGWAS"; version="1.0-3"; sha256="1fb70p2mvp742557ns44ilb9m85aqq59p5x6vdrmb22hczsjj6q4"; depends=[survival rms]; };
 loe = derive { name="loe"; version="1.0"; sha256="11wjzq4h7qjrnrj1zg3msg1ksld9c3r3n3biamf2hz8zvi1asvqv"; depends=[igraph MASS vegan Matrix]; };
 log4r = derive { name="log4r"; version="0.2"; sha256="07q8m7z2sxm6n25a62invf76qakxdsijfh3272spc8xrmdmyw6rj"; depends=[]; };
-logbin = derive { name="logbin"; version="1.0"; sha256="17vabb348kczn839mhwshn20qgrdnpd0ll81hb8bcsricm6dqhna"; depends=[glm2]; };
+logbin = derive { name="logbin"; version="1.2"; sha256="1jfkg5rx51hm2skwwafqiw6ajdijdm0cniral3j5flidinsbsbcm"; depends=[glm2]; };
 logconPH = derive { name="logconPH"; version="1.5"; sha256="05fkibgh5nzs8c4f39kzg4zyh2dfhg1k69hlx7l8p442snajsg92"; depends=[]; };
 logconcens = derive { name="logconcens"; version="0.16-4"; sha256="11bk03kjlb747g54axmb0nayz226g41xvanbw79aij76vjbglv7y"; depends=[]; };
-logcondens = derive { name="logcondens"; version="2.1.2"; sha256="0lnsyjl77l9024pqncyxwivmj05f5mfa3563jql47jajaai0my8y"; depends=[ks]; };
+logcondens = derive { name="logcondens"; version="2.1.3"; sha256="0fg7dsila67k80kbh1m1l69pb0pwwr893lkian7a8abx3a1qclij"; depends=[ks]; };
 logcondens_mode = derive { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[logcondens distr]; };
 logcondiscr = derive { name="logcondiscr"; version="1.0.5"; sha256="170rg4rqch0mlhmc1zc59h271b57y3xfxrc3gh9pwvc9r11gw7k5"; depends=[Matrix mvtnorm cobs]; };
 logging = derive { name="logging"; version="0.7-103"; sha256="1sp7q217awizb6l8c9p5dix6skpq8j7w8i088x4mm0fc0qr1ba5c"; depends=[]; };
@@ -4308,11 +4386,11 @@ lomb = derive { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvb
 longCatEDA = derive { name="longCatEDA"; version="0.17"; sha256="1yb0117ycj4079590mrx3lg9m5k7xd1dhb779r3rmnww94pmvja9"; depends=[]; };
 longclust = derive { name="longclust"; version="1.2"; sha256="1m270fyvfz0w19p9xdv7ihy19nhrhjq2akymbp774073crznmmw0"; depends=[]; };
 longitudinal = derive { name="longitudinal"; version="1.1.11"; sha256="0rzi177v9k6gy1wv06vf81r1q0ml81ssf83v0z8rpmx5j91d71ac"; depends=[corpcor]; };
-longitudinalData = derive { name="longitudinalData"; version="2.2"; sha256="1kdgnkhk39a9r4fq6zmrvzcvs7qjd21knpzfjglxyx723r9p3fs7"; depends=[clv class rgl misc3d]; };
+longitudinalData = derive { name="longitudinalData"; version="2.3"; sha256="0ld2saga04if2zp3ylz720q8451f7a7aiva5hpj471wxd0948592"; depends=[clv class rgl misc3d]; };
 longmemo = derive { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; };
 longpower = derive { name="longpower"; version="1.0-11"; sha256="1l1icy653d67wlvigcya8glhqh2746cr1vh1khx36qjhfjz6wgyf"; depends=[Matrix lme4 nlme]; };
 loop = derive { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; };
-loopr = derive { name="loopr"; version="1.0.0"; sha256="19gk3phi45ylkvdfyyr0j0r13ndz7wxl73x0znp2n59vazdgy24w"; depends=[plyr dplyr magrittr lazyeval R6]; };
+loopr = derive { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[plyr dplyr magrittr lazyeval R6]; };
 lordif = derive { name="lordif"; version="0.2-2"; sha256="0898k5w9wky318k8x0zknjqdzdify0yyrnb1506j341l4n1bm04s"; depends=[MASS msm mvtnorm polycor sfsmisc ltm Hmisc rms]; };
 lorec = derive { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; };
 lpSolve = derive { name="lpSolve"; version="5.6.11"; sha256="0mgpns9wflqaz9ynwxwkvmc1694yhf275wgrqfjfy3qxz1hxq7s0"; depends=[]; };
@@ -4330,13 +4408,13 @@ lsbclust = derive { name="lsbclust"; version="1.0.2"; sha256="03vaf9l0fy3pdr3cqb
 lsdv = derive { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; };
 lsgl = derive { name="lsgl"; version="1.0.123.1"; sha256="10q3f56yjgs3kvyk7b7d1xi06sa16pv9y3c6lsp1461whqvinpj4"; depends=[sglOptim Matrix sglOptim Rcpp RcppProgress RcppArmadillo BH]; };
 lshorth = derive { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; };
-lsmeans = derive { name="lsmeans"; version="2.17"; sha256="0jpyqrc84w1zxgw7vbrp2263fcbk8rahxq2lqhcf8by47xcgk5kk"; depends=[estimability coda multcomp plyr mvtnorm]; };
+lsmeans = derive { name="lsmeans"; version="2.18"; sha256="1wnpn4hngjcfr44apsw85g3x4wm3ma7msg2n4dnadj0w0zbf0fq4"; depends=[estimability coda multcomp plyr mvtnorm]; };
 lspls = derive { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; };
 lsr = derive { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; };
 lss = derive { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; };
 ltbayes = derive { name="ltbayes"; version="0.3"; sha256="1b35bwli08yzgv3idg86wz8fzpx7r5sx0ryr950rdh0n2jdml09q"; depends=[mcmc MHadaptive numDeriv]; };
 ltm = derive { name="ltm"; version="1.0-0"; sha256="1igkgb0jy3mzlnp9s6avhcpplwijz5g3x26a3lavyy3d9fjpmfpa"; depends=[MASS msm polycor]; };
-ltmle = derive { name="ltmle"; version="0.9-5"; sha256="07z576ry6i73l4jp073l360gvhzfdq845x43vrpfq258h7mqhgg4"; depends=[Matrix]; };
+ltmle = derive { name="ltmle"; version="0.9-6"; sha256="0q65ha7j3q9myhsafcmjwyxjf486xw4c3d17gpdnsvq4zqgfsy16"; depends=[Matrix]; };
 ltsa = derive { name="ltsa"; version="1.4.4"; sha256="06db0d4j0kqp4q6rpa3sawcsm5rfgdhzl8fl7cxivjbbyrfnszqp"; depends=[]; };
 ltsbase = derive { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; };
 ltsk = derive { name="ltsk"; version="1.0.3"; sha256="17l4mwggd4s39l6x1b6gvwgd6gjl0h37wfis1i6l9k6hiaqhb6vr"; depends=[fields]; };
@@ -4361,21 +4439,20 @@ mada = derive { name="mada"; version="0.5.7"; sha256="0a2m1rb4d143v9732392xzvbg6
 mads = derive { name="mads"; version="0.1.2"; sha256="1hbanfa1wnfvfs0g8dcf5z4439v0pp3rqhxahiis03jlfxzgd841"; depends=[mrds]; };
 madsim = derive { name="madsim"; version="1.1"; sha256="1d9mv769zia43krdfl43hp22cp5mdi3ycwj3kxyfcjrg23bjnyc0"; depends=[]; };
 magic = derive { name="magic"; version="1.5-6"; sha256="1399w1zhz79nj8cdhslybncd9h6rylfhb548nv22ip0dxxdkyv0v"; depends=[abind]; };
-magicaxis = derive { name="magicaxis"; version="1.9.3"; sha256="0dxlqpxw82v9cxfp475ppd02ywvlg96b1cfj02fjvs04xfprhar0"; depends=[MASS plotrix sm]; };
-magma = derive { name="magma"; version="1.3.0-2"; sha256="0hgwjq30ksx2qg4q9fj57m27i96sci8hrfrqc2lw4hz18b6kkph4"; depends=[]; };
+magicaxis = derive { name="magicaxis"; version="1.9.4"; sha256="0kgr29q4v9aq10l6zkddgv93zl66yzwxx9jsnskkx3r0kk3rlxa3"; depends=[MASS plotrix sm]; };
 magrittr = derive { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; };
 mail = derive { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; };
 mailR = derive { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslpcvhr9gcj7wsamaxzgrcsaxm8fdlw"; depends=[rJava stringr R_utils]; };
 makeProject = derive { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; };
 mallet = derive { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; };
 managelocalrepo = derive { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[stringr assertthat]; };
-manifestoR = derive { name="manifestoR"; version="0.9-12"; sha256="1hz45555941b9jplac4l8l6h4dn387fp4nk873c17mds7xaxzidq"; depends=[NLP tm dplyr httr jsonlite functional]; };
+manifestoR = derive { name="manifestoR"; version="1.0-1"; sha256="1008bz2vsmhx0sx6kc55z8dhlfinbadagz4hd0p50c4q86ibl7lh"; depends=[NLP tm dplyr httr jsonlite functional zoo psych]; };
 manipulate = derive { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; };
 mapDK = derive { name="mapDK"; version="0.3.0"; sha256="03ksg47caxx3y97p3nsflwpc7i788jw874cixr9gjz756avwkmwp"; depends=[ggplot2 stringi]; };
 mapStats = derive { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[survey lattice maptools RColorBrewer Hmisc classInt sp colorspace reshape2]; };
 mapdata = derive { name="mapdata"; version="2.2-3"; sha256="1fhj34cgq6rniy0339qv2ghbs0aiq38h9jfwx7szb83yj37v7wm6"; depends=[maps]; };
 mapfit = derive { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; };
-mapmisc = derive { name="mapmisc"; version="1.2.1"; sha256="1sds83cbsdfb6ac2y13fy1lm7bi27qzkkpjv1cjml8yjwcazfbfj"; depends=[sp raster]; };
+mapmisc = derive { name="mapmisc"; version="1.2.4"; sha256="07h237sgsycagn61rharb09q9s8da777hzngh4py1sbv6gfyqpv8"; depends=[sp raster]; };
 mapplots = derive { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; };
 mapproj = derive { name="mapproj"; version="1.2-2"; sha256="1fdb72hvcp6jm7rhvs8zdkya6ifs92lfqnmq5vj5amwckkxfidc6"; depends=[maps]; };
 maps = derive { name="maps"; version="2.3-9"; sha256="1gzy81sl4vpr4hsnh4jsp5rd26jdkzsw99qxwfmbadjyf55q06wv"; depends=[]; };
@@ -4387,12 +4464,13 @@ marelac = derive { name="marelac"; version="2.1.4"; sha256="0mm1rmaxrbhk6r9z62ns
 marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; };
 markdown = derive { name="markdown"; version="0.7.7"; sha256="00j1hlib3il50azs2vlcyhi0bjpx1r50mxr9w9dl5g1bwjjc71hb"; depends=[mime]; };
 marked = derive { name="marked"; version="1.1.8"; sha256="1xsg0iy8mcy9b98bxmjr3y413xwblbhks3fcydbvjnry0k03gd5i"; depends=[lme4 R2admb truncnorm coda ggplot2 Matrix numDeriv Rcpp plyr optimx expm Rcpp]; };
-markovchain = derive { name="markovchain"; version="0.2"; sha256="03lmvnfdcn4s274ydi5i8xwwm8bl4fv64dwm8mb61nf0i5d0w6ky"; depends=[igraph Matrix matlab expm Rcpp RcppParallel Rcpp RcppParallel]; };
+markovchain = derive { name="markovchain"; version="0.2.1"; sha256="0ix7sdcnsc4bl9diddfl4q0lmq1nq8bp1d7arxzcjj4zy35vhkv5"; depends=[igraph Matrix matlab expm Rcpp RcppParallel Rcpp RcppParallel]; };
 marl = derive { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; };
 marmap = derive { name="marmap"; version="0.9.2"; sha256="1csi6v6z2p3nmyqwy8bmbj036693rzmxrc317g0a45gsqxggp3n4"; depends=[DBI RSQLite gdistance geosphere sp raster ncdf plotrix shape reshape2 adehabitatMA ggplot2]; };
 marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
 matR = derive { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[MGRASTer BIOM_utils]; };
-matchingMarkets = derive { name="matchingMarkets"; version="0.1-3"; sha256="1q76sw77r90m8wrzj2d81w0fnkqfg8fz5sgpc7m64c5if82z3awa"; depends=[Rcpp lpSolve partitions Rcpp RcppArmadillo RcppProgress]; };
+matchingMarkets = derive { name="matchingMarkets"; version="0.1-4"; sha256="096yknmzla2qq2vkaxna5f8mclayjn5baff3cm8ik95zy7j3lrjp"; depends=[Rcpp lpSolve partitions Rcpp RcppArmadillo RcppProgress]; };
+matchingR = derive { name="matchingR"; version="1.0.1"; sha256="0qqk2zcyj0m3r9q0lclb39gdrjqqjlaxvk3cxpfah7hxhhkrk4mc"; depends=[Rcpp Rcpp RcppArmadillo]; };
 mathgraph = derive { name="mathgraph"; version="0.9-11"; sha256="0xikgzn24p0qqlrmaydmjk5yz5pq2rilsvpx86n3p2k2fc3wpwjy"; depends=[]; };
 matie = derive { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[dfoptim mvtnorm seriation igraph gplots cba]; };
 matlab = derive { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; };
@@ -4428,13 +4506,13 @@ mco = derive { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2b
 mcprofile = derive { name="mcprofile"; version="0.2-1"; sha256="0q1d236mcmgp5p5gl474myp1zz8cbxffd0kvsd8338jijalj05p0"; depends=[ggplot2 quadprog mvtnorm]; };
 mcr = derive { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; };
 mcsm = derive { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[MASS coda]; };
-mda = derive { name="mda"; version="0.4-6"; sha256="0v6avsq1j3vd8pmnilxcbx6v42kb5gvsy03q2srwzf3z04807n8i"; depends=[class]; };
+mda = derive { name="mda"; version="0.4-7"; sha256="1hjmjrdr6zfccsd4xln1jvkkvk25igppvnl6mqznfc7qsmk459cy"; depends=[class]; };
 mdatools = derive { name="mdatools"; version="0.6.0"; sha256="13pfzr3lvqifln9lzdd0dpnygdibxp9ka7zwfisxjrw21m8mhmm3"; depends=[]; };
 mded = derive { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; };
 mdscore = derive { name="mdscore"; version="0.1-2"; sha256="1g473rwffkb2x6y6wcm98i6xr5dhz11ypnbrvhb2klbvi81jj511"; depends=[MASS]; };
 mdsdt = derive { name="mdsdt"; version="1.0"; sha256="0ngf2p6lm32124qyfh18zlgf0dipj3njn6d0m8f192563kp50q0p"; depends=[ellipse mnormt polycor]; };
 measuRing = derive { name="measuRing"; version="0.3"; sha256="16lgvk9lm0vjy50das0qq0h0z683hh94spjcdmkljmxxzwmzfl4b"; depends=[pastecs png tiff]; };
-meboot = derive { name="meboot"; version="1.4-5"; sha256="1h33f3dpx906q5nmd57hhkq07mbs2kg8mv6mi4imaa2zpr5vc4py"; depends=[dynlm nlme]; };
+meboot = derive { name="meboot"; version="1.4-6"; sha256="17wjvc375vnya1lhkj10nsn68k1j3zy036031qca3wxx6wqw9kzx"; depends=[dynlm nlme]; };
 medSTC = derive { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; };
 mederrRank = derive { name="mederrRank"; version="0.0.7"; sha256="08jbqmb418qb7v2x6lm4wig1pfzzfx6fhb49mbfhlkbmssbqsjfq"; depends=[BB numDeriv]; };
 medflex = derive { name="medflex"; version="0.5-0"; sha256="06zp0la99ly2vpm97l3qm289inyd0bxgkjd4cv15mvc47w9c9x9x"; depends=[multcomp boot Matrix sandwich]; };
@@ -4456,24 +4534,27 @@ metaLik = derive { name="metaLik"; version="0.41.0"; sha256="08wiriq6cm02d0b0q34
 metaMA = derive { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[SMVar]; };
 metaMix = derive { name="metaMix"; version="0.2"; sha256="0xlsdgincxwjzyr4i8qfmfw2wvgf41qbmyhf2rxcbarf7rmwhmqf"; depends=[data_table Matrix gtools Rmpi ggplot2]; };
 metaRNASeq = derive { name="metaRNASeq"; version="1.0.2"; sha256="1xz7df7ypq4326yg429pgxd6aldp14c3h3qi20j5nqr5xgsdgzqa"; depends=[]; };
+metaSEM = derive { name="metaSEM"; version="0.9.4"; sha256="1d790z462g9qnrxl5p3a50abaachc2wih10zsk6jpbf10z694g13"; depends=[OpenMx Matrix MASS]; };
 metabolomics = derive { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots]; };
 metacom = derive { name="metacom"; version="1.4.3"; sha256="0djq2ry2vriayn839f0pgkq4j8j1zyd8ribmzn6ngfhz305fszlq"; depends=[devtools vegan lattice]; };
 metacor = derive { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[rmeta gsl]; };
 metafolio = derive { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[Rcpp plyr colorspace MASS Rcpp RcppArmadillo]; };
-metafor = derive { name="metafor"; version="1.9-6"; sha256="1bjhzkim64035xk04kc1ra4ih6gxfsn389gag21mf9zhk0mi6yd0"; depends=[Matrix]; };
+metafor = derive { name="metafor"; version="1.9-7"; sha256="1gnq9qrz3ym9az9s6pi48dx7j3znrp9knbdmh4qpdhjkdlpa55d1"; depends=[Matrix]; };
+metagear = derive { name="metagear"; version="0.1"; sha256="1c00y7p7063f3c1ar17r9ij5j4chzyispg0wprkjaaz0mx9w1hb0"; depends=[gWidgetsRGtk2 gWidgets stringr metafor MASS Matrix]; };
 metagen = derive { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[MASS lhs plyr BBmisc ParamHelpers BatchJobs BatchExperiments ggplot2 metafor]; };
 metamisc = derive { name="metamisc"; version="0.1.1"; sha256="1cvlsix3b857xdw6anqhqsrfwxpnf4rbzg4ybf6aw7vcdc05zgwd"; depends=[mvtnorm ellipse bbmle rjags coda]; };
 metap = derive { name="metap"; version="0.6"; sha256="1iy5cmwrlsr70z0qnqn30n15knsfclg383815a2a8yqpg5gs4953"; depends=[]; };
-metaplus = derive { name="metaplus"; version="0.7-1"; sha256="17wn2x8dnfzm98bd007axq9ak38hphx08vqpk6ba0jahlfvqqdiz"; depends=[bbmle metafor boot numDeriv lme4 MASS]; };
+metaplus = derive { name="metaplus"; version="0.7-2"; sha256="1d9528z78vmkmv67s29g87kfdwydfwx4cnbcdmd0kq8rch9zjk07"; depends=[bbmle metafor boot numDeriv lme4 MASS]; };
 metasens = derive { name="metasens"; version="0.2-0"; sha256="13mncikxzg8cnpbw78ird1xkrjlivmjibhrk700vdx1hygzwi6x0"; depends=[meta]; };
 metatest = derive { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; };
-meteoForecast = derive { name="meteoForecast"; version="0.43"; sha256="1fpbxkdkgi50xbx3n26apdm6i29a2302vabfz0z3czafd76wkwg7"; depends=[raster sp zoo ncdf rjson]; };
+meteoForecast = derive { name="meteoForecast"; version="0.45"; sha256="0p74w5zcibzw2vpbyl4jb2wzpz0pki1n1l66hjs6dnkrn52zph95"; depends=[raster sp zoo ncdf]; };
 meteogRam = derive { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; };
-mets = derive { name="mets"; version="1.1.0"; sha256="0nfyfmhcd4sy2j1nymgw4yz0b5a36s2dqx42kzwbzgvp1m11z225"; depends=[timereg lava numDeriv Rcpp survival Rcpp RcppArmadillo]; };
+mets = derive { name="mets"; version="1.1.1"; sha256="1myqcds9glsy3fwzr7v711xzk7gmvy2cb4x3qgj1kxa90d1d50hz"; depends=[timereg lava numDeriv Rcpp survival Rcpp RcppArmadillo]; };
 mewAvg = derive { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; };
 mfp = derive { name="mfp"; version="1.5.1"; sha256="0flqrvicgks7nxxijhndshpf541drlgqjidm3nql1bg5hnpc5fcq"; depends=[survival]; };
 mfx = derive { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[sandwich lmtest MASS betareg]; };
 mgcv = derive { name="mgcv"; version="1.8-6"; sha256="0605cqrbk26zg8s8qdd8kqwq56wihx7r6hfzr4x0xzk4y1g0m2rq"; depends=[nlme Matrix]; };
+mglmn = derive { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; };
 mgpd = derive { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[evd numDeriv corpcor fields]; };
 mgraph = derive { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wcms0n2mm0z3nnl98mx2fy7wz34z8b2"; depends=[rgdal]; };
 mhsmm = derive { name="mhsmm"; version="0.4.14"; sha256="1zrqnzbmlk3kmwbq9rl4bdkc9iawkgn3qr7nzsa782v55i7w2wiz"; depends=[mvtnorm]; };
@@ -4487,7 +4568,7 @@ micEconAids = derive { name="micEconAids"; version="0.6-16"; sha256="07hsabrlkwp
 micEconCES = derive { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[minpack_lm DEoptim systemfit car micEcon miscTools]; };
 micEconSNQP = derive { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[miscTools systemfit MASS]; };
 mice = derive { name="mice"; version="2.22"; sha256="1b7ivpa21ipzbmmwjn1ch968zpw6wydg30f7jdk95m40lrk2xs68"; depends=[Rcpp lattice MASS nnet randomForest rpart Rcpp]; };
-miceadds = derive { name="miceadds"; version="1.1-1"; sha256="1hzx9gf73kgpaa1l0889ybc8qsi703sc4z8wd8jfayhi57rigikb"; depends=[MASS mice mvtnorm pan Rcpp sirt TAM lme4 MBESS pls mitools bayesm inline car foreign Rcpp RcppArmadillo]; };
+miceadds = derive { name="miceadds"; version="1.2-0"; sha256="01gbkpmmd81v5yhj3jparp7li1jzq91f5zk65dhcd8g3a0k0952m"; depends=[MASS mice mvtnorm pan Rcpp sirt TAM lme4 MBESS pls mitools bayesm inline car foreign sjmisc multiwayvcov Rcpp RcppArmadillo]; };
 microbenchmark = derive { name="microbenchmark"; version="1.4-2"; sha256="05yxvdnkxr2ll94h6f2m5sn3gg7vrlm9nbdxgmj2g8cp8gfxpfkg"; depends=[ggplot2]; };
 micromap = derive { name="micromap"; version="1.9.2"; sha256="1x4v0ibbpfz471dp46agib27i4svs8wyy93ldriryvhpa2w5948y"; depends=[maptools RColorBrewer rgdal sp ggplot2]; };
 micromapST = derive { name="micromapST"; version="1.0.5"; sha256="1n9mzyl5dj21165j0j99brkqq7c54j3cg6r21ifdzffj2dx29wh0"; depends=[RColorBrewer]; };
@@ -4519,9 +4600,10 @@ missForest = derive { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfka
 missMDA = derive { name="missMDA"; version="1.7.3"; sha256="1wg4rgziw2f8asdxi2a5dx1mn4z0sd1lf9a8fp7dg29bnv82brmh"; depends=[FactoMineR]; };
 mistat = derive { name="mistat"; version="1.0-2"; sha256="1n5wdn5pl6mflzxpdwjj0x44c8a3cxxpwhmyw1jkx5r8yk95mh3p"; depends=[]; };
 mistral = derive { name="mistral"; version="1.1-1"; sha256="19zkc5ddjzw17y70x3l6maljsfvg0295xyzx7kavmjrws74jx4rc"; depends=[DiceKriging e1071 kernlab Matrix mvtnorm rgenoud]; };
+mitml = derive { name="mitml"; version="0.2-2"; sha256="11pgwa1cxf1i2qkm8gyzxsjkhg40r75gk2k1lwaqpqgi7vs3drbs"; depends=[pan haven]; };
 mitools = derive { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; };
 mix = derive { name="mix"; version="1.0-8"; sha256="0wlp6wkn8dwwnjfq3qzk0hjb3xsjh5ld5zxbd6nf12awpkwa1j9y"; depends=[]; };
-mixAK = derive { name="mixAK"; version="3.10"; sha256="1mma3515p1r5nhbmdyxzvv73ni5iw4arnzq94nw9gib1dgjpm7c5"; depends=[colorspace lme4 fastGHQuad mnormt coda]; };
+mixAK = derive { name="mixAK"; version="4.0-5"; sha256="1kdcia6j2dw4q1rbrswx9h8ivzrnw8hrg5a206jykmsdbngbifx5"; depends=[colorspace lme4 fastGHQuad mnormt coda]; };
 mixOmics = derive { name="mixOmics"; version="5.0-4"; sha256="020cy0x7qf6x7lb1aqfr6qflf08k2phnygcjr7lq4z8q9v502qyh"; depends=[MASS lattice RGCCA igraph rgl pheatmap]; };
 mixPHM = derive { name="mixPHM"; version="0.7-1"; sha256="0v75xv06m40jqq0c4y1gvdrmyddxs814djbpyq61fv8cn22fn7wx"; depends=[survival lattice]; };
 mixRasch = derive { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; };
@@ -4538,13 +4620,15 @@ mixsep = derive { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9
 mixsmsn = derive { name="mixsmsn"; version="1.0-9"; sha256="0pgip1xfgfrdy3g3197d7visn164zi7xnp6wlsgjwxdylvjsxkji"; depends=[mvtnorm]; };
 mixtNB = derive { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; };
 mixtools = derive { name="mixtools"; version="1.0.3"; sha256="01ix019cvplqz09q55pz9w7cc281k37khh1i3xf1k6l9f2cj519z"; depends=[boot MASS segmented]; };
+mixtox = derive { name="mixtox"; version="1.0"; sha256="059vjrz9isyrdqk2ij4b11dawza2yslh67bj7gi9v5awzcf4n2v7"; depends=[]; };
 mixture = derive { name="mixture"; version="1.4"; sha256="0k9pzcgfjyp0rmcma26kr2n8rcwmijznmdpvqidgl3jay20c87ca"; depends=[]; };
 mizer = derive { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[plyr reshape2 ggplot2]; };
 mkde = derive { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[Rcpp raster sp Rcpp]; };
-mkin = derive { name="mkin"; version="0.9-34"; sha256="0g0r30hs5ja2x1mwj336x8y3p0b33asfql076w2krmw38xkpla44"; depends=[minpack_lm rootSolve FME deSolve]; };
+mkin = derive { name="mkin"; version="0.9-35"; sha256="0ac71wkl8b034l1bbv8qr5ynvpl8l9j31ych5v5pf6mmqs62bwnr"; depends=[minpack_lm rootSolve FME deSolve]; };
 mkssd = derive { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; };
 mlDNA = derive { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[snowfall igraph rsgcc e1071 randomForest pROC ROCR]; };
 mlPhaser = derive { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; };
+mlVAR = derive { name="mlVAR"; version="0.1.0"; sha256="0xychak3xdqnsl9z1ifi0niqsrdc10f6frl6zg162mzpil33wp3g"; depends=[plyr lme4 arm qgraph]; };
 mlbench = derive { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; };
 mldr = derive { name="mldr"; version="0.1.70"; sha256="08yiglqzlqxlfrxd7l12x59h7a38skrkkf8w7jh620ab7a7w1gyg"; depends=[shiny XML circlize]; };
 mlearning = derive { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class nnet MASS e1071 randomForest ipred]; };
@@ -4557,7 +4641,7 @@ mlmmm = derive { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4s
 mlogit = derive { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ixxnqx9yvbci7n3mb3hm9mnrxwh5v7sx"; depends=[Formula maxLik statmod zoo MASS lmtest]; };
 mlogitBMA = derive { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[BMA abind maxLik]; };
 mlr = derive { name="mlr"; version="2.3"; sha256="0cvg2bxxw3c69lj5wy4ds54wn5h299c5mjcsbax1p0k408z5aa6z"; depends=[ParamHelpers BBmisc ggplot2 checkmate parallelMap plyr reshape2 survival]; };
-mlxR = derive { name="mlxR"; version="2.1.1"; sha256="13ddm4hhnjx7r058qlvvxn9npqa0vq6y5l1g0zrlhckjp7bpp90a"; depends=[ggplot2 XML Rcpp]; };
+mlxR = derive { name="mlxR"; version="2.2.0"; sha256="1ca0vfky45gvr2rqbgli79v1mqhi0d8mpd220xxs1p6xlwbyvn0m"; depends=[ggplot2 XML Rcpp]; };
 mma = derive { name="mma"; version="2.0-0"; sha256="0fdb2lbg08l47wnrsjf3rarf2n0qsw0qrx9b9aa08ablwpip4k69"; depends=[gbm]; };
 mmand = derive { name="mmand"; version="1.1.0"; sha256="0awi9wxxalz81d6766djbjsk980n65dhz02fcqb69ifc7x80lc33"; depends=[reportr Rcpp Rcpp RcppArmadillo]; };
 mmap = derive { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; };
@@ -4570,13 +4654,14 @@ mmm = derive { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gk
 mmm2 = derive { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; };
 mmod = derive { name="mmod"; version="1.2.1"; sha256="0c2ijg5116hacq0f18xhkbxankjp0k34zfnw8q02ahzwd26ds0z7"; depends=[adegenet pegas]; };
 mmpp = derive { name="mmpp"; version="0.1"; sha256="1m2079vz4h3h90ikh268jwh20ink5n1mri8n7aj50xkfspmwsmpg"; depends=[]; };
-mnlogit = derive { name="mnlogit"; version="1.2.0"; sha256="0ymkm3xwm97v5f9lg2ir4czdfb47hibgrkirc2iw66fh24iah84m"; depends=[mlogit lmtest Formula]; };
+mnlogit = derive { name="mnlogit"; version="1.2.2"; sha256="01wvlmkf9ddcmsb8pw08j05r7kfn8zr76zaaa3mv92h967v79grp"; depends=[mlogit lmtest Formula]; };
 mnormpow = derive { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; };
-mnormt = derive { name="mnormt"; version="1.5-2"; sha256="0k3mj7yyh599z93iw8zhfwvj6xjl4g2wzs3hdj1df7vbz1yynp8i"; depends=[]; };
+mnormt = derive { name="mnormt"; version="1.5-3"; sha256="1mw5fk4q5cnj2x2938di58179fr51l396qd61i6y5vwmcccj0kn9"; depends=[]; };
 modMax = derive { name="modMax"; version="1.0"; sha256="0p8vnlbw53lqbaq3819jhixq6ns2lwxf56w2md7y98rshf92h474"; depends=[gtools igraph]; };
 modTempEff = derive { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; };
 modeest = derive { name="modeest"; version="2.1"; sha256="0l4y7yhkgsxycdd2lck0g8g6k2r059hwlrrcpl46md3rva4jgbnp"; depends=[]; };
 modehunt = derive { name="modehunt"; version="1.0.6"; sha256="15rq1yyrjhsn2rlkyiqj36jvji635hy6jsih845mfxdpn4vnssa3"; depends=[]; };
+modelObj = derive { name="modelObj"; version="1.0"; sha256="0r4smak9hni9pzih4nzkpv3bq18acrsmmxs1a13wq3pgjfvkwa63"; depends=[]; };
 modelfree = derive { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; };
 modeltools = derive { name="modeltools"; version="0.2-21"; sha256="0ynds453xprxv0jqqzi3blnv5w6vrdww9pvd1sq4lrr5ar3k3cq7"; depends=[]; };
 modiscloud = derive { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date sp sfsmisc raster rgdal]; };
@@ -4586,7 +4671,7 @@ mombf = derive { name="mombf"; version="1.5.9"; sha256="0lc3rrmm2vsa4mg2zkbhp5dp
 momentchi2 = derive { name="momentchi2"; version="0.1.0"; sha256="02k4hzhqmqh7sx7dzb6w84fc1f5523md3284y4gvdbaw9y34ayk8"; depends=[]; };
 moments = derive { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; };
 mondate = derive { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
-mongolite = derive { name="mongolite"; version="0.2"; sha256="0lyq565c8xqxcm5sbg1rp3myppbw4hbqr3fiqzvcqpp72ar6ywvv"; depends=[jsonlite]; };
+mongolite = derive { name="mongolite"; version="0.4"; sha256="0jrjf9sh8y7n4lgy54y5pl9dw6z4c5qb903l0907finm749cb2w1"; depends=[jsonlite]; };
 monitoR = derive { name="monitoR"; version="1.0.3"; sha256="0g2dhyz3411pa6kcsmmi9x77ygvdrvas3k9ps0w2r69mfab785c6"; depends=[tuneR]; };
 monmlp = derive { name="monmlp"; version="1.1.2"; sha256="14x6xz07hg2c5n36rc314z66jqvgmicjxi2vsqyy91vwjxs9akrm"; depends=[]; };
 monomvn = derive { name="monomvn"; version="1.9-5"; sha256="1fh0c1234hb5f3rwy85i4rlzc3n1851q5mivckcjs2vdm9rz25mg"; depends=[pls lars MASS]; };
@@ -4596,7 +4681,7 @@ moonsun = derive { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fay
 mopsocd = derive { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; };
 morgenstemning = derive { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; };
 morse = derive { name="morse"; version="1.0.2"; sha256="044aljv48mfq6yj9i77yqf03qa4qqkncaalzhph3wr9w4jvxpxn5"; depends=[plyr]; };
-mosaic = derive { name="mosaic"; version="0.9.2-2"; sha256="1fx3nbndvvif1pwl013clh91s229yg7fnr0kp842jyx03hkcinba"; depends=[car dplyr lattice ggplot2 mosaicData MASS reshape2 plyr latticeExtra gridExtra ggdendro]; };
+mosaic = derive { name="mosaic"; version="0.10.0"; sha256="0hhln6kfxdk6z4rmi3378cs18ziwa5awi53ylnx5kva7f42m5jxr"; depends=[car dplyr lattice ggplot2 mosaicData lazyeval MASS reshape2 plyr readr latticeExtra gridExtra ggdendro]; };
 mosaicData = derive { name="mosaicData"; version="0.9.1"; sha256="0gxnw3x806pm97x1043qq3qf1cwn1z1771cayp3xlh5khn5bijk7"; depends=[]; };
 moult = derive { name="moult"; version="1.4"; sha256="0nglf7wijp2v66fpyh88glbn1glp8vvkbvpc1g6136bg6ahbbkkl"; depends=[Formula Matrix]; };
 mountainplot = derive { name="mountainplot"; version="1.0"; sha256="1hjmzig0s4vjlkpqhvf4v6z2gd8ljy14z5n1m9y21is9yp2cy6xf"; depends=[lattice]; };
@@ -4606,9 +4691,10 @@ move = derive { name="move"; version="1.4.496"; sha256="0p20c6rqxk299pqd10icq4a5
 mp = derive { name="mp"; version="0.2.0"; sha256="1vpjrx04yn1rdmrhj42rhc757cj02sghrv0i5jfm4k2y28ab7qh1"; depends=[svd Rcpp Rcpp RcppArmadillo]; };
 mpMap = derive { name="mpMap"; version="1.14"; sha256="0gmhg5ps8yli8699a5aw26skfbjxx4zpp0paqxxdc0zl28l0pdff"; depends=[gdata seriation qtl wgaim]; };
 mpa = derive { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; };
-mpath = derive { name="mpath"; version="0.1-17"; sha256="031mf0b32435y0cfar7zh9d1wd62ghqpspipin1cjhvnr2lyzw21"; depends=[MASS glmnet pscl numDeriv]; };
+mpath = derive { name="mpath"; version="0.1-18"; sha256="04d6lbsqjmr6pkyfpr2vw3rhv5hi044rx1n1isgw96j2c0f7dgzv"; depends=[MASS glmnet pscl numDeriv]; };
 mpcv = derive { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; };
 mph = derive { name="mph"; version="0.9"; sha256="11wcy23sv8x7aq6ky8wi0cq55yhjkkm9hn672qy803dwzzxv5y61"; depends=[]; };
+mplot = derive { name="mplot"; version="0.6.2"; sha256="0lnslv471abhfr245wx24ps3c97qs54i43ybpc1f8mqsxh0vxz3s"; depends=[leaps foreach bestglm doParallel plyr shinydashboard shiny googleVis]; };
 mpm = derive { name="mpm"; version="1.0-22"; sha256="0wijw8v0wmbfrda5564cmnp788qmlkk21yn5cp5qk8aprm9l1fnk"; depends=[MASS KernSmooth]; };
 mpmcorrelogram = derive { name="mpmcorrelogram"; version="0.1-3"; sha256="0qgzsh744002whh3v1hrxs1i0xnk9zgfgkdgx2f0ffj00vvnwr97"; depends=[vegan]; };
 mpmi = derive { name="mpmi"; version="0.41"; sha256="1iwdhvdglsamzq18f0r5mh0anrd4ffrddafdlbw16kr8jy0c8fdn"; depends=[KernSmooth]; };
@@ -4658,7 +4744,7 @@ multimark = derive { name="multimark"; version="1.1.4"; sha256="045lfgzxwz4m1y5g
 multinbmod = derive { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
 multinomRob = derive { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[rgenoud MASS mvtnorm]; };
 multipleNCC = derive { name="multipleNCC"; version="1.0"; sha256="13z6yq77h1r6kp8wgza58c6yp9a1gqm0w36x534mxbhcmingdw9f"; depends=[survival gam]; };
-multiplex = derive { name="multiplex"; version="1.5"; sha256="1sc4jnmh3lfpx92cpqd8phm09dn9xaq4qdq9301dccw3f0m260md"; depends=[]; };
+multiplex = derive { name="multiplex"; version="1.6"; sha256="052qjqkwf2sp4w7hv5gj9x3vhwjpa6k10sr969283z7aw6c1yb4g"; depends=[]; };
 multipol = derive { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; };
 multirich = derive { name="multirich"; version="2.0.2"; sha256="1lqc4np45p9ar9l8l1m5bdh98fsmhvzj8s0b2mcp9cqrvnhp1irc"; depends=[]; };
 multisensi = derive { name="multisensi"; version="1.0-8"; sha256="168g6hym5chz69wa3vfprg1m1c935wh7bi3gfz5calxiqf89mncz"; depends=[]; };
@@ -4679,7 +4765,7 @@ mvMORPH = derive { name="mvMORPH"; version="1.0.5"; sha256="184ywvgi2dz77ivl2g7s
 mvProbit = derive { name="mvProbit"; version="0.1-0"; sha256="0fnrlralydlsf9iphq385f8hpqigfmi8rafvgp443gygvpq5b6g0"; depends=[mvtnorm maxLik abind bayesm miscTools]; };
 mvSLOUCH = derive { name="mvSLOUCH"; version="1.1.5"; sha256="1cq1j4f1k0xhq2ncmji1a4p4m6h7k2afsr39abib4g3md902v0hp"; depends=[ouch ape numDeriv mvtnorm corpcor]; };
 mvShapiroTest = derive { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; };
-mvabund = derive { name="mvabund"; version="3.9.3"; sha256="1vr4rw8ivkhmzrpvz2k8v594cavrw88i7nqr9g1mar76d9mpchkx"; depends=[Rcpp MASS tweedie statmod Rcpp]; };
+mvabund = derive { name="mvabund"; version="3.10.4"; sha256="1hza09nghgz0iyfayqabf5d0yb6zqnvhwmprif6y9qix8jscilwl"; depends=[Rcpp MASS tweedie statmod]; };
 mvbutils = derive { name="mvbutils"; version="2.7.4.1"; sha256="1vs97yia78xh35sdfv5pj3ddqmy83qgamvyyh9gjg0vdznqhffzg"; depends=[]; };
 mvc = derive { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; };
 mvctm = derive { name="mvctm"; version="1.0"; sha256="1naxjh2k3vv4wlpzzx0y2zwvbn4kdqyls8a8qx6bz609ynzay5r9"; depends=[Formula nlme MNM quantreg Rfit]; };
@@ -4687,7 +4773,7 @@ mvcwt = derive { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6j
 mvglmmRank = derive { name="mvglmmRank"; version="1.0-2"; sha256="0gpp0ibgji86pxscqzcws0d1qn1ciqqvyfb0x2v18580r4cx8jv7"; depends=[Matrix numDeriv]; };
 mvinfluence = derive { name="mvinfluence"; version="0.6"; sha256="1cd5p6cl2zln8madjf3vsbmqlg4nsklzzy6ngdd5glj1a9qapd6c"; depends=[car heplots]; };
 mvmesh = derive { name="mvmesh"; version="1.0"; sha256="168s3n3ibiwdk0wys4kjj1xdpkz891rq5dv3lqf4pil83kbw8jw9"; depends=[rcdd rgl]; };
-mvmeta = derive { name="mvmeta"; version="0.4.5"; sha256="0faczanbz6i7794sqxm21a6v52cs5hrjjzdypdvi23bkl4mkxjrb"; depends=[]; };
+mvmeta = derive { name="mvmeta"; version="0.4.7"; sha256="1yadaviq66wdfs0dipn6gxk7jqvzwzjdr8lkfggdsl4vyyi9pwip"; depends=[]; };
 mvna = derive { name="mvna"; version="1.2-3"; sha256="1gwv17j6w9c38bqvnasv9kfigbdxiqkzwj89gqmkxgw715f9nnpp"; depends=[lattice]; };
 mvnfast = derive { name="mvnfast"; version="0.1.3"; sha256="1ghm6zdrh2ax8r4jin8gka0qjwcsixn5faclf17sr5bx7l5b62np"; depends=[Rcpp Rcpp RcppArmadillo BH]; };
 mvngGrAd = derive { name="mvngGrAd"; version="0.1.5"; sha256="0ir4pakfb2jq84rbfqix6rph8q6cgadjdn49rrdl4439b8hlsg8k"; depends=[]; };
@@ -4704,7 +4790,7 @@ mvtsplot = derive { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw
 mwa = derive { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem rJava MASS]; };
 mwaved = derive { name="mwaved"; version="1.1.1"; sha256="1hn6nbwawkizv9v4k98hm5lz94yha2fng76x0r9f804whmv1pz36"; depends=[Rcpp shiny Rcpp]; };
 mxkssd = derive { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; };
-myTAI = derive { name="myTAI"; version="0.0.2"; sha256="1qnnlf8c8qkcvl5sh9qd19drlfmjhmy3grxhlnlbz7v11zcbvah8"; depends=[Rcpp nortest fitdistrplus foreach doParallel dplyr Rcpp]; };
+myTAI = derive { name="myTAI"; version="0.1.0"; sha256="0qz2mm3ca5i93kz3pg8llpniix3vdy7mxz1n8k36iap09rbsrgmi"; depends=[Rcpp nortest fitdistrplus foreach doParallel dplyr Rcpp]; };
 mycobacrvR = derive { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; };
 mycor = derive { name="mycor"; version="0.1"; sha256="1ibcxl9v2d2mxpwad0rv5dw1j645rrg05f4aqvyhyd40hz9823mr"; depends=[lattice]; };
 myepisodes = derive { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; };
@@ -4714,21 +4800,22 @@ nCal = derive { name="nCal"; version="2015.3-3"; sha256="0vj6l8w29ymj1v18mb4qyw6
 nFCA = derive { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; };
 nFactors = derive { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[MASS psych boot lattice]; };
 nLTT = derive { name="nLTT"; version="1.1"; sha256="0hrrwil7vcym7zjbnzviw13p60y14w660vndvc2lm5lmhbb8nhcn"; depends=[ape coda deSolve]; };
-nabor = derive { name="nabor"; version="0.4.4"; sha256="0465wkyggz4665b2ph1qpyxsmak0arfzpxaci1r0lrf5ddyp0n6y"; depends=[Rcpp Rcpp RcppEigen BH]; };
-nadiv = derive { name="nadiv"; version="2.13.2"; sha256="1r63z08k46b6hryxracicsw1hr91x4pgk2x58c9nijdni4my7kkc"; depends=[Matrix]; };
+nabor = derive { name="nabor"; version="0.4.6"; sha256="0kd0h8n5yrn16vrfdchdiqzws05q0fm8z577p20dm18gdcs2vbxv"; depends=[Rcpp Rcpp RcppEigen BH]; };
+nadiv = derive { name="nadiv"; version="2.13.3"; sha256="0ph05a1yvphij41fgm4gnvijqni29n4jx2my6s0pd9l67bwa56c8"; depends=[Matrix]; };
 namespace = derive { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
 nanop = derive { name="nanop"; version="2.0-5"; sha256="0zdn2hgp516hcqpc2w2vzhhalcr05dlw539zj3afzi75w8rwb71z"; depends=[distrEx rgl]; };
 nasaweather = derive { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; };
-nat = derive { name="nat"; version="1.6.4"; sha256="1a4wr1378y8crmpk150gmzjc12wn4q9l6nbghddizyw9827b5my1"; depends=[rgl nabor igraph filehash digest nat_utils plyr yaml]; };
+nat = derive { name="nat"; version="1.6.6"; sha256="0jqpj9hrz8xqikl84b9nzi1hh82cmry18vpca7s8dl4824yadkrw"; depends=[rgl nabor igraph filehash digest nat_utils plyr yaml]; };
 nat_nblast = derive { name="nat.nblast"; version="1.5"; sha256="1slpk126fwgn90j3aazlf3pw2ij050dghc1yqadv6mjcj82qpm5i"; depends=[rgl nat nabor dendroextras plyr spam]; };
 nat_templatebrains = derive { name="nat.templatebrains"; version="0.4.1"; sha256="06vqnrwcara4ljkf5wbwqbsfx1ypd8xsv8pbrs5x6hyj5jxnnvaz"; depends=[rgl nat]; };
 nat_utils = derive { name="nat.utils"; version="0.4.2"; sha256="0k5bdqwrbq82bb9ld90ia7b4vjaczba20h231a129rkszsy6sz9v"; depends=[]; };
 naturalsort = derive { name="naturalsort"; version="0.1.2"; sha256="0m8a8z0n5zmmgpmpn5w87j2jfsz1igz3x133z3q25h8jlyaxy750"; depends=[]; };
-nbpMatching = derive { name="nbpMatching"; version="1.4.4"; sha256="0dnj97aj2x81yppw3rayxxaf2bb68l5x5f2852l5xmvpxb73w478"; depends=[Hmisc MASS]; };
+nbconvertR = derive { name="nbconvertR"; version="1.0"; sha256="1yjsw5aq68ya4k1nl2n6q5d5z5yzqskgnpj3gms67ha3dhmz78jr"; depends=[]; };
+nbpMatching = derive { name="nbpMatching"; version="1.4.5"; sha256="1bglrzhap9rar6c8c2c5009l1ljq44mys66jpafw4xyw2pq7djqg"; depends=[Hmisc MASS]; };
 ncappc = derive { name="ncappc"; version="0.1"; sha256="1145y9k718245mzs8q33mjwcln79dmiyawy771zrk3kpxhfb5985"; depends=[ggplot2 gridExtra scales gtable PerformanceAnalytics lattice knitr xtable reshape2]; };
 ncbit = derive { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; };
 ncdf = derive { name="ncdf"; version="1.6.8"; sha256="1vrbrrqij7p712wfrki09749yryzr9lg4p95yqvb0zzggqpw2snm"; depends=[]; };
-ncdf_tools = derive { name="ncdf.tools"; version="0.7.1.291"; sha256="149d89kim67q77w17afc5x7hkvmk05gfkaw6cpl583j2zxingify"; depends=[RNetCDF chron abind plotrix raster RColorBrewer JBTools]; };
+ncdf_tools = derive { name="ncdf.tools"; version="0.7.1.295"; sha256="1jgxivmg2gzvkn09n13i5xr1v0xcyp5ckhwxz6g5kdh9z2dkjhc2"; depends=[RNetCDF chron abind plotrix raster RColorBrewer JBTools]; };
 ncdf4 = derive { name="ncdf4"; version="1.13"; sha256="07s1lh5cg4fck7sapfka2skky70max1rfhimblnqf41phndxjcsv"; depends=[]; };
 ncdf4_helpers = derive { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[ncdf4 PCICt abind]; };
 ncf = derive { name="ncf"; version="1.1-5"; sha256="03nbmg9swxhpwrmfjsanp6fj5l2nw160sys70mj10a0ljlaf904z"; depends=[]; };
@@ -4740,12 +4827,12 @@ neariso = derive { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y
 needy = derive { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; };
 negenes = derive { name="negenes"; version="1.0-1"; sha256="0g8m3idjm24cf9b1wngw2pv1axgnv9mk5wqs78zgwvn0m67ypsiz"; depends=[]; };
 neldermead = derive { name="neldermead"; version="1.0-10"; sha256="1snavf90yb12sydic7br749njbnfr0k7kk20fy677mg648sf73di"; depends=[optimbase optimsimplex]; };
-neotoma = derive { name="neotoma"; version="1.2-0"; sha256="0mb7b4qncn63nppq3hxl3a6hgipb413rygsm9qhira61ysnay51m"; depends=[RJSONIO RCurl plyr reshape2]; };
+neotoma = derive { name="neotoma"; version="1.3.0"; sha256="0a5fmas441zl479vfndgyhanp5iivzdp5zqrpnr3pvgf3wfdnppd"; depends=[RJSONIO RCurl plyr reshape2]; };
 nephro = derive { name="nephro"; version="1.1"; sha256="06lxkk67n5whgc78vrr7gxvnrz38pxlsj4plj02zv9fwlzbb9h6p"; depends=[]; };
-nestedRanksTest = derive { name="nestedRanksTest"; version="0.1"; sha256="12pqxldyzy2i2gc575rx67zdfb8c9j0fv400nw509cwx5w6ya35x"; depends=[]; };
+nestedRanksTest = derive { name="nestedRanksTest"; version="0.2"; sha256="0r08jp8036cz2dl1mjf4qvv5qdcvsrad3cwj88x31xx35c4dnjgj"; depends=[]; };
 netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[kernlab Matrix ROCR igraph samr]; };
 netassoc = derive { name="netassoc"; version="0.4.3"; sha256="153zgnmk9qjcxhfdy9g1fkgjx0vpyv55gmj4spk664igvw6kicf3"; depends=[igraph]; };
-netgen = derive { name="netgen"; version="1.0"; sha256="01j5s80k658wcp8ml2kyf10dvajp4crrxcad65rs03grak1q5mkv"; depends=[BBmisc mvtnorm lhs ggplot2 lpSolve checkmate]; };
+netgen = derive { name="netgen"; version="1.1"; sha256="0wbsssskhih6fyb0xfpnd3sjp25z8h0jyy3437ykgh7g24hh0i1z"; depends=[BBmisc mvtnorm lhs checkmate ggplot2 lpSolve igraph stringr]; };
 netgsa = derive { name="netgsa"; version="2.0"; sha256="04id2wcrmi0lqvn4a8qhqkc3z076b8xd7jhw9hsmaz21g9cxdfx8"; depends=[cvTools corpcor glasso glmnet igraph]; };
 netmeta = derive { name="netmeta"; version="0.7-0"; sha256="0nsy817bj3fh4sz632pljyjn7jphg9w389hhdcyjvkb7i43c9v5c"; depends=[meta magic]; };
 nets = derive { name="nets"; version="0.1"; sha256="0zshiavdi1z8mq6q93vsyb5wx5nq37qln9gcyvamvi2pgy5xg4k2"; depends=[igraph]; };
@@ -4772,7 +4859,7 @@ nice = derive { name="nice"; version="0.4"; sha256="1alq8n8pchn9v0fvwrifdisazkh5
 nicheROVER = derive { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; };
 nlADG = derive { name="nlADG"; version="0.1-0"; sha256="0nvd5hzd1p81jwx5p7js86wblgg615vdnpbvy5rhmhf1ig583z1b"; depends=[ggm]; };
 nlWaldTest = derive { name="nlWaldTest"; version="1.0.1"; sha256="1rwpkkddivpcamhsp22nmy5gz2006y9kbdzj8lhh20s1vsyhn2b3"; depends=[stringr numDeriv]; };
-nleqslv = derive { name="nleqslv"; version="2.7"; sha256="1livdnwrs8vzsbhvjqf3rmnanaywsr464jb6988s6pmyc2b0q9zp"; depends=[]; };
+nleqslv = derive { name="nleqslv"; version="2.8"; sha256="1jkf02mcz16d8h8b7h5m13lpx6z2shpap5vncapszwa9js6vps67"; depends=[]; };
 nlme = derive { name="nlme"; version="3.1-120"; sha256="1ji8nrf714nf18by9g7k4czkgnj1cq464pvjv195c5fnhwhmpmjc"; depends=[lattice]; };
 nlmeODE = derive { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve nlme lattice]; };
 nlmeU = derive { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; };
@@ -4790,11 +4877,12 @@ nmcdr = derive { name="nmcdr"; version="0.3.0"; sha256="1557pdv7mqdjwpm6d9zw3zfb
 nnet = derive { name="nnet"; version="7.3-9"; sha256="1z1lhi35w5l7l645d764w9h4aiv6hapjv8fwb9b51b36vyg1r0zg"; depends=[]; };
 nnlasso = derive { name="nnlasso"; version="0.2"; sha256="1q1psc6s5xw2nsz09q20n5rksq07gx21q9ap22dr7haln5jrvpzr"; depends=[]; };
 nnls = derive { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; };
-nodeHarvest = derive { name="nodeHarvest"; version="0.6"; sha256="16151rwmqkf5vlyrlxlirz8s0nimxppx1f7f4pwfxi9vipwph125"; depends=[quadprog randomForest]; };
+nodeHarvest = derive { name="nodeHarvest"; version="0.7-2"; sha256="18lmp7mly3ad95yz2cv330bg7y9fwldvagnzvjx0zgsx81f3bncr"; depends=[quadprog randomForest]; };
 nodiv = derive { name="nodiv"; version="1.0.3"; sha256="0fwx7f30qxfnhgzn5lrphwv0clvap3w887xf6316lbr86sjw4x3v"; depends=[picante raster ape sp vegan]; };
 noia = derive { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; };
+nomclust = derive { name="nomclust"; version="0.91.1010"; sha256="02jpzcjclm22bjg59wj4490vh2rp9ma1vqxdnwmppyb478558fz1"; depends=[cluster dummies]; };
 noncensus = derive { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; };
-nonlinearTseries = derive { name="nonlinearTseries"; version="0.2.1"; sha256="1pq93g25arnc68kyvv6ymywdvbqv6620dvqzv1l43c1xssw364bc"; depends=[Matrix rgl tseries TSA]; };
+nonlinearTseries = derive { name="nonlinearTseries"; version="0.2.2"; sha256="1p78a9nqn53v9r885p4lg47vqlryw7335pxrid191xqabxxs3ba7"; depends=[Matrix rgl tseries TSA Rcpp Rcpp]; };
 nonnest2 = derive { name="nonnest2"; version="0.2"; sha256="0z2ihnhphf6c9cklj1l81kqgyz1h9wl2ziwx7s0ssn3dfgw4fnp7"; depends=[CompQuadForm mvtnorm sandwich]; };
 nonparaeff = derive { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[lpSolve gdata Hmisc rms geometry psych pwt]; };
 nonrandom = derive { name="nonrandom"; version="1.42"; sha256="0icm23hw593322z41wmjkwxqknh2pa9kpzbrch7xw1mhp93sd5ll"; depends=[lme4]; };
@@ -4809,6 +4897,7 @@ normwhn_test = derive { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40
 nortest = derive { name="nortest"; version="1.0-3"; sha256="0kih1r703hjw2vha2hx13vm3fvbyra7v229khgv3hxxfppb7jis8"; depends=[]; };
 nose = derive { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; };
 notifyR = derive { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; };
+novelist = derive { name="novelist"; version="1.0"; sha256="0wzx0vkqvl9sfhbbrzylsxhm3qmjj5w8sy5w6gvd104fn84d49yk"; depends=[]; };
 noweb = derive { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; };
 np = derive { name="np"; version="0.60-2"; sha256="0zs1d4mmgns7s26qcplf9mlz9rkp6f9mv7abb0b9b2an23y6gmi5"; depends=[boot cubature]; };
 npIntFactRep = derive { name="npIntFactRep"; version="1.2"; sha256="0fx5923wdzz6122bbyil5imwbhgwlm50wcrscy78qdx8n4n07rv8"; depends=[ez plyr]; };
@@ -4849,12 +4938,15 @@ obs_agree = derive { name="obs.agree"; version="1.0"; sha256="191xshnrncjqzwd2rd
 obsSens = derive { name="obsSens"; version="1.3"; sha256="1vfm1mzsycwkqa39vf3fcdv1s6adps9hw1rxlvl8v9kq746hcabw"; depends=[]; };
 oc = derive { name="oc"; version="0.95"; sha256="1zmy34fsqcd4rq0v72r514k6gm3jmf9a5zv4m6kj09hl89xvqsci"; depends=[pscl]; };
 occ = derive { name="occ"; version="1.0"; sha256="1rpgq6mqrdzz52ln897f5k8yyz5i14s3lxqmy3nwsxf3q2bdf3yh"; depends=[]; };
-oce = derive { name="oce"; version="0.9-14"; sha256="03vp83504pwjk6wbx5l4s31qvxfyd3g38snvfvp8b0pvnlv8f2fh"; depends=[mapproj]; };
+oce = derive { name="oce"; version="0.9-17"; sha256="0j1sj9qlcg0yrdhpqinrpaa8dv4d8c8hjl48028x75frsc784pip"; depends=[gsw]; };
 ocean = derive { name="ocean"; version="0.2-4"; sha256="1554iixfbw3k6w9xh3hgbiygszqvj5ci431cfmnx48jm27h2alqg"; depends=[ncdf4 proj4]; };
-ocedata = derive { name="ocedata"; version="0.1.2"; sha256="0kic6m09a66zc5fxh9fkqk7rp3mnpf0p6i1qy2irh3bj9ccmdkvk"; depends=[]; };
+ocedata = derive { name="ocedata"; version="0.1.3"; sha256="0lzsyaz8zb6kiw86fnaav2g2wfdhyicxvm81ly5a9z4mjch3qj02"; depends=[]; };
+odds_converter = derive { name="odds.converter"; version="1.1"; sha256="0x57hrb54pvk1prxl87yz3mwvxf3fxranzg706vdiwkcnjc4damm"; depends=[]; };
+odeintr = derive { name="odeintr"; version="1.3"; sha256="12y5hr6f7bj3aqj4gd0hlj495c5163jn0liksspk5jpqcmpsgdg3"; depends=[Rcpp Rcpp BH]; };
 odfWeave = derive { name="odfWeave"; version="0.8.4"; sha256="1rp9j3snkkp0fqmkr6h6pxqd4cxkdfajgh4vlhpz56gr2l9j48q5"; depends=[lattice XML]; };
 odfWeave_survey = derive { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; };
 oem = derive { name="oem"; version="1.02.1"; sha256="0z9k0jhpp5dayyin6v8p26rgl8s983hnpsk195c9z458i7nbmrpd"; depends=[Rcpp Rcpp RcppArmadillo]; };
+oglmx = derive { name="oglmx"; version="1.0.2"; sha256="1yln1ysk19mxnb0aq74xgqj0qqipqg3qbczyhdygakjd4v4ndvhg"; depends=[maxLik]; };
 okmesonet = derive { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; };
 omd = derive { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; };
 oncomodel = derive { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; };
@@ -4871,11 +4963,12 @@ openintro = derive { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795v
 openssl = derive { name="openssl"; version="0.4"; sha256="1gfhzxjjssid2z8xmw3vnnd4gj2f6a3zzazkhpg9b1ymmcp9b288"; depends=[]; };
 opentraj = derive { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[plyr maptools openair raster rgdal reshape doParallel foreach sp]; };
 openxlsx = derive { name="openxlsx"; version="2.4.0"; sha256="1jzq3lz9qivsprmn8aibwiidcwsanlnfpmsz2ccw3650gdgk3zdk"; depends=[Rcpp Rcpp]; };
-operator_tools = derive { name="operator.tools"; version="1.3.0"; sha256="0y5f0ifj4gaq03gm44vdvslcs7lglk1p8kq47mdc0gc1yfa6l00c"; depends=[]; };
+operator_tools = derive { name="operator.tools"; version="1.4.4"; sha256="1ridxi3pbylb4flfgn371n1v9796rnd1ndxhh6ijyzpysqqmwi08"; depends=[]; };
 operators = derive { name="operators"; version="0.1-7"; sha256="1qik9ihv5blz77bzsnrslf665ndpa8vp3xldqsgvs4gr5bg5algw"; depends=[]; };
 ops = derive { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; };
 optAUC = derive { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; };
 optBiomarker = derive { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[rpanel rgl MASS randomForest e1071 ipred msm Matrix]; };
+optCluster = derive { name="optCluster"; version="1.0.0"; sha256="1qpymgdy4pcl5isz88m2bb734c2c2qlh77c0i8c1wy4hkrx5ndpl"; depends=[clValid RankAggreg mclust cluster gplots kohonen MBCluster_Seq]; };
 optR = derive { name="optR"; version="1.1.1"; sha256="1lr5n0g21jayb27b2j8zh16f1k28avzg7k2mwyc7rjhhxv8k9w1j"; depends=[]; };
 optextras = derive { name="optextras"; version="2013-10.28"; sha256="1sm025xwrpm5c63l4kiqfndxb7rwq2bcmidy4k2b24g5a8x7cpfv"; depends=[numDeriv]; };
 optiRum = derive { name="optiRum"; version="0.35"; sha256="0hfby5791jmzpacd8a4jj45b6sr5fph9g24kv6sr9db35y07ca36"; depends=[data_table ggplot2 AUC knitr plyr scales stringr XML]; };
@@ -4894,11 +4987,12 @@ orca = derive { name="orca"; version="1.1"; sha256="138qqjklwd3g4dfg9j2438kzpsdc
 orclus = derive { name="orclus"; version="0.2-5"; sha256="0kkxhyqjxib862npinzf3mipqg5imgscdmb5wqm8wf2j2mbislsx"; depends=[]; };
 orcutt = derive { name="orcutt"; version="1.1"; sha256="0hz7aw4jpf4l7ihj4bjnjv1m8ynr71n4l12x046qj8y7mrnl9p4k"; depends=[]; };
 ordBTL = derive { name="ordBTL"; version="0.8"; sha256="09x3zfmss4fsh3rjghgmpv8y34dnkz4mw696b3k3nvlgk55a1423"; depends=[caret VGAM wikibooks gtools]; };
-ordPens = derive { name="ordPens"; version="0.2-1"; sha256="1kcxjfr2ncnqg293ph509hpgzzn5s4ih2kd8agl335zlxcksz3fp"; depends=[grplasso mgcv RLRsim]; };
+ordPens = derive { name="ordPens"; version="0.3-1"; sha256="0yzf3qzi4p7xqimihjvr0wkdvj3sy9n3wc86bf4bjbavniq6m69r"; depends=[grplasso mgcv RLRsim]; };
 orddom = derive { name="orddom"; version="3.1"; sha256="165axs15fvwhrp89xd87l81q3h2qjll1vrwcsap645cwvb85nwsh"; depends=[psych]; };
 orderbook = derive { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[lattice hash]; };
 orderedLasso = derive { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8xscvambcb1y70gqqi5819a2gxh02h4pnyjn8axql"; depends=[Matrix Iso quadprog ggplot2 reshape2]; };
 ordinal = derive { name="ordinal"; version="2015.1-21"; sha256="1vhkxdsapmah09vzy6xd00kb1ck02vbiyamv5ccflxdbdmch1q1y"; depends=[ucminf MASS Matrix]; };
+ordinalCont = derive { name="ordinalCont"; version="0.4"; sha256="1inms74l4zx6r526xd0v79v18bcqa76xwsgfvap0fizyv2dvgpim"; depends=[fastGHQuad boot ucminf]; };
 ordinalgmifs = derive { name="ordinalgmifs"; version="1.0.2"; sha256="1rbn2mb516hdr0chny1849m1aq0vb0vmr636b4fp914l5zh75vgi"; depends=[]; };
 ore = derive { name="ore"; version="1.1.0"; sha256="1khgjd5fl8vi9n9pj4nbai6fbfbiwzc121a0gf7dfk727iid8whq"; depends=[]; };
 orgR = derive { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[ggthemes ggplot2 lubridate data_table stringr]; };
@@ -4931,7 +5025,7 @@ pacbpred = derive { name="pacbpred"; version="0.92.2"; sha256="13p405vh9rf1r5idx
 pack = derive { name="pack"; version="0.1-1"; sha256="0x4p8clwp49s2y67y7in530xwhjngnqwagf9xnyb1jp0z3myd3r7"; depends=[]; };
 packClassic = derive { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0sq54q9kj0kpahp6my246jy3bivgy09g5fjk0dmkj"; depends=[]; };
 packHV = derive { name="packHV"; version="1.8"; sha256="0dr2picjd7mm633vw29524f3n4jpyillpzi9cg7yc2cymxnrgvyg"; depends=[survival WriteXLS]; };
-packS4 = derive { name="packS4"; version="0.9.1"; sha256="01kkw5g3xcn9hhfglmfvwsryid0w4vw9azh6as8l8d5i1xjyp9k7"; depends=[]; };
+packS4 = derive { name="packS4"; version="0.9.3"; sha256="0kkh4lfdbr2ydyfpymwrdkms1d4mj8430p6vxvj5wrgl4vh85gwd"; depends=[codetools]; };
 packdep = derive { name="packdep"; version="0.3.1"; sha256="1827h9xcvgdad9nwz9k3hi79jc33yr7dnxy4xn2frp3fdh4q81ll"; depends=[igraph]; };
 packrat = derive { name="packrat"; version="0.4.3"; sha256="0sfv7vl9afvv2rpqk39hbrvhq6z54ilqjrff4j3parsfqvg7gaqf"; depends=[]; };
 pacman = derive { name="pacman"; version="0.3.0"; sha256="10fjkr4zjcx7cyfmnpdnb96swxizhdqhvzgb5crymrafxqvg00c7"; depends=[devtools]; };
@@ -4948,21 +5042,25 @@ paleobioDB = derive { name="paleobioDB"; version="0.3"; sha256="1vcfssi6w0m2wd2s
 paleofire = derive { name="paleofire"; version="1.1.6"; sha256="1fzmnc4ywhqb6sr3cclsqy6y9v27j69bxszlrrgbnqb0kyg28rd7"; depends=[GCD locfit raster ggplot2 plyr rgdal lattice]; };
 paleotree = derive { name="paleotree"; version="2.4"; sha256="1rrsxll5qcvr9a96wg5bdljvyy7zy26zd9f0b17xswmp77gxmahb"; depends=[ape phangorn]; };
 palinsol = derive { name="palinsol"; version="0.92"; sha256="1jxy3qx8w1r8jwgdavf37gqjjqpizdqk218xcc7b77xi8w52vxpg"; depends=[gsl]; };
+palr = derive { name="palr"; version="0.0-4"; sha256="0rcb01lpi8zapnml1spx4ixxwbq9qh42sisqzrg7gxrkcjrbqxgl"; depends=[]; };
 pamctdp = derive { name="pamctdp"; version="0.3.1"; sha256="1fnadgfd2ikis49j9zl2ijj8gim8lpbygwxjj6ri9jyrc1qmj9jb"; depends=[ade4 xtable FactoClass]; };
 pamm = derive { name="pamm"; version="0.7"; sha256="02py4zcymmwnlpsvha5cgc4ik8fp0gbsg86s5q7z5fl3ma3g669j"; depends=[lme4 mvtnorm gmodels]; };
 pampe = derive { name="pampe"; version="1.1.1"; sha256="1ha4jbmi2j35i375ziv4rbs4rijlp6fxwvb0vfr2905d1vl3cbap"; depends=[leaps]; };
 pamr = derive { name="pamr"; version="1.55"; sha256="1hy3khb0gikdr3vpjz0s245m5zang1vq8k93g7n9fq3sjfa034gd"; depends=[cluster survival]; };
 pan = derive { name="pan"; version="1.3"; sha256="08g0arwwkj9smkzyh6aicfrqvknag3n2xl55f7q7ghj09fhwg1br"; depends=[]; };
-pander = derive { name="pander"; version="0.5.1"; sha256="0m95vnrzw9v4cq52kn3a605gbk1qd24ivh7aywhk1lh0imlk7i85"; depends=[digest Rcpp Rcpp]; };
+pander = derive { name="pander"; version="0.5.2"; sha256="0zs2c00dr0vph9d4par3zcisnyqa98rqym8fpya02ka28qajjiia"; depends=[digest Rcpp Rcpp]; };
 panelAR = derive { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; };
 panelaggregation = derive { name="panelaggregation"; version="0.1"; sha256="19426hab4rvgn8k2c7x327k4ymihas59jbys0nmrfgg074x0xdnm"; depends=[data_table]; };
+papeR = derive { name="papeR"; version="0.6-1"; sha256="1h3mfapn31qphaly01j5pw2ci65g4z0wh4m1wf5r808cspn0mya0"; depends=[car gmodels]; };
 parallelMCMCcombine = derive { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; };
-parallelMap = derive { name="parallelMap"; version="1.2"; sha256="1rd4q644xml29nj4mybgh8cr0h4wsadsf2wlyzppx5hg5yi27ff2"; depends=[BBmisc checkmate]; };
+parallelMap = derive { name="parallelMap"; version="1.3"; sha256="026d018fr2a43cbh8bi2dklzr9fxjzdw5qyq84g2i18v5ibr6bd5"; depends=[BBmisc checkmate]; };
+parallelSVM = derive { name="parallelSVM"; version="0.1-8"; sha256="19hmagv95nx8aw8xylk5vvpxw9a4fsa68r9q0x6irhq50wmah93r"; depends=[e1071 foreach doParallel]; };
 parallelize_dynamic = derive { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; };
 paramlink = derive { name="paramlink"; version="0.9-6"; sha256="0pazllkjbqzvl9vmpvr67lkcsd960mipcd1p1nf00y8hknrwh7qp"; depends=[kinship2 maxLik]; };
 paran = derive { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; };
 parboost = derive { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[mboost party iterators plyr caret glmnet doParallel]; };
 parcor = derive { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[MASS glmnet ppls Epi GeneNet]; };
+parfm = derive { name="parfm"; version="2.5.8"; sha256="05bzmm5ahaip5apsv84fbqy8bag9pkkfsxvqw1cbcvlbr2zyxfgp"; depends=[survival eha msm]; };
 parfossil = derive { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq5j0r3jnnrzw1q412dbvmakipyw2yx2l2s7jn"; depends=[fossil foreach]; };
 parma = derive { name="parma"; version="1.5-1"; sha256="0qrq3bx0amri9b3s6bym4znnk140jjd2abnvqyihaj4bf2glbl0g"; depends=[nloptr slam Rglpk quadprog FRAPO corpcor]; };
 parmigene = derive { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; };
@@ -4973,14 +5071,15 @@ partialOR = derive { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpx
 partitionMap = derive { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; };
 partitionMetric = derive { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; };
 partitions = derive { name="partitions"; version="1.9-15"; sha256="0jgpknm4zah50w9i3fbq2f1whm4hywm2j72vxc3ignx1snx2z0gs"; depends=[gmp polynom]; };
+partools = derive { name="partools"; version="1.0.1"; sha256="0id6fw582ag0zwkp0yjm5vfcd2gv1bsa3zzhfx2fgiaarhnhzmda"; depends=[]; };
 partsm = derive { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
-party = derive { name="party"; version="1.0-20"; sha256="10d4hyzc8icgb51k4dkc1bwprky7sg35vpa9s3jcl9ifw6na0bgm"; depends=[mvtnorm modeltools strucchange survival coin zoo sandwich mvtnorm]; };
+party = derive { name="party"; version="1.0-21"; sha256="10kk3mw9kbkzhh5qacmq404d1r0scin2vc33wsf152lgc9fhs1xx"; depends=[mvtnorm modeltools strucchange survival coin zoo sandwich mvtnorm]; };
 partykit = derive { name="partykit"; version="1.0-1"; sha256="12ja72nginkzl9zrpiidqwrih2zgwxksdkhbw7hbdjbsr4zb7q62"; depends=[survival]; };
 parviol = derive { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; };
 pass = derive { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[MASS lars ncvreg]; };
 pastecs = derive { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5z5j65lvr92ghpsk9f1ifm94dzjhi6d22i"; depends=[boot]; };
 pastis = derive { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[caper ape]; };
-patchDVI = derive { name="patchDVI"; version="1.9.1601"; sha256="0vv1rmmd78n2r14dsl9fx25v6ym9mav557ya0aagr548wqcajf0m"; depends=[]; };
+patchDVI = derive { name="patchDVI"; version="1.9.1616"; sha256="1akdlzw8v2p1zz09bm88d63jyxj7fv5h50p459p9ml4yc816xvji"; depends=[]; };
 patchPlot = derive { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; };
 patchSynctex = derive { name="patchSynctex"; version="0.1-2"; sha256="1ssjs4mcsjad7g0yfi5sxwfyywsziry81rzwb4sly3afw8g538p9"; depends=[stringr]; };
 pathClass = derive { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[svmpath kernlab ROCR igraph lpSolve]; };
@@ -4988,7 +5087,7 @@ pathdiagram = derive { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95
 pathmox = derive { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; };
 pathological = derive { name="pathological"; version="0.0-6"; sha256="1a6a9q15nk8rcpyz5xpndq0gbdv7y2iq4jgqiv7sgd3j1agh26c6"; depends=[assertive plyr stringr]; };
 pauwels2014 = derive { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; };
-pavo = derive { name="pavo"; version="0.5-1"; sha256="189kshc5dm02qv0rm1dlcxrhvga4yhlkn3yyj3rjhmrags4rmwcb"; depends=[rgl rcdd mapproj geometry]; };
+pavo = derive { name="pavo"; version="0.5-2"; sha256="13iy9dmg19v0gqg12224ci0zq8fa0ap2i0is8v0rkfp19wzy0ryg"; depends=[rgl geometry mapproj rcdd]; };
 pawacc = derive { name="pawacc"; version="1.2.1"; sha256="1l2wn69ynr5mza04a5mmzwzigqac8k9xkiaw7sdqv5hn9y7x3sj9"; depends=[SparseM]; };
 pbapply = derive { name="pbapply"; version="1.1-1"; sha256="1dshpnnmq1g2v223qy7pgbxydy9sqj04zwqxvzylm4mqc91ks4n2"; depends=[]; };
 pbatR = derive { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[survival rootSolve]; };
@@ -5005,14 +5104,15 @@ pbo = derive { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf
 pbs = derive { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
 pcIRT = derive { name="pcIRT"; version="0.1"; sha256="0vfbbmnp4jyrbi5d9gz1krh707aazbrqfcgc3rjrwwyjld11wyzn"; depends=[combinat]; };
 pca3d = derive { name="pca3d"; version="0.3"; sha256="01nc4p68r7bnly18q8rkhnnj6vq9mwbb5hhdcblan6nhhlzhnld0"; depends=[rgl]; };
+pcaBootPlot = derive { name="pcaBootPlot"; version="0.1.0"; sha256="0h5i5qh4lhnhh7n9k1map10gvw70f7576gnxhjjc6l03sngm0yp7"; depends=[RColorBrewer]; };
 pcaL1 = derive { name="pcaL1"; version="1.3"; sha256="026cgi812kvbkmaryd3lyqnb1m78i3ql2phlvsd2r691y1j8w532"; depends=[]; };
 pcaPP = derive { name="pcaPP"; version="1.9-60"; sha256="1rqq4zgik7cgnnnm8il1rxamp6q9isznac8fhryfsfdcawclfjws"; depends=[mvtnorm]; };
-pcalg = derive { name="pcalg"; version="2.0-10"; sha256="1ph5n3hlxni039phvhr9r2nj62c4mw9zmf0857sqzv434hizdfzi"; depends=[abind igraph ggm corpcor robustbase vcd Rcpp bdsmatrix sfsmisc Rcpp RcppArmadillo BH]; };
+pcalg = derive { name="pcalg"; version="2.2-0"; sha256="1cgir5h9g8v3kjmdqnnjsc0z1f8wl3flnnxnk9y7km82x5pby0m7"; depends=[abind igraph ggm corpcor robustbase vcd Rcpp bdsmatrix sfsmisc fastICA clue gmp Rcpp RcppArmadillo BH]; };
 pcg = derive { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; };
-pcnetmeta = derive { name="pcnetmeta"; version="2.1"; sha256="00vrlkzc6d5xgs4my8qr6f9skyjdi3i529i9sfmdcwwrwp2spr24"; depends=[rjags coda]; };
+pcnetmeta = derive { name="pcnetmeta"; version="2.2.1"; sha256="0y4sn1aby38c458667fsy2ndq64i8kknmzdc32mbvzd530p1yxai"; depends=[rjags coda]; };
 pcrcoal = derive { name="pcrcoal"; version="1.1"; sha256="17mm13xpmghachiqr7v2691jk39mbfsadpg028gs3iiwmh0pksa0"; depends=[ape ggplot2 phylosim]; };
 pcse = derive { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; };
-pdR = derive { name="pdR"; version="1.2"; sha256="0dgw6i623a6w18q54b46fnbp38941hqdvjpcnxrbqwvcgk024pr6"; depends=[]; };
+pdR = derive { name="pdR"; version="1.3"; sha256="0y81nlvq5vwf6021m5ns6j4l44c5456jkbs2x9y7jfkw6r3v2ddf"; depends=[]; };
 pdc = derive { name="pdc"; version="1.0.2"; sha256="0d7p65rkwrh39njhszdrbv25z4jz27746y1qyhqmhkxmvkx6g1fl"; depends=[]; };
 pdfCluster = derive { name="pdfCluster"; version="1.0-2"; sha256="0kbci54dlzn736835fh18xnf2pmzqrdmwa3jim29xcnwa1r2gklb"; depends=[geometry]; };
 pdfetch = derive { name="pdfetch"; version="0.1.6"; sha256="1j3fdjnmfj84pfd5bc37ssbs83ya3ma0hj5iy1a0bg9wb5xqap13"; depends=[httr zoo xts XML lubridate jsonlite reshape2]; };
@@ -5026,8 +5126,8 @@ pedantics = derive { name="pedantics"; version="1.5"; sha256="0m5jxzkf1pf657q2kl
 pedgene = derive { name="pedgene"; version="2.1"; sha256="0nmp1s0i5b4h45p3f4rvvixjz8sgv56as3c85rvv3a8xwfd1gcxq"; depends=[Matrix CompQuadForm survey kinship2]; };
 pedigree = derive { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[Matrix HaploSim reshape]; };
 pedigreemm = derive { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; };
-pedometrics = derive { name="pedometrics"; version="0.4-1"; sha256="0pzkkjp126g64q6avlk7bqrhcl6y5zz8vmfrq68k4yck34c1gn16"; depends=[car fields gstat lattice latticeExtra MASS moments plyr pbapply Rcpp sp spsurvey xtable Rcpp]; };
-pegas = derive { name="pegas"; version="0.7"; sha256="1vhlg40jz938h63isi5c8cjfqrwnh5miyl5kg2hbybw9awlp6gjj"; depends=[ape adegenet]; };
+pedometrics = derive { name="pedometrics"; version="0.6-2"; sha256="137685gyd7k9vpjnsy6h280cdbl15bchrizfnalnz6nizi0q85lj"; depends=[car gstat Hmisc lattice latticeExtra MASS moments plyr pbapply Rcpp sp spsurvey xtable Rcpp]; };
+pegas = derive { name="pegas"; version="0.8"; sha256="0074r6vsnvdc0gkqhb3cb4dybpgp4ryf38lrfkk8vrs3y9gb7hdh"; depends=[ape adegenet]; };
 penDvine = derive { name="penDvine"; version="0.2.2"; sha256="054vw99z68pk0bi4yzdmvx13x8n75sj2371l8w2yady1lqjj4qi7"; depends=[lattice quadprog TSP fda Matrix]; };
 penMSM = derive { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp Rcpp]; };
 penalized = derive { name="penalized"; version="0.9-45"; sha256="0svmhsh0lv3d571jyhk73zd9slcd6xnp3p0l1ijab9gl2rjhlzz5"; depends=[survival]; };
@@ -5045,14 +5145,15 @@ performanceEstimation = derive { name="performanceEstimation"; version="1.0.0";
 perm = derive { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; };
 permGPU = derive { name="permGPU"; version="0.14.6"; sha256="1h01nfq8hn7i29xanma70q6s5mj83znbb2lg9x7bjgdrgj38vy2m"; depends=[RUnit foreach survival]; };
 permtest = derive { name="permtest"; version="1.2"; sha256="1sciyjs840h004zg8bwclq0j0n22anvjvx3fz62y4dzblrynhrci"; depends=[]; };
-permute = derive { name="permute"; version="0.8-3"; sha256="0zc3b3cl7q7y9pglc690ldg6p7bl7d1h7xkwnqqmvrpn7cq29rdb"; depends=[]; };
+permute = derive { name="permute"; version="0.8-4"; sha256="1z5pmq9dy93rpsdb73waqrqmnvvi9ygx1v5l81a2n1j1kb4lmksv"; depends=[]; };
 perry = derive { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; };
 persiandictionary = derive { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; };
+perspectev = derive { name="perspectev"; version="1.0"; sha256="1qqhja7vqji9313dxxy1a9a50h5zxwxgc5s16lssczjachkqaibk"; depends=[ggplot2 foreach ape doParallel mapproj boot sp]; };
 perturb = derive { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr4fr9r07zyn97v8a1jqz3g9njza983la"; depends=[]; };
 pesticides = derive { name="pesticides"; version="0.1"; sha256="1w180hqqav0mh9sr9djj94sf55fzh4r373a7h08a2nz9nyjpq09w"; depends=[]; };
 pez = derive { name="pez"; version="1.0-0"; sha256="0d1npc2w6gzi4ki7gwqa0f4sklz0sml8q0cmgb77hpvgrny47mk3"; depends=[ape caper picante quantreg mvtnorm vegan ade4 apTreeshape FD plotrix Matrix]; };
 pgam = derive { name="pgam"; version="0.4.12"; sha256="0vhac2mysd053bswy3xwpiz0q0qh260hziw6bygpf83vkj94qf2v"; depends=[]; };
-pgirmess = derive { name="pgirmess"; version="1.6.0"; sha256="0b2sxk2q4cylsb5ch9bq1grdifp2sww7bv1bgl9zn0j6h611gif5"; depends=[boot nlme rgdal sp spdep splancs]; };
+pgirmess = derive { name="pgirmess"; version="1.6.2"; sha256="02i2jp345hyzz0s3rfxn3rpx0yl1aw6r0r0zaw471j5l9m6s85kw"; depends=[boot maptools rgdal rgeos sp spdep splancs]; };
 pglm = derive { name="pglm"; version="0.1-2"; sha256="1arn2gf0bkg0s59a96hyhrm7adw66d33qs2al2s0ghln6fyk8674"; depends=[maxLik plm statmod]; };
 pgmm = derive { name="pgmm"; version="1.2"; sha256="0f0wdcirjyxzg2139c055i035qzmhm01yvf97nrhp69h4hpynb2n"; depends=[]; };
 pgs = derive { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; };
@@ -5079,7 +5180,7 @@ phylin = derive { name="phylin"; version="1.0"; sha256="10pbs4adsyp43i89jb3xi0m5
 phyloTop = derive { name="phyloTop"; version="1.1.1"; sha256="046myyr01c4zc6sfy7r6p2vswkqqqd3w4k173gjbjazl1ims1sjs"; depends=[phylobase NHPoisson ape igraph]; };
 phylobase = derive { name="phylobase"; version="0.6.8"; sha256="0xj7x4cdfp0yadvjhdkw1ai3yd081ri4gpdg0n5g0z13cjaa6mjh"; depends=[ade4 ape Rcpp Rcpp]; };
 phyloclim = derive { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; };
-phylocurve = derive { name="phylocurve"; version="1.0.0"; sha256="13gfavzkkicqcmdxfh9779a81kjgffskchqm0ygqkwhy9afnsxwr"; depends=[ape geiger phytools abind phylolm]; };
+phylocurve = derive { name="phylocurve"; version="1.1.0"; sha256="03jvq9cdbch860910qjwg16y7h8jq9zn0iaak9daza65arch8fv0"; depends=[drc ape geiger phytools abind phylolm GPfit dtw]; };
 phyloland = derive { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; };
 phylolm = derive { name="phylolm"; version="2.2"; sha256="1x1mi1mcq3ijbqhr0951scqzv4zza0r3fcs0hh4gpbr8z49b6d98"; depends=[ape]; };
 phylosim = derive { name="phylosim"; version="2.1.1"; sha256="0rrz5c7zl2hjalwm6m8pydikiwmiq2dybx2yhzp0ps2bcsn02lhn"; depends=[R_oo ape compoisson ggplot2 R_methodsS3]; };
@@ -5092,7 +5193,7 @@ pi0 = derive { name="pi0"; version="1.3-250"; sha256="1561zvf1hcd05iqy245c0z23mi
 picante = derive { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape vegan nlme]; };
 picasso = derive { name="picasso"; version="0.3.0"; sha256="0z314akr1x2a28hh5hbb7mzkyaxsj4dfkdmx10l6gqllgk9j5qca"; depends=[lattice igraph MASS Matrix]; };
 pingr = derive { name="pingr"; version="1.1.0"; sha256="0j03qcsyckv3zh2v4m8wz8kyfl0k8qi71rm20rc0spy1s9ng7fcb"; depends=[]; };
-pipe_design = derive { name="pipe.design"; version="0.1"; sha256="0hy3n15b4a2319xn2gix9vca3qryy7hjsxlh0z8k96l24ql0r62z"; depends=[ggplot2 gtools]; };
+pipe_design = derive { name="pipe.design"; version="0.2"; sha256="1hmc4g3bnpwicjr53xz8yhhshnfhd2fqx9c6v4af8wvnqpy7mlpq"; depends=[ggplot2 gtools]; };
 pipeR = derive { name="pipeR"; version="0.6"; sha256="15hq6i1cv072jpw71slij534s85xljkjk2ygxpkgq3cyngbq3jxb"; depends=[]; };
 pitchRx = derive { name="pitchRx"; version="1.7"; sha256="0mx948bahw0zr0915hz9lcws7iq2l0ikgx4gjnnfhhpiii86xs57"; depends=[ggplot2 XML2R plyr MASS hexbin mgcv]; };
 pixmap = derive { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; };
@@ -5120,17 +5221,17 @@ plotKML = derive { name="plotKML"; version="0.5-2"; sha256="006f6j3k2yb20zcmx2lq
 plotMCMC = derive { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; };
 plotROC = derive { name="plotROC"; version="1.3.3"; sha256="090fpj3b5vp0r2zrn38yxiy205mk9kx1fpwp0g8rl4bsa88v4c9y"; depends=[ggplot2 gridSVG shiny]; };
 plotSEMM = derive { name="plotSEMM"; version="2.0"; sha256="0n30m1nz9fnilbgxg5jcmx2bsscdvz5mkjkyrgx7yr3alazkaimd"; depends=[plyr shiny MplusAutomation Rcpp plotrix Rcpp]; };
-plotmo = derive { name="plotmo"; version="3.1.0"; sha256="1z735ks92d1gfx6hk29mnj18a9hpsmifjy8qgh5lv9z0mwd7igca"; depends=[plotrix TeachingDemos]; };
+plotmo = derive { name="plotmo"; version="3.1.1"; sha256="08vl41an94l3f7hkd2lzpqgzxsp4wyh24lnay3lpmc3ra2ycpbmg"; depends=[plotrix TeachingDemos]; };
 plotpc = derive { name="plotpc"; version="1.0.3"; sha256="0dw9k702a67c2k77dl4k2747lhsr84x41qrgj5mp9jnyfq6naciq"; depends=[]; };
-plotrix = derive { name="plotrix"; version="3.5-11"; sha256="01vb3i7hkc3krvl9v4f8fnpfcv62p4ci2vbm2qs5w593h70bys7c"; depends=[]; };
+plotrix = derive { name="plotrix"; version="3.5-12"; sha256="13gffp7zp46wal83609652x48i63zb5i20x6ycmgc97l4nanhrfi"; depends=[]; };
 pls = derive { name="pls"; version="2.4-3"; sha256="114ka4766x8fx0zvvr7cylky1jsy542nj6s7sb2dwv8zjhbclkhn"; depends=[]; };
 plsRbeta = derive { name="plsRbeta"; version="0.2.0"; sha256="1b8yldz5nzw3gilv9wk79bxcqb0hrgsxi2cn6qlby5nf9b4zmzv8"; depends=[mvtnorm boot Formula plsdof MASS betareg plsRglm]; };
 plsRcox = derive { name="plsRcox"; version="1.7.2"; sha256="1c3ll13m27ndwlc9r79ilzl0i6cyp870x66swlbg6387whf7wn2r"; depends=[survival plsRglm lars pls kernlab mixOmics risksetROC survAUC rms]; };
 plsRglm = derive { name="plsRglm"; version="1.1.1"; sha256="1bx1pl1pv47z3yj3ngkd97j10v2h8jqiybcqbm3kvqhgqydm07rp"; depends=[mvtnorm boot bipartite car]; };
 plsdepot = derive { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; };
 plsdof = derive { name="plsdof"; version="0.2-7"; sha256="1z8z9m0nsnyy1fipzvm1srpxn3q6wjrlivmmki1f8plwkixkyc5y"; depends=[MASS]; };
-plsgenomics = derive { name="plsgenomics"; version="1.3"; sha256="0gzk7sgv6bqkay7j854xsmyr3vwsdb2dbcnffv1ygdxikj64icp4"; depends=[MASS boot]; };
-plspm = derive { name="plspm"; version="0.4.2"; sha256="0q7mx5ydw61z1qcs0flpwpnnrcwsfsh3razc8jnd4z1xn96i3x85"; depends=[amap diagram tester turner]; };
+plsgenomics = derive { name="plsgenomics"; version="1.3-1"; sha256="0vddhzqfix8q692mdls227m2l6zjzbjwp1ia5j9shy71ycg2fzn9"; depends=[MASS boot]; };
+plspm = derive { name="plspm"; version="0.4.7"; sha256="0iy4qw4zjgqxg93a827qjcm32yipmnrl4gzn4hmskjd4khm9ngwd"; depends=[tester turner diagram shape amap]; };
 plugdensity = derive { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; };
 plumbr = derive { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; };
 plus = derive { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; };
@@ -5142,7 +5243,7 @@ pmg = derive { name="pmg"; version="0.9-43"; sha256="0i7d50m4w7p8ipyx2d3qmc54aiq
 pmlr = derive { name="pmlr"; version="1.0"; sha256="1z3hbw4wabpai1q8kbn77nzxqziag8y04cidlfiw7z969s4pkmgl"; depends=[]; };
 pmml = derive { name="pmml"; version="1.4.2"; sha256="0588sph67zs58knf4g3fd7c84i2yag81igr882jgbaxhfhxrpk6n"; depends=[XML survival]; };
 pmmlTransformations = derive { name="pmmlTransformations"; version="1.2.2"; sha256="1p31lakhqwk0qhb565j2sjcfsjsx0i5v8kj8779ryjyvy7717m6m"; depends=[]; };
-pmr = derive { name="pmr"; version="1.2.4"; sha256="15yrh533rj5i728nvcpjj3m5wa3jbspnfj941px3mf11h14npxpp"; depends=[]; };
+pmr = derive { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; };
 png = derive { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; };
 pnmtrem = derive { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; };
 pnn = derive { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; };
@@ -5152,7 +5253,7 @@ pogit = derive { name="pogit"; version="1.0.0"; sha256="0lgvf4d7b2ycz9wryjrd7qym
 poibin = derive { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; };
 poilog = derive { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; };
 pointRes = derive { name="pointRes"; version="1.0.2"; sha256="1q9vjvmxs1f5g8f2aj674wk8piqzjqxzdrvxnawgw1pfi66adnms"; depends=[ggplot2 gridExtra plyr TripleR]; };
-pointdensityP = derive { name="pointdensityP"; version="0.1"; sha256="1wa10sp0pxcjyicifz638f89b7ynsy7718qbh2p2gn66lbvjpkhr"; depends=[]; };
+pointdensityP = derive { name="pointdensityP"; version="0.2.1"; sha256="013vamdh987w56bmz0m6j2xas4ycv1zwxs860rs5z4i55dhgf9kh"; depends=[]; };
 poisDoubleSamp = derive { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp Rcpp]; };
 poisson_glm_mix = derive { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; };
 poistweedie = derive { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; };
@@ -5164,14 +5265,14 @@ polySegratio = derive { name="polySegratio"; version="0.2-4"; sha256="05kvj475zh
 polySegratioMM = derive { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[polySegratio gtools coda lattice]; };
 polyaAeppli = derive { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; };
 polyapost = derive { name="polyapost"; version="1.1-6"; sha256="1wk85nl2p9plnaavjdr4bqxxhjc84ynv53bh2v1rmq87jymw40b1"; depends=[boot]; };
-polyclip = derive { name="polyclip"; version="1.3-0"; sha256="05bbj4hy4h1hcb4pzg1mjp8k7k91kqq5rg2x0ns4hcs1h4zrspds"; depends=[]; };
+polyclip = derive { name="polyclip"; version="1.3-2"; sha256="0gsckb5nwfq1w48g67pszk3ndzvj63r8rp7vhh77idizaczkv0r1"; depends=[]; };
 polycor = derive { name="polycor"; version="0.7-8"; sha256="0hvww5grl68dff23069smfk3isysyi5n2jm4qmaynrk0m3yvhxwn"; depends=[mvtnorm sfsmisc]; };
 polynom = derive { name="polynom"; version="1.3-8"; sha256="05lng88c8cwj65cav31hsrca9nbrqn5rmcz79b17issyk2j0g86p"; depends=[]; };
 polysat = derive { name="polysat"; version="1.3-3"; sha256="02h1lf1bk7hhphfdcql0rmiszp3b3mdfhqfwxj369389dg0q57bd"; depends=[]; };
 polytomous = derive { name="polytomous"; version="0.1.6"; sha256="137qcnncih1lm2wshwrznlcr0k552n0sqhiy73iwis59lg854caa"; depends=[MASS Hmisc lme4]; };
 polywog = derive { name="polywog"; version="0.4-0"; sha256="0wl9br0g4kgi3nz2fq28nsk6fw0ll0y715v4vz8lv3pvfwc7518j"; depends=[miscTools foreach Formula glmnet iterators Matrix ncvreg Rcpp stringr Rcpp]; };
 pom = derive { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; };
-pomp = derive { name="pomp"; version="0.53-5"; sha256="1bfb2b1fdj673b43jnq9pzh36h1hfb8dsarf1dq6pwain7dnqjyp"; depends=[subplex nloptr mvtnorm deSolve coda]; };
+pomp = derive { name="pomp"; version="0.65-1"; sha256="1fxfbqa6lb4x0d4h29in8crhac32aw71chyjyvnhadfqynxhhv4k"; depends=[mvtnorm deSolve coda subplex nloptr]; };
 pooh = derive { name="pooh"; version="0.3"; sha256="1wcv77vjjp62c5l1mplnkk4vhy2scjrq96cjx58w5jdj46lban2h"; depends=[]; };
 popKorn = derive { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; };
 popRange = derive { name="popRange"; version="1.1.3"; sha256="0kkz6va0p8zv3skaqqcpw42014d9x9x4ilx0czz91qf46h61jgb0"; depends=[findpython]; };
@@ -5181,12 +5282,12 @@ popdemo = derive { name="popdemo"; version="0.1-4"; sha256="0syhmm8fnxbsdzj75y7d
 popgen = derive { name="popgen"; version="1.0-3"; sha256="00rgfwmmiharfxqlpy21n3jbxwr5whzdg8psqylkjf83ls2myqzm"; depends=[cluster]; };
 popgraph = derive { name="popgraph"; version="1.4"; sha256="1z6w6vj3vl2w10hvzwmkw4d475bqcd6ys92xnn445ag6vpq0cvxq"; depends=[ggplot2 igraph MASS sp Matrix sampling]; };
 poplite = derive { name="poplite"; version="0.99.16"; sha256="0yp1hfda2k6c5x0gbcfxj9h6igzx3ra05xs7g88wjz76yxp3wb6w"; depends=[dplyr DBI igraph lazyeval RSQLite]; };
-poppr = derive { name="poppr"; version="1.1.4"; sha256="13zxcclr8ar3ibjd34n23g0q0rw28gdl2q5477cmpcnypwzxsa71"; depends=[adegenet vegan ggplot2 phangorn ape igraph ade4 pegas reshape2]; };
+poppr = derive { name="poppr"; version="1.1.5"; sha256="0whk06gwm171b5j2vcfqi7rdwczv109g7bw2gfnzhz4fm46nhmfk"; depends=[adegenet vegan ggplot2 phangorn ape igraph ade4 pegas reshape2]; };
 popsom = derive { name="popsom"; version="2.3"; sha256="0hdg1nx8mlpqw9aj2q08sb20frsc5jnbvqpfalf5kyvlygnhxdlc"; depends=[som fields]; };
 portes = derive { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5inkv2cwgzd0zi6ky0vvrc3abchqsjm2ck"; depends=[]; };
 portfolio = derive { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; };
 portfolioSim = derive { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; };
-potts = derive { name="potts"; version="0.5-2"; sha256="1q4kvknxkrd8qbv8l3vmwrppgzq5bsysnqgm029lx7iys73x4fck"; depends=[]; };
+potts = derive { name="potts"; version="0.5-3"; sha256="1pddz8d4p69wzr51zy3bnbwka1a2dr7civh72qi0rpdsrfm4jxl6"; depends=[]; };
 poweRlaw = derive { name="poweRlaw"; version="0.30.2"; sha256="1b4ngqsh5gywksb3y9cj1yjkhxs4081svwgxwf8gpsa7fnl9c0fl"; depends=[VGAM]; };
 powell = derive { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; };
 powerAnalysis = derive { name="powerAnalysis"; version="0.2"; sha256="15ff3wnn37sjkiyycgh16g7gwl3l321fbw12kv621dad5bki14jl"; depends=[]; };
@@ -5213,11 +5314,11 @@ predictmeans = derive { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0
 predmixcor = derive { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; };
 prefmod = derive { name="prefmod"; version="0.8-32"; sha256="0v5r195gzbfi6jbqz8r1x2fzj3anqxf4hxaxb9krm9rkwgphrwpi"; depends=[gnm colorspace]; };
 presens = derive { name="presens"; version="1.0.0"; sha256="0hwciahpfp7h7dchn6k64cwjwxzm6cx28b66kv6flz4yzwvqd3pb"; depends=[birk marelac]; };
-preseqR = derive { name="preseqR"; version="1.1.1"; sha256="0hz9a7jji2k55a57l03ajkf0j7yp6dgyapyqr1ip0v18fjpfj98q"; depends=[]; };
+preseqR = derive { name="preseqR"; version="1.2.1"; sha256="1izfykccybnr2pnw043g680wg78hbds6hcfqirqhy1sfn6sf8lz1"; depends=[]; };
 prettyGraphs = derive { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; };
 prettyR = derive { name="prettyR"; version="2.1-1"; sha256="173n0cp0mq00y1ydba9m7l3izz04czg9vvadbflfinpi86wvcgq6"; depends=[]; };
 prettyunits = derive { name="prettyunits"; version="1.0.0"; sha256="0lh83pf30hnqcq6ppq8axlyawp0qxpym0lqq8pchh3gq8mgcdz1h"; depends=[magrittr assertthat]; };
-prevR = derive { name="prevR"; version="2.9"; sha256="1h0v52pwhrb9ib61wjqdcand5prc1h205nd2rl5qiiqcnq4xn582"; depends=[sp gstat GenKern rgdal fields]; };
+prevR = derive { name="prevR"; version="3.1"; sha256="1x8ssz1k8vdq3zx1qhfhyq371i8s3bam2rd6bm3biha5i8icglh6"; depends=[sp rgdal ggplot2 directlabels GenKern fields gstat foreign maptools]; };
 prevalence = derive { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[rjags coda]; };
 prim = derive { name="prim"; version="1.0.15"; sha256="008a8fm4as5b6j70xxwiipywhbg1wmdbgjz9r7qfnivcpfarxv7f"; depends=[rgl misc3d]; };
 primer = derive { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; };
@@ -5225,7 +5326,7 @@ primerTree = derive { name="primerTree"; version="1.0.1"; sha256="068j5a2rh8f1h1
 princurve = derive { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6ann978ilwhh58qi443q25z01qzxml4b5jzsd7w"; depends=[]; };
 prinsimp = derive { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; };
 prob = derive { name="prob"; version="0.9-5"; sha256="05skjqimzhnk99z864466dc8qx58pavrky320il91yqyr8b98j8b"; depends=[combinat fAsianOptions hypergeo VGAM]; };
-probFDA = derive { name="probFDA"; version="1.0"; sha256="0aqg3f9n1c30wiqml556xmdcv9yr8rijqvymqk89jdzfc0ri25gh"; depends=[MASS]; };
+probFDA = derive { name="probFDA"; version="1.0.1"; sha256="093k50kyady54rkrz0n9x9z98z5ws36phlj42j25yip7pzhfd6sv"; depends=[MASS]; };
 probemod = derive { name="probemod"; version="0.2.1"; sha256="1cgjr03amssc9rng8ky4w3abhhijj0d2byzm118dfdjzrgmnrf9g"; depends=[]; };
 probsvm = derive { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; };
 prodlim = derive { name="prodlim"; version="1.5.1"; sha256="0qjyx4i66cahiqjqff63ljwxdig4lvfs2asxnhkgylwn2kb3lygv"; depends=[survival KernSmooth lava]; };
@@ -5235,6 +5336,7 @@ profileR = derive { name="profileR"; version="0.2-1"; sha256="1hcydy7hqjac9mvbai
 profr = derive { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[stringr plyr]; };
 proftools = derive { name="proftools"; version="0.1-0"; sha256="1wzkrz7zr2pjw5id2sp6jdqm5pgrrh35zfwjrkr6mac22lniq4bv"; depends=[]; };
 prognosticROC = derive { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; };
+progress = derive { name="progress"; version="1.0.2"; sha256="1dpcfvdg1rf0fd4whcn7k09x70s7jhz8p7nqkm9p13b4nhil76sj"; depends=[prettyunits R6]; };
 proj4 = derive { name="proj4"; version="1.0-8"; sha256="06r3lavgixrsa52d1v31laqcbw6fb9xn23akv39hvaib78diglv9"; depends=[]; };
 propOverlap = derive { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[]; };
 propagate = derive { name="propagate"; version="1.0-4"; sha256="18vyh4i4zlsmggfyd4w0zrznk75m84k08p1qa9crind04n5581j1"; depends=[MASS tmvtnorm Rcpp ff minpack_lm Rcpp]; };
@@ -5247,8 +5349,9 @@ proto = derive { name="proto"; version="0.3-10"; sha256="03mvzi529y6kjcp9bkpk7zl
 protoclass = derive { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; };
 protoclust = derive { name="protoclust"; version="1.5"; sha256="03qhqfqdz45s8c1p8c6sqs10i6c2ilx4fz8wkpwas3j78lgylskg"; depends=[]; };
 protr = derive { name="protr"; version="0.5-1"; sha256="1ji0vpy9rrrvbsfwi4823ywi5zbwl57zw1glxllxgwyv9l6v4bpb"; depends=[]; };
+provenance = derive { name="provenance"; version="0.2"; sha256="07wgfb5hmdd4nddl42wpqsx9vzayvngrgmcsssilbm5qbrvgv4sr"; depends=[MASS smacof vegan shapes]; };
 proxy = derive { name="proxy"; version="0.4-14"; sha256="1ijip1jmpm7dg11yv2rjcpkpg4p30m9acddbn49fbss9kcpl5b5i"; depends=[]; };
-pryr = derive { name="pryr"; version="0.1"; sha256="1vp63v1l4myahmmbphc043x1kpmvvdhs6dr640dxi0napvkdqlq6"; depends=[stringr codetools Rcpp Rcpp]; };
+pryr = derive { name="pryr"; version="0.1.1"; sha256="00j81iwf2mka1a953nrgar0r4wcfi4n5nl8pidnhw51lyh2285d8"; depends=[stringr codetools Rcpp Rcpp]; };
 psData = derive { name="psData"; version="0.1.2"; sha256="0w8kzivqrh1b6gq803rfd10drxdwgy0cxb5sff273m6jxzak52f2"; depends=[countrycode DataCombine foreign xlsx]; };
 psbcGroup = derive { name="psbcGroup"; version="1.1"; sha256="17kpxddvy9m87i9r1hazc8g6mm35p1452ngz80byhgw9p0jkvn5p"; depends=[LearnBayes SuppDists mvtnorm]; };
 pscl = derive { name="pscl"; version="1.4.9"; sha256="15fij6n43hry1plgzrak9vmk9xbb7n4v2frv997bhwxbs6jhhfhf"; depends=[MASS lattice]; };
@@ -5256,7 +5359,7 @@ psd = derive { name="psd"; version="1.0-1"; sha256="1ssda4g98m0bk6gkrb7c6ylfsd2a
 pse = derive { name="pse"; version="0.4.0"; sha256="1ln6b5ch99fmmcsfn8m8fl4ir7cadwq5ckggwizw9cbllw3drv0b"; depends=[Hmisc boot]; };
 pseudo = derive { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[KMsurv geepack]; };
 psgp = derive { name="psgp"; version="0.3-6"; sha256="0h9gyadfy0djj32pgwhg8vy2gfn7i7yj5nnsm6pvfypc3k71s2wf"; depends=[intamap automap gstat Rcpp RcppArmadillo]; };
-psidR = derive { name="psidR"; version="1.2"; sha256="14cpxk7z0inrpvhsdb3z6r5nrpyb4v8bv77mygxcf51rxihigzvj"; depends=[data_table RCurl foreign SAScii]; };
+psidR = derive { name="psidR"; version="1.3"; sha256="1jdxbjvc309b1bs81v57kc1g7lgfdz84bfakh9qwh8wgjqbjr06i"; depends=[data_table RCurl foreign SAScii]; };
 pso = derive { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; };
 pspearman = derive { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; };
 pspline = derive { name="pspline"; version="1.0-16"; sha256="170apwfv2lbf2rggzzynrf9vi2mr0y15sm4zy8djxxpzv217iaf7"; depends=[]; };
@@ -5285,7 +5388,7 @@ pwr = derive { name="pwr"; version="1.1-2"; sha256="1czganj70qszz32yx2jprhr8h9a2
 pwt = derive { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; };
 pwt8 = derive { name="pwt8"; version="8.0-0"; sha256="12cgyban6waj0cxz9gb35s5v0v29rmx67ipzalzdnrjp5nsmy431"; depends=[]; };
 pxR = derive { name="pxR"; version="0.40.0"; sha256="08s62kzdgak7mjzyhd32qn93q5l7sj01vhsk7fjg9nxjvm78xxka"; depends=[stringr reshape2 RJSONIO plyr]; };
-pxweb = derive { name="pxweb"; version="0.5.5"; sha256="1rrsxis2fi1x90gj251phbrz3bbl7yyc39n20lk2rln14acdhfsy"; depends=[data_table plyr stringr RJSONIO httr]; };
+pxweb = derive { name="pxweb"; version="0.5.54"; sha256="17vg480b54mcv9jbkci1rrn6zi90zzw098xzrcw3kvp583as9mar"; depends=[data_table plyr stringr RJSONIO httr]; };
 pycno = derive { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[sp maptools rgeos]; };
 pyramid = derive { name="pyramid"; version="1.4"; sha256="0hh0hmckicl0r2r9zlf693j65jr9jgmiz643j2asp57nbs99lgxz"; depends=[]; };
 qLearn = derive { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; };
@@ -5295,8 +5398,8 @@ qat = derive { name="qat"; version="0.73"; sha256="1fff4sv1n3i0gfgj83sy4pygxalif
 qcc = derive { name="qcc"; version="2.6"; sha256="0bsdgpsqvkz2w1qanxwx8kvrpkpzs9jgw8ml2lyqhmhqbxyg125r"; depends=[MASS]; };
 qclust = derive { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm0zy0gyn3brc1mf9jv8gmkl941cp3"; depends=[mclust mvtnorm]; };
 qcr = derive { name="qcr"; version="0.1-18"; sha256="16dfda3rwivsdhp7j5izzbk2rzwfabfmxgpq4kjc4h7r90n2vly2"; depends=[qcc]; };
-qdap = derive { name="qdap"; version="2.2.0"; sha256="0lbc38x4gvh6q2sb6d524ksfhpvxm8knfy85bmwbf6d3q4s0b6q4"; depends=[ggplot2 qdapDictionaries qdapRegex qdapTools RColorBrewer chron dplyr gdata gender gridExtra igraph NLP openNLP plotrix RCurl reports reshape2 scales stringdist tm venneuler wordcloud xlsx XML]; };
-qdapDictionaries = derive { name="qdapDictionaries"; version="1.0.5"; sha256="1nk432nyw4srz92zsikv830dpjxflrrgjhq5va6pd3ifpy3nzdrw"; depends=[]; };
+qdap = derive { name="qdap"; version="2.2.1"; sha256="0gix6l0h6q0c2pl38d3qp3pzs1m3j96rcb9n6q9k1nh0002vfnsg"; depends=[qdapDictionaries qdapRegex qdapTools RColorBrewer chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; };
+qdapDictionaries = derive { name="qdapDictionaries"; version="1.0.6"; sha256="1icivvsi33494ycd7vfqm9zx2g2rc1m3dygs3bi0ndi798z1cvx2"; depends=[]; };
 qdapRegex = derive { name="qdapRegex"; version="0.3.2"; sha256="1hygkck4wilm2f2cg5q82a867608j3dqp7wqj3kbnh5a970lw41y"; depends=[stringi]; };
 qdapTools = derive { name="qdapTools"; version="1.1.0"; sha256="0k3mvcjj2fg2v3z8jm2z02zmrpgjpwbpcaanmp2vlykqzacsrl52"; depends=[chron data_table RCurl XML]; };
 qdm = derive { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; };
@@ -5315,13 +5418,13 @@ qqtest = derive { name="qqtest"; version="1.0"; sha256="12hw4d2gddb4fgdi986pyqgv
 qrLMM = derive { name="qrLMM"; version="1.1"; sha256="1yg9ph6jy0sn4d82vn4v7yy3mqczbnzsq8qqp9dw38vh2456rmf2"; depends=[nlme matrixcalc mvtnorm ghyp quantreg psych]; };
 qrNLMM = derive { name="qrNLMM"; version="1.0"; sha256="0vlinc3bggapff29dyz14vn122gy6aq3rp38v2bpnxfkbpj10lvy"; depends=[matrixcalc mvtnorm ghyp quantreg psych ald]; };
 qrfactor = derive { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[mvoutlier mgraph pvclust cluster maptools]; };
+qrmtools = derive { name="qrmtools"; version="0.0-1"; sha256="0xjgb8clyhlrl4qdbhi85m97cbhab5q5sy2zr87gamz2y365alpr"; depends=[xts]; };
 qrng = derive { name="qrng"; version="0.0-2"; sha256="0rs4dggvrlc3bi0wgkjw8lhv4b3jpckcfkqzsaz0j46kf6vfgfw1"; depends=[]; };
 qrnn = derive { name="qrnn"; version="1.1.2"; sha256="01wsz9qcdiayi7gsyy2y09jyyapanyhlc4pdyman2f7z5nl9yv9i"; depends=[]; };
-qtbase = derive { name="qtbase"; version="1.0.4"; sha256="02yilvywkcqn3y9ayix18cgkwhi0gh69fl3fcw28fs2zxf1hqy75"; depends=[]; };
+qtbase = derive { name="qtbase"; version="1.0.9"; sha256="1jffdkv6jwxqljx6jd5n27wk9r5sg0llpf34nlr29h4shi3f2f8z"; depends=[]; };
 qte = derive { name="qte"; version="1.0.1"; sha256="15y6n0c9jinfz7hmm107palgy8fl15bc71gw0bcd3bawpydkrq2w"; depends=[]; };
 qtl = derive { name="qtl"; version="1.36-6"; sha256="1qn8fv0s2934pbds2962isr8y96s2k0jlh6y27rz21qlpryrbijb"; depends=[]; };
 qtlDesign = derive { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; };
-qtlbim = derive { name="qtlbim"; version="2.0.7"; sha256="0nm7ky5bkzhmfr41fs1pvl51i2df1fz11j55q74ma2wzki5adfps"; depends=[qtl lattice coda MASS]; };
 qtlbook = derive { name="qtlbook"; version="0.18-1"; sha256="09b4w7kqdlmpf0vsjgwbi9sraafzchvk18yzrx72gs151v03nxlm"; depends=[qtl]; };
 qtlhot = derive { name="qtlhot"; version="0.9.0"; sha256="1043rksqqzgmr7q03j18wxgm706prqxq9ki9b9p2dxvc62vfcfih"; depends=[qtl lattice corpcor mnormt]; };
 qtlmt = derive { name="qtlmt"; version="0.1-3"; sha256="01ql0fr2mxl8a8nd6lpig5j8vznv594ygn6bj6d31gj15r5rs8fs"; depends=[]; };
@@ -5335,15 +5438,15 @@ qualCI = derive { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cp
 qualV = derive { name="qualV"; version="0.3-1"; sha256="0p4yfgq2wxwis2w28mdb61x6hzm6sb9bczjdm9bc05ga5srr3sdd"; depends=[KernSmooth]; };
 qualityTools = derive { name="qualityTools"; version="1.54"; sha256="0ylp5a49b4q4max4yz30ia7r12s4jrvqn9zx5a21qcnpinf8b932"; depends=[]; };
 quantchem = derive { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; };
-quanteda = derive { name="quanteda"; version="0.7.2"; sha256="0mpalvnhqkmqczpc1qaipvqxlyqfli510p81h6mf0sq9f82nzmks"; depends=[Matrix data_table SnowballC wordcloud proxy Rcpp ca Rcpp RcppArmadillo]; };
+quanteda = derive { name="quanteda"; version="0.7.2-1"; sha256="1j6hjcr3sd1xymzznvz1r2z6rs3m6vp3ji5y6dqq5qr18g1bi4cm"; depends=[Matrix data_table SnowballC wordcloud proxy Rcpp ca Rcpp RcppArmadillo]; };
 quantification = derive { name="quantification"; version="0.1.0"; sha256="0987389rr21fl3khgd3a1yq5821hljwm0xlyxgjy1km5hj81diap"; depends=[car]; };
 quantmod = derive { name="quantmod"; version="0.4-4"; sha256="0a8gr2qb2b2w58zyxbyz3dbprmyiwf5cd62xqv4d3rk29l7vk4n8"; depends=[xts zoo TTR]; };
 quantreg = derive { name="quantreg"; version="5.11"; sha256="0pyc1zknkjyvaix76bn84l90zavajsc7jx17x0zanllnh34siizp"; depends=[SparseM]; };
-quantregForest = derive { name="quantregForest"; version="0.2-3"; sha256="06c73f66nnw3vd2dv8h5skzyxbr89i3pyprbb0if721h5d7pm0s7"; depends=[randomForest]; };
+quantregForest = derive { name="quantregForest"; version="1.0"; sha256="11mnb32vz6m2g7nggip2y251rkwn6wr7jwdh0hqvl0pgalmipb84"; depends=[randomForest]; };
 quantregGrowth = derive { name="quantregGrowth"; version="0.3-0"; sha256="0iyqd4gf780xqj2gcinlx0h6r6wy4vc7sp8r4qa1s638qcrp3qwa"; depends=[quantreg]; };
 quantspec = derive { name="quantspec"; version="1.0-3"; sha256="1g4arhhybw021dnz0imdfwwj328gc8yw75cgnnd00skdc402cfhk"; depends=[quantreg abind zoo snowfall Rcpp Rcpp]; };
 questionr = derive { name="questionr"; version="0.4.3"; sha256="13mmmjxg9vkn53dp9hng330bkilzdf2zqisgs21ng08b6p9dv7n4"; depends=[shiny highr classInt htmltools]; };
-queueing = derive { name="queueing"; version="0.2.4"; sha256="03zz5437bkai2bmk9hcwf09cmyrnbs2cxlafbcf1lp6iahj66il9"; depends=[]; };
+queueing = derive { name="queueing"; version="0.2.5"; sha256="11a44aqq0s50vdbn7rhijajqw1rrcj1qnyjjd8dn1cc5nvq141k7"; depends=[]; };
 quickpsy = derive { name="quickpsy"; version="0.1.0"; sha256="1p1rhv69bh842r77dxn73l0k2lwa5vj2xc27m470pjygap2zaqv0"; depends=[boot DEoptim dplyr ggplot2 tidyr MPDiR]; };
 quint = derive { name="quint"; version="1.0"; sha256="19dxrssy4dw7v3s4hhhy6yilbc7zb6pvcnh3mm1z6vv5a1wfr245"; depends=[partykit Formula rpart]; };
 quipu = derive { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae stringr pixmap shiny xtable]; };
@@ -5367,7 +5470,7 @@ rClinicalCodes = derive { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r
 rDEA = derive { name="rDEA"; version="1.1-1"; sha256="17j7cz08nd5sgr1z75jlrdjl9ffkdhmzmqcyrf1qcy36v9i2fqzk"; depends=[slam truncreg truncnorm maxLik]; };
 rDNA = derive { name="rDNA"; version="1.30.1"; sha256="12h83zirv55sryc1zww97ws8kvsym1z7p7y5d4w43nam8mi3fpcd"; depends=[rJava]; };
 rDVR = derive { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; };
-rEMM = derive { name="rEMM"; version="1.0-8"; sha256="1d8nwranqfvr9c0g2ny7akawgqk5hjnr1mclk87gmbmwn9iwik34"; depends=[proxy MASS clusterGeneration igraph]; };
+rEMM = derive { name="rEMM"; version="1.0-9"; sha256="0b3g30s8nw107y5yg113xdw1s2h96mq0j5cldj01z3j676idjgw5"; depends=[proxy igraph clusterGeneration MASS]; };
 rFDSN = derive { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; };
 rFerns = derive { name="rFerns"; version="1.1.0"; sha256="00ddb9zwf4hqkx9qmrndz182mg69mb5fyg0v0v4b32sy4sixnps5"; depends=[]; };
 rGammaGamma = derive { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; };
@@ -5378,11 +5481,11 @@ rJava = derive { name="rJava"; version="0.9-6"; sha256="008g6s6rcb5lnz5y2a2rs4iq
 rJavax = derive { name="rJavax"; version="0.3"; sha256="0sv2fjinp4wmdfvcpgm4hv8v3fkiiv84ywqyr4hz86j50ncd79km"; depends=[rJava]; };
 rJython = derive { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; };
 rLTP = derive { name="rLTP"; version="0.1"; sha256="0dv8jj8rgcx4cbbs10sqdblcznxgm9ld5md922ghnka4ymar244m"; depends=[RCurl]; };
-rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.7.3"; sha256="1w9z0m8ddslsk4d9r8dm5npm1s8sqdjv11x0gc08awa77iwak4wh"; depends=[plyr]; };
+rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.7.6"; sha256="03gdr4swy3dq6vkq4q44sdn7slgjzcqzd2pmhac4bghgzgk3zgj8"; depends=[plyr]; };
 rLiDAR = derive { name="rLiDAR"; version="0.1"; sha256="1zm3c3xpxk1ll0cq589k1kf69wgn93qmaqkvpgcjib0ay35q7c7f"; depends=[spatstat sp deldir plyr raster geometry rgl bitops]; };
 rLindo = derive { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; };
 rNMF = derive { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[nnls knitr]; };
-rNOMADS = derive { name="rNOMADS"; version="2.1.3"; sha256="1m2qbkqaninczs4v558vpzkiqh0rngkmpp9sk7y4k5j3g4x1jrpf"; depends=[rvest scrapeR stringr fields GEOmap MBA RCurl XML]; };
+rNOMADS = derive { name="rNOMADS"; version="2.1.4"; sha256="0a0knxqqbn52i4ixpv16h1hnajhwx788cmdiq78ysds7yfkjrwzy"; depends=[rvest scrapeR stringr fields GEOmap MBA RCurl XML]; };
 rPlant = derive { name="rPlant"; version="2.7"; sha256="0gqxb49d6qzkd533s9qp75byvz66v1csdlnmh3m2zg96aw32178r"; depends=[rjson RCurl seqinr knitcitations]; };
 rPref = derive { name="rPref"; version="0.5"; sha256="0wgyf785izfhx1jvff4as1dir1s432z9v2b2rgdxvay9y5zpc2ar"; depends=[Rcpp RcppParallel dplyr igraph Rcpp RcppParallel]; };
 rPython = derive { name="rPython"; version="0.0-5"; sha256="0d608v1x8walwnx7aa3m0n7999jlbiymhl7605z4n7ps6l1140mv"; depends=[RJSONIO]; };
@@ -5403,11 +5506,11 @@ rags2ridges = derive { name="rags2ridges"; version="1.4"; sha256="1vwd39vp8xdrcz
 rainbow = derive { name="rainbow"; version="3.3"; sha256="0xiqljshkdhhkdgcvz5n9qgbxgxskpxbq14vbpil9nqw2syj9xvj"; depends=[MASS pcaPP hdrcde cluster colorspace ks]; };
 raincpc = derive { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; };
 rainfreq = derive { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; };
-ramify = derive { name="ramify"; version="0.2.0"; sha256="1fn2r6mr461yp00z8c7f1wsyhz3ag13q6ckf84sj11rgg6jivzjj"; depends=[]; };
+ramify = derive { name="ramify"; version="0.3.0"; sha256="1pysv802pyab06zl41b71x91527fw1smw4x2lcj2xc3p95yb4zb9"; depends=[]; };
 ramps = derive { name="ramps"; version="0.6-13"; sha256="1y7jaajzbf6d9xwr0rg0qr43l8kncgwbpfy5rpka90g3244v8nwz"; depends=[coda maps Matrix nlme fields]; };
 randNames = derive { name="randNames"; version="0.2"; sha256="0mgfwdbadfvxg1dp8aqp2c24lkhz3bi9ssmym4ns6xjq088l3ldh"; depends=[dplyr httr jsonlite]; };
 randaes = derive { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; };
-random = derive { name="random"; version="0.2.3"; sha256="1ljz54i73bzxh69v7xjklajcl526pdapr0jgdwd6prfilafhf618"; depends=[curl]; };
+random = derive { name="random"; version="0.2.4"; sha256="17d1gcdymgcc08hx3998vs0x70fn8gxw2a1ycm9z7xrasx03g7kn"; depends=[curl]; };
 random_polychor_pa = derive { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[psych nFactors boot MASS mvtnorm sfsmisc]; };
 randomForest = derive { name="randomForest"; version="4.6-10"; sha256="0glj08w6sbabr3n71kzd5w3jb7vhrys8rq904j27a4xk0qp4s5lv"; depends=[]; };
 randomForestSRC = derive { name="randomForestSRC"; version="1.6.1"; sha256="174ky1wwdpq6wkn8hanfpfgy55jf6v1hlm6k688gjs0515y5490r"; depends=[]; };
@@ -5421,7 +5524,7 @@ randomizr = derive { name="randomizr"; version="0.2.2"; sha256="0g870sr8zjfl1dh3
 randtests = derive { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; };
 randtoolbox = derive { name="randtoolbox"; version="1.16"; sha256="03z4g2mmdywsgl95xbj80awirkgrghdk2kwhsh58p00aq4bpl5ff"; depends=[rngWELL]; };
 rangeMapper = derive { name="rangeMapper"; version="0.2-8"; sha256="0bxb37gy98smypjj27r3dbd0vfyvaqw2p25qv07j3isykcn2pxpn"; depends=[RSQLite rgdal sp rgeos raster maptools lattice RColorBrewer classInt]; };
-rankdist = derive { name="rankdist"; version="0.3.1"; sha256="0812bw2bm9837lp5l6lwbhln61qb584f0nk2k7nc60m1ppsi0dw6"; depends=[Rcpp hash optimx Rcpp]; };
+rankdist = derive { name="rankdist"; version="0.4.1"; sha256="11lc7ggi5bv836f3bwk8gb5pry4fw4qwbj95bzg34xdascaapw59"; depends=[Rcpp hash optimx Rcpp]; };
 rankhazard = derive { name="rankhazard"; version="1.0"; sha256="1kylg8yjrixbv86i2ffhhn8f5shsj8kvi66k202ari0li92y7dsg"; depends=[survival]; };
 rappdirs = derive { name="rappdirs"; version="0.3"; sha256="1yjd91h1knagri5m4djal25p7925162zz5g6005h1fgcvwz3sszd"; depends=[]; };
 rapport = derive { name="rapport"; version="0.51"; sha256="1qn45nrcawr8d9pkdnpmm37dg31l28gfbnwjl62fs7y691187cqp"; depends=[lattice plyr pander yaml reshape]; };
@@ -5446,13 +5549,14 @@ rbmn = derive { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293
 rbounds = derive { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; };
 rbugs = derive { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; };
 rbundler = derive { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; };
-rcbalance = derive { name="rcbalance"; version="1.5"; sha256="1lqxx9ghxnskl8sy26x03d8baw8kn78mlxbh1gjjkszx4y5bm4vl"; depends=[MASS plyr]; };
+rcbalance = derive { name="rcbalance"; version="1.6"; sha256="0nbwsisx4ajdccywwvpg2xcaf8b4b25zij2qcb39yzmlz0yk6jjz"; depends=[MASS plyr]; };
 rcdd = derive { name="rcdd"; version="1.1-8"; sha256="09bb92rp44palx9dvc9pb0gdmb1g22289xjk8p9s918lalc6i9aw"; depends=[]; };
 rcdk = derive { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint rJava rcdklibs png iterators]; };
 rcdklibs = derive { name="rcdklibs"; version="1.5.8.4"; sha256="0mzkr23f4d639vhxfdbg44hzxapmpqkhc084ikcj93gjwvdz903k"; depends=[rJava]; };
+rchallenge = derive { name="rchallenge"; version="1.1"; sha256="1qad0mcadr3zw5r37rgwnqf4ic9brlw3zl5n4jcxyaj324fj4pa3"; depends=[rmarkdown knitr]; };
 rcicr = derive { name="rcicr"; version="0.3.0"; sha256="0fvv6diqg6sw3ar3gzvhl3mbm6zvx0k12lzsa92mccg0giqa9n0w"; depends=[matlab aspace jpeg]; };
 rclinicaltrials = derive { name="rclinicaltrials"; version="1.4.1"; sha256="1x8mj4gzfpgvdj3glwanr76g5x8pks8fm806bvnfls35g967z4p4"; depends=[httr XML plyr]; };
-rcorpora = derive { name="rcorpora"; version="1.0.1"; sha256="10bmsmx9pznfpddddvk7khm7klxg1c82bf85613bnpcwjyb7xcid"; depends=[jsonlite]; };
+rcorpora = derive { name="rcorpora"; version="1.1.0"; sha256="05i9zqvgg5fxgscqzmbsi84baq9cxs14k70agjy95h61fndaaarf"; depends=[jsonlite]; };
 rcppbugs = derive { name="rcppbugs"; version="0.1.4.1"; sha256="0wb5mzw1sdrr7lc6izilv60k5v0wcvy8q31a863b63a9jvh16g8d"; depends=[Rcpp Rcpp RcppArmadillo BH]; };
 rcrossref = derive { name="rcrossref"; version="0.3.0"; sha256="1w822n6mlld7fa92iy38xjvgnkhyns3mvy7vaqabgr2bikcz6545"; depends=[jsonlite XML httr plyr bibtex dplyr]; };
 rda = derive { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; };
@@ -5470,8 +5574,8 @@ readMzXmlData = derive { name="readMzXmlData"; version="2.8"; sha256="0x5h3dh6fk
 readODS = derive { name="readODS"; version="1.4"; sha256="00xcas8y0cq3scgi9vlfkrjalphmd7bsynlzpy7izxa5w9b7x79f"; depends=[XML]; };
 readbitmap = derive { name="readbitmap"; version="0.1-4"; sha256="08fqqsdb2wsx415mnac9mzl5sr5and0zx72ablnlidqfxv8xsi9d"; depends=[bmp jpeg png]; };
 reader = derive { name="reader"; version="1.0.5"; sha256="1g22pnlfr2c974s6rqnyixknhgy2crqbxg2cg2s3ja1sk29v4gr0"; depends=[NCmisc]; };
-readr = derive { name="readr"; version="0.1.0"; sha256="0w6576lrnwk1p90mjwsgy7hi3rk5dqmksnwnmn1gw46lh2888bc8"; depends=[Rcpp curl Rcpp BH]; };
-readstata13 = derive { name="readstata13"; version="0.6.1"; sha256="0h5x6j74m7z715nknh4s62ffs7j3ccpcvy0ws8wf3bdzfa27jvq5"; depends=[Rcpp Rcpp]; };
+readr = derive { name="readr"; version="0.1.1"; sha256="1raw3kihksqr274p0mdigfxpg8yrhx0phwiab22sdi1vp62c8ja6"; depends=[Rcpp curl Rcpp BH]; };
+readstata13 = derive { name="readstata13"; version="0.7"; sha256="14il790jgn8l9c8gxgl2s11vzff5xz77jsgdgjs044r407a72wkb"; depends=[Rcpp Rcpp]; };
 readxl = derive { name="readxl"; version="0.1.0"; sha256="0a0mjcn70a0nz1bkrdjwq495000kswxvyq1nlad9k3ayni2ixjkd"; depends=[Rcpp Rcpp]; };
 reams = derive { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
 rebird = derive { name="rebird"; version="0.1.1"; sha256="0s8wmp2sghs56ppca57fjfab7wngszmy1g8rd3hiwx6br0sjidcg"; depends=[RJSONIO httr RCurl plyr]; };
@@ -5483,9 +5587,10 @@ recluster = derive { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6g
 recommenderlab = derive { name="recommenderlab"; version="0.1-5"; sha256="1hpgd2la4wnlxx5h8cjni4i978hdssr041zrg851lpjrkbxmxfsi"; depends=[Matrix registry arules proxy]; };
 recommenderlabBX = derive { name="recommenderlabBX"; version="0.1-0"; sha256="0dl79cxarsfp8l4nxnns05jwnjygigjhwpjrr4lzx4nvsfxmgsr2"; depends=[recommenderlab]; };
 recommenderlabJester = derive { name="recommenderlabJester"; version="0.1-0"; sha256="1m5jg8gs16cwwwcnjzqkyzwyip8fshrwhmqz8g7nlf6g3p9347rl"; depends=[recommenderlab]; };
-reconstructr = derive { name="reconstructr"; version="0.5"; sha256="0lffi30grk88na2jmkbhs62xf3d8mzrmjsiajrpp7dsaxa650bf0"; depends=[Rcpp Rcpp]; };
-recosystem = derive { name="recosystem"; version="0.2.5"; sha256="0i5rgkmjaz50qlyi85hmr61r0iir53prrphzvnjq5bjchb1k3m09"; depends=[Rcpp Rcpp]; };
+reconstructr = derive { name="reconstructr"; version="1.1.0"; sha256="1kswvpmhk3zzwm4nv6pjb80ww95n9bd4q9j7bhk9kql8v5mnfg5m"; depends=[Rcpp Rcpp]; };
+recosystem = derive { name="recosystem"; version="0.3"; sha256="064rnnz4m85mwq3084m0ldj8sb5z6jwzqzkh22fagsq2xyqri15l"; depends=[Rcpp Rcpp]; };
 redcapAPI = derive { name="redcapAPI"; version="1.3"; sha256="08js2lvrdl9ig0pq1wf7cwkmvaah6xs65bgfysdhsyayx0lz5rii"; depends=[chron DBI Hmisc httr stringr]; };
+redist = derive { name="redist"; version="1.1"; sha256="0ddwvmzmqv5nm3azia1g0x0icj1jcd7s34f1kv01phky2pmz5wy4"; depends=[Rcpp spdep sp coda Rcpp RcppArmadillo]; };
 ref = derive { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; };
 refGenome = derive { name="refGenome"; version="1.3.0"; sha256="121aw4w84hlhxgwlf1gh0w3ydvd8zsijrh0q7fzcwi1vdgnjb7lv"; depends=[doBy RSQLite DBI]; };
 referenceIntervals = derive { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot extremevalues car outliers]; };
@@ -5500,7 +5605,7 @@ regpro = derive { name="regpro"; version="0.1.0"; sha256="0d47ffsqx1633pmf3abi7w
 regress = derive { name="regress"; version="1.3-14"; sha256="0qnks28fr8siq95iiiqyvz82cbdg14i18rj7g9rqyjhiam12fshl"; depends=[]; };
 regsubseq = derive { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; };
 regtest = derive { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; };
-rehh = derive { name="rehh"; version="1.12"; sha256="0qqmh48vxi1yqf6ykfsi6wighly5msf4lqx058lbn555g3vg17jp"; depends=[gplots]; };
+rehh = derive { name="rehh"; version="1.13"; sha256="0hi9bfclai1b948yq9fp1q7rxb8nwvdm368l09la8ghlgxi5lnm8"; depends=[gplots]; };
 relSim = derive { name="relSim"; version="0.2-0"; sha256="0cqcp7r263sk874l17wz84mzm4b1dxbfbsk74937rcz1wfc623k5"; depends=[Rcpp Rcpp]; };
 rela = derive { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; };
 relaimpo = derive { name="relaimpo"; version="2.2-2"; sha256="1rxjg2yw2gyshaij98w83cshxwscnq3ql7bg13n7v4nbjsi1l6zh"; depends=[MASS boot survey mitools corpcor]; };
@@ -5512,7 +5617,7 @@ reldist = derive { name="reldist"; version="1.6-4"; sha256="0v86wws29zy67jidrvfx
 relevent = derive { name="relevent"; version="1.0-4"; sha256="10bf1s7jmas8ck1izqibqcaqg4z55ciwdpd9pm2697y8z0jhr2rj"; depends=[trust sna coda]; };
 reliaR = derive { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; };
 relimp = derive { name="relimp"; version="1.0-4"; sha256="1i9j218b6lh6ag4a8x4vwhmqqclbzx46mpwd36s8hdqayzs6lmad"; depends=[]; };
-relsurv = derive { name="relsurv"; version="2.0-4"; sha256="1da3sj7hks5azm18m23fh8r2g02p0nivgilayndxwwvd1i70ycrx"; depends=[survival date MASS]; };
+relsurv = derive { name="relsurv"; version="2.0-5"; sha256="0lwmdz1hm46qlkvfvvyc2v592lx2crs3cxjpkph0vg5w6a0k10i4"; depends=[survival date]; };
 remMap = derive { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; };
 remix = derive { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[plyr survival Hmisc ascii]; };
 remote = derive { name="remote"; version="0.3.0"; sha256="1f41j26grkv4830bvi6z16b63yksplrq3yg1amd4l634lwhp6x55"; depends=[Rcpp raster foreach Rcpp]; };
@@ -5520,7 +5625,7 @@ rentrez = derive { name="rentrez"; version="0.4.1"; sha256="1prpzfq5106f0r5z4ffj
 repfdr = derive { name="repfdr"; version="1.1-3"; sha256="15f7x7vqwlpyzvzsybyz825a9dmglbrngjmajrsqlwffypgxjvi8"; depends=[]; };
 replicatedpp2w = derive { name="replicatedpp2w"; version="0.1-1"; sha256="0q6mfrdjpx6nh4xgr5i7ka3xvnx9585xdhni020q4pm05rhimid2"; depends=[spatstat]; };
 replicationInterval = derive { name="replicationInterval"; version="0.3"; sha256="1zqs114514xj59dlkhw5kmq73grghmb3i5rnnq05qzgf5wjn581i"; depends=[MBESS]; };
-repmis = derive { name="repmis"; version="0.4.2"; sha256="1pjf010h4rkrwarq541wh8x1267894fsdg8na41z8cp3hr5aql21"; depends=[data_table digest httr plyr R_cache]; };
+repmis = derive { name="repmis"; version="0.4.4"; sha256="12sw9l2nifkvri5kvgf0br7yqqmjlq5rj58g6yik8gh7wwy5157z"; depends=[data_table digest httr plyr R_cache]; };
 repolr = derive { name="repolr"; version="2.0"; sha256="10wg07sfxcxzswf3zh5sx2cm9dxjx11zymy82a4q9awnacb5gp9b"; depends=[gee]; };
 reportRx = derive { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[reshape survival xtable aod cmprsk geoR stringr]; };
 reportr = derive { name="reportr"; version="1.1.2"; sha256="0lxnmay9vgg7dsa3scszx3v4lb6m3bv6kjl0dk7hrl7bd67azdrk"; depends=[]; };
@@ -5528,20 +5633,21 @@ reports = derive { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdx
 reporttools = derive { name="reporttools"; version="1.1.1"; sha256="0cnxzq679f860z063j3pbm2c5qcaz45g73khj9rdp3if0cci8ikj"; depends=[xtable]; };
 repra = derive { name="repra"; version="0.4.2"; sha256="1djcs83z8ckpmsbyzscnysmy45z28kswzm852176b9pip21mb1w8"; depends=[data_table dplyr Rcpp reshape2 ggplot2 assertthat Rcpp]; };
 represent = derive { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
-reproducer = derive { name="reproducer"; version="0.1.2"; sha256="067yj1dhhikjrnkklsfp6p03gp4lqxwfdwhl6z8djj4rkzi48xm5"; depends=[openxlsx ggplot2 gridExtra]; };
+reproducer = derive { name="reproducer"; version="0.1.3"; sha256="1pz2l123xc16m1pqi95khg9r267s25igcyjgr7hn9gy623cqgzah"; depends=[openxlsx ggplot2 gridExtra tm wordcloud RColorBrewer xtable metafor]; };
 rerddap = derive { name="rerddap"; version="0.1.0"; sha256="1a58vsm1m9ybafda6pak0fa7kdfscslq9855a5r2x12bzqy98k4f"; depends=[httr dplyr data_table jsonlite xml2 digest ncdf]; };
 resample = derive { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; };
 resemble = derive { name="resemble"; version="1.1.1"; sha256="0mz5mxm6p1drfx2s9dx35m2bnvirr8lkjjh5b4vdk9p2cdv1qkkv"; depends=[RcppArmadillo foreach iterators pls Rcpp Rcpp RcppArmadillo]; };
 reshape = derive { name="reshape"; version="0.8.5"; sha256="08jm9fb02g1fp9vmiqmc0yki6n3rnnp2ph1rk8n9lb5c1s390f4k"; depends=[plyr]; };
 reshape2 = derive { name="reshape2"; version="1.4.1"; sha256="0hl082dyk3pk07nqprpn5dvnrkqhnf6zjnjig1ijddxhlmsrzm7v"; depends=[plyr stringr Rcpp Rcpp]; };
 reshapeGUI = derive { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[reshape2 plyr gWidgets gWidgetsRGtk2]; };
+restimizeapi = derive { name="restimizeapi"; version="1.0.0"; sha256="1ss6fng5pmqg6cafc256g9ddz8f660c68ysxfan6mn4gdaigz7lb"; depends=[RCurl RJSONIO]; };
 restlos = derive { name="restlos"; version="0.1-3"; sha256="03bsakp9kd8i468wz7xhdjqb6ck6p9wci3gk2b2bykv73c0g6n95"; depends=[som rgl geometry igraph]; };
 restorepoint = derive { name="restorepoint"; version="0.1.5"; sha256="0xmpxprirnd1yavwk3vkc0cp715d187mn0amppya7kd47iw10wsy"; depends=[]; };
 retimes = derive { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; };
 retistruct = derive { name="retistruct"; version="0.5.10"; sha256="1wg2a906y09hcqba42hh9r2x59w35dms2aa5mw44avigc1nwm0s2"; depends=[foreign RImageJROI png ttutils sp geometry RTriangle rgl R_matlab]; };
 retrosheet = derive { name="retrosheet"; version="1.0.2"; sha256="079rfc55sy315i7zhv1a8r6drgpiglbf3b4gwyria2mfbn94a5qb"; depends=[RCurl XML data_table stringi]; };
 reutils = derive { name="reutils"; version="0.1.2"; sha256="0f2c6zxk6x2plq649b1ml6b112j6y8ys074pn30yw35ncg3h86fa"; depends=[assertthat RCurl XML]; };
-reval = derive { name="reval"; version="1.0"; sha256="14vzsg3azggfrm1cnrxigbhnpxpjifjf61r71hf73ggpspx2gj5r"; depends=[doParallel foreach]; };
+reval = derive { name="reval"; version="2.0.0"; sha256="1yxkyc6wdp5h3cp8i42a9cf0b1cwr4nmpd7svlp7bpfxlcnqqa0d"; depends=[doParallel foreach]; };
 revealedPrefs = derive { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkjznzgwxfbnmrfiafq43cyf0i5hjy68ybxc7bbvfryxc"; depends=[Rcpp Rcpp RcppArmadillo]; };
 reweight = derive { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
 rex = derive { name="rex"; version="1.0.1"; sha256="1k1s5rx3lpyh6apakaf4mw94y72zkxf14c2kj0d9njhf5j6g1sdj"; depends=[magrittr lazyeval]; };
@@ -5551,30 +5657,31 @@ rfUtilities = derive { name="rfUtilities"; version="1.0-1"; sha256="0y0jn4c5dpr9
 rfigshare = derive { name="rfigshare"; version="0.3.6"; sha256="1n6i5ppn3v93126gvva8sn85v1h4f7hgc43pxja9bwr1ypmzgr45"; depends=[RJSONIO httr httpuv plyr yaml ggplot2 XML]; };
 rfishbase = derive { name="rfishbase"; version="0.2-2"; sha256="09pa5zpw9rclf5pqj1wjjhdcblca9sm9xcs9ka3xfa7azj7n9ljd"; depends=[XML RCurl]; };
 rfisheries = derive { name="rfisheries"; version="0.1"; sha256="1g0h3icj7cikfkh76yff84hil23rfshlnnqmgvnfbhykyr2zmk61"; depends=[httr data_table assertthat ggplot2 rjson]; };
-rfoaas = derive { name="rfoaas"; version="0.1.3"; sha256="0wdb645fx2wsy4vwz43d8ynwx3divpjwbkql52zkikyr8zv21gz5"; depends=[httr]; };
+rfoaas = derive { name="rfoaas"; version="0.1.6"; sha256="0wfpf6k0xsjzpabyziqyllksj1p9n6ix1lnk02mkz0bzl97hnilq"; depends=[httr]; };
 rfordummies = derive { name="rfordummies"; version="0.1.1"; sha256="0k725wgba9132cfbm0ppgy476iyh9gcn6bdh9gjqab5sj3jb0iva"; depends=[]; };
 rforensicbatwing = derive { name="rforensicbatwing"; version="1.3"; sha256="0ff4v7px4wm5rd4f4z8s4arh48hgayqjfpnni2997c92wlsq3d12"; depends=[Rcpp Rcpp]; };
 rgabriel = derive { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; };
 rgam = derive { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp Rcpp RcppArmadillo]; };
 rgauges = derive { name="rgauges"; version="0.2.0"; sha256="0p42hh32wcjcchsalpsan52kvz6nd1gw28xnydqgfzkzcqkl22dd"; depends=[ggplot2 lubridate plyr httr reshape2 gridExtra scales data_table]; };
-rgbif = derive { name="rgbif"; version="0.8.0"; sha256="1sdjlymymfc5chnrc5if0fvf64mjz6sc4071xsw2ja7zcdasxb40"; depends=[XML plyr ggplot2 maps httr rgeos sp data_table stringr whisker magrittr jsonlite]; };
+rgbif = derive { name="rgbif"; version="0.8.4"; sha256="13rcqqa19w3gzab4xg006kj7m5zj4x1hbxpam8yg1r3n9dad1bjz"; depends=[XML ggplot2 httr data_table whisker magrittr jsonlite V8]; };
 rgcvpack = derive { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; };
-rgdal = derive { name="rgdal"; version="0.9-2"; sha256="0jzhjy3qnb9aimmwyssinbyxz49hzcfksmxhsqyz3g8868k946g5"; depends=[sp sp]; };
+rgdal = derive { name="rgdal"; version="0.9-3"; sha256="011vw2pgaxgbba0a0c5ha2n0haljbn00z5km13fhgqlvhhdhzd6n"; depends=[sp sp]; };
 rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w8c0whcxpchsx7bwjzk1q5sfqxswclqq0g"; depends=[]; };
-rgeos = derive { name="rgeos"; version="0.3-8"; sha256="0snbfxzh700fn415li0wia94zgb0x73vwdrbrpimvz9k3y43yvp8"; depends=[sp sp]; };
+rgeos = derive { name="rgeos"; version="0.3-11"; sha256="1x5fna4n5ck0wfdrplj5q5cvv289fzsmlr95q86na78lvwn14fzl"; depends=[sp sp]; };
 rgexf = derive { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[XML Rook igraph]; };
 rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; };
 rgl = derive { name="rgl"; version="0.95.1247"; sha256="1zmb09lljng1dmwd23w5ld8z9wr0xd0s365vz54il0ndwrqfhsi1"; depends=[]; };
-rglobi = derive { name="rglobi"; version="0.2.6"; sha256="042lc71j49bndlmcxmqdjly48qvqjpif7dgzk4cxsmbil5jmyzks"; depends=[rjson RCurl]; };
+rglobi = derive { name="rglobi"; version="0.2.8"; sha256="1033cmwairf4nm9r6nvi1ddgq0j9mzchlzvj1hph0vlcbb53ybqh"; depends=[rjson RCurl]; };
 rgp = derive { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq80dy2w1hk4c80pfwrxc6n03g"; depends=[emoa]; };
 rgpui = derive { name="rgpui"; version="0.1-2"; sha256="0sh5wj4f2wj6g3r7xaq95q89n0qjavchi5kfi6sj1j34ykybbs3g"; depends=[rgp shiny emoa]; };
 rgr = derive { name="rgr"; version="1.1.11"; sha256="01hlj3nqzfsffr4k7d3iyp4mfqs1sy94d0scy64wh9kkplrzkh4i"; depends=[MASS fastICA]; };
 rgrass7 = derive { name="rgrass7"; version="0.1-0"; sha256="19fwf3gaq25x3imj9kc1112cf9dhafp0d1gjly2xh2gz1kam5wl6"; depends=[sp XML]; };
 rhosp = derive { name="rhosp"; version="1.06"; sha256="0kii29w292kffxablqnmgvl127jwsriz0p5y5d1xd6n8yzji79j3"; depends=[]; };
 ri = derive { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; };
-riceware = derive { name="riceware"; version="0.2"; sha256="1rd64saags4s7nadpbi38h8m8mw6y44lmdi8vmg58mglkfcbqf32"; depends=[random]; };
+riceware = derive { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; };
 rich = derive { name="rich"; version="0.3"; sha256="122xb729xlm8gyb7b3glw4sdvrh98wh89528kcbibpx83bp3frc0"; depends=[boot vegan permute]; };
 ridge = derive { name="ridge"; version="2.1-3"; sha256="1i5klabnv328kgy7p11nwdid2x7hzl1j80yqqshbraladszyfpwk"; depends=[]; };
+ridigbio = derive { name="ridigbio"; version="0.2.2"; sha256="065pad7pprax1mgqikjrl4nygyw5mjr80j21072zb7qcki9ag2k5"; depends=[httr jsonlite]; };
 rinat = derive { name="rinat"; version="0.1.4"; sha256="1m5k1wcinm6is3mf86314scgy3xfifz7ly7il5zgqyg9jkkpywbz"; depends=[httr plyr jsonlite ggplot2 maps]; };
 rindex = derive { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; };
 ringbuffer = derive { name="ringbuffer"; version="1.1"; sha256="1jj6zdvqlkc30bnxapg0sjl5ci5kq76611smqc4jc8adzhzwrh3f"; depends=[]; };
@@ -5589,15 +5696,16 @@ rite = derive { name="rite"; version="0.3.4"; sha256="196ashcfj5p52qpnpnrkg7vxq8
 riv = derive { name="riv"; version="2.0-4"; sha256="1c9k62plqgxcgcm2j1s26hqvgww96n6bfjz2yk7m3p2wf8gkkyam"; depends=[MASS rrcov quantreg]; };
 rivernet = derive { name="rivernet"; version="1.0"; sha256="0za5k00k9vivpq4wr1xqc4aw7mlcxhjj2b3iiip1qy13fg7bhbjm"; depends=[]; };
 riverplot = derive { name="riverplot"; version="0.3"; sha256="1x02ci6744k3lsqh53vmpmv957b5wwr1idvn16nzixvzknixryq8"; depends=[]; };
-rivervis = derive { name="rivervis"; version="0.45.0"; sha256="0dc02m923l1y689rd13zxz1122l8cipr4m2cf2bw7pis7zr3m119"; depends=[]; };
+rivervis = derive { name="rivervis"; version="0.46.0"; sha256="19jsl5g46jcbc0kg47bsif1wrw9z9brgvwdcxqjc89shnx3hzzfv"; depends=[]; };
 rivr = derive { name="rivr"; version="0.9.2"; sha256="1xz7l7j8adhlzdasx9ljrh8z6cx017pl6761z8q4ixpcgr3vf5ws"; depends=[Rcpp reshape2 Rcpp]; };
 rjade = derive { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; };
 rjags = derive { name="rjags"; version="3-15"; sha256="02nmaqv0xddh7bgrlwrr30gb10mcz2f5lilbyzfw6wpjgi2aihx5"; depends=[coda]; };
 rje = derive { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; };
 rjson = derive { name="rjson"; version="0.2.15"; sha256="1vzjyvf57k1fjizlk28rby65y5lsww5qnfvgnhln74qwda7hvl3p"; depends=[]; };
-rjstat = derive { name="rjstat"; version="0.2"; sha256="1ylwp6d3cc8xb8129yr49grx9vb4xyp62ig0qa7vzkbdplba2zr2"; depends=[jsonlite assertthat]; };
+rjstat = derive { name="rjstat"; version="0.2.1"; sha256="0chb3mypmgqz7wncl01yy93xpz1mmlcc6x1cib37zxc8dy79jm1s"; depends=[jsonlite assertthat]; };
 rkafka = derive { name="rkafka"; version="1.0"; sha256="02h3nlffgd48xm38i2arlrgbilraf6r7k65s35906v33i0kjzrgg"; depends=[rJava RUnit rkafkajars]; };
 rkafkajars = derive { name="rkafkajars"; version="1.0"; sha256="0ss9gjjq92hba6nkhnda0pbm3a5bqm00hy0zbj4kivg5dlsf30q0"; depends=[rJava RUnit]; };
+rknn = derive { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjzb4jzghzd3whgjvm2rsmnabai95"; depends=[gmp]; };
 rkt = derive { name="rkt"; version="1.4"; sha256="01c8fwnml1n0sw5lw9p2nz15i1zhxirr0kh39qvjmdiw97c1v1yq"; depends=[]; };
 rkvo = derive { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp Rcpp]; };
 rlecuyer = derive { name="rlecuyer"; version="0.3-3"; sha256="1n0vny3k5s5152y0ggz9vfn4bqay9ncbdzkw9g4703pszrbwq7xh"; depends=[]; };
@@ -5635,10 +5743,10 @@ robust = derive { name="robust"; version="0.4-16"; sha256="0psai9d6w7yi0wfm57cc7
 robustDA = derive { name="robustDA"; version="1.1"; sha256="1yys6adkyms5r4sw887y78gnh97qqr7sbi5lxv5l9bnc4ggcfiz6"; depends=[MASS mclust Rsolnp]; };
 robustHD = derive { name="robustHD"; version="0.5.0"; sha256="14ql2k5880lbwkv1acydrli6jyh6dls32jjhimbz82zzkzfk2cxr"; depends=[ggplot2 perry robustbase MASS Rcpp RcppArmadillo]; };
 robustX = derive { name="robustX"; version="1.1-4"; sha256="1s2aav2jr22dgrl7xzk09yn9909k76kpiz271w5r1id6hpfprjwc"; depends=[robustbase]; };
-robustbase = derive { name="robustbase"; version="0.92-3"; sha256="0b7rld5pa9nrnqj7600ybvzy74lxz6s41dibamwdssh36mx6ayvb"; depends=[DEoptimR]; };
+robustbase = derive { name="robustbase"; version="0.92-4"; sha256="0dyz2wwfjq8bjjwi4fhm6v3sxmlh34bawppakl4l6dv7vpjsv85k"; depends=[DEoptimR]; };
 robustfa = derive { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; };
 robustgam = derive { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[Rcpp RcppArmadillo mgcv robustbase Rcpp RcppArmadillo]; };
-robustlmm = derive { name="robustlmm"; version="1.6"; sha256="18lhbnmcd6nc0qr23a19mhw9k9r30li6z92g600dil6ll8s5m54z"; depends=[lme4 Matrix ggplot2 lattice nlme robustbase xtable]; };
+robustlmm = derive { name="robustlmm"; version="1.7-2"; sha256="0cwr5fsl3m78xvfv3cy6n82zsdwsyq2zrlnzdppba9ja6hnh32wm"; depends=[lme4 Matrix ggplot2 lattice nlme robustbase xtable]; };
 robustloggamma = derive { name="robustloggamma"; version="0.4-31"; sha256="19ycdvpzns46gjnkddwznnszs0941blpss7l0cqligv91cz7bkjc"; depends=[robustbase]; };
 robustreg = derive { name="robustreg"; version="0.1-7"; sha256="1nrz10065mwccil78c74vmkhinskpnk1vyp1ikrdw23vyk2l00nc"; depends=[Rcpp Matrix Rcpp RcppArmadillo]; };
 robustvarComp = derive { name="robustvarComp"; version="0.1-2"; sha256="187mcpih509hx15wjjr7z2h6h76mz2v0d8xgsxjd8wz7l3dnlp2f"; depends=[robustbase GSE numDeriv robust plyr]; };
@@ -5650,6 +5758,7 @@ rootSolve = derive { name="rootSolve"; version="1.6.5.1"; sha256="02ydj4ydgljs80
 ropensecretsapi = derive { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RJSONIO RCurl]; };
 ror = derive { name="ror"; version="1.2"; sha256="0n8mk35rm3rp0c7a3i961kij21a177znh9hkq4snqqlw9vf50hdg"; depends=[rJava ROI ROI_plugin_glpk igraph]; };
 rorutadis = derive { name="rorutadis"; version="0.1.3"; sha256="0ik0dpmsyb4g9wl1fb7mm0dry9s26nfvv1v91cslss82phhf16wd"; depends=[Rglpk ggplot2 gridExtra]; };
+rotationForest = derive { name="rotationForest"; version="0.1"; sha256="07my0i84jvmjxvg2ifvsrbc0r5z4s32xi0vfdwrkhhdzdn87h527"; depends=[rpart]; };
 rotations = derive { name="rotations"; version="1.3"; sha256="01qqiqlp370llk8w9g0nip08cd54rj9dsvf0qxznalyb7vpnvgxf"; depends=[ggplot2 Rcpp rgl sphereplot Rcpp RcppArmadillo]; };
 roughrf = derive { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[randomForest mice nnet]; };
 rowr = derive { name="rowr"; version="1.1.2"; sha256="1hvj17n3fy1jaaz551s1icjv1kgr2s22xvg4fllzs8hpgdsybp1j"; depends=[]; };
@@ -5661,13 +5770,14 @@ rpart_plot = derive { name="rpart.plot"; version="1.5.2"; sha256="0aw0bhd0bliih7
 rpart_utils = derive { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; };
 rpartScore = derive { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; };
 rpartitions = derive { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; };
-rpf = derive { name="rpf"; version="0.44"; sha256="1q68lb7cw4p31mrjwxyn2bkpclmgfcnln8z0brs9pkkh70j0vii8"; depends=[mvtnorm RcppEigen]; };
+rpf = derive { name="rpf"; version="0.45"; sha256="1d22wjhv14rl16kljn42j4hba30x28zd5svddrpxp1kraxjq5mn7"; depends=[mvtnorm RcppEigen]; };
 rpg = derive { name="rpg"; version="1.4"; sha256="0sisn5l1qxlqg6jq4lzr7w3axkaw5jlpz8vl9gp2hs0spxsjhcyn"; depends=[Rcpp uuid RApiSerialize Rcpp RApiSerialize]; };
 rphast = derive { name="rphast"; version="1.6"; sha256="0ni8969bj3pv0wl8l0v352pqw2d5mlshsdw1rb6wlxk7qzfi5cl2"; depends=[]; };
-rplexos = derive { name="rplexos"; version="1.0"; sha256="129izg9ipn2pfm4yq0lg597nn9rcxr8m9yslmra85jmzbisc1vfw"; depends=[Rcpp dplyr RSQLite DBI data_table lubridate reshape2 stringi assertthat doParallel foreach Rcpp]; };
+rplexos = derive { name="rplexos"; version="1.1.1"; sha256="1s3srk5f1ciy43vblwsy7wrwp2k2j5q52dfl4vjg69i63bh9yrpf"; depends=[Rcpp dplyr RSQLite DBI data_table tidyr lubridate stringi doParallel foreach Rcpp]; };
 rplos = derive { name="rplos"; version="0.4.7"; sha256="0d6p6cgjmfv615mpvp6vxm92gxfdi6fn4mp0ixhj2gkm1hmpwwc5"; depends=[ggplot2 httr jsonlite XML dplyr plyr lubridate reshape2 whisker solr]; };
 rplotengine = derive { name="rplotengine"; version="1.0-5"; sha256="1wwpfnr5vi8z26alm8y5gply0y4iniagimldzy2z696djzz8p8p8"; depends=[xtable]; };
 rportfolios = derive { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; };
+rprime = derive { name="rprime"; version="0.1.0"; sha256="1v6n1qi0i7x8xgizbyvp1mnwc316lsan4rvam44fgjj45fcd79gd"; depends=[stringr stringi plyr assertthat]; };
 rprintf = derive { name="rprintf"; version="0.1-2"; sha256="1jsn6i3ikcdbrg8g89hmb1ky3a84fykx5gpnbswplhidh2qhb9jz"; depends=[stringr]; };
 rpsychi = derive { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; };
 rpubchem = derive { name="rpubchem"; version="1.5.0.2"; sha256="0lvi7m8jb2izsfia3c0qigsd1k1x9r02gymlwfg29pb8k10lwcjf"; depends=[XML car RCurl RJSONIO]; };
@@ -5680,22 +5790,23 @@ rrcov = derive { name="rrcov"; version="1.3-8"; sha256="0f71khnsvd95yh6y1hnl62vq
 rrcovHD = derive { name="rrcovHD"; version="0.2-3"; sha256="18k5c590wbi0kmx4nl1mkv7h6339as0s4jcr9am8v9v3w4pn0xni"; depends=[rrcov robustbase pls spls pcaPP]; };
 rrcovNA = derive { name="rrcovNA"; version="0.4-7"; sha256="1b3ffcs1szwswsayz8q3w87wndd7xbcg5rqamhjr2damgialx3bq"; depends=[rrcov robustbase lattice cluster norm]; };
 rredis = derive { name="rredis"; version="1.6.9"; sha256="00fgrhyj6bai0kc18c2m1fsk9ja5c9q7m6dpsb8wsn4gs79mw3sc"; depends=[]; };
+rriskDistributions = derive { name="rriskDistributions"; version="2.1"; sha256="1sc0bj5sivclbq0grif99vclnlhg1k9dz4xdvng6vv392xkwbmfd"; depends=[mc2d eha msm tkrplot]; };
 rrlda = derive { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[pcaPP mvoutlier glasso matrixcalc]; };
 rrules = derive { name="rrules"; version="0.1-0"; sha256="0f9msp289akzricjrm8dvfbh2dihfbszr7ms4fld1cr30zssajin"; depends=[]; };
 rsae = derive { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; };
 rsatscan = derive { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; };
-rscala = derive { name="rscala"; version="1.0.4"; sha256="05pgyzin0d5lfz5rjf0c0j7b2zj7b8r1blgd126kjlvjkj1spy84"; depends=[]; };
+rscala = derive { name="rscala"; version="1.0.6"; sha256="065ll2xza09hi05w4hq35jl6y1nvwrv93ld983nxaji81z9pfgzx"; depends=[]; };
 rscproxy = derive { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; };
 rsdepth = derive { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
 rsdmx = derive { name="rsdmx"; version="0.4-6"; sha256="0hsf0jkp31qfvl4pxaqxwz1fvwgmqld3rnbk9g29g5bqwld40syc"; depends=[XML RCurl plyr]; };
 rseedcalc = derive { name="rseedcalc"; version="1.2"; sha256="1di9bzwxyxm9gs14ks9z6sixi656hz9xwmq3aaqh53cjjr1ka0rc"; depends=[]; };
-rsem = derive { name="rsem"; version="0.4.5"; sha256="02vccj03bxisi2jwl31rwi4gw9i26g70aagdgg5gk8z0bys78v4d"; depends=[MASS lavaan]; };
+rsem = derive { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[MASS lavaan]; };
 rsgcc = derive { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene stringr snowfall]; };
 rsig = derive { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k6xyiwrhw08vhzz6mf3jxlqsh"; depends=[survival BBmisc glmnet superpc Matrix]; };
-rsm = derive { name="rsm"; version="2.07"; sha256="0d1kymgmprp41xvax6c5k881dxjgf6bnvpl4mh9l1pnjdcq7pyi5"; depends=[]; };
+rsm = derive { name="rsm"; version="2.7-2"; sha256="0pn018n36h1xhhlsimggbfgfgl9nh5a49x8amkqy3drrnamjl577"; depends=[]; };
 rsml = derive { name="rsml"; version="1.2"; sha256="1w9bqs32sn5ry5qjgnqnns56ylr59cq5kczjsssw3yvc8a8lr39x"; depends=[XML rgl]; };
 rsnps = derive { name="rsnps"; version="0.1.6"; sha256="1pqdmg1cwpm0cvr5ma7gzni88iq5kqv1w40v8iil3xvcmns8msjk"; depends=[plyr stringr httr RCurl XML jsonlite]; };
-rspa = derive { name="rspa"; version="0.1-6"; sha256="0zwmcjakpir8mvy8cvy8j85gar4s7gmizxc3z4mdrc4iadps9gqd"; depends=[editrules]; };
+rspa = derive { name="rspa"; version="0.1-7"; sha256="0hmdfj1cgy9fjfbrs8qvx79fkv5v1xr6vrwjp89lq0blhsnzn5k2"; depends=[editrules]; };
 rspear = derive { name="rspear"; version="0.1-2"; sha256="1rjg84plnvlcp3p2929f1afl43lb92d3bfsvlhsaw92z7iva1vad"; depends=[plyr]; };
 rstackdeque = derive { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; };
 rstiefel = derive { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9ldd7aihlhl3wndg4i4b3wy6rrrjkficrl1"; depends=[]; };
@@ -5717,12 +5828,12 @@ rtype = derive { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qd
 rucm = derive { name="rucm"; version="0.4"; sha256="1s3q6wfp9nb50rqsaq6h2wb48qvxncmlf8l4gm18pr25wkangfxq"; depends=[KFAS]; };
 rugarch = derive { name="rugarch"; version="1.3-4"; sha256="1za92hqfaws8azf2zml1q8mlbirrdw3rb4rvwg6sclfx7z7gsqkh"; depends=[Rsolnp nloptr ks numDeriv spd xts zoo chron SkewHyperbolic expm Rcpp Rcpp RcppArmadillo]; };
 runjags = derive { name="runjags"; version="2.0.1-4"; sha256="1any5f7paf8a8yyvk594iixvh1l1dc87pil292sd1pq1lh2510lw"; depends=[lattice coda]; };
-ruv = derive { name="ruv"; version="0.9.4"; sha256="07bvyqrkm10vh63l8dm93spd7l0v105a87lsbjw4vg65czp1iayg"; depends=[]; };
+ruv = derive { name="ruv"; version="0.9.5"; sha256="19n2zrbfg6kzks395iiv1wbz2zf1j25aap3iy3d8yspmasqxi93x"; depends=[]; };
 rv = derive { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrfb37hzkyy5szai52nqr2xij"; depends=[]; };
 rvHPDT = derive { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; };
 rvTDT = derive { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; };
 rvalues = derive { name="rvalues"; version="0.3"; sha256="0fkf0gngrx1rfa67blzf3xxjwhlp2m2jplxw3z3j9vgl6ray0nqs"; depends=[]; };
-rversions = derive { name="rversions"; version="1.0.0"; sha256="0k9v77bpxbxxmf5bdansg074zx3cm4hhaw6vl9f6c58xzxl567nf"; depends=[RCurl XML]; };
+rversions = derive { name="rversions"; version="1.0.1"; sha256="1qqar1cg8218dr4hp09629jx6yvwcnwxzp8grnqcmhbc5xyx76ch"; depends=[curl xml2]; };
 rvertnet = derive { name="rvertnet"; version="0.2.2"; sha256="14afdf0mflpa2arxdy44y8mak9j3cg2cgk97idd7k4pi8vf6q0jg"; depends=[plyr jsonlite httr data_table ggplot2 maps]; };
 rvest = derive { name="rvest"; version="0.2.0"; sha256="1bg9l0wzh9xs7rpacl8s6q33hkjvv85vsl8079qsri0lr856wni7"; depends=[httr XML selectr magrittr]; };
 rvgtest = derive { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
@@ -5741,7 +5852,7 @@ sGPCA = derive { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79
 sROC = derive { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; };
 sac = derive { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; };
 saccades = derive { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; };
-sadists = derive { name="sadists"; version="0.2.0"; sha256="156a1xzii2nkfismwbrfli5yxz52alpkqdi7maqlx9b1qrpybmhs"; depends=[PDQutils hypergeo orthopolynom]; };
+sadists = derive { name="sadists"; version="0.2.1"; sha256="0m3rlbhgzl0xvx8bcaswbi9nsrgfhdmkywx7ynayl6q0lmslhk6a"; depends=[PDQutils hypergeo orthopolynom]; };
 sads = derive { name="sads"; version="0.1.10"; sha256="02662vbbk3jikp506ljil9zqchs6bq3lsw4fwbbi2wgg7xvb260g"; depends=[MASS bbmle poilog VGAM untb]; };
 sae = derive { name="sae"; version="1.0-5"; sha256="05jvzq4cqb78pgdlxf8vlanx3v10n5njlw7g666nrnziy9ak8z4f"; depends=[nlme MASS]; };
 sae2 = derive { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; };
@@ -5750,7 +5861,7 @@ saemix = derive { name="saemix"; version="1.2"; sha256="1whwn54iiapdfig6qpzji3z3
 saery = derive { name="saery"; version="1.0"; sha256="09x1v627llqbpiwkh1wr0z7gsndfdrjzag2hprhq1adbzh05k47z"; depends=[]; };
 safeBinaryRegression = derive { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; };
 safi = derive { name="safi"; version="1.0"; sha256="1km58w57kdmyfj4a97zhnjcka4q4pxm8r2br01qq2niaihpbzp98"; depends=[]; };
-sampSurf = derive { name="sampSurf"; version="0.7-2"; sha256="1bj1m5c8bx8i4jyk6kdgcfmgfj15iirxwg259r0c4fk7whcnfz59"; depends=[sp raster rasterVis boot]; };
+sampSurf = derive { name="sampSurf"; version="0.7-3"; sha256="165y2z9bhf7cyrh177fk87apqpgzyn69gf53f9mmii931cyykihw"; depends=[sp raster rasterVis boot]; };
 sampleSelection = derive { name="sampleSelection"; version="1.0-2"; sha256="1hzvvwvqp6v9d6ldm17kx3g8pbgngw2pxklny0b3man47zh5jshc"; depends=[maxLik miscTools systemfit Formula]; };
 samplesize4surveys = derive { name="samplesize4surveys"; version="2.4.0.900"; sha256="199g2gsbv1w1acn7nnlv2wbrhq7lc1mx8vvs1w9a9a8dkxdmml0g"; depends=[TeachingSampling]; };
 sampling = derive { name="sampling"; version="2.6"; sha256="11r8p29kwc0ggycbv7sm1zmazmfm4p5207l764ad4znjib0cab6p"; depends=[MASS lpSolve]; };
@@ -5785,25 +5896,26 @@ schwartz97 = derive { name="schwartz97"; version="0.0.6"; sha256="0l34f30l75zrg3
 scidb = derive { name="scidb"; version="1.2-0"; sha256="17y1bml8kb896l3hsw356qdj25sfbdvm10dyxhaafdgcbp5ywcrn"; depends=[Matrix iterators RCurl zoo digest]; };
 scio = derive { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; };
 sciplot = derive { name="sciplot"; version="1.1-0"; sha256="0na4qkslg3lns439q1124y4fl68dgqjck60a7yvgxc76p355spl4"; depends=[]; };
+score = derive { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; };
 scoring = derive { name="scoring"; version="0.5-1"; sha256="0vxjcbp43h2ipc428qc0gx7nh6my7202hixwhnmspl4f3kai3wkp"; depends=[]; };
 scout = derive { name="scout"; version="1.0.3"; sha256="0wmjmk0ckd211cq5ykd0yzjschs7fkg04w67arl4pwma0z5z56lq"; depends=[glasso lars]; };
 scrapeR = derive { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[XML RCurl]; };
 scrime = derive { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; };
 scriptests = derive { name="scriptests"; version="1.0-15"; sha256="1f55rnz4zbywyn79l2ac2600k95fwxgnyh1wzxvyxjh4qcg50plv"; depends=[]; };
-scrm = derive { name="scrm"; version="1.5.0-1"; sha256="176k3qmlfs1cj8gm421p3hivs434xvm6ch3gva7x7766vz5mxi39"; depends=[Rcpp Rcpp]; };
+scrm = derive { name="scrm"; version="1.6.0-2"; sha256="1a3m56j4ca526mjhc7h0967k5bja336dw1bpna119l5yic6hkc1n"; depends=[Rcpp Rcpp]; };
 scrypt = derive { name="scrypt"; version="0.1.0"; sha256="1hc1rziigwggdx2pvklldkw88mdzbwa8b8a2a0ip4cm1w6flsl9n"; depends=[Rcpp Rcpp]; };
 scuba = derive { name="scuba"; version="1.7-0"; sha256="11mdc8pj552ag36ib4sfbjv8r0psa6wnb13spz0v3rbaslz25hpw"; depends=[]; };
 sda = derive { name="sda"; version="1.3.6"; sha256="1igdkgpxlni4d8h5k912aikbd66jqkabzq144xlgd2vp3kcbw4ly"; depends=[entropy corpcor fdrtool]; };
 sdcMicro = derive { name="sdcMicro"; version="4.5.0"; sha256="1cz34g6si7f8kgybcvcsr0lkcspqp3vrkvfqsfdjd0mb8lv5pbjj"; depends=[brew knitr data_table xtable car robustbase cluster MASS e1071 Rcpp sets Rcpp]; };
 sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.2.0"; sha256="0bhrpric17y1ljm18a00i6bkxfq1cpljfkib8qbb4jyj5s50f3ps"; depends=[sdcMicro gWidgetsRGtk2 gWidgets cairoDevice vcd foreign Hmisc]; };
-sdcTable = derive { name="sdcTable"; version="0.18.0"; sha256="13k96ahz6vzvbnvca18p0r1pv9k6sdmxbq04cf76an7r2g4w6kji"; depends=[stringr Rcpp Rglpk lpSolveAPI data_table Rcpp]; };
+sdcTable = derive { name="sdcTable"; version="0.18.1"; sha256="18l6d6q6pawvswj1v9mfmcg4m94dkp38yd2mnndz9l7qmvf6n7kx"; depends=[stringr Rcpp Rglpk lpSolveAPI data_table Rcpp]; };
 sdcTarget = derive { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[magic foreach doParallel tuple]; };
 sddpack = derive { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
 sde = derive { name="sde"; version="2.0.13"; sha256="194dkwrww9win5chhlffjv1xkhpxx2bcv6hf81xaqk7pdf7ifj80"; depends=[MASS fda zoo]; };
 sdef = derive { name="sdef"; version="1.5"; sha256="1xmx3nfjjfh6zw1vq7iip4rnshh40azja83xyvnz04jcv574vhxm"; depends=[]; };
 sdmvspecies = derive { name="sdmvspecies"; version="0.3.1"; sha256="1rpbj55598862vb4bwrvcbskm10xibsvx58fpvkn58zbm6ab2534"; depends=[GPArotation ggplot2 psych raster]; };
 sdnet = derive { name="sdnet"; version="2.03.3"; sha256="1884pil3brm7llczacxda6gki501ddyc5m8ggqjix64kbvw37slv"; depends=[]; };
-sdprisk = derive { name="sdprisk"; version="1.1-0"; sha256="03nbvrrgzcnczj1zsnqakjy278bg15vva6yb35clks5zyipl0qdk"; depends=[numDeriv PolynomF rootSolve]; };
+sdprisk = derive { name="sdprisk"; version="1.1-3"; sha256="1rwzi112fjckzxmhagpg60qm9a35fqx8g8xaypxsmnml6q00ysiq"; depends=[numDeriv PolynomF rootSolve]; };
 sdtoolkit = derive { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
 sdwd = derive { name="sdwd"; version="1.0.1"; sha256="1df8xx538ba3axi0jbkvyrdl7qnmkvh1x15kh57jmw3qbpf5gh56"; depends=[Matrix]; };
 seacarb = derive { name="seacarb"; version="3.0.6"; sha256="0xhyy8nd20f29j9y3x250fq8qp57gdv61gg4ck24v4jbl8qvwhla"; depends=[oce]; };
@@ -5823,13 +5935,15 @@ seewave = derive { name="seewave"; version="1.7.6"; sha256="1sh2i9hb8v0awhczvkj8
 seg = derive { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; };
 segmag = derive { name="segmag"; version="1.2.2"; sha256="130saznhssg0qsc34fcw80x92mmqhjgizrb4fxpjsg7a8jjrclp8"; depends=[Rcpp Rcpp]; };
 segmented = derive { name="segmented"; version="0.5-1.1"; sha256="0rkbhg8wwqk08jfd29sh4ifx427kmd4mfqrssllckha9hcglqhz7"; depends=[]; };
+seismic = derive { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; };
 seismicRoll = derive { name="seismicRoll"; version="1.0.1"; sha256="1lls2gbx994j7y3kwpf00ngga5qlzqxwc3cy9x21gy9iq2s8hn0x"; depends=[Rcpp Rcpp]; };
 selectMeta = derive { name="selectMeta"; version="1.0.7"; sha256="1ibiiddl9km8dahfc3kdpl42k43fx4mqgqibxgv5q8zbcp2829p9"; depends=[DEoptim]; };
 selectiongain = derive { name="selectiongain"; version="2.0.40"; sha256="1xzvz747242wfv789dl3gqvgbc8l1c4i2r3p95766ypcjw51j55d"; depends=[mvtnorm]; };
 selectr = derive { name="selectr"; version="0.2-3"; sha256="1ppm1f6mwfwbq92iwacyjn46k1d8148j4zykmjvw8as6c8blgap1"; depends=[XML stringr]; };
 selectspm = derive { name="selectspm"; version="0.1"; sha256="0bihyjaacpyjnm5vznix8krw2sqmy62in33hmb5yj4yidwz1gpv0"; depends=[spatstat ecespa]; };
+selfea = derive { name="selfea"; version="1.0"; sha256="02ncccyjgdpp9hkd278jg8x1c3566fqhfmmh423596b1slzs8gqm"; depends=[pwr MASS plyr]; };
 selfingTree = derive { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; };
-sem = derive { name="sem"; version="3.1-5"; sha256="093kklhl9fnawpwj3km1q0px6fm40kc3vg7kw93y3yb6hniwla35"; depends=[matrixcalc]; };
+sem = derive { name="sem"; version="3.1-6"; sha256="1gx0j3ignpmgy3qvnp0qjmhlzbxj0wjfr6jfs9d29cnq8b38p73c"; depends=[matrixcalc MASS boot mi DiagrammeR]; };
 semGOF = derive { name="semGOF"; version="0.2-0"; sha256="1lsv72yaza80jqadmah7v2cpfqfay57y12hcz6brvia6bmr5qagb"; depends=[sem MASS matrixcalc]; };
 semPLS = derive { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; };
 semPlot = derive { name="semPlot"; version="1.0.1"; sha256="0sdp970qb4mz5vzncfmqxvg1z12gmiyqi3yaz9x2drm3rgzavy83"; depends=[qgraph lavaan sem plyr XML igraph lisrelToR rockchalk colorspace corpcor]; };
@@ -5853,18 +5967,18 @@ seqMeta = derive { name="seqMeta"; version="1.5"; sha256="1igag08qkfvkx83w6jjyfm
 seqPERM = derive { name="seqPERM"; version="1.0"; sha256="1i8ai4gxybh08wxjh96m6xlqxhh7ch0xihjs879snmy4zqfi0pap"; depends=[]; };
 seqRFLP = derive { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; };
 seqinr = derive { name="seqinr"; version="3.1-3"; sha256="0bbjfwbqg74wsamb3iz01g0ssdpdpg65gh00y9xlnpk4wb990n4n"; depends=[ade4]; };
-seqminer = derive { name="seqminer"; version="3.4"; sha256="1fl7mmqs3y0vpfhqss7syafwli67jwha703fyailxixq7djvwf9f"; depends=[stringr]; };
+seqminer = derive { name="seqminer"; version="4.2"; sha256="026minlmqf4n6pznkzkm6daqa7pj7hmis0i2azdy2m56a9hkj52z"; depends=[stringr]; };
 seqmon = derive { name="seqmon"; version="0.2"; sha256="075hc6vgl1w3nisrihf5w6mkkg9q601jsqxm9hk9yagyvvd7d78w"; depends=[]; };
 sequences = derive { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp Rcpp]; };
 sequenza = derive { name="sequenza"; version="2.1.1"; sha256="0vrdmfy8qyzjflyl5skcy9mazl56py5gzb1kn1xh2hiv3mshdrfx"; depends=[squash]; };
-seriation = derive { name="seriation"; version="1.0-14"; sha256="0a7m1x6dhk00wh6djiz75x462y06fammr7fd2z8ks32migsbbvpp"; depends=[TSP cluster gclus colorspace MASS]; };
-seroincidence = derive { name="seroincidence"; version="1.0.3"; sha256="1qk11xrv2qnw3wmcg357m9nbnc1qr3wl2nznj8xw10r3jc1736s8"; depends=[]; };
+seriation = derive { name="seriation"; version="1.1-0"; sha256="0lbkv005ws4khwp12mygrpvxxdz8g5a7q2xl62k43sz6vj7cp8cn"; depends=[TSP cluster gclus colorspace MASS gplots registry]; };
+seroincidence = derive { name="seroincidence"; version="1.0.4"; sha256="0m3hlbv3277qyhqi3liwbna7czd6kdc7gqaxc7xn5x8d2hsc45hk"; depends=[]; };
 servr = derive { name="servr"; version="0.2"; sha256="0gah99snaj8lk5zfzbxi3jwvpnlff9diz9gqv4qalfxpmb7fp6lc"; depends=[mime httpuv jsonlite]; };
 sesem = derive { name="sesem"; version="1.0.1"; sha256="0s4xkv6bc5nxhj09mk9agnj11b9h7swccs9jrn4lg3fy12vqhf5a"; depends=[lavaan mgcv gplots]; };
 session = derive { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; };
 setRNG = derive { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; };
 sets = derive { name="sets"; version="1.0-14"; sha256="1wfg4yc3p7zqcj2z3lb5knv6l3lw4pf20s3rkpz4yj4nsb41zs4g"; depends=[]; };
-settings = derive { name="settings"; version="0.2.1"; sha256="0dxnysa3857d141rk46pyfkbgzk6ms3fhb2bz0y41jy72bdhxmrm"; depends=[]; };
+settings = derive { name="settings"; version="0.2.2"; sha256="0bssy42kkb1aww9yndkyw3bj1jn3akvwsvhj0cz16r3a7jfcav7h"; depends=[]; };
 setwidth = derive { name="setwidth"; version="1.0-3"; sha256="1s6m24kmkafscgibgfldm70m57bv4gs0m7fdki18nwdi1rvwpkbf"; depends=[]; };
 severity = derive { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; };
 sfa = derive { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; };
@@ -5874,18 +5988,18 @@ sgPLS = derive { name="sgPLS"; version="1.2"; sha256="1q3pf4sfh8l2qwxm0qd3sg29kv
 sgd = derive { name="sgd"; version="0.1"; sha256="16jqzshkg1n1azyfjadyg454ar0hk2dmw9ba1wrn6rh7mxsngik6"; depends=[Rcpp MASS Rcpp RcppArmadillo BH]; };
 sgeostat = derive { name="sgeostat"; version="1.0-25"; sha256="04zl932s6zb26r42h2l8qf3d43bmrq67281mrkh4spn4vcddv5da"; depends=[]; };
 sglOptim = derive { name="sglOptim"; version="1.0.122.1"; sha256="0ld53rdxai85r9hwz9jrsxr08lxin0ksxa6823r7cr96w18c1ssm"; depends=[Matrix Rcpp RcppProgress RcppArmadillo BH]; };
-sglasso = derive { name="sglasso"; version="1.2"; sha256="1y2ms6p792klzmy3prhsyanlbp7n004di9hscma7ih3jx9703wsr"; depends=[Matrix igraph]; };
+sglasso = derive { name="sglasso"; version="1.2.1"; sha256="18dag7wvz0l959igg4g77psi8idvqyikg676yy9ga3k69kl11hdk"; depends=[Matrix igraph]; };
 sglr = derive { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; };
 sgof = derive { name="sgof"; version="2.2"; sha256="087f4nbx9ppzi5za3f4w4msq2gd3r08v16fihppa30nqydg3ssbj"; depends=[poibin]; };
 sgr = derive { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; };
 sgt = derive { name="sgt"; version="1.1"; sha256="0j4xxh5lypcl0hyfx7gzrhb40z36ygn97hf1nl6m8wj4dncg39jf"; depends=[maxLik]; };
 shape = derive { name="shape"; version="1.4.2"; sha256="0yk3cmsa57svcvbnm21pyr0s0qbhnllka8nmsg4yb41frjlqph66"; depends=[]; };
-shapeR = derive { name="shapeR"; version="0.1-3"; sha256="12j6qawnhv7i1488wkh8shm3shzi7g58r8pk9p10lm0bwi59l2l8"; depends=[gplots jpeg pixmap wavethresh vegan MASS]; };
+shapeR = derive { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg pixmap wavethresh vegan MASS]; };
 shapefiles = derive { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; };
 shapes = derive { name="shapes"; version="1.1-10"; sha256="038xps6f8b6w9qa9csqk33ggmb311h5zxwsxr027bd95a3vmyijx"; depends=[scatterplot3d rgl MASS]; };
 sharpshootR = derive { name="sharpshootR"; version="0.7-2"; sha256="04plsgmyil6znmcqx2j78n2vjj4y4mprb3wqbhwagapdhvp9rcis"; depends=[aqp ape soilDB igraph cluster lattice latticeExtra vegan sp reshape2 Hmisc scales circular RColorBrewer plyr]; };
 sharx = derive { name="sharx"; version="1.0-4"; sha256="1flcflx6w93s8bk4lcwcscwx8vacdl8900ikwkz358jbgywskd5n"; depends=[Formula dcmle dclone]; };
-shiny = derive { name="shiny"; version="0.11.1"; sha256="1aplb2wvgsbg6hhjsyjjhd8qbj11yrzm10rr812lzpiavd9wjn3w"; depends=[httpuv mime RJSONIO xtable digest htmltools R6]; };
+shiny = derive { name="shiny"; version="0.12.0"; sha256="1mv2l2jlayg8jwr2710mp5awazdxbmq2vz8ld1jr2apq9irai14l"; depends=[httpuv mime jsonlite xtable digest htmltools R6]; };
 shinyAce = derive { name="shinyAce"; version="0.1.0"; sha256="1031hzh647ys0d5hkw7cqxj0wgry3rxgq95fgs7slbm0rgx9g6f7"; depends=[shiny]; };
 shinyBS = derive { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[shiny htmltools]; };
 shinyFiles = derive { name="shinyFiles"; version="0.6.0"; sha256="08cvpvrsr1bh0yh17ap20bmwxa4bsan3h6bicrxzanl2dlwp8kvr"; depends=[shiny htmltools RJSONIO]; };
@@ -5893,11 +6007,11 @@ shinyRGL = derive { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk6
 shinyTree = derive { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; };
 shinybootstrap2 = derive { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; };
 shinydashboard = derive { name="shinydashboard"; version="0.4.0"; sha256="0my1bz983ncnvljhz6d25q9bqc510q9dgl9wzcg8c0civyjaps39"; depends=[shiny htmltools]; };
-shinyjs = derive { name="shinyjs"; version="0.0.3.3"; sha256="1fgydm8ai0fvfqbwlkj27pa3nl242kb3xiai50lrda0ssqbrnw67"; depends=[shiny]; };
+shinyjs = derive { name="shinyjs"; version="0.0.6.2"; sha256="0z9lw680bhfzm40j1ffy6y3vfxjkz9457w62rjrw32nssv8vjqvs"; depends=[shiny]; };
 shinythemes = derive { name="shinythemes"; version="1.0.1"; sha256="0wv579cxjlnd7wkfqzy2x3qk7d1abql1nhw10rx1c4c808vsylkw"; depends=[shiny]; };
 shopifyr = derive { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[RCurl R6 RJSONIO]; };
 shotGroups = derive { name="shotGroups"; version="0.6"; sha256="0khcgzli6114yqrglmsvhr8rwkkkwdkd06b50isbc24vpv6xbfx9"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; };
-showtext = derive { name="showtext"; version="0.4-1"; sha256="1c2wd107g2xg8khlad5vimwj7wdxk7b7i2k1ydkkd7b47c6d9zhh"; depends=[sysfonts showtextdb]; };
+showtext = derive { name="showtext"; version="0.4-2"; sha256="18r1xwyjca9ccr2yf8r786pgji38myqp35abxsvd7wv7k3avhwd9"; depends=[sysfonts showtextdb]; };
 showtextdb = derive { name="showtextdb"; version="1.0"; sha256="14iv5nyc9wszy1yhbggk7zs042kv10lwk92pn9751hfws53yq6hf"; depends=[sysfonts]; };
 shp2graph = derive { name="shp2graph"; version="0-2"; sha256="09gbb7f9h3q2p56dwb2813mr36115ah70szq47jimpymzkd2x08m"; depends=[maptools igraph]; };
 shrink = derive { name="shrink"; version="1.2.0"; sha256="0r207mj57kjn6wfmz4f2l4wmbz7g1pvj96gpl0s76vkdjzbh1l47"; depends=[survival MASS rms]; };
@@ -5910,16 +6024,18 @@ sievetest = derive { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg
 sig = derive { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; };
 sigclust = derive { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; };
 sigloc = derive { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[nleqslv ellipse]; };
-signal = derive { name="signal"; version="0.7-4"; sha256="0sz8im7i46qy5wjpm34a2nqvrc1vipmqlw8ns3i2s1vhcvp7fjs1"; depends=[MASS]; };
+signal = derive { name="signal"; version="0.7-5"; sha256="0v6zmy25ikkrc2ravaj7k1qzxm3zdvj6g0d55lkyjv7pb3kl5m1k"; depends=[MASS]; };
 signal_hsmm = derive { name="signal.hsmm"; version="1.2.1"; sha256="0nxhksvwkidmp5x27hxmwxbv747lrwa19b4vi6dx72hny8prgvpc"; depends=[biogram seqinr shiny]; };
+signmedian_test = derive { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; };
 simFrame = derive { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[Rcpp lattice Rcpp]; };
 simMSM = derive { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[survival mvna]; };
-simPH = derive { name="simPH"; version="1.3.1"; sha256="1i4sqaiiy77a4c3aq52d0ddn3abkkqgjh5sxj2v459gck5fd9rgs"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv reshape2 stringr survival quadprog]; };
+simPH = derive { name="simPH"; version="1.3.2"; sha256="0zlzlan2syl51smc3wm52yiak82v1f3pjgsba3w677a37g3badls"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv reshape2 stringr survival quadprog]; };
 simPop = derive { name="simPop"; version="0.2.9"; sha256="1vi2jab57aqf1jyf87vrybz5qbhv7wdjhsm963z3cpyva2bj0i60"; depends=[lattice vcd data_table laeken MASS Rcpp e1071 nnet doParallel foreach colorspace Rcpp]; };
 simSummary = derive { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind svUnit gdata]; };
 simTool = derive { name="simTool"; version="1.0.3"; sha256="1x018p5mssrhz2ghs3ly9wss12503h93gl7zk0mqh1bcrzximh0k"; depends=[plyr reshape]; };
 simba = derive { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; };
 simboot = derive { name="simboot"; version="0.2-5"; sha256="0slznwk8i3z76sxbfd4y5rp28jr6jv4i5ynnckpr10i59ba04wlq"; depends=[boot mvtnorm]; };
+simcausal = derive { name="simcausal"; version="0.1"; sha256="0i39rkfmaqw0f9g3mw05rz7bf0vd4nqxwaixf8i8mvhnbn5gglv3"; depends=[data_table reshape2]; };
 simctest = derive { name="simctest"; version="2.4.1"; sha256="0v4l3dqhr551kr1kivsndk4ynkiaarp8hp65vgng4q8jm60il98c"; depends=[]; };
 simecol = derive { name="simecol"; version="0.8-6"; sha256="0h48klfwk0836byncqn9d0z8mkh6lc8qm4zivyk5af79mr5s0bn5"; depends=[deSolve]; };
 simex = derive { name="simex"; version="1.5"; sha256="01706vbmfgcg13w1kq8v5rnk5xggbd1n7fv50c6bvhdyc1dly313"; depends=[]; };
@@ -5933,15 +6049,15 @@ simsalapar = derive { name="simsalapar"; version="1.0-5"; sha256="1z3dwylfrl08pq
 simsem = derive { name="simsem"; version="0.5-8"; sha256="1kir1c0g5xb4gzmpvx13qp071b3d5v0br3093q394wzp22d816xk"; depends=[lavaan]; };
 siplab = derive { name="siplab"; version="1.1"; sha256="1b5drhla4p7n1y1cp7kqwqzw0b286kgij9j6wsks5vjgy5qfal1x"; depends=[spatstat]; };
 sirad = derive { name="sirad"; version="2.0-7"; sha256="009icj1jil757vvsf88sgmdz40swrx1qvrhnx7wwj7p3dlh78pvw"; depends=[zoo ncdf RNetCDF raster]; };
-sirt = derive { name="sirt"; version="1.5-0"; sha256="0mj6j336b4kzd2fsy3nha66r88cyfnq70cgfld36p9izlxlq6l7x"; depends=[TAM CDM Rcpp mirt lavaan qgraph semPlot combinat ic_infer sfsmisc sm psych pbivnorm gtools igraph coda mvtnorm MASS Matrix Rcpp RcppArmadillo]; };
+sirt = derive { name="sirt"; version="1.7-0"; sha256="12z1gk92rll5lxycv3gvz6y5ia5pbysq5fr3y62xn3wwgm2vrpch"; depends=[TAM CDM Rcpp mirt lavaan qgraph semPlot combinat ic_infer sfsmisc sm psych pbivnorm gtools igraph coda mvtnorm MASS Matrix lavaan_survey survey Rcpp RcppArmadillo]; };
 sisVIVE = derive { name="sisVIVE"; version="1.1"; sha256="1p1l07pgd88ap3bp0zwinnzda07pfg6cn92ync2pkqn5l0gmfxbs"; depends=[lars]; };
 sisus = derive { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[MASS RColorBrewer coda gdata gtools moments polyapost rcdd]; };
 sitar = derive { name="sitar"; version="1.0.2"; sha256="0z9r3z512s0gpkcpdbi45qdl40rp4jacpm9k0c5pjilwiga6p07z"; depends=[nlme quantreg]; };
 sitools = derive { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; };
 sivipm = derive { name="sivipm"; version="1.0-0"; sha256="1r548kfsi90rzisx37nw3w9vwj3gs4ck5zhwlskbdzgigb78spfp"; depends=[seqinr]; };
-sjPlot = derive { name="sjPlot"; version="1.8"; sha256="10hbm76qrlbcl384vfp9gkhlkxpvic8iq3l0k97pb7pv8k4482mx"; depends=[car dplyr ggplot2 MASS psych scales sjmisc tidyr]; };
+sjPlot = derive { name="sjPlot"; version="1.8.1"; sha256="0na5c9fd4irnf1vhqhxgdhwpqyqfsqdxz47gx65r9qq294bhwc75"; depends=[car dplyr ggplot2 MASS psych scales sjmisc tidyr]; };
 sjdbc = derive { name="sjdbc"; version="1.5.0-71"; sha256="0i9wdfadfcabayq78ilcn6x6y5csazbsgd60vssa2hdff0ncgvk1"; depends=[rJava]; };
-sjmisc = derive { name="sjmisc"; version="1.0.1"; sha256="1a8i355jzp77d8ngyyyiw12yx2ppc2drh3qxs2n4b361vxcq8p6m"; depends=[MASS]; };
+sjmisc = derive { name="sjmisc"; version="1.0.2"; sha256="1hgmm5yjgnd2n3k0gjcv58pv0wxzx5pia38ycjix4vyjgbp01kq0"; depends=[MASS]; };
 skatMeta = derive { name="skatMeta"; version="1.4.3"; sha256="0bknv066ya4yl4hl4y02d9lglq2wkl9c2j1shzg3d64dg4sjvbak"; depends=[Matrix coxme survival CompQuadForm]; };
 skda = derive { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
 skewt = derive { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; };
@@ -5962,6 +6078,7 @@ smart = derive { name="smart"; version="1.0.1"; sha256="0ki3qn71zrw0nyv395qijcwa
 smatr = derive { name="smatr"; version="3.4-3"; sha256="0iiazln4albj7k5w67slvyn98cqg4f6k409mml0n1pvlkki0h7gy"; depends=[plyr]; };
 smbinning = derive { name="smbinning"; version="0.1"; sha256="1r3l8z875k5sjnbjg0dpkv3x122hn8g601025lfdpl2ndkbz4qms"; depends=[sqldf partykit Formula gsubfn]; };
 smcUtils = derive { name="smcUtils"; version="0.2.2"; sha256="0d1kmg386j0zrpp8vgxjwvpf1i25l86xrh82767xkp0n9qj8srwq"; depends=[]; };
+smcfcs = derive { name="smcfcs"; version="1.0.0"; sha256="04r8a2p8549pq8yl92ajj893w1rj03s14q6dv14vp0873zrxkxza"; depends=[VGAM MASS survival]; };
 smco = derive { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; };
 smcure = derive { name="smcure"; version="2.0"; sha256="1j7fxnb0sx57a0l929c3haz4f1y829ymlq0cvdh0cia4qp6ydv60"; depends=[survival]; };
 smdata = derive { name="smdata"; version="1.1"; sha256="1hcr093xfkp88fn75imjkmfnp9cfsng5ndxpa8m2g0l29qhpxfvk"; depends=[]; };
@@ -5970,16 +6087,17 @@ smds = derive { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxws
 sme = derive { name="sme"; version="0.8"; sha256="1djrs3z699p6q2y1hfywh27csqc9cp1cfm3lxkigmmvxqjhyshz6"; depends=[lattice]; };
 smfsb = derive { name="smfsb"; version="1.1"; sha256="0khd23b6k9zgxz2x6g6c6k2g32mbpli32izdq6fgk1a990kdsp6j"; depends=[]; };
 smirnov = derive { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; };
-smnet = derive { name="smnet"; version="1.0"; sha256="185ihq44fp00qp03lp9hz821a1ddm1bd09k3j0ii715grc91nc49"; depends=[SSN spam dfoptim RSQLite igraph DBI]; };
+smnet = derive { name="smnet"; version="2.0"; sha256="0jd574cjkylcrlnlnw859f4vwadi1v955m2lb5z3w3gdpv0lbx3p"; depends=[SSN spam RSQLite igraph DBI]; };
+smoof = derive { name="smoof"; version="1.0"; sha256="10yvx5lr73kzjk7xn4jy97yzvv8qilrp7ilvk0fg5hyimbwlz13s"; depends=[ParamHelpers BBmisc checkmate ggplot2 RColorBrewer plot3D emoa]; };
 smoothHR = derive { name="smoothHR"; version="1.0.1"; sha256="02kjqkgnhjwhq1vmva9nmy36a7bc6zjj6g81dw9m4zd3y9nbb005"; depends=[survival]; };
-smoothSurv = derive { name="smoothSurv"; version="1.5"; sha256="145j415jr482s860c685sr815bwx7g63pkfhra1m6r2wawqb2gl5"; depends=[survival]; };
+smoothSurv = derive { name="smoothSurv"; version="1.5-2"; sha256="07yr97nzp4mfj37v9sr37dgriq0a7kbmsj0n3lmxrzfjhinwnhij"; depends=[survival]; };
 smoother = derive { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; };
 smoothie = derive { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; };
 smoothmest = derive { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; };
 smoothtail = derive { name="smoothtail"; version="2.0.3"; sha256="0yr3j5mq1h9pd72kyi9z6wzly9cqkscim814yi710y79l03gp0fd"; depends=[logcondens]; };
 sms = derive { name="sms"; version="2.3"; sha256="0grxyp590hj2rvw1fw3yidzkl8nqqp5a14bp9xfpdph2nyas61qq"; depends=[doParallel foreach]; };
 smss = derive { name="smss"; version="1.0-1"; sha256="17a0x92hxzn212yiz87n7ssyi3bdhnyawxk1kkmk46q1ss22a1pm"; depends=[]; };
-sn = derive { name="sn"; version="1.2-1"; sha256="0sqmabksvv13adf521mbzbi76dgbxc37xppjw4vwzmp4x6d8h0jf"; depends=[mnormt numDeriv]; };
+sn = derive { name="sn"; version="1.2-2"; sha256="1fsl2qjgk7lcjxszdfs7s159qwy6gyg7bsxpfg0l5rcf2mlbwf8m"; depends=[mnormt numDeriv]; };
 sna = derive { name="sna"; version="2.3-2"; sha256="1dmdv1bi22gg4qdrjkdzdc51qsbb2bg4hn47b50lxnrywdj1b5jy"; depends=[]; };
 snapshot = derive { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; };
 snht = derive { name="snht"; version="1.0.2"; sha256="1rs9q8fmvz3x21ymbmgmgkqr7hqf3ya3xb33zj31px799jlldpb9"; depends=[ggplot2 gridExtra mgcv zoo plyr reshape]; };
@@ -6001,7 +6119,7 @@ soil_spec = derive { name="soil.spec"; version="2.1.4"; sha256="129iqr6fdvlchq56
 soilDB = derive { name="soilDB"; version="1.5-4"; sha256="1n8ybryrg88m12qb6bwiqs04dxgbs4nv8ay27d2vi0xrkqhs99k2"; depends=[aqp plyr Hmisc RCurl XML sp]; };
 soilphysics = derive { name="soilphysics"; version="2.3"; sha256="1d64jaw5ra1l0za2kpigqfdf52a5zrxy9j9g2g7f5yffqsp0jwb5"; depends=[rpanel MASS]; };
 soilprofile = derive { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; };
-soiltexture = derive { name="soiltexture"; version="1.2.19"; sha256="0nw72913qb1hpifjqv0s1z5sxhgavhbalqhjczxg8b66fwqzrs7l"; depends=[sp MASS]; };
+soiltexture = derive { name="soiltexture"; version="1.3.3"; sha256="1a0j10f6mxwrslqd4fvc1nqvsh47ly1nyhc6l0qq1iz6ffqd37mx"; depends=[sp MASS]; };
 soilwater = derive { name="soilwater"; version="1.0.1"; sha256="08rz1i5dsgwfvfd4sl5x9j970v82v3kny0rqg1zbdnr53vp2xc7j"; depends=[]; };
 solaR = derive { name="solaR"; version="0.41"; sha256="003f8dka0jqlfshzc3d4z9frq5jb5nq6sw3sm44x7rj79w3ynpyg"; depends=[zoo lattice latticeExtra RColorBrewer]; };
 solarius = derive { name="solarius"; version="0.2.3"; sha256="164va71v77b0lyhccgrb47idhi7dlgyyw1vbs2iqci77ld6x50yl"; depends=[plyr ggplot2 data_table]; };
@@ -6021,11 +6139,12 @@ sos4R = derive { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6
 sotkanet = derive { name="sotkanet"; version="0.9.10"; sha256="0nshd6caxxayr7w39d6ildz42aarr3ff8iyfpwjd544yhblkj7jh"; depends=[ggplot2 RCurl rjson]; };
 soundecology = derive { name="soundecology"; version="1.3"; sha256="1kcmsas359xcwqd0lxffr5p996jikqdag6idibq57qb6rnz3hgfz"; depends=[pracma oce ineq vegan tuneR seewave]; };
 source_gist = derive { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; };
-sp = derive { name="sp"; version="1.1-0"; sha256="1lnc1vlxw15wk69hh7c26dc7vxydyxwi8rfpwrpn9wj4pm0hp8a5"; depends=[lattice]; };
+sp = derive { name="sp"; version="1.1-1"; sha256="1485jylvwbf99snbmp0xs13h5wlvfgwf04cbny4zgn43nipsvsik"; depends=[lattice]; };
 sp23design = derive { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; };
 spBayes = derive { name="spBayes"; version="0.3-9"; sha256="1zdyz5jqbixwj59q9f1x8f3knz0jwdfl0abj0w6cxrllkb38yg10"; depends=[coda magic abind Formula]; };
 spBayesSurv = derive { name="spBayesSurv"; version="1.0.2"; sha256="0pxndjksrd22p60pvc4czxwqhrpx5ik0yr23nz7kmg6wnp36hc6w"; depends=[Rcpp survival coda Rcpp RcppArmadillo]; };
 spMC = derive { name="spMC"; version="0.3.6"; sha256="0h71m55jmv80kx5ccsrpsakrh4qw5f3kx2qizwi10jlybwggqv0m"; depends=[]; };
+spTDyn = derive { name="spTDyn"; version="1.0"; sha256="0yrnbf9g1n1hrrra2vp6412wfky1bhy3b6raif9k82xvi9p9m6pz"; depends=[coda sp]; };
 spTest = derive { name="spTest"; version="0.1.0"; sha256="0asfgf0dx72025q41ndzgwm2n471lwha7bcc1dfk3zwib75w3lgl"; depends=[]; };
 spThin = derive { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[spam fields knitr]; };
 spTimer = derive { name="spTimer"; version="2.0-0"; sha256="0ldby68p4y5cz5dj2m33jcbgd3mw9nv0py4llg8aj10bxylarmfv"; depends=[coda sp]; };
@@ -6039,6 +6158,7 @@ spacetime = derive { name="spacetime"; version="1.1-4"; sha256="1amxdjjqxibllwnb
 spacodiR = derive { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[picante colorspace Rcpp Rcpp]; };
 spacom = derive { name="spacom"; version="1.0-4"; sha256="1jfsbgy7b0mwl4n2pgrkkghx9p8b0wipvg4c5jar6v8ydby6qg94"; depends=[spdep foreach iterators lme4 nlme Matrix]; };
 spam = derive { name="spam"; version="1.0-1"; sha256="033s5ka05kg97fmc3l1li3z6x5225rwhrdxh57wwn4axrjwy1nyy"; depends=[]; };
+spanel = derive { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; };
 spanr = derive { name="spanr"; version="1.0"; sha256="1x29hky347kvmk9q75884vf6msgcmfi3w4lyarq99aasi442n1ps"; depends=[plyr stringr survival]; };
 sparc = derive { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; };
 sparcl = derive { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; };
@@ -6069,9 +6189,9 @@ spatialkernel = derive { name="spatialkernel"; version="0.4-19"; sha256="0gbl6lr
 spatialnbda = derive { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[SocialNetworks mvtnorm]; };
 spatialprobit = derive { name="spatialprobit"; version="0.9-10"; sha256="1z88nss69pixazqk3b6rpyc7mjryfznrgw9swfyfxky0bsdfj6mv"; depends=[Matrix spdep mvtnorm tmvtnorm]; };
 spatialsegregation = derive { name="spatialsegregation"; version="2.40"; sha256="0kpna2198nrj93bjsdgvj85wnjfj18psdq919fjnnhbzgzdkxs7l"; depends=[spatstat]; };
-spatstat = derive { name="spatstat"; version="1.41-1"; sha256="1r2538h4arvlsn49ci84ch45wy5k9kiq4d22bd98jrh6xna3rd6x"; depends=[mgcv Matrix deldir abind tensor polyclip goftest]; };
-spatsurv = derive { name="spatsurv"; version="0.9-8"; sha256="1dsqkcmhka8yzl13jfn19ywq1bk7788amj4nrl1bz05q3vz3drpp"; depends=[survival sp iterators RandomFields fields rgl Matrix stringr]; };
-spc = derive { name="spc"; version="0.5.0"; sha256="0bh4a3dpavczckhpwqax1h5w73ai3mkf0nwq9nhlvkdrh6k6j6cy"; depends=[]; };
+spatstat = derive { name="spatstat"; version="1.42-1"; sha256="10889xg5l7vjmlv79dhdayifplzxhnykhhgjpsn54rncz0k0hd0p"; depends=[mgcv Matrix deldir abind tensor polyclip goftest]; };
+spatsurv = derive { name="spatsurv"; version="0.9-9"; sha256="1zvf8n4isaxi8n47qvgw6zqrgsnf3g6jpm19k6w6zbp9v5r8fw7r"; depends=[survival sp spatstat raster iterators RandomFields fields rgl Matrix stringr rgeos RColorBrewer geostatsp]; };
+spc = derive { name="spc"; version="0.5.1"; sha256="1299lhk8snrhm7xpq0ccmq5kmpapc13rxcyvljs4c7frj645rwz4"; depends=[]; };
 spca = derive { name="spca"; version="0.6.0"; sha256="156bz3w3999vhjpsa9cs21rf2r9hv49vw1pfak0r37kbvf2d4rm6"; depends=[MASS]; };
 spcadjust = derive { name="spcadjust"; version="0.1-3"; sha256="1l6m4aisk780znpjr7lnlh0z42rbc2jyblv17hafbr1siymrasc2"; depends=[]; };
 spcosa = derive { name="spcosa"; version="0.3-5"; sha256="15q0f2sfhm1b13zs5a50yfvqhgcn4fyncf0h5ivin2k9g5xvq4k4"; depends=[rJava ggplot2 sp]; };
@@ -6084,8 +6204,9 @@ spe = derive { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq0
 speaq = derive { name="speaq"; version="1.2.1"; sha256="0glvw1jdyc8w8b8m7l74d0rl74xfs4zmanmx4i41l7ynswhmqm01"; depends=[]; };
 speccalt = derive { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; };
 specificity = derive { name="specificity"; version="0.1.1"; sha256="1gvlyx9crkzm3yyp1ln5j9czcg83k7grm6ijabhl919gjjr1p60n"; depends=[car]; };
+spectral_methods = derive { name="spectral.methods"; version="0.7.2.133"; sha256="0k8kpk94d2qzqdk3fnf6h9jmwdyp8h3klr0ilm5siwq5wkcz339l"; depends=[Rssa raster nnet abind RNetCDF ncdf_tools foreach JBTools DistributionUtils RColorBrewer]; };
 spectralGP = derive { name="spectralGP"; version="1.3.2"; sha256="0gzkwi3npb97y06gvsidaq75h8lg1cvkq8mr9hxp9n7ib6n924v9"; depends=[]; };
-speedglm = derive { name="speedglm"; version="0.2-1.0"; sha256="13gjij9pb65j9c52d5cxl9n6fjmcwbhja4wdl4619dy5rj9vsyi4"; depends=[Matrix]; };
+speedglm = derive { name="speedglm"; version="0.3"; sha256="07pq0ymg7x9c9pq79d476slca43jv4682iackd446glw2qffac1y"; depends=[Matrix MASS]; };
 speff2trial = derive { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; };
 sperich = derive { name="sperich"; version="1.5-5"; sha256="0xwzyfx3z06lapvhzdzrfr9hw2hm8d0cyfmc29p5fcplmjm24idh"; depends=[]; };
 sperrorest = derive { name="sperrorest"; version="0.2-1"; sha256="17jq8r98pq3hsyiinxg30lddxwpwi696srsvm3lfxrzk11076j6v"; depends=[ROCR rpart]; };
@@ -6116,7 +6237,7 @@ sprinter = derive { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs
 sprm = derive { name="sprm"; version="1.1"; sha256="0xnbdnzgf54r93bvnyjcdcqlr0q7s7f2cvayw681zi0ig3z633j0"; depends=[ggplot2 cvTools reshape2 pcaPP]; };
 sprsmdl = derive { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; };
 spsmooth = derive { name="spsmooth"; version="1.1-3"; sha256="09b740586zyi8npq0bmy8qifs9rq0rzhs9c300fr6pjpc7134xn4"; depends=[mgcv]; };
-spsurvey = derive { name="spsurvey"; version="2.6"; sha256="1s48acqi502mdabhymhn0jjsghnlh2w6wnrfaa9gv0a7xjvjkydq"; depends=[sp deldir foreign MASS rgeos]; };
+spsurvey = derive { name="spsurvey"; version="3.0"; sha256="15i10a6hhk1wwnyd4lbrqaql8i4s10302bxmpr0s5cyifs084l77"; depends=[sp deldir foreign MASS rgeos]; };
 spt = derive { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; };
 sptm = derive { name="sptm"; version="14.10-11"; sha256="1g7dqfsyy0cvv3idx16bpny9z4f638aprbc50x8kk4zfk3km7wnr"; depends=[survival survey kyotil]; };
 spuRs = derive { name="spuRs"; version="2.0.0"; sha256="0lbc3nny6idijdaxrxfkfrn40bxfyp9z3yl9mwb1k6cyd10v5mfj"; depends=[MASS lattice]; };
@@ -6131,28 +6252,30 @@ ss3sim = derive { name="ss3sim"; version="0.8.2"; sha256="1gj3kf4ccd5n2jr4sm50gn
 ssanv = derive { name="ssanv"; version="1.0-2"; sha256="18ib0djqxjpp4xgvsffwqgxqljpwc24ysxj26phpr6p8kdl3hr2f"; depends=[]; };
 ssd = derive { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; };
 sse = derive { name="sse"; version="0.5-4"; sha256="126dc4gk0hynwfz887d3wdcs7xacmmjhpf82sbhmhvg73dc1r5jz"; depends=[lattice]; };
+ssfa = derive { name="ssfa"; version="1.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik spdep sp]; };
 ssfit = derive { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; };
 ssh_utils = derive { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; };
 ssize_fdr = derive { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; };
-ssizeRNA = derive { name="ssizeRNA"; version="1.1.1"; sha256="19l7kmkc1cnggf0rcqxphifw5y6iknkxas0ik3kfd1swsgmvw587"; depends=[MASS ssize_fdr]; };
+ssizeRNA = derive { name="ssizeRNA"; version="1.1.2"; sha256="11dnc3wqj0i5blzc9ndpgl48xm5fibjgx9sxrzdcza0gbj8qpadm"; depends=[MASS ssize_fdr]; };
 ssmrob = derive { name="ssmrob"; version="0.4"; sha256="1inndspir7571f54kalbj0h599v9k6dxdmp0n1l5r3a62vn45hd3"; depends=[sampleSelection robustbase mvtnorm MASS]; };
 sspline = derive { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; };
 sspse = derive { name="sspse"; version="0.5-1"; sha256="0gih9d0g4kp08c4v01p699lavb491khyj16i8vldhcb194bvs8m5"; depends=[coda]; };
 sss = derive { name="sss"; version="0.0-11"; sha256="0k7p1ws0w7wg9wyxcg1zpk8q6kr32l3jl6yd9r4qmzq04dwqrdgz"; depends=[plyr XML]; };
 ssvd = derive { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; };
-ssym = derive { name="ssym"; version="1.5.2"; sha256="0c3c4disiicavr8m2yvvi2k38gnw4akdqp0f1v6647i5zj160zkr"; depends=[GIGrvg numDeriv normalp Formula]; };
+ssym = derive { name="ssym"; version="1.5.3"; sha256="0d8d0s9k87w7mxlvkzj307wkmxghc0qzhn7crm3fvcb1phf115p8"; depends=[GIGrvg numDeriv normalp Formula survival]; };
 st = derive { name="st"; version="1.2.4"; sha256="1lnrzz7kc21mrs8xrqs21fcwd92d5kzhvfiq36j02982n18f6c64"; depends=[sda fdrtool corpcor]; };
 staTools = derive { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[Rcpp VGAM magicaxis Rcpp]; };
 stab = derive { name="stab"; version="0.1.9"; sha256="1awf8bj3c4wvs818g4wfmw23vdhv06kn229cmhqbr7dsz933vwwf"; depends=[MASS reshape]; };
 stabledist = derive { name="stabledist"; version="0.7-0"; sha256="06xd3kkyand0gzyj5phxlfjyygn5jlsq7gbwh62pc390by7ld2c7"; depends=[]; };
 stabs = derive { name="stabs"; version="0.5-1"; sha256="0mlwbf8wf38mr39si31i4iz00hpsmchbhgagwgsf3x9422zpq92p"; depends=[]; };
+stackoverflow = derive { name="stackoverflow"; version="0.1.2"; sha256="1psw96iscgsx11drmcnh0yjg2jjcaa4akmywh337i6gbgam8kj61"; depends=[]; };
 stacomirtools = derive { name="stacomirtools"; version="0.3"; sha256="1lbbnvmilf3j3hyhvpkyjd4b4sf3zwygilb8x0kjn2jfhkxnx4c1"; depends=[RODBC xtable]; };
-stagePop = derive { name="stagePop"; version="1.0-1"; sha256="0yb1dbgmns6km0p35wny6f4v7xl4225v8lww0wmzrvdw7l2m8m8d"; depends=[deSolve PBSddesolve]; };
+stagePop = derive { name="stagePop"; version="1.1-1"; sha256="0949r5ibl3sb10sr5xsswxap3wd824riglrylk7fx43ynsv5hzpy"; depends=[deSolve PBSddesolve]; };
 stam = derive { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; };
 stargazer = derive { name="stargazer"; version="5.1"; sha256="0ar0qm289ncsns2pqkabpyjc90ws0il1q7fp5206wqghgsvqjcc0"; depends=[]; };
 startupmsg = derive { name="startupmsg"; version="0.9"; sha256="1l75w4v1cf4kkb05akhgzk5n77zsj6h20ds8y0aa6kd2208zxd9f"; depends=[]; };
 stashR = derive { name="stashR"; version="0.3-5"; sha256="1lnpi1vb043aj4b9vmmy56anj4344709986b27hqaqk5ajzq9c3w"; depends=[filehash digest]; };
-statar = derive { name="statar"; version="0.1.3"; sha256="1lkbp6ki4w0gm3l683xar44vrkw69883qvr73mc179bdh31znqli"; depends=[data_table dplyr ggplot2 Hmisc lazyeval lfe lubridate matrixStats stargazer stringr tidyr]; };
+statar = derive { name="statar"; version="0.3.0"; sha256="0ynvabdyp5vy90gz7c9ywbdyg8dp4vmmz2zjd7z8b5jjk0f8xsf1"; depends=[data_table dplyr ggplot2 lazyeval matrixStats proto stargazer stringr tidyr]; };
 statcheck = derive { name="statcheck"; version="1.0.1"; sha256="01b40bjagkj6hfyq9ppdlaafwgykv8p9s8sm0abd3if82ivdpixj"; depends=[plyr]; };
 statebins = derive { name="statebins"; version="1.0"; sha256="1mqky4nb31xjhn922csvv8ps2fwgcgazxs56rcn3ka32c59a4mmg"; depends=[ggplot2 scales gridExtra RColorBrewer]; };
 statfi = derive { name="statfi"; version="0.9.8"; sha256="0kg9bj2mmd95ysg604rcg4szqx3whbqm14fwivnd110jgfy20gk2"; depends=[pxR]; };
@@ -6174,7 +6297,7 @@ stm = derive { name="stm"; version="1.0.8"; sha256="0dnzkqh3hnnjm0wmzpn48bwylmh4
 stmCorrViz = derive { name="stmCorrViz"; version="1.1"; sha256="03bjxil8v4ixgbabg2gq78xgqy4s3wh89hq1z5598gxysz12z3ji"; depends=[jsonlite stm]; };
 stocc = derive { name="stocc"; version="1.23"; sha256="183rv1l1hpa691f3xf455bv8dzdw6ac79zg3v99zksli6i7c8jdz"; depends=[truncnorm coda Matrix fields]; };
 stochprofML = derive { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; };
-stochvol = derive { name="stochvol"; version="1.0.0"; sha256="1c083gmfq9ldd41235shcb5i3ggd92fxvimhaavljnr1wsls5f2b"; depends=[coda Rcpp Rcpp]; };
+stochvol = derive { name="stochvol"; version="1.1.1"; sha256="1cfav3i7w5i3rayajdybjmwvmqvqj58zk8sk0icw52r5l4ki2d6s"; depends=[coda Rcpp Rcpp]; };
 stockPortfolio = derive { name="stockPortfolio"; version="1.2"; sha256="0k5ss6lf9yhcvc4hwqmcfpdn6qkbq5kaw0arldkl46391kac3bd1"; depends=[]; };
 stocks = derive { name="stocks"; version="1.1.1"; sha256="1qwd16bw40w2ns7b0n9wm8l344r4vyk27rmg0vr5512zsrcjkcfb"; depends=[rbenchmark Rcpp Rcpp]; };
 stoichcalc = derive { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; };
@@ -6186,18 +6309,18 @@ strataG = derive { name="strataG"; version="0.9.4"; sha256="0lxp6s0gfqxyla7mx19f
 stratification = derive { name="stratification"; version="2.2-5"; sha256="0cgr49gvh12s6rr43878jxjkir7b7absqgbfsvj1bjlf2r3gyqy9"; depends=[]; };
 stratigraph = derive { name="stratigraph"; version="0.66"; sha256="1idn5rwar9pxp1vsra68wrlhagmc92y5rs7vn4h63p35p357qdwz"; depends=[]; };
 straweib = derive { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; };
-stream = derive { name="stream"; version="1.1-1"; sha256="0l9sywmajydmd0nkdlbhc4k5lf7qjrndjj6clw5j2mgw97cqaag5"; depends=[hash proxy animation clue cluster clusterGeneration fpc MASS mlbench]; };
-streamMOA = derive { name="streamMOA"; version="1.0-0"; sha256="176llkj9q0p5ym09iagaw5cag6ln94bw04pjl120jnxn6p7i22s2"; depends=[stream rJava]; };
+stream = derive { name="stream"; version="1.1-4"; sha256="1pz9ck6rxxwnzrhixs015k3sy2gl8hwxyxwr56ykpkrcn6kgzm3f"; depends=[proxy animation clue cluster clusterGeneration fpc MASS mlbench Rcpp Rcpp]; };
+streamMOA = derive { name="streamMOA"; version="1.1-0"; sha256="0h45saz5jf9jfsajy987ljpfpm2cxigyqkgmybd0m3aqyrqlljbc"; depends=[stream rJava]; };
 streamR = derive { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23xk5d25jkm3qr7rfj2kc5j5vgsih6kr0gl"; depends=[RCurl rjson]; };
 stremo = derive { name="stremo"; version="0.2"; sha256="13b9xnd8ykxrm8gnakh0ixbsb7yppqv3isga8dsz473wzy82y6h1"; depends=[lavaan numDeriv MASS]; };
 stressr = derive { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[xts XML lattice latticeExtra]; };
 stringdist = derive { name="stringdist"; version="0.9.0"; sha256="0304a3qyssq2l2c7da5a90fca32n3ph5jixqnqvb3jwzdb8dxm2f"; depends=[]; };
 stringi = derive { name="stringi"; version="0.4-1"; sha256="01ig59cmvrk9vfh4l84i2h4vgddfspyrxwh3am33apv8r8vr4bnj"; depends=[]; };
 stringr = derive { name="stringr"; version="1.0.0"; sha256="0jnz6r9yqyf7dschr2fnn1slg4wn6b4ik5q00j4zrh43bfw7s9pq"; depends=[stringi magrittr]; };
-strucchange = derive { name="strucchange"; version="1.5-0"; sha256="17ikp36ahnsx1q3avqkz5r2n2yagzq7j6m515vdm8rxgv0538is3"; depends=[zoo sandwich]; };
+strucchange = derive { name="strucchange"; version="1.5-1"; sha256="0cdgvl6kphm2i59bmnppn1y3kv65ml111bk7yzpcx7vv8wh2w3kl"; depends=[zoo sandwich]; };
 structSSI = derive { name="structSSI"; version="1.1.1"; sha256="06rwmrgqc4qy4x0bhlshjdsjxfmp5fr9d1wjglhlb1gbp72fmkdv"; depends=[igraph rjson ggplot2 reshape2]; };
-strum = derive { name="strum"; version="0.6"; sha256="1jd8h8fnjv4a58shl0j9fdlds7xns1j18b9qaqhrfa4hrdrw75s9"; depends=[pedigree Matrix MASS Rcpp Rcpp RcppArmadillo]; };
-strvalidator = derive { name="strvalidator"; version="1.4.0"; sha256="1zgfy5w4qwcm3jdqigahxi7xn8328jr568ssbj99ibzdj0m0hmfw"; depends=[gridExtra ggplot2 gWidgets gtable plyr scales gWidgetsRGtk2 RGtk2 data_table]; };
+strum = derive { name="strum"; version="0.6.1"; sha256="128xrprdmncnn2a7z6g2qzkps323qq33g3fxh1q23ys11p37dnjw"; depends=[pedigree Matrix MASS Rcpp Rcpp RcppArmadillo]; };
+strvalidator = derive { name="strvalidator"; version="1.5.0"; sha256="0b71drc80hqmqi4kspy0700wss4pm88x2gp83jsw1jrfrrrfw9jk"; depends=[gridExtra ggplot2 gWidgets gtable plyr scales gWidgetsRGtk2 RGtk2 data_table]; };
 stsm = derive { name="stsm"; version="1.7"; sha256="080xakf7rf53vzv64g338hz87sk4cqfwd6ly4f122sxvn4xypq3n"; depends=[KFKSDS]; };
 stsm_class = derive { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; };
 stylo = derive { name="stylo"; version="0.5.9"; sha256="061nfjh932qjlzvnarpwvzar0qv7ij8l6m3iax1jilygzhfqfyin"; depends=[tcltk2 ape pamr e1071 class lattice tsne]; };
@@ -6212,6 +6335,7 @@ sudoku = derive { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin
 sudokuAlt = derive { name="sudokuAlt"; version="0.1-4"; sha256="14jqwsp692dq0bfnk2i70qc42inb6jbissvp88c5r2cgzc1ry072"; depends=[]; };
 summarytools = derive { name="summarytools"; version="0.3"; sha256="1hhkhpyaj8sc62vap5s7ds0kmk1jiy6gdvsz65ynqy2qfz58c3ms"; depends=[htmltools pander xtable rapportools rstudioapi]; };
 supclust = derive { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[rpart class]; };
+supcluster = derive { name="supcluster"; version="1.0"; sha256="1rkd4bpzzvzbmqaj907pqv53hxcgic0jklbsf5iayf0ra768b5w6"; depends=[mvtnorm gtools]; };
 superMDS = derive { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; };
 superbiclust = derive { name="superbiclust"; version="1.1"; sha256="1gzjbzbl8y1nzdfhyd6dlrwjq8mwj43a26qav84s1bdzwx6dra48"; depends=[biclust Matrix]; };
 superdiag = derive { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[coda boa]; };
@@ -6230,10 +6354,11 @@ survMisc = derive { name="survMisc"; version="0.4.6"; sha256="1d16kkzg0clwvv5rgv
 survPresmooth = derive { name="survPresmooth"; version="1.1-8"; sha256="1qva7yx4vv99mgh3wqxdnbasa1gy0ixxyxpqrfbn6827whjzf91m"; depends=[]; };
 survRM2 = derive { name="survRM2"; version="1.0-1"; sha256="1qcjdx4a9b9dg8jkzak6rq4d4byf9377h43f1m3icdgf79vghlhr"; depends=[survival]; };
 survSNP = derive { name="survSNP"; version="0.23.2"; sha256="0vpk5qdvsagv5pnap7ja7smqvibvfp5v7smhikbbwl0h6l83jjw4"; depends=[survival Rcpp lattice foreach xtable Rcpp]; };
-surveillance = derive { name="surveillance"; version="1.8-3"; sha256="10d170l0ah92awpa9cafxshpvmj3d206fqn5sm7bd73q87mvbgdp"; depends=[sp xtable polyCub Rcpp MASS Matrix spatstat Rcpp]; };
+surveillance = derive { name="surveillance"; version="1.9-0"; sha256="1v087x0y8i2b4pbikdaj3xdb0qj1lnl8yjrzcp3l0ffcbfb8a8j2"; depends=[sp xtable polyCub Rcpp MASS Matrix spatstat Rcpp]; };
 survexp_fr = derive { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; };
 survey = derive { name="survey"; version="3.30-3"; sha256="0vcyph1vpnl4xaqd85ffh1gm0dqhvgr3343q0mlycmyq485x0idy"; depends=[]; };
 surveydata = derive { name="surveydata"; version="0.1-14"; sha256="1zcp3wb7yhsa59cl4bdw7p08vpviypvfa9hggwc60w7ashpky73i"; depends=[stringr plyr]; };
+surveyeditor = derive { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; };
 survival = derive { name="survival"; version="2.38-1"; sha256="0kq0a6h1bmphp4vi1f3wzs5pddp3zw9vfi7vk6x27zglnwjhkfgm"; depends=[]; };
 survivalMPL = derive { name="survivalMPL"; version="0.1.1"; sha256="0c4hr2q50snd5qm2drg4qzfkcz4klxr4jba6xpc8n2i8wn573cvc"; depends=[survival]; };
 survivalROC = derive { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; };
@@ -6259,10 +6384,12 @@ svgViewR = derive { name="svgViewR"; version="1.0.0"; sha256="0js3mc5lxzfwbnc30m
 svmpath = derive { name="svmpath"; version="0.953"; sha256="0hqga4cwy1az8cckh3nkknbq1ag67f4m5xdg271f2jxvnmhdv6wv"; depends=[]; };
 svyPVpack = derive { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; };
 swamp = derive { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots MASS]; };
-sweidnumbr = derive { name="sweidnumbr"; version="0.2"; sha256="0zsijh9jf0pnil5n69ix408j3plbrnj0235whh9rch486ibyk779"; depends=[lubridate]; };
+sweidnumbr = derive { name="sweidnumbr"; version="0.6.0"; sha256="1qdak16jnm436m7nlngarimlhx9sc6wwq9pfrcijq8240mh7xwa2"; depends=[lubridate stringr]; };
 swfscMisc = derive { name="swfscMisc"; version="1.0.3"; sha256="0ciwvxpafpc6an58r1ffkab8kj4np6l2kbpkijnqnfbf6cya0aim"; depends=[mapdata maps]; };
 swirl = derive { name="swirl"; version="2.2.21"; sha256="0lpin7frm1a6y9lz0nyykhvydr1qbx85iqy24sm52r1vxycv2r8h"; depends=[stringr testthat httr yaml RCurl digest]; };
 switchnpreg = derive { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[MASS fda expm HiddenMarkov]; };
+switchr = derive { name="switchr"; version="0.9.4"; sha256="16a8659x2r9adi3r0cqhsw8qg3jk6pkvrzgx8a50qyk4v50f2jsj"; depends=[]; };
+switchrGist = derive { name="switchrGist"; version="0.2.1"; sha256="0n8fzzsxm0m4yic133q07vki803zywhijadymrgyq7qlx3d1m97d"; depends=[switchr gistr httpuv RJSONIO]; };
 sybil = derive { name="sybil"; version="1.2.6"; sha256="1d7q0dvpqxay86dy4zbllv78dsh0amr8n7wl0vkrb8jbakq4afip"; depends=[Matrix lattice]; };
 sybilDynFBA = derive { name="sybilDynFBA"; version="0.0.2"; sha256="1sqk6dwwfrwvgkwk6mra0i1dszhhvcwm58ax6m89sxk8n0nbmr4b"; depends=[sybil]; };
 sybilEFBA = derive { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j8ixqd2pj43hhyr99vjdh7c106lsmqd1pifa4"; depends=[sybil Matrix]; };
@@ -6273,14 +6400,14 @@ symbolicDA = derive { name="symbolicDA"; version="0.4-2"; sha256="1vn7r7b7yyn2kp
 symbols = derive { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; };
 symmoments = derive { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[mvtnorm cubature combinat multipol]; };
 synRNASeqNet = derive { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[parmigene GenKern igraph KernSmooth]; };
-synbreed = derive { name="synbreed"; version="0.10-5"; sha256="0qhcxmcxa0ixn6ql2dr7pq10g7hmv55rcn279wz4cg5mbgqkhvmm"; depends=[doBy BLR regress abind lattice igraph MASS LDheatmap qtl synbreedData]; };
+synbreed = derive { name="synbreed"; version="0.11-8"; sha256="1d58rlys0557xs1wwd9mrvsrnx8fkcs4igxwf70rw9zy6nl9zg9k"; depends=[doBy BLR regress abind igraph lattice MASS LDheatmap qtl]; };
 synbreedData = derive { name="synbreedData"; version="1.5"; sha256="16wv9r7p0n8726qv0jlizmkvnrqwjj1q4xaxvfmj9611rm47vckx"; depends=[]; };
 synchronicity = derive { name="synchronicity"; version="1.1.4"; sha256="0hcxwgf1irswwabgl0b6vb9q09nhxc1ljsm195lc8ql49sfj9mfz"; depends=[bigmemory_sri BH]; };
 synchrony = derive { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; };
 synlik = derive { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Rcpp Matrix Rcpp RcppArmadillo]; };
 synthpop = derive { name="synthpop"; version="1.1-0"; sha256="1j9d0jpmr8dva2c7gd6z1q0a3qdxkvmm83xlv08dxkbvsfbzvmmr"; depends=[lattice MASS nnet ggplot2 coefplot rpart party foreign plyr proto]; };
 sysfonts = derive { name="sysfonts"; version="0.5"; sha256="1vppj3jnag88351f8xfk9ds8gbbij3m55iq5rxbnrzy89c04zpzp"; depends=[]; };
-systemfit = derive { name="systemfit"; version="1.1-14"; sha256="0f33v96awyhxw3i6zr6whdz91hbfi7vwnfs0bz7xsrjcinqhm6h5"; depends=[Matrix car lmtest sandwich]; };
+systemfit = derive { name="systemfit"; version="1.1-16"; sha256="0b34cpwhmsmq7dcr3gymdvanj3q493aczgz3af7b14bsp3bbwpw6"; depends=[Matrix car lmtest sandwich MASS]; };
 systemicrisk = derive { name="systemicrisk"; version="0.2"; sha256="06061hca2x9hj0caann69j6x2jgy8bq40nxs27iqb3zfqp2cz44f"; depends=[Rcpp lpSolve Rcpp]; };
 syuzhet = derive { name="syuzhet"; version="0.2.0"; sha256="1l83wjiv1xsxw4wrcgcj3ryisi7zn4sbdl0sail0rhw0g9y9cz76"; depends=[openNLP NLP]; };
 taRifx = derive { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[reshape2 plyr]; };
@@ -6300,13 +6427,13 @@ tawny_types = derive { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdc
 taxize = derive { name="taxize"; version="0.5.2"; sha256="1141ypz76nda9ij0fr63kgjagj9al63gnqwxa7ld7v9xzig8zgyp"; depends=[XML RCurl stringr plyr httr jsonlite foreach ape Taxonstand reshape2 data_table vegan bold]; };
 tbart = derive { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp Rcpp]; };
 tbdiag = derive { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; };
-tcR = derive { name="tcR"; version="1.3"; sha256="09jvmnyq9j0l8ng73jr2ldb70fbqryd6jzjsxdyhdxvj2w83qcxa"; depends=[ggplot2 dplyr gridExtra reshape2 igraph Rcpp data_table gtable roxygen2 stringdist Rcpp]; };
+tcR = derive { name="tcR"; version="2.0"; sha256="05y3nbqdaxry7jwph6z2v8d2304xh791l0vviywyghrw7b2hqw9q"; depends=[ggplot2 dplyr gridExtra reshape2 igraph Rcpp data_table gtable roxygen2 stringdist Rcpp]; };
 tcltk2 = derive { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; };
 tclust = derive { name="tclust"; version="1.2-3"; sha256="0a1b7yp4l9wf6ic5czizyl2cnxrc1virj0icr8i6m1vv23jd8jfp"; depends=[mvtnorm sn mclust cluster]; };
 tdm = derive { name="tdm"; version="3.0.3"; sha256="01xy090h9idw05jssfgdarbqp5d1vsiir5x7fr1ylaz0k8ai23d4"; depends=[rjags coda png deSolve]; };
 tdr = derive { name="tdr"; version="0.11"; sha256="1ga1lczqj5pka2yz7igxfm83xmkx7lla8pz6ryij0ybn284agszs"; depends=[lattice ggplot2 RColorBrewer]; };
 tdthap = derive { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; };
-teigen = derive { name="teigen"; version="2.0.8"; sha256="0gh5p2rwv1krrbq92wpgl1ya74vrdxhsagd7r7wvyxvxdv3j94v5"; depends=[]; };
+teigen = derive { name="teigen"; version="2.0.81"; sha256="1bssfn487dg1nc7fv73ksciiifnk1mvaqvp8a3gjmrb7bzfyzby7"; depends=[]; };
 tempdisagg = derive { name="tempdisagg"; version="0.24.0"; sha256="02ld14mppyyqvgz537sypr3mqc758cchfcmpj46b7wswwa2y7fyz"; depends=[]; };
 tensor = derive { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; };
 tensorA = derive { name="tensorA"; version="0.36"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; depends=[]; };
@@ -6315,12 +6442,12 @@ termstrc = derive { name="termstrc"; version="1.3.7"; sha256="12bycwhjrhkadafcck
 ternvis = derive { name="ternvis"; version="1.1"; sha256="16q1a1ns7q0d46js2m1hr6zm8msg3ncgp8w7yrwch11xq0759sb4"; depends=[quadprog maps maptools mapdata dichromat]; };
 tester = derive { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; };
 testit = derive { name="testit"; version="0.4"; sha256="1805i82kb2g08r0cqdk6dhfhwqjjdigdm1rqf88sp7435wksyv8i"; depends=[]; };
-testthat = derive { name="testthat"; version="0.9.1"; sha256="0hbkyfx54fz4lwyz3azfxb6xkdcmm6kjdv6ma47gv947m90ysnfk"; depends=[digest]; };
+testthat = derive { name="testthat"; version="0.10.0"; sha256="0b3akwcx5mv9dmi8vssbk91hr3yrrdxd2fm6zhr31fnyz8kjx4pw"; depends=[digest crayon]; };
 testthatsomemore = derive { name="testthatsomemore"; version="0.1"; sha256="0j9sszm4l0mn7nqz47li6fq5ycb3yawc2yrad9ngb75cvp47ikkk"; depends=[testthat]; };
 texmex = derive { name="texmex"; version="2.1"; sha256="17x4xw2h4g9a10zk4mvi3jz3gf4rf81b29hg2g3gq6a6nrxsj8sy"; depends=[mvtnorm]; };
 texmexseq = derive { name="texmexseq"; version="0.1"; sha256="18lpihiwpjkjkc1n7ka6rzasrwv8npn4939s1gl8g1jb27vnhzb5"; depends=[]; };
 texreg = derive { name="texreg"; version="1.35"; sha256="0c1w6kzczzflcmvr544v3gdasvyjxcwqgdm2w2i9wp7kd1va37fr"; depends=[]; };
-textcat = derive { name="textcat"; version="1.0-2"; sha256="0sjhahmqva9pwp75zwxxf8g1cw38awid3w6rx9xfx73cpj2blcz3"; depends=[tau slam]; };
+textcat = derive { name="textcat"; version="1.0-3"; sha256="0j3sp94bz57l70aqm11033nfshxdz3l9m4sq1gsfzkvxgnlpqrm5"; depends=[tau slam]; };
 textir = derive { name="textir"; version="2.0-3"; sha256="039xl2h0igrp3fzr1qiyb0zr6j4bbajhj36apylqvwsczzaywhwb"; depends=[distrom gamlr Matrix]; };
 textometry = derive { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; };
 textreg = derive { name="textreg"; version="0.1.2"; sha256="0qya0czbi78a29jp9pd3lbqh574d9k0i340hrgc6jmdhwzhimhk7"; depends=[tm NLP Rcpp Rcpp]; };
@@ -6328,11 +6455,13 @@ tfer = derive { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm2
 tfplot = derive { name="tfplot"; version="2015.4-1"; sha256="1qrw8x7pz7xcmpym3j1d095bhvy2s7znxplml1qyw5minc67n1mh"; depends=[tframe]; };
 tframe = derive { name="tframe"; version="2015.1-1"; sha256="10igwmrfslyz3z3cbyldik8fcxq43pwh60yggka6mkl0nzkxagbd"; depends=[]; };
 tframePlus = derive { name="tframePlus"; version="2015.1-2"; sha256="043ay79x520lbh4jm2nb3331pwd7dvwfw20k1kc9cxbplxiy8pnb"; depends=[tframe timeSeries]; };
+tgcd = derive { name="tgcd"; version="1.4"; sha256="108i7kkfkpgavs8d2c6aih9winfqhin777jn5zfxzkjd6clj857i"; depends=[]; };
 tgp = derive { name="tgp"; version="2.4-11"; sha256="0hdi05bz9qn4zmljfnll5hk9j8z9qaqmya77pdcgr6vc31ckixw5"; depends=[maptree]; };
 tgram = derive { name="tgram"; version="0.2-2"; sha256="091g6j5ry1gmjff1kprk5vi2lirl8zbynqxkkywaqpifz302p39q"; depends=[zoo]; };
 thermocouple = derive { name="thermocouple"; version="1.0.0"; sha256="1pawk7aq27vc708xwz997pmxxhipw8449793zv6fw5aj47wcw1l5"; depends=[]; };
 thgenetics = derive { name="thgenetics"; version="0.3-4"; sha256="1316nx0s52y12j9499mvi050p3qvp6b8i01v82na01vidl54b9c2"; depends=[]; };
 threeboost = derive { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; };
+threejs = derive { name="threejs"; version="0.2.1"; sha256="01zfv5lm11i2nkb876f3fg8vsff2wk271jqs6xw1njjdhbnnihs1"; depends=[htmlwidgets base64enc]; };
 threg = derive { name="threg"; version="1.0.2"; sha256="0wb9waj0j83zrj763d3fdnp3lp52gfdyzv23yrvxvd6zmk5clgi2"; depends=[survival Formula]; };
 thsls = derive { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; };
 tibbrConnector = derive { name="tibbrConnector"; version="1.5.0-71"; sha256="0d8gy126hzzardcwr9ydagdb0dy9bdw30l8s2wwi7zaxx2lpii6q"; depends=[RCurl rjson]; };
@@ -6341,7 +6470,7 @@ tidyjson = derive { name="tidyjson"; version="0.2.1"; sha256="178lc4ii4vjzvrkxfd
 tidyr = derive { name="tidyr"; version="0.2.0"; sha256="169i6xnr4bs5vqkv6dilj5j8v95giz0b7byhi06qk414gdlj2r8n"; depends=[reshape2 dplyr stringi lazyeval]; };
 tiff = derive { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; };
 tiger = derive { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin qualV klaR som lattice]; };
-tigerstats = derive { name="tigerstats"; version="0.2"; sha256="1wj4z1jj7jg3885nvfh4l812cyybjcm5r66w3l41s4c0civl4z5b"; depends=[mosaic mosaicData abd MASS ggplot2 lattice]; };
+tigerstats = derive { name="tigerstats"; version="0.2-6"; sha256="0niibqhqpjxgq3m7xp0icf98k531ncmm853scvqp5icv2yz5ivav"; depends=[abd mosaic mosaicData ggplot2 lattice MASS]; };
 tightClust = derive { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; };
 tikzDevice = derive { name="tikzDevice"; version="0.8.1"; sha256="0262szfzv4yrfal19giinrphra1kfcm2arfckql4rf2zsq13rw35"; depends=[filehash]; };
 tileHMM = derive { name="tileHMM"; version="1.0-6"; sha256="18vqj7fdh4knnjk9s7yk2bgn3qwqz92fmm5fdny21gi0wl4qgdsd"; depends=[]; };
@@ -6352,7 +6481,7 @@ timeSeries = derive { name="timeSeries"; version="3012.99"; sha256="06lz9xljzadf
 timeit = derive { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; };
 timeline = derive { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; };
 timeordered = derive { name="timeordered"; version="0.9.8"; sha256="1j0x2v22ybyl3l9r3aaz5a3bxh0zq81rbga9gh63zads2xy5axmf"; depends=[igraph plyr]; };
-timereg = derive { name="timereg"; version="1.8.7"; sha256="1xarqsdgl1zcc8ilg23g3p2xl3zbsfiak7lagvs5sbsq84b0wpr7"; depends=[survival lava numDeriv]; };
+timereg = derive { name="timereg"; version="1.8.9"; sha256="12l8sz10ic8d34jd7ik8szg2d51pr949nsss20c5l5g3kfnvqkkh"; depends=[survival lava numDeriv]; };
 timesboot = derive { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; };
 timeseriesdb = derive { name="timeseriesdb"; version="0.2.1"; sha256="0150zs8c8184jzry33aki21prmpnxp3rclp84q6igwxi4grdhlr0"; depends=[RPostgreSQL RJSONIO xts zoo reshape2 shiny DBI]; };
 timetools = derive { name="timetools"; version="1.6.5"; sha256="1ni1dqzkdrzmvr0sbnfdh7kcsd5sgfggfl6w7nqviidcff5dbc9g"; depends=[]; };
@@ -6360,7 +6489,7 @@ timetree = derive { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkffl
 timma = derive { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[Rcpp QCA reshape2 Rcpp RcppArmadillo]; };
 timsac = derive { name="timsac"; version="1.3.3"; sha256="0jg9mjzzfl94z4dqb2kz0aiccpclnbyf9p08x3a3cw1y6wqmzrmy"; depends=[]; };
 tipom = derive { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; };
-tis = derive { name="tis"; version="1.27"; sha256="1kgzc032qa005hzcimhbbhcs5kcvm88pfb48ac84k205f6xhdsir"; depends=[]; };
+tis = derive { name="tis"; version="1.30"; sha256="0bqvnaxqqq4962wfw4s9rf0qil613mplqcjwjlq1s9yfxl78gzzw"; depends=[]; };
 titan = derive { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762j5ci56964j2466xfbwcywhn9njz5r"; depends=[MASS boot lattice]; };
 tkrgl = derive { name="tkrgl"; version="0.7"; sha256="1kpq5p6izqrn1zr53firis3rmifq9lf6326lf3z7l1p82nf2yps5"; depends=[rgl]; };
 tkrplot = derive { name="tkrplot"; version="0.0-23"; sha256="1cnyszn3rmr1kwvi5a178dr3074skdijfixf5ln8av5wwcy35947"; depends=[]; };
@@ -6376,10 +6505,10 @@ tm_plugin_factiva = derive { name="tm.plugin.factiva"; version="1.5"; sha256="06
 tm_plugin_lexisnexis = derive { name="tm.plugin.lexisnexis"; version="1.2"; sha256="0cjw705czzzhd8ybfxkrv0f9kvmv9pcswisc7n9hkx8lxi942h19"; depends=[NLP tm XML ISOcodes]; };
 tm_plugin_mail = derive { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; };
 tm_plugin_webmining = derive { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[NLP tm boilerpipeR RCurl XML RJSONIO]; };
-tmap = derive { name="tmap"; version="0.7"; sha256="0lnlnnllj2bypw2cf8pgpv40w5zy4876kmjgav07ls8j11lklgwz"; depends=[rgeos gridBase sp rgdal classInt RColorBrewer igraph fields vegan]; };
+tmap = derive { name="tmap"; version="1.0"; sha256="1807zh2yjgcpjrl1g83ahby7857l7hd5k9shrb1v6vkv6x5rrrkm"; depends=[sp raster gridBase rgdal rgeos classInt RColorBrewer]; };
 tmg = derive { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp Rcpp RcppEigen]; };
 tmle = derive { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99wg8a2xyvfgvbyvx3jfxkgk33mybbm"; depends=[SuperLearner]; };
-tmle_npvi = derive { name="tmle.npvi"; version="0.9.3"; sha256="0njrjwjjn853iahccg37dns7pm14qr05xbkqnd1rhzg4lcl34fyb"; depends=[R_utils R_methodsS3 R_oo MASS Matrix sgeostat geometry]; };
+tmle_npvi = derive { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[R_utils R_methodsS3 R_oo MASS Matrix geometry]; };
 tmvtnorm = derive { name="tmvtnorm"; version="1.4-9"; sha256="1dacdhqv6bb29a81bmxp8hxy4hragpg8mb5kql4cp59q08zmizyi"; depends=[mvtnorm Matrix gmm]; };
 tnet = derive { name="tnet"; version="3.0.11"; sha256="00hifb145w0a9f5qi3gx16lm1qg621jp523vswb8h86jqmxcczbc"; depends=[igraph survival]; };
 toOrdinal = derive { name="toOrdinal"; version="0.0-1"; sha256="1rr6liw0krzdarc9gd406mf242n3hl38bn52xphr1g0riq5y2m4q"; depends=[]; };
@@ -6398,7 +6527,7 @@ track = derive { name="track"; version="1.1.8"; sha256="0scrww0ba1lrv39fh416wcbz
 tractor_base = derive { name="tractor.base"; version="2.5.0"; sha256="17s4iyp67w7m8gslm87p3ic5r9iq7x1ifpxqrmnin3y5a3d04f5v"; depends=[reportr]; };
 traitr = derive { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest proto gWidgets]; };
 traj = derive { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster psych pastecs NbClust GPArotation]; };
-trajectories = derive { name="trajectories"; version="0.1-2"; sha256="1d27mb5xy29j2mgb0wh5x61q1z41vjmpidzqswqmw8fbq9g64826"; depends=[lattice sp spacetime rgdal rgeos]; };
+trajectories = derive { name="trajectories"; version="0.1-3"; sha256="1lk2mxfsf8x8idhb4dcj9lqvkjwm2yarvjid42xr2a9wwylvz9vq"; depends=[lattice sp spacetime]; };
 translate = derive { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[RCurl RJSONIO functional lisp]; };
 translateR = derive { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[RJSONIO RCurl textcat httr]; };
 transport = derive { name="transport"; version="0.6-3"; sha256="1sldlccsprzan1liyslzp9wzz3d36khyr6zri773npvnss9pa67w"; depends=[]; };
@@ -6419,7 +6548,7 @@ trifield = derive { name="trifield"; version="1.1"; sha256="0xk48fkd5xa3mfn3pwdy
 trimTrees = derive { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[randomForest mlbench]; };
 trimcluster = derive { name="trimcluster"; version="0.1-2"; sha256="0lsgbg93hm0w1rdb813ry0ks2l0jfpyqzqkf3h3bj6fch0avcbv2"; depends=[]; };
 trioGxE = derive { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[msm mgcv gtools]; };
-trip = derive { name="trip"; version="1.1-19"; sha256="1353lzfgvq8236ijxy8521r7hhmgyfrvc17ga8p8c0851nx53xn3"; depends=[sp maptools MASS spatstat]; };
+trip = derive { name="trip"; version="1.1-21"; sha256="0rawckw3xd8kz2jn6xgspgl5axabjcp4xh4kp93n3h41xlarv9xa"; depends=[sp maptools MASS raster spatstat]; };
 tripEstimation = derive { name="tripEstimation"; version="0.0-42"; sha256="17spnvrrqv89vldd496wc1psmaby0mhw9nh0qnfm7yc2jcqaf5nb"; depends=[lattice mgcv rgdal sp zoo]; };
 tripack = derive { name="tripack"; version="1.3-6"; sha256="1dknz1arzfyknip04a9fxdhqmrkb0r0lr8hgria9s0d57hr1ay12"; depends=[]; };
 trotter = derive { name="trotter"; version="0.6"; sha256="0i8r2f2klkkfnjm7jhvga3gx6m7r97pd73d88004jzlm9ficspgy"; depends=[]; };
@@ -6497,21 +6626,21 @@ varSelRF = derive { name="varSelRF"; version="0.7-5"; sha256="1800d9vvkqpxjvmiqd
 varSelectIP = derive { name="varSelectIP"; version="0.2-1"; sha256="180lzsg48hnlcmhpk0a5yzmy2syw8yr7f5npnyspx3897hjag1vp"; depends=[MASS mvtnorm]; };
 varbvs = derive { name="varbvs"; version="1.0"; sha256="0ywgb6ibijffjjzqqb5lvh1lk5qznwwiq7kbsyzkwcxbp8xkabjw"; depends=[]; };
 vardiag = derive { name="vardiag"; version="0.2-0"; sha256="0avj900zx4nr67dk08n0n6arxx2cb2ymm0kd5xxnzsmyrmwm40mm"; depends=[]; };
-vardpoor = derive { name="vardpoor"; version="0.3.0"; sha256="0gdvnz86c96i90zvbp5a6ljq4pcnx2zcqb0rbhcqhylcyqys054w"; depends=[data_table laeken stringr reshape2 foreach plyr gdata MASS]; };
+vardpoor = derive { name="vardpoor"; version="0.3.2"; sha256="0vb684yhvafdmzphx4vv8gqih10x3mj8vmwshppwfgd3jp76dnps"; depends=[data_table laeken stringr reshape2 foreach plyr gdata MASS]; };
 vars = derive { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[MASS strucchange urca lmtest sandwich]; };
 vartors = derive { name="vartors"; version="0.2.6"; sha256="04dynqs903clllk9nyynh3dr7msxn5rr5jmw6ql86ppd5w3da0rl"; depends=[]; };
 vbdm = derive { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; };
 vbsr = derive { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; };
-vcd = derive { name="vcd"; version="1.3-2"; sha256="1ww69sgg178aqcs90mm599nlr6hnxn54d2wzyhddgx1z3qxhzwjd"; depends=[MASS colorspace]; };
+vcd = derive { name="vcd"; version="1.4-0"; sha256="0gp137hlkg1wm8bhfdpswz0g05a4biprfa5r9i1fz5w0myqgpxca"; depends=[MASS colorspace lmtest]; };
 vcdExtra = derive { name="vcdExtra"; version="0.6-8"; sha256="00nxvq5fn5il3lmip8ag22cqc2sxlbl1rqw5zxp309wp4nrm5i2v"; depends=[vcd gnm MASS]; };
 vcrpart = derive { name="vcrpart"; version="0.3-3"; sha256="0rnf9cwynfwr956hwj4kxqiqq3cdw4wf5ia73s7adxixh5kpqxqa"; depends=[partykit nlme rpart numDeriv ucminf zoo sandwich strucchange]; };
 vdg = derive { name="vdg"; version="1.1"; sha256="08bl7835m5c62lgaghgnd80zlbic6i80sjfxdr39a715bxpr8g3b"; depends=[ggplot2 quantreg proxy gridExtra]; };
-vdmR = derive { name="vdmR"; version="0.1.0"; sha256="0rv9c6bn711dn1fhgmr4ig0lr9s6yjk7r5ccvyiadgn6g5mr2bds"; depends=[ggplot2 plyr maptools gridSVG rjson GGally Rook dplyr]; };
+vdmR = derive { name="vdmR"; version="0.1.1"; sha256="0hmn7xgi1dzril6jdwxkpxp8isin0kxn3yb5fmcyfjhf03kcv4d4"; depends=[ggplot2 plyr maptools gridSVG rjson GGally Rook dplyr]; };
 vec2dtransf = derive { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; };
 vecsets = derive { name="vecsets"; version="1.1"; sha256="0k27g3frc9y9z2qlm19kfpls6wl0422dilhdlk6096f1fp3mc6ij"; depends=[]; };
 vectoptim = derive { name="vectoptim"; version="0.2"; sha256="1n19sipx5r0qy08jmrbsrf0kgwgl31np88wc1zyc2bkx8h1zkmf2"; depends=[foreach doParallel]; };
-vegan = derive { name="vegan"; version="2.2-1"; sha256="06rq9qrcf180isjrczscl84m3jvygz5w2gz5nc4rm1pg89rf6lrd"; depends=[permute lattice MASS cluster mgcv]; };
-vegan3d = derive { name="vegan3d"; version="0.65-0"; sha256="0c75hybhwqv56f2zpskr99rr9k6hw6rbv29bcxn0fciw5jqk01m3"; depends=[vegan rgl scatterplot3d]; };
+vegan = derive { name="vegan"; version="2.3-0"; sha256="1zlz2zq0818735db4l8gfwwxxd5dc0xnx6v8cq6mfclkw1qhcdpx"; depends=[permute lattice MASS cluster mgcv]; };
+vegan3d = derive { name="vegan3d"; version="0.65-1"; sha256="03rzv7l2jjrahj3492ysalyizkv24by35nrhd1bnlb1s88sav7sr"; depends=[vegan rgl scatterplot3d]; };
 vegclust = derive { name="vegclust"; version="1.6.3"; sha256="0l6j4sgzfqvcypx2dszpnsd1sivk33pixlgf9abqifp45skpkwfg"; depends=[vegan sp]; };
 vegdata = derive { name="vegdata"; version="0.6.9"; sha256="1a8b8wwsxq8090cj8pxw1digllmc2rnby8immjfmbi5rzjbksgi3"; depends=[foreign XML]; };
 vegetarian = derive { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
@@ -6522,7 +6651,7 @@ vines = derive { name="vines"; version="1.1.3"; sha256="1m862kgcwfz2af00p3vqg959
 violinmplot = derive { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; };
 vioplot = derive { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; };
 viopoints = derive { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
-virtualspecies = derive { name="virtualspecies"; version="1.0"; sha256="1qg5106ja17nsqzjnyswjf438f55195l197pizkybb2ilg4fw0x1"; depends=[raster ade4 dismo rworldmap]; };
+virtualspecies = derive { name="virtualspecies"; version="1.1"; sha256="0znrb6xqyzddd1r999rhx6ix6wgpj1laf5bcns7zgmq6zb39j74s"; depends=[raster ade4 dismo rworldmap]; };
 visreg = derive { name="visreg"; version="2.2-0"; sha256="1hnyrfgyk5fign5l35aql2q7q4mmw3jby5pkv696h8k1mc8qq096"; depends=[lattice]; };
 visualFields = derive { name="visualFields"; version="0.4.2"; sha256="14plg94g4znl8n6798na2rivjjamjgayqkk1qwn1nx5df040l4q5"; depends=[gridBase flip matrixStats Hmisc]; };
 visualize = derive { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; };
@@ -6563,10 +6692,11 @@ wfe = derive { name="wfe"; version="1.3"; sha256="16b39i60x10kw6yz44ff19h638s9ls
 wgaim = derive { name="wgaim"; version="1.4-8"; sha256="1x1dgxw1viswdqd1k1gfbpipzhgy13lhncji0wlsgpcgfa40ap1a"; depends=[qtl lattice]; };
 wgsea = derive { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[]; };
 whisker = derive { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; };
+whoami = derive { name="whoami"; version="1.1.0"; sha256="15mj1s0dfr9y14b23nx0506r0vz48bm1f6mf0fi7b390q0zmndq7"; depends=[httr jsonlite]; };
 widals = derive { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; };
 widenet = derive { name="widenet"; version="0.1-2"; sha256="1nimm8szbg82vg00f5c7b3f3sk0gplssbl4ggasjnh7dl621vfny"; depends=[glmnet relaxnet]; };
 wikibooks = derive { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; };
-wikipediatrend = derive { name="wikipediatrend"; version="0.2.0"; sha256="11gxi94i6xfsj4dz7g2r7ag0gbah2km9ibbmjqihbk5ccxh5kfd6"; depends=[jsonlite stringr RCurl]; };
+wikipediatrend = derive { name="wikipediatrend"; version="1.1.4"; sha256="1ccqwnlp0zchjqwxpy1li4wlgjlmdq3vdz6nrcgg7npplq4f6pjl"; depends=[jsonlite stringr rvest httr RCurl]; };
 wildlifeDI = derive { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[sp rgeos adehabitatLT]; };
 windex = derive { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[geiger ape scatterplot3d]; };
 witness = derive { name="witness"; version="1.2"; sha256="1pccn7czm1q0w31zpmky5arkcbnfl94gh1nnkf8kmcccdrr3lxph"; depends=[]; };
@@ -6582,14 +6712,14 @@ wordnet = derive { name="wordnet"; version="0.1-10"; sha256="1k0ncxqsvv5vd5xm6nx
 wpp2008 = derive { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jpc24f76i0pxsjs5pb1v3k2si6df7q4msd"; depends=[]; };
 wpp2010 = derive { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; };
 wpp2012 = derive { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; };
-wppExplorer = derive { name="wppExplorer"; version="1.6-1"; sha256="1pgfh9r98yfrk8228iw5hl5pdb4ki6pz49hpf796frd86d94hw0a"; depends=[shiny plyr reshape2 googleVis wpp2012 Hmisc ggplot2]; };
+wppExplorer = derive { name="wppExplorer"; version="1.6-2"; sha256="1y9mdghq4is81gabx47pm1kfay67zv3b9hxz58lhml68wwwsfmsj"; depends=[shiny plyr reshape2 googleVis wpp2012 Hmisc ggplot2]; };
 wq = derive { name="wq"; version="0.4.3"; sha256="1lgxf5pfw3563dpyq0dgj4ps2mc5nqh56y1i77ypscj5lrcgjxrf"; depends=[zoo ggplot2 reshape2]; };
 wrassp = derive { name="wrassp"; version="0.1.3"; sha256="1xza4w5dgc6gda9ybmq386jnb1gkahdi6sds5dqay7pm5mjql6fl"; depends=[]; };
 write_snns = derive { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
 wrspathrow = derive { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[wrspathrowData sp raster rgeos rgdal]; };
 wrspathrowData = derive { name="wrspathrowData"; version="1.0"; sha256="0a1aggcll0fmkwfg4h7rs4j5h3v1bh95dkbriwrb0bx0cikg63x3"; depends=[]; };
 wskm = derive { name="wskm"; version="1.4.19"; sha256="16smir0b4pxkaxgr2vclq8kprpwn0y3fb43ba79q94d6m5hm844y"; depends=[lattice latticeExtra clv]; };
-wsrf = derive { name="wsrf"; version="1.4.0"; sha256="1b9ifswv0civaavmpzi2r3fdbccxg4akzvklqri0hj49kr4cw5pa"; depends=[Rcpp Rcpp]; };
+wsrf = derive { name="wsrf"; version="1.5.14"; sha256="0j0zlnazz40sv02fl8m5z7rv877m6ak2cms2q3ivy344k8ynjs0m"; depends=[Rcpp Rcpp]; };
 wtcrsk = derive { name="wtcrsk"; version="1.3"; sha256="1viddyms2d9q2hb9z788fcs8vp7gp6vzlsszcnyxgganfjsd85zy"; depends=[]; };
 wux = derive { name="wux"; version="2.0-0"; sha256="04casnfx5cam5a1iqm2x6lldicv11zqxgxjb61qcivga781g5sxg"; depends=[sp ncdf reshape abind fields rgdal rgeos class stringr Hmisc gdata corpcor rworldmap]; };
 x_ent = derive { name="x.ent"; version="1.1.2"; sha256="1wq1gf656jpd6aw08b0g9319gb087zqgn7bzw4amq4k8vk9vjkjm"; depends=[opencpu rJava stringr xtable jsonlite venneuler ggplot2 statmod]; };
@@ -6601,23 +6731,24 @@ xhmmScripts = derive { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64
 xkcd = derive { name="xkcd"; version="0.0.4"; sha256="1hwr3ylgflzizgp8ffwdv9cgcngpjwmpxvgrvg8ad89a40l1mxcr"; depends=[ggplot2 extrafont Hmisc]; };
 xlsx = derive { name="xlsx"; version="0.5.7"; sha256="0qxkdpf1dvi0x7fy65abjx2j60rdx7fv5yi8l2wdm0f2631pnwin"; depends=[rJava xlsxjars]; };
 xlsxjars = derive { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; };
-xml2 = derive { name="xml2"; version="0.1.0"; sha256="0p00lg8p5naw77k2fk6wbqmqdhj9iv2zn7g00gp7g253lmm8q740"; depends=[Rcpp Rcpp BH]; };
+xml2 = derive { name="xml2"; version="0.1.1"; sha256="1k6xzgx87vqzg1lkc1jaxxlw7zyhzqsis51q5p9jn0q3pw02qf53"; depends=[Rcpp Rcpp BH]; };
 xoi = derive { name="xoi"; version="0.61-1"; sha256="0ypy0rb0f0bns41vjzyln04k3hypgr3wysqbdi0b0r14ip5rb47k"; depends=[qtl]; };
 xpose4 = derive { name="xpose4"; version="4.5.3"; sha256="02m3ad4287ljsi4qrzwd84lfj1y6rz9nias2zk4cbqm14gf19pdf"; depends=[lattice gam Hmisc survival]; };
 xtable = derive { name="xtable"; version="1.7-4"; sha256="1fvx4p058ygsyj9f4xb9k5h0fdi4zibadqrsn4qbx4am30qrlqj7"; depends=[]; };
 xtal = derive { name="xtal"; version="1.0"; sha256="1717pl64nbliwbdg5fs6cwj7zvgrm00zlyj2dhi06yyg16gq1w8k"; depends=[]; };
-xtermStyle = derive { name="xtermStyle"; version="2.2-4"; sha256="0m1lwr7smym7aczcqqgqj5bx46j38ymmljilxl54bby188qhfcyz"; depends=[]; };
+xtermStyle = derive { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; };
 xts = derive { name="xts"; version="0.9-7"; sha256="163hzcnxrdb4lbsnwwv7qa00h4qlg4jm289acgvbg4jbiywpq7zi"; depends=[zoo]; };
-yaImpute = derive { name="yaImpute"; version="1.0-23"; sha256="11k7ab5s9zldn0py7zhgi1zcbpsw3bp2xf6s6salv68fhzdgpzp8"; depends=[]; };
+yaImpute = derive { name="yaImpute"; version="1.0-24"; sha256="0vqzcxkrnsj99kpc4fx9lbm446fjgsjcbfakm9pdk013mxiii72d"; depends=[]; };
 yacca = derive { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11mshrdb8w4r2pqq360dracpn0ak6x"; depends=[]; };
 yaml = derive { name="yaml"; version="2.1.13"; sha256="18kz5mfn7qpif5pn91w4vbrc5bkycsj85vwm5wxwzjlb02i9mxi6"; depends=[]; };
 ycinterextra = derive { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; };
 yhat = derive { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[yacca miscTools plotrix boot]; };
 yhatr = derive { name="yhatr"; version="0.13.4"; sha256="1z1i48nhyadn1l00sw50qif2zyjvy1jbvq91chnapfdbjjsgfv2x"; depends=[httr RCurl rjson plyr jsonlite stringr]; };
 ykmeans = derive { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[plyr foreach]; };
-yuima = derive { name="yuima"; version="1.0.36"; sha256="1rz96v0c9sikjvm3i8x887v1bkiixps691vclpd6i4cchyayx63h"; depends=[zoo expm cubature mvtnorm]; };
+yuima = derive { name="yuima"; version="1.0.71"; sha256="0aqb87jlvlq6iw2mlngiylvayd6y2wrc82zl1za442gqq8py00if"; depends=[zoo expm cubature mvtnorm]; };
 zCompositions = derive { name="zCompositions"; version="1.0.3"; sha256="0lxy201ys9dvv8c09q8wbks1c2jkjyd1bbrxhjr7zi9j7m0parl7"; depends=[MASS NADA truncnorm]; };
 zendeskR = derive { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
+zetadiv = derive { name="zetadiv"; version="0.1"; sha256="1p9mxy70mgqxjn7szh44217nvhjh90237kp5znli1r01ch64mx6b"; depends=[car mgcv vegan]; };
 zic = derive { name="zic"; version="0.8.1"; sha256="05mn894qdx6k7158dbsjy2b49n0gz5xnmlixr2dhkxc12ydj6zs5"; depends=[Rcpp RcppArmadillo coda Rcpp RcppArmadillo]; };
 zipcode = derive { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; };
 zipfR = derive { name="zipfR"; version="0.6-6"; sha256="1y3nqfjg5m89mdvcmqwjmwlc8p3hpcqnwv4ji1a7ggg4n63lwl3j"; depends=[]; };

From bb3db4e6534d26b0be2d3ef8113e8b34463a80d0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Jun 2015 03:54:11 +0300
Subject: [PATCH 1053/2322] mueval: reapply Nix-specific patch

---
 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 e1f45351a78..55a7e330aa4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -760,7 +760,7 @@ self: super: {
   dyre = appendPatch super.dyre ./dyre-nix.patch;
 
   # https://github.com/gwern/mueval/issues/9
-  mueval = appendPatch super.mueval ./mueval-fix.patch;
+  mueval = appendPatch (appendPatch super.mueval ./mueval-fix.patch) ./mueval-nix.patch;
 
   # Test suite won't compile against tasty-hunit 0.9.x.
   zlib = dontCheck super.zlib;

From 33e70ad68a13efc14187a0657d447c26cf765cb7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 11 Jun 2015 17:59:51 -0700
Subject: [PATCH 1054/2322] ncurses: Add gcc-5 patch

---
 .../development/libraries/ncurses/default.nix |  3 +-
 .../development/libraries/ncurses/gcc-5.patch | 46 +++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/ncurses/gcc-5.patch

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 19b1b5fe33b..0c789fc4460 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh";
   };
 
-  patches = [ ./clang.patch ];
+  # gcc-5.patch should be removed after 5.9
+  patches = [ ./clang.patch ./gcc-5.patch ];
 
   configureFlags =
     [ "--with-shared" "--without-debug" "--enable-pc-files" "--enable-symlinks" ]
diff --git a/pkgs/development/libraries/ncurses/gcc-5.patch b/pkgs/development/libraries/ncurses/gcc-5.patch
new file mode 100644
index 00000000000..2448229b88e
--- /dev/null
+++ b/pkgs/development/libraries/ncurses/gcc-5.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/545114
+
+extracted from the upstream change (which had many unrelated commits in one)
+
+From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001
+From: "Thomas E. Dickey" <dickey@invisible-island.net>
+Date: Sun, 7 Dec 2014 03:10:09 +0000
+Subject: [PATCH] ncurses 5.9 - patch 20141206
+
++ modify MKlib_gen.sh to work around change in development version of
+  gcc introduced here:
+	  https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
+	  https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
+  (reports by Marcus Shawcroft, Maohui Lei).
+
+diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
+index d8cc3c9..b91398c 100755
+--- a/ncurses/base/MKlib_gen.sh
++++ b/ncurses/base/MKlib_gen.sh
+@@ -474,11 +474,22 @@ sed -n -f $ED1 \
+ 	-e 's/gen_$//' \
+ 	-e 's/  / /g' >>$TMP
+ 
++cat >$ED1 <<EOF
++s/  / /g
++s/^ //
++s/ $//
++s/P_NCURSES_BOOL/NCURSES_BOOL/g
++EOF
++
++# A patch discussed here:
++#	https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
++# introduces spurious #line markers.  Work around that by ignoring the system's
++# attempt to define "bool" and using our own symbol here.
++sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
++cat $ED2 >$TMP
++
+ $preprocessor $TMP 2>/dev/null \
+-| sed \
+-	-e 's/  / /g' \
+-	-e 's/^ //' \
+-	-e 's/_Bool/NCURSES_BOOL/g' \
++| sed -f $ED1 \
+ | $AWK -f $AW2 \
+ | sed -f $ED3 \
+ | sed \

From b6c589b2da2b46aed1dc2950ffae07437606bbff Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 27 May 2015 06:12:26 +0000
Subject: [PATCH 1055/2322] Simple EC2 user-data VM test

---
 nixos/lib/test-driver/Machine.pm              |  2 -
 .../scripts/ec2/amazon-base-config.nix        |  2 +-
 nixos/release.nix                             |  1 +
 nixos/tests/ec2.nix                           | 96 +++++++++++++++++++
 4 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 nixos/tests/ec2.nix

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 6df8ddb9e95..41088ed75f7 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -43,8 +43,6 @@ sub new {
         $startCommand .= "-bios $args->{bios} "
             if defined $args->{bios};
         $startCommand .= $args->{qemuFlags} || "";
-    } else {
-        $startCommand = Cwd::abs_path $startCommand;
     }
 
     my $tmpDir = $ENV{'TMPDIR'} || "/tmp";
diff --git a/nixos/maintainers/scripts/ec2/amazon-base-config.nix b/nixos/maintainers/scripts/ec2/amazon-base-config.nix
index d23f15e828b..097d722554c 100644
--- a/nixos/maintainers/scripts/ec2/amazon-base-config.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-base-config.nix
@@ -1,5 +1,5 @@
 { modulesPath, ...}:
 {
-  imports = [ "${modulesPath}/virtualisation/amazon-config.nix" ];
+  imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ];
   services.journald.rateLimitBurst = 0;
 }
diff --git a/nixos/release.nix b/nixos/release.nix
index 51a58da4454..103bf9b2c5b 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -247,6 +247,7 @@ in rec {
   tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
   tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; });
   tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; });
+  tests.ec2 = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).bootEc2NixOps;
   tests.firefox = callTest tests/firefox.nix {};
   tests.firewall = callTest tests/firewall.nix {};
   tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; });
diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix
new file mode 100644
index 00000000000..7ea9b3d07f7
--- /dev/null
+++ b/nixos/tests/ec2.nix
@@ -0,0 +1,96 @@
+{ system ? builtins.currentSystem }:
+
+with import ../lib/testing.nix { inherit system; };
+with import ../lib/qemu-flags.nix;
+with pkgs.lib;
+
+let
+  image =
+    (import ../lib/eval-config.nix {
+      inherit system;
+      modules = [
+        ../maintainers/scripts/ec2/amazon-hvm-config.nix
+        ../../nixos/modules/testing/test-instrumentation.nix
+        { boot.initrd.kernelModules = [ "virtio" "virtio_blk" "virtio_pci" "virtio_ring" ]; }
+      ];
+    }).config.system.build.amazonImage;
+
+  makeEc2Test = { name, userData, script, hostname ? "ec2-instance", sshPublicKey ? null }:
+    let
+      metaData = pkgs.stdenv.mkDerivation {
+        name = "metadata";
+        buildCommand = ''
+          mkdir -p $out/2011-01-01
+          ln -s ${pkgs.writeText "userData" userData} $out/2011-01-01/user-data
+          mkdir -p $out/1.0/meta-data
+          echo "${hostname}" > $out/1.0/meta-data/hostname
+        '' + optionalString (sshPublicKey != null) ''
+          mkdir -p $out/1.0/meta-data/public-keys/0
+          ln -s ${pkgs.writeText "sshPublicKey" sshPublicKey} $out/1.0/meta-data/public-keys/0/openssh-key
+        '';
+      };
+    in makeTest {
+      name = "ec2-" + name;
+      nodes = {};
+      testScript =
+        ''
+          use File::Temp qw/ tempfile /;
+          my ($fh, $filename) = tempfile();
+
+          `qemu-img create -f qcow2 -o backing_file=${image}/nixos.img $filename`;
+
+          my $startCommand = "qemu-kvm -m 768 -net nic -net 'user,net=169.254.0.0/16,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'";
+          $startCommand .= " -drive file=" . Cwd::abs_path($filename) . ",if=virtio,werror=report";
+          $startCommand .= " \$QEMU_OPTS";
+
+          my $machine = createMachine({ startCommand => $startCommand });
+          ${script}
+        '';
+    };
+
+  snakeOilPrivateKey = [
+    "-----BEGIN EC PRIVATE KEY-----"
+    "MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49"
+    "AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN"
+    "r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA=="
+    "-----END EC PRIVATE KEY-----"
+  ];
+
+  snakeOilPublicKey = pkgs.lib.concatStrings [
+    "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA"
+    "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa"
+    "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= snakeoil"
+  ];
+in {
+  bootEc2NixOps = makeEc2Test {
+    name         = "nixops-userdata";
+    sshPublicKey = snakeOilPublicKey; # That's right folks! My user's key is also the host key!
+
+    userData = ''
+      SSH_HOST_DSA_KEY_PUB:${snakeOilPublicKey}
+      SSH_HOST_DSA_KEY:${pkgs.lib.concatStringsSep "|" snakeOilPrivateKey}
+    '';
+    script = ''
+      $machine->start;
+      $machine->waitForFile("/root/user-data");
+      $machine->waitForUnit("sshd.service");
+
+      # We have no keys configured on the client side yet, so this should fail
+      $machine->fail("ssh -o BatchMode=yes localhost exit");
+
+      # Let's install our client private key
+      $machine->succeed("mkdir -p ~/.ssh");
+      ${concatMapStrings (s: "$machine->succeed('echo ${s} >> ~/.ssh/id_ecdsa');") snakeOilPrivateKey}
+      $machine->succeed("chmod 600 ~/.ssh/id_ecdsa");
+
+      # We haven't configured the host key yet, so this should still fail
+      $machine->fail("ssh -o BatchMode=yes localhost exit");
+
+      # Add the host key; ssh should finally succeed
+      $machine->succeed("echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts");
+      $machine->succeed("ssh -o BatchMode=yes localhost exit");
+
+      $machine->shutdown;
+    '';
+  };
+}

From 089f9d6486b9c0d5f27b116468ca131697ef8e16 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 11 Jun 2015 22:00:13 -0500
Subject: [PATCH 1056/2322] gnuapl: latest version doesn't require liblapack

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

diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix
index 687b7319cf4..44462161407 100644
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/pkgs/development/interpreters/gnu-apl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, liblapack, readline, gettext, ncurses }:
+{ stdenv, fetchurl, readline, gettext, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "gnu-apl-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0h4diq3wfbdwxp5nm0z4b0p1zq13lwip0y7v28r9v0mbbk8xsfh1";
   };
 
-  buildInputs = [ liblapack readline gettext ncurses ];
+  buildInputs = [ readline gettext ncurses ];
 
   postInstall = ''
     cp -r support-files/ $out/share/doc/

From da6eec001ab9437a50d4f91d8c1a3704c193647c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 11 Jun 2015 22:10:56 -0500
Subject: [PATCH 1057/2322] nixpkgs: z3 4.3.2 -> 4.4.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/logic/z3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index 2296a28444b..fb3fb959ae6 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "z3-${version}";
-  version = "4.3.2";
+  version = "4.4.0";
 
   src = fetchFromGitHub {
     owner  = "Z3Prover";
     repo   = "z3";
-    rev    = "ac21ffebdf1512da2a77dc46c47bde87cc3850f3";
-    sha256 = "1y86akhpy41wx3gx7r8gvf7xbax7dj36ikj6gqh5a7p6r6maz9ci";
+    rev    = "7f6ef0b6c0813f2e9e8f993d45722c0e5b99e152";
+    sha256 = "1xllvq9fcj4cz34biq2a9dn2sj33bdgrzyzkj26hqw70wkzv1kzx";
   };
 
   buildInputs = [ python ];

From 4b758e374e19774509a5c93726d79dde4744a8bc Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkingod@gmail.com>
Date: Fri, 10 Apr 2015 06:06:52 +0200
Subject: [PATCH 1058/2322] Initial attempt at configuring from EC2 userdata
 (with input from cstrahan). Now with VM tests!

---
 .../scripts/ec2/amazon-base-config.nix        |  2 +-
 nixos/modules/virtualisation/amazon-init.nix  | 52 +++++++++++++++++++
 nixos/release.nix                             |  3 +-
 nixos/tests/ec2.nix                           | 25 ++++++++-
 4 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 nixos/modules/virtualisation/amazon-init.nix

diff --git a/nixos/maintainers/scripts/ec2/amazon-base-config.nix b/nixos/maintainers/scripts/ec2/amazon-base-config.nix
index 097d722554c..28317317eab 100644
--- a/nixos/maintainers/scripts/ec2/amazon-base-config.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-base-config.nix
@@ -1,5 +1,5 @@
 { modulesPath, ...}:
 {
-  imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ];
+  imports = [ "${modulesPath}/virtualisation/amazon-init.nix" ];
   services.journald.rateLimitBurst = 0;
 }
diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
new file mode 100644
index 00000000000..c5dfb3643e1
--- /dev/null
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -0,0 +1,52 @@
+{ config, pkgs, modulesPath, ... }:
+
+# This attempts to pull a nix expression from this EC2 instance's user-data.
+
+let
+  bootScript = pkgs.writeScript "bootscript.sh" ''
+    #!${pkgs.stdenv.shell} -eux
+
+    echo "attempting to fetch configuration from user-data..."
+
+    export PATH=${pkgs.nix}/bin:${pkgs.wget}/bin:${pkgs.systemd}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin:${config.system.build.nixos-rebuild}/bin:$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="$(mktemp)"
+    wget -q --wait=1 --tries=0 --retry-connrefused -O - http://169.254.169.254/2011-01-01/user-data > "$userData"
+
+    if [[ $? -eq 0 ]]; then
+      echo "user-data fetched"
+      # 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.
+      if sed '/^\(#\|SSH_HOST_.*\)/d' < "$userData" | grep -q '\S'; then
+        channels="$(grep '^###' "$userData" | sed 's|###\s*||')"
+        printf "%s" "$channels" | while read channel; do
+          echo "writing channel: $channel"
+        done
+
+        if [[ -n "$channels" ]]; then
+          printf "%s" "$channels" > /root/.nix-channels
+          nix-channel --update
+        fi
+
+        echo "setting configuration"
+        cp "$userData" /etc/nixos/configuration.nix
+      else
+        echo "user-data does not appear to be a nix expression; ignoring"
+      fi
+    else
+      echo "failed to fetch user-data"
+    fi
+
+    type -f nixos-rebuild
+
+    nixos-rebuild switch
+  '';
+in {
+  imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ];
+  ec2.metadata = true;
+  boot.postBootCommands = ''
+    ${bootScript} &
+  '';
+}
diff --git a/nixos/release.nix b/nixos/release.nix
index 103bf9b2c5b..6afcdbff3e1 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -247,7 +247,8 @@ in rec {
   tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
   tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; });
   tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; });
-  tests.ec2 = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).bootEc2NixOps;
+  tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops;
+  tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config;
   tests.firefox = callTest tests/firefox.nix {};
   tests.firewall = callTest tests/firewall.nix {};
   tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; });
diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix
index 7ea9b3d07f7..1296ff4e8e3 100644
--- a/nixos/tests/ec2.nix
+++ b/nixos/tests/ec2.nix
@@ -62,7 +62,7 @@ let
     "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= snakeoil"
   ];
 in {
-  bootEc2NixOps = makeEc2Test {
+  boot-ec2-nixops = makeEc2Test {
     name         = "nixops-userdata";
     sshPublicKey = snakeOilPublicKey; # That's right folks! My user's key is also the host key!
 
@@ -93,4 +93,27 @@ in {
       $machine->shutdown;
     '';
   };
+
+  boot-ec2-config = makeEc2Test {
+    name         = "config-userdata";
+    sshPublicKey = snakeOilPublicKey;
+
+    userData = ''
+      ### http://nixos.org/channels/nixos-unstable nixos
+      {
+        imports = [
+          <nixpkgs/nixos/modules/virtualisation/amazon-image.nix>
+          <nixpkgs/nixos/modules/testing/test-instrumentation.nix>
+        ];
+        environment.etc.testFile = {
+          text = "whoa";
+        };
+      }
+    '';
+    script = ''
+      $machine->start;
+      $machine->waitForFile("/etc/testFile");
+      $machine->succeed("cat /etc/testFile | grep -q 'whoa'");
+    '';
+  };
 }

From 214aae46c79186d4d96fd434b55cdf701cb48307 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 12 Jun 2015 10:32:36 +0200
Subject: [PATCH 1059/2322] emacs-monky: add an Mercurial mode that's inspired
 by Magit

---
 .../editors/emacs-modes/monky/default.nix     | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/monky/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/monky/default.nix b/pkgs/applications/editors/emacs-modes/monky/default.nix
new file mode 100644
index 00000000000..8e35a4e2b57
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/monky/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, emacs, unzip }:
+
+stdenv.mkDerivation {
+  name = "emacs-monky-20150404";
+
+  src = fetchurl {
+    url = "https://github.com/ananthakumaran/monky/archive/48c0200910739b6521f26f6423b2bfb8c38b4482.zip";
+    sha256 = "0yp3pzddx7yki9n3qrriqa5p442qyrdivvlc4xbl024vzjyzddrj";
+  };
+
+  buildInputs = [ emacs unzip ];
+
+  buildPhase = "emacs -L . --batch -f batch-byte-compile *.el";
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2630b2f79b..a6a6ed3aeeb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10934,6 +10934,8 @@ let
 
     metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { };
 
+    monky = callPackage ../applications/editors/emacs-modes/monky { };
+
     notmuch = lowPrio (pkgs.notmuch.override { inherit emacs; });
 
     ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { };

From 4d404fd6a48e67db0c9da507d6dbf829cb47e3de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 12 Jun 2015 10:50:40 +0200
Subject: [PATCH 1060/2322] ihaskell-wrapper: avoid use of /bin/sh

https://github.com/NixOS/nixpkgs/issues/183
---
 pkgs/development/tools/haskell/ihaskell/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
index 035ad738a82..c00f46577a8 100644
--- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix
+++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
@@ -7,7 +7,7 @@ let
     self.ihaskell-display
   ] ++ packages self);
   ihaskellSh = writeScriptBin "ihaskell-notebook" ''
-    #!/bin/sh
+    #! ${stdenv.shell}
     export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"
     export PATH="${ihaskell}/bin:${ihaskellEnv}/bin:${ipython}/bin"
     ${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell

From 85ae0cb070628bcb98e63e6166fd6f52045f385a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 12 Jun 2015 10:54:02 +0200
Subject: [PATCH 1061/2322] ghc: move gcc-clang-wrapper.sh script into the ghc
 directory tree since it's the only user of that script

---
 pkgs/development/compilers/ghc/7.0.4-binary.nix                 | 2 +-
 pkgs/development/compilers/ghc/7.0.4.nix                        | 2 +-
 pkgs/development/compilers/ghc/7.2.2.nix                        | 2 +-
 pkgs/development/compilers/ghc/7.4.2-binary.nix                 | 2 +-
 pkgs/development/compilers/ghc/7.4.2.nix                        | 2 +-
 pkgs/development/compilers/ghc/7.6.3.nix                        | 2 +-
 .../{haskell-modules => compilers/ghc}/gcc-clang-wrapper.sh     | 0
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/development/{haskell-modules => compilers/ghc}/gcc-clang-wrapper.sh (100%)

diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix
index a1cdd6171ee..7a6f1b78fa4 100644
--- a/pkgs/development/compilers/ghc/7.0.4-binary.nix
+++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     ./configure --prefix=$out \
       --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \
-      ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}"}
+      ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"}
   '';
 
   # Stripping combined with patchelf breaks the executables (they die
diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix
index c28359af16f..281e5ca66a2 100644
--- a/pkgs/development/compilers/ghc/7.0.4.nix
+++ b/pkgs/development/compilers/ghc/7.0.4.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     export NIX_LDFLAGS+=" -no_dtrace_dof"
   '';
 
-  configureFlags = if stdenv.isDarwin then "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}"
+  configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}"
                                       else "--with-gcc=${stdenv.cc}/bin/gcc";
 
   NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";
diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix
index 651cf200a8d..7276f413967 100644
--- a/pkgs/development/compilers/ghc/7.2.2.nix
+++ b/pkgs/development/compilers/ghc/7.2.2.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     export NIX_LDFLAGS+=" -no_dtrace_dof"
   '';
 
-  configureFlags = if stdenv.isDarwin then "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}"
+  configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}"
                                       else "--with-gcc=${stdenv.cc}/bin/gcc";
 
   NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";
diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix
index 2b8d403701f..25c9dd0a65a 100644
--- a/pkgs/development/compilers/ghc/7.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     ./configure --prefix=$out \
       --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \
-      ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}"}
+      ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"}
   '';
 
   # Stripping combined with patchelf breaks the executables (they die
diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix
index 4e4a5f6024e..b2abcb08ec3 100644
--- a/pkgs/development/compilers/ghc/7.4.2.nix
+++ b/pkgs/development/compilers/ghc/7.4.2.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     export NIX_LDFLAGS+=" -no_dtrace_dof"
   '';
 
-  configureFlags = if stdenv.isDarwin then "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}"
+  configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}"
                                       else "--with-gcc=${stdenv.cc}/bin/gcc";
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix
index 4eb6e425f35..366c0044a67 100644
--- a/pkgs/development/compilers/ghc/7.6.3.nix
+++ b/pkgs/development/compilers/ghc/7.6.3.nix
@@ -52,7 +52,7 @@ in stdenv.mkDerivation rec {
     export NIX_LDFLAGS+=" -no_dtrace_dof"
   '';
 
-  configureFlags = if stdenv.isDarwin then "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}"
+  configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}"
                                       else "--with-gcc=${stdenv.cc}/bin/gcc";
 
   postInstall = ''
diff --git a/pkgs/development/haskell-modules/gcc-clang-wrapper.sh b/pkgs/development/compilers/ghc/gcc-clang-wrapper.sh
similarity index 100%
rename from pkgs/development/haskell-modules/gcc-clang-wrapper.sh
rename to pkgs/development/compilers/ghc/gcc-clang-wrapper.sh

From 69829dd4ff0248a3b96970e9e2b94790c738bf30 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Jun 2015 11:22:59 +0200
Subject: [PATCH 1062/2322] Debian: Update to 8.1

---
 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 53a01365435..c4fefe4d501 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1710,22 +1710,22 @@ rec {
     };
 
     debian8i386 = {
-      name = "debian-8.0-jessie-i386";
-      fullName = "Debian 8.0 Jessie (i386)";
+      name = "debian-8.1-jessie-i386";
+      fullName = "Debian 8.1 Jessie (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz;
-        sha256 = "0lrv1lnd595c346ci7z8ja2b0rm2gx5r4hwp0wbp9lzxi8k5nk1d";
+        sha256 = "e658c2aebc3c0bc529e89de3ad916a71372f0a80161111d86a7dab1026644507";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
 
     debian8x86_64 = {
-      name = "debian-8.0-jessie-amd64";
-      fullName = "Debian 8.0 Jessie (amd64)";
+      name = "debian-8.1-jessie-amd64";
+      fullName = "Debian 8.1 Jessie (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz;
-        sha256 = "0hhagvybciy89wr1cy9dgdfki668dvcywgbz4w01qwivyd6dsia4";
+        sha256 = "265907f3cb05aff5f653907e9babd4704902f78cd5e355d4cd4ae590e4d5b043";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;

From 248a1b4d51555ce1ca5c3d8d496ec4ee9ef07f54 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 12 Jun 2015 11:45:58 +0200
Subject: [PATCH 1063/2322] nixos-artwork: only download the necessary artwork

---
 pkgs/data/misc/nixos-artwork/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix
index 99f3e8b1177..b35a96fff82 100644
--- a/pkgs/data/misc/nixos-artwork/default.nix
+++ b/pkgs/data/misc/nixos-artwork/default.nix
@@ -1,24 +1,23 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "nixos-artwork-2015-02-27";
   # Remember to check the default lightdm wallpaper when updating
 
-  src = fetchFromGitHub {
-    owner = "NixOS";
-    repo = "nixos-artwork";
-    rev = "e71b6846023919136795ede22b16d73b2cf1693d";
-    sha256 = "167yvhm2qy7qgyrqqs4hv98mmlarhgxpcsyv0r8a9g3vkblfdczb";
+  GnomeDark = fetchurl {
+    url = https://raw.githubusercontent.com/NixOS/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png;
+    sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7";
   };
 
+  unpackPhase = "true";
+
   installPhase = ''
-    mkdir -p $out/share/artwork
-    cp -r * $out/share/artwork
-    find $out -name \*.xcf -exec rm {} \;
+    mkdir -p $out/share/artwork/gnome
+    ln -s $GnomeDark $out/share/artwork/gnome/Gnome_Dark.png
   '';
   
   meta = with stdenv.lib; {
-    homepage = "https://github.com/NixOS/nixos-artwork";
+    homepage = https://github.com/NixOS/nixos-artwork;
     platforms = platforms.all;
   };
 }

From 69f4fc4be6e799fbd7aa3bafa8849e24e8f1d4fb Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Fri, 12 Jun 2015 11:53:33 +0200
Subject: [PATCH 1064/2322] Add hicolor_icon_theme dependency

This avoids having icon-theme.cache generated.
---
 pkgs/applications/audio/gmpc/default.nix | 4 ++--
 pkgs/tools/misc/gparted/default.nix      | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
index 7cc8aeda367..4da235dd8a9 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libtool, intltool, pkgconfig, glib
 , gtk, curl, mpd_clientlib, libsoup, gob2, vala, libunique
-, libSM, libICE, sqlite
+, libSM, libICE, sqlite, hicolor_icon_theme
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup
-    libunique libmpd gob2 vala libSM libICE sqlite
+    libunique libmpd gob2 vala libSM libICE sqlite hicolor_icon_theme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index dd2798de272..464e40ec014 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, parted, gtk, glib, intltool, gettext, libuuid
-, pkgconfig, gtkmm, libxml2 }:
+, pkgconfig, gtkmm, libxml2, hicolor_icon_theme
+}:
 
 stdenv.mkDerivation rec {
   name = "gparted-0.22.0";
@@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
   configureFlags = "--disable-doc";
 
   buildInputs = [
-    parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2
+    parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2 hicolor_icon_theme
   ];
 
   meta = with stdenv.lib; {

From 0a7c5e4f686ade2cfac329afdaee5da05a366556 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 5 Jun 2015 10:34:00 +0200
Subject: [PATCH 1065/2322] cygwin: libedit patch for cygwin

---
 .../libraries/libedit/01-cygwin.patch         | 25 +++++++++++++++++++
 .../development/libraries/libedit/default.nix |  4 +++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/libedit/01-cygwin.patch

diff --git a/pkgs/development/libraries/libedit/01-cygwin.patch b/pkgs/development/libraries/libedit/01-cygwin.patch
new file mode 100644
index 00000000000..33bd39ed61e
--- /dev/null
+++ b/pkgs/development/libraries/libedit/01-cygwin.patch
@@ -0,0 +1,25 @@
+--- libedit-20120311-3.0/src/chartype.h	2012-03-11 10:54:58.000000000 +0100
++++ libedit-20120311-3.0/src/chartype.h	2012-05-03 19:00:20.651847423 +0200
+@@ -56,9 +56,11 @@
+ /* Oh for a <uchar.h> with char32_t and __STDC_UTF_32__ in it...
+  * ref: ISO/IEC DTR 19769
+  */
++#ifndef __CYGWIN__
+ #if WCHAR_MAX < INT32_MAX
+ #warning Build environment does not support non-BMP characters
+ #endif
++#endif
+ 
+ #ifndef HAVE_WCSDUP
+ wchar_t *wcsdup(const wchar_t *s);
+--- libedit-20120311-3.0/src/editline/readline.h	2011-02-26 23:42:59.000000000 +0100
++++ libedit-20120311-3.0/src/editline/readline.h	2012-05-03 19:00:49.211244803 +0200
+@@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap;
+ 
+ #ifndef CTRL
+ #include <sys/ioctl.h>
+-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
++#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__CYGWIN__)
+ #include <sys/ttydefaults.h>
+ #endif
+ #ifndef CTRL
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index 61bb15dde7d..dc2f5842b28 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
   # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
   NROFF = "${groff}/bin/nroff";
 
+  patches = if stdenv.isCygwin then [
+    ./01-cygwin.patch
+  ] else null;
+
   postInstall = ''
     sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.nativeTools) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc
   '';

From 85b7673e92029853311c84aabec677092024d898 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 5 Jun 2015 15:47:32 +0200
Subject: [PATCH 1066/2322] cygwin: turn off tests for swig since they depend
 on tcl (which i havent yet figure out how to build)

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

diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix
index c4fcd315845..e10fd25d046 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/pkgs/development/tools/misc/swig/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "02dc8g8wy75nd2is1974rl24c6mdl0ai1vszs1xpg9nd7dlv6i8r";
   };
 
-  doCheck = true;
+  doCheck = !stdenv.isCygwin;
   # 'make check' uses boost and tcl
   buildInputs = stdenv.lib.optionals doCheck [ boost tcl ];
 

From d5087119c63ce8820c564e392ddb8e3c1865855e Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 5 Jun 2015 15:49:11 +0200
Subject: [PATCH 1067/2322] cygwin: remove kerberos from builsInputs for serf

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

diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index df8749622be..580460d5fc0 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1bphz616dv1svc50kkm8xbgyszhg3ni2dqbij99sfvjycr7bgk7c";
   };
 
-  buildInputs = [ apr scons openssl aprutil zlib kerberos pkgconfig ];
+  buildInputs = [ apr scons openssl aprutil zlib ]
+    ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos
+    ++ [ pkgconfig ];
 
   configurePhase = ''
     ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
         APU="$(echo "${aprutil}"/bin/*-config)" CC="${
           if stdenv.isDarwin then "clang" else "${stdenv.cc}/bin/gcc"
         }" ${
-          if stdenv.isDarwin then "" else "GSSAPI=\"${kerberos}\""
+          if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos}\""
         }
   '';
 

From 7c67c350a3cd1d3074efb826f70d5017d2f28cf8 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 5 Jun 2015 15:50:14 +0200
Subject: [PATCH 1068/2322] cygwin: turn off ldap and crypt for apr-util to
 make it build

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

diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 0f21af94c64..bceb10e3355 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, apr, expat, gnused
 , sslSupport ? true, openssl
 , bdbSupport ? false, db
-, ldapSupport ? true, openldap
+, ldapSupport ? !stdenv.isCygwin, openldap
 , libiconv
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = ''
     --with-apr=${apr} --with-expat=${expat}
-    --with-crypto
+    ${if !stdenv.isCygwin then "--with-crypto" else "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"}
     ${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"}
     ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"}
     ${stdenv.lib.optionalString ldapSupport "--with-ldap"}

From fac474080f4f71fd751c718d24d0cec88a3538e4 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 9 Jun 2015 14:49:39 +0200
Subject: [PATCH 1069/2322] cygwin: patchShebangs fails without proper
 findutils

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

diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 74524164dd0..19878a24e95 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, python }:
+{ stdenv, fetchFromGitHub, autoreconfHook, python, findutils }:
 
 let version = "2.0.22"; in
 stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ python ];
+  buildInputs = [ python ] ++ stdenv.lib.optional stdenv.isCygwin findutils;
 
   patchPhase = ''
     patchShebangs event_rpcgen.py

From 277c263c1e2497a9c0009be242939ed4f7615a24 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 10 Jun 2015 14:08:12 +0200
Subject: [PATCH 1070/2322] cygwin: update patch for cmake 3.2.2

---
 .../build-managers/cmake/3.2.2-cygwin.patch   | 274 ++++++++++++++++++
 .../tools/build-managers/cmake/default.nix    |   7 +-
 2 files changed, 277 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch

diff --git a/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch b/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch
new file mode 100644
index 00000000000..982aba17e87
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cmake/3.2.2-cygwin.patch
@@ -0,0 +1,274 @@
+--- cmake-3.2.2/Source/cmFileCommand.cxx	2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Source/ccmFileCommand.cxx	2015-06-10 11:02:27.345598700 +0200
+@@ -1179,7 +1179,7 @@
+   MatchProperties CollectMatchProperties(const char* file)
+     {
+     // Match rules are case-insensitive on some platforms.
+-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
++#if defined(_WIN32) || defined(__APPLE__)
+     std::string lower = cmSystemTools::LowerCase(file);
+     const char* file_to_match = lower.c_str();
+ #else
+--- cmake-3.2.2/Source/cmInstallCommand.cxx	2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Source/cmInstallCommand.cxx	2015-06-10 11:04:19.257935200 +0200
+@@ -1138,7 +1138,7 @@
+       {
+       literal_args += " REGEX \"";
+     // Match rules are case-insensitive on some platforms.
+-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
++#if defined(_WIN32) || defined(__APPLE__)
+       std::string regex = cmSystemTools::LowerCase(args[i]);
+ #else
+       std::string regex = args[i];
+--- cmake-3.2.2/Source/kwsys/Glob.cxx	2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Source/kwsys/Glob.cxx	2015-06-10 11:05:51.602674000 +0200
+@@ -37,7 +37,7 @@
+ #include <string.h>
+ namespace KWSYS_NAMESPACE
+ {
+-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
++#if defined(_WIN32) || defined(__APPLE__)
+ // On Windows and apple, no difference between lower and upper case
+ # define KWSYS_GLOB_CASE_INDEPENDENT
+ #endif
+--- cmake-3.2.2/Source/kwsys/SystemInformation.cxx	2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Source/kwsys/SystemInformation.cxx	2015-06-10 11:13:00.308303500 +0200
+@@ -911,7 +911,7 @@
+ // Hide implementation details in an anonymous namespace.
+ namespace {
+ // *****************************************************************************
+-#if defined(__linux) || defined(__APPLE__)
++#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__)
+ int LoadLines(
+       FILE *file,
+       kwsys_stl::vector<kwsys_stl::string> &lines)
+@@ -947,7 +947,7 @@
+   return nRead;
+ }
+ 
+-# if defined(__linux)
++# if defined(__linux) || defined(__CYGWIN__)
+ // *****************************************************************************
+ int LoadLines(
+       const char *fileName,
+@@ -986,7 +986,7 @@
+ }
+ #endif
+ 
+-#if defined(__linux)
++#if defined(__linux) || defined(__CYGWIN__)
+ // ****************************************************************************
+ template<typename T>
+ int GetFieldsFromFile(
+@@ -3132,7 +3132,6 @@
+     pos = buffer.find("processor\t",pos+1);
+     }
+ 
+-#ifdef __linux
+   // Find the largest physical id.
+   int maxId = -1;
+   kwsys_stl::string idc =
+@@ -3165,14 +3164,6 @@
+             atoi(this->ExtractValueFromCpuInfoFile(buffer,"ncpus active").c_str());
+     }
+ 
+-#else // __CYGWIN__
+-  // does not have "physical id" entries, neither "cpu cores"
+-  // this has to be fixed for hyper-threading.
+-  kwsys_stl::string cpucount =
+-    this->ExtractValueFromCpuInfoFile(buffer,"cpu count");
+-  this->NumberOfPhysicalCPU=
+-    this->NumberOfLogicalCPU = atoi(cpucount.c_str());
+-#endif
+   // gotta have one, and if this is 0 then we get a / by 0n
+   // better to have a bad answer than a crash
+   if(this->NumberOfPhysicalCPU <= 0)
+@@ -3370,7 +3361,7 @@
+   GlobalMemoryStatusEx(&statex);
+   return statex.ullTotalPhys/1024;
+ # endif
+-#elif defined(__linux)
++#elif defined(__linux) || defined(__CYGWIN__)
+   SystemInformation::LongLong memTotal=0;
+   int ierr=GetFieldFromFile("/proc/meminfo","MemTotal:",memTotal);
+   if (ierr)
+@@ -3501,7 +3492,7 @@
+   GlobalMemoryStatusEx(&statex);
+   return (statex.ullTotalPhys - statex.ullAvailPhys)/1024;
+ # endif
+-#elif defined(__linux)
++#elif defined(__linux) || defined(__CYGWIN__)
+   const char *names[3]={"MemTotal:","MemFree:",NULL};
+   SystemInformation::LongLong values[2]={SystemInformation::LongLong(0)};
+   int ierr=GetFieldsFromFile("/proc/meminfo",names,values);
+@@ -3560,7 +3551,7 @@
+     return -2;
+     }
+   return pmc.WorkingSetSize/1024;
+-#elif defined(__linux)
++#elif defined(__linux) || defined(__CYGWIN__)
+   SystemInformation::LongLong memUsed=0;
+   int ierr=GetFieldFromFile("/proc/self/status","VmRSS:",memUsed);
+   if (ierr)
+@@ -3612,7 +3603,7 @@
+ {
+ #if defined(_WIN32)
+   return GetCurrentProcessId();
+-#elif defined(__linux) || defined(__APPLE__)
++#elif defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__)
+   return getpid();
+ #else
+   return -1;
+--- cmake-3.2.2/Source/kwsys/SystemTools.cxx	2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Source/kwsys/SystemTools.cxx	2015-06-10 11:21:58.980443200 +0200
+@@ -93,19 +93,12 @@
+ # if defined(_MSC_VER) && _MSC_VER >= 1800
+ #  define KWSYS_WINDOWS_DEPRECATED_GetVersionEx
+ # endif
+-#elif defined (__CYGWIN__)
+-# include <windows.h>
+-# undef _WIN32
+ #endif
+ 
+ #if !KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H
+ extern char **environ;
+ #endif
+ 
+-#ifdef __CYGWIN__
+-# include <sys/cygwin.h>
+-#endif
+-
+ // getpwnam doesn't exist on Windows and Cray Xt3/Catamount
+ // same for TIOCGWINSZ
+ #if defined(_WIN32) || defined (__LIBCATAMOUNT__)
+@@ -1148,15 +1141,7 @@
+     {
+     return false;
+     }
+-#if defined(__CYGWIN__)
+-  // Convert filename to native windows path if possible.
+-  char winpath[MAX_PATH];
+-  if(SystemTools::PathCygwinToWin32(filename.c_str(), winpath))
+-    {
+-    return (GetFileAttributesA(winpath) != INVALID_FILE_ATTRIBUTES);
+-    }
+-  return access(filename.c_str(), R_OK) == 0;
+-#elif defined(_WIN32)
++#if defined(_WIN32)
+   return (GetFileAttributesW(
+             SystemTools::ConvertToWindowsExtendedPath(filename).c_str())
+           != INVALID_FILE_ATTRIBUTES);
+@@ -1190,28 +1175,6 @@
+ }
+ 
+ //----------------------------------------------------------------------------
+-#ifdef __CYGWIN__
+-bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path)
+-{
+-  SystemToolsTranslationMap::iterator i =
+-    SystemTools::Cyg2Win32Map->find(path);
+-
+-  if (i != SystemTools::Cyg2Win32Map->end())
+-    {
+-    strncpy(win32_path, i->second.c_str(), MAX_PATH);
+-    }
+-  else
+-    {
+-    if(cygwin_conv_path(CCP_POSIX_TO_WIN_A, path, win32_path, MAX_PATH) != 0)
+-      {
+-      win32_path[0] = 0;
+-      }
+-    SystemToolsTranslationMap::value_type entry(path, win32_path);
+-    SystemTools::Cyg2Win32Map->insert(entry);
+-    }
+-  return win32_path[0] != 0;
+-}
+-#endif
+ 
+ bool SystemTools::Touch(const kwsys_stl::string& filename, bool create)
+ {
+@@ -4307,7 +4270,7 @@
+ 
+ bool SystemTools::FileIsFullPath(const char* in_name, size_t len)
+ {
+-#if defined(_WIN32) || defined(__CYGWIN__)
++#if defined(_WIN32)
+   // On Windows, the name must be at least two characters long.
+   if(len < 2)
+     {
+@@ -5078,9 +5041,6 @@
+ static unsigned int SystemToolsManagerCount;
+ SystemToolsTranslationMap *SystemTools::TranslationMap;
+ SystemToolsTranslationMap *SystemTools::LongPathMap;
+-#ifdef __CYGWIN__
+-SystemToolsTranslationMap *SystemTools::Cyg2Win32Map;
+-#endif
+ 
+ // SystemToolsManager manages the SystemTools singleton.
+ // SystemToolsManager should be included in any translation unit
+@@ -5126,9 +5086,6 @@
+   // Allocate the translation map first.
+   SystemTools::TranslationMap = new SystemToolsTranslationMap;
+   SystemTools::LongPathMap = new SystemToolsTranslationMap;
+-#ifdef __CYGWIN__
+-  SystemTools::Cyg2Win32Map = new SystemToolsTranslationMap;
+-#endif
+ 
+   // Add some special translation paths for unix.  These are not added
+   // for windows because drive letters need to be maintained.  Also,
+@@ -5183,9 +5140,6 @@
+ {
+   delete SystemTools::TranslationMap;
+   delete SystemTools::LongPathMap;
+-#ifdef __CYGWIN__
+-  delete SystemTools::Cyg2Win32Map;
+-#endif
+ }
+ 
+ 
+--- cmake-3.2.2/Source/kwsys/SystemTools.hxx.in	2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Source/kwsys/SystemTools.hxx.in	2015-06-10 11:24:24.271286600 +0200
+@@ -298,15 +298,6 @@
+   static bool FileExists(const kwsys_stl::string& filename);
+ 
+   /**
+-   * Converts Cygwin path to Win32 path. Uses dictionary container for
+-   * caching and calls to cygwin_conv_to_win32_path from Cygwin dll
+-   * for actual translation.  Returns true on success, else false.
+-   */
+-#ifdef __CYGWIN__
+-  static bool PathCygwinToWin32(const char *path, char *win32_path);
+-#endif
+-
+-  /**
+    * Return file length
+    */
+   static unsigned long FileLength(const kwsys_stl::string& filename);
+@@ -942,9 +933,6 @@
+    */
+   static SystemToolsTranslationMap *TranslationMap;
+   static SystemToolsTranslationMap *LongPathMap;
+-#ifdef __CYGWIN__
+-  static SystemToolsTranslationMap *Cyg2Win32Map;
+-#endif
+   friend class SystemToolsManager;
+ };
+ 
+--- cmake-3.2.2/Modules/FindCurses.cmake	2015-04-13 19:09:00.000000000 +0200
++++ cmake-3.2.2/Modules/FindCurses.cmake	2015-06-10 12:10:19.682030300 +0200
+@@ -60,15 +60,6 @@
+ if(CURSES_NCURSES_LIBRARY  AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES))
+   set(CURSES_USE_NCURSES TRUE)
+ endif()
+-# http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html
+-# cygwin ncurses stopped providing curses.h symlinks see above
+-# message.  Cygwin is an ncurses package, so force ncurses on
+-# cygwin if the curses.h is missing
+-if(CYGWIN)
+-  if(NOT EXISTS /usr/include/curses.h)
+-    set(CURSES_USE_NCURSES TRUE)
+-  endif()
+-endif()
+ 
+ 
+ # Not sure the logic is correct here.
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 9f2ed0a7352..e882f47cfe3 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -36,11 +36,11 @@ stdenv.mkDerivation rec {
       url = "http://public.kitware.com/Bug/file_download.php?"
           + "file_id=4981&type=bug";
       sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
-    }) ++ stdenv.lib.optional stdenv.isCygwin ./2.8.11-cygwin.patch;
+    }) ++ stdenv.lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch;
 
   buildInputs =
     [ bzip2 curl expat libarchive xz zlib ]
-    ++ optional (jsoncpp != null) jsoncpp
+    ++ optional (jsoncpp != null && !stdenv.isCygwin) jsoncpp
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
@@ -53,8 +53,7 @@ stdenv.mkDerivation rec {
       "--docdir=/share/doc/${name}"
       "--mandir=/share/man"
     ]
-    ++ optional (!stdenv.isCygwin) "--system-libs"
-    ++ optional (jsoncpp == null) "--no-system-jsoncpp"
+    ++ optional (jsoncpp == null || stdenv.isCygwin) "--no-system-jsoncpp"
     ++ optional useQt4 "--qt-gui"
     ++ ["--"]
     ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF";

From b980b7445f7335e59b32bf6265e865ccde039625 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 10 Jun 2015 14:09:44 +0200
Subject: [PATCH 1071/2322] cygwin: skip ssl support for postgresql (temporary)

---
 pkgs/servers/sql/postgresql/9.2.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index e04309fc466..5c51a7c578a 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "world" ];
 
-  configureFlags = [ "--with-openssl" ];
+  configureFlags = stdenv.lib.optionals (!stdenv.isCygwin) [ "--with-openssl" ];
 
   patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ];
 

From 0860826795dddb0f00a975f54f2e71521fac6770 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 10 Jun 2015 14:37:46 +0200
Subject: [PATCH 1072/2322] cygwin: cmake expression should not change for
 linux

---
 pkgs/development/tools/build-managers/cmake/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index e882f47cfe3..8cdf231729f 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
       "--docdir=/share/doc/${name}"
       "--mandir=/share/man"
     ]
+    ++ optional (!stdenv.isCygwin) "--system-libs"
     ++ optional (jsoncpp == null || stdenv.isCygwin) "--no-system-jsoncpp"
     ++ optional useQt4 "--qt-gui"
     ++ ["--"]

From 617c16f8f68088b78e815dd539eda0d3f1241da7 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 11 Jun 2015 16:25:56 +0200
Subject: [PATCH 1073/2322] cygwin: python27 gdbm module needs gettext

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

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index e67c2682998..4ad4679bd6e 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, self, callPackage
-, bzip2, openssl
+, bzip2, openssl, gettext
 
 , includeModules ? false
 
 , db, gdbm, ncurses, sqlite, readline
 
-, tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? true
+, tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? !stdenv.isCygwin
 , zlib ? null, zlibSupport ? true
 , expat, libffi
 }:
@@ -224,7 +224,7 @@ let
     gdbm = buildInternalPythonModule {
       moduleName = "gdbm";
       internalName = "gdbm";
-      deps = [ gdbm ];
+      deps = [ gdbm ] ++ stdenv.lib.optional stdenv.isCygwin gettext;
     };
 
     sqlite3 = buildInternalPythonModule {

From 36a1d2d4f8c74a58ca6c56b7d768753c0dac0752 Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Fri, 12 Jun 2015 13:49:28 +1200
Subject: [PATCH 1074/2322] Update tor to 0.2.6.9

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

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index c6a5917640e..bfa1a0ab9f4 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libevent, openssl, zlib, torsocks }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.2.6.8";
+  name = "tor-0.2.6.9";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz";
-    sha256 = "0xlsc2pa7i8hm8dyilln6p4rb0pig62b9c31yp1m0hj5jqw3d2xq";
+    sha256 = "171gjhapymfzql3bbx5qndgkamcfdl6lincrqlr7i3d9i6njjv2a";
   };
 
   # Note: torsocks is specified as a dependency, as the distributed

From a6e12c23fcb5890e44094b95a91ddb6c3e9cc081 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 8 Jun 2015 19:56:37 +0200
Subject: [PATCH 1075/2322] Link Xen scripts to /etc/xen

---
 nixos/modules/virtualisation/xen-dom0.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index ea9f61aad6a..65efdabb3b4 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -6,7 +6,6 @@ with lib;
 
 let
   cfg = config.virtualisation.xen;
-  xen = pkgs.xen;
 in
 
 {
@@ -88,9 +87,9 @@ in
       message = "Xen currently does not support EFI boot";
     } ];
 
-    virtualisation.xen.stored = mkDefault "${xen}/bin/oxenstored";
+    virtualisation.xen.stored = mkDefault "${pkgs.xen}/bin/oxenstored";
 
-    environment.systemPackages = [ xen ];
+    environment.systemPackages = [ pkgs.xen ];
 
     # Make sure Domain 0 gets the required configuration
     #boot.kernelPackages = pkgs.boot.kernelPackages.override { features={xen_dom0=true;}; };
@@ -122,7 +121,7 @@ in
 
     system.extraSystemBuilderCmds =
       ''
-        ln -s ${xen}/boot/xen.gz $out/xen.gz
+        ln -s ${pkgs.xen}/boot/xen.gz $out/xen.gz
         echo "${toString cfg.bootParams}" > $out/xen-params
       '';
 
@@ -158,13 +157,16 @@ in
 
 
     environment.etc =
-      [ { source = "${xen}/etc/xen/xl.conf";
+      [ { source = "${pkgs.xen}/etc/xen/xl.conf";
           target = "xen/xl.conf";
         }
+        { source = "${pkgs.xen}/etc/xen/scripts";
+          target = "xen/scripts";
+        }
       ];
 
     # Xen provides udev rules.
-    services.udev.packages = [ xen ];
+    services.udev.packages = [ pkgs.xen ];
 
     services.udev.path = [ pkgs.bridge-utils pkgs.iproute ];
 

From 399b5496119d1f81fb64dc1a86143adade698129 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Tue, 9 Jun 2015 15:08:06 +0200
Subject: [PATCH 1076/2322] Fix: xen-bridge systemd service

---
 nixos/modules/virtualisation/xen-dom0.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 65efdabb3b4..7b5d714622c 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -262,16 +262,13 @@ in
       wantedBy = [ "multi-user.target" ];
       before = [ "xen-domains.service" ];
       serviceConfig.RemainAfterExit = "yes";
-      serviceConfig.ExecStart = ''
-        ${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge}
-        ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} up
-        '';
-      serviceConfig.ExecStop = ''
-        ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} down
-        ${pkgs.bridge-utils}/bin/brctl delbr ${cfg.bridge}
-        '';
+      serviceConfig.ExecStart = "${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge}";
+      postStart = "${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} up";
+      serviceConfig.ExecStop = "${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} down";
+      postStop = "${pkgs.bridge-utils}/bin/brctl delbr ${cfg.bridge}";
     };
 
+
     systemd.services.xen-domains = {
       description = "Xen domains - automatically starts, saves and restores Xen domains";
       wantedBy = [ "multi-user.target" ];

From dbac15d66c887689e7701837ffb462fa5820025d Mon Sep 17 00:00:00 2001
From: Robbin C <robbinch33@gmail.com>
Date: Tue, 9 Jun 2015 17:07:11 +0800
Subject: [PATCH 1077/2322] aacgain: Add package.

This adds aacgain which is a normalizer for AAC (.m4a) audio files.
---
 pkgs/applications/audio/aacgain/default.nix | 72 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 74 insertions(+)
 create mode 100644 pkgs/applications/audio/aacgain/default.nix

diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix
new file mode 100644
index 00000000000..4cfc51970aa
--- /dev/null
+++ b/pkgs/applications/audio/aacgain/default.nix
@@ -0,0 +1,72 @@
+{ stdenv, fetchgit, unzip, m4, libtool, automake, autoconf, mp3gain, mp4v2, faad2 }:
+
+stdenv.mkDerivation {
+  name = "aacgain-1.9";
+  srcs = [
+    (fetchgit {
+      url = "https://github.com/mecke/aacgain.git";
+      rev = "4a7d59d78eadbbd5413e905af8f91fe9184ce7a8";
+      sha256 = "0y25avgmm1xpbggvkhby1a7v9wmhsp3wmp74q06sf8ph8xsfajw4";
+    })
+    mp3gain.src
+    mp4v2.src
+    faad2.src
+  ];
+
+  buildInputs = [ unzip m4 libtool automake autoconf ];
+
+  setSourceRoot = "sourceRoot=`pwd`";
+
+  postUnpack = ''
+    cd $sourceRoot
+    # mp3gain does not unzip to its own directory, so move files accordingly.
+    mkdir mp3gain
+    find . -type f -maxdepth 1 -exec mv {} mp3gain/ \;
+    mv mpglibDBL mp3gain/
+
+    mv aacgain-* aacgain
+    mv faad2-* faad2
+    mv mp4v2-* mp4v2
+  '';
+
+  patchPhase = ''
+    cd $sourceRoot
+    patch -p2 -N < aacgain/linux/mp3gain.patch
+  '';
+
+  configurePhase = ''
+    cd $sourceRoot/mp4v2
+    ./configure
+
+    cd $sourceRoot/faad2
+    ./configure
+  '';
+
+  buildPhase = ''
+    cd $sourceRoot/mp4v2
+    make libmp4v2.la
+
+    cd $sourceRoot/faad2/libfaad
+    make
+
+    cd $sourceRoot/aacgain/linux
+    sh prepare.sh
+    mkdir build
+    cd build
+    ../../../configure
+    make
+  '';
+
+  installPhase = ''
+    strip -s aacgain/aacgain
+    install -vD aacgain/aacgain "$out/bin/aacgain"
+  '';
+
+  meta = {
+    description = "ReplayGain for AAC files";
+    homepage = https://github.com/mecke/aacgain.git;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.robbinch ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6a6ed3aeeb..093c9d15540 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10404,6 +10404,8 @@ let
 
   a2jmidid = callPackage ../applications/audio/a2jmidid { };
 
+  aacgain = callPackage ../applications/audio/aacgain { };
+
   aangifte2006 = callPackage_i686 ../applications/taxes/aangifte-2006 { };
 
   aangifte2007 = callPackage_i686 ../applications/taxes/aangifte-2007 { };

From 681cbedd4a522b0ef99f49cba4c5e53b3920d718 Mon Sep 17 00:00:00 2001
From: Robbin C <robbinch33@gmail.com>
Date: Wed, 10 Jun 2015 17:43:34 +0800
Subject: [PATCH 1078/2322] aacgain: Use fetchFromGitHub instead of fetchgit.

---
 pkgs/applications/audio/aacgain/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix
index 4cfc51970aa..3f1c67a2a61 100644
--- a/pkgs/applications/audio/aacgain/default.nix
+++ b/pkgs/applications/audio/aacgain/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchgit, unzip, m4, libtool, automake, autoconf, mp3gain, mp4v2, faad2 }:
+{ stdenv, fetchFromGitHub, unzip, m4, libtool, automake, autoconf, mp3gain, mp4v2, faad2 }:
 
 stdenv.mkDerivation {
   name = "aacgain-1.9";
   srcs = [
-    (fetchgit {
-      url = "https://github.com/mecke/aacgain.git";
+    (fetchFromGitHub {
+      owner = "mecke";
+      repo = "aacgain";
       rev = "4a7d59d78eadbbd5413e905af8f91fe9184ce7a8";
       sha256 = "0y25avgmm1xpbggvkhby1a7v9wmhsp3wmp74q06sf8ph8xsfajw4";
     })

From c07fb11cd2c7495780200f26ac798574ea0dd111 Mon Sep 17 00:00:00 2001
From: Robbin C <robbinch33@gmail.com>
Date: Thu, 11 Jun 2015 00:12:46 +0800
Subject: [PATCH 1079/2322] aacgain: Use more up-to-date upstream repository.

Use more up-to-date upstream repostiory, which allows for a cleaner
build. It includes mp4v2 and faad, which will be built statically and
linked to the resulting binary.
---
 pkgs/applications/audio/aacgain/default.nix | 65 ++++++---------------
 1 file changed, 19 insertions(+), 46 deletions(-)

diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix
index 3f1c67a2a61..69cc798ec0f 100644
--- a/pkgs/applications/audio/aacgain/default.nix
+++ b/pkgs/applications/audio/aacgain/default.nix
@@ -1,61 +1,34 @@
-{ stdenv, fetchFromGitHub, unzip, m4, libtool, automake, autoconf, mp3gain, mp4v2, faad2 }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "aacgain-1.9";
-  srcs = [
-    (fetchFromGitHub {
-      owner = "mecke";
-      repo = "aacgain";
-      rev = "4a7d59d78eadbbd5413e905af8f91fe9184ce7a8";
-      sha256 = "0y25avgmm1xpbggvkhby1a7v9wmhsp3wmp74q06sf8ph8xsfajw4";
-    })
-    mp3gain.src
-    mp4v2.src
-    faad2.src
-  ];
-
-  buildInputs = [ unzip m4 libtool automake autoconf ];
-
-  setSourceRoot = "sourceRoot=`pwd`";
-
-  postUnpack = ''
-    cd $sourceRoot
-    # mp3gain does not unzip to its own directory, so move files accordingly.
-    mkdir mp3gain
-    find . -type f -maxdepth 1 -exec mv {} mp3gain/ \;
-    mv mpglibDBL mp3gain/
-
-    mv aacgain-* aacgain
-    mv faad2-* faad2
-    mv mp4v2-* mp4v2
-  '';
-
-  patchPhase = ''
-    cd $sourceRoot
-    patch -p2 -N < aacgain/linux/mp3gain.patch
-  '';
+  name = "aacgain-1.9.0";
+  src = fetchFromGitHub {
+    owner = "mulx";
+    repo = "aacgain";
+    rev = "7c29dccd878ade1301710959aeebe87a8f0828f5";
+    sha256 = "07hl432vsscqg01b6wr99qmsj4gbx0i02x4k565432y6zpfmaxm0";
+  };
 
   configurePhase = ''
-    cd $sourceRoot/mp4v2
+    cd mp4v2
     ./configure
 
-    cd $sourceRoot/faad2
+    cd ../faad2
+    ./configure
+
+    cd ..
     ./configure
   '';
 
   buildPhase = ''
-    cd $sourceRoot/mp4v2
+    cd mp4v2
     make libmp4v2.la
 
-    cd $sourceRoot/faad2/libfaad
-    make
+    cd ../faad2
+    make LDFLAGS=-static
 
-    cd $sourceRoot/aacgain/linux
-    sh prepare.sh
-    mkdir build
-    cd build
-    ../../../configure
-    make
+    cd ..
+    make   
   '';
 
   installPhase = ''
@@ -65,7 +38,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "ReplayGain for AAC files";
-    homepage = https://github.com/mecke/aacgain.git;
+    homepage = https://github.com/mulx/aacgain;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.robbinch ];

From da7748a6fc47e9efec56470ec01f9a137c14816f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 12 Jun 2015 13:02:06 +0200
Subject: [PATCH 1080/2322] nixos: set high fs.inotify.max_user_watches when
 xserver is enabled

---
 nixos/modules/services/x11/xserver.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 5198864ef6e..9fddc6a7210 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -469,6 +469,11 @@ in
     environment.pathsToLink =
       [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
 
+    # The default max inotify watches is 8192.
+    # Nowadays most apps require a good number of inotify watches,
+    # the value below is used by default on several other distros.
+    boot.kernel.sysctl."fs.inotify.max_user_watches" = mkDefault 524288;
+
     systemd.defaultUnit = mkIf cfg.autorun "graphical.target";
 
     systemd.services.display-manager =

From 4e9327e7acbab44f7b562cfe37daf894106c7286 Mon Sep 17 00:00:00 2001
From: Fabian Schmitthenner <development@schmitthenner.eu>
Date: Wed, 27 May 2015 17:57:26 +0000
Subject: [PATCH 1081/2322] add qt decrypt ssl traffic option

this introduces an argument to qt5 that if enabled allows
e.g. wireshark to show decrypted ssl traffic from a qt
application
---
 pkgs/development/libraries/qt-5/5.4/0100-ssl.patch | 13 +++++++++++++
 pkgs/development/libraries/qt-5/5.4/default.nix    |  3 ++-
 pkgs/development/libraries/qt-5/5.4/qtbase.nix     |  4 +++-
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.4/0100-ssl.patch

diff --git a/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch b/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch
new file mode 100644
index 00000000000..4607274de74
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.4/0100-ssl.patch
@@ -0,0 +1,13 @@
+diff --git a/qtbase/src/network/ssl/qsslsocket_openssl.cpp b/qtbase/src/network/ssl/qsslsocket_openssl.cpp
+index 8833e3f..c56d381 100644
+--- a/qtbase/src/network/ssl/qsslsocket_openssl.cpp
++++ b/qtbase/src/network/ssl/qsslsocket_openssl.cpp
+@@ -47,7 +47,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.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
index c7e3a5c6123..139bba2db89 100644
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/default.nix
@@ -20,6 +20,7 @@
 
 # options
 , developerBuild ? false
+, decryptSslTraffic ? false
 }:
 
 with autonix;
@@ -61,7 +62,7 @@ let
         # GNOME dependencies are not used unless gtkStyle == true
         inherit (gnome) libgnomeui GConf gnome_vfs;
         bison = bison2; # error: too few arguments to function 'int yylex(...
-        inherit developerBuild srcs version;
+        inherit developerBuild srcs version decryptSslTraffic;
       };
 
       connectivity = callPackage
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index 9e11dcdde86..7ef39a40860 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -20,6 +20,7 @@
 , buildTests ? false
 , developerBuild ? false
 , gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk
+, decryptSslTraffic ? false
 }:
 
 with stdenv.lib;
@@ -68,7 +69,8 @@ stdenv.mkDerivation {
       (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; })
       (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; })
       ./0013-xdg_config_dirs.patch
-    ];
+    ]
+    ++ (optional decryptSslTraffic ./0100-ssl.patch);
 
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH"

From cbbefbdabb698b69357f4b758cfa525170f36e7a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 12 Jun 2015 13:08:14 +0200
Subject: [PATCH 1082/2322] mcelog -> 120

Fix potential NULL reference while parsing kernel efi files
---
 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 1706b8b87fa..63bab2ddd76 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "119"; in
+let version = "120"; in
 stdenv.mkDerivation {
   name = "mcelog-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "04zm8pa7r6awjgza8m048srvqcyayzdzw93vl8yrjzhh37p5m4gp";
+    sha256 = "1x50g0vrarcv31x4xszcxkpwklkq6mrv2xr1dxbbds26qz8jk11l";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

From 192d20e8203dfac526add4da26c5076c60d82e23 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Jun 2015 13:19:35 +0200
Subject: [PATCH 1083/2322] nix: Update to 1.9

---
 pkgs/tools/package-management/nix/default.nix | 12 +++++-------
 pkgs/tools/package-management/nix/xfs.patch   | 13 -------------
 pkgs/top-level/all-packages.nix               |  7 +++++--
 3 files changed, 10 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/tools/package-management/nix/xfs.patch

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 2d105113133..d64e194e93e 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,22 +1,20 @@
-{ stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
-, pkgconfig, boehmgc, perlPackages
+{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
+, pkgconfig, boehmgc, perlPackages, libsodium
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.8";
+  name = "nix-1.9";
 
   src = fetchurl {
     url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-    sha256 = "a30a5e801bc1cb1019cbc3456d961a307c45c9c588b8692cf1293ea6588ef01c";
+    sha256 = "8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1";
   };
 
-  patches = [ ./xfs.patch ];
-
   nativeBuildInputs = [ perl pkgconfig ];
 
-  buildInputs = [ curl openssl sqlite ];
+  buildInputs = [ curl openssl sqlite ] ++ lib.optional stdenv.isLinux libsodium;
 
   propagatedBuildInputs = [ boehmgc ];
 
diff --git a/pkgs/tools/package-management/nix/xfs.patch b/pkgs/tools/package-management/nix/xfs.patch
deleted file mode 100644
index 62ee9189ac1..00000000000
--- a/pkgs/tools/package-management/nix/xfs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
-index 119e71a..422ec97 100644
---- a/src/libexpr/primops.cc
-+++ b/src/libexpr/primops.cc
-@@ -796,7 +796,7 @@ static void prim_readDir(EvalState & state, const Pos & pos, Value * * args, Val
-     for (auto & ent : entries) {
-         Value * ent_val = state.allocAttr(v, state.symbols.create(ent.name));
-         if (ent.type == DT_UNKNOWN)
--            ent.type = getFileType(path);
-+            ent.type = getFileType(path + "/" + ent.name);
-         mkStringNoCopy(*ent_val,
-             ent.type == DT_REG ? "regular" :
-             ent.type == DT_DIR ? "directory" :
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 093c9d15540..22ff26e098e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14431,10 +14431,13 @@ let
     stateDir = config.nix.stateDir or "/nix/var";
   };
 
-  nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
+  nixUnstable = nixStable;
+  /*
+  nixUnstable = lowPrio (callPackage ../tools/package-management/nix/unstable.nix {
     storeDir = config.nix.storeDir or "/nix/store";
     stateDir = config.nix.stateDir or "/nix/var";
-  };
+  });
+  */
 
   nixops = callPackage ../tools/package-management/nixops { };
 

From 07aa0f7f2165ac0dcab2441cc54940bc4a28e6ed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Jun 2015 13:20:18 +0200
Subject: [PATCH 1084/2322] Revert "Use nixUnstable by default"

This reverts commit 64a41b7a90bd99f532847ef1b6ad3c3c6a2a7120.
---
 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 42a9d46f1d6..6d25fef4576 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -63,7 +63,7 @@ in
 
       package = mkOption {
         type = types.package;
-        default = pkgs.nixUnstable;
+        default = pkgs.nix;
         description = ''
           This option specifies the Nix package instance to use throughout the system.
         '';

From e982ac10177a67ea460928096edb43f65801ec70 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Jun 2015 13:47:30 +0200
Subject: [PATCH 1085/2322] php: Update to 5.4.42, 5.6.10

CVE-2015-3414, CVE-2015-3415, CVE-2015-3416
---
 pkgs/development/interpreters/php/5.4.nix | 4 ++--
 pkgs/development/interpreters/php/5.6.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index c10425631b3..c1ba35a9134 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -1,6 +1,6 @@
 { callPackage, apacheHttpd }:
 callPackage ./generic.nix {
-  phpVersion = "5.4.41";
-  sha = "0wl27f5z6vymajm2bzfp440zsp1jdxqn71avryiq1zw029db9i2v";
+  phpVersion = "5.4.42";
+  sha = "1yg03b6a88i7hg593m9zmmcm4kr59wdrhz9xk1frx9ps9gkb51b2";
   apacheHttpd = apacheHttpd;
 }
diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix
index 425f51ce5c6..e05f1ae10bd 100644
--- a/pkgs/development/interpreters/php/5.6.nix
+++ b/pkgs/development/interpreters/php/5.6.nix
@@ -1,6 +1,6 @@
 { callPackage, apacheHttpd  }:
 callPackage ./generic.nix {
-  phpVersion = "5.6.9";
-  sha = "1fdwk8g509gxd5ad3y1s3j49hfkjdg8mgmzn9ki3pflbgdxvilqr";
+  phpVersion = "5.6.10";
+  sha = "0iccgibmbc659z6dh6c58l1b7vnqly7al37fbs0l3si4qy0rqmqa";
   apacheHttpd = apacheHttpd;
 }

From cb6daa036bf4de47fc73ad4a9ce218d845902a5d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Jun 2015 13:50:37 +0200
Subject: [PATCH 1086/2322] sqlite: Update to 3.8.10.2

---
 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 ee8aec79af1..963566e27fa 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.8.10.1";
+  name = "sqlite-3.8.10.2";
 
   src = fetchurl {
-    url = "http://sqlite.org/2015/sqlite-autoconf-3081001.tar.gz";
-    sha1 = "86bfed5752783fb24c051f3efac5972ce11023f0";
+    url = "http://sqlite.org/2015/sqlite-autoconf-3081002.tar.gz";
+    sha1 = "c2f2c17d3dc4c4e179d35cc04e4420636d48a152";
   };
 
   buildInputs = lib.optionals interactive [ readline ncurses ];

From 74e4f6befab4514c6ee5bef7a4f3cfdae302ce68 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 12 Jun 2015 07:26:47 -0500
Subject: [PATCH 1087/2322] ipopt: build with openblas

---
 .../development/libraries/science/math/ipopt/default.nix | 9 +++++++--
 pkgs/top-level/all-packages.nix                          | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix
index 4dd1ca46e95..89d2a242f96 100644
--- a/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, blas, liblapack, gfortran }:
+{ stdenv, fetchurl, unzip, openblas, gfortran }:
 
 stdenv.mkDerivation rec {
   version = "3.12.3";
@@ -13,9 +13,14 @@ stdenv.mkDerivation rec {
      export CXXDEFS="-DHAVE_RAND -DHAVE_CSTRING -DHAVE_CSTDIO"
   '';
 
+  configureFlags = [
+    "--with-blas-lib=-lopenblas"
+    "--with-lapack-lib=-lopenblas"
+  ];
+
   nativeBuildInputs = [ unzip ];
 
-  buildInputs = [ gfortran blas liblapack ];
+  buildInputs = [ gfortran openblas ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69c46414c9e..937c404d74f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13883,7 +13883,7 @@ let
   suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse {};
   suitesparse = suitesparse_4_4;
 
-  ipopt = callPackage ../development/libraries/science/math/ipopt { };
+  ipopt = callPackage ../development/libraries/science/math/ipopt { openblas = openblasCompat; };
 
   ### SCIENCE/MOLECULAR-DYNAMICS
 

From 4fb98dd6a760315f5219e15d599200271d890ef3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 12 Jun 2015 07:56:04 -0500
Subject: [PATCH 1088/2322] jags: build with openblas

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

diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix
index 785c2460bb4..9d70d268691 100644
--- a/pkgs/applications/science/math/jags/default.nix
+++ b/pkgs/applications/science/math/jags/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gfortran, liblapack, blas}:
+{stdenv, fetchurl, gfortran, openblas}:
 
 stdenv.mkDerivation rec {
   name = "JAGS-3.4.0";
@@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz";
     sha256 = "0ayqsz9kkmbss7mxlwr34ch2z1vsb65lryjzqpprab1ccyiaksib";
   };
-  buildInputs = [gfortran liblapack blas];
+  buildInputs = [gfortran openblas];
+  configureFlags = [ "--with-blas=-lopenblas" "--with-lapack=-lopenblas" ];
 
   meta = {
     description = "Just Another Gibbs Sampler";

From c02dd4a7260f36901088830ae23d9723968ed066 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 12 Jun 2015 08:04:02 -0500
Subject: [PATCH 1089/2322] Update release notes about OpenBLAS

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

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index cf67014a69d..fcbf6ed0add 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -153,6 +153,19 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.cabal-install
   </para>
 </listitem>
 
+<listitem>
+  <para>
+    The OpenBLAS library has been updated to version
+    <literal>0.2.14</literal>. Support for the
+    <literal>x86_64-darwin</literal> platform was added. Dynamic
+    architecture detection was enabled; OpenBLAS now selects
+    microarchitecture-optimized routines at runtime, so optimal
+    performance is achieved without the need to rebuild OpenBLAS
+    locally. OpenBLAS has replaced ATLAS in most packages which use an
+    optimized BLAS or LAPACK implementation.
+ </para>
+</listitem>
+
 </itemizedlist>
 </para>
 

From dfe20de78257fb24fdea011eb3a9b71eb000241d Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 23 Feb 2015 18:02:12 +0100
Subject: [PATCH 1090/2322] nixos: permit dnscrypt-proxy service to read basic
 user/group info

If nscd is not running, dnscrypt-proxy crashes without read access
to /etc/{password,group,nsswitch.conf}.
---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 5cc33f35adb..78e240e49ba 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -104,6 +104,10 @@ in
           /dev/null rw,
           /dev/urandom r,
 
+          /etc/passwd r,
+          /etc/group r,
+          ${config.environment.etc."nsswitch.conf".source} r,
+
           ${pkgs.glibc}/lib/*.so mr,
           ${pkgs.tzdata}/share/zoneinfo/** r,
 

From 114cb31b659271ad38e4717291622e88f0126ddb Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 7 Mar 2015 19:09:52 +0100
Subject: [PATCH 1091/2322] dnscrypt-proxy: enable systemd support on linux

This permits using socket activation in the NixOS service
module.
---
 pkgs/tools/networking/dnscrypt-proxy/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index 11dadf9dcd8..9d86f648470 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libsodium }:
+{ stdenv, fetchurl, libsodium, pkgconfig, systemd }:
 
 stdenv.mkDerivation rec {
   name = "dnscrypt-proxy-1.4.3";
@@ -8,7 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "0cij80ryxnikpmm6s79c2fqg6bdiz1wdy50xrnd7w954vw9mhr0b";
   };
 
-  buildInputs = [ libsodium ];
+  configureFlags = ''
+    ${stdenv.lib.optionalString stdenv.isLinux "--with-systemd"}
+  '';
+
+  buildInputs = [ pkgconfig libsodium ] ++ stdenv.lib.optional stdenv.isLinux systemd;
 
   meta = {
     description = "A tool for securing communications between a client and a DNS resolver";

From 823bb5dd4d9fabf39a81c9374076b8ecdc209a61 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 7 Mar 2015 19:13:12 +0100
Subject: [PATCH 1092/2322] nixos: implement socket-activation for
 dnscrypt-proxy

The socket definition is derived from upstream with the
exception that it does not depend on network.target, as
this creates a cycle between basic.target and sockets.target.

The apparmor profile has been updated to account for additional
runtime dependencies introduced by enabling systemd support.
---
 .../services/networking/dnscrypt-proxy.nix    | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 78e240e49ba..2e3add3db85 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -7,8 +7,7 @@ let
   cfg = config.services.dnscrypt-proxy;
   uid = config.ids.uids.dnscrypt-proxy;
   daemonArgs =
-    [ "--daemonize"
-      "--user=dnscrypt-proxy"
+    [ "--user=dnscrypt-proxy"
       "--local-address=${cfg.localAddress}:${toString cfg.port}"
       (optionalString cfg.tcpOnly "--tcp-only")
       "--resolvers-list=${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv"
@@ -114,6 +113,10 @@ in
           ${dnscrypt-proxy}/share/dnscrypt-proxy/** r,
           ${pkgs.gcc.cc}/lib/libssp.so.* mr,
           ${pkgs.libsodium}/lib/libsodium.so.* mr,
+          ${pkgs.systemd}/lib/libsystemd.so.* mr,
+          ${pkgs.xz}/lib/liblzma.so.* mr,
+          ${pkgs.libgcrypt}/lib/libgcrypt.so.* mr,
+          ${pkgs.libgpgerror}/lib/libgpg-error.so.* mr,
         }
       '')
     ];
@@ -128,13 +131,27 @@ in
 
     ### Service definition
 
+    ## derived from upstream dnscrypt-proxy.socket
+    systemd.sockets.dnscrypt-proxy = {
+      description = "dnscrypt-proxy listening socket";
+
+      socketConfig = {
+        ListenStream = "${cfg.localAddress}:${toString cfg.port}";
+        ListenDatagram = "${cfg.localAddress}:${toString cfg.port}";
+      };
+
+      wantedBy = [ "sockets.target" ];
+    };
+
+    # derived from upstream dnscrypt-proxy.service
     systemd.services.dnscrypt-proxy = {
       description = "dnscrypt-proxy daemon";
       after = [ "network.target" ] ++ optional apparmorEnabled "apparmor.service";
-      requires = mkIf apparmorEnabled [ "apparmor.service" ];
-      wantedBy = [ "multi-user.target" ];
+      requires = [ "dnscrypt-proxy.socket "] ++ optional apparmorEnabled "apparmor.service";
       serviceConfig = {
-        Type = "forking";
+        Type = "simple";
+        ## note: NonBlocking is required for socket activation to work
+        NonBlocking = "true";
         ExecStart = "${dnscrypt-proxy}/bin/dnscrypt-proxy ${toString daemonArgs}";
       };
     };

From a88a6bc676cc82c2a1050addd0d36b0064e70242 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 15 Mar 2015 22:19:48 +0100
Subject: [PATCH 1093/2322] nixos: additional hardening for dnscrypt-proxy

- Run as unprivileged user/group via systemd, obviating the need to
  specify capabilities, etc.
- Run with private tmp and minimal device name space
---
 nixos/modules/misc/ids.nix                    |  2 +-
 .../services/networking/dnscrypt-proxy.nix    | 48 ++++++++-----------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index d283a633734..b66e95fd0d3 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -376,7 +376,7 @@
       seeks = 148;
       prosody = 149;
       i2pd = 150;
-      #dnscrypt-proxy = 151; # unused
+      dnscrypt-proxy = 151;
       systemd-network = 152;
       systemd-resolve = 153;
       systemd-timesync = 154;
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 2e3add3db85..60016994016 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -5,12 +5,11 @@ let
   apparmorEnabled = config.security.apparmor.enable;
   dnscrypt-proxy = pkgs.dnscrypt-proxy;
   cfg = config.services.dnscrypt-proxy;
-  uid = config.ids.uids.dnscrypt-proxy;
+  resolverListFile = "${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv";
   daemonArgs =
-    [ "--user=dnscrypt-proxy"
-      "--local-address=${cfg.localAddress}:${toString cfg.port}"
+    [ "--local-address=${cfg.localAddress}:${toString cfg.port}"
       (optionalString cfg.tcpOnly "--tcp-only")
-      "--resolvers-list=${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv"
+      "--resolvers-list=${resolverListFile}"
       "--resolver-name=${cfg.resolverName}"
     ];
 in
@@ -56,10 +55,10 @@ in
         default = "opendns";
         type = types.string;
         description = ''
-          The name of the upstream DNSCrypt resolver to use.
-          See <literal>${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv</literal>
-          for alternative resolvers (e.g., if you are concerned about logging
-          and/or server location).
+          The name of the upstream DNSCrypt resolver to use. See
+          <literal>${resolverListFile}</literal> for alternative resolvers
+          (e.g., if you are concerned about logging and/or server
+          location).
         '';
       };
 
@@ -88,17 +87,6 @@ in
       (pkgs.writeText "apparmor-dnscrypt-proxy" ''
 
         ${dnscrypt-proxy}/bin/dnscrypt-proxy {
-          network inet stream,
-          network inet6 stream,
-          network inet dgram,
-          network inet6 dgram,
-
-          capability ipc_lock,
-          capability net_bind_service,
-          capability net_admin,
-          capability sys_chroot,
-          capability setgid,
-          capability setuid,
 
           /dev/null rw,
           /dev/urandom r,
@@ -110,26 +98,28 @@ in
           ${pkgs.glibc}/lib/*.so mr,
           ${pkgs.tzdata}/share/zoneinfo/** r,
 
-          ${dnscrypt-proxy}/share/dnscrypt-proxy/** r,
+          network inet stream,
+          network inet6 stream,
+          network inet dgram,
+          network inet6 dgram,
+
           ${pkgs.gcc.cc}/lib/libssp.so.* mr,
           ${pkgs.libsodium}/lib/libsodium.so.* mr,
           ${pkgs.systemd}/lib/libsystemd.so.* mr,
           ${pkgs.xz}/lib/liblzma.so.* mr,
           ${pkgs.libgcrypt}/lib/libgcrypt.so.* mr,
           ${pkgs.libgpgerror}/lib/libgpg-error.so.* mr,
+
+          ${resolverListFile} r,
         }
       '')
     ];
 
-    ### User
-
-    users.extraUsers = singleton {
-      inherit uid;
-      name = "dnscrypt-proxy";
+    users.extraUsers.dnscrypt-proxy = {
+      uid = config.ids.uids.dnscrypt-proxy;
       description = "dnscrypt-proxy daemon user";
     };
-
-    ### Service definition
+    users.extraGroups.dnscrypt-proxy.gid = config.ids.gids.dnscrypt-proxy;
 
     ## derived from upstream dnscrypt-proxy.socket
     systemd.sockets.dnscrypt-proxy = {
@@ -153,6 +143,10 @@ in
         ## note: NonBlocking is required for socket activation to work
         NonBlocking = "true";
         ExecStart = "${dnscrypt-proxy}/bin/dnscrypt-proxy ${toString daemonArgs}";
+        User = "dnscrypt-proxy";
+        Group = "dnscrypt-proxy";
+        PrivateTmp = true;
+        PrivateDevices = true;
       };
     };
 

From 2e8bc2bd5c264cf30bfb9b357e2a2b64416002e1 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 15 Mar 2015 22:22:45 +0100
Subject: [PATCH 1094/2322] nixos: cosmetic improvements to dnscrypt-proxy
 service module

Remove superflous whitespace & comments
---
 .../services/networking/dnscrypt-proxy.nix    | 85 +++++++------------
 1 file changed, 29 insertions(+), 56 deletions(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 60016994016..4505ce31d0f 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -15,26 +15,19 @@ let
 in
 
 {
-  ##### interface
-
   options = {
-
     services.dnscrypt-proxy = {
-
       enable = mkOption {
         default = false;
         type = types.bool;
         description = ''
-          Enable dnscrypt-proxy.
-          The proxy relays regular DNS queries to a DNSCrypt enabled
-          upstream resolver.
-          The traffic between the client and the upstream resolver is
-          encrypted and authenticated, which may mitigate the risk of MITM
-          attacks and third-party snooping (assuming the upstream is
-          trustworthy).
+          Enable dnscrypt-proxy. The proxy relays regular DNS queries to a
+          DNSCrypt enabled upstream resolver. The traffic between the
+          client and the upstream resolver is encrypted and authenticated,
+          which may mitigate the risk of MITM attacks and third-party
+          snooping (assuming the upstream is trustworthy).
         '';
       };
-
       localAddress = mkOption {
         default = "127.0.0.1";
         type = types.string;
@@ -42,7 +35,6 @@ in
           Listen for DNS queries on this address.
         '';
       };
-
       port = mkOption {
         default = 53;
         type = types.int;
@@ -50,7 +42,6 @@ in
           Listen on this port.
         '';
       };
-
       resolverName = mkOption {
         default = "opendns";
         type = types.string;
@@ -61,59 +52,47 @@ in
           location).
         '';
       };
-
       tcpOnly = mkOption {
         default = false;
         type = types.bool;
         description = ''
           Force sending encrypted DNS queries to the upstream resolver
-          over TCP instead of UDP (on port 443).
-          Enabling this option may help circumvent filtering, but should
-          not be used otherwise.
+          over TCP instead of UDP (on port 443). Enabling this option may
+          help circumvent filtering, but should not be used otherwise.
         '';
       };
-
     };
-
   };
 
-  ##### implementation
-
   config = mkIf cfg.enable {
 
-    ### AppArmor profile
+    security.apparmor.profiles = mkIf apparmorEnabled (singleton (pkgs.writeText "apparmor-dnscrypt-proxy" ''
+      ${dnscrypt-proxy}/bin/dnscrypt-proxy {
+        /dev/null rw,
+        /dev/urandom r,
 
-    security.apparmor.profiles = mkIf apparmorEnabled [
-      (pkgs.writeText "apparmor-dnscrypt-proxy" ''
+        /etc/passwd r,
+        /etc/group r,
+        ${config.environment.etc."nsswitch.conf".source} r,
 
-        ${dnscrypt-proxy}/bin/dnscrypt-proxy {
+        ${pkgs.glibc}/lib/*.so mr,
+        ${pkgs.tzdata}/share/zoneinfo/** r,
 
-          /dev/null rw,
-          /dev/urandom r,
+        network inet stream,
+        network inet6 stream,
+        network inet dgram,
+        network inet6 dgram,
 
-          /etc/passwd r,
-          /etc/group r,
-          ${config.environment.etc."nsswitch.conf".source} r,
+        ${pkgs.gcc.cc}/lib/libssp.so.* mr,
+        ${pkgs.libsodium}/lib/libsodium.so.* mr,
+        ${pkgs.systemd}/lib/libsystemd.so.* mr,
+        ${pkgs.xz}/lib/liblzma.so.* mr,
+        ${pkgs.libgcrypt}/lib/libgcrypt.so.* mr,
+        ${pkgs.libgpgerror}/lib/libgpg-error.so.* mr,
 
-          ${pkgs.glibc}/lib/*.so mr,
-          ${pkgs.tzdata}/share/zoneinfo/** r,
-
-          network inet stream,
-          network inet6 stream,
-          network inet dgram,
-          network inet6 dgram,
-
-          ${pkgs.gcc.cc}/lib/libssp.so.* mr,
-          ${pkgs.libsodium}/lib/libsodium.so.* mr,
-          ${pkgs.systemd}/lib/libsystemd.so.* mr,
-          ${pkgs.xz}/lib/liblzma.so.* mr,
-          ${pkgs.libgcrypt}/lib/libgcrypt.so.* mr,
-          ${pkgs.libgpgerror}/lib/libgpg-error.so.* mr,
-
-          ${resolverListFile} r,
-        }
-      '')
-    ];
+        ${resolverListFile} r,
+      }
+    ''));
 
     users.extraUsers.dnscrypt-proxy = {
       uid = config.ids.uids.dnscrypt-proxy;
@@ -121,26 +100,21 @@ in
     };
     users.extraGroups.dnscrypt-proxy.gid = config.ids.gids.dnscrypt-proxy;
 
-    ## derived from upstream dnscrypt-proxy.socket
     systemd.sockets.dnscrypt-proxy = {
       description = "dnscrypt-proxy listening socket";
-
       socketConfig = {
         ListenStream = "${cfg.localAddress}:${toString cfg.port}";
         ListenDatagram = "${cfg.localAddress}:${toString cfg.port}";
       };
-
       wantedBy = [ "sockets.target" ];
     };
 
-    # derived from upstream dnscrypt-proxy.service
     systemd.services.dnscrypt-proxy = {
       description = "dnscrypt-proxy daemon";
       after = [ "network.target" ] ++ optional apparmorEnabled "apparmor.service";
       requires = [ "dnscrypt-proxy.socket "] ++ optional apparmorEnabled "apparmor.service";
       serviceConfig = {
         Type = "simple";
-        ## note: NonBlocking is required for socket activation to work
         NonBlocking = "true";
         ExecStart = "${dnscrypt-proxy}/bin/dnscrypt-proxy ${toString daemonArgs}";
         User = "dnscrypt-proxy";
@@ -149,6 +123,5 @@ in
         PrivateDevices = true;
       };
     };
-
   };
 }

From 8131065b63601b40e21ad9e9f841b5e5fa2e0fd5 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 23 Mar 2015 20:44:55 +0100
Subject: [PATCH 1095/2322] dnscrypt-proxy service: use mkEnableOption

---
 .../services/networking/dnscrypt-proxy.nix     | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 4505ce31d0f..b4801dc5551 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -17,17 +17,13 @@ in
 {
   options = {
     services.dnscrypt-proxy = {
-      enable = mkOption {
-        default = false;
-        type = types.bool;
-        description = ''
-          Enable dnscrypt-proxy. The proxy relays regular DNS queries to a
-          DNSCrypt enabled upstream resolver. The traffic between the
-          client and the upstream resolver is encrypted and authenticated,
-          which may mitigate the risk of MITM attacks and third-party
-          snooping (assuming the upstream is trustworthy).
-        '';
-      };
+      enable = mkEnableOption ''
+        Enable dnscrypt-proxy. The proxy relays regular DNS queries to a
+        DNSCrypt enabled upstream resolver. The traffic between the
+        client and the upstream resolver is encrypted and authenticated,
+        which may mitigate the risk of MITM attacks and third-party
+        snooping (assuming the upstream is trustworthy).
+      '';
       localAddress = mkOption {
         default = "127.0.0.1";
         type = types.string;

From ffc6275e552b0fbc955ce96865de2fbb5a4c89d0 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 14 Apr 2015 23:11:28 +0200
Subject: [PATCH 1096/2322] dnscrypt-proxy service: support custom providers

The primary use-case is private DNSCrypt providers.

Also rename the `port` option to differentiate it from the
`customResolver.port` option.
---
 nixos/modules/rename.nix                      |  3 +
 .../services/networking/dnscrypt-proxy.nix    | 61 ++++++++++++++++---
 2 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index fc83e7ed590..b3cd0c7f40b 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -141,6 +141,9 @@ in zipModules ([]
 ++ obsolete [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ]
 ++ obsolete [ "services" "xserver" "desktopManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ]
 
+# DNSCrypt-proxy
+++ obsolete [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ]
+
 # Options that are obsolete and have no replacement.
 ++ obsolete' [ "boot" "loader" "grub" "bootDevice" ]
 ++ obsolete' [ "boot" "initrd" "luks" "enable" ]
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index b4801dc5551..c724ee979c2 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -6,12 +6,22 @@ let
   dnscrypt-proxy = pkgs.dnscrypt-proxy;
   cfg = config.services.dnscrypt-proxy;
   resolverListFile = "${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv";
+  localAddress = "${cfg.localAddress}:${toString cfg.localPort}";
   daemonArgs =
-    [ "--local-address=${cfg.localAddress}:${toString cfg.port}"
+    [ "--local-address=${localAddress}"
       (optionalString cfg.tcpOnly "--tcp-only")
-      "--resolvers-list=${resolverListFile}"
-      "--resolver-name=${cfg.resolverName}"
-    ];
+    ]
+    ++ resolverArgs;
+  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=${resolverListFile}"
+        "--resolver-name=${toString cfg.resolverName}"
+      ];
 in
 
 {
@@ -31,7 +41,7 @@ in
           Listen for DNS queries on this address.
         '';
       };
-      port = mkOption {
+      localPort = mkOption {
         default = 53;
         type = types.int;
         description = ''
@@ -40,7 +50,7 @@ in
       };
       resolverName = mkOption {
         default = "opendns";
-        type = types.string;
+        type = types.nullOr types.string;
         description = ''
           The name of the upstream DNSCrypt resolver to use. See
           <literal>${resolverListFile}</literal> for alternative resolvers
@@ -48,6 +58,35 @@ in
           location).
         '';
       };
+      customResolver = mkOption {
+        default = null;
+        description = ''
+          Use a resolver not listed in the upstream list (e.g.,
+          a private DNSCrypt provider). For advanced users only.
+          If specified, this option takes precedence.
+        '';
+        type = types.nullOr (types.submodule ({ ... }: { options = {
+          address = mkOption {
+            type = types.str;
+            description = "Resolver IP address";
+            example = "208.67.220.220";
+          };
+          port = mkOption {
+            type = types.int;
+            description = "Resolver port";
+            default = 443;
+          };
+          name = mkOption {
+            type = types.str;
+            description = "Provider fully qualified domain name";
+            example = "2.dnscrypt-cert.opendns.com";
+         };
+         key = mkOption {
+           type = types.str;
+           description = "Provider public key";
+           example = "B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79";
+         }; }; }));
+      };
       tcpOnly = mkOption {
         default = false;
         type = types.bool;
@@ -62,6 +101,12 @@ in
 
   config = mkIf cfg.enable {
 
+    assertions = [
+      { assertion = (cfg.customResolver != null) || (cfg.resolverName != null);
+        message   = "please configure upstream DNSCrypt resolver";
+      }
+    ];
+
     security.apparmor.profiles = mkIf apparmorEnabled (singleton (pkgs.writeText "apparmor-dnscrypt-proxy" ''
       ${dnscrypt-proxy}/bin/dnscrypt-proxy {
         /dev/null rw,
@@ -99,8 +144,8 @@ in
     systemd.sockets.dnscrypt-proxy = {
       description = "dnscrypt-proxy listening socket";
       socketConfig = {
-        ListenStream = "${cfg.localAddress}:${toString cfg.port}";
-        ListenDatagram = "${cfg.localAddress}:${toString cfg.port}";
+        ListenStream = "${localAddress}";
+        ListenDatagram = "${localAddress}";
       };
       wantedBy = [ "sockets.target" ];
     };

From 32ed6018831954a5c2345ddff7de640521c620a5 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Fri, 29 May 2015 12:46:49 +0200
Subject: [PATCH 1097/2322] init ladspaPlugins-git at git-2015-03-04

---
 .../applications/audio/ladspa-plugins/git.nix | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/audio/ladspa-plugins/git.nix

diff --git a/pkgs/applications/audio/ladspa-plugins/git.nix b/pkgs/applications/audio/ladspa-plugins/git.nix
new file mode 100644
index 00000000000..e9ab932a88e
--- /dev/null
+++ b/pkgs/applications/audio/ladspa-plugins/git.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, automake, autoreconfHook, fftw, gettext, ladspaH, libxml2, pkgconfig, perl, perlPackages }:
+
+stdenv.mkDerivation {
+  name = "swh-plugins-git-2015-03-04";
+
+  src = fetchgit {
+    url = https://github.com/swh/ladspa.git;
+    rev = "4b8437e8037cace3d5bf8ce6d1d1da0182aba686";
+    sha256 = "7d9aa13a064903b330bd52e35c1f810f1c8a253ea5eb4e5a3a69a051af03150e";
+  };
+
+  buildInputs = [ automake autoreconfHook fftw gettext ladspaH libxml2 pkgconfig perl perlPackages.XMLParser ];
+
+  patchPhase = ''
+    patchShebangs .
+    patchShebangs ./metadata/
+    cp ${automake}/share/automake-*/mkinstalldirs .
+  '';
+
+  configurePhase = ''
+    autoreconf -i
+    ./configure --prefix=$out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://plugin.org.uk/;
+    description = "LADSPA format audio plugins";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b55478313a5..a1bec97f066 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11622,6 +11622,10 @@ let
     fftw = fftwSinglePrec;
   };
 
+  ladspaPlugins-git = callPackage ../applications/audio/ladspa-plugins/git.nix {
+    fftw = fftwSinglePrec;
+  };
+
   ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
 
   caps = callPackage ../applications/audio/caps { };

From 90f0bb83c3e77cc9548e68845df251f2c7015290 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 12 Jun 2015 17:06:32 +0200
Subject: [PATCH 1098/2322] dotnet: Add FSharpDataSQLProvider, FsPickler and
 Suave

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 852856d4c69..3aca091f0df 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -14,6 +14,8 @@
 
 let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
+  # BINARY PACKAGES
+
   Autofac = fetchNuGet {
     baseName = "Autofac";
     version = "3.5.2";
@@ -44,6 +46,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/net40/*" ];
   };
 
+  FSharpDataSQLProvider = fetchNuGet {
+    baseName = "SQLProvider";
+    version = "0.0.9-alpha";
+    sha256 = "1wmgr5ca9hh6a7f0s8yc87n6arn7bq6nwc8n4crbbdil4r0bw46w";
+    outputFiles = [ "lib/net40/*" ];
+  };
+
   FsCheck = fetchNuGet {
     baseName = "FsCheck";
     version = "1.0.4";
@@ -58,6 +67,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/net45/*" ];
   };
 
+  FsPickler = fetchNuGet {
+    baseName = "FsPickler";
+    version = "1.2.9";
+    sha256 = "12fgcj7pvffsj1s1kaz15j22i1n98dy5mf4z84555xdf7mw7dpm4";
+    outputFiles = [ "lib/net45/*" ];
+  };
+
   FsUnit = fetchNuGet {
     baseName = "FsUnit";
     version = "1.3.0.1";
@@ -87,6 +103,15 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/portable-net45+win8+wp8+wpa81/*" ];
   };
 
+  Suave = fetchNuGet {
+    baseName = "Suave";
+    version = "0.29.0";
+    sha256 = "0rgqy0afwm50gq5ca94w16s565yx5wf961683ghfld6ir0k3dhln";
+    outputFiles = [ "lib/net40/*" ];
+  };
+
+  # SOURCE PACKAGES
+
   ExtCore = buildDotnetPackage rec {
     baseName = "ExtCore";
     version = "0.8.46";
@@ -492,4 +517,5 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
       platforms = with stdenv.lib.platforms; linux;
     };
   };
+
 }; in self

From 5c8a993a422bd649a1493917a062ccb077ea583f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 12 Jun 2015 17:13:21 +0200
Subject: [PATCH 1099/2322] fetchnuget: run fixupPhase to honor
 propagatedBuildInputs

---
 pkgs/build-support/fetchnuget/default.nix | 2 +-
 pkgs/top-level/dotnet-packages.nix        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix
index 803db27c9d5..95bb7b7cd8d 100644
--- a/pkgs/build-support/fetchnuget/default.nix
+++ b/pkgs/build-support/fetchnuget/default.nix
@@ -18,7 +18,7 @@ attrs @
 
     buildInputs = [ unzip ];
 
-    phases = [ "unpackPhase" "installPhase" ];
+    dontBuild = true;
 
     preInstall = ''
       function traverseRename () {
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 3aca091f0df..e08af379da8 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -106,6 +106,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
   Suave = fetchNuGet {
     baseName = "Suave";
     version = "0.29.0";
+    propagatedBuildInputs = [ FsPickler ];
     sha256 = "0rgqy0afwm50gq5ca94w16s565yx5wf961683ghfld6ir0k3dhln";
     outputFiles = [ "lib/net40/*" ];
   };

From fd187980c71dc44a134f4ebcbb0f9f9e93c47870 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 12 Jun 2015 16:18:42 +0000
Subject: [PATCH 1100/2322] Put dysnomia in system environment if Disnix is
 enabled

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

diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index 48bb9e4293e..c439efe9f8e 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -67,7 +67,7 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;
+    environment.systemPackages = [ pkgs.disnix pkgs.dysnomia ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;
 
     services.dbus.enable = true;
     services.dbus.packages = [ pkgs.disnix ];

From 093b2de396c7f6a6ea1fab1dc5f3b527bf672bc9 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 12 Jun 2015 16:19:26 +0000
Subject: [PATCH 1101/2322] dysnomia: fix compatibility with mariadb derivation

---
 pkgs/tools/package-management/disnix/dysnomia/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index 021225c1b4d..0507ff45dc7 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
   
   buildInputs = [ getopt ]
     ++ stdenv.lib.optional enableEjabberdDump ejabberd
-    ++ stdenv.lib.optional enableMySQLDatabase mysql.lib
+    ++ stdenv.lib.optional enableMySQLDatabase mysql.out
     ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql
     ++ stdenv.lib.optional enableSubversionRepository subversion
     ++ stdenv.lib.optional enableMongoDatabase mongodb;

From d7f36310d03a418ea43278b76de559c6fbfa2a8c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 12 Jun 2015 00:17:53 +0200
Subject: [PATCH 1102/2322] Remove use of builderDefsPackage in font packages.

With this change they now use `stdenv.mkDerivation` instead. Also some
minor cleanups such as URL fixes, adding version numbers, adding
descriptions, etc.
---
 pkgs/data/fonts/andagii/default.nix       | 74 +++++++----------------
 pkgs/data/fonts/anonymous-pro/default.nix | 70 +++++++++------------
 pkgs/data/fonts/cm-unicode/default.nix    | 54 +++++++----------
 pkgs/data/fonts/eb-garamond/default.nix   | 64 +++++++-------------
 pkgs/data/fonts/gentium/default.nix       | 63 +++++++------------
 pkgs/data/fonts/inconsolata/default.nix   | 63 ++++++-------------
 pkgs/data/fonts/oldstandard/default.nix   | 67 +++++++-------------
 pkgs/data/fonts/theano/default.nix        | 67 +++++++-------------
 8 files changed, 181 insertions(+), 341 deletions(-)

diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix
index 8143d284120..562aa8be4ef 100644
--- a/pkgs/data/fonts/andagii/default.nix
+++ b/pkgs/data/fonts/andagii/default.nix
@@ -1,59 +1,31 @@
-x@{builderDefsPackage
-  , unzip
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchzip }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    url="http://www.i18nguy.com/unicode/andagii.zip";
-    name="andagii";
-    version="1.0.2";
-    hash="0cknb8vin15akz4ahpyayrpqyaygp9dgrx6qw7zs7d6iv9v59ds1";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
+stdenv.mkDerivation rec {
+  name = "andagii-${version}";
+  version = "1.0.2";
+
+  src = fetchzip {
+    url = http://www.i18nguy.com/unicode/andagii.zip;
+    sha256 = "0a0c43y1fd5ksj50axhng7p00kgga0i15p136g68p35wj7kh5g2k";
+    stripRoot = false;
     curlOpts = "--user-agent 'Mozilla/5.0'";
-    sha256 = sourceInfo.hash;
   };
 
-  name = "${sourceInfo.name}-${sourceInfo.version}";
-  inherit buildInputs;
+  phases = [ "unpackPhase" "installPhase" ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doUnpack" "doInstall"];
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf
+  '';
 
-  doUnpack = a.fullDepEntry ''
-    unzip "${src}"
-  '' ["addInputs"];
-
-  doInstall = a.fullDepEntry (''
-    mkdir -p "$out"/share/fonts/ttf/
-    cp ANDAGII_.TTF "$out"/share/fonts/ttf/andagii.ttf
-  '') ["defEnsureDir" "minInit"];
-      
-  meta = {
+  # There are multiple claims that the font is GPL, so I include the
+  # package; but I cannot find the original source, so use it on your
+  # own risk Debian claims it is GPL - good enough for me.
+  meta = with stdenv.lib; {
+    homepage = http://www.i18nguy.com/unicode/unicode-font.HTML;
     description = "Unicode Plane 1 Osmanya script font";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    hydraPlatforms = [];
-    # There are multiple claims that the font is GPL, 
-    # so I include the package; but I cannot find the
-    # original source, so use it on your own risk
-    # Debian claims it is GPL - good enough for me.
+    maintainers = with maintainers; [ raskin rycee ];
+    license = "unknown";
+    platforms = platforms.all;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://www.i18nguy.com/unicode/unicode-font.html";
-    };
-  };
-}) x
-
+}
diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix
index 5b51ee36c5c..da34a2f43aa 100644
--- a/pkgs/data/fonts/anonymous-pro/default.nix
+++ b/pkgs/data/fonts/anonymous-pro/default.nix
@@ -1,50 +1,36 @@
-x@{builderDefsPackage
-  , unzip
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, unzip }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    version = "1.002";
-    name="anonymousPro";
-    url="http://www.ms-studio.com/FontSales/AnonymousPro-${version}.zip";
+stdenv.mkDerivation rec {
+  name = "anonymousPro-${version}";
+  version = "1.002";
+
+  src = fetchurl {
+    url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip";
     sha256 = "1asj6lykvxh46czbal7ymy2k861zlcdqpz8x3s5bbpqwlm3mhrl6";
   };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.sha256;
-  };
 
-  name = "${sourceInfo.name}-${sourceInfo.version}";
-  inherit buildInputs;
+  nativeBuildInputs = [ unzip ];
+  phases = [ "unpackPhase" "installPhase" ];
 
-  phaseNames = ["doUnpack" "installFonts"];
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    mkdir -p $out/share/doc/${name}
+    find . -name "*.ttf" -exec cp -v {} $out/share/fonts/truetype \;
+    find . -name "*.txt" -exec cp -v {} $out/share/doc/${name} \;
+  '';
 
-  doUnpack = a.fullDepEntry (''
-    unzip ${src}
-    cd AnonymousPro*/
-  '') ["addInputs"];
-      
-  meta = {
+  meta = with stdenv.lib; {
+    homepage = http://www.marksimonson.com/fonts/view/anonymous-pro;
     description = "TrueType font set intended for source code";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      all;
-    license = with a.lib.licenses; ofl;
-    hydraPlatforms = [];
-    homepage = "http://www.marksimonson.com/fonts/view/anonymous-pro";
-    downloadPage = "http://www.ms-studio.com/FontSales/anonymouspro.html";
-    inherit (sourceInfo) version;
+    longDescription = ''
+      Anonymous Pro (2009) is a family of four fixed-width fonts
+      designed with coding in mind. Anonymous Pro features an
+      international, Unicode-based character set, with support for
+      most Western and Central European Latin-based languages, plus
+      Greek and Cyrillic. It is designed by Mark Simonson.
+    '';
+    maintainers = with maintainers; [ raskin rycee ];
+    license = licenses.ofl;
+    platforms = platforms.all;
   };
-}) x
-
+}
diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix
index d8f6f7f8351..ed7ce93e189 100644
--- a/pkgs/data/fonts/cm-unicode/default.nix
+++ b/pkgs/data/fonts/cm-unicode/default.nix
@@ -1,40 +1,28 @@
-x@{builderDefsPackage
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    version = "0.7.0";
-    baseName="cm-unicode";
-    name="${baseName}-${version}";
-    url="mirror://sourceforge/${baseName}/${baseName}/${version}/${name}-otf.tar.xz";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
+stdenv.mkDerivation rec {
+  name = "cm-unicode-${version}";
+  version = "0.7.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${name}-otf.tar.xz";
     sha256 = "0a0w9qm9g8qz2xh3lr61bj1ymqslqsvk4w2ybc3v2qa89nz7x2jl";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  phases = [ "unpackPhase" "installPhase" ];
 
-  phaseNames = ["doUnpack" "installFonts"];
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    mkdir -p $out/share/doc/${name}
+    cp -v *.otf $out/share/fonts/opentype/
+    cp -v README FontLog.txt $out/share/doc/${name}
+  '';
 
-  meta = {
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      all;
-    downloadPage = "http://sourceforge.net/projects/cm-unicode/files/cm-unicode/";
-    inherit version;
+  meta = with stdenv.lib; {
+    homepage = http://canopus.iacp.dvo.ru/~panov/cm-unicode/;
+    description = "Computer Modern Unicode fonts";
+    maintainers = with maintainers; [ raskin rycee ];
+    license = licenses.ofl;
+    platforms = platforms.all;
   };
-}) x
-
+}
diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/data/fonts/eb-garamond/default.nix
index 99c9b53217e..0956250e36c 100644
--- a/pkgs/data/fonts/eb-garamond/default.nix
+++ b/pkgs/data/fonts/eb-garamond/default.nix
@@ -1,50 +1,28 @@
-x@{builderDefsPackage
-  , unzip
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchzip }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    version="0.016";
-    name="EBGaramond";
-    url="https://bitbucket.org/georgd/eb-garamond/downloads/${name}-${version}.zip";
-    hash="0y630khn5zh70al3mm84fs767ac94ffyz1w70zzhrhambx07pdx0";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "eb-garamond-${version}";
+  version = "0.016";
+
+  src = fetchzip {
+    url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip";
+    sha256 = "0j40bg1di39q7zis64il67xchldyznrl8wij9il10c4wr8nl4r9z";
   };
 
-  name = "eb-garamond-${sourceInfo.version}";
-  inherit buildInputs;
+  phases = [ "unpackPhase" "installPhase" ];
 
-  phaseNames = ["doUnpack" "installFonts"];
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    mkdir -p $out/share/doc/${name}
+    cp -v "otf/"*.otf $out/share/fonts/opentype/
+    cp -v Changes README.markdown README.xelualatex $out/share/doc/${name}
+  '';
 
-  # This will clean up if/when 8263996 lands.
-  doUnpack = a.fullDepEntry (''
-    unzip ${src}
-    cd ${sourceInfo.name}*
-    mv {ttf,otf}/* .
-  '') ["addInputs"];
-
-  meta = with a.lib; {
-    description = "Digitization of the Garamond shown on the Egenolff-Berner specimen";
-    maintainers = with maintainers; [ relrod ];
-    platforms = platforms.all;
-    license = licenses.ofl;
+  meta = with stdenv.lib; {
     homepage = http://www.georgduffner.at/ebgaramond/;
+    description = "Digitization of the Garamond shown on the Egenolff-Berner specimen";
+    maintainers = with maintainers; [ relrod rycee ];
+    license = licenses.ofl;
+    platforms = platforms.all;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "https://github.com/georgd/EB-Garamond/releases";
-    };
-  };
-}) x
-
+}
diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix
index a4e8099db96..d0af6ce0eb0 100644
--- a/pkgs/data/fonts/gentium/default.nix
+++ b/pkgs/data/fonts/gentium/default.nix
@@ -1,46 +1,29 @@
-x@{builderDefsPackage
-  , unzip
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchzip }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    version="1.504";
-    baseName="GentiumPlus";
-    name="${baseName}-${version}";
-    url="http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${name}.zip&filename=${name}";
-    hash="04kslaqbscpfrc6igkifcv1nkrclrm35hqpapjhw9102wpq12fpr";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-    name = "${sourceInfo.name}.zip";
+stdenv.mkDerivation rec {
+  name = "gentium-${version}";
+  version = "1.504";
+
+  src = fetchzip {
+    name = "${name}.zip";
+    url = "http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=GentiumPlus-${version}.zip&filename=${name}.zip";
+    sha256 = "1xdx80dfal0b8rkrp1janybx2hki7algnvkx4hyghgikpjcjkdh7";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  phases = [ "unpackPhase" "installPhase" ];
 
-  phaseNames = ["addInputs" "doUnpack" "installFonts"];
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    mkdir -p $out/share/doc/${name}
+    cp -v *.ttf $out/share/fonts/truetype/
+    cp -v FONTLOG.txt GENTIUM-FAQ.txt README.txt $out/share/doc/${name}
+  '';
 
-  meta = {
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      all;
+  meta = with stdenv.lib; {
+    homepage = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=Gentium";
+    description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
+    maintainers = with maintainers; [ raskin rycee ];
+    license = licenses.ofl;
+    platforms = platforms.all;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://scripts.sil.org/cms/scripts/page.php?item_id=Gentium_download";
-    };
-  };
-}) x
-
+}
diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix
index 887f37c241b..caa67256a1f 100644
--- a/pkgs/data/fonts/inconsolata/default.nix
+++ b/pkgs/data/fonts/inconsolata/default.nix
@@ -1,51 +1,26 @@
-x@{builderDefsPackage
-  , fontforge
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    name="inconsolata";
-    url="http://www.levien.com/type/myfonts/Inconsolata.sfd";
-    hash="1cd29c8396adb18bfeddb1abf5bdb98b677649bb9b09f126d1335b123a4cfddb";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "inconsolata-${version}";
+  version = "1.010";
+
+  src = fetchurl {
+    url = "http://www.levien.com/type/myfonts/Inconsolata.otf";
+    sha256 = "06js6znbcf7swn8y3b8ki416bz96ay7d3yvddqnvi88lqhbfcq8m";
   };
 
-  inherit (sourceInfo) name;
-  inherit buildInputs;
+  phases = [ "installPhase" ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["copySrc" "generateFontsFromSFD" "installFonts"];
-  
-  copySrc = a.fullDepEntry (''
-    cp ${src} inconsolata.sfd
-  '') ["minInit"];
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    cp -v $src $out/share/fonts/opentype/inconsolata.otf
+  '';
 
-  generateFontsFromSFD = a.generateFontsFromSFD // {deps=["addInputs"];};
-
-  meta = {
+  meta = with stdenv.lib; {
+    homepage = http://www.levien.com/type/myfonts/inconsolata.html;
     description = "A monospace font for both screen and print";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      all;
+    maintainers = with maintainers; [ raskin rycee ];
+    license = licenses.ofl;
+    platforms = platforms.all;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://www.levien.com/type/myfonts/inconsolata.html";
-    };
-  };
-}) x
-
+}
diff --git a/pkgs/data/fonts/oldstandard/default.nix b/pkgs/data/fonts/oldstandard/default.nix
index ad25ac7fd95..125a4b636a9 100644
--- a/pkgs/data/fonts/oldstandard/default.nix
+++ b/pkgs/data/fonts/oldstandard/default.nix
@@ -1,50 +1,29 @@
-x@{builderDefsPackage
-  , unzip
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchzip }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    version="2.2";
-    baseName="oldstandard";
-    name="${baseName}-${version}";
-    url="http://www.thessalonica.org.ru/downloads/${name}.otf.zip";
-    hash="0xhbksrh9mv1cs6dl2mc8l6sypialy9wirkjr54nf7s9bcynv1h6";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "oldstandard-${version}";
+  version = "2.2";
+
+  src = fetchzip {
+    stripRoot = false;
+    url = "https://github.com/akryukov/oldstand/releases/download/v${version}/${name}.otf.zip";
+    sha256 = "1hl78jw5szdjq9dhbcv2ln75wpp2lzcxrnfc36z35v5wk4l7jc3h";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  phases = [ "unpackPhase" "installPhase" ];
 
-  phaseNames = ["doUnpack" "installFonts"];
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    mkdir -p $out/share/doc/${name}
+    cp -v *.otf $out/share/fonts/opentype/
+    cp -v FONTLOG.txt $out/share/doc/${name}
+  '';
 
-  doUnpack = a.fullDepEntry ''
-    unzip ${src}
-  '' ["addInputs"];
-      
-  meta = {
-    description = "An old-style font";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      all;
+  meta = with stdenv.lib; {
+    homepage = https://github.com/akryukov/oldstand;
+    description = "An attempt to revive a specific type of Modern style of serif typefaces";
+    maintainers = with maintainers; [ raskin rycee ];
+    license = licenses.ofl;
+    platforms = platforms.all;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://www.thessalonica.org.ru/ru/fonts-download.html";
-    };
-  };
-}) x
-
+}
diff --git a/pkgs/data/fonts/theano/default.nix b/pkgs/data/fonts/theano/default.nix
index ca560c72a8e..c385c3d40a9 100644
--- a/pkgs/data/fonts/theano/default.nix
+++ b/pkgs/data/fonts/theano/default.nix
@@ -1,50 +1,29 @@
-x@{builderDefsPackage
-  , unzip
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchzip }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    version="2.0";
-    baseName="theano";
-    name="${baseName}-${version}";
-    url="http://www.thessalonica.org.ru/downloads/${name}.otf.zip";
-    hash="1xiykqbbiawvfk33639awmgdn25b8s2k7vpwncl17bzlk887b4z6";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "theano-${version}";
+  version = "2.0";
+
+  src = fetchzip {
+    stripRoot = false;
+    url = "https://github.com/akryukov/theano/releases/download/v${version}/theano-${version}.otf.zip";
+    sha256 = "1z3c63rcp4vfjyfv8xwc3br10ydwjyac3ipbl09y01s7qhfz02gp";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  phases = [ "unpackPhase" "installPhase" ];
 
-  phaseNames = ["doUnpack" "installFonts"];
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    mkdir -p $out/share/doc/${name}
+    find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \;
+    find . -name "*.txt" -exec cp -v {} $out/share/doc/${name} \;
+  '';
 
-  doUnpack = a.fullDepEntry ''
-    unzip ${src}
-  '' ["addInputs"];
-      
-  meta = {
-    description = "An old-style font";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      all;
+  meta = with stdenv.lib; {
+    homepage = https://github.com/akryukov/theano;
+    description = "An old-style font designed from historic samples";
+    maintainers = with maintainers; [ raskin rycee ];
+    license = licenses.ofl;
+    platforms = platforms.all;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://www.thessalonica.org.ru/ru/fonts-download.html";
-    };
-  };
-}) x
-
+}

From 42ccd3cd983a88527cbe29630b18a665ae5d248f Mon Sep 17 00:00:00 2001
From: Matthew Maurer <maurer@matthewmaurer.org>
Date: Fri, 12 Jun 2015 20:50:37 +0200
Subject: [PATCH 1103/2322] Bump rust package index to more recent version

---
 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 0de95d59c8e..fe723a038e2 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,15 +7,15 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2015-05-19";
-  rev = "6280837d21e5a241d961daf968f5379e6e2e392f";
+  version = "2015-06-12";
+  rev = "020d1f3344ed8e7bd8fa740372bb7f03675fa708";
 
   src = fetchFromGitHub {
       inherit rev;
 
       owner = "rust-lang";
       repo = "crates.io-index";
-      sha256 = "1y5zhpd9l0zsknjnhk1ris45y5jka6d6fklzwwhss39h48vymf91";
+      sha256 = "0vkr0k1ga0jskvl8ss7m5m66b4wwi7ibjj5qw0x0khcg1b5skkq6";
   };
 
 in

From 5ee75e236c0cf758ed6b1188e10448acfcbc93b4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 12 Jun 2015 15:56:06 -0400
Subject: [PATCH 1104/2322] apache-kafka: Enable overriding the kafka package

---
 nixos/modules/services/misc/apache-kafka.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
index 90555ebc468..5314a096fe0 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -116,11 +116,19 @@ in {
       ];
     };
 
+    package = mkOption {
+      description = "The kafka package to use";
+
+      default = pkgs.apacheKafka;
+
+      type = types.package;
+    };
+
   };
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [pkgs.apacheKafka];
+    environment.systemPackages = [cfg.package];
 
     users.extraUsers = singleton {
       name = "apache-kafka";
@@ -136,7 +144,7 @@ in {
       serviceConfig = {
         ExecStart = ''
           ${pkgs.jre}/bin/java \
-            -cp "${pkgs.apacheKafka}/libs/*:${configDir}" \
+            -cp "${cfg.package}/libs/*:${configDir}" \
             ${toString cfg.jvmOptions} \
             kafka.Kafka \
             ${configDir}/server.properties

From 86f9f5d128306a37649cf13a687b231df18a03ca Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 12 Jun 2015 13:53:53 -0700
Subject: [PATCH 1105/2322] perl: Don't use builtin zlib and bzip2

---
 pkgs/development/interpreters/perl/5.20/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix
index 0ad955d0363..053f9730f45 100644
--- a/pkgs/development/interpreters/perl/5.20/default.nix
+++ b/pkgs/development/interpreters/perl/5.20/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, enableThreading ? stdenv ? glibc }:
+{ stdenv, fetchurl, bzip2, zlib, enableThreading ? stdenv ? glibc }:
 
 # We can only compile perl with threading on platforms where we have a
 # real glibc in the stdenv.
@@ -33,7 +33,12 @@ stdenv.mkDerivation rec {
       ./no-sys-dirs.patch
     ]
     ++ optional stdenv.isSunOS ./ld-shared.patch
-    ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ;
+    ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ];
+
+  buildInputs = [ zlib bzip2 ];
+
+  BUILD_ZLIB = "false";
+  BUILD_BZIP2 = "0";
 
   # Build a thread-safe Perl with a dynamic libperls.o.  We need the
   # "installstyle" option to ensure that modules are put under

From 4c536065b7f1b349472689a51dc423c2efb2ed88 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 12 Jun 2015 13:54:15 -0700
Subject: [PATCH 1106/2322] perl: Add gcc5 compat patch

---
 .../interpreters/perl/5.20/default.nix        |   2 +
 .../perl/5.20/perl-5.20.2-gcc5_fixes-1.patch  | 127 ++++++++++++++++++
 2 files changed, 129 insertions(+)
 create mode 100644 pkgs/development/interpreters/perl/5.20/perl-5.20.2-gcc5_fixes-1.patch

diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix
index 053f9730f45..700616dd4eb 100644
--- a/pkgs/development/interpreters/perl/5.20/default.nix
+++ b/pkgs/development/interpreters/perl/5.20/default.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
   patches =
     [ # Do not look in /usr etc. for dependencies.
       ./no-sys-dirs.patch
+      # Remove in 5.20.3
+      ./perl-5.20.2-gcc5_fixes-1.patch
     ]
     ++ optional stdenv.isSunOS ./ld-shared.patch
     ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ];
diff --git a/pkgs/development/interpreters/perl/5.20/perl-5.20.2-gcc5_fixes-1.patch b/pkgs/development/interpreters/perl/5.20/perl-5.20.2-gcc5_fixes-1.patch
new file mode 100644
index 00000000000..21f3ca8d7a5
--- /dev/null
+++ b/pkgs/development/interpreters/perl/5.20/perl-5.20.2-gcc5_fixes-1.patch
@@ -0,0 +1,127 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2015-04-17
+Initial Package Version: 5.20.2
+Upstream Status: Committed
+Origin: Petr Pisař and Tony Cook
+Description: Fixes Errno.pm and h2ph with gcc-5.
+
+1. cherry-picked because the change to $version will not apply, from
+commit 816b056ffb99ae54642320e20dc30a59fd1effef
+Author: Petr Písař <ppisar@redhat.com>
+Date:   Wed Feb 11 15:46:37 2015 +0100
+
+    Fix Errno.pm generation for gcc-5.0
+    
+    gcc-5.0 -E interleaves now line numbers with expended macros, so that
+    the generated errno.c will be preprocessed to
+    
+    EBFONT => [[
+               59
+                    ]]
+    
+    which is hard to parse in in line-based reader.
+    
+    So use -P option with gcc >= 5.0. Global -P usage would break makedepend,
+    global -ftrack-macro-expansion=0 would break lib/h2ph.t.
+    
+    RT#123784
+
+diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
+index 3dadfce..c6bfa06 100644
+--- a/ext/Errno/Errno_pm.PL
++++ b/ext/Errno/Errno_pm.PL
+@@ -215,20 +215,31 @@ sub write_errno_pm {
+     {	# BeOS (support now removed) did not enter this block
+     # invoke CPP and read the output
+ 
++	my $inhibit_linemarkers = '';
++	if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
++	    # GCC 5.0 interleaves expanded macros with line numbers breaking
++	    # each line into multiple lines. RT#123784
++	    $inhibit_linemarkers = ' -P';
++	}
++
+ 	if ($^O eq 'VMS') {
+-	    my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
++	    my $cpp = "$Config{cppstdin} $Config{cppflags}" .
++		$inhibit_linemarkers . " $Config{cppminus}";
+ 	    $cpp =~ s/sys\$input//i;
+ 	    open(CPPO,"$cpp  errno.c |") or
+ 		die "Cannot exec $Config{cppstdin}";
+ 	} elsif ($IsMSWin32 || $^O eq 'NetWare') {
+-	    open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
+-		die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
++	    my $cpp = "$Config{cpprun} $Config{cppflags}" .
++		$inhibit_linemarkers;
++	    open(CPPO,"$cpp errno.c |") or
++		die "Cannot run '$cpp errno.c'";
+ 	} elsif ($IsSymbian) {
+-            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
++            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
++		$inhibit_linemarkers ." -";
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+         } else {
+-	    my $cpp = default_cpp();
++	    my $cpp = default_cpp() . $inhibit_linemarkers;
+ 	    open(CPPO,"$cpp < errno.c |")
+ 		or die "Cannot exec $cpp";
+ 	}
+
+commit 3bea78d24634e630b610f59957e7a019205a67b2
+Author: Tony Cook <tony@develop-help.com>
+Date:   Mon Feb 16 15:57:00 2015 +1100
+
+    h2ph: correct handling of hex constants for the preamble
+    
+    Previously they were treated as identifiers resulting in code
+    generated like C< &0xFFF >.
+    
+    We also try to prevent compile-time warnings from large hex integers,
+    the user isn't responsible for the generated code, so we delay those
+    warnings to run-time.
+
+diff --git a/utils/h2ph.PL b/utils/h2ph.PL
+index 9a8b14d..d082f22 100644
+--- a/utils/h2ph.PL
++++ b/utils/h2ph.PL
+@@ -769,7 +769,7 @@ sub inc_dirs
+ sub build_preamble_if_necessary
+ {
+     # Increment $VERSION every time this function is modified:
+-    my $VERSION     = 3;
++    my $VERSION     = 4;
+     my $preamble    = "$Dest_dir/_h2ph_pre.ph";
+ 
+     # Can we skip building the preamble file?
+@@ -788,6 +788,11 @@ sub build_preamble_if_necessary
+ 
+     open  PREAMBLE, ">$preamble" or die "Cannot open $preamble:  $!";
+ 	print PREAMBLE "# This file was created by h2ph version $VERSION\n";
++        # Prevent non-portable hex constants from warning.
++        #
++        # We still produce an overflow warning if we can't represent
++        # a hex constant as an integer.
++        print PREAMBLE "no warnings qw(portable);\n";
+ 
+ 	foreach (sort keys %define) {
+ 	    if ($opt_D) {
+@@ -814,6 +819,18 @@ DEFINE
+ 		# integer:
+ 		print PREAMBLE
+ 		    "unless (defined &$_) { sub $_() { $1 } }\n\n";
++            } elsif ($define{$_} =~ /^([+-]?0x[\da-f]+)U?L{0,2}$/i) {
++                # hex integer
++                # Special cased, since perl warns on hex integers
++                # that can't be represented in a UV.
++                #
++                # This way we get the warning at time of use, so the user
++                # only gets the warning if they happen to use this
++                # platform-specific definition.
++                my $code = $1;
++                $code = "hex('$code')" if length $code > 10;
++                print PREAMBLE
++                    "unless (defined &$_) { sub $_() { $code } }\n\n";
+ 	    } elsif ($define{$_} =~ /^\w+$/) {
+ 		my $def = $define{$_};
+ 		if ($isatype{$def}) {

From 03efddef759f1f8d7906445be8b9795674b7c622 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 12 Jun 2015 13:55:34 -0700
Subject: [PATCH 1107/2322] perl: Add version 5.22.0

---
 .../interpreters/perl/5.22/cpp-precomp.patch  |  11 +
 .../interpreters/perl/5.22/default.nix        | 110 ++++++++
 .../interpreters/perl/5.22/ld-shared.patch    |  11 +
 .../interpreters/perl/5.22/no-libutil.patch   |  12 +
 .../interpreters/perl/5.22/no-sys-dirs.patch  | 250 ++++++++++++++++++
 .../interpreters/perl/5.22/setup-hook.sh      |   5 +
 pkgs/top-level/all-packages.nix               |   5 +
 7 files changed, 404 insertions(+)
 create mode 100644 pkgs/development/interpreters/perl/5.22/cpp-precomp.patch
 create mode 100644 pkgs/development/interpreters/perl/5.22/default.nix
 create mode 100644 pkgs/development/interpreters/perl/5.22/ld-shared.patch
 create mode 100644 pkgs/development/interpreters/perl/5.22/no-libutil.patch
 create mode 100644 pkgs/development/interpreters/perl/5.22/no-sys-dirs.patch
 create mode 100644 pkgs/development/interpreters/perl/5.22/setup-hook.sh

diff --git a/pkgs/development/interpreters/perl/5.22/cpp-precomp.patch b/pkgs/development/interpreters/perl/5.22/cpp-precomp.patch
new file mode 100644
index 00000000000..231853fe51a
--- /dev/null
+++ b/pkgs/development/interpreters/perl/5.22/cpp-precomp.patch
@@ -0,0 +1,11 @@
+--- a/hints/darwin.sh	2013-05-08 11:13:45.000000000 -0600
++++ b/hints/darwin.sh	2013-05-08 11:15:04.000000000 -0600
+@@ -129,7 +129,7 @@
+ 
+ # Avoid Apple's cpp precompiler, better for extensions
+ if [ "X`echo | ${cc} -no-cpp-precomp -E - 2>&1 >/dev/null`" = "X" ]; then
+-    cppflags="${cppflags} -no-cpp-precomp"
++    #cppflags="${cppflags} -no-cpp-precomp"
+ 
+     # This is necessary because perl's build system doesn't
+     # apply cppflags to cc compile lines as it should.
diff --git a/pkgs/development/interpreters/perl/5.22/default.nix b/pkgs/development/interpreters/perl/5.22/default.nix
new file mode 100644
index 00000000000..b7aad858ccf
--- /dev/null
+++ b/pkgs/development/interpreters/perl/5.22/default.nix
@@ -0,0 +1,110 @@
+{ stdenv, fetchurl, bzip2, zlib, enableThreading ? stdenv ? glibc }:
+
+# We can only compile perl with threading on platforms where we have a
+# real glibc in the stdenv.
+#
+# Instead of silently building an unthreaded perl if this is not the
+# case, we force callers to disableThreading explicitly, therefore
+# documenting the platforms where the perl is not threaded.
+#
+# In the case of stdenv linux boot stage1 it's not possible to use
+# threading because of the simpleness of the bootstrap glibc, so we
+# use enableThreading = false there.
+assert enableThreading -> (stdenv ? glibc);
+
+let
+
+  libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";
+
+in
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "perl-5.22.0";
+
+  src = fetchurl {
+    url = "mirror://cpan/src/5.0/${name}.tar.gz";
+    sha256 = "0g5bl8sdpzx9gx2g5jq3py4bj07z2ylk7s1qn0fvsss2yl3hhs8c";
+  };
+
+  patches =
+    [ # Do not look in /usr etc. for dependencies.
+      ./no-sys-dirs.patch
+    ]
+    ++ optional stdenv.isSunOS ./ld-shared.patch
+    ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ];
+
+  buildInputs = [ zlib bzip2 ];
+
+  BUILD_ZLIB = "false";
+  BUILD_BZIP2 = "0";
+
+  # Build a thread-safe Perl with a dynamic libperls.o.  We need the
+  # "installstyle" option to ensure that modules are put under
+  # $out/lib/perl5 - this is the general default, but because $out
+  # contains the string "perl", Configure would select $out/lib.
+  # Miniperl needs -lm. perl needs -lrt.
+  configureFlags =
+    [ "-de"
+      "-Dcc=cc"
+      "-Uinstallusrbinperl"
+      "-Dinstallstyle=lib/perl5"
+      "-Duseshrplib"
+      "-Dlocincpth=${libc}/include"
+      "-Dloclibpth=${libc}/lib"
+    ]
+    ++ optional enableThreading "-Dusethreads";
+
+  configureScript = "${stdenv.shell} ./Configure";
+
+  dontAddPrefix = true;
+
+  enableParallelBuilding = true;
+
+  preConfigure =
+    ''
+
+      configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
+
+      ${optionalString stdenv.isArm ''
+        configureFlagsArray=(-Dldflags="-lm -lrt")
+      ''}
+    '' + optionalString stdenv.isDarwin ''
+      substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
+    '' + optionalString (!enableThreading) ''
+      # We need to do this because the bootstrap doesn't have a static libpthread
+      sed -i 's,\(libswanted.*\)pthread,\1,g' Configure
+    '';
+
+  preBuild = optionalString (!(stdenv ? cc && stdenv.cc.nativeTools))
+    ''
+      # Make Cwd work on NixOS (where we don't have a /bin/pwd).
+      substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
+    '';
+
+  setupHook = ./setup-hook.sh;
+
+  passthru.libPrefix = "lib/perl5/site_perl";
+
+  preCheck = ''
+    # Try and setup a local hosts file
+    if [ -f "${libc}/lib/libnss_files.so" ]; then
+      mkdir $TMPDIR/fakelib
+      cp "${libc}/lib/libnss_files.so" $TMPDIR/fakelib
+      sed -i 's,/etc/hosts,/dev/fd/3,g' $TMPDIR/fakelib/libnss_files.so
+      export LD_LIBRARY_PATH=$TMPDIR/fakelib
+    fi
+  '';
+
+  postCheck = ''
+    unset LD_LIBRARY_PATH
+  '';
+
+  meta = {
+    homepage = https://www.perl.org/;
+    description = "The standard implementation of the Perl 5 programmming language";
+    maintainers = [ maintainers.eelco ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/interpreters/perl/5.22/ld-shared.patch b/pkgs/development/interpreters/perl/5.22/ld-shared.patch
new file mode 100644
index 00000000000..be45230c8a7
--- /dev/null
+++ b/pkgs/development/interpreters/perl/5.22/ld-shared.patch
@@ -0,0 +1,11 @@
+--- perl-5.16.2/hints/solaris_2.sh.orig	2013-02-14 19:29:49.453988140 +0000
++++ perl-5.16.2/hints/solaris_2.sh	2013-02-14 19:30:31.681631019 +0000
+@@ -568,7 +568,7 @@
+ #		    ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
+ #		fi
+ 		ldflags="$ldflags -m64"
+-		lddlflags="$lddlflags -G -m64"
++		lddlflags="$lddlflags -shared -m64"
+ 		;;
+ 	    *)
+ 		getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
diff --git a/pkgs/development/interpreters/perl/5.22/no-libutil.patch b/pkgs/development/interpreters/perl/5.22/no-libutil.patch
new file mode 100644
index 00000000000..68d44612bfe
--- /dev/null
+++ b/pkgs/development/interpreters/perl/5.22/no-libutil.patch
@@ -0,0 +1,12 @@
+diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure
+--- perl-5.14.2-orig/Configure	2011-09-26 11:44:34.000000000 +0200
++++ perl-5.14.2/Configure	2012-02-16 17:24:50.779839039 +0100
+@@ -1368,7 +1368,7 @@
+ : List of libraries we want.
+ : If anyone needs extra -lxxx, put those in a hint file.
+ libswanted="socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun"
+-libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
++libswanted="$libswanted m crypt sec c cposix posix ucb bsd BSD"
+ : We probably want to search /usr/shlib before most other libraries.
+ : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
+ glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
diff --git a/pkgs/development/interpreters/perl/5.22/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.22/no-sys-dirs.patch
new file mode 100644
index 00000000000..1793273a76f
--- /dev/null
+++ b/pkgs/development/interpreters/perl/5.22/no-sys-dirs.patch
@@ -0,0 +1,250 @@
+diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
+--- perl-5.20.0-orig/Configure	2014-05-26 15:34:18.000000000 +0200
++++ perl-5.20.0/Configure	2014-06-25 10:43:35.368285986 +0200
+@@ -106,15 +106,7 @@
+ fi
+ 
+ : Proper PATH setting
+-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
+-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
+-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
+-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
+-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
+-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
+-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
+-paths="$paths /sbin /usr/sbin /usr/libexec"
+-paths="$paths /system/gnu_library/bin"
++paths=''
+ 
+ for p in $paths
+ do
+@@ -1337,8 +1329,7 @@
+ archname=''
+ : Possible local include directories to search.
+ : Set locincpth to "" in a hint file to defeat local include searches.
+-locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
+-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
++locincpth=""
+ :
+ : no include file wanted by default
+ inclwanted=''
+@@ -1349,17 +1340,12 @@
+ 
+ libnames=''
+ : change the next line if compiling for Xenix/286 on Xenix/386
+-xlibpth='/usr/lib/386 /lib/386'
++xlibpth=''
+ : Possible local library directories to search.
+-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
+-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
++loclibpth=""
+ 
+ : general looking path for locating libraries
+-glibpth="/lib /usr/lib $xlibpth"
+-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
+-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
+-test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
+-test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
++glibpth=""
+ 
+ : Private path used by Configure to find libraries.  Its value
+ : is prepended to libpth. This variable takes care of special
+@@ -1391,8 +1377,6 @@
+ libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
+ : We probably want to search /usr/shlib before most other libraries.
+ : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
+-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
+-glibpth="/usr/shlib $glibpth"
+ : Do not use vfork unless overridden by a hint file.
+ usevfork=false
+ 
+@@ -2446,7 +2430,6 @@
+ zip
+ "
+ pth=`echo $PATH | sed -e "s/$p_/ /g"`
+-pth="$pth $sysroot/lib $sysroot/usr/lib"
+ for file in $loclist; do
+ 	eval xxx=\$$file
+ 	case "$xxx" in
+@@ -4936,7 +4919,7 @@
+ : Set private lib path
+ case "$plibpth" in
+ '') if ./mips; then
+-	plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib"
++	plibpth="$incpath/usr/lib"
+     fi;;
+ esac
+ case "$libpth" in
+@@ -8600,13 +8583,8 @@
+ echo " "
+ case "$sysman" in
+ '')
+-	syspath='/usr/share/man/man1 /usr/man/man1'
+-	syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1"
+-	syspath="$syspath /usr/man/u_man/man1"
+-	syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
+-	syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"
+-	syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"
+-	sysman=`./loc . /usr/man/man1 $syspath`
++	syspath=''
++	sysman=''
+ 	;;
+ esac
+ if $test -d "$sysman"; then
+@@ -19900,9 +19878,10 @@
+ case "$full_ar" in
+ '') full_ar=$ar ;;
+ esac
++full_ar=ar
+ 
+ : Store the full pathname to the sed program for use in the C program
+-full_sed=$sed
++full_sed=sed
+ 
+ : see what type gids are declared as in the kernel
+ echo " "
+Only in perl-5.20.0/: Configure.orig
+diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL
+--- perl-5.20.0-orig/ext/Errno/Errno_pm.PL	2014-05-26 15:34:20.000000000 +0200
++++ perl-5.20.0/ext/Errno/Errno_pm.PL	2014-06-25 10:31:24.317970047 +0200
+@@ -126,11 +126,7 @@
+ 	if ($dep =~ /(\S+errno\.h)/) {
+ 	     $file{$1} = 1;
+ 	}
+-    } elsif ($^O eq 'linux' &&
+-	      $Config{gccversion} ne '' && 
+-	      $Config{gccversion} !~ /intel/i
+-	      # might be using, say, Intel's icc
+-	     ) {
++    } elsif (0) {
+     # When cross-compiling we may store a path for gcc's "sysroot" option:
+     my $sysroot = $Config{sysroot} || '';
+ 	# Some Linuxes have weird errno.hs which generate
+Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig
+diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh
+--- perl-5.20.0-orig/hints/freebsd.sh	2014-01-31 22:55:51.000000000 +0100
++++ perl-5.20.0/hints/freebsd.sh	2014-06-25 10:25:53.263964680 +0200
+@@ -119,21 +119,21 @@
+         objformat=`/usr/bin/objformat`
+         if [ x$objformat = xaout ]; then
+             if [ -e /usr/lib/aout ]; then
+-                libpth="/usr/lib/aout /usr/local/lib /usr/lib"
+-                glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
++                libpth=""
++                glibpth=""
+             fi
+             lddlflags='-Bshareable'
+         else
+-            libpth="/usr/lib /usr/local/lib"
+-            glibpth="/usr/lib /usr/local/lib"
++            libpth=""
++            glibpth=""
+             ldflags="-Wl,-E "
+             lddlflags="-shared "
+         fi
+         cccdlflags='-DPIC -fPIC'
+         ;;
+ *)
+-       libpth="/usr/lib /usr/local/lib"
+-       glibpth="/usr/lib /usr/local/lib"
++       libpth=""
++       glibpth=""
+        ldflags="-Wl,-E "
+         lddlflags="-shared "
+         cccdlflags='-DPIC -fPIC'
+diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh
+--- perl-5.20.0-orig/hints/linux.sh	2014-05-26 15:34:20.000000000 +0200
++++ perl-5.20.0/hints/linux.sh	2014-06-25 10:33:47.354883843 +0200
+@@ -150,25 +150,6 @@
+     ;;
+ esac
+ 
+-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries
+-# (such as -lm) in /lib or /usr/lib.  So we have to ask gcc to tell us
+-# where to look.  We don't want gcc's own libraries, however, so we
+-# filter those out.
+-# This could be conditional on Unbuntu, but other distributions may
+-# follow suit, and this scheme seems to work even on rather old gcc's.
+-# This unconditionally uses gcc because even if the user is using another
+-# compiler, we still need to find the math library and friends, and I don't
+-# know how other compilers will cope with that situation.
+-# Morever, if the user has their own gcc earlier in $PATH than the system gcc,
+-# we don't want its libraries. So we try to prefer the system gcc
+-# Still, as an escape hatch, allow Configure command line overrides to
+-# plibpth to bypass this check.
+-if [ -x /usr/bin/gcc ] ; then
+-    gcc=/usr/bin/gcc
+-else
+-    gcc=gcc
+-fi
+-
+ case "$plibpth" in
+ '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries |
+ 	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
+@@ -178,32 +159,6 @@
+     ;;
+ esac
+ 
+-case "$libc" in
+-'')
+-# If you have glibc, then report the version for ./myconfig bug reporting.
+-# (Configure doesn't need to know the specific version since it just uses
+-# gcc to load the library for all tests.)
+-# We don't use __GLIBC__ and  __GLIBC_MINOR__ because they
+-# are insufficiently precise to distinguish things like
+-# libc-2.0.6 and libc-2.0.7.
+-    for p in $plibpth
+-    do
+-        for trylib in libc.so.6 libc.so
+-        do
+-            if $test -e $p/$trylib; then
+-                libc=`ls -l $p/$trylib | awk '{print $NF}'`
+-                if $test "X$libc" != X; then
+-                    break
+-                fi
+-            fi
+-        done
+-        if $test "X$libc" != X; then
+-            break
+-        fi
+-    done
+-    ;;
+-esac
+-
+ # Are we using ELF?  Thanks to Kenneth Albanowski <kjahds@kjahds.com>
+ # for this test.
+ cat >try.c <<'EOM'
+@@ -367,33 +322,6 @@
+ 	;;
+ esac
+ 
+-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than
+-# true libraries. The scripts cause binding against static
+-# version of -lgdbm which is a bad idea. So if we have 'nm'
+-# make sure it can read the file
+-# NI-S 2003/08/07
+-case "$nm" in
+-    '') ;;
+-    *)
+-    for p in $plibpth
+-    do
+-        if $test -r $p/libndbm.so; then
+-            if $nm $p/libndbm.so >/dev/null 2>&1 ; then
+-                echo 'Your shared -lndbm seems to be a real library.'
+-                _libndbm_real=1
+-                break
+-            fi
+-        fi
+-    done
+-    if $test "X$_libndbm_real" = X; then
+-        echo 'Your shared -lndbm is not a real library.'
+-        set `echo X "$libswanted "| sed -e 's/ ndbm / /'`
+-        shift
+-        libswanted="$*"
+-    fi
+-    ;;
+-esac
+-
+ # Linux on Synology.
+ if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then
+     # Tested on Synology DS213 and DS413
diff --git a/pkgs/development/interpreters/perl/5.22/setup-hook.sh b/pkgs/development/interpreters/perl/5.22/setup-hook.sh
new file mode 100644
index 00000000000..a8656b8531d
--- /dev/null
+++ b/pkgs/development/interpreters/perl/5.22/setup-hook.sh
@@ -0,0 +1,5 @@
+addPerlLibPath () {
+    addToSearchPath PERL5LIB $1/lib/perl5/site_perl
+}
+
+envHooks+=(addPerlLibPath)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3669f3cf11..82f23b713dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4842,6 +4842,11 @@ let
     fetchurl = fetchurlBoot;
   };
 
+  perl522 = callPackage ../development/interpreters/perl/5.22 {
+    fetchurl = fetchurlBoot;
+  };
+
+  # Make perl522 the default once gnulib is updated to support it.
   perl = perl520;
 
   php = php56;

From 458552f614676a338272ca064a3207305345d4f9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 12 Jun 2015 13:56:19 -0700
Subject: [PATCH 1108/2322] Revert "Net::HTTP: Disable tests"

This should work with a well built version of perl that has correctly
generated Errno information.

This reverts commit 623401788df6b9f2c91fb43f4d569ea4c0c66116.
---
 pkgs/top-level/perl-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a9168e3bdd2..c166457add2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6967,7 +6967,6 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/G/GA/GAAS/Net-HTTP-6.06.tar.gz;
       sha256 = "1m1rvniffadq99gsy25298ia3lixwymr6kan64jd3ylyi7nkqkhx";
     };
-    doCheck = false; # binds to TCP ports
     meta = {
       description = "Low-level HTTP connection (client)";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From dce591e0b8f99322b2063940c39c892cb03e6d27 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 12 Jun 2015 13:57:05 -0700
Subject: [PATCH 1109/2322] bcache-tools: Add gcc5 compatability patch

---
 .../filesystems/bcache-tools/default.nix      |  5 ++++-
 .../filesystems/bcache-tools/fix-static.patch | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/filesystems/bcache-tools/fix-static.patch

diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix
index a4b1363d841..14d8d282c81 100644
--- a/pkgs/tools/filesystems/bcache-tools/default.nix
+++ b/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -21,7 +21,10 @@ stdenv.mkDerivation rec {
         -i Makefile
   '';
 
-  patches = [ ./bcache-udev-modern.patch ];
+  patches = [
+    ./bcache-udev-modern.patch
+    ./fix-static.patch
+  ];
 
   preBuild = ''
     export makeFlags="$makeFlags PREFIX=\"$out\" UDEVLIBDIR=\"$out/lib/udev/\"";
diff --git a/pkgs/tools/filesystems/bcache-tools/fix-static.patch b/pkgs/tools/filesystems/bcache-tools/fix-static.patch
new file mode 100644
index 00000000000..e5dd2df5299
--- /dev/null
+++ b/pkgs/tools/filesystems/bcache-tools/fix-static.patch
@@ -0,0 +1,22 @@
+diff --git a/bcache.c b/bcache.c
+index 8f37445..79806d8 100644
+--- a/bcache.c
++++ b/bcache.c
+@@ -26,7 +26,7 @@
+  * x^7 + x^4 + x + 1
+ */
+ 
+-static const uint64_t crc_table[256] = {
++const uint64_t crc_table[256] = {
+ 	0x0000000000000000ULL, 0x42F0E1EBA9EA3693ULL, 0x85E1C3D753D46D26ULL,
+ 	0xC711223CFA3E5BB5ULL, 0x493366450E42ECDFULL, 0x0BC387AEA7A8DA4CULL,
+ 	0xCCD2A5925D9681F9ULL, 0x8E224479F47CB76AULL, 0x9266CC8A1C85D9BEULL,
+@@ -115,7 +115,7 @@ static const uint64_t crc_table[256] = {
+ 	0x9AFCE626CE85B507ULL
+ };
+ 
+-inline uint64_t crc64(const void *_data, size_t len)
++uint64_t crc64(const void *_data, size_t len)
+ {
+ 	uint64_t crc = 0xFFFFFFFFFFFFFFFFULL;
+ 	const unsigned char *data = _data;

From bf91d04c51e92abd5204bd858053c89f421e96f4 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Fri, 12 Jun 2015 22:56:53 +0200
Subject: [PATCH 1110/2322] Update pharo-vm to 2015.04.30

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

diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix
index b8a09492eab..8fa1bc12646 100644
--- a/pkgs/development/pharo/vm/default.nix
+++ b/pkgs/development/pharo/vm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
 
-  version = "2014.11.29-2";
+  version = "2015.04.30";
 
   name = "pharo-vm-core-i386-${version}";
   system = "x86_32-linux";
   src = fetchurl {
     url = "http://files.pharo.org/vm/src/vm-unix-sources/blessed/pharo-vm-${version}.tar.bz2";
-    md5 = "529cff4639cee313ddf55fd377bd6fb3";
+    sha256 = "0lg9ahqfrwbn3srxbbvr1vhjnx267chbs1la0nrc2ivpd55iwjgv";
   };
 
   sources10Zip = fetchurl {

From 52a1ae743bdcc946cdbde147c70621fc04cec978 Mon Sep 17 00:00:00 2001
From: Jonathan Rudenberg <jonathan@titanous.com>
Date: Fri, 12 Jun 2015 17:58:27 -0400
Subject: [PATCH 1111/2322] makemkv: 1.9.2 -> 1.9.3

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

diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index 583c800a8b4..7220402f2ad 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -4,17 +4,17 @@
 
 stdenv.mkDerivation rec {
   name = "makemkv-${ver}";
-  ver = "1.9.2";
+  ver = "1.9.3";
   builder = ./builder.sh;
 
   src_bin = fetchurl {
     url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
-    sha256 = "0hjby7imja9sg2h68al81n4zl72mc3y3fqmf61sf1sad4njs9bkj";
+    sha256 = "1rlg7phkhzhzbb1zk8mb5qsd4zcsw20glga31npaxxy8vyfkjcxc";
   };
 
   src_oss = fetchurl {
     url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
-    sha256 = "074scfz835jynzmb28i8q44hc6ixvfg3crgirmy02bbpxakyp1v6";
+    sha256 = "1vn4wbxii1vn7mss2ydikhwp8hkizii7arg7a1cnpvmwp7pd952v";
   };
 
   buildInputs = [openssl qt4 mesa zlib pkgconfig libav];

From 8f60f45eb69fa6814b5624ecc7fb5a4410c5ce6a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 12 Jun 2015 15:40:38 -0700
Subject: [PATCH 1112/2322] mdadm: add gcc5 compat

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

diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index a7965a70b1c..042c2225ff3 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -19,6 +19,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ groff ];
 
+  # Attempt removing if building with gcc5 when updating
+  NIX_CFLAGS_COMPILE = "-std=gnu89";
+
   preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile";
 
   # Force mdadm to use /var/run/mdadm.map for its map file (or

From 84aad77f54d673cd047d51b8cd5194507a6e4395 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 12 Jun 2015 15:40:48 -0700
Subject: [PATCH 1113/2322] trousers: Add gcc5 compat

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

diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix
index 9d15b16a188..e910241113b 100644
--- a/pkgs/tools/security/trousers/default.nix
+++ b/pkgs/tools/security/trousers/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--disable-usercheck" ];
 
-  NIX_CFLAGS_COMPILE = "-DALLOW_NON_TSS_CONFIG_FILE";
+  # Attempt to remove -std=gnu89 when updating if using gcc5
+  NIX_CFLAGS_COMPILE = "-std=gnu89 -DALLOW_NON_TSS_CONFIG_FILE";
   NIX_LDFLAGS = "-lgcc_s";
 
   # Fix broken libtool file

From c240556a24f6e358992a0c7169592c2ccc3c4e60 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 12 Jun 2015 10:33:59 +0300
Subject: [PATCH 1114/2322] gmp: Fix build on ARM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The config.guess script tries to detect various ARM optimization flags
via /proc/cpuinfo. This is not only impure, but the detection is also
broken on multicore machines; on my quad-core system the machine type is
autodetected as 'neon neon neon neon-unknown-linux-gnueabihf':

checking build system type... Invalid configuration `neon': machine `neon' not recognized
configure: error: /nix/store/bafimhdj1yaxj6m1hvq7wvhwwizc939x-bootstrap-tools/bin/sh ./config.sub neon
neon
neon
neon-unknown-linux-gnueabihf failed
builder for ‘/nix/store/1npm2358bpvclj5w7fqjjwg72vbb0d79-gmp-6.0.0a.drv’ failed with exit code 1

Override the system type with the output of GNU config.guess to avoid
the autodetection.
---
 pkgs/development/libraries/gmp/5.1.x.nix | 9 ++++++++-
 pkgs/development/libraries/gmp/6.x.nix   | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
index 0df1a4f8cd8..7b393067ff5 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; };
+with { inherit (stdenv.lib) optional optionalString; };
 
 stdenv.mkDerivation rec {
   name = "gmp-5.1.3";
@@ -28,6 +28,13 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.is64bit "--with-pic"
     ;
 
+  # The config.guess in GMP tries to runtime-detect various
+  # ARM optimization flags via /proc/cpuinfo (and is also
+  # broken on multicore CPUs). Avoid this impurity.
+  preConfigure = optionalString stdenv.isArm ''
+      configureFlagsArray+=("--build=$(./configfsf.guess)")
+    '';
+
   doCheck = true;
 
   dontDisableStatic = withStatic;
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index b7350c19960..171611e1249 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 ? true }:
 
-with { inherit (stdenv.lib) optional; };
+with { inherit (stdenv.lib) optional optionalString; };
 
 stdenv.mkDerivation rec {
   name = "gmp-6.0.0a";
@@ -26,6 +26,13 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.is64bit "--with-pic"
     ;
 
+  # The config.guess in GMP tries to runtime-detect various
+  # ARM optimization flags via /proc/cpuinfo (and is also
+  # broken on multicore CPUs). Avoid this impurity.
+  preConfigure = optionalString stdenv.isArm ''
+      configureFlagsArray+=("--build=$(./configfsf.guess)")
+    '';
+
   doCheck = true;
 
   dontDisableStatic = withStatic;

From 7e38ad08e764c6f0c10e1d676af046d876d47adb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 11 Jun 2015 12:38:35 +0200
Subject: [PATCH 1115/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/008236bc31f0113ee2a50ee1149843a6c7a75395
 with hackage2nix revision c519a8ee5f75311f8eaaca7eaf5af8f7ad26d33e

---
 .../haskell-modules/hackage-packages.nix      | 430 ++++++++++++------
 1 file changed, 286 insertions(+), 144 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 4794ec73879..e5cdabbed67 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -19370,8 +19370,8 @@ self: {
      }:
      mkDerivation {
        pname = "angel";
-       version = "0.5.2";
-       sha256 = "0h2nyxv56cshkxlbq5j54220w7x2y0m1aaqzqz6dhipff29pmr39";
+       version = "0.6.0";
+       sha256 = "0625r8jy9v6x5v5y5vrz2z7bqag9hwjnxr7ir35bq18xd5fpr9kf";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -28020,8 +28020,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-bounds";
-       version = "0.9.3";
-       sha256 = "0r8ayxsfx7z4hivknshj2sybssn3hjwprxpyqw4yv3w26gv7d82j";
+       version = "0.9.4";
+       sha256 = "1l1nqf8878kmmdc5ssrpn52cszn9w0ym70pjjbaprpa1c7mdbziy";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -35752,21 +35752,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cpphs_1_18_9" = callPackage
-    ({ mkDerivation, base, directory, old-locale, old-time, polyparse
-     }:
-     mkDerivation {
-       pname = "cpphs";
-       version = "1.18.9";
-       sha256 = "0bf9p5izkag6iqlpf59znsv8107hg1xghgas4crw2gxai1z7bfq6";
-       isLibrary = true;
-       isExecutable = true;
-       buildDepends = [ 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" = callPackage
     ({ mkDerivation, base, directory, old-locale, old-time, polyparse
      }:
@@ -36413,17 +36398,19 @@ self: {
 
   "cron" = callPackage
     ({ mkDerivation, attoparsec, base, derive, hspec
-     , hspec-expectations, mtl, old-locale, QuickCheck, text, time
-     , transformers
+     , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text
+     , time, transformers-compat
      }:
      mkDerivation {
        pname = "cron";
-       version = "0.2.6";
-       sha256 = "1klxhk12c08ig7n8n8drnvqmggfghr8i9j5bfhakj58bk1x8xfvg";
-       buildDepends = [ attoparsec base mtl old-locale text time ];
+       version = "0.3.0";
+       sha256 = "18yadf94bzyhm5nab6lc8zagp39yv5k8cjjakhaxncgipcm30s9k";
+       buildDepends = [
+         attoparsec base mtl mtl-compat old-locale text time
+       ];
        testDepends = [
          attoparsec base derive hspec hspec-expectations QuickCheck text
-         time transformers
+         time transformers-compat
        ];
        homepage = "http://github.com/michaelxavier/cron";
        description = "Cron datatypes and Attoparsec parser";
@@ -43249,6 +43236,24 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "dozens" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default-class
+     , http-client, http-types, reflection, scientific, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "dozens";
+       version = "0.1.1";
+       sha256 = "1hvsdc69ag4x8rp2pzr3cxjfbl4fh9bdj4bwlkfvpr755qdi45ky";
+       buildDepends = [
+         aeson base bytestring data-default-class http-client http-types
+         reflection scientific text transformers
+       ];
+       homepage = "https://github.com/philopon/apiary";
+       description = "dozens api library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "dph-base" = callPackage
     ({ mkDerivation, array, base, ghc-prim, pretty, random, vector }:
      mkDerivation {
@@ -46041,24 +46046,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "equivalence_0_2_5" = callPackage
-    ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans
-     , template-haskell, test-framework, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "equivalence";
-       version = "0.2.5";
-       sha256 = "014r9v81r7nj5pynfk3wa4lm4hk04123fgxkhb9a945wi6d9m5h3";
-       buildDepends = [ base containers mtl STMonadTrans ];
-       testDepends = [
-         base containers mtl QuickCheck STMonadTrans template-haskell
-         test-framework test-framework-quickcheck2
-       ];
-       homepage = "https://bitbucket.org/paba/equivalence/";
-       description = "Maintaining an equivalence relation implemented as union-find using STT";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
   "equivalence" = callPackage
     ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans
      , template-haskell, test-framework, test-framework-quickcheck2
@@ -48255,17 +48242,25 @@ self: {
      }) {};
 
   "feldspar-signal" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, base-compat, feldspar-compiler
+     , feldspar-compiler-shim, feldspar-language, imperative-edsl
+     , mainland-pretty, monadic-edsl-priv
+     }:
      mkDerivation {
        pname = "feldspar-signal";
-       version = "0.0.0.1";
-       sha256 = "16brcdnbk4ykribgw5jix7k6qca2rxqms1hnljmirs0b8ldyflgx";
-       buildDepends = [ base ];
+       version = "0.0.1.0";
+       sha256 = "147y0fy5pzagk8pm8way8qnxv42mn5qh8kmzjf02laydzxrwvpxd";
+       buildDepends = [
+         base base-compat feldspar-compiler feldspar-compiler-shim
+         feldspar-language imperative-edsl mainland-pretty monadic-edsl-priv
+       ];
        jailbreak = true;
        homepage = "https://github.com/markus-git/feldspar-signal";
        description = "Signal Processing extension for Feldspar";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+       broken = true;
+     }) { feldspar-compiler-shim = null;  imperative-edsl = null;
+          monadic-edsl-priv = null;};
 
   "fen2s" = callPackage
     ({ mkDerivation, api-opentheory-unicode, base, opentheory-unicode
@@ -48341,19 +48336,19 @@ self: {
      }) {};
 
   "fficxx" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, directory
-     , either, errors, filepath, hashable, HStringTemplate, lens, mtl
-     , process, pureMD5, split, template-haskell, transformers
-     , unordered-containers
+    ({ mkDerivation, base, bytestring, Cabal, containers, data-default
+     , directory, either, errors, filepath, hashable, HStringTemplate
+     , lens, mtl, process, pureMD5, split, template-haskell
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "fficxx";
-       version = "0.2";
-       sha256 = "0512v9xhli6qdz46gvn8lj15rp30919pf982fjcgklw22qmci69q";
+       version = "0.2.1";
+       sha256 = "1vjkwp0krs2762ww7vkl1g0dpaw6ifba7acjndmqbnvm3yl0ha0d";
        buildDepends = [
-         base bytestring Cabal containers directory either errors filepath
-         hashable HStringTemplate lens mtl process pureMD5 split
-         template-haskell transformers unordered-containers
+         base bytestring Cabal containers data-default directory either
+         errors filepath hashable HStringTemplate lens mtl process pureMD5
+         split template-haskell transformers unordered-containers
        ];
        description = "automatic C++ binding generation";
        license = stdenv.lib.licenses.bsd3;
@@ -48364,8 +48359,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "fficxx-runtime";
-       version = "0.2";
-       sha256 = "0czh7in30369c8c4ls3m3r61w6zb1p0p0jy2yi5j9521f61q588a";
+       version = "0.2.1";
+       sha256 = "0hcpc0db4mh3yx8yzbkllq9b04dd1qvr63ppz2qa9nq5zydb5pxk";
        buildDepends = [ base ];
        description = "Runtime for fficxx-generated library";
        license = stdenv.lib.licenses.bsd3;
@@ -52312,11 +52307,10 @@ self: {
     ({ mkDerivation, base, ieee754, QuickCheck }:
      mkDerivation {
        pname = "geom2d";
-       version = "0.1.2.1";
-       sha256 = "0235p0gjwsklxynr84ak6zirbxirhwm9f2z7d6b31y5hc9pnrznj";
+       version = "0.1.3.1";
+       sha256 = "1kz0cdxfc27412vzqv7vcywg9pba177ds6mpwknxlh049vcfrvh5";
        buildDepends = [ base ieee754 QuickCheck ];
        testDepends = [ base ieee754 QuickCheck ];
-       jailbreak = true;
        description = "package for geometry in euklidean 2d space";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53294,7 +53288,7 @@ self: {
      , clientsession, conduit, conduit-extra, containers, crypto-api
      , cryptohash, curl, data-default, DAV, dbus, directory, dlist, dns
      , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath
-     , git, gnupg1, gnutls, hamlet, hinotify, hslogger, http-client
+     , git, gnupg, gnutls, hamlet, hinotify, hslogger, http-client
      , http-conduit, http-types, IfElse, json, lsof, MissingH
      , monad-control, monad-logger, mtl, network, network-info
      , network-multicast, network-protocol-xmpp, network-uri, openssh
@@ -53330,7 +53324,7 @@ self: {
          yesod-static
        ];
        buildTools = [
-         bup curl git gnupg1 lsof openssh perl rsync wget which
+         bup curl git gnupg lsof openssh perl rsync wget which
        ];
        configureFlags = [ "-fassistant" "-fproduction" ];
        preConfigure = "export HOME=$TEMPDIR";
@@ -53342,7 +53336,7 @@ self: {
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
      }) { inherit (pkgs) bup;  inherit (pkgs) curl;  inherit (pkgs) git;
-          inherit (pkgs) gnupg1;  inherit (pkgs) lsof;
+          inherit (pkgs) gnupg;  inherit (pkgs) lsof;
           inherit (pkgs) openssh;  inherit (pkgs) perl;
           inherit (pkgs) rsync;  inherit (pkgs) wget;
           inherit (pkgs) which;};
@@ -67451,8 +67445,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.3.0";
-       sha256 = "0hvnb3svs7rh8c6afsp5rs6wdld2pllr5fvjhmlc143p40akck25";
+       version = "0.3.1";
+       sha256 = "178pdk9rhqiyzjpdvkfvjs4gfc27k1limi7qpnpqyxzlcrcsplvb";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -71698,9 +71692,9 @@ self: {
      mkDerivation {
        pname = "http-encodings";
        version = "0.9.3";
-       revision = "1";
+       revision = "2";
        sha256 = "0b29zqa2ybja73jip83qn1xhiinn1k64b6dmc39ccp48ip1xdnvn";
-       editedCabalFile = "b9e6dd65c8dd4119887c084f1bd14570ab0540e723afb845212f041e871210d7";
+       editedCabalFile = "0370852e7250c2c2bb1575155286442cbfcdd03a7e494dcaa73305d4e84a6c76";
        buildDepends = [
          base bytestring HTTP iconv mime mtl parsec text utf8-string zlib
        ];
@@ -71916,8 +71910,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-streams";
-       version = "0.8.3.2";
-       sha256 = "1hyg3fyhysxfbqks3y7rkbzx8j0hxkxlqdcbx77cihvz9j3ddzyk";
+       version = "0.8.3.3";
+       sha256 = "0cp2jdalg0vzikl6v4yhyflllv7yqskph5gp5ahirawhcj9rfi9z";
        buildDepends = [
          aeson attoparsec base base64-bytestring blaze-builder bytestring
          case-insensitive directory HsOpenSSL http-common io-streams mtl
@@ -76998,19 +76992,19 @@ self: {
     ({ mkDerivation, arrows, base, bytestring, cmdargs
      , data-default-class, data-default-instances-base, Diff, directory
      , filepath, HTTP, http-encodings, hxt, hxt-tagsoup
-     , language-ecmascript, network, random, tasty, tasty-golden
-     , transformers
+     , language-ecmascript, network, network-uri, random, tasty
+     , tasty-golden, transformers
      }:
      mkDerivation {
        pname = "jespresso";
-       version = "1.0.1";
-       sha256 = "0rl4k1vn5q23rjylpyya6dmp6pwdbdvrlxgkczxwy84j9xm665zg";
+       version = "1.0.1.1";
+       sha256 = "0lxkn0zd4y7b36y42hxpfan5jcy910ksl044yvmrk634p7s3996h";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          arrows base bytestring cmdargs data-default-class
          data-default-instances-base HTTP http-encodings hxt hxt-tagsoup
-         language-ecmascript network random
+         language-ecmascript network network-uri random
        ];
        testDepends = [
          arrows base Diff directory filepath hxt tasty tasty-golden
@@ -80459,8 +80453,8 @@ self: {
     ({ mkDerivation, base, mtl, parsers, text, trifecta }:
      mkDerivation {
        pname = "language-thrift";
-       version = "0.1.0.1";
-       sha256 = "11z8lkny9bhbbgchpy3jz1nn867ygqi4rq5vffxqpbj6qq2a8bxk";
+       version = "0.2.0.0";
+       sha256 = "01wvpm4aa222ic8z6wg0wdjyfnkd8gh2kqsda7qfckcyxs9679qw";
        buildDepends = [ base mtl parsers text trifecta ];
        homepage = "https://github.com/abhinav/language-thrift";
        description = "Parser for the Thrift IDL format";
@@ -81198,14 +81192,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-regex" = callPackage
+    ({ mkDerivation, array, base, directory, doctest, filepath, lens
+     , regex-base, regex-posix, template-haskell
+     }:
+     mkDerivation {
+       pname = "lens-regex";
+       version = "0.1.0";
+       sha256 = "0hjizjmvdngxn63gs7x87qidh71aqhvyigrnqlbfjqan76pb6m29";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ array base lens regex-base template-haskell ];
+       testDepends = [ base directory doctest filepath regex-posix ];
+       homepage = "https://github.com/himura/lens-regex";
+       description = "Lens powered regular expression";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lens-simple" = callPackage
     ({ mkDerivation, base, lens-family, lens-family-core
      , lens-family-th, transformers
      }:
      mkDerivation {
        pname = "lens-simple";
-       version = "0.1.0.4";
-       sha256 = "0cr1jghg8dnyclih21zlm9190j2dyl6mwc0gw216l5yj67c5aly3";
+       version = "0.1.0.5";
+       sha256 = "1hn2g9xswfn94m5hxi39jpmdaxm51l231cvqn2a62pr8j6b34839";
        buildDepends = [
          base lens-family lens-family-core lens-family-th transformers
        ];
@@ -81283,10 +81294,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "0.1.0.2";
-       revision = "2";
-       sha256 = "104f1hyd9fp0b0ibqr292bpx8zgmw8gi7m3br2zv8m19rrnwgn4v";
-       editedCabalFile = "fb144e396ba79b4418a347b981356f5d15a1c33179bc8c7c154de7c5cb0d3d4c";
+       version = "0.1.1.2";
+       sha256 = "06k0vvxp8vd43bbslm78lmmmc89q3b9ghwfj0chvaw32m0hd8l0z";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -82405,7 +82414,9 @@ self: {
      mkDerivation {
        pname = "linear";
        version = "1.18.1.1";
+       revision = "2";
        sha256 = "1qgpv6c3q4ljqc3223iyj49piqs9xx58zmnpvg76wkaygsnnzq9p";
+       editedCabalFile = "8c57bd840e0c9ab84b032d65a2a48ed6d20da4fb780f0d89d8c53adccc632ba4";
        buildDepends = [
          adjunctions base binary bytes cereal containers deepseq
          distributive ghc-prim hashable lens reflection semigroupoids
@@ -82455,13 +82466,13 @@ self: {
      }) {};
 
   "linear-grammar" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, quickcheck-instances }:
+    ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "linear-grammar";
-       version = "0.0.0.5";
-       sha256 = "0cw0w1fz3m2kwnbff543h5as9zvl66y1ry1q3ppvy9lc409570ry";
-       buildDepends = [ base ];
-       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       version = "0.0.1.6";
+       sha256 = "05mzxv1ixdxirmm31jqwd8w749dpy113pyw1mfr6ck3ksva5g1ap";
+       buildDepends = [ base QuickCheck ];
+       testDepends = [ base hspec QuickCheck ];
        description = "A simple grammar for building linear equations and inclusive inequalities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -87952,14 +87963,19 @@ self: {
      }) {};
 
   "mockery" = callPackage
-    ({ mkDerivation, base, directory, hspec, logging-facade, temporary
+    ({ mkDerivation, base, bytestring, directory, filepath, hspec
+     , logging-facade, temporary
      }:
      mkDerivation {
        pname = "mockery";
-       version = "0.2.0";
-       sha256 = "18a9zz964crhjb1xdzv38pwg458lxajhvjpqd08klb1w7kh57hlj";
-       buildDepends = [ base directory logging-facade temporary ];
-       testDepends = [ base directory hspec logging-facade temporary ];
+       version = "0.3.0";
+       sha256 = "1k9ywdamdl1c8nvp4yrjmqpbis1nqj9p9cim5rh72n9w5h3qaa6x";
+       buildDepends = [
+         base bytestring directory filepath logging-facade temporary
+       ];
+       testDepends = [
+         base bytestring directory filepath hspec logging-facade temporary
+       ];
        description = "Support functions for automated testing";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -90102,13 +90118,16 @@ self: {
      mkDerivation {
        pname = "mueval";
        version = "0.9.1.1";
+       revision = "2";
        sha256 = "0p9qf8lb3c1y87qpl9b4n6v6bjrb9fw3yfg4p7niqdz31454d2pz";
+       editedCabalFile = "26147e2bbac6b9afea949ab81c6072fc89bbff6b7e6678f3ce57c77d26264832";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base Cabal containers directory extensible-exceptions filepath hint
          mtl process show simple-reflect unix utf8-string
        ];
+       jailbreak = true;
        homepage = "https://github.com/gwern/mueval";
        description = "Safely evaluate pure Haskell expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -90341,12 +90360,12 @@ self: {
      }) {};
 
   "multiset-comb" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, containers, transformers }:
      mkDerivation {
        pname = "multiset-comb";
-       version = "0.2.3";
-       sha256 = "0qkl6csnl1g6wbsyxirdq8hdbbbkp3dfsjix76yx242wdyh1j6pq";
-       buildDepends = [ base ];
+       version = "0.2.4";
+       sha256 = "0j7vxm67aws7dzlmdkvx2aja888jp22qdzz8hgmhvbpcr4p7lz99";
+       buildDepends = [ base containers transformers ];
        description = "Combinatorial algorithms over multisets";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91174,6 +91193,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "namelist" = callPackage
+    ({ mkDerivation, base, case-insensitive, data-default-class, parsec
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "namelist";
+       version = "0.1.0";
+       sha256 = "0sfiqd1dh3frzwnqz4fjh0wg8m55cprqw8ywvcaszrp5gq3mj74s";
+       buildDepends = [ base case-insensitive data-default-class parsec ];
+       testDepends = [
+         base case-insensitive QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://github.com/philopon/namelist-hs";
+       description = "fortran90 namelist parser/pretty printer";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "names" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -94305,8 +94341,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "old-version";
-       version = "1.0.1";
-       sha256 = "1h5kln84658036sqap9fxxj464gmw8i6dqiba52577055apl62xv";
+       version = "1.1.0";
+       sha256 = "1vlh6wz9khcamlb5pv5gy5bss7bws7b92j8kkyqf6cp22x4dxdlc";
        buildDepends = [ base ];
        jailbreak = true;
        description = "Basic versioning library";
@@ -95846,6 +95882,22 @@ self: {
        license = "unknown";
      }) {};
 
+  "pagure-hook-receiver" = callPackage
+    ({ mkDerivation, base, containers, scotty, shelly, text
+     , transformers, unix
+     }:
+     mkDerivation {
+       pname = "pagure-hook-receiver";
+       version = "0.1.0.0";
+       sha256 = "0qnnkxcad4843v6c1fqqkiip6cv82q5fckpn5v40sw2p9xk3lkcl";
+       buildDepends = [
+         base containers scotty shelly text transformers unix
+       ];
+       homepage = "https://pagure.io/pagure-hook-receiver";
+       description = "Receive hooks from pagure and do things with them";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "palette" = callPackage
     ({ mkDerivation, array, base, colour, containers }:
      mkDerivation {
@@ -103299,8 +103351,8 @@ self: {
      }:
      mkDerivation {
        pname = "quantfin";
-       version = "0.1.0.2";
-       sha256 = "1m6208c8gxbm95a99kk0chh62bk2zb1fmwrdd7fwl7zpwzr8iany";
+       version = "0.2.0.0";
+       sha256 = "0s9wmkngz31wrllffk3i8y66f60liajwhapih7mnriyfvqqsb6ra";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -103613,6 +103665,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "quickcheck-simple" = callPackage
+    ({ mkDerivation, base, QuickCheck }:
+     mkDerivation {
+       pname = "quickcheck-simple";
+       version = "0.0.1.0";
+       sha256 = "04r5nqm7g5wp13k6d109yykky9i121f65bxlv5ji5sk35yp650c4";
+       buildDepends = [ base QuickCheck ];
+       description = "Test properties and default-mains for QuickCheck";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "quickcheck-unicode" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
@@ -104225,14 +104288,14 @@ self: {
      }:
      mkDerivation {
        pname = "range";
-       version = "0.1.0.1";
-       sha256 = "04nzxjgjnql6bq30pkkmlxcj0cxmw3hlzb6y1fhb052rxmpaq8mk";
+       version = "0.1.1.0";
+       sha256 = "1cqy6lz7mr0n2zrrn9qxvgp8q7yj0drri1885m1crmvx4xd1dfp2";
        buildDepends = [ base parsec ];
        testDepends = [
          base Cabal QuickCheck random test-framework
          test-framework-quickcheck2
        ];
-       jailbreak = true;
+       homepage = "https://bitbucket.org/robertmassaioli/range";
        description = "This has a bunch of code for specifying and managing ranges in your code";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104942,20 +105005,15 @@ self: {
      }) {};
 
   "record" = callPackage
-    ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest
-     , filepath, template-haskell, text, transformers
+    ({ mkDerivation, base, base-prelude, basic-lens, template-haskell
      }:
      mkDerivation {
        pname = "record";
-       version = "0.3.1.2";
-       sha256 = "02kpi21l2kwysk8qgxgl10ngqnmc0mx50qxf9jq0fmi8rv3fm9xp";
-       buildDepends = [
-         attoparsec base base-prelude template-haskell text transformers
-       ];
-       testDepends = [ base base-prelude directory doctest filepath ];
-       jailbreak = true;
+       version = "0.4.0.0";
+       sha256 = "0ml0rmqscdkp4zp430q206lrnah3j5d4bbra7ka526gagmrvpnmb";
+       buildDepends = [ base base-prelude basic-lens template-haskell ];
        homepage = "https://github.com/nikita-volkov/record";
-       description = "First class records implemented with quasi-quotation";
+       description = "Anonymous records";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -104998,6 +105056,46 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "record-preprocessor" = callPackage
+    ({ mkDerivation, base, base-prelude, conversion, conversion-text
+     , record-syntax, text
+     }:
+     mkDerivation {
+       pname = "record-preprocessor";
+       version = "0.1.0.0";
+       sha256 = "0ign3zvpnz4zrzfqglf34xbcrb21dq8hyzwkzlq9y26r9g3nmbd5";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base base-prelude conversion conversion-text record-syntax text
+       ];
+       homepage = "https://github.com/nikita-volkov/record-preprocessor";
+       description = "Compiler preprocessor introducing a syntactic extension for anonymous records";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "record-syntax" = callPackage
+    ({ mkDerivation, base, base-prelude, conversion, conversion-text
+     , directory, doctest, filepath, haskell-src-exts, hspec, parsec
+     , record, template-haskell, text, transformers
+     }:
+     mkDerivation {
+       pname = "record-syntax";
+       version = "0.1.0.0";
+       sha256 = "115z96ific9n3612yzkfmj7hxnbjc8xjz5nmfiddklx9zjih7h40";
+       buildDepends = [
+         base base-prelude conversion conversion-text haskell-src-exts
+         parsec record template-haskell text transformers
+       ];
+       testDepends = [
+         base base-prelude directory doctest filepath hspec record
+       ];
+       jailbreak = true;
+       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;
+     }) {};
+
   "records" = callPackage
     ({ mkDerivation, base, kinds, type-functions }:
      mkDerivation {
@@ -107630,6 +107728,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "riemann" = callPackage
+    ({ mkDerivation, base, cereal, containers, data-default, either
+     , errors, HUnit, lens, network, protobuf, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, time, transformers
+     }:
+     mkDerivation {
+       pname = "riemann";
+       version = "0.1.0.1";
+       sha256 = "0d36ff839g7y1lm8dg5j5s1vdxr1hqbyjxh7gsfjca00a0cgy5xa";
+       buildDepends = [
+         base cereal containers data-default either errors lens network
+         protobuf text time transformers
+       ];
+       testDepends = [
+         base either errors HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 transformers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/telser/riemann-hs";
+       description = "A Riemann client for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "riff" = callPackage
     ({ mkDerivation, base, binary, bytestring, either, filepath
      , transformers
@@ -110562,8 +110684,8 @@ self: {
      }:
      mkDerivation {
        pname = "second-transfer";
-       version = "0.5.3.1";
-       sha256 = "1ng3a384y3hsm6xgw8mhchkgz8xdgrk35b44lbifdfilcmmq7nrv";
+       version = "0.5.3.2";
+       sha256 = "0qc6xm7c37n2r9xnqc6njkm2d8lkwmripcr3q1q4m7q97qsvjbdl";
        buildDepends = [
          attoparsec base base16-bytestring binary bytestring conduit
          containers exceptions hashable hashtables hslogger http2 lens
@@ -112310,8 +112432,8 @@ self: {
     ({ mkDerivation, base, containers, text, unix }:
      mkDerivation {
        pname = "shell-monad";
-       version = "0.6.3";
-       sha256 = "0wfn1zwbqzwvbvh1x28rpgsvn8i2ff5r6v4i5kriiw025vdb5r2v";
+       version = "0.6.4";
+       sha256 = "1wmihv2x4pbz9bkrjyyh4hqwsdmlldmyi5jlgxx6ry6z3jyx9i13";
        buildDepends = [ base containers text unix ];
        description = "shell monad";
        license = stdenv.lib.licenses.bsd3;
@@ -113124,8 +113246,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-sendfile";
-       version = "0.2.20";
-       sha256 = "0fzxlj3nmlj9nyzl4ygn6q2rgwvcgjpkypp6cpka64bhqfrgqyb3";
+       version = "0.2.21";
+       sha256 = "0xzxcz60gl22w3rxjvw0s6js0g5mi6as1n48gl37dv4lbrn9s8v1";
        buildDepends = [ base bytestring network unix ];
        testDepends = [
          base bytestring conduit conduit-extra directory hspec HUnit network
@@ -115141,8 +115263,8 @@ self: {
      }:
      mkDerivation {
        pname = "snaplet-sass";
-       version = "0.1.0.0";
-       sha256 = "0wv9a7pa6r7nzgppbywasqy38zk79ann2ivwyyh2b9dny95mx5yd";
+       version = "0.1.1.0";
+       sha256 = "05vif2rz0dj2b3vm0yh0bwj234xjnjpiaf2fk8vlv00jirgrdr40";
        buildDepends = [
          base bytestring configurator directory filepath mtl process snap
          snap-core transformers
@@ -116234,8 +116356,8 @@ self: {
      }:
      mkDerivation {
        pname = "species";
-       version = "0.3.2.4";
-       sha256 = "1ka5pd876iddaah9ay2ihcifhfh0f5rd19bn6yh42wlx6mdarfbq";
+       version = "0.3.3";
+       sha256 = "0cy6l4gvzydl9k2ijxkxhr6jqjbf85z71v6zrvbdajc3xip99w6i";
        buildDepends = [
          base containers multiset-comb np-extras numeric-prelude
          template-haskell
@@ -124752,8 +124874,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "tip-lib";
-       version = "0.1.1";
-       sha256 = "0xvsr6hh7r6y82linkpvbby6jkxw744y3mh82kma4cbpwc84gxhi";
+       version = "0.1.2";
+       sha256 = "01x8hpijgx3fd0svp0di02470xnhq1gaa6k2fxjph9g5rzmx076b";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -125898,22 +126020,21 @@ test/package-dump/ghc-7.10.txt";
      }) {};
 
   "trurl" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, hastache
-     , http-conduit, MissingH, scientific, tar, tasty, tasty-hunit, text
-     , unordered-containers
+    ({ mkDerivation, aeson, base, bytestring, directory, filemanip
+     , hastache, http-conduit, MissingH, scientific, tar, tasty
+     , tasty-hunit, text, unordered-containers
      }:
      mkDerivation {
        pname = "trurl";
-       version = "0.1.0.0";
-       sha256 = "0lq4x3vkif6sldcw07llmhwixgk1x2bfyzi0zq32jardp7ah0rc5";
+       version = "0.2.0.0";
+       sha256 = "167f7wrvrva7764z35l48rxbcnnajm343gqw2b67jh14d5kj6fz9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson base bytestring directory hastache http-conduit MissingH
-         scientific tar text unordered-containers
+         aeson base bytestring directory filemanip hastache http-conduit
+         MissingH scientific tar text unordered-containers
        ];
        testDepends = [ base hastache tasty tasty-hunit ];
-       jailbreak = true;
        homepage = "http://github.com/dbushenko/trurl";
        description = "Haskell template code generator";
        license = stdenv.lib.licenses.bsd3;
@@ -126062,12 +126183,12 @@ test/package-dump/ghc-7.10.txt";
      }) {};
 
   "tubes" = callPackage
-    ({ mkDerivation, base, free, mtl, transformers }:
+    ({ mkDerivation, base, comonad, free, mtl, transformers }:
      mkDerivation {
        pname = "tubes";
-       version = "0.1.0.0";
-       sha256 = "0xfpvffwp9nqkgc0j6qx6fkliaynhr8zvwzgg02y791hkjbn629k";
-       buildDepends = [ base free mtl transformers ];
+       version = "0.2.1.0";
+       sha256 = "1j1pzsmr4djjvhmix6ffsapm30lv4iim1jvcq454r1kxi0yid76z";
+       buildDepends = [ base comonad free mtl transformers ];
        homepage = "https://github.com/gatlin/tubes";
        description = "Effectful, iteratee-inspired stream processing based on a free monad";
        license = stdenv.lib.licenses.gpl3;
@@ -127573,7 +127694,9 @@ test/package-dump/ghc-7.10.txt";
      mkDerivation {
        pname = "uhc-light";
        version = "1.1.9.0";
+       revision = "1";
        sha256 = "0dqb0054nbl5qfxrg7g4yvmiawp9ladlws26cdf32jxrm31wgmkj";
+       editedCabalFile = "8847b4a41a2f6c9be09cf7b4835f53219522da9ef0ca26b918159fec747bd938";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -127581,7 +127704,6 @@ test/package-dump/ghc-7.10.txt";
          hashable mtl network old-locale primitive process syb transformers
          uhc-util uulib vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/UU-ComputerScience/uhc";
        description = "Part of UHC packaged as cabal/hackage installable library";
        license = stdenv.lib.licenses.bsd3;
@@ -128827,8 +128949,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.1.4";
-       sha256 = "19ryx71hyv1jg24yn19nfn6x1956a3a8bjhbdl4fnjnln3h7xkmv";
+       version = "0.1.5";
+       sha256 = "0pl00n40b1nc3rnvayk8jz9lgv0s1lp33czyg962jdbffwhqgszj";
        buildDepends = [ attoparsec base blaze-builder bytestring ];
        testDepends = [
          attoparsec base blaze-builder bytestring derive HUnit lens
@@ -131599,8 +131721,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "wai-middleware-crowd";
-       version = "0.1.1.1";
-       sha256 = "1lkdjfp7aq61hzh9y13bqk9qgfr6s3m7n13ar73gjv5k2g97fizj";
+       version = "0.1.1.2";
+       sha256 = "039vqcy16ww7cigzppl0lnmjwbvxdv0z0zq3rnklh334lyh5jfay";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -131708,6 +131830,26 @@ test/package-dump/ghc-7.10.txt";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wai-middleware-metrics" = callPackage
+    ({ mkDerivation, base, bytestring, ekg-core, http-types, QuickCheck
+     , scotty, tasty, tasty-hunit, tasty-quickcheck, time, transformers
+     , wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "wai-middleware-metrics";
+       version = "0.2.0";
+       sha256 = "0vqpp7fqjmhknvmizvbzzay3ixk0a5jqq9y80al62hc2yb75pz0w";
+       buildDepends = [ base ekg-core http-types time wai ];
+       testDepends = [
+         base bytestring ekg-core http-types QuickCheck scotty tasty
+         tasty-hunit tasty-quickcheck time transformers wai wai-extra
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/Helkafen/wai-middleware-metrics";
+       description = "A WAI middleware to collect EKG request metrics";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wai-middleware-preprocessor" = callPackage
     ({ mkDerivation, base, Cabal, directory, mtl, split, text, wai
      , wai-middleware-static, warp

From cd7b1ca0002b393a7fe00b36506a402fbc9432ac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 12 Jun 2015 15:02:39 +0200
Subject: [PATCH 1116/2322] haskell-configuration-ghc-7.8.x: drop obsolete
 override for 'equivalence'

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 -
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix  | 1 -
 2 files changed, 2 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 28c74f61925..f2e0fb056e7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -225,7 +225,6 @@ self: super: {
   cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0;
   containers_0_4_2_1 = markBroken super.containers_0_4_2_1;
   control-monad-free_0_5_3 = markBroken super.control-monad-free_0_5_3;
-  equivalence_0_2_5 = markBroken super.equivalence_0_2_5;
   haddock-api_2_15_0_2 = markBroken super.haddock-api_2_15_0_2;
   optparse-applicative_0_10_0 = markBroken super.optparse-applicative_0_10_0;
   QuickCheck_1_2_0_1 = markBroken super.QuickCheck_1_2_0_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 4fbb5056837..9696ccddcc5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -59,7 +59,6 @@ self: super: {
 
   # Newer versions require mtl 2.2.x.
   mtl-prelude = self.mtl-prelude_1_0_3;
-  equivalence = super.equivalence_0_2_5;        # required by Agda
 
   # purescript requires mtl 2.2.x.
   purescript = overrideCabal (super.purescript.overrideScope (self: super: {

From 5fae046771a5166430669816a88f7c27dfbecf88 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 13 Jun 2015 00:30:46 +0200
Subject: [PATCH 1117/2322] darcs: remove all run-time dependencies on GHC and
 other Haskell libraries

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1bec97f066..8fedb29ee59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10721,7 +10721,10 @@ let
   darcs = haskell.lib.overrideCabal 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 ea3382bb69e542b7af7cdc1407abd9e0dc757c68 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 13 Jun 2015 11:09:38 +0200
Subject: [PATCH 1118/2322] haskell-record doesn't pass the Haddock phase.

---
 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 52a0e29c7d4..d42c05fad28 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -166,6 +166,7 @@ self: super: {
   types-compat = dontHaddock super.types-compat;                # https://github.com/philopon/apiary/issues/15
   wai-test = dontHaddock super.wai-test;
   zlib-conduit = dontHaddock super.zlib-conduit;
+  record = dontHaddock super.record;                            # https://github.com/nikita-volkov/record/issues/22
 
   # Jailbreak doesn't get the job done because the Cabal file uses conditionals a lot.
   darcs = (overrideCabal super.darcs (drv: {

From 3754de550f8cb0d1b8f79b40d2865db07c8cdf53 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 13 Jun 2015 15:00:43 +0200
Subject: [PATCH 1119/2322] nixos/grub: allow customization of the nix store
 path

---
 nixos/modules/system/boot/loader/grub/grub.nix        | 10 ++++++++++
 nixos/modules/system/boot/loader/grub/install-grub.pl |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 0b6333ab573..e7494161cb3 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -36,6 +36,7 @@ let
       grubEfi = f grubEfi;
       grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else "";
       bootPath = args.path;
+      storePath = config.boot.loader.grub.storePath;
       efiSysMountPoint = if args.efiSysMountPoint == null then args.path else args.efiSysMountPoint;
       inherit (args) devices;
       inherit (efi) canTouchEfiVariables;
@@ -163,6 +164,15 @@ in
         '';
       };
 
+      storePath = mkOption {
+        default = "/nix/store";
+        type = types.str;
+        description = ''
+          Path to the Nix store when looking for kernels at boot.
+          Only makes sense when copyKernels is false.
+        '';
+      };
+
       extraPrepareConfig = mkOption {
         default = "";
         type = types.lines;
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index fcf5871203d..9db6249c450 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -55,6 +55,7 @@ my $fsIdentifier = get("fsIdentifier");
 my $grubEfi = get("grubEfi");
 my $grubTargetEfi = get("grubTargetEfi");
 my $bootPath = get("bootPath");
+my $storePath = get("storePath");
 my $canTouchEfiVariables = get("canTouchEfiVariables");
 my $efiSysMountPoint = get("efiSysMountPoint");
 $ENV{'PATH'} = get("path");
@@ -210,7 +211,7 @@ sub GrubFs {
 my $grubBoot = GrubFs($bootPath);
 my $grubStore;
 if ($copyKernels == 0) {
-    $grubStore = GrubFs("/nix/store");
+    $grubStore = GrubFs($storePath);
 }
 
 # Generate the header.

From c3e832b323deced79b49ecf42a06714e2aa661e9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 13 Jun 2015 15:02:41 +0200
Subject: [PATCH 1120/2322] stage-1: mkdir -p /mnt-root, it may be created
 earlier by some hooks

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

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 5af644279e5..e8d276920a8 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -317,7 +317,7 @@ mountFS() {
 
 
 # Try to find and mount the root device.
-mkdir /mnt-root
+mkdir -p $targetRoot
 
 exec 3< @fsInfo@
 

From 481a764f8f860dde4d664ec9d83724fd4a9631e6 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 13 Jun 2015 15:22:47 +0200
Subject: [PATCH 1121/2322] dconf-editor: fix icons on non-nixos

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

diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
index 06c01d305f8..e69bcd39032 100644
--- a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
     sha256 = "0vl5ygbh8blbk3710w34lmhxxl4g275vzpyhjsq0016c597isp88";
   };
 
-  buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
+  buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
                   intltool docbook_xsl docbook_xsl_ns makeWrapper gnome3.dconf ];
 
   preFixup = ''
     wrapProgram "$out/bin/dconf-editor" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {

From ccb32c96c4f00f5296e697e7c316f8a72e216355 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 13 Jun 2015 15:27:42 +0200
Subject: [PATCH 1122/2322] gnome-bluetooth: fix icons on non-nixos

---
 .../gnome-3/3.16/core/gnome-bluetooth/default.nix     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
index ab8f380f672..5b7d7c19d29 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, gnome3, pkgconfig, intltool, glib
-, udev, itstool, libxml2 }:
+, udev, itstool, libxml2, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "gnome-bluetooth-${gnome3.version}.1";
@@ -9,8 +9,13 @@ stdenv.mkDerivation rec {
     sha256 = "12z0792j5ln238ajhgqx5jrm34wz2yqbbskhlp23p9c0cwnj1srz";
   };
 
-  buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2
-                               gsettings_desktop_schemas itstool ];
+  buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme
+                               makeWrapper gsettings_desktop_schemas itstool ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/bluetooth-sendto" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;

From 5ee56b642401349960d2691cfa838e69e6324733 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 13 Jun 2015 08:33:51 -0500
Subject: [PATCH 1123/2322] julia03: fix evaluation on x86_64-darwin

---
 pkgs/development/compilers/julia/0.3.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 42b296c7b85..4566752340f 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -127,10 +127,6 @@ stdenv.mkDerivation rec {
     "-lz"
   ];
 
-  preConfigure = ''
-    export PATH="$PATH:${stdenv.cc.libc}/sbin"
-  '';
-
   dontStrip = true;
   dontPatchELF = true;
 

From 9f5b9de5595534d52d278de9d3d2781c63ea0a31 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 13 Jun 2015 16:13:52 +0200
Subject: [PATCH 1124/2322] hplip 3.15.4 -> 3.15.6

---
 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 8558d1f7dee..09fa67d7dcd 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -6,11 +6,11 @@
 
 let
 
-  name = "hplip-3.15.4";
+  name = "hplip-3.15.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "0s1yiifp002n8qy0i4cv6j0hq9ikp4jabki5w3xzlaqgd4bjz1x3";
+    sha256 = "1jbnjw7vrn1qawrjfdv8j58w69q8ki1qkzvlh0nk8nxacpp17i9h";
   };
 
   hplip_state =
@@ -31,7 +31,7 @@ let
 
   plugin = fetchurl {
     url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "00zhaq48m7p6nrxfy16086hzghf2pfr32s53sndbpp2514v2j392";
+    sha256 = "1rymxahz12s1s37rri5qyvka6q0yi0yai08kgspg24176ry3a3fx";
   };
 
 in

From c8c15ba95d2250a4047428fa1235cb3b2660fe1d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 13 Jun 2015 16:34:01 +0200
Subject: [PATCH 1125/2322] stress-ng -> 0.04.06

- stess-sysfs: Do not read sysfs files when running as root
---
 pkgs/tools/system/stress-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index 2a0b2816ba7..af09b7af030 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, attr }:
 
-let version = "0.04.05"; in
+let version = "0.04.06"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "1xj3rrcvpjl3sgvl22m0bdrkscxxnipzh4s1ivmrifw7lq2zq1kg";
+    sha256 = "1iwl16gzxl1gq7gkn6pwhk6ss641n11wgf37yd47jcdr5pac6z9s";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 

From 64a507bd9b5d29cb72ddc37c4e366c2708dcbba6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 12 Jun 2015 19:32:11 -0500
Subject: [PATCH 1126/2322] plasma53.plasma-workspace: fix missing paths

---
 pkgs/desktops/plasma-5.3/default.nix          | 22 ++++++++--------
 .../0001-startkde-NixOS-patches.patch         | 26 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index c4fb624a377..39ccb4e3c30 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -12,7 +12,7 @@
 #  make a copy of this directory first. After copying, be sure to delete ./tmp
 #  if it exists. Then follow the minor update instructions.
 
-{ autonix, kf5, pkgs, qt5, stdenv, debug ? false }:
+{ autonix, kf5, kdeApps, pkgs, qt5, stdenv, debug ? false }:
 
 with stdenv.lib; with autonix;
 
@@ -143,19 +143,19 @@ let
       };
 
       plasma-workspace = with pkgs; super.plasma-workspace // {
-        patches = [
-          (substituteAll {
-            src = ./plasma-workspace/0001-startkde-NixOS-patches.patch;
-            inherit (pkgs) bash gnused gnugrep socat;
-            inherit (kf5) kconfig kinit kservice;
-            inherit (pkgs.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
-            qt5tools = qt5.tools;
-            dbus_tools = pkgs.dbus.tools;
-          })
-        ];
+        patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ];
         buildInputs = with xlibs;
           super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ];
+
+        inherit (pkgs) bash gnused gnugrep socat;
+        inherit (kf5) kconfig kinit kservice;
+        inherit (pkgs.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
+        kde_workspace = kdeApps.kde-workspace;
+        qt5tools = qt5.tools;
+        dbus_tools = pkgs.dbus.tools;
+
         postPatch = ''
+          substituteAllInPlace startkde/startkde.cmake
           substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
             --replace kdostartupconfig5 $out/bin/kdostartupconfig5
         '';
diff --git a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
index a542fb7b87d..86c6dd857be 100644
--- a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
+++ b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
@@ -1,14 +1,14 @@
-From 37abdee4e25f6aff55da838864d1a67a7be758ad Mon Sep 17 00:00:00 2001
+From ff61c8ba856328a60e29938466b69d0bb38a357f Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
 Date: Tue, 2 Jun 2015 11:21:43 -0500
 Subject: [PATCH] startkde: NixOS patches
 
 ---
- startkde/startkde.cmake | 214 ++++++++++++++++++++----------------------------
- 1 file changed, 87 insertions(+), 127 deletions(-)
+ startkde/startkde.cmake | 218 ++++++++++++++++++++----------------------------
+ 1 file changed, 89 insertions(+), 129 deletions(-)
 
 diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 24e5c1b..787d719 100644
+index 24e5c1b..e7bdd32 100644
 --- a/startkde/startkde.cmake
 +++ b/startkde/startkde.cmake
 @@ -1,8 +1,31 @@
@@ -93,7 +93,7 @@ index 24e5c1b..787d719 100644
  
  #This is basically setting defaults so we can use them with kstartupconfig5
  cat >$configDir/startupconfigkeys <<EOF
-@@ -106,53 +111,19 @@ toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0
+@@ -106,55 +111,21 @@ toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0
  EOF
  }
  
@@ -148,9 +148,12 @@ index 24e5c1b..787d719 100644
  if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
 -    @EXPORT_XCURSOR_PATH@
  
-     kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+-    kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
++    @kde_workspace@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
      if test $? -eq 10; then
-@@ -168,15 +139,33 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
+         XCURSOR_THEME=breeze_cursors
+         export XCURSOR_THEME
+@@ -168,21 +139,39 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
      fi
  fi
  
@@ -175,7 +178,7 @@ index 24e5c1b..787d719 100644
 +# Make sure that D-Bus is running
 +# D-Bus autolaunch is broken
 +if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-+    eval `@dbus_tools@/dbus-launch --sh-syntax --exit-with-session`
++    eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
 +fi
 +if @qt5tools@/bin/qdbus >/dev/null 2>/dev/null; then
 +    : # ok
@@ -189,6 +192,13 @@ index 24e5c1b..787d719 100644
  ksplash_pid=
  if test -z "$dl"; then
    # the splashscreen and progress indicator
+   case "$ksplashrc_ksplash_engine" in
+     KSplashQML)
+-      ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid`
++      ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid`
+       ;;
+     None)
+       ;;
 @@ -205,8 +194,7 @@ fi
  # For anything else (that doesn't set env vars, or that needs a window manager),
  # better use the Autostart folder.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8fedb29ee59..000027a9125 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13846,6 +13846,7 @@ let
 
   plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 {
     kf5 = kf510;
+    kdeApps = kdeApps_15_04;
   });
   plasma5_latest = plasma53;
   plasma5_stable = plasma53;

From af6c270b6df187ca123d54cf28955341854fedd3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 8 Jun 2015 09:25:58 -0500
Subject: [PATCH 1127/2322] pinentry: find moc when qt4 enabled

---
 pkgs/tools/security/pinentry/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 757959f5345..b4ff0b77f38 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libcap gtk2 ncurses qt4 ];
 
+  # configure cannot find moc on its own
+  preConfigure = stdenv.lib.optionalString (qt4 != null) ''
+    export QTDIR="${qt4}"
+    export MOC="${qt4}/bin/moc"
+  '';
+
   configureFlags = [
     (mkWith   (libcap != null)  "libcap")
     (mkWith   (hasX)            "x")
@@ -36,8 +42,9 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.all;
     longDescription = ''
-      Pinentry provides a console and a GTK+ GUI that allows users to
-      enter a passphrase when `gpg' or `gpg2' is run and needs it.
+      Pinentry provides a console and (optional) GTK+ and Qt GUIs allowing users
+      to enter a passphrase when `gpg' or `gpg2' is run and needs it.
     '';
+    maintainers = [ stdenv.lib.maintainers.ttuegel ];
   };
 }

From 95b02f6459c9812a8d68a24ae92171667158ab14 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 13 Jun 2015 10:11:01 -0500
Subject: [PATCH 1128/2322] kf510.kinit: fix library path

---
 .../libraries/kde-frameworks-5.10/default.nix |  2 +-
 ...libpath.patch => 0001-kinit-libpath.patch} | 22 ++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)
 rename pkgs/development/libraries/kde-frameworks-5.10/kinit/{kinit-libpath.patch => 0001-kinit-libpath.patch} (72%)

diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix
index 4423f9c157d..f4c98c7da33 100644
--- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix
@@ -178,7 +178,7 @@ let
           + " -I${ilmbase}/include/OpenEXR";
       };
 
-      kinit = super.kinit // { patches = [ ./kinit/kinit-libpath.patch ]; };
+      kinit = super.kinit // { patches = [ ./kinit/0001-kinit-libpath.patch ]; };
 
       kpackage = super.kpackage // { patches = [ ./kpackage/0001-allow-external-paths.patch ]; };
 
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.10/kinit/0001-kinit-libpath.patch
similarity index 72%
rename from pkgs/development/libraries/kde-frameworks-5.10/kinit/kinit-libpath.patch
rename to pkgs/development/libraries/kde-frameworks-5.10/kinit/0001-kinit-libpath.patch
index a6ccb2085d3..9c76079a382 100644
--- a/pkgs/development/libraries/kde-frameworks-5.10/kinit/kinit-libpath.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.10/kinit/0001-kinit-libpath.patch
@@ -1,8 +1,17 @@
+From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sat, 13 Jun 2015 08:57:55 -0500
+Subject: [PATCH] kinit libpath
+
+---
+ src/kdeinit/kinit.cpp | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
 diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
-index 3c3c913..f510620 100644
+index 9e775b6..0ac5646 100644
 --- a/src/kdeinit/kinit.cpp
 +++ b/src/kdeinit/kinit.cpp
-@@ -652,15 +652,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
+@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
          if (!libpath.isEmpty()) {
              if (!l.load()) {
                  if (libpath_relative) {
@@ -15,10 +24,10 @@ index 3c3c913..f510620 100644
 -                    libpath = install_lib_dir + libpath;
 -                    l.setFileName(libpath);
 +                  // Use QT_PLUGIN_PATH to find shared library directories
-+                  // For KF5, the plugin path is /lib/plugins, so the kdeinit5
-+                  // shared libraries should be in /lib/plugins/../
++                  // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5
++                  // shared libraries should be in /lib/qt5/plugins/../../
 +                  const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
-+                  const QString up = QString::fromLocal8Bit("/../");
++                  const QString up = QString::fromLocal8Bit("/../../");
 +                  const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
 +                  Q_FOREACH (const QString &path, paths) {
 +                    l.setFileName(path + up + libpath);
@@ -28,3 +37,6 @@ index 3c3c913..f510620 100644
                  }
              }
              if (!l.isLoaded()) {
+-- 
+2.4.2
+

From 2434ee4aab06d2c6a5835bbc5a0e49cc78949429 Mon Sep 17 00:00:00 2001
From: Oliver Matthews <oliver@codersoffortune.net>
Date: Sat, 13 Jun 2015 15:14:47 +0000
Subject: [PATCH 1129/2322] Allow setting mediatomb interface

---
 nixos/modules/services/misc/mediatomb.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix
index 3f70bceb23b..40ec2831ff0 100644
--- a/nixos/modules/services/misc/mediatomb.nix
+++ b/nixos/modules/services/misc/mediatomb.nix
@@ -230,6 +230,13 @@ in {
         '';
       };
 
+      interface = mkOption {
+        default = "";
+        description = ''
+          A specific interface to bind to.
+        '';
+      };
+
       uuid = mkOption {
         default = "fdfc8a4e-a3ad-4c1d-b43d-a2eedb03a687";
         description = ''
@@ -256,7 +263,7 @@ in {
       after = [ "local-fs.target" "network.target" ];
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.mediatomb ];
-      serviceConfig.ExecStart = "${pkgs.mediatomb}/bin/mediatomb -p ${toString cfg.port} ${if cfg.customCfg then "" else "-c ${mtConf}"} -m ${cfg.dataDir}";
+      serviceConfig.ExecStart = "${pkgs.mediatomb}/bin/mediatomb -p ${toString cfg.port} ${if cfg.interface!="" then "-e ${cfg.interface}" else ""} ${if cfg.customCfg then "" else "-c ${mtConf}"} -m ${cfg.dataDir}";
       serviceConfig.User = "${cfg.user}";
     };
 

From 354e5af036826e89732399929a3d53e4a69642f7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 13 Jun 2015 10:28:42 -0700
Subject: [PATCH 1130/2322] Revert "perl: Don't use builtin zlib and bzip2"

This reverts commit 86f9f5d128306a37649cf13a687b231df18a03ca.
---
 pkgs/development/interpreters/perl/5.20/default.nix | 9 ++-------
 pkgs/development/interpreters/perl/5.22/default.nix | 7 +------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix
index 700616dd4eb..7651bc15f46 100644
--- a/pkgs/development/interpreters/perl/5.20/default.nix
+++ b/pkgs/development/interpreters/perl/5.20/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bzip2, zlib, enableThreading ? stdenv ? glibc }:
+{ stdenv, fetchurl, enableThreading ? stdenv ? glibc }:
 
 # We can only compile perl with threading on platforms where we have a
 # real glibc in the stdenv.
@@ -35,12 +35,7 @@ stdenv.mkDerivation rec {
       ./perl-5.20.2-gcc5_fixes-1.patch
     ]
     ++ optional stdenv.isSunOS ./ld-shared.patch
-    ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ];
-
-  buildInputs = [ zlib bzip2 ];
-
-  BUILD_ZLIB = "false";
-  BUILD_BZIP2 = "0";
+    ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ;
 
   # Build a thread-safe Perl with a dynamic libperls.o.  We need the
   # "installstyle" option to ensure that modules are put under
diff --git a/pkgs/development/interpreters/perl/5.22/default.nix b/pkgs/development/interpreters/perl/5.22/default.nix
index b7aad858ccf..f9068de1c2c 100644
--- a/pkgs/development/interpreters/perl/5.22/default.nix
+++ b/pkgs/development/interpreters/perl/5.22/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bzip2, zlib, enableThreading ? stdenv ? glibc }:
+{ stdenv, fetchurl, enableThreading ? stdenv ? glibc }:
 
 # We can only compile perl with threading on platforms where we have a
 # real glibc in the stdenv.
@@ -35,11 +35,6 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.isSunOS ./ld-shared.patch
     ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ];
 
-  buildInputs = [ zlib bzip2 ];
-
-  BUILD_ZLIB = "false";
-  BUILD_BZIP2 = "0";
-
   # Build a thread-safe Perl with a dynamic libperls.o.  We need the
   # "installstyle" option to ensure that modules are put under
   # $out/lib/perl5 - this is the general default, but because $out

From fc964a15cbac5d8a3aeda806bf09cbbeab2862f3 Mon Sep 17 00:00:00 2001
From: Siarhei Zirukin <ftrvxmtrx@gmail.com>
Date: Sat, 13 Jun 2015 23:19:04 +0200
Subject: [PATCH 1131/2322] mpg123: 1.19.0 -> 1.22.2

---
 pkgs/applications/audio/mpg123/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 3edb7ae6793..eb1f8f4faa8 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, alsaLib }:
 
-stdenv.mkDerivation {
-  name = "mpg123-1.19.0";
+stdenv.mkDerivation rec {
+  name = "mpg123-1.22.2";
 
   src = fetchurl {
-    url = mirror://sourceforge/mpg123/mpg123-1.19.0.tar.bz2;
-    sha256 = "06xhd68mj9yp0r6l771aq0d7xgnl402a3wm2mvhxmd3w3ph29446";
+    url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
+    sha256 = "0i1phi6fdjas37y00h3j8rb0b8ngr9az6hy5ff5bl53ify3j87kd";
   };
 
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
@@ -16,8 +16,9 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "Command-line MP3 player";
-    homepage = http://mpg123.sourceforge.net/;
-    license = "LGPL";
+    description = "Fast console MPEG Audio Player and decoder library";
+    homepage = http://mpg123.org;
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ];
   };
 }

From 8811724ec9915d1d708d5e4671392623ff25b22f Mon Sep 17 00:00:00 2001
From: Unai Zalakain <unai@gisa-elkartea.org>
Date: Sat, 13 Jun 2015 23:24:19 +0200
Subject: [PATCH 1132/2322] The user specified in the conf should run MPD

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

diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index 06ba4b9b5ac..5515f827b29 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -118,7 +118,7 @@ in {
       preStart = "mkdir -p ${cfg.dataDir} && chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}";
       script = "exec mpd --no-daemon ${mpdConf}";
       serviceConfig = {
-        User = "mpd";
+        User = "${cfg.user}";
         PermissionsStartOnly = true;
       };
     };

From 6fa931421ed02ce6ee5dd13e2f7eccd795216c27 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Fri, 12 Jun 2015 16:31:15 +0100
Subject: [PATCH 1133/2322] add package for django-pipeline

---
 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 703560b7758..f80df2edfcb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4815,6 +4815,26 @@ let
   };
 
 
+  django_pipeline = buildPythonPackage rec {
+    name = "django-pipeline-${version}";
+    version = "1.5.1";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/d/django-pipeline/${name}.tar.gz";
+      md5 = "dff8a4abb2895ee5df335c3fb2775a02";
+      sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha";
+    };
+
+    propagatedBuildInputs = with self; [ django futures ];
+
+    meta = with stdenv.lib; {
+      description = "Pipeline is an asset packaging library for Django.";
+      homepage = https://github.com/cyberdelia/django-pipeline;
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
+
   djblets = buildPythonPackage rec {
     name = "Djblets-0.6.28";
 

From ebde5fd9d48e79b4ee9fabf51440f09d27f3fc5f Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkingod@gmail.com>
Date: Sat, 13 Jun 2015 21:26:50 -0400
Subject: [PATCH 1134/2322] Use the right nix when doing things in our
 amazoninit

---
 nixos/modules/virtualisation/amazon-init.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index c5dfb3643e1..6058a7019e8 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -8,7 +8,7 @@ let
 
     echo "attempting to fetch configuration from user-data..."
 
-    export PATH=${pkgs.nix}/bin:${pkgs.wget}/bin:${pkgs.systemd}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin:${config.system.build.nixos-rebuild}/bin:$PATH
+    export PATH=${config.nix.package}/bin:${pkgs.wget}/bin:${pkgs.systemd}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin:${config.system.build.nixos-rebuild}/bin:$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="$(mktemp)"

From 10e75453b2cc1406d9d53aab46c88025505dd169 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkingod@gmail.com>
Date: Sat, 13 Jun 2015 21:55:29 -0400
Subject: [PATCH 1135/2322] Factor the NixOS channel building code out into its
 own file, so I can use it elsewhere

---
 nixos/lib/make-channel.nix | 31 +++++++++++++++++++++++++++++++
 nixos/release.nix          | 32 +-------------------------------
 2 files changed, 32 insertions(+), 31 deletions(-)
 create mode 100644 nixos/lib/make-channel.nix

diff --git a/nixos/lib/make-channel.nix b/nixos/lib/make-channel.nix
new file mode 100644
index 00000000000..7764527ffa7
--- /dev/null
+++ b/nixos/lib/make-channel.nix
@@ -0,0 +1,31 @@
+{ pkgs, nixpkgs, version, versionSuffix }:
+
+pkgs.releaseTools.makeSourceTarball {
+  name = "nixos-channel";
+
+  src = nixpkgs;
+
+  officialRelease = false; # FIXME: fix this in makeSourceTarball
+  inherit version versionSuffix;
+
+  buildInputs = [ pkgs.nixUnstable ];
+
+  expr = builtins.readFile ./channel-expr.nix;
+
+  distPhase = ''
+    rm -rf .git
+    echo -n $VERSION_SUFFIX > .version-suffix
+    echo -n ${nixpkgs.rev or nixpkgs.shortRev} > .git-revision
+    releaseName=nixos-$VERSION$VERSION_SUFFIX
+    mkdir -p $out/tarballs
+    mkdir ../$releaseName
+    cp -prd . ../$releaseName/nixpkgs
+    chmod -R u+w ../$releaseName
+    ln -s nixpkgs/nixos ../$releaseName/nixos
+    echo "$expr" > ../$releaseName/default.nix
+    NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
+    cd ..
+    chmod -R u+w $releaseName
+    tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName
+  '';
+}
diff --git a/nixos/release.nix b/nixos/release.nix
index 6afcdbff3e1..a8b6d275f1d 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -93,37 +93,7 @@ let
 
 in rec {
 
-  channel =
-    pkgs.releaseTools.makeSourceTarball {
-      name = "nixos-channel";
-
-      src = nixpkgs;
-
-      officialRelease = false; # FIXME: fix this in makeSourceTarball
-      inherit version versionSuffix;
-
-      buildInputs = [ pkgs.nixUnstable ];
-
-      expr = builtins.readFile lib/channel-expr.nix;
-
-      distPhase = ''
-        rm -rf .git
-        echo -n $VERSION_SUFFIX > .version-suffix
-        echo -n ${nixpkgs.rev or nixpkgs.shortRev} > .git-revision
-        releaseName=nixos-$VERSION$VERSION_SUFFIX
-        mkdir -p $out/tarballs
-        mkdir ../$releaseName
-        cp -prd . ../$releaseName/nixpkgs
-        chmod -R u+w ../$releaseName
-        ln -s nixpkgs/nixos ../$releaseName/nixos
-        echo "$expr" > ../$releaseName/default.nix
-        NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
-        cd ..
-        chmod -R u+w $releaseName
-        tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName
-      ''; # */
-    };
-
+  channel = import lib/make-channel.nix { inherit pkgs nixpkgs version versionSuffix; };
 
   manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual);
   manualPDF = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualPDF)).x86_64-linux;

From 2fe7bf8d55d05023e67c94a84950fbc4181fbdbb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jun 2015 11:21:27 +0300
Subject: [PATCH 1136/2322] Update CL-Launch

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

diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix
index 755e8001e88..40c4085adab 100644
--- a/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="cl-launch";
-    version="4.1.3.1";
+    version="4.1.3.3";
     name="${baseName}-${version}";
-    hash="0l5iwffrzmaxbpfh2h5y8lz6yap3q8xi14z080lhl193p8f3rk0z";
-    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.3.1.tar.gz";
-    sha256="0l5iwffrzmaxbpfh2h5y8lz6yap3q8xi14z080lhl193p8f3rk0z";
+    hash="1al7jrj4fy9w4lpgizgb1ppk4rhhlcrfkz1yxpjv3w0wij1h67zl";
+    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.3.3.tar.gz";
+    sha256="1al7jrj4fy9w4lpgizgb1ppk4rhhlcrfkz1yxpjv3w0wij1h67zl";
   };
   buildInputs = [
   ];

From b32174dcc6671779f4f0d4ff6057795f3ec01e2a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jun 2015 11:21:36 +0300
Subject: [PATCH 1137/2322] Update SlimerJS

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

diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index 7c6cf82d741..a35816e2511 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="slimerjs";
-    version="0.9.5";
+    version="0.9.6";
     name="${baseName}-${version}";
-    hash="05p7cwbr2jly6sd6h69j577y48yr05zm2nj7wgnxw0rhyrhkl22s";
-    url="http://download.slimerjs.org/releases/0.9.5/slimerjs-0.9.5.zip";
-    sha256="05p7cwbr2jly6sd6h69j577y48yr05zm2nj7wgnxw0rhyrhkl22s";
+    hash="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq";
+    url="http://download.slimerjs.org/releases/0.9.6/slimerjs-0.9.6.zip";
+    sha256="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq";
   };
   buildInputs = [
     unzip zip

From 59cbed7a02b99580afe09a0d2f1afc709f54b0a6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jun 2015 11:21:44 +0300
Subject: [PATCH 1138/2322] Update eudev

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

diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix
index e2bcf9837e7..de8ad00acc8 100644
--- a/pkgs/os-specific/linux/eudev/default.nix
+++ b/pkgs/os-specific/linux/eudev/default.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="eudev";
-    version = "3.0";
+    version = "3.1.1";
     name="${baseName}-${version}";
     url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz";
-    sha256 = "0afva1vh3lwhw9bryh41dxg82kfnxj1ifa91p3gjwffc2fpqmnvl";
+    sha256 = "1r1jbk1fwc4wl0ifm7xzkb2vjd8w1a39hx6mmy4pp4fl2gvcg86k";
   };
   buildInputs = [
     glib pkgconfig gperf utillinux

From dc84b5118eb7f542715a81f98b392d16bde98a36 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jun 2015 11:21:55 +0300
Subject: [PATCH 1139/2322] Update qpdfview

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

diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix
index 1cf6d76b892..574b73f5672 100644
--- a/pkgs/applications/misc/qpdfview/default.nix
+++ b/pkgs/applications/misc/qpdfview/default.nix
@@ -5,10 +5,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="qpdfview";
-    version = "0.4.14";
+    version = "0.4.15";
     name="${baseName}-${version}";
     url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz";
-    sha256 = "15d88xzqvrcp9szmz8d1lj65yrdx90j6fp78gia5c8kra2z8bik9";
+    sha256 = "0wgj02zpbyq4m2ix8rljiz312l2xk81gpy030vy424icq4xsip52";
   };
   buildInputs = [
     qt4 poppler_qt4 pkgconfig djvulibre libspectre cups file ghostscript

From 59126fb3f8ccec44cd2cead144b57045f6ea3c2d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jun 2015 11:22:07 +0300
Subject: [PATCH 1140/2322] Update golly

---
 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 63a0be47c47..bf6eabef909 100644
--- a/pkgs/applications/science/misc/golly/default.nix
+++ b/pkgs/applications/science/misc/golly/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="golly";
-    version="2.6";
+    version="2.7";
     name="${baseName}-${version}";
-    hash="1n1k3yf23ymlwq4k6p4v2g04qd29pg2rabr4l7m9bj2b2j1zkqhz";
-    url="mirror://sourceforge/project/golly/golly/golly-2.6/golly-2.6-src.tar.gz";
-    sha256="1n1k3yf23ymlwq4k6p4v2g04qd29pg2rabr4l7m9bj2b2j1zkqhz";
+    hash="0wfr9dhdbwg2cbcl7g2s1h9pmsm1lkjncbs9m0df82bcw516xs2f";
+    url="mirror://sourceforge/project/golly/golly/golly-2.7/golly-2.7-src.tar.gz";
+    sha256="0wfr9dhdbwg2cbcl7g2s1h9pmsm1lkjncbs9m0df82bcw516xs2f";
   };
   buildInputs = [
     wxGTK perl python zlib

From ed145cb07f846489b1d333cd4ad8f4421c557ba7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jun 2015 11:22:23 +0300
Subject: [PATCH 1141/2322] Update Nginx unstable

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

diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
index d9d9857e33b..ae8e2785d5f 100644
--- a/pkgs/servers/http/nginx/unstable.nix
+++ b/pkgs/servers/http/nginx/unstable.nix
@@ -10,10 +10,10 @@
 with stdenv.lib;
 
 let
-  version = "1.9.0";
+  version = "1.9.1";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "0j7j4yfz39jl433ci9wgxnz3y70pr93vxixw1s4dxv81nzas2ap1";
+    sha256 = "1b8xikrr19p07n28xnar8p8l0vgm7795lmrb2x7r9h4lwvx5bx89";
   };
 
   rtmp-ext = fetchFromGitHub {

From de7c3eef17db55ff34399872d6779ff520cdd978 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jun 2015 11:22:32 +0300
Subject: [PATCH 1142/2322] Update Asymptote

---
 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 90a7ce9efad..01f3947cdfa 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -7,11 +7,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asymptote";
-    version="2.32";
+    version="2.35";
     name="${baseName}-${version}";
-    hash="19cgn5158p42igjbp8lf6xdbh3yjhlkdm22m5lqrhibp09g06d90";
-    url="mirror://sourceforge/project/asymptote/2.32/asymptote-2.32.src.tgz";
-    sha256="19cgn5158p42igjbp8lf6xdbh3yjhlkdm22m5lqrhibp09g06d90";
+    hash="11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z";
+    url="http://softlayer-ams.dl.sourceforge.net/project/asymptote/2.35/asymptote-2.35.src.tgz";
+    sha256="11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z";
   };
   buildInputs = [
    freeglut ghostscriptX imagemagick fftw 

From 9c726f502dd3d3da050afd564031be44de318617 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jun 2015 11:22:40 +0300
Subject: [PATCH 1143/2322] Update getmail

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

diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index dbd3c631c29..a05b3ccfa9a 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, buildPythonPackage }:
 
 buildPythonPackage rec {
-  version = "4.47.0";
+  version = "4.48.0";
   name = "getmail-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
-    sha256 = "0h25irimigral9xspkvjmplzddqphyn51n5fq221m7nps39wqnjb";
+    sha256 = "0k5rm5kag14izng2ajcagvli9sns5mzvkyfa65ri4xymxs91wi29";
   };
 
   doCheck = false;

From 000162daed5e6a854d1e034409002aee80e6d8ac Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jun 2015 11:22:56 +0300
Subject: [PATCH 1144/2322] Update FreeIPMI

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

diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index 346bbef0bdf..7e3ec2358c7 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv, libgcrypt, readline }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.8";
+  version = "1.4.9";
   name = "freeipmi-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/freeipmi/${name}.tar.gz";
-    sha256 = "06smdsri1v5v2smrd3jxq3n135x7cx0npcimc37lb144gzgyk9wz";
+    sha256 = "0v2xfwik2mv6z8066raiypc4xymjvr8pb0mv3mc3g4ym4km132qp";
   };
 
   buildInputs = [ libgcrypt readline ];

From 2b35cccc5b161d95e09150a5f82ecef8d231bb97 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jun 2015 11:23:18 +0300
Subject: [PATCH 1145/2322] Update dd_rescue and switch to bzip2 releases

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

diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix
index 7b3e62a1bc0..a0ff9b063dd 100644
--- a/pkgs/tools/system/dd_rescue/default.nix
+++ b/pkgs/tools/system/dd_rescue/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, autoconf }:
 
 stdenv.mkDerivation rec {
-  version = "1.46";
+  version = "1.98";
   name = "dd_rescue-${version}";
 
   src = fetchurl {
-    sha256 = "1fhs4jl5pkyn4aq75fxczrgnsj2m0kz9hfa7dhxy93vp7xcba2cy";
-    url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.gz";
+    sha256 = "14lf2pv52sr16977qjq1rsr42rfd3ywsss2xw9svgaa14g49ss6b";
+    url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2";
   };
 
   dd_rhelp_src = fetchurl {

From f39c3ebf047c3fc7274a7f83f204ef1d94de6898 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jun 2015 11:23:42 +0300
Subject: [PATCH 1146/2322] Update GlusterFS, adding new dependencies

---
 pkgs/tools/filesystems/glusterfs/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index bfab9454d6d..57b36875a51 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -1,18 +1,21 @@
 {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python, ncurses, readline,
- autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2}:
+ autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite
+ , liburcu, attr
+}:
 let 
   s = # Generated upstream information 
   rec {
     baseName="glusterfs";
-    version="3.6.3";
+    version="3.7.1";
     name="${baseName}-${version}";
-    hash="084zkc1jd5ggkfl0f5d4s7lra5xgildnphyf6ywzxrb7g44vk0d4";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.6/3.6.3/glusterfs-3.6.3.tar.gz";
-    sha256="084zkc1jd5ggkfl0f5d4s7lra5xgildnphyf6ywzxrb7g44vk0d4";
+    hash="0d1bcijwvc3rhr24xsn7nnp0b5xwlwvybamb05jzja5m7hapydpw";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.1/glusterfs-3.7.1.tar.gz";
+    sha256="0d1bcijwvc3rhr24xsn7nnp0b5xwlwvybamb05jzja5m7hapydpw";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python ncurses readline
     autoconf automake libtool pkgconfig zlib libaio libxml2
+    acl sqlite liburcu attr
   ];
 in
 stdenv.mkDerivation

From 14e7d5440bf22f059dc943d06afe6b10b4225530 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jun 2015 11:23:56 +0300
Subject: [PATCH 1147/2322] Update Sysdig, adding new dependencies

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

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 5a7d0700004..9478e07468e 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -1,15 +1,15 @@
-{stdenv, fetchurl, cmake, luajit, kernel, zlib}:
+{stdenv, fetchurl, cmake, luajit, kernel, zlib, ncurses}:
 let
   inherit (stdenv.lib) optional optionalString;
   s = rec {
     baseName="sysdig";
-    version = "0.1.99";
+    version = "0.1.101";
     name="${baseName}-${version}";
     url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256 = "02faw8s07i7jjydqzqfs0r9lc2qmny3sn26741bz0hmazs9h9w76";
+    sha256 = "1dlx1v7wr0i36sbybr4kj8sziyrfxs4pcn6bnl0ljlb5wndy75b9";
   };
   buildInputs = [
-    cmake zlib luajit
+    cmake zlib luajit ncurses
   ];
 in
 stdenv.mkDerivation {
@@ -22,6 +22,7 @@ stdenv.mkDerivation {
   cmakeFlags = [
     "-DUSE_BUNDLED_LUAJIT=OFF"
     "-DUSE_BUNDLED_ZLIB=OFF"
+    "-DUSE_BUNDLED_NCURSES=OFF"
   ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF";
   preConfigure = ''
     export INSTALL_MOD_PATH="$out"

From 5d5bb7156771cbca73ea4bb46af2716dd60e9000 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jun 2015 11:37:33 +0300
Subject: [PATCH 1148/2322] Update PostgreSQL to latest point-releases

---
 pkgs/servers/sql/postgresql/9.0.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.1.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.2.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.3.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.4.x.nix | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index f1abfa3fb0f..ef7e5d3797f 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline, openssl }:
 
-let version = "9.0.20"; in
+let version = "9.0.22"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02";
+    sha256 = "19gq6axjhvlr5zlrzwnll1fbrvai4xh0nb1jki6gmmschl6v5m4l";
   };
 
   buildInputs = [ zlib readline openssl ];
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 93bf5e1e716..7616f92ca62 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline, openssl }:
 
-let version = "9.1.16"; in
+let version = "9.1.18"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b";
+    sha256 = "1a44hmcvfaa8j169ladsibmvjakw6maaxqkzz1ab8139cqkda9i7";
   };
 
   buildInputs = [ zlib readline openssl ];
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index 5c51a7c578a..51a265da785 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline, openssl }:
 
-let version = "9.2.11"; in
+let version = "9.2.13"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5";
+    sha256 = "0i3avdr8mnvn6ldkx0hc4jmclhisb2338hzs0j2m03wck8hddjsx";
   };
 
   buildInputs = [ zlib readline openssl ];
diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
index 71f3d7a826f..3e0b7d4a76e 100644
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -2,14 +2,14 @@
 
 with stdenv.lib;
 
-let version = "9.3.7"; in
+let version = "9.3.9"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0ggz0i91znv053zx9qas7pjf93s5by3dk84z1jxbjkg8yyrnlx4b";
+    sha256 = "0j85j69rf54cwz5yhrhk4ca22b82990j5sqb8cr1fl9843nd0fzp";
   };
 
   buildInputs = [ zlib readline openssl ]
diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix
index f1834d301de..5c795329b2d 100644
--- a/pkgs/servers/sql/postgresql/9.4.x.nix
+++ b/pkgs/servers/sql/postgresql/9.4.x.nix
@@ -2,14 +2,14 @@
 
 with stdenv.lib;
 
-let version = "9.4.2"; in
+let version = "9.4.4"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "04adpfg2f7ip96rh3jjygx5cpgasrrp1dl2wswjivfk5q68s3zc1";
+    sha256 = "04q07g209y99xzjh88y52qpvz225rxwifv8nzp3bxzfni2bdk3jk";
   };
 
   buildInputs = [ zlib readline openssl ]

From 653cdac274ef2ccb46712eea5e0b7dba6c30eb7e 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 Apr 2015 21:20:54 +0200
Subject: [PATCH 1149/2322] glib hooks: move gsettings-schemas if on wrong
 place

Fixes #7325.
---
 pkgs/development/libraries/glib/setup-hook.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh
index f173744e5ca..ca7e326bd02 100644
--- a/pkgs/development/libraries/glib/setup-hook.sh
+++ b/pkgs/development/libraries/glib/setup-hook.sh
@@ -11,6 +11,12 @@ make_glib_find_gsettings_schemas() {
 envHooks+=(make_glib_find_gsettings_schemas)
 
 glibPreFixupPhase() {
+    # Move gschemas in case the install flag didn't help
+    if [ -d "$out/share/glib-2.0/schemas" ]; then
+        mkdir -p "$out/share/gsettings-schemas/$name/glib-2.0"
+        mv "$out/share/glib-2.0/schemas" "$out/share/gsettings-schemas/$name/glib-2.0/"
+    fi
+
     addToSearchPath GSETTINGS_SCHEMAS_PATH "$out/share/gsettings-schemas/$name"
 }
 

From cba76fa500423d70699ea8686976d8197c8daf7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 14 Jun 2015 16:15:30 +0200
Subject: [PATCH 1150/2322] redshift: disable a failing phase (hidden by #7524)

The wrapped file $out/bin/redshift-gtk doesn't exist.
/cc maintainer @mornfall and #7655.
---
 pkgs/applications/misc/redshift/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 6070c560815..c5095d9f9ee 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -23,11 +23,11 @@ stdenv.mkDerivation rec {
   preInstall = ''
     substituteInPlace src/redshift-gtk/redshift-gtk python --replace "/usr/bin/env python" "${python}/bin/${python.executable}"
   '';
-
+/*
   postInstall = ''
     wrapProgram "$out/bin/redshift-gtk" --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0:${pyxdg}/lib/${python.libPrefix}/site-packages/pyxdg:$out/lib/${python.libPrefix}/site-packages
   '';
-
+*/
   meta = with stdenv.lib; {
     description = "changes the color temperature of your screen gradually";
     longDescription = ''

From c72bbc5b8eb135d13fa38a5ad7754df19c8d7f66 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sun, 14 Jun 2015 18:17:03 +0300
Subject: [PATCH 1151/2322] teamviewer: add option to accept license

---
 .../networking/remote/teamviewer/10.nix          | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/remote/teamviewer/10.nix b/pkgs/applications/networking/remote/teamviewer/10.nix
index cd1833261f4..4b919d36fb6 100644
--- a/pkgs/applications/networking/remote/teamviewer/10.nix
+++ b/pkgs/applications/networking/remote/teamviewer/10.nix
@@ -1,5 +1,8 @@
-{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau
-, bash, patchelf, config }:
+{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes,
+wineUnstable, makeWrapper, libXau , bash, patchelf, config,
+acceptLicense ? false }:
+
+with stdenv.lib;
 
 let
   topath = "${wineUnstable}/bin";
@@ -37,11 +40,18 @@ stdenv.mkDerivation {
     patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer/tv_bin/teamviewerd
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer/tv_bin/teamviewerd
     ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin/
+    ${optionalString acceptLicense "
+      cat > $out/share/teamviewer/config/global.conf << EOF
+      [int32] EulaAccepted = 1
+      [int32] EulaAcceptedRevision = 6
+      EOF
+    "}
   '';
 
   meta = {
     homepage = "http://www.teamviewer.com";
-    license = stdenv.lib.licenses.unfree;
+    license = licenses.unfree;
     description = "Desktop sharing application, providing remote support and online meetings";
+    maintainers = with maintainers; [ jagajaga ];
   };
 }

From 8ae4d0b1e1d3a00a60b2649da20c568c4d63967b Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Sun, 14 Jun 2015 18:31:48 +0200
Subject: [PATCH 1152/2322] Add mailnag package

---
 .../mailreaders/mailnag/default.nix           | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/mailnag/default.nix

diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
new file mode 100644
index 00000000000..e4253f5bff5
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, buildPythonPackage, fetchurl, gettext, gtk3, pythonPackages
+, gdk_pixbuf, libnotify, gst_all_1
+, libgnome_keyring3 ? null, networkmanager ? null
+}:
+
+buildPythonPackage rec {
+  name = "mailnag-${version}";
+  version = "1.1.0";
+
+  src = fetchurl {
+    url = "https://github.com/pulb/mailnag/archive/v${version}.tar.gz";
+    sha256 = "0li4kvxjmbz3nqg6bysgn2wdazqrd7gm9fym3rd7148aiqqwa91r";
+  };
+
+  # Sometimes the generated output isn't identical. It seems like there's a
+  # race condtion while patching the Mailnag/commons/dist_cfg.py file. This is
+  # a small workaround to produce deterministic builds.
+  # For more information see https://github.com/NixOS/nixpkgs/pull/8279
+  setupPyBuildFlags = [ "--build-base=$PWD" ];
+
+  buildInputs = [
+    gettext gtk3 pythonPackages.pygobject3 pythonPackages.dbus
+    pythonPackages.pyxdg gdk_pixbuf libnotify gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-bad libgnome_keyring3 networkmanager
+  ];
+
+  preFixup = ''
+    for script in mailnag mailnag-config; do
+      wrapProgram $out/bin/$script \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+        --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
+        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" \
+        --prefix PYTHONPATH : "$PYTHONPATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An extensible mail notification daemon";
+    homepage = https://github.com/pulb/mailnag;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jgeerds ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 000027a9125..f8ae7936797 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2061,6 +2061,8 @@ let
 
   maildrop = callPackage ../tools/networking/maildrop { };
 
+  mailnag = callPackage ../applications/networking/mailreaders/mailnag { };
+
   mailsend = callPackage ../tools/networking/mailsend { };
 
   mailpile = callPackage ../applications/networking/mailreaders/mailpile { };

From 279c426f05e8ab7f09ac095446eaedd25a3add9e Mon Sep 17 00:00:00 2001
From: Phil Scott <me@philscotted.com>
Date: Sun, 14 Jun 2015 17:44:38 +0100
Subject: [PATCH 1153/2322] Add Tales of Maj'eyal game.

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

diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix
new file mode 100644
index 00000000000..8ff82767cb7
--- /dev/null
+++ b/pkgs/games/tome4/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl, openal, libvorbis, mesa_glu, premake4, SDL2, SDL2_image, SDL2_ttf}:
+
+stdenv.mkDerivation rec {
+  version = "1.3.1";
+  name = "tome4-${version}";
+  src = fetchurl {
+    url = "http://te4.org/dl/t-engine/t-engine4-src-1.3.1.tar.bz2";
+    sha256 = "9b6658e29ad3be9f8469a61e724350f4dfec676777e471f633d616443dfbc7e7";
+  };
+  buildInputs = [ mesa_glu openal libvorbis SDL2 SDL2_ttf SDL2_image premake4 ];
+  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
+    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
+    install -Dm755 tome4 $out/bin/tome4
+    cp -r bootstrap $out/opt/tome4
+    cp -r game $out/opt/tome4
+  '';
+  meta = {
+    homepage = "http://te4.org/";
+    description = "Tales of Maj'eyal (rogue-like game)";
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 000027a9125..3e377bde4e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13467,6 +13467,8 @@ let
 
   tintin = callPackage ../games/tintin { };
 
+  tome4 = callPackage ../games/tome4 { };
+
   tpm = callPackage ../games/thePenguinMachine { };
 
   tremulous = callPackage ../games/tremulous { };

From 74d5adcb4d114e2d159d4ed4a5f0ef35352465a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 10 Apr 2015 22:41:55 +0200
Subject: [PATCH 1154/2322] nixos: move environment.{variables =>
 sessionVariables}.MODULE_DIR

This solves the problem that modprobe does not know about $MODULE_DIR
when run via sudo, and instead wrongly tries to read /lib/modules/:

  $ sudo strace -efile modprobe foo |& grep modules
  open("/lib/modules/3.14.37/modules.softdep", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
  open("/lib/modules/3.14.37/modules.dep.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
  open("/lib/modules/3.14.37/modules.dep.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
  open("/lib/modules/3.14.37/modules.alias.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)

Without this patch, one would have to use sudo -E (preserves environment
vars). But that option is reserved for sudo users with extra rights
(SETENV), so it's not a solution.

environment.sessionVariables are set by PAM, so they are included in the
environment used by sudo.
---
 nixos/modules/system/boot/modprobe.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix
index a1feaad6132..a3b616ff3ef 100644
--- a/nixos/modules/system/boot/modprobe.nix
+++ b/nixos/modules/system/boot/modprobe.nix
@@ -101,7 +101,7 @@ with lib;
         echo ${config.system.sbin.modprobe}/sbin/modprobe > /proc/sys/kernel/modprobe
       '';
 
-    environment.variables.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
+    environment.sessionVariables.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
 
   };
 

From 903183d9e467c2bfe9c102f28328cbff2c95fe19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 4 Feb 2015 07:39:19 +0100
Subject: [PATCH 1155/2322] gtkglextmm: unbreak build

* Add missing build inputs: pangox_compat, libXmu
* Add patch from debian to fix build with newer gtk
---
 .../gnome-2/platform/gtkglextmm/default.nix   |  15 ++-
 .../gtkglextmm/fix_ftbfs_gtk_2_36.patch       | 121 ++++++++++++++++++
 2 files changed, 134 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch

diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
index bf09bd93eeb..97bad111ca7 100644
--- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf }:
+{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf
+, pangox_compat, libXmu
+}:
 
 stdenv.mkDerivation rec {
   name = "gtkglextmm-${minVer}.0";
@@ -9,7 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea";
   };
 
-  patches = [ ./gdk.patch ];
+  patches = [
+    ./gdk.patch
+
+    # From debian, fixes build with newer gtk "[...] by switching #includes
+    # around so that the G_DISABLE_DEPRECATED trick in glibmm still works".
+    # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707356
+    ./fix_ftbfs_gtk_2_36.patch
+  ];
+
+  buildInputs = [ pangox_compat libXmu ];
 
   nativeBuildInputs = [pkgconfig];
 
diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch b/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch
new file mode 100644
index 00000000000..88e271e3eb7
--- /dev/null
+++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch
@@ -0,0 +1,121 @@
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc
+===================================================================
+--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/wrap_init.cc	2013-05-16 23:40:48.363207736 +0200
++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc	2013-05-16 23:42:40.193801834 +0200
+@@ -1,15 +1,8 @@
+-
+-#include <glib.h>
+-
+ // Disable the 'const' function attribute of the get_type() functions.
+ // GCC would optimize them out because we don't use the return value.
+ #undef  G_GNUC_CONST
+ #define G_GNUC_CONST /* empty */
+ 
+-#include <gdkmm/gl/wrap_init.h>
+-#include <glibmm/error.h>
+-#include <glibmm/object.h>
+-
+ // #include the widget headers so that we can call the get_type() static methods:
+ 
+ #include "tokens.h"
+@@ -19,6 +12,12 @@
+ #include "pixmap.h"
+ #include "window.h"
+ 
++#include <glib.h>
++
++#include <gdkmm/gl/wrap_init.h>
++#include <glibmm/error.h>
++#include <glibmm/object.h>
++
+ extern "C"
+ {
+ 
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc
+===================================================================
+--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/query.cc	2013-05-16 23:40:48.363207736 +0200
++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc	2013-05-16 23:42:40.193801834 +0200
+@@ -17,10 +17,10 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
+-#include <gdk/gdkglquery.h>
+-
+ #include "query.h"
+ 
++#include <gdk/gdkglquery.h>
++
+ namespace Gdk
+ {
+   namespace GL
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc
+===================================================================
+--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/pixmapext.cc	2013-05-16 23:40:48.363207736 +0200
++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc	2013-05-16 23:42:40.193801834 +0200
+@@ -17,11 +17,11 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
++#include "pixmapext.h"
++
+ #include <gdk/gdkgldrawable.h>
+ #include <gdk/gdkglpixmap.h>
+ 
+-#include "pixmapext.h"
+-
+ namespace Gdk
+ {
+   namespace GL
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc
+===================================================================
+--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/windowext.cc	2013-05-16 23:40:48.363207736 +0200
++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc	2013-05-16 23:42:40.193801834 +0200
+@@ -17,11 +17,11 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
++#include "windowext.h"
++
+ #include <gdk/gdkgldrawable.h>
+ #include <gdk/gdkglwindow.h>
+ 
+-#include "windowext.h"
+-
+ namespace Gdk
+ {
+   namespace GL
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc
+===================================================================
+--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/font.cc	2004-05-18 08:01:49.000000000 +0200
++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc	2013-05-16 23:43:07.637456821 +0200
+@@ -17,10 +17,10 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
+-#include <gdk/gdkglfont.h>
+-
+ #include "font.h"
+ 
++#include <gdk/gdkglfont.h>
++
+ namespace Gdk
+ {
+   namespace GL
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc
+===================================================================
+--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/init.cc	2003-02-27 10:49:24.000000000 +0100
++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc	2013-05-16 23:44:38.320316782 +0200
+@@ -19,11 +19,11 @@
+ 
+ #include <cstdlib>
+ 
+-#include <gdk/gdkglinit.h>
+-
+ #include "wrap_init.h"
+ #include "init.h"
+ 
++#include <gdk/gdkglinit.h>
++
+ namespace Gdk
+ {
+   namespace GL

From a9c339283663527818f5a0309b54675275306a98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 14 Jun 2015 20:40:35 +0200
Subject: [PATCH 1156/2322] bmon: fix build by including a proper header

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

diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix
index 1a24ba70051..4416c3e1625 100644
--- a/pkgs/tools/misc/bmon/default.nix
+++ b/pkgs/tools/misc/bmon/default.nix
@@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "16qwazays2j448kmfckv6wvh4rhmhc9q4vp1s75hm9z02cmhvk8q";
   };
 
+  # https://github.com/tgraf/bmon/pull/24#issuecomment-98068887
+  postPatch = "sed '1i#include <net/if.h>' -i src/in_netlink.c";
+
   buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ];
 
   preConfigure = "sh ./autogen.sh";

From 23393964bb7d166694adf7c07dccac57d69c3aea Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 14 Jun 2015 21:23:37 +0200
Subject: [PATCH 1157/2322] intel-gpu-tools: update from 1.10 to 1.11

---
 .../misc/intel-gpu-tools/compile-fix.patch    | 37 -------------------
 .../tools/misc/intel-gpu-tools/default.nix    | 12 +++---
 2 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch

diff --git a/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch b/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch
deleted file mode 100644
index 8285867d8ed..00000000000
--- a/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 233808a58db1f62d773b03f9dad599924170aca6 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Wed, 18 Mar 2015 08:36:37 +0000
-Subject: lib/batch: Trivial compile fix for 32-bit builds
-
-intel_batchbuffer.c: In function 'fill_object':
-intel_batchbuffer.c:589:20: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
-  obj->relocs_ptr = (uint64_t)relocs;
-                    ^
-intel_batchbuffer.c: In function 'exec_blit':
-intel_batchbuffer.c:598:21: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
-  exec.buffers_ptr = (uint64_t)objs;
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
-diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
-index 666c323..c1c27a6 100644
---- a/lib/intel_batchbuffer.c
-+++ b/lib/intel_batchbuffer.c
-@@ -548,7 +548,7 @@ fill_object(struct drm_i915_gem_exec_object2 *obj, uint32_t gem_handle,
-	memset(obj, 0, sizeof(*obj));
-	obj->handle = gem_handle;
-	obj->relocation_count = count;
--	obj->relocs_ptr = (uint64_t)relocs;
-+	obj->relocs_ptr = (uintptr_t)relocs;
- }
-
- static void exec_blit(int fd,
-@@ -557,7 +557,7 @@ static void exec_blit(int fd,
- {
-	struct drm_i915_gem_execbuffer2 exec;
-
--	exec.buffers_ptr = (uint64_t)objs;
-+	exec.buffers_ptr = (uintptr_t)objs;
-	exec.buffer_count = count;
-	exec.batch_start_offset = 0;
-	exec.batch_len = batch_len * 4;
diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index 997f1bfc012..b675565d053 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev, libX11, libXext, libXv, libXrandr, glib, bison }:
+{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev
+, libX11, libXext, libXv, libXrandr, glib, bison, libunwind }:
 
 stdenv.mkDerivation rec {
-  name = "intel-gpu-tools-1.10";
+  name = "intel-gpu-tools-1.11";
 
   src = fetchurl {
     url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2";
-    sha256 = "0x4q7gv14yaniycgdxym9nazlj6wzcvjjhg40bbm5lkw5pqvxwkd";
+    sha256 = "1r5dbp2gdxqryv1fhxy83k4d1kfp7rv8q370fhncamrb8m8390j8";
   };
 
-  buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 libXext libXv libXrandr glib bison ];
-
-  patches = [ ./compile-fix.patch ];
+  buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11
+                  libXext libXv libXrandr glib bison libunwind ];
 
   meta = with stdenv.lib; {
     homepage = https://01.org/linuxgraphics/;

From 1ee742b0ef2904788e1775d73de42c00492e8c4f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 14 Jun 2015 14:27:46 -0500
Subject: [PATCH 1158/2322] nixpkgs: afl 1.80b -> 1.83b

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../tools/analysis/infer/default.nix          | 33 +++++++++++++++++++
 pkgs/tools/security/afl/default.nix           |  4 +--
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/analysis/infer/default.nix

diff --git a/pkgs/development/tools/analysis/infer/default.nix b/pkgs/development/tools/analysis/infer/default.nix
new file mode 100644
index 00000000000..35dbd08a870
--- /dev/null
+++ b/pkgs/development/tools/analysis/infer/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, python }:
+
+stdenv.mkDerivation rec {
+  name    = "infer-${version}";
+  version = "0.1.0";
+
+  src = fetchurl {
+    url = "https://github.com/facebook/infer/releases/download/v${version}/infer-linux64-v${version}.tar.xz";
+    sha256 = "1kppiayzqwmm13aq8x1jxd3j4jywh3h37jxrgyipz8li1ddpdq3m";
+  };
+
+  buildInputs = [ python ];
+  buildPhase = "true";
+  installPhase = ''
+    mkdir -p $out/libexec $out/bin;
+    cp -R facebook-clang-plugin $out/libexec
+    cp -R infer $out/libexec
+    for x in `ls $out/libexec/infer/infer/bin`; do
+      ln -s $out/libexec/infer/infer/bin/$x $out/bin/$x;
+    done
+  '';
+  fixupPhase = ''
+    patchShebangs $out
+  '';
+
+  meta = {
+    description = "Scalable static analyzer for Java, C and Objective-C";
+    homepage    = http://fbinfer.com;
+    license     = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
+    platforms   = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index 2aed8df3260..ff9798b3f75 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -9,11 +9,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "1.80b";
+  version = "1.83b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "008l2qirwlf40yhlrybcpglsil9nw8498qcjmvrnvvq31piwyhp0";
+    sha256 = "1zkf9vdhmm1h0flxl1ybmw41amgh9cyh4hyb18jp972lgd9q642v";
   };
 
   # Note: libcgroup isn't needed for building, just for the afl-cgroup
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 000027a9125..7db22233024 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5302,6 +5302,8 @@ let
 
   csslint = callPackage ../development/web/csslint { };
 
+  infer = callPackage ../development/tools/analysis/infer { };
+
   libcxx = llvmPackages.libcxx;
   libcxxabi = llvmPackages.libcxxabi;
 

From 4e0fb6578af581f375c21820bd94bcba3e279eb1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 14 Jun 2015 21:44:18 +0200
Subject: [PATCH 1159/2322] strongswan: update from 5.2.1 to 5.3.2, fixes
 CVE-2015-4171

---
 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 871cd3e8f47..d65f1ac4335 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "strongswan-5.2.1";
+  name = "strongswan-5.3.2";
 
   src = fetchurl {
     url = "http://download.strongswan.org/${name}.tar.bz2";
-    sha256 = "05cjjd7gg65bl6fswj2r2i13nn1nk4x86s06y75gwfdvnlrsnlga";
+    sha256 = "09gjrd5f8iykh926y35blxlm2hlzpw15m847d8vc9ga29s6brad4";
   };
 
   dontPatchELF = true;

From cf9e72369edc32919f2647f31be3a9363b5d574f Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Sun, 14 Jun 2015 19:37:55 +0000
Subject: [PATCH 1160/2322] add libebur128 package

---
 .../libraries/libebur128/default.nix          | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/libebur128/default.nix

diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix
new file mode 100644
index 00000000000..e11e2b1db85
--- /dev/null
+++ b/pkgs/development/libraries/libebur128/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchFromGitHub, cmake, speexdsp, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.2";
+  name = "libebur128-${version}";
+
+  src = fetchFromGitHub {
+    owner = "jiixyj";
+    repo = "libebur128";
+    rev = "v${version}";
+    sha256 = "19vy3ldbf931hjvn9jf9dvw1di3yx9ljxyk2yp5cnac1wqiza3jm";
+  };
+
+  buildInputs = [ cmake speexdsp pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "Implementation of the EBU R128 loudness standard";
+    homepage = https://github.com/jiixyj/libebur128;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7db22233024..e487756e350 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6727,6 +6727,8 @@ let
 
   libebml = callPackage ../development/libraries/libebml { };
 
+  libebur128 = callPackage ../development/libraries/libebur128 { };
+
   libedit = callPackage ../development/libraries/libedit { };
 
   libelf = callPackage ../development/libraries/libelf { };

From 14695867cb54887ac622ea7c0e3ab6c7108398b6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jun 2015 22:26:13 +0300
Subject: [PATCH 1161/2322] Add ratmen X11 menu generator

---
 pkgs/tools/X11/ratmen/default.nix | 35 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/tools/X11/ratmen/default.nix

diff --git a/pkgs/tools/X11/ratmen/default.nix b/pkgs/tools/X11/ratmen/default.nix
new file mode 100644
index 00000000000..c438381d712
--- /dev/null
+++ b/pkgs/tools/X11/ratmen/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchurl, perl, xproto, libX11}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="ratmen";
+    version="2.2.3";
+    name="${baseName}-${version}";
+    hash="0gnfqhnch9x8jhr87gvdjcp1wsqhchfjilpnqcwx5j0nlqyz6wi6";
+    url="http://www.update.uu.se/~zrajm/programs/ratmen/ratmen-2.2.3.tar.gz";
+    sha256="0gnfqhnch9x8jhr87gvdjcp1wsqhchfjilpnqcwx5j0nlqyz6wi6";
+  };
+  buildInputs = [
+    perl xproto libX11
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
+  meta = {
+    inherit (s) version;
+    description = ''A minimalistic X11 menu creator'';
+    license = stdenv.lib.licenses.free ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "http://www.update.uu.se/~zrajm/programs/";
+    downloadPage = "http://www.update.uu.se/~zrajm/programs/ratmen/";
+    updateWalker = true;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d32149e67f..fb283ac087a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12241,6 +12241,8 @@ let
 
   rapidsvn = callPackage ../applications/version-management/rapidsvn { };
 
+  ratmen = callPackage ../tools/X11/ratmen {};
+
   ratox = callPackage ../applications/networking/instant-messengers/ratox { };
 
   ratpoison = callPackage ../applications/window-managers/ratpoison { };

From a6d54b3fdd23ae540de9061575dba882fdc92d18 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jun 2015 22:40:17 +0300
Subject: [PATCH 1162/2322] A comment about the license

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

diff --git a/pkgs/tools/X11/ratmen/default.nix b/pkgs/tools/X11/ratmen/default.nix
index c438381d712..19e5fe69da5 100644
--- a/pkgs/tools/X11/ratmen/default.nix
+++ b/pkgs/tools/X11/ratmen/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = ''A minimalistic X11 menu creator'';
-    license = stdenv.lib.licenses.free ;
+    license = stdenv.lib.licenses.free ; # 9menu derivative with 9menu license
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
     homepage = "http://www.update.uu.se/~zrajm/programs/";

From 649b0affe139e5b60b414d988a7d8a2950e99e1d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jun 2015 22:53:25 +0300
Subject: [PATCH 1163/2322] Adding Skippy-XD window switcher

---
 pkgs/tools/X11/skippy-xd/default.nix | 30 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/X11/skippy-xd/default.nix

diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix
new file mode 100644
index 00000000000..b3e9ad759f1
--- /dev/null
+++ b/pkgs/tools/X11/skippy-xd/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchgit, xproto, libX11, libXft, libXcomposite, libXdamage
+, libXext, xextproto, libXinerama, libjpeg, giflib, pkgconfig
+}:
+let
+  buildInputs = [
+    xproto libX11 libXft libXcomposite libXdamage libXext xextproto 
+    libXinerama libjpeg giflib pkgconfig
+  ];
+in
+stdenv.mkDerivation rec {
+  version = "git-2015-03-01";
+  name = "skippy-xd-${version}";
+  inherit buildInputs;
+  src = fetchgit {
+    url = "https://github.com/richardgv/skippy-xd/";
+    rev = "397216ca67";
+    sha256 = "19lvy5888j7rl52dsxv1wwxxijdlk8d7qn1zzzy0b8wvqknhxypm";
+  };
+  makeFlags = ["PREFIX=$(out)"];
+  preInstall = ''
+    sed -e "s@/etc/xdg@$out&@" -i Makefile
+  '';
+  meta = {
+    inherit version;
+    description = ''Expose-style compositing-based standalone window switcher'';
+    license = stdenv.lib.licenses.gpl2Plus ;
+    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 fb283ac087a..75ef22131e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2856,6 +2856,8 @@ let
 
   simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { };
 
+  skippy-xd = callPackage ../tools/X11/skippy-xd {};
+
   skydns = callPackage ../servers/dns/skydns { };
 
   sleuthkit = callPackage ../tools/system/sleuthkit {};

From d9354c6a2a33a751bb1533b653985563af50eac3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Jun 2015 23:09:32 +0300
Subject: [PATCH 1164/2322] Add xwinmosaic window switcher

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

diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix
new file mode 100644
index 00000000000..95f35129754
--- /dev/null
+++ b/pkgs/tools/X11/xwinmosaic/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchgit, gtk2, cmake, pkgconfig}:
+let
+  buildInputs = [
+    gtk2 cmake pkgconfig
+  ];
+in
+stdenv.mkDerivation rec {
+  version = "0.4.2";
+  name = "xwinmosaic-${version}";
+  inherit buildInputs;
+  src = fetchgit {
+    url = "https://github.com/soulthreads/xwinmosaic/";
+    rev = "refs/tags/v0.4.2";
+    sha256 = "0ddriqx4idyp55v8js5xazmhl09jwkmnv5nlfzhs2cpvshcj56ri";
+  };
+  meta = {
+    inherit version;
+    description = ''X window switcher drawing a colourful grid'';
+    license = stdenv.lib.licenses.bsd2 ;
+    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 75ef22131e4..6371b636b30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3414,6 +3414,8 @@ let
     inherit (xlibs) libXt libXaw libXtst xextproto libXi libXpm gccmakedep;
   };
 
+  xwinmosaic = callPackage ../tools/X11/xwinmosaic {};
+
   # To expose more packages for Yi, override the extraPackages arg.
   yi = callPackage ../applications/editors/yi/wrapper.nix { };
 

From 853e87909f342f18161a875eb91e2cf964e37ab2 Mon Sep 17 00:00:00 2001
From: Jonathan Rudenberg <jonathan@titanous.com>
Date: Sun, 14 Jun 2015 16:31:29 -0400
Subject: [PATCH 1165/2322] makemkv: 1.9.3 -> 1.9.4

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

diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index 7220402f2ad..7d604101f4b 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -4,17 +4,17 @@
 
 stdenv.mkDerivation rec {
   name = "makemkv-${ver}";
-  ver = "1.9.3";
+  ver = "1.9.4";
   builder = ./builder.sh;
 
   src_bin = fetchurl {
     url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
-    sha256 = "1rlg7phkhzhzbb1zk8mb5qsd4zcsw20glga31npaxxy8vyfkjcxc";
+    sha256 = "0xr5bfbpzd1s9fyxbwj0crpgi57hm4wrm1dybx13lv4n6xdj2ww0";
   };
 
   src_oss = fetchurl {
     url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
-    sha256 = "1vn4wbxii1vn7mss2ydikhwp8hkizii7arg7a1cnpvmwp7pd952v";
+    sha256 = "0gpmyp2g44piaj47a52ik5i3sk5flbs8kqlqmjxnqkv16s01vfra";
   };
 
   buildInputs = [openssl qt4 mesa zlib pkgconfig libav];

From dcffd285273718d3a35ed43e3a51e2a96fad7f72 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@afiniate.com>
Date: Sun, 14 Jun 2015 13:22:46 -0700
Subject: [PATCH 1166/2322] ocp-build: upgrade to 1.99.9-beta

This also allows ocp-build to build for ocaml 4.02 and greater
---
 pkgs/development/tools/ocaml/ocp-build/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index fe174febc9e..31b99ada2a3 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -1,17 +1,16 @@
-{ stdenv, fetchurl, ocaml, findlib, ncurses }:
+{ stdenv, fetchurl, ocaml, findlib, ncurses, camlp4 }:
 
 stdenv.mkDerivation {
 
-  name = "ocp-build-1.99.8-beta";
+  name = "ocp-build-1.99.9-beta";
 
   src = fetchurl {
-    url = http://www.typerex.org/pub/ocp-build/ocp-build.1.99.8-beta.tar.gz;
-    sha256 = "03zqpl73ah0fji5baxmk8w0h7waamlnhhysi128yap4abzsh5w87";
+    url = http://www.typerex.org/pub/ocp-build/ocp-build.1.99.9-beta.tar.gz;
+    sha256 = "0wcb49bp239ns9mz55ky0kfjcz80cp97k0j0rwaw4h5sp3phn4l0";
   };
 
-  buildInputs = [ ocaml findlib ncurses ];
-
-  patches = [ ./fix-for-no-term.patch ];
+  buildInputs = [ ocaml findlib ncurses camlp4 ];
+  preInstall = "mkdir -p $out/bin";
 
   # In the Nix sandbox, the TERM variable is unset and stty does not
   # work. In such a case, ocp-build crashes due to a bug. The

From faa90fad3fa97161e55ea28262ede574477db5e6 Mon Sep 17 00:00:00 2001
From: Henry Till <henrytill@gmail.com>
Date: Sun, 14 Jun 2015 16:28:55 -0400
Subject: [PATCH 1167/2322] mr: update from 1.20141024 to 1.20150503

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

diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix
index d52802e42f1..68bef621bc2 100644
--- a/pkgs/applications/version-management/mr/default.nix
+++ b/pkgs/applications/version-management/mr/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  version = "1.20141024";
+  version = "1.20150503";
   name = "mr-${version}";
 
   src = fetchurl {
     url = "https://github.com/joeyh/myrepos/archive/${version}.tar.gz";
-    sha256 = "7b68183476867d15d6f111fc9678335b94824dcfa09f07c761a72d64cdf5ad4a";
+    sha256 = "12cf8kmn13446rszmah5wws5p2k2gjp6y4505sy1r14qnahf4qbf";
   };
 
   buildInputs = [ perl ];

From 6cfc2caaeb94a3fb3c789e6f8853bf69c5e3858a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 14 Jun 2015 14:35:29 -0500
Subject: [PATCH 1168/2322] nixpkgs/cvc4: touchups, add myself as maintainer

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/cvc4/default.nix            | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix
index 5b2e9c54d6f..5d2968e42a6 100644
--- a/pkgs/applications/science/logic/cvc4/default.nix
+++ b/pkgs/applications/science/logic/cvc4/default.nix
@@ -1,23 +1,23 @@
-{stdenv, fetchurl, gmp, libantlr3c, boost}:
+{ stdenv, fetchurl, gmp, libantlr3c, boost }:
+
+stdenv.mkDerivation rec {
+  name = "cvc4-${version}";
+  version = "1.4";
 
-stdenv.mkDerivation {
-  name = "cvc4-1.4";
   src = fetchurl {
-    url = http://cvc4.cs.nyu.edu/builds/src/cvc4-1.4.tar.gz;
+    url = "http://cvc4.cs.nyu.edu/builds/src/cvc4-${version}.tar.gz";
     sha256 = "093h7zgv4z4ad503j30dpn8k2pz9m90pvd7gi5axdmwsxgwlzzkn";
   };
 
   buildInputs = [ gmp libantlr3c boost ];
-
   preConfigure = "patchShebangs ./src/";
-
   doChecks = true;
 
   meta = with stdenv.lib; {
-    description = "An efficient open-source automatic theorem prover for satisfiability modulo theories (SMT) problems";
-    homepage = http://cvc4.cs.nyu.edu/web/;
-    license = licenses.bsd3;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ vbgl ];
+    description = "A high-performance theorem prover and SMT solver";
+    homepage    = http://cvc4.cs.nyu.edu/web/;
+    license     = licenses.bsd3;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ vbgl thoughtpolice ];
   };
 }

From 3d181a3175d67b30a8a9a8add51a953c06a5e273 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 14 Jun 2015 14:39:13 -0500
Subject: [PATCH 1169/2322] nixpkgs: abc-verifier 20150406 -> 20150614

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/logic/abc/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix
index 174dfe8f2b2..236045fa335 100644
--- a/pkgs/applications/science/logic/abc/default.nix
+++ b/pkgs/applications/science/logic/abc/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "abc-verifier-${version}";
-  version = "20150406";
+  version = "20150614";
 
   src = fetchhg {
     url    = "https://bitbucket.org/alanmi/abc";
-    rev    = "7d9c50a17d8676ad0c9792bb87102d7cb4b10667";
-    sha256 = "1gg5jjfjjnv0fl7jsz37hzd9dpv58r8p0q8qvms0r289fcdxalcx";
+    rev    = "38661894bc1287cad9bd35978bd252dbfe3e6c56";
+    sha256 = "04v0hkvj501r10pj3yrqrk2463d1d7lhl8dzfjwkmlbmlmpjlvvv";
   };
 
   buildInputs = [ readline ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Sequential Logic Synthesis and Formal Verification";
+    description = "A tool for squential logic synthesis and ormal verification";
     homepage    = "www.eecs.berkeley.edu/~alanmi/abc/abc.htm";
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.unix;

From da76434dbd5e727ab21b04e87ad219eedae2c183 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 14 Jun 2015 14:56:49 -0500
Subject: [PATCH 1170/2322] nixpkgs: yices 2.2.1 -> 2.3.1, now with source

It's still under a non-commercial license, but the source build is waay
better than the binary build. Can probably work on OS X too now.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/yices/default.nix           | 39 ++++++-------------
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index 4e3b9b2a76b..5daaa444c12 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -1,36 +1,19 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, gmp, gperf, autoreconfHook }:
 
-assert stdenv.isLinux;
-
-let
-  libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
-in
 stdenv.mkDerivation rec {
   name    = "yices-${version}";
-  version = "2.2.1";
+  version = "2.3.1";
 
-  src =
-    if stdenv.system == "i686-linux"
-    then fetchurl {
-      url = "http://yices.csl.sri.com/cgi-bin/yices2-newdownload.cgi?file=yices-2.2.1-i686-pc-linux-gnu-static-gmp.tar.gz&accept=I+accept";
-      name = "yices-${version}-i686.tar.gz";
-      sha256 = "12jzk3kqlbqa5x6rl92cpzj7dch7gm7fnbj72wifvwgdj4zyhrra";
-    }
-    else fetchurl {
-      url = "http://yices.csl.sri.com/cgi-bin/yices2-newdownload.cgi?file=yices-2.2.1-x86_64-unknown-linux-gnu-static-gmp.tar.gz&accept=I+accept";
-      name = "yices-${version}-x86_64.tar.gz";
-      sha256 = "0fpmihf6ykcg4qbsimkamgcwp4sl1xyxmz7q28ily91rd905ijaj";
-    };
+  src = fetchurl {
+    url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=yices-2.3.1-src.tar.gz&accept=I+Agree";
+    name = "yices-${version}-src.tar.gz";
+    sha256 = "1da70n0cah0dh3pk7fcrvjkszx9qmhc0csgl15jqa7bdh707k2zs";
+  };
 
-  buildPhase = false;
-  installPhase = ''
-    mkdir -p $out/bin $out/lib $out/include
-    cd bin     && mv * $out/bin     && cd ..
-    cd lib     && mv * $out/lib     && cd ..
-    cd include && mv * $out/include && cd ..
-
-    patchelf --set-rpath ${libPath} $out/lib/libyices.so.${version}
-  '';
+  configureFlags = [ "--with-static-gmp=${gmp}/lib/libgmp.a"
+                     "--with-static-gmp-include-dir=${gmp}/include"
+                   ];
+  buildInputs = [ gmp gperf autoreconfHook ];
 
   meta = {
     description = "A high-performance theorem prover and SMT solver";

From 44ef5a3ab00bb96476b0cdb6a3768a78132df62d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 14 Jun 2015 15:05:24 -0500
Subject: [PATCH 1171/2322] cvc4: regenerate ./configure on rebuild

Otherwise some absurd error from ./configure crops up.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/logic/cvc4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix
index 5d2968e42a6..769f86d5d77 100644
--- a/pkgs/applications/science/logic/cvc4/default.nix
+++ b/pkgs/applications/science/logic/cvc4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp, libantlr3c, boost }:
+{ stdenv, fetchurl, gmp, libantlr3c, boost, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "cvc4-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "093h7zgv4z4ad503j30dpn8k2pz9m90pvd7gi5axdmwsxgwlzzkn";
   };
 
-  buildInputs = [ gmp libantlr3c boost ];
+  buildInputs = [ gmp libantlr3c boost autoreconfHook ];
   preConfigure = "patchShebangs ./src/";
   doChecks = true;
 

From 2dfb657b94fd4f0421447715a693acc39da09244 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 14 Jun 2015 15:55:08 -0500
Subject: [PATCH 1172/2322] nixpkgs: picosat 936 -> 960, add myself as a
 maintainer

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/picosat/default.nix         | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix
index 6c2cce0ea4b..fb5acc64c4d 100644
--- a/pkgs/applications/science/logic/picosat/default.nix
+++ b/pkgs/applications/science/logic/picosat/default.nix
@@ -1,41 +1,33 @@
-{stdenv, fetchurl }:
-
-let
-  version = "936";
-  pname = "picosat";
-
-in
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  name    = "picosat-${version}";
+  version = "960";
 
   src = fetchurl {
     url = "http://fmv.jku.at/picosat/${name}.tar.gz";
-    sha256 = "02hq68fmfjs085216wsj13ff6i1rhc652yscl16w9jzpfqzly91n";
+    sha256 = "05z8cfjk84mkna5ryqlq2jiksjifg3jhlgbijaq36sbn0i51iczd";
   };
 
   dontAddPrefix = true;
-
-  # configureFlags = "--shared"; the ./configure file is broken and doesn't accept this parameter :(
-  patchPhase = ''
-   sed -e 's/^shared=no/shared=yes/' -i configure
-  '';
+  configureFlags = "--shared";
 
   installPhase = ''
-   mkdir -p "$out"/bin
+   mkdir -p $out/bin $out/lib $out/include/picosat
    cp picomus "$out"/bin
    cp picosat "$out"/bin
-   mkdir -p "$out"/lib
+
    cp libpicosat.a "$out"/lib
    cp libpicosat.so "$out"/lib
-   mkdir -p "$out"/include/picosat
+
    cp picosat.h "$out"/include/picosat
   '';
 
   meta = {
-    homepage = http://fmv.jku.at/picosat/;
     description = "SAT solver with proof and core support";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.roconnor ];
+    homepage    = http://fmv.jku.at/picosat/;
+    license     = stdenv.lib.licenses.mit;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ roconnor thoughtpolice ];
   };
 }

From f4d7b23a680ed497cfd64b3430cd33d458b4fc85 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 15 Jun 2015 11:07:02 +0200
Subject: [PATCH 1173/2322] tomcat-connectors: update from 1.2.40 to
 1.2.41-dev, fixes CVE-2014-8111

Using the prerelease version, because there was no response on when a
new official release will happen, see
http://tomcat.10.x6.nabble.com/Release-of-tomcat-connectors-1-2-41-td5035487.html
---
 .../http/apache-modules/tomcat-connectors/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
index 0e908acd74b..90d0fb899c3 100644
--- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
+++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, apacheHttpd, jdk }:
 
 stdenv.mkDerivation rec {
-  name = "tomcat-connectors-1.2.40";
+  name = "tomcat-connectors-1.2.41-dev-1613051";
 
   src = fetchurl {
-    url = "http://www.apache.si/tomcat/tomcat-connectors/jk/${name}-src.tar.gz";
-    sha256 = "0pbh6s19ba5k2kahiiqgx8lz8v4fjllzn0w6hjd08x7z9my38pl9";
+    url = "http://people.apache.org/~rjung/mod_jk-dev/${name}-src.tar.gz";
+    sha256 = "11khipjpy3y84j1pp7yyx76y64jccvyhh3klwzqxylff49vjc2fc";
   };
 
   configureFlags = "--with-apxs=${apacheHttpd}/bin/apxs --with-java-home=${jdk}";

From 6c382151fb86fdd34d3dacfc86c5fe98dd6ac3f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 15 Jun 2015 11:28:38 +0200
Subject: [PATCH 1174/2322] imagemagick: remove mirrors that don't work

/cc #8302.
---
 pkgs/build-support/fetchurl/mirrors.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 0e2a6e756f6..2a3dbb40a2b 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -151,10 +151,9 @@ rec {
 
   # ImageMagick mirrors, see http://www.imagemagick.org/script/download.php.
   imagemagick = [
-    ftp://ftp.nluug.nl/pub/ImageMagick/
+    http://www.imagemagick.org/download/
+    ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ # also contains older versions removed from most mirrors
     ftp://ftp.imagemagick.org/pub/ImageMagick/
-    ftp://ftp.imagemagick.net/pub/ImageMagick/
-    ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/
   ];
 
   # CPAN mirrors.

From cc5663de0c17d7b76418b570a459ecb8c33dc49d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 15 Jun 2015 11:47:32 +0200
Subject: [PATCH 1175/2322] gnome3: easier to override packages

---
 pkgs/desktops/gnome-3/3.16/default.nix | 19 ++++++++++++++++---
 pkgs/top-level/all-packages.nix        |  5 +----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index be60a58db26..89f4ea86829 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -1,6 +1,16 @@
-{ callPackage, pkgs, self }:
+{ pkgs }:
+
+let
+
+  pkgsFun = overrides:
+    let 
+      self = self_ // overrides;
+      self_ = with self; {
+
+  overridePackages = f: pkgsFun (f self);
+
+  callPackage = pkgs.newScope self;
 
-rec {
   corePackages = with gnome3; [
     pkgs.desktop_file_utils pkgs.ibus
     pkgs.shared_mime_info # for update-mime-database
@@ -293,4 +303,7 @@ rec {
 
   gtkhtml = callPackage ./misc/gtkhtml { };
 
-}
+    };
+  in self; # pkgsFun
+
+in pkgsFun {}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f326977b8f..62622cd8a0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13614,10 +13614,7 @@ let
     inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils;
   };
 
-  gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 {
-    callPackage = pkgs.newScope pkgs.gnome3_16;
-    self = pkgs.gnome3_16;
-  });
+  gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 { });
 
   gnome3 = gnome3_16;
 

From b36629d8212527f72d7a5f7b8adf05fcdec1b77f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 15 Jun 2015 11:52:26 +0200
Subject: [PATCH 1176/2322] gnome3: also pass self to overridePackages function

---
 pkgs/desktops/gnome-3/3.16/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 89f4ea86829..2dee0cefd92 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -7,7 +7,9 @@ let
       self = self_ // overrides;
       self_ = with self; {
 
-  overridePackages = f: pkgsFun (f self);
+  overridePackages = f:
+    let newself = pkgsFun (f newself self);
+    in newself;
 
   callPackage = pkgs.newScope self;
 

From 6c213c6e44e27abbb965ff59c94c5ebfcc142ddb Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Wed, 10 Jun 2015 13:55:52 +0000
Subject: [PATCH 1177/2322] rmlint: 2.1.0 -> 2.2.0 (closes #8268)

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

diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index 9e61a5c195e..392734e2256 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -4,11 +4,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "rmlint-${version}";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "https://github.com/sahib/rmlint/archive/v${version}.tar.gz";
-    sha256 = "17hqkx1ji6rbvliji18my16b23ig9d6v4azgypwl0fam2ar4rm4g";
+    sha256 = "1wg6br30ccvxl2189a75lb3d03kg8spfkkp9qlf3whl0xirsm15n";
   };
 
   configurePhase = "scons config";

From c2116191d36ca0df26a8e2f0ccd7dbd187f154d4 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Mon, 15 Jun 2015 10:54:53 +0200
Subject: [PATCH 1178/2322] gnupg 2.1.4 -> 2.1.5

According to someone on #gnupg, the patch is not necessary anymore.
---
 pkgs/tools/security/gnupg/21.nix              |   6 +-
 .../gnupg/socket-activate-2.1.1.patch         | 170 ------------------
 2 files changed, 2 insertions(+), 174 deletions(-)
 delete mode 100644 pkgs/tools/security/gnupg/socket-activate-2.1.1.patch

diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index 31a6bd2c460..34561c3c33d 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -13,15 +13,13 @@ with stdenv.lib;
 assert x11Support -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.1.4";
+  name = "gnupg-2.1.5";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1c3c89b7ziknz6h1dnwmfjhgyy28g982rcncrhmhylb8v3npw4k4";
+    sha256 = "0k5818r847zplbrwjp6i48s6xb5zy44rny2kmbisd6y3c1qml45m";
   };
 
-  patches = [ ./socket-activate-2.1.1.patch ];
-
   postPatch = stdenv.lib.optionalString stdenv.isLinux ''
     sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
   '';
diff --git a/pkgs/tools/security/gnupg/socket-activate-2.1.1.patch b/pkgs/tools/security/gnupg/socket-activate-2.1.1.patch
deleted file mode 100644
index 2c2d7b54250..00000000000
--- a/pkgs/tools/security/gnupg/socket-activate-2.1.1.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Port Shea Levy's socket activation patch to version 2.1.1.
-
-diff -Naur gnupg-2.1.1-upstream/agent/gpg-agent.c gnupg-2.1.1/agent/gpg-agent.c
---- gnupg-2.1.1-upstream/agent/gpg-agent.c	2014-12-01 05:04:57.000000000 -0430
-+++ gnupg-2.1.1/agent/gpg-agent.c	2014-12-23 17:13:48.029286035 -0430
-@@ -125,7 +125,9 @@
-   oPuttySupport,
-   oDisableScdaemon,
-   oDisableCheckOwnSocket,
--  oWriteEnvFile
-+  oWriteEnvFile,
-+  oAgentFD,
-+  oSSHAgentFD
- };
- 
- 
-@@ -143,6 +145,8 @@
-   ARGPARSE_group (301, N_("@Options:\n ")),
- 
-   ARGPARSE_s_n (oDaemon,  "daemon", N_("run in daemon mode (background)")),
-+  ARGPARSE_s_i (oAgentFD,  "agent-fd", "@"),
-+  ARGPARSE_s_i (oSSHAgentFD,  "ssh-agent-fd", "@"),
-   ARGPARSE_s_n (oServer,  "server", N_("run in server mode (foreground)")),
-   ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
-   ARGPARSE_s_n (oQuiet,	  "quiet",     N_("be somewhat more quiet")),
-@@ -627,6 +631,31 @@
-   return 1; /* handled */
- }
- 
-+/* Handle agent socket(s) */
-+static void
-+handle_agent_socks(int fd, int fd_extra, int fd_ssh)
-+{
-+#ifndef HAVE_W32_SYSTEM
-+  if (chdir("/"))
-+    {
-+      log_error ("chdir to / failed: %s\n", strerror (errno));
-+      exit (1);
-+    }
-+
-+  {
-+    struct sigaction sa;
-+
-+    sa.sa_handler = SIG_IGN;
-+    sigemptyset (&sa.sa_mask);
-+    sa.sa_flags = 0;
-+    sigaction (SIGPIPE, &sa, NULL);
-+  }
-+#endif /*!HAVE_W32_SYSTEM*/
-+
-+  log_info ("%s %s started\n", strusage(11), strusage(13) );
-+  handle_connections (fd, fd_extra, fd_ssh);
-+  assuan_sock_close (fd);
-+}
- 
- /* The main entry point.  */
- int
-@@ -643,6 +672,8 @@
-   int default_config =1;
-   int pipe_server = 0;
-   int is_daemon = 0;
-+  int fd_agent = GNUPG_INVALID_FD;
-+  int fd_ssh_agent = GNUPG_INVALID_FD;
-   int nodetach = 0;
-   int csh_style = 0;
-   char *logfile = NULL;
-@@ -850,6 +881,8 @@
-         case oSh: csh_style = 0; break;
-         case oServer: pipe_server = 1; break;
-         case oDaemon: is_daemon = 1; break;
-+        case oAgentFD: fd_agent = pargs.r.ret_int; break;
-+        case oSSHAgentFD: fd_ssh_agent = pargs.r.ret_int; break;
- 
-         case oDisplay: default_display = xstrdup (pargs.r.ret_str); break;
-         case oTTYname: default_ttyname = xstrdup (pargs.r.ret_str); break;
-@@ -940,7 +973,8 @@
-     bind_textdomain_codeset (PACKAGE_GT, "UTF-8");
- #endif
- 
--  if (!pipe_server && !is_daemon && !gpgconf_list)
-+  if (!pipe_server && !is_daemon && !gpgconf_list &&
-+                                                  fd_agent == GNUPG_INVALID_FD)
-     {
-      /* We have been called without any options and thus we merely
-         check whether an agent is already running.  We do this right
-@@ -1090,6 +1124,10 @@
-       agent_deinit_default_ctrl (ctrl);
-       xfree (ctrl);
-     }
-+  else if (fd_agent != GNUPG_INVALID_FD)
-+    {
-+      handle_agent_socks(fd_agent, GNUPG_INVALID_FD, fd_ssh_agent);
-+    }
-   else if (!is_daemon)
-     ; /* NOTREACHED */
-   else
-@@ -1287,26 +1325,8 @@
-           log_set_prefix (NULL, oldflags | JNLIB_LOG_RUN_DETACHED);
-           opt.running_detached = 1;
-         }
--
--      if (chdir("/"))
--        {
--          log_error ("chdir to / failed: %s\n", strerror (errno));
--          exit (1);
--        }
--
--      {
--        struct sigaction sa;
--
--        sa.sa_handler = SIG_IGN;
--        sigemptyset (&sa.sa_mask);
--        sa.sa_flags = 0;
--        sigaction (SIGPIPE, &sa, NULL);
--      }
--#endif /*!HAVE_W32_SYSTEM*/
--
--      log_info ("%s %s started\n", strusage(11), strusage(13) );
--      handle_connections (fd, fd_extra, fd_ssh);
--      assuan_sock_close (fd);
-+#endif /*!HAVE_W32_SYSTEM*/      
-+      handle_agent_socks(fd, fd_extra, fd_ssh);
-     }
- 
-   return 0;
-diff -Naur gnupg-2.1.1-upstream/doc/gpg-agent.texi gnupg-2.1.1/doc/gpg-agent.texi
---- gnupg-2.1.1-upstream/doc/gpg-agent.texi	2014-12-05 09:56:37.000000000 -0430
-+++ gnupg-2.1.1/doc/gpg-agent.texi	2014-12-23 16:26:38.366391186 -0430
-@@ -43,7 +43,15 @@
- .IR file ]
- .RI [ options ]
- .B  \-\-daemon
--.RI [ command_line ]
-+.br
-+.B  gpg-agent
-+.RB [ \-\-homedir
-+.IR dir ]
-+.RB [ \-\-options
-+.IR file ]
-+.RI [ options ]
-+.B  \-\-agent-fd
-+.IR fd
- @end ifset
- 
- @mansect description
-@@ -186,6 +194,11 @@
- a new process as a child of gpg-agent: @code{gpg-agent --daemon
- /bin/sh}.  This way you get a new shell with the environment setup
- properly; if you exit from this shell, gpg-agent terminates as well.
-+
-+@item --agent-fd @var{fd}
-+@opindex  agent-fd
-+Start the gpg-agent using @var{fd} as the listening socket. This is useful for
-+socket activation a la systemd and launchd.
- @end table
- 
- @mansect options
-@@ -545,6 +558,12 @@
- remote machine.
- 
- 
-+@item --ssh-agent-fd @var{fd}
-+@opindex ssh-agent-fd
-+
-+When starting the agent with @option{--agent-fd}, use this to pass in a socket
-+to be used for the OpenSSH agent protocol.
-+
- @anchor{option --enable-ssh-support}
- @item --enable-ssh-support
- @opindex enable-ssh-support

From 5a5a5ade0fcc9317a7c75bde424aab3f32065e30 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 18 May 2015 01:40:26 +0300
Subject: [PATCH 1179/2322] libx86: Add patch from debian to fix build on ARM

Without this, the build fails even with x86emu:

make LIBRARY=static static
make[1]: Entering directory '/tmp/nix-build-libx86-1.1.drv-0/libx86-1.1'
gcc -O2 -Wall -DDEBUG -g   -c -o x86-common.o x86-common.c
gcc -O2 -Wall -DDEBUG -g   -c -o thunk.o thunk.c
thunk.c: In function 'x_inb':
thunk.c:40:9: error: impossible constraint in 'asm'
         __asm__ __volatile__("in" #bwl " %w1, %" #bw "0" : "=a"(value) : "Nd"(port)); \
         ^
thunk.c:44:1: note: in expansion of macro '__BUILDIO'
 __BUILDIO(b,b,char)
 ^
<builtin>: recipe for target 'thunk.o' failed
make[1]: *** [thunk.o] Error 1
make[1]: Leaving directory '/tmp/nix-build-libx86-1.1.drv-0/libx86-1.1'
Makefile:17: recipe for target 'default' failed
make: *** [default] Error 2
---
 pkgs/development/libraries/libx86/default.nix |  4 +-
 .../libraries/libx86/non-x86.patch            | 38 +++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/libx86/non-x86.patch

diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix
index 09cc623cbb1..011e936548a 100644
--- a/pkgs/development/libraries/libx86/default.nix
+++ b/pkgs/development/libraries/libx86/default.nix
@@ -12,13 +12,13 @@ rec {
   inherit buildInputs;
 
   phaseNames = ["doPatch" "fixX86Def" "killUsr" "doMakeInstall"];
-  patches = [./constants.patch];
+  patches = [./constants.patch ./non-x86.patch];
 
   # using BACKEND=x86emu on 64bit systems fixes:
   #  http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html
   makeFlags = [
     "DESTDIR=$out"
-  ] ++ a.stdenv.lib.optionals ( a.stdenv.system == "x86_64-linux" ) [ "BACKEND=x86emu" ]; 
+  ] ++ a.stdenv.lib.optionals ( a.stdenv.isx86_64 || a.stdenv.isArm ) [ "BACKEND=x86emu" ];
 
   fixX86Def = a.fullDepEntry (''
     sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@'
diff --git a/pkgs/development/libraries/libx86/non-x86.patch b/pkgs/development/libraries/libx86/non-x86.patch
new file mode 100644
index 00000000000..0d41cd737f0
--- /dev/null
+++ b/pkgs/development/libraries/libx86/non-x86.patch
@@ -0,0 +1,38 @@
+diff -Naur libx86-1.1+ds1.orig/Makefile libx86-1.1+ds1/Makefile
+--- libx86-1.1+ds1.orig/Makefile	2008-05-19 12:28:59.000000000 +0300
++++ libx86-1.1+ds1/Makefile	2012-02-20 01:32:03.750068423 +0200
+@@ -5,6 +5,7 @@
+ ifeq ($(BACKEND),x86emu)
+ 	OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \
+ 	x86emu/ops.o x86emu/ops2.o x86emu/prim_ops.o x86emu/sys.o
++	CFLAGS += -DX86EMU
+ else
+ 	OBJECTS += lrmi.o
+ endif
+diff -Naur libx86-1.1+ds1.orig/thunk.c libx86-1.1+ds1/thunk.c
+--- libx86-1.1+ds1.orig/thunk.c	2008-04-03 03:48:00.000000000 +0300
++++ libx86-1.1+ds1/thunk.c	2012-02-20 01:12:56.468820192 +0200
+@@ -32,6 +32,7 @@
+ #define TRUE 1
+ #define FALSE 0
+ 
++#ifndef X86EMU
+ #define __BUILDIO(bwl,bw,type) \
+ static inline void out##bwl##_local(unsigned long port, unsigned type value) {        __asm__ __volatile__("out" #bwl " %" #bw "0, %w1" : : "a"(value), "Nd"(port)); \
+ }\
+@@ -44,6 +45,15 @@
+ __BUILDIO(b,b,char)
+ __BUILDIO(w,w,short)
+ __BUILDIO(l,,int)
++#else
++/* use libc functions */
++#define inb_local inb
++#define inw_local inw
++#define inl_local inl
++#define outb_local outb
++#define outw_local outw
++#define outl_local outl
++#endif /* X86EMU */
+ 
+ 
+ char *mmap_addr = SHMERRORPTR;

From 7233ca0488707c23bac26914f41dea2513cd9ab3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 18 May 2015 01:42:18 +0300
Subject: [PATCH 1180/2322] read-edid: New package at version 3.0.2

---
 pkgs/os-specific/linux/read-edid/default.nix | 25 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/os-specific/linux/read-edid/default.nix

diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/os-specific/linux/read-edid/default.nix
new file mode 100644
index 00000000000..fdf2c4c9f12
--- /dev/null
+++ b/pkgs/os-specific/linux/read-edid/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, cmake, libx86 }:
+
+stdenv.mkDerivation rec {
+  name = "read-edid-${version}";
+  version = "3.0.2";
+
+  src = fetchurl {
+    url = "http://www.polypux.org/projects/read-edid/${name}.tar.gz";
+    sha256 = "0vqqmwsgh2gchw7qmpqk6idgzcm5rqf2fab84y7gk42v1x2diin7";
+  };
+
+  buildInputs = [ cmake libx86 ];
+
+  patchPhase = ''
+    substituteInPlace CMakeLists.txt --replace 'COPYING' 'LICENSE'
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tool for reading and parsing EDID data from monitors";
+    homepage = http://www.polypux.org/projects/read-edid/;
+    license = licenses.bsd2; # Quoted: "This is an unofficial license. Let's call it BSD-like."
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62622cd8a0d..ce83ce492aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2684,6 +2684,8 @@ let
 
   privateer = callPackage ../games/privateer { };
 
+  read-edid = callPackage ../os-specific/linux/read-edid { };
+
   redmine = callPackage ../applications/version-management/redmine { };
 
   rtmpdump = callPackage ../tools/video/rtmpdump { };

From 2c9b93b01c471a4d933ae05e36504c6f26d1f08b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 18 May 2015 01:43:13 +0300
Subject: [PATCH 1181/2322] i2c-tools: New package at version 3.1.1

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

diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix
new file mode 100644
index 00000000000..5cac6069e72
--- /dev/null
+++ b/pkgs/os-specific/linux/i2c-tools/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, perl, read-edid }:
+
+stdenv.mkDerivation rec {
+  name = "i2c-tools-${version}";
+  version = "3.1.1";
+
+  src = fetchurl {
+    url = "http://dl.lm-sensors.org/i2c-tools/releases/${name}.tar.bz2";
+    sha256 = "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l";
+  };
+
+  buildInputs = [ perl ];
+
+  patchPhase = ''
+    substituteInPlace eeprom/decode-edid --replace "/usr/sbin/parse-edid" "${read-edid}/bin/parse-edid"
+    substituteInPlace stub/i2c-stub-from-dump --replace "/sbin/" ""
+  '';
+
+  installPhase = ''
+    make install prefix=$out
+    rm -rf $out/include # Installs include/linux/i2c-dev.h that conflics with kernel headers
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Set of I2C tools for Linux";
+    homepage = http://www.lm-sensors.org/wiki/I2CTools;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce83ce492aa..bcf02133be7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1792,6 +1792,8 @@ let
 
   hwinfo = callPackage ../tools/system/hwinfo { };
 
+  i2c-tools = callPackage ../os-specific/linux/i2c-tools { };
+
   i2p = callPackage ../tools/networking/i2p {};
 
   i2pd = callPackage ../tools/networking/i2pd {};

From a4925bcfa8ba5517dda7fa5369b2493f363936af Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jun 2015 18:07:18 +0200
Subject: [PATCH 1182/2322] Remove obsolete stuff

---
 lib/options.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/lib/options.nix b/lib/options.nix
index eed43daaecc..a30397c7216 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -59,20 +59,6 @@ rec {
     else if all isInt list && all (x: x == head list) list then head list
     else throw "Cannot merge definitions of `${showOption loc}' given in ${showFiles (getFiles defs)}.";
 
-  /* Obsolete, will remove soon.  Specify an option type or apply
-     function instead.  */
-  mergeTypedOption = typeName: predicate: merge: loc: list:
-    let list' = map (x: x.value) list; in
-    if all predicate list then merge list'
-    else throw "Expected a ${typeName}.";
-
-  mergeEnableOption = mergeTypedOption "boolean"
-    (x: true == x || false == x) (fold lib.or false);
-
-  mergeListOption = mergeTypedOption "list" isList concatLists;
-
-  mergeStringOption = mergeTypedOption "string" isString lib.concatStrings;
-
   mergeOneOption = loc: defs:
     if defs == [] then abort "This case should never happen."
     else if length defs != 1 then

From e212e07cf6aac9d9e1c46db34b17fd16be2399c3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jun 2015 18:04:27 +0200
Subject: [PATCH 1183/2322] Make types.bool complain on conflicting definitions

Previously, conflicting definitions would merge to "true". Now they
give an error, e.g.

  error: The option `hardware.enableAllFirmware' has conflicting definitions, in `/etc/nixos/configurations/misc/eelco/stuff.nix' and `/etc/nixos/configurations/misc/eelco/mandark.nix'.
---
 lib/options.nix | 9 +++++++++
 lib/types.nix   | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/options.nix b/lib/options.nix
index a30397c7216..bfc5b5fa2ae 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -65,6 +65,15 @@ rec {
       throw "The unique option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."
     else (head defs).value;
 
+  /* "Merge" option definitions by checking that they all have the same value. */
+  mergeEqualOption = loc: defs:
+    if defs == [] then abort "This case should never happen."
+    else fold (def: val:
+      if def.value != val then
+        throw "The option `${showOption loc}' has conflicting definitions, in ${showFiles (getFiles defs)}."
+      else
+        val) (head defs).value defs;
+
   getValues = map (x: x.value);
   getFiles = map (x: x.file);
 
diff --git a/lib/types.nix b/lib/types.nix
index f22c7661634..0a54a5598f1 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -54,7 +54,7 @@ rec {
     bool = mkOptionType {
       name = "boolean";
       check = isBool;
-      merge = loc: fold (x: y: x.value || y) false;
+      merge = mergeEqualOption;
     };
 
     int = mkOptionType {

From 9366af1b94ed42b5e92a776b1ddc4ecd46e69ad1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jun 2015 17:42:55 +0200
Subject: [PATCH 1184/2322] "types.uniq types.string" -> "types.str"

---
 nixos/modules/services/networking/atftpd.nix | 2 +-
 nixos/modules/services/x11/redshift.nix      | 8 ++++----
 nixos/modules/services/x11/unclutter.nix     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/atftpd.nix b/nixos/modules/services/networking/atftpd.nix
index 47465ba948a..a9fd1e3ef8e 100644
--- a/nixos/modules/services/networking/atftpd.nix
+++ b/nixos/modules/services/networking/atftpd.nix
@@ -26,7 +26,7 @@ in
 
       root = mkOption {
         default = "/var/empty";
-        type = types.uniq types.string;
+        type = types.str;
         description = ''
           Document root directory for the atftpd.
         '';
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index d73b58de6c0..4ccb9153526 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -14,12 +14,12 @@ in {
 
     services.redshift.latitude = mkOption {
       description = "Your current latitude";
-      type = types.uniq types.string;
+      type = types.str;
     };
 
     services.redshift.longitude = mkOption {
       description = "Your current longitude";
-      type = types.uniq types.string;
+      type = types.str;
     };
 
     services.redshift.temperature = {
@@ -39,12 +39,12 @@ in {
       day = mkOption {
         description = "Screen brightness to apply during the day (between 0.1 and 1.0)";
         default = "1";
-        type = types.uniq types.string;
+        type = types.str;
       };
       night = mkOption {
         description = "Screen brightness to apply during the night (between 0.1 and 1.0)";
         default = "1";
-        type = types.uniq types.string;
+        type = types.str;
       };
     };
   };
diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix
index 556d9e187fd..6e8719e1053 100644
--- a/nixos/modules/services/x11/unclutter.nix
+++ b/nixos/modules/services/x11/unclutter.nix
@@ -13,7 +13,7 @@ in {
     services.unclutter.arguments = mkOption {
       description = "Arguments to pass to unclutter command";
       default = "-idle 1";
-      type = types.uniq types.string;
+      type = types.str;
     };
   };
 

From c738b309eea83669bbd590f7293db5d725233193 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jun 2015 18:10:26 +0200
Subject: [PATCH 1185/2322] types.uniq types.bool -> types.bool

---
 lib/modules.nix                                    |  2 +-
 nixos/modules/services/databases/influxdb.nix      |  2 +-
 nixos/modules/services/databases/neo4j.nix         |  2 +-
 nixos/modules/services/misc/apache-kafka.nix       |  2 +-
 nixos/modules/services/misc/mesos-master.nix       |  2 +-
 nixos/modules/services/misc/mesos-slave.nix        |  2 +-
 nixos/modules/services/misc/zookeeper.nix          |  2 +-
 nixos/modules/services/monitoring/apcupsd.nix      |  2 +-
 nixos/modules/services/monitoring/graphite.nix     | 14 +++++++-------
 nixos/modules/services/monitoring/statsd.nix       |  2 +-
 .../modules/services/network-filesystems/samba.nix |  2 +-
 nixos/modules/services/networking/atftpd.nix       |  2 +-
 nixos/modules/services/networking/freenet.nix      |  2 +-
 nixos/modules/services/networking/iodined.nix      |  4 ++--
 nixos/modules/services/networking/kippo.nix        |  2 +-
 nixos/modules/services/networking/notbit.nix       |  8 ++++----
 nixos/modules/services/networking/unifi.nix        |  2 +-
 nixos/modules/services/scheduling/chronos.nix      |  2 +-
 nixos/modules/services/scheduling/marathon.nix     |  2 +-
 nixos/modules/services/search/elasticsearch.nix    |  2 +-
 nixos/modules/services/torrent/peerflix.nix        |  2 +-
 nixos/modules/services/torrent/transmission.nix    |  2 +-
 .../modules/services/web-servers/lighttpd/cgit.nix |  2 +-
 .../services/web-servers/lighttpd/default.nix      |  6 +++---
 .../services/web-servers/lighttpd/gitweb.nix       |  2 +-
 25 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 3561dd0d1d3..73dbdd371f6 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -43,7 +43,7 @@ rec {
           };
 
           _module.check = mkOption {
-            type = types.uniq types.bool;
+            type = types.bool;
             internal = true;
             default = check;
             description = "Whether to check whether all option definitions have matching declarations.";
diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix
index b57ccebae16..08963f7aab7 100644
--- a/nixos/modules/services/databases/influxdb.nix
+++ b/nixos/modules/services/databases/influxdb.nix
@@ -55,7 +55,7 @@ in
       enable = mkOption {
         default = false;
         description = "Whether to enable the influxdb server";
-        type = types.uniq types.bool;
+        type = types.bool;
       };
 
       package = mkOption {
diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix
index 575034c93ab..3cf22db7da2 100644
--- a/nixos/modules/services/databases/neo4j.nix
+++ b/nixos/modules/services/databases/neo4j.nix
@@ -43,7 +43,7 @@ in {
     enable = mkOption {
       description = "Whether to enable neo4j.";
       default = false;
-      type = types.uniq types.bool;
+      type = types.bool;
     };
 
     package = mkOption {
diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
index 5314a096fe0..cbfeef7a9c7 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -33,7 +33,7 @@ in {
     enable = mkOption {
       description = "Whether to enable Apache Kafka.";
       default = false;
-      type = types.uniq types.bool;
+      type = types.bool;
     };
 
     brokerId = mkOption {
diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixos/modules/services/misc/mesos-master.nix
index 52f08c53b1d..6cbe94029d2 100644
--- a/nixos/modules/services/misc/mesos-master.nix
+++ b/nixos/modules/services/misc/mesos-master.nix
@@ -13,7 +13,7 @@ in {
       enable = mkOption {
         description = "Whether to enable the Mesos Master.";
         default = false;
-        type = types.uniq types.bool;
+        type = types.bool;
       };
 
       port = mkOption {
diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix
index 811aa812c8d..7a7fcf105ac 100644
--- a/nixos/modules/services/misc/mesos-slave.nix
+++ b/nixos/modules/services/misc/mesos-slave.nix
@@ -21,7 +21,7 @@ in {
       enable = mkOption {
         description = "Whether to enable the Mesos Slave.";
         default = false;
-        type = types.uniq types.bool;
+        type = types.bool;
       };
 
       ip = mkOption {
diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix
index 47675b8876c..827a050be11 100644
--- a/nixos/modules/services/misc/zookeeper.nix
+++ b/nixos/modules/services/misc/zookeeper.nix
@@ -27,7 +27,7 @@ in {
     enable = mkOption {
       description = "Whether to enable Zookeeper.";
       default = false;
-      type = types.uniq types.bool;
+      type = types.bool;
     };
 
     port = mkOption {
diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix
index 6cd0254dbe3..9abd6e9ab64 100644
--- a/nixos/modules/services/monitoring/apcupsd.nix
+++ b/nixos/modules/services/monitoring/apcupsd.nix
@@ -74,7 +74,7 @@ in
 
       enable = mkOption {
         default = false;
-        type = types.uniq types.bool;
+        type = types.bool;
         description = ''
           Whether to enable the APC UPS daemon. apcupsd monitors your UPS and
           permits orderly shutdown of your computer in the event of a power
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 2a572a6a065..fb30daba1dc 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -67,7 +67,7 @@ in {
       enable = mkOption {
         description = "Whether to enable graphite web frontend.";
         default = false;
-        type = types.uniq types.bool;
+        type = types.bool;
       };
 
       host = mkOption {
@@ -95,7 +95,7 @@ in {
           <link xlink:href="http://graphite-api.readthedocs.org/en/latest/"/>
         '';
         default = false;
-        type = types.uniq types.bool;
+        type = types.bool;
       };
 
       finders = mkOption {
@@ -177,7 +177,7 @@ in {
       enableCache = mkOption {
         description = "Whether to enable carbon cache, the graphite storage daemon.";
         default = false;
-        type = types.uniq types.bool;
+        type = types.bool;
       };
 
       storageAggregation = mkOption {
@@ -234,7 +234,7 @@ in {
       enableRelay = mkOption {
         description = "Whether to enable carbon relay, the carbon replication and sharding service.";
         default = false;
-        type = types.uniq types.bool;
+        type = types.bool;
       };
 
       relayRules = mkOption {
@@ -251,7 +251,7 @@ in {
       enableAggregator = mkOption {
         description = "Whether to enable carbon agregator, the carbon buffering service.";
         default = false;
-        type = types.uniq types.bool;
+        type = types.bool;
       };
 
       aggregationRules = mkOption {
@@ -269,7 +269,7 @@ in {
       enable = mkOption {
         description = "Whether to enable seyren service.";
         default = false;
-        type = types.uniq types.bool;
+        type = types.bool;
       };
 
       port = mkOption {
@@ -319,7 +319,7 @@ in {
           <link xlink:href="https://github.com/seatgeek/graphite-pager"/>
         '';
         default = false;
-        type = types.uniq types.bool;
+        type = types.bool;
       };
 
       redisUrl = mkOption {
diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix
index 7d7ca27bb2f..10ce5a4ce4c 100644
--- a/nixos/modules/services/monitoring/statsd.nix
+++ b/nixos/modules/services/monitoring/statsd.nix
@@ -37,7 +37,7 @@ in
     enable = mkOption {
       description = "Whether to enable statsd stats aggregation service";
       default = false;
-      type = types.uniq types.bool;
+      type = types.bool;
     };
 
     host = mkOption {
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 8b3741bca0a..bbf21634c36 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -137,7 +137,7 @@ in
 
       nsswins = mkOption {
         default = false;
-        type = types.uniq types.bool;
+        type = types.bool;
         description = ''
           Whether to enable the WINS NSS (Name Service Switch) plug-in.
           Enabling it allows applications to resolve WINS/NetBIOS names (a.k.a.
diff --git a/nixos/modules/services/networking/atftpd.nix b/nixos/modules/services/networking/atftpd.nix
index a9fd1e3ef8e..d875ddc6352 100644
--- a/nixos/modules/services/networking/atftpd.nix
+++ b/nixos/modules/services/networking/atftpd.nix
@@ -18,7 +18,7 @@ in
 
       enable = mkOption {
         default = false;
-        type = types.uniq types.bool;
+        type = types.bool;
         description = ''
           Whenever to enable the atftpd TFTP server.
         '';
diff --git a/nixos/modules/services/networking/freenet.nix b/nixos/modules/services/networking/freenet.nix
index e9cacf4a16e..b069526c768 100644
--- a/nixos/modules/services/networking/freenet.nix
+++ b/nixos/modules/services/networking/freenet.nix
@@ -20,7 +20,7 @@ in
     services.freenet = {
 
       enable = mkOption {
-        type = types.uniq types.bool;
+        type = types.bool;
         default = false;
         description = "Enable the Freenet daemon";
       };
diff --git a/nixos/modules/services/networking/iodined.nix b/nixos/modules/services/networking/iodined.nix
index bc0fbb42c99..6bfe62e6261 100644
--- a/nixos/modules/services/networking/iodined.nix
+++ b/nixos/modules/services/networking/iodined.nix
@@ -20,13 +20,13 @@ in
     services.iodined = {
 
       enable = mkOption {
-        type = types.uniq types.bool;
+        type = types.bool;
         default = false;
         description = "Enable iodine, ip over dns daemon";
       };
 
       client = mkOption {
-        type = types.uniq types.bool;
+        type = types.bool;
         default = false;
         description = "Start iodine in client mode";
       };
diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix
index d2045c9efc5..3412d02862b 100644
--- a/nixos/modules/services/networking/kippo.nix
+++ b/nixos/modules/services/networking/kippo.nix
@@ -16,7 +16,7 @@ rec {
     services.kippo = {
       enable = mkOption {
         default = false;
-        type = types.uniq types.bool;
+        type = types.bool;
         description = ''Enable the kippo honeypot ssh server.'';
       };
       port = mkOption {
diff --git a/nixos/modules/services/networking/notbit.nix b/nixos/modules/services/networking/notbit.nix
index 2e1412ff7c8..8aaccebccde 100644
--- a/nixos/modules/services/networking/notbit.nix
+++ b/nixos/modules/services/networking/notbit.nix
@@ -31,7 +31,7 @@ with lib;
     services.notbit = {
 
       enable = mkOption {
-        type = types.uniq types.bool;
+        type = types.bool;
         default = false;
         description = ''
           Enables the notbit daemon and provides a sendmail binary named `notbit-system-sendmail` for sending mail over the system instance of notbit. Users must be in the notbit group in order to send mail over the system notbit instance. Currently mail recipt is not supported.
@@ -65,19 +65,19 @@ with lib;
       };
 
       specifiedPeersOnly = mkOption {
-        type = types.uniq types.bool;
+        type = types.bool;
         default = false;
         description = "If true, notbit will only connect to peers specified by the peers option.";
       };
 
       allowPrivateAddresses = mkOption {
-        type = types.uniq types.bool;
+        type = types.bool;
         default = false;
         description = "If true, notbit will allow connections to to RFC 1918 addresses.";
       };
 
       noBootstrap = mkOption {
-        type = types.uniq types.bool;
+        type = types.bool;
         default = false;
         description = "If true, notbit will not bootstrap an initial peerlist from bitmessage.org servers";
       };
diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index d6c8e0dc7a5..fd9e58f24a4 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -25,7 +25,7 @@ in
   options = {
 
     services.unifi.enable = mkOption {
-      type = types.uniq types.bool;
+      type = types.bool;
       default = false;
       description = ''
         Whether or not to enable the unifi controller service.
diff --git a/nixos/modules/services/scheduling/chronos.nix b/nixos/modules/services/scheduling/chronos.nix
index f36b886a744..db1f0f5f00c 100644
--- a/nixos/modules/services/scheduling/chronos.nix
+++ b/nixos/modules/services/scheduling/chronos.nix
@@ -13,7 +13,7 @@ in {
     enable = mkOption {
       description = "Whether to enable graphite web frontend.";
       default = false;
-      type = types.uniq types.bool;
+      type = types.bool;
     };
 
     httpPort = mkOption {
diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix
index b9f4a808b0c..4e837c62dc1 100644
--- a/nixos/modules/services/scheduling/marathon.nix
+++ b/nixos/modules/services/scheduling/marathon.nix
@@ -12,7 +12,7 @@ in {
 
   options.services.marathon = {
     enable = mkOption {
-      type = types.uniq types.bool;
+      type = types.bool;
       default = false;
       description = ''
 	Whether to enable the marathon mesos framework.
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index 12f163db463..f6a3fad6c5d 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -34,7 +34,7 @@ in {
     enable = mkOption {
       description = "Whether to enable elasticsearch.";
       default = false;
-      type = types.uniq types.bool;
+      type = types.bool;
     };
 
     host = mkOption {
diff --git a/nixos/modules/services/torrent/peerflix.nix b/nixos/modules/services/torrent/peerflix.nix
index 0360deac08b..38fbd3b226c 100644
--- a/nixos/modules/services/torrent/peerflix.nix
+++ b/nixos/modules/services/torrent/peerflix.nix
@@ -20,7 +20,7 @@ in {
     enable = mkOption {
       description = "Whether to enable peerflix service.";
       default = false;
-      type = types.uniq types.bool;
+      type = types.bool;
     };
 
     stateDir = mkOption {
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 135113b3ceb..44cd6216f5c 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -27,7 +27,7 @@ in
   options = {
     services.transmission = {
       enable = mkOption {
-        type = types.uniq types.bool;
+        type = types.bool;
         default = false;
         description = ''
           Whether or not to enable the headless Transmission BitTorrent daemon.
diff --git a/nixos/modules/services/web-servers/lighttpd/cgit.nix b/nixos/modules/services/web-servers/lighttpd/cgit.nix
index 34b2fa600ad..c8590e6a54e 100644
--- a/nixos/modules/services/web-servers/lighttpd/cgit.nix
+++ b/nixos/modules/services/web-servers/lighttpd/cgit.nix
@@ -15,7 +15,7 @@ in
 
     enable = mkOption {
       default = false;
-      type = types.uniq types.bool;
+      type = types.bool;
       description = ''
         If true, enable cgit (fast web interface for git repositories) as a
         sub-service in lighttpd. cgit will be accessible at
diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix
index 06f310eeb93..490df268e8f 100644
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
@@ -122,7 +122,7 @@ in
 
       enable = mkOption {
         default = false;
-        type = types.uniq types.bool;
+        type = types.bool;
         description = ''
           Enable the lighttpd web server.
         '';
@@ -146,7 +146,7 @@ in
 
       mod_userdir = mkOption {
         default = false;
-        type = types.uniq types.bool;
+        type = types.bool;
         description = ''
           If true, requests in the form /~user/page.html are rewritten to take
           the file public_html/page.html from the home directory of the user.
@@ -168,7 +168,7 @@ in
 
       mod_status = mkOption {
         default = false;
-        type = types.uniq types.bool;
+        type = types.bool;
         description = ''
           Show server status overview at /server-status, statistics at
           /server-statistics and list of loaded modules at /server-config.
diff --git a/nixos/modules/services/web-servers/lighttpd/gitweb.nix b/nixos/modules/services/web-servers/lighttpd/gitweb.nix
index ef7072ecba3..f12cc973446 100644
--- a/nixos/modules/services/web-servers/lighttpd/gitweb.nix
+++ b/nixos/modules/services/web-servers/lighttpd/gitweb.nix
@@ -17,7 +17,7 @@ in
 
     enable = mkOption {
       default = false;
-      type = types.uniq types.bool;
+      type = types.bool;
       description = ''
         If true, enable gitweb in lighttpd. Access it at http://yourserver/gitweb
       '';

From 19ffa212af8763e84e09e1e56fba99e1d7124d84 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jun 2015 18:11:32 +0200
Subject: [PATCH 1186/2322] types.uniq types.int -> types.int

types.int already implies uniqueness.
---
 nixos/modules/services/backup/almir.nix                     | 2 +-
 nixos/modules/services/backup/bacula.nix                    | 6 +++---
 .../services/continuous-integration/jenkins/default.nix     | 2 +-
 nixos/modules/services/misc/gpsd.nix                        | 4 ++--
 nixos/modules/services/monitoring/statsd.nix                | 4 ++--
 nixos/modules/services/monitoring/ups.nix                   | 4 ++--
 nixos/modules/services/networking/freenet.nix               | 2 +-
 nixos/modules/services/networking/kippo.nix                 | 2 +-
 nixos/modules/services/networking/notbit.nix                | 4 ++--
 nixos/modules/services/networking/ntopng.nix                | 2 +-
 nixos/modules/services/torrent/transmission.nix             | 2 +-
 nixos/modules/services/web-servers/lighttpd/default.nix     | 2 +-
 nixos/modules/services/x11/redshift.nix                     | 4 ++--
 nixos/modules/system/boot/systemd.nix                       | 2 +-
 14 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/services/backup/almir.nix b/nixos/modules/services/backup/almir.nix
index ec39a997028..fbb4ff4034f 100644
--- a/nixos/modules/services/backup/almir.nix
+++ b/nixos/modules/services/backup/almir.nix
@@ -95,7 +95,7 @@ in {
 
       port = mkOption {
         default = 35000;
-        type = types.uniq types.int;
+        type = types.int;
         description = ''
           Port for Almir web server to listen on.
         '';
diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index c2255f68818..9e3ae66f808 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -182,7 +182,7 @@ in {
  
       port = mkOption {
         default = 9102;
-        type = types.uniq types.int;
+        type = types.int;
         description = ''
         	This specifies the port number on which the Client listens for Director connections. It must agree with the FDPort specified in the Client resource of the Director's configuration file. The default is 9102.
         '';
@@ -237,7 +237,7 @@ in {
  
       port = mkOption {
         default = 9103;
-        type = types.uniq types.int;
+        type = types.int;
         description = ''
           Specifies port number on which the Storage daemon listens for Director connections. The default is 9103.
         '';
@@ -302,7 +302,7 @@ in {
  
       port = mkOption {
         default = 9101;
-        type = types.uniq types.int;
+        type = types.int;
         description = ''
           Specify the port (a positive integer) on which the Director daemon will listen for Bacula Console connections. This same port number must be specified in the Director resource of the Console configuration file. The default is 9101, so normally this directive need not be specified. This directive should not be used if you specify DirAddresses (N.B plural) directive.
         '';
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 29a81f066ab..ccea85faa3e 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -50,7 +50,7 @@ in {
 
       port = mkOption {
         default = 8080;
-        type = types.uniq types.int;
+        type = types.int;
         description = ''
           Specifies port number on which the jenkins HTTP interface listens. The default is 8080.
         '';
diff --git a/nixos/modules/services/misc/gpsd.nix b/nixos/modules/services/misc/gpsd.nix
index 4a677f33fa0..a4a4c7b5d93 100644
--- a/nixos/modules/services/misc/gpsd.nix
+++ b/nixos/modules/services/misc/gpsd.nix
@@ -54,7 +54,7 @@ in
       };
 
       port = mkOption {
-        type = types.uniq types.int;
+        type = types.int;
         default = 2947;
         description = ''
           The port where to listen for TCP connections.
@@ -62,7 +62,7 @@ in
       };
 
       debugLevel = mkOption {
-        type = types.uniq types.int;
+        type = types.int;
         default = 0;
         description = ''
           The debugging level.
diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix
index 10ce5a4ce4c..d9e0b83e238 100644
--- a/nixos/modules/services/monitoring/statsd.nix
+++ b/nixos/modules/services/monitoring/statsd.nix
@@ -49,7 +49,7 @@ in
     port = mkOption {
       description = "Port that stats listens for messages on over UDP";
       default = 8125;
-      type = types.uniq types.int;
+      type = types.int;
     };
 
     mgmt_address = mkOption {
@@ -61,7 +61,7 @@ in
     mgmt_port = mkOption {
       description = "Port to run the management TCP interface on";
       default = 8126;
-      type = types.uniq types.int;
+      type = types.int;
     };
 
     backends = mkOption {
diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix
index cc9026f768a..98817f22f5d 100644
--- a/nixos/modules/services/monitoring/ups.nix
+++ b/nixos/modules/services/monitoring/ups.nix
@@ -32,7 +32,7 @@ let
 
       shutdownOrder = mkOption {
         default = 0;
-        type = types.uniq types.int;
+        type = types.int;
         description = ''
           When you have multiple UPSes on your system, you usually need to
           turn them off in a certain order.  upsdrvctl shuts down all the
@@ -151,7 +151,7 @@ in
 
       maxStartDelay = mkOption {
         default = 45;
-        type = types.uniq types.int;
+        type = types.int;
         description = ''
           This can be set as a global variable above your first UPS
           definition and it can also be set in a UPS section.  This value
diff --git a/nixos/modules/services/networking/freenet.nix b/nixos/modules/services/networking/freenet.nix
index b069526c768..3903a2c708c 100644
--- a/nixos/modules/services/networking/freenet.nix
+++ b/nixos/modules/services/networking/freenet.nix
@@ -26,7 +26,7 @@ in
       };
 
       nice = mkOption {
-        type = types.uniq types.int;
+        type = types.int;
         default = 10;
         description = "Set the nice level for the Freenet daemon";
       };
diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix
index 3412d02862b..68f26eefe27 100644
--- a/nixos/modules/services/networking/kippo.nix
+++ b/nixos/modules/services/networking/kippo.nix
@@ -21,7 +21,7 @@ rec {
       };
       port = mkOption {
         default = 2222;
-        type = types.uniq types.int;
+        type = types.int;
         description = ''TCP port number for kippo to bind to.'';
       };
       hostname = mkOption {
diff --git a/nixos/modules/services/networking/notbit.nix b/nixos/modules/services/networking/notbit.nix
index 8aaccebccde..a96e181cb80 100644
--- a/nixos/modules/services/networking/notbit.nix
+++ b/nixos/modules/services/networking/notbit.nix
@@ -39,13 +39,13 @@ with lib;
       };
 
       port = mkOption {
-        type = types.uniq types.int;
+        type = types.int;
         default = 8444;
         description = "The port which the daemon listens for other bitmessage clients";
       };
 
       nice = mkOption {
-        type = types.uniq types.int;
+        type = types.int;
         default = 10;
         description = "Set the nice level for the notbit daemon";
       };
diff --git a/nixos/modules/services/networking/ntopng.nix b/nixos/modules/services/networking/ntopng.nix
index ab86f1a5b2b..c1525711713 100644
--- a/nixos/modules/services/networking/ntopng.nix
+++ b/nixos/modules/services/networking/ntopng.nix
@@ -57,7 +57,7 @@ in
 
       http-port = mkOption {
         default = 3000;
-        type = types.uniq types.int;
+        type = types.int;
         description = ''
           Sets the HTTP port of the embedded web server.
         '';
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 44cd6216f5c..cf548bc696c 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -66,7 +66,7 @@ in
       };
 
       port = mkOption {
-        type = types.uniq types.int;
+        type = types.int;
         default = 9091;
         description = "TCP port number to run the RPC/web interface.";
       };
diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix
index 490df268e8f..2c662c0aead 100644
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
@@ -130,7 +130,7 @@ in
 
       port = mkOption {
         default = 80;
-        type = types.uniq types.int;
+        type = types.int;
         description = ''
           TCP port number for lighttpd to bind to.
         '';
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 4ccb9153526..99d19f6ab15 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -26,12 +26,12 @@ in {
       day = mkOption {
         description = "Colour temperature to use during day time";
         default = 5500;
-        type = types.uniq types.int;
+        type = types.int;
       };
       night = mkOption {
         description = "Colour temperature to use during night time";
         default = 3700;
-        type = types.uniq types.int;
+        type = types.int;
       };
     };
 
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 1fde720bba0..2ad12c51b21 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -491,7 +491,7 @@ in
 
     services.journald.rateLimitBurst = mkOption {
       default = 100;
-      type = types.uniq types.int;
+      type = types.int;
       description = ''
         Configures the rate limiting burst limit (number of messages per
         interval) that is applied to all messages generated on the system.

From c63bc92d4c040fb7999185e1948b29c3c84bacf9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jun 2015 18:12:32 +0200
Subject: [PATCH 1187/2322] types.uniq types.str -> types.str

---
 nixos/modules/hardware/video/bumblebee.nix | 2 +-
 nixos/modules/misc/nixpkgs.nix             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix
index e20ebc3041e..e341eac4a81 100644
--- a/nixos/modules/hardware/video/bumblebee.nix
+++ b/nixos/modules/hardware/video/bumblebee.nix
@@ -26,7 +26,7 @@ in
     hardware.bumblebee.group = mkOption {
       default = "wheel";
       example = "video";
-      type = types.uniq types.str;
+      type = types.str;
       description = ''Group for bumblebee socket'';
     };
     hardware.bumblebee.connectDisplay = mkOption {
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 114feb2562d..fb5516c953c 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -59,7 +59,7 @@ in
     };
 
     nixpkgs.system = mkOption {
-      type = types.uniq types.str;
+      type = types.str;
       example = "i686-linux";
       description = ''
         Specifies the Nix platform type for which NixOS should be built.

From 6e6a96d42cf56cfcd042bbeab89e37f442f0cfcc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jun 2015 18:18:46 +0200
Subject: [PATCH 1188/2322] Some more type cleanup

---
 nixos/modules/config/shells-environment.nix          | 2 +-
 nixos/modules/misc/assertions.nix                    | 2 +-
 nixos/modules/programs/ssh.nix                       | 4 ++--
 nixos/modules/security/ca.nix                        | 2 +-
 nixos/modules/services/logging/logcheck.nix          | 2 +-
 nixos/modules/services/logging/rsyslogd.nix          | 2 +-
 nixos/modules/services/logging/syslogd.nix           | 2 +-
 nixos/modules/services/mail/opensmtpd.nix            | 2 +-
 nixos/modules/services/misc/apache-kafka.nix         | 2 +-
 nixos/modules/services/misc/mesos-master.nix         | 2 +-
 nixos/modules/services/misc/mesos-slave.nix          | 2 +-
 nixos/modules/services/misc/zookeeper.nix            | 2 +-
 nixos/modules/services/monitoring/ups.nix            | 2 +-
 nixos/modules/services/networking/dnsmasq.nix        | 2 +-
 nixos/modules/services/networking/firewall.nix       | 4 ++--
 nixos/modules/services/networking/minidlna.nix       | 2 +-
 nixos/modules/services/networking/networkmanager.nix | 4 ++--
 nixos/modules/services/networking/polipo.nix         | 2 +-
 nixos/modules/services/networking/ssh/sshd.nix       | 2 +-
 nixos/modules/services/networking/wpa_supplicant.nix | 2 +-
 nixos/modules/services/networking/znc.nix            | 4 ++--
 nixos/modules/services/search/elasticsearch.nix      | 2 +-
 nixos/modules/system/boot/luksroot.nix               | 2 +-
 nixos/modules/system/boot/stage-1.nix                | 2 +-
 nixos/modules/system/boot/systemd-unit-options.nix   | 4 ++--
 nixos/modules/tasks/filesystems.nix                  | 2 +-
 nixos/modules/tasks/kbd.nix                          | 2 +-
 nixos/modules/tasks/network-interfaces.nix           | 2 +-
 28 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index e5b342afcc4..bff0b299132 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -63,7 +63,7 @@ in
       description = ''
         A list of profiles used to setup the global environment.
       '';
-      type = types.listOf types.string;
+      type = types.listOf types.str;
     };
 
     environment.profileRelativeEnvVars = mkOption {
diff --git a/nixos/modules/misc/assertions.nix b/nixos/modules/misc/assertions.nix
index c1be36e98cb..c42de038e61 100644
--- a/nixos/modules/misc/assertions.nix
+++ b/nixos/modules/misc/assertions.nix
@@ -21,7 +21,7 @@ with lib;
     warnings = mkOption {
       internal = true;
       default = [];
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       example = [ "The `foo' service is deprecated and will go away soon!" ];
       description = ''
         This option allows modules to show warnings to users during
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 6ca73eea5f6..0d1ec500afc 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -27,7 +27,7 @@ in
     programs.ssh = {
 
       askPassword = mkOption {
-        type = types.string;
+        type = types.str;
         default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
         description = ''Program used by SSH to ask for passwords.'';
       };
@@ -77,7 +77,7 @@ in
       };
 
       agentTimeout = mkOption {
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
         default = null;
         example = "1h";
         description = ''
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix
index 31caab97a65..88f53eab9b4 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@@ -33,7 +33,7 @@ in
     };
 
     security.pki.certificates = mkOption {
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       default = [];
       example = singleton ''
         NixOS.org
diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index 1cd032ffa76..6069262b470 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@@ -192,7 +192,7 @@ in
 
       extraGroups = mkOption {
         default = [];
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         example = [ "postdrop" "mongodb" ];
         description = ''
           Extra groups for the logcheck user, for example to be able to use sendmail,
diff --git a/nixos/modules/services/logging/rsyslogd.nix b/nixos/modules/services/logging/rsyslogd.nix
index d4b7aa809f0..1ea96b8f132 100644
--- a/nixos/modules/services/logging/rsyslogd.nix
+++ b/nixos/modules/services/logging/rsyslogd.nix
@@ -66,7 +66,7 @@ in
       };
 
       extraParams = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [ ];
         example = [ "-m 0" ];
         description = ''
diff --git a/nixos/modules/services/logging/syslogd.nix b/nixos/modules/services/logging/syslogd.nix
index 325868079e2..a0f8e89fa69 100644
--- a/nixos/modules/services/logging/syslogd.nix
+++ b/nixos/modules/services/logging/syslogd.nix
@@ -83,7 +83,7 @@ in
       };
 
       extraParams = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [ ];
         example = [ "-m 0" ];
         description = ''
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index fbc4b1d7d8a..a3e50b42292 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -24,7 +24,7 @@ in {
       };
 
       extraServerArgs = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [];
         example = [ "-v" "-P mta" ];
         description = ''
diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
index cbfeef7a9c7..f6198e03bae 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -108,7 +108,7 @@ in {
         "-Djava.awt.headless=true"
         "-Djava.net.preferIPv4Stack=true"
       ];
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       example = [
         "-Djava.net.preferIPv4Stack=true"
         "-Dcom.sun.management.jmxremote"
diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixos/modules/services/misc/mesos-master.nix
index 6cbe94029d2..497646b2b41 100644
--- a/nixos/modules/services/misc/mesos-master.nix
+++ b/nixos/modules/services/misc/mesos-master.nix
@@ -45,7 +45,7 @@ in {
           See https://mesos.apache.org/documentation/latest/configuration/
         '';
         default = [ "" ];
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         example = [ "--credentials=VALUE" ];
       };
 
diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix
index 7a7fcf105ac..8c29734813a 100644
--- a/nixos/modules/services/misc/mesos-slave.nix
+++ b/nixos/modules/services/misc/mesos-slave.nix
@@ -70,7 +70,7 @@ in {
           See https://mesos.apache.org/documentation/latest/configuration/
         '';
         default = [ "" ];
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         example = [ "--gc_delay=3days" ];
       };
 
diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix
index 827a050be11..4ce692b6f6a 100644
--- a/nixos/modules/services/misc/zookeeper.nix
+++ b/nixos/modules/services/misc/zookeeper.nix
@@ -94,7 +94,7 @@ in {
     extraCmdLineOptions = mkOption {
       description = "Extra command line options for the Zookeeper launcher.";
       default = [ "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.local.only=true" ];
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       example = [ "-Djava.net.preferIPv4Stack=true" "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.local.only=true" ];
     };
 
diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix
index 98817f22f5d..eb478f7da65 100644
--- a/nixos/modules/services/monitoring/ups.nix
+++ b/nixos/modules/services/monitoring/ups.nix
@@ -63,7 +63,7 @@ let
 
       directives = mkOption {
         default = [];
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         description = ''
           List of configuration directives for this UPS.
         '';
diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index 18086154b6b..4a812167bb5 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -45,7 +45,7 @@ in
       };
 
       servers = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [];
         example = [ "8.8.8.8" "8.8.4.4" ];
         description = ''
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index b05a640e11f..40681f5b957 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -287,7 +287,7 @@ in
     };
 
     networking.firewall.trustedInterfaces = mkOption {
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       description =
         ''
           Traffic coming in from these interfaces will be accepted
@@ -379,7 +379,7 @@ in
     networking.firewall.connectionTrackingModules = mkOption {
       default = [ "ftp" ];
       example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ];
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       description =
         ''
           List of connection-tracking helpers that are auto-loaded.
diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix
index 989ee4d91af..51850496e2c 100644
--- a/nixos/modules/services/networking/minidlna.nix
+++ b/nixos/modules/services/networking/minidlna.nix
@@ -30,7 +30,7 @@ in
     };
 
     services.minidlna.mediaDirs = mkOption {
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       default = [];
       example = [ "/data/media" "V,/home/alice/video" ];
       description =
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 60f380f024b..adbc6099c95 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -118,7 +118,7 @@ in {
       };
 
       appendNameservers = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [];
         description = ''
           A list of name servers that should be appended
@@ -127,7 +127,7 @@ in {
       };
 
       insertNameservers = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [];
         description = ''
           A list of name servers that should be inserted before
diff --git a/nixos/modules/services/networking/polipo.nix b/nixos/modules/services/networking/polipo.nix
index 51179d9120f..847fc88ead4 100644
--- a/nixos/modules/services/networking/polipo.nix
+++ b/nixos/modules/services/networking/polipo.nix
@@ -42,7 +42,7 @@ in
       };
 
       allowedClients = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [ "127.0.0.1" "::1" ];
         example = [ "127.0.0.1" "::1" "134.157.168.0/24" "2001:660:116::/48" ];
         description = ''
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 14d516ddbb6..bc89ea2d3cd 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -234,7 +234,7 @@ in
         ];
         options = {
           hostNames = mkOption {
-            type = types.listOf types.string;
+            type = types.listOf types.str;
             default = [];
             description = ''
               A list of host names and/or IP numbers used for accessing
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index e2d34ea079c..9e04bd40190 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -43,7 +43,7 @@ in
       };
 
       interfaces = mkOption {
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         default = [];
         example = [ "wlan0" "wlan1" ];
         description = ''
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index b39aea04521..196a14dd40e 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -144,7 +144,7 @@ in
       */
       confOptions = {
         modules = mkOption {
-          type = types.listOf types.string;
+          type = types.listOf types.str;
           default = [ "partyline" "webadmin" "adminlog" "log" ];
           example = [ "partyline" "webadmin" "adminlog" "log" ];
           description = ''
@@ -153,7 +153,7 @@ in
         };
 
         userModules = mkOption {
-          type = types.listOf types.string;
+          type = types.listOf types.str;
           default = [ ];
           example = [ "fish" "push" ];
           description = ''
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index f6a3fad6c5d..64620bf1604 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -102,7 +102,7 @@ in {
     extraCmdLineOptions = mkOption {
       description = "Extra command line options for the elasticsearch launcher.";
       default = [];
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       example = [ "-Djava.net.preferIPv4Stack=true" ];
     };
 
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 03070bef483..3799e5d7ddb 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -211,7 +211,7 @@ in
     };
 
     boot.initrd.luks.cryptoModules = mkOption {
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       default =
         [ "aes" "aes_generic" "blowfish" "twofish"
           "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512"
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 8b58eccdcec..893861a2eed 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -358,7 +358,7 @@ in
     boot.initrd.supportedFilesystems = mkOption {
       default = [ ];
       example = [ "btrfs" ];
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       description = "Names of supported filesystem types in the initial ramdisk.";
     };
 
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 57831a5e6ef..a7a334dec28 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -42,13 +42,13 @@ in rec {
 
     requiredBy = mkOption {
       default = [];
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       description = "Units that require (i.e. depend on and need to go down with) this unit.";
     };
 
     wantedBy = mkOption {
       default = [];
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       description = "Units that want (i.e. depend on) this unit.";
     };
 
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index ce8d6079faa..ce21d9fe762 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -121,7 +121,7 @@ in
     boot.supportedFilesystems = mkOption {
       default = [ ];
       example = [ "btrfs" ];
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       description = "Names of supported filesystem types.";
     };
 
diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index 8d26998021d..69f004888f5 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
@@ -22,7 +22,7 @@ in
     # FIXME: still needed?
     boot.extraTTYs = mkOption {
       default = [];
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       example = ["tty8" "tty9"];
       description = ''
         Tty (virtual console) devices, in addition to the consoles on
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 71a721abba2..6361ed2cc43 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -392,7 +392,7 @@ in
 
         interfaces = mkOption {
           example = [ "eth0" "eth1" ];
-          type = types.listOf types.string;
+          type = types.listOf types.str;
           description =
             "The physical network interfaces connected by the bridge.";
         };

From d3212beff9b4ff076d67e9334a83a967ab2baf6c Mon Sep 17 00:00:00 2001
From: Casey Ransom <casey.ransom@lookout.com>
Date: Wed, 3 Jun 2015 20:21:12 +0000
Subject: [PATCH 1189/2322] Allow custom tags to be set for datadog monitoring

---
 nixos/modules/services/monitoring/dd-agent.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent.nix
index dc51a7c7486..3e90393a662 100644
--- a/nixos/modules/services/monitoring/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent.nix
@@ -23,6 +23,7 @@ let
     # proxy_password: password
 
     # tags: mytag0, mytag1
+    ${optionalString (cfg.tags != null ) "tags: ${concatStringsSep "," cfg.tags }"}
 
     # collect_ec2_tags: no
     # recent_point_threshold: 30
@@ -80,6 +81,13 @@ in {
       type = types.str;
     };
 
+    tags = mkOption {
+      description = "The tags to mark this Datadog agent";
+      example = [ "test" "service" ];
+      default = null;
+      type = types.nullOr (types.listOf types.str);
+    };
+
     hostname = mkOption {
       description = "The hostname to show in the Datadog dashboard (optional)";
       default = null;

From fa5eb0a7da226ff593f36d3a6661b5a780926e7b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 14 Jun 2015 20:00:21 -0700
Subject: [PATCH 1190/2322] rethinkdb: 2.0.0-1 -> 2.0.3

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

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 79343b04483..2f47d542d00 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "rethinkdb-${version}";
-  version = "2.0.0-1";
+  version = "2.0.3";
 
   src = fetchurl {
     url = "http://download.rethinkdb.com/dist/${name}.tgz";
-    sha256 = "0fbxs6gmlmgkbfrmi0f4xyr3vqwylr6i7fa4p68y12qy6kv7q9pc";
+    sha256 = "1580h5clkw8kprdb9waaf8al3wa2vj5d2l2m394r91fq45ss23sd";
   };
 
   preConfigure = ''

From 49821433242c4f44cff038a039ead3bc9741fbf1 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sun, 14 Jun 2015 15:59:52 +0200
Subject: [PATCH 1191/2322] gdkpixbuf: simplify setup hook, don't create
 per-package loaders.cache

---
 .../libraries/gdk-pixbuf/setup-hook.sh        | 26 +++++++------------
 .../development/libraries/librsvg/default.nix |  9 ++++++-
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
index 06e820633b8..ba7ab82f50b 100644
--- a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
+++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
@@ -1,23 +1,15 @@
 findGdkPixbufLoaders() {
 
-	if [ -n "$out" ] && [ -z "$IN_NIX_SHELL" ]; then
-
-		# set pixbuf loaders.cache for this package
-
-		local loadersDir="$out/lib/gdk-pixbuf-loaders-2.0/$name"
-		mkdir -p "$loadersDir"
-		
-		if [ -f "$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ]; then
-			cat "$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" >> "$loadersDir/loaders.cache"
+	# choose the longest loaders.cache
+	local loadersCache="$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	if [ -f "$loadersCache" ]; then
+		if [ -f "$GDK_PIXBUF_MODULE_FILE" ]; then
+			if [ $(cat "$loadersCache"|wc -l) -gt $(cat "$GDK_PIXBUF_MODULE_FILE"|wc -l) ]; then
+				export GDK_PIXBUF_MODULE_FILE="$loadersCache"
+			fi
+		else
+			export GDK_PIXBUF_MODULE_FILE="$loadersCache"
 		fi
-	
-		if [ -f "$1/lib/gdk-pixbuf/loaders.cache" ]; then
-			cat "$1/lib/gdk-pixbuf/loaders.cache" >> "$loadersDir/loaders.cache"
-		fi
-		
-		# note, this is not a search path
-		export GDK_PIXBUF_MODULE_FILE=$(readlink -e "$loadersDir/loaders.cache")
-
 	fi
 
 }
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 9589298ecd5..4c22c988c79 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   # The loaders.cache can be used by setting GDK_PIXBUF_MODULE_FILE to
   # point to this file in a wrapper.
   postConfigure = ''
-    GDK_PIXBUF=$out/lib/gdk-pixbuf
+    GDK_PIXBUF=$out/lib/gdk-pixbuf-2.0/2.10.0
     mkdir -p $GDK_PIXBUF/loaders
     sed -e "s#gdk_pixbuf_moduledir = .*#gdk_pixbuf_moduledir = $GDK_PIXBUF/loaders#" \
         -i gdk-pixbuf-loader/Makefile
@@ -43,4 +43,11 @@ stdenv.mkDerivation rec {
     sed -e "s#\$(GDK_PIXBUF_QUERYLOADERS)#GDK_PIXBUF_MODULEDIR=$GDK_PIXBUF/loaders \$(GDK_PIXBUF_QUERYLOADERS)#" \
          -i gdk-pixbuf-loader/Makefile
   '';
+
+  # Merge gdkpixbuf and librsvg loaders
+  postInstall = ''
+    mv $GDK_PIXBUF/loaders.cache $GDK_PIXBUF/loaders.cache.tmp
+    cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache.tmp > $GDK_PIXBUF/loaders.cache
+    rm $GDK_PIXBUF/loaders.cache.tmp
+  '';
 }

From 5af468d0bc670f020ff75372be82c2857da912bc Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 15 Jun 2015 10:09:07 +0200
Subject: [PATCH 1192/2322] libmspack: update from 0.4alpha to 0.5alpha

fixes CVE-2014-9732, CVE-2015-4467, CVE-2015-4468, CVE-2015-4469,
CVE-2015-4470, CVE-2015-4471 and CVE-2015-4472.
---
 pkgs/development/libraries/libmspack/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix
index b78e583fa64..1b981edcdcd 100644
--- a/pkgs/development/libraries/libmspack/default.nix
+++ b/pkgs/development/libraries/libmspack/default.nix
@@ -1,13 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "libmspack-0.4alpha";
+  name = "libmspack-0.5alpha";
   src = fetchurl {
-    # upstream url: "curl: (22) The requested URL returned error: 406 Not Acceptable"
-    #url = http://www.cabextract.org.uk/libmspack/libmspack-0.4alpha.tar.gz;
-    url = "http://pkgs.fedoraproject.org/lookaside/pkgs/libmspack/"
-      + "libmspack-0.4alpha.tar.gz/1ab10b507259993c74b4c41a88103b59/libmspack-0.4alpha.tar.gz";
-    sha256 = "0s2w5zxx9cw7445cx9ap59ky5n7r201551zg906w9ghcys1qk5dp";
+    url = "http://www.cabextract.org.uk/libmspack/libmspack-0.5alpha.tar.gz";
+    sha256 = "04413hynb7zizxnkgy9riik3612dwirkpr6fcjrnfl2za9sz4rw9";
   };
 
   meta = {
@@ -15,5 +12,4 @@ stdenv.mkDerivation {
     homepage = http://www.cabextract.org.uk/libmspack;
     license = stdenv.lib.licenses.lgpl2;
   };
-
 }

From d95fba37460d1a727e06b4df0e3dec659b67eafa Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Mon, 15 Jun 2015 10:47:53 +0200
Subject: [PATCH 1193/2322] haskell-uhc: Use newer version with relaxed cabal
 constraints.

---
 pkgs/development/compilers/uhc/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index 64d51f971b9..1dbfb039f90 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -2,13 +2,17 @@
 
 let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [shuffle hashable mtl network uhc-util uulib] );
 in stdenv.mkDerivation rec {
-  version = "1.1.9.1";
+  # Important:
+  # The commits "Fixate/tag v..." are the released versions.
+  # Ignore the "bumped version to ...." commits, they do not
+  # correspond to releases.
+  version = "1.1.9.1.20150611";
   name = "uhc-${version}";
 
   src = fetchgit {
     url = "https://github.com/UU-ComputerScience/uhc.git";
-    rev = "c4955d01089485cdcfec785fe2bbcdf2253bee4b";
-    sha256 = "1n2bfbzni2hwv90z3mgn0x3l3jwc7sy8ryk81p5mlvlis1wzxnq3";
+    rev = "b80098e07d12900f098ea964b1d2b3f38e5c9900";
+    sha256 = "14qg1fd9pgbczcmn5ggkd9674qadx1izmz8363ps7c207dg94f9x";
   };
 
   postUnpack = "sourceRoot=\${sourceRoot}/EHC";

From 41e1900ea1a6323918596a17434b2011b5915b40 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jun 2015 11:24:11 +0200
Subject: [PATCH 1194/2322] Define closeNest before exitHandler

This prevents "closeNest: command not found" messages if setup fails
early.
---
 pkgs/stdenv/generic/setup.sh | 55 +++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 47e33056270..fb79d883288 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -72,6 +72,35 @@ _eval() {
 }
 
 
+######################################################################
+# Logging.
+
+nestingLevel=0
+
+startNest() {
+    nestingLevel=$(($nestingLevel + 1))
+    echo -en "\033[$1p"
+}
+
+stopNest() {
+    nestingLevel=$(($nestingLevel - 1))
+    echo -en "\033[q"
+}
+
+header() {
+    startNest "$2"
+    echo "$1"
+}
+
+# Make sure that even when we exit abnormally, the original nesting
+# level is properly restored.
+closeNest() {
+    while [ $nestingLevel -gt 0 ]; do
+        stopNest
+    done
+}
+
+
 ######################################################################
 # Error handling.
 
@@ -409,32 +438,6 @@ substituteAllInPlace() {
 # What follows is the generic builder.
 
 
-nestingLevel=0
-
-startNest() {
-    nestingLevel=$(($nestingLevel + 1))
-    echo -en "\033[$1p"
-}
-
-stopNest() {
-    nestingLevel=$(($nestingLevel - 1))
-    echo -en "\033[q"
-}
-
-header() {
-    startNest "$2"
-    echo "$1"
-}
-
-# Make sure that even when we exit abnormally, the original nesting
-# level is properly restored.
-closeNest() {
-    while [ $nestingLevel -gt 0 ]; do
-        stopNest
-    done
-}
-
-
 # This function is useful for debugging broken Nix builds.  It dumps
 # all environment variables to a file `env-vars' in the build
 # directory.  If the build fails and the `-K' option is used, you can

From 42d94b6f15987ecaae03c639300d38e0b5c4afd4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jun 2015 11:24:55 +0200
Subject: [PATCH 1195/2322] Barf on non-existant build inputs

Previously saying

  buildInputs = [ "bla" ];

was quietly ignored. Now it's a fatal error.
---
 pkgs/stdenv/generic/setup.sh | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index fb79d883288..75cc8693480 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -222,7 +222,7 @@ runHook addInputsHook
 
 # Recursively find all build inputs.
 findInputs() {
-    local pkg=$1
+    local pkg="$1"
     local var=$2
     local propagatedBuildInputsFile=$3
 
@@ -234,17 +234,22 @@ findInputs() {
 
     eval $var="'${!var} $pkg '"
 
-    if [ -f $pkg ]; then
-        source $pkg
+    if ! [ -e "$pkg" ]; then
+        echo "build input $pkg does not exist" >&2
+        exit 1
     fi
 
-    if [ -f $pkg/nix-support/setup-hook ]; then
-        source $pkg/nix-support/setup-hook
+    if [ -f "$pkg" ]; then
+        source "$pkg"
     fi
 
-    if [ -f $pkg/nix-support/$propagatedBuildInputsFile ]; then
-        for i in $(cat $pkg/nix-support/$propagatedBuildInputsFile); do
-            findInputs $i $var $propagatedBuildInputsFile
+    if [ -f "$pkg/nix-support/setup-hook" ]; then
+        source "$pkg/nix-support/setup-hook"
+    fi
+
+    if [ -f "$pkg/nix-support/$propagatedBuildInputsFile" ]; then
+        for i in $(cat "$pkg/nix-support/$propagatedBuildInputsFile"); do
+            findInputs "$i" $var $propagatedBuildInputsFile
         done
     fi
 }

From 18421542f919ffb78bd9168ca9c310b80e6103fe Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 15 Jun 2015 15:31:06 +0200
Subject: [PATCH 1196/2322] electrum: 2.0.4 -> 2.3.2

---
 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 0f7b85e055b..b910b1796a3 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   name = "electrum-${version}";
-  version = "2.0.4";
+  version = "2.3.2";
 
   src = fetchurl {
     url = "https://download.electrum.org/Electrum-${version}.tar.gz";
-    sha256 = "0q9vrrzy2iypfg2zvs3glzvqyq65dnwn1ijljvfqfwrkpvpp0zxp";
+    sha256 = "0idqm77d5rbwpw14wqg4ysvbjyqjw7zlqfcdxniy74i2qwz163bi";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From d72538be8d4fbe0efea43e81d63216410417c322 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jun 2015 19:26:52 +0200
Subject: [PATCH 1197/2322] Don't include /no-such-path in buildInputs

---
 pkgs/stdenv/darwin/default.nix | 2 +-
 pkgs/stdenv/linux/default.nix  | 2 +-
 pkgs/stdenv/native/default.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index ac396ecdf12..98fc35074c2 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -31,7 +31,7 @@ rec {
       shell        = "/bin/bash";
       initialPath  = [ bootstrapTools ];
       fetchurlBoot = fetchurl;
-      cc           = "/no-such-path";
+      cc           = null;
     };
   };
 
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 1bcf74afa32..12fc3fed5a5 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -86,7 +86,7 @@ rec {
         };
 
         cc = if isNull gccPlain
-             then "/no-such-path"
+             then null
              else lib.makeOverridable (import ../../build-support/cc-wrapper) {
           nativeTools = false;
           nativeLibc = false;
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 5390907928d..bd90d580d3f 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -98,7 +98,7 @@ rec {
 
 
   stdenvBoot0 = makeStdenv {
-    cc = "/no-such-path";
+    cc = null;
     fetchurl = null;
   };
 

From b3113802276b133fb62bd57d129937252cbe7c76 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 13 Jun 2015 11:38:10 +0200
Subject: [PATCH 1198/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/2c4a8914cbc96987a1c2f9a32ca798f7055d548c
 with hackage2nix revision c519a8ee5f75311f8eaaca7eaf5af8f7ad26d33e

---
 .../haskell-modules/hackage-packages.nix      | 404 ++++++++++++------
 1 file changed, 275 insertions(+), 129 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e5cdabbed67..75d61b83d96 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -17727,8 +17727,8 @@ self: {
      }:
      mkDerivation {
        pname = "agentx";
-       version = "0.1.0.5";
-       sha256 = "0a6zzn4zv5f1zl10vz1p4iw32s9jd605px4ziy5v24fmjm5xnbzb";
+       version = "0.2.0.0";
+       sha256 = "0pmnrij90xag46af4c5yws5g26pf77l5ck864f4cyw5g9acw67g6";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -17891,8 +17891,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment";
-       version = "3.1";
-       sha256 = "19x4y060r9cgkfffyxdgilmrrjv4ycpxv6w8gclkfrxj1ywwkwx4";
+       version = "4.0.3";
+       sha256 = "1v0x37kmav87b3mxvribw6658glf5hbk7npipkabp1qbfz5sp7zv";
        buildDepends = [
          aivika base containers directory filepath mtl network-uri
          parallel-io split
@@ -17925,8 +17925,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment-chart";
-       version = "3.1";
-       sha256 = "17bp7bp3x7z3xlzd6922mjm44v8jlkw1ak3zfr31146hlifgfhyw";
+       version = "4.0.3";
+       sha256 = "1c5xzp0n67fg799cdf6aqc7sxbv3dy6nkiilyc5hlr8bg3r20bpd";
        buildDepends = [
          aivika aivika-experiment array base Chart colour containers
          data-default-class filepath lens mtl split
@@ -19370,8 +19370,8 @@ self: {
      }:
      mkDerivation {
        pname = "angel";
-       version = "0.6.0";
-       sha256 = "0625r8jy9v6x5v5y5vrz2z7bqag9hwjnxr7ir35bq18xd5fpr9kf";
+       version = "0.6.1";
+       sha256 = "1wkllv4ziggj3smhghdk5qsgccds9d69rhx1gi079ph7z533w2dc";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -19785,7 +19785,9 @@ self: {
      mkDerivation {
        pname = "apiary";
        version = "1.4.3";
+       revision = "1";
        sha256 = "1z6fgdkn3k4sbwk5jyz6yp9qwllhv2m9vq7z25fhmj41y3spgcsc";
+       editedCabalFile = "024867d05ec04c0b83c41e948b80c56686cc170beed600daffa8d8c725e50a32";
        buildDepends = [
          base blaze-builder blaze-html blaze-markup bytestring
          bytestring-read case-insensitive data-default-class exceptions
@@ -19798,7 +19800,6 @@ self: {
          base bytestring http-types HUnit mtl tasty tasty-hunit
          tasty-quickcheck wai wai-extra
        ];
-       jailbreak = true;
        homepage = "https://github.com/philopon/apiary";
        description = "Simple and type safe web framework that generate web API documentation";
        license = stdenv.lib.licenses.mit;
@@ -19853,14 +19854,13 @@ self: {
      mkDerivation {
        pname = "apiary-cookie";
        version = "1.4.0";
-       revision = "1";
+       revision = "2";
        sha256 = "017bxqavv4w5r2ghgmyhljqa4fyzl02v2sjwxi056s3phgrlrkrx";
-       editedCabalFile = "50b9adcb346e7233cb73eef7e7d00902a7b43454ab998f76923582bada569e32";
+       editedCabalFile = "4edecbd2a1e6fb740815be85cc9c4836144338af88e6774348a1703e861a9771";
        buildDepends = [
          apiary base blaze-builder blaze-html bytestring cookie time
          types-compat wai web-routing
        ];
-       jailbreak = true;
        homepage = "https://github.com/philopon/apiary";
        description = "Cookie support for apiary web framework";
        license = stdenv.lib.licenses.mit;
@@ -19909,15 +19909,14 @@ self: {
      mkDerivation {
        pname = "apiary-logger";
        version = "1.4.0";
-       revision = "1";
+       revision = "2";
        sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48";
-       editedCabalFile = "cb2677faabb41ccf7a4990179990f55c14d5bcd517591ccd086b84c68362c93c";
+       editedCabalFile = "ce71ccd5e0a1f20777b17efdc536aab8f43a3468f54fa14609c635aa731ce944";
        buildDepends = [
          apiary base data-default-class fast-logger lifted-base
          monad-control monad-logger transformers transformers-base
          types-compat
        ];
-       jailbreak = true;
        homepage = "https://github.com/philopon/apiary";
        description = "fast-logger support for apiary web framework";
        license = stdenv.lib.licenses.mit;
@@ -21693,6 +21692,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "attoparsec-trans" = callPackage
+    ({ mkDerivation, attoparsec, base, transformers }:
+     mkDerivation {
+       pname = "attoparsec-trans";
+       version = "0.1.0.3";
+       sha256 = "11a743qgh9rwjyf1hng5jg139xr11dsjj1bisqaaayb17addd2xx";
+       buildDepends = [ attoparsec base transformers ];
+       homepage = "https://github.com/srijs/haskell-attoparsec-trans";
+       description = "Interleaved effects for attoparsec parsers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "attosplit" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring }:
      mkDerivation {
@@ -22178,6 +22189,24 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "aws-dynamodb-conduit" = callPackage
+    ({ mkDerivation, aeson, attoparsec-trans, aws, base, bytestring
+     , conduit, http-conduit, http-types, json-togo, resourcet, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "aws-dynamodb-conduit";
+       version = "0.1.0.2";
+       sha256 = "02q49anmairvjwzvgn8kqx27965n71xbyi86wwlmrs4w0dkbsd41";
+       buildDepends = [
+         aeson attoparsec-trans aws base bytestring conduit http-conduit
+         http-types json-togo resourcet text transformers
+       ];
+       homepage = "https://github.com/srijs/haskell-aws-dynamodb-query";
+       description = "Conduit-based interface for AWS DynamoDB";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "aws-dynamodb-streams" = callPackage
     ({ mkDerivation, aeson, attoparsec, aws, aws-general, base
      , base-unicode-symbols, base16-bytestring, base64-bytestring
@@ -23348,8 +23377,8 @@ self: {
      }:
      mkDerivation {
        pname = "basic-prelude";
-       version = "0.4.1";
-       sha256 = "041wnym7b8p70kcbkxxbgszmi2y88xs0ww357jrn0v6cc21h60j9";
+       version = "0.5.0";
+       sha256 = "1l8hc99sxm27gd93zq6v0l0x2rzl6fd9zp7snh14m4yriqrn5xfi";
        buildDepends = [
          base bytestring containers filepath hashable lifted-base ReadArgs
          safe text transformers unordered-containers vector
@@ -23781,8 +23810,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "between";
-       version = "0.9.0.2";
-       sha256 = "0n3nx077hv10rwv2kl3n1a3v40sr1qzfj9jwb6cvd1l0zx42igw8";
+       version = "0.10.0.0";
+       sha256 = "10bj4v2451c9dri3r9c825xnr4lb8jhihr05nhc6m8fdvqnyqvsi";
        buildDepends = [ base ];
        homepage = "https://github.com/trskop/between";
        description = "Function combinator \"between\" and derived combinators";
@@ -26879,6 +26908,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "break" = callPackage
+    ({ mkDerivation, base, mtl, transformers }:
+     mkDerivation {
+       pname = "break";
+       version = "1.0.0";
+       sha256 = "15fqdha71i4ziv0ra8v2mfp0fviwgs27xlsvc0chb8icqf33y22m";
+       buildDepends = [ base mtl transformers ];
+       description = "Break from a loop";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "breakout" = callPackage
     ({ mkDerivation, base, haskgame, mtl, SDL }:
      mkDerivation {
@@ -27723,8 +27763,8 @@ self: {
      }:
      mkDerivation {
        pname = "bytestring-read";
-       version = "0.3.0";
-       sha256 = "19bq478066chy35fnfjq5bg2f196zl6qi2dssqwlr9bivgvk434g";
+       version = "0.3.1";
+       sha256 = "0df6mb5fhfd1kgah5gv4q4ykxvl0y8hbqrdvm17nh33cxj2csj00";
        buildDepends = [ base bytestring types-compat ];
        testDepends = [ base bytestring doctest tasty tasty-quickcheck ];
        jailbreak = true;
@@ -31615,8 +31655,8 @@ self: {
      }:
      mkDerivation {
        pname = "classy-prelude";
-       version = "0.12.0";
-       sha256 = "0g72084wnfqam0djpck76bb7dmphpjs1h32w361cqyvgxkyy1prw";
+       version = "0.12.0.1";
+       sha256 = "0ny5cxkzbjhhsmypsp4sjm7nm0jv2l2kysgcphm6j1l3dr0ck6il";
        buildDepends = [
          base basic-prelude bifunctors bytestring chunked-data containers
          dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base
@@ -34181,8 +34221,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-combinators";
-       version = "1.0.0";
-       sha256 = "1ibbj3ipkys26np9d791ynpfzgrw3miclcj02bb0ipmvqngm90hv";
+       version = "1.0.1";
+       sha256 = "014n3qhn9flwj43zjp62vagp5df9ll6nkjk1x9qpagni1vf9cbqq";
        buildDepends = [
          base base16-bytestring base64-bytestring bytestring chunked-data
          conduit conduit-extra filepath monad-control mono-traversable
@@ -34555,13 +34595,12 @@ self: {
      }:
      mkDerivation {
        pname = "connection-pool";
-       version = "0.1.1.0";
-       sha256 = "08mfl5gwbxzkf6dvqvshmzpjy02f46avimw8ss66br2397bi0qj7";
+       version = "0.1.2.0";
+       sha256 = "12nr9vl884yj4yq9dyfc725zi6dw0amp65xlm9hjm7wffz6mc5az";
        buildDepends = [
          base between data-default-class monad-control network resource-pool
          streaming-commons time transformers-base
        ];
-       jailbreak = true;
        homepage = "https://github.com/trskop/connection-pool";
        description = "Connection pool built on top of resource-pool and streaming-commons";
        license = stdenv.lib.licenses.bsd3;
@@ -39912,8 +39951,8 @@ self: {
      }:
      mkDerivation {
        pname = "debian-build";
-       version = "0.7.1.0";
-       sha256 = "0hzvv6aazpf7r75yygcqy1ldz3j9shs6spv71nzn040rny67cdll";
+       version = "0.7.1.1";
+       sha256 = "0r2f14h0bpbq861jfa0rgp0y87nq142f80dyjzyzzrdwc8szj120";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -40373,6 +40412,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "delta" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, fs-events
+     , sodium, time
+     }:
+     mkDerivation {
+       pname = "delta";
+       version = "0.1.0.1";
+       sha256 = "0kjii2hqwzzsb8i09547y0qxrdak3xkhgv7dqahbpypzh8hldgzf";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base containers directory filepath fs-events sodium time
+       ];
+       homepage = "https://github.com/kryoxide/delta";
+       description = "A library for detecting file changes";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "delta-h" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, monad-atom
      , nlp-scores, text
@@ -45579,10 +45636,9 @@ self: {
     ({ mkDerivation, base, between, transformers }:
      mkDerivation {
        pname = "endo";
-       version = "0.1.0.2";
-       sha256 = "1wqg0mcaf55wa70wjgd6n0gw56rghz6p76lc6kw4aki969h12xrl";
+       version = "0.2.0.0";
+       sha256 = "1gqw14nadw1cb49m251swly35gjkb2xhqi0cqhm17ww8r13mzp31";
        buildDepends = [ base between transformers ];
-       jailbreak = true;
        homepage = "https://github.com/trskop/endo";
        description = "Endomorphism utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -46476,6 +46532,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ether" = callPackage
+    ({ mkDerivation, base, mtl, newtype-generics, QuickCheck, tasty
+     , tasty-quickcheck, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "ether";
+       version = "0.2.1.0";
+       sha256 = "1iwi3whaxnpwfdghw1rli9dxqh1c28hhxkdvl4wslj0vc014h3di";
+       buildDepends = [
+         base mtl newtype-generics template-haskell transformers
+       ];
+       testDepends = [
+         base mtl QuickCheck tasty tasty-quickcheck transformers
+       ];
+       homepage = "https://int-index.github.io/ether/";
+       description = "Monad transformers and classes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ethereum-client-haskell" = callPackage
     ({ mkDerivation, ansi-wl-pprint, array, base, base16-bytestring
      , binary, bytestring, cmdargs, containers, cryptohash, data-default
@@ -52844,12 +52919,12 @@ self: {
      }) {};
 
   "ghc-simple" = callPackage
-    ({ mkDerivation, base, data-default, ghc, ghc-paths }:
+    ({ mkDerivation, base, ghc, ghc-paths }:
      mkDerivation {
        pname = "ghc-simple";
-       version = "0.1.0.0";
-       sha256 = "0a8xla80al1glxpf0dsbzdgwbzwxmk9cr6xwfmmz237q7dv4pjhf";
-       buildDepends = [ base data-default ghc ghc-paths ];
+       version = "0.1.2.0";
+       sha256 = "0cwirw9j52khkl8fsgw22136nb3nwlbiahvfcds8hryvr64x9vql";
+       buildDepends = [ base ghc ghc-paths ];
        homepage = "https://github.com/valderman/ghc-simple";
        description = "Simplified interface to the GHC API";
        license = stdenv.lib.licenses.mit;
@@ -62021,6 +62096,7 @@ self: {
          base basic-prelude containers errors mtl random-shuffle tasty
          tasty-hunit tasty-quickcheck text
        ];
+       jailbreak = true;
        description = "Implementation of the rules of Love Letter";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64598,7 +64674,9 @@ self: {
      mkDerivation {
        pname = "highlighting-kate";
        version = "0.6";
+       revision = "1";
        sha256 = "16334fbiyq6017zbgc59qc00h0bk24xh4dcrbqx63dvf72ac37dk";
+       editedCabalFile = "7466b389fd27b0520d371b2b225cb6024e9b7dd371cffa78169c219ab449558b";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -64919,7 +64997,9 @@ self: {
      mkDerivation {
        pname = "hipbot";
        version = "0.5";
+       revision = "1";
        sha256 = "0acy9bp2dwszd01l514nx2crdxgb356k18pm9ravddljxr24n1hs";
+       editedCabalFile = "6ac1673be45c18dc010eeeef508a021ec9fef4e0a4e05864733f91aec8508ab8";
        buildDepends = [
          aeson base bifunctors blaze-builder bytestring either exceptions
          http-client http-client-tls http-types jwt lens mtl network-uri
@@ -64927,7 +65007,6 @@ self: {
          unordered-containers utf8-string wai wai-lens webcrank webcrank-wai
          wreq
        ];
-       jailbreak = true;
        homepage = "https://github.com/purefn/hipbot";
        description = "A library for building HipChat Bots";
        license = stdenv.lib.licenses.bsd3;
@@ -65864,8 +65943,8 @@ self: {
     ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex }:
      mkDerivation {
        pname = "hmatrix-gsl-stats";
-       version = "0.3.0.2";
-       sha256 = "1n0p7pg9rsdckcysczg7l8rqfm3xw1rc2jzp0khb1i33nhbr7bzn";
+       version = "0.3.0.3";
+       sha256 = "0zrh3knwqkaqlgajza22jfg3xhsxhiaf8qmiwnd9qjbasnm5a1lp";
        buildDepends = [ base binary hmatrix storable-complex ];
        pkgconfigDepends = [ gsl ];
        homepage = "http://code.haskell.org/hmatrix-gsl-stats";
@@ -68322,9 +68401,10 @@ self: {
      mkDerivation {
        pname = "hs-pkg-config";
        version = "0.2.1.0";
+       revision = "1";
        sha256 = "09v2kp643asl3zpv8rbb8a7zv0h3bn5l4gxz44d71kly9qr3jkhh";
+       editedCabalFile = "9337acf593d6f7e1d54f81886cb3736001a127e3b75ba01bd97a99d77565f784";
        buildDepends = [ base data-default-class text ];
-       jailbreak = true;
        homepage = "https://github.com/trskop/hs-pkg-config";
        description = "Create pkg-config configuration files";
        license = stdenv.lib.licenses.bsd3;
@@ -69704,9 +69784,9 @@ self: {
      mkDerivation {
        pname = "hslua";
        version = "0.4.0";
-       revision = "1";
+       revision = "2";
        sha256 = "0l50ppvnavs3lc1vmrpxhlb3ffl772n1hk8mdi9w4ml64ninba3p";
-       editedCabalFile = "a2019a0881b90b842dfa9c88e452a45bbadb25d9461d0549ab8fd328a82757ee";
+       editedCabalFile = "43f6956aba870857548523718d3d5645e422187964e5158d14a9c17d96671ccb";
        buildDepends = [ base bytestring ];
        testDepends = [ base bytestring hspec hspec-contrib HUnit text ];
        extraLibraries = [ lua ];
@@ -75448,12 +75528,13 @@ self: {
      }) {};
 
   "invariant" = callPackage
-    ({ mkDerivation, base, contravariant }:
+    ({ mkDerivation, base, contravariant, hspec, QuickCheck }:
      mkDerivation {
        pname = "invariant";
-       version = "0.1.1";
-       sha256 = "077jhn2fspnjkr8p3sh6draidqpk6wpism73rz8172acd4jjg4fz";
+       version = "0.1.2";
+       sha256 = "02p114wnpxbqxik4sz87bd9rcqfs9klgsxi9pc4v1qwyb64mb92b";
        buildDepends = [ base contravariant ];
+       testDepends = [ base hspec QuickCheck ];
        description = "Haskell 98 invariant functors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77685,6 +77766,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-togo" = callPackage
+    ({ mkDerivation, aeson, attoparsec, attoparsec-trans, base
+     , bytestring, scientific, text, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "json-togo";
+       version = "0.1.0.1";
+       sha256 = "05g8k8qsxjwqrdwqf24g90hx5jlrwjpa4vsjf0ddrw0whnva3gbz";
+       buildDepends = [
+         aeson attoparsec attoparsec-trans base bytestring scientific text
+         transformers unordered-containers vector
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/srijs/haskell-json-togo";
+       description = "Effectful parsing of JSON documents";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "json-tools" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , process, tar, text, unordered-containers, vector
@@ -80977,8 +81077,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah";
-       version = "0.15.0.1";
-       sha256 = "169vrqdxcx8xkilrw3dh5zmdsb876fny4n0k5gzvi8fian0dl8nh";
+       version = "0.15.0.3";
+       sha256 = "11b4kp1bbw35gsrdcr5kjyjrfiqrqfy645nbpngjz7rzivjl6n4s";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -81012,8 +81112,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah-server";
-       version = "0.15.0.1";
-       sha256 = "04sxfzl8p9fk8qkzmwnm7fkg5sgrzjx0992kivgbrnyx7wh06xsp";
+       version = "0.15.0.2";
+       sha256 = "090nz2kvsf83jdp2lhng5x87a96xzxknsr4vx2jc2r2vs60841lx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -82466,13 +82566,13 @@ self: {
      }) {};
 
   "linear-grammar" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck }:
+    ({ mkDerivation, base, containers, hspec, QuickCheck }:
      mkDerivation {
        pname = "linear-grammar";
-       version = "0.0.1.6";
-       sha256 = "05mzxv1ixdxirmm31jqwd8w749dpy113pyw1mfr6ck3ksva5g1ap";
-       buildDepends = [ base QuickCheck ];
-       testDepends = [ base hspec QuickCheck ];
+       version = "0.0.2.1";
+       sha256 = "00vfhcqhg6azb1ay12n248l0bjg5g0c5y5ybz5rqf2jdlab7fg97";
+       buildDepends = [ base containers QuickCheck ];
+       testDepends = [ base containers hspec QuickCheck ];
        description = "A simple grammar for building linear equations and inclusive inequalities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -83785,8 +83885,8 @@ self: {
      }:
      mkDerivation {
        pname = "lock-file";
-       version = "0.5.0.1";
-       sha256 = "0x1pis244pg5k91y3p40m2pc483vx49gcdqa95f7q0gjsnvb9yi9";
+       version = "0.5.0.2";
+       sha256 = "1l4slkykw59p20kw9iqaa4pjczqx701a9z14nvbzwrmgs2acnki7";
        buildDepends = [
          base data-default-class directory exceptions tagged-exception-core
          transformers
@@ -83796,7 +83896,6 @@ self: {
          tagged-exception-core test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/trskop/lock-file";
        description = "Provide exclusive access to a resource using lock file";
        license = stdenv.lib.licenses.bsd3;
@@ -89246,10 +89345,8 @@ self: {
      }:
      mkDerivation {
        pname = "mono-traversable";
-       version = "0.9.1";
-       revision = "1";
-       sha256 = "0hzqlldilkkfmrq3pkymwkzpp9dn40v6fa18kahxlf4qiyih0xzc";
-       editedCabalFile = "28392123a8b245f7bc2c13bb63f5c3008118ed38e107cf0534be37461fb64daf";
+       version = "0.9.2";
+       sha256 = "1cw8bsf6ayalsx0l0xwb2f2j2rg6zpfsvci174fr4xiyr646mpd6";
        buildDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
          semigroupoids semigroups text transformers unordered-containers
@@ -90450,6 +90547,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "murmur3" = callPackage
+    ({ mkDerivation, base, base16-bytestring, binary, bytestring, HUnit
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "murmur3";
+       version = "1.0.0";
+       sha256 = "1rdnfy37dmmrqpapdv9h22ki94mxrz1xdk5ibcj833q35868kjmq";
+       buildDepends = [ base binary bytestring ];
+       testDepends = [
+         base base16-bytestring bytestring HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "http://github.com/plaprade/murmur3";
+       description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "murmurhash3" = callPackage
     ({ mkDerivation, haskell2010 }:
      mkDerivation {
@@ -95214,6 +95330,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "optional-args" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "optional-args";
+       version = "1.0.0";
+       sha256 = "0j49cp5y7gp9acvhw315lq92mgr35fwaw90vpxy0n9g541ls350z";
+       buildDepends = [ base ];
+       description = "Optional function arguments";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "options" = callPackage
     ({ mkDerivation, base, chell, chell-quickcheck, containers
      , monads-tf, transformers
@@ -95478,8 +95605,8 @@ self: {
      }:
      mkDerivation {
        pname = "orgmode-parse";
-       version = "0.1.1.1";
-       sha256 = "17slf2i7k8bk1d47l165awn38dlpq2rdw6glzvp8if1dir2l2jl7";
+       version = "0.1.1.2";
+       sha256 = "1ys9gcydipjxn5ba7ndmz70ri218d6wivxrd7xvcsf4kncfks3xi";
        buildDepends = [
          aeson attoparsec base bytestring containers free hashable
          old-locale text thyme unordered-containers
@@ -98006,8 +98133,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-template";
-       version = "2.1.3.3";
-       sha256 = "1p9vndchcd06ajqmqmf3pw5ql9r6jqbs9xl5jxv1x0pjvbq6yjy5";
+       version = "2.1.3.4";
+       sha256 = "0wi1mrcilz66jnlgz16crqlh4bibb03mj460bgg3af4f8zpwja2g";
        buildDepends = [
          aeson base bytestring containers ghc-prim monad-control
          monad-logger path-pieces persistent tagged template-haskell text
@@ -98016,7 +98143,6 @@ self: {
        testDepends = [
          aeson base bytestring hspec persistent QuickCheck text transformers
        ];
-       jailbreak = true;
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, non-relational, multi-backend persistence";
        license = stdenv.lib.licenses.mit;
@@ -103669,8 +103795,8 @@ self: {
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "quickcheck-simple";
-       version = "0.0.1.0";
-       sha256 = "04r5nqm7g5wp13k6d109yykky9i121f65bxlv5ji5sk35yp650c4";
+       version = "0.1.0.0";
+       sha256 = "0vnxyb3qz8i1rpmkga6151cld1jr3kiyv3xrhg814mhf1fmhb8xl";
        buildDepends = [ base QuickCheck ];
        description = "Test properties and default-mains for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
@@ -105006,12 +105132,15 @@ self: {
 
   "record" = callPackage
     ({ mkDerivation, base, base-prelude, basic-lens, template-haskell
+     , transformers
      }:
      mkDerivation {
        pname = "record";
-       version = "0.4.0.0";
-       sha256 = "0ml0rmqscdkp4zp430q206lrnah3j5d4bbra7ka526gagmrvpnmb";
-       buildDepends = [ base base-prelude basic-lens template-haskell ];
+       version = "0.4.0.2";
+       sha256 = "18j30j7dppm0lqf9p345bfz65cls15ka6jyflamwgig5h0dzz5mw";
+       buildDepends = [
+         base base-prelude basic-lens template-haskell transformers
+       ];
        homepage = "https://github.com/nikita-volkov/record";
        description = "Anonymous records";
        license = stdenv.lib.licenses.mit;
@@ -105815,7 +105944,9 @@ self: {
      mkDerivation {
        pname = "regex-tdfa";
        version = "1.2.0";
+       revision = "1";
        sha256 = "00gl9sx3hzd83lp38jlcj7wvzrda8kww7njwlm1way73m8aar0pw";
+       editedCabalFile = "5489b69b9f0e8e181ee5134fd500bb0e2b4f914234c5223c59186035fb50478e";
        buildDepends = [
          array base bytestring containers ghc-prim mtl parsec regex-base
        ];
@@ -113525,6 +113656,25 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "simplex-basic" = callPackage
+    ({ mkDerivation, base, bifunctors, containers, hspec
+     , linear-grammar, mtl, QuickCheck, transformers
+     }:
+     mkDerivation {
+       pname = "simplex-basic";
+       version = "0.0.0.1";
+       sha256 = "180bnrka1id16scz4zzi60m8692b7pyicfzfbzvi8rz1shl038zq";
+       buildDepends = [
+         base bifunctors linear-grammar mtl QuickCheck transformers
+       ];
+       testDepends = [
+         base bifunctors containers hspec linear-grammar mtl QuickCheck
+         transformers
+       ];
+       description = "Very basic simplex implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "simseq" = callPackage
     ({ mkDerivation, base, bio, bytestring, random }:
      mkDerivation {
@@ -115320,10 +115470,10 @@ self: {
      }:
      mkDerivation {
        pname = "snaplet-sqlite-simple";
-       version = "0.4.8.2";
-       sha256 = "00a92wymniaw0si4xpkx1442prmcjimwrjjqiqnkj6k8bxs7p2jm";
+       version = "0.4.8.3";
+       sha256 = "0nc0kv9s3c4wc3xb6jggx9v4p141c3af07x8vda18c7qlfif5nx3";
        buildDepends = [
-         aeson base bytestring clientsession configurator direct-sqlite
+         aeson base bytestring clientsession configurator direct-sqlite lens
          MonadCatchIO-transformers mtl snap sqlite-simple text transformers
          unordered-containers
        ];
@@ -115333,7 +115483,6 @@ self: {
          SafeSemaphore snap snap-core sqlite-simple stm test-framework
          test-framework-hunit text time transformers unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/nurpax/snaplet-sqlite-simple";
        description = "sqlite-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -115544,8 +115693,8 @@ self: {
      }:
      mkDerivation {
        pname = "snmp";
-       version = "0.1.0.3";
-       sha256 = "1zncgn3i6xbvxrwdf6s6vhbmsf6sqncf2rbllx26dz1bmxh4gr33";
+       version = "0.2.0.0";
+       sha256 = "0vjbpjsa4ivsjzvfc9sr457pms2rw1zpb92d971n0yccl0bxmf67";
        buildDepends = [
          asn1-encoding asn1-parse asn1-types async base binary bytestring
          cipher-aes cipher-des containers crypto-cipher-types cryptohash mtl
@@ -117299,44 +117448,44 @@ self: {
      }) {};
 
   "stack" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring
-     , bifunctors, binary, bytestring, Cabal, conduit, conduit-extra
-     , containers, cpphs, cryptohash, cryptohash-conduit, deepseq
-     , directory, either, enclosed-exceptions, exceptions, fast-logger
-     , filepath, hashable, hspec, http-client, http-client-tls
-     , http-conduit, http-types, lifted-base, monad-control
-     , monad-logger, monad-loops, mtl, old-locale, optparse-applicative
-     , optparse-simple, path, persistent, persistent-sqlite
-     , persistent-template, pretty, process, resourcet, safe, split, stm
-     , streaming-commons, tar, template-haskell, temporary, text, time
-     , transformers, transformers-base, unix, unordered-containers
-     , vector, vector-binary-instances, void, yaml, zlib
+    ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring
+     , base64-bytestring, bifunctors, binary, bytestring, Cabal, conduit
+     , conduit-combinators, conduit-extra, containers, cryptohash
+     , cryptohash-conduit, deepseq, directory, either
+     , enclosed-exceptions, exceptions, fast-logger, filepath, hashable
+     , hspec, http-client, http-client-tls, http-conduit, http-types
+     , lifted-base, monad-control, monad-logger, monad-loops, mtl
+     , old-locale, optparse-applicative, optparse-simple, path
+     , persistent, persistent-sqlite, persistent-template, pretty
+     , process, resourcet, safe, split, stm, streaming-commons, tar
+     , template-haskell, temporary, text, time, transformers
+     , transformers-base, unix, unordered-containers, vector
+     , vector-binary-instances, void, yaml, zlib
      }:
      mkDerivation {
        pname = "stack";
-       version = "0.0.1";
-       sha256 = "04bb0wih2nzqrq8si48w1p6zc4b7nzrgrg4cbnly63hgx64vyhq3";
+       version = "0.0.2.1";
+       sha256 = "1gv2cbjnr93s4cyhybpd8nsqa8gqd9hpm9wyrh19fl82p8db46x6";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson async attoparsec base base64-bytestring bifunctors binary
-         bytestring Cabal conduit conduit-extra containers cryptohash
-         cryptohash-conduit deepseq directory either enclosed-exceptions
-         exceptions fast-logger filepath hashable http-client
-         http-client-tls http-conduit http-types lifted-base monad-control
-         monad-logger monad-loops mtl old-locale optparse-applicative
-         optparse-simple path persistent persistent-sqlite
-         persistent-template pretty process resourcet safe split stm
-         streaming-commons tar template-haskell temporary text time
-         transformers transformers-base unix unordered-containers vector
-         vector-binary-instances void yaml zlib
+         aeson async attoparsec base base16-bytestring base64-bytestring
+         bifunctors binary bytestring Cabal conduit conduit-combinators
+         conduit-extra containers cryptohash cryptohash-conduit deepseq
+         directory either enclosed-exceptions exceptions fast-logger
+         filepath hashable http-client http-client-tls http-conduit
+         http-types lifted-base monad-control monad-logger monad-loops mtl
+         old-locale optparse-applicative optparse-simple path persistent
+         persistent-sqlite persistent-template pretty process resourcet safe
+         split stm streaming-commons tar template-haskell temporary text
+         time transformers transformers-base unix unordered-containers
+         vector vector-binary-instances void yaml zlib
        ];
        testDepends = [
          base Cabal conduit conduit-extra containers cryptohash directory
          exceptions filepath hspec http-conduit monad-logger path resourcet
          temporary transformers
        ];
-       buildTools = [ cpphs ];
        homepage = "https://github.com/commercialhaskell/stack
 test/package-dump/ghc-7.8.txt
 test/package-dump/ghc-7.10.txt";
@@ -120949,17 +121098,14 @@ test/package-dump/ghc-7.10.txt";
      }) {};
 
   "tagged-exception-core" = callPackage
-    ({ mkDerivation, base, exceptions, extensible-exceptions, mmorph
-     , transformers
-     }:
+    ({ mkDerivation, base, exceptions, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "tagged-exception-core";
-       version = "2.0.0.0";
-       sha256 = "02ny4yz9afaazw2pxpkpalffx8i5nhi3x9561blrd0pdrqq8qnib";
-       buildDepends = [
-         base exceptions extensible-exceptions mmorph transformers
-       ];
-       jailbreak = true;
+       version = "2.1.0.0";
+       revision = "1";
+       sha256 = "1w4020qb6f5vnym13a4jrha62vj7rqz3nfsrsxa34dl04y63jcax";
+       editedCabalFile = "8f3f0eba857169c03927f8605ed326b7a4a5395582aeac4edcee44369b4c9689";
+       buildDepends = [ base exceptions mmorph mtl transformers ];
        homepage = "https://github.com/trskop/tagged-exception";
        description = "Reflect exceptions using phantom types";
        license = stdenv.lib.licenses.bsd3;
@@ -124059,8 +124205,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "thumbnail-plus";
-       version = "1.0.4";
-       sha256 = "110vfk5ri394awzmmq82r87gc9pmvy3500i836602syvd5zfa92x";
+       version = "1.0.5";
+       sha256 = "0320yfgnsazl7bxm9zf077mi4dgfmlcfnzy1qpdl9w3jl5i7z441";
        buildDepends = [
          base bytestring conduit conduit-extra data-default directory either
          gd imagesize-conduit resourcet temporary transformers
@@ -124481,13 +124627,14 @@ test/package-dump/ghc-7.10.txt";
      mkDerivation {
        pname = "time-recurrence";
        version = "0.9.2";
+       revision = "1";
        sha256 = "1arqmkagmswimbh78qfz5bcilk9i14w29j4vf4i89d00vac3vrzm";
+       editedCabalFile = "7f1fe44ec61160e3fba86a04942d056ac91faa0002817e107e3d8399b71fe427";
        buildDepends = [ base data-ordlist mtl time ];
        testDepends = [
          base data-ordlist HUnit mtl old-locale test-framework
          test-framework-hunit time
        ];
-       jailbreak = true;
        homepage = "http://github.com/hellertime/time-recurrence";
        description = "Generate recurring dates";
        license = stdenv.lib.licenses.gpl3;
@@ -126026,8 +126173,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "trurl";
-       version = "0.2.0.0";
-       sha256 = "167f7wrvrva7764z35l48rxbcnnajm343gqw2b67jh14d5kj6fz9";
+       version = "0.2.2.0";
+       sha256 = "139c97c63fhgq9lisic5wyfn872j120xsj3i72fs5s0aa9m59w81";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -131837,8 +131984,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "wai-middleware-metrics";
-       version = "0.2.0";
-       sha256 = "0vqpp7fqjmhknvmizvbzzay3ixk0a5jqq9y80al62hc2yb75pz0w";
+       version = "0.2.1";
+       sha256 = "0aiig72r72vykd1f1871458d4glnqsrs7rr402jv5ka05d1rg6y0";
        buildDepends = [ base ekg-core http-types time wai ];
        testDepends = [
          base bytestring ekg-core http-types QuickCheck scotty tasty
@@ -132815,7 +132962,9 @@ test/package-dump/ghc-7.10.txt";
      mkDerivation {
        pname = "webcrank";
        version = "0.2.2";
+       revision = "1";
        sha256 = "1rgvpp2526lmly2fli65mygplfc6wzqcw5fkn7gq4fcrmql2cisj";
+       editedCabalFile = "487831902c68484790108f97e32098dad9711eb15e0729b9ab1ba009e8fd5747";
        buildDepends = [
          attoparsec base blaze-builder bytestring case-insensitive either
          exceptions http-date http-media http-types lens mtl semigroups text
@@ -132826,7 +132975,6 @@ test/package-dump/ghc-7.10.txt";
          http-media http-types lens mtl tasty tasty-hunit tasty-quickcheck
          unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/webcrank/webcrank.hs";
        description = "Webmachine inspired toolkit for building http applications and services";
        license = stdenv.lib.licenses.bsd3;
@@ -136478,8 +136626,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "yesod-auth";
-       version = "1.4.5";
-       sha256 = "0agddsicjqcvraa3lcbxwwnk4mapjjd1y4pdp5kg111kaww6nkdn";
+       version = "1.4.5.1";
+       sha256 = "161gij0r82raih9lvdws4vsknpm36m00ikd17vhhlzz01q9z7l64";
        buildDepends = [
          aeson authenticate base base16-bytestring base64-bytestring binary
          blaze-builder blaze-html blaze-markup byteable bytestring conduit
@@ -136489,7 +136637,6 @@ test/package-dump/ghc-7.10.txt";
          resourcet safe shakespeare template-haskell text time transformers
          unordered-containers wai yesod-core yesod-form yesod-persistent
        ];
-       jailbreak = true;
        homepage = "http://www.yesodweb.com/";
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
@@ -136784,8 +136931,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.9.2";
-       sha256 = "0bbr9bjgj75jh8q9jzv9h1ivz87svz3j02hwphq32487f3682gd0";
+       version = "1.4.10";
+       sha256 = "1h55155l7ca664zdwq1x0c6p43gy35p1vvghpgd0ajzip8lsyfq1";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -137302,8 +137449,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "yesod-persistent";
-       version = "1.4.0.2";
-       sha256 = "06qzgq0mb7k0h8q6lh47l0mzx91xn4ba07nmn22vsfvjfdji6lib";
+       version = "1.4.0.3";
+       sha256 = "0prvrz52c2pr4qsanjzndviyq4f6zc49in69xz5153h2vagbfmb4";
        buildDepends = [
          base blaze-builder conduit persistent persistent-template
          resource-pool resourcet transformers yesod-core
@@ -137312,7 +137459,6 @@ test/package-dump/ghc-7.10.txt";
          base blaze-builder conduit hspec persistent persistent-sqlite text
          wai-extra yesod-core
        ];
-       jailbreak = true;
        homepage = "http://www.yesodweb.com/";
        description = "Some helpers for using Persistent from Yesod";
        license = stdenv.lib.licenses.mit;

From a0473fde87721c9211785c1ef66f85717554ca91 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 14 Jun 2015 13:04:08 +0200
Subject: [PATCH 1199/2322] tzdata -> 2015e

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

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 0ed99bfdb16..6d10fe68a09 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-let version = "2015d"; in
+let version = "2015e"; in
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "0cfmjvr753b3wjnr1njv268xcs31yl9pifkxx58y42bz4w4517wb";
+        sha256 = "0vxs6j1i429vxz4a1lbwjz81k236lxdggqvrlix2ga5xib9vbjgz";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "0a3i65b6lracfx18s8j69k0x30x8aq9gx7qm040sybn4qm7ga6i2";
+        sha256 = "185db6789kygcpcl48y1dh6m4fkgqcwqjwx7f3s5dys7b2sig8mm";
       })
     ];
 

From 553ce28bc296c8f51cf2605e58abaa14d4bb41b2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 15 Jun 2015 19:58:08 +0200
Subject: [PATCH 1200/2322] geolite-legacy -> 2015-06-15

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

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index a34c10630aa..b6cc2a25266 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-06-03";
+  version = "2015-06-15";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
     "0xjzg76vdsayxyy1yyw64w781vad4c9nbhw61slh2qmazdr360g9";
   srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz"
-    "0zccfd1wsny3n1f3wgkb071pp6z01nmk0p6nngha0gwnywchvbx4";
+    "18kxswr0b5klimfpj1zhxipvyvrljvcywic4jc1ggcr44lf4hj9w";
   srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz"
     "0asnmmirridiy57zm0kccb7g8h7ndliswfv3yfk7zm7dk98njnxs";
 

From 99912bbf0e082cac9edbb8074c6b962057b43d3b Mon Sep 17 00:00:00 2001
From: Dario Bertini <dario.bertini@nccgroup.trust>
Date: Mon, 15 Jun 2015 19:24:02 +0100
Subject: [PATCH 1201/2322] Add (optional, but opted in by default) support for
 Windows in ansible

---
 pkgs/tools/system/ansible/default.nix |  4 ++--
 pkgs/top-level/python-packages.nix    | 29 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix
index 374528872e8..c23d10d20ee 100644
--- a/pkgs/tools/system/ansible/default.nix
+++ b/pkgs/tools/system/ansible/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, python }:
+{ windowsSupport ? true, stdenv, fetchurl, pythonPackages, python }:
 
 pythonPackages.buildPythonPackage rec {
   version = "1.9.1";
@@ -21,7 +21,7 @@ pythonPackages.buildPythonPackage rec {
 
   propagatedBuildInputs = with pythonPackages; [
     paramiko jinja2 pyyaml httplib2 boto six
-  ];
+  ] ++ stdenv.lib.optional windowsSupport pywinrm;
 
   postFixup = ''
       wrapPythonProgramsIn $out/bin "$out $pythonPath"
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 38fda4ad406..3d4aa343b53 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10508,6 +10508,18 @@ let
     };
   };
 
+  pywinrm = buildPythonPackage (rec {
+    name = "pywinrm";
+
+    src = pkgs.fetchgit {
+      url = https://github.com/diyan/pywinrm.git;
+      rev = "c9ce62d500007561ab31a8d0a5d417e779fb69d9";
+      sha256 = "0n0qlcgin2g5lpby07qbdlnpq5v2qc2yns9zc4zm5prwh2mhs5za";
+    };
+
+    propagatedBuildInputs = with self; [ xmltodict isodate ];
+  });
+
 
   pyxattr = buildPythonPackage (rec {
     name = "pyxattr-0.5.1";
@@ -13451,6 +13463,23 @@ let
     };
   });
 
+  xmltodict = buildPythonPackage (rec {
+    name = "xmltodict-0.9.2";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/x/xmltodict/${name}.tar.gz";
+      sha256 = "00crqnjh1kbvcgfnn3b8c7vq30lf4ykkxp1xf3pf7mswr5l1wp97";
+    };
+
+    buildInputs = with self; [ coverage nose ];
+
+    meta = {
+      description = "Makes working with XML feel like you are working with JSON";
+      homepage = https://github.com/martinblech/xmltodict;
+      license = licenses.mit;
+    };
+  });
+
   zbase32 = buildPythonPackage (rec {
     name = "zbase32-1.1.2";
 

From b325c1556a9b769ec3f6d5c56eed707e319138a7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 15 Jun 2015 11:31:15 -0700
Subject: [PATCH 1202/2322] kernel: 3.12.43 -> 3.12.44

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 2646bf93b0a..e34eccadda6 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, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.43";
+  version = "3.12.44";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "08nsppn3rpwydkq0pd8k8fgjfm67y2nbbrcz1hri227crxxx13dm";
+    sha256 = "05fyb49ibijq2iv4x25m5a77n8609b4lz8x8n8wfkdywm13479h8";
   };
 
   features.iwlwifi = true;

From 2fd74f43b5a22923b64ceab2f13fb99f827dec04 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 15 Jun 2015 11:31:26 -0700
Subject: [PATCH 1203/2322] kernel: 3.18.14 -> 3.18.16

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 592086b6547..168bfe5e94c 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.18.14";
+  version = "3.18.16";
   extraMeta.branch = "3.18";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1xh0vvn1l2g1kkg54f0mg0inbpsiqs24ybgsakksmcpcadjgqk1i";
+    sha256 = "0c2530amgsk29ina9mfvlncki64w0zs16d2k8bghq3fv9k2qv3nr";
   };
 
   features.iwlwifi = true;

From 046ba6b7db940c8f70ee6fca0de28464febe4a4d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 15 Jun 2015 11:37:05 -0700
Subject: [PATCH 1204/2322] linux-testing: 4.1-rc7 -> 4.1-rc8

---
 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 60bc4e51209..ec7e597e871 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, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1-rc7";
-  modDirVersion = "4.1.0-rc7";
+  version = "4.1-rc8";
+  modDirVersion = "4.1.0-rc8";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "09bxkm0nl9vzlfb14500bl6zjzhgacy7y32b3mw1d9hx62yknk2f";
+    sha256 = "0ia4lajpr3w9iivmwm2d7gqrpv97da5g4j8pkqa7q4mlr86jki2w";
   };
 
   features.iwlwifi = true;

From 32616ae028627dbe12eca4a5199f51a4df0c8a90 Mon Sep 17 00:00:00 2001
From: Dario Bertini <dario.bertini@nccgroup.trust>
Date: Mon, 15 Jun 2015 19:45:49 +0100
Subject: [PATCH 1205/2322] Add pywinrm metadata

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 36cf8cefc48..8a34d67df11 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10604,6 +10604,12 @@ let
     };
 
     propagatedBuildInputs = with self; [ xmltodict isodate ];
+
+    meta = {
+      homepage = "http://github.com/diyan/pywinrm/";
+      description = "Python library for Windows Remote Management";
+      license = licenses.mit;
+    };
   });
 
 

From ede08cec4d21fea80a4a1a15442ba7dd64694c4c Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Sun, 14 Jun 2015 20:30:02 +0000
Subject: [PATCH 1206/2322] add libgroove package

---
 .../libraries/libgroove/default.nix           | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/libgroove/default.nix

diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix
new file mode 100644
index 00000000000..69545e4720c
--- /dev/null
+++ b/pkgs/development/libraries/libgroove/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, cmake, libav, SDL2, chromaprint, libebur128 }:
+
+stdenv.mkDerivation rec {
+  version = "4.3.0";
+  name = "libgroove-${version}";
+
+  src = fetchFromGitHub {
+    owner = "andrewrk";
+    repo = "libgroove";
+    rev = "${version}";
+    sha256 = "1la9d9kig50mc74bxvhx6hzqv0nrci9aqdm4k2j4q0s1nlfgxipd";
+  };
+
+  buildInputs = [ cmake libav SDL2 chromaprint libebur128 ];
+
+  meta = with stdenv.lib; {
+    description = "Streaming audio processing library";
+    homepage = https://github.com/andrewrk/libgroove;
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bcf02133be7..8764ee5c8be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6771,6 +6771,8 @@ let
 
   libgnurl = callPackage ../development/libraries/libgnurl { };
 
+  libgroove = callPackage ../development/libraries/libgroove { };
+
   libseccomp = callPackage ../development/libraries/libseccomp { };
 
   libsecret = callPackage ../development/libraries/libsecret { };

From e8dea0c5c20ffe107adad49fec5083c86b91167c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 15 Jun 2015 21:34:30 +0200
Subject: [PATCH 1207/2322] fmit -> 1.0.0

---
 pkgs/applications/audio/fmit/default.nix | 26 ++++++++++++++----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index ead15e9a918..a8acfbffb05 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -1,26 +1,30 @@
-{ stdenv, fetchurl, alsaLib, cmake, fftw, freeglut, jack2, libXmu, qt4 }:
+{ stdenv, fetchFromGitHub, alsaLib, cmake, fftw
+, freeglut, jack2, libXmu, qt4 }:
 
-stdenv.mkDerivation rec {
-  version = "0.99.5";
+let version = "1.0.0"; in
+stdenv.mkDerivation {
   name = "fmit-${version}";
 
-  src = fetchurl {
-    url = "http://download.gna.org/fmit/${name}-Source.tar.bz2";
-    sha256 = "1rc84gi27jmq2smhk0y0p2xyypmsz878vi053iqns21k848g1491";
+  src = fetchFromGitHub {
+    sha256 = "13y9csv34flz7065kg69h99hd7d9zskq12inmkf34l4qjyk7c185";
+    rev = "v${version}";
+    repo = "fmit";
+    owner = "gillesdegottex";
   };
 
-  # Also update longDescription when adding/removing sound libraries
-  buildInputs = [ alsaLib cmake fftw freeglut jack2 libXmu qt4 ];
+  buildInputs = [ alsaLib fftw freeglut jack2 libXmu qt4 ];
+  nativeBuildInputs = [ cmake ];
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Free Musical Instrument Tuner";
     longDescription = ''
-      Software for tuning musical instruments. Uses Qt as GUI library and
-      ALSA or JACK as sound input library.
+      FMIT is a graphical utility for tuning your musical instruments, with
+      error and volume history and advanced features.
     '';
-    homepage = http://home.gna.org/fmit/index.html;
+    homepage = http://gillesdegottex.github.io/fmit/;
     license = licenses.gpl3Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];

From 06d49aa69680871226496b5b16361f613b3cd518 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 10 Jun 2015 17:20:27 +0200
Subject: [PATCH 1208/2322] vimPlugins.youcompleteme: use clang instead of
 clang-unwrapped on darwin

---
 pkgs/misc/vim-plugins/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index d693d9df857..e3016fc65f3 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -685,7 +685,8 @@ rec {
     dependencies = [];
     buildInputs = [
       python cmake
-      llvmPackages.clang-unwrapped llvmPackages.llvm
+      (if stdenv.isDarwin then llvmPackages.clang else llvmPackages.clang-unwrapped)
+      llvmPackages.llvm
     ];
 
     configurePhase = ":";

From ed554d5ae21b7769d64835d02cdad9f8185dcd0f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 15 Jun 2015 13:15:03 +0200
Subject: [PATCH 1209/2322] Delete redundant expression cheetahTemplate

Use the one provided by python-packages instead; retain the
top-level cheetahTemplate name as an alias.
---
 pkgs/tools/text/cheetah-template/2.0.1.nix | 18 ------------------
 pkgs/top-level/all-packages.nix            |  5 +----
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 pkgs/tools/text/cheetah-template/2.0.1.nix

diff --git a/pkgs/tools/text/cheetah-template/2.0.1.nix b/pkgs/tools/text/cheetah-template/2.0.1.nix
deleted file mode 100644
index 0bfa72ca00d..00000000000
--- a/pkgs/tools/text/cheetah-template/2.0.1.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = mirror://sourceforge/cheetahtemplate/Cheetah-2.0.1.tar.gz;
-    sha256 = "134k4s5f116k23vb7wf9bynlx3gf0wwl7y0zp9ciz0q66nh1idkh";
-  };
-
-  buildInputs = [python makeWrapper];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["installPythonPackage" (makeManyWrappers ''$out/bin/*'' ''--prefix PYTHONPATH : $(toPythonPath $out)'')];
-      
-  name = "cheetah-template-2.0.1";
-  meta = {
-    description = "Templating engine";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cf9fed11ae..e8382d21446 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1022,10 +1022,6 @@ let
 
   checkinstall = callPackage ../tools/package-management/checkinstall { };
 
-  cheetahTemplate = builderDefsPackage (import ../tools/text/cheetah-template/2.0.1.nix) {
-    inherit makeWrapper python;
-  };
-
   chkrootkit = callPackage ../tools/security/chkrootkit { };
 
   chocolateDoom = callPackage ../games/chocolate-doom { };
@@ -14802,6 +14798,7 @@ let
   haskell-ng = haskell;                 # 2015-04-19
   haskellngPackages = haskellPackages;  # 2015-04-19
   inherit (haskell.compiler) jhc uhc;   # 2015-05-15
+  cheetahTemplate = pythonPackages.cheetah; # 2015-06-15
 
   opentsdb = callPackage ../tools/misc/opentsdb {};
 

From b83d53e3558b3082a039640cfc1b88a117b32105 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Tue, 16 Jun 2015 01:43:54 +0300
Subject: [PATCH 1210/2322] vimPlugins: 2015-06-16 update

---
 pkgs/misc/vim-plugins/default.nix | 130 ++++++++++++++++--------------
 1 file changed, 69 insertions(+), 61 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index e3016fc65f3..28db4c343c1 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -35,13 +35,16 @@ rec {
   # Update with vimUtils.vimPlugins.pluginnames2Nix command
 
   # aliasess
+  "sourcemap.vim"     = sourcemap;
+  Colour_Sampler_Pack = Colour-Sampler-Pack;
+  YouCompleteMe       = youcompleteme;
   airline             = vim-airline;
   alternative         = a-vim; # backwards compat, added 2014-10-21
+  calendar            = calendar-vim;
   coffee-script       = vim-coffee-script;
   coffeeScript        = coffee-script; # backwards compat, added 2014-10-18
   colors-solarized    = Solarized;
   colorsamplerpack    = Colour_Sampler_Pack;
-  Colour_Sampler_Pack = Colour-Sampler-Pack;
   command_T           = command-t; # backwards compat, added 2014-10-18
   easy-align          = vim-easy-align;
   easymotion          = vim-easymotion;
@@ -52,36 +55,40 @@ rec {
   gundo               = Gundo;
   haskellConceal      = haskellconceal; # backwards compat, added 2014-10-18
   haskellconceal      = vim-haskellconceal;
-  hoogle              = Hoogle;
   hier                = vim-hier;
+  hoogle              = Hoogle;
   ipython             = vim-ipython;
   latex-live-preview  = vim-latex-live-preview;
   necoGhc             = neco-ghc; # backwards compat, added 2014-10-18
+  neocomplete         = neocomplete-vim;
+  neosnippet          = neosnippet-vim;
   nerdcommenter       = The_NERD_Commenter;
   nerdtree            = The_NERD_tree;
   quickrun            = vim-quickrun;
   signature           = vim-signature;
-  "sourcemap.vim"     = sourcemap;
   stylish-haskell     = vim-stylish-haskell;
   stylishHaskell      = stylish-haskell; # backwards compat, added 2014-10-18
   supertab            = Supertab;
   syntastic           = Syntastic;
   tabular             = Tabular;
   tagbar              = Tagbar;
+  thumbnail           = thumbnail-vim;
   tmux-navigator      = vim-tmux-navigator;
   tmuxNavigator       = tmux-navigator; # backwards compat, added 2014-10-18
+  tslime              = tslime-vim;
+  vimproc             = vimproc-vim;
+  vimshell            = vimshell-vim;
   watchdogs           = vim-watchdogs;
   webapi-vim          = WebAPI;
   yankring            = YankRing;
-  YouCompleteMe       = youcompleteme;
   
 
   Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Gist-2015-05-29";
+    name = "Gist-2015-06-09";
     src = fetchgit {
       url = "git://github.com/mattn/gist-vim";
-      rev = "235955468c2d85e5d0ece46d84948acf2bedeb20";
-      sha256 = "50ac95e145d00631acb3ae53261c880920b40b208fed1aaae71ed31d070e381e";
+      rev = "c39e5e317d88da71da338c07af492c7a27efcf0a";
+      sha256 = "97fa171cf239b54ee4ab102dd9f87810744bfa3edd34fe04d4dd8a879b22d5b4";
     };
     dependencies = [];
 
@@ -132,11 +139,11 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2015-05-29";
+    name = "Syntastic-2015-06-12";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "5c6e78a2711aa5d04d116123d78684b620033c3d";
-      sha256 = "fa8781df0c37b5d120ab4b287a911a1545cd4342edf08f85d644097c50ff59b0";
+      rev = "b8682c3029de5913e0a63a45e5f4d6f3b5e4920e";
+      sha256 = "6ec2a6a3b4b3998612d21fcdccdb82799f8cf4022d6bc38e16f85ece8692d3a3";
     };
     dependencies = [];
 
@@ -187,11 +194,11 @@ rec {
   };
 
   UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "UltiSnips-2015-05-11";
+    name = "UltiSnips-2015-06-11";
     src = fetchgit {
       url = "git://github.com/sirver/ultisnips";
-      rev = "188e00f7b87297ea7737f9494d531c7073637332";
-      sha256 = "9fb127b32bd0e2ae139b3b6008849f4566cfb1c29087e787570428c770a3430c";
+      rev = "c3a0924b777dbba2f8612950bd8f8a00df18d1bf";
+      sha256 = "7ad0e5dc8e8713db38ef2875e5d512e6cf8ef3dd7885ce12aff22052da780593";
     };
     dependencies = [];
 
@@ -269,11 +276,11 @@ rec {
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2015-05-31";
+    name = "fugitive-2015-06-14";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "e065e4f841f4a033ac9a6156573a446007617b1d";
-      sha256 = "339e2418da5f7e04490e6732010abd2f287c935e7a20df5832611f94ed42013f";
+      rev = "1c844375fa2762e3b7c16294fa36afee6fef28b1";
+      sha256 = "fa02d055243a386fe3fdb5069f36d3f035ace3594c1b1dd4a4bbc61df232fb97";
     };
     dependencies = [];
 
@@ -291,11 +298,11 @@ rec {
   };
 
   vim-addon-vim2nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-vim2nix-2015-06-01";
+    name = "vim-addon-vim2nix-2015-06-16";
     src = fetchgit {
       url = "git://github.com/JagaJaga/vim-addon-vim2nix";
-      rev = "cfa1f191b9e427dee77f8054a911a327c3cf4f79";
-      sha256 = "9960dd3248ffc8d2d3b9bf322df2369feb7a6bf54d47253bd65de1988d2e5ec3";
+      rev = "046702653f7af5829a3f3fda3b7cf89c2a8d03b5";
+      sha256 = "b92068c32ce14e75159070acbd86c52e09aaa65a523fd566e44762ed33403161";
     };
     dependencies = ["vim-addon-manager"];
 
@@ -467,22 +474,22 @@ rec {
   };
 
   vim-eighties = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-eighties-2015-04-16";
+    name = "vim-eighties-2015-06-15";
     src = fetchgit {
       url = "git://github.com/justincampbell/vim-eighties";
-      rev = "d202e6015163bbb4f7c9973f2eac66c2351e8c24";
-      sha256 = "ad7341c8d7ab659b062a67f893962b08596466a6a3a3395f28a4f4031a36eb9c";
+      rev = "68dc644664bf569e96ac91f79fdf828e89d70e02";
+      sha256 = "d6600665179395141d660c65dad3e03c13aeba164a6c1e6fabfc9e2499588132";
     };
     dependencies = [];
 
   };
 
   latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "latex-box-2015-05-16";
+    name = "latex-box-2015-06-01";
     src = fetchgit {
       url = "git://github.com/latex-box-team/latex-box";
-      rev = "55a88ed55a7631b91321916cf80c47077d478c9c";
-      sha256 = "96203a95d919db65574e187b793a7d846463d91fe641349732cc5d9aeb8242ac";
+      rev = "3c2901e12cb78bfb2be58ba4c62a488612550fe1";
+      sha256 = "8af2c45209c39438da8481183a1f14885891db73454bb4b16d24799453184e81";
     };
     dependencies = [];
 
@@ -517,11 +524,11 @@ rec {
       rev = "0854ac6a810daae4a5c99bcae61613266ce75c26";
       sha256 = "886a173d48340ad0ddeb3c852e4f2bdfc7b513a9d5a954115d081a3e276fa655";
     };
+    dependencies = [];
     patchPhase = ''
       substituteInPlace plugin/xkbswitch.vim \
               --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so
     '';
-    dependencies = [];
     buildInputs = [ xkb_switch ];
   };
 
@@ -548,22 +555,22 @@ rec {
   };
 
   vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-watchdogs-2015-04-16";
+    name = "vim-watchdogs-2015-06-15";
     src = fetchgit {
       url = "git://github.com/osyo-manga/vim-watchdogs";
-      rev = "5e3d1db592297f7d4c563900a6d224ff559f533e";
-      sha256 = "3d4c9624d86815dd47d7655eb58a703574f2ecb92238ae4e65dc67fc9960820a";
+      rev = "7dd19b1344e6bb89ecd469b085ad945435905eb9";
+      sha256 = "8481b5e0efffec520f66920aaf3f2da843c01c70688a4c71f7b31ead8d4049d1";
     };
     dependencies = [];
 
   };
 
   racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "racer-2015-06-01";
+    name = "racer-2015-06-15";
     src = fetchgit {
       url = "git://github.com/phildawes/racer";
-      rev = "7425ae5299ed3f89817945fd867403e825070df6";
-      sha256 = "0721528de38e179ab887ccb06339dabcc5aa43c564f47fa06a372ace6e9ba457";
+      rev = "dd0671b8d6e66e3e503bd7049561fb08e7815ed3";
+      sha256 = "ec996e7cbf46aec545b70781108f4290dacecd02b599a0d13b8b0cf431205403";
     };
     dependencies = [];
     buildPhase = ''
@@ -573,33 +580,33 @@ rec {
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2015-05-26";
+    name = "neocomplete-vim-2015-06-15";
     src = fetchgit {
       url = "git://github.com/shougo/neocomplete.vim";
-      rev = "0a8a7e8a72a23459c2eda5116fe9b22b0dad7a3e";
-      sha256 = "fe75653939e1299b71708a26a9af2ca1e4ac0f1daed8aa98ce46b8bb26c9bd71";
+      rev = "15c6a63ca8807493df273c77be0754f44d68d30b";
+      sha256 = "1a2a30da610e5f252bbe43717cf2cad76b8b09916c2082541fc3bb456b9b97a9";
     };
     dependencies = [];
 
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2015-05-28";
+    name = "neosnippet-snippets-2015-06-11";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet-snippets";
-      rev = "842622af4ce0e559ba64f4b991d0de8b9cade6af";
-      sha256 = "5d9a3c2d06edb3146e0dbdbba7d8c411197914bea8192844a3c849987e23a72a";
+      rev = "522c38e28949ae53af8c96d7bcbda192b92e3656";
+      sha256 = "ff0c09fb5a70e011cb7570951a67ef0253f544b3f61c8e7741d65d27b4d418c1";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2015-05-12";
+    name = "neosnippet-vim-2015-06-13";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet.vim";
-      rev = "e2c830db87e50e8cdb1128f3096664f68cb05cad";
-      sha256 = "bc950c1756d3c276dc231563749a9fbe7de0d5595e30428e1408bb530bc61e6f";
+      rev = "3cfe8368cfccffdeab660ca1019696e0fd1aa944";
+      sha256 = "049555be6a2aedee7fffc583d43c0cbe3aecc2f0efcf6cfab826e30b2e83f2fd";
     };
     dependencies = [];
 
@@ -676,11 +683,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2015-05-29";
+    name = "youcompleteme-2015-06-12";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "c2d962dddb4cc86f771722e9775d2345d31fe8bb";
-      sha256 = "2543d42662e99401ac8b4ff938fe5452b6d0215befc155e9b24590533a4bfe06";
+      rev = "d77ef96ebcca90381f38604d7fb2e90da91bd503";
+      sha256 = "7a794986eebd8fa952be3dc903588d124dd14377a07bff1b877279c3b7d498f9";
     };
     dependencies = [];
     buildInputs = [
@@ -733,7 +740,7 @@ rec {
   };
 
   a-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "a-vim-git-2010-11-06";
+    name = "a-vim-2010-11-06";
     src = fetchgit {
       url = "git://github.com/vim-scripts/a.vim";
       rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
@@ -744,7 +751,7 @@ rec {
   };
 
   align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "align-git-2012-08-07";
+    name = "align-2012-08-07";
     src = fetchgit {
       url = "git://github.com/vim-scripts/align";
       rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77";
@@ -766,11 +773,11 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2015-05-31";
+    name = "vim-wakatime-2015-06-11";
     src = fetchgit {
       url = "git://github.com/wakatime/vim-wakatime";
-      rev = "1e2ba90f708965719ed52c4ea2728bc3cfa32f6d";
-      sha256 = "ebd5a651554742727944f4a705ccbe990875d4ed656fc535183474091bcf1f1c";
+      rev = "b2dcc7ccc2247274fe63168952de5db595a01e1c";
+      sha256 = "883f92fcd45a824009e613d8a527effd1eac8bef0fe4299c0df366376afb6273";
     };
     dependencies = [];
     buildInputs = [ python ];
@@ -904,11 +911,11 @@ rec {
   };
 
   table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "table-mode-2015-04-21";
+    name = "table-mode-2015-06-05";
     src = fetchgit {
       url = "git://github.com/dhruvasagar/vim-table-mode";
-      rev = "cc723fe8cdab054f325292c288103229b0193147";
-      sha256 = "4daee279dc4e9c48af41a70bc45385136fa02546bdc8525f68ce44404db7a84a";
+      rev = "5395c9f52b91ae6083fd7b26577b8f926da6871e";
+      sha256 = "784e51f7144790fcfad83c2dc5c7f250608826ce48706b80c41f88fa04914ae2";
     };
     dependencies = [];
 
@@ -1167,11 +1174,11 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2015-05-25";
+    name = "vim-airline-2015-06-09";
     src = fetchgit {
       url = "git://github.com/bling/vim-airline";
-      rev = "67de5f2257f8d5def7a31e3009d4298ce977cb80";
-      sha256 = "0ca13f68b22ce3112117d7194f3d6b4e1280f032bc7bbca6fba4df185ff1da2a";
+      rev = "b29e01fa22ee8b8eb02cf505382a90b045b4bc64";
+      sha256 = "e943dd5900d4d49a6f7dd02434b394167a3802d68d17072fc767552a9fd16001";
     };
     dependencies = [];
 
@@ -1200,11 +1207,11 @@ rec {
   };
 
   vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gista-2015-01-29";
+    name = "vim-gista-2015-06-04";
     src = fetchgit {
       url = "git://github.com/lambdalisue/vim-gista";
-      rev = "e450417a6eaeb99d3982b880507697dce85b7217";
-      sha256 = "a7665dbc63a35d1fe9b7679a498deafb80c8dfb05fced37ac4722212c673f2ec";
+      rev = "ffe85c0438cf5ad76b07ddb6524de3803c2bfdba";
+      sha256 = "9f44d07a4f36fb4559c99a655501b3752e180458de9d76d1cb293abd0f990fb4";
     };
     dependencies = [];
 
@@ -1255,11 +1262,11 @@ rec {
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2015-05-31";
+    name = "vim-snippets-2015-06-08";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "0e9eff1bf36728b6423171f962a8d6e5de7a4621";
-      sha256 = "0d2342a184806ba9357871ef77229a29854a665fd4e75674638136d2054c0551";
+      rev = "69c918175c77c0a0516c3ab587509a3eca38b3ae";
+      sha256 = "1fe9c6d5f80513bc35c309723b57d73d42296fbe73d44c0df1de4244b2596bf0";
     };
     dependencies = [];
 
@@ -1302,4 +1309,5 @@ rec {
 
 
   };
+
 }

From 4c8f84e8afe4b782909981e23f245b7c310ff2a5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 15 Jun 2015 17:55:27 -0700
Subject: [PATCH 1211/2322] python: Correctly detect ncurses opaque api

---
 .../interpreters/python/2.7/default.nix       |   2 +
 .../python/2.7/properly-detect-curses.patch   | 116 ++++++++++++++++++
 2 files changed, 118 insertions(+)
 create mode 100644 pkgs/development/interpreters/python/2.7/properly-detect-curses.patch

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 4ad4679bd6e..813c10897e7 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -40,6 +40,8 @@ let
       # patch python to put zero timestamp into pyc
       # if DETERMINISTIC_BUILD env var is set
       ./deterministic-build.patch
+
+      ./properly-detect-curses.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/2.7/properly-detect-curses.patch b/pkgs/development/interpreters/python/2.7/properly-detect-curses.patch
new file mode 100644
index 00000000000..e2640bab0e9
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.7/properly-detect-curses.patch
@@ -0,0 +1,116 @@
+From 6dc83db69b5e29d25ba6d73646ea2e9a1097848a Mon Sep 17 00:00:00 2001
+From: Roumen Petrov <local@example.net>
+Date: Sun, 19 Feb 2012 16:13:24 +0200
+Subject: [PATCH] CROSS-properly detect WINDOW _flags for different ncurses versions
+
+---
+ Include/py_curses.h |    5 +++++
+ configure.ac        |   40 ++++++++++++++++++++++++++++++++++++++--
+ pyconfig.h.in       |    6 ++++++
+ 3 files changed, 49 insertions(+), 2 deletions(-)
+
+diff --git a/Include/py_curses.h b/Include/py_curses.h
+index f2c08f6..a9b5260 100644
+--- a/Include/py_curses.h
++++ b/Include/py_curses.h
+@@ -14,7 +14,9 @@
+ /* the following define is necessary for OS X 10.6; without it, the
+    Apple-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python
+    can't get at the WINDOW flags field. */
++/* NOTE configure check if ncurses require such definition
+ #define NCURSES_OPAQUE 0
++*/
+ #endif /* __APPLE__ */
+ 
+ #ifdef __FreeBSD__
+@@ -57,9 +59,12 @@
+ #ifdef HAVE_NCURSES_H
+ /* configure was checking <curses.h>, but we will
+    use <ncurses.h>, which has all these features. */
++/* NOTE configure check for existence of flags
++ * Also flags are visible only if WINDOW structure is not opaque
+ #ifndef WINDOW_HAS_FLAGS
+ #define WINDOW_HAS_FLAGS 1
+ #endif
++*/
+ #ifndef MVWDELCH_IS_EXPRESSION
+ #define MVWDELCH_IS_EXPRESSION 1
+ #endif
+diff --git a/configure.ac b/configure.ac
+index 0a3a186..75f5142 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4150,15 +4150,51 @@ then
+ fi
+ 
+ AC_MSG_CHECKING(whether WINDOW has _flags)
+-AC_CACHE_VAL(ac_cv_window_has_flags,
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
+   WINDOW *w;
+   w->_flags = 0;
+ ]])],
+ [ac_cv_window_has_flags=yes],
+-[ac_cv_window_has_flags=no]))
++[ac_cv_window_has_flags=no])
+ AC_MSG_RESULT($ac_cv_window_has_flags)
+ 
++py_curses_window_is_opaque=no
++if test no = $ac_cv_window_has_flags; then
++  AC_MSG_CHECKING([whether WINDOW has _flags in non-opaque structure])
++  AC_COMPILE_IFELSE([
++  AC_LANG_PROGRAM([[
++    #define NCURSES_OPAQUE 0
++    #include <curses.h>
++  ]],[[
++    WINDOW *w;
++    w->_flags = 0;
++  ]])],
++  [py_curses_window_is_opaque=yes])
++  AC_MSG_RESULT([$py_curses_window_is_opaque])
++fi
++if test yes = $py_curses_window_is_opaque; then
++  ac_cv_window_has_flags=yes
++  AC_DEFINE([NCURSES_OPAQUE], [0], [Define to 0 if you have WINDOW _flags in non-opaque structure.])
++fi
++
++py_curses_window_is_internal=no
++if test no = $ac_cv_window_has_flags; then
++  AC_MSG_CHECKING([whether WINDOW has _flags as internal structure])
++  AC_COMPILE_IFELSE([
++  AC_LANG_PROGRAM([[
++    #define NCURSES_INTERNALS 1
++    #include <curses.h>
++  ]],[[
++    WINDOW *w;
++    w->_flags = 0;
++  ]])],
++  [py_curses_window_is_internal=yes])
++  AC_MSG_RESULT([$py_curses_window_is_internal])
++fi
++if test yes = $py_curses_window_is_internal; then
++  ac_cv_window_has_flags=yes
++  AC_DEFINE([NCURSES_INTERNALS], [1], [Define to 1 if you have WINDOW _flags as internal structure.])
++fi
+ 
+ if test "$ac_cv_window_has_flags" = yes
+ then
+diff --git a/pyconfig.h.in b/pyconfig.h.in
+index 3ca3a4f..484c817 100644
+--- a/pyconfig.h.in
++++ b/pyconfig.h.in
+@@ -1130,6 +1130,12 @@
+ /* Define if mvwdelch in curses.h is an expression. */
+ #undef MVWDELCH_IS_EXPRESSION
+ 
++/* Define to 1 if you have WINDOW _flags as internal structure. */
++#undef NCURSES_INTERNALS
++
++/* Define to 0 if you have WINDOW _flags in non-opaque structure. */
++#undef NCURSES_OPAQUE
++
+ /* Define to the address where bug reports for this package should be sent. */
+ #undef PACKAGE_BUGREPORT
+ 
+-- 
+1.6.4
+

From 82ec18463dad6997eb6a66225f0c8017e867b105 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 16 Jun 2015 03:12:30 +0200
Subject: [PATCH 1212/2322] Add dfasma 1.0.1: analyse/compare audio files

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

diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
new file mode 100644
index 00000000000..0dda6e3dabd
--- /dev/null
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, fftw, libsndfile, qt5 }:
+
+let version = "1.0.1"; in
+stdenv.mkDerivation {
+  name = "dfasma-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "16m6jnr49j525xxqiwmwni07rcdg92p0dcznd5bmzz34xsm0cbiz";
+    rev = "v${version}";
+    repo = "dfasma";
+    owner = "gillesdegottex";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Analyse and compare audio files in time and frequency";
+    longDescription = ''
+      DFasma is free open-source software to compare audio files by time and
+      frequency. The comparison is first visual, using wavforms and spectra. It
+      is also possible to listen to time-frequency segments in order to allow
+      perceptual comparison. It is basically dedicated to analysis. Even though
+      there are basic functionalities to align the signals in time and
+      amplitude, this software does not aim to be an audio editor.
+    '';
+    homepage = http://gillesdegottex.github.io/dfasma/;
+    license = licenses.gpl3Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ fftw libsndfile qt5.base qt5.multimedia ];
+
+  configurePhase = ''
+    qmake DESTDIR=$out/bin dfasma.pro
+  '';
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    install -Dm644 distrib/dfasma.desktop $out/share/applications/dfasma.desktop
+    install -Dm644 icons/dfasma.png $out/share/pixmaps/dfasma.png
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8764ee5c8be..77268cb088f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10757,6 +10757,8 @@ let
     pulseSupport = config.pulseaudio or true;
   };
 
+  dfasma = callPackage ../applications/audio/dfasma { };
+
   dia = callPackage ../applications/graphics/dia {
     inherit (pkgs.gnome) libart_lgpl libgnomeui;
   };

From 368e381d1f0fc463fb43b2868c8f48772a4b97e0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 16 Jun 2015 03:34:41 +0200
Subject: [PATCH 1213/2322] python-packages: prompt_toolkit -> 0.40

Fixes:
- Fix in output_screen_diff: reset correctly.
- Ignore flush errors in vt100_output.
- Implemented <num>gg Vi key binding.
- Bug fix in the renderer when the style changes.

New features:
- TokenListControl can now display the cursor somewhere.
- Added SwitchableValidator class.
- print_tokens function added.
- get_style argument for Application added.
- KeyBindingManager got an enable_all argument.

Backwards incompatible changes:
- history_search is now a SimpleFilter instance.
---
 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 f80df2edfcb..7e01bda11c8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8868,11 +8868,11 @@ let
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "0.39";
+    version = "0.40";
 
     src = pkgs.fetchurl {
+      sha256 = "0zyp2zpbckpdhapijvg7jwli71ilhp02awn99ly70q3l1f44m9dj";
       url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
-      sha256 = "1046fhgqd1171n8xyzcxwzcxgkcwa77r08g7iih8k5x7z59l94lb";
     };
 
     buildInputs = with self; [ jedi ipython pygments ];

From a2a69400a47aca17daacb694bd8ce46d91d25007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <deroiste@syslab.com>
Date: Tue, 16 Jun 2015 11:30:20 +0200
Subject: [PATCH 1214/2322] jmtpfs: add platform

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

diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix
index 2a2ff0a47a5..091270deab6 100644
--- a/pkgs/tools/filesystems/jmtpfs/default.nix
+++ b/pkgs/tools/filesystems/jmtpfs/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation {
     description = "A FUSE filesystem for MTP devices like Android phones";
     homepage = https://github.com/JasonFerrara/jmtpfs;
     license = licenses.gpl3;
+    platforms = platforms.linux;
     maintainers = [ maintainers.coconnor ];
   };
 }

From 8437f039e3a07b47ce504a7c96f62300c9bc8d82 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 16 Jun 2015 12:02:00 +0200
Subject: [PATCH 1215/2322] help2man: update from 1.46.6 to 1.47.1

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

diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index 79dbb533d03..2f811d9ae82 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "help2man-1.46.6";
+  name = "help2man-1.47.1";
 
   src = fetchurl {
     url = "mirror://gnu/help2man/${name}.tar.xz";
-    sha256 = "1brccgnjf09f2zg70s6gv6gn68mi59kp3zf50wvxp79n72ngapv1";
+    sha256 = "01ib718afwc28bmh1n0p5h7245vs3rrfm7bj1sq4avmh1kv2d6y5";
   };
 
   buildInputs = [ makeWrapper perl gettext LocaleGettext ];

From c9743be4458728ed803e00f2cc93b1a6594fd887 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 10:59:52 +0200
Subject: [PATCH 1216/2322] nlopt: broken by recent octave 4.x update

See http://hydra.cryp.to/build/932458/nixlog/1/raw for a complete build log.
The issue is known upstream at https://github.com/stevengj/nlopt/issues/33.
---
 pkgs/development/libraries/nlopt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index ad194437727..080f09dfdf4 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
     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;
     maintainers = [ stdenv.lib.maintainers.simons ];
+    broken = true;              # cannot cope with Octave 4.x
   };
 
 }

From d4c810cccda570df54adcc51329f07dca69db65a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 10:44:52 +0200
Subject: [PATCH 1217/2322] r-modules: disable broken packages to avoid Hydra
 evaluation errors

---
 pkgs/development/r-modules/default.nix | 278 ++++++++++++++++++++++++-
 1 file changed, 273 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 2f8c22fe865..34e50d08413 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -649,97 +649,191 @@ let
 
   # Packages which cannot be installed due to lack of dependencies or other reasons.
   brokenPackages = [
+    "abd" # requires nlopt
     "ACNE" # requires aroma_affymetrix
     "Actigraphy" # SDMTools.so: undefined symbol: X
+    "adabag" # requires nlopt
     "adaptsmoFMRI" # requires spatstat
     "ads" # requires spatstat
+    "AER" # REQUIRES NLOPT
+    "afex" # requires nlopt
+    "agRee" # requires nlopt
     "agridat" # requires pcaMethods
     "aLFQ" # requires protiq
+    "alr3" # requires nlopt
+    "alr4" # requires nlopt
+    "anacor" # requires nlopt
     "AntWeb" # requires leafletR
+    "aods3" # requires nlopt
     "aoristic" # requires spatstat
     "apmsWAPP" # requires genefilter, Biobase, multtest, edgeR, DESeq, and aroma.light
+    "apt" # requires nlopt
+    "ArfimaMLM" # Requires Nlopt
+    "arm" # requires nlopt
     "aroma_affymetrix" # requires aroma_core
     "aroma_cn" # requires PSCBS
     "aroma_core" # requires PSCBS
     "ArrayBin" # requires SAGx
+    "ARTool" # Requires Nlopt
     "babel" # requires edgeR
     "BACA" # requires RDAVIDWebService
+    "backShift" # requires pcalg to build
+    "bartMachine" # requires nlopt
+    "bayesDem" # requires nlopt
+    "bayesLife" # requires nlopt
+    "bayesPop" # requires nlopt
+    "Bayesthresh" # Requires Nlopt
+    "BBRecapture" # Requires Nlopt
+    "BCA" # REQUIRES NLOPT
     "BcDiag" # requires fabia
     "bdvis" # requres taxize
     "beadarrayFilter" # requires beadarray
     "beadarrayMSV" # requires Biobase, geneplotter, andlimma
+    "bgmm" # requires nlopt
+    "BIFIEsurvey" # requires DiagrammeR to build
     "bigGP" # requires MPI running. HELP WANTED!
     "bigpca" # requires NCmisc
+    "BiodiversityR" # Requires Nlopt
     "Biograph" # requires mvna
     "biotools" # requires rpanel
     "BiSEp" # requires GOSemSim, GO.db, and org.Hs.eg.db
     "BLCOP" # depends on broken fPortfolio
+    "blmeco" # requires nlopt
+    "blme" # requires nlopt
+    "bmd" # requires nlopt
+    "bmem" # requires DiagrammeR to build
     "bmrm" # requires clpAPI
+    "bootnet" # requires IsingFit
+    "boss" # requires nlopt
+    "BradleyTerry2" # Requires Nlopt
     "branchLars" # requires Rgraphviz
     "BRugs" # requires OpenBUGS
+    "CADFtest" # Requires Nlopt
+    "cAIC4" # requires nlopt
     "calmate" # requires aroma_core
+    "candisc" # requires nlopt
+    "carcass" # requires nlopt
+    "caretEnsemble" # requires nlopt
+    "caret" # requires nlopt
     "CARrampsOcl" # depends on OpenCL
+    "car" # requires nlopt
+    "CCpop" # Requires Nlopt
+    "ChainLadder" # Requires Nlopt
     "CHAT" # requires DNAcopy
     "ChemoSpec" # depends on broken speaq
     "classGraph" # requires graph, and Rgraphviz
+    "climwin" # requires nlopt
+    "CLME" # REQUIRES NLOPT
     "clpAPI" # requires clp
+    "clusterPower" # requires nlopt
     "compendiumdb" # requires Biobase
+    "conformal" # requires nlopt
+    "corHMM" # requires nlopt
     "CORM" # requires limma
+    "CosmoPhotoz" # Requires Nlopt
+    "cp4p" # build is broken
     "cplexAPI" # requires CPLEX
     "crmn" # requires pcaMethods, and Biobase
     "Crossover" # fails self-test
     "CrypticIBDcheck" # requires rJPSGCS
     "cudaBayesreg" # requres Rmath
+    "curl" # build is broken
     "curvHDR" # requires flowCore
     "D2C" # requires gRbase
     "DAAGbio" # requires limma
     "daff" # requires V8 to build
     "dagbag" # requires Rlapack
+    "DAMisc" # Requires Nlopt
     "DBKGrad" # requires SDD
     "dbmss" # requires spatstat
     "DCGL" # requires limma
     "dcGOR" # requires dnet
+    "DeducerExtras" # Requires Nlopt
+    "DeducerPlugInExample" # Requires Nlopt
+    "DeducerPlugInScaling" # Requires Nlopt
+    "Deducer" # Requires Nlopt
+    "DeducerSpatial" # Requires Nlopt
+    "DeducerSurvival" # Requires Nlopt
+    "DeducerText" # Requires Nlopt
     "demi" # requires affy, affxparser, and oligo
     "DepthProc" # requires samr
     "DiagrammeR" # requires V8 to build
+    "DiagTest3Grp" # Requires Nlopt
     "DiffCorr" # misses undeclared dependencies 'pcaMethods', 'multtest'
+    "difR" # requires nlopt
     "Digiroo2" # requires spatstat
+    "discSurv" # requires nlopt
+    "DistatisR" # Requires Nlopt
+    "diveRsity" # requires DiagrammeR to build
     "dixon" # requires spatstat
     "dnet" # requires supraHex, graph, Rgraphviz, and Biobase
     "doMPI" # requires MPI running. HELP WANTED!
+    "dpa" # requires DiagrammeR to build
     "dpcR" # requires spatstat
+    "drc" # requires nlopt
+    "drfit" # requires nlopt
+    "drsmooth" # requires nlopt
     "DSpat" # requires spatstat
+    "dynlm" # requires nlopt
+    "easyanova" # requires nlopt
     "ecespa" # requires spatstat
     "ecoengine" # requires leafletR
     "ecospat" # requires spatstat
     "edgeRun" # requires edgeR
+    "eeptools" # requires nlopt
+    "EffectLiteR" # Requires Nlopt
+    "effects" # requires nlopt
     "EMA" # requires siggenes, affy, multtest, gcrma, biomaRt, and AnnotationDbi
     "empiricalFDR_DESeq2" # requires DESeq2, and GenomicRanges
+    "EnQuireR" # Requires Nlopt
+    "episplineDensity" # requires nlopt
     "epoc" # requires graph, and Rgraphviz
+    "epr" # requires nlopt
+    "erer" # requires nlopt
     "erpR" # requires rpanel
     "ETAS" # requires spatstat
     "eulerian" # requires graph
     "evobiR" # requres taxiz
     "evora" # requires qvalue
     "ExomeDepth" # requires GenomicRanges, and Rsamtools
+    "extRemes" # requires nlopt
+    "ez" # requires nlopt
+    "FactoMineR" # Requires Nlopt
+    "Factoshiny" # Requires Nlopt
     "FAMT" # requires impute
+    "faoutlier" # requires DiagrammeR to build
+    "fastR" # requires nlopt
     "fdrDiscreteNull" # requires edgeR
+    "FDRreg" # Requires Nlopt
     "FHtest" # requires interval
     "flexCWM" # depends on broken mixture
     "fPortfolio" # requires rneos
+    "freqweights" # requires nlopt
+    "fscaret" # requires nlopt
     "FunctionalNetworks" # requires breastCancerVDX, and Biobase
+    "fxregime" # requires nlopt
+    "gamclass" # requires nlopt
     "gamlss_demo" # requires rpanel
+    "gamm4" # requires nlopt
+    "gcmr" # requires nlopt
+    "GDAtools" # Requires Nlopt
     "GeneticTools" # requires snpStats
+    "genridge" # requires nlopt
     "geojsonio" # requires V8 to build
     "GExMap" # requires Biobase and multtest
+    "gimme" # requires DiagrammeR to build
     "gitter" # requires EBImage
     "glmgraph" # test suite says: "undefined symbol: dgemv_"
     "gmatrix" # depends on proprietary cudatoolkit
     "gMCP" # fails self-test
     "GOGANPA" # requires WGCNA
+    "gplm" # requires nlopt
     "gputools" # depends on proprietary cudatoolkit
     "gRain" # requires gRbase
+    "granova" # requires nlopt
     "gRapHD" # requires graph
+    "graphicalVAR" # requires DiagrammeR to build
+    "GraphPCA" # Requires Nlopt
     "gRbase" # requires RBGL, and graph
     "gRc" # requires gRbase
     "gridDebug" # requires gridGraphviz
@@ -748,51 +842,101 @@ let
     "gRim" # requires gRbase
     "GSAgm" # requires edgeR
     "GUIDE" # requires rpanel
+    "GWAF" # REQUIRES NLOPT
     "h2o" # tries to download some h2o.jar during its build
+    "h5" # depends on missing h5 system library
     "hasseDiagram" # requires Rgraphviz
+    "hbsae" # requires nlopt
     "hddplot" # requires multtest
+    "heplots" # requires nlopt
+    "HH" # REQUIRES NLOPT
     "HierO" # requires rneos
     "HiPLARM" # requires MAGMA or PLASMA
+    "HistDAWass" # Requires Nlopt
+    "HLMdiag" # Requires Nlopt
     "hpoPlot" # requires Rgraphviz
     "hsdar" # fails to build
     "HTSCluster" # requires edgeR
+    "hysteresis" # requires nlopt
+    "IATscores" # requires DiagrammeR to build
+    "ibd" # requires nlopt
+    "iccbeta" # requires nlopt
     "iFes" # depends on proprietary cudatoolkit
     "imputeLCMD" # requires pcaMethods, and impute
+    "imputeR" # requires nlopt
+    "in2extRemes" # requires nlopt
+    "incReg" # requires nlopt
+    "inferference" # requires nlopt
+    "influence_ME" # requires nlopt
     "intamapInteractive" # requires spatstat
     "interval" # requires Icens
     "ionflows" # requires Biostrings
     "iRefR" # requires graph, and RBGL
+    "IsingFit" # requires DiagrammeR to build
     "IsoGene" # requires Biobase, and affy
     "isva" # requires qvalue
+    "ivpack" # requires nlopt
+    "JAGUAR" # REQUIRES NLOPT
     "jomo" # linking errors
     "js" # requires broken V8
     "KANT" # requires affy, and Biobase
     "ktspair" # requires Biobase
     "latticeDensity" # requires spatstat
+    "lawn" # requires DiagrammeR to build
+    "lawn" # requires V8 to build
     "leapp" # requires sva
+    "learnstats" # requires nlopt
     "lefse" # SDMTools.so: undefined symbol: X
+    "lessR" # requires nlopt
     "lfe" # fails to compile
     "lgcp" # requires rpanel
     "LinRegInteractive" # requires Rpanel
+    "lme4" # requires nlopt
+    "LMERConvenienceFunctions" # Requires Nlopt
+    "lmerTest" # requires nlopt
+    "lmSupport" # requires nlopt
     "LogisticDx" # requires gRbase
+    "longpower" # requires nlopt
     "LOST" # requires pcaMethods
     "ltsk" # requires Rlapack and Rblas
-    "magma" # requires MAGMA
     "MAMA" # requires metaMA
+    "marked" # requires nlopt
+    "MaxPro" # Requires Nlopt
+    "mbest" # requires nlopt
+    "meboot" # requires nlopt
     "MEET" # requires pcaMethods, and seqLogo
+    "MEMSS" # REQUIRES NLOPT
     "metabolomics" # depends on broken crmn
     "MetaDE" # requires impute, and Biobase
+    "metagear" # build is broken
     "MetaLandSim" # requires Biobase
     "metaMA" # requires limma
     "metaMix" # requires MPI running. HELP WANTED!
+    "metaplus" # requires nlopt
+    "metaSEM" # requires OpenMx
+    "Metatron" # Requires Nlopt
     "mGSZ" # requires Biobase, and limma
+    "miceadds" # requires DiagrammeR to build
+    "micEconAids" # requires nlopt
+    "micEconCES" # requires nlopt
+    "micEconSNQP" # requires nlopt
     "MigClim" # SDMTools.So: Undefined Symbol: X
+    "migui" # requires nlopt
     "minimist" # requires broken V8
+    "mi" # requires nlopt
     "miRtest" # requires globaltest, GlobalAncova, and limma
+    "missMDA" # requires nlopt
+    "mixAK" # requires nlopt
     "MixGHD" # requires mixture to build
+    "mixlm" # requires nlopt
+    "MixMAP" # Requires Nlopt
     "mixture" # mixture.so: undefined symbol: dtrmm_
+    "mlmRev" # requires nlopt
+    "mlVAR" # requires DiagrammeR to build
+    "MM2S" # BUILD IS BROKEN
     "moduleColor" # requires impute
     "mongolite" # doesn't find OpenSSL
+    "mosaic" # requires nlopt
     "msarc" # requires AnnotationDbi
     "MSeasy" # requires mzR, and xcms
     "MSeasyTkGUI" # requires MSeasyTkGUI
@@ -800,106 +944,209 @@ let
     "msSurv" # requires graph
     "muir" # requires DiagrammeR to build
     "multiDimBio" # requires pcaMethods
+    "MultiRR" # Requires Nlopt
+    "muma" # requires nlopt
     "mutossGUI" # requires mutoss
     "mutoss" # requires multtest
+    "mvinfluence" # requires nlopt
     "MXM" # depends on broken gRbase
     "NBPSeq" # requires qvalue
+    "nCal" # requires nlopt
     "NCmisc" # requires BiocInstaller
     "netClass" # requires samr
     "nettools" # requires WGCNA
     "netweavers" # requires BiocGenerics, Biobase, and limma
+    "NHPoisson" # Requires Nlopt
+    "nloptr" # requires nlopt
     "NLPutils" # requires qdap
+    "nonrandom" # requires nlopt
     "NORRRM" # can't load SDMTools properly
+    "npIntFactRep" # requires nlopt
     "NSA" # requires aroma_core
     "OpenCL" # FIXME: requires CL/opencl.h
+    "OpenMx" # Build Is Broken
     "optBiomarker" # requires rpanel
     "ora" # requires ROracle
+    "ordBTL" # requires nlopt
     "orQA" # requires genefilter
+    "OUwie" # Requires Nlopt
     "PairViz" # requires graph
+    "pamm" # requires nlopt
     "PANDA" # requires GO.db
+    "pander" # build is broken
+    "panelAR" # requires nlopt
+    "papeR" # requires nlopt
+    "parboost" # requires nlopt
     "ParDNAcopy" # requires DNAcopy
+    "parma" # requires nlopt
     "pathClass" # requires affy, and Biobase
     "PatternClass" # SDMTools.So: Undefined Symbol: X
     "pbdBASE" # requires pbdMPI
     "pbdDEMO" # requires pbdMPI
     "pbdDMAT" # requires pbdMPI
     "pbdSLAP" # requires pbdMPI
+    "PBImisc" # Requires Nlopt
+    "pbkrtest" # requires nlopt
     "PBSddesolve" # fails its test suite for unclear reasons
     "PBSmapping" # fails its test suite for unclear reasons
     "pcaL1" # requires clp
     "pcalg" # requires graph, and RBGL
     "PCGSE" # requires safe
     "PCS" # requires multtest
+    "pedigreemm" # requires nlopt
+    "pedometrics" # requires nlopt
     "PepPrep" # requires biomaRt
+    "pequod" # requires nlopt
     "PerfMeas" # requires limma, graph, and RBGL
     "permGPU" # requires Biobase
+    "phia" # requires nlopt
     "PhViD" # requires LBE
+    "phylocurve" # requires nlopt
+    "phyloTop" # requires nlopt
     "pi0" # requires qvalue
     "plmDE" # requires limma
+    "plsRbeta" # requires nlopt
     "plsRcox" # requires survcomp
+    "plsRglm" # requires nlopt
     "PMA" # requires impute
     "pmcgd" # depends on broken mixture
     "pmclust" # requires MPI running. HELP WANTED!
     "polyCub" # requires spatstat
+    "polytomous" # requires nlopt
+    "pomp" # requires nlopt
     "ppiPre" # requires AnnotationDbi, GOSemSim, GO.db
+    "predictmeans" # requires nlopt
     "pRF" # requires multtest
+    "prLogistic" # requires nlopt
     "propOverlap" # requires Biobase
     "protiq" # requires graph, and RBGL
+    "PSAboot" # Requires Nlopt
     "PSCBS" # requires DNAcopy
     "pubmed_mineR" # requires SSOAP
     "PubMedWordcloud" # requires GOsummaries
     "qdap" # requires gender
+    "qgraph" # requires DiagrammeR to build
+    "qtbase" # build is broken
     "qtlnet" # requires pcalg
     "qtpaint" # can't find QtCore libraries
+    "qtutils" # requires qtbase
     "QuACN" # requires graph, RBGL
     "quanteda" # fails to build
+    "quantification" # requires nlopt
     "QuasiSeq" # requires edgeR
+    "R2STATS" # REQUIRES NLOPT
     "RADami" # requires Biostrings
+    "radiant" # requires nlopt
     "raincpc" # SDMTools.so: undefined symbol: X
     "rainfreq" # SDMTools.so: undefined symbol: X
     "RAM" # requires Heatplus
     "RapidPolygonLookup" # depends on broken PBSmapping
     "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges
+    "rasclass" # requires nlopt
     "RbioRXN" # requires fmcsR, and KEGGREST
+    "RcmdrMisc" # Requires Nlopt
+    "RcmdrPlugin_BCA" # Requires Nlopt
+    "RcmdrPlugin_coin" # requires nlopt
+    "RcmdrPlugin_depthTools" # requires nlopt
+    "RcmdrPlugin_DoE" # Requires Nlopt
+    "RcmdrPlugin_doex" # requires nlopt
+    "RcmdrPlugin_EACSPIR" # Requires Nlopt
+    "RcmdrPlugin_EBM" # Requires Nlopt
+    "RcmdrPlugin_EcoVirtual" # Requires Nlopt
+    "RcmdrPlugin_epack" # requires nlopt
+    "RcmdrPlugin_EZR" # Requires Nlopt
+    "RcmdrPlugin_FactoMineR" # Requires Nlopt
+    "RcmdrPlugin_HH" # Requires Nlopt
+    "RcmdrPlugin_IPSUR" # Requires Nlopt
+    "RcmdrPlugin_KMggplot2" # Requires Nlopt
+    "RcmdrPlugin_lfstat" # requires nlopt
+    "RcmdrPlugin_MA" # Requires Nlopt
+    "RcmdrPlugin_mosaic" # requires nlopt
+    "RcmdrPlugin_MPAStats" # Requires Nlopt
+    "RcmdrPlugin_NMBU" # Requires Nlopt
+    "RcmdrPlugin_orloca" # requires nlopt
+    "RcmdrPlugin_plotByGroup" # requires nlopt
+    "RcmdrPlugin_pointG" # requires nlopt
+    "RcmdrPlugin_qual" # requires nlopt
+    "RcmdrPlugin_RMTCJags" # Requires Nlopt
+    "RcmdrPlugin_ROC" # Requires Nlopt
+    "RcmdrPlugin_sampling" # requires nlopt
+    "RcmdrPlugin_SCDA" # Requires Nlopt
     "RcmdrPlugin_seeg" # requires seeg
+    "RcmdrPlugin_SLC" # Requires Nlopt
+    "RcmdrPlugin_SM" # Requires Nlopt
+    "RcmdrPlugin_sos" # requires nlopt
+    "RcmdrPlugin_StatisticalURV" # Requires Nlopt
+    "RcmdrPlugin_steepness" # requires nlopt
+    "RcmdrPlugin_survival" # requires nlopt
+    "RcmdrPlugin_TeachingDemos" # Requires Nlopt
+    "RcmdrPlugin_temis" # requires nlopt
+    "RcmdrPlugin_UCA" # Requires Nlopt
+    "Rcmdr" # Requires Nlopt
     "Rcplex" # requires cplexAPI
     "RcppAPT" # configure script depends on /bin/sh
+    "RcppOctave" # Build Is Broken
     "RcppRedis" # requires Hiredis
+    "rdd" # requires nlopt
     "rDEA" # no such file or directory
     "RDieHarder" # requires libdieharder
     "reader" # requires NCmisc
     "REBayes" # requires Rmosek
+    "referenceIntervals" # requires nlopt
     "RefFreeEWAS" # requires isva
+    "refund" # requires nlopt
+    "REST" # REQUIRES NLOPT
     "retistruct" # depends on broken RImageJROI
+    "rgbif" # requires V8 to build
     "rgp" # fails self-test
     "rgpui" # depends on broken rgp
     "RImageJROI" # requires spatstat
     "rjade" # requires V8 to build
     "rJPSGCS" # requires chopsticks
     "rLindo" # requires LINDO API
+    "rmgarch" # requires nlopt
+    "rminer" # requires nlopt
     "Rmosek" # requires mosek
     "RnavGraph" # requires graph, and RBGL
     "rneos" # requires XMLRPC
     "RNeXML" # requres taxize
     "RobLoxBioC" # requires Biobase
     "RobLox" # requires Biobase
+    "robustlmm" # requires nlopt
+    "rockchalk" # requires nlopt
     "RockFab" # requires EBImage
     "ROI_plugin_symphony" # depends on broken Rsymphony
     "ROracle" # requires OCI
     "rpanel" # I could not make Tcl to recognize BWidget. HELP WANTED!
+    "rpubchem" # requires nlopt
     "RQuantLib" # requires QuantLib
+    "rr" # requires nlopt
     "RSAP" # requires SAPNWRFCSDK
+    "rscala" # build is broken
+    "RSDA" # REQUIRES NLOPT
     "RSeed" # requires RBGL, and graph
     "rsig" # requires survcomp
     "RSNPset" # requires qvalue
     "Rsymphony" # FIXME: requires SYMPHONY
+    "rugarch" # requires nlopt
+    "RVAideMemoire" # Requires Nlopt
+    "RVFam" # Requires Nlopt
     "RVideoPoker" # requires Rpanel
+    "ryouready" # requires nlopt
     "rysgran" # requires soiltexture
+    "sampleSelection" # requires nlopt
     "samr" # requires impute
+    "sdcMicroGUI" # requires nlopt
+    "sdcMicro" # requires nlopt
     "SDD" # requires rpanel
     "seeg" # requires spatstat
     "selectspm" # depends on broken ecespa
+    "semdiag" # requires DiagrammeR to build
+    "semGOF" # requires DiagrammeR to build
     "semiArtificial" # requires RSNNS
+    "semPlot" # requires DiagrammeR to build
+    "sem" # requires DiagrammeR to build
+    "SensoMineR" # Requires Nlopt
     "SeqFeatR" # requires Biostrings, qvalue, and widgetTools
     "SeqGrapheR" # depends on Biostrings
     "sequenza" # requires copynumber
@@ -909,6 +1156,8 @@ let
     "SimRAD" # requires Biostrings, and ShortRead
     "SimSeq" # requires edgeR
     "siplab" # requires spatstat
+    "sirt" # requires DiagrammeR to build
+    "sjPlot" # requires nlopt
     "smart" # requires PMA
     "snpEnrichment" # requires snpStats
     "snplist" # requires biomaRt
@@ -916,41 +1165,60 @@ let
     "SNPtools" # requires IRanges, GenomicRanges, Biostrings, and Rsamtools
     "SOD" # depends on proprietary cudatoolkit
     "soilphysics" # requires rpanel
+    "spacom" # requires nlopt
     "sparr" # requires spatstat
     "spatialsegregation" # requires spatstat
     "SpatialVx" # requires spatstat
     "speaq" # requires MassSpecWavelet
+    "specificity" # requires nlopt
     "spocc" # requires leafletR
     "SQDA" # requires limma
+    "ssizeRNA" # depends on missing 'Biobase', 'edgeR', 'limma', 'qvalue'
+    "ssmrob" # requires nlopt
     "stagePop" # depends on broken PBSddesolve
     "statar" # depends on broken lfe
     "Statomica" # requires Biobase, multtest
+    "stcm" # requires nlopt
+    "stepp" # requires nlopt
     "stpp" # requires spatstat
     "structSSI" # requires multtest
     "strum" # requires Rgraphviz
     "superbiclust" # requires fabia
+    "Surrogate" # Requires Nlopt
     "surveillance" # requires polyCub
+    "survJamda" # depends on missing survcomp
     "swamp" # requires impute
+    "switchr" # build is broken
+    "switchrGist" # requires switchr
     "sybilSBML" # requires libSBML
+    "systemfit" # requires nlopt
     "taxize" # requres bold
     "TcGSA" # requires multtest
+    "TDMR" # REQUIRES NLOPT
+    "tigerstats" # requires nlopt
+    "timeSeq" # depends on missing edgeR
     "topologyGSA" # requires gRbase
     "TR8" # requres taxize
+    "TriMatch" # Requires Nlopt
     "trip" # requires spatstat
     "TROM" # misses undeclared dependencies topGO', 'AnnotationDbi', 'GO.db'
     "ttScreening" # requires sva, and limma
+    "userfriendlyscience" # requires nlopt
     "V8" # compilation error
+    "VIMGUI" # REQUIRES NLOPT
+    "VIM" # REQUIRES NLOPT
     "vmsbase" # depends on broken PBSmapping
     "vows" # requires rpanel
+    "wfe" # requires nlopt
     "WGCNA" # requires impute
     "wgsea" # requires snpStats
     "WideLM" # depends on proprietary cudatoolkit
     "x_ent" # requires opencpu
+    "xergm" # requires nlopt
+    "xml2" # build is broken
+    "ZeligMultilevel" # Requires Nlopt
+    "zetadiv" # requires nlopt
     "zoib" # tarball is invalid on server
-    "timeSeq" # depends on missing edgeR
-    "survJamda" # depends on missing survcomp
-    "ssizeRNA" # depends on missing 'Biobase', 'edgeR', 'limma', 'qvalue'
-    "h5" # depends on missing h5 system library
   ];
 
   otherOverrides = old: new: {

From 9fc5317055059cbad38a3163805d39838668721c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 12:01:43 +0200
Subject: [PATCH 1218/2322] r-modules: fix curl

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 34e50d08413..d2ef6f5daa8 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -216,7 +216,7 @@ let
     CARramps = [ pkgs.linuxPackages.nvidia_x11 pkgs.liblapack ];
     chebpol = [ pkgs.fftw ];
     cit = [ pkgs.gsl ];
-    curl = [ pkgs.curl pkgs.openldap ];
+    curl = [ pkgs.curl ];
     devEMF = [ pkgs.xlibs.libXft ];
     diversitree = [ pkgs.gsl pkgs.fftw ];
     EMCluster = [ pkgs.liblapack ];
@@ -737,7 +737,6 @@ let
     "Crossover" # fails self-test
     "CrypticIBDcheck" # requires rJPSGCS
     "cudaBayesreg" # requres Rmath
-    "curl" # build is broken
     "curvHDR" # requires flowCore
     "D2C" # requires gRbase
     "DAAGbio" # requires limma
@@ -1230,7 +1229,7 @@ let
     });
 
     curl = old.curl.overrideDerivation (attrs: {
-      preConfigure = "export CURL_INCLUDES=${pkgs.curl}/include/curl";
+      preConfigure = "export CURL_INCLUDES=${pkgs.curl}/include";
     });
 
     iFes = old.iFes.overrideDerivation (attrs: {

From 8ac6350ce77a73559ca7e0b53c1c042a92432af9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 12:06:07 +0200
Subject: [PATCH 1219/2322] r-modules: fix pander

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index d2ef6f5daa8..00565e0905d 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -199,6 +199,7 @@ let
 
   packagesWithRDepends = {
     FactoMineR = [ self.car ];
+    pander = [ self.codetools ];
   };
 
   packagesWithNativeBuildInputs = {
@@ -244,6 +245,7 @@ let
     nloptr = [ pkgs.nlopt ];
     openssl = [ pkgs.openssl ];
     outbreaker = [ pkgs.gsl ];
+    pander = [ pkgs.pandoc pkgs.which ];
     pbdMPI = [ pkgs.openmpi ];
     pbdNCDF4 = [ pkgs.netcdf ];
     pbdPROF = [ pkgs.openmpi ];
@@ -265,9 +267,9 @@ let
     RcppZiggurat = [ pkgs.gsl ];
     rgdal = [ pkgs.proj pkgs.gdal ];
     rgeos = [ pkgs.geos ];
+    rggobi = [ pkgs.ggobi pkgs.gtk2 pkgs.libxml2 ];
     rgl = [ pkgs.mesa pkgs.x11 ];
     Rglpk = [ pkgs.glpk ];
-    rggobi = [ pkgs.ggobi pkgs.gtk2 pkgs.libxml2 ];
     RGtk2 = [ pkgs.gtk2 ];
     Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ];
     ridge = [ pkgs.gsl ];
@@ -972,7 +974,6 @@ let
     "PairViz" # requires graph
     "pamm" # requires nlopt
     "PANDA" # requires GO.db
-    "pander" # build is broken
     "panelAR" # requires nlopt
     "papeR" # requires nlopt
     "parboost" # requires nlopt

From ccd6988b3d4226be2a516945d5b459146c6678da Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 12:11:26 +0200
Subject: [PATCH 1220/2322] r-modules: fix xml2

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 00565e0905d..283e38bd80b 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -325,6 +325,7 @@ let
     VBmix = [ pkgs.gsl pkgs.fftw pkgs.qt4 ];
     WhopGenome = [ pkgs.zlib ];
     XBRL = [ pkgs.zlib pkgs.libxml2 ];
+    xml2 = [ pkgs.libxml2 ];
     XML = [ pkgs.libtool pkgs.libxml2 pkgs.xmlsec pkgs.libxslt ];
   };
 
@@ -1215,7 +1216,6 @@ let
     "WideLM" # depends on proprietary cudatoolkit
     "x_ent" # requires opencpu
     "xergm" # requires nlopt
-    "xml2" # build is broken
     "ZeligMultilevel" # Requires Nlopt
     "zetadiv" # requires nlopt
     "zoib" # tarball is invalid on server
@@ -1223,10 +1223,7 @@ let
 
   otherOverrides = old: new: {
     xml2 = old.xml2.overrideDerivation (attrs: {
-      preConfigure = ''
-        export LIBXML_INCDIR=${pkgs.libxml2}/include/libxml2
-        export LIBXML_LIBDIR=${pkgs.libxml2}/lib
-      '';
+      preConfigure = "export LIBXML_INCDIR=${pkgs.libxml2}/include/libxml2";
     });
 
     curl = old.curl.overrideDerivation (attrs: {

From 21c18c4f0a3e47a860cfd57d4269ee2cb582480c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 12:28:19 +0200
Subject: [PATCH 1221/2322] r-modules: fix rapport

---
 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 283e38bd80b..134e9299b68 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -258,6 +258,7 @@ let
     R2GUESS = [ pkgs.gsl ];
     R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype ];
     RAppArmor = [ pkgs.libapparmor ];
+    rapport = [ pkgs.which ];
     rbamtools = [ pkgs.zlib ];
     RCA = [ pkgs.gmp ];
     rcdd = [ pkgs.gmp ];

From 362e60a5dcea491d60673b4e620e4c7169e69a57 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 12:29:02 +0200
Subject: [PATCH 1222/2322] r-modules: fix rapportools

---
 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 134e9299b68..1dc6019f42a 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -259,6 +259,7 @@ let
     R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype ];
     RAppArmor = [ pkgs.libapparmor ];
     rapport = [ pkgs.which ];
+    rapportools = [ pkgs.which ];
     rbamtools = [ pkgs.zlib ];
     RCA = [ pkgs.gmp ];
     rcdd = [ pkgs.gmp ];

From 19c5b0a8cdf5a6053141864985fa0ad0bcfe2180 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 15 Jun 2015 20:45:08 +0200
Subject: [PATCH 1223/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/a6e45bb640861b6f3281828c92d392e7c53c284d
 with hackage2nix revision 6c4694e3e3d2f6135be35b967f6f459a01789604

---
 .../haskell-modules/hackage-packages.nix      | 342 +++++++++++++++---
 1 file changed, 299 insertions(+), 43 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 75d61b83d96..2d24211870d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3192,6 +3192,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "DSA" = callPackage
+    ({ mkDerivation, base, binary, bytestring, crypto-api
+     , crypto-pubkey-types, DRBG, ghc-prim, HUnit, integer-gmp
+     , QuickCheck, SHA, tagged, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "DSA";
+       version = "1";
+       sha256 = "0js67dj7dls7ivvdw1hvxc1cw0rl4bvnfip16ygmgwg98344bfwl";
+       buildDepends = [
+         base binary bytestring crypto-api crypto-pubkey-types ghc-prim
+         integer-gmp SHA tagged
+       ];
+       testDepends = [
+         base binary bytestring crypto-api crypto-pubkey-types DRBG ghc-prim
+         HUnit integer-gmp QuickCheck SHA tagged test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       description = "Implementation of DSA, based on the description of FIPS 186-4";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "DSH" = callPackage
     ({ mkDerivation, aeson, algebra-dag, ansi-wl-pprint, base
      , bytestring, containers, Decimal, dlist, either, hashable, HUnit
@@ -14088,10 +14111,9 @@ self: {
     ({ mkDerivation, base, directory, mtl, syb, transformers }:
      mkDerivation {
        pname = "Strafunski-StrategyLib";
-       version = "5.0.0.7";
-       sha256 = "0dsa3zg24rk52zyyh2y13sb0fnh01vwq0y2yybyiy3vkc7pznjvq";
+       version = "5.0.0.8";
+       sha256 = "09k9lcrrdzj6p7ywagc6mw17g4x9i743np36p4dkdp37q48j0mac";
        buildDepends = [ base directory mtl syb transformers ];
-       jailbreak = true;
        description = "Library for strategic programming";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17366,8 +17388,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-better-errors";
-       version = "0.7.0.0";
-       sha256 = "01kfbbpf0kdjidgiscljg6mx0x4qk89n5jl44lhg52i3ni3wr28x";
+       version = "0.8.0";
+       sha256 = "1synbykzdkrkdys9xl0y9yarbi7ya0ij62smambi9ndz474ngb95";
        buildDepends = [
          aeson base bytestring dlist mtl scientific text transformers
          transformers-compat unordered-containers vector void
@@ -20084,6 +20106,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "app-lens" = callPackage
+    ({ mkDerivation, base, containers, lens, mtl }:
+     mkDerivation {
+       pname = "app-lens";
+       version = "0.1.0.0";
+       revision = "1";
+       sha256 = "0gizjnc7x1ggryfrm4d87xiyjz9yw6c5y3zp23x40bgmw49zl318";
+       editedCabalFile = "a143bd5aec7a06285e0ef56e76f31e0d8b69f277da57ce4d88a7688355ca86a6";
+       buildDepends = [ base containers lens mtl ];
+       jailbreak = true;
+       homepage = "https://bitbucket.org/kztk/app-lens";
+       description = "applicative (functional) bidirectional programming beyond composition chains";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "app-settings" = callPackage
     ({ mkDerivation, base, containers, directory, hspec, HUnit, mtl
      , parsec, text
@@ -21696,8 +21734,8 @@ self: {
     ({ mkDerivation, attoparsec, base, transformers }:
      mkDerivation {
        pname = "attoparsec-trans";
-       version = "0.1.0.3";
-       sha256 = "11a743qgh9rwjyf1hng5jg139xr11dsjj1bisqaaayb17addd2xx";
+       version = "0.1.1.0";
+       sha256 = "0lsbl7hhirr13jmn6fc4g5443j73p4rxjgxvv967n5dsp7xrjaa7";
        buildDepends = [ attoparsec base transformers ];
        homepage = "https://github.com/srijs/haskell-attoparsec-trans";
        description = "Interleaved effects for attoparsec parsers";
@@ -25872,6 +25910,7 @@ self: {
        homepage = "https://github.com/tebello-thejane/bitx-haskell";
        description = "A Haskell library for working with the BitX bitcoin exchange";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bk-tree" = callPackage
@@ -29652,6 +29691,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cased" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "cased";
+       version = "0.1.0.0";
+       sha256 = "08xdc0mpp6b6inaxh6cr6ni08sy2ahfcbq8xbs3m4cfqbrqfd543";
+       buildDepends = [ base text ];
+       homepage = "https://github.com/jb55/cased";
+       description = "Track string casing in its type";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "cases" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, HTF, HUnit
      , loch-th, placeholders, QuickCheck, text
@@ -40428,6 +40479,7 @@ self: {
        homepage = "https://github.com/kryoxide/delta";
        description = "A library for detecting file changes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "delta-h" = callPackage
@@ -43301,12 +43353,14 @@ self: {
      mkDerivation {
        pname = "dozens";
        version = "0.1.1";
+       revision = "1";
        sha256 = "1hvsdc69ag4x8rp2pzr3cxjfbl4fh9bdj4bwlkfvpr755qdi45ky";
+       editedCabalFile = "08e6297d7be6ec753261aa5cb8f265a6ba6c369f44d25f46f9784ae1d8a88e52";
        buildDepends = [
          aeson base bytestring data-default-class http-client http-types
          reflection scientific text transformers
        ];
-       homepage = "https://github.com/philopon/apiary";
+       homepage = "https://github.com/philopon/dozens-hs";
        description = "dozens api library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -45732,8 +45786,8 @@ self: {
     ({ mkDerivation, base, bytestring, unix }:
      mkDerivation {
        pname = "entropy";
-       version = "0.3.6";
-       sha256 = "1sfv930hvdmf018ngdl15jac2bgj75941w0ndlh78n1jgmf04jhn";
+       version = "0.3.7";
+       sha256 = "1vzg9fi597dbrcbjsr71y47rvmhiih7lg5rjnb297fzdlbmj1w0z";
        buildDepends = [ base bytestring unix ];
        homepage = "https://github.com/TomMD/entropy";
        description = "A platform independent entropy source";
@@ -65943,8 +65997,8 @@ self: {
     ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex }:
      mkDerivation {
        pname = "hmatrix-gsl-stats";
-       version = "0.3.0.3";
-       sha256 = "0zrh3knwqkaqlgajza22jfg3xhsxhiaf8qmiwnd9qjbasnm5a1lp";
+       version = "0.4";
+       sha256 = "08rrvn833psl0fic1zvhgv2ymgj16cdrfwv003fiapphnqxcpj9a";
        buildDepends = [ base binary hmatrix storable-complex ];
        pkgconfigDepends = [ gsl ];
        homepage = "http://code.haskell.org/hmatrix-gsl-stats";
@@ -75067,8 +75121,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-c";
-       version = "0.5.3.2";
-       sha256 = "0sihzjscdrk02z2d22j0fcqgk05nhpg16zy2cdkxjj4cp09nbaac";
+       version = "0.5.3.4";
+       sha256 = "1hn1diaxvg0658j9wy9nsa4fhjzjk4g9f161gb26n5cfymsjnnc3";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -79305,6 +79359,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/laika";
        description = "Minimalistic type-checked compile-time template engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambda-ast" = callPackage
@@ -81394,8 +81449,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "0.1.1.2";
-       sha256 = "06k0vvxp8vd43bbslm78lmmmc89q3b9ghwfj0chvaw32m0hd8l0z";
+       version = "0.1.1.3";
+       sha256 = "0m2k3ba4b9dxd5ql8z3m9lmbc9lbxl1d2vi0k0024mjlpp0kdwwm";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -88816,8 +88871,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim }:
      mkDerivation {
        pname = "monad-skeleton";
-       version = "0.1.2";
-       sha256 = "13lkbbvajfl4lr6r5plmxvqk6bxn7mp6acsyfxwh2yr6krzdlb82";
+       version = "0.1.2.1";
+       sha256 = "0sg1yj4cp7ac26ydwhpc05j9bs3scaj25b9sb0xr1gw1qasnyi76";
        buildDepends = [ base containers ghc-prim ];
        homepage = "https://github.com/fumieval/monad-skeleton";
        description = "An undead monad";
@@ -89345,8 +89400,8 @@ self: {
      }:
      mkDerivation {
        pname = "mono-traversable";
-       version = "0.9.2";
-       sha256 = "1cw8bsf6ayalsx0l0xwb2f2j2rg6zpfsvci174fr4xiyr646mpd6";
+       version = "0.9.2.1";
+       sha256 = "1vs2nl3c0gdhaxxh013ri3l9n13yl9nawiynpsyq6zp495xq5hrl";
        buildDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
          semigroupoids semigroups text transformers unordered-containers
@@ -93751,6 +93806,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "notzero" = callPackage
+    ({ mkDerivation, base, bifunctors, directory, doctest, filepath
+     , lens, mtl, QuickCheck, semigroupoids, semigroups
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "notzero";
+       version = "0.0.1";
+       sha256 = "1sk7hq3qpfrimgpg4r22lzl749yazv1hka3si4921gg61w4bdx8l";
+       buildDepends = [
+         base bifunctors lens mtl semigroupoids semigroups transformers
+       ];
+       testDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/NICTA/notzero";
+       description = "A data type for representing numeric values, except zero";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "np-extras" = callPackage
     ({ mkDerivation, base, containers, numeric-prelude, primes }:
      mkDerivation {
@@ -105160,6 +105235,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/record-aeson";
        description = "Instances of \"aeson\" classes for the \"record\" types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "record-gl" = callPackage
@@ -105183,6 +105259,7 @@ self: {
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and Nikita Volkov's \"Record\"s";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "record-preprocessor" = callPackage
@@ -105201,6 +105278,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/record-preprocessor";
        description = "Compiler preprocessor introducing a syntactic extension for anonymous records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "record-syntax" = callPackage
@@ -105223,6 +105301,7 @@ self: {
        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;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "records" = callPackage
@@ -106389,22 +106468,20 @@ self: {
      }) {};
 
   "relational-query" = callPackage
-    ({ mkDerivation, array, base, bytestring, Cabal, cabal-test-compat
-     , containers, dlist, names-th, persistable-record, sql-words
+    ({ mkDerivation, array, base, bytestring, containers, dlist
+     , names-th, persistable-record, quickcheck-simple, sql-words
      , template-haskell, text, time, time-locale-compat, transformers
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.5.0.1";
-       sha256 = "1yhcdc0m839pdwhb2vv25wz1vbhk5ynfkb9d6xgkjymsjvqlp78n";
+       version = "0.5.0.2";
+       sha256 = "1n9x0yrfjgyf49b19vjp0n57h88vvj6bzc8nz0c9z0568cdb9fsh";
        buildDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
          transformers
        ];
-       testDepends = [
-         base Cabal cabal-test-compat containers transformers
-       ];
+       testDepends = [ 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;
@@ -111796,6 +111873,158 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "serversession" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , containers, data-default, hashable, hspec, nonce, path-pieces
+     , QuickCheck, text, time, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "serversession";
+       version = "1.0";
+       sha256 = "0g56lqcrfhl9mrzqcd0sckyc98friqlfjxl1ws1j2zsc1z153x1a";
+       buildDepends = [
+         aeson base base64-bytestring bytestring data-default hashable nonce
+         path-pieces text time transformers unordered-containers
+       ];
+       testDepends = [
+         aeson base base64-bytestring bytestring containers data-default
+         hspec nonce path-pieces QuickCheck text time transformers
+         unordered-containers
+       ];
+       homepage = "https://github.com/yesodweb/serversession";
+       description = "Secure, modular server-side sessions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "serversession-backend-acid-state" = callPackage
+    ({ mkDerivation, acid-state, base, containers, hspec, mtl, safecopy
+     , serversession, unordered-containers
+     }:
+     mkDerivation {
+       pname = "serversession-backend-acid-state";
+       version = "1.0";
+       sha256 = "122mp6vcc89f44vijlncywmbsim76hhhlzw38snnsmsfn0q96ln1";
+       buildDepends = [
+         acid-state base containers mtl safecopy serversession
+         unordered-containers
+       ];
+       testDepends = [
+         acid-state base containers hspec mtl safecopy serversession
+         unordered-containers
+       ];
+       homepage = "https://github.com/yesodweb/serversession";
+       description = "Storage backend for serversession using acid-state";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "serversession-backend-persistent" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
+     , hspec, monad-logger, path-pieces, persistent
+     , persistent-postgresql, persistent-sqlite, persistent-template
+     , QuickCheck, resource-pool, serversession, tagged, text, time
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "serversession-backend-persistent";
+       version = "1.0";
+       sha256 = "1rcfff45qm8akjbby1j64lmc8gff96gzssk2jaw8x5k5nn2pdgq0";
+       buildDepends = [
+         aeson base base64-bytestring bytestring cereal path-pieces
+         persistent serversession tagged text time transformers
+         unordered-containers
+       ];
+       testDepends = [
+         aeson base base64-bytestring bytestring cereal hspec monad-logger
+         path-pieces persistent persistent-postgresql persistent-sqlite
+         persistent-template QuickCheck resource-pool serversession text
+         time transformers unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/yesodweb/serversession";
+       description = "Storage backend for serversession using persistent and an RDBMS";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "serversession-backend-redis" = callPackage
+    ({ mkDerivation, base, bytestring, hedis, hspec, path-pieces
+     , serversession, tagged, text, time, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "serversession-backend-redis";
+       version = "1.0";
+       sha256 = "0r1zr25zw80s4psscdwscf7wlm8qfw4dyk0kkczzvj5434jnxnj2";
+       buildDepends = [
+         base bytestring hedis path-pieces serversession tagged text time
+         transformers unordered-containers
+       ];
+       testDepends = [
+         base bytestring hedis hspec path-pieces serversession text time
+         transformers unordered-containers
+       ];
+       homepage = "https://github.com/yesodweb/serversession";
+       description = "Storage backend for serversession using Redis";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "serversession-frontend-snap" = callPackage
+    ({ mkDerivation, base, bytestring, nonce, path-pieces
+     , serversession, snap, snap-core, text, time, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "serversession-frontend-snap";
+       version = "1.0";
+       sha256 = "1n29c3jfv61fz9kfc4zjwj7df1fll74l2kqccxmg4id8jpsrywci";
+       buildDepends = [
+         base bytestring nonce path-pieces serversession snap snap-core text
+         time transformers unordered-containers
+       ];
+       homepage = "https://github.com/yesodweb/serversession";
+       description = "Snap bindings for serversession";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "serversession-frontend-wai" = callPackage
+    ({ mkDerivation, base, bytestring, cookie, data-default
+     , path-pieces, serversession, text, time, transformers
+     , unordered-containers, vault, wai, wai-session
+     }:
+     mkDerivation {
+       pname = "serversession-frontend-wai";
+       version = "1.0";
+       sha256 = "0rxifhjirhmhk1x14m6lvpv6dl32g179i4i3xi3dq59r7l716j0b";
+       buildDepends = [
+         base bytestring cookie data-default path-pieces serversession text
+         time transformers unordered-containers vault wai wai-session
+       ];
+       homepage = "https://github.com/yesodweb/serversession";
+       description = "wai-session bindings for serversession";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "serversession-frontend-yesod" = callPackage
+    ({ mkDerivation, base, bytestring, containers, cookie, data-default
+     , path-pieces, serversession, text, time, transformers
+     , unordered-containers, wai, yesod-core
+     }:
+     mkDerivation {
+       pname = "serversession-frontend-yesod";
+       version = "1.0";
+       sha256 = "0lv7gkj4inks98g44n5kqvx5s4c66lmxf7gqfdly54znggglcf86";
+       buildDepends = [
+         base bytestring containers cookie data-default path-pieces
+         serversession text time transformers unordered-containers wai
+         yesod-core
+       ];
+       homepage = "https://github.com/yesodweb/serversession";
+       description = "Yesod bindings for serversession";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "servius" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
      , cmdargs, containers, directory, hamlet, http-types, mime-types
@@ -114852,8 +115081,8 @@ self: {
     ({ mkDerivation, acid-state, base, mtl, snap, text, transformers }:
      mkDerivation {
        pname = "snaplet-acid-state";
-       version = "0.2.6.2";
-       sha256 = "0p4cfc5llz2z0jfmkj225nxi8abdncjl53g1rjwc86yfgld0wwm9";
+       version = "0.2.7";
+       sha256 = "0vjqcmcp0p8vmh7vzwv62bigbx1ck2vnaxlkqmg5wddn0mhfm6gx";
        buildDepends = [ acid-state base mtl snap text transformers ];
        homepage = "https://github.com/mightybyte/snaplet-acid-state";
        description = "acid-state snaplet for Snap Framework";
@@ -116505,8 +116734,8 @@ self: {
      }:
      mkDerivation {
        pname = "species";
-       version = "0.3.3";
-       sha256 = "0cy6l4gvzydl9k2ijxkxhr6jqjbf85z71v6zrvbdajc3xip99w6i";
+       version = "0.3.4";
+       sha256 = "1j1bf1l5hg67kagbzwyjw8fnli2axi6ny4zb8fdd1m8zqqrajxr4";
        buildDepends = [
          base containers multiset-comb np-extras numeric-prelude
          template-haskell
@@ -117075,13 +117304,13 @@ self: {
      }) {};
 
   "sql-words" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-test-compat, QuickCheck }:
+    ({ mkDerivation, base, QuickCheck, quickcheck-simple }:
      mkDerivation {
        pname = "sql-words";
-       version = "0.1.3.0";
-       sha256 = "03r6lk4rgk55idxqifazrq673hnkzr089b34qjv1x3yk160xnmz8";
+       version = "0.1.3.1";
+       sha256 = "17dma51naynrxhvljwp7s3sadnmfqgallxsq7l763z6d0a25zkn9";
        buildDepends = [ base ];
-       testDepends = [ base Cabal cabal-test-compat QuickCheck ];
+       testDepends = [ base QuickCheck quickcheck-simple ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Simple idea SQL keywords data constructor into OverloadedString";
        license = stdenv.lib.licenses.bsd3;
@@ -117111,8 +117340,8 @@ self: {
      }:
      mkDerivation {
        pname = "sqlite-simple";
-       version = "0.4.8.0";
-       sha256 = "098d1s80wlvsp307422f79bm3a9knvgw5ni6jap62fl4rpa7fsmz";
+       version = "0.4.9.0";
+       sha256 = "18v03yqq9jxyvxq93rh20sxak4ffsshhpq9v9lrz1lk9vnhy9pw1";
        buildDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
          direct-sqlite text time transformers
@@ -123182,7 +123411,9 @@ test/package-dump/ghc-7.10.txt";
      mkDerivation {
        pname = "text-position";
        version = "0.1.0.0";
+       revision = "1";
        sha256 = "0cdi5kwpwvzmadhgkgnwax4jhllm6gjrsg1y3f3fp12x28nml1g8";
+       editedCabalFile = "45fd633a94e0a13dbaeeb1791725a72d185f54027569e967f8006f07df67d586";
        buildDepends = [ base regex-applicative ];
        testDepends = [ base QuickCheck regex-applicative ];
        jailbreak = true;
@@ -133818,6 +134049,32 @@ test/package-dump/ghc-7.10.txt";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wolf" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-s3, amazonka-swf, base
+     , bytestring, conduit, conduit-extra, cryptohash, exceptions
+     , fast-logger, http-conduit, lens, monad-control, monad-logger, mtl
+     , optparse-applicative, safe, shelly, text, transformers
+     , transformers-base, unordered-containers, uuid, yaml
+     }:
+     mkDerivation {
+       pname = "wolf";
+       version = "0.1.0";
+       sha256 = "1b51gb7waxv0i7l3phz0h24n5jpir51b7zycs75kb1wn8qmm8ia3";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson amazonka amazonka-s3 amazonka-swf base bytestring conduit
+         conduit-extra cryptohash exceptions fast-logger http-conduit lens
+         monad-control monad-logger mtl optparse-applicative safe shelly
+         text transformers transformers-base unordered-containers uuid yaml
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/swift-nav/wolf";
+       description = "Amazon Simple Workflow Service Wrapper";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "word-trie" = callPackage
     ({ mkDerivation, base, binary, containers, hspec, QuickCheck }:
      mkDerivation {
@@ -137055,13 +137312,13 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "yesod-crud-persist";
-       version = "0.1.0.0";
-       sha256 = "0kzigyggzxv4ps8a15bhk8ngxn15inp630x0v3kn0j1xdmj7inpw";
+       version = "0.1.1";
+       sha256 = "171papb9hns62jswqxkg4q41wb8sb72714i4wghx7g8svh17lv28";
        buildDepends = [
          base lens persistent text transformers wai yesod-core yesod-form
          yesod-persistent
        ];
-       homepage = "google.com";
+       homepage = "https://github.com/andrewthad/yesod-crud-persist";
        description = "Flexible CRUD subsite usable with Yesod and Persistent";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137818,10 +138075,9 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "yesod-table";
-       version = "0.1.1";
-       sha256 = "0glbdm19bf0pxp0y2831yi0yxjwc3b9xfhsdimxyc5ppm2dqdxsj";
+       version = "0.1.2";
+       sha256 = "1415y7q45s65cklqyrvcgsqi6v07p698024d5wfghcjnv9qylwmi";
        buildDepends = [ base containers contravariant text yesod-core ];
-       jailbreak = true;
        homepage = "https://github.com/andrewthad/yesod-table";
        description = "HTML tables for Yesod";
        license = stdenv.lib.licenses.mit;

From 614769a9ede25991cd79d71f00813c3fb7e9d43d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 11:12:14 +0200
Subject: [PATCH 1224/2322] haskell-serversession: disable failing 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 d42c05fad28..29bca6c99d0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -873,4 +873,7 @@ self: super: {
   # Doesn't work with recent versions of mtl.
   cron-compat = markBroken super.cron-compat;
 
+  # https://github.com/yesodweb/serversession/issues/1
+  serversession = dontCheck super.serversession;
+
 }

From 6390ea5026b45a77b4290795d0ea2d7c75a46d09 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 11:42:29 +0200
Subject: [PATCH 1225/2322] haskell-serversession-backend-redis: disable
 failing test suite

---
 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 29bca6c99d0..a1038d3cb4b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -334,6 +334,7 @@ self: super: {
   wreq = dontCheck super.wreq;                          # http://hydra.cryp.to/build/501895/nixlog/1/raw
   wreq-sb = dontCheck super.wreq-sb;                    # http://hydra.cryp.to/build/783948/log/raw
   wuss = dontCheck super.wuss;                          # http://hydra.cryp.to/build/875964/nixlog/2/raw
+  serversession-backend-redis = dontCheck super.serversession-backend-redis;
 
   # https://github.com/NICTA/digit/issues/3
   digit = dontCheck super.digit;

From 90c3d380d1aacf19368549182452541348dda2dd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 11:42:39 +0200
Subject: [PATCH 1226/2322] haskell-wai-session: package is broken

---
 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 a1038d3cb4b..2a5231aef21 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/yesodweb/serversession/issues/1
   serversession = dontCheck super.serversession;
 
+  # https://github.com/singpolyma/wai-session/issues/8
+  wai-session = markBroken super.wai-session;
+  serversession-frontend-wai = dontDistribute super.serversession-frontend-wai;
+
 }

From fbe153989ccd8ba4955e16bd44e2ffcc9a9710cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 12:32:21 +0200
Subject: [PATCH 1227/2322] ghcjs: mark broken

The build has been failing for quite some time.
---
 pkgs/development/compilers/ghcjs/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 696415f4562..06588ec949b 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -127,4 +127,5 @@ in mkDerivation (rec {
   license = stdenv.lib.licenses.bsd3;
   platforms = ghc.meta.platforms;
   maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
+  broken = true; # configure fails: "aeson >=0.7 && <0.9, syb ==0.4.*, text-binary ==0.1.*"
 })

From 8a8ed5fa1b7746caeed463963719e1c6744e69c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 12:32:46 +0200
Subject: [PATCH 1228/2322] ghcjs: unbreak syntax highlighting in Emacs

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

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 06588ec949b..65988901de7 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -103,7 +103,7 @@ in mkDerivation (rec {
 
     # Make the patches be relative their corresponding package's directory.
     # See: https://github.com/ghcjs/ghcjs-boot/pull/12
-    for patch in $topDir/ghcjs-boot/patches/*.patch; do
+    for patch in "$topDir/ghcjs-boot/patches/"*.patch; do
       echo "fixing patch: $patch"
       sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch
     done

From d5628c982df2fad1ec42c0e6471c90bd3556a90d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 16 Jun 2015 11:20:20 +0000
Subject: [PATCH 1229/2322] Bypass /etc/gdm/Xsession. Closes #8351

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

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index c5012dbb5e3..1fb7f20893d 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -165,6 +165,7 @@ let
         Type=XSession
         TryExec=${cfg.displayManager.session.script}
         Exec=${cfg.displayManager.session.script} '${n}'
+        X-GDM-BypassXsession=true
         Name=${n}
         Comment=
         EODESKTOP

From a4178b1b8a8bfced7fb08f0220313625bf18d2d9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Jun 2015 14:16:08 +0200
Subject: [PATCH 1230/2322] openssl: Update to 1.0.1o

From https://www.openssl.org/news/openssl-1.0.1-notes.html:

"Fix HMAC ABI incompatibility"
---
 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 e8ecb5a5775..6aa0b28b238 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -2,7 +2,7 @@
 , withCryptodev ? false, cryptodevHeaders }:
 
 let
-  name = "openssl-1.0.1n";
+  name = "openssl-1.0.1o";
 
   opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
     (throw "openssl needs its platform name cross building" null)
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
       "http://www.openssl.org/source/${name}.tar.gz"
       "http://openssl.linux-mirror.org/source/${name}.tar.gz"
     ];
-    sha1 = "2f6ea1e0f2724aca1805392e4387df8361442ace";
+    sha1 = "b003e3382607ef2c6d85b51e4ed7a4c0a76b8d5a";
   };
 
   patches = (patchesCross false) ++ extraPatches;

From b333a2cb19fd9115bf6f24f9260eeb7727b88598 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 14:17:25 +0200
Subject: [PATCH 1231/2322] openssl: remove some cruft

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

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 6aa0b28b238..f0212aeabee 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -42,10 +42,6 @@ stdenv.mkDerivation {
   configureFlags = "shared --libdir=lib --openssldir=etc/ssl" +
     stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS";
 
-  # CYGXXX: used to be set for cygwin with optionalString. Not needed
-  # anymore but kept to prevent rebuild.
-  preBuild = "";
-
   makeFlags = "MANDIR=$(out)/share/man";
 
   # Parallel building is broken in OpenSSL.
@@ -56,12 +52,12 @@ stdenv.mkDerivation {
       # If we're building dynamic libraries, then don't install static
       # libraries.
       if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib)" ]; then
-          rm $out/lib/*.a
+          rm "$out/lib/"*.a
       fi
 
       # remove dependency on Perl at runtime
       rm -rf $out/etc/ssl/misc
-    ''; # */
+    '';
 
   crossAttrs = {
     patches = patchesCross true;

From d2ad04cd382e097eb72f4084deee9842aa362ba1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 16 Jun 2015 14:56:15 +0200
Subject: [PATCH 1232/2322] add california, a calendar application for gnome

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  2 +
 ...d-with-evolution-data-server-3.13.90.patch | 39 +++++++++++++++++++
 .../gnome-3/3.16/misc/california/default.nix  | 39 +++++++++++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
 create mode 100644 pkgs/desktops/gnome-3/3.16/misc/california/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 2dee0cefd92..da3527d8ceb 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -279,6 +279,8 @@ let
 
 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
 
+  california = callPackage ./misc/california { };
+
   geary = callPackage ./misc/geary { 
     webkitgtk = webkitgtk24x;
   };
diff --git a/pkgs/desktops/gnome-3/3.16/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/3.16/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
new file mode 100644
index 00000000000..c229cc96094
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
@@ -0,0 +1,39 @@
+diff --git a/configure.ac b/configure.ac
+index 8a94642..1ca6426 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,7 +27,7 @@ AC_SUBST(LDFLAGS)
+ GLIB_REQUIRED=2.38.0
+ GTK_REQUIRED=3.12.2
+ GEE_REQUIRED=0.10.5
+-ECAL_REQUIRED=3.8.5
++ECAL_REQUIRED=3.13.90
+ LIBSOUP_REQUIRED=2.44
+ GDATA_REQUIRED=0.14.0
+ GOA_REQUIRED=3.8.3
+diff --git a/src/backing/eds/backing-eds-calendar-source.vala b/src/backing/eds/backing-eds-calendar-source.vala
+index ee6a572..5009b5d 100644
+--- a/src/backing/eds/backing-eds-calendar-source.vala
++++ b/src/backing/eds/backing-eds-calendar-source.vala
+@@ -256,7 +256,7 @@ internal class EdsCalendarSource : CalendarSource {
+
+     // Invoked by EdsStore prior to making it available outside of unit
+     internal async void open_async(Cancellable? cancellable) throws Error {
+-        client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS,
++        client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, 1,
+             cancellable);
+
+         client.bind_property("readonly", this, PROP_READONLY, BindingFlags.SYNC_CREATE);
+diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi
+index 6ead3ec..46fd711 100644
+--- a/vapi/libecal-1.2.vapi
++++ b/vapi/libecal-1.2.vapi
+@@ -23,7 +23,7 @@ namespace E {
+		public bool check_save_schedules ();
+		public static bool check_timezones (iCal.icalcomponent comp, GLib.List comps, GLib.Callback tzlookup, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error;
+		[CCode (finish_name = "e_cal_client_connect_finish")]
+-		public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error;
++		public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, uint32 wait_for_connected_seconds, GLib.Cancellable cancellable) throws GLib.Error;
+		public static unowned E.Client connect_sync (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error;
+		[CCode (finish_name = "e_cal_client_create_object_finish")]
+		public async void create_object (iCal.icalcomponent icalcomp, GLib.Cancellable? cancellable, out string out_uid) throws GLib.Error;
diff --git a/pkgs/desktops/gnome-3/3.16/misc/california/default.nix b/pkgs/desktops/gnome-3/3.16/misc/california/default.nix
new file mode 100644
index 00000000000..4bdeeb23a91
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/california/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala, makeWrapper
+, gnome3, glib, libsoup, libgdata, sqlite, itstool, xdg_utils }:
+
+let
+  majorVersion = "0.4";
+in
+stdenv.mkDerivation rec {
+  name = "california-${majorVersion}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/california/${majorVersion}/${name}.tar.xz";
+    sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ makeWrapper intltool pkgconfig vala glib gtk3 gnome3.libgee
+    libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server
+    sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/california" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings_desktop_schemas}/share"
+  '';
+
+  enableParallelBuilding = true;
+
+  # Apply fedoras patch to build with evolution-data-server >3.13
+  patches = [ ./0002-Build-with-evolution-data-server-3.13.90.patch ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/California;
+    description = "Calendar application for GNOME 3";
+    maintainers = with maintainers; [ pSub ];
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+  };
+}

From 55227b330fc7fb3c9f4f56cd11895810b05825fd Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Tue, 16 Jun 2015 15:12:37 +0200
Subject: [PATCH 1233/2322] khal: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 7f7f1308eb1..2652af9bed9 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgs, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "0.4.0";
+  version = "0.5.0";
   name = "khal-${version}";
 
   src = fetchurl {
     url = "https://github.com/geier/khal/archive/v${version}.tar.gz";
-    sha256 = "0d32miq55cly4q3raxkw3xpq4d5y3hvzaqvy066nv35bdlpafxi1";
+    sha256 = "1rjs5s8ky4n628rs6l5ggaj2abb4kq2avvxmimjjgxz3zh9xlz6s";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From de142fe63efd117a998edbdb23b64e0203552e34 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 16 Jun 2015 15:02:58 +0000
Subject: [PATCH 1234/2322] gtk-vnc: add new lib for gnome

---
 .../gnome-3/3.16/core/gtk-vnc/default.nix     | 30 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.16/default.nix        |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gtk-vnc/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/core/gtk-vnc/default.nix b/pkgs/desktops/gnome-3/3.16/core/gtk-vnc/default.nix
new file mode 100644
index 00000000000..ebe7370aba7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gtk-vnc/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, gdk_pixbuf, pkgconfig, gtk3, cyrus_sasl
+, gnutls, gobjectIntrospection, vala, intltool, libgcrypt }:
+
+stdenv.mkDerivation rec {
+  versionMajor = "0.5";
+  versionMinor = "4";
+  moduleName   = "gtk-vnc";
+
+  name = "${moduleName}-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
+    sha256 = "1rwwdh7lb16xdmy76ca6mpqfc3zfl3a4bkcr0qb6hs6ffrxak2j8";
+  };
+
+  buildInputs = [ pkgconfig gtk3 gdk_pixbuf gnutls cyrus_sasl
+                  gobjectIntrospection vala intltool libgcrypt ];
+
+  configureFlags = [ "--with-gtk=3.0" ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/gtk-vnc;
+    description = "A VNC viewer widget for GTK+";
+    license = licenses.lgpl2;
+    maintainers = with maintainers; [ lethalman ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index da3527d8ceb..d7e6d04614e 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -151,6 +151,8 @@ let
 
   gtksourceview = callPackage ./core/gtksourceview { };
 
+  gtk-vnc = callPackage ./core/gtk-vnc { };
+
   gucharmap = callPackage ./core/gucharmap { };
 
   gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };

From 3b2c44fc745afca3b14c22f87d58b9d74caf0508 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 16 Jun 2015 15:13:26 +0000
Subject: [PATCH 1235/2322] vinagre: add new gnome app

---
 .../gnome-3/3.16/apps/vinagre/default.nix     | 29 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix
new file mode 100644
index 00000000000..38263ac73f8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool
+, libsecret, itstool, makeWrapper, librsvg }:
+
+stdenv.mkDerivation rec {
+  name = "vinagre-${version}";
+
+  majVersion = gnome3.version;
+  version = "${majVersion}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/vinagre/${majVersion}/${name}.tar.xz";
+    sha256 = "0gs8sqd4r6jlgxn1b7ggyfcisig50z79p0rmigpzwpjjx1bh0z6p";
+  };
+
+  buildInputs = [ pkgconfig gtk3 vte libxml2 gtk-vnc intltool libsecret
+                  itstool makeWrapper gnome3.defaultIconTheme librsvg ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/vinagre" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Vinagre;
+    description = "Remote desktop viewer for GNOME";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index d7e6d04614e..77f45d681a0 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -28,7 +28,7 @@ let
     gnome-shell-extensions gnome-system-log gnome-system-monitor
     gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
-    nautilus-sendto dconf-editor
+    nautilus-sendto dconf-editor vinagre
   ];
 
   inherit (pkgs) libsoup glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
@@ -273,6 +273,8 @@ let
 
   pomodoro = callPackage ./apps/pomodoro { };
 
+  vinagre = callPackage ./apps/vinagre { };
+
 #### Dev http://ftp.gnome.org/pub/GNOME/devtools/
 
   anjuta = callPackage ./devtools/anjuta { };

From e37340b49a874e7fd5357fbc0f001d6e642903a0 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 16 Jun 2015 15:26:37 +0000
Subject: [PATCH 1236/2322] gnome-pomodoro: move from apps to misc

---
 pkgs/desktops/gnome-3/3.16/default.nix                        | 4 ++--
 .../desktops/gnome-3/3.16/{apps => misc}/pomodoro/default.nix | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/desktops/gnome-3/3.16/{apps => misc}/pomodoro/default.nix (100%)

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 77f45d681a0..0c3d49f769f 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -271,8 +271,6 @@ let
 
   seahorse = callPackage ./apps/seahorse { };
 
-  pomodoro = callPackage ./apps/pomodoro { };
-
   vinagre = callPackage ./apps/vinagre { };
 
 #### Dev http://ftp.gnome.org/pub/GNOME/devtools/
@@ -311,6 +309,8 @@ let
 
   gtkhtml = callPackage ./misc/gtkhtml { };
 
+  pomodoro = callPackage ./misc/pomodoro { };
+
     };
   in self; # pkgsFun
 
diff --git a/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
rename to pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix

From 7c4a0eaa53616293a84272257cf3460f4f38a35d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 16 Jun 2015 17:28:35 +0200
Subject: [PATCH 1237/2322] wpa_supplicant: fix CVE-2015-4143

see http://www.openwall.com/lists/oss-security/2015/05/09/6
---
 .../linux/wpa_supplicant/default.nix          | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index c709880af2d..3cf45697129 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -84,6 +84,26 @@ stdenv.mkDerivation rec {
       url = "http://w1.fi/cgit/hostap/patch/?id=8a78e227df1ead19be8e12a4108e448887e64d6f";
       sha256 = "1k2mcq1jv8xzi8061ixcz6j56n4i8wbq0vxcvml204q1syy2ika0";
     })
+    (fetchpatch {
+      url = http://w1.fi/security/2015-4/0001-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch;
+      sha256 = "1cg4r638s4m9ar9lmzm534y657ppcm8bl1h363kjnng1zbzh8rfb";
+    })
+    (fetchpatch {
+      url = http://w1.fi/security/2015-4/0002-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch;
+      sha256 = "0ky850rg1k9lwd1p4wzyvl2dpi5g7k1mwx1ndjclp4x7bshb6w79";
+    })
+    (fetchpatch {
+      url = http://w1.fi/security/2015-4/0003-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch;
+      sha256 = "0hicw3vk1khk849xil75ckrg1xzbwcva7g01kp0lvab34dwhryy7";
+    })
+    (fetchpatch {
+      url = http://w1.fi/security/2015-4/0004-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch;
+      sha256 = "18d5r3zbwz96n4zzj9r27cv4kvc09zkj9x0p6qji68h8k2pcazxd";
+    })
+    (fetchpatch {
+      url = http://w1.fi/security/2015-4/0005-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch;
+      sha256 = "1ndzyfpnxpvryiqal4kdic02kg9dgznh65kaqydaqqfj3rbjdqip";
+    })
   ];
 
   postInstall = ''

From f2c84ffeb28e2681ef00bd339d4b92a681c082a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 16 Jun 2015 18:34:18 +0200
Subject: [PATCH 1238/2322] libarchive: fix CVE-2015-1197 by upstream patch

Fixes #6799.
---
 .../libraries/libarchive/CVE-2015-1197.patch  | 143 ++++++++++++++++++
 .../libraries/libarchive/default.nix          |   1 +
 2 files changed, 144 insertions(+)
 create mode 100644 pkgs/development/libraries/libarchive/CVE-2015-1197.patch

diff --git a/pkgs/development/libraries/libarchive/CVE-2015-1197.patch b/pkgs/development/libraries/libarchive/CVE-2015-1197.patch
new file mode 100644
index 00000000000..cb7be5f18cd
--- /dev/null
+++ b/pkgs/development/libraries/libarchive/CVE-2015-1197.patch
@@ -0,0 +1,143 @@
+From 59357157706d47c365b2227739e17daba3607526 Mon Sep 17 00:00:00 2001
+From: Alessandro Ghedini <alessandro@ghedini.me>
+Date: Sun, 1 Mar 2015 12:07:45 +0100
+Subject: [PATCH] Add ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS option
+
+This fixes a directory traversal in the cpio tool.
+---
+ cpio/bsdcpio.1                           |  3 ++-
+ cpio/cpio.c                              |  2 ++
+ libarchive/archive.h                     |  2 ++
+ libarchive/archive_write_disk.3          |  3 +++
+ libarchive/archive_write_disk_posix.c    | 14 +++++++++++---
+ libarchive/test/test_write_disk_secure.c | 23 +++++++++++++++++++++++
+ 6 files changed, 43 insertions(+), 4 deletions(-)
+
+diff --git a/cpio/bsdcpio.1 b/cpio/bsdcpio.1
+index f966aa0..e52546e 100644
+--- a/cpio/bsdcpio.1
++++ b/cpio/bsdcpio.1
+@@ -156,7 +156,8 @@ See above for description.
+ .It Fl Fl insecure
+ (i and p mode only)
+ Disable security checks during extraction or copying.
+-This allows extraction via symbolic links and path names containing
++This allows extraction via symbolic links, absolute paths,
++and path names containing
+ .Sq ..
+ in the name.
+ .It Fl J , Fl Fl xz
+diff --git a/cpio/cpio.c b/cpio/cpio.c
+index 0acde11..b267e9b 100644
+--- a/cpio/cpio.c
++++ b/cpio/cpio.c
+@@ -171,6 +171,7 @@ main(int argc, char *argv[])
+ 	cpio->extract_flags |= ARCHIVE_EXTRACT_NO_OVERWRITE_NEWER;
+ 	cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_SYMLINKS;
+ 	cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_NODOTDOT;
++	cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS;
+ 	cpio->extract_flags |= ARCHIVE_EXTRACT_PERM;
+ 	cpio->extract_flags |= ARCHIVE_EXTRACT_FFLAGS;
+ 	cpio->extract_flags |= ARCHIVE_EXTRACT_ACL;
+@@ -256,6 +257,7 @@ main(int argc, char *argv[])
+ 		case OPTION_INSECURE:
+ 			cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_SYMLINKS;
+ 			cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_NODOTDOT;
++			cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS;
+ 			break;
+ 		case 'L': /* GNU cpio */
+ 			cpio->option_follow_links = 1;
+diff --git a/libarchive/archive.h b/libarchive/archive.h
+index 1f0fc38..ef635ac 100644
+--- a/libarchive/archive.h
++++ b/libarchive/archive.h
+@@ -649,6 +649,8 @@ __LA_DECL int archive_read_set_passphrase_callback(struct archive *,
+ /* Default: Do not use HFS+ compression if it was not compressed. */
+ /* This has no effect except on Mac OS v10.6 or later. */
+ #define	ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED	(0x8000)
++/* Default: Do not reject entries with absolute paths */
++#define ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS (0x10000)
+ 
+ __LA_DECL int archive_read_extract(struct archive *, struct archive_entry *,
+ 		     int flags);
+diff --git a/libarchive/archive_write_disk.3 b/libarchive/archive_write_disk.3
+index fa925cc..a2e7afa 100644
+--- a/libarchive/archive_write_disk.3
++++ b/libarchive/archive_write_disk.3
+@@ -177,6 +177,9 @@ The default is to not refuse such paths.
+ Note that paths ending in
+ .Pa ..
+ always cause an error, regardless of this flag.
++.It Cm ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS
++Refuse to extract an absolute path.
++The default is to not refuse such paths.
+ .It Cm ARCHIVE_EXTRACT_SPARSE
+ Scan data for blocks of NUL bytes and try to recreate them with holes.
+ This results in sparse files, independent of whether the archive format
+diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c
+index ab3bdac..c1290eb 100644
+--- a/libarchive/archive_write_disk_posix.c
++++ b/libarchive/archive_write_disk_posix.c
+@@ -2509,8 +2509,9 @@ cleanup_pathname_win(struct archive_write_disk *a)
+ /*
+  * Canonicalize the pathname.  In particular, this strips duplicate
+  * '/' characters, '.' elements, and trailing '/'.  It also raises an
+- * error for an empty path, a trailing '..' or (if _SECURE_NODOTDOT is
+- * set) any '..' in the path.
++ * error for an empty path, a trailing '..', (if _SECURE_NODOTDOT is
++ * set) any '..' in the path or (if ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS
++ * is set) if the path is absolute.
+  */
+ static int
+ cleanup_pathname(struct archive_write_disk *a)
+@@ -2529,8 +2530,15 @@ cleanup_pathname(struct archive_write_disk *a)
+ 	cleanup_pathname_win(a);
+ #endif
+ 	/* Skip leading '/'. */
+-	if (*src == '/')
++	if (*src == '/') {
++		if (a->flags & ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS) {
++			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++			                  "Path is absolute");
++			return (ARCHIVE_FAILED);
++		}
++
+ 		separator = *src++;
++	}
+ 
+ 	/* Scan the pathname one element at a time. */
+ 	for (;;) {
+diff --git a/libarchive/test/test_write_disk_secure.c b/libarchive/test/test_write_disk_secure.c
+index 31c5bfd..2c94206 100644
+--- a/libarchive/test/test_write_disk_secure.c
++++ b/libarchive/test/test_write_disk_secure.c
+@@ -178,6 +178,29 @@ DEFINE_TEST(test_write_disk_secure)
+ 	assert(S_ISDIR(st.st_mode));
+ 	archive_entry_free(ae);
+ 
++	/*
++	 * Without security checks, we should be able to
++	 * extract an absolute path.
++	 */
++	assert((ae = archive_entry_new()) != NULL);
++	archive_entry_copy_pathname(ae, "/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
++	archive_entry_set_mode(ae, S_IFREG | 0777);
++	assert(0 == archive_write_header(a, ae));
++	assert(0 == archive_write_finish_entry(a));
++	assertFileExists("/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
++	assert(0 == unlink("/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp"));
++
++	/* But with security checks enabled, this should fail. */
++	assert(archive_entry_clear(ae) != NULL);
++	archive_entry_copy_pathname(ae, "/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
++	archive_entry_set_mode(ae, S_IFREG | 0777);
++	archive_write_disk_set_options(a, ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS);
++	failure("Extracting an absolute path should fail here.");
++	assertEqualInt(ARCHIVE_FAILED, archive_write_header(a, ae));
++	archive_entry_free(ae);
++	assert(0 == archive_write_finish_entry(a));
++	assertFileNotExists("/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
++
+ 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
+ 
+ 	/* Test the entries on disk. */
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 076d2240277..60777614881 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./CVE-2013-0211.patch # https://github.com/libarchive/libarchive/commit/22531545
+    ./CVE-2015-1197.patch # https://github.com/NixOS/nixpkgs/issues/6799
   ];
 
   buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz ] ++

From b73a9a0b6860203f7a38f1cec6c859c56bb13cb2 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 16 Jun 2015 20:10:57 +0200
Subject: [PATCH 1239/2322] add libgringotts, a library to encapsulate data in
 an encrypted structure

---
 .../libraries/libgringotts/default.nix        | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/libgringotts/default.nix

diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix
new file mode 100644
index 00000000000..93ad88f0021
--- /dev/null
+++ b/pkgs/development/libraries/libgringotts/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, zlib, bzip2, libmcrypt, libmhash }:
+
+stdenv.mkDerivation rec {
+  name = "libgringotts-${version}";
+  version = "1.1.2";
+
+  src = fetchurl {
+    url = "http://libgringotts.sourceforge.net/current/${name}.tar.bz2";
+    sha256 = "1bzfnpf2gwc2bisbrw06s63g9z9v4mh1n9ksqr6pbgj2prz7bvlk";
+  };
+
+  buildInputs = [ pkgconfig zlib bzip2 libmcrypt libmhash ];
+
+  meta = with stdenv.lib; {
+    description = "A small library to encapsulate data in an encrypted structure";
+    homepage = http://libgringotts.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2bba940c49a..0552921ddcd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6771,6 +6771,8 @@ let
 
   libgnurl = callPackage ../development/libraries/libgnurl { };
 
+  libgringotts = callPackage ../development/libraries/libgringotts { };
+
   libgroove = callPackage ../development/libraries/libgroove { };
 
   libseccomp = callPackage ../development/libraries/libseccomp { };

From 7d7a5e9f0e14106e660cf26860c0d1f4efe7cc74 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 16 Jun 2015 20:12:22 +0200
Subject: [PATCH 1240/2322] add osmo, a handy personal organizer

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

diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix
new file mode 100644
index 00000000000..81f5773a453
--- /dev/null
+++ b/pkgs/applications/office/osmo/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, gtk, libxml2, gettext, libical, libnotify
+, libarchive, gtkspell, webkitgtk2, libgringotts }:
+
+stdenv.mkDerivation rec {
+  name = "osmo-${version}";
+  version = "0.2.12";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/osmo-pim/${name}.tar.gz";
+    sha256 = "0y3bpsi18v3dxb3vsy0dr7cgf692g4p62l84hj9l2bpr2hbabgck";
+  };
+
+  buildInputs = [ pkgconfig gtk libxml2 gettext libical libnotify libarchive
+    gtkspell webkitgtk2 libgringotts ];
+
+  meta = with stdenv.lib; {
+    description = "A handy personal organizer";
+    homepage = http://clayo.org/osmo/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0552921ddcd..59090e1ced9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12060,6 +12060,8 @@ let
 
   opusTools = callPackage ../applications/audio/opus-tools { };
 
+  osmo = callPackage ../applications/office/osmo { };
+
   pamixer = callPackage ../applications/audio/pamixer { };
 
   pan = callPackage ../applications/networking/newsreaders/pan {

From f8df92efbe5a99d4f5e196d5d548917c3ef062e0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 16 Jun 2015 20:22:55 +0200
Subject: [PATCH 1241/2322] scala-mode2: fix hash

---
 pkgs/applications/editors/emacs-modes/scala-mode/v2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
index 75861b0a988..ed3ac0e3da0 100644
--- a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
+++ b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/hvesalai/scala-mode2/archive/c154f1623f4696d26e1c88d19170e67bf6825837.zip";
-    sha256 = "0fyxdpwz55n4c87v4ijqlbv6w1rybg5qrgsc40f6bs6sd747scy5";
+    sha256 = "0im2ajb1iagjldh52j8wz4yby68rs3h7shrdf1pqy5ds7s4fa8cc";
   };
 
   buildInputs = [ unzip emacs ];

From 21bb2caf78fedeb77993b1f47187218f39cbb20a Mon Sep 17 00:00:00 2001
From: Andraz Brodnik <brodul@brodul.org>
Date: Tue, 16 Jun 2015 21:02:48 +0200
Subject: [PATCH 1242/2322] Update scrolls client (src hash change)

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

diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix
index da4a34cfec8..0f252a5043f 100644
--- a/pkgs/games/scrolls/default.nix
+++ b/pkgs/games/scrolls/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.scrolls.com/client/linux.tar.gz";
-    sha256 = "0gpwb8f1wrj6dfd9ffxga07whnxdgk66bj7j9gkbxlvrx3sj8zbp";
+    sha256 = "164d13ce5b81b215a58bae5a0d024b4cf6e32c986ca57a2c9d4e80326edb5004";
   };
 
   libPath = stdenv.lib.makeLibraryPath [

From 6cd67cb218441255f8e130a48b4d2261222aa9a9 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Tue, 16 Jun 2015 21:26:47 +0200
Subject: [PATCH 1243/2322] goPackages: grpc: fix dependencies so that grpc
 builds

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 1181d8e2b60..b60ccfdb0de 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -652,6 +652,12 @@ let
     buildInputs = [ net oauth2 protobuf google-api-go-client grpc ];
   };
 
+  gcloud-golang-compute-metadata = buildGoPackage rec {
+    inherit (gcloud-golang) rev name goPackagePath src;
+    subPackages = [ "compute/metadata" ];
+    buildInputs = [ net ];
+  };
+
   ginkgo = buildGoPackage rec {
     rev = "5ed93e443a4b7dfe9f5e95ca87e6082e503021d2";
     name = "ginkgo-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1378,6 +1384,7 @@ let
       sha256 = "07dfpwwk68rrhxmqj69gq2ncsf3kfmn0zhlwscda0gc5gb57n5x1";
     };
 
+    buildInputs = [ gcloud-golang-compute-metadata ];
     propagatedBuildInputs = [ http2 glog net protobuf oauth2 ];
   };
 

From 57ee8d6131fa4f44f5bdd93a95fb103cf504ae58 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 16 Jun 2015 14:08:46 -0700
Subject: [PATCH 1244/2322] xorgserver: Add gcc5 compat patch

---
 pkgs/servers/x11/xorg/overrides.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 1ef0d88ce3a..eaa3055827f 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -294,7 +294,7 @@ in
         libpciaccess inputproto xextproto randrproto renderproto presentproto
         dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto
       ];
-      commonPatches = [ ./xorgserver-xkbcomp-path.patch ]
+      commonPatches = [ ./xorgserver-xkbcomp-path.patch ./xorgserver-gcc5.patch ]
                    ++ lib.optional isDarwin ./fix-clang.patch;
       # XQuartz requires two compilations: the first to get X / XQuartz,
       # and the second to get Xvfb, Xnest, etc.

From 01c2ad2525f2f5bc7c2790b8d10f0629bb793dbd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 16 Jun 2015 14:28:12 -0700
Subject: [PATCH 1245/2322] screen: 4.2.1 -> 4.3.0

---
 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 d4377c14fad..e8a39623d9a 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, pam ? null }:
 
 stdenv.mkDerivation rec {
-  name = "screen-4.2.1";
+  name = "screen-4.3.0";
 
   src = fetchurl {
     url = "mirror://gnu/screen/${name}.tar.gz";
-    sha256 = "105hp6qdd8rl71p81klmxiz4mlb60kh9r7czayrx40g38x858s2l";
+    sha256 = "0ilccnwszaxr9wbrx0swh4fisha2rj2jiq76fwqikmv0rjdyhr2i";
   };
 
   preConfigure = ''

From 7d299447ae584bd064ef175fa889607cb387d0c9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 23:59:56 +0200
Subject: [PATCH 1246/2322] Revert "gmp: Use version 6 as the default"

This reverts commit 370fc79b948438694dc4767570afe43c5b1fb7c4, because it causes
trouble on both Linux and Darwin, and we probably shouldn't have to worry about
that kind of stuff right now with the 15.06 release being late'ish already.
---
 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 1f7422cb125..4df6e675d68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6206,8 +6206,7 @@ let
 
   gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions
   gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { };
-  gmp6 = callPackage ../development/libraries/gmp/6.x.nix { };
-  gmp = gmp6;
+  gmp = gmp5;
   gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; });
 
   #GMP ex-satellite, so better keep it near gmp

From bc4e1f3c1a628396632f491b465d15dd3a8b92c4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 16 Jun 2015 15:20:28 -0700
Subject: [PATCH 1247/2322] inetutils: 1.9.3 -> 1.9.4

---
 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 251462ecc27..eca416b53d4 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "inetutils-1.9.3";
+  name = "inetutils-1.9.4";
 
   src = fetchurl {
     url = "mirror://gnu/inetutils/${name}.tar.gz";
-    sha256 = "06dshajjpyi9sxi7qfki9gnp5r3nxvyvf81r81gx0x2qkqzqcxlj";
+    sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy";
   };
 
   buildInputs = [ ncurses /* for `talk' */ ];

From af21595ecaf0003496933b46beb9c841d828ca4e Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 2 Jun 2015 19:30:32 -0400
Subject: [PATCH 1248/2322] ghcjs: fix/bump git refs

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

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 65988901de7..e4288b9a2cb 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -41,22 +41,22 @@ let
   version = "0.1.0";
   ghcjsBoot = fetchgit {
     url = git://github.com/ghcjs/ghcjs-boot.git;
-    rev = "5c3ca2db12bd3e92d3eeaead8bcb6b347174a30f"; # 7.10 branch
-    sha256 = "0rpfb73bd0maccg3bjf51l23byy0h2i47wph99wblmkdp8ywxkpf";
+    rev = "d3581514d0a5073f8220a2f5baafe6866faa35a0"; # 7.10 branch
+    sha256 = "1p13ifidpi7y1mjq5qv9229isfnsiklizci7i55sf83mp6wqdyvr";
     fetchSubmodules = true;
   };
   shims = fetchgit {
     url = git://github.com/ghcjs/shims.git;
-    rev = "6ada4bf1a084d1b80b993303d35ed863d219b031"; # master branch
-    sha256 = "0dhfnjj3rxdbb2m1pbnjc2yp4xcgsfdrsinljgdmg0hpqkafp4vc";
+    rev = "9b196ff5ff13a24997011009b37c980c5534e24f"; # master branch
+    sha256 = "1zsfxka692fr3zb710il7g1sj64xwaxmasimciylb4wx84h7c30w";
   };
 in mkDerivation (rec {
   pname = "ghcjs";
   inherit version;
   src = fetchgit {
     url = git://github.com/ghcjs/ghcjs.git;
-    rev = "15b7a34ddc11075a335e097f6109ad57ca03edab"; # master branch
-    sha256 = "0h6jdwd7lh3rkfsqpq3s6iavqkz1a88grzcxrcqj4rjilzdw288q";
+    rev = "c1b6239b0289371dc6b8d17dfd845c14bd4dc490"; # master branch
+    sha256 = "0ncbk7m1l7cpdgmabm14d7f97fw3vy0hmpj4vs4kkwhhfjf6kp8s";
   };
   isLibrary = true;
   isExecutable = true;
@@ -127,5 +127,4 @@ in mkDerivation (rec {
   license = stdenv.lib.licenses.bsd3;
   platforms = ghc.meta.platforms;
   maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
-  broken = true; # configure fails: "aeson >=0.7 && <0.9, syb ==0.4.*, text-binary ==0.1.*"
 })

From e4316b8c17121042fd258df6df2fdbc5618c2b72 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 16 Jun 2015 23:36:02 -0700
Subject: [PATCH 1249/2322] xorg-server: 1.16.4 -> 1.17.2

---
 pkgs/servers/x11/xorg/default.nix   | 10 +++++-----
 pkgs/servers/x11/xorg/overrides.nix |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 1d8997e3c1d..f0fdb67f30e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2075,14 +2075,14 @@ let
   }) // {inherit ;};
 
   xorgserver = (mkDerivation "xorgserver" {
-    name = "xorg-server-1.16.4";
+    name = "xorg-server-1.17.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.16.4.tar.bz2;
-      sha256 = "0wf8xykcjhvpk9ppjcixvf60p6kkyrpmfj0z29d93a8kjb6f3dmb";
+      url = mirror://xorg/individual/xserver/xorg-server-1.17.2.tar.bz2;
+      sha256 = "14vr4mm0x94a9bd3sfx9mdh8qhvk48zcml3i8q1wbwi84xhj04gn";
     };
-    buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ];
-  }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ;};
+    buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt xcbutilrenderutil];
+  }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt xcbutilrenderutil;};
 
   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 eaa3055827f..1ef0d88ce3a 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -294,7 +294,7 @@ in
         libpciaccess inputproto xextproto randrproto renderproto presentproto
         dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto
       ];
-      commonPatches = [ ./xorgserver-xkbcomp-path.patch ./xorgserver-gcc5.patch ]
+      commonPatches = [ ./xorgserver-xkbcomp-path.patch ]
                    ++ lib.optional isDarwin ./fix-clang.patch;
       # XQuartz requires two compilations: the first to get X / XQuartz,
       # and the second to get Xvfb, Xnest, etc.

From 061887e38a37e31521a67a02f575dd413b5eeddc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 16 Jun 2015 23:36:58 -0700
Subject: [PATCH 1250/2322] xf86-video-intel: Kernel 4.0 match

---
 pkgs/servers/x11/xorg/overrides.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index e7a5bdb1018..b5b58ab320c 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -417,6 +417,7 @@ in
 
   xf86videointel = attrs: attrs // {
     buildInputs = attrs.buildInputs ++ [xorg.libXfixes];
+    patches = [ ./xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch ];
   };
 
   xwd = attrs: attrs // {

From 8310045b14a50b246378ed9ad934a03b47646fb9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 16 Jun 2015 23:56:15 -0700
Subject: [PATCH 1251/2322] Add missing patch

---
 ...tel-2.99.917-libdrm-kernel-4_0-crash.patch | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 pkgs/servers/x11/xorg/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch

diff --git a/pkgs/servers/x11/xorg/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch b/pkgs/servers/x11/xorg/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch
new file mode 100644
index 00000000000..ea3aa30ed13
--- /dev/null
+++ b/pkgs/servers/x11/xorg/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch
@@ -0,0 +1,65 @@
+From 7fe2b2948652443ff43d907855bd7a051d54d309 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu, 19 Mar 2015 23:14:17 +0000
+Subject: sna: Protect against ABI breakage in recent versions of libdrm
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+diff --git a/src/sna/kgem.c b/src/sna/kgem.c
+index 11f0828..6f16cba 100644
+--- a/src/sna/kgem.c
++++ b/src/sna/kgem.c
+@@ -182,6 +182,15 @@ struct local_i915_gem_caching {
+ #define LOCAL_IOCTL_I915_GEM_SET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_SET_CACHING, struct local_i915_gem_caching)
+ #define LOCAL_IOCTL_I915_GEM_GET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_GET_CACHING, struct local_i915_gem_caching)
+ 
++struct local_i915_gem_mmap {
++	uint32_t handle;
++	uint32_t pad;
++	uint64_t offset;
++	uint64_t size;
++	uint64_t addr_ptr;
++};
++#define LOCAL_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct local_i915_gem_mmap)
++
+ struct local_i915_gem_mmap2 {
+ 	uint32_t handle;
+ 	uint32_t pad;
+@@ -514,15 +523,15 @@ retry_wc:
+ 
+ static void *__kgem_bo_map__cpu(struct kgem *kgem, struct kgem_bo *bo)
+ {
+-	struct drm_i915_gem_mmap mmap_arg;
++	struct local_i915_gem_mmap arg;
+ 	int err;
+ 
+ retry:
+-	VG_CLEAR(mmap_arg);
+-	mmap_arg.handle = bo->handle;
+-	mmap_arg.offset = 0;
+-	mmap_arg.size = bytes(bo);
+-	if ((err = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg))) {
++	VG_CLEAR(arg);
++	arg.handle = bo->handle;
++	arg.offset = 0;
++	arg.size = bytes(bo);
++	if ((err = do_ioctl(kgem->fd, LOCAL_IOCTL_I915_GEM_MMAP, &arg))) {
+ 		assert(err != EINVAL);
+ 
+ 		if (__kgem_throttle_retire(kgem, 0))
+@@ -536,10 +545,10 @@ retry:
+ 		return NULL;
+ 	}
+ 
+-	VG(VALGRIND_MAKE_MEM_DEFINED(mmap_arg.addr_ptr, bytes(bo)));
++	VG(VALGRIND_MAKE_MEM_DEFINED(arg.addr_ptr, bytes(bo)));
+ 
+ 	DBG(("%s: caching CPU vma for %d\n", __FUNCTION__, bo->handle));
+-	return bo->map__cpu = (void *)(uintptr_t)mmap_arg.addr_ptr;
++	return bo->map__cpu = (void *)(uintptr_t)arg.addr_ptr;
+ }
+ 
+ static int gem_write(int fd, uint32_t handle,
+-- 
+cgit v0.10.2
+

From fcd7b6829b4dee251b36153259d954c2731af0d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 17 Jun 2015 11:11:25 +0200
Subject: [PATCH 1252/2322] nix-repl: bump version to add support for current
 versions of Nix

---
 pkgs/tools/package-management/nix-repl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix
index 35f4f36b473..feba569d398 100644
--- a/pkgs/tools/package-management/nix-repl/default.nix
+++ b/pkgs/tools/package-management/nix-repl/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, nix, readline, boehmgc }:
 
-let rev = "f92408136ed08804bab14b3e2a2def9b8effd7eb"; in
+let rev = "45c6405a30bd1b2cb8ad6a94b23be8b10cf52069"; in
 
 stdenv.mkDerivation {
   name = "nix-repl-${lib.getVersion nix}-${lib.substring 0 7 rev}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     owner = "edolstra";
     repo = "nix-repl";
     inherit rev;
-    sha256 = "1vl36d3n7hrw4vy2n358zx210ygkj4lmd8zsiifna6x7w7q388bj";
+    sha256 = "0c6sifpz8j898xznvy9dvm44w4nysqprrhs553in19jwwkf7kryp";
   };
 
   buildInputs = [ nix readline ];

From bb2d249706fd010c2850b159d701bbc4037fc23a Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Wed, 17 Jun 2015 00:55:16 -0700
Subject: [PATCH 1253/2322] expose librhash

---
 pkgs/tools/security/rhash/default.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix
index 6a2710869bf..643053d9cac 100644
--- a/pkgs/tools/security/rhash/default.nix
+++ b/pkgs/tools/security/rhash/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "rhash-1.3.3";
+  version = "1.3.3";
+  name = "rhash-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/rhash/${name}-src.tar.gz";
@@ -10,9 +11,23 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "DESTDIR=$(out)" "PREFIX=/" ];
 
+  # we build the static library because of two makefile bugs
+  # * .h files installed for static library target only
+  # * .so.0 -> .so link only created in the static library install target
+  buildPhase = ''
+    make lib-shared lib-static build-shared
+  '';
+
+  # we don't actually want the static library, so we remove it after it
+  # gets installed
+  installPhase = ''
+    make DESTDIR="$out" PREFIX="/" install-shared install-lib-shared install-lib-static
+    rm $out/lib/librhash.a
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://rhash.anz.ru;
-    description = "Console utility for computing and verifying hash sums of files";
+    description = "Console utility and library for computing and verifying hash sums of files";
     platforms = platforms.linux;
   };
 }

From d7530a0630f454ab77e82ea9de133976defb1aaf Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 17 Jun 2015 14:03:16 +0200
Subject: [PATCH 1254/2322] nxproxy: nxcomp: fix "negotiation in stage 10"
 error

Apply backported upstream patch.
---
 pkgs/tools/admin/nxproxy/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix
index 6da78f60630..e9fe8f8f9c7 100644
--- a/pkgs/tools/admin/nxproxy/default.nix
+++ b/pkgs/tools/admin/nxproxy/default.nix
@@ -17,6 +17,10 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ nckx ];
   };
 
+  patches = [
+    ./0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch
+  ];
+
   buildInputs = [ autoreconfHook libxcomp ];
 
   preAutoreconf = ''

From 6563dd251fee81b50f5c27bc6e44c91829b51649 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 17 Jun 2015 14:44:44 +0100
Subject: [PATCH 1255/2322] tibia: update to 10.79

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

diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index 1e4d1ad7f3f..4d759c5f889 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 assert stdenv.isi686;
 stdenv.mkDerivation {
-  name = "tibia-10.78";
+  name = "tibia-10.79";
 
   src = fetchurl {
-    url = http://static.tibia.com/download/tibia1078.tgz;
-    sha256 = "087yi8jzi8bn1fp3b8lpp913bzdwf5nszv5p5gr6hx9xyhjj97ax";
+    url = http://static.tibia.com/download/tibia1079.tgz;
+    sha256 = "04wpg5hdfhcp12kk2va3jdijr2p9jfmfivgqrn3cnbblxi83k2sn";
   };
 
   shell = stdenv.shell;

From f93d8425c3897467798742d5f9ba871dca4a8e47 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Jun 2015 15:40:46 +0200
Subject: [PATCH 1256/2322] Installer test: Fix booting from SCSI

This is required by the GRUB 1 test.
---
 nixos/modules/virtualisation/qemu-vm.nix | 25 ++++++++++++++++++++----
 nixos/tests/installer.nix                |  5 ++++-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index dcb498493fa..15b0da3bab7 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -62,7 +62,7 @@ let
       extraDisks=""
       ${flip concatMapStrings cfg.emptyDiskImages (size: ''
         ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M"
-        extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx.qcow2,if=virtio,werror=report"
+        extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx.qcow2,if=${cfg.qemu.diskInterface},werror=report"
         idx=$((idx + 1))
       '')}
 
@@ -76,14 +76,14 @@ let
           -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \
           -virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \
           ${if cfg.useBootLoader then ''
-            -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
+            -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \
             -drive index=1,id=drive2,file=$TMPDIR/disk.img,media=disk \
             ${if cfg.useEFIBoot then ''
               -pflash $TMPDIR/bios.bin \
             '' else ''
             ''}
           '' else ''
-            -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
+            -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \
             -kernel ${config.system.build.toplevel}/kernel \
             -initrd ${config.system.build.toplevel}/initrd \
             -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
@@ -207,7 +207,7 @@ in
     virtualisation.bootDevice =
       mkOption {
         type = types.str;
-        default = "/dev/vda";
+        example = "/dev/vda";
         description =
           ''
             The disk to be used for the root filesystem.
@@ -318,6 +318,17 @@ in
             to keep the default runtime behaviour.
           '';
         };
+
+      diskInterface =
+        mkOption {
+          default = "virtio";
+          example = "scsi";
+          type = types.str;
+          description = ''
+            The interface used for the virtual hard disks
+            (<literal>virtio</literal> or <literal>scsi</literal>).
+          '';
+        };
     };
 
     virtualisation.useBootLoader =
@@ -393,6 +404,12 @@ in
         fi
       '';
 
+    boot.initrd.availableKernelModules =
+      optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx";
+
+    virtualisation.bootDevice =
+      mkDefault (if cfg.qemu.diskInterface == "scsi" then "/dev/sda" else "/dev/vda");
+
     virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
 
     virtualisation.qemu.options = [ "-vga std" "-usbdevice tablet" ];
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 4feed56cd67..32be1ea23b9 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -175,7 +175,10 @@ let
             # installer. This ensures the target disk (/dev/vda) is
             # the same during and after installation.
             virtualisation.emptyDiskImages = [ 512 ];
-            virtualisation.bootDevice = "/dev/vdb";
+            virtualisation.bootDevice =
+              if grubVersion == 1 then "/dev/sdb" else "/dev/vdb";
+            virtualisation.qemu.diskInterface =
+              if grubVersion == 1 then "scsi" else "virtio";
 
             hardware.enableAllFirmware = mkForce false;
 

From ee3768b9ba78fed67c95b8baa67355cd0304fe5c Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Wed, 17 Jun 2015 17:01:31 +0200
Subject: [PATCH 1257/2322] Make it possible to boot NixOS from a SCSI Disk on
 KVM

Currently NixOS can't boot from a SCSI disk as a KVM Guest.
I found this out while installing it on the new [Linode KVM
platform](https://www.linode.com/docs/platform/kvm#custom-kernel-configuration).
---
 nixos/modules/profiles/qemu-guest.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix
index 79890aa7f17..759fdb7f8e5 100644
--- a/nixos/modules/profiles/qemu-guest.nix
+++ b/nixos/modules/profiles/qemu-guest.nix
@@ -4,7 +4,7 @@
 { config, pkgs, ... }:
 
 {
-  boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "9p" "9pnet_virtio" ];
+  boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ];
   boot.initrd.kernelModules = [ "virtio_balloon" "virtio_console" "virtio_rng" ];
 
   boot.initrd.postDeviceCommands =

From 3d2a2fdd6ff836219c0003e9a105e5c8258bde3e Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 17 Jun 2015 17:50:53 +0200
Subject: [PATCH 1258/2322] pythonPackages: pelican upgrade to 3.6.0 and added
 ghp-import package

- added ghc-import, smartypants and typogrify packages. last 2 needed as
  a dependency for pelican buildInputs
- updated pelican to 3.6.0 and enable tests
- added myself (garbas) as maintainer to bunch of packages which I use.
- removed usage if python.isPypy and replace it with isPyPy
---
 pkgs/top-level/python-packages.nix | 117 +++++++++++++++++++++++------
 1 file changed, 94 insertions(+), 23 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9d2d1add713..e829be5a21e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1305,6 +1305,7 @@ let
       homepage = http://pythonhosted.org/blinker/;
       description = "Fast, simple object-to-object and broadcast signaling";
       license = licenses.mit;
+      maintainers = with maintainers; [ garbas ];
     };
   };
 
@@ -4904,8 +4905,9 @@ let
     doCheck = false;
 
     meta = {
-      homepage = http://docutils.sourceforge.net/;
       description = "An open-source text processing system for processing plaintext documentation into useful formats, such as HTML or LaTeX";
+      homepage = http://docutils.sourceforge.net/;
+      maintainers = with maintainers; [ garbas ];
     };
   };
 
@@ -5089,8 +5091,9 @@ let
     propagatedBuildInputs = with self; [ six pytz ];
 
     meta = {
-      homepage = https://github.com/dmdm/feedgenerator-py3k.git;
       description = "Standalone version of django.utils.feedgenerator,  compatible with Py3k";
+      homepage = https://github.com/dmdm/feedgenerator-py3k.git;
+      maintainers = with maintainers; [ garbas ];
     };
   });
 
@@ -6430,7 +6433,7 @@ let
       sha256 = "2e24ac5d004db5714976a04ac0e80c6df6e47e98c354cb2c0d82f8879d4f8fdb";
     };
 
-    propagatedBuildInputs = with self; [ self.markupsafe ];
+    propagatedBuildInputs = with self; [ markupsafe ];
 
     meta = {
       homepage = http://jinja.pocoo.org/;
@@ -6442,7 +6445,7 @@ let
         an optional sandboxed environment.
       '';
       platforms = platforms.all;
-      maintainers = with maintainers; [ pierron ];
+      maintainers = with maintainers; [ pierron garbas ];
     };
   };
 
@@ -6856,8 +6859,8 @@ let
     meta = {
       description = "Implements a XML/HTML/XHTML Markup safe string";
       homepage = http://dev.pocoo.org;
-      license = "BSD";
-      maintainers = with maintainers; [ iElectric ];
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ iElectric garbas ];
     };
   };
 
@@ -8434,33 +8437,46 @@ let
 
   pelican = buildPythonPackage rec {
     name = "pelican-${version}";
-    version = "3.5.0";
+    version = "3.6.0";
+    disabled = isPy26;
 
-    src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pelican/${name}.tar.gz";
-      sha256 = "0dl8i26sa20iijlg3z9gxn3p6f1d9v44b9742929xfaqwj4amvdp";
+    src = pkgs.fetchFromGitHub {
+      owner = "getpelican";
+      repo = "pelican";
+      rev = version;
+      sha256 = "0a9r90d85rn2cvl6yyk6q5i5kwz9igfj8fdwi37zsx4ijhmn2b5j";
     };
 
-    preConfigure = ''
-      export LC_ALL="en_US.UTF-8"
-    '';
-
-    # Test data not provided
-    #buildInputs = [nose mock];
-    doCheck = false;
-
-    buildInputs = [ pkgs.glibcLocales ];
+    buildInputs = with self; [
+      pkgs.glibcLocales
+      pkgs.pandoc
+      pkgs.git
+      mock
+      nose
+      markdown
+      beautifulsoup4
+      lxml
+      typogrify
+    ];
 
     propagatedBuildInputs = with self; [
       jinja2 pygments docutils pytz unidecode six dateutil feedgenerator
       blinker pillow beautifulsoup4 markupsafe
     ];
 
+    postPatch= ''
+      sed -i -e "s|'git'|'${pkgs.git}/bin/git'|" pelican/tests/test_pelican.py
+    '';
+
+    preConfigure = ''
+      export LC_ALL="en_US.UTF-8"
+    '';
+
     meta = {
-      homepage = http://getpelican.com/;
       description = "A tool to generate a static blog from reStructuredText or Markdown input files";
+      homepage = "http://getpelican.com/";
       license = licenses.agpl3;
-      maintainers = with maintainers; [ offline prikhi ];
+      maintainers = with maintainers; [ offline prikhi garbas ];
     };
   };
 
@@ -9635,7 +9651,7 @@ let
       homepage = http://pygments.org/;
       description = "A generic syntax highlighter";
       license = licenses.bsd2;
-      maintainers = with maintainers; [ nckx ];
+      maintainers = with maintainers; [ nckx garbas ];
     };
   };
 
@@ -14191,7 +14207,7 @@ let
       md5 = "6c73c5b668a67fdc116a25b884058ed9";
     };
 
-    doCheck = !(python.isPypy or false);
+    doCheck = !isPyPy;
 
     propagatedBuildInputs = with self; [ zope_interface zope_exceptions zope_location ];
 
@@ -15889,4 +15905,59 @@ let
     };
   };
 
+  ghp-import = buildPythonPackage rec {
+    version = "0.4.1";
+    name = "ghp-import-${version}";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/g/ghp-import/${name}.tar.gz";
+      md5 = "99e018372990c03ab355aa62c34965c5";
+    };
+    disabled = isPyPy;
+    buildInputs = [ pkgs.glibcLocales ];
+    preConfigure = ''
+      export LC_ALL="en_US.UTF-8"
+    '';
+    meta = {
+      description = "Copy your docs directly to the gh-pages branch.";
+      homepage = "http://github.com/davisp/ghp-import";
+      license = "Tumbolia Public License";
+      maintainers = with maintainers; [ garbas ];
+    };
+  };
+
+  typogrify = buildPythonPackage rec {
+    name = "typogrify-2.0.7";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/t/typogrify/${name}.tar.gz";
+      md5 = "63f38f80531996f187d2894cc497ba08";
+    };
+    disabled = isPyPy;
+    propagatedBuildInputs = with self; [ smartypants ];
+    meta = {
+      description = "Filters to enhance web typography, including support for Django & Jinja templates";
+      homepage = "https://github.com/mintchaos/typogrify";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ garbas ];
+    };
+  };
+
+  smartypants = buildPythonPackage rec {
+    version = "1.8.6";
+    name = "smartypants-${version}";
+    src = pkgs.fetchhg {
+      url = "https://bitbucket.org/livibetter/smartypants.py";
+      rev = "v${version}";
+      sha256 = "1cmzz44d2hm6y8jj2xcq1wfr26760gi7iq92ha8xbhb1axzd7nq6";
+    };
+    disabled = isPyPy;
+    buildInputs = with self; [ ]; #docutils pygments ];
+    meta = {
+      description = "Python with the SmartyPants";
+      homepage = "https://bitbucket.org/livibetter/smartypants.py";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ garbas ];
+    };
+  };
+
+
 }; in pythonPackages

From 8170e74d9f3bad81dfc8dbe7ba0ef4dd760a6f8b Mon Sep 17 00:00:00 2001
From: Rushmore Mushambi <rushmore@webenchanter.com>
Date: Wed, 17 Jun 2015 19:13:08 +0200
Subject: [PATCH 1259/2322] Revert "Make it possible to boot NixOS from a SCSI
 Disk on KVM"

---
 nixos/modules/profiles/qemu-guest.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix
index 759fdb7f8e5..79890aa7f17 100644
--- a/nixos/modules/profiles/qemu-guest.nix
+++ b/nixos/modules/profiles/qemu-guest.nix
@@ -4,7 +4,7 @@
 { config, pkgs, ... }:
 
 {
-  boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ];
+  boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "9p" "9pnet_virtio" ];
   boot.initrd.kernelModules = [ "virtio_balloon" "virtio_console" "virtio_rng" ];
 
   boot.initrd.postDeviceCommands =

From d9c56c696f2b05571a6b9b8db1f7e0d83081e852 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Wed, 17 Jun 2015 19:26:17 +0200
Subject: [PATCH 1260/2322] Replaces https://github.com/NixOS/nixpkgs/pull/8368

---
 nixos/modules/profiles/all-hardware.nix | 2 +-
 nixos/modules/profiles/qemu-guest.nix   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 6385ee69500..99b45228ce4 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -40,7 +40,7 @@
       "ohci1394" "sbp2"
 
       # Virtio (QEMU, KVM etc.) support.
-      "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_console"
+      "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console"
 
       # Keyboards
       "usbhid" "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat"
diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix
index 79890aa7f17..759fdb7f8e5 100644
--- a/nixos/modules/profiles/qemu-guest.nix
+++ b/nixos/modules/profiles/qemu-guest.nix
@@ -4,7 +4,7 @@
 { config, pkgs, ... }:
 
 {
-  boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "9p" "9pnet_virtio" ];
+  boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ];
   boot.initrd.kernelModules = [ "virtio_balloon" "virtio_console" "virtio_rng" ];
 
   boot.initrd.postDeviceCommands =

From 5093fd9cc90dc975d3a1aebb2ed6fe70506582dd Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Tue, 16 Jun 2015 00:10:09 +0200
Subject: [PATCH 1261/2322] added drive package

---
 .../applications/networking/drive/default.nix |  29 ++++
 pkgs/top-level/all-packages.nix               |   2 +
 pkgs/top-level/go-packages.nix                | 138 ++++++++++++++++++
 3 files changed, 169 insertions(+)
 create mode 100644 pkgs/applications/networking/drive/default.nix

diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix
new file mode 100644
index 00000000000..0af104fa380
--- /dev/null
+++ b/pkgs/applications/networking/drive/default.nix
@@ -0,0 +1,29 @@
+{ lib, goPackages, fetchFromGitHub }:
+
+with goPackages;
+
+buildGoPackage rec {
+  rev = "4530cf8d59e1047cb1c005a6bd5b14ecb98b9e68";
+  name = "drive-${lib.strings.substring 0 7 rev}";
+  goPackagePath = "github.com/odeke-em/drive";
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "odeke-em";
+    repo = "drive";
+    sha256 = "1y4qlzvgg84mh8l6bhaazzy6bv6dwjcbpm0rxvvc5aknvvh581ps";
+  };
+
+  subPackages = [ "cmd/drive" ];
+
+  buildInputs = [ pb go-isatty command dts odeke-em.log statos xon odeke-em.google-api-go-client cli-spinner oauth2 text net ];
+
+  dontInstallSrc = true;
+
+  meta = with lib; {
+    description = "A tiny program to pull or push Google Drive files";
+    homepage = https://github.com/odeke-em/drive;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ bobvanderlinden ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7a08a42898..cbd2d12e21f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1278,6 +1278,8 @@ let
 
   doomseeker = callPackage ../applications/misc/doomseeker { };
 
+  drive = callPackage ../applications/networking/drive { };
+
   dropbear = callPackage ../tools/networking/dropbear { };
 
   dtach = callPackage ../tools/misc/dtach { };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index b60ccfdb0de..b08b0ea170a 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -348,6 +348,18 @@ let
     propagatedBuildInputs = [ crypto ];
   };
 
+  cli-spinner = buildGoPackage rec {
+    rev = "610063bb4aeef25f7645b3e6080456655ec0fb33";
+    name = "cli-spinner-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/odeke-em/cli-spinner";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "odeke-em";
+      repo = "cli-spinner";
+      sha256 = "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c";
+    };
+  };
+
   cobra = buildGoPackage rec {
     date = "20140617";
     rev = "10a8494a87448bf5003222d9974f166437e7f042";
@@ -374,6 +386,18 @@ let
     };
   };
 
+  command = buildGoPackage rec {
+    rev = "076a2ad5f3a7ec92179f2d57208728432280ec4e";
+    name = "command-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/odeke-em/command";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "odeke-em";
+      repo = "command";
+      sha256 = "093as4kxlabk3hrsd52kr9fhl6qafr4ghg89cjyglsva0mk0n7sb";
+    };
+  };
+
   copystructure = buildGoPackage rec {
     rev = "6fc66267e9da7d155a9d3bd489e00dad02666dc6";
     name = "copystructure-${stdenv.lib.strings.substring 0 7 rev}";
@@ -574,6 +598,18 @@ let
     };
   };
 
+  dts = buildGoPackage rec {
+    rev = "ec2daabf2f9078e887405f7bcddb3d79cb65502d";
+    name = "dts-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/odeke-em/dts";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "odeke-em";
+      repo = "dts";
+      sha256 = "0vq3cz4ab9vdsz9s0jjlp7z27w218jjabjzsh607ps4i8m5d441s";
+    };
+  };
+
   ed25519 = buildGoPackage rec {
     rev = "d2b94fd789ea21d12fac1a4443dd3a3f79cda72c";
     name = "ed25519-${stdenv.lib.strings.substring 0 7 rev}";
@@ -886,6 +922,23 @@ let
     buildInputs = [ net ];
   };
 
+  odeke-em.google-api-go-client = buildGoPackage rec {
+    rev = "30f4c144b02321ebbc712f35dc95c3e72a5a7fdc";
+    name = "odeke-em-google-api-go-client-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/odeke-em/google-api-go-client";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "odeke-em";
+      repo = "google-api-go-client";
+      sha256 = "1fidlljxnd82i2r9yia0b9gh0vv3hwb5k65papnvw7sqpc4sriby";
+    };
+    preBuild = ''
+      rm -rf go/src/${goPackagePath}/examples
+    '';
+    buildInputs = [ net ];
+    propagatedBuildInputs = [ google-api-go-client ];
+  };
+
   gopass = buildGoPackage rec {
     rev = "2c70fa70727c953c51695f800f25d6b44abb368e";
     name = "gopass-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1128,6 +1181,18 @@ let
     };
   };
 
+  go-isatty = buildGoPackage rec {
+    rev = "ae0b1f8f8004be68d791a576e3d8e7648ab41449";
+    name = "go-isatty-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/mattn/go-isatty";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "mattn";
+      repo = "go-isatty";
+      sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj";
+    };
+  };
+
   go-log = buildGoPackage rec {
     rev = "70d039bee4b0e389e5be560491d8291708506f59";
     name = "go-log-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1157,6 +1222,19 @@ let
     buildInputs = [ influxdb stathat ];
   };
 
+  appengine = buildGoPackage rec {
+    rev = "25b8450bec636c6b6e3b9b33d3a3f55230b10812";
+    name = "appengine-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "google.golang.org/appengine";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "golang";
+      repo = "appengine";
+      sha256 = "1b0v244hmw8078601v18xda501aix0kw4q2m1g3ai33dl0p2dh2n";
+    };
+    buildInputs = [ protobuf net ];
+  };
+
   armon.go-metrics = buildGoPackage rec {
     rev = "a54701ebec11868993bc198c3f315353e9de2ed6";
     name = "armon.go-metrics-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1577,6 +1655,18 @@ let
     };
   };
 
+  odeke-em.log = buildGoPackage rec {
+    rev = "cad53c4565a0b0304577bd13f3862350bdc5f907";
+    name = "log-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/odeke-em/log";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "odeke-em";
+      repo = "log";
+      sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w";
+    };
+  };
+
   log4go = buildGoPackage rec {
     rev = "cb4cc51cd03958183d3b637d0750497d88c2f7a8";
     name = "log4go-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1911,6 +2001,18 @@ let
     };
   };
 
+  pb = buildGoPackage rec {
+    rev = "e648e12b78cedf14ebb2fc1855033f07b034cfbb";
+    name = "pb-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/cheggaaa/pb";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "cheggaaa";
+      repo = "pb";
+      sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam";
+    };
+  };
+
   beorn7.perks = buildGoPackage rec {
     rev = "b965b613227fddccbfffe13eae360ed3fa822f8d";
     name = "beorn7.perks-${stdenv.lib.strings.substring 0 7 rev}";
@@ -2175,6 +2277,18 @@ let
     };
   };
 
+  ripper = buildGoPackage rec {
+    rev = "bd1a682568fcb8a480b977bb5851452fc04f9ccb";
+    name = "ripper-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/odeke-em/ripper";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "odeke-em";
+      repo = "ripper";
+      sha256 = "010jsclnmkaywdlyfqdmq372q7kh3qbz2zra0c4wn91qnkmkrnw1";
+    };
+  };
+
   sandblast = buildGoPackage rec {
     rev = "694d24817b9b7b8bacb6d458b7989b30d7fe3555";
     name = "sandblast-${stdenv.lib.strings.substring 0 7 rev}";
@@ -2285,6 +2399,18 @@ let
     };
   };
 
+  statos = buildGoPackage rec {
+    rev = "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6";
+    name = "statos-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/odeke-em/statos";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "odeke-em";
+      repo = "statos";
+      sha256 = "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs";
+    };
+  };
+
   statik = buildGoPackage rec {
     rev = "274df120e9065bdd08eb1120e0375e3dc1ae8465";
     name = "statik-${stdenv.lib.strings.substring 0 7 rev}";
@@ -2469,4 +2595,16 @@ let
     };
   };
 
+  xon = buildGoPackage rec {
+    rev = "d580be739d723da4f6378083128f93017b8ab295";
+    name = "xon-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/odeke-em/xon";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "odeke-em";
+      repo = "xon";
+      sha256 = "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc";
+    };
+  };
+
 }; in self

From 361cf81f30d627c811108963873fadf8f045bd54 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Tue, 16 Jun 2015 22:27:39 +0200
Subject: [PATCH 1262/2322] goPackages: oauth2: use propagatedBuildInputs
 instead of extraSrcs

---
 pkgs/top-level/go-packages.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index b08b0ea170a..ce8e529a921 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -84,11 +84,7 @@ let
       sha256 = "0hi54mm63ha7a75avydj6xm0a4dd2njdzllr9y2si1i1wnijqw2i";
     };
 
-    extraSrcs = [
-      { inherit (gcloud-golang) src goPackagePath; }
-    ];
-
-    propagatedBuildInputs = [ net ];
+    propagatedBuildInputs = [ net gcloud-golang-compute-metadata ];
   };
 
 

From d4fc2b4d99122ba6592835aa84f659b22aeea433 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 17 Jun 2015 11:47:36 -0700
Subject: [PATCH 1263/2322] nixos/install-grub: Fix grub1 installation

---
 .../modules/system/boot/loader/grub/install-grub.pl  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 9db4c4003c9..cad9013bf5a 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -502,6 +502,14 @@ my $efiDiffer = ($efiTarget eq \$prevGrubState->efi);
 my $efiMountPointDiffer = ($efiSysMountPoint eq \$prevGrubState->efiMountPoint);
 my $requireNewInstall = $devicesDiffer || $versionDiffer || $efiDiffer || $efiMountPointDiffer || (($ENV{'NIXOS_INSTALL_GRUB'} // "") eq "1");
 
+# install a symlink so that grub can detect the boot drive when set
+# as the root directory
+if (! -l "$bootPath/boot") {
+    if (-e "$bootPath/boot") {
+        unlink "$bootPath/boot";
+    }
+    symlink ".", "$bootPath/boot";
+}
 
 # install non-EFI GRUB
 if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) {
@@ -509,10 +517,10 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) {
         next if $dev eq "nodev";
         print STDERR "installing the GRUB $grubVersion boot loader on $dev...\n";
         if ($grubTarget eq "") {
-            system("$grub/sbin/grub-install", "--recheck", "--boot-directory=$bootPath", Cwd::abs_path($dev)) == 0
+            system("$grub/sbin/grub-install", "--recheck", "--root-directory=$bootPath", Cwd::abs_path($dev)) == 0
                 or die "$0: installation of GRUB on $dev failed\n";
         } else {
-            system("$grub/sbin/grub-install", "--recheck", "--boot-directory=$bootPath", "--target=$grubTarget", Cwd::abs_path($dev)) == 0
+            system("$grub/sbin/grub-install", "--recheck", "--root-directory=$bootPath", "--target=$grubTarget", Cwd::abs_path($dev)) == 0
                 or die "$0: installation of GRUB on $dev failed\n";
         }
     }

From 98b2d7b727491f18e2f3e0bba17611e95e6e8016 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 17 Jun 2015 19:36:06 +0200
Subject: [PATCH 1264/2322] Separate nativeBuildInputs where maintainers |=
 nckx

---
 pkgs/applications/editors/neovim/default.nix          | 11 ++++++-----
 pkgs/applications/graphics/apitrace/default.nix       |  3 ++-
 pkgs/applications/graphics/simple-scan/default.nix    |  5 +++--
 .../networking/remote/x2goclient/default.nix          |  3 ++-
 pkgs/development/compilers/squeak/default.nix         |  5 +++--
 pkgs/development/libraries/bobcat/default.nix         |  4 ++--
 .../libraries/libnetfilter_conntrack/default.nix      |  3 ++-
 pkgs/development/libraries/libpsl/default.nix         |  3 ++-
 pkgs/development/libraries/libxcomp/default.nix       |  3 ++-
 pkgs/development/tools/analysis/coan/default.nix      |  2 +-
 pkgs/development/tools/parsing/flexc++/default.nix    |  3 ++-
 pkgs/games/eduke32/default.nix                        |  3 ++-
 pkgs/misc/drivers/hplip/default.nix                   |  4 +++-
 pkgs/os-specific/linux/radeontop/default.nix          |  3 ++-
 pkgs/servers/nosql/cassandra/2.0.nix                  |  2 +-
 pkgs/servers/nosql/cassandra/2.1.nix                  |  2 +-
 pkgs/tools/admin/nxproxy/default.nix                  |  3 ++-
 pkgs/tools/compression/xdelta/default.nix             |  2 +-
 pkgs/tools/filesystems/boxfs/default.nix              |  3 ++-
 pkgs/tools/filesystems/duff/default.nix               |  2 +-
 pkgs/tools/filesystems/encfs/default.nix              |  3 ++-
 pkgs/tools/filesystems/exfat-utils/default.nix        |  2 +-
 pkgs/tools/filesystems/fuse-exfat/default.nix         |  3 ++-
 pkgs/tools/filesystems/mp3fs/default.nix              |  3 ++-
 pkgs/tools/misc/gparted/default.nix                   |  5 ++---
 pkgs/tools/networking/httping/default.nix             |  3 ++-
 pkgs/tools/networking/ipv6calc/default.nix            |  3 ++-
 pkgs/tools/package-management/dpkg/default.nix        |  3 ++-
 pkgs/tools/security/eid-mw/default.nix                |  3 ++-
 pkgs/tools/security/eid-viewer/default.nix            |  3 ++-
 30 files changed, 61 insertions(+), 39 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 3943a9910a4..28d455e06b2 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -27,7 +27,8 @@ let
       owner = "neovim";
     };
 
-    buildInputs = [ libtool perl ];
+    buildInputs = [ perl ];
+    nativeBuildInputs = [ libtool ];
 
     makeFlags = [ "PREFIX=$(out)" ]
       ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
@@ -66,8 +67,6 @@ let
     enableParallelBuilding = true;
 
     buildInputs = [
-      makeWrapper
-      cmake
       glib
       libtermkey
       libuv
@@ -79,12 +78,14 @@ let
       libmsgpack
       ncurses
       neovimLibvterm
-      pkgconfig
       unibilium
     ] ++ optional withJemalloc jemalloc;
 
     nativeBuildInputs = [
+      cmake
       gettext
+      makeWrapper
+      pkgconfig
     ];
 
     LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so";
@@ -136,7 +137,7 @@ let
 
 in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation rec {
   name = "neovim-${version}-configured";
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
   buildCommand = ''
     mkdir -p $out/bin
     for item in ${neovim}/bin/*; do
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index 348ba5c3c2c..8e546652f85 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation {
     owner = "apitrace";
   };
 
-  buildInputs = [ cmake python libX11 qt4 ];
+  buildInputs = [ python libX11 qt4 ];
+  nativeBuildInputs = [ cmake ];
 
   buildPhase = ''
     cmake
diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index ad825eceec2..b96688333a2 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -26,8 +26,9 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ cairo colord glib gtk3 intltool itstool libxml2 makeWrapper
-    pkgconfig saneBackends systemd vala ];
+  buildInputs = [ cairo colord glib gtk3 intltool itstool libxml2
+    saneBackends systemd vala ];
+  nativeBuildInputs = [ makeWrapper pkgconfig ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 328a156260b..4353f251038 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ cups libssh libXpm nxproxy openldap makeWrapper qt4 ];
+  buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ];
+  nativeBuildInputs [ makeWrapper ];
 
   patchPhase = ''
      substituteInPlace Makefile \
diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix
index 816803d4bd9..6e68defb624 100644
--- a/pkgs/development/compilers/squeak/default.nix
+++ b/pkgs/development/compilers/squeak/default.nix
@@ -28,8 +28,9 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ cmake coreutils dbus freetype glib gnused libpthreadstubs
-    pango pkgconfig libpulseaudio which ];
+  buildInputs = [ coreutils dbus freetype glib gnused libpthreadstubs
+    pango libpulseaudio which ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
   postPatch = ''
     for i in squeak.in squeak.sh.in; do
diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index abd8a284e62..791dab2d17a 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ gcc49 icmake libmilter libX11 openssl readline utillinux
-    yodl ];
+  buildInputs = [ gcc49 libmilter libX11 openssl readline utillinux ];
+  nativeBuildInputs = [ icmake yodl ];
 
   postPatch = ''
     substituteInPlace INSTALL.im --replace /usr $out
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index a1a343de0e2..0e10161a75a 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "0zcwjav1qgr7ikmvfmy7g3nc7s1kj4j4939d18mpyha9mwy4mv6r";
   };
 
-  buildInputs = [ pkgconfig libmnl ];
+  buildInputs = [ libmnl ];
   propagatedBuildInputs = [ libnfnetlink ];
+  nativeBuildInputs = [ pkgconfig ];
 
   meta = with stdenv.lib; {
     description = "Userspace library providing an API to the in-kernel connection tracking state table";
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index 4a2d7be7b8b..c304b9e6930 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ autoreconfHook icu libxslt pkgconfig ];
+  buildInputs = [ icu libxslt ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   configureFlags = "--disable-static --enable-man";
 
diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix
index 3a7ca70a85f..ed9e4b26944 100644
--- a/pkgs/development/libraries/libxcomp/default.nix
+++ b/pkgs/development/libraries/libxcomp/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ autoreconfHook libjpeg libpng12 libX11 zlib ];
+  buildInputs = [ libjpeg libpng12 libX11 zlib ];
+  nativeBuildInputs = [ autoreconfHook ];
 
   preAutoreconf = ''
     cd nxcomp/
diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix
index ce9b8a9a59d..dd550064e26 100644
--- a/pkgs/development/tools/analysis/coan/default.nix
+++ b/pkgs/development/tools/analysis/coan/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44";
   };
 
-  buildInputs = [ perl ];
+  nativeBuildInputs = [ perl ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix
index 0a7e2530526..515fb9d251f 100644
--- a/pkgs/development/tools/parsing/flexc++/default.nix
+++ b/pkgs/development/tools/parsing/flexc++/default.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ bobcat gcc49 icmake yodl ];
+  buildInputs = [ bobcat gcc49 ];
+  nativeBuildInputs = [ icmake yodl ];
 
   postPatch = ''
     substituteInPlace INSTALL.im --replace /usr $out
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index 46cd66d22af..e0c5798d48d 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -13,8 +13,9 @@ in stdenv.mkDerivation rec {
     sha256 = "1nlq5jbglg00c1z1vsyl627fh0mqfxvk5qyxav5vzla2b4svik2v";
   };
 
-  buildInputs = [ flac gtk libvorbis libvpx mesa pkgconfig SDL2 SDL2_mixer ]
+  buildInputs = [ flac gtk libvorbis libvpx mesa SDL2 SDL2_mixer ]
     ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
+  nativeBuildInputs = [ pkgconfig ];
 
   postPatch = ''
     substituteInPlace build/src/glbuild.c \
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 09fa67d7dcd..ba64b729393 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -139,9 +139,11 @@ stdenv.mkDerivation {
       pythonPackages.wrapPython
       saneBackends
       dbus
-      pkgconfig
       net_snmp
     ] ++ stdenv.lib.optional qtSupport qt4;
+  nativeBuildInputs = [
+    pkgconfig
+  ];
 
   pythonPath = with pythonPackages; [
       dbus
diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix
index 99100b85cb6..05442abc5e8 100644
--- a/pkgs/os-specific/linux/radeontop/default.nix
+++ b/pkgs/os-specific/linux/radeontop/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation {
     owner = "clbr";
   };
 
-  buildInputs = [ pkgconfig gettext ncurses libdrm libpciaccess ];
+  buildInputs = [ ncurses libdrm libpciaccess ];
+  nativeBuildInputs = [ pkgconfig gettext ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix
index a0392d0f95a..4f27452a065 100644
--- a/pkgs/servers/nosql/cassandra/2.0.nix
+++ b/pkgs/servers/nosql/cassandra/2.0.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz";
   };
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
     mkdir $out
diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix
index 5d99af41cb2..94f920ffe11 100644
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/pkgs/servers/nosql/cassandra/2.1.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz";
   };
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
     mkdir $out
diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix
index e9fe8f8f9c7..20b8f4059ad 100644
--- a/pkgs/tools/admin/nxproxy/default.nix
+++ b/pkgs/tools/admin/nxproxy/default.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation {
     ./0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch
   ];
 
-  buildInputs = [ autoreconfHook libxcomp ];
+  buildInputs = [ libxcomp ];
+  nativeBuildInputs = [ autoreconfHook ];
 
   preAutoreconf = ''
     cd nxproxy/
diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index 5355138ac8c..68c4ea809be 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "jmacd";
   };
 
-  buildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook ];
 
   postPatch = ''
     cd xdelta3
diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix
index 69c2d046f1c..e82e720c11b 100644
--- a/pkgs/tools/filesystems/boxfs/default.nix
+++ b/pkgs/tools/filesystems/boxfs/default.nix
@@ -34,7 +34,8 @@ in stdenv.mkDerivation {
 
   patches = [ ./work-around-API-borkage.patch ];
 
-  buildInputs = [ curl fuse libxml2 pkgconfig ];
+  buildInputs = [ curl fuse libxml2 ];
+  nativeBuildInputs = [ pkgconfig ];
 
   buildFlags = "static";
 
diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix
index 59cb07dead0..edb69aaef5c 100644
--- a/pkgs/tools/filesystems/duff/default.nix
+++ b/pkgs/tools/filesystems/duff/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "elmindreda";
   };
 
-  buildInputs = [ autoreconfHook gettext ];
+  nativeBuildInputs = [ autoreconfHook gettext ];
 
   preAutoreconf = ''
     # duff is currently badly packaged, requiring us to do extra work here that
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index 211690606ef..d85440c5475 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
     owner = "vgough";
   };
 
-  buildInputs = [ autoreconfHook boost fuse openssl perl pkgconfig rlog ];
+  buildInputs = [ boost fuse openssl rlog ];
+  nativeBuildInputs = [ autoreconfHook perl pkgconfig ];
 
   configureFlags = [
     "--with-boost-serialization=boost_wserialization"
diff --git a/pkgs/tools/filesystems/exfat-utils/default.nix b/pkgs/tools/filesystems/exfat-utils/default.nix
index 3215b0d9174..eb7977c71a3 100644
--- a/pkgs/tools/filesystems/exfat-utils/default.nix
+++ b/pkgs/tools/filesystems/exfat-utils/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ scons ];
+  nativeBuildInputs = [ scons ];
 
   buildPhase = ''
     export CCFLAGS="-std=c99"
diff --git a/pkgs/tools/filesystems/fuse-exfat/default.nix b/pkgs/tools/filesystems/fuse-exfat/default.nix
index ae9f9e32fa8..ef8bf5845dd 100644
--- a/pkgs/tools/filesystems/fuse-exfat/default.nix
+++ b/pkgs/tools/filesystems/fuse-exfat/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     name = "${name}.tar.gz";
   };
 
-  buildInputs = [ pkgconfig fuse scons ];
+  buildInputs = [ fuse ];
+  nativeBuildInputs = [ pkgconfig scons ];
 
   buildPhase = ''
     export CCFLAGS="-O2 -Wall -std=c99 -I${fuse}/include"
diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix
index 23ee5558e14..8859aa003eb 100644
--- a/pkgs/tools/filesystems/mp3fs/default.nix
+++ b/pkgs/tools/filesystems/mp3fs/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./fix-statfs-operation.patch ];
 
-  buildInputs = [ flac fuse lame libid3tag pkgconfig ];
+  buildInputs = [ flac fuse lame libid3tag ];
+  nativeBuildInputs = [ pkgconfig ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 464e40ec014..84709010118 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -12,9 +12,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--disable-doc";
 
-  buildInputs = [
-    parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2 hicolor_icon_theme
-  ];
+  buildInputs = [ parted gtk glib libuuid gtkmm libxml2 hicolor_icon_theme ];
+  nativeBuildInputs = [ intltool gettext pkgconfig ];
 
   meta = with stdenv.lib; {
     description = "Graphical disk partitioning tool";
diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix
index 9243550a1b1..9389d17900b 100644
--- a/pkgs/tools/networking/httping/default.nix
+++ b/pkgs/tools/networking/httping/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "1110r3gpsj9xmybdw7w4zkhj3zmn5mnv2nq0ijbvrywbn019zdfs";
   };
 
-  buildInputs = [ gettext ncurses ];
+  buildInputs = [ ncurses ];
+  nativeBuildInputs = [ gettext ];
 
   makeFlags = [
     "DESTDIR=$(out)"
diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index f1abec0faf7..102d0688234 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "02r0r4lgz10ivbmgdzivj7dvry1aad75ik9vyy6irjvngjkzg5r3";
   };
 
-  buildInputs = [ geoip geolite-legacy getopt openssl perl ];
+  buildInputs = [ geoip geolite-legacy getopt openssl ];
+  nativeBuildInputs = [ perl ];
 
   patchPhase = ''
     for i in {,databases/}lib/Makefile.in; do
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index e5be41ed7f6..dbe1e665411 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -33,7 +33,8 @@ stdenv.mkDerivation {
     done
   '';
 
-  buildInputs = [ perl zlib bzip2 xz makeWrapper ];
+  buildInputs = [ perl zlib bzip2 xz ];
+  nativeBuildInputs [ makeWrapper ];
 
   postInstall =
     ''
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 1833d460081..e02c58d3825 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
     owner = "Fedict";
   };
 
-  buildInputs = [ autoreconfHook gtk2 pcsclite pkgconfig ];
+  buildInputs = [ gtk2 pcsclite ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix
index 06307263e52..f2dfd58a7fb 100644
--- a/pkgs/tools/security/eid-viewer/default.nix
+++ b/pkgs/tools/security/eid-viewer/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "e263e6751ef7c185e278a607fdc46c207306d9a56c6ddb2ce6f58fb4464a2893";
   };
 
-  buildInputs = [ jre makeWrapper pcsclite ];
+  buildInputs = [ jre pcsclite ];
+  nativeBuildInputs = [ makeWrapper ];
 
   unpackPhase = "tar -xzf ${src} --strip-components=1";
 

From c544a2b74bffdbf9c1bf8017f60eb294440779ca Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 17 Jun 2015 22:24:12 +0200
Subject: [PATCH 1265/2322] nxproxy: add patch file...

---
 ...otiation-in-stage-10-error.full+lite.patch | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 pkgs/tools/admin/nxproxy/0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch

diff --git a/pkgs/tools/admin/nxproxy/0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch b/pkgs/tools/admin/nxproxy/0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch
new file mode 100644
index 00000000000..3d4c584fb07
--- /dev/null
+++ b/pkgs/tools/admin/nxproxy/0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch
@@ -0,0 +1,67 @@
+commit f982cbc85e9ffff24a6a348c3637b54a7e8cbc34
+Author: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
+Date:   Wed May 20 15:47:45 2015 +0200
+
+Fix negotiation in stage 10 error
+
+Problem fixed by adding a select() call to implement a timeout,
+and retrying writes if needed.
+
+v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)
+
+--- a/nxcomp/Loop.cpp
++++ b/nxcomp/Loop.cpp
+@@ -8073,16 +8073,52 @@ int ReadRemoteData(int fd, char *buffer,
+ int WriteLocalData(int fd, const char *buffer, int size)
+ {
+   int position = 0;
++  int ret = 0;
++  fd_set writeSet;
++  struct timeval selectTs = {30, 0};
+ 
+   while (position < size)
+   {
++
++    // A write to a non-blocking socket may fail with EAGAIN. The problem is
++    // that cache data is done in several writes, and there's no easy way
++    // to handle failure without rewriting a significant amount of code.
++    //
++    // Bailing out of the outer loop would result in restarting the sending
++    // of the entire cache list, which would confuse the other side.
++
++    FD_ZERO(&writeSet);
++    FD_SET(fd, &writeSet);
++
++    ret = select(fd+1, NULL, &writeSet, NULL, &selectTs);
++
++    #ifdef DEBUG
++    *logofs << "Loop: WriteLocalData: select() returned with a code of " << ret << " and remaining timeout of "
++            << selectTs.tv_sec << " sec, " << selectTs.tv_usec << "usec\n" << logofs_flush;
++    #endif
++
++    if ( ret < 0 )
++    {
++      *logofs << "Loop: Error in select() when writing data to FD#" << fd << ": " << strerror(EGET()) << "\n" << logofs_flush;
++
++      if ( EGET() == EINTR )
++        continue;
++
++      return -1;
++    }
++    else if ( ret == 0 )
++    {
++      *logofs << "Loop: Timeout expired in select() when writing data to FD#" << fd << ": " << strerror(EGET()) << "\n" << logofs_flush;
++      return -1;
++    }
++
+     int result = write(fd, buffer + position, size - position);
+ 
+     getNewTimestamp();
+ 
+     if (result <= 0)
+     {
+-      if (result < 0 && EGET() == EINTR)
++      if (result < 0 && (EGET() == EINTR || EGET() == EAGAIN || EGET() == EWOULDBLOCK))
+       {
+         continue;
+       }

From c78005aac20f252e468be1d5f3a88bdf0fa1370e Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Wed, 17 Jun 2015 13:57:30 -0700
Subject: [PATCH 1266/2322] fix typos in CONTRIBUTING.md

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 519b2180b01..195d1ae6d0a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -44,7 +44,7 @@
     * _If you don't want to install pkg in you profile_. 
       * `nix-build -A pkg-attribute-name <path to your local nixpkgs folder>/default.nix` and check results in the folder `result`. It will appear in the same directory where you did `nix-build`.
     * If you did `nix-env -i pkg-name` you can do `nix-env -e pkg-name` to uninstall it from your system.
-  * nixos and it's modules
+  * nixos and its modules
     * You can add new module to you `nixos-configuration file` (usually it's `/etc/nixos/configuration.nix`.  
     And do `sudo nixos-rebuild test -I nixpkgs=<path to your local nixpkgs folder> --fast`
 * If you have commits `pkg-name: oh, forgot to insert whitespace`: squash commits in this case. Use `git rebase -i`.
@@ -56,7 +56,7 @@
 * Create pull request.
   * Write the title in format `(pkg-name | service): improvement`
     * If you update the pkg, write versions `from -> to`
-  * Write in comment if you have tested your patch. Do not rely much on `TravisCL`.
+  * Write in comment if you have tested your patch. Do not rely much on `TravisCI`.
   * If you make an improvement, write why is it good.
   * Notify maintainers of the package. For example add to the message: `cc @jagajaga @domenkozar`
 

From ef421d6f9b1d587b5e807e5ce3e1c2d79d44ef8b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 14:38:33 +0200
Subject: [PATCH 1267/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/0a970838946d127ccab7826f2d78ba55cceb4363
 with hackage2nix revision 1663fb81050a8be440e74263f022c7b04d3ccd6b

---
 .../haskell-modules/hackage-packages.nix      | 468 ++++++++++++------
 1 file changed, 305 insertions(+), 163 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2d24211870d..42ec33178f7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2144,7 +2144,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "Cabal_1_22_3_0" = callPackage
+  "Cabal_1_22_4_0" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , deepseq, directory, extensible-exceptions, filepath, HUnit
      , old-time, pretty, process, QuickCheck, regex-posix
@@ -2153,8 +2153,8 @@ self: {
      }:
      mkDerivation {
        pname = "Cabal";
-       version = "1.22.3.0";
-       sha256 = "15y78hym5yfrchg0lpix80hf41l3c75rda5w1ni8irm593y7il6l";
+       version = "1.22.4.0";
+       sha256 = "19nwapy5rvsrk8jc75ql5klp8hikzrwd3c5x07nisl73d2r8ssmr";
        buildDepends = [
          array base binary bytestring containers deepseq directory filepath
          pretty process time unix
@@ -5481,6 +5481,18 @@ self: {
        license = "GPL";
      }) {};
 
+  "GiveYouAHead" = callPackage
+    ({ mkDerivation, base, directory, extra, old-time, process }:
+     mkDerivation {
+       pname = "GiveYouAHead";
+       version = "0.2.2.0";
+       sha256 = "0qq2kiv9rbch4ps9hsxic9ip0c8z92i0v7hq6vc49hmizdj136ch";
+       buildDepends = [ base directory extra old-time process ];
+       homepage = "https://github.com/Qinka/GiveYouAHead/";
+       description = "to auto-do somethings";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "Glob" = callPackage
     ({ mkDerivation, base, containers, directory, dlist, filepath
      , transformers
@@ -18018,11 +18030,11 @@ self: {
     ({ mkDerivation, base, c2hs, mtl, openal }:
      mkDerivation {
        pname = "al";
-       version = "0.1.3.1";
-       sha256 = "1p6l64p52d0sznzkig1jczwfqs8wfx22ic40kfpai8icqx357v08";
+       version = "0.1.3.2";
+       sha256 = "0hjxcgblzcx4nfckyr7p0lfxr5csx5d96gcrbrmh0fbdddz1nqpc";
        buildDepends = [ base mtl ];
        buildTools = [ c2hs ];
-       extraLibraries = [ openal ];
+       pkgconfigDepends = [ openal ];
        homepage = "http://github.com/phaazon/al";
        description = "OpenAL 1.1 raw API.";
        license = stdenv.lib.licenses.bsd3;
@@ -22229,16 +22241,16 @@ self: {
 
   "aws-dynamodb-conduit" = callPackage
     ({ mkDerivation, aeson, attoparsec-trans, aws, base, bytestring
-     , conduit, http-conduit, http-types, json-togo, resourcet, text
-     , transformers
+     , conduit, containers, http-conduit, http-types, json-togo
+     , resourcet, text, transformers
      }:
      mkDerivation {
        pname = "aws-dynamodb-conduit";
-       version = "0.1.0.2";
-       sha256 = "02q49anmairvjwzvgn8kqx27965n71xbyi86wwlmrs4w0dkbsd41";
+       version = "0.1.0.5";
+       sha256 = "1s1dxk0489vnb0v6kr0b74265cc0ih84pm80ajg8111blabx8kgf";
        buildDepends = [
-         aeson attoparsec-trans aws base bytestring conduit http-conduit
-         http-types json-togo resourcet text transformers
+         aeson attoparsec-trans aws base bytestring conduit containers
+         http-conduit http-types json-togo resourcet text transformers
        ];
        homepage = "https://github.com/srijs/haskell-aws-dynamodb-query";
        description = "Conduit-based interface for AWS DynamoDB";
@@ -25133,8 +25145,8 @@ self: {
      }:
      mkDerivation {
        pname = "bindings-saga-cmd";
-       version = "0.1.1.0";
-       sha256 = "1vv3cx3g3zvrg6xb355b98qxxxf621scqbzaaq45dvfzq9kvclwi";
+       version = "0.1.1.1";
+       sha256 = "11k56zsz1fg0hb0pqamq2hh3gczzqgj105qss5xrk0cgmsphhbmy";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -25900,13 +25912,14 @@ self: {
      }:
      mkDerivation {
        pname = "bitx-bitcoin";
-       version = "0.2.0.0";
-       sha256 = "1n0hp16rpddm74q2rfldga7vpvvsqfn099qdp8qd5pqh8swkmwq8";
+       version = "0.2.0.1";
+       sha256 = "0lg6zmyf299gh8921qxm2xxqv8hsz4p2rpslfcsic5k4bqm2nswg";
        buildDepends = [
          aeson base bytestring http-conduit network record scientific split
          text time
        ];
        testDepends = [ aeson base bytestring hspec record time ];
+       jailbreak = true;
        homepage = "https://github.com/tebello-thejane/bitx-haskell";
        description = "A Haskell library for working with the BitX bitcoin exchange";
        license = stdenv.lib.licenses.publicDomain;
@@ -28368,8 +28381,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-install";
-       version = "1.22.4.0";
-       sha256 = "0qwgs01jd6k03zk67gbydhqkdgsb4wzqylxywz4samkmdilagiw0";
+       version = "1.22.6.0";
+       sha256 = "1d5h7h2wjwc2s3dvsvzjgmmfrfl2312ym2h6kyjgm9wnaqw9w8wx";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -30690,14 +30703,13 @@ self: {
     ({ mkDerivation, array, base, bytestring, cereal, containers
      , deepseq, directory, filepath, fullstop, HUnit, mbox, MonadRandom
      , parsec, QuickCheck, quickcheck-instances, random-shuffle
-     , regex-tdfa, regex-tdfa-text, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, test-framework-skip, text, tokenize
-     , transformers, zlib
+     , regex-tdfa, regex-tdfa-text, tasty, tasty-ant-xml, tasty-hunit
+     , tasty-quickcheck, text, tokenize, transformers, zlib
      }:
      mkDerivation {
        pname = "chatter";
-       version = "0.5.0.2";
-       sha256 = "1nbdc4np4hmvnsh1rfpldi2j1wm1klmfm9szi2kz9fa8g8n3kxxl";
+       version = "0.5.1.0";
+       sha256 = "014palhzpphwq3q1c211xajl30afr4ac6mjcpvyzqwxdr9ia74c8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -30708,8 +30720,8 @@ self: {
        ];
        testDepends = [
          base cereal containers filepath HUnit parsec QuickCheck
-         quickcheck-instances test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-skip text tokenize
+         quickcheck-instances tasty tasty-ant-xml tasty-hunit
+         tasty-quickcheck text tokenize
        ];
        homepage = "http://github.com/creswick/chatter";
        description = "A library of simple NLP algorithms";
@@ -32845,8 +32857,8 @@ self: {
      }:
      mkDerivation {
        pname = "codex";
-       version = "0.3.0.6";
-       sha256 = "1slgh54kvf01y991pqi51kj6lfq05l5gp8dkhwcya1l9gilfazr4";
+       version = "0.3.0.8";
+       sha256 = "1jlrap3qhgnsgdmp0nb2hf3bbjlajp6p4z2q2rl70l93v0v9xi02";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -32855,7 +32867,6 @@ self: {
          MissingH monad-loops network process tar text transformers wreq
          yaml zlib
        ];
-       jailbreak = true;
        homepage = "http://github.com/aloiscochard/codex";
        description = "A ctags file generator for cabal project dependencies";
        license = stdenv.lib.licenses.asl20;
@@ -38533,18 +38544,18 @@ self: {
      }) {};
 
   "data-easy" = callPackage
-    ({ mkDerivation, base, containers, directory, either, errors
+    ({ mkDerivation, base, containers, directory, errors
      , haskell-src-exts, hlint, hspec, HUnit, QuickCheck, safe, text
      , transformers, unix
      }:
      mkDerivation {
        pname = "data-easy";
-       version = "0.5";
-       sha256 = "1rrq20v1nzkmak1m7x3gpcn262h26y4mcx058g8dp413gvdniypq";
+       version = "0.6";
+       sha256 = "1gqc7833lz3n1mqah4mall1m32slz79hifp8381p1qdj2hkirypc";
        buildDepends = [ base containers safe ];
        testDepends = [
-         base containers directory either errors haskell-src-exts hlint
-         hspec HUnit QuickCheck safe text transformers unix
+         base containers directory errors haskell-src-exts hlint hspec HUnit
+         QuickCheck safe text transformers unix
        ];
        jailbreak = true;
        homepage = "https://github.com/jcristovao/easy-data";
@@ -38611,6 +38622,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-fin-simple" = callPackage
+    ({ mkDerivation, base, doctest }:
+     mkDerivation {
+       pname = "data-fin-simple";
+       version = "0.1.0.0";
+       sha256 = "17qj3b3lkrakdk3vbs9nqc2pvqr81n43qxphcznfbkv91k1ygrp6";
+       buildDepends = [ base ];
+       testDepends = [ base doctest ];
+       homepage = "https://github.com/seagull-kamome/data-fin-simple";
+       description = "Simple integral finite set";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-fix" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -42203,18 +42227,17 @@ self: {
   "distributed-process" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
      , data-accessor, deepseq, distributed-static, ghc-prim, hashable
-     , mtl, network-transport, old-locale, random, rank1dynamic, stm
-     , syb, template-haskell, time, transformers
+     , mtl, network-transport, random, rank1dynamic, stm, syb
+     , template-haskell, time, transformers
      }:
      mkDerivation {
        pname = "distributed-process";
-       version = "0.5.4";
-       sha256 = "1yx2vspnpa478bn7n82ii6m6x0z43xwbr5995l3mm64sd0nmxp2s";
+       version = "0.5.5";
+       sha256 = "0w3jwnfc8ca0sx9mshgbxr61pfbnp82ihy3ca5v1pkwz34dqd3f5";
        buildDepends = [
          base binary bytestring containers data-accessor deepseq
-         distributed-static ghc-prim hashable mtl network-transport
-         old-locale random rank1dynamic stm syb template-haskell time
-         transformers
+         distributed-static ghc-prim hashable mtl network-transport random
+         rank1dynamic stm syb template-haskell time transformers
        ];
        jailbreak = true;
        homepage = "http://haskell-distributed.github.com/";
@@ -42491,8 +42514,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-simplelocalnet";
-       version = "0.2.2.0";
-       sha256 = "024m5jycz257i34m2x97x3qyg76j1128ww61pql3fqy4mhvp3791";
+       version = "0.2.3.0";
+       sha256 = "01871r4cj5zwcv63m95i622h0xxfjnflj33wvpxv1ii5z265rkjy";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -42630,13 +42653,16 @@ self: {
      }) {};
 
   "distributed-static" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, rank1dynamic
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , rank1dynamic
      }:
      mkDerivation {
        pname = "distributed-static";
-       version = "0.3.1.0";
-       sha256 = "190b6vjcipgrvnfl72c0ssw8crza02gfw9kwyvwg043jcznihj08";
-       buildDepends = [ base binary bytestring containers rank1dynamic ];
+       version = "0.3.2.0";
+       sha256 = "1zz18lgf39i8anw17qxacb6cicm1kq0yayx9a4inxpnch5xfvg4m";
+       buildDepends = [
+         base binary bytestring containers deepseq rank1dynamic
+       ];
        homepage = "http://haskell-distributed.github.com";
        description = "Compositional, type-safe, polymorphic static values and closures";
        license = stdenv.lib.licenses.bsd3;
@@ -45705,14 +45731,13 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io";
-       version = "1.2.6";
-       sha256 = "1vxbpfldnqrw42vm8c0rqy4b56yig38mca5b83pl79f2z722l3v4";
+       version = "1.2.7";
+       sha256 = "0giqsx1wknhp5a1dg72wl48j56h38jzc3pw6w8pfhngpc0spl3gf";
        buildDepends = [
          aeson async attoparsec base base64-bytestring bytestring either
          free monad-loops mwc-random stm stm-delay text transformers
          unordered-containers vector websockets
        ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/engine.io";
        description = "A Haskell implementation of Engine.IO";
        license = stdenv.lib.licenses.bsd3;
@@ -46309,6 +46334,18 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "error-list" = callPackage
+    ({ mkDerivation, base, mtl, text, text-render }:
+     mkDerivation {
+       pname = "error-list";
+       version = "0.1.0.2";
+       sha256 = "1g50wwgs9xxwc03mhch89rcfnj62mpisl8ihw8yy5c3pp0kag2mm";
+       buildDepends = [ base mtl text text-render ];
+       homepage = "http://github.com/thinkpad20/error-list";
+       description = "A useful type for collecting error messages";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "error-loc" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -52976,8 +53013,8 @@ self: {
     ({ mkDerivation, base, ghc, ghc-paths }:
      mkDerivation {
        pname = "ghc-simple";
-       version = "0.1.2.0";
-       sha256 = "0cwirw9j52khkl8fsgw22136nb3nwlbiahvfcds8hryvr64x9vql";
+       version = "0.1.2.1";
+       sha256 = "0hk3sii5d6mjry28gaipl45c6si82rhdsd43cq130fk9m0xzl9hf";
        buildDepends = [ base ghc ghc-paths ];
        homepage = "https://github.com/valderman/ghc-simple";
        description = "Simplified interface to the GHC API";
@@ -53417,23 +53454,23 @@ self: {
      , clientsession, conduit, conduit-extra, containers, crypto-api
      , cryptohash, curl, data-default, DAV, dbus, directory, dlist, dns
      , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath
-     , git, gnupg, gnutls, hamlet, hinotify, hslogger, http-client
-     , http-conduit, http-types, IfElse, json, lsof, MissingH
-     , monad-control, monad-logger, mtl, network, network-info
-     , network-multicast, network-protocol-xmpp, network-uri, openssh
-     , optparse-applicative, path-pieces, perl, persistent
-     , persistent-sqlite, persistent-template, process, QuickCheck
-     , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
-     , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-rerun, template-haskell, text, time, torrent, transformers
-     , unix, unix-compat, utf8-string, uuid, wai, wai-extra, warp
-     , warp-tls, wget, which, xml-types, yesod, yesod-core
-     , yesod-default, yesod-form, yesod-static
+     , git, gnupg, gnutls, hinotify, hslogger, http-client, http-conduit
+     , http-types, IfElse, json, lsof, MissingH, monad-control
+     , monad-logger, mtl, network, network-info, network-multicast
+     , network-protocol-xmpp, network-uri, openssh, optparse-applicative
+     , path-pieces, perl, persistent, persistent-sqlite
+     , persistent-template, process, QuickCheck, random, regex-tdfa
+     , resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare
+     , stm, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
+     , template-haskell, text, time, torrent, transformers, unix
+     , unix-compat, utf8-string, uuid, wai, wai-extra, warp, warp-tls
+     , wget, which, xml-types, yesod, yesod-core, yesod-default
+     , yesod-form, yesod-static
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "5.20150528";
-       sha256 = "1d7760c3wq0zq9q1zs1y9hjlzjjqcdg88wfi0k5hsmwgiysn2pr2";
+       version = "5.20150617";
+       sha256 = "0m4dbzjmjyjpxbplykil1k64mj2lq5xf2yz7dy406248cscc8drd";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -53441,8 +53478,8 @@ self: {
          case-insensitive clientsession conduit conduit-extra containers
          crypto-api cryptohash data-default DAV dbus directory dlist dns
          edit-distance esqueleto exceptions fdo-notify feed filepath gnutls
-         hamlet hinotify hslogger http-client http-conduit http-types IfElse
-         json MissingH monad-control monad-logger mtl network network-info
+         hinotify hslogger http-client http-conduit http-types IfElse json
+         MissingH monad-control monad-logger mtl network network-info
          network-multicast network-protocol-xmpp network-uri
          optparse-applicative path-pieces persistent persistent-sqlite
          persistent-template process QuickCheck random regex-tdfa resourcet
@@ -53758,8 +53795,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-backup";
-       version = "1.20150106";
-       sha256 = "0y68ml1pp7w6kpfvr0p0sl8q0qmlfyijmw6pd33m301b3ys3p62p";
+       version = "1.20150617";
+       sha256 = "1qg0mksvbnlfpi9dykg5595d6plgxlcbzrbm4al4cm5m6w0d2a73";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -53771,7 +53808,7 @@ self: {
        buildTools = [ git ];
        homepage = "https://github.com/joeyh/github-backup";
        description = "backs up everything github knows about a repository, to the repository";
-       license = "GPL";
+       license = stdenv.lib.licenses.gpl3;
      }) { inherit (pkgs) git;};
 
   "github-post-receive" = callPackage
@@ -56554,6 +56591,19 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "gyah-bin" = callPackage
+    ({ mkDerivation, base, extra, GiveYouAHead }:
+     mkDerivation {
+       pname = "gyah-bin";
+       version = "0.2.2.0";
+       sha256 = "16yzkrn5q21nal07jlvzn84maxx94fyrn1lyljd7hazj2lkpcxvw";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ base extra GiveYouAHead ];
+       description = "A binary version of GiveYouAHead";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "h-booru" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , http-conduit, hxt, mtl, stm, template-haskell, transformers
@@ -57662,14 +57712,13 @@ self: {
      }:
      mkDerivation {
        pname = "hackernews";
-       version = "0.4.0.0";
-       sha256 = "1avznjavz5f3rrmcy6xbi3nh2knarrjnxlrh7sk82zv5aashvp2h";
+       version = "0.5.0.0";
+       sha256 = "1yj8wip52dagmdpziyyjs9hp7k1gdvwl6ynk5hr8c8wxapcj28bs";
        buildDepends = [
          aeson attoparsec base bytestring either HsOpenSSL http-streams
          io-streams text time transformers
        ];
        testDepends = [ base hspec transformers ];
-       jailbreak = true;
        description = "API for Hacker News";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73614,15 +73663,14 @@ self: {
      }:
      mkDerivation {
        pname = "iCalendar";
-       version = "0.4.0.2";
-       sha256 = "0a6kj6ih8dpzvld7hjvjp6gcf4f2y81x6bx17z6wgzwdj9fv7jry";
+       version = "0.4.0.3";
+       sha256 = "0dbs9s68fpx67ngjnd1p8c9n421bzn6a034dr6i3bhg2cn0s01mw";
        buildDepends = [
          base base64-bytestring bytestring case-insensitive containers
          data-default mime mtl network network-uri old-locale parsec text
          time
        ];
-       jailbreak = true;
-       homepage = "http://github.com/tingtun/iCalendar";
+       homepage = "http://github.com/chrra/iCalendar";
        description = "iCalendar data types, parser, and printer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77827,13 +77875,12 @@ self: {
      }:
      mkDerivation {
        pname = "json-togo";
-       version = "0.1.0.1";
-       sha256 = "05g8k8qsxjwqrdwqf24g90hx5jlrwjpa4vsjf0ddrw0whnva3gbz";
+       version = "0.1.0.3";
+       sha256 = "0fl71ij0v4gjjvm5d4624x5fm0si75d9baz07c5ck6da24xgbg0l";
        buildDepends = [
          aeson attoparsec attoparsec-trans base bytestring scientific text
          transformers unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/srijs/haskell-json-togo";
        description = "Effectful parsing of JSON documents";
        license = stdenv.lib.licenses.mit;
@@ -81366,14 +81413,14 @@ self: {
 
   "lens-simple" = callPackage
     ({ mkDerivation, base, lens-family, lens-family-core
-     , lens-family-th, transformers
+     , lens-family-th, mtl, transformers
      }:
      mkDerivation {
        pname = "lens-simple";
-       version = "0.1.0.5";
-       sha256 = "1hn2g9xswfn94m5hxi39jpmdaxm51l231cvqn2a62pr8j6b34839";
+       version = "0.1.0.6";
+       sha256 = "097zxi3g9ziadiwg4sk96gfjv0jrv4sd3kkpv1hdwjqw1x1dknd3";
        buildDepends = [
-         base lens-family lens-family-core lens-family-th transformers
+         base lens-family lens-family-core lens-family-th mtl transformers
        ];
        homepage = "https://github.com/michaelt/lens-simple";
        description = "simplified import of elementary lens-family combinators";
@@ -83985,8 +84032,8 @@ self: {
      }:
      mkDerivation {
        pname = "log";
-       version = "0.2.1";
-       sha256 = "0jply63w04pnkfv3s8lpnwvjf43sfhf3mk72p3wva4p28c6mql31";
+       version = "0.2.2";
+       sha256 = "05izcd3qwwfwj5kl2k2pzjs8fk14hq10qls3a8m057gg4pd6nw1n";
        buildDepends = [
          aeson aeson-pretty base bytestring deepseq exceptions hpqtypes
          monad-control monad-time mtl old-locale split stm text time
@@ -92956,13 +93003,16 @@ self: {
      }) {};
 
   "network-transport" = callPackage
-    ({ mkDerivation, base, binary, bytestring, hashable, transformers
+    ({ mkDerivation, base, binary, bytestring, deepseq, hashable
+     , transformers
      }:
      mkDerivation {
        pname = "network-transport";
-       version = "0.4.1.0";
-       sha256 = "0xn879ngrbnm71i1wsbxxiih22sdb6csy6aip6fgqyafqlpc1c93";
-       buildDepends = [ base binary bytestring hashable transformers ];
+       version = "0.4.2.0";
+       sha256 = "0arwy5csrm33217rmnip6b0x61b6am1db6mj5phfysj0pz30viqf";
+       buildDepends = [
+         base binary bytestring deepseq hashable transformers
+       ];
        homepage = "http://haskell-distributed.github.com";
        description = "Network abstraction layer";
        license = stdenv.lib.licenses.bsd3;
@@ -92998,8 +93048,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-transport-tcp";
-       version = "0.4.1";
-       sha256 = "11fj0f2yrvdqn3sivfb4p0chs74bx26a0yc49fh160kkcmk42yaf";
+       version = "0.4.2";
+       sha256 = "0wh3d37cfmqbxa0x9c56miki7m9mpg0xv5rrn8fh562lfvcn89ls";
        buildDepends = [
          base bytestring containers data-accessor network network-transport
        ];
@@ -93415,6 +93465,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "nixfromnpm" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, classy-prelude
+     , data-default, directory, error-list, filepath, github, hspec
+     , hspec-expectations, http-client-streams, io-streams, MissingH
+     , mtl, network-uri, parsec, shelly, simple-nix, system-filepath
+     , text, text-render, unordered-containers
+     }:
+     mkDerivation {
+       pname = "nixfromnpm";
+       version = "0.1.0.0";
+       sha256 = "16m7rish1n8292virv0dgzvxwjhy73blmdpcfwdkmb2qvkvvv93j";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring classy-prelude data-default directory
+         error-list filepath MissingH mtl network-uri parsec shelly
+         simple-nix system-filepath text text-render unordered-containers
+       ];
+       testDepends = [
+         aeson base bytestring classy-prelude data-default directory
+         error-list filepath github hspec hspec-expectations
+         http-client-streams io-streams MissingH mtl network-uri parsec
+         shelly simple-nix system-filepath text text-render
+         unordered-containers
+       ];
+       description = "Generate nix expressions from npm packages";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "nixos-types" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -93813,8 +93892,8 @@ self: {
      }:
      mkDerivation {
        pname = "notzero";
-       version = "0.0.1";
-       sha256 = "1sk7hq3qpfrimgpg4r22lzl749yazv1hka3si4921gg61w4bdx8l";
+       version = "0.0.7";
+       sha256 = "1247jhaqlmw720x5j2h6mj677jrg392f4i38zign05ral11xh4xf";
        buildDepends = [
          base bifunctors lens mtl semigroupoids semigroups transformers
        ];
@@ -97078,8 +97157,8 @@ self: {
      }:
      mkDerivation {
        pname = "path";
-       version = "0.5.0";
-       sha256 = "1fk1fpyrmdxym2qnjmlhkgn2kyn5j728hiqw94i8kg47c1xnihkk";
+       version = "0.5.1";
+       sha256 = "181dq5r4nslh37yy3hs1k20vd2w9yyp8ccjvxcmq12czfzgzz8bi";
        buildDepends = [ base exceptions filepath template-haskell ];
        testDepends = [ base hspec HUnit mtl ];
        description = "Path";
@@ -97210,8 +97289,8 @@ self: {
      }:
      mkDerivation {
        pname = "paypal-adaptive-hoops";
-       version = "0.11.0.1";
-       sha256 = "061vzsncyl0is2d3p8sh3a1wb46g2v6vqgdh390b8d41max1wabg";
+       version = "0.11.0.2";
+       sha256 = "0z71j79wqxnixadpy47n30nrwhqya6qaadlwvrk9q60vrqvd21rm";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -97222,7 +97301,6 @@ self: {
          aeson base bytestring HUnit test-framework test-framework-hunit
          text unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/fanjam/paypal-adaptive-hoops";
        description = "Client for a limited part of PayPal's Adaptive Payments API";
        license = stdenv.lib.licenses.mit;
@@ -97371,12 +97449,14 @@ self: {
      }) {};
 
   "pcg-random" = callPackage
-    ({ mkDerivation, base, doctest, primitive, random, time }:
+    ({ mkDerivation, base, bytestring, doctest, entropy, primitive
+     , random, time
+     }:
      mkDerivation {
        pname = "pcg-random";
-       version = "0.1.2.0";
-       sha256 = "1h2ry2p1nnvh3prrl6xz18p3npccrb0p9qzq41lcn10sizfsgpzx";
-       buildDepends = [ base primitive random time ];
+       version = "0.1.3.1";
+       sha256 = "02sx8l51dks316n0df7h75igynb56ms8gs8siczbl5zrlrgycywi";
+       buildDepends = [ base bytestring entropy primitive random time ];
        testDepends = [ base doctest ];
        homepage = "http://github.com/cchalmers/pcg-random";
        description = "Haskell bindings to the PCG random number generator";
@@ -104563,18 +104643,15 @@ self: {
      }) {};
 
   "rank1dynamic" = callPackage
-    ({ mkDerivation, base, binary, constraints, ghc-prim, HUnit
-     , test-framework, test-framework-hunit
+    ({ mkDerivation, base, binary, ghc-prim, HUnit, test-framework
+     , test-framework-hunit
      }:
      mkDerivation {
        pname = "rank1dynamic";
-       version = "0.2.0.1";
-       sha256 = "1np3ghp7wdn0clsyslk5j6fhs4c5cd6y0xlvdg2jj6ydaglzcchl";
+       version = "0.3.1.0";
+       sha256 = "0klfwglssp782p1brbfgjm30d2s3lpgd75iv7jq1pih598kkjsd5";
        buildDepends = [ base binary ghc-prim ];
-       testDepends = [
-         base constraints HUnit test-framework test-framework-hunit
-       ];
-       jailbreak = true;
+       testDepends = [ base HUnit test-framework test-framework-hunit ];
        homepage = "http://haskell-distributed.github.com";
        description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
        license = stdenv.lib.licenses.bsd3;
@@ -107423,8 +107500,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-gen";
-       version = "0.17.0.5";
-       sha256 = "1pwn1ws6dcwa00y8dblaj7wnr51mv9hjrc05fiv7mzvl0j0v0iz7";
+       version = "0.17.0.6";
+       sha256 = "0pkqpycvsdbz2kk6lsq226rkgfrbwh49jky1wcik36yh3s9hfxdq";
        buildDepends = [
          aeson base blaze-html Cabal code-builder directory fclabels
          filepath hashable haskell-src-exts HStringTemplate hxt json-schema
@@ -109075,12 +109152,11 @@ self: {
      }:
      mkDerivation {
        pname = "s3-signer";
-       version = "0.2.0.0";
-       sha256 = "08n2ip8ba3apgc5x8pq1b0rs9j0ng1d7hkw2jrd307q4q85gngy0";
+       version = "0.3.0.0";
+       sha256 = "15647fs38blg37s0407ybxlmzwdhmxz3sk914p21g90i2bw5gsc9";
        buildDepends = [
          base base64-bytestring cryptohash http-types time utf8-string
        ];
-       jailbreak = true;
        homepage = "https://github.com/dmjio/s3-signer";
        description = "Pre-signed Amazon S3 URLs";
        license = stdenv.lib.licenses.bsd3;
@@ -111880,8 +111956,8 @@ self: {
      }:
      mkDerivation {
        pname = "serversession";
-       version = "1.0";
-       sha256 = "0g56lqcrfhl9mrzqcd0sckyc98friqlfjxl1ws1j2zsc1z153x1a";
+       version = "1.0.1";
+       sha256 = "08j8v6a2018bmvwsb7crdg0ajak74jggb073pdpx9s0pf3cfzyrz";
        buildDepends = [
          aeson base base64-bytestring bytestring data-default hashable nonce
          path-pieces text time transformers unordered-containers
@@ -111902,8 +111978,8 @@ self: {
      }:
      mkDerivation {
        pname = "serversession-backend-acid-state";
-       version = "1.0";
-       sha256 = "122mp6vcc89f44vijlncywmbsim76hhhlzw38snnsmsfn0q96ln1";
+       version = "1.0.1";
+       sha256 = "1hc5vpy82pxd0wlzabw3md4gvhxbnvs8wsa0wammni2a1pf123a7";
        buildDepends = [
          acid-state base containers mtl safecopy serversession
          unordered-containers
@@ -113509,6 +113585,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "simple-nix" = callPackage
+    ({ mkDerivation, base, classy-prelude, error-list, MissingH, mtl
+     , parsec, system-filepath, text, text-render, unordered-containers
+     }:
+     mkDerivation {
+       pname = "simple-nix";
+       version = "0.1.0.0";
+       sha256 = "18bvqc3gkbczgvipsv6rn71vmw8ybbgvyxccm6q5fgniv1knzh0i";
+       buildDepends = [
+         base classy-prelude error-list MissingH mtl parsec system-filepath
+         text text-render unordered-containers
+       ];
+       homepage = "https://github.com/adnelson/simple-nix";
+       description = "Simple parsing/pretty printing for Nix expressions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "simple-observer" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -114568,8 +114661,8 @@ self: {
     ({ mkDerivation, base, linear, vector }:
      mkDerivation {
        pname = "smoothie";
-       version = "0.1.3";
-       sha256 = "1326hqinlfipbxcynqfsskh4bq5136b48z3kjic8qnddkgkhgg1s";
+       version = "0.2.1";
+       sha256 = "07n0qhxhy800nyahfja8qdzk5ygvj4d2l7i2nwh3f3mqy5bp5jyz";
        buildDepends = [ base linear vector ];
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several splines and polynomials";
@@ -116091,8 +116184,8 @@ self: {
     ({ mkDerivation, async, base, bytestring }:
      mkDerivation {
        pname = "socket";
-       version = "0.3.0.1";
-       sha256 = "01fz3lng41i9q4r2wh6nsyx27yc7jbhglzb10lg06d2ll7gxakx0";
+       version = "0.4.0.1";
+       sha256 = "0xb5mdx8mxyy1h0kccgkj8qc3qkpi1rn1l0z52rid716yw1lia42";
        buildDepends = [ base bytestring ];
        testDepends = [ async base bytestring ];
        homepage = "https://github.com/lpeterse/haskell-socket";
@@ -116734,8 +116827,8 @@ self: {
      }:
      mkDerivation {
        pname = "species";
-       version = "0.3.4";
-       sha256 = "1j1bf1l5hg67kagbzwyjw8fnli2axi6ny4zb8fdd1m8zqqrajxr4";
+       version = "0.3.4.1";
+       sha256 = "0nn8s43d6r297my3y3m83qv082j2if32c7pyy14c5ll893v16nvw";
        buildDepends = [
          base containers multiset-comb np-extras numeric-prelude
          template-haskell
@@ -123470,6 +123563,18 @@ test/package-dump/ghc-7.10.txt";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-render" = callPackage
+    ({ mkDerivation, base, mtl, parsec, text }:
+     mkDerivation {
+       pname = "text-render";
+       version = "0.1.0.1";
+       sha256 = "1viy7amiy6pz2mcay70r952jham9mnkmf70icfzd25cjzqx1h8wn";
+       buildDepends = [ base mtl parsec text ];
+       homepage = "http://github.com/thinkpad20/text-render";
+       description = "A type class for rendering objects as text, pretty-printing, etc";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "text-show" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, bytestring
      , bytestring-builder, ghc-prim, hspec, integer-gmp, nats
@@ -125302,26 +125407,25 @@ test/package-dump/ghc-7.10.txt";
      }) {};
 
   "tkyprof" = callPackage
-    ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base
-     , blaze-builder, bytestring, cmdargs, conduit, containers
-     , data-default, directory, filepath, hamlet, http-types, mtl
-     , resourcet, rosezipper, shakespeare-css, shakespeare-js, stm
-     , template-haskell, text, time, transformers, unordered-containers
-     , vector, wai, wai-extra, warp, web-routes, yesod, yesod-core
-     , yesod-form, yesod-static
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
+     , cmdargs, conduit, conduit-extra, containers, data-default
+     , directory, exceptions, filepath, http-types, mtl, resourcet
+     , rosezipper, shakespeare, stm, template-haskell, text, time
+     , transformers, unordered-containers, vector, wai, wai-extra, warp
+     , web-routes, yesod, yesod-core, yesod-form, yesod-static
      }:
      mkDerivation {
        pname = "tkyprof";
-       version = "0.2.2";
-       sha256 = "0c3sdpjs22fqg5nkwig6smggf6snx1y5dg11y3s5cgm1ihy27h75";
+       version = "0.2.2.2";
+       sha256 = "1xyy1aagbjyjs9d52jmf7xch0831v7hvsb0mfrxpahvqsdac6h7a";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson attoparsec attoparsec-conduit base blaze-builder bytestring
-         cmdargs conduit containers data-default directory filepath hamlet
-         http-types mtl resourcet rosezipper shakespeare-css shakespeare-js
-         stm template-haskell text time transformers unordered-containers
-         vector wai wai-extra warp web-routes yesod yesod-core yesod-form
+         aeson attoparsec base blaze-builder bytestring cmdargs conduit
+         conduit-extra containers data-default directory exceptions filepath
+         http-types mtl resourcet rosezipper shakespeare stm
+         template-haskell text time transformers unordered-containers vector
+         wai wai-extra warp web-routes yesod yesod-core yesod-form
          yesod-static
        ];
        jailbreak = true;
@@ -126399,18 +126503,18 @@ test/package-dump/ghc-7.10.txt";
 
   "trurl" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filemanip
-     , hastache, http-conduit, MissingH, scientific, tar, tasty
+     , hastache, http-conduit, MissingH, safe, scientific, tar, tasty
      , tasty-hunit, text, unordered-containers
      }:
      mkDerivation {
        pname = "trurl";
-       version = "0.2.2.0";
-       sha256 = "139c97c63fhgq9lisic5wyfn872j120xsj3i72fs5s0aa9m59w81";
+       version = "0.3.0.4";
+       sha256 = "1ync81dhac7m62fq15ciipy2lbrqph2riq1af1z70ah30vyzr415";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base bytestring directory filemanip hastache http-conduit
-         MissingH scientific tar text unordered-containers
+         MissingH safe scientific tar text unordered-containers
        ];
        testDepends = [ base hastache tasty tasty-hunit ];
        homepage = "http://github.com/dbushenko/trurl";
@@ -129754,16 +129858,19 @@ test/package-dump/ghc-7.10.txt";
 
   "utc" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, clock
-     , QuickCheck, test-framework, test-framework-quickcheck2, text
+     , exceptions, QuickCheck, test-framework
+     , test-framework-quickcheck2, text
      }:
      mkDerivation {
        pname = "utc";
-       version = "0.1.0.1";
-       sha256 = "0fqqnb6rcbkdxz7wf1r6475k7lv6c8hkvak8nydcl0d10j0hqkil";
-       buildDepends = [ attoparsec base bytestring clock text ];
+       version = "0.2.0.1";
+       sha256 = "0vnydjjvv0kh1mww9vb9l90crl9ddd5n63dwpjjs8ln56b5yvv5h";
+       buildDepends = [
+         attoparsec base bytestring clock exceptions text
+       ];
        testDepends = [
-         attoparsec base bytestring Cabal clock QuickCheck test-framework
-         test-framework-quickcheck2 text
+         attoparsec base bytestring Cabal clock exceptions QuickCheck
+         test-framework test-framework-quickcheck2 text
        ];
        homepage = "https://github.com/lpeterse/haskell-utc";
        description = "A pragmatic time and date library";
@@ -133985,6 +134092,24 @@ test/package-dump/ghc-7.10.txt";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wlc-hs" = callPackage
+    ({ mkDerivation, base, c2hs, containers, data-default, lens, pretty
+     , process, transformers, wlc, xkbcommon
+     }:
+     mkDerivation {
+       pname = "wlc-hs";
+       version = "0.1.0.0";
+       sha256 = "0z553h86dznsf2wagbfhh8p27aa20jm3wmxkklr51al35xralvv9";
+       buildDepends = [
+         base containers data-default lens pretty process transformers
+         xkbcommon
+       ];
+       buildTools = [ c2hs ];
+       extraLibraries = [ wlc ];
+       description = "Haskell bindings for the wlc library";
+       license = stdenv.lib.licenses.isc;
+     }) { wlc = null;};
+
   "wobsurv" = callPackage
     ({ mkDerivation, aeson, attoparsec, base-prelude, bytestring
      , hastache, HTF, http-client, http-types, HUnit, lifted-async
@@ -134053,20 +134178,21 @@ test/package-dump/ghc-7.10.txt";
     ({ mkDerivation, aeson, amazonka, amazonka-s3, amazonka-swf, base
      , bytestring, conduit, conduit-extra, cryptohash, exceptions
      , fast-logger, http-conduit, lens, monad-control, monad-logger, mtl
-     , optparse-applicative, safe, shelly, text, transformers
-     , transformers-base, unordered-containers, uuid, yaml
+     , mtl-compat, optparse-applicative, safe, shelly, text
+     , transformers, transformers-base, unordered-containers, uuid, yaml
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.1.0";
-       sha256 = "1b51gb7waxv0i7l3phz0h24n5jpir51b7zycs75kb1wn8qmm8ia3";
+       version = "0.1.1";
+       sha256 = "1g98xjl8qpayj8ynz0391cqhfagaxa03hxqaz2wvyppalqdp44k9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson amazonka amazonka-s3 amazonka-swf base bytestring conduit
          conduit-extra cryptohash exceptions fast-logger http-conduit lens
-         monad-control monad-logger mtl optparse-applicative safe shelly
-         text transformers transformers-base unordered-containers uuid yaml
+         monad-control monad-logger mtl mtl-compat optparse-applicative safe
+         shelly text transformers transformers-base unordered-containers
+         uuid yaml
        ];
        jailbreak = true;
        homepage = "https://github.com/swift-nav/wolf";
@@ -135168,8 +135294,8 @@ test/package-dump/ghc-7.10.txt";
 
   "xkbcommon" = callPackage
     ({ mkDerivation, base, bytestring, cpphs, data-flags, filepath
-     , process, storable-record, template-haskell, text, transformers
-     , unix, xkbcommon
+     , libxkbcommon, process, storable-record, template-haskell, text
+     , transformers, unix
      }:
      mkDerivation {
        pname = "xkbcommon";
@@ -135180,11 +135306,10 @@ test/package-dump/ghc-7.10.txt";
          template-haskell text transformers
        ];
        testDepends = [ base unix ];
-       extraLibraries = [ xkbcommon ];
+       extraLibraries = [ libxkbcommon ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { xkbcommon = null;};
+     }) { inherit (pkgs) libxkbcommon;};
 
   "xkcd" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, HTTP
@@ -136015,6 +136140,23 @@ test/package-dump/ghc-7.10.txt";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xmonad-windownames" = callPackage
+    ({ mkDerivation, base, containers, utf8-string, xmonad
+     , xmonad-contrib
+     }:
+     mkDerivation {
+       pname = "xmonad-windownames";
+       version = "0.1.0.0";
+       sha256 = "1w1f0v81dnbxkmavk5d3hbnanx24yzrqacg4m8j4w36k041w7zn9";
+       buildDepends = [
+         base containers utf8-string xmonad xmonad-contrib
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/plindbe2/xmonad-windownames";
+       description = "A library to automatically put named windows into the DynamicLog";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "xmpipe" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, handle-like
      , monads-tf, sasl, simple-pipe, uuid, xml-pipe
@@ -138075,8 +138217,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "yesod-table";
-       version = "0.1.2";
-       sha256 = "1415y7q45s65cklqyrvcgsqi6v07p698024d5wfghcjnv9qylwmi";
+       version = "0.1.3";
+       sha256 = "1phbjcry1drl98ivv7yjqvwcray134zh9xqj37p1p7ki1850id3p";
        buildDepends = [ base containers contravariant text yesod-core ];
        homepage = "https://github.com/andrewthad/yesod-table";
        description = "HTML tables for Yesod";

From b8446a4d858ae91bafa6d685cd91de280e27d1a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 23:39:28 +0200
Subject: [PATCH 1268/2322] haskell: update configuration for Cabal 1.22.4.0

---
 pkgs/development/haskell-modules/configuration-common.nix    | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2a5231aef21..20173aba517 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -7,8 +7,8 @@ self: super: {
   # Some packages need a non-core version of Cabal.
   Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
   Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
-  Cabal_1_22_3_0 = dontCheck super.Cabal_1_22_3_0;
-  cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_3_0; zlib = self.zlib_0_5_4_2; });
+  Cabal_1_22_4_0 = dontCheck super.Cabal_1_22_4_0;
+  cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; zlib = self.zlib_0_5_4_2; });
   cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; });
 
   # Break infinite recursions.
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 556b86f95eb..63506bad419 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -41,7 +41,7 @@ self: super: {
   transformers = self.transformers_0_4_3_0;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_5_0; process = self.process_1_2_3_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_7_5_0; process = self.process_1_2_3_0; };
 
   # Newer versions don't compile.
   Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
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 e012cda2da9..e19a69277db 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -38,7 +38,7 @@ self: super: {
   transformers = self.transformers_0_4_3_0;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = dontCheck self.binary_0_7_5_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_5_0; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
   cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_5_0; });
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 16257dcc17b..a9e64935faf 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -40,7 +40,7 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = dontCheck self.binary_0_7_5_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_5_0; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
   cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_5_0; });

From 84235ff763ee77058032319f791fb1d49c9695d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 17 Jun 2015 16:06:15 +0200
Subject: [PATCH 1269/2322] haskell-xkbcommon test suite has unspecified
 dependencies.

---
 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 20173aba517..8a9127307e4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -303,6 +303,7 @@ self: super: {
   users-postgresql-simple = dontCheck super.users-postgresql-simple;
   wai-middleware-hmac = dontCheck super.wai-middleware-hmac;
   wai-middleware-throttle = dontCheck super.wai-middleware-throttle; # https://github.com/creichert/wai-middleware-throttle/issues/1
+  xkbcommon = dontCheck super.xkbcommon;
   xmlgen = dontCheck super.xmlgen;
 
   # These packages try to access the network.

From 93a742fd28bb1dca4091478755b2f30e93d84d2e Mon Sep 17 00:00:00 2001
From: Jeffrey David Johnson <jefdaj@gmail.com>
Date: Fri, 22 May 2015 17:51:24 -0700
Subject: [PATCH 1270/2322] R: add support for Bioconductor packages

---
 pkgs/build-support/fetchurl/mirrors.nix       |  15 +
 pkgs/development/r-modules/bioc-packages.nix  | 943 ++++++++++++++++++
 pkgs/development/r-modules/default.nix        |  40 +-
 ...-cran-packages.R => generate-r-packages.R} |  24 +-
 4 files changed, 998 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/r-modules/bioc-packages.nix
 rename pkgs/development/r-modules/{generate-cran-packages.R => generate-r-packages.R} (67%)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 2a3dbb40a2b..5507eba965f 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -289,6 +289,21 @@ rec {
     ftp://ftp.xemacs.org/sites/metalab.unc.edu/
   ];
 
+  # Bioconductor mirrors (from http://bioconductor.org/about/mirrors)
+  # The commented-out ones don't seem to allow direct package downloads;
+  # they serve error messages that result in hash mismatches instead.
+  bioc = [
+    # http://bioc.ism.ac.jp/3.0/bioc/
+    # http://bioc.openanalytics.eu/3.0/bioc/
+    # http://bioconductor.fmrp.usp.br/3.0/bioc/
+    # http://mirror.aarnet.edu.au/pub/bioconductor/3.0/bioc/
+    # http://watson.nci.nih.gov/bioc_mirror/3.0/bioc/
+    http://bioconductor.jp/packages/3.0/bioc/
+    http://bioconductor.statistik.tu-dortmund.de/packages/3.0/bioc/
+    http://mirrors.ebi.ac.uk/bioconductor/packages/3.0/bioc/
+    http://mirrors.ustc.edu.cn/bioc/3.0/bioc/
+  ];
+
   # CRAN mirrors (from http://cran.r-project.org/mirrors.html)
   cran = [
     http://cran.r-project.org/
diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix
new file mode 100644
index 00000000000..23ff444afb0
--- /dev/null
+++ b/pkgs/development/r-modules/bioc-packages.nix
@@ -0,0 +1,943 @@
+# 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 bioc > bioc-packages.nix
+
+{ self, derive }: with self; {
+ABSSeq = derive { name="ABSSeq"; version="1.2.0"; sha256="0y8cr6w6jw8ac94jn4kbvrf9kdpjz2hq4s5hfkgd1gnphfkrw4f9"; depends=[]; };
+ABarray = derive { name="ABarray"; version="1.34.0"; sha256="0b7vyd3vagbczsf5ppd8pv18yrlzgb818lg1ga3lpzf6yr9gb2kd"; depends=[Biobase multtest]; };
+ACME = derive { name="ACME"; version="2.22.0"; sha256="06jhvqm2m27k44pk4iqz1msq3vnkchxvhsamdydsnlv52finfl66"; depends=[Biobase BiocGenerics]; };
+ADaCGH2 = derive { name="ADaCGH2"; version="2.6.0"; sha256="15afapvazksy6kgp9fgz57vc96dfhlz6hd0bssgfgjr243qgh2yy"; depends=[DNAcopy tilingArray GLAD aCGH snapCGH]; };
+AGDEX = derive { name="AGDEX"; version="1.14.0"; sha256="1kc8k2nqq2jc6hvxxs1abya8k96cc7lba0f3vndijai14lp2ynl0"; depends=[Biobase GSEABase]; };
+ALDEx2 = derive { name="ALDEx2"; version="1.0.0"; sha256="0w456qvyjx8m92p0jaawkr8jlp8rqnzic5z49gl4368shl07pfzx"; depends=[GenomicRanges]; };
+ARRmNormalization = derive { name="ARRmNormalization"; version="1.6.0"; sha256="108rjwd21z2k45a8dhsd1hs8ssf6gml80wcvg3768bzr0nipsc83"; depends=[]; };
+ASEB = derive { name="ASEB"; version="1.10.0"; sha256="0cwm7f9x7msnb5d8iq9d7s84r07iv0h43kjcim4hdmg27ij9a4yv"; depends=[]; };
+ASGSCA = derive { name="ASGSCA"; version="1.0.0"; sha256="0j43fm4vdl2s02a32l0bf7lj7j9irj2sgb958zykq42clzfsbcyx"; depends=[]; };
+ASSET = derive { name="ASSET"; version="1.4.0"; sha256="1dizmldax3b38zq1i6yvkcwzvir3jy74dmf2j3acbkri9ksxfbyp"; depends=[]; };
+ASSIGN = derive { name="ASSIGN"; version="1.2.0"; sha256="0qvhyp2mbmpdv08sdlw49kgba56zhblrf3x5vjld20frarfjjmm2"; depends=[]; };
+AffyCompatible = derive { name="AffyCompatible"; version="1.26.0"; sha256="1d803lbhibwr26m392vss3zkyiczivjiwj5bkcalwlyv3bmkikyn"; depends=[Biostrings]; };
+AffyExpress = derive { name="AffyExpress"; version="1.32.0"; sha256="1zmrqrh0dzzgprxh8gibj3dxdkh6ga6m3dlb8jvxyi9p6bwvdihq"; depends=[affy limma]; };
+AffyRNADegradation = derive { name="AffyRNADegradation"; version="1.12.0"; sha256="1wpgfnrajwhq850ibrkwiy1k2lvf1g4zfc35z1kwksh0fbx50s3d"; depends=[affy]; };
+AffyTiling = derive { name="AffyTiling"; version="1.24.0"; sha256="0rv1rg573qnwf1vfiklgm8dprr5gnfqccg06dvz5fddr1myjg53b"; depends=[affxparser affy preprocessCore]; };
+AgiMicroRna = derive { name="AgiMicroRna"; version="2.16.0"; sha256="1ziw9yvj2zn6ymqc3mihy55nl51r0jss3x2raspfpnzn9fv4lnph"; depends=[Biobase limma affy preprocessCore affycoretools Biobase]; };
+AllelicImbalance = derive { name="AllelicImbalance"; version="1.4.2"; sha256="1idxgilwlxf26991rilnggrm0qbvajmm4w6ssfljrddnlcqpnnkh"; depends=[GenomicRanges GenomicAlignments BiocGenerics AnnotationDbi Biostrings S4Vectors IRanges Rsamtools GenomicFeatures Gviz GenomeInfoDb]; };
+AnnotationDbi = derive { name="AnnotationDbi"; version="1.28.2"; sha256="0czhmh2bgip8ax30nk1jkb82qa68cyi7ki5fwwrv3sd05gvc8qln"; depends=[BiocGenerics Biobase GenomeInfoDb BiocGenerics Biobase S4Vectors]; };
+AnnotationForge = derive { name="AnnotationForge"; version="1.8.2"; sha256="13gqf7pa44js7z64psk2p6abjvwzp28pn0lc6hgmc7bcnbnblsg8"; depends=[BiocGenerics Biobase AnnotationDbi BiocGenerics S4Vectors Biobase]; };
+AnnotationFuncs = derive { name="AnnotationFuncs"; version="1.16.0"; sha256="090m1dm37r3pdn7367akmddil1qivcjsy7ilgplqhabii0gb8dhi"; depends=[AnnotationDbi]; };
+AnnotationHub = derive { name="AnnotationHub"; version="1.6.0"; sha256="1kkdxf28pl743c9yamg75kcvp0pqxvphba7q9yblfsjhq2sym2v2"; depends=[S4Vectors IRanges BiocGenerics BiocInstaller AnnotationDbi GenomicRanges interactiveDisplay]; };
+ArrayExpress = derive { name="ArrayExpress"; version="1.26.0"; sha256="06746fvc2xlz42ykp9b8vzgfhz4jzyx5qp6drvl9776lpawd2qq8"; depends=[Biobase affy limma]; };
+ArrayExpressHTS = derive { name="ArrayExpressHTS"; version="1.16.0"; sha256="0mp9dafd5h2n8sfdadncch4inxy7gn4rsmv68fyjxr4cs52c229p"; depends=[Rsamtools Biobase BiocGenerics Biostrings DESeq GenomicRanges IRanges Rsamtools ShortRead biomaRt edgeR Rsamtools]; };
+ArrayTV = derive { name="ArrayTV"; version="1.4.0"; sha256="06yf52yf3jydr187yfg52vr7krhw433wab487qj3qlq903nkvjn0"; depends=[DNAcopy oligoClasses]; };
+ArrayTools = derive { name="ArrayTools"; version="1.26.0"; sha256="1sf38isnq2bv8np9skqs9iwhb7k6waf6xzzrmkrxqrbm86izvdxj"; depends=[affy Biobase affy Biobase limma]; };
+AtlasRDF = derive { name="AtlasRDF"; version="1.2.0"; sha256="0cdan2739w7sbz503kqm3xyyizs4l1vi9i2a5jmxn6fb9nqgkar5"; depends=[]; };
+BAC = derive { name="BAC"; version="1.26.0"; sha256="1km0d3k2qxqa0s1bf2hpic71rplh07b5y06i8qr3yj3nis23z6a2"; depends=[]; };
+BADER = derive { name="BADER"; version="1.4.0"; sha256="06k2dmh9dv9ng469cp67c2ld2mv7sqgynkwn368whqvvv8drc23g"; depends=[]; };
+BAGS = derive { name="BAGS"; version="2.6.0"; sha256="1553n2cslnvslcc09x8wb1jll5w24zbfpjj2fhwl1955fxhclfdm"; depends=[Biobase]; };
+BCRANK = derive { name="BCRANK"; version="1.28.0"; sha256="1fwyfj619i8d32k69x5ngmc7f3j71986l762rhl6idb28krfgzb8"; depends=[Biostrings]; };
+BEAT = derive { name="BEAT"; version="1.4.0"; sha256="1xqnabgbzd08f25wdvwbzi3f68ldvxbisriww9f32ysj5dhjl0mh"; depends=[GenomicRanges ShortRead Biostrings BSgenome]; };
+BGmix = derive { name="BGmix"; version="1.26.0"; sha256="1fc9dh23i1lab5b10z1xz6hb5ilgpif5ifg32qyppxz971cxrb2j"; depends=[]; };
+BHC = derive { name="BHC"; version="1.18.0"; sha256="16i2di8d71as8jh4lm185405xmc3kkmsmlrwkqr0rj59vlgghn46"; depends=[]; };
+BRAIN = derive { name="BRAIN"; version="1.12.0"; sha256="0284ww8gxzgvq6c1pkzr4lsrw6gv94ghl9myp4pihfgj26g4qcdm"; depends=[Biostrings]; };
+BSgenome = derive { name="BSgenome"; version="1.34.1"; sha256="099jwllff6gkzs34jhhrnjljjm7wv2jdh1y01318pifgcrym5sw0"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges Biostrings rtracklayer BiocGenerics S4Vectors IRanges XVector GenomeInfoDb GenomicRanges Biostrings Rsamtools rtracklayer]; };
+BUS = derive { name="BUS"; version="1.22.0"; sha256="0l3rhvja8k8yawc2wz3xdk6m8ccvx024i2ckpwiimslnpb5qai3m"; depends=[minet]; };
+BaseSpaceR = derive { name="BaseSpaceR"; version="1.10.0"; sha256="0gsrs9aan1802hv8db5x1mfaawayrcw8zvdcf3ly7z9cavf1nyfs"; depends=[]; };
+Basic4Cseq = derive { name="Basic4Cseq"; version="1.2.0"; sha256="0kpsvrwl1mphdraww8ha586a57j1iqz1dk7ms5x9rsddjkl7vqa6"; depends=[Biostrings ShortRead GenomicRanges]; };
+BayesPeak = derive { name="BayesPeak"; version="1.18.2"; sha256="16ndpxlwgpzhh7c9kmv2pvlan0ida1zzcflzvnq7sggynfghff2j"; depends=[IRanges IRanges]; };
+BeadDataPackR = derive { name="BeadDataPackR"; version="1.18.0"; sha256="0z7s1v2xac3k52d1cyir8h99yf3h494s104z9slvd679kn7r1288"; depends=[]; };
+BiGGR = derive { name="BiGGR"; version="1.2.0"; sha256="18brc57np4074fckcv3h1ik6zaw18r82c8z7kmna4f66396i6v1g"; depends=[rsbml hyperdraw hypergraph]; };
+BiRewire = derive { name="BiRewire"; version="1.8.0"; sha256="1bdilpbz0z1ppbg5729f0wi8xvr0j96q9q1mdqs7agnfc82yiwhq"; depends=[]; };
+BiSeq = derive { name="BiSeq"; version="1.6.0"; sha256="0rsf9kii79qjzabahpvbmmkyxc0605z325pkkdzrp3062fwafhm9"; depends=[S4Vectors IRanges GenomicRanges BiocGenerics Biobase S4Vectors IRanges GenomicRanges rtracklayer globaltest]; };
+BicARE = derive { name="BicARE"; version="1.24.0"; sha256="0945kwimcbb7asp1jsadl97glyw26a0wqrymb8qb1zn5r6scplbv"; depends=[Biobase multtest GSEABase]; };
+BioMVCClass = derive { name="BioMVCClass"; version="1.34.0"; sha256="0yzpwynxyxqfjhggkq1jmfc86bxzfnzy4pc7b78q6flkkz025d0h"; depends=[MVCClass Biobase graph Rgraphviz]; };
+BioNet = derive { name="BioNet"; version="1.26.1"; sha256="0cwgjddx9zdbfwjcsx7qlzi2yw8jgi6xl69y1i87b00smi0dj0in"; depends=[Biobase graph RBGL AnnotationDbi]; };
+BioSeqClass = derive { name="BioSeqClass"; version="1.24.0"; sha256="13ry3kwlkpk5gr6rjkhip1hhd6b6b02v9hw30wz9qcwfai8fxklv"; depends=[Biostrings Biobase]; };
+Biobase = derive { name="Biobase"; version="2.26.0"; sha256="170vaqkpb2ycmydxh8kl0g7f0wmy5kks43sx4adrcbbnawza50f4"; depends=[BiocGenerics]; };
+BiocCaseStudies = derive { name="BiocCaseStudies"; version="1.28.0"; sha256="01xlfl5klhiwnn8cmp8jqrsr54c4d9s54flf8rjr5vb6n0gnfnwy"; depends=[Biobase]; };
+BiocCheck = derive { name="BiocCheck"; version="1.2.3"; sha256="0blcll935flkn9019mxzg0g1146z3h6lqy52kwq53alwqbqllxw0"; depends=[biocViews BiocInstaller graph]; };
+BiocGenerics = derive { name="BiocGenerics"; version="0.12.1"; sha256="0xszm3ppkw1mi509bz0vdnlabw3jp83s4lnjdpxbb9s65k3z4lfl"; depends=[]; };
+BiocInstaller = derive { name="BiocInstaller"; version="1.16.5"; sha256="1s9qvvr4cgxysvz1rr9bnnalmcc4jhbabfl3j7zcx77pdh14wkqb"; depends=[]; };
+BiocParallel = derive { name="BiocParallel"; version="1.0.3"; sha256="07zpmdy2yrk4rn20jjak2vdgab80xwlx98rw1zxglyk3hn17r71k"; depends=[BiocGenerics]; };
+BiocStyle = derive { name="BiocStyle"; version="1.4.1"; sha256="0s4518fd29ym9ql0pj9p5grym0ykddc85yp9rkpip9g3i9cy9izp"; depends=[]; };
+Biostrings = derive { name="Biostrings"; version="2.34.1"; sha256="1kfh3gabgfxnksadxd31qxv46j59l0gmfnxj197gmfhxxgwgh2mh"; depends=[BiocGenerics S4Vectors IRanges XVector BiocGenerics IRanges XVector zlibbioc S4Vectors IRanges XVector]; };
+BitSeq = derive { name="BitSeq"; version="1.10.0"; sha256="1g5znh2hyvc6ywzhqdr2f2wl81842wy9xsndmx7xswy6vkvalyc4"; depends=[Rsamtools zlibbioc S4Vectors IRanges Rsamtools zlibbioc]; };
+BrainStars = derive { name="BrainStars"; version="1.10.0"; sha256="17jb1n0ndh05gvwh0sjcqmn17i54p9q1g3520zhpqp7d2wz8diyi"; depends=[Biobase Biobase]; };
+BridgeDbR = derive { name="BridgeDbR"; version="1.0.0"; sha256="1m3gq4hssvaazgv966lwv0fh4b8hsxxipbfzmf6jrwlwkz1snvc0"; depends=[]; };
+BufferedMatrix = derive { name="BufferedMatrix"; version="1.30.0"; sha256="1c8asd6k9wkpdkmy5pgicr86kgp2y830w3zmha47jjsrni71fm2v"; depends=[]; };
+BufferedMatrixMethods = derive { name="BufferedMatrixMethods"; version="1.30.0"; sha256="0aih4b3is6qhb5ac3s2mmcmvmbscb3cv5kpgp7cn5zzsd6gqan34"; depends=[BufferedMatrix BufferedMatrix]; };
+CAFE = derive { name="CAFE"; version="1.2.0"; sha256="0h3gy904dgjggk84cjmx8k8x9482fx5cvvy8hcc39z97p39ar5wn"; depends=[biovizBase GenomicRanges IRanges ggbio affy annotate Biobase]; };
+CAGEr = derive { name="CAGEr"; version="1.10.3"; sha256="0dja1xszwy8nmn6id7yjh13x7myl36104y4kb4qs5fdc955ir93a"; depends=[BSgenome Rsamtools GenomicRanges IRanges rtracklayer]; };
+CALIB = derive { name="CALIB"; version="1.32.0"; sha256="17hm37xklsmizmwyaak3i657ly60afpl01zhrvd5jcp1z8p315rj"; depends=[limma limma]; };
+CAMERA = derive { name="CAMERA"; version="1.22.0"; sha256="17yv2q67xcdmnwlxd5yd3z3gq4rksbazzjk44g6caz8k1scl5yj6"; depends=[Biobase xcms xcms RBGL graph]; };
+CFAssay = derive { name="CFAssay"; version="1.0.0"; sha256="1j1x06fn516454d6drfmmznazifbpxnkna1j2q64lcjc0rlrwl6y"; depends=[]; };
+CGEN = derive { name="CGEN"; version="3.0.1"; sha256="1w06wk31wycbvs4xmb5qxxv2frprfa7rlxv5g3h0pbpi79w1s6f7"; depends=[]; };
+CGHbase = derive { name="CGHbase"; version="1.26.0"; sha256="16i8x78wmph5pi9bbijcblnrmq9d89y9wp44xisq12bd4n4f6a7r"; depends=[Biobase marray]; };
+CGHcall = derive { name="CGHcall"; version="2.28.0"; sha256="0v11d5y6l520jvrp3srbwwcl8llw5wf8yc2kmld5rznxbmbca70j"; depends=[impute DNAcopy Biobase CGHbase]; };
+CGHnormaliter = derive { name="CGHnormaliter"; version="1.20.0"; sha256="1dkqp42a3nb7pxn15s893n0qh8jjw7scnhxh15ddjq04wa4wcprw"; depends=[CGHcall CGHbase Biobase CGHbase CGHcall]; };
+CGHregions = derive { name="CGHregions"; version="1.24.0"; sha256="0c4df9sn1yx3zw0jpccxbbhnk9466zy2alkmrm3sk1cnfy867263"; depends=[Biobase CGHbase]; };
+CMA = derive { name="CMA"; version="1.24.0"; sha256="02c243b50zg3n1qz526zv66zff75iw58n27dvxp0cxxb8nnibdxk"; depends=[Biobase]; };
+CNAnorm = derive { name="CNAnorm"; version="1.12.0"; sha256="0fvgrk37g8k940fxhbwi3m5l3vm4dpiswlyac8jgkhzdab8zkigd"; depends=[DNAcopy]; };
+CNEr = derive { name="CNEr"; version="1.2.0"; sha256="1zsgpdx1jy32cgpd7sdgdn5j5jcl8rnhbaz084p426if6irb8q8c"; depends=[Biostrings GenomeInfoDb GenomicRanges rtracklayer XVector GenomicAlignments S4Vectors IRanges S4Vectors IRanges XVector]; };
+CNORdt = derive { name="CNORdt"; version="1.8.0"; sha256="0sx1d94z09d3r409v7dykli3fj0j37j1cslm7mdhh0bp9bi1fzfz"; depends=[CellNOptR]; };
+CNORfeeder = derive { name="CNORfeeder"; version="1.6.0"; sha256="1yzypx0pkyga4qhi11ngr2riq4rbj35lw5hy3pv82a5bwfi2vwxk"; depends=[CellNOptR graph]; };
+CNORfuzzy = derive { name="CNORfuzzy"; version="1.8.0"; sha256="0srg848n3cf10sp8v9cclrxpfn1zhjlb7n1ix2v0q9p3darsw15f"; depends=[CellNOptR]; };
+CNORode = derive { name="CNORode"; version="1.8.1"; sha256="1dhdcsqw73c3a7jm7341zf91xb08f40fjy38qppjyfyjfaibyxj4"; depends=[CellNOptR]; };
+CNTools = derive { name="CNTools"; version="1.22.0"; sha256="0hjd1qldnxsfwlc28g522lqf4ain9ad2pk03dhhnz046sddibv76"; depends=[genefilter]; };
+CNVrd2 = derive { name="CNVrd2"; version="1.4.0"; sha256="0m7632gq9j5y1vc5w2scbsrwga9n3cl8mvp8z4lw3j81qmilsc1c"; depends=[VariantAnnotation DNAcopy IRanges Rsamtools]; };
+CNVtools = derive { name="CNVtools"; version="1.60.0"; sha256="17igkk3c2vb66yvsq4x9aanxwp977jzagxx8q0wgphdgv4sggbvb"; depends=[]; };
+COHCAP = derive { name="COHCAP"; version="1.4.0"; sha256="1fv3zrp3d4lk7qd7wn52i54z89v7ldsakzy7jhdj6adyf1cm6rgf"; depends=[]; };
+COMPASS = derive { name="COMPASS"; version="1.4.0"; sha256="0gp77dfwgdvy7p9sr80ylpynfjq0yyrp20lzzp07sygvaaygs2aq"; depends=[]; };
+COPDSexualDimorphism = derive { name="COPDSexualDimorphism"; version="1.2.0"; sha256="02lsl2965ixhy1707qkhmc8rcdpq1qpyvbv09j4hkg20ymsrh4b8"; depends=[limma GenomicRanges]; };
+CORREP = derive { name="CORREP"; version="1.32.0"; sha256="0g2w9hzmdiwlal49x7cx1zvy8f5b52dc91xwqh61sh9sfn454423"; depends=[]; };
+COSNet = derive { name="COSNet"; version="1.0.0"; sha256="1d08y0mpvgpvwr08yjjh4v0phankm6b55m66m61qbb1xb0ix1rnz"; depends=[]; };
+CRISPRseek = derive { name="CRISPRseek"; version="1.4.2"; sha256="1x4wgvlqighycadr8rf70pvdk0fpnix78zkfqqbnvmw6sb0r28dk"; depends=[BiocGenerics Biostrings BSgenome]; };
+CRImage = derive { name="CRImage"; version="1.14.0"; sha256="118m3157izfjm5i2kail3cphys0cm1xnm7lj3s8j8k1wilq7y7fz"; depends=[EBImage DNAcopy aCGH]; };
+CSAR = derive { name="CSAR"; version="1.18.0"; sha256="1kzry6ixb6fr5468y8mi31m1anw42nk6xx844xyiavwd61547kx0"; depends=[S4Vectors IRanges GenomeInfoDb GenomicRanges]; };
+CSSP = derive { name="CSSP"; version="1.5.1"; sha256="06n5jhk1yr4ihb3hc888fyzr803hzjig4xzkdqq67m1rfnv51w3r"; depends=[]; };
+CancerMutationAnalysis = derive { name="CancerMutationAnalysis"; version="1.10.0"; sha256="0azqwgy95nqfs1i8biwfn8dbqmmdhqcw4r2f91q9njfrbnrgsgpy"; depends=[qvalue AnnotationDbi limma]; };
+Category = derive { name="Category"; version="2.32.0"; sha256="1cyphjvymyg530qkrjmxib63k5a1dd2wv8irj56ygifv8rzfib13"; depends=[BiocGenerics AnnotationDbi Biobase BiocGenerics graph Biobase AnnotationDbi RBGL GSEABase genefilter annotate]; };
+CellNOptR = derive { name="CellNOptR"; version="1.12.0"; sha256="1wfd0xavib58mnv6bnrsaznvmq370i7lnd565n7sk5cy09fwvnlh"; depends=[RBGL graph Rgraphviz]; };
+CexoR = derive { name="CexoR"; version="1.4.0"; sha256="1mp2xx2bjscirc9w54ix7ha20ysmhm0p51d7281fr3mibd5p2zny"; depends=[S4Vectors IRanges Rsamtools GenomeInfoDb GenomicRanges rtracklayer]; };
+ChAMP = derive { name="ChAMP"; version="1.4.1"; sha256="136al7yx68gnw43rsglwndhvbjvl139zvj27hjrmzn0h24d1sx73"; depends=[minfi sva limma DNAcopy preprocessCore impute marray wateRmelon]; };
+ChIPQC = derive { name="ChIPQC"; version="1.2.2"; sha256="07jgq5056c23lxi974pgg41nr93hhxz8ia8cbz9i9zn0jqwrrr0k"; depends=[DiffBind GenomicRanges BiocGenerics S4Vectors IRanges Rsamtools GenomicAlignments chipseq BiocParallel Biobase]; };
+ChIPXpress = derive { name="ChIPXpress"; version="1.8.0"; sha256="17qdklr99vxx9npa03svslysisfraxx5z3s8cd0zgjg4b00q2bdb"; depends=[Biobase GEOquery frma affy]; };
+ChIPpeakAnno = derive { name="ChIPpeakAnno"; version="2.16.4"; sha256="1321agyc1z14dqm9fjqbjbrbla0ykziqjx4k4v2smxp75xsxn3dk"; depends=[biomaRt IRanges Biostrings BiocGenerics BSgenome GenomicFeatures AnnotationDbi limma multtest]; };
+ChIPseeker = derive { name="ChIPseeker"; version="1.2.6"; sha256="07hgig4x64cnlq297zr6vcawvhrbj47qc26fqp14nl080w11rf9s"; depends=[BiocGenerics AnnotationDbi IRanges GenomeInfoDb GenomicRanges GenomicFeatures rtracklayer S4Vectors]; };
+ChIPseqR = derive { name="ChIPseqR"; version="1.20.0"; sha256="0fbcwv59mhmkqrfa3f3drfwwygkdbbxmxf3pf7v4d633qziwi6fb"; depends=[BiocGenerics S4Vectors ShortRead Biostrings GenomicRanges HilbertVis IRanges ShortRead]; };
+ChIPsim = derive { name="ChIPsim"; version="1.20.0"; sha256="1iw8r5qc3bjhldxa553yp5y4gv3g6x5lfwr4hbd4waydas01ncjf"; depends=[Biostrings IRanges XVector Biostrings ShortRead]; };
+ChemmineOB = derive { name="ChemmineOB"; version="1.4.1"; sha256="0yygn5p0dwj3zfdmipkqlpm1w9kd8i4pdb17xwcwaz5k7z1v4jzr"; depends=[BiocGenerics zlibbioc]; };
+ChemmineR = derive { name="ChemmineR"; version="2.18.1"; sha256="09vrv0bxmhhh40n4lpwmfk6imwbsxp2aanla3b3l9zia0w6r1h7k"; depends=[BiocGenerics]; };
+ChromHeatMap = derive { name="ChromHeatMap"; version="1.20.0"; sha256="0a66gh4xkw4f8xnh1ak1masy9k94dvnz3h5wfd06p8yx0pfycyrm"; depends=[BiocGenerics annotate AnnotationDbi Biobase IRanges rtracklayer]; };
+ClassifyR = derive { name="ClassifyR"; version="1.0.18"; sha256="1l5pqfqsjny1caxdglfi5qn85r0m52mr7ks9m98rkqgk10d1nclk"; depends=[Biobase BiocParallel]; };
+Clomial = derive { name="Clomial"; version="1.2.0"; sha256="0gfb3v9fvvf96qr1x3d59icsmx7mhns71fbz62bc3dr2434msa5p"; depends=[]; };
+Clonality = derive { name="Clonality"; version="1.14.0"; sha256="1vk0cn197xp64wdl7ff9xrac5x4rgx6b759a22jaaxc13vl38807"; depends=[DNAcopy DNAcopy]; };
+CoCiteStats = derive { name="CoCiteStats"; version="1.38.0"; sha256="1l7hvz1054yd43ix67vqkyfxirnpy073xphqll9lyjqdk1zkaxy0"; depends=[AnnotationDbi]; };
+CoGAPS = derive { name="CoGAPS"; version="2.0.0"; sha256="0hqrqf3sajf9fnwpas4hd0a6zdr2w882j9n8iwxylcas4iq9p0ya"; depends=[]; };
+CoRegNet = derive { name="CoRegNet"; version="1.1.7"; sha256="0dmm3qy8c0p7yjnhad0gi6vv08l3fw29zwy2sydrxf1x43wjjn3g"; depends=[]; };
+CompGO = derive { name="CompGO"; version="1.2.0"; sha256="1y21ha0dxg4gnwdkpsx051p9i3dsgp65yzzzbs3qzkrqf7qldccr"; depends=[RDAVIDWebService rtracklayer Rgraphviz GenomicFeatures pcaMethods pathview]; };
+ConsensusClusterPlus = derive { name="ConsensusClusterPlus"; version="1.20.0"; sha256="14ga3qamsj0h871k79nzmfq0462vir501d2pngs8fj0rh699n552"; depends=[Biobase]; };
+CopyNumber450k = derive { name="CopyNumber450k"; version="1.2.0"; sha256="181cydyzq9dym0jz6arn9nqgnzdp4gfhy51d27fw55zwnrhxlwv7"; depends=[Biobase minfi DNAcopy preprocessCore BiocGenerics]; };
+CorMut = derive { name="CorMut"; version="1.8.0"; sha256="1i7r4dwvs927dv1n3wa89wizjwj6pibsgry1zzhdifchi6gkyva8"; depends=[]; };
+Cormotif = derive { name="Cormotif"; version="1.12.0"; sha256="0xmac8m4i2x9d3gd1scxawiz6y8fqg92irs8j3ni81cijn9gbaxl"; depends=[affy limma affy]; };
+CoverageView = derive { name="CoverageView"; version="1.2.0"; sha256="09scvmd78cck922m3n8lvmgim2k8i376b5n2cwp0fmifwzwaxiqx"; depends=[Rsamtools rtracklayer IRanges GenomicRanges GenomicAlignments]; };
+DART = derive { name="DART"; version="1.12.0"; sha256="0nq43b2lld40720139wjx9pkmjdbkiwmcgaakdd7k3i0vqpriarw"; depends=[]; };
+DASiR = derive { name="DASiR"; version="1.6.0"; sha256="0k19nlw4wf1fiwgnm3l2y6mmmwqigh62nd2iqjchj4v7g3vd134w"; depends=[IRanges GenomicRanges Biostrings]; };
+DAVIDQuery = derive { name="DAVIDQuery"; version="1.26.0"; sha256="1ms5gqx2rf8k4cdwbjdfhyymdr59fyz6xmykgp398scl6kmgys6f"; depends=[]; };
+DBChIP = derive { name="DBChIP"; version="1.10.0"; sha256="0d36sqwzrcpm9i24f7qc8lbkgxcrhilx2ic8czhp3lk81p5wa9qn"; depends=[edgeR DESeq]; };
+DECIPHER = derive { name="DECIPHER"; version="1.12.0"; sha256="0fxgzwyx8z3xygkvw6divadymxgfanmm1clcxzr6j3inicqmcd9k"; depends=[Biostrings S4Vectors IRanges XVector Biostrings S4Vectors IRanges XVector]; };
+DEDS = derive { name="DEDS"; version="1.40.0"; sha256="1lzkcj2nil2d4aqwzi25s9y46p5rs2hs7is98iqphq49vw1xqxv5"; depends=[]; };
+DEGraph = derive { name="DEGraph"; version="1.18.0"; sha256="02f3wq0lpv6mwl1xbhggywwldf8ib34vll2fdgcyyxnw2y3z534y"; depends=[graph KEGGgraph RBGL Rgraphviz NCIgraph]; };
+DEGreport = derive { name="DEGreport"; version="1.0.0"; sha256="1fki0qc7ln3ivcwkb3ra4hf8xwvfpbrlarzqy8yf2rxw9bi6fi9d"; depends=[edgeR]; };
+DEGseq = derive { name="DEGseq"; version="1.20.0"; sha256="0ndb1kdbhjab6c2q44rc171877g3xqcq3zs1n789b7y55m95qpdc"; depends=[qvalue]; };
+DESeq = derive { name="DESeq"; version="1.18.0"; sha256="10q9ag2na6pxrxzh01y1j9sp3vw8h769lr986n35mmxxq40n50nc"; depends=[BiocGenerics Biobase genefilter geneplotter]; };
+DESeq2 = derive { name="DESeq2"; version="1.6.3"; sha256="1mc2ciyps16vsg3h7cxcl49k7n4rgbmal8qb3bqwa12jj5nnjpi0"; depends=[S4Vectors IRanges GenomicRanges BiocGenerics Biobase BiocParallel genefilter geneplotter]; };
+DEXSeq = derive { name="DEXSeq"; version="1.12.2"; sha256="0c2avg8likbs7mv6q7srwgf7qjlc2vk0qr0jbq97z0vjnb3h68fm"; depends=[Biobase GenomicRanges IRanges DESeq2 BiocParallel BiocGenerics biomaRt Rsamtools geneplotter genefilter]; };
+DFP = derive { name="DFP"; version="1.24.0"; sha256="1v0bvrjmzyxn1jc3fp1fzxa2pyxxmchb74vcq63j2gpnb2w35p52"; depends=[Biobase]; };
+DMRcate = derive { name="DMRcate"; version="1.2.0"; sha256="1klpsiwl2srip3dwlvdry1kjn5cpx6mmhakxrz0k7z07dy1c60zk"; depends=[limma minfi]; };
+DMRforPairs = derive { name="DMRforPairs"; version="1.2.0"; sha256="1asmwfph7aw8a8s9aj5pgzqdkfh9lnd5kv3y21jjm7vcmd5snd4h"; depends=[Gviz GenomicRanges]; };
+DNAcopy = derive { name="DNAcopy"; version="1.40.0"; sha256="109dwb43f7hxzkyygirabrnm3nd7ibzk228k1mvlpz55n7w8v98y"; depends=[]; };
+DNaseR = derive { name="DNaseR"; version="1.4.0"; sha256="189g6ww5361i0jzicb4qnvjdbrw3n9wgw749awmr1ai6igp7mg9g"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges Rsamtools]; };
+DOQTL = derive { name="DOQTL"; version="1.0.0"; sha256="12sxw204hxw59pcxgilhz9x5k0wqpn1cyds1ih6bf9497da3vbab"; depends=[annotate annotationTools biomaRt Biobase BiocGenerics GenomicRanges IRanges Rsamtools]; };
+DOSE = derive { name="DOSE"; version="2.4.0"; sha256="0swyzrx1aapnqszzwavl0insw6ml8hrvscvqmpwr72cssclq0p3d"; depends=[qvalue AnnotationDbi GOSemSim]; };
+DSS = derive { name="DSS"; version="2.4.1"; sha256="0lm8miyzg2cyc1p18qvv6g63wmk7d25q6igsk8p8p663y7jkm43s"; depends=[Biobase bsseq edgeR]; };
+DTA = derive { name="DTA"; version="2.12.1"; sha256="0rbwx2853388fvshrf8sz48ilcdrs4062isavaq5dwvma484jrdk"; depends=[]; };
+DeconRNASeq = derive { name="DeconRNASeq"; version="1.8.0"; sha256="0bk8q1dp0hnrkcymgimbymlz3v7s5bgzx59m51rcypypyhdnc3gi"; depends=[pcaMethods]; };
+DiffBind = derive { name="DiffBind"; version="1.12.3"; sha256="0rm1jgzrw5ik0pxryf7vrq715d0gvxfiid1amf9wk2s4vqxj2shj"; depends=[GenomicRanges limma GenomicAlignments edgeR IRanges zlibbioc S4Vectors Rsamtools]; };
+DirichletMultinomial = derive { name="DirichletMultinomial"; version="1.8.0"; sha256="10hip99fxyl9pb2kp810j5cr59i2xmn1x60ansgjdr0xcbp0791w"; depends=[S4Vectors IRanges]; };
+DriverNet = derive { name="DriverNet"; version="1.6.0"; sha256="00rccsf3zvyghx9a1gjs9smd5cf927rwx1fghnq5a9kkwg21sp5m"; depends=[]; };
+DrugVsDisease = derive { name="DrugVsDisease"; version="2.6.0"; sha256="1b5214gknp4dsgg1gc229kln89nlvddx2d202jaiqdgw9j0gyn4s"; depends=[affy limma biomaRt ArrayExpress GEOquery qvalue annotate BiocGenerics]; };
+DupChecker = derive { name="DupChecker"; version="1.4.0"; sha256="0k5yyi3hnz08x5fy7vhp0glhcjdp2mlgkvqmqw78w12af0pynpjf"; depends=[]; };
+DynDoc = derive { name="DynDoc"; version="1.44.0"; sha256="14vx87r20ccf08wx3a42rg2dg0ydbprwxsk24j5bmjxqkm45pmxc"; depends=[]; };
+EBImage = derive { name="EBImage"; version="4.8.3"; sha256="1lzbn2i8ikqghp5jnb3a0k2in3b9f4ck4imlk6l6ddi6szprmrrs"; depends=[BiocGenerics]; };
+EBSeq = derive { name="EBSeq"; version="1.6.0"; sha256="0k6azzbyxxaqblv326i0ykm414qhwsrr69k1l3dfbwvrh17giamv"; depends=[]; };
+EBSeqHMM = derive { name="EBSeqHMM"; version="1.0.0"; sha256="13nfj4ka0plli2yd69jmvy1qsqcprn0xbzqmr264v15msl94vqyx"; depends=[EBSeq]; };
+EBarrays = derive { name="EBarrays"; version="2.30.0"; sha256="1v32rzzx9brv3c0kl7zmxa09ah954nd1rynljm2l21h0swlrrr64"; depends=[Biobase Biobase]; };
+EBcoexpress = derive { name="EBcoexpress"; version="1.10.0"; sha256="0w684g7v2r55br4n9lb9r0sdm9p0z7v4cb38fy7nin8rcipkqh0r"; depends=[EBarrays]; };
+EDASeq = derive { name="EDASeq"; version="2.0.0"; sha256="1q0n1p7ba6kp7gq1fhvjg0bdwb34dxn0xvxqajh36xx34f1ksiv6"; depends=[Biobase ShortRead BiocGenerics IRanges DESeq aroma_light Rsamtools]; };
+EDDA = derive { name="EDDA"; version="1.5.3"; sha256="0syhwhqbpvazy6vnpkjx99m752fwdzkaqyq98kwx4pjikpw6j2zr"; depends=[DESeq baySeq edgeR DESeq baySeq edgeR]; };
+ELBOW = derive { name="ELBOW"; version="1.2.0"; sha256="0k2iaa5v2pr2h6vfa5r7lrqkvxsaq6hf4zi2si4n2qivm29s3hby"; depends=[]; };
+ENVISIONQuery = derive { name="ENVISIONQuery"; version="1.14.0"; sha256="1xhcvmw9px4kyg3p7wc08jrin0qkw7xi20jjy34fd6almnmk7mfd"; depends=[]; };
+EasyqpcR = derive { name="EasyqpcR"; version="1.8.0"; sha256="0ql9mj94yb0cpk0gwnhrlsc0xr6i7psral26vgp7zrzx5iw6zg9d"; depends=[]; };
+EnrichmentBrowser = derive { name="EnrichmentBrowser"; version="1.0.3"; sha256="03jq5w9hlgcc7yl2305jw6hlnrlpwg6mg131zya1cxzxrs12gv8b"; depends=[Biobase KEGGgraph KEGGREST Rgraphviz SPIA graph limma neaGUI qvalue safe]; };
+ExiMiR = derive { name="ExiMiR"; version="2.8.0"; sha256="19ghy4l1zcz3jfrcdzmlpwml2if618j2i5b0m8iw7ww7n1mapmvw"; depends=[Biobase affy limma affyio Biobase preprocessCore]; };
+ExpressionView = derive { name="ExpressionView"; version="1.18.0"; sha256="1kw2gdflfnqs4pkyjk1qjxdk1xafl7qx4vwjb7fd1c26wk28b6xh"; depends=[eisa AnnotationDbi eisa AnnotationDbi]; };
+FEM = derive { name="FEM"; version="1.0.0"; sha256="019iw3rgzym59332pw941lw8n7hnk9arc237d3y1ayrwgxh73b3r"; depends=[marray impute limma graph BiocGenerics]; };
+FGNet = derive { name="FGNet"; version="3.0.7"; sha256="05kxjizcimfyjcjqpzgxlnj5lssbiq05bq5q64h7xxyyia3913n8"; depends=[]; };
+FRGEpistasis = derive { name="FRGEpistasis"; version="1.2.0"; sha256="00d1q06rkvbblajiqjyv87vsa3g1mzg4km2z0548g503k961cp8d"; depends=[]; };
+FourCSeq = derive { name="FourCSeq"; version="1.0.0"; sha256="11f340ri3s3qjqpf4vjngrz1vrpilkyg69cn09kpfs5vvh6y7wii"; depends=[GenomicRanges DESeq2 DESeq2 Biobase Biostrings GenomicRanges Rsamtools ggbio rtracklayer GenomicAlignments]; };
+FunciSNP = derive { name="FunciSNP"; version="1.8.0"; sha256="0ns1c2zsdkrgzq3a6mdd057h13sgh175sbvadibz06gj22008ka6"; depends=[AnnotationDbi IRanges Rsamtools rtracklayer ChIPpeakAnno GenomicRanges VariantAnnotation snpStats]; };
+GENE_E = derive { name="GENE.E"; version="1.6.0"; sha256="0g7ghg5mksaazivgb8m2faizcbpzkddh35417f8qi6hbl8a7kpja"; depends=[rhdf5 rhdf5]; };
+GEOmetadb = derive { name="GEOmetadb"; version="1.26.1"; sha256="10n56xlx61j6rjzz6g3079s9jv3n0ra5l83q63qpg7g563ddihmk"; depends=[GEOquery]; };
+GEOquery = derive { name="GEOquery"; version="2.32.0"; sha256="079f5c6gxms014jqyc41g174qic9ka08j9jk4jlynf7a689hf8v4"; depends=[Biobase]; };
+GEOsubmission = derive { name="GEOsubmission"; version="1.18.0"; sha256="12zk2izm1gliky5lpfzs31ymnv73sal6f2vi15lppfcxklj2zsmx"; depends=[affy Biobase]; };
+GEWIST = derive { name="GEWIST"; version="1.10.0"; sha256="1lh7d2fz1nnadl01iyrflpja04xzl01j1zzpsavmj5m7g8d6l525"; depends=[]; };
+GGBase = derive { name="GGBase"; version="3.28.0"; sha256="05y237f0azkgv8xgl357gf7j8024hjq0padz8wv1slw6p8frsqb8"; depends=[snpStats limma genefilter Biobase BiocGenerics AnnotationDbi GenomicRanges]; };
+GGtools = derive { name="GGtools"; version="5.2.0"; sha256="0ikx3xsx11pdqi1245xqsj3y0r64ry0qbvgdrvv5cjhlgf172qgw"; depends=[GGBase BiocGenerics snpStats Rsamtools AnnotationDbi Biobase VariantAnnotation rtracklayer Gviz S4Vectors IRanges GenomeInfoDb GenomicRanges Biostrings]; };
+GLAD = derive { name="GLAD"; version="2.30.0"; sha256="1wlf2mxay26j9lbnizj2fbs7rhq0qpqrsxm3gzn8dabs01qhm109"; depends=[]; };
+GOFunction = derive { name="GOFunction"; version="1.14.0"; sha256="1p7hfg9apyks9l8swc55x89b556fwf3g259pl4r62yf035jdiw1k"; depends=[Biobase graph Rgraphviz AnnotationDbi Biobase graph Rgraphviz AnnotationDbi]; };
+GOSemSim = derive { name="GOSemSim"; version="1.24.1"; sha256="12qf8ahfchkqs0f37y0hz5yng24myr7svls6s72z9xbmcrzrzmj6"; depends=[AnnotationDbi]; };
+GOSim = derive { name="GOSim"; version="1.8.0"; sha256="1kkj2mg9d4w8kzcy468drk95lvbknjsib68d1v165g0wvbm2hqxw"; depends=[annotate AnnotationDbi topGO RBGL graph]; };
+GOTHiC = derive { name="GOTHiC"; version="1.2.2"; sha256="17lqkd6yi6pzd2q1jaq1fg8qy4shqrn7pj8l8lw92cib2sbhbrgs"; depends=[GenomicRanges Biostrings BSgenome BiocGenerics S4Vectors IRanges ShortRead rtracklayer]; };
+GOexpress = derive { name="GOexpress"; version="1.0.1"; sha256="0yxgcpy6z5dgd3hkgcikbbq30rx682n0arqic8dns5mg6mns428p"; depends=[Biobase biomaRt]; };
+GOstats = derive { name="GOstats"; version="2.32.0"; sha256="12yxqavqvxq5b53fr79czlxmnz9mwbchqcmsmgdvzqdca4kh6b0l"; depends=[Biobase Category graph AnnotationDbi Biobase Category RBGL annotate graph AnnotationForge]; };
+GOsummaries = derive { name="GOsummaries"; version="2.0.0"; sha256="0gikgj4hxy9qrbyy3282x896fch5q67gdi8d2havqqrzi65mfgxa"; depends=[limma]; };
+GRENITS = derive { name="GRENITS"; version="1.18.0"; sha256="1wx8y472jkvszkb0rf944mzb1dzcwqxbf8qwgzmm07s6hcwyi6xg"; depends=[]; };
+GSAR = derive { name="GSAR"; version="1.0.0"; sha256="1pfm6d2av87kq17f1b7gz4fg8krvf237vdap5b6bv7n3lbh2d7p5"; depends=[]; };
+GSCA = derive { name="GSCA"; version="1.4.0"; sha256="0j1n99w7d293kfrc6g96lkvi624d6v85993hfysbcx9nksajkcdw"; depends=[rhdf5]; };
+GSEABase = derive { name="GSEABase"; version="1.28.0"; sha256="1g602vlaw4fxg87w8dczidij58r9fwn3ql68cd51ar5kbz9cr65s"; depends=[BiocGenerics Biobase annotate graph AnnotationDbi]; };
+GSEAlm = derive { name="GSEAlm"; version="1.26.0"; sha256="12qfpwzqd09w25nqi98551vspigzmxzvvbp0bl68zbl937c971v2"; depends=[Biobase]; };
+GSRI = derive { name="GSRI"; version="2.14.0"; sha256="1fsm4zrcqbm14ls3sm8wmbxzmnsn1vn64kl9kkfgijvj0jw92qzs"; depends=[genefilter Biobase GSEABase les]; };
+GSReg = derive { name="GSReg"; version="1.0.0"; sha256="13yxchr44vcfzhmm69xgjhf326n0arjla5qvib3arqa0vs3b10qn"; depends=[]; };
+GSVA = derive { name="GSVA"; version="1.14.1"; sha256="1i8v09yd8ikyicmdcszvinifzp44irkqrz1n58wyhhq6iz32gl87"; depends=[BiocGenerics Biobase GSEABase]; };
+GWASTools = derive { name="GWASTools"; version="1.12.2"; sha256="06g3wbnr70dw7bgbiid4qcjnvvzdvc0vn3mc3i757h8sdd8ina5x"; depends=[Biobase gdsfmt DNAcopy quantsmooth]; };
+GeneAnswers = derive { name="GeneAnswers"; version="2.8.0"; sha256="04hb6ja695c1jn7w47rdbz15qvl74ddq7wvkqxlbz7n670n5vqh3"; depends=[annotate Biobase Heatplus RBGL annotate]; };
+GeneExpressionSignature = derive { name="GeneExpressionSignature"; version="1.12.0"; sha256="04wmgsxbv2gzp0f9bnr3zqmjhjj9ph96jjmvkjldq88ryq8zwlbm"; depends=[Biobase PGSEA]; };
+GeneGA = derive { name="GeneGA"; version="1.16.0"; sha256="18l3mpvadw02gclggx7288jpaim0rkz6h9j3wy6351bj0h1ki4s6"; depends=[]; };
+GeneMeta = derive { name="GeneMeta"; version="1.38.0"; sha256="18lrszvq7a18ndgn1ylgf14xaz9sck3s0f7hhfakgjmm43yg9m2j"; depends=[Biobase genefilter Biobase]; };
+GeneNetworkBuilder = derive { name="GeneNetworkBuilder"; version="1.8.0"; sha256="068y7ak8w62nj3p55cs5kljzfq74m06g7nrbclqjx9jbsa3lpc12"; depends=[graph graph]; };
+GeneOverlap = derive { name="GeneOverlap"; version="1.2.0"; sha256="0yjbclrb1vkpf4jckwggpp4mmq7vh5z0maqy9rswk98a5ybd25lk"; depends=[]; };
+GeneRegionScan = derive { name="GeneRegionScan"; version="1.22.0"; sha256="0x50d1a7h6npkxvwsxl7dv47ww5a0w5frj833hni1j65z62v7h32"; depends=[Biobase Biostrings Biobase affxparser Biostrings]; };
+GeneSelectMMD = derive { name="GeneSelectMMD"; version="2.10.0"; sha256="0n5sa8zz804qkx3rayvw23xf7g96ynavm1jrvka18vcf9jaymy96"; depends=[Biobase Biobase limma]; };
+GeneSelector = derive { name="GeneSelector"; version="2.16.0"; sha256="1prkrn9fjxbklp5mck6fi310y98b79fa7nj1h1s858lcddkm53l5"; depends=[Biobase multtest siggenes limma]; };
+GeneticsDesign = derive { name="GeneticsDesign"; version="1.34.0"; sha256="1ixz68hn11dn83c1dnryj9jaad6gwbnnvn2478njsl9sqca5x1hj"; depends=[]; };
+GeneticsPed = derive { name="GeneticsPed"; version="1.28.0"; sha256="1qw6agvkjm9b747lbvqw24y8gflp4bhkasp2vjizjyjf8jy0br7j"; depends=[]; };
+GenoView = derive { name="GenoView"; version="1.0.0"; sha256="116q5k2byizpd6fax7l0nvlh8fablnmjjphm8kjf5clzc5dqlnyz"; depends=[GenomicRanges ggbio biovizBase]; };
+GenomeGraphs = derive { name="GenomeGraphs"; version="1.26.0"; sha256="0l7gx0fn29wyac0vjsw1wh5j2232ngbzyhb7ihnq8hh1krhsml4s"; depends=[biomaRt]; };
+GenomeInfoDb = derive { name="GenomeInfoDb"; version="1.2.5"; sha256="1rmxk4wyjgycdqc3f7pnyjcz7n1j8w8wkik2qcq50xka4wh2sw0k"; depends=[BiocGenerics S4Vectors IRanges BiocGenerics S4Vectors]; };
+GenomicAlignments = derive { name="GenomicAlignments"; version="1.2.2"; sha256="00kk1gq6iiig9746j9h8ac2l4dvwz824pjy0hs7w5kwysq0szjxz"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges Biostrings Rsamtools BiocGenerics S4Vectors IRanges GenomicRanges Biostrings Rsamtools BiocParallel S4Vectors IRanges]; };
+GenomicFeatures = derive { name="GenomicFeatures"; version="1.18.7"; sha256="0rxll1qvw43gmk0x5hknlmjr3wdnjyc6s6lif60yj1qk1y66ijpx"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges AnnotationDbi Biostrings rtracklayer biomaRt Biobase]; };
+GenomicFiles = derive { name="GenomicFiles"; version="1.2.1"; sha256="0jwj30ppknsgsac3750d3b7f7fp5m3g9px8ghlkvb1chw1x0lhrw"; depends=[BiocGenerics Rsamtools GenomicRanges rtracklayer BiocParallel GenomicAlignments IRanges]; };
+GenomicInteractions = derive { name="GenomicInteractions"; version="1.0.3"; sha256="0hczqam6isn1rw4xn4dxzgvrg11kwzs6ysy5i3xxyzyf23yqjbwf"; depends=[Rsamtools GenomicRanges IRanges rtracklayer]; };
+GenomicRanges = derive { name="GenomicRanges"; version="1.18.4"; sha256="1aaa1wqcyk7jsi4nzg6kyh3awwzi323qnj1ibg2zfqzj9lv6ixqz"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb XVector S4Vectors IRanges]; };
+GenomicTuples = derive { name="GenomicTuples"; version="1.0.0"; sha256="15pwq8zsr20ygy1mwm2q3siljkj51h8cr61n8jcphd8h29xjvhjk"; depends=[GenomicRanges GenomeInfoDb BiocGenerics S4Vectors Biobase]; };
+Genominator = derive { name="Genominator"; version="1.20.0"; sha256="1a9zw05asmrl848yii4bkszj2lsh6jank095g8zcp1yrncdgszi1"; depends=[BiocGenerics IRanges GenomeGraphs]; };
+GlobalAncova = derive { name="GlobalAncova"; version="3.34.0"; sha256="1k8b3p1g7igqynvhq4jpvzcx739q6fk05zahrdxcipi7r58y9f61"; depends=[globaltest annotate AnnotationDbi]; };
+GraphAT = derive { name="GraphAT"; version="1.38.0"; sha256="18zy8d1b5q6v6sx0gpgzbyhwf8h87c5vf4i2zagsjn6k26v12f7g"; depends=[graph graph]; };
+GraphAlignment = derive { name="GraphAlignment"; version="1.30.0"; sha256="0rr4kq3r5wlh8mgn0raggdhc3j59x9k3qnzllm6khhp053gjr32f"; depends=[]; };
+GraphPAC = derive { name="GraphPAC"; version="1.8.0"; sha256="0pgxnhbqq919rawcbpjdy8xd5q22rb34grbfnhq8m0lwd8an9hzr"; depends=[iPAC]; };
+Gviz = derive { name="Gviz"; version="1.10.11"; sha256="0mfwb230xh77a0qkfp6207sack9g3aksw9mrpyhyk35pfzrh4k8m"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges XVector rtracklayer biomaRt AnnotationDbi Biobase GenomicFeatures BSgenome Biostrings biovizBase Rsamtools GenomicAlignments]; };
+HCsnip = derive { name="HCsnip"; version="1.6.0"; sha256="0fc7fn3v2zz6p94n14wj5xamq5c49bdinkrgkm5q9rpdd55hzyah"; depends=[impute sigaR Biobase]; };
+HDTD = derive { name="HDTD"; version="1.0.0"; sha256="16mgcb512q4r49a0jxa24k7cs1ivzaq0638m3xfl8qp64mhycd4n"; depends=[]; };
+HELP = derive { name="HELP"; version="1.24.0"; sha256="02gwdasbkh2gwc2cr1jhsb5w1i4jwfgdrdfgi5a7c76k37wy7m09"; depends=[Biobase]; };
+HEM = derive { name="HEM"; version="1.38.0"; sha256="0hmibyl9jbagr2w1lcy7vcbxbbnqh5r03ya39c0x6sanh9mswbf2"; depends=[Biobase]; };
+HMMcopy = derive { name="HMMcopy"; version="1.8.0"; sha256="1wh3ha3yk79ci1amna3wcm5nmwq1dsvz6qgf72xcnx3x5d6f5v49"; depends=[IRanges geneplotter]; };
+HTSFilter = derive { name="HTSFilter"; version="1.6.0"; sha256="0wmag2q92364fs36y1hjxkkvi0ng408sphra5rk728g5panqh4j6"; depends=[Biobase DESeq edgeR DESeq2 GenomicRanges IRanges]; };
+HTSanalyzeR = derive { name="HTSanalyzeR"; version="2.18.0"; sha256="1gvqzcy6zv984kl29w8vwz6sajz4azk8navlk0vq47crady1x1wq"; depends=[graph GSEABase BioNet cellHTS2 AnnotationDbi biomaRt RankProd]; };
+HTSeqGenie = derive { name="HTSeqGenie"; version="3.16.1"; sha256="0zciancr64d37a9akcr6hkha5f2wkb88jn0grpgs2gdji130pfa0"; depends=[gmapR ShortRead VariantAnnotation BiocGenerics IRanges GenomicRanges Rsamtools Biostrings chipseq GenomicFeatures BiocParallel rtracklayer GenomicAlignments VariantTools]; };
+HTqPCR = derive { name="HTqPCR"; version="1.20.0"; sha256="0z3872svkx86jjygcsqyh7z6a5i5rhrslyn3i2hxixwhscn5kib7"; depends=[Biobase limma affy Biobase limma]; };
+Harshlight = derive { name="Harshlight"; version="1.38.0"; sha256="02q2kyad3613z77sycq0w69lc8jl1a8s99a5lcpir0dviw9brhzc"; depends=[affy altcdfenvs Biobase]; };
+Heatplus = derive { name="Heatplus"; version="2.12.0"; sha256="0hnf9ybrj24nr2hybh4lnxv9lxazzhkz53kd8r3xh2irwvf6mpnq"; depends=[]; };
+HiTC = derive { name="HiTC"; version="1.10.0"; sha256="0brb21jh98a1518hkn7ni93qjcibfi4p2x407xrvfkbb9vdwmk5h"; depends=[IRanges GenomicRanges Biostrings rtracklayer]; };
+HilbertVis = derive { name="HilbertVis"; version="1.24.0"; sha256="06qsmfy0p4m1x4w9az0cw1fh8fr59kzc6sskkzihb2kl51vbjfcz"; depends=[]; };
+HilbertVisGUI = derive { name="HilbertVisGUI"; version="1.24.0"; sha256="14488b09kvap9m6xh93vrbi3d1wla1246sa0siamxvhpvsnl4gs0"; depends=[HilbertVis]; };
+HybridMTest = derive { name="HybridMTest"; version="1.10.0"; sha256="0c4ikl59b7wwygj4xyvcdla3xq5jpfbyvsl9n53fdxk1f5lhr7f1"; depends=[Biobase]; };
+IMPCdata = derive { name="IMPCdata"; version="1.0.0"; sha256="0ga6l0xza2cdl6i5nimqnvm804vmhb9lcn5aizzlcsn575m3nhy5"; depends=[]; };
+INPower = derive { name="INPower"; version="1.2.0"; sha256="0i83nympny2pr2jvxmdhl8wiafamq4dnzpn1np50j0zkgmnjvvny"; depends=[]; };
+IPPD = derive { name="IPPD"; version="1.14.0"; sha256="14yx5rwwihjwx8rpsgkkgmc3bz6pzc91pa0qq8cz1czscj5srca9"; depends=[]; };
+IRanges = derive { name="IRanges"; version="2.0.1"; sha256="1f9xki5b0ypp01ns3y54b21ypi7lk6gdb2368zz6ky3hjnwgq9kc"; depends=[BiocGenerics S4Vectors S4Vectors]; };
+ITALICS = derive { name="ITALICS"; version="2.26.0"; sha256="12h0c89q2f4iq3pma2z8c3kzy63mpzcxdpbj3jmsmdzlr34p2rca"; depends=[GLAD oligo affxparser affxparser GLAD oligo oligoClasses]; };
+Icens = derive { name="Icens"; version="1.38.0"; sha256="02pzhwwhp7l9iv20h928df82c1h647lpdqcdxi8wsfqqayzhb27n"; depends=[]; };
+IdMappingAnalysis = derive { name="IdMappingAnalysis"; version="1.10.0"; sha256="0jdx6xqwv8kx3jb391nzv2qv77qj8vjhx815fgfr09k3nlh9j46l"; depends=[Biobase]; };
+IdMappingRetrieval = derive { name="IdMappingRetrieval"; version="1.12.0"; sha256="05pdmfqb7dk8bd6y09jxaazhwvds62mhbfpwc3rhsv4lzbgkjz47"; depends=[ENVISIONQuery biomaRt ENVISIONQuery DAVIDQuery AffyCompatible]; };
+IdeoViz = derive { name="IdeoViz"; version="1.0.0"; sha256="1641pzxprp5izrh3vlryzwvkxaq2rv58ahb75gwi34ma6qf2v37r"; depends=[Biobase IRanges GenomicRanges rtracklayer GenomeInfoDb]; };
+IsoGeneGUI = derive { name="IsoGeneGUI"; version="2.0.0"; sha256="0jprrffb88rc59ycsf3vk1jcvnprgh17cfymqaws88w0sqb5n7y7"; depends=[multtest geneplotter Biobase]; };
+KCsmart = derive { name="KCsmart"; version="2.24.0"; sha256="1p248qq36csg015k0grnrgyrbzbyclvfp52p9x3fd0zcw05lqi27"; depends=[siggenes multtest BiocGenerics]; };
+KEGGREST = derive { name="KEGGREST"; version="1.6.4"; sha256="1mz0yd2wa55hawmj961phmdcha8hs1q2cxg8sxadbk09k37msgcn"; depends=[Biostrings]; };
+KEGGgraph = derive { name="KEGGgraph"; version="1.24.0"; sha256="15h6mphrx39rvp07qj11b4kys9wx6xlma4z350lic8b9ab3ci4wg"; depends=[graph graph]; };
+KEGGprofile = derive { name="KEGGprofile"; version="1.8.2"; sha256="0wv9s0n8yby88b40l0a6v0vkgplqg6qm12ni45afs1vslfw4d28r"; depends=[AnnotationDbi KEGGREST biomaRt]; };
+LBE = derive { name="LBE"; version="1.34.0"; sha256="0archkaxwiljxp6bsgkils6b66gm9wrvkd2w0nlh712qz7plp1a6"; depends=[]; };
+LMGene = derive { name="LMGene"; version="2.22.0"; sha256="1vl0zyfl6vispk7cll0xfpblabmz71jj07k4csckl64x2imqz199"; depends=[Biobase multtest affy]; };
+LPE = derive { name="LPE"; version="1.40.0"; sha256="181zknwrassnw0iqphqlr9bw2pnzpk05ch4almzj1pcp5l52i5sc"; depends=[]; };
+LPEadj = derive { name="LPEadj"; version="1.26.0"; sha256="0pbq1a5rqwyv1s5bncrymiw1dqf0mwippmc4gn1qzjk609myis8x"; depends=[LPE LPE]; };
+LVSmiRNA = derive { name="LVSmiRNA"; version="1.16.0"; sha256="0s70fkxx4ghhz2d8ammp22brs0066hq2sxwc8fhczs206fvj0x7m"; depends=[BiocGenerics Biobase limma affy vsn]; };
+LiquidAssociation = derive { name="LiquidAssociation"; version="1.20.0"; sha256="0i5bbcyasykxqxsd7i0slx1dhlk9v21v74zsj99n8z6rbds0ggzc"; depends=[Biobase]; };
+M3D = derive { name="M3D"; version="1.1.4"; sha256="0q8b7k40hcd0yb8c5y8wm88azvdj5w3cpmi3x4x5axjid2qx0ms3"; depends=[GenomicRanges IRanges BiSeq]; };
+MAIT = derive { name="MAIT"; version="1.0.0"; sha256="10m59b0l3wsmpwmswbpnx91hf3pl69nq0b2j1iwj03qp7khx6xsk"; depends=[CAMERA xcms]; };
+MANOR = derive { name="MANOR"; version="1.38.0"; sha256="18vvi17zjb034s7w73acy59fpb39kskpzkspwh0q3cggvypaccq9"; depends=[GLAD GLAD]; };
+MBASED = derive { name="MBASED"; version="1.0.0"; sha256="1j0g5qlncvba7rylic4bh1hx19kddxwvjg455fkw5iigpsgny5cc"; depends=[BiocGenerics BiocParallel GenomicRanges]; };
+MBAmethyl = derive { name="MBAmethyl"; version="1.0.0"; sha256="1ahxiajqafaw8p9fw8v9f7g7vcf6h6cj2mpxznc0vbv9wdz1a2l9"; depends=[]; };
+MBCB = derive { name="MBCB"; version="1.20.0"; sha256="19s52g3ck475rdghcmbnk852ki3f050bcb286jz812zia1859px5"; depends=[preprocessCore]; };
+MCRestimate = derive { name="MCRestimate"; version="2.22.0"; sha256="0brkdxqdh631wpa1sr5qxkj0g9g6l8b7257ayndjjj48p30nprj5"; depends=[Biobase]; };
+MEDIPS = derive { name="MEDIPS"; version="1.16.0"; sha256="035jj91wh1j3qzyhi487lwr939z6f88nprs60m0w117082926l32"; depends=[BSgenome DNAcopy Biostrings BSgenome Rsamtools IRanges GenomicRanges edgeR GenomicFeatures DNAcopy biomaRt rtracklayer]; };
+MEDME = derive { name="MEDME"; version="1.26.0"; sha256="0bl8g35y1z7zq8cyq3hy0npgbr015wiw0dbqwfw57n0kckmmk9vc"; depends=[Biostrings]; };
+MEIGOR = derive { name="MEIGOR"; version="1.0.0"; sha256="06dc7v3j39jglpm65nc6b5jf827mz8cjd6fnmbaqdk99kcripqdg"; depends=[CNORode]; };
+MGFM = derive { name="MGFM"; version="1.0.0"; sha256="0qv0851jlpn9xydgf3x0mxdhgbw50adfqqw3gf9sny83rx0vxy4z"; depends=[AnnotationDbi annotate]; };
+MIMOSA = derive { name="MIMOSA"; version="1.2.0"; sha256="1lyxl39cjb58vi7pfzdsxcyw0f4llabax3866pfdalpqh1d8p9yr"; depends=[Biobase]; };
+MLInterfaces = derive { name="MLInterfaces"; version="1.46.0"; sha256="0hc9z07ajda5qhsa20ddalpp1aj9j1hsy59jvam3jdby5hkklin5"; depends=[Biobase annotate genefilter]; };
+MLP = derive { name="MLP"; version="1.14.0"; sha256="0n5gp4qf6x1ahzbigqjabrv8d090byv87vx7wk0al7534lm9c5g7"; depends=[AnnotationDbi affy]; };
+MLSeq = derive { name="MLSeq"; version="1.2.0"; sha256="0kdrlijq4cah7jdqw3fymkv21wp32ra85vv2y71m8m111bf91cm0"; depends=[DESeq2 Biobase limma edgeR]; };
+MMDiff = derive { name="MMDiff"; version="1.6.0"; sha256="0rif1y2i6s91qn6220q3avrddgicsmlsxhh8rls0ri9gsl4f16b7"; depends=[GenomicRanges DiffBind Rsamtools GenomicRanges IRanges Biobase]; };
+MPFE = derive { name="MPFE"; version="1.0.0"; sha256="0lgzcdzasf50r0aj3lgbifq2yqyppbr1q9zgaahc84gg0dybcbyn"; depends=[]; };
+MSGFgui = derive { name="MSGFgui"; version="1.0.2"; sha256="1qklwy9wc81la49fjj8kmwds9d6ydnkgbgb4r3lzyr8k5g4v75ik"; depends=[mzR mzID MSGFplus]; };
+MSGFplus = derive { name="MSGFplus"; version="1.0.5"; sha256="0h0m0rnfr5lyaskrrmdqcv8182hi8gl7nmnqk3fs61a23rf3i8sk"; depends=[mzID]; };
+MSnID = derive { name="MSnID"; version="1.0.1"; sha256="02grqlsqcgv1ricx7wyd4l72s35w1k92m80kkjm4afhx6aqv9wsf"; depends=[MSnbase mzID Biobase mzR]; };
+MSnbase = derive { name="MSnbase"; version="1.14.2"; sha256="1sxkdp41qdih3vz7zakqmws33yhpsggcg30w6sl7p23lmixbkqrl"; depends=[BiocGenerics Biobase mzR BiocParallel IRanges preprocessCore vsn affy impute pcaMethods mzID]; };
+MSstats = derive { name="MSstats"; version="2.4.0"; sha256="0srlcd2k1h23zj3h5g73b3rdbi2hg0mna35mvvv4l4i7k603dxsp"; depends=[MSnbase marray limma preprocessCore]; };
+MVCClass = derive { name="MVCClass"; version="1.40.0"; sha256="1ix9yb97wbhi6577p2kp84c13g8rmikzbqcdc9vd6bp61f3bf484"; depends=[]; };
+MantelCorr = derive { name="MantelCorr"; version="1.36.0"; sha256="1a5m54ljsfgrpbhj9n3yz67s10pspl050a5sjrkq2cvx0hyk4wwg"; depends=[]; };
+MassArray = derive { name="MassArray"; version="1.18.0"; sha256="0lmyfjrak3fm2zmc0k1db4yyb38xzzichb1if3lda6v0wlq86yxn"; depends=[]; };
+MassSpecWavelet = derive { name="MassSpecWavelet"; version="1.32.0"; sha256="16xfcdrsy2c68kib1yicqllzydn8l143n1zxrpzw1zrj32zwdd04"; depends=[]; };
+MeSHDbi = derive { name="MeSHDbi"; version="1.2.7"; sha256="159lx1xgpyn9mj40fnfnz13qjahs18xsvsyj9crfbh5y5q8d308z"; depends=[AnnotationDbi Biobase]; };
+MeasurementError_cor = derive { name="MeasurementError.cor"; version="1.38.0"; sha256="1q5y46sjd4gbb9sckhkjjj6kb4df511f9822dbibdccav9y9pfgq"; depends=[]; };
+MergeMaid = derive { name="MergeMaid"; version="2.38.0"; sha256="0y3qa7hw9c74x7q1j5nmy21xp7rp5bgkgngc4yk3kkd8z8ik2kvi"; depends=[Biobase]; };
+Metab = derive { name="Metab"; version="1.0.0"; sha256="0rlr1dckg07qd76cfsdyjna0phjcbcqsqdbbciyv774cb7fhca0j"; depends=[xcms]; };
+MethylAid = derive { name="MethylAid"; version="1.0.2"; sha256="0rsv93k3j61q237sh65b69k3d81abd7zq7nxvklwkyyhyyp25p7c"; depends=[BiocParallel minfi]; };
+MethylMix = derive { name="MethylMix"; version="1.0.0"; sha256="0yqgsh7y6qxlvq3d7j8ywdxflmrr2p6pfdlgblmfydcg64hv3c49"; depends=[]; };
+MethylSeekR = derive { name="MethylSeekR"; version="1.6.0"; sha256="1dlrnmraslmr51zvfdbssizgc7h4kldb480vvaak3kzqs3k1lsfv"; depends=[rtracklayer IRanges BSgenome GenomicRanges geneplotter]; };
+Mfuzz = derive { name="Mfuzz"; version="2.26.0"; sha256="1x1jz0x6l38ssil5zassxa6dvm4m4fq904vdhjnivqhl2akcabvh"; depends=[Biobase tkWidgets]; };
+MiChip = derive { name="MiChip"; version="1.20.0"; sha256="17cjxg487fhb2fv3cj9fkswbdv9fflnj530kksxckmx759pzv5xb"; depends=[Biobase Biobase]; };
+MiPP = derive { name="MiPP"; version="1.38.0"; sha256="1m3c6x412hzhkf1i8w708qj099ag9sikvsdll1n9gp174asg5idn"; depends=[Biobase]; };
+MiRaGE = derive { name="MiRaGE"; version="1.8.0"; sha256="1kcjlja6bmgkwx8l1mywf3n36a9gwx04gzppb3x89hrkrhip95m9"; depends=[Biobase AnnotationDbi BiocGenerics]; };
+MineICA = derive { name="MineICA"; version="1.6.0"; sha256="08qy899p44j4kgrwllyvqp6wd1z1gzq9krm46n2i84kdkz5vqy1i"; depends=[Biobase biomaRt GOstats marray Rgraphviz graph annotate AnnotationDbi lumi]; };
+MinimumDistance = derive { name="MinimumDistance"; version="1.10.2"; sha256="1c8skic7m2hiyccbg2iclrlgq8h3ra3d23j9b4iliwhpjqip1y8j"; depends=[oligoClasses S4Vectors VanillaICE Biobase DNAcopy BiocGenerics IRanges GenomicRanges GenomeInfoDb]; };
+Mirsynergy = derive { name="Mirsynergy"; version="1.2.0"; sha256="00y510f0c4w9cmaymm5l59j0yjiv9jwcv5ihds83c5x2hpivzv84"; depends=[]; };
+MmPalateMiRNA = derive { name="MmPalateMiRNA"; version="1.16.0"; sha256="0jg925daxwhr99dxp841w5z20cgpc185n0w1n8nnjwpyah950v83"; depends=[Biobase limma vsn limma Biobase]; };
+MoPS = derive { name="MoPS"; version="1.0.0"; sha256="18bxh9jwdm85nb3v4sn8k55fl8hv79h80f3dy0d10vfpwjf9aabi"; depends=[Biobase]; };
+MotIV = derive { name="MotIV"; version="1.22.0"; sha256="154k9y42r42mfbiz3pqc80789d19d9fchrdcij71hxz0r0jr1mji"; depends=[BiocGenerics IRanges Biostrings rGADEM]; };
+MotifDb = derive { name="MotifDb"; version="1.8.0"; sha256="0yxvv4mz4bj6iyn8whzkn59gbb0cm8nik9l8076jwa2nhmgwnkzd"; depends=[BiocGenerics S4Vectors IRanges Biostrings rtracklayer]; };
+Mulcom = derive { name="Mulcom"; version="1.16.0"; sha256="129gw95zqkfalnvslzx6k99qy7l0fgimb96ghlghdv2rj4xjhiwg"; depends=[Biobase]; };
+MultiMed = derive { name="MultiMed"; version="1.0.0"; sha256="1lhf0dj3xw52d0glqgij42qjyzqwwb1jkjcnqgc8ign22smz1bx0"; depends=[]; };
+NCIgraph = derive { name="NCIgraph"; version="1.14.0"; sha256="0d6pigamrib2q8j5zg9i84rl43q4hlg2m29q37zf6m4y1m9dffy4"; depends=[graph graph KEGGgraph RBGL RCytoscape]; };
+NGScopy = derive { name="NGScopy"; version="1.0.0"; sha256="0xyr2zspg9vghc2cmrczrb2v0qjzks649vysl716ccynl9yk4ccd"; depends=[]; };
+NOISeq = derive { name="NOISeq"; version="2.8.0"; sha256="04qz721khji40lr3w8bjddxkvvyr85d2z094sj64ylfkjyxzdmhf"; depends=[Biobase]; };
+NTW = derive { name="NTW"; version="1.16.0"; sha256="0wflyx2vdaffk56nbik5yrbp73yvalf44v7m5y9cndxywq9713iy"; depends=[]; };
+NarrowPeaks = derive { name="NarrowPeaks"; version="1.10.0"; sha256="0d1rmvzy1cd2ivlazr1fvls4jcp81j00dpxh7mnkzla2gbjspvac"; depends=[BiocGenerics S4Vectors IRanges GenomicRanges GenomeInfoDb CSAR]; };
+NetPathMiner = derive { name="NetPathMiner"; version="1.2.0"; sha256="04bz4y8vvciqdhmmicj93igw71hzyxq6aak88qdj5ks7ihplllbm"; depends=[]; };
+NetSAM = derive { name="NetSAM"; version="1.6.0"; sha256="1gqazmm9arqv8kn0lfs12r1dl8w19mivfr682rqhcvizdpczij7s"; depends=[graph]; };
+NormqPCR = derive { name="NormqPCR"; version="1.12.0"; sha256="0g4x33bjg35bxxw1024fsp6fbfrsj16sk5ihnghgwg927jdypmn2"; depends=[Biobase ReadqPCR]; };
+NuPoP = derive { name="NuPoP"; version="1.16.0"; sha256="065a63fy62gqsrnzxw26fch0gs3xgilcvbc7zhcp5klyndzalr30"; depends=[]; };
+OCplus = derive { name="OCplus"; version="1.40.0"; sha256="09g03mrzby4rv0xkb705camnhyqgmlg7p2xzcsac5ncci05ivhc3"; depends=[multtest]; };
+OLIN = derive { name="OLIN"; version="1.44.0"; sha256="0rah35s96slcddggs56cinvv8p764r8k09i5wgz7irk6q39v21rz"; depends=[marray limma marray]; };
+OLINgui = derive { name="OLINgui"; version="1.40.0"; sha256="052ngldrq80qjkxjfkb68d0g5xv29s02h4n56cqjnydkhjnyfc50"; depends=[OLIN marray OLIN tkWidgets widgetTools]; };
+OSAT = derive { name="OSAT"; version="1.14.0"; sha256="0mm67jd79slz8d0laswiljbvc6s4iii516wfpl9mlkrfrnyymr4l"; depends=[]; };
+OTUbase = derive { name="OTUbase"; version="1.16.0"; sha256="1a4ynx9lwkphgqg9s7m5x6vs9swk4pvfrq9a222ry9mx4019v240"; depends=[S4Vectors IRanges ShortRead Biobase Biostrings]; };
+OmicCircos = derive { name="OmicCircos"; version="1.4.0"; sha256="07kyi4ag39bnpalgv1p88hy6270q0l2y5w806p9p7j1y9n5w5bmc"; depends=[GenomicRanges]; };
+OncoSimulR = derive { name="OncoSimulR"; version="1.0.0"; sha256="1dy8xfmh61g678hihnzjgjc5p55y41n40hp2vygx1hi19sha5fm9"; depends=[graph Rgraphviz]; };
+OrderedList = derive { name="OrderedList"; version="1.38.0"; sha256="1zxz154jqcm39w05cc96kik7g7s1274bm24i7v137jrcgr21yih0"; depends=[Biobase twilight Biobase twilight]; };
+OrganismDbi = derive { name="OrganismDbi"; version="1.8.1"; sha256="0j2d3gpp49nh0igzbwjkrccqyxnwdg2i4s4gch6hkbnyj2v3bdhs"; depends=[AnnotationDbi GenomicFeatures BiocGenerics graph RBGL AnnotationDbi]; };
+OutlierD = derive { name="OutlierD"; version="1.30.0"; sha256="0xww3z8zjyypzrbgn0knlmpa0xg05clzwwihq5fxn7kj5db7nw46"; depends=[Biobase]; };
+PAA = derive { name="PAA"; version="1.0.0"; sha256="0zsr8gd61g9imi2ns1wzz8k3zhcqrgxa6671fc8mrr5zzdlj17pd"; depends=[limma sva]; };
+PADOG = derive { name="PADOG"; version="1.8.0"; sha256="0cjbpq55zx8xd44fk02chfi2fn7m0z3kg9nn6vls4awb3p8ih3bk"; depends=[limma AnnotationDbi Biobase limma AnnotationDbi Biobase]; };
+PANR = derive { name="PANR"; version="1.12.1"; sha256="0k9ysn0yi7daqklsjdxkiqqp2i5ha8bx20jxfyipva0x83gvx1l1"; depends=[]; };
+PAPi = derive { name="PAPi"; version="1.6.1"; sha256="0i7gazmpg3izfc8ha7snk3f03d2na5rxd4jddbhy84ccgc44ddb1"; depends=[KEGGREST]; };
+PAnnBuilder = derive { name="PAnnBuilder"; version="1.30.1"; sha256="03qxq3wnyknxavladqvpyci0xnwh72paq8wl2ci6vjr6xrwdlb6h"; depends=[Biobase AnnotationDbi Biobase AnnotationDbi]; };
+PCpheno = derive { name="PCpheno"; version="1.28.0"; sha256="14lf4jhbslx64bppfk5hxj7i2brdxzrw1hcyzdy69f1sb2wlgjcp"; depends=[Category ScISI SLGI ppiStats annotate AnnotationDbi Biobase Category graph GSEABase ScISI]; };
+PECA = derive { name="PECA"; version="1.2.0"; sha256="096km1yla9cbpf90fiz75zz07nnm83lnfi95k73whyh8rs10wpn4"; depends=[limma affy genefilter preprocessCore]; };
+PGSEA = derive { name="PGSEA"; version="1.40.0"; sha256="11z4hdfddwhjdp0nf7q9k390x63ig9y110c59y3fd04ylqpc6y0b"; depends=[AnnotationDbi annaffy Biobase]; };
+PICS = derive { name="PICS"; version="2.10.0"; sha256="0y3i4q2ydsc0q99iij9hcs4m7y27rvqw7z0hk21p4xary24z0xzj"; depends=[BiocGenerics IRanges GenomicRanges Rsamtools GenomicAlignments]; };
+PING = derive { name="PING"; version="2.10.0"; sha256="1b0vygpl3vs46frjxwjdbc7dg5bllvm0kdcyw642ay7c8shbfzk4"; depends=[chipseq IRanges GenomicRanges PICS Gviz BSgenome BiocGenerics]; };
+PLPE = derive { name="PLPE"; version="1.26.0"; sha256="0knww741zh3yb2wr9wnncw77q7iwgcw08wfwdjpg3z0gj8jx926g"; depends=[Biobase LPE]; };
+PREDA = derive { name="PREDA"; version="1.12.0"; sha256="0p42nkgxxv6bj6lvvbldb5yw1bxa0vclziyyvd560j1fvh8f8qna"; depends=[Biobase multtest annotate]; };
+PROMISE = derive { name="PROMISE"; version="1.18.0"; sha256="15b34cymhcpd3qlvg0rbfp478bq37f7z6y8b96f4y6wnf6a1il54"; depends=[Biobase GSEABase Biobase GSEABase]; };
+PROcess = derive { name="PROcess"; version="1.42.0"; sha256="18gr05ws2nvq05jwk45fmck541r7qrlcf5v9wgkgwcbbyfqyjpyr"; depends=[Icens Icens]; };
+PSEA = derive { name="PSEA"; version="1.0.0"; sha256="1ncjdvp9qdx0xiqz7m3ri9jpdcj8p7760ngcdi7f6h4lnhs94d16"; depends=[Biobase]; };
+PSICQUIC = derive { name="PSICQUIC"; version="1.4.5"; sha256="1b17dazaw8i0v6srxv9llh1hhmh1wq3d63sajjmqwvrwpw5i69jl"; depends=[IRanges biomaRt BiocGenerics]; };
+PWMEnrich = derive { name="PWMEnrich"; version="4.2.0"; sha256="1svpl0cawfzj9749jc7sl66spb455b5ja2n2bjcp9mwns8z4s92z"; depends=[BiocGenerics Biostrings seqLogo]; };
+PathNet = derive { name="PathNet"; version="1.6.0"; sha256="0l16vaj3f4h5x0kf4njnblnrd6pmdpjya97pw48zgi85ws64473k"; depends=[]; };
+Pbase = derive { name="Pbase"; version="0.4.0"; sha256="0cin9kkdmcyasaxpn8608k5j10hqp8lkmgjwymvdw4v508ych73k"; depends=[BiocGenerics Gviz cleaver Biobase Biostrings IRanges S4Vectors mzID mzR MSnbase Pviz]; };
+PhenStat = derive { name="PhenStat"; version="2.0.1"; sha256="1qpdcch32mg7rmjbklgq7bkc6hrw20dqanl7xkglzzf1wi19pmnn"; depends=[limma]; };
+Polyfit = derive { name="Polyfit"; version="1.0.0"; sha256="0dg48simy02fhmk49vinqn7x9cl83akr78s0zcs7v1v0ggv642qa"; depends=[DESeq]; };
+ProCoNA = derive { name="ProCoNA"; version="1.4.1"; sha256="1llkls9wbjmngz15pip92xpn2x66vhy5wl5qbc3zw44vnx2352lg"; depends=[MSnbase BiocGenerics GOstats]; };
+Pviz = derive { name="Pviz"; version="1.0.0"; sha256="0chiz5rfqpq90d63jbys9884jxhk5i9vb0ag4n41x1bgl65wdskd"; depends=[Gviz biovizBase Biostrings GenomicRanges IRanges]; };
+QDNAseq = derive { name="QDNAseq"; version="1.2.4"; sha256="04arnk1qvad0mh4vz7z1akddw44xjz7v761366xvww5zkjq1lx0w"; depends=[Biobase CGHbase CGHcall DNAcopy Rsamtools]; };
+QUALIFIER = derive { name="QUALIFIER"; version="1.10.0"; sha256="00i06qcqf1ywrzg48cs1f7fjwmkb9y8bysbi9m0kn6mqg0vd98l3"; depends=[flowCore flowViz ncdfFlow flowWorkspace flowCore flowViz flowWorkspace Biobase]; };
+QuasR = derive { name="QuasR"; version="1.6.2"; sha256="02jgxh73pyl5zmzbaj65a2bsmfw9csyqlkmxqxnh63g1c20b6xbl"; depends=[GenomicRanges Rbowtie zlibbioc BiocGenerics S4Vectors IRanges BiocInstaller Biobase Biostrings GenomicRanges BSgenome Rsamtools GenomicFeatures ShortRead GenomicAlignments Rsamtools]; };
+R453Plus1Toolbox = derive { name="R453Plus1Toolbox"; version="1.16.0"; sha256="1xb3jmcb6jkxg0w3i4zaqbydnim5im6l9v54kmcysknw2b7y3sxf"; depends=[Biobase Biostrings GenomicRanges BiocGenerics biomaRt BSgenome IRanges XVector Rsamtools ShortRead VariantAnnotation]; };
+RBGL = derive { name="RBGL"; version="1.42.0"; sha256="1a2pc0a6mmw50wznbh9qpwyfy9c0rkl41a9rsvzx85y9wlysv6fl"; depends=[graph]; };
+RBioinf = derive { name="RBioinf"; version="1.26.0"; sha256="10mx0qqhwhqcrilyfilbrk0xfq4szgi8gp85nqsx4iipha6i1i2y"; depends=[graph]; };
+RCASPAR = derive { name="RCASPAR"; version="1.12.0"; sha256="1laj2pg2q761y7l91wdn6dm24rb22vk52ckx91r6pm13gdj3ma41"; depends=[]; };
+RCytoscape = derive { name="RCytoscape"; version="1.16.0"; sha256="0yswjdw1q5qai7a0g2ncqx166vl409kv95wc255284b1iljyd21y"; depends=[graph BiocGenerics]; };
+RDAVIDWebService = derive { name="RDAVIDWebService"; version="1.4.0"; sha256="0r460vd2q4xvri9piqkdfka4wq95h12gs8py1ybkvbwdl4sxvflx"; depends=[graph GOstats Category RBGL]; };
+RDRToolbox = derive { name="RDRToolbox"; version="1.16.0"; sha256="0jiyxw1pdbsjlmkxqgxs9ib3ap8n7mrgnxccvgj854khv92lw1gq"; depends=[]; };
+REDseq = derive { name="REDseq"; version="1.12.0"; sha256="0wkwkcfhqmbzxmwz7h396skirywwpdrbax8hdwmj0c4c6w612ccp"; depends=[BiocGenerics multtest Biostrings BSgenome ChIPpeakAnno BiocGenerics AnnotationDbi Biostrings ChIPpeakAnno IRanges multtest]; };
+RGSEA = derive { name="RGSEA"; version="1.0.0"; sha256="150cqysn5n689b86cp1ib4zh75h7w04xi96fnyd6mky11vy0c5yc"; depends=[BiocGenerics]; };
+RGalaxy = derive { name="RGalaxy"; version="1.10.0"; sha256="1p9dcxp2xqvcxdl3gikbf89n1mhhhpkqhd6drxmljgxbj790paxz"; depends=[BiocGenerics Biobase]; };
+RIPSeeker = derive { name="RIPSeeker"; version="1.6.0"; sha256="04kfxwp6h6iw60v1hacaj054r2l2v1p3csv4rvhirdiwdcgljfxp"; depends=[IRanges GenomicRanges Rsamtools GenomicAlignments rtracklayer]; };
+RLMM = derive { name="RLMM"; version="1.28.0"; sha256="1hdmqbvp7p3svldbb25kn2498y93807aj5b2qi72vdrf4wpxjabj"; depends=[]; };
+RMassBank = derive { name="RMassBank"; version="1.8.1"; sha256="09yd8zc9ba2mf9cws99cpg330h6gryszn0pclvq9jn2azdvqag68"; depends=[mzR]; };
+RNASeqPower = derive { name="RNASeqPower"; version="1.6.0"; sha256="1am0y36v29lig3d52a68kdivv5bwabfaxd6npmm4xsdqfafyffrs"; depends=[]; };
+RNAinteract = derive { name="RNAinteract"; version="1.14.0"; sha256="1hjn6vhkal5k1m15sjnr4zf5r90mj9mchscim2818xc7cbw5bqzy"; depends=[Biobase cellHTS2 geneplotter limma splots]; };
+RNAither = derive { name="RNAither"; version="2.14.0"; sha256="1izlnxlbjcsvdlhji93sv4ap8n5qqai8pyk3npnawrci2b50niiz"; depends=[topGO RankProd prada geneplotter limma biomaRt splots]; };
+ROC = derive { name="ROC"; version="1.42.0"; sha256="0g1whrm9c0x8aqa01am3gr0kjnm6gryvwfw430dj2hcrvsjpwg4j"; depends=[]; };
+ROntoTools = derive { name="ROntoTools"; version="1.6.1"; sha256="0a72nkx8ichc35hl9iwc5rf2d4mm2rd39nlvb1pjag3lp65wa3ax"; depends=[graph KEGGREST KEGGgraph Rgraphviz]; };
+RPA = derive { name="RPA"; version="1.22.0"; sha256="015slb9g3my3hv59ja4czvi2bcxf30ldgy8nazn6qmph78pdbm9b"; depends=[affy]; };
+RRHO = derive { name="RRHO"; version="1.6.0"; sha256="1i1i0kk6la20hd0gk9q5pai7lrzxjz6dj10wiylgg2bg63dkqbm4"; depends=[]; };
+RSVSim = derive { name="RSVSim"; version="1.6.1"; sha256="1xqgl0xq90ax42y5yhfk6v5py5nsgm0mms8rx87fyb3zg2aihx4y"; depends=[Biostrings GenomicRanges IRanges ShortRead]; };
+RTCA = derive { name="RTCA"; version="1.18.0"; sha256="14q30yf6lxwn5nnn4p9hsqsc2i10vfki0hl6slz6nw5nszc1bkf8"; depends=[Biobase]; };
+RTN = derive { name="RTN"; version="1.4.1"; sha256="1fh14m8zk6rl5bbwldbvysrl8csn9wczb8aicsiscndqdi9914v4"; depends=[RedeR minet limma IRanges]; };
+RTopper = derive { name="RTopper"; version="1.12.0"; sha256="1cghjbz2nwamvny858p8xg6azzgwqr7922dk6iiczyl7brvgmf5r"; depends=[Biobase limma multtest]; };
+RUVSeq = derive { name="RUVSeq"; version="1.0.0"; sha256="19c5shg278zaqhnhq7kx6xf8i34g42lcd2ri26y6rkg870lbs5f0"; depends=[EDASeq edgeR]; };
+RUVnormalize = derive { name="RUVnormalize"; version="1.0.0"; sha256="1s5a1dw99qvxrm0dhgy973nwrpif7hgqzq4x8x9ydy6p8s7fj07k"; depends=[Biobase]; };
+RWebServices = derive { name="RWebServices"; version="1.30.0"; sha256="0k9270arzhj6l5vnk2m7dw52nb6py2kgdlrdl2yazbjw4xsi7c9l"; depends=[SJava TypeInfo SJava]; };
+RamiGO = derive { name="RamiGO"; version="1.12.1"; sha256="1hdcfmhwm4laap8pxpda3q19fz76xh1zw5wssvagji17x2l0pqiy"; depends=[RCytoscape graph]; };
+RankProd = derive { name="RankProd"; version="2.38.0"; sha256="15d0v1pzz5z75w28mi5a67q319zdcjs770w4vmr6vdq366v5ai6v"; depends=[]; };
+Rariant = derive { name="Rariant"; version="1.2.0"; sha256="1gli9ill961hblxgw8d33bz462rnas0v4jclnclslfvvlbji27lc"; depends=[GenomicRanges VariantAnnotation IRanges ggbio exomeCopy SomaticSignatures Rsamtools GenomeInfoDb S4Vectors]; };
+RbcBook1 = derive { name="RbcBook1"; version="1.34.0"; sha256="05bsnvvvm5xs3vrm0v6jggsmf4d31kzz0aga76scxf66wzvwdnq0"; depends=[Biobase graph]; };
+Rbowtie = derive { name="Rbowtie"; version="1.6.0"; sha256="0bjiwrl8dvwmilq85w18lm47a7xji5rmgzy7pfxyb836i75qn70v"; depends=[]; };
+Rcade = derive { name="Rcade"; version="1.8.0"; sha256="00rr2gznlfxkq0dlfpc9d62y84av3z7vrrph4yyh8kaz5pyd9qjn"; depends=[GenomicRanges baySeq Rsamtools S4Vectors]; };
+Rchemcpp = derive { name="Rchemcpp"; version="2.4.0"; sha256="0kfhn3ry6w5d5wl6asz96662sb7abxhy97q2g3p19qig04v00kdl"; depends=[ChemmineR]; };
+RchyOptimyx = derive { name="RchyOptimyx"; version="2.6.0"; sha256="1q9gsmy84lk869j1d6jabdpi0z8ahhpcya62fy965mza901q9cin"; depends=[Rgraphviz graph flowType]; };
+Rcpi = derive { name="Rcpi"; version="1.2.0"; sha256="02p4k91472lxrd2l0q1vs1zycbh2gjndc4wmgpkfvzakfcyr7vxr"; depends=[Biostrings GOSemSim ChemmineR fmcsR]; };
+Rdisop = derive { name="Rdisop"; version="1.26.0"; sha256="1d96mwc26nplax0063mz5ymz4x72vcd8zhsyn06c41r3j7ql6xl3"; depends=[]; };
+ReQON = derive { name="ReQON"; version="1.12.0"; sha256="11b3b6s0i0kj8r3nadl6ckqsx7zqgapgwkivxd5wzswrrznpjjiz"; depends=[Rsamtools seqbias]; };
+ReactomePA = derive { name="ReactomePA"; version="1.10.1"; sha256="0spq6zvvnjcxs9k7rfj27af7yb442md82r5bcyjp0vjn5l1g4ph7"; depends=[DOSE AnnotationDbi graphite]; };
+ReadqPCR = derive { name="ReadqPCR"; version="1.12.0"; sha256="1cy58aappyydqwan7jwaq2mr32pcy0xl2zzp8fzfvirjbrvj5d0f"; depends=[Biobase affy Biobase]; };
+RedeR = derive { name="RedeR"; version="1.14.10"; sha256="1aijy1mzkpbjcgsjirqmjbw6gblgpb456sby5yzgqlnz5jqbh13j"; depends=[]; };
+RefNet = derive { name="RefNet"; version="1.2.1"; sha256="0960aj6lmxnam8763nlqiz8acxm7d2lz9vn49zwh68lb4rpv8qqd"; depends=[IRanges PSICQUIC AnnotationHub BiocGenerics]; };
+RefPlus = derive { name="RefPlus"; version="1.36.0"; sha256="160i2zcfr9a1znx01bnssdj7737mvpmnkkycixs5npzy06hkf5mb"; depends=[Biobase affy affyPLM preprocessCore]; };
+Repitools = derive { name="Repitools"; version="1.12.1"; sha256="1b6c87248z1f28v67zl3h6i7nfd0sxyc1hrbfv9xkkq1092fybms"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges GenomicAlignments BSgenome edgeR DNAcopy Ringo Biostrings Rsamtools rtracklayer]; };
+ReportingTools = derive { name="ReportingTools"; version="2.6.0"; sha256="1pk9qp65awffp7nfj71hppqr6nfcakfxp36bmbssjfirycdzj7qx"; depends=[Biobase Category GOstats limma AnnotationDbi edgeR annotate GSEABase BiocGenerics DESeq2 ggbio IRanges]; };
+Rgraphviz = derive { name="Rgraphviz"; version="2.10.0"; sha256="1hs1vqix0frwyrrcmvgn9jjr8vzdflag5yc6l1fsslg99c5dmlys"; depends=[graph]; };
+Ringo = derive { name="Ringo"; version="1.30.0"; sha256="1krh2c5wqlc32i7s5wwggzba533i74d2zfxn9gic1k2mjnrax7b5"; depends=[Biobase limma BiocGenerics genefilter limma vsn]; };
+Risa = derive { name="Risa"; version="1.8.0"; sha256="0iv7v93yikkxk63cjvi80a24akf0gfd24h8bswpl8vqib2nxj74l"; depends=[Biobase biocViews affy xcms]; };
+Rmagpie = derive { name="Rmagpie"; version="1.22.0"; sha256="14v9kif2srbmqw2dpyrh8kr1598n63zr5d0lx2r57c4jh5g0cg9p"; depends=[Biobase Biobase]; };
+RmiR = derive { name="RmiR"; version="1.22.0"; sha256="0hgg6xjj6jjgizs1qgjx3cgqky188z1b5kqdvf2ryhcn7gjyym2r"; depends=[]; };
+Rnits = derive { name="Rnits"; version="1.0.0"; sha256="1v41764jb3q4is99w6ykdihxva8imma6zid16k56xg9b331pnz43"; depends=[Biobase limma affy impute qvalue]; };
+Roleswitch = derive { name="Roleswitch"; version="1.4.1"; sha256="1halab8xr5z4kwnirxrmax72ncsw5cmjh7wg9364kjyrgcrkn8am"; depends=[microRNA biomaRt Biostrings Biobase]; };
+Rolexa = derive { name="Rolexa"; version="1.22.0"; sha256="0864zas9kbdi3vsw4la08zdf62xnbrfdbghvvfva2kagn783h6l5"; depends=[ShortRead Biostrings IRanges ShortRead]; };
+RpsiXML = derive { name="RpsiXML"; version="2.8.0"; sha256="0280clvvshkidkx8xixdn215023rf6xvjhmh3h3gdr7q9msmz4q8"; depends=[annotate graph Biobase RBGL hypergraph AnnotationDbi]; };
+Rqc = derive { name="Rqc"; version="1.0.4"; sha256="1wv1yvczxq5jmp3q01yfmkl0w4xq0p1flm2mvi17lfdm4xnh1xlj"; depends=[BiocParallel ShortRead BiocGenerics Biostrings IRanges S4Vectors BiocStyle]; };
+Rsamtools = derive { name="Rsamtools"; version="1.18.3"; sha256="14bpdz9yad10dvb49921di3ci8d32y76c3034xqcnnkdcdzcvbsb"; depends=[S4Vectors IRanges GenomeInfoDb GenomicRanges XVector Biostrings BiocGenerics zlibbioc S4Vectors IRanges XVector Biostrings]; };
+Rsubread = derive { name="Rsubread"; version="1.16.1"; sha256="0zxvhj25hmd9496wfmc1dp9kaf84640z8xkgyck7llhq80cd4d3a"; depends=[]; };
+Rtreemix = derive { name="Rtreemix"; version="1.28.0"; sha256="0gshbb9gxzi3gdxjlp9g920dmy6hdp59ddlb6pyiva33pq9yhpz0"; depends=[graph Biobase]; };
+S4Vectors = derive { name="S4Vectors"; version="0.4.0"; sha256="0y3bqkx1jg6xr0b24hd5akj61yjwnmzafld81ic5hi7kz8rncsca"; depends=[BiocGenerics BiocGenerics]; };
+SAGx = derive { name="SAGx"; version="1.40.0"; sha256="09vx06m974max7l2wm7d42xsbwayapkfi4nzc83n7nykkx7vqpx3"; depends=[multtest Biobase]; };
+SANTA = derive { name="SANTA"; version="2.2.0"; sha256="013bvam139ch20rr774rf1nsssl1y0ckaizsn0ryqpgvrlc78ik7"; depends=[]; };
+SBMLR = derive { name="SBMLR"; version="1.62.0"; sha256="0fx0354iqp7m6g42pq9xb34vzy55vqwdh2sxsha835whz5db96vh"; depends=[]; };
+SCAN_UPC = derive { name="SCAN.UPC"; version="2.8.1"; sha256="1ky1bp4856dk9hsrvij9k9yr0ygzvx1wmn25jk56lk80kzyybx9m"; depends=[Biobase oligo Biostrings GEOquery affy affyio sva IRanges]; };
+SGSeq = derive { name="SGSeq"; version="1.0.6"; sha256="08ngcqr5h0q2y37s0vqcafjyxa5p2shf1zmsydynrghvmfbjlksl"; depends=[BiocParallel GenomicRanges IRanges AnnotationDbi BiocGenerics Biostrings GenomicAlignments GenomicFeatures GenomeInfoDb Rsamtools rtracklayer S4Vectors]; };
+SIM = derive { name="SIM"; version="1.36.0"; sha256="1d6nv0wszar176lr42jwz2mab5fm7v39sany0gcfqypdw1bb94i4"; depends=[globaltest quantsmooth]; };
+SJava = derive { name="SJava"; version="0.92.1"; sha256="0d5v3wvky06f8sd0hr39sw61f2a084winjqy4cd8vkmnxh6y8xcf"; depends=[]; };
+SLGI = derive { name="SLGI"; version="1.26.0"; sha256="1b47jz7bgccm345mip5b628cnk2qwd3z0177nyx7lkkx8pyb0fp0"; depends=[ScISI AnnotationDbi Biobase ScISI BiocGenerics]; };
+SLqPCR = derive { name="SLqPCR"; version="1.32.0"; sha256="02px4mkqp6mj7bkakqnp85p77ipway96k91jznf3vcingsd52d25"; depends=[]; };
+SMAP = derive { name="SMAP"; version="1.30.0"; sha256="0i44gpvc9939q3vyi45d1a7ixpsrc448bf0dmsnrzljgqzv322cv"; depends=[]; };
+SNAGEE = derive { name="SNAGEE"; version="1.6.0"; sha256="0ngmcgsf39y3v7pmaxcqgzbndmcc3n8cwzf29qh698nixbqr3q5b"; depends=[]; };
+SNPRelate = derive { name="SNPRelate"; version="1.0.1"; sha256="1l4kq76fg7hvqwc7h954rz8880cc0vhgljf6kgi05v7g1yz3bq4v"; depends=[gdsfmt gdsfmt]; };
+SNPchip = derive { name="SNPchip"; version="2.12.0"; sha256="0fww0gdpn2vq9n7mlsd72hk55va5vdrn606190skh8v6xh5d3ns1"; depends=[oligoClasses Biobase GenomicRanges IRanges GenomeInfoDb]; };
+SPEM = derive { name="SPEM"; version="1.6.0"; sha256="0wkkk473cwvarws9sfk85v2n6cx2dl1fsgs9ai52d9lnnwjf7ixa"; depends=[Biobase]; };
+SPIA = derive { name="SPIA"; version="2.18.0"; sha256="1k45hbdgwrfbaz5h02d37599bbxx5lfnisbh3hzmzi00jfvjlg54"; depends=[KEGGgraph]; };
+SQUADD = derive { name="SQUADD"; version="1.16.0"; sha256="117cdn7xy8priy7g06r57dbby1sq43ln9x6mc126szig89hp4wsr"; depends=[]; };
+SRAdb = derive { name="SRAdb"; version="1.20.13"; sha256="0h1v4bz3syzh2z9p832fp981fkq5yzf4yvrpprfghpbsqmqhq1xh"; depends=[graph GEOquery]; };
+SSPA = derive { name="SSPA"; version="2.6.0"; sha256="1svgzxlk64lhha8j00nji8jzihd6172jizk78m5wxy28cvcpngjs"; depends=[qvalue limma]; };
+STAN = derive { name="STAN"; version="1.0.0"; sha256="0q0d0yyzs549vhpxk4lmxjhih97a6k4r7xxlq7mmrhja6ylm7sh7"; depends=[]; };
+STATegRa = derive { name="STATegRa"; version="1.0.0"; sha256="0vi268m7b7l9pmxmi705920pygkfxmq2lqy9gijbzrf3gb8m0l5v"; depends=[Biobase]; };
+STRINGdb = derive { name="STRINGdb"; version="1.5.5"; sha256="0bds67n1bdin2cjiswdlpc8f0nw4j9px17255j8qmz5saf2yflgl"; depends=[]; };
+SamSPECTRAL = derive { name="SamSPECTRAL"; version="1.20.0"; sha256="043wxqdmafs96xnwzvjj1xfccg7nzkha99pryz50cvrpy85si5s8"; depends=[]; };
+ScISI = derive { name="ScISI"; version="1.38.0"; sha256="094gdjmzjy39ch1fjbin1rnaybqfnvnahzqzfyx3cm0vwz0sddf7"; depends=[RpsiXML annotate apComplex AnnotationDbi RpsiXML annotate]; };
+SemDist = derive { name="SemDist"; version="1.0.0"; sha256="1gbbbslifpqxr6ndbrmpif5dm6l99nprzxrdjb113qzdxcs27m9p"; depends=[AnnotationDbi annotate]; };
+SeqArray = derive { name="SeqArray"; version="1.6.1"; sha256="18nfd9mhgmgqr5ww5lv3xkxrdc3cprd4hp5l3cwk9h7x0yg7v0sz"; depends=[gdsfmt Biostrings GenomicRanges IRanges S4Vectors VariantAnnotation gdsfmt]; };
+SeqGSEA = derive { name="SeqGSEA"; version="1.6.0"; sha256="1ql2f9hdiq5h3ry02kgwjm4mf07z8aqxk7019zq656an09d3aby2"; depends=[Biobase DESeq biomaRt]; };
+SeqVarTools = derive { name="SeqVarTools"; version="1.4.0"; sha256="07i36kfhd329h721xq23nyhi08lavnmfj6dymlcqf1pg4njv8fxa"; depends=[SeqArray GenomicRanges IRanges]; };
+ShortRead = derive { name="ShortRead"; version="1.24.0"; sha256="0gvkzwz22bifh49yhxdj0pklc9h1i629rhhaicmz24nwa68dfc7x"; depends=[BiocGenerics BiocParallel Biostrings Rsamtools GenomicAlignments Biobase S4Vectors IRanges GenomeInfoDb GenomicRanges zlibbioc S4Vectors IRanges XVector Biostrings]; };
+SigCheck = derive { name="SigCheck"; version="1.0.2"; sha256="12fzadfnc5csjdk64krm95zar5wqb4xkcp1h00slhkng4580va38"; depends=[MLInterfaces Biobase BiocParallel]; };
+SigFuge = derive { name="SigFuge"; version="1.4.0"; sha256="1j4781c26x7pi0p6vgq1z9lfmjlhb07y20l4jacarpffilb6nnkh"; depends=[GenomicRanges]; };
+SimBindProfiles = derive { name="SimBindProfiles"; version="1.4.0"; sha256="0xl3295gabaycvxmgaijr6lgy52py2fv5gd3vpmnfzn9cfsw0a8i"; depends=[Ringo limma Biobase]; };
+SomatiCA = derive { name="SomatiCA"; version="1.10.0"; sha256="19gs6gkm3jchri1npyrcjgns0hk1b07ifajbimpc43s6dyx2dq6q"; depends=[DNAcopy GenomicRanges IRanges DNAcopy GenomicRanges IRanges]; };
+SomaticSignatures = derive { name="SomaticSignatures"; version="2.2.3"; sha256="16dnaip4x3fqrgs59hl1n0x61165xaz40pzzkcng4rzvvf1yya5n"; depends=[VariantAnnotation GenomicRanges S4Vectors IRanges GenomeInfoDb Biostrings ggbio pcaMethods Biobase]; };
+SpacePAC = derive { name="SpacePAC"; version="1.4.0"; sha256="0bywmkaj208qlgndsg0x415vvlsgvdhpn64dzxsw4dh9d2ilygb8"; depends=[iPAC]; };
+SpeCond = derive { name="SpeCond"; version="1.20.0"; sha256="1im1fry6c19v1kds82nw12i4xv7v6x2shr5s0wf22m2adz6hgj5c"; depends=[Biobase]; };
+SplicingGraphs = derive { name="SplicingGraphs"; version="1.6.0"; sha256="0m70j5wqmldgnhvk1lfaq024yzx85m05c3f7z9y3yjsmxy75mlhp"; depends=[BiocGenerics S4Vectors IRanges GenomicRanges GenomicFeatures GenomicAlignments Rgraphviz BiocGenerics IRanges GenomicRanges GenomicFeatures GenomicAlignments graph Rgraphviz]; };
+Starr = derive { name="Starr"; version="1.22.0"; sha256="1kclc4qsgj0v3r18yk0qmlz906bg8v8f7h76ils983zdb42p5d5n"; depends=[Ringo affy affxparser zlibbioc]; };
+Streamer = derive { name="Streamer"; version="1.12.0"; sha256="0h93z1kqyrb713dn6zabppbr0lcwrp3d9m7c00gm4hg0dlpc3y1s"; depends=[graph RBGL BiocGenerics]; };
+Sushi = derive { name="Sushi"; version="1.2.0"; sha256="12zdd6c50li95qipck2zrqlx458rhklgja09887cby7s5s54vzca"; depends=[biomaRt]; };
+SwimR = derive { name="SwimR"; version="1.4.0"; sha256="02sdfc50siix81qvsc41d2khc6zijjgh337zjypglsp2k2lg1hfi"; depends=[]; };
+TCC = derive { name="TCC"; version="1.6.5"; sha256="17cyfv1401xrscxk7n10s85b6zyw5amc924hz1hsdgsvqm8kv1p0"; depends=[DESeq DESeq2 edgeR baySeq ROC]; };
+TDARACNE = derive { name="TDARACNE"; version="1.16.0"; sha256="1yqf747bx6vm09yjclf787xz2j3nhk1fiwwmkp4wrd7fazqfnchl"; depends=[Rgraphviz Biobase]; };
+TEQC = derive { name="TEQC"; version="3.6.0"; sha256="0072qasrzl50ril7jz96mkxkc290ifk8fs7r3mjmx2v8a7ifxak4"; depends=[BiocGenerics IRanges Rsamtools Biobase]; };
+TFBSTools = derive { name="TFBSTools"; version="1.4.0"; sha256="1vkx7mnik79pdq02x8r73y8hmdaf8g6f2f1lf0fissvmg8z7v13w"; depends=[Biostrings seqLogo GenomicRanges XVector rtracklayer BSgenome S4Vectors IRanges CNEr BiocParallel DirichletMultinomial]; };
+TSCAN = derive { name="TSCAN"; version="1.2.0"; sha256="0pkx5nij9qag5ki8fgs1ygi06aybwkjn4n7qcr95qzafjqxr9r19"; depends=[]; };
+TSSi = derive { name="TSSi"; version="1.12.0"; sha256="1dynhh1pn4bc57brs7jf9q7na71zd3pc9nj03n76g0rfy92n78gi"; depends=[BiocGenerics IRanges BiocGenerics S4Vectors Biobase IRanges]; };
+TargetScore = derive { name="TargetScore"; version="1.4.0"; sha256="1djnws8qls7kqq7bs950z9cdhz8fm79i4b5l3z9xn27divhadz8h"; depends=[]; };
+TargetSearch = derive { name="TargetSearch"; version="1.22.0"; sha256="0xzn71kdif1maicla2xlk40zf1lih1yd742dz3yyrig4d8mhfasl"; depends=[mzR]; };
+TitanCNA = derive { name="TitanCNA"; version="1.4.0"; sha256="1715mzds758z8k7lz9bn2r9f9azrf359d4ryac514w0f1v56f1hk"; depends=[IRanges Rsamtools GenomeInfoDb]; };
+ToPASeq = derive { name="ToPASeq"; version="1.0.1"; sha256="0ilsjx2ys425bg9nsk909xii1rpddqpmjxlhsd0196b5vmcdpy0m"; depends=[graphite graph edgeR DESeq2 GenomicRanges DESeq limma SPIA clipper]; };
+TransView = derive { name="TransView"; version="1.10.0"; sha256="08jzlzp7skmkllangb1d5fksdznb5qxnr036hksr8nakndjwv1ra"; depends=[GenomicRanges Rsamtools zlibbioc IRanges Rsamtools]; };
+TurboNorm = derive { name="TurboNorm"; version="1.14.0"; sha256="14zfl2xrn55mwws7mx8q70fa8ym5dfdgqzmfk6ygbn6g2f57i8vr"; depends=[convert limma marray affy]; };
+TypeInfo = derive { name="TypeInfo"; version="1.32.0"; sha256="1ha815a0f07hnlqjw3r10h2da7bdsvdil513f9xm41is4npf8f1b"; depends=[]; };
+UNDO = derive { name="UNDO"; version="1.8.0"; sha256="0ka1n3fjk7awh128wbgw08z3z7s2fnkj3xnrmqrz0ydqhhz58654"; depends=[BiocGenerics Biobase]; };
+UniProt_ws = derive { name="UniProt.ws"; version="2.6.2"; sha256="0h3w6ldi3ni3g1546c12p987q9shksj2s18pfyqbk2jdxygph3i0"; depends=[BiocGenerics AnnotationDbi]; };
+VanillaICE = derive { name="VanillaICE"; version="1.28.5"; sha256="0lfhhawkvv4ah4wbk7krmwq5ymmgyqzk6ni66ij6slm5nsib253s"; depends=[GenomicRanges Biobase oligoClasses IRanges S4Vectors GenomeInfoDb crlmm]; };
+VariantAnnotation = derive { name="VariantAnnotation"; version="1.12.9"; sha256="06s1fxiw3dxjy5li3kn4p46bymrgssx4pfmrgvdra1wcfqx29qbq"; depends=[BiocGenerics GenomeInfoDb GenomicRanges Rsamtools zlibbioc Biobase S4Vectors IRanges XVector Biostrings AnnotationDbi BSgenome rtracklayer GenomicFeatures S4Vectors IRanges XVector Biostrings Rsamtools]; };
+VariantFiltering = derive { name="VariantFiltering"; version="1.2.14"; sha256="0275cy9xpxjp9jff3my97s5pa193f2i6ll54wsm5l8qvkpilqr1i"; depends=[BiocGenerics Biobase S4Vectors IRanges AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicRanges GenomicFeatures Rsamtools BSgenome VariantAnnotation S4Vectors IRanges XVector Biostrings]; };
+VariantTools = derive { name="VariantTools"; version="1.8.1"; sha256="0kr05nh1p128nm50bzrcn2lxnapm4vvgrzakbszxrakgk9span5r"; depends=[S4Vectors IRanges GenomicRanges VariantAnnotation Rsamtools BiocGenerics Biostrings gmapR GenomicFeatures rtracklayer BiocParallel GenomeInfoDb BSgenome]; };
+Vega = derive { name="Vega"; version="1.14.0"; sha256="1gzm54glvbm24bb0qvkcmn9zl00dywiwbqcjk9vxf002xbww03pw"; depends=[]; };
+VegaMC = derive { name="VegaMC"; version="3.4.0"; sha256="128r0ns20vsp8glxyafa9yms4f2l5iakv0pz0cmq9pgqkg6ni2wz"; depends=[biomaRt Biobase genoset]; };
+XDE = derive { name="XDE"; version="2.12.0"; sha256="1x0jy8gx2zd4cdhba3wp2ajyngxcnph3mkiqm5qynm4cd462r3hq"; depends=[Biobase Biobase BiocGenerics genefilter MergeMaid]; };
+XVector = derive { name="XVector"; version="0.6.0"; sha256="055sv0289pc1i0bdihms4ml2j44xxgljk566csjr1da7lrjb6qga"; depends=[BiocGenerics S4Vectors IRanges BiocGenerics S4Vectors IRanges S4Vectors IRanges]; };
+a4 = derive { name="a4"; version="1.14.0"; sha256="16fy84ra04lly9l188zfbqxk08dm8pkjnpzz04v46aqnmyhnih3v"; depends=[a4Base a4Preproc a4Classif a4Core a4Reporting]; };
+a4Base = derive { name="a4Base"; version="1.14.0"; sha256="1dhy6r6mn02mqiz1x7jzpiy71zwclv8b3b7gys0yz4d5d67ywm6r"; depends=[Biobase AnnotationDbi annaffy genefilter limma multtest a4Preproc a4Core]; };
+a4Classif = derive { name="a4Classif"; version="1.14.0"; sha256="0j5byji2dhapg5bk1zvpsi7f2ws26npx2jl7nj0qk9fzqagysvh8"; depends=[a4Core a4Preproc MLInterfaces a4Core]; };
+a4Core = derive { name="a4Core"; version="1.14.0"; sha256="0pdpbb3i4vc81kf18flx70wv27dnxjb28gnijcmc5v6im7zi33cr"; depends=[Biobase]; };
+a4Preproc = derive { name="a4Preproc"; version="1.14.0"; sha256="04af822aaia03d2569fdxyflfhb2ppdaa0aia0afwsf0pmr3lng3"; depends=[AnnotationDbi]; };
+a4Reporting = derive { name="a4Reporting"; version="1.14.0"; sha256="13y6xw9c5d2ag6naqjdgr3pz2ajc9liqczjxq5pjj1619pxvsg0s"; depends=[annaffy]; };
+aCGH = derive { name="aCGH"; version="1.44.0"; sha256="0bj73kwibkadm3j7j9g5fim5npvcpxgdfqv7qa2lk690vzyn12w6"; depends=[multtest Biobase multtest]; };
+adSplit = derive { name="adSplit"; version="1.36.0"; sha256="1h0jkyzn7pkdbvlwfwpbnybpm2zsdxm1n9zggklyxq37xvy2g548"; depends=[AnnotationDbi Biobase multtest]; };
+affxparser = derive { name="affxparser"; version="1.38.0"; sha256="19pvq35hip53qzglfh39vwnpkbw6h4bxjfy8k06amh6i9pbwg3wl"; depends=[]; };
+affy = derive { name="affy"; version="1.44.0"; sha256="1af0vd7drsg0k4wvp1lrryv23szgmprjpk0kbwj414lc3ddridzw"; depends=[BiocGenerics Biobase affyio BiocInstaller preprocessCore zlibbioc preprocessCore]; };
+affyContam = derive { name="affyContam"; version="1.24.0"; sha256="0knr0l6xwcyfpz4l3k23cygm2i0bhsxshs15iyy6ach9hdm57bq4"; depends=[Biobase affy]; };
+affyILM = derive { name="affyILM"; version="1.18.0"; sha256="00db5avl50i9h139x5d272qhim8cdr4afc1lhhpi48l4y4zhxc1p"; depends=[gcrma affxparser affy Biobase]; };
+affyPLM = derive { name="affyPLM"; version="1.42.0"; sha256="1lyzy0rv7irl2izavs48i7f29i4mb5bn45946s2v8c31f6698qlq"; depends=[BiocGenerics affy Biobase gcrma preprocessCore BiocGenerics zlibbioc preprocessCore]; };
+affyPara = derive { name="affyPara"; version="1.26.0"; sha256="03zbc93ba5li1fwv2smfp5859c2dm0anq2biran0zzwav08h3bwm"; depends=[affy vsn affyio]; };
+affyQCReport = derive { name="affyQCReport"; version="1.44.0"; sha256="0z0qrxj1xndgx86kfm2vs3dbdw1j44ax9xcdgifb9048z1gw350l"; depends=[Biobase affy affy affyPLM Biobase genefilter simpleaffy]; };
+affycomp = derive { name="affycomp"; version="1.42.0"; sha256="18p7f3dhg26fircpxg1gcbn9mi0ysdydm8pnwp49mnwl0sq72435"; depends=[Biobase]; };
+affycoretools = derive { name="affycoretools"; version="1.38.0"; sha256="1qn3wr8nbj52sk3r6nhpq9iffhgf4jjs8yqm9q18xlvmqszsq3vy"; depends=[affy Biobase biomaRt limma GOstats annotate annaffy genefilter gcrma AnnotationDbi oligoClasses ReportingTools]; };
+affyio = derive { name="affyio"; version="1.34.0"; sha256="0ils272ap69kf3l7d66dzrvdh8gp66wb648iyzy26dbzkjcld3a7"; depends=[zlibbioc]; };
+affylmGUI = derive { name="affylmGUI"; version="1.40.2"; sha256="062333g5ks3f58n8xqzklalndiq42njfs9ad805za5si58lg1c2r"; depends=[affyPLM limma affy BiocInstaller affyio gcrma AnnotationDbi]; };
+affypdnn = derive { name="affypdnn"; version="1.40.0"; sha256="09xfhcklsh4kpzwjp96hq8i9v7x5nc6n3zl2ybk899ilvhirbsbv"; depends=[affy]; };
+agilp = derive { name="agilp"; version="3.8.0"; sha256="0g5hfmwylbxm8r4dn40qkxac2n7hc9hzv4pra60766dgisyz6i15"; depends=[]; };
+alsace = derive { name="alsace"; version="1.2.0"; sha256="13phx385i6hj0l054gm6wycvh2ggf653m8sdn81sln8nmrly4lp4"; depends=[]; };
+altcdfenvs = derive { name="altcdfenvs"; version="2.28.0"; sha256="1p8d732c13vcim9ny3m832cvzkaw7d63dmj13r1j50y4gqwjfynm"; depends=[BiocGenerics Biobase affy makecdfenv Biostrings hypergraph]; };
+ampliQueso = derive { name="ampliQueso"; version="1.4.0"; sha256="0qx2f9dszrgcrcwix78mizb5h4bjqrlsm9mbc3xval1r53vj58i4"; depends=[rnaSeqMap VariantAnnotation genefilter edgeR DESeq]; };
+annaffy = derive { name="annaffy"; version="1.38.0"; sha256="1wa045yzsxc3z20ip8s98kczp58yj2ljx9y09xgxalm31462v6yr"; depends=[Biobase AnnotationDbi]; };
+annmap = derive { name="annmap"; version="1.8.0"; sha256="0skniiq0lfiz6wcwbrdyq3cv8r46j9k7k5sidigp0gfqa88f9v2f"; depends=[GenomicRanges Biobase Rsamtools genefilter IRanges BiocGenerics]; };
+annotate = derive { name="annotate"; version="1.44.0"; sha256="1jmkj4yy9hx8wwzykf667ndykwcigqilk5vph95f9y3nb1zpd4f1"; depends=[AnnotationDbi Biobase BiocGenerics]; };
+annotationTools = derive { name="annotationTools"; version="1.40.0"; sha256="1fbnl1a8xy73aisgxh6q023l5q0mb17pd1ww65kq8v978751prs4"; depends=[Biobase]; };
+anota = derive { name="anota"; version="1.14.0"; sha256="0byhmv4w86zq1i1fshx7ld0lyixjsyz68wiz7c7vvz8z53dnw1in"; depends=[qvalue multtest qvalue]; };
+antiProfiles = derive { name="antiProfiles"; version="1.6.0"; sha256="1avsffrvyi4w7zqp0i1j53cjhbf7xgsjhzc4na8widsrla1jqzx0"; depends=[]; };
+apComplex = derive { name="apComplex"; version="2.32.0"; sha256="12vk170npyfhr5m0yyvcijxsigjj0739xaxlx8sq3rx5xdf92lrr"; depends=[graph RBGL Rgraphviz]; };
+aroma_light = derive { name="aroma.light"; version="2.2.1"; sha256="120f8r117iidhdlfj73wv276jyl1vs6sdb5pha95ywqq5b3qxvi5"; depends=[]; };
+arrayMvout = derive { name="arrayMvout"; version="1.24.0"; sha256="11338l6jhyf90nzkhmgb60dz4hhkfkkzwv02x90ly9q9bq9g2c3q"; depends=[parody Biobase affy lumi simpleaffy mdqc affyContam]; };
+arrayQuality = derive { name="arrayQuality"; version="1.44.0"; sha256="0vriyjg3aqgjhxgzlww5h3215smnvdh0rrrq7llfwbxmji3fhfl7"; depends=[limma marray]; };
+arrayQualityMetrics = derive { name="arrayQualityMetrics"; version="3.22.1"; sha256="1ynacxsncvnniq4av60046x3y6v42jsvrwyh9snkrjhkfpivh4xj"; depends=[affy affyPLM beadarray Biobase genefilter limma vsn]; };
+asmn = derive { name="asmn"; version="1.2.0"; sha256="0kc47p68gv1yn3yflqa2b5bz7c165s55fxpaqgsxpxnanh4ynf17"; depends=[methylumi Biobase]; };
+attract = derive { name="attract"; version="1.18.0"; sha256="1xshcyfd78lr9kla1iclz60rz56pxkza04y13jn28ad12dfff1nk"; depends=[AnnotationDbi limma GOstats Biobase AnnotationDbi limma GOstats]; };
+ballgown = derive { name="ballgown"; version="1.0.4"; sha256="1pvzm8dxyrxfgw4wypl805wjxnywqnqr0ip8yxwx16qa04vr88ii"; depends=[GenomicRanges IRanges S4Vectors sva limma rtracklayer Biobase GenomeInfoDb]; };
+baySeq = derive { name="baySeq"; version="2.0.50"; sha256="08p2kck94hsn6p4xcb4y2q4il236xf5vr44zvxmpvxpbjga1lk3f"; depends=[GenomicRanges]; };
+beadarray = derive { name="beadarray"; version="2.16.0"; sha256="10yh90501bdy1gnmxamn6z4rhjiplay2afgd9145bb84hldcwa6d"; depends=[BiocGenerics Biobase BeadDataPackR limma AnnotationDbi GenomicRanges IRanges illuminaio]; };
+beadarraySNP = derive { name="beadarraySNP"; version="1.32.0"; sha256="0lmgcbbb4caf2qgbgk574yazil2vif10i3j1d69xhqjr38k936hb"; depends=[Biobase quantsmooth]; };
+betr = derive { name="betr"; version="1.22.0"; sha256="1gw9g33cpsbc86825ispf56w16273abxflbb9r3r4hvhv4m1kklx"; depends=[Biobase limma]; };
+bgafun = derive { name="bgafun"; version="1.28.0"; sha256="1zrlfv7g0pfmpr55m0rx81zn02k3g278d24qh6xzl2f198zwf6aw"; depends=[made4]; };
+bgx = derive { name="bgx"; version="1.32.0"; sha256="0sg56jz4y9z71dp8dq2hdzwp09ij98xsba0a8fap66xw6b249nr1"; depends=[Biobase affy gcrma]; };
+bigmemoryExtras = derive { name="bigmemoryExtras"; version="1.10.0"; sha256="0ym8750x94lk62mpgp5gfxs2wqnqsfka5p1gapngq9rhbz15fba5"; depends=[Biobase]; };
+bioDist = derive { name="bioDist"; version="1.38.0"; sha256="0lax2lr794gzz6a6l100zkx6f02k9nj1xmn7d3l224s4vkn57zhr"; depends=[Biobase]; };
+bioassayR = derive { name="bioassayR"; version="1.4.3"; sha256="1p0r8wplhcxh2xw3wc9gda2mgiynfsqr368xjrgkch2q4f95hkbl"; depends=[]; };
+biocGraph = derive { name="biocGraph"; version="1.28.0"; sha256="1rgb7dp24dv5d2nadpl2j4gzqnna1diwciirjb4nmcbb5p8rh8fy"; depends=[Rgraphviz graph Rgraphviz geneplotter graph BiocGenerics]; };
+biocViews = derive { name="biocViews"; version="1.34.1"; sha256="1jxdkbi8fdpc3253qy0gxs3xfd5g4d231n9b3r5sy18424c7zvr7"; depends=[Biobase graph RBGL]; };
+biomaRt = derive { name="biomaRt"; version="2.22.0"; sha256="0pn5cg5yhxg11yfp4xbnm048y1h7njs42f3mb7gbhzk8ijs783cq"; depends=[AnnotationDbi]; };
+biomvRCNS = derive { name="biomvRCNS"; version="1.6.0"; sha256="1bf9s5n3jy3pv6182j8jd7387dlqdy4776vnsi3xn4sz532j2cs6"; depends=[IRanges GenomicRanges Gviz]; };
+biosvd = derive { name="biosvd"; version="2.2.0"; sha256="0yig3gpjzzs7m17c76sdzn68s55waxc6n6jgpbcsl3hg84s3ch95"; depends=[BiocGenerics Biobase]; };
+biovizBase = derive { name="biovizBase"; version="1.14.1"; sha256="1v3d408yxccpps16j2x8pdk3fzfahbjwscaqr10am9qqsvjrcyfa"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges Biostrings Rsamtools GenomicAlignments GenomicFeatures AnnotationDbi VariantAnnotation]; };
+birta = derive { name="birta"; version="1.10.0"; sha256="12jpmicfdw6c314ypy5galxkc4fgdbpawdf55xvm946dvf30bf11"; depends=[limma Biobase]; };
+blima = derive { name="blima"; version="1.0.0"; sha256="0v6a7611ziw0hsklj4w5ry1m1bw0m8lcs75a8ba3brdz0mdhab8k"; depends=[beadarray Biobase BiocGenerics]; };
+bridge = derive { name="bridge"; version="1.30.0"; sha256="1dr2hdip01k3j47vl12w7m4c21b3s8sljjq8pibplcgawx1b848g"; depends=[rama]; };
+bsseq = derive { name="bsseq"; version="1.2.0"; sha256="10vjm9gycr62qq8bh6widjikf4fjcjvgn0y254i6rncq9la7ihvi"; depends=[BiocGenerics IRanges GenomicRanges Biobase]; };
+bumphunter = derive { name="bumphunter"; version="1.6.0"; sha256="115fs6ndzdxfdiqm4lv93b4ym4wh1r2xbfg3vg9i87p0ma59ns7q"; depends=[S4Vectors IRanges GenomeInfoDb GenomicRanges limma BiocGenerics]; };
+cancerclass = derive { name="cancerclass"; version="1.10.0"; sha256="0fc8ia12lkgz38bn13j4zknwrknrzlpfbc7j04z48z5996hjny8i"; depends=[Biobase]; };
+casper = derive { name="casper"; version="2.0.2"; sha256="1x2gmrjgf29l47ss8claarrhhkn6cyi9833z6sg5q69ndmsij957"; depends=[Biobase IRanges GenomicRanges BiocGenerics EBarrays gaga GenomeInfoDb GenomicFeatures limma Rsamtools rtracklayer S4Vectors]; };
+categoryCompare = derive { name="categoryCompare"; version="1.10.0"; sha256="0mj9iipq9alf3cz0wfngsj5lfdjm0zj109l8jdhcqqfhgrf51rd1"; depends=[Biobase BiocGenerics AnnotationDbi GSEABase Category GOstats annotate graph RCytoscape]; };
+ccrepe = derive { name="ccrepe"; version="1.2.0"; sha256="1yj91dm43jkfc757y5izqp72lsw39n0pmg9hhpkmlhd5ddyp5ly8"; depends=[]; };
+cellGrowth = derive { name="cellGrowth"; version="1.10.0"; sha256="0fqzzz06b6sy5xz4cf7i16m07qk3l42k9hbkr7qggpj6y81f0n96"; depends=[]; };
+cellHTS = derive { name="cellHTS"; version="1.36.0"; sha256="1d887wqfn25vh88srxpbbs0z4p2xkxwc3l7d8280j1hg5w1q0nxg"; depends=[prada Biobase genefilter]; };
+cellHTS2 = derive { name="cellHTS2"; version="2.30.0"; sha256="0an4z1czl5ai7rm4dbrrxay0z9yfi2v7c033982mzbnnvwa2kcy7"; depends=[Biobase genefilter splots vsn prada GSEABase Category]; };
+cghMCR = derive { name="cghMCR"; version="1.24.0"; sha256="1nfb7p7l700nzx4gvmj4n2575d4hj5rm8khf77yim8pqndnr2rg8"; depends=[DNAcopy CNTools limma BiocGenerics]; };
+charm = derive { name="charm"; version="2.12.0"; sha256="0pf2qfxydjm9gqy20rskawg04cjmf93013736s5hvq576pa8qw39"; depends=[Biobase genefilter BSgenome Biobase oligo oligoClasses preprocessCore Biostrings IRanges siggenes limma sva]; };
+chimera = derive { name="chimera"; version="1.8.5"; sha256="0jbp6kmzq66dypfhnm5ml9q4krkfrjpam8dbm1nym3agxlhr4ywp"; depends=[Biobase GenomicRanges Rsamtools GenomicAlignments AnnotationDbi]; };
+chipenrich = derive { name="chipenrich"; version="1.4.0"; sha256="03zsdbdg09s3fjsvz181wgfsq8xgjmdf5n7r9y94a84f6140ixsz"; depends=[GenomicRanges IRanges]; };
+chipseq = derive { name="chipseq"; version="1.16.0"; sha256="1mnqrr967h7fizngqq75q67wjvv4b12j0wldjsa7b969fah5jfmn"; depends=[BiocGenerics S4Vectors IRanges GenomicRanges BSgenome ShortRead BiocGenerics IRanges BSgenome GenomicRanges ShortRead]; };
+chopsticks = derive { name="chopsticks"; version="1.30.1"; sha256="1igpilcmz4pxcglwbclink07gyx3ysbndg1qsjfaqr1xafip4hmd"; depends=[]; };
+chroGPS = derive { name="chroGPS"; version="1.10.0"; sha256="1r300py3n2a0c1nim0g6jnr6llsih0hil3g71fa01dckr37yzhjy"; depends=[IRanges Biobase]; };
+cisPath = derive { name="cisPath"; version="1.6.4"; sha256="0h9s84hgy3pgzh39jgjwv81g8g9gj36c6m9n1rz3g26w9hdrcznx"; depends=[]; };
+cleanUpdTSeq = derive { name="cleanUpdTSeq"; version="1.4.0"; sha256="06sq1xpi9n4b07i0r1l87pwnlylsy3qav0z6rfnb5df0xycbsrqq"; depends=[BiocGenerics BSgenome GenomicRanges]; };
+cleaver = derive { name="cleaver"; version="1.4.0"; sha256="09y7f1qcfp4fdkn21c6gfxrrx95piy168lz8ln1v7fd50lz25ilc"; depends=[Biostrings IRanges]; };
+clippda = derive { name="clippda"; version="1.16.0"; sha256="0dv9n6y3c1kfkcnjlyhi9zk80r5glpzihkvdjqpcl06p6i9jgvb4"; depends=[limma Biobase]; };
+clipper = derive { name="clipper"; version="1.6.2"; sha256="05rf33h89b31ys1gr1k1i9aipdc8hgciqzfbnhml7glx8v4gnxyp"; depends=[graph Biobase qpgraph KEGGgraph RBGL]; };
+clonotypeR = derive { name="clonotypeR"; version="1.4.0"; sha256="197dx26v5vxvpdhbh6ph4lcmk93zrbnx9ac4fclspsyna2q5i9yy"; depends=[]; };
+clst = derive { name="clst"; version="1.14.0"; sha256="09gs6489394xnwdsva4kk8qhyixxw5i8pa9nbapld77fkh3mb2ss"; depends=[ROC]; };
+clstutils = derive { name="clstutils"; version="1.14.0"; sha256="0qbrijs731xc64zdkm51j5644y6xkvd22skjvlap4fawh6dn538i"; depends=[clst]; };
+clusterProfiler = derive { name="clusterProfiler"; version="2.0.1"; sha256="0fnmkgincy9sn0hgggnpy5xd9r8dn14yr829dw2b9d9k2rl2x457"; depends=[AnnotationDbi DOSE GOSemSim]; };
+clusterStab = derive { name="clusterStab"; version="1.38.0"; sha256="17w1mz308dp9gjk73k9zh4yhk8ykqh8ya6q2713x6wb8sy66xsrx"; depends=[Biobase]; };
+cn_farms = derive { name="cn.farms"; version="1.14.0"; sha256="1p00mlpsn5adsgq51g7v09vpznbbly05sq1qyndq35mmwlsp6l4y"; depends=[Biobase oligoClasses affxparser oligo DNAcopy preprocessCore]; };
+cn_mops = derive { name="cn.mops"; version="1.12.0"; sha256="091gmwswlnqnh1b9n7xx3xafs4p7m79fw7fakbs43yrdd8ias6nd"; depends=[BiocGenerics Biobase IRanges GenomicRanges Rsamtools]; };
+cnvGSA = derive { name="cnvGSA"; version="1.10.0"; sha256="1wwrpifhg6ppmdrrx8h43mps3h85gv51dm3cn3q198cfhrj4m6yj"; depends=[]; };
+coGPS = derive { name="coGPS"; version="1.10.0"; sha256="16hx3pp517nlg2nk5sbhggxijn7ilf7b7l7zf1wv3zbm2myr1rhi"; depends=[]; };
+coRNAi = derive { name="coRNAi"; version="1.16.0"; sha256="1gg83a3d1zs9h833pxyb18iixwckj5ccgsch0rrhwxlasa778zb3"; depends=[cellHTS2 limma]; };
+cobindR = derive { name="cobindR"; version="1.4.0"; sha256="1c7za0zdpwb49mbhzgyp66pyzvd3nl5hnkdln1s1hwwnqsljivxk"; depends=[Biostrings biomaRt BSgenome IRanges]; };
+codelink = derive { name="codelink"; version="1.34.0"; sha256="15rvy25zn3g7rs2h58pamrg3mb3hb4kh8ghvc7vcnbn70rpqh17f"; depends=[BiocGenerics Biobase limma annotate]; };
+compEpiTools = derive { name="compEpiTools"; version="1.0.3"; sha256="0rlwxxn4vj2vv2348yjay4p4wbfd5r2h3qc6s276225axv6w0nzq"; depends=[topGO GenomicRanges AnnotationDbi BiocGenerics Biostrings Rsamtools IRanges GenomicFeatures XVector methylPipe S4Vectors GenomeInfoDb]; };
+compcodeR = derive { name="compcodeR"; version="1.2.1"; sha256="0r221d2dbhjzh8aqsd74rbjbrfgq2s6amw9zfy3zgjv9hygli84q"; depends=[edgeR limma]; };
+convert = derive { name="convert"; version="1.42.0"; sha256="1i8h0d7vdd0h1gk09zmf3aqvaqq3sl11nhm5yrscb2xkwz085ppn"; depends=[Biobase limma marray]; };
+copa = derive { name="copa"; version="1.34.0"; sha256="1q1ydzkf7inqyc4hxwrvjkxnqwpqw9nry67lr6igsf9mdzc2lawp"; depends=[Biobase]; };
+copynumber = derive { name="copynumber"; version="1.6.0"; sha256="01l8is7f09kr1dq7xzyr65xdr0bx83a4p8yqzyfrvbrjzzildi00"; depends=[BiocGenerics S4Vectors IRanges GenomicRanges]; };
+cosmiq = derive { name="cosmiq"; version="1.0.0"; sha256="1vbdc6my002h7kqigkic4qclxyxfy6jpz861vj6f9m0ysjsnlsn6"; depends=[xcms MassSpecWavelet]; };
+cqn = derive { name="cqn"; version="1.12.0"; sha256="11rprdpfbjkfpdxvzkd25vr0gn5gqkydafp94bmynf02lk8hvmcq"; depends=[preprocessCore]; };
+crlmm = derive { name="crlmm"; version="1.24.0"; sha256="1jgmgf60j1dhpqd7wva1szf8nfcdar2q111njdzx3bi1xqyfcb7s"; depends=[oligoClasses preprocessCore Biobase BiocGenerics affyio illuminaio SNPchip preprocessCore]; };
+csaw = derive { name="csaw"; version="1.0.7"; sha256="08k6d6n7pkxrg81hplp0h775bjjnh39m00k52zmc0g56krfx7dhq"; depends=[GenomicRanges Rsamtools edgeR limma GenomicFeatures AnnotationDbi GenomicAlignments S4Vectors IRanges GenomeInfoDb]; };
+ctc = derive { name="ctc"; version="1.40.0"; sha256="02c7fah15ci45qrydlqd2brmp8j0s5g8n7ms0akr1d203gc9jzfx"; depends=[]; };
+cummeRbund = derive { name="cummeRbund"; version="2.8.2"; sha256="16w4c0bcn55xhqa29kh68qhmpd7hm3mm2m68fm2164lykap2k472"; depends=[BiocGenerics rtracklayer Gviz BiocGenerics Biobase]; };
+customProDB = derive { name="customProDB"; version="1.6.0"; sha256="1cp989qp1s5fwl6vy70fyymxcp23hpnvcb0xaznm21f07fnnmkcp"; depends=[IRanges AnnotationDbi biomaRt IRanges GenomicRanges Rsamtools GenomicAlignments Biostrings GenomicFeatures biomaRt VariantAnnotation rtracklayer AnnotationDbi]; };
+cycle = derive { name="cycle"; version="1.20.0"; sha256="00ibwn87v982k3qrx44k36dcwrs06s2qwvfdbk03pnm3mnmgaqmj"; depends=[Mfuzz Biobase]; };
+daMA = derive { name="daMA"; version="1.38.0"; sha256="19ssjpr3ri1qlj6rx34ddis19rh54waysbjwfhysxzjfphnhpn0c"; depends=[]; };
+dagLogo = derive { name="dagLogo"; version="1.4.1"; sha256="0bzy3q7vfhd5c8aq4aj9mfdmafnnzhvq8qaygxdksv42i2affdj1"; depends=[biomaRt motifStack Biostrings]; };
+ddCt = derive { name="ddCt"; version="1.20.0"; sha256="1dyz23i31fs35h7ay1vah8v41289vf04djxshm10bazxaa2855w4"; depends=[Biobase]; };
+ddgraph = derive { name="ddgraph"; version="1.10.1"; sha256="05hxphpg71d4kzyv4949awdrqhw2hx22lcpmyhv4cbc388nrb9ji"; depends=[graph]; };
+deepSNV = derive { name="deepSNV"; version="1.12.0"; sha256="1ff3x138hmlvpcnqsrfbsbsl51rr4a05h8qsgkjijv33k55f5319"; depends=[Rsamtools GenomicRanges IRanges Biostrings VariantAnnotation Rsamtools Rsamtools]; };
+deltaGseg = derive { name="deltaGseg"; version="1.6.0"; sha256="0b6pxmxzrdxqj9bd8i589xb7vjs2ckygj2a79vcj7gfcigmga8fd"; depends=[]; };
+derfinder = derive { name="derfinder"; version="1.0.10"; sha256="1733lqy4hdq8dl44p3c5l1r0vki1pzxxjawbzx6p2fz8jd0aiilv"; depends=[AnnotationDbi BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges IRanges qvalue Rsamtools rtracklayer S4Vectors]; };
+derfinderHelper = derive { name="derfinderHelper"; version="1.0.4"; sha256="0yiimvsiilj8qh72xijpirdf32gjai5dz1087wgn5rwkwh7qxsi6"; depends=[IRanges S4Vectors]; };
+derfinderPlot = derive { name="derfinderPlot"; version="1.0.3"; sha256="0zg3rjswi61zmji93gcslyr1jgppsbhrjcbsr1il6rjklrgkkd07"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio IRanges]; };
+dexus = derive { name="dexus"; version="1.6.0"; sha256="1fyg8ll9w74qzgcjy2cbs250dbwnhmivz412i6p62yr1050h0hrp"; depends=[BiocGenerics]; };
+diffGeneAnalysis = derive { name="diffGeneAnalysis"; version="1.48.0"; sha256="0gns3f7zqilzp6zb3lyqrqy2cxzrahbv2vc5qygpnrx9pa0dpbqz"; depends=[]; };
+dks = derive { name="dks"; version="1.12.0"; sha256="13g027l318x4zhv2aq02cg9xciqir662xawpgq3r93z57a756473"; depends=[]; };
+domainsignatures = derive { name="domainsignatures"; version="1.26.0"; sha256="1m8l7v2k0vl0mcbmqfqsd7ssiki8zsgn14209dzs0j6hbsikkj4j"; depends=[prada biomaRt AnnotationDbi]; };
+dualKS = derive { name="dualKS"; version="1.26.0"; sha256="0gf36sr7ihpzy0czn11md37hjcykcryvm6fpvnshal4jd5ak3wng"; depends=[Biobase affy]; };
+dyebias = derive { name="dyebias"; version="1.24.0"; sha256="0wy8sisxzlhc2m8pcfsqdkdchhskhy3j5vn5bn2sj8fb2h4h0fm4"; depends=[marray Biobase]; };
+easyRNASeq = derive { name="easyRNASeq"; version="2.2.1"; sha256="1p5i50169qks4prw3dmy5ic6y3w7gmsxzvfg409xy1gj766xkr16"; depends=[Biobase BiocGenerics biomaRt Biostrings DESeq edgeR genomeIntervals GenomicAlignments GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; };
+ecolitk = derive { name="ecolitk"; version="1.38.0"; sha256="1msw03bxvzzk7x15d42qrmhrf0h6ivgvsnmfn4jszxdrvpwhbv41"; depends=[Biobase]; };
+edgeR = derive { name="edgeR"; version="3.8.6"; sha256="0lz9rx7v7ksmfy6jl1w8m6dv184c8gmvpgx457j2wqlg9jm939w5"; depends=[limma]; };
+eiR = derive { name="eiR"; version="1.6.0"; sha256="0d3dj5k891g00anl5nad3xfgz4jg40nvw80qiwrl3ac0nyrfa00p"; depends=[ChemmineR ChemmineR BiocGenerics]; };
+eisa = derive { name="eisa"; version="1.18.0"; sha256="1yly3v4ic9qhlcps729vvz8y5hjwk2z5wz0xgkjzihzmfjd85kyk"; depends=[Biobase AnnotationDbi BiocGenerics Category genefilter]; };
+ensemblVEP = derive { name="ensemblVEP"; version="1.6.2"; sha256="09k8480cgcs40zw10i5zvajb8n7s9165617faqxx62894iv6nxp5"; depends=[BiocGenerics GenomicRanges VariantAnnotation Biostrings]; };
+epigenomix = derive { name="epigenomix"; version="1.6.0"; sha256="0xd380gzgld43k9lib66g56miak8gn65hzxnnlva5f67jwwmb4z6"; depends=[Biobase IRanges GenomicRanges BiocGenerics Rsamtools beadarray]; };
+epivizr = derive { name="epivizr"; version="1.4.6"; sha256="0n049ck7r9090hmch9q41dlzdqm05ipv9lzdbdwf0bdy2cbqjaj2"; depends=[Biobase GenomicRanges S4Vectors OrganismDbi GenomeInfoDb GenomicFeatures]; };
+erccdashboard = derive { name="erccdashboard"; version="1.0.0"; sha256="074xif08r79b4m3hhvxc5iqfshb0d404xrvbz9jyhl11izn708py"; depends=[edgeR limma qvalue]; };
+exomeCopy = derive { name="exomeCopy"; version="1.12.0"; sha256="0s0z362maqk4myh4lygcv647kd8xfvjazsx8x8fv4vprdvwkf36h"; depends=[IRanges GenomicRanges Rsamtools GenomeInfoDb]; };
+exomePeak = derive { name="exomePeak"; version="1.6.0"; sha256="0vl0qx88id24fpvy9kffrq2qhyapygpk1jr6lx8p4qw456vvqiwh"; depends=[Rsamtools GenomicFeatures rtracklayer]; };
+explorase = derive { name="explorase"; version="1.30.0"; sha256="1k19730ky08jxl293f74vl8n386k2ggpkf7mapq5h2y64x39v1mm"; depends=[limma]; };
+fabia = derive { name="fabia"; version="2.12.0"; sha256="13709ymfdlc8xfvlqxac93znkyas56kr39gg1qb8mq5d9jdz72sb"; depends=[Biobase]; };
+facopy = derive { name="facopy"; version="1.0.0"; sha256="1xkk4nbksh6bcir2n1ayvjzi12vwsg32zypcygfdl4h5kx99c4a4"; depends=[annotate DOSE GOstats graphite IRanges Rgraphviz]; };
+factDesign = derive { name="factDesign"; version="1.42.0"; sha256="1kf02yh4k46xcz5csn2cz4wrifxb48wax175p9850mbk6gaw5jm8"; depends=[Biobase]; };
+farms = derive { name="farms"; version="1.18.0"; sha256="03gi6lsjhchjgjc7vvbzmm2w454fia5fpb3ba9jc1w2hz22razld"; depends=[affy affy Biobase]; };
+fastLiquidAssociation = derive { name="fastLiquidAssociation"; version="1.2.2"; sha256="1bq1n4hbcbpcw10sxbibc149075wx3lqhxj8npddz7m0aa4y3ma9"; depends=[LiquidAssociation]; };
+fastseg = derive { name="fastseg"; version="1.12.0"; sha256="19awyg0l6bm9kqh9dlvls17vil15sngh58q15yb0yds1c7qy4ff5"; depends=[GenomicRanges Biobase IRanges BiocGenerics]; };
+fdrame = derive { name="fdrame"; version="1.38.0"; sha256="1hqb6d5vc03p7fbqghyk247l72vl9ivr82zgs90h3f9h2ipq4szn"; depends=[]; };
+ffpe = derive { name="ffpe"; version="1.10.0"; sha256="1x9x759dxnbfd2yhskbalgvqv6lw3mazsjgnf5wgnr4bs4s5zgql"; depends=[Biobase BiocGenerics affy lumi methylumi]; };
+flagme = derive { name="flagme"; version="1.22.0"; sha256="0cs608irzag4ql0lxa34fw6y46k1vqvgg2iv1d5s2y36jmbhx202"; depends=[xcms CAMERA]; };
+flipflop = derive { name="flipflop"; version="1.4.1"; sha256="1cl9p78zgpa7153b296i3azwx0f303np4cqkpmm0sb2v4sb1r4vk"; depends=[IRanges GenomicRanges]; };
+flowBeads = derive { name="flowBeads"; version="1.4.0"; sha256="1azhw92jxiw2b2q046a6hlb3n0wld5ccg9m9grp4rkwsc1sabv0f"; depends=[Biobase flowCore flowCore]; };
+flowBin = derive { name="flowBin"; version="1.2.0"; sha256="08qwjc4yq28r4q4y71a4x79x8razljm64xpvyhfzq7rg06aqdg5w"; depends=[flowCore flowFP limma BiocGenerics]; };
+flowCHIC = derive { name="flowCHIC"; version="1.0.2"; sha256="1i8cvnbhpdk5z1k6mpaw2z7xx092x6kaqh3jz3fj14dqd6vas1g1"; depends=[flowCore EBImage]; };
+flowCL = derive { name="flowCL"; version="1.4.0"; sha256="0gags4slbjgb97khcsrnzar2s3xpkck77n8ji50m0yha8h31g9m7"; depends=[Rgraphviz]; };
+flowClean = derive { name="flowClean"; version="1.2.0"; sha256="1l11chqaj0in4gsj869crx9z5ib36acjq0sa5lwflzy99xd179ky"; depends=[flowCore]; };
+flowClust = derive { name="flowClust"; version="3.4.11"; sha256="0v6p70m948wz5hln0fp1bq9z80vkw5xw7lqhv9lpxgwa7k0gzh8r"; depends=[Biobase graph RBGL flowViz flowCore BiocGenerics]; };
+flowCore = derive { name="flowCore"; version="1.32.2"; sha256="03ykfhc8vfc4ss5dgrzi7qn6y99qn78b9j5y1fdmslsdsm81n2mq"; depends=[Biobase BiocGenerics graph]; };
+flowCyBar = derive { name="flowCyBar"; version="1.2.2"; sha256="0ndpw0nh1hkpw8fis8v0850pargfrih96ybv8gi6sks3r127ji11"; depends=[]; };
+flowDensity = derive { name="flowDensity"; version="1.0.0"; sha256="14z5100z8kh3xmd2dic274nfyj996dc7vhz5mjp91aifj9igjjss"; depends=[flowCore]; };
+flowFP = derive { name="flowFP"; version="1.24.0"; sha256="0nbx7yh8nzjzfb1dcxzfmyhgm6f8yljqc9ngnywx1gs3gxbm6drx"; depends=[flowCore flowViz Biobase BiocGenerics flowCore flowViz]; };
+flowFit = derive { name="flowFit"; version="1.4.0"; sha256="1p4k2gmjghk7xnfkkv14vbw5ambq7ik577yqyf1vfx4sqnpjp5k7"; depends=[flowCore flowViz]; };
+flowFlowJo = derive { name="flowFlowJo"; version="1.24.0"; sha256="0cx1bn64gwcffzdxa3fbk2pi8bwfpbllbrgvsh4g020yqlgrnxml"; depends=[flowCore Biobase]; };
+flowMap = derive { name="flowMap"; version="1.4.0"; sha256="0qfpmmi6dw3vj3kkyygl12w6r5sq5ncd9gk31hd91dhm3ph3q44l"; depends=[]; };
+flowMatch = derive { name="flowMatch"; version="1.2.0"; sha256="0k3vc9b1clp65abb702402srbahgsb36lk4ii76mhz965gnss024"; depends=[flowCore Biobase]; };
+flowMeans = derive { name="flowMeans"; version="1.18.0"; sha256="18nx0b889zyiihcg6lxqiqwgcg3xzw4xwdlm4q47nb564f82b52l"; depends=[Biobase flowCore]; };
+flowMerge = derive { name="flowMerge"; version="2.14.0"; sha256="1kaq8l0ackcmkair4pjm94337qlig9vvl018dz0v8mhplzlsdg91"; depends=[graph flowClust Rgraphviz flowCore]; };
+flowPeaks = derive { name="flowPeaks"; version="1.8.0"; sha256="1ppgxywm1hvinj45f0bxh2vj25mrq7l10yxr6ayk49vlg3filia2"; depends=[]; };
+flowPhyto = derive { name="flowPhyto"; version="1.18.0"; sha256="1b55fswncz00ij4237m9ayki5hvjhv0j58xa9p4r56495cxfj8f3"; depends=[flowClust flowCore flowMeans]; };
+flowPlots = derive { name="flowPlots"; version="1.14.0"; sha256="117nxr4y65bx6qrm8kg9y0afdyyj87j3m8p03s5naigbc7xl660p"; depends=[]; };
+flowQ = derive { name="flowQ"; version="1.26.0"; sha256="0rrkxnhxmy18cbrafzlhkpdw2vbjv8bqrxix0xn60z6c45y7w02n"; depends=[BiocGenerics flowViz bioDist parody BiocGenerics geneplotter flowCore flowViz IRanges]; };
+flowQB = derive { name="flowQB"; version="1.10.0"; sha256="11qz76h5897jwlh6ql6x8dalpzigimbkqvicr3vzh5lxnprw63kl"; depends=[Biobase flowCore]; };
+flowStats = derive { name="flowStats"; version="3.24.8"; sha256="0ph3czaz1w6dsnyianp6133fwlfx9afxwv3q9ykca53sq6vblg30"; depends=[flowCore flowWorkspace BiocGenerics flowViz flowCore Biobase]; };
+flowTrans = derive { name="flowTrans"; version="1.18.0"; sha256="0wivpq2hx4rr89fd85sz3qpa4g7barz3pvp91nc8h4pngj769312"; depends=[flowCore flowViz flowClust flowCore flowViz flowClust]; };
+flowType = derive { name="flowType"; version="2.4.0"; sha256="0kp8nh4hd09m65kfhh0jcj9hyyak69sb6mjqhn3j81imnwr1g981"; depends=[Biobase flowCore flowMeans flowClust flowMerge]; };
+flowUtils = derive { name="flowUtils"; version="1.30.0"; sha256="1cm8jh3xsbmm88p28yri47iviwd2b0pp6xh8bbgjmsgnibrsagym"; depends=[flowCore Biobase graph flowViz]; };
+flowViz = derive { name="flowViz"; version="1.30.1"; sha256="1i3sm5bgp6y7y8s2gzlbckacszjcvdfx9khnqyflspw3p7pppwaq"; depends=[flowCore Biobase flowCore]; };
+flowWorkspace = derive { name="flowWorkspace"; version="3.12.06"; sha256="12sk1dkxm85mgsyh41qjgzg9lyyj44250gkib00a8kl2ss37skbk"; depends=[flowCore flowViz ncdfFlow Biobase BiocGenerics graph RBGL graph Biobase Rgraphviz]; };
+flowcatchR = derive { name="flowcatchR"; version="1.0.3"; sha256="0w3wnnq1snh6v59lim8av5wbg2bvs4xmd24vv3kjrs9d4v68qbwz"; depends=[EBImage BiocParallel]; };
+fmcsR = derive { name="fmcsR"; version="1.8.0"; sha256="08mk2kmaxxflimfahdpfpclqyg550y9dr0p0s232l6zghp97vshr"; depends=[ChemmineR ChemmineR BiocGenerics]; };
+focalCall = derive { name="focalCall"; version="1.0.0"; sha256="096wps0kcglw3vrw9rbm2abs6qpq4fbll7w67w5gi36s1mba4azn"; depends=[CGHcall]; };
+frma = derive { name="frma"; version="1.18.0"; sha256="036x1q0fwyafavzs1q8hpm9ipwn3qiqn7sfkh032vphhghp8hgli"; depends=[Biobase Biobase affy oligo oligoClasses preprocessCore BiocGenerics]; };
+frmaTools = derive { name="frmaTools"; version="1.18.0"; sha256="1y6lgv2cja7zz9qmid46lfj83rs3i7as9mjpgn30qmdghswrp04f"; depends=[affy Biobase preprocessCore]; };
+gCMAP = derive { name="gCMAP"; version="1.10.2"; sha256="0yxczlsf1q3ibbcr668fsgya10jx6871kxpkr332yhn87zshp80s"; depends=[GSEABase limma Biobase BiocGenerics GSEAlm Category annotate genefilter AnnotationDbi]; };
+gCMAPWeb = derive { name="gCMAPWeb"; version="1.6.0"; sha256="0k2g0vl0xllir75haajgqarqn19ycsqypsnwc1x66q022aq08l52"; depends=[gCMAP Biobase annotate AnnotationDbi BiocGenerics GSEABase IRanges]; };
+gaga = derive { name="gaga"; version="2.12.0"; sha256="14jf02535hrf3117ih89nslz55snj8vw9vznny7nnhnlq29hqwfy"; depends=[Biobase EBarrays]; };
+gage = derive { name="gage"; version="2.16.0"; sha256="19y270z9sq1q91f44013r10hms903zrhy7wx7q4i10yf7ch8zakj"; depends=[graph KEGGREST AnnotationDbi]; };
+gaggle = derive { name="gaggle"; version="1.34.0"; sha256="16flb2xx4n840kmq2c5sc0j0p03gi0bz8sc3ry240nch5i15jqmx"; depends=[graph]; };
+gaia = derive { name="gaia"; version="2.10.0"; sha256="18j3ws2j2nj4j30wvhgjjqvwd2dmb3qf17rsdw9hgfx2xi5c1a2a"; depends=[]; };
+gaucho = derive { name="gaucho"; version="1.2.0"; sha256="024ca4709pymhja36iz5p1xaca0ihhk0i1cjs6fyllhz9s91h8zg"; depends=[graph Rgraphviz]; };
+gcrma = derive { name="gcrma"; version="2.38.0"; sha256="1rv87jwqca62xgg3a14lak3am2vm3qb4cdsl0d3iqhr833pgmil3"; depends=[affy Biobase affy affyio XVector Biostrings BiocInstaller]; };
+gdsfmt = derive { name="gdsfmt"; version="1.2.2"; sha256="0vk6y1ma3pxdwqnk1zv5vkc768lj65xmm49ib4zkawj5ndc71rzx"; depends=[]; };
+geNetClassifier = derive { name="geNetClassifier"; version="1.6.3"; sha256="0sigqjw6xpqbdai00mwwbpzcxm0fdmqclqyjz167whkhgdyvrza8"; depends=[Biobase EBarrays minet]; };
+geecc = derive { name="geecc"; version="1.0.0"; sha256="0prhm27ni2m457fmvh7n4898kkvpqkpq30cnjkd15k9hsnpag3zc"; depends=[]; };
+genArise = derive { name="genArise"; version="1.42.0"; sha256="1glhv4d0x6imlqnyddq9pfd3ggzg719qm2pka3rxqjl7p2mivwsn"; depends=[]; };
+geneRecommender = derive { name="geneRecommender"; version="1.38.0"; sha256="00v4sj89303izigaaq58jh2170ybf6plwzxa087sr1gfzhxgab01"; depends=[Biobase Biobase]; };
+geneRxCluster = derive { name="geneRxCluster"; version="1.2.0"; sha256="0hc57j5kvv3kzgkf5y403jjdvmav1fbi9f029jkgwnsrgfn07gid"; depends=[GenomicRanges IRanges]; };
+genefilter = derive { name="genefilter"; version="1.48.1"; sha256="1xlijvr11js9kxq1s1i4y4glhn5jssfczv94c7zb9mpcmf76yd9i"; depends=[AnnotationDbi annotate Biobase]; };
+genefu = derive { name="genefu"; version="1.16.0"; sha256="0w1031bc11h4hf3z9fy6yp7lnwlvcasd1kmsazz8lxmjpv2pslk9"; depends=[survcomp biomaRt]; };
+geneplotter = derive { name="geneplotter"; version="1.44.0"; sha256="13asb62sawiwbj2rv85ndyc07x0957i743gnrgq0r6y7shyq3xmn"; depends=[Biobase BiocGenerics annotate AnnotationDbi]; };
+genoCN = derive { name="genoCN"; version="1.18.0"; sha256="01dh4z1377znp9yi6k8rq3ai0jzp7apqapx69cmd9kf4qxr39ay5"; depends=[]; };
+genomeIntervals = derive { name="genomeIntervals"; version="1.22.3"; sha256="1rsvrk2l9wvji370kcyrvj97rfxh2ylrmzry3347khks46dmsc7r"; depends=[BiocGenerics]; };
+genomes = derive { name="genomes"; version="2.12.0"; sha256="1ll3nnfrpb575cmra99vibsda33xc822l5mm08mldkazzg8xf0nr"; depends=[GenomicRanges IRanges Biostrings]; };
+genoset = derive { name="genoset"; version="1.20.0"; sha256="13jvc5qczkkm2a4kq06pdi9pzhcskk7fp6vl8x4gvzr9srvq4ca4"; depends=[BiocGenerics Biobase GenomicRanges S4Vectors GenomeInfoDb IRanges]; };
+ggbio = derive { name="ggbio"; version="1.14.0"; sha256="1pbx15f4gax3kc7crggizjasvs8h6y22qz3b7ya77cjzc5j90pb1"; depends=[BiocGenerics biovizBase Biobase S4Vectors IRanges GenomeInfoDb GenomicRanges Biostrings Rsamtools GenomicAlignments BSgenome VariantAnnotation rtracklayer GenomicFeatures OrganismDbi]; };
+girafe = derive { name="girafe"; version="1.18.0"; sha256="1ipxbg07m52d82gr59b3gbmasrjqi5d9665qdzrg7jfs3vx00dqf"; depends=[BiocGenerics S4Vectors IRanges Rsamtools ShortRead genomeIntervals Biobase Biostrings BSgenome IRanges]; };
+globaltest = derive { name="globaltest"; version="5.20.0"; sha256="0rpmylm3pfkbmbarga6zn3705kn9cz5cpngqj9ad6z1rgc1xxb83"; depends=[Biobase AnnotationDbi annotate multtest]; };
+gmapR = derive { name="gmapR"; version="1.8.0"; sha256="02kxlfd2xnl2ki7604wy6gwf18j6x9sxfm3acraiwwyxa9n3qfkp"; depends=[GenomeInfoDb GenomicRanges S4Vectors IRanges Rsamtools rtracklayer GenomicFeatures Biostrings VariantAnnotation Biobase BSgenome GenomicAlignments BiocParallel]; };
+goProfiles = derive { name="goProfiles"; version="1.28.0"; sha256="0l1n93j7zc3mzydhgykcy1ys5vljm0ka2wzld9l0i79dwcsjsap5"; depends=[Biobase AnnotationDbi]; };
+goTools = derive { name="goTools"; version="1.40.0"; sha256="0b2p46r643mjbcx8q1g6qpbvb1qc2mwz9l58snilbqv214fh1khd"; depends=[AnnotationDbi]; };
+goseq = derive { name="goseq"; version="1.18.0"; sha256="0srsf83nic4lqa8ab3qcsjid8djblbqgddpxih7dvykxc3yh84x1"; depends=[AnnotationDbi BiocGenerics]; };
+gpls = derive { name="gpls"; version="1.38.0"; sha256="036cqbrs388snhcfg09zmrq7s5ggp45z7pbyhfhzs4g0f8kzgb2d"; depends=[]; };
+gprege = derive { name="gprege"; version="1.10.0"; sha256="1bgb9q5wdl0ha1499khp0wrmckibjhgfm5p2xrygxijhd0yb0iff"; depends=[]; };
+graph = derive { name="graph"; version="1.44.1"; sha256="1s8va4zn2w1rg91m7ascp03gk3cfzymjpbwb3xr6clrpbnbw8g7g"; depends=[BiocGenerics]; };
+graphite = derive { name="graphite"; version="1.12.0"; sha256="1pjaf7zrrrfw5h15zk9qzpw6dh3lwfv41fk5clmg0aa1gsln7s0y"; depends=[AnnotationDbi graph]; };
+groHMM = derive { name="groHMM"; version="1.0.2"; sha256="1gvb4h54hs65c7sckx4k3832698p9gppbmx4gqbspswrqf6izr2k"; depends=[S4Vectors IRanges GenomicRanges GenomicAlignments rtracklayer]; };
+gwascat = derive { name="gwascat"; version="1.10.0"; sha256="1s27idaikm22yqdhnvnkilk1jm3r50h1hriswpis9gbjnfmma1kn"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges snpStats Biostrings Rsamtools rtracklayer]; };
+h5vc = derive { name="h5vc"; version="2.0.6"; sha256="122s8jx03ilx9zg8yg4ir7fysyk8hq6fqz87mqjvprzhy8c1f2ip"; depends=[rhdf5 S4Vectors IRanges Biostrings Rsamtools GenomicRanges BiocParallel GenomeInfoDb]; };
+hapFabia = derive { name="hapFabia"; version="1.8.0"; sha256="0zmbwyjs96zhr2qa27i9vig4vmafkkr3sl00pr90p2zs2g1m5gqj"; depends=[Biobase fabia]; };
+hiAnnotator = derive { name="hiAnnotator"; version="1.0.0"; sha256="1l4kdp4ra7svjwi4zfkgsi6z363nvjr5ihs8pn9y32xyfp31swc8"; depends=[GenomicRanges rtracklayer BSgenome]; };
+hiReadsProcessor = derive { name="hiReadsProcessor"; version="1.0.0"; sha256="14p37x0qbv6jgv2mb071zwn675y4nx4h4kbzsqgzdaqa0y467hd4"; depends=[Biostrings GenomicAlignments BiocParallel hiAnnotator]; };
+hopach = derive { name="hopach"; version="2.26.0"; sha256="0vc1ji0n12k1q812539163n5vw99sh2z885gw9p97llr3aazr3x6"; depends=[Biobase BiocGenerics]; };
+hpar = derive { name="hpar"; version="1.8.1"; sha256="10n9bnzhvnms4bj8db441hil0i4kxdmvqpf8c39xvpyq7a1brv5k"; depends=[]; };
+htSeqTools = derive { name="htSeqTools"; version="1.12.0"; sha256="1wb847k7bvr5y4kc48lhwyfl6ng8r42qpaqqwccb2q5mfz5cqxzf"; depends=[BiocGenerics Biobase IRanges BSgenome GenomeInfoDb GenomicRanges]; };
+hyperdraw = derive { name="hyperdraw"; version="1.18.0"; sha256="18l0lcwaki5fqw4hmf481irmikgc45a5n7h225zvh5j78ci207mj"; depends=[graph hypergraph Rgraphviz]; };
+hypergraph = derive { name="hypergraph"; version="1.38.1"; sha256="05w2l5y16xrw309hsgy283qn48gn95l6c754jiwxkmn2cap8zqwp"; depends=[graph]; };
+iASeq = derive { name="iASeq"; version="1.10.0"; sha256="0m1i6f0ngk94kr8wmanhf26g6pnym0lcvak82nmprdzhnkxh8y9c"; depends=[]; };
+iBBiG = derive { name="iBBiG"; version="1.10.0"; sha256="0d0d0v6fn6xsm6j4p2z924sspxvs1kdf93vsn5wwgfb86rh205sk"; depends=[]; };
+iBMQ = derive { name="iBMQ"; version="1.6.0"; sha256="0d6w6b276p48c65h4zk6dfzmn9i6vsam5lry9p7pyz6xzmdbx84z"; depends=[Biobase]; };
+iChip = derive { name="iChip"; version="1.20.0"; sha256="13rs1j0l9nh5dir725kcbzhp6b741gn8xnv67w5pj9bmx3q1njkk"; depends=[limma]; };
+iClusterPlus = derive { name="iClusterPlus"; version="1.2.0"; sha256="1f4hg8phzza2dlw7svabbpxwyjplc3xxzzd267axvq4pkxyz7f5z"; depends=[]; };
+iPAC = derive { name="iPAC"; version="1.10.0"; sha256="0dav5mrfk9gy07lavf2f7am78zb3jcy4scbglajr7bf212v16awj"; depends=[Biostrings multtest]; };
+iSeq = derive { name="iSeq"; version="1.18.0"; sha256="14pdjh6i0xr6ihy7jz30prwv2s9q5wib8d5s1crpk72bz9dqbn59"; depends=[]; };
+ibh = derive { name="ibh"; version="1.14.0"; sha256="05kiqbfkd6a865y7ckn2hv3kagyab91i57f27327b42hqzi3v7dy"; depends=[]; };
+idiogram = derive { name="idiogram"; version="1.42.0"; sha256="1k257rdqxqa8mncdanzjy5vcmp7l3jzfzr5sbcpr1fml30jpljmh"; depends=[Biobase annotate]; };
+illuminaio = derive { name="illuminaio"; version="0.8.0"; sha256="17lcdl401xcf4dc8rs3nz9nrycrvyq1smdk73v4g07mj1mkydbyg"; depends=[]; };
+imageHTS = derive { name="imageHTS"; version="1.16.0"; sha256="0iq1mhr9ic5hwrylb9ffblk5rfm8vkqvzi4wj69dga5khc3bvi7x"; depends=[EBImage cellHTS2 Biobase vsn]; };
+impute = derive { name="impute"; version="1.40.0"; sha256="0m4wfrgax6hxjwb6fgyn9dh0z3vnj1pqwgafyp7ic0ifd3zn7nbg"; depends=[]; };
+inSilicoDb = derive { name="inSilicoDb"; version="2.2.1"; sha256="1c4kkcljwvl1xaxr8i23zvf6m73bbs4yydw3rvimbn39a55dp26g"; depends=[Biobase]; };
+inSilicoMerging = derive { name="inSilicoMerging"; version="1.10.1"; sha256="0c73zrxnbpixlmdx24rqrhv7h03agk3ckss64wr03r8zc1z6wrd8"; depends=[Biobase]; };
+intansv = derive { name="intansv"; version="1.6.2"; sha256="11zvsgpyl712qdjz8mfkbyl4d09f6lb0wbnr3c50crw76flhp5m2"; depends=[ggbio GenomicRanges BiocGenerics IRanges]; };
+interactiveDisplay = derive { name="interactiveDisplay"; version="1.4.1"; sha256="14mpww5ijwlkdyl3hxdyd95zik0s5vrb1dmhdpfhcbd18xj6gkcs"; depends=[BiocGenerics interactiveDisplayBase Category AnnotationDbi]; };
+interactiveDisplayBase = derive { name="interactiveDisplayBase"; version="1.4.0"; sha256="0ahd8ja8f6d7lcn6kz9wm8g7ly5ngda8zva44120r6df3n6ij2dg"; depends=[BiocGenerics]; };
+inveRsion = derive { name="inveRsion"; version="1.14.0"; sha256="1zmb0h949sc9xvyc3qjc8xhg1iq9lpff3h98zn6zq4lr9hv542w3"; depends=[]; };
+iontree = derive { name="iontree"; version="1.12.0"; sha256="1z62n0y2x569s5f3dxrbya70sbx5zjfhv17awnzw4bxsl2iwdlsw"; depends=[]; };
+isobar = derive { name="isobar"; version="1.12.2"; sha256="1paxykz7b400cxmdbwh0xw3crvlrd63i612w1bkm8n5d508wij8k"; depends=[Biobase]; };
+iterativeBMA = derive { name="iterativeBMA"; version="1.24.0"; sha256="14ri5m9lk77w5clsh0jsidsx8xwxizky5mrvhk136x20pd13vp8n"; depends=[Biobase]; };
+iterativeBMAsurv = derive { name="iterativeBMAsurv"; version="1.24.0"; sha256="0wg07ass90ha2z460vddlchw2vjcn6sfzmrwfdjak1b9cckhgg7f"; depends=[]; };
+jmosaics = derive { name="jmosaics"; version="1.6.0"; sha256="1kif1ms3v4askg9sf43fgrw8flxpzp36a7pwflnbfg035xkjdwgn"; depends=[mosaics]; };
+joda = derive { name="joda"; version="1.14.0"; sha256="09xyk761825hpjpffv2d6bmj8snprm9k8fdaslyh4clx0r9nsm13"; depends=[RBGL]; };
+kebabs = derive { name="kebabs"; version="1.0.5"; sha256="0jphbpbv5r8s0q4f985yvrckjx58g94nw9mccqfsrjlz2ka8kpls"; depends=[Biostrings XVector S4Vectors IRanges XVector Biostrings S4Vectors]; };
+keggorthology = derive { name="keggorthology"; version="2.18.0"; sha256="0iwwp3zv94ci89l1wd19l4ryjlggq9naairzsifrajnq3ivq07fg"; depends=[graph AnnotationDbi graph graph]; };
+lapmix = derive { name="lapmix"; version="1.32.0"; sha256="16gqhmyd5yl2myk9b7dad9mr3agxh5a1hgd2xdszrnya61r7kvnw"; depends=[Biobase]; };
+les = derive { name="les"; version="1.16.0"; sha256="1g7hqm61z66qf6cw5dl8xc0ndw7hak2034kc2zdp2i7gl5ww8iad"; depends=[]; };
+limma = derive { name="limma"; version="3.22.7"; sha256="0qa5kfph80j4ykngaj300bkvk464chpnlsaffqwnv0g70r1af7hy"; depends=[]; };
+limmaGUI = derive { name="limmaGUI"; version="1.42.0"; sha256="0236bmwxdppgpw0fb4sw8wg16k2pijzxm8a6qy2kxd3a77ci034k"; depends=[limma]; };
+lmdme = derive { name="lmdme"; version="1.8.0"; sha256="0pidyb48ranx4a9k6zk69sh5dd51q81wig1h5qbv1irsdjrl5k51"; depends=[limma]; };
+logicFS = derive { name="logicFS"; version="1.36.0"; sha256="0hyqfcb3lz0ylgf21mklwam2w7vrii2k0bsazwx02kp1z918qzax"; depends=[]; };
+logitT = derive { name="logitT"; version="1.24.0"; sha256="09b7wk51hbvfhvmvwfqjd194ywgqyp728nvwbi44ln04v4d1834h"; depends=[affy]; };
+lol = derive { name="lol"; version="1.14.0"; sha256="0y78yfbyjy40cybqyxhfsg3ay9kacv75a7xi71npkqii04f7cszq"; depends=[]; };
+lpNet = derive { name="lpNet"; version="1.6.0"; sha256="1qk4v6wq01218r17a1daj7h9jsb9i7l867r2m4ry0bjgnz2h6lk2"; depends=[nem]; };
+lumi = derive { name="lumi"; version="2.18.0"; sha256="1f0fcz7vlkc062fn248hgx3p1msz3hna34aa0g1gcnv51rxb5him"; depends=[Biobase affy methylumi GenomicFeatures GenomicRanges annotate Biobase preprocessCore AnnotationDbi]; };
+mBPCR = derive { name="mBPCR"; version="1.20.0"; sha256="1l7ybvnh00grfjdvpn45ns8kg6jfs8hn7z4ijyghzmm70w9527xk"; depends=[oligoClasses SNPchip Biobase]; };
+mQTL_NMR = derive { name="mQTL.NMR"; version="1.0.0"; sha256="0dbpkbgbpzv8vzmgcs4s3ppfwy88aj79cd3cnf18jqg43b56w4fi"; depends=[]; };
+maCorrPlot = derive { name="maCorrPlot"; version="1.36.0"; sha256="12k4f427xipcbhz6ffv25rxpk799vpv2g15lpj15pmjpspi43q10"; depends=[]; };
+maPredictDSC = derive { name="maPredictDSC"; version="1.4.0"; sha256="1bnkfpicb3pfr2rymnwc5n56zk1fyzhg58b823xdjpdv3p4d806h"; depends=[affy limma gcrma ROC AnnotationDbi]; };
+maSigPro = derive { name="maSigPro"; version="1.38.0"; sha256="1pk8mnzvrsp0x229r91xdx0f7v18dizw2pjkhyh3xblx4mgbryyh"; depends=[Biobase Biobase limma Mfuzz]; };
+maanova = derive { name="maanova"; version="1.36.0"; sha256="0ygwzxl89rng52vf4ai41mbsn0yiv580l0xfwykqai81qjk97kgy"; depends=[Biobase]; };
+macat = derive { name="macat"; version="1.40.0"; sha256="14azwx7719wqi4n4k17y90w3ypcz8kmmkf25lwgf1mx8jpqdfnn6"; depends=[Biobase annotate]; };
+made4 = derive { name="made4"; version="1.40.0"; sha256="1hxaz11k0kcidm9krf9a63hhxkcrk9g3lrljd1bphj6kwjs0zyfg"; depends=[]; };
+maigesPack = derive { name="maigesPack"; version="1.30.0"; sha256="0dmxikyw045b0q6vkq7l5rh6rkvjzjjrppi07yx2849hvd78sv74"; depends=[convert graph limma marray]; };
+makecdfenv = derive { name="makecdfenv"; version="1.42.0"; sha256="1z0p3piyaj8577hmvmainng3csbcwszk4mijdbw5i6pzv4j7qlzc"; depends=[affyio Biobase affy zlibbioc]; };
+manta = derive { name="manta"; version="1.12.0"; sha256="0kkfdvd6b1fz289di5h3pbnh5lm6ixcg0vdancxrqh23xcmzn020"; depends=[edgeR]; };
+marray = derive { name="marray"; version="1.44.0"; sha256="1cg2qkg2pyf2vy9j2c2iw2z3mppmz7hvknm207dky594sh38azsm"; depends=[limma]; };
+maskBAD = derive { name="maskBAD"; version="1.10.0"; sha256="02dy1y7z0s2g3kp5dn5scrvqfwbdp57fyrc85bb576ncbckd89gl"; depends=[gcrma affy]; };
+massiR = derive { name="massiR"; version="1.2.0"; sha256="0x7ip2w8vrh0pa5rw8s53a7kmb4aixmd32y1y9vwm8q19p1fn91c"; depends=[Biobase]; };
+matchBox = derive { name="matchBox"; version="1.8.0"; sha256="1g44cbac3k4d5krpi93nrxk3w43sihfblnji5hknavny7z2k57k1"; depends=[]; };
+mcaGUI = derive { name="mcaGUI"; version="1.14.0"; sha256="188zganyc5wqm87nk160w6zhrzwjxs3mpiin17mr13kr609cs03j"; depends=[OTUbase]; };
+mdqc = derive { name="mdqc"; version="1.28.0"; sha256="06bb1il2r9pfnnja6nmdx1k7pq827xnnr67q6l3k262rj3j0nfk2"; depends=[]; };
+meshr = derive { name="meshr"; version="1.2.7"; sha256="014lj15kk2aq49hys0cdrxr7c6psxpah91jbwkw9mk57s0vw3fja"; depends=[Category BiocGenerics cummeRbund MeSHDbi S4Vectors]; };
+messina = derive { name="messina"; version="1.2.0"; sha256="054hznxclhv9b9inis2xc0y1028hqc9fwl15z0hrqld9z4jsl5vc"; depends=[]; };
+metaArray = derive { name="metaArray"; version="1.44.0"; sha256="0nbvz094xgm4k25z77d1frq72mjdy9ck2a8fy2zkb97gpnsii10h"; depends=[Biobase MergeMaid]; };
+metaMS = derive { name="metaMS"; version="1.2.0"; sha256="0137zd25mr0pwclbnnf06si79ja1kn0czfw698cnd38fjkz300sg"; depends=[CAMERA xcms BiocGenerics]; };
+metaSeq = derive { name="metaSeq"; version="1.6.0"; sha256="04yfs1zhd35w9zjn71cnm9avc5rhqkg8jymgsra1slgrdhwwly7m"; depends=[NOISeq]; };
+metabomxtr = derive { name="metabomxtr"; version="1.0.0"; sha256="0wr2qyh57r9c0pdbjrkri72zjxjm3vjdh6ny1srwjrgx5hfa9nr7"; depends=[Biobase multtest]; };
+metagene = derive { name="metagene"; version="1.0.0"; sha256="1b2nqyis5cl7z16ql0ix9wyh9lcbnxhx26sz3wgrxwxwrq5gy64g"; depends=[rtracklayer GenomicRanges GenomicAlignments]; };
+metagenomeSeq = derive { name="metagenomeSeq"; version="1.8.3"; sha256="16j5g3yb184giygbfrb96ggal8y44b40g7771g9bgfzr950dq9wc"; depends=[Biobase limma interactiveDisplay]; };
+metahdep = derive { name="metahdep"; version="1.24.0"; sha256="13w25dailvl4y4vzb66vkyzzgswy10izapicf41f2w4qqwp1swc9"; depends=[]; };
+metaseqR = derive { name="metaseqR"; version="1.4.13"; sha256="14sbagw7jkv56569z438y0vsph104hryb825ih4wsk1ngrgnk7zg"; depends=[EDASeq DESeq limma qvalue edgeR NOISeq baySeq biomaRt vsn]; };
+methVisual = derive { name="methVisual"; version="1.18.0"; sha256="0mr5rymx9x4aav2lvfjxmm5zc47xfgmysnh5lvgx30fpsf1gsa2m"; depends=[Biostrings Biostrings IRanges]; };
+methyAnalysis = derive { name="methyAnalysis"; version="1.8.0"; sha256="1ygj9j2b0g052n7vv1qypv9ffmxfc3dpwmxmdqs8gq7gdz9h36yn"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges Biobase lumi methylumi Gviz genoset GenomicRanges IRanges rtracklayer GenomicFeatures annotate Biobase AnnotationDbi genefilter biomaRt]; };
+methylMnM = derive { name="methylMnM"; version="1.4.0"; sha256="10p4jhqq0116grwcwf28jxgn59c66bkwcqvxy11mrw6533dbnfp5"; depends=[edgeR]; };
+methylPipe = derive { name="methylPipe"; version="1.0.5"; sha256="0z3xkrzpkgdl7cjam9mirm8gqwc69gicprlw2vgphzdc491dbx1y"; depends=[GenomicRanges Rsamtools marray IRanges BiocGenerics Gviz GenomicAlignments Biostrings GenomeInfoDb S4Vectors]; };
+methylumi = derive { name="methylumi"; version="2.12.0"; sha256="0mcg985g3nw8cbjffagdsjn1an0z61jzl7w24zzhy4mbscjj0b6h"; depends=[Biobase minfi BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges Biobase annotate genefilter AnnotationDbi minfi illuminaio]; };
+mgsa = derive { name="mgsa"; version="1.14.2"; sha256="16x4s22r6qyirrm78260i59lzx5mknfirjg09dhw56w431ibra9b"; depends=[]; };
+miRNApath = derive { name="miRNApath"; version="1.26.0"; sha256="0lpr2id012wdh3zkla6xpyfxsy068zzbldfwj24hclzxqiwhqkgd"; depends=[]; };
+miRNAtap = derive { name="miRNAtap"; version="1.0.0"; sha256="1w2ivqkndnmq9h2h9nx0wcwg7hppiyskgrvmmsy36q3dy96nvis1"; depends=[AnnotationDbi]; };
+microRNA = derive { name="microRNA"; version="1.24.0"; sha256="187xjq2fy9zgvx82q47rvywrsc0260vlzyi79zd48ayyr8wi2q5s"; depends=[Biostrings]; };
+minet = derive { name="minet"; version="3.24.0"; sha256="126yhbn98048ahnmcc7v8pgk9c2fa669fw84zq4819zq027dqk07"; depends=[]; };
+minfi = derive { name="minfi"; version="1.12.0"; sha256="0cz59qcbg6bi7l4kzsdx1jrlwfr720ahpc5f3qap8j5bdhsgjr0i"; depends=[BiocGenerics Biobase GenomicRanges Biostrings bumphunter S4Vectors IRanges siggenes limma preprocessCore illuminaio genefilter]; };
+missMethyl = derive { name="missMethyl"; version="1.0.0"; sha256="054y75q7dlwnrbrx68kjpj9pdb5wx9nhrg3ch8kxfi6kcbymyibk"; depends=[limma minfi methylumi]; };
+mitoODE = derive { name="mitoODE"; version="1.4.0"; sha256="1xaxf61vlfcx02sigmplayak0kc35s3301l42f3lap9236qmiikl"; depends=[]; };
+mmnet = derive { name="mmnet"; version="1.4.0"; sha256="1brgl3bnxja3z8wrny9d53ir7yk8qsdl02dr46055spck5p5ngkd"; depends=[Biobase KEGGREST]; };
+monocle = derive { name="monocle"; version="1.0.0"; sha256="07i77c7hicfd00b8y0y6gkd6ffach0s67awl69q3xzjlvhv6yq5b"; depends=[Biobase BiocGenerics limma]; };
+mosaics = derive { name="mosaics"; version="2.0.1"; sha256="0gmhlg34vhdzn9dg5g8l1xndrs54c4ijwi5b5hvnij09wagi4557"; depends=[IRanges]; };
+motifRG = derive { name="motifRG"; version="1.10.0"; sha256="1bsj18j0cnj31njy5l4n6dwxxxdbv1xyqjn5v9ql8whya6rq4s2j"; depends=[Biostrings IRanges seqLogo BSgenome XVector IRanges seqLogo XVector]; };
+motifStack = derive { name="motifStack"; version="1.10.2"; sha256="1ypy92cbdw4iksf0ivxqk7jnz91cmm3n48qsh8b9gbc72wrdw45r"; depends=[MotIV]; };
+msmsEDA = derive { name="msmsEDA"; version="1.4.0"; sha256="1s4gahc6n973d76vdz9hk5wiqs6d28xfm1jzvh0pw40igx475l2b"; depends=[MSnbase]; };
+msmsTests = derive { name="msmsTests"; version="1.4.0"; sha256="19dfzvq1kdiwchijs9z367cggrvgh6f45kdn4585qn65pyii0fva"; depends=[MSnbase msmsEDA edgeR qvalue]; };
+multiscan = derive { name="multiscan"; version="1.26.0"; sha256="027ccaqmf84bkbjy9j5jq91pjx3b3cycn6fbyjc2w0f7prcx394q"; depends=[Biobase]; };
+multtest = derive { name="multtest"; version="2.22.0"; sha256="1kcz6h91qz0n0vi7dphw6rdzy1i1c0xd41q4bgqhmg0mi44m0k78"; depends=[Biobase]; };
+mvGST = derive { name="mvGST"; version="1.0.0"; sha256="0p6msfkj5qa29b0g3p87wcryn0gq9vfhcc3y8rx2j1f01qb1raif"; depends=[Rgraphviz topGO GOstats annotate AnnotationDbi graph]; };
+mygene = derive { name="mygene"; version="1.0.1"; sha256="1i085n7af6lx8ymrglzfv5bwnsz4rvyk47hws9xhhriydrniwiq3"; depends=[GenomicFeatures S4Vectors]; };
+mzID = derive { name="mzID"; version="1.4.1"; sha256="1ijyr2s4g1hvrs719sj3ylckdgaar8v5aal62kajmc8zjwhc6pd0"; depends=[]; };
+mzR = derive { name="mzR"; version="2.0.0"; sha256="0djvbgsz9y0qy91c6r8hlkdy0a95nmncakapn0s04lzqhjj2azkq"; depends=[Biobase]; };
+ncdfFlow = derive { name="ncdfFlow"; version="2.12.0"; sha256="0r4q4ydaqlrsan8a3k60bjrzqvm37s308k3fz9lvqvdk3c5hichz"; depends=[flowCore flowViz Biobase flowCore flowViz zlibbioc]; };
+neaGUI = derive { name="neaGUI"; version="1.4.0"; sha256="0l0v5jb4m7hxmdmkhm52gbw8c0vsgi4y3mkd0ygja9kp7half10h"; depends=[]; };
+nem = derive { name="nem"; version="2.40.0"; sha256="19mmvbg52vk6i5wy0kqpm460w7q9fsp1gwyjmqfhwd5jicxpp14k"; depends=[graph limma Rgraphviz graph RBGL Rgraphviz]; };
+netbiov = derive { name="netbiov"; version="1.0.0"; sha256="1zging9jh417z8fyv7z3bdbf44agnx5lqih0sizyvv6wccz0jm30"; depends=[]; };
+netresponse = derive { name="netresponse"; version="1.16.0"; sha256="1ngj2v85rfm1hbd5xsvl05z28xjdf5j4pd2fm4p0ch6i8ar3wzzd"; depends=[graph minet qvalue Rgraphviz]; };
+networkBMA = derive { name="networkBMA"; version="1.8.0"; sha256="00k3z1fsm32i6kgzxg6cydylxg849gxdrs8zy6923y26742ysi8s"; depends=[]; };
+nnNorm = derive { name="nnNorm"; version="2.30.0"; sha256="13wxpgkd90giqx3hlsl8hsk2vd2n3w1522sks82rz7663ixbfill"; depends=[marray marray]; };
+nondetects = derive { name="nondetects"; version="1.2.0"; sha256="1jhdqvjzw8hsr6ql82hv443qh36mnwkmwgygirlgn48rs0j289y0"; depends=[Biobase HTqPCR]; };
+npGSEA = derive { name="npGSEA"; version="1.2.0"; sha256="19kk2c81cwfcv0z0qd5jm0k0kr1q7nxj1givk26m32mrqh7rm4zk"; depends=[GSEABase Biobase BiocGenerics]; };
+nucleR = derive { name="nucleR"; version="1.14.0"; sha256="1wjffdi4vx00rsxs8dzcamz5n9ramgcl8j228rwq1ag1vp836jg6"; depends=[BiocGenerics IRanges Biobase ShortRead BiocGenerics S4Vectors IRanges Biobase ShortRead GenomicRanges]; };
+nudge = derive { name="nudge"; version="1.32.0"; sha256="1h0zjy1x4papcwwwwymkpaig6wkh5wp7asw4qpgw9g9xajdg4gcq"; depends=[]; };
+occugene = derive { name="occugene"; version="1.26.0"; sha256="122if8jvyiw7384s4g3z95b2bs4sijjhq0yzk8b62i7j9dv8m11b"; depends=[]; };
+oligo = derive { name="oligo"; version="1.30.0"; sha256="0djadgk5la3wdd2scvk6v45y3a25ffwq220n3kjivcgnj529f83a"; depends=[BiocGenerics oligoClasses Biobase Biostrings affyio affxparser BiocGenerics preprocessCore zlibbioc preprocessCore]; };
+oligoClasses = derive { name="oligoClasses"; version="1.28.0"; sha256="0dgplhks2miidfiviz122rw7chxcm14hpizbhcf6l9r1r7wrd69r"; depends=[BiocGenerics Biobase IRanges GenomicRanges Biostrings affyio BiocInstaller S4Vectors]; };
+omicade4 = derive { name="omicade4"; version="1.6.2"; sha256="1zmzl78sr9hj04azyrncfh1rsf5lb5v0wfkls35qmcxb18sp4178"; depends=[made4]; };
+oneChannelGUI = derive { name="oneChannelGUI"; version="1.32.0"; sha256="002jj674jqjqpqg7q4dqfwv0lmbp1bgkvljjp78jgy5rhjvpy10c"; depends=[Biobase affylmGUI tkWidgets IRanges Rsamtools Biostrings siggenes chimera]; };
+ontoCAT = derive { name="ontoCAT"; version="1.18.0"; sha256="0xq2vd3lkavnwj9da1hkamhyvxr46ysl2mh9xa6j2c13a6yq3p4c"; depends=[]; };
+openCyto = derive { name="openCyto"; version="1.4.0"; sha256="0nzfb2xhypl8kscsaznx8i3gf1fyd71p6x84zfvqx98wi5vpsswj"; depends=[flowWorkspace Biobase flowCore flowViz ncdfFlow flowStats flowClust RBGL graph]; };
+oposSOM = derive { name="oposSOM"; version="1.1.1"; sha256="0q9j67gpik4i8n485cbn96wi4svbcl3v69fvqgvrv4byjwzn02pp"; depends=[biomaRt Biobase]; };
+pRoloc = derive { name="pRoloc"; version="1.6.2"; sha256="1r80fyfhpjq36gf8cwwrh8zikp9yvdfnpwwq6yf5155k4090269h"; depends=[MSnbase MLInterfaces BiocParallel BiocGenerics]; };
+pRolocGUI = derive { name="pRolocGUI"; version="1.0.2"; sha256="1q5nzi89408vsls1k59j8i9dfkx9dfmi7k01dm1c17qvi977a1mb"; depends=[pRoloc MSnbase]; };
+paircompviz = derive { name="paircompviz"; version="1.4.0"; sha256="0l9jifzazrl3wchrgn6q4cj088gjghabrzh0118g73hm5y2rjq51"; depends=[Rgraphviz Rgraphviz]; };
+panp = derive { name="panp"; version="1.36.0"; sha256="0yyghljg81s5f9fwj24hlhgl7i4a15ia662cqhb6l6im8ghssxrl"; depends=[affy Biobase Biobase]; };
+parody = derive { name="parody"; version="1.24.0"; sha256="1y36abd3l8xaqd7aaf1sfi1ylqqvyns6in8i7j2kswgjjv89k4wr"; depends=[]; };
+pathRender = derive { name="pathRender"; version="1.34.0"; sha256="0giwl6inrs0krk7qnri23g8xyf06x8knqh83p4cpzagg8rfbkpzc"; depends=[graph Rgraphviz AnnotationDbi]; };
+pathifier = derive { name="pathifier"; version="1.4.0"; sha256="1xm9rjpk1ngapl2kni5bn5z4fg19rnbi41dvv784flmzy87iwhjl"; depends=[]; };
+pathview = derive { name="pathview"; version="1.6.0"; sha256="1bfr20rad6qrvaid8y0n167x7d6ixi1k3dclq919473v7pzzqq65"; depends=[KEGGgraph Rgraphviz graph AnnotationDbi KEGGREST]; };
+paxtoolsr = derive { name="paxtoolsr"; version="1.2.11"; sha256="1b8197cd0c5i0r9d85v2x0mw8yz3l74skg9jj0lh1h56hwpxfnb1"; depends=[]; };
+pcaGoPromoter = derive { name="pcaGoPromoter"; version="1.10.0"; sha256="03h1fpj7iaaz6b9y7zwpn9nhgyhg8r39iw0vnhmmlsyg5g4zrlza"; depends=[Biobase AnnotationDbi]; };
+pcaMethods = derive { name="pcaMethods"; version="1.56.0"; sha256="112wm1qr1bczn18k854ja8029rz4sxnxgvlksjjpxswxliwfldkn"; depends=[Biobase BiocGenerics]; };
+pcot2 = derive { name="pcot2"; version="1.34.0"; sha256="0v6350d9inmfvbiyagqb2wpp6pfirnwrm9hq53g0yg9igyd4q4nl"; depends=[Biobase]; };
+pdInfoBuilder = derive { name="pdInfoBuilder"; version="1.30.6"; sha256="0ydzwbkjzmm5dh70vwbdiw2kmd4cmnvfwpqa65fmblbpdg73618w"; depends=[Biobase affxparser oligo Biostrings BiocGenerics IRanges oligoClasses S4Vectors]; };
+pdmclass = derive { name="pdmclass"; version="1.38.0"; sha256="0lk7y8i24mbajp4lln07q61pnbmsn6mpajb09zfvrf7qgklm64hz"; depends=[Biobase]; };
+pepStat = derive { name="pepStat"; version="1.0.0"; sha256="1r3hvhxwd85mkjw4f2hwygvffppsbay3ghj7rmy9jkaayfz2px49"; depends=[Biobase IRanges limma GenomicRanges]; };
+pepXMLTab = derive { name="pepXMLTab"; version="1.0.0"; sha256="0pxy5hhg3vb2zph484c8hm7066dnfp7303n7zbaviszykcxmw9h6"; depends=[]; };
+phenoDist = derive { name="phenoDist"; version="1.14.0"; sha256="0vr2mv4swk102kl7vq3mj6xxl1z0v45shd0wrhs9zg1pklbd851j"; depends=[imageHTS]; };
+phenoTest = derive { name="phenoTest"; version="1.14.0"; sha256="19qgcpd28frnhcx10lsrxg885b6f9l6qfwlyzkp3x875p62xy942"; depends=[Biobase annotate Heatplus limma Category AnnotationDbi hopach biomaRt GSEABase genefilter annotate SNPchip HTSanalyzeR]; };
+phyloseq = derive { name="phyloseq"; version="1.10.0"; sha256="1whwm1wm9fhxsz54vqf2r32bmgg3c9smvrpnzmvz9gigygvv5cyl"; depends=[Biostrings DESeq2 multtest]; };
+piano = derive { name="piano"; version="1.6.2"; sha256="00qbcgzafila8idbfxvdnssx5161rn1xhnh3w1fp8sqlw5d1v6xz"; depends=[Biobase marray]; };
+pickgene = derive { name="pickgene"; version="1.38.0"; sha256="1pzr3l2h9rfywl7a20ppyaggzrvlr0as3bl4ys451khwnm1abwcf"; depends=[]; };
+pint = derive { name="pint"; version="1.16.0"; sha256="1vlrblp4i4qd0lpbphz0l6hpsyl88pc1qrr6kk8v62bw0a0bsdf9"; depends=[]; };
+pkgDepTools = derive { name="pkgDepTools"; version="1.32.0"; sha256="1fh52j5lrvbvm05bv67swdxckjys74v5ikqjv9ln2a30pxp0vs6a"; depends=[graph RBGL graph RBGL]; };
+plateCore = derive { name="plateCore"; version="1.24.0"; sha256="0gqv0wqd93q4c2sgjic109i9a59z63hbqilc4a7c80krsada80sc"; depends=[flowCore flowViz Biobase flowCore flowStats]; };
+plethy = derive { name="plethy"; version="1.4.3"; sha256="16xff9y274lf0hpjzfqxl94xbl5prk7gbjh23ysb0jl8hszjc9i8"; depends=[BiocGenerics S4Vectors Streamer IRanges]; };
+plgem = derive { name="plgem"; version="1.38.0"; sha256="1wsianyvwhiwpm3ip2la3a78jj9cvj07l9nipmjk84nlk5wpvw9k"; depends=[Biobase]; };
+plier = derive { name="plier"; version="1.36.0"; sha256="0qr4v2lazvl3bnqdjd1jnbfh4z9jbkqr2bbs4wc1r7rps4gxib3y"; depends=[affy Biobase]; };
+plrs = derive { name="plrs"; version="1.6.0"; sha256="03pwcv8vx1rdx85z3a60p7g53lmg1qdwmbkmnsx6fjc0hnvxvx6w"; depends=[Biobase BiocGenerics CGHbase marray]; };
+plw = derive { name="plw"; version="1.26.0"; sha256="0mb35ql57gl0nhdcwbcj2fwbanm8gv0rpgjbcc1mrw82d7ffj94i"; depends=[affy affy]; };
+polyester = derive { name="polyester"; version="1.0.2"; sha256="0mv25jgdfw74f1y68zz292qx27ar6w2413nml4nipfpv6krh37vm"; depends=[Biostrings IRanges S4Vectors]; };
+ppiStats = derive { name="ppiStats"; version="1.32.0"; sha256="1hjzcc9g9bszn9h24wr7v3vj8ili0z1dpgbk8pkf209iyjv7l9mz"; depends=[ScISI Biobase Category graph]; };
+prada = derive { name="prada"; version="1.42.0"; sha256="1yw2lzs7bdi7fb5hfy6jq3br1hzc9by4vv16vrnhm7v41nsi7y1a"; depends=[Biobase Biobase BiocGenerics]; };
+prebs = derive { name="prebs"; version="1.6.0"; sha256="12fyiz7mmxvmwwxkf2l0yypmsm8wlyvdpbxlcs0ip82mcya4kfgs"; depends=[GenomicAlignments affy GenomicRanges IRanges]; };
+predictionet = derive { name="predictionet"; version="1.12.0"; sha256="1smz1zcaivd28y59qxp34r9b04jxar3ldsvx4kbfn70axwvwhcsq"; depends=[RBGL]; };
+preprocessCore = derive { name="preprocessCore"; version="1.28.0"; sha256="0bbsnid3bdbpaxdww1zxp34sj95fhkgxlsjggpw46kdzryf01j84"; depends=[]; };
+proBAMr = derive { name="proBAMr"; version="1.0.1"; sha256="11fgl1w0nhfdnk3fm2x5d1749w82i1jj76nazsifsd087wf0hl3l"; depends=[IRanges AnnotationDbi GenomicRanges Biostrings GenomicFeatures rtracklayer]; };
+procoil = derive { name="procoil"; version="1.16.0"; sha256="18bifg3sf0jwm2c4gzc632qnl8b27qn48jpw5cx5gk1cwqmwjh6z"; depends=[]; };
+prot2D = derive { name="prot2D"; version="1.4.0"; sha256="0plsndlbrq8pyx0b4r3xn7qakk78kdlhx776jmd2sx5x2bqc53z4"; depends=[Biobase limma Mulcom impute qvalue]; };
+proteinProfiles = derive { name="proteinProfiles"; version="1.6.0"; sha256="1cvwqgxgn87bj2shag7sqz9xkp83qzqvx2x34jacndg3ypjakhwx"; depends=[]; };
+proteoQC = derive { name="proteoQC"; version="1.2.0"; sha256="05chpx2brp7snfgzc6xqp88mla463389cs0mdgb8159v86qy76dw"; depends=[MSnbase rTANDEM]; };
+puma = derive { name="puma"; version="3.8.0"; sha256="00q69f16mp40h623lgxqxj9xgfcfkz6551dgmiv0mckcparyl2xa"; depends=[Biobase affy oligo Biobase affy affyio]; };
+pvac = derive { name="pvac"; version="1.14.0"; sha256="05jmvv4c71gsavsdnkzskldhlg9yprgvfavah3ik9mvsldk6cqqy"; depends=[affy Biobase]; };
+pvca = derive { name="pvca"; version="1.6.0"; sha256="1kbb5vwff8wxq5j3cikgpibi2n2d9v97z7gm28yzc63ymyvl9ngn"; depends=[Biobase vsn]; };
+qcmetrics = derive { name="qcmetrics"; version="1.4.1"; sha256="1r5qs19fgwryjqyf9wsdn0lkyb2hisn3akp87qhc9rs8rf9w469w"; depends=[Biobase S4Vectors]; };
+qpcrNorm = derive { name="qpcrNorm"; version="1.24.0"; sha256="1db7w2w0ss1xx990h5xp6354xfyjdb5r5898zz2i2sgn0l2k5fpc"; depends=[Biobase limma affy]; };
+qpgraph = derive { name="qpgraph"; version="2.0.5"; sha256="188v0bpgd5a7c0gby8vzljfagl8k3gynyv7c9a96miyyl0qlxn0s"; depends=[annotate graph Biobase S4Vectors BiocParallel AnnotationDbi IRanges GenomeInfoDb GenomicRanges GenomicFeatures Rgraphviz]; };
+qrqc = derive { name="qrqc"; version="1.20.0"; sha256="1phmcd4a097h9jj8c8cqwvvgg10cc5cvn7b1ghylh1ddp5npxz4c"; depends=[Biostrings biovizBase Rsamtools Biostrings biovizBase Rsamtools]; };
+quantro = derive { name="quantro"; version="1.0.0"; sha256="0cqs7vigv7yfamwq8jjs61xxlq8c3kl3gc5sd4y8382j1rdcipjk"; depends=[Biobase minfi]; };
+quantsmooth = derive { name="quantsmooth"; version="1.32.0"; sha256="1q66x7kw2pmm81xifb49agl4akgprfjwlhsa692bwprvi9vq6z73"; depends=[]; };
+qusage = derive { name="qusage"; version="1.6.0"; sha256="16c5rrvqz784m49556h9six1p7r7mxfjwmms6lz416r9cvjg9khh"; depends=[limma Biobase]; };
+qvalue = derive { name="qvalue"; version="1.43.0"; sha256="169cfpwgq4lpapipwrc6yczfxgc9wczq47xf2vzl7wdp8arrblqz"; depends=[]; };
+r3Cseq = derive { name="r3Cseq"; version="1.12.1"; sha256="0df52ccial9axnpmawap3pfvmjdgnl8pfvcgjwyvddrg2xbi8n32"; depends=[Rsamtools rtracklayer qvalue]; };
+rBiopaxParser = derive { name="rBiopaxParser"; version="2.4.0"; sha256="0jcwf7a24w5ccm93fwqcvlbp54k18v68dnalqbr5dqb9jl6ncfzy"; depends=[]; };
+rGADEM = derive { name="rGADEM"; version="2.14.0"; sha256="0303nl790qvay6qdh45acc3yvw8hxw2gy7lsxmnl5gn3sk23cbnh"; depends=[Biostrings IRanges BSgenome seqLogo Biostrings IRanges seqLogo]; };
+rHVDM = derive { name="rHVDM"; version="1.32.0"; sha256="151pcx2dnfplkpdhxmvfd8dl0dkaggy96fi5h1zkgbzjggn6ig07"; depends=[affy Biobase]; };
+rMAT = derive { name="rMAT"; version="3.16.0"; sha256="0vad1qhslvqcvva78i7isxmd9llcwn06vjhvayk2a6f38hfd4m69"; depends=[BiocGenerics IRanges Biobase affxparser BiocGenerics IRanges Biobase affxparser]; };
+rRDP = derive { name="rRDP"; version="1.0.0"; sha256="06rd9dmsrpp1k70iap9y6vfxgrg77mdd5g67q4qspmfm3srrig8y"; depends=[Biostrings]; };
+rSFFreader = derive { name="rSFFreader"; version="0.14.0"; sha256="10bnliqpmch3fgnmi0cnq4xkh66r1r5k72asnlmmh9jcfi5ziaqy"; depends=[ShortRead Biostrings IRanges S4Vectors IRanges XVector Biostrings]; };
+rTANDEM = derive { name="rTANDEM"; version="1.6.1"; sha256="17gv6rbhbmn0v1bsqn5cd78wd6g415dcr72pg0h2r6cxyc611qjv"; depends=[]; };
+rTRM = derive { name="rTRM"; version="1.4.0"; sha256="06kfxb4rmq38xpmd53bnbgfg5w275ik88x1my829lk441prj2vi6"; depends=[AnnotationDbi]; };
+rTRMui = derive { name="rTRMui"; version="1.4.0"; sha256="1pd4fjzi4qlghy7si8g63dm4rrk1nzvpxr4yf5fzd0k48fyhmz0r"; depends=[rTRM MotifDb]; };
+rain = derive { name="rain"; version="1.0.1"; sha256="01dlpz9cdwxkgfdmshyh9hy4clsx0yk12nlndgz06gjr07l7ip2q"; depends=[multtest]; };
+rama = derive { name="rama"; version="1.40.0"; sha256="1bmx8f0nvqfnl756mzf6m0d392hlvz6swlvs2m07abj0ka32z6jb"; depends=[]; };
+randPack = derive { name="randPack"; version="1.12.0"; sha256="16ykrzdhhns5nww7jqh4vax6v96wkhsj3capxbq510ljb97zpayy"; depends=[Biobase]; };
+rbsurv = derive { name="rbsurv"; version="2.24.0"; sha256="0cnhdfpwgxx3fbj8zvhrzlkv0qhgs3v05ql7x91ningg554isvz8"; depends=[Biobase]; };
+reb = derive { name="reb"; version="1.44.0"; sha256="10lalx5fdrgfi4z557ciq445bdnp31ihdcphniw58v0cm1nirl0i"; depends=[Biobase idiogram]; };
+regionReport = derive { name="regionReport"; version="1.0.5"; sha256="16k82hlyspcldhdl6kwixjdwd3drchdwmc9bb7s8yd8ijhqh8xdm"; depends=[derfinder derfinderPlot GenomeInfoDb GenomicRanges ggbio IRanges]; };
+rfPred = derive { name="rfPred"; version="1.4.0"; sha256="0r55i8sdy0zjv1lf8wyafysgvh8krsghhbc1h2nblfab8875v4z7"; depends=[Rsamtools GenomicRanges IRanges]; };
+rhdf5 = derive { name="rhdf5"; version="2.10.0"; sha256="1lb0wni0l2k18p6n88chdgm132xv4ff0p5ah95z08k3vajgm4afp"; depends=[zlibbioc]; };
+riboSeqR = derive { name="riboSeqR"; version="1.0.5"; sha256="19i703ykbm0f9rfc08nrzf6b9d3nin4illf35kljf0nlmmpj68f7"; depends=[GenomicRanges]; };
+rnaSeqMap = derive { name="rnaSeqMap"; version="2.24.0"; sha256="06q1a6zyxzarimwyiq4bszs5s0s921i0d3d59hifgkvarlqf0ki9"; depends=[Biobase Rsamtools GenomicAlignments GenomicRanges IRanges edgeR DESeq]; };
+roar = derive { name="roar"; version="1.2.0"; sha256="0xq8pjjzvcwl1wh91kla7rws1bx7gc1v246al4piymmjisivz3wq"; depends=[GenomicRanges GenomicAlignments rtracklayer S4Vectors]; };
+rols = derive { name="rols"; version="1.8.0"; sha256="10p8lcifff39cmnx34hmhfs11yi4jd8xp0h0blhwhv4dmnp5bn9j"; depends=[Biobase]; };
+rpx = derive { name="rpx"; version="1.2.0"; sha256="1cq569spv8k54xpl6kh2lw8xvs4kj25vgq8nvj9akisipbnf1n8f"; depends=[]; };
+rqubic = derive { name="rqubic"; version="1.12.0"; sha256="0l90rzajw966k96c5azzi4p5b0dnc5ydjf2bvfjbnfs21kgcqkqg"; depends=[Biobase]; };
+rsbml = derive { name="rsbml"; version="2.24.1"; sha256="1xq64md8i1yjbngpds96b73ywa1qsfraiw21dckl731hqggw6q6a"; depends=[BiocGenerics BiocGenerics graph]; };
+rtracklayer = derive { name="rtracklayer"; version="1.26.3"; sha256="1731z3hnhn6kqyijw2haq7jqh0izpvqxywrnk1mfmn7wx9sp6nbj"; depends=[GenomicRanges BiocGenerics S4Vectors IRanges XVector GenomeInfoDb Biostrings zlibbioc Rsamtools GenomicAlignments S4Vectors IRanges XVector]; };
+sRAP = derive { name="sRAP"; version="1.6.0"; sha256="0js1b4mad83635n08g2bz259knknffa4zqqh4an697fz0q4gkf55"; depends=[qvalue]; };
+sSeq = derive { name="sSeq"; version="1.4.0"; sha256="1c6an23l69210zqb76b4n66pn7iin4im9g8wm750k567w92xs3ry"; depends=[]; };
+safe = derive { name="safe"; version="3.6.1"; sha256="18s8p3cjyxka3xkwmmzbp8pnqn3rvd85zan46f41j8awgaxw8db2"; depends=[AnnotationDbi Biobase]; };
+sagenhaft = derive { name="sagenhaft"; version="1.36.0"; sha256="19s55x4d5s0imkkyg9ihrc7l4q1w4xm8n4pg7l18zx4xb316fv88"; depends=[]; };
+sangerseqR = derive { name="sangerseqR"; version="1.3.4"; sha256="0as1ynn1lvffiaflfiijjglyjx9ms812vyb6qlhdcp4cz2lzjyzk"; depends=[Biostrings]; };
+sapFinder = derive { name="sapFinder"; version="1.4.0"; sha256="1h4b44hz8016ggvqxcjzkxk84xgk1d1vxa9y3nxxwr4cz6f6i7k2"; depends=[rTANDEM]; };
+savR = derive { name="savR"; version="1.4.0"; sha256="1baj5bnx32wwq3y3xwgqvp57629a3jfvjvzhnyn6f9qac68d4c67"; depends=[]; };
+scsR = derive { name="scsR"; version="1.3.2"; sha256="17xmcbsch7p45a3ir11n6izw92jipbflp0778bvqrhwjaahi41kx"; depends=[STRINGdb BiocGenerics Biostrings IRanges]; };
+segmentSeq = derive { name="segmentSeq"; version="2.0.1"; sha256="0kxmnsfdpmsaxdhdvskh8g87ldvnkdm09lhbpq0irbi7k9nq94g3"; depends=[baySeq ShortRead GenomicRanges IRanges S4Vectors]; };
+seqCNA = derive { name="seqCNA"; version="1.10.0"; sha256="01aa533a6qsjsw5yr47c2k2dmxpgzgxixn99dmbc336kwrq6vhgf"; depends=[GLAD]; };
+seqLogo = derive { name="seqLogo"; version="1.32.1"; sha256="1bnhfmwbzprpyz6p7rwsk1idcjg0plhxwfs9v4k8wsx83mcdyral"; depends=[]; };
+seqTools = derive { name="seqTools"; version="1.0.0"; sha256="1q41w150w4j73ihsy6pibn1dd48jfs7fhgymq9rd0510mrlp770i"; depends=[zlibbioc zlibbioc]; };
+seqbias = derive { name="seqbias"; version="1.14.0"; sha256="0q5zxf4ds4adnp1cxlldyfli844lf1zd1sz9rn7gv34hmfyw1jdc"; depends=[GenomicRanges Biostrings zlibbioc Rsamtools]; };
+seqplots = derive { name="seqplots"; version="1.2.0"; sha256="17rrfiphrdsajr5mbigcbv4wgd8x72wb37my1wzdw54nhg8l69w6"; depends=[IRanges BSgenome rtracklayer GenomicRanges Biostrings GenomeInfoDb S4Vectors]; };
+shinyMethyl = derive { name="shinyMethyl"; version="1.0.2"; sha256="0n73qi3vvlqyg87ww3azwakvz6z6saz59rknv8267p48dzasnivc"; depends=[BiocGenerics minfi]; };
+shinyTANDEM = derive { name="shinyTANDEM"; version="1.4.0"; sha256="1vb3s7qvrh0b42dnbdyyrxx89rq0f1m5dygcygsl1mgc587spgm7"; depends=[rTANDEM]; };
+sigPathway = derive { name="sigPathway"; version="1.34.0"; sha256="05l87qm8myfnqj3pndnazsfjy7c7ib5mphr31xiyrz8ipl2y7462"; depends=[]; };
+sigaR = derive { name="sigaR"; version="1.10.0"; sha256="0z7pnrizmindckl1vafg1dpp7xwp7pvx6hr8d5diwyaw0mfj430f"; depends=[Biobase CGHbase marray]; };
+siggenes = derive { name="siggenes"; version="1.40.0"; sha256="1w1c187dqdhk3wqh8bgslw85zwr6pzfkq0dlgs9d58fsrky0wsay"; depends=[Biobase multtest]; };
+simpleaffy = derive { name="simpleaffy"; version="2.42.0"; sha256="0wz3kzn5fy4bkpzq9njs2lz6a29mcz91a5gvfrf06wq5gsn6l3rz"; depends=[BiocGenerics Biobase affy genefilter gcrma BiocGenerics Biobase affy genefilter gcrma]; };
+simulatorZ = derive { name="simulatorZ"; version="1.0.0"; sha256="1sabjya98prprq10gbra4c3maclw1y38r4826b9vzxp41ragm1sf"; depends=[Biobase GenomicRanges]; };
+sizepower = derive { name="sizepower"; version="1.36.0"; sha256="0lgb7gsqa8cq5mjkp7hxidkvhms7nj8cyxhxcb2716d6ivllkvff"; depends=[]; };
+snapCGH = derive { name="snapCGH"; version="1.36.0"; sha256="17c5gybk7mpl4w9aja01hxirjs6rygqpinsqlfmsnjk9pknqw43d"; depends=[limma DNAcopy aCGH DNAcopy GLAD limma tilingArray]; };
+snm = derive { name="snm"; version="1.14.0"; sha256="1d979rbxpypbc2s192p5f6ynps2pbap3ym4gig14fjrd61gzcmrb"; depends=[]; };
+snpStats = derive { name="snpStats"; version="1.16.0"; sha256="1560mxm9ni4wlssw2kdd86nflb45rcjv8060zqiainy1jd92ys0x"; depends=[BiocGenerics zlibbioc]; };
+spade = derive { name="spade"; version="1.14.0"; sha256="0fhhmx80zjixd1wp55aphkb9pfvgm03pd2kg4yxim1iic7n09xm3"; depends=[Biobase flowCore]; };
+specL = derive { name="specL"; version="1.0.0"; sha256="03igq0cb134kfr36g3gsvzj8n4hz5zwmg2j0pd4zhr500d9sxfs7"; depends=[]; };
+spikeLI = derive { name="spikeLI"; version="2.26.0"; sha256="1hdrrlkiiqkaypp425cgggjcwb3gdsd0v0frqqx3bb845r91x42x"; depends=[]; };
+spkTools = derive { name="spkTools"; version="1.22.0"; sha256="0dw27jfmdjn75ga086a19inl6xc02jpwk9vjc3yvayp67i8nh1mb"; depends=[Biobase Biobase]; };
+spliceR = derive { name="spliceR"; version="1.8.0"; sha256="1v6451mry0sjj1bi3s2da6dymq1650pk1g7h09ckdvsvhnyrfmxq"; depends=[cummeRbund rtracklayer GenomicRanges IRanges]; };
+spliceSites = derive { name="spliceSites"; version="1.4.0"; sha256="1y93fzsmw15gqn1l9i4qkds4xfvlsv9ynlwkxwfdrd5vy6sclahr"; depends=[Biobase Biostrings seqLogo BiocGenerics]; };
+splicegear = derive { name="splicegear"; version="1.38.0"; sha256="1sxvd2qvvbhcrsmij8jz9r9l6zk2a8idmhrrf1hkmkx8a9xkdq9r"; depends=[Biobase annotate Biobase]; };
+splots = derive { name="splots"; version="1.32.0"; sha256="1bz76nvplm862072m4dd6bm7qb93fld7lwsx18jah7xkjrr3alp6"; depends=[]; };
+spotSegmentation = derive { name="spotSegmentation"; version="1.40.0"; sha256="02k3d3kz8rssn6c8y5ywwsynh3zjnkxwy7w4d16zx4haivrpziyn"; depends=[]; };
+sscore = derive { name="sscore"; version="1.38.0"; sha256="0bxclcx3xbsqs1i2w80rh8amzsxzv5mavbpy81pgrqsnqhldriyd"; depends=[affy affyio]; };
+ssize = derive { name="ssize"; version="1.40.0"; sha256="1fb3c28v7p3fgpciv9b7v7clyiyyaiaz6r4hjkvdcf236xs1kjwm"; depends=[]; };
+ssviz = derive { name="ssviz"; version="1.0.0"; sha256="0y0nvlvwfhf1nhghxaigskh4rsjjfy59lnbr2s8jqswzk39n6843"; depends=[Rsamtools Biostrings]; };
+staRank = derive { name="staRank"; version="1.8.0"; sha256="0yzcz2vpx7gxswy6rxdp59qfsa2jiy35kya2i2n3yrpnhb0s7wbm"; depends=[cellHTS2]; };
+stepNorm = derive { name="stepNorm"; version="1.38.0"; sha256="0267smjz132lj2ka0ccvgdn12r416hc9wqlbdzix59i80py45hwh"; depends=[marray marray]; };
+stepwiseCM = derive { name="stepwiseCM"; version="1.12.0"; sha256="1p5yhz2s4ad30p47bx0vmvfdm8y7adcvdi5ydqg3g0zdh2akvg21"; depends=[tspair Biobase]; };
+supraHex = derive { name="supraHex"; version="1.4.0"; sha256="1qq2cbq04623qp1yb22dkiz5d7gz7fspia4601jhair1c129vm4g"; depends=[]; };
+survcomp = derive { name="survcomp"; version="1.16.0"; sha256="1z03krc9lznry1izaxb91jbw3zghajxfiigfkgdj0n2a5rd3yhwk"; depends=[]; };
+sva = derive { name="sva"; version="3.12.0"; sha256="1x2lh2fl53zv1r97p4gq8jvip99wq2j1wpps7j2qlfh9fclwbbsk"; depends=[genefilter]; };
+switchBox = derive { name="switchBox"; version="1.0.0"; sha256="1m5icry27l4hh2h3f7kfph0qc332n2l0miazhaqfazilyw3pvyai"; depends=[]; };
+synapter = derive { name="synapter"; version="1.8.4"; sha256="1j4dm2d43ji2xrj9835724qn7ji7vsi5rsvmc0m0za81lz2zvak3"; depends=[MSnbase qvalue multtest Biobase Biostrings cleaver BiocParallel]; };
+systemPipeR = derive { name="systemPipeR"; version="1.0.12"; sha256="0d0kpgkn2nlh54v5rdiacjykh6vxyf20yw18dji0q1l8ggklmz04"; depends=[Rsamtools Biostrings ShortRead BiocGenerics limma edgeR DESeq2 GOstats annotate]; };
+tRanslatome = derive { name="tRanslatome"; version="1.4.0"; sha256="173vb64bd3qxy4hikn7d31nvlpzvpby12akgc5pqbg5hcgm8rqkm"; depends=[limma sigPathway anota DESeq edgeR RankProd topGO GOSemSim Heatplus]; };
+ternarynet = derive { name="ternarynet"; version="1.10.0"; sha256="1n6dh3y2bpvcccbpglw788i236bh36n9npk6rc1j4n7pi0wimzcl"; depends=[]; };
+tigre = derive { name="tigre"; version="1.20.0"; sha256="09298m4wg2f1ra45rhv8srsbzqz8cczy50aw2iiavzdrzibns31r"; depends=[BiocGenerics Biobase AnnotationDbi annotate]; };
+tilingArray = derive { name="tilingArray"; version="1.44.0"; sha256="15bgljy9xd2sljklvmha361himkzaxkrjis9wcz9z6wjzfr14h1r"; depends=[Biobase affy vsn genefilter]; };
+timecourse = derive { name="timecourse"; version="1.38.0"; sha256="14w87dqivhfp3xyxhlxvnka7v1rhyxxmmdygkjydag3yh4z6zfi4"; depends=[Biobase limma marray]; };
+tkWidgets = derive { name="tkWidgets"; version="1.44.0"; sha256="0s23ajd61jbklkhp1cr7nq4ssw8nkvr77r4viv4z3gnkndrflnl3"; depends=[widgetTools DynDoc]; };
+topGO = derive { name="topGO"; version="2.18.0"; sha256="1py4r0pq777r2xwvhyp80dyycfy072dsg1z0jd7vf7nn4x3xyjfl"; depends=[graph Biobase AnnotationDbi graph Biobase AnnotationDbi]; };
+trackViewer = derive { name="trackViewer"; version="1.2.0"; sha256="00fc063zh9wk6dfp2haxrgk79nxcczf25jkkr1s22lh2rnr6q3r3"; depends=[GenomicRanges GenomicAlignments GenomicFeatures Gviz Rsamtools rtracklayer]; };
+tracktables = derive { name="tracktables"; version="1.0.0"; sha256="116y9ghw40qvf10m6g8pbd29rr67jijk13a1k7a3w70jh96vin1q"; depends=[IRanges GenomicRanges XVector Rsamtools]; };
+triform = derive { name="triform"; version="1.8.0"; sha256="0f02a7jc3l2scs6pimc6kvv5f7f67gvxk7y55im7jzhzwb39bv42"; depends=[IRanges IRanges BiocGenerics]; };
+trigger = derive { name="trigger"; version="1.12.0"; sha256="0y8vzwh6a2ijf8g60sdnkhzq8pj0n9kxy60zb491n5pv9n84j5ws"; depends=[qvalue sva]; };
+trio = derive { name="trio"; version="3.4.0"; sha256="0nc35ijljibzlxbfdps5z0snrgjwsx6hnwkg85m03mkmhgv6q513"; depends=[]; };
+triplex = derive { name="triplex"; version="1.6.0"; sha256="1r4z9fb5xfmgvs22pc2ma0r9sxhknqa096wk9ff728jrmfdfnrzl"; depends=[S4Vectors IRanges XVector Biostrings GenomicRanges S4Vectors IRanges XVector Biostrings]; };
+tspair = derive { name="tspair"; version="1.24.0"; sha256="1y48148ym5h493rvjvnf3kgw1gdi29m2l938lmig28c6xad3wjzi"; depends=[Biobase]; };
+tweeDEseq = derive { name="tweeDEseq"; version="1.12.0"; sha256="1gymsalw3bh0j8mvnwvslim9nramdpcrm7xq2fyy6zmqnfmfkc6n"; depends=[limma edgeR cqn]; };
+twilight = derive { name="twilight"; version="1.42.0"; sha256="0zwsbaqpya7rw012915l6q87xnqrz0pg0iqmrax7qfrv2ryv6ac2"; depends=[Biobase Biobase]; };
+unifiedWMWqPCR = derive { name="unifiedWMWqPCR"; version="1.2.0"; sha256="04r07537pnnnrby2lnrm8qiihz2530h3ah9jbrw5knwc2jpi83qy"; depends=[BiocGenerics HTqPCR]; };
+vbmp = derive { name="vbmp"; version="1.34.0"; sha256="12x2kmjidpap9qbyppc8kka0z7ijsjhkipfs8kh91wfr6i4a89sm"; depends=[]; };
+viper = derive { name="viper"; version="1.2.0"; sha256="1nx10mg6flll5ypg8bzx23703w27vf01xry1vbw211g7hhkb10hd"; depends=[Biobase]; };
+vsn = derive { name="vsn"; version="3.34.0"; sha256="14kvfvpfc2dvkv4692vdkj39agd9l7fh77jynpi5c5c2wkgamm4w"; depends=[Biobase affy limma]; };
+vtpnet = derive { name="vtpnet"; version="0.6.0"; sha256="1bs3nj4zairvf1hhwvrmckzj8w8q942kfrhphwv7gcyhgza1l01x"; depends=[graph GenomicRanges gwascat]; };
+wateRmelon = derive { name="wateRmelon"; version="1.6.0"; sha256="0akw9a6d6y04icgcfwsd6f5icbiwckkgrj4d7j7wqs96yzyjm47i"; depends=[limma methylumi lumi ROC]; };
+wavClusteR = derive { name="wavClusteR"; version="2.0.0"; sha256="0xnnmj5hqnf7zl6qfs4fc2srp1liq8xhjxphkaiqyk10h2442nbb"; depends=[GenomicRanges Rsamtools Biostrings GenomicFeatures IRanges rtracklayer]; };
+waveTiling = derive { name="waveTiling"; version="1.8.1"; sha256="19rlyhzid11x8d56lj5c8w127ycs6maw4xs8qqia4dsc6jdii617"; depends=[oligo oligoClasses Biobase Biostrings GenomeGraphs affy preprocessCore GenomicRanges IRanges]; };
+weaver = derive { name="weaver"; version="1.32.0"; sha256="16bqpq2p013m14rjzqh4r57skfj5k93xvl0s7cp8wyq6zhisp1lv"; depends=[]; };
+webbioc = derive { name="webbioc"; version="1.38.0"; sha256="00rwccdbvv7vk8gspkqizjjshh9rccmxzzb95yhgg6qw2n10afgd"; depends=[Biobase affy multtest annaffy vsn gcrma qvalue multtest qvalue BiocInstaller]; };
+widgetTools = derive { name="widgetTools"; version="1.44.0"; sha256="0lzf99s9jzhl98i6lr45n76jkaycjxrb0nrwi8hcc7rq30x0adjd"; depends=[]; };
+xcms = derive { name="xcms"; version="1.42.0"; sha256="16icfyl3whvwgfzyz56wjl9ynrvd7bznghd6rczczkzcq2sgiqdf"; depends=[mzR BiocGenerics Biobase]; };
+xmapbridge = derive { name="xmapbridge"; version="1.24.0"; sha256="01xdx7pda642479xg2kzy2bbxqwmwg4zlhigqpmycv13pmrpqa8c"; depends=[]; };
+xps = derive { name="xps"; version="1.26.1"; sha256="1pqdkm8g9x74l0dfwyrcsqqmi0c8i9dkiq4sydg60zygdipmi65x"; depends=[]; };
+yaqcaffy = derive { name="yaqcaffy"; version="1.26.0"; sha256="0n3pjvmx833yby6ip3cww42lsk3c4hl1csvd72480l28cwr4n4zz"; depends=[simpleaffy]; };
+zlibbioc = derive { name="zlibbioc"; version="1.12.0"; sha256="05ps73iwf1s57nksla5mbbbf35447j131qnk27aw8hgkwbq3hrrs"; depends=[]; }; 
+}
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 1dc6019f42a..fb197545571 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -7,11 +7,11 @@ let
 
   buildRPackage = pkgs.callPackage ./generic-builder.nix { inherit R; };
 
-  # Package template
+  # Generates package templates given per-repository settings
   #
   # some packages, e.g. cncaGUI, require X running while installation,
   # so that we use xvfb-run if requireX is true.
-  derive = lib.makeOverridable ({
+  mkDerive = {mkHomepage, mkUrls}: lib.makeOverridable ({
         name, version, sha256,
         depends ? [],
         doCheck ? true,
@@ -21,21 +21,33 @@ let
       }: buildRPackage {
     name = "${name}-${version}";
     src = fetchurl {
-      urls = [
-        "mirror://cran/src/contrib/${name}_${version}.tar.gz"
-        "mirror://cran/src/contrib/00Archive/${name}/${name}_${version}.tar.gz"
-      ];
       inherit sha256;
+      urls = mkUrls { inherit name version; };
     };
     inherit doCheck requireX;
     propagatedBuildInputs = depends;
     nativeBuildInputs = depends;
-    meta.homepage = "http://cran.r-project.org/web/packages/${name}/";
+    meta.homepage = mkHomepage name;
     meta.platforms = R.meta.platforms;
     meta.hydraPlatforms = hydraPlatforms;
     meta.broken = broken;
   });
 
+  # Templates for generating Bioconductor and CRAN packages
+  # from the name, version, sha256, and optional per-package arguments above
+  #
+  deriveBioc = mkDerive {
+    mkHomepage = name: "http://cran.r-project.org/web/packages/${name}/";
+    mkUrls = {name, version}: [ "mirror://bioc/src/contrib/${name}_${version}.tar.gz" ];
+  };
+  deriveCran = mkDerive {
+    mkHomepage = name: "http://bioconductor.org/packages/release/bioc/html/${name}.html";
+    mkUrls = {name, version}: [
+      "mirror://cran/src/contrib/${name}_${version}.tar.gz"
+      "mirror://cran/src/contrib/00Archive/${name}/${name}_${version}.tar.gz"
+    ];
+  };
+
   # Overrides package definitions with nativeBuildInputs.
   # For example,
   #
@@ -193,7 +205,8 @@ let
   # `self` is `_self` with overridden packages;
   # packages in `_self` may depends on overridden packages.
   self = (defaultOverrides _self self) // overrides;
-  _self = import ./cran-packages.nix { inherit self derive; };
+  _self = import ./cran-packages.nix { inherit self; derive = deriveCran; }
+       // import ./bioc-packages.nix { inherit self; derive = deriveBioc; };
 
   # tweaks for the individual packages and "in self" follow
 
@@ -738,13 +751,8 @@ let
     "CosmoPhotoz" # Requires Nlopt
     "cp4p" # build is broken
     "cplexAPI" # requires CPLEX
-    "crmn" # requires pcaMethods, and Biobase
     "Crossover" # fails self-test
-    "CrypticIBDcheck" # requires rJPSGCS
     "cudaBayesreg" # requres Rmath
-    "curvHDR" # requires flowCore
-    "D2C" # requires gRbase
-    "DAAGbio" # requires limma
     "daff" # requires V8 to build
     "dagbag" # requires Rlapack
     "DAMisc" # Requires Nlopt
@@ -814,6 +822,7 @@ let
     "fPortfolio" # requires rneos
     "freqweights" # requires nlopt
     "fscaret" # requires nlopt
+    "FunctionalNetworks" # requires breastCancerVDX
     "FunctionalNetworks" # requires breastCancerVDX, and Biobase
     "fxregime" # requires nlopt
     "gamclass" # requires nlopt
@@ -829,6 +838,7 @@ let
     "gitter" # requires EBImage
     "glmgraph" # test suite says: "undefined symbol: dgemv_"
     "gmatrix" # depends on proprietary cudatoolkit
+    "gmatrix" # requires CUDA runtime
     "gMCP" # fails self-test
     "GOGANPA" # requires WGCNA
     "gplm" # requires nlopt
@@ -903,6 +913,7 @@ let
     "longpower" # requires nlopt
     "LOST" # requires pcaMethods
     "ltsk" # requires Rlapack and Rblas
+    "magma" # requires MAGMA
     "MAMA" # requires metaMA
     "marked" # requires nlopt
     "MaxPro" # Requires Nlopt
@@ -1018,6 +1029,7 @@ let
     "polytomous" # requires nlopt
     "pomp" # requires nlopt
     "ppiPre" # requires AnnotationDbi, GOSemSim, GO.db
+    "ppiPre" # requires GO.db
     "predictmeans" # requires nlopt
     "pRF" # requires multtest
     "prLogistic" # requires nlopt
@@ -1103,7 +1115,6 @@ let
     "rgbif" # requires V8 to build
     "rgp" # fails self-test
     "rgpui" # depends on broken rgp
-    "RImageJROI" # requires spatstat
     "rjade" # requires V8 to build
     "rJPSGCS" # requires chopsticks
     "rLindo" # requires LINDO API
@@ -1130,6 +1141,7 @@ let
     "RSeed" # requires RBGL, and graph
     "rsig" # requires survcomp
     "RSNPset" # requires qvalue
+    "rsprng" # requres sprng
     "Rsymphony" # FIXME: requires SYMPHONY
     "rugarch" # requires nlopt
     "RVAideMemoire" # Requires Nlopt
diff --git a/pkgs/development/r-modules/generate-cran-packages.R b/pkgs/development/r-modules/generate-r-packages.R
similarity index 67%
rename from pkgs/development/r-modules/generate-cran-packages.R
rename to pkgs/development/r-modules/generate-r-packages.R
index ad6c103513f..f9346ddc127 100755
--- a/pkgs/development/r-modules/generate-cran-packages.R
+++ b/pkgs/development/r-modules/generate-r-packages.R
@@ -3,16 +3,21 @@
 library(data.table)
 library(parallel)
 cl <- makeCluster(10)
-options(repos=structure(c(CRAN="http://cran.rstudio.com/")))
 
+mirrorType <- commandArgs(trailingOnly=TRUE)[1]
+packagesFile <- paste(mirrorType, 'packages.nix', sep='-')
+mirrorUrls <- list(
+  bioc="http://bioconductor.statistik.tu-dortmund.de/packages/3.0/bioc",
+  cran="http://cran.r-project.org"
+)
+mirrorUrl <- paste(mirrorUrls[mirrorType], "/src/contrib/", sep="")
 
-readFormatted <- as.data.table(read.table(skip=6, sep='"', text=head(readLines('cran-packages.nix'), -1)))
+readFormatted <- as.data.table(read.table(skip=6, sep='"', text=head(readLines(packagesFile), -1)))
 
 nixPrefetch <- function(name, version) {
   prevV <- readFormatted$V2 == name & readFormatted$V4 == version
   if (sum(prevV) == 1) as.character(readFormatted$V6[ prevV ]) else
-    system(paste0("nix-prefetch-url --type sha256 http://cran.rstudio.com/src/contrib/", name, "_", version, ".tar.gz"), intern=TRUE)
-    # system(paste0("nix-hash --flat --base32 --type sha256 /nix/store/*", name, "_", version, ".tar.gz", "| head -n 1"), intern=TRUE)
+    system(paste0("nix-prefetch-url --type sha256 ", mirrorUrl, name, "_", version, ".tar.gz"), intern=TRUE)
 }
 
 formatPackage <- function(name, version, sha256, depends, imports, linkingTo, knownPackages) {
@@ -28,21 +33,20 @@ formatPackage <- function(name, version, sha256, depends, imports, linkingTo, kn
     paste0(attr, " = derive { name=\"", name, "\"; version=\"", version, "\"; sha256=\"", sha256, "\"; depends=[", depends, "]; };")
 }
 
-clusterExport(cl, c("nixPrefetch","readFormatted"))
+clusterExport(cl, c("nixPrefetch","readFormatted", "mirrorUrl"))
 
-pkgs <- as.data.table(available.packages(filters=c("R_version", "OS_type", "CRAN", "duplicates")))
-pkgs <- subset(pkgs, Repository=="http://cran.rstudio.com/src/contrib")
+pkgs <- as.data.table(available.packages(mirrorUrl, filters=c("R_version", "OS_type", "duplicates")))
 pkgs <- pkgs[order(Package)]
 pkgs$sha256 <- parApply(cl, pkgs, 1, function(p) nixPrefetch(p[1], p[2]))
 knownPackages <- unique(pkgs$Package)
 
 nix <- apply(pkgs, 1, function(p) formatPackage(p[1], p[2], p[18], p[4], p[5], p[6], knownPackages))
 
-cat("# This file is generated from generate-cran-packages.R. DO NOT EDIT.\n")
+cat("# This file is generated from generate-r-packages.R. DO NOT EDIT.\n")
 cat("# Execute the following command to update the file.\n")
 cat("#\n")
-cat("# Rscript generate-cran-packages.R > cran-packages.nix\n")
-cat("\n")
+cat(paste("# Rscript generate-r-packages.R", mirrorType, ">", packagesFile))
+cat("\n\n")
 cat("{ self, derive }: with self; {\n")
 cat(paste(nix, collapse="\n"), "\n")
 cat("}\n")

From bb42c215e2a90c19e8c15e156976c004c4141f89 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Jun 2015 12:58:58 +0200
Subject: [PATCH 1271/2322] R: improve support for CRAN and Bioconductor
 package sets

 - Update the instructions for re-generating each of the package set files.
 - Provide test-evaluation.nix expression to verify that the package sets evaluates.
 - Update list of known broken packages.
---
 pkgs/build-support/fetchurl/mirrors.nix       |   18 +-
 pkgs/development/r-modules/bioc-packages.nix  | 1974 ++++---
 pkgs/development/r-modules/cran-packages.nix  | 5148 +++++++++--------
 pkgs/development/r-modules/default.nix        | 1694 +++---
 .../r-modules/generate-r-packages.R           |   41 +-
 .../development/r-modules/test-evaluation.nix |   21 +
 6 files changed, 4661 insertions(+), 4235 deletions(-)
 create mode 100644 pkgs/development/r-modules/test-evaluation.nix

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 5507eba965f..1f5e92da88a 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -293,15 +293,15 @@ rec {
   # The commented-out ones don't seem to allow direct package downloads;
   # they serve error messages that result in hash mismatches instead.
   bioc = [
-    # http://bioc.ism.ac.jp/3.0/bioc/
-    # http://bioc.openanalytics.eu/3.0/bioc/
-    # http://bioconductor.fmrp.usp.br/3.0/bioc/
-    # http://mirror.aarnet.edu.au/pub/bioconductor/3.0/bioc/
-    # http://watson.nci.nih.gov/bioc_mirror/3.0/bioc/
-    http://bioconductor.jp/packages/3.0/bioc/
-    http://bioconductor.statistik.tu-dortmund.de/packages/3.0/bioc/
-    http://mirrors.ebi.ac.uk/bioconductor/packages/3.0/bioc/
-    http://mirrors.ustc.edu.cn/bioc/3.0/bioc/
+    # http://bioc.ism.ac.jp/3.2/bioc/
+    # http://bioc.openanalytics.eu/3.2/bioc/
+    # http://bioconductor.fmrp.usp.br/3.2/bioc/
+    # http://mirror.aarnet.edu.au/pub/bioconductor/3.2/bioc/
+    # http://watson.nci.nih.gov/bioc_mirror/3.2/bioc/
+    http://bioconductor.jp/packages/3.2/bioc/
+    http://bioconductor.statistik.tu-dortmund.de/packages/3.2/bioc/
+    http://mirrors.ebi.ac.uk/bioconductor/packages/3.2/bioc/
+    http://mirrors.ustc.edu.cn/bioc/3.2/bioc/
   ];
 
   # CRAN mirrors (from http://cran.r-project.org/mirrors.html)
diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix
index 23ff444afb0..015d6d5537c 100644
--- a/pkgs/development/r-modules/bioc-packages.nix
+++ b/pkgs/development/r-modules/bioc-packages.nix
@@ -1,943 +1,1043 @@
 # 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 bioc > bioc-packages.nix
+# Rscript generate-r-packages.R bioc >new && mv new bioc-packages.nix
 
 { self, derive }: with self; {
-ABSSeq = derive { name="ABSSeq"; version="1.2.0"; sha256="0y8cr6w6jw8ac94jn4kbvrf9kdpjz2hq4s5hfkgd1gnphfkrw4f9"; depends=[]; };
-ABarray = derive { name="ABarray"; version="1.34.0"; sha256="0b7vyd3vagbczsf5ppd8pv18yrlzgb818lg1ga3lpzf6yr9gb2kd"; depends=[Biobase multtest]; };
-ACME = derive { name="ACME"; version="2.22.0"; sha256="06jhvqm2m27k44pk4iqz1msq3vnkchxvhsamdydsnlv52finfl66"; depends=[Biobase BiocGenerics]; };
-ADaCGH2 = derive { name="ADaCGH2"; version="2.6.0"; sha256="15afapvazksy6kgp9fgz57vc96dfhlz6hd0bssgfgjr243qgh2yy"; depends=[DNAcopy tilingArray GLAD aCGH snapCGH]; };
-AGDEX = derive { name="AGDEX"; version="1.14.0"; sha256="1kc8k2nqq2jc6hvxxs1abya8k96cc7lba0f3vndijai14lp2ynl0"; depends=[Biobase GSEABase]; };
-ALDEx2 = derive { name="ALDEx2"; version="1.0.0"; sha256="0w456qvyjx8m92p0jaawkr8jlp8rqnzic5z49gl4368shl07pfzx"; depends=[GenomicRanges]; };
-ARRmNormalization = derive { name="ARRmNormalization"; version="1.6.0"; sha256="108rjwd21z2k45a8dhsd1hs8ssf6gml80wcvg3768bzr0nipsc83"; depends=[]; };
-ASEB = derive { name="ASEB"; version="1.10.0"; sha256="0cwm7f9x7msnb5d8iq9d7s84r07iv0h43kjcim4hdmg27ij9a4yv"; depends=[]; };
-ASGSCA = derive { name="ASGSCA"; version="1.0.0"; sha256="0j43fm4vdl2s02a32l0bf7lj7j9irj2sgb958zykq42clzfsbcyx"; depends=[]; };
-ASSET = derive { name="ASSET"; version="1.4.0"; sha256="1dizmldax3b38zq1i6yvkcwzvir3jy74dmf2j3acbkri9ksxfbyp"; depends=[]; };
-ASSIGN = derive { name="ASSIGN"; version="1.2.0"; sha256="0qvhyp2mbmpdv08sdlw49kgba56zhblrf3x5vjld20frarfjjmm2"; depends=[]; };
-AffyCompatible = derive { name="AffyCompatible"; version="1.26.0"; sha256="1d803lbhibwr26m392vss3zkyiczivjiwj5bkcalwlyv3bmkikyn"; depends=[Biostrings]; };
-AffyExpress = derive { name="AffyExpress"; version="1.32.0"; sha256="1zmrqrh0dzzgprxh8gibj3dxdkh6ga6m3dlb8jvxyi9p6bwvdihq"; depends=[affy limma]; };
-AffyRNADegradation = derive { name="AffyRNADegradation"; version="1.12.0"; sha256="1wpgfnrajwhq850ibrkwiy1k2lvf1g4zfc35z1kwksh0fbx50s3d"; depends=[affy]; };
-AffyTiling = derive { name="AffyTiling"; version="1.24.0"; sha256="0rv1rg573qnwf1vfiklgm8dprr5gnfqccg06dvz5fddr1myjg53b"; depends=[affxparser affy preprocessCore]; };
-AgiMicroRna = derive { name="AgiMicroRna"; version="2.16.0"; sha256="1ziw9yvj2zn6ymqc3mihy55nl51r0jss3x2raspfpnzn9fv4lnph"; depends=[Biobase limma affy preprocessCore affycoretools Biobase]; };
-AllelicImbalance = derive { name="AllelicImbalance"; version="1.4.2"; sha256="1idxgilwlxf26991rilnggrm0qbvajmm4w6ssfljrddnlcqpnnkh"; depends=[GenomicRanges GenomicAlignments BiocGenerics AnnotationDbi Biostrings S4Vectors IRanges Rsamtools GenomicFeatures Gviz GenomeInfoDb]; };
-AnnotationDbi = derive { name="AnnotationDbi"; version="1.28.2"; sha256="0czhmh2bgip8ax30nk1jkb82qa68cyi7ki5fwwrv3sd05gvc8qln"; depends=[BiocGenerics Biobase GenomeInfoDb BiocGenerics Biobase S4Vectors]; };
-AnnotationForge = derive { name="AnnotationForge"; version="1.8.2"; sha256="13gqf7pa44js7z64psk2p6abjvwzp28pn0lc6hgmc7bcnbnblsg8"; depends=[BiocGenerics Biobase AnnotationDbi BiocGenerics S4Vectors Biobase]; };
-AnnotationFuncs = derive { name="AnnotationFuncs"; version="1.16.0"; sha256="090m1dm37r3pdn7367akmddil1qivcjsy7ilgplqhabii0gb8dhi"; depends=[AnnotationDbi]; };
-AnnotationHub = derive { name="AnnotationHub"; version="1.6.0"; sha256="1kkdxf28pl743c9yamg75kcvp0pqxvphba7q9yblfsjhq2sym2v2"; depends=[S4Vectors IRanges BiocGenerics BiocInstaller AnnotationDbi GenomicRanges interactiveDisplay]; };
-ArrayExpress = derive { name="ArrayExpress"; version="1.26.0"; sha256="06746fvc2xlz42ykp9b8vzgfhz4jzyx5qp6drvl9776lpawd2qq8"; depends=[Biobase affy limma]; };
-ArrayExpressHTS = derive { name="ArrayExpressHTS"; version="1.16.0"; sha256="0mp9dafd5h2n8sfdadncch4inxy7gn4rsmv68fyjxr4cs52c229p"; depends=[Rsamtools Biobase BiocGenerics Biostrings DESeq GenomicRanges IRanges Rsamtools ShortRead biomaRt edgeR Rsamtools]; };
-ArrayTV = derive { name="ArrayTV"; version="1.4.0"; sha256="06yf52yf3jydr187yfg52vr7krhw433wab487qj3qlq903nkvjn0"; depends=[DNAcopy oligoClasses]; };
-ArrayTools = derive { name="ArrayTools"; version="1.26.0"; sha256="1sf38isnq2bv8np9skqs9iwhb7k6waf6xzzrmkrxqrbm86izvdxj"; depends=[affy Biobase affy Biobase limma]; };
-AtlasRDF = derive { name="AtlasRDF"; version="1.2.0"; sha256="0cdan2739w7sbz503kqm3xyyizs4l1vi9i2a5jmxn6fb9nqgkar5"; depends=[]; };
-BAC = derive { name="BAC"; version="1.26.0"; sha256="1km0d3k2qxqa0s1bf2hpic71rplh07b5y06i8qr3yj3nis23z6a2"; depends=[]; };
-BADER = derive { name="BADER"; version="1.4.0"; sha256="06k2dmh9dv9ng469cp67c2ld2mv7sqgynkwn368whqvvv8drc23g"; depends=[]; };
-BAGS = derive { name="BAGS"; version="2.6.0"; sha256="1553n2cslnvslcc09x8wb1jll5w24zbfpjj2fhwl1955fxhclfdm"; depends=[Biobase]; };
-BCRANK = derive { name="BCRANK"; version="1.28.0"; sha256="1fwyfj619i8d32k69x5ngmc7f3j71986l762rhl6idb28krfgzb8"; depends=[Biostrings]; };
-BEAT = derive { name="BEAT"; version="1.4.0"; sha256="1xqnabgbzd08f25wdvwbzi3f68ldvxbisriww9f32ysj5dhjl0mh"; depends=[GenomicRanges ShortRead Biostrings BSgenome]; };
-BGmix = derive { name="BGmix"; version="1.26.0"; sha256="1fc9dh23i1lab5b10z1xz6hb5ilgpif5ifg32qyppxz971cxrb2j"; depends=[]; };
-BHC = derive { name="BHC"; version="1.18.0"; sha256="16i2di8d71as8jh4lm185405xmc3kkmsmlrwkqr0rj59vlgghn46"; depends=[]; };
-BRAIN = derive { name="BRAIN"; version="1.12.0"; sha256="0284ww8gxzgvq6c1pkzr4lsrw6gv94ghl9myp4pihfgj26g4qcdm"; depends=[Biostrings]; };
-BSgenome = derive { name="BSgenome"; version="1.34.1"; sha256="099jwllff6gkzs34jhhrnjljjm7wv2jdh1y01318pifgcrym5sw0"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges Biostrings rtracklayer BiocGenerics S4Vectors IRanges XVector GenomeInfoDb GenomicRanges Biostrings Rsamtools rtracklayer]; };
-BUS = derive { name="BUS"; version="1.22.0"; sha256="0l3rhvja8k8yawc2wz3xdk6m8ccvx024i2ckpwiimslnpb5qai3m"; depends=[minet]; };
-BaseSpaceR = derive { name="BaseSpaceR"; version="1.10.0"; sha256="0gsrs9aan1802hv8db5x1mfaawayrcw8zvdcf3ly7z9cavf1nyfs"; depends=[]; };
-Basic4Cseq = derive { name="Basic4Cseq"; version="1.2.0"; sha256="0kpsvrwl1mphdraww8ha586a57j1iqz1dk7ms5x9rsddjkl7vqa6"; depends=[Biostrings ShortRead GenomicRanges]; };
-BayesPeak = derive { name="BayesPeak"; version="1.18.2"; sha256="16ndpxlwgpzhh7c9kmv2pvlan0ida1zzcflzvnq7sggynfghff2j"; depends=[IRanges IRanges]; };
-BeadDataPackR = derive { name="BeadDataPackR"; version="1.18.0"; sha256="0z7s1v2xac3k52d1cyir8h99yf3h494s104z9slvd679kn7r1288"; depends=[]; };
-BiGGR = derive { name="BiGGR"; version="1.2.0"; sha256="18brc57np4074fckcv3h1ik6zaw18r82c8z7kmna4f66396i6v1g"; depends=[rsbml hyperdraw hypergraph]; };
-BiRewire = derive { name="BiRewire"; version="1.8.0"; sha256="1bdilpbz0z1ppbg5729f0wi8xvr0j96q9q1mdqs7agnfc82yiwhq"; depends=[]; };
-BiSeq = derive { name="BiSeq"; version="1.6.0"; sha256="0rsf9kii79qjzabahpvbmmkyxc0605z325pkkdzrp3062fwafhm9"; depends=[S4Vectors IRanges GenomicRanges BiocGenerics Biobase S4Vectors IRanges GenomicRanges rtracklayer globaltest]; };
-BicARE = derive { name="BicARE"; version="1.24.0"; sha256="0945kwimcbb7asp1jsadl97glyw26a0wqrymb8qb1zn5r6scplbv"; depends=[Biobase multtest GSEABase]; };
-BioMVCClass = derive { name="BioMVCClass"; version="1.34.0"; sha256="0yzpwynxyxqfjhggkq1jmfc86bxzfnzy4pc7b78q6flkkz025d0h"; depends=[MVCClass Biobase graph Rgraphviz]; };
-BioNet = derive { name="BioNet"; version="1.26.1"; sha256="0cwgjddx9zdbfwjcsx7qlzi2yw8jgi6xl69y1i87b00smi0dj0in"; depends=[Biobase graph RBGL AnnotationDbi]; };
-BioSeqClass = derive { name="BioSeqClass"; version="1.24.0"; sha256="13ry3kwlkpk5gr6rjkhip1hhd6b6b02v9hw30wz9qcwfai8fxklv"; depends=[Biostrings Biobase]; };
-Biobase = derive { name="Biobase"; version="2.26.0"; sha256="170vaqkpb2ycmydxh8kl0g7f0wmy5kks43sx4adrcbbnawza50f4"; depends=[BiocGenerics]; };
-BiocCaseStudies = derive { name="BiocCaseStudies"; version="1.28.0"; sha256="01xlfl5klhiwnn8cmp8jqrsr54c4d9s54flf8rjr5vb6n0gnfnwy"; depends=[Biobase]; };
-BiocCheck = derive { name="BiocCheck"; version="1.2.3"; sha256="0blcll935flkn9019mxzg0g1146z3h6lqy52kwq53alwqbqllxw0"; depends=[biocViews BiocInstaller graph]; };
-BiocGenerics = derive { name="BiocGenerics"; version="0.12.1"; sha256="0xszm3ppkw1mi509bz0vdnlabw3jp83s4lnjdpxbb9s65k3z4lfl"; depends=[]; };
-BiocInstaller = derive { name="BiocInstaller"; version="1.16.5"; sha256="1s9qvvr4cgxysvz1rr9bnnalmcc4jhbabfl3j7zcx77pdh14wkqb"; depends=[]; };
-BiocParallel = derive { name="BiocParallel"; version="1.0.3"; sha256="07zpmdy2yrk4rn20jjak2vdgab80xwlx98rw1zxglyk3hn17r71k"; depends=[BiocGenerics]; };
-BiocStyle = derive { name="BiocStyle"; version="1.4.1"; sha256="0s4518fd29ym9ql0pj9p5grym0ykddc85yp9rkpip9g3i9cy9izp"; depends=[]; };
-Biostrings = derive { name="Biostrings"; version="2.34.1"; sha256="1kfh3gabgfxnksadxd31qxv46j59l0gmfnxj197gmfhxxgwgh2mh"; depends=[BiocGenerics S4Vectors IRanges XVector BiocGenerics IRanges XVector zlibbioc S4Vectors IRanges XVector]; };
-BitSeq = derive { name="BitSeq"; version="1.10.0"; sha256="1g5znh2hyvc6ywzhqdr2f2wl81842wy9xsndmx7xswy6vkvalyc4"; depends=[Rsamtools zlibbioc S4Vectors IRanges Rsamtools zlibbioc]; };
-BrainStars = derive { name="BrainStars"; version="1.10.0"; sha256="17jb1n0ndh05gvwh0sjcqmn17i54p9q1g3520zhpqp7d2wz8diyi"; depends=[Biobase Biobase]; };
-BridgeDbR = derive { name="BridgeDbR"; version="1.0.0"; sha256="1m3gq4hssvaazgv966lwv0fh4b8hsxxipbfzmf6jrwlwkz1snvc0"; depends=[]; };
-BufferedMatrix = derive { name="BufferedMatrix"; version="1.30.0"; sha256="1c8asd6k9wkpdkmy5pgicr86kgp2y830w3zmha47jjsrni71fm2v"; depends=[]; };
-BufferedMatrixMethods = derive { name="BufferedMatrixMethods"; version="1.30.0"; sha256="0aih4b3is6qhb5ac3s2mmcmvmbscb3cv5kpgp7cn5zzsd6gqan34"; depends=[BufferedMatrix BufferedMatrix]; };
-CAFE = derive { name="CAFE"; version="1.2.0"; sha256="0h3gy904dgjggk84cjmx8k8x9482fx5cvvy8hcc39z97p39ar5wn"; depends=[biovizBase GenomicRanges IRanges ggbio affy annotate Biobase]; };
-CAGEr = derive { name="CAGEr"; version="1.10.3"; sha256="0dja1xszwy8nmn6id7yjh13x7myl36104y4kb4qs5fdc955ir93a"; depends=[BSgenome Rsamtools GenomicRanges IRanges rtracklayer]; };
-CALIB = derive { name="CALIB"; version="1.32.0"; sha256="17hm37xklsmizmwyaak3i657ly60afpl01zhrvd5jcp1z8p315rj"; depends=[limma limma]; };
-CAMERA = derive { name="CAMERA"; version="1.22.0"; sha256="17yv2q67xcdmnwlxd5yd3z3gq4rksbazzjk44g6caz8k1scl5yj6"; depends=[Biobase xcms xcms RBGL graph]; };
-CFAssay = derive { name="CFAssay"; version="1.0.0"; sha256="1j1x06fn516454d6drfmmznazifbpxnkna1j2q64lcjc0rlrwl6y"; depends=[]; };
-CGEN = derive { name="CGEN"; version="3.0.1"; sha256="1w06wk31wycbvs4xmb5qxxv2frprfa7rlxv5g3h0pbpi79w1s6f7"; depends=[]; };
-CGHbase = derive { name="CGHbase"; version="1.26.0"; sha256="16i8x78wmph5pi9bbijcblnrmq9d89y9wp44xisq12bd4n4f6a7r"; depends=[Biobase marray]; };
-CGHcall = derive { name="CGHcall"; version="2.28.0"; sha256="0v11d5y6l520jvrp3srbwwcl8llw5wf8yc2kmld5rznxbmbca70j"; depends=[impute DNAcopy Biobase CGHbase]; };
-CGHnormaliter = derive { name="CGHnormaliter"; version="1.20.0"; sha256="1dkqp42a3nb7pxn15s893n0qh8jjw7scnhxh15ddjq04wa4wcprw"; depends=[CGHcall CGHbase Biobase CGHbase CGHcall]; };
-CGHregions = derive { name="CGHregions"; version="1.24.0"; sha256="0c4df9sn1yx3zw0jpccxbbhnk9466zy2alkmrm3sk1cnfy867263"; depends=[Biobase CGHbase]; };
-CMA = derive { name="CMA"; version="1.24.0"; sha256="02c243b50zg3n1qz526zv66zff75iw58n27dvxp0cxxb8nnibdxk"; depends=[Biobase]; };
-CNAnorm = derive { name="CNAnorm"; version="1.12.0"; sha256="0fvgrk37g8k940fxhbwi3m5l3vm4dpiswlyac8jgkhzdab8zkigd"; depends=[DNAcopy]; };
-CNEr = derive { name="CNEr"; version="1.2.0"; sha256="1zsgpdx1jy32cgpd7sdgdn5j5jcl8rnhbaz084p426if6irb8q8c"; depends=[Biostrings GenomeInfoDb GenomicRanges rtracklayer XVector GenomicAlignments S4Vectors IRanges S4Vectors IRanges XVector]; };
-CNORdt = derive { name="CNORdt"; version="1.8.0"; sha256="0sx1d94z09d3r409v7dykli3fj0j37j1cslm7mdhh0bp9bi1fzfz"; depends=[CellNOptR]; };
-CNORfeeder = derive { name="CNORfeeder"; version="1.6.0"; sha256="1yzypx0pkyga4qhi11ngr2riq4rbj35lw5hy3pv82a5bwfi2vwxk"; depends=[CellNOptR graph]; };
-CNORfuzzy = derive { name="CNORfuzzy"; version="1.8.0"; sha256="0srg848n3cf10sp8v9cclrxpfn1zhjlb7n1ix2v0q9p3darsw15f"; depends=[CellNOptR]; };
-CNORode = derive { name="CNORode"; version="1.8.1"; sha256="1dhdcsqw73c3a7jm7341zf91xb08f40fjy38qppjyfyjfaibyxj4"; depends=[CellNOptR]; };
-CNTools = derive { name="CNTools"; version="1.22.0"; sha256="0hjd1qldnxsfwlc28g522lqf4ain9ad2pk03dhhnz046sddibv76"; depends=[genefilter]; };
-CNVrd2 = derive { name="CNVrd2"; version="1.4.0"; sha256="0m7632gq9j5y1vc5w2scbsrwga9n3cl8mvp8z4lw3j81qmilsc1c"; depends=[VariantAnnotation DNAcopy IRanges Rsamtools]; };
-CNVtools = derive { name="CNVtools"; version="1.60.0"; sha256="17igkk3c2vb66yvsq4x9aanxwp977jzagxx8q0wgphdgv4sggbvb"; depends=[]; };
-COHCAP = derive { name="COHCAP"; version="1.4.0"; sha256="1fv3zrp3d4lk7qd7wn52i54z89v7ldsakzy7jhdj6adyf1cm6rgf"; depends=[]; };
-COMPASS = derive { name="COMPASS"; version="1.4.0"; sha256="0gp77dfwgdvy7p9sr80ylpynfjq0yyrp20lzzp07sygvaaygs2aq"; depends=[]; };
-COPDSexualDimorphism = derive { name="COPDSexualDimorphism"; version="1.2.0"; sha256="02lsl2965ixhy1707qkhmc8rcdpq1qpyvbv09j4hkg20ymsrh4b8"; depends=[limma GenomicRanges]; };
-CORREP = derive { name="CORREP"; version="1.32.0"; sha256="0g2w9hzmdiwlal49x7cx1zvy8f5b52dc91xwqh61sh9sfn454423"; depends=[]; };
-COSNet = derive { name="COSNet"; version="1.0.0"; sha256="1d08y0mpvgpvwr08yjjh4v0phankm6b55m66m61qbb1xb0ix1rnz"; depends=[]; };
-CRISPRseek = derive { name="CRISPRseek"; version="1.4.2"; sha256="1x4wgvlqighycadr8rf70pvdk0fpnix78zkfqqbnvmw6sb0r28dk"; depends=[BiocGenerics Biostrings BSgenome]; };
-CRImage = derive { name="CRImage"; version="1.14.0"; sha256="118m3157izfjm5i2kail3cphys0cm1xnm7lj3s8j8k1wilq7y7fz"; depends=[EBImage DNAcopy aCGH]; };
-CSAR = derive { name="CSAR"; version="1.18.0"; sha256="1kzry6ixb6fr5468y8mi31m1anw42nk6xx844xyiavwd61547kx0"; depends=[S4Vectors IRanges GenomeInfoDb GenomicRanges]; };
-CSSP = derive { name="CSSP"; version="1.5.1"; sha256="06n5jhk1yr4ihb3hc888fyzr803hzjig4xzkdqq67m1rfnv51w3r"; depends=[]; };
-CancerMutationAnalysis = derive { name="CancerMutationAnalysis"; version="1.10.0"; sha256="0azqwgy95nqfs1i8biwfn8dbqmmdhqcw4r2f91q9njfrbnrgsgpy"; depends=[qvalue AnnotationDbi limma]; };
-Category = derive { name="Category"; version="2.32.0"; sha256="1cyphjvymyg530qkrjmxib63k5a1dd2wv8irj56ygifv8rzfib13"; depends=[BiocGenerics AnnotationDbi Biobase BiocGenerics graph Biobase AnnotationDbi RBGL GSEABase genefilter annotate]; };
-CellNOptR = derive { name="CellNOptR"; version="1.12.0"; sha256="1wfd0xavib58mnv6bnrsaznvmq370i7lnd565n7sk5cy09fwvnlh"; depends=[RBGL graph Rgraphviz]; };
-CexoR = derive { name="CexoR"; version="1.4.0"; sha256="1mp2xx2bjscirc9w54ix7ha20ysmhm0p51d7281fr3mibd5p2zny"; depends=[S4Vectors IRanges Rsamtools GenomeInfoDb GenomicRanges rtracklayer]; };
-ChAMP = derive { name="ChAMP"; version="1.4.1"; sha256="136al7yx68gnw43rsglwndhvbjvl139zvj27hjrmzn0h24d1sx73"; depends=[minfi sva limma DNAcopy preprocessCore impute marray wateRmelon]; };
-ChIPQC = derive { name="ChIPQC"; version="1.2.2"; sha256="07jgq5056c23lxi974pgg41nr93hhxz8ia8cbz9i9zn0jqwrrr0k"; depends=[DiffBind GenomicRanges BiocGenerics S4Vectors IRanges Rsamtools GenomicAlignments chipseq BiocParallel Biobase]; };
-ChIPXpress = derive { name="ChIPXpress"; version="1.8.0"; sha256="17qdklr99vxx9npa03svslysisfraxx5z3s8cd0zgjg4b00q2bdb"; depends=[Biobase GEOquery frma affy]; };
-ChIPpeakAnno = derive { name="ChIPpeakAnno"; version="2.16.4"; sha256="1321agyc1z14dqm9fjqbjbrbla0ykziqjx4k4v2smxp75xsxn3dk"; depends=[biomaRt IRanges Biostrings BiocGenerics BSgenome GenomicFeatures AnnotationDbi limma multtest]; };
-ChIPseeker = derive { name="ChIPseeker"; version="1.2.6"; sha256="07hgig4x64cnlq297zr6vcawvhrbj47qc26fqp14nl080w11rf9s"; depends=[BiocGenerics AnnotationDbi IRanges GenomeInfoDb GenomicRanges GenomicFeatures rtracklayer S4Vectors]; };
-ChIPseqR = derive { name="ChIPseqR"; version="1.20.0"; sha256="0fbcwv59mhmkqrfa3f3drfwwygkdbbxmxf3pf7v4d633qziwi6fb"; depends=[BiocGenerics S4Vectors ShortRead Biostrings GenomicRanges HilbertVis IRanges ShortRead]; };
-ChIPsim = derive { name="ChIPsim"; version="1.20.0"; sha256="1iw8r5qc3bjhldxa553yp5y4gv3g6x5lfwr4hbd4waydas01ncjf"; depends=[Biostrings IRanges XVector Biostrings ShortRead]; };
-ChemmineOB = derive { name="ChemmineOB"; version="1.4.1"; sha256="0yygn5p0dwj3zfdmipkqlpm1w9kd8i4pdb17xwcwaz5k7z1v4jzr"; depends=[BiocGenerics zlibbioc]; };
-ChemmineR = derive { name="ChemmineR"; version="2.18.1"; sha256="09vrv0bxmhhh40n4lpwmfk6imwbsxp2aanla3b3l9zia0w6r1h7k"; depends=[BiocGenerics]; };
-ChromHeatMap = derive { name="ChromHeatMap"; version="1.20.0"; sha256="0a66gh4xkw4f8xnh1ak1masy9k94dvnz3h5wfd06p8yx0pfycyrm"; depends=[BiocGenerics annotate AnnotationDbi Biobase IRanges rtracklayer]; };
-ClassifyR = derive { name="ClassifyR"; version="1.0.18"; sha256="1l5pqfqsjny1caxdglfi5qn85r0m52mr7ks9m98rkqgk10d1nclk"; depends=[Biobase BiocParallel]; };
-Clomial = derive { name="Clomial"; version="1.2.0"; sha256="0gfb3v9fvvf96qr1x3d59icsmx7mhns71fbz62bc3dr2434msa5p"; depends=[]; };
-Clonality = derive { name="Clonality"; version="1.14.0"; sha256="1vk0cn197xp64wdl7ff9xrac5x4rgx6b759a22jaaxc13vl38807"; depends=[DNAcopy DNAcopy]; };
-CoCiteStats = derive { name="CoCiteStats"; version="1.38.0"; sha256="1l7hvz1054yd43ix67vqkyfxirnpy073xphqll9lyjqdk1zkaxy0"; depends=[AnnotationDbi]; };
-CoGAPS = derive { name="CoGAPS"; version="2.0.0"; sha256="0hqrqf3sajf9fnwpas4hd0a6zdr2w882j9n8iwxylcas4iq9p0ya"; depends=[]; };
-CoRegNet = derive { name="CoRegNet"; version="1.1.7"; sha256="0dmm3qy8c0p7yjnhad0gi6vv08l3fw29zwy2sydrxf1x43wjjn3g"; depends=[]; };
-CompGO = derive { name="CompGO"; version="1.2.0"; sha256="1y21ha0dxg4gnwdkpsx051p9i3dsgp65yzzzbs3qzkrqf7qldccr"; depends=[RDAVIDWebService rtracklayer Rgraphviz GenomicFeatures pcaMethods pathview]; };
-ConsensusClusterPlus = derive { name="ConsensusClusterPlus"; version="1.20.0"; sha256="14ga3qamsj0h871k79nzmfq0462vir501d2pngs8fj0rh699n552"; depends=[Biobase]; };
-CopyNumber450k = derive { name="CopyNumber450k"; version="1.2.0"; sha256="181cydyzq9dym0jz6arn9nqgnzdp4gfhy51d27fw55zwnrhxlwv7"; depends=[Biobase minfi DNAcopy preprocessCore BiocGenerics]; };
-CorMut = derive { name="CorMut"; version="1.8.0"; sha256="1i7r4dwvs927dv1n3wa89wizjwj6pibsgry1zzhdifchi6gkyva8"; depends=[]; };
-Cormotif = derive { name="Cormotif"; version="1.12.0"; sha256="0xmac8m4i2x9d3gd1scxawiz6y8fqg92irs8j3ni81cijn9gbaxl"; depends=[affy limma affy]; };
-CoverageView = derive { name="CoverageView"; version="1.2.0"; sha256="09scvmd78cck922m3n8lvmgim2k8i376b5n2cwp0fmifwzwaxiqx"; depends=[Rsamtools rtracklayer IRanges GenomicRanges GenomicAlignments]; };
-DART = derive { name="DART"; version="1.12.0"; sha256="0nq43b2lld40720139wjx9pkmjdbkiwmcgaakdd7k3i0vqpriarw"; depends=[]; };
-DASiR = derive { name="DASiR"; version="1.6.0"; sha256="0k19nlw4wf1fiwgnm3l2y6mmmwqigh62nd2iqjchj4v7g3vd134w"; depends=[IRanges GenomicRanges Biostrings]; };
-DAVIDQuery = derive { name="DAVIDQuery"; version="1.26.0"; sha256="1ms5gqx2rf8k4cdwbjdfhyymdr59fyz6xmykgp398scl6kmgys6f"; depends=[]; };
-DBChIP = derive { name="DBChIP"; version="1.10.0"; sha256="0d36sqwzrcpm9i24f7qc8lbkgxcrhilx2ic8czhp3lk81p5wa9qn"; depends=[edgeR DESeq]; };
-DECIPHER = derive { name="DECIPHER"; version="1.12.0"; sha256="0fxgzwyx8z3xygkvw6divadymxgfanmm1clcxzr6j3inicqmcd9k"; depends=[Biostrings S4Vectors IRanges XVector Biostrings S4Vectors IRanges XVector]; };
-DEDS = derive { name="DEDS"; version="1.40.0"; sha256="1lzkcj2nil2d4aqwzi25s9y46p5rs2hs7is98iqphq49vw1xqxv5"; depends=[]; };
-DEGraph = derive { name="DEGraph"; version="1.18.0"; sha256="02f3wq0lpv6mwl1xbhggywwldf8ib34vll2fdgcyyxnw2y3z534y"; depends=[graph KEGGgraph RBGL Rgraphviz NCIgraph]; };
-DEGreport = derive { name="DEGreport"; version="1.0.0"; sha256="1fki0qc7ln3ivcwkb3ra4hf8xwvfpbrlarzqy8yf2rxw9bi6fi9d"; depends=[edgeR]; };
-DEGseq = derive { name="DEGseq"; version="1.20.0"; sha256="0ndb1kdbhjab6c2q44rc171877g3xqcq3zs1n789b7y55m95qpdc"; depends=[qvalue]; };
-DESeq = derive { name="DESeq"; version="1.18.0"; sha256="10q9ag2na6pxrxzh01y1j9sp3vw8h769lr986n35mmxxq40n50nc"; depends=[BiocGenerics Biobase genefilter geneplotter]; };
-DESeq2 = derive { name="DESeq2"; version="1.6.3"; sha256="1mc2ciyps16vsg3h7cxcl49k7n4rgbmal8qb3bqwa12jj5nnjpi0"; depends=[S4Vectors IRanges GenomicRanges BiocGenerics Biobase BiocParallel genefilter geneplotter]; };
-DEXSeq = derive { name="DEXSeq"; version="1.12.2"; sha256="0c2avg8likbs7mv6q7srwgf7qjlc2vk0qr0jbq97z0vjnb3h68fm"; depends=[Biobase GenomicRanges IRanges DESeq2 BiocParallel BiocGenerics biomaRt Rsamtools geneplotter genefilter]; };
-DFP = derive { name="DFP"; version="1.24.0"; sha256="1v0bvrjmzyxn1jc3fp1fzxa2pyxxmchb74vcq63j2gpnb2w35p52"; depends=[Biobase]; };
-DMRcate = derive { name="DMRcate"; version="1.2.0"; sha256="1klpsiwl2srip3dwlvdry1kjn5cpx6mmhakxrz0k7z07dy1c60zk"; depends=[limma minfi]; };
-DMRforPairs = derive { name="DMRforPairs"; version="1.2.0"; sha256="1asmwfph7aw8a8s9aj5pgzqdkfh9lnd5kv3y21jjm7vcmd5snd4h"; depends=[Gviz GenomicRanges]; };
-DNAcopy = derive { name="DNAcopy"; version="1.40.0"; sha256="109dwb43f7hxzkyygirabrnm3nd7ibzk228k1mvlpz55n7w8v98y"; depends=[]; };
-DNaseR = derive { name="DNaseR"; version="1.4.0"; sha256="189g6ww5361i0jzicb4qnvjdbrw3n9wgw749awmr1ai6igp7mg9g"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges Rsamtools]; };
-DOQTL = derive { name="DOQTL"; version="1.0.0"; sha256="12sxw204hxw59pcxgilhz9x5k0wqpn1cyds1ih6bf9497da3vbab"; depends=[annotate annotationTools biomaRt Biobase BiocGenerics GenomicRanges IRanges Rsamtools]; };
-DOSE = derive { name="DOSE"; version="2.4.0"; sha256="0swyzrx1aapnqszzwavl0insw6ml8hrvscvqmpwr72cssclq0p3d"; depends=[qvalue AnnotationDbi GOSemSim]; };
-DSS = derive { name="DSS"; version="2.4.1"; sha256="0lm8miyzg2cyc1p18qvv6g63wmk7d25q6igsk8p8p663y7jkm43s"; depends=[Biobase bsseq edgeR]; };
-DTA = derive { name="DTA"; version="2.12.1"; sha256="0rbwx2853388fvshrf8sz48ilcdrs4062isavaq5dwvma484jrdk"; depends=[]; };
-DeconRNASeq = derive { name="DeconRNASeq"; version="1.8.0"; sha256="0bk8q1dp0hnrkcymgimbymlz3v7s5bgzx59m51rcypypyhdnc3gi"; depends=[pcaMethods]; };
-DiffBind = derive { name="DiffBind"; version="1.12.3"; sha256="0rm1jgzrw5ik0pxryf7vrq715d0gvxfiid1amf9wk2s4vqxj2shj"; depends=[GenomicRanges limma GenomicAlignments edgeR IRanges zlibbioc S4Vectors Rsamtools]; };
-DirichletMultinomial = derive { name="DirichletMultinomial"; version="1.8.0"; sha256="10hip99fxyl9pb2kp810j5cr59i2xmn1x60ansgjdr0xcbp0791w"; depends=[S4Vectors IRanges]; };
-DriverNet = derive { name="DriverNet"; version="1.6.0"; sha256="00rccsf3zvyghx9a1gjs9smd5cf927rwx1fghnq5a9kkwg21sp5m"; depends=[]; };
-DrugVsDisease = derive { name="DrugVsDisease"; version="2.6.0"; sha256="1b5214gknp4dsgg1gc229kln89nlvddx2d202jaiqdgw9j0gyn4s"; depends=[affy limma biomaRt ArrayExpress GEOquery qvalue annotate BiocGenerics]; };
-DupChecker = derive { name="DupChecker"; version="1.4.0"; sha256="0k5yyi3hnz08x5fy7vhp0glhcjdp2mlgkvqmqw78w12af0pynpjf"; depends=[]; };
-DynDoc = derive { name="DynDoc"; version="1.44.0"; sha256="14vx87r20ccf08wx3a42rg2dg0ydbprwxsk24j5bmjxqkm45pmxc"; depends=[]; };
-EBImage = derive { name="EBImage"; version="4.8.3"; sha256="1lzbn2i8ikqghp5jnb3a0k2in3b9f4ck4imlk6l6ddi6szprmrrs"; depends=[BiocGenerics]; };
-EBSeq = derive { name="EBSeq"; version="1.6.0"; sha256="0k6azzbyxxaqblv326i0ykm414qhwsrr69k1l3dfbwvrh17giamv"; depends=[]; };
-EBSeqHMM = derive { name="EBSeqHMM"; version="1.0.0"; sha256="13nfj4ka0plli2yd69jmvy1qsqcprn0xbzqmr264v15msl94vqyx"; depends=[EBSeq]; };
-EBarrays = derive { name="EBarrays"; version="2.30.0"; sha256="1v32rzzx9brv3c0kl7zmxa09ah954nd1rynljm2l21h0swlrrr64"; depends=[Biobase Biobase]; };
-EBcoexpress = derive { name="EBcoexpress"; version="1.10.0"; sha256="0w684g7v2r55br4n9lb9r0sdm9p0z7v4cb38fy7nin8rcipkqh0r"; depends=[EBarrays]; };
-EDASeq = derive { name="EDASeq"; version="2.0.0"; sha256="1q0n1p7ba6kp7gq1fhvjg0bdwb34dxn0xvxqajh36xx34f1ksiv6"; depends=[Biobase ShortRead BiocGenerics IRanges DESeq aroma_light Rsamtools]; };
-EDDA = derive { name="EDDA"; version="1.5.3"; sha256="0syhwhqbpvazy6vnpkjx99m752fwdzkaqyq98kwx4pjikpw6j2zr"; depends=[DESeq baySeq edgeR DESeq baySeq edgeR]; };
-ELBOW = derive { name="ELBOW"; version="1.2.0"; sha256="0k2iaa5v2pr2h6vfa5r7lrqkvxsaq6hf4zi2si4n2qivm29s3hby"; depends=[]; };
-ENVISIONQuery = derive { name="ENVISIONQuery"; version="1.14.0"; sha256="1xhcvmw9px4kyg3p7wc08jrin0qkw7xi20jjy34fd6almnmk7mfd"; depends=[]; };
-EasyqpcR = derive { name="EasyqpcR"; version="1.8.0"; sha256="0ql9mj94yb0cpk0gwnhrlsc0xr6i7psral26vgp7zrzx5iw6zg9d"; depends=[]; };
-EnrichmentBrowser = derive { name="EnrichmentBrowser"; version="1.0.3"; sha256="03jq5w9hlgcc7yl2305jw6hlnrlpwg6mg131zya1cxzxrs12gv8b"; depends=[Biobase KEGGgraph KEGGREST Rgraphviz SPIA graph limma neaGUI qvalue safe]; };
-ExiMiR = derive { name="ExiMiR"; version="2.8.0"; sha256="19ghy4l1zcz3jfrcdzmlpwml2if618j2i5b0m8iw7ww7n1mapmvw"; depends=[Biobase affy limma affyio Biobase preprocessCore]; };
-ExpressionView = derive { name="ExpressionView"; version="1.18.0"; sha256="1kw2gdflfnqs4pkyjk1qjxdk1xafl7qx4vwjb7fd1c26wk28b6xh"; depends=[eisa AnnotationDbi eisa AnnotationDbi]; };
-FEM = derive { name="FEM"; version="1.0.0"; sha256="019iw3rgzym59332pw941lw8n7hnk9arc237d3y1ayrwgxh73b3r"; depends=[marray impute limma graph BiocGenerics]; };
-FGNet = derive { name="FGNet"; version="3.0.7"; sha256="05kxjizcimfyjcjqpzgxlnj5lssbiq05bq5q64h7xxyyia3913n8"; depends=[]; };
-FRGEpistasis = derive { name="FRGEpistasis"; version="1.2.0"; sha256="00d1q06rkvbblajiqjyv87vsa3g1mzg4km2z0548g503k961cp8d"; depends=[]; };
-FourCSeq = derive { name="FourCSeq"; version="1.0.0"; sha256="11f340ri3s3qjqpf4vjngrz1vrpilkyg69cn09kpfs5vvh6y7wii"; depends=[GenomicRanges DESeq2 DESeq2 Biobase Biostrings GenomicRanges Rsamtools ggbio rtracklayer GenomicAlignments]; };
-FunciSNP = derive { name="FunciSNP"; version="1.8.0"; sha256="0ns1c2zsdkrgzq3a6mdd057h13sgh175sbvadibz06gj22008ka6"; depends=[AnnotationDbi IRanges Rsamtools rtracklayer ChIPpeakAnno GenomicRanges VariantAnnotation snpStats]; };
-GENE_E = derive { name="GENE.E"; version="1.6.0"; sha256="0g7ghg5mksaazivgb8m2faizcbpzkddh35417f8qi6hbl8a7kpja"; depends=[rhdf5 rhdf5]; };
-GEOmetadb = derive { name="GEOmetadb"; version="1.26.1"; sha256="10n56xlx61j6rjzz6g3079s9jv3n0ra5l83q63qpg7g563ddihmk"; depends=[GEOquery]; };
-GEOquery = derive { name="GEOquery"; version="2.32.0"; sha256="079f5c6gxms014jqyc41g174qic9ka08j9jk4jlynf7a689hf8v4"; depends=[Biobase]; };
-GEOsubmission = derive { name="GEOsubmission"; version="1.18.0"; sha256="12zk2izm1gliky5lpfzs31ymnv73sal6f2vi15lppfcxklj2zsmx"; depends=[affy Biobase]; };
-GEWIST = derive { name="GEWIST"; version="1.10.0"; sha256="1lh7d2fz1nnadl01iyrflpja04xzl01j1zzpsavmj5m7g8d6l525"; depends=[]; };
-GGBase = derive { name="GGBase"; version="3.28.0"; sha256="05y237f0azkgv8xgl357gf7j8024hjq0padz8wv1slw6p8frsqb8"; depends=[snpStats limma genefilter Biobase BiocGenerics AnnotationDbi GenomicRanges]; };
-GGtools = derive { name="GGtools"; version="5.2.0"; sha256="0ikx3xsx11pdqi1245xqsj3y0r64ry0qbvgdrvv5cjhlgf172qgw"; depends=[GGBase BiocGenerics snpStats Rsamtools AnnotationDbi Biobase VariantAnnotation rtracklayer Gviz S4Vectors IRanges GenomeInfoDb GenomicRanges Biostrings]; };
-GLAD = derive { name="GLAD"; version="2.30.0"; sha256="1wlf2mxay26j9lbnizj2fbs7rhq0qpqrsxm3gzn8dabs01qhm109"; depends=[]; };
-GOFunction = derive { name="GOFunction"; version="1.14.0"; sha256="1p7hfg9apyks9l8swc55x89b556fwf3g259pl4r62yf035jdiw1k"; depends=[Biobase graph Rgraphviz AnnotationDbi Biobase graph Rgraphviz AnnotationDbi]; };
-GOSemSim = derive { name="GOSemSim"; version="1.24.1"; sha256="12qf8ahfchkqs0f37y0hz5yng24myr7svls6s72z9xbmcrzrzmj6"; depends=[AnnotationDbi]; };
-GOSim = derive { name="GOSim"; version="1.8.0"; sha256="1kkj2mg9d4w8kzcy468drk95lvbknjsib68d1v165g0wvbm2hqxw"; depends=[annotate AnnotationDbi topGO RBGL graph]; };
-GOTHiC = derive { name="GOTHiC"; version="1.2.2"; sha256="17lqkd6yi6pzd2q1jaq1fg8qy4shqrn7pj8l8lw92cib2sbhbrgs"; depends=[GenomicRanges Biostrings BSgenome BiocGenerics S4Vectors IRanges ShortRead rtracklayer]; };
-GOexpress = derive { name="GOexpress"; version="1.0.1"; sha256="0yxgcpy6z5dgd3hkgcikbbq30rx682n0arqic8dns5mg6mns428p"; depends=[Biobase biomaRt]; };
-GOstats = derive { name="GOstats"; version="2.32.0"; sha256="12yxqavqvxq5b53fr79czlxmnz9mwbchqcmsmgdvzqdca4kh6b0l"; depends=[Biobase Category graph AnnotationDbi Biobase Category RBGL annotate graph AnnotationForge]; };
-GOsummaries = derive { name="GOsummaries"; version="2.0.0"; sha256="0gikgj4hxy9qrbyy3282x896fch5q67gdi8d2havqqrzi65mfgxa"; depends=[limma]; };
-GRENITS = derive { name="GRENITS"; version="1.18.0"; sha256="1wx8y472jkvszkb0rf944mzb1dzcwqxbf8qwgzmm07s6hcwyi6xg"; depends=[]; };
-GSAR = derive { name="GSAR"; version="1.0.0"; sha256="1pfm6d2av87kq17f1b7gz4fg8krvf237vdap5b6bv7n3lbh2d7p5"; depends=[]; };
-GSCA = derive { name="GSCA"; version="1.4.0"; sha256="0j1n99w7d293kfrc6g96lkvi624d6v85993hfysbcx9nksajkcdw"; depends=[rhdf5]; };
-GSEABase = derive { name="GSEABase"; version="1.28.0"; sha256="1g602vlaw4fxg87w8dczidij58r9fwn3ql68cd51ar5kbz9cr65s"; depends=[BiocGenerics Biobase annotate graph AnnotationDbi]; };
-GSEAlm = derive { name="GSEAlm"; version="1.26.0"; sha256="12qfpwzqd09w25nqi98551vspigzmxzvvbp0bl68zbl937c971v2"; depends=[Biobase]; };
-GSRI = derive { name="GSRI"; version="2.14.0"; sha256="1fsm4zrcqbm14ls3sm8wmbxzmnsn1vn64kl9kkfgijvj0jw92qzs"; depends=[genefilter Biobase GSEABase les]; };
-GSReg = derive { name="GSReg"; version="1.0.0"; sha256="13yxchr44vcfzhmm69xgjhf326n0arjla5qvib3arqa0vs3b10qn"; depends=[]; };
-GSVA = derive { name="GSVA"; version="1.14.1"; sha256="1i8v09yd8ikyicmdcszvinifzp44irkqrz1n58wyhhq6iz32gl87"; depends=[BiocGenerics Biobase GSEABase]; };
-GWASTools = derive { name="GWASTools"; version="1.12.2"; sha256="06g3wbnr70dw7bgbiid4qcjnvvzdvc0vn3mc3i757h8sdd8ina5x"; depends=[Biobase gdsfmt DNAcopy quantsmooth]; };
-GeneAnswers = derive { name="GeneAnswers"; version="2.8.0"; sha256="04hb6ja695c1jn7w47rdbz15qvl74ddq7wvkqxlbz7n670n5vqh3"; depends=[annotate Biobase Heatplus RBGL annotate]; };
-GeneExpressionSignature = derive { name="GeneExpressionSignature"; version="1.12.0"; sha256="04wmgsxbv2gzp0f9bnr3zqmjhjj9ph96jjmvkjldq88ryq8zwlbm"; depends=[Biobase PGSEA]; };
-GeneGA = derive { name="GeneGA"; version="1.16.0"; sha256="18l3mpvadw02gclggx7288jpaim0rkz6h9j3wy6351bj0h1ki4s6"; depends=[]; };
-GeneMeta = derive { name="GeneMeta"; version="1.38.0"; sha256="18lrszvq7a18ndgn1ylgf14xaz9sck3s0f7hhfakgjmm43yg9m2j"; depends=[Biobase genefilter Biobase]; };
-GeneNetworkBuilder = derive { name="GeneNetworkBuilder"; version="1.8.0"; sha256="068y7ak8w62nj3p55cs5kljzfq74m06g7nrbclqjx9jbsa3lpc12"; depends=[graph graph]; };
-GeneOverlap = derive { name="GeneOverlap"; version="1.2.0"; sha256="0yjbclrb1vkpf4jckwggpp4mmq7vh5z0maqy9rswk98a5ybd25lk"; depends=[]; };
-GeneRegionScan = derive { name="GeneRegionScan"; version="1.22.0"; sha256="0x50d1a7h6npkxvwsxl7dv47ww5a0w5frj833hni1j65z62v7h32"; depends=[Biobase Biostrings Biobase affxparser Biostrings]; };
-GeneSelectMMD = derive { name="GeneSelectMMD"; version="2.10.0"; sha256="0n5sa8zz804qkx3rayvw23xf7g96ynavm1jrvka18vcf9jaymy96"; depends=[Biobase Biobase limma]; };
-GeneSelector = derive { name="GeneSelector"; version="2.16.0"; sha256="1prkrn9fjxbklp5mck6fi310y98b79fa7nj1h1s858lcddkm53l5"; depends=[Biobase multtest siggenes limma]; };
-GeneticsDesign = derive { name="GeneticsDesign"; version="1.34.0"; sha256="1ixz68hn11dn83c1dnryj9jaad6gwbnnvn2478njsl9sqca5x1hj"; depends=[]; };
-GeneticsPed = derive { name="GeneticsPed"; version="1.28.0"; sha256="1qw6agvkjm9b747lbvqw24y8gflp4bhkasp2vjizjyjf8jy0br7j"; depends=[]; };
-GenoView = derive { name="GenoView"; version="1.0.0"; sha256="116q5k2byizpd6fax7l0nvlh8fablnmjjphm8kjf5clzc5dqlnyz"; depends=[GenomicRanges ggbio biovizBase]; };
-GenomeGraphs = derive { name="GenomeGraphs"; version="1.26.0"; sha256="0l7gx0fn29wyac0vjsw1wh5j2232ngbzyhb7ihnq8hh1krhsml4s"; depends=[biomaRt]; };
-GenomeInfoDb = derive { name="GenomeInfoDb"; version="1.2.5"; sha256="1rmxk4wyjgycdqc3f7pnyjcz7n1j8w8wkik2qcq50xka4wh2sw0k"; depends=[BiocGenerics S4Vectors IRanges BiocGenerics S4Vectors]; };
-GenomicAlignments = derive { name="GenomicAlignments"; version="1.2.2"; sha256="00kk1gq6iiig9746j9h8ac2l4dvwz824pjy0hs7w5kwysq0szjxz"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges Biostrings Rsamtools BiocGenerics S4Vectors IRanges GenomicRanges Biostrings Rsamtools BiocParallel S4Vectors IRanges]; };
-GenomicFeatures = derive { name="GenomicFeatures"; version="1.18.7"; sha256="0rxll1qvw43gmk0x5hknlmjr3wdnjyc6s6lif60yj1qk1y66ijpx"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges AnnotationDbi Biostrings rtracklayer biomaRt Biobase]; };
-GenomicFiles = derive { name="GenomicFiles"; version="1.2.1"; sha256="0jwj30ppknsgsac3750d3b7f7fp5m3g9px8ghlkvb1chw1x0lhrw"; depends=[BiocGenerics Rsamtools GenomicRanges rtracklayer BiocParallel GenomicAlignments IRanges]; };
-GenomicInteractions = derive { name="GenomicInteractions"; version="1.0.3"; sha256="0hczqam6isn1rw4xn4dxzgvrg11kwzs6ysy5i3xxyzyf23yqjbwf"; depends=[Rsamtools GenomicRanges IRanges rtracklayer]; };
-GenomicRanges = derive { name="GenomicRanges"; version="1.18.4"; sha256="1aaa1wqcyk7jsi4nzg6kyh3awwzi323qnj1ibg2zfqzj9lv6ixqz"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb XVector S4Vectors IRanges]; };
-GenomicTuples = derive { name="GenomicTuples"; version="1.0.0"; sha256="15pwq8zsr20ygy1mwm2q3siljkj51h8cr61n8jcphd8h29xjvhjk"; depends=[GenomicRanges GenomeInfoDb BiocGenerics S4Vectors Biobase]; };
-Genominator = derive { name="Genominator"; version="1.20.0"; sha256="1a9zw05asmrl848yii4bkszj2lsh6jank095g8zcp1yrncdgszi1"; depends=[BiocGenerics IRanges GenomeGraphs]; };
-GlobalAncova = derive { name="GlobalAncova"; version="3.34.0"; sha256="1k8b3p1g7igqynvhq4jpvzcx739q6fk05zahrdxcipi7r58y9f61"; depends=[globaltest annotate AnnotationDbi]; };
-GraphAT = derive { name="GraphAT"; version="1.38.0"; sha256="18zy8d1b5q6v6sx0gpgzbyhwf8h87c5vf4i2zagsjn6k26v12f7g"; depends=[graph graph]; };
-GraphAlignment = derive { name="GraphAlignment"; version="1.30.0"; sha256="0rr4kq3r5wlh8mgn0raggdhc3j59x9k3qnzllm6khhp053gjr32f"; depends=[]; };
-GraphPAC = derive { name="GraphPAC"; version="1.8.0"; sha256="0pgxnhbqq919rawcbpjdy8xd5q22rb34grbfnhq8m0lwd8an9hzr"; depends=[iPAC]; };
-Gviz = derive { name="Gviz"; version="1.10.11"; sha256="0mfwb230xh77a0qkfp6207sack9g3aksw9mrpyhyk35pfzrh4k8m"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges XVector rtracklayer biomaRt AnnotationDbi Biobase GenomicFeatures BSgenome Biostrings biovizBase Rsamtools GenomicAlignments]; };
-HCsnip = derive { name="HCsnip"; version="1.6.0"; sha256="0fc7fn3v2zz6p94n14wj5xamq5c49bdinkrgkm5q9rpdd55hzyah"; depends=[impute sigaR Biobase]; };
-HDTD = derive { name="HDTD"; version="1.0.0"; sha256="16mgcb512q4r49a0jxa24k7cs1ivzaq0638m3xfl8qp64mhycd4n"; depends=[]; };
-HELP = derive { name="HELP"; version="1.24.0"; sha256="02gwdasbkh2gwc2cr1jhsb5w1i4jwfgdrdfgi5a7c76k37wy7m09"; depends=[Biobase]; };
-HEM = derive { name="HEM"; version="1.38.0"; sha256="0hmibyl9jbagr2w1lcy7vcbxbbnqh5r03ya39c0x6sanh9mswbf2"; depends=[Biobase]; };
-HMMcopy = derive { name="HMMcopy"; version="1.8.0"; sha256="1wh3ha3yk79ci1amna3wcm5nmwq1dsvz6qgf72xcnx3x5d6f5v49"; depends=[IRanges geneplotter]; };
-HTSFilter = derive { name="HTSFilter"; version="1.6.0"; sha256="0wmag2q92364fs36y1hjxkkvi0ng408sphra5rk728g5panqh4j6"; depends=[Biobase DESeq edgeR DESeq2 GenomicRanges IRanges]; };
-HTSanalyzeR = derive { name="HTSanalyzeR"; version="2.18.0"; sha256="1gvqzcy6zv984kl29w8vwz6sajz4azk8navlk0vq47crady1x1wq"; depends=[graph GSEABase BioNet cellHTS2 AnnotationDbi biomaRt RankProd]; };
-HTSeqGenie = derive { name="HTSeqGenie"; version="3.16.1"; sha256="0zciancr64d37a9akcr6hkha5f2wkb88jn0grpgs2gdji130pfa0"; depends=[gmapR ShortRead VariantAnnotation BiocGenerics IRanges GenomicRanges Rsamtools Biostrings chipseq GenomicFeatures BiocParallel rtracklayer GenomicAlignments VariantTools]; };
-HTqPCR = derive { name="HTqPCR"; version="1.20.0"; sha256="0z3872svkx86jjygcsqyh7z6a5i5rhrslyn3i2hxixwhscn5kib7"; depends=[Biobase limma affy Biobase limma]; };
-Harshlight = derive { name="Harshlight"; version="1.38.0"; sha256="02q2kyad3613z77sycq0w69lc8jl1a8s99a5lcpir0dviw9brhzc"; depends=[affy altcdfenvs Biobase]; };
-Heatplus = derive { name="Heatplus"; version="2.12.0"; sha256="0hnf9ybrj24nr2hybh4lnxv9lxazzhkz53kd8r3xh2irwvf6mpnq"; depends=[]; };
-HiTC = derive { name="HiTC"; version="1.10.0"; sha256="0brb21jh98a1518hkn7ni93qjcibfi4p2x407xrvfkbb9vdwmk5h"; depends=[IRanges GenomicRanges Biostrings rtracklayer]; };
-HilbertVis = derive { name="HilbertVis"; version="1.24.0"; sha256="06qsmfy0p4m1x4w9az0cw1fh8fr59kzc6sskkzihb2kl51vbjfcz"; depends=[]; };
-HilbertVisGUI = derive { name="HilbertVisGUI"; version="1.24.0"; sha256="14488b09kvap9m6xh93vrbi3d1wla1246sa0siamxvhpvsnl4gs0"; depends=[HilbertVis]; };
-HybridMTest = derive { name="HybridMTest"; version="1.10.0"; sha256="0c4ikl59b7wwygj4xyvcdla3xq5jpfbyvsl9n53fdxk1f5lhr7f1"; depends=[Biobase]; };
-IMPCdata = derive { name="IMPCdata"; version="1.0.0"; sha256="0ga6l0xza2cdl6i5nimqnvm804vmhb9lcn5aizzlcsn575m3nhy5"; depends=[]; };
-INPower = derive { name="INPower"; version="1.2.0"; sha256="0i83nympny2pr2jvxmdhl8wiafamq4dnzpn1np50j0zkgmnjvvny"; depends=[]; };
-IPPD = derive { name="IPPD"; version="1.14.0"; sha256="14yx5rwwihjwx8rpsgkkgmc3bz6pzc91pa0qq8cz1czscj5srca9"; depends=[]; };
-IRanges = derive { name="IRanges"; version="2.0.1"; sha256="1f9xki5b0ypp01ns3y54b21ypi7lk6gdb2368zz6ky3hjnwgq9kc"; depends=[BiocGenerics S4Vectors S4Vectors]; };
-ITALICS = derive { name="ITALICS"; version="2.26.0"; sha256="12h0c89q2f4iq3pma2z8c3kzy63mpzcxdpbj3jmsmdzlr34p2rca"; depends=[GLAD oligo affxparser affxparser GLAD oligo oligoClasses]; };
-Icens = derive { name="Icens"; version="1.38.0"; sha256="02pzhwwhp7l9iv20h928df82c1h647lpdqcdxi8wsfqqayzhb27n"; depends=[]; };
-IdMappingAnalysis = derive { name="IdMappingAnalysis"; version="1.10.0"; sha256="0jdx6xqwv8kx3jb391nzv2qv77qj8vjhx815fgfr09k3nlh9j46l"; depends=[Biobase]; };
-IdMappingRetrieval = derive { name="IdMappingRetrieval"; version="1.12.0"; sha256="05pdmfqb7dk8bd6y09jxaazhwvds62mhbfpwc3rhsv4lzbgkjz47"; depends=[ENVISIONQuery biomaRt ENVISIONQuery DAVIDQuery AffyCompatible]; };
-IdeoViz = derive { name="IdeoViz"; version="1.0.0"; sha256="1641pzxprp5izrh3vlryzwvkxaq2rv58ahb75gwi34ma6qf2v37r"; depends=[Biobase IRanges GenomicRanges rtracklayer GenomeInfoDb]; };
-IsoGeneGUI = derive { name="IsoGeneGUI"; version="2.0.0"; sha256="0jprrffb88rc59ycsf3vk1jcvnprgh17cfymqaws88w0sqb5n7y7"; depends=[multtest geneplotter Biobase]; };
-KCsmart = derive { name="KCsmart"; version="2.24.0"; sha256="1p248qq36csg015k0grnrgyrbzbyclvfp52p9x3fd0zcw05lqi27"; depends=[siggenes multtest BiocGenerics]; };
-KEGGREST = derive { name="KEGGREST"; version="1.6.4"; sha256="1mz0yd2wa55hawmj961phmdcha8hs1q2cxg8sxadbk09k37msgcn"; depends=[Biostrings]; };
-KEGGgraph = derive { name="KEGGgraph"; version="1.24.0"; sha256="15h6mphrx39rvp07qj11b4kys9wx6xlma4z350lic8b9ab3ci4wg"; depends=[graph graph]; };
-KEGGprofile = derive { name="KEGGprofile"; version="1.8.2"; sha256="0wv9s0n8yby88b40l0a6v0vkgplqg6qm12ni45afs1vslfw4d28r"; depends=[AnnotationDbi KEGGREST biomaRt]; };
-LBE = derive { name="LBE"; version="1.34.0"; sha256="0archkaxwiljxp6bsgkils6b66gm9wrvkd2w0nlh712qz7plp1a6"; depends=[]; };
-LMGene = derive { name="LMGene"; version="2.22.0"; sha256="1vl0zyfl6vispk7cll0xfpblabmz71jj07k4csckl64x2imqz199"; depends=[Biobase multtest affy]; };
-LPE = derive { name="LPE"; version="1.40.0"; sha256="181zknwrassnw0iqphqlr9bw2pnzpk05ch4almzj1pcp5l52i5sc"; depends=[]; };
-LPEadj = derive { name="LPEadj"; version="1.26.0"; sha256="0pbq1a5rqwyv1s5bncrymiw1dqf0mwippmc4gn1qzjk609myis8x"; depends=[LPE LPE]; };
-LVSmiRNA = derive { name="LVSmiRNA"; version="1.16.0"; sha256="0s70fkxx4ghhz2d8ammp22brs0066hq2sxwc8fhczs206fvj0x7m"; depends=[BiocGenerics Biobase limma affy vsn]; };
-LiquidAssociation = derive { name="LiquidAssociation"; version="1.20.0"; sha256="0i5bbcyasykxqxsd7i0slx1dhlk9v21v74zsj99n8z6rbds0ggzc"; depends=[Biobase]; };
-M3D = derive { name="M3D"; version="1.1.4"; sha256="0q8b7k40hcd0yb8c5y8wm88azvdj5w3cpmi3x4x5axjid2qx0ms3"; depends=[GenomicRanges IRanges BiSeq]; };
-MAIT = derive { name="MAIT"; version="1.0.0"; sha256="10m59b0l3wsmpwmswbpnx91hf3pl69nq0b2j1iwj03qp7khx6xsk"; depends=[CAMERA xcms]; };
-MANOR = derive { name="MANOR"; version="1.38.0"; sha256="18vvi17zjb034s7w73acy59fpb39kskpzkspwh0q3cggvypaccq9"; depends=[GLAD GLAD]; };
-MBASED = derive { name="MBASED"; version="1.0.0"; sha256="1j0g5qlncvba7rylic4bh1hx19kddxwvjg455fkw5iigpsgny5cc"; depends=[BiocGenerics BiocParallel GenomicRanges]; };
-MBAmethyl = derive { name="MBAmethyl"; version="1.0.0"; sha256="1ahxiajqafaw8p9fw8v9f7g7vcf6h6cj2mpxznc0vbv9wdz1a2l9"; depends=[]; };
-MBCB = derive { name="MBCB"; version="1.20.0"; sha256="19s52g3ck475rdghcmbnk852ki3f050bcb286jz812zia1859px5"; depends=[preprocessCore]; };
-MCRestimate = derive { name="MCRestimate"; version="2.22.0"; sha256="0brkdxqdh631wpa1sr5qxkj0g9g6l8b7257ayndjjj48p30nprj5"; depends=[Biobase]; };
-MEDIPS = derive { name="MEDIPS"; version="1.16.0"; sha256="035jj91wh1j3qzyhi487lwr939z6f88nprs60m0w117082926l32"; depends=[BSgenome DNAcopy Biostrings BSgenome Rsamtools IRanges GenomicRanges edgeR GenomicFeatures DNAcopy biomaRt rtracklayer]; };
-MEDME = derive { name="MEDME"; version="1.26.0"; sha256="0bl8g35y1z7zq8cyq3hy0npgbr015wiw0dbqwfw57n0kckmmk9vc"; depends=[Biostrings]; };
-MEIGOR = derive { name="MEIGOR"; version="1.0.0"; sha256="06dc7v3j39jglpm65nc6b5jf827mz8cjd6fnmbaqdk99kcripqdg"; depends=[CNORode]; };
-MGFM = derive { name="MGFM"; version="1.0.0"; sha256="0qv0851jlpn9xydgf3x0mxdhgbw50adfqqw3gf9sny83rx0vxy4z"; depends=[AnnotationDbi annotate]; };
-MIMOSA = derive { name="MIMOSA"; version="1.2.0"; sha256="1lyxl39cjb58vi7pfzdsxcyw0f4llabax3866pfdalpqh1d8p9yr"; depends=[Biobase]; };
-MLInterfaces = derive { name="MLInterfaces"; version="1.46.0"; sha256="0hc9z07ajda5qhsa20ddalpp1aj9j1hsy59jvam3jdby5hkklin5"; depends=[Biobase annotate genefilter]; };
-MLP = derive { name="MLP"; version="1.14.0"; sha256="0n5gp4qf6x1ahzbigqjabrv8d090byv87vx7wk0al7534lm9c5g7"; depends=[AnnotationDbi affy]; };
-MLSeq = derive { name="MLSeq"; version="1.2.0"; sha256="0kdrlijq4cah7jdqw3fymkv21wp32ra85vv2y71m8m111bf91cm0"; depends=[DESeq2 Biobase limma edgeR]; };
-MMDiff = derive { name="MMDiff"; version="1.6.0"; sha256="0rif1y2i6s91qn6220q3avrddgicsmlsxhh8rls0ri9gsl4f16b7"; depends=[GenomicRanges DiffBind Rsamtools GenomicRanges IRanges Biobase]; };
-MPFE = derive { name="MPFE"; version="1.0.0"; sha256="0lgzcdzasf50r0aj3lgbifq2yqyppbr1q9zgaahc84gg0dybcbyn"; depends=[]; };
-MSGFgui = derive { name="MSGFgui"; version="1.0.2"; sha256="1qklwy9wc81la49fjj8kmwds9d6ydnkgbgb4r3lzyr8k5g4v75ik"; depends=[mzR mzID MSGFplus]; };
-MSGFplus = derive { name="MSGFplus"; version="1.0.5"; sha256="0h0m0rnfr5lyaskrrmdqcv8182hi8gl7nmnqk3fs61a23rf3i8sk"; depends=[mzID]; };
-MSnID = derive { name="MSnID"; version="1.0.1"; sha256="02grqlsqcgv1ricx7wyd4l72s35w1k92m80kkjm4afhx6aqv9wsf"; depends=[MSnbase mzID Biobase mzR]; };
-MSnbase = derive { name="MSnbase"; version="1.14.2"; sha256="1sxkdp41qdih3vz7zakqmws33yhpsggcg30w6sl7p23lmixbkqrl"; depends=[BiocGenerics Biobase mzR BiocParallel IRanges preprocessCore vsn affy impute pcaMethods mzID]; };
-MSstats = derive { name="MSstats"; version="2.4.0"; sha256="0srlcd2k1h23zj3h5g73b3rdbi2hg0mna35mvvv4l4i7k603dxsp"; depends=[MSnbase marray limma preprocessCore]; };
-MVCClass = derive { name="MVCClass"; version="1.40.0"; sha256="1ix9yb97wbhi6577p2kp84c13g8rmikzbqcdc9vd6bp61f3bf484"; depends=[]; };
-MantelCorr = derive { name="MantelCorr"; version="1.36.0"; sha256="1a5m54ljsfgrpbhj9n3yz67s10pspl050a5sjrkq2cvx0hyk4wwg"; depends=[]; };
-MassArray = derive { name="MassArray"; version="1.18.0"; sha256="0lmyfjrak3fm2zmc0k1db4yyb38xzzichb1if3lda6v0wlq86yxn"; depends=[]; };
-MassSpecWavelet = derive { name="MassSpecWavelet"; version="1.32.0"; sha256="16xfcdrsy2c68kib1yicqllzydn8l143n1zxrpzw1zrj32zwdd04"; depends=[]; };
-MeSHDbi = derive { name="MeSHDbi"; version="1.2.7"; sha256="159lx1xgpyn9mj40fnfnz13qjahs18xsvsyj9crfbh5y5q8d308z"; depends=[AnnotationDbi Biobase]; };
-MeasurementError_cor = derive { name="MeasurementError.cor"; version="1.38.0"; sha256="1q5y46sjd4gbb9sckhkjjj6kb4df511f9822dbibdccav9y9pfgq"; depends=[]; };
-MergeMaid = derive { name="MergeMaid"; version="2.38.0"; sha256="0y3qa7hw9c74x7q1j5nmy21xp7rp5bgkgngc4yk3kkd8z8ik2kvi"; depends=[Biobase]; };
-Metab = derive { name="Metab"; version="1.0.0"; sha256="0rlr1dckg07qd76cfsdyjna0phjcbcqsqdbbciyv774cb7fhca0j"; depends=[xcms]; };
-MethylAid = derive { name="MethylAid"; version="1.0.2"; sha256="0rsv93k3j61q237sh65b69k3d81abd7zq7nxvklwkyyhyyp25p7c"; depends=[BiocParallel minfi]; };
-MethylMix = derive { name="MethylMix"; version="1.0.0"; sha256="0yqgsh7y6qxlvq3d7j8ywdxflmrr2p6pfdlgblmfydcg64hv3c49"; depends=[]; };
-MethylSeekR = derive { name="MethylSeekR"; version="1.6.0"; sha256="1dlrnmraslmr51zvfdbssizgc7h4kldb480vvaak3kzqs3k1lsfv"; depends=[rtracklayer IRanges BSgenome GenomicRanges geneplotter]; };
-Mfuzz = derive { name="Mfuzz"; version="2.26.0"; sha256="1x1jz0x6l38ssil5zassxa6dvm4m4fq904vdhjnivqhl2akcabvh"; depends=[Biobase tkWidgets]; };
-MiChip = derive { name="MiChip"; version="1.20.0"; sha256="17cjxg487fhb2fv3cj9fkswbdv9fflnj530kksxckmx759pzv5xb"; depends=[Biobase Biobase]; };
-MiPP = derive { name="MiPP"; version="1.38.0"; sha256="1m3c6x412hzhkf1i8w708qj099ag9sikvsdll1n9gp174asg5idn"; depends=[Biobase]; };
-MiRaGE = derive { name="MiRaGE"; version="1.8.0"; sha256="1kcjlja6bmgkwx8l1mywf3n36a9gwx04gzppb3x89hrkrhip95m9"; depends=[Biobase AnnotationDbi BiocGenerics]; };
-MineICA = derive { name="MineICA"; version="1.6.0"; sha256="08qy899p44j4kgrwllyvqp6wd1z1gzq9krm46n2i84kdkz5vqy1i"; depends=[Biobase biomaRt GOstats marray Rgraphviz graph annotate AnnotationDbi lumi]; };
-MinimumDistance = derive { name="MinimumDistance"; version="1.10.2"; sha256="1c8skic7m2hiyccbg2iclrlgq8h3ra3d23j9b4iliwhpjqip1y8j"; depends=[oligoClasses S4Vectors VanillaICE Biobase DNAcopy BiocGenerics IRanges GenomicRanges GenomeInfoDb]; };
-Mirsynergy = derive { name="Mirsynergy"; version="1.2.0"; sha256="00y510f0c4w9cmaymm5l59j0yjiv9jwcv5ihds83c5x2hpivzv84"; depends=[]; };
-MmPalateMiRNA = derive { name="MmPalateMiRNA"; version="1.16.0"; sha256="0jg925daxwhr99dxp841w5z20cgpc185n0w1n8nnjwpyah950v83"; depends=[Biobase limma vsn limma Biobase]; };
-MoPS = derive { name="MoPS"; version="1.0.0"; sha256="18bxh9jwdm85nb3v4sn8k55fl8hv79h80f3dy0d10vfpwjf9aabi"; depends=[Biobase]; };
-MotIV = derive { name="MotIV"; version="1.22.0"; sha256="154k9y42r42mfbiz3pqc80789d19d9fchrdcij71hxz0r0jr1mji"; depends=[BiocGenerics IRanges Biostrings rGADEM]; };
-MotifDb = derive { name="MotifDb"; version="1.8.0"; sha256="0yxvv4mz4bj6iyn8whzkn59gbb0cm8nik9l8076jwa2nhmgwnkzd"; depends=[BiocGenerics S4Vectors IRanges Biostrings rtracklayer]; };
-Mulcom = derive { name="Mulcom"; version="1.16.0"; sha256="129gw95zqkfalnvslzx6k99qy7l0fgimb96ghlghdv2rj4xjhiwg"; depends=[Biobase]; };
-MultiMed = derive { name="MultiMed"; version="1.0.0"; sha256="1lhf0dj3xw52d0glqgij42qjyzqwwb1jkjcnqgc8ign22smz1bx0"; depends=[]; };
-NCIgraph = derive { name="NCIgraph"; version="1.14.0"; sha256="0d6pigamrib2q8j5zg9i84rl43q4hlg2m29q37zf6m4y1m9dffy4"; depends=[graph graph KEGGgraph RBGL RCytoscape]; };
-NGScopy = derive { name="NGScopy"; version="1.0.0"; sha256="0xyr2zspg9vghc2cmrczrb2v0qjzks649vysl716ccynl9yk4ccd"; depends=[]; };
-NOISeq = derive { name="NOISeq"; version="2.8.0"; sha256="04qz721khji40lr3w8bjddxkvvyr85d2z094sj64ylfkjyxzdmhf"; depends=[Biobase]; };
-NTW = derive { name="NTW"; version="1.16.0"; sha256="0wflyx2vdaffk56nbik5yrbp73yvalf44v7m5y9cndxywq9713iy"; depends=[]; };
-NarrowPeaks = derive { name="NarrowPeaks"; version="1.10.0"; sha256="0d1rmvzy1cd2ivlazr1fvls4jcp81j00dpxh7mnkzla2gbjspvac"; depends=[BiocGenerics S4Vectors IRanges GenomicRanges GenomeInfoDb CSAR]; };
-NetPathMiner = derive { name="NetPathMiner"; version="1.2.0"; sha256="04bz4y8vvciqdhmmicj93igw71hzyxq6aak88qdj5ks7ihplllbm"; depends=[]; };
-NetSAM = derive { name="NetSAM"; version="1.6.0"; sha256="1gqazmm9arqv8kn0lfs12r1dl8w19mivfr682rqhcvizdpczij7s"; depends=[graph]; };
-NormqPCR = derive { name="NormqPCR"; version="1.12.0"; sha256="0g4x33bjg35bxxw1024fsp6fbfrsj16sk5ihnghgwg927jdypmn2"; depends=[Biobase ReadqPCR]; };
-NuPoP = derive { name="NuPoP"; version="1.16.0"; sha256="065a63fy62gqsrnzxw26fch0gs3xgilcvbc7zhcp5klyndzalr30"; depends=[]; };
-OCplus = derive { name="OCplus"; version="1.40.0"; sha256="09g03mrzby4rv0xkb705camnhyqgmlg7p2xzcsac5ncci05ivhc3"; depends=[multtest]; };
-OLIN = derive { name="OLIN"; version="1.44.0"; sha256="0rah35s96slcddggs56cinvv8p764r8k09i5wgz7irk6q39v21rz"; depends=[marray limma marray]; };
-OLINgui = derive { name="OLINgui"; version="1.40.0"; sha256="052ngldrq80qjkxjfkb68d0g5xv29s02h4n56cqjnydkhjnyfc50"; depends=[OLIN marray OLIN tkWidgets widgetTools]; };
-OSAT = derive { name="OSAT"; version="1.14.0"; sha256="0mm67jd79slz8d0laswiljbvc6s4iii516wfpl9mlkrfrnyymr4l"; depends=[]; };
-OTUbase = derive { name="OTUbase"; version="1.16.0"; sha256="1a4ynx9lwkphgqg9s7m5x6vs9swk4pvfrq9a222ry9mx4019v240"; depends=[S4Vectors IRanges ShortRead Biobase Biostrings]; };
-OmicCircos = derive { name="OmicCircos"; version="1.4.0"; sha256="07kyi4ag39bnpalgv1p88hy6270q0l2y5w806p9p7j1y9n5w5bmc"; depends=[GenomicRanges]; };
-OncoSimulR = derive { name="OncoSimulR"; version="1.0.0"; sha256="1dy8xfmh61g678hihnzjgjc5p55y41n40hp2vygx1hi19sha5fm9"; depends=[graph Rgraphviz]; };
-OrderedList = derive { name="OrderedList"; version="1.38.0"; sha256="1zxz154jqcm39w05cc96kik7g7s1274bm24i7v137jrcgr21yih0"; depends=[Biobase twilight Biobase twilight]; };
-OrganismDbi = derive { name="OrganismDbi"; version="1.8.1"; sha256="0j2d3gpp49nh0igzbwjkrccqyxnwdg2i4s4gch6hkbnyj2v3bdhs"; depends=[AnnotationDbi GenomicFeatures BiocGenerics graph RBGL AnnotationDbi]; };
-OutlierD = derive { name="OutlierD"; version="1.30.0"; sha256="0xww3z8zjyypzrbgn0knlmpa0xg05clzwwihq5fxn7kj5db7nw46"; depends=[Biobase]; };
-PAA = derive { name="PAA"; version="1.0.0"; sha256="0zsr8gd61g9imi2ns1wzz8k3zhcqrgxa6671fc8mrr5zzdlj17pd"; depends=[limma sva]; };
-PADOG = derive { name="PADOG"; version="1.8.0"; sha256="0cjbpq55zx8xd44fk02chfi2fn7m0z3kg9nn6vls4awb3p8ih3bk"; depends=[limma AnnotationDbi Biobase limma AnnotationDbi Biobase]; };
-PANR = derive { name="PANR"; version="1.12.1"; sha256="0k9ysn0yi7daqklsjdxkiqqp2i5ha8bx20jxfyipva0x83gvx1l1"; depends=[]; };
-PAPi = derive { name="PAPi"; version="1.6.1"; sha256="0i7gazmpg3izfc8ha7snk3f03d2na5rxd4jddbhy84ccgc44ddb1"; depends=[KEGGREST]; };
-PAnnBuilder = derive { name="PAnnBuilder"; version="1.30.1"; sha256="03qxq3wnyknxavladqvpyci0xnwh72paq8wl2ci6vjr6xrwdlb6h"; depends=[Biobase AnnotationDbi Biobase AnnotationDbi]; };
-PCpheno = derive { name="PCpheno"; version="1.28.0"; sha256="14lf4jhbslx64bppfk5hxj7i2brdxzrw1hcyzdy69f1sb2wlgjcp"; depends=[Category ScISI SLGI ppiStats annotate AnnotationDbi Biobase Category graph GSEABase ScISI]; };
-PECA = derive { name="PECA"; version="1.2.0"; sha256="096km1yla9cbpf90fiz75zz07nnm83lnfi95k73whyh8rs10wpn4"; depends=[limma affy genefilter preprocessCore]; };
-PGSEA = derive { name="PGSEA"; version="1.40.0"; sha256="11z4hdfddwhjdp0nf7q9k390x63ig9y110c59y3fd04ylqpc6y0b"; depends=[AnnotationDbi annaffy Biobase]; };
-PICS = derive { name="PICS"; version="2.10.0"; sha256="0y3i4q2ydsc0q99iij9hcs4m7y27rvqw7z0hk21p4xary24z0xzj"; depends=[BiocGenerics IRanges GenomicRanges Rsamtools GenomicAlignments]; };
-PING = derive { name="PING"; version="2.10.0"; sha256="1b0vygpl3vs46frjxwjdbc7dg5bllvm0kdcyw642ay7c8shbfzk4"; depends=[chipseq IRanges GenomicRanges PICS Gviz BSgenome BiocGenerics]; };
-PLPE = derive { name="PLPE"; version="1.26.0"; sha256="0knww741zh3yb2wr9wnncw77q7iwgcw08wfwdjpg3z0gj8jx926g"; depends=[Biobase LPE]; };
-PREDA = derive { name="PREDA"; version="1.12.0"; sha256="0p42nkgxxv6bj6lvvbldb5yw1bxa0vclziyyvd560j1fvh8f8qna"; depends=[Biobase multtest annotate]; };
-PROMISE = derive { name="PROMISE"; version="1.18.0"; sha256="15b34cymhcpd3qlvg0rbfp478bq37f7z6y8b96f4y6wnf6a1il54"; depends=[Biobase GSEABase Biobase GSEABase]; };
-PROcess = derive { name="PROcess"; version="1.42.0"; sha256="18gr05ws2nvq05jwk45fmck541r7qrlcf5v9wgkgwcbbyfqyjpyr"; depends=[Icens Icens]; };
-PSEA = derive { name="PSEA"; version="1.0.0"; sha256="1ncjdvp9qdx0xiqz7m3ri9jpdcj8p7760ngcdi7f6h4lnhs94d16"; depends=[Biobase]; };
-PSICQUIC = derive { name="PSICQUIC"; version="1.4.5"; sha256="1b17dazaw8i0v6srxv9llh1hhmh1wq3d63sajjmqwvrwpw5i69jl"; depends=[IRanges biomaRt BiocGenerics]; };
-PWMEnrich = derive { name="PWMEnrich"; version="4.2.0"; sha256="1svpl0cawfzj9749jc7sl66spb455b5ja2n2bjcp9mwns8z4s92z"; depends=[BiocGenerics Biostrings seqLogo]; };
-PathNet = derive { name="PathNet"; version="1.6.0"; sha256="0l16vaj3f4h5x0kf4njnblnrd6pmdpjya97pw48zgi85ws64473k"; depends=[]; };
-Pbase = derive { name="Pbase"; version="0.4.0"; sha256="0cin9kkdmcyasaxpn8608k5j10hqp8lkmgjwymvdw4v508ych73k"; depends=[BiocGenerics Gviz cleaver Biobase Biostrings IRanges S4Vectors mzID mzR MSnbase Pviz]; };
-PhenStat = derive { name="PhenStat"; version="2.0.1"; sha256="1qpdcch32mg7rmjbklgq7bkc6hrw20dqanl7xkglzzf1wi19pmnn"; depends=[limma]; };
-Polyfit = derive { name="Polyfit"; version="1.0.0"; sha256="0dg48simy02fhmk49vinqn7x9cl83akr78s0zcs7v1v0ggv642qa"; depends=[DESeq]; };
-ProCoNA = derive { name="ProCoNA"; version="1.4.1"; sha256="1llkls9wbjmngz15pip92xpn2x66vhy5wl5qbc3zw44vnx2352lg"; depends=[MSnbase BiocGenerics GOstats]; };
-Pviz = derive { name="Pviz"; version="1.0.0"; sha256="0chiz5rfqpq90d63jbys9884jxhk5i9vb0ag4n41x1bgl65wdskd"; depends=[Gviz biovizBase Biostrings GenomicRanges IRanges]; };
-QDNAseq = derive { name="QDNAseq"; version="1.2.4"; sha256="04arnk1qvad0mh4vz7z1akddw44xjz7v761366xvww5zkjq1lx0w"; depends=[Biobase CGHbase CGHcall DNAcopy Rsamtools]; };
-QUALIFIER = derive { name="QUALIFIER"; version="1.10.0"; sha256="00i06qcqf1ywrzg48cs1f7fjwmkb9y8bysbi9m0kn6mqg0vd98l3"; depends=[flowCore flowViz ncdfFlow flowWorkspace flowCore flowViz flowWorkspace Biobase]; };
-QuasR = derive { name="QuasR"; version="1.6.2"; sha256="02jgxh73pyl5zmzbaj65a2bsmfw9csyqlkmxqxnh63g1c20b6xbl"; depends=[GenomicRanges Rbowtie zlibbioc BiocGenerics S4Vectors IRanges BiocInstaller Biobase Biostrings GenomicRanges BSgenome Rsamtools GenomicFeatures ShortRead GenomicAlignments Rsamtools]; };
-R453Plus1Toolbox = derive { name="R453Plus1Toolbox"; version="1.16.0"; sha256="1xb3jmcb6jkxg0w3i4zaqbydnim5im6l9v54kmcysknw2b7y3sxf"; depends=[Biobase Biostrings GenomicRanges BiocGenerics biomaRt BSgenome IRanges XVector Rsamtools ShortRead VariantAnnotation]; };
-RBGL = derive { name="RBGL"; version="1.42.0"; sha256="1a2pc0a6mmw50wznbh9qpwyfy9c0rkl41a9rsvzx85y9wlysv6fl"; depends=[graph]; };
-RBioinf = derive { name="RBioinf"; version="1.26.0"; sha256="10mx0qqhwhqcrilyfilbrk0xfq4szgi8gp85nqsx4iipha6i1i2y"; depends=[graph]; };
-RCASPAR = derive { name="RCASPAR"; version="1.12.0"; sha256="1laj2pg2q761y7l91wdn6dm24rb22vk52ckx91r6pm13gdj3ma41"; depends=[]; };
-RCytoscape = derive { name="RCytoscape"; version="1.16.0"; sha256="0yswjdw1q5qai7a0g2ncqx166vl409kv95wc255284b1iljyd21y"; depends=[graph BiocGenerics]; };
-RDAVIDWebService = derive { name="RDAVIDWebService"; version="1.4.0"; sha256="0r460vd2q4xvri9piqkdfka4wq95h12gs8py1ybkvbwdl4sxvflx"; depends=[graph GOstats Category RBGL]; };
-RDRToolbox = derive { name="RDRToolbox"; version="1.16.0"; sha256="0jiyxw1pdbsjlmkxqgxs9ib3ap8n7mrgnxccvgj854khv92lw1gq"; depends=[]; };
-REDseq = derive { name="REDseq"; version="1.12.0"; sha256="0wkwkcfhqmbzxmwz7h396skirywwpdrbax8hdwmj0c4c6w612ccp"; depends=[BiocGenerics multtest Biostrings BSgenome ChIPpeakAnno BiocGenerics AnnotationDbi Biostrings ChIPpeakAnno IRanges multtest]; };
-RGSEA = derive { name="RGSEA"; version="1.0.0"; sha256="150cqysn5n689b86cp1ib4zh75h7w04xi96fnyd6mky11vy0c5yc"; depends=[BiocGenerics]; };
-RGalaxy = derive { name="RGalaxy"; version="1.10.0"; sha256="1p9dcxp2xqvcxdl3gikbf89n1mhhhpkqhd6drxmljgxbj790paxz"; depends=[BiocGenerics Biobase]; };
-RIPSeeker = derive { name="RIPSeeker"; version="1.6.0"; sha256="04kfxwp6h6iw60v1hacaj054r2l2v1p3csv4rvhirdiwdcgljfxp"; depends=[IRanges GenomicRanges Rsamtools GenomicAlignments rtracklayer]; };
-RLMM = derive { name="RLMM"; version="1.28.0"; sha256="1hdmqbvp7p3svldbb25kn2498y93807aj5b2qi72vdrf4wpxjabj"; depends=[]; };
-RMassBank = derive { name="RMassBank"; version="1.8.1"; sha256="09yd8zc9ba2mf9cws99cpg330h6gryszn0pclvq9jn2azdvqag68"; depends=[mzR]; };
-RNASeqPower = derive { name="RNASeqPower"; version="1.6.0"; sha256="1am0y36v29lig3d52a68kdivv5bwabfaxd6npmm4xsdqfafyffrs"; depends=[]; };
-RNAinteract = derive { name="RNAinteract"; version="1.14.0"; sha256="1hjn6vhkal5k1m15sjnr4zf5r90mj9mchscim2818xc7cbw5bqzy"; depends=[Biobase cellHTS2 geneplotter limma splots]; };
-RNAither = derive { name="RNAither"; version="2.14.0"; sha256="1izlnxlbjcsvdlhji93sv4ap8n5qqai8pyk3npnawrci2b50niiz"; depends=[topGO RankProd prada geneplotter limma biomaRt splots]; };
-ROC = derive { name="ROC"; version="1.42.0"; sha256="0g1whrm9c0x8aqa01am3gr0kjnm6gryvwfw430dj2hcrvsjpwg4j"; depends=[]; };
-ROntoTools = derive { name="ROntoTools"; version="1.6.1"; sha256="0a72nkx8ichc35hl9iwc5rf2d4mm2rd39nlvb1pjag3lp65wa3ax"; depends=[graph KEGGREST KEGGgraph Rgraphviz]; };
-RPA = derive { name="RPA"; version="1.22.0"; sha256="015slb9g3my3hv59ja4czvi2bcxf30ldgy8nazn6qmph78pdbm9b"; depends=[affy]; };
-RRHO = derive { name="RRHO"; version="1.6.0"; sha256="1i1i0kk6la20hd0gk9q5pai7lrzxjz6dj10wiylgg2bg63dkqbm4"; depends=[]; };
-RSVSim = derive { name="RSVSim"; version="1.6.1"; sha256="1xqgl0xq90ax42y5yhfk6v5py5nsgm0mms8rx87fyb3zg2aihx4y"; depends=[Biostrings GenomicRanges IRanges ShortRead]; };
-RTCA = derive { name="RTCA"; version="1.18.0"; sha256="14q30yf6lxwn5nnn4p9hsqsc2i10vfki0hl6slz6nw5nszc1bkf8"; depends=[Biobase]; };
-RTN = derive { name="RTN"; version="1.4.1"; sha256="1fh14m8zk6rl5bbwldbvysrl8csn9wczb8aicsiscndqdi9914v4"; depends=[RedeR minet limma IRanges]; };
-RTopper = derive { name="RTopper"; version="1.12.0"; sha256="1cghjbz2nwamvny858p8xg6azzgwqr7922dk6iiczyl7brvgmf5r"; depends=[Biobase limma multtest]; };
-RUVSeq = derive { name="RUVSeq"; version="1.0.0"; sha256="19c5shg278zaqhnhq7kx6xf8i34g42lcd2ri26y6rkg870lbs5f0"; depends=[EDASeq edgeR]; };
-RUVnormalize = derive { name="RUVnormalize"; version="1.0.0"; sha256="1s5a1dw99qvxrm0dhgy973nwrpif7hgqzq4x8x9ydy6p8s7fj07k"; depends=[Biobase]; };
-RWebServices = derive { name="RWebServices"; version="1.30.0"; sha256="0k9270arzhj6l5vnk2m7dw52nb6py2kgdlrdl2yazbjw4xsi7c9l"; depends=[SJava TypeInfo SJava]; };
-RamiGO = derive { name="RamiGO"; version="1.12.1"; sha256="1hdcfmhwm4laap8pxpda3q19fz76xh1zw5wssvagji17x2l0pqiy"; depends=[RCytoscape graph]; };
-RankProd = derive { name="RankProd"; version="2.38.0"; sha256="15d0v1pzz5z75w28mi5a67q319zdcjs770w4vmr6vdq366v5ai6v"; depends=[]; };
-Rariant = derive { name="Rariant"; version="1.2.0"; sha256="1gli9ill961hblxgw8d33bz462rnas0v4jclnclslfvvlbji27lc"; depends=[GenomicRanges VariantAnnotation IRanges ggbio exomeCopy SomaticSignatures Rsamtools GenomeInfoDb S4Vectors]; };
-RbcBook1 = derive { name="RbcBook1"; version="1.34.0"; sha256="05bsnvvvm5xs3vrm0v6jggsmf4d31kzz0aga76scxf66wzvwdnq0"; depends=[Biobase graph]; };
-Rbowtie = derive { name="Rbowtie"; version="1.6.0"; sha256="0bjiwrl8dvwmilq85w18lm47a7xji5rmgzy7pfxyb836i75qn70v"; depends=[]; };
-Rcade = derive { name="Rcade"; version="1.8.0"; sha256="00rr2gznlfxkq0dlfpc9d62y84av3z7vrrph4yyh8kaz5pyd9qjn"; depends=[GenomicRanges baySeq Rsamtools S4Vectors]; };
-Rchemcpp = derive { name="Rchemcpp"; version="2.4.0"; sha256="0kfhn3ry6w5d5wl6asz96662sb7abxhy97q2g3p19qig04v00kdl"; depends=[ChemmineR]; };
-RchyOptimyx = derive { name="RchyOptimyx"; version="2.6.0"; sha256="1q9gsmy84lk869j1d6jabdpi0z8ahhpcya62fy965mza901q9cin"; depends=[Rgraphviz graph flowType]; };
-Rcpi = derive { name="Rcpi"; version="1.2.0"; sha256="02p4k91472lxrd2l0q1vs1zycbh2gjndc4wmgpkfvzakfcyr7vxr"; depends=[Biostrings GOSemSim ChemmineR fmcsR]; };
-Rdisop = derive { name="Rdisop"; version="1.26.0"; sha256="1d96mwc26nplax0063mz5ymz4x72vcd8zhsyn06c41r3j7ql6xl3"; depends=[]; };
-ReQON = derive { name="ReQON"; version="1.12.0"; sha256="11b3b6s0i0kj8r3nadl6ckqsx7zqgapgwkivxd5wzswrrznpjjiz"; depends=[Rsamtools seqbias]; };
-ReactomePA = derive { name="ReactomePA"; version="1.10.1"; sha256="0spq6zvvnjcxs9k7rfj27af7yb442md82r5bcyjp0vjn5l1g4ph7"; depends=[DOSE AnnotationDbi graphite]; };
-ReadqPCR = derive { name="ReadqPCR"; version="1.12.0"; sha256="1cy58aappyydqwan7jwaq2mr32pcy0xl2zzp8fzfvirjbrvj5d0f"; depends=[Biobase affy Biobase]; };
-RedeR = derive { name="RedeR"; version="1.14.10"; sha256="1aijy1mzkpbjcgsjirqmjbw6gblgpb456sby5yzgqlnz5jqbh13j"; depends=[]; };
-RefNet = derive { name="RefNet"; version="1.2.1"; sha256="0960aj6lmxnam8763nlqiz8acxm7d2lz9vn49zwh68lb4rpv8qqd"; depends=[IRanges PSICQUIC AnnotationHub BiocGenerics]; };
-RefPlus = derive { name="RefPlus"; version="1.36.0"; sha256="160i2zcfr9a1znx01bnssdj7737mvpmnkkycixs5npzy06hkf5mb"; depends=[Biobase affy affyPLM preprocessCore]; };
-Repitools = derive { name="Repitools"; version="1.12.1"; sha256="1b6c87248z1f28v67zl3h6i7nfd0sxyc1hrbfv9xkkq1092fybms"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges GenomicAlignments BSgenome edgeR DNAcopy Ringo Biostrings Rsamtools rtracklayer]; };
-ReportingTools = derive { name="ReportingTools"; version="2.6.0"; sha256="1pk9qp65awffp7nfj71hppqr6nfcakfxp36bmbssjfirycdzj7qx"; depends=[Biobase Category GOstats limma AnnotationDbi edgeR annotate GSEABase BiocGenerics DESeq2 ggbio IRanges]; };
-Rgraphviz = derive { name="Rgraphviz"; version="2.10.0"; sha256="1hs1vqix0frwyrrcmvgn9jjr8vzdflag5yc6l1fsslg99c5dmlys"; depends=[graph]; };
-Ringo = derive { name="Ringo"; version="1.30.0"; sha256="1krh2c5wqlc32i7s5wwggzba533i74d2zfxn9gic1k2mjnrax7b5"; depends=[Biobase limma BiocGenerics genefilter limma vsn]; };
-Risa = derive { name="Risa"; version="1.8.0"; sha256="0iv7v93yikkxk63cjvi80a24akf0gfd24h8bswpl8vqib2nxj74l"; depends=[Biobase biocViews affy xcms]; };
-Rmagpie = derive { name="Rmagpie"; version="1.22.0"; sha256="14v9kif2srbmqw2dpyrh8kr1598n63zr5d0lx2r57c4jh5g0cg9p"; depends=[Biobase Biobase]; };
-RmiR = derive { name="RmiR"; version="1.22.0"; sha256="0hgg6xjj6jjgizs1qgjx3cgqky188z1b5kqdvf2ryhcn7gjyym2r"; depends=[]; };
-Rnits = derive { name="Rnits"; version="1.0.0"; sha256="1v41764jb3q4is99w6ykdihxva8imma6zid16k56xg9b331pnz43"; depends=[Biobase limma affy impute qvalue]; };
-Roleswitch = derive { name="Roleswitch"; version="1.4.1"; sha256="1halab8xr5z4kwnirxrmax72ncsw5cmjh7wg9364kjyrgcrkn8am"; depends=[microRNA biomaRt Biostrings Biobase]; };
-Rolexa = derive { name="Rolexa"; version="1.22.0"; sha256="0864zas9kbdi3vsw4la08zdf62xnbrfdbghvvfva2kagn783h6l5"; depends=[ShortRead Biostrings IRanges ShortRead]; };
-RpsiXML = derive { name="RpsiXML"; version="2.8.0"; sha256="0280clvvshkidkx8xixdn215023rf6xvjhmh3h3gdr7q9msmz4q8"; depends=[annotate graph Biobase RBGL hypergraph AnnotationDbi]; };
-Rqc = derive { name="Rqc"; version="1.0.4"; sha256="1wv1yvczxq5jmp3q01yfmkl0w4xq0p1flm2mvi17lfdm4xnh1xlj"; depends=[BiocParallel ShortRead BiocGenerics Biostrings IRanges S4Vectors BiocStyle]; };
-Rsamtools = derive { name="Rsamtools"; version="1.18.3"; sha256="14bpdz9yad10dvb49921di3ci8d32y76c3034xqcnnkdcdzcvbsb"; depends=[S4Vectors IRanges GenomeInfoDb GenomicRanges XVector Biostrings BiocGenerics zlibbioc S4Vectors IRanges XVector Biostrings]; };
-Rsubread = derive { name="Rsubread"; version="1.16.1"; sha256="0zxvhj25hmd9496wfmc1dp9kaf84640z8xkgyck7llhq80cd4d3a"; depends=[]; };
-Rtreemix = derive { name="Rtreemix"; version="1.28.0"; sha256="0gshbb9gxzi3gdxjlp9g920dmy6hdp59ddlb6pyiva33pq9yhpz0"; depends=[graph Biobase]; };
-S4Vectors = derive { name="S4Vectors"; version="0.4.0"; sha256="0y3bqkx1jg6xr0b24hd5akj61yjwnmzafld81ic5hi7kz8rncsca"; depends=[BiocGenerics BiocGenerics]; };
-SAGx = derive { name="SAGx"; version="1.40.0"; sha256="09vx06m974max7l2wm7d42xsbwayapkfi4nzc83n7nykkx7vqpx3"; depends=[multtest Biobase]; };
-SANTA = derive { name="SANTA"; version="2.2.0"; sha256="013bvam139ch20rr774rf1nsssl1y0ckaizsn0ryqpgvrlc78ik7"; depends=[]; };
-SBMLR = derive { name="SBMLR"; version="1.62.0"; sha256="0fx0354iqp7m6g42pq9xb34vzy55vqwdh2sxsha835whz5db96vh"; depends=[]; };
-SCAN_UPC = derive { name="SCAN.UPC"; version="2.8.1"; sha256="1ky1bp4856dk9hsrvij9k9yr0ygzvx1wmn25jk56lk80kzyybx9m"; depends=[Biobase oligo Biostrings GEOquery affy affyio sva IRanges]; };
-SGSeq = derive { name="SGSeq"; version="1.0.6"; sha256="08ngcqr5h0q2y37s0vqcafjyxa5p2shf1zmsydynrghvmfbjlksl"; depends=[BiocParallel GenomicRanges IRanges AnnotationDbi BiocGenerics Biostrings GenomicAlignments GenomicFeatures GenomeInfoDb Rsamtools rtracklayer S4Vectors]; };
-SIM = derive { name="SIM"; version="1.36.0"; sha256="1d6nv0wszar176lr42jwz2mab5fm7v39sany0gcfqypdw1bb94i4"; depends=[globaltest quantsmooth]; };
-SJava = derive { name="SJava"; version="0.92.1"; sha256="0d5v3wvky06f8sd0hr39sw61f2a084winjqy4cd8vkmnxh6y8xcf"; depends=[]; };
-SLGI = derive { name="SLGI"; version="1.26.0"; sha256="1b47jz7bgccm345mip5b628cnk2qwd3z0177nyx7lkkx8pyb0fp0"; depends=[ScISI AnnotationDbi Biobase ScISI BiocGenerics]; };
-SLqPCR = derive { name="SLqPCR"; version="1.32.0"; sha256="02px4mkqp6mj7bkakqnp85p77ipway96k91jznf3vcingsd52d25"; depends=[]; };
-SMAP = derive { name="SMAP"; version="1.30.0"; sha256="0i44gpvc9939q3vyi45d1a7ixpsrc448bf0dmsnrzljgqzv322cv"; depends=[]; };
-SNAGEE = derive { name="SNAGEE"; version="1.6.0"; sha256="0ngmcgsf39y3v7pmaxcqgzbndmcc3n8cwzf29qh698nixbqr3q5b"; depends=[]; };
-SNPRelate = derive { name="SNPRelate"; version="1.0.1"; sha256="1l4kq76fg7hvqwc7h954rz8880cc0vhgljf6kgi05v7g1yz3bq4v"; depends=[gdsfmt gdsfmt]; };
-SNPchip = derive { name="SNPchip"; version="2.12.0"; sha256="0fww0gdpn2vq9n7mlsd72hk55va5vdrn606190skh8v6xh5d3ns1"; depends=[oligoClasses Biobase GenomicRanges IRanges GenomeInfoDb]; };
-SPEM = derive { name="SPEM"; version="1.6.0"; sha256="0wkkk473cwvarws9sfk85v2n6cx2dl1fsgs9ai52d9lnnwjf7ixa"; depends=[Biobase]; };
-SPIA = derive { name="SPIA"; version="2.18.0"; sha256="1k45hbdgwrfbaz5h02d37599bbxx5lfnisbh3hzmzi00jfvjlg54"; depends=[KEGGgraph]; };
-SQUADD = derive { name="SQUADD"; version="1.16.0"; sha256="117cdn7xy8priy7g06r57dbby1sq43ln9x6mc126szig89hp4wsr"; depends=[]; };
-SRAdb = derive { name="SRAdb"; version="1.20.13"; sha256="0h1v4bz3syzh2z9p832fp981fkq5yzf4yvrpprfghpbsqmqhq1xh"; depends=[graph GEOquery]; };
-SSPA = derive { name="SSPA"; version="2.6.0"; sha256="1svgzxlk64lhha8j00nji8jzihd6172jizk78m5wxy28cvcpngjs"; depends=[qvalue limma]; };
-STAN = derive { name="STAN"; version="1.0.0"; sha256="0q0d0yyzs549vhpxk4lmxjhih97a6k4r7xxlq7mmrhja6ylm7sh7"; depends=[]; };
-STATegRa = derive { name="STATegRa"; version="1.0.0"; sha256="0vi268m7b7l9pmxmi705920pygkfxmq2lqy9gijbzrf3gb8m0l5v"; depends=[Biobase]; };
-STRINGdb = derive { name="STRINGdb"; version="1.5.5"; sha256="0bds67n1bdin2cjiswdlpc8f0nw4j9px17255j8qmz5saf2yflgl"; depends=[]; };
-SamSPECTRAL = derive { name="SamSPECTRAL"; version="1.20.0"; sha256="043wxqdmafs96xnwzvjj1xfccg7nzkha99pryz50cvrpy85si5s8"; depends=[]; };
-ScISI = derive { name="ScISI"; version="1.38.0"; sha256="094gdjmzjy39ch1fjbin1rnaybqfnvnahzqzfyx3cm0vwz0sddf7"; depends=[RpsiXML annotate apComplex AnnotationDbi RpsiXML annotate]; };
-SemDist = derive { name="SemDist"; version="1.0.0"; sha256="1gbbbslifpqxr6ndbrmpif5dm6l99nprzxrdjb113qzdxcs27m9p"; depends=[AnnotationDbi annotate]; };
-SeqArray = derive { name="SeqArray"; version="1.6.1"; sha256="18nfd9mhgmgqr5ww5lv3xkxrdc3cprd4hp5l3cwk9h7x0yg7v0sz"; depends=[gdsfmt Biostrings GenomicRanges IRanges S4Vectors VariantAnnotation gdsfmt]; };
-SeqGSEA = derive { name="SeqGSEA"; version="1.6.0"; sha256="1ql2f9hdiq5h3ry02kgwjm4mf07z8aqxk7019zq656an09d3aby2"; depends=[Biobase DESeq biomaRt]; };
-SeqVarTools = derive { name="SeqVarTools"; version="1.4.0"; sha256="07i36kfhd329h721xq23nyhi08lavnmfj6dymlcqf1pg4njv8fxa"; depends=[SeqArray GenomicRanges IRanges]; };
-ShortRead = derive { name="ShortRead"; version="1.24.0"; sha256="0gvkzwz22bifh49yhxdj0pklc9h1i629rhhaicmz24nwa68dfc7x"; depends=[BiocGenerics BiocParallel Biostrings Rsamtools GenomicAlignments Biobase S4Vectors IRanges GenomeInfoDb GenomicRanges zlibbioc S4Vectors IRanges XVector Biostrings]; };
-SigCheck = derive { name="SigCheck"; version="1.0.2"; sha256="12fzadfnc5csjdk64krm95zar5wqb4xkcp1h00slhkng4580va38"; depends=[MLInterfaces Biobase BiocParallel]; };
-SigFuge = derive { name="SigFuge"; version="1.4.0"; sha256="1j4781c26x7pi0p6vgq1z9lfmjlhb07y20l4jacarpffilb6nnkh"; depends=[GenomicRanges]; };
-SimBindProfiles = derive { name="SimBindProfiles"; version="1.4.0"; sha256="0xl3295gabaycvxmgaijr6lgy52py2fv5gd3vpmnfzn9cfsw0a8i"; depends=[Ringo limma Biobase]; };
-SomatiCA = derive { name="SomatiCA"; version="1.10.0"; sha256="19gs6gkm3jchri1npyrcjgns0hk1b07ifajbimpc43s6dyx2dq6q"; depends=[DNAcopy GenomicRanges IRanges DNAcopy GenomicRanges IRanges]; };
-SomaticSignatures = derive { name="SomaticSignatures"; version="2.2.3"; sha256="16dnaip4x3fqrgs59hl1n0x61165xaz40pzzkcng4rzvvf1yya5n"; depends=[VariantAnnotation GenomicRanges S4Vectors IRanges GenomeInfoDb Biostrings ggbio pcaMethods Biobase]; };
-SpacePAC = derive { name="SpacePAC"; version="1.4.0"; sha256="0bywmkaj208qlgndsg0x415vvlsgvdhpn64dzxsw4dh9d2ilygb8"; depends=[iPAC]; };
-SpeCond = derive { name="SpeCond"; version="1.20.0"; sha256="1im1fry6c19v1kds82nw12i4xv7v6x2shr5s0wf22m2adz6hgj5c"; depends=[Biobase]; };
-SplicingGraphs = derive { name="SplicingGraphs"; version="1.6.0"; sha256="0m70j5wqmldgnhvk1lfaq024yzx85m05c3f7z9y3yjsmxy75mlhp"; depends=[BiocGenerics S4Vectors IRanges GenomicRanges GenomicFeatures GenomicAlignments Rgraphviz BiocGenerics IRanges GenomicRanges GenomicFeatures GenomicAlignments graph Rgraphviz]; };
-Starr = derive { name="Starr"; version="1.22.0"; sha256="1kclc4qsgj0v3r18yk0qmlz906bg8v8f7h76ils983zdb42p5d5n"; depends=[Ringo affy affxparser zlibbioc]; };
-Streamer = derive { name="Streamer"; version="1.12.0"; sha256="0h93z1kqyrb713dn6zabppbr0lcwrp3d9m7c00gm4hg0dlpc3y1s"; depends=[graph RBGL BiocGenerics]; };
-Sushi = derive { name="Sushi"; version="1.2.0"; sha256="12zdd6c50li95qipck2zrqlx458rhklgja09887cby7s5s54vzca"; depends=[biomaRt]; };
-SwimR = derive { name="SwimR"; version="1.4.0"; sha256="02sdfc50siix81qvsc41d2khc6zijjgh337zjypglsp2k2lg1hfi"; depends=[]; };
-TCC = derive { name="TCC"; version="1.6.5"; sha256="17cyfv1401xrscxk7n10s85b6zyw5amc924hz1hsdgsvqm8kv1p0"; depends=[DESeq DESeq2 edgeR baySeq ROC]; };
-TDARACNE = derive { name="TDARACNE"; version="1.16.0"; sha256="1yqf747bx6vm09yjclf787xz2j3nhk1fiwwmkp4wrd7fazqfnchl"; depends=[Rgraphviz Biobase]; };
-TEQC = derive { name="TEQC"; version="3.6.0"; sha256="0072qasrzl50ril7jz96mkxkc290ifk8fs7r3mjmx2v8a7ifxak4"; depends=[BiocGenerics IRanges Rsamtools Biobase]; };
-TFBSTools = derive { name="TFBSTools"; version="1.4.0"; sha256="1vkx7mnik79pdq02x8r73y8hmdaf8g6f2f1lf0fissvmg8z7v13w"; depends=[Biostrings seqLogo GenomicRanges XVector rtracklayer BSgenome S4Vectors IRanges CNEr BiocParallel DirichletMultinomial]; };
-TSCAN = derive { name="TSCAN"; version="1.2.0"; sha256="0pkx5nij9qag5ki8fgs1ygi06aybwkjn4n7qcr95qzafjqxr9r19"; depends=[]; };
-TSSi = derive { name="TSSi"; version="1.12.0"; sha256="1dynhh1pn4bc57brs7jf9q7na71zd3pc9nj03n76g0rfy92n78gi"; depends=[BiocGenerics IRanges BiocGenerics S4Vectors Biobase IRanges]; };
-TargetScore = derive { name="TargetScore"; version="1.4.0"; sha256="1djnws8qls7kqq7bs950z9cdhz8fm79i4b5l3z9xn27divhadz8h"; depends=[]; };
-TargetSearch = derive { name="TargetSearch"; version="1.22.0"; sha256="0xzn71kdif1maicla2xlk40zf1lih1yd742dz3yyrig4d8mhfasl"; depends=[mzR]; };
-TitanCNA = derive { name="TitanCNA"; version="1.4.0"; sha256="1715mzds758z8k7lz9bn2r9f9azrf359d4ryac514w0f1v56f1hk"; depends=[IRanges Rsamtools GenomeInfoDb]; };
-ToPASeq = derive { name="ToPASeq"; version="1.0.1"; sha256="0ilsjx2ys425bg9nsk909xii1rpddqpmjxlhsd0196b5vmcdpy0m"; depends=[graphite graph edgeR DESeq2 GenomicRanges DESeq limma SPIA clipper]; };
-TransView = derive { name="TransView"; version="1.10.0"; sha256="08jzlzp7skmkllangb1d5fksdznb5qxnr036hksr8nakndjwv1ra"; depends=[GenomicRanges Rsamtools zlibbioc IRanges Rsamtools]; };
-TurboNorm = derive { name="TurboNorm"; version="1.14.0"; sha256="14zfl2xrn55mwws7mx8q70fa8ym5dfdgqzmfk6ygbn6g2f57i8vr"; depends=[convert limma marray affy]; };
-TypeInfo = derive { name="TypeInfo"; version="1.32.0"; sha256="1ha815a0f07hnlqjw3r10h2da7bdsvdil513f9xm41is4npf8f1b"; depends=[]; };
-UNDO = derive { name="UNDO"; version="1.8.0"; sha256="0ka1n3fjk7awh128wbgw08z3z7s2fnkj3xnrmqrz0ydqhhz58654"; depends=[BiocGenerics Biobase]; };
-UniProt_ws = derive { name="UniProt.ws"; version="2.6.2"; sha256="0h3w6ldi3ni3g1546c12p987q9shksj2s18pfyqbk2jdxygph3i0"; depends=[BiocGenerics AnnotationDbi]; };
-VanillaICE = derive { name="VanillaICE"; version="1.28.5"; sha256="0lfhhawkvv4ah4wbk7krmwq5ymmgyqzk6ni66ij6slm5nsib253s"; depends=[GenomicRanges Biobase oligoClasses IRanges S4Vectors GenomeInfoDb crlmm]; };
-VariantAnnotation = derive { name="VariantAnnotation"; version="1.12.9"; sha256="06s1fxiw3dxjy5li3kn4p46bymrgssx4pfmrgvdra1wcfqx29qbq"; depends=[BiocGenerics GenomeInfoDb GenomicRanges Rsamtools zlibbioc Biobase S4Vectors IRanges XVector Biostrings AnnotationDbi BSgenome rtracklayer GenomicFeatures S4Vectors IRanges XVector Biostrings Rsamtools]; };
-VariantFiltering = derive { name="VariantFiltering"; version="1.2.14"; sha256="0275cy9xpxjp9jff3my97s5pa193f2i6ll54wsm5l8qvkpilqr1i"; depends=[BiocGenerics Biobase S4Vectors IRanges AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicRanges GenomicFeatures Rsamtools BSgenome VariantAnnotation S4Vectors IRanges XVector Biostrings]; };
-VariantTools = derive { name="VariantTools"; version="1.8.1"; sha256="0kr05nh1p128nm50bzrcn2lxnapm4vvgrzakbszxrakgk9span5r"; depends=[S4Vectors IRanges GenomicRanges VariantAnnotation Rsamtools BiocGenerics Biostrings gmapR GenomicFeatures rtracklayer BiocParallel GenomeInfoDb BSgenome]; };
-Vega = derive { name="Vega"; version="1.14.0"; sha256="1gzm54glvbm24bb0qvkcmn9zl00dywiwbqcjk9vxf002xbww03pw"; depends=[]; };
-VegaMC = derive { name="VegaMC"; version="3.4.0"; sha256="128r0ns20vsp8glxyafa9yms4f2l5iakv0pz0cmq9pgqkg6ni2wz"; depends=[biomaRt Biobase genoset]; };
-XDE = derive { name="XDE"; version="2.12.0"; sha256="1x0jy8gx2zd4cdhba3wp2ajyngxcnph3mkiqm5qynm4cd462r3hq"; depends=[Biobase Biobase BiocGenerics genefilter MergeMaid]; };
-XVector = derive { name="XVector"; version="0.6.0"; sha256="055sv0289pc1i0bdihms4ml2j44xxgljk566csjr1da7lrjb6qga"; depends=[BiocGenerics S4Vectors IRanges BiocGenerics S4Vectors IRanges S4Vectors IRanges]; };
-a4 = derive { name="a4"; version="1.14.0"; sha256="16fy84ra04lly9l188zfbqxk08dm8pkjnpzz04v46aqnmyhnih3v"; depends=[a4Base a4Preproc a4Classif a4Core a4Reporting]; };
-a4Base = derive { name="a4Base"; version="1.14.0"; sha256="1dhy6r6mn02mqiz1x7jzpiy71zwclv8b3b7gys0yz4d5d67ywm6r"; depends=[Biobase AnnotationDbi annaffy genefilter limma multtest a4Preproc a4Core]; };
-a4Classif = derive { name="a4Classif"; version="1.14.0"; sha256="0j5byji2dhapg5bk1zvpsi7f2ws26npx2jl7nj0qk9fzqagysvh8"; depends=[a4Core a4Preproc MLInterfaces a4Core]; };
-a4Core = derive { name="a4Core"; version="1.14.0"; sha256="0pdpbb3i4vc81kf18flx70wv27dnxjb28gnijcmc5v6im7zi33cr"; depends=[Biobase]; };
-a4Preproc = derive { name="a4Preproc"; version="1.14.0"; sha256="04af822aaia03d2569fdxyflfhb2ppdaa0aia0afwsf0pmr3lng3"; depends=[AnnotationDbi]; };
-a4Reporting = derive { name="a4Reporting"; version="1.14.0"; sha256="13y6xw9c5d2ag6naqjdgr3pz2ajc9liqczjxq5pjj1619pxvsg0s"; depends=[annaffy]; };
-aCGH = derive { name="aCGH"; version="1.44.0"; sha256="0bj73kwibkadm3j7j9g5fim5npvcpxgdfqv7qa2lk690vzyn12w6"; depends=[multtest Biobase multtest]; };
-adSplit = derive { name="adSplit"; version="1.36.0"; sha256="1h0jkyzn7pkdbvlwfwpbnybpm2zsdxm1n9zggklyxq37xvy2g548"; depends=[AnnotationDbi Biobase multtest]; };
-affxparser = derive { name="affxparser"; version="1.38.0"; sha256="19pvq35hip53qzglfh39vwnpkbw6h4bxjfy8k06amh6i9pbwg3wl"; depends=[]; };
-affy = derive { name="affy"; version="1.44.0"; sha256="1af0vd7drsg0k4wvp1lrryv23szgmprjpk0kbwj414lc3ddridzw"; depends=[BiocGenerics Biobase affyio BiocInstaller preprocessCore zlibbioc preprocessCore]; };
-affyContam = derive { name="affyContam"; version="1.24.0"; sha256="0knr0l6xwcyfpz4l3k23cygm2i0bhsxshs15iyy6ach9hdm57bq4"; depends=[Biobase affy]; };
-affyILM = derive { name="affyILM"; version="1.18.0"; sha256="00db5avl50i9h139x5d272qhim8cdr4afc1lhhpi48l4y4zhxc1p"; depends=[gcrma affxparser affy Biobase]; };
-affyPLM = derive { name="affyPLM"; version="1.42.0"; sha256="1lyzy0rv7irl2izavs48i7f29i4mb5bn45946s2v8c31f6698qlq"; depends=[BiocGenerics affy Biobase gcrma preprocessCore BiocGenerics zlibbioc preprocessCore]; };
-affyPara = derive { name="affyPara"; version="1.26.0"; sha256="03zbc93ba5li1fwv2smfp5859c2dm0anq2biran0zzwav08h3bwm"; depends=[affy vsn affyio]; };
-affyQCReport = derive { name="affyQCReport"; version="1.44.0"; sha256="0z0qrxj1xndgx86kfm2vs3dbdw1j44ax9xcdgifb9048z1gw350l"; depends=[Biobase affy affy affyPLM Biobase genefilter simpleaffy]; };
-affycomp = derive { name="affycomp"; version="1.42.0"; sha256="18p7f3dhg26fircpxg1gcbn9mi0ysdydm8pnwp49mnwl0sq72435"; depends=[Biobase]; };
-affycoretools = derive { name="affycoretools"; version="1.38.0"; sha256="1qn3wr8nbj52sk3r6nhpq9iffhgf4jjs8yqm9q18xlvmqszsq3vy"; depends=[affy Biobase biomaRt limma GOstats annotate annaffy genefilter gcrma AnnotationDbi oligoClasses ReportingTools]; };
-affyio = derive { name="affyio"; version="1.34.0"; sha256="0ils272ap69kf3l7d66dzrvdh8gp66wb648iyzy26dbzkjcld3a7"; depends=[zlibbioc]; };
-affylmGUI = derive { name="affylmGUI"; version="1.40.2"; sha256="062333g5ks3f58n8xqzklalndiq42njfs9ad805za5si58lg1c2r"; depends=[affyPLM limma affy BiocInstaller affyio gcrma AnnotationDbi]; };
-affypdnn = derive { name="affypdnn"; version="1.40.0"; sha256="09xfhcklsh4kpzwjp96hq8i9v7x5nc6n3zl2ybk899ilvhirbsbv"; depends=[affy]; };
-agilp = derive { name="agilp"; version="3.8.0"; sha256="0g5hfmwylbxm8r4dn40qkxac2n7hc9hzv4pra60766dgisyz6i15"; depends=[]; };
-alsace = derive { name="alsace"; version="1.2.0"; sha256="13phx385i6hj0l054gm6wycvh2ggf653m8sdn81sln8nmrly4lp4"; depends=[]; };
-altcdfenvs = derive { name="altcdfenvs"; version="2.28.0"; sha256="1p8d732c13vcim9ny3m832cvzkaw7d63dmj13r1j50y4gqwjfynm"; depends=[BiocGenerics Biobase affy makecdfenv Biostrings hypergraph]; };
-ampliQueso = derive { name="ampliQueso"; version="1.4.0"; sha256="0qx2f9dszrgcrcwix78mizb5h4bjqrlsm9mbc3xval1r53vj58i4"; depends=[rnaSeqMap VariantAnnotation genefilter edgeR DESeq]; };
-annaffy = derive { name="annaffy"; version="1.38.0"; sha256="1wa045yzsxc3z20ip8s98kczp58yj2ljx9y09xgxalm31462v6yr"; depends=[Biobase AnnotationDbi]; };
-annmap = derive { name="annmap"; version="1.8.0"; sha256="0skniiq0lfiz6wcwbrdyq3cv8r46j9k7k5sidigp0gfqa88f9v2f"; depends=[GenomicRanges Biobase Rsamtools genefilter IRanges BiocGenerics]; };
-annotate = derive { name="annotate"; version="1.44.0"; sha256="1jmkj4yy9hx8wwzykf667ndykwcigqilk5vph95f9y3nb1zpd4f1"; depends=[AnnotationDbi Biobase BiocGenerics]; };
-annotationTools = derive { name="annotationTools"; version="1.40.0"; sha256="1fbnl1a8xy73aisgxh6q023l5q0mb17pd1ww65kq8v978751prs4"; depends=[Biobase]; };
-anota = derive { name="anota"; version="1.14.0"; sha256="0byhmv4w86zq1i1fshx7ld0lyixjsyz68wiz7c7vvz8z53dnw1in"; depends=[qvalue multtest qvalue]; };
-antiProfiles = derive { name="antiProfiles"; version="1.6.0"; sha256="1avsffrvyi4w7zqp0i1j53cjhbf7xgsjhzc4na8widsrla1jqzx0"; depends=[]; };
-apComplex = derive { name="apComplex"; version="2.32.0"; sha256="12vk170npyfhr5m0yyvcijxsigjj0739xaxlx8sq3rx5xdf92lrr"; depends=[graph RBGL Rgraphviz]; };
-aroma_light = derive { name="aroma.light"; version="2.2.1"; sha256="120f8r117iidhdlfj73wv276jyl1vs6sdb5pha95ywqq5b3qxvi5"; depends=[]; };
-arrayMvout = derive { name="arrayMvout"; version="1.24.0"; sha256="11338l6jhyf90nzkhmgb60dz4hhkfkkzwv02x90ly9q9bq9g2c3q"; depends=[parody Biobase affy lumi simpleaffy mdqc affyContam]; };
-arrayQuality = derive { name="arrayQuality"; version="1.44.0"; sha256="0vriyjg3aqgjhxgzlww5h3215smnvdh0rrrq7llfwbxmji3fhfl7"; depends=[limma marray]; };
-arrayQualityMetrics = derive { name="arrayQualityMetrics"; version="3.22.1"; sha256="1ynacxsncvnniq4av60046x3y6v42jsvrwyh9snkrjhkfpivh4xj"; depends=[affy affyPLM beadarray Biobase genefilter limma vsn]; };
-asmn = derive { name="asmn"; version="1.2.0"; sha256="0kc47p68gv1yn3yflqa2b5bz7c165s55fxpaqgsxpxnanh4ynf17"; depends=[methylumi Biobase]; };
-attract = derive { name="attract"; version="1.18.0"; sha256="1xshcyfd78lr9kla1iclz60rz56pxkza04y13jn28ad12dfff1nk"; depends=[AnnotationDbi limma GOstats Biobase AnnotationDbi limma GOstats]; };
-ballgown = derive { name="ballgown"; version="1.0.4"; sha256="1pvzm8dxyrxfgw4wypl805wjxnywqnqr0ip8yxwx16qa04vr88ii"; depends=[GenomicRanges IRanges S4Vectors sva limma rtracklayer Biobase GenomeInfoDb]; };
-baySeq = derive { name="baySeq"; version="2.0.50"; sha256="08p2kck94hsn6p4xcb4y2q4il236xf5vr44zvxmpvxpbjga1lk3f"; depends=[GenomicRanges]; };
-beadarray = derive { name="beadarray"; version="2.16.0"; sha256="10yh90501bdy1gnmxamn6z4rhjiplay2afgd9145bb84hldcwa6d"; depends=[BiocGenerics Biobase BeadDataPackR limma AnnotationDbi GenomicRanges IRanges illuminaio]; };
-beadarraySNP = derive { name="beadarraySNP"; version="1.32.0"; sha256="0lmgcbbb4caf2qgbgk574yazil2vif10i3j1d69xhqjr38k936hb"; depends=[Biobase quantsmooth]; };
-betr = derive { name="betr"; version="1.22.0"; sha256="1gw9g33cpsbc86825ispf56w16273abxflbb9r3r4hvhv4m1kklx"; depends=[Biobase limma]; };
-bgafun = derive { name="bgafun"; version="1.28.0"; sha256="1zrlfv7g0pfmpr55m0rx81zn02k3g278d24qh6xzl2f198zwf6aw"; depends=[made4]; };
-bgx = derive { name="bgx"; version="1.32.0"; sha256="0sg56jz4y9z71dp8dq2hdzwp09ij98xsba0a8fap66xw6b249nr1"; depends=[Biobase affy gcrma]; };
-bigmemoryExtras = derive { name="bigmemoryExtras"; version="1.10.0"; sha256="0ym8750x94lk62mpgp5gfxs2wqnqsfka5p1gapngq9rhbz15fba5"; depends=[Biobase]; };
-bioDist = derive { name="bioDist"; version="1.38.0"; sha256="0lax2lr794gzz6a6l100zkx6f02k9nj1xmn7d3l224s4vkn57zhr"; depends=[Biobase]; };
-bioassayR = derive { name="bioassayR"; version="1.4.3"; sha256="1p0r8wplhcxh2xw3wc9gda2mgiynfsqr368xjrgkch2q4f95hkbl"; depends=[]; };
-biocGraph = derive { name="biocGraph"; version="1.28.0"; sha256="1rgb7dp24dv5d2nadpl2j4gzqnna1diwciirjb4nmcbb5p8rh8fy"; depends=[Rgraphviz graph Rgraphviz geneplotter graph BiocGenerics]; };
-biocViews = derive { name="biocViews"; version="1.34.1"; sha256="1jxdkbi8fdpc3253qy0gxs3xfd5g4d231n9b3r5sy18424c7zvr7"; depends=[Biobase graph RBGL]; };
-biomaRt = derive { name="biomaRt"; version="2.22.0"; sha256="0pn5cg5yhxg11yfp4xbnm048y1h7njs42f3mb7gbhzk8ijs783cq"; depends=[AnnotationDbi]; };
-biomvRCNS = derive { name="biomvRCNS"; version="1.6.0"; sha256="1bf9s5n3jy3pv6182j8jd7387dlqdy4776vnsi3xn4sz532j2cs6"; depends=[IRanges GenomicRanges Gviz]; };
-biosvd = derive { name="biosvd"; version="2.2.0"; sha256="0yig3gpjzzs7m17c76sdzn68s55waxc6n6jgpbcsl3hg84s3ch95"; depends=[BiocGenerics Biobase]; };
-biovizBase = derive { name="biovizBase"; version="1.14.1"; sha256="1v3d408yxccpps16j2x8pdk3fzfahbjwscaqr10am9qqsvjrcyfa"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges Biostrings Rsamtools GenomicAlignments GenomicFeatures AnnotationDbi VariantAnnotation]; };
-birta = derive { name="birta"; version="1.10.0"; sha256="12jpmicfdw6c314ypy5galxkc4fgdbpawdf55xvm946dvf30bf11"; depends=[limma Biobase]; };
-blima = derive { name="blima"; version="1.0.0"; sha256="0v6a7611ziw0hsklj4w5ry1m1bw0m8lcs75a8ba3brdz0mdhab8k"; depends=[beadarray Biobase BiocGenerics]; };
-bridge = derive { name="bridge"; version="1.30.0"; sha256="1dr2hdip01k3j47vl12w7m4c21b3s8sljjq8pibplcgawx1b848g"; depends=[rama]; };
-bsseq = derive { name="bsseq"; version="1.2.0"; sha256="10vjm9gycr62qq8bh6widjikf4fjcjvgn0y254i6rncq9la7ihvi"; depends=[BiocGenerics IRanges GenomicRanges Biobase]; };
-bumphunter = derive { name="bumphunter"; version="1.6.0"; sha256="115fs6ndzdxfdiqm4lv93b4ym4wh1r2xbfg3vg9i87p0ma59ns7q"; depends=[S4Vectors IRanges GenomeInfoDb GenomicRanges limma BiocGenerics]; };
-cancerclass = derive { name="cancerclass"; version="1.10.0"; sha256="0fc8ia12lkgz38bn13j4zknwrknrzlpfbc7j04z48z5996hjny8i"; depends=[Biobase]; };
-casper = derive { name="casper"; version="2.0.2"; sha256="1x2gmrjgf29l47ss8claarrhhkn6cyi9833z6sg5q69ndmsij957"; depends=[Biobase IRanges GenomicRanges BiocGenerics EBarrays gaga GenomeInfoDb GenomicFeatures limma Rsamtools rtracklayer S4Vectors]; };
-categoryCompare = derive { name="categoryCompare"; version="1.10.0"; sha256="0mj9iipq9alf3cz0wfngsj5lfdjm0zj109l8jdhcqqfhgrf51rd1"; depends=[Biobase BiocGenerics AnnotationDbi GSEABase Category GOstats annotate graph RCytoscape]; };
-ccrepe = derive { name="ccrepe"; version="1.2.0"; sha256="1yj91dm43jkfc757y5izqp72lsw39n0pmg9hhpkmlhd5ddyp5ly8"; depends=[]; };
-cellGrowth = derive { name="cellGrowth"; version="1.10.0"; sha256="0fqzzz06b6sy5xz4cf7i16m07qk3l42k9hbkr7qggpj6y81f0n96"; depends=[]; };
-cellHTS = derive { name="cellHTS"; version="1.36.0"; sha256="1d887wqfn25vh88srxpbbs0z4p2xkxwc3l7d8280j1hg5w1q0nxg"; depends=[prada Biobase genefilter]; };
-cellHTS2 = derive { name="cellHTS2"; version="2.30.0"; sha256="0an4z1czl5ai7rm4dbrrxay0z9yfi2v7c033982mzbnnvwa2kcy7"; depends=[Biobase genefilter splots vsn prada GSEABase Category]; };
-cghMCR = derive { name="cghMCR"; version="1.24.0"; sha256="1nfb7p7l700nzx4gvmj4n2575d4hj5rm8khf77yim8pqndnr2rg8"; depends=[DNAcopy CNTools limma BiocGenerics]; };
-charm = derive { name="charm"; version="2.12.0"; sha256="0pf2qfxydjm9gqy20rskawg04cjmf93013736s5hvq576pa8qw39"; depends=[Biobase genefilter BSgenome Biobase oligo oligoClasses preprocessCore Biostrings IRanges siggenes limma sva]; };
-chimera = derive { name="chimera"; version="1.8.5"; sha256="0jbp6kmzq66dypfhnm5ml9q4krkfrjpam8dbm1nym3agxlhr4ywp"; depends=[Biobase GenomicRanges Rsamtools GenomicAlignments AnnotationDbi]; };
-chipenrich = derive { name="chipenrich"; version="1.4.0"; sha256="03zsdbdg09s3fjsvz181wgfsq8xgjmdf5n7r9y94a84f6140ixsz"; depends=[GenomicRanges IRanges]; };
-chipseq = derive { name="chipseq"; version="1.16.0"; sha256="1mnqrr967h7fizngqq75q67wjvv4b12j0wldjsa7b969fah5jfmn"; depends=[BiocGenerics S4Vectors IRanges GenomicRanges BSgenome ShortRead BiocGenerics IRanges BSgenome GenomicRanges ShortRead]; };
-chopsticks = derive { name="chopsticks"; version="1.30.1"; sha256="1igpilcmz4pxcglwbclink07gyx3ysbndg1qsjfaqr1xafip4hmd"; depends=[]; };
-chroGPS = derive { name="chroGPS"; version="1.10.0"; sha256="1r300py3n2a0c1nim0g6jnr6llsih0hil3g71fa01dckr37yzhjy"; depends=[IRanges Biobase]; };
-cisPath = derive { name="cisPath"; version="1.6.4"; sha256="0h9s84hgy3pgzh39jgjwv81g8g9gj36c6m9n1rz3g26w9hdrcznx"; depends=[]; };
-cleanUpdTSeq = derive { name="cleanUpdTSeq"; version="1.4.0"; sha256="06sq1xpi9n4b07i0r1l87pwnlylsy3qav0z6rfnb5df0xycbsrqq"; depends=[BiocGenerics BSgenome GenomicRanges]; };
-cleaver = derive { name="cleaver"; version="1.4.0"; sha256="09y7f1qcfp4fdkn21c6gfxrrx95piy168lz8ln1v7fd50lz25ilc"; depends=[Biostrings IRanges]; };
-clippda = derive { name="clippda"; version="1.16.0"; sha256="0dv9n6y3c1kfkcnjlyhi9zk80r5glpzihkvdjqpcl06p6i9jgvb4"; depends=[limma Biobase]; };
-clipper = derive { name="clipper"; version="1.6.2"; sha256="05rf33h89b31ys1gr1k1i9aipdc8hgciqzfbnhml7glx8v4gnxyp"; depends=[graph Biobase qpgraph KEGGgraph RBGL]; };
-clonotypeR = derive { name="clonotypeR"; version="1.4.0"; sha256="197dx26v5vxvpdhbh6ph4lcmk93zrbnx9ac4fclspsyna2q5i9yy"; depends=[]; };
-clst = derive { name="clst"; version="1.14.0"; sha256="09gs6489394xnwdsva4kk8qhyixxw5i8pa9nbapld77fkh3mb2ss"; depends=[ROC]; };
-clstutils = derive { name="clstutils"; version="1.14.0"; sha256="0qbrijs731xc64zdkm51j5644y6xkvd22skjvlap4fawh6dn538i"; depends=[clst]; };
-clusterProfiler = derive { name="clusterProfiler"; version="2.0.1"; sha256="0fnmkgincy9sn0hgggnpy5xd9r8dn14yr829dw2b9d9k2rl2x457"; depends=[AnnotationDbi DOSE GOSemSim]; };
-clusterStab = derive { name="clusterStab"; version="1.38.0"; sha256="17w1mz308dp9gjk73k9zh4yhk8ykqh8ya6q2713x6wb8sy66xsrx"; depends=[Biobase]; };
-cn_farms = derive { name="cn.farms"; version="1.14.0"; sha256="1p00mlpsn5adsgq51g7v09vpznbbly05sq1qyndq35mmwlsp6l4y"; depends=[Biobase oligoClasses affxparser oligo DNAcopy preprocessCore]; };
-cn_mops = derive { name="cn.mops"; version="1.12.0"; sha256="091gmwswlnqnh1b9n7xx3xafs4p7m79fw7fakbs43yrdd8ias6nd"; depends=[BiocGenerics Biobase IRanges GenomicRanges Rsamtools]; };
-cnvGSA = derive { name="cnvGSA"; version="1.10.0"; sha256="1wwrpifhg6ppmdrrx8h43mps3h85gv51dm3cn3q198cfhrj4m6yj"; depends=[]; };
-coGPS = derive { name="coGPS"; version="1.10.0"; sha256="16hx3pp517nlg2nk5sbhggxijn7ilf7b7l7zf1wv3zbm2myr1rhi"; depends=[]; };
-coRNAi = derive { name="coRNAi"; version="1.16.0"; sha256="1gg83a3d1zs9h833pxyb18iixwckj5ccgsch0rrhwxlasa778zb3"; depends=[cellHTS2 limma]; };
-cobindR = derive { name="cobindR"; version="1.4.0"; sha256="1c7za0zdpwb49mbhzgyp66pyzvd3nl5hnkdln1s1hwwnqsljivxk"; depends=[Biostrings biomaRt BSgenome IRanges]; };
-codelink = derive { name="codelink"; version="1.34.0"; sha256="15rvy25zn3g7rs2h58pamrg3mb3hb4kh8ghvc7vcnbn70rpqh17f"; depends=[BiocGenerics Biobase limma annotate]; };
-compEpiTools = derive { name="compEpiTools"; version="1.0.3"; sha256="0rlwxxn4vj2vv2348yjay4p4wbfd5r2h3qc6s276225axv6w0nzq"; depends=[topGO GenomicRanges AnnotationDbi BiocGenerics Biostrings Rsamtools IRanges GenomicFeatures XVector methylPipe S4Vectors GenomeInfoDb]; };
-compcodeR = derive { name="compcodeR"; version="1.2.1"; sha256="0r221d2dbhjzh8aqsd74rbjbrfgq2s6amw9zfy3zgjv9hygli84q"; depends=[edgeR limma]; };
-convert = derive { name="convert"; version="1.42.0"; sha256="1i8h0d7vdd0h1gk09zmf3aqvaqq3sl11nhm5yrscb2xkwz085ppn"; depends=[Biobase limma marray]; };
-copa = derive { name="copa"; version="1.34.0"; sha256="1q1ydzkf7inqyc4hxwrvjkxnqwpqw9nry67lr6igsf9mdzc2lawp"; depends=[Biobase]; };
-copynumber = derive { name="copynumber"; version="1.6.0"; sha256="01l8is7f09kr1dq7xzyr65xdr0bx83a4p8yqzyfrvbrjzzildi00"; depends=[BiocGenerics S4Vectors IRanges GenomicRanges]; };
-cosmiq = derive { name="cosmiq"; version="1.0.0"; sha256="1vbdc6my002h7kqigkic4qclxyxfy6jpz861vj6f9m0ysjsnlsn6"; depends=[xcms MassSpecWavelet]; };
-cqn = derive { name="cqn"; version="1.12.0"; sha256="11rprdpfbjkfpdxvzkd25vr0gn5gqkydafp94bmynf02lk8hvmcq"; depends=[preprocessCore]; };
-crlmm = derive { name="crlmm"; version="1.24.0"; sha256="1jgmgf60j1dhpqd7wva1szf8nfcdar2q111njdzx3bi1xqyfcb7s"; depends=[oligoClasses preprocessCore Biobase BiocGenerics affyio illuminaio SNPchip preprocessCore]; };
-csaw = derive { name="csaw"; version="1.0.7"; sha256="08k6d6n7pkxrg81hplp0h775bjjnh39m00k52zmc0g56krfx7dhq"; depends=[GenomicRanges Rsamtools edgeR limma GenomicFeatures AnnotationDbi GenomicAlignments S4Vectors IRanges GenomeInfoDb]; };
-ctc = derive { name="ctc"; version="1.40.0"; sha256="02c7fah15ci45qrydlqd2brmp8j0s5g8n7ms0akr1d203gc9jzfx"; depends=[]; };
-cummeRbund = derive { name="cummeRbund"; version="2.8.2"; sha256="16w4c0bcn55xhqa29kh68qhmpd7hm3mm2m68fm2164lykap2k472"; depends=[BiocGenerics rtracklayer Gviz BiocGenerics Biobase]; };
-customProDB = derive { name="customProDB"; version="1.6.0"; sha256="1cp989qp1s5fwl6vy70fyymxcp23hpnvcb0xaznm21f07fnnmkcp"; depends=[IRanges AnnotationDbi biomaRt IRanges GenomicRanges Rsamtools GenomicAlignments Biostrings GenomicFeatures biomaRt VariantAnnotation rtracklayer AnnotationDbi]; };
-cycle = derive { name="cycle"; version="1.20.0"; sha256="00ibwn87v982k3qrx44k36dcwrs06s2qwvfdbk03pnm3mnmgaqmj"; depends=[Mfuzz Biobase]; };
-daMA = derive { name="daMA"; version="1.38.0"; sha256="19ssjpr3ri1qlj6rx34ddis19rh54waysbjwfhysxzjfphnhpn0c"; depends=[]; };
-dagLogo = derive { name="dagLogo"; version="1.4.1"; sha256="0bzy3q7vfhd5c8aq4aj9mfdmafnnzhvq8qaygxdksv42i2affdj1"; depends=[biomaRt motifStack Biostrings]; };
-ddCt = derive { name="ddCt"; version="1.20.0"; sha256="1dyz23i31fs35h7ay1vah8v41289vf04djxshm10bazxaa2855w4"; depends=[Biobase]; };
-ddgraph = derive { name="ddgraph"; version="1.10.1"; sha256="05hxphpg71d4kzyv4949awdrqhw2hx22lcpmyhv4cbc388nrb9ji"; depends=[graph]; };
-deepSNV = derive { name="deepSNV"; version="1.12.0"; sha256="1ff3x138hmlvpcnqsrfbsbsl51rr4a05h8qsgkjijv33k55f5319"; depends=[Rsamtools GenomicRanges IRanges Biostrings VariantAnnotation Rsamtools Rsamtools]; };
-deltaGseg = derive { name="deltaGseg"; version="1.6.0"; sha256="0b6pxmxzrdxqj9bd8i589xb7vjs2ckygj2a79vcj7gfcigmga8fd"; depends=[]; };
-derfinder = derive { name="derfinder"; version="1.0.10"; sha256="1733lqy4hdq8dl44p3c5l1r0vki1pzxxjawbzx6p2fz8jd0aiilv"; depends=[AnnotationDbi BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges IRanges qvalue Rsamtools rtracklayer S4Vectors]; };
-derfinderHelper = derive { name="derfinderHelper"; version="1.0.4"; sha256="0yiimvsiilj8qh72xijpirdf32gjai5dz1087wgn5rwkwh7qxsi6"; depends=[IRanges S4Vectors]; };
-derfinderPlot = derive { name="derfinderPlot"; version="1.0.3"; sha256="0zg3rjswi61zmji93gcslyr1jgppsbhrjcbsr1il6rjklrgkkd07"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio IRanges]; };
-dexus = derive { name="dexus"; version="1.6.0"; sha256="1fyg8ll9w74qzgcjy2cbs250dbwnhmivz412i6p62yr1050h0hrp"; depends=[BiocGenerics]; };
-diffGeneAnalysis = derive { name="diffGeneAnalysis"; version="1.48.0"; sha256="0gns3f7zqilzp6zb3lyqrqy2cxzrahbv2vc5qygpnrx9pa0dpbqz"; depends=[]; };
-dks = derive { name="dks"; version="1.12.0"; sha256="13g027l318x4zhv2aq02cg9xciqir662xawpgq3r93z57a756473"; depends=[]; };
-domainsignatures = derive { name="domainsignatures"; version="1.26.0"; sha256="1m8l7v2k0vl0mcbmqfqsd7ssiki8zsgn14209dzs0j6hbsikkj4j"; depends=[prada biomaRt AnnotationDbi]; };
-dualKS = derive { name="dualKS"; version="1.26.0"; sha256="0gf36sr7ihpzy0czn11md37hjcykcryvm6fpvnshal4jd5ak3wng"; depends=[Biobase affy]; };
-dyebias = derive { name="dyebias"; version="1.24.0"; sha256="0wy8sisxzlhc2m8pcfsqdkdchhskhy3j5vn5bn2sj8fb2h4h0fm4"; depends=[marray Biobase]; };
-easyRNASeq = derive { name="easyRNASeq"; version="2.2.1"; sha256="1p5i50169qks4prw3dmy5ic6y3w7gmsxzvfg409xy1gj766xkr16"; depends=[Biobase BiocGenerics biomaRt Biostrings DESeq edgeR genomeIntervals GenomicAlignments GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; };
-ecolitk = derive { name="ecolitk"; version="1.38.0"; sha256="1msw03bxvzzk7x15d42qrmhrf0h6ivgvsnmfn4jszxdrvpwhbv41"; depends=[Biobase]; };
-edgeR = derive { name="edgeR"; version="3.8.6"; sha256="0lz9rx7v7ksmfy6jl1w8m6dv184c8gmvpgx457j2wqlg9jm939w5"; depends=[limma]; };
-eiR = derive { name="eiR"; version="1.6.0"; sha256="0d3dj5k891g00anl5nad3xfgz4jg40nvw80qiwrl3ac0nyrfa00p"; depends=[ChemmineR ChemmineR BiocGenerics]; };
-eisa = derive { name="eisa"; version="1.18.0"; sha256="1yly3v4ic9qhlcps729vvz8y5hjwk2z5wz0xgkjzihzmfjd85kyk"; depends=[Biobase AnnotationDbi BiocGenerics Category genefilter]; };
-ensemblVEP = derive { name="ensemblVEP"; version="1.6.2"; sha256="09k8480cgcs40zw10i5zvajb8n7s9165617faqxx62894iv6nxp5"; depends=[BiocGenerics GenomicRanges VariantAnnotation Biostrings]; };
-epigenomix = derive { name="epigenomix"; version="1.6.0"; sha256="0xd380gzgld43k9lib66g56miak8gn65hzxnnlva5f67jwwmb4z6"; depends=[Biobase IRanges GenomicRanges BiocGenerics Rsamtools beadarray]; };
-epivizr = derive { name="epivizr"; version="1.4.6"; sha256="0n049ck7r9090hmch9q41dlzdqm05ipv9lzdbdwf0bdy2cbqjaj2"; depends=[Biobase GenomicRanges S4Vectors OrganismDbi GenomeInfoDb GenomicFeatures]; };
-erccdashboard = derive { name="erccdashboard"; version="1.0.0"; sha256="074xif08r79b4m3hhvxc5iqfshb0d404xrvbz9jyhl11izn708py"; depends=[edgeR limma qvalue]; };
-exomeCopy = derive { name="exomeCopy"; version="1.12.0"; sha256="0s0z362maqk4myh4lygcv647kd8xfvjazsx8x8fv4vprdvwkf36h"; depends=[IRanges GenomicRanges Rsamtools GenomeInfoDb]; };
-exomePeak = derive { name="exomePeak"; version="1.6.0"; sha256="0vl0qx88id24fpvy9kffrq2qhyapygpk1jr6lx8p4qw456vvqiwh"; depends=[Rsamtools GenomicFeatures rtracklayer]; };
-explorase = derive { name="explorase"; version="1.30.0"; sha256="1k19730ky08jxl293f74vl8n386k2ggpkf7mapq5h2y64x39v1mm"; depends=[limma]; };
-fabia = derive { name="fabia"; version="2.12.0"; sha256="13709ymfdlc8xfvlqxac93znkyas56kr39gg1qb8mq5d9jdz72sb"; depends=[Biobase]; };
-facopy = derive { name="facopy"; version="1.0.0"; sha256="1xkk4nbksh6bcir2n1ayvjzi12vwsg32zypcygfdl4h5kx99c4a4"; depends=[annotate DOSE GOstats graphite IRanges Rgraphviz]; };
-factDesign = derive { name="factDesign"; version="1.42.0"; sha256="1kf02yh4k46xcz5csn2cz4wrifxb48wax175p9850mbk6gaw5jm8"; depends=[Biobase]; };
-farms = derive { name="farms"; version="1.18.0"; sha256="03gi6lsjhchjgjc7vvbzmm2w454fia5fpb3ba9jc1w2hz22razld"; depends=[affy affy Biobase]; };
-fastLiquidAssociation = derive { name="fastLiquidAssociation"; version="1.2.2"; sha256="1bq1n4hbcbpcw10sxbibc149075wx3lqhxj8npddz7m0aa4y3ma9"; depends=[LiquidAssociation]; };
-fastseg = derive { name="fastseg"; version="1.12.0"; sha256="19awyg0l6bm9kqh9dlvls17vil15sngh58q15yb0yds1c7qy4ff5"; depends=[GenomicRanges Biobase IRanges BiocGenerics]; };
-fdrame = derive { name="fdrame"; version="1.38.0"; sha256="1hqb6d5vc03p7fbqghyk247l72vl9ivr82zgs90h3f9h2ipq4szn"; depends=[]; };
-ffpe = derive { name="ffpe"; version="1.10.0"; sha256="1x9x759dxnbfd2yhskbalgvqv6lw3mazsjgnf5wgnr4bs4s5zgql"; depends=[Biobase BiocGenerics affy lumi methylumi]; };
-flagme = derive { name="flagme"; version="1.22.0"; sha256="0cs608irzag4ql0lxa34fw6y46k1vqvgg2iv1d5s2y36jmbhx202"; depends=[xcms CAMERA]; };
-flipflop = derive { name="flipflop"; version="1.4.1"; sha256="1cl9p78zgpa7153b296i3azwx0f303np4cqkpmm0sb2v4sb1r4vk"; depends=[IRanges GenomicRanges]; };
-flowBeads = derive { name="flowBeads"; version="1.4.0"; sha256="1azhw92jxiw2b2q046a6hlb3n0wld5ccg9m9grp4rkwsc1sabv0f"; depends=[Biobase flowCore flowCore]; };
-flowBin = derive { name="flowBin"; version="1.2.0"; sha256="08qwjc4yq28r4q4y71a4x79x8razljm64xpvyhfzq7rg06aqdg5w"; depends=[flowCore flowFP limma BiocGenerics]; };
-flowCHIC = derive { name="flowCHIC"; version="1.0.2"; sha256="1i8cvnbhpdk5z1k6mpaw2z7xx092x6kaqh3jz3fj14dqd6vas1g1"; depends=[flowCore EBImage]; };
-flowCL = derive { name="flowCL"; version="1.4.0"; sha256="0gags4slbjgb97khcsrnzar2s3xpkck77n8ji50m0yha8h31g9m7"; depends=[Rgraphviz]; };
-flowClean = derive { name="flowClean"; version="1.2.0"; sha256="1l11chqaj0in4gsj869crx9z5ib36acjq0sa5lwflzy99xd179ky"; depends=[flowCore]; };
-flowClust = derive { name="flowClust"; version="3.4.11"; sha256="0v6p70m948wz5hln0fp1bq9z80vkw5xw7lqhv9lpxgwa7k0gzh8r"; depends=[Biobase graph RBGL flowViz flowCore BiocGenerics]; };
-flowCore = derive { name="flowCore"; version="1.32.2"; sha256="03ykfhc8vfc4ss5dgrzi7qn6y99qn78b9j5y1fdmslsdsm81n2mq"; depends=[Biobase BiocGenerics graph]; };
-flowCyBar = derive { name="flowCyBar"; version="1.2.2"; sha256="0ndpw0nh1hkpw8fis8v0850pargfrih96ybv8gi6sks3r127ji11"; depends=[]; };
-flowDensity = derive { name="flowDensity"; version="1.0.0"; sha256="14z5100z8kh3xmd2dic274nfyj996dc7vhz5mjp91aifj9igjjss"; depends=[flowCore]; };
-flowFP = derive { name="flowFP"; version="1.24.0"; sha256="0nbx7yh8nzjzfb1dcxzfmyhgm6f8yljqc9ngnywx1gs3gxbm6drx"; depends=[flowCore flowViz Biobase BiocGenerics flowCore flowViz]; };
-flowFit = derive { name="flowFit"; version="1.4.0"; sha256="1p4k2gmjghk7xnfkkv14vbw5ambq7ik577yqyf1vfx4sqnpjp5k7"; depends=[flowCore flowViz]; };
-flowFlowJo = derive { name="flowFlowJo"; version="1.24.0"; sha256="0cx1bn64gwcffzdxa3fbk2pi8bwfpbllbrgvsh4g020yqlgrnxml"; depends=[flowCore Biobase]; };
-flowMap = derive { name="flowMap"; version="1.4.0"; sha256="0qfpmmi6dw3vj3kkyygl12w6r5sq5ncd9gk31hd91dhm3ph3q44l"; depends=[]; };
-flowMatch = derive { name="flowMatch"; version="1.2.0"; sha256="0k3vc9b1clp65abb702402srbahgsb36lk4ii76mhz965gnss024"; depends=[flowCore Biobase]; };
-flowMeans = derive { name="flowMeans"; version="1.18.0"; sha256="18nx0b889zyiihcg6lxqiqwgcg3xzw4xwdlm4q47nb564f82b52l"; depends=[Biobase flowCore]; };
-flowMerge = derive { name="flowMerge"; version="2.14.0"; sha256="1kaq8l0ackcmkair4pjm94337qlig9vvl018dz0v8mhplzlsdg91"; depends=[graph flowClust Rgraphviz flowCore]; };
-flowPeaks = derive { name="flowPeaks"; version="1.8.0"; sha256="1ppgxywm1hvinj45f0bxh2vj25mrq7l10yxr6ayk49vlg3filia2"; depends=[]; };
-flowPhyto = derive { name="flowPhyto"; version="1.18.0"; sha256="1b55fswncz00ij4237m9ayki5hvjhv0j58xa9p4r56495cxfj8f3"; depends=[flowClust flowCore flowMeans]; };
-flowPlots = derive { name="flowPlots"; version="1.14.0"; sha256="117nxr4y65bx6qrm8kg9y0afdyyj87j3m8p03s5naigbc7xl660p"; depends=[]; };
-flowQ = derive { name="flowQ"; version="1.26.0"; sha256="0rrkxnhxmy18cbrafzlhkpdw2vbjv8bqrxix0xn60z6c45y7w02n"; depends=[BiocGenerics flowViz bioDist parody BiocGenerics geneplotter flowCore flowViz IRanges]; };
-flowQB = derive { name="flowQB"; version="1.10.0"; sha256="11qz76h5897jwlh6ql6x8dalpzigimbkqvicr3vzh5lxnprw63kl"; depends=[Biobase flowCore]; };
-flowStats = derive { name="flowStats"; version="3.24.8"; sha256="0ph3czaz1w6dsnyianp6133fwlfx9afxwv3q9ykca53sq6vblg30"; depends=[flowCore flowWorkspace BiocGenerics flowViz flowCore Biobase]; };
-flowTrans = derive { name="flowTrans"; version="1.18.0"; sha256="0wivpq2hx4rr89fd85sz3qpa4g7barz3pvp91nc8h4pngj769312"; depends=[flowCore flowViz flowClust flowCore flowViz flowClust]; };
-flowType = derive { name="flowType"; version="2.4.0"; sha256="0kp8nh4hd09m65kfhh0jcj9hyyak69sb6mjqhn3j81imnwr1g981"; depends=[Biobase flowCore flowMeans flowClust flowMerge]; };
-flowUtils = derive { name="flowUtils"; version="1.30.0"; sha256="1cm8jh3xsbmm88p28yri47iviwd2b0pp6xh8bbgjmsgnibrsagym"; depends=[flowCore Biobase graph flowViz]; };
-flowViz = derive { name="flowViz"; version="1.30.1"; sha256="1i3sm5bgp6y7y8s2gzlbckacszjcvdfx9khnqyflspw3p7pppwaq"; depends=[flowCore Biobase flowCore]; };
-flowWorkspace = derive { name="flowWorkspace"; version="3.12.06"; sha256="12sk1dkxm85mgsyh41qjgzg9lyyj44250gkib00a8kl2ss37skbk"; depends=[flowCore flowViz ncdfFlow Biobase BiocGenerics graph RBGL graph Biobase Rgraphviz]; };
-flowcatchR = derive { name="flowcatchR"; version="1.0.3"; sha256="0w3wnnq1snh6v59lim8av5wbg2bvs4xmd24vv3kjrs9d4v68qbwz"; depends=[EBImage BiocParallel]; };
-fmcsR = derive { name="fmcsR"; version="1.8.0"; sha256="08mk2kmaxxflimfahdpfpclqyg550y9dr0p0s232l6zghp97vshr"; depends=[ChemmineR ChemmineR BiocGenerics]; };
-focalCall = derive { name="focalCall"; version="1.0.0"; sha256="096wps0kcglw3vrw9rbm2abs6qpq4fbll7w67w5gi36s1mba4azn"; depends=[CGHcall]; };
-frma = derive { name="frma"; version="1.18.0"; sha256="036x1q0fwyafavzs1q8hpm9ipwn3qiqn7sfkh032vphhghp8hgli"; depends=[Biobase Biobase affy oligo oligoClasses preprocessCore BiocGenerics]; };
-frmaTools = derive { name="frmaTools"; version="1.18.0"; sha256="1y6lgv2cja7zz9qmid46lfj83rs3i7as9mjpgn30qmdghswrp04f"; depends=[affy Biobase preprocessCore]; };
-gCMAP = derive { name="gCMAP"; version="1.10.2"; sha256="0yxczlsf1q3ibbcr668fsgya10jx6871kxpkr332yhn87zshp80s"; depends=[GSEABase limma Biobase BiocGenerics GSEAlm Category annotate genefilter AnnotationDbi]; };
-gCMAPWeb = derive { name="gCMAPWeb"; version="1.6.0"; sha256="0k2g0vl0xllir75haajgqarqn19ycsqypsnwc1x66q022aq08l52"; depends=[gCMAP Biobase annotate AnnotationDbi BiocGenerics GSEABase IRanges]; };
-gaga = derive { name="gaga"; version="2.12.0"; sha256="14jf02535hrf3117ih89nslz55snj8vw9vznny7nnhnlq29hqwfy"; depends=[Biobase EBarrays]; };
-gage = derive { name="gage"; version="2.16.0"; sha256="19y270z9sq1q91f44013r10hms903zrhy7wx7q4i10yf7ch8zakj"; depends=[graph KEGGREST AnnotationDbi]; };
-gaggle = derive { name="gaggle"; version="1.34.0"; sha256="16flb2xx4n840kmq2c5sc0j0p03gi0bz8sc3ry240nch5i15jqmx"; depends=[graph]; };
-gaia = derive { name="gaia"; version="2.10.0"; sha256="18j3ws2j2nj4j30wvhgjjqvwd2dmb3qf17rsdw9hgfx2xi5c1a2a"; depends=[]; };
-gaucho = derive { name="gaucho"; version="1.2.0"; sha256="024ca4709pymhja36iz5p1xaca0ihhk0i1cjs6fyllhz9s91h8zg"; depends=[graph Rgraphviz]; };
-gcrma = derive { name="gcrma"; version="2.38.0"; sha256="1rv87jwqca62xgg3a14lak3am2vm3qb4cdsl0d3iqhr833pgmil3"; depends=[affy Biobase affy affyio XVector Biostrings BiocInstaller]; };
-gdsfmt = derive { name="gdsfmt"; version="1.2.2"; sha256="0vk6y1ma3pxdwqnk1zv5vkc768lj65xmm49ib4zkawj5ndc71rzx"; depends=[]; };
-geNetClassifier = derive { name="geNetClassifier"; version="1.6.3"; sha256="0sigqjw6xpqbdai00mwwbpzcxm0fdmqclqyjz167whkhgdyvrza8"; depends=[Biobase EBarrays minet]; };
-geecc = derive { name="geecc"; version="1.0.0"; sha256="0prhm27ni2m457fmvh7n4898kkvpqkpq30cnjkd15k9hsnpag3zc"; depends=[]; };
-genArise = derive { name="genArise"; version="1.42.0"; sha256="1glhv4d0x6imlqnyddq9pfd3ggzg719qm2pka3rxqjl7p2mivwsn"; depends=[]; };
-geneRecommender = derive { name="geneRecommender"; version="1.38.0"; sha256="00v4sj89303izigaaq58jh2170ybf6plwzxa087sr1gfzhxgab01"; depends=[Biobase Biobase]; };
-geneRxCluster = derive { name="geneRxCluster"; version="1.2.0"; sha256="0hc57j5kvv3kzgkf5y403jjdvmav1fbi9f029jkgwnsrgfn07gid"; depends=[GenomicRanges IRanges]; };
-genefilter = derive { name="genefilter"; version="1.48.1"; sha256="1xlijvr11js9kxq1s1i4y4glhn5jssfczv94c7zb9mpcmf76yd9i"; depends=[AnnotationDbi annotate Biobase]; };
-genefu = derive { name="genefu"; version="1.16.0"; sha256="0w1031bc11h4hf3z9fy6yp7lnwlvcasd1kmsazz8lxmjpv2pslk9"; depends=[survcomp biomaRt]; };
-geneplotter = derive { name="geneplotter"; version="1.44.0"; sha256="13asb62sawiwbj2rv85ndyc07x0957i743gnrgq0r6y7shyq3xmn"; depends=[Biobase BiocGenerics annotate AnnotationDbi]; };
-genoCN = derive { name="genoCN"; version="1.18.0"; sha256="01dh4z1377znp9yi6k8rq3ai0jzp7apqapx69cmd9kf4qxr39ay5"; depends=[]; };
-genomeIntervals = derive { name="genomeIntervals"; version="1.22.3"; sha256="1rsvrk2l9wvji370kcyrvj97rfxh2ylrmzry3347khks46dmsc7r"; depends=[BiocGenerics]; };
-genomes = derive { name="genomes"; version="2.12.0"; sha256="1ll3nnfrpb575cmra99vibsda33xc822l5mm08mldkazzg8xf0nr"; depends=[GenomicRanges IRanges Biostrings]; };
-genoset = derive { name="genoset"; version="1.20.0"; sha256="13jvc5qczkkm2a4kq06pdi9pzhcskk7fp6vl8x4gvzr9srvq4ca4"; depends=[BiocGenerics Biobase GenomicRanges S4Vectors GenomeInfoDb IRanges]; };
-ggbio = derive { name="ggbio"; version="1.14.0"; sha256="1pbx15f4gax3kc7crggizjasvs8h6y22qz3b7ya77cjzc5j90pb1"; depends=[BiocGenerics biovizBase Biobase S4Vectors IRanges GenomeInfoDb GenomicRanges Biostrings Rsamtools GenomicAlignments BSgenome VariantAnnotation rtracklayer GenomicFeatures OrganismDbi]; };
-girafe = derive { name="girafe"; version="1.18.0"; sha256="1ipxbg07m52d82gr59b3gbmasrjqi5d9665qdzrg7jfs3vx00dqf"; depends=[BiocGenerics S4Vectors IRanges Rsamtools ShortRead genomeIntervals Biobase Biostrings BSgenome IRanges]; };
-globaltest = derive { name="globaltest"; version="5.20.0"; sha256="0rpmylm3pfkbmbarga6zn3705kn9cz5cpngqj9ad6z1rgc1xxb83"; depends=[Biobase AnnotationDbi annotate multtest]; };
-gmapR = derive { name="gmapR"; version="1.8.0"; sha256="02kxlfd2xnl2ki7604wy6gwf18j6x9sxfm3acraiwwyxa9n3qfkp"; depends=[GenomeInfoDb GenomicRanges S4Vectors IRanges Rsamtools rtracklayer GenomicFeatures Biostrings VariantAnnotation Biobase BSgenome GenomicAlignments BiocParallel]; };
-goProfiles = derive { name="goProfiles"; version="1.28.0"; sha256="0l1n93j7zc3mzydhgykcy1ys5vljm0ka2wzld9l0i79dwcsjsap5"; depends=[Biobase AnnotationDbi]; };
-goTools = derive { name="goTools"; version="1.40.0"; sha256="0b2p46r643mjbcx8q1g6qpbvb1qc2mwz9l58snilbqv214fh1khd"; depends=[AnnotationDbi]; };
-goseq = derive { name="goseq"; version="1.18.0"; sha256="0srsf83nic4lqa8ab3qcsjid8djblbqgddpxih7dvykxc3yh84x1"; depends=[AnnotationDbi BiocGenerics]; };
-gpls = derive { name="gpls"; version="1.38.0"; sha256="036cqbrs388snhcfg09zmrq7s5ggp45z7pbyhfhzs4g0f8kzgb2d"; depends=[]; };
-gprege = derive { name="gprege"; version="1.10.0"; sha256="1bgb9q5wdl0ha1499khp0wrmckibjhgfm5p2xrygxijhd0yb0iff"; depends=[]; };
-graph = derive { name="graph"; version="1.44.1"; sha256="1s8va4zn2w1rg91m7ascp03gk3cfzymjpbwb3xr6clrpbnbw8g7g"; depends=[BiocGenerics]; };
-graphite = derive { name="graphite"; version="1.12.0"; sha256="1pjaf7zrrrfw5h15zk9qzpw6dh3lwfv41fk5clmg0aa1gsln7s0y"; depends=[AnnotationDbi graph]; };
-groHMM = derive { name="groHMM"; version="1.0.2"; sha256="1gvb4h54hs65c7sckx4k3832698p9gppbmx4gqbspswrqf6izr2k"; depends=[S4Vectors IRanges GenomicRanges GenomicAlignments rtracklayer]; };
-gwascat = derive { name="gwascat"; version="1.10.0"; sha256="1s27idaikm22yqdhnvnkilk1jm3r50h1hriswpis9gbjnfmma1kn"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges snpStats Biostrings Rsamtools rtracklayer]; };
-h5vc = derive { name="h5vc"; version="2.0.6"; sha256="122s8jx03ilx9zg8yg4ir7fysyk8hq6fqz87mqjvprzhy8c1f2ip"; depends=[rhdf5 S4Vectors IRanges Biostrings Rsamtools GenomicRanges BiocParallel GenomeInfoDb]; };
-hapFabia = derive { name="hapFabia"; version="1.8.0"; sha256="0zmbwyjs96zhr2qa27i9vig4vmafkkr3sl00pr90p2zs2g1m5gqj"; depends=[Biobase fabia]; };
-hiAnnotator = derive { name="hiAnnotator"; version="1.0.0"; sha256="1l4kdp4ra7svjwi4zfkgsi6z363nvjr5ihs8pn9y32xyfp31swc8"; depends=[GenomicRanges rtracklayer BSgenome]; };
-hiReadsProcessor = derive { name="hiReadsProcessor"; version="1.0.0"; sha256="14p37x0qbv6jgv2mb071zwn675y4nx4h4kbzsqgzdaqa0y467hd4"; depends=[Biostrings GenomicAlignments BiocParallel hiAnnotator]; };
-hopach = derive { name="hopach"; version="2.26.0"; sha256="0vc1ji0n12k1q812539163n5vw99sh2z885gw9p97llr3aazr3x6"; depends=[Biobase BiocGenerics]; };
-hpar = derive { name="hpar"; version="1.8.1"; sha256="10n9bnzhvnms4bj8db441hil0i4kxdmvqpf8c39xvpyq7a1brv5k"; depends=[]; };
-htSeqTools = derive { name="htSeqTools"; version="1.12.0"; sha256="1wb847k7bvr5y4kc48lhwyfl6ng8r42qpaqqwccb2q5mfz5cqxzf"; depends=[BiocGenerics Biobase IRanges BSgenome GenomeInfoDb GenomicRanges]; };
-hyperdraw = derive { name="hyperdraw"; version="1.18.0"; sha256="18l0lcwaki5fqw4hmf481irmikgc45a5n7h225zvh5j78ci207mj"; depends=[graph hypergraph Rgraphviz]; };
-hypergraph = derive { name="hypergraph"; version="1.38.1"; sha256="05w2l5y16xrw309hsgy283qn48gn95l6c754jiwxkmn2cap8zqwp"; depends=[graph]; };
-iASeq = derive { name="iASeq"; version="1.10.0"; sha256="0m1i6f0ngk94kr8wmanhf26g6pnym0lcvak82nmprdzhnkxh8y9c"; depends=[]; };
-iBBiG = derive { name="iBBiG"; version="1.10.0"; sha256="0d0d0v6fn6xsm6j4p2z924sspxvs1kdf93vsn5wwgfb86rh205sk"; depends=[]; };
-iBMQ = derive { name="iBMQ"; version="1.6.0"; sha256="0d6w6b276p48c65h4zk6dfzmn9i6vsam5lry9p7pyz6xzmdbx84z"; depends=[Biobase]; };
-iChip = derive { name="iChip"; version="1.20.0"; sha256="13rs1j0l9nh5dir725kcbzhp6b741gn8xnv67w5pj9bmx3q1njkk"; depends=[limma]; };
-iClusterPlus = derive { name="iClusterPlus"; version="1.2.0"; sha256="1f4hg8phzza2dlw7svabbpxwyjplc3xxzzd267axvq4pkxyz7f5z"; depends=[]; };
-iPAC = derive { name="iPAC"; version="1.10.0"; sha256="0dav5mrfk9gy07lavf2f7am78zb3jcy4scbglajr7bf212v16awj"; depends=[Biostrings multtest]; };
-iSeq = derive { name="iSeq"; version="1.18.0"; sha256="14pdjh6i0xr6ihy7jz30prwv2s9q5wib8d5s1crpk72bz9dqbn59"; depends=[]; };
-ibh = derive { name="ibh"; version="1.14.0"; sha256="05kiqbfkd6a865y7ckn2hv3kagyab91i57f27327b42hqzi3v7dy"; depends=[]; };
-idiogram = derive { name="idiogram"; version="1.42.0"; sha256="1k257rdqxqa8mncdanzjy5vcmp7l3jzfzr5sbcpr1fml30jpljmh"; depends=[Biobase annotate]; };
-illuminaio = derive { name="illuminaio"; version="0.8.0"; sha256="17lcdl401xcf4dc8rs3nz9nrycrvyq1smdk73v4g07mj1mkydbyg"; depends=[]; };
-imageHTS = derive { name="imageHTS"; version="1.16.0"; sha256="0iq1mhr9ic5hwrylb9ffblk5rfm8vkqvzi4wj69dga5khc3bvi7x"; depends=[EBImage cellHTS2 Biobase vsn]; };
-impute = derive { name="impute"; version="1.40.0"; sha256="0m4wfrgax6hxjwb6fgyn9dh0z3vnj1pqwgafyp7ic0ifd3zn7nbg"; depends=[]; };
-inSilicoDb = derive { name="inSilicoDb"; version="2.2.1"; sha256="1c4kkcljwvl1xaxr8i23zvf6m73bbs4yydw3rvimbn39a55dp26g"; depends=[Biobase]; };
-inSilicoMerging = derive { name="inSilicoMerging"; version="1.10.1"; sha256="0c73zrxnbpixlmdx24rqrhv7h03agk3ckss64wr03r8zc1z6wrd8"; depends=[Biobase]; };
-intansv = derive { name="intansv"; version="1.6.2"; sha256="11zvsgpyl712qdjz8mfkbyl4d09f6lb0wbnr3c50crw76flhp5m2"; depends=[ggbio GenomicRanges BiocGenerics IRanges]; };
-interactiveDisplay = derive { name="interactiveDisplay"; version="1.4.1"; sha256="14mpww5ijwlkdyl3hxdyd95zik0s5vrb1dmhdpfhcbd18xj6gkcs"; depends=[BiocGenerics interactiveDisplayBase Category AnnotationDbi]; };
-interactiveDisplayBase = derive { name="interactiveDisplayBase"; version="1.4.0"; sha256="0ahd8ja8f6d7lcn6kz9wm8g7ly5ngda8zva44120r6df3n6ij2dg"; depends=[BiocGenerics]; };
-inveRsion = derive { name="inveRsion"; version="1.14.0"; sha256="1zmb0h949sc9xvyc3qjc8xhg1iq9lpff3h98zn6zq4lr9hv542w3"; depends=[]; };
-iontree = derive { name="iontree"; version="1.12.0"; sha256="1z62n0y2x569s5f3dxrbya70sbx5zjfhv17awnzw4bxsl2iwdlsw"; depends=[]; };
-isobar = derive { name="isobar"; version="1.12.2"; sha256="1paxykz7b400cxmdbwh0xw3crvlrd63i612w1bkm8n5d508wij8k"; depends=[Biobase]; };
-iterativeBMA = derive { name="iterativeBMA"; version="1.24.0"; sha256="14ri5m9lk77w5clsh0jsidsx8xwxizky5mrvhk136x20pd13vp8n"; depends=[Biobase]; };
-iterativeBMAsurv = derive { name="iterativeBMAsurv"; version="1.24.0"; sha256="0wg07ass90ha2z460vddlchw2vjcn6sfzmrwfdjak1b9cckhgg7f"; depends=[]; };
-jmosaics = derive { name="jmosaics"; version="1.6.0"; sha256="1kif1ms3v4askg9sf43fgrw8flxpzp36a7pwflnbfg035xkjdwgn"; depends=[mosaics]; };
-joda = derive { name="joda"; version="1.14.0"; sha256="09xyk761825hpjpffv2d6bmj8snprm9k8fdaslyh4clx0r9nsm13"; depends=[RBGL]; };
-kebabs = derive { name="kebabs"; version="1.0.5"; sha256="0jphbpbv5r8s0q4f985yvrckjx58g94nw9mccqfsrjlz2ka8kpls"; depends=[Biostrings XVector S4Vectors IRanges XVector Biostrings S4Vectors]; };
-keggorthology = derive { name="keggorthology"; version="2.18.0"; sha256="0iwwp3zv94ci89l1wd19l4ryjlggq9naairzsifrajnq3ivq07fg"; depends=[graph AnnotationDbi graph graph]; };
-lapmix = derive { name="lapmix"; version="1.32.0"; sha256="16gqhmyd5yl2myk9b7dad9mr3agxh5a1hgd2xdszrnya61r7kvnw"; depends=[Biobase]; };
-les = derive { name="les"; version="1.16.0"; sha256="1g7hqm61z66qf6cw5dl8xc0ndw7hak2034kc2zdp2i7gl5ww8iad"; depends=[]; };
-limma = derive { name="limma"; version="3.22.7"; sha256="0qa5kfph80j4ykngaj300bkvk464chpnlsaffqwnv0g70r1af7hy"; depends=[]; };
-limmaGUI = derive { name="limmaGUI"; version="1.42.0"; sha256="0236bmwxdppgpw0fb4sw8wg16k2pijzxm8a6qy2kxd3a77ci034k"; depends=[limma]; };
-lmdme = derive { name="lmdme"; version="1.8.0"; sha256="0pidyb48ranx4a9k6zk69sh5dd51q81wig1h5qbv1irsdjrl5k51"; depends=[limma]; };
-logicFS = derive { name="logicFS"; version="1.36.0"; sha256="0hyqfcb3lz0ylgf21mklwam2w7vrii2k0bsazwx02kp1z918qzax"; depends=[]; };
-logitT = derive { name="logitT"; version="1.24.0"; sha256="09b7wk51hbvfhvmvwfqjd194ywgqyp728nvwbi44ln04v4d1834h"; depends=[affy]; };
-lol = derive { name="lol"; version="1.14.0"; sha256="0y78yfbyjy40cybqyxhfsg3ay9kacv75a7xi71npkqii04f7cszq"; depends=[]; };
-lpNet = derive { name="lpNet"; version="1.6.0"; sha256="1qk4v6wq01218r17a1daj7h9jsb9i7l867r2m4ry0bjgnz2h6lk2"; depends=[nem]; };
-lumi = derive { name="lumi"; version="2.18.0"; sha256="1f0fcz7vlkc062fn248hgx3p1msz3hna34aa0g1gcnv51rxb5him"; depends=[Biobase affy methylumi GenomicFeatures GenomicRanges annotate Biobase preprocessCore AnnotationDbi]; };
-mBPCR = derive { name="mBPCR"; version="1.20.0"; sha256="1l7ybvnh00grfjdvpn45ns8kg6jfs8hn7z4ijyghzmm70w9527xk"; depends=[oligoClasses SNPchip Biobase]; };
-mQTL_NMR = derive { name="mQTL.NMR"; version="1.0.0"; sha256="0dbpkbgbpzv8vzmgcs4s3ppfwy88aj79cd3cnf18jqg43b56w4fi"; depends=[]; };
-maCorrPlot = derive { name="maCorrPlot"; version="1.36.0"; sha256="12k4f427xipcbhz6ffv25rxpk799vpv2g15lpj15pmjpspi43q10"; depends=[]; };
-maPredictDSC = derive { name="maPredictDSC"; version="1.4.0"; sha256="1bnkfpicb3pfr2rymnwc5n56zk1fyzhg58b823xdjpdv3p4d806h"; depends=[affy limma gcrma ROC AnnotationDbi]; };
-maSigPro = derive { name="maSigPro"; version="1.38.0"; sha256="1pk8mnzvrsp0x229r91xdx0f7v18dizw2pjkhyh3xblx4mgbryyh"; depends=[Biobase Biobase limma Mfuzz]; };
-maanova = derive { name="maanova"; version="1.36.0"; sha256="0ygwzxl89rng52vf4ai41mbsn0yiv580l0xfwykqai81qjk97kgy"; depends=[Biobase]; };
-macat = derive { name="macat"; version="1.40.0"; sha256="14azwx7719wqi4n4k17y90w3ypcz8kmmkf25lwgf1mx8jpqdfnn6"; depends=[Biobase annotate]; };
-made4 = derive { name="made4"; version="1.40.0"; sha256="1hxaz11k0kcidm9krf9a63hhxkcrk9g3lrljd1bphj6kwjs0zyfg"; depends=[]; };
-maigesPack = derive { name="maigesPack"; version="1.30.0"; sha256="0dmxikyw045b0q6vkq7l5rh6rkvjzjjrppi07yx2849hvd78sv74"; depends=[convert graph limma marray]; };
-makecdfenv = derive { name="makecdfenv"; version="1.42.0"; sha256="1z0p3piyaj8577hmvmainng3csbcwszk4mijdbw5i6pzv4j7qlzc"; depends=[affyio Biobase affy zlibbioc]; };
-manta = derive { name="manta"; version="1.12.0"; sha256="0kkfdvd6b1fz289di5h3pbnh5lm6ixcg0vdancxrqh23xcmzn020"; depends=[edgeR]; };
-marray = derive { name="marray"; version="1.44.0"; sha256="1cg2qkg2pyf2vy9j2c2iw2z3mppmz7hvknm207dky594sh38azsm"; depends=[limma]; };
-maskBAD = derive { name="maskBAD"; version="1.10.0"; sha256="02dy1y7z0s2g3kp5dn5scrvqfwbdp57fyrc85bb576ncbckd89gl"; depends=[gcrma affy]; };
-massiR = derive { name="massiR"; version="1.2.0"; sha256="0x7ip2w8vrh0pa5rw8s53a7kmb4aixmd32y1y9vwm8q19p1fn91c"; depends=[Biobase]; };
-matchBox = derive { name="matchBox"; version="1.8.0"; sha256="1g44cbac3k4d5krpi93nrxk3w43sihfblnji5hknavny7z2k57k1"; depends=[]; };
-mcaGUI = derive { name="mcaGUI"; version="1.14.0"; sha256="188zganyc5wqm87nk160w6zhrzwjxs3mpiin17mr13kr609cs03j"; depends=[OTUbase]; };
-mdqc = derive { name="mdqc"; version="1.28.0"; sha256="06bb1il2r9pfnnja6nmdx1k7pq827xnnr67q6l3k262rj3j0nfk2"; depends=[]; };
-meshr = derive { name="meshr"; version="1.2.7"; sha256="014lj15kk2aq49hys0cdrxr7c6psxpah91jbwkw9mk57s0vw3fja"; depends=[Category BiocGenerics cummeRbund MeSHDbi S4Vectors]; };
-messina = derive { name="messina"; version="1.2.0"; sha256="054hznxclhv9b9inis2xc0y1028hqc9fwl15z0hrqld9z4jsl5vc"; depends=[]; };
-metaArray = derive { name="metaArray"; version="1.44.0"; sha256="0nbvz094xgm4k25z77d1frq72mjdy9ck2a8fy2zkb97gpnsii10h"; depends=[Biobase MergeMaid]; };
-metaMS = derive { name="metaMS"; version="1.2.0"; sha256="0137zd25mr0pwclbnnf06si79ja1kn0czfw698cnd38fjkz300sg"; depends=[CAMERA xcms BiocGenerics]; };
-metaSeq = derive { name="metaSeq"; version="1.6.0"; sha256="04yfs1zhd35w9zjn71cnm9avc5rhqkg8jymgsra1slgrdhwwly7m"; depends=[NOISeq]; };
-metabomxtr = derive { name="metabomxtr"; version="1.0.0"; sha256="0wr2qyh57r9c0pdbjrkri72zjxjm3vjdh6ny1srwjrgx5hfa9nr7"; depends=[Biobase multtest]; };
-metagene = derive { name="metagene"; version="1.0.0"; sha256="1b2nqyis5cl7z16ql0ix9wyh9lcbnxhx26sz3wgrxwxwrq5gy64g"; depends=[rtracklayer GenomicRanges GenomicAlignments]; };
-metagenomeSeq = derive { name="metagenomeSeq"; version="1.8.3"; sha256="16j5g3yb184giygbfrb96ggal8y44b40g7771g9bgfzr950dq9wc"; depends=[Biobase limma interactiveDisplay]; };
-metahdep = derive { name="metahdep"; version="1.24.0"; sha256="13w25dailvl4y4vzb66vkyzzgswy10izapicf41f2w4qqwp1swc9"; depends=[]; };
-metaseqR = derive { name="metaseqR"; version="1.4.13"; sha256="14sbagw7jkv56569z438y0vsph104hryb825ih4wsk1ngrgnk7zg"; depends=[EDASeq DESeq limma qvalue edgeR NOISeq baySeq biomaRt vsn]; };
-methVisual = derive { name="methVisual"; version="1.18.0"; sha256="0mr5rymx9x4aav2lvfjxmm5zc47xfgmysnh5lvgx30fpsf1gsa2m"; depends=[Biostrings Biostrings IRanges]; };
-methyAnalysis = derive { name="methyAnalysis"; version="1.8.0"; sha256="1ygj9j2b0g052n7vv1qypv9ffmxfc3dpwmxmdqs8gq7gdz9h36yn"; depends=[BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges Biobase lumi methylumi Gviz genoset GenomicRanges IRanges rtracklayer GenomicFeatures annotate Biobase AnnotationDbi genefilter biomaRt]; };
-methylMnM = derive { name="methylMnM"; version="1.4.0"; sha256="10p4jhqq0116grwcwf28jxgn59c66bkwcqvxy11mrw6533dbnfp5"; depends=[edgeR]; };
-methylPipe = derive { name="methylPipe"; version="1.0.5"; sha256="0z3xkrzpkgdl7cjam9mirm8gqwc69gicprlw2vgphzdc491dbx1y"; depends=[GenomicRanges Rsamtools marray IRanges BiocGenerics Gviz GenomicAlignments Biostrings GenomeInfoDb S4Vectors]; };
-methylumi = derive { name="methylumi"; version="2.12.0"; sha256="0mcg985g3nw8cbjffagdsjn1an0z61jzl7w24zzhy4mbscjj0b6h"; depends=[Biobase minfi BiocGenerics S4Vectors IRanges GenomeInfoDb GenomicRanges Biobase annotate genefilter AnnotationDbi minfi illuminaio]; };
-mgsa = derive { name="mgsa"; version="1.14.2"; sha256="16x4s22r6qyirrm78260i59lzx5mknfirjg09dhw56w431ibra9b"; depends=[]; };
-miRNApath = derive { name="miRNApath"; version="1.26.0"; sha256="0lpr2id012wdh3zkla6xpyfxsy068zzbldfwj24hclzxqiwhqkgd"; depends=[]; };
-miRNAtap = derive { name="miRNAtap"; version="1.0.0"; sha256="1w2ivqkndnmq9h2h9nx0wcwg7hppiyskgrvmmsy36q3dy96nvis1"; depends=[AnnotationDbi]; };
-microRNA = derive { name="microRNA"; version="1.24.0"; sha256="187xjq2fy9zgvx82q47rvywrsc0260vlzyi79zd48ayyr8wi2q5s"; depends=[Biostrings]; };
-minet = derive { name="minet"; version="3.24.0"; sha256="126yhbn98048ahnmcc7v8pgk9c2fa669fw84zq4819zq027dqk07"; depends=[]; };
-minfi = derive { name="minfi"; version="1.12.0"; sha256="0cz59qcbg6bi7l4kzsdx1jrlwfr720ahpc5f3qap8j5bdhsgjr0i"; depends=[BiocGenerics Biobase GenomicRanges Biostrings bumphunter S4Vectors IRanges siggenes limma preprocessCore illuminaio genefilter]; };
-missMethyl = derive { name="missMethyl"; version="1.0.0"; sha256="054y75q7dlwnrbrx68kjpj9pdb5wx9nhrg3ch8kxfi6kcbymyibk"; depends=[limma minfi methylumi]; };
-mitoODE = derive { name="mitoODE"; version="1.4.0"; sha256="1xaxf61vlfcx02sigmplayak0kc35s3301l42f3lap9236qmiikl"; depends=[]; };
-mmnet = derive { name="mmnet"; version="1.4.0"; sha256="1brgl3bnxja3z8wrny9d53ir7yk8qsdl02dr46055spck5p5ngkd"; depends=[Biobase KEGGREST]; };
-monocle = derive { name="monocle"; version="1.0.0"; sha256="07i77c7hicfd00b8y0y6gkd6ffach0s67awl69q3xzjlvhv6yq5b"; depends=[Biobase BiocGenerics limma]; };
-mosaics = derive { name="mosaics"; version="2.0.1"; sha256="0gmhlg34vhdzn9dg5g8l1xndrs54c4ijwi5b5hvnij09wagi4557"; depends=[IRanges]; };
-motifRG = derive { name="motifRG"; version="1.10.0"; sha256="1bsj18j0cnj31njy5l4n6dwxxxdbv1xyqjn5v9ql8whya6rq4s2j"; depends=[Biostrings IRanges seqLogo BSgenome XVector IRanges seqLogo XVector]; };
-motifStack = derive { name="motifStack"; version="1.10.2"; sha256="1ypy92cbdw4iksf0ivxqk7jnz91cmm3n48qsh8b9gbc72wrdw45r"; depends=[MotIV]; };
-msmsEDA = derive { name="msmsEDA"; version="1.4.0"; sha256="1s4gahc6n973d76vdz9hk5wiqs6d28xfm1jzvh0pw40igx475l2b"; depends=[MSnbase]; };
-msmsTests = derive { name="msmsTests"; version="1.4.0"; sha256="19dfzvq1kdiwchijs9z367cggrvgh6f45kdn4585qn65pyii0fva"; depends=[MSnbase msmsEDA edgeR qvalue]; };
-multiscan = derive { name="multiscan"; version="1.26.0"; sha256="027ccaqmf84bkbjy9j5jq91pjx3b3cycn6fbyjc2w0f7prcx394q"; depends=[Biobase]; };
-multtest = derive { name="multtest"; version="2.22.0"; sha256="1kcz6h91qz0n0vi7dphw6rdzy1i1c0xd41q4bgqhmg0mi44m0k78"; depends=[Biobase]; };
-mvGST = derive { name="mvGST"; version="1.0.0"; sha256="0p6msfkj5qa29b0g3p87wcryn0gq9vfhcc3y8rx2j1f01qb1raif"; depends=[Rgraphviz topGO GOstats annotate AnnotationDbi graph]; };
-mygene = derive { name="mygene"; version="1.0.1"; sha256="1i085n7af6lx8ymrglzfv5bwnsz4rvyk47hws9xhhriydrniwiq3"; depends=[GenomicFeatures S4Vectors]; };
-mzID = derive { name="mzID"; version="1.4.1"; sha256="1ijyr2s4g1hvrs719sj3ylckdgaar8v5aal62kajmc8zjwhc6pd0"; depends=[]; };
-mzR = derive { name="mzR"; version="2.0.0"; sha256="0djvbgsz9y0qy91c6r8hlkdy0a95nmncakapn0s04lzqhjj2azkq"; depends=[Biobase]; };
-ncdfFlow = derive { name="ncdfFlow"; version="2.12.0"; sha256="0r4q4ydaqlrsan8a3k60bjrzqvm37s308k3fz9lvqvdk3c5hichz"; depends=[flowCore flowViz Biobase flowCore flowViz zlibbioc]; };
-neaGUI = derive { name="neaGUI"; version="1.4.0"; sha256="0l0v5jb4m7hxmdmkhm52gbw8c0vsgi4y3mkd0ygja9kp7half10h"; depends=[]; };
-nem = derive { name="nem"; version="2.40.0"; sha256="19mmvbg52vk6i5wy0kqpm460w7q9fsp1gwyjmqfhwd5jicxpp14k"; depends=[graph limma Rgraphviz graph RBGL Rgraphviz]; };
-netbiov = derive { name="netbiov"; version="1.0.0"; sha256="1zging9jh417z8fyv7z3bdbf44agnx5lqih0sizyvv6wccz0jm30"; depends=[]; };
-netresponse = derive { name="netresponse"; version="1.16.0"; sha256="1ngj2v85rfm1hbd5xsvl05z28xjdf5j4pd2fm4p0ch6i8ar3wzzd"; depends=[graph minet qvalue Rgraphviz]; };
-networkBMA = derive { name="networkBMA"; version="1.8.0"; sha256="00k3z1fsm32i6kgzxg6cydylxg849gxdrs8zy6923y26742ysi8s"; depends=[]; };
-nnNorm = derive { name="nnNorm"; version="2.30.0"; sha256="13wxpgkd90giqx3hlsl8hsk2vd2n3w1522sks82rz7663ixbfill"; depends=[marray marray]; };
-nondetects = derive { name="nondetects"; version="1.2.0"; sha256="1jhdqvjzw8hsr6ql82hv443qh36mnwkmwgygirlgn48rs0j289y0"; depends=[Biobase HTqPCR]; };
-npGSEA = derive { name="npGSEA"; version="1.2.0"; sha256="19kk2c81cwfcv0z0qd5jm0k0kr1q7nxj1givk26m32mrqh7rm4zk"; depends=[GSEABase Biobase BiocGenerics]; };
-nucleR = derive { name="nucleR"; version="1.14.0"; sha256="1wjffdi4vx00rsxs8dzcamz5n9ramgcl8j228rwq1ag1vp836jg6"; depends=[BiocGenerics IRanges Biobase ShortRead BiocGenerics S4Vectors IRanges Biobase ShortRead GenomicRanges]; };
-nudge = derive { name="nudge"; version="1.32.0"; sha256="1h0zjy1x4papcwwwwymkpaig6wkh5wp7asw4qpgw9g9xajdg4gcq"; depends=[]; };
-occugene = derive { name="occugene"; version="1.26.0"; sha256="122if8jvyiw7384s4g3z95b2bs4sijjhq0yzk8b62i7j9dv8m11b"; depends=[]; };
-oligo = derive { name="oligo"; version="1.30.0"; sha256="0djadgk5la3wdd2scvk6v45y3a25ffwq220n3kjivcgnj529f83a"; depends=[BiocGenerics oligoClasses Biobase Biostrings affyio affxparser BiocGenerics preprocessCore zlibbioc preprocessCore]; };
-oligoClasses = derive { name="oligoClasses"; version="1.28.0"; sha256="0dgplhks2miidfiviz122rw7chxcm14hpizbhcf6l9r1r7wrd69r"; depends=[BiocGenerics Biobase IRanges GenomicRanges Biostrings affyio BiocInstaller S4Vectors]; };
-omicade4 = derive { name="omicade4"; version="1.6.2"; sha256="1zmzl78sr9hj04azyrncfh1rsf5lb5v0wfkls35qmcxb18sp4178"; depends=[made4]; };
-oneChannelGUI = derive { name="oneChannelGUI"; version="1.32.0"; sha256="002jj674jqjqpqg7q4dqfwv0lmbp1bgkvljjp78jgy5rhjvpy10c"; depends=[Biobase affylmGUI tkWidgets IRanges Rsamtools Biostrings siggenes chimera]; };
-ontoCAT = derive { name="ontoCAT"; version="1.18.0"; sha256="0xq2vd3lkavnwj9da1hkamhyvxr46ysl2mh9xa6j2c13a6yq3p4c"; depends=[]; };
-openCyto = derive { name="openCyto"; version="1.4.0"; sha256="0nzfb2xhypl8kscsaznx8i3gf1fyd71p6x84zfvqx98wi5vpsswj"; depends=[flowWorkspace Biobase flowCore flowViz ncdfFlow flowStats flowClust RBGL graph]; };
-oposSOM = derive { name="oposSOM"; version="1.1.1"; sha256="0q9j67gpik4i8n485cbn96wi4svbcl3v69fvqgvrv4byjwzn02pp"; depends=[biomaRt Biobase]; };
-pRoloc = derive { name="pRoloc"; version="1.6.2"; sha256="1r80fyfhpjq36gf8cwwrh8zikp9yvdfnpwwq6yf5155k4090269h"; depends=[MSnbase MLInterfaces BiocParallel BiocGenerics]; };
-pRolocGUI = derive { name="pRolocGUI"; version="1.0.2"; sha256="1q5nzi89408vsls1k59j8i9dfkx9dfmi7k01dm1c17qvi977a1mb"; depends=[pRoloc MSnbase]; };
-paircompviz = derive { name="paircompviz"; version="1.4.0"; sha256="0l9jifzazrl3wchrgn6q4cj088gjghabrzh0118g73hm5y2rjq51"; depends=[Rgraphviz Rgraphviz]; };
-panp = derive { name="panp"; version="1.36.0"; sha256="0yyghljg81s5f9fwj24hlhgl7i4a15ia662cqhb6l6im8ghssxrl"; depends=[affy Biobase Biobase]; };
-parody = derive { name="parody"; version="1.24.0"; sha256="1y36abd3l8xaqd7aaf1sfi1ylqqvyns6in8i7j2kswgjjv89k4wr"; depends=[]; };
-pathRender = derive { name="pathRender"; version="1.34.0"; sha256="0giwl6inrs0krk7qnri23g8xyf06x8knqh83p4cpzagg8rfbkpzc"; depends=[graph Rgraphviz AnnotationDbi]; };
-pathifier = derive { name="pathifier"; version="1.4.0"; sha256="1xm9rjpk1ngapl2kni5bn5z4fg19rnbi41dvv784flmzy87iwhjl"; depends=[]; };
-pathview = derive { name="pathview"; version="1.6.0"; sha256="1bfr20rad6qrvaid8y0n167x7d6ixi1k3dclq919473v7pzzqq65"; depends=[KEGGgraph Rgraphviz graph AnnotationDbi KEGGREST]; };
-paxtoolsr = derive { name="paxtoolsr"; version="1.2.11"; sha256="1b8197cd0c5i0r9d85v2x0mw8yz3l74skg9jj0lh1h56hwpxfnb1"; depends=[]; };
-pcaGoPromoter = derive { name="pcaGoPromoter"; version="1.10.0"; sha256="03h1fpj7iaaz6b9y7zwpn9nhgyhg8r39iw0vnhmmlsyg5g4zrlza"; depends=[Biobase AnnotationDbi]; };
-pcaMethods = derive { name="pcaMethods"; version="1.56.0"; sha256="112wm1qr1bczn18k854ja8029rz4sxnxgvlksjjpxswxliwfldkn"; depends=[Biobase BiocGenerics]; };
-pcot2 = derive { name="pcot2"; version="1.34.0"; sha256="0v6350d9inmfvbiyagqb2wpp6pfirnwrm9hq53g0yg9igyd4q4nl"; depends=[Biobase]; };
-pdInfoBuilder = derive { name="pdInfoBuilder"; version="1.30.6"; sha256="0ydzwbkjzmm5dh70vwbdiw2kmd4cmnvfwpqa65fmblbpdg73618w"; depends=[Biobase affxparser oligo Biostrings BiocGenerics IRanges oligoClasses S4Vectors]; };
-pdmclass = derive { name="pdmclass"; version="1.38.0"; sha256="0lk7y8i24mbajp4lln07q61pnbmsn6mpajb09zfvrf7qgklm64hz"; depends=[Biobase]; };
-pepStat = derive { name="pepStat"; version="1.0.0"; sha256="1r3hvhxwd85mkjw4f2hwygvffppsbay3ghj7rmy9jkaayfz2px49"; depends=[Biobase IRanges limma GenomicRanges]; };
-pepXMLTab = derive { name="pepXMLTab"; version="1.0.0"; sha256="0pxy5hhg3vb2zph484c8hm7066dnfp7303n7zbaviszykcxmw9h6"; depends=[]; };
-phenoDist = derive { name="phenoDist"; version="1.14.0"; sha256="0vr2mv4swk102kl7vq3mj6xxl1z0v45shd0wrhs9zg1pklbd851j"; depends=[imageHTS]; };
-phenoTest = derive { name="phenoTest"; version="1.14.0"; sha256="19qgcpd28frnhcx10lsrxg885b6f9l6qfwlyzkp3x875p62xy942"; depends=[Biobase annotate Heatplus limma Category AnnotationDbi hopach biomaRt GSEABase genefilter annotate SNPchip HTSanalyzeR]; };
-phyloseq = derive { name="phyloseq"; version="1.10.0"; sha256="1whwm1wm9fhxsz54vqf2r32bmgg3c9smvrpnzmvz9gigygvv5cyl"; depends=[Biostrings DESeq2 multtest]; };
-piano = derive { name="piano"; version="1.6.2"; sha256="00qbcgzafila8idbfxvdnssx5161rn1xhnh3w1fp8sqlw5d1v6xz"; depends=[Biobase marray]; };
-pickgene = derive { name="pickgene"; version="1.38.0"; sha256="1pzr3l2h9rfywl7a20ppyaggzrvlr0as3bl4ys451khwnm1abwcf"; depends=[]; };
-pint = derive { name="pint"; version="1.16.0"; sha256="1vlrblp4i4qd0lpbphz0l6hpsyl88pc1qrr6kk8v62bw0a0bsdf9"; depends=[]; };
-pkgDepTools = derive { name="pkgDepTools"; version="1.32.0"; sha256="1fh52j5lrvbvm05bv67swdxckjys74v5ikqjv9ln2a30pxp0vs6a"; depends=[graph RBGL graph RBGL]; };
-plateCore = derive { name="plateCore"; version="1.24.0"; sha256="0gqv0wqd93q4c2sgjic109i9a59z63hbqilc4a7c80krsada80sc"; depends=[flowCore flowViz Biobase flowCore flowStats]; };
-plethy = derive { name="plethy"; version="1.4.3"; sha256="16xff9y274lf0hpjzfqxl94xbl5prk7gbjh23ysb0jl8hszjc9i8"; depends=[BiocGenerics S4Vectors Streamer IRanges]; };
-plgem = derive { name="plgem"; version="1.38.0"; sha256="1wsianyvwhiwpm3ip2la3a78jj9cvj07l9nipmjk84nlk5wpvw9k"; depends=[Biobase]; };
-plier = derive { name="plier"; version="1.36.0"; sha256="0qr4v2lazvl3bnqdjd1jnbfh4z9jbkqr2bbs4wc1r7rps4gxib3y"; depends=[affy Biobase]; };
-plrs = derive { name="plrs"; version="1.6.0"; sha256="03pwcv8vx1rdx85z3a60p7g53lmg1qdwmbkmnsx6fjc0hnvxvx6w"; depends=[Biobase BiocGenerics CGHbase marray]; };
-plw = derive { name="plw"; version="1.26.0"; sha256="0mb35ql57gl0nhdcwbcj2fwbanm8gv0rpgjbcc1mrw82d7ffj94i"; depends=[affy affy]; };
-polyester = derive { name="polyester"; version="1.0.2"; sha256="0mv25jgdfw74f1y68zz292qx27ar6w2413nml4nipfpv6krh37vm"; depends=[Biostrings IRanges S4Vectors]; };
-ppiStats = derive { name="ppiStats"; version="1.32.0"; sha256="1hjzcc9g9bszn9h24wr7v3vj8ili0z1dpgbk8pkf209iyjv7l9mz"; depends=[ScISI Biobase Category graph]; };
-prada = derive { name="prada"; version="1.42.0"; sha256="1yw2lzs7bdi7fb5hfy6jq3br1hzc9by4vv16vrnhm7v41nsi7y1a"; depends=[Biobase Biobase BiocGenerics]; };
-prebs = derive { name="prebs"; version="1.6.0"; sha256="12fyiz7mmxvmwwxkf2l0yypmsm8wlyvdpbxlcs0ip82mcya4kfgs"; depends=[GenomicAlignments affy GenomicRanges IRanges]; };
-predictionet = derive { name="predictionet"; version="1.12.0"; sha256="1smz1zcaivd28y59qxp34r9b04jxar3ldsvx4kbfn70axwvwhcsq"; depends=[RBGL]; };
-preprocessCore = derive { name="preprocessCore"; version="1.28.0"; sha256="0bbsnid3bdbpaxdww1zxp34sj95fhkgxlsjggpw46kdzryf01j84"; depends=[]; };
-proBAMr = derive { name="proBAMr"; version="1.0.1"; sha256="11fgl1w0nhfdnk3fm2x5d1749w82i1jj76nazsifsd087wf0hl3l"; depends=[IRanges AnnotationDbi GenomicRanges Biostrings GenomicFeatures rtracklayer]; };
-procoil = derive { name="procoil"; version="1.16.0"; sha256="18bifg3sf0jwm2c4gzc632qnl8b27qn48jpw5cx5gk1cwqmwjh6z"; depends=[]; };
-prot2D = derive { name="prot2D"; version="1.4.0"; sha256="0plsndlbrq8pyx0b4r3xn7qakk78kdlhx776jmd2sx5x2bqc53z4"; depends=[Biobase limma Mulcom impute qvalue]; };
-proteinProfiles = derive { name="proteinProfiles"; version="1.6.0"; sha256="1cvwqgxgn87bj2shag7sqz9xkp83qzqvx2x34jacndg3ypjakhwx"; depends=[]; };
-proteoQC = derive { name="proteoQC"; version="1.2.0"; sha256="05chpx2brp7snfgzc6xqp88mla463389cs0mdgb8159v86qy76dw"; depends=[MSnbase rTANDEM]; };
-puma = derive { name="puma"; version="3.8.0"; sha256="00q69f16mp40h623lgxqxj9xgfcfkz6551dgmiv0mckcparyl2xa"; depends=[Biobase affy oligo Biobase affy affyio]; };
-pvac = derive { name="pvac"; version="1.14.0"; sha256="05jmvv4c71gsavsdnkzskldhlg9yprgvfavah3ik9mvsldk6cqqy"; depends=[affy Biobase]; };
-pvca = derive { name="pvca"; version="1.6.0"; sha256="1kbb5vwff8wxq5j3cikgpibi2n2d9v97z7gm28yzc63ymyvl9ngn"; depends=[Biobase vsn]; };
-qcmetrics = derive { name="qcmetrics"; version="1.4.1"; sha256="1r5qs19fgwryjqyf9wsdn0lkyb2hisn3akp87qhc9rs8rf9w469w"; depends=[Biobase S4Vectors]; };
-qpcrNorm = derive { name="qpcrNorm"; version="1.24.0"; sha256="1db7w2w0ss1xx990h5xp6354xfyjdb5r5898zz2i2sgn0l2k5fpc"; depends=[Biobase limma affy]; };
-qpgraph = derive { name="qpgraph"; version="2.0.5"; sha256="188v0bpgd5a7c0gby8vzljfagl8k3gynyv7c9a96miyyl0qlxn0s"; depends=[annotate graph Biobase S4Vectors BiocParallel AnnotationDbi IRanges GenomeInfoDb GenomicRanges GenomicFeatures Rgraphviz]; };
-qrqc = derive { name="qrqc"; version="1.20.0"; sha256="1phmcd4a097h9jj8c8cqwvvgg10cc5cvn7b1ghylh1ddp5npxz4c"; depends=[Biostrings biovizBase Rsamtools Biostrings biovizBase Rsamtools]; };
-quantro = derive { name="quantro"; version="1.0.0"; sha256="0cqs7vigv7yfamwq8jjs61xxlq8c3kl3gc5sd4y8382j1rdcipjk"; depends=[Biobase minfi]; };
-quantsmooth = derive { name="quantsmooth"; version="1.32.0"; sha256="1q66x7kw2pmm81xifb49agl4akgprfjwlhsa692bwprvi9vq6z73"; depends=[]; };
-qusage = derive { name="qusage"; version="1.6.0"; sha256="16c5rrvqz784m49556h9six1p7r7mxfjwmms6lz416r9cvjg9khh"; depends=[limma Biobase]; };
-qvalue = derive { name="qvalue"; version="1.43.0"; sha256="169cfpwgq4lpapipwrc6yczfxgc9wczq47xf2vzl7wdp8arrblqz"; depends=[]; };
-r3Cseq = derive { name="r3Cseq"; version="1.12.1"; sha256="0df52ccial9axnpmawap3pfvmjdgnl8pfvcgjwyvddrg2xbi8n32"; depends=[Rsamtools rtracklayer qvalue]; };
-rBiopaxParser = derive { name="rBiopaxParser"; version="2.4.0"; sha256="0jcwf7a24w5ccm93fwqcvlbp54k18v68dnalqbr5dqb9jl6ncfzy"; depends=[]; };
-rGADEM = derive { name="rGADEM"; version="2.14.0"; sha256="0303nl790qvay6qdh45acc3yvw8hxw2gy7lsxmnl5gn3sk23cbnh"; depends=[Biostrings IRanges BSgenome seqLogo Biostrings IRanges seqLogo]; };
-rHVDM = derive { name="rHVDM"; version="1.32.0"; sha256="151pcx2dnfplkpdhxmvfd8dl0dkaggy96fi5h1zkgbzjggn6ig07"; depends=[affy Biobase]; };
-rMAT = derive { name="rMAT"; version="3.16.0"; sha256="0vad1qhslvqcvva78i7isxmd9llcwn06vjhvayk2a6f38hfd4m69"; depends=[BiocGenerics IRanges Biobase affxparser BiocGenerics IRanges Biobase affxparser]; };
-rRDP = derive { name="rRDP"; version="1.0.0"; sha256="06rd9dmsrpp1k70iap9y6vfxgrg77mdd5g67q4qspmfm3srrig8y"; depends=[Biostrings]; };
-rSFFreader = derive { name="rSFFreader"; version="0.14.0"; sha256="10bnliqpmch3fgnmi0cnq4xkh66r1r5k72asnlmmh9jcfi5ziaqy"; depends=[ShortRead Biostrings IRanges S4Vectors IRanges XVector Biostrings]; };
-rTANDEM = derive { name="rTANDEM"; version="1.6.1"; sha256="17gv6rbhbmn0v1bsqn5cd78wd6g415dcr72pg0h2r6cxyc611qjv"; depends=[]; };
-rTRM = derive { name="rTRM"; version="1.4.0"; sha256="06kfxb4rmq38xpmd53bnbgfg5w275ik88x1my829lk441prj2vi6"; depends=[AnnotationDbi]; };
-rTRMui = derive { name="rTRMui"; version="1.4.0"; sha256="1pd4fjzi4qlghy7si8g63dm4rrk1nzvpxr4yf5fzd0k48fyhmz0r"; depends=[rTRM MotifDb]; };
-rain = derive { name="rain"; version="1.0.1"; sha256="01dlpz9cdwxkgfdmshyh9hy4clsx0yk12nlndgz06gjr07l7ip2q"; depends=[multtest]; };
-rama = derive { name="rama"; version="1.40.0"; sha256="1bmx8f0nvqfnl756mzf6m0d392hlvz6swlvs2m07abj0ka32z6jb"; depends=[]; };
-randPack = derive { name="randPack"; version="1.12.0"; sha256="16ykrzdhhns5nww7jqh4vax6v96wkhsj3capxbq510ljb97zpayy"; depends=[Biobase]; };
-rbsurv = derive { name="rbsurv"; version="2.24.0"; sha256="0cnhdfpwgxx3fbj8zvhrzlkv0qhgs3v05ql7x91ningg554isvz8"; depends=[Biobase]; };
-reb = derive { name="reb"; version="1.44.0"; sha256="10lalx5fdrgfi4z557ciq445bdnp31ihdcphniw58v0cm1nirl0i"; depends=[Biobase idiogram]; };
-regionReport = derive { name="regionReport"; version="1.0.5"; sha256="16k82hlyspcldhdl6kwixjdwd3drchdwmc9bb7s8yd8ijhqh8xdm"; depends=[derfinder derfinderPlot GenomeInfoDb GenomicRanges ggbio IRanges]; };
-rfPred = derive { name="rfPred"; version="1.4.0"; sha256="0r55i8sdy0zjv1lf8wyafysgvh8krsghhbc1h2nblfab8875v4z7"; depends=[Rsamtools GenomicRanges IRanges]; };
-rhdf5 = derive { name="rhdf5"; version="2.10.0"; sha256="1lb0wni0l2k18p6n88chdgm132xv4ff0p5ah95z08k3vajgm4afp"; depends=[zlibbioc]; };
-riboSeqR = derive { name="riboSeqR"; version="1.0.5"; sha256="19i703ykbm0f9rfc08nrzf6b9d3nin4illf35kljf0nlmmpj68f7"; depends=[GenomicRanges]; };
-rnaSeqMap = derive { name="rnaSeqMap"; version="2.24.0"; sha256="06q1a6zyxzarimwyiq4bszs5s0s921i0d3d59hifgkvarlqf0ki9"; depends=[Biobase Rsamtools GenomicAlignments GenomicRanges IRanges edgeR DESeq]; };
-roar = derive { name="roar"; version="1.2.0"; sha256="0xq8pjjzvcwl1wh91kla7rws1bx7gc1v246al4piymmjisivz3wq"; depends=[GenomicRanges GenomicAlignments rtracklayer S4Vectors]; };
-rols = derive { name="rols"; version="1.8.0"; sha256="10p8lcifff39cmnx34hmhfs11yi4jd8xp0h0blhwhv4dmnp5bn9j"; depends=[Biobase]; };
-rpx = derive { name="rpx"; version="1.2.0"; sha256="1cq569spv8k54xpl6kh2lw8xvs4kj25vgq8nvj9akisipbnf1n8f"; depends=[]; };
-rqubic = derive { name="rqubic"; version="1.12.0"; sha256="0l90rzajw966k96c5azzi4p5b0dnc5ydjf2bvfjbnfs21kgcqkqg"; depends=[Biobase]; };
-rsbml = derive { name="rsbml"; version="2.24.1"; sha256="1xq64md8i1yjbngpds96b73ywa1qsfraiw21dckl731hqggw6q6a"; depends=[BiocGenerics BiocGenerics graph]; };
-rtracklayer = derive { name="rtracklayer"; version="1.26.3"; sha256="1731z3hnhn6kqyijw2haq7jqh0izpvqxywrnk1mfmn7wx9sp6nbj"; depends=[GenomicRanges BiocGenerics S4Vectors IRanges XVector GenomeInfoDb Biostrings zlibbioc Rsamtools GenomicAlignments S4Vectors IRanges XVector]; };
-sRAP = derive { name="sRAP"; version="1.6.0"; sha256="0js1b4mad83635n08g2bz259knknffa4zqqh4an697fz0q4gkf55"; depends=[qvalue]; };
-sSeq = derive { name="sSeq"; version="1.4.0"; sha256="1c6an23l69210zqb76b4n66pn7iin4im9g8wm750k567w92xs3ry"; depends=[]; };
-safe = derive { name="safe"; version="3.6.1"; sha256="18s8p3cjyxka3xkwmmzbp8pnqn3rvd85zan46f41j8awgaxw8db2"; depends=[AnnotationDbi Biobase]; };
-sagenhaft = derive { name="sagenhaft"; version="1.36.0"; sha256="19s55x4d5s0imkkyg9ihrc7l4q1w4xm8n4pg7l18zx4xb316fv88"; depends=[]; };
-sangerseqR = derive { name="sangerseqR"; version="1.3.4"; sha256="0as1ynn1lvffiaflfiijjglyjx9ms812vyb6qlhdcp4cz2lzjyzk"; depends=[Biostrings]; };
-sapFinder = derive { name="sapFinder"; version="1.4.0"; sha256="1h4b44hz8016ggvqxcjzkxk84xgk1d1vxa9y3nxxwr4cz6f6i7k2"; depends=[rTANDEM]; };
-savR = derive { name="savR"; version="1.4.0"; sha256="1baj5bnx32wwq3y3xwgqvp57629a3jfvjvzhnyn6f9qac68d4c67"; depends=[]; };
-scsR = derive { name="scsR"; version="1.3.2"; sha256="17xmcbsch7p45a3ir11n6izw92jipbflp0778bvqrhwjaahi41kx"; depends=[STRINGdb BiocGenerics Biostrings IRanges]; };
-segmentSeq = derive { name="segmentSeq"; version="2.0.1"; sha256="0kxmnsfdpmsaxdhdvskh8g87ldvnkdm09lhbpq0irbi7k9nq94g3"; depends=[baySeq ShortRead GenomicRanges IRanges S4Vectors]; };
-seqCNA = derive { name="seqCNA"; version="1.10.0"; sha256="01aa533a6qsjsw5yr47c2k2dmxpgzgxixn99dmbc336kwrq6vhgf"; depends=[GLAD]; };
-seqLogo = derive { name="seqLogo"; version="1.32.1"; sha256="1bnhfmwbzprpyz6p7rwsk1idcjg0plhxwfs9v4k8wsx83mcdyral"; depends=[]; };
-seqTools = derive { name="seqTools"; version="1.0.0"; sha256="1q41w150w4j73ihsy6pibn1dd48jfs7fhgymq9rd0510mrlp770i"; depends=[zlibbioc zlibbioc]; };
-seqbias = derive { name="seqbias"; version="1.14.0"; sha256="0q5zxf4ds4adnp1cxlldyfli844lf1zd1sz9rn7gv34hmfyw1jdc"; depends=[GenomicRanges Biostrings zlibbioc Rsamtools]; };
-seqplots = derive { name="seqplots"; version="1.2.0"; sha256="17rrfiphrdsajr5mbigcbv4wgd8x72wb37my1wzdw54nhg8l69w6"; depends=[IRanges BSgenome rtracklayer GenomicRanges Biostrings GenomeInfoDb S4Vectors]; };
-shinyMethyl = derive { name="shinyMethyl"; version="1.0.2"; sha256="0n73qi3vvlqyg87ww3azwakvz6z6saz59rknv8267p48dzasnivc"; depends=[BiocGenerics minfi]; };
-shinyTANDEM = derive { name="shinyTANDEM"; version="1.4.0"; sha256="1vb3s7qvrh0b42dnbdyyrxx89rq0f1m5dygcygsl1mgc587spgm7"; depends=[rTANDEM]; };
-sigPathway = derive { name="sigPathway"; version="1.34.0"; sha256="05l87qm8myfnqj3pndnazsfjy7c7ib5mphr31xiyrz8ipl2y7462"; depends=[]; };
-sigaR = derive { name="sigaR"; version="1.10.0"; sha256="0z7pnrizmindckl1vafg1dpp7xwp7pvx6hr8d5diwyaw0mfj430f"; depends=[Biobase CGHbase marray]; };
-siggenes = derive { name="siggenes"; version="1.40.0"; sha256="1w1c187dqdhk3wqh8bgslw85zwr6pzfkq0dlgs9d58fsrky0wsay"; depends=[Biobase multtest]; };
-simpleaffy = derive { name="simpleaffy"; version="2.42.0"; sha256="0wz3kzn5fy4bkpzq9njs2lz6a29mcz91a5gvfrf06wq5gsn6l3rz"; depends=[BiocGenerics Biobase affy genefilter gcrma BiocGenerics Biobase affy genefilter gcrma]; };
-simulatorZ = derive { name="simulatorZ"; version="1.0.0"; sha256="1sabjya98prprq10gbra4c3maclw1y38r4826b9vzxp41ragm1sf"; depends=[Biobase GenomicRanges]; };
-sizepower = derive { name="sizepower"; version="1.36.0"; sha256="0lgb7gsqa8cq5mjkp7hxidkvhms7nj8cyxhxcb2716d6ivllkvff"; depends=[]; };
-snapCGH = derive { name="snapCGH"; version="1.36.0"; sha256="17c5gybk7mpl4w9aja01hxirjs6rygqpinsqlfmsnjk9pknqw43d"; depends=[limma DNAcopy aCGH DNAcopy GLAD limma tilingArray]; };
-snm = derive { name="snm"; version="1.14.0"; sha256="1d979rbxpypbc2s192p5f6ynps2pbap3ym4gig14fjrd61gzcmrb"; depends=[]; };
-snpStats = derive { name="snpStats"; version="1.16.0"; sha256="1560mxm9ni4wlssw2kdd86nflb45rcjv8060zqiainy1jd92ys0x"; depends=[BiocGenerics zlibbioc]; };
-spade = derive { name="spade"; version="1.14.0"; sha256="0fhhmx80zjixd1wp55aphkb9pfvgm03pd2kg4yxim1iic7n09xm3"; depends=[Biobase flowCore]; };
-specL = derive { name="specL"; version="1.0.0"; sha256="03igq0cb134kfr36g3gsvzj8n4hz5zwmg2j0pd4zhr500d9sxfs7"; depends=[]; };
-spikeLI = derive { name="spikeLI"; version="2.26.0"; sha256="1hdrrlkiiqkaypp425cgggjcwb3gdsd0v0frqqx3bb845r91x42x"; depends=[]; };
-spkTools = derive { name="spkTools"; version="1.22.0"; sha256="0dw27jfmdjn75ga086a19inl6xc02jpwk9vjc3yvayp67i8nh1mb"; depends=[Biobase Biobase]; };
-spliceR = derive { name="spliceR"; version="1.8.0"; sha256="1v6451mry0sjj1bi3s2da6dymq1650pk1g7h09ckdvsvhnyrfmxq"; depends=[cummeRbund rtracklayer GenomicRanges IRanges]; };
-spliceSites = derive { name="spliceSites"; version="1.4.0"; sha256="1y93fzsmw15gqn1l9i4qkds4xfvlsv9ynlwkxwfdrd5vy6sclahr"; depends=[Biobase Biostrings seqLogo BiocGenerics]; };
-splicegear = derive { name="splicegear"; version="1.38.0"; sha256="1sxvd2qvvbhcrsmij8jz9r9l6zk2a8idmhrrf1hkmkx8a9xkdq9r"; depends=[Biobase annotate Biobase]; };
-splots = derive { name="splots"; version="1.32.0"; sha256="1bz76nvplm862072m4dd6bm7qb93fld7lwsx18jah7xkjrr3alp6"; depends=[]; };
-spotSegmentation = derive { name="spotSegmentation"; version="1.40.0"; sha256="02k3d3kz8rssn6c8y5ywwsynh3zjnkxwy7w4d16zx4haivrpziyn"; depends=[]; };
-sscore = derive { name="sscore"; version="1.38.0"; sha256="0bxclcx3xbsqs1i2w80rh8amzsxzv5mavbpy81pgrqsnqhldriyd"; depends=[affy affyio]; };
-ssize = derive { name="ssize"; version="1.40.0"; sha256="1fb3c28v7p3fgpciv9b7v7clyiyyaiaz6r4hjkvdcf236xs1kjwm"; depends=[]; };
-ssviz = derive { name="ssviz"; version="1.0.0"; sha256="0y0nvlvwfhf1nhghxaigskh4rsjjfy59lnbr2s8jqswzk39n6843"; depends=[Rsamtools Biostrings]; };
-staRank = derive { name="staRank"; version="1.8.0"; sha256="0yzcz2vpx7gxswy6rxdp59qfsa2jiy35kya2i2n3yrpnhb0s7wbm"; depends=[cellHTS2]; };
-stepNorm = derive { name="stepNorm"; version="1.38.0"; sha256="0267smjz132lj2ka0ccvgdn12r416hc9wqlbdzix59i80py45hwh"; depends=[marray marray]; };
-stepwiseCM = derive { name="stepwiseCM"; version="1.12.0"; sha256="1p5yhz2s4ad30p47bx0vmvfdm8y7adcvdi5ydqg3g0zdh2akvg21"; depends=[tspair Biobase]; };
-supraHex = derive { name="supraHex"; version="1.4.0"; sha256="1qq2cbq04623qp1yb22dkiz5d7gz7fspia4601jhair1c129vm4g"; depends=[]; };
-survcomp = derive { name="survcomp"; version="1.16.0"; sha256="1z03krc9lznry1izaxb91jbw3zghajxfiigfkgdj0n2a5rd3yhwk"; depends=[]; };
-sva = derive { name="sva"; version="3.12.0"; sha256="1x2lh2fl53zv1r97p4gq8jvip99wq2j1wpps7j2qlfh9fclwbbsk"; depends=[genefilter]; };
-switchBox = derive { name="switchBox"; version="1.0.0"; sha256="1m5icry27l4hh2h3f7kfph0qc332n2l0miazhaqfazilyw3pvyai"; depends=[]; };
-synapter = derive { name="synapter"; version="1.8.4"; sha256="1j4dm2d43ji2xrj9835724qn7ji7vsi5rsvmc0m0za81lz2zvak3"; depends=[MSnbase qvalue multtest Biobase Biostrings cleaver BiocParallel]; };
-systemPipeR = derive { name="systemPipeR"; version="1.0.12"; sha256="0d0kpgkn2nlh54v5rdiacjykh6vxyf20yw18dji0q1l8ggklmz04"; depends=[Rsamtools Biostrings ShortRead BiocGenerics limma edgeR DESeq2 GOstats annotate]; };
-tRanslatome = derive { name="tRanslatome"; version="1.4.0"; sha256="173vb64bd3qxy4hikn7d31nvlpzvpby12akgc5pqbg5hcgm8rqkm"; depends=[limma sigPathway anota DESeq edgeR RankProd topGO GOSemSim Heatplus]; };
-ternarynet = derive { name="ternarynet"; version="1.10.0"; sha256="1n6dh3y2bpvcccbpglw788i236bh36n9npk6rc1j4n7pi0wimzcl"; depends=[]; };
-tigre = derive { name="tigre"; version="1.20.0"; sha256="09298m4wg2f1ra45rhv8srsbzqz8cczy50aw2iiavzdrzibns31r"; depends=[BiocGenerics Biobase AnnotationDbi annotate]; };
-tilingArray = derive { name="tilingArray"; version="1.44.0"; sha256="15bgljy9xd2sljklvmha361himkzaxkrjis9wcz9z6wjzfr14h1r"; depends=[Biobase affy vsn genefilter]; };
-timecourse = derive { name="timecourse"; version="1.38.0"; sha256="14w87dqivhfp3xyxhlxvnka7v1rhyxxmmdygkjydag3yh4z6zfi4"; depends=[Biobase limma marray]; };
-tkWidgets = derive { name="tkWidgets"; version="1.44.0"; sha256="0s23ajd61jbklkhp1cr7nq4ssw8nkvr77r4viv4z3gnkndrflnl3"; depends=[widgetTools DynDoc]; };
-topGO = derive { name="topGO"; version="2.18.0"; sha256="1py4r0pq777r2xwvhyp80dyycfy072dsg1z0jd7vf7nn4x3xyjfl"; depends=[graph Biobase AnnotationDbi graph Biobase AnnotationDbi]; };
-trackViewer = derive { name="trackViewer"; version="1.2.0"; sha256="00fc063zh9wk6dfp2haxrgk79nxcczf25jkkr1s22lh2rnr6q3r3"; depends=[GenomicRanges GenomicAlignments GenomicFeatures Gviz Rsamtools rtracklayer]; };
-tracktables = derive { name="tracktables"; version="1.0.0"; sha256="116y9ghw40qvf10m6g8pbd29rr67jijk13a1k7a3w70jh96vin1q"; depends=[IRanges GenomicRanges XVector Rsamtools]; };
-triform = derive { name="triform"; version="1.8.0"; sha256="0f02a7jc3l2scs6pimc6kvv5f7f67gvxk7y55im7jzhzwb39bv42"; depends=[IRanges IRanges BiocGenerics]; };
-trigger = derive { name="trigger"; version="1.12.0"; sha256="0y8vzwh6a2ijf8g60sdnkhzq8pj0n9kxy60zb491n5pv9n84j5ws"; depends=[qvalue sva]; };
-trio = derive { name="trio"; version="3.4.0"; sha256="0nc35ijljibzlxbfdps5z0snrgjwsx6hnwkg85m03mkmhgv6q513"; depends=[]; };
-triplex = derive { name="triplex"; version="1.6.0"; sha256="1r4z9fb5xfmgvs22pc2ma0r9sxhknqa096wk9ff728jrmfdfnrzl"; depends=[S4Vectors IRanges XVector Biostrings GenomicRanges S4Vectors IRanges XVector Biostrings]; };
-tspair = derive { name="tspair"; version="1.24.0"; sha256="1y48148ym5h493rvjvnf3kgw1gdi29m2l938lmig28c6xad3wjzi"; depends=[Biobase]; };
-tweeDEseq = derive { name="tweeDEseq"; version="1.12.0"; sha256="1gymsalw3bh0j8mvnwvslim9nramdpcrm7xq2fyy6zmqnfmfkc6n"; depends=[limma edgeR cqn]; };
-twilight = derive { name="twilight"; version="1.42.0"; sha256="0zwsbaqpya7rw012915l6q87xnqrz0pg0iqmrax7qfrv2ryv6ac2"; depends=[Biobase Biobase]; };
-unifiedWMWqPCR = derive { name="unifiedWMWqPCR"; version="1.2.0"; sha256="04r07537pnnnrby2lnrm8qiihz2530h3ah9jbrw5knwc2jpi83qy"; depends=[BiocGenerics HTqPCR]; };
-vbmp = derive { name="vbmp"; version="1.34.0"; sha256="12x2kmjidpap9qbyppc8kka0z7ijsjhkipfs8kh91wfr6i4a89sm"; depends=[]; };
-viper = derive { name="viper"; version="1.2.0"; sha256="1nx10mg6flll5ypg8bzx23703w27vf01xry1vbw211g7hhkb10hd"; depends=[Biobase]; };
-vsn = derive { name="vsn"; version="3.34.0"; sha256="14kvfvpfc2dvkv4692vdkj39agd9l7fh77jynpi5c5c2wkgamm4w"; depends=[Biobase affy limma]; };
-vtpnet = derive { name="vtpnet"; version="0.6.0"; sha256="1bs3nj4zairvf1hhwvrmckzj8w8q942kfrhphwv7gcyhgza1l01x"; depends=[graph GenomicRanges gwascat]; };
-wateRmelon = derive { name="wateRmelon"; version="1.6.0"; sha256="0akw9a6d6y04icgcfwsd6f5icbiwckkgrj4d7j7wqs96yzyjm47i"; depends=[limma methylumi lumi ROC]; };
-wavClusteR = derive { name="wavClusteR"; version="2.0.0"; sha256="0xnnmj5hqnf7zl6qfs4fc2srp1liq8xhjxphkaiqyk10h2442nbb"; depends=[GenomicRanges Rsamtools Biostrings GenomicFeatures IRanges rtracklayer]; };
-waveTiling = derive { name="waveTiling"; version="1.8.1"; sha256="19rlyhzid11x8d56lj5c8w127ycs6maw4xs8qqia4dsc6jdii617"; depends=[oligo oligoClasses Biobase Biostrings GenomeGraphs affy preprocessCore GenomicRanges IRanges]; };
-weaver = derive { name="weaver"; version="1.32.0"; sha256="16bqpq2p013m14rjzqh4r57skfj5k93xvl0s7cp8wyq6zhisp1lv"; depends=[]; };
-webbioc = derive { name="webbioc"; version="1.38.0"; sha256="00rwccdbvv7vk8gspkqizjjshh9rccmxzzb95yhgg6qw2n10afgd"; depends=[Biobase affy multtest annaffy vsn gcrma qvalue multtest qvalue BiocInstaller]; };
-widgetTools = derive { name="widgetTools"; version="1.44.0"; sha256="0lzf99s9jzhl98i6lr45n76jkaycjxrb0nrwi8hcc7rq30x0adjd"; depends=[]; };
-xcms = derive { name="xcms"; version="1.42.0"; sha256="16icfyl3whvwgfzyz56wjl9ynrvd7bznghd6rczczkzcq2sgiqdf"; depends=[mzR BiocGenerics Biobase]; };
-xmapbridge = derive { name="xmapbridge"; version="1.24.0"; sha256="01xdx7pda642479xg2kzy2bbxqwmwg4zlhigqpmycv13pmrpqa8c"; depends=[]; };
-xps = derive { name="xps"; version="1.26.1"; sha256="1pqdkm8g9x74l0dfwyrcsqqmi0c8i9dkiq4sydg60zygdipmi65x"; depends=[]; };
-yaqcaffy = derive { name="yaqcaffy"; version="1.26.0"; sha256="0n3pjvmx833yby6ip3cww42lsk3c4hl1csvd72480l28cwr4n4zz"; depends=[simpleaffy]; };
-zlibbioc = derive { name="zlibbioc"; version="1.12.0"; sha256="05ps73iwf1s57nksla5mbbbf35447j131qnk27aw8hgkwbq3hrrs"; depends=[]; }; 
+ABSSeq = derive { name="ABSSeq"; version="1.5.0"; sha256="1glzkjq7ih4vqwfcvl7rc8dmlb5a3pl5f6x21df6fljdxiff23vk"; depends=[Rcpp]; };
+ABarray = derive { name="ABarray"; version="1.37.0"; sha256="06pvn3nbi0gnj6inwyy1hy6r0m6axm4aqw36966va02vby4937ln"; depends=[Biobase multtest]; };
+ACME = derive { name="ACME"; version="2.25.0"; sha256="1kni4wvp7dw1yy813dyq2329a0v8wgskq0wr2yvkpjiagg5j36km"; depends=[Biobase BiocGenerics]; };
+ADaCGH2 = derive { name="ADaCGH2"; version="2.9.3"; sha256="0rs0ih1zjrmqm56hh9vdz737c9g009x70q4h7g9d612xb38cbfhv"; depends=[aCGH bit cluster DNAcopy ff ffbase GLAD snapCGH tilingArray waveslim]; };
+AGDEX = derive { name="AGDEX"; version="1.17.0"; sha256="16lgq2ycyql4ky2i8x3cd7w77gr946bcb9pp70gb9m1arhjcz41j"; depends=[Biobase GSEABase]; };
+AIMS = derive { name="AIMS"; version="1.1.0"; sha256="1k4004b5a5db0rr6dbbbqv1llq1p815b5m5a0q7pqc9vgv0yvv9b"; depends=[Biobase e1071]; };
+ALDEx2 = derive { name="ALDEx2"; version="1.1.1"; sha256="01fk2kkrkz2vv7339a82sn1lk3h3c0amkm0n1651am3jdal7bqzs"; depends=[GenomicRanges IRanges S4Vectors SummarizedExperiment]; };
+ARRmNormalization = derive { name="ARRmNormalization"; version="1.9.0"; sha256="1kiqi93ivdgqz0m8msi084kbzjx75sb143mb5q27qc9cmc91l6x2"; depends=[]; };
+ASEB = derive { name="ASEB"; version="1.13.0"; sha256="1706mpsszwbii70r01vf641lvcaaj1ng2z7kwmnbi0idjab4qqbv"; depends=[]; };
+ASGSCA = derive { name="ASGSCA"; version="1.3.0"; sha256="0pfbg7wgm20jy6kkjgv7ix91bkry6xhlm537fs9ww5l6p9q4ia0c"; depends=[MASS Matrix]; };
+ASSET = derive { name="ASSET"; version="1.7.0"; sha256="1a3kgllz4nb7n28ip25qdwbawwzbm0l0mfyqlx98zm0ln9crv6mm"; depends=[MASS msm rmeta]; };
+ASSIGN = derive { name="ASSIGN"; version="1.5.0"; sha256="0jkp9v3yn6y6izyma86nxkk4nrlh9dkgxd842k4wr1fha06ix807"; depends=[gplots msm Rlab]; };
+AffyCompatible = derive { name="AffyCompatible"; version="1.29.1"; sha256="1ldqlm7i5fklv1ih0ghpwh1ark2ccdqnrwdxrn4np5c4pv3zckgl"; depends=[Biostrings RCurl XML]; };
+AffyExpress = derive { name="AffyExpress"; version="1.35.0"; sha256="1ysn3c8mpnq3rcir3vqcv0yb0sd41qwm2nmh1j8jx5iq254s5l5z"; depends=[affy limma]; };
+AffyRNADegradation = derive { name="AffyRNADegradation"; version="1.15.0"; sha256="0x7mwlzvcxplvijprch0anwbfmj1qkrxqd9rc6f4p0zf88z2csal"; depends=[affy]; };
+AffyTiling = derive { name="AffyTiling"; version="1.27.0"; sha256="1jqil9hd10cwsqdlxjd7c8s0p9fvrfcqxiw8rfrq117c8dlgl7w6"; depends=[affxparser affy preprocessCore]; };
+AgiMicroRna = derive { name="AgiMicroRna"; version="2.19.0"; sha256="1m1fi6pdqwnfn21a4i7psxdg12bn6bhvcsi43bhwlzxzkrz00257"; depends=[affy affycoretools Biobase limma preprocessCore]; };
+AllelicImbalance = derive { name="AllelicImbalance"; version="1.7.13"; sha256="195pad565yczbxili0zg6329dxnwaj70vhxz3lizm3pbidlv56jn"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges lattice Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; };
+AnalysisPageServer = derive { name="AnalysisPageServer"; version="1.1.1"; sha256="0qbnwxwc205623fmzvhwrhr2jii2bgrd0mcdwi4811pab0dmzf49"; depends=[Biobase graph log4r rjson]; };
+AnnotationDbi = derive { name="AnnotationDbi"; version="1.31.16"; sha256="0dxgcdvbq8vi97i6r64x5s4gngynk2hqdjmhfnbk648sq8h2rbrf"; depends=[Biobase BiocGenerics DBI IRanges RSQLite S4Vectors]; };
+AnnotationForge = derive { name="AnnotationForge"; version="1.11.3"; sha256="1a3fhinjmrxl400p6w452ar31h40lwd8vlf8snsqqk21vs5mmnla"; depends=[AnnotationDbi Biobase BiocGenerics DBI RSQLite S4Vectors]; };
+AnnotationFuncs = derive { name="AnnotationFuncs"; version="1.19.0"; sha256="1qjvkbqpyhwibdqv1c4n2z5wjnzx0h3kdas3fs33jhb597bxhl1y"; depends=[AnnotationDbi]; };
+AnnotationHub = derive { name="AnnotationHub"; version="2.1.26"; sha256="0py74da9j3j0h0pvf1kvfzf3cixn52x9l5ac7igans4cm5pizr0k"; depends=[AnnotationDbi BiocGenerics BiocInstaller httr interactiveDisplayBase RSQLite S4Vectors]; };
+ArrayExpress = derive { name="ArrayExpress"; version="1.29.1"; sha256="0gyckxsmmh81ykf7mj952h2a4z58xrf9lbnmv884hz7zj317lf83"; depends=[affy Biobase limma XML]; };
+ArrayExpressHTS = derive { name="ArrayExpressHTS"; version="1.19.0"; sha256="0qyd9jhkvw4lxqjvix28yzdx08hi7vf77ynlqxcl2q1lb3gmbxar"; depends=[Biobase BiocGenerics biomaRt Biostrings bitops DESeq edgeR GenomicRanges Hmisc IRanges R2HTML RColorBrewer rJava Rsamtools sampling sendmailR ShortRead snow svMisc XML]; };
+ArrayTV = derive { name="ArrayTV"; version="1.7.0"; sha256="11dlq4lmzw0x8z2qrxff6xlcilp95nd71jpdvg3i5yni3ws6z5m1"; depends=[DNAcopy foreach oligoClasses]; };
+ArrayTools = derive { name="ArrayTools"; version="1.29.0"; sha256="1n7ism9ga87mbcbjc155md76gvnzli1vlakzx5ax6hnxcdjzp9n4"; depends=[affy Biobase limma xtable]; };
+AtlasRDF = derive { name="AtlasRDF"; version="1.5.0"; sha256="12l629rpkwdmvxjy5kb3d9f72mhcn22nlp7kwgfw79syqilb9wz6"; depends=[hash SPARQL]; };
+BAC = derive { name="BAC"; version="1.29.0"; sha256="0xhhpxv8z9f0q4hb1l327x4vzm3jyk1xx9dbbpnhlyjfj9hzzn38"; depends=[]; };
+BADER = derive { name="BADER"; version="1.7.0"; sha256="0v1p0s77pi2vxjpsn578741gyr2mgvkppfcaf75qkhs9b6g2m3ps"; depends=[]; };
+BAGS = derive { name="BAGS"; version="2.9.0"; sha256="0hhgi874kq98nclmlsqkng0g9gs2jy9qkwl6vmgb7p37h61pmjli"; depends=[Biobase]; };
+BCRANK = derive { name="BCRANK"; version="1.31.0"; sha256="12w7yk5911ll3nrksxv861z4lzymakk4yfsqm5j0y6wf1mwd7wyc"; depends=[Biostrings]; };
+BEAT = derive { name="BEAT"; version="1.7.0"; sha256="0s4mkp09n913dw2s5d7hms7rbcqzi1rsk8dmc5fdc3wlp7hw277w"; depends=[Biostrings BSgenome GenomicRanges ShortRead]; };
+BEclear = derive { name="BEclear"; version="1.1.0"; sha256="1icaxkxwr2rkii4ffflna51jxz4f1ijszrxj1ndz6r4gbrzdy374"; depends=[Matrix snowfall]; };
+BGmix = derive { name="BGmix"; version="1.29.0"; sha256="0s2s6ylbw2wvdkn28842ghsflhcmcn156zw3fxmbdnz7xs29qs1f"; depends=[KernSmooth]; };
+BHC = derive { name="BHC"; version="1.21.0"; sha256="0f8qqid4qxw52zjvvm024wcmn0afr7avkr4hr2jfyvs0ga49khx8"; depends=[]; };
+BRAIN = derive { name="BRAIN"; version="1.15.0"; sha256="09yd3xf3h85wdf56p38mnspyqbswl2v8zb81yg0a008p0l5ax8xr"; depends=[Biostrings lattice PolynomF]; };
+BSgenome = derive { name="BSgenome"; version="1.37.1"; sha256="0nmj1wdp1xlkf603sw1h0k3x0jywj3ykaws8sdb4hizb52pgzw8z"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; };
+BUS = derive { name="BUS"; version="1.25.0"; sha256="1n3s0pw4ijgh927mahwqybks8i6ysybp7xn4a86nrbpr2kqhznrd"; depends=[infotheo minet]; };
+BaseSpaceR = derive { name="BaseSpaceR"; version="1.13.1"; sha256="0w7hdzncjds0dji03ldgk4zyrpr3qal2lzdlhlbc8809fjlp3jb9"; depends=[RCurl RJSONIO]; };
+Basic4Cseq = derive { name="Basic4Cseq"; version="1.5.1"; sha256="0a4b11rv5ilv84qqpvf320c3knaajg4hlby5km0zzms3vbisr4hi"; depends=[Biostrings caTools GenomicAlignments GenomicRanges RCircos]; };
+BayesPeak = derive { name="BayesPeak"; version="1.21.0"; sha256="0mz00mk6gmc5g79iifn5hzfwf7s568n6s6wy46vrnnnnr3sk9w49"; depends=[IRanges]; };
+BeadDataPackR = derive { name="BeadDataPackR"; version="1.21.0"; sha256="1h9zq2zjwslgwzz5zghjkszhy9d6bcrpssk6x15a9i0wb6nkrdxm"; depends=[]; };
+BiGGR = derive { name="BiGGR"; version="1.5.0"; sha256="1q9m870pyhxd1627n94c259094k8jyrg22ni26qpnxkapj18lr0b"; depends=[hyperdraw hypergraph LIM rsbml stringr]; };
+BiRewire = derive { name="BiRewire"; version="2.1.0"; sha256="1rf3j0rfbzyd17ashj99fjahilz4pgil7ch6iyfzipb6894faxwi"; depends=[igraph slam]; };
+BiSeq = derive { name="BiSeq"; version="1.9.1"; sha256="0s8mhynjprg4bpn9p88rzpm6na9581bzmyv4wljsdqlz0wcb87az"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; };
+BicARE = derive { name="BicARE"; version="1.27.0"; sha256="19hslc78nijcs6gyxzzcd8856wa1gf5dsrvm4x6r9lprfrk7d7fb"; depends=[Biobase GSEABase multtest]; };
+BioMVCClass = derive { name="BioMVCClass"; version="1.37.0"; sha256="1k4ba98cjaqhy33vsmflnwasi0vxr30dvj6861pz625m87fyp2g6"; depends=[Biobase graph MVCClass Rgraphviz]; };
+BioNet = derive { name="BioNet"; version="1.29.0"; sha256="0q86sfv29y8haq8zhxc93p7zl1nh8aq0yj31hvw8xx6g75xlapaz"; depends=[AnnotationDbi Biobase graph igraph RBGL]; };
+BioSeqClass = derive { name="BioSeqClass"; version="1.27.0"; sha256="1pv7zibcrgbh7xlf2j04jc0m2ddlx8wa198ikvwi85qm09hrvmmk"; depends=[Biobase Biostrings class e1071 foreign ipred klaR nnet party randomForest rpart scatterplot3d tree]; };
+Biobase = derive { name="Biobase"; version="2.29.1"; sha256="12cckssh7x4dd8vaapp5nfc5bfcqls8k3rblcfi17z5cpi0jply6"; depends=[BiocGenerics]; };
+BiocCaseStudies = derive { name="BiocCaseStudies"; version="1.31.0"; sha256="05nj9i9y8clf406bjcflj8lsrp9x9iw6my1bdqnxg3nv2krp37xn"; depends=[Biobase]; };
+BiocCheck = derive { name="BiocCheck"; version="1.5.6"; sha256="0gpmrqvj31n73bqljf23wbsw3hp44hl3z1jhc2q86s3mw6hlcfip"; depends=[BiocInstaller biocViews codetools devtools graph httr knitr optparse]; };
+BiocGenerics = derive { name="BiocGenerics"; version="0.15.2"; sha256="16r4jq5yq3xg8s212dngrf6a63ggb87654cf45f4386c56gcczgg"; depends=[]; };
+BiocInstaller = derive { name="BiocInstaller"; version="1.19.6"; sha256="09f3ybmaklac71ixd4imfig7861qc339kpqhjybq97a3yw8zcksa"; depends=[]; };
+BiocParallel = derive { name="BiocParallel"; version="1.3.26"; sha256="1dy3i5ypjxnz57yw2pyfm7778fdficbp6abbsrq79rgr1dvfbqyr"; depends=[futile_logger snow]; };
+BiocStyle = derive { name="BiocStyle"; version="1.7.4"; sha256="0wlydy1a3pspnyjg5vl0657z620n5vlhx99hxisskbrsr026mhmg"; depends=[]; };
+Biostrings = derive { name="Biostrings"; version="2.37.2"; sha256="0j6701qgrnphsy9p34sf3s6d91j1zbd824zwv9rsfdmdffbkqq3b"; depends=[BiocGenerics IRanges S4Vectors XVector zlibbioc]; };
+BitSeq = derive { name="BitSeq"; version="1.13.0"; sha256="1d397bcdyi3d35l1q1661spm3xhr7hqlsrjr5a2ybsjs3wqkf4fj"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; };
+BrainStars = derive { name="BrainStars"; version="1.13.0"; sha256="07wygi0fw0ilg404gx1ifswr61w6qlg8j0vkmnsr0migm70rgzzg"; depends=[Biobase RCurl RJSONIO]; };
+BridgeDbR = derive { name="BridgeDbR"; version="1.3.0"; sha256="1z72dd7vvbsz6nc4asfc9qim6svxhmfbpi8f876d45kds2dfgyd5"; depends=[RCurl rJava]; };
+BrowserViz = derive { name="BrowserViz"; version="1.1.4"; sha256="1ilzf8k0bqrwidk01b7yyc0mhrif02j5a6aqi70mvxfy1dfj5yj0"; depends=[BiocGenerics httpuv jsonlite Rcpp]; };
+BrowserVizDemo = derive { name="BrowserVizDemo"; version="1.1.0"; sha256="1q04fsl3nxwlmzwxn27bgd66pcjy8sywsmpdny6206kl6rs2a9yk"; depends=[BiocGenerics BrowserViz httpuv jsonlite Rcpp]; };
+BubbleTree = derive { name="BubbleTree"; version="1.1.0"; sha256="1vyv0klid43jwcjkrsm6fmgqaigb1f76i0q3yc38qm5q8z55vx8n"; depends=[dplyr GenomicRanges geosphere IRanges mixdist plyr shape]; };
+BufferedMatrix = derive { name="BufferedMatrix"; version="1.33.0"; sha256="0db35771j5hnifn9avs2m1zazr07pga4ybr0vq5q5a1krg73kqn0"; depends=[]; };
+BufferedMatrixMethods = derive { name="BufferedMatrixMethods"; version="1.33.0"; sha256="14x330kwv4fj1l974xr0djy6xvmi6z8z7wc3ri3d824rxc6glcld"; depends=[BufferedMatrix]; };
+CAFE = derive { name="CAFE"; version="1.5.0"; sha256="1kzy0g0kwvzvlls316cpvwrvnv5m9vklzjjsiiykvfq1wd21s96f"; depends=[affy annotate Biobase biovizBase GenomicRanges ggbio ggplot2 gridExtra IRanges]; };
+CAGEr = derive { name="CAGEr"; version="1.11.0"; sha256="1rz1r55aji1av70c661d7czwipxah9507h5i9hcngy84ic1m72f1"; depends=[beanplot BSgenome data_table GenomicRanges IRanges Rsamtools rtracklayer som VGAM]; };
+CALIB = derive { name="CALIB"; version="1.35.0"; sha256="08fgzq80ws4i6i1ppbqxdq3ba9qfdv4h0dyi08f9k91kfh1y31x4"; depends=[limma]; };
+CAMERA = derive { name="CAMERA"; version="1.25.0"; sha256="1nl5va3f436vwpcirhcpcph13s2vbh8965v8iizi29vk83gbyfza"; depends=[Biobase graph Hmisc igraph RBGL xcms]; };
+CAnD = derive { name="CAnD"; version="1.1.1"; sha256="1zyp4z86fda83wdhjfdh1ck9ynvdvrrxcvdlgld7h4x295r35r3s"; depends=[ggplot2 reshape]; };
+CFAssay = derive { name="CFAssay"; version="1.3.0"; sha256="04zgyvm0rrs780z1vn4zzrh3w01lnhaywyn5ar6dvxcyxnr2y3qs"; depends=[]; };
+CGEN = derive { name="CGEN"; version="3.3.0"; sha256="03sdyw6z5xw9ndwkwdli7bz6v0ki8w2slx30v5lgm31lqgl4lpf6"; depends=[mvtnorm survival]; };
+CGHbase = derive { name="CGHbase"; version="1.29.0"; sha256="1a9j82jgppbajl6zkkymjdq61lgyrv8aavr2lzi88ipafmqajnvd"; depends=[Biobase marray]; };
+CGHcall = derive { name="CGHcall"; version="2.31.0"; sha256="0f03gx73sfn8x1rnynviyg12fs1j4wfz7adh4n1lrvph89y4lkhv"; depends=[Biobase CGHbase DNAcopy impute snowfall]; };
+CGHnormaliter = derive { name="CGHnormaliter"; version="1.23.0"; sha256="1rd7lbzmqch6lkbn36ymmp3hnnllqbgwb0rasziqk9ys6633fzv6"; depends=[Biobase CGHbase CGHcall]; };
+CGHregions = derive { name="CGHregions"; version="1.27.0"; sha256="0ah7cxaq1qvgwxvgp8jzkwyzdqa4yji7ylhdq2whysvc73aciikg"; depends=[Biobase CGHbase]; };
+CMA = derive { name="CMA"; version="1.27.0"; sha256="10bbmlyd8370dr1azrsljlslail5i9pwy8m524laqq85196lf6lv"; depends=[Biobase]; };
+CNAnorm = derive { name="CNAnorm"; version="1.15.0"; sha256="13wraamvj1vr5iiwknz5g1jq8zmq3gqzcsphn156rmxivpkxmk8l"; depends=[DNAcopy]; };
+CNEr = derive { name="CNEr"; version="1.5.3"; sha256="101cf9hpz3ak04xf9i9b6wbmmdjfgawfvxsb4zflv6avjdqnsqbm"; depends=[Biostrings DBI GenomeInfoDb GenomicAlignments GenomicRanges IRanges RSQLite rtracklayer S4Vectors XVector]; };
+CNORdt = derive { name="CNORdt"; version="1.11.0"; sha256="1c01ra85j04wdwaqzvc3qvva9sf878qcy4xaz8kxd6b49ringcia"; depends=[abind CellNOptR]; };
+CNORfeeder = derive { name="CNORfeeder"; version="1.9.0"; sha256="1d2lskj5vlg0ry3gkm61i1cahf6m9vg2599qj6v8z7w9wmp37cb7"; depends=[CellNOptR graph]; };
+CNORfuzzy = derive { name="CNORfuzzy"; version="1.11.0"; sha256="0kzlad2mkfvqxv4lv8hcc10cspcg31yp49r6pdn2vakif5gbpnz3"; depends=[CellNOptR nloptr]; };
+CNORode = derive { name="CNORode"; version="1.11.0"; sha256="0cmv9s23pcd48fpzg92i5h2g10z49n091f2lnarldsay3sj8wlcy"; depends=[CellNOptR genalg]; };
+CNTools = derive { name="CNTools"; version="1.25.0"; sha256="05k939z92mmqajirl4w872qnh59093dpxk6da5bcmrr43h65dn95"; depends=[genefilter]; };
+CNVrd2 = derive { name="CNVrd2"; version="1.7.0"; sha256="18970q33dw51b7jas26dl2cr2ghwjxrllgmqykq0f50b55sv01p7"; depends=[DNAcopy ggplot2 gridExtra IRanges rjags Rsamtools VariantAnnotation]; };
+CNVtools = derive { name="CNVtools"; version="1.63.0"; sha256="005xw4rbp4zdg78jhrq5l4201kq5889py0jh49kfjpk000nvvmj9"; depends=[survival]; };
+CODEX = derive { name="CODEX"; version="1.1.0"; sha256="0k3ncnngblbx8hhv5p31dac4s9asjc8hddn4b0z20zkqncpgs16s"; depends=[GenomeInfoDb Rsamtools]; };
+COHCAP = derive { name="COHCAP"; version="1.7.0"; sha256="0clr1jh4jnq54phsnl90zfqy1rqy9zpzffyqpziahpfifsaq0kl2"; depends=[WriteXLS]; };
+COMPASS = derive { name="COMPASS"; version="1.7.2"; sha256="0c83fsrmi7d2888pa3lnln42mlbnjgvpxw337vdh3dar1185a5b0"; depends=[abind clue data_table knitr plyr RColorBrewer Rcpp scales]; };
+CORREP = derive { name="CORREP"; version="1.35.0"; sha256="0hlij2ch8r3lv130hvyshb82lfqz2c7kr56bka1ghmg6jp0xf1n6"; depends=[e1071]; };
+COSNet = derive { name="COSNet"; version="1.3.3"; sha256="0l9sn0cki0mxacxv0bwp3cczcl8rscx8g3lnr0r448f13j8198f4"; depends=[]; };
+CRISPRseek = derive { name="CRISPRseek"; version="1.9.1"; sha256="1wrjvnr8i50b9r4h8m84whs5nhqxi1w91c622kid7adwmhzq3ri2"; depends=[BiocGenerics Biostrings BSgenome seqinr]; };
+CRImage = derive { name="CRImage"; version="1.17.0"; sha256="1sab95gngwi7c333n9hnbd9fdvdy9i69pjpx5ic5799s7qr03llw"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; };
+CSAR = derive { name="CSAR"; version="1.21.0"; sha256="1wn7zxmy5ssj2jkk2624j42yv67wdcigp5ksb6fc2kzpgnvqmxl1"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
+CSSP = derive { name="CSSP"; version="1.7.0"; sha256="1ydxj358sfaygzjvh0b042p7gymjyl7nr5cnxrh8c7x2mv2hdh4d"; depends=[]; };
+CancerMutationAnalysis = derive { name="CancerMutationAnalysis"; version="1.13.0"; sha256="0c3yjscd1jlgfl869vnv37qdb0y5gicnja1why9ws95qqgmij6zl"; depends=[AnnotationDbi limma qvalue]; };
+Cardinal = derive { name="Cardinal"; version="1.1.0"; sha256="0n87rzcfvy5km17n2bk2k85szlwlw7h8g1yqasvpk73sxmjlfc0a"; depends=[Biobase BiocGenerics fields irlba lattice ProtGenerics signal sp]; };
+Category = derive { name="Category"; version="2.35.1"; sha256="12y0mgr7lsdb4hhb95qgylxfbdjiqwv1gs9iknvgnyj37gdpxajz"; depends=[annotate AnnotationDbi Biobase BiocGenerics genefilter graph GSEABase Matrix RBGL]; };
+CausalR = derive { name="CausalR"; version="0.99.12"; sha256="038raljgrdwsp8dzc5qbzbwr8j8n7dlwmx0jx8liq153l3nwp01p"; depends=[igraph]; };
+CellNOptR = derive { name="CellNOptR"; version="1.15.0"; sha256="14x68i7wss44hmfihyqkw340lc0dpsccqsn1l2a0zs0gfkwgw3a5"; depends=[ggplot2 graph hash RBGL RCurl Rgraphviz XML]; };
+CexoR = derive { name="CexoR"; version="1.7.2"; sha256="1rhz97c8avmx9g3zf4vdzqb56v98dlh9xw74nywqvznn7wbq8rvp"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; };
+ChAMP = derive { name="ChAMP"; version="1.7.0"; sha256="0ll50qyq9k8x4bv30dap6g6lpavh7diwxllm501jgg39kp956d08"; depends=[DNAcopy GenomicRanges impute IRanges limma marray minfi plyr preprocessCore RPMM sva wateRmelon]; };
+ChIPQC = derive { name="ChIPQC"; version="1.5.1"; sha256="0nvpq2m267nf3aiv7xvw1fkwnr53qqzhs2nmyhjiqdw9ckias134"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors]; };
+ChIPXpress = derive { name="ChIPXpress"; version="1.11.0"; sha256="11aifr69ss1hakrhba985bwz6k1sqkpzvv7gnzn8cgqnzxyr2i6b"; depends=[affy biganalytics bigmemory Biobase frma GEOquery]; };
+ChIPpeakAnno = derive { name="ChIPpeakAnno"; version="3.3.2"; sha256="0ww3ddnvdc561lhz27h8n3ywi1xpx1cbsqk2i8m5rkpykkkkr2dh"; depends=[AnnotationDbi BiocGenerics BiocInstaller biomaRt Biostrings BSgenome GenomicFeatures GenomicRanges graph IRanges limma multtest RBGL VennDiagram]; };
+ChIPseeker = derive { name="ChIPseeker"; version="1.5.4"; sha256="10h2gbc1irzlkv9b12k9z54csaav6qpvjvjbgqzh7dcm03l14fah"; depends=[AnnotationDbi BiocGenerics boot dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gtools IRanges magrittr plotrix plyr RColorBrewer rtracklayer S4Vectors]; };
+ChIPseqR = derive { name="ChIPseqR"; version="1.23.1"; sha256="0di3vh865m84cvl9mkwiqmz8jz5y54q4ayc0fbzjkwh790qxb48j"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; };
+ChIPsim = derive { name="ChIPsim"; version="1.23.1"; sha256="13kniwvwa49n1kc9114ljn1fmzaiyb2nh33if596llql60p7nd23"; depends=[Biostrings IRanges ShortRead XVector]; };
+ChemmineOB = derive { name="ChemmineOB"; version="1.7.1"; sha256="04agfsdzccsvvvis6vy1gg83gfs4nrph950v6bbzgk15ki32rsjz"; depends=[BH BiocGenerics Rcpp zlibbioc]; };
+ChemmineR = derive { name="ChemmineR"; version="2.21.7"; sha256="01riyjdjxnw1fybps1g5sbbcv1yn3mn222wg3w825m7lcb1hg13z"; depends=[BH BiocGenerics DBI digest ggplot2 Rcpp RCurl rjson]; };
+ChromHeatMap = derive { name="ChromHeatMap"; version="1.23.0"; sha256="1z0w201lbhsapx4p0gn9x65zxjbzh8g51jjfcvy61xrqbbyshwv1"; depends=[annotate AnnotationDbi Biobase BiocGenerics IRanges rtracklayer]; };
+ClassifyR = derive { name="ClassifyR"; version="1.3.0"; sha256="0jn7pd3mh6m6cqg5dldn8vmi3ffjhv1hn3gvvy6bl1g80a0xf5mb"; depends=[Biobase BiocParallel locfit ROCR]; };
+Clomial = derive { name="Clomial"; version="1.5.0"; sha256="1kxc0bgfrfj0bbx696513mn8n6vficdsd3ag5pqs5xz2bb7vx4qn"; depends=[matrixStats permute]; };
+Clonality = derive { name="Clonality"; version="1.17.0"; sha256="1irb13wi5lq28nni0b89fy06vvjwpzigfdwfmzjscrmhzdysrfa6"; depends=[DNAcopy]; };
+CoCiteStats = derive { name="CoCiteStats"; version="1.41.0"; sha256="0shp06qy8cvwq0723xc7qxrxv9qhkids3gq3aqqhlvn1s66nw7nq"; depends=[AnnotationDbi]; };
+CoGAPS = derive { name="CoGAPS"; version="2.3.1"; sha256="037abxyw5xkj537di2q3q75isb2qr2h2czr5a6q30g8qzh1xj3ik"; depends=[BH gplots RColorBrewer Rcpp]; };
+CoRegNet = derive { name="CoRegNet"; version="1.5.0"; sha256="14yq1f005fcfmfp88h2fy05gdgbskjws11qbdh0ndx3sf93nzxm2"; depends=[arules igraph shiny]; };
+CompGO = derive { name="CompGO"; version="1.5.0"; sha256="128ib7w0jxba0p32s796i864b73zjfxac56znd0v4wv4vxv3jiv6"; depends=[GenomicFeatures ggplot2 pathview pcaMethods RDAVIDWebService reshape2 Rgraphviz rtracklayer]; };
+ComplexHeatmap = derive { name="ComplexHeatmap"; version="1.1.9"; sha256="127w7bhjmzzav3y6vz3dhr5da37vzl86xriy32rhiyppbxx34s78"; depends=[circlize colorspace GetoptLong RColorBrewer]; };
+ConsensusClusterPlus = derive { name="ConsensusClusterPlus"; version="1.23.0"; sha256="13iikfh234d2z4k487lb3shmnrfijygrf6gz3x481gba2psnbjyw"; depends=[Biobase cluster]; };
+CopyNumber450k = derive { name="CopyNumber450k"; version="1.5.0"; sha256="0mjhmh4shgckv43zvg4yqr17jfi9p9xnc40fwy9fw9c4vjcfsvsj"; depends=[Biobase BiocGenerics DNAcopy minfi preprocessCore]; };
+CopywriteR = derive { name="CopywriteR"; version="2.1.2"; sha256="0lja77qdfbsl9cc1nv4jbrjwiq8bb93ja6na8hqksrrm9g1qs4q4"; depends=[BiocParallel chipseq data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; };
+CorMut = derive { name="CorMut"; version="1.11.0"; sha256="0s92bh3610frxbm0gqvlznay70dy7x61hvc0qgh6xmcyz0llx27g"; depends=[igraph seqinr]; };
+Cormotif = derive { name="Cormotif"; version="1.15.0"; sha256="1v36ylwkxr6yqasckmmj2dkr7s72f39srhwvm93rs1rl7kw4dc4p"; depends=[affy limma]; };
+CoverageView = derive { name="CoverageView"; version="1.5.0"; sha256="0ix1xy0in3nzd1lm9imy1wrm347dib5nfa6105zkc993bnh11wls"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; };
+DART = derive { name="DART"; version="1.17.1"; sha256="1z7lf4d9yjcyikq9j3348z5sxjqaly46c0ls7f9cl8nnqdpw7w42"; depends=[igraph]; };
+DASiR = derive { name="DASiR"; version="1.9.0"; sha256="0b3b7kmhsd6bb1s57c89h495j1ax6779wfca112fq6ba3z4dih3n"; depends=[Biostrings GenomicRanges IRanges XML]; };
+DAVIDQuery = derive { name="DAVIDQuery"; version="1.29.0"; sha256="0gvm6qjx8y61nbnbz66md74pfc4awj4900pjr8q1m5sip5yzbxj2"; depends=[RCurl]; };
+DBChIP = derive { name="DBChIP"; version="1.13.0"; sha256="0gk9kgmyp9540sq5gpbn77ii8rl5kjm0nxsr80r5cn4q9gsjyyis"; depends=[DESeq edgeR]; };
+DECIPHER = derive { name="DECIPHER"; version="1.15.0"; sha256="1kbdsqvkznzsk4ljy91r5ipndwxb8hhkm46qqkakgr24mia3yvl1"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; };
+DEDS = derive { name="DEDS"; version="1.43.0"; sha256="1z049ppkrbyp0xjpiygz5i6rbxbv3vvnvspwz2vv77495v7ykj6z"; depends=[]; };
+DEGraph = derive { name="DEGraph"; version="1.21.0"; sha256="17f04qngcx8y4glr5wiryi8fifbla8fxh8nb6wagnrai5x6vhzis"; depends=[graph KEGGgraph lattice mvtnorm NCIgraph R_methodsS3 R_utils RBGL Rgraphviz rrcov]; };
+DEGreport = derive { name="DEGreport"; version="1.3.0"; sha256="0qz7zmg9r76pwmn4hfpwagaij080pwmj7373h9fiiqk51416pqkq"; depends=[coda edgeR ggplot2 Nozzle_R1 plyr quantreg rjags]; };
+DEGseq = derive { name="DEGseq"; version="1.23.0"; sha256="0993f140wwv9z9l53f9g74x7l28bflxq7wdcbilfz7ijhh7isr7p"; depends=[qvalue samr]; };
+DESeq = derive { name="DESeq"; version="1.21.0"; sha256="13f6phdf9g325dlpn38l7zrq3mzldhldil134acxi9p3l50bx23y"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; };
+DESeq2 = derive { name="DESeq2"; version="1.9.10"; sha256="1mvxhw7nzcv2p5kr90yyv29dl8vqcvz9y4z0vgpbl6s4qh741br4"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; };
+DEXSeq = derive { name="DEXSeq"; version="1.15.6"; sha256="19hjrdfl28jma8jb00b0dywqpj07bas623avqaw0c2xns2zrb224"; depends=[Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools statmod stringr]; };
+DFP = derive { name="DFP"; version="1.27.0"; sha256="0xcipbhfzvrpbm6dh2y3lbvfbwpn4wly32sssfm702zik5wm9dy1"; depends=[Biobase]; };
+DMRcaller = derive { name="DMRcaller"; version="1.1.1"; sha256="1g7q7cwivvb0m2y4fixvbxp51zfag1jv66bdlai3gawr94pcx56y"; depends=[GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; };
+DMRcate = derive { name="DMRcate"; version="1.5.0"; sha256="12q6if9lljia37zwhcc9fpcp9vhkp1qhzchpypwwyn2j4344bmp3"; depends=[limma minfi]; };
+DMRforPairs = derive { name="DMRforPairs"; version="1.5.0"; sha256="0d14qgx07xq7wa687a2znpfw0zcg8ccvxjawkjdbi6ayjwpb6zd7"; depends=[GenomicRanges Gviz R2HTML]; };
+DNAcopy = derive { name="DNAcopy"; version="1.43.0"; sha256="1v1i4bfkblimdmazv29csqr46jaiv8lncihgywvq5wfn8ccr7xl9"; depends=[]; };
+DOQTL = derive { name="DOQTL"; version="1.3.0"; sha256="0g3nyamqdhjg8105kcq6nsgjgqzcxkp04194j82v1xb31baj53bg"; depends=[annotate annotationTools Biobase BiocGenerics biomaRt corpcor GenomicRanges hwriter IRanges mclust QTLRel Rsamtools RUnit S4Vectors XML]; };
+DOSE = derive { name="DOSE"; version="2.7.7"; sha256="0bdn26akwvhw3aksxw68mjn1s462vv9y12v6wlykpp2sla1naywv"; depends=[AnnotationDbi ggplot2 GOSemSim igraph plyr qvalue reshape2 scales]; };
+DSS = derive { name="DSS"; version="2.7.1"; sha256="1vf9j3clb7ac1zm8wx8vi0kmsv6p6533qxv4932gjcs5nn482516"; depends=[Biobase bsseq]; };
+DTA = derive { name="DTA"; version="2.15.0"; sha256="0amibwj5mnm2plkf3ys8sgy4lpwr60fnvika0psdrahgb4blmkzp"; depends=[LSD scatterplot3d]; };
+DeconRNASeq = derive { name="DeconRNASeq"; version="1.11.0"; sha256="0665chwpbs2pw753nb2x65cs9r9ghb5123bsrzrv6pz2p3ni8yz7"; depends=[ggplot2 limSolve pcaMethods]; };
+DiffBind = derive { name="DiffBind"; version="1.15.3"; sha256="1akx65vi8razwpfxnvilh4x1vb8qbsfr2q8lygsb3imfrrb83q44"; depends=[amap edgeR GenomicAlignments GenomicRanges gplots IRanges lattice limma locfit RColorBrewer Rsamtools SummarizedExperiment systemPipeR zlibbioc]; };
+DirichletMultinomial = derive { name="DirichletMultinomial"; version="1.11.1"; sha256="1ds5gghxs4nb171cvahnb70s86hpqib6alijjfgdzcax09miw72v"; depends=[IRanges S4Vectors]; };
+DriverNet = derive { name="DriverNet"; version="1.9.0"; sha256="0visiafw9m7i0yy70fvnmdkhg9z946sg5hdl5vnvj8c6g3mfacxy"; depends=[]; };
+DrugVsDisease = derive { name="DrugVsDisease"; version="2.9.0"; sha256="1wmw1r0x7kkmp47743aq0pp71wamnf5gsk6bhz6rdvswzb12iyqk"; depends=[affy annotate ArrayExpress BiocGenerics biomaRt GEOquery limma qvalue RUnit xtable]; };
+DupChecker = derive { name="DupChecker"; version="1.7.0"; sha256="02wwwnx3w8rxiassd62xr295paw8py9pqsk1396qb5k773l6bfxv"; depends=[R_utils RCurl]; };
+DynDoc = derive { name="DynDoc"; version="1.47.0"; sha256="0gpmhqav4dx8p86pkh18fpmlki60zqaz00m2zhziiawigbrz41ph"; depends=[]; };
+EBImage = derive { name="EBImage"; version="4.11.2"; sha256="1mnpwf844lgz4agk9w67pyppz6kq6fqbmarpv6pkwc9p3jb05nsy"; depends=[abind BiocGenerics fftwtools jpeg locfit png tiff]; };
+EBSeq = derive { name="EBSeq"; version="1.9.1"; sha256="0c65iiw9qxk6pqmnnjxdncpfvddgbvdfghshb4qpida4zp1yc7sg"; depends=[blockmodeling gplots]; };
+EBSeqHMM = derive { name="EBSeqHMM"; version="1.3.1"; sha256="0lyf363f1wfgacrj5cyq8n3f3ssl5q400mn2q94cpai6k0qmvgs1"; depends=[EBSeq]; };
+EBarrays = derive { name="EBarrays"; version="2.33.0"; sha256="1zvfqf49chiks5vmj5ki89pvy14bm1cman47n3ybba1gg8z8mw94"; depends=[Biobase cluster lattice]; };
+EBcoexpress = derive { name="EBcoexpress"; version="1.13.0"; sha256="0fl0a7xasqcwvjlgf3h51akyhwpras2865m2idz1nmacm42q1w79"; depends=[EBarrays mclust minqa]; };
+EDASeq = derive { name="EDASeq"; version="2.3.0"; sha256="1myqbcgyah325yh04cb70bgrqpwgikdkda77m4g5g5zn570s6bd3"; depends=[aroma_light Biobase BiocGenerics DESeq IRanges Rsamtools ShortRead]; };
+EDDA = derive { name="EDDA"; version="1.7.0"; sha256="0dyyhnc9v232njqnrcaq78g2m1qws30qcf6bsswq2di235ymk2g0"; depends=[baySeq DESeq edgeR Rcpp ROCR snow]; };
+ELBOW = derive { name="ELBOW"; version="1.5.0"; sha256="0lnc5hw2x4p9yd561w9dwplf7q2slcaghxsh5796bmyxjxhxanpy"; depends=[]; };
+ELMER = derive { name="ELMER"; version="0.99.8"; sha256="1xvl12f8wmwc8crdl810vkszgxik649w0km581jvpy1azr6z2vjk"; depends=[GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges minfi reshape S4Vectors]; };
+EMDomics = derive { name="EMDomics"; version="1.1.0"; sha256="1i2dy2vqig0lkd13xy4yfwq58zyjiqavpmcvg6pvkh2l48ap1jds"; depends=[BiocParallel emdist ggplot2 matrixStats]; };
+ENCODExplorer = derive { name="ENCODExplorer"; version="1.1.3"; sha256="054cm1ldas26gv4xn16w3i25kykwnikj4s83g7sxxdij93m5rmlb"; depends=[jsonlite RSQLite]; };
+ENVISIONQuery = derive { name="ENVISIONQuery"; version="1.17.0"; sha256="1dnlw62hwysij63yc856c2sncgfwdq0rpmcds6i6wigdcfd21w8q"; depends=[rJava XML]; };
+ENmix = derive { name="ENmix"; version="1.1.4"; sha256="1pcbklxcfnfqwlfwax9n8aql2gaak596gph4xqq5xf64mj5f4qqv"; depends=[Biobase doParallel foreach geneplotter MASS minfi preprocessCore sva wateRmelon]; };
+EasyqpcR = derive { name="EasyqpcR"; version="1.11.1"; sha256="0s2jyg6b14wbyl0c1n89c7bi7p88g7s1rz8d830p9hh2x75ly6zj"; depends=[gWidgetsRGtk2 matrixStats plotrix plyr]; };
+EnrichmentBrowser = derive { name="EnrichmentBrowser"; version="1.3.0"; sha256="1a6w3drh5x20wvxpx1cb5q2h9k6jh65v9hh81924lcp4baplpx31"; depends=[Biobase graph KEGGgraph KEGGREST limma MASS mixtools neaGUI qvalue RColorBrewer Rgraphviz safe SPIA stringr]; };
+ExiMiR = derive { name="ExiMiR"; version="2.11.0"; sha256="1gmfrn3jq4pz5wmijywhxr0kx79534fhrfnqyhjmqq3s9sjn2cbh"; depends=[affy affyio Biobase limma preprocessCore]; };
+ExpressionView = derive { name="ExpressionView"; version="1.21.0"; sha256="026w9f119j26c1078nwg4rhfc54wlb3i56iy8bi0cjpvbm4p698f"; depends=[AnnotationDbi bitops caTools eisa isa2]; };
+FEM = derive { name="FEM"; version="2.3.0"; sha256="112mmah33ar36cpqjwanrfyhdwjfympnvmxwirxbbnk0nfp9cvpr"; depends=[AnnotationDbi corrplot igraph impute limma marray Matrix]; };
+FGNet = derive { name="FGNet"; version="3.3.2"; sha256="000s0f6wki96w5di3gxhn70iwyrnwj5359s3a5ns2a0z0qnr05ww"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; };
+FISHalyseR = derive { name="FISHalyseR"; version="1.3.0"; sha256="0xnmww7ldyxghq7mfjc3zhx1qahskmny3088ar0mj9v4iz4a987q"; depends=[abind EBImage]; };
+FRGEpistasis = derive { name="FRGEpistasis"; version="1.5.0"; sha256="1vvcphgirvghzjvic5yq6nl229ryc0y4kp5qd25kgspbcgblg01q"; depends=[fda MASS]; };
+FlowRepositoryR = derive { name="FlowRepositoryR"; version="1.1.1"; sha256="1xxljbdbvxg1dbm82r86frw2bskmfrl6rv98xz0z4jfc0w4ag3pd"; depends=[RCurl XML]; };
+FlowSOM = derive { name="FlowSOM"; version="1.1.0"; sha256="0k5pw46dbhm6nssr5szj251v3479xgky2iipihrdvp5lr5lhxilq"; depends=[BiocGenerics ConsensusClusterPlus flowCore igraph tsne]; };
+FourCSeq = derive { name="FourCSeq"; version="1.3.3"; sha256="1zny041wfg4c9cfdx0kr3a5nsl48zn6fccb8dixp4q61nm621zra"; depends=[Biobase Biostrings DESeq2 fda GenomicAlignments GenomicRanges ggbio ggplot2 gtools LSD Matrix reshape2 Rsamtools rtracklayer SummarizedExperiment]; };
+FunciSNP = derive { name="FunciSNP"; version="1.11.0"; sha256="19kl14yzqr59ngrd5ygr858zbvx23rihlr4vw5bfdy9cgwlvlzab"; depends=[AnnotationDbi ChIPpeakAnno GenomicRanges ggplot2 IRanges plyr reshape Rsamtools rtracklayer scales snpStats VariantAnnotation]; };
+GENE_E = derive { name="GENE.E"; version="1.9.0"; sha256="10c9mw9f619z2ai43qvagj7p1lsqpv90z8vzsyyxym614lvlqfzm"; depends=[RCurl rhdf5]; };
+GENESIS = derive { name="GENESIS"; version="1.1.0"; sha256="01d3yc5rc4y22znr7zf980m458qvnmjxpml353k7bkwyz6xyn0fj"; depends=[GWASTools]; };
+GEOmetadb = derive { name="GEOmetadb"; version="1.29.0"; sha256="1s9x3dbh61xisk5hwzqv3991savygdcwv5cww447w4bfgwffzplg"; depends=[GEOquery RSQLite]; };
+GEOquery = derive { name="GEOquery"; version="2.35.4"; sha256="1ny592c1s36a1hkgaqqyss65c190bw5612l23qc9y9qhf4sarq38"; depends=[Biobase RCurl XML]; };
+GEOsubmission = derive { name="GEOsubmission"; version="1.21.0"; sha256="1rr8k4myw7jibibclphj63hp4byk3v0cg37vnyc5b0iacdp8s9gn"; depends=[affy Biobase]; };
+GEWIST = derive { name="GEWIST"; version="1.13.0"; sha256="1mlzyjggv0rh9xk9pifshhdri3vapvzk2h47g75wx57yfapamcwn"; depends=[car]; };
+GGBase = derive { name="GGBase"; version="3.31.1"; sha256="0nyq5rv5mfvvh2h9f1d7b5agwhjagpzjgfm8x0bwpdbz6k691glx"; depends=[AnnotationDbi Biobase BiocGenerics digest genefilter GenomicRanges IRanges limma Matrix S4Vectors snpStats SummarizedExperiment]; };
+GGtools = derive { name="GGtools"; version="5.5.1"; sha256="0r16yc6j68baf7pl3f708ys745px6qgpgbvcjiqqg7vgcj4qyq0h"; 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 = derive { name="GLAD"; version="2.33.0"; sha256="19db59ry832vrbk86p1bppr52mwri2pz8iwx5ibg18pxr7pw6jw7"; depends=[]; };
+GOFunction = derive { name="GOFunction"; version="1.17.0"; sha256="0scjk4zlfrqv3z6ii0bvmhj3d880xyc2p5f4hqmfqn6cml0d6ncj"; depends=[AnnotationDbi Biobase graph Rgraphviz SparseM]; };
+GOSemSim = derive { name="GOSemSim"; version="1.27.3"; sha256="0d57my1zmlfsx1d1i55q82s4vzz6v7a7q8h8fkxxzs7wl8pjk5jh"; depends=[AnnotationDbi Rcpp]; };
+GOSim = derive { name="GOSim"; version="1.7.0"; sha256="0dzx6nnd8p4p5v5rsmbpw6wl0i1jq3n4s0qc8z4xnp2n2757r2z4"; depends=[annotate AnnotationDbi cluster corpcor flexmix graph Matrix RBGL Rcpp topGO]; };
+GOTHiC = derive { name="GOTHiC"; version="1.5.2"; sha256="1jxg3hfyy96nwgmpk4ivl2wp3i050n7zahbawiz6d8f2hxcv44zg"; depends=[BiocGenerics Biostrings BSgenome data_table GenomicRanges ggplot2 IRanges rtracklayer S4Vectors ShortRead]; };
+GOexpress = derive { name="GOexpress"; version="1.3.1"; sha256="0wqip9ibzjy73b431wlifb6c01c397wkl7nldpj3mvd25s73p102"; depends=[Biobase biomaRt ggplot2 gplots randomForest RColorBrewer stringr VennDiagram]; };
+GOstats = derive { name="GOstats"; version="2.35.1"; sha256="1almz6gc2xm3njz8pjvynpnniz7xdd8z5293cfvx91v11lz70v7f"; depends=[annotate AnnotationDbi AnnotationForge Biobase Category graph RBGL]; };
+GOsummaries = derive { name="GOsummaries"; version="2.3.0"; sha256="09c4grz9ljwrz37yv9k6gna9zxk708vxfz2190xz7za0mrql1k3k"; depends=[ggplot2 gProfileR gtable limma plyr Rcpp reshape2]; };
+GRENITS = derive { name="GRENITS"; version="1.21.0"; sha256="1lm0074dw0248vyj9wl99if489dx38ia8wscx61842jyi4qz7r2q"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; };
+GSAR = derive { name="GSAR"; version="1.3.0"; sha256="1mf7v3v7arcrkx1207wsr0ajjqk8ipq2j9fdd6677ard7xvdj6zl"; depends=[igraph]; };
+GSCA = derive { name="GSCA"; version="1.7.0"; sha256="1hv9r59fx1hbjnga26shb8crxji1bzmzjmwfbk1wrlm8dsikjnyg"; depends=[ggplot2 gplots RColorBrewer reshape2 rhdf5 shiny sp]; };
+GSEABase = derive { name="GSEABase"; version="1.31.3"; sha256="1jq3s3pha624gns7d7yf8qqgzq0fm3qgjrkwdkxgbpc7b09baiz0"; depends=[annotate AnnotationDbi Biobase BiocGenerics graph XML]; };
+GSEAlm = derive { name="GSEAlm"; version="1.29.0"; sha256="13ixp6vq9g9ag5rndc40gw64vny70zcj6lll7r7vz06p5i9b6kyk"; depends=[Biobase]; };
+GSRI = derive { name="GSRI"; version="2.17.0"; sha256="158dipqi9mh79d42pv5qsa1gwxz660kl474rdnkd59rnxh7ziyf3"; depends=[Biobase fdrtool genefilter GSEABase les]; };
+GSReg = derive { name="GSReg"; version="1.3.0"; sha256="07s60j68i1r64y8x8r1r9s6w020n41137cf2aj9hrsw6gn4ajh15"; depends=[]; };
+GSVA = derive { name="GSVA"; version="1.17.0"; sha256="0rk1srk95qia5ap69c2lysgv7r8qh50f50v9b569d2v2vjb0hpq5"; depends=[Biobase BiocGenerics GSEABase]; };
+GWASTools = derive { name="GWASTools"; version="1.15.8"; sha256="1rbpvscz7ghssxan02xs14cx7x69wi7vydai9q6ljl7nkazh4hgj"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf ncdf quantsmooth RSQLite sandwich survival]; };
+GeneAnswers = derive { name="GeneAnswers"; version="2.11.1"; sha256="15rf8syxhj3332d7f4jkvyby05r3iia7p1ryz1zv629waz6mr4nh"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; };
+GeneExpressionSignature = derive { name="GeneExpressionSignature"; version="1.15.0"; sha256="0wni584412af8a2wzk5r8nf63grw86d6fk74cmwksirw2734mmqs"; depends=[Biobase PGSEA]; };
+GeneGA = derive { name="GeneGA"; version="1.19.0"; sha256="0irfr4q55rda8acchgcqsksh6ija87fryj822nb3d4zklv9raqfv"; depends=[hash seqinr]; };
+GeneMeta = derive { name="GeneMeta"; version="1.41.0"; sha256="10c99i6bm3aid20xm59acqsa2hzvp5ym98nlb8fyscyigbrzvid8"; depends=[Biobase genefilter]; };
+GeneNetworkBuilder = derive { name="GeneNetworkBuilder"; version="1.11.0"; sha256="0ynjmb7a1jk2gzxynjzdh6qw90h3f2r7yxwi94ql7hq7l2jhl051"; depends=[graph plyr Rcpp]; };
+GeneOverlap = derive { name="GeneOverlap"; version="1.5.0"; sha256="0n1vy6hfzac73x1dy9abrgyhhs91zhikhy11zhw07j8ciswymm84"; depends=[gplots RColorBrewer]; };
+GeneRegionScan = derive { name="GeneRegionScan"; version="1.25.0"; sha256="0w7lfj2d0ih8gyr148digrfs5dmmixzyghx73vjcd60kk5bgcr80"; depends=[affxparser Biobase Biostrings RColorBrewer]; };
+GeneSelectMMD = derive { name="GeneSelectMMD"; version="2.13.0"; sha256="1yddwwln50v9ivsnv4hzy5azk0rs480plpplqc058xixjvyy2k1l"; depends=[Biobase limma MASS survival]; };
+GeneSelector = derive { name="GeneSelector"; version="2.19.0"; sha256="0i63g36hz26493i4676bbbwy71f3m928bj4bn7zxcf5ax4jqac1j"; depends=[Biobase limma multtest samr siggenes]; };
+GeneticsDesign = derive { name="GeneticsDesign"; version="1.37.0"; sha256="08awfvk4n6j3y1ncf0r7zwmiyywz9k3xflg5ll4ilxx5pjn8lrnn"; depends=[gmodels gtools mvtnorm]; };
+GeneticsPed = derive { name="GeneticsPed"; version="1.31.0"; sha256="17fs4gvirji3qp9ik480jpz6qrbq209sjhn57ipkaafvx7rw5j4i"; depends=[gdata genetics MASS]; };
+GenoView = derive { name="GenoView"; version="1.3.0"; sha256="09k9xjmx3qmsfr3a4vrfgs73r0xsymf5m4gl0zjjk4cnfk7bs41v"; depends=[biovizBase GenomicRanges ggbio ggplot2 gridExtra]; };
+GenomeGraphs = derive { name="GenomeGraphs"; version="1.29.0"; sha256="0kl2gapg7hnl4zfsamb3vwmj7z0vag7vd8viwh0pwqj0pd45dswa"; depends=[biomaRt]; };
+GenomeInfoDb = derive { name="GenomeInfoDb"; version="1.5.7"; sha256="1hk3q4wr87wflrcqrpdng70d42irf3v4i6av224pqq3h33j0iwpc"; depends=[BiocGenerics IRanges S4Vectors]; };
+GenomicAlignments = derive { name="GenomicAlignments"; version="1.5.9"; sha256="15zwx5z54cr3ix55m70682n1xxfbbx92z3m0qr7srsn8q9ycc8kj"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
+GenomicFeatures = derive { name="GenomicFeatures"; version="1.21.13"; sha256="1swk94rqpvfysr3x1r61ypq9vlw1ryc0iw0x6dazfjjchaln0h07"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors]; };
+GenomicFiles = derive { name="GenomicFiles"; version="1.5.3"; sha256="03iq136ff0dymfnwyizq9zyzr3smahwp8p6ifc7yf1hwd0nql3wa"; depends=[BiocGenerics BiocParallel GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; };
+GenomicInteractions = derive { name="GenomicInteractions"; version="1.3.3"; sha256="0z5c8n0xnyxrdhvffyx8mnpj2qhclknn1gjn3ikmw9cprzlbcb6n"; depends=[BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra igraph IRanges plotrix Rsamtools rtracklayer S4Vectors stringr]; };
+GenomicRanges = derive { name="GenomicRanges"; version="1.21.15"; sha256="0sjv8b6vhqpg54v83zkai57xmx0axq7khr35l89b4rc3qd9i8k5c"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; };
+GenomicTuples = derive { name="GenomicTuples"; version="1.3.1"; sha256="0i91qs1c84lyh0irhgnbnnvag0j3f48gfxxndk5x0yjf9kpa0hca"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; };
+Genominator = derive { name="Genominator"; version="1.23.0"; sha256="03pacbd3d5q7ykrflg258zcf8yfzm8kc976aw3d38q7agkia69h2"; depends=[BiocGenerics DBI GenomeGraphs IRanges RSQLite]; };
+GlobalAncova = derive { name="GlobalAncova"; version="3.37.0"; sha256="1j35r39plsxlkla2bv7wvg0if5gs2mfy71g6zb65g6ml5cqws45r"; depends=[annotate AnnotationDbi corpcor globaltest]; };
+GoogleGenomics = derive { name="GoogleGenomics"; version="1.1.1"; sha256="06mcg36x41k9s9ick6y3vrg5r4fnkz5qb77a7dh7kk2skinvzips"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; };
+GraphAT = derive { name="GraphAT"; version="1.41.0"; sha256="1mjd54zy4l7ivy347zn5rv6gn65sjhxn2cxm417fm83hm542327l"; depends=[graph MCMCpack]; };
+GraphAlignment = derive { name="GraphAlignment"; version="1.33.0"; sha256="14zxbw8cj12wr6c2a0a6mfskr9sqf6cdfyz0ccbzy91d1lnrxzdf"; depends=[]; };
+GraphPAC = derive { name="GraphPAC"; version="1.11.0"; sha256="1p0rkc1qz0yf0lxyjfvrpd7nqky855kmhb1pdwxg3ckifnypw5mc"; depends=[igraph iPAC RMallow TSP]; };
+GreyListChIP = derive { name="GreyListChIP"; version="1.1.1"; sha256="0kbl9m37aiyv6yrqg4z352k7dpdpxm7yywymjfa9gdd0rv1cy401"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer]; };
+Gviz = derive { name="Gviz"; version="1.13.2"; sha256="0na13x76dlnddiijxigr4j75xb9dcg32j0gbkqkzjak9azp8szys"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; };
+HCsnip = derive { name="HCsnip"; version="1.9.0"; sha256="14f881v776xn8lw4lvjc26s72laxs9zph902875f76ykbzygayd9"; depends=[Biobase clusterRepro coin fpc impute randomForestSRC sigaR sm survival]; };
+HDTD = derive { name="HDTD"; version="1.3.2"; sha256="19kzd1sjl0riwisdbrsy9j2pd39lpxwmizrnnj65hrfv6dwaqsgq"; depends=[]; };
+HELP = derive { name="HELP"; version="1.27.0"; sha256="1n2fj316ha2l941biyr9d56pry6n39drwa820rgyrwd116rzx79d"; depends=[Biobase]; };
+HEM = derive { name="HEM"; version="1.41.0"; sha256="0qi6q305p0vdhyah3860dpd3z0lyyn6wn5x0m3mj3p739pk288ik"; depends=[Biobase]; };
+HIBAG = derive { name="HIBAG"; version="1.5.0"; sha256="0rrpz4brij408szfmzv7gpk0hrhikjyx061gkamb02ry1my722j1"; depends=[]; };
+HMMcopy = derive { name="HMMcopy"; version="1.11.0"; sha256="1lcddw963lryks9xc0faw8x0pin4k4r9zdfl5iqi5mbrzn5pp7h3"; depends=[geneplotter IRanges]; };
+HTSFilter = derive { name="HTSFilter"; version="1.9.0"; sha256="1y5k26jc2gfrwp0l7jsx6br70hsxqhgdvmhbsagsampl67yjw6by"; depends=[Biobase DESeq DESeq2 edgeR]; };
+HTSanalyzeR = derive { name="HTSanalyzeR"; version="2.21.0"; sha256="1drmd4jycb85wg857daj3jpkj9gxa5asyv2sd873daj03q9c1yld"; depends=[AnnotationDbi biomaRt BioNet cellHTS2 graph GSEABase igraph RankProd]; };
+HTSeqGenie = derive { name="HTSeqGenie"; version="3.19.0"; sha256="0i9h6qn2fpcp6wy0ssnls8x6nz4azs93wb4qq5bpmps8wkp0na36"; depends=[BiocGenerics BiocParallel Biostrings Cairo chipseq GenomicAlignments GenomicFeatures GenomicRanges gmapR hwriter IRanges Rsamtools rtracklayer ShortRead VariantAnnotation VariantTools]; };
+HTqPCR = derive { name="HTqPCR"; version="1.23.0"; sha256="0zp7jbnh5zbrqaq84q1146sb3qg8n0kz6m9v5mi8a9l2fcvg2q09"; depends=[affy Biobase gplots limma RColorBrewer]; };
+Harshlight = derive { name="Harshlight"; version="1.41.0"; sha256="12wpfg785dfn5gwp014dfzk9x8zqvr9qrrs0pq32by576knida5z"; depends=[affy altcdfenvs Biobase]; };
+Heatplus = derive { name="Heatplus"; version="2.15.1"; sha256="1jcrajxvll0hhrsq8qvvyc1sj1nd3dm06n8q25qi9nacnfi865y7"; depends=[]; };
+HiTC = derive { name="HiTC"; version="1.13.1"; sha256="0mhfrxhfd11218pw6yn0l7dn3x5k90s07k53h1gj1j93i64gzzxg"; depends=[Biostrings GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; };
+HilbertVis = derive { name="HilbertVis"; version="1.27.0"; sha256="1qcyzn86v0xhb9zc1vcia1n53i33sgncbb7lpink5llmjpalacq6"; depends=[lattice]; };
+HilbertVisGUI = derive { name="HilbertVisGUI"; version="1.27.0"; sha256="03jxn398xv97mmvbpl0qymmydhm4i4c36qnw4s22ch7wy3h9x6h8"; depends=[HilbertVis]; };
+HybridMTest = derive { name="HybridMTest"; version="1.13.0"; sha256="0r4j8yllxzwn5r2rvpkqx6w23836lmly8wlshib6p917ky0djw4s"; depends=[Biobase fdrtool MASS survival]; };
+IMPCdata = derive { name="IMPCdata"; version="1.3.0"; sha256="003qvf47bcfcwxkw7zpzdvpnw7xhd2y12n9by2b1ns5i5jka754b"; depends=[rjson]; };
+INPower = derive { name="INPower"; version="1.5.0"; sha256="0msz24bixp7b5a83n40675xq8fglrhbg8972a93x2k8jgb5gdh38"; depends=[mvtnorm]; };
+IPPD = derive { name="IPPD"; version="1.17.0"; sha256="0afhz5ishr1my9gnksa4dl92lfnb2fnvdpsh3n7kj4j2s8xx0crc"; depends=[bitops digest MASS Matrix XML]; };
+IRanges = derive { name="IRanges"; version="2.3.11"; sha256="06914mn3x097km2i4p8z4zj99msr1dvlqk50ari1djcnww0im251"; depends=[BiocGenerics S4Vectors]; };
+ITALICS = derive { name="ITALICS"; version="2.29.0"; sha256="16l0wq7bxi3nz8f5hggnzddhg07vrcca480ygvmi03cxajxbjr9h"; depends=[affxparser DBI GLAD oligo oligoClasses]; };
+IVAS = derive { name="IVAS"; version="1.1.0"; sha256="15jnmi40bsnyf5yw86gvqppv0g8250lsi74gsjzhm7gijhlxfnrm"; depends=[AnnotationDbi BiocGenerics doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges lme4 Matrix S4Vectors]; };
+Icens = derive { name="Icens"; version="1.41.0"; sha256="1vi2hnzs8z5prggswa6wzr2y53jczkgg09f4vw0pjzkzi7p8bphy"; depends=[survival]; };
+IdMappingAnalysis = derive { name="IdMappingAnalysis"; version="1.13.0"; sha256="1kwalcvb7cxkg89kz5hpk0cvsfzxz5g2cbiflrs2dyaxx96pm5gm"; depends=[Biobase boot mclust R_oo rChoiceDialogs RColorBrewer]; };
+IdMappingRetrieval = derive { name="IdMappingRetrieval"; version="1.17.0"; sha256="0fclrkv53q9aq3xw95k25rw52sjzy40r37kajnrk0kc41cyzf2vv"; depends=[AffyCompatible biomaRt DAVIDQuery ENVISIONQuery R_methodsS3 R_oo rChoiceDialogs RCurl XML]; };
+IdeoViz = derive { name="IdeoViz"; version="1.3.0"; sha256="1ynqg2a0jq23mlqzgf7k05jc2nkby8hkbc6h0p76ms33fwqj2qxz"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges RColorBrewer rtracklayer]; };
+InPAS = derive { name="InPAS"; version="1.1.3"; sha256="1fyhrf1n7hb34l742d3jrjyyznhjvf6z8bdmjawsqr10dvk1j2mv"; depends=[AnnotationDbi BiocParallel BSgenome cleanUpdTSeq GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma S4Vectors seqinr]; };
+IsoGeneGUI = derive { name="IsoGeneGUI"; version="2.5.0"; sha256="05k6qdnsr2aywdmhdlimx5axrk07mf14rvia10afhf56380sdf3s"; depends=[Biobase ff geneplotter goric Iso IsoGene jpeg multtest ORCME ORIClust orQA RColorBrewer Rcpp relimp tkrplot xlsx]; };
+KCsmart = derive { name="KCsmart"; version="2.27.0"; sha256="1igsmg1l39yladz4dlc9j01nxkwfaciy575d7k6764jhrs6pv39m"; depends=[BiocGenerics KernSmooth multtest siggenes]; };
+KEGGREST = derive { name="KEGGREST"; version="1.9.0"; sha256="0ms60slsf7lpw0yidpy47hyxi7cm9r0gyb0q6ajxv52vn9diz29v"; depends=[Biostrings httr png]; };
+KEGGgraph = derive { name="KEGGgraph"; version="1.27.2"; sha256="14giz5858nr1fz7fv0d98xnl8rmimnjq4n6s81b0pkiz4vsriqvn"; depends=[graph XML]; };
+KEGGprofile = derive { name="KEGGprofile"; version="1.11.0"; sha256="04fkdsjj5z0ib6y8gi03av9b5zz4sbw277xvkr199kh9xlrfcqgh"; depends=[AnnotationDbi biomaRt KEGGREST png TeachingDemos XML]; };
+LBE = derive { name="LBE"; version="1.37.0"; sha256="09ql13kc18b8zjvb3ny536k5704q9xxpv9xfqi4y4q32vavywj1x"; depends=[]; };
+LEA = derive { name="LEA"; version="1.1.0"; sha256="017cz56xiv9c2v2q3lwnmpb4j7iz2k1aww6c9kz9s0kcjjyi3sak"; depends=[]; };
+LMGene = derive { name="LMGene"; version="2.25.0"; sha256="17djx1fkjxpmmp56vphcbkgwpr56i375xc7rb76d94911grz9fh4"; depends=[affy Biobase multtest survival]; };
+LPE = derive { name="LPE"; version="1.43.0"; sha256="13z3h3mabbwhb5p40a7hil0aq10mya1zqgb8qj2qwnc50sbmgjx2"; depends=[]; };
+LPEadj = derive { name="LPEadj"; version="1.29.0"; sha256="1734ihzvid5bz2wyh7yskk7agd82xmw7dibzb7aivhcfyxs8g8p4"; depends=[LPE]; };
+LVSmiRNA = derive { name="LVSmiRNA"; version="1.19.0"; sha256="1z74y8zbg5amsmslb309gi630v8qa1qqgj37214bv5g9ab8xajmj"; depends=[affy Biobase BiocGenerics limma MASS quantreg SparseM vsn zlibbioc]; };
+LiquidAssociation = derive { name="LiquidAssociation"; version="1.23.0"; sha256="178gx8n0ga1ppjk368xacidms1rc2kn301fmdc8rwbcknwvxrwck"; depends=[Biobase geepack]; };
+LowMACA = derive { name="LowMACA"; version="1.1.0"; sha256="0i0pka0jf1yq7vjw1kb9sd2p21gpy4pw855ap815k02i0n7jyny4"; depends=[Biostrings cgdsr data_table motifStack RColorBrewer reshape2 stringr]; };
+M3D = derive { name="M3D"; version="1.3.4"; sha256="0yyhfs8frvyx0dk0k61a4xggqdrspx07jxhhl9q7bld026bv8d9d"; depends=[BiSeq GenomicRanges IRanges]; };
+MAIT = derive { name="MAIT"; version="1.3.1"; sha256="1kpcns5f9j41sg5694ng4d0w5gil2qwi9s1804gncnnh273jsv5z"; depends=[agricolae CAMERA caret class e1071 gplots MASS pls plsgenomics Rcpp xcms]; };
+MANOR = derive { name="MANOR"; version="1.41.1"; sha256="0i1fk4c72k91i0w84b0swgdbd4igvbcrbcs12dqqxcslnqg44rs2"; depends=[GLAD]; };
+MBASED = derive { name="MBASED"; version="1.3.1"; sha256="0rdsv7qv5x6whb5jx4wzgcv88z6hwmf5ryz84liv7kg1i1pq1adn"; depends=[BiocGenerics BiocParallel GenomicRanges RUnit SummarizedExperiment]; };
+MBAmethyl = derive { name="MBAmethyl"; version="1.3.0"; sha256="1807sv9dj74la17m2jj0kzj1sqy4gqydkxax0ngifvyk920zr19n"; depends=[]; };
+MBCB = derive { name="MBCB"; version="1.23.0"; sha256="0swcr95qzgyjqpm6sc5z7ifc0vrj4hkpm7srfm2cb7d0dg0lk092"; depends=[preprocessCore tcltk2]; };
+MCRestimate = derive { name="MCRestimate"; version="2.25.0"; sha256="1zbajax2kk4dnk17l6vm6rxgqyxm1zly3i7x0y78bbk34ismcixj"; depends=[Biobase e1071 pamr randomForest RColorBrewer]; };
+MEDIPS = derive { name="MEDIPS"; version="1.19.2"; sha256="1k4bdvqsp9rrxadz79g4jvynn7832dq9sgdk0fnv5lk3sc004ypq"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; };
+MEDME = derive { name="MEDME"; version="1.29.0"; sha256="1fpi4ri134ii28nfiq2p875xinwvs8icrxvw158g5k7ixy1zx826"; depends=[Biostrings drc MASS]; };
+MEIGOR = derive { name="MEIGOR"; version="1.3.0"; sha256="1kif7m78w0w0qv4fqfby3rknqk56zk83dds3cm4pgv2cii61i9jy"; depends=[CNORode deSolve Rsolnp snowfall]; };
+MGFM = derive { name="MGFM"; version="1.3.0"; sha256="1h2bi2cchfxl0z31pgj6q6pb1jnmqvjy7jv2khp80h7sdr65356i"; depends=[annotate AnnotationDbi]; };
+MIMOSA = derive { name="MIMOSA"; version="1.7.0"; sha256="0kw2f3gk0fxfv393gh2mlnw4hy658j6ga20rhkbza1hzyyz44mvk"; depends=[Biobase coda data_table Formula ggplot2 Kmisc MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; };
+MLInterfaces = derive { name="MLInterfaces"; version="1.49.0"; sha256="0h5pr3lkgr6wb2h8dik2p4zv62p1hx22anxsbzbxsd4k4n9yzxd4"; depends=[annotate Biobase BiocGenerics cluster gdata genefilter MASS pls rda rpart sfsmisc]; };
+MLP = derive { name="MLP"; version="1.17.0"; sha256="1wb6bzxn1paba2fxh62ldsfr4kr0nq2sy21v0pp0qwhfxndyzpdn"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; };
+MLSeq = derive { name="MLSeq"; version="1.7.0"; sha256="0vc5rz4l574hmzwn3q7c4giib0lzs720j0j3alvarb3lmfzx9mhq"; depends=[Biobase caret DESeq2 edgeR limma randomForest]; };
+MMDiff = derive { name="MMDiff"; version="1.9.0"; sha256="0xvnv024cv540m0jv9lrb4s5rvc0mq4gwp6wvdgpnsnqnwi9j556"; depends=[Biobase DiffBind GenomicRanges GMD IRanges Rsamtools]; };
+MPFE = derive { name="MPFE"; version="1.5.0"; sha256="123a6qg761j46bs1ckd6yyr2igdfx6mik3aj7a1dcqjqy5qrvx6r"; depends=[]; };
+MSGFgui = derive { name="MSGFgui"; version="1.3.0"; sha256="0r7izs3wpd7l9agrm3mrr3kmm00s9fzljsjxhk4pzxkjg1ran4hp"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; };
+MSGFplus = derive { name="MSGFplus"; version="1.3.0"; sha256="0q75mygrd56kr9hrrxlmckkgvhcrgvpgvbjdxjmz6jaqp5wfbkf5"; depends=[mzID]; };
+MSnID = derive { name="MSnID"; version="1.3.1"; sha256="0a0r2ikyb0spm110xzn3zzhl8g6xsvmh781d65f10l1iqnd2cqza"; depends=[Biobase data_table doParallel foreach iterators MSnbase mzID ProtGenerics R_cache Rcpp reshape2]; };
+MSnbase = derive { name="MSnbase"; version="1.17.4"; sha256="0ig62281xic977br9ddibcafrad2cwc49cqs7vz5i3gg9nf46iby"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp reshape2 S4Vectors vsn]; };
+MSstats = derive { name="MSstats"; version="2.7.0"; sha256="0zhv2c769biv6avb4csi7alabk76bfn0ykzwp0lc6ymzggbj9pil"; depends=[ggplot2 gplots limma lme4 marray MSnbase preprocessCore Rcpp reshape]; };
+MVCClass = derive { name="MVCClass"; version="1.43.0"; sha256="1mbhfkvdkxw9xd76dd2pxk947w9wahwdsk9x1wcryrmwcdvaqqcz"; depends=[]; };
+MantelCorr = derive { name="MantelCorr"; version="1.39.0"; sha256="0l255m63q9idv56svs5m5bc4izwqnm3jy2z3kka7sw4xcx13l39g"; depends=[]; };
+MassArray = derive { name="MassArray"; version="1.21.0"; sha256="0pz3azrjc7akqh63ijhxmfzainz8nwfffylz6610k1a7yxpaxb1h"; depends=[]; };
+MassSpecWavelet = derive { name="MassSpecWavelet"; version="1.35.0"; sha256="1z2p9fdf57p3ryn25mn7ny910c8zrliw6jjwl34mjfp07kdf7hml"; depends=[waveslim]; };
+MatrixRider = derive { name="MatrixRider"; version="1.1.0"; sha256="0mfhlwr84yrfan7y1p14n8f1rj3331d6vdrsib3b52ws5y25cabd"; depends=[Biostrings IRanges S4Vectors TFBSTools XVector]; };
+MeSHDbi = derive { name="MeSHDbi"; version="1.5.0"; sha256="1wcprr976jf9laah45jpmdx7aiy9f6vhamp5gk3npplr73i5m1ri"; depends=[AnnotationDbi Biobase RSQLite]; };
+MeSHSim = derive { name="MeSHSim"; version="1.1.0"; sha256="0v7vh8z2ddaaabnkg6hmfw34xp0gbm5jml1lfxrqpw18sy7rypnv"; depends=[RCurl XML]; };
+MeasurementError_cor = derive { name="MeasurementError.cor"; version="1.41.0"; sha256="11fkg2zxig0p5vws2a7avcwvn8c08qv3a665315ycainjsci7ay0"; depends=[]; };
+MergeMaid = derive { name="MergeMaid"; version="2.41.0"; sha256="0zy3jsrc8chzmhfv7swp56imjhfc33dfzf32nmncq0731882m3mx"; depends=[Biobase MASS survival]; };
+Metab = derive { name="Metab"; version="1.3.0"; sha256="041j2xn6gypg07l2snhqp940b682m30ra4iyla4dbqsncrailxpr"; depends=[pander svDialogs xcms]; };
+MethTargetedNGS = derive { name="MethTargetedNGS"; version="1.1.0"; sha256="0bspvxxmyf22079sapmimz3fdxz91g4mq0kj7ssf0mmp2847l57k"; depends=[Biostrings gplots seqinr stringr]; };
+MethylAid = derive { name="MethylAid"; version="1.3.1"; sha256="012ypjnw5ky6233dibx2hpryzbr66g86hm14cjfd45fzr08bv08z"; depends=[Biobase BiocGenerics BiocParallel ggplot2 gridBase hexbin matrixStats minfi RColorBrewer shiny]; };
+MethylMix = derive { name="MethylMix"; version="1.3.0"; sha256="181sz3ny79i8gaq3y2k0q56l03ii288lhy8xv1fsh94bjhihjgcd"; depends=[doParallel foreach optimx RColorBrewer RPMM]; };
+MethylSeekR = derive { name="MethylSeekR"; version="1.9.0"; sha256="1hp2qadkkkanp3cs0gqwyvn94qy1v34gcjhx730p55iq1had5dcf"; depends=[BSgenome geneplotter GenomicRanges IRanges mhsmm rtracklayer]; };
+Mfuzz = derive { name="Mfuzz"; version="2.29.1"; sha256="06xzb670y19ry1fr97xw8j3gcagqnyaxlclscx3w1m2qfss5wi15"; depends=[Biobase e1071 tkWidgets]; };
+MiChip = derive { name="MiChip"; version="1.23.0"; sha256="0np5drks6nfg3aw8qm899syxv1z56608bhav1jid4ks9fwdi33bb"; depends=[Biobase]; };
+MiPP = derive { name="MiPP"; version="1.41.0"; sha256="1zp8j123fx82xdc3dvn4a17mspw2pdxxlyj4f750vzwc4ma9pj39"; depends=[Biobase e1071 MASS]; };
+MiRaGE = derive { name="MiRaGE"; version="1.11.1"; sha256="1nkvk07kgps9rzh362pczlsq0r7g8b85f4bdbi0ld5p0ijdd02f3"; depends=[AnnotationDbi Biobase BiocGenerics]; };
+MineICA = derive { name="MineICA"; version="1.9.0"; sha256="0gfdnlahsm206vw443ml872dr1k5sg6w9hsdd3gkwzm0lsrxqd7x"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt cluster colorspace fastICA foreach fpc ggplot2 GOstats graph gtools Hmisc igraph JADE lumi marray mclust plyr RColorBrewer Rgraphviz scales xtable]; };
+MinimumDistance = derive { name="MinimumDistance"; version="1.13.2"; sha256="09rpwh75gdn5s5i4vd3nk97ns04q7vfspbm7r0mjjrjnidd0fxlf"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; };
+Mirsynergy = derive { name="Mirsynergy"; version="1.5.0"; sha256="0nbdnz3m99r3zlkqqya4xs944a3zy0daqxbnf5gn4033z2kgd10s"; depends=[ggplot2 gridExtra igraph Matrix RColorBrewer reshape scales]; };
+MmPalateMiRNA = derive { name="MmPalateMiRNA"; version="1.19.0"; sha256="0pnbzqh90vqcgsh1swvhy8w2k1vj24k5j9m4sb7qwhi2h5y1gzwa"; depends=[Biobase lattice limma statmod vsn xtable]; };
+MoPS = derive { name="MoPS"; version="1.3.0"; sha256="0sf7v7clghm48g2ryainsyvsl67nqq4xha71zc1r5w9fz33xa5mv"; depends=[Biobase]; };
+MotIV = derive { name="MotIV"; version="1.25.0"; sha256="0d57bsi1jl5xcsxrd6v7506hrjz7b8r4hy39rsd6d2rfnw1w49yl"; depends=[BiocGenerics Biostrings IRanges lattice rGADEM]; };
+MotifDb = derive { name="MotifDb"; version="1.11.0"; sha256="1swfp50l4h4jas5r0yz558qqp74a8q62qbyxf6h7dzcs9s1krqhh"; depends=[BiocGenerics Biostrings IRanges rtracklayer S4Vectors]; };
+Mulcom = derive { name="Mulcom"; version="1.19.0"; sha256="05mx5z188g7kwj7km9p54djjlf4kq4iwvf9fa8158ic5wd3ycyh7"; depends=[Biobase fields]; };
+MultiMed = derive { name="MultiMed"; version="1.3.0"; sha256="16hi69kpxz6q71nr909pbqp5qa20z1qn367vjs7146mpfn70rnwq"; depends=[]; };
+NCIgraph = derive { name="NCIgraph"; version="1.17.0"; sha256="103p0i4y9frkvdpzhpj9c0d78wc40650hbhfbhhmkv1a8zq5260v"; depends=[graph KEGGgraph R_methodsS3 RBGL RCytoscape]; };
+NGScopy = derive { name="NGScopy"; version="1.3.0"; sha256="09b323rx0v5dnck2dgq9rzzjk7dbpry74q6c4dkgvjvxkf7khh8m"; depends=[changepoint rbamtools Xmisc]; };
+NOISeq = derive { name="NOISeq"; version="2.11.1"; sha256="13q3v2jphridbjk1059c475xgw9ywkdyqf0b6pbl3pk9l3ag9dr9"; depends=[Biobase Matrix]; };
+NTW = derive { name="NTW"; version="1.19.0"; sha256="027rdvy8xpsa70g6x33v4fmzk8gyvd8p3lgf65ac36wcy120gyhl"; depends=[mvtnorm]; };
+NanoStringQCPro = derive { name="NanoStringQCPro"; version="1.1.1"; sha256="0mmbbxhxd7nh7mqzckw0as68ac0nv005liif0laadbz49y6p4rwm"; depends=[AnnotationDbi Biobase knitr NMF png RColorBrewer]; };
+NarrowPeaks = derive { name="NarrowPeaks"; version="1.13.2"; sha256="0cryjprj8y1fgn5xxzsyyv4zdzv5qy8405qkj47kvjbrk0kbr97s"; depends=[BiocGenerics CSAR fda GenomeInfoDb GenomicRanges ICSNP IRanges S4Vectors]; };
+NetPathMiner = derive { name="NetPathMiner"; version="1.5.0"; sha256="0z0bppsvy1zzbx8fspmsgzw7vzf5x649762znaqpfabvy6bpp2xk"; depends=[igraph]; };
+NetSAM = derive { name="NetSAM"; version="1.9.0"; sha256="1bdch37kk1clb8cyffrlcr6d5qykk5a5ql3dfi94bw1l0w6v4fjq"; depends=[graph igraph seriation]; };
+NormqPCR = derive { name="NormqPCR"; version="1.15.0"; sha256="0nfjnx5id04nbkda9v66418yzpp88mq2ijsfn8jyg0sfika405nl"; depends=[Biobase qpcR RColorBrewer ReadqPCR]; };
+NuPoP = derive { name="NuPoP"; version="1.19.0"; sha256="1dpqmhbwr1l95vgjxlw3xayjxksa909xj05jbf4x3gafnlkkdvbk"; depends=[]; };
+OCplus = derive { name="OCplus"; version="1.43.0"; sha256="1x7yqb6hkbglvr0kkq5s7caxambdvzc0f38gahq68wfsfwln7b49"; depends=[akima multtest]; };
+OLIN = derive { name="OLIN"; version="1.47.0"; sha256="19wjz96104rn88pdflixb790qhj24ff4s3hc09ldcii1pfzm0sdw"; depends=[limma locfit marray]; };
+OLINgui = derive { name="OLINgui"; version="1.43.0"; sha256="0714bzbsmd7bsdm5zk05g83yy48z3rlazpv17xbn38ljpykawzjb"; depends=[marray OLIN tkWidgets widgetTools]; };
+OSAT = derive { name="OSAT"; version="1.17.0"; sha256="1ky9xb5ls3xnzinsrxrgggb4r0fmm1q33vxb3ajav7nygyxijq0d"; depends=[]; };
+OTUbase = derive { name="OTUbase"; version="1.19.0"; sha256="0xmp446v57z875lmjkg47f9hx961af9nda658v8qlbjxf1wjw9zb"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; };
+OmicCircos = derive { name="OmicCircos"; version="1.7.0"; sha256="1xil5043hgpypaww1a1wvcxw9im9jmzgdp83p3z71giqiq36dvh4"; depends=[GenomicRanges]; };
+OmicsMarkeR = derive { name="OmicsMarkeR"; version="1.1.0"; sha256="1fw6zfp5jrkvxjb6j48q3n1fqkm1qmmjjvmr70v93hi5jg0an8gy"; depends=[assertive caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; };
+OncoSimulR = derive { name="OncoSimulR"; version="1.3.2"; sha256="0bm4p5wpp32kd90c7mx76d8iy1jxxfssnkg3wrrglcfi0qqzs404"; depends=[data_table graph Rcpp Rgraphviz]; };
+OperaMate = derive { name="OperaMate"; version="0.99.6"; sha256="0xh57d82rmfcs1a6gj0qcjf585drhzns5k69bwxb7x1xw63wp4kp"; depends=[ggplot2 MASS pheatmap RDAVIDWebService]; };
+OrderedList = derive { name="OrderedList"; version="1.41.0"; sha256="1cw8y5f5h15z0qwg8n4dq7g3ixx2wa332rdsb4w2qqmcqlz79bfp"; depends=[Biobase twilight]; };
+OrganismDbi = derive { name="OrganismDbi"; version="1.11.32"; sha256="15zl741nw38yq07wp8rp5w1jzvyg8cz10dcyirv28rqs9nhz6q7b"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller GenomicFeatures GenomicRanges graph IRanges RBGL RSQLite S4Vectors]; };
+OutlierD = derive { name="OutlierD"; version="1.33.0"; sha256="0bljxmrnlqcngzzv6yxjsim7gd4icyi384vimn5gs869mq9gyrj3"; depends=[Biobase quantreg]; };
+PAA = derive { name="PAA"; version="1.3.0"; sha256="1786prxxf3yk4zgs8qcrnxf9i7b3dwaq21cj2hsz4xsrnskygcs0"; depends=[e1071 limma MASS mRMRe randomForest Rcpp ROCR sva]; };
+PADOG = derive { name="PADOG"; version="1.11.0"; sha256="0x84k32fmd1zrwjc4f71mq4jslh9bxr4gjbl48k1f5kl5j6hlxj3"; depends=[AnnotationDbi Biobase doRNG foreach GSA limma nlme]; };
+PANR = derive { name="PANR"; version="1.15.0"; sha256="0nc2a10z7i16dz41yhz3zw9h51myxzxbxd1vpc2d8gczks07n6ch"; depends=[igraph MASS pvclust RedeR]; };
+PAPi = derive { name="PAPi"; version="1.9.0"; sha256="1553fxm3ma3p5j10acyk5m2wx4dafp346x0pyxj9aah856h4zkw5"; depends=[KEGGREST svDialogs]; };
+PAnnBuilder = derive { name="PAnnBuilder"; version="1.33.0"; sha256="0larxmdzdb33hpv2m7n4kdjkmmc7pn8dl0b1x43fl54dq5xwvzpg"; depends=[AnnotationDbi Biobase DBI RSQLite]; };
+PCpheno = derive { name="PCpheno"; version="1.31.0"; sha256="1crk56kzfb9smdaagv44l7h2hh1qc15zyl1rjnwlyz8cxplsll7w"; depends=[annotate AnnotationDbi Biobase Category graph GSEABase ppiStats ScISI SLGI]; };
+PECA = derive { name="PECA"; version="1.5.1"; sha256="0dzkwjsdhbmripw91wk7fmz83dn88x33q7v4pdi6q17lxfpc5w7y"; depends=[affy genefilter limma preprocessCore]; };
+PGA = derive { name="PGA"; version="0.99.9"; sha256="0p3wbn0yyi74cm4xsgw0n1rgb5nmlhxnq9c62ss9k0yr3jx83y8s"; depends=[AnnotationDbi biomaRt Biostrings customProDB data_table GenomicFeatures GenomicRanges ggplot2 IRanges Nozzle_R1 pheatmap RCurl Rsamtools RSQLite rTANDEM rtracklayer stringr VariantAnnotation]; };
+PGSEA = derive { name="PGSEA"; version="1.43.0"; sha256="0bchcpb3ma179akjaf4agsbvx3f8vp73qxrqlq3ls25j9c1acbl5"; depends=[annaffy AnnotationDbi Biobase]; };
+PICS = derive { name="PICS"; version="2.13.0"; sha256="0mc49s5qq2jlc5alba38fyr60p18lad3q6wn48a5khzfkwdbjm9s"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools S4Vectors]; };
+PING = derive { name="PING"; version="2.13.0"; sha256="0fghsvanq6r3ndp9vc2zwvfizifw2yl8qjhzv5rl5hkpsb7w9y2d"; depends=[BiocGenerics BSgenome chipseq fda GenomicRanges Gviz IRanges PICS S4Vectors]; };
+PLPE = derive { name="PLPE"; version="1.29.0"; sha256="17x48ygk0z5pzlpad950csc5jl46h4rrpifd7l0vni2wkv1wxvy9"; depends=[Biobase LPE MASS]; };
+PREDA = derive { name="PREDA"; version="1.15.0"; sha256="0ls2wlldgmzihfllz4gjhsrr39mjnbp1gpkj4dbr3411cfzd087s"; depends=[annotate Biobase lokern multtest]; };
+PROMISE = derive { name="PROMISE"; version="1.21.0"; sha256="0k3xr0x5xw1jpm8w1hf0pwddf864myn048lg5mba70f6irx9s2qn"; depends=[Biobase GSEABase]; };
+PROPER = derive { name="PROPER"; version="1.1.0"; sha256="1h75zcz3b048760dlhlnvwvwhqfihyl6k3fwqq50b9sh698vbf8z"; depends=[edgeR]; };
+PROcess = derive { name="PROcess"; version="1.45.0"; sha256="1d5kg0r3ddf4bjcmjdd84r92d1cx6xjgk0a303mwsbyp6b7qs06i"; depends=[Icens]; };
+PSEA = derive { name="PSEA"; version="1.3.0"; sha256="13v4q6qxvplvln7ff378chff4z4ppc51wpaq8fz7hxpl0g60cfqm"; depends=[Biobase MASS]; };
+PSICQUIC = derive { name="PSICQUIC"; version="1.7.0"; sha256="0c7v2zm5rrn8ma2kmwpffq2qgipi537fbi1gjhx7yvmnqw9zcjnc"; depends=[BiocGenerics biomaRt httr IRanges plyr RCurl]; };
+PWMEnrich = derive { name="PWMEnrich"; version="4.5.0"; sha256="134xskadqb7afvz3y4nbbxi5mf02i3cfgb4an2290znvdvsml6sn"; depends=[BiocGenerics Biostrings evd gdata seqLogo]; };
+PathNet = derive { name="PathNet"; version="1.9.0"; sha256="1dqai2ys5vfhhqqghh1xaxsbcbsqwkjrcrhsm03r3ckpizmbynp5"; depends=[]; };
+Pbase = derive { name="Pbase"; version="0.9.0"; sha256="1j0b2ajlsk42kxakh4vhcd9ias1fxr4cna4h52hrinxi9jml9ywx"; depends=[Biobase BiocGenerics biomaRt Biostrings cleaver GenomicRanges Gviz IRanges MSnbase mzID mzR Pviz Rcpp rtracklayer S4Vectors]; };
+PhenStat = derive { name="PhenStat"; version="2.3.0"; sha256="0irasfwks5w5a25zkp0qhasrk5nvahbijsncfbmpimac5cwps1an"; depends=[car logistf MASS nlme nortest]; };
+Polyfit = derive { name="Polyfit"; version="1.3.0"; sha256="0zdd85bshdcf85asq93wbbrj26fa5d6xkmgdyrqg9hawdznj9kip"; depends=[DESeq]; };
+ProCoNA = derive { name="ProCoNA"; version="1.7.0"; sha256="1x2wmlhlizd09v4d7q98cfplqqmxcagi43rl9ibdah04n7k35zpd"; depends=[BiocGenerics flashClust GOstats MSnbase WGCNA]; };
+ProtGenerics = derive { name="ProtGenerics"; version="1.1.0"; sha256="1l77j3zl78v86jbxpwnyc0a5q66yds79nirlcvan789hxbggr0i4"; depends=[BiocGenerics]; };
+Pviz = derive { name="Pviz"; version="1.3.0"; sha256="0pvmpxw4dpxxs9lrn9nn44rn36r3l09rwlkh5ph054h56nm80xs1"; depends=[Biostrings biovizBase data_table GenomicRanges Gviz IRanges]; };
+QDNAseq = derive { name="QDNAseq"; version="1.5.0"; sha256="16qp5r8gl81a4arpb6kac387dnc0ng4vilfv1gfqr4rjkpp0gks2"; depends=[Biobase CGHbase CGHcall DNAcopy matrixStats R_utils Rsamtools]; };
+QUALIFIER = derive { name="QUALIFIER"; version="1.13.0"; sha256="0vk3xx0dmxadxk1wmcnf9cxv7rr4z8624npkmdbqlzb6mxix7p6d"; depends=[Biobase data_table flowCore flowViz flowWorkspace hwriter lattice latticeExtra MASS ncdfFlow reshape XML]; };
+QuartPAC = derive { name="QuartPAC"; version="1.1.0"; sha256="0w92hggwihp2nia9dzg8yjbfsyrcgwq4kpxh96jb8kkmq6kl2l8p"; depends=[data_table GraphPAC iPAC SpacePAC]; };
+QuasR = derive { name="QuasR"; version="1.9.8"; sha256="0ij9lkqld0pkbf6hq731ygzhj1nf864y6rxzys8f4j7g871lbm1w"; depends=[Biobase BiocGenerics BiocInstaller BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rbowtie Rsamtools S4Vectors ShortRead zlibbioc]; };
+R3CPET = derive { name="R3CPET"; version="1.1.0"; sha256="0vwyrqsihnabzqh5r329v3f5zcg2ik51aakvscpp482z0dm2naqh"; depends=[clues clValid data_table DAVIDQuery GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp reshape2 S4Vectors]; };
+R453Plus1Toolbox = derive { name="R453Plus1Toolbox"; version="1.19.1"; sha256="0fp8hx9igfjaj1dvfxs54r5krhsp1hbmlqs9vac3g6ga51268rir"; depends=[Biobase BiocGenerics biomaRt Biostrings BSgenome GenomicRanges IRanges R2HTML Rsamtools S4Vectors ShortRead SummarizedExperiment TeachingDemos VariantAnnotation xtable XVector]; };
+RBGL = derive { name="RBGL"; version="1.45.1"; sha256="0y90pvl3i8pyzxwssciygcd1c1lb8a0rqhpiqgif56075amm71rl"; depends=[graph]; };
+RBM = derive { name="RBM"; version="1.1.0"; sha256="03q7prkrj8y3k8jrnnbjrkmlyv72cxfa8l042df4wajhcbpa4g4l"; depends=[limma marray]; };
+RBioinf = derive { name="RBioinf"; version="1.29.0"; sha256="1cyd18lz3h9b20g6s9azzv9rv9bachh3qsczz84y8lj4kay3qssx"; depends=[graph]; };
+RCASPAR = derive { name="RCASPAR"; version="1.15.0"; sha256="16v55gkqg4jaa7wp4g1l536jv74nlcwkir6796zd85byz2c6aaxh"; depends=[]; };
+RCyjs = derive { name="RCyjs"; version="1.1.12"; sha256="1gv31yj0ms7llsg2rca96rh77h1qw3hkjbiskzc3zmpycx5m9m8b"; depends=[BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; };
+RCytoscape = derive { name="RCytoscape"; version="1.19.0"; sha256="0yfmlksi7sz0p9nbgjz2cpqwbwyzzxij3zaqmkp3wqfdk89mxgi7"; depends=[BiocGenerics graph]; };
+RDAVIDWebService = derive { name="RDAVIDWebService"; version="1.7.0"; sha256="07hnj7flfacg9j8c6155nw23zjxcb1v4wj4rkfi8xz5clp80v6xh"; depends=[Category ggplot2 GOstats graph RBGL rJava]; };
+RDRToolbox = derive { name="RDRToolbox"; version="1.19.0"; sha256="186cj6xri4prv7y9jvspyql8mkqy3aqs2kd6m5fliqicqbfia2z8"; depends=[MASS rgl]; };
+REDseq = derive { name="REDseq"; version="1.15.0"; sha256="1xgc0xir09n900dgnpg5cibyxqsk0llh3jqqzgghm672rinbx2c6"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome ChIPpeakAnno IRanges multtest]; };
+RGSEA = derive { name="RGSEA"; version="1.3.0"; sha256="1z69ccc6kxmfy1lc4jfnf36b305n8zizzc1sdjxkh43swiivs64k"; depends=[BiocGenerics]; };
+RGalaxy = derive { name="RGalaxy"; version="1.13.0"; sha256="082zmqxqzk0wawrp36ds4sh30zf48pbs3pgsrn5b0j5w3lr1dy1x"; depends=[Biobase BiocGenerics digest optparse roxygen2 XML]; };
+RIPSeeker = derive { name="RIPSeeker"; version="1.9.2"; sha256="1z0p32fcc8npzs8p3zl7irx5m8vqyfgkwd9kifwjl13ciqlp15j5"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer SummarizedExperiment]; };
+RLMM = derive { name="RLMM"; version="1.31.0"; sha256="01plzmxz5dzvvxzx4wxsqhhypc8fyvkyr96c7xwsaaakah4780nk"; depends=[MASS]; };
+RMassBank = derive { name="RMassBank"; version="1.11.0"; sha256="1df5kfm4gb5kz1z5sq38wddi4njq3y8nzy7fr2dxk1z2j4b1977z"; depends=[mzR rcdk Rcpp RCurl rjson XML yaml]; };
+RNASeqPower = derive { name="RNASeqPower"; version="1.9.0"; sha256="0nn5wq81cm81wjwc43ky597fyq1l4ya36k64bp6k80ri94qx2vzg"; depends=[]; };
+RNAinteract = derive { name="RNAinteract"; version="1.17.0"; sha256="03rz6xyy9f48ns0r9xcxrghikxlna8cx62rwswq2i1xkh7c5lfiy"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; };
+RNAither = derive { name="RNAither"; version="2.17.0"; sha256="028qf3sj2cms9h6wh4bynxaky8mvlr0axci8yw9bjp4bdlrjland"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; };
+RNAprobR = derive { name="RNAprobR"; version="1.1.1"; sha256="1n0ra0jb6y01nbdx9qbmkh5w4zy381nzkwcawvdg2bfzva1734mp"; depends=[BiocGenerics Biostrings GenomicFeatures GenomicRanges plyr Rsamtools rtracklayer]; };
+ROC = derive { name="ROC"; version="1.45.0"; sha256="1vcv5q7ylr2b1fb4vmrc8j4j7s3v5szzpkwblnfkcp2y8d03i9a1"; depends=[]; };
+ROntoTools = derive { name="ROntoTools"; version="1.9.0"; sha256="07l9j4d26hn8d5ma3z19ipy4rrw29k66zb2ib8n3ba24pjm0h8w3"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; };
+RPA = derive { name="RPA"; version="1.25.0"; sha256="1bzjb0064xdn5zk9y9dpxjdw79i8kkfb29f13balx78nq5xznxh4"; depends=[affy]; };
+RRHO = derive { name="RRHO"; version="1.9.1"; sha256="0lkmg40lwc3v6njalm2a2i3h9cc5iqifqj0ji20mxvk2bgpaj7p6"; depends=[VennDiagram]; };
+RSVSim = derive { name="RSVSim"; version="1.9.1"; sha256="096zfl3glpwa38f2n6cxxcl4a9saf7mfy13g0p2cxq5vfkikab0h"; depends=[Biostrings GenomicRanges IRanges ShortRead]; };
+RTCA = derive { name="RTCA"; version="1.21.0"; sha256="1kpfmrjcwmzgih0vib9ckf4c00yax0fbklfi46cwx0avv54gaqs0"; depends=[Biobase gtools RColorBrewer]; };
+RTCGAToolbox = derive { name="RTCGAToolbox"; version="1.99.4"; sha256="1s78mll5907bpwca0zzhp19p328gwxc88wg98fjk710i0lx67gbi"; depends=[data_table limma RCircos RCurl RJSONIO survival XML]; };
+RTN = derive { name="RTN"; version="1.7.2"; sha256="0k0xwnk0vgbi86435m5rhv2sxdnzwmhgr85zb8dlffr68dqa66ih"; depends=[car data_table ff igraph IRanges limma minet RedeR snow]; };
+RTopper = derive { name="RTopper"; version="1.15.0"; sha256="1bjrrljidnij9zhq6lqsdi6hr35pih2kwwwd5cgmwfff8nfx60kw"; depends=[Biobase limma multtest]; };
+RUVSeq = derive { name="RUVSeq"; version="1.3.0"; sha256="0wi1ydj98l0826sjpm4bfpdklz3735q16vamqzr2b10p3m22xi79"; depends=[EDASeq edgeR MASS]; };
+RUVcorr = derive { name="RUVcorr"; version="1.1.0"; sha256="1pgsfm17gnqwa9sr19f15h0nx1fhyjj07yhmpwr7s6p3v46qdw33"; depends=[BiocParallel corrplot gridExtra lattice MASS psych reshape2 snowfall]; };
+RUVnormalize = derive { name="RUVnormalize"; version="1.3.0"; sha256="1fqk68rpznz9xc7ricipvrk1anppa33h9m5yv65fjwv4q1d05265"; depends=[Biobase]; };
+RWebServices = derive { name="RWebServices"; version="1.33.1"; sha256="1bxp4zj7r1lrxb7r7l32h6b8hdxb1ryf7dxxj0qhwimh7pmxln31"; depends=[RCurl SJava TypeInfo]; };
+RamiGO = derive { name="RamiGO"; version="1.15.0"; sha256="1q9f2ii5b1xway407gzfpzz6vm6an8p13vmgkw7vb9rldxn85hab"; depends=[graph gsubfn igraph png RCurl RCytoscape]; };
+RankProd = derive { name="RankProd"; version="2.41.0"; sha256="05r8mrgnpfkd7yhcch7nrn9jbapfhvi67h0z9a9nlxlp44mz0qq7"; depends=[]; };
+Rariant = derive { name="Rariant"; version="1.5.0"; sha256="1xwy2xrdk1m1mscnql8cp3az1jx639a9w4mb8bz7jf62z4z4npsi"; depends=[dplyr exomeCopy GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges reshape2 Rsamtools S4Vectors shiny SomaticSignatures VariantAnnotation VGAM]; };
+RbcBook1 = derive { name="RbcBook1"; version="1.37.0"; sha256="03q82zjd725w585rgdn9mbx7ddsv1kdxylsndh26csz573j2myhh"; depends=[Biobase graph rpart]; };
+Rbowtie = derive { name="Rbowtie"; version="1.9.0"; sha256="02wc0pzw9vm1mc7y84ic79jjdi1mh77v8h4gk2pl117pdkgg7nl7"; depends=[]; };
+Rcade = derive { name="Rcade"; version="1.11.0"; sha256="0dqhir9nkkhga3zll4jv9nc4k2kaggxkks2whfw581k9akj1v7x1"; depends=[baySeq GenomicRanges plotrix rgl Rsamtools S4Vectors]; };
+Rchemcpp = derive { name="Rchemcpp"; version="2.7.0"; sha256="0px77l9h4f0kximv7almkyx9lfc67cdvms25mfry5hyv2v2d3qb8"; depends=[ChemmineR Rcpp]; };
+RchyOptimyx = derive { name="RchyOptimyx"; version="2.9.0"; sha256="1l84zzd4xpz409gl3d3j5ssddgx3i6ik5hqsdggyvnvf1nb2yavn"; depends=[flowType graph Rgraphviz sfsmisc]; };
+Rcpi = derive { name="Rcpi"; version="1.5.0"; sha256="1ap4i41iy9r6xl0dhlry6yz28g5blb057vvddx6ysphaq9gwx6rp"; depends=[Biostrings ChemmineR doParallel fmcsR foreach GOSemSim rcdk RCurl rjson]; };
+Rdisop = derive { name="Rdisop"; version="1.29.0"; sha256="0j40i96k6q94c3238gl3z9kp9dxv00133m9s4zx28z17ayz00h69"; depends=[Rcpp RcppClassic]; };
+ReQON = derive { name="ReQON"; version="1.15.1"; sha256="147fywvb9f9gjg3ij3sh753fs6mkr9b3f1c9j4gws1hmc6ryyn3m"; depends=[rJava Rsamtools seqbias]; };
+ReactomePA = derive { name="ReactomePA"; version="1.13.2"; sha256="0wll3hgf161jyj2pzbybncvikw6idph672s3n048a1fa7nn8abyg"; depends=[AnnotationDbi DOSE graphite igraph]; };
+ReadqPCR = derive { name="ReadqPCR"; version="1.15.0"; sha256="063swfh992gmibvr9ffsh65i57fdl651gpc39b2y6k9dp2rx8is7"; depends=[affy Biobase]; };
+RedeR = derive { name="RedeR"; version="1.17.0"; sha256="13fmv76jrzxsa1ykzl85zwj0zb3aycyvc5s3h60vlgawfw66z90h"; depends=[igraph RCurl XML]; };
+RefNet = derive { name="RefNet"; version="1.5.0"; sha256="0dzkvrpphbajpcwc3gdqi8lmwfg8a3rljhdnwswvbjg2vraj48s2"; depends=[AnnotationHub BiocGenerics IRanges PSICQUIC RCurl shiny]; };
+RefPlus = derive { name="RefPlus"; version="1.39.0"; sha256="049nv5jhcl26vgvimgd6s7832vd6q2rn7h6pmc8wd6844vv7sx2n"; depends=[affy affyPLM Biobase preprocessCore]; };
+Repitools = derive { name="Repitools"; version="1.15.1"; sha256="00jjhxib1whn6dv7cilvdglppkqlafm5wvsg89r2hyrh8l6f2a2b"; depends=[aroma_affymetrix BiocGenerics Biostrings BSgenome cluster DNAcopy edgeR GenomeInfoDb GenomicAlignments GenomicRanges gplots gsmoothr IRanges MASS Ringo Rsamtools Rsolnp rtracklayer S4Vectors]; };
+ReportingTools = derive { name="ReportingTools"; version="2.9.1"; sha256="05p005092xm2qjz9b60562q69avphgrr8x7iac24pvnbywn1j7q2"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category DESeq2 edgeR ggbio ggplot2 GOstats GSEABase hwriter IRanges knitr lattice limma R_utils XML]; };
+Rgraphviz = derive { name="Rgraphviz"; version="2.13.0"; sha256="08apr3v2h5jwah96c2596ggz7xaz41k5zywcqsjm6g8xhd3hs522"; depends=[graph]; };
+Rhtslib = derive { name="Rhtslib"; version="1.1.8"; sha256="1n6mimlkyaxcfwfr4hclmch3h14qaffakkd899p9fwlf1d60j9xw"; depends=[zlibbioc]; };
+Ringo = derive { name="Ringo"; version="1.33.0"; sha256="12qh3aayy317pzb137ds9vqrrwn93c4l4fdcl6yyp8p4fqpki03j"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; };
+Risa = derive { name="Risa"; version="1.11.0"; sha256="1rgyh3yv4ii0xw6ycm0g9b0y6c9nqdq4k8lidmifk0gx835lw7vf"; depends=[affy Biobase biocViews Rcpp xcms]; };
+Rmagpie = derive { name="Rmagpie"; version="1.25.0"; sha256="13mb9aaqmwx1ad4mk0fhxqfql8pjpyaiibip7jawiyji7ghp9iw7"; depends=[Biobase e1071 kernlab pamr]; };
+RmiR = derive { name="RmiR"; version="1.25.0"; sha256="1xc19w8la239ia793qpnpx2h0aavwhidrjf4i87jry2j29npjfzz"; depends=[DBI RSVGTipsDevice]; };
+RnBeads = derive { name="RnBeads"; version="1.1.1"; sha256="1cz26pivf2w57ha03c49nsqnvr93s8s4xqdy2ccdc3rgffvv191g"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr RColorBrewer]; };
+RnaSeqSampleSize = derive { name="RnaSeqSampleSize"; version="1.1.0"; sha256="0q2w1yd5p9k3pls6ki8yci3r2v4rxi3iy4zk5mafmr7ip0q1rwpp"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp]; };
+Rnits = derive { name="Rnits"; version="1.3.0"; sha256="0hxll8hlv5nc6vijznhzmvbjh1hxmfy9shm2g8al291yi0gfdmk3"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; };
+Roleswitch = derive { name="Roleswitch"; version="1.7.0"; sha256="01b21yyg0d2v10abcbw08zhswh9nb7wj7s3x5kcaaas7671f06ha"; depends=[Biobase biomaRt Biostrings DBI microRNA plotrix pracma reshape]; };
+Rolexa = derive { name="Rolexa"; version="1.25.0"; sha256="1qrf7byimw9s5jp15zmwqk95x34r3yx2npr46gwf1zih06n7kc05"; depends=[Biostrings IRanges mclust ShortRead]; };
+RpsiXML = derive { name="RpsiXML"; version="2.11.0"; sha256="0rvma7vynfh5sjhqnbpagilq54dh0wrvvb3jzykwmrak0dbyk7zh"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; };
+Rqc = derive { name="Rqc"; version="1.3.0"; sha256="06x637d83qv0g0b833r02andj13ipn7dg9xp3lz1rfv5rc1v9m6v"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings ggplot2 IRanges knitr markdown plyr reshape2 S4Vectors ShortRead]; };
+Rsamtools = derive { name="Rsamtools"; version="1.21.8"; sha256="0hv36vmhv37mvn4mqyydyjm3gsfmnizw37jicpb9m2zgc6zgvzha"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; };
+Rsubread = derive { name="Rsubread"; version="1.19.0"; sha256="1vlv6h84bxl8986vqc0j47jgmyx8zn2fawj2w6r6fbblq3n2gnm0"; depends=[]; };
+Rtreemix = derive { name="Rtreemix"; version="1.31.0"; sha256="1z08y8qhc3sv4pwvji4pks46hxpcpwb9yx8y0927bc96a8mqgax4"; depends=[Biobase graph Hmisc]; };
+S4Vectors = derive { name="S4Vectors"; version="0.7.5"; sha256="0fayn794gwndk7rnawmks1armc1znfgllnsdk36fa19fg9g3245r"; depends=[BiocGenerics]; };
+SAGx = derive { name="SAGx"; version="1.43.0"; sha256="111pgl7rzmscgadkbivwa736gpyw1z7zkcj648zq3jhqix569dvd"; depends=[Biobase multtest]; };
+SANTA = derive { name="SANTA"; version="2.5.0"; sha256="1xrgjhja7idfby99ln90q1h6qrvsy1zbxksjccrv25qqmgaiw0ql"; depends=[igraph Matrix snow stringr]; };
+SBMLR = derive { name="SBMLR"; version="1.65.0"; sha256="1nmw5c32ka6l12cid54mc4diahjhmyg6fngsd646v70rbzgffn7q"; depends=[deSolve XML]; };
+SCAN_UPC = derive { name="SCAN.UPC"; version="2.11.0"; sha256="1gwjd78qfaqv6xh4ys6rr29b82wc8qxk7ysfjcl06j6n0qk1v4s6"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; };
+SELEX = derive { name="SELEX"; version="1.1.0"; sha256="13v2aqphpblwslbnm9yk9lfg31vrc3lz9ds4m8j7584iszmlgnar"; depends=[Biostrings rJava]; };
+SEPA = derive { name="SEPA"; version="0.99.0"; sha256="1mc44amd39x1dvl0kamhbsn2cplg7h5j5v5y2lv1gminfl4xs0sw"; depends=[ggplot2 reshape2 segmented shiny topGO]; };
+SGSeq = derive { name="SGSeq"; version="1.3.7"; sha256="0cr9z0yjbn7n3p4442vjsdr6a0g0nsw6cp0mp7g92vna8lhff4n0"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+SIM = derive { name="SIM"; version="1.39.0"; sha256="1r08h5hkciycv4lh998vm742flim07plysgjvrq9dp4c5q4qrzr5"; depends=[globaltest quantreg quantsmooth]; };
+SIMAT = derive { name="SIMAT"; version="1.1.0"; sha256="1w9pw94p4fiq54vjh132b4j0gj5qq06y0b7crdbhv9ihn6780lpg"; depends=[ggplot2 mzR Rcpp reshape2]; };
+SJava = derive { name="SJava"; version="0.95.1"; sha256="1cl0qybi71srf1ggawxdy128kz8crn8if4yi8c2m6w9ppah9m763"; depends=[]; };
+SLGI = derive { name="SLGI"; version="1.29.0"; sha256="0jhi3nmgnqf8qix90kpz8gqibqvyp02ca07aka7npqls24d3i96f"; depends=[AnnotationDbi Biobase BiocGenerics lattice ScISI]; };
+SLqPCR = derive { name="SLqPCR"; version="1.35.0"; sha256="1p35xgwf3i8ksznz1gi3bddj0816hdljamcb7smdrq0md5fqmpzb"; depends=[]; };
+SMAP = derive { name="SMAP"; version="1.33.0"; sha256="0znl289fclws2vnqgpjnrl8b0s5q4cna3ps3il5783vr64ir88cg"; depends=[]; };
+SNAGEE = derive { name="SNAGEE"; version="1.9.0"; sha256="0sn5b8ah9idbz63y1rjx8brz3h58zvh2sk59l4i48nvrm38g169r"; depends=[]; };
+SNPRelate = derive { name="SNPRelate"; version="1.3.4"; sha256="1m10sa7zlsg8b77xi663jz315fi267g2d59d69a7mzcznxz7xi1z"; depends=[gdsfmt]; };
+SNPchip = derive { name="SNPchip"; version="2.15.2"; sha256="1px5ifdsly1z8iwd22vj2xb4pk5jhsa3h2z31scw37b0v4daks50"; depends=[Biobase foreach GenomeInfoDb GenomicRanges IRanges lattice oligoClasses SummarizedExperiment]; };
+SPEM = derive { name="SPEM"; version="1.9.0"; sha256="09klaxlz1ff77jhjsr95g3s4b5m285zf3fl9w4mv5pc8r1viqplf"; depends=[Biobase Rsolnp]; };
+SPIA = derive { name="SPIA"; version="2.21.0"; sha256="0v8m9wfl2kqzzl3k0v7lr7g33ymdnmqi9r2fqyb42mggpq5pwxlm"; depends=[KEGGgraph]; };
+SQUADD = derive { name="SQUADD"; version="1.19.0"; sha256="0xss3vhn6471z44gd44i8j5bni8471nb1sq3cx99f2gyk817nxp8"; depends=[RColorBrewer]; };
+SRAdb = derive { name="SRAdb"; version="1.23.0"; sha256="042y06ds1jdj26jzi51wxb6mlmlr751jyf7ggjaq7zrz267dmj76"; depends=[GEOquery graph RCurl RSQLite]; };
+SSPA = derive { name="SSPA"; version="2.9.0"; sha256="1kkvj3s2l6zzvv6pybx38qrnm3i5dxckx2fpc4snlx7km2w175xz"; depends=[lattice limma qvalue]; };
+STAN = derive { name="STAN"; version="1.3.0"; sha256="02qg79aa0j2ns1xswdirgbpwb0dlghd0lbdxgnpmy225wgb7nak6"; depends=[Rsolnp]; };
+STATegRa = derive { name="STATegRa"; version="1.3.1"; sha256="0kfwi5qimg4myx5x0gjwrkhz8cxh2hz1mvxla8yn8v8fkb3ryshj"; depends=[affy Biobase calibrate edgeR foreach ggplot2 gplots gridExtra limma MASS]; };
+STRINGdb = derive { name="STRINGdb"; version="1.9.0"; sha256="0nsl13gb0kjppd4gnpg35ww1dy0gnql7ki6902pxam6pz2m0sp26"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; };
+SVM2CRM = derive { name="SVM2CRM"; version="1.1.0"; sha256="0k3mg9b8i406ssvkzacz60qk000bnd1d5bmcqzc3yrh3w9qv567q"; depends=[AnnotationDbi GenomicRanges IRanges LiblineaR mclust pls ROCR rtracklayer squash verification zoo]; };
+SamSPECTRAL = derive { name="SamSPECTRAL"; version="1.23.2"; sha256="1bm8b6myyafya99af6w6ayngkm8dl85ldma0lf6v0gysmn9dlqkk"; depends=[]; };
+ScISI = derive { name="ScISI"; version="1.41.0"; sha256="05snqj8qphcmnkrmv42p6zs92dmi09sd06abn5ll5234my5d0vvn"; depends=[annotate AnnotationDbi apComplex RpsiXML]; };
+SemDist = derive { name="SemDist"; version="1.3.0"; sha256="0dvnp3d2s7bc4jv2vm8jikyac2cd23hx7r480g2lkcaic99wbl0s"; depends=[annotate AnnotationDbi]; };
+SeqArray = derive { name="SeqArray"; version="1.9.3"; sha256="062zl6igsf12k7k9c5j0sya3mq57y0vp1giqcj3czv569ipnc93s"; depends=[Biostrings gdsfmt GenomicRanges IRanges S4Vectors VariantAnnotation]; };
+SeqGSEA = derive { name="SeqGSEA"; version="1.9.0"; sha256="0znabm84qgzf9m4dk64jppn3s5vzz1sjvrdlr7s6jls8jwi8kqqi"; depends=[Biobase biomaRt DESeq doParallel]; };
+SeqVarTools = derive { name="SeqVarTools"; version="1.7.0"; sha256="0nwhz7fpfrbbvcl08g8wflhz8iv660grfq2dq0l5bgqv04x3a19h"; depends=[gdsfmt GenomicRanges GWASExactHW IRanges S4Vectors SeqArray VariantAnnotation]; };
+ShortRead = derive { name="ShortRead"; version="1.27.4"; sha256="1wkpl67rbiwdy5s4hr84bgc4qj4i94d3kkgg527c2xdg7pwd2vx9"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; };
+SigCheck = derive { name="SigCheck"; version="2.1.0"; sha256="012n75gmsifvymbk20pjdv9g8mzmm9bzk98l089ymy5hbddja86b"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; };
+SigFuge = derive { name="SigFuge"; version="1.7.0"; sha256="1b966n3rl4xs3q1vjgkxxfravqr02rdgwyzvr469y757qdqi1day"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; };
+SimBindProfiles = derive { name="SimBindProfiles"; version="1.7.0"; sha256="04m7h5zil05sg9yfgjjzm1p65302fp50vxf8y1jafp1nwqialxwh"; depends=[Biobase limma mclust Ringo]; };
+SomatiCA = derive { name="SomatiCA"; version="1.13.0"; sha256="06b3mz199qm2ynal8iq4kp8rv40wbc5zipzwm22nccf97krxl9a4"; depends=[DNAcopy doParallel foreach GenomicRanges IRanges lars rebmix sn]; };
+SomaticSignatures = derive { name="SomaticSignatures"; version="2.5.4"; sha256="1kr4z1b9b5a8gb1m9vfk9bxhinh5ccba2mrwnq3cqhb7c3slbjs3"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; };
+SpacePAC = derive { name="SpacePAC"; version="1.7.0"; sha256="1ay5hlbm2x9g5mjrq5qksgrrr84vwfk49g9qb2sc9wyc46n5af6k"; depends=[iPAC]; };
+SpeCond = derive { name="SpeCond"; version="1.23.0"; sha256="0nbbqazxql9mc5idvrcycrm9fkrnm2vi9zrad3awhc378ippdk8k"; depends=[Biobase fields hwriter mclust RColorBrewer]; };
+SplicingGraphs = derive { name="SplicingGraphs"; version="1.9.1"; sha256="1s3kvaxrrvfndp4imavj0r9zw0rg37cn9xwxhi5zpfd7a784z1xk"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; };
+Starr = derive { name="Starr"; version="1.25.0"; sha256="0553rfkhzzlszhmfcrl7r7n2jmvvz9rqj91x131x3jsmb1qavw57"; depends=[affxparser affy MASS pspline Ringo zlibbioc]; };
+Streamer = derive { name="Streamer"; version="1.15.2"; sha256="0mah1sq797ihy82mvb6vyppggap3nxcpwbnswxf1rw0jxhnjnmll"; depends=[BiocGenerics graph RBGL]; };
+SummarizedExperiment = derive { name="SummarizedExperiment"; version="0.1.5"; sha256="1n29sssjkhaj2rs9qd9g8mq25a63rs04f1kn9hjy67f10i5h1l1n"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
+Sushi = derive { name="Sushi"; version="1.6.1"; sha256="0g1fk0xrn584l49r73crj0bc5z2y6rdzyf54d221r7k119njp3dw"; depends=[biomaRt zoo]; };
+SwimR = derive { name="SwimR"; version="1.7.0"; sha256="07kh24m9d1q3swj3srjybj6lq68s89750fbvlg449px4aq23yrq0"; depends=[gplots heatmap_plus R2HTML signal]; };
+TCC = derive { name="TCC"; version="1.9.0"; sha256="1bihqfvrq3sjs38m2a60swxqcxmgabb1lmsnfrb669imiqc7ramj"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; };
+TDARACNE = derive { name="TDARACNE"; version="1.19.0"; sha256="0nwg355n0qs781801pmmwfwp66sa2ci7g6gfdh4669067j4qbqhb"; depends=[Biobase GenKern Rgraphviz]; };
+TEQC = derive { name="TEQC"; version="3.9.0"; sha256="0dkmh901jkf529jcshvr79jmkvw0824r4dxgp6l6vgv9j5c6nf25"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; };
+TFBSTools = derive { name="TFBSTools"; version="1.7.0"; sha256="1c38n6xlm4cfrhh9qih0d8xh3d7r7w797fjcbmhsr2zhd7qssrqb"; depends=[BiocParallel Biostrings BSgenome caTools CNEr DirichletMultinomial GenomicRanges gtools IRanges RSQLite rtracklayer S4Vectors seqLogo TFMPvalue XVector]; };
+TIN = derive { name="TIN"; version="1.1.0"; sha256="0npf3gwh2izvsa5j0zjy1gkm69nrxhcjlm2ha621fc1gz7lx1i2y"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; };
+TPP = derive { name="TPP"; version="1.1.0"; sha256="06xm73jx4f2pldi7yifvx7zh62zmigidnfd7klpp0jpfxx3xjw61"; depends=[Biobase doParallel foreach ggplot2 gridExtra nls2 openxlsx plyr reshape2 VennDiagram VGAM]; };
+TRONCO = derive { name="TRONCO"; version="1.1.0"; sha256="18zmn1cxysar3a19n9i47r2gda5r5jvz0bk209wh6kqlhs001q9v"; depends=[graph lattice Rgraphviz]; };
+TSCAN = derive { name="TSCAN"; version="1.5.0"; sha256="1hkmfn9svbgpvxpszfdxjc23qq8x60prsbrgv7z5n3na4sl7y5z5"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; };
+TSSi = derive { name="TSSi"; version="1.15.0"; sha256="0475zw1s34ayiz0v9i770rmha4rx9i3zzkjvyskgvsdpgsq9wl4j"; depends=[Biobase BiocGenerics Hmisc IRanges minqa plyr S4Vectors]; };
+TargetScore = derive { name="TargetScore"; version="1.7.0"; sha256="0lkkxzi3fi0dxika09fkbakq54c2sjw4g4y9bafcy3f225fac8x8"; depends=[Matrix pracma]; };
+TargetSearch = derive { name="TargetSearch"; version="1.25.0"; sha256="071p06gb1rn6sdhdpi7g05rflp6jgs0cdff13gj8hr5jykyw5ix7"; depends=[mzR]; };
+TitanCNA = derive { name="TitanCNA"; version="1.7.1"; sha256="0a64bqgyn18qdvgzmc6kqr6c16jlqyz0vah0fm2qwdjz3zmjd081"; depends=[foreach GenomeInfoDb IRanges Rsamtools]; };
+ToPASeq = derive { name="ToPASeq"; version="1.3.0"; sha256="1m6mh30fpf9mmgg2wsv08qvizw0cpa6dz5abspgbw3q0vaskm2db"; depends=[Biobase clipper DESeq DESeq2 edgeR fields GenomicRanges graph graphite gRbase KEGGgraph limma locfit qpgraph R_utils RBGL Rcpp Rgraphviz TeachingDemos]; };
+TransView = derive { name="TransView"; version="1.13.0"; sha256="14fanxl8lqam3492c5sbvhsjwbayrx7dcp5wpsbqrcvbssmfa3cx"; depends=[GenomicRanges gplots IRanges Rsamtools zlibbioc]; };
+TurboNorm = derive { name="TurboNorm"; version="1.17.0"; sha256="1f2frh2xnngzpl2q2jxiild98qgnd60c0pz31aisk013nj3jdadq"; depends=[affy convert lattice limma marray]; };
+TypeInfo = derive { name="TypeInfo"; version="1.35.0"; sha256="0rxwfaqg8sg70hiq8frm4pjhs8a17n0rgjra346bsi8cm4a2vyhz"; depends=[]; };
+UNDO = derive { name="UNDO"; version="1.11.0"; sha256="173cdpp0gipwplxdf7ynxqnv8fqfkbyx7xmr5cx396zi8gpq3am4"; depends=[Biobase BiocGenerics boot MASS nnls]; };
+UniProt_ws = derive { name="UniProt.ws"; version="2.9.1"; sha256="0w5rgr5a5mmhrgvgdyxvglflz1z3yl8i8kfrhcavl1apkqv2v0p0"; depends=[AnnotationDbi BiocGenerics RCurl RSQLite]; };
+VanillaICE = derive { name="VanillaICE"; version="1.31.2"; sha256="0szd11zz5nvax9awwh1v3qdg01x7s87a2smacz96fya9acjiclhb"; depends=[Biobase BiocGenerics crlmm data_table foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment]; };
+VariantAnnotation = derive { name="VariantAnnotation"; version="1.15.13"; sha256="1fp09wnvwh981bwysfnvak1qz0ybidz6qim73w1wg32dn2d42p5a"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; };
+VariantFiltering = derive { name="VariantFiltering"; version="1.5.14"; sha256="0r972lvyjcq0wxxnpgd9ym0b7kfjl8nyjkkci2z5gnilpq9ds5fw"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges graph Gviz IRanges RBGL Rsamtools RSQLite S4Vectors shiny VariantAnnotation XVector]; };
+VariantTools = derive { name="VariantTools"; version="1.11.0"; sha256="1yyx9l6q3v4igm2ppnrsj9c7p4p0zpkqwjyf9d7b7rqvrk9yjyrv"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges gmapR IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
+Vega = derive { name="Vega"; version="1.17.0"; sha256="1c39112czlw9hgh9gmkwxhhz9kwki48k8lsfmy3hkzxqpxx61h01"; depends=[]; };
+VegaMC = derive { name="VegaMC"; version="3.7.0"; sha256="046wly5sn4vwk3h4bcick8q5dpjrfjq393rqjl8y4v24iqynlyqd"; depends=[Biobase biomaRt genoset]; };
+XDE = derive { name="XDE"; version="2.15.0"; sha256="17i8zxb6q4wpsa8lymcnilmr39ip1a54h6rqyl3m7qa8xwb0gv50"; depends=[Biobase BiocGenerics genefilter gtools MergeMaid mvtnorm]; };
+XVector = derive { name="XVector"; version="0.9.1"; sha256="0l5l45i7sx1j51s3wkab207qwbk77i8iazd26isf0yp3rsb84a4c"; depends=[BiocGenerics IRanges S4Vectors]; };
+a4 = derive { name="a4"; version="1.17.0"; sha256="0pn0gm4xkngz72i92h58d0xbpcx04938x4vm0mqsilrjapchripj"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; };
+a4Base = derive { name="a4Base"; version="1.17.0"; sha256="13cxavpf8x7y7n6aszdibpq225raj15klnidk59kpxn4vmpyqskl"; depends=[a4Core a4Preproc annaffy AnnotationDbi Biobase genefilter glmnet gplots limma mpm multtest]; };
+a4Classif = derive { name="a4Classif"; version="1.17.0"; sha256="1inascpwzzshy1halmsalz7nk9m63rbpg6xh0wxydaflm8wbxmr1"; depends=[a4Core a4Preproc glmnet MLInterfaces pamr ROCR varSelRF]; };
+a4Core = derive { name="a4Core"; version="1.17.0"; sha256="07fc0kg4l44mbps49bdivsxdf5581mdvgdl2551a24vayb6kg050"; depends=[Biobase glmnet]; };
+a4Preproc = derive { name="a4Preproc"; version="1.17.0"; sha256="1xb7jqvb4x5s9a5gbn8b7z69cwhsbmln5s0lymxcgmfb73sjczfw"; depends=[AnnotationDbi]; };
+a4Reporting = derive { name="a4Reporting"; version="1.17.0"; sha256="1fpdkw048gv9031rz7zkkx55i5qw5b03zdhykxkcczb1f51znby2"; depends=[annaffy xtable]; };
+aCGH = derive { name="aCGH"; version="1.47.0"; sha256="095arlryay4gdr6kva7vf9lcby60pyx5bs4vcx586zgwskzpb2ln"; depends=[Biobase cluster multtest survival]; };
+acde = derive { name="acde"; version="0.99.5"; sha256="1bbsfr7a2sivb6dpn06hwj0i95wdlfxzba4a36pakx7nzn6nv76p"; depends=[boot]; };
+adSplit = derive { name="adSplit"; version="1.39.0"; sha256="1jprbqwhksyp9jf05r5dbfzgn30xm16shqsf8yi9b3nr7z2swvwm"; depends=[AnnotationDbi Biobase cluster multtest]; };
+affxparser = derive { name="affxparser"; version="1.41.4"; sha256="11l1d74qvsaknnfa4wwp1jb0v17hwbz5yc8fnvg5qqmdwnblrdjc"; depends=[]; };
+affy = derive { name="affy"; version="1.47.1"; sha256="1c9ggyqhj65mj0nq9xsqfmzp4a5705qj67swjpk5bmqajxr390a3"; depends=[affyio Biobase BiocGenerics BiocInstaller preprocessCore zlibbioc]; };
+affyContam = derive { name="affyContam"; version="1.27.0"; sha256="1hd9kchhdjcnkxlf6kcc59jb5a9v67671shvzprraa1lg4800j5x"; depends=[affy Biobase]; };
+affyILM = derive { name="affyILM"; version="1.21.0"; sha256="1gvagg83p4vxp6q72s7camcg5lhxdfy7rmm3a2p2n29267xvcz5x"; depends=[affxparser affy Biobase gcrma]; };
+affyPLM = derive { name="affyPLM"; version="1.45.0"; sha256="1443xrhphkmrjah5lgnq00zqbillngwz9r50xk1kg9br4fxm3adv"; depends=[affy Biobase BiocGenerics gcrma preprocessCore zlibbioc]; };
+affyPara = derive { name="affyPara"; version="1.29.0"; sha256="06382vyfjrng72hhmdivbhz02l27g18ll867clj8avi5r66zlj4n"; depends=[affy affyio aplpack snow vsn]; };
+affyQCReport = derive { name="affyQCReport"; version="1.47.0"; sha256="09f3pbacsrjs5bv1bv3dz7jmd849rnix6pqlkszr507s6by5i47y"; depends=[affy affyPLM Biobase genefilter lattice RColorBrewer simpleaffy xtable]; };
+affycomp = derive { name="affycomp"; version="1.45.0"; sha256="0wwgijr7h2hbv2l0w5p509f70yy873w8kahs7nnhrgl4kzbjiymc"; depends=[Biobase]; };
+affycoretools = derive { name="affycoretools"; version="1.41.9"; sha256="16zdm1idmssg9jp86kkfc2h2dhjz2rl6qnrbybfbkiiklj2gagq7"; depends=[affy AnnotationDbi Biobase gcrma ggplot2 GOstats gplots hwriter lattice limma oligoClasses ReportingTools xtable]; };
+affyio = derive { name="affyio"; version="1.37.0"; sha256="0p6wgrl8xag85y5vadfxdvvr430d7sa4wh2fw3ijyi3hr83sdr4z"; depends=[zlibbioc]; };
+affylmGUI = derive { name="affylmGUI"; version="1.43.0"; sha256="04np48b2v04w77vhpacdx8790i8jb58rw7da76qvahiqja857vlq"; depends=[affy affyio affyPLM AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
+affypdnn = derive { name="affypdnn"; version="1.43.0"; sha256="01myf9dxzgc2jgdswphinz7ap7bdaqnw0gcfk32sxbykr4g4zyiy"; depends=[affy]; };
+agilp = derive { name="agilp"; version="3.1.0"; sha256="13jnq7v0qfyllbldx2abnia0rg40yxxgkq4i1whsy5qnk1fp0n77"; depends=[]; };
+alsace = derive { name="alsace"; version="1.5.0"; sha256="17ah7dl02w6qysfbs92h4c3wxfb6f1m6vz6yl07s0zd86k12g4nm"; depends=[ALS ptw]; };
+altcdfenvs = derive { name="altcdfenvs"; version="2.31.0"; sha256="05gr6j1w1y289p239138qv4ap4rciwpbw2g2cdm63xzlnryanr1m"; depends=[affy Biobase BiocGenerics Biostrings hypergraph makecdfenv]; };
+ampliQueso = derive { name="ampliQueso"; version="1.7.0"; sha256="1bk0svxg7n6b610d5czkk1mgkrgdsjlghbj38g4hxxw3vciaxhkk"; depends=[DESeq doParallel edgeR foreach genefilter ggplot2 gplots knitr rgl rnaSeqMap samr statmod VariantAnnotation xtable]; };
+annaffy = derive { name="annaffy"; version="1.41.1"; sha256="1rqp0lrhahkimnhifpipf2vw0lhprdx9slz3s4bwylvn0k5balcm"; depends=[AnnotationDbi Biobase]; };
+annmap = derive { name="annmap"; version="1.11.0"; sha256="0s0ifbwra3zczw9h0nqcs88rb3h74ry1gap1bvqvcxqirdwq9nw4"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; };
+annotate = derive { name="annotate"; version="1.47.0"; sha256="06nrzkl9g26rrnqvakwkn2yinvgka02a5iivhi9kgjk4g5plcmkw"; depends=[AnnotationDbi Biobase BiocGenerics DBI XML xtable]; };
+annotationTools = derive { name="annotationTools"; version="1.43.0"; sha256="1dqs8f4p1ks03q0lfwm3hs116ahks39hk17knkqs492zcqr83qay"; depends=[Biobase]; };
+anota = derive { name="anota"; version="1.17.0"; sha256="0grdmpdg03wqjs6rk558nvl8vvdi6my0jv06f3h364pk44hrijdn"; depends=[multtest qvalue]; };
+antiProfiles = derive { name="antiProfiles"; version="1.9.0"; sha256="0jyrwk7h3qrka950yqhblavf40yjbyarimrf8d7zbq1kd3licfbf"; depends=[matrixStats]; };
+apComplex = derive { name="apComplex"; version="2.35.0"; sha256="0h9vvz62fbnqqw2qz4kpcr0s40yj7swy0plkdaq51q04p41z016r"; depends=[graph RBGL Rgraphviz]; };
+aroma_light = derive { name="aroma.light"; version="2.5.1"; sha256="0d48c2860gg2qpmqx5i0lzh2n8chb4jdq78f169vlynx49ix3kq7"; depends=[matrixStats R_methodsS3 R_oo R_utils]; };
+arrayMvout = derive { name="arrayMvout"; version="1.27.0"; sha256="1czqsd34d8rb9h4vwp2m6ficvi41gbdgrilgbl0fb01vlp79qq0k"; depends=[affy affyContam Biobase lumi mdqc parody simpleaffy]; };
+arrayQuality = derive { name="arrayQuality"; version="1.47.0"; sha256="0f3wvvb1a78hzlxansjfh065vbyh2qk9vz3jna6294zc7k4r7wfb"; depends=[gridBase hexbin limma marray RColorBrewer]; };
+arrayQualityMetrics = derive { name="arrayQualityMetrics"; version="3.25.0"; sha256="0h90j2fj87bvwj1cjy7qq5mnfy4jabqa8ijq23gp3p51qwyh84zr"; depends=[affy affyPLM beadarray Biobase Cairo genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG vsn XML]; };
+attract = derive { name="attract"; version="1.21.0"; sha256="0kl2kgxvm9ix2lwcwilmzcjhxbhx99afn6g6608aq26649q3k2sz"; depends=[AnnotationDbi Biobase cluster GOstats limma]; };
+ballgown = derive { name="ballgown"; version="2.1.0"; sha256="168bpcawi5g6vhwg16585qd6g1pp3kd4baldcd1yk9bkccxaj8xx"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; };
+bamsignals = derive { name="bamsignals"; version="1.1.0"; sha256="1ga4swlqmjg4xnmkk16h0qjh3dpz7n0pra2233j4cz78cn8zvj3p"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; };
+baySeq = derive { name="baySeq"; version="2.3.0"; sha256="1l0is5dcwip7babll7mpsahhj69v1j1d7caq64ak6qhb477pmak5"; depends=[abind GenomicRanges perm]; };
+beadarray = derive { name="beadarray"; version="2.19.0"; sha256="0izc7i65j60k20a86hblkfq6vq2n855vi8qrn42p3gx27s28a20v"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 illuminaio IRanges limma reshape2]; };
+beadarraySNP = derive { name="beadarraySNP"; version="1.35.0"; sha256="0g6ba4iynfgrm647d5vx6wk9pijg62bdvvz1afz9dimqvjlwybhc"; depends=[Biobase quantsmooth]; };
+betr = derive { name="betr"; version="1.25.0"; sha256="0jd7r069jlfp5fj51xw8k6jpxq5kb364xi9331l06hwijp3msrk6"; depends=[Biobase limma mvtnorm]; };
+bgafun = derive { name="bgafun"; version="1.31.0"; sha256="18wk42h1i06j3swlsac9vnkc7riimk7qap59lygji1p3zvy1nkpx"; depends=[ade4 made4 seqinr]; };
+bgx = derive { name="bgx"; version="1.35.0"; sha256="1cawfanrxq82b24ny050hv4p607k2zhfxllgl8j1j9qm9n4yk4yk"; depends=[affy Biobase gcrma]; };
+bigmemoryExtras = derive { name="bigmemoryExtras"; version="1.13.2"; sha256="0qmrpm4bir0si5xd5v8ih6wnwfprwp4q9hcxbylf1721v9m9wpwv"; depends=[bigmemory Biobase]; };
+bioDist = derive { name="bioDist"; version="1.41.0"; sha256="14a18ky9x36fa8yx3kry23c0vfazxy0lg0j2zkdnr1irngc9wnw5"; depends=[Biobase KernSmooth]; };
+bioassayR = derive { name="bioassayR"; version="1.7.3"; sha256="1m6b2l0y7acpwpb6jjmmhsxdjrrhqnas7c8a2xq50x88l9ks4v68"; depends=[BiocGenerics DBI Matrix rjson RSQLite XML]; };
+biocGraph = derive { name="biocGraph"; version="1.31.0"; sha256="069n4867pkygrsgfjp6arnnmcvlij03r1a2kbs9jgnpx4knck09i"; depends=[BiocGenerics geneplotter graph Rgraphviz]; };
+biocViews = derive { name="biocViews"; version="1.37.7"; sha256="0d7gwbb9x23gr2h0pl72hzsm2jfj7s3dzbl66gmk6dc0bs7ibw42"; depends=[Biobase graph knitr RBGL RCurl RUnit XML]; };
+biomaRt = derive { name="biomaRt"; version="2.25.1"; sha256="1dk55qrfxyzgnjk90qy6mfgw04fpwfy4jkhwbmnpnky826mg7bwb"; depends=[AnnotationDbi RCurl XML]; };
+biomvRCNS = derive { name="biomvRCNS"; version="1.9.1"; sha256="0ni7ncip0vx1ipyrgd2kkasw6cmxbr2ha2dsqb0bizyyf2981rnh"; depends=[GenomicRanges Gviz IRanges mvtnorm]; };
+biosvd = derive { name="biosvd"; version="2.5.0"; sha256="0xnc3vpbj5p14w2fwql8vpz9lyvivq3kjmwsr62abn418ampa941"; depends=[Biobase BiocGenerics NMF]; };
+biovizBase = derive { name="biovizBase"; version="1.17.1"; sha256="0fffqm8z7x849rd0k7vhpbzwyrx5s0w75iz78627rglczjff6ddp"; depends=[AnnotationDbi BiocGenerics Biostrings dichromat GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Hmisc IRanges RColorBrewer Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; };
+birta = derive { name="birta"; version="1.13.0"; sha256="01lrwg4naks85gcrlg3sk3pr328j40b1ji4m4bn3s74rqn6sb52h"; depends=[Biobase limma MASS]; };
+birte = derive { name="birte"; version="1.3.0"; sha256="0azkl9x2hk826sdpw96ls868jf83yf1v79inyjg7xsilal2slqgf"; depends=[Biobase limma MASS nem Rcpp RcppArmadillo ridge]; };
+blima = derive { name="blima"; version="1.3.0"; sha256="1i7njg1lw76717irmfbpy9pmv8hy7nzyini2wm6625cafizp5xq8"; depends=[beadarray Biobase BiocGenerics]; };
+bridge = derive { name="bridge"; version="1.33.0"; sha256="06iz67amv80az14s8yim25jfsgbxhxbfifbqazsc78ip9gd7lfyv"; depends=[rama]; };
+bsseq = derive { name="bsseq"; version="1.5.3"; sha256="1rdblq7xh5hbghr66iamnpc24yiqrnqfn7pr835m6wag6waxdc3i"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges gtools IRanges locfit matrixStats S4Vectors scales SummarizedExperiment]; };
+bumphunter = derive { name="bumphunter"; version="1.9.1"; sha256="0phq9dhrj8fa253a64vwfp75j85vp9142g5gmfy1g1n861xy8r26"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; };
+caOmicsV = derive { name="caOmicsV"; version="0.99.2"; sha256="0y96f64m0liv53vbby866v1ga5nml1506pp6ff4ax7dbg0niiwwn"; depends=[bc3net igraph]; };
+canceR = derive { name="canceR"; version="1.1.2"; sha256="07wikalgmf3vw2dzmri1ia80hfman53mynsk40y549qn8hjija1k"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; };
+cancerclass = derive { name="cancerclass"; version="1.13.0"; sha256="066v9dz49ap0db31jrdlx2zbv8l3bwd75sf9gqa1dw3g8m9zq7hg"; depends=[binom Biobase]; };
+casper = derive { name="casper"; version="2.3.1"; sha256="12nz9ypg685c1bly3fp9x76cilh6imlw4hqdmd7sbp2d0z89dcgf"; depends=[Biobase BiocGenerics EBarrays gaga GenomeInfoDb GenomicFeatures GenomicRanges gtools IRanges limma mgcv Rsamtools rtracklayer S4Vectors sqldf survival VGAM]; };
+categoryCompare = derive { name="categoryCompare"; version="1.13.0"; sha256="08r5payxn40xdpaph6zind8miqlqdhnmka9jcijj396rbbhvb480"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCytoscape]; };
+ccrepe = derive { name="ccrepe"; version="1.5.0"; sha256="1cza3f27216aqlhmc3qfdxvjwywzhwklfg27ls37fbzv6a40wy8j"; depends=[infotheo]; };
+cellGrowth = derive { name="cellGrowth"; version="1.13.0"; sha256="1x7fxjhddv46wxv7qy1j8vzjna07r0drizpmsjakjw21mr4r3w06"; depends=[lattice locfit]; };
+cellHTS = derive { name="cellHTS"; version="1.39.1"; sha256="1xvnk8s7grhmjdh369zp6w6fasgrysbgnfyshgckaghvnlb5c962"; depends=[genefilter prada RColorBrewer]; };
+cellHTS2 = derive { name="cellHTS2"; version="2.33.0"; sha256="0gmf9xly6b9xskk6700m5jpc61hx4p6nbc5m47xmircwnn6lcvxi"; depends=[Biobase Category genefilter GSEABase hwriter locfit prada RColorBrewer splots vsn]; };
+cghMCR = derive { name="cghMCR"; version="1.27.0"; sha256="1chyl52628gnxnsky2d0xbxsj7x3jizc1h914cip9i90akir6srk"; depends=[BiocGenerics CNTools DNAcopy limma]; };
+charm = derive { name="charm"; version="2.15.0"; sha256="14mrkgzfhljsmf4saw64nkid583mx0wxwjfq16gzm5j8q5d2qy88"; depends=[Biobase Biostrings BSgenome ff fields genefilter gtools IRanges limma nor1mix oligo oligoClasses preprocessCore RColorBrewer siggenes SQN sva]; };
+chimera = derive { name="chimera"; version="1.11.0"; sha256="12341saahq2b3bwiqd2hpmykvsfdbzqy4082iv4lp3pjdzpvbmmx"; depends=[AnnotationDbi Biobase GenomicAlignments GenomicRanges Rsamtools]; };
+chipenrich = derive { name="chipenrich"; version="1.7.2"; sha256="08fmf80nlkr5yavq89nrzxxc8w8yfvpcfl2f5797a8yb5vg1palj"; depends=[GenomicRanges IRanges lattice latticeExtra mgcv plyr rms stringr]; };
+chipseq = derive { name="chipseq"; version="1.19.1"; sha256="1f84a0lscsh72n284h2i09zaimki3mlh73575bixy734lixjkvfn"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; };
+chopsticks = derive { name="chopsticks"; version="1.33.0"; sha256="0p6jsvn5pmbh0ws7kplkwx9dajl6npfd1icxds42kygkpcf3y8bz"; depends=[survival]; };
+chroGPS = derive { name="chroGPS"; version="1.13.1"; sha256="0ggzhi8fx9nrxcz88ail5m831hvg8pkqxmvj2xgxjvzbb0gk5sak"; depends=[Biobase changepoint cluster DPpackage ICSNP IRanges MASS]; };
+chromDraw = derive { name="chromDraw"; version="1.1.0"; sha256="1v3k6kiz2l216l61l8pr95fhyin6hqqg7qv9six5xg40xai8is7a"; depends=[GenomicRanges Rcpp]; };
+cisPath = derive { name="cisPath"; version="1.9.0"; sha256="1jdq159ixiixh9ppfc5g4pqi625vawag2w89q2l2n3fq57x890w8"; depends=[]; };
+cleanUpdTSeq = derive { name="cleanUpdTSeq"; version="1.7.1"; sha256="0inszzss1fqyhw18lx40iycvpzkm18djxmad1li8bd22hss759c2"; depends=[BiocGenerics BSgenome e1071 GenomicRanges seqinr]; };
+cleaver = derive { name="cleaver"; version="1.7.0"; sha256="14vbdagy61imql6z2qazzlqzp0r9ridydn7phvajc84lnwbf8xa3"; depends=[Biostrings IRanges]; };
+clippda = derive { name="clippda"; version="1.19.0"; sha256="1gd5b2n2qa9bv1n93vcdz8lg8kmn1lv923i3gzq8pcy7fbz7m5cs"; depends=[Biobase lattice limma rgl scatterplot3d statmod]; };
+clipper = derive { name="clipper"; version="1.9.0"; sha256="0py5hdbf8wypw5r9r2d7b3239b83lyrybcvksrmiklv7snw9c2qx"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; };
+clonotypeR = derive { name="clonotypeR"; version="1.7.0"; sha256="1pwwjgln7r7035fdqqfb69fgql91cxfablbwid2m5xkdrwzpb57s"; depends=[]; };
+clst = derive { name="clst"; version="1.17.0"; sha256="0wsn5ins5hz2xq866wh71b7jk4six5cy3hq5ff2a04n20asaiq4i"; depends=[lattice ROC]; };
+clstutils = derive { name="clstutils"; version="1.17.0"; sha256="0bnqmmi5j0iy1zjxlj4b621d9llww4b2wvrq1vcqjm5wfrn7a372"; depends=[ape clst lattice rjson RSQLite]; };
+clusterProfiler = derive { name="clusterProfiler"; version="2.3.3"; sha256="1hsqfl6dp5671y3sr0qxr01fra1b6y44a7jnc94mqdfabsm9a9vx"; depends=[AnnotationDbi DOSE ggplot2 GOSemSim KEGGREST magrittr plyr qvalue topGO]; };
+clusterStab = derive { name="clusterStab"; version="1.41.0"; sha256="0sgj2k70fc3r3s19vxcx95z8s3a42yshl78swxp0qp55kidbhvdp"; depends=[Biobase]; };
+cn_farms = derive { name="cn.farms"; version="1.17.0"; sha256="09xasmanimx3mzis786iwy2nvxqa5rzvrvrz1hpsiyh5y77yrbnb"; depends=[affxparser Biobase DBI DNAcopy ff lattice oligo oligoClasses preprocessCore snow]; };
+cn_mops = derive { name="cn.mops"; version="1.15.0"; sha256="11yds13b65hnhaiqckphcl7hn9z85qv7jpwrp4knscl9y8bs3s78"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools]; };
+cnvGSA = derive { name="cnvGSA"; version="1.13.0"; sha256="1sswh1xwimki8ys08l2h95ajpnm5gr0bscvwilhjw4g2a0y7nibr"; depends=[brglm doParallel foreach GenomicRanges splitstackshape]; };
+coGPS = derive { name="coGPS"; version="1.13.0"; sha256="160cf9ijn5crvhwbqldix1n36jrmn51085sr4whgm765si57wwb4"; depends=[]; };
+coMET = derive { name="coMET"; version="1.1.0"; sha256="01baf156p0ldqhczrin2lsf4jir7158b0db5732jddnl5ayghsi3"; depends=[biomaRt colortools GenomicRanges ggbio ggplot2 gridExtra Gviz hash IRanges psych rtracklayer S4Vectors trackViewer]; };
+coRNAi = derive { name="coRNAi"; version="1.19.0"; sha256="1vidwyq8rnkbi0pfbh3mk8m3qj8acwqn7q6jm35gahy4y3p0nq7x"; depends=[cellHTS2 gplots lattice limma locfit MASS]; };
+cobindR = derive { name="cobindR"; version="1.7.1"; sha256="0mya51pynfdxfap3paylinqg10fpir7flsz1bng0sk34y15jnxbz"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust rtfbs seqinr yaml]; };
+codelink = derive { name="codelink"; version="1.37.0"; sha256="10s8x9j034j9vl7hv9w8ws4kihmw632b177ckiq0gsy2k63iampk"; depends=[annotate Biobase BiocGenerics limma]; };
+cogena = derive { name="cogena"; version="1.1.2"; sha256="0qjcjh65hbllmqzjnmr4vwgn7scs6lfb7g4pxka4w3r2ca444a0v"; depends=[amap Biobase biwt class cluster corrplot devtools doParallel fastcluster foreach ggplot2 gplots kohonen mclust reshape2]; };
+compEpiTools = derive { name="compEpiTools"; version="1.3.4"; sha256="0y12sn2dh0x2y7nghkh6dm98b4ilg41694shw3m0fcgaz22c30kp"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; };
+compcodeR = derive { name="compcodeR"; version="1.5.3"; sha256="0208sxff40mjizr47zf6yf87irnnjm0gizdk9h5frbizdxl2i9nn"; depends=[caTools edgeR gdata ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS modeest ROCR sm stringr vioplot]; };
+conumee = derive { name="conumee"; version="1.1.0"; sha256="1sxl5m7yfqbzg76n06y1jcv0v75y7wf3ad66zw8v004nz84diaix"; depends=[DNAcopy GenomeInfoDb GenomicRanges IRanges minfi rtracklayer]; };
+convert = derive { name="convert"; version="1.45.0"; sha256="1sg152ma0y0n6vy9f0zas6znmndjp1j0n8vxa6ymw4pkg7li0fxa"; depends=[Biobase limma marray]; };
+copa = derive { name="copa"; version="1.37.0"; sha256="03sr5lcfxw49gnhm7xsdskbz740hirqba743617wcwkbay8nr5lj"; depends=[Biobase]; };
+copynumber = derive { name="copynumber"; version="1.9.0"; sha256="0zgkgyqzkhh9fwmrjcy06vi0g80nvr7193m5qbidgf3sbvkiabhr"; depends=[BiocGenerics GenomicRanges IRanges S4Vectors]; };
+cosmiq = derive { name="cosmiq"; version="1.3.0"; sha256="1868sxwlmaqas3w3nrw4bvxfhs42qsm97gdwksp4fakpm039h757"; depends=[MassSpecWavelet pracma Rcpp xcms]; };
+cpvSNP = derive { name="cpvSNP"; version="1.1.0"; sha256="066y409zfz0bway990ygck5lf0vzl6whh212v4rpis1l9bzfv434"; depends=[BiocParallel corpcor GenomicFeatures ggplot2 GSEABase plyr]; };
+cqn = derive { name="cqn"; version="1.15.1"; sha256="1g1ip7lxs82qq0qbhnx90hxmjiypc76p1sgx7yvj5nmp6wp1m5xy"; depends=[mclust nor1mix preprocessCore quantreg]; };
+crlmm = derive { name="crlmm"; version="1.27.0"; sha256="16i3ijqhwp6c2dshk8r7idrjwga3sm1qcafqz9gl4q6b04s5jvym"; depends=[affyio Biobase BiocGenerics ellipse ff foreach illuminaio lattice matrixStats mvtnorm oligoClasses preprocessCore RcppEigen SNPchip VGAM]; };
+csaw = derive { name="csaw"; version="1.3.7"; sha256="0bislfi25l4m5rviccp8nx5ilw9804h4dfxc928a8mxhc8piqgzx"; depends=[AnnotationDbi edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges limma Rsamtools S4Vectors SummarizedExperiment]; };
+ctc = derive { name="ctc"; version="1.43.0"; sha256="139rxdvyvv3wvlc5q3581y5hkjkd5smxvb606mlxjb8lww4qmcj8"; depends=[amap]; };
+cummeRbund = derive { name="cummeRbund"; version="2.11.1"; sha256="0nd1a9wi2qvvdhfvkb18ql82bfzhz6fivc7wdfv90mibrd7ypb2a"; depends=[Biobase BiocGenerics fastcluster ggplot2 Gviz plyr reshape2 RSQLite rtracklayer]; };
+customProDB = derive { name="customProDB"; version="1.9.4"; sha256="0ws620i6s9p477zfns0m6qpzzhrsivjziv2gv3gmy19dhfh0ln08"; depends=[AnnotationDbi biomaRt Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr RCurl Rsamtools RSQLite rtracklayer stringr VariantAnnotation]; };
+cycle = derive { name="cycle"; version="1.23.0"; sha256="1fpn41xgnvn77m2bga3j70hh61ar0mns919ib21ap763j8lkbm19"; depends=[Biobase Mfuzz]; };
+cytofkit = derive { name="cytofkit"; version="1.1.1"; sha256="0kzy6ylijyypsii5vl77r0wl2s2rhnvj98qbiy96ziijfjmjmfcc"; depends=[Biobase e1071 flowCore ggplot2 gplots reshape Rtsne vegan]; };
+daMA = derive { name="daMA"; version="1.41.0"; sha256="0jfp6kxzys0w8vv8fr5shki79rimiagylvkz5avg2idvzgs2q1w8"; depends=[MASS]; };
+dagLogo = derive { name="dagLogo"; version="1.7.1"; sha256="1mqxhdwiaq9szg5krhxndr1wgl77cgxxxq271a5n53srkbfh77s4"; depends=[biomaRt Biostrings grImport motifStack pheatmap]; };
+ddCt = derive { name="ddCt"; version="1.24.1"; sha256="0am65cwrhy0xijxfg1709rwvdjammdfz4y2g7cyd83d7chfaznxa"; depends=[Biobase BiocGenerics lattice RColorBrewer xtable]; };
+ddgraph = derive { name="ddgraph"; version="1.13.0"; sha256="1krdxmcjrhbw5gdrg68m41m1mhb5q0ijmqhxbvvxzqm3wyh8v2g1"; depends=[bnlearn graph gtools MASS pcalg plotrix RColorBrewer Rcpp]; };
+deepSNV = derive { name="deepSNV"; version="1.15.3"; sha256="1sg4swpna7h4lmpzmqg1x4lqmyx1xq0fckz43gpvpk5s8li6j62h"; depends=[Biostrings GenomicRanges IRanges Rhtslib SummarizedExperiment VariantAnnotation VGAM]; };
+deltaGseg = derive { name="deltaGseg"; version="1.9.0"; sha256="0y8fw4gxmhsr5xrbg1k0s8207mhj6dmlbbmny2dn66c1qlg2bh24"; depends=[changepoint fBasics ggplot2 pvclust reshape scales tseries wavethresh]; };
+derfinder = derive { name="derfinder"; version="1.3.2"; sha256="11syvmgfw7sdl9p5sl0b0q9kkk37xdqil8qz70l0p9m9j1z385sq"; depends=[AnnotationDbi BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; };
+derfinderHelper = derive { name="derfinderHelper"; version="1.3.0"; sha256="0hgj1adh82w2b1gdw6zh8hxij4n5a0bsild66cpb0i8cny8a3ayj"; depends=[IRanges Matrix S4Vectors]; };
+derfinderPlot = derive { name="derfinderPlot"; version="1.3.2"; sha256="1fhgq1nr4qxv6l1qf1g92gw6c9h47i92ybxcr9m88kqp53y6flj4"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 scales]; };
+dexus = derive { name="dexus"; version="1.9.0"; sha256="1xnjs6gmzkdj1snwakq73bz8ypnxzzxh8ki9wv0ljfbfwv1j7z53"; depends=[BiocGenerics]; };
+diffGeneAnalysis = derive { name="diffGeneAnalysis"; version="1.51.0"; sha256="1k5as63cd87nnigc0yzaxvhskpnbr7l1ym2bqc57zsm3bwh8xxwb"; depends=[minpack_lm]; };
+diffHic = derive { name="diffHic"; version="1.1.7"; sha256="1h6qlvk7bbdfi0lg86kbd4milp3imgkq79w73gf1am4knpplks1g"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges IRanges limma locfit rhdf5 Rsamtools S4Vectors]; };
+diggit = derive { name="diggit"; version="1.1.1"; sha256="0c3zy1d9bzb6asa4clgq738h7dj6md55gclwa244qyx857b58rqv"; depends=[Biobase ks viper]; };
+dks = derive { name="dks"; version="1.15.0"; sha256="1d66jfca6q8ni5vz5zh7fmxwh3y0yvl2p7gal7w55py6wvyssnl3"; depends=[cubature]; };
+domainsignatures = derive { name="domainsignatures"; version="1.29.0"; sha256="1wkypbm5ldwx8y2n16fajf450pwv6zipjdk0176a5rqihaflz80l"; depends=[AnnotationDbi biomaRt prada]; };
+dualKS = derive { name="dualKS"; version="1.29.0"; sha256="1a2wb137x98nmdm8dvnl4msl89mlyvm8f1kqzr6jhdj4wjv2hrg1"; depends=[affy Biobase]; };
+dyebias = derive { name="dyebias"; version="1.27.0"; sha256="095qcnri2g19m363ipdi31xgn20b51mbfv5mgkk21m6fww1npc92"; depends=[Biobase marray]; };
+easyRNASeq = derive { name="easyRNASeq"; version="2.5.2"; sha256="142chhn3p8c22vm9mky2mx32s6d09by99fmrck87nglg0w8l2n9j"; depends=[Biobase BiocGenerics biomaRt Biostrings DESeq edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD Rsamtools S4Vectors ShortRead SummarizedExperiment]; };
+ecolitk = derive { name="ecolitk"; version="1.41.0"; sha256="0jga35q98bidqjlqynq0cack4gwsm3hw34vgns67v37krjs4hn9f"; depends=[Biobase]; };
+edge = derive { name="edge"; version="2.1.0"; sha256="1xxz8qyagrfr92ldaxlgb8dfpm6nx3lyk6fa4dl0m8yvlr6lw2fa"; depends=[Biobase MASS qvalue snm sva]; };
+edgeR = derive { name="edgeR"; version="3.11.2"; sha256="0df181xjga322phjinlffl0j2mg61pq4p8h3sxx3xz100c6xrahr"; depends=[limma]; };
+eiR = derive { name="eiR"; version="1.9.1"; sha256="01wkz9lc6gi1a98q02c6zyzfsnkk52px60xg3lawp2419dvj2ww3"; depends=[BH BiocGenerics ChemmineR DBI digest RCurl RUnit snow snowfall]; };
+eisa = derive { name="eisa"; version="1.21.0"; sha256="03366q5qj4wdfm4d9lwysmgz3bgwc53zynw2cmsj7w3yg6dj63km"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; };
+ensemblVEP = derive { name="ensemblVEP"; version="1.9.2"; sha256="10xjxafm97jnk7dfi0j1ahyd6hp45r5rpfr206fbiipcq3ha2p9h"; depends=[BiocGenerics Biostrings GenomicRanges VariantAnnotation]; };
+ensembldb = derive { name="ensembldb"; version="1.1.3"; sha256="1vp4bb3i5jw8kmxz1784wxwh2i9m344xhssfv5w4i2k9lx2anqrs"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics DBI GenomeInfoDb GenomicFeatures GenomicRanges Rsamtools RSQLite rtracklayer S4Vectors]; };
+epigenomix = derive { name="epigenomix"; version="1.9.1"; sha256="0jr0ly6sd818yhcpqk685y7fb4q8dd80w18qpwpypgf4ysymv36y"; depends=[beadarray Biobase BiocGenerics GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
+epivizr = derive { name="epivizr"; version="1.7.7"; sha256="00hjvpg6vr0kd1nhyr3dfjqyxy8jfgfkv0lainj48w7lr9ld7y9w"; depends=[Biobase GenomeInfoDb GenomicFeatures GenomicRanges httpuv mime OrganismDbi R6 rjson rtracklayer S4Vectors SummarizedExperiment]; };
+erccdashboard = derive { name="erccdashboard"; version="1.3.0"; sha256="06jvrlp0sfnkrcmyach1q0ry4pzyv2frzg4c0swr193vxv4mx14w"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr QuasiSeq qvalue reshape2 ROCR scales stringr]; };
+exomeCopy = derive { name="exomeCopy"; version="1.15.0"; sha256="1047k3whc8pjcrvb10dmykbc3c7ah4fgzsiqxw7asp4ksiqpj5ii"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; };
+exomePeak = derive { name="exomePeak"; version="1.9.0"; sha256="05bdwp8msi9i0hi505pwm4lxa8m0syrws934418sgfhfldlh5sip"; depends=[GenomicFeatures Rsamtools rtracklayer]; };
+explorase = derive { name="explorase"; version="1.33.0"; sha256="0405q21ivvchmb37jksv46kwxgbmyiavznizn39asv6wrsvw62az"; depends=[limma rggobi RGtk2]; };
+fabia = derive { name="fabia"; version="2.15.0"; sha256="1631f6q30cxzaw7vqjacr44hwzrjbvk0sw3v41zagpbqbbr11swx"; depends=[Biobase]; };
+facopy = derive { name="facopy"; version="1.3.0"; sha256="0nm7jds5c4p471qyzv61byl61frwnf71kkvcdrc876168bd6s9y3"; depends=[annotate cgdsr coin data_table DOSE FactoMineR ggplot2 GOstats graphite gridExtra igraph IRanges MASS nnet reshape2 Rgraphviz scales]; };
+factDesign = derive { name="factDesign"; version="1.45.0"; sha256="08d7ma718s8rdbmk00jdbwn9d1g431iaff7hc4ra421drl95yql1"; depends=[Biobase]; };
+farms = derive { name="farms"; version="1.21.0"; sha256="1c0k2ffjqfrhkw0d7h6a6sffh50qvbc7jqd3glgrvbwjnmsys34v"; depends=[affy Biobase MASS]; };
+fastLiquidAssociation = derive { name="fastLiquidAssociation"; version="1.5.0"; sha256="0477z4inv374bv5qs6wr5lcndk0d4if4hf1qbwlvv070sh5001gi"; depends=[Hmisc LiquidAssociation WGCNA]; };
+fastseg = derive { name="fastseg"; version="1.15.0"; sha256="12a308lr292nisf0k0wzk5mxazw4izkcsip5nlh826y2h9b2yc6q"; depends=[Biobase BiocGenerics GenomicRanges IRanges]; };
+fdrame = derive { name="fdrame"; version="1.41.0"; sha256="1zmspa2mm7scv5lx83171hdn48y9vify58jcr6nxw15nj4lqbmsd"; depends=[]; };
+ffpe = derive { name="ffpe"; version="1.13.0"; sha256="0444g47cg6ci1lflmz84vjms0p918iaz65cm6whxx4z3pfjc55ls"; depends=[affy Biobase BiocGenerics lumi methylumi sfsmisc TTR]; };
+flagme = derive { name="flagme"; version="1.25.0"; sha256="0jj8rba2ggimwm709m2c78rpccvp9q8hx83c026pgmrryjv8qbzc"; depends=[CAMERA gplots MASS SparseM xcms]; };
+flipflop = derive { name="flipflop"; version="1.7.2"; sha256="0clwqz14lxg9m4jasjwksvs0afhv9rna2p8h91rgip5d3nhmjsp5"; depends=[GenomicRanges IRanges Matrix]; };
+flowBeads = derive { name="flowBeads"; version="1.7.0"; sha256="1knzfj14hwggvc41bba2chrjnl709bh2wxwv268mw18crc1gs140"; depends=[Biobase flowCore knitr rrcov xtable]; };
+flowBin = derive { name="flowBin"; version="1.5.0"; sha256="1728qzxpssh44ayk5bgjwdwzb98xalzciq7pzlcwg1yqgyxz81xv"; depends=[BiocGenerics class flowCore flowFP limma snow]; };
+flowCHIC = derive { name="flowCHIC"; version="1.3.0"; sha256="1g6kkmcja3am6dawdkmhyz9pl9xqivnp95zqxh8vd3a4la0ysazb"; depends=[EBImage flowCore ggplot2 hexbin vegan]; };
+flowCL = derive { name="flowCL"; version="1.7.0"; sha256="0n7gsvsfvfcn1ysc2kzv564hnn963rg6zwzx70vzp8lzvg55z8db"; depends=[Rgraphviz SPARQL]; };
+flowClean = derive { name="flowClean"; version="1.5.0"; sha256="1ggzsm1zrvg7x0x9jvjiqm5172cm6lvkmzkk5v38pjvhplqgx4hi"; depends=[bit changepoint flowCore sfsmisc]; };
+flowClust = derive { name="flowClust"; version="3.7.01"; sha256="06y8sg5mdjzn3d18m5b3753q2g4s4yxm1v8vb6pkdszq88255w6k"; depends=[Biobase BiocGenerics clue corpcor ellipse flowCore flowViz graph MCMCpack mnormt RBGL]; };
+flowCore = derive { name="flowCore"; version="1.35.5"; sha256="1w9x5ynbfglj620i4ffg3p18q16ig553rfd52j7r0adlx8w1hm9d"; depends=[BH Biobase BiocGenerics corpcor graph Rcpp rrcov]; };
+flowCyBar = derive { name="flowCyBar"; version="1.5.0"; sha256="160vyp9pglsrv23m0118506bikwzi2mm9b1qgsrxjnzls2lqvjfa"; depends=[gplots vegan]; };
+flowDensity = derive { name="flowDensity"; version="1.3.0"; sha256="1z8s1d4qwavi5z8zmvac9yqyd19sma18z1jl129w6sl5964spi86"; depends=[car flowCore GEOmap gplots RFOC]; };
+flowFP = derive { name="flowFP"; version="1.27.0"; sha256="15n57slfn0z4vzqhk38mfqzb22r6krafqyp11hv1xsllp8my2a5g"; depends=[Biobase BiocGenerics flowCore flowViz]; };
+flowFit = derive { name="flowFit"; version="1.7.0"; sha256="079ygak8ysjh44l3gmvlc89x4argw15mlq380j77n19d3wqai8r9"; depends=[flowCore flowViz gplots kza minpack_lm]; };
+flowMap = derive { name="flowMap"; version="1.7.0"; sha256="030dv51xwskrc97kkm72wxbfsq1qj4fy9nknvxaydn3y1r2wakcs"; depends=[abind ade4 doParallel Matrix reshape2 scales]; };
+flowMatch = derive { name="flowMatch"; version="1.5.0"; sha256="1b81aik86m4y8n8khz7kxy2ibky7i06s9jzm4pydh41ypv6h0wv9"; depends=[Biobase flowCore Rcpp]; };
+flowMeans = derive { name="flowMeans"; version="1.23.0"; sha256="0y7dkfz0wjgmyjvsvqcqb9m59xq8bzd8bcp06dd6pgvb33aqlqr4"; depends=[Biobase feature flowCore rrcov]; };
+flowMerge = derive { name="flowMerge"; version="2.17.0"; sha256="1sc7xqp4vkgc84by4vmbj0iy0vsrwadglwxbziigjai0ijsgrvfn"; depends=[feature flowClust flowCore foreach graph Rgraphviz rrcov snow]; };
+flowPeaks = derive { name="flowPeaks"; version="1.11.0"; sha256="0ib9mgfq8lmakw2g0hj0dc75ifllpf5s9yfpkq3p5f6qqa8gncqw"; depends=[]; };
+flowPlots = derive { name="flowPlots"; version="1.17.0"; sha256="1y4g2kjdha6qn79cyb9mxkkj33wd2jndrpnpd1p0x1pvnjlyxhas"; depends=[]; };
+flowQ = derive { name="flowQ"; version="1.29.0"; sha256="1wp5h8bpavcs4plgy12qwm2y8ds8gdkwp5dhkbi4yqy1bl5cl0xj"; depends=[BiocGenerics bioDist flowCore flowViz geneplotter IRanges lattice latticeExtra mvoutlier outliers parody RColorBrewer]; };
+flowQB = derive { name="flowQB"; version="1.13.0"; sha256="19z25lhjdlc1hq6gkqajhi80920zi89yryzwabdazbhb9i5f1ni0"; depends=[Biobase flowCore MASS]; };
+flowStats = derive { name="flowStats"; version="3.27.0"; sha256="0vw3a426wa684fr8g2jh8c64dyfya0z5azz1ncfd7xszknyc51si"; depends=[Biobase BiocGenerics cluster fda flowCore flowViz flowWorkspace KernSmooth ks lattice MASS mvoutlier]; };
+flowTrans = derive { name="flowTrans"; version="1.21.1"; sha256="0c45blakwi4x0mr40ss5m3gh9bf0cvy9lwid274swd4qwydqyy1l"; depends=[flowClust flowCore flowViz]; };
+flowType = derive { name="flowType"; version="2.7.0"; sha256="0zrwf7h62jd5xgs0kqv34mh8q2knaiaj2adrd53i56jb514yfnb9"; depends=[BH Biobase flowClust flowCore flowMeans flowMerge Rcpp rrcov sfsmisc]; };
+flowUtils = derive { name="flowUtils"; version="1.33.0"; sha256="0r7l8fbi3p1y7ql60czlqhxx4l0fzxv50phwkr5w85jxxldk2pjm"; depends=[Biobase corpcor flowCore flowViz graph RUnit XML]; };
+flowVS = derive { name="flowVS"; version="1.1.0"; sha256="0g1zmcr1wd3xccx2z1akwk177innzrngmxc5r4hjanl37l0skrpq"; depends=[flowCore flowStats flowViz]; };
+flowViz = derive { name="flowViz"; version="1.33.2"; sha256="11qbpf0yw1gjzgw3pb7mnqfvwd60nms4cwrwag8h36a5whfd158c"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; };
+flowWorkspace = derive { name="flowWorkspace"; version="3.15.6"; sha256="111a5kvcz3hyw7269fg6b0885g63f8r02dkzfidfcq2pg4n2sa8w"; depends=[BH Biobase BiocGenerics data_table flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow plyr RBGL RColorBrewer Rcpp Rgraphviz stringr XML]; };
+flowcatchR = derive { name="flowcatchR"; version="1.3.0"; sha256="0zgbnfh3sq6s8y81al379lrif67w5xffc6n3fd5y8bp2wmdqmx8b"; depends=[abind BiocParallel colorRamps EBImage rgl]; };
+fmcsR = derive { name="fmcsR"; version="1.11.4"; sha256="1ah1gyrhcyv4kqxi4n8yj14mgjh6v9l820k5hzb7fwbw74kh2pa5"; depends=[BiocGenerics ChemmineR RUnit]; };
+focalCall = derive { name="focalCall"; version="1.3.0"; sha256="1g3vk72xnzy2vsjjq7dnmmxiy29qg2bqij1iim9psb2zd6w387r5"; depends=[CGHcall]; };
+frma = derive { name="frma"; version="1.21.0"; sha256="0glsdwzlfba9j850s393jm6ada4j04nz4lilym81qvs9y9jccscp"; depends=[affy Biobase BiocGenerics DBI MASS oligo oligoClasses preprocessCore]; };
+frmaTools = derive { name="frmaTools"; version="1.21.0"; sha256="1k5ghz0ddcypisw2l64cg3r9lhvvmdiv1gpbb9b56rw0sk27w0cr"; depends=[affy Biobase DBI preprocessCore]; };
+gCMAP = derive { name="gCMAP"; version="1.13.0"; sha256="06qb51rxxjqanh92g0cj6kwnrcbgkc2f0slav2bxkh2rkrjpyvcn"; depends=[annotate AnnotationDbi Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; };
+gCMAPWeb = derive { name="gCMAPWeb"; version="1.9.0"; sha256="0xn1iyvrw3idhwszvipf3y69i1w1azr5hhgklg57v9wibnq02q9g"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; };
+gQTLBase = derive { name="gQTLBase"; version="1.1.1"; sha256="033lfnn0zkkkzay25fkj7wizyd63jxr2nkgga22iwm8ffjgpyac0"; depends=[BatchJobs BBmisc BiocGenerics doParallel ff ffbase foreach GenomicRanges S4Vectors]; };
+gQTLstats = derive { name="gQTLstats"; version="1.1.0"; sha256="1hc2lwvq5bzxjl7xap8ykr7ja9jxpp6ydalc582v2jz6r8yp0wx8"; depends=[AnnotationDbi BatchJobs Biobase BiocGenerics doParallel dplyr foreach gam GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gQTLBase IRanges limma reshape2 S4Vectors snpStats VariantAnnotation]; };
+gaga = derive { name="gaga"; version="2.15.1"; sha256="17ccfnvrqq6p9dynlacxw4797n1h9773ilmsh53mzs52w1k2cybm"; depends=[Biobase coda EBarrays mgcv]; };
+gage = derive { name="gage"; version="2.19.0"; sha256="1g8i3w715s10azw7xyzq6gjmz5ilxll4qcf367jn6dwz8xnf15dr"; depends=[AnnotationDbi graph KEGGREST]; };
+gaggle = derive { name="gaggle"; version="1.37.0"; sha256="1429xffj08m3dgfp6z34ngwzaq0wyjm3wv3cwfxzl5pzzy200k41"; depends=[graph rJava RUnit]; };
+gaia = derive { name="gaia"; version="2.13.0"; sha256="10vpz16plzi651aj1f5h3iwz6nzrrdnl9sgx3sgv5wmks2haqij4"; depends=[]; };
+gaucho = derive { name="gaucho"; version="1.5.0"; sha256="0kl8fw1n6dkqmrjp0xri3w2fhx25llrjag7j50m2xh371zfw9chc"; depends=[GA graph heatmap_plus png Rgraphviz]; };
+gcrma = derive { name="gcrma"; version="2.41.0"; sha256="03ncgd26hmj4l0mnnif1cf5qg99ir66d0mafx7wamrr930m17v8x"; depends=[affy affyio Biobase BiocInstaller Biostrings XVector]; };
+gdsfmt = derive { name="gdsfmt"; version="1.5.1"; sha256="04pp9lw0548243k6almy4ckwv7sd805b7kkp87dq3z087h7287s7"; depends=[]; };
+geNetClassifier = derive { name="geNetClassifier"; version="1.9.2"; sha256="04k1j2hqbs75k250i8b17bb8b84mij0hyb3yk1jl1368mpn5vmhc"; depends=[Biobase e1071 EBarrays minet]; };
+geecc = derive { name="geecc"; version="1.3.0"; sha256="0s955yg31papyny42nnqq711hawk5nn3dqgsf24ldz93vjiif9dr"; depends=[gplots hypergea MASS]; };
+genArise = derive { name="genArise"; version="1.45.0"; sha256="07xyy6wa22sa0ziqvy1dvpmpq11j56aw70kvj834da003yvabmg1"; depends=[locfit tkrplot xtable]; };
+geneRecommender = derive { name="geneRecommender"; version="1.41.0"; sha256="0c06xg7jbcn4lnrkwgwwdjq383a7d34svf9cdqlaz5fc662nl5v0"; depends=[Biobase]; };
+geneRxCluster = derive { name="geneRxCluster"; version="1.5.0"; sha256="1m5jxv0qhm68iv6rwy91nkx2mz9b7zh9mdz98gva8mb6gm88iiig"; depends=[GenomicRanges IRanges]; };
+genefilter = derive { name="genefilter"; version="1.51.0"; sha256="0zrav2zw7v67i564v20y02cn2ycyk9ms8cnj2b2l7ajd1lq5cp9s"; depends=[annotate AnnotationDbi Biobase survival]; };
+genefu = derive { name="genefu"; version="1.19.0"; sha256="05rzq0dy4v7z57zqdg9v2csj3ncv2n76igbz2a9nvjpmqrgfcqlc"; depends=[amap biomaRt mclust survcomp]; };
+geneplotter = derive { name="geneplotter"; version="1.47.0"; sha256="03vl60rhhfh8imp0ihx83gq9r64gdnh2gjdm7pzi4yc03afqgaw8"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; };
+genoCN = derive { name="genoCN"; version="1.21.0"; sha256="10q16kch3gn6phx1zk3aii87f4liy5l6mp0kvjf29x6aam11l7c7"; depends=[]; };
+genomation = derive { name="genomation"; version="1.1.4"; sha256="1217xm5rqngag4r2r95z7wxwmdlassghwkxqpljqnangix4c0h96"; depends=[GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges plyr readr reshape2 Rsamtools rtracklayer]; };
+genomeIntervals = derive { name="genomeIntervals"; version="1.25.0"; sha256="1dy71hdqw02kv5rqa80w4bfbn247hj6fqqsc12qimk3l60z38rpr"; depends=[BiocGenerics intervals]; };
+genomes = derive { name="genomes"; version="2.15.0"; sha256="1a172fz97b6xg4w91dcjbdr9kx0grzf71qn2j7zlyz52dcqppybb"; depends=[Biostrings GenomicRanges IRanges RCurl XML]; };
+genoset = derive { name="genoset"; version="1.23.2"; sha256="0j23ym7v47fv2f2j25hfc4xh1113614ixdd1accx9gindbqf72cl"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
+gespeR = derive { name="gespeR"; version="1.1.0"; sha256="0hp2pw4z5kgj4av339v7r43is082c47ms422pwwa5f2pljijz2z6"; depends=[Biobase biomaRt cellHTS2 doParallel foreach ggplot2 glmnet Matrix reshape2]; };
+ggbio = derive { name="ggbio"; version="1.17.1"; sha256="1pc98v500l476sa1krxrj24lfsnbs13ws9hdix3vxfkbklvqjww7"; 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 = derive { name="ggtree"; version="1.1.8"; sha256="1y9h93wn0zmmaz4hdn2xgz226y8pak0lnix5wvv1xax7myzhkbyl"; depends=[ape Biostrings colorspace EBImage ggplot2 gridExtra jsonlite magrittr reshape2]; };
+girafe = derive { name="girafe"; version="1.21.0"; sha256="11j9aiy6s5cdhwc9591vv344qnwlgn4hvwlp2rx47gccrnxxaqxi"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; };
+globaltest = derive { name="globaltest"; version="5.23.0"; sha256="1cwgqq5i3v6pp5kp4qi0jxqfh09zgaj719mk4kci3wxb18dc6ql7"; depends=[annotate AnnotationDbi Biobase multtest survival]; };
+gmapR = derive { name="gmapR"; version="1.11.0"; sha256="0vn5iz44gcp4k0y5y4pjw6m60w75k82kv25hmnjshh8cpcwqkxkp"; depends=[Biobase BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
+goProfiles = derive { name="goProfiles"; version="1.31.0"; sha256="0nnc5idd3p969nhcsw2bjv7ws1qlb30sywhvpy8kcvk64wzz4jgw"; depends=[AnnotationDbi Biobase]; };
+goTools = derive { name="goTools"; version="1.43.0"; sha256="104xj0q1151ch0b4sswnky6shscx6fps25ycmig1s1ingd8dqnby"; depends=[AnnotationDbi]; };
+goseq = derive { name="goseq"; version="1.21.1"; sha256="175xg4qyy2iq9vmxsvd120qb9s3xn51ibsrvc1a3lrnrlii992fk"; depends=[AnnotationDbi BiasedUrn BiocGenerics mgcv]; };
+gpls = derive { name="gpls"; version="1.41.0"; sha256="050db8ag8wpngfkw686r9vjvdgbpz0slrdnmkb0vcm5ijzm172b2"; depends=[]; };
+gprege = derive { name="gprege"; version="1.13.0"; sha256="0z27521mjn5ipjq8wi3fbh2qw4k1q694l8268f8lypr9f357i1q4"; depends=[gptk]; };
+graph = derive { name="graph"; version="1.47.2"; sha256="0db15kd5qf993qdbr7dl2wbw6bgyg3kiqvd1iziqdq6d2vvbpzbj"; depends=[BiocGenerics]; };
+graphite = derive { name="graphite"; version="1.15.0"; sha256="1nzyrc3cwy35m7ijr5pjanvw868yw2d7sl9h3ns8w70af8ih6z14"; depends=[AnnotationDbi BiocGenerics graph]; };
+groHMM = derive { name="groHMM"; version="1.3.0"; sha256="0kx574xs0k51wwkvm6rbrrgr76ziwkkyqhiy076yzfsfkm3d1jvf"; depends=[GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; };
+gtrellis = derive { name="gtrellis"; version="1.1.0"; sha256="0cr4p22h0xh18pbr1jnz9dr6nv1q5a2bnx4nq5pz9jnn70lg7384"; depends=[circlize GetoptLong]; };
+gwascat = derive { name="gwascat"; version="2.1.3"; sha256="0wjl53zfrn6adwlfrqxj3nqndg753pi03dsm7xxjv7x2rkx1z1k8"; depends=[AnnotationHub BiocGenerics Biostrings GenomeInfoDb GenomicRanges gQTLstats Gviz IRanges Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; };
+h5vc = derive { name="h5vc"; version="2.3.0"; sha256="1cl00k13x03sm60gfkxmaf6ba9kw4186cnik08zn446fipxqypla"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges reshape rhdf5 Rsamtools S4Vectors]; };
+hapFabia = derive { name="hapFabia"; version="1.11.0"; sha256="1jbj1bxqmvldpbbyq6d854srvzsr14jva1711zn4387b407knz7w"; depends=[Biobase fabia]; };
+hiAnnotator = derive { name="hiAnnotator"; version="1.3.2"; sha256="104d6wp331dvsdk5p9l7m70xr9jrwx0nzlrapi95c0p1nr3wr7bl"; depends=[BSgenome dplyr foreach GenomicRanges ggplot2 iterators rtracklayer scales]; };
+hiReadsProcessor = derive { name="hiReadsProcessor"; version="1.3.0"; sha256="16gcjaiw8j82y5wzcbhh3yjym8xi4dqsf30i64ah6rb30i3bk716"; depends=[BiocGenerics BiocParallel Biostrings GenomicAlignments GenomicRanges hiAnnotator plyr rSFFreader sonicLength xlsx]; };
+hierGWAS = derive { name="hierGWAS"; version="0.99.2"; sha256="1i3ykpslp79y1v156bja971z3g3v1yb7bb2w26gv1p1kd8f57s6d"; depends=[fastcluster fmsb glmnet hlr]; };
+hopach = derive { name="hopach"; version="2.29.0"; sha256="08hfq74s3a4q94awhw6fiwlfnnv3rhkfpz56jbcyp6bi6y1rrp9d"; depends=[Biobase BiocGenerics cluster]; };
+hpar = derive { name="hpar"; version="1.11.0"; sha256="025hdmb70h2zf4g06spfdm09ni3i4qc21c2hp0mjdp3b2y2f9g9r"; depends=[]; };
+htSeqTools = derive { name="htSeqTools"; version="1.15.1"; sha256="0pv6csw7bgknjm0q42hrf3x22bx3xs0xm9hq9i46plwglq6c8kvn"; depends=[Biobase BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges MASS]; };
+hyperdraw = derive { name="hyperdraw"; version="1.21.0"; sha256="0w1rcaw5fysj257c8ybcvmrdayvkcmfl670ysg2wcp8nrgv6z7vg"; depends=[graph hypergraph Rgraphviz]; };
+hypergraph = derive { name="hypergraph"; version="1.41.0"; sha256="06fvmda8x81bv5bn21pmvpfx9ni01l23q1ph9rh3qj803mwa0d72"; depends=[graph]; };
+iASeq = derive { name="iASeq"; version="1.13.0"; sha256="0d9ciilyc0aps3mnhdwvy69lv1m0fmv4gjdwr6rpdc7xsrrap35y"; depends=[]; };
+iBBiG = derive { name="iBBiG"; version="1.13.0"; sha256="09g9inaxmc94vfjv247c5ni591lnapmch5dq9s2havfdyss56n69"; depends=[ade4 biclust xtable]; };
+iBMQ = derive { name="iBMQ"; version="1.9.0"; sha256="08snz38d1jig0n989bwyvcayb83xyfb1cp927zvmxrnsyi7piqda"; depends=[Biobase ggplot2]; };
+iChip = derive { name="iChip"; version="1.23.0"; sha256="081s08v7n8l80r5dlfxdwibw5gsr7rjm6hgc0r5fhzpw7kb5svir"; depends=[limma]; };
+iClusterPlus = derive { name="iClusterPlus"; version="1.5.0"; sha256="0r0pbp9kn9rsv3hj7fai55cgfwa31rlg8zd7x8311ajg2q3kxwfd"; depends=[]; };
+iPAC = derive { name="iPAC"; version="1.13.0"; sha256="02cawn395mymgxmhrcff9q57dwb8xrwba7z8dg6jzda3kbixzc1x"; depends=[Biostrings gdata multtest scatterplot3d]; };
+iSeq = derive { name="iSeq"; version="1.21.0"; sha256="0jp1p56wqdyiamd5jqiqz0sdc5snp1cds48x7449m4lsaqzmc3l4"; depends=[]; };
+ibh = derive { name="ibh"; version="1.17.0"; sha256="1rcnmsg4iynsk9cfx6bwym9akhxapqkq31cgj6a9rb00l5g75fx3"; depends=[]; };
+idiogram = derive { name="idiogram"; version="1.45.0"; sha256="1kpviyzmfkqkrdy8gchdr0zlxzrg3qv8sg6r0b3qk27gii2bsprf"; depends=[annotate Biobase plotrix]; };
+illuminaio = derive { name="illuminaio"; version="0.11.1"; sha256="1d0jb5wisllhcdaj6f19nxswl4lccmjhnrwycckd22qjdw29kdpl"; depends=[base64]; };
+imageHTS = derive { name="imageHTS"; version="1.19.0"; sha256="1paw8ym90lj42kc1bbmbyaz77kq9gzrhij43p5mg0ra6jl1f53v4"; depends=[Biobase cellHTS2 e1071 EBImage hwriter vsn]; };
+immunoClust = derive { name="immunoClust"; version="1.1.0"; sha256="11dykszddx9qm3fvpj7q96vjh46ndn695cvls7p5grlci9i4443l"; depends=[flowCore lattice]; };
+impute = derive { name="impute"; version="1.43.0"; sha256="1wp02zd2vgpkalz830kah5135amrhv0gj6nqr3hs34yw3nnzcvxa"; depends=[]; };
+inSilicoDb = derive { name="inSilicoDb"; version="2.5.0"; sha256="1w5irx042z8if0pnvw9ra4a0hm0m1nbc2s9l2j59ww9l2qhj8hiq"; depends=[Biobase RCurl rjson]; };
+inSilicoMerging = derive { name="inSilicoMerging"; version="1.13.0"; sha256="0zaqwachxn3anbjyn0akv0n2djg08475cdxz7c44ja635r1f6y1j"; depends=[Biobase]; };
+intansv = derive { name="intansv"; version="1.9.0"; sha256="0vb5hls1yyw0x0ff2xcjmxplg0gar9g9xvs1bqw96bf9akcr12r9"; depends=[BiocGenerics GenomicRanges ggbio IRanges plyr]; };
+interactiveDisplay = derive { name="interactiveDisplay"; version="1.7.1"; sha256="0xqghsy7s7m2xkngsqjzxrfvs7jy2bqprvx4qm2a8d24q392abs0"; depends=[AnnotationDbi BiocGenerics Category ggplot2 gridSVG interactiveDisplayBase plyr RColorBrewer reshape2 shiny XML]; };
+interactiveDisplayBase = derive { name="interactiveDisplayBase"; version="1.7.0"; sha256="0032ljfx6pj0c11imfhxsxvrcn3gwyb6j29xl8xv48x8z44r0vas"; depends=[BiocGenerics shiny]; };
+inveRsion = derive { name="inveRsion"; version="1.17.0"; sha256="1km1h75dh5q505x1ddlhvyqxy4c10wvlviiz2l8sv3g3m9mbd26h"; depends=[haplo_stats]; };
+iontree = derive { name="iontree"; version="1.15.0"; sha256="0frq4f357n5w08nwz3m7s0hv858kgcnlvxb4907yrg1b11zpfvmm"; depends=[rJava RSQLite XML]; };
+isobar = derive { name="isobar"; version="1.15.0"; sha256="0zkj2i1hhs9nwflnwidzpnqcs08vbv3vqwz244shs9i7h0c5fd16"; depends=[Biobase distr plyr]; };
+iterativeBMA = derive { name="iterativeBMA"; version="1.27.0"; sha256="18g04l2bksjc2563kd2fmjygpci6pdw9lxv4ax0kpbfvc7zwbz17"; depends=[Biobase BMA leaps]; };
+iterativeBMAsurv = derive { name="iterativeBMAsurv"; version="1.27.0"; sha256="1l36lmxlwq16kzh8i8nbi8bbrgqc7im1b5pcc170q89x6rfgvyf7"; depends=[BMA leaps survival]; };
+jmosaics = derive { name="jmosaics"; version="1.9.0"; sha256="00c84fh5798yyzmsy985b79fcf2yz8y8am13dj7xgnzxl5nj32v1"; depends=[mosaics]; };
+joda = derive { name="joda"; version="1.17.0"; sha256="0y3z4shl1vmx19wwp6msz5igjgmy5rkygj7ikpjjcksrjdwqskrz"; depends=[bgmm RBGL]; };
+kebabs = derive { name="kebabs"; version="1.3.3"; sha256="10pnr5fd2ni4w69qp30q81d1rbyy0844sx1fskmv15d5ld2w5wkq"; depends=[Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; };
+keggorthology = derive { name="keggorthology"; version="2.21.0"; sha256="1d3dz61llgmdnyqxqwv03pacfs97lzynzpjpmn7grf7bbpybjk2q"; depends=[AnnotationDbi DBI graph]; };
+lapmix = derive { name="lapmix"; version="1.35.0"; sha256="1sps41l210h782bry6n8h55ghnlqn7s5dx0bx2805y5izz01linm"; depends=[Biobase]; };
+les = derive { name="les"; version="1.19.0"; sha256="1b3zcvflwyybrh9pf33a0fn5qz6918sszjf0n666iqd3hh7zph8z"; depends=[boot fdrtool gplots RColorBrewer]; };
+limma = derive { name="limma"; version="3.25.9"; sha256="19kzyja25bchvcnbl8g2xfzi1rypja44312g94qssiyanlw1i2bp"; depends=[]; };
+limmaGUI = derive { name="limmaGUI"; version="1.45.0"; sha256="05pqzb5nq3paddq2zw80gvdaf8rvynga8zs24rwzjpz3ylakqngr"; depends=[AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
+lmdme = derive { name="lmdme"; version="1.11.0"; sha256="0j41rfvbhz31vniax7njnslxd94lws4jjfv3hc2s1ihxnj41dcma"; depends=[limma pls]; };
+logicFS = derive { name="logicFS"; version="1.39.0"; sha256="1sz4bxsg76437j42i6cpbqvj5a35q7dwhya4yh1gmknqjrrcrv56"; depends=[LogicReg mcbiopi]; };
+logitT = derive { name="logitT"; version="1.27.0"; sha256="13gglwkvwrc5xr44ynz10qzyksry0wamk9mjlsfb18c2ncbnyypq"; depends=[affy]; };
+lol = derive { name="lol"; version="1.17.1"; sha256="0adj2bg8akb3z0w3wqj6bdlypf9c587k5c2npx0l21hgy4qv7p8k"; depends=[Matrix penalized]; };
+lpNet = derive { name="lpNet"; version="2.1.1"; sha256="15v3mpxrm1qq3hnwwnahziafpy83b35i69qyggdvzszwg1cpn5vi"; depends=[lpSolve nem]; };
+lumi = derive { name="lumi"; version="2.21.1"; sha256="16cg8zsfvw4fc51zr27ymp7a0qc59y0cvp2j7bsfw6ip0avmgkgk"; depends=[affy annotate AnnotationDbi Biobase DBI GenomicFeatures GenomicRanges KernSmooth lattice MASS methylumi mgcv nleqslv preprocessCore RSQLite]; };
+mAPKL = derive { name="mAPKL"; version="1.1.0"; sha256="1knjvwd0z4i70py0dqcngz56j78ylhcxsw8dyxj80ns5jzsdppbx"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene]; };
+mBPCR = derive { name="mBPCR"; version="1.23.0"; sha256="0c0idj213l8gwxkh9sb03dr4jhlbwvkpghldccbjrqnk4jqs4zpp"; depends=[Biobase oligoClasses SNPchip]; };
+mQTL_NMR = derive { name="mQTL.NMR"; version="1.3.0"; sha256="05q3p6pxi5x89z3zyrvdv5p2lzwr3as3zwcg8k0zm70liyczqcbx"; depends=[GenABEL MASS outliers qtl]; };
+maCorrPlot = derive { name="maCorrPlot"; version="1.39.0"; sha256="14p6cliik2ar0x8q4x66p43lsdbz11sqa7szafqvk7aw3pbszgh4"; depends=[lattice]; };
+maPredictDSC = derive { name="maPredictDSC"; version="1.7.0"; sha256="0mfip8h5brd2ri4cnbcsdc7h7m94qq3afl2amvz8l3gj38y21gvk"; depends=[affy AnnotationDbi caret class e1071 gcrma limma MASS ROC ROCR]; };
+maSigPro = derive { name="maSigPro"; version="1.41.0"; sha256="1m8dzdas2063wvxi0apn1g4mbh365wpi29wx4acs3frxvhw9ll3g"; depends=[Biobase limma MASS Mfuzz]; };
+maanova = derive { name="maanova"; version="1.39.0"; sha256="1m3ikf3r99q0zq3lrkq88vhs8k9z2y39rsv0w7yq4gimj42fxfb6"; depends=[Biobase]; };
+macat = derive { name="macat"; version="1.43.0"; sha256="1h4yi0a5mpikqq30rc90xprfjvhjlc6f9yjzlw8iynv4kgxajymk"; depends=[annotate Biobase]; };
+made4 = derive { name="made4"; version="1.43.0"; sha256="0jh90rhwp1qdiz5jfkp87xdxbzkb1r10rphjikr025vf5zk9ipfv"; depends=[ade4 gplots RColorBrewer scatterplot3d]; };
+maigesPack = derive { name="maigesPack"; version="1.33.0"; sha256="1sig032263lapric0hh6bmimjbq4hbarzdqp6k2pzhsc92dyybrl"; depends=[convert graph limma marray]; };
+makecdfenv = derive { name="makecdfenv"; version="1.45.0"; sha256="0ybyimcd7hkb2dy9cihy28h53ybijn5bdrlibwmxwbb8wxbqczag"; depends=[affy affyio Biobase zlibbioc]; };
+manta = derive { name="manta"; version="1.15.0"; sha256="0yf85qzvs2ngqiw98pmc3c6zdjphimjnkmd64bnv05aclpkadz7b"; depends=[caroline edgeR Hmisc]; };
+marray = derive { name="marray"; version="1.47.0"; sha256="0m2lkags00851xf3h48h0bj44ndfc91a2wq3z0ywnz7wzfisv9cc"; depends=[limma]; };
+maskBAD = derive { name="maskBAD"; version="1.13.0"; sha256="1j187m0qbri49a148m8nnsqfpngzy3l3r9r01wnp0jfc7nfbq5dl"; depends=[affy gcrma]; };
+massiR = derive { name="massiR"; version="1.5.0"; sha256="19snv6w1xvysd9090lmnk6f7vkfgr3q0aqxfp50fp4hgfamvfm7r"; depends=[Biobase cluster diptest gplots]; };
+matchBox = derive { name="matchBox"; version="1.11.0"; sha256="1wnn14l0qfxklz2ljqczq7n22926333d8l68jy90ak33wcfqmh5n"; depends=[]; };
+mcaGUI = derive { name="mcaGUI"; version="1.17.0"; sha256="12xll5kpbwm3wcf047w6kaja6c0ghh6zzfblhmc7ixf43f5f8i53"; depends=[bpca foreign gWidgets gWidgetsRGtk2 lattice MASS OTUbase proto vegan]; };
+mdgsa = derive { name="mdgsa"; version="1.1.0"; sha256="118b6h62i7yp26w1xqb4qdqrpwwkgp628g600hhzdb7w0prdk37a"; depends=[AnnotationDbi cluster DBI Matrix]; };
+mdqc = derive { name="mdqc"; version="1.31.0"; sha256="1zqxbhf29bdd12g019y8nimgzbzghkmaj7iz6q2x97rbjd7kl90l"; depends=[cluster MASS]; };
+meshr = derive { name="meshr"; version="1.5.1"; sha256="0z90bxqn5l0a9xgcdx784539xf8arni1ahj02k4j9k44pckl8sl5"; depends=[BiocGenerics Category cummeRbund fdrtool MeSHDbi S4Vectors]; };
+messina = derive { name="messina"; version="1.5.0"; sha256="0hhhzw4nafsdjsl7m786315449yqppvfs82fgfw4mxav2dp5h7n2"; depends=[foreach ggplot2 plyr Rcpp survival]; };
+metaArray = derive { name="metaArray"; version="1.47.0"; sha256="11vl7lzdsgcg28940lngchlvdi64cyjm0qc42h85dbkk4p55mbpx"; depends=[Biobase MergeMaid]; };
+metaMS = derive { name="metaMS"; version="1.5.0"; sha256="1nd4b525yyya6xxfa373924z34qmz28nai14h5ww7kkczpjzig1s"; depends=[BiocGenerics CAMERA Matrix robustbase xcms]; };
+metaSeq = derive { name="metaSeq"; version="1.9.0"; sha256="1z8i4c5fxdwvja77jvziq0djkdsis56b5491i579yb6ydcc0pc6b"; depends=[NOISeq Rcpp snow]; };
+metabomxtr = derive { name="metabomxtr"; version="1.3.2"; sha256="0wbpb79k9026ql0csgvmxf0sxy7iws6lm21k7vhg8vaizk84f4d1"; depends=[Biobase Formula multtest optimx plyr]; };
+metagene = derive { name="metagene"; version="2.1.0"; sha256="0fk7cgf96g1ax009g6f45jppb0w80akv5n3iwaaryy5b9pvsfk21"; depends=[BiocParallel biomaRt GenomicAlignments GenomicRanges ggplot2 gplots muStat R6 Rsamtools rtracklayer]; };
+metagenomeSeq = derive { name="metagenomeSeq"; version="1.11.10"; sha256="0b9vylijb6gzri61qn8wkj9si1zrgznzqhxzib1aw9y71v8y8k05"; depends=[Biobase foreach glmnet gplots limma Matrix matrixStats RColorBrewer]; };
+metahdep = derive { name="metahdep"; version="1.27.0"; sha256="0kjd27brcvhfqbqk9r3fclbzf2np2zj88gi522y1c6vh3pc6fd22"; depends=[]; };
+metaseqR = derive { name="metaseqR"; version="1.9.0"; sha256="0p8bpnjm73jkng2xrypnz14rmrw1pppkrx1r88vnx33hzpkx83zx"; depends=[baySeq biomaRt brew corrplot DESeq EDASeq edgeR gplots limma log4r NBPSeq NOISeq qvalue rjson vsn]; };
+methVisual = derive { name="methVisual"; version="1.21.0"; sha256="18kin1ibcc4ilfh59qgb0zilhvhvs0a1gmbg0lbvj2r0kbsk1ryy"; depends=[Biostrings ca gridBase gsubfn IRanges plotrix sqldf]; };
+methyAnalysis = derive { name="methyAnalysis"; version="1.11.0"; sha256="0ka0svxvb76j0xkdx4pbwf2cyplihh45mb953csrapyh5r6hxwkn"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt genefilter GenomeInfoDb GenomicFeatures GenomicRanges genoset Gviz IRanges lumi methylumi rtracklayer S4Vectors VariantAnnotation]; };
+methylMnM = derive { name="methylMnM"; version="1.7.0"; sha256="08y13kkmafn2h55wwkgs1mpskb4i2wpxzzgjdr9gb3ns06qc9799"; depends=[edgeR statmod]; };
+methylPipe = derive { name="methylPipe"; version="1.3.3"; sha256="1skds6ac2s2grb3s5ay0b6j91qmpag8cmqqh0plnqjvh5zdsi733"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; };
+methylumi = derive { name="methylumi"; version="2.15.1"; sha256="02bgqja3zzd3ps8a2r6k9whdvnzi4h44vjmrjgqljmmr40pspqqw"; depends=[annotate AnnotationDbi Biobase BiocGenerics genefilter GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; };
+mgsa = derive { name="mgsa"; version="1.17.0"; sha256="1nic4bgk3g3j2l6vr3i3msmid2bz0n7bq8f8zq26n45sr37wb4wq"; depends=[gplots]; };
+miRNApath = derive { name="miRNApath"; version="1.29.0"; sha256="07r37gzn0y5cp4awj2i638i2cn019rnp7b4hnaqi3gc71sdzb25c"; depends=[]; };
+miRNAtap = derive { name="miRNAtap"; version="1.3.0"; sha256="0hmnhbbai04wp8hxrpgq04czfx2c49aihq7iiz86x9hzlj6xhgn6"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; };
+microRNA = derive { name="microRNA"; version="1.27.0"; sha256="1akq1yxc03v7jmpypmr8a9lx5h2nfdjp1y0433lyffbd49wia2gm"; depends=[Biostrings]; };
+minet = derive { name="minet"; version="3.27.0"; sha256="1wnn3nlpa0ymk465ax2s65i3w9xplhwssvng9qs7p3v2z72p9nqp"; depends=[infotheo]; };
+minfi = derive { name="minfi"; version="1.15.7"; sha256="09v8flkn0ja1q9glzfa5bsaflvx7w240w38fp59dgknz4xr1zp3r"; 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 = derive { name="mirIntegrator"; version="0.99.5"; sha256="0r8l1lgf9rdxnr0dvc8r05ahjf3q0r4syy9mzx4p3f04s0c78q3h"; depends=[AnnotationDbi ggplot2 graph Rgraphviz ROntoTools]; };
+missMethyl = derive { name="missMethyl"; version="1.3.1"; sha256="07l7jnw5ixlhhphrxhalkh50swc8jr4pfkgvzf33hiid4g9jkqsk"; depends=[limma methylumi minfi ruv statmod stringr]; };
+mitoODE = derive { name="mitoODE"; version="1.7.0"; sha256="182ifqh1g1yz8rbsxdqgk4hzlz3dwy0d03iklbg39cxy6qhgxqg4"; depends=[KernSmooth MASS minpack_lm]; };
+mmnet = derive { name="mmnet"; version="1.7.0"; sha256="0za8a3j2fzyi15hd7l3ccw5qy3lyl7vihbcbixaw2kb81hmpphsa"; depends=[Biobase biom flexmix ggplot2 igraph KEGGREST Matrix plyr RCurl reshape2 RJSONIO stringr XML]; };
+mogsa = derive { name="mogsa"; version="1.1.3"; sha256="0rzqlm0c4skjgic334nfd2s7p0xk86mv1zbwjk036nwf5lnmdd0i"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; };
+monocle = derive { name="monocle"; version="1.3.0"; sha256="1ir0f80nsrvpl4i441irprd4pk1f53dxf1jnvnjg5zrkj7dz3wrw"; depends=[Biobase BiocGenerics cluster combinat fastICA ggplot2 igraph irlba limma matrixStats plyr reshape2 VGAM]; };
+mosaics = derive { name="mosaics"; version="2.3.0"; sha256="1jv5sv6xyh5i5m7kypgwc5g3sfsf0n5n683gijxcvrrwpvvfpnqy"; depends=[IRanges lattice MASS Rcpp]; };
+motifRG = derive { name="motifRG"; version="1.13.0"; sha256="01k47padfs393pprjyz9pp9z6vjqlxi6x10y51mhg0anqfb1sar2"; depends=[Biostrings BSgenome IRanges seqLogo XVector]; };
+motifStack = derive { name="motifStack"; version="1.13.3"; sha256="08ddwy3yyydxaxs6qfh99va3v7xx57kq1pizqknxaar0p79x278w"; depends=[ade4 Biostrings grImport MotIV scales XML]; };
+msa = derive { name="msa"; version="1.1.1"; sha256="0nqgx1zb3n8kk2l3dgilsamwzadnddif39q5br7qs9xl38hag4nr"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; };
+msmsEDA = derive { name="msmsEDA"; version="1.7.0"; sha256="1hywj0vvrqq1zg62gr1rk4sblm201hgwz5kd78819apw5jf50fwd"; depends=[gplots MASS MSnbase RColorBrewer]; };
+msmsTests = derive { name="msmsTests"; version="1.7.0"; sha256="1qvi91shpy02irppq6g6lq43sp3rk2j7n1nfnm2p9767rdhbj13b"; depends=[edgeR msmsEDA MSnbase qvalue]; };
+mtbls2 = derive { name="mtbls2"; version="0.99.8"; sha256="0x5slfyn6gq5bhvpi820g93q2xzs8hb3s5yw4inpra0wpdmnvmkz"; depends=[]; };
+multiscan = derive { name="multiscan"; version="1.29.0"; sha256="0rp1nc8vjr8b0v9bcwrnsvdfklan0zc2cilrmwz1ikz0k5gnc0sq"; depends=[Biobase]; };
+multtest = derive { name="multtest"; version="2.25.1"; sha256="07ywm87prs1lyndwdsccswfhfz28ahasalwhn95vdkk50r7d3drf"; depends=[Biobase BiocGenerics MASS survival]; };
+muscle = derive { name="muscle"; version="3.11.0"; sha256="1s3apdcd0qj08bswn7smj7b93yv9qar7wrzyfkp5z3m16jgz979x"; depends=[Biostrings]; };
+mvGST = derive { name="mvGST"; version="1.3.0"; sha256="1chskyx9hgymxg57p6y98rw743lapssx18axvl0r9f2zsmmfz9bn"; depends=[annotate AnnotationDbi GOstats gProfileR graph Rgraphviz stringr topGO]; };
+mygene = derive { name="mygene"; version="1.4.0"; sha256="1f1nqf2h679z6j9pshc393qygdygs3s4spz2n7iwr56aqkbnccf6"; depends=[GenomicFeatures Hmisc httr jsonlite S4Vectors sqldf]; };
+mzID = derive { name="mzID"; version="1.7.0"; sha256="0gkkyxb7zk0c8ynddxxv7bym2lzpn8yn1ww6xf9bp9ax1zc021wk"; depends=[doParallel foreach iterators plyr XML]; };
+mzR = derive { name="mzR"; version="2.3.1"; sha256="19piyqgdxpi777nd4860d6mp0g4zzcf3wf7q7ilm99jqav9lfrn8"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; };
+ncdfFlow = derive { name="ncdfFlow"; version="2.15.2"; sha256="0s65c26r6q8di73iwpkrx4g3d9dy6v18vna7yy7di5vsgy0phr9l"; depends=[BH Biobase flowCore flowViz Rcpp RcppArmadillo zlibbioc]; };
+neaGUI = derive { name="neaGUI"; version="1.7.0"; sha256="198b0vrr5qp66z4sccwy6rh8sjxpw3qjkdryygg1baxq91ra76p1"; depends=[hwriter]; };
+nem = derive { name="nem"; version="2.43.0"; sha256="1d357gh8binh0fwg1z0mzjzq3nyhazg9dnnf7aqk6gjfgsjda9i8"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; };
+netbenchmark = derive { name="netbenchmark"; version="1.1.6"; sha256="07q5a9kxq5r0ch32q68vxb4gxl6r5zhw6d06b8c89h42cby2qdfp"; depends=[c3net GeneNet minet PCIT pracma randomForest Rcpp]; };
+netbiov = derive { name="netbiov"; version="1.3.0"; sha256="0d6xc74ivzvi0n9ndfgc0m9y79mwdbs344lxv9nps4igd7aaxh34"; depends=[igraph]; };
+nethet = derive { name="nethet"; version="1.1.0"; sha256="1xklqhwfmv1sk5h3x2g1jjbl5higrzhfj0mvap15vr2agax5hbg5"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network parcor]; };
+netresponse = derive { name="netresponse"; version="1.19.0"; sha256="0blgcfbhwns4khnsd3m2yafmihr63kh3zsf7imphim0cdrx67xks"; depends=[dmt ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape Rgraphviz]; };
+networkBMA = derive { name="networkBMA"; version="1.11.0"; sha256="09wf696s8n30nnadfds58flv8sv2gamgnw6pzz80isfc3178h1n6"; depends=[BMA Rcpp RcppArmadillo RcppEigen]; };
+nnNorm = derive { name="nnNorm"; version="2.33.0"; sha256="1ml2z7cds83ff8fpmagfmymnqg66r2jgi32r840c87gk2vakakrm"; depends=[marray nnet]; };
+nondetects = derive { name="nondetects"; version="1.5.0"; sha256="0178ci017kxgpbgjgkgzpjcw1qyz5ajx8qv9pbv76airwkhbharf"; depends=[Biobase HTqPCR]; };
+npGSEA = derive { name="npGSEA"; version="1.5.1"; sha256="0yh0cj6sj4r8sqv8xszpzws9sdxf7xji6sw0vrn6yn6zfmfjkib0"; depends=[Biobase BiocGenerics GSEABase]; };
+nucleR = derive { name="nucleR"; version="2.1.0"; sha256="0w9hmrahbk14gijv1ngps70m5f9lijbqr1lgpdbrjcqn7ff96yrq"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; };
+nudge = derive { name="nudge"; version="1.35.0"; sha256="1135k3nz8613vrib7fxmn669f31h5k1szy0r20qwmji28806arrk"; depends=[]; };
+occugene = derive { name="occugene"; version="1.29.0"; sha256="1vlm93r8xxp4dl8yv3hcg618vc5s7wbn7kcw4qpk8kyqaqcjqw2r"; depends=[]; };
+oligo = derive { name="oligo"; version="1.33.0"; sha256="0110j0lv1n1m81z3lvyqb5y0zzjda34i5xb5rm0n1s641f5cw82v"; depends=[affxparser affyio Biobase BiocGenerics Biostrings DBI ff oligoClasses preprocessCore RSQLite zlibbioc]; };
+oligoClasses = derive { name="oligoClasses"; version="1.31.1"; sha256="0likyfm4xq6s34l9pj7n3my04zrfvrhrcwd1ydbg7jpss2piy4lm"; depends=[affyio Biobase BiocGenerics BiocInstaller Biostrings ff foreach GenomicRanges IRanges RSQLite S4Vectors SummarizedExperiment]; };
+omicade4 = derive { name="omicade4"; version="1.9.3"; sha256="00dr419qd563d75srypc02j6m5v281995mrh0r6fylz5bmi9bbks"; depends=[ade4 made4]; };
+oneChannelGUI = derive { name="oneChannelGUI"; version="1.35.0"; sha256="1diclgl4zkzzyz705cyqx983bw4zqw03rx7fn9515w0ifl0bk1r4"; depends=[affylmGUI Biobase Biostrings chimera IRanges Rsamtools siggenes tkrplot tkWidgets]; };
+ontoCAT = derive { name="ontoCAT"; version="1.21.0"; sha256="10d0a0fxg2h9gf6d1jbilxxg8irbqb1k526689qkdn2zh0qjvv04"; depends=[rJava]; };
+openCyto = derive { name="openCyto"; version="1.7.0"; sha256="11hhgxfwl6z7s6dzvr9bs3px21mwwv0b203snv6xgzan4wh11iyw"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; };
+oposSOM = derive { name="oposSOM"; version="1.5.1"; sha256="055ya0xvld0c7sl0s9cz7zmpw3ayqbskbya730cskzw5nz104lpg"; depends=[ape Biobase biomaRt fastICA fdrtool igraph KernSmooth pixmap scatterplot3d som]; };
+pRoloc = derive { name="pRoloc"; version="1.9.2"; sha256="1q9xaxz8if6ihs5a3ihbk2ayil1fxs8s34ij7gw7sv8hy6pvpm9s"; 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 = derive { name="pRolocGUI"; version="1.3.0"; sha256="1k7r8fhj4fqizk1w76mfcdd9sj3y7vxiq3kzfrkbk674gl1jsgmq"; depends=[MSnbase pRoloc shiny]; };
+paircompviz = derive { name="paircompviz"; version="1.7.0"; sha256="0sf80ji20q6kaqw2747an9b51xxwhl55yj5y7q6j68gif1ndkzl4"; depends=[Rgraphviz]; };
+pandaR = derive { name="pandaR"; version="1.1.0"; sha256="03aa0s1mifq5hyg4xshbjqz9javphgb11135zvfg8cqdq34dzg4m"; depends=[]; };
+panp = derive { name="panp"; version="1.39.0"; sha256="163yii12bhw0skzhwrjbavpsgsl2aygj8x9cilzj9pqsqakvinna"; depends=[affy Biobase]; };
+parglms = derive { name="parglms"; version="1.1.0"; sha256="1msk5ygl030rczm10rp9xnb461cbzcs7qqk6jqk8xhv5dycnwnbd"; depends=[BatchJobs BiocGenerics BiocParallel]; };
+parody = derive { name="parody"; version="1.27.0"; sha256="06lrzix8ydc41siy21fqkf3z6krj07p5v38pzan8jzzhqpwlq4iz"; depends=[]; };
+pathRender = derive { name="pathRender"; version="1.37.0"; sha256="0iw7gsbjccazz1pip75czrzxrnmmw8iyzkzxwz6yc7p23y68xlgd"; depends=[AnnotationDbi graph RColorBrewer Rgraphviz]; };
+pathifier = derive { name="pathifier"; version="1.7.0"; sha256="1zfhs2qkl20ryfp6zq6xrbavdgcfgw27b50pjx8p5maqx21qcgyh"; depends=[princurve R_oo]; };
+pathview = derive { name="pathview"; version="1.9.0"; sha256="0bajyh3ikaw87bpp6i04pmq440vy2rjjwjg1gp2bzml4rpwi2sz4"; depends=[AnnotationDbi graph KEGGgraph KEGGREST png Rgraphviz]; };
+paxtoolsr = derive { name="paxtoolsr"; version="1.3.1"; sha256="0pv4zcl12yxidiy3wd0kc10p5n561348fbvdpzhjdz12gjdr3j41"; depends=[plyr RCurl rJava rjson XML]; };
+pcaGoPromoter = derive { name="pcaGoPromoter"; version="1.13.1"; sha256="0a1yfi16sadp5fj112mlq9har0yggp8amn8v4v18jzfrb8aiacsj"; depends=[AnnotationDbi Biostrings ellipse]; };
+pcaMethods = derive { name="pcaMethods"; version="1.59.0"; sha256="12b8qdd38xgpzisz0lm9xkwq22z5ciq7b8i11z3na1wynvim3nll"; depends=[Biobase BiocGenerics MASS Rcpp]; };
+pcot2 = derive { name="pcot2"; version="1.37.0"; sha256="023ly5jgq8zc7k73mfqvra13mask54l7f62dznjh1dcjpv6xgw4p"; depends=[amap Biobase]; };
+pdInfoBuilder = derive { name="pdInfoBuilder"; version="1.33.1"; sha256="1vyw3ggh247km4qag1gy3wz9v338na4hlxmqz57mv51gp7fw6v1l"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
+pdmclass = derive { name="pdmclass"; version="1.41.0"; sha256="0361s7d6n9wn65pxks3alr8ycqjcgv9dvvb2n9xqiqawyki1nvpm"; depends=[Biobase mda]; };
+pepStat = derive { name="pepStat"; version="1.3.0"; sha256="003gqcs5m5b8mil9r1ydadhcc086nqmdk6i1xz4kkdpkcyxbyz7p"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; };
+pepXMLTab = derive { name="pepXMLTab"; version="1.3.0"; sha256="0rbcj59vsbq8zqxq4h1v077jgpz7l607zalc4lhw9yn8l5lij4j8"; depends=[XML]; };
+phenoDist = derive { name="phenoDist"; version="1.17.0"; sha256="1dn5s6dfh4x5xqp336a12vrqrk1gqdxp5k3yinnshxnq4iy5x8m9"; depends=[e1071 imageHTS]; };
+phenoTest = derive { name="phenoTest"; version="1.17.0"; sha256="09192i8zsamcd1s31w2w0ipr6ms8n0dznpdy83j0d280c5mmb20y"; depends=[annotate AnnotationDbi Biobase biomaRt BMA Category ellipse genefilter ggplot2 gplots GSEABase Heatplus Hmisc hopach HTSanalyzeR limma mgcv SNPchip survival xtable]; };
+phyloseq = derive { name="phyloseq"; version="1.13.2"; sha256="127n0smsgfgwb7by3hkagfhj8wn7xz5l73lf1vxmbzx8pal5lzni"; depends=[ade4 ape BiocGenerics biom Biostrings cluster data_table DESeq2 foreach ggplot2 igraph multtest plyr reshape2 scales vegan]; };
+piano = derive { name="piano"; version="1.9.4"; sha256="1gj5ka0kjyvzxvsr84bs9z1ia3glsq57b1k820lp5qhswapzmgps"; depends=[Biobase BiocGenerics gplots igraph marray relations]; };
+pickgene = derive { name="pickgene"; version="1.41.0"; sha256="0gy0zzd00gn91gmxszdk1jsrglxknpxb7n957fw3rxy0zkbnbyzd"; depends=[MASS]; };
+pint = derive { name="pint"; version="1.19.0"; sha256="0gl9yafqxjj8ndlcfvhmksbmcr7wmrb0p5c5pn293xsivfw590b7"; depends=[dmt Matrix mvtnorm]; };
+pkgDepTools = derive { name="pkgDepTools"; version="1.35.0"; sha256="1z8aznll9a61n9a20fh1lkcg58ml1vk8kaw3id5jr7m55hl6gwrg"; depends=[graph RBGL]; };
+plateCore = derive { name="plateCore"; version="1.27.0"; sha256="10br9gx4z41n63b36jc7ifjd7glj82lahrvfsprvrwl8c0xh5ii4"; depends=[Biobase flowCore flowStats flowViz lattice latticeExtra MASS robustbase]; };
+plethy = derive { name="plethy"; version="1.7.0"; sha256="1ll6p7iji4gwjirj6w04zzb7c5kpyqhp3q9cnjixrzd4x3h3a8hz"; depends=[Biobase BiocGenerics DBI ggplot2 IRanges plyr RColorBrewer reshape2 RSQLite S4Vectors Streamer]; };
+plgem = derive { name="plgem"; version="1.41.0"; sha256="0gs4sawmvcfykdybmjk4sm4xizbldj7jp34zgs2zn42kr2xllz6k"; depends=[Biobase MASS]; };
+plier = derive { name="plier"; version="1.39.0"; sha256="0ws919mrm8q719ssmxsxb4mqrq5ffhg81amkiw1s4pymqv5292z5"; depends=[affy Biobase]; };
+plrs = derive { name="plrs"; version="1.9.0"; sha256="1lwnzbq2f75zh191g8zjljajq1qypvi2abzjsq5vfyqr3jnzpah8"; depends=[Biobase BiocGenerics CGHbase ic_infer marray quadprog Rcsdp]; };
+plw = derive { name="plw"; version="1.29.0"; sha256="0rc31452gnzxxz5rwg932i680xx8azdvailn4id6fnkr5xqr1d5a"; depends=[affy MASS]; };
+pmm = derive { name="pmm"; version="1.1.0"; sha256="05vix8j0rpvnyfkdb043d24vrbpdvkjmb8cqpqbg0knja178c8cg"; depends=[lme4]; };
+podkat = derive { name="podkat"; version="1.1.2"; sha256="1jqb55mnys66grhkx9d5yzf4c6x1vb0g0arfibv7ayzlsgw1cwxx"; depends=[Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp Rsamtools]; };
+polyester = derive { name="polyester"; version="1.5.0"; sha256="1qpnabv5c7wi1qw8lp3nvnv4dass7g6chz6blyg3k572p0zhzm47"; depends=[Biostrings IRanges limma logspline S4Vectors]; };
+ppiStats = derive { name="ppiStats"; version="1.35.0"; sha256="10c3lnipwnpg0j938c1hxz1qgysc4n56lmsw7n6cra57zkr0whxj"; depends=[Biobase Category graph lattice RColorBrewer ScISI]; };
+prada = derive { name="prada"; version="1.45.0"; sha256="140fv2yrgdf9ab26k14n0l6yd03vidi5y3dn4d1ybkyc66rx8xpa"; depends=[Biobase BiocGenerics MASS RColorBrewer rrcov]; };
+prebs = derive { name="prebs"; version="1.9.2"; sha256="0vwnxnxy0v03mx7lc5avkhy5706nm3scf237nbrwxrpr9598y9r0"; depends=[affy Biobase GenomeInfoDb GenomicAlignments GenomicRanges IRanges RPA S4Vectors]; };
+predictionet = derive { name="predictionet"; version="1.15.0"; sha256="19ikg3kzy6h0n4x3hp13n2f9g3qmgvvi700w1wiah0m4pm1xfhw1"; depends=[catnet igraph MASS penalized RBGL]; };
+preprocessCore = derive { name="preprocessCore"; version="1.31.0"; sha256="1hm8066i4cxwiqqp5d9dx2dh5m5mrj7gpc3v06rhyk34mq2xkppc"; depends=[]; };
+proBAMr = derive { name="proBAMr"; version="1.3.1"; sha256="0nz9imskb1dmf3i55vpk8ik406s60x80n9ds7nc67zg2xc62fw6v"; depends=[AnnotationDbi Biostrings GenomicFeatures GenomicRanges IRanges rtracklayer]; };
+procoil = derive { name="procoil"; version="1.19.0"; sha256="1jada5s60ir29dggixxma7m5amr3lbc11n8xxdnscx934zb428rz"; depends=[]; };
+prot2D = derive { name="prot2D"; version="1.7.0"; sha256="0cpksbs1d8g8v1hdqfshj9imj55w4vlixnawvhlrpb7fj52izz4q"; depends=[Biobase fdrtool impute limma MASS Mulcom qvalue samr st]; };
+proteinProfiles = derive { name="proteinProfiles"; version="1.9.1"; sha256="14gl7hfahmjfw7v9vjfbwb041dkpp7ykjckr64naphxk3nkijbc0"; depends=[]; };
+proteoQC = derive { name="proteoQC"; version="1.5.0"; sha256="1khhy7y1w8pyccc3x18m497lh6a3kv7cyd3np04qwg277c3lqvas"; depends=[ggplot2 MSnbase Nozzle_R1 plyr Rcpp reshape2 rTANDEM seqinr VennDiagram XML]; };
+puma = derive { name="puma"; version="3.11.0"; sha256="1dgi08p70fifsa42gj4jd1651d8laq03fa52qvicsmwkjxxyd83w"; depends=[affy affyio Biobase mclust oligo]; };
+pvac = derive { name="pvac"; version="1.17.0"; sha256="0r9p96lp15883xix9gbr36pcjy7zg8yniag257mps58xagld0162"; depends=[affy Biobase]; };
+pvca = derive { name="pvca"; version="1.9.0"; sha256="1xi72iwarx3784l5hjf7vmwindsz4fbah5g9y2a2fllr5mjh421b"; depends=[Biobase lme4 Matrix vsn]; };
+pwOmics = derive { name="pwOmics"; version="1.1.7"; sha256="1750jxrdb801ipzkr8y2zkgr79bzxxzsnyvcj4jamifljv49gz5c"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics biomaRt data_table GenomicRanges gplots igraph rBiopaxParser STRINGdb]; };
+qcmetrics = derive { name="qcmetrics"; version="1.7.0"; sha256="1qrhl7w131yzkvck9ifqf966lmh8f9y9xlmrg2g3dgh29vgww54b"; depends=[Biobase knitr Nozzle_R1 pander S4Vectors xtable]; };
+qpcrNorm = derive { name="qpcrNorm"; version="1.27.0"; sha256="0lmk9ksfrrw8zvhq20kg3kv0aqr8wx342nmw7zxvjv7l8z3d33sf"; depends=[affy Biobase limma]; };
+qpgraph = derive { name="qpgraph"; version="2.3.3"; sha256="1ykijxsg8yc3d1k9ip0p0zqrv75l9ps6q7h1naqw9sjhk6nqwf0g"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; };
+qrqc = derive { name="qrqc"; version="1.23.0"; sha256="15kphqzml54zaadbdssna6krfgm28f7h8cmvq78hfzi303wqsi5j"; depends=[Biostrings biovizBase brew ggplot2 plyr reshape Rsamtools testthat xtable]; };
+quantro = derive { name="quantro"; version="1.3.0"; sha256="155yqm48yc447mimcqxc6f27d5jcd6j9a069x1d2djx7xn3af76b"; depends=[Biobase doParallel foreach ggplot2 iterators minfi RColorBrewer]; };
+quantsmooth = derive { name="quantsmooth"; version="1.35.0"; sha256="03z3q8zmaap6bd0mgm7hdj7rn929cfam8ajlxdy91nvyj6033lf5"; depends=[quantreg]; };
+qusage = derive { name="qusage"; version="1.9.0"; sha256="1dg8qchhqfvak5cqjs9v30bh0hpi449biv27wc8y8f6292xqb6jk"; depends=[Biobase limma]; };
+qvalue = derive { name="qvalue"; version="2.1.0"; sha256="0qgsqjb90qnf5a77n3zf5dcb5agdbj4hlk3swh1hrjg9iqcs76g0"; depends=[ggplot2 reshape2]; };
+r3Cseq = derive { name="r3Cseq"; version="1.15.0"; sha256="0pi5aq3dbivk23x6axwbqa4danbsvn623icw6xvlh3i71v8m5rkw"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges IRanges qvalue RColorBrewer Rsamtools rtracklayer sqldf VGAM]; };
+rBiopaxParser = derive { name="rBiopaxParser"; version="2.7.0"; sha256="1ni8kaivdxqxv8fj2qf5vnwzmmamfd073l1p4072pnfxpn7rn0p4"; depends=[data_table XML]; };
+rGADEM = derive { name="rGADEM"; version="2.17.0"; sha256="1xwypnpf7sdaqszfmallgg2314g866xbi9q342yhds2fkiw9sp65"; depends=[Biostrings BSgenome IRanges seqLogo]; };
+rGREAT = derive { name="rGREAT"; version="1.1.0"; sha256="1rd4cjwh4rrqgfg15k32br0iv15j99797z7lx7789wc1zxkpzvg3"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; };
+rHVDM = derive { name="rHVDM"; version="1.35.0"; sha256="0y2vm6xsdsz174xrs22p54z5f5rxqcx937yf02ilv0bnfa0r06hj"; depends=[affy Biobase minpack_lm R2HTML]; };
+rMAT = derive { name="rMAT"; version="3.19.0"; sha256="0nhmf1hbiqwzb9035405f8asnhh2ywj4bm9wdlgbafyhiw6qik98"; depends=[affxparser Biobase BiocGenerics IRanges]; };
+rRDP = derive { name="rRDP"; version="1.3.0"; sha256="0q373nfs4ynjnmq9rp0c0ficnnylwb2gf1j0bzlnxcd2cwz215zv"; depends=[Biostrings]; };
+rSFFreader = derive { name="rSFFreader"; version="0.17.1"; sha256="105qlrjq4777k4ps2h7gmr2ywix9skrylhg4ds3dw0pi6n9a4w8n"; depends=[Biostrings IRanges S4Vectors ShortRead XVector]; };
+rTANDEM = derive { name="rTANDEM"; version="1.9.0"; sha256="08r73kv83w8rfglbqf2zvczj4yix7sfhvrz93wk22nry04jfgccr"; depends=[data_table Rcpp XML]; };
+rTRM = derive { name="rTRM"; version="1.7.0"; sha256="0lqzxcgz36dsvqlx218cc9h785vw3czxsq93z388adraw7i0r55x"; depends=[AnnotationDbi igraph RSQLite]; };
+rTRMui = derive { name="rTRMui"; version="1.7.0"; sha256="132cm40hxhb4apdidifbw90jyxhlz0dqxgqsr6awv8q6dy9jpfw4"; depends=[MotifDb rTRM shiny]; };
+rain = derive { name="rain"; version="1.3.0"; sha256="0ak8wbhsglnylzy1jzh9hb2yxqjzmspvj98x10vf3qmgbqc30i4y"; depends=[gmp multtest]; };
+rama = derive { name="rama"; version="1.43.0"; sha256="1siqzb0b9j51b06aijz85xn6c9v4dqvcw7scmrlfpf18dihqaig1"; depends=[]; };
+randPack = derive { name="randPack"; version="1.15.0"; sha256="0m9729h3fia15rcgxznz4hmlz7abz8xkbn1ffc3l8qhqks5j50f7"; depends=[Biobase]; };
+rbsurv = derive { name="rbsurv"; version="2.27.0"; sha256="1v97vrralg445zn8s3km7vmhlxhkv8bdwcj90fyvd6kfk7gm4xc7"; depends=[Biobase survival]; };
+rcellminer = derive { name="rcellminer"; version="1.1.1"; sha256="04ddqp6kxsdhanp7xfifhcvm8hirb915wl15m2qzwx5xy4l97vry"; depends=[Biobase fingerprint gplots rcdk shiny stringr]; };
+reb = derive { name="reb"; version="1.47.0"; sha256="1lxl4mzfz9b7hmq4fd7bsplxmknb8a3ffwdpddik3wry8rpqzmsd"; depends=[Biobase idiogram]; };
+regionReport = derive { name="regionReport"; version="1.3.4"; sha256="0n5l83izk4xr59f1npp1rwhghn4g19yy8wn2h7q2pb4hwdqa3sfd"; depends=[bumphunter derfinder derfinderPlot devtools GenomeInfoDb GenomicRanges ggbio ggplot2 gridExtra IRanges knitcitations knitr knitrBootstrap mgcv RColorBrewer rmarkdown whisker]; };
+regioneR = derive { name="regioneR"; version="1.1.1"; sha256="1wylrkqiv5lc9rw3mc1by88ckx437jwhlgyg5kasvpry003rm72c"; depends=[BSgenome GenomicRanges memoise rtracklayer]; };
+rfPred = derive { name="rfPred"; version="1.7.0"; sha256="0k1z7bqdjmm668kipz8c74kd9k1vw2pcjbirxdi88clrclz3i47y"; depends=[data_table GenomicRanges IRanges Rsamtools]; };
+rgsepd = derive { name="rgsepd"; version="1.1.0"; sha256="1rvzlzh43j3sj2vrhmg13hl4wq3bg9hml3xq2dpx28lapynywm41"; depends=[AnnotationDbi biomaRt DESeq2 GenomicRanges goseq gplots hash]; };
+rhdf5 = derive { name="rhdf5"; version="2.13.1"; sha256="01ldm91wq6klcs2djpy95m5gvspql2b35q51ba9p5017h3brvrqm"; depends=[zlibbioc]; };
+riboSeqR = derive { name="riboSeqR"; version="1.3.0"; sha256="0jlh5q1hkxkfvy496hlbwfkl17k36n304yiyz9f0azq5kv7jz1y2"; depends=[abind GenomicRanges]; };
+rnaSeqMap = derive { name="rnaSeqMap"; version="2.27.0"; sha256="1638vikgizcgg4bpfm61ak98smwy74dk5hyx73qjbisd49zvy5nk"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; };
+roar = derive { name="roar"; version="1.5.1"; sha256="1r4m95lw27rrdzfxi52llx50i3vm7k7br198k573ycmm6p941fwk"; depends=[GenomicAlignments GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; };
+rols = derive { name="rols"; version="1.11.2"; sha256="0mzw65knb7y41zamvnx2j3pl10b48y6xb4ajc7297dgf23v8bxms"; depends=[Biobase XML]; };
+rpx = derive { name="rpx"; version="1.5.0"; sha256="1348x8jzc0bjxhyzi5yjrhx0v8jxd3x7slidjzi924aqbnn7shs0"; depends=[RCurl XML]; };
+rqubic = derive { name="rqubic"; version="1.15.0"; sha256="19n613m7x48wkrfrhnd0ab9018m5dd7rf08qjbgphakwycssfgcw"; depends=[biclust Biobase BiocGenerics]; };
+rsbml = derive { name="rsbml"; version="2.27.0"; sha256="10qmv5gpgqffnr5wqh7zik0l2d1cg0c0m3xak4r4bqmsd1y4dw01"; depends=[BiocGenerics graph]; };
+rtracklayer = derive { name="rtracklayer"; version="1.29.10"; sha256="04p3hpxf5jnyfjh5pign7r4k47pzl9m0g84cq93p8cb2jgywc97a"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; };
+sRAP = derive { name="sRAP"; version="1.9.0"; sha256="0rvnq41gns4ccr6gnfw0xbbi2c2wjl14qh0yr7wj7s4yrxzqr866"; depends=[gplots pls qvalue ROCR WriteXLS]; };
+sSeq = derive { name="sSeq"; version="1.7.0"; sha256="0wcw77cz47wklwsrwwimwryqmyc0lrd9mk2aawk0vx1zkqci1yca"; depends=[caTools RColorBrewer]; };
+safe = derive { name="safe"; version="3.9.0"; sha256="0x1gdzpgrm4m2m64h6y5rayp64j6ckxlr081d3w46zvfb935294a"; depends=[AnnotationDbi Biobase SparseM]; };
+sagenhaft = derive { name="sagenhaft"; version="1.39.0"; sha256="1jr4pi4qz5sapigx5lwrvaw2cjbm03hpisc0kf20id8q8sg4wqqw"; depends=[SparseM]; };
+sangerseqR = derive { name="sangerseqR"; version="1.5.0"; sha256="0wiqaqzn6n63k1389nqj35k5wn93bq7c99gayblwjrhks0y9fll0"; depends=[Biostrings shiny]; };
+sapFinder = derive { name="sapFinder"; version="1.7.0"; sha256="1xg3scw5ijm1z2l4ha4ik52s97vr10plr9ifs9rdk2l6vh8na6kh"; depends=[pheatmap Rcpp rTANDEM]; };
+saps = derive { name="saps"; version="2.1.0"; sha256="0r6525n8ksxaa5dcvs9419bca1v369251psvwphfsdnfa4xg2n14"; depends=[piano reshape2 survcomp survival]; };
+savR = derive { name="savR"; version="1.7.3"; sha256="0jm5fc4zf4iqdq2qzzigal5r69mllzdx578ixxb9c3hxi55161mc"; depends=[ggplot2 gridExtra reshape2 scales XML]; };
+scsR = derive { name="scsR"; version="1.5.0"; sha256="1n9clp1ldspxbrv4chihv1xhw2fmys13p884cmn037xhwv5b7j3r"; depends=[BiocGenerics Biostrings ggplot2 hash IRanges plyr RColorBrewer sqldf STRINGdb]; };
+segmentSeq = derive { name="segmentSeq"; version="2.3.1"; sha256="005b9a7rhhhcpkac8xyvl9lbzgwjbfpqr49wyn0i9j99v9zw1lfv"; depends=[baySeq GenomicRanges IRanges S4Vectors ShortRead]; };
+seq2pathway = derive { name="seq2pathway"; version="1.1.2"; sha256="1ghanxmfs99h8w2fxn6im3ml7brhhx131k7djbvsm695lvxgqm7a"; depends=[biomaRt GenomicRanges GSA nnet WGCNA]; };
+seqCNA = derive { name="seqCNA"; version="1.15.0"; sha256="171292r5fwvvnwk4ajsxd43j92v2pn9n7aplvzcqxc4z43gvicss"; depends=[adehabitatLT doSNOW GLAD]; };
+seqLogo = derive { name="seqLogo"; version="1.35.0"; sha256="1fwg6v536kqgmmjfk3cixy4s5chyp74drq8bj14ap8pzpfivisi1"; depends=[]; };
+seqPattern = derive { name="seqPattern"; version="1.1.1"; sha256="0lshbskj928c2n7gi6kf22id6rarmbby5ffrlxir0zihh7g7yfxz"; depends=[Biostrings GenomicRanges IRanges KernSmooth plotrix]; };
+seqTools = derive { name="seqTools"; version="1.3.0"; sha256="17n8mz93jx7ggf6w3hm92r9mb224w2spwsyr85amny6x8xrxr7k7"; depends=[zlibbioc]; };
+seqbias = derive { name="seqbias"; version="1.17.0"; sha256="02zlj9nmwhjjmbfw499pf1szpair7ahbijvf6ci30z2g805l1qsk"; depends=[Biostrings GenomicRanges Rsamtools zlibbioc]; };
+seqplots = derive { name="seqplots"; version="1.5.1"; sha256="0xwhrln6bmsfv4rrnnr8mih2dvchxxv7kxdj9mwmwrnsh9ghk4qr"; depends=[Biostrings BSgenome Cairo class DBI digest DT fields GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges jsonlite kohonen plotrix reshape2 RSQLite rtracklayer S4Vectors shiny]; };
+shinyMethyl = derive { name="shinyMethyl"; version="1.3.0"; sha256="03wfpaprrg6czkik0xxwq7hkwgdqm3z7frl6vpcq333chnv3nl5z"; depends=[BiocGenerics matrixStats minfi RColorBrewer shiny]; };
+shinyTANDEM = derive { name="shinyTANDEM"; version="1.7.0"; sha256="18fl4kjwhbxnnhifa9kxz6j73pri0kfw08mgrryzdpqbd2p7x70y"; depends=[mixtools rTANDEM shiny xtable]; };
+sigPathway = derive { name="sigPathway"; version="1.37.0"; sha256="1gkkpgibj3snpzs33c4k09b7q029s3jjch7slx7ljaqhdzldbpw4"; depends=[]; };
+sigaR = derive { name="sigaR"; version="1.13.0"; sha256="0gfimhsmkrg78apasn3x7gw8vz9rcnc8flnnybplv6mgjwdgyqml"; depends=[Biobase CGHbase corpcor igraph marray MASS mvtnorm penalized quadprog snowfall]; };
+siggenes = derive { name="siggenes"; version="1.43.0"; sha256="15l5h1shmva4lh9n8n9i1hfap1bh03vlz98bpcz842b7qczhn1v8"; depends=[Biobase multtest]; };
+sigsquared = derive { name="sigsquared"; version="1.1.0"; sha256="010fsh2il81rg8k8yh5kms5rpqs379s74r52m69v3cf3pnhjxn2p"; depends=[Biobase survival]; };
+similaRpeak = derive { name="similaRpeak"; version="1.1.0"; sha256="0aq18iwxxapbgnjcjqyig20i58sbbjq1dfrbsmbfdh9i4fs1403w"; depends=[GenomicAlignments R6 Rsamtools rtracklayer]; };
+simpleaffy = derive { name="simpleaffy"; version="2.45.0"; sha256="00fzbq82r9n1mfqh9f51z11a7qc2idms3hc95id1ggkjkqn5ljf8"; depends=[affy Biobase BiocGenerics gcrma genefilter]; };
+simulatorZ = derive { name="simulatorZ"; version="1.3.5"; sha256="0rhpljx59n0klajz661ygx9a2xy4sdaxlgz6kqhdjvg7k53kr6z7"; depends=[Biobase BiocGenerics CoxBoost gbm GenomicRanges Hmisc IRanges S4Vectors SummarizedExperiment survival]; };
+sincell = derive { name="sincell"; version="1.1.01"; sha256="1fkpdinh38xqx2d8dn0g5cxkfw0gfl1ddp6r5bc7ckdsvl692b5f"; depends=[cluster entropy fastICA fields ggplot2 igraph MASS proxy Rcpp reshape2 Rtsne scatterplot3d statmod TSP]; };
+sizepower = derive { name="sizepower"; version="1.39.0"; sha256="1xw2r7m2hlg9r5i20nilkdf7gg3naznhl26xk19w2hyjlp84b8xp"; depends=[]; };
+skewr = derive { name="skewr"; version="1.1.0"; sha256="1dd7vn4d7zffvmy1ic139qc5rp647wyw4jqlyy6kc2vil0w8368q"; depends=[IRanges methylumi minfi mixsmsn RColorBrewer wateRmelon]; };
+snapCGH = derive { name="snapCGH"; version="1.39.0"; sha256="11xdijl28mn7znjdv1qgj5z5hhf7xnnpg79pnxr5kj17b06w5509"; depends=[aCGH cluster DNAcopy GLAD limma tilingArray]; };
+snm = derive { name="snm"; version="1.17.0"; sha256="0ckn29nymlml8ldxqq5la1h3bwm2h2c2zcr2sjs5plxl2fga4a0l"; depends=[corpcor lme4]; };
+snpStats = derive { name="snpStats"; version="1.19.0"; sha256="0m42vqjsqh2bjkn5vd5hm4q5r0pi9znxi2qzxxh0c9iai8wjjsca"; depends=[BiocGenerics Matrix survival zlibbioc]; };
+soGGi = derive { name="soGGi"; version="1.1.1"; sha256="17kq195xgsfq5fxvkyfxhkx1rcx4wp0115043snmxhp0vfpp36qv"; depends=[BiocGenerics BiocParallel Biostrings chipseq GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges preprocessCore reshape2 Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+spade = derive { name="spade"; version="1.17.0"; sha256="02ba8ybgcldjmfsxywb0q7drm5nyhg6i72brvbrcgsq2ni0b7cpf"; depends=[Biobase flowCore igraph Rclusterpp]; };
+specL = derive { name="specL"; version="1.3.3"; sha256="17067na171pn55w7znyhrn9bcibjpk7spvdw5l6gzrr5slh49qg8"; depends=[DBI protViz Rcpp RSQLite seqinr]; };
+spikeLI = derive { name="spikeLI"; version="2.29.0"; sha256="1f7in8zcbdz9i1cqdhvdcjl6g71vhz9hgd8whc0x9nf12qa87l7p"; depends=[]; };
+spkTools = derive { name="spkTools"; version="1.25.0"; sha256="1a260c41jxg0yi2li1159pdp8dqbrxgvda88047k5pjrpzwg0738"; depends=[Biobase gtools RColorBrewer]; };
+spliceR = derive { name="spliceR"; version="1.11.0"; sha256="0zfvbnlslpav4kz385sa5h1v73wrzirahxc6fx752zvn4kqbxdkj"; depends=[cummeRbund GenomicRanges IRanges plyr RColorBrewer rtracklayer VennDiagram]; };
+spliceSites = derive { name="spliceSites"; version="1.7.0"; sha256="09av779v8dznw77xss3wfl4gwy8knspb20ggvayjd5b0jxmip4n5"; depends=[Biobase BiocGenerics Biostrings doBy rbamtools refGenome seqLogo]; };
+splicegear = derive { name="splicegear"; version="1.41.0"; sha256="0bnwkr42fg3hb2rwkq01g6jvjx9p5bmdizcf1bhff2apr7bk8188"; depends=[annotate Biobase XML]; };
+splots = derive { name="splots"; version="1.35.0"; sha256="1zc8k0599wjzyvgh01lzk89v01985h3wh8vznsxawn9b07mydjsv"; depends=[RColorBrewer]; };
+spotSegmentation = derive { name="spotSegmentation"; version="1.43.0"; sha256="1y6ydlc6yn4hi66v7pgsa18kxarq8i164wzp440dxd54baqpq3ps"; depends=[mclust]; };
+sscore = derive { name="sscore"; version="1.41.0"; sha256="15hj8wdvafk4kqiy370m95c188jw15aqxs7fjsx03z01kdnqs2xd"; depends=[affy affyio]; };
+ssize = derive { name="ssize"; version="1.43.0"; sha256="144jgm68x0r5wrcg0bisrgxcrk9ckkj117rn7c19kvz8874bbir5"; depends=[gdata xtable]; };
+ssviz = derive { name="ssviz"; version="1.3.0"; sha256="1sl181mq7qsibn6f51mp8srl6zzrmpz69rjgbx00h57b5i8frv7b"; depends=[Biostrings ggplot2 RColorBrewer reshape Rsamtools]; };
+staRank = derive { name="staRank"; version="1.11.0"; sha256="0hi3nzm0bdqrgjqjfvgz0qwymdrsd2c4csndw85hw9dj5ml1czqd"; depends=[cellHTS2]; };
+stepNorm = derive { name="stepNorm"; version="1.41.0"; sha256="05g9qgxwfahyfq97pz3xmg49y7ml93w8n5hs5fv6f60l1nz59va1"; depends=[marray MASS]; };
+stepwiseCM = derive { name="stepwiseCM"; version="1.15.0"; sha256="0r0ca29xpzki7lpr91rf99a1dvc5lmyls2v22pd1nxq4fb3g265l"; depends=[Biobase e1071 glmpath MAclinical pamr penalized randomForest snowfall tspair]; };
+supraHex = derive { name="supraHex"; version="1.7.1"; sha256="02jv0mb17d79031b6a8sam0710a0njm2akkcj4bji40bx0bkqsna"; depends=[ape hexbin MASS]; };
+survcomp = derive { name="survcomp"; version="1.19.0"; sha256="1czy90l49f0c31kh9p461wkdxb1iih64pvpbz31wv0mhyi2633i5"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; };
+sva = derive { name="sva"; version="3.15.0"; sha256="0bskn3famgz24kjaz4lrrm94vw07g5d2103h9gh5qzhajdsc2d03"; depends=[genefilter mgcv]; };
+switchBox = derive { name="switchBox"; version="1.3.0"; sha256="0bnb1wqxl3rv8w5rm0jw3x22yy8q27j11hpqnd792fvsz8ssr5h1"; depends=[]; };
+synapter = derive { name="synapter"; version="1.11.0"; sha256="05gv788mx1bzizr07cg5cw98i4xm3qdh8hpys4xvr06as7q65h2g"; depends=[Biobase BiocParallel Biostrings cleaver hwriter knitr lattice MSnbase multtest qvalue RColorBrewer]; };
+systemPipeR = derive { name="systemPipeR"; version="1.3.4"; sha256="16sn8svmxz9yfhhdl3kwq3hgk80rmirz2g4c8z8i9dib3i8i3sia"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicRanges ggplot2 GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; };
+tRanslatome = derive { name="tRanslatome"; version="1.7.0"; sha256="1pcr1ghwkmkpsbkqh85yninvgb2za2vdsnax5bjkdj60wfj0d5bc"; depends=[anota Biobase DESeq edgeR GOSemSim gplots Heatplus limma plotrix RankProd samr sigPathway topGO]; };
+ternarynet = derive { name="ternarynet"; version="1.13.0"; sha256="13pnzzlfzgkvqn323xhjvbaqzrk2fjq440ff9hjf09a53g14q7li"; depends=[igraph]; };
+tigre = derive { name="tigre"; version="1.23.0"; sha256="177phidn72rcghb4mqfcr2wbfx5pz2vdw6jh7ahnki7s5q6fkldl"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; };
+tilingArray = derive { name="tilingArray"; version="1.47.0"; sha256="1l7ldbzzjxa60ivnlb18m53z54vjjfdxjp5jxnxwg46n423rs93x"; depends=[affy Biobase genefilter pixmap RColorBrewer strucchange vsn]; };
+timecourse = derive { name="timecourse"; version="1.41.0"; sha256="1jpbjh4dg71zyhy8vghzqvmkg17aw7azdbhn101j8rdfsf90i8mx"; depends=[Biobase limma marray MASS]; };
+tkWidgets = derive { name="tkWidgets"; version="1.47.0"; sha256="08vhxl7bdhnx0vk8pkm4bxjy9jvg42wy8nhlp04fyjkylfs5d58r"; depends=[DynDoc widgetTools]; };
+topGO = derive { name="topGO"; version="2.21.0"; sha256="0hhglb4zqbjwqywn37h3klz7qgkypl2zmv1afibxjn70xc6wxq46"; depends=[AnnotationDbi Biobase BiocGenerics graph lattice SparseM]; };
+trackViewer = derive { name="trackViewer"; version="1.5.1"; sha256="16xjh6k1v1pp29g2x2n8ywaapf7wgj2l4klmmspa3f8gkzlmxgwz"; depends=[GenomicAlignments GenomicFeatures GenomicRanges Gviz gWidgetstcltk pbapply Rsamtools rtracklayer scales]; };
+tracktables = derive { name="tracktables"; version="1.3.0"; sha256="125z9b0rjvrrbg91bdzqrf3rrw0aajivpyxd1m9k1gcs6jmsaaj3"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; };
+triform = derive { name="triform"; version="1.11.2"; sha256="11vsg3ki9dyl8vpi1q1p0cilhnvz076lk55w6ld4k53sp2h3q0r4"; depends=[BiocGenerics IRanges yaml]; };
+trigger = derive { name="trigger"; version="1.15.0"; sha256="1gsvp2rvry8pg9wfl9rggjfjxd0dcq3lrfkygfsl4jqcwnankpvc"; depends=[corpcor qtl qvalue sva]; };
+trio = derive { name="trio"; version="3.7.1"; sha256="1g3q1pvqq2kp1vck9c7sj000inw5b7q0wvd14yr8096mm6ax8zka"; depends=[]; };
+triplex = derive { name="triplex"; version="1.9.0"; sha256="0a7pyazg2vmk8229x6lvvxcvplj07drqrlvn9cra5ckqhflm3san"; depends=[Biostrings GenomicRanges IRanges S4Vectors XVector]; };
+tspair = derive { name="tspair"; version="1.27.0"; sha256="0kx2iw2g0nji25qds5z6qh4wvia6gc14jnf7q08qcpqb0xg8s11x"; depends=[Biobase]; };
+tweeDEseq = derive { name="tweeDEseq"; version="1.15.0"; sha256="17mmkz0qpww2qwzk1vd5945wqpr59v091rlvn1s2013h248173vm"; depends=[cqn edgeR limma MASS]; };
+twilight = derive { name="twilight"; version="1.45.0"; sha256="0dzgapk34jzxhdadraq072fcj6rwqhkx2795rbn0dkk4vazqz4sn"; depends=[Biobase]; };
+unifiedWMWqPCR = derive { name="unifiedWMWqPCR"; version="1.5.0"; sha256="055yvgwqjh91cf8d2hsacnbzq2z9c911cy3qd206azqlr6qyjiip"; depends=[BiocGenerics HTqPCR]; };
+vbmp = derive { name="vbmp"; version="1.37.0"; sha256="1i4akvqrwj1r0ahi4vjxl7q780sa5bryj3rd2c5wg0ifd5l95h6s"; depends=[]; };
+viper = derive { name="viper"; version="1.5.1"; sha256="0494601adg93i5gwam73x4x3m7vfg25xly6v2gj4aclaq9v6fpyf"; depends=[Biobase e1071 KernSmooth mixtools]; };
+vsn = derive { name="vsn"; version="3.37.1"; sha256="0qya4csz1vhvshnzrml6d9fbxqrdp2ckh4f38izcbj53y3hhilf9"; depends=[affy Biobase lattice limma]; };
+vtpnet = derive { name="vtpnet"; version="0.9.0"; sha256="0gbs4pdwy88pjwsn3r2yspnfscz127awhlwym6g1lk8sxkb4mjxc"; depends=[doParallel foreach GenomicRanges graph gwascat]; };
+wateRmelon = derive { name="wateRmelon"; version="1.9.0"; sha256="1lgadzv28j5qqqqsrjzakxmyj1q9j0hps3waa2nn9r7dq4cvallh"; depends=[limma lumi matrixStats methylumi ROC]; };
+wavClusteR = derive { name="wavClusteR"; version="2.3.1"; sha256="0cfh1jiyzs1fijp8p3f4vysvrm7xhrriqdyjrms81pldka4kfv6y"; depends=[Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer seqinr stringr wmtsa]; };
+waveTiling = derive { name="waveTiling"; version="1.11.0"; sha256="0y1xfa2z1djcdj7q84szkij21v86mqia3zwyhvawwmqf9kznk3n7"; depends=[affy Biobase Biostrings GenomeGraphs GenomicRanges IRanges oligo oligoClasses preprocessCore waveslim]; };
+weaver = derive { name="weaver"; version="1.35.0"; sha256="010qw05wm66n0rwx8lz82kc064p40kqx5jb2nh99yqx14pah0v65"; depends=[codetools digest]; };
+webbioc = derive { name="webbioc"; version="1.41.1"; sha256="01nsfzlxwjlj435mghm5ch324w6l22lvr22h0v59mjyi5gspvxbi"; depends=[affy annaffy Biobase BiocInstaller gcrma multtest qvalue vsn]; };
+widgetTools = derive { name="widgetTools"; version="1.47.0"; sha256="134yq5qqxd0cpw4lm4k7gc1nq9cmlw7k2h4a93b32s75fa0mmnv7"; depends=[]; };
+xcms = derive { name="xcms"; version="1.45.6"; sha256="174az64bjhkq483zmpycwi28brabracc3478p9a7892yjg9rkiw5"; depends=[Biobase BiocGenerics lattice mzR ProtGenerics RColorBrewer]; };
+xmapbridge = derive { name="xmapbridge"; version="1.27.0"; sha256="1lmsbmhim1v20j1v9iry5ridvh2dzdvz082wj2r68j68ilcz08gr"; depends=[]; };
+xps = derive { name="xps"; version="1.29.0"; sha256="1m0rabnxwzm6hjfvr38r19c49jri91fgvwpghg5718qmk5hsfac1"; depends=[]; };
+yaqcaffy = derive { name="yaqcaffy"; version="1.29.1"; sha256="13hxgs8qm4z0h8mywxabij4q7fqd188wwcs2zfavna8q4cysf783"; depends=[simpleaffy]; };
+zlibbioc = derive { name="zlibbioc"; version="1.15.0"; sha256="1dh5i3r74fy2q5jf31gsy40l3xzig2xqrpligji7aq8r2k4dchqv"; depends=[]; }; 
 }
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 77c075397e1..7ccca09742b 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -1,208 +1,209 @@
-# This file is generated from generate-cran-packages.R. DO NOT EDIT.
+# This file is generated from generate-r-packages.R. DO NOT EDIT.
 # Execute the following command to update the file.
 #
-# Rscript generate-cran-packages.R > cran-packages.nix
+# Rscript generate-r-packages.R cran >new && mv new cran-packages.nix
 
 { self, derive }: with self; {
-A3 = derive { name="A3"; version="0.9.2"; sha256="01s7znhph2mr3snpscci3y7nbcisa6kg6hy7im3742r6ah0z3jv7"; depends=[xtable pbapply]; };
-ABCExtremes = derive { name="ABCExtremes"; version="1.0"; sha256="032bc9a6cxy4war95n8v4vaax3q96k2wryjbcipi3z55b2l8hdny"; depends=[SpatialExtremes combinat]; };
-ABCanalysis = derive { name="ABCanalysis"; version="1.0.1"; sha256="1q1ms76nzg93sf71r0v3d3yx3a8agpccndlv9lz49cr6asa9iwl0"; depends=[Hmisc plotrix]; };
+A3 = derive { name="A3"; version="0.9.2"; sha256="01s7znhph2mr3snpscci3y7nbcisa6kg6hy7im3742r6ah0z3jv7"; depends=[pbapply xtable]; };
+ABCExtremes = derive { name="ABCExtremes"; version="1.0"; sha256="032bc9a6cxy4war95n8v4vaax3q96k2wryjbcipi3z55b2l8hdny"; depends=[combinat SpatialExtremes]; };
+ABCanalysis = derive { name="ABCanalysis"; version="1.0.2"; sha256="1lgf9nhh5a8m4m48l6gd3d3avjqcplp40jzpb7d7y5vgj8cj1bw6"; depends=[Hmisc plotrix]; };
 ABCoptim = derive { name="ABCoptim"; version="0.13.11"; sha256="1j2pbfl5g9x71gq9f7vg6wznsds8sn8dj3q2h5fhjcv58di3gjhl"; depends=[]; };
 ABCp2 = derive { name="ABCp2"; version="1.1"; sha256="0s0lbwlc8nycm7b8vx0v01f8dmy91r1zqcj9zgrlj7dnpg4cpkml"; depends=[MASS]; };
 ACCLMA = derive { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; };
 ACD = derive { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; };
-ACNE = derive { name="ACNE"; version="0.8.0"; sha256="0ps38lljzm2aszqf8fhh74zbdxh46kypmybkw5w7xaf9nv5kcq8g"; depends=[aroma_affymetrix MASS R_methodsS3 R_oo R_utils matrixStats R_filesets aroma_core]; };
+ACNE = derive { name="ACNE"; version="0.8.0"; sha256="0ps38lljzm2aszqf8fhh74zbdxh46kypmybkw5w7xaf9nv5kcq8g"; depends=[aroma_affymetrix aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
 ACTCD = derive { name="ACTCD"; version="1.0-0"; sha256="0zn8f6l5vmn4w1lqjnpcxvfbr2fhwbhdjx4144h3bk71bk9raavl"; depends=[R_methodsS3]; };
 ADDT = derive { name="ADDT"; version="1.0"; sha256="1jx7rxi0yfn34pf3cf9zpf434rapgn5qn2mn5rkq5lysr3kwdw91"; depends=[]; };
 ADGofTest = derive { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; };
 ADM3 = derive { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; };
-ADPclust = derive { name="ADPclust"; version="0.6.3"; sha256="0lr4zkjhqr9azqxnxpxp9i0ppn8wi8ndb61ki7h2dzfgv27fingk"; depends=[dplyr cluster fields knitr]; };
-AER = derive { name="AER"; version="1.2-4"; sha256="0cfhnh6ijwvbywk6falfq852jgx969v35j2l1q3cghwj9yggapbh"; depends=[car lmtest sandwich survival zoo Formula]; };
+ADPclust = derive { name="ADPclust"; version="0.6.3"; sha256="0lr4zkjhqr9azqxnxpxp9i0ppn8wi8ndb61ki7h2dzfgv27fingk"; depends=[cluster dplyr fields knitr]; };
+AER = derive { name="AER"; version="1.2-4"; sha256="0cfhnh6ijwvbywk6falfq852jgx969v35j2l1q3cghwj9yggapbh"; depends=[car Formula lmtest sandwich survival zoo]; };
 AFLPsim = derive { name="AFLPsim"; version="0.3-4"; sha256="0xqp1d3cn8rcrsx0yipqh0k4xynv446acxpcammbflsz01xsgx9v"; depends=[adegenet introgress]; };
 AGD = derive { name="AGD"; version="0.35"; sha256="1dk8m3zqvapwhz0677d3b2cbrin14p9adn5annzgjrxgw7ms4mg0"; depends=[gamlss gamlss_dist]; };
 AGSDest = derive { name="AGSDest"; version="2.2"; sha256="00kf786i72bc4a80qswq1iazwqi709pxvzadgfih511plgir6ik2"; depends=[ldbounds]; };
 AICcmodavg = derive { name="AICcmodavg"; version="2.0-3"; sha256="1a9jbf3vd77hsf98smjgqchhkc9z8qqp12c1mflln3l0pxx0vk8q"; depends=[lattice MASS Matrix nlme unmarked VGAM xtable]; };
-AID = derive { name="AID"; version="1.5"; sha256="0fpgq2ahl0mdj0sb0p39z2ksslsiwm3hma8d09jmggi3yjbrgqq7"; depends=[MASS tseries nortest]; };
-AIM = derive { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival survival]; };
+AID = derive { name="AID"; version="1.5"; sha256="0fpgq2ahl0mdj0sb0p39z2ksslsiwm3hma8d09jmggi3yjbrgqq7"; depends=[MASS nortest tseries]; };
+AIM = derive { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival]; };
 ALDqr = derive { name="ALDqr"; version="0.5"; sha256="0294d6cjfl5m63jhrv4rbh7npwrbmmw5101jz5bbwihhj94qcxp9"; depends=[HyperbolicDist]; };
-ALKr = derive { name="ALKr"; version="0.5.3.1"; sha256="09df3vx2q0sn8fwz2cc9lckzwrf2hgbglzyn376d6nkrm6gq792a"; depends=[MASS Rcpp Rcpp]; };
-ALS = derive { name="ALS"; version="0.0.5"; sha256="1ryviknpf7c0v20bmc40khhmx51b83hbh9q9iwz9d694by51xryc"; depends=[nnls Iso]; };
+ALKr = derive { name="ALKr"; version="0.5.3.1"; sha256="09df3vx2q0sn8fwz2cc9lckzwrf2hgbglzyn376d6nkrm6gq792a"; depends=[MASS Rcpp]; };
+ALS = derive { name="ALS"; version="0.0.5"; sha256="1ryviknpf7c0v20bmc40khhmx51b83hbh9q9iwz9d694by51xryc"; depends=[Iso nnls]; };
 ALSCPC = derive { name="ALSCPC"; version="1.0"; sha256="0ippxzq5qwb9dnpvm1kxhc0fxh83rs9ny5rcvd30w2bp632q9qdx"; depends=[]; };
 ALTopt = derive { name="ALTopt"; version="0.1.0"; sha256="0vdn535x199m95gs715i42p0cf9zlj74s7xgxly7aknr0l2ypl2c"; depends=[cubature lattice]; };
 AMAP_Seq = derive { name="AMAP.Seq"; version="1.0"; sha256="0z0rrzps6rm58k4m1ybg77s3w05m5zfya4x8ril78ksxsjwi3636"; depends=[]; };
 AMGET = derive { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy44fb2n5gpghwcrx80knnicy3dxq"; depends=[]; };
-AMOEBA = derive { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[snowfall rlecuyer spdep]; };
+AMOEBA = derive { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; };
 AMORE = derive { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; };
 AOfamilies = derive { name="AOfamilies"; version="1.01"; sha256="0v3b83k12lsrdcrkjl2ff38d0g8sbrnm5pmm9xphyrk3lfgap76k"; depends=[lqmm quantreg]; };
-APSIM = derive { name="APSIM"; version="0.8.0"; sha256="0ph4wl6c9jy2w0w3yh8ba12nqbsldicpn2aii675vrvdrx36vwn7"; depends=[data_table lubridate stringr plyr sirad]; };
+APSIM = derive { name="APSIM"; version="0.8.0"; sha256="0ph4wl6c9jy2w0w3yh8ba12nqbsldicpn2aii675vrvdrx36vwn7"; depends=[data_table lubridate plyr sirad stringr]; };
 APSIMBatch = derive { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; };
 AR1seg = derive { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; };
 ARPobservation = derive { name="ARPobservation"; version="1.1"; sha256="1cdhn11jf1nf03jyvs17ygmjq9pb5rvmyyrq9fp7ifmvcgbkwsms"; depends=[]; };
-ARTIVA = derive { name="ARTIVA"; version="1.2.3"; sha256="1jdvsslc8parz7wibcv51fx62brl2mc6i482hz43j1npsms2z1hl"; depends=[MASS igraph gplots]; };
+ARTIVA = derive { name="ARTIVA"; version="1.2.3"; sha256="1jdvsslc8parz7wibcv51fx62brl2mc6i482hz43j1npsms2z1hl"; depends=[gplots igraph MASS]; };
 ARTP = derive { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; };
-ARTool = derive { name="ARTool"; version="0.9.5"; sha256="1wfan4v3498libqgjdgn4l4ihf1khp3smj0lmyxd7vb4iaawlzci"; depends=[lme4 car plyr pbkrtest]; };
-ASMap = derive { name="ASMap"; version="0.4-1"; sha256="0nslmzhf99vl1zkp702xgcrd36xvis45yb5b0hx0mvf4dfv233lm"; depends=[qtl gtools fields lattice]; };
-ASPBay = derive { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp Rcpp RcppArmadillo]; };
+ARTool = derive { name="ARTool"; version="0.9.5"; sha256="1wfan4v3498libqgjdgn4l4ihf1khp3smj0lmyxd7vb4iaawlzci"; depends=[car lme4 pbkrtest plyr]; };
+ASMap = derive { name="ASMap"; version="0.4-1"; sha256="0nslmzhf99vl1zkp702xgcrd36xvis45yb5b0hx0mvf4dfv233lm"; depends=[fields gtools lattice qtl]; };
+ASPBay = derive { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp RcppArmadillo]; };
 ATE = derive { name="ATE"; version="0.2.0"; sha256="1i46ivb7q61kq11z9v1rlnwad914nsdjcz9bagqx17vjk160mc0a"; depends=[]; };
 ATmet = derive { name="ATmet"; version="1.2"; sha256="047ibxxf5si45zw22zy8a1kpj36q0pd3bsmxwvn0dhf4h65ah0zz"; depends=[DiceDesign lhs metRology msm sensitivity]; };
 AUC = derive { name="AUC"; version="0.3.0"; sha256="0ripcib2qz0m7rgr1kiz68nx8f6p408l1ww7j78ljqik7p3g41g7"; depends=[]; };
 AUCRF = derive { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; };
 AcceptanceSampling = derive { name="AcceptanceSampling"; version="1.0-3"; sha256="1camxmvz8prkvpf3d3rc07bnfphakwdlickqlr4sgzrs4k27rr4f"; depends=[]; };
 Actigraphy = derive { name="Actigraphy"; version="1.2"; sha256="02xxmzjqym46q0fzddmy29i8la9knrna3b46y8849nmbpqvmp3qn"; depends=[fda lattice SDMTools]; };
-ActuDistns = derive { name="ActuDistns"; version="3.0"; sha256="04rff9czcgac80clpv32a1dl0jbyvfsa7wqxyywgk99w672x50i2"; depends=[reliaR actuar hypergeo]; };
+ActuDistns = derive { name="ActuDistns"; version="3.0"; sha256="04rff9czcgac80clpv32a1dl0jbyvfsa7wqxyywgk99w672x50i2"; depends=[actuar hypergeo reliaR]; };
 AdMit = derive { name="AdMit"; version="2.0.1"; sha256="0bqzq2pf5449qyr8ff5d3sq0lbsph29ppv6zzf1rbjz06sc5d6ff"; depends=[mvtnorm]; };
-AdaptFit = derive { name="AdaptFit"; version="0.2-2"; sha256="124lj1sq5cbp35z4ybkc7ci3fi6pgf8pc5k9mpqmyb6dj870q836"; depends=[SemiPar MASS nlme cluster]; };
-AdaptFitOS = derive { name="AdaptFitOS"; version="0.54"; sha256="0h9jfq9mk5wd6v6an40l3sk2adn6fcaks22bi8d9s7zr2ldpzrjq"; depends=[SemiPar nlme MASS mgcv]; };
-AdaptiveSparsity = derive { name="AdaptiveSparsity"; version="1.4"; sha256="1az7isvalf3kmdiycrfl6s9k9xqk22k1mc6rh8v0jmcz402qyq8z"; depends=[Rcpp Rcpp RcppArmadillo]; };
+AdaptFit = derive { name="AdaptFit"; version="0.2-2"; sha256="124lj1sq5cbp35z4ybkc7ci3fi6pgf8pc5k9mpqmyb6dj870q836"; depends=[cluster MASS nlme SemiPar]; };
+AdaptFitOS = derive { name="AdaptFitOS"; version="0.62"; sha256="0cxl58by9mfd6hf4hb2d5qnm0pgb0gplgg7mm0qhvckvghjpb00q"; depends=[MASS mgcv nlme SemiPar]; };
+AdaptiveSparsity = derive { name="AdaptiveSparsity"; version="1.4"; sha256="1az7isvalf3kmdiycrfl6s9k9xqk22k1mc6rh8v0jmcz402qyq8z"; depends=[Rcpp RcppArmadillo]; };
 AdequacyModel = derive { name="AdequacyModel"; version="1.0.8"; sha256="1bpb6lwgkh5g82h4yaf5dh2jbl6f0vz36k22538rhb3kdld6w0i3"; depends=[]; };
 Agreement = derive { name="Agreement"; version="0.8-1"; sha256="1g29rxr8xsr0dh2r6c6j2bqs0q6snz9wz0hrnb92cxj27ili55yq"; depends=[R2HTML]; };
 Ake = derive { name="Ake"; version="1.0"; sha256="1dj598xfdyjqvysc39a0d5gizgk367c5lkddmwmsqa8zjmvpr15a"; depends=[]; };
 AlgDesign = derive { name="AlgDesign"; version="1.1-7.3"; sha256="0bl7mx4dnmkgs2x1fj7cqnrp7jx18mqwxyga0rzlniq12h8mc3fz"; depends=[]; };
 AllPossibleSpellings = derive { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; };
 AlleleRetain = derive { name="AlleleRetain"; version="1.3.1"; sha256="1k2iwns1wk5n02cii6p9prgdb6asys3vwiq5dq2i26fk2xr6j4gq"; depends=[]; };
-Amelia = derive { name="Amelia"; version="1.7.3"; sha256="07agkgg4jdjk4kxf87nck7dyihpf2l4pmpf20a7ld9c83is14ib1"; depends=[Rcpp foreign Rcpp RcppArmadillo]; };
+Amelia = derive { name="Amelia"; version="1.7.3"; sha256="07agkgg4jdjk4kxf87nck7dyihpf2l4pmpf20a7ld9c83is14ib1"; depends=[foreign Rcpp RcppArmadillo]; };
 AmericanCallOpt = derive { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; };
 AmpliconDuo = derive { name="AmpliconDuo"; version="1.0"; sha256="0l6p5c2802a1f3b77cdrrk3wdf41926mh34630p462fb3wqipps0"; depends=[ggplot2 xtable]; };
-AnDE = derive { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization functional foreign stringr]; };
-AnalyzeFMRI = derive { name="AnalyzeFMRI"; version="1.1-16"; sha256="1mbjb682ns5230jd3vcvd6x4gnn9hpbmjd7r8120y4sp2g733b0f"; depends=[R_matlab fastICA]; };
+AnDE = derive { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization foreign functional stringr]; };
+AnalyzeFMRI = derive { name="AnalyzeFMRI"; version="1.1-16"; sha256="1mbjb682ns5230jd3vcvd6x4gnn9hpbmjd7r8120y4sp2g733b0f"; depends=[fastICA R_matlab]; };
 AncestryMapper = derive { name="AncestryMapper"; version="1.2"; sha256="0d47vkf59ysa58wnlqkshsvdzhcppb9xc1agwkxv37jv1asllb67"; depends=[]; };
 AnglerCreelSurveySimulation = derive { name="AnglerCreelSurveySimulation"; version="0.2.1"; sha256="100mbmdllk6c32j75jviz2k9kmwca3jvrqb95a555alfcpkfim8c"; depends=[]; };
 AnnotLists = derive { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; };
-AntWeb = derive { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[rjson plyr assertthat httr leafletR]; };
+AntWeb = derive { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; };
 AnthropMMD = derive { name="AnthropMMD"; version="0.9.9"; sha256="10wn0fkcli5yz3fhngsz8sg1mfllqkvjrpjggd9qynay2zrpiw1n"; depends=[tcltk2]; };
-Anthropometry = derive { name="Anthropometry"; version="1.2"; sha256="15689jy85kf8j9w8yhffjfjw3lsdlv2w99za32p33shp32f3rvjz"; depends=[shapes rgl archetypes nnls depth FNN ICGE cluster biclust]; };
-ApacheLogProcessor = derive { name="ApacheLogProcessor"; version="0.1.5"; sha256="1xnx6syn365s4w4pks7xq6rng7hk30xln8hvszxwhwfnkzr8qqn2"; depends=[foreach doParallel]; };
+Anthropometry = derive { name="Anthropometry"; version="1.2"; sha256="15689jy85kf8j9w8yhffjfjw3lsdlv2w99za32p33shp32f3rvjz"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; };
+ApacheLogProcessor = derive { name="ApacheLogProcessor"; version="0.1.5"; sha256="1xnx6syn365s4w4pks7xq6rng7hk30xln8hvszxwhwfnkzr8qqn2"; depends=[doParallel foreach]; };
 AppliedPredictiveModeling = derive { name="AppliedPredictiveModeling"; version="1.1-6"; sha256="004d2k3mhl45inb7kx1ph8xc8h9bgm7f7l3prmvqrl5792400cn4"; depends=[CORElearn MASS plyr reshape2]; };
-AquaEnv = derive { name="AquaEnv"; version="1.0-3"; sha256="1hkygw09w70im9f6l6q5yxk86mdl5pkczqfqrwc4wl1yhz7z1gjb"; depends=[minpack_lm deSolve]; };
+AquaEnv = derive { name="AquaEnv"; version="1.0-3"; sha256="1hkygw09w70im9f6l6q5yxk86mdl5pkczqfqrwc4wl1yhz7z1gjb"; depends=[deSolve minpack_lm]; };
 ArArRedux = derive { name="ArArRedux"; version="0.1"; sha256="1fgll399plraijbh1xrhf1nmc308daqhhsi5krq2lm7q2cn584pc"; depends=[]; };
 ArDec = derive { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; };
-ArfimaMLM = derive { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[lme4 fractal fracdiff]; };
+ArfimaMLM = derive { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[fracdiff fractal lme4]; };
 ArgumentCheck = derive { name="ArgumentCheck"; version="0.9.0"; sha256="1gyc6bx6sfp7k8cp43l6fic4rfn729h6kl5zqs3ypf4425s7jm3f"; depends=[]; };
-ArrayBin = derive { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[]; };
-AssetPricing = derive { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[polynom deSolve]; };
+ArrayBin = derive { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[SAGx]; };
+AssetPricing = derive { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[deSolve polynom]; };
 AssotesteR = derive { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; };
 AsynchLong = derive { name="AsynchLong"; version="1.0"; sha256="097d0zvzjkz3v32qhxdir0xv7kbjkhzy6q5k54w8l4fa2632j3mk"; depends=[]; };
-AtelieR = derive { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58xg9wvqcril8j8yd61lkkmz4b3195zai"; depends=[proto cairoDevice gWidgetsRGtk2 partitions]; };
+AtelieR = derive { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58xg9wvqcril8j8yd61lkkmz4b3195zai"; depends=[cairoDevice gWidgetsRGtk2 partitions proto]; };
 AtmRay = derive { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; };
-AutoSEARCH = derive { name="AutoSEARCH"; version="1.5"; sha256="1s2ldhxijd8n9ba78faik6gn4f07pdzksy0030pqyafxlr3v1qdj"; depends=[zoo lgarch]; };
-B2Z = derive { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[numDeriv coda mvtnorm]; };
-BACA = derive { name="BACA"; version="1.3"; sha256="1vbip7wbzix1s2izbm4058wmwar7w5rv3q8bmj9pm7hcapfi19k0"; depends=[ggplot2 rJava]; };
-BACCO = derive { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[emulator calibrator approximator]; };
-BACprior = derive { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[mvtnorm leaps boot]; };
+AutoSEARCH = derive { name="AutoSEARCH"; version="1.5"; sha256="1s2ldhxijd8n9ba78faik6gn4f07pdzksy0030pqyafxlr3v1qdj"; depends=[lgarch zoo]; };
+B2Z = derive { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[coda mvtnorm numDeriv]; };
+BACA = derive { name="BACA"; version="1.3"; sha256="1vbip7wbzix1s2izbm4058wmwar7w5rv3q8bmj9pm7hcapfi19k0"; depends=[ggplot2 RDAVIDWebService rJava]; };
+BACCO = derive { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[approximator calibrator emulator]; };
+BACprior = derive { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[boot leaps mvtnorm]; };
 BAEssd = derive { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; };
 BAMMtools = derive { name="BAMMtools"; version="2.0.5"; sha256="1xrhif8872w5rwiba5lc705162si3vflri2r6wj8n69qg979kvw0"; depends=[ape]; };
-BANFF = derive { name="BANFF"; version="0.3"; sha256="0z7hwplp12m8sypkndjkjkmanbh67h47k8j9wm60qg6nnyqry9np"; depends=[foreach doParallel DPpackage igraph mclust pscl tmvtnorm network coda]; };
-BANOVA = derive { name="BANOVA"; version="0.2"; sha256="1zgn9wxh4c89rris58hhj5fh37mmy8wjvligr02id7a1pcw177m3"; depends=[rjags runjags coda]; };
+BANFF = derive { name="BANFF"; version="0.3"; sha256="0z7hwplp12m8sypkndjkjkmanbh67h47k8j9wm60qg6nnyqry9np"; depends=[coda doParallel DPpackage foreach igraph mclust network pscl tmvtnorm]; };
+BANOVA = derive { name="BANOVA"; version="0.2"; sha256="1zgn9wxh4c89rris58hhj5fh37mmy8wjvligr02id7a1pcw177m3"; depends=[coda rjags runjags]; };
 BASIX = derive { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; };
-BAT = derive { name="BAT"; version="1.3.0"; sha256="0a8l3hzlgxyp604dg20qm9hvxl97dyh1lm0hj85p6s6nz0qwi8jy"; depends=[vegan spatstat nls2]; };
-BAYSTAR = derive { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[mvtnorm coda]; };
+BAT = derive { name="BAT"; version="1.3.0"; sha256="0a8l3hzlgxyp604dg20qm9hvxl97dyh1lm0hj85p6s6nz0qwi8jy"; depends=[nls2 spatstat vegan]; };
+BAYSTAR = derive { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[coda mvtnorm]; };
 BB = derive { name="BB"; version="2014.10-1"; sha256="1lig3vxhyxy8cnic5bczms8pajmdvwr2ijad1rkdndpglving7x0"; depends=[quadprog]; };
-BBEST = derive { name="BBEST"; version="0.1-4"; sha256="0yqsz97lljlydhphiy0fb7vwbqxpjzn5v0v665c39dlprxv3jg3b"; depends=[DEoptim wmtsa ggplot2 reshape2 shiny]; };
+BBEST = derive { name="BBEST"; version="0.1-4"; sha256="0yqsz97lljlydhphiy0fb7vwbqxpjzn5v0v665c39dlprxv3jg3b"; depends=[DEoptim ggplot2 reshape2 shiny wmtsa]; };
 BBMM = derive { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; };
-BBRecapture = derive { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI locfit lme4 secr]; };
+BBRecapture = derive { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI lme4 locfit secr]; };
 BBmisc = derive { name="BBmisc"; version="1.9"; sha256="01ihbx6cfgqvz87kpy7yb9c7jlizdym3f0n16967x2imq73dazsb"; depends=[checkmate]; };
-BCA = derive { name="BCA"; version="0.9-3"; sha256="0ksd6b0ykydgdn33x29bwwqkrp23cvdj3imps0l6qs1p4465j5nf"; depends=[RcmdrMisc Rcmdr car rpart flexclust clv]; };
+BCA = derive { name="BCA"; version="0.9-3"; sha256="0ksd6b0ykydgdn33x29bwwqkrp23cvdj3imps0l6qs1p4465j5nf"; depends=[car clv flexclust Rcmdr RcmdrMisc rpart]; };
 BCBCSF = derive { name="BCBCSF"; version="1.0-0"; sha256="1ag8wz8a9vh1x4jgppimgchfs53rr6hbg5xzzr6k2h4bfsg7pmn3"; depends=[abind]; };
 BCDating = derive { name="BCDating"; version="0.9.7"; sha256="0z3a95sc481p0n33mhg7qlsf1jynbm1vbfds0n03bsjrwvqkzpb2"; depends=[]; };
 BCE = derive { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; };
 BCEA = derive { name="BCEA"; version="2.1-1"; sha256="1j2zb2icv5b6kwgbjzvidbzvciag89227ina6qcb2m4g6spyxcrm"; depends=[]; };
 BCEs0 = derive { name="BCEs0"; version="1.1"; sha256="0q63bkmk0kk9p5d3xb0f5srzfrbr743isyw4v2h9ch5yyxizcizb"; depends=[]; };
 BCRA = derive { name="BCRA"; version="1.0"; sha256="1bbxh1kf35h31c4k565kk6grdhp5pnn8vr3nr6vnp32dp4pc05zh"; depends=[]; };
-BDgraph = derive { name="BDgraph"; version="2.18"; sha256="08cm4lk587ffrbr57s4krvwgb7fdpnd767g4adnadq0hv0r27xqq"; depends=[Matrix igraph]; };
+BDgraph = derive { name="BDgraph"; version="2.19"; sha256="1z1ah2d5mjdfqgi00p2jlslhfd256ksijg3nk307594k2c8psqfp"; depends=[igraph Matrix]; };
 BEANSP = derive { name="BEANSP"; version="1.0"; sha256="0xcb81pk3iidb3dz9l4hm6cwx8hrbg5qz0sfi59yx2f7nsazr4xk"; depends=[]; };
-BEDASSLE = derive { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[MASS matrixcalc emdbook]; };
-BEQI2 = derive { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[knitr markdown jsonlite xtable plyr reshape2]; };
-BEST = derive { name="BEST"; version="0.2.2"; sha256="160lvrd0zjm1lr8llra6lyz3qsmqhn3bpdlmwingwfimbpb754rz"; depends=[rjags coda]; };
+BEDASSLE = derive { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; };
+BEQI2 = derive { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[jsonlite knitr markdown plyr reshape2 xtable]; };
+BEST = derive { name="BEST"; version="0.2.2"; sha256="160lvrd0zjm1lr8llra6lyz3qsmqhn3bpdlmwingwfimbpb754rz"; depends=[coda rjags]; };
 BGLR = derive { name="BGLR"; version="1.0.4"; sha256="1bvk8iifvrcvnb0f1k3v9xxajljsz79ck95191p8alnda64cz0zf"; depends=[]; };
 BGPhazard = derive { name="BGPhazard"; version="1.2.2"; sha256="1v89pjigrjkin9vsf6sa0qhwxvn1a3dy2gqwq3sd9v6y0hrld6ng"; depends=[survival]; };
 BGSIMD = derive { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; };
 BH = derive { name="BH"; version="1.58.0-1"; sha256="17rnwyw9ib2pvm60iixzkbz7ff4fslpifp1nlx4czp42hy67kqpf"; depends=[]; };
 BHH2 = derive { name="BHH2"; version="2012.04-0"; sha256="10ixvjpkqamlddrndpnw5gsdm4gdhp693jdvc0f774ngmf32rbaa"; depends=[]; };
-BHMSMAfMRI = derive { name="BHMSMAfMRI"; version="1.0"; sha256="0j5ivknsr441clgm0b95f2rz4pr29ixvw3dgsi8nb0ffh52dgz7q"; depends=[fmri AnalyzeFMRI wavethresh]; };
-BIFIEsurvey = derive { name="BIFIEsurvey"; version="1.2-6"; sha256="1fin5dr1xxr617i4ysfx39gaw6ygbcm4h7j1l38kqnfz18hn6xsq"; depends=[Rcpp miceadds mitools TAM Rcpp RcppArmadillo]; };
+BHMSMAfMRI = derive { name="BHMSMAfMRI"; version="1.0"; sha256="0j5ivknsr441clgm0b95f2rz4pr29ixvw3dgsi8nb0ffh52dgz7q"; depends=[AnalyzeFMRI fmri wavethresh]; };
+BIFIEsurvey = derive { name="BIFIEsurvey"; version="1.2-6"; sha256="1fin5dr1xxr617i4ysfx39gaw6ygbcm4h7j1l38kqnfz18hn6xsq"; depends=[miceadds mitools Rcpp RcppArmadillo TAM]; };
+BIGDAWG = derive { name="BIGDAWG"; version="1.1"; sha256="0rgk2w7d8qq2dahfmiv81v1ydm1by6nabjzjb6iabfk0b8bnwqy2"; depends=[haplo_stats XML]; };
 BIOM_utils = derive { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; };
-BIPOD = derive { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp Rcpp RcppArmadillo]; };
-BLCOP = derive { name="BLCOP"; version="0.3.1"; sha256="1qfkljw5b1k4b5jd08hw6dsmvgr7vg3kjyib5s13q0mkxvclasym"; depends=[MASS quadprog RUnit timeSeries fBasics fMultivar fPortfolio]; };
+BIPOD = derive { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp RcppArmadillo]; };
+BLCOP = derive { name="BLCOP"; version="0.3.1"; sha256="1qfkljw5b1k4b5jd08hw6dsmvgr7vg3kjyib5s13q0mkxvclasym"; depends=[fBasics fMultivar fPortfolio MASS quadprog RUnit timeSeries]; };
 BLR = derive { name="BLR"; version="1.4"; sha256="0wy3c8nnzkdhwb5s1ygdid47hpdx72ryim36mnicrydy0msjivja"; depends=[SuppDists]; };
-BMA = derive { name="BMA"; version="3.18.1"; sha256="0ppcjjcrjrs18lp55hrs0ad7x052v57wd0zdfmvyydlsjbgnsx1p"; depends=[survival leaps robustbase inline]; };
+BMA = derive { name="BMA"; version="3.18.1"; sha256="0ppcjjcrjrs18lp55hrs0ad7x052v57wd0zdfmvyydlsjbgnsx1p"; depends=[inline leaps robustbase survival]; };
 BMN = derive { name="BMN"; version="1.02"; sha256="12gyq01cn6a9ixqgki1ihx5jrp2gw6jdj7q210rb12xlvj3p6x7w"; depends=[]; };
 BMS = derive { name="BMS"; version="0.3.3"; sha256="1yj9vi8jvhkwpcjkclf0zbah0dayridklpj65ay6r18fyf4crnd2"; depends=[]; };
 BMhyd = derive { name="BMhyd"; version="1.2-2"; sha256="09gb1pq9y3gq9avpaqrlxdsm9iqsxpbnr0bg2mw1vkhc0d5z8zv7"; depends=[corpcor numDeriv]; };
 BNDataGenerator = derive { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; };
-BNPTSclust = derive { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[mvtnorm MASS]; };
+BNPTSclust = derive { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[MASS mvtnorm]; };
 BNPdensity = derive { name="BNPdensity"; version="2015.5"; sha256="0jgdc9dayc57y77bb2yjcn1pb5ahrvbrsmyjkhyl4365sn5njzl8"; depends=[]; };
 BNSP = derive { name="BNSP"; version="1.0.3"; sha256="1q7nxl1lx57dzb5yfpb0966ylyl15x22y9r78r6pxrprrbsnv931"; depends=[]; };
-BOG = derive { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[hash DIME]; };
+BOG = derive { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
 BOIN = derive { name="BOIN"; version="1.1"; sha256="1ffr6w9ml0mkffgg1vds8fmf8ww7rs375pxk2dqv9nlb9061m97r"; depends=[]; };
 BRugs = derive { name="BRugs"; version="0.8-4"; sha256="0bd5m4nfj25bhjy0d96kna50h5a5a2mdxrl21c1kvxmiwxcx4wrs"; depends=[coda]; };
 BSDA = derive { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; };
-BSGS = derive { name="BSGS"; version="1.0"; sha256="11r7bx9ax84iv3gam02p1hg174ni3d3gv6yj64n0gp2gaj438hv7"; depends=[MASS pscl plyr]; };
+BSGS = derive { name="BSGS"; version="1.0"; sha256="11r7bx9ax84iv3gam02p1hg174ni3d3gv6yj64n0gp2gaj438hv7"; depends=[MASS plyr pscl]; };
 BSGW = derive { name="BSGW"; version="0.9"; sha256="0df5d0d0kfvwavxbxra36jjs9044q1szq1xm37dvh4wfvvv6igmb"; depends=[survival]; };
 BSSasymp = derive { name="BSSasymp"; version="1.1-0"; sha256="0z3abgvbpmwgzb6b6r5ys3msy97lfdg81p8d19c83aaa6hrngggn"; depends=[fICA JADE]; };
-BSagri = derive { name="BSagri"; version="0.1-8"; sha256="148pr4lkgdi4bwc9lavgj356nh240iazz28xklq14rw4gzhmz2k4"; depends=[gamlss multcomp MCPAN mvtnorm boot mratios]; };
+BSagri = derive { name="BSagri"; version="0.1-8"; sha256="148pr4lkgdi4bwc9lavgj356nh240iazz28xklq14rw4gzhmz2k4"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; };
 BSquare = derive { name="BSquare"; version="1.1"; sha256="1s16307m5gj60nv4m652iisyqi3jw5pmnvar6f52rw1sypfp5n49"; depends=[quadprog quantreg VGAM]; };
-BTSPAS = derive { name="BTSPAS"; version="2014.0901"; sha256="0ankkhm38rvq06g0jnbvjbja4jv8lg21dsc0rxsy174b1i6vjhwi"; depends=[coda actuar rjags R2OpenBUGS ggplot2 plyr]; };
+BTSPAS = derive { name="BTSPAS"; version="2014.0901"; sha256="0ankkhm38rvq06g0jnbvjbja4jv8lg21dsc0rxsy174b1i6vjhwi"; depends=[actuar coda ggplot2 plyr R2OpenBUGS rjags]; };
 BTYD = derive { name="BTYD"; version="2.4"; sha256="13szcsgsrd7mwc4f47xrfrmsm2sg5sf7pfm21ly4cbvqcz8m0147"; depends=[hypergeo Matrix]; };
-BVS = derive { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[MASS msm haplo_stats]; };
-BaBooN = derive { name="BaBooN"; version="0.1-6"; sha256="1splid5mvyd04d1lxkq45md910ry6n516cph20j6vqfhla0arxjg"; depends=[MASS nnet]; };
-BaM = derive { name="BaM"; version="0.99"; sha256="1q04va2s876ydlmaalx63r520pfx1qzpjg6hbnl9pvn86b5grnf4"; depends=[bayesm coda MASS mice survival foreign nnet]; };
+BVS = derive { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[haplo_stats MASS msm]; };
+BaBooN = derive { name="BaBooN"; version="0.2-0"; sha256="145q2kabjks2ql3m48sfjis5y35l8rcqnr5s176viv9yhfafn351"; depends=[coda Hmisc MASS nnet Rcpp RcppArmadillo]; };
+BaM = derive { name="BaM"; version="0.99"; sha256="1q04va2s876ydlmaalx63r520pfx1qzpjg6hbnl9pvn86b5grnf4"; depends=[bayesm coda foreign MASS mice nnet survival]; };
 BaSTA = derive { name="BaSTA"; version="1.9.3"; sha256="1jfki5lnsvd6fjrld2qp179lyzli61pi2308lkkl1h6vgp11zp2v"; depends=[msm]; };
-BalancedSampling = derive { name="BalancedSampling"; version="1.4"; sha256="0l8jxszd0j27kb58xrn7lvf52mhifqjd1w42cp4kdiax8c6s7421"; depends=[Rcpp Rcpp]; };
-BatchExperiments = derive { name="BatchExperiments"; version="1.4.1"; sha256="0fg7p0q6avc0kcwcd3z4q3akrr2mkrx2yf9zcd6hhz22l3x4aphz"; depends=[BatchJobs checkmate BBmisc DBI RSQLite plyr]; };
+BalancedSampling = derive { name="BalancedSampling"; version="1.4"; sha256="0l8jxszd0j27kb58xrn7lvf52mhifqjd1w42cp4kdiax8c6s7421"; depends=[Rcpp]; };
+BatchExperiments = derive { name="BatchExperiments"; version="1.4.1"; sha256="0fg7p0q6avc0kcwcd3z4q3akrr2mkrx2yf9zcd6hhz22l3x4aphz"; depends=[BatchJobs BBmisc checkmate DBI plyr RSQLite]; };
 BatchJobs = derive { name="BatchJobs"; version="1.6"; sha256="1kb99024jih5bycc226bl4jyvbbl1sg72q3m2wnlshl7s8p6vva0"; depends=[BBmisc brew checkmate DBI digest fail RSQLite sendmailR stringr]; };
 BayClone2 = derive { name="BayClone2"; version="1.1"; sha256="1wprdj22zh8fwqawcv4m2n2y7sqwh2f6m9b0cq0rp4ll774yz30i"; depends=[combinat]; };
 BayHap = derive { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; };
 BayHaz = derive { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; };
-BaySIC = derive { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[rjags fields poibin]; };
+BaySIC = derive { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; };
 BayesBridge = derive { name="BayesBridge"; version="0.6"; sha256="1j03m465pwq0lhbrfvddjglrzs6px7bc89yvfzj776amm7myqd0l"; depends=[]; };
-BayesCR = derive { name="BayesCR"; version="2.0"; sha256="0cafind5vz81ryw1c7324hyfc6922fsxmjnvddb4mrhis54id2r4"; depends=[mvtnorm Rlab truncdist mnormt rootSolve]; };
-BayesComm = derive { name="BayesComm"; version="0.1-0"; sha256="17hnq4z451g2j3p73awllihhwsdy3grh6ki3qy9bkr064wvzbvcj"; depends=[Rcpp RcppArmadillo coda Rcpp RcppArmadillo]; };
+BayesCR = derive { name="BayesCR"; version="2.0"; sha256="0cafind5vz81ryw1c7324hyfc6922fsxmjnvddb4mrhis54id2r4"; depends=[mnormt mvtnorm Rlab rootSolve truncdist]; };
+BayesComm = derive { name="BayesComm"; version="0.1-0"; sha256="17hnq4z451g2j3p73awllihhwsdy3grh6ki3qy9bkr064wvzbvcj"; depends=[coda Rcpp RcppArmadillo]; };
 BayesDA = derive { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; };
-BayesFactor = derive { name="BayesFactor"; version="0.9.11-1"; sha256="0vq656q38vlf0ba8g23psk8as1y48y6s8yrvqrppbjx5d9wlm9wv"; depends=[coda Matrix pbapply mvtnorm stringr gtools MatrixModels Rcpp Rcpp RcppEigen]; };
-BayesGESM = derive { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[GIGrvg normalp Formula]; };
-BayesLCA = derive { name="BayesLCA"; version="1.7"; sha256="0lsqgjqal9092v1wr07p8g5cqm24k2d80sp7hlr7r1xknakmm1b6"; depends=[e1071 coda fields nlme MCMCpack]; };
+BayesFactor = derive { name="BayesFactor"; version="0.9.11-1"; sha256="0vq656q38vlf0ba8g23psk8as1y48y6s8yrvqrppbjx5d9wlm9wv"; depends=[coda gtools Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; };
+BayesGESM = derive { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; };
+BayesLCA = derive { name="BayesLCA"; version="1.7"; sha256="0lsqgjqal9092v1wr07p8g5cqm24k2d80sp7hlr7r1xknakmm1b6"; depends=[coda e1071 fields MCMCpack nlme]; };
 BayesLogit = derive { name="BayesLogit"; version="0.5.1"; sha256="0nr215wzhqlfi32617mmqb6i3w5x1kh5fiy68k0xzdqjsyjr65m0"; depends=[]; };
-BayesMed = derive { name="BayesMed"; version="1.0.1"; sha256="1ysc7sh0drqxbisi2dz6gj4jlw6qsd879bbhr5pra7nxgmk4h650"; depends=[R2jags QRM polspline MCMCpack]; };
+BayesMed = derive { name="BayesMed"; version="1.0.1"; sha256="1ysc7sh0drqxbisi2dz6gj4jlw6qsd879bbhr5pra7nxgmk4h650"; depends=[MCMCpack polspline QRM R2jags]; };
 BayesMixSurv = derive { name="BayesMixSurv"; version="0.9"; sha256="0hqkqpzk21d2zh7pyn042w1s51wyszkmam0rwzgy0i9i51zjxwvz"; depends=[survival]; };
 BayesNI = derive { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; };
-BayesSAE = derive { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[Formula coda lattice]; };
-BayesSingleSub = derive { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda mvtnorm MCMCpack]; };
-BayesSummaryStatLM = derive { name="BayesSummaryStatLM"; version="1.0-1"; sha256="05mlgyi4fglvjkpqyw3vcjpipqllx37svcb20c1mrsa46m6fm4s7"; depends=[mvnfast ff]; };
+BayesSAE = derive { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[coda Formula lattice]; };
+BayesSingleSub = derive { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda MCMCpack mvtnorm]; };
+BayesSummaryStatLM = derive { name="BayesSummaryStatLM"; version="1.0-1"; sha256="05mlgyi4fglvjkpqyw3vcjpipqllx37svcb20c1mrsa46m6fm4s7"; depends=[ff mvnfast]; };
 BayesTree = derive { name="BayesTree"; version="0.3-1.2"; sha256="1if6x7xxs8pv37c3w4yij17gxnf63k83lawzlmd2644w1i6p7sw1"; depends=[nnet]; };
 BayesValidate = derive { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; };
 BayesVarSel = derive { name="BayesVarSel"; version="1.6.1"; sha256="1pmhbyvsq4k2kqnbnxm089qxil0ac61msa204pck6r0b360pmpnh"; depends=[MASS]; };
-BayesX = derive { name="BayesX"; version="0.2-9"; sha256="0p170m8zkaspiah1fdyql9lj9yqg6sl525blzq7wwgx5wx4rvncs"; depends=[shapefiles sp maptools colorspace coda]; };
+BayesX = derive { name="BayesX"; version="0.2-9"; sha256="0p170m8zkaspiah1fdyql9lj9yqg6sl525blzq7wwgx5wx4rvncs"; depends=[coda colorspace maptools shapefiles sp]; };
 BayesXsrc = derive { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[]; };
 BayesianAnimalTracker = derive { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; };
-Bayesianbetareg = derive { name="Bayesianbetareg"; version="1.2"; sha256="0imsz2761ngbnap0vnxks9527la51m5g8gkkn1vrgwis43i6qcgs"; depends=[mvtnorm betareg]; };
-Bayesthresh = derive { name="Bayesthresh"; version="2.0.1"; sha256="0w26h1ragqcg1i4h7c2y6vd8fig2jb2zrnvvchgg5z2hg9qdplsf"; depends=[lme4 MASS VGAM mvtnorm matrixcalc coda]; };
+Bayesianbetareg = derive { name="Bayesianbetareg"; version="1.2"; sha256="0imsz2761ngbnap0vnxks9527la51m5g8gkkn1vrgwis43i6qcgs"; depends=[betareg mvtnorm]; };
+Bayesthresh = derive { name="Bayesthresh"; version="2.0.1"; sha256="0w26h1ragqcg1i4h7c2y6vd8fig2jb2zrnvvchgg5z2hg9qdplsf"; depends=[coda lme4 MASS matrixcalc mvtnorm VGAM]; };
 BaylorEdPsych = derive { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; };
-BcDiag = derive { name="BcDiag"; version="1.0.8"; sha256="1x9rkr96dgxp88z9qaw72ikcdmdlxnj8vjn3bfv0q27sfyxwb3a5"; depends=[]; };
-Bchron = derive { name="Bchron"; version="4.1.1"; sha256="0dnfz7xpmbygyarh9ai9x3xfsqiizi0zhnxm8bmkvqyb8h7zpghb"; depends=[inline hdrcde MASS ellipse coda mclust]; };
-Bclim = derive { name="Bclim"; version="2.3.1"; sha256="160c9v83bpik73yjj45lr8sdgl8v4ymlkqw424ncc3lficyhvfjg"; depends=[MASS mclust hdrcde statmod]; };
+BcDiag = derive { name="BcDiag"; version="1.0.8"; sha256="1x9rkr96dgxp88z9qaw72ikcdmdlxnj8vjn3bfv0q27sfyxwb3a5"; depends=[fabia]; };
+Bchron = derive { name="Bchron"; version="4.1.1"; sha256="0dnfz7xpmbygyarh9ai9x3xfsqiizi0zhnxm8bmkvqyb8h7zpghb"; depends=[coda ellipse hdrcde inline MASS mclust]; };
+Bclim = derive { name="Bclim"; version="2.3.1"; sha256="160c9v83bpik73yjj45lr8sdgl8v4ymlkqw424ncc3lficyhvfjg"; depends=[hdrcde MASS mclust statmod]; };
 Benchmarking = derive { name="Benchmarking"; version="0.24"; sha256="18gx8cwip1c03p37apyr9z89p117bz439vfgx91gxbbg1scc8bfp"; depends=[lpSolveAPI ucminf]; };
 BenfordTests = derive { name="BenfordTests"; version="1.1.1"; sha256="12xzc4gq4h7p18ypbkybrzjj2qh71rgd7nzznij36yv7n6h21mlw"; depends=[]; };
-Bergm = derive { name="Bergm"; version="3.0.1"; sha256="1ngxqpagf8snnwdm82bg8yxbf1zpzd99g32fhw9l4gjx77kpkhl2"; depends=[ergm network coda mvtnorm]; };
-BerlinData = derive { name="BerlinData"; version="1.0.1"; sha256="1shhx4pisi139sc0siawa7gp9psfgxm58qijg5m65nihv7spki75"; depends=[XML stringr rjson]; };
+Bergm = derive { name="Bergm"; version="3.0.1"; sha256="1ngxqpagf8snnwdm82bg8yxbf1zpzd99g32fhw9l4gjx77kpkhl2"; depends=[coda ergm mvtnorm network]; };
+BerlinData = derive { name="BerlinData"; version="1.0.1"; sha256="1shhx4pisi139sc0siawa7gp9psfgxm58qijg5m65nihv7spki75"; depends=[rjson stringr XML]; };
 Bessel = derive { name="Bessel"; version="0.5-5"; sha256="1apcpwqgnbsn544x2mfjkp4136xn33pijazmbzas7lr14syl5a6b"; depends=[Rmpfr]; };
 Bhat = derive { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; };
 BiDimRegression = derive { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; };
-BiSEp = derive { name="BiSEp"; version="2.0.1"; sha256="15sn9kxs0mb98kclfpif90c808a1365gdj2j332sxi07f64pb87q"; depends=[mclust]; };
+BiSEp = derive { name="BiSEp"; version="2.0.1"; sha256="15sn9kxs0mb98kclfpif90c808a1365gdj2j332sxi07f64pb87q"; depends=[AnnotationDbi GOSemSim mclust]; };
 BiasedUrn = derive { name="BiasedUrn"; version="1.06.1"; sha256="1ra9fmymm97a2b8jsrsi98cjnnxc478zq51lx7a5pgafprcwcgkg"; depends=[]; };
-BigTSP = derive { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[glmnet tree randomForest gbm]; };
-BinNonNor = derive { name="BinNonNor"; version="1.2"; sha256="15bzpi2q2428661v8z9izp942ihffgq8dgh4fsnzllvdrpqcyc41"; depends=[BB corpcor mvtnorm Matrix]; };
-BinNor = derive { name="BinNor"; version="2.0"; sha256="0c1qy93ccgzg8g25wm1j4ninsa0ck4y3jjh25za92w070cqhkd8m"; depends=[mvtnorm corpcor psych Matrix]; };
-BinOrdNonNor = derive { name="BinOrdNonNor"; version="1.0"; sha256="1x231xxdiyp6nwj2dx9w1shi5w6mdyzg43g5zc4r2bpvzccgj0l0"; depends=[GenOrd OrdNor BB corpcor Matrix mvtnorm]; };
+BigTSP = derive { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[gbm glmnet randomForest tree]; };
+BinNonNor = derive { name="BinNonNor"; version="1.2"; sha256="15bzpi2q2428661v8z9izp942ihffgq8dgh4fsnzllvdrpqcyc41"; depends=[BB corpcor Matrix mvtnorm]; };
+BinNor = derive { name="BinNor"; version="2.0"; sha256="0c1qy93ccgzg8g25wm1j4ninsa0ck4y3jjh25za92w070cqhkd8m"; depends=[corpcor Matrix mvtnorm psych]; };
+BinOrdNonNor = derive { name="BinOrdNonNor"; version="1.0"; sha256="1x231xxdiyp6nwj2dx9w1shi5w6mdyzg43g5zc4r2bpvzccgj0l0"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; };
 Binarize = derive { name="Binarize"; version="1.0"; sha256="1yfr87s1hgjhc8ah81sfrgr1hpp0vd5clqayrz1i698h1c34amkh"; depends=[diptest]; };
-BinaryEPPM = derive { name="BinaryEPPM"; version="1.0"; sha256="088yg07966g09gv9hznhwfdka4yk0c9j0viy9x4ldmhxl9w9scv5"; depends=[Formula expm numDeriv]; };
-BioGeoBEARS = derive { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[rexpokit cladoRcpp ape phylobase optimx FD xtable plotrix gdata]; };
-BioMark = derive { name="BioMark"; version="0.4.2"; sha256="17r4q2migmdk2vqfbr69q07cgdzwpjgs3ijmnm42srs5d3brw8cr"; depends=[pls glmnet MASS st]; };
-BioPhysConnectoR = derive { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[snow matrixcalc]; };
+BinaryEPPM = derive { name="BinaryEPPM"; version="1.0"; sha256="088yg07966g09gv9hznhwfdka4yk0c9j0viy9x4ldmhxl9w9scv5"; depends=[expm Formula numDeriv]; };
+BioGeoBEARS = derive { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[ape cladoRcpp FD gdata optimx phylobase plotrix rexpokit xtable]; };
+BioMark = derive { name="BioMark"; version="0.4.2"; sha256="17r4q2migmdk2vqfbr69q07cgdzwpjgs3ijmnm42srs5d3brw8cr"; depends=[glmnet MASS pls st]; };
+BioPhysConnectoR = derive { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[matrixcalc snow]; };
 BioStatR = derive { name="BioStatR"; version="2.0.0"; sha256="1k3z337lj8r06xgrqgi5h67hhkz2s5hggj6dhcciq26i1nzafsw6"; depends=[ggplot2]; };
 Biodem = derive { name="Biodem"; version="0.3"; sha256="0wfyypr46awki2nrvhcjwacmaxrr2wvhdv9hddnf10msssflvshc"; depends=[]; };
-BiodiversityR = derive { name="BiodiversityR"; version="2.5-2"; sha256="0l23nlibv7wjmkv1jnssaab3iwm2i5wrkzjji2x9rr5131aj82gn"; depends=[vegan Rcmdr]; };
-Biograph = derive { name="Biograph"; version="2.0.4"; sha256="1mik5yvbi28xnyzha8p3xjaa064x29wgn18yx766wha7djxxr353"; depends=[etm msm Epi lubridate reshape plyr survival mstate ggplot2]; };
-BivarP = derive { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[dfoptim survival copula]; };
+BiodiversityR = derive { name="BiodiversityR"; version="2.5-2"; sha256="0l23nlibv7wjmkv1jnssaab3iwm2i5wrkzjji2x9rr5131aj82gn"; depends=[Rcmdr vegan]; };
+Biograph = derive { name="Biograph"; version="2.0.4"; sha256="1mik5yvbi28xnyzha8p3xjaa064x29wgn18yx766wha7djxxr353"; depends=[Epi etm ggplot2 lubridate msm mstate mvna plyr reshape survival]; };
+BivarP = derive { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; };
 BlakerCI = derive { name="BlakerCI"; version="1.0-4"; sha256="1sa9qq5frjjcw46p3ankn7v3gj0gwn9lww6jacz8flf5qpplhn4l"; depends=[]; };
 BlandAltmanLeh = derive { name="BlandAltmanLeh"; version="0.1.0"; sha256="0y35zkxiallp4x09646qb8wj9bayh7mpnjg43qmzhxkm7l95b78r"; depends=[]; };
 Blaunet = derive { name="Blaunet"; version="1.0.1"; sha256="1qcp5wag4081pcjg5paryxz3hk3rqql15v891ppqc1injni7rljz"; depends=[network]; };
@@ -212,12 +213,12 @@ BoSSA = derive { name="BoSSA"; version="1.2"; sha256="191hq0np9iadks4sflg360k64x
 Bolstad = derive { name="Bolstad"; version="0.2-25"; sha256="1dj0ib3jndnsdx2cqsy0dz54szdx1xq3r2xqnxzk4ysng6svdym8"; depends=[]; };
 Bolstad2 = derive { name="Bolstad2"; version="1.0-28"; sha256="08cfadvl9jl9278ilsf8cm2i2a3i8zsa2f3vjzw2nlv85fwi2c7v"; depends=[]; };
 BoolNet = derive { name="BoolNet"; version="2.1.1"; sha256="0g8f2pv8s8kj84qcp2fy3h8p91ja6ap2dgxkdaf5kjv7r3hfddg0"; depends=[igraph XML]; };
-Boom = derive { name="Boom"; version="0.2"; sha256="0myb8pihjz25y9sj8b844jrkkd2x7zxyr3pg212cgkx9arby0afn"; depends=[MASS BH]; };
-BoomSpikeSlab = derive { name="BoomSpikeSlab"; version="0.5.2"; sha256="0n7kf0nkznsaajx4z4bkzjx99b56mjpd8543jc1dq6ki81yxlr1v"; depends=[Boom BH]; };
+Boom = derive { name="Boom"; version="0.2"; sha256="0myb8pihjz25y9sj8b844jrkkd2x7zxyr3pg212cgkx9arby0afn"; depends=[BH MASS]; };
+BoomSpikeSlab = derive { name="BoomSpikeSlab"; version="0.5.2"; sha256="0n7kf0nkznsaajx4z4bkzjx99b56mjpd8543jc1dq6ki81yxlr1v"; depends=[BH Boom]; };
 BootPR = derive { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; };
 Boruta = derive { name="Boruta"; version="4.0.0"; sha256="1r7bl4ab6swhks9cijhqn9gdhp2vjfhwb65fi5rzz0yvzxx97xi8"; depends=[randomForest rFerns]; };
-BradleyTerry2 = derive { name="BradleyTerry2"; version="1.0-6"; sha256="1080q7fw4yfl2y0jh3w2xz342i5yhhhavq40i3902bsmjj8g531d"; depends=[lme4 brglm gtools]; };
-BrailleR = derive { name="BrailleR"; version="0.20"; sha256="1cfg5jfhal77n1pmwcj0awhnprqw6bha7q7z3s2m3q4g1ar49shv"; depends=[knitr gridGraphics gridSVG moments nortest rmarkdown xtable]; };
+BradleyTerry2 = derive { name="BradleyTerry2"; version="1.0-6"; sha256="1080q7fw4yfl2y0jh3w2xz342i5yhhhavq40i3902bsmjj8g531d"; depends=[brglm gtools lme4]; };
+BrailleR = derive { name="BrailleR"; version="0.20"; sha256="1cfg5jfhal77n1pmwcj0awhnprqw6bha7q7z3s2m3q4g1ar49shv"; depends=[gridGraphics gridSVG knitr moments nortest rmarkdown xtable]; };
 Brobdingnag = derive { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; };
 Brq = derive { name="Brq"; version="1.0"; sha256="0m01qw0mh9za1gx1vkbyvwny4k5fvmvs9dbp0504q8jqfqf4l1vj"; depends=[quantreg truncnorm]; };
 BsMD = derive { name="BsMD"; version="2013.0718"; sha256="1yvazqlbmm221r7nkhrhi309gkk6vx7ji5xlvf07klya2zg20gcj"; depends=[]; };
@@ -227,92 +228,92 @@ C50 = derive { name="C50"; version="0.1.0-24"; sha256="17ay0rbm2cg2s27mh09xg0knk
 CADFtest = derive { name="CADFtest"; version="0.3-2"; sha256="00nsnzgjwkif7mbrw7msswjxhi9aysjdx3qg3i4mdmj1rmp7c4dc"; depends=[dynlm sandwich tseries urca]; };
 CALIBERrfimpute = derive { name="CALIBERrfimpute"; version="0.1-6"; sha256="036nwnday098mawc9qlgl3jjjcdjnja1immg6xkq27hvv2xfbz82"; depends=[mice mvtnorm randomForest]; };
 CALINE3 = derive { name="CALINE3"; version="1.0-2"; sha256="07w1kb7wqdi1qslpvpmqcmq6da4h7sgwv3aih4brdprym61c3rkm"; depends=[]; };
-CAM = derive { name="CAM"; version="1.0"; sha256="07mmrz6j8cm6zgaw2zcxgkxb7abd651kb80526r271snjgvpr5bl"; depends=[glmnet mboost Matrix mgcv]; };
-CAMAN = derive { name="CAMAN"; version="0.72"; sha256="10qikirv73d03ssg3sb6w3ih92ms5726b5lqw3x7r5rpbl9179rh"; depends=[sp mvtnorm]; };
-CARBayes = derive { name="CARBayes"; version="4.1"; sha256="0g4b44p3ybb92wrm42ws8yrrdzmxk454w6a3w20fbhfc2zprjilz"; depends=[MASS Rcpp CARBayesdata coda sp spam truncdist Rcpp]; };
-CARBayesST = derive { name="CARBayesST"; version="1.1"; sha256="03vp6qajag0ak4lcn0ddyxri3ndiwsc4yxi6ym5lr2v6kv674wl6"; depends=[Rcpp spam truncdist coda Rcpp]; };
-CARBayesdata = derive { name="CARBayesdata"; version="1.0"; sha256="19dhgkqpdcq1y866arb3qm7wbl348w66yl85kwajkmqgplx2pvaq"; depends=[sp shapefiles]; };
+CAM = derive { name="CAM"; version="1.0"; sha256="07mmrz6j8cm6zgaw2zcxgkxb7abd651kb80526r271snjgvpr5bl"; depends=[glmnet Matrix mboost mgcv]; };
+CAMAN = derive { name="CAMAN"; version="0.72"; sha256="10qikirv73d03ssg3sb6w3ih92ms5726b5lqw3x7r5rpbl9179rh"; depends=[mvtnorm sp]; };
+CARBayes = derive { name="CARBayes"; version="4.1"; sha256="0g4b44p3ybb92wrm42ws8yrrdzmxk454w6a3w20fbhfc2zprjilz"; depends=[CARBayesdata coda MASS Rcpp sp spam truncdist]; };
+CARBayesST = derive { name="CARBayesST"; version="1.1"; sha256="03vp6qajag0ak4lcn0ddyxri3ndiwsc4yxi6ym5lr2v6kv674wl6"; depends=[coda Rcpp spam truncdist]; };
+CARBayesdata = derive { name="CARBayesdata"; version="1.0"; sha256="19dhgkqpdcq1y866arb3qm7wbl348w66yl85kwajkmqgplx2pvaq"; depends=[shapefiles sp]; };
 CARE1 = derive { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; };
 CARLIT = derive { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; };
 CARramps = derive { name="CARramps"; version="0.1.2"; sha256="097xxvql6qglk6x4yi7xsvr15n0yj21613zv003z0mhgvqr1n5vf"; depends=[]; };
-CARrampsOcl = derive { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[OpenCL fields]; };
+CARrampsOcl = derive { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[fields OpenCL]; };
 CAvariants = derive { name="CAvariants"; version="2.1"; sha256="105bj6r6i7xz95lr5g4ld9xfgyq1dn15lw117jivx76z3k2zpi59"; depends=[]; };
 CBPS = derive { name="CBPS"; version="0.9"; sha256="08pc50fndpx6xvxkvqdklrp6v98w2j387frq08nlglcbfjk22i6x"; depends=[MASS MatchIt nnet numDeriv]; };
 CCA = derive { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; };
 CCAGFA = derive { name="CCAGFA"; version="1.0.6"; sha256="19il9i7ybjg2qchmpjwkyx48l4fl7lb1zdkfpiaw3fng6ndasp1k"; depends=[]; };
 CCM = derive { name="CCM"; version="1.1"; sha256="0gya1109w61ia6cq3jg2z5gmvjkv9xg71l2rxhrrf6bx1c2nsrq6"; depends=[]; };
 CCP = derive { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; };
-CCTpack = derive { name="CCTpack"; version="1.4"; sha256="09s2ysqsz158lrah44rwvs3nlhyqlvwcj6aar2p79flf4xxdwsvk"; depends=[R2jags rjags psych mvtnorm polycor MASS]; };
+CCTpack = derive { name="CCTpack"; version="1.4"; sha256="09s2ysqsz158lrah44rwvs3nlhyqlvwcj6aar2p79flf4xxdwsvk"; depends=[MASS mvtnorm polycor psych R2jags rjags]; };
 CCpop = derive { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; };
 CDFt = derive { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; };
 CDLasso = derive { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; };
-CDM = derive { name="CDM"; version="4.3-0"; sha256="0xryd4l0fqa2m39zcgd6jyi6shlqxc98qgwdpg38csqmbpny4bvm"; depends=[mvtnorm Rcpp psych MASS polycor sfsmisc plyr lattice Rcpp RcppArmadillo]; };
+CDM = derive { name="CDM"; version="4.3-0"; sha256="0xryd4l0fqa2m39zcgd6jyi6shlqxc98qgwdpg38csqmbpny4bvm"; depends=[lattice MASS mvtnorm plyr polycor psych Rcpp RcppArmadillo sfsmisc]; };
 CDNmoney = derive { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; };
-CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[MASS mvtnorm igraph]; };
+CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[igraph MASS mvtnorm]; };
 CEC = derive { name="CEC"; version="0.9.3"; sha256="05cgd281p0hxkni4nqb0d4l71aah3f3s6jxdnzgw8lqxaxz4194i"; depends=[]; };
-CEGO = derive { name="CEGO"; version="1.0.1108"; sha256="0klj9g656rnfqhj36r4v8y6mv4cazlzyrvws6yqa0r61abfbxy68"; depends=[MASS DEoptim]; };
+CEGO = derive { name="CEGO"; version="1.0.1108"; sha256="0klj9g656rnfqhj36r4v8y6mv4cazlzyrvws6yqa0r61abfbxy68"; depends=[DEoptim MASS]; };
 CEoptim = derive { name="CEoptim"; version="1.0"; sha256="1mrv2vhrwd7hvw67ys08nilbn3f1fp3bsvlbc8ggwyl3lw957fi9"; depends=[MASS msm]; };
 CFC = derive { name="CFC"; version="0.7.0"; sha256="1sl0gsx4gcbcf7bc6xf84g3lx58zraj2h51riacch2iyxl1ygspq"; depends=[abind]; };
 CGP = derive { name="CGP"; version="2.0-2"; sha256="1mggv3c8525vbdfdc3yhpp4vm4zzdvbwyxim29zj0lzwjf9fkgqk"; depends=[]; };
-CHAT = derive { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DPpackage]; };
+CHAT = derive { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DNAcopy DPpackage]; };
 CHCN = derive { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; };
 CHNOSZ = derive { name="CHNOSZ"; version="1.0.5"; sha256="19kh4fnf6myn072hrjcibw7bhm4qbjp039vdqjq1qx3bmz28an1k"; depends=[]; };
-CHsharp = derive { name="CHsharp"; version="0.3"; sha256="0aa9v6yih6qmqsmc8zsl8k1wqsp3sp2bfwri3d37k06vfj7gwbh0"; depends=[scatterplot3d KernSmooth]; };
-CIDnetworks = derive { name="CIDnetworks"; version="0.8.1"; sha256="0k75mdlvm0rccag42pnhsni1kihpqsnj5bsrwlj7hdf7n8k1xb77"; depends=[mvtnorm msm Rcpp igraph numDeriv pbivnorm MASS Rcpp]; };
+CHsharp = derive { name="CHsharp"; version="0.3"; sha256="0aa9v6yih6qmqsmc8zsl8k1wqsp3sp2bfwri3d37k06vfj7gwbh0"; depends=[KernSmooth scatterplot3d]; };
+CIDnetworks = derive { name="CIDnetworks"; version="0.8.1"; sha256="0k75mdlvm0rccag42pnhsni1kihpqsnj5bsrwlj7hdf7n8k1xb77"; depends=[igraph MASS msm mvtnorm numDeriv pbivnorm Rcpp]; };
 CIFsmry = derive { name="CIFsmry"; version="1.0.1"; sha256="118vyiiy4iqn86n9xf84n5hrwrhzhr1mdsmyg9sm6qq6dm7zg6la"; depends=[]; };
 CINID = derive { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; };
-CINOEDV = derive { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[R_matlab igraph ggplot2 reshape2]; };
-CITAN = derive { name="CITAN"; version="2014.12-1"; sha256="0hiccsg49zgcdm5iwj2vzyqhwyfw6h5fd2gasy6hlakjp102mvy2"; depends=[agop RSQLite RGtk2 hash stringi DBI]; };
+CINOEDV = derive { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[ggplot2 igraph R_matlab reshape2]; };
+CITAN = derive { name="CITAN"; version="2014.12-1"; sha256="0hiccsg49zgcdm5iwj2vzyqhwyfw6h5fd2gasy6hlakjp102mvy2"; depends=[agop DBI hash RGtk2 RSQLite stringi]; };
 CLAG = derive { name="CLAG"; version="2.18.1"; sha256="0y8m6m01vw3rxwrmxvwhpiy6dd2snr0lhb026l1494y43hhqi3wy"; depends=[]; };
-CLME = derive { name="CLME"; version="2.0-2"; sha256="11krgxn3fvbwknmiz2jyidpbb0svf4frvk99spd7i53m615sai91"; depends=[MASS lme4 shiny isotone stringr prettyR]; };
+CLME = derive { name="CLME"; version="2.0-2"; sha256="11krgxn3fvbwknmiz2jyidpbb0svf4frvk99spd7i53m615sai91"; depends=[isotone lme4 MASS prettyR shiny stringr]; };
 CLSOCP = derive { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; };
 CMC = derive { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; };
-CMF = derive { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp Rcpp]; };
+CMF = derive { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp]; };
 CMPControl = derive { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; };
-CMplot = derive { name="CMplot"; version="1.0.1"; sha256="04pkpv0sl0aijp6b4sgn27bq54cn95zazikjlx5pwiyc8p0bzz86"; depends=[]; };
+CMplot = derive { name="CMplot"; version="2.0.1"; sha256="0pja152i10i7s5lx08ai8saaa4iw3rbv03kkcnjg1y0jr5nbnmr8"; depends=[]; };
 CNOGpro = derive { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; };
-CNVassoc = derive { name="CNVassoc"; version="2.1"; sha256="0gwyhipkvvnivdahr9mkj1b8j9wzg6g8mcsvk5rq28xdzrskz0i8"; depends=[CNVassocData mixdist mclust survival]; };
+CNVassoc = derive { name="CNVassoc"; version="2.1"; sha256="0gwyhipkvvnivdahr9mkj1b8j9wzg6g8mcsvk5rq28xdzrskz0i8"; depends=[CNVassocData mclust mixdist survival]; };
 CNVassocData = derive { name="CNVassocData"; version="1.0"; sha256="17r3b1w9i9v6llawnjnrjns6jkd82m2cn9c90aif8j0bf4dmgdli"; depends=[]; };
 CNprep = derive { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; };
 COBRA = derive { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; };
 COMMUNAL = derive { name="COMMUNAL"; version="1.0"; sha256="0smza4q0gnhskyq3fxcrs2hq3lxkyp5xf3zd6zi92962lg6s3w3n"; depends=[cluster clValid fpc rgl]; };
 COMPoissonReg = derive { name="COMPoissonReg"; version="0.3.4"; sha256="1mf2q7phc2bn700yp7i2i6ccj6lrvh8b2dmibqihh76a85j1ycrq"; depends=[]; };
 COP = derive { name="COP"; version="1.0-2"; sha256="1gynknplvx97hjhi7adsgq9r9lqismch1q1pqvgmz0x1wkg4jj40"; depends=[dr MASS]; };
-COPASutils = derive { name="COPASutils"; version="0.1.6"; sha256="0vi7x14ma3i4gabdb04byr4ba0209lklj3d5ql2f2vaxyb4a1hj9"; depends=[ggplot2 reshape2 dplyr kernlab stringr knitr]; };
+COPASutils = derive { name="COPASutils"; version="0.1.6"; sha256="0vi7x14ma3i4gabdb04byr4ba0209lklj3d5ql2f2vaxyb4a1hj9"; depends=[dplyr ggplot2 kernlab knitr reshape2 stringr]; };
 CORE = derive { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; };
 CORElearn = derive { name="CORElearn"; version="0.9.46"; sha256="1jwc3sqkbhhmn67x44iyqzvpjsnbrwhgq6yam6h6gf086nv0lmic"; depends=[cluster rpart]; };
-CORM = derive { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster]; };
-COSINE = derive { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[MASS genalg]; };
-COUNT = derive { name="COUNT"; version="1.3.2"; sha256="1lb67gwznva5p046f4gjjisip5a12icp7d2g1ipizixw99c5lll8"; depends=[msme sandwich MASS]; };
+CORM = derive { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster limma]; };
+COSINE = derive { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[genalg MASS]; };
+COUNT = derive { name="COUNT"; version="1.3.2"; sha256="1lb67gwznva5p046f4gjjisip5a12icp7d2g1ipizixw99c5lll8"; depends=[MASS msme sandwich]; };
 CP = derive { name="CP"; version="1.5"; sha256="0hzp4h7bhhxn336kkq27phplk7idwk27jjsp6zimwl8fq3ylh0dr"; depends=[survival]; };
-CPE = derive { name="CPE"; version="1.4.4"; sha256="09sqp2a0j43jr9ya9piv8575rwd5fdvwmiz4chv75r3mw8p128mn"; depends=[survival rms]; };
+CPE = derive { name="CPE"; version="1.4.4"; sha256="09sqp2a0j43jr9ya9piv8575rwd5fdvwmiz4chv75r3mw8p128mn"; depends=[rms survival]; };
 CPHshape = derive { name="CPHshape"; version="1.0.1"; sha256="05krqcd4spgghp3ihv1zfql6ikd64vkqnrjghjvfki3hi3zi5k7h"; depends=[]; };
 CPMCGLM = derive { name="CPMCGLM"; version="1.1"; sha256="1w8yp37vxz2cl0yqdzpyxdfq2scz2h9i4crjzjmjzpzffi45f06s"; depends=[mvtnorm plyr]; };
 CR = derive { name="CR"; version="1.0"; sha256="0smb2i560dwbxg3mp1svfxmaiw193pd3klwqq0i27czf07k1xfvj"; depends=[]; };
 CRAC = derive { name="CRAC"; version="1.0"; sha256="0vnqmmmwakx5jnzqp20dng35p7rvmz3ypm2m7bs41m8nhh2wq1xa"; depends=[]; };
-CRF = derive { name="CRF"; version="0.3-8"; sha256="0w9wfjlx6hvd07k0iszfyip0vn0ca5ax2d5g7hsg6pm2isnzap8a"; depends=[Rglpk Matrix]; };
+CRF = derive { name="CRF"; version="0.3-8"; sha256="0w9wfjlx6hvd07k0iszfyip0vn0ca5ax2d5g7hsg6pm2isnzap8a"; depends=[Matrix Rglpk]; };
 CRM = derive { name="CRM"; version="1.1.1"; sha256="09h6xvqc2h2gxhdhc7592z93cnw16l549pn9i26ml0f0n20hljmf"; depends=[]; };
 CRTSize = derive { name="CRTSize"; version="1.0"; sha256="1d45zx26bf0zk0piham69gvb8djqf48g6iisbldv0ds3s2hhcsin"; depends=[]; };
 CTT = derive { name="CTT"; version="2.1"; sha256="0v8k54x9pib6hq3nz3m80g1a3p003f7bn8wnj9swwvacc90d6n44"; depends=[]; };
 CUMP = derive { name="CUMP"; version="1.0"; sha256="0dbpgm75nbd4h8rf3ca5n4mgdn3qm4yyf2d48vlihakzw6rqbpka"; depends=[]; };
 CVST = derive { name="CVST"; version="0.2-1"; sha256="17xacyi8cf37rr2xswx96qy7pwkaqq394awdlswykz3qlyzx4zx2"; depends=[kernlab Matrix]; };
-CVThresh = derive { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[wavethresh EbayesThresh]; };
+CVThresh = derive { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[EbayesThresh wavethresh]; };
 CVTuningCov = derive { name="CVTuningCov"; version="1.0"; sha256="1bwzis82lqwcqp2djy4bnd3vvjr47krlv3pdc5msh12wcs0xhs7n"; depends=[]; };
 CVcalibration = derive { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; };
 CaDENCE = derive { name="CaDENCE"; version="1.2.2"; sha256="1rbwm3s63dxd366bs7pdxl0zpv7svsfr3ayznach9bjjrnjk3z3g"; depends=[pso]; };
 Cairo = derive { name="Cairo"; version="1.5-6"; sha256="0x5xd2xq5q8a3kzmz7f9bawg3j131rhyb3s7w34acg7rd79l1935"; depends=[]; };
 CarletonStats = derive { name="CarletonStats"; version="1.1"; sha256="18pd1hi8bnbv0sdixw746xvdg9szvng422yj12mk0k50v60403xg"; depends=[]; };
-CatDyn = derive { name="CatDyn"; version="1.1-0"; sha256="0bdixcf1iwbmjd2axi6csrzms25ghdj4r6223qhk2b54wlmbzaiz"; depends=[optimx BB]; };
+CatDyn = derive { name="CatDyn"; version="1.1-0"; sha256="0bdixcf1iwbmjd2axi6csrzms25ghdj4r6223qhk2b54wlmbzaiz"; depends=[BB optimx]; };
 CateSelection = derive { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; };
 CausalFX = derive { name="CausalFX"; version="1.0.1"; sha256="0v0diqq9fa1v9n3v5m5shvwlgmj91cbbb78243rwib1h3pyacihf"; depends=[igraph rcdd rje]; };
 CausalGAM = derive { name="CausalGAM"; version="0.1-3"; sha256="0g68m2kxixwr7rx65r57m1n0qa161igc428zh9rj91fg6h4pdq4w"; depends=[gam]; };
-Causata = derive { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[XML R_utils rjson RMySQL RCurl stringr yaml boot foreach data_table glmnet ggplot2]; };
+Causata = derive { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[boot data_table foreach ggplot2 glmnet R_utils RCurl rjson RMySQL stringr XML yaml]; };
 CePa = derive { name="CePa"; version="0.5"; sha256="1y2q72j8bqx509i62a2x9j40rj5bkpgx4z6fwj05ibazc1441asd"; depends=[igraph snow]; };
-CellularAutomaton = derive { name="CellularAutomaton"; version="1.1-1"; sha256="0kmw2ic161xwalqa63hznic4n4hdz20hsilf2awlcldg7m9si1zd"; depends=[R_oo R_methodsS3]; };
+CellularAutomaton = derive { name="CellularAutomaton"; version="1.1-1"; sha256="0kmw2ic161xwalqa63hznic4n4hdz20hsilf2awlcldg7m9si1zd"; depends=[R_methodsS3 R_oo]; };
 CensRegMod = derive { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; };
 CerioliOutlierDetection = derive { name="CerioliOutlierDetection"; version="1.0.8"; sha256="0n67y7ah496wck9hlrphya9k753gk44v7zgfz4s2a5ii49739zqi"; depends=[robustbase]; };
 CfEstimateQuantiles = derive { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; };
-ChainLadder = derive { name="ChainLadder"; version="0.2.0"; sha256="03gwavmimh4isrc6gpn72m52sqx1aj0prshzsb0531g45qxmvw9x"; depends=[systemfit statmod Matrix actuar Hmisc reshape2 MASS lattice tweedie]; };
+ChainLadder = derive { name="ChainLadder"; version="0.2.0"; sha256="03gwavmimh4isrc6gpn72m52sqx1aj0prshzsb0531g45qxmvw9x"; depends=[actuar Hmisc lattice MASS Matrix reshape2 statmod systemfit tweedie]; };
 ChargeTransport = derive { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; };
 CheckDigit = derive { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; };
 ChemoSpec = derive { name="ChemoSpec"; version="4.0.1"; sha256="08z85g0r38xh57h3f4hdcg8wlaklpqmxvjla1562f3lxbqm1r9k1"; depends=[plyr rgl]; };
@@ -322,153 +323,157 @@ ChoiceModelR = derive { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn
 CircE = derive { name="CircE"; version="1.1"; sha256="14bja3zv9wg389m6khmsy3q12hhnfcp49rvrmw47y6fh5m7ihrz2"; depends=[]; };
 CircNNTSR = derive { name="CircNNTSR"; version="2.1"; sha256="1rl17kw6bl5xf7pgsc4im12i2kqz4a3b11vzzlb6wfl5yck6iff5"; depends=[]; };
 CircOutlier = derive { name="CircOutlier"; version="3.1.3"; sha256="103d5fbwzbj9ribl2vzrj1lxv0n3hcygjrf5k4kqm0kfnql91k2s"; depends=[CircStats circular]; };
-CircStats = derive { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa82s2qxm3xlcv6zpi578zc4pl0d7qyxqnh603s"; depends=[MASS boot]; };
+CircStats = derive { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa82s2qxm3xlcv6zpi578zc4pl0d7qyxqnh603s"; depends=[boot MASS]; };
 CityPlot = derive { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; };
 Ckmeans_1d_dp = derive { name="Ckmeans.1d.dp"; version="3.3.1"; sha256="0gzwcg6f3p1vr30lyniqiq4893kjxri4y2vjzh6qrldnay42kqf9"; depends=[]; };
-Claddis = derive { name="Claddis"; version="0.1"; sha256="1dxsz62x856lpapw5xpvvr2qpyj3j93m9dn07m0bjbpmx0y0bm9c"; depends=[gdata ape phytools strap]; };
+Claddis = derive { name="Claddis"; version="0.1"; sha256="1dxsz62x856lpapw5xpvvr2qpyj3j93m9dn07m0bjbpmx0y0bm9c"; depends=[ape gdata phytools strap]; };
 ClickClust = derive { name="ClickClust"; version="1.1.4"; sha256="17r8jzhzwqa5h04bxdcyv31jhk6c709sx5m1z53jh3yf9zmkilvi"; depends=[]; };
 ClimClass = derive { name="ClimClass"; version="1.0"; sha256="07jl8vwqyyj4q2hav8qbg69yjs73s3kbms5bd9hqs1y938rrp2l5"; depends=[geosphere ggplot2 reshape2]; };
 ClueR = derive { name="ClueR"; version="1.0"; sha256="1ak8pgbzm5xrk7pjnkbiqdwyvvyvrm6k6h50ycc86w3zy7fnqhds"; depends=[e1071]; };
-ClustMMDD = derive { name="ClustMMDD"; version="1.0.1"; sha256="0pzascdiadhvx4xjxa6kjw5kkmj3izphz2f86jnimyn5fid7cl02"; depends=[Rcpp Rcpp]; };
+ClustMMDD = derive { name="ClustMMDD"; version="1.0.1"; sha256="0pzascdiadhvx4xjxa6kjw5kkmj3izphz2f86jnimyn5fid7cl02"; depends=[Rcpp]; };
 ClustOfVar = derive { name="ClustOfVar"; version="0.8"; sha256="17y8q2g4yjxs2jl1s8n5svxi021nlm0phs1g5hcnfxzpadq84wbs"; depends=[]; };
-ClustVarLV = derive { name="ClustVarLV"; version="1.4.0"; sha256="1dm4vyfq4mf9y2ha32fhirqyss4yjk5zxrb9i3fx4i8kbaw6160z"; depends=[Rcpp Rcpp]; };
+ClustVarLV = derive { name="ClustVarLV"; version="1.4.0"; sha256="1dm4vyfq4mf9y2ha32fhirqyss4yjk5zxrb9i3fx4i8kbaw6160z"; depends=[Rcpp]; };
 CoClust = derive { name="CoClust"; version="0.3-1"; sha256="00i0dghd35s91kkkxj1ywa5i93752mfa5527ifclw4xxxshppva8"; depends=[copula gtools]; };
-CoImp = derive { name="CoImp"; version="0.2-3"; sha256="04n0drx98hi8hmlb5xwl87ylv03j1ld04vp9d8s5sphvm9bbx690"; depends=[copula nnet gtools locfit]; };
+CoImp = derive { name="CoImp"; version="0.2-3"; sha256="04n0drx98hi8hmlb5xwl87ylv03j1ld04vp9d8s5sphvm9bbx690"; depends=[copula gtools locfit nnet]; };
 CoinMinD = derive { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; };
-CollocInfer = derive { name="CollocInfer"; version="1.0.1"; sha256="0wfk3qw28msz3wqm5xmivjgi18kqv1s6w76vh71zq777d6a7al6i"; depends=[fda deSolve MASS Matrix spam]; };
+CollocInfer = derive { name="CollocInfer"; version="1.0.1"; sha256="0wfk3qw28msz3wqm5xmivjgi18kqv1s6w76vh71zq777d6a7al6i"; depends=[deSolve fda MASS Matrix spam]; };
 ColorPalette = derive { name="ColorPalette"; version="1.0-0"; sha256="0mh1fjcl80fc5prrypl42aqj1svzs6600n250a5sah276bd0zzk9"; depends=[]; };
 CombMSC = derive { name="CombMSC"; version="1.4.2"; sha256="1wkawxisn9alpwrymja8dla8n25z2fhai3l2xhin0b914y2kai09"; depends=[]; };
 CombinS = derive { name="CombinS"; version="1.1"; sha256="18wanir5vqk5i65hd6gr2za1xd26yfa0c3c029dbxsrsczwmb9xi"; depends=[]; };
 CombinePValue = derive { name="CombinePValue"; version="1.0"; sha256="0mlngyz2nq7s39javnnjbb5db93c5sg9daw2szng83mbyfza4hv2"; depends=[]; };
+CommT = derive { name="CommT"; version="0.1.1"; sha256="1kimm8z3k7p5lxsjnkb203js2rqn09grywxs890fab1hhgssgv2r"; depends=[ape ggplot2 gridExtra phangorn reshape]; };
 CommonJavaJars = derive { name="CommonJavaJars"; version="1.0-5"; sha256="0kwf504g1izyy7hxss21dgz26w0spxibdlacrjdh7q10z799hfhh"; depends=[]; };
 CommonTrend = derive { name="CommonTrend"; version="0.7-1"; sha256="088pg2hy2g2jgs84xawrnsf7gpvrpqjsimkx7g0i5r5fmkx169f9"; depends=[MASS urca]; };
 CommunityCorrelogram = derive { name="CommunityCorrelogram"; version="1.0"; sha256="1wkrm5lil595sc4ih3qsf4sgvfipzlav0n7339ixqw9zxm2pg4nj"; depends=[vegan]; };
-Comp2ROC = derive { name="Comp2ROC"; version="1.1"; sha256="0vhpw6k9barcx5fl3kw3r7152mcrlpr127i5b70bx64g8g9ffs1v"; depends=[ROCR boot]; };
-CompGLM = derive { name="CompGLM"; version="1.0"; sha256="04bjal92r0m7is5ygqpd0mdz3fb3pwcr7rc3mbxg9sg57nff3kf5"; depends=[Rcpp Rcpp]; };
+Comp2ROC = derive { name="Comp2ROC"; version="1.1"; sha256="0vhpw6k9barcx5fl3kw3r7152mcrlpr127i5b70bx64g8g9ffs1v"; depends=[boot ROCR]; };
+CompGLM = derive { name="CompGLM"; version="1.0"; sha256="04bjal92r0m7is5ygqpd0mdz3fb3pwcr7rc3mbxg9sg57nff3kf5"; depends=[Rcpp]; };
 CompLognormal = derive { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; };
 CompQuadForm = derive { name="CompQuadForm"; version="1.4.1"; sha256="1kv4bdkwidkjw0hgn2krv42p9v1a03p47g0p03lja3flhfbmiifj"; depends=[]; };
 CompRandFld = derive { name="CompRandFld"; version="1.0.3-4"; sha256="1a3j5j50fz3f8vkvdmfccv5hn00spk08xanadqxpdy8pn925gqqb"; depends=[]; };
 CompareTests = derive { name="CompareTests"; version="1.0"; sha256="098axl20jid35pqvgiwk6h91waafigwks6n5f4pg7xxx1fifks4f"; depends=[]; };
-Compind = derive { name="Compind"; version="1.0"; sha256="13gfsbjaciign8cswsibdj9a4rwj5afwrk4g1x4fyihfhnm4qx7m"; depends=[Benchmarking psych boot Hmisc MASS GPArotation lpSolve nonparaeff]; };
+Compind = derive { name="Compind"; version="1.0"; sha256="13gfsbjaciign8cswsibdj9a4rwj5afwrk4g1x4fyihfhnm4qx7m"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff psych]; };
 Compounding = derive { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; };
-ConConPiWiFun = derive { name="ConConPiWiFun"; version="0.4.4"; sha256="1dq9nlg04xs2n9g62y4gbl8ay4vsa25d7d7dra7q8zq6a561hzz5"; depends=[Rcpp Rcpp]; };
+ConConPiWiFun = derive { name="ConConPiWiFun"; version="0.4.4"; sha256="1dq9nlg04xs2n9g62y4gbl8ay4vsa25d7d7dra7q8zq6a561hzz5"; depends=[Rcpp]; };
 ConSpline = derive { name="ConSpline"; version="1.0"; sha256="04zwnnp8rmzacfl9skd1lybqwxja0527h4xwcx5ki2z8c0zvvpi8"; depends=[coneproj]; };
 Conake = derive { name="Conake"; version="1.0"; sha256="1rj1rv8r53516jqhwp9xqqwjxh4gx1w47c0bw59f87wiy5pbchpf"; depends=[]; };
 CondReg = derive { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; };
 ConjointChecks = derive { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; };
 ConnMatTools = derive { name="ConnMatTools"; version="0.1.5"; sha256="02cv2rlfp9shwqc9nwb8278akmwv7yvviwl23jglzsyh721dpqkr"; depends=[]; };
 ConvCalendar = derive { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; };
-ConvergenceConcepts = derive { name="ConvergenceConcepts"; version="1.1"; sha256="0878fz33jxh5cf72lv0lga48wq2hqa4wz6m59111k59pzrsli344"; depends=[tkrplot lattice]; };
+ConvergenceConcepts = derive { name="ConvergenceConcepts"; version="1.1"; sha256="0878fz33jxh5cf72lv0lga48wq2hqa4wz6m59111k59pzrsli344"; depends=[lattice tkrplot]; };
 Copula_Markov = derive { name="Copula.Markov"; version="1.0"; sha256="028rmpihyz9xr4r305lbcbb0y22jw1szmhw5iznv5zma507grbl3"; depends=[]; };
-CopulaREMADA = derive { name="CopulaREMADA"; version="0.5-1"; sha256="1lrqx07986f7cv0ws1dd9p0dza0qkc67p8mp7rdq58b9f1h7yk2r"; depends=[statmod]; };
+CopulaREMADA = derive { name="CopulaREMADA"; version="0.9"; sha256="0fhd4g8157rmkda5dygvnvb50f8dz31wlg1x432g9ra8fw7bdq01"; depends=[matlab statmod tensor]; };
 CopulaRegression = derive { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; };
 CopyDetect = derive { name="CopyDetect"; version="1.1"; sha256="0h9bf7ay5yr6dwk7q28b6xxfzy6smljkq6qwjkzfscy5hnmwxkpa"; depends=[irtoys]; };
-CorReg = derive { name="CorReg"; version="1.0.5"; sha256="1b7l17i33bqvdzgqw5vc73fnpdgqbr01456qgmxls80ji8qjiv9x"; depends=[Rcpp lars Rmixmod elasticnet corrplot Matrix ridge rpart MASS mvtnorm mclust Rcpp RcppEigen]; };
-CorrBin = derive { name="CorrBin"; version="1.5"; sha256="1kg8kms76z127j2vmf7v162n0sh2jqylw4i7c35x5sig4q22m9gy"; depends=[boot combinat geepack dirmult mvtnorm]; };
+CorReg = derive { name="CorReg"; version="1.0.5"; sha256="1b7l17i33bqvdzgqw5vc73fnpdgqbr01456qgmxls80ji8qjiv9x"; depends=[corrplot elasticnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen ridge Rmixmod rpart]; };
+CorrBin = derive { name="CorrBin"; version="1.5"; sha256="1kg8kms76z127j2vmf7v162n0sh2jqylw4i7c35x5sig4q22m9gy"; depends=[boot combinat dirmult geepack mvtnorm]; };
 CorrMixed = derive { name="CorrMixed"; version="0.1-11"; sha256="18n70yx6yysvcn3wsf1zmnp4z2hs3783mr1n0pjp2ph5yd9xk4mg"; depends=[nlme psych]; };
 Correlplot = derive { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; };
-CosmoPhotoz = derive { name="CosmoPhotoz"; version="0.1"; sha256="04girid6wvgyrk8ha81mdqjx2mmzifz57l1hzcgrdnzmjmm3vlmp"; depends=[ggplot2 ggthemes arm COUNT gridExtra pcaPP mvtnorm shiny]; };
-CountsEPPM = derive { name="CountsEPPM"; version="2.0"; sha256="0bwd2jc8g62xpvnnq759cxhjvip94abbj63yk6n1awlh5hb4ni3b"; depends=[Formula expm numDeriv]; };
-CovSel = derive { name="CovSel"; version="1.1"; sha256="13dh97857h3r684yw1bzyr1rkpk8l7sshgy9hvg5y95csgai2qhw"; depends=[MASS dr np boot cubature]; };
-CoxBoost = derive { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[survival Matrix prodlim]; };
+CosmoPhotoz = derive { name="CosmoPhotoz"; version="0.1"; sha256="04girid6wvgyrk8ha81mdqjx2mmzifz57l1hzcgrdnzmjmm3vlmp"; depends=[arm COUNT ggplot2 ggthemes gridExtra mvtnorm pcaPP shiny]; };
+CountsEPPM = derive { name="CountsEPPM"; version="2.0"; sha256="0bwd2jc8g62xpvnnq759cxhjvip94abbj63yk6n1awlh5hb4ni3b"; depends=[expm Formula numDeriv]; };
+CovSel = derive { name="CovSel"; version="1.1"; sha256="13dh97857h3r684yw1bzyr1rkpk8l7sshgy9hvg5y95csgai2qhw"; depends=[boot cubature dr MASS np]; };
+CoxBoost = derive { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[Matrix prodlim survival]; };
 CoxRidge = derive { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; };
-Coxnet = derive { name="Coxnet"; version="0.1-1"; sha256="07ivs47lj0l84mk4r7bvzncvddspq4yl19aibii5pvjmzfzdgymp"; depends=[Matrix Rcpp Rcpp RcppEigen]; };
+Coxnet = derive { name="Coxnet"; version="0.1-1"; sha256="07ivs47lj0l84mk4r7bvzncvddspq4yl19aibii5pvjmzfzdgymp"; depends=[Matrix Rcpp RcppEigen]; };
 CpGFilter = derive { name="CpGFilter"; version="1.0"; sha256="07426xlmx0ya3pi1y5c24zr58wr024m38y036h9gz26pw7bpawy2"; depends=[]; };
 CpGassoc = derive { name="CpGassoc"; version="2.50"; sha256="052mzkcp7510dm12winmwpxz6dvy54aziff0mn3nzy0xbk5v1fw4"; depends=[nlme]; };
-Cprob = derive { name="Cprob"; version="1.2.4"; sha256="0zird0l0kx2amrp4qjvlagw55pk9jrx0536gq7bvajj8avyvyykr"; depends=[prodlim tpr geepack lgtdl lattice]; };
+Cprob = derive { name="Cprob"; version="1.2.4"; sha256="0zird0l0kx2amrp4qjvlagw55pk9jrx0536gq7bvajj8avyvyykr"; depends=[geepack lattice lgtdl prodlim tpr]; };
 CreditMetrics = derive { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; };
-Crossover = derive { name="Crossover"; version="0.1-14"; sha256="0d35am446z1pj7iz2zk1fvmp3xn5nhz3pgj7rwhmj77ad8vy8p8b"; depends=[rJava CommonJavaJars JavaGD ggplot2 MASS crossdes xtable Matrix multcomp digest Rcpp RcppArmadillo]; };
-CrypticIBDcheck = derive { name="CrypticIBDcheck"; version="0.3-1"; sha256="1lrpwgvsif1wnp19agh8fs3nhlb7prr3hhqg28fi4ikdd1l2j3r4"; depends=[rJPSGCS car ellipse]; };
+Crossover = derive { name="Crossover"; version="0.1-14"; sha256="0d35am446z1pj7iz2zk1fvmp3xn5nhz3pgj7rwhmj77ad8vy8p8b"; depends=[CommonJavaJars crossdes digest ggplot2 JavaGD MASS Matrix multcomp Rcpp RcppArmadillo rJava xtable]; };
+CryptRndTest = derive { name="CryptRndTest"; version="1.0.5"; sha256="0ypqwzn9r9x7l4wzz6vqnirmjx7zrbx0jck4wpy83w1jvx02qcqv"; depends=[copula kSamples LambertW MissMech sfsmisc tseries]; };
+CrypticIBDcheck = derive { name="CrypticIBDcheck"; version="0.3-1"; sha256="1lrpwgvsif1wnp19agh8fs3nhlb7prr3hhqg28fi4ikdd1l2j3r4"; depends=[car chopsticks ellipse rJPSGCS]; };
 Cubist = derive { name="Cubist"; version="0.0.18"; sha256="176k9l7vrxamahvw346aysj19j7il9a2v6ka6dzmk0qq7hf3w9ka"; depends=[lattice reshape2]; };
-D2C = derive { name="D2C"; version="1.2.1"; sha256="0qhq27978id0plyz9mgdi0r1sr3ixnvqm8w6hp5c2wjd1yhhh12s"; depends=[randomForest gRbase lazy MASS corpcor foreach]; };
+D2C = derive { name="D2C"; version="1.2.1"; sha256="0qhq27978id0plyz9mgdi0r1sr3ixnvqm8w6hp5c2wjd1yhhh12s"; depends=[corpcor foreach gRbase lazy MASS randomForest RBGL Rgraphviz]; };
 DAAG = derive { name="DAAG"; version="1.20"; sha256="05jlsrs0frk9ky20h17c5vj9d4j28c9n0a1jww5lssacimn1d4x5"; depends=[lattice latticeExtra]; };
-DAAGbio = derive { name="DAAGbio"; version="0.62"; sha256="18m4vq8vv0yi79na62nrm0cy1nlk7bg0xbddzxv5gpkmzi1i6m9s"; depends=[]; };
+DAAGbio = derive { name="DAAGbio"; version="0.62"; sha256="18m4vq8vv0yi79na62nrm0cy1nlk7bg0xbddzxv5gpkmzi1i6m9s"; depends=[limma]; };
 DAAGxtras = derive { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; };
-DAGGER = derive { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpdcjwg5lj33i6pb884l1kx92svjfr7"; depends=[Rglpk quadprog Matrix]; };
+DAGGER = derive { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpdcjwg5lj33i6pb884l1kx92svjfr7"; depends=[Matrix quadprog Rglpk]; };
 DAISIE = derive { name="DAISIE"; version="1.0.1"; sha256="1dhfkjgksxy39siz5mf97sw2gyb0jvy44ndy0asdmplwhmqrc4md"; depends=[deSolve]; };
 DAKS = derive { name="DAKS"; version="2.1-2"; sha256="1817s7xd4h2zzaagmnw423qaxpa5fmxi3fh4h9hm2ra9w7nh6ljj"; depends=[relations sets]; };
 DALY = derive { name="DALY"; version="1.4.0"; sha256="1gx4q24149q1ipsrinswrm37z1nf4swgq188zsc1xifmw9l28v11"; depends=[]; };
-DAMOCLES = derive { name="DAMOCLES"; version="1.1"; sha256="07z8mynhqnk1zcvm84w09xzkiy2dfxwhmnpi6gaddr3p0waql4gj"; depends=[geiger caper ape deSolve matrixStats expm picante]; };
-DAMisc = derive { name="DAMisc"; version="1.3"; sha256="0d6fkg0c5a2jx1khv013lmahx5clyzab9w2dsi5zwxnf0jz5m8fc"; depends=[car effects lattice sm MASS nnet pscl gdata xtable]; };
-DATforDCEMRI = derive { name="DATforDCEMRI"; version="0.55"; sha256="0v26a1gi8l21ga5nqcnyfaa7gc8zxq6wk95b96ajgpdybb0l9s53"; depends=[xtable akima R_oo R_methodsS3 matlab lattice locfit]; };
+DAMOCLES = derive { name="DAMOCLES"; version="1.1"; sha256="07z8mynhqnk1zcvm84w09xzkiy2dfxwhmnpi6gaddr3p0waql4gj"; depends=[ape caper deSolve expm geiger matrixStats picante]; };
+DAMisc = derive { name="DAMisc"; version="1.3"; sha256="0d6fkg0c5a2jx1khv013lmahx5clyzab9w2dsi5zwxnf0jz5m8fc"; depends=[car effects gdata lattice MASS nnet pscl sm xtable]; };
+DATforDCEMRI = derive { name="DATforDCEMRI"; version="0.55"; sha256="0v26a1gi8l21ga5nqcnyfaa7gc8zxq6wk95b96ajgpdybb0l9s53"; depends=[akima lattice locfit matlab R_methodsS3 R_oo xtable]; };
 DBFTest = derive { name="DBFTest"; version="1.0"; sha256="0h83ic16z0lg7grjh4jbrxf672qchqv4zzypm2b1mhmzl01jn1wg"; depends=[]; };
 DBGSA = derive { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; };
 DBI = derive { name="DBI"; version="0.3.1"; sha256="0xj5baxwnhl23rd5nskhjvranrwrc68f3xlyrklglipi41bm69hw"; depends=[]; };
-DBKGrad = derive { name="DBKGrad"; version="1.6"; sha256="0207zx0v1x3zhfbs0h1ssxc1b683k111f90k8ybhknb147104knr"; depends=[minpack_lm SDD TSA lattice]; };
-DCGL = derive { name="DCGL"; version="2.1.2"; sha256="1dhkdvdglpsr0fzrfrrr6q76jhwxgrcjsiqn56s082y7v366xvs4"; depends=[igraph]; };
+DBKGrad = derive { name="DBKGrad"; version="1.6"; sha256="0207zx0v1x3zhfbs0h1ssxc1b683k111f90k8ybhknb147104knr"; depends=[lattice minpack_lm SDD TSA]; };
+DCGL = derive { name="DCGL"; version="2.1.2"; sha256="1dhkdvdglpsr0fzrfrrr6q76jhwxgrcjsiqn56s082y7v366xvs4"; depends=[igraph limma]; };
 DCL = derive { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; };
-DCluster = derive { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot spdep MASS]; };
-DDD = derive { name="DDD"; version="2.7"; sha256="06nnfn84vhfix8ks08y3kar2cpm63fqghf9y2dhgrnb4midpk5ig"; depends=[deSolve ape ade4]; };
+DCluster = derive { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot MASS spdep]; };
+DDD = derive { name="DDD"; version="2.7"; sha256="06nnfn84vhfix8ks08y3kar2cpm63fqghf9y2dhgrnb4midpk5ig"; depends=[ade4 ape deSolve]; };
 DDHFm = derive { name="DDHFm"; version="1.1.1"; sha256="03zs2zbrhjcb321baghva7b8y61c8p9z6bfj2vg9cvadpb0260nk"; depends=[]; };
-DDIwR = derive { name="DDIwR"; version="0.2-0"; sha256="0dqbldl5c6b8i5q3yk0hwd12lp8z9j4ilnmsqrkj69fv7mys9q3k"; depends=[XML foreign]; };
+DDIwR = derive { name="DDIwR"; version="0.2-0"; sha256="0dqbldl5c6b8i5q3yk0hwd12lp8z9j4ilnmsqrkj69fv7mys9q3k"; depends=[foreign XML]; };
 DECIDE = derive { name="DECIDE"; version="1.2"; sha256="18kn2pm9r0ims2k1jfsfzh258wwxz0xg86rsbwgq6szh0azlq3qy"; depends=[]; };
 DEEPR = derive { name="DEEPR"; version="0.1"; sha256="0q8970q3gpjxwxdf2bkhpnqrxpm00w27b20a9sn9vv314rn1n7s8"; depends=[dirmult]; };
 DEMEtics = derive { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxjacdbmxdbpdm7cy9samn088w8fs0q232vjjx"; depends=[]; };
-DESnowball = derive { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue combinat MASS cluster]; };
+DESP = derive { name="DESP"; version="0.1-3"; sha256="18dx1ljc8radxdm57n0xcnza3w9wjl1zi60azjrazzfpwyjldc9l"; depends=[graph MASS Matrix RBGL SparseM]; };
+DESnowball = derive { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue cluster combinat MASS]; };
 DEoptim = derive { name="DEoptim"; version="2.2-3"; sha256="0pcs7kkhad139c3nhmg7bkac1av4siknfg59lpknwwrsxbz208dg"; depends=[]; };
 DEoptimR = derive { name="DEoptimR"; version="1.0-2"; sha256="00viy7x3br3094az635lmjydm826d48vv2f14rwmdhqmv03066kq"; depends=[]; };
-DFIT = derive { name="DFIT"; version="1.0-2"; sha256="1kn3av6pnkmf9703yp3cn0zbdzjzxrlm6nbbcg7lwv9550jw2c4n"; depends=[simex mvtnorm ggplot2]; };
-DIFlasso = derive { name="DIFlasso"; version="1.0-1"; sha256="048d5x9nzksphsdk9lwfagl165bb40r0pvjq2ihvhqvxspgpar4b"; depends=[grplasso penalized miscTools]; };
+DFIT = derive { name="DFIT"; version="1.0-2"; sha256="1kn3av6pnkmf9703yp3cn0zbdzjzxrlm6nbbcg7lwv9550jw2c4n"; depends=[ggplot2 mvtnorm simex]; };
+DIFlasso = derive { name="DIFlasso"; version="1.0-1"; sha256="048d5x9nzksphsdk9lwfagl165bb40r0pvjq2ihvhqvxspgpar4b"; depends=[grplasso miscTools penalized]; };
 DIFtree = derive { name="DIFtree"; version="1.0.0"; sha256="08s6ba44517xq783fysksb1h53zkqsk7zakaibi1c2npq1gzny9p"; depends=[penalized plotrix]; };
 DIME = derive { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; };
 DIRECT = derive { name="DIRECT"; version="1.0"; sha256="129bx45zmd6h7j6ilbzj2hjg4bcdc08dvm2igggi8ajndl1l5q9j"; depends=[]; };
-DLMtool = derive { name="DLMtool"; version="1.35"; sha256="1qcc5q35a68m468ip1mhij2g0qzz5fhcjzax11a8n2fl9x2s9d57"; depends=[snowfall boot MASS]; };
+DLMtool = derive { name="DLMtool"; version="1.35"; sha256="1qcc5q35a68m468ip1mhij2g0qzz5fhcjzax11a8n2fl9x2s9d57"; depends=[boot MASS snowfall]; };
 DMR = derive { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; };
-DMwR = derive { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[lattice xts quantmod zoo abind rpart class ROCR]; };
-DNAprofiles = derive { name="DNAprofiles"; version="0.3.1"; sha256="0chsndrmanb2swmhfan9iz1bzz3jsvk24n7j9fnjxibckmn2fdpv"; depends=[RcppProgress Rcpp bit Rcpp RcppProgress]; };
-DNAtools = derive { name="DNAtools"; version="0.1-21"; sha256="1ncx2rmxb0ip804x6xznfv8brjpp518fhnm1653mlrsl3hpzrh88"; depends=[Rsolnp multicool Rcpp Rcpp]; };
-DNMF = derive { name="DNMF"; version="1.3"; sha256="09yp6x6vd44ahklcag96fpjgyphyn45rkqkbwr1n36a2d8vxk9nc"; depends=[foreach Matrix gplots doParallel]; };
-DOBAD = derive { name="DOBAD"; version="1.0.4"; sha256="1hslwgs4q05xm29my5cq6g3vvjc0arvdmlx734wardj9dy29p1v5"; depends=[numDeriv lattice]; };
+DMwR = derive { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[abind class lattice quantmod ROCR rpart xts zoo]; };
+DNAprofiles = derive { name="DNAprofiles"; version="0.3.1"; sha256="0chsndrmanb2swmhfan9iz1bzz3jsvk24n7j9fnjxibckmn2fdpv"; depends=[bit Rcpp RcppProgress]; };
+DNAtools = derive { name="DNAtools"; version="0.1-21"; sha256="1ncx2rmxb0ip804x6xznfv8brjpp518fhnm1653mlrsl3hpzrh88"; depends=[multicool Rcpp Rsolnp]; };
+DNMF = derive { name="DNMF"; version="1.3"; sha256="09yp6x6vd44ahklcag96fpjgyphyn45rkqkbwr1n36a2d8vxk9nc"; depends=[doParallel foreach gplots Matrix]; };
+DOBAD = derive { name="DOBAD"; version="1.0.4"; sha256="1hslwgs4q05xm29my5cq6g3vvjc0arvdmlx734wardj9dy29p1v5"; depends=[lattice numDeriv]; };
 DOvalidation = derive { name="DOvalidation"; version="0.1.0"; sha256="0vm4sxbchkj2hk91xnzj6lpj05jg2zcinlbcamy0x1lrbjffn9zk"; depends=[]; };
 DPpackage = derive { name="DPpackage"; version="1.1-6"; sha256="01qdl6cp6wkddl9fwwpxwvyhb7lpjxis6wnbm2s288y2n9wi4j24"; depends=[MASS nlme survival]; };
 DPw = derive { name="DPw"; version="1.1.3"; sha256="1cw9qig5z2nfp2b3k4ng5hpar9izd3d6jihj93mkc0rqcli2wzp1"; depends=[fOptions]; };
 DSBayes = derive { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; };
 DSL = derive { name="DSL"; version="0.1-5"; sha256="0k320cmim9mvi5cmr6964h9i2jbskh76xws3p6zsfakk63ndg3rr"; depends=[]; };
-DSpat = derive { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[spatstat RandomFields rgeos mgcv sp]; };
-DSsim = derive { name="DSsim"; version="1.0.3"; sha256="01kkpzs0prcq43y4nmyaw39bgjabr99xxs2hn3fmb4ka46xj0bfb"; depends=[shapefiles splancs mrds mgcv]; };
-DStree = derive { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[rpart pec Ecdat rpart_plot survival Rcpp Rcpp]; };
+DSpat = derive { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; };
+DSsim = derive { name="DSsim"; version="1.0.3"; sha256="01kkpzs0prcq43y4nmyaw39bgjabr99xxs2hn3fmb4ka46xj0bfb"; depends=[mgcv mrds shapefiles splancs]; };
+DStree = derive { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[Ecdat pec Rcpp rpart rpart_plot survival]; };
 DSviaDRM = derive { name="DSviaDRM"; version="1.0"; sha256="1hj2pgnldrpgapwwz1kf4k6mvyzwdvb1i6czd7sbimsx5hafwps8"; depends=[igraph ppcor]; };
 DT = derive { name="DT"; version="0.1"; sha256="0mj7iiy1gglw7kixybmb7kr1bcl5r006zcb3klkw7p6vvvzdm6qj"; depends=[htmltools htmlwidgets magrittr]; };
 DTComPair = derive { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; };
 DTDA = derive { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; };
 DTK = derive { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; };
 DTMCPack = derive { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; };
-DTR = derive { name="DTR"; version="1.6"; sha256="186qgrx9alzmj1vdy2yvfqs5xgidmwddm0zgg041s5q992cih36g"; depends=[survival ggplot2 gridExtra aod proto]; };
-DVHmetrics = derive { name="DVHmetrics"; version="0.3"; sha256="1ndrzd5q12kabpk3yj95s24kn7ri61w1h4aa50zw9qb12f5dzc98"; depends=[ggplot2 reshape2 shiny KernSmooth markdown]; };
+DTR = derive { name="DTR"; version="1.6"; sha256="186qgrx9alzmj1vdy2yvfqs5xgidmwddm0zgg041s5q992cih36g"; depends=[aod ggplot2 gridExtra proto survival]; };
+DVHmetrics = derive { name="DVHmetrics"; version="0.3"; sha256="1ndrzd5q12kabpk3yj95s24kn7ri61w1h4aa50zw9qb12f5dzc98"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; };
+DYM = derive { name="DYM"; version="0.1.1"; sha256="0k6iqn1397by9pg31m3ypbnn85zv192ghsn4gpnsfhqfcp18q4d4"; depends=[]; };
 Daim = derive { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; };
 DandEFA = derive { name="DandEFA"; version="1.5"; sha256="0d82rjkgqf4w7qg7irlqvzzav1f23i2gmygkbf8jycaa6xhli80d"; depends=[gplots polycor]; };
 Dark = derive { name="Dark"; version="0.9.4"; sha256="0paw34zhbi8k6pjgykxxqhpjgl8qr340dv091r9931q4mm215j2n"; depends=[]; };
 DatABEL = derive { name="DatABEL"; version="0.9-6"; sha256="1w0w3gwacqrbqjdcngdp44d2gb16pq9grq2f8j2bhbxc4nkx12n1"; depends=[]; };
 DataCombine = derive { name="DataCombine"; version="0.2.9"; sha256="1yvpv28fwkifiiyzj121dhzwzp06fncms5jbwpvc3nkq1bpzm2mk"; depends=[data_table dplyr]; };
 Davies = derive { name="Davies"; version="1.1-8"; sha256="1wp7ifbs4vqfrn4vwh09lc53yiagpww91m5mxmcr62mjbw8q7zhr"; depends=[]; };
-Deducer = derive { name="Deducer"; version="0.7-7"; sha256="1x97rz92v1hx30fdmgd1lnzydgygjp6zh20v082qymvh997l1zzd"; depends=[ggplot2 JGR car MASS rJava e1071 scales plyr foreign multcomp effects]; };
+Deducer = derive { name="Deducer"; version="0.7-7"; sha256="1x97rz92v1hx30fdmgd1lnzydgygjp6zh20v082qymvh997l1zzd"; depends=[car e1071 effects foreign ggplot2 JGR MASS multcomp plyr rJava scales]; };
 DeducerExtras = derive { name="DeducerExtras"; version="1.7"; sha256="0sngsq31469a74y7nhskl82fwy2i0ga68m9g6b1xyhxz1a8kgvlg"; depends=[Deducer irr rJava]; };
 DeducerPlugInExample = derive { name="DeducerPlugInExample"; version="0.2-0"; sha256="03aw7wr957xzw920ybyzxnck5kx0q2xpcrpq8jh2afyzszy6hzbi"; depends=[Deducer]; };
-DeducerPlugInScaling = derive { name="DeducerPlugInScaling"; version="0.1-0"; sha256="1qg11vi4szznchh54p9345jbmrfzfr9z5l3x5xz4m86myjkys1mb"; depends=[Deducer psych GPArotation mvnormtest irr klaR]; };
-DeducerSpatial = derive { name="DeducerSpatial"; version="0.7"; sha256="0133qk3yjcifyha7c4pqr5s0hmbci72bzgil2r0sxjmrljs3q727"; depends=[JavaGD Deducer sp maptools OpenStreetMap scales rgdal UScensus2010 Hmisc]; };
+DeducerPlugInScaling = derive { name="DeducerPlugInScaling"; version="0.1-0"; sha256="1qg11vi4szznchh54p9345jbmrfzfr9z5l3x5xz4m86myjkys1mb"; depends=[Deducer GPArotation irr klaR mvnormtest psych]; };
+DeducerSpatial = derive { name="DeducerSpatial"; version="0.7"; sha256="0133qk3yjcifyha7c4pqr5s0hmbci72bzgil2r0sxjmrljs3q727"; depends=[Deducer Hmisc JavaGD maptools OpenStreetMap rgdal scales sp UScensus2010]; };
 DeducerSurvival = derive { name="DeducerSurvival"; version="0.1-0"; sha256="03qk3y4pibvrxbnxbm5rlksw807dvbilip1jbpn1r7k02ibzq676"; depends=[Deducer]; };
-DeducerText = derive { name="DeducerText"; version="0.1-2"; sha256="0if2p9j74wa5rva4iv0i8iax22grl9j7lqcqzqlywjgqwnlzxa05"; depends=[Deducer tm wordcloud RColorBrewer SnowballC]; };
-Delaporte = derive { name="Delaporte"; version="2.2-2"; sha256="1smx8vbi1kvfij00aq0fzj03sxagnzn9vfws0f5973bp3q72x86q"; depends=[Rcpp Rcpp]; };
-Demerelate = derive { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmij5ldrmhcn12s9yxd0rargc5vzvkrwcqpkgylkn"; depends=[Formula fts sfsmisc vegan mlogit]; };
+DeducerText = derive { name="DeducerText"; version="0.1-2"; sha256="0if2p9j74wa5rva4iv0i8iax22grl9j7lqcqzqlywjgqwnlzxa05"; depends=[Deducer RColorBrewer SnowballC tm wordcloud]; };
+Delaporte = derive { name="Delaporte"; version="2.2-2"; sha256="1smx8vbi1kvfij00aq0fzj03sxagnzn9vfws0f5973bp3q72x86q"; depends=[Rcpp]; };
+Demerelate = derive { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmij5ldrmhcn12s9yxd0rargc5vzvkrwcqpkgylkn"; depends=[Formula fts mlogit sfsmisc vegan]; };
 DendSer = derive { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; };
 Density_T_HoldOut = derive { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; };
-DepthProc = derive { name="DepthProc"; version="1.0.3"; sha256="0xil3pl33224sizn1wy9x3lcngw017qjl22hfqzss9iy73cmxqnc"; depends=[ggplot2 Rcpp rrcov MASS np lattice sm geometry colorspace Rcpp RcppArmadillo]; };
+DepthProc = derive { name="DepthProc"; version="1.0.3"; sha256="0xil3pl33224sizn1wy9x3lcngw017qjl22hfqzss9iy73cmxqnc"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm]; };
 Deriv = derive { name="Deriv"; version="3.5.4"; sha256="07a3pm79mv8wiapjdb2n6scgl3hc7pvz9inalm80aqlhpqrvp3hs"; depends=[]; };
-DescTools = derive { name="DescTools"; version="0.99.11"; sha256="0ccqgx6w7x55h5pd76hjyq79g0cdyw2m0w1h55kw4chqj0ibqizy"; depends=[manipulate boot mvtnorm foreign]; };
-DescribeDisplay = derive { name="DescribeDisplay"; version="0.2.4"; sha256="13npxq1314n4n08j6hbmij7qinl1xrxrgc5hxpbbpbd16d75c7iw"; depends=[proto reshape2 ggplot2 plyr scales GGally]; };
-DetMCD = derive { name="DetMCD"; version="0.0.2"; sha256="0z4zs0k8c8gsd2fry984p06l3p17fdyfky8fv9kvypk7xdg52whc"; depends=[robustbase Rcpp RcppEigen]; };
+DescTools = derive { name="DescTools"; version="0.99.11"; sha256="0ccqgx6w7x55h5pd76hjyq79g0cdyw2m0w1h55kw4chqj0ibqizy"; depends=[boot foreign manipulate mvtnorm]; };
+DescribeDisplay = derive { name="DescribeDisplay"; version="0.2.4"; sha256="13npxq1314n4n08j6hbmij7qinl1xrxrgc5hxpbbpbd16d75c7iw"; depends=[GGally ggplot2 plyr proto reshape2 scales]; };
+DetMCD = derive { name="DetMCD"; version="0.0.2"; sha256="0z4zs0k8c8gsd2fry984p06l3p17fdyfky8fv9kvypk7xdg52whc"; depends=[Rcpp RcppEigen robustbase]; };
 DetSel = derive { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; };
-Devore7 = derive { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[MASS lattice]; };
-DiagTest3Grp = derive { name="DiagTest3Grp"; version="1.6"; sha256="04dxyyqv333rkjf2vlfpal59m7klhw6y7qilym6nw78qb1kqqys7"; depends=[car KernSmooth gplots]; };
+Devore7 = derive { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[lattice MASS]; };
+DiagTest3Grp = derive { name="DiagTest3Grp"; version="1.6"; sha256="04dxyyqv333rkjf2vlfpal59m7klhw6y7qilym6nw78qb1kqqys7"; depends=[car gplots KernSmooth]; };
 DiagrammeR = derive { name="DiagrammeR"; version="0.7"; sha256="0cfxhxs4b5kknp1xsq2gg0dnyyv9vrj3bfswlvc5np7pkxankr2r"; depends=[htmlwidgets rstudioapi stringr]; };
-DiceDesign = derive { name="DiceDesign"; version="1.6"; sha256="1djq7clga3cvpgfycs3zjj106213yhfj9909sqrni70nj1nwdpj9"; depends=[]; };
-DiceEval = derive { name="DiceEval"; version="1.3"; sha256="1vp9zwd09cwl3c8066jr9d3w4yic70fvd40r7hsj2y8d0bhiwl82"; depends=[DiceKriging]; };
+DiceDesign = derive { name="DiceDesign"; version="1.7"; sha256="05bmscy275077kmbmg75npnmw30kd5x5wmlizcfq771zixby3f7h"; depends=[]; };
+DiceEval = derive { name="DiceEval"; version="1.4"; sha256="06p3v161ig714k7z59iji64xhxw1a68kqhnlwhwpjpyrx7kn137b"; depends=[DiceKriging]; };
 DiceKriging = derive { name="DiceKriging"; version="1.5.5"; sha256="035kbk633v4kfb44wiyb556sayl73c24fc1w09r3f33shqgidzjm"; depends=[]; };
-DiceOptim = derive { name="DiceOptim"; version="1.5"; sha256="0ajqn5p7sl9rdj35wy45vmmzxl2d97jgz5wdq6ghdzxq523vfkz3"; depends=[DiceKriging rgenoud MASS lhs mnormt]; };
-DiceView = derive { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceKriging DiceEval rgl]; };
-DiffCorr = derive { name="DiffCorr"; version="0.4.1"; sha256="1kxp9dbiww086rmvmjvfhbk7jl36dkj88qwii6zg57llf7l5l4hm"; depends=[igraph fdrtool]; };
+DiceOptim = derive { name="DiceOptim"; version="1.5"; sha256="0ajqn5p7sl9rdj35wy45vmmzxl2d97jgz5wdq6ghdzxq523vfkz3"; depends=[DiceKriging lhs MASS mnormt rgenoud]; };
+DiceView = derive { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceEval DiceKriging rgl]; };
+DiffCorr = derive { name="DiffCorr"; version="0.4.1"; sha256="1kxp9dbiww086rmvmjvfhbk7jl36dkj88qwii6zg57llf7l5l4hm"; depends=[fdrtool igraph multtest pcaMethods]; };
 Digiroo2 = derive { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; };
-DirichletReg = derive { name="DirichletReg"; version="0.6-2"; sha256="08qfykyahyq54l9zm7g1yzmk2biz4xqq3qpxw0py4xazq719slk8"; depends=[Formula rgl maxLik]; };
+DirichletReg = derive { name="DirichletReg"; version="0.6-2"; sha256="08qfykyahyq54l9zm7g1yzmk2biz4xqq3qpxw0py4xazq719slk8"; depends=[Formula maxLik rgl]; };
 Disake = derive { name="Disake"; version="1.5"; sha256="1fw45fmnir6h34jw8917mhyz6cgzbq4ywyyf51qxhm68wgzy9h17"; depends=[]; };
 DiscML = derive { name="DiscML"; version="1.0.1"; sha256="0qkh0yak1kmzxxx0cqb47zgrj8v2s1d5danpibwwg43j138sb73l"; depends=[ape]; };
 DiscreteInverseWeibull = derive { name="DiscreteInverseWeibull"; version="1.0.1"; sha256="0w0s2fixpcmcwids35xx91hll9rf9qbi7155sp90dxd3vr8c939v"; depends=[Rsolnp]; };
@@ -476,88 +481,88 @@ DiscreteLaplace = derive { name="DiscreteLaplace"; version="1.0"; sha256="1mwqvl
 DiscreteWeibull = derive { name="DiscreteWeibull"; version="1.0"; sha256="0v8za4arqarf20jrw38dzcjxdwfdpn0ss7p5yxbwhylnj7qz207w"; depends=[Rsolnp]; };
 DiscriMiner = derive { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; };
 Distance = derive { name="Distance"; version="0.9.3"; sha256="054z9pi8m8gjpax3s2hajvaik4yvfpy8qc4gmpl9bqncrk594pbv"; depends=[mrds]; };
-DistatisR = derive { name="DistatisR"; version="1.0"; sha256="1il00v26q68h5dd5c9lm2jblgn8hs6n0457r13mlw6r7pcj0158j"; depends=[prettyGraphs car]; };
+DistatisR = derive { name="DistatisR"; version="1.0"; sha256="1il00v26q68h5dd5c9lm2jblgn8hs6n0457r13mlw6r7pcj0158j"; depends=[car prettyGraphs]; };
 DistributionUtils = derive { name="DistributionUtils"; version="0.5-1"; sha256="0gw531wfrjx1sxh17qh48dwbxnibgr0viga07vsp8nay7l02jap9"; depends=[RUnit]; };
 DivE = derive { name="DivE"; version="1.0"; sha256="1ixkk8kd3ri78ykq178izib0vwppnbiwbpc1139rcl8f5giiwcdh"; depends=[deSolve FME rgeos sp]; };
 DivMelt = derive { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; };
 DiversitySampler = derive { name="DiversitySampler"; version="2.1"; sha256="1sfx7craykb82ncphvdj19mzc0kwzafhxlk9jcxkskygrlwsxfgg"; depends=[]; };
 DnE = derive { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; };
-DoE_base = derive { name="DoE.base"; version="0.27"; sha256="0nh0hs4g8cl3h7p84ddag1qk4rdyw5wb13qnvw23r12q0f1p6y3l"; depends=[conf_design vcd combinat MASS]; };
-DoE_wrapper = derive { name="DoE.wrapper"; version="0.8-10"; sha256="12q3arfm76x9j8qnrmw07jh904qdqz59ga1zk8m3n17prr11vrgb"; depends=[FrF2 DoE_base rsm lhs DiceDesign AlgDesign]; };
+DoE_base = derive { name="DoE.base"; version="0.27"; sha256="0nh0hs4g8cl3h7p84ddag1qk4rdyw5wb13qnvw23r12q0f1p6y3l"; depends=[combinat conf_design MASS vcd]; };
+DoE_wrapper = derive { name="DoE.wrapper"; version="0.8-10"; sha256="12q3arfm76x9j8qnrmw07jh904qdqz59ga1zk8m3n17prr11vrgb"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; };
 Dodge = derive { name="Dodge"; version="0.8"; sha256="1vnvqb2qvl6c13s48pyfn1g6yfhc60ql3vn7yh2zymxcsr1gxgcw"; depends=[]; };
-Dominance = derive { name="Dominance"; version="1.0.0"; sha256="0xcmslzfdcy826vcnlybhdyym5kqkrdqidq6jn10s4jic7jk8nl3"; depends=[igraph chron gdata]; };
+Dominance = derive { name="Dominance"; version="1.0.0"; sha256="0xcmslzfdcy826vcnlybhdyym5kqkrdqidq6jn10s4jic7jk8nl3"; depends=[chron gdata igraph]; };
 DoseFinding = derive { name="DoseFinding"; version="0.9-12"; sha256="126xhq1ckry65g312cqvs9bdcl2ws34k6xnq7n9dcgi8jiizz46d"; depends=[lattice mvtnorm]; };
-DoubleCone = derive { name="DoubleCone"; version="1.0"; sha256="1pba9ypp0n3i2k3ji1x8j7h548pfam9z99hxylcjcxnnvc7xs2fw"; depends=[coneproj Matrix MASS]; };
+DoubleCone = derive { name="DoubleCone"; version="1.0"; sha256="1pba9ypp0n3i2k3ji1x8j7h548pfam9z99hxylcjcxnnvc7xs2fw"; depends=[coneproj MASS Matrix]; };
 DoubleExpSeq = derive { name="DoubleExpSeq"; version="1.0"; sha256="0y797iqmxihrsp8lhy84p5hlyw3ckpklv0pgcqv4h39a6cpglbvd"; depends=[numDeriv]; };
 DunnettTests = derive { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; };
 DynClust = derive { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; };
-DynNom = derive { name="DynNom"; version="1.0.1"; sha256="0gdy3kqj63khm74cdjhfmlnd06ard97h1598rkqwm7c3cng7b98c"; depends=[ggplot2 stargazer shiny compare]; };
+DynNom = derive { name="DynNom"; version="1.0.1"; sha256="0gdy3kqj63khm74cdjhfmlnd06ard97h1598rkqwm7c3cng7b98c"; depends=[compare ggplot2 shiny stargazer]; };
 DynTxRegime = derive { name="DynTxRegime"; version="2.1"; sha256="0dxf16zpj6cyx7afbvr4w4d76w4vshbvvkkqla68dbav0yvy7z7i"; depends=[modelObj]; };
 DynamicDistribution = derive { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; };
 EBEN = derive { name="EBEN"; version="1.1.1"; sha256="12nh96avcx4rrbmlr1q046i5ymrsnqvf0ra5ynh58akajfx7wy49"; depends=[]; };
-EBMAforecast = derive { name="EBMAforecast"; version="0.42"; sha256="161l6jxbzli2g5lcmlp74z320rsvsi80pxk1vc1ypa1hgwz3q80x"; depends=[separationplot ensembleBMA plyr Hmisc abind]; };
+EBMAforecast = derive { name="EBMAforecast"; version="0.42"; sha256="161l6jxbzli2g5lcmlp74z320rsvsi80pxk1vc1ypa1hgwz3q80x"; depends=[abind ensembleBMA Hmisc plyr separationplot]; };
 EBS = derive { name="EBS"; version="3.0"; sha256="0nrqglbfr7wagd4xrk5jx0kficjgvk7wqwzqrbs589dkll24sn5b"; depends=[MASS]; };
 EBglmnet = derive { name="EBglmnet"; version="3.6"; sha256="0qjwk5y9bghidha4i937nc0kl1jz4d8g2br6ij8651lf2byj9s1a"; depends=[]; };
 EDISON = derive { name="EDISON"; version="1.1"; sha256="09xw4p4hwj8djq143wfdcqhr2mhwynj4ixj3ma7crhqidgal169p"; depends=[corpcor MASS]; };
 EDR = derive { name="EDR"; version="0.6-5.1"; sha256="10ldygd1ymc4s9gqhhnpipggsiv4rwbgajvdk4mykkg3zmz7cbpm"; depends=[]; };
-EFDR = derive { name="EFDR"; version="0.1.1"; sha256="0jgznwrd40g9xmvhrd7b441g79x41ppfdn6vbsbzc0k5ym1wzb1p"; depends=[Matrix foreach doParallel waveslim gstat tidyr dplyr sp]; };
-EGRET = derive { name="EGRET"; version="2.2.0"; sha256="1a3bvmshmxrnaijl9pklfia0ab94rzn22ywjh9gwn268qai52zjy"; depends=[dataRetrieval survival fields lubridate]; };
-EIAdata = derive { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszczdr4j4svn2k024462sgj1sn07a4a4z2s"; depends=[XML plyr xts zoo]; };
+EFDR = derive { name="EFDR"; version="0.1.1"; sha256="0jgznwrd40g9xmvhrd7b441g79x41ppfdn6vbsbzc0k5ym1wzb1p"; depends=[doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; };
+EGRET = derive { name="EGRET"; version="2.2.0"; sha256="1a3bvmshmxrnaijl9pklfia0ab94rzn22ywjh9gwn268qai52zjy"; depends=[dataRetrieval fields lubridate survival]; };
+EIAdata = derive { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszczdr4j4svn2k024462sgj1sn07a4a4z2s"; depends=[plyr XML xts zoo]; };
 EILA = derive { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; };
 EL = derive { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; };
-ELT = derive { name="ELT"; version="1.3"; sha256="0q6gc3npwxqq0hz1ardssv5wfxjnx93pi4l1viqsb0wp2kkfq3w6"; depends=[locfit lattice latticeExtra xlsx]; };
+ELT = derive { name="ELT"; version="1.3"; sha256="0q6gc3npwxqq0hz1ardssv5wfxjnx93pi4l1viqsb0wp2kkfq3w6"; depends=[lattice latticeExtra locfit xlsx]; };
 ELYP = derive { name="ELYP"; version="0.7-2"; sha256="1aji3b9mixhzc6zv7qksacx328drpi0q7pgv3gi6iazira7lybdy"; depends=[survival]; };
-EMA = derive { name="EMA"; version="1.4.4"; sha256="1hqkan9k6ps4qckjrhsgxzham106fm38m5rgayz8i2ji3spvbfca"; depends=[survival xtable heatmap_plus GSA MASS FactoMineR cluster]; };
-EMC = derive { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[mvtnorm MASS]; };
-EMCC = derive { name="EMCC"; version="1.2"; sha256="1qff8yvw7iqdsrqkvwb7m14xh7gcnjcrf8gw00g4j6aq0h0cgk2z"; depends=[MASS mclust EMC]; };
+EMA = derive { name="EMA"; version="1.4.4"; sha256="1hqkan9k6ps4qckjrhsgxzham106fm38m5rgayz8i2ji3spvbfca"; depends=[affy AnnotationDbi biomaRt cluster FactoMineR gcrma GSA heatmap_plus MASS multtest siggenes survival xtable]; };
+EMC = derive { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[MASS mvtnorm]; };
+EMCC = derive { name="EMCC"; version="1.2"; sha256="1qff8yvw7iqdsrqkvwb7m14xh7gcnjcrf8gw00g4j6aq0h0cgk2z"; depends=[EMC MASS mclust]; };
 EMCluster = derive { name="EMCluster"; version="0.2-4"; sha256="0m5cl5mrg6q0ixfpjj1jwd7l5hcldc33lr7n6xgy7p9nlr52mimz"; depends=[MASS]; };
 EMD = derive { name="EMD"; version="1.5.7"; sha256="0m2g7akg9h964d6qr1mj20h9pcb2fcmala3skhl0qpy8qz01w5ck"; depends=[fields locfit]; };
 EMJumpDiffusion = derive { name="EMJumpDiffusion"; version="1.4.1"; sha256="10lw6717yq9vlywn5ilsl0d99fpx3zvc87vf7s0zxswhs81h7x1w"; depends=[]; };
 EMMAgeo = derive { name="EMMAgeo"; version="0.9.1"; sha256="1rxbb666gh9g35m4jqa6y1zjp82s62ha6n92fkjvkk9wm25w6imr"; depends=[GPArotation limSolve shape]; };
 EMMIXcontrasts = derive { name="EMMIXcontrasts"; version="1.0.0"; sha256="1q7bwf7kkpraj38lz5s1lhhghp7a5lzyj5b9x8024g6rh2qlwp7v"; depends=[]; };
-EMMIXskew = derive { name="EMMIXskew"; version="1.0.1"; sha256="16jkq0a9k1gf6gia8r65nwa2lh8zny4jmnq51g2rcqm44s5ylqbh"; depends=[lattice mvtnorm KernSmooth]; };
+EMMIXskew = derive { name="EMMIXskew"; version="1.0.1"; sha256="16jkq0a9k1gf6gia8r65nwa2lh8zny4jmnq51g2rcqm44s5ylqbh"; depends=[KernSmooth lattice mvtnorm]; };
 EMMIXuskew = derive { name="EMMIXuskew"; version="0.11-6"; sha256="0japf0l0sj84jna7b5kirp6pgqa4c923ldwphb16ch2xxrgk5n5k"; depends=[MASS]; };
 EMMREML = derive { name="EMMREML"; version="3.0"; sha256="0y37ydssn6m2q78v2aympfjr6z2hcn5y3dlgv4pj5g414fikb825"; depends=[Matrix]; };
 EMP = derive { name="EMP"; version="2.0.1"; sha256="1zdy05jfhcgj6415pnm079v8xjg90n3akp1rwq65jbqdar38zj4y"; depends=[ROCR]; };
 EMT = derive { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; };
 EMVC = derive { name="EMVC"; version="0.1"; sha256="1725zrvq419yj0gd79h8bm56lv2mmk296wq3wapivcy6xn0j97jh"; depends=[]; };
 ENMeval = derive { name="ENMeval"; version="0.1.1"; sha256="0g1h8dklv6rv73wwpx3vhbpnwply5lpq8x9jvl7r018x9gcvvb9m"; depends=[dismo raster rJava]; };
-ENiRG = derive { name="ENiRG"; version="0.1"; sha256="1cnl1mjl5y1rc6fv7c9jw2lkm898l3flfrj3idx9v1brjzyx5xlf"; depends=[ade4 raster R_utils sp spgrass6 gdata fgui miniGUI]; };
-ENmisc = derive { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc vcd RColorBrewer]; };
-EQL = derive { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[ttutils lattice]; };
+ENiRG = derive { name="ENiRG"; version="0.1"; sha256="1cnl1mjl5y1rc6fv7c9jw2lkm898l3flfrj3idx9v1brjzyx5xlf"; depends=[ade4 fgui gdata miniGUI R_utils raster sp spgrass6]; };
+ENmisc = derive { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc RColorBrewer vcd]; };
+EQL = derive { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[lattice ttutils]; };
 ERP = derive { name="ERP"; version="1.0.1"; sha256="0wy1p7pp9dvc3krylskb627rmfqaj11qvia97m88x05ydqx1fwmr"; depends=[fdrtool mnormt]; };
 ES = derive { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; };
-ESEA = derive { name="ESEA"; version="1.0"; sha256="06r5lki32mxkznj6yxvlz0ikqcxm3jbaralv4qp9xrw6dy6yyg27"; depends=[igraph XML parmigene]; };
+ESEA = derive { name="ESEA"; version="1.0"; sha256="06r5lki32mxkznj6yxvlz0ikqcxm3jbaralv4qp9xrw6dy6yyg27"; depends=[igraph parmigene XML]; };
 ESG = derive { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; };
-ESGtoolkit = derive { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahini5yhgc43msdxwvn45l57xbfszahsnr3b3aq"; depends=[CDVine ggplot2 gridExtra reshape2 ycinterextra Rcpp Rcpp]; };
+ESGtoolkit = derive { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahini5yhgc43msdxwvn45l57xbfszahsnr3b3aq"; depends=[CDVine ggplot2 gridExtra Rcpp reshape2 ycinterextra]; };
 ETAS = derive { name="ETAS"; version="0.0-1"; sha256="1p38ay3vnca8b8wszm66whxap8k58c004l1nlsk7zkynyia0im6c"; depends=[spatstat]; };
 ETC = derive { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; };
-ETLUtils = derive { name="ETLUtils"; version="1.3"; sha256="13xq9i9fr34kx1nym7nr02gynshzm4jjn4qzx6ydg044b7xl57jp"; depends=[ff bit]; };
+ETLUtils = derive { name="ETLUtils"; version="1.3"; sha256="13xq9i9fr34kx1nym7nr02gynshzm4jjn4qzx6ydg044b7xl57jp"; depends=[bit ff]; };
 EW = derive { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; };
-EWGoF = derive { name="EWGoF"; version="2.1"; sha256="10p392n003sxn8l9sfnksi789k1w191rmkah6gxhji5f41gib5rh"; depends=[Rcpp Rcpp]; };
-EasyABC = derive { name="EasyABC"; version="1.4"; sha256="0v3i7vlx2pnfkcqxka4g7ss8k8zphyx3vq5l0c1b433qp0fnjwf3"; depends=[abc pls mnormt MASS lhs]; };
-EasyHTMLReport = derive { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc markdown knitr ggplot2 scales xtable reshape2]; };
-EasyMARK = derive { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[MASS stringr rjags coda foreach doParallel random]; };
+EWGoF = derive { name="EWGoF"; version="2.1"; sha256="10p392n003sxn8l9sfnksi789k1w191rmkah6gxhji5f41gib5rh"; depends=[Rcpp]; };
+EasyABC = derive { name="EasyABC"; version="1.4"; sha256="0v3i7vlx2pnfkcqxka4g7ss8k8zphyx3vq5l0c1b433qp0fnjwf3"; depends=[abc lhs MASS mnormt pls]; };
+EasyHTMLReport = derive { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc ggplot2 knitr markdown reshape2 scales xtable]; };
+EasyMARK = derive { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[coda doParallel foreach MASS random rjags stringr]; };
 EasyStrata = derive { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8ijwxmjkcqjvc1ng0jsadkqpfz71a963nkqdcl"; depends=[Cairo plotrix]; };
 EbayesThresh = derive { name="EbayesThresh"; version="1.3.2"; sha256="0n7cr917jrvmgwfqki7shvz9g9zpmbz9z8hm5ax7s8nnfzphrh4g"; depends=[]; };
 Ecdat = derive { name="Ecdat"; version="0.2-7"; sha256="1z9mxx3mvn3vi5drxlzss7gs7vpzg7shinl529bx4jpxqpci90jy"; depends=[Ecfun]; };
-Ecfun = derive { name="Ecfun"; version="0.1-4"; sha256="0h3351pcahrn578lz1pcb7h3chmh0vmwbn9iqll98vibck847gai"; depends=[fda gdata RCurl XML tis jpeg MASS TeachingDemos stringi]; };
+Ecfun = derive { name="Ecfun"; version="0.1-4"; sha256="0h3351pcahrn578lz1pcb7h3chmh0vmwbn9iqll98vibck847gai"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML]; };
 EcoGenetics = derive { name="EcoGenetics"; version="1.2.0"; sha256="090vcbl8gl23335rga1126w6jqvql62kk9wxlfpjz4q11czgdclq"; depends=[adegenet ggplot2 hierfstat party raster rgdal rkt SoDA sp vegan]; };
-EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[operators topmodel DEoptim XML]; };
+EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[DEoptim operators topmodel XML]; };
 EcoSimR = derive { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; };
 EcoTroph = derive { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; };
 EcoVirtual = derive { name="EcoVirtual"; version="0.1"; sha256="1c815kxljk4qhw0zs28w16ggasfyyyb6aggffx1m1q21s63h6c8h"; depends=[]; };
-EditImputeCont = derive { name="EditImputeCont"; version="1.0.0"; sha256="1ghrax514hm8zymmaifwbls4wpic8qqzlf83p615k3d96p4lb304"; depends=[Rcpp editrules Rcpp]; };
-EffectLiteR = derive { name="EffectLiteR"; version="0.3-3"; sha256="14v5samvkzpiy0gq6lq1vs5jqi084sq1if2sih0lk57qxz2647qh"; depends=[lavaan shiny foreign ggplot2 nnet survey lavaan_survey car]; };
+EditImputeCont = derive { name="EditImputeCont"; version="1.0.0"; sha256="1ghrax514hm8zymmaifwbls4wpic8qqzlf83p615k3d96p4lb304"; depends=[editrules Rcpp]; };
+EffectLiteR = derive { name="EffectLiteR"; version="0.3-3"; sha256="14v5samvkzpiy0gq6lq1vs5jqi084sq1if2sih0lk57qxz2647qh"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; };
 EffectStars = derive { name="EffectStars"; version="1.5"; sha256="0j2jxxxpcsrsjzszz4mfk3892ain3qkswa1dkpsmfsk4zs06g0s4"; depends=[VGAM]; };
 EffectTreat = derive { name="EffectTreat"; version="0.1-11"; sha256="1ps3jac3wc1v325maf4vx9jkirxbc1dfflr218xbzbgrj0zx9diz"; depends=[]; };
 EffectsRelBaseline = derive { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; };
 ElemStatLearn = derive { name="ElemStatLearn"; version="2012.04-0"; sha256="107x2mybadqgw03j3yq8ibq3ljs4fpx90chvsirpylqhv77wsabl"; depends=[]; };
 EloRating = derive { name="EloRating"; version="0.43"; sha256="0gzpi4qjiqn0lzjwy37pkz6fg7dkp2hv2dfqgzfk32wsj0bswgab"; depends=[zoo]; };
-ElstonStewart = derive { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[kinship2 digest]; };
-EnQuireR = derive { name="EnQuireR"; version="0.10"; sha256="00kyclcr8da79lwpqa1vzkwn6pgf197h2biackwgphb0byhi8ssx"; depends=[FactoMineR SensoMineR Rcmdr MASS]; };
+ElstonStewart = derive { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[digest kinship2]; };
+EnQuireR = derive { name="EnQuireR"; version="0.10"; sha256="00kyclcr8da79lwpqa1vzkwn6pgf197h2biackwgphb0byhi8ssx"; depends=[FactoMineR MASS Rcmdr SensoMineR]; };
 EngrExpt = derive { name="EngrExpt"; version="0.1-8"; sha256="0zclvckj2i7j4kfs58hcjcl722vl2y6dcnjz238cjfgwv279gqhp"; depends=[lattice]; };
-EnsembleBase = derive { name="EnsembleBase"; version="0.7.1"; sha256="1yc5afim7zprxvnk5r2m0wwrl15b8sifxnh00b1x7qnzyz4glfl2"; depends=[kknn gbm nnet e1071 randomForest doParallel foreach]; };
+EnsembleBase = derive { name="EnsembleBase"; version="0.7.1"; sha256="1yc5afim7zprxvnk5r2m0wwrl15b8sifxnh00b1x7qnzyz4glfl2"; depends=[doParallel e1071 foreach gbm kknn nnet randomForest]; };
 EnsembleCV = derive { name="EnsembleCV"; version="0.7.1"; sha256="14mvwfjbhsrq9q7k5ph5sf9zriazgfby376v1zjm82r93y4samsf"; depends=[EnsembleBase]; };
 EnsemblePCReg = derive { name="EnsemblePCReg"; version="0.6"; sha256="0amswx7x08hpfvsrkjyfz3adkfshl7d1knyvk9nrnrrpy65rilc3"; depends=[EnsembleBase]; };
 EnsemblePenReg = derive { name="EnsemblePenReg"; version="0.6"; sha256="0fjp50jbnbhvyd7srvhy0ipysm192d8ikg9yra2vch33zrid2xbm"; depends=[EnsembleBase glmnet]; };
@@ -567,126 +572,126 @@ EnvNicheR = derive { name="EnvNicheR"; version="1.0"; sha256="1vw21gsdrx8gkf1rf8
 EnvStats = derive { name="EnvStats"; version="2.0.1"; sha256="1z909p56dlhr00a5ir55sn5ny51h1wwi85as6arv3cn8c0zqyi74"; depends=[MASS]; };
 EnviroStat = derive { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; };
 Epi = derive { name="Epi"; version="1.1.67"; sha256="12wbzv21whjnzlyqacgqmsgrjbkgj2495y9fwvav5mr21yfrjds3"; depends=[]; };
-EpiContactTrace = derive { name="EpiContactTrace"; version="0.8.8"; sha256="1vlr2xxnyq1i6ky39g8j3pf3m5775bmhii7vpskb0x7nnq161yzb"; depends=[Rcpp plyr R2HTML Rcpp]; };
-EpiDynamics = derive { name="EpiDynamics"; version="0.2"; sha256="1hqbfysvw2ln8z3as6lfcjlhkzccksngwh2vm25zsgy93gxw3mcc"; depends=[deSolve reshape2 ggplot2]; };
+EpiContactTrace = derive { name="EpiContactTrace"; version="0.8.8"; sha256="1vlr2xxnyq1i6ky39g8j3pf3m5775bmhii7vpskb0x7nnq161yzb"; depends=[plyr R2HTML Rcpp]; };
+EpiDynamics = derive { name="EpiDynamics"; version="0.2"; sha256="1hqbfysvw2ln8z3as6lfcjlhkzccksngwh2vm25zsgy93gxw3mcc"; depends=[deSolve ggplot2 reshape2]; };
 EpiEstim = derive { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; };
-EpiModel = derive { name="EpiModel"; version="1.1.6"; sha256="0h3bbvk9qyhc0jml2jd21dahi1v00alar67jkzpwnavvmcgd8a3s"; depends=[deSolve network networkDynamic tergm doParallel ergm foreach RColorBrewer statnet_common]; };
+EpiModel = derive { name="EpiModel"; version="1.1.6"; sha256="0h3bbvk9qyhc0jml2jd21dahi1v00alar67jkzpwnavvmcgd8a3s"; depends=[deSolve doParallel ergm foreach network networkDynamic RColorBrewer statnet_common tergm]; };
 Eplot = derive { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; };
 EstCRM = derive { name="EstCRM"; version="1.3"; sha256="0fmnlh0pnprskq01iq3rfassyxq7fywiprvqw0xdlh8yxl3w2c9n"; depends=[Hmisc lattice]; };
 EstSimPDMP = derive { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; };
 EvCombR = derive { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; };
-EvalEst = derive { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[tfplot dse setRNG tframe]; };
+EvalEst = derive { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[dse setRNG tfplot tframe]; };
 Evapotranspiration = derive { name="Evapotranspiration"; version="1.5"; sha256="181s9wwil07740n79gz2ar9c1bjxy45v4fyxxkqjmdfly72la542"; depends=[zoo]; };
 EvoRAG = derive { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; };
 ExPosition = derive { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; };
 Exact = derive { name="Exact"; version="1.6"; sha256="0d5g5p98yrcd6v56iadsq448hl522shdqln2icmc3yfnya326as7"; depends=[]; };
 ExactCIdiff = derive { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; };
-ExactPath = derive { name="ExactPath"; version="1.0"; sha256="0ngvalmgdswf73q0jr4psg0ihnb7qwkamm6h64l01k5rmgd5nm16"; depends=[ncvreg lars]; };
-ExceedanceTools = derive { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[splancs SpatialTools]; };
-ExomeDepth = derive { name="ExomeDepth"; version="1.1.5"; sha256="11ff89c080855wmvglapif7h3wmk6zrgfqcb0kshy4jglpwkz52x"; depends=[aod VGAM]; };
+ExactPath = derive { name="ExactPath"; version="1.0"; sha256="0ngvalmgdswf73q0jr4psg0ihnb7qwkamm6h64l01k5rmgd5nm16"; depends=[lars ncvreg]; };
+ExceedanceTools = derive { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[SpatialTools splancs]; };
+ExomeDepth = derive { name="ExomeDepth"; version="1.1.5"; sha256="11ff89c080855wmvglapif7h3wmk6zrgfqcb0kshy4jglpwkz52x"; depends=[aod Biostrings GenomicAlignments GenomicRanges IRanges Rsamtools VGAM]; };
 ExpDes = derive { name="ExpDes"; version="1.1.2"; sha256="0qfigbx06b3p04x5v7wban139mp8hg8x77x6nzwa4v6dr226qbkv"; depends=[]; };
 ExpDes_pt = derive { name="ExpDes.pt"; version="1.1.2"; sha256="0khw2jhg2vxcivgr20ybvrsqhd8l8bir5xjmr4m44za9nhap43bz"; depends=[]; };
 ExtDist = derive { name="ExtDist"; version="0.6-3"; sha256="1vsxm578bb70wnz3mxm7y1n5vs0x5pby99hvxg5y5ksh2g2ascwa"; depends=[numDeriv optimx]; };
 ExtremeBounds = derive { name="ExtremeBounds"; version="0.1.5"; sha256="1fsrp2dm1bdg5p0qsi2wa8qxrlq065jlazsxzixpjsni910mrb2k"; depends=[Formula]; };
 FACTscorer = derive { name="FACTscorer"; version="0.1.0"; sha256="1gbfpm5szi6w8iyp7ywpqrmdq0wrv5axj29sj9gxjwmjfh5qgqjx"; depends=[]; };
-FADA = derive { name="FADA"; version="1.2"; sha256="1wpjqvhhgvirzcvl8r23iaw63wr8rys19mjy71mn24wg3zwnc2qz"; depends=[MASS elasticnet sparseLDA sda glmnet mnormt crossval]; };
+FADA = derive { name="FADA"; version="1.2"; sha256="1wpjqvhhgvirzcvl8r23iaw63wr8rys19mjy71mn24wg3zwnc2qz"; depends=[crossval elasticnet glmnet MASS mnormt sda sparseLDA]; };
 FAMILY = derive { name="FAMILY"; version="0.1.18"; sha256="1f1s0p721sl27b9xp2wrdyx03kv1bdin4wfknmw1k0nnc94dcnp2"; depends=[pheatmap pROC]; };
-FAMT = derive { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[mnormt]; };
-FAOSTAT = derive { name="FAOSTAT"; version="2.0"; sha256="06z8c964sf73ld4v9vybqjsdxskxp3ssyv0a3mpcs9la5y7n9jaz"; depends=[RJSONIO plyr data_table MASS classInt ggplot2 labeling scales]; };
+FAMT = derive { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[impute mnormt]; };
+FAOSTAT = derive { name="FAOSTAT"; version="2.0"; sha256="06z8c964sf73ld4v9vybqjsdxskxp3ssyv0a3mpcs9la5y7n9jaz"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO scales]; };
 FAdist = derive { name="FAdist"; version="2.1"; sha256="1y66ymg0k6kmyq4bclwwlqkp8brkq925ajpp0jqqn39f749c2kji"; depends=[]; };
-FAiR = derive { name="FAiR"; version="0.4-15"; sha256="18nj95fiy3j7kf4nzf692dxja3msnaaj5csg745bnajb48l606wz"; depends=[rgenoud gWidgetsRGtk2 rrcov Matrix]; };
+FAiR = derive { name="FAiR"; version="0.4-15"; sha256="18nj95fiy3j7kf4nzf692dxja3msnaaj5csg745bnajb48l606wz"; depends=[gWidgetsRGtk2 Matrix rgenoud rrcov]; };
 FAmle = derive { name="FAmle"; version="1.3.3"; sha256="125m2hvl603avg9h9x5gfb7l9clpg7p0ir8fdypxyjiqggdr8hxa"; depends=[mvtnorm]; };
-FAwR = derive { name="FAwR"; version="1.1.0"; sha256="0566h9fgnnk8xankqkpvcshf8acr46lz84sf2pzlmasgvwh7xp19"; depends=[MASS lattice glpkAPI]; };
-FBFsearch = derive { name="FBFsearch"; version="1.0"; sha256="1nxfhll9gx9l6hzpcihlz880qxr0fyv5rjghk0xgp8xn4r5wxw11"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
+FAwR = derive { name="FAwR"; version="1.1.0"; sha256="0566h9fgnnk8xankqkpvcshf8acr46lz84sf2pzlmasgvwh7xp19"; depends=[glpkAPI lattice MASS]; };
+FBFsearch = derive { name="FBFsearch"; version="1.0"; sha256="1nxfhll9gx9l6hzpcihlz880qxr0fyv5rjghk0xgp8xn4r5wxw11"; depends=[Rcpp RcppArmadillo]; };
 FBN = derive { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; };
 FCMapper = derive { name="FCMapper"; version="1.0"; sha256="1wp5byx68067fnc0sl5zwvw2wllaqdbcy4g2gbzmlqwli0jz2dsk"; depends=[igraph]; };
 FD = derive { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7mrzhx7gwri3vp9y7a1380sbi"; depends=[ade4 ape geometry vegan]; };
-FDGcopulas = derive { name="FDGcopulas"; version="1.0"; sha256="1i86ns4hq74y0gnxfschshjlc6if3js0disjb4bwfizaclwbw3as"; depends=[Rcpp numDeriv randtoolbox Rcpp]; };
-FDRreg = derive { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda Rcpp mosaic Rcpp RcppArmadillo]; };
-FDboost = derive { name="FDboost"; version="0.0-8"; sha256="1xvyndbfd0df6ld7r6f6ajr7i6aql26n9j5ncn6rw5gm0f64s1lq"; depends=[mboost Matrix mgcv zoo MASS]; };
-FFD = derive { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[tkrplot R2HTML]; };
+FDGcopulas = derive { name="FDGcopulas"; version="1.0"; sha256="1i86ns4hq74y0gnxfschshjlc6if3js0disjb4bwfizaclwbw3as"; depends=[numDeriv randtoolbox Rcpp]; };
+FDRreg = derive { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; };
+FDboost = derive { name="FDboost"; version="0.0-8"; sha256="1xvyndbfd0df6ld7r6f6ajr7i6aql26n9j5ncn6rw5gm0f64s1lq"; depends=[MASS Matrix mboost mgcv zoo]; };
+FFD = derive { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[R2HTML tkrplot]; };
 FField = derive { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; };
 FGN = derive { name="FGN"; version="2.0-12"; sha256="0jxawb4wm1vcp0131mdnc0r24dw8sd29ih0fc2wh6ahy7mxzajqn"; depends=[akima ltsa]; };
 FGSG = derive { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; };
 FGalgorithm = derive { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; };
-FHtest = derive { name="FHtest"; version="1.2"; sha256="033p90zzlgx2galzp2iwwpg29hhhgscqmqkwpr69y2ck3nj3hz0v"; depends=[interval KMsurv survival perm MASS]; };
+FHtest = derive { name="FHtest"; version="1.2"; sha256="033p90zzlgx2galzp2iwwpg29hhhgscqmqkwpr69y2ck3nj3hz0v"; depends=[interval KMsurv MASS perm survival]; };
 FI = derive { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; };
 FITSio = derive { name="FITSio"; version="2.0-0"; sha256="1gf3i1q9g81gydag2gj1wsy6wi5jj2v4j3lyrnh1n2g4kxd6s3cp"; depends=[]; };
 FKF = derive { name="FKF"; version="0.1.3"; sha256="01ibihca39zng4wrvhq8h28bmb2rnsjm21xy22b85kpn3mbnh7f1"; depends=[RUnit]; };
-FLIM = derive { name="FLIM"; version="1.2"; sha256="180az4zwmfcglmvismyacmh7ri4qg8jvhlisqpway0z5z6fsda6r"; depends=[zoo MASS]; };
+FLIM = derive { name="FLIM"; version="1.2"; sha256="180az4zwmfcglmvismyacmh7ri4qg8jvhlisqpway0z5z6fsda6r"; depends=[MASS zoo]; };
 FLLat = derive { name="FLLat"; version="1.1"; sha256="1h2nfx7gb66hjdfkdm6im6n8c1fjdz9csg39pckb47c0khl3g9r0"; depends=[gplots]; };
 FLR = derive { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; };
-FLSSS = derive { name="FLSSS"; version="3.1"; sha256="0cyrjq1b0s7x0dz3x2kvd7pr8v4lyw1324ik4rnbj9hv9mf1g0af"; depends=[Rcpp Rcpp]; };
-FME = derive { name="FME"; version="1.3.2"; sha256="1sjnsc8jbylb2bln5ic24s5bany3clzn44lqnymhsy81x88396ff"; depends=[deSolve rootSolve coda minpack_lm MASS]; };
+FLSSS = derive { name="FLSSS"; version="3.1"; sha256="0cyrjq1b0s7x0dz3x2kvd7pr8v4lyw1324ik4rnbj9hv9mf1g0af"; depends=[Rcpp]; };
+FME = derive { name="FME"; version="1.3.2"; sha256="1sjnsc8jbylb2bln5ic24s5bany3clzn44lqnymhsy81x88396ff"; depends=[coda deSolve MASS minpack_lm rootSolve]; };
 FMStable = derive { name="FMStable"; version="0.1-2"; sha256="00viigpqfbqc4hyl9cwicbwqf2ksjak28qrqaa16jhbqz93j4fck"; depends=[]; };
 FNN = derive { name="FNN"; version="1.1"; sha256="1kncmiaraq1mrykb9fj3fsxswabk3l71fnp1vks0x9aay5xfk8mj"; depends=[]; };
 FPDclustering = derive { name="FPDclustering"; version="1.0"; sha256="078vvpn9lwza45l9k53m3yzhrkkyakm1ynm93x5yld4fgkrd3c33"; depends=[ThreeWay]; };
 FRACTION = derive { name="FRACTION"; version="1.0"; sha256="0g25dzsbharsq8bzfka96zccaqppdclax24mz5m080ddg4y8zj49"; depends=[]; };
 FRAPO = derive { name="FRAPO"; version="0.3-8"; sha256="1wqayyai8pdm1vq6qvpd10qpd882cyjb0y0jl582fxd3a2ic7n14"; depends=[quadprog Rglpk timeSeries]; };
 FRB = derive { name="FRB"; version="1.8"; sha256="13rp4gqldx84mngrdv5fa9xamkng7b3kgy30ywykcx46gmrym6ps"; depends=[corpcor rrcov]; };
-FRCC = derive { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[CCP MASS calibrate corpcor]; };
+FRCC = derive { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[calibrate CCP corpcor MASS]; };
 FREQ = derive { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; };
-FRESA_CAD = derive { name="FRESA.CAD"; version="2.0.2"; sha256="1clnv18d6f747725ayksas3c2hng1bkb4zss44avfqh9q1y0z1iy"; depends=[Rcpp stringr miscTools Hmisc pROC Rcpp RcppArmadillo]; };
-FSInteract = derive { name="FSInteract"; version="0.1.1"; sha256="0hlmz0sc4l9vmb4b2y3j95gh39m1jqrp9bvqsjjqdr0ly1lb7mvm"; depends=[Rcpp Matrix Rcpp]; };
-FSelector = derive { name="FSelector"; version="0.20"; sha256="0gbnm48x5myhxxw8gz7ck9sl41nj5rxq4gwifqk3l4kiqphywlpi"; depends=[randomForest RWeka digest entropy]; };
-FTICRMS = derive { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[Matrix lattice]; };
+FRESA_CAD = derive { name="FRESA.CAD"; version="2.0.2"; sha256="1clnv18d6f747725ayksas3c2hng1bkb4zss44avfqh9q1y0z1iy"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; };
+FSInteract = derive { name="FSInteract"; version="0.1.1"; sha256="0hlmz0sc4l9vmb4b2y3j95gh39m1jqrp9bvqsjjqdr0ly1lb7mvm"; depends=[Matrix Rcpp]; };
+FSelector = derive { name="FSelector"; version="0.20"; sha256="0gbnm48x5myhxxw8gz7ck9sl41nj5rxq4gwifqk3l4kiqphywlpi"; depends=[digest entropy randomForest RWeka]; };
+FTICRMS = derive { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[lattice Matrix]; };
 FWDselect = derive { name="FWDselect"; version="2.0"; sha256="12hhb2vysg3c9fzh56xy3kwhwbgcn1yx4afhlpydnavp3aclrqrg"; depends=[cvTools mgcv]; };
-FacPad = derive { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[Rlab MASS]; };
+FacPad = derive { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; };
 FactMixtAnalysis = derive { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
 FactoClass = derive { name="FactoClass"; version="1.1.1"; sha256="0m5108g2nhdwqqmkn04l1x0kx32ikkhcz6gki0hpj9hlzrkya5w6"; depends=[ade4 xtable]; };
-FactoMineR = derive { name="FactoMineR"; version="1.29"; sha256="08pyp8z9xhy9f1mrcgdm13xqrca63xhpyarkq5fg7hv0ncs68s1h"; depends=[MASS ellipse lattice cluster scatterplot3d leaps flashClust]; };
-Factoshiny = derive { name="Factoshiny"; version="1.0"; sha256="0r8xnnmf2c0nhddgzwsfb86ajpirkr1788phhcjdap1w9k67nsy9"; depends=[FactoMineR shiny]; };
+FactoMineR = derive { name="FactoMineR"; version="1.30"; sha256="16zxrr1mqv56ipkhz2m8hrhipxynphy9d104zsqbwa0k7336z2b0"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; };
+Factoshiny = derive { name="Factoshiny"; version="1.0.2"; sha256="0wwsv0frn2d6a5l5lr9qzqglznaigc23bq7nhcbfy1wlvsmimnr3"; depends=[FactoMineR shiny]; };
 Fahrmeir = derive { name="Fahrmeir"; version="2012.04-0"; sha256="1axx6r4g6gj1inih41i2az4y0d3jq9x1a6nyj8k7wp51z4z2nbmk"; depends=[]; };
 Familias = derive { name="Familias"; version="2.2"; sha256="1nhjxn3f063gvi4jvwb8r4fap7f1zbcvb6qa30153yh31yprljls"; depends=[kinship2 paramlink]; };
-FastHCS = derive { name="FastHCS"; version="0.0.5"; sha256="02ds9syqh8wpjrqibdv3kqxcyijclm572daqrj262b4b6211v46x"; depends=[matrixStats robustbase Rcpp RcppEigen]; };
+FastHCS = derive { name="FastHCS"; version="0.0.5"; sha256="02ds9syqh8wpjrqibdv3kqxcyijclm572daqrj262b4b6211v46x"; depends=[matrixStats Rcpp RcppEigen robustbase]; };
 FastImputation = derive { name="FastImputation"; version="1.2"; sha256="04bz623kcanxcl9z8zl6m7m47pk0szcjrjlgs5v1yl3jnq9m2n7g"; depends=[]; };
-FastKNN = derive { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp1zvy9xlmyjid441mf62dq08a0zncnyss"; depends=[pdist assertthat]; };
+FastKNN = derive { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp1zvy9xlmyjid441mf62dq08a0zncnyss"; depends=[assertthat pdist]; };
 FastPCS = derive { name="FastPCS"; version="0.1.2"; sha256="1lqb6g65vna2p7kc2y4kc5piy3280nlxl41bdkxkng2icmq14l58"; depends=[matrixStats Rcpp RcppEigen]; };
 FastRCS = derive { name="FastRCS"; version="0.0.6"; sha256="0wjsh37jas8hcb9554ijvwj0k8dx96fjf88bzgy7nbim2byiy8p8"; depends=[matrixStats Rcpp RcppEigen]; };
 FastRWeb = derive { name="FastRWeb"; version="1.1-0"; sha256="1hiabi7ibp69n5wi5x4kwznxhc2i7dxdrqf1fm6ppv7ix0wkjs07"; depends=[Cairo]; };
 FatTailsR = derive { name="FatTailsR"; version="1.0-3"; sha256="0r9n18qlr70p6y4v1xv1lxi1lzm9qp29qy4w51chllqjn15kmv7l"; depends=[minpack_lm]; };
 FeaLect = derive { name="FeaLect"; version="1.10"; sha256="1r7rgcadrqjhxn2g2w16axygsck82fprxg7l14ai11bn4b7h4pmb"; depends=[lars rms]; };
-FeatureHashing = derive { name="FeatureHashing"; version="0.9"; sha256="1xbzmyah22kjrkd7ln1pjzwyn5w0zmhdhs9w1a3p8rjxrwmx6ssf"; depends=[Rcpp Matrix digest magrittr Rcpp digest BH]; };
-FedData = derive { name="FedData"; version="1.1.0"; sha256="0s5blfhlizl4lv22lxjhqrwrf10mxgy2cd5z4a9xg05k419q7alr"; depends=[sp rgdal raster RCurl rgeos igraph data_table devtools soilDB]; };
-FeedbackTS = derive { name="FeedbackTS"; version="1.3.1"; sha256="1zx64wbl5pzqn69bjhshd3nayxx4wlg7n1zwv7ilh68raxfxnbbx"; depends=[maps mapdata proj4 geoR sp]; };
-FieldSim = derive { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[rgl RColorBrewer]; };
+FeatureHashing = derive { name="FeatureHashing"; version="0.9"; sha256="1xbzmyah22kjrkd7ln1pjzwyn5w0zmhdhs9w1a3p8rjxrwmx6ssf"; depends=[BH digest magrittr Matrix Rcpp]; };
+FedData = derive { name="FedData"; version="1.1.0"; sha256="0s5blfhlizl4lv22lxjhqrwrf10mxgy2cd5z4a9xg05k419q7alr"; depends=[data_table devtools igraph raster RCurl rgdal rgeos soilDB sp]; };
+FeedbackTS = derive { name="FeedbackTS"; version="1.3.1"; sha256="1zx64wbl5pzqn69bjhshd3nayxx4wlg7n1zwv7ilh68raxfxnbbx"; depends=[geoR mapdata maps proj4 sp]; };
+FieldSim = derive { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[RColorBrewer rgl]; };
 FinAsym = derive { name="FinAsym"; version="1.0"; sha256="0v15ydz4sq9djwcdcfp90mk8l951rry7h91d7asgg53mddbxjj6f"; depends=[]; };
-FinCal = derive { name="FinCal"; version="0.6"; sha256="0slw5s7gilmv0j8iwhz27lss2gbrj2l8zqv7bqywr1yf0hw2nxn7"; depends=[ggplot2 reshape2 scales RCurl]; };
+FinCal = derive { name="FinCal"; version="0.6"; sha256="0slw5s7gilmv0j8iwhz27lss2gbrj2l8zqv7bqywr1yf0hw2nxn7"; depends=[ggplot2 RCurl reshape2 scales]; };
 FinCovRegularization = derive { name="FinCovRegularization"; version="1.0.0"; sha256="0da7asm4mvbd4wvqll5gdvckb10ccfx7gy141xbxyaixdhgi6zl4"; depends=[quadprog]; };
 FinTS = derive { name="FinTS"; version="0.4-5"; sha256="16m57h6rk4344aalfwaz7hsyis30c1dirsyx8ih661ihgqn1ai1r"; depends=[zoo]; };
-FinancialInstrument = derive { name="FinancialInstrument"; version="1.2.0"; sha256="0lx8gqmnapyizlg0qdcjy8xrkpbhj0f7nc95l86a6xy82hz62dzb"; depends=[quantmod zoo xts TTR]; };
+FinancialInstrument = derive { name="FinancialInstrument"; version="1.2.0"; sha256="0lx8gqmnapyizlg0qdcjy8xrkpbhj0f7nc95l86a6xy82hz62dzb"; depends=[quantmod TTR xts zoo]; };
 FindAllRoots = derive { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; };
 FindIt = derive { name="FindIt"; version="0.5"; sha256="0bj4al4b7na3w5y783nqyd2wc1pmwfmgf2p4q6n7vqbzqghy0a3q"; depends=[glmnet lars Matrix]; };
 FindMinIC = derive { name="FindMinIC"; version="1.6"; sha256="0vlr56nw32msvz8bljrw82nzrnazncs6nz7zisidffm2v3najkar"; depends=[nlme sets]; };
-FisHiCal = derive { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph RcppArmadillo Rcpp RcppArmadillo]; };
-FisherEM = derive { name="FisherEM"; version="1.4"; sha256="1lhkyyk82i6alxyiqrvy5fx60f8vab0y62zmw5fjaq6h0vczqn3s"; depends=[MASS elasticnet]; };
-FitAR = derive { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[lattice leaps ltsa bestglm lattice leaps ltsa]; };
+FisHiCal = derive { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph Rcpp RcppArmadillo]; };
+FisherEM = derive { name="FisherEM"; version="1.4"; sha256="1lhkyyk82i6alxyiqrvy5fx60f8vab0y62zmw5fjaq6h0vczqn3s"; depends=[elasticnet MASS]; };
+FitAR = derive { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[bestglm lattice leaps ltsa]; };
 FitARMA = derive { name="FitARMA"; version="1.6"; sha256="1r9mqrqkm4wh3nd6v9wmpj23gw21i4p89p6z4c7639kn4f590ldk"; depends=[FitAR]; };
 FlexParamCurve = derive { name="FlexParamCurve"; version="1.5-2"; sha256="1r8iacjnpbkpqwp58dz724g1cpnmll4b1mkxnsdj3h9iq1rbi7bq"; depends=[nlme]; };
 FluOMatic = derive { name="FluOMatic"; version="1.0"; sha256="06hww6viynisnfiphvghv4iqf1gk2snb8aksignaw8pnlkixnsg7"; depends=[]; };
 Flury = derive { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; };
 ForIT = derive { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; };
-ForImp = derive { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals sampling mvtnorm]; };
+ForImp = derive { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals mvtnorm sampling]; };
 ForeCA = derive { name="ForeCA"; version="0.2.2"; sha256="1iszhiqn0vg3l2c8cgshk8qir0dqml4jsl942hdsmjm6raxlb6n9"; depends=[ifultools MASS sapa]; };
 FormalSeries = derive { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; };
 Formula = derive { name="Formula"; version="1.2-1"; sha256="02in5325zzrqbhlygx6s0dinj6ymw845q70y56frqacv25ayzcax"; depends=[]; };
 ForwardSearch = derive { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; };
 FourScores = derive { name="FourScores"; version="1.0"; sha256="0d21mrl9bzsvhljv7ymiyck508smp66w9qivrb2rp0p803h9yibm"; depends=[]; };
-FrF2 = derive { name="FrF2"; version="1.7-1"; sha256="0i9hfx7n0g866imdsmalqzs8v95vx08cz97hi8311v1wc3pqsn1j"; depends=[DoE_base sfsmisc BsMD scatterplot3d igraph]; };
+FrF2 = derive { name="FrF2"; version="1.7-1"; sha256="0i9hfx7n0g866imdsmalqzs8v95vx08cz97hi8311v1wc3pqsn1j"; depends=[BsMD DoE_base igraph scatterplot3d sfsmisc]; };
 FrF2_catlg128 = derive { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; };
 Frames2 = derive { name="Frames2"; version="0.1.1"; sha256="004h3w5bfnbbxa8yczlcd8m0bc9xq91dg5ph6yql28ivibw24q1l"; depends=[sampling]; };
-FreeSortR = derive { name="FreeSortR"; version="1.1"; sha256="03z5wmr88gr6raa2cg7w4j6y5vgxr3g8b8axzhbd7jipswr5x1jf"; depends=[smacof vegan ellipse]; };
-FunChisq = derive { name="FunChisq"; version="2.0.2"; sha256="0j767iwf1hr7r532hdkrl9q2xiz997gd3rc7aca18fj743w6ras9"; depends=[Rcpp BH Rcpp RcppClassic]; };
-FunCluster = derive { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[Hmisc cluster]; };
+FreeSortR = derive { name="FreeSortR"; version="1.1"; sha256="03z5wmr88gr6raa2cg7w4j6y5vgxr3g8b8axzhbd7jipswr5x1jf"; depends=[ellipse smacof vegan]; };
+FunChisq = derive { name="FunChisq"; version="2.0.2"; sha256="0j767iwf1hr7r532hdkrl9q2xiz997gd3rc7aca18fj743w6ras9"; depends=[BH Rcpp RcppClassic]; };
+FunCluster = derive { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; };
 FuncMap = derive { name="FuncMap"; version="1.0-3"; sha256="0bhx7y1n75r3jwf5mkx2i2bqfjgzxgsw58nwhfl48ldibgx7h1qs"; depends=[mvbutils]; };
-Funclustering = derive { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp Rcpp RcppEigen]; };
-FunctionalNetworks = derive { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[]; };
+Funclustering = derive { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp RcppEigen]; };
+FunctionalNetworks = derive { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[Biobase]; };
 FusedPCA = derive { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; };
 FuzzyNumbers = derive { name="FuzzyNumbers"; version="0.4-1"; sha256="15i0chp43y8xfyzkjrbljmdvgjjx9w1l5ayhvavk9y85pwb147b8"; depends=[]; };
-FuzzyStatProb = derive { name="FuzzyStatProb"; version="2.0"; sha256="06s45w18airrrs5ppy325idv4yi6nf69nrs18gha55kb2xvjq3km"; depends=[MultinomialCI FuzzyNumbers DEoptim]; };
+FuzzyStatProb = derive { name="FuzzyStatProb"; version="2.0.1"; sha256="0cj6dqb5iy4gw7kkip9jvk9djf6dx20078kmb42br8sim1065j8m"; depends=[DEoptim FuzzyNumbers MultinomialCI]; };
 FuzzyToolkitUoN = derive { name="FuzzyToolkitUoN"; version="1.0"; sha256="104s45mmlam67vwpshhpns2mgwvmhnbj8w1918jyk2r5mqibwz06"; depends=[]; };
-G1DBN = derive { name="G1DBN"; version="3.1.1"; sha256="015rw3bpz32a8254janddgg1ip947qgcvmiwx5r3v7g8n854bwxn"; depends=[MASS igraph]; };
-G2Sd = derive { name="G2Sd"; version="2.1.3"; sha256="02j30mfrzi4q3a387i0cr4khj2hzf7jrlyj06qc8bwlhz0f4l35m"; depends=[shiny xlsx rJava xlsxjars reshape2 ggplot2]; };
+G1DBN = derive { name="G1DBN"; version="3.1.1"; sha256="015rw3bpz32a8254janddgg1ip947qgcvmiwx5r3v7g8n854bwxn"; depends=[igraph MASS]; };
+G2Sd = derive { name="G2Sd"; version="2.1.3"; sha256="02j30mfrzi4q3a387i0cr4khj2hzf7jrlyj06qc8bwlhz0f4l35m"; depends=[ggplot2 reshape2 rJava shiny xlsx xlsxjars]; };
 GA = derive { name="GA"; version="2.2"; sha256="1pk80jwzvpmi61df0y331qvl8jkdizblg93s7gaspkbzy50wyfkp"; depends=[foreach iterators]; };
 GA4Stratification = derive { name="GA4Stratification"; version="1.0"; sha256="0li23mrxjx72fir16j3q06fa32cicck4pfc30n0dy2lysf81m9gs"; depends=[]; };
 GABi = derive { name="GABi"; version="0.1"; sha256="1zmiaqbd1jrpiz9hk16s8rggcpl3xyyhjkkdliymx2p42vy5b5mf"; depends=[hash]; };
@@ -700,141 +705,141 @@ GAabbreviate = derive { name="GAabbreviate"; version="1.0"; sha256="0c9407i6dq7p
 GB2 = derive { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; };
 GCAI_bias = derive { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; };
 GCD = derive { name="GCD"; version="3.0.5"; sha256="1ami5xw5xx464pxr9y1z9bb3dvj46vx3wrbh19w4g7sk8yjvh5nl"; depends=[]; };
-GCPM = derive { name="GCPM"; version="1.1.1"; sha256="1wm7nmqj88j1pd2s1lvi6z1fizm3q3cl7vbzp88vbhpij4rnk4jl"; depends=[Rcpp RcppProgress Rcpp RcppProgress]; };
+GCPM = derive { name="GCPM"; version="1.1.1"; sha256="1wm7nmqj88j1pd2s1lvi6z1fizm3q3cl7vbzp88vbhpij4rnk4jl"; depends=[Rcpp RcppProgress]; };
 GDAdata = derive { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; };
 GDAtools = derive { name="GDAtools"; version="1.3"; sha256="1av29mllix0az4n85vxh1344j6jmy103hd78ibjwxalm620rp7ns"; depends=[FactoMineR]; };
 GDELTtools = derive { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; };
 GENEAread = derive { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; };
-GENLIB = derive { name="GENLIB"; version="1.0.4"; sha256="1gl8qsgm9iy57rlajgc47lfxah52jsg7lpj131a6813kj0c639l7"; depends=[Rcpp kinship2 bootstrap Matrix lattice quadprog foreach doParallel Rcpp]; };
-GEOmap = derive { name="GEOmap"; version="2.3-5"; sha256="11sxlijfcswxmry6p9pb4g6prrql0qnqcqc21f72a0jp3k3670nc"; depends=[RPMG splancs fields]; };
-GESTr = derive { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[mclust gtools]; };
-GEVStableGarch = derive { name="GEVStableGarch"; version="1.0"; sha256="007s7lbfpp1bqnyg08rwarsmkxlx16p4is1k3736fmnri9sfp7z6"; depends=[fGarch fExtremes stabledist skewt Rsolnp]; };
+GENLIB = derive { name="GENLIB"; version="1.0.4"; sha256="1gl8qsgm9iy57rlajgc47lfxah52jsg7lpj131a6813kj0c639l7"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; };
+GEOmap = derive { name="GEOmap"; version="2.3-5"; sha256="11sxlijfcswxmry6p9pb4g6prrql0qnqcqc21f72a0jp3k3670nc"; depends=[fields RPMG splancs]; };
+GESTr = derive { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; };
+GEVStableGarch = derive { name="GEVStableGarch"; version="1.0"; sha256="007s7lbfpp1bqnyg08rwarsmkxlx16p4is1k3736fmnri9sfp7z6"; depends=[fExtremes fGarch Rsolnp skewt stabledist]; };
 GEVcdn = derive { name="GEVcdn"; version="1.1.3"; sha256="13p6hkdybs8s2i363z2a65yijqarwj9swvy22ljk61shf2nzbk80"; depends=[VGAM]; };
-GExMap = derive { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[]; };
+GExMap = derive { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; };
 GGEBiplotGUI = derive { name="GGEBiplotGUI"; version="1.0-8"; sha256="0bkagsm9mkcghc2q46cc86kjajzgjbq9588v0v2bp71qw8m97mbh"; depends=[rgl tkrplot]; };
 GGIR = derive { name="GGIR"; version="1.1-5"; sha256="0lanza1i7bqa0z745hbxkkyjhf6jy578jjva6nbisbbfsrbf7ydj"; depends=[]; };
-GGMselect = derive { name="GGMselect"; version="0.1-9"; sha256="18l98v6hv0sjhany275lsbdjwclx3abqfi924n9qlcnap1rvsfwz"; depends=[mvtnorm lars gtools]; };
+GGMselect = derive { name="GGMselect"; version="0.1-9"; sha256="18l98v6hv0sjhany275lsbdjwclx3abqfi924n9qlcnap1rvsfwz"; depends=[gtools lars mvtnorm]; };
 GGally = derive { name="GGally"; version="0.5.0"; sha256="00ix8qafi71l7vhj6268f9srqbgr9iw1qk0202y59mhfrj6c6f5i"; depends=[ggplot2 gtable plyr reshape stringr]; };
 GHQp = derive { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; };
 GIGrvg = derive { name="GIGrvg"; version="0.3"; sha256="014srgh79g8y9fcj979v3md9qqx9i6b6fx6lw0r0qdrg4v6bvr76"; depends=[]; };
-GISTools = derive { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools sp RColorBrewer MASS rgeos]; };
+GISTools = derive { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; };
 GLDEX = derive { name="GLDEX"; version="2.0.0.2"; sha256="16vy50jgk9b57h9f48097m17zrla6ksmi3wm4z2yadfg81sg8721"; depends=[cluster]; };
 GLDreg = derive { name="GLDreg"; version="1.0.2"; sha256="179qjcsfgzcw39gmmwlz9h608cq865kz2lvh76dwgyyn519l3y8g"; depends=[GLDEX]; };
-GLSME = derive { name="GLSME"; version="1.0.2"; sha256="1zdqrji8x0f3wjl8bhpbnwdfklihv3ii20iz2y2gsm53yzw7dlwq"; depends=[mvtnorm corpcor]; };
-GMCM = derive { name="GMCM"; version="1.2.1"; sha256="1s45xmbx64h3sb10py8n444jpxcgsz4pc36cz3zinfq55amf8r6r"; depends=[Rcpp Rcpp RcppArmadillo]; };
+GLSME = derive { name="GLSME"; version="1.0.2"; sha256="1zdqrji8x0f3wjl8bhpbnwdfklihv3ii20iz2y2gsm53yzw7dlwq"; depends=[corpcor mvtnorm]; };
+GMCM = derive { name="GMCM"; version="1.2.1"; sha256="1s45xmbx64h3sb10py8n444jpxcgsz4pc36cz3zinfq55amf8r6r"; depends=[Rcpp RcppArmadillo]; };
 GMD = derive { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; };
 GMDH = derive { name="GMDH"; version="1.0"; sha256="194bx1gg0d50fq9002ga8lwx288csfk5vfr1qwkn886wiw97wl9n"; depends=[MASS]; };
-GMMBoost = derive { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[minqa magic]; };
-GNE = derive { name="GNE"; version="0.99-0"; sha256="1iwlh1mx8z24hgry78i5sqfrbqqp4946x1jxh6h7z1vxs7qfpq0v"; depends=[alabama nleqslv BB SQUAREM]; };
+GMMBoost = derive { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; };
+GNE = derive { name="GNE"; version="0.99-0"; sha256="1iwlh1mx8z24hgry78i5sqfrbqqp4946x1jxh6h7z1vxs7qfpq0v"; depends=[alabama BB nleqslv SQUAREM]; };
 GOGANPA = derive { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; };
-GOplot = derive { name="GOplot"; version="1.0"; sha256="15ix1lcbxf63bmxvjsy7y2nz55wf539xii8rb7lf788jplh47gb6"; depends=[ggplot2 ggdendro gridExtra RColorBrewer]; };
+GOplot = derive { name="GOplot"; version="1.0"; sha256="15ix1lcbxf63bmxvjsy7y2nz55wf539xii8rb7lf788jplh47gb6"; depends=[ggdendro ggplot2 gridExtra RColorBrewer]; };
 GPArotation = derive { name="GPArotation"; version="2014.11-1"; sha256="15jh5qqqwx47ara6glilzha87rnih0hs5fsz0jjqwv6wr1gw26rm"; depends=[]; };
-GPC = derive { name="GPC"; version="0.1"; sha256="1naqy5g6a0z65wssfic5s7cw9v0zjckk526nian3l98ci22sz0j7"; depends=[randtoolbox orthopolynom ks lars]; };
+GPC = derive { name="GPC"; version="0.1"; sha256="1naqy5g6a0z65wssfic5s7cw9v0zjckk526nian3l98ci22sz0j7"; depends=[ks lars orthopolynom randtoolbox]; };
 GPCSIV = derive { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; };
-GPFDA = derive { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda_usc spam fda MASS]; };
+GPFDA = derive { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda fda_usc MASS spam]; };
 GPLTR = derive { name="GPLTR"; version="1.1"; sha256="0yp4b3ddvcd6s7rjpbmszl3a0x8qq6s138jjkm135yvbgp1jk5jz"; depends=[rpart]; };
-GPareto = derive { name="GPareto"; version="1.0.0"; sha256="0mzrl4xs7f5rkx0m4lkqy1456dnsa232hprmbg3bpris1rla780b"; depends=[DiceKriging emoa Rcpp rgenoud pbivnorm pso randtoolbox KrigInv MASS Rcpp]; };
-GPfit = derive { name="GPfit"; version="1.0-0"; sha256="0g0g343ncqsqh88qq9qrf4xv5n3sa980kqbvklcx534dmn6a7n2i"; depends=[lhs lattice]; };
-GPlab = derive { name="GPlab"; version="0.1.0"; sha256="05lp5hm5f9pwqcw88x2206babb8yd0nw5smsd6j555qikx8nv88i"; depends=[Rcpp testthat MASS numDeriv Rcpp]; };
+GPareto = derive { name="GPareto"; version="1.0.0"; sha256="0mzrl4xs7f5rkx0m4lkqy1456dnsa232hprmbg3bpris1rla780b"; depends=[DiceKriging emoa KrigInv MASS pbivnorm pso randtoolbox Rcpp rgenoud]; };
+GPfit = derive { name="GPfit"; version="1.0-0"; sha256="0g0g343ncqsqh88qq9qrf4xv5n3sa980kqbvklcx534dmn6a7n2i"; depends=[lattice lhs]; };
+GPlab = derive { name="GPlab"; version="0.1.0"; sha256="05lp5hm5f9pwqcw88x2206babb8yd0nw5smsd6j555qikx8nv88i"; depends=[MASS numDeriv Rcpp testthat]; };
 GPseq = derive { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; };
-GPvam = derive { name="GPvam"; version="3.0-2"; sha256="160j0zwbcmvzvia1b5p5midf395xfv1frk2w6w3v2zpbn8h6pdz5"; depends=[Rcpp RcppArmadillo Matrix numDeriv Rcpp RcppArmadillo]; };
+GPvam = derive { name="GPvam"; version="3.0-2"; sha256="160j0zwbcmvzvia1b5p5midf395xfv1frk2w6w3v2zpbn8h6pdz5"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
 GRTo = derive { name="GRTo"; version="1.2"; sha256="0x65g8a39vrb8m3hqajxi0ksmdavz0p6mlamqprkdn9p6ikf5c73"; depends=[bootstrap]; };
 GRaF = derive { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy2c5p51ws38xfz233sjz475snajr"; depends=[dismo]; };
 GSA = derive { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; };
-GSAgm = derive { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[survival]; };
-GSE = derive { name="GSE"; version="3.1"; sha256="08xr7w6dsmgs3l8ayihadcvwy0xdzn78fllxa42sk7nfz6waadr3"; depends=[Rcpp MASS ggplot2 Rcpp RcppArmadillo]; };
-GSIF = derive { name="GSIF"; version="0.4-6"; sha256="00m5djgc443678nwnmvgqv070g67pbvp1ci1x8gp7van8knjn5zq"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat plyr]; };
+GSAgm = derive { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; };
+GSE = derive { name="GSE"; version="3.1"; sha256="08xr7w6dsmgs3l8ayihadcvwy0xdzn78fllxa42sk7nfz6waadr3"; depends=[ggplot2 MASS Rcpp RcppArmadillo]; };
+GSIF = derive { name="GSIF"; version="0.4-6"; sha256="00m5djgc443678nwnmvgqv070g67pbvp1ci1x8gp7van8knjn5zq"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA sp]; };
 GSM = derive { name="GSM"; version="1.3.1"; sha256="1ay6znw31qnhz5k6fa0aiccr2xxmnj7v3vzrvlk6y5v5smlvybd0"; depends=[gtools]; };
 GUIDE = derive { name="GUIDE"; version="1.0.9"; sha256="1y0y6rwv1khd9bdaz5rl9nmxiangx0jckgihg16wb6hx6kf8kzc1"; depends=[rpanel tkrplot]; };
-GUILDS = derive { name="GUILDS"; version="1.2.1"; sha256="1z90qjgrx16yk956phbifcr7jd3w59h7akzz7p6g5ymrcjzih4qf"; depends=[Rcpp pracma subplex Rcpp]; };
-GUIProfiler = derive { name="GUIProfiler"; version="0.1.2"; sha256="1k56clda6xr649xfacnigi3c2s7ih1whchwcfqm7aa2d44vv3axz"; depends=[Nozzle_R1 MASS]; };
-GUTS = derive { name="GUTS"; version="0.9.3"; sha256="0gyi5vlr1r35qn3gj788lh9xrb7dz03r57hxk11x8w72kv415pih"; depends=[Rcpp Rcpp]; };
-GUniFrac = derive { name="GUniFrac"; version="1.0"; sha256="0xr68yv3h2lwn7sxy8l5p9g1z3q9hihg9jamsyl70jj9b2ic80jn"; depends=[vegan ape]; };
-GWAF = derive { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[geepack coxme lme4]; };
+GUILDS = derive { name="GUILDS"; version="1.2.1"; sha256="1z90qjgrx16yk956phbifcr7jd3w59h7akzz7p6g5ymrcjzih4qf"; depends=[pracma Rcpp subplex]; };
+GUIProfiler = derive { name="GUIProfiler"; version="0.1.2"; sha256="1k56clda6xr649xfacnigi3c2s7ih1whchwcfqm7aa2d44vv3axz"; depends=[MASS Nozzle_R1]; };
+GUTS = derive { name="GUTS"; version="0.9.3"; sha256="0gyi5vlr1r35qn3gj788lh9xrb7dz03r57hxk11x8w72kv415pih"; depends=[Rcpp]; };
+GUniFrac = derive { name="GUniFrac"; version="1.0"; sha256="0xr68yv3h2lwn7sxy8l5p9g1z3q9hihg9jamsyl70jj9b2ic80jn"; depends=[ape vegan]; };
+GWAF = derive { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[coxme geepack lme4]; };
 GWASExactHW = derive { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; };
 GWG = derive { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; };
-GWLelast = derive { name="GWLelast"; version="1.1"; sha256="0c3mcvmvxvgibja6rb8j2mhmmjny825wgvi1dw0pz8pq1kg1q0ay"; depends=[doParallel geosphere sp spgwr glmnet foreach]; };
+GWLelast = derive { name="GWLelast"; version="1.1"; sha256="0c3mcvmvxvgibja6rb8j2mhmmjny825wgvi1dw0pz8pq1kg1q0ay"; depends=[doParallel foreach geosphere glmnet sp spgwr]; };
 GWRM = derive { name="GWRM"; version="2.0"; sha256="1dfrwxr12dn6i39mv6i3j6k341f9rvd76skh0350jn6zx1cdkj9k"; depends=[SuppDists]; };
 GWmodel = derive { name="GWmodel"; version="1.2-5"; sha256="14pp1hy4bqr6kg9fy9nchjm6kb3l85f58rl2449b7wv7vsk3yfvk"; depends=[maptools robustbase sp]; };
 GWsignif = derive { name="GWsignif"; version="1.0"; sha256="04663qgy3xmijrx8m1s5ql7zj70mgsd58dl08ci742l1fzmfya5f"; depends=[]; };
 GaDiFPT = derive { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; };
-GameTheory = derive { name="GameTheory"; version="1.0"; sha256="07v2qhnhczid814isnz4ywf624sds6jxxzayl8mzlnjv5qnk59z8"; depends=[lpSolveAPI combinat gtools ineq kappalab]; };
+GameTheory = derive { name="GameTheory"; version="1.0"; sha256="07v2qhnhczid814isnz4ywf624sds6jxxzayl8mzlnjv5qnk59z8"; depends=[combinat gtools ineq kappalab lpSolveAPI]; };
 Gammareg = derive { name="Gammareg"; version="1.0"; sha256="1a5wibnbd8jg0v8577n1x9kc358qpd4jz7l8h7r541sdpprm6wb0"; depends=[]; };
-GenABEL = derive { name="GenABEL"; version="1.8-0"; sha256="0sd497qvik70iwv7wc8r50rhc5wx153pm8vif738wwqqp43chks3"; depends=[MASS GenABEL_data]; };
+GenABEL = derive { name="GenABEL"; version="1.8-0"; sha256="0sd497qvik70iwv7wc8r50rhc5wx153pm8vif738wwqqp43chks3"; depends=[GenABEL_data MASS]; };
 GenABEL_data = derive { name="GenABEL.data"; version="1.0.0"; sha256="0p66fb0gynjx3mnfvnlz45cbn6xf49gwx9mfyxf584xfcggxaa1c"; depends=[]; };
 GenBinomApps = derive { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; };
 GenForImp = derive { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; };
 GenKern = derive { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; };
-GenOrd = derive { name="GenOrd"; version="1.3.0"; sha256="07ll15fqcfvrbsd8psbvn9569hcmvghwadzb3h9qxh6pxnl9i5qd"; depends=[mvtnorm Matrix MASS]; };
+GenOrd = derive { name="GenOrd"; version="1.3.0"; sha256="07ll15fqcfvrbsd8psbvn9569hcmvghwadzb3h9qxh6pxnl9i5qd"; depends=[MASS Matrix mvtnorm]; };
 GenSA = derive { name="GenSA"; version="1.1.5"; sha256="10fkb30p3ncswlq4f9jknfhrrsi4v3lkn2nlnpb2yhrqai538wij"; depends=[]; };
 GenWin = derive { name="GenWin"; version="0.1"; sha256="0jm537i4jn3azdpvd50y9p0fssfx2ym2n36d3zgnfd32gqckz3s4"; depends=[pspline]; };
-GeneCycle = derive { name="GeneCycle"; version="1.1.2"; sha256="1ghdzdddbv6cnxqd08amy4c4s5jsxa637r828ygffk6z76xjr6b6"; depends=[MASS longitudinal fdrtool]; };
+GeneCycle = derive { name="GeneCycle"; version="1.1.2"; sha256="1ghdzdddbv6cnxqd08amy4c4s5jsxa637r828ygffk6z76xjr6b6"; depends=[fdrtool longitudinal MASS]; };
 GeneF = derive { name="GeneF"; version="1.0"; sha256="0bizf47944b2zv9ayxb9rhrqx0ilz2xlvkw7x5vbg7l67y2g2l4d"; depends=[]; };
 GeneFeST = derive { name="GeneFeST"; version="1.0.1"; sha256="0qgzjzhwf3nigfi09maywg9zkjxiicwiwiyqfcdk9gsvmp6mr4qn"; depends=[BASIX]; };
-GeneNet = derive { name="GeneNet"; version="1.2.12"; sha256="0z94ws95nvk7jx5fnrwb81925y14fash1g5pd1mmkkj8njq9kk4l"; depends=[corpcor longitudinal fdrtool igraph]; };
+GeneNet = derive { name="GeneNet"; version="1.2.12"; sha256="0z94ws95nvk7jx5fnrwb81925y14fash1g5pd1mmkkj8njq9kk4l"; depends=[corpcor fdrtool igraph longitudinal]; };
 GeneReg = derive { name="GeneReg"; version="1.1.2"; sha256="081qc66mb17dwk886x9l2z4imklxnfs02yqql0ri9c47bpsga7wp"; depends=[igraph]; };
-Geneland = derive { name="Geneland"; version="4.0.5"; sha256="1v2m8v4sy95rajjw8m9bg4yal5ay7x1k5kqjxrivm45ad546ykwh"; depends=[RandomFields fields]; };
+Geneland = derive { name="Geneland"; version="4.0.5"; sha256="1v2m8v4sy95rajjw8m9bg4yal5ay7x1k5kqjxrivm45ad546ykwh"; depends=[fields RandomFields]; };
 GeneralizedHyperbolic = derive { name="GeneralizedHyperbolic"; version="0.8-1"; sha256="0rx07z5npawvsah2lhhkryzpj19sg0sl0w410gmff985ksdn285m"; depends=[DistributionUtils RUnit]; };
 GeneticSubsetter = derive { name="GeneticSubsetter"; version="0.5"; sha256="1j04qbnx6j39w16ks3v05hr99lsdsy8sp8af2cfg2mqwk4dy3kx2"; depends=[rrBLUP]; };
-GeneticTools = derive { name="GeneticTools"; version="0.3.1"; sha256="033dwg94ns4mz2ixgn180h6qd783gm492p9qs2nf8498cb4ycg9m"; depends=[gMWT Rcpp plotrix Rcpp RcppArmadillo]; };
-GeoDE = derive { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[Matrix MASS]; };
+GeneticTools = derive { name="GeneticTools"; version="0.3.1"; sha256="033dwg94ns4mz2ixgn180h6qd783gm492p9qs2nf8498cb4ycg9m"; depends=[gMWT plotrix Rcpp RcppArmadillo snpStats]; };
+GeoDE = derive { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[MASS Matrix]; };
 GeoGenetix = derive { name="GeoGenetix"; version="0.0.2"; sha256="0rrc8rdf6whpd830s2g9ybz82jcd0il9kkfrjh3xza3b86fasdvg"; depends=[RandomFields]; };
-GeoLight = derive { name="GeoLight"; version="1.03"; sha256="0l2p4rcmk33dj31xy06652mn05d2dhnny3xpzcf12kxyflpipdgr"; depends=[maps changepoint]; };
-GeoXp = derive { name="GeoXp"; version="1.6.2"; sha256="18wdmdwb79ipdjdii068dz9f55b5ldxn95g5q6jcxsqwp0wldvw8"; depends=[quantreg rgl spdep KernSmooth rgeos robustbase splancs]; };
+GeoLight = derive { name="GeoLight"; version="1.03"; sha256="0l2p4rcmk33dj31xy06652mn05d2dhnny3xpzcf12kxyflpipdgr"; depends=[changepoint maps]; };
+GeoXp = derive { name="GeoXp"; version="1.6.2"; sha256="18wdmdwb79ipdjdii068dz9f55b5ldxn95g5q6jcxsqwp0wldvw8"; depends=[KernSmooth quantreg rgeos rgl robustbase spdep splancs]; };
 GetR = derive { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; };
-GetoptLong = derive { name="GetoptLong"; version="0.1.0"; sha256="1r86bffsj6s8d71wngspqvfv0gyrrpihf225b4v3c69c05n36qm1"; depends=[rjson GlobalOptions]; };
-GhcnDaily = derive { name="GhcnDaily"; version="1.5"; sha256="1gln1giid5n5b9mxidh90l8ahvcgx968zak2lxr2f9c32pnrpmnp"; depends=[R_utils R_oo R_methodsS3 abind ncdf]; };
+GetoptLong = derive { name="GetoptLong"; version="0.1.0"; sha256="1r86bffsj6s8d71wngspqvfv0gyrrpihf225b4v3c69c05n36qm1"; depends=[GlobalOptions rjson]; };
+GhcnDaily = derive { name="GhcnDaily"; version="1.5"; sha256="1gln1giid5n5b9mxidh90l8ahvcgx968zak2lxr2f9c32pnrpmnp"; depends=[abind ncdf R_methodsS3 R_oo R_utils]; };
 GibbsACOV = derive { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; };
 GillespieSSA = derive { name="GillespieSSA"; version="0.5-4"; sha256="0bs16g8vm9yrv74g94lj8fdfmf1rjj0f04lcnaya7gyak3jhk36q"; depends=[]; };
-Giza = derive { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[reshape lattice lattice]; };
+Giza = derive { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[lattice reshape]; };
 GlobalDeviance = derive { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; };
 GlobalFit = derive { name="GlobalFit"; version="1.0"; sha256="0cx4jpr5yhjdqbvnswqjwx7542mnmk73dy99klwg8bsz0c36ii5k"; depends=[sybil]; };
 GlobalOptions = derive { name="GlobalOptions"; version="0.0.6"; sha256="0g10zf3hn4ns7faffqzc9xbscz9p84vcqhlg4jp9jl063ma2pvqm"; depends=[]; };
-Gmisc = derive { name="Gmisc"; version="1.1"; sha256="1dcnnsjxap50zfx984rxgksjcvqgbb9zxxd03186h4669slh1d0d"; depends=[Rcpp htmlTable lattice Hmisc forestplot abind knitr magrittr Rcpp]; };
+Gmisc = derive { name="Gmisc"; version="1.1"; sha256="1dcnnsjxap50zfx984rxgksjcvqgbb9zxxd03186h4669slh1d0d"; depends=[abind forestplot Hmisc htmlTable knitr lattice magrittr Rcpp]; };
 GoFKernel = derive { name="GoFKernel"; version="2.0-5"; sha256="030gcj608nkalscjqs2ad73pwhk4gp5gl1lvm4mc9b39jhki0r70"; depends=[KernSmooth]; };
-GrammR = derive { name="GrammR"; version="1.0.1"; sha256="1dhq4srzxbdbym89dy4gh0c4jjfkljxdnriv4v0yh9g688my1gvn"; depends=[gWidgets RGtk2 gWidgetsRGtk2 MASS cluster rgl GUniFrac ape]; };
-GraphPCA = derive { name="GraphPCA"; version="1.0"; sha256="17ipcp7nh47lfs9jy1aybpz4r172zj5yyrdrgmd6wa7hax8yv8gg"; depends=[ggplot2 FactoMineR scatterplot3d scales]; };
+GrammR = derive { name="GrammR"; version="1.0.1"; sha256="1dhq4srzxbdbym89dy4gh0c4jjfkljxdnriv4v0yh9g688my1gvn"; depends=[ape cluster GUniFrac gWidgets gWidgetsRGtk2 MASS rgl RGtk2]; };
+GraphPCA = derive { name="GraphPCA"; version="1.0"; sha256="17ipcp7nh47lfs9jy1aybpz4r172zj5yyrdrgmd6wa7hax8yv8gg"; depends=[FactoMineR ggplot2 scales scatterplot3d]; };
 GrapheR = derive { name="GrapheR"; version="1.9-84"; sha256="1wwks2a4vzhj1rcspizp1vadl6kvrqr8s4zd6pghj02nd266znk9"; depends=[]; };
 GrassmannOptim = derive { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; };
-Grid2Polygons = derive { name="Grid2Polygons"; version="0.1-5"; sha256="18hgyx8a75allldsc2ih5i1p7ajkwj2x020cfd2hp18zrc4qyp5n"; depends=[sp rgeos]; };
+Grid2Polygons = derive { name="Grid2Polygons"; version="0.1-5"; sha256="18hgyx8a75allldsc2ih5i1p7ajkwj2x020cfd2hp18zrc4qyp5n"; depends=[rgeos sp]; };
 GriegSmith = derive { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; };
 GroupSeq = derive { name="GroupSeq"; version="1.3.2"; sha256="16n06jw7f97jhafgl9sfvd163v1walhlpmai1hmhiwjvv341sp13"; depends=[]; };
 GuardianR = derive { name="GuardianR"; version="0.5"; sha256="0m5arxz4ih84zg8sf2wy2kg38adraa098gb52vwz93dzdm1dhslw"; depends=[RCurl RJSONIO]; };
 Guerry = derive { name="Guerry"; version="1.6-1"; sha256="1hpp49w2kd1npsd709cwg125pw6mrqxfv2nn3lcs1mg2r49ki2bl"; depends=[]; };
-GxM = derive { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[Rcpp minqa nlme]; };
+GxM = derive { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; };
 HAC = derive { name="HAC"; version="1.0-3"; sha256="084i123fj5vnhn08fa1qzbk93khsi3r60s52d6pqkqvzbxc572jr"; depends=[copula numDeriv]; };
-HAP_ROR = derive { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[hash ape]; };
+HAP_ROR = derive { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[ape hash]; };
 HAPim = derive { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; };
-HBSTM = derive { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[MASS fBasics maps]; };
-HDMD = derive { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[psych MASS]; };
-HDPenReg = derive { name="HDPenReg"; version="0.91"; sha256="0q63pm39ivka64f7rhad6bv0yr1b2b3241ln8gqfnal25qw31w82"; depends=[rtkpp rtkpp]; };
+HBSTM = derive { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[fBasics maps MASS]; };
+HDMD = derive { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[MASS psych]; };
+HDPenReg = derive { name="HDPenReg"; version="0.91"; sha256="0q63pm39ivka64f7rhad6bv0yr1b2b3241ln8gqfnal25qw31w82"; depends=[rtkpp]; };
 HDclassif = derive { name="HDclassif"; version="1.2.3"; sha256="1ss30cjq352cr3v5blpdywycfv2ik200mvj54y8qihc811mash6h"; depends=[MASS]; };
 HDtweedie = derive { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; };
 HEAT = derive { name="HEAT"; version="1.2"; sha256="1qifqd06ifl0f5l44mkxapnkwhpm0b82yq6dhfw4f8yhb27wd0z2"; depends=[]; };
 HGNChelper = derive { name="HGNChelper"; version="0.3.1"; sha256="0vidw7gdvr0i4l175ic5ya8q2x2jj0v2vc7fagzrp2mcy7fn1y6a"; depends=[]; };
-HH = derive { name="HH"; version="3.1-15"; sha256="030yfg1vx4ns0v2623axi1n6jdfi520fsjvln196gjw7dzdsm1gh"; depends=[lattice latticeExtra multcomp gridExtra reshape2 leaps vcd colorspace RColorBrewer Rcmdr shiny]; };
+HH = derive { name="HH"; version="3.1-19"; sha256="0hm8fk0wqfhkrjm3ycpxd4i8wwm9hi8ihy45a3wayp0p6lqv4rpp"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
 HHG = derive { name="HHG"; version="1.4"; sha256="048jbwhrbgp1pv2j6sw234ykdn7bgpa49slwh3p5547nl2cwjysg"; depends=[]; };
 HI = derive { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; };
 HIV_LifeTables = derive { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; };
 HIest = derive { name="HIest"; version="2.0"; sha256="0ik55kxhzjyg6z6072iz9nfaj7x1nvf91l1kysgvkjccr6jf3y86"; depends=[nnet]; };
 HK80 = derive { name="HK80"; version="0.0.1"; sha256="1qhknrqpspxrdxzf5kakans94db58bbhgpblvpwcyw4jrjmm0ng7"; depends=[]; };
-HLMdiag = derive { name="HLMdiag"; version="0.2.5"; sha256="1yim9m5q1m112aj7zhsw345l32bdj7lbw2mqpcxhjzv1lcknm5lq"; depends=[lme4 ggplot2 plyr reshape2 MASS Matrix Rcpp Rcpp RcppArmadillo]; };
-HLSM = derive { name="HLSM"; version="0.4"; sha256="115215fiaib6ndvzb3gn80l636ddxp0dxrnph8pnh16b3b6q2jnk"; depends=[MASS coda]; };
+HLMdiag = derive { name="HLMdiag"; version="0.2.5"; sha256="1yim9m5q1m112aj7zhsw345l32bdj7lbw2mqpcxhjzv1lcknm5lq"; depends=[ggplot2 lme4 MASS Matrix plyr Rcpp RcppArmadillo reshape2]; };
+HLSM = derive { name="HLSM"; version="0.4"; sha256="115215fiaib6ndvzb3gn80l636ddxp0dxrnph8pnh16b3b6q2jnk"; depends=[coda MASS]; };
 HMM = derive { name="HMM"; version="1.0"; sha256="0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw"; depends=[]; };
 HMMCont = derive { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw0pv1q8lfkgmxdr9h4rwv1accril85x"; depends=[]; };
 HMMpa = derive { name="HMMpa"; version="1.0"; sha256="14r2axg42by49qm6avgv7g3xnc29bxlrni5fhc5vdz0wygkcrqhn"; depends=[]; };
-HMP = derive { name="HMP"; version="1.3.1"; sha256="1r39mq8j071khza37ck7w4kvk1di71hhn5m4wnx9dak7nlcq2nwx"; depends=[MCMCpack dirmult]; };
+HMP = derive { name="HMP"; version="1.3.1"; sha256="1r39mq8j071khza37ck7w4kvk1di71hhn5m4wnx9dak7nlcq2nwx"; depends=[dirmult MCMCpack]; };
 HMPTrees = derive { name="HMPTrees"; version="1.2"; sha256="0agp8w7rzr1byj01di89r3qy1vb9inb2zgys78mg8jnk7axi925l"; depends=[ape]; };
 HMR = derive { name="HMR"; version="0.4.1"; sha256="1acaph5q6vgi4c7liv7xsc3crhp23nib5q44aszxhramky0gvaqr"; depends=[]; };
-HPbayes = derive { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[MASS mvtnorm corpcor numDeriv boot]; };
+HPbayes = derive { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; };
 HSAUR = derive { name="HSAUR"; version="1.3-6"; sha256="1872diskd9yz76x0z6yjg6dn1dxh479ybnja8vcly9fr8jb0kqqj"; depends=[]; };
 HSAUR2 = derive { name="HSAUR2"; version="1.1-13"; sha256="13b14m2cknicahvprkn3kmjk1sir7a10vkaq63niinfirw603fa9"; depends=[]; };
 HSAUR3 = derive { name="HSAUR3"; version="1.0-4"; sha256="1m2nqvm0ma5rmwwn27nzzyjzq8c0awsrrjjrnyaj50bcnmg0x0k6"; depends=[]; };
-HSROC = derive { name="HSROC"; version="2.1.8"; sha256="056g6iygrddmpmg5nnilqrlw2xavmcc9q07z942vc2nivw06h346"; depends=[lattice coda MASS MCMCpack]; };
+HSROC = derive { name="HSROC"; version="2.1.8"; sha256="056g6iygrddmpmg5nnilqrlw2xavmcc9q07z942vc2nivw06h346"; depends=[coda lattice MASS MCMCpack]; };
 HSSVD = derive { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; };
 HTMLUtils = derive { name="HTMLUtils"; version="0.1.7"; sha256="05y505jazzahnd6jsp3plqz8hd75991hhhcpcdn8093rinb1f8l1"; depends=[R2HTML]; };
-HTSCluster = derive { name="HTSCluster"; version="2.0.4"; sha256="1kvq118hqxc81n88g4bq10lh84dydrqqhzig246wf3f97ajvq7y0"; depends=[capushe poisson_glm_mix plotrix]; };
-HUM = derive { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl Rcpp]; };
+HTSCluster = derive { name="HTSCluster"; version="2.0.4"; sha256="1kvq118hqxc81n88g4bq10lh84dydrqqhzig246wf3f97ajvq7y0"; depends=[capushe edgeR plotrix poisson_glm_mix]; };
+HUM = derive { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl]; };
 HW_pval = derive { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; };
 HWEBayes = derive { name="HWEBayes"; version="1.4"; sha256="1rbffx6pn031a278ps9aqxcaq8yi73s5kf60za143ysbfxv9dphw"; depends=[MCMCpack mvtnorm]; };
 HWEintrinsic = derive { name="HWEintrinsic"; version="1.2.1"; sha256="1sg5lrc6kl5rr6f5awp100qpd1679745kixasiddiggzd8fhgb7q"; depends=[]; };
@@ -843,7 +848,7 @@ HadoopStreaming = derive { name="HadoopStreaming"; version="0.2"; sha256="1l9msa
 HandTill2001 = derive { name="HandTill2001"; version="0.2-9"; sha256="1j4ivxarm3k9sj05824lv6b03apyabpciv4mp253vv0yzjcp2bzf"; depends=[]; };
 Hankel = derive { name="Hankel"; version="0.0-1"; sha256="0g3b0ji8hw29k0wxxvlnbcm0z91p4vbajbrhm6cqbccjq85lg4si"; depends=[]; };
 HapEstXXR = derive { name="HapEstXXR"; version="0.1-8"; sha256="00p8pziy8q6vki7brpd57c7ckc9zw41c90h47yp9vb3ndanfqavp"; depends=[survival]; };
-Haplin = derive { name="Haplin"; version="5.5"; sha256="12wkj5x1s920xs0xzhxk0dswmwan7x20fw5sj6cx29n013h1gkam"; depends=[GenABEL DatABEL mgcv MASS SuppDists snow]; };
+Haplin = derive { name="Haplin"; version="5.5"; sha256="12wkj5x1s920xs0xzhxk0dswmwan7x20fw5sj6cx29n013h1gkam"; depends=[DatABEL GenABEL MASS mgcv snow SuppDists]; };
 HaploSim = derive { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; };
 HardyWeinberg = derive { name="HardyWeinberg"; version="1.5.5"; sha256="1kz12301bi2880i9ds7wvc6yb5hvrs3fr5689fm1yygkqfq8zc56"; depends=[mice]; };
 HarmonicRegression = derive { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; };
@@ -851,32 +856,32 @@ HelpersMG = derive { name="HelpersMG"; version="1.1"; sha256="0pk8bcad9dnza803cq
 HiClimR = derive { name="HiClimR"; version="1.2.1"; sha256="12qq3w20xzw2ih15hw5pzn0h58wv8rczhb4zxcdzc7zbg6i8qas4"; depends=[]; };
 HiCseg = derive { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; };
 HiDimDA = derive { name="HiDimDA"; version="0.2-3"; sha256="0pk7hf8cnwv22p5cbpsh5wd94i1an87ddv80qycgypx4wi0v57hh"; depends=[]; };
-HiDimMaxStable = derive { name="HiDimMaxStable"; version="0.1.1"; sha256="0gscdjm48yyf8h3bn6xjbjlfc1hwbbh5j6v64c0z3d04h9q35c24"; depends=[copula mnormt partitions maxLik mnormpow VGAM]; };
+HiDimMaxStable = derive { name="HiDimMaxStable"; version="0.1.1"; sha256="0gscdjm48yyf8h3bn6xjbjlfc1hwbbh5j6v64c0z3d04h9q35c24"; depends=[copula maxLik mnormpow mnormt partitions VGAM]; };
 HiLMM = derive { name="HiLMM"; version="1.1"; sha256="09135cwi6kqrvzdlivm86q1dqn6cbbi6nspdm0c2s700jl49pl5z"; depends=[]; };
 HiPLARM = derive { name="HiPLARM"; version="0.1"; sha256="0af68gfmc89nn1chmqay6ix0zygcp1hmylj02i7l6rx6vb06qw6w"; depends=[Matrix]; };
 HiddenMarkov = derive { name="HiddenMarkov"; version="1.8-3"; sha256="1bgkzj9lmv0rbi5a77brw7w69k2w611jh3d851lfqnwx6gxgzkmc"; depends=[]; };
-HierO = derive { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[rneos RCurl bitops XML tcltk2]; };
-HighDimOut = derive { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[foreach DMwR plyr proxy FNN ggplot2]; };
-HistDAWass = derive { name="HistDAWass"; version="0.1.2"; sha256="16c4b9nfl6rbca7zifb2q3c5x60rmj32913hw1f79xs9ffdrnkwr"; depends=[FactoMineR class ggplot2 histogram]; };
+HierO = derive { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[bitops RCurl rneos tcltk2 XML]; };
+HighDimOut = derive { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[DMwR FNN foreach ggplot2 plyr proxy]; };
+HistDAWass = derive { name="HistDAWass"; version="0.1.2"; sha256="16c4b9nfl6rbca7zifb2q3c5x60rmj32913hw1f79xs9ffdrnkwr"; depends=[class FactoMineR ggplot2 histogram]; };
 HistData = derive { name="HistData"; version="0.7-5"; sha256="17s64hfs7r77p0wjzpbgz9wp3gjzbly2d0v784f9m2bka8gj6xhr"; depends=[]; };
-HistogramTools = derive { name="HistogramTools"; version="0.3.1"; sha256="0cc3saly5q2kn1gr2mam7g901ddcipmlrn1m0amgrnbkakby2320"; depends=[Hmisc ash stringr]; };
-HiveR = derive { name="HiveR"; version="0.2-28"; sha256="1zz1cg7cf4yyv1bymqlyh50nzj5lgdv4clzm0l2vladcxzjvgk8c"; depends=[RColorBrewer plyr jpeg png rgl xtable tkrgl]; };
-Hmisc = derive { name="Hmisc"; version="3.16-0"; sha256="03d372bld4mikyrvmfw00ljiz6jf7szkmhrlgxs5vqk3v81kkp2f"; depends=[lattice survival Formula ggplot2 proto scales latticeExtra cluster rpart nnet acepack foreign gtable gridExtra]; };
+HistogramTools = derive { name="HistogramTools"; version="0.3.1"; sha256="0cc3saly5q2kn1gr2mam7g901ddcipmlrn1m0amgrnbkakby2320"; depends=[ash Hmisc stringr]; };
+HiveR = derive { name="HiveR"; version="0.2-28"; sha256="1zz1cg7cf4yyv1bymqlyh50nzj5lgdv4clzm0l2vladcxzjvgk8c"; depends=[jpeg plyr png RColorBrewer rgl tkrgl xtable]; };
+Hmisc = derive { name="Hmisc"; version="3.16-0"; sha256="03d372bld4mikyrvmfw00ljiz6jf7szkmhrlgxs5vqk3v81kkp2f"; depends=[acepack cluster foreign Formula ggplot2 gridExtra gtable lattice latticeExtra nnet proto rpart scales survival]; };
 Holidays = derive { name="Holidays"; version="1.0-6"; sha256="031vddjf7s3pirv041y2mw694db63gjajlbczmmya8b1zp2f3vzk"; depends=[TimeWarp]; };
-HomoPolymer = derive { name="HomoPolymer"; version="1.0"; sha256="1bxc33dx9y9rr9aii4vn9d1j9v5pd4c0xayfdldz8d9m2010xr4a"; depends=[RGtk2 MenuCollection deSolve]; };
+HomoPolymer = derive { name="HomoPolymer"; version="1.0"; sha256="1bxc33dx9y9rr9aii4vn9d1j9v5pd4c0xayfdldz8d9m2010xr4a"; depends=[deSolve MenuCollection RGtk2]; };
 HotDeckImputation = derive { name="HotDeckImputation"; version="1.0.0"; sha256="0zb02wcpq09lr7lr4wcgrbw9x7jcvhi34g7f4s6h88zz7xg9daw5"; depends=[Rglpk]; };
 Hotelling = derive { name="Hotelling"; version="1.0-2"; sha256="0dzsqnn4c4av23qjnmacwc78i0xg355p1xwfmgipr04ivym0mqn0"; depends=[corpcor]; };
 HyPhy = derive { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; };
 HybridMC = derive { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; };
-HydroMe = derive { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[nlme minpack_lm]; };
+HydroMe = derive { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[minpack_lm nlme]; };
 HyperbolicDist = derive { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; };
 IASD = derive { name="IASD"; version="1.0.7"; sha256="0a25sd82fxnmz3f4iaxhc69cdfb7xmh7wi79wv11sbw9cv2pl7kr"; depends=[]; };
 IAT = derive { name="IAT"; version="0.2"; sha256="0byivq2298sjvpsz5z1w7r31h6z2jqpip40z8r2alygbgwwa48pd"; depends=[data_table ggplot2]; };
-IATscores = derive { name="IATscores"; version="0.1-2"; sha256="0grl5m4ccwaxvhg1bziy3vv5jffkvr24z268ws5m4ia20haif0dm"; depends=[stringr dplyr reshape2 qgraph]; };
+IATscores = derive { name="IATscores"; version="0.1-2"; sha256="0grl5m4ccwaxvhg1bziy3vv5jffkvr24z268ws5m4ia20haif0dm"; depends=[dplyr nem qgraph reshape2 stringr]; };
 IBDLabels = derive { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; };
 IBDhaploRtools = derive { name="IBDhaploRtools"; version="1.8"; sha256="1754239pdil6b383mpzyi8zb9l9hzg15dwgn5246v97g1y3mlp5r"; depends=[]; };
 IBDsim = derive { name="IBDsim"; version="0.9-4"; sha256="0cpabz7mnhsrmjrgb23zs5anjrkhwc2005b2inl6p93l47i81fps"; depends=[paramlink]; };
-IBHM = derive { name="IBHM"; version="1.1-11"; sha256="1m0zxlybcak2v5c4spgaa39ngb2hryak4xd875jryk1dcnk9c702"; depends=[DEoptim cmaes Rcpp Rcpp]; };
+IBHM = derive { name="IBHM"; version="1.1-11"; sha256="1m0zxlybcak2v5c4spgaa39ngb2hryak4xd875jryk1dcnk9c702"; depends=[cmaes DEoptim Rcpp]; };
 IBrokers = derive { name="IBrokers"; version="0.9-12"; sha256="0mhh4kgwrncrcysvnvah6xc7fhx5ywjzn258cs9xj9kzns0jblk6"; depends=[xts zoo]; };
 IC2 = derive { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; };
 ICAFF = derive { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; };
@@ -884,33 +889,33 @@ ICC = derive { name="ICC"; version="2.2.1"; sha256="1xl8x8ddbrk8ma57mybmmv9m096w
 ICE = derive { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; };
 ICEbox = derive { name="ICEbox"; version="1.0"; sha256="1m3p0b93ksrcsp45m4gszcz01cwbfpj4ldar6l0q3c9lmyqsznx8"; depends=[sfsmisc]; };
 ICEinfer = derive { name="ICEinfer"; version="1.0-1"; sha256="0gjgr1r33w6d5ra0njh15lj46lw6v751yl8iqrdf4a5pazs7w3lm"; depends=[lattice]; };
-ICGE = derive { name="ICGE"; version="0.3"; sha256="0xin7zml1nbygyi08hhg3wwr2jr1zcsvrlgia89zp4xanxlzgaqa"; depends=[MASS cluster]; };
+ICGE = derive { name="ICGE"; version="0.3"; sha256="0xin7zml1nbygyi08hhg3wwr2jr1zcsvrlgia89zp4xanxlzgaqa"; depends=[cluster MASS]; };
 ICS = derive { name="ICS"; version="1.2-4"; sha256="1sfm9ymrrl72jzg8gsdw6v4q20i4s2w4syyr7brlvan136khpqyn"; depends=[mvtnorm survey]; };
-ICSNP = derive { name="ICSNP"; version="1.0-9"; sha256="0kisk7wk0zjsr47hgrmz5c8f2ljsl7x4549a1rwzsfkjz8901qka"; depends=[mvtnorm ICS]; };
+ICSNP = derive { name="ICSNP"; version="1.0-9"; sha256="0kisk7wk0zjsr47hgrmz5c8f2ljsl7x4549a1rwzsfkjz8901qka"; depends=[ICS mvtnorm]; };
 ICsurv = derive { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; };
-IDPSurvival = derive { name="IDPSurvival"; version="1.0"; sha256="1v1w0i74b065b4qc302xbdl5df7qx9z8jmbc9cn46fqm1hh2b6d7"; depends=[Rsolnp gtools survival]; };
+IDPSurvival = derive { name="IDPSurvival"; version="1.0"; sha256="1v1w0i74b065b4qc302xbdl5df7qx9z8jmbc9cn46fqm1hh2b6d7"; depends=[gtools Rsolnp survival]; };
 IDPmisc = derive { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; };
-IFP = derive { name="IFP"; version="0.2.0"; sha256="02dm2qbnrs2yi6c64j90hdfimmdsld46k1wdkay8pfg62jy9rrwa"; depends=[haplo_stats coda]; };
-IM = derive { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[png jpeg bmp]; };
+IFP = derive { name="IFP"; version="0.2.0"; sha256="02dm2qbnrs2yi6c64j90hdfimmdsld46k1wdkay8pfg62jy9rrwa"; depends=[coda haplo_stats]; };
+IM = derive { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[bmp jpeg png]; };
 IMIS = derive { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; };
-INLABMA = derive { name="INLABMA"; version="0.1-6"; sha256="0rij3y89yyj25xz8r9n8cnq7rg9b7hf0n9nxxrrnm86w3n4r66in"; depends=[sp Matrix spdep]; };
-IPMpack = derive { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[Matrix MASS nlme]; };
+INLABMA = derive { name="INLABMA"; version="0.1-6"; sha256="0rij3y89yyj25xz8r9n8cnq7rg9b7hf0n9nxxrrnm86w3n4r66in"; depends=[Matrix sp spdep]; };
+IPMpack = derive { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[MASS Matrix nlme]; };
 IPSUR = derive { name="IPSUR"; version="1.5"; sha256="0brh3dx7m1rilvr1ig6vbi7p13bfbblgvs8fc114f08d90fczwnq"; depends=[]; };
-IQCC = derive { name="IQCC"; version="0.6"; sha256="0gsnkdl4cfxzq6pm9g4i1g23mxg108j3is4x69id1xn2plf92m04"; depends=[qcc MASS micEcon miscTools]; };
-IRTShiny = derive { name="IRTShiny"; version="1.0"; sha256="1gjfqjqk7izl23b96g758dn6pb784ayb8yjjlryyrwga6mgsqdik"; depends=[shiny shinyAce beeswarm CTT ltm]; };
+IQCC = derive { name="IQCC"; version="0.6"; sha256="0gsnkdl4cfxzq6pm9g4i1g23mxg108j3is4x69id1xn2plf92m04"; depends=[MASS micEcon miscTools qcc]; };
+IRTShiny = derive { name="IRTShiny"; version="1.0"; sha256="1gjfqjqk7izl23b96g758dn6pb784ayb8yjjlryyrwga6mgsqdik"; depends=[beeswarm CTT ltm shiny shinyAce]; };
 ISBF = derive { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; };
 ISDA_R = derive { name="ISDA.R"; version="1.0"; sha256="0w6p2iy6s7fy8pw2cf4b5zhqcgjjwd5bkax1aqflaaj4ppmfx64v"; depends=[scatterplot3d]; };
 ISLR = derive { name="ISLR"; version="1.0"; sha256="0gmhvsivhpq3x8a240lgcbv1qzdgf6wxms4svak1501clc87xc6x"; depends=[]; };
 ISOcodes = derive { name="ISOcodes"; version="2015.04.04"; sha256="1mg7mifcqh0g0ra4f1skng6fyp2rhfv2xd9m7nyih39inzdjkcdf"; depends=[]; };
-ISOpureR = derive { name="ISOpureR"; version="1.0.8"; sha256="0jjamyj4rf078rfa2qqrn4i55025sc5968lq95yadbw0izxb51i8"; depends=[Rcpp Rcpp RcppEigen]; };
+ISOpureR = derive { name="ISOpureR"; version="1.0.8"; sha256="0jjamyj4rf078rfa2qqrn4i55025sc5968lq95yadbw0izxb51i8"; depends=[Rcpp RcppEigen]; };
 ISOweek = derive { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; };
 ISwR = derive { name="ISwR"; version="2.0-7"; sha256="1rd1wrvl8wlc8ya5lndk74gnfvj9wp29z8617v3kbf32gqhby7ng"; depends=[]; };
-IUPS = derive { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[R2jags Matching boot]; };
+IUPS = derive { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[boot Matching R2jags]; };
 Iboot = derive { name="Iboot"; version="0.1-1"; sha256="1fahh86kgv2axj2qg14n87v888sc0kb567s6zr3fh5zv361phwkq"; depends=[]; };
 IgorR = derive { name="IgorR"; version="0.8"; sha256="1khm7mbs497ybaw428ziwlxxygg1vcn5kx77w2cwm4mg8w95f4na"; depends=[bitops]; };
 Imap = derive { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; };
 ImpactIV = derive { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; };
-InPosition = derive { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[prettyGraphs ExPosition]; };
+InPosition = derive { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[ExPosition prettyGraphs]; };
 IndependenceTests = derive { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; };
 InfDim = derive { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; };
 InferenceSMR = derive { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; };
@@ -920,59 +925,59 @@ Interact = derive { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p0
 InteractiveIGraph = derive { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; };
 Interatrix = derive { name="Interatrix"; version="1.0"; sha256="1lkkjckxc0fc8hg1livgzrgphqwcp53cib0r0vii5jp4zkcna595"; depends=[MASS tkrplot]; };
 Interpol = derive { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; };
-Interpol_T = derive { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[date chron]; };
+Interpol_T = derive { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[chron date]; };
 InvariantCausalPrediction = derive { name="InvariantCausalPrediction"; version="0.3-3"; sha256="00sxfgnzqikp92haqnqi4asq904dcsqqnxmz23lx7508qbfx3vhn"; depends=[glmnet mboost]; };
 InventorymodelPackage = derive { name="InventorymodelPackage"; version="1.0.2"; sha256="1w35idsagl9v93ci3qmal3xbf11sy6h1k7xnv25c59ivfnpjpkva"; depends=[e1071]; };
-IsingFit = derive { name="IsingFit"; version="0.3.0"; sha256="0imgj3g6sankzmycjkzzz3bgai3jjycgsinhs5zy9k4vgqjg27d6"; depends=[qgraph Matrix glmnet]; };
-IsingSampler = derive { name="IsingSampler"; version="0.2"; sha256="16vwb5pcqjvvsk9wsgj10mzhgh72iz1q6n8nmkva6y1l7xv54c8w"; depends=[Rcpp plyr magrittr nnet Rcpp]; };
+IsingFit = derive { name="IsingFit"; version="0.3.0"; sha256="0imgj3g6sankzmycjkzzz3bgai3jjycgsinhs5zy9k4vgqjg27d6"; depends=[glmnet Matrix qgraph]; };
+IsingSampler = derive { name="IsingSampler"; version="0.2"; sha256="16vwb5pcqjvvsk9wsgj10mzhgh72iz1q6n8nmkva6y1l7xv54c8w"; depends=[magrittr nnet plyr Rcpp]; };
 Iso = derive { name="Iso"; version="0.0-17"; sha256="0lljc99sdzdqj6d56qbsggibr6pkdwkh821bj70ianikyvmdc1y0"; depends=[]; };
 IsoCI = derive { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; };
-IsoGene = derive { name="IsoGene"; version="1.0-23"; sha256="18sl1qki2dn4ldycpqazj23zcibs3zqwp355q24nwr802xx3y4a6"; depends=[Iso xtable ff]; };
+IsoGene = derive { name="IsoGene"; version="1.0-23"; sha256="18sl1qki2dn4ldycpqazj23zcibs3zqwp355q24nwr802xx3y4a6"; depends=[affy Biobase ff Iso xtable]; };
 IsotopeR = derive { name="IsotopeR"; version="0.4.7"; sha256="18gwmh4nprj4z0ar1w8npj2ymxihw5ydwa33g25mimjk8y2cs0x5"; depends=[coda fgui runjags]; };
 JADE = derive { name="JADE"; version="1.9-92"; sha256="0ki3jpz4npjikn3jjb7ppiyx0flhxx3p8aghjxlm3klhkm0k6ix4"; depends=[clue]; };
-JAGUAR = derive { name="JAGUAR"; version="2.0"; sha256="1c9pyg9jph95161g6zz0jlv5hlyvr9z960by7x3pv7plfkppjy7m"; depends=[Rcpp plyr lme4 doParallel Rcpp]; };
+JAGUAR = derive { name="JAGUAR"; version="2.0"; sha256="1c9pyg9jph95161g6zz0jlv5hlyvr9z960by7x3pv7plfkppjy7m"; depends=[doParallel lme4 plyr Rcpp]; };
 JASPAR = derive { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; };
-JBTools = derive { name="JBTools"; version="0.7.2.9"; sha256="0bynqn3daqgmi3l9asy34mfwyfjkn35k465dfqqi3xwx6cbzlg5k"; depends=[foreach gplots colorspace plotrix]; };
+JBTools = derive { name="JBTools"; version="0.7.2.9"; sha256="0bynqn3daqgmi3l9asy34mfwyfjkn35k465dfqqi3xwx6cbzlg5k"; depends=[colorspace foreach gplots plotrix]; };
 JGL = derive { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; };
-JGR = derive { name="JGR"; version="1.7-16"; sha256="0iv659mjsv7apzpzvmq23w514h6yq50hi70ym7jrv948qrzh64pg"; depends=[rJava JavaGD iplots]; };
+JGR = derive { name="JGR"; version="1.7-16"; sha256="0iv659mjsv7apzpzvmq23w514h6yq50hi70ym7jrv948qrzh64pg"; depends=[iplots JavaGD rJava]; };
 JM = derive { name="JM"; version="1.3-0"; sha256="0yn33dvy9kp7xaxlqk11f86qaichdcxpmq04gpnbcs8w8cdjjz3m"; depends=[MASS nlme survival]; };
 JMbayes = derive { name="JMbayes"; version="0.7-2"; sha256="087brgljj158my1xc0vmbjkh4hqr0509zf8j4fq1b9lj52z7rdl5"; depends=[MASS nlme survival]; };
 JMdesign = derive { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; };
-JOP = derive { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[Rsolnp dglm]; };
+JOP = derive { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[dglm Rsolnp]; };
 JPSurv = derive { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; };
 JavaGD = derive { name="JavaGD"; version="0.6-1"; sha256="13n6xzbbjgd0bpwv2xgm3dlscg87wh32q6fcq50kk6byp6yv05sc"; depends=[]; };
 Jmisc = derive { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; };
 JoSAE = derive { name="JoSAE"; version="0.2.2"; sha256="1ag4qg9cfcg8i2xz79bza2qlw3azw33h7k2ip5nlfkfpd33l9w05"; depends=[nlme]; };
 Johnson = derive { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; };
 JohnsonDistribution = derive { name="JohnsonDistribution"; version="0.24"; sha256="00211pa2wn4bsfj6wfl9q9g123cp8iz3kxc17pw9q65j9an4sr0m"; depends=[]; };
-JointRegBC = derive { name="JointRegBC"; version="0.1.1"; sha256="0w7ygs3pvlqkkb2x20kv20kda3gz7cn6zgrkg30nhjxp318d76ab"; depends=[nlme MASS survival]; };
+JointRegBC = derive { name="JointRegBC"; version="0.1.1"; sha256="0w7ygs3pvlqkkb2x20kv20kda3gz7cn6zgrkg30nhjxp318d76ab"; depends=[MASS nlme survival]; };
 Julia = derive { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; };
-KANT = derive { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[]; };
-KATforDCEMRI = derive { name="KATforDCEMRI"; version="0.740"; sha256="1k8fihd9m26k14rvc5d5x0d9xc3mh8d49hs64p55np1acqfhg2sy"; depends=[locfit R_matlab matlab]; };
+KANT = derive { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; };
+KATforDCEMRI = derive { name="KATforDCEMRI"; version="0.740"; sha256="1k8fihd9m26k14rvc5d5x0d9xc3mh8d49hs64p55np1acqfhg2sy"; depends=[locfit matlab R_matlab]; };
 KFAS = derive { name="KFAS"; version="1.1.1"; sha256="16r86kcx5av11j1p0dad8qvcj4dszh3kvcy8zp7kaw247kjvr3pv"; depends=[]; };
 KFKSDS = derive { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; };
 KMDA = derive { name="KMDA"; version="1.0"; sha256="0x4kjjdd59wvgg699vrj99wqg3s1qbkbskis1c34xv9b8bzcv94j"; depends=[]; };
 KMsurv = derive { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; };
-KODAMA = derive { name="KODAMA"; version="0.0.1"; sha256="199l6y5b98ags5p7jf150v0i0kcdxlsr2q0rgdpz9ra1hw1cjsfb"; depends=[e1071 plsgenomics class]; };
+KODAMA = derive { name="KODAMA"; version="0.0.1"; sha256="199l6y5b98ags5p7jf150v0i0kcdxlsr2q0rgdpz9ra1hw1cjsfb"; depends=[class e1071 plsgenomics]; };
 KOGMWU = derive { name="KOGMWU"; version="1.0"; sha256="0nk7vbppimrf01wnxsg2wjpagjrzs6gh3a6jlqy9bdfh0j4fm0kn"; depends=[pheatmap]; };
 KRLS = derive { name="KRLS"; version="0.3-7"; sha256="0dx4b68xx3saqlkbpvvrhxjscl7jr5phwqvjywxsp4qxlr3ysl79"; depends=[]; };
 KappaGUI = derive { name="KappaGUI"; version="1.2"; sha256="014d3lshq3avrncd8ydjpn59zalq46v29jrlz3g76wzr96xf5ckr"; depends=[irr]; };
-KappaV = derive { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[PresenceAbsence maptools rgeos sp]; };
+KappaV = derive { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[maptools PresenceAbsence rgeos sp]; };
 Kendall = derive { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; };
 KernSmooth = derive { name="KernSmooth"; version="2.23-14"; sha256="1dl22pncdlrlysmny0q89yg1s6iafdh75dh31l2hjy16gzlrbhk0"; depends=[]; };
-KernSmoothIRT = derive { name="KernSmoothIRT"; version="6.1"; sha256="1hq4sykddh9sg24qrnccii89nqxmq7hnldhn8wl6y62aj0h1nrqm"; depends=[Rcpp plotrix rgl Rcpp]; };
-Kernelheaping = derive { name="Kernelheaping"; version="0.5"; sha256="02hvb1w7z04nn44czxkkg7g1c1fyq0ki0v4shrpi5akwaac30dgj"; depends=[plyr evmix MASS corpcor]; };
-Kmisc = derive { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[Rcpp data_table lattice knitr markdown Rcpp]; };
-KoNLP = derive { name="KoNLP"; version="0.76.9"; sha256="1q72irl4izb7f5bb99plpqnmpfdq4x4ymp4wm2bsyfjcxm649ya8"; depends=[rJava stringr hash tau Sejong]; };
+KernSmoothIRT = derive { name="KernSmoothIRT"; version="6.1"; sha256="1hq4sykddh9sg24qrnccii89nqxmq7hnldhn8wl6y62aj0h1nrqm"; depends=[plotrix Rcpp rgl]; };
+Kernelheaping = derive { name="Kernelheaping"; version="0.9"; sha256="0x42cv28c074zcb023plb3pw5ffrihwbl1jlwm2f4h68q84ra3a4"; depends=[evmix ks MASS plyr sparr]; };
+Kmisc = derive { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[data_table knitr lattice markdown Rcpp]; };
+KoNLP = derive { name="KoNLP"; version="0.76.9"; sha256="1q72irl4izb7f5bb99plpqnmpfdq4x4ymp4wm2bsyfjcxm649ya8"; depends=[hash rJava Sejong stringr tau]; };
 Kpart = derive { name="Kpart"; version="1.1"; sha256="1cyml48i1jvwy4xzymijwraqpnssnkrd81q3m7nyjd5m2czjvihv"; depends=[leaps]; };
-KrigInv = derive { name="KrigInv"; version="1.3.1"; sha256="0fcfv2vl572l8qp1ilhjai6zrw15bf1z41qm7xlfspfbj611ga7k"; depends=[DiceKriging pbivnorm rgenoud randtoolbox]; };
+KrigInv = derive { name="KrigInv"; version="1.3.1"; sha256="0fcfv2vl572l8qp1ilhjai6zrw15bf1z41qm7xlfspfbj611ga7k"; depends=[DiceKriging pbivnorm randtoolbox rgenoud]; };
 L1pack = derive { name="L1pack"; version="0.3"; sha256="0lhixnfb2ga830z91z51r970l5s5qpavbwcmk1pi80180n11kv4i"; depends=[]; };
 LARF = derive { name="LARF"; version="1.3"; sha256="0crg89d377wkga0bc42y8bfk6chg06afchhgnab6q4dirwv9360q"; depends=[]; };
 LCA = derive { name="LCA"; version="0.1"; sha256="14nhx2fs18558zljnw56mdz3qx30v394llhzswxhznjfiiqc9z5h"; depends=[]; };
-LCAextend = derive { name="LCAextend"; version="1.2"; sha256="1y9azq9v42a3z5fq6gj8js89qblb2z93k4mg4jmw0wgkyv6mysfc"; depends=[boot mvtnorm rms kinship2]; };
+LCAextend = derive { name="LCAextend"; version="1.2"; sha256="1y9azq9v42a3z5fq6gj8js89qblb2z93k4mg4jmw0wgkyv6mysfc"; depends=[boot kinship2 mvtnorm rms]; };
 LCFdata = derive { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; };
 LDAvis = derive { name="LDAvis"; version="0.2"; sha256="18fbnk5qd7icn3mgwwb3ld3c9n3j1z4ydc2pg2zizkrahhqxdswi"; depends=[proxy RJSONIO]; };
-LDOD = derive { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rsolnp Rmpfr]; };
+LDOD = derive { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rmpfr Rsolnp]; };
 LDPD = derive { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; };
 LDRTools = derive { name="LDRTools"; version="0.1"; sha256="1cr0v6qsdldy89p44lhr6hisqaz99qzab32kd1srdnnwnwl1q2y4"; depends=[]; };
 LDcorSV = derive { name="LDcorSV"; version="1.3.1"; sha256="0i4npl90mkj8vry6ckq8bc4ydbl44vxichgsxyn80r6k9i71yl67"; depends=[MASS]; };
@@ -980,40 +985,40 @@ LDheatmap = derive { name="LDheatmap"; version="0.99-1"; sha256="1bj42chw1xyf8yg
 LDtests = derive { name="LDtests"; version="1.0"; sha256="1jwqr7zlp9hv7vw8xp80xvrwbdv796wjgr914v393wfa07j5wbd1"; depends=[]; };
 LEAPFrOG = derive { name="LEAPFrOG"; version="1.0.7"; sha256="0z9ahkk4qzc45h1r806frv9cd84vvshvn5mr84gx7qdxljfkfq6h"; depends=[alabama MASS]; };
 LGS = derive { name="LGS"; version="0.91"; sha256="0rzj1shapyg7hyzsb9v81dirwihd7bz9s861l75g3yl3p4qm8sg7"; depends=[]; };
-LICORS = derive { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[RColorBrewer mvtnorm zoo FNN fields locfit Matrix]; };
+LICORS = derive { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[fields FNN locfit Matrix mvtnorm RColorBrewer zoo]; };
 LICurvature = derive { name="LICurvature"; version="0.1.1"; sha256="09hqar4kvksd816ya6jg349r0v6z2m2109hq6j4k1d2vchab4lni"; depends=[MASS]; };
-LIHNPSD = derive { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh028vwjw6l6h10cirbnwr65s458zvh4xqv"; depends=[sn moments BB Bolstad2 optimx Rmpfr]; };
-LIM = derive { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[limSolve diagram]; };
+LIHNPSD = derive { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh028vwjw6l6h10cirbnwr65s458zvh4xqv"; depends=[BB Bolstad2 moments optimx Rmpfr sn]; };
+LIM = derive { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[diagram limSolve]; };
 LINselect = derive { name="LINselect"; version="0.0-1"; sha256="1n6nsspdp1ig8v9bclyga072hxqj2hb9n1smrqia8jrma07yaydl"; depends=[]; };
 LIStest = derive { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; };
-LLSR = derive { name="LLSR"; version="0.0.1.9225"; sha256="0jn1svnzn89d55hal64fadhv5bmrc37g4qz3pmcd196s5frvyhai"; depends=[rootSolve XLConnect digest]; };
-LMERConvenienceFunctions = derive { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[Matrix lme4 LCFdata rgl fields mgcv]; };
+LLSR = derive { name="LLSR"; version="0.0.1.9425"; sha256="1s49m1sb4amap64yf7hh61nw95w00jqx2ghwryd1j1mbyp2j9br3"; depends=[digest rootSolve XLConnect]; };
+LMERConvenienceFunctions = derive { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[fields LCFdata lme4 Matrix mgcv rgl]; };
 LMest = derive { name="LMest"; version="2.1"; sha256="1jbwbmamgxbbipzdpjmr7l9csydx55by4zd9h13lnaibdxr4xn5q"; depends=[MASS MultiLCIRT]; };
 LOGICOIL = derive { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; };
-LOST = derive { name="LOST"; version="1.1"; sha256="19ar85dykbz0jlzbhlm3pcpffj4cizc6sj3gn93qdvpxkp64jfq9"; depends=[gdata shapes e1071 MASS miscTools]; };
+LOST = derive { name="LOST"; version="1.1"; sha256="19ar85dykbz0jlzbhlm3pcpffj4cizc6sj3gn93qdvpxkp64jfq9"; depends=[e1071 gdata MASS miscTools pcaMethods shapes]; };
 LPCM = derive { name="LPCM"; version="0.44-8"; sha256="14627wk5azxm3y3a0qfy4qz57nxbdcasnv7djpqhk2gxf5smq19k"; depends=[]; };
 LPS = derive { name="LPS"; version="1.0.10"; sha256="0gf3jmhfki01z8fm5xdx59gxvhgzqd10x2iwa8369iz9dvwbjk8j"; depends=[]; };
 LPStimeSeries = derive { name="LPStimeSeries"; version="1.0-5"; sha256="0jmcy8076w4bzfnxaq2m3s60c1wdmywkwzfyrc19wdm8idf666wh"; depends=[RColorBrewer]; };
 LPTime = derive { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fdnqb86x5s6yzb72hh3nrz50awj1f8nn"; depends=[orthopolynom]; };
-LPmerge = derive { name="LPmerge"; version="1.6"; sha256="0xc06s2p7n151lzrp0dcrrxk8zmd816dc7qbnbcail5c1bhvdqhd"; depends=[Rglpk Matrix]; };
+LPmerge = derive { name="LPmerge"; version="1.6"; sha256="0xc06s2p7n151lzrp0dcrrxk8zmd816dc7qbnbcail5c1bhvdqhd"; depends=[Matrix Rglpk]; };
 LS2W = derive { name="LS2W"; version="1.3-3"; sha256="0pdsv7ld0j116rh94m5y1i2mwrzc80fqxmc6ykc51i1sj6ws3i5k"; depends=[wavethresh]; };
-LS2Wstat = derive { name="LS2Wstat"; version="2.0-3"; sha256="0wkh1a6xbp3qg5favxsj166jcgdza16zki675gswxckana6s4is7"; depends=[LS2W matrixStats geoR RandomFields spdep]; };
+LS2Wstat = derive { name="LS2Wstat"; version="2.0-3"; sha256="0wkh1a6xbp3qg5favxsj166jcgdza16zki675gswxckana6s4is7"; depends=[geoR LS2W matrixStats RandomFields spdep]; };
 LSAfun = derive { name="LSAfun"; version="0.4"; sha256="178lbk5f2vjcpxand15l1dlqf77zkxap22i9lid5db1bmqh9rpk9"; depends=[lsa rgl]; };
-LSC = derive { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[LICORS RColorBrewer fields gam Matrix]; };
+LSC = derive { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[fields gam LICORS Matrix RColorBrewer]; };
 LSD = derive { name="LSD"; version="3.0"; sha256="069p33aw6iwikp82b7b8wa77wlyjqwr4hcwvrgaxgwqdgn6jjg3k"; depends=[]; };
-LSMonteCarlo = derive { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[mvtnorm fBasics]; };
+LSMonteCarlo = derive { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[fBasics mvtnorm]; };
 LTPDvar = derive { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; };
 LTR = derive { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; };
-LVMMCOR = derive { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[nlme MASS]; };
+LVMMCOR = derive { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[MASS nlme]; };
 LVQTools = derive { name="LVQTools"; version="1.2"; sha256="06mninrrr49xsh00gfsp0vc418r6pdvq3m6sbnj0ywdyki106mni"; depends=[]; };
-LaF = derive { name="LaF"; version="0.6.2"; sha256="180xsqilpkql8my0dimsxj1kpmb3jl19l6bz8li8m63zii4xmwmp"; depends=[Rcpp Rcpp]; };
+LaF = derive { name="LaF"; version="0.6.2"; sha256="180xsqilpkql8my0dimsxj1kpmb3jl19l6bz8li8m63zii4xmwmp"; depends=[Rcpp]; };
 Lahman = derive { name="Lahman"; version="3.0-1"; sha256="0w7vp3vjxhigyyqmmka4bw5v4pp5z3jzmf0krq8biwzrpx5qp86x"; depends=[]; };
-LakeMetabolizer = derive { name="LakeMetabolizer"; version="1.3.3"; sha256="06mgn5dgdw0gaw1za20cabs4bx6q5bgv0x09imxhskik76kini01"; depends=[rLakeAnalyzer plyr]; };
+LakeMetabolizer = derive { name="LakeMetabolizer"; version="1.3.3"; sha256="06mgn5dgdw0gaw1za20cabs4bx6q5bgv0x09imxhskik76kini01"; depends=[plyr rLakeAnalyzer]; };
 Lambda4 = derive { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; };
-LambertW = derive { name="LambertW"; version="0.5.1"; sha256="0mhw748nkikaq96azps7yyzkz5glibhb8rh6f748vj9lrq3wa5mn"; depends=[moments MASS gsl]; };
+LambertW = derive { name="LambertW"; version="0.5.1"; sha256="0mhw748nkikaq96azps7yyzkz5glibhb8rh6f748vj9lrq3wa5mn"; depends=[gsl MASS moments]; };
 Laterality = derive { name="Laterality"; version="0.9.3"; sha256="0pl5bfbkzhgxjjzzh99s6rh4jsq0pbcgc902i0z2lmmivgs5qmd6"; depends=[ade4]; };
-LatticeKrig = derive { name="LatticeKrig"; version="3.4"; sha256="0qa16sxzj40nk4kmzcb7n4xxn7bqlkx7ar66qpqvh2dvcvi1d70d"; depends=[spam fields]; };
-LeLogicielR = derive { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[xtable RColorBrewer gdata IndependenceTests]; };
+LatticeKrig = derive { name="LatticeKrig"; version="3.4"; sha256="0qa16sxzj40nk4kmzcb7n4xxn7bqlkx7ar66qpqvh2dvcvi1d70d"; depends=[fields spam]; };
+LeLogicielR = derive { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[gdata IndependenceTests RColorBrewer xtable]; };
 LeafAngle = derive { name="LeafAngle"; version="1.2-1"; sha256="0g3i5300f3rvjz7g7z8s5n8xdcsp41gf1vnr4g36m1likddfpxlx"; depends=[]; };
 LeafArea = derive { name="LeafArea"; version="0.1.0"; sha256="0gl31iv1pqb9w352h70y4x57dgfs4v15391fyhsc221803hk2fdn"; depends=[]; };
 LearnBayes = derive { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; };
@@ -1022,144 +1027,145 @@ LifeTables = derive { name="LifeTables"; version="0.2"; sha256="1n4mqypxm0rbi77y
 LinCal = derive { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; };
 LinRegInteractive = derive { name="LinRegInteractive"; version="0.3-1"; sha256="0w7s3i6i2wnydh88l8lnzrh6w5zqkcwvms91iizis0mwd9af2jdl"; depends=[rpanel xtable]; };
 LindenmayeR = derive { name="LindenmayeR"; version="0.1.4"; sha256="05aq7qmzb7a6kw24pwlg78ch17y945ggrxqn7l2rypn1vfm0br9x"; depends=[stringr]; };
-LinearizedSVR = derive { name="LinearizedSVR"; version="1.3"; sha256="0h3xmlnd5x37r5hdhcz90z5n1hsbr2ci3m939i89p1x9644i2l5g"; depends=[kernlab LiblineaR expectreg]; };
+LinearizedSVR = derive { name="LinearizedSVR"; version="1.3"; sha256="0h3xmlnd5x37r5hdhcz90z5n1hsbr2ci3m939i89p1x9644i2l5g"; depends=[expectreg kernlab LiblineaR]; };
 Lmoments = derive { name="Lmoments"; version="1.1-6"; sha256="0jffnlamll5mwxrfqrb1qr8kjcn40y57kzd10kkm98vzfjcwg4y4"; depends=[]; };
 LocFDRPois = derive { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; };
 Lock5Data = derive { name="Lock5Data"; version="2.6"; sha256="0ckaac00ck5vyv0gv25l1zhgkm3char6ks1p4fl3vdl5gdyrc1pp"; depends=[]; };
 LogConcDEAD = derive { name="LogConcDEAD"; version="1.5-9"; sha256="135vkp70q6gn75ds43aq08y13vrsgsgykssmnhrh6545i86vmhhi"; depends=[MASS mvtnorm]; };
-LogicForest = derive { name="LogicForest"; version="2.1.0"; sha256="0zdyyi6wka0568414f1kw91rx04y76n1k11wxd4r8svb5wybjhp5"; depends=[LogicReg CircStats gtools plotrix]; };
+LogicForest = derive { name="LogicForest"; version="2.1.0"; sha256="0zdyyi6wka0568414f1kw91rx04y76n1k11wxd4r8svb5wybjhp5"; depends=[CircStats gtools LogicReg plotrix]; };
 LogicReg = derive { name="LogicReg"; version="1.5.6"; sha256="1izsdv8vcfv7lqq6i5kzawvrdbqizp2pvf5kv198cmav0g0p4ijd"; depends=[survival]; };
-LogisticDx = derive { name="LogisticDx"; version="0.1"; sha256="1w530panmbwf4qplzzj02q9g2lfzrkawxy66ibwdd14z9bwjdclj"; depends=[multcomp data_table pROC car gRbase rms statmod speedglm]; };
+LogisticDx = derive { name="LogisticDx"; version="0.1"; sha256="1w530panmbwf4qplzzj02q9g2lfzrkawxy66ibwdd14z9bwjdclj"; depends=[car data_table gRbase multcomp pROC rms speedglm statmod]; };
 LogitNet = derive { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; };
 LogrankA = derive { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; };
 LoopAnalyst = derive { name="LoopAnalyst"; version="1.2-3"; sha256="0xbiy1xa2c6acfrzh6p9pa6wrds8ipskxq0f86ia9g5zkp1rjk2j"; depends=[nlme]; };
 LowRankQP = derive { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; };
-Luminescence = derive { name="Luminescence"; version="0.4.4"; sha256="0b7a55aqishi6jwxlpkbakfr38brjd4c61n4mcbsg6nwg7qiz1v7"; depends=[XML shape rgl matrixStats raster zoo bbmle data_table Rcpp minpack_lm Rcpp]; };
-M3 = derive { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[ncdf4 rgdal maps mapdata]; };
+Luminescence = derive { name="Luminescence"; version="0.4.4"; sha256="0b7a55aqishi6jwxlpkbakfr38brjd4c61n4mcbsg6nwg7qiz1v7"; depends=[bbmle data_table matrixStats minpack_lm raster Rcpp rgl shape XML zoo]; };
+M3 = derive { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; };
 MADAM = derive { name="MADAM"; version="1.2.2"; sha256="09w5liqa3mpkbyvkwlabcgyg2b4316qpzq7pbpl0wxl74bsh76vq"; depends=[]; };
 MAINT_Data = derive { name="MAINT.Data"; version="0.4"; sha256="0338q1yh7b0mbnmh3rbli8vq0fzxyx4qxx0143p615ahsf68jw1c"; depends=[]; };
 MALDIquant = derive { name="MALDIquant"; version="1.12"; sha256="1grlqplcz41xdr3wlmn246xs3vk8y6qqq0n92srv2crlr8fw2yg2"; depends=[]; };
-MALDIquantForeign = derive { name="MALDIquantForeign"; version="0.9"; sha256="0bs6frqz462hrad16kjvbmq2s66bv3kpriav4hdz5a4klra389gl"; depends=[MALDIquant base64enc digest downloader readBrukerFlexData readMzXmlData XML]; };
-MAMA = derive { name="MAMA"; version="2.2.1"; sha256="1dcyfir6jv28jzvphiqrjns3jh2zg2201iwcvjzbmddl2isk9h0i"; depends=[metaMA xtable gtools xtable]; };
+MALDIquantForeign = derive { name="MALDIquantForeign"; version="0.9"; sha256="0bs6frqz462hrad16kjvbmq2s66bv3kpriav4hdz5a4klra389gl"; depends=[base64enc digest downloader MALDIquant readBrukerFlexData readMzXmlData XML]; };
+MAMA = derive { name="MAMA"; version="2.2.1"; sha256="1dcyfir6jv28jzvphiqrjns3jh2zg2201iwcvjzbmddl2isk9h0i"; depends=[genefilter GeneMeta gtools MergeMaid metaArray metaMA multtest xtable]; };
 MAMS = derive { name="MAMS"; version="0.4"; sha256="0v4sa8cyjdkg7lrznl7jv8xqm6qf67jf946fd6ymbd0wpd7gxrgp"; depends=[mvtnorm]; };
 MAMSE = derive { name="MAMSE"; version="0.1-3"; sha256="06q6raqbyi9zwg3wzaygqmfs3di55fh4bln3vscdw95kma4hz9km"; depends=[]; };
 MAPA = derive { name="MAPA"; version="1.9"; sha256="1i143x2l6fq4vl8l8cagai580yqv446pdw4gw5qzxp85hgvm8bvg"; depends=[forecast]; };
 MAPLES = derive { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; };
-MAR1 = derive { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[leaps bestglm]; };
-MARSS = derive { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[nlme mvtnorm KFAS]; };
+MAR1 = derive { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[bestglm leaps]; };
+MARSS = derive { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[KFAS mvtnorm nlme]; };
 MASS = derive { name="MASS"; version="7.3-40"; sha256="05mmbhswp5dqjd2c6v9w1z1710sm46d53j3prq8maj6bc9qr634y"; depends=[]; };
 MASSTIMATE = derive { name="MASSTIMATE"; version="1.2"; sha256="1j9l8b5d518ag9ivzr1z4dd2m23y2ia1wdshx1krmshn8xsd6lwp"; depends=[]; };
-MAT = derive { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp Rcpp RcppArmadillo]; };
+MAT = derive { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp RcppArmadillo]; };
 MATA = derive { name="MATA"; version="0.3"; sha256="006mnc4wqh9vdigfzrzx4csgczi0idvlwb6r23w5mmsfbn0ysdm5"; depends=[]; };
 MATTOOLS = derive { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; };
-MAVIS = derive { name="MAVIS"; version="1.1"; sha256="1nbvm6nfwymim63xvfqpvyk1w5fv6cwfh6cl2089myimid22ws1l"; depends=[shiny shinyAce metafor MAc MAd quantreg ggplot2 compute_es SCMA SCRT shinyBS]; };
-MAVTgsa = derive { name="MAVTgsa"; version="1.3"; sha256="0rzal9nsi8y873cbf6hrdyzyxnpd4r1yr9fj66cn0s1c8g93ls0y"; depends=[corpcor foreach multcomp randomForest MASS]; };
+MAVIS = derive { name="MAVIS"; version="1.1"; sha256="1nbvm6nfwymim63xvfqpvyk1w5fv6cwfh6cl2089myimid22ws1l"; depends=[compute_es ggplot2 MAc MAd metafor quantreg SCMA SCRT shiny shinyAce shinyBS]; };
+MAVTgsa = derive { name="MAVTgsa"; version="1.3"; sha256="0rzal9nsi8y873cbf6hrdyzyxnpd4r1yr9fj66cn0s1c8g93ls0y"; depends=[corpcor foreach MASS multcomp randomForest]; };
 MAc = derive { name="MAc"; version="1.1"; sha256="1lshi5rb8l2mpd302wskhlk5vz1wjidvbss9y69l63zjqdwjs7ch"; depends=[]; };
-MAclinical = derive { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[party plsgenomics st e1071]; };
+MAclinical = derive { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[e1071 party plsgenomics st]; };
 MAd = derive { name="MAd"; version="0.8-2"; sha256="0mhys27rmzb0kal4jr8j2y44z4qq46fw260sxl8da9qqvplcwq1p"; depends=[]; };
-MBA = derive { name="MBA"; version="0.0-8"; sha256="09rs1861fz41dgicgh4f95v4zafh1jfxhqar1plpqqdx8z1gpxfl"; depends=[sp BH]; };
+MBA = derive { name="MBA"; version="0.0-8"; sha256="09rs1861fz41dgicgh4f95v4zafh1jfxhqar1plpqqdx8z1gpxfl"; depends=[BH sp]; };
 MBCluster_Seq = derive { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; };
 MBESS = derive { name="MBESS"; version="3.3.3"; sha256="12jsrxwdprrahqbk0i0js7lja81ydy385xmijlqk0slppd72dd9c"; depends=[]; };
 MBI = derive { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; };
-MBmca = derive { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[robustbase chipPCR]; };
+MBmca = derive { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[chipPCR robustbase]; };
 MC2toPath = derive { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrml907v23mfxr62wwjdh7487ihjj59g434ry7wh"; depends=[RNetCDF]; };
 MCAPS = derive { name="MCAPS"; version="0.3-2"; sha256="1jvxl9xi102pcs3swxlx4jk76i7i4fll88c92k7m379ik3r36alb"; depends=[stashR]; };
 MCAvariants = derive { name="MCAvariants"; version="1.0"; sha256="08c5qpklilj41agi5nzm4f5w41pdxk98i1wc1ahhnawc3n2cdbjz"; depends=[]; };
-MCDA = derive { name="MCDA"; version="0.0.8"; sha256="0zpjbshvv88dvqf6a6yw9zhzzh2j90b9yx8yg7q52c3l7a9lks6w"; depends=[Rglpk Kendall glpkAPI]; };
+MCDA = derive { name="MCDA"; version="0.0.10"; sha256="1ba6bzgy5dp6ga6jsbjdy4rm28mp4hj23wdqsp8hcchv0vfx9n2l"; depends=[glpkAPI Kendall Rglpk]; };
 MCL = derive { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; };
-MCMC_OTU = derive { name="MCMC.OTU"; version="1.0.8"; sha256="1bdmvwxkm162m3237bgf42dm5kp3q0giwf0avrkla8qd834gqch0"; depends=[MCMCglmm ggplot2]; };
-MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.2"; sha256="1v8jkxxy7z1r3l9jlshhsq6634chf30d9bb1w80iqrjfn6aamn69"; depends=[MCMCglmm ggplot2 coda]; };
+MCMC_OTU = derive { name="MCMC.OTU"; version="1.0.8"; sha256="1bdmvwxkm162m3237bgf42dm5kp3q0giwf0avrkla8qd834gqch0"; depends=[ggplot2 MCMCglmm]; };
+MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.2"; sha256="1v8jkxxy7z1r3l9jlshhsq6634chf30d9bb1w80iqrjfn6aamn69"; depends=[coda ggplot2 MCMCglmm]; };
 MCMC4Extremes = derive { name="MCMC4Extremes"; version="1.0"; sha256="1ib3rllvqjni9xg3634ankrr66f1lj376kl3xhfwnwbfsbi4a8pw"; depends=[evir]; };
-MCMCglmm = derive { name="MCMCglmm"; version="2.21"; sha256="1mjjp65w7pg2kxrx2qf0lh1kdi9d21xxj7s39zhi3q8ixw35h95r"; depends=[Matrix coda ape corpcor tensorA]; };
+MCMCglmm = derive { name="MCMCglmm"; version="2.21"; sha256="1mjjp65w7pg2kxrx2qf0lh1kdi9d21xxj7s39zhi3q8ixw35h95r"; depends=[ape coda corpcor Matrix tensorA]; };
 MCMCpack = derive { name="MCMCpack"; version="1.3-3"; sha256="0s1j3047qp2fkwdix9galm05lp7jk7qxyic6lwpbd70hmj8ggs76"; depends=[coda MASS]; };
-MCPAN = derive { name="MCPAN"; version="1.1-15"; sha256="0811wrbp0nf4nj8kvq62ks8yksabib8r1a0gx3nr3v6avfnv08w1"; depends=[mvtnorm multcomp]; };
-MCPMod = derive { name="MCPMod"; version="1.0-8"; sha256="1kkak9x66dmannhxfdp6cybbjh2g43p03kyp7a4x1az7h4bnc92f"; depends=[mvtnorm lattice]; };
+MCPAN = derive { name="MCPAN"; version="1.1-15"; sha256="0811wrbp0nf4nj8kvq62ks8yksabib8r1a0gx3nr3v6avfnv08w1"; depends=[multcomp mvtnorm]; };
+MCPMod = derive { name="MCPMod"; version="1.0-8"; sha256="1kkak9x66dmannhxfdp6cybbjh2g43p03kyp7a4x1az7h4bnc92f"; depends=[lattice mvtnorm]; };
 MCPerm = derive { name="MCPerm"; version="1.1.4"; sha256="0g65vzn43k6qrsglxd2kz245f662gl3c2gdz6qvvxa96v6q9lhh1"; depends=[metafor]; };
 MCS = derive { name="MCS"; version="0.1.1"; sha256="0fxc5ri4ci3r5w1hdicqm1j0g6fwrl3wng7qwc2c0isagrn3vp4n"; depends=[]; };
 MCTM = derive { name="MCTM"; version="1.0"; sha256="14xjfskyrqi0m58lkwjfjpss5j7wy3ajr148n526czrrpccg108j"; depends=[]; };
 MChtest = derive { name="MChtest"; version="1.0-2"; sha256="01lflilrp42m236cznn6qgzvv5v9fzpx6wcfxp3q545bw2xmbdvj"; depends=[]; };
 MConjoint = derive { name="MConjoint"; version="0.1"; sha256="02yik28mhvd4rfqwrprdbdjx9c49ds55fh042bsjajs2ip467w5c"; depends=[]; };
 MDM = derive { name="MDM"; version="1.3"; sha256="1bvjhl243rf19829ly1qc20ik937hb82lq23aiysj7ya55z8hdpf"; depends=[nnet]; };
-MDPtoolbox = derive { name="MDPtoolbox"; version="4.0.2"; sha256="04w0y5ib23l7nhj1947hwvfk6lpwwc11amqpyw1w53yj794g97wz"; depends=[Matrix linprog]; };
+MDPtoolbox = derive { name="MDPtoolbox"; version="4.0.2"; sha256="04w0y5ib23l7nhj1947hwvfk6lpwwc11amqpyw1w53yj794g97wz"; depends=[linprog Matrix]; };
 MDR = derive { name="MDR"; version="1.2"; sha256="0g2fvvcwagml6635va87nc0ijzy0pypx5aqzz7mf5w13j0wpm24y"; depends=[lattice]; };
-MEET = derive { name="MEET"; version="5.1.1"; sha256="02xz2zkwqaf1wck9a3h1j6z8dasw4j0zqa88jg6h10wqzcrlp9ba"; depends=[seqinr Matrix ROCR Hmisc KernSmooth]; };
+MEET = derive { name="MEET"; version="5.1.1"; sha256="02xz2zkwqaf1wck9a3h1j6z8dasw4j0zqa88jg6h10wqzcrlp9ba"; depends=[Hmisc KernSmooth Matrix pcaMethods ROCR seqinr seqLogo]; };
 MEMSS = derive { name="MEMSS"; version="0.9-2"; sha256="0wyw8yjs4miwgwdfcnfbzvkxrgv5r3jlg3cg8q2vy7s69wvhksmy"; depends=[lme4]; };
-MESS = derive { name="MESS"; version="0.3-2"; sha256="0x518awi2mxjh3vq69n1jv4d4dxjxhqfx1py48dijgd6w674d3q8"; depends=[geepack glmnet Matrix kinship2 mvtnorm]; };
-MExPosition = derive { name="MExPosition"; version="2.0.3"; sha256="1l27wp0psfvlkk79fhb8ypf8awardjljg1f37yj42friy9pdfksz"; depends=[prettyGraphs ExPosition]; };
+MESS = derive { name="MESS"; version="0.3-2"; sha256="0x518awi2mxjh3vq69n1jv4d4dxjxhqfx1py48dijgd6w674d3q8"; depends=[geepack glmnet kinship2 Matrix mvtnorm]; };
+MExPosition = derive { name="MExPosition"; version="2.0.3"; sha256="1l27wp0psfvlkk79fhb8ypf8awardjljg1f37yj42friy9pdfksz"; depends=[ExPosition prettyGraphs]; };
 MF = derive { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; };
 MFDA = derive { name="MFDA"; version="1.1-4"; sha256="0zf21al8ivmsxlf1i7kc01w0jx3s6650a034cdynz7axnxx28ncx"; depends=[gss mvtnorm]; };
-MFHD = derive { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[fda_usc deldir depth depthTools matrixStats]; };
+MFHD = derive { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; };
 MGL = derive { name="MGL"; version="1.1"; sha256="17xkrq0wzq1gfa6k1lgf34l4ibwjk6j9rnig3l403zpykmf2ffs6"; depends=[]; };
 MGRASTer = derive { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; };
 MGSDA = derive { name="MGSDA"; version="1.1"; sha256="09z066sfjvx7awxc86gfw066wlz6svj7nxkhlas63a7zfbkiz7hl"; depends=[glmnet MASS]; };
 MHadaptive = derive { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; };
-MIICD = derive { name="MIICD"; version="2.1"; sha256="1lh3pbpxn7lbs68741ydw264qn9rap7kmcw49vnjvvzdp7hf24in"; depends=[survival MASS mstate]; };
+MIICD = derive { name="MIICD"; version="2.1"; sha256="1lh3pbpxn7lbs68741ydw264qn9rap7kmcw49vnjvvzdp7hf24in"; depends=[MASS mstate survival]; };
 MIIVsem = derive { name="MIIVsem"; version="0.2"; sha256="15sv6fskhdm70vyz6y6wbxw9ghwinvqad7414qkn7lgymn5fm767"; depends=[lavaan Matrix]; };
 MILC = derive { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; };
 MIPHENO = derive { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; };
 MImix = derive { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; };
-MInt = derive { name="MInt"; version="1.0.1"; sha256="1nk02baainxk7z083yyajxrnadg2y1dnhr51fianibvph1pjjkl6"; depends=[glasso trust MASS testthat]; };
+MInt = derive { name="MInt"; version="1.0.1"; sha256="1nk02baainxk7z083yyajxrnadg2y1dnhr51fianibvph1pjjkl6"; depends=[glasso MASS testthat trust]; };
 MKLE = derive { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; };
 MKmisc = derive { name="MKmisc"; version="0.98"; sha256="0ng6n1x2x1bg60byhpk212pihh7hirbjr4s89lzrwj854z93bv5l"; depends=[RColorBrewer robustbase]; };
-MLCIRTwithin = derive { name="MLCIRTwithin"; version="1.0"; sha256="01fp2pyiwpzsby3iwn9w9ry4nksy2llwzawrmba80s5m7mrcljbn"; depends=[MASS limSolve MultiLCIRT]; };
+MLCIRTwithin = derive { name="MLCIRTwithin"; version="1.0"; sha256="01fp2pyiwpzsby3iwn9w9ry4nksy2llwzawrmba80s5m7mrcljbn"; depends=[limSolve MASS MultiLCIRT]; };
 MLCM = derive { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3y4928chxkggnfwwxp8hqw4r6px"; depends=[]; };
 MLDS = derive { name="MLDS"; version="0.4.3"; sha256="1vql92y2dy1ba5l5xdysqzkzvkrr4bhclmjabn49c8qb2xc2rl40"; depends=[MASS]; };
 MLEcens = derive { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; };
 MLRMPA = derive { name="MLRMPA"; version="1.0"; sha256="0gfbi70b15ivv76l3i0zlm14cq398nlny40aci3vqxxd0m2lyyx5"; depends=[ClustOfVar]; };
 MLmetrics = derive { name="MLmetrics"; version="1.0.0"; sha256="05j8hwcvfrsslib5k4w3xwkllb3rxdxazsld26zpjf3dc643ag9a"; depends=[]; };
-MM = derive { name="MM"; version="1.6-2"; sha256="1z7i8ggd54qjmlxw9ks686hqgm272lwwhgw2s00d9946rxhb3ffi"; depends=[magic partitions emulator Oarray]; };
-MM2S = derive { name="MM2S"; version="1.0.0"; sha256="0g5x375c58xsihj43dh19hx6vh87f8ppjibik5sb7lxvl1xms49c"; depends=[kknn lattice pheatmap]; };
+MM = derive { name="MM"; version="1.6-2"; sha256="1z7i8ggd54qjmlxw9ks686hqgm272lwwhgw2s00d9946rxhb3ffi"; depends=[emulator magic Oarray partitions]; };
+MM2S = derive { name="MM2S"; version="1.0.0"; sha256="0g5x375c58xsihj43dh19hx6vh87f8ppjibik5sb7lxvl1xms49c"; depends=[GSVA kknn lattice pheatmap]; };
+MM2Sdata = derive { name="MM2Sdata"; version="1.0.1"; sha256="1prx0gm9shizj45382qhja417y18jp6spk2hmgrzb7sbniyqs5pd"; depends=[Biobase]; };
 MMIX = derive { name="MMIX"; version="1.2"; sha256="02c74qp48ixqh5cjp2006zgg4xz4bgxxq3csyhjl219if19kmj5m"; depends=[]; };
-MMMS = derive { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[survival glmnet]; };
+MMMS = derive { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[glmnet survival]; };
 MMS = derive { name="MMS"; version="3.00"; sha256="06909912v2hr52s8k0a0830lbmdh05dcd7k47vydhbwq3rzf3ahg"; depends=[glmnet Matrix mht]; };
-MNM = derive { name="MNM"; version="1.0-1"; sha256="0fy43jfd7wak2rfdv5hdq7zc0zsxnbz9p69g6sla0zliibafg0q6"; depends=[ICSNP SpatialNP ellipse ICS]; };
+MNM = derive { name="MNM"; version="1.0-1"; sha256="0fy43jfd7wak2rfdv5hdq7zc0zsxnbz9p69g6sla0zliibafg0q6"; depends=[ellipse ICS ICSNP SpatialNP]; };
 MNP = derive { name="MNP"; version="2.6-4"; sha256="068lssg565dw673dm8f5k6dbxl2vblnszg8wibzy3ijf96hp03cw"; depends=[MASS]; };
 MOCCA = derive { name="MOCCA"; version="1.2"; sha256="04smpzn9x64w1vpw4szqa7dwnaak1ls6gpg7fgajs68mv5zivffa"; depends=[cclust clv]; };
 MODISTools = derive { name="MODISTools"; version="0.94.6"; sha256="0jzs2dvhq48zjzb2rj6yxws8i2h7w2k00vg7xg5riad4v9j9jk0c"; depends=[RCurl XML]; };
-MOJOV = derive { name="MOJOV"; version="1.0.1"; sha256="11mcqxw83z4xx29s34v4rsbb3zvyhlb2lmvf97b77n455gsy5hab"; depends=[aod survey saws lattice]; };
+MOJOV = derive { name="MOJOV"; version="1.0.1"; sha256="11mcqxw83z4xx29s34v4rsbb3zvyhlb2lmvf97b77n455gsy5hab"; depends=[aod lattice saws survey]; };
 MOrder = derive { name="MOrder"; version="0.1"; sha256="1vhy20xyvfc18f04hvlb1jm2n0caaz8ysy13w2rra5i4kjdvz52i"; depends=[]; };
-MPAgenomics = derive { name="MPAgenomics"; version="1.1.2"; sha256="1gwglzkip54si6i23y8s5hhkzrwmhvfyvsian9593ixy4kqlm2bz"; depends=[R_utils changepoint glmnet cghseg HDPenReg spikeslab]; };
+MPAgenomics = derive { name="MPAgenomics"; version="1.1.2"; sha256="1gwglzkip54si6i23y8s5hhkzrwmhvfyvsian9593ixy4kqlm2bz"; depends=[cghseg changepoint glmnet HDPenReg R_utils spikeslab]; };
 MPDiR = derive { name="MPDiR"; version="0.1-16"; sha256="10g4dnysjnzf106qibqqcrxz3xw2nfh4ck1n1dlciwahr0f80j13"; depends=[]; };
 MPINet = derive { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; };
 MPSEM = derive { name="MPSEM"; version="0.2-6"; sha256="1vmdjnhxl8v7xw71kd1m66vhgaa1q0vvifd67v8fmii0i0i5i35y"; depends=[ape MASS]; };
-MPTinR = derive { name="MPTinR"; version="1.8.0"; sha256="0nxiicjdq41bbpfwgzlczm1zrgdilx29nyspvs8m1lx58br1hh8i"; depends=[numDeriv Brobdingnag Rcpp Rcpp RcppEigen]; };
+MPTinR = derive { name="MPTinR"; version="1.9.2"; sha256="1k9mkpwrvrkqh2467kklj9v111pjdwfblk7zpikk18v43qjlayb6"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; };
 MPV = derive { name="MPV"; version="1.38"; sha256="1w3b0lszqmsz0yqvaz56x08xmy1m5ngl9m6p2pg9pjv13k8dv190"; depends=[]; };
 MRCE = derive { name="MRCE"; version="2.0"; sha256="0fnd7ykcxi04pv1af5zbmavsp577vkw6pcrh011na5pzy2xrc49z"; depends=[QUIC]; };
 MRCV = derive { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; };
-MRH = derive { name="MRH"; version="2.0"; sha256="0d6zfhyy8a0pjrr74lj0mcagh49pjh15yp4wa7g7j4qv8wfw5pkv"; depends=[survival KMsurv coda]; };
-MRIaggr = derive { name="MRIaggr"; version="1.1.2"; sha256="0z410xkfyaqfrdiwkw29z7l6n15hdwd4dwbjn211sj6s90fa4q2w"; depends=[Rcpp Rcpp RcppArmadillo]; };
-MRMR = derive { name="MRMR"; version="0.1.3"; sha256="1b3a4bkpcncl4sh7d81nk6b2dzhzqn9zhqdxv31jgippsqm2s3k2"; depends=[reshape2 ggplot2 lubridate lmtest plyr]; };
-MRSP = derive { name="MRSP"; version="0.4.3"; sha256="0zv22xiq3qh9x3r2ckkvq1vv0vkcirh8y87053bqvw1m20j7q1by"; depends=[matrixcalc Formula]; };
-MRsurv = derive { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[survival mvtnorm]; };
+MRH = derive { name="MRH"; version="2.0"; sha256="0d6zfhyy8a0pjrr74lj0mcagh49pjh15yp4wa7g7j4qv8wfw5pkv"; depends=[coda KMsurv survival]; };
+MRIaggr = derive { name="MRIaggr"; version="1.1.2"; sha256="0z410xkfyaqfrdiwkw29z7l6n15hdwd4dwbjn211sj6s90fa4q2w"; depends=[Rcpp RcppArmadillo]; };
+MRMR = derive { name="MRMR"; version="0.1.3"; sha256="1b3a4bkpcncl4sh7d81nk6b2dzhzqn9zhqdxv31jgippsqm2s3k2"; depends=[ggplot2 lmtest lubridate plyr reshape2]; };
+MRSP = derive { name="MRSP"; version="0.4.3"; sha256="0zv22xiq3qh9x3r2ckkvq1vv0vkcirh8y87053bqvw1m20j7q1by"; depends=[Formula matrixcalc]; };
+MRsurv = derive { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[mvtnorm survival]; };
 MRwarping = derive { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; };
-MSBVAR = derive { name="MSBVAR"; version="0.9-2"; sha256="1p6n8vbrlqqq1vbqvxnn0ffmnr462gslb1jkaf4vcrndbln5cclq"; depends=[KernSmooth xtable coda bit mvtnorm lattice]; };
+MSBVAR = derive { name="MSBVAR"; version="0.9-2"; sha256="1p6n8vbrlqqq1vbqvxnn0ffmnr462gslb1jkaf4vcrndbln5cclq"; depends=[bit coda KernSmooth lattice mvtnorm xtable]; };
 MSG = derive { name="MSG"; version="0.2.2"; sha256="18siw81pa02yg0zs40pavwm88yz7kfi60fislmjpwnl2207a6fhf"; depends=[RColorBrewer]; };
-MSIseq = derive { name="MSIseq"; version="0.99.1"; sha256="1wg0j0qr2g2lhhw57cvlawd5hik0bmqb66ynxgn62sgx1nkj3g74"; depends=[RWeka rJava R_utils]; };
+MSIseq = derive { name="MSIseq"; version="1.0.0"; sha256="1v2why1k6pjsc04044nr74571p7541nciq7xkzmya3jq6dw878j3"; depends=[IRanges R_utils rJava RWeka]; };
 MSQC = derive { name="MSQC"; version="1.0.1"; sha256="1vs9kygjg9f4sr1m80hdn03gdhbdqfjamqxhbs9zha8smjrsgisw"; depends=[rgl]; };
-MST = derive { name="MST"; version="1.0"; sha256="142xhg7fpf27ba9gi3dxbmpcpmz56dks0rp4ybqpcxiq3z7wacxp"; depends=[survival MASS]; };
-MSeasy = derive { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4lsjx7n6ydf16flax79hv01z7rcjylh"; depends=[amap clValid cluster fpc]; };
+MST = derive { name="MST"; version="1.0"; sha256="142xhg7fpf27ba9gi3dxbmpcpmz56dks0rp4ybqpcxiq3z7wacxp"; depends=[MASS survival]; };
+MSeasy = derive { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4lsjx7n6ydf16flax79hv01z7rcjylh"; depends=[amap cluster clValid fpc mzR xcms]; };
 MSeasyTkGUI = derive { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; };
 MSwM = derive { name="MSwM"; version="1.2"; sha256="01l23ia20y3nchykha4vz6sa757zmbvgx2315cacxfcqk9rgs08c"; depends=[nlme]; };
-MTS = derive { name="MTS"; version="0.33"; sha256="0i7kpgsw56vvgrdgddn83i9lzjlb72z4llffqai29qq0m1i7hm65"; depends=[Rcpp fGarch mvtnorm Rcpp]; };
-MTurkR = derive { name="MTurkR"; version="0.6.5.1"; sha256="0yg2ycramz0rpac4bfyq8wciyv9jl93al0qsdbzrl7c37z151w3l"; depends=[RCurl digest XML]; };
-MUCflights = derive { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[XML geosphere sp RSQLite NightDay]; };
+MTS = derive { name="MTS"; version="0.33"; sha256="0i7kpgsw56vvgrdgddn83i9lzjlb72z4llffqai29qq0m1i7hm65"; depends=[fGarch mvtnorm Rcpp]; };
+MTurkR = derive { name="MTurkR"; version="0.6.5.1"; sha256="0yg2ycramz0rpac4bfyq8wciyv9jl93al0qsdbzrl7c37z151w3l"; depends=[digest RCurl XML]; };
+MUCflights = derive { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[geosphere NightDay RSQLite sp XML]; };
 MVA = derive { name="MVA"; version="1.0-5"; sha256="18x075hjqhrjwxivvrixgs6yc67il3n5p1m7v2wymcf8h2mkki91"; depends=[HSAUR2]; };
-MVB = derive { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
-MVN = derive { name="MVN"; version="4.0"; sha256="1ql50ch6qig7r0xnfv5f74k3vc32k04jgmvjbndgyzbacn2ibrm7"; depends=[nortest moments MASS robustbase mvoutlier plyr psych]; };
+MVB = derive { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; };
+MVN = derive { name="MVN"; version="4.0"; sha256="1ql50ch6qig7r0xnfv5f74k3vc32k04jgmvjbndgyzbacn2ibrm7"; depends=[MASS moments mvoutlier nortest plyr psych robustbase]; };
 MVR = derive { name="MVR"; version="1.20.0"; sha256="1wwzws9116ck14g6xd1svmwc9wkr8piwb24bddnzri388p8qkgb4"; depends=[statmod]; };
 MVar_pt = derive { name="MVar.pt"; version="1.1"; sha256="0jcxsf0c9klnj19j8shiadxrbh3wa7da2vywk352ylirl5vdv2yl"; depends=[]; };
 MXM = derive { name="MXM"; version="0.3.1"; sha256="06sp6hy0dparya6fcfbiyhh0h10r8ai8fmh4rq2fz0dq6prk95ic"; depends=[]; };
 MaXact = derive { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; };
-Maeswrap = derive { name="Maeswrap"; version="1.4.11"; sha256="15i36xj2bdzhly78614077s8k2z75a1gmzl2crsfgvhyyjdax8r7"; depends=[rgl lattice geometry]; };
+Maeswrap = derive { name="Maeswrap"; version="1.4.11"; sha256="15i36xj2bdzhly78614077s8k2z75a1gmzl2crsfgvhyyjdax8r7"; depends=[geometry lattice rgl]; };
 ManyTests = derive { name="ManyTests"; version="1.1"; sha256="11xk3j2q7w6b6ljmp7b8gni0khpmpvcvzwxypy0w8ihi2gaczsxj"; depends=[]; };
 Map2NCBI = derive { name="Map2NCBI"; version="1.0"; sha256="02cgmayrhkyji0cwr6n0f439njq29mzna7sgzkq6ml45njm9m5nh"; depends=[]; };
-MapGAM = derive { name="MapGAM"; version="0.7-5"; sha256="0bpswdi7iic7hsqrwcxwv27n4095m292nv5db6d4mj9gvp13h7i7"; depends=[sp gam maptools]; };
+MapGAM = derive { name="MapGAM"; version="0.7-5"; sha256="0bpswdi7iic7hsqrwcxwv27n4095m292nv5db6d4mj9gvp13h7i7"; depends=[gam maptools sp]; };
 MareyMap = derive { name="MareyMap"; version="1.2"; sha256="1l7s1ffl9bg1zx5nyb1r3dba188mxiaprdda3gqm2cr1f33jmr51"; depends=[tkrplot]; };
-MarkowitzR = derive { name="MarkowitzR"; version="0.1502"; sha256="0srrmzr4msn04w5f6s6qs51db8jccpfj10sighsv1l7d056n2xjn"; depends=[matrixcalc sandwich gtools]; };
+MarkowitzR = derive { name="MarkowitzR"; version="0.1502"; sha256="0srrmzr4msn04w5f6s6qs51db8jccpfj10sighsv1l7d056n2xjn"; depends=[gtools matrixcalc sandwich]; };
 MasterBayes = derive { name="MasterBayes"; version="2.52"; sha256="12ka2l4x6psij7wzbb98lwx5shgwzn5v44qfpiw1i6g236yp0mhm"; depends=[coda genetics gtools kinship2]; };
 MatchIt = derive { name="MatchIt"; version="2.4-21"; sha256="02kii2143i8zywxlf049l841b1y4hqjwkr1cnyv6b8b7y7lz2m5v"; depends=[MASS]; };
 Matching = derive { name="Matching"; version="4.8-3.4"; sha256="04m647342j4yi74ds7ddwnyrf58qdy7k3mc067k3p779qavq2ka1"; depends=[MASS]; };
-MatchingFrontier = derive { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[MASS igraph segmented]; };
+MatchingFrontier = derive { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[igraph MASS segmented]; };
 Matrix = derive { name="Matrix"; version="1.2-1"; sha256="0farq1x1qhgzdwqqd4bn3g6hbv91hk5sm2v00vphf0zgj2fg2qm6"; depends=[lattice]; };
 MatrixEQTL = derive { name="MatrixEQTL"; version="2.1.1"; sha256="1bvfhzhvm1psgq51kpjcpp7bidaxcrxdigmv6abfi3jk5kyzn5ik"; depends=[]; };
 MatrixModels = derive { name="MatrixModels"; version="0.4-0"; sha256="1jcjsyha0xmz264g1haj7x8zpzjmp1m0jl39h5bf8r45hhlaxcsa"; depends=[Matrix]; };
@@ -1167,22 +1173,22 @@ MaxPro = derive { name="MaxPro"; version="3.1-2"; sha256="1y2g8a8yvzb24dj0z82nzf
 MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.2.4"; sha256="04ljjzcqfgy136wviz92gdavqzjhbai1v69nj4kg6vc6nwvkhnbx"; depends=[dplyr rgdal rgeos rvest sp stringr]; };
 McParre = derive { name="McParre"; version="1.0.1"; sha256="16bfca867drbknzc6bylg8paa8p72l23wgjpyvy4pd9z6lpgmhdy"; depends=[MASS]; };
 McSpatial = derive { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
-Mcomp = derive { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[tseries forecast]; };
+Mcomp = derive { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[forecast tseries]; };
 MedOr = derive { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; };
-MenuCollection = derive { name="MenuCollection"; version="1.2"; sha256="0v3flicfnln9qld150yk3rfldvsr4dllhq80l02n1lq6px38nf2s"; depends=[RGtk2 RGtk2Extras gplots]; };
-MergeGUI = derive { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[gWidgetsRGtk2 ggplot2 cairoDevice rpart]; };
+MenuCollection = derive { name="MenuCollection"; version="1.2"; sha256="0v3flicfnln9qld150yk3rfldvsr4dllhq80l02n1lq6px38nf2s"; depends=[gplots RGtk2 RGtk2Extras]; };
+MergeGUI = derive { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 rpart]; };
 MetABEL = derive { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; };
 MetFns = derive { name="MetFns"; version="1.0"; sha256="03kx8cr4c6mgjincf87m305fhryh1c42hdzr1ljl63affnlp7nfp"; depends=[astroFns plotrix]; };
 MetNorm = derive { name="MetNorm"; version="0.1"; sha256="0vfi3k0yp2dz47gwj1n1avs3ji0a2nlrrljz5d0l66zfh4474jb4"; depends=[]; };
-MetSizeR = derive { name="MetSizeR"; version="1.1"; sha256="11hdmpvnszr6pn9ihb3zjy9miksz1fs4piry153z4dic8pjydkax"; depends=[mvtnorm MetabolAnalyze cairoDevice gWidgets gWidgetsRGtk2]; };
-MetStaT = derive { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[MASS abind pls]; };
-MetaDE = derive { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[survival combinat]; };
-MetaLandSim = derive { name="MetaLandSim"; version="0.2"; sha256="0lb058kcqpylw27hlmkxmpndsiw71g865fgapw6d599brgi91a8i"; depends=[spatstat sp e1071 fgui googleVis maptools rgeos spgrass6 raster]; };
+MetSizeR = derive { name="MetSizeR"; version="1.1"; sha256="11hdmpvnszr6pn9ihb3zjy9miksz1fs4piry153z4dic8pjydkax"; depends=[cairoDevice gWidgets gWidgetsRGtk2 MetabolAnalyze mvtnorm]; };
+MetStaT = derive { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[abind MASS pls]; };
+MetaDE = derive { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[Biobase combinat impute survival]; };
+MetaLandSim = derive { name="MetaLandSim"; version="0.2"; sha256="0lb058kcqpylw27hlmkxmpndsiw71g865fgapw6d599brgi91a8i"; depends=[Biobase e1071 fgui googleVis maptools raster rgeos sp spatstat spgrass6]; };
 MetaPCA = derive { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; };
-MetaQC = derive { name="MetaQC"; version="0.1.13"; sha256="11595ggjr46z6xiwmhiyx1sydaq68l18y7mgdwxsg81g03ck9x1r"; depends=[proto foreach iterators]; };
+MetaQC = derive { name="MetaQC"; version="0.1.13"; sha256="11595ggjr46z6xiwmhiyx1sydaq68l18y7mgdwxsg81g03ck9x1r"; depends=[foreach iterators proto]; };
 MetaSKAT = derive { name="MetaSKAT"; version="0.40"; sha256="1jxs32hvsw6wzci9f1rc7sw1dfyazdm2d57wcmhkggfg3hkdn1vv"; depends=[SKAT]; };
-MetabolAnalyze = derive { name="MetabolAnalyze"; version="1.3"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[mclust mvtnorm ellipse gtools gplots]; };
-Metatron = derive { name="Metatron"; version="0.1-1"; sha256="0apz2k3za19px1bcg4ls0axaljrpxnqhs86b6s862c370sspc1x8"; depends=[lme4 mpt Matrix]; };
+MetabolAnalyze = derive { name="MetabolAnalyze"; version="1.3"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[ellipse gplots gtools mclust mvtnorm]; };
+Metatron = derive { name="Metatron"; version="0.1-1"; sha256="0apz2k3za19px1bcg4ls0axaljrpxnqhs86b6s862c370sspc1x8"; depends=[lme4 Matrix mpt]; };
 Meth27QC = derive { name="Meth27QC"; version="1.1"; sha256="0ad30svs2kjzmmyvcm0jmv64iyq7slp1x1xl35h2rv1b6zbd4658"; depends=[gplots]; };
 MethComp = derive { name="MethComp"; version="1.22.2"; sha256="0f9l36d00x054yqgbw0dckc7ldlgap6vnbb03n6n5yz47xxg0ic3"; depends=[nlme]; };
 Methplot = derive { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; };
@@ -1190,116 +1196,116 @@ Metrics = derive { name="Metrics"; version="0.1.1"; sha256="1yqhlsmhh9sl7qngl85b
 MfUSampler = derive { name="MfUSampler"; version="0.9.1"; sha256="0fw1jw2ljsxmvnaayn7zdrrsnbbkkb5n9nm396321p36bqkf1pk3"; depends=[ars]; };
 MiRSEA = derive { name="MiRSEA"; version="1.0"; sha256="1azabfwd83x6g3fpwdqss5b0rxj8zfmj9972bd0brk8z39wggsrr"; depends=[]; };
 MiST = derive { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; };
-MicSim = derive { name="MicSim"; version="1.0.8"; sha256="0i9vyim7wfnaf1zcs1vz6yc7xkr1hzhqcccbcvg15vkzhr23f8lg"; depends=[chron snowfall rlecuyer]; };
-MicroDatosEs = derive { name="MicroDatosEs"; version="0.6.3.1"; sha256="17ka9bdic8vdr0aabmgm216zm9a8jppxll042b5ric4vzplah17d"; depends=[memisc Hmisc]; };
+MicSim = derive { name="MicSim"; version="1.0.8"; sha256="0i9vyim7wfnaf1zcs1vz6yc7xkr1hzhqcccbcvg15vkzhr23f8lg"; depends=[chron rlecuyer snowfall]; };
+MicroDatosEs = derive { name="MicroDatosEs"; version="0.6.3.1"; sha256="17ka9bdic8vdr0aabmgm216zm9a8jppxll042b5ric4vzplah17d"; depends=[Hmisc memisc]; };
 MicroStrategyR = derive { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; };
-MigClim = derive { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[SDMTools raster]; };
+MigClim = derive { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[raster SDMTools]; };
 MindOnStats = derive { name="MindOnStats"; version="0.11"; sha256="13995v4n0hfb53w02jk81pl7nazkvqwwv87y1sr99jr9ppzc08mz"; depends=[]; };
 Miney = derive { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; };
 MissMech = derive { name="MissMech"; version="1.0.2"; sha256="1b7i1balfl1cqr3l4l4wxlahk2gmawzv9rhyibwzf0yp60cb1sv9"; depends=[]; };
-MissingDataGUI = derive { name="MissingDataGUI"; version="0.2-2"; sha256="07a3y8l0r7a0f7zmp5pg2aqkf7hyk8cf562x3m8b38w96vir4vr0"; depends=[gWidgetsRGtk2 ggplot2 GGally cairoDevice reshape]; };
+MissingDataGUI = derive { name="MissingDataGUI"; version="0.2-2"; sha256="07a3y8l0r7a0f7zmp5pg2aqkf7hyk8cf562x3m8b38w96vir4vr0"; depends=[cairoDevice GGally ggplot2 gWidgetsRGtk2 reshape]; };
 MitISEM = derive { name="MitISEM"; version="1.0"; sha256="03305ds3rgr29z4idaxzsm83igiygna2sqd5vpixklngsrp8w341"; depends=[mvtnorm]; };
-MixAll = derive { name="MixAll"; version="1.0.2"; sha256="10jwiri659i2h0gkaxc41gjvff4v465syxr0nppn1qqz5910jql0"; depends=[rtkpp Rcpp rtkpp]; };
-MixGHD = derive { name="MixGHD"; version="1.6"; sha256="0lmv1yspjn9m5kw0zd2sabgy33zd77p0nqfvs9cvy3ldvz35095i"; depends=[MASS mclust Bessel mvtnorm ghyp numDeriv mixture]; };
+MixAll = derive { name="MixAll"; version="1.0.2"; sha256="10jwiri659i2h0gkaxc41gjvff4v465syxr0nppn1qqz5910jql0"; depends=[Rcpp rtkpp]; };
+MixGHD = derive { name="MixGHD"; version="1.6"; sha256="0lmv1yspjn9m5kw0zd2sabgy33zd77p0nqfvs9cvy3ldvz35095i"; depends=[Bessel ghyp MASS mclust mixture mvtnorm numDeriv]; };
 MixMAP = derive { name="MixMAP"; version="1.3.1"; sha256="0m6m9wi0ain7z96s6z6kmwjisfqm3al6m459y5zr2l1cdbdpxfpv"; depends=[lme4]; };
 MixSim = derive { name="MixSim"; version="1.1-1"; sha256="1a1hrsnm6zv9vag7hq8plrkjr4ak26w7k58wdkgxsjb9r6qzm1yf"; depends=[MASS]; };
 MixedTS = derive { name="MixedTS"; version="1.0.1"; sha256="0ljal2jxscwrv439blavf5gjxbi3k3jfqqmwblzfvc05dqgvdk0b"; depends=[MASS]; };
 MixtureInf = derive { name="MixtureInf"; version="1.0-1"; sha256="1cq8zzhhb6vg545n9aw1b9fhx025zy75dd6pw161svsb5776py5d"; depends=[]; };
-Mobilize = derive { name="Mobilize"; version="2.16-4"; sha256="16vdvpwspa0igb52zvzyk0if9l4wq1hm8y42572i8sh1m82wyyfs"; depends=[Ohmage ggplot2 wordcloud reshape2]; };
-Modalclust = derive { name="Modalclust"; version="0.6"; sha256="16h90d30jwdrla5627rva0yf69n0zib9z5fl3k5awlqfscz4fw26"; depends=[mvtnorm zoo class]; };
+Mobilize = derive { name="Mobilize"; version="2.16-4"; sha256="16vdvpwspa0igb52zvzyk0if9l4wq1hm8y42572i8sh1m82wyyfs"; depends=[ggplot2 Ohmage reshape2 wordcloud]; };
+Modalclust = derive { name="Modalclust"; version="0.6"; sha256="16h90d30jwdrla5627rva0yf69n0zib9z5fl3k5awlqfscz4fw26"; depends=[class mvtnorm zoo]; };
 ModelGood = derive { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; };
-ModelMap = derive { name="ModelMap"; version="3.0.15"; sha256="1d7qn1p4fv94bdlr6if64vxl9yknavix4gzmpg3kxwlrxaz2g8a2"; depends=[randomForest raster gbm rgdal fields HandTill2001 PresenceAbsence]; };
-Momocs = derive { name="Momocs"; version="0.2-6"; sha256="187w6xyswlg5nac6lbprcwvj63gka832n33vlj2ix810vqyxd0fk"; depends=[ade4 sp shapes jpeg spdep ape]; };
+ModelMap = derive { name="ModelMap"; version="3.0.15"; sha256="1d7qn1p4fv94bdlr6if64vxl9yknavix4gzmpg3kxwlrxaz2g8a2"; depends=[fields gbm HandTill2001 PresenceAbsence randomForest raster rgdal]; };
+Momocs = derive { name="Momocs"; version="0.2-6"; sha256="187w6xyswlg5nac6lbprcwvj63gka832n33vlj2ix810vqyxd0fk"; depends=[ade4 ape jpeg shapes sp spdep]; };
 MonetDB_R = derive { name="MonetDB.R"; version="0.9.7"; sha256="0b5agr3dl0ps7fnqw2fsgzb2ysqzvg2ymhxz3xyn08djgz6w7vkm"; depends=[DBI digest]; };
 MonoPoly = derive { name="MonoPoly"; version="0.2-8"; sha256="0lpqqpahpss4q9iddh2p4h6klsrjhg3v6h1wfb70vy0miyhqb93h"; depends=[quadprog]; };
-Morpho = derive { name="Morpho"; version="2.2"; sha256="03j121ghswr1kwq40krk3b4ycn44l9ga3bp64igknvpnqikp5qcb"; depends=[Rvcg rgl colorRamps foreach Matrix yaImpute doParallel Rcpp Rcpp RcppArmadillo]; };
+Morpho = derive { name="Morpho"; version="2.2"; sha256="03j121ghswr1kwq40krk3b4ycn44l9ga3bp64igknvpnqikp5qcb"; depends=[colorRamps doParallel foreach Matrix Rcpp RcppArmadillo rgl Rvcg yaImpute]; };
 MorseGen = derive { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; };
-MortalitySmooth = derive { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[svcm lattice]; };
-MplusAutomation = derive { name="MplusAutomation"; version="0.6-3"; sha256="1zb4drqaswzwssky1bp69p3p8inqfdvxg2ji9bjrzf3vf0b5fl4p"; depends=[boot plyr gsubfn coda xtable lattice texreg]; };
-Mposterior = derive { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp Rcpp RcppArmadillo]; };
+MortalitySmooth = derive { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[lattice svcm]; };
+MplusAutomation = derive { name="MplusAutomation"; version="0.6-3"; sha256="1zb4drqaswzwssky1bp69p3p8inqfdvxg2ji9bjrzf3vf0b5fl4p"; depends=[boot coda gsubfn lattice plyr texreg xtable]; };
+Mposterior = derive { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp RcppArmadillo]; };
 MuFiCokriging = derive { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; };
 MuMIn = derive { name="MuMIn"; version="1.14.0"; sha256="0zwwwp7979kss5871vp6975maqm8gsc0hn75fxq90l0xcyipxvcy"; depends=[Matrix]; };
 MultEq = derive { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; };
 MultNonParam = derive { name="MultNonParam"; version="1.0"; sha256="0xff81wjmyw2d38r0v3n7vv0dasg9rlrc0zrdwsmfd83zpvxqj5m"; depends=[]; };
 MultiCNVDetect = derive { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; };
-MultiLCIRT = derive { name="MultiLCIRT"; version="2.9"; sha256="0anb041nd56rrryhv5w1pb0axxsfkqas177r6yf5h5gbc4vn3758"; depends=[MASS limSolve]; };
-MultiMeta = derive { name="MultiMeta"; version="0.1"; sha256="0gj0wk39fqd21xjcah20jk16jlfrcjarspbjk5xv74c9k4p5gmak"; depends=[gtable mvtnorm expm ggplot2 reshape2]; };
-MultiOrd = derive { name="MultiOrd"; version="2.1"; sha256="12y5cg06qyaz72gk3bi5pqkd55n72rz056y9va49znlsqph09x2x"; depends=[mvtnorm corpcor Matrix psych]; };
-MultiPhen = derive { name="MultiPhen"; version="2.0.0"; sha256="05w7khzyxswlsz4sxhaakbz828zrdya1y8qcsdfc6w7wgl8qpmj9"; depends=[MASS abind epitools meta HardyWeinberg RColorBrewer gplots]; };
-MultiRR = derive { name="MultiRR"; version="1.0"; sha256="0m2v13cygabjbsz0fwxwh03csd3yfdpzk4yfvx8lrim9m90026hz"; depends=[MASS lme4]; };
+MultiLCIRT = derive { name="MultiLCIRT"; version="2.9"; sha256="0anb041nd56rrryhv5w1pb0axxsfkqas177r6yf5h5gbc4vn3758"; depends=[limSolve MASS]; };
+MultiMeta = derive { name="MultiMeta"; version="0.1"; sha256="0gj0wk39fqd21xjcah20jk16jlfrcjarspbjk5xv74c9k4p5gmak"; depends=[expm ggplot2 gtable mvtnorm reshape2]; };
+MultiOrd = derive { name="MultiOrd"; version="2.1"; sha256="12y5cg06qyaz72gk3bi5pqkd55n72rz056y9va49znlsqph09x2x"; depends=[corpcor Matrix mvtnorm psych]; };
+MultiPhen = derive { name="MultiPhen"; version="2.0.0"; sha256="05w7khzyxswlsz4sxhaakbz828zrdya1y8qcsdfc6w7wgl8qpmj9"; depends=[abind epitools gplots HardyWeinberg MASS meta RColorBrewer]; };
+MultiRR = derive { name="MultiRR"; version="1.0"; sha256="0m2v13cygabjbsz0fwxwh03csd3yfdpzk4yfvx8lrim9m90026hz"; depends=[lme4 MASS]; };
 MultiSV = derive { name="MultiSV"; version="0.0-67"; sha256="0924lvkx12aqjxxz8bwqdi4h9xc2acf8aynllx0m45ip5r4gh1g2"; depends=[nlme reshape]; };
 Multiclasstesting = derive { name="Multiclasstesting"; version="1.3.9"; sha256="09y3gnarqv15wgmk545qrwpjwb2ilv2b2kc74cxzcb2p1lflfjzm"; depends=[]; };
 MultinomialCI = derive { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; };
 Myrrix = derive { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; };
 Myrrixjars = derive { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; };
 NADA = derive { name="NADA"; version="1.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; };
-NAM = derive { name="NAM"; version="1.3.2"; sha256="0rzhqs9qcry3w4q1lcfzmp4fndbmj4bm8981i7nn4cipcjfx7635"; depends=[Rcpp randomForest Rcpp]; };
-NAPPA = derive { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[plyr NanoStringNorm]; };
+NAM = derive { name="NAM"; version="1.3.2"; sha256="0rzhqs9qcry3w4q1lcfzmp4fndbmj4bm8981i7nn4cipcjfx7635"; depends=[randomForest Rcpp]; };
+NAPPA = derive { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[NanoStringNorm plyr]; };
 NB = derive { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; };
 NBDdirichlet = derive { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; };
-NBPSeq = derive { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[]; };
-NCmisc = derive { name="NCmisc"; version="1.1.4"; sha256="0hbrad72lzp0vi0j9lvpmvdih7vijqghqng1f0hjd8fg8hjvcflg"; depends=[proftools dplyr]; };
-NEff = derive { name="NEff"; version="1.1"; sha256="16ys1fi28kbzg3am9vz1c5pc9x0ac47pl6za04h63lspk99yplzk"; depends=[msm bit]; };
+NBPSeq = derive { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[qvalue]; };
+NCmisc = derive { name="NCmisc"; version="1.1.4"; sha256="0hbrad72lzp0vi0j9lvpmvdih7vijqghqng1f0hjd8fg8hjvcflg"; depends=[dplyr proftools]; };
+NEff = derive { name="NEff"; version="1.1"; sha256="16ys1fi28kbzg3am9vz1c5pc9x0ac47pl6za04h63lspk99yplzk"; depends=[bit msm]; };
 NHANES = derive { name="NHANES"; version="2.0"; sha256="0bdsccr1g2vnisllnmj2z4sma5hdp2iqm1fpr0kmbv1dnkpmxd41"; depends=[]; };
-NHEMOtree = derive { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[partykit emoa sets rpart]; };
-NHMM = derive { name="NHMM"; version="3.5"; sha256="03il5y6vz5zyadydhk3qg6sd6fmsw7md9if1igyy9643mxxm1g0f"; depends=[BayesLogit msm MCMCpack MASS Rcpp Rcpp]; };
-NHMSAR = derive { name="NHMSAR"; version="1.1"; sha256="1qbgxb684qwcb29x95a48r6bndqwdi1drwzimkhkb2ldm98yga3z"; depends=[ucminf lars SIS caTools glasso]; };
+NHEMOtree = derive { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[emoa partykit rpart sets]; };
+NHMM = derive { name="NHMM"; version="3.5"; sha256="03il5y6vz5zyadydhk3qg6sd6fmsw7md9if1igyy9643mxxm1g0f"; depends=[BayesLogit MASS MCMCpack msm Rcpp]; };
+NHMSAR = derive { name="NHMSAR"; version="1.1"; sha256="1qbgxb684qwcb29x95a48r6bndqwdi1drwzimkhkb2ldm98yga3z"; depends=[caTools glasso lars SIS ucminf]; };
 NHPoisson = derive { name="NHPoisson"; version="3.1"; sha256="1gr682kxgw227yqw9w0iw9lrijsz5iszhnfk0mdhi6m1w9s28kcn"; depends=[car]; };
 NISTnls = derive { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; };
 NISTunits = derive { name="NISTunits"; version="1.0.0"; sha256="156rk3wams52lw3inf55s9v7mi5x29mmb41p8kvryimnzgi904ca"; depends=[]; };
 NLP = derive { name="NLP"; version="0.1-7"; sha256="1r7m6mq7i6xcf2qxzwvwx129fq89gx6f8kxqn76iw5a5nfarq87w"; depends=[]; };
-NLPutils = derive { name="NLPutils"; version="0.0-2"; sha256="1ny1q4b4pd1pl6d3lgv9zfkrw5wjd6pvhwlahj82fr1z3nq46bwb"; depends=[NLP SnowballC qdap]; };
+NLPutils = derive { name="NLPutils"; version="0.0-2"; sha256="1ny1q4b4pd1pl6d3lgv9zfkrw5wjd6pvhwlahj82fr1z3nq46bwb"; depends=[NLP qdap SnowballC]; };
 NLRoot = derive { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; };
-NMF = derive { name="NMF"; version="0.20.6"; sha256="0mmh9bz0zjwd8h9jplz4rq3g94npaqj8s4px51vcv47csssd9k6z"; depends=[pkgmaker registry rngtools cluster stringr digest gridBase colorspace RColorBrewer foreach doParallel ggplot2 reshape2]; };
+NMF = derive { name="NMF"; version="0.20.6"; sha256="0mmh9bz0zjwd8h9jplz4rq3g94npaqj8s4px51vcv47csssd9k6z"; depends=[cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; };
 NMFN = derive { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; };
 NMOF = derive { name="NMOF"; version="0.34-2"; sha256="1hqq0gypry614jfc8hcagwkf6xz6z98pb9hzkl9ygykv4rfs5bms"; depends=[]; };
-NNTbiomarker = derive { name="NNTbiomarker"; version="0.28"; sha256="1y9lkn12a7p1qwi10pzzidhjgkzazn6lfflihnc46phf6yzgdrs6"; depends=[shiny xtable stringr]; };
+NNTbiomarker = derive { name="NNTbiomarker"; version="0.28"; sha256="1y9lkn12a7p1qwi10pzzidhjgkzazn6lfflihnc46phf6yzgdrs6"; depends=[shiny stringr xtable]; };
 NORMT3 = derive { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; };
 NORRRM = derive { name="NORRRM"; version="1.0.0"; sha256="06bdd5m46c8bbgmr1xkqfw72mm38pafxsvwi9p8y7znzyd0i6ag3"; depends=[ggplot2 SDMTools]; };
 NORTARA = derive { name="NORTARA"; version="1.0.0"; sha256="1q4dmn5q939d920spmxxw08afacs3pzhr2gzwyqa5kn8xiz4ffg8"; depends=[corpcor Matrix]; };
-NPBayesImpute = derive { name="NPBayesImpute"; version="0.5"; sha256="0ym227hz6g51bfn218k1g377ci66j4i2sx9zmm5n62sg1dzj3xaj"; depends=[Rcpp Rcpp]; };
-NPC = derive { name="NPC"; version="1.0.0"; sha256="0cx1rqbzn1bmizixf86idqyxz29yip8aq55mbi6l7bfnqp1hq105"; depends=[permute dplyr coin matlab]; };
-NPCD = derive { name="NPCD"; version="1.0-8"; sha256="0wpyxcq2s97iy155sz4pihcgwk8wgk56s7cgszbkz2hl6cijjcbb"; depends=[BB R_oo R_methodsS3]; };
+NPBayesImpute = derive { name="NPBayesImpute"; version="0.5"; sha256="0ym227hz6g51bfn218k1g377ci66j4i2sx9zmm5n62sg1dzj3xaj"; depends=[Rcpp]; };
+NPC = derive { name="NPC"; version="1.0.0"; sha256="0cx1rqbzn1bmizixf86idqyxz29yip8aq55mbi6l7bfnqp1hq105"; depends=[coin dplyr matlab permute]; };
+NPCD = derive { name="NPCD"; version="1.0-8"; sha256="0wpyxcq2s97iy155sz4pihcgwk8wgk56s7cgszbkz2hl6cijjcbb"; depends=[BB R_methodsS3 R_oo]; };
 NPCirc = derive { name="NPCirc"; version="2.0.1"; sha256="1pyckjvf4vzns9hxnhnk7cm4abllmdj3f142pvjhnilyqwndqgyc"; depends=[circular misc3d movMF plotrix rgl shape]; };
-NPHMC = derive { name="NPHMC"; version="2.2"; sha256="000x9y00gfkaj5lf00a55b9qx15x05yp3g3nmp8slyzsnfv66p5d"; depends=[survival smcure]; };
+NPHMC = derive { name="NPHMC"; version="2.2"; sha256="000x9y00gfkaj5lf00a55b9qx15x05yp3g3nmp8slyzsnfv66p5d"; depends=[smcure survival]; };
 NPMLEcmprsk = derive { name="NPMLEcmprsk"; version="2.1"; sha256="1v15ylgflbdr03pgh55fan1l6mymd1d5n6h9jhbcqahjlcsxkwq3"; depends=[]; };
 NPMPM = derive { name="NPMPM"; version="1.0"; sha256="14rjj48vfj4wv1na5v181jby016afx4ak1fs0f3g1fif4kbgbdx0"; depends=[]; };
 NPMVCP = derive { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; };
 NPS = derive { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; };
 NPsimex = derive { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; };
-NSA = derive { name="NSA"; version="0.0.32"; sha256="0lnimyx3fpnw9zfhqm7y3ssvbpmvbmhcqy6fp83862imiwpl8i5r"; depends=[R_methodsS3 MASS matrixStats R_oo R_utils aroma_core aroma_affymetrix]; };
-NSM3 = derive { name="NSM3"; version="1.3"; sha256="0vmv7r499ig2fq2gwx78jdrflk5i55jy3vgjh87ygwlyhwj9cm8p"; depends=[combinat MASS partitions survival agricolae ash binom BSDA coin epitools fANCOVA gtools Hmisc km_ci metafor nortest np quantreg Rfit SemiPar SuppDists waveslim]; };
+NSA = derive { name="NSA"; version="0.0.32"; sha256="0lnimyx3fpnw9zfhqm7y3ssvbpmvbmhcqy6fp83862imiwpl8i5r"; depends=[aroma_affymetrix aroma_core DNAcopy MASS matrixStats R_methodsS3 R_oo R_utils]; };
+NSM3 = derive { 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]; };
 NSUM = derive { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; };
 NScluster = derive { name="NScluster"; version="1.0.2"; sha256="1bvr44qx3bzbgsdpj70dfq9azkrsywkbvwvm3lwwgpn0spk8apld"; depends=[]; };
 NanoStringNorm = derive { name="NanoStringNorm"; version="1.1.19"; sha256="0nrhsg32f6381snsxivcnznl752y9jmdscrcn1j8xylwmwc0r4hj"; depends=[gdata]; };
 NbClust = derive { name="NbClust"; version="3.0"; sha256="1vwb48zy6ln1ddpqmfngii1i80n8qmqyxnzdp6gbaq96lakl3w3c"; depends=[]; };
 NeatMap = derive { name="NeatMap"; version="0.3.6.2"; sha256="186y06zrh87q6vixl2da2d6apvcj1zkk79c95k081zj5awmryr9b"; depends=[ggplot2 rgl]; };
-NestedCohort = derive { name="NestedCohort"; version="1.1-3"; sha256="10hsc6zik8sz2mp6ig3xr6z3bq0c6rlvqkn11pxny17a4n02wapp"; depends=[survival MASS]; };
+NestedCohort = derive { name="NestedCohort"; version="1.1-3"; sha256="10hsc6zik8sz2mp6ig3xr6z3bq0c6rlvqkn11pxny17a4n02wapp"; depends=[MASS survival]; };
 NetCluster = derive { name="NetCluster"; version="0.2"; sha256="0aby8kfniw07jap795cwk69z83p45q5rap73zp1qbmkm3qcb31g4"; depends=[sna]; };
 NetComp = derive { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; };
 NetData = derive { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; };
 NetIndices = derive { name="NetIndices"; version="1.4.4"; sha256="0ydivbri8l8zkxi18ghj9h66915scyhca8i9mcyq4b06mjfigss8"; depends=[MASS]; };
-NetSim = derive { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp Rcpp]; };
+NetSim = derive { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp]; };
 NeuralNetTools = derive { name="NeuralNetTools"; version="1.3.1"; sha256="0nk2rs1rfv1lp99kfmqfcwgli92pljzrf4dgxp5q3icgpyf88kqv"; depends=[ggplot2 neuralnet nnet reshape2 RSNNS scales]; };
 Newdistns = derive { name="Newdistns"; version="2.0"; sha256="1jgv9jl6pvsjgjsbjvmjg8qwjx4gsmp4kd27pbqxldp0qp0q9mjf"; depends=[AdequacyModel]; };
 NightDay = derive { name="NightDay"; version="1.0.1"; sha256="0vkpr2jwhgghiiiaiglaj1b9pz25fcsl628c9nsp9zyl67982wz1"; depends=[maps]; };
 Nippon = derive { name="Nippon"; version="0.5.3"; sha256="02m591aljlaxn95k7sl8gfsviv4ywqv9mrkjf6g19kfrc9pbgjqg"; depends=[maptools]; };
 NlsyLinks = derive { name="NlsyLinks"; version="1.302"; sha256="0m1qvrpdfwql4jdk3nbn80llq83wavimifw630gnazwmkgkcncai"; depends=[lavaan]; };
-NominalLogisticBiplot = derive { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[mirt gmodels MASS]; };
+NominalLogisticBiplot = derive { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; };
 NonpModelCheck = derive { name="NonpModelCheck"; version="1.0"; sha256="0mgbyp651jfqyfavpv12i9kwqf0cpk2mzh9m0b5k4n759710qv8f"; depends=[dr MASS]; };
 NormPsy = derive { name="NormPsy"; version="1.0.3"; sha256="0lp6b7hh36ipmsv395xk671f7sczlfz5f9x0h88b2q6zvgbk081v"; depends=[lcmm]; };
-NormalGamma = derive { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[optimx histogram]; };
+NormalGamma = derive { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[histogram optimx]; };
 NormalLaplace = derive { name="NormalLaplace"; version="0.2-0"; sha256="11z568zhb7jw9ghp6wlyf26ijm25crc5pqhzw71qgvva42nsmmwn"; depends=[DistributionUtils GeneralizedHyperbolic]; };
 Nozzle_R1 = derive { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; };
-OAIHarvester = derive { name="OAIHarvester"; version="0.1-7"; sha256="0wcl71y8i4s4fxpb90xg71sj6819kgl3d4gff66dan8i6y8sxmyk"; depends=[XML RCurl]; };
+OAIHarvester = derive { name="OAIHarvester"; version="0.1-7"; sha256="0wcl71y8i4s4fxpb90xg71sj6819kgl3d4gff66dan8i6y8sxmyk"; depends=[RCurl XML]; };
 ODB = derive { name="ODB"; version="1.1.1"; sha256="1hha4rkbc2zh3karkqa0vn4v0nmcd7sljcymy1nh28bx1gx2ffgs"; depends=[DBI RJDBC]; };
-ODMconverter = derive { name="ODMconverter"; version="2.1"; sha256="03m15vck01s6jqcpm5fl7mipki4grgywlb9mksr0l8wygmn8zkxs"; depends=[XML xlsx]; };
-OIdata = derive { name="OIdata"; version="1.0"; sha256="078khxrszwnrww2h0ag153bf59fnyhirxy4m56ssgr2gmfahaymf"; depends=[RCurl maps RCurl maps]; };
-OIsurv = derive { name="OIsurv"; version="0.2"; sha256="148mpjj5navc1vrl72y87krn4lf3awnd32z3g4qqaia404w5w7p7"; depends=[survival KMsurv]; };
+ODMconverter = derive { name="ODMconverter"; version="2.1"; sha256="03m15vck01s6jqcpm5fl7mipki4grgywlb9mksr0l8wygmn8zkxs"; depends=[xlsx XML]; };
+OIdata = derive { name="OIdata"; version="1.0"; sha256="078khxrszwnrww2h0ag153bf59fnyhirxy4m56ssgr2gmfahaymf"; depends=[maps RCurl]; };
+OIsurv = derive { name="OIsurv"; version="0.2"; sha256="148mpjj5navc1vrl72y87krn4lf3awnd32z3g4qqaia404w5w7p7"; depends=[KMsurv survival]; };
 OLScurve = derive { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; };
-ONETr = derive { name="ONETr"; version="1.0.2"; sha256="1b0djffn4bx6drq5j87s15dwvnjmvraxs52y4dr6micvd9hifa9a"; depends=[XML RCurl]; };
+ONETr = derive { name="ONETr"; version="1.0.2"; sha256="1b0djffn4bx6drq5j87s15dwvnjmvraxs52y4dr6micvd9hifa9a"; depends=[RCurl XML]; };
 OOmisc = derive { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; };
-OPDOE = derive { name="OPDOE"; version="1.0-9"; sha256="0pf8rv5wydc8pl4x57g7bk2swjabaxdgijgsigjy5wihfcb48654"; depends=[gmp mvtnorm orthopolynom nlme crossdes polynom]; };
+OPDOE = derive { name="OPDOE"; version="1.0-9"; sha256="0pf8rv5wydc8pl4x57g7bk2swjabaxdgijgsigjy5wihfcb48654"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; };
 OPE = derive { name="OPE"; version="0.7"; sha256="0ld3pr94ii1pmfk99qfwgria6ki2iz2hwmn7pj3cjwprv8jkcjji"; depends=[]; };
 OPI = derive { name="OPI"; version="2.1"; sha256="1pzw5b4gwf1q98547cgq7b363fn72ll0zlvcahy56wc1ci5ny3dd"; depends=[]; };
 ORCI = derive { name="ORCI"; version="1.1"; sha256="0xy5lvz2scz06fphjyhqbdhp4bizmv87a8xykp9dbgx8b4ssnqgz"; depends=[BiasedUrn BlakerCI PropCIs]; };
@@ -1307,111 +1313,111 @@ ORCME = derive { name="ORCME"; version="2.0.1"; sha256="0wr4z19alyp2cvlpg4bs8sni
 ORDER2PARENT = derive { name="ORDER2PARENT"; version="1.0"; sha256="04c80vk6z227w6qsnfls89ig4vqyiiymdarhq1pxa0gpr8j2ssx5"; depends=[Matrix]; };
 ORIClust = derive { name="ORIClust"; version="1.0-1"; sha256="1biddddyls2zsg71w4innxl0ckfb80q2j9pmd56wvbc0qnbm0w3q"; depends=[]; };
 ORMDR = derive { name="ORMDR"; version="1.3-2"; sha256="0y7b2aja3zvsd6lm7jal9pabcfxv16r2wh0kyzjkdfanvvgk3wmm"; depends=[]; };
-OUwie = derive { name="OUwie"; version="1.45"; sha256="1g1315g015pcnd7g8k0vngjg7f842nq8ixhmqnj64by4vsafliva"; depends=[ape nloptr numDeriv corpcor lattice phytools phangorn]; };
+OUwie = derive { name="OUwie"; version="1.45"; sha256="1g1315g015pcnd7g8k0vngjg7f842nq8ixhmqnj64by4vsafliva"; depends=[ape corpcor lattice nloptr numDeriv phangorn phytools]; };
 Oarray = derive { name="Oarray"; version="1.4-5"; sha256="1w66vqxvqyrp2h6acnbg3xy7cp6j2dgvzmqqk564kvivbn40vyy4"; depends=[]; };
 OceanView = derive { name="OceanView"; version="1.0.3"; sha256="0k281r358xg599n3h4avwbhnhgcfdawf36p8k3sxwv29292npkzv"; depends=[plot3D plot3Drgl rgl shape]; };
 Ohmage = derive { name="Ohmage"; version="2.11-4"; sha256="14pga59ikiywyl6xnfd2d8sy323vyn88q9sf101bcwp0s0qczwzg"; depends=[RCurl RJSONIO]; };
 OjaNP = derive { name="OjaNP"; version="0.9-8"; sha256="010l75irgj7nl8yq6crp8d00zjgpv9wg2maw99cj0frhqxvqzbfz"; depends=[ICS ICSNP]; };
 OligoSpecificitySystem = derive { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; };
-OmicKriging = derive { name="OmicKriging"; version="1.3"; sha256="1fj131684faj75jdipmsvb8s684x72is6zz79hwb5wszklk00ind"; depends=[doParallel ROCR irlba]; };
+OmicKriging = derive { name="OmicKriging"; version="1.3"; sha256="1fj131684faj75jdipmsvb8s684x72is6zz79hwb5wszklk00ind"; depends=[doParallel irlba ROCR]; };
 Oncotree = derive { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; };
 OneTwoSamples = derive { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; };
-OpasnetUtils = derive { name="OpasnetUtils"; version="1.2.0"; sha256="1ckagq14w9923a4x7pk9mfzqcfayi00apwd2kvqzgd0s6355r1q7"; depends=[rjson RCurl reshape2 triangle httpRequest digest xtable ggplot2 rgdal sp plyr]; };
+OpasnetUtils = derive { name="OpasnetUtils"; version="1.2.0"; sha256="1ckagq14w9923a4x7pk9mfzqcfayi00apwd2kvqzgd0s6355r1q7"; depends=[digest ggplot2 httpRequest plyr RCurl reshape2 rgdal rjson sp triangle xtable]; };
 OpenCL = derive { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; };
 OpenMPController = derive { name="OpenMPController"; version="0.1-2"; sha256="1cpsbjmqql0fsjc1xv323pfkhfr9vrcv5g4j3p1qc5zn4z9pq7r6"; depends=[]; };
-OpenMx = derive { name="OpenMx"; version="2.2.4"; sha256="1w72ikysda45zbvwlr297fqqjl3law2r6m3c9n9j5d8r3clfhqyl"; depends=[digest MASS RcppEigen StanHeaders BH]; };
-OpenRepGrid = derive { name="OpenRepGrid"; version="0.1.9"; sha256="1s40c2yfd4a4khs0ghlbzii94x8cidg851bivanplg2s51j5jrhk"; depends=[pvclust colorspace plyr stringr abind rgl GPArotation psych XML]; };
-OpenStreetMap = derive { name="OpenStreetMap"; version="0.3.1"; sha256="009xiqsbgqb3lba6msyzq7ncripmvpymxynkga8pqc8npv8g7fzb"; depends=[rJava raster rgdal rJava]; };
+OpenMx = derive { name="OpenMx"; version="2.2.4"; sha256="1w72ikysda45zbvwlr297fqqjl3law2r6m3c9n9j5d8r3clfhqyl"; depends=[BH digest MASS RcppEigen StanHeaders]; };
+OpenRepGrid = derive { name="OpenRepGrid"; version="0.1.9"; sha256="1s40c2yfd4a4khs0ghlbzii94x8cidg851bivanplg2s51j5jrhk"; depends=[abind colorspace GPArotation plyr psych pvclust rgl stringr XML]; };
+OpenStreetMap = derive { name="OpenStreetMap"; version="0.3.1"; sha256="009xiqsbgqb3lba6msyzq7ncripmvpymxynkga8pqc8npv8g7fzb"; depends=[raster rgdal rJava]; };
 OptHedging = derive { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; };
-OptInterim = derive { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[mvtnorm clinfun]; };
+OptInterim = derive { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; };
 OptimalCutpoints = derive { name="OptimalCutpoints"; version="1.1-3"; sha256="1vrbx62080r9sgk9ipjvdrqvikp4gwidp5gi5j92hspk7cp10amg"; depends=[]; };
 OptionPricing = derive { name="OptionPricing"; version="0.1"; sha256="0j98h3fn29xfv7xyp7av459v56chw99pnvmsbqvrv4g77p60f5q2"; depends=[]; };
-OrdFacReg = derive { name="OrdFacReg"; version="1.0.5"; sha256="1if6ghagj2196pc73ankfrcms0snlpibgfca1c6lhj96m1waahg2"; depends=[survival eha MASS]; };
+OrdFacReg = derive { name="OrdFacReg"; version="1.0.5"; sha256="1if6ghagj2196pc73ankfrcms0snlpibgfca1c6lhj96m1waahg2"; depends=[eha MASS survival]; };
 OrdLogReg = derive { name="OrdLogReg"; version="1.1"; sha256="18s75pmz1g3yac2rfl41kj8sfflq298qkijnvqlybgxpq98ickxx"; depends=[LogicReg]; };
 OrdMonReg = derive { name="OrdMonReg"; version="1.0.3"; sha256="1xca8pvvq79j484l2rmn4nva8ncx8z51g5diljikck231y8qjqaz"; depends=[]; };
-OrdNor = derive { name="OrdNor"; version="1.0"; sha256="1n6c0d4r1w3n016lzk2i5yyvawk9pgmsbzymbbyq7gx8a80iv32h"; depends=[mvtnorm corpcor Matrix GenOrd]; };
-OrdinalLogisticBiplot = derive { name="OrdinalLogisticBiplot"; version="0.4"; sha256="1axn03yrw30r2j9ss5ig9sq857y37vhrr4a7px68jc2az8mng41j"; depends=[mirt MASS NominalLogisticBiplot]; };
+OrdNor = derive { name="OrdNor"; version="1.0"; sha256="1n6c0d4r1w3n016lzk2i5yyvawk9pgmsbzymbbyq7gx8a80iv32h"; depends=[corpcor GenOrd Matrix mvtnorm]; };
+OrdinalLogisticBiplot = derive { name="OrdinalLogisticBiplot"; version="0.4"; sha256="1axn03yrw30r2j9ss5ig9sq857y37vhrr4a7px68jc2az8mng41j"; depends=[MASS mirt NominalLogisticBiplot]; };
 OrgMassSpecR = derive { name="OrgMassSpecR"; version="0.4-4"; sha256="046lr0piiy5w5lxjvyw7iqqclkghmc6zqymfypkw374gk73yrm76"; depends=[]; };
-OutbreakTools = derive { name="OutbreakTools"; version="0.1-13"; sha256="0wwb43n0vv3ihpyr1g48nf81ml7vigvlsq316nzav528i1f7jh22"; depends=[ggplot2 network knitr RColorBrewer ape reshape2 sna plyr ggmap scales rjson networkDynamic RCurl]; };
-OutlierDC = derive { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[survival quantreg Formula]; };
-OutlierDM = derive { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[quantreg MatrixModels outliers pcaPP]; };
+OutbreakTools = derive { name="OutbreakTools"; version="0.1-13"; sha256="0wwb43n0vv3ihpyr1g48nf81ml7vigvlsq316nzav528i1f7jh22"; depends=[ape ggmap ggplot2 knitr network networkDynamic plyr RColorBrewer RCurl reshape2 rjson scales sna]; };
+OutlierDC = derive { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[Formula quantreg survival]; };
+OutlierDM = derive { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[MatrixModels outliers pcaPP quantreg]; };
 OutrankingTools = derive { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; };
 P2C2M = derive { name="P2C2M"; version="0.7.6"; sha256="07ycl22v03b2xdaw4v0l6layqhab431ma38qywzm96hkl3ywvl49"; depends=[ape ggplot2 rPython stringr]; };
-PAFit = derive { name="PAFit"; version="0.7.2"; sha256="047ajzb9xnhxqa9v5dggznix9rd9z66g0mzanzwqb8ds5f8gm8ls"; depends=[Rcpp Rcpp]; };
+PAFit = derive { name="PAFit"; version="0.7.2"; sha256="047ajzb9xnhxqa9v5dggznix9rd9z66g0mzanzwqb8ds5f8gm8ls"; depends=[Rcpp]; };
 PAGI = derive { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; };
-PAGWAS = derive { name="PAGWAS"; version="1.0"; sha256="1zwq4b0bgsskzvlapffh30ys9y4wlcfwpjqw8m2i9zabib5knx9i"; depends=[lars doMC mnormt]; };
+PAGWAS = derive { name="PAGWAS"; version="1.0"; sha256="1zwq4b0bgsskzvlapffh30ys9y4wlcfwpjqw8m2i9zabib5knx9i"; depends=[doMC lars mnormt]; };
 PANDA = derive { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster]; };
 PANICr = derive { name="PANICr"; version="0.0.0.5"; sha256="049ga5iiymqczvy51y52yk7yvv9xy0ibr64ly8ciqig84d5f4jjr"; depends=[MCMCpack]; };
 PAS = derive { name="PAS"; version="1.2"; sha256="0q5g9j8xb9fl7r8f1w5gk5h83ll5w1r6m2gq9ilw8w8s96pm4xd8"; depends=[glmnet]; };
-PASWR = derive { name="PASWR"; version="1.1"; sha256="1rxymnqvflypc6m62f5vw65l8x1m2yah7r11hhpmzdq2l2sg8fci"; depends=[e1071 MASS lattice]; };
-PASWR2 = derive { name="PASWR2"; version="1.0"; sha256="1bxczrfxj7nlx4r0b23a7sisinb4d5nd3pj68vigbgrhqyggk87x"; depends=[ggplot2 lattice e1071]; };
-PAWL = derive { name="PAWL"; version="0.5"; sha256="1sx4g4qycba2j1fm0bvhz3hk6ghhdc37rz5zi1njqxrpmbnkqg04"; depends=[mvtnorm foreach reshape ggplot2]; };
-PBC = derive { name="PBC"; version="1.2"; sha256="1z08y5sn6i439811c9mq3bs78zqlzzkz0srmv4wld68bywhmwqj4"; depends=[igraph Rcpp copula Rcpp]; };
-PBD = derive { name="PBD"; version="1.0"; sha256="1q8ijjmcwxi8f3wgggpj4y522wmxady7f60frhlvvixhzfn2iml1"; depends=[deSolve ade4 ape DDD]; };
-PBImisc = derive { name="PBImisc"; version="0.999"; sha256="0igwl78wj8w6jzmk5m8y9rf4j72qrcjyhb83kz44is72ddzsyss6"; depends=[MASS lme4 Matrix]; };
+PASWR = derive { name="PASWR"; version="1.1"; sha256="1rxymnqvflypc6m62f5vw65l8x1m2yah7r11hhpmzdq2l2sg8fci"; depends=[e1071 lattice MASS]; };
+PASWR2 = derive { name="PASWR2"; version="1.0"; sha256="1bxczrfxj7nlx4r0b23a7sisinb4d5nd3pj68vigbgrhqyggk87x"; depends=[e1071 ggplot2 lattice]; };
+PAWL = derive { name="PAWL"; version="0.5"; sha256="1sx4g4qycba2j1fm0bvhz3hk6ghhdc37rz5zi1njqxrpmbnkqg04"; depends=[foreach ggplot2 mvtnorm reshape]; };
+PBC = derive { name="PBC"; version="1.2"; sha256="1z08y5sn6i439811c9mq3bs78zqlzzkz0srmv4wld68bywhmwqj4"; depends=[copula igraph Rcpp]; };
+PBD = derive { name="PBD"; version="1.0"; sha256="1q8ijjmcwxi8f3wgggpj4y522wmxady7f60frhlvvixhzfn2iml1"; depends=[ade4 ape DDD deSolve]; };
+PBImisc = derive { name="PBImisc"; version="0.999"; sha256="0igwl78wj8w6jzmk5m8y9rf4j72qrcjyhb83kz44is72ddzsyss6"; depends=[lme4 MASS Matrix]; };
 PBSadmb = derive { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5d75yyy3ph0mff85n8qsnr59fla5b5cm4qlj"; depends=[PBSmodelling]; };
 PBSddesolve = derive { name="PBSddesolve"; version="1.11.29"; sha256="13vprr66hh5d19xambpyw7k7fvqxb8mj5s9ba19ls7xgypw22cmm"; depends=[]; };
 PBSmapping = derive { name="PBSmapping"; version="2.69.76"; sha256="1fci7mx5m3jqy92nqfaw5w5yd5rw6f0bk5kya1v0mmvf7j715kar"; depends=[]; };
 PBSmodelling = derive { name="PBSmodelling"; version="2.67.266"; sha256="0ych9k20x0m71gkdrpwv5jnx6pfsk45wwsaaamy32cmnhd3y14sq"; depends=[XML]; };
 PCAmixdata = derive { name="PCAmixdata"; version="2.2"; sha256="0gbmiy2mhz8lgp0pcjby4ny8a28wlx1xrsa2lknzxn4d0m2csxjn"; depends=[]; };
-PCDSpline = derive { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[nleqslv matrixcalc]; };
-PCGSE = derive { name="PCGSE"; version="0.2"; sha256="19bpnn1b8ihmf52zh9g9pc38130np1ki8l7wf0j5myw2cnw6fna8"; depends=[RMTstat MASS]; };
+PCDSpline = derive { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[matrixcalc nleqslv]; };
+PCGSE = derive { name="PCGSE"; version="0.2"; sha256="19bpnn1b8ihmf52zh9g9pc38130np1ki8l7wf0j5myw2cnw6fna8"; depends=[MASS RMTstat safe]; };
 PCICt = derive { name="PCICt"; version="0.5-4"; sha256="1g17hxs00dlnb6p0av6l7j99qy00555f80nk1i1i1x87fszp3axa"; depends=[]; };
 PCIT = derive { name="PCIT"; version="1.5-3"; sha256="0gi28i2qd09pkaja4w7abcl7sz43jnk98897vc2905fnk9nks65j"; depends=[]; };
-PCPS = derive { name="PCPS"; version="1.0.2"; sha256="17gjj88zq123nxg4dh2w304sh9c1c4myad2g8x31wn1z7bmawv3y"; depends=[SYNCSA vegan ape picante phylobase plotrix]; };
-PCS = derive { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[statmod]; };
-PCovR = derive { name="PCovR"; version="2.6"; sha256="0b1bbf6namll2afxh61qz4xz4ipzipdnfhbcqlragmyj9pisaf45"; depends=[GPArotation ThreeWay MASS Matrix]; };
-PDQutils = derive { name="PDQutils"; version="0.1.1"; sha256="0klzh7ilgs02i0cvb5j6jd65dxyg2c3yk5rc82wcjn9ixhr8ks9b"; depends=[orthopolynom moments]; };
+PCPS = derive { name="PCPS"; version="1.0.2"; sha256="17gjj88zq123nxg4dh2w304sh9c1c4myad2g8x31wn1z7bmawv3y"; depends=[ape phylobase picante plotrix SYNCSA vegan]; };
+PCS = derive { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[multtest statmod]; };
+PCovR = derive { name="PCovR"; version="2.6"; sha256="0b1bbf6namll2afxh61qz4xz4ipzipdnfhbcqlragmyj9pisaf45"; depends=[GPArotation MASS Matrix ThreeWay]; };
+PDQutils = derive { name="PDQutils"; version="0.1.2"; sha256="1782nnw5mag4impfs05rnapjfrzvbiw1mdrvfrq1v0h9zl43afrd"; depends=[moments orthopolynom]; };
 PDSCE = derive { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; };
-PEIP = derive { name="PEIP"; version="2.0-1"; sha256="0zfvp3ngc4320sh6r6y746zxigr2wqgaqasnlkv3hxhzpzxq08lj"; depends=[bvls Matrix RSEIS pracma]; };
+PEIP = derive { name="PEIP"; version="2.0-1"; sha256="0zfvp3ngc4320sh6r6y746zxigr2wqgaqasnlkv3hxhzpzxq08lj"; depends=[bvls Matrix pracma RSEIS]; };
 PEMM = derive { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; };
 PERregress = derive { name="PERregress"; version="1.0-8"; sha256="1rhridhfgvrz14h61psfyr5ll13fvxj4b9fwrnlnc6lyqi01wjlc"; depends=[]; };
 PET = derive { name="PET"; version="0.4.9"; sha256="1ijg6mfh3xrc1gjh6a4nq64psk9yh16yc8nfp7c9837xbjigqq7f"; depends=[adimpro]; };
-PF = derive { name="PF"; version="9.5"; sha256="1y99brdabj78s5kxyv0136s40kaaj3zya9lk4qd0kqk83z2gdawp"; depends=[xtable RColorBrewer gdata]; };
+PF = derive { name="PF"; version="9.5"; sha256="1y99brdabj78s5kxyv0136s40kaaj3zya9lk4qd0kqk83z2gdawp"; depends=[gdata RColorBrewer xtable]; };
 PGICA = derive { name="PGICA"; version="1.0"; sha256="0qxa5hw2s3mndjvk8lb82pcbyj1kbdclx4j4xa8jq0lcj180abi9"; depends=[fastICA]; };
 PGM2 = derive { name="PGM2"; version="1.0"; sha256="18azh6k271p9dvc23q402pv7wrilr1yk02vqqy6qjppnvq6jxahg"; depends=[]; };
 PGRdup = derive { name="PGRdup"; version="0.2"; sha256="12vxdw4093xmmpcl6ars7h03f1a21gjl5p29r5d19hp68h4hchi1"; depends=[data_table igraph stringdist stringi]; };
 PHENIX = derive { name="PHENIX"; version="1.2"; sha256="0fnrx2xf6q9ng9pwfxbbbzvcf6kqj12byd81x0q0vfl85h1xddws"; depends=[ppcor SuppDists]; };
 PHYLOGR = derive { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; };
 PHeval = derive { name="PHeval"; version="0.5.2"; sha256="1q0cyq7b8d42jgiw7ra9vjdjw1zcxpyg6wgb3zgygkmd744ifggp"; depends=[survival]; };
-PIGE = derive { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[snowfall ARTP xtable survival]; };
+PIGE = derive { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[ARTP snowfall survival xtable]; };
 PIGShift = derive { name="PIGShift"; version="1.0.0"; sha256="15cgpi7j5cs4aqdq5cy7535x8ar916d9hd109kc01njrwxp1xr96"; depends=[ape mvtnorm]; };
 PIPS = derive { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; };
 PK = derive { name="PK"; version="1.3-2"; sha256="0162ri9wlm9inryljal48av8yxb326na94kckkigsrklfxb3wkp2"; depends=[]; };
 PKI = derive { name="PKI"; version="0.1-1"; sha256="1m4q43yq8ddig15k0j9yg9hq4yz3yplqp68zl3p9g2shkam60p6w"; depends=[base64enc]; };
 PKPDmodels = derive { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; };
-PKfit = derive { name="PKfit"; version="1.2.5"; sha256="0kym2dwb4f53xmf8dq94jz0zmpaiv8pl956j1bs3h9nhhzlaj83y"; depends=[deSolve optimx minpack_lm]; };
-PKgraph = derive { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[RGtk2 gWidgetsRGtk2 cairoDevice lattice rggobi ggplot2 proto RGtk2 gWidgetsRGtk2]; };
-PKreport = derive { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[lattice ggplot2]; };
+PKfit = derive { name="PKfit"; version="1.2.5"; sha256="0kym2dwb4f53xmf8dq94jz0zmpaiv8pl956j1bs3h9nhhzlaj83y"; depends=[deSolve minpack_lm optimx]; };
+PKgraph = derive { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; };
+PKreport = derive { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; };
 PLIS = derive { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; depends=[]; };
 PLRModels = derive { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; };
 PLSbiplot1 = derive { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; };
 PLordprob = derive { name="PLordprob"; version="1.0"; sha256="156lvz6vfm68hm32l5nlhq15hfacdla627d6lf8l4g34lwzdh8k8"; depends=[mnormt]; };
-PMA = derive { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3mfn89157nfwnrassl7qr42xkq"; depends=[plyr]; };
+PMA = derive { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3mfn89157nfwnrassl7qr42xkq"; depends=[impute plyr]; };
 PMCMR = derive { name="PMCMR"; version="1.1"; sha256="0f3882rjyxlcr183qa9y22bxh8nqp307v065aiy61ii0kizj9f70"; depends=[]; };
-PP = derive { name="PP"; version="0.5.3"; sha256="17y1v2536n7ap0kvllwkmndmdjf4wgwl171c053ph45krv37mscf"; depends=[Rcpp Rcpp]; };
+PP = derive { name="PP"; version="0.5.3"; sha256="17y1v2536n7ap0kvllwkmndmdjf4wgwl171c053ph45krv37mscf"; depends=[Rcpp]; };
 PPtree = derive { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
-PPtreeViz = derive { name="PPtreeViz"; version="1.0.3"; sha256="0m0nw6kh8ybgdih2d10b8q8q0wknrbppad8nq8jmq85sm0xrrysj"; depends=[gridExtra ggplot2 Rcpp reshape2 Rcpp RcppArmadillo]; };
-PRISMA = derive { name="PRISMA"; version="0.2-5"; sha256="06z4z1rbsk5a8kpbs6ymm0m02i8dwbmv783c3l2pn4q3pf6ncmd5"; depends=[Matrix gplots ggplot2]; };
-PROFANCY = derive { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[Matrix lattice igraph]; };
+PPtreeViz = derive { name="PPtreeViz"; version="1.0.3"; sha256="0m0nw6kh8ybgdih2d10b8q8q0wknrbppad8nq8jmq85sm0xrrysj"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo reshape2]; };
+PRISMA = derive { name="PRISMA"; version="0.2-5"; sha256="06z4z1rbsk5a8kpbs6ymm0m02i8dwbmv783c3l2pn4q3pf6ncmd5"; depends=[ggplot2 gplots Matrix]; };
+PROFANCY = derive { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[igraph lattice Matrix]; };
 PROTOLIDAR = derive { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; };
 PRROC = derive { name="PRROC"; version="1.1"; sha256="1v35z9inzb6x42fil8z7kfcrnfif93cj8974mfbqhhx0f9vi476a"; depends=[]; };
-PReMiuM = derive { name="PReMiuM"; version="3.1.0"; sha256="0k8fffsbbdknmv1vshb72mdh7qfdqkrrh41s0ld64ziwnmp3gz23"; depends=[Rcpp ggplot2 cluster plotrix gamlss_dist Rcpp RcppEigen BH]; };
-PResiduals = derive { name="PResiduals"; version="0.2-1"; sha256="0my5slprmswazsxgjvpw8hjr41aqxm6j1s2dga65fvpfv5qimsw6"; depends=[MASS Formula rms sandwich actuar]; };
-PSAboot = derive { name="PSAboot"; version="1.1"; sha256="176sbjr906xk2ycl8653k7nch2h7ryxfisdy178k51f55qpvv4h9"; depends=[ggplot2 PSAgraphics Matching MatchIt modeltools party psych reshape2 rpart TriMatch]; };
+PReMiuM = derive { name="PReMiuM"; version="3.1.1"; sha256="10xrgqq6vii5xcxcf6jqbhzmkiy88ssxjvn2pnfx5a9xj037ymqb"; depends=[BH cluster gamlss_dist ggplot2 plotrix Rcpp RcppEigen]; };
+PResiduals = derive { name="PResiduals"; version="0.2-1"; sha256="0my5slprmswazsxgjvpw8hjr41aqxm6j1s2dga65fvpfv5qimsw6"; depends=[actuar Formula MASS rms sandwich]; };
+PSAboot = derive { name="PSAboot"; version="1.1"; sha256="176sbjr906xk2ycl8653k7nch2h7ryxfisdy178k51f55qpvv4h9"; depends=[ggplot2 Matching MatchIt modeltools party PSAgraphics psych reshape2 rpart TriMatch]; };
 PSAgraphics = derive { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; };
-PSCBS = derive { name="PSCBS"; version="0.44.0"; sha256="1bpvqn2p8pw57dpwk1mr51rsiqirk5sywrycqwbazvjr7hkiqa3d"; depends=[R_methodsS3 R_oo R_utils R_cache matrixStats]; };
-PSM = derive { name="PSM"; version="0.8-10"; sha256="1s60fr85xn3ynpvsbc3nw7vgz6h6jxy3yii1w6jpkw3iwl4bgn84"; depends=[MASS numDeriv deSolve ucminf]; };
-PST = derive { name="PST"; version="0.86"; sha256="0m6v7j36v47zdqqd3lf05w6pk0f3wfs1kix1qfvy2gj8n41jjmxf"; depends=[TraMineR RColorBrewer]; };
+PSCBS = derive { name="PSCBS"; version="0.44.0"; sha256="1bpvqn2p8pw57dpwk1mr51rsiqirk5sywrycqwbazvjr7hkiqa3d"; depends=[DNAcopy matrixStats R_cache R_methodsS3 R_oo R_utils]; };
+PSM = derive { name="PSM"; version="0.8-10"; sha256="1s60fr85xn3ynpvsbc3nw7vgz6h6jxy3yii1w6jpkw3iwl4bgn84"; depends=[deSolve MASS numDeriv ucminf]; };
+PST = derive { name="PST"; version="0.86"; sha256="0m6v7j36v47zdqqd3lf05w6pk0f3wfs1kix1qfvy2gj8n41jjmxf"; depends=[RColorBrewer TraMineR]; };
 PTAk = derive { name="PTAk"; version="1.2-9"; sha256="1wbjak8dp53601z39kkpa4ysm264x32371rbgbzmyzx89ap2c0cq"; depends=[tensor]; };
 PTE = derive { name="PTE"; version="1.0"; sha256="10if2hh69yysi2y82m7is74hmzw2xpxijgb8bhy1d4g9n9lqidfs"; depends=[doParallel]; };
-PVAClone = derive { name="PVAClone"; version="0.1-2"; sha256="0afl2il5wdcwzpyhjkgq8iz16q1086c3ndr4cjlyspgbss9h5l24"; depends=[dcmle dclone]; };
+PVAClone = derive { name="PVAClone"; version="0.1-2"; sha256="0afl2il5wdcwzpyhjkgq8iz16q1086c3ndr4cjlyspgbss9h5l24"; depends=[dclone dcmle]; };
 PVR = derive { name="PVR"; version="0.2.1"; sha256="1p87pj9g0qlc8ja6xdj2amny9pbkaqb34x2y9nkl1nj1pkwjq2s5"; depends=[ape splancs]; };
 Pade = derive { name="Pade"; version="0.1-2"; sha256="144wzwh5wy9hmxd4ng6k601ppvdbqn6hrx210kj266dlapwyg8l2"; depends=[]; };
-PairViz = derive { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[TSP gtools]; };
-PairedData = derive { name="PairedData"; version="1.0.1"; sha256="025h5wjsh9c78bg6gmg6p6kvv2s6d5x7fzn3mp42mlybq0ry78p0"; depends=[MASS gld mvtnorm lattice ggplot2]; };
+PairViz = derive { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[graph gtools TSP]; };
+PairedData = derive { name="PairedData"; version="1.0.1"; sha256="025h5wjsh9c78bg6gmg6p6kvv2s6d5x7fzn3mp42mlybq0ry78p0"; depends=[ggplot2 gld lattice MASS mvtnorm]; };
 Paneldata = derive { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; };
-ParDNAcopy = derive { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[]; };
+ParDNAcopy = derive { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; };
 ParallelForest = derive { name="ParallelForest"; version="1.1.0"; sha256="1xa9lfgrvzv7bvv1aaabcfk4372p8x5gxgj463h5ggf9x177lj5j"; depends=[]; };
 ParamHelpers = derive { name="ParamHelpers"; version="1.5"; sha256="1ywsc96gc252i6girr2ph674wfrzjfk96l2w8512rqy9bgimr0lr"; depends=[BBmisc checkmate]; };
 ParentOffspring = derive { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; };
@@ -1420,15 +1426,15 @@ PatternClass = derive { name="PatternClass"; version="1.5"; sha256="1paw39xm2rqj
 Peaks = derive { name="Peaks"; version="0.2"; sha256="0a173p5cdm1jnm7bwsvjpxh4dccy593g02c4qjwky1cgzy5rvin2"; depends=[]; };
 PearsonDS = derive { name="PearsonDS"; version="0.97"; sha256="0bsdj4zir12zkv8yhq1z6dqjzhkb9l0f88jrr4iyclns1pcqvrvi"; depends=[]; };
 PearsonICA = derive { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; };
-PedCNV = derive { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[Rcpp RcppArmadillo ggplot2 Rcpp RcppArmadillo]; };
-PepPrep = derive { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[stringr]; };
+PedCNV = derive { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[ggplot2 Rcpp RcppArmadillo]; };
+PepPrep = derive { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[biomaRt stringr]; };
 Peptides = derive { name="Peptides"; version="1.1.0"; sha256="0nfldckrb9cvxnzqkhqr06d8a5nna5b900439x49r8njcwr4xpcg"; depends=[]; };
-PerFit = derive { name="PerFit"; version="1.3.1"; sha256="0zmhafr5fk3z66cp46gasgcxcza2q02821sg8zcs0vk5k80md9a7"; depends=[ltm mirt fda Hmisc irtoys MASS Matrix]; };
-PerMallows = derive { name="PerMallows"; version="1.8"; sha256="1p0rnphhjc0rr1zpbff71mk75lnyph994k4p5whwn2fyfzi1pn0f"; depends=[Rcpp Rcpp]; };
-PerfMeas = derive { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[]; };
+PerFit = derive { name="PerFit"; version="1.3.1"; sha256="0zmhafr5fk3z66cp46gasgcxcza2q02821sg8zcs0vk5k80md9a7"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; };
+PerMallows = derive { name="PerMallows"; version="1.8"; sha256="1p0rnphhjc0rr1zpbff71mk75lnyph994k4p5whwn2fyfzi1pn0f"; depends=[Rcpp]; };
+PerfMeas = derive { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[graph limma RBGL]; };
 PerformanceAnalytics = derive { name="PerformanceAnalytics"; version="1.4.3541"; sha256="1czchsccsbdfjw743j6rm101q2q01pggyl8zmlva213pwm86zb3v"; depends=[xts zoo]; };
 PermAlgo = derive { name="PermAlgo"; version="1.1"; sha256="16fhdgr4nza9yknsbwiv8pgljfwp8hhva0crs4dbfd0w4j97n5fp"; depends=[]; };
-PhViD = derive { name="PhViD"; version="1.0.6"; sha256="04vh3892fwb8pn2wmsw5449al80z5sm6avi6b67shky942dasl17"; depends=[MCMCpack]; };
+PhViD = derive { name="PhViD"; version="1.0.6"; sha256="04vh3892fwb8pn2wmsw5449al80z5sm6avi6b67shky942dasl17"; depends=[LBE MCMCpack]; };
 PharmPow = derive { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; };
 PhaseType = derive { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; };
 PhyActBedRest = derive { name="PhyActBedRest"; version="1.0"; sha256="0fpg17fwap12da7xka8pnd1wk6rbmw3zl099588g2r05wq3425sx"; depends=[]; };
@@ -1441,74 +1447,75 @@ PogromcyDanych = derive { name="PogromcyDanych"; version="1.5"; sha256="1m6sycca
 PoiClaClu = derive { name="PoiClaClu"; version="1.0.2"; sha256="1j593sc344h9iy7if1ppihx2qd73dv32d77d8ckac43i7b2lig24"; depends=[]; };
 PoisBinNonNor = derive { name="PoisBinNonNor"; version="1.0"; sha256="0a2v5iwrglg4r6zj5qbbg66638kcf45mxw2gs3qv2zpnfkabadnq"; depends=[BB corpcor Matrix mvtnorm]; };
 PoisBinOrd = derive { name="PoisBinOrd"; version="1.1"; sha256="151qqxd2rgh6jxzpclxxa51apiif77j122r2w23bdijkb85sqy9z"; depends=[corpcor GenOrd Matrix mvtnorm]; };
-PoisBinOrdNonNor = derive { name="PoisBinOrdNonNor"; version="1.0"; sha256="1x41mwvdria48cjr3dyq4d0l8v8kp3v9aayfl6jfxy6dhjwdg4vz"; depends=[Matrix corpcor MASS GenOrd BB]; };
-PoisBinOrdNor = derive { name="PoisBinOrdNor"; version="1.0"; sha256="0big81yvbz9qyw4h6h1ak2wzvn56g1d1809m7lnmd2kx780i2hsf"; depends=[Matrix corpcor mvtnorm psych GenOrd]; };
+PoisBinOrdNonNor = derive { name="PoisBinOrdNonNor"; version="1.0"; sha256="1x41mwvdria48cjr3dyq4d0l8v8kp3v9aayfl6jfxy6dhjwdg4vz"; depends=[BB corpcor GenOrd MASS Matrix]; };
+PoisBinOrdNor = derive { name="PoisBinOrdNor"; version="1.0"; sha256="0big81yvbz9qyw4h6h1ak2wzvn56g1d1809m7lnmd2kx780i2hsf"; depends=[corpcor GenOrd Matrix mvtnorm psych]; };
 PoisNonNor = derive { name="PoisNonNor"; version="1.0"; sha256="1i00knyv5m6p9rllkc440cg2agzs36am5b5w9n90506nq36xp8qm"; depends=[BB corpcor MASS Matrix]; };
-PoisNor = derive { name="PoisNor"; version="1.0"; sha256="147ma6qg6nwxzp022jm5mpijhg3jz489qclr9g2mli5mhgm31f8j"; depends=[mvtnorm corpcor Matrix]; };
+PoisNor = derive { name="PoisNor"; version="1.0"; sha256="147ma6qg6nwxzp022jm5mpijhg3jz489qclr9g2mli5mhgm31f8j"; depends=[corpcor Matrix mvtnorm]; };
 PoissonSeq = derive { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; };
 PolyPatEx = derive { name="PolyPatEx"; version="0.9"; sha256="1y3jsy095kfp9ycjnj467s1y5abba7jkm83x2cajp5g2jdgp7cf6"; depends=[gtools]; };
 PolynomF = derive { name="PolynomF"; version="0.94"; sha256="006ds50ivq91v2jyhgpm5rfaipxbzsnljrki6fjplcw07g0frz71"; depends=[]; };
 Pomic = derive { name="Pomic"; version="1.0.2"; sha256="1i3zsz7gc4n4vid3yi3srrv04qk1678wqyyw303pfibiyfd4m80q"; depends=[]; };
-PopED = derive { name="PopED"; version="0.2.0"; sha256="00qbwabzjb4ns9y9a4gg73zxpx02xcycbm19bdk9z1mv06fkg9dj"; depends=[ggplot2 MASS mvtnorm nlme dplyr codetools]; };
+PopED = derive { name="PopED"; version="0.2.0"; sha256="00qbwabzjb4ns9y9a4gg73zxpx02xcycbm19bdk9z1mv06fkg9dj"; depends=[codetools dplyr ggplot2 MASS mvtnorm nlme]; };
 PopGenKit = derive { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; };
-PopGenReport = derive { name="PopGenReport"; version="2.1"; sha256="040h7cvnh1xqlbsyg1lkfiz88421myr47r63v466bxidwb17bqg2"; depends=[knitr adegenet raster lattice RgoogleMaps gap calibrate xtable plyr dismo reshape ggplot2 R_utils ade4 pegas genetics rgdal gdistance vegan sp mmod GGally]; };
+PopGenReport = derive { name="PopGenReport"; version="2.1"; sha256="040h7cvnh1xqlbsyg1lkfiz88421myr47r63v466bxidwb17bqg2"; depends=[ade4 adegenet calibrate dismo gap gdistance genetics GGally ggplot2 knitr lattice mmod pegas plyr R_utils raster reshape rgdal RgoogleMaps sp vegan xtable]; };
 PopGenome = derive { name="PopGenome"; version="2.1.6"; sha256="1wk5k5f80l7k6haiaikhgaqn67q5n7gm632i3yz3frj1ph7bwjb7"; depends=[ff]; };
 PopVar = derive { name="PopVar"; version="1.1"; sha256="1125yynxdg13r84wzbm2h50yqhw1if0zrkaqlcjvmavymmx0vln2"; depends=[BGLR qtl rrBLUP]; };
 PortRisk = derive { name="PortRisk"; version="1.0"; sha256="0vyzvi56lmdlhxpbxcxcfqa8271jv2l45w7x1kzzwl6q0wm4bjln"; depends=[zoo]; };
-PortfolioAnalytics = derive { name="PortfolioAnalytics"; version="1.0.3636"; sha256="0xva3ff8lz05f1jvx8hgn8rpgr658fjhf3xyh9ga1r7dii13ld50"; depends=[zoo xts foreach PerformanceAnalytics]; };
+PortfolioAnalytics = derive { name="PortfolioAnalytics"; version="1.0.3636"; sha256="0xva3ff8lz05f1jvx8hgn8rpgr658fjhf3xyh9ga1r7dii13ld50"; depends=[foreach PerformanceAnalytics xts zoo]; };
 PottsUtils = derive { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; };
-PoweR = derive { name="PoweR"; version="1.0.4"; sha256="00y0dvrsbvz8mr8mdw7fk17s5dfgm0f641qg96039y6g3hk2rn77"; depends=[Rcpp Rcpp RcppArmadillo]; };
+PoweR = derive { name="PoweR"; version="1.0.4"; sha256="00y0dvrsbvz8mr8mdw7fk17s5dfgm0f641qg96039y6g3hk2rn77"; depends=[Rcpp RcppArmadillo]; };
 Power2Stage = derive { name="Power2Stage"; version="0.3-1"; sha256="0a5llzbhl6s71bh21ka2x50pjissl9gg7f5sskailzcmi60yz2zk"; depends=[PowerTOST]; };
 PowerTOST = derive { name="PowerTOST"; version="1.2-07"; sha256="0d8nbha0jwkz4phiddpfm32kf8hjrkck05y3w60f40110j9f8yy7"; depends=[mvtnorm]; };
 PracTools = derive { name="PracTools"; version="0.2"; sha256="1njnm0rk2z9p3p8wsj881mddqhpayh56gyyis4cwb5b6pc344s9p"; depends=[]; };
-PredictABEL = derive { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[Hmisc ROCR epitools PBSmodelling]; };
+PredictABEL = derive { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; };
 PredictiveRegression = derive { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; };
 PresenceAbsence = derive { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; };
-PrevMap = derive { name="PrevMap"; version="1.1.5"; sha256="0bzk09ygz4i3v8s39p0n157wrylp38h5xz32f18py8gr776x311n"; depends=[geoR maxLik raster pdist splancs]; };
+PrevMap = derive { name="PrevMap"; version="1.1.5"; sha256="0bzk09ygz4i3v8s39p0n157wrylp38h5xz32f18py8gr776x311n"; depends=[geoR maxLik pdist raster splancs]; };
 PrivateLR = derive { name="PrivateLR"; version="1.2-21"; sha256="1jwq8f0dnngj8sfbmcmxy34nkkq6yjw0mq3w1f8rasz67v3bwzp3"; depends=[]; };
 ProDenICA = derive { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; };
-ProbForecastGOP = derive { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[RandomFields fields]; };
+ProbForecastGOP = derive { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[fields RandomFields]; };
 ProfessR = derive { name="ProfessR"; version="2.3"; sha256="1y88as4xjvdm2v2ms5l7c6ziq7sll6qkrpgzdd4xnbcjx7c0g9w8"; depends=[RPMG]; };
-ProfileLikelihood = derive { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[nlme MASS]; };
-ProgGUIinR = derive { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 svMisc MASS]; };
+ProfileLikelihood = derive { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[MASS nlme]; };
+ProgGUIinR = derive { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 MASS svMisc]; };
 ProjectTemplate = derive { name="ProjectTemplate"; version="0.6"; sha256="0ijsy49gghnki5l63vg5l2awy57kbxbih618j5i5lxs44g15sa5v"; depends=[]; };
 PropCIs = derive { name="PropCIs"; version="0.2-5"; sha256="0wnc5h4390w4rglr7gjh6827f5r7gdhajx1iwp5fggdlm808hgq7"; depends=[]; };
-PropClust = derive { name="PropClust"; version="1.4-2"; sha256="13ac895i7ljayyqcjjmwvwar6wf1j0qssazcb5nlz8rw155qwavs"; depends=[flashClust dynamicTreeCut]; };
+PropClust = derive { name="PropClust"; version="1.4-2"; sha256="13ac895i7ljayyqcjjmwvwar6wf1j0qssazcb5nlz8rw155qwavs"; depends=[dynamicTreeCut flashClust]; };
 PropScrRand = derive { name="PropScrRand"; version="1.1"; sha256="0cj62dzg4zm8d1g8h7qmviiwm93cwplppbi0p674fmmf1wy84v9s"; depends=[]; };
-PsumtSim = derive { name="PsumtSim"; version="0.4"; sha256="0079kb1bgsxs4cwmn33rbbk2jgq39rdjfgz9k9hc64iyzz0i6na3"; depends=[EffectsRelBaseline boot]; };
+PsumtSim = derive { name="PsumtSim"; version="0.4"; sha256="0079kb1bgsxs4cwmn33rbbk2jgq39rdjfgz9k9hc64iyzz0i6na3"; depends=[boot EffectsRelBaseline]; };
 PtProcess = derive { name="PtProcess"; version="3.3-9"; sha256="1pgxi6085l6wwcn354rm8zkrm7nvjmyad6627fh5561y9ksws08k"; depends=[]; };
-PubBias = derive { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[rmeta R_utils]; };
-PubMedWordcloud = derive { name="PubMedWordcloud"; version="0.3.2"; sha256="1xn4ygpvj6pm548yj5kjh2l8n59p2caihfpbkykvbkzgf7hq8p00"; depends=[XML stringr RCurl wordcloud tm RColorBrewer]; };
+PubBias = derive { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[R_utils rmeta]; };
+PubMedWordcloud = derive { name="PubMedWordcloud"; version="0.3.2"; sha256="1xn4ygpvj6pm548yj5kjh2l8n59p2caihfpbkykvbkzgf7hq8p00"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; };
 PurBayes = derive { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; };
 PwrGSD = derive { name="PwrGSD"; version="2.000"; sha256="0qxvws9mfrnqw5s24qhqk6cbffjm13z7awyxdmnilazghpiq1p7s"; depends=[survival]; };
 QCA = derive { name="QCA"; version="1.1-4"; sha256="0wg2yfg61bmcxmkxvm9zjrnz4766f176y4gyqvfp5hsp9pp0h2lm"; depends=[lpSolve]; };
 QCA3 = derive { name="QCA3"; version="0.0-7"; sha256="0i9i2i633sjnzsywq51r2l7fkbd4ip217hp0vnkj78sfl7zf1270"; depends=[lpSolveAPI]; };
 QCAGUI = derive { name="QCAGUI"; version="1.9-6"; sha256="020ngni02j2w2ylhyidimm51d426pym2g1hg7gnpb7aplxx67n6x"; depends=[abind QCA]; };
 QCAfalsePositive = derive { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; };
-QCAtools = derive { name="QCAtools"; version="0.1"; sha256="1fcssxpyw0kfm6xgihkv4qxqmg628ahfr1bk36b9di9d29w6vgn9"; depends=[stringr QCA ggplot2 directlabels]; };
+QCAtools = derive { name="QCAtools"; version="0.1"; sha256="1fcssxpyw0kfm6xgihkv4qxqmg628ahfr1bk36b9di9d29w6vgn9"; depends=[directlabels ggplot2 QCA stringr]; };
 QCGWAS = derive { name="QCGWAS"; version="1.0-8"; sha256="1wn1kddgfmqv326pihnavbgsbd2yxrlq5s2xgi6kbprssxvj8bk1"; depends=[]; };
-QRM = derive { name="QRM"; version="0.4-10"; sha256="1fkxjqyb9yqki4qwk393ra66wg5dnbr5b5sgypm8wk973crbhcj0"; depends=[gsl Matrix mvtnorm numDeriv timeSeries Rcpp mgcv Rcpp]; };
+QRM = derive { name="QRM"; version="0.4-10"; sha256="1fkxjqyb9yqki4qwk393ra66wg5dnbr5b5sgypm8wk973crbhcj0"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeSeries]; };
 QSARdata = derive { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; };
 QTLRel = derive { name="QTLRel"; version="0.2-14"; sha256="05x56a8fjr6xk38dphdzh77y520cr6zykjp3qlx27drk9s5z06cs"; depends=[gdata]; };
 QUIC = derive { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; };
 QZ = derive { name="QZ"; version="0.1-4"; sha256="1k657i1rf6ayavn0lgfvlh8am3kzypgb1jhf2by147gv103izkrz"; depends=[]; };
 QoLR = derive { name="QoLR"; version="1.0"; sha256="1ah6x1fcs4l571jvgm0c257cgxhhpkzfhqimwbb9j7xbz3h55lp3"; depends=[survival zoo]; };
-QuACN = derive { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat igraph]; };
-QualInt = derive { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[survival ggplot2]; };
-Quandl = derive { name="Quandl"; version="2.6.0"; sha256="1mz39sj7dxfh9p5kdq7bxlifbg9izqz04l3ilnfchva7qq1ij01q"; depends=[xts httr zoo]; };
+QuACN = derive { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat graph igraph RBGL]; };
+QualInt = derive { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; };
+Quandl = derive { name="Quandl"; version="2.6.0"; sha256="1mz39sj7dxfh9p5kdq7bxlifbg9izqz04l3ilnfchva7qq1ij01q"; depends=[httr xts zoo]; };
 QuantPsyc = derive { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; };
 QuantifQuantile = derive { name="QuantifQuantile"; version="2.1"; sha256="1d3dcpri8d98mn2c0nfipp1pdr67a8h35p0y7bdil6il71h4qldm"; depends=[rgl]; };
-QuasiSeq = derive { name="QuasiSeq"; version="1.0-8"; sha256="113pxmvwwn331g5dcv2zwsvvi5jgc1v41f38sw9gms06i8x3a7q6"; depends=[mgcv pracma]; };
+QuantumClone = derive { name="QuantumClone"; version="0.6.15"; sha256="0fc63bns6vn4i0qi3vpp2ybm5hd4fl6n18biblph37qnwqxm2dvq"; depends=[doSNOW foreach fpc]; };
+QuasiSeq = derive { name="QuasiSeq"; version="1.0-8"; sha256="113pxmvwwn331g5dcv2zwsvvi5jgc1v41f38sw9gms06i8x3a7q6"; depends=[edgeR mgcv pracma]; };
 Quor = derive { name="Quor"; version="0.1"; sha256="1ncl4pj472m881fqndcm6jzn4jkwbnzpc639c9vy5mxa4z569i1g"; depends=[combinat]; };
 R_cache = derive { name="R.cache"; version="0.10.0"; sha256="0y8q3w9z9cyzsg60x95kkc81ksc2d5vpdaqg5njq5bgjyw7yjqvs"; depends=[R_methodsS3 R_oo R_utils]; };
-R_devices = derive { name="R.devices"; version="2.13.0"; sha256="1ys4sxns2y5cgqb18scclsv99jfkyy3l9mq0jcnh76c48gpzaisp"; depends=[R_methodsS3 R_oo R_utils base64enc]; };
-R_filesets = derive { name="R.filesets"; version="2.7.2"; sha256="0jlbpvj1ijjknjrb48x26c1ngkv7gl42fmk5g9sqaivm69d76nav"; depends=[R_oo R_methodsS3 R_utils R_cache digest]; };
+R_devices = derive { name="R.devices"; version="2.13.0"; sha256="1ys4sxns2y5cgqb18scclsv99jfkyy3l9mq0jcnh76c48gpzaisp"; depends=[base64enc R_methodsS3 R_oo R_utils]; };
+R_filesets = derive { name="R.filesets"; version="2.7.2"; sha256="0jlbpvj1ijjknjrb48x26c1ngkv7gl42fmk5g9sqaivm69d76nav"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; };
 R_huge = derive { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; };
 R_matlab = derive { name="R.matlab"; version="3.2.0"; sha256="1c87m6pv62ciqwpmsp8l7rkixcv04s9nkdn4yjbgyqvcslfaw26m"; depends=[R_methodsS3 R_oo R_utils]; };
 R_methodsS3 = derive { name="R.methodsS3"; version="1.7.0"; sha256="1dg4bbrwr8jcsqisjrrwxs942mrjq72zw8yvl2br4djdm0md8zz5"; depends=[]; };
 R_oo = derive { name="R.oo"; version="1.19.0"; sha256="15rm1qb9a212bqazhcpk7m48hcp7jq8rh4yhd9c6zfyvdqszfmsb"; depends=[R_methodsS3]; };
-R_rsp = derive { name="R.rsp"; version="0.20.0"; sha256="06vq9qq5hdz3hqc99q82622mab6ix7jwap20h4za6ap6gnwqs0fv"; depends=[R_methodsS3 R_oo R_utils R_cache]; };
-R_utils = derive { name="R.utils"; version="2.1.0"; sha256="03pi6pkcsq65fv7cn4x74cj050dc8x5d4xyg930p6f7flk788xaz"; depends=[R_oo R_methodsS3]; };
+R_rsp = derive { name="R.rsp"; version="0.20.0"; sha256="06vq9qq5hdz3hqc99q82622mab6ix7jwap20h4za6ap6gnwqs0fv"; depends=[R_cache R_methodsS3 R_oo R_utils]; };
+R_utils = derive { name="R.utils"; version="2.1.0"; sha256="03pi6pkcsq65fv7cn4x74cj050dc8x5d4xyg930p6f7flk788xaz"; depends=[R_methodsS3 R_oo]; };
 R0 = derive { name="R0"; version="1.2-6"; sha256="1yvcgchxlj7hkgqkw6g8pxnracxkld1grgykkcr6wbhminbylqv8"; depends=[MASS]; };
 R1magic = derive { name="R1magic"; version="0.3.2"; sha256="1xfldr5y7pfdi6qljjvckknsv2wi9rnzwmqxkpgnyc96md2fvwjr"; depends=[]; };
 R2BayesX = derive { name="R2BayesX"; version="1.0-0"; sha256="1p60n14gaqciskzah5haskflpms1g5lh4n57653yysa7fvmfgdhw"; depends=[BayesXsrc colorspace mgcv]; };
@@ -1516,81 +1523,81 @@ R2Cuba = derive { name="R2Cuba"; version="1.0-11"; sha256="1kgcxqn83yskh0dv6vyz6
 R2G2 = derive { name="R2G2"; version="1.0-2"; sha256="05d5vybvsi4pyr099916nk1l8sqszs9gaj2vhsx1jxxks8981na7"; depends=[]; };
 R2GUESS = derive { name="R2GUESS"; version="1.6"; sha256="1lh73zjch2jaspas065mkcsq13v6s323k4wdhvkydmvyhlgvlpcl"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; };
 R2HTML = derive { name="R2HTML"; version="2.3.1"; sha256="01mycvmz4xd1729kkb8nv5cl30v3qy3k4fmrlr2m1112hf5cmp59"; depends=[]; };
-R2MLwiN = derive { name="R2MLwiN"; version="0.8-1"; sha256="0gkp5jvvbf9rppxirs1s7vr5nbfkrlykaph3lv20xq8cc8nz9zzx"; depends=[lattice coda Matrix foreign rbugs digest]; };
-R2OpenBUGS = derive { name="R2OpenBUGS"; version="3.2-3.1"; sha256="1nnyfhpqgx6wd4n039c4d42png80b2xcwalyj08bmq0cgl32cjgk"; depends=[coda boot]; };
-R2STATS = derive { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[proto Matrix lattice lme4 cairoDevice gWidgets gWidgetsRGtk2 RGtk2Extras MASS latticeExtra statmod]; };
+R2MLwiN = derive { name="R2MLwiN"; version="0.8-1"; sha256="0gkp5jvvbf9rppxirs1s7vr5nbfkrlykaph3lv20xq8cc8nz9zzx"; depends=[coda digest foreign lattice Matrix rbugs]; };
+R2OpenBUGS = derive { name="R2OpenBUGS"; version="3.2-3.1"; sha256="1nnyfhpqgx6wd4n039c4d42png80b2xcwalyj08bmq0cgl32cjgk"; depends=[boot coda]; };
+R2STATS = derive { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[cairoDevice gWidgets gWidgetsRGtk2 lattice latticeExtra lme4 MASS Matrix proto RGtk2Extras statmod]; };
 R2SWF = derive { name="R2SWF"; version="0.9"; sha256="0c3lkmm8wgpix3fv7dxql6zpklwbcsv1y30r26yws12fnavw4y1k"; depends=[sysfonts]; };
-R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-20"; sha256="052frb3qlqfy6zl0qd2a9d4w2s7prfvdb0vn45rns68q03dma1ml"; depends=[coda boot]; };
+R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-20"; sha256="052frb3qlqfy6zl0qd2a9d4w2s7prfvdb0vn45rns68q03dma1ml"; depends=[boot coda]; };
 R2admb = derive { name="R2admb"; version="0.7.13"; sha256="0sjli498pz1vk5wmw65mca08mramwhzlfli2aih15xj7qzvp0nky"; depends=[coda lattice]; };
-R2jags = derive { name="R2jags"; version="0.5-6"; sha256="0zknl9qrypp96qz6rx7bkxg7bslvsnlhrgh749q4q566fz944n1g"; depends=[rjags abind coda R2WinBUGS]; };
-R330 = derive { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[s20x leaps rgl lattice]; };
+R2jags = derive { name="R2jags"; version="0.5-6"; sha256="0zknl9qrypp96qz6rx7bkxg7bslvsnlhrgh749q4q566fz944n1g"; depends=[abind coda R2WinBUGS rjags]; };
+R330 = derive { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[lattice leaps rgl s20x]; };
 R4CDISC = derive { name="R4CDISC"; version="0.3"; sha256="0443mzkhsbrvsl7vawfpabsdqbqr9yjyyhsw1y07yncy55ylc2v5"; depends=[XML]; };
 R4CouchDB = derive { name="R4CouchDB"; version="0.7.1"; sha256="08s999m1kfjzabng41d5fpkag7nrdbricnw7m4jvj1ssqfnil2hj"; depends=[bitops RCurl RJSONIO]; };
 R4dfp = derive { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; };
 R6 = derive { name="R6"; version="2.0.1"; sha256="0ngm3hl0q3aj067q6q0iqh729z8jx3ydvasj1jw9qrr7bzjh1jn5"; depends=[]; };
-RAD = derive { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[mvtnorm MASS]; };
-RADami = derive { name="RADami"; version="1.0-3"; sha256="0rg07dsh2rlldajcj0gq5sgsl1i3qa28bsrmq88xcljg5hnr4iqn"; depends=[ape geiger phangorn]; };
-RAM = derive { name="RAM"; version="1.2.1"; sha256="11ymhx0nk113cy068s52hjj38y8glv8nh24yljqqvr1fd9fmy64g"; depends=[vegan ggplot2 ape gridExtra RColorBrewer gplots plyr reshape2 scales labdsv ggmap permute VennDiagram data_table FD MASS RgoogleMaps lattice reshape ade4 phangorn phytools Hmisc]; };
+RAD = derive { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[MASS mvtnorm]; };
+RADami = derive { name="RADami"; version="1.0-3"; sha256="0rg07dsh2rlldajcj0gq5sgsl1i3qa28bsrmq88xcljg5hnr4iqn"; depends=[ape Biostrings geiger phangorn]; };
+RAM = derive { name="RAM"; version="1.2.1"; sha256="11ymhx0nk113cy068s52hjj38y8glv8nh24yljqqvr1fd9fmy64g"; depends=[ade4 ape data_table FD ggmap ggplot2 gplots gridExtra Hmisc labdsv lattice MASS permute phangorn phytools plyr RColorBrewer reshape reshape2 RgoogleMaps scales vegan VennDiagram]; };
 RAMP = derive { name="RAMP"; version="1.0"; sha256="18cz8gvb49j1hic71dzfcl17hz5gjdcabqvq84yr1h7iqkrq95cq"; depends=[]; };
-RAMpath = derive { name="RAMpath"; version="0.3.8"; sha256="1p1l6iirb314n5246kyyz0r3ja4v05xb5a6aq9k26wsb5m42x85k"; depends=[lavaan ellipse]; };
+RAMpath = derive { name="RAMpath"; version="0.3.8"; sha256="1p1l6iirb314n5246kyyz0r3ja4v05xb5a6aq9k26wsb5m42x85k"; depends=[ellipse lavaan]; };
 RANN = derive { name="RANN"; version="2.5"; sha256="007cgqg9bybg2zlljbv5m6cmlm3r6i251018rpgjcn0xnm9sjsj7"; depends=[]; };
 RANN_L1 = derive { name="RANN.L1"; version="2.5"; sha256="0sjf92hdw9jczvq1wl5syckhvik7wv0k9vrrgw4nnnsabc25v9pf"; depends=[]; };
 RAP = derive { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; };
-RAPIDR = derive { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[data_table PropCIs]; };
+RAPIDR = derive { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; };
 RAdwords = derive { name="RAdwords"; version="0.1.4"; sha256="0zqxvspza60sh65k0fr3c51qdxk8mzkrh8fm421lyd6054n6az21"; depends=[RCurl rjson]; };
 RApiSerialize = derive { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; };
 RAppArmor = derive { name="RAppArmor"; version="1.0.1"; sha256="06j7ghmzw2rrlk8nsarmpk1ab2gg88qs52zpw37rhqchpyzwwkfb"; depends=[]; };
 RArcInfo = derive { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; };
 RAtmosphere = derive { name="RAtmosphere"; version="1.1"; sha256="0mk43bq28hlrjwaycsxca458k8xf00q58czgc17d8yx3kz17a5i0"; depends=[]; };
-RBPcurve = derive { name="RBPcurve"; version="1.0-20"; sha256="1fk2zj16xj8n9jnydzd60crdfsigqd6xs2hq572b9r65ldiikv3z"; depends=[mlr BBmisc checkmate shape TeachingDemos]; };
+RBPcurve = derive { name="RBPcurve"; version="1.0-20"; sha256="1fk2zj16xj8n9jnydzd60crdfsigqd6xs2hq572b9r65ldiikv3z"; depends=[BBmisc checkmate mlr shape TeachingDemos]; };
 RCA = derive { name="RCA"; version="1.4.5"; sha256="0s200s28a6gh3dggad52dgqnf0k2jsfrqv1hbg8w2529v4s3dc5i"; depends=[igraph]; };
 RCALI = derive { name="RCALI"; version="0.2-15"; sha256="0w9807dyjghqy1rnv2c0k4kdjlwxzg5fk5r3rsqrmzjj4r8x9g9w"; depends=[splancs]; };
 RCEIM = derive { name="RCEIM"; version="0.2"; sha256="0l3lfx3zqxf310rhvjkn977xchxzi7cbzij3ks0nqlx55x5ica9w"; depends=[]; };
-RCMIP5 = derive { name="RCMIP5"; version="1.1"; sha256="1aqcwxh2p4z7wn4p224xdiaharbr51rj51aa760rirs5s1ra7f6q"; depends=[abind dplyr reshape2 digest]; };
-RCPmod = derive { name="RCPmod"; version="1.4"; sha256="1psn1w8ws0n96jqvd98l0wl0l46w0691c5vm9aarql2pqnc73lw9"; depends=[numDeriv gtools]; };
+RCMIP5 = derive { name="RCMIP5"; version="1.1"; sha256="1aqcwxh2p4z7wn4p224xdiaharbr51rj51aa760rirs5s1ra7f6q"; depends=[abind digest dplyr reshape2]; };
+RCPmod = derive { name="RCPmod"; version="1.4"; sha256="1psn1w8ws0n96jqvd98l0wl0l46w0691c5vm9aarql2pqnc73lw9"; depends=[gtools numDeriv]; };
 RCassandra = derive { name="RCassandra"; version="0.1-3"; sha256="0xa241s81cyw6lfjb522f2mlyrd0gav9yz3z5jab9hpdpgg9ri38"; depends=[]; };
 RCircos = derive { name="RCircos"; version="1.1.2"; sha256="0j7ww2djnhpra13vjr6y772sg64ikdmw1z68lpp9i7d0shlc3qx9"; depends=[]; };
 RClimMAWGEN = derive { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10mxlq0xmc6lbg6a030za9sygw1rpz8sk5j0lvb84"; depends=[climdex_pcic RMAWGEN]; };
 RColorBrewer = derive { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; };
 RConics = derive { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; };
-RCryptsy = derive { name="RCryptsy"; version="0.2"; sha256="1sm6l2jbaxia53dqivii5g7pqbczvjk53c2v2vz65qz1qnrmrybj"; depends=[RJSONIO RCurl]; };
+RCryptsy = derive { name="RCryptsy"; version="0.2"; sha256="1sm6l2jbaxia53dqivii5g7pqbczvjk53c2v2vz65qz1qnrmrybj"; depends=[RCurl RJSONIO]; };
 RCurl = derive { name="RCurl"; version="1.95-4.6"; sha256="145li081kqa07w3bzb5zaad6jkr3zr0hcpkjwar76ybrvc4jyi4s"; depends=[bitops]; };
 RDIDQ = derive { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
-RDML = derive { name="RDML"; version="0.8-4"; sha256="0zrzi81rlxz8hrpz19g7v470fh930n5y6brn6mjq52shn0ap742m"; depends=[R6 assertthat XML plyr dplyr]; };
-RDS = derive { name="RDS"; version="0.7-2"; sha256="143pb13wg0ms9zaiilb3ylqj6r6bcy4iqbq19j57z33i1q6ll51c"; depends=[gridExtra ggplot2 igraph reshape2 scales]; };
-RDSTK = derive { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr rjson RCurl]; };
+RDML = derive { name="RDML"; version="0.8-4"; sha256="0zrzi81rlxz8hrpz19g7v470fh930n5y6brn6mjq52shn0ap742m"; depends=[assertthat dplyr plyr R6 XML]; };
+RDS = derive { name="RDS"; version="0.7-2"; sha256="143pb13wg0ms9zaiilb3ylqj6r6bcy4iqbq19j57z33i1q6ll51c"; depends=[ggplot2 gridExtra igraph reshape2 scales]; };
+RDSTK = derive { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr RCurl rjson]; };
 RDataCanvas = derive { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; };
 RDieHarder = derive { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; };
 RDota = derive { name="RDota"; version="1.2"; sha256="1r56s4ii37szmdwgbnlw2g9576kjvyc79nvnfrsgr5mys62pbrzs"; depends=[XML]; };
-REBayes = derive { name="REBayes"; version="0.50"; sha256="0p4kv709r0577xq3mdw2vwla1gsjm8b9mnbsbfwm8fx3n3wfrx0p"; depends=[Rmosek Matrix SparseM]; };
+REBayes = derive { name="REBayes"; version="0.50"; sha256="0p4kv709r0577xq3mdw2vwla1gsjm8b9mnbsbfwm8fx3n3wfrx0p"; depends=[Matrix Rmosek SparseM]; };
 RECA = derive { name="RECA"; version="1.1"; sha256="1wgcd53yy4xsi7i674n4255qvvv6988r43q7n7pjqrimp04g1qd0"; depends=[]; };
 REDCapR = derive { name="REDCapR"; version="0.7-1"; sha256="1r5vvl52z5gpqhq949fzwmsqvwpr74phcapkckczyznlfql4qdh1"; depends=[httr plyr stringr]; };
 REEMtree = derive { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; };
-REPPlab = derive { name="REPPlab"; version="0.9.1"; sha256="1yrw03p7rk5dbr23z343kxn7vbac8khcz4c718wq9w6sykhgv8d0"; depends=[rJava lattice]; };
+REPPlab = derive { name="REPPlab"; version="0.9.1"; sha256="1yrw03p7rk5dbr23z343kxn7vbac8khcz4c718wq9w6sykhgv8d0"; depends=[lattice rJava]; };
 REQS = derive { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; };
 RESS = derive { name="RESS"; version="1.1"; sha256="1g4g15m29cb6c60ah86si6ibi8sb2j7spqml6lmcflk4rrnyi4pc"; depends=[]; };
 REST = derive { name="REST"; version="1.0.1"; sha256="16v89z7p9qkg7bsypf9vkrnbmb2n7gw3fqnfzbyxwj496wzxdv1x"; depends=[Rcmdr]; };
 REdaS = derive { name="REdaS"; version="0.9.2"; sha256="0w1b2996b0sdpxklkxylnk18dx8vgssn5avh7pnrvdqa464ci4f8"; depends=[]; };
 RFGLS = derive { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; };
 RFLPtools = derive { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; };
-RFOC = derive { name="RFOC"; version="3.3-3"; sha256="101d7nf4zjni5kdk54w3afdaqnjzl7y90zygybkqpd0vi82q602b"; depends=[RPMG GEOmap RSEIS MASS splancs]; };
-RFgroove = derive { name="RFgroove"; version="1.0"; sha256="13cf2grp87j7mm0lqf8f65d1pzypjp3b7g09f35x6dfirvc7lkdy"; depends=[randomForest wmtsa fda]; };
+RFOC = derive { name="RFOC"; version="3.3-3"; sha256="101d7nf4zjni5kdk54w3afdaqnjzl7y90zygybkqpd0vi82q602b"; depends=[GEOmap MASS RPMG RSEIS splancs]; };
+RFgroove = derive { name="RFgroove"; version="1.0"; sha256="13cf2grp87j7mm0lqf8f65d1pzypjp3b7g09f35x6dfirvc7lkdy"; depends=[fda randomForest wmtsa]; };
 RFinanceYJ = derive { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0zckjkspsajzh8m10cf75ixjlgd0nj8rm41fngm3"; depends=[XML xts]; };
-RFmarkerDetector = derive { name="RFmarkerDetector"; version="1.0"; sha256="0p8dnqwhsjh1gwxvqpicdbsjs9gczqi5j4av786l9g18f5djsv6m"; depends=[AUCRF randomForest ggplot2 UsingR WilcoxCV ROCR]; };
-RForcecom = derive { name="RForcecom"; version="0.7"; sha256="0rjav2rwanzqgi1yasbm9lj18f0mfxwd8w8x41skf656gfcpi0i4"; depends=[XML RCurl plyr]; };
+RFmarkerDetector = derive { name="RFmarkerDetector"; version="1.0"; sha256="0p8dnqwhsjh1gwxvqpicdbsjs9gczqi5j4av786l9g18f5djsv6m"; depends=[AUCRF ggplot2 randomForest ROCR UsingR WilcoxCV]; };
+RForcecom = derive { name="RForcecom"; version="0.7"; sha256="0rjav2rwanzqgi1yasbm9lj18f0mfxwd8w8x41skf656gfcpi0i4"; depends=[plyr RCurl XML]; };
 RFreak = derive { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; };
-RGA = derive { name="RGA"; version="0.2.1"; sha256="14fyd65n75m4xjdp019xdp3sa6h6j3ip6yr42b4nn1cxgkjplbnm"; depends=[httr httpuv RCurl jsonlite shiny]; };
+RGA = derive { name="RGA"; version="0.2.2"; sha256="1n3czw1yl13ws23yv2rhpq9l7wm0lvgm0jidh6j0mb833322jljx"; depends=[curl httpuv httr jsonlite shiny]; };
 RGCCA = derive { name="RGCCA"; version="2.0"; sha256="0mcp51z5jkn7yxmspp5cvmmvq0cwh7hj66g7wjmxsi74dwxcinvg"; depends=[MASS]; };
 RGENERATE = derive { name="RGENERATE"; version="1.3"; sha256="16gkdwbigdsdvnplqhzs11kk4dhb2rlnf7vj6kbzxw9fb1b7818q"; depends=[RMAWGEN]; };
-RGENERATEPREC = derive { name="RGENERATEPREC"; version="1.0"; sha256="1f6y3i8r6a9cajbj127s0cd13ihbi8scgrsgizza1fjb7fg2g450"; depends=[copula RGENERATE blockmatrix Matrix stringr RMAWGEN]; };
+RGENERATEPREC = derive { name="RGENERATEPREC"; version="1.0"; sha256="1f6y3i8r6a9cajbj127s0cd13ihbi8scgrsgizza1fjb7fg2g450"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; };
 RGIFT = derive { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; };
 RGenetics = derive { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; };
-RGoogleAnalytics = derive { name="RGoogleAnalytics"; version="0.1.1"; sha256="1049fyxl00izw92rm508p90asjp0agmv38b00yfbmasfzsp1r00s"; depends=[lubridate httr]; };
-RGraphics = derive { name="RGraphics"; version="2.0-12"; sha256="03f0rlckfkll3s30avglbf0524laf8n6plxlbmbx1qi1s18hcfai"; depends=[lattice ggplot2]; };
+RGoogleAnalytics = derive { name="RGoogleAnalytics"; version="0.1.1"; sha256="1049fyxl00izw92rm508p90asjp0agmv38b00yfbmasfzsp1r00s"; depends=[httr lubridate]; };
+RGraphics = derive { name="RGraphics"; version="2.0-12"; sha256="03f0rlckfkll3s30avglbf0524laf8n6plxlbmbx1qi1s18hcfai"; depends=[ggplot2 lattice]; };
 RGtk2 = derive { name="RGtk2"; version="2.20.31"; sha256="1ilnlmsk9fis61pc5bn9sf7z4b7vc7f0a0zcy77kk4bns6iqjvyp"; depends=[]; };
 RGtk2Extras = derive { name="RGtk2Extras"; version="0.6.1"; sha256="19gjz2bk9dix06wrmlnq02yj1ly8pzhvr0riz9b08vbzlsv9gnk2"; depends=[RGtk2]; };
-RH2 = derive { name="RH2"; version="0.2.3"; sha256="1qbxy600fc8k2xl70liggdgg03ga6a8yad001banqzdmh508wcxl"; depends=[chron RJDBC rJava]; };
-RHRV = derive { name="RHRV"; version="4.0"; sha256="16xmmmw8gsqalbqf59xwpkd2bkfwxrdx8bwdn875bizx7mn0bql7"; depends=[tkrplot waveslim nonlinearTseries]; };
+RH2 = derive { name="RH2"; version="0.2.3"; sha256="1qbxy600fc8k2xl70liggdgg03ga6a8yad001banqzdmh508wcxl"; depends=[chron rJava RJDBC]; };
+RHRV = derive { name="RHRV"; version="4.0"; sha256="16xmmmw8gsqalbqf59xwpkd2bkfwxrdx8bwdn875bizx7mn0bql7"; depends=[nonlinearTseries tkrplot waveslim]; };
 RHT = derive { name="RHT"; version="1.0"; sha256="1gxf8nhj3y92h8al7l3fxa45wc568kb3cykrbdjlsy2zjacf7fcc"; depends=[]; };
 RHive = derive { name="RHive"; version="2.0-0.2"; sha256="0a1saqqwh6zvz264jkkd6c9abxpsg1j4yfivb5h773i76pzhvqc3"; depends=[rJava]; };
 RI2by2 = derive { name="RI2by2"; version="1.2"; sha256="0387ncq1nhpz8521nwsjybsdpncm56nrwkz68apgihmrbjlmp6m7"; depends=[gtools]; };
@@ -1600,121 +1607,121 @@ RISmed = derive { name="RISmed"; version="2.1.5"; sha256="03c2b6iqq147kwrpx6wh44
 RImageJROI = derive { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; };
 RImpala = derive { name="RImpala"; version="0.1.6"; sha256="03f4cq4bcrydpy78ypir7smj7abrcfynz0zzlgwgc60vh7vl79lz"; depends=[rJava]; };
 RInSp = derive { name="RInSp"; version="1.2"; sha256="0zg46qw44wx17ydcz592gl4k9qq08dycmsshxxqkjf92r3g3l6wm"; depends=[]; };
-RInside = derive { name="RInside"; version="0.2.13"; sha256="0cfhljdai9kkw5m01mjaya0s02g4g1cy1g4i0qpjkhgqyihsh7dy"; depends=[Rcpp Rcpp]; };
-RItools = derive { name="RItools"; version="0.1-12"; sha256="0zdwj5y355d8jnwmjic3djwn6zy7h1iyl58j9hmnmc3m369cir0s"; depends=[lattice SparseM xtable svd abind]; };
+RInside = derive { name="RInside"; version="0.2.13"; sha256="0cfhljdai9kkw5m01mjaya0s02g4g1cy1g4i0qpjkhgqyihsh7dy"; depends=[Rcpp]; };
+RItools = derive { name="RItools"; version="0.1-12"; sha256="0zdwj5y355d8jnwmjic3djwn6zy7h1iyl58j9hmnmc3m369cir0s"; depends=[abind lattice SparseM svd xtable]; };
 RJDBC = derive { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vpd662nmw4hr7qkq6510gk4l375ab2"; depends=[DBI rJava]; };
 RJSDMX = derive { name="RJSDMX"; version="1.3"; sha256="1z4l6iw404qn3syk2877msywkr8369nic5zzvnx1qj0gj9x2mm2p"; depends=[rJava zoo]; };
 RJSONIO = derive { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; };
 RJaCGH = derive { name="RJaCGH"; version="2.0.3"; sha256="0wz7vhlgzf8smzl7gx01dx070266fnmzw66wpl0im20nxfy8mr0l"; depends=[]; };
-RJafroc = derive { name="RJafroc"; version="0.0.1"; sha256="0zjyr7qz50wvzkais6q9kyf3wp29g15kan73b8wdqrvab0f5rjqs"; depends=[xlsx ggplot2 stringr]; };
-RKEA = derive { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[RKEAjars rJava tm]; };
+RJafroc = derive { name="RJafroc"; version="0.0.1"; sha256="0zjyr7qz50wvzkais6q9kyf3wp29g15kan73b8wdqrvab0f5rjqs"; depends=[ggplot2 stringr xlsx]; };
+RKEA = derive { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; };
 RKEAjars = derive { name="RKEAjars"; version="5.0-1"; sha256="00bva6ksdnmwa0i2zvr36n40xp429c0sqyp20a8n3zsblawiralc"; depends=[rJava]; };
-RLRsim = derive { name="RLRsim"; version="3.0"; sha256="16bqsp15b8ikgix18p63k6sf81d1al4djbb51r08imjs4z9jppg4"; depends=[Rcpp mgcv Rcpp]; };
-RLumShiny = derive { name="RLumShiny"; version="0.1.0"; sha256="0j4w3h1j6dm5q98639am3xfixjdx2xhiiy3qghkb0z8lv5rbvvw5"; depends=[Luminescence shiny digest googleVis RCurl]; };
+RLRsim = derive { name="RLRsim"; version="3.0"; sha256="16bqsp15b8ikgix18p63k6sf81d1al4djbb51r08imjs4z9jppg4"; depends=[mgcv Rcpp]; };
+RLumShiny = derive { name="RLumShiny"; version="0.1.0"; sha256="0j4w3h1j6dm5q98639am3xfixjdx2xhiiy3qghkb0z8lv5rbvvw5"; depends=[digest googleVis Luminescence RCurl shiny]; };
 RM2 = derive { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; };
 RMAWGEN = derive { name="RMAWGEN"; version="1.3.0"; sha256="19p8bxcfk802pdn6990ya0bd9ghbvg8vmk3z01x1v76w09j4bv38"; depends=[chron date vars]; };
 RMC = derive { name="RMC"; version="0.2"; sha256="1sc4nsjmaw2ajm8bka7r4mf73zxqhnvx23kl4v20pfpy9rhgd0h6"; depends=[]; };
 RMKdiscrete = derive { name="RMKdiscrete"; version="0.1"; sha256="0b4adw46sn98qmy4nxv5l5svcjrp5532x7slfhhgsskqx408lzjf"; depends=[]; };
-RMOA = derive { name="RMOA"; version="1.0"; sha256="01mrl6544wv2jc8b8gk1whs865sbv4id5sywnf1hq3r7g8wgs8lp"; depends=[RMOAjars rJava]; };
+RMOA = derive { name="RMOA"; version="1.0"; sha256="01mrl6544wv2jc8b8gk1whs865sbv4id5sywnf1hq3r7g8wgs8lp"; depends=[rJava RMOAjars]; };
 RMOAjars = derive { name="RMOAjars"; version="1.0"; sha256="0k3w37dwyyvfxh7a9l76cyjm27qq1clxppc5h16li2m8x68fvpjq"; depends=[rJava]; };
-RMRAINGEN = derive { name="RMRAINGEN"; version="1.0"; sha256="175kd803a44yblq2jw5mrn2qv4piiy249577lf684bmmajf4ird4"; depends=[copula RGENERATE RMAWGEN blockmatrix Matrix]; };
+RMRAINGEN = derive { name="RMRAINGEN"; version="1.0"; sha256="175kd803a44yblq2jw5mrn2qv4piiy249577lf684bmmajf4ird4"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN]; };
 RMTstat = derive { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; };
 RMallow = derive { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; };
-RMark = derive { name="RMark"; version="2.1.13"; sha256="04wrl4i3d6kwy4masqc17qab24jv8p3kbfcx2z5l11wyf84xaqgx"; depends=[snowfall matrixcalc msm coda]; };
-RMediation = derive { name="RMediation"; version="1.1.3"; sha256="07ck74dl1wwb88229fhkh2czlynddff7zvjyhisxk53qmdb0wvmw"; depends=[MASS lavaan e1071]; };
+RMark = derive { name="RMark"; version="2.1.13"; sha256="04wrl4i3d6kwy4masqc17qab24jv8p3kbfcx2z5l11wyf84xaqgx"; depends=[coda matrixcalc msm snowfall]; };
+RMediation = derive { name="RMediation"; version="1.1.3"; sha256="07ck74dl1wwb88229fhkh2czlynddff7zvjyhisxk53qmdb0wvmw"; depends=[e1071 lavaan MASS]; };
 RMongo = derive { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; };
 RMySQL = derive { name="RMySQL"; version="0.10.3"; sha256="0791pshzr7rjjcnlm9md7gfsqkzizhzr9vwgnk2acc7sw5hikga6"; depends=[DBI]; };
 RNCBIEUtilsLibs = derive { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; };
-RNCEP = derive { name="RNCEP"; version="1.0.7"; sha256="0yvddsdpdrsg2dafmba081q4a34q15d7g2z5zr4qnzqb8wjwh6q2"; depends=[maps RColorBrewer abind fields fossil tgp sp]; };
+RNCEP = derive { name="RNCEP"; version="1.0.7"; sha256="0yvddsdpdrsg2dafmba081q4a34q15d7g2z5zr4qnzqb8wjwh6q2"; depends=[abind fields fossil maps RColorBrewer sp tgp]; };
 RND = derive { name="RND"; version="1.1"; sha256="1rbnjkfrsvm68xp90l4awixbvpid9nxnhg6i6fndpdmqwly2fwdp"; depends=[]; };
-RNeXML = derive { name="RNeXML"; version="2.0.3"; sha256="02aaacd2vs2iccjabx1bcrimhzr1kpzhkx9l50amwilj8q8ackr0"; depends=[ape XML plyr taxize reshape2 httr uuid]; };
+RNeXML = derive { name="RNeXML"; version="2.0.3"; sha256="02aaacd2vs2iccjabx1bcrimhzr1kpzhkx9l50amwilj8q8ackr0"; depends=[ape httr plyr reshape2 taxize uuid XML]; };
 RNetCDF = derive { name="RNetCDF"; version="1.7-3"; sha256="1blpwkmdi7scm876mvk9m23k4kfx83rc6hcy342236rbmxdzahhg"; depends=[]; };
-RNetLogo = derive { name="RNetLogo"; version="1.0-1"; sha256="051yx7l8qbnvb4gn67m00wnl6v0jrmavmp7n7zygjn7p1xi3w22c"; depends=[rJava igraph]; };
-RNiftyReg = derive { name="RNiftyReg"; version="1.1.3"; sha256="1z980rwlq7wg4zjslppzs9d2cxhj7l63sgg8x8g6zgs5ag3pzgi7"; depends=[reportr oro_nifti]; };
-ROAuth = derive { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[RCurl digest]; };
-ROC632 = derive { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[survival penalized survivalROC]; };
+RNetLogo = derive { name="RNetLogo"; version="1.0-1"; sha256="051yx7l8qbnvb4gn67m00wnl6v0jrmavmp7n7zygjn7p1xi3w22c"; depends=[igraph rJava]; };
+RNiftyReg = derive { name="RNiftyReg"; version="1.1.3"; sha256="1z980rwlq7wg4zjslppzs9d2cxhj7l63sgg8x8g6zgs5ag3pzgi7"; depends=[oro_nifti reportr]; };
+ROAuth = derive { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[digest RCurl]; };
+ROC632 = derive { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[penalized survival survivalROC]; };
 ROCR = derive { name="ROCR"; version="1.0-7"; sha256="1jay8cm7lgq56i967vm5c2hgaxqkphfpip0gn941li3yhh7p3vz7"; depends=[gplots]; };
 ROCS = derive { name="ROCS"; version="1.2"; sha256="1liph11p5dwvm1z5vq7ph5pizzqrm6ami94cq6y5kvm2qyv0jfah"; depends=[rgl]; };
-ROCt = derive { name="ROCt"; version="0.8"; sha256="1k0571gq7igg56qxwf9ibk28v763ji0w9183gs6qp95lpbyp5zwr"; depends=[date survival relsurv]; };
+ROCt = derive { name="ROCt"; version="0.8"; sha256="1k0571gq7igg56qxwf9ibk28v763ji0w9183gs6qp95lpbyp5zwr"; depends=[date relsurv survival]; };
 ROCwoGS = derive { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; };
 RODBC = derive { name="RODBC"; version="1.3-11"; sha256="1j6qv7w4klgwzdx9jf6h4l1x1idn3rka70ql37pbnzga1h5dr9yy"; depends=[]; };
 RODBCext = derive { name="RODBCext"; version="0.2.3"; sha256="0j0774gpnd72mw3x9qv7shiwrk0s5rk8hf0wjq4iy42wwbvql7l6"; depends=[RODBC]; };
 RODM = derive { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; };
 ROI = derive { name="ROI"; version="0.1-0"; sha256="01za8cxjf721m2lxnw352k8g32pglmllk50l7b8yhjwc49k8rl66"; depends=[registry slam]; };
-ROI_plugin_glpk = derive { name="ROI.plugin.glpk"; version="0.0-2"; sha256="10p3cq59app3xdv8dvqr24m937a36lzd274mdl2a9r4fwny2rssa"; depends=[ROI Rglpk]; };
+ROI_plugin_glpk = derive { name="ROI.plugin.glpk"; version="0.0-2"; sha256="10p3cq59app3xdv8dvqr24m937a36lzd274mdl2a9r4fwny2rssa"; depends=[Rglpk ROI]; };
 ROI_plugin_quadprog = derive { name="ROI.plugin.quadprog"; version="0.0-2"; sha256="0mkjq87rv1xf0bggpqd2r4gabv11spgcds2y94r3vpmh8krf71jf"; depends=[quadprog ROI slam]; };
 ROI_plugin_symphony = derive { name="ROI.plugin.symphony"; version="0.0-2"; sha256="1z4cahz0h38jw54p9363ca6i3qq7dwlm3568dr91gvpqf76b05wd"; depends=[ROI Rsymphony slam]; };
 ROSE = derive { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; };
-RObsDat = derive { name="RObsDat"; version="15.02"; sha256="1fagbmp48rnyln6jh2yzvc414q82q6dvixmia7yqg64lrkzkh302"; depends=[zoo spacetime xts DBI vwr e1071 sp]; };
+RObsDat = derive { name="RObsDat"; version="15.02"; sha256="1fagbmp48rnyln6jh2yzvc414q82q6dvixmia7yqg64lrkzkh302"; depends=[DBI e1071 sp spacetime vwr xts zoo]; };
 ROptEst = derive { name="ROptEst"; version="0.9"; sha256="0m5czyqcsz42dzrhm3vwfmn046n57cb7x5sqzf2nad1gqgxzxp1d"; depends=[distr distrEx distrMod RandVar RobAStBase]; };
-ROptEstOld = derive { name="ROptEstOld"; version="0.9.2"; sha256="0blf34xff9pjfy983xm7a27xqkh9173nk64ysas6f0g4h31gh8ax"; depends=[distr distrEx RandVar evd]; };
-ROptRegTS = derive { name="ROptRegTS"; version="0.9.1"; sha256="1a8pbn63wh2w2n409yzbwvarvhphcn82rdqjh407ch3k3x6jz3r5"; depends=[ROptEstOld RandVar distr distrEx]; };
+ROptEstOld = derive { name="ROptEstOld"; version="0.9.2"; sha256="0blf34xff9pjfy983xm7a27xqkh9173nk64ysas6f0g4h31gh8ax"; depends=[distr distrEx evd RandVar]; };
+ROptRegTS = derive { name="ROptRegTS"; version="0.9.1"; sha256="1a8pbn63wh2w2n409yzbwvarvhphcn82rdqjh407ch3k3x6jz3r5"; depends=[distr distrEx RandVar ROptEstOld]; };
 ROracle = derive { name="ROracle"; version="1.1-12"; sha256="1ydmckr0wzjgvhhh410l4ih7idbr8140g6v11avh655wffk02q5p"; depends=[DBI]; };
-RPANDA = derive { name="RPANDA"; version="1.0"; sha256="1q8chhmdgn697a4qp4f7prdviar29z0py050748qw7ab326lqp5d"; depends=[ape picante pspline deSolve]; };
+RPANDA = derive { name="RPANDA"; version="1.0"; sha256="1q8chhmdgn697a4qp4f7prdviar29z0py050748qw7ab326lqp5d"; depends=[ape deSolve picante pspline]; };
 RPCLR = derive { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; };
-RPEnsemble = derive { name="RPEnsemble"; version="0.2"; sha256="1kbgpbk7gma0vhl0aybdj7bk2chhbggzh7h1w7snddgdvvj6cz10"; depends=[MASS class]; };
+RPEnsemble = derive { name="RPEnsemble"; version="0.2"; sha256="1kbgpbk7gma0vhl0aybdj7bk2chhbggzh7h1w7snddgdvvj6cz10"; depends=[class MASS]; };
 RPMG = derive { name="RPMG"; version="2.1-7"; sha256="1nkmnqrys65vg377mys6qzpbwfh43adgy76c6jfdg336nf8qx2wd"; depends=[]; };
 RPMM = derive { name="RPMM"; version="1.20"; sha256="09rwrcd8jz0nii1vx0n3b4daidiq0kp0vf88bvi84y4i06743il7"; depends=[cluster]; };
 RPPairwiseDesign = derive { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; };
 RPostgreSQL = derive { name="RPostgreSQL"; version="0.4"; sha256="0gpmbpiaiqvjzyl84l2l8v2jnz3h41v8jl99sp1qvvyrjrickra2"; depends=[DBI]; };
-RProtoBuf = derive { name="RProtoBuf"; version="0.4.2"; sha256="0ph6sdw0gys70sjlfimgvjk19rbj4v6p7wk05nar6wh8mabpvb63"; depends=[Rcpp RCurl Rcpp]; };
-RPublica = derive { name="RPublica"; version="0.1.2"; sha256="1fawjkwfxx3z370132vsjjs3ls316gzxzlxp8b4vzrshx1p7vp3q"; depends=[jsonlite httr RCurl]; };
+RProtoBuf = derive { name="RProtoBuf"; version="0.4.2"; sha256="0ph6sdw0gys70sjlfimgvjk19rbj4v6p7wk05nar6wh8mabpvb63"; depends=[Rcpp RCurl]; };
+RPublica = derive { name="RPublica"; version="0.1.2"; sha256="1fawjkwfxx3z370132vsjjs3ls316gzxzlxp8b4vzrshx1p7vp3q"; depends=[httr jsonlite RCurl]; };
 RPushbullet = derive { name="RPushbullet"; version="0.2.0"; sha256="1h9yvw9kw7df0ijwhfc2bi29y61fl9zg3mp4xygx3fyr9mycjm7a"; depends=[RJSONIO]; };
-RQDA = derive { name="RQDA"; version="0.2-7"; sha256="05h2f5sk0a14bhzqng5xp87li24b6n11p5lcxf9xpy7sbmh5ig6g"; depends=[RSQLite gWidgetsRGtk2 RGtk2 DBI igraph gWidgets]; };
-RQuantLib = derive { name="RQuantLib"; version="0.4.0"; sha256="1p2hd7wa5yi5ian2akb70pjr4glfni4dvwgglyg5pqmmm2j45k2d"; depends=[Rcpp Rcpp]; };
+RQDA = derive { name="RQDA"; version="0.2-7"; sha256="05h2f5sk0a14bhzqng5xp87li24b6n11p5lcxf9xpy7sbmh5ig6g"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; };
+RQuantLib = derive { name="RQuantLib"; version="0.4.0"; sha256="1p2hd7wa5yi5ian2akb70pjr4glfni4dvwgglyg5pqmmm2j45k2d"; depends=[Rcpp]; };
 RRF = derive { name="RRF"; version="1.6"; sha256="1gp224mracrz53vnxwfvd7bln18v8x7w130wslhfgcdl0n4f2d28"; depends=[]; };
 RRTCS = derive { name="RRTCS"; version="0.0.1"; sha256="05ws5n2ajisdh4gfzmilvkz6jvvbl6fiwkcjzwm8bll2rhl916z4"; depends=[sampling samplingVarEst]; };
 RRreg = derive { name="RRreg"; version="0.3.0"; sha256="0pip05wk76h436mvcsddhn2p25ihms3yf1lb23k7ygpx6jx4mdn3"; depends=[doParallel foreach]; };
-RSA = derive { name="RSA"; version="0.9.8"; sha256="1pqblhimhj79ss8js0nf8w24ga2kdmgw64rh496iib36g27asn8n"; depends=[lavaan ggplot2 lattice tkrplot plyr RColorBrewer aplpack]; };
+RSA = derive { name="RSA"; version="0.9.8"; sha256="1pqblhimhj79ss8js0nf8w24ga2kdmgw64rh496iib36g27asn8n"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; };
 RSADBE = derive { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; };
-RSAGA = derive { name="RSAGA"; version="0.94-1"; sha256="0zr3rm3s5pf2l2gkvbsr60srj6s1xx7kn26krpbzz3xqgbfgmz6k"; depends=[gstat shapefiles plyr]; };
-RSAP = derive { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[yaml reshape]; };
-RSDA = derive { name="RSDA"; version="1.2"; sha256="06sa3x0abm2gnf4i4y3d5mlqj1wl7mzzal27sa1x65awzi6rs2kz"; depends=[sqldf XML scales FactoMineR ggplot2 glmnet abind scatterplot3d]; };
+RSAGA = derive { name="RSAGA"; version="0.94-1"; sha256="0zr3rm3s5pf2l2gkvbsr60srj6s1xx7kn26krpbzz3xqgbfgmz6k"; depends=[gstat plyr shapefiles]; };
+RSAP = derive { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[reshape yaml]; };
+RSDA = derive { name="RSDA"; version="1.2"; sha256="06sa3x0abm2gnf4i4y3d5mlqj1wl7mzzal27sa1x65awzi6rs2kz"; depends=[abind FactoMineR ggplot2 glmnet scales scatterplot3d sqldf XML]; };
 RSEIS = derive { name="RSEIS"; version="3.4-5"; sha256="0wh7977vm721hb566lh721mwn6b4x0p7x6xb7gv0nvrd3kpsw9zn"; depends=[RPMG Rwave]; };
 RSGHB = derive { name="RSGHB"; version="1.1.0"; sha256="08ir7460mg0f414j69s7ffj35drip9qbbzwva1ps6x0gjjdnmzcq"; depends=[]; };
 RSKC = derive { name="RSKC"; version="2.4.1"; sha256="1dvzxf001a9dg71l4bh8z3aia7mymqy800268qf7qzy9n6552g59"; depends=[flexclust]; };
-RSNNS = derive { name="RSNNS"; version="0.4-6"; sha256="1p4gv2v9vzbgaksiibg66l9l9nabnm5lblc17md2cdcb6rygh3hp"; depends=[Rcpp Rcpp]; };
-RSNPset = derive { name="RSNPset"; version="0.4"; sha256="1asrl75jlkdp829phjfza10fcl9akiqspbxncd8zf2a23f2r54sy"; depends=[fastmatch foreach doRNG Rcpp Rcpp RcppEigen]; };
-RSPS = derive { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[lattice plyr gridExtra]; };
+RSNNS = derive { name="RSNNS"; version="0.4-7"; sha256="15293a6lrihk407spv2ndpcf0r9xm5l8ggc1sagf5r2mvbfiv57c"; depends=[Rcpp]; };
+RSNPset = derive { name="RSNPset"; version="0.4"; sha256="1asrl75jlkdp829phjfza10fcl9akiqspbxncd8zf2a23f2r54sy"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; };
+RSPS = derive { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; };
 RSQLServer = derive { name="RSQLServer"; version="0.1.1"; sha256="0xaw8a06xgc78hjg4bndip0jpc7l4glk28pggm2l3j31ybx81kw7"; depends=[DBI rJava RJDBC]; };
 RSQLite = derive { name="RSQLite"; version="1.0.0"; sha256="08b1syv8z887gxiw8i09dpqh0zisfb6ihq6qqr01zipvkahzq34f"; depends=[DBI]; };
 RSVGTipsDevice = derive { name="RSVGTipsDevice"; version="1.0-4"; sha256="1ybk5q4dhskrh7h1sy86ilchdwi6rivy3vv3lph6pms2virgm854"; depends=[]; };
 RSclient = derive { name="RSclient"; version="0.7-2"; sha256="04ml4pynjl97295wrclvb61mpwacrkzc9x5pbwyfg1qr3l8hss93"; depends=[]; };
-RSeed = derive { name="RSeed"; version="0.1.31"; sha256="0wljchzkp8800v9zcgjapkbildkb3p2xnkh1m6m7q6qqc9aw8mws"; depends=[sybil]; };
-RSelenium = derive { name="RSelenium"; version="1.3.5"; sha256="15pnmnljl4dm9gbcgnad5j58k6cgs6qm34829kdgyb0ygs9q7ya0"; depends=[RCurl RJSONIO XML caTools]; };
+RSeed = derive { name="RSeed"; version="0.1.31"; sha256="0wljchzkp8800v9zcgjapkbildkb3p2xnkh1m6m7q6qqc9aw8mws"; depends=[graph RBGL sybil]; };
+RSelenium = derive { name="RSelenium"; version="1.3.5"; sha256="15pnmnljl4dm9gbcgnad5j58k6cgs6qm34829kdgyb0ygs9q7ya0"; depends=[caTools RCurl RJSONIO XML]; };
 RSiena = derive { name="RSiena"; version="1.1-232"; sha256="0qp3bqq5p19bg47m37s2dw8m4q91hnkc2zxwhsgb076q0xvvv9xq"; depends=[Matrix]; };
-RSiteCatalyst = derive { name="RSiteCatalyst"; version="1.4.3"; sha256="003mazcwz7w814pm8i9zdfmsbijf02n80w48ml4grmjjn1v7x5ar"; depends=[jsonlite httr plyr base64enc digest stringr]; };
-RSocrata = derive { name="RSocrata"; version="1.6.0-12"; sha256="0db1p3bxlh07d43rlg4cmj2gbasqd21mg8qnrrp8zkqasmjdzhn7"; depends=[httr jsonlite mime curl]; };
-RSofia = derive { name="RSofia"; version="1.1"; sha256="0q931y9rcf6slb0s2lsxhgqrzy4yqwh8hb1124nxg0bjbxvjbihn"; depends=[Rcpp Rcpp]; };
-RStars = derive { name="RStars"; version="1.0"; sha256="1siwqm8sp8wqbb56961drkwcnkv3w1xiy81hxy0zcr2z7rscv7mh"; depends=[RJSONIO RCurl]; };
+RSiteCatalyst = derive { name="RSiteCatalyst"; version="1.4.3"; sha256="003mazcwz7w814pm8i9zdfmsbijf02n80w48ml4grmjjn1v7x5ar"; depends=[base64enc digest httr jsonlite plyr stringr]; };
+RSocrata = derive { name="RSocrata"; version="1.6.0-12"; sha256="0db1p3bxlh07d43rlg4cmj2gbasqd21mg8qnrrp8zkqasmjdzhn7"; depends=[curl httr jsonlite mime]; };
+RSofia = derive { name="RSofia"; version="1.1"; sha256="0q931y9rcf6slb0s2lsxhgqrzy4yqwh8hb1124nxg0bjbxvjbihn"; depends=[Rcpp]; };
+RStars = derive { name="RStars"; version="1.0"; sha256="1siwqm8sp8wqbb56961drkwcnkv3w1xiy81hxy0zcr2z7rscv7mh"; depends=[RCurl RJSONIO]; };
 RStorm = derive { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; };
-RSurveillance = derive { name="RSurveillance"; version="0.1.0"; sha256="1y17bfv0glzzb5rfniia0z4px810kgv2gns0igizw7w427zshnm0"; depends=[epitools epiR]; };
-RSurvey = derive { name="RSurvey"; version="0.8-3"; sha256="0dqrajd3m2v5cd3afl9lni9amfqfv4vhz7kakg3a5180j5rcag12"; depends=[sp rgeos MBA]; };
+RSurveillance = derive { name="RSurveillance"; version="0.1.0"; sha256="1y17bfv0glzzb5rfniia0z4px810kgv2gns0igizw7w427zshnm0"; depends=[epiR epitools]; };
+RSurvey = derive { name="RSurvey"; version="0.8-3"; sha256="0dqrajd3m2v5cd3afl9lni9amfqfv4vhz7kakg3a5180j5rcag12"; depends=[MBA rgeos sp]; };
 RSvgDevice = derive { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; };
 RTConnect = derive { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; };
 RTDE = derive { name="RTDE"; version="0.1-0"; sha256="00hh1axipp2blrhjwl9mc4fkqv3l132gxlhi9hdy52w20yhwigin"; depends=[]; };
-RTOMO = derive { name="RTOMO"; version="1.1-3"; sha256="10qkqdx2zj2m854z9s57ddf5jbzagac9mq5v6z5393c0s8bx10x8"; depends=[RPMG GEOmap RSEIS splancs]; };
-RTextTools = derive { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax51mbizxz704i3ys4vzp8hyi5kkjzq6g2lw7ywq2"; depends=[SparseM randomForest tree nnet tm e1071 ipred caTools maxent glmnet tau]; };
+RTOMO = derive { name="RTOMO"; version="1.1-3"; sha256="10qkqdx2zj2m854z9s57ddf5jbzagac9mq5v6z5393c0s8bx10x8"; depends=[GEOmap RPMG RSEIS splancs]; };
+RTextTools = derive { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax51mbizxz704i3ys4vzp8hyi5kkjzq6g2lw7ywq2"; depends=[caTools e1071 glmnet ipred maxent nnet randomForest SparseM tau tm tree]; };
 RTextureMetrics = derive { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; };
 RTriangle = derive { name="RTriangle"; version="1.6-0.6"; sha256="1g4dp792awbvsl35nvyd8gkx99p2njdcafin16qysfrjl43f5i4s"; depends=[]; };
 RUnit = derive { name="RUnit"; version="0.4.28"; sha256="0p631cg014m7linml2770g260ml0jj74d5w82ddl1p2zs5yq57hx"; depends=[]; };
-RVAideMemoire = derive { name="RVAideMemoire"; version="0.9-45-2"; sha256="1c2hmkc34qgi942i4pnw61lk0z6kd4j9424zqqscm77zscfmrmcw"; depends=[ade4 boot cramer car lme4 MASS mixOmics multcompView nnet pspearman statmod vegan]; };
-RVFam = derive { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme survival lme4 kinship2 MASS Matrix]; };
-RVideoPoker = derive { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap tkrplot rpanel]; };
-RVowpalWabbit = derive { name="RVowpalWabbit"; version="0.0.6"; sha256="06f2lmls92qkbscss00c99xkzpx83mgjah6ds0sixv1b2qi216ap"; depends=[Rcpp Rcpp]; };
+RVAideMemoire = derive { name="RVAideMemoire"; version="0.9-45-2"; sha256="1c2hmkc34qgi942i4pnw61lk0z6kd4j9424zqqscm77zscfmrmcw"; depends=[ade4 boot car cramer lme4 MASS mixOmics multcompView nnet pspearman statmod vegan]; };
+RVFam = derive { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; };
+RVideoPoker = derive { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap rpanel tkrplot]; };
+RVowpalWabbit = derive { name="RVowpalWabbit"; version="0.0.6"; sha256="06f2lmls92qkbscss00c99xkzpx83mgjah6ds0sixv1b2qi216ap"; depends=[Rcpp]; };
 RVsharing = derive { name="RVsharing"; version="1.3.4"; sha256="0v267m7gfvc6fvfh4i53jk2xcr21kih6ddlgvb600j5ck6mi14vf"; depends=[kinship2]; };
-RVtests = derive { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet spls pls]; };
-RWBP = derive { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[RANN igraph lsa SnowballC]; };
+RVtests = derive { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet pls spls]; };
+RWBP = derive { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[igraph lsa RANN SnowballC]; };
 RWeather = derive { name="RWeather"; version="0.4"; sha256="1vm8w07gsxwxvg1gpdzn6mpnh8g9kp0ln9fxjw5rl2f1zz80bxpy"; depends=[XML]; };
 RWebLogo = derive { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; };
-RWeka = derive { name="RWeka"; version="0.4-24"; sha256="1nzpwh5i4snlz5hpk27395f6ly2mfzif6fw1cb6yn2sba0nj0ls7"; depends=[RWekajars rJava]; };
+RWeka = derive { name="RWeka"; version="0.4-24"; sha256="1nzpwh5i4snlz5hpk27395f6ly2mfzif6fw1cb6yn2sba0nj0ls7"; depends=[rJava RWekajars]; };
 RWekajars = derive { name="RWekajars"; version="3.7.12-1"; sha256="0a3a33l4rglyj95v6m3lqdz0c1fzriprdlp1p8cx2v06n50ymvrz"; depends=[rJava]; };
 RWiener = derive { name="RWiener"; version="1.2-0"; sha256="1ssh4xcyr4whgyd91p6bjsm9mq1ajqjqva0yyk13dnf5jfpsr0gs"; depends=[]; };
-RXKCD = derive { name="RXKCD"; version="1.7-5"; sha256="0dsds1bv2vfq61gfppar2ai23dryh09ric5i6zaccms6q64z23md"; depends=[RJSONIO png jpeg plyr]; };
-RXMCDA = derive { name="RXMCDA"; version="1.5.3"; sha256="1pc52kvihxzq12p95r4srmnawxcsvd4r7252dajby338p56d1lw8"; depends=[XML kappalab]; };
+RXKCD = derive { name="RXKCD"; version="1.7-5"; sha256="0dsds1bv2vfq61gfppar2ai23dryh09ric5i6zaccms6q64z23md"; depends=[jpeg plyr png RJSONIO]; };
+RXMCDA = derive { name="RXMCDA"; version="1.5.3"; sha256="1pc52kvihxzq12p95r4srmnawxcsvd4r7252dajby338p56d1lw8"; depends=[kappalab XML]; };
 RXshrink = derive { name="RXshrink"; version="1.0-8"; sha256="0l4aknr1vxrkxqsgkjcffs0731jskyzvl055a01vd8h4a0826n5s"; depends=[lars]; };
 RYoudaoTranslate = derive { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; };
-RadOnc = derive { name="RadOnc"; version="1.1.0"; sha256="0gjrs78aaqbizzlcyjshc785ams3nclr503p4s2xsmd6sxj4khwi"; depends=[rgl geometry oro_dicom ptinpoly]; };
+RadOnc = derive { name="RadOnc"; version="1.1.0"; sha256="0gjrs78aaqbizzlcyjshc785ams3nclr503p4s2xsmd6sxj4khwi"; depends=[geometry oro_dicom ptinpoly rgl]; };
 RadTran = derive { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; };
 RadioSonde = derive { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3syhas1s08xxlvjawhlvjkyhils2iggi4xw4hiq"; depends=[]; };
 Rambo = derive { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; };
@@ -1724,115 +1731,116 @@ RandomFields = derive { name="RandomFields"; version="3.0.62"; sha256="1v2dmwl3n
 RandomFieldsUtils = derive { name="RandomFieldsUtils"; version="0.0.7"; sha256="1rdhc81gd0y5ss1ap74y1n8g2d7z4gjryviw86z53aznn3ddnbhg"; depends=[]; };
 RankAggreg = derive { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l24wgai2xg817wv218fzp7w1r3rcshxf0dcz2i"; depends=[gtools]; };
 RankResponse = derive { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; };
-Rankcluster = derive { name="Rankcluster"; version="0.92.9"; sha256="172jjsyc6a5y32s2fb8z6lgcq6rcwjbk3xnc5vvkhj64amlyxla6"; depends=[Rcpp Rcpp RcppEigen]; };
-RapidPolygonLookup = derive { name="RapidPolygonLookup"; version="0.1"; sha256="0m6r11ksryzcfcm265wr9fhwb867j9ppfhalvvygzig5j85sg92k"; depends=[sp RANN PBSmapping RgoogleMaps]; };
+Rankcluster = derive { name="Rankcluster"; version="0.92.9"; sha256="172jjsyc6a5y32s2fb8z6lgcq6rcwjbk3xnc5vvkhj64amlyxla6"; depends=[Rcpp RcppEigen]; };
+RapidPolygonLookup = derive { name="RapidPolygonLookup"; version="0.1"; sha256="0m6r11ksryzcfcm265wr9fhwb867j9ppfhalvvygzig5j85sg92k"; depends=[PBSmapping RANN RgoogleMaps sp]; };
 Rarity = derive { name="Rarity"; version="1.3-4"; sha256="0zz1axr8a1r6js0la2ncls0l6jnjvx807ay2ngzb52hqbijifghx"; depends=[]; };
 RaschSampler = derive { name="RaschSampler"; version="0.8-7"; sha256="11vkb5gvr1r2a7fpxyygkixc62ms53dpik9jdg7vrb9k43v82ggj"; depends=[]; };
-RbioRXN = derive { name="RbioRXN"; version="1.5.1"; sha256="0lc43wm986y3xbdh1xihn7w583cql9kvj6rb018pn06ghz153i0d"; depends=[plyr RCurl gdata data_table stringr]; };
-Rbitcoin = derive { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table RCurl digest RJSONIO]; };
-Rborist = derive { name="Rborist"; version="0.1-0"; sha256="1irb9scl68m7skqdwny9kvnzg7f1r0q1c0whzqyhhj9l4lw16hmr"; depends=[Rcpp Rcpp RcppArmadillo]; };
+RbioRXN = derive { name="RbioRXN"; version="1.5.1"; sha256="0lc43wm986y3xbdh1xihn7w583cql9kvj6rb018pn06ghz153i0d"; depends=[ChemmineR data_table fmcsR gdata KEGGREST plyr RCurl stringr]; };
+Rbitcoin = derive { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; };
+Rborist = derive { name="Rborist"; version="0.1-0"; sha256="1irb9scl68m7skqdwny9kvnzg7f1r0q1c0whzqyhhj9l4lw16hmr"; depends=[Rcpp RcppArmadillo]; };
 Rcapture = derive { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; };
-Rcell = derive { name="Rcell"; version="1.3-2"; sha256="1gfbwarbnv70sawaxv71har1m099icc2347wdvrz3hwmfgw6qm8n"; depends=[proto plyr reshape ggplot2 digest]; };
+Rcell = derive { name="Rcell"; version="1.3-2"; sha256="1gfbwarbnv70sawaxv71har1m099icc2347wdvrz3hwmfgw6qm8n"; depends=[digest ggplot2 plyr proto reshape]; };
 RcellData = derive { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; };
 Rcgmin = derive { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; };
 Rchoice = derive { name="Rchoice"; version="0.3"; sha256="1ac2nw03g66z2rgxzv8jqad74cp4c9ry0hvnw77d57ddaxszkrva"; depends=[Formula maxLik msm plm plotrix]; };
-Rclusterpp = derive { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen Rcpp RcppEigen]; };
-Rcmdr = derive { name="Rcmdr"; version="2.1-7"; sha256="1qn0bfh36shdnm2qbjwggjv19vqkkhng82x39sdbljx0z3g3bmdg"; depends=[RcmdrMisc car tcltk2 abind]; };
-RcmdrMisc = derive { name="RcmdrMisc"; version="1.0-2"; sha256="18by1b1iz7q6lbnhxj5l5w58fqsvki84d830sv7iyzrs2q6n7vhq"; depends=[car sandwich abind Hmisc MASS e1071]; };
-RcmdrPlugin_BCA = derive { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xkip7q9i57ghgz0rh0pl8nkl7bflf4w1g4zbyjdlcjypyf7lnr8"; depends=[Rcmdr BCA flexclust car RcmdrMisc nnet foreign rpart rpart_plot]; };
-RcmdrPlugin_DoE = derive { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base FrF2 DoE_wrapper relimp Rcmdr RcmdrMisc]; };
-RcmdrPlugin_EACSPIR = derive { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[R2HTML abind ez nortest reshape Rcmdr RcmdrMisc]; };
-RcmdrPlugin_EBM = derive { name="RcmdrPlugin.EBM"; version="1.0-8"; sha256="0lkj869xdacvnma0qq20fqdsq59jqka2fv5h78f99lybzcb95i11"; depends=[Rcmdr epiR abind]; };
+Rclusterpp = derive { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen]; };
+Rcmdr = derive { name="Rcmdr"; version="2.1-7"; sha256="1qn0bfh36shdnm2qbjwggjv19vqkkhng82x39sdbljx0z3g3bmdg"; depends=[abind car RcmdrMisc tcltk2]; };
+RcmdrMisc = derive { name="RcmdrMisc"; version="1.0-2"; sha256="18by1b1iz7q6lbnhxj5l5w58fqsvki84d830sv7iyzrs2q6n7vhq"; depends=[abind car e1071 Hmisc MASS sandwich]; };
+RcmdrPlugin_BCA = derive { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xkip7q9i57ghgz0rh0pl8nkl7bflf4w1g4zbyjdlcjypyf7lnr8"; depends=[BCA car flexclust foreign nnet Rcmdr RcmdrMisc rpart rpart_plot]; };
+RcmdrPlugin_DoE = derive { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; };
+RcmdrPlugin_EACSPIR = derive { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; };
+RcmdrPlugin_EBM = derive { name="RcmdrPlugin.EBM"; version="1.0-8"; sha256="0lkj869xdacvnma0qq20fqdsq59jqka2fv5h78f99lybzcb95i11"; depends=[abind epiR Rcmdr]; };
 RcmdrPlugin_EZR = derive { name="RcmdrPlugin.EZR"; version="1.28"; sha256="0by00cnfs0yciy1azqvmcbkbf6r8mr2451xjqqxfd4jwmhg3nrxl"; depends=[Rcmdr]; };
-RcmdrPlugin_EcoVirtual = derive { name="RcmdrPlugin.EcoVirtual"; version="0.1"; sha256="00yk09c1d1frwpfq12zvhg4gnc3p63r61abnil623jpr6wh4b2x8"; depends=[Rcmdr EcoVirtual]; };
+RcmdrPlugin_EcoVirtual = derive { name="RcmdrPlugin.EcoVirtual"; version="0.1"; sha256="00yk09c1d1frwpfq12zvhg4gnc3p63r61abnil623jpr6wh4b2x8"; depends=[EcoVirtual Rcmdr]; };
 RcmdrPlugin_FactoMineR = derive { name="RcmdrPlugin.FactoMineR"; version="1.5-0"; sha256="1hfnn12l3jljqpczpxz4m9ywbmw5rc1c8dpfl4cabrxnh6ymnk1a"; depends=[FactoMineR Rcmdr]; };
-RcmdrPlugin_HH = derive { name="RcmdrPlugin.HH"; version="1.1-42"; sha256="0ra5glv2p4ii2c1b3dyxbdjl4ps6idjpl6ni8ridrfb391qlmyrk"; depends=[HH lattice latticeExtra rgl mgcv Rcmdr]; };
+RcmdrPlugin_HH = derive { name="RcmdrPlugin.HH"; version="1.1-43"; sha256="0bn94wcrzvcrzhixh8kyg5gkax762mskhm2wvdfz1sm3n6fc7281"; depends=[HH lattice mgcv Rcmdr]; };
 RcmdrPlugin_IPSUR = derive { name="RcmdrPlugin.IPSUR"; version="0.2-1"; sha256="1lk7divj5va74prsnchq8yx9fbyym7xcsyqzkf72w448fgvvvwlv"; depends=[Rcmdr]; };
 RcmdrPlugin_KMggplot2 = derive { name="RcmdrPlugin.KMggplot2"; version="0.2-0"; sha256="1w4n7r3sp6h87wxhrzg500w90p8dzr43j28p8p1r2y0v0i0v6mk5"; depends=[ggplot2 ggthemes gtable plyr Rcmdr RColorBrewer scales survival tcltk2]; };
-RcmdrPlugin_MA = derive { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[Rcmdr MAd metafor]; };
-RcmdrPlugin_MPAStats = derive { name="RcmdrPlugin.MPAStats"; version="1.1.5"; sha256="0km6yglhn0128kk1xm2mnrkr2lkv3r9zndhlv7h1dkd16aph3vm3"; depends=[Rcmdr ordinal]; };
-RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.8.0.4"; sha256="1qxx685wd974dc2zj7myg0jlxz5s63lkjfycc66f3mcj1qk5j4k6"; depends=[mixlm MASS pls xtable Rcmdr]; };
-RcmdrPlugin_RMTCJags = derive { name="RcmdrPlugin.RMTCJags"; version="1.0"; sha256="0fwzr27pk7p82wj1xbajva1ips15jdfgwxzf7815bcm7x7w9xr8v"; depends=[Rcmdr runjags rmeta igraph coda rjags]; };
-RcmdrPlugin_ROC = derive { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[Rcmdr ROCR pROC ResourceSelection]; };
-RcmdrPlugin_SCDA = derive { name="RcmdrPlugin.SCDA"; version="1.1"; sha256="0pd765ndh8d7hy6spds3r4pi09i0ak4b1ygwczp6yr2zcs1aikbc"; depends=[SCVA SCRT SCMA Rcmdr]; };
-RcmdrPlugin_SLC = derive { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[SLC Rcmdr]; };
-RcmdrPlugin_SM = derive { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[Rcmdr car RColorBrewer colorspace vcd]; };
-RcmdrPlugin_StatisticalURV = derive { name="RcmdrPlugin.StatisticalURV"; version="1.0-1"; sha256="04pqqgy12rnhwm8l0752hb9p5h4l11mm7flm6n9kkcvbkvagsbrz"; depends=[agricolae multcomp car Rcmdr]; };
-RcmdrPlugin_TeachingDemos = derive { name="RcmdrPlugin.TeachingDemos"; version="1.0-7"; sha256="0d473p0df99x9a3jfwb49gxsrcvslcw9yandramwq82cwy3sdcxw"; depends=[rgl TeachingDemos Rcmdr]; };
-RcmdrPlugin_UCA = derive { name="RcmdrPlugin.UCA"; version="2.0-4"; sha256="066h5idmmjng4i1n84rbvqgjnj7f1xrj32l1icm1dw3gsh2ipa5l"; depends=[Rcmdr randtests tseries]; };
-RcmdrPlugin_coin = derive { name="RcmdrPlugin.coin"; version="1.0-22"; sha256="0qmdjnjmgq52wgl4llg69q9x7hvwd73mz3swv0sv88v8zqg7xj93"; depends=[Rcmdr coin survival multcomp]; };
-RcmdrPlugin_depthTools = derive { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[Rcmdr depthTools]; };
-RcmdrPlugin_doex = derive { name="RcmdrPlugin.doex"; version="0.2.0"; sha256="0l3c8vwifyl8a7qkfaqxm7cws2cg1g501qa93w5svcgp03yf98mj"; depends=[Rcmdr multcomp]; };
-RcmdrPlugin_epack = derive { name="RcmdrPlugin.epack"; version="1.2.5"; sha256="1577qhac4rldifax5x3l39cddan6dhq2dv4iv2n64nadgrl0259w"; depends=[Rcmdr TeachingDemos tseries abind MASS xts forecast]; };
+RcmdrPlugin_MA = derive { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[MAd metafor Rcmdr]; };
+RcmdrPlugin_MPAStats = derive { name="RcmdrPlugin.MPAStats"; version="1.1.5"; sha256="0km6yglhn0128kk1xm2mnrkr2lkv3r9zndhlv7h1dkd16aph3vm3"; depends=[ordinal Rcmdr]; };
+RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.8.0.4"; sha256="1qxx685wd974dc2zj7myg0jlxz5s63lkjfycc66f3mcj1qk5j4k6"; depends=[MASS mixlm pls Rcmdr xtable]; };
+RcmdrPlugin_RMTCJags = derive { name="RcmdrPlugin.RMTCJags"; version="1.0"; sha256="0fwzr27pk7p82wj1xbajva1ips15jdfgwxzf7815bcm7x7w9xr8v"; depends=[coda igraph Rcmdr rjags rmeta runjags]; };
+RcmdrPlugin_ROC = derive { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[pROC Rcmdr ResourceSelection ROCR]; };
+RcmdrPlugin_SCDA = derive { name="RcmdrPlugin.SCDA"; version="1.1"; sha256="0pd765ndh8d7hy6spds3r4pi09i0ak4b1ygwczp6yr2zcs1aikbc"; depends=[Rcmdr SCMA SCRT SCVA]; };
+RcmdrPlugin_SLC = derive { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[Rcmdr SLC]; };
+RcmdrPlugin_SM = derive { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[car colorspace Rcmdr RColorBrewer vcd]; };
+RcmdrPlugin_StatisticalURV = derive { name="RcmdrPlugin.StatisticalURV"; version="1.0-1"; sha256="04pqqgy12rnhwm8l0752hb9p5h4l11mm7flm6n9kkcvbkvagsbrz"; depends=[agricolae car multcomp Rcmdr]; };
+RcmdrPlugin_TeachingDemos = derive { name="RcmdrPlugin.TeachingDemos"; version="1.0-7"; sha256="0d473p0df99x9a3jfwb49gxsrcvslcw9yandramwq82cwy3sdcxw"; depends=[Rcmdr rgl TeachingDemos]; };
+RcmdrPlugin_UCA = derive { name="RcmdrPlugin.UCA"; version="2.0-4"; sha256="066h5idmmjng4i1n84rbvqgjnj7f1xrj32l1icm1dw3gsh2ipa5l"; depends=[randtests Rcmdr tseries]; };
+RcmdrPlugin_coin = derive { name="RcmdrPlugin.coin"; version="1.0-22"; sha256="0qmdjnjmgq52wgl4llg69q9x7hvwd73mz3swv0sv88v8zqg7xj93"; depends=[coin multcomp Rcmdr survival]; };
+RcmdrPlugin_depthTools = derive { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[depthTools Rcmdr]; };
+RcmdrPlugin_doex = derive { name="RcmdrPlugin.doex"; version="0.2.0"; sha256="0l3c8vwifyl8a7qkfaqxm7cws2cg1g501qa93w5svcgp03yf98mj"; depends=[multcomp Rcmdr]; };
+RcmdrPlugin_epack = derive { name="RcmdrPlugin.epack"; version="1.2.5"; sha256="1577qhac4rldifax5x3l39cddan6dhq2dv4iv2n64nadgrl0259w"; depends=[abind forecast MASS Rcmdr TeachingDemos tseries xts]; };
 RcmdrPlugin_lfstat = derive { name="RcmdrPlugin.lfstat"; version="0.7"; sha256="009yj9c5cr34k8qa16q19sp7c5iwv95g9swbm004nr18mfah8x9w"; depends=[lfstat Rcmdr]; };
-RcmdrPlugin_mosaic = derive { name="RcmdrPlugin.mosaic"; version="1.0-7"; sha256="0k6xaz2dfm9ch9lxqsh19jm8d4bbyjj2ffmjjxl57kanb3pvrrwv"; depends=[ENmisc vcd Hmisc Rcmdr]; };
+RcmdrPlugin_mosaic = derive { name="RcmdrPlugin.mosaic"; version="1.0-7"; sha256="0k6xaz2dfm9ch9lxqsh19jm8d4bbyjj2ffmjjxl57kanb3pvrrwv"; depends=[ENmisc Hmisc Rcmdr vcd]; };
 RcmdrPlugin_orloca = derive { name="RcmdrPlugin.orloca"; version="4.1"; sha256="19qj6llr5sfw267dgbn2jvrsisb54qbjhgaiigfzymk6px33wwmg"; depends=[orloca orloca_es Rcmdr]; };
-RcmdrPlugin_plotByGroup = derive { name="RcmdrPlugin.plotByGroup"; version="0.1-0"; sha256="10wc7lnihsrldsynq2s0syr1aqmvfnj9rhgwh1nkk7jlrwcgj0z6"; depends=[Rcmdr lattice]; };
+RcmdrPlugin_plotByGroup = derive { name="RcmdrPlugin.plotByGroup"; version="0.1-0"; sha256="10wc7lnihsrldsynq2s0syr1aqmvfnj9rhgwh1nkk7jlrwcgj0z6"; depends=[lattice Rcmdr]; };
 RcmdrPlugin_pointG = derive { name="RcmdrPlugin.pointG"; version="0.6.6"; sha256="0sc3akbpdys353va05b40g3rq8qihw0pmhvv0kckkhsgrbr8mc07"; depends=[Rcmdr RColorBrewer]; };
 RcmdrPlugin_qual = derive { name="RcmdrPlugin.qual"; version="2.2.6"; sha256="00wznh0k909cd9vwdj1ag3224xkqnwjsad1bfkgxbszsx0w6xvy9"; depends=[Rcmdr]; };
-RcmdrPlugin_sampling = derive { name="RcmdrPlugin.sampling"; version="1.1"; sha256="0fx0s63wq0si1jydl9xyj9ny7iglg91zpvkyrnc05i5pan9l3xd9"; depends=[lpSolve sampling MASS Rcmdr]; };
-RcmdrPlugin_seeg = derive { name="RcmdrPlugin.seeg"; version="1.0"; sha256="105c2rl3mrcv7r3iqa9d2zs6cys7vfpyydylkg2cggfqkghxgr95"; depends=[Rcmdr seeg spatstat sgeostat]; };
-RcmdrPlugin_sos = derive { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9jxzmf5ks62b5jbw0pkf388i1lnld6i27xhfzysjqdxcnzdsdz"; depends=[sos Rcmdr tcltk2]; };
+RcmdrPlugin_sampling = derive { name="RcmdrPlugin.sampling"; version="1.1"; sha256="0fx0s63wq0si1jydl9xyj9ny7iglg91zpvkyrnc05i5pan9l3xd9"; depends=[lpSolve MASS Rcmdr sampling]; };
+RcmdrPlugin_seeg = derive { name="RcmdrPlugin.seeg"; version="1.0"; sha256="105c2rl3mrcv7r3iqa9d2zs6cys7vfpyydylkg2cggfqkghxgr95"; depends=[Rcmdr seeg sgeostat spatstat]; };
+RcmdrPlugin_sos = derive { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9jxzmf5ks62b5jbw0pkf388i1lnld6i27xhfzysjqdxcnzdsdz"; depends=[Rcmdr sos tcltk2]; };
 RcmdrPlugin_steepness = derive { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="1na98sl42896y7yklaj07sn88lj6p6ik7gwy9ffaxzicqaa8plgf"; depends=[Rcmdr steepness]; };
-RcmdrPlugin_survival = derive { name="RcmdrPlugin.survival"; version="1.0-5"; sha256="1gcc9l1x0vmzmq7v09mzybig1js5jsgsq84096yk494w3dnzrr0a"; depends=[survival date Rcmdr]; };
-RcmdrPlugin_temis = derive { name="RcmdrPlugin.temis"; version="0.7.3"; sha256="1ssnky8basr135lhnagq7dlwlj1c9qrvm14hbdm0k3g9gnqmxkgh"; depends=[tm NLP slam zoo lattice Rcmdr tcltk2 ca R2HTML RColorBrewer latticeExtra stringi]; };
+RcmdrPlugin_survival = derive { name="RcmdrPlugin.survival"; version="1.0-5"; sha256="1gcc9l1x0vmzmq7v09mzybig1js5jsgsq84096yk494w3dnzrr0a"; depends=[date Rcmdr survival]; };
+RcmdrPlugin_temis = derive { name="RcmdrPlugin.temis"; version="0.7.3"; sha256="1ssnky8basr135lhnagq7dlwlj1c9qrvm14hbdm0k3g9gnqmxkgh"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; };
 Rcolombos = derive { name="Rcolombos"; version="1.5.2"; sha256="1whjn447jk2bjyjf0fwl0165f8x41fjzmkmagl6dfq1c4373sf27"; depends=[httr]; };
 Rcplex = derive { name="Rcplex"; version="0.3-2"; sha256="1hx9s327af7yawzyq5isvx8n6pvr0481lrfajgh8nihj7g69nmk7"; depends=[slam]; };
 Rcpp = derive { name="Rcpp"; version="0.11.6"; sha256="153gwzg2inxmzs5qrr87r3zabjvfh32i8kdivdy77b3c5yfrl5za"; depends=[]; };
 Rcpp11 = derive { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
-RcppAPT = derive { name="RcppAPT"; version="0.0.1"; sha256="0fyya80bd3w22qbsbznj9y21dwlj30a16d8a8kww4x8bpvmyil5z"; depends=[Rcpp Rcpp]; };
-RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.6"; sha256="1n4wrllhxn95lgkralvw5jjgff93nay5wdlyihih7f195fq5wqms"; depends=[Rcpp Rcpp]; };
-RcppArmadillo = derive { name="RcppArmadillo"; version="0.5.200.1.0"; sha256="0vz0yl5k0q57xrnjpz1bxs6j3hpysp1mkcxf5fs6xdy6nzaqsr7x"; depends=[Rcpp Rcpp]; };
-RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[Rcpp Rcpp BH]; };
-RcppCNPy = derive { name="RcppCNPy"; version="0.2.4"; sha256="1cawaxghbliy7hgvqz3y69asl43bl9mxf46nwpbxc0vx3cq15fnk"; depends=[Rcpp Rcpp]; };
-RcppClassic = derive { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy7nagnx1y1pkqffrq8iyplllcar24vxr0zirgi1xi"; depends=[Rcpp Rcpp]; };
-RcppClassicExamples = derive { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic Rcpp RcppClassic]; };
-RcppDE = derive { name="RcppDE"; version="0.1.2"; sha256="0ji5csfygqvrcahgx5gxy7dddpykckzw8hmqslsdl7l68wj60qkc"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
-RcppDL = derive { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp Rcpp]; };
-RcppEigen = derive { name="RcppEigen"; version="0.3.2.4.0"; sha256="1p6lfylj0mh059pxbp198r8nci8f89h0gb11x2pi0jgg7cqbxgh6"; depends=[Matrix Rcpp Rcpp]; };
-RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp Rcpp]; };
-RcppFaddeeva = derive { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[Rcpp knitr Rcpp]; };
-RcppGSL = derive { name="RcppGSL"; version="0.2.4"; sha256="1nw1984siwxvihp68g7khr2c4a4nwyb4ll04r5302kksz4nh7mpi"; depends=[Rcpp Rcpp]; };
-RcppMLPACK = derive { name="RcppMLPACK"; version="1.0.10-2"; sha256="1hdvdk6ni2iganmldarklv635yzgzja36zcpflh5w45c5y3ysqvj"; depends=[Rcpp Rcpp RcppArmadillo BH]; };
-RcppOctave = derive { name="RcppOctave"; version="0.14.5"; sha256="0dplc2x9fq2jfzfbcxdd45pmiimapqb3xhyjkzd4k6q8xmqjw95p"; depends=[Rcpp pkgmaker digest stringr Rcpp]; };
+RcppAPT = derive { name="RcppAPT"; version="0.0.1"; sha256="0fyya80bd3w22qbsbznj9y21dwlj30a16d8a8kww4x8bpvmyil5z"; depends=[Rcpp]; };
+RcppAnnoy = derive { name="RcppAnnoy"; version="0.0.6"; sha256="1n4wrllhxn95lgkralvw5jjgff93nay5wdlyihih7f195fq5wqms"; depends=[Rcpp]; };
+RcppArmadillo = derive { name="RcppArmadillo"; version="0.5.200.1.0"; sha256="0vz0yl5k0q57xrnjpz1bxs6j3hpysp1mkcxf5fs6xdy6nzaqsr7x"; depends=[Rcpp]; };
+RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; };
+RcppCNPy = derive { name="RcppCNPy"; version="0.2.4"; sha256="1cawaxghbliy7hgvqz3y69asl43bl9mxf46nwpbxc0vx3cq15fnk"; depends=[Rcpp]; };
+RcppClassic = derive { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy7nagnx1y1pkqffrq8iyplllcar24vxr0zirgi1xi"; depends=[Rcpp]; };
+RcppClassicExamples = derive { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic]; };
+RcppDE = derive { name="RcppDE"; version="0.1.2"; sha256="0ji5csfygqvrcahgx5gxy7dddpykckzw8hmqslsdl7l68wj60qkc"; depends=[Rcpp RcppArmadillo]; };
+RcppDL = derive { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; };
+RcppEigen = derive { name="RcppEigen"; version="0.3.2.4.0"; sha256="1p6lfylj0mh059pxbp198r8nci8f89h0gb11x2pi0jgg7cqbxgh6"; depends=[Matrix Rcpp]; };
+RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp]; };
+RcppFaddeeva = derive { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; };
+RcppGSL = derive { name="RcppGSL"; version="0.2.4"; sha256="1nw1984siwxvihp68g7khr2c4a4nwyb4ll04r5302kksz4nh7mpi"; depends=[Rcpp]; };
+RcppMLPACK = derive { name="RcppMLPACK"; version="1.0.10-2"; sha256="1hdvdk6ni2iganmldarklv635yzgzja36zcpflh5w45c5y3ysqvj"; depends=[BH Rcpp RcppArmadillo]; };
+RcppOctave = derive { name="RcppOctave"; version="0.14.5"; sha256="0dplc2x9fq2jfzfbcxdd45pmiimapqb3xhyjkzd4k6q8xmqjw95p"; depends=[digest pkgmaker Rcpp stringr]; };
 RcppParallel = derive { name="RcppParallel"; version="4.3.14"; sha256="04kch598fqxkclv7ys8s9mqsd9wbzjqk1yjc66drzyycjc8jl9qi"; depends=[]; };
-RcppProgress = derive { name="RcppProgress"; version="0.2.1"; sha256="1dah99679hs6pcaazxyc52xpx5wawk95r2bpx9fx0i33fqs1s4ng"; depends=[Rcpp Rcpp]; };
-RcppRedis = derive { name="RcppRedis"; version="0.1.3"; sha256="0xpldiny2n121dp7vpj9l3bjvjhbfkdim5cassvvj2wms9q4jvh5"; depends=[Rcpp RApiSerialize Rcpp RApiSerialize]; };
-RcppRoll = derive { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp Rcpp]; };
-RcppSMC = derive { name="RcppSMC"; version="0.1.4"; sha256="1gcqffb6rkw029cpzv7bzsxaq0a5b032zjvriw6yjzyrpi944ip7"; depends=[Rcpp Rcpp]; };
-RcppStreams = derive { name="RcppStreams"; version="0.1.0"; sha256="0pb9ri2jajfh7643wx730bkmpvjvvmip682ynm2yn6x6brjll6jf"; depends=[Rcpp Rcpp BH]; };
-RcppTOML = derive { name="RcppTOML"; version="0.0.3"; sha256="0v9gxbr5gb7k273ld6vx2n0vzy22px13s7cvackbm7mhc68bp5jw"; depends=[Rcpp Rcpp]; };
-RcppXts = derive { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts Rcpp xts]; };
-RcppZiggurat = derive { name="RcppZiggurat"; version="0.1.2"; sha256="05ai6s2j025fvr4znpmsvhxj4x7xyw2wsb9j3c5sv7aw1byfs0bb"; depends=[Rcpp Rcpp RcppGSL]; };
+RcppProgress = derive { name="RcppProgress"; version="0.2.1"; sha256="1dah99679hs6pcaazxyc52xpx5wawk95r2bpx9fx0i33fqs1s4ng"; depends=[Rcpp]; };
+RcppRedis = derive { name="RcppRedis"; version="0.1.3"; sha256="0xpldiny2n121dp7vpj9l3bjvjhbfkdim5cassvvj2wms9q4jvh5"; depends=[RApiSerialize Rcpp]; };
+RcppRoll = derive { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp]; };
+RcppSMC = derive { name="RcppSMC"; version="0.1.4"; sha256="1gcqffb6rkw029cpzv7bzsxaq0a5b032zjvriw6yjzyrpi944ip7"; depends=[Rcpp]; };
+RcppStreams = derive { name="RcppStreams"; version="0.1.0"; sha256="0pb9ri2jajfh7643wx730bkmpvjvvmip682ynm2yn6x6brjll6jf"; depends=[BH Rcpp]; };
+RcppTOML = derive { name="RcppTOML"; version="0.0.3"; sha256="0v9gxbr5gb7k273ld6vx2n0vzy22px13s7cvackbm7mhc68bp5jw"; depends=[Rcpp]; };
+RcppXts = derive { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; };
+RcppZiggurat = derive { name="RcppZiggurat"; version="0.1.2"; sha256="05ai6s2j025fvr4znpmsvhxj4x7xyw2wsb9j3c5sv7aw1byfs0bb"; depends=[Rcpp RcppGSL]; };
 Rcsdp = derive { name="Rcsdp"; version="0.1.53"; sha256="0x91hyx6z9f4zd7djxlq7dnznmr9skyzwbbcbjyid9hxbcfyvhcp"; depends=[]; };
-Rd2roxygen = derive { name="Rd2roxygen"; version="1.6"; sha256="0y0vh1dfflh8lrgrdj9wfmwh70ywd9kiia49f09h849mv1ln1z60"; depends=[roxygen2 formatR]; };
+Rd2roxygen = derive { name="Rd2roxygen"; version="1.6"; sha256="0y0vh1dfflh8lrgrdj9wfmwh70ywd9kiia49f09h849mv1ln1z60"; depends=[formatR roxygen2]; };
 Rdistance = derive { name="Rdistance"; version="1.2.2"; sha256="0njfcgcaw8vkvayd102wd5cdp1ai9ghqhi8zsijv6iifxs6yvwq9"; depends=[]; };
-Rdpack = derive { name="Rdpack"; version="0.4-14"; sha256="19vscr9l63c074n76b6a6jbl956sphjhz0d50yiwp3cvqf28yssf"; depends=[gbRd bibtex]; };
+Rdpack = derive { name="Rdpack"; version="0.4-14"; sha256="19vscr9l63c074n76b6a6jbl956sphjhz0d50yiwp3cvqf28yssf"; depends=[bibtex gbRd]; };
 Rdsdp = derive { name="Rdsdp"; version="1.0.2"; sha256="0rpy3897dargrfrn6qd5m1j6i1pvfk2qa3cny0iacqkgqbg8a4wx"; depends=[]; };
 Rdsm = derive { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; };
 ReCiPa = derive { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; };
-ReacTran = derive { name="ReacTran"; version="1.4.2"; sha256="1yc0k3wgg4yb6cqmjkyl25sfkbfcfxi5ria106w5jyx7dr5lfvdi"; depends=[rootSolve deSolve shape]; };
-RealVAMS = derive { name="RealVAMS"; version="0.3-1"; sha256="04d4sc3lhlklx1y016rmh3x27m8caxlp53qn2ks5wz52w26pfdhn"; depends=[Matrix numDeriv Rcpp Rcpp RcppArmadillo]; };
-RecordLinkage = derive { name="RecordLinkage"; version="0.4-8"; sha256="0wjjrgmz7m11hhsw7dcg3745255xckdgrqp3xlqkyh2kzbyr9rp4"; depends=[DBI RSQLite ff ffbase e1071 rpart ada ipred evd data_table nnet xtable RSQLite]; };
+ReacTran = derive { name="ReacTran"; version="1.4.2"; sha256="1yc0k3wgg4yb6cqmjkyl25sfkbfcfxi5ria106w5jyx7dr5lfvdi"; depends=[deSolve rootSolve shape]; };
+RealVAMS = derive { name="RealVAMS"; version="0.3-1"; sha256="04d4sc3lhlklx1y016rmh3x27m8caxlp53qn2ks5wz52w26pfdhn"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
+RecordLinkage = derive { name="RecordLinkage"; version="0.4-8"; sha256="0wjjrgmz7m11hhsw7dcg3745255xckdgrqp3xlqkyh2kzbyr9rp4"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; };
 Records = derive { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; };
+RedditExtractoR = derive { name="RedditExtractoR"; version="1.0.0"; sha256="197zqivkk00ch6vgh9cdqwjwj6gjfbzrvc0cpra1zk8b3h4qx5na"; depends=[RJSONIO]; };
 RefFreeEWAS = derive { name="RefFreeEWAS"; version="1.3"; sha256="1cb1q2nki0d18ia4cmi1sp7qih9hv7g1jk1kyp7vya5gp572z3cd"; depends=[isva]; };
-RefManageR = derive { name="RefManageR"; version="0.8.63"; sha256="17gmdyaqg8swfhpa1n8h1rj7aamrgdcprf56vx643ivhih8kgdj4"; depends=[XML RCurl RJSONIO plyr bibtex lubridate stringr]; };
+RefManageR = derive { name="RefManageR"; version="0.8.63"; sha256="17gmdyaqg8swfhpa1n8h1rj7aamrgdcprf56vx643ivhih8kgdj4"; depends=[bibtex lubridate plyr RCurl RJSONIO stringr XML]; };
 RegClust = derive { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; };
 RegressionFactory = derive { name="RegressionFactory"; version="0.7.1"; sha256="1zx885x49ncp2cl1v8hxzc3r2njka9cjsadjykbvqp9pdbm4ga5l"; depends=[]; };
 RelValAnalysis = derive { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; };
 Reliability = derive { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; };
-ReliabilityTheory = derive { name="ReliabilityTheory"; version="0.1.4"; sha256="1faab4z3rp0xqc0s0rrkw4kxgyc332xz3sjaz1wd4p6kiydds2hi"; depends=[igraph sfsmisc combinat FRACTION mcmc PhaseType actuar HI]; };
+ReliabilityTheory = derive { name="ReliabilityTheory"; version="0.1.4"; sha256="1faab4z3rp0xqc0s0rrkw4kxgyc332xz3sjaz1wd4p6kiydds2hi"; depends=[actuar combinat FRACTION HI igraph mcmc PhaseType sfsmisc]; };
 Renext = derive { name="Renext"; version="2.1-10"; sha256="1c18v9xya73j8qnqvkb4fc7bfvzxnw904z5n9n9rgch70nrccqfn"; depends=[evd numDeriv]; };
 RenextGUI = derive { name="RenextGUI"; version="1.0-2"; sha256="0ghs8bwb6qdyvhghxvdy51cibylgm7bdbzgqsn1nbxam39yhvfv9"; depends=[gWidgets gWidgetstcltk Renext]; };
-Reol = derive { name="Reol"; version="1.55"; sha256="0147x3fvafc47zd2chgv3b40k480pcjpji8vm1d741i1p6ml448p"; depends=[XML RCurl ape]; };
-ReorderCluster = derive { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp Rcpp]; };
+Reol = derive { name="Reol"; version="1.55"; sha256="0147x3fvafc47zd2chgv3b40k480pcjpji8vm1d741i1p6ml448p"; depends=[ape RCurl XML]; };
+ReorderCluster = derive { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp]; };
 RepeatedHighDim = derive { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; };
 ReporteRs = derive { name="ReporteRs"; version="0.7.8"; sha256="1gzsdrkmz2g59m2653xfcl4d6zs010hzcjxr6sk26dhxj11alqgr"; depends=[ReporteRsjars rJava]; };
 ReporteRsjars = derive { name="ReporteRsjars"; version="0.0.2"; sha256="1abvgzxipg0cgiy26z14i99qydzqva6j2v7pnrxapysg7ml5cnjc"; depends=[rJava]; };
 ResistorArray = derive { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; };
 ResourceSelection = derive { name="ResourceSelection"; version="0.2-4"; sha256="01r1w03paazyix5jjxww89falba1qfiqcznx79a6fmsiv8gm2x5w"; depends=[]; };
-RevEcoR = derive { name="RevEcoR"; version="0.99.2"; sha256="100sman51vvwg5xkypmksyyjqdb6g858z29vn7x4kvly8ncw4hfd"; depends=[Matrix igraph XML stringr magrittr gtools plyr]; };
-Rfacebook = derive { name="Rfacebook"; version="0.5"; sha256="0cl4s815i4yxp805j8nhqmva31imbd1xp3yxgi53qwjhagh4i57a"; depends=[httr rjson httpuv]; };
+RevEcoR = derive { name="RevEcoR"; version="0.99.2"; sha256="100sman51vvwg5xkypmksyyjqdb6g858z29vn7x4kvly8ncw4hfd"; depends=[gtools igraph magrittr Matrix plyr stringr XML]; };
+Rfacebook = derive { name="Rfacebook"; version="0.5"; sha256="0cl4s815i4yxp805j8nhqmva31imbd1xp3yxgi53qwjhagh4i57a"; depends=[httpuv httr rjson]; };
 Rfit = derive { name="Rfit"; version="0.21"; sha256="129z5ivwfxbh3rfwk98jnm6ibq5z9z3r9mhy9gv61jfr4ig78dcn"; depends=[quantreg]; };
 Rglpk = derive { name="Rglpk"; version="0.6-0"; sha256="0g0s63skabr0yqk5s9p66p77z8v3pr3hbnirbgdddlvkpphi08xx"; depends=[slam]; };
 RgoogleMaps = derive { name="RgoogleMaps"; version="1.2.0.7"; sha256="04k7h8hgxvgsccdiysbblplwjvn8m7g8h3anzdlxmmjaamd8l9lw"; depends=[png RJSONIO]; };
@@ -1846,63 +1854,63 @@ Rivivc = derive { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z
 Rjpstatdb = derive { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88wfpqn09y1xrkingfkm3z9jsi2bwrnrjc2iv"; depends=[RCurl XML]; };
 Rlab = derive { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; };
 Rlabkey = derive { name="Rlabkey"; version="2.1.127"; sha256="1bacl4ax9bgn27180hgh6gr4y0bwl3q4y18mc0cyb06yagzci5d9"; depends=[RCurl rjson]; };
-Rlibeemd = derive { name="Rlibeemd"; version="1.3.2"; sha256="0db6x2cry011ymmfy1pxgdyjdn6l93d8wmixp59r51yij2s775xq"; depends=[Rcpp Rcpp]; };
-Rlinkedin = derive { name="Rlinkedin"; version="0.1"; sha256="0w30zv4a842vckk4yqsh8hhkdz2gy650a0x29aacp77p9y79g9yn"; depends=[httr XML httpuv]; };
-Rmalschains = derive { name="Rmalschains"; version="0.2-2"; sha256="1ki3igj78sk4kk1cvbzrgzjdvw6kbdb7dmqglh6ws2nmr5b6a7fx"; depends=[Rcpp Rcpp]; };
+Rlibeemd = derive { name="Rlibeemd"; version="1.3.2"; sha256="0db6x2cry011ymmfy1pxgdyjdn6l93d8wmixp59r51yij2s775xq"; depends=[Rcpp]; };
+Rlinkedin = derive { name="Rlinkedin"; version="0.1"; sha256="0w30zv4a842vckk4yqsh8hhkdz2gy650a0x29aacp77p9y79g9yn"; depends=[httpuv httr XML]; };
+Rmalschains = derive { name="Rmalschains"; version="0.2-2"; sha256="1ki3igj78sk4kk1cvbzrgzjdvw6kbdb7dmqglh6ws2nmr5b6a7fx"; depends=[Rcpp]; };
 Rmisc = derive { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; };
-Rmixmod = derive { name="Rmixmod"; version="2.0.2"; sha256="1qv6zymkgsbplrq4aa87lvcsv75dssj8qqq2h9665v31jsgx84lr"; depends=[Rcpp Rcpp]; };
-RmixmodCombi = derive { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rmixmod Rcpp]; };
-Rmonkey = derive { name="Rmonkey"; version="0.2.11"; sha256="0dfn38ni06k0q7a10ilb3169ffc71mizf25jfiqmbmqw08az8bhf"; depends=[RCurl httr jsonlite plyr]; };
-Rmosek = derive { name="Rmosek"; version="1.2.5.1"; sha256="0zggv699s93i9g98qjs4ci2nprgfkzq45lpzgrbhldsxiflf27gz"; depends=[Matrix Matrix]; };
+Rmixmod = derive { name="Rmixmod"; version="2.0.2"; sha256="1qv6zymkgsbplrq4aa87lvcsv75dssj8qqq2h9665v31jsgx84lr"; depends=[Rcpp]; };
+RmixmodCombi = derive { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rcpp Rmixmod]; };
+Rmonkey = derive { name="Rmonkey"; version="0.2.11"; sha256="0dfn38ni06k0q7a10ilb3169ffc71mizf25jfiqmbmqw08az8bhf"; depends=[httr jsonlite plyr RCurl]; };
+Rmosek = derive { name="Rmosek"; version="1.2.5.1"; sha256="0zggv699s93i9g98qjs4ci2nprgfkzq45lpzgrbhldsxiflf27gz"; depends=[Matrix]; };
 Rmpfr = derive { name="Rmpfr"; version="0.5-7"; sha256="0bqjs65wlnpq95smnnwpqjrqgwda412z2qbyafa8jw6972lmsyq9"; depends=[gmp]; };
 Rmpi = derive { name="Rmpi"; version="0.6-5"; sha256="0i9z3c45jyxy86yh3f2nja5miv5dbnipm7fpm751i7qh630acykc"; depends=[]; };
-RnavGraph = derive { name="RnavGraph"; version="0.1.8"; sha256="1fwzfy41gdr1aw1wg6dw04mxwwpp5s9x2inxyq3bc9s8bm1rlxih"; depends=[scagnostics rgl]; };
+RnavGraph = derive { name="RnavGraph"; version="0.1.8"; sha256="1fwzfy41gdr1aw1wg6dw04mxwwpp5s9x2inxyq3bc9s8bm1rlxih"; depends=[graph rgl scagnostics]; };
 RnavGraphImageData = derive { name="RnavGraphImageData"; version="0.0.3"; sha256="1mrh0p2ckczw4xr1kfmcf0ri2h2fhp7fmf8sn2h1capmm12i1q8f"; depends=[]; };
-RobAStBase = derive { name="RobAStBase"; version="0.9"; sha256="1428xaplcjq6r0migbaqncfj0iz8hzzfabmabm167p44wa2bwbwh"; depends=[rrcov distr distrEx distrMod RandVar]; };
-RobLox = derive { name="RobLox"; version="0.9"; sha256="1ws6bkzvg1y1cwmls71das0lih6gncx5w3ncd2siznapd4n44p69"; depends=[distrMod RobAStBase lattice RColorBrewer RandVar distr]; };
-RobLoxBioC = derive { name="RobLoxBioC"; version="0.9"; sha256="0ia7vn8x8whyp8kl7mpwd6fd0yv0y3pb1mppnh2329x7xdvcs5j4"; depends=[RobLox lattice RColorBrewer distr]; };
-RobPer = derive { name="RobPer"; version="1.2.1"; sha256="1impcp2yfxxh439a70s2gqwfng6cgi123y20fd01b84jkp9gx3hi"; depends=[robustbase quantreg BB rgenoud]; };
+RobAStBase = derive { name="RobAStBase"; version="0.9"; sha256="1428xaplcjq6r0migbaqncfj0iz8hzzfabmabm167p44wa2bwbwh"; depends=[distr distrEx distrMod RandVar rrcov]; };
+RobLox = derive { name="RobLox"; version="0.9"; sha256="1ws6bkzvg1y1cwmls71das0lih6gncx5w3ncd2siznapd4n44p69"; depends=[Biobase distr distrMod lattice RandVar RColorBrewer RobAStBase]; };
+RobLoxBioC = derive { name="RobLoxBioC"; version="0.9"; sha256="0ia7vn8x8whyp8kl7mpwd6fd0yv0y3pb1mppnh2329x7xdvcs5j4"; depends=[affy beadarray Biobase BiocGenerics distr lattice RColorBrewer RobLox]; };
+RobPer = derive { name="RobPer"; version="1.2.1"; sha256="1impcp2yfxxh439a70s2gqwfng6cgi123y20fd01b84jkp9gx3hi"; depends=[BB quantreg rgenoud robustbase]; };
 RobRSVD = derive { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; };
 RobRex = derive { name="RobRex"; version="0.9"; sha256="0ii539mjq462n1lbnyv3whl8b1agvhvlz31wwyz911gb40isl639"; depends=[ROptRegTS]; };
 RobustAFT = derive { name="RobustAFT"; version="1.3"; sha256="0cxyvq75bwhjh3qzfj6ynmy8mby6yjy4r851sx80b8ls6rv4cf3z"; depends=[robustbase survival]; };
-RobustEM = derive { name="RobustEM"; version="1.0"; sha256="1li9r3bk7zhpxljgqvr2zila8nb05nasvlzqlswwgi9443i740zi"; depends=[mvtnorm e1071 ggplot2 ellipse doParallel foreach]; };
+RobustEM = derive { name="RobustEM"; version="1.0"; sha256="1li9r3bk7zhpxljgqvr2zila8nb05nasvlzqlswwgi9443i740zi"; depends=[doParallel e1071 ellipse foreach ggplot2 mvtnorm]; };
 RobustRankAggreg = derive { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; };
-RockFab = derive { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[rgl]; };
+RockFab = derive { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[EBImage rgl]; };
 Rook = derive { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; };
 RootsExtremaInflections = derive { name="RootsExtremaInflections"; version="1.0"; sha256="1vcbjxx1yfla71fmmf5w8dqp0vqw93dxsjsvz0vj28bfqmkmh554"; depends=[]; };
-Rothermel = derive { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[GA ftsa]; };
+Rothermel = derive { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[ftsa GA]; };
 RoughSetKnowledgeReduction = derive { name="RoughSetKnowledgeReduction"; version="0.1"; sha256="0zn6y2rp78vay9zwijpzhjpyq1gmcsa13m9fcsxkd1p2c8g5rbmf"; depends=[]; };
-RoughSets = derive { name="RoughSets"; version="1.2-1"; sha256="06bykfd26qdll0xadvvp0lljcibg613xi02gq5q8x3h0l9qa4c2x"; depends=[Rcpp Rcpp]; };
+RoughSets = derive { name="RoughSets"; version="1.2-1"; sha256="06bykfd26qdll0xadvvp0lljcibg613xi02gq5q8x3h0l9qa4c2x"; depends=[Rcpp]; };
 Rpdb = derive { name="Rpdb"; version="2.2"; sha256="0gf6qab05a3ky8skbbjiadizi1gs4pcw3zp25qj5gn82lb6382pd"; depends=[rgl]; };
 Rphylip = derive { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; };
-Rphylopars = derive { name="Rphylopars"; version="0.1.1"; sha256="04qd6zzgjgrfnv3ffv3jzlcl4ilfb67fxza49qq4rzinxc2s392b"; depends=[ape Rcpp doBy geiger phylolm phytools mvnmle Rcpp RcppArmadillo]; };
+Rphylopars = derive { name="Rphylopars"; version="0.1.1"; sha256="04qd6zzgjgrfnv3ffv3jzlcl4ilfb67fxza49qq4rzinxc2s392b"; depends=[ape doBy geiger mvnmle phylolm phytools Rcpp RcppArmadillo]; };
 Rpoppler = derive { name="Rpoppler"; version="0.0-1"; sha256="01zsbm538yhwm1cyz5j6x2ngz05yqj16yxyvyxqhn6jp8d0885jh"; depends=[]; };
-Rquake = derive { name="Rquake"; version="2.3-1"; sha256="0xb8j76jjv6k3r8nzjxdddic4rq1yj7qsh85asl38qwj7483cyc4"; depends=[RPMG RSEIS GEOmap MBA minpack_lm rgl cda]; };
+Rquake = derive { name="Rquake"; version="2.3-1"; sha256="0xb8j76jjv6k3r8nzjxdddic4rq1yj7qsh85asl38qwj7483cyc4"; depends=[cda GEOmap MBA minpack_lm rgl RPMG RSEIS]; };
 Rramas = derive { name="Rramas"; version="0.1-4"; sha256="191rm2ylvf3ffc9i4wpjvfbsinmw7s1m0wcq24j4qs4fxg8qqzyq"; depends=[diagram]; };
 Rrdrand = derive { name="Rrdrand"; version="0.1-14"; sha256="18ry07pi9iwskbxcimvp91fgpvrlaf44z0hp7k90dnyaa8qpbwjx"; depends=[]; };
-Rsampletrees = derive { name="Rsampletrees"; version="0.1"; sha256="02wh99nxlhyrivr655825nqcl3w0mvppnmvc9yrkdbkjw0l1zsjd"; depends=[haplo_stats ape]; };
+Rsampletrees = derive { name="Rsampletrees"; version="0.1"; sha256="02wh99nxlhyrivr655825nqcl3w0mvppnmvc9yrkdbkjw0l1zsjd"; depends=[ape haplo_stats]; };
 Rserve = derive { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5bm5ig09xam8zlqv63n9wf36v3kdmpn"; depends=[]; };
-RsimMosaic = derive { name="RsimMosaic"; version="1.0.2"; sha256="0d5z5dffi2prz0r31x08c8gw83448bhkma5mzcmrdlg6kx5y7dp8"; depends=[jpeg fields RANN]; };
+RsimMosaic = derive { name="RsimMosaic"; version="1.0.2"; sha256="0d5z5dffi2prz0r31x08c8gw83448bhkma5mzcmrdlg6kx5y7dp8"; depends=[fields jpeg RANN]; };
 Rsolnp = derive { name="Rsolnp"; version="1.15"; sha256="10w9gd1l62r638sh00fbgcpinsyyanfrqjdskrpk7z70fnyvwqm2"; depends=[truncnorm]; };
 Rsomoclu = derive { name="Rsomoclu"; version="1.4.1"; sha256="0yr0nsm2b7wg1x57db9zclqnqqbmhyax9vgw13ynqirq2ysxxsg6"; depends=[Rcpp]; };
-Rssa = derive { name="Rssa"; version="0.13"; sha256="1prcivlwxky4h33ybky7n3wpn4vj1wm898ifsrhs1j9ywla1m2zf"; depends=[svd forecast lattice]; };
+Rssa = derive { name="Rssa"; version="0.13"; sha256="1prcivlwxky4h33ybky7n3wpn4vj1wm898ifsrhs1j9ywla1m2zf"; depends=[forecast lattice svd]; };
 Rsundials = derive { name="Rsundials"; version="1.6"; sha256="0vrvxsznbclgls4jljc59lyli6cw9k1a3wapfrs6xbkqi8865iif"; depends=[]; };
 Rsymphony = derive { name="Rsymphony"; version="0.1-20"; sha256="10l3z9b51c8xsdfnscwn6g868xn84pfw3dlyj3vrsw3vs7qbi0gl"; depends=[]; };
-Rtsne = derive { name="Rtsne"; version="0.10"; sha256="14270gg0fp3imq9rafqj56ld56kzby7yyf5rg9z0wlimm7s72hy5"; depends=[Rcpp Rcpp]; };
+Rtsne = derive { name="Rtsne"; version="0.10"; sha256="14270gg0fp3imq9rafqj56ld56kzby7yyf5rg9z0wlimm7s72hy5"; depends=[Rcpp]; };
 Rttf2pt1 = derive { name="Rttf2pt1"; version="1.3.3"; sha256="16bnhrg86rzi4g4zf235m1g8amyhcwxpw0wgcxynfiinm2fl4y1n"; depends=[]; };
 Rtts = derive { name="Rtts"; version="0.3.1"; sha256="1zgrkj4y7267d1n8iw1q3pgf2lmmklkslf5211kl7v788zxqr9c5"; depends=[RCurl]; };
-Ruchardet = derive { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp Rcpp]; };
+Ruchardet = derive { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp]; };
 Runiversal = derive { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; };
 Runuran = derive { name="Runuran"; version="0.21.0"; sha256="1p33z9h2zj6fx42rlq6yajd6lwvzy4a1a5gs67dz5k1zbza8avw0"; depends=[]; };
-RunuranGUI = derive { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[Runuran rvgtest gWidgets gWidgetsRGtk2 cairoDevice]; };
-Rvcg = derive { name="Rvcg"; version="0.11"; sha256="0id732zhncy6x47qdbyddcm3f8l1r4j53ya4qj3zcf81q15dadw0"; depends=[Rcpp Rcpp RcppEigen]; };
+RunuranGUI = derive { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[cairoDevice gWidgets gWidgetsRGtk2 Runuran rvgtest]; };
+Rvcg = derive { name="Rvcg"; version="0.11"; sha256="0id732zhncy6x47qdbyddcm3f8l1r4j53ya4qj3zcf81q15dadw0"; depends=[Rcpp RcppEigen]; };
 Rvmmin = derive { name="Rvmmin"; version="2013-11.12"; sha256="1ljzydvizbbv0jv5lbfinypkixfy7zsvplisb866f8w45amd152a"; depends=[optextras]; };
 Rwave = derive { name="Rwave"; version="2.4"; sha256="1ynj6higx0j6iv033lx8h3i9hlg5b53nl2gv6fwjny4ygm8b1mjm"; depends=[]; };
 Rwinsteps = derive { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; };
-RxCEcolInf = derive { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[MASS MCMCpack mvtnorm lattice]; };
-RxnSim = derive { name="RxnSim"; version="1.0.1"; sha256="17agz3kw7pj4mpl25y1n8l9lqfj63wn70rqpdkcpnx7j6s6933vx"; depends=[rJava fingerprint data_table rcdk]; };
+RxCEcolInf = derive { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[lattice MASS MCMCpack mvtnorm]; };
+RxnSim = derive { name="RxnSim"; version="1.0.1"; sha256="17agz3kw7pj4mpl25y1n8l9lqfj63wn70rqpdkcpnx7j6s6933vx"; depends=[data_table fingerprint rcdk rJava]; };
 Ryacas = derive { name="Ryacas"; version="0.2-12.1"; sha256="18dpnr6kj0a8f2jcbj9f6ahd0mg7bm1qm8dcs1wh8kmjl3klr1y8"; depends=[XML]; };
-Rz = derive { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign memisc psych ggplot2 RGtk2 formatR]; };
+Rz = derive { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign formatR ggplot2 memisc psych RGtk2]; };
 SAENET = derive { name="SAENET"; version="1.1"; sha256="13mfmmjqbkdr6j48smdlqvb83dkb34kx3i16gx0gmmafk3avdaxx"; depends=[autoencoder neuralnet]; };
 SAFD = derive { name="SAFD"; version="0.4"; sha256="1zbja8bgva2j24ks4m14hbf4s0n674lj89nfxkkmwrljzsmjrjhv"; depends=[]; };
 SAM = derive { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; };
@@ -1914,27 +1922,27 @@ SAScii = derive { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3sv
 SASmixed = derive { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; };
 SAVE = derive { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; };
 SBRect = derive { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; };
-SBSA = derive { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp Rcpp RcppArmadillo]; };
+SBSA = derive { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp RcppArmadillo]; };
 SCBmeanfd = derive { name="SCBmeanfd"; version="1.1"; sha256="0pcyrnzlnlyn4v3lyv7pv01v2lh4vig1x4x8g98lpccpi1bimd4z"; depends=[boot KernSmooth]; };
 SCEPtER = derive { name="SCEPtER"; version="0.2-1"; sha256="19sphwcsj2z05dvpmz7vgxykzyghkfn79jwqvk6d66daman679mv"; depends=[MASS]; };
 SCEPtERbinary = derive { name="SCEPtERbinary"; version="0.1-1"; sha256="0rab0widfndx94dn1nchhs06q0d57vq2n3xy79p130l9rgp9v489"; depends=[MASS SCEPtER]; };
-SCGLR = derive { name="SCGLR"; version="2.0.2"; sha256="1g8vgmlsc88g00rf3pxqszli4r9v3r4md6vq5lxa7j9wn28c7rp1"; depends=[Matrix Formula expm ggplot2 pROC]; };
+SCGLR = derive { name="SCGLR"; version="2.0.2"; sha256="1g8vgmlsc88g00rf3pxqszli4r9v3r4md6vq5lxa7j9wn28c7rp1"; depends=[expm Formula ggplot2 Matrix pROC]; };
 SCI = derive { name="SCI"; version="1.0-1"; sha256="1m5a15a4n0zjqykq38pyw9133g2ih4ykbgak8c8khq8p0isnl8qb"; depends=[fitdistrplus lmomco]; };
 SCMA = derive { name="SCMA"; version="1.1.1"; sha256="1jbx4fkixm31zdlfx65xxdzpf77dzpqazy1l6qyjz7q672s2vidd"; depends=[]; };
 SCORER2 = derive { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; };
 SCRT = derive { name="SCRT"; version="1.1.1"; sha256="02sndf5r1y27pgkw4wd9bhz7jhzk3cv78hp3xl222phjznjf2lzi"; depends=[]; };
 SCVA = derive { name="SCVA"; version="1.1.1"; sha256="1n660pml288ia4x18kjbrcx0n1cnasdxhl6pymh1nzxm4ai2hinc"; depends=[]; };
 SCperf = derive { name="SCperf"; version="1.0"; sha256="1v9l7d9lil2gy5bw6i7bzc24808m063xaw2spl005j0a9rh4ag41"; depends=[]; };
-SDD = derive { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc sm tseries rpanel rgl]; };
-SDDE = derive { name="SDDE"; version="1.0.0"; sha256="1vd96w6qjy7ak85gj1c255fb0ifaffp79k6swqnvskvkq2cc524m"; depends=[igraph doParallel foreach iterators]; };
+SDD = derive { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc rgl rpanel sm tseries]; };
+SDDE = derive { name="SDDE"; version="1.0.0"; sha256="1vd96w6qjy7ak85gj1c255fb0ifaffp79k6swqnvskvkq2cc524m"; depends=[doParallel foreach igraph iterators]; };
 SDMTools = derive { name="SDMTools"; version="1.1-221"; sha256="1kacrpamshv7wz83yn45sfbw4m9c44xrrngzcklnwx8gcxx2knm6"; depends=[R_utils]; };
 SDaA = derive { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; };
 SE_IGE = derive { name="SE.IGE"; version="1.0"; sha256="0gx3kdsdl3rjms6fxabxz51z84r9mcy4934l2g43ifrxbyphnias"; depends=[]; };
 SEAsic = derive { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; };
 SECP = derive { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; };
 SEER2R = derive { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; };
-SEERaBomb = derive { name="SEERaBomb"; version="2015.1"; sha256="1pab5088pjhsx0lwh2xgm7hril0qpb0jprwm61d8c30bgrrqxni9"; depends=[RSQLite LaF dplyr rgl XLConnect Rcpp reshape2 mgcv DBI Rcpp]; };
-SEL = derive { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[quadprog lattice]; };
+SEERaBomb = derive { name="SEERaBomb"; version="2015.1"; sha256="1pab5088pjhsx0lwh2xgm7hril0qpb0jprwm61d8c30bgrrqxni9"; depends=[DBI dplyr LaF mgcv Rcpp reshape2 rgl RSQLite XLConnect]; };
+SEL = derive { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[lattice quadprog]; };
 SEMID = derive { name="SEMID"; version="0.1"; sha256="1bxdjdyqlvxz339jdgw90qi6kvfhjdmga38vhfl3ldlxfv2s9gfk"; depends=[igraph]; };
 SEMModComp = derive { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; };
 SETPath = derive { name="SETPath"; version="1.0"; sha256="1dpgmki0dhph13h1fd3mbf308746wccgfz5g5gdm7bwbjnmjzd98"; depends=[]; };
@@ -1944,43 +1952,43 @@ SGL = derive { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7
 SGP = derive { name="SGP"; version="1.2-0.0"; sha256="0v4ljhvfrvl6izprcrw8w36474fjz0v1kpcsg0sx32359amd3zxz"; depends=[Cairo colorspace data_table doParallel foreach gridBase iterators jsonlite plyr quantreg reshape2 RSQLite sn]; };
 SGPdata = derive { name="SGPdata"; version="8.0-0.0"; sha256="0g25s2wcj47394fm16maygafnynizma3mgb3r65b5p9c27swk4v8"; depends=[]; };
 SHIP = derive { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; };
-SID = derive { name="SID"; version="1.0"; sha256="1446zy4rqbw0lpyhnhyd06dzv238dxpdxgmsk34hqv7g3j7q5h1w"; depends=[pcalg igraph Matrix]; };
+SID = derive { name="SID"; version="1.0"; sha256="1446zy4rqbw0lpyhnhyd06dzv238dxpdxgmsk34hqv7g3j7q5h1w"; depends=[igraph Matrix pcalg RBGL]; };
 SII = derive { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; };
-SIMMS = derive { name="SIMMS"; version="1.0.1"; sha256="08kl9kzxqmzlacs8jfys0w7rngx93mlj4k1g8wzg4hmnlmic8l3k"; depends=[survival MASS glmnet]; };
+SIMMS = derive { name="SIMMS"; version="1.0.1"; sha256="08kl9kzxqmzlacs8jfys0w7rngx93mlj4k1g8wzg4hmnlmic8l3k"; depends=[glmnet MASS survival]; };
 SIN = derive { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; };
-SINGLE = derive { name="SINGLE"; version="1.3"; sha256="0wd7jzys51rnwr5rhf2llpygqxydjrv0dill19v8sz9w0madkil4"; depends=[flsa igraph dse Matrix]; };
+SINGLE = derive { name="SINGLE"; version="1.3"; sha256="0wd7jzys51rnwr5rhf2llpygqxydjrv0dill19v8sz9w0madkil4"; depends=[dse flsa igraph Matrix]; };
 SIS = derive { name="SIS"; version="0.7-5"; sha256="197zf4s4f5wm8sl9h5vxwywmml7n05fwqlxbldn6wkpxix7gx0xm"; depends=[glmnet ncvreg survival]; };
-SKAT = derive { name="SKAT"; version="1.0.7"; sha256="0f8ln37871qsnxfcfcrnq91krcgwd85cz6g0p78px4yg3g4jwsn3"; depends=[]; };
+SKAT = derive { name="SKAT"; version="1.0.9"; sha256="030fhs25kmnkzx98mbl8xa5j8jzb821jmw9j675kkyi41w3dzk8c"; depends=[]; };
 SLC = derive { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; };
 SLHD = derive { name="SLHD"; version="2.1-1"; sha256="0y3ilxd0phmks8zkmpgw7p5zrkwq4k95h976cwk58pavvhfwj9kb"; depends=[]; };
-SLOPE = derive { name="SLOPE"; version="0.1.1"; sha256="1v58jcd60i7hhs8wirdfqr1sskdrynnwcnqsr3q19vgnj4x1dn8f"; depends=[Rcpp Rcpp]; };
+SLOPE = derive { name="SLOPE"; version="0.1.1"; sha256="1v58jcd60i7hhs8wirdfqr1sskdrynnwcnqsr3q19vgnj4x1dn8f"; depends=[Rcpp]; };
 SMC = derive { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; };
 SMCP = derive { name="SMCP"; version="1.1.3"; sha256="0ksx2ibz849vhrz2px9p7z8hlgvspz7kxhadvhk5mhkfbhrnpdf0"; depends=[]; };
 SMCRM = derive { name="SMCRM"; version="0.0-3"; sha256="1x06w00sdijhg5h1s61q4ym5wgk97pw9md6api7if2cxjv7h5zcy"; depends=[]; };
-SMFI5 = derive { name="SMFI5"; version="1.0"; sha256="10qp33l0dig00y9gfhpzqig6dbkjw76ch9pfq64dn4xrdkpq1kx5"; depends=[ggplot2 reshape corpcor]; };
+SMFI5 = derive { name="SMFI5"; version="1.0"; sha256="10qp33l0dig00y9gfhpzqig6dbkjw76ch9pfq64dn4xrdkpq1kx5"; depends=[corpcor ggplot2 reshape]; };
 SMIR = derive { name="SMIR"; version="0.02"; sha256="02q8m5m8lcfrpi78p3kajkps8wiir3jwyqc54j9vfx8aj6mk1v71"; depends=[]; };
-SML = derive { name="SML"; version="0.1"; sha256="0pdj7321wy50v5l23hknlm30kp8cfgn072pbbifyp8qzmk0hyd8h"; depends=[glmnet Matrix lattice]; };
+SML = derive { name="SML"; version="0.1"; sha256="0pdj7321wy50v5l23hknlm30kp8cfgn072pbbifyp8qzmk0hyd8h"; depends=[glmnet lattice Matrix]; };
 SMNCensReg = derive { name="SMNCensReg"; version="3.0"; sha256="06542jacy74mw6ic0i1ml09pn45sll96bya7dqja6bg9yp0m6bvr"; depends=[Matrix PerformanceAnalytics]; };
 SMPracticals = derive { name="SMPracticals"; version="1.4-2"; sha256="0apmkmsv2fqmxpgq08n9k9dvcknj74s4cpp0myjcd6kibb7g9slq"; depends=[ellipse MASS nlme survival]; };
 SMR = derive { name="SMR"; version="2.0.1"; sha256="0qy56fmismcjklpf29ic2gi1g8ajdjpxsl0akb9cqzyisyf641ia"; depends=[]; };
 SMVar = derive { name="SMVar"; version="1.3.3"; sha256="17wr4lixy3p32gr4jq02d7zsr88yrbddjsvynzdsdrwbxf4mwqhp"; depends=[]; };
 SNFtool = derive { name="SNFtool"; version="2.2"; sha256="1d84ybsi91mr3ma4jzmr9606hg1q00yg0dn50vkjnyda50igcb1c"; depends=[heatmap_plus]; };
 SNPMClust = derive { name="SNPMClust"; version="1.0"; sha256="1vyag8axrl888qhjsbv7g84hzfsnvxh5ccdcdriamy50c2chkji8"; depends=[MASS mclust]; };
-SNPassoc = derive { name="SNPassoc"; version="1.9-2"; sha256="113byj8zbg6xyxb1qzm76sqfyk3fap0sd90691zzm1x2pbfnb3mh"; depends=[haplo_stats survival mvtnorm]; };
-SNPmaxsel = derive { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[mvtnorm combinat]; };
-SNPtools = derive { name="SNPtools"; version="1.1"; sha256="0l29kiqz4048x7amxx1qzkaw2xnd6lpdsdp5nq3rck9amx2hw64a"; depends=[]; };
+SNPassoc = derive { name="SNPassoc"; version="1.9-2"; sha256="113byj8zbg6xyxb1qzm76sqfyk3fap0sd90691zzm1x2pbfnb3mh"; depends=[haplo_stats mvtnorm survival]; };
+SNPmaxsel = derive { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[combinat mvtnorm]; };
+SNPtools = derive { name="SNPtools"; version="1.1"; sha256="0l29kiqz4048x7amxx1qzkaw2xnd6lpdsdp5nq3rck9amx2hw64a"; depends=[Biostrings GenomicRanges IRanges Rsamtools]; };
 SNSequate = derive { name="SNSequate"; version="1.1-1"; sha256="1jgpjws5apysp55pwy3x8mbzy4zjvv39anp6j2x4lgczh5nf49b6"; depends=[magic]; };
 SOAR = derive { name="SOAR"; version="0.99-11"; sha256="1n38gx5sxpkqfkk4y6vpp6g19b8bs5bisni9wn6311s0csizp86m"; depends=[]; };
-SOD = derive { name="SOD"; version="1.0"; sha256="0f0rh1qsjzxb3zzr440kvl6fnnj7dvc5apdzs5hpf6xrlfg863pk"; depends=[Rcpp Rcpp]; };
-SODC = derive { name="SODC"; version="1.0"; sha256="18s4rcp5dzchvwrzzbfhbs3x91zlg1rymjarxjk5i429mfrn0krx"; depends=[magic ppls psych MASS]; };
+SOD = derive { name="SOD"; version="1.0"; sha256="0f0rh1qsjzxb3zzr440kvl6fnnj7dvc5apdzs5hpf6xrlfg863pk"; depends=[Rcpp]; };
+SODC = derive { name="SODC"; version="1.0"; sha256="18s4rcp5dzchvwrzzbfhbs3x91zlg1rymjarxjk5i429mfrn0krx"; depends=[magic MASS ppls psych]; };
 SOLOMON = derive { name="SOLOMON"; version="1.0-1"; sha256="0z91wsrgdir25ks4dnirzsg4f1ngal7n40235m3w43j6y6dhkqrc"; depends=[]; };
-SOMbrero = derive { name="SOMbrero"; version="1.0"; sha256="10d2fakjkfk3p4dfh0cw1sp7i95f7lqdvz8b7x7sc5pg82dpffy7"; depends=[knitr igraph wordcloud scatterplot3d RColorBrewer shiny]; };
+SOMbrero = derive { name="SOMbrero"; version="1.0"; sha256="10d2fakjkfk3p4dfh0cw1sp7i95f7lqdvz8b7x7sc5pg82dpffy7"; depends=[igraph knitr RColorBrewer scatterplot3d shiny wordcloud]; };
 SOPIE = derive { name="SOPIE"; version="1.4"; sha256="0kmzw0plr5bhc65g7aggf8g1i38aw9v2fw7x4vgdgb7zi5qmn5mx"; depends=[circular]; };
 SOR = derive { name="SOR"; version="0.22"; sha256="1njwlsvdnwxidvwrx18h6h4dhrsdgy0fikkhn20pip42qqwd96gz"; depends=[Matrix]; };
 SOUP = derive { name="SOUP"; version="1.1"; sha256="0k8nlvl4681cz07xjazprcc0jhknfa5hgr7w1qxxmgrp3sprr8r4"; depends=[tensor]; };
 SPA3G = derive { name="SPA3G"; version="1.0"; sha256="15f38imwqn1zifym2821q7xysvws9vhlif4g16w0pnvk0wlhyb92"; depends=[]; };
 SPACECAP = derive { name="SPACECAP"; version="1.1.0"; sha256="11szdq7sqr8ldwz7apbf1dv5mh43rbyb7dkivms58s5623xrq3sm"; depends=[coda]; };
-SPARQL = derive { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[XML RCurl]; };
+SPARQL = derive { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[RCurl XML]; };
 SPAr = derive { name="SPAr"; version="0.1"; sha256="068jlsvaxx80ih6n86286m2r75cvy6w0m51vpj4gfclhh38py4p4"; depends=[]; };
 SPECIES = derive { name="SPECIES"; version="1.0"; sha256="0p45llf2wjr467bqr4pbljfank9zz3fm42yl3i0r3jbkxgz0rjf0"; depends=[]; };
 SPEI = derive { name="SPEI"; version="1.6"; sha256="0mbz4nydnzwypfbi1d9fjy09x6133q096qbfrc913dbidzkvfpqv"; depends=[lmomco]; };
@@ -1988,38 +1996,38 @@ SPIAssay = derive { name="SPIAssay"; version="1.0.0"; sha256="1rwa2iicwdm7z8khln
 SPIn = derive { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; };
 SPMS = derive { name="SPMS"; version="2.0"; sha256="150kb4gjiksp3kc7p9j5zqc4955rq4fb27as71z89h23mkswz5r5"; depends=[Matrix]; };
 SPODT = derive { name="SPODT"; version="0.9-1"; sha256="01yq429a4s63855bwpn2mqjj2k3cz4187kfpi7n7qqdpdvmxz109"; depends=[rgdal sp tree]; };
-SPOT = derive { name="SPOT"; version="1.0.5543"; sha256="0y8rj0wxy8sdk7si9k11i4pb96vp1q78h48ihs4r7d383zykk827"; depends=[rpart emoa twiddler rgl AlgDesign randomForest rsm MASS mco]; };
-SPREDA = derive { name="SPREDA"; version="1.0"; sha256="1dyqsra899fd1nbk1b7vkw8gs455c6pbcvzw84q9iri77186xqhv"; depends=[survival nlme]; };
+SPOT = derive { name="SPOT"; version="1.0.5543"; sha256="0y8rj0wxy8sdk7si9k11i4pb96vp1q78h48ihs4r7d383zykk827"; depends=[AlgDesign emoa MASS mco randomForest rgl rpart rsm twiddler]; };
+SPREDA = derive { name="SPREDA"; version="1.0"; sha256="1dyqsra899fd1nbk1b7vkw8gs455c6pbcvzw84q9iri77186xqhv"; depends=[nlme survival]; };
 SPRT = derive { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; };
 SPSL = derive { name="SPSL"; version="0.1-8"; sha256="1jg1nfhz8qml1wwqa4d0w7vkdmbgdy5xlfqx0h2pdw2z8iij3xxc"; depends=[]; };
 SPmlficmcm = derive { name="SPmlficmcm"; version="1.3"; sha256="0igybzc6fx6yd8xq06909vml4zwwzm4sl5xpds1292lgv3y3zdgb"; depends=[nleqslv]; };
-SQDA = derive { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[PDSCE mvtnorm]; };
+SQDA = derive { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[limma mvtnorm PDSCE]; };
 SQN = derive { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; };
 SQUAREM = derive { name="SQUAREM"; version="2014.8-1"; sha256="17fn37da4zslbfq5h4f3dfwyw1dxj5y2rgly3vjl2c4k5bnwxxqw"; depends=[]; };
 SRCS = derive { name="SRCS"; version="1.0"; sha256="0aha9fqdigvsx8dvck4y2yb8c7v58rivz50z0xwi0bhwzdddx52f"; depends=[]; };
-SRRS = derive { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[tcltk2 gtools]; };
-SSDforR = derive { name="SSDforR"; version="1.4.9"; sha256="1ka6zy77ml4kccfqjszvijh9dvlhzcp7fhsd2zsirsn6sdz0wrp0"; depends=[psych TTR MASS TSA]; };
-SSN = derive { name="SSN"; version="1.1.5"; sha256="1iymq6zzs3zfbjkz7h2ss8djdzvw2b3n68qazvw8vnrnkq3iyzry"; depends=[RSQLite sp MASS igraph maptools lattice BH]; };
+SRRS = derive { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; };
+SSDforR = derive { name="SSDforR"; version="1.4.9"; sha256="1ka6zy77ml4kccfqjszvijh9dvlhzcp7fhsd2zsirsn6sdz0wrp0"; depends=[MASS psych TSA TTR]; };
+SSN = derive { name="SSN"; version="1.1.5"; sha256="1iymq6zzs3zfbjkz7h2ss8djdzvw2b3n68qazvw8vnrnkq3iyzry"; depends=[BH igraph lattice maptools MASS RSQLite sp]; };
 SSrat = derive { name="SSrat"; version="1.0"; sha256="1qpsdfdngsgxx3mqgn4avl65w4v5v4jwsh1nnxzfn9iqi9mg4bhi"; depends=[plyr sna]; };
 SSsimple = derive { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; };
-STAR = derive { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[survival mgcv R2HTML gss codetools]; };
-STEPCAM = derive { name="STEPCAM"; version="1.0"; sha256="0lgikdj0mghz5hjm3rlrnnddjhvf9cmm0hwklbdyl3h816gq1jci"; depends=[vcd FD gtools MASS]; };
+STAR = derive { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[codetools gss mgcv R2HTML survival]; };
+STEPCAM = derive { name="STEPCAM"; version="1.0"; sha256="0lgikdj0mghz5hjm3rlrnnddjhvf9cmm0hwklbdyl3h816gq1jci"; depends=[FD gtools MASS vcd]; };
 STPGA = derive { name="STPGA"; version="1.0"; sha256="1kqxzjrxf194n006dr3h5kprb4l7qy8bgm2n6251p0sswpvr70j1"; depends=[]; };
 SUE = derive { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; };
 SVMMaj = derive { name="SVMMaj"; version="0.2-2"; sha256="01njc7drq01r3364081dv9gn37vrql52zbrb60gd559f3jshqx3m"; depends=[kernlab MASS]; };
-SVMMatch = derive { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp Rcpp RcppArmadillo]; };
+SVMMatch = derive { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; };
 SWATmodel = derive { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; };
-SWMPr = derive { name="SWMPr"; version="2.0.0"; sha256="1gnjz5p76xpw4rpish4d7vr3r9f880mw5fb27bnc6b408vy0781d"; depends=[ggplot2 zoo data_table httr ggmap gridExtra maptools oce dplyr reshape2 tictoc tidyr wq XML]; };
-SYNCSA = derive { name="SYNCSA"; version="1.3.2"; sha256="1m057lhfaf0n35rs3sipia04qgkp04hv7wf7rvnr7bhzic9f4vg3"; depends=[vegan mice FD]; };
+SWMPr = derive { name="SWMPr"; version="2.0.0"; sha256="1gnjz5p76xpw4rpish4d7vr3r9f880mw5fb27bnc6b408vy0781d"; depends=[data_table dplyr ggmap ggplot2 gridExtra httr maptools oce reshape2 tictoc tidyr wq XML zoo]; };
+SYNCSA = derive { name="SYNCSA"; version="1.3.2"; sha256="1m057lhfaf0n35rs3sipia04qgkp04hv7wf7rvnr7bhzic9f4vg3"; depends=[FD mice vegan]; };
 Sabermetrics = derive { name="Sabermetrics"; version="1.0"; sha256="1x35h1ffy6jnsak13vb1kcsbmh3hpass19gqic8grk0c3g1dvv6y"; depends=[]; };
 Sample_Size = derive { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; };
 SampleSizeMeans = derive { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; };
 SampleSizeProportions = derive { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; };
 SamplerCompare = derive { name="SamplerCompare"; version="1.2.6"; sha256="1n94fp6frawlbxcnvi0v6lhgs3yyc47lj1r46y3jg6zb9z3va3fa"; depends=[mvtnorm]; };
 SamplingStrata = derive { name="SamplingStrata"; version="1.0-3"; sha256="16nrcv5hbbvn4rgckzagi84i7h49bd878mnpknlzmzr5ykzywsay"; depends=[]; };
-Scale = derive { name="Scale"; version="1.0.4"; sha256="1fa3840kji34qpbw6mxfavk8wq0vq0vx2w6ya71idbkxnvwc3y06"; depends=[psych Hmisc MASS]; };
-SciViews = derive { name="SciViews"; version="0.9-5"; sha256="199waafpn0ndg7szwfhw2jlgcx1f0pv7j0vix2vzz60knwm698xb"; depends=[MASS ellipse]; };
-SciencesPo = derive { name="SciencesPo"; version="1.02.12"; sha256="0v947xjfwyidl2fa6i7drvv9vnskz06kq4rmz46qzns7g0lwfjnq"; depends=[ggplot2 foreign MASS data_table lubridate xtable]; };
+Scale = derive { name="Scale"; version="1.0.4"; sha256="1fa3840kji34qpbw6mxfavk8wq0vq0vx2w6ya71idbkxnvwc3y06"; depends=[Hmisc MASS psych]; };
+SciViews = derive { name="SciViews"; version="0.9-5"; sha256="199waafpn0ndg7szwfhw2jlgcx1f0pv7j0vix2vzz60knwm698xb"; depends=[ellipse MASS]; };
+SciencesPo = derive { name="SciencesPo"; version="1.02.12"; sha256="0v947xjfwyidl2fa6i7drvv9vnskz06kq4rmz46qzns7g0lwfjnq"; depends=[data_table foreign ggplot2 lubridate MASS xtable]; };
 ScoreGGUM = derive { name="ScoreGGUM"; version="1.0"; sha256="0f7sjfr3a8b8y1n9lrwyiyyljls3rbz84d9s93psi2fnmjj0kvgw"; depends=[]; };
 ScottKnott = derive { name="ScottKnott"; version="1.2-5"; sha256="1ywwhdghcy30mp2nhsk2yhgb37nrdmb9yan5vvzsg66bchc3xgll"; depends=[]; };
 ScrabbleScore = derive { name="ScrabbleScore"; version="1.0"; sha256="19vgaxnhvqsbllqxfbnhnar2j4g0fkxi7rfsmkks2bd2py81x04m"; depends=[]; };
@@ -2028,30 +2036,30 @@ SearchTrees = derive { name="SearchTrees"; version="0.5.2"; sha256="11p81x1klkmx
 SegCorr = derive { name="SegCorr"; version="1.0"; sha256="1fyrnhbifvc2y2n6r0zg5yq0qcjzws62ynwqgc0mbvzax3n82dhm"; depends=[cghseg]; };
 Segmentor3IsBack = derive { name="Segmentor3IsBack"; version="1.8"; sha256="00m6fvx6s8mz477c8b4dmgdh52jf6jx1lcqzf84l90b1xw93qnv7"; depends=[]; };
 Sejong = derive { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; };
-SeleMix = derive { name="SeleMix"; version="0.9.1"; sha256="04gxgja35qs4k66iil014dzgl5bkx0qhr9w4v7qpmwv2bb07jwz3"; depends=[mvtnorm Ecdat xtable]; };
-SelvarMix = derive { name="SelvarMix"; version="1.0"; sha256="0yysmf854xz5l0lf2x0hw0qxbrdhgfrcx5ggw8n4pjfv553p38ni"; depends=[Rcpp glasso Rmixmod Rcpp RcppArmadillo]; };
+SeleMix = derive { name="SeleMix"; version="0.9.1"; sha256="04gxgja35qs4k66iil014dzgl5bkx0qhr9w4v7qpmwv2bb07jwz3"; depends=[Ecdat mvtnorm xtable]; };
+SelvarMix = derive { name="SelvarMix"; version="1.0"; sha256="0yysmf854xz5l0lf2x0hw0qxbrdhgfrcx5ggw8n4pjfv553p38ni"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; };
 SemiCompRisks = derive { name="SemiCompRisks"; version="2.0"; sha256="0in3pv66nhb0ar4xfxskvf24c7bqkr9ik069a4nynwnc3idpsq32"; depends=[]; };
-SemiMarkov = derive { name="SemiMarkov"; version="1.4.1"; sha256="048hmbcmhqkvqw8nbzm0136mc9w7b27jy8q9r3rvc3banh854d1m"; depends=[numDeriv MASS Rsolnp]; };
-SemiPar = derive { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[MASS cluster nlme]; };
-SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.4"; sha256="038k5vvgrk20n2cbji8qrp9nkg0ck5dcbxnd7wc5hy1l780g4k5g"; depends=[mgcv magic VGAM survey trust VineCopula]; };
-SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.2"; sha256="1k9xmby8hy4k0qn7pjj0rypxj4iqb206ixv92bz7ga0q8zd0nxbr"; depends=[copula mgcv mvtnorm gamlss_dist magic trust VGAM Matrix]; };
+SemiMarkov = derive { name="SemiMarkov"; version="1.4.1"; sha256="048hmbcmhqkvqw8nbzm0136mc9w7b27jy8q9r3rvc3banh854d1m"; depends=[MASS numDeriv Rsolnp]; };
+SemiPar = derive { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[cluster MASS nlme]; };
+SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.4"; sha256="038k5vvgrk20n2cbji8qrp9nkg0ck5dcbxnd7wc5hy1l780g4k5g"; depends=[magic mgcv survey trust VGAM VineCopula]; };
+SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.2"; sha256="1k9xmby8hy4k0qn7pjj0rypxj4iqb206ixv92bz7ga0q8zd0nxbr"; depends=[copula gamlss_dist magic Matrix mgcv mvtnorm trust VGAM]; };
 SenSrivastava = derive { name="SenSrivastava"; version="2012-04-0"; sha256="0ki0kl18cj8lkad6q48piyvslkirs8y5rnfa8bvgjxsisxg2ahhp"; depends=[]; };
 SensitivityCaseControl = derive { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; };
-SensoMineR = derive { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29bbpssl0rqag3w8im4nm9964lr7r012y5wdqhx"; depends=[FactoMineR cluster KernSmooth]; };
-SensusR = derive { name="SensusR"; version="1.0"; sha256="1b5yrb3iiijr7x0r4ga5dlx6yqqk4bvmh1377655s6c7j36sn1xd"; depends=[jsonlite lubridate rworldmap plyr sp]; };
-SeqFeatR = derive { name="SeqFeatR"; version="0.1.7"; sha256="195pkpk9sh99v01mk827axsynwaccygx19i1x0h0ma7bsqlmw1qc"; depends=[tcltk2 plotrix ape plyr phangorn calibrate ggplot2]; };
-SeqGrapheR = derive { name="SeqGrapheR"; version="0.4.8.3"; sha256="03plwa3sc1pg34p1szbz3d0z8y53w7iqm7qn9q6fj72rsnk5spxc"; depends=[igraph rggobi gWidgets gWidgetsRGtk2 cairoDevice]; };
+SensoMineR = derive { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29bbpssl0rqag3w8im4nm9964lr7r012y5wdqhx"; depends=[cluster FactoMineR KernSmooth]; };
+SensusR = derive { name="SensusR"; version="1.0"; sha256="1b5yrb3iiijr7x0r4ga5dlx6yqqk4bvmh1377655s6c7j36sn1xd"; depends=[jsonlite lubridate plyr rworldmap sp]; };
+SeqFeatR = derive { name="SeqFeatR"; version="0.1.7"; sha256="195pkpk9sh99v01mk827axsynwaccygx19i1x0h0ma7bsqlmw1qc"; depends=[ape Biostrings calibrate ggplot2 phangorn plotrix plyr qvalue tcltk2 widgetTools]; };
+SeqGrapheR = derive { name="SeqGrapheR"; version="0.4.8.3"; sha256="03plwa3sc1pg34p1szbz3d0z8y53w7iqm7qn9q6fj72rsnk5spxc"; depends=[Biostrings cairoDevice gWidgets gWidgetsRGtk2 igraph rggobi]; };
 Sequential = derive { name="Sequential"; version="2.0"; sha256="0dndy4a1waxgwj43gq1zb6cqwvrafcr729hhr7qckw5crcmm0iph"; depends=[]; };
-SetMethods = derive { name="SetMethods"; version="1.0"; sha256="0zizvrzyk01w4ncazvifmjm4h5zrpsf6n68n11sc8f5kzny9ia48"; depends=[lattice betareg lattice betareg]; };
+SetMethods = derive { name="SetMethods"; version="1.0"; sha256="0zizvrzyk01w4ncazvifmjm4h5zrpsf6n68n11sc8f5kzny9ia48"; depends=[betareg lattice]; };
 ShapeSelectForest = derive { name="ShapeSelectForest"; version="1.0"; sha256="0jy40aql33xwl4s7y2s3wb6yig4vr6ly6fhz7hn2d59b8428p04q"; depends=[coneproj raster rgdal]; };
 SharpeR = derive { name="SharpeR"; version="0.1501"; sha256="138faypgrfph48wvz600l20ypqzxdir4q43bl9s7vndysya3vsnl"; depends=[matrixcalc]; };
 ShrinkCovMat = derive { name="ShrinkCovMat"; version="1.1.0"; sha256="1v2rr97wz5521cjy41j5vdqq29xd7696pc1rzw4angsfjrq3fnh4"; depends=[]; };
 SiZer = derive { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; };
 SightabilityModel = derive { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; };
-Sim_DiffProc = derive { name="Sim.DiffProc"; version="2.9"; sha256="1cq168ga4p70hgx7rsm9rvam8b0wvjivqp2nsprk39i864j9sr91"; depends=[scatterplot3d rgl]; };
-SimComp = derive { name="SimComp"; version="2.2"; sha256="07gmlbwvv07kq3z7gq2jxlank011c0cqh8zwwp4pzf061d3gjdm6"; depends=[mvtnorm multcomp mratios]; };
+Sim_DiffProc = derive { name="Sim.DiffProc"; version="2.9"; sha256="1cq168ga4p70hgx7rsm9rvam8b0wvjivqp2nsprk39i864j9sr91"; depends=[rgl scatterplot3d]; };
+SimComp = derive { name="SimComp"; version="2.2"; sha256="07gmlbwvv07kq3z7gq2jxlank011c0cqh8zwwp4pzf061d3gjdm6"; depends=[mratios multcomp mvtnorm]; };
 SimCorMultRes = derive { name="SimCorMultRes"; version="1.3.0"; sha256="0r3d91x9srzsa0g6p3jlzplpsrprbg11kv6fsbbh47pz02fvi8mc"; depends=[evd]; };
-SimRAD = derive { name="SimRAD"; version="0.95"; sha256="1l4y39d05h5f2q609i73p07h093r9yca11dqw5iq1d7skwxcvf01"; depends=[]; };
+SimRAD = derive { name="SimRAD"; version="0.95"; sha256="1l4y39d05h5f2q609i73p07h093r9yca11dqw5iq1d7skwxcvf01"; depends=[Biostrings ShortRead]; };
 SimSeq = derive { name="SimSeq"; version="1.3.0"; sha256="0xkiiwk52sv8vivd4qsvzgjbw8q0csy0d45diym2mc9aq9nhf5dq"; depends=[fdrtool]; };
 SimilarityMeasures = derive { name="SimilarityMeasures"; version="1.4"; sha256="1w4klcln4hy9vcik9csg7b3b8kk4raxgckwfrhqg089d80xbqsxj"; depends=[]; };
 Simile = derive { name="Simile"; version="1.3.3"; sha256="1izyjp18m1inac3svkf59z3lddrv44m7pdkhisgkr987xs8gdch4"; depends=[]; };
@@ -2060,35 +2068,35 @@ SimplicialCubature = derive { name="SimplicialCubature"; version="1.0"; sha256="
 Simpsons = derive { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; };
 SimuChemPC = derive { name="SimuChemPC"; version="1.3"; sha256="06sxknaykikcgbw7qbbw1risg0sbaisb68vhfd7cl6sg0327dznk"; depends=[rcdk]; };
 SimultAnR = derive { name="SimultAnR"; version="1.1"; sha256="0jvmxwmbnx14h27b576dg9mw3c2z0w3m82f51f25zd1darcl06bj"; depends=[]; };
-SixSigma = derive { name="SixSigma"; version="0.8-1"; sha256="15jdr10a7a6wv50vz9y6qcrbhnddl8zh4j4d48xrarrqbjy6l4p7"; depends=[qcc lattice ggplot2 reshape2 nortest testthat]; };
+SixSigma = derive { name="SixSigma"; version="0.8-1"; sha256="15jdr10a7a6wv50vz9y6qcrbhnddl8zh4j4d48xrarrqbjy6l4p7"; depends=[ggplot2 lattice nortest qcc reshape2 testthat]; };
 SkewHyperbolic = derive { name="SkewHyperbolic"; version="0.3-2"; sha256="10vilra5z884xinqkvk7ryi4nsq5zxlyn5qh23lsajba3b3qwhaw"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
-Skillings_Mack = derive { name="Skillings.Mack"; version="1.0-2"; sha256="1spf77ix9d264r126hnrjm7z8fw19v1bk5pqhqcf6lm93zlcgh8i"; depends=[MASS matrixcalc gtools]; };
+Skillings_Mack = derive { name="Skillings.Mack"; version="1.0-2"; sha256="1spf77ix9d264r126hnrjm7z8fw19v1bk5pqhqcf6lm93zlcgh8i"; depends=[gtools MASS matrixcalc]; };
 Sleuth2 = derive { name="Sleuth2"; version="1.0-7"; sha256="1zav2g1yqc6bvzap4r5xwy9abkdj8iswivj5y2lylc25nkxwcswg"; depends=[]; };
 Sleuth3 = derive { name="Sleuth3"; version="0.1-8"; sha256="02qbigg75ckyg65620bv88ggs4d9z3vivxd5j76x8hzg5lkk31yj"; depends=[]; };
-SmarterPoland = derive { name="SmarterPoland"; version="1.5"; sha256="0qa31z0wgl8bgc3ihgbfdmp1ang3wyy4qylj81zxh1yn2zxx5fr0"; depends=[rjson ggplot2 httr htmltools]; };
+SmarterPoland = derive { name="SmarterPoland"; version="1.5"; sha256="0qa31z0wgl8bgc3ihgbfdmp1ang3wyy4qylj81zxh1yn2zxx5fr0"; depends=[ggplot2 htmltools httr rjson]; };
 SmithWilsonYieldCurve = derive { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; };
 SmoothHazard = derive { name="SmoothHazard"; version="1.2.3"; sha256="0p6hnq782d5qwmq6ak2rmbzx84lrsy02lr303gg3y0vln5i2myyn"; depends=[lava mvtnorm prodlim]; };
 SnowballC = derive { name="SnowballC"; version="0.5.1"; sha256="0kbg33hy6m2hv9jspyx6naqmk2q6h2zmvvczjmkwqvlhzlj0c5s4"; depends=[]; };
 SoDA = derive { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; };
-SocialMediaMineR = derive { name="SocialMediaMineR"; version="0.1"; sha256="113nyjncl5yi61hz8i7k60b3f0f9a5vyrd3s72nbmc44cnvr8fci"; depends=[RCurl jsonlite httr]; };
-SocialNetworks = derive { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp Rcpp]; };
+SocialMediaMineR = derive { name="SocialMediaMineR"; version="0.1"; sha256="113nyjncl5yi61hz8i7k60b3f0f9a5vyrd3s72nbmc44cnvr8fci"; depends=[httr jsonlite RCurl]; };
+SocialNetworks = derive { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp]; };
 SocialPosition = derive { name="SocialPosition"; version="1.0"; sha256="0aqx6raskybxwavl7366klhagclq0zlklr5sd0l9h6cz530h3azq"; depends=[]; };
 SoftClustering = derive { name="SoftClustering"; version="1.1502"; sha256="1pgg9mjpfw55m3ny726vx5wl8gwsdkrxv8xzgmy3aqdlwzhh4bwz"; depends=[]; };
 SoilR = derive { name="SoilR"; version="1.1-23"; sha256="1cryypgnbck5hvkc2izrd8r10q2b97f2p1s46x4dk8p099gck5wg"; depends=[deSolve RUnit]; };
-SortableHTMLTables = derive { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[testthat brew]; };
+SortableHTMLTables = derive { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[brew testthat]; };
 SoundexBR = derive { name="SoundexBR"; version="1.1"; sha256="1rhmwbf7687lgwwx1qldljb9j7qj7hcaypawlchmys61ny9500wl"; depends=[]; };
 SparseGrid = derive { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; };
 SparseM = derive { name="SparseM"; version="1.6"; sha256="1296snm3481259xwhj97vffwjb2v8367ivf2g5amd4pzqzwx6p1k"; depends=[]; };
-SparseTSCGM = derive { name="SparseTSCGM"; version="2.1.1"; sha256="0xr3l049kssi7k074wggvc96p2zlca076j2hwpwpmna42xl3dmqv"; depends=[glasso longitudinal flare MASS mvtnorm network abind]; };
-SpatPCA = derive { name="SpatPCA"; version="1.0.0.2"; sha256="0f8byi4zhrjj8fdka93r22kbjjqgkx3p06a65sppgvq65v8lff0l"; depends=[fields Rcpp Rcpp RcppArmadillo]; };
-SpatialEpi = derive { name="SpatialEpi"; version="1.2.1"; sha256="02mvahpbrlcnxmf272fk46wykv9s2lcjqd5yhd80dfs78qjwly77"; depends=[sp Rcpp MASS maptools spdep Rcpp RcppArmadillo]; };
-SpatialExtremes = derive { name="SpatialExtremes"; version="2.0-2"; sha256="0ywybk9gziy2hzb1ks88q4rzs3lzzy6y3fzhja2s39ngg195hi6l"; depends=[maps fields]; };
+SparseTSCGM = derive { name="SparseTSCGM"; version="2.1.1"; sha256="0xr3l049kssi7k074wggvc96p2zlca076j2hwpwpmna42xl3dmqv"; depends=[abind flare glasso longitudinal MASS mvtnorm network]; };
+SpatPCA = derive { name="SpatPCA"; version="1.0.0.2"; sha256="0f8byi4zhrjj8fdka93r22kbjjqgkx3p06a65sppgvq65v8lff0l"; depends=[fields Rcpp RcppArmadillo]; };
+SpatialEpi = derive { name="SpatialEpi"; version="1.2.1"; sha256="02mvahpbrlcnxmf272fk46wykv9s2lcjqd5yhd80dfs78qjwly77"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; };
+SpatialExtremes = derive { name="SpatialExtremes"; version="2.0-2"; sha256="0ywybk9gziy2hzb1ks88q4rzs3lzzy6y3fzhja2s39ngg195hi6l"; depends=[fields maps]; };
 SpatialNP = derive { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; };
 SpatialPack = derive { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; };
 SpatialPosition = derive { name="SpatialPosition"; version="0.9"; sha256="0w09yrn32pis4w3hkbghkgwpyy7mnnzzkhhp289xl738lymv207a"; depends=[raster sp]; };
-SpatialTools = derive { name="SpatialTools"; version="0.5.8"; sha256="18zchr8bfjqdr9j6vh6365mhrj2n0ns1ixvmas5s0ppiim59jl7j"; depends=[spBayes Rcpp Rcpp RcppArmadillo]; };
-SpatialVx = derive { name="SpatialVx"; version="0.2-4"; sha256="0nm3mripq1fiqn7ydl854azwpl1sdh2ls8gj1k432xsvi02m05y3"; depends=[spatstat fields smoothie smatr turboEM distillery maps boot CircStats fastcluster waveslim]; };
-SpatioTemporal = derive { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[Matrix MASS]; };
+SpatialTools = derive { name="SpatialTools"; version="0.5.8"; sha256="18zchr8bfjqdr9j6vh6365mhrj2n0ns1ixvmas5s0ppiim59jl7j"; depends=[Rcpp RcppArmadillo spBayes]; };
+SpatialVx = derive { name="SpatialVx"; version="0.2-4"; sha256="0nm3mripq1fiqn7ydl854azwpl1sdh2ls8gj1k432xsvi02m05y3"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
+SpatioTemporal = derive { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[MASS Matrix]; };
 SpecHelpers = derive { name="SpecHelpers"; version="0.1.6"; sha256="1h14a1rsk7x5qafn4hcpmannkdf2wdphkzaa3b6nbb9jqjs1szi0"; depends=[gsubfn]; };
 SpeciesMix = derive { name="SpeciesMix"; version="0.3.1"; sha256="0wl15k00d7n9pmnp1kr28p05z4vrziprcdndw77kwkcgv51cvllk"; depends=[MASS numDeriv]; };
 SpecsVerification = derive { name="SpecsVerification"; version="0.3-0"; sha256="19vr4xlx9gx0ph6k2kf59bpbhmzncm1mmzz7ld3pjc7k4jfba3np"; depends=[]; };
@@ -2096,99 +2104,100 @@ SpherWave = derive { name="SpherWave"; version="1.2.2"; sha256="1wd9pql97m1zl0ax
 SphericalCubature = derive { name="SphericalCubature"; version="1.0.1"; sha256="0j592zvs07yc6amahlxgdw0k1vqr89gvcq22vcwzkx62igvlf6pv"; depends=[cubature]; };
 SphericalK = derive { name="SphericalK"; version="1.1"; sha256="18h1k0gy65jvzfpsda0ifv3nn3pvzx5ifllxbwh0my6w75c4biqn"; depends=[]; };
 SportsAnalytics = derive { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; };
-StAMPP = derive { name="StAMPP"; version="1.3"; sha256="1igf6arp7glihkv60zc7c0zwfqaf5kcm2d1xr856fj194zxww9ad"; depends=[pegas doParallel foreach adegenet]; };
-StMoMo = derive { name="StMoMo"; version="0.2.0"; sha256="1pddlwf3kns9fzmqddfak6bir0mc1i4bv9cswj5pbhpavsd08r1c"; depends=[gnm forecast MASS rootSolve fanplot reshape2 fields]; };
-StMoSim = derive { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[RcppParallel Rcpp RcppParallel Rcpp]; };
-StableEstim = derive { name="StableEstim"; version="2.0"; sha256="080khfix88j4656hmdy9l0xpbk9zzw7z7d7f6yvwsbalk3ag18i5"; depends=[Matrix stabledist testthat numDeriv xtable fBasics MASS]; };
-Stack = derive { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[plyr stringr ff ffbase bit]; };
+StAMPP = derive { name="StAMPP"; version="1.3"; sha256="1igf6arp7glihkv60zc7c0zwfqaf5kcm2d1xr856fj194zxww9ad"; depends=[adegenet doParallel foreach pegas]; };
+StMoMo = derive { name="StMoMo"; version="0.2.0"; sha256="1pddlwf3kns9fzmqddfak6bir0mc1i4bv9cswj5pbhpavsd08r1c"; depends=[fanplot fields forecast gnm MASS reshape2 rootSolve]; };
+StMoSim = derive { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[Rcpp RcppParallel]; };
+StableEstim = derive { name="StableEstim"; version="2.0"; sha256="080khfix88j4656hmdy9l0xpbk9zzw7z7d7f6yvwsbalk3ag18i5"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; };
+Stack = derive { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[bit ff ffbase plyr stringr]; };
 StanHeaders = derive { name="StanHeaders"; version="2.6.0-10"; sha256="0bw11myc16ddi1qhh8dcsf8dqg6dcp1wjbyrp5p98dcc1rym7kmg"; depends=[]; };
 StandardizeText = derive { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; };
 Stat2Data = derive { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; };
-StatDA = derive { name="StatDA"; version="1.6.9"; sha256="01bjygis14b3yfsfkjbvy0zlhjxysjf46cfcw8p4a4lwik3qp03b"; depends=[geoR sgeostat cluster e1071 MASS MBA mgcv rgl robustbase xtable]; };
+StatDA = derive { name="StatDA"; version="1.6.9"; sha256="01bjygis14b3yfsfkjbvy0zlhjxysjf46cfcw8p4a4lwik3qp03b"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat xtable]; };
 StatDataML = derive { name="StatDataML"; version="1.0-25"; sha256="05s9kbrjl2wsfccgav34b02m06q62r3iyjd0ndr6xcqlw9x2w2ya"; depends=[XML]; };
-StatMatch = derive { name="StatMatch"; version="1.2.3"; sha256="10y9xaclxrw65v3k9qwdm7lvvf1kxpssc9nx0f15m8xkw5hhm7pa"; depends=[proxy clue survey RANN lpSolve]; };
+StatMatch = derive { name="StatMatch"; version="1.2.3"; sha256="10y9xaclxrw65v3k9qwdm7lvvf1kxpssc9nx0f15m8xkw5hhm7pa"; depends=[clue lpSolve proxy RANN survey]; };
 StatMeasures = derive { name="StatMeasures"; version="1.0"; sha256="1bnbz803xx8kqhy1cx545b35si6f10za0mp5z82qfvd4kv9a9izz"; depends=[data_table]; };
-StatMethRank = derive { name="StatMethRank"; version="1.0"; sha256="0mcvwn1f3hylvyg46vigc5wnvhhig5v01ag3y9rap32v85f308zh"; depends=[MASS rjags pmr]; };
-StatRank = derive { name="StatRank"; version="0.0.4"; sha256="0s0jc4hvrry9a884fqfk3gp1w4ww5wif2kh3m0f22nn7qb49if9p"; depends=[truncdist plyr]; };
-Statomica = derive { name="Statomica"; version="1.0"; sha256="0x60n1d7wxfd013k6jjzvfi2mqgr52fd8ylk3yhm3907002jnh1g"; depends=[distr fBasics]; };
-Stem = derive { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[mvtnorm MASS]; };
-StereoMorph = derive { name="StereoMorph"; version="1.4"; sha256="0xar1vx05q6dbfs9jmdbj7cz6jfrckhd8cm2ml922xg4zxrg23cf"; depends=[bezier rjson shiny Rcpp jpeg tiff png Rcpp]; };
+StatMethRank = derive { name="StatMethRank"; version="1.0"; sha256="0mcvwn1f3hylvyg46vigc5wnvhhig5v01ag3y9rap32v85f308zh"; depends=[MASS pmr rjags]; };
+StatRank = derive { name="StatRank"; version="0.0.4"; sha256="0s0jc4hvrry9a884fqfk3gp1w4ww5wif2kh3m0f22nn7qb49if9p"; depends=[plyr truncdist]; };
+Statomica = derive { name="Statomica"; version="1.0"; sha256="0x60n1d7wxfd013k6jjzvfi2mqgr52fd8ylk3yhm3907002jnh1g"; depends=[Biobase distr fBasics multtest]; };
+Stem = derive { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; };
+StereoMorph = derive { name="StereoMorph"; version="1.4"; sha256="0xar1vx05q6dbfs9jmdbj7cz6jfrckhd8cm2ml922xg4zxrg23cf"; depends=[bezier jpeg png Rcpp rjson shiny tiff]; };
 Storm = derive { name="Storm"; version="1.2"; sha256="1fg8y9my9yp6px1gh43mr3m2s2z262mzq03pj52mqg3n186vk8z3"; depends=[permute rjson]; };
 StrainRanking = derive { name="StrainRanking"; version="1.1"; sha256="0q6k90if74320mrs2ccq2izynylr8zakciwbc2c6ms0v57aalwic"; depends=[]; };
-StratSel = derive { name="StratSel"; version="1.1"; sha256="0l08v71qmd170027y5vjnvgfm8kqvgaqrpms9msxhv8g5974kla8"; depends=[MASS memisc Formula mnormt]; };
-StreamMetabolism = derive { name="StreamMetabolism"; version="1.1.1"; sha256="1r9p6awf3a2d08w9rdlggkwlfhksn14xbhdhdnmxz79ym5mgdd8f"; depends=[zoo chron maptools]; };
+StratSel = derive { name="StratSel"; version="1.1"; sha256="0l08v71qmd170027y5vjnvgfm8kqvgaqrpms9msxhv8g5974kla8"; depends=[Formula MASS memisc mnormt]; };
+StreamMetabolism = derive { name="StreamMetabolism"; version="1.1.1"; sha256="1r9p6awf3a2d08w9rdlggkwlfhksn14xbhdhdnmxz79ym5mgdd8f"; depends=[chron maptools zoo]; };
 StressStrength = derive { name="StressStrength"; version="1.0.1"; sha256="15sgdisgz8zcq4i9z4zm7isr5ckyd7bk6yl1g7a5kngams282ipx"; depends=[]; };
 SubCultCon = derive { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; };
-SubLasso = derive { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet psych gplots]; };
-SubpathwayGMir = derive { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[XML igraph]; };
+SubLasso = derive { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet gplots psych]; };
+SubpathwayGMir = derive { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[igraph XML]; };
 Sunder = derive { name="Sunder"; version="0.0.4"; sha256="1na41nnscyc4v1qbwzfgqk503r39xxbi6f446pscrz3v0v121f1a"; depends=[mnormt]; };
 SunterSampling = derive { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; };
 SuperLearner = derive { name="SuperLearner"; version="2.0-15"; sha256="1sk45419awk8aahylmqbardx8lglx0d7hrwc0k2prnksk5r3549l"; depends=[nnls]; };
 SuppDists = derive { name="SuppDists"; version="1.1-9.1"; sha256="1jqsv1lzjblc7sdb4gh8pkww9ar174bpbjl7mmdi59fixymwz87s"; depends=[]; };
-Surrogate = derive { name="Surrogate"; version="0.1-61"; sha256="0jifjns0v22risy783a0s71v6sn165wn7w6a47sb7dsdimrvnn9d"; depends=[MASS nlme msm lme4 rgl lattice latticeExtra]; };
-SurvCorr = derive { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[survival fields]; };
+Surrogate = derive { name="Surrogate"; version="0.1-61"; sha256="0jifjns0v22risy783a0s71v6sn165wn7w6a47sb7dsdimrvnn9d"; depends=[lattice latticeExtra lme4 MASS msm nlme rgl]; };
+SurvCorr = derive { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields survival]; };
 SurvLong = derive { name="SurvLong"; version="1.0"; sha256="000ywg0sdk9kailiy7ckhq4mkaawl9hh88w6apj5khgpxsyj8aw3"; depends=[]; };
-SurvRegCensCov = derive { name="SurvRegCensCov"; version="1.3"; sha256="1sl17x984ww07aakz6dambn5kznw4hvj4b8ahy2r4mr6wf2dpg5a"; depends=[survival numDeriv]; };
+SurvRegCensCov = derive { name="SurvRegCensCov"; version="1.3"; sha256="1sl17x984ww07aakz6dambn5kznw4hvj4b8ahy2r4mr6wf2dpg5a"; depends=[numDeriv survival]; };
 Survgini = derive { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; };
-SvyNom = derive { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[survival rms Hmisc survey]; };
+SvyNom = derive { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[Hmisc rms survey survival]; };
 SweaveListingUtils = derive { name="SweaveListingUtils"; version="0.6.2"; sha256="0n15gkiil9rlb0dhnkfimhcs09av35b7qx79iba7bx3y7spvzaqy"; depends=[startupmsg]; };
 SwissAir = derive { name="SwissAir"; version="1.1.4"; sha256="1avc32q7nbwjkcbml7z05car6khv1ghcz3miw0krm8i53w032c6f"; depends=[]; };
 SyNet = derive { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; };
 SynchWave = derive { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; };
-SynergizeR = derive { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RJSONIO RCurl]; };
+SynergizeR = derive { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RCurl RJSONIO]; };
 Synth = derive { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
-TAM = derive { name="TAM"; version="1.7-1"; sha256="1zsgdilxh7j7ay74a5id7iwm0mz3vf1rcgw7fvclic1ndwwj68z3"; depends=[CDM MASS Rcpp mirt lavaan WrightMap tensor sfsmisc GPArotation psych mvtnorm msm lattice plyr Rcpp RcppArmadillo]; };
+TAM = derive { name="TAM"; version="1.7-1"; sha256="1zsgdilxh7j7ay74a5id7iwm0mz3vf1rcgw7fvclic1ndwwj68z3"; depends=[CDM GPArotation lattice lavaan MASS mirt msm mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc tensor WrightMap]; };
 TANOVA = derive { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; };
 TAQMNGR = derive { name="TAQMNGR"; version="2015.2-1"; sha256="0j7qb15xy4g4ff0cmyjyz4lsalaxxf6zdwbq49j3y80ld0pvwhbk"; depends=[Rcpp]; };
-TBEST = derive { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[signal fdrtool]; };
-TBSSurvival = derive { name="TBSSurvival"; version="1.2"; sha256="12ipgffympqjjg8l9gbich5pgz0pqr5g07b0il26rr721xiyxk5v"; depends=[normalp survival mcmc R_utils coda Rsolnp BMS]; };
+TBEST = derive { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[fdrtool signal]; };
+TBSSurvival = derive { name="TBSSurvival"; version="1.2"; sha256="12ipgffympqjjg8l9gbich5pgz0pqr5g07b0il26rr721xiyxk5v"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; };
 TDA = derive { name="TDA"; version="1.3"; sha256="1f9f5v8c0ynxz8p4kr9w08c4icf0840h7iay8k1ydh5zmr43d7lk"; depends=[FNN igraph scales]; };
 TDAmapper = derive { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; };
 TDCor = derive { name="TDCor"; version="0.1-1"; sha256="001rmwi2v4vy1b2d7wwvvca4xnkizz8dmys3q3xbjv7wrfxyvai8"; depends=[deSolve]; };
-TDD = derive { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[signal RSEIS pracma]; };
-TDMR = derive { name="TDMR"; version="1.3"; sha256="0bbd2an18ayxaxprsjqrybb877lkk74dpxbvbv7qdwc1ivqm8g96"; depends=[SPOT twiddler testit adabag]; };
+TDD = derive { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[pracma RSEIS signal]; };
+TDMR = derive { name="TDMR"; version="1.3"; sha256="0bbd2an18ayxaxprsjqrybb877lkk74dpxbvbv7qdwc1ivqm8g96"; depends=[adabag SPOT testit twiddler]; };
 TDboost = derive { name="TDboost"; version="1.1"; sha256="1pyqssqxkr9bwyz4h1l5isbb78asmvddy20vyxq8snxra2r06hbf"; depends=[lattice]; };
-TED = derive { name="TED"; version="1.1.1"; sha256="0nb2arx7c1m8ymnkmj3jwbcw23vhkr1f3vlym2hqs0pq0lnsl4g0"; depends=[foreach zoo fields animation geoR RcppArmadillo]; };
+TED = derive { name="TED"; version="1.1.1"; sha256="0nb2arx7c1m8ymnkmj3jwbcw23vhkr1f3vlym2hqs0pq0lnsl4g0"; depends=[animation fields foreach geoR RcppArmadillo zoo]; };
 TEEReg = derive { name="TEEReg"; version="1.0"; sha256="1xpr4m8yamifjx7njb7dyqv51rsbjym9c5avflf69r9sazf3n503"; depends=[]; };
 TEQR = derive { name="TEQR"; version="5.0-0"; sha256="04r26qzps7nnvs4s2xpvjf6q456wa29alhsds07xvyqhi972xhs6"; depends=[]; };
 TERAplusB = derive { name="TERAplusB"; version="1.0"; sha256="0mshx615awcf2arm39mgw2gzgpyn7a3f767484g7z4nqqlikwpgc"; depends=[]; };
 TESS = derive { name="TESS"; version="1.2.1"; sha256="15wrbbhrzj66j0z6xhnbf560qg0dzm1yqfbpmx070n3lsa2rdyij"; depends=[ape coda deSolve]; };
-TExPosition = derive { name="TExPosition"; version="2.6.10"; sha256="12rgijlclaipwjjiyng7nwilzixdy6lsvncigcg0vjydhgk97jn1"; depends=[prettyGraphs ExPosition]; };
+TExPosition = derive { name="TExPosition"; version="2.6.10"; sha256="12rgijlclaipwjjiyng7nwilzixdy6lsvncigcg0vjydhgk97jn1"; depends=[ExPosition prettyGraphs]; };
 TFDEA = derive { name="TFDEA"; version="0.9.8.3"; sha256="0qg4nhlqqj7hc8lg732zz8klbbp3yksnq8q8n4ml3jz8gadrpyj7"; depends=[lpSolveAPI]; };
-TFMPvalue = derive { name="TFMPvalue"; version="0.0.5"; sha256="13bfcwfiyl61cv2ma23fcmv2cvbsyzdbg2pl6l6zg39l6scxf9na"; depends=[Rcpp Rcpp]; };
+TFMPvalue = derive { name="TFMPvalue"; version="0.0.5"; sha256="13bfcwfiyl61cv2ma23fcmv2cvbsyzdbg2pl6l6zg39l6scxf9na"; depends=[Rcpp]; };
 TFX = derive { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; };
 TH_data = derive { name="TH.data"; version="1.0-6"; sha256="1kx6z8lj1l2vxi7vhx47sly65grjkm3wvrbr3nl52q1vdmy1xsgm"; depends=[]; };
-TIMP = derive { name="TIMP"; version="1.12.1"; sha256="06zjpa9j4sr62f2lspa75i7n8xcf4xdgxq2zjbzsx4f0p0nf5ymj"; depends=[fields vcd gplots colorspace gclus nnls deSolve minpack_lm MASS]; };
-TInPosition = derive { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[prettyGraphs TExPosition ExPosition InPosition]; };
-TKF = derive { name="TKF"; version="0.0.8"; sha256="1db87lwx26ayv1x2k8qd9dfr6j3jkvdl9ykisaxr42l6akqy21nr"; depends=[expm numDeriv ape phytools phangorn]; };
-TOC = derive { name="TOC"; version="0.0-2"; sha256="0zkwbjyi5dc6y0fzmwkbyrf32h0r5vhxxz67zjrhqc06vyasai8w"; depends=[raster bit rgdal]; };
+TIMP = derive { name="TIMP"; version="1.12.1"; sha256="06zjpa9j4sr62f2lspa75i7n8xcf4xdgxq2zjbzsx4f0p0nf5ymj"; depends=[colorspace deSolve fields gclus gplots MASS minpack_lm nnls vcd]; };
+TInPosition = derive { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[ExPosition InPosition prettyGraphs TExPosition]; };
+TKF = derive { name="TKF"; version="0.0.8"; sha256="1db87lwx26ayv1x2k8qd9dfr6j3jkvdl9ykisaxr42l6akqy21nr"; depends=[ape expm numDeriv phangorn phytools]; };
+TMDb = derive { name="TMDb"; version="1.0"; sha256="0bbcmsv7b3vvskhdjww03gbcgql44vsvyjz2fajy9w2vgkr6ga90"; depends=[httr jsonlite]; };
+TOC = derive { name="TOC"; version="0.0-2"; sha256="0zkwbjyi5dc6y0fzmwkbyrf32h0r5vhxxz67zjrhqc06vyasai8w"; depends=[bit raster rgdal]; };
 TPmsm = derive { name="TPmsm"; version="1.2.0"; sha256="1670b9g6sqlg5xk76x77cph1wzp44yp957sn8px5k7kkb1hgi0pl"; depends=[KernSmooth]; };
-TR8 = derive { name="TR8"; version="0.9.13"; sha256="07wrqwa5gf1l1y3b07mganr5xkzxdzrh6lrv7gf01m9b7bsz564m"; depends=[RCurl XML taxize plyr rappdirs gWidgets gWidgetstcltk gdata]; };
+TR8 = derive { name="TR8"; version="0.9.13"; sha256="07wrqwa5gf1l1y3b07mganr5xkzxdzrh6lrv7gf01m9b7bsz564m"; depends=[gdata gWidgets gWidgetstcltk plyr rappdirs RCurl taxize XML]; };
 TRAMPR = derive { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; };
 TRD = derive { name="TRD"; version="1.0"; sha256="1xj3ns9phiz4i70ky2p1q1cr3h6iq2i3dywnap6gqaq0fqmiq2fh"; depends=[Rlab]; };
-TROM = derive { name="TROM"; version="1.0"; sha256="1pr5n6bgjrn60f95395p2x8c2h1q3sx6a7448m0xi0a51wa016xp"; depends=[lattice openxlsx gtools RColorBrewer gplots]; };
-TRSbook = derive { name="TRSbook"; version="1.0.1"; sha256="1w2yl5pchw2vn9l3qnm1ra9mjy946i5xsxh5n5xdvrcj2kak50x5"; depends=[xtable RColorBrewer gdata IndependenceTests]; };
+TROM = derive { name="TROM"; version="1.0"; sha256="1pr5n6bgjrn60f95395p2x8c2h1q3sx6a7448m0xi0a51wa016xp"; depends=[AnnotationDbi gplots gtools lattice openxlsx RColorBrewer topGO]; };
+TRSbook = derive { name="TRSbook"; version="1.0.1"; sha256="1w2yl5pchw2vn9l3qnm1ra9mjy946i5xsxh5n5xdvrcj2kak50x5"; depends=[gdata IndependenceTests RColorBrewer xtable]; };
 TSA = derive { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx"; depends=[leaps locfit mgcv tseries]; };
 TSEN = derive { name="TSEN"; version="1.0"; sha256="1pn313g2ylbjc37rqcakd797vffnh7v0rgg1xl5wjyvcgmm5mxix"; depends=[ncdf]; };
 TSHRC = derive { name="TSHRC"; version="0.1-3"; sha256="18ygg7bqwg1pdqi52l1lf33gcd277895rlf5853yzh7ln2ivssmi"; depends=[]; };
-TSMySQL = derive { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[TSdbi DBI tframe TSsql RMySQL]; };
+TSMySQL = derive { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[DBI RMySQL tframe TSdbi TSsql]; };
 TSP = derive { name="TSP"; version="1.1-1"; sha256="0wwzmkgfy55dba9jl3mpbyqciia71px0x0s6708k8kz9vr03m2zs"; depends=[foreach]; };
-TSPostgreSQL = derive { name="TSPostgreSQL"; version="2015.4-1"; sha256="11201zpbrva6gwc9hg8pynadrps6d8pb3syzba9nyjpv2ck6x3ry"; depends=[TSdbi DBI tframe tframePlus TSsql RPostgreSQL]; };
+TSPostgreSQL = derive { name="TSPostgreSQL"; version="2015.4-1"; sha256="11201zpbrva6gwc9hg8pynadrps6d8pb3syzba9nyjpv2ck6x3ry"; depends=[DBI RPostgreSQL tframe tframePlus TSdbi TSsql]; };
 TSPred = derive { name="TSPred"; version="2.0"; sha256="0p4msk12n8jc1ss8p7m15rxd0ip7v83c5p78v26nk5dz21a4xprp"; depends=[forecast]; };
-TSSQLite = derive { name="TSSQLite"; version="2015.4-1"; sha256="10z8s967wmapkb56hh2brb5bafgqr8flwh0sr72yqqv0ca2d06sc"; depends=[TSdbi DBI tframe tframePlus TSsql RSQLite]; };
+TSSQLite = derive { name="TSSQLite"; version="2015.4-1"; sha256="10z8s967wmapkb56hh2brb5bafgqr8flwh0sr72yqqv0ca2d06sc"; depends=[DBI RSQLite tframe tframePlus TSdbi TSsql]; };
 TSTutorial = derive { name="TSTutorial"; version="1.2.3"; sha256="0hpk6k3lc72p8pdz5aad04lcjsz9k443h5gs09dc3i10wqw3yhxs"; depends=[MASS]; };
-TSclust = derive { name="TSclust"; version="1.2.3"; sha256="0m04svw4z2rhvzyckn8l4pg4rmwfn8xlzd9k839c47ldbzgb4z6l"; depends=[wmtsa pdc cluster locpol KernSmooth dtw longitudinalData]; };
-TScompare = derive { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[TSdbi tframe tfplot DBI]; };
+TSclust = derive { name="TSclust"; version="1.2.3"; sha256="0m04svw4z2rhvzyckn8l4pg4rmwfn8xlzd9k839c47ldbzgb4z6l"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc wmtsa]; };
+TScompare = derive { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[DBI tfplot tframe TSdbi]; };
 TSdata = derive { name="TSdata"; version="2015.4-2"; sha256="1c0ly1gs6p3fspwvk1f6c2xgzvc7p7pkzakm44lisbyjklacnilp"; depends=[]; };
 TSdbi = derive { name="TSdbi"; version="2015.1-1"; sha256="1bqxpd4g0ppm1261srgwjzghfwwl53vybkihz99azckky0539m1s"; depends=[DBI tframe]; };
-TSdist = derive { name="TSdist"; version="2.2"; sha256="1zqqy2pxjzxlj1d32d086qrkf9rlgj9vn9smzbcfix8wlgvxfi1l"; depends=[proxy zoo xts dtw TSclust KernSmooth locpol pdc longitudinalData cluster]; };
-TSfame = derive { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[TSdbi DBI tframe tframePlus fame tis]; };
-TSmisc = derive { name="TSmisc"; version="2015.1-3"; sha256="1hv1q9p7vp7pxx9s4s9w3vkif1w1xr4y656x3zaf48ijxf6c6a90"; depends=[TSdbi DBI tframe tframePlus zoo xts its tseries quantmod gdata]; };
-TSodbc = derive { name="TSodbc"; version="2015.4-1"; sha256="0m6r97gs483jg6jlmfkbzxg3jvf6q140kvpidjccj224zb1sqlcq"; depends=[TSdbi DBI tframe tframePlus TSsql RODBC]; };
-TSsdmx = derive { name="TSsdmx"; version="2015.2-2"; sha256="1xwriyg0raqd6812r6vf34dljs0cjhxls9gpal4w0bjmvmc67khb"; depends=[TSdbi DBI tframe tframePlus RJSDMX rJava]; };
-TSsql = derive { name="TSsql"; version="2015.1-2"; sha256="1hpi2cssnkzqgnaj91wrvb94fs8zpfg8hi4m1zwswzyl3az0l9sc"; depends=[DBI tframe TSdbi tframePlus zoo]; };
-TTAinterfaceTrendAnalysis = derive { name="TTAinterfaceTrendAnalysis"; version="1.5.1"; sha256="1i9p5s7xj3py8465yjjaqs2m7krjxzzqd86lkpbgzxnxjdnxcx5i"; depends=[Hmisc pastecs reshape wq e1071 timeSeries fBasics relimp multcomp nlme lubridate tcltk2]; };
-TTR = derive { name="TTR"; version="0.22-0"; sha256="0aackwmmakjcynpq4nxi8xw1x3688rkg6kypgd5jiprzzdhsz5rq"; depends=[xts xts]; };
+TSdist = derive { name="TSdist"; version="2.2"; sha256="1zqqy2pxjzxlj1d32d086qrkf9rlgj9vn9smzbcfix8wlgvxfi1l"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; };
+TSfame = derive { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[DBI fame tframe tframePlus tis TSdbi]; };
+TSmisc = derive { name="TSmisc"; version="2015.1-3"; sha256="1hv1q9p7vp7pxx9s4s9w3vkif1w1xr4y656x3zaf48ijxf6c6a90"; depends=[DBI gdata its quantmod tframe tframePlus TSdbi tseries xts zoo]; };
+TSodbc = derive { name="TSodbc"; version="2015.4-1"; sha256="0m6r97gs483jg6jlmfkbzxg3jvf6q140kvpidjccj224zb1sqlcq"; depends=[DBI RODBC tframe tframePlus TSdbi TSsql]; };
+TSsdmx = derive { name="TSsdmx"; version="2015.2-2"; sha256="1xwriyg0raqd6812r6vf34dljs0cjhxls9gpal4w0bjmvmc67khb"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; };
+TSsql = derive { name="TSsql"; version="2015.1-2"; sha256="1hpi2cssnkzqgnaj91wrvb94fs8zpfg8hi4m1zwswzyl3az0l9sc"; depends=[DBI tframe tframePlus TSdbi zoo]; };
+TTAinterfaceTrendAnalysis = derive { name="TTAinterfaceTrendAnalysis"; version="1.5.1"; sha256="1i9p5s7xj3py8465yjjaqs2m7krjxzzqd86lkpbgzxnxjdnxcx5i"; depends=[e1071 fBasics Hmisc lubridate multcomp nlme pastecs relimp reshape tcltk2 timeSeries wq]; };
+TTR = derive { name="TTR"; version="0.22-0"; sha256="0aackwmmakjcynpq4nxi8xw1x3688rkg6kypgd5jiprzzdhsz5rq"; depends=[xts]; };
 TTmoment = derive { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; };
 TUWmodel = derive { name="TUWmodel"; version="0.1-4"; sha256="1xxbrcs3dddzcya15pj4k86z05vnv06fnwblfvygx0zkw0m292av"; depends=[]; };
 Table1Heatmap = derive { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; };
@@ -2198,36 +2207,36 @@ TaoTeProgramming = derive { name="TaoTeProgramming"; version="1.0"; sha256="1b36
 TapeR = derive { name="TapeR"; version="0.3.2"; sha256="070zl7hqv5zprhs464gy1kmz0am58l0vig8xvdq6pbz94nrhvpj0"; depends=[nlme pracma]; };
 TauP_R = derive { name="TauP.R"; version="1.1"; sha256="10sjvcv70fjrsl5nnk9gm4sy7nhwm6aaq57gr37cb10v079ykmk1"; depends=[]; };
 Taxonstand = derive { name="Taxonstand"; version="1.7"; sha256="0xs2kdsd6sa5vpxajw1rkraiy27km6q4mqsdsq1yfdl1wxv7m0sl"; depends=[]; };
-TcGSA = derive { name="TcGSA"; version="0.9.8"; sha256="19gp3pj4p2svrfyviccvv13q82qj7584nck8zbba90hzv9g4xy86"; depends=[lme4 ggplot2 GSA reshape2 gtools gplots cluster stringr]; };
+TcGSA = derive { name="TcGSA"; version="0.9.8"; sha256="19gp3pj4p2svrfyviccvv13q82qj7584nck8zbba90hzv9g4xy86"; depends=[cluster ggplot2 gplots GSA gtools lme4 multtest reshape2 stringr]; };
 TeachNet = derive { name="TeachNet"; version="0.7"; sha256="1p39bsf846r7zwz4lrrv2bpyx9yrkqzrnacajwrz3jjqj6qpp6cn"; depends=[]; };
 TeachingDemos = derive { name="TeachingDemos"; version="2.9"; sha256="160xch4812darv77qk2xjblm6nfnna5x2rxy335bwdsdjzcx4x9m"; depends=[]; };
 TeachingSampling = derive { name="TeachingSampling"; version="3.2.2"; sha256="07c1wx7hl246kvj9ah55kdjpag8a9zbzh3jy0680w5nnv8vzsxxs"; depends=[]; };
 TestScorer = derive { name="TestScorer"; version="1.7"; sha256="1rzpy4aa61l21qx2qxrmk16cxrvbygacxk4rkm766769aq2jqa09"; depends=[]; };
-TestSurvRec = derive { name="TestSurvRec"; version="1.2.1"; sha256="05f5gc8hvz09hx015jzis6ikki9c1brdq7l7a9bxm9bqbcc9f2f9"; depends=[survrec boot]; };
+TestSurvRec = derive { name="TestSurvRec"; version="1.2.1"; sha256="05f5gc8hvz09hx015jzis6ikki9c1brdq7l7a9bxm9bqbcc9f2f9"; depends=[boot survrec]; };
 Thermimage = derive { name="Thermimage"; version="1.0.1"; sha256="16wpmwqfqjghhp4g5wpmgzf0ii2aa0gawcq74rfn4frfizzdy0ad"; depends=[]; };
 Thinknum = derive { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; };
 ThreeArmedTrials = derive { name="ThreeArmedTrials"; version="0.1-0"; sha256="1pafm8k90yv0hrk5a9adfv37087l2in0psslhkxha6mkmdh6a5f6"; depends=[MASS]; };
 ThreeWay = derive { name="ThreeWay"; version="1.1.2"; sha256="1vf71im3bs2b2v05j12l8qn181kah0mch4h13n71zqik1ykly6jf"; depends=[]; };
-ThresholdROC = derive { name="ThresholdROC"; version="1.0"; sha256="1w7bjw1w09skxyc5w3d72wivljlvnck6vbchihjx7m5k6djn7pxi"; depends=[]; };
+ThresholdROC = derive { name="ThresholdROC"; version="2.0"; sha256="1qnxzp8rkxm39zgs8yv2yqkzda9hkd67910ikig423zs70gb6nj7"; depends=[MASS numDeriv pROC]; };
 TickExec = derive { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; };
 TiddlyWikiR = derive { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; };
 Tides = derive { name="Tides"; version="1.1"; sha256="0w2xjnw2zv4s49kvzbnfvy30mfkn8hqdz6p155xm1kfqwvyb28qq"; depends=[]; };
 TilePlot = derive { name="TilePlot"; version="1.3.1"; sha256="0yfzjyzc743rv5piw9mb7y0rr558hkxszgz49lya2w3i1mqvxbzy"; depends=[]; };
 TimeMachine = derive { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; };
-TimeProjection = derive { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate timeDate Matrix]; };
+TimeProjection = derive { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate Matrix timeDate]; };
 TimeWarp = derive { name="TimeWarp"; version="1.0.12"; sha256="1qadaf8n8ym5nv1z328hd5wiw78f014imgd2ryvi70sh4dmzb16l"; depends=[]; };
 Tinflex = derive { name="Tinflex"; version="1.0"; sha256="0zvh2nfx4kqf90mmrpdm2fzlzn7s7gs09i8zin604hqxjir6p3ny"; depends=[]; };
-TopKLists = derive { name="TopKLists"; version="1.0.3"; sha256="0687nxsddmlgyz3kwcfmcv0vj2pw91154rd1p19ivhmbvhvnhwvh"; depends=[Hmisc gplots]; };
-TraMineR = derive { name="TraMineR"; version="1.8-9"; sha256="0qawgjifz6w7gb06j9q5kbvhf8pn17922mvmgwzva5mykvqfmdic"; depends=[RColorBrewer boot]; };
-TraMineRextras = derive { name="TraMineRextras"; version="0.2.3"; sha256="0b6xh1xhmigjfj9cbk4gdpi1d131cq9ikwgdblcwwrmnrhcjgld6"; depends=[TraMineR RColorBrewer combinat survival cluster]; };
+TopKLists = derive { name="TopKLists"; version="1.0.3"; sha256="0687nxsddmlgyz3kwcfmcv0vj2pw91154rd1p19ivhmbvhvnhwvh"; depends=[gplots Hmisc]; };
+TraMineR = derive { name="TraMineR"; version="1.8-9"; sha256="0qawgjifz6w7gb06j9q5kbvhf8pn17922mvmgwzva5mykvqfmdic"; depends=[boot RColorBrewer]; };
+TraMineRextras = derive { name="TraMineRextras"; version="0.2.3"; sha256="0b6xh1xhmigjfj9cbk4gdpi1d131cq9ikwgdblcwwrmnrhcjgld6"; depends=[cluster combinat RColorBrewer survival TraMineR]; };
 TrackReconstruction = derive { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; };
 TreatmentSelection = derive { name="TreatmentSelection"; version="1.1.2"; sha256="1mvrb72yz51gmwqlfg5gsjbi65lqk5j24agddw1br53ymdvjgzq4"; depends=[ggplot2]; };
-TreePar = derive { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape Matrix subplex TreeSim deSolve]; };
+TreePar = derive { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; };
 TreeSim = derive { name="TreeSim"; version="2.1"; sha256="01izfzlvrak65mzwpz4bn5cansw10fvfjfvj164f5g0qghg9v84n"; depends=[ape geiger laser]; };
 TreeSimGM = derive { name="TreeSimGM"; version="1.2"; sha256="0y6hadwx3apw11jy5d4al3dav3his8b4xvkv7s5d5rd92l7yrw0r"; depends=[TreeSim]; };
-TriMatch = derive { name="TriMatch"; version="0.9.4"; sha256="008mi58sv82ykvwzil229z3zq3addyn3bik0xzfajcx4h7sdmsfg"; depends=[ggplot2 scales reshape2 ez psych PSAgraphics gridExtra]; };
+TriMatch = derive { name="TriMatch"; version="0.9.4"; sha256="008mi58sv82ykvwzil229z3zq3addyn3bik0xzfajcx4h7sdmsfg"; depends=[ez ggplot2 gridExtra PSAgraphics psych reshape2 scales]; };
 TrialSize = derive { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; };
-TripleR = derive { name="TripleR"; version="1.4.1"; sha256="028xvy3l72n1jhhfzv1fx1a51ya9bx008icz81ixjdwghzqr0wmi"; depends=[ggplot2 reshape2 plyr]; };
+TripleR = derive { name="TripleR"; version="1.4.1"; sha256="028xvy3l72n1jhhfzv1fx1a51ya9bx008icz81ixjdwghzqr0wmi"; depends=[ggplot2 plyr reshape2]; };
 Tsphere = derive { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; };
 TukeyC = derive { name="TukeyC"; version="1.1-5"; sha256="08s9scsd2l6wavc7qqlffjbf89vkd6xpb4iawvbqf7jh8jiyvw17"; depends=[]; };
 TunePareto = derive { name="TunePareto"; version="2.4"; sha256="0pljl3q5s9yqc4ph70y66ff9ci9w8gwj8jsy8srxqkgqvahc8arf"; depends=[]; };
@@ -2236,19 +2245,19 @@ TwoCop = derive { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9
 TwoStepCLogit = derive { name="TwoStepCLogit"; version="1.2.3"; sha256="0arqpfflflsydsgcrpq364vqf4sn019m03ygmpq810wa78v4r9s0"; depends=[survival]; };
 UBCRM = derive { name="UBCRM"; version="1.0.1"; sha256="1h9f8wlxdgb67qqqnfhd9gfs4l2cq84vajhcb0psva0gwdd1yf6i"; depends=[]; };
 UNF = derive { name="UNF"; version="2.0.1"; sha256="1gnzj7lxfp0x5f2ws9aclzaq75gbmsqhjqi02llmihf05gq0kp23"; depends=[base64enc digest]; };
-UPMASK = derive { name="UPMASK"; version="1.0"; sha256="19krsqkz2g5b6svqp29s6i92bhlk7liv8lf7d03za848w7y2jkhq"; depends=[MASS RSQLite DBI]; };
+UPMASK = derive { name="UPMASK"; version="1.0"; sha256="19krsqkz2g5b6svqp29s6i92bhlk7liv8lf7d03za848w7y2jkhq"; depends=[DBI MASS RSQLite]; };
 USAboundaries = derive { name="USAboundaries"; version="0.1.1"; sha256="18bk37lhrlp5j0496n956881zl88inliylmgh1p2nlkv4f195yd0"; depends=[assertthat dplyr ggplot2 lubridate maptools rgeos sp]; };
 UScancer = derive { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; };
-UScensus2000cdp = derive { name="UScensus2000cdp"; version="0.03"; sha256="143hqnzdla3p31n422ddzaaa34wc6xnnhil4y53m4qydyg407700"; depends=[maptools sp foreign]; };
-UScensus2000tract = derive { name="UScensus2000tract"; version="0.03"; sha256="11ppw75k8zghj7xphx5xyl3azsdsyd142avp0la2g941w6f8l2n1"; depends=[maptools sp foreign]; };
-UScensus2010 = derive { name="UScensus2010"; version="0.11"; sha256="1q06spkh8f4ijvfg557rl3176ki4i8a1y39cyqm3v7mnzwckyj3l"; depends=[maptools sp foreign]; };
+UScensus2000cdp = derive { name="UScensus2000cdp"; version="0.03"; sha256="143hqnzdla3p31n422ddzaaa34wc6xnnhil4y53m4qydyg407700"; depends=[foreign maptools sp]; };
+UScensus2000tract = derive { name="UScensus2000tract"; version="0.03"; sha256="11ppw75k8zghj7xphx5xyl3azsdsyd142avp0la2g941w6f8l2n1"; depends=[foreign maptools sp]; };
+UScensus2010 = derive { name="UScensus2010"; version="0.11"; sha256="1q06spkh8f4ijvfg557rl3176ki4i8a1y39cyqm3v7mnzwckyj3l"; depends=[foreign maptools sp]; };
 UWHAM = derive { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; };
 Unicode = derive { name="Unicode"; version="0.1-5"; sha256="088f38qy3vympxj6n4vyvvqd4gldcfli9l8rmzgmm1rm3v195mvn"; depends=[]; };
-UsingR = derive { name="UsingR"; version="2.0-4"; sha256="0wj6cn9ijc0rkpxsy1fd104m254b997dhmvwzz0knjkh5nybm8zm"; depends=[MASS HistData Hmisc]; };
-V8 = derive { name="V8"; version="0.6"; sha256="1cr9nm5wvi3b2766fpdgihnfmn1ckrwrzyya6dchvg2lr3giba38"; depends=[Rcpp jsonlite curl Rcpp]; };
+UsingR = derive { name="UsingR"; version="2.0-4"; sha256="0wj6cn9ijc0rkpxsy1fd104m254b997dhmvwzz0knjkh5nybm8zm"; depends=[HistData Hmisc MASS]; };
+V8 = derive { name="V8"; version="0.6"; sha256="1cr9nm5wvi3b2766fpdgihnfmn1ckrwrzyya6dchvg2lr3giba38"; depends=[curl jsonlite Rcpp]; };
 VAR_etp = derive { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; };
-VBLPCM = derive { name="VBLPCM"; version="2.4.3"; sha256="0aibjkqlc8l3f17m52ifb25s639gkydvgdj2gkijk5mk0g681qdj"; depends=[ergm sna mclust]; };
-VBmix = derive { name="VBmix"; version="0.2.17"; sha256="0fhx2vk5ffq147kfgsqjbqwgv64m7z9mbz4gchj90440ih7kyxa5"; depends=[lattice pixmap mnormt]; };
+VBLPCM = derive { name="VBLPCM"; version="2.4.3"; sha256="0aibjkqlc8l3f17m52ifb25s639gkydvgdj2gkijk5mk0g681qdj"; depends=[ergm mclust sna]; };
+VBmix = derive { name="VBmix"; version="0.2.17"; sha256="0fhx2vk5ffq147kfgsqjbqwgv64m7z9mbz4gchj90440ih7kyxa5"; depends=[lattice mnormt pixmap]; };
 VCA = derive { name="VCA"; version="1.1.1"; sha256="14xm220ymg5p1m2h2xvjkbgaqfhi7dmf8fmi4zmfm5gksgf4v351"; depends=[Matrix numDeriv]; };
 VDA = derive { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; };
 VGAM = derive { name="VGAM"; version="0.9-8"; sha256="0wizv2r1k79ifg9m0z9m2l80bshvfmajanznk5a5370ih3fih33a"; depends=[]; };
@@ -2256,50 +2265,50 @@ VGAMdata = derive { name="VGAMdata"; version="0.9-7"; sha256="0fkm90nbmj0gjzxmh5
 VHDClassification = derive { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; };
 VIF = derive { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; };
 VIGoR = derive { name="VIGoR"; version="1.0"; sha256="1c24s917aafqy46b3xlsw8v3afs11nd5bq83vlygpgnz1612jpga"; depends=[]; };
-VIM = derive { name="VIM"; version="4.1.0"; sha256="15nmywg8mhknvivg9bfszif2allim5vf1hjfbfyl053jphjpax26"; depends=[colorspace data_table car robustbase sp vcd MASS nnet e1071 Rcpp Rcpp]; };
-VIMGUI = derive { name="VIMGUI"; version="0.9.0"; sha256="195lakyik597sjkq6c5v3881p35111gzmj2r5f5nr53vi6bn4pzm"; depends=[tkrplot VIM survey gWidgetsRGtk2 foreign RGtk2 Cairo Hmisc]; };
+VIM = derive { name="VIM"; version="4.1.0"; sha256="15nmywg8mhknvivg9bfszif2allim5vf1hjfbfyl053jphjpax26"; depends=[car colorspace data_table e1071 MASS nnet Rcpp robustbase sp vcd]; };
+VIMGUI = derive { name="VIMGUI"; version="0.9.0"; sha256="195lakyik597sjkq6c5v3881p35111gzmj2r5f5nr53vi6bn4pzm"; depends=[Cairo foreign gWidgetsRGtk2 Hmisc RGtk2 survey tkrplot VIM]; };
 VLF = derive { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; };
 VLMC = derive { name="VLMC"; version="1.4-1"; sha256="0y91cl9pv1d5s8956grdx3y4xa5l1fabrh1wl5hn11fjgyz1dcij"; depends=[MASS]; };
 VNM = derive { name="VNM"; version="4.0"; sha256="0dc2wvj8f09yrsf5lhg6djhfnkgslngs6a13g54d5q9aa4nnxm8w"; depends=[]; };
 VPdtw = derive { name="VPdtw"; version="2.1-10"; sha256="1sipiqbk766czd1jxam3bc2hfq7wsn72x51j5ssn2s2q0gvpl7m1"; depends=[]; };
 VSURF = derive { name="VSURF"; version="1.0.0"; sha256="1hqn22k66v9zb2qr7sig0zgki9hbfr5442d7mlldnyj3m012m22j"; depends=[doParallel foreach randomForest rpart]; };
 VaRES = derive { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; };
-VarSelLCM = derive { name="VarSelLCM"; version="1.2"; sha256="1pzcadzg1snv2nkdrbhgi6scrd70cawprncm8hs82gcl3r9dscic"; depends=[Rcpp Rcpp RcppArmadillo]; };
+VarSelLCM = derive { name="VarSelLCM"; version="1.2"; sha256="1pzcadzg1snv2nkdrbhgi6scrd70cawprncm8hs82gcl3r9dscic"; depends=[Rcpp RcppArmadillo]; };
 VarSwapPrice = derive { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; };
 VariABEL = derive { name="VariABEL"; version="0.9-2"; sha256="0vlr6zxl75i49p35jxrc5fwfrb55n91hqdan2ikcix3r2k4qs5k0"; depends=[]; };
 VarianceGamma = derive { name="VarianceGamma"; version="0.3-1"; sha256="0h424hdphbgi9i84bgzdwmsq05w61q8300x8f9y4szbxa5k2dnar"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
-VdgRsm = derive { name="VdgRsm"; version="1.5"; sha256="13mbv3ih6p2915wdzq4zjx7m4k37w1xddkxx6dzk1jiak2br9slj"; depends=[permute AlgDesign]; };
+VdgRsm = derive { name="VdgRsm"; version="1.5"; sha256="13mbv3ih6p2915wdzq4zjx7m4k37w1xddkxx6dzk1jiak2br9slj"; depends=[AlgDesign permute]; };
 Vdgraph = derive { name="Vdgraph"; version="2.2-2"; sha256="1q8l711zbrrj4h1wmpv93nbvlg8xi6kjv22zpidkck8ncpyyla80"; depends=[]; };
 VecStatGraphs2D = derive { name="VecStatGraphs2D"; version="1.7"; sha256="08f9ixpiq8s5h8h608wrs9l16xk3c1xcrvwgvm5wqm6xfkj9gpfd"; depends=[MASS]; };
-VecStatGraphs3D = derive { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[rgl misc3d MASS]; };
+VecStatGraphs3D = derive { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[MASS misc3d rgl]; };
 VennDiagram = derive { name="VennDiagram"; version="1.6.9"; sha256="0sxgspqsn15y3pipd9wy4wh2n5rkb9bazqkfwkf88p483azpjxw9"; depends=[]; };
-VideoComparison = derive { name="VideoComparison"; version="0.11"; sha256="04jc9br4ddck2sh9bhy02jx34cqxvh904lr46sid6dnmaqfn80l7"; depends=[RJSONIO RCurl zoo pracma Rcpp Rcpp]; };
-VineCopula = derive { name="VineCopula"; version="1.5"; sha256="1ifb7y0y1b5kha9nv395mlf3h3cczlqkvk782a2z0xy5vf0frfhi"; depends=[MASS mvtnorm igraph copula ADGofTest lattice]; };
+VideoComparison = derive { name="VideoComparison"; version="0.11"; sha256="04jc9br4ddck2sh9bhy02jx34cqxvh904lr46sid6dnmaqfn80l7"; depends=[pracma Rcpp RCurl RJSONIO zoo]; };
+VineCopula = derive { name="VineCopula"; version="1.5"; sha256="1ifb7y0y1b5kha9nv395mlf3h3cczlqkvk782a2z0xy5vf0frfhi"; depends=[ADGofTest copula igraph lattice MASS mvtnorm]; };
 VizOR = derive { name="VizOR"; version="0.7-9"; sha256="1xw06y86nsrwpri6asrwh8kccjsqzzidgbpld6d6l7vrglp8m6sr"; depends=[lattice rms]; };
 Voss = derive { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
 VoxR = derive { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; };
-W2CWM2C = derive { name="W2CWM2C"; version="1.0"; sha256="14q1y4vpmrx8qz5nav8bbjkxqsqk646zcwr8h7yzi7cfa85b4cxz"; depends=[waveslim wavemulcor]; };
-W3CMarkupValidator = derive { name="W3CMarkupValidator"; version="0.1-2"; sha256="162bjf8g94xxif86c6545kjvn2m06v618kna6ic2b3alyx577fww"; depends=[XML RCurl]; };
+W2CWM2C = derive { name="W2CWM2C"; version="1.0"; sha256="14q1y4vpmrx8qz5nav8bbjkxqsqk646zcwr8h7yzi7cfa85b4cxz"; depends=[wavemulcor waveslim]; };
+W3CMarkupValidator = derive { name="W3CMarkupValidator"; version="0.1-2"; sha256="162bjf8g94xxif86c6545kjvn2m06v618kna6ic2b3alyx577fww"; depends=[RCurl XML]; };
 WARN = derive { name="WARN"; version="1.1"; sha256="0rnzsc8vbm116g4cwdivmxqv1zyg4givjrrlahvbf4xl5pbryg6d"; depends=[MASS]; };
 WCE = derive { name="WCE"; version="1.0"; sha256="1kb1z67ymnz8cgwxq6m5fpqgxmmrfiwh2q3x4rhanac2sinagyn4"; depends=[plyr survival]; };
 WCQ = derive { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; };
 WDI = derive { name="WDI"; version="2.4"; sha256="0ih6d9znq6b2prb4nvq5ypyjv1kpi1vylm3zvmkdjvx95z1qsinf"; depends=[RJSONIO]; };
-WGCNA = derive { name="WGCNA"; version="1.46"; sha256="0amrj6bm4rdr9db57a7qqkh0wk8f9vkvpc3jag9dhwvxfwnrn378"; depends=[dynamicTreeCut fastcluster matrixStats Hmisc foreach doParallel reshape survival]; };
-WMCapacity = derive { name="WMCapacity"; version="0.9.6.6"; sha256="19x6l06srh59q1cnixisa5fgm5hkpq35h9zfmdnfaj3xl8pxhzyn"; depends=[gtools gWidgets gWidgetsRGtk2 coda cairoDevice RGtk2 XML]; };
+WGCNA = derive { name="WGCNA"; version="1.47"; sha256="1q4lags9ihadbwyisbyc21bpb7p8dd82sxwmbjq83z7s3vrlh8bd"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach Hmisc impute matrixStats preprocessCore reshape survival]; };
+WMCapacity = derive { name="WMCapacity"; version="0.9.6.6"; sha256="19x6l06srh59q1cnixisa5fgm5hkpq35h9zfmdnfaj3xl8pxhzyn"; depends=[cairoDevice coda gtools gWidgets gWidgetsRGtk2 RGtk2 XML]; };
 WMDB = derive { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; };
-WRS2 = derive { name="WRS2"; version="0.3-1"; sha256="11i9zv7p7808v3hvnhjn58yl7mwh26zhis6hh9n73dw3hn22xdng"; depends=[MASS reshape plyr]; };
+WRS2 = derive { name="WRS2"; version="0.3-1"; sha256="11i9zv7p7808v3hvnhjn58yl7mwh26zhis6hh9n73dw3hn22xdng"; depends=[MASS plyr reshape]; };
 WWGbook = derive { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; };
-WaterML = derive { name="WaterML"; version="1.0.0"; sha256="125aivc23qgarndbwxif3xmqjp4n32vyk8cb7f7a2v3y51z332j2"; depends=[XML RJSONIO httr]; };
-Watersheds = derive { name="Watersheds"; version="1.0"; sha256="11hrprl8ldbgk1j1f8z4cb327c8d94x1fc29dpacqck48gdb4wmp"; depends=[sp maptools rgeos lattice splancs]; };
+WaterML = derive { name="WaterML"; version="1.0.0"; sha256="125aivc23qgarndbwxif3xmqjp4n32vyk8cb7f7a2v3y51z332j2"; depends=[httr RJSONIO XML]; };
+Watersheds = derive { name="Watersheds"; version="1.0"; sha256="11hrprl8ldbgk1j1f8z4cb327c8d94x1fc29dpacqck48gdb4wmp"; depends=[lattice maptools rgeos sp splancs]; };
 Wats = derive { name="Wats"; version="0.2-16"; sha256="1wbyyllmjsmh8wb8npzizlfn3hsvfpqp9p3b5wx3zpsavqw839wy"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; };
-WaveCD = derive { name="WaveCD"; version="1.0"; sha256="0gracn8lknw96nnir1m8fg5va3f45vvbiy69rxx8vibnfdg1q3l9"; depends=[waveslim lattice]; };
+WaveCD = derive { name="WaveCD"; version="1.0"; sha256="0gracn8lknw96nnir1m8fg5va3f45vvbiy69rxx8vibnfdg1q3l9"; depends=[lattice waveslim]; };
 WaveletComp = derive { name="WaveletComp"; version="1.0"; sha256="16ghxqjbv39pmgd52im6ilkkh0hpnaw8ns0hwkngpbr479m1grdp"; depends=[]; };
-WeightedCluster = derive { name="WeightedCluster"; version="1.2"; sha256="1d0df284fzfa34fi7b3d7f4zzm9ppyah46rj865446l5pjvl9np3"; depends=[TraMineR cluster RColorBrewer]; };
+WeightedCluster = derive { name="WeightedCluster"; version="1.2"; sha256="1d0df284fzfa34fi7b3d7f4zzm9ppyah46rj865446l5pjvl9np3"; depends=[cluster RColorBrewer TraMineR]; };
 WeightedPortTest = derive { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; };
 WhatIf = derive { name="WhatIf"; version="1.5-6"; sha256="02lqvirnf24jn8b2s08z5fjmpilp2z08lww1s793n3pn783adbky"; depends=[lpSolve]; };
-WhiteStripe = derive { name="WhiteStripe"; version="1.1.1"; sha256="1naavgkvgky3lzg5vlz11g589cxr0fgiqz2waz86da1ksk4a19gw"; depends=[oro_nifti mgcv]; };
+WhiteStripe = derive { name="WhiteStripe"; version="1.1.1"; sha256="1naavgkvgky3lzg5vlz11g589cxr0fgiqz2waz86da1ksk4a19gw"; depends=[mgcv oro_nifti]; };
 WhopGenome = derive { name="WhopGenome"; version="0.9.2"; sha256="0nhl3qanwvyxvkrdc0wngzdx6id0yfzbf9wp170mcsyd4qh7pxzs"; depends=[]; };
-WideLM = derive { name="WideLM"; version="0.1-1"; sha256="0spxl960pgzh0cn1gkw2ayixpi982rr85qajcdqahmn9msk877h8"; depends=[Rcpp Rcpp]; };
+WideLM = derive { name="WideLM"; version="0.1-1"; sha256="0spxl960pgzh0cn1gkw2ayixpi982rr85qajcdqahmn9msk877h8"; depends=[Rcpp]; };
 WikidataR = derive { name="WikidataR"; version="1.0.0"; sha256="061745pz4j9gldbwy6pa5pbxmin84csqpv7r5r8lanvc0m7kgcgx"; depends=[httr jsonlite WikipediR]; };
 WikipediR = derive { name="WikipediR"; version="1.2.0"; sha256="1l9q9yg4z4j0lch9r8xr9q0f8mr0lpzf50ygmkkcvfd5sp7hirmi"; depends=[httr jsonlite]; };
 WikipediaR = derive { name="WikipediaR"; version="1.0"; sha256="0kx966q5zn7jq1m7b8w1y1zllxvslr66bz6ji1lr11vk0fykl3kn"; depends=[XML]; };
@@ -2307,43 +2316,44 @@ WilcoxCV = derive { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrb
 WordPools = derive { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; };
 WrightMap = derive { name="WrightMap"; version="1.1"; sha256="0dmximp549gr37ps56vz8mnlii7753dc5v0wl3s78cymjmnmyr0z"; depends=[]; };
 WriteXLS = derive { name="WriteXLS"; version="3.5.1"; sha256="0grhwwlibdpvzjlm1vc5ykl54jcz0jmg6rkhis00rjn5yqccx0in"; depends=[]; };
-XBRL = derive { name="XBRL"; version="0.99.16"; sha256="1wrcm8srn185qrba7rig3fvwjz1n2ab296i0jr71vhyp9417h40q"; depends=[Rcpp Rcpp]; };
+XBRL = derive { name="XBRL"; version="0.99.16"; sha256="1wrcm8srn185qrba7rig3fvwjz1n2ab296i0jr71vhyp9417h40q"; depends=[Rcpp]; };
 XHWE = derive { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; };
-XLConnect = derive { name="XLConnect"; version="0.2-11"; sha256="02wxnr6h06h125dqszs8mzq4av842g445ndr59xgscxr03fyvi8p"; depends=[XLConnectJars rJava]; };
+XLConnect = derive { name="XLConnect"; version="0.2-11"; sha256="02wxnr6h06h125dqszs8mzq4av842g445ndr59xgscxr03fyvi8p"; depends=[rJava XLConnectJars]; };
 XLConnectJars = derive { name="XLConnectJars"; version="0.2-9"; sha256="0js79297himq628cwx5cc3pcq3iv6p16bn4bpd5diyjaya4x27g3"; depends=[rJava]; };
 XML = derive { name="XML"; version="3.98-1.2"; sha256="13rhl534l0cnklxf6zb9y8ykg0k5idg9dxy0nv1vbliz6rw3dr00"; depends=[]; };
-XML2R = derive { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[XML RCurl plyr]; };
+XML2R = derive { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[plyr RCurl XML]; };
 XNomial = derive { name="XNomial"; version="1.0.1"; sha256="134bwglqhgah7v3w6ir65dch2dwp5h4vldw521ba74l5v9b2j2h4"; depends=[]; };
 XiMpLe = derive { name="XiMpLe"; version="0.03-21"; sha256="1j387jzxh0z9dmhvc0kpjjjzf781sgrw57nwzdqwx6bn09bw509d"; depends=[]; };
 Xmisc = derive { name="Xmisc"; version="0.2.1"; sha256="11gwlcyxhz1p50m68cnqrxmisdk99v8vrsbvyr7k67f0kvsznzs1"; depends=[]; };
 YPmodel = derive { name="YPmodel"; version="1.1"; sha256="036f5y8qrcxglblgnaa15xzlz9pxbhbysrbr2gl66h9dvcd6kavr"; depends=[]; };
 YaleToolkit = derive { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgnmxnqhp8bypyy1x1p50g49fwdzl2l43il44cdyv0g"; depends=[foreach iterators]; };
 YieldCurve = derive { name="YieldCurve"; version="4.1"; sha256="0w47j8v2lvarrclnixwzaq98nv1xh2m48q5xvnmk7j9nsv2l3p68"; depends=[xts]; };
-YourCast = derive { name="YourCast"; version="1.6.2"; sha256="0vl37svwky6j1am235ac2wk1fdmh509w0h4m7y93lpjhzj6m8c1p"; depends=[ggplot2 gridExtra lattice foreign reshape2]; };
-YplantQMC = derive { name="YplantQMC"; version="0.6-4"; sha256="09galr2bcjvfpcp84znsv45j2cfyn4yhdx31kxs062sylys6kxld"; depends=[rgl geometry LeafAngle gplots]; };
+YourCast = derive { name="YourCast"; version="1.6.2"; sha256="0vl37svwky6j1am235ac2wk1fdmh509w0h4m7y93lpjhzj6m8c1p"; depends=[foreign ggplot2 gridExtra lattice reshape2]; };
+YplantQMC = derive { name="YplantQMC"; version="0.6-4"; sha256="09galr2bcjvfpcp84znsv45j2cfyn4yhdx31kxs062sylys6kxld"; depends=[geometry gplots LeafAngle rgl]; };
 YuGene = derive { name="YuGene"; version="1.1.2"; sha256="0sy0bh49l0fajh1z88mpb4f0k3hsf3kd1vxv731qhpxcrc3pz09b"; depends=[mixOmics]; };
 ZIM = derive { name="ZIM"; version="1.0.2"; sha256="1n4dc0as011gzaac153zq1dfbg1axvmf9znlmhl7xjj4dz4966qm"; depends=[MASS]; };
-ZeBook = derive { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[triangle deSolve]; };
+ZeBook = derive { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[deSolve triangle]; };
 Zelig = derive { name="Zelig"; version="4.2-1"; sha256="1hhr9jx25fdnkqwyj2bkgrvqlah4z2drphmb5mdn1an2p2g23v9z"; depends=[boot MASS sandwich]; };
-ZeligChoice = derive { name="ZeligChoice"; version="0.8-1"; sha256="1ql9yq83ipf0vpv63fpckylwq4jrcbfjgjm77f5ndkd83gqjzrmg"; depends=[Zelig VGAM]; };
-ZeligGAM = derive { name="ZeligGAM"; version="0.7-1"; sha256="1643ycx51mnlxwiarfkrwm8gr8clx00xi2llcaqsd3wsrr4z5j97"; depends=[Zelig mgcv]; };
-ZeligMultilevel = derive { name="ZeligMultilevel"; version="0.7-1"; sha256="00zlambykds4z1c5kx3rpla1kllyp96cxwvbc5lalwdb9i48pp3s"; depends=[Zelig lme4]; };
-aCRM = derive { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[dummies randomForest kernelFactory ada]; };
-aLFQ = derive { name="aLFQ"; version="1.3.2"; sha256="1963np2b2x7gbpgwcx0rqxd2psfdfmh72ap1y4p7f37ibjm8g45m"; depends=[data_table plyr caret seqinr lattice randomForest ROCR reshape2 protiq]; };
+ZeligChoice = derive { name="ZeligChoice"; version="0.8-1"; sha256="1ql9yq83ipf0vpv63fpckylwq4jrcbfjgjm77f5ndkd83gqjzrmg"; depends=[VGAM Zelig]; };
+ZeligGAM = derive { name="ZeligGAM"; version="0.7-1"; sha256="1643ycx51mnlxwiarfkrwm8gr8clx00xi2llcaqsd3wsrr4z5j97"; depends=[mgcv Zelig]; };
+ZeligMultilevel = derive { name="ZeligMultilevel"; version="0.7-1"; sha256="00zlambykds4z1c5kx3rpla1kllyp96cxwvbc5lalwdb9i48pp3s"; depends=[lme4 Zelig]; };
+aCRM = derive { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[ada dummies kernelFactory randomForest]; };
+aLFQ = derive { name="aLFQ"; version="1.3.2"; sha256="1963np2b2x7gbpgwcx0rqxd2psfdfmh72ap1y4p7f37ibjm8g45m"; depends=[caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; };
 aRpsDCA = derive { name="aRpsDCA"; version="1.0.0"; sha256="035888scbl5333sz25f9n6xh1zis7l2752p4nhsbs2g44q38l9h6"; depends=[]; };
 aRxiv = derive { name="aRxiv"; version="0.5.10"; sha256="1q8nblb0kfdidcj1nwxn0fap87wpkg49z0bgmwayskwv1p860wrh"; depends=[httr XML]; };
 aSPU = derive { name="aSPU"; version="1.35"; sha256="0wlp47wc75mmgh3986npqa72d4jia1jgalfvz7sq62wjsh1wkrbv"; depends=[]; };
-abc = derive { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data nnet quantreg MASS locfit]; };
+abbyyR = derive { name="abbyyR"; version="0.1"; sha256="03krflrjhq7yx06wacfyxzqvq0v2b17xvcyl8sfnaylrilracwjq"; depends=[httr XML]; };
+abc = derive { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data locfit MASS nnet quantreg]; };
 abc_data = derive { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; };
-abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[Rglpk rgl corrplot lattice]; };
+abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[corrplot lattice rgl Rglpk]; };
 abctools = derive { name="abctools"; version="1.0.2"; sha256="1wdm42g2maab700fq2shpr1kajpj9m4c4z6k49gghrdzpk1kqxsa"; depends=[abc abind plyr]; };
-abd = derive { name="abd"; version="0.2-7"; sha256="0zkqwdcpz1v9k509vvzfbf9732v43q919hwd9yq3q0dg67d32ai7"; depends=[nlme lattice mosaic]; };
+abd = derive { name="abd"; version="0.2-7"; sha256="0zkqwdcpz1v9k509vvzfbf9732v43q919hwd9yq3q0dg67d32ai7"; depends=[lattice mosaic nlme]; };
 abf2 = derive { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; };
 abind = derive { name="abind"; version="1.4-3"; sha256="1km61qygl4g3f91ar15r55b13gl8dra387vhmq0igf0sij3mbhmn"; depends=[]; };
 abn = derive { name="abn"; version="0.85"; sha256="1ml4l4fiqscc1ikv0wsi73rymb9599mpnhmzlfnvv4zp3fkfm6qm"; depends=[Cairo]; };
 abundant = derive { name="abundant"; version="1.0"; sha256="0n2yvq057vq5idi7mynnp15cbsijyyipgbl4p7rqfbbgpk5hy3qb"; depends=[QUIC]; };
-acc = derive { name="acc"; version="1.0.2"; sha256="1z7hncgd43mc84v3wdcqpkp3gxsdyvh7h8s6qvgap2lp04m1j74l"; depends=[zoo PhysicalActivity mhsmm timeDate]; };
-accelerometry = derive { name="accelerometry"; version="2.2.5"; sha256="00mn09j7y39sc7h5srnnfk2l73vhh6zq7rzc0vckfvs72lncmwv5"; depends=[Rcpp Rcpp]; };
+acc = derive { name="acc"; version="1.0.2"; sha256="1z7hncgd43mc84v3wdcqpkp3gxsdyvh7h8s6qvgap2lp04m1j74l"; depends=[mhsmm PhysicalActivity timeDate zoo]; };
+accelerometry = derive { name="accelerometry"; version="2.2.5"; sha256="00mn09j7y39sc7h5srnnfk2l73vhh6zq7rzc0vckfvs72lncmwv5"; depends=[Rcpp]; };
 accrual = derive { name="accrual"; version="1.1"; sha256="12zlv34pgmhcvisqk3x09hjpmfj91pn56pkjyj483mcf634m9ha4"; depends=[fgui SMPracticals]; };
 accrued = derive { name="accrued"; version="1.2"; sha256="0xkar6kpxf7sq36xqf6cvns2sp5qgqxqjb8hindp59gvlcd2r5a7"; depends=[]; };
 acepack = derive { name="acepack"; version="1.3-3.3"; sha256="13ry3vyys12iplb14jfhmkrl9g5fxg3iijiggq4s4zb5m5436b1y"; depends=[]; };
@@ -2351,61 +2361,61 @@ acid = derive { name="acid"; version="1.0"; sha256="0m59xnz6435n7j3fggv274g5rap7
 acm4r = derive { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; };
 acnr = derive { name="acnr"; version="0.2.4"; sha256="1nry927zqhb34h9lcixr344n3sxvq1142zwgj8hadlw69dv8m59y"; depends=[R_utils xtable]; };
 acopula = derive { name="acopula"; version="0.9.2"; sha256="1z8bs4abbfsdxfpbczdrf1ma84bmh7akwx2ki9070zavrhbf00cf"; depends=[]; };
-acp = derive { name="acp"; version="2.0"; sha256="11ij2xhnkhy7lnzj8fld7habidb9av8a2bk22ycf62f556pqf533"; depends=[tseries quantmod]; };
-acs = derive { name="acs"; version="1.2"; sha256="1vw4ghqcz53m3qy7hy2j7nrdinbbqjpwvr1hsvglq31fq7wss3bd"; depends=[stringr plyr XML]; };
+acp = derive { name="acp"; version="2.0"; sha256="11ij2xhnkhy7lnzj8fld7habidb9av8a2bk22ycf62f556pqf533"; depends=[quantmod tseries]; };
+acs = derive { name="acs"; version="1.2"; sha256="1vw4ghqcz53m3qy7hy2j7nrdinbbqjpwvr1hsvglq31fq7wss3bd"; depends=[plyr stringr XML]; };
 acss = derive { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; };
 acss_data = derive { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; };
 activity = derive { name="activity"; version="1.0"; sha256="1y1vy3kj9n21jvbyl3s5hllfkqp3z1rnn7701c5jxhay5dbdz3p2"; depends=[circular overlap pbapply]; };
 actuar = derive { name="actuar"; version="1.1-8"; sha256="0zdw8dphpp49hr82z44az10vyawj301p8lr0cc7dk96g7xrzmlwa"; depends=[]; };
 ada = derive { name="ada"; version="2.0-3"; sha256="1c0nj9k628bcl4r8j0rmyp5f1igdjq6qhjxyif6575fvn2gdzmbw"; depends=[rpart]; };
-adabag = derive { name="adabag"; version="4.0"; sha256="0n4zls13f46rxqrx9qkvrifshb3cl8l6ni7zw36pm6fixbz844fk"; depends=[rpart mlbench caret]; };
+adabag = derive { name="adabag"; version="4.0"; sha256="0n4zls13f46rxqrx9qkvrifshb3cl8l6ni7zw36pm6fixbz844fk"; depends=[caret mlbench rpart]; };
 adagio = derive { name="adagio"; version="0.5.9"; sha256="1yp9w557advb7dzrdqwkffpdmhn6mk4879lrrjd0d6kv89fwz5yr"; depends=[]; };
 adaptDA = derive { name="adaptDA"; version="1.0"; sha256="0nk7n628d30jz03a2rmpgzrwwd79rlpqvr6lwhilmkg1gblvz7r1"; depends=[MASS]; };
 adaptMCMC = derive { name="adaptMCMC"; version="1.1"; sha256="1y1qxn3qm59nyy9ld5x30p452yam7b2fyl236b14xvpm8g3xx1fa"; depends=[coda Matrix]; };
 adaptTest = derive { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; };
 adaptivetau = derive { name="adaptivetau"; version="2.2"; sha256="1xqvbbdmn70fmycpn0680q1l9s34kcmkjl812d7yrfxwm1bjfif5"; depends=[]; };
-adaptsmoFMRI = derive { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[Matrix coda mvtnorm MCMCpack spatstat]; };
+adaptsmoFMRI = derive { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[coda Matrix MCMCpack mvtnorm spatstat]; };
 additivityTests = derive { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; };
 addreg = derive { name="addreg"; version="2.0"; sha256="1lc8p70di466i061jrbahq4hir4g5a8rns6044jjjg8v7b1y8alc"; depends=[combinat glm2]; };
 ade4 = derive { name="ade4"; version="1.7-2"; sha256="01pchn70jpz8v9l86ng34a2vgn3pv4v5iwxz5n39f685p9lkc2nn"; depends=[]; };
 ade4TkGUI = derive { name="ade4TkGUI"; version="0.2-6"; sha256="010ggsxcmljh0cdba4lcfnsd9r49pwqs6kbw88syfn2qv65hh5kq"; depends=[ade4]; };
-adegenet = derive { name="adegenet"; version="1.4-2"; sha256="13fglxy40rnwi5hsmmvwlfcvfn8dybxyy3k5qhpml8jgpbl3fsdb"; depends=[ade4 MASS igraph ape shiny ggplot2]; };
+adegenet = derive { name="adegenet"; version="1.4-2"; sha256="13fglxy40rnwi5hsmmvwlfcvfn8dybxyy3k5qhpml8jgpbl3fsdb"; depends=[ade4 ape ggplot2 igraph MASS shiny]; };
 adegraphics = derive { name="adegraphics"; version="1.0-2"; sha256="1jhi761rhrq1k27gxfns46j67x0ajbff6mz9cwl5jkcqg2mbcg8q"; depends=[ade4 KernSmooth lattice RColorBrewer sp]; };
-adehabitat = derive { name="adehabitat"; version="1.8.17"; sha256="0cy98fd6mcbjc152vv41mnh5xj19xdfag8n950fvffbrpvpgbcpb"; depends=[ade4 tkrplot shapefiles sp]; };
-adehabitatHR = derive { name="adehabitatHR"; version="0.4.13"; sha256="140ar1naf67v996d5p0i2v07g02pf9c4c6h1pjicai5n59s7z72v"; depends=[sp deldir ade4 adehabitatMA adehabitatLT]; };
-adehabitatHS = derive { name="adehabitatHS"; version="0.3.11"; sha256="0sbhc1mvdc8pxq56plbgk0ry65chxcv3zjry4151hiv7yxpn39ri"; depends=[sp ade4 adehabitatMA adehabitatHR]; };
-adehabitatLT = derive { name="adehabitatLT"; version="0.3.19"; sha256="0h9n6j3a52bik5pslysvhb11d8df5k50ghi34zlxhdcbm09gfnmz"; depends=[sp ade4 adehabitatMA CircStats]; };
+adehabitat = derive { name="adehabitat"; version="1.8.17"; sha256="0cy98fd6mcbjc152vv41mnh5xj19xdfag8n950fvffbrpvpgbcpb"; depends=[ade4 shapefiles sp tkrplot]; };
+adehabitatHR = derive { name="adehabitatHR"; version="0.4.13"; sha256="140ar1naf67v996d5p0i2v07g02pf9c4c6h1pjicai5n59s7z72v"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; };
+adehabitatHS = derive { name="adehabitatHS"; version="0.3.11"; sha256="0sbhc1mvdc8pxq56plbgk0ry65chxcv3zjry4151hiv7yxpn39ri"; depends=[ade4 adehabitatHR adehabitatMA sp]; };
+adehabitatLT = derive { name="adehabitatLT"; version="0.3.19"; sha256="0h9n6j3a52bik5pslysvhb11d8df5k50ghi34zlxhdcbm09gfnmz"; depends=[ade4 adehabitatMA CircStats sp]; };
 adehabitatMA = derive { name="adehabitatMA"; version="0.3.9"; sha256="15n9mg8m4mjg5zn5c5hz9bl5qcghzkijiflk8psc0kg2csfpv7hy"; depends=[sp]; };
-adephylo = derive { name="adephylo"; version="1.1-6"; sha256="1sk639gmk3cs711xn68mx18r28kjd1pychcg89qlki03y1hnxg7j"; depends=[ade4 phylobase ape adegenet]; };
-adhoc = derive { name="adhoc"; version="1.0"; sha256="193adddarjkc2kk1xncfkm919s1lkmc1yzgyz9793p74nqmfsj0a"; depends=[spider ape polynom]; };
+adephylo = derive { name="adephylo"; version="1.1-6"; sha256="1sk639gmk3cs711xn68mx18r28kjd1pychcg89qlki03y1hnxg7j"; depends=[ade4 adegenet ape phylobase]; };
+adhoc = derive { name="adhoc"; version="1.0"; sha256="193adddarjkc2kk1xncfkm919s1lkmc1yzgyz9793p74nqmfsj0a"; depends=[ape polynom spider]; };
 adimpro = derive { name="adimpro"; version="0.7.8"; sha256="06zwdgl7g4azg2mn7p35may8hsjcvf2dz7dj86zqngjspda123s4"; depends=[]; };
 adlift = derive { name="adlift"; version="1.3-2"; sha256="0nzg16vhm5qg3xzczi3f6cynvp9ym2jsfrc4fdyxq7bwp9kry2i4"; depends=[EbayesThresh]; };
 ads = derive { name="ads"; version="1.5-2.2"; sha256="17k24dihl41jgkkglhnkj7lvvl53dgahjkb5jhfmfgk6i16c7s23"; depends=[ade4 spatstat]; };
 adwave = derive { name="adwave"; version="1.0"; sha256="10cz870n3az7brmf2658g0jrc1x39c69vw37n99m8x6wxxp6ypn8"; depends=[waveslim]; };
-aemo = derive { name="aemo"; version="0.1.0"; sha256="1iik0rrqkkx9n1qb1pvq5iwxqmvs6vnx8z80hdzb5vqq0lvi1bsx"; depends=[dplyr stringr assertthat lubridate]; };
-afex = derive { name="afex"; version="0.13-145"; sha256="0wyjgxh1rdibj21f8dbwg7f30q1z6jwwpj2dcjx2rh60axvp1dir"; depends=[car lme4 reshape2 stringr coin Matrix pbkrtest]; };
-aftgee = derive { name="aftgee"; version="1.0-0"; sha256="0gfp05r6xvn9fcysbqyzkz916axpsc2d3lb5wmb1v92z1zw3037b"; depends=[MASS BB survival geepack]; };
-agRee = derive { name="agRee"; version="0.3-1"; sha256="1gqbhv44z1r9m54fmrg0frnzsgsp13v5ppmzpv28frz9d8x7sxx6"; depends=[miscF lme4 R2jags]; };
-agop = derive { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[Matrix igraph]; };
-agricolae = derive { name="agricolae"; version="1.2-1"; sha256="1vrc1bjqcp3xk8q41bl3kvjvaj58gw19dv7vwsxn9r6r99hlb3j1"; depends=[klaR MASS nlme cluster spdep]; };
+aemo = derive { name="aemo"; version="0.1.0"; sha256="1iik0rrqkkx9n1qb1pvq5iwxqmvs6vnx8z80hdzb5vqq0lvi1bsx"; depends=[assertthat dplyr lubridate stringr]; };
+afex = derive { name="afex"; version="0.13-145"; sha256="0wyjgxh1rdibj21f8dbwg7f30q1z6jwwpj2dcjx2rh60axvp1dir"; depends=[car coin lme4 Matrix pbkrtest reshape2 stringr]; };
+aftgee = derive { name="aftgee"; version="1.0-0"; sha256="0gfp05r6xvn9fcysbqyzkz916axpsc2d3lb5wmb1v92z1zw3037b"; depends=[BB geepack MASS survival]; };
+agRee = derive { name="agRee"; version="0.3-1"; sha256="1gqbhv44z1r9m54fmrg0frnzsgsp13v5ppmzpv28frz9d8x7sxx6"; depends=[lme4 miscF R2jags]; };
+agop = derive { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[igraph Matrix]; };
+agricolae = derive { name="agricolae"; version="1.2-1"; sha256="1vrc1bjqcp3xk8q41bl3kvjvaj58gw19dv7vwsxn9r6r99hlb3j1"; depends=[cluster klaR MASS nlme spdep]; };
 agridat = derive { name="agridat"; version="1.11"; sha256="1bnkzacwp22dw5vppm4yz583h1dw5d93dlca9i3ba2y9dzsalx0d"; depends=[lattice reshape2]; };
 agrmt = derive { name="agrmt"; version="1.39"; sha256="0qkl8wikvg635mr8v3n9svdicnb8sl4brrh7px1n5jy71h7cswd7"; depends=[]; };
 agsemisc = derive { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; };
-ahaz = derive { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[survival Matrix]; };
+ahaz = derive { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[Matrix survival]; };
 aidar = derive { name="aidar"; version="1.0.0"; sha256="01vs14bz4k504q5lx65b60kyi7hgvjdmib8igiipjmg4snwh8hdk"; depends=[XML]; };
 akima = derive { name="akima"; version="0.5-11"; sha256="17n7iiwybwanvm5mflb1f2xx1gnw1pcmfsnl1f82afixpalbs0gh"; depends=[]; };
 akmeans = derive { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; };
 alabama = derive { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; };
 ald = derive { name="ald"; version="1.0"; sha256="1vphmqhx6wlzsz3s94jsa4mk6wpacp93wfgpj0vp9ljfb3aplhik"; depends=[]; };
-algstat = derive { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly stringr reshape2 Rcpp Rcpp]; };
+algstat = derive { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly Rcpp reshape2 stringr]; };
 allan = derive { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; };
 allanvar = derive { name="allanvar"; version="1.0"; sha256="0wpywdr15gb49m9kxrpjfsxlxrm4hwm46x42k8dgc6sihfsqbm22"; depends=[gplots]; };
 alleHap = derive { name="alleHap"; version="0.7.2"; sha256="1x10grrv732a0iidr2c96vbl46553njhvvlq249jxn3y11lfq2gv"; depends=[gtools]; };
 allelematch = derive { name="allelematch"; version="2.5"; sha256="1kws6y3igq6l85cfjrck2dzcfpgr56ridbc6w071h8kjw19mlzas"; depends=[dynamicTreeCut]; };
 allelic = derive { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; };
-alm = derive { name="alm"; version="0.4.0"; sha256="125cl5b1sps33ipsh2pygrw79mhin1qj374lq56ny7c9rp4n9w7p"; depends=[ggplot2 plyr stringr reshape reshape2 httr jsonlite lubridate]; };
-alphaOutlier = derive { name="alphaOutlier"; version="1.0.1"; sha256="1zl80q08vcyvyakfv6cd444m6l5z14p7bv9jf8kpg4dad3d63mhz"; depends=[Rsolnp nleqslv quantreg]; };
-alphahull = derive { name="alphahull"; version="2.0"; sha256="1z8kbh3y5clh3hn018g0fci2psd0l36nz4a08pgg7md2bbhripbl"; depends=[ggplot2 tripack sgeostat spatstat splancs]; };
+alm = derive { name="alm"; version="0.4.0"; sha256="125cl5b1sps33ipsh2pygrw79mhin1qj374lq56ny7c9rp4n9w7p"; depends=[ggplot2 httr jsonlite lubridate plyr reshape reshape2 stringr]; };
+alphaOutlier = derive { name="alphaOutlier"; version="1.0.1"; sha256="1zl80q08vcyvyakfv6cd444m6l5z14p7bv9jf8kpg4dad3d63mhz"; depends=[nleqslv quantreg Rsolnp]; };
+alphahull = derive { name="alphahull"; version="2.0"; sha256="1z8kbh3y5clh3hn018g0fci2psd0l36nz4a08pgg7md2bbhripbl"; depends=[ggplot2 sgeostat spatstat splancs tripack]; };
 alphashape3d = derive { name="alphashape3d"; version="1.1"; sha256="1hfxvzqgirc587vxyggxdqii90nvypzi3wddvd2zdw2h95v9kfyg"; depends=[geometry rgl]; };
 alr3 = derive { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; };
 alr4 = derive { name="alr4"; version="1.0.5"; sha256="0m8jgc4mfni17psf8m0avf0m364vcq5k3c9x807p98ch2z5nsygv"; depends=[car effects]; };
@@ -2413,97 +2423,98 @@ amap = derive { name="amap"; version="0.8-14"; sha256="1dz37z9v4zvyvqrs4xvpfv468
 amei = derive { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; };
 amen = derive { name="amen"; version="1.0"; sha256="17kaknfgi39qcg5mhkdyf6cn2l3nn9n2xzvyz1c4piy6inhmj36c"; depends=[]; };
 aml = derive { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; };
-anacor = derive { name="anacor"; version="1.0-5"; sha256="1m2r5x5spb5nahd9cvnsxwqi0ay2kasmha21rbwj3r99jz1vxkql"; depends=[rgl car scatterplot3d colorspace fda]; };
-analogue = derive { name="analogue"; version="0.16-3"; sha256="0lv8ljf10jdrgrd59pcjdi1wvjfd0j6qb87xzfx5k8kcp9awx4h6"; depends=[vegan mgcv MASS brglm princurve lattice]; };
-analogueExtra = derive { name="analogueExtra"; version="0.1-0"; sha256="0hyl0vn2i594r5czzha7y9a1n4dpznfpmh2j46mci2r57p2s3qr2"; depends=[vegan3d analogue rgl]; };
+anacor = derive { name="anacor"; version="1.0-5"; sha256="1m2r5x5spb5nahd9cvnsxwqi0ay2kasmha21rbwj3r99jz1vxkql"; depends=[car colorspace fda rgl scatterplot3d]; };
+analogue = derive { name="analogue"; version="0.16-3"; sha256="0lv8ljf10jdrgrd59pcjdi1wvjfd0j6qb87xzfx5k8kcp9awx4h6"; depends=[brglm lattice MASS mgcv princurve vegan]; };
+analogueExtra = derive { name="analogueExtra"; version="0.1-0"; sha256="0hyl0vn2i594r5czzha7y9a1n4dpznfpmh2j46mci2r57p2s3qr2"; depends=[analogue rgl vegan3d]; };
 analyz = derive { name="analyz"; version="1.4"; sha256="0qdh1gld2dkl0krbhm2vcqg8dfs03dn51rclgsw02554s06dlgxw"; depends=[]; };
-anametrix = derive { name="anametrix"; version="1.6"; sha256="14xrrnvz7jn1jqds48l5pvzlx6hsaxrjc932lqnvv70sfypinjkm"; depends=[RCurl XML pastecs]; };
+anametrix = derive { name="anametrix"; version="1.6"; sha256="14xrrnvz7jn1jqds48l5pvzlx6hsaxrjc932lqnvv70sfypinjkm"; depends=[pastecs RCurl XML]; };
 anapuce = derive { name="anapuce"; version="2.2"; sha256="0qs27as628090k3sq5b14l90g7qdp23d0jz5lb1wxsgi3ji0f7qj"; depends=[]; };
-anchors = derive { name="anchors"; version="3.0-8"; sha256="12gd2526y7s2a8i6b9xma2c3sc6zxnwzl6sn8b50hbxizwr8d34j"; depends=[rgenoud MASS]; };
+anchors = derive { name="anchors"; version="3.0-8"; sha256="12gd2526y7s2a8i6b9xma2c3sc6zxnwzl6sn8b50hbxizwr8d34j"; depends=[MASS rgenoud]; };
 andrews = derive { name="andrews"; version="1.0"; sha256="130i86qkdy1xpcf611jpzqgmd17iik7j7spdcfwzk48f31biyp8v"; depends=[]; };
 anesrake = derive { name="anesrake"; version="0.70"; sha256="17127rmjfrdwnr2m6205cci3b0kd9girp82qranxwac4mgb7p7ld"; depends=[Hmisc]; };
 anfis = derive { name="anfis"; version="0.99.1"; sha256="1v8di5dzwb1g1ldi7idcmmr9nirp9kxvc8km1qq1i8zaw1bh8pqb"; depends=[]; };
 anim_plots = derive { name="anim.plots"; version="0.1"; sha256="0qjwmxpkvjf27parh1fvhrkiczm4zlv9c034dp04yysbdz65r1by"; depends=[animation]; };
 animalTrack = derive { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; };
 animation = derive { name="animation"; version="2.3"; sha256="1hqgkaxmyyfrx7cfzv00010r9l2n8gxm35jd41p3kc208mhd7ssp"; depends=[]; };
-anominate = derive { name="anominate"; version="0.5"; sha256="0qhq3ngxi1d3yln6bafg3c36a7whnznnww0101da2y0i6dw79lg5"; depends=[coda wnominate oc pscl MCMCpack]; };
-antitrust = derive { name="antitrust"; version="0.94"; sha256="1k768lmx5vv069bd9fzly1205rxr9mkqi1p8jjx67kwmyhhw5sd2"; depends=[MASS evd BB numDeriv ggplot2]; };
+anominate = derive { name="anominate"; version="0.5"; sha256="0qhq3ngxi1d3yln6bafg3c36a7whnznnww0101da2y0i6dw79lg5"; depends=[coda MCMCpack oc pscl wnominate]; };
+antitrust = derive { name="antitrust"; version="0.94"; sha256="1k768lmx5vv069bd9fzly1205rxr9mkqi1p8jjx67kwmyhhw5sd2"; depends=[BB evd ggplot2 MASS numDeriv]; };
 aod = derive { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; };
-aods3 = derive { name="aods3"; version="0.4-1"; sha256="074c16wmgd1vc2yvwx1y84bg55hvmm5yi8zgpwh51jcsbqlhbpgn"; depends=[lme4 boot]; };
+aods3 = derive { name="aods3"; version="0.4-1"; sha256="074c16wmgd1vc2yvwx1y84bg55hvmm5yi8zgpwh51jcsbqlhbpgn"; depends=[boot lme4]; };
 aoos = derive { name="aoos"; version="0.2.0"; sha256="0dnhbynkc02mi1a5xsl992dqks44k57z9a05q7k2s25953bqfqq3"; depends=[]; };
-aoristic = derive { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43j74frvwa8lsj4x5kwhwpsfjfch1yqwjl"; depends=[ggplot2 spatstat GISTools lubridate classInt reshape2 rgdal plotKML MASS sp maptools RColorBrewer]; };
+aop = derive { name="aop"; version="0.99.5"; sha256="1mncia5m79m1nw2kwfsrf62i2dlmxdcwj0rrrs95s51b7c6d369h"; depends=[graph igraph Rgraphviz rjson]; };
+aoristic = derive { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43j74frvwa8lsj4x5kwhwpsfjfch1yqwjl"; depends=[classInt ggplot2 GISTools lubridate maptools MASS plotKML RColorBrewer reshape2 rgdal sp spatstat]; };
 apTreeshape = derive { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; };
 apc = derive { name="apc"; version="1.1"; sha256="0gnjniy7gm5fh4wn7vwml3z5bw6ydd1xxq5npvqljbzy4vhh8k5a"; depends=[]; };
-apcluster = derive { name="apcluster"; version="1.4.1"; sha256="1s7wsgimpln5kiy1ai8clq2r0i6vh8mr5v4xjha9phdbm8l8yfbg"; depends=[Rcpp Matrix Rcpp]; };
-ape = derive { name="ape"; version="3.3"; sha256="1zdgszyi5kwfj3kccx35q8z57p53zdp819hjqdw5z8y6q7b49j1c"; depends=[nlme lattice]; };
-apex = derive { name="apex"; version="1.0.0"; sha256="1y4y1kji5nvbk0igbv9xjwsjrnz7bsjj23cczydywg9nppsi9df0"; depends=[ape phangorn adegenet]; };
+apcluster = derive { name="apcluster"; version="1.4.1"; sha256="1s7wsgimpln5kiy1ai8clq2r0i6vh8mr5v4xjha9phdbm8l8yfbg"; depends=[Matrix Rcpp]; };
+ape = derive { name="ape"; version="3.3"; sha256="1zdgszyi5kwfj3kccx35q8z57p53zdp819hjqdw5z8y6q7b49j1c"; depends=[lattice nlme]; };
+apex = derive { name="apex"; version="1.0.0"; sha256="1y4y1kji5nvbk0igbv9xjwsjrnz7bsjj23cczydywg9nppsi9df0"; depends=[adegenet ape phangorn]; };
 aplore3 = derive { name="aplore3"; version="0.7"; sha256="1xj3k13wjpsydcrai474b94kyj298islzfpfwn8n51k67h8r4l08"; depends=[]; };
 aplpack = derive { name="aplpack"; version="1.3.0"; sha256="0i6jy6aygkqk5gagngdw9h9l579lf0qkiy5v8scq5c015w000aaq"; depends=[]; };
-apmsWAPP = derive { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[seqinr gtools]; };
+apmsWAPP = derive { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; };
 appell = derive { name="appell"; version="0.0-4"; sha256="0g7pzhxqgscnyf07xycbrpyimp1z1hljgcr3nqigpx09w7zi5wlw"; depends=[]; };
 apple = derive { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; };
 approximator = derive { name="approximator"; version="1.2-6"; sha256="165qvx5946wkv1qsgbmjhmwvik7m23r1vbpnp7claylflgj1ycnm"; depends=[emulator]; };
 aprean3 = derive { name="aprean3"; version="1.0.1"; sha256="17rnq02sncl6rzwyln10200s43b8z1s2j0kdi9kgcb6qr51v12rv"; depends=[]; };
 aprof = derive { name="aprof"; version="0.2.4"; sha256="0gw5qj6c5ygjc6nwx2lb8biykkk73fv2x3j1xxabpgnsfq1whwyc"; depends=[]; };
-apsimr = derive { name="apsimr"; version="1.0"; sha256="1lk8n0vb20sxs02s6xx16d2xrh09p08b6i50b99bx9k7dhlgn6cf"; depends=[ggplot2 XML lubridate reshape2 MASS mgcv]; };
+apsimr = derive { name="apsimr"; version="1.0"; sha256="1lk8n0vb20sxs02s6xx16d2xrh09p08b6i50b99bx9k7dhlgn6cf"; depends=[ggplot2 lubridate MASS mgcv reshape2 XML]; };
 apsrtable = derive { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; };
-apt = derive { name="apt"; version="2.3"; sha256="0yrgxdqzwa5zv6rv8d8nnlraxngq60i1f0yrkygwsj4kngv2yhyv"; depends=[erer gWidgets car urca copula]; };
+apt = derive { name="apt"; version="2.3"; sha256="0yrgxdqzwa5zv6rv8d8nnlraxngq60i1f0yrkygwsj4kngv2yhyv"; depends=[car copula erer gWidgets urca]; };
 aqfig = derive { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; };
-aqp = derive { name="aqp"; version="1.8-6"; sha256="03gwvb5sm9l4vyl0jh9rzjs3ka2qmw4qqh40ywahq3dchpbxmlzd"; depends=[plyr reshape lattice cluster sp Hmisc stringr scales plotrix RColorBrewer MASS digest]; };
-aqr = derive { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[xts RCurl]; };
+aqp = derive { name="aqp"; version="1.8-6"; sha256="03gwvb5sm9l4vyl0jh9rzjs3ka2qmw4qqh40ywahq3dchpbxmlzd"; depends=[cluster digest Hmisc lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; };
+aqr = derive { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[RCurl xts]; };
 archdata = derive { name="archdata"; version="0.1"; sha256="1k7cpqwgvkwfz25a9db0c8g6ii6xsbhkj3c9alghhaafs7x8n47w"; depends=[]; };
 archetypes = derive { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; };
 archiDART = derive { name="archiDART"; version="1.1"; sha256="1md8y3nq575y9v4gj963y92as54h6bzaysnmjirk634rravps9ja"; depends=[XML]; };
-archivist = derive { name="archivist"; version="1.3"; sha256="1did4s9afmbd4b2xcs674fyk2vz0r08vchjfar1q3ri2mfq4p7x5"; depends=[RSQLite DBI shiny lubridate RCurl digest httr]; };
+archivist = derive { name="archivist"; version="1.3"; sha256="1did4s9afmbd4b2xcs674fyk2vz0r08vchjfar1q3ri2mfq4p7x5"; depends=[DBI digest httr lubridate RCurl RSQLite shiny]; };
 arf3DS4 = derive { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; };
 arfima = derive { name="arfima"; version="1.2-7"; sha256="00mc50hssnv7qj6dn1l3jgx8ca4vjkqirc38rv538xwjgw9mm1ms"; depends=[ltsa]; };
 argosfilter = derive { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; };
-argparse = derive { name="argparse"; version="1.0.1"; sha256="03p8dpwc26xz01lfbnmckcx6wzky43dyq71085b0anzsavgx0786"; depends=[proto findpython getopt rjson]; };
+argparse = derive { name="argparse"; version="1.0.1"; sha256="03p8dpwc26xz01lfbnmckcx6wzky43dyq71085b0anzsavgx0786"; depends=[findpython getopt proto rjson]; };
 argparser = derive { name="argparser"; version="0.1"; sha256="0x4wm8hjzb779pp39v8q210npg7kzh9m8wwqmd17aaqaa3l2al9f"; depends=[]; };
-arm = derive { name="arm"; version="1.8-5"; sha256="0mjsjqrim2a6ds8gxrbdyp96b6sz1vjsqic80a5izrc2z9bml5p5"; depends=[MASS Matrix lme4 abind coda nlme]; };
+arm = derive { name="arm"; version="1.8-5"; sha256="0mjsjqrim2a6ds8gxrbdyp96b6sz1vjsqic80a5izrc2z9bml5p5"; depends=[abind coda lme4 MASS Matrix nlme]; };
 arnie = derive { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; };
-aroma_affymetrix = derive { name="aroma.affymetrix"; version="2.13.2"; sha256="0km1mhy8p6pksa0wnwx0cxbfgipi6c7xn7913agsqdpfbfphhm8j"; depends=[R_utils aroma_core R_methodsS3 R_oo R_cache R_devices R_filesets aroma_apd MASS matrixStats]; };
-aroma_apd = derive { name="aroma.apd"; version="0.6.0"; sha256="1l9p5qww71h6wlg2z15wirsfz2i7hmf637l17zaf3n7fp9s3flc7"; depends=[R_methodsS3 R_oo R_utils R_huge]; };
-aroma_cn = derive { name="aroma.cn"; version="1.6.0"; sha256="090qqvv6sk0508knmh2qr1lvpc2vr8s17mj6siblzc66ldp22dj7"; depends=[R_utils aroma_core R_methodsS3 R_oo R_filesets R_cache matrixStats PSCBS]; };
-aroma_core = derive { name="aroma.core"; version="2.13.1"; sha256="1085qh092sij4c3wl3g10wc8agr13bnqbrq3k4fnm53jpa786qsx"; depends=[R_utils R_filesets R_devices R_methodsS3 R_oo R_cache R_rsp matrixStats RColorBrewer PSCBS]; };
-arqas = derive { name="arqas"; version="1.0"; sha256="1wqrvrmwpgkccr8vi0kn6xiy191ib1zxzrclb6v564bkj16s2w5q"; depends=[distr ggplot2 reshape iterators doParallel foreach fitdistrplus gridExtra]; };
+aroma_affymetrix = derive { name="aroma.affymetrix"; version="2.13.2"; sha256="0km1mhy8p6pksa0wnwx0cxbfgipi6c7xn7913agsqdpfbfphhm8j"; depends=[aroma_apd aroma_core MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; };
+aroma_apd = derive { name="aroma.apd"; version="0.6.0"; sha256="1l9p5qww71h6wlg2z15wirsfz2i7hmf637l17zaf3n7fp9s3flc7"; depends=[R_huge R_methodsS3 R_oo R_utils]; };
+aroma_cn = derive { name="aroma.cn"; version="1.6.0"; sha256="090qqvv6sk0508knmh2qr1lvpc2vr8s17mj6siblzc66ldp22dj7"; depends=[aroma_core matrixStats PSCBS R_cache R_filesets R_methodsS3 R_oo R_utils]; };
+aroma_core = derive { name="aroma.core"; version="2.13.1"; sha256="1085qh092sij4c3wl3g10wc8agr13bnqbrq3k4fnm53jpa786qsx"; depends=[matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; };
+arqas = derive { name="arqas"; version="1.1"; sha256="1vdx9nfqkdrn6s4h90spb0g5vk7qxm5rg3mr2jkk4n67x7s5cv3x"; depends=[distr doParallel fitdistrplus foreach ggplot2 gridExtra iterators reshape]; };
 arrayhelpers = derive { name="arrayhelpers"; version="0.76-20120816"; sha256="1q80dykcbqbcigv2f9xg1brfm3835i0zvs0810q6kh682a3hpqbi"; depends=[]; };
 ars = derive { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; };
 arules = derive { name="arules"; version="1.1-6"; sha256="0xq0j4phwqw9cx2yzxx8xx4srnjjlv75cd463x959bycsp6fzb5r"; depends=[Matrix]; };
 arulesNBMiner = derive { name="arulesNBMiner"; version="0.1-4"; sha256="05vj7pzzh84xr6d0m16dhzr7bw50hkiyq99vl46zinak648my338"; depends=[arules rJava]; };
 arulesSequences = derive { name="arulesSequences"; version="0.2-6"; sha256="1fvph6c8dy3hj0h63h85bzzzka8dx0cc0lcncz9svyahy1j4q3z0"; depends=[arules]; };
-arulesViz = derive { name="arulesViz"; version="1.0-0"; sha256="0g4bqfn8jya992r2wbi044v68mj508h52snrdcd5ijhdhw8xq9xc"; depends=[arules scatterplot3d vcd seriation igraph]; };
+arulesViz = derive { name="arulesViz"; version="1.0-0"; sha256="0g4bqfn8jya992r2wbi044v68mj508h52snrdcd5ijhdhw8xq9xc"; depends=[arules igraph scatterplot3d seriation vcd]; };
 asVPC = derive { name="asVPC"; version="1.0.2"; sha256="07nfwr0lsfpwgfdgzcdn1svw8dnjfni5ga9q77yjd1bj0wf76ci2"; depends=[ggplot2 plyr]; };
-asbio = derive { name="asbio"; version="1.1-5"; sha256="1br9rhj6nghwx54i2hpjrsdhwg8v38s66cy8fc4pg97zypdnikpj"; depends=[scatterplot3d pixmap tkrplot plotrix mvtnorm deSolve lattice multcompView]; };
+asbio = derive { name="asbio"; version="1.1-5"; sha256="1br9rhj6nghwx54i2hpjrsdhwg8v38s66cy8fc4pg97zypdnikpj"; depends=[deSolve lattice multcompView mvtnorm pixmap plotrix scatterplot3d tkrplot]; };
 ascii = derive { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; };
-ascrda = derive { name="ascrda"; version="1.15"; sha256="17anzlhcjmrk13s5gs752rsc735y5wvba6r3w1nbv0cnkpnyk8i7"; depends=[class nnet rda MASS sfsmisc e1071 pamr]; };
+ascrda = derive { name="ascrda"; version="1.15"; sha256="17anzlhcjmrk13s5gs752rsc735y5wvba6r3w1nbv0cnkpnyk8i7"; depends=[class e1071 MASS nnet pamr rda sfsmisc]; };
 asd = derive { name="asd"; version="2.0"; sha256="1nnsbh6g0bhvhp6644zf2l6frr3qnls0s7y7r0g211b5zagq20z3"; depends=[mvtnorm]; };
 ash = derive { name="ash"; version="1.0-14"; sha256="15x16ld25i160asqf4z4difa6zn2yfgl04j8y8nqb0djymdx7a1f"; depends=[]; };
-aspace = derive { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[splancs Hmisc shapefiles]; };
+aspace = derive { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; };
 aspect = derive { name="aspect"; version="1.0-3"; sha256="12wyyr0ms8g3y96jz1x0y52dlma00j20h7hmm8m6y5p1lgk9kmcd"; depends=[]; };
 asremlPlus = derive { name="asremlPlus"; version="1.10-16"; sha256="17k1syfdsg097pawldw5mgy3a325p8k7xk99qpcivcl3pzsmw79q"; depends=[dae ggplot2]; };
 assertive = derive { name="assertive"; version="0.2-4"; sha256="0xc561fi322qd5z7ss2zi69nl3i8i56w8bksgd38fpjigg0x9fwl"; depends=[knitr]; };
 assertr = derive { name="assertr"; version="0.4.1"; sha256="1h77iisvyakccm7v1iqva04s1hn197sjcy28832cagqg89qlsg31"; depends=[dplyr]; };
 assertthat = derive { name="assertthat"; version="0.1"; sha256="0dwsqajyglfscqilj843qfqn1ndbqpswa7b4l1d633qjk9d68qqk"; depends=[]; };
-assist = derive { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[nlme lattice]; };
+assist = derive { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[lattice nlme]; };
 aster = derive { name="aster"; version="0.8-30"; sha256="0vdlimkkmd9ar5v3xrbi9gshvj980l7641brd7cqs78sqf0v71fn"; depends=[trust]; };
 aster2 = derive { name="aster2"; version="0.2-1"; sha256="1gr9hx0mhyan0jy7wsl4ccsx9ahlvhfiq0j1xnffa4m3hzazisn5"; depends=[]; };
 astro = derive { name="astro"; version="1.2"; sha256="1c7zrycgj2n8gz50m94ys1dspilds91s1b2pwaq6df1va17pznby"; depends=[MASS plotrix]; };
 astroFns = derive { name="astroFns"; version="4.1-0"; sha256="0g5q0y067xf1ah91b4lg8mr9imj0d6lgig7gbj3b69fn335k363g"; depends=[]; };
-astrochron = derive { name="astrochron"; version="0.4.2"; sha256="1wrpcngny2b4k0p3xagh5967yvvgxcsp87xcdp4raf4n1v3nk2xx"; depends=[multitaper IDPmisc fields]; };
+astrochron = derive { name="astrochron"; version="0.4.2"; sha256="1wrpcngny2b4k0p3xagh5967yvvgxcsp87xcdp4raf4n1v3nk2xx"; depends=[fields IDPmisc multitaper]; };
 astrodatR = derive { name="astrodatR"; version="0.1"; sha256="00689px4znwmlp6qbj6z2a51b7ylx1yrrjpv6zjkvrwpv6lyj9fw"; depends=[]; };
 astrolibR = derive { name="astrolibR"; version="0.1"; sha256="0gkgry5aiz29grp9vdq9zgg6ss47ql08nwcmz1pfvd0g0h9h75l8"; depends=[]; };
 astsa = derive { name="astsa"; version="1.3"; sha256="01bslr6hww029097244r5l4bz4v7z46gpihw39har8h0xicl6ywk"; depends=[]; };
 asympTest = derive { name="asympTest"; version="0.1.3"; sha256="11nlkgws3y8xbz3yli55414a2rkk7367q9q5r2ssa61jaiimibhh"; depends=[]; };
 asypow = derive { name="asypow"; version="2013.9-1"; sha256="0zd42ha30kysjhd6rwxr91k1hhsimw3py2inymbpxgyq4s890whs"; depends=[]; };
 atmcmc = derive { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; };
-atsd = derive { name="atsd"; version="1.0.8441"; sha256="1jz2bdgvk1wamrm8r9ygprhyf0z3mdk9c1pwlb4bfmwvbnqd0yqa"; depends=[RCurl httr]; };
-attribrisk = derive { name="attribrisk"; version="0.1"; sha256="1zqx53mxz2hh9jyanf3jkadgpj44jbqrk4p13fas91zvhpw9pn5s"; depends=[survival boot]; };
+atsd = derive { name="atsd"; version="1.0.8441"; sha256="1jz2bdgvk1wamrm8r9ygprhyf0z3mdk9c1pwlb4bfmwvbnqd0yqa"; depends=[httr RCurl]; };
+attribrisk = derive { name="attribrisk"; version="0.1"; sha256="1zqx53mxz2hh9jyanf3jkadgpj44jbqrk4p13fas91zvhpw9pn5s"; depends=[boot survival]; };
 audio = derive { name="audio"; version="0.1-5"; sha256="1hv4052n2r6jkzkilhkfsk4dj1xhbgk4bhba2ca9nf8ag92jkqml"; depends=[]; };
-audiolyzR = derive { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin RJSONIO plotrix]; };
+audiolyzR = derive { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; };
 audit = derive { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; };
 autoencoder = derive { name="autoencoder"; version="1.0"; sha256="18i6b2vjhlq9f82syw3k88gm9bvklv827nflgzq0xzjnzh6z5nr8"; depends=[]; };
-automap = derive { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[sp gstat lattice reshape]; };
+automap = derive { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[gstat lattice reshape sp]; };
 autopls = derive { name="autopls"; version="1.3"; sha256="1qf5gk1vsz1p5670w7bgzh3b15wvrx1gy6ih4sivw0vj8bcjxbw9"; depends=[pls]; };
 aws = derive { name="aws"; version="1.9-4"; sha256="11vbsg4yhnl4995m8gq5gykrlk61y3a618g2zxkc9wdf5z4xqdny"; depends=[awsMethods gsl]; };
 awsMethods = derive { name="awsMethods"; version="1.0-3"; sha256="1r6rbrlc5wbljp2x9aqhhnjblnb3gjm217x0cbmrw1pa0cf7q5jq"; depends=[]; };
@@ -2512,16 +2523,16 @@ b6e6rl = derive { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaf
 bPeaks = derive { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; };
 bReeze = derive { name="bReeze"; version="0.4-0"; sha256="1znhmb2inbfv574adhwjwk3qf9kikrxrly4n6sfyim1z6sagnj0z"; depends=[]; };
 babar = derive { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; };
-babel = derive { name="babel"; version="0.2-6"; sha256="1dsxjnhr0cky7wlzz8pr8rn3cldfcyrh8v6gn2ba4abr0df7i4dd"; depends=[]; };
+babel = derive { name="babel"; version="0.2-6"; sha256="1dsxjnhr0cky7wlzz8pr8rn3cldfcyrh8v6gn2ba4abr0df7i4dd"; depends=[edgeR]; };
 babynames = derive { name="babynames"; version="0.1"; sha256="0qq0303mmcnpfy5630d7rqmb8rl36p7hg2z842rzd4lkhy8c2l07"; depends=[]; };
-backShift = derive { name="backShift"; version="0.1.1"; sha256="11mr2pdg63xa5yrybv91fxz69jizpshs67i7a8lb84n6ydaq1pj3"; depends=[jointDiag clue pcalg igraph matrixcalc reshape2]; };
+backShift = derive { name="backShift"; version="0.1.1"; sha256="11mr2pdg63xa5yrybv91fxz69jizpshs67i7a8lb84n6ydaq1pj3"; depends=[clue igraph jointDiag matrixcalc pcalg reshape2]; };
 backtest = derive { name="backtest"; version="0.3-2"; sha256="06q488pynxgis1m6rxc8hgscpy8vimffpi4aamviwb089sjzilnn"; depends=[lattice]; };
 bagRboostR = derive { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; };
-bamdit = derive { name="bamdit"; version="1.1-1"; sha256="0f865yfwd2pvbkcx8jm4iyilldmprsgyqnscp1n28rp3sbdii4bl"; depends=[coda rjags]; };
+bamdit = derive { name="bamdit"; version="2.0"; sha256="1zqc2iwsa9p3lvqbf87yf6j24i0c5ybpizxp4gkaibg2llaskxki"; depends=[ggplot2 gridExtra R2jags rjags]; };
 bams = derive { name="bams"; version="1.6"; sha256="1pplnpilpydxf7gcs87424cajss74q8cr9pyv2biy4pkvfql0nxl"; depends=[]; };
 bandit = derive { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; };
 barcode = derive { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; };
-bartMachine = derive { name="bartMachine"; version="1.2.0"; sha256="0hcz39397v2y8qgdy67i97j0z5g2qidkkf5p9ydcqp9fp5msshq7"; depends=[rJava car randomForest missForest]; };
+bartMachine = derive { name="bartMachine"; version="1.2.0"; sha256="0hcz39397v2y8qgdy67i97j0z5g2qidkkf5p9ydcqp9fp5msshq7"; depends=[car missForest randomForest rJava]; };
 base64 = derive { name="base64"; version="1.1"; sha256="1wn3zj1qlgybzid4nr6hvlyqg1rp2dwfh88vxrfby2fy2ba1nl5x"; depends=[]; };
 base64enc = derive { name="base64enc"; version="0.1-2"; sha256="0d2b7vl08abssfwprfiqc0yscb1gz4xlzlwwbf7y9z19wbyxizh5"; depends=[]; };
 baseline = derive { name="baseline"; version="1.2-0"; sha256="12gjirk9jyq7lmfkp10kcli84bld9n9m6yhcj5z6y4iaq6d8hazq"; depends=[SparseM]; };
@@ -2529,50 +2540,51 @@ basicspace = derive { name="basicspace"; version="0.15"; sha256="11aqrai26kdwszz
 batade = derive { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; };
 batch = derive { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; };
 batchmeans = derive { name="batchmeans"; version="1.0-2"; sha256="126q7gyb1namhb56pi0rv9hchlghjr95pflmmpwhblqfq27djss2"; depends=[]; };
-bayesDccGarch = derive { name="bayesDccGarch"; version="1.1"; sha256="1gjba5c9vfgvhlard6k47rc2f4r497qy4ybjwr57rm3n3jb0vkl1"; depends=[numDeriv coda]; };
-bayesDem = derive { name="bayesDem"; version="2.4-1"; sha256="0s2dhy8c90smvaxcng6ixhjm7kvwwz2c4lgplynrggrm8rfb19ay"; depends=[gWidgets gWidgetsRGtk2 bayesTFR bayesLife bayesPop RGtk2 wpp2012]; };
-bayesGARCH = derive { name="bayesGARCH"; version="2.0.1"; sha256="1gz18wjikkg3yf71b1g21cx918dyz89f5m295iv8ah807cdx7vjk"; depends=[mvtnorm coda]; };
+bayesDccGarch = derive { name="bayesDccGarch"; version="1.1"; sha256="1gjba5c9vfgvhlard6k47rc2f4r497qy4ybjwr57rm3n3jb0vkl1"; depends=[coda numDeriv]; };
+bayesDem = derive { name="bayesDem"; version="2.4-1"; sha256="0s2dhy8c90smvaxcng6ixhjm7kvwwz2c4lgplynrggrm8rfb19ay"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2012]; };
+bayesGARCH = derive { name="bayesGARCH"; version="2.0.1"; sha256="1gz18wjikkg3yf71b1g21cx918dyz89f5m295iv8ah807cdx7vjk"; depends=[coda mvtnorm]; };
 bayesGDS = derive { name="bayesGDS"; version="0.6.1"; sha256="0134x5knwp9pmkjyzgi1k7hjj92sym1p0zq98sizlbs0mff2p2s4"; depends=[Matrix]; };
-bayesLife = derive { name="bayesLife"; version="2.2-0"; sha256="09r915azz60ca5b4w0kkd8x8mb0cxz36lapakdmgrgxd4qax17nv"; depends=[bayesTFR wpp2012 hett car coda]; };
-bayesMCClust = derive { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[gplots xtable mnormt MASS bayesm boa e1071 gtools]; };
-bayesPop = derive { name="bayesPop"; version="5.3-4"; sha256="1zq0vjkz4b33niwldli6sh8pgz5wsyzk59iyx5bcdpkbkprv57np"; depends=[bayesTFR bayesLife abind plyr wpp2012]; };
+bayesLife = derive { name="bayesLife"; version="2.2-0"; sha256="09r915azz60ca5b4w0kkd8x8mb0cxz36lapakdmgrgxd4qax17nv"; depends=[bayesTFR car coda hett wpp2012]; };
+bayesMCClust = derive { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[bayesm boa e1071 gplots gtools MASS mnormt xtable]; };
+bayesPop = derive { name="bayesPop"; version="5.3-4"; sha256="1zq0vjkz4b33niwldli6sh8pgz5wsyzk59iyx5bcdpkbkprv57np"; depends=[abind bayesLife bayesTFR plyr wpp2012]; };
 bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; };
-bayesSurv = derive { name="bayesSurv"; version="2.4"; sha256="014jxlx4w6lzzq9axdk8mwwlppmly0yj9i14zhmngdbr7mxh3f87"; depends=[survival coda smoothSurv]; };
-bayesTFR = derive { name="bayesTFR"; version="4.1-2"; sha256="17qv25yrprj099vx1jj46ycgxnc4ldx6qcqx42h5gz38qqzz2q4s"; depends=[mvtnorm MASS coda wpp2012]; };
+bayesSurv = derive { name="bayesSurv"; version="2.4"; sha256="014jxlx4w6lzzq9axdk8mwwlppmly0yj9i14zhmngdbr7mxh3f87"; depends=[coda smoothSurv survival]; };
+bayesTFR = derive { name="bayesTFR"; version="4.1-2"; sha256="17qv25yrprj099vx1jj46ycgxnc4ldx6qcqx42h5gz38qqzz2q4s"; depends=[coda MASS mvtnorm wpp2012]; };
 bayesclust = derive { name="bayesclust"; version="3.1"; sha256="0zxjd64nz8c6vg6jwb2xh6kbw41a2pcmlwq5cl6k2kbplqbm2jdf"; depends=[]; };
-bayescount = derive { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[runjags rjags coda]; };
-bayesm = derive { name="bayesm"; version="2.2-5"; sha256="16cnm1i7vwviqxwq3yhj5r9a46qaanq2mb4snd0659rkia6p8h7a"; depends=[]; };
-bayesmix = derive { name="bayesmix"; version="0.7-3"; sha256="142132aslmmm35yai4n1d2hqqkczvrnm8ln9gwxvbczmxaggnc01"; depends=[rjags coda]; };
+bayescount = derive { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; };
+bayesm = derive { name="bayesm"; version="3.0-1"; sha256="06j7zm4y8is5csk9krjv2gvk8j25nd77wk208b8zk5qld7a9q4r5"; depends=[Rcpp RcppArmadillo]; };
+bayesmix = derive { name="bayesmix"; version="0.7-3"; sha256="142132aslmmm35yai4n1d2hqqkczvrnm8ln9gwxvbczmxaggnc01"; depends=[coda rjags]; };
 bayespref = derive { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; };
-bayess = derive { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[MASS mnormt gplots combinat]; };
-bayou = derive { name="bayou"; version="1.0.1"; sha256="0l342a4lsn6b18i2kyk2hr50k69bb7jcw8dlnbi96yf1i58qcdri"; depends=[ape geiger phytools coda Rcpp MASS mnormt fitdistrplus denstrip Rcpp RcppArmadillo]; };
+bayess = derive { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; };
+bayou = derive { name="bayou"; version="1.0.1"; sha256="0l342a4lsn6b18i2kyk2hr50k69bb7jcw8dlnbi96yf1i58qcdri"; depends=[ape coda denstrip fitdistrplus geiger MASS mnormt phytools Rcpp RcppArmadillo]; };
 bbefkr = derive { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; };
 bbemkr = derive { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; };
-bbmle = derive { name="bbmle"; version="1.0.17"; sha256="1j3x2glnn0i0fc0mmafwkkqh1js90g8q7gix2vrhif0pmwinsrak"; depends=[numDeriv lattice MASS]; };
+bbmle = derive { name="bbmle"; version="1.0.17"; sha256="1j3x2glnn0i0fc0mmafwkkqh1js90g8q7gix2vrhif0pmwinsrak"; depends=[lattice MASS numDeriv]; };
 bbo = derive { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; };
-bc3net = derive { name="bc3net"; version="1.0.2"; sha256="0iakqf4apscxb4mb5klj9qklbi25dmdd77la3ads2y882gm2nj0z"; depends=[c3net infotheo igraph Matrix lattice]; };
+bc3net = derive { name="bc3net"; version="1.0.2"; sha256="0iakqf4apscxb4mb5klj9qklbi25dmdd77la3ads2y882gm2nj0z"; depends=[c3net igraph infotheo lattice Matrix]; };
 bclust = derive { name="bclust"; version="1.4"; sha256="1s04fqff5bw6d5kk0smvach6yq492dv1w0ahh9mrm2jsi2q58h7p"; depends=[]; };
-bcp = derive { name="bcp"; version="3.0.1"; sha256="08sa1az1ljsi00zmj3l7z8p1j5im1w79yjxy8k1p6ba90bck7l4h"; depends=[foreach iterators Rcpp Rcpp]; };
-bcpa = derive { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[Rcpp plyr Rcpp]; };
+bcp = derive { name="bcp"; version="3.0.1"; sha256="08sa1az1ljsi00zmj3l7z8p1j5im1w79yjxy8k1p6ba90bck7l4h"; depends=[foreach iterators Rcpp]; };
+bcpa = derive { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; };
 bcpmeta = derive { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; };
-bcrm = derive { name="bcrm"; version="0.4.4"; sha256="0gcigc7505fsk1m70df3n0dz553adkbs8yz2bhskb4qrw4gbmvr7"; depends=[mvtnorm ggplot2]; };
+bcrm = derive { name="bcrm"; version="0.4.4"; sha256="0gcigc7505fsk1m70df3n0dz553adkbs8yz2bhskb4qrw4gbmvr7"; depends=[ggplot2 mvtnorm]; };
+bcrypt = derive { name="bcrypt"; version="0.1"; sha256="0myrxdayrjdx5zvsvdv1cj1cfjnsd0llrvffw7spdnmryli7wbfh"; depends=[openssl]; };
 bcv = derive { name="bcv"; version="1.0.1"; sha256="0yqcfariw9sw0b8cpljcr7vf5rf0cwr1wbif23icchfaxk2m42gj"; depends=[]; };
 bda = derive { name="bda"; version="5.1.3"; sha256="0v2xki9a1j6y42x03a3rrm746xx4qd3ris1m0k7alh25j3ayhs3p"; depends=[]; };
-bde = derive { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[shiny ggplot2]; };
+bde = derive { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; };
 bdoc = derive { name="bdoc"; version="1.2"; sha256="15d7grc0a1hakkxhgbm2gp0awggzlmsp8zf8abj5bgfih63gcmj2"; depends=[]; };
 bdpv = derive { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g72wbvzlx52mz4ahw700xjc7n"; depends=[]; };
 bdscale = derive { name="bdscale"; version="1.2"; sha256="0j2h7ainfnh78szp355didbkmcl6d5vz1di8nznjarwxncrbgc6g"; depends=[ggplot2 scales]; };
 bdsmatrix = derive { name="bdsmatrix"; version="1.3-2"; sha256="16qhfwk0r1snm9hg32qwz7hizkpwc32m723hjm23m2026gvz2nwy"; depends=[]; };
-bdvis = derive { name="bdvis"; version="0.1.0"; sha256="1f837i48gmspx9xrnxzsgdbg6ykxmvkp8l20y19yd9iakhv7k3jy"; depends=[maps plotrix sqldf plyr taxize treemap ggplot2]; };
-bdynsys = derive { name="bdynsys"; version="1.3"; sha256="07gfyp0qwq9y1cnh7lhcz7q0b1s51cjwlbpll50l2cza2dszmf29"; depends=[plm Formula MASS Hmisc deSolve pracma caTools matrixStats]; };
-beadarrayFilter = derive { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[RColorBrewer]; };
-beadarrayMSV = derive { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[rggobi]; };
+bdvis = derive { name="bdvis"; version="0.1.0"; sha256="1f837i48gmspx9xrnxzsgdbg6ykxmvkp8l20y19yd9iakhv7k3jy"; depends=[ggplot2 maps plotrix plyr sqldf taxize treemap]; };
+bdynsys = derive { name="bdynsys"; version="1.3"; sha256="07gfyp0qwq9y1cnh7lhcz7q0b1s51cjwlbpll50l2cza2dszmf29"; depends=[caTools deSolve Formula Hmisc MASS matrixStats plm pracma]; };
+beadarrayFilter = derive { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[beadarray RColorBrewer]; };
+beadarrayMSV = derive { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[Biobase geneplotter limma rggobi]; };
 beanplot = derive { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; };
-bear = derive { name="bear"; version="2.6.4"; sha256="1v5rcb7aqzc7zjbbwwcy02z79crxq90mxs32k2gfvf7jzky09hpy"; depends=[reshape nlme gdata ICSNP sciplot plotrix ggplot2 png]; };
-beepr = derive { name="beepr"; version="1.1"; sha256="187gww50yc8hzrzwz6j9ib101196g6ci9fx3dqyhg764ydn8if1n"; depends=[stringr audio]; };
+bear = derive { name="bear"; version="2.6.4"; sha256="1v5rcb7aqzc7zjbbwwcy02z79crxq90mxs32k2gfvf7jzky09hpy"; depends=[gdata ggplot2 ICSNP nlme plotrix png reshape sciplot]; };
+beepr = derive { name="beepr"; version="1.2"; sha256="0w4szy3rgj1bdcanxbcb9agyw38jqp0hc7qsn7j9700vh20zqbln"; depends=[audio stringr]; };
 beeswarm = derive { name="beeswarm"; version="0.2.0"; sha256="05yhddljmls35xdffp7iikgwh3jh5s4b7w5d2gw89w7l8hr62ypz"; depends=[]; };
 benchden = derive { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; };
-benchmark = derive { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[proto ggplot2 relations psychotools reshape scales plyr]; };
+benchmark = derive { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[ggplot2 plyr proto psychotools relations reshape scales]; };
 benford_analysis = derive { name="benford.analysis"; version="0.1.1"; sha256="00ynk1af5nbq8bn8y77sckx4w32g5zxcp06pdpcxwvp38d7hxhvc"; depends=[data_table]; };
 bentcableAR = derive { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; };
 ber = derive { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; };
@@ -2580,46 +2592,46 @@ berryFunctions = derive { name="berryFunctions"; version="1.8.1"; sha256="0plksy
 bestglm = derive { name="bestglm"; version="0.34"; sha256="0b6lj91v0vww0fy50sqdn99izkxqbhv83y3zkyrrpvdzwia4dg9w"; depends=[leaps]; };
 betafam = derive { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; };
 betapart = derive { name="betapart"; version="1.3"; sha256="0h2y2c3q6njzh2rlxh8izgkrq9y7abkbb0b13f2iyj9pnalvdv52"; depends=[ape geometry picante rcdd]; };
-betaper = derive { name="betaper"; version="1.1-0"; sha256="1gr533iw71n2sq8gga9kzlah7k28cnlwxb2yh562gw6mh1axmidm"; depends=[vegan ellipse]; };
+betaper = derive { name="betaper"; version="1.1-0"; sha256="1gr533iw71n2sq8gga9kzlah7k28cnlwxb2yh562gw6mh1axmidm"; depends=[ellipse vegan]; };
 betareg = derive { name="betareg"; version="3.0-5"; sha256="1zpj1x5jvkn7d8jln16vr4xziahng0f54vb4gc4vs03z7c853i4a"; depends=[flexmix Formula lmtest modeltools sandwich]; };
 betas = derive { name="betas"; version="0.1.1"; sha256="1v85r6lrk21viwzam42gi42bgbwh5ibn3dpbh3aqrf3dnn1rdsyd"; depends=[robust]; };
 betategarch = derive { name="betategarch"; version="3.2"; sha256="0x3l1zvdp8r7mam7fvdlh1w3dwpjwj86n0ysfk8g824p4mn2wsgv"; depends=[zoo]; };
 bethel = derive { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; };
 bezier = derive { name="bezier"; version="1.1"; sha256="1bhqf1zbshkf1x8mgqp4mkgdxk9jxi51xj6i47kqkyn9gbdzch0c"; depends=[]; };
-bfa = derive { name="bfa"; version="0.3.1"; sha256="02vnbm77blllb74kll8w1i91k0llk43vq60aqjwpc5kqmzy652pk"; depends=[coda Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
-bfast = derive { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[strucchange zoo forecast sp raster]; };
-bfp = derive { name="bfp"; version="0.0-27"; sha256="08hlr33dwwjc4ag8vfsa3w4rcsc2093j8zwb05xkkl5nwqsq3mq0"; depends=[Rcpp Rcpp]; };
-bgeva = derive { name="bgeva"; version="0.3"; sha256="0isijl43kmg4x7mdnvz0lrxr87f68dl4jx7gmlg70m8r6kk8cfqn"; depends=[mgcv magic trust]; };
+bfa = derive { name="bfa"; version="0.3.1"; sha256="02vnbm77blllb74kll8w1i91k0llk43vq60aqjwpc5kqmzy652pk"; depends=[coda Rcpp RcppArmadillo]; };
+bfast = derive { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[forecast raster sp strucchange zoo]; };
+bfp = derive { name="bfp"; version="0.0-27"; sha256="08hlr33dwwjc4ag8vfsa3w4rcsc2093j8zwb05xkkl5nwqsq3mq0"; depends=[Rcpp]; };
+bgeva = derive { name="bgeva"; version="0.3"; sha256="0isijl43kmg4x7mdnvz0lrxr87f68dl4jx7gmlg70m8r6kk8cfqn"; depends=[magic mgcv trust]; };
 bglm = derive { name="bglm"; version="1.0"; sha256="1ln5clsfhpzjkm6cjil0lfqg687b0xxbvw1hcvangc0c0s314mrz"; depends=[mvtnorm]; };
-bgmm = derive { name="bgmm"; version="1.7"; sha256="00bjwmgqvz053yczvllf1nxy1g88fgwrrzhnw309f2yjr1qvjbgg"; depends=[mvtnorm car lattice combinat]; };
+bgmm = derive { name="bgmm"; version="1.7"; sha256="00bjwmgqvz053yczvllf1nxy1g88fgwrrzhnw309f2yjr1qvjbgg"; depends=[car combinat lattice mvtnorm]; };
 biasbetareg = derive { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; };
 bibtex = derive { name="bibtex"; version="0.4.0"; sha256="0sy1czwjff3kdfnmlkp036qlnw8dzdl5al7izy1cc0535hsijv0d"; depends=[]; };
-biclust = derive { name="biclust"; version="1.2.0"; sha256="03vkj7zp3dl4zbv2gzv9pahcd1018lbv4ixghvv1g0fsbndrybdg"; depends=[MASS colorspace lattice flexclust]; };
-bifactorial = derive { name="bifactorial"; version="1.4.7"; sha256="187zlsqph7m63wf6wajvs6a4a08aax9hiqssgvma6cpkpisfiz4k"; depends=[mvtnorm multcomp lattice Rcpp Rcpp]; };
+biclust = derive { name="biclust"; version="1.2.0"; sha256="03vkj7zp3dl4zbv2gzv9pahcd1018lbv4ixghvv1g0fsbndrybdg"; depends=[colorspace flexclust lattice MASS]; };
+bifactorial = derive { name="bifactorial"; version="1.4.7"; sha256="187zlsqph7m63wf6wajvs6a4a08aax9hiqssgvma6cpkpisfiz4k"; depends=[lattice multcomp mvtnorm Rcpp]; };
 bigGP = derive { name="bigGP"; version="0.1-5"; sha256="0hlfylwinkwz2s8wgqf6qwxrrdx5a02ln13y4arfwwlqi1kw0s4q"; depends=[Rmpi]; };
-bigRR = derive { name="bigRR"; version="1.3-10"; sha256="08m77r9br6wb9i21smaj4pwwpq3nxdirs542gnkrpakl7bvyp6s3"; depends=[hglm DatABEL]; };
-bigalgebra = derive { name="bigalgebra"; version="0.8.4"; sha256="19rv552ac0q9djc1yvpldkc0lipdf6q143m9dnndpsqs7ayqlr4g"; depends=[bigmemory bigmemory BH]; };
-biganalytics = derive { name="biganalytics"; version="1.1.1"; sha256="0g45b293c1z9n2z9ab66jsy8yaiqm7bbs2d6pglzwgmmdvwy03qd"; depends=[bigmemory BH bigmemory]; };
-bigdata = derive { name="bigdata"; version="0.1"; sha256="1n1zcjhvb2s87d7fkcm95x11ss4b8pczza0n55gxjv4przfiq0in"; depends=[glmnet Matrix lattice]; };
+bigRR = derive { name="bigRR"; version="1.3-10"; sha256="08m77r9br6wb9i21smaj4pwwpq3nxdirs542gnkrpakl7bvyp6s3"; depends=[DatABEL hglm]; };
+bigalgebra = derive { name="bigalgebra"; version="0.8.4"; sha256="19rv552ac0q9djc1yvpldkc0lipdf6q143m9dnndpsqs7ayqlr4g"; depends=[BH bigmemory]; };
+biganalytics = derive { name="biganalytics"; version="1.1.1"; sha256="0g45b293c1z9n2z9ab66jsy8yaiqm7bbs2d6pglzwgmmdvwy03qd"; depends=[BH bigmemory]; };
+bigdata = derive { name="bigdata"; version="0.1"; sha256="1n1zcjhvb2s87d7fkcm95x11ss4b8pczza0n55gxjv4przfiq0in"; depends=[glmnet lattice Matrix]; };
 biglars = derive { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f4nmgkx4mnyqs5iscwsyahr6qigx1rz9x"; depends=[ff]; };
 biglm = derive { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; };
-bigmemory = derive { name="bigmemory"; version="4.4.6"; sha256="1pplnpxqg380l5mjgz0ak4ipsx7x54339n2wr3dd29xv3w2fb5rp"; depends=[bigmemory_sri BH BH]; };
+bigmemory = derive { name="bigmemory"; version="4.4.6"; sha256="1pplnpxqg380l5mjgz0ak4ipsx7x54339n2wr3dd29xv3w2fb5rp"; depends=[BH bigmemory_sri]; };
 bigmemory_sri = derive { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; };
-bigml = derive { name="bigml"; version="0.1.2"; sha256="0vl5krjbgckknxwl26b2hn63jhb80zbn7abpckhxzxfxzncpnfz9"; depends=[RJSONIO RCurl plyr]; };
-bigpca = derive { name="bigpca"; version="1.0"; sha256="1s4qmg7xl8z0sv1b1vfqw0r5cvlbrxx1n0m03ira8fpykcck2clm"; depends=[reader NCmisc bigmemory biganalytics bigmemory_sri BH irlba]; };
-bigrf = derive { name="bigrf"; version="0.1-11"; sha256="0lazi8jk8aapdyyynd5yfcbn4jpjyxh8l64ayd0jj3nisl6hvmdh"; depends=[bigmemory foreach bigmemory BH]; };
-bigrquery = derive { name="bigrquery"; version="0.1.0"; sha256="15ibgi6bqvn0ydq8jx1xhwkwpwwyd7w4f2ams2gpafpysc2f2ks6"; depends=[httr jsonlite assertthat R6 dplyr]; };
+bigml = derive { name="bigml"; version="0.1.2"; sha256="0vl5krjbgckknxwl26b2hn63jhb80zbn7abpckhxzxfxzncpnfz9"; depends=[plyr RCurl RJSONIO]; };
+bigpca = derive { name="bigpca"; version="1.0"; sha256="1s4qmg7xl8z0sv1b1vfqw0r5cvlbrxx1n0m03ira8fpykcck2clm"; depends=[BH biganalytics bigmemory bigmemory_sri irlba NCmisc reader]; };
+bigrf = derive { name="bigrf"; version="0.1-11"; sha256="0lazi8jk8aapdyyynd5yfcbn4jpjyxh8l64ayd0jj3nisl6hvmdh"; depends=[BH bigmemory foreach]; };
+bigrquery = derive { name="bigrquery"; version="0.1.0"; sha256="15ibgi6bqvn0ydq8jx1xhwkwpwwyd7w4f2ams2gpafpysc2f2ks6"; depends=[assertthat dplyr httr jsonlite R6]; };
 bigsplines = derive { name="bigsplines"; version="1.0-6"; sha256="03gan2wrsi2hfxhn3l05qd0x04x8ymkab9aqpfbfn59m296xhd3m"; depends=[]; };
-bigtabulate = derive { name="bigtabulate"; version="1.1.2"; sha256="0vp873r3gww6kfkjdm87qgcdi85362kq946lvs45ggvyv7iaw0wa"; depends=[bigmemory BH bigmemory]; };
+bigtabulate = derive { name="bigtabulate"; version="1.1.2"; sha256="0vp873r3gww6kfkjdm87qgcdi85362kq946lvs45ggvyv7iaw0wa"; depends=[BH bigmemory]; };
 bild = derive { name="bild"; version="1.1-5"; sha256="03has1zi57inicahl52ja006vv5cdndyxfsxp77l6nc3zc6ixna8"; depends=[]; };
 bimetallic = derive { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; };
 binGroup = derive { name="binGroup"; version="1.1-0"; sha256="1sf7prg2x1ryynf1kz7jr50svmga7kjgd5pi9qm3g2hyimz8mvs4"; depends=[]; };
 binMto = derive { name="binMto"; version="0.0-6"; sha256="1h9s42wk848x15f4glhsh2iikpra64miwlia6xz5dqlzbs4vw86k"; depends=[mvtnorm]; };
 binda = derive { name="binda"; version="1.0.2"; sha256="1hfqx79pq9bn37j8rwv11wsv6d9prph26p2hqmnxilsdxr953ib2"; depends=[entropy]; };
 bindata = derive { name="bindata"; version="0.9-19"; sha256="15ya21fz1kvq4qsppkn9ypiqvaq8q4vszdcgcymampa7zc07z2ld"; depends=[e1071 mvtnorm]; };
-binequality = derive { name="binequality"; version="0.6.1"; sha256="18pcz5b65zk6fwh597pcbpyy0j7gkxp5swwadxvsa3cainvyd07n"; depends=[gamlss gamlss_cens gamlss_dist survival ineq]; };
+binequality = derive { name="binequality"; version="0.6.1"; sha256="18pcz5b65zk6fwh597pcbpyy0j7gkxp5swwadxvsa3cainvyd07n"; depends=[gamlss gamlss_cens gamlss_dist ineq survival]; };
 bingat = derive { name="bingat"; version="1.1"; sha256="1pb1yy1xrfvh71pg237lkmi56p8pbam60rii5i5km1i960lq0wc1"; depends=[matrixStats network]; };
-binhf = derive { name="binhf"; version="1.0-1"; sha256="0l8925bj6mjv2y7fn76zh2g8xjig3kbbdy4jl0ip3gd9kbrakl9k"; depends=[wavethresh adlift]; };
+binhf = derive { name="binhf"; version="1.0-1"; sha256="0l8925bj6mjv2y7fn76zh2g8xjig3kbbdy4jl0ip3gd9kbrakl9k"; depends=[adlift wavethresh]; };
 binom = derive { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; };
 binomSamSize = derive { name="binomSamSize"; version="0.1-3"; sha256="0hryaf0y3yjxp84c0k80mhxj8zzlad697bv2yrvcjvllkzdvzbm7"; depends=[binom]; };
 binomTools = derive { name="binomTools"; version="1.0-1"; sha256="14594i7iapd6hy4j36yb88xmrbmczg8zgbs0b6k0adnmqf83bn4v"; depends=[]; };
@@ -2631,56 +2643,56 @@ bio_infer = derive { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9
 bio3d = derive { name="bio3d"; version="2.2-2"; sha256="0sqwl27n15sbablw4mcqgf0w2k28jc59wf8yqxrmqbg8cckfsh9j"; depends=[]; };
 bioPN = derive { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
 biogas = derive { name="biogas"; version="1.0.1"; sha256="0fjxfj4c4clyp4gkzm0dl5ls7pbyaxmff56dw59wswijm4na2il7"; depends=[]; };
-biogram = derive { name="biogram"; version="1.1"; sha256="04nkm972x1nzlacfjfk3i4gsqbfhrfaygmmw13hrp47j8snv8r26"; depends=[slam bit]; };
-biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[plyr RJSONIO Matrix]; };
-biomod2 = derive { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl256ws9namqdcdxq3w5g79ymfpymfav10h3a"; depends=[sp raster reshape ggplot2 abind rasterVis pROC nnet gbm mda randomForest rpart MASS]; };
+biogram = derive { name="biogram"; version="1.1"; sha256="04nkm972x1nzlacfjfk3i4gsqbfhrfaygmmw13hrp47j8snv8r26"; depends=[bit slam]; };
+biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[Matrix plyr RJSONIO]; };
+biomod2 = derive { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl256ws9namqdcdxq3w5g79ymfpymfav10h3a"; depends=[abind gbm ggplot2 MASS mda nnet pROC randomForest raster rasterVis reshape rpart sp]; };
 bionetdata = derive { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; };
 biopara = derive { name="biopara"; version="1.5"; sha256="1fhhs6lkm3iphlkx6wklh9sgr1mkjkka9wv2m8fnk0xw01bdsyl5"; depends=[]; };
 biorxivr = derive { name="biorxivr"; version="0.1.1"; sha256="0v2jmqpdcci3wwpcrakqcssahy3yx07s265axs14615w74dgd4kl"; depends=[XML]; };
-bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap e1071 scales cluster rgl]; };
+bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap cluster e1071 rgl scales]; };
 biosignalEMG = derive { name="biosignalEMG"; version="1.0.2"; sha256="0ywb59w3rgac59gif1jba8qi7rjdsdj7y5czj7kv8lf01vd5dl3l"; depends=[]; };
-biotools = derive { name="biotools"; version="2.1"; sha256="15ncx700v5ignr3gggz5zfspskzpj3kpzsy6rg2y4pnjm1vlndgj"; depends=[rpanel tkrplot MASS boot]; };
-bipartite = derive { name="bipartite"; version="2.05"; sha256="05w3ypdxy2lfygdlvg9xv88dpsf21i60rsbvvz058zwpfzr39hfh"; depends=[vegan sna fields igraph MASS permute]; };
-biplotbootGUI = derive { name="biplotbootGUI"; version="1.0"; sha256="0pgm31nhh1b78a8ciqjxw7gf3j7hh9wjc3myj29jpl92flbqmsw0"; depends=[rgl tkrplot vegan tcltk2]; };
+biotools = derive { name="biotools"; version="2.1"; sha256="15ncx700v5ignr3gggz5zfspskzpj3kpzsy6rg2y4pnjm1vlndgj"; depends=[boot MASS rpanel tkrplot]; };
+bipartite = derive { name="bipartite"; version="2.05"; sha256="05w3ypdxy2lfygdlvg9xv88dpsf21i60rsbvvz058zwpfzr39hfh"; depends=[fields igraph MASS permute sna vegan]; };
+biplotbootGUI = derive { name="biplotbootGUI"; version="1.0"; sha256="0pgm31nhh1b78a8ciqjxw7gf3j7hh9wjc3myj29jpl92flbqmsw0"; depends=[rgl tcltk2 tkrplot vegan]; };
 birdring = derive { name="birdring"; version="1.2"; sha256="1jhhvdipsx3kw8n6gw6amm1vq0m83l48dkark9vvi2hpd730ca1y"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; };
 birk = derive { name="birk"; version="1.3.0"; sha256="02h8vh2r1ilmfgx1j3yw9jlzwshqh70nac28qzq1f5mpqll8z1sg"; depends=[]; };
 bisectr = derive { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; };
-bisoreg = derive { name="bisoreg"; version="1.4"; sha256="1ianhk5vrzhwb9ymzvlx9701p5c4iasxyq7nhrvm815dm15rf2wf"; depends=[bootstrap monreg R2WinBUGS coda]; };
+bisoreg = derive { name="bisoreg"; version="1.4"; sha256="1ianhk5vrzhwb9ymzvlx9701p5c4iasxyq7nhrvm815dm15rf2wf"; depends=[bootstrap coda monreg R2WinBUGS]; };
 bit = derive { name="bit"; version="1.1-12"; sha256="0a6ig6nnjzq80r2ll4hc74za3xwzbzig6wlyb4dby0knzf3iqa6f"; depends=[]; };
 bit64 = derive { name="bit64"; version="0.9-4"; sha256="1w734l5ayr7w17a3gk2kmkqwz7v5jm830kfhyqmnd15i816lnjb9"; depends=[bit]; };
 bitops = derive { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; };
 bivarRIpower = derive { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; };
 biwavelet = derive { name="biwavelet"; version="0.17.10"; sha256="0rvlpqfrgajaw5bifc3103ixj2akdhpcxqhgw9fv0r1c5kv98qz0"; depends=[fields]; };
-biwt = derive { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[rrcov MASS]; };
+biwt = derive { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[MASS rrcov]; };
 bizdays = derive { name="bizdays"; version="0.2.2"; sha256="1n2bh7vy0fhxq20s4lnbhgig1012di34kfl61i0ap7pc6464kg8d"; depends=[]; };
 blender = derive { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; };
 blighty = derive { name="blighty"; version="3.1-4"; sha256="1fkz3vfcnciy6rfybddcp5j744dcsdpmf7cln2jky0krag8pjzpn"; depends=[]; };
-blkergm = derive { name="blkergm"; version="1.1"; sha256="0giknhcl14b4djn5k5v5n33b7bc3f8x6lx2h4jr25kpd89aynhq5"; depends=[network ergm statnet_common ergm]; };
+blkergm = derive { name="blkergm"; version="1.1"; sha256="0giknhcl14b4djn5k5v5n33b7bc3f8x6lx2h4jr25kpd89aynhq5"; depends=[ergm network statnet_common]; };
 blm = derive { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; };
-blme = derive { name="blme"; version="1.0-3"; sha256="0kr2svvjbsravvahg96f6q2whfgyx2y4wgbpj9caf3rc2bd5s4nj"; depends=[lme4]; };
-blmeco = derive { name="blmeco"; version="1.0"; sha256="0shhyvqq88i0nr6wdf78rlqk4c91jv26nrb19jcjcw2wxv1mnazq"; depends=[MASS MuMIn arm lme4]; };
+blme = derive { name="blme"; version="1.0-4"; sha256="1ca2b0248k0fj3lczn9shfjplz1sl4ay4v6djldizp2ch2vwdgy2"; depends=[lme4]; };
+blmeco = derive { name="blmeco"; version="1.0"; sha256="0shhyvqq88i0nr6wdf78rlqk4c91jv26nrb19jcjcw2wxv1mnazq"; depends=[arm lme4 MASS MuMIn]; };
 blockTools = derive { name="blockTools"; version="0.6-2"; sha256="0h04179ybklwbs69rg73p5h09fi3vzagh845r00ivw4iv18anq40"; depends=[MASS]; };
-blockcluster = derive { name="blockcluster"; version="3.0.2"; sha256="1qd92lj3ckrj7cvl9zs85igb0974wy5s4zwdnvfyvrsi2bqi3qp8"; depends=[Rcpp Rcpp RcppEigen]; };
+blockcluster = derive { name="blockcluster"; version="3.0.2"; sha256="1qd92lj3ckrj7cvl9zs85igb0974wy5s4zwdnvfyvrsi2bqi3qp8"; depends=[Rcpp RcppEigen]; };
 blockmatrix = derive { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; };
 blockmodeling = derive { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; };
-blockmodels = derive { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[Rcpp digest Rcpp RcppArmadillo]; };
+blockmodels = derive { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[digest Rcpp RcppArmadillo]; };
 blockrand = derive { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; };
 blocksdesign = derive { name="blocksdesign"; version="1.6"; sha256="1d188c1lyf5zvdffcw3w7imzjxxmr7nmr29zj9z1b64p1ddrryh4"; depends=[crossdes]; };
-blowtorch = derive { name="blowtorch"; version="1.0.2"; sha256="0ymhkzfdrfcsq2qc5hbn9i0p58xqf90vwd46960cszxacyzzcnrb"; depends=[ggplot2 foreach iterators]; };
-blsAPI = derive { name="blsAPI"; version="0.1.1"; sha256="1d9mzhhr9yrx1kca6mzrq3gqqismv2q5wf1zx76srqvpaja2wszq"; depends=[rjson RCurl]; };
+blowtorch = derive { name="blowtorch"; version="1.0.2"; sha256="0ymhkzfdrfcsq2qc5hbn9i0p58xqf90vwd46960cszxacyzzcnrb"; depends=[foreach ggplot2 iterators]; };
+blsAPI = derive { name="blsAPI"; version="0.1.1"; sha256="1d9mzhhr9yrx1kca6mzrq3gqqismv2q5wf1zx76srqvpaja2wszq"; depends=[RCurl rjson]; };
 bmd = derive { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; };
-bmem = derive { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia MASS lavaan sem snowfall]; };
-bmk = derive { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda plyr functional]; };
+bmem = derive { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia lavaan MASS sem snowfall]; };
+bmk = derive { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; };
 bmmix = derive { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; };
 bmp = derive { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; };
-bmrm = derive { name="bmrm"; version="3.0"; sha256="0ix5hfsvs2vnca0l1aflynddw6z85cqdyxn0y7xynkkapk182g4p"; depends=[lpSolve LowRankQP]; };
+bmrm = derive { name="bmrm"; version="3.0"; sha256="0ix5hfsvs2vnca0l1aflynddw6z85cqdyxn0y7xynkkapk182g4p"; depends=[LowRankQP lpSolve]; };
 bnlearn = derive { name="bnlearn"; version="3.8.1"; sha256="07lh67nw7wpjimim44zpw8h1rq4yqa2sdjcwj95bmyc25hlzv1s1"; depends=[]; };
 bnormnlr = derive { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; };
 bnpmr = derive { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; };
 boa = derive { name="boa"; version="1.1.7-2"; sha256="1n7i0i8jq2sa1kzhbgyqzl9d53wja7fsxd7rligc8xjm0sdsb386"; depends=[]; };
 boilerpipeR = derive { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; };
-bold = derive { name="bold"; version="0.2.6"; sha256="15hnbspp5s293v2jykmirf9rvdgpkd71h431gizz71ssayanzp67"; depends=[XML httr stringr assertthat jsonlite reshape plyr]; };
-boolean3 = derive { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[optimx numDeriv lattice rgenoud mvtnorm rlecuyer]; };
+bold = derive { name="bold"; version="0.2.6"; sha256="15hnbspp5s293v2jykmirf9rvdgpkd71h431gizz71ssayanzp67"; depends=[assertthat httr jsonlite plyr reshape stringr XML]; };
+boolean3 = derive { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[lattice mvtnorm numDeriv optimx rgenoud rlecuyer]; };
 boostSeq = derive { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; };
 boostr = derive { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; };
 boot = derive { name="boot"; version="1.3-16"; sha256="1fdp3yccsffqpm209dy11085i81cj7g36l34bb94rmd27mqiwrfi"; depends=[]; };
@@ -2689,74 +2701,74 @@ bootLR = derive { name="bootLR"; version="0.9"; sha256="0p4hq8nfdd8jw8r8dmlb6va4
 bootRes = derive { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; };
 bootSVD = derive { name="bootSVD"; version="0.5"; sha256="14xwbrpqj3j1xpsppgjxpn9ggsns2n1kmni9vn30vgy68zwvs2wy"; depends=[ff]; };
 bootStepAIC = derive { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; };
-bootnet = derive { name="bootnet"; version="0.1"; sha256="18bx0za81z8za0hswj1qwl7a721xbvfpjz0hsih7glf6n5hn0cyp"; depends=[ggplot2 IsingFit qgraph dplyr gtools corpcor]; };
+bootnet = derive { name="bootnet"; version="0.1"; sha256="18bx0za81z8za0hswj1qwl7a721xbvfpjz0hsih7glf6n5hn0cyp"; depends=[corpcor dplyr ggplot2 gtools IsingFit qgraph]; };
 bootruin = derive { name="bootruin"; version="1.2-1"; sha256="1ii1fcj8sn9x82w23yfzxkgngrgsncnyrik4gcqn6kv7sl58f4r3"; depends=[]; };
 bootsPLS = derive { name="bootsPLS"; version="1.0.2"; sha256="1d2jn3c74d31rp37qpr8j4rviwg1gmkqppx5pyw0mm37vdajffri"; depends=[mixOmics]; };
 bootspecdens = derive { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; };
 bootstrap = derive { name="bootstrap"; version="2015.2"; sha256="1h068az4sz49ysb0wcas1hfj7jkn13zdmk087scqj5iyqzr459xf"; depends=[]; };
 boottol = derive { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; };
-boral = derive { name="boral"; version="0.6"; sha256="0ldd5slj90xsch498brll6sjbl6j8fb6a28vfciykr2364mgmahp"; depends=[coda R2jags mvtnorm fishMod MASS]; };
-boss = derive { name="boss"; version="2.1"; sha256="1knsnf19b1xvvq20pjiv56anbnk0d51aq6z3ikhi8y92ijkzh0y8"; depends=[lme4 geepack Matrix ncdf]; };
+boral = derive { name="boral"; version="0.6"; sha256="0ldd5slj90xsch498brll6sjbl6j8fb6a28vfciykr2364mgmahp"; depends=[coda fishMod MASS mvtnorm R2jags]; };
+boss = derive { name="boss"; version="2.1"; sha256="1knsnf19b1xvvq20pjiv56anbnk0d51aq6z3ikhi8y92ijkzh0y8"; depends=[geepack lme4 Matrix ncdf]; };
 boussinesq = derive { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; };
 boxplotdbl = derive { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; };
-boxr = derive { name="boxr"; version="0.2.6"; sha256="1b7xvblw2a1p8sr1gxrak404d43haa4kk7blnyir1pql8dcw24jd"; depends=[httr httpuv assertthat stringr dplyr digest jsonlite]; };
-bpca = derive { name="bpca"; version="1.2-2"; sha256="05ldz6b2s379mymj8jzvia9x6gj047gwsxvnv3zj9x8b1hvndnd6"; depends=[scatterplot3d rgl]; };
+boxr = derive { name="boxr"; version="0.2.6"; sha256="1b7xvblw2a1p8sr1gxrak404d43haa4kk7blnyir1pql8dcw24jd"; depends=[assertthat digest dplyr httpuv httr jsonlite stringr]; };
+bpca = derive { name="bpca"; version="1.2-2"; sha256="05ldz6b2s379mymj8jzvia9x6gj047gwsxvnv3zj9x8b1hvndnd6"; depends=[rgl scatterplot3d]; };
 bpcp = derive { name="bpcp"; version="1.2.5"; sha256="0dzsj0xhvn7jc8nb54191hwpw4sm7g13af5y3sgp9bhvcym8p31q"; depends=[]; };
 bpkde = derive { name="bpkde"; version="1.0-7"; sha256="1ls6rwmbgb2vzsjn34r87ab8rnz3ls61g6f4x3jpglbk0j91f0h8"; depends=[]; };
 bqtl = derive { name="bqtl"; version="1.0-30"; sha256="1v1p3wvqm5hmwpnjqaz8vlpzm036gpzpxsvy7m0v4x7nc5vrq7g6"; depends=[]; };
-brainR = derive { name="brainR"; version="1.2"; sha256="1515v6kk73p4s3vrnkpkilfxfyqrf7b762sq6j364ygsyfybvh2z"; depends=[rgl misc3d oro_nifti]; };
+brainR = derive { name="brainR"; version="1.2"; sha256="1515v6kk73p4s3vrnkpkilfxfyqrf7b762sq6j364ygsyfybvh2z"; depends=[misc3d oro_nifti rgl]; };
 brainwaver = derive { name="brainwaver"; version="1.6"; sha256="0r79dpd9bbbn34rm29512srzj3m29qgvbryvrp1mwv8mmcsh6ij6"; depends=[waveslim]; };
-branchLars = derive { name="branchLars"; version="1.0"; sha256="1adk9j77ynv7y8q04nvb468ik4nq4ff3j2nbxw596kgg5bg1ymz0"; depends=[lars]; };
+branchLars = derive { name="branchLars"; version="1.0"; sha256="1adk9j77ynv7y8q04nvb468ik4nq4ff3j2nbxw596kgg5bg1ymz0"; depends=[lars Rgraphviz]; };
 breakage = derive { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; };
 breakaway = derive { name="breakaway"; version="1.0"; sha256="1agigb3b2ff1p9lx9ndz4hs1sgyv1g2zjb41l5p23370i5gk1nbn"; depends=[]; };
-breakpoint = derive { name="breakpoint"; version="1.1"; sha256="07k5d1jn5ahhml2q9ynpmwjm2ckyrr63qj7svh2ziyb41f5v7mfw"; depends=[ggplot2 MASS msm foreach doParallel]; };
+breakpoint = derive { name="breakpoint"; version="1.1"; sha256="07k5d1jn5ahhml2q9ynpmwjm2ckyrr63qj7svh2ziyb41f5v7mfw"; depends=[doParallel foreach ggplot2 MASS msm]; };
 brew = derive { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; };
-brewdata = derive { name="brewdata"; version="0.4"; sha256="1i8i3yhyph212m6jjsij61hz65a5rplxw8y2xqf6daqiisam5q6i"; depends=[RCurl XML stringdist]; };
+brewdata = derive { name="brewdata"; version="0.4"; sha256="1i8i3yhyph212m6jjsij61hz65a5rplxw8y2xqf6daqiisam5q6i"; depends=[RCurl stringdist XML]; };
 brglm = derive { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; };
 bride = derive { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; };
-brms = derive { name="brms"; version="0.2.0"; sha256="1i515sz3paiwwkmgglqzb2gzb2y6m99kp95xaarpawsja8nxi2j0"; depends=[ggplot2 Rcpp abind coda ggmcmc gridExtra]; };
+brms = derive { name="brms"; version="0.2.0"; sha256="1i515sz3paiwwkmgglqzb2gzb2y6m99kp95xaarpawsja8nxi2j0"; depends=[abind coda ggmcmc ggplot2 gridExtra Rcpp]; };
 brnn = derive { name="brnn"; version="0.5"; sha256="0kf2fdgshk8i3jlxjfgpdfq08kzlz3k9s7rdp4bg4lg3khmah9d1"; depends=[Formula]; };
-broman = derive { name="broman"; version="0.55-2"; sha256="04pg362gmxg5lvrv333mjq06lv0q3a1mq6wrbmy87jch6f10lazi"; depends=[assertthat RPushbullet jsonlite ggplot2]; };
-broom = derive { name="broom"; version="0.3.7"; sha256="00z4kwxdqp6g35g4x6js9rc96z8i40hzgvhf5frj9dwfpxclk145"; depends=[plyr dplyr tidyr psych stringr]; };
-bshazard = derive { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[survival Epi]; };
+broman = derive { name="broman"; version="0.55-2"; sha256="04pg362gmxg5lvrv333mjq06lv0q3a1mq6wrbmy87jch6f10lazi"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
+broom = derive { name="broom"; version="0.3.7"; sha256="00z4kwxdqp6g35g4x6js9rc96z8i40hzgvhf5frj9dwfpxclk145"; depends=[dplyr plyr psych stringr tidyr]; };
+bshazard = derive { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[Epi survival]; };
 bspec = derive { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; };
 bspmma = derive { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; };
-bst = derive { name="bst"; version="0.3-4"; sha256="1s7qv2q9mcgg1c5mhblqg3nk9hary4pq6z0xgi3a6rs1929mgdyf"; depends=[rpart gbm]; };
-bsts = derive { name="bsts"; version="0.6.1"; sha256="0hs2inbwwpafpcr6y51qnmxms121z8cy8mil6acjfhrfc27f1msd"; depends=[BoomSpikeSlab zoo xts Boom Boom BH]; };
-btf = derive { name="btf"; version="1.1"; sha256="0n1h4hmjpvj97mpvannh3s5l08m4zfv0w64hrgdv4s5808miwfzc"; depends=[Matrix coda Rcpp RcppEigen]; };
-bujar = derive { name="bujar"; version="0.1-4"; sha256="0v48mkg78sy91z1z4xvy2r3xmay74615kzqxjqlclkk20999z56m"; depends=[mda ncvreg mboost gbm earth elasticnet rms]; };
+bst = derive { name="bst"; version="0.3-4"; sha256="1s7qv2q9mcgg1c5mhblqg3nk9hary4pq6z0xgi3a6rs1929mgdyf"; depends=[gbm rpart]; };
+bsts = derive { name="bsts"; version="0.6.1"; sha256="0hs2inbwwpafpcr6y51qnmxms121z8cy8mil6acjfhrfc27f1msd"; depends=[BH Boom BoomSpikeSlab xts zoo]; };
+btf = derive { name="btf"; version="1.1"; sha256="0n1h4hmjpvj97mpvannh3s5l08m4zfv0w64hrgdv4s5808miwfzc"; depends=[coda Matrix Rcpp RcppEigen]; };
+bujar = derive { name="bujar"; version="0.1-4"; sha256="0v48mkg78sy91z1z4xvy2r3xmay74615kzqxjqlclkk20999z56m"; depends=[earth elasticnet gbm mboost mda ncvreg rms]; };
 bursts = derive { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; };
-bvarsv = derive { name="bvarsv"; version="1.0"; sha256="0ak4nsrcvhkg0145ax5ib9ljb5yc63zzfxlgvdbrdr4mlri4gsid"; depends=[Rcpp Rcpp RcppArmadillo]; };
+bvarsv = derive { name="bvarsv"; version="1.0"; sha256="0ak4nsrcvhkg0145ax5ib9ljb5yc63zzfxlgvdbrdr4mlri4gsid"; depends=[Rcpp RcppArmadillo]; };
 bvenn = derive { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; };
 bvls = derive { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; };
-bvpSolve = derive { name="bvpSolve"; version="1.2.4"; sha256="1ss25md3q59cm40rxw29x9421xjc7gd964hx9xwvx4h8dis34rgd"; depends=[rootSolve deSolve]; };
-c060 = derive { name="c060"; version="0.2-4"; sha256="1yzy0p6041rygqfwzb8dpyc7jq12javmhlvdcmmc7p59bbk7wv3j"; depends=[glmnet survival mlegp tgp peperr penalizedSVM lattice]; };
+bvpSolve = derive { name="bvpSolve"; version="1.2.4"; sha256="1ss25md3q59cm40rxw29x9421xjc7gd964hx9xwvx4h8dis34rgd"; depends=[deSolve rootSolve]; };
+c060 = derive { name="c060"; version="0.2-4"; sha256="1yzy0p6041rygqfwzb8dpyc7jq12javmhlvdcmmc7p59bbk7wv3j"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; };
 c3net = derive { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; };
 cAIC4 = derive { name="cAIC4"; version="0.2"; sha256="13sp3wywv82wgi1vsbxwn68v9xigy0fi3mcwyxjmmgmnsxns2fza"; depends=[lme4 Matrix]; };
 cOde = derive { name="cOde"; version="0.2"; sha256="0741ghg0cqxvgwgvrvsgi75qlkirnm8cjc6bw6xbmkg97scrs5ck"; depends=[]; };
-cSFM = derive { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[sn mgcv mnormt MASS moments]; };
+cSFM = derive { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[MASS mgcv mnormt moments sn]; };
 ca = derive { name="ca"; version="0.58"; sha256="10dp261sq56ixrrr8qq4filxpzszcinz5qv50g40dan0k75n7isb"; depends=[]; };
 caTools = derive { name="caTools"; version="1.17.1"; sha256="1x4szsn2qmbzpyjfdaiz2q7jwhap2gky9wq0riah74q0pzz76ank"; depends=[bitops]; };
 cabootcrs = derive { name="cabootcrs"; version="1.0"; sha256="0a6y04jq837k1pk8b9nhgz7rima7s8jid6vdjyfvrqshgaiabg1q"; depends=[]; };
 cacIRT = derive { name="cacIRT"; version="1.3"; sha256="1qd9qw47d9dmxhnva3ik62q5rfcw0pd1ha1y689345nl05wysjkh"; depends=[]; };
 cairoDevice = derive { name="cairoDevice"; version="2.22"; sha256="0j1fsfjzaz0mz6v33v8n2dcbskpafm3mhi5v85phpk3x4s2y84al"; depends=[]; };
 calibrate = derive { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; };
-calibrator = derive { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[emulator cubature]; };
-calmate = derive { name="calmate"; version="0.12.0"; sha256="1jd1ag1v10bpgkqpf5134av0yc7xph1679q40y541kyr59df0lxw"; depends=[R_utils aroma_core MASS R_methodsS3 R_oo matrixStats R_filesets]; };
-camel = derive { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[lattice igraph MASS Matrix]; };
-cancerTiming = derive { name="cancerTiming"; version="3.0.0"; sha256="1sc5mz2gnrzvkc9kfnspq9vddk48a0a99yyywkwy1vvj0q2dgmyn"; depends=[LearnBayes gplots]; };
+calibrator = derive { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[cubature emulator]; };
+calmate = derive { name="calmate"; version="0.12.0"; sha256="1jd1ag1v10bpgkqpf5134av0yc7xph1679q40y541kyr59df0lxw"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
+camel = derive { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[igraph lattice MASS Matrix]; };
+cancerTiming = derive { name="cancerTiming"; version="3.0.0"; sha256="1sc5mz2gnrzvkc9kfnspq9vddk48a0a99yyywkwy1vvj0q2dgmyn"; depends=[gplots LearnBayes]; };
 candisc = derive { name="candisc"; version="0.6-7"; sha256="1g2vypcniy94h462kylmzraa6q3ys9m0r1cn21dm8rzzjxid9g3g"; depends=[car heplots]; };
-cape = derive { name="cape"; version="1.3"; sha256="1qvjbnxydc16mflg1rmgp2kgljcna8vi88w34cs6k12wpgxmvz1f"; depends=[corpcor evd qpcR Matrix igraph fdrtool shape]; };
+cape = derive { name="cape"; version="1.3"; sha256="1qvjbnxydc16mflg1rmgp2kgljcna8vi88w34cs6k12wpgxmvz1f"; depends=[corpcor evd fdrtool igraph Matrix qpcR shape]; };
 caper = derive { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; };
-capm = derive { name="capm"; version="0.8.0"; sha256="1vz17x0v5cjs5kdqkbay08f91kclsx4rcli5vgh9yxlk4ih9w4dd"; depends=[deSolve FME survey ggplot2 reshape2 shiny rgdal maptools sp]; };
+capm = derive { name="capm"; version="0.8.0"; sha256="1vz17x0v5cjs5kdqkbay08f91kclsx4rcli5vgh9yxlk4ih9w4dd"; depends=[deSolve FME ggplot2 maptools reshape2 rgdal shiny sp survey]; };
 capushe = derive { name="capushe"; version="1.0"; sha256="0dwxaiqnz0qbsk4icjapklaa9bpjfl4gqvk1f92livy97jmf1r44"; depends=[MASS]; };
 capwire = derive { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; };
 car = derive { name="car"; version="2.0-25"; sha256="1h7fndsypg9jqfc4xlr8aszjgs477jsvvw4lkpgjxrlb4j779yyj"; depends=[MASS mgcv nnet pbkrtest quantreg]; };
-carcass = derive { name="carcass"; version="1.4"; sha256="16apmiackw194p5n0fivkgd2ymca9bfajasypl82xqyfk6amh088"; depends=[lme4 survival expm arm MASS]; };
-cardidates = derive { name="cardidates"; version="0.4.6"; sha256="02ib56fvn2z63sbinhwnlw123y86h6xazbkzw68sa9klqaxv69yl"; depends=[boot pastecs lattice]; };
+carcass = derive { name="carcass"; version="1.4"; sha256="16apmiackw194p5n0fivkgd2ymca9bfajasypl82xqyfk6amh088"; depends=[arm expm lme4 MASS survival]; };
+cardidates = derive { name="cardidates"; version="0.4.6"; sha256="02ib56fvn2z63sbinhwnlw123y86h6xazbkzw68sa9klqaxv69yl"; depends=[boot lattice pastecs]; };
 care = derive { name="care"; version="1.1.8"; sha256="0r1j2q23rz54rcx528n53m3hmhvb8ndqjpmmzm6j1y6lmixpqh41"; depends=[corpcor]; };
-caret = derive { name="caret"; version="6.0-47"; sha256="0mpmch0435gcszj5yq4p7jpq7y9q8jk1bz3i1c9ij7a73kq2368i"; depends=[lattice ggplot2 car reshape2 foreach plyr nlme BradleyTerry2]; };
-caretEnsemble = derive { name="caretEnsemble"; version="1.0.0"; sha256="16qibyx034gi06rs8wnazfdicvrwpdsys3mvgwmb35qgzldqfizy"; depends=[caret caTools pbapply ggplot2 digest plyr lattice gridExtra]; };
+caret = derive { name="caret"; version="6.0-47"; sha256="0mpmch0435gcszj5yq4p7jpq7y9q8jk1bz3i1c9ij7a73kq2368i"; depends=[BradleyTerry2 car foreach ggplot2 lattice nlme plyr reshape2]; };
+caretEnsemble = derive { name="caretEnsemble"; version="1.0.0"; sha256="16qibyx034gi06rs8wnazfdicvrwpdsys3mvgwmb35qgzldqfizy"; depends=[caret caTools digest ggplot2 gridExtra lattice pbapply plyr]; };
 caribou = derive { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; };
 caroline = derive { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; };
 caschrono = derive { name="caschrono"; version="1.4"; sha256="1l9hmsacynh73kh14jrp7a42385v78znn9ll1jchzgkyz2x4dibw"; depends=[forecast Hmisc its timeSeries]; };
@@ -2765,42 +2777,42 @@ cat = derive { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yiz
 catIrt = derive { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; };
 catR = derive { name="catR"; version="3.4"; sha256="0rgzcnqp18wb8m7f3m8mm7pv04a1irlknkrsrr4hhnzs0phf06yz"; depends=[]; };
 catdata = derive { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; };
-catenary = derive { name="catenary"; version="1.1"; sha256="0khdk61fh8ngr70qf9i2655h5nblj98r8zl724ljv1cjb5x1vphv"; depends=[ggplot2 boot]; };
-cati = derive { name="cati"; version="0.99"; sha256="1xghdqmqfwi0wnzvrd896z4snyjqqs9kw3whmkd3cph8zf0jl931"; depends=[nlme ade4 ape e1071 mice rasterVis hypervolume FD geometry vegan]; };
+catenary = derive { name="catenary"; version="1.1"; sha256="0khdk61fh8ngr70qf9i2655h5nblj98r8zl724ljv1cjb5x1vphv"; depends=[boot ggplot2]; };
+cati = derive { name="cati"; version="0.99"; sha256="1xghdqmqfwi0wnzvrd896z4snyjqqs9kw3whmkd3cph8zf0jl931"; depends=[ade4 ape e1071 FD geometry hypervolume mice nlme rasterVis vegan]; };
 catnet = derive { name="catnet"; version="1.14.8"; sha256="03y7ddjyra3cjq7savdgickmw82ncx4k01rn752sks6rpl6bjslc"; depends=[]; };
 catspec = derive { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
 causaleffect = derive { name="causaleffect"; version="1.1.1"; sha256="1rsn3zfi24vv1s03ki0aghw4kjls95dr25473fpbmsrmm8n48cqi"; depends=[ggm igraph XML]; };
 causalsens = derive { name="causalsens"; version="0.1"; sha256="1v72zjplsa073f92qdza1zvwa1fwxlpmh8f6w5z8qcyiwqcbmifr"; depends=[]; };
 cba = derive { name="cba"; version="0.2-14"; sha256="067rm1rfz0rrq8xkzibd81pwvc9rx7ki46bncim4j5ra6i9pn24n"; depends=[proxy]; };
 ccChooser = derive { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; };
-ccaPP = derive { name="ccaPP"; version="0.3.0"; sha256="1wj5yij02372xarhvxsnh43v0l6xb2p8rflmskw6x86vpcdqd6zw"; depends=[Rcpp pcaPP robustbase RcppArmadillo Rcpp RcppArmadillo]; };
-cccd = derive { name="cccd"; version="1.5"; sha256="0m364zsrgr7mh1yhl2lqxpaf71gzq3y3pp9qgnj4spiy4iadyy7i"; depends=[igraph proxy deldir FNN]; };
-cccp = derive { name="cccp"; version="0.2-4"; sha256="1hw0xzfdycrnhkym5va430jk1b9ywf7wbm9qyj4a62n210hk4nzc"; depends=[Rcpp Rcpp RcppArmadillo]; };
-cccrm = derive { name="cccrm"; version="1.1"; sha256="0q7vxzj3lblz5ddgzm8z99k0b0z194963hx96bbkqm4rv705dgb0"; depends=[nlme gdata]; };
+ccaPP = derive { name="ccaPP"; version="0.3.0"; sha256="1wj5yij02372xarhvxsnh43v0l6xb2p8rflmskw6x86vpcdqd6zw"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; };
+cccd = derive { name="cccd"; version="1.5"; sha256="0m364zsrgr7mh1yhl2lqxpaf71gzq3y3pp9qgnj4spiy4iadyy7i"; depends=[deldir FNN igraph proxy]; };
+cccp = derive { name="cccp"; version="0.2-4"; sha256="1hw0xzfdycrnhkym5va430jk1b9ywf7wbm9qyj4a62n210hk4nzc"; depends=[Rcpp RcppArmadillo]; };
+cccrm = derive { name="cccrm"; version="1.1"; sha256="0q7vxzj3lblz5ddgzm8z99k0b0z194963hx96bbkqm4rv705dgb0"; depends=[gdata nlme]; };
 ccda = derive { name="ccda"; version="1.1"; sha256="0ya9x1b41l0pjyyfdswjyip0c2v8z7gncbj7cdz0486ad75229x7"; depends=[MASS]; };
 ccgarch = derive { name="ccgarch"; version="0.2.3"; sha256="0angffla3sk9i86v6bbsav95fp3mz5yvq7qfv0fx2v0nd2cx116w"; depends=[]; };
 cchs = derive { name="cchs"; version="0.1.0"; sha256="1x6pzwjdcklkbgr1yalijrcj3g56hj6085fh4pzqbm7xkqcj1mi6"; depends=[survival]; };
 cclust = derive { name="cclust"; version="0.6-19"; sha256="11lzzpr65jw7s0419bdy3w7cq97ysvv52ijb1wgqpa48wh1qbqqd"; depends=[]; };
-cda = derive { name="cda"; version="1.5.1"; sha256="09a2jb25219hq6if3bx03lsp94rp2ll9g73dhkdi665y7rlhgqwh"; depends=[dielectric Rcpp statmod randtoolbox reshape2 plyr Rcpp RcppArmadillo]; };
+cda = derive { name="cda"; version="1.5.1"; sha256="09a2jb25219hq6if3bx03lsp94rp2ll9g73dhkdi665y7rlhgqwh"; depends=[dielectric plyr randtoolbox Rcpp RcppArmadillo reshape2 statmod]; };
 cdb = derive { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; };
 cdcsis = derive { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; };
-cds = derive { name="cds"; version="1.0.1"; sha256="1vw8ghvwsrpsq89yc4vjyfcw2wsz9dhqv1nlaqmv9b4wqm8gsb5h"; depends=[MASS limSolve clue colorspace copula]; };
+cds = derive { name="cds"; version="1.0.1"; sha256="1vw8ghvwsrpsq89yc4vjyfcw2wsz9dhqv1nlaqmv9b4wqm8gsb5h"; depends=[clue colorspace copula limSolve MASS]; };
 cec2005benchmark = derive { name="cec2005benchmark"; version="1.0.4"; sha256="0bwv63l31hiy63372nvnyfkpqp61cqjag0gczd2v2iwsy3hyivpd"; depends=[]; };
 cec2013 = derive { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; };
 celestial = derive { name="celestial"; version="1.3"; sha256="0icsrpw8y7r0ls8ch5b25fl4rnvs6x5y2wscmcmpp4fa4x64qqg6"; depends=[RANN]; };
-cellVolumeDist = derive { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[minpack_lm gplots]; };
+cellVolumeDist = derive { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[gplots minpack_lm]; };
 cellranger = derive { name="cellranger"; version="0.1.0"; sha256="1nfvh0bd99q7cili0hj6ifcg8r57fxv5k4634b7vkshy5rbc5fw1"; depends=[]; };
-cem = derive { name="cem"; version="1.1.16"; sha256="1crljw5ry3hynmfg9xfnbm3ypy57m33885xg39m88gzi6ydrnsvk"; depends=[lattice MatchIt combinat randomForest nlme]; };
+cem = derive { name="cem"; version="1.1.16"; sha256="1crljw5ry3hynmfg9xfnbm3ypy57m33885xg39m88gzi6ydrnsvk"; depends=[combinat lattice MatchIt nlme randomForest]; };
 censNID = derive { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; };
-censReg = derive { name="censReg"; version="0.5-20"; sha256="15k7iq4275dyah3r47vgxsx6g6mr7ma53lkv6d1n89bczzys72kx"; depends=[maxLik glmmML sandwich miscTools]; };
+censReg = derive { name="censReg"; version="0.5-20"; sha256="15k7iq4275dyah3r47vgxsx6g6mr7ma53lkv6d1n89bczzys72kx"; depends=[glmmML maxLik miscTools sandwich]; };
 cents = derive { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; };
-cepp = derive { name="cepp"; version="1.0"; sha256="0lw3qr0vp0qbg2b62abhi1ady1dwig68m4nzqnjnk3lqxzp0fs8f"; depends=[trust randtoolbox]; };
+cepp = derive { name="cepp"; version="1.0"; sha256="0lw3qr0vp0qbg2b62abhi1ady1dwig68m4nzqnjnk3lqxzp0fs8f"; depends=[randtoolbox trust]; };
 cernn = derive { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; };
 cfa = derive { name="cfa"; version="0.9-3"; sha256="0pl1mxv6jxn3mvlh75gr8as0daklyr7gkh37fcgmn2bwi973sspy"; depends=[]; };
-cg = derive { name="cg"; version="1.0-2"; sha256="1rgbk4kvjaw4mbqa19hbnhlinqd4bw4fn2znlxr8wfhzj6648cl3"; depends=[Hmisc VGAM MASS lattice survival multcomp nlme]; };
-cgAUC = derive { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp Rcpp]; };
+cg = derive { name="cg"; version="1.0-2"; sha256="1rgbk4kvjaw4mbqa19hbnhlinqd4bw4fn2znlxr8wfhzj6648cl3"; depends=[Hmisc lattice MASS multcomp nlme survival VGAM]; };
+cgAUC = derive { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp]; };
 cgam = derive { name="cgam"; version="1.2"; sha256="14vl608bf223jclaxfb6i7irfn9g2dqp76fhw82j4h7w4l47i1c3"; depends=[coneproj]; };
-cgdsr = derive { name="cgdsr"; version="1.1.33"; sha256="0y8cn386jifg2ilml0cp9cafjxaa0xkvjnja1fgarlyf07k3cpcs"; depends=[R_oo R_methodsS3]; };
+cgdsr = derive { name="cgdsr"; version="1.1.33"; sha256="0y8cn386jifg2ilml0cp9cafjxaa0xkvjnja1fgarlyf07k3cpcs"; depends=[R_methodsS3 R_oo]; };
 cggd = derive { name="cggd"; version="0.8"; sha256="06z0mrxxc02parn9vkjv89qq4yqmsccsy319fi6c5iarssyvin1r"; depends=[]; };
 cgh = derive { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697lybq3jyzz4l8ppgxqwxp4p4d2yqn"; depends=[]; };
 cghFLasso = derive { name="cghFLasso"; version="0.2-1"; sha256="0b1hnjf9g0v47hbz0dy9m6jhcl1ky20yyhhmm8myng2sndcpjsbf"; depends=[]; };
@@ -2812,22 +2824,22 @@ checkmate = derive { name="checkmate"; version="1.5.3"; sha256="1d9szbszql0nz1zx
 checkpoint = derive { name="checkpoint"; version="0.3.10"; sha256="147phhsv5g8k23fd355jqjqpjjj8n3s0bblm8mv5c3d0322li7ac"; depends=[]; };
 cheddar = derive { name="cheddar"; version="0.1-629"; sha256="13fmr37jj7dky5jrpr20z1iai9jbnpmwsh2pbzjwvib7561pyd6x"; depends=[]; };
 chemCal = derive { name="chemCal"; version="0.1-34"; sha256="0sn0mhp2d9a9rddfpkiv1pkrmvnv4sy18c1x2ks0lwpaklg78fbs"; depends=[]; };
-chemometrics = derive { name="chemometrics"; version="1.3.9"; sha256="089zlp4ba6yyxjh2p7fcph29lnxyk1gifb44fw7lsslvg19xlgjm"; depends=[rpart class e1071 MASS nnet pcaPP robustbase som lars pls mclust]; };
-chemosensors = derive { name="chemosensors"; version="0.7.8"; sha256="0zphfag0q6zskd301z1dldazzxr2fam6h41cpyivphaxpaljiv0m"; depends=[pls plyr reshape2 ggplot2 LearnBayes quadprog RColorBrewer]; };
+chemometrics = derive { name="chemometrics"; version="1.3.9"; sha256="089zlp4ba6yyxjh2p7fcph29lnxyk1gifb44fw7lsslvg19xlgjm"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; };
+chemosensors = derive { name="chemosensors"; version="0.7.8"; sha256="0zphfag0q6zskd301z1dldazzxr2fam6h41cpyivphaxpaljiv0m"; depends=[ggplot2 LearnBayes pls plyr quadprog RColorBrewer reshape2]; };
 cherry = derive { name="cherry"; version="0.5-10"; sha256="0fs4p5k1lwwlin5fj9z91aw59ybp60phjk293imizg6vpai5h39p"; depends=[bitops lpSolve Matrix]; };
 childsds = derive { name="childsds"; version="0.5"; sha256="1fmisp6k375harjxsyzpwnd8zh3kd7vlhin18q1svfwdjyy9k3xh"; depends=[]; };
-chillR = derive { name="chillR"; version="0.55"; sha256="1b8lp4dfr3366ism7q2pddqpps3zmsyv5xg9rpyyh9yyl9ga1xhy"; depends=[pls Kendall fields]; };
+chillR = derive { name="chillR"; version="0.55"; sha256="1b8lp4dfr3366ism7q2pddqpps3zmsyv5xg9rpyyh9yyl9ga1xhy"; depends=[fields Kendall pls]; };
 chipPCR = derive { name="chipPCR"; version="0.0.8-10"; sha256="1mff7n7ga4sfwvcq7zkjkrl68nybnm2zkn37hmxvnw9yl3ls9lnw"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; };
 chngpt = derive { name="chngpt"; version="2014.12-2"; sha256="1bg2hm5clvq1rj1mnj5fasbwmq0xayj327kwclajami4zcwjwqj5"; depends=[kyotil MASS]; };
 choiceDes = derive { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffdijzx14sxhqv1imdakj7y94brlr5mbf5i4fl4"; depends=[AlgDesign]; };
 choplump = derive { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; };
-chopthin = derive { name="chopthin"; version="0.1"; sha256="1xnyd5mvgqksk7c0mf4irrnshkjgih2h19b55yi4finxh6wrn8l4"; depends=[Rcpp Rcpp]; };
+chopthin = derive { name="chopthin"; version="0.1"; sha256="1xnyd5mvgqksk7c0mf4irrnshkjgih2h19b55yi4finxh6wrn8l4"; depends=[Rcpp]; };
 chords = derive { name="chords"; version="0.90"; sha256="0wz5glm15615xb3cicc0m34zg78qzng3lpmysswbrfhc8x4kkchh"; depends=[MASS]; };
-choroplethr = derive { name="choroplethr"; version="3.1.0"; sha256="0nv47hx8z06xh58a1ff63zncl1776pakxa6dbf1skhc23wfafi86"; depends=[scales Hmisc stringr ggplot2 dplyr R6 acs WDI]; };
+choroplethr = derive { name="choroplethr"; version="3.1.0"; sha256="0nv47hx8z06xh58a1ff63zncl1776pakxa6dbf1skhc23wfafi86"; depends=[acs dplyr ggplot2 Hmisc R6 scales stringr WDI]; };
 choroplethrAdmin1 = derive { name="choroplethrAdmin1"; version="1.0.0"; sha256="1pnj5155h809sh9mp703y72348mi7mxnwid07kp1s489512ysfwr"; depends=[ggplot2]; };
 choroplethrMaps = derive { name="choroplethrMaps"; version="1.0"; sha256="00dgwikfxm1p1dqz1ybsxj1j8jcmrwa08m2d3zsww2invd55pk7g"; depends=[]; };
-chromer = derive { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[dplyr httr data_table]; };
-chromoR = derive { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[haarfisz gdata]; };
+chromer = derive { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; };
+chromoR = derive { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; };
 chron = derive { name="chron"; version="2.3-45"; sha256="0jkanbisi1bxh35rg0i6sl82f8r9v8va8mf8hknfvwv7p7n3ddpx"; depends=[]; };
 cin = derive { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; };
 circlize = derive { name="circlize"; version="0.2.4"; sha256="0zxd8jcim03cg77zxq9dvwlki51s9jhyaycdif7q6qc598lwwjx1"; depends=[GlobalOptions shape]; };
@@ -2835,32 +2847,32 @@ circular = derive { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76k
 cit = derive { name="cit"; version="1.4"; sha256="0axmi41bydkj512jscil9mqz9g6f11khl8hi6fci96wnm9x8gw7s"; depends=[]; };
 citbcmst = derive { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
 citccmst = derive { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; };
-cjoint = derive { name="cjoint"; version="1.0.3"; sha256="0f9yh4rbgqlx12vx336isfxc3lnrl5sgbapld0qfkv93p26in9h6"; depends=[sandwich lmtest ggplot2]; };
-clValid = derive { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[cluster class]; };
-cladoRcpp = derive { name="cladoRcpp"; version="0.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp Rcpp RcppArmadillo]; };
+cjoint = derive { name="cjoint"; version="1.0.3"; sha256="0f9yh4rbgqlx12vx336isfxc3lnrl5sgbapld0qfkv93p26in9h6"; depends=[ggplot2 lmtest sandwich]; };
+clValid = derive { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[class cluster]; };
+cladoRcpp = derive { name="cladoRcpp"; version="0.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp RcppArmadillo]; };
 class = derive { name="class"; version="7.3-12"; sha256="14baglhxk8xv3857s9b0immizh7sakk3spa5s4v28ysh7i94wx6i"; depends=[MASS]; };
-classGraph = derive { name="classGraph"; version="0.7-4"; sha256="08cid5bdbciyijlzkx3684gx0cyzcj8myawf4dhcrz00jqrg8v60"; depends=[]; };
-classInt = derive { name="classInt"; version="0.1-22"; sha256="0r9940bv6n43i6vlcgc19bvmcv3zlw0bi9zfs3scvah68rdb7v7l"; depends=[e1071 class]; };
+classGraph = derive { name="classGraph"; version="0.7-4"; sha256="08cid5bdbciyijlzkx3684gx0cyzcj8myawf4dhcrz00jqrg8v60"; depends=[graph Rgraphviz]; };
+classInt = derive { name="classInt"; version="0.1-22"; sha256="0r9940bv6n43i6vlcgc19bvmcv3zlw0bi9zfs3scvah68rdb7v7l"; depends=[class e1071]; };
 classifly = derive { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; };
-classify = derive { name="classify"; version="1.3"; sha256="0134h12h6v06d7ldj9qgqjhh5f5ap98pvr0v6d4k8dqndnn0pggy"; depends=[Rcpp plyr ggplot2 lattice R2jags reshape2 Rcpp]; };
-classyfire = derive { name="classyfire"; version="0.1-2"; sha256="0rar3mi2m1wf14lmahjbpdh1jlnisvgsbx86xbqlb8c0f8zfzxq3"; depends=[snowfall e1071 boot neldermead ggplot2 optimbase]; };
-clere = derive { name="clere"; version="1.1"; sha256="1jna5dqy47mldd557qxl7vr59v5lalhligvm3c4k6b2dfararhfr"; depends=[Rcpp Rcpp RcppEigen]; };
-clhs = derive { name="clhs"; version="0.5-4"; sha256="0535mpl1dbm9ij1dvj8dsmv4fickdg47by1mvf71lgfk5mjxy5nc"; depends=[ggplot2 sp raster reshape2 plyr scales]; };
-clickstream = derive { name="clickstream"; version="1.1.4"; sha256="0z73phz31j7n49xmwdgv293qbg6ldfgibpd5713qyk7qkhk8hvl7"; depends=[igraph plyr Rsolnp data_table arules]; };
-clifro = derive { name="clifro"; version="2.4-0"; sha256="1bjsfk4m7hgq8k1mw07zx34ibgmpxjw8sig9jjzsr5mp3v13kwp8"; depends=[lubridate XML selectr RCurl ggplot2 scales RColorBrewer reshape2]; };
-climdex_pcic = derive { name="climdex.pcic"; version="1.1-5.1"; sha256="0sq5l5dmnwbq9y6zfrq7zp81c8bmxwkvl7y9iq6wi3qcr78ga6zy"; depends=[PCICt caTools Rcpp]; };
+classify = derive { name="classify"; version="1.3"; sha256="0134h12h6v06d7ldj9qgqjhh5f5ap98pvr0v6d4k8dqndnn0pggy"; depends=[ggplot2 lattice plyr R2jags Rcpp reshape2]; };
+classyfire = derive { name="classyfire"; version="0.1-2"; sha256="0rar3mi2m1wf14lmahjbpdh1jlnisvgsbx86xbqlb8c0f8zfzxq3"; depends=[boot e1071 ggplot2 neldermead optimbase snowfall]; };
+clere = derive { name="clere"; version="1.1"; sha256="1jna5dqy47mldd557qxl7vr59v5lalhligvm3c4k6b2dfararhfr"; depends=[Rcpp RcppEigen]; };
+clhs = derive { name="clhs"; version="0.5-4"; sha256="0535mpl1dbm9ij1dvj8dsmv4fickdg47by1mvf71lgfk5mjxy5nc"; depends=[ggplot2 plyr raster reshape2 scales sp]; };
+clickstream = derive { name="clickstream"; version="1.1.4"; sha256="0z73phz31j7n49xmwdgv293qbg6ldfgibpd5713qyk7qkhk8hvl7"; depends=[arules data_table igraph plyr Rsolnp]; };
+clifro = derive { name="clifro"; version="2.4-0"; sha256="1bjsfk4m7hgq8k1mw07zx34ibgmpxjw8sig9jjzsr5mp3v13kwp8"; depends=[ggplot2 lubridate RColorBrewer RCurl reshape2 scales selectr XML]; };
+climdex_pcic = derive { name="climdex.pcic"; version="1.1-5.1"; sha256="0sq5l5dmnwbq9y6zfrq7zp81c8bmxwkvl7y9iq6wi3qcr78ga6zy"; depends=[caTools PCICt Rcpp]; };
 clime = derive { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; };
-climwin = derive { name="climwin"; version="0.0.1"; sha256="1ajkqk6lj2d8gx7arkwrznrkrjvdc5g9789vwaawwczbdavyi8kd"; depends=[ggplot2 gridExtra evd lme4 lubridate MuMIn reshape]; };
+climwin = derive { name="climwin"; version="0.0.1"; sha256="1ajkqk6lj2d8gx7arkwrznrkrjvdc5g9789vwaawwczbdavyi8kd"; depends=[evd ggplot2 gridExtra lme4 lubridate MuMIn reshape]; };
 clinUtiDNA = derive { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; };
 clinfun = derive { name="clinfun"; version="1.0.10"; sha256="1q69qn7ib0mzpx5cv69fcgflp9rfmys5j33lqdj4b3g1z036bqrr"; depends=[mvtnorm]; };
 clinsig = derive { name="clinsig"; version="1.0-5"; sha256="1jb2qk6hfvms85whymrfpgvjp8pv33fbllpl8jg80yg1ppmg2jcg"; depends=[]; };
 clisymbols = derive { name="clisymbols"; version="1.0.0"; sha256="1g68kh1js6nssyzw4lpxp4d2h4rhlayhahaykxw4a4bd67fkw20p"; depends=[]; };
-clogitL1 = derive { name="clogitL1"; version="1.4"; sha256="0m9yrg9mzzfv5qkdf6w55xyrjdghyrf27kk7b4x2gyvwvi5b7dkm"; depends=[Rcpp Rcpp]; };
+clogitL1 = derive { name="clogitL1"; version="1.4"; sha256="0m9yrg9mzzfv5qkdf6w55xyrjdghyrf27kk7b4x2gyvwvi5b7dkm"; depends=[Rcpp]; };
 cloudUtil = derive { name="cloudUtil"; version="0.1.10"; sha256="1j86vpd4ngrdpfjk44wb1mp0l88dxia64pjd2idfcd276giplh6s"; depends=[]; };
 clpAPI = derive { name="clpAPI"; version="1.2.6"; sha256="1kgzmzf87b0j43ch21anmm2d73bj2d16slmyavpbkdwg72dg1sjb"; depends=[]; };
-clue = derive { name="clue"; version="0.3-49"; sha256="1gz9imirwlvmvzn9j0rmdrrax2girf78xfrxw6mrhal66g48bsrj"; depends=[cluster]; };
+clue = derive { name="clue"; version="0.3-50"; sha256="0r3lb625a6vhxr7im2slz279zav9i74s0b9srkarqmz1bhaf6ly2"; depends=[cluster]; };
 clues = derive { name="clues"; version="0.5.6"; sha256="1g0pjj4as5wfc7qr3nwkzgxxxp3mrdq7djn8p8qjba6kcdjxak1i"; depends=[]; };
-clustMD = derive { name="clustMD"; version="1.1"; sha256="192li0nx2hwhh5y21xs70vrnzw3wxbzr95f06makaxcrwf4xlp16"; depends=[tmvtnorm mvtnorm truncnorm MASS mclust msm]; };
+clustMD = derive { name="clustMD"; version="1.1"; sha256="192li0nx2hwhh5y21xs70vrnzw3wxbzr95f06makaxcrwf4xlp16"; depends=[MASS mclust msm mvtnorm tmvtnorm truncnorm]; };
 cluster = derive { name="cluster"; version="2.0.1"; sha256="09l2vydyabk7x19bblxbjm68vnmifz46m5k3csb1snpbhq6qx52c"; depends=[]; };
 cluster_datasets = derive { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; };
 clusterCrit = derive { name="clusterCrit"; version="1.2.5"; sha256="1xwbvvzrh2dz47y4snmhb96mriblk3czy7dp5bmyvckh5papr2xv"; depends=[]; };
@@ -2868,28 +2880,28 @@ clusterGeneration = derive { name="clusterGeneration"; version="1.3.4"; sha256="
 clusterGenomics = derive { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; };
 clusterPower = derive { name="clusterPower"; version="0.5"; sha256="1g2qpvizyk4q3qlgvar436nrfqxwp5y8yi2y6rch9ak5mbg3yzqb"; depends=[lme4]; };
 clusterRepro = derive { name="clusterRepro"; version="0.5-1.1"; sha256="0vsf6cq6d51a4w23ph8kdz2h8dfpzyd6i85049p2wakn1kdvkz5p"; depends=[]; };
-clusterSEs = derive { name="clusterSEs"; version="1.2"; sha256="0ykfwvibps20w62xrdj4cr6w63gig3dyjmdq8m937g8qsmhd74lz"; depends=[sandwich lmtest mlogit]; };
-clusterSim = derive { name="clusterSim"; version="0.44-2"; sha256="1xf3byri6mwlf89n896bxffmf3c6yqqh992npg9sqznx955hcggv"; depends=[cluster MASS ade4 e1071 rgl R2HTML]; };
-clusterfly = derive { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[rggobi e1071 reshape2 plyr RGtk2]; };
+clusterSEs = derive { name="clusterSEs"; version="1.2"; sha256="0ykfwvibps20w62xrdj4cr6w63gig3dyjmdq8m937g8qsmhd74lz"; depends=[lmtest mlogit sandwich]; };
+clusterSim = derive { name="clusterSim"; version="0.44-2"; sha256="1xf3byri6mwlf89n896bxffmf3c6yqqh992npg9sqznx955hcggv"; depends=[ade4 cluster e1071 MASS R2HTML rgl]; };
+clusterfly = derive { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[e1071 plyr reshape2 rggobi RGtk2]; };
 clustergas = derive { name="clustergas"; version="1.0"; sha256="1vf4czpwk71yxd26vm5sal0ml20ssjrq4bmk31yzxydpxn495fg8"; depends=[cluster]; };
 clustering_sc_dp = derive { name="clustering.sc.dp"; version="1.0"; sha256="0cppka7613cbjjf1q2yp6fln511wbqdhh8d4gs6p0fbq379kzmvc"; depends=[]; };
 clustertend = derive { name="clustertend"; version="1.4"; sha256="1aqg8cy1hk3lmzvyqh9qc1mcknrva2i0c77hyd0yff9whz80ik4j"; depends=[]; };
-clusteval = derive { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp Rcpp]; };
+clusteval = derive { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; };
 clustrd = derive { name="clustrd"; version="0.1.2"; sha256="022lzp1wvbaa20d8hribgq9miy6i7jxm5m1p3p52h9b7bzga3q6g"; depends=[corpcor e1071 ggplot2 irlba]; };
 clustsig = derive { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; };
-clustvarsel = derive { name="clustvarsel"; version="2.1"; sha256="0sj9065s604sjzmlziak9xxl0xhplmp1g3d5dl9smwf2x8bb80mw"; depends=[mclust BMA foreach iterators]; };
-clv = derive { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[cluster class]; };
+clustvarsel = derive { name="clustvarsel"; version="2.1"; sha256="0sj9065s604sjzmlziak9xxl0xhplmp1g3d5dl9smwf2x8bb80mw"; depends=[BMA foreach iterators mclust]; };
+clv = derive { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[class cluster]; };
 cmaes = derive { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; };
 cmm = derive { name="cmm"; version="0.8"; sha256="1661v2lzxgf4s37wdsrnbsvqwppcr7mbp70i1xsysfzki1z6xr19"; depends=[]; };
 cmprsk = derive { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm"; depends=[survival]; };
-cmprskQR = derive { name="cmprskQR"; version="0.9.0"; sha256="1vnrfhlmmyamkpd8lsfznfpcq0mspkiwn3j23yj4sarfx5n32s9a"; depends=[survival quantreg]; };
+cmprskQR = derive { name="cmprskQR"; version="0.9.0"; sha256="1vnrfhlmmyamkpd8lsfznfpcq0mspkiwn3j23yj4sarfx5n32s9a"; depends=[quantreg survival]; };
 cmrutils = derive { name="cmrutils"; version="1.2-2"; sha256="0gc4sx8g9364sybmrqdjdvddqjd9ps6v205kaw0nqdx30xn96hmm"; depends=[chron]; };
-cmvnorm = derive { name="cmvnorm"; version="1.0-1"; sha256="00cm7zfxbc5md3p6sakan64a6rzz7nbq0bqq9ys2iyxpilxalj3m"; depends=[emulator elliptic]; };
+cmvnorm = derive { name="cmvnorm"; version="1.0-1"; sha256="00cm7zfxbc5md3p6sakan64a6rzz7nbq0bqq9ys2iyxpilxalj3m"; depends=[elliptic emulator]; };
 cna = derive { name="cna"; version="1.0-3"; sha256="1iy0ispazhib30kh5wp3jziiyf0992nrdklrq80n0w3zhjyi21rh"; depends=[]; };
 cncaGUI = derive { name="cncaGUI"; version="0.0-2"; sha256="0iwsaqqnh142syag91rzwwsc9n2qiw4xh5x1gjsgc74ywdm4g5fz"; depends=[rgl tcltk2 tkrplot]; };
 coalescentMCMC = derive { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; };
 coarseDataTools = derive { name="coarseDataTools"; version="0.6-2"; sha256="1nnh61kfw294cxawz9i8yf37ddzsn5s532vvkaz0ychk0390wmi5"; depends=[MCMCpack]; };
-cobs = derive { name="cobs"; version="1.3-0"; sha256="1aly7ir7vzir9wnbhyfbrkl7dbq68f79jwxhqrfpf0v2m5kxhz88"; depends=[SparseM quantreg]; };
+cobs = derive { name="cobs"; version="1.3-0"; sha256="1aly7ir7vzir9wnbhyfbrkl7dbq68f79jwxhqrfpf0v2m5kxhz88"; depends=[quantreg SparseM]; };
 cobs99 = derive { name="cobs99"; version="0.9-12"; sha256="0zd0nyw8ma7k90i1k3ryn6qcb6yivrrajc6nmdh4f95ihvhc9ksm"; depends=[]; };
 cocor = derive { name="cocor"; version="1.1-1"; sha256="1w6v9499jj727iznap66hlv9lr4r3s9pr5jnsin9zi8hjb2vhj4h"; depends=[]; };
 cocorresp = derive { name="cocorresp"; version="0.2-3"; sha256="0r1kmcwnf476xbw7r40r3vbn6l1zgmaiq6cpgrvnyss7i5313q8s"; depends=[vegan]; };
@@ -2898,20 +2910,20 @@ coda = derive { name="coda"; version="0.17-1"; sha256="1qjsqf4xi6xii60dscn577gmh
 codadiags = derive { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; };
 codep = derive { name="codep"; version="0.4-1"; sha256="1jkd6k80d6vyriwmq1car5zjms304zrdrfbjib664zxzx1wadf8z"; depends=[]; };
 codetools = derive { name="codetools"; version="0.2-11"; sha256="1mal1xa7san28l6rssvanndsgm90qhvbskz840ybfwwix8bqnbmh"; depends=[]; };
-coefficientalpha = derive { name="coefficientalpha"; version="0.5"; sha256="0pfw64z7f0gp415nn7519rcw829a7wnwnjx94sc55jsvgb1di3kc"; depends=[rsem lavaan]; };
-coefplot = derive { name="coefplot"; version="1.2.0"; sha256="1v6c3fk2wrjgs3b31vajmig6dvmp5acfm72wh0iffpg0qgvf5hh7"; depends=[ggplot2 plyr reshape2 useful scales proto]; };
+coefficientalpha = derive { name="coefficientalpha"; version="0.5"; sha256="0pfw64z7f0gp415nn7519rcw829a7wnwnjx94sc55jsvgb1di3kc"; depends=[lavaan rsem]; };
+coefplot = derive { name="coefplot"; version="1.2.0"; sha256="1v6c3fk2wrjgs3b31vajmig6dvmp5acfm72wh0iffpg0qgvf5hh7"; depends=[ggplot2 plyr proto reshape2 scales useful]; };
 coenocliner = derive { name="coenocliner"; version="0.2-0"; sha256="1ndz7nhkzb8y0akyf1ja39m60c1afk4sb8qk7m4xd3srd71wb35z"; depends=[]; };
 coexist = derive { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; };
-coin = derive { name="coin"; version="1.0-24"; sha256="1h1d6pi957qkmlk2j8f280sc6jkg328wnyxjk43yxj2zwmdnmgpd"; depends=[survival modeltools mvtnorm]; };
+coin = derive { name="coin"; version="1.0-24"; sha256="1h1d6pi957qkmlk2j8f280sc6jkg328wnyxjk43yxj2zwmdnmgpd"; depends=[modeltools mvtnorm survival]; };
 cold = derive { name="cold"; version="1.0-4"; sha256="00rl2h4pirzvgwi28pr94kkn233wvm2z8yyfsz6andbkjsihp6jw"; depends=[]; };
-coloc = derive { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b6s6l56s6j2ni96gii4a06r87ig60"; depends=[colorspace MASS BMA]; };
+coloc = derive { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b6s6l56s6j2ni96gii4a06r87ig60"; depends=[BMA colorspace MASS]; };
 colorRamps = derive { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; };
 coloredICA = derive { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; };
 colorfulVennPlot = derive { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; };
 colorspace = derive { name="colorspace"; version="1.2-6"; sha256="0y8n4ljwhbdvkysdwgqzcnpv107pb3px1jip3k6svv86p72nacds"; depends=[]; };
 colortools = derive { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; };
-colourlovers = derive { name="colourlovers"; version="0.1.4"; sha256="1c5g9z7cknn4z1jqb0l1w8v5zj0qbk4msaf1pqfcx9a70pw8s0m5"; depends=[XML RJSONIO png]; };
-comato = derive { name="comato"; version="1.0"; sha256="03jnvv0sczy13r81aljhj9kv09sl5hrs0n5bn3pdi7ba64zgbjiw"; depends=[igraph Matrix lattice gdata XML cluster clusterSim]; };
+colourlovers = derive { name="colourlovers"; version="0.1.4"; sha256="1c5g9z7cknn4z1jqb0l1w8v5zj0qbk4msaf1pqfcx9a70pw8s0m5"; depends=[png RJSONIO XML]; };
+comato = derive { name="comato"; version="1.0"; sha256="03jnvv0sczy13r81aljhj9kv09sl5hrs0n5bn3pdi7ba64zgbjiw"; depends=[cluster clusterSim gdata igraph lattice Matrix XML]; };
 combinat = derive { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; };
 comclim = derive { name="comclim"; version="0.9.4"; sha256="0m6ynccscsrrq70p0drwrwxp4skc630kv1l5smh48pi8kagahj1g"; depends=[]; };
 commandr = derive { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; };
@@ -2921,14 +2933,14 @@ compHclust = derive { name="compHclust"; version="1.0-2"; sha256="1h39krvz516xws
 compactr = derive { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; };
 compare = derive { name="compare"; version="0.2-5"; sha256="073apjmw5hwslhnjwhff0m8lwszv29n6vbqy0wxl39pyzg7q2x41"; depends=[]; };
 compareC = derive { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; };
-compareGroups = derive { name="compareGroups"; version="3.0.1"; sha256="185lz69al72p4s354vn6gvha3zbhyvf2fsfym0knyspgl08q3m2g"; depends=[Hmisc gdata xtable SNPassoc survival epitools HardyWeinberg]; };
+compareGroups = derive { name="compareGroups"; version="3.0.1"; sha256="185lz69al72p4s354vn6gvha3zbhyvf2fsfym0knyspgl08q3m2g"; depends=[epitools gdata HardyWeinberg Hmisc SNPassoc survival xtable]; };
 compareODM = derive { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; };
 comparison = derive { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; };
-compeir = derive { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[lattice etm]; };
-compendiumdb = derive { name="compendiumdb"; version="1.0.0"; sha256="14dpfyknb4rnig3k2k7684ly45mwx8b22q8bffbiqx1ah827nrna"; depends=[RMySQL]; };
-complmrob = derive { name="complmrob"; version="0.5.8"; sha256="0hhn6w8kvwzs2qflqf8qiqac0n93pi4rkbh8idbcfn8shkhnjzjs"; depends=[robustbase ggplot2 boot scales]; };
+compeir = derive { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[etm lattice]; };
+compendiumdb = derive { name="compendiumdb"; version="1.0.1"; sha256="1dbmsjr4sdg8q09zgg957dcvsqxpjxpnqs7gyc4k523k6ramzabr"; depends=[Biobase GEOquery RMySQL]; };
+complmrob = derive { name="complmrob"; version="0.5.8"; sha256="0hhn6w8kvwzs2qflqf8qiqac0n93pi4rkbh8idbcfn8shkhnjzjs"; depends=[boot ggplot2 robustbase scales]; };
 compoisson = derive { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; };
-compositions = derive { name="compositions"; version="1.40-1"; sha256="1hn139g86bc1q3dj6kj9f21042v4x0xgrp4ni1zvx1zx8xmy3h8b"; depends=[tensorA robustbase energy bayesm]; };
+compositions = derive { name="compositions"; version="1.40-1"; sha256="1hn139g86bc1q3dj6kj9f21042v4x0xgrp4ni1zvx1zx8xmy3h8b"; depends=[bayesm energy robustbase tensorA]; };
 compound_Cox = derive { name="compound.Cox"; version="1.4"; sha256="08sdkq040zk9mb1lcy4nm32gwab26vaig8brp2n3aizagx9fv3r9"; depends=[numDeriv survival]; };
 compute_es = derive { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; };
 concor = derive { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; };
@@ -2937,30 +2949,30 @@ cond = derive { name="cond"; version="1.2-3"; sha256="0y7m7valk7zn40y62348czmdvf
 condGEE = derive { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; };
 condMVNorm = derive { name="condMVNorm"; version="2015.2-1"; sha256="04563jljnjhbiaiq33gn5dxjfvv05xp3lhl3w942v0smy0cdhrh4"; depends=[mvtnorm]; };
 condmixt = derive { name="condmixt"; version="1.0"; sha256="05q1fj7akf6lsq9rbcqqkzlx82jvk6mlvmwx6jzk8j228fwqmg90"; depends=[evd]; };
-coneproj = derive { name="coneproj"; version="1.6"; sha256="1bx0j9r83c944aklyq4lxdhmskyiwh4f6i2fim5fi6hpf6n9ajds"; depends=[Rcpp RcppArmadillo Rcpp]; };
+coneproj = derive { name="coneproj"; version="1.6"; sha256="1bx0j9r83c944aklyq4lxdhmskyiwh4f6i2fim5fi6hpf6n9ajds"; depends=[Rcpp RcppArmadillo]; };
 conf_design = derive { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; };
-confidence = derive { name="confidence"; version="1.1-0"; sha256="11y2mjh9ykmsgf6km6f2w5rql1vqwick4jzmxg5gkfkiisvsq1cp"; depends=[knitr markdown plyr xtable ggplot2]; };
-conformal = derive { name="conformal"; version="0.1"; sha256="0syb1p35r6fir7qimp2k51hpvl3xw45ma2hi7qz2xzw8cwhlii3a"; depends=[caret ggplot2 randomForest e1071]; };
+confidence = derive { name="confidence"; version="1.1-0"; sha256="11y2mjh9ykmsgf6km6f2w5rql1vqwick4jzmxg5gkfkiisvsq1cp"; depends=[ggplot2 knitr markdown plyr xtable]; };
+conformal = derive { name="conformal"; version="0.1"; sha256="0syb1p35r6fir7qimp2k51hpvl3xw45ma2hi7qz2xzw8cwhlii3a"; depends=[caret e1071 ggplot2 randomForest]; };
 confreq = derive { name="confreq"; version="1.3-1"; sha256="1d4ianimksnfwkld7cg9mkhbpwiaqy5bcilwfy45dwby5bai6cjx"; depends=[gmp]; };
 conics = derive { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; };
 conjoint = derive { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; };
-constrainedKriging = derive { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[sp spatialCovariance rgeos RandomFields]; };
+constrainedKriging = derive { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; };
 contfrac = derive { name="contfrac"; version="1.1-9"; sha256="16yl96bmr16a18qfz6y5zf7p02ky1jy2iimcb1wp50g7imlcq840"; depends=[]; };
-conting = derive { name="conting"; version="1.5"; sha256="02vkpzdcwsny40jdcxgjfrx89lw1gq864s3fgswa9bfxfps9p58h"; depends=[mvtnorm BMS gtools tseries coda]; };
+conting = derive { name="conting"; version="1.5"; sha256="02vkpzdcwsny40jdcxgjfrx89lw1gq864s3fgswa9bfxfps9p58h"; depends=[BMS coda gtools mvtnorm tseries]; };
 contrast = derive { name="contrast"; version="0.19"; sha256="1kc3scz3msa52lplc79mmn4z99kq1p2vlb18wqxa9q2ma133x6pl"; depends=[rms]; };
-convevol = derive { name="convevol"; version="1.0"; sha256="05nhpndixvrmiq5paswj7qwsq3k3al34q3j751bic4kb8zhby3fk"; depends=[ape geiger MASS phytools cluster]; };
-cooccur = derive { name="cooccur"; version="1.2"; sha256="0v26aa6j77dmm7pdij4qaz03mxn69aa71rw6n5yl3b9qb0w4k81z"; depends=[reshape2 gmp ggplot2]; };
-cooptrees = derive { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[igraph optrees gtools]; };
+convevol = derive { name="convevol"; version="1.0"; sha256="05nhpndixvrmiq5paswj7qwsq3k3al34q3j751bic4kb8zhby3fk"; depends=[ape cluster geiger MASS phytools]; };
+cooccur = derive { name="cooccur"; version="1.2"; sha256="0v26aa6j77dmm7pdij4qaz03mxn69aa71rw6n5yl3b9qb0w4k81z"; depends=[ggplot2 gmp reshape2]; };
+cooptrees = derive { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; };
 copBasic = derive { name="copBasic"; version="1.7.1"; sha256="0qhrazzsrc429z9fsbqklvwdfgn65adck51vp74jijjd0p6pki4s"; depends=[lmomco]; };
-copCAR = derive { name="copCAR"; version="1.0-1"; sha256="173jv69n4g68yfrz03sg23qzlyvvlw988axgj5knq3l2cq6pjpb2"; depends=[numDeriv Rcpp spam Rcpp RcppArmadillo]; };
-cope = derive { name="cope"; version="0.1"; sha256="1g00dzy99m4212wrkhmqf8ibmilhp75hd2yv7yfzi28nr5jgir3m"; depends=[maps fields MASS mvtnorm]; };
-copula = derive { name="copula"; version="0.999-13"; sha256="0yjy03wn6lsiacfh7qblspklxc9kfwd3g7bz2fx2ldkd90rwhmqp"; depends=[Matrix lattice gsl ADGofTest stabledist mvtnorm pspline]; };
-copulaedas = derive { name="copulaedas"; version="1.4.1"; sha256="1xs02s91la4i1x1zs8k5gfvd9jhs2zqhv58431p1j3spfapzf2rc"; depends=[copula vines mvtnorm truncnorm]; };
-corHMM = derive { name="corHMM"; version="1.16"; sha256="048bvnw2ib9x7yijlgp4d1lfm9055y79fc613y7p6240vw1ywkrh"; depends=[ape nloptr GenSA expm numDeriv corpcor phangorn]; };
+copCAR = derive { name="copCAR"; version="1.0-1"; sha256="173jv69n4g68yfrz03sg23qzlyvvlw988axgj5knq3l2cq6pjpb2"; depends=[numDeriv Rcpp RcppArmadillo spam]; };
+cope = derive { name="cope"; version="0.1"; sha256="1g00dzy99m4212wrkhmqf8ibmilhp75hd2yv7yfzi28nr5jgir3m"; depends=[fields maps MASS mvtnorm]; };
+copula = derive { name="copula"; version="0.999-13"; sha256="0yjy03wn6lsiacfh7qblspklxc9kfwd3g7bz2fx2ldkd90rwhmqp"; depends=[ADGofTest gsl lattice Matrix mvtnorm pspline stabledist]; };
+copulaedas = derive { name="copulaedas"; version="1.4.1"; sha256="1xs02s91la4i1x1zs8k5gfvd9jhs2zqhv58431p1j3spfapzf2rc"; depends=[copula mvtnorm truncnorm vines]; };
+corHMM = derive { name="corHMM"; version="1.16"; sha256="048bvnw2ib9x7yijlgp4d1lfm9055y79fc613y7p6240vw1ywkrh"; depends=[ape corpcor expm GenSA nloptr numDeriv phangorn]; };
 corTools = derive { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; };
 corclass = derive { name="corclass"; version="0.1"; sha256="02mxypdrjwf8psk0j9ggbw14889a87c6lw11qki3s3biq52qsx3y"; depends=[igraph]; };
 corcounts = derive { name="corcounts"; version="1.4"; sha256="0irlx62ql5rp5s7nnjdy6jh723wl4039wn10zxri8ihxwqsyyz3f"; depends=[]; };
-coreNLP = derive { name="coreNLP"; version="0.4-1"; sha256="0a6pc588ddi9qyi5gsnzzvm4k0p5sp5bnjrlsskaymzdq4rp6miz"; depends=[rJava XML plotrix]; };
+coreNLP = derive { name="coreNLP"; version="0.4-1"; sha256="0a6pc588ddi9qyi5gsnzzvm4k0p5sp5bnjrlsskaymzdq4rp6miz"; depends=[plotrix rJava XML]; };
 coreTDT = derive { name="coreTDT"; version="1.0"; sha256="14rnh61gk3m6g8rq77hm9ybds0px15di2mxm3jiyfdfynx5ng58f"; depends=[]; };
 corpcor = derive { name="corpcor"; version="1.6.7"; sha256="1vfzi17vkvzbqgzhmpdhybb6lli0z9vm9p31cwb8bn8ddlkn5ll4"; depends=[]; };
 corpora = derive { name="corpora"; version="0.4-3"; sha256="0zh8mabfy9yqgx7asi4yqv4c0kj59yvyxxaxjgdjy5kkr17zd4g4"; depends=[]; };
@@ -2971,58 +2983,58 @@ corrsieve = derive { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbi
 cosinor = derive { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; };
 cosmoFns = derive { name="cosmoFns"; version="1.0-1"; sha256="0a6xhbgxxnymlvicg99yhgny2lscxcbmvqmy17kxmahdi797dsg6"; depends=[]; };
 cosmosR = derive { name="cosmosR"; version="1.0"; sha256="0w4qywnkgcybgyyhnvvg33amqi2vnkry6iajakyqr1x2hzfpf9sv"; depends=[xlsx]; };
-cosso = derive { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[quadprog Rglpk glmnet]; };
+cosso = derive { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[glmnet quadprog Rglpk]; };
 costat = derive { name="costat"; version="2.3"; sha256="1kqyl89lx1amap9zgrfy1bqnl93kahrksj6yms44yrxr1as2g4nk"; depends=[wavethresh]; };
 cotrend = derive { name="cotrend"; version="1.0"; sha256="0h0y502wqq83wlf9ab1b9rxg1wycvi3sp4lbqfpvy46vgljrjw87"; depends=[xts]; };
-couchDB = derive { name="couchDB"; version="1.3.0"; sha256="153zxi2liv932r7mphhzgxw4wyizh5iyk62ad6x64av31kd2qzsn"; depends=[RCurl bitops httr rjson]; };
+couchDB = derive { name="couchDB"; version="1.3.0"; sha256="153zxi2liv932r7mphhzgxw4wyizh5iyk62ad6x64av31kd2qzsn"; depends=[bitops httr RCurl rjson]; };
 countrycode = derive { name="countrycode"; version="0.18"; sha256="1by3xws2c43ryz4fnlq85yvgnwnvzmvjbd18cafirlwpl6liy2ic"; depends=[]; };
 covLCA = derive { name="covLCA"; version="1.0"; sha256="15jsjrlaws1cqyrwvh4lzbhxkb11jmgpmddg98nfrzmjpczn2iw3"; depends=[Matrix mlogit poLCA]; };
 covRobust = derive { name="covRobust"; version="1.1-0"; sha256="1nvy5cqs4g565qj2hhgk5spr58ps2bhas3i752rf7wvrskb89fk7"; depends=[]; };
-covTest = derive { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[lars glmnet glmpath MASS]; };
-covr = derive { name="covr"; version="1.0.0"; sha256="1svq2dcqnd5iwq75nk38lxa3dshiwil2ksd3666713agbqzikgcz"; depends=[jsonlite rex devtools httr crayon htmltools]; };
+covTest = derive { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[glmnet glmpath lars MASS]; };
+covr = derive { name="covr"; version="1.0.0"; sha256="1svq2dcqnd5iwq75nk38lxa3dshiwil2ksd3666713agbqzikgcz"; depends=[crayon devtools htmltools httr jsonlite rex]; };
 covreg = derive { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; };
-cowplot = derive { name="cowplot"; version="0.3.1"; sha256="0sqnirrwm0x2gbmblrvpdghd4v76mhczkhlhr4nd7yjz4947gfcp"; depends=[ggplot2]; };
-coxinterval = derive { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[survival timereg Matrix]; };
-coxme = derive { name="coxme"; version="2.2-4"; sha256="186867w9lcx6il2nfa79g4fbljhak2imjn7hcwczmwz7k7sfa4nk"; depends=[survival bdsmatrix nlme Matrix bdsmatrix]; };
+cowplot = derive { name="cowplot"; version="0.4.0"; sha256="06zpzqm19lmvlwl6pkhlb4iw8y9mq69xw002yggfnfm5lb3plsgs"; depends=[ggplot2 gtable plyr]; };
+coxinterval = derive { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[Matrix survival timereg]; };
+coxme = derive { name="coxme"; version="2.2-5"; sha256="0lpdwpvsgjgmbf55qqhflw4q40xmqm422inkssgn3ladcp68gb1s"; depends=[bdsmatrix Matrix nlme survival]; };
 coxphf = derive { name="coxphf"; version="1.11"; sha256="0494szmhc7qp1qynrqf3kmna26h4ams40qr6w7qj4al54mkp0346"; depends=[survival]; };
 coxphw = derive { name="coxphw"; version="3.0.0"; sha256="11pyd09dwkbixjz1riv8rz3jrp1ix6cbn1fw9nm8vnrc19x5lkz5"; depends=[survival]; };
 coxrobust = derive { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; };
 coxsei = derive { name="coxsei"; version="0.1"; sha256="1agr0gmyy1f2x6yspj04skgpi1drpbc1fcbwhhhjsz1j6c64xagy"; depends=[]; };
-cp4p = derive { name="cp4p"; version="0.2"; sha256="1rm6dgfiv2dx17svlzyaiqiqkpip24ns5wp8lddr6gmpws581ywl"; depends=[MESS]; };
+cp4p = derive { name="cp4p"; version="0.2"; sha256="1rm6dgfiv2dx17svlzyaiqiqkpip24ns5wp8lddr6gmpws581ywl"; depends=[limma MESS multtest qvalue]; };
 cpa = derive { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; };
 cpca = derive { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; };
 cpk = derive { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; };
 cplexAPI = derive { name="cplexAPI"; version="1.2.11"; sha256="1rfvq2a561dz3szvrs9s5gsizwwp0b5rn4059v9divzw23clr2a9"; depends=[]; };
-cplm = derive { name="cplm"; version="0.7-2"; sha256="0vwj130r5wbax9ixcn0fdznh1zrr0wq48iivmlymqbhbqajmv8fb"; depends=[coda Matrix biglm ggplot2 minqa nlme reshape2 statmod tweedie Matrix]; };
+cplm = derive { name="cplm"; version="0.7-2"; sha256="0vwj130r5wbax9ixcn0fdznh1zrr0wq48iivmlymqbhbqajmv8fb"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; };
 cpm = derive { name="cpm"; version="2.0"; sha256="0k27r3bfqrdy3iwpzyh8mp8lr3ndcsc688g6mp5ha4blxiwgciyb"; depends=[]; };
-cqrReg = derive { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[Rcpp quantreg Rcpp RcppArmadillo]; };
+cqrReg = derive { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; };
 cquad = derive { name="cquad"; version="1.1"; sha256="09rzqdv59q81nsrpjhjbdwm3p803q51w18arjg8x8l2jcgk3zcga"; depends=[]; };
-crackR = derive { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[Hmisc evd]; };
+crackR = derive { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[evd Hmisc]; };
 cramer = derive { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; };
 crank = derive { name="crank"; version="1.0-7"; sha256="1ni5icg1c9ypvcvcxrr7dcp1zbk4iwyns421rrqsgmpns06s59w6"; depends=[]; };
 cranlogs = derive { name="cranlogs"; version="2.0.0"; sha256="13c8sa3s1xvb5naj4cy7d5azcbf716l0gp4x086sqd5dg1hqdy8b"; depends=[httr jsonlite]; };
 crantastic = derive { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; };
-crawl = derive { name="crawl"; version="1.4-1"; sha256="175w5933h5hhhjnrc0l1kg5q24b8pclnf5sf36gj1pmg8s58d1gp"; depends=[mvtnorm sp raster]; };
+crawl = derive { name="crawl"; version="1.4-1"; sha256="175w5933h5hhhjnrc0l1kg5q24b8pclnf5sf36gj1pmg8s58d1gp"; depends=[mvtnorm raster sp]; };
 crayon = derive { name="crayon"; version="1.3.0"; sha256="1s51ijdsss02d6wwbx2r14vz03w8b17757rh43i7nc1vh36ylbjk"; depends=[memoise]; };
 crblocks = derive { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; };
 crch = derive { name="crch"; version="0.1-0"; sha256="1f4y2dd6lxsryyjjv569bxh1b4ymcnma0m9k7j150anzvkbrgnjn"; depends=[Formula ordinal]; };
 crimCV = derive { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; };
-crimelinkage = derive { name="crimelinkage"; version="0.0.3"; sha256="018ni9jgnm4k8vybz99drsx8phb0ar3x0raa5ydkfpgqp525sayi"; depends=[igraph geosphere]; };
-crmn = derive { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[]; };
+crimelinkage = derive { name="crimelinkage"; version="0.0.3"; sha256="018ni9jgnm4k8vybz99drsx8phb0ar3x0raa5ydkfpgqp525sayi"; depends=[geosphere igraph]; };
+crmn = derive { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[Biobase pcaMethods]; };
 crn = derive { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; };
 crossReg = derive { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; };
 crossdes = derive { name="crossdes"; version="1.1-1"; sha256="1d7lv3ibq1rwxx8kc3ia6l9dbz2dxdd5pnf2vhhjmwm448iamcfd"; depends=[AlgDesign gtools]; };
-crossmatch = derive { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[survival nbpMatching]; };
+crossmatch = derive { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[nbpMatching survival]; };
 crossval = derive { name="crossval"; version="1.0.2"; sha256="1imqmrr86yr2ml9x8cycnlr7d8yymyyypi87kxqjc32s2r16s0cx"; depends=[]; };
 crp_CSFP = derive { name="crp.CSFP"; version="2.0"; sha256="0ji208hn3zimql0xhy8bl7w0vg40szw28fia7k1f7g9z0wbl9xqp"; depends=[MASS]; };
-crqa = derive { name="crqa"; version="1.0.5"; sha256="0kiw90p89mf207mmky98g2d4l9mnhzi4dy08d810nm16wiqabkw4"; depends=[Matrix tseriesChaos fields pracma]; };
+crqa = derive { name="crqa"; version="1.0.5"; sha256="0kiw90p89mf207mmky98g2d4l9mnhzi4dy08d810nm16wiqabkw4"; depends=[fields Matrix pracma tseriesChaos]; };
 crrSC = derive { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; };
 crrstep = derive { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; };
 crs = derive { name="crs"; version="0.15-24"; sha256="08k8vim4n85ll16zpkwbf3riz641kafn699qsg0h746zqzi1kfn7"; depends=[boot np quantreg rgl]; };
 crunch = derive { name="crunch"; version="1.2.1"; sha256="0p3d7iwphywyfb0m9s3fnqhdhf9klgf1cswilaz9ngxfzh5g3df2"; depends=[httr jsonlite RCurl]; };
 csSAM = derive { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
 csampling = derive { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; };
-cshapes = derive { name="cshapes"; version="0.4-2"; sha256="015mkh0iwdbhpbk8gpnq48pp026mfidd69rj70arpmg3knd2jvff"; depends=[sp maptools plyr]; };
+cshapes = derive { name="cshapes"; version="0.4-2"; sha256="015mkh0iwdbhpbk8gpnq48pp026mfidd69rj70arpmg3knd2jvff"; depends=[maptools plyr sp]; };
 cslogistic = derive { name="cslogistic"; version="0.1-3"; sha256="1s8p3qpz81nn6zr0pzw6h9ca3p6ahd8zj640vy5gcb5waqwj6bfj"; depends=[mvtnorm]; };
 csn = derive { name="csn"; version="1.1.3"; sha256="102w1qh9hgz4j9lh5hnbw1z3b7p034si73q4pkk564a2mhzlksw4"; depends=[mvtnorm]; };
 csrplus = derive { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; };
@@ -3038,16 +3050,16 @@ cudia = derive { name="cudia"; version="0.1"; sha256="1ms3bc8sp6l3bm75j418mmb707
 cumSeg = derive { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; };
 cumplyr = derive { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; };
 curl = derive { name="curl"; version="0.8"; sha256="1j24w2hswcs3hl47b60rz3scbqpd2s2dfa2fbf1c9xxb3fi1m38w"; depends=[]; };
-currentSurvival = derive { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[survival cmprsk]; };
-curvHDR = derive { name="curvHDR"; version="1.0-3"; sha256="0rq72prxv2r5nicss9mh4wpkfjvlbb885w85ag4qrqijzq6y8q04"; depends=[feature geometry hdrcde ks misc3d ptinpoly rgl]; };
-curvetest = derive { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_oo R_methodsS3]; };
+currentSurvival = derive { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[cmprsk survival]; };
+curvHDR = derive { name="curvHDR"; version="1.0-3"; sha256="0rq72prxv2r5nicss9mh4wpkfjvlbb885w85ag4qrqijzq6y8q04"; depends=[feature flowCore geometry hdrcde ks misc3d ptinpoly rgl]; };
+curvetest = derive { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_methodsS3 R_oo]; };
 cutoffR = derive { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; };
 cuttlefish_model = derive { name="cuttlefish.model"; version="1.0"; sha256="1rmkfyfd1323g2ymd5gi1aksp160cwy5ha5cjqh5r6fzd8hhqjxs"; depends=[]; };
-cvAUC = derive { name="cvAUC"; version="1.1.0"; sha256="13bk97l5nn97h85iz93zxazhr63n21nwyrpnl856as9qp59yvn64"; depends=[ROCR data_table]; };
-cvTools = derive { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase lattice robustbase]; };
+cvAUC = derive { name="cvAUC"; version="1.1.0"; sha256="13bk97l5nn97h85iz93zxazhr63n21nwyrpnl856as9qp59yvn64"; depends=[data_table ROCR]; };
+cvTools = derive { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase]; };
 cvplogistic = derive { name="cvplogistic"; version="3.1-0"; sha256="1lm66nn0q7665r64rdslxp35b7drdss4mys42ks54xdydcminns9"; depends=[]; };
 cvq2 = derive { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; };
-cvxclustr = derive { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[Matrix igraph]; };
+cvxclustr = derive { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[igraph Matrix]; };
 cwhmisc = derive { name="cwhmisc"; version="5.0"; sha256="0b70ssss48kpjyimwm8hwcx82whg77j40qxaaj4vhhqc8d2bzgd2"; depends=[lattice]; };
 cwm = derive { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; };
 cxxfunplus = derive { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; };
@@ -3055,58 +3067,58 @@ cycloids = derive { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bf
 cyphid = derive { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; };
 cytoDiv = derive { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; };
 d3Network = derive { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; };
-dMod = derive { name="dMod"; version="0.1"; sha256="0170hvgngwxr0qfl7knmj0l2gg053xj5yfd5hkfyjnl6ivcsw3c9"; depends=[cOde trust ggplot2]; };
+dMod = derive { name="dMod"; version="0.1"; sha256="0170hvgngwxr0qfl7knmj0l2gg053xj5yfd5hkfyjnl6ivcsw3c9"; depends=[cOde ggplot2 trust]; };
 dae = derive { name="dae"; version="2.7-0"; sha256="1pfd3zyvs29ij8xa1ngz2din4srl45rjnjc576h1mz16l7h5kx53"; depends=[ggplot2]; };
-daewr = derive { name="daewr"; version="1.1-4"; sha256="0pmz4721999vf023hpvsf17k5fgqpwnisnwssmav46glhmzl2cyj"; depends=[lattice FrF2 BsMD]; };
-daff = derive { name="daff"; version="0.1.4"; sha256="1g08m9qyrlwxdy9w18132dc9klz6ayw5jbn700vkzvqibfc1l7cx"; depends=[V8 jsonlite]; };
+daewr = derive { name="daewr"; version="1.1-4"; sha256="0pmz4721999vf023hpvsf17k5fgqpwnisnwssmav46glhmzl2cyj"; depends=[BsMD FrF2 lattice]; };
+daff = derive { name="daff"; version="0.1.4"; sha256="1g08m9qyrlwxdy9w18132dc9klz6ayw5jbn700vkzvqibfc1l7cx"; depends=[jsonlite V8]; };
 dafs = derive { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; };
 dagR = derive { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; };
 dagbag = derive { name="dagbag"; version="1.1"; sha256="1hpg7fs1yhnycziahscymkr0s3a2lyasfpj0cg677va73nrpdz12"; depends=[]; };
 dams = derive { name="dams"; version="0.1"; sha256="0h0chh9ahsfvqhv1a0dfw88q7gdl1d0w11qcw0w4qmc2ipsl52i6"; depends=[RCurl]; };
-darch = derive { name="darch"; version="0.9.1"; sha256="0syrzmmz43msd51whkb4xy5n0kgcl50yw4w3i9sdd9k20glvwpsx"; depends=[futile_logger ff]; };
+darch = derive { name="darch"; version="0.9.1"; sha256="0syrzmmz43msd51whkb4xy5n0kgcl50yw4w3i9sdd9k20glvwpsx"; depends=[ff futile_logger]; };
 darts = derive { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; };
 dashboard = derive { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; };
 data_table = derive { name="data.table"; version="1.9.4"; sha256="0gsnjjly3mxwfs6q0kjr42vr234mprp8kcyzcsa4dqf2ya2gs1s6"; depends=[chron reshape2]; };
 data_tree = derive { name="data.tree"; version="0.1.6"; sha256="09pk4c5jkj69m6sxa2pbs1wh1w4rsg799w72fx9ib4jv22hjvrhc"; depends=[R6]; };
 dataQualityR = derive { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; };
-dataRetrieval = derive { name="dataRetrieval"; version="2.2.1"; sha256="1mq32blqdsc1zj3l7wbxdc9asl2nkrby5kijdk0rix574cxml9qm"; depends=[XML RCurl reshape2 lubridate plyr]; };
-datacheck = derive { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[stringr Hmisc shiny]; };
+dataRetrieval = derive { name="dataRetrieval"; version="2.2.1"; sha256="1mq32blqdsc1zj3l7wbxdc9asl2nkrby5kijdk0rix574cxml9qm"; depends=[lubridate plyr RCurl reshape2 XML]; };
+datacheck = derive { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[Hmisc shiny stringr]; };
 dataframes2xls = derive { name="dataframes2xls"; version="0.4.6"; sha256="18m4cbr3pxdn5ynxwd8klwwli3cyfjcn83pl17sn1rbavqlnkq5c"; depends=[]; };
 datalist = derive { name="datalist"; version="0.2"; sha256="0q82wira0sfi63cn66f5cfyd15f19ig7pbmpk56j38a3115l2fmn"; depends=[assertthat]; };
 datamap = derive { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; };
-datamart = derive { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[RJSONIO XML RCurl base64 gsubfn markdown]; };
-datastepr = derive { name="datastepr"; version="0.0.1"; sha256="1dzx7mw9hl2f8q638m3vwva7mdlb59bgjc5rmpcjb5nxmylpx0vk"; depends=[dplyr lazyeval R6 magrittr rlist]; };
+datamart = derive { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[base64 gsubfn markdown RCurl RJSONIO XML]; };
+datastepr = derive { name="datastepr"; version="0.0.1"; sha256="1dzx7mw9hl2f8q638m3vwva7mdlb59bgjc5rmpcjb5nxmylpx0vk"; depends=[dplyr lazyeval magrittr R6 rlist]; };
 datautils = derive { name="datautils"; version="0.1.4"; sha256="0adg87p9rzz62cm0s80x71mhsg3yfg93gskv1hs1l8gaj78zd1y1"; depends=[deldir gplots gtools]; };
 dataview = derive { name="dataview"; version="2.1.1"; sha256="1nn33h5c1h4a3zm1xm7sdz4s6sy0f3r53jhm7bv6qk7aiylwqf6v"; depends=[data_table xtermStyle]; };
 date = derive { name="date"; version="1.2-34"; sha256="066zsddpw87x1bhl3479k6fd1wrl3x91n5rd454diwmwq2s8i5qb"; depends=[]; };
 dave = derive { name="dave"; version="1.5"; sha256="0sw9hc4y9wdfbnnk6isg7z7sky6ni68pkjxdlrph5m7jcyqphz96"; depends=[labdsv vegan]; };
-dawai = derive { name="dawai"; version="1.1"; sha256="0icf8iys980z0agyba94xa16400p2vdvg8hg52vvlgfc85ikqfkx"; depends=[mvtnorm ibdreg boot]; };
+dawai = derive { name="dawai"; version="1.1"; sha256="0icf8iys980z0agyba94xa16400p2vdvg8hg52vvlgfc85ikqfkx"; depends=[boot ibdreg mvtnorm]; };
 db_r = derive { name="db.r"; version="0.1.3"; sha256="1zjsj0rxg9wysl1gzm7ggphd5mi02mj0bn80kmbx1vb7aa7bnxxh"; depends=[DBI rjson RSQLite stringr]; };
-dbConnect = derive { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[RMySQL gWidgets]; };
+dbConnect = derive { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[gWidgets RMySQL]; };
 dbEmpLikeGOF = derive { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; };
 dbEmpLikeNorm = derive { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; };
 dbarts = derive { name="dbarts"; version="0.8-5"; sha256="1w170mdfl5qz7dv1p2kqx0wnkmbz2gxh2a4p7vak1nckhz2sgpgn"; depends=[]; };
 dblcens = derive { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; };
-dbmss = derive { name="dbmss"; version="2.2.0"; sha256="0ngf7l7nsp03jvspa7xfhal2ccaxcvjny5sd5aypfwfgrndrd71z"; depends=[spatstat Rcpp cubature Rcpp]; };
+dbmss = derive { name="dbmss"; version="2.2.0"; sha256="0ngf7l7nsp03jvspa7xfhal2ccaxcvjny5sd5aypfwfgrndrd71z"; depends=[cubature Rcpp spatstat]; };
 dbstats = derive { name="dbstats"; version="1.0.4"; sha256="1miba5h5hkpb79kv9v9hqb5p66sinxpqvrw9hy9l5z4li6849yy1"; depends=[cluster pls]; };
-dcGOR = derive { name="dcGOR"; version="1.0.4"; sha256="1vvij7f2vw9xaky32wyr7h1iwcq5m3s2s46kn9vjq1jllw85phgl"; depends=[Matrix igraph dnet]; };
+dcGOR = derive { name="dcGOR"; version="1.0.4"; sha256="1vvij7f2vw9xaky32wyr7h1iwcq5m3s2s46kn9vjq1jllw85phgl"; depends=[dnet igraph Matrix]; };
 dcemriS4 = derive { name="dcemriS4"; version="0.55"; sha256="15x4hjc5fwpn80h90q5x9a3p84pp3mxsmcx4hq5l0j52l9dy9nv3"; depends=[oro_nifti]; };
 dclone = derive { name="dclone"; version="2.0-0"; sha256="1j8g955rvdgcmc9vnz3xizlkq8w1bslav5h72igvzzffcvqbj9hq"; depends=[coda]; };
-dcmle = derive { name="dcmle"; version="0.2-4"; sha256="0ddb0x0lwk8jgx05k747sa33d2rrj4g2p4aj0m5bw1c9d5gril0m"; depends=[dclone rjags coda lattice]; };
+dcmle = derive { name="dcmle"; version="0.2-4"; sha256="0ddb0x0lwk8jgx05k747sa33d2rrj4g2p4aj0m5bw1c9d5gril0m"; depends=[coda dclone lattice rjags]; };
 dcmr = derive { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; };
 dcv = derive { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; };
-ddalpha = derive { name="ddalpha"; version="1.1.1"; sha256="1i0zchgp5pdfa9p1mpd9svbigbn01jqfl47nnqixzlgz1808929c"; depends=[MASS class robustbase Rcpp BH Rcpp]; };
+ddalpha = derive { name="ddalpha"; version="1.1.1"; sha256="1i0zchgp5pdfa9p1mpd9svbigbn01jqfl47nnqixzlgz1808929c"; depends=[BH class MASS Rcpp robustbase]; };
 ddeploy = derive { name="ddeploy"; version="1.0.2"; sha256="115k379l39gzddvn0l45l0sr0wyd7r486i28qs2hfyjnk1288vrs"; depends=[httr jsonlite]; };
-ddst = derive { name="ddst"; version="1.03"; sha256="0zbqw4qmrh80jjgn8jzbnq3kykj1v5bsg6k751vircc0x9vnig3j"; depends=[orthopolynom evd]; };
+ddst = derive { name="ddst"; version="1.03"; sha256="0zbqw4qmrh80jjgn8jzbnq3kykj1v5bsg6k751vircc0x9vnig3j"; depends=[evd orthopolynom]; };
 deSolve = derive { name="deSolve"; version="1.11"; sha256="014fbrgzlarg2w27kq9qy7631hvhlf7ldrn5g8x2xibb260832s1"; depends=[]; };
 deTestSet = derive { name="deTestSet"; version="1.1.2"; sha256="142261xjlz6h9vakiks04rz7hgv9b5j6s77acavd5s5mpi51ysh7"; depends=[deSolve]; };
 deal = derive { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmabbyivc25cbfhcf814avrhpysvpxa"; depends=[]; };
 deamer = derive { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; };
 debug = derive { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; };
-decctools = derive { name="decctools"; version="0.2.1"; sha256="01h119gdvvbfnqfxaca7ca0yhpp6wggq0b69k6ww5lnkfnlj0sgi"; depends=[XLConnect stringr XML reshape2 RCurl lubridate plyr]; };
+decctools = derive { name="decctools"; version="0.2.1"; sha256="01h119gdvvbfnqfxaca7ca0yhpp6wggq0b69k6ww5lnkfnlj0sgi"; depends=[lubridate plyr RCurl reshape2 stringr XLConnect XML]; };
 decisionSupport = derive { name="decisionSupport"; version="1.101.1"; sha256="08qcvdwp0wgspnfnlhkpxz3p6y43pjf32p185knw8g81wr1950ip"; depends=[msm mvtnorm]; };
 decode = derive { name="decode"; version="1.1"; sha256="06c6l2s32s1vri51hbnl17sxgkl7x8537prk0zzq6zlqhkwy6j77"; depends=[]; };
-decompr = derive { name="decompr"; version="4.0.0"; sha256="161y5fyy5yqbsl68q9bd4b0s87c3qzv7x9jrzb2k9lxhm4h8qh0w"; depends=[]; };
+decompr = derive { name="decompr"; version="4.1.0"; sha256="1agzfy7iyyzh71pb56l7438bvpsx0q2z9mxh16fc8mfnywcl2jr2"; depends=[]; };
 decon = derive { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; };
 deducorrect = derive { name="deducorrect"; version="1.3-5"; sha256="06lcqnay36fgkzvgbiq7b67r9lfgll3lxfr1pmx14vmivshb6mmm"; depends=[editrules]; };
 deepnet = derive { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; };
@@ -3115,12 +3127,12 @@ degreenet = derive { name="degreenet"; version="1.3-1"; sha256="0k0a1c1bv7zclrar
 deldir = derive { name="deldir"; version="0.1-9"; sha256="0shzyqfqdkbhpf4hcwjjfzzizh6z56iamx2blhj79izg8xkvl2h9"; depends=[]; };
 delt = derive { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; };
 deltaPlotR = derive { name="deltaPlotR"; version="1.5"; sha256="0hbaibl4b50pg9ypyhz4700w6kir4jiyyl0230a8hjmb92aqn303"; depends=[MASS]; };
-demi = derive { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[R_utils plyr devtools]; };
+demi = derive { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[affxparser affy devtools oligo plyr R_utils]; };
 deming = derive { name="deming"; version="1.0-1"; sha256="00v59qb6qwbwsvcwi59d0c0g3czfz1190ccj4dx6yarizr4g6cy8"; depends=[boot]; };
 demoKde = derive { name="demoKde"; version="0.9-3"; sha256="1nkvsjms1gfvjz5l7zza0cgx4yqmn2kgnax44pysn0zqmhfny8bw"; depends=[]; };
-demography = derive { name="demography"; version="1.18"; sha256="17r7sz5ikngc4qg495wmn99xawmllpx7rw2gpv8q8bypbc47wlfv"; depends=[forecast rainbow ftsa cobs mgcv strucchange RCurl]; };
+demography = derive { name="demography"; version="1.18"; sha256="17r7sz5ikngc4qg495wmn99xawmllpx7rw2gpv8q8bypbc47wlfv"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; };
 dendextend = derive { name="dendextend"; version="0.18.3"; sha256="1s6bdkibb066yima31sn8ddp8qrwyx2zc84wf2kixs37ynhw1xi1"; depends=[magrittr whisker]; };
-dendextendRcpp = derive { name="dendextendRcpp"; version="0.6.1"; sha256="125kjlfcj7y282j5g62c6j5hflvwngrm70waxym0lzr7xldwx7bk"; depends=[Rcpp dendextend Rcpp]; };
+dendextendRcpp = derive { name="dendextendRcpp"; version="0.6.1"; sha256="125kjlfcj7y282j5g62c6j5hflvwngrm70waxym0lzr7xldwx7bk"; depends=[dendextend Rcpp]; };
 dendroextras = derive { name="dendroextras"; version="0.2.1"; sha256="0k1w374r4fvfcbzhrgcvklccjggyz755z7wc2vqfi3c5hvdb9ns4"; depends=[]; };
 dendsort = derive { name="dendsort"; version="0.3.2"; sha256="0qj65jraj6ksmsfsrc4f3y8m7x5lqg9bqc9yb5s3bav2r8qjyhv6"; depends=[]; };
 denovolyzeR = derive { name="denovolyzeR"; version="0.1.0"; sha256="0ys8pi3wp2cvywsnh07wldv6vcb8sn7f1divpaw8f6gnw7mnhimd"; depends=[dplyr reshape]; };
@@ -3129,32 +3141,33 @@ densityClust = derive { name="densityClust"; version="0.1-1"; sha256="1apv9n871d
 denstrip = derive { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; };
 depend_truncation = derive { name="depend.truncation"; version="2.4"; sha256="09jcg6gr4dy0ayayn8qvbgncnw6v76xzif90c7v64a09snhh8qv6"; depends=[mvtnorm]; };
 depmix = derive { name="depmix"; version="0.9.13"; sha256="1dkwc1bjq19hjzichh78b41qslklgwib8mglbn23q9dsys8a3ccz"; depends=[MASS]; };
-depmixS4 = derive { name="depmixS4"; version="1.3-2"; sha256="18xmn5fv9wszh86ph91yypfnyrxy7j2gqrzzgkb84986fjp2sxlq"; depends=[nnet MASS Rsolnp]; };
-depth = derive { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6jp2qs39g8lxi2nmpbi3m7a6qrgr2q"; depends=[abind rgl circular]; };
+depmixS4 = derive { name="depmixS4"; version="1.3-2"; sha256="18xmn5fv9wszh86ph91yypfnyrxy7j2gqrzzgkb84986fjp2sxlq"; depends=[MASS nnet Rsolnp]; };
+depth = derive { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6jp2qs39g8lxi2nmpbi3m7a6qrgr2q"; depends=[abind circular rgl]; };
 depthTools = derive { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; };
 descomponer = derive { name="descomponer"; version="1.2"; sha256="08hc3p4l8dy1h2z8ijifwlgidmac9b29g1k725yzwzbdr5jzvnzl"; depends=[taRifx]; };
 descr = derive { name="descr"; version="1.1.1"; sha256="1flnz05j390izwadsv2l5bcxgl6zmq4vzz1aycfifjz75zyqqy8s"; depends=[xtable]; };
-deseasonalize = derive { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[lattice FitAR]; };
+deseasonalize = derive { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[FitAR lattice]; };
+desiR = derive { name="desiR"; version="1.0"; sha256="10c9ld918yg5zgvf40bhlsj2i7w6i08ws26q799w9ma9splgq8sk"; depends=[]; };
 designGG = derive { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; };
 desirability = derive { name="desirability"; version="1.9"; sha256="1p3w4xk4is22gqgy2gyxj80vib8s40lgllqc2fnz66kb2cln10n6"; depends=[]; };
 desire = derive { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; };
 detect = derive { name="detect"; version="0.3-2"; sha256="1mjc8h3xb2zbj4dxala8yqbdl94knf9q0qvkc37ag1b2w4y2d2b0"; depends=[Formula]; };
 detrendeR = derive { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; };
 devEMF = derive { name="devEMF"; version="2.0"; sha256="19wraakvf7xsf1i108dz3ipl1hdixgwa6h0bizxfyajw5yqmw8mw"; depends=[]; };
-devtools = derive { name="devtools"; version="1.8.0"; sha256="14q1c6jfnvljn50ccl2irfq8awa03z8fni3n5fdsdv4l9cdwj29p"; depends=[httr RCurl memoise whisker evaluate digest rstudioapi jsonlite roxygen2 rversions git2r]; };
+devtools = derive { name="devtools"; version="1.8.0"; sha256="14q1c6jfnvljn50ccl2irfq8awa03z8fni3n5fdsdv4l9cdwj29p"; depends=[digest evaluate git2r httr jsonlite memoise RCurl roxygen2 rstudioapi rversions whisker]; };
 df2json = derive { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; };
-dfcomb = derive { name="dfcomb"; version="2.1-3"; sha256="0mjvk0yc229x80z97dmnmbph9lpgfxpqagwdf57369mkwzms5kx2"; depends=[RcppArmadillo BH RcppProgress Rcpp]; };
+dfcomb = derive { name="dfcomb"; version="2.1-3"; sha256="0mjvk0yc229x80z97dmnmbph9lpgfxpqagwdf57369mkwzms5kx2"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
 dfcrm = derive { name="dfcrm"; version="0.2-2"; sha256="1kwgxfqnz2bcicyb27lp6bnvrj30lqjpn5fg7kaqshgkj53g0s4f"; depends=[]; };
 dfexplore = derive { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; };
-dfmta = derive { name="dfmta"; version="1.3-2"; sha256="1x3hz6by82mjcs8y6h7n380wr884dlx2pjpfsbz84zrk78hhnh5g"; depends=[RcppArmadillo BH RcppProgress Rcpp]; };
+dfmta = derive { name="dfmta"; version="1.3-2"; sha256="1x3hz6by82mjcs8y6h7n380wr884dlx2pjpfsbz84zrk78hhnh5g"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
 dfoptim = derive { name="dfoptim"; version="2011.8-1"; sha256="19j0h5xdrbmykz2nrjrwqwaw7466zvqaiwafrm1jc12mk5azfcqx"; depends=[]; };
 dga = derive { name="dga"; version="1.2"; sha256="13mfampnghcs5xplzq69bw948lqhw561pn54j3gb0ydsg5bm5vmr"; depends=[chron]; };
 dglars = derive { name="dglars"; version="1.0.5"; sha256="02g8x4p98jv3cfwfxvh68aivb72651w4977g4xqksq0p4nqcs636"; depends=[]; };
 dglm = derive { name="dglm"; version="1.8.1"; sha256="12q49nf30ji4c7vysf2s48bif7crwlmqn8cx0wy23xlhj5x2p4b3"; depends=[statmod]; };
-dgmb = derive { name="dgmb"; version="1.1"; sha256="134ckgq7rsdypg3c586kkhr9rx5ya34smp38i9lzvbdanzrpf33w"; depends=[MASS abind]; };
+dgmb = derive { name="dgmb"; version="1.1"; sha256="134ckgq7rsdypg3c586kkhr9rx5ya34smp38i9lzvbdanzrpf33w"; depends=[abind MASS]; };
 dgof = derive { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; };
-dhglm = derive { name="dhglm"; version="1.2"; sha256="14wa0xkwb1qvkynk95aw6y4rx3jjdki19wdydg3wv5nfagcc4vdz"; depends=[Matrix numDeriv boot]; };
-diagonals = derive { name="diagonals"; version="0.2.0"; sha256="185nibadqvi6cvablh84ijs52wn2vg0xrc2idizll6lcxhf441yq"; depends=[]; };
+dhglm = derive { name="dhglm"; version="1.2"; sha256="14wa0xkwb1qvkynk95aw6y4rx3jjdki19wdydg3wv5nfagcc4vdz"; depends=[boot Matrix numDeriv]; };
+diagonals = derive { name="diagonals"; version="0.3.0"; sha256="066v1n1l7qkc8m5m9057n3gphiz5054b5h30ik3iwhfkk536364q"; depends=[]; };
 diagram = derive { name="diagram"; version="1.6.3"; sha256="1iga574r31hz7g50nmicbah4rj4l46w6lgw3sz1b69iv6hpp7sq1"; depends=[shape]; };
 diaplt = derive { name="diaplt"; version="1.2.1"; sha256="0pya6rqzsvc5nd3smhydvabarglc4nn04q605vbllmbhq9rv00pa"; depends=[]; };
 dice = derive { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; };
@@ -3162,25 +3175,25 @@ dichromat = derive { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3m
 dicionariosIBGE = derive { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; };
 dielectric = derive { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; };
 difR = derive { name="difR"; version="4.6"; sha256="1803j0ql1g8gdy9i0wy4sz9sbl52dqjqcwbnknyrb34r51jmij5k"; depends=[lme4 ltm]; };
-diffEq = derive { name="diffEq"; version="1.0-1"; sha256="1xmb19hs0x913g45szmm26xx5xp85v182wqf0lnl4raxaf47yhkm"; depends=[deSolve rootSolve bvpSolve ReacTran deTestSet shape]; };
+diffEq = derive { name="diffEq"; version="1.0-1"; sha256="1xmb19hs0x913g45szmm26xx5xp85v182wqf0lnl4raxaf47yhkm"; depends=[bvpSolve deSolve deTestSet ReacTran rootSolve shape]; };
 diffIRT = derive { name="diffIRT"; version="1.4"; sha256="13axwzsrlr1akj4viwsyaplh11krixg3l07qi58c81jrcrmqpgv1"; depends=[statmod]; };
-diffdepprop = derive { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee rootSolve PropCIs]; };
-diffeR = derive { name="diffeR"; version="0.0-2"; sha256="1dkmwr6klqx950g9214n2rbd0p3k668w5217b0nvz6vfp3gczkjz"; depends=[rgdal raster ggplot2]; };
+diffdepprop = derive { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee PropCIs rootSolve]; };
+diffeR = derive { name="diffeR"; version="0.0-2"; sha256="1dkmwr6klqx950g9214n2rbd0p3k668w5217b0nvz6vfp3gczkjz"; depends=[ggplot2 raster rgdal]; };
 diffractometry = derive { name="diffractometry"; version="0.1-8"; sha256="1m6cyf1kxm9xf1z4mn4iz0ggiy9wcyi8ysbgcsk7l78y7nqh1h99"; depends=[]; };
-diffusionMap = derive { name="diffusionMap"; version="1.1-0"; sha256="1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3"; depends=[scatterplot3d igraph Matrix]; };
+diffusionMap = derive { name="diffusionMap"; version="1.1-0"; sha256="1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3"; depends=[igraph Matrix scatterplot3d]; };
 digest = derive { name="digest"; version="0.6.8"; sha256="0m9grqv67hhf51lz10whymhw0g0d98466ka694kya5x95hn44qih"; depends=[]; };
 digitalPCR = derive { name="digitalPCR"; version="1.0"; sha256="0gjxlw0f2msh2x5jpzkpq8xc67zpv560q4vql5nwifm44dwar753"; depends=[]; };
-dils = derive { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp Rcpp]; };
+dils = derive { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; };
 dinamic = derive { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; };
 diptest = derive { name="diptest"; version="0.75-7"; sha256="0rcgycgp0bf8vhga1wwgfcz3pqs5l26hgzsgf2f97dwfna40i1p1"; depends=[]; };
-directPA = derive { name="directPA"; version="1.1"; sha256="0sri3981vk997qjl3c3zchn3vx0h3pdbnagcvds4bnrpycvn4bz8"; depends=[rgl calibrate]; };
+directPA = derive { name="directPA"; version="1.1"; sha256="0sri3981vk997qjl3c3zchn3vx0h3pdbnagcvds4bnrpycvn4bz8"; depends=[calibrate rgl]; };
 directlabels = derive { name="directlabels"; version="2013.6.15"; sha256="083cwahz320r4w4jbh62pxmzn1i1hixp398zm8f2fpzh4qp5y44g"; depends=[quadprog]; };
 dirmult = derive { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; };
-discSurv = derive { name="discSurv"; version="1.1.0"; sha256="0jj055w0m749fdd90cqlyklxnjxfjhly179lmg9xfl69w4xrjc2l"; depends=[functional Matrix matrixcalc mvtnorm numDeriv caret mgcv]; };
+discSurv = derive { name="discSurv"; version="1.1.0"; sha256="0jj055w0m749fdd90cqlyklxnjxfjhly179lmg9xfl69w4xrjc2l"; depends=[caret functional Matrix matrixcalc mgcv mvtnorm numDeriv]; };
 disclap = derive { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; };
-disclapmix = derive { name="disclapmix"; version="1.6"; sha256="0g1yg4n4pfy0295faw2scfh45m978ymmlx9bl3h8849kfaizkysi"; depends=[Rcpp disclap cluster Rcpp]; };
+disclapmix = derive { name="disclapmix"; version="1.6.1"; sha256="1sjmw9yb7py8nk4w73qdjwiwmrjs387x6lhh711sgf87p5834fxp"; depends=[cluster disclap Rcpp]; };
 discreteMTP = derive { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; };
-discreteRV = derive { name="discreteRV"; version="1.2.1"; sha256="06gvfn5v54gbal7kpnfcxwaacbq8354yvc47kjipn29bqpw9b6mb"; depends=[plyr MASS]; };
+discreteRV = derive { name="discreteRV"; version="1.2.1"; sha256="06gvfn5v54gbal7kpnfcxwaacbq8354yvc47kjipn29bqpw9b6mb"; depends=[MASS plyr]; };
 discretization = derive { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; };
 discrimARTs = derive { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; };
 diseasemapping = derive { name="diseasemapping"; version="1.2.0"; sha256="1l6w1f4zxfp1hrhvmxgijj2kwy7x0na2yf75ifqrbh1i499j8zjq"; depends=[sp]; };
@@ -3192,85 +3205,85 @@ displayHTS = derive { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204
 dispmod = derive { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; };
 disposables = derive { name="disposables"; version="1.0.0"; sha256="0xd8war6vav8swpwgmyi9hd6xv0j6j72yrk4sdcwiwzgs4l8cbfj"; depends=[]; };
 dissUtils = derive { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; };
-distcomp = derive { name="distcomp"; version="0.25.1"; sha256="04cq4hsv1yl65cchhran9s3844w4knsbfja5wxfib5gh4dadriwk"; depends=[survival shiny httr digest jsonlite stringr R6]; };
+distcomp = derive { name="distcomp"; version="0.25.1"; sha256="04cq4hsv1yl65cchhran9s3844w4knsbfja5wxfib5gh4dadriwk"; depends=[digest httr jsonlite R6 shiny stringr survival]; };
 distfree_cr = derive { name="distfree.cr"; version="1.0"; sha256="13y714l6b3kkpp75fdrsbdclgj1vw1xsvbj9pxi4lkwf11wwmrqr"; depends=[]; };
 distillery = derive { name="distillery"; version="1.0-1"; sha256="0hfj4qbfb5219dm7yrgf2h4jrh2qsjhwrbv8gbrxcr0xf6gqbxmv"; depends=[]; };
 distory = derive { name="distory"; version="1.4.2"; sha256="12j19cb1b4prm8m43gya15kia1ii1k0yy7hkngpn2vsyk7n2z65m"; depends=[ape]; };
-distr = derive { name="distr"; version="2.5.3"; sha256="13ssdidbh4x534f0vvhfpi5cdrhlpmrz8s0y33q7ccf3dfmdsyan"; depends=[startupmsg sfsmisc SweaveListingUtils]; };
-distrDoc = derive { name="distrDoc"; version="2.5.1"; sha256="02wcqy9z36lxkpxy42vj1yv7x2v3i57rngpw58s7immzp5j3dlam"; depends=[distr distrEx distrSim distrTEst distrTeach RandVar distrMod MASS SweaveListingUtils startupmsg]; };
-distrEllipse = derive { name="distrEllipse"; version="2.5"; sha256="1slzzmcf09mqqba287rpgpwbsq6j5lprjgxda5lrc21znvrgfxn3"; depends=[mvtnorm setRNG distr distrEx distrSim]; };
+distr = derive { name="distr"; version="2.5.3"; sha256="13ssdidbh4x534f0vvhfpi5cdrhlpmrz8s0y33q7ccf3dfmdsyan"; depends=[sfsmisc startupmsg SweaveListingUtils]; };
+distrDoc = derive { name="distrDoc"; version="2.5.1"; sha256="02wcqy9z36lxkpxy42vj1yv7x2v3i57rngpw58s7immzp5j3dlam"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg SweaveListingUtils]; };
+distrEllipse = derive { name="distrEllipse"; version="2.5"; sha256="1slzzmcf09mqqba287rpgpwbsq6j5lprjgxda5lrc21znvrgfxn3"; depends=[distr distrEx distrSim mvtnorm setRNG]; };
 distrEx = derive { name="distrEx"; version="2.5"; sha256="0mbccd53r9wl875i702j14wlrv7pjgrwzlnyc511cqa5pg3mn81i"; depends=[distr]; };
-distrMod = derive { name="distrMod"; version="2.5.3"; sha256="1xa6a8fxhb87z4bimvnrylm63q9m90kmm49w2dik79a9d5x5q29b"; depends=[distr distrEx RandVar MASS sfsmisc startupmsg]; };
+distrMod = derive { name="distrMod"; version="2.5.3"; sha256="1xa6a8fxhb87z4bimvnrylm63q9m90kmm49w2dik79a9d5x5q29b"; depends=[distr distrEx MASS RandVar sfsmisc startupmsg]; };
 distrRmetrics = derive { name="distrRmetrics"; version="2.5"; sha256="0c7fhckw7hav68gag8ymgicywl2vbnvqpjxca0x24wpdi1gs4jf6"; depends=[distr fBasics fGarch]; };
-distrSim = derive { name="distrSim"; version="2.5.2"; sha256="0ipg4l2vyifaj1r9a4cc8kg32s65jpz5wxrlnrix95xk5wasdpbh"; depends=[setRNG distr]; };
-distrTEst = derive { name="distrTEst"; version="2.5"; sha256="1swl4v70gkkpidddsgqf0dqz9j0xz5j1wk44bhpi4ficim7hap3l"; depends=[setRNG distrSim startupmsg]; };
+distrSim = derive { name="distrSim"; version="2.5.2"; sha256="0ipg4l2vyifaj1r9a4cc8kg32s65jpz5wxrlnrix95xk5wasdpbh"; depends=[distr setRNG]; };
+distrTEst = derive { name="distrTEst"; version="2.5"; sha256="1swl4v70gkkpidddsgqf0dqz9j0xz5j1wk44bhpi4ficim7hap3l"; depends=[distrSim setRNG startupmsg]; };
 distrTeach = derive { name="distrTeach"; version="2.5"; sha256="0a7qfqpirzcd94dvcvmprhhj2j1yl3lpizsi8mdqr19zcp6dw21k"; depends=[distr distrEx]; };
-distrom = derive { name="distrom"; version="0.3-2"; sha256="08brd85kg7sfvxy9xxjbpzh5zirfxyhjvl9zsxnqy0zlhq7p05q8"; depends=[Matrix gamlr]; };
+distrom = derive { name="distrom"; version="0.3-2"; sha256="08brd85kg7sfvxy9xxjbpzh5zirfxyhjvl9zsxnqy0zlhq7p05q8"; depends=[gamlr Matrix]; };
 divagis = derive { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl08pgcwd16ygjjmm0jjv9knn2ggc3j1jzz"; depends=[rgdal sp]; };
-diveMove = derive { name="diveMove"; version="1.3.9"; sha256="0782b8fvh676g6fy05g1da52q398rxmgz46vk6yxwrmnvg78wcq5"; depends=[caTools KernSmooth quantreg geosphere]; };
-diveRsity = derive { name="diveRsity"; version="1.9.73"; sha256="07lln4fkphwk8kgvw4hsi7rghpwza8967z2gkb2265l28irv7ffm"; depends=[ggplot2 shiny qgraph Rcpp Rcpp]; };
-diversitree = derive { name="diversitree"; version="0.9-7"; sha256="0hr3hzrrbmfqbzcwn18lnqmychs9f21j1x214zry0jmw9pnai0s0"; depends=[deSolve ape subplex Rcpp Rcpp]; };
-divo = derive { name="divo"; version="0.1.1"; sha256="10kymbvp46rzdd6a6p2fri9424sdxj2bhhv0fld7ikk71xgpfdrp"; depends=[RcppCNPy cluster]; };
-dixon = derive { name="dixon"; version="0.0-5"; sha256="0x7x0l7p8kmkfqqqah8hck2r96b3w8padd41skd3q35vq8kmnsqc"; depends=[splancs spatstat]; };
+diveMove = derive { name="diveMove"; version="1.3.9"; sha256="0782b8fvh676g6fy05g1da52q398rxmgz46vk6yxwrmnvg78wcq5"; depends=[caTools geosphere KernSmooth quantreg]; };
+diveRsity = derive { name="diveRsity"; version="1.9.73"; sha256="07lln4fkphwk8kgvw4hsi7rghpwza8967z2gkb2265l28irv7ffm"; depends=[ggplot2 qgraph Rcpp shiny]; };
+diversitree = derive { name="diversitree"; version="0.9-7"; sha256="0hr3hzrrbmfqbzcwn18lnqmychs9f21j1x214zry0jmw9pnai0s0"; depends=[ape deSolve Rcpp subplex]; };
+divo = derive { name="divo"; version="0.1.1"; sha256="10kymbvp46rzdd6a6p2fri9424sdxj2bhhv0fld7ikk71xgpfdrp"; depends=[cluster RcppCNPy]; };
+dixon = derive { name="dixon"; version="0.0-5"; sha256="0x7x0l7p8kmkfqqqah8hck2r96b3w8padd41skd3q35vq8kmnsqc"; depends=[spatstat splancs]; };
 dkDNA = derive { name="dkDNA"; version="0.1.1"; sha256="0ycyzn5bmhjl5idp0lndffkninpm9n23wrkrzi59ac8z8ghsnhf4"; depends=[]; };
 dlm = derive { name="dlm"; version="1.1-4"; sha256="0hyphl90bqc16j7in750pmiyq28hmc46kxgv7gj17c8xl9c9xqxm"; depends=[]; };
-dlmap = derive { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[qtl ibdreg wgaim nlme mgcv]; };
+dlmap = derive { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[ibdreg mgcv nlme qtl wgaim]; };
 dlmodeler = derive { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; };
 dlnm = derive { name="dlnm"; version="2.1.3"; sha256="044khdhk4dgd09cwmidsfa2rgd43h7wnd48bmmrnsvj3314bic0f"; depends=[nlme]; };
 dma = derive { name="dma"; version="1.2-2"; sha256="18v40rr4qx98ap38vr77xxvl7y3a6cqfky3z4s5zc87q6y1z5g2s"; depends=[MASS mnormt]; };
-dmm = derive { name="dmm"; version="1.6-1"; sha256="0bls3ka8fwnsd0v74ncy8nbgxk0a3z1gw9dgm3vibz1lsypfs72a"; depends=[MASS Matrix nadiv robustbase pls]; };
-dmt = derive { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[mvtnorm MASS Matrix]; };
+dmm = derive { name="dmm"; version="1.6-1"; sha256="0bls3ka8fwnsd0v74ncy8nbgxk0a3z1gw9dgm3vibz1lsypfs72a"; depends=[MASS Matrix nadiv pls robustbase]; };
+dmt = derive { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; };
 dna = derive { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; };
-dnet = derive { name="dnet"; version="1.0.6"; sha256="0zhv2yfrlhfwjbgbvjzmw3c5g5rj33n8l2npdf6b4nqz0c0hc1jn"; depends=[igraph Matrix]; };
-doBy = derive { name="doBy"; version="4.5-13"; sha256="07ppghcf381wc9s9igsi3viy6p86b5bmpfm1s8iwq7ca4j89qw42"; depends=[survival MASS Matrix]; };
+dnet = derive { name="dnet"; version="1.0.6"; sha256="0zhv2yfrlhfwjbgbvjzmw3c5g5rj33n8l2npdf6b4nqz0c0hc1jn"; depends=[Biobase graph igraph Matrix Rgraphviz supraHex]; };
+doBy = derive { name="doBy"; version="4.5-13"; sha256="07ppghcf381wc9s9igsi3viy6p86b5bmpfm1s8iwq7ca4j89qw42"; depends=[MASS Matrix survival]; };
 doMC = derive { name="doMC"; version="1.3.3"; sha256="0g5psgk92b2zk9fkap3a86haay2y0kfz75cyk3d1ila9m7cd2cn4"; depends=[foreach iterators]; };
 doMPI = derive { name="doMPI"; version="0.2.1"; sha256="1d2pkxsap656l7h88q37ymy1jw0zd4n9h892511a1a230dxwc0xh"; depends=[foreach iterators Rmpi]; };
 doParallel = derive { name="doParallel"; version="1.0.8"; sha256="1z6cwqnjvqsbck44padqkv4r75cy32p5vrlkkan4mq84cc8062nx"; depends=[foreach iterators]; };
-doRNG = derive { name="doRNG"; version="1.6"; sha256="0yvg4052gfdh54drn6xnpiqyd77p8765yi525nag3ismw2yn9y58"; depends=[foreach rngtools iterators pkgmaker]; };
-doRedis = derive { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[rredis foreach iterators]; };
+doRNG = derive { name="doRNG"; version="1.6"; sha256="0yvg4052gfdh54drn6xnpiqyd77p8765yi525nag3ismw2yn9y58"; depends=[foreach iterators pkgmaker rngtools]; };
+doRedis = derive { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[foreach iterators rredis]; };
 doSNOW = derive { name="doSNOW"; version="1.0.12"; sha256="0j71n0l9lbvwllw9iigvjgv0x8z2j57grl3yazkgcyzy0mcgf741"; depends=[foreach iterators snow]; };
 docopt = derive { name="docopt"; version="0.4.3.3"; sha256="1vpq5q3kfgwijrgblvfipxqkw0m75rahnlmddpiyfgziyszbmidm"; depends=[stringr]; };
 documair = derive { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; };
 domino = derive { name="domino"; version="0.2-7"; sha256="1wp2rikyggjvqpg29qjn3zcydyplmzhmbgq3xxrlq92swdyzmyy5"; depends=[]; };
-dosresmeta = derive { name="dosresmeta"; version="1.3.0"; sha256="0yfm8dkds8abdl6jrib5vvgkyrd5cl5a99qs27safxx0fcpdiz4k"; depends=[mvmeta aod Matrix]; };
+dosresmeta = derive { name="dosresmeta"; version="1.3.0"; sha256="0yfm8dkds8abdl6jrib5vvgkyrd5cl5a99qs27safxx0fcpdiz4k"; depends=[aod Matrix mvmeta]; };
 dostats = derive { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; };
-dotenv = derive { name="dotenv"; version="1.0"; sha256="1lxwvrhqcwj9q24x30xzrw8qqhxgyr88ja3fajm5hf3pwbw85yls"; depends=[magrittr falsy]; };
+dotenv = derive { name="dotenv"; version="1.0"; sha256="1lxwvrhqcwj9q24x30xzrw8qqhxgyr88ja3fajm5hf3pwbw85yls"; depends=[falsy magrittr]; };
 downloader = derive { name="downloader"; version="0.3"; sha256="0jpq8z3i9fkgs8wwjrq5qd7qfi5w3rxmzmsi1c1dxlnxzzhg6kxq"; depends=[digest]; };
-dpa = derive { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[sem igraph]; };
-dpcR = derive { name="dpcR"; version="0.1.4.0"; sha256="0fv17vzlsjb5cy1f0ll5gi5y8npavp2y7frzc595na5g15xphmxc"; depends=[binom chipPCR e1071 dgof multcomp qpcR pracma rateratio_test signal shiny spatstat]; };
+dpa = derive { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; };
+dpcR = derive { name="dpcR"; version="0.1.4.0"; sha256="0fv17vzlsjb5cy1f0ll5gi5y8npavp2y7frzc595na5g15xphmxc"; depends=[binom chipPCR dgof e1071 multcomp pracma qpcR rateratio_test shiny signal spatstat]; };
 dpglasso = derive { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; };
-dplR = derive { name="dplR"; version="1.6.3"; sha256="0w94rdkpw5pbl9ywfvgpmzkwc88m5d5dwii5kw312nfhkb549q4x"; depends=[lattice Matrix digest gmp matrixStats png R_utils stringi stringr XML]; };
+dplR = derive { name="dplR"; version="1.6.3"; sha256="0w94rdkpw5pbl9ywfvgpmzkwc88m5d5dwii5kw312nfhkb549q4x"; depends=[digest gmp lattice Matrix matrixStats png R_utils stringi stringr XML]; };
 dplRCon = derive { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; };
-dplyr = derive { name="dplyr"; version="0.4.1"; sha256="0kcwg922gzvwz1vfazwknb2sn2z9wfg9xhndi4280lg8cjdllcmw"; depends=[assertthat R6 Rcpp magrittr lazyeval DBI Rcpp BH]; };
-dpmixsim = derive { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[oro_nifti cluster]; };
+dplyr = derive { name="dplyr"; version="0.4.2"; sha256="1b0nb7agzb515jrm33sv8yhszsf06d9fga6pgdxi2kwl71vjfrd6"; depends=[assertthat BH DBI lazyeval magrittr R6 Rcpp]; };
+dpmixsim = derive { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[cluster oro_nifti]; };
 dpmr = derive { name="dpmr"; version="0.1.7-1"; sha256="0nh45hg9za9w4w4syrrg54s1fpn6iikv431qkdjyinv8y1a3klga"; depends=[digest httr jsonlite magrittr rio]; };
 dr = derive { name="dr"; version="3.0.9"; sha256="0gmxa5mbmkz54l75ss6kj5ka5kingf02pqj0xsfjxfv0311hwm52"; depends=[MASS]; };
 drat = derive { name="drat"; version="0.0.4"; sha256="0pq74a0f1pkgfzgrh0r2xa2xkgxbanp8a5v13bmma09ghy5vnrhm"; depends=[]; };
 drawExpression = derive { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; };
-drc = derive { name="drc"; version="2.5-12"; sha256="1gw78n0w262wl6mdm5wvyp3f0hvrb2kj714acdxz84h2znxr9879"; depends=[MASS car gtools multcomp plotrix scales]; };
-drfit = derive { name="drfit"; version="0.6.3"; sha256="0vx5niw6mfg85937sbjmc0z0gdgf9aj43rmkn1gljky7pq4j3hfn"; depends=[MASS RODBC drc]; };
-drgee = derive { name="drgee"; version="1.1.2"; sha256="1idnwa9yy1bijwbz9ffvc4q4lynhisgjvp3jcik3z3r96wfmz2ks"; depends=[nleqslv survival]; };
+drc = derive { name="drc"; version="2.5-12"; sha256="1gw78n0w262wl6mdm5wvyp3f0hvrb2kj714acdxz84h2znxr9879"; depends=[car gtools MASS multcomp plotrix scales]; };
+drfit = derive { name="drfit"; version="0.6.3"; sha256="0vx5niw6mfg85937sbjmc0z0gdgf9aj43rmkn1gljky7pq4j3hfn"; depends=[drc MASS RODBC]; };
+drgee = derive { name="drgee"; version="1.1.3"; sha256="0gib0f5l55md5zymi7j01g3dfif0j2ki01cy5nca6j0ag500k54j"; depends=[nleqslv survival]; };
 drm = derive { name="drm"; version="0.5-8"; sha256="1p6ixd7hnv41gfmvan3rv9xzz1279hmrnvfrl6pxwzs9zcnbb53a"; depends=[]; };
 drmdel = derive { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn9jd750p27qa84vdfxpacm5r0mggnys"; depends=[]; };
 dropR = derive { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; };
-drsmooth = derive { name="drsmooth"; version="1.0"; sha256="1cxhj28dkll704kif040vqnp9grb61v891rswvyx7aa9216156px"; depends=[car clinfun mgcv multcomp pgirmess DTK segmented mvtnorm]; };
+drsmooth = derive { name="drsmooth"; version="1.0"; sha256="1cxhj28dkll704kif040vqnp9grb61v891rswvyx7aa9216156px"; depends=[car clinfun DTK mgcv multcomp mvtnorm pgirmess segmented]; };
 ds = derive { name="ds"; version="3.0"; sha256="10xp575l0wh85wg32k3as02kgqm9ax9nx9i5kd5bkimfwg4qv745"; depends=[]; };
 dsample = derive { name="dsample"; version="0.91.1"; sha256="0nxx3x55zj089aq2shk7cg9bgh6xw7jnrr2qmlaq6bflwn58wn1q"; depends=[]; };
-dse = derive { name="dse"; version="2014.11-1"; sha256="0fl1av8zd0csbsk6fplcxgqsb50qr1baasw2jrqv6h83j2xwph2l"; depends=[tfplot tframe setRNG]; };
-dslice = derive { name="dslice"; version="1.1.4"; sha256="0srqw1kznbjl1v6dpgh7vsrpf9k3zj7j55zw9k50jsbw2z4xqzfw"; depends=[Rcpp ggplot2 scales Rcpp]; };
-dsm = derive { name="dsm"; version="2.2.5"; sha256="0sfsfzcsqnvjkc5l7h5xq8p2jsgwxfzds75sqs58a0kzagcm1b05"; depends=[mgcv mrds nlme ggplot2 statmod]; };
+dse = derive { name="dse"; version="2014.11-1"; sha256="0fl1av8zd0csbsk6fplcxgqsb50qr1baasw2jrqv6h83j2xwph2l"; depends=[setRNG tfplot tframe]; };
+dslice = derive { name="dslice"; version="1.1.4"; sha256="0srqw1kznbjl1v6dpgh7vsrpf9k3zj7j55zw9k50jsbw2z4xqzfw"; depends=[ggplot2 Rcpp scales]; };
+dsm = derive { name="dsm"; version="2.2.5"; sha256="0sfsfzcsqnvjkc5l7h5xq8p2jsgwxfzds75sqs58a0kzagcm1b05"; depends=[ggplot2 mgcv mrds nlme statmod]; };
 dst = derive { name="dst"; version="0.3"; sha256="1gdf4sjk2svywx2m6z22d383xppsm6dm108w93pcwfs8fpcdwxb9"; depends=[]; };
-dti = derive { name="dti"; version="1.2-0.1"; sha256="09ad7mwa53dk1jlddkql3wm1s2diyqij7prd5klh59j21kvkf0hy"; depends=[awsMethods adimpro rgl oro_nifti oro_dicom gsl quadprog]; };
+dti = derive { name="dti"; version="1.2-0.1"; sha256="09ad7mwa53dk1jlddkql3wm1s2diyqij7prd5klh59j21kvkf0hy"; depends=[adimpro awsMethods gsl oro_dicom oro_nifti quadprog rgl]; };
 dtt = derive { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; };
 dtw = derive { name="dtw"; version="1.17-1"; sha256="0kbf38a14k112vdi7yaql18w0sj694smlm6pmdw5q4sqpk7azhqg"; depends=[proxy]; };
-dualScale = derive { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[matrixcalc ff vcd lattice Matrix]; };
+dualScale = derive { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[ff lattice Matrix matrixcalc vcd]; };
 dummies = derive { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; };
 dummy = derive { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; };
 dunn_test = derive { name="dunn.test"; version="1.2.4"; sha256="01z9rxhp9mli9b21in9gvrjiyxlkx5imspfangg2qvkyrb8jl9i5"; depends=[]; };
 dupiR = derive { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; };
 dvfBm = derive { name="dvfBm"; version="1.0"; sha256="0gx11dxkbnh759ysd1lxdarlddgr3l5gwd5b0klwvwsgck6jv529"; depends=[wmtsa]; };
 dvn = derive { name="dvn"; version="0.3.3"; sha256="14ncna67qgknh20xdvxqddjhagj61niwpvz4ava9k0z68rgzmk5h"; depends=[RCurl XML]; };
-dygraphs = derive { name="dygraphs"; version="0.4.5"; sha256="08bc41d0f8adfnhv668p9sk4507i63xlfs3yswig1g7c0cnyaba9"; depends=[magrittr htmlwidgets zoo xts]; };
+dygraphs = derive { name="dygraphs"; version="0.4.5"; sha256="08bc41d0f8adfnhv668p9sk4507i63xlfs3yswig1g7c0cnyaba9"; depends=[htmlwidgets magrittr xts zoo]; };
 dyn = derive { name="dyn"; version="0.2-9"; sha256="16zd32567aj0gqv9chbcdgi6sj78pnnfy5k8si15v5pnfvkkwslp"; depends=[zoo]; };
 dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.1.3"; sha256="1wgxxn0nlmza7npvjbkfq6nmp30n719yqrav6jzxcp00dk3ymg6g"; depends=[tcltk2 tkrplot]; };
 dynCorr = derive { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; };
@@ -3278,17 +3291,17 @@ dynRB = derive { name="dynRB"; version="0.2"; sha256="00xpigx1bxjm03fz7x19wws7vq
 dynaTree = derive { name="dynaTree"; version="1.2-7"; sha256="06pw78j6wwx7yc175bns1m2p5kg5400vg8x14v4hbrz3ydagx4dn"; depends=[]; };
 dynamicGraph = derive { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; };
 dynamicTreeCut = derive { name="dynamicTreeCut"; version="1.62"; sha256="1y11gg6k32wpsyb10kdv176ivczx2jlizs1xsrjrs6iwbncwzrkp"; depends=[]; };
-dynatopmodel = derive { name="dynatopmodel"; version="1.0"; sha256="1dq18wqbf7y597mbqv8fwwc5fm8l618mkqvb2l95bplq7n508hng"; depends=[raster xts shape fields rgeos maptools rgdal sp spam hydroGOF topmodel intervals]; };
+dynatopmodel = derive { name="dynatopmodel"; version="1.0"; sha256="1dq18wqbf7y597mbqv8fwwc5fm8l618mkqvb2l95bplq7n508hng"; depends=[fields hydroGOF intervals maptools raster rgdal rgeos shape sp spam topmodel xts]; };
 dynia = derive { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; };
-dynlm = derive { name="dynlm"; version="0.3-3"; sha256="0ym23gv2vkvvnxvzk5kh6xy4gb5wbnpdbgkb5s6zx24lh81whvcs"; depends=[zoo car lmtest]; };
+dynlm = derive { name="dynlm"; version="0.3-3"; sha256="0ym23gv2vkvvnxvzk5kh6xy4gb5wbnpdbgkb5s6zx24lh81whvcs"; depends=[car lmtest zoo]; };
 dynsim = derive { name="dynsim"; version="1.0"; sha256="0w4brs8kcps6gkamkic57nj61iz7zdxq972jwzs17i43wfcrw32c"; depends=[ggplot2 gridExtra MASS]; };
-dynsurv = derive { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1mgv3xpbryi520va3jpd03dx15zrq8zaqg"; depends=[survival reshape plyr nleqslv ggplot2 BH]; };
+dynsurv = derive { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1mgv3xpbryi520va3jpd03dx15zrq8zaqg"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
 e1071 = derive { name="e1071"; version="1.6-4"; sha256="0hakqawy8bz4hvjzz9dbc2pbqhaf1qjsgl0agz3qfg63974whw2i"; depends=[class]; };
-eHOF = derive { name="eHOF"; version="1.5.8"; sha256="19zs0krz13m7rbiw72clnhh1rbb6qgzp85ndchqbparw7f9yji1s"; depends=[mgcv lattice]; };
-eRm = derive { name="eRm"; version="0.15-5"; sha256="0g4avcr709brvzcbmqmq35c7zvgx1hkf5nq6djsprzkgvh6rznjn"; depends=[MASS Matrix lattice]; };
+eHOF = derive { name="eHOF"; version="1.5.8"; sha256="19zs0krz13m7rbiw72clnhh1rbb6qgzp85ndchqbparw7f9yji1s"; depends=[lattice mgcv]; };
+eRm = derive { name="eRm"; version="0.15-5"; sha256="0g4avcr709brvzcbmqmq35c7zvgx1hkf5nq6djsprzkgvh6rznjn"; depends=[lattice MASS Matrix]; };
 eVenn = derive { name="eVenn"; version="2.2"; sha256="0k6m61z902spxxrc38504l73h022w5v74g39h4azd1ibr35yrl7j"; depends=[]; };
 eaf = derive { name="eaf"; version="1.07"; sha256="0310lrqfm1l0lifak7wa6xn21bzzn27kbrrx0bidj4hibwv7sa4l"; depends=[modeltools]; };
-earlywarnings = derive { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[ggplot2 moments tgp tseries fields nortest quadprog Kendall KernSmooth lmtest som spam]; };
+earlywarnings = derive { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[fields ggplot2 Kendall KernSmooth lmtest moments nortest quadprog som spam tgp tseries]; };
 earth = derive { name="earth"; version="4.4.0"; sha256="1dsqyp93z8a2afvnhms4453cmhn7zbqf5fy18sl43gn616miarpv"; depends=[plotmo TeachingDemos]; };
 easyanova = derive { name="easyanova"; version="4.0"; sha256="1d8fkgyqzphipvla7x8ipcf0by07iqx8xran15d2q82yq9iik5g9"; depends=[car nlme]; };
 easynls = derive { name="easynls"; version="4.0"; sha256="1j2crqvgsf84bpwzf4qh5xkzn5mhxhfx9c0y3p8dbyn8bg7zc2rf"; depends=[]; };
@@ -3297,41 +3310,41 @@ ebSNP = derive { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfv
 eba = derive { name="eba"; version="1.7-1"; sha256="0kxdhl7bc4f570m9rbxxzg748zvq0q7a0slvfr4w1f45vfzhyh17"; depends=[nlme]; };
 ebal = derive { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw2lz7iq4b0ggp316rdqqb5bj9r0"; depends=[]; };
 ebdbNet = derive { name="ebdbNet"; version="1.2.3"; sha256="123iqp8rnm3pac5fvpzq5sqbf8nyfpf05g23nawanid6yv23ba9a"; depends=[igraph]; };
-ecespa = derive { name="ecespa"; version="1.1-7"; sha256="0ynyphc1jnk088041i0yk22bh4ga1v9xwrcghy70q1ipv0z279ph"; depends=[splancs spatstat]; };
+ecespa = derive { name="ecespa"; version="1.1-7"; sha256="0ynyphc1jnk088041i0yk22bh4ga1v9xwrcghy70q1ipv0z279ph"; depends=[spatstat splancs]; };
 ecipex = derive { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; };
 eco = derive { name="eco"; version="3.1-7"; sha256="0qrl1mq0nc42j4dzqhayzzb56gmkk479wgpxikzgzpj9wv78yd5s"; depends=[MASS]; };
 ecodist = derive { name="ecodist"; version="1.2.9"; sha256="199f3lwwm8r2bnik595m540la1p4z6vbkwfqh9kimy9d0fjp8nps"; depends=[]; };
-ecoengine = derive { name="ecoengine"; version="1.9.1"; sha256="0y1f8ylyk9jny48z5grf4r9jcdin6clhy0vg1wkg3alsqn4iiqlg"; depends=[httr plyr assertthat whisker dplyr jsonlite lubridate leafletR]; };
-ecolMod = derive { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[rootSolve shape diagram deSolve]; };
+ecoengine = derive { name="ecoengine"; version="1.9.1"; sha256="0y1f8ylyk9jny48z5grf4r9jcdin6clhy0vg1wkg3alsqn4iiqlg"; depends=[assertthat dplyr httr jsonlite leafletR lubridate plyr whisker]; };
+ecolMod = derive { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[deSolve diagram rootSolve shape]; };
 ecoreg = derive { name="ecoreg"; version="0.2"; sha256="08iw7w9z7zqwhvirnhdc2jr2qjp9yma8ddc831d5dvbvi2j7kq84"; depends=[]; };
 ecoretriever = derive { name="ecoretriever"; version="0.1"; sha256="1iwds81pyn9c04fmnjfsri7rjanrfki8hngdwpqcx3dkbsg76ii6"; depends=[]; };
 ecosim = derive { name="ecosim"; version="1.2"; sha256="1lzjd6kl2864ngyiqyfnnra5ag9bj42pxb793gwp45r7z95k32rf"; depends=[deSolve stoichcalc]; };
-ecospat = derive { name="ecospat"; version="1.1"; sha256="070vvx00gm36rwjz2g188jn7bkljs1c7j6ap6ssrl3ihzqvc1zdz"; depends=[ade4 ape gam gbm sp adehabitatHR adehabitatMA biomod2 dismo ecodist maptools randomForest spatstat raster rms]; };
-ecoval = derive { name="ecoval"; version="1.0"; sha256="1szvr2ipb7bd0cyslhwwwyx5kw7yx3kpqcyzxfd9pk263bny323g"; depends=[utility rivernet]; };
-ecp = derive { name="ecp"; version="2.0.0"; sha256="0cr3rzvd4bahg5idd857mgp005n075xql5kvjw0smsjbjh4p84wq"; depends=[Rcpp Rcpp]; };
+ecospat = derive { name="ecospat"; version="1.1"; sha256="070vvx00gm36rwjz2g188jn7bkljs1c7j6ap6ssrl3ihzqvc1zdz"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 dismo ecodist gam gbm maptools randomForest raster rms sp spatstat]; };
+ecoval = derive { name="ecoval"; version="1.0"; sha256="1szvr2ipb7bd0cyslhwwwyx5kw7yx3kpqcyzxfd9pk263bny323g"; depends=[rivernet utility]; };
+ecp = derive { name="ecp"; version="2.0.0"; sha256="0cr3rzvd4bahg5idd857mgp005n075xql5kvjw0smsjbjh4p84wq"; depends=[Rcpp]; };
 edcc = derive { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; };
 edeR = derive { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; };
-edgeRun = derive { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table]; };
+edgeRun = derive { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; };
 editrules = derive { name="editrules"; version="2.9.0"; sha256="14mfa8flkym2rx9n7bq9icc9fsrk3szib3amx5l0008rxll9qnxm"; depends=[igraph lpSolveAPI]; };
-edrGraphicalTools = derive { name="edrGraphicalTools"; version="2.1"; sha256="09y63xj3gqrz66mym20g4pmfwrb0wnc2n67692hnqq8dz31q7p3i"; depends=[rgl mvtnorm MASS lasso2]; };
-eegAnalysis = derive { name="eegAnalysis"; version="0.0"; sha256="1lrwjbhm5fnf5fhyyga2b21j2snnmj3zfvfxfkvgsbdnzr3qxaxb"; depends=[e1071 wmtsa fields splus2R]; };
+edrGraphicalTools = derive { name="edrGraphicalTools"; version="2.1"; sha256="09y63xj3gqrz66mym20g4pmfwrb0wnc2n67692hnqq8dz31q7p3i"; depends=[lasso2 MASS mvtnorm rgl]; };
+eegAnalysis = derive { name="eegAnalysis"; version="0.0"; sha256="1lrwjbhm5fnf5fhyyga2b21j2snnmj3zfvfxfkvgsbdnzr3qxaxb"; depends=[e1071 fields splus2R wmtsa]; };
 eegkit = derive { name="eegkit"; version="1.0-2"; sha256="10dksmc5lrl0ypifvmmv96xnndl2zx191sl79qif0gfs3wq3w4s0"; depends=[bigsplines eegkitdata ica rgl]; };
 eegkitdata = derive { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; };
-eeptools = derive { name="eeptools"; version="0.3.1"; sha256="0m6i0hiw565wgziknlf19rh2fq8zvzq2v5a0ppnwcv8vhbhyph3g"; depends=[ggplot2 MASS stringr maptools arm data_table memisc]; };
-effects = derive { name="effects"; version="3.0-4"; sha256="0ypw49gighmg2azc2872y8r9rx9v3x0r2gsidgkwqlaqg95vfcd7"; depends=[lme4 nnet lattice colorspace]; };
+eeptools = derive { name="eeptools"; version="0.3.1"; sha256="0m6i0hiw565wgziknlf19rh2fq8zvzq2v5a0ppnwcv8vhbhyph3g"; depends=[arm data_table ggplot2 maptools MASS memisc stringr]; };
+effects = derive { name="effects"; version="3.0-4"; sha256="0ypw49gighmg2azc2872y8r9rx9v3x0r2gsidgkwqlaqg95vfcd7"; depends=[colorspace lattice lme4 nnet]; };
 effsize = derive { name="effsize"; version="0.5.4"; sha256="1dc90avbnb83nrm70wh0h45g3c6dcg8zh2ynklc2x86cqk7b264b"; depends=[]; };
 ega = derive { name="ega"; version="1.0.1"; sha256="02mbadv505jz6nk1yp9xl12c9l9wnwpl5bajfbhgs837pdca438g"; depends=[ggplot2]; };
-egcm = derive { name="egcm"; version="1.0.6"; sha256="1j499f94ibr9rx544mwbpwjrwhzbdlvv1p156kj8pfnd7qin26xl"; depends=[zoo xts TTR ggplot2 tseries MASS urca fArma]; };
+egcm = derive { name="egcm"; version="1.0.6"; sha256="1j499f94ibr9rx544mwbpwjrwhzbdlvv1p156kj8pfnd7qin26xl"; depends=[fArma ggplot2 MASS tseries TTR urca xts zoo]; };
 eggCounts = derive { name="eggCounts"; version="0.4-1"; sha256="16prkcmpfjl1lab8m9hm0sfbdlh94ds3wi6ra9n2wnrpdn32fl20"; depends=[actuar boot coda]; };
 egonet = derive { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; };
 eha = derive { name="eha"; version="2.4-3"; sha256="1dfilgw9m4m78ny3fd89nl8f9c9y5z5bnj912hpbfff3v5yfm3iq"; depends=[survival]; };
-eiPack = derive { name="eiPack"; version="0.1-7"; sha256="1cxk31bj012ijm85sf6l4rjrwayw94j2d6aav8p9g1f0raha2s6y"; depends=[MASS coda msm]; };
+eiPack = derive { name="eiPack"; version="0.1-7"; sha256="1cxk31bj012ijm85sf6l4rjrwayw94j2d6aav8p9g1f0raha2s6y"; depends=[coda MASS msm]; };
 eigeninv = derive { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; };
 eigenmodel = derive { name="eigenmodel"; version="1.01"; sha256="0p9n28x5gg46nszzd2z9ky5fhv6qa070673i1df6bhjh962aqgaf"; depends=[]; };
 eigenprcomp = derive { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; };
-eive = derive { name="eive"; version="2.1"; sha256="1vazl5dnrvljd07csy9rjs4302w09h94i411gffg9fvxn70km7qg"; depends=[Rcpp Rcpp]; };
-eiwild = derive { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[gtools coda lattice]; };
-elastic = derive { name="elastic"; version="0.4.0"; sha256="03cj0vljad4bkz7zmlp7cr6y734pddngmlzwa1h4ja1nr8nv8xf4"; depends=[httr RCurl jsonlite]; };
+eive = derive { name="eive"; version="2.1"; sha256="1vazl5dnrvljd07csy9rjs4302w09h94i411gffg9fvxn70km7qg"; depends=[Rcpp]; };
+eiwild = derive { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[coda gtools lattice]; };
+elastic = derive { name="elastic"; version="0.4.0"; sha256="03cj0vljad4bkz7zmlp7cr6y734pddngmlzwa1h4ja1nr8nv8xf4"; depends=[httr jsonlite RCurl]; };
 elasticnet = derive { name="elasticnet"; version="1.1"; sha256="1x8rwqb275lz86vi044m1fy8xanmvs7f7irr1vczps1w45nsmqr2"; depends=[lars]; };
 elec = derive { name="elec"; version="0.1.2"; sha256="0f7ahrjb52w8a8l5v00xla6z9afpz2zrckl9v04xalp34snhdwan"; depends=[]; };
 elec_strat = derive { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; };
@@ -3340,81 +3353,81 @@ ellipse = derive { name="ellipse"; version="0.3-8"; sha256="0ibz1qvf1qbb5sigyhpx
 elliptic = derive { name="elliptic"; version="1.3-5"; sha256="0hi0r3z6f5yq53v6ii4z35nws2gc00xkk0dncll0sf5nshcj8fl5"; depends=[MASS]; };
 elmNN = derive { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3jjakddsj5fwj91kqq0hkm34kyd"; depends=[MASS]; };
 elrm = derive { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; };
-emIRT = derive { name="emIRT"; version="0.0.5"; sha256="0n94iqdzbml0hx3gd046958vmv3y0hymj5kly53gvvlcidsn15c4"; depends=[pscl Rcpp Rcpp RcppArmadillo]; };
-embryogrowth = derive { name="embryogrowth"; version="6.0"; sha256="0l08imqagn2w1q8s4f84bb1zlc17zjkfc5qz1gpmqc7dbw9nvxph"; depends=[deSolve HelpersMG coda polynom]; };
+emIRT = derive { name="emIRT"; version="0.0.5"; sha256="0n94iqdzbml0hx3gd046958vmv3y0hymj5kly53gvvlcidsn15c4"; depends=[pscl Rcpp RcppArmadillo]; };
+embryogrowth = derive { name="embryogrowth"; version="6.0"; sha256="0l08imqagn2w1q8s4f84bb1zlc17zjkfc5qz1gpmqc7dbw9nvxph"; depends=[coda deSolve HelpersMG polynom]; };
 emdatr = derive { name="emdatr"; version="0.3"; sha256="1ccm45al90wa467n19dqs33q2w74in4qnwdrsh94g3d67cw5fsfc"; depends=[RCurl]; };
-emdbook = derive { name="emdbook"; version="1.3.8"; sha256="10qmppacfww8wg1hhd9fpadrvrivrvfgfn1qgm87xlf3a8jpffjj"; depends=[MASS lattice plyr rgl coda bbmle]; };
+emdbook = derive { name="emdbook"; version="1.3.8"; sha256="10qmppacfww8wg1hhd9fpadrvrivrvfgfn1qgm87xlf3a8jpffjj"; depends=[bbmle coda lattice MASS plyr rgl]; };
 emdist = derive { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; };
 emg = derive { name="emg"; version="1.0.6"; sha256="1kzmxs224m6scmk8gg5ckx5c7is99hwgwv28yl26hnrbkm59skyh"; depends=[]; };
-emil = derive { name="emil"; version="2.0.2"; sha256="16fkf5ns6pw0nrpysr1yy5hwwg59mkfa84skajchfvq75aw6hwbi"; depends=[dplyr data_table ggplot2 lazyeval magrittr tidyr]; };
-emma = derive { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[earth clusterSim]; };
+emil = derive { name="emil"; version="2.0.2"; sha256="16fkf5ns6pw0nrpysr1yy5hwwg59mkfa84skajchfvq75aw6hwbi"; depends=[data_table dplyr ggplot2 lazyeval magrittr tidyr]; };
+emma = derive { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; };
 emme2 = derive { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; };
 emoa = derive { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; };
 emov = derive { name="emov"; version="0.1"; sha256="1jzssxk7c26ylfb70p9s631bz63fgvrqc105p7536n0kgxy21f7b"; depends=[]; };
-empiricalFDR_DESeq2 = derive { name="empiricalFDR.DESeq2"; version="1.0.3"; sha256="0h2mcdw4v3ac6dn0s4z37l4sdzbi12sxrnn0f0gc9z207dyyf6w3"; depends=[]; };
+empiricalFDR_DESeq2 = derive { name="empiricalFDR.DESeq2"; version="1.0.3"; sha256="0h2mcdw4v3ac6dn0s4z37l4sdzbi12sxrnn0f0gc9z207dyyf6w3"; depends=[DESeq2 GenomicRanges]; };
 emplik = derive { name="emplik"; version="1.0-1"; sha256="1kwgikdnxh52wsmzrzqv7sp8s55w9q40aq9kpfd3zshkflx7w8g1"; depends=[quantreg]; };
 emplik2 = derive { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; };
 emulator = derive { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; };
 enRich = derive { name="enRich"; version="2.0"; sha256="13ahwdifm33h4h5mvmc49v39fbhiy291rbdwm4c8kxjrqjq9ip66"; depends=[]; };
-enaR = derive { name="enaR"; version="2.8.1"; sha256="1p2vhqd1zxwar5fb16ibvwrzrxl7c574ls6747bkdjzlx7vznrn1"; depends=[MASS stringr sna network gdata]; };
+enaR = derive { name="enaR"; version="2.8.1"; sha256="1p2vhqd1zxwar5fb16ibvwrzrxl7c574ls6747bkdjzlx7vznrn1"; depends=[gdata MASS network sna stringr]; };
 endogMNP = derive { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; };
 endorse = derive { name="endorse"; version="1.4.1"; sha256="0xyi2cq4k4xa8kr717i4njl6rgjf5z99056jbhp2rbzfyy4sw61d"; depends=[coda]; };
 energy = derive { name="energy"; version="1.6.2"; sha256="008yf4r6546mzk9q515zliqxyjx6w0z19g5wlarg7f4lrzsmqiaw"; depends=[boot]; };
 english = derive { name="english"; version="1.0-1"; sha256="1413axjp2icj9wwnkz3vl4gvrwlgmjpc2djzv5bllbnc4a4dgj24"; depends=[]; };
 enigma = derive { name="enigma"; version="0.1.1"; sha256="1309w9nwh7kd1iivj5kq6sgi10k9ac69n3yl6a52ajqnm9rsg3lm"; depends=[httr jsonlite plyr]; };
-enpls = derive { name="enpls"; version="1.0"; sha256="1grnabrb0kzjvjvwp9rx1xqfljla0jd5xrkcbwfzmy2ymmbvh6ma"; depends=[pls foreach doParallel]; };
+enpls = derive { name="enpls"; version="1.0"; sha256="1grnabrb0kzjvjvwp9rx1xqfljla0jd5xrkcbwfzmy2ymmbvh6ma"; depends=[doParallel foreach pls]; };
 enrichvs = derive { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; };
 ensembleBMA = derive { name="ensembleBMA"; version="5.1.2"; sha256="0cfasrs1paz60na8by9zk0c5jc48l9djvn6c64ygjl1rapz389d4"; depends=[chron]; };
-ensembleMOS = derive { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[ensembleBMA chron]; };
+ensembleMOS = derive { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[chron ensembleBMA]; };
 ensurer = derive { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; };
 entropart = derive { name="entropart"; version="1.2.1"; sha256="14cn0zkfk6w8qrbzis9nxhs0vmhpxn4ksa95j5zxr7lxn77piznz"; depends=[ade4]; };
 entropy = derive { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; };
 enviPat = derive { name="enviPat"; version="2.0"; sha256="10fzzwlcmrfcppsj06pma8jkp5pfrb2ys70ggb9q4frc5irg5lha"; depends=[]; };
-enviPick = derive { name="enviPick"; version="1.3"; sha256="01wkijvhr8wqjzrhgkvxbnnmb9qsnq0lhkgw93s8nrf8yr3z3awj"; depends=[shiny readMzXmlData]; };
+enviPick = derive { name="enviPick"; version="1.3"; sha256="01wkijvhr8wqjzrhgkvxbnnmb9qsnq0lhkgw93s8nrf8yr3z3awj"; depends=[readMzXmlData shiny]; };
 epade = derive { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; };
 epi2loc = derive { name="epi2loc"; version="1.0-1"; sha256="16abk1v177sg7gmaw42ldf6hf20l7dvyq295zwbq76nxj467khdv"; depends=[pwr]; };
 epiR = derive { name="epiR"; version="0.9-62"; sha256="04r0inaa04pc4nj5dippl2qxa4nysk0sabdgp4bzp5zxw33mf55v"; depends=[survival]; };
 epibasix = derive { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; };
 epinet = derive { name="epinet"; version="2.0.9"; sha256="071svl1zcjjb3gvk3vg8xf660bvlz0ypkxy88n3d3f3ir2k26s7b"; depends=[]; };
-episensr = derive { name="episensr"; version="0.6.0"; sha256="005cxrwszgqar52zdrliwgg0p8j7rh2msvjd4s028z8ns334zwsb"; depends=[triangle trapezoid]; };
+episensr = derive { name="episensr"; version="0.6.0"; sha256="005cxrwszgqar52zdrliwgg0p8j7rh2msvjd4s028z8ns334zwsb"; depends=[trapezoid triangle]; };
 episplineDensity = derive { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; };
 epitools = derive { name="epitools"; version="0.5-7"; sha256="163sibnbihdsnkxf313fr8n8rh5d64dwjagv95vhhzr87f21sw22"; depends=[]; };
-epoc = derive { name="epoc"; version="0.2.5-1"; sha256="1r19cvcqf39yf09n3znbdy3dsr7z96yx6zib6031mqqdsxaav5qd"; depends=[lassoshooting Matrix irr elasticnet survival]; };
+epoc = derive { name="epoc"; version="0.2.5-1"; sha256="1r19cvcqf39yf09n3znbdy3dsr7z96yx6zib6031mqqdsxaav5qd"; depends=[elasticnet graph irr lassoshooting Matrix Rgraphviz survival]; };
 epr = derive { name="epr"; version="2.0"; sha256="1xqc0jhgdwwvilqpljxzpzz3wx30kigy09sxvzcfvsjmxyyvflqy"; depends=[car]; };
 eqs2lavaan = derive { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; };
 eqtl = derive { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; };
 equate = derive { name="equate"; version="2.0-3"; sha256="0y37nxily7zjx00z7h4vmpn8cs7bl3aravhjkjz9l6y0fv0rc5vv"; depends=[]; };
 equateIRT = derive { name="equateIRT"; version="1.2"; sha256="07qh5awa12d1bcm504k0rpgyxyzhymg92131cl676kdlfp49aqk1"; depends=[statmod]; };
-equivalence = derive { name="equivalence"; version="0.6.0"; sha256="1q17c2bs36f46bmm6wzmp0g2lg7d0j9mlrfnkzxnlvmspwksc0zl"; depends=[lattice boot PairedData]; };
+equivalence = derive { name="equivalence"; version="0.6.0"; sha256="1q17c2bs36f46bmm6wzmp0g2lg7d0j9mlrfnkzxnlvmspwksc0zl"; depends=[boot lattice PairedData]; };
 erboost = derive { name="erboost"; version="1.2"; sha256="0afgh0zkl3h3ab4s7wl0cn24qdyhszssai9i390mi7w0p88wgba9"; depends=[lattice]; };
-erer = derive { name="erer"; version="2.3"; sha256="165hngfzbzn403gwdcjkhvlm7jygl57nbpwdmlya2rd43z09kp77"; depends=[lmtest systemfit tseries urca ggplot2]; };
-ergm = derive { name="ergm"; version="3.2.4"; sha256="004d3wrv271i0czqkp7abz9lba8g68z350b21f94ad0xfp0cwlp2"; depends=[statnet_common network robustbase coda trust Matrix Rglpk]; };
-ergm_count = derive { name="ergm.count"; version="3.1.1"; sha256="0l66shy5p7h9j3h5gpkn48ps069mdaqbscnnkvmwjfvcc7k5vr8m"; depends=[statnet_common ergm network ergm]; };
-ergm_graphlets = derive { name="ergm.graphlets"; version="1.0.3"; sha256="0xk45ialjckvjs96k19skk7imilcahgyzfwc74h6yand5q3mg6fz"; depends=[network ergm statnet_common ergm]; };
-ergm_userterms = derive { name="ergm.userterms"; version="3.1.1"; sha256="0pvklvyxi7sjc5041zl8vcisni0jz1283gyjw5mhas9bl47g1cwc"; depends=[network ergm statnet_common ergm]; };
+erer = derive { name="erer"; version="2.3"; sha256="165hngfzbzn403gwdcjkhvlm7jygl57nbpwdmlya2rd43z09kp77"; depends=[ggplot2 lmtest systemfit tseries urca]; };
+ergm = derive { name="ergm"; version="3.4.0"; sha256="1qyj4b22d998qky0rv1h9h0r33vdwr7lw7gpkvbgzf5d44yng33b"; depends=[coda lpSolve Matrix network robustbase statnet_common trust]; };
+ergm_count = derive { name="ergm.count"; version="3.1.1"; sha256="0l66shy5p7h9j3h5gpkn48ps069mdaqbscnnkvmwjfvcc7k5vr8m"; depends=[ergm network statnet_common]; };
+ergm_graphlets = derive { name="ergm.graphlets"; version="1.0.3"; sha256="0xk45ialjckvjs96k19skk7imilcahgyzfwc74h6yand5q3mg6fz"; depends=[ergm network statnet_common]; };
+ergm_userterms = derive { name="ergm.userterms"; version="3.1.1"; sha256="0pvklvyxi7sjc5041zl8vcisni0jz1283gyjw5mhas9bl47g1cwc"; depends=[ergm network statnet_common]; };
 ergmharris = derive { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; };
 erpR = derive { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; };
 esaBcv = derive { name="esaBcv"; version="1.2.1"; sha256="0hgjcdbiy1a71vsb2vcyp0xmhy6wi4nlh1sqsfb2vxckc95i9i21"; depends=[corpcor svd]; };
 esotericR = derive { name="esotericR"; version="1.0"; sha256="0kl9c2z2mpg3mk8jnl0ssgcf6y0i9jpczms746j8f07ydrcxpf41"; depends=[]; };
 estimability = derive { name="estimability"; version="1.1"; sha256="1inw2ir83bzz40gynwfcjzx7f6v99pqlphq7p3rmql01ikd2b6r9"; depends=[]; };
 estout = derive { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; };
-etable = derive { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[xtable Hmisc]; };
-etasFLP = derive { name="etasFLP"; version="1.3.0"; sha256="1qh8s9ikd2lpchpp4h9z4zvcd9l2gi15dg0i54nxg9acn92yn3hi"; depends=[mapdata rgl fields maps]; };
-etm = derive { name="etm"; version="0.6-2"; sha256="0sdsm6h502bkrxc9admshkrkqjczivh3av55sha7542pr6nhl085"; depends=[survival lattice]; };
-eulerian = derive { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[]; };
+etable = derive { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[Hmisc xtable]; };
+etasFLP = derive { name="etasFLP"; version="1.3.0"; sha256="1qh8s9ikd2lpchpp4h9z4zvcd9l2gi15dg0i54nxg9acn92yn3hi"; depends=[fields mapdata maps rgl]; };
+etm = derive { name="etm"; version="0.6-2"; sha256="0sdsm6h502bkrxc9admshkrkqjczivh3av55sha7542pr6nhl085"; depends=[lattice survival]; };
+eulerian = derive { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[graph]; };
 eurostat = derive { name="eurostat"; version="1.0.16"; sha256="017ri3vvlp60r9h5b0y4j2adggkrkjbapkjynpl0vg92islspqkz"; depends=[plyr tidyr]; };
 evaluate = derive { name="evaluate"; version="0.7"; sha256="0sh58pysabz1iinl8gp0f2v03fwzawpagbk18jbsnfr2vvc927bk"; depends=[stringr]; };
 evd = derive { name="evd"; version="2.3-0"; sha256="1h3dkssgw2x7pblvknfr0l8k7q25nikxyl7kl9x95ganjpi2452v"; depends=[]; };
 evdbayes = derive { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; };
 eventInterval = derive { name="eventInterval"; version="1.2"; sha256="15g934n7flkl1g5q8qhxv60iakx8i9ndpx88yiqqr3n38hcnifrs"; depends=[MASS]; };
 events = derive { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; };
-eventstudies = derive { name="eventstudies"; version="1.1"; sha256="13l2yhmlpiid9r3njnmvja231l00ym7gvwfbv0m9fk2k5j6gm5id"; depends=[zoo xts boot]; };
+eventstudies = derive { name="eventstudies"; version="1.1"; sha256="13l2yhmlpiid9r3njnmvja231l00ym7gvwfbv0m9fk2k5j6gm5id"; depends=[boot xts zoo]; };
 evir = derive { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; };
-evmix = derive { name="evmix"; version="2.6"; sha256="1rc52mqmzl05n5n1lr990czqgpq9h2x8shnv6s7hvr8896kjasjm"; depends=[MASS gsl SparseM]; };
-evobiR = derive { name="evobiR"; version="1.0"; sha256="12j01qzc4yrjpxbj39bl29f5ypxwk33c6qf0mjjbgpwn5g6fgsi4"; depends=[seqinr ape stringr geiger taxize]; };
-evolqg = derive { name="evolqg"; version="0.1-5"; sha256="1s9jh14ycymlajc285cczr9m529vv6la4bkv0lgk3dc0557m7q5w"; depends=[plyr Rcpp reshape2 ggplot2 magrittr tidyr vegan ape phytools mvtnorm Rcpp]; };
+evmix = derive { name="evmix"; version="2.6"; sha256="1rc52mqmzl05n5n1lr990czqgpq9h2x8shnv6s7hvr8896kjasjm"; depends=[gsl MASS SparseM]; };
+evobiR = derive { name="evobiR"; version="1.0"; sha256="12j01qzc4yrjpxbj39bl29f5ypxwk33c6qf0mjjbgpwn5g6fgsi4"; depends=[ape geiger seqinr stringr taxize]; };
+evolqg = derive { name="evolqg"; version="0.1-5"; sha256="1s9jh14ycymlajc285cczr9m529vv6la4bkv0lgk3dc0557m7q5w"; depends=[ape ggplot2 magrittr mvtnorm phytools plyr Rcpp reshape2 tidyr vegan]; };
 evolvability = derive { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; };
-evora = derive { name="evora"; version="1.0"; sha256="0blq28ldynbq3v6rh0yk89wy1sjp4621h6iwnyyiipqwzihwrhz2"; depends=[Hmisc]; };
+evora = derive { name="evora"; version="1.0"; sha256="0blq28ldynbq3v6rh0yk89wy1sjp4621h6iwnyyiipqwzihwrhz2"; depends=[Hmisc qvalue]; };
 evt0 = derive { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; };
 evtree = derive { name="evtree"; version="1.0-0"; sha256="0i37lkdfzvgby98888ndd5wzxs7y11sxf9mh6pqpqgwif05p4z3i"; depends=[partykit]; };
 exCon = derive { name="exCon"; version="0.1.5"; sha256="08gq257qp814960ykp16qdk9xpc7ag9mxs1qhnnzlk1v2cnhilaq"; depends=[jsonlite]; };
@@ -3425,105 +3438,105 @@ exactci = derive { name="exactci"; version="1.3-0"; sha256="03mhgpyrgm3cb0hw908w
 exactmeta = derive { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; };
 exams = derive { name="exams"; version="2.0-2"; sha256="1cv01wa3zs31zdc1qk6rsnimbs6m31r0j56syg6yjicfxiwxxm0v"; depends=[]; };
 excursions = derive { name="excursions"; version="2.0.16"; sha256="10z0mix7fx4pb9jpix5d00ch4i6jlvj2337s6ja916q6cczj21qr"; depends=[Matrix sp spam]; };
-expands = derive { name="expands"; version="1.5"; sha256="14m5fzh302v0nchf875i4nwrr25wk7hych405psgfidq058pr985"; depends=[rJava flexmix matlab mclust moments ape permute]; };
-expectreg = derive { name="expectreg"; version="0.39"; sha256="1mxhv6phc3lgp0zz20wszx4nr3by9p6492wcb0x8wn8p8p1sy1b3"; depends=[mboost BayesX quadprog]; };
+expands = derive { name="expands"; version="1.5"; sha256="14m5fzh302v0nchf875i4nwrr25wk7hych405psgfidq058pr985"; depends=[ape flexmix matlab mclust moments permute rJava]; };
+expectreg = derive { name="expectreg"; version="0.39"; sha256="1mxhv6phc3lgp0zz20wszx4nr3by9p6492wcb0x8wn8p8p1sy1b3"; depends=[BayesX mboost quadprog]; };
 experiment = derive { name="experiment"; version="1.1-1"; sha256="07yaf5k5fpymz2yvr52zbbi60g0v84qryvqqjq3sjq2mb1fjfz1p"; depends=[boot MASS]; };
 expert = derive { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; };
 expm = derive { name="expm"; version="0.99-1.1"; sha256="0kcanqaqn51f437fxriw4qkpxbhzpjzlkp95wn89ip4jhy6076qn"; depends=[Matrix]; };
 expoRkit = derive { name="expoRkit"; version="0.9"; sha256="0raf0m2nfbdbd1pc4lincyp8y8lgn3bfi4hn0p04plc5p40l1gvc"; depends=[Matrix SparseM]; };
 expoTree = derive { name="expoTree"; version="1.0.1"; sha256="0hj1x4niqp0ghqik3mz733nc3zpnhyknrdpzpj6y2rfia2ysdiz8"; depends=[ape deSolve]; };
-expp = derive { name="expp"; version="1.1"; sha256="13zbhkkcshqrpln5gsa051d390q9ij97lawsdbd5j7fj9hxm9pwh"; depends=[sp spdep rgeos deldir]; };
+expp = derive { name="expp"; version="1.1"; sha256="13zbhkkcshqrpln5gsa051d390q9ij97lawsdbd5j7fj9hxm9pwh"; depends=[deldir rgeos sp spdep]; };
 expsmooth = derive { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; };
 exptest = derive { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; };
-exsic = derive { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[stringr markdown]; };
-extRemes = derive { name="extRemes"; version="2.0-5"; sha256="1r1q26gb06db0nsd9m5r54sjhsdwbi3179ai4b71l849viragq4z"; depends=[Lmoments distillery car]; };
+exsic = derive { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[markdown stringr]; };
+extRemes = derive { name="extRemes"; version="2.0-5"; sha256="1r1q26gb06db0nsd9m5r54sjhsdwbi3179ai4b71l849viragq4z"; depends=[car distillery Lmoments]; };
 extWeibQuant = derive { name="extWeibQuant"; version="1.1"; sha256="08dzw5xfgqx0c7ac632c5mg5jmjjw7wwpcr4c9lvz5rv72ykh2rh"; depends=[]; };
 extfunnel = derive { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; };
 extlasso = derive { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; };
 extraBinomial = derive { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n78kghszwyaz4wzbswqy4p98c3b6alzrc2ldsq6pq5z"; depends=[]; };
 extraTrees = derive { name="extraTrees"; version="1.0.5"; sha256="1rvvp2p9j8ih8fid1n17606pa23bjg3i2659w1l6w0jkb1p23zcx"; depends=[rJava]; };
-extracat = derive { name="extracat"; version="1.7-1"; sha256="1vgxr9j812jjr0i188vv7c1l0d7b73aakvfgsm0agwv7vj8k0rhi"; depends=[colorspace hexbin scales ggplot2 reshape2 plyr TSP]; };
+extracat = derive { name="extracat"; version="1.7-1"; sha256="1vgxr9j812jjr0i188vv7c1l0d7b73aakvfgsm0agwv7vj8k0rhi"; depends=[colorspace ggplot2 hexbin plyr reshape2 scales TSP]; };
 extrafont = derive { name="extrafont"; version="0.17"; sha256="0b9k2n9sk23bh45hjgnkxpjyvpdrz1hx7kmxvmb4nhlhm1wpsv9g"; depends=[extrafontdb Rttf2pt1]; };
 extrafontdb = derive { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; };
 extremevalues = derive { name="extremevalues"; version="2.3.0"; sha256="1nn67kgf3qd41nmizkbc2cy3128kajsxbxg03fhfgkjdqa0781lq"; depends=[gWidgets gWidgetstcltk]; };
 eyetracking = derive { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; };
 ez = derive { name="ez"; version="4.2-2"; sha256="1dk4ig137ridr4pw4afp3flm22s8l38yrgxabld1zv46slndc8mm"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; };
 ezglm = derive { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; };
-ezsim = derive { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[foreach ggplot2 digest plyr reshape Jmisc]; };
+ezsim = derive { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[digest foreach ggplot2 Jmisc plyr reshape]; };
 fANCOVA = derive { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; };
-fArma = derive { name="fArma"; version="3010.79"; sha256="1byxyy4afl1gq58r1cmc5p6frdr9rljr1x3pdnc8nj8rr65lkg72"; depends=[timeDate timeSeries fBasics]; };
-fAsianOptions = derive { name="fAsianOptions"; version="3010.79"; sha256="1w9ph3rz6cd7g275flzsnqxwd3r5xin6pkini8pbsi9s8hbqv3vl"; depends=[timeDate timeSeries fBasics fOptions]; };
-fAssets = derive { name="fAssets"; version="3011.83"; sha256="0i3phc8kxwhzf6010bv5k2ff5zlv7aqrwavqmhly4wwby73i39yl"; depends=[timeDate timeSeries fBasics fMultivar robustbase MASS sn ecodist mvnormtest energy]; };
-fBasics = derive { name="fBasics"; version="3011.87"; sha256="1x4jv4db0nr2fig6hglk0kv6j27ngkc8qzclgiklbl8wjfrrp9zh"; depends=[timeDate timeSeries gss stabledist MASS]; };
-fBonds = derive { name="fBonds"; version="3010.77"; sha256="00rc3i0iyqcpsqvc036csa1c8gxwcnniwj3l2irmcalx4p8650w0"; depends=[timeDate timeSeries fBasics]; };
-fCertificates = derive { name="fCertificates"; version="0.5-4"; sha256="1a49gkzvb83lqqw65lxlaszpicn663hwi9wrbsb3f6z7znylkzaf"; depends=[fBasics fOptions fExoticOptions]; };
-fCopulae = derive { name="fCopulae"; version="3011.81"; sha256="0r4g567icgiiz6cxi6ak3kzrav9qzsc6zvww5dj1pd8mkd4r1f0y"; depends=[timeDate timeSeries fBasics fMultivar]; };
-fExoticOptions = derive { name="fExoticOptions"; version="2152.78"; sha256="0h58prj8nh340b0fxxkgg4bk25yxvb4f8ppq677hr12x8sysf1a8"; depends=[timeDate timeSeries fBasics fOptions]; };
-fExpressCertificates = derive { name="fExpressCertificates"; version="1.2"; sha256="1r4qkhf7alasbwjz910b0x4dlzm72af06kv7v2vwyzvf3byn21c5"; depends=[mvtnorm tmvtnorm fCertificates Matrix]; };
-fExtremes = derive { name="fExtremes"; version="3010.81"; sha256="0bzgnn0wf7lqhj7b2dbbhi61s8fi2kmi87gg9hzqqi6p7krnz1n5"; depends=[timeDate timeSeries fBasics fGarch fTrading]; };
-fGarch = derive { name="fGarch"; version="3010.82"; sha256="08q452pasvjhsg2ks6c52lqg276hlbdwk0vh25xya2bw2bgbqy99"; depends=[timeDate timeSeries fBasics]; };
-fICA = derive { name="fICA"; version="1.0-2"; sha256="058kkhjksm0nrfaj0csi6dgzr83kq4cln04v9fja12cqvdij9k7k"; depends=[JADE Rcpp Rcpp RcppArmadillo]; };
+fArma = derive { name="fArma"; version="3010.79"; sha256="1byxyy4afl1gq58r1cmc5p6frdr9rljr1x3pdnc8nj8rr65lkg72"; depends=[fBasics timeDate timeSeries]; };
+fAsianOptions = derive { name="fAsianOptions"; version="3010.79"; sha256="1w9ph3rz6cd7g275flzsnqxwd3r5xin6pkini8pbsi9s8hbqv3vl"; depends=[fBasics fOptions timeDate timeSeries]; };
+fAssets = derive { name="fAssets"; version="3011.83"; sha256="0i3phc8kxwhzf6010bv5k2ff5zlv7aqrwavqmhly4wwby73i39yl"; depends=[ecodist energy fBasics fMultivar MASS mvnormtest robustbase sn timeDate timeSeries]; };
+fBasics = derive { name="fBasics"; version="3011.87"; sha256="1x4jv4db0nr2fig6hglk0kv6j27ngkc8qzclgiklbl8wjfrrp9zh"; depends=[gss MASS stabledist timeDate timeSeries]; };
+fBonds = derive { name="fBonds"; version="3010.77"; sha256="00rc3i0iyqcpsqvc036csa1c8gxwcnniwj3l2irmcalx4p8650w0"; depends=[fBasics timeDate timeSeries]; };
+fCertificates = derive { name="fCertificates"; version="0.5-4"; sha256="1a49gkzvb83lqqw65lxlaszpicn663hwi9wrbsb3f6z7znylkzaf"; depends=[fBasics fExoticOptions fOptions]; };
+fCopulae = derive { name="fCopulae"; version="3011.81"; sha256="0r4g567icgiiz6cxi6ak3kzrav9qzsc6zvww5dj1pd8mkd4r1f0y"; depends=[fBasics fMultivar timeDate timeSeries]; };
+fExoticOptions = derive { name="fExoticOptions"; version="2152.78"; sha256="0h58prj8nh340b0fxxkgg4bk25yxvb4f8ppq677hr12x8sysf1a8"; depends=[fBasics fOptions timeDate timeSeries]; };
+fExpressCertificates = derive { name="fExpressCertificates"; version="1.2"; sha256="1r4qkhf7alasbwjz910b0x4dlzm72af06kv7v2vwyzvf3byn21c5"; depends=[fCertificates Matrix mvtnorm tmvtnorm]; };
+fExtremes = derive { name="fExtremes"; version="3010.81"; sha256="0bzgnn0wf7lqhj7b2dbbhi61s8fi2kmi87gg9hzqqi6p7krnz1n5"; depends=[fBasics fGarch fTrading timeDate timeSeries]; };
+fGarch = derive { name="fGarch"; version="3010.82"; sha256="08q452pasvjhsg2ks6c52lqg276hlbdwk0vh25xya2bw2bgbqy99"; depends=[fBasics timeDate timeSeries]; };
+fICA = derive { name="fICA"; version="1.0-2"; sha256="058kkhjksm0nrfaj0csi6dgzr83kq4cln04v9fja12cqvdij9k7k"; depends=[JADE Rcpp RcppArmadillo]; };
 fImport = derive { name="fImport"; version="3000.82"; sha256="07yqppl8sbfa0x9k4n7hh6hcgyxpcvlk74hhylib4nzqm70bn0sq"; depends=[timeDate timeSeries]; };
-fMultivar = derive { name="fMultivar"; version="3011.78"; sha256="115hqbbxsdjs5v2rhalg8vz0m5lyg8ppjjqmbq1x21jdnbg6l0fl"; depends=[timeDate timeSeries fBasics cubature mvtnorm sn]; };
-fNonlinear = derive { name="fNonlinear"; version="3010.78"; sha256="0pmz16b606i3mx05zjln4nyl53ks7rlwgm45ldr9qgmw51pflwz9"; depends=[timeDate timeSeries fBasics fGarch]; };
-fOptions = derive { name="fOptions"; version="3010.83"; sha256="01yr3hrfiq4hjhidl5pl1gcqg0myg4acmnipjhq70l3q50cfjm8l"; depends=[timeDate timeSeries fBasics]; };
-fPortfolio = derive { name="fPortfolio"; version="3011.81"; sha256="1rmyp2dv1jgrfj76mnggvi98ffa0yr8d9dlxxmg5pc6pdy2g4q4c"; depends=[timeDate timeSeries fBasics fAssets fCopulae robustbase MASS Rglpk slam Rsymphony Rsolnp kernlab quadprog rneos]; };
-fRegression = derive { name="fRegression"; version="3011.81"; sha256="1qyacwwa2mjq9szwwwfdnny4np68bj1j4bvfkywl7q7x44p4n5b4"; depends=[timeDate timeSeries fBasics lmtest mgcv nnet polspline]; };
-fSRM = derive { name="fSRM"; version="0.6.1"; sha256="0d545i4sqkmimy42jgryyafzxayr62prwa47x11v5kkd63gmn3j2"; depends=[lavaan plyr reshape2 ggplot2 scales foreign tcltk2 gridExtra]; };
-fTrading = derive { name="fTrading"; version="3010.78"; sha256="0qakjxnr5nslw06ywlj65m3w7pjgn5hixxc2rnqhvvvmjpdxybz7"; depends=[timeDate timeSeries fBasics]; };
-fUnitRoots = derive { name="fUnitRoots"; version="3010.78"; sha256="04nwwazd8jvzds6p4njzq4wpcsrvvvs0y9z8v8r402myd4856ssm"; depends=[urca timeDate timeSeries fBasics]; };
+fMultivar = derive { name="fMultivar"; version="3011.78"; sha256="115hqbbxsdjs5v2rhalg8vz0m5lyg8ppjjqmbq1x21jdnbg6l0fl"; depends=[cubature fBasics mvtnorm sn timeDate timeSeries]; };
+fNonlinear = derive { name="fNonlinear"; version="3010.78"; sha256="0pmz16b606i3mx05zjln4nyl53ks7rlwgm45ldr9qgmw51pflwz9"; depends=[fBasics fGarch timeDate timeSeries]; };
+fOptions = derive { name="fOptions"; version="3010.83"; sha256="01yr3hrfiq4hjhidl5pl1gcqg0myg4acmnipjhq70l3q50cfjm8l"; depends=[fBasics timeDate timeSeries]; };
+fPortfolio = derive { name="fPortfolio"; version="3011.81"; sha256="1rmyp2dv1jgrfj76mnggvi98ffa0yr8d9dlxxmg5pc6pdy2g4q4c"; depends=[fAssets fBasics fCopulae kernlab MASS quadprog Rglpk rneos robustbase Rsolnp Rsymphony slam timeDate timeSeries]; };
+fRegression = derive { name="fRegression"; version="3011.81"; sha256="1qyacwwa2mjq9szwwwfdnny4np68bj1j4bvfkywl7q7x44p4n5b4"; depends=[fBasics lmtest mgcv nnet polspline timeDate timeSeries]; };
+fSRM = derive { name="fSRM"; version="0.6.1"; sha256="0d545i4sqkmimy42jgryyafzxayr62prwa47x11v5kkd63gmn3j2"; depends=[foreign ggplot2 gridExtra lavaan plyr reshape2 scales tcltk2]; };
+fTrading = derive { name="fTrading"; version="3010.78"; sha256="0qakjxnr5nslw06ywlj65m3w7pjgn5hixxc2rnqhvvvmjpdxybz7"; depends=[fBasics timeDate timeSeries]; };
+fUnitRoots = derive { name="fUnitRoots"; version="3010.78"; sha256="04nwwazd8jvzds6p4njzq4wpcsrvvvs0y9z8v8r402myd4856ssm"; depends=[fBasics timeDate timeSeries urca]; };
 factorQR = derive { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; };
 factorplot = derive { name="factorplot"; version="1.1-1"; sha256="1l8pabf32dr12l7b4dgv5jaxpsjymgdxc51miv72zczrx8adc7da"; depends=[multcomp nnet]; };
-factualR = derive { name="factualR"; version="0.5"; sha256="1wz8ibcmilcx62yy29nd2i1pdmjf7fm0g9i5s58gdn8cjlhnw1jl"; depends=[RJSONIO RCurl]; };
+factualR = derive { name="factualR"; version="0.5"; sha256="1wz8ibcmilcx62yy29nd2i1pdmjf7fm0g9i5s58gdn8cjlhnw1jl"; depends=[RCurl RJSONIO]; };
 fail = derive { name="fail"; version="1.2"; sha256="0xzvb71iq20ah1x1zlb9kbx0r47jhqlzxx0sxwhkibglpzskg84z"; depends=[BBmisc]; };
 faisalconjoint = derive { name="faisalconjoint"; version="1.15"; sha256="08sb4za8qyadvigq2z7b0r44qk2lpahpnz9nv16xfjb1zhdkz5w3"; depends=[]; };
 falcon = derive { name="falcon"; version="0.1"; sha256="0yas8a8nqdp03s77k5z1xlyz59gapyx68pz0mf6i2snjwpgai59v"; depends=[]; };
 falsy = derive { name="falsy"; version="1.0.1"; sha256="1n2b2h7w7p3vib4vgb9vadd3c07dx12vz5gm8bawbdx7llh2pr24"; depends=[]; };
 fame = derive { name="fame"; version="2.18"; sha256="132wb59d15bs94fga5hwxxr9pklyp2rjn448nl8lx5spjrvycwf4"; depends=[tis]; };
 fanc = derive { name="fanc"; version="1.23"; sha256="01bsny14r3i0a0yxbq3c670vh6m17g0lcjiphm6g5427rkn70whq"; depends=[Matrix]; };
-fanovaGraph = derive { name="fanovaGraph"; version="1.4.7"; sha256="19bzl6yrmi5lgyx6nq3f7i0rdaz2ig580h8116axrsxpx8c4d52x"; depends=[sensitivity igraph DiceKriging]; };
+fanovaGraph = derive { name="fanovaGraph"; version="1.4.7"; sha256="19bzl6yrmi5lgyx6nq3f7i0rdaz2ig580h8116axrsxpx8c4d52x"; depends=[DiceKriging igraph sensitivity]; };
 fanplot = derive { name="fanplot"; version="3.4.0"; sha256="1arb10jxksicrdpgj8fq8r0sdnzvvdjjbw357aplqh422x54w4mp"; depends=[]; };
-faoutlier = derive { name="faoutlier"; version="0.5"; sha256="1via1gggcj6cpdkyn61fbvlvhl47dwv9hi81x2jlq15lh340ljd4"; depends=[sem mvtnorm lattice lavaan mirt MASS]; };
+faoutlier = derive { name="faoutlier"; version="0.5"; sha256="1via1gggcj6cpdkyn61fbvlvhl47dwv9hi81x2jlq15lh340ljd4"; depends=[lattice lavaan MASS mirt mvtnorm sem]; };
 far = derive { name="far"; version="0.6-4"; sha256="166lhswdd1shx591wvx8a3lwzjini60mc37rbb3qvm6fxrb6fl55"; depends=[nlme]; };
 faraway = derive { name="faraway"; version="1.0.6"; sha256="10vj38chfnlz595pdi16v8gcwsbmn8a7p4gb0mm98dncyin5p2a3"; depends=[]; };
 farsi = derive { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; };
 fast = derive { name="fast"; version="0.63"; sha256="00ag9d0dwn9al104y93m8dclbjqabr9liif8gr19v3gv6k2k6p2c"; depends=[zoo]; };
-fastGHQuad = derive { name="fastGHQuad"; version="0.2"; sha256="0yv3wdyj7hs1gr3rq08k520v0ldmv5zzng709xjx2kchhwhmy8ah"; depends=[Rcpp Rcpp]; };
-fastHICA = derive { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[fastICA energy]; };
+fastGHQuad = derive { name="fastGHQuad"; version="0.2"; sha256="0yv3wdyj7hs1gr3rq08k520v0ldmv5zzng709xjx2kchhwhmy8ah"; depends=[Rcpp]; };
+fastHICA = derive { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; };
 fastICA = derive { name="fastICA"; version="1.2-0"; sha256="0ykk78fsk5da2g16i4wji85bvji7nayjvkfp07hyaxq9d15jmf0r"; depends=[]; };
-fastM = derive { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5ajb8fjbf7xam75scp0mg3czswnfn"; depends=[Rcpp Rcpp RcppArmadillo]; };
-fastR = derive { name="fastR"; version="0.10"; sha256="0bd164lij12yfqjykxj1m4rma7x2y4kpv4fspjlp1vpwqn3h4lb9"; depends=[mosaic lattice mosaicData]; };
+fastM = derive { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5ajb8fjbf7xam75scp0mg3czswnfn"; depends=[Rcpp RcppArmadillo]; };
+fastR = derive { name="fastR"; version="0.10"; sha256="0bd164lij12yfqjykxj1m4rma7x2y4kpv4fspjlp1vpwqn3h4lb9"; depends=[lattice mosaic mosaicData]; };
 fastSOM = derive { name="fastSOM"; version="0.9"; sha256="03501d5289lrlr4qcgxciz160hqc6nhqb9ab266fr132fkbiv4id"; depends=[]; };
-fastclime = derive { name="fastclime"; version="1.2.5"; sha256="12k7bkq4gkkyh8lr2whmi73mzcy7wmfzwgi20kli7r4g39n3a1kv"; depends=[lattice igraph MASS Matrix]; };
+fastclime = derive { name="fastclime"; version="1.2.5"; sha256="12k7bkq4gkkyh8lr2whmi73mzcy7wmfzwgi20kli7r4g39n3a1kv"; depends=[igraph lattice MASS Matrix]; };
 fastcluster = derive { name="fastcluster"; version="1.1.16"; sha256="0x2prrsnqi5iqx23ki6y2agndjq8058ph6s703i4avrqi1q1w1q8"; depends=[]; };
 fastcox = derive { name="fastcox"; version="1.1.1"; sha256="1a5i0ragl0r6p29iamkn04igakiwyysykfbs2p6ybgy8pfdq69sv"; depends=[Matrix]; };
 fastmatch = derive { name="fastmatch"; version="1.0-4"; sha256="16gfizfb1p7rjybrfm57nb6hdm30iirbppva8p8xf8pndz35fjbs"; depends=[]; };
 fastpseudo = derive { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; };
 fat2Lpoly = derive { name="fat2Lpoly"; version="1.1.1"; sha256="0xgxlx9m6lgcn784892g2xvnabyq8k45wi3xrszrbdxxa7zqd1i4"; depends=[kinship2 multgee]; };
 fbRanks = derive { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; };
-fbati = derive { name="fbati"; version="1.0-1"; sha256="1ia67dg9b61kc14mjg7065v0c6n6agdp8cjdviasyzga00wzsyxj"; depends=[pbatR fgui rootSolve]; };
-fbroc = derive { name="fbroc"; version="0.2.1"; sha256="06qpdnh86klkbwiv593l57wnbamrmcj5ysabyrbjf9mr8mjzhkkj"; depends=[ggplot2 Rcpp Rcpp]; };
-fcd = derive { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[glmnet MASS combinat]; };
+fbati = derive { name="fbati"; version="1.0-1"; sha256="1ia67dg9b61kc14mjg7065v0c6n6agdp8cjdviasyzga00wzsyxj"; depends=[fgui pbatR rootSolve]; };
+fbroc = derive { name="fbroc"; version="0.2.1"; sha256="06qpdnh86klkbwiv593l57wnbamrmcj5ysabyrbjf9mr8mjzhkkj"; depends=[ggplot2 Rcpp]; };
+fcd = derive { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; };
 fclust = derive { name="fclust"; version="1.1.1"; sha256="0gxgyvz6nzqp5sdjhfdjmm3r4lf1b4min3s5rfddwdqiswzxg8m8"; depends=[]; };
 fcros = derive { name="fcros"; version="1.3"; sha256="1ylkma69gfc5ij3vvf1axyasya31qm5bwj2bjlvj12byf52wsiy8"; depends=[]; };
 fda = derive { name="fda"; version="2.4.4"; sha256="05rvrp29ip1wrk2wly06wdry2a2riynkx677nx5lg240lz12d6yw"; depends=[Matrix]; };
 fda_usc = derive { name="fda.usc"; version="1.2.1"; sha256="1w0dw06vgviia4yy2v5mrq0jvnfvdp7y8f2x246v3xliqgjmg7as"; depends=[fda MASS mgcv rpart]; };
-fdaMixed = derive { name="fdaMixed"; version="0.4"; sha256="15m13v71kqxd9gqiymgfkq0dvcpzp05576m8zkg08m0k067ga9bd"; depends=[Formula Rcpp Rcpp RcppArmadillo]; };
+fdaMixed = derive { name="fdaMixed"; version="0.4"; sha256="15m13v71kqxd9gqiymgfkq0dvcpzp05576m8zkg08m0k067ga9bd"; depends=[Formula Rcpp RcppArmadillo]; };
 fdakma = derive { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; };
-fdasrvf = derive { name="fdasrvf"; version="1.4.2"; sha256="12x04fi0sxs9yh1mf9iykk69zlz6m31j7s01in28p5hgk6wqf8fi"; depends=[foreach mvtnorm matrixcalc numDeriv]; };
+fdasrvf = derive { name="fdasrvf"; version="1.4.2"; sha256="12x04fi0sxs9yh1mf9iykk69zlz6m31j7s01in28p5hgk6wqf8fi"; depends=[foreach matrixcalc mvtnorm numDeriv]; };
 fdatest = derive { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; };
-fdrDiscreteNull = derive { name="fdrDiscreteNull"; version="1.0"; sha256="1388a9hjbgblmhx5f3ddk16kigzsik9bvw179d1szk33kadfq2vp"; depends=[MCMCpack]; };
+fdrDiscreteNull = derive { name="fdrDiscreteNull"; version="1.0"; sha256="1388a9hjbgblmhx5f3ddk16kigzsik9bvw179d1szk33kadfq2vp"; depends=[edgeR MCMCpack]; };
 fdrci = derive { name="fdrci"; version="2.0"; sha256="0smyl9phl02wghimawvff3h267w3h213jbqpka155i6cfzig9qjy"; depends=[]; };
 fdrtool = derive { name="fdrtool"; version="1.2.14"; sha256="0q4mxm3vxhvxxbkgl9vxs3q93icipg9hz7qcr4vas8cks1hmzbdw"; depends=[]; };
 fds = derive { name="fds"; version="1.7"; sha256="164f2cbywph7kyn712lfq4d86v22j4y3fg5i9zyz956hipqv0qvw"; depends=[rainbow RCurl]; };
 fdth = derive { name="fdth"; version="1.2-1"; sha256="0rr9p2rns5ws111iqcicrlpcv47fkbxf161yxkkzfs2l3f1kgw14"; depends=[]; };
-feature = derive { name="feature"; version="1.2.11"; sha256="0dgiv9gwyklnw8w0cpchakadc1vqcngjg39cha6gvl2i3csgxz4p"; depends=[ks rgl misc3d]; };
+feature = derive { name="feature"; version="1.2.11"; sha256="0dgiv9gwyklnw8w0cpchakadc1vqcngjg39cha6gvl2i3csgxz4p"; depends=[ks misc3d rgl]; };
 features = derive { name="features"; version="2011.8-2"; sha256="0yshwqv2mzl5jj323jwxscpz2ygb4ywxh6q0zwphb24bhv7h9lwd"; depends=[lokern]; };
 fechner = derive { name="fechner"; version="1.0-2"; sha256="0yhiqr0wlka3wq0nhwy9n02ax3x5b0y803iadbsr3xb54pxbfbqd"; depends=[]; };
 federalregister = derive { name="federalregister"; version="0.1.2"; sha256="0f73jhzhqi3a97iyfx5c5i09vxwnyypgw6668z7nch8lvq337s8x"; depends=[RCurl RJSONIO]; };
 fermicatsR = derive { name="fermicatsR"; version="1.3"; sha256="0vv3i1f01rjsd17a8z2wcf3iv6xlwg7fki99z3p5h8m4g6jwljfk"; depends=[]; };
 ff = derive { name="ff"; version="2.2-13"; sha256="1nvd6kx46xzyc99a44mgynd94pvd2h495m5a7b1g67k5w2phiywb"; depends=[bit]; };
-ffbase = derive { name="ffbase"; version="0.12.1"; sha256="1qgmk1cn8s89amfmzzr2zhg6w4wwn4k79i92ib15j02i4csvykjj"; depends=[ff fastmatch bit]; };
+ffbase = derive { name="ffbase"; version="0.12.1"; sha256="1qgmk1cn8s89amfmzzr2zhg6w4wwn4k79i92ib15j02i4csvykjj"; depends=[bit fastmatch ff]; };
 ffmanova = derive { name="ffmanova"; version="0.2-2"; sha256="0sw8br73mx552m4b5zi4qgjcrwxflmgsnvs4mlnxh8g2gaf5bx4j"; depends=[]; };
 fftw = derive { name="fftw"; version="1.0-3"; sha256="01nncrf2p0yq49lhd5aq4hvhp87f25r0x7siqnaldv5zq24krl30"; depends=[]; };
 fftwtools = derive { name="fftwtools"; version="0.9-7"; sha256="1pd6ri9qh8rj5dahznl38l6haa1x6f2w91mxi83lic76lpddnxly"; depends=[]; };
@@ -3531,41 +3544,42 @@ fgac = derive { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh
 fgof = derive { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; };
 fgpt = derive { name="fgpt"; version="2.3"; sha256="1d0qzsn4b68jhk07k97iv765jpmzzh1gwqpid0r76vg4cwqfs3n7"; depends=[]; };
 fgui = derive { name="fgui"; version="1.0-5"; sha256="0gzwxzvf2y9p5rlfk862d7l1dm2sdwjhjpcb8p494cj4g1xshazg"; depends=[]; };
-fheatmap = derive { name="fheatmap"; version="1.0.0"; sha256="0braywpc0zghv1lnwb0c83p8ls2w7b8d2gbvv0p4123rhax5limw"; depends=[RColorBrewer gdata ggplot2 reshape2 gplots]; };
-fields = derive { name="fields"; version="8.2-1"; sha256="1zsi3ngp50f61nn93lh1v895as4lp63znf7bzn2q3hsl6ncaylbc"; depends=[spam maps]; };
-fifer = derive { name="fifer"; version="1.0"; sha256="0vbkks6y6pacgpiixm10fbfa34lmk5r9kwd30lfjf0g7r51fhvv9"; depends=[xtable MASS]; };
+fheatmap = derive { name="fheatmap"; version="1.0.0"; sha256="0braywpc0zghv1lnwb0c83p8ls2w7b8d2gbvv0p4123rhax5limw"; depends=[gdata ggplot2 gplots RColorBrewer reshape2]; };
+fields = derive { name="fields"; version="8.2-1"; sha256="1zsi3ngp50f61nn93lh1v895as4lp63znf7bzn2q3hsl6ncaylbc"; depends=[maps spam]; };
+fifer = derive { name="fifer"; version="1.0"; sha256="0vbkks6y6pacgpiixm10fbfa34lmk5r9kwd30lfjf0g7r51fhvv9"; depends=[MASS xtable]; };
 filehash = derive { name="filehash"; version="2.2-2"; sha256="0766wrc42qh7r99bd2zy50vvdnqlz0vkzplskzkm5f4g63qdhjxh"; depends=[]; };
-filehashSQLite = derive { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[filehash DBI RSQLite filehash DBI]; };
+filehashSQLite = derive { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[DBI filehash RSQLite]; };
+filematrix = derive { name="filematrix"; version="1.0"; sha256="17rkf9izhpz3nljv9s56fannd4v7dzsgk6igl7s9mkzmzn4fyp0g"; depends=[]; };
 filenamer = derive { name="filenamer"; version="0.2"; sha256="0f2xvqp75b8v59707z26y746vvag3f2mcykafqp5cy8cqrf7x61j"; depends=[]; };
 financial = derive { name="financial"; version="0.2"; sha256="1v6jgs3rq57byin5mynslfjk3zrx91qz36558nn17mv6z0qsf10v"; depends=[]; };
 findpython = derive { name="findpython"; version="1.0.1"; sha256="0fa01znc9cckj4ay4zmwmssm2lkhmsw6h07y1pwgd6z1b2pj7bns"; depends=[]; };
 fingerprint = derive { name="fingerprint"; version="3.5.2"; sha256="042aycxs00rglqh2y27bjlwkk6z312gavli7g8xvqfx1lisijrjk"; depends=[]; };
-finiteruinprob = derive { name="finiteruinprob"; version="0.4"; sha256="0wcllbqkryll3v3fjb6k210pcgkskzrpa78gg8nda0jvkij11zb7"; depends=[sdprisk numDeriv]; };
+finiteruinprob = derive { name="finiteruinprob"; version="0.4"; sha256="0wcllbqkryll3v3fjb6k210pcgkskzrpa78gg8nda0jvkij11zb7"; depends=[numDeriv sdprisk]; };
 fishMod = derive { name="fishMod"; version="0.25"; sha256="0mg1bziz2ia406m4ilc7hw1bghrgdibm537hnlf9ffhfayjc4kid"; depends=[]; };
 fisheyeR = derive { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; };
-fishmethods = derive { name="fishmethods"; version="1.8-0"; sha256="1n5wwwnggflq2y7j3m3kf324mwdhf45ihi25gbqyv79qklg5xcai"; depends=[MASS boot bootstrap]; };
-fishmove = derive { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[ggplot2 plyr MASS boot]; };
+fishmethods = derive { name="fishmethods"; version="1.8-0"; sha256="1n5wwwnggflq2y7j3m3kf324mwdhf45ihi25gbqyv79qklg5xcai"; depends=[boot bootstrap MASS]; };
+fishmove = derive { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[boot ggplot2 MASS plyr]; };
 fit_models = derive { name="fit.models"; version="0.5-10"; sha256="06pj26dbnq6mf9wxinvjzwyn36656f66a4bmky36r7fzi92gf3d8"; depends=[lattice]; };
-fit4NM = derive { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[gWidgets tkrplot RGtk2 gWidgetsRGtk2 cairoDevice]; };
+fit4NM = derive { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 tkrplot]; };
 fitDRC = derive { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; };
 fitTetra = derive { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; };
-fitbitScraper = derive { name="fitbitScraper"; version="0.1.3"; sha256="0fh8qm4ws9idx0868rda7v1cs8g61q8zdx1ncyxijbvijhdslfgj"; depends=[httr stringr RJSONIO]; };
+fitbitScraper = derive { name="fitbitScraper"; version="0.1.3"; sha256="0fh8qm4ws9idx0868rda7v1cs8g61q8zdx1ncyxijbvijhdslfgj"; depends=[httr RJSONIO stringr]; };
 fitdistrplus = derive { name="fitdistrplus"; version="1.0-4"; sha256="02ds5vmxc3rk50c33rxdnpqf2hbx186ss6br29n6538q7734nra9"; depends=[survival]; };
 flam = derive { name="flam"; version="1.0"; sha256="0jyx0wff5zdpnhgxz74k6fxgwdnl7khanahv63af22y0mqpd066f"; depends=[MASS]; };
-flare = derive { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[lattice MASS Matrix igraph]; };
+flare = derive { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[igraph lattice MASS Matrix]; };
 flashClust = derive { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
-flexCWM = derive { name="flexCWM"; version="1.5"; sha256="1q6nkw6al56wc53sj719c94iv20a9a82pq4s62jnb2flq1pwdaml"; depends=[numDeriv mnormt mclust ellipse mixture Flury adehabitat MASS statmod]; };
+flexCWM = derive { name="flexCWM"; version="1.5"; sha256="1q6nkw6al56wc53sj719c94iv20a9a82pq4s62jnb2flq1pwdaml"; depends=[adehabitat ellipse Flury MASS mclust mixture mnormt numDeriv statmod]; };
 flexPM = derive { name="flexPM"; version="1.0"; sha256="0zchcqsjinf3fpw5ijnygh1ywn2fdj9a6rgv7vfb44dcjgy4k74f"; depends=[]; };
 flexclust = derive { name="flexclust"; version="1.3-4"; sha256="1x9gyg69kb3wn02w885kl6hcwpf2ki66gzfayvc83jisrwxvdfvv"; depends=[lattice modeltools]; };
 flexmix = derive { name="flexmix"; version="2.3-13"; sha256="1i205yw3kkxs27gqcs6zx0c2mh16p332a2p06wq6fdzb20bazg3z"; depends=[lattice modeltools nnet]; };
-flexsurv = derive { name="flexsurv"; version="0.6"; sha256="10y6v1m8w5h92y37pi26xqsb4l6wk6dz43593dngpfr9ww1j4aaa"; depends=[survival muhaz mvtnorm deSolve]; };
-flip = derive { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[e1071 someMTP cherry Rcpp Rcpp RcppArmadillo]; };
+flexsurv = derive { name="flexsurv"; version="0.6"; sha256="10y6v1m8w5h92y37pi26xqsb4l6wk6dz43593dngpfr9ww1j4aaa"; depends=[deSolve muhaz mvtnorm survival]; };
+flip = derive { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[cherry e1071 Rcpp RcppArmadillo someMTP]; };
 flora = derive { name="flora"; version="0.2.4"; sha256="1rdwdx7mphfr7sk3yba0vhbsh3xggz2k6ip8dmfiqjjhv2vxji5k"; depends=[shiny]; };
 flower = derive { name="flower"; version="1.0"; sha256="1h2fvpjrvpbyrqb8hd51sslr1ibpwa7h9fiqy9anvf2yim5j11yq"; depends=[]; };
 flowfield = derive { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; };
 flsa = derive { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; };
 flux = derive { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; };
-fma = derive { name="fma"; version="2.01"; sha256="1j5mvhbrdnkyj4svibpahnz7d4221nkhja5b7fnh68mbmil607fc"; depends=[tseries forecast]; };
+fma = derive { name="fma"; version="2.01"; sha256="1j5mvhbrdnkyj4svibpahnz7d4221nkhja5b7fnh68mbmil607fc"; depends=[forecast tseries]; };
 fmri = derive { name="fmri"; version="1.5-1"; sha256="0dla5w8x4njw2njryb35nqh4r31wdps9bl5wzab2grzl546wwmwm"; depends=[]; };
 fmsb = derive { name="fmsb"; version="0.5.1"; sha256="0y9h29a2wsngx73vn07f31l8ffrrm0si3qqx60hgxmb57v501kqz"; depends=[]; };
 fmt = derive { name="fmt"; version="1.0"; sha256="13gsywnyvf9zy5n644g2xyd60f92w2dp7vil2dncjvjcqsib22a0"; depends=[]; };
@@ -3575,218 +3589,218 @@ foodweb = derive { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28
 forams = derive { name="forams"; version="2.0-4"; sha256="1kvxlqdyzb3rqa45hp7jxjm009w0r6h78nr3yh9bqcz594zqidbq"; depends=[vegan]; };
 foreach = derive { name="foreach"; version="1.4.2"; sha256="097zk7cwyjxgw2i8i547y437y0gg2fmyc5g4i8bbkn99004qzzfl"; depends=[codetools iterators]; };
 forecTheta = derive { name="forecTheta"; version="1.0"; sha256="1ip6l27d37xqnmg8w285lq1y5j6akrjrviq4338c8sq075d8hckn"; depends=[forecast]; };
-forecast = derive { name="forecast"; version="6.1"; sha256="1hwv3arcpkkhpj5n2dvpw2fyx687b6x6yakxx55cw9rrka70rx1k"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; };
+forecast = derive { name="forecast"; version="6.1"; sha256="1hwv3arcpkkhpj5n2dvpw2fyx687b6x6yakxx55cw9rrka70rx1k"; depends=[colorspace fracdiff nnet Rcpp RcppArmadillo timeDate tseries zoo]; };
 foreign = derive { name="foreign"; version="0.8-63"; sha256="1g5hl8drcmh2c9kpkr4443nw7dsxjwqsqs1q4bnhvw2lizs8bfb2"; depends=[]; };
-forensic = derive { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[genetics combinat]; };
+forensic = derive { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; };
 forensim = derive { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; };
-forestFloor = derive { name="forestFloor"; version="1.4"; sha256="152b5pq9901bdik3dqmn4gb0aiyl8zf8mg88d8xnz839aildp2fw"; depends=[Rcpp randomForest rgl kknn trimTrees Rcpp]; };
+forestFloor = derive { name="forestFloor"; version="1.4"; sha256="152b5pq9901bdik3dqmn4gb0aiyl8zf8mg88d8xnz839aildp2fw"; depends=[kknn randomForest Rcpp rgl trimTrees]; };
 forestplot = derive { name="forestplot"; version="1.1"; sha256="1h28lwqdizs450bm5hb8zfbmx633n8v5bj2p8mi4cl814sjjylr0"; depends=[]; };
 formatR = derive { name="formatR"; version="1.2"; sha256="0dlj728qdm7wmxcxvw1ip64pl4ajgmi8ax69zafrn3306pg9y136"; depends=[]; };
 formula_tools = derive { name="formula.tools"; version="1.5.2"; sha256="1n2rw9zhrgcsjxrm108fs7sysk9jk1gmq0jmg9s7pm7ff76insnj"; depends=[operator_tools]; };
 fortunes = derive { name="fortunes"; version="1.5-2"; sha256="1wv1x055v388ay4gnd1l8y6dgvamyfvmsd0ik9fziygwsaljb049"; depends=[]; };
 forward = derive { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; };
-fossil = derive { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[sp maps shapefiles]; };
+fossil = derive { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[maps shapefiles sp]; };
 fpCompare = derive { name="fpCompare"; version="0.2.0"; sha256="0s8gfnyj6kjwy3ymiy232bb5wzgkd1ainaqzlki7mcafa3dyzq0a"; depends=[]; };
-fpc = derive { name="fpc"; version="2.1-9"; sha256="01x7zcsbz9n10dxx8plb37c7z7pfz1xd5dvfrij3na327mny3pxs"; depends=[MASS cluster mclust flexmix prabclus class diptest mvtnorm robustbase kernlab trimcluster]; };
+fpc = derive { name="fpc"; version="2.1-9"; sha256="01x7zcsbz9n10dxx8plb37c7z7pfz1xd5dvfrij3na327mny3pxs"; depends=[class cluster diptest flexmix kernlab MASS mclust mvtnorm prabclus robustbase trimcluster]; };
 fpca = derive { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; };
 fpow = derive { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; };
-fpp = derive { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[forecast fma expsmooth lmtest tseries]; };
+fpp = derive { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[expsmooth fma forecast lmtest tseries]; };
 fptdApprox = derive { name="fptdApprox"; version="2.0"; sha256="152bajs76wrapp0zdbkckff6kdkkm6sqqlqd2w220hsi96l2p9dh"; depends=[]; };
 fracdiff = derive { name="fracdiff"; version="1.4-2"; sha256="03l5dqpqwwi5c8fwc2vissfawcsignai60h2zalknkibvk782dwq"; depends=[]; };
 fracprolif = derive { name="fracprolif"; version="1.0.6"; sha256="1cpb71yk1245j6qz4mqvpqc3s3lrmav4blp5wlxasjizn3ilwh66"; depends=[emg numDeriv]; };
-fractal = derive { name="fractal"; version="2.0-0"; sha256="17wz3c9f1l1rphzdn7j27j5nb1ll6j84f9ihk0z6fni41050szv7"; depends=[splus2R ifultools sapa wmtsa scatterplot3d]; };
+fractal = derive { name="fractal"; version="2.0-0"; sha256="17wz3c9f1l1rphzdn7j27j5nb1ll6j84f9ihk0z6fni41050szv7"; depends=[ifultools sapa scatterplot3d splus2R wmtsa]; };
 fractaldim = derive { name="fractaldim"; version="0.8-4"; sha256="0fln4qn0d79agnnlzi8b9g9qn90zynq1cg9v5isiyi71345v45nr"; depends=[abind]; };
-fractalrock = derive { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger timeDate quantmod]; };
+fractalrock = derive { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger quantmod timeDate]; };
 frailtyHL = derive { name="frailtyHL"; version="1.1"; sha256="1xjdph0ixanf9w4b6hx6igfhkcp8h93sclrg0pgqgmbvm41lhb1x"; depends=[Matrix numDeriv survival]; };
-frailtypack = derive { name="frailtypack"; version="2.7.5"; sha256="1wjb8l6aj1lsmbgczfag8a96r0z235yj315kr7dpkqkninn2bqwk"; depends=[survival boot MASS survC1]; };
-frair = derive { name="frair"; version="0.4"; sha256="1g52ykj1m9znpp0pvry7dnmhg4m73nbkw0bp31zl6pcsdgmxxqjr"; depends=[bbmle emdbook boot]; };
+frailtypack = derive { name="frailtypack"; version="2.7.5"; sha256="1wjb8l6aj1lsmbgczfag8a96r0z235yj315kr7dpkqkninn2bqwk"; depends=[boot MASS survC1 survival]; };
+frair = derive { name="frair"; version="0.4"; sha256="1g52ykj1m9znpp0pvry7dnmhg4m73nbkw0bp31zl6pcsdgmxxqjr"; depends=[bbmle boot emdbook]; };
 frbs = derive { name="frbs"; version="3.1-0"; sha256="0ngvi7lg6aviwic8f4ya03khyzh3ksglpmsnrdjjznwj874y2wim"; depends=[]; };
 freeknotsplines = derive { name="freeknotsplines"; version="1.0"; sha256="19zs42q9njknirdbrbnp8bv4vr32kd8wxmkqj0a0nh06i5fcx67r"; depends=[]; };
 freestats = derive { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; };
 freqMAP = derive { name="freqMAP"; version="0.2"; sha256="02hpkqqrxifrr1cxn5brp166jwa8lgl1mcgmq7s8csrbbd900ziv"; depends=[]; };
-freqparcoord = derive { name="freqparcoord"; version="1.0.0"; sha256="0hn5y10yp3j76lqrmj6dsaafamgy4pfxx1p4y92z17s79x29j59q"; depends=[ggplot2 GGally FNN mvtnorm]; };
-freqweights = derive { name="freqweights"; version="1.0.1"; sha256="13wy8nzs888yn7ld96qq3p7k3xjn6s38qdlfb3nqmh52daqcnn7m"; depends=[plyr dplyr data_table biglm fastcluster FactoMineR]; };
+freqparcoord = derive { name="freqparcoord"; version="1.0.0"; sha256="0hn5y10yp3j76lqrmj6dsaafamgy4pfxx1p4y92z17s79x29j59q"; depends=[FNN GGally ggplot2 mvtnorm]; };
+freqweights = derive { name="freqweights"; version="1.0.1"; sha256="13wy8nzs888yn7ld96qq3p7k3xjn6s38qdlfb3nqmh52daqcnn7m"; depends=[biglm data_table dplyr FactoMineR fastcluster plyr]; };
 frm = derive { name="frm"; version="1.2.2"; sha256="1dl0vca9r2dams99sc13pfpi0b3yb02x59f4c1jz07zz005c8l23"; depends=[]; };
 frmhet = derive { name="frmhet"; version="1.1.2"; sha256="1a6q5qz22b4sx5l1jz50x1q3bz8sj91dj2cahq28h6ss5b8vfn0y"; depends=[]; };
 frmpd = derive { name="frmpd"; version="1.0.1"; sha256="104frdraawj8g76589kz4csbgzkvs4rgdhgwmb77srhqp5nc8v96"; depends=[]; };
 frmqa = derive { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3limd4fxwyb5i7845rwmkzk1944aj"; depends=[partitions Rmpfr]; };
-frontier = derive { name="frontier"; version="1.1-0"; sha256="0k2ap22qddzki63biikr1jzi5vmqz4j06d7qrf1y8axdq1q1cr44"; depends=[micEcon lmtest moments Formula miscTools]; };
+frontier = derive { name="frontier"; version="1.1-0"; sha256="0k2ap22qddzki63biikr1jzi5vmqz4j06d7qrf1y8axdq1q1cr44"; depends=[Formula lmtest micEcon miscTools moments]; };
 frontiles = derive { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; };
 frt = derive { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; };
 fscaret = derive { name="fscaret"; version="0.9.4"; sha256="0cna1cixq021lka7c8jgfqr6h8vvyvylckkbfay10ng7cxpqa44c"; depends=[caret gsubfn hmeasure]; };
 fsia = derive { name="fsia"; version="1.0"; sha256="0qa4avd1xiwh1ih1cj067r7vipab2ngspq7hfd0xbapwx87fggrg"; depends=[]; };
-fslr = derive { name="fslr"; version="1.4.4"; sha256="0k6973hd1q54q6243lir4xi3wlrsiqb526qsh9gryx9ha4iv0rmc"; depends=[stringr oro_nifti matrixStats R_utils scales]; };
+fslr = derive { name="fslr"; version="1.4.4"; sha256="0k6973hd1q54q6243lir4xi3wlrsiqb526qsh9gryx9ha4iv0rmc"; depends=[matrixStats oro_nifti R_utils scales stringr]; };
 fso = derive { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; };
 ftnonpar = derive { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; };
-fts = derive { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[zoo BH]; };
-ftsa = derive { name="ftsa"; version="4.3"; sha256="0hf3v83a5mh6s8y3hhvnwqmj55n707c8lgkpmxlc52gxykgnayjz"; depends=[forecast rainbow colorspace MASS pcaPP]; };
+fts = derive { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[BH zoo]; };
+ftsa = derive { name="ftsa"; version="4.3"; sha256="0hf3v83a5mh6s8y3hhvnwqmj55n707c8lgkpmxlc52gxykgnayjz"; depends=[colorspace forecast MASS pcaPP rainbow]; };
 fueleconomy = derive { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; };
-fugeR = derive { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[snowfall Rcpp Rcpp]; };
+fugeR = derive { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[Rcpp snowfall]; };
 fun = derive { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; };
-funFEM = derive { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[MASS fda elasticnet]; };
+funFEM = derive { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; };
 funHDDC = derive { name="funHDDC"; version="1.0"; sha256="038m64yv27wz7ki2gcn94q011p8mv0ggmli5n27y0f5bnkfh6d6w"; depends=[fda]; };
 functional = derive { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; };
 funreg = derive { name="funreg"; version="1.1"; sha256="1sxr4mylcpbya197d55yi6d7g5pfspaf59xxbwjgmwgjw06rl76r"; depends=[MASS mgcv mvtnorm]; };
 funtimes = derive { name="funtimes"; version="1.1"; sha256="0z478b57l7hg8b42jyzcdjzs3nn62m2y117xmgbw1gbyf3rcnjkw"; depends=[Jmisc]; };
 futile_any = derive { name="futile.any"; version="1.3.0"; sha256="1c7pj64kz09qzwrxvkp1w1w8mvxwq36zkj6w4b7yyi8v7x3daq2a"; depends=[lambda_r]; };
-futile_logger = derive { name="futile.logger"; version="1.4.1"; sha256="1plld1icxrcay7llplbd4i8inpg97crpnczk58mbk26j8glqbr51"; depends=[lambda_r futile_options]; };
-futile_matrix = derive { name="futile.matrix"; version="1.2.2"; sha256="1cb975n93ck5fma0gvvbzainp7hv3nr8fc6b3qi8gnxy0d2i029m"; depends=[lambda_r lambda_tools futile_logger RMTstat]; };
+futile_logger = derive { name="futile.logger"; version="1.4.1"; sha256="1plld1icxrcay7llplbd4i8inpg97crpnczk58mbk26j8glqbr51"; depends=[futile_options lambda_r]; };
+futile_matrix = derive { name="futile.matrix"; version="1.2.2"; sha256="1cb975n93ck5fma0gvvbzainp7hv3nr8fc6b3qi8gnxy0d2i029m"; depends=[futile_logger lambda_r lambda_tools RMTstat]; };
 futile_options = derive { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; };
 futile_paradigm = derive { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; };
 fuzzyFDR = derive { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; };
-fuzzyMM = derive { name="fuzzyMM"; version="1.0.1"; sha256="1pqfc9b9l2xx5pl45hfildikqjsdgqfhqzi2nbb34026nla5m8vk"; depends=[osmar frbs igraph rgeos rgdal]; };
+fuzzyMM = derive { name="fuzzyMM"; version="1.0.1"; sha256="1pqfc9b9l2xx5pl45hfildikqjsdgqfhqzi2nbb34026nla5m8vk"; depends=[frbs igraph osmar rgdal rgeos]; };
 fuzzyRankTests = derive { name="fuzzyRankTests"; version="0.3-5"; sha256="1g09506bbpk05a2r2wxjynjs8dmjd2q7x74d83vjscg1kdk4kazq"; depends=[]; };
 fwdmsa = derive { name="fwdmsa"; version="0.2"; sha256="0p0kh8am6gajfaixkvq61f12hfbm6chl9372yzn1yilhiyvqdxgp"; depends=[]; };
 fwi_fbp = derive { name="fwi.fbp"; version="1.5"; sha256="08ngg70vi2fca5yblm2gf1lkjjmb6m39d8q6429n7i3jn6ca5nzf"; depends=[]; };
-fwsim = derive { name="fwsim"; version="0.3.3"; sha256="1ix4sl2krlr0b0wfgvy73qhpmkjymqcci3q3v60j20zapi55gxn2"; depends=[Rcpp Rcpp]; };
-fxregime = derive { name="fxregime"; version="1.0-3"; sha256="15fh8yhcba2gw2xfd0yiw5ssvbgb62l6vb28bxz71ckdyv9nsahk"; depends=[zoo strucchange car sandwich]; };
+fwsim = derive { name="fwsim"; version="0.3.3"; sha256="1ix4sl2krlr0b0wfgvy73qhpmkjymqcci3q3v60j20zapi55gxn2"; depends=[Rcpp]; };
+fxregime = derive { name="fxregime"; version="1.0-3"; sha256="15fh8yhcba2gw2xfd0yiw5ssvbgb62l6vb28bxz71ckdyv9nsahk"; depends=[car sandwich strucchange zoo]; };
 g_data = derive { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; };
 gCat = derive { name="gCat"; version="0.1"; sha256="10990ilsjk52kqkcdngj4nq0kcbn4w1syxl1mqjq2n5g1l002yjy"; depends=[]; };
 gIPFrm = derive { name="gIPFrm"; version="2.0"; sha256="1syjsnna7b7y27yf7zsxjwq8z5f4wxf2hfadhgjaw898gvfcnrbc"; depends=[]; };
-gMCP = derive { name="gMCP"; version="0.8-8"; sha256="0568pqvcbrpqbppvpvmgxf23rzy1fgl892asq9lhcjslzsz89an5"; depends=[rJava JavaGD xlsxjars MASS PolynomF multcomp mvtnorm Matrix CommonJavaJars]; };
-gMWT = derive { name="gMWT"; version="1.0"; sha256="12ryjpq0k3brw4xy4f6j89zm94j6phbzn9ga0nr9bzfvslhqjhna"; depends=[clinfun Rcpp Rcpp RcppArmadillo]; };
+gMCP = derive { name="gMCP"; version="0.8-8"; sha256="0568pqvcbrpqbppvpvmgxf23rzy1fgl892asq9lhcjslzsz89an5"; depends=[CommonJavaJars JavaGD MASS Matrix multcomp mvtnorm PolynomF rJava xlsxjars]; };
+gMWT = derive { name="gMWT"; version="1.0"; sha256="12ryjpq0k3brw4xy4f6j89zm94j6phbzn9ga0nr9bzfvslhqjhna"; depends=[clinfun Rcpp RcppArmadillo]; };
 gPCA = derive { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; };
 gPdtest = derive { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; };
-gProfileR = derive { name="gProfileR"; version="0.5.3"; sha256="0kv01b1ihwggzjd9plznz3il3b97pja11nqki3378zvpgfy5wzdn"; depends=[RCurl plyr]; };
-gRain = derive { name="gRain"; version="1.2-3"; sha256="0cxlni9b4p4g02zhhsbbpkwhx9y3x83vm7qd6lsca02yi96palsi"; depends=[gRbase igraph]; };
-gRapHD = derive { name="gRapHD"; version="0.2.4"; sha256="0fxd04s6zh23chks4k6nwb5w408xjy89b44pa42kv6qnqj86ylvm"; depends=[]; };
+gProfileR = derive { name="gProfileR"; version="0.5.3"; sha256="0kv01b1ihwggzjd9plznz3il3b97pja11nqki3378zvpgfy5wzdn"; depends=[plyr RCurl]; };
+gRain = derive { name="gRain"; version="1.2-3"; sha256="0cxlni9b4p4g02zhhsbbpkwhx9y3x83vm7qd6lsca02yi96palsi"; depends=[graph gRbase igraph]; };
+gRapHD = derive { name="gRapHD"; version="0.2.4"; sha256="0fxd04s6zh23chks4k6nwb5w408xjy89b44pa42kv6qnqj86ylvm"; depends=[graph]; };
 gRapfa = derive { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; };
-gRbase = derive { name="gRbase"; version="1.7-0.1"; sha256="1x52i4c5jbry17y1pfnjq03kz4xxnk3anidva41z5alp7c73zlqv"; depends=[Matrix igraph Rcpp Rcpp RcppArmadillo RcppEigen]; };
-gRc = derive { name="gRc"; version="0.4-1"; sha256="1a6q24yj7js1sk0lfqbm7kdv605cby6i711w4dlygsxdvwxbrsdr"; depends=[gRbase]; };
-gRim = derive { name="gRim"; version="0.1-17"; sha256="0vn031r318kp78cx00n43fc42bv6sjyb8dm6q0l08s0g9n2w17dp"; depends=[gRbase gRain igraph Rcpp RcppArmadillo]; };
+gRbase = derive { name="gRbase"; version="1.7-0.1"; sha256="1x52i4c5jbry17y1pfnjq03kz4xxnk3anidva41z5alp7c73zlqv"; depends=[graph igraph Matrix RBGL Rcpp RcppArmadillo RcppEigen]; };
+gRc = derive { name="gRc"; version="0.4-1"; sha256="1a6q24yj7js1sk0lfqbm7kdv605cby6i711w4dlygsxdvwxbrsdr"; depends=[graph gRbase Rgraphviz]; };
+gRim = derive { name="gRim"; version="0.1-17"; sha256="0vn031r318kp78cx00n43fc42bv6sjyb8dm6q0l08s0g9n2w17dp"; depends=[gRain gRbase igraph Rcpp RcppArmadillo]; };
 gSeg = derive { name="gSeg"; version="0.1"; sha256="0qnv3c0rla0g2fb4s4x1i0zdp3dlvi98qf80wlr54gnn7s9vpjf1"; depends=[]; };
 gWidgets = derive { name="gWidgets"; version="0.0-54"; sha256="13lbbbnmkvb559klgsnz0q27qlyv102xakb6yccxsxjw249hm8c2"; depends=[]; };
-gWidgets2 = derive { name="gWidgets2"; version="1.0-5"; sha256="1y6vm6ds77yr1qiqlcaixbsarbwx5w53ba343svla7wva80ajbpl"; depends=[digest]; };
-gWidgets2RGtk2 = derive { name="gWidgets2RGtk2"; version="1.0-3"; sha256="041d510rxghcj5h6zw5258f4jnj1j9ycq2kdh0kl81fjr8n992jv"; depends=[memoise RGtk2 gWidgets2]; };
-gWidgets2tcltk = derive { name="gWidgets2tcltk"; version="1.0-4"; sha256="1c9vfnr6j4lvshvdzp88a45pjrdl0dfhr1rxlpz95d3cks9rfq1f"; depends=[digest memoise gWidgets2]; };
-gWidgetsRGtk2 = derive { name="gWidgetsRGtk2"; version="0.0-83"; sha256="1kn2095jx1amyzbkvgf7m466zqfv548n232xc555bpsrw9ma5qhk"; depends=[RGtk2 gWidgets cairoDevice]; };
-gWidgetstcltk = derive { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[gWidgets digest]; };
+gWidgets2 = derive { name="gWidgets2"; version="1.0-6"; sha256="0xh1f9j1y3zifz8xrvyp41c8zdgqx8lx0cg1sdqhxv8j3mxibcsg"; depends=[digest]; };
+gWidgets2RGtk2 = derive { name="gWidgets2RGtk2"; version="1.0-3"; sha256="041d510rxghcj5h6zw5258f4jnj1j9ycq2kdh0kl81fjr8n992jv"; depends=[gWidgets2 memoise RGtk2]; };
+gWidgets2tcltk = derive { name="gWidgets2tcltk"; version="1.0-4"; sha256="1c9vfnr6j4lvshvdzp88a45pjrdl0dfhr1rxlpz95d3cks9rfq1f"; depends=[digest gWidgets2 memoise]; };
+gWidgetsRGtk2 = derive { name="gWidgetsRGtk2"; version="0.0-83"; sha256="1kn2095jx1amyzbkvgf7m466zqfv548n232xc555bpsrw9ma5qhk"; depends=[cairoDevice gWidgets RGtk2]; };
+gWidgetstcltk = derive { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[digest gWidgets]; };
 gains = derive { name="gains"; version="1.1"; sha256="1mn8db8yxgkf8z6nm6k76g5l3i3vnw750ksg3w9ysd2pcabb65g1"; depends=[]; };
-galts = derive { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgggjr5b8kvjnbxrf6r23qsdk43mn"; depends=[genalg DEoptim]; };
+galts = derive { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgggjr5b8kvjnbxrf6r23qsdk43mn"; depends=[DEoptim genalg]; };
 gam = derive { name="gam"; version="1.12"; sha256="00rx8y7pcxabwjvg0ch6c76xqs43drjg3ih3kflqxdcl2rmaapnd"; depends=[foreach]; };
 gamair = derive { name="gamair"; version="0.0-8"; sha256="11qwmhrzks8gi9is2n9xcy6cviy7a8mwh2v78fw78x7g7ccd8i9x"; depends=[]; };
 gambin = derive { name="gambin"; version="1.1"; sha256="197k8j6mvf8236gwg8vvfnskf4hic9y075chsd8214n1nk7i6jmz"; depends=[]; };
 gamboostLSS = derive { name="gamboostLSS"; version="1.1-3"; sha256="1gdsrizr4q5zyfs2g8c8fdwriqz0xrpq9vyy4wd2ywdh5lbi995b"; depends=[mboost]; };
 gamboostMSM = derive { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; };
-gamclass = derive { name="gamclass"; version="0.55"; sha256="0nhy1qdc221hsnby8j0m2a4x4a8qwfixbaq4gd22rn1xpbsdnfw3"; depends=[car mgcv DAAG MASS rpart randomForest lattice latticeExtra ape KernSmooth]; };
-games = derive { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[maxLik Formula MASS stringr]; };
+gamclass = derive { name="gamclass"; version="0.55"; sha256="0nhy1qdc221hsnby8j0m2a4x4a8qwfixbaq4gd22rn1xpbsdnfw3"; depends=[ape car DAAG KernSmooth lattice latticeExtra MASS mgcv randomForest rpart]; };
+games = derive { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; };
 gamlr = derive { name="gamlr"; version="1.13-1"; sha256="1y97zsb9shll93f6j7r95296c26dbmxwa1z67ziy0yh4gsgbijc8"; depends=[Matrix]; };
-gamlss = derive { name="gamlss"; version="4.3-4"; sha256="0qbxcfvhy8blswzv8194x9f08p25vhknnm3h4hhz9lp5gh536fbk"; depends=[gamlss_data gamlss_dist nlme MASS survival]; };
-gamlss_add = derive { name="gamlss.add"; version="4.3-3"; sha256="0cs4mcpm0ckaim3g8q7m4yb6y3izqgvndzgkqgrwr75cxz0wd4vh"; depends=[gamlss_dist gamlss mgcv nnet rpart]; };
-gamlss_cens = derive { name="gamlss.cens"; version="4.3.1"; sha256="1y3a4b6n86h0r287065kr574ix0qpc2nnjpp8fp49nbpxwxlz962"; depends=[gamlss_dist gamlss survival]; };
+gamlss = derive { name="gamlss"; version="4.3-4"; sha256="0qbxcfvhy8blswzv8194x9f08p25vhknnm3h4hhz9lp5gh536fbk"; depends=[gamlss_data gamlss_dist MASS nlme survival]; };
+gamlss_add = derive { name="gamlss.add"; version="4.3-3"; sha256="0cs4mcpm0ckaim3g8q7m4yb6y3izqgvndzgkqgrwr75cxz0wd4vh"; depends=[gamlss gamlss_dist mgcv nnet rpart]; };
+gamlss_cens = derive { name="gamlss.cens"; version="4.3.1"; sha256="1y3a4b6n86h0r287065kr574ix0qpc2nnjpp8fp49nbpxwxlz962"; depends=[gamlss gamlss_dist survival]; };
 gamlss_data = derive { name="gamlss.data"; version="4.2-7"; sha256="0g3fmqrwxmj14r0p0ai1adq6cs3bd3ys47gjcja035xjiajg6cs2"; depends=[]; };
-gamlss_demo = derive { name="gamlss.demo"; version="4.3-1"; sha256="04xl2ddf8wg2j8m05y8j5avcgfrr55a7g6m9wzxx4k599m0c7c8i"; depends=[rpanel gamlss_dist gamlss_tr]; };
+gamlss_demo = derive { name="gamlss.demo"; version="4.3-1"; sha256="04xl2ddf8wg2j8m05y8j5avcgfrr55a7g6m9wzxx4k599m0c7c8i"; depends=[gamlss_dist gamlss_tr rpanel]; };
 gamlss_dist = derive { name="gamlss.dist"; version="4.3-4"; sha256="0aymwh1lrjalravqf6nfz716v4r805aw82dsi0sn2nlb00fi8w2x"; depends=[MASS]; };
-gamlss_mx = derive { name="gamlss.mx"; version="4.3-1"; sha256="1sjm8a44nh88mvscpspyqsp2agjhwibi4kbyizyi78dmzf2sakiq"; depends=[gamlss_dist gamlss nnet]; };
+gamlss_mx = derive { name="gamlss.mx"; version="4.3-1"; sha256="1sjm8a44nh88mvscpspyqsp2agjhwibi4kbyizyi78dmzf2sakiq"; depends=[gamlss gamlss_dist nnet]; };
 gamlss_nl = derive { name="gamlss.nl"; version="4.1-0"; sha256="083l5lsb0csxcp4vffvdv2nr7jk3s2gkcavx66m8inzw16j7xilz"; depends=[gamlss survival]; };
-gamlss_spatial = derive { name="gamlss.spatial"; version="0.2"; sha256="0sjb47gnzrab4y23c0z7cxqq5k46k2rb31lmqws2c9zgf4n7aqbi"; depends=[gamlss_dist gamlss spam mgcv]; };
-gamlss_tr = derive { name="gamlss.tr"; version="4.3-1"; sha256="1fdy61i2dmz2qafk92kl9acjbxx5gm8s9kkc8k9nnx6230qg8iq6"; depends=[gamlss_dist gamlss]; };
-gamlss_util = derive { name="gamlss.util"; version="4.3-2"; sha256="13facgyd14jl4j09d446jjzs91zwmv85g22gkyyi1hl4i5v5nfc4"; depends=[gamlss_dist gamlss zoo]; };
-gamm4 = derive { name="gamm4"; version="0.2-3"; sha256="19vy5wik9nh77cm25gp3j3j8w8vinwzx5pv90nzdzvx84yvvf0y3"; depends=[Matrix lme4 mgcv]; };
+gamlss_spatial = derive { name="gamlss.spatial"; version="0.2"; sha256="0sjb47gnzrab4y23c0z7cxqq5k46k2rb31lmqws2c9zgf4n7aqbi"; depends=[gamlss gamlss_dist mgcv spam]; };
+gamlss_tr = derive { name="gamlss.tr"; version="4.3-1"; sha256="1fdy61i2dmz2qafk92kl9acjbxx5gm8s9kkc8k9nnx6230qg8iq6"; depends=[gamlss gamlss_dist]; };
+gamlss_util = derive { name="gamlss.util"; version="4.3-2"; sha256="13facgyd14jl4j09d446jjzs91zwmv85g22gkyyi1hl4i5v5nfc4"; depends=[gamlss gamlss_dist zoo]; };
+gamm4 = derive { name="gamm4"; version="0.2-3"; sha256="19vy5wik9nh77cm25gp3j3j8w8vinwzx5pv90nzdzvx84yvvf0y3"; depends=[lme4 Matrix mgcv]; };
 gammSlice = derive { name="gammSlice"; version="1.3"; sha256="1vw8d0v0awyflh4gmbcf1g9nfx52cys8gpqvag5djri59p0y945a"; depends=[KernSmooth lattice mgcv]; };
 gaoptim = derive { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; };
 gap = derive { name="gap"; version="1.1-16"; sha256="0xyln7ffapm31cvx4n86ncyg3cdz5d2149qb5h5xx3kf0a8r7gpz"; depends=[]; };
 gapmap = derive { name="gapmap"; version="0.0.2"; sha256="0xykpy3cmbiwwa3s8f4777585r7l441qb9ks6ajym01scqcj3nwl"; depends=[ggplot2 reshape2]; };
 gapminder = derive { name="gapminder"; version="0.1.0"; sha256="06hi4m9i86nkdyz7w9wa4qkpbsl2178qskzzy8168wlzayx820ad"; depends=[]; };
-gaselect = derive { name="gaselect"; version="1.0.5"; sha256="0xzx00n46x6x7w1xbx8nvabkkrna45pv1i70787m8h05q1yrjjij"; depends=[Rcpp Rcpp RcppArmadillo]; };
+gaselect = derive { name="gaselect"; version="1.0.5"; sha256="0xzx00n46x6x7w1xbx8nvabkkrna45pv1i70787m8h05q1yrjjij"; depends=[Rcpp RcppArmadillo]; };
 gaussDiff = derive { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; };
-gaussquad = derive { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[polynom orthopolynom]; };
+gaussquad = derive { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[orthopolynom polynom]; };
 gazepath = derive { name="gazepath"; version="1.0"; sha256="00k6617wra9pcvyr94mr48c21l7z6grlpgf9g02lh23p6900fjxq"; depends=[]; };
 gb = derive { name="gb"; version="1.1.8-8"; sha256="18n9wqz82mjxjgzk8vc68kyz3b6lk21d2f16551d6fikjla03adf"; depends=[boot]; };
 gbRd = derive { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; };
-gbm = derive { name="gbm"; version="2.1.1"; sha256="0jkjr09w9cgfb21aznvr9nivxjmj1zxfsl7gafy4mwh719jzygy0"; depends=[survival lattice]; };
+gbm = derive { name="gbm"; version="2.1.1"; sha256="0jkjr09w9cgfb21aznvr9nivxjmj1zxfsl7gafy4mwh719jzygy0"; depends=[lattice survival]; };
 gbm2sas = derive { name="gbm2sas"; version="1.0"; sha256="0khw1nqc4yl2719h3zc70yl26s4lmngfz5iqw00pcv838z8myc0i"; depends=[gbm]; };
 gbs = derive { name="gbs"; version="1.0"; sha256="19zcsvd258ibrj356zlwgryjqylcs56agg3z6d44xbnf8prg05ig"; depends=[nlme]; };
-gcbd = derive { name="gcbd"; version="0.2.5"; sha256="0fkg6vk0jkl6680n1hljyv783j4hd84mql0k4pfblvqafwv4nhm3"; depends=[RSQLite plyr reshape lattice]; };
+gcbd = derive { name="gcbd"; version="0.2.5"; sha256="0fkg6vk0jkl6680n1hljyv783j4hd84mql0k4pfblvqafwv4nhm3"; depends=[lattice plyr reshape RSQLite]; };
 gcdnet = derive { name="gcdnet"; version="1.0.4"; sha256="0fmy0li06rahch4ir0xa81yilvrd0zqyhmpl4hfxjahhl3npw370"; depends=[Matrix]; };
 gclus = derive { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; };
 gcmr = derive { name="gcmr"; version="0.7.5"; sha256="1z1hdgdasmw3drld8nmkw6cc1xls1gaaym1mlr8lyida4gb3giv8"; depends=[betareg car Formula geoR lmtest nlme sandwich sp]; };
 gconcord = derive { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; };
 gcookbook = derive { name="gcookbook"; version="1.0"; sha256="0hb52zfi5bl2j0h8lazz4gzhhcvpicb4ld6xm2vkvi4cj47piyy8"; depends=[]; };
-gdalUtils = derive { name="gdalUtils"; version="0.3.1"; sha256="1a6sg3x5yfffa9xrkvc98i2hm3lvna4jw7p89gn2bf74kzphqpmy"; depends=[sp foreach R_utils]; };
+gdalUtils = derive { name="gdalUtils"; version="0.3.1"; sha256="1a6sg3x5yfffa9xrkvc98i2hm3lvna4jw7p89gn2bf74kzphqpmy"; depends=[foreach R_utils sp]; };
 gdata = derive { name="gdata"; version="2.16.1"; sha256="14ssq8z45zf1wwgfgxlc33i6hsdhc0b71kfncfclxz5ahxaqdkdm"; depends=[gtools]; };
-gdimap = derive { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[rgl oro_nifti movMF gridExtra colorspace geometry gsl abind]; };
-gdistance = derive { name="gdistance"; version="1.1-7"; sha256="1wcpjx76pnkpc6kmqx7bq73qbvzfzjb9s46qb7gi7kabpkya97il"; depends=[raster igraph Matrix sp]; };
-gdm = derive { name="gdm"; version="1.0"; sha256="08wafxvds4sxaxv7mbbkbzilkpfz1xnzdc5jdw3pldvmbgk861vd"; depends=[Rcpp raster reshape2 vegan plyr Rcpp]; };
+gdimap = derive { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; };
+gdistance = derive { name="gdistance"; version="1.1-7"; sha256="1wcpjx76pnkpc6kmqx7bq73qbvzfzjb9s46qb7gi7kabpkya97il"; depends=[igraph Matrix raster sp]; };
+gdm = derive { name="gdm"; version="1.0"; sha256="08wafxvds4sxaxv7mbbkbzilkpfz1xnzdc5jdw3pldvmbgk861vd"; depends=[plyr raster Rcpp reshape2 vegan]; };
 gee = derive { name="gee"; version="4.13-18"; sha256="1s2cjgg4ypw72g710m93g6az763xz6sxw91nd6cwm5jjvr9vb91f"; depends=[]; };
 geeM = derive { name="geeM"; version="0.7.4"; sha256="0vxgwx6qx2xhhj217d6x7m5y89r0b9xxdd4k3sw0zgfga133ij7w"; depends=[Matrix]; };
 geepack = derive { name="geepack"; version="1.2-0"; sha256="1pxh9nsyj9a40znm4zza4nbi3dkhb96s3azi43p9ivvfj3l21m74"; depends=[]; };
-geesmv = derive { name="geesmv"; version="1.1"; sha256="1xijdjmkg6nw2y1556zbaic969dg23np0wrb9ncknsrhq4aa28pa"; depends=[nlme gee matrixcalc MASS]; };
+geesmv = derive { name="geesmv"; version="1.1"; sha256="1xijdjmkg6nw2y1556zbaic969dg23np0wrb9ncknsrhq4aa28pa"; depends=[gee MASS matrixcalc nlme]; };
 geigen = derive { name="geigen"; version="1.5"; sha256="06k4fc7j8asqv1winmz28hb3r8fvlgikrvi064ysvj2fqwh7jnq1"; depends=[]; };
-geiger = derive { name="geiger"; version="2.0.3"; sha256="1wqihvscmq44i34205fzv79wk7j2a72qd8y6ycgrv74plql0316c"; depends=[ape MASS mvtnorm subplex deSolve digest Rcpp coda Rcpp]; };
+geiger = derive { name="geiger"; version="2.0.3"; sha256="1wqihvscmq44i34205fzv79wk7j2a72qd8y6ycgrv74plql0316c"; depends=[ape coda deSolve digest MASS mvtnorm Rcpp subplex]; };
 gelnet = derive { name="gelnet"; version="1.1"; sha256="1d77v44azqpk6hzi7fl2ba6z3nyzh33xn0yp7ydp86nmf1gcgwlh"; depends=[]; };
-gems = derive { name="gems"; version="1.0.0"; sha256="0h8z3ih24hxdv8bah4xf8f797pnwihby8hj93z6zw5sq9dyszxwa"; depends=[MASS msm plyr data_table]; };
-gemtc = derive { name="gemtc"; version="0.6-2"; sha256="0bkcbyh71aq3p7w75w78l472gfschfb2qf9wcv7s2vyy6ypbvh2q"; depends=[coda igraph meta XML plyr]; };
+gems = derive { name="gems"; version="1.0.0"; sha256="0h8z3ih24hxdv8bah4xf8f797pnwihby8hj93z6zw5sq9dyszxwa"; depends=[data_table MASS msm plyr]; };
+gemtc = derive { name="gemtc"; version="0.6-2"; sha256="0bkcbyh71aq3p7w75w78l472gfschfb2qf9wcv7s2vyy6ypbvh2q"; depends=[coda igraph meta plyr XML]; };
 gemtc_jar = derive { name="gemtc.jar"; version="0.14.3"; sha256="18hbiygpsv67flc4v6z6mir0rfq41v1vsh11dg9phmdr8bx4kcl1"; depends=[rJava]; };
 genMOSS = derive { name="genMOSS"; version="1.2"; sha256="18qinckzz7wsw222skrq30izbj6s85i8hq6iicj9nng8gh6jydr8"; depends=[ROCR]; };
 genMOSSplus = derive { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; };
 genSurv = derive { name="genSurv"; version="1.0.2"; sha256="0hvkrlcl8jrj0x0ixrl34484p9kxlwxfaa64ynz6jf3dcyghp9l0"; depends=[]; };
 genalg = derive { name="genalg"; version="0.2.0"; sha256="1wzfamq8k5yhwbdx0wy1w5bks93brj0p890xxc4yqrja4w38ja3s"; depends=[]; };
-genasis = derive { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[Kendall fitdistrplus]; };
+genasis = derive { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[fitdistrplus Kendall]; };
 gendata = derive { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; };
 gender = derive { name="gender"; version="0.4.3"; sha256="0dhwhv2b86arpmyr89g69h8ikw0f2x27ig420jngfb9gxljj9phc"; depends=[devtools dplyr httr jsonlite]; };
-genderizeR = derive { name="genderizeR"; version="1.1.0"; sha256="0hdphzmjqlzwk1gnhncidsdqrbc1lra3a4nl992ap9gfk890rvi4"; depends=[stringr httr tm data_table magrittr]; };
+genderizeR = derive { name="genderizeR"; version="1.1.0"; sha256="0hdphzmjqlzwk1gnhncidsdqrbc1lra3a4nl992ap9gfk890rvi4"; depends=[data_table httr magrittr stringr tm]; };
 geneListPie = derive { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; };
-geneSignatureFinder = derive { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[survival cluster class]; };
+geneSignatureFinder = derive { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[class cluster survival]; };
 genepi = derive { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; };
 genetics = derive { name="genetics"; version="1.3.8.1"; sha256="0gfbrpz0zp5bgw3s21wrhjfy70laif47wcrjrm6mjgs6xapiw790"; depends=[combinat gdata gtools MASS mvtnorm]; };
-genlasso = derive { name="genlasso"; version="1.3"; sha256="1q4ybg8xzphnqwywwdb7i2q94dlxwpggvisjqqdj39jh2cabda57"; depends=[MASS Matrix igraph]; };
+genlasso = derive { name="genlasso"; version="1.3"; sha256="1q4ybg8xzphnqwywwdb7i2q94dlxwpggvisjqqdj39jh2cabda57"; depends=[igraph MASS Matrix]; };
 genoPlotR = derive { name="genoPlotR"; version="0.8.2"; sha256="0q12sg13yn5f3j5gk0qzszp81x52lpwpk3z4cg0bgxi9zbwmw467"; depends=[ade4]; };
-genpathmox = derive { name="genpathmox"; version="0.2"; sha256="1m08j10mrvkrnlgxbhjn3qmjz29p121fc4haww5qrici06nipfdm"; depends=[plspm quantreg mice diagram]; };
+genpathmox = derive { name="genpathmox"; version="0.2"; sha256="1m08j10mrvkrnlgxbhjn3qmjz29p121fc4haww5qrici06nipfdm"; depends=[diagram mice plspm quantreg]; };
 genridge = derive { name="genridge"; version="0.6-5"; sha256="0ms8n1yrga5qqg9ni41ifyw6320aajyrwvjh6d27q1k96j2dicp4"; depends=[car]; };
 gensemble = derive { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; };
 geoBayes = derive { name="geoBayes"; version="0.2.150402"; sha256="123b2xds69clkgjvczkdbl673cahmiprrr1cki2alspryy37icar"; depends=[coda sp]; };
-geoCount = derive { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp Rcpp RcppArmadillo]; };
-geoR = derive { name="geoR"; version="1.7-5.1"; sha256="10rxlvlsg2avrf63p03a22lnq4ysyc4zq06mxidkjpviwk1kvzqy"; depends=[MASS sp splancs RandomFields]; };
+geoCount = derive { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp RcppArmadillo]; };
+geoR = derive { name="geoR"; version="1.7-5.1"; sha256="10rxlvlsg2avrf63p03a22lnq4ysyc4zq06mxidkjpviwk1kvzqy"; depends=[MASS RandomFields sp splancs]; };
 geoRglm = derive { name="geoRglm"; version="0.9-8"; sha256="1zncqsw62m0p4a1wchhb8xsf0152z2xxk3c4xqdr5wbzxf32jhvh"; depends=[geoR sp]; };
 geocodeHERE = derive { name="geocodeHERE"; version="0.1.2"; sha256="0sr8r6f41bpi0rncjcf0aydda68wnsrbmqzsgc1f1has2rb1g9p0"; depends=[httr]; };
-geojsonio = derive { name="geojsonio"; version="0.1.0"; sha256="17nv7xn80sf2nn6fvmlbnbcgg66n6bh8x725wdfnhk3gg1rb64g5"; depends=[sp rgdal rgeos httr maptools jsonlite magrittr V8]; };
+geojsonio = derive { name="geojsonio"; version="0.1.0"; sha256="17nv7xn80sf2nn6fvmlbnbcgg66n6bh8x725wdfnhk3gg1rb64g5"; depends=[httr jsonlite magrittr maptools rgdal rgeos sp V8]; };
 geomapdata = derive { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
 geometry = derive { name="geometry"; version="0.3-5"; sha256="1x1dhdbqnq1wi1r4njj3l1g8yag2dig19rna3a5pwf1j1gxbl0i8"; depends=[magic]; };
-geomorph = derive { name="geomorph"; version="2.1.5"; sha256="0xys2gwin16h4ahcjy3m49sslypilxlcgrnky19vv4aagrydq776"; depends=[rgl jpeg ape geiger phytools]; };
+geomorph = derive { name="geomorph"; version="2.1.5"; sha256="0xys2gwin16h4ahcjy3m49sslypilxlcgrnky19vv4aagrydq776"; depends=[ape geiger jpeg phytools rgl]; };
 geonames = derive { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; };
-geophys = derive { name="geophys"; version="1.3-8"; sha256="0nw4m30r46892cf1n575jkfjgdjc14wic9xzmzcnskbk8cd50hp2"; depends=[RPMG RSEIS RFOC GEOmap cluster]; };
-georob = derive { name="georob"; version="0.1-5"; sha256="0awcqcpv82pn2z7lgir73pg2b0whvrrfy55gi0jrjn7lzyakhqaq"; depends=[sp constrainedKriging lmtest nlme nleqslv quantreg RandomFields robustbase snowfall]; };
+geophys = derive { name="geophys"; version="1.3-8"; sha256="0nw4m30r46892cf1n575jkfjgdjc14wic9xzmzcnskbk8cd50hp2"; depends=[cluster GEOmap RFOC RPMG RSEIS]; };
+georob = derive { name="georob"; version="0.1-5"; sha256="0awcqcpv82pn2z7lgir73pg2b0whvrrfy55gi0jrjn7lzyakhqaq"; depends=[constrainedKriging lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; };
 geoscale = derive { name="geoscale"; version="2.0"; sha256="0gisds0in32xhw54fxfyxvwxgrfjs871wmqf6l915nr896rlx0bm"; depends=[]; };
-geospacom = derive { name="geospacom"; version="0.5-7"; sha256="00yi2wwnjh2z8xhzfbp1jhh5fhq2z885s0gv937xsin4a63m76fd"; depends=[rgeos classInt sp maptools geosphere]; };
+geospacom = derive { name="geospacom"; version="0.5-7"; sha256="00yi2wwnjh2z8xhzfbp1jhh5fhq2z885s0gv937xsin4a63m76fd"; depends=[classInt geosphere maptools rgeos sp]; };
 geosphere = derive { name="geosphere"; version="1.3-13"; sha256="124l1mfqf4qq5qsa0k3r5hkky9q2m2waq2rp4xcym49wr3jysf6c"; depends=[sp]; };
-geospt = derive { name="geospt"; version="1.0-1"; sha256="1nv5wn8s4vlbyyzi8is7zsa1vrijp1va0vhi8l2yny8fh22qhjij"; depends=[gstat genalg MASS sp minqa limSolve fields gsl plyr TeachingDemos sgeostat]; };
-geostatsp = derive { name="geostatsp"; version="1.2.1"; sha256="0p93b8mmjsqg7qg1c6v7c5ism8jqf7w21rydck7agh4i64q47s7y"; depends=[Matrix raster sp abind numDeriv pracma]; };
+geospt = derive { name="geospt"; version="1.0-1"; sha256="1nv5wn8s4vlbyyzi8is7zsa1vrijp1va0vhi8l2yny8fh22qhjij"; depends=[fields genalg gsl gstat limSolve MASS minqa plyr sgeostat sp TeachingDemos]; };
+geostatsp = derive { name="geostatsp"; version="1.2.1"; sha256="0p93b8mmjsqg7qg1c6v7c5ism8jqf7w21rydck7agh4i64q47s7y"; depends=[abind Matrix numDeriv pracma raster sp]; };
 geotools = derive { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; };
-geotopbricks = derive { name="geotopbricks"; version="1.3.6"; sha256="1c4v590r27lsz2ld2dsi9dv7fsbfklyqgsjvcrbk4di18nc1hygp"; depends=[raster stringr zoo rgdal]; };
+geotopbricks = derive { name="geotopbricks"; version="1.3.6"; sha256="1c4v590r27lsz2ld2dsi9dv7fsbfklyqgsjvcrbk4di18nc1hygp"; depends=[raster rgdal stringr zoo]; };
 geozoo = derive { name="geozoo"; version="0.4.3"; sha256="0nmmmyk0ih5aqpsn7ip4dhgfm7jhcnca8pigyr9794b110icq1rv"; depends=[bitops]; };
 getopt = derive { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz1556xqcmx8nhrlbbhaq4w7gl2ibl87r"; depends=[]; };
 gets = derive { name="gets"; version="0.2"; sha256="0vdg8g588asyzkld9v3rmscx3k727ncxnjzi8qxinlr2zhw9nbcq"; depends=[zoo]; };
 gettingtothebottom = derive { name="gettingtothebottom"; version="3.2"; sha256="1cz2vidh7k346qc38wszs2dg6lvya249hvcsn6zdpbx0c0qs3y72"; depends=[ggplot2 Matrix]; };
-gfcanalysis = derive { name="gfcanalysis"; version="1.2"; sha256="147vgv4z14xn0j94g7z0y099gz8xj2yb02r6j3mfi4412dg5f5fp"; depends=[raster rgdal geosphere RCurl rgeos plyr ggplot2 sp stringr animation rasterVis]; };
+gfcanalysis = derive { name="gfcanalysis"; version="1.2"; sha256="147vgv4z14xn0j94g7z0y099gz8xj2yb02r6j3mfi4412dg5f5fp"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; };
 ggExtra = derive { name="ggExtra"; version="0.1.5.2"; sha256="0lad58245x5gn1yqx65rqpbjwy17yrisns6lqnaw5w1ff5bh7s9i"; depends=[ggplot2]; };
 ggROC = derive { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; };
-ggRandomForests = derive { name="ggRandomForests"; version="1.1.4"; sha256="0h55593mr2x0kvp97rrm1spj17zbr1p9pqrpngsxmp11iahhccqh"; depends=[randomForestSRC ggplot2 survival reshape2]; };
-ggdendro = derive { name="ggdendro"; version="0.1-15"; sha256="1xa1pswkf7xnrxs1zqw71ws0r6r0nmc2gnc76bd372czfdn4npci"; depends=[MASS ggplot2]; };
+ggRandomForests = derive { name="ggRandomForests"; version="1.1.4"; sha256="0h55593mr2x0kvp97rrm1spj17zbr1p9pqrpngsxmp11iahhccqh"; depends=[ggplot2 randomForestSRC reshape2 survival]; };
+ggdendro = derive { name="ggdendro"; version="0.1-15"; sha256="1xa1pswkf7xnrxs1zqw71ws0r6r0nmc2gnc76bd372czfdn4npci"; depends=[ggplot2 MASS]; };
 ggenealogy = derive { name="ggenealogy"; version="0.1.0"; sha256="0shy6ylrx49yccyydhahqk1nnljqgf1cm11fl4cmb44la5zd3wjn"; depends=[ggplot2 igraph plyr reshape2]; };
 gglasso = derive { name="gglasso"; version="1.3"; sha256="0qqp5zak4xsakhydn9cfhpb19n6yidgqj183il1v7yi90qjfyn66"; depends=[]; };
 ggm = derive { name="ggm"; version="2.3"; sha256="1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3"; depends=[igraph]; };
-ggmap = derive { name="ggmap"; version="2.4"; sha256="06mdczacjnlzyr5sm1d099sqyf6anhlnn2bnjxni8h36100m5nm2"; depends=[ggplot2 proto scales RgoogleMaps png plyr reshape2 rjson mapproj jpeg geosphere digest]; };
-ggmcmc = derive { name="ggmcmc"; version="0.6"; sha256="12z0six1swpmisbm8x9a9dk19cd0f9yvzm92gc9qs484ihpcscvq"; depends=[dplyr tidyr ggplot2]; };
-ggparallel = derive { name="ggparallel"; version="0.1.1"; sha256="1z8w4bm4ahmmwbr87qlqhm8jlrqf7dhdvm1cf0xrwjlkmy6dqjvg"; depends=[ggplot2 reshape2 plyr]; };
-ggplot2 = derive { name="ggplot2"; version="1.0.1"; sha256="0794kjqi3lrxb33lr1mykd58959hlgkhdn259vj8fxrh65mqw920"; depends=[plyr digest gtable reshape2 scales proto MASS]; };
+ggmap = derive { name="ggmap"; version="2.4"; sha256="06mdczacjnlzyr5sm1d099sqyf6anhlnn2bnjxni8h36100m5nm2"; depends=[digest geosphere ggplot2 jpeg mapproj plyr png proto reshape2 RgoogleMaps rjson scales]; };
+ggmcmc = derive { name="ggmcmc"; version="0.6"; sha256="12z0six1swpmisbm8x9a9dk19cd0f9yvzm92gc9qs484ihpcscvq"; depends=[dplyr ggplot2 tidyr]; };
+ggparallel = derive { name="ggparallel"; version="0.1.1"; sha256="1z8w4bm4ahmmwbr87qlqhm8jlrqf7dhdvm1cf0xrwjlkmy6dqjvg"; depends=[ggplot2 plyr reshape2]; };
+ggplot2 = derive { name="ggplot2"; version="1.0.1"; sha256="0794kjqi3lrxb33lr1mykd58959hlgkhdn259vj8fxrh65mqw920"; depends=[digest gtable MASS plyr proto reshape2 scales]; };
 ggsubplot = derive { name="ggsubplot"; version="0.3.2"; sha256="1rrq47rf95hnwz8c33sbnpvc37sb6v2w37863hyjl6gc0bhyrvzb"; depends=[ggplot2 plyr proto scales stringr]; };
 ggswissmaps = derive { name="ggswissmaps"; version="0.0.2"; sha256="1cl8m9j3d2kf8dbpq09q36v7nwkgz7khqds431l0kmkzq02qhddf"; depends=[ggplot2]; };
-ggtern = derive { name="ggtern"; version="1.0.5.0"; sha256="0ykgz3268381glkrv1gbn9qnyrkxsmihc3srv8zrldbq18zbr0a8"; depends=[ggplot2 plyr gtable scales reshape2 proto MASS sp]; };
-ggthemes = derive { name="ggthemes"; version="2.1.2"; sha256="049fjk0f960sjsnqns2kgk7dvr6jr5rrpxgl8qbxx4idz95bvdi7"; depends=[ggplot2 colorspace proto scales]; };
-ggvis = derive { name="ggvis"; version="0.4.2"; sha256="07arzhczvh2sgqv9h30n32s6l2a3rc98rid2fpz6kp7vlin2pk1g"; depends=[assertthat jsonlite shiny magrittr dplyr lazyeval htmltools]; };
-ghyp = derive { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ijhmzyz4qsmy7vfijlilkz0ynn20"; depends=[numDeriv gplots]; };
+ggtern = derive { name="ggtern"; version="1.0.5.0"; sha256="0ykgz3268381glkrv1gbn9qnyrkxsmihc3srv8zrldbq18zbr0a8"; depends=[ggplot2 gtable MASS plyr proto reshape2 scales sp]; };
+ggthemes = derive { name="ggthemes"; version="2.1.2"; sha256="049fjk0f960sjsnqns2kgk7dvr6jr5rrpxgl8qbxx4idz95bvdi7"; depends=[colorspace ggplot2 proto scales]; };
+ggvis = derive { name="ggvis"; version="0.4.2"; sha256="07arzhczvh2sgqv9h30n32s6l2a3rc98rid2fpz6kp7vlin2pk1g"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; };
+ghyp = derive { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ijhmzyz4qsmy7vfijlilkz0ynn20"; depends=[gplots numDeriv]; };
 giRaph = derive { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; };
 gibbs_met = derive { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; };
 gimme = derive { name="gimme"; version="0.1-1"; sha256="1snzlwq6d86ygpn778m3inlfqpymp0l05pdlrdkm8ip4wgir0hvs"; depends=[lavaan qgraph]; };
-gistr = derive { name="gistr"; version="0.2.0"; sha256="1812qh3f4nwbpqaiq4gfkalfckwqvn84j7v7qfj69gd4jzxcwywz"; depends=[jsonlite httr magrittr assertthat knitr rmarkdown dplyr]; };
+gistr = derive { name="gistr"; version="0.2.0"; sha256="1812qh3f4nwbpqaiq4gfkalfckwqvn84j7v7qfj69gd4jzxcwywz"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; };
 git2r = derive { name="git2r"; version="0.10.1"; sha256="1damlhxf3ma0flqw4am42wj2dxk3m232wh0wpl1ikgx0dcfn9l8f"; depends=[]; };
-gitter = derive { name="gitter"; version="1.0.4"; sha256="1pvl8k8mb15mcfz1074y246s9basmi5vbpw2n1ca0d8wm5wdidap"; depends=[jpeg tiff logging PET ggplot2]; };
+gitter = derive { name="gitter"; version="1.0.4"; sha256="1pvl8k8mb15mcfz1074y246s9basmi5vbpw2n1ca0d8wm5wdidap"; depends=[EBImage ggplot2 jpeg logging PET tiff]; };
 glarma = derive { name="glarma"; version="1.3-0"; sha256="0fp354zxkddc4giynhwjlf9mg4sklcmqi0gdn8nxm1pkdpb86rba"; depends=[MASS]; };
 glasso = derive { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; };
-glassomix = derive { name="glassomix"; version="1.2"; sha256="13a2ly0by58z8djq8nbakpyacgb6nkdsqxjq44yw4v2fy3s22z3n"; depends=[mvtnorm glasso huge]; };
+glassomix = derive { name="glassomix"; version="1.2"; sha256="13a2ly0by58z8djq8nbakpyacgb6nkdsqxjq44yw4v2fy3s22z3n"; depends=[glasso huge mvtnorm]; };
 glba = derive { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; };
-glcm = derive { name="glcm"; version="1.2"; sha256="00bkhd4arvg7ahdr5kfvran46b2sywv9i0rlwalx9pmyvjwnzm5b"; depends=[Rcpp Rcpp RcppArmadillo]; };
+glcm = derive { name="glcm"; version="1.2"; sha256="00bkhd4arvg7ahdr5kfvran46b2sywv9i0rlwalx9pmyvjwnzm5b"; depends=[Rcpp RcppArmadillo]; };
 gld = derive { name="gld"; version="2.2.1"; sha256="1x9xlqj87xmk90hn20k1yvnvyndxdbi67yrxrfdhr3lhxabq5msw"; depends=[]; };
 gldist = derive { name="gldist"; version="2160.2"; sha256="1dcf3pb4xqvhqj4m3xc3ihzjbzxjspjrnc8819hmlnmdd0csghmx"; depends=[]; };
 glinternet = derive { name="glinternet"; version="1.0.0"; sha256="0aa75xq2w64iknbyl6qw9ckk8v64a96xz0ar1mbqd8zhx0xvibyy"; depends=[]; };
@@ -3794,32 +3808,32 @@ gllm = derive { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2i
 glm2 = derive { name="glm2"; version="1.1.2"; sha256="1x9pq2ddsz9al8w044qch34s3fahca63dz85lvm5qn16945ccw1s"; depends=[]; };
 glmc = derive { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjijlcwsn5lijg0nsr4hd6gxw29cla"; depends=[emplik]; };
 glmdm = derive { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; };
-glmgraph = derive { name="glmgraph"; version="1.0.1"; sha256="1jzkz2lri7nbxxkryhf95503wd651ic59h6iafkx9ahwpmibyv4l"; depends=[Rcpp Rcpp RcppArmadillo]; };
+glmgraph = derive { name="glmgraph"; version="1.0.1"; sha256="1jzkz2lri7nbxxkryhf95503wd651ic59h6iafkx9ahwpmibyv4l"; depends=[Rcpp RcppArmadillo]; };
 glmlep = derive { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; };
-glmm = derive { name="glmm"; version="1.0.3"; sha256="0bs543x9czg8mbgpy0zhgnfll2nrmj8xz5kwkddf3k6hp859h0v8"; depends=[trust mvtnorm Matrix]; };
-glmmBUGS = derive { name="glmmBUGS"; version="2.3"; sha256="1j96c1c2lqplhjvyigpj494yxj85bpmc7cnd1hl1rc8b552jr192"; depends=[MASS abind]; };
+glmm = derive { name="glmm"; version="1.0.3"; sha256="0bs543x9czg8mbgpy0zhgnfll2nrmj8xz5kwkddf3k6hp859h0v8"; depends=[Matrix mvtnorm trust]; };
+glmmBUGS = derive { name="glmmBUGS"; version="2.3"; sha256="1j96c1c2lqplhjvyigpj494yxj85bpmc7cnd1hl1rc8b552jr192"; depends=[abind MASS]; };
 glmmGS = derive { name="glmmGS"; version="0.5-1"; sha256="1aqyxw3nrjri8k8wlwvddy25dj7mjqndssd5p5arax8vaqgrdnjz"; depends=[]; };
 glmmLasso = derive { name="glmmLasso"; version="1.3.4"; sha256="14x74640vvyrg72pq19gqb8db7wq97xhc30iakh84fdh1llyykpn"; depends=[minqa]; };
 glmmML = derive { name="glmmML"; version="1.0"; sha256="0b1q5mj325xga3lfks28r03363bjfa31rlgjzwk4s0a6g21bdl4a"; depends=[]; };
-glmnet = derive { name="glmnet"; version="2.0-2"; sha256="1nfbh1y41ly09lcdb5z02dy8l4qkll21yicmwg25wlkzk5sxb3z3"; depends=[Matrix foreach]; };
+glmnet = derive { name="glmnet"; version="2.0-2"; sha256="1nfbh1y41ly09lcdb5z02dy8l4qkll21yicmwg25wlkzk5sxb3z3"; depends=[foreach Matrix]; };
 glmnetcr = derive { name="glmnetcr"; version="1.0.2"; sha256="1pyg23hdqksiaqdcrsaqz9vb7mgclm41hh0vb7ndkdv284bzzlbz"; depends=[glmnet]; };
 glmpath = derive { name="glmpath"; version="0.97"; sha256="054v188ffjl6x11cld5s9py22kxcs0iq58x4yhxb0ny7mbma5hkn"; depends=[survival]; };
 glmpathcr = derive { name="glmpathcr"; version="1.0.3"; sha256="0qa63c7kwpxf6smczgzf4fmvczw1ynqq5vgcw3bxdbs37q4ypj8n"; depends=[glmpath mvtnorm]; };
 glmulti = derive { name="glmulti"; version="1.0.7"; sha256="154s72sjp6pz7ki7s4mgn5v62j7h0lfz9mngf40wvmy31da2s8ix"; depends=[rJava]; };
-glmvsd = derive { name="glmvsd"; version="1.2"; sha256="0p99sanr95vcjfyjx7khwd1l59d319j1i49iv3isgsh3fwikhpgf"; depends=[glmnet ncvreg MASS]; };
-glmx = derive { name="glmx"; version="0.1-0"; sha256="0i0p1xk5yk1l274gfr4ijmqnnbq7yyzmi577pb7igwvi3hjn7g7k"; depends=[MASS Formula lmtest sandwich]; };
+glmvsd = derive { name="glmvsd"; version="1.2"; sha256="0p99sanr95vcjfyjx7khwd1l59d319j1i49iv3isgsh3fwikhpgf"; depends=[glmnet MASS ncvreg]; };
+glmx = derive { name="glmx"; version="0.1-0"; sha256="0i0p1xk5yk1l274gfr4ijmqnnbq7yyzmi577pb7igwvi3hjn7g7k"; depends=[Formula lmtest MASS sandwich]; };
 globalGSA = derive { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; };
 globalOptTests = derive { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; };
 globalboosttest = derive { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; };
 globals = derive { name="globals"; version="0.3.1"; sha256="1fjbs75m07r8gvj5pjqj8dv1xm558h4g2cpg5l1psqzs567gkcxv"; depends=[codetools]; };
-glogis = derive { name="glogis"; version="1.0-0"; sha256="19h0d3x5lcjipkdvx4ppq5lyj2xzizayidx0gjg9ggb1qljpyw9m"; depends=[zoo sandwich]; };
+glogis = derive { name="glogis"; version="1.0-0"; sha256="19h0d3x5lcjipkdvx4ppq5lyj2xzizayidx0gjg9ggb1qljpyw9m"; depends=[sandwich zoo]; };
 glpkAPI = derive { name="glpkAPI"; version="1.3.0"; sha256="0173wljx13jali2jxz4k5za89hc64n2j9djz5bcryrqhq4rmkp87"; depends=[]; };
 glrt = derive { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; };
-gmailr = derive { name="gmailr"; version="0.6.0"; sha256="1l0lnlq5vrxrab8d9b5hwm8krg8zgx8f8m0kfnryyyrqkjrksky5"; depends=[httr base64enc magrittr jsonlite mime]; };
+gmailr = derive { name="gmailr"; version="0.6.0"; sha256="1l0lnlq5vrxrab8d9b5hwm8krg8zgx8f8m0kfnryyyrqkjrksky5"; depends=[base64enc httr jsonlite magrittr mime]; };
 gmatrix = derive { name="gmatrix"; version="0.2"; sha256="1w83m6q8xflifqqgkkg2my4fkjfjyv0qq4ly8yqk12k77lb03hxq"; depends=[]; };
 gmm = derive { name="gmm"; version="1.5-2"; sha256="1phd8mmfyhjb72a45gavckb3g8qi927hdq0i8c7iw1d28f04lc70"; depends=[sandwich]; };
-gmnl = derive { name="gmnl"; version="1.1"; sha256="1dz7fhacys88hpf13pbqc9ba37qhwspq7j5zqfy1bg4py1hsx1q7"; depends=[maxLik Formula plotrix msm mlogit truncnorm]; };
-gmodels = derive { name="gmodels"; version="2.15.4.1"; sha256="1yizjw181bg0ml6j96calflz3k3wpvpxh61hfd3pdba013ixjib5"; depends=[MASS gdata]; };
+gmnl = derive { name="gmnl"; version="1.1"; sha256="1dz7fhacys88hpf13pbqc9ba37qhwspq7j5zqfy1bg4py1hsx1q7"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; };
+gmodels = derive { name="gmodels"; version="2.15.4.1"; sha256="1yizjw181bg0ml6j96calflz3k3wpvpxh61hfd3pdba013ixjib5"; depends=[gdata MASS]; };
 gmp = derive { name="gmp"; version="0.5-12"; sha256="10fpvcli526a8j6jaryn0mwk78c24xy7whdpcvqzzvb41l6nnkma"; depends=[]; };
 gmt = derive { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; };
 gnm = derive { name="gnm"; version="1.0-8"; sha256="1581lzkb1v3y0arrq7x1bg7c91cii87bifxcdi1jzyc5rxj261la"; depends=[MASS Matrix nnet qvcalc relimp]; };
@@ -3829,79 +3843,79 @@ goalprog = derive { name="goalprog"; version="1.0-2"; sha256="1h3nd3d53hbz5hl349
 gof = derive { name="gof"; version="0.9.1"; sha256="1s12gga9d6yizn2y7lzql4jd80lp5jpyml8ybn7xqswp8am82vpg"; depends=[]; };
 goft = derive { name="goft"; version="1.1"; sha256="19mb2i2iri09v2dgkyl1ral2m7bzyizncnz24niwg13afpwbq12h"; depends=[gPdtest mvShapiroTest]; };
 goftest = derive { name="goftest"; version="1.0-2"; sha256="11xw0cfj71z5smywsds9ijbhf3glxkqnhxmwwdqkv4gjrrr2y1bv"; depends=[]; };
-gogarch = derive { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fGarch fastICA]; };
+gogarch = derive { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fastICA fGarch]; };
 gooJSON = derive { name="gooJSON"; version="1.0.01"; sha256="02sldh5lsrjprc9mbf99jyid7ij62db5f1h60z719gxl4pk6fjms"; depends=[rjson]; };
 googleVis = derive { name="googleVis"; version="0.5.8"; sha256="185pp2sgdw81p9vjkxzx4nrv9fp9jw24mqng7k98ql98p3kw9y21"; depends=[RJSONIO]; };
-goric = derive { name="goric"; version="0.0-8"; sha256="0ayac0yfkxrl13ckc2pwfqnmsrhmbg5bi6iwzx0fmh81vrlp0zrm"; depends=[nlme quadprog mvtnorm MASS Matrix]; };
+goric = derive { name="goric"; version="0.0-8"; sha256="0ayac0yfkxrl13ckc2pwfqnmsrhmbg5bi6iwzx0fmh81vrlp0zrm"; depends=[MASS Matrix mvtnorm nlme quadprog]; };
 govStatJPN = derive { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; };
-gpairs = derive { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode lattice vcd MASS colorspace]; };
+gpairs = derive { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode colorspace lattice MASS vcd]; };
 gpclib = derive { name="gpclib"; version="1.5-5"; sha256="08j81b8wymsgin20n54gvm6m54rmdic51p6qzs9cz4pmgl7dkkjv"; depends=[]; };
 gpk = derive { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; };
 gplm = derive { name="gplm"; version="0.7-2"; sha256="0pr39fbkv61iwd110lq76p2fi4dvx9qz6mjsvg6bpja9pfbb6wc0"; depends=[AER]; };
-gplots = derive { name="gplots"; version="2.17.0"; sha256="0dyysysl595khv00m4h68s7zx7xlfnpxzfkc49av1s3fc58bvmr5"; depends=[gtools gdata caTools KernSmooth]; };
-gpmap = derive { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[isotone plyr ggplot2 foreach]; };
+gplots = derive { name="gplots"; version="2.17.0"; sha256="0dyysysl595khv00m4h68s7zx7xlfnpxzfkc49av1s3fc58bvmr5"; depends=[caTools gdata gtools KernSmooth]; };
+gpmap = derive { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[foreach ggplot2 isotone plyr]; };
 gpr = derive { name="gpr"; version="1.1"; sha256="03ywik11kc6cnaqrzzzi94jkrdbd378m3sf26f2vpb7d834nl728"; depends=[]; };
-gptk = derive { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[Matrix fields]; };
+gptk = derive { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; };
 gputools = derive { name="gputools"; version="0.28"; sha256="0ria03ggcfqgn93gjv2anhvkd3k73c6vfwgka16kf66g1nfzxs4l"; depends=[]; };
 grImport = derive { name="grImport"; version="0.9-0"; sha256="1d8fd7502qj7cirjqdkr1qj51rylw2fz5hs06avfvc2dxs2xwfw1"; depends=[XML]; };
 grade = derive { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; };
 gramEvol = derive { name="gramEvol"; version="2.0-2"; sha256="1xrn5gkr9rxw53i5l2sqcgai9q0w4kyrychf0nq17cvcynw1y1lx"; depends=[]; };
 granova = derive { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; };
-granovaGG = derive { name="granovaGG"; version="1.3"; sha256="1bsxad2h7rmbkmmg5zx6wbpws62dmp7n905gnp17n8cl8c6w2jp9"; depends=[ggplot2 RColorBrewer plyr gridExtra reshape2]; };
-graphicalVAR = derive { name="graphicalVAR"; version="0.1.2"; sha256="0vc2x58z4w1hhvkqpxya3wr78p2b1irfyivc7njxw8a2595rc347"; depends=[Rcpp Matrix glasso glmnet mvtnorm qgraph Rcpp RcppArmadillo]; };
+granovaGG = derive { name="granovaGG"; version="1.3"; sha256="1bsxad2h7rmbkmmg5zx6wbpws62dmp7n905gnp17n8cl8c6w2jp9"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; };
+graphicalVAR = derive { name="graphicalVAR"; version="0.1.2"; sha256="0vc2x58z4w1hhvkqpxya3wr78p2b1irfyivc7njxw8a2595rc347"; depends=[glasso glmnet Matrix mvtnorm qgraph Rcpp RcppArmadillo]; };
 graphicsQC = derive { name="graphicsQC"; version="1.0-6"; sha256="07kzz0r8rh4m7qqxnlab0d4prr56jz5kspx782byspkcm5l4xrsl"; depends=[XML]; };
-graphscan = derive { name="graphscan"; version="1.0"; sha256="15kdpp2k2gpfr8qq6wr08gva5hlxqha2h48zi1j3p6r766j07082"; depends=[ape sp snowfall rgl]; };
-greport = derive { name="greport"; version="0.5-3"; sha256="0cd7rqzrk1yb22ksbmva1fl9k388bxxm586c20j8k8z5zympi9g1"; depends=[Hmisc data_table rms lattice latticeExtra ggplot2 Formula survival]; };
-greyzoneSurv = derive { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[survival Hmisc survAUC]; };
+graphscan = derive { name="graphscan"; version="1.0"; sha256="15kdpp2k2gpfr8qq6wr08gva5hlxqha2h48zi1j3p6r766j07082"; depends=[ape rgl snowfall sp]; };
+greport = derive { name="greport"; version="0.5-3"; sha256="0cd7rqzrk1yb22ksbmva1fl9k388bxxm586c20j8k8z5zympi9g1"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; };
+greyzoneSurv = derive { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; };
 gridBase = derive { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
 gridDebug = derive { name="gridDebug"; version="0.4-0"; sha256="1nbcdjip6ghnlv0j7cf45bpqdpirwn636pg324f0hgiqj4rifn09"; depends=[gridGraphviz gridSVG]; };
 gridExtra = derive { name="gridExtra"; version="0.9.1"; sha256="15pj5w5wlrf8gw4z01i9j88gk6bm4kni64fpip9icmxkn887y3hx"; depends=[]; };
 gridGraphics = derive { name="gridGraphics"; version="0.1-3"; sha256="09ml9vy4lz0q235xy2m5l8qd3rb3r73gf3bwz35dgn7qcxps8jjp"; depends=[]; };
-gridGraphviz = derive { name="gridGraphviz"; version="0.1"; sha256="14zcr0w2c9cgdw6ij93w52k3bkmgdmx809snh9jjf2amy08p2gbg"; depends=[]; };
+gridGraphviz = derive { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; };
 gridSVG = derive { name="gridSVG"; version="1.4-3"; sha256="1jgrhckjbvccp5zqbkkiw9glhdljwxlc8kkr1fgkbrwmsi053iwk"; depends=[RJSONIO XML]; };
 grnn = derive { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; };
-groc = derive { name="groc"; version="1.0.5"; sha256="1kqcdyq1y80gd62jpn38yz6q1qmg84b7k8qcniip5h948vfzkddg"; depends=[rrcov pls mgcv robust robustbase MASS]; };
+groc = derive { name="groc"; version="1.0.5"; sha256="1kqcdyq1y80gd62jpn38yz6q1qmg84b7k8qcniip5h948vfzkddg"; depends=[MASS mgcv pls robust robustbase rrcov]; };
 grofit = derive { name="grofit"; version="1.1.1-1"; sha256="1rnym5fxbg3bin2idmymrwvf1fcd646bipbgjd6wby8my69zy4c5"; depends=[]; };
-gromovlab = derive { name="gromovlab"; version="0.6-16"; sha256="0ndi4i91fnndvpp3xmr405a62vq5gjagw2qrvcmq1q6cgg7bj17q"; depends=[igraph phangorn glpkAPI quadprog cluster]; };
+gromovlab = derive { name="gromovlab"; version="0.6-16"; sha256="0ndi4i91fnndvpp3xmr405a62vq5gjagw2qrvcmq1q6cgg7bj17q"; depends=[cluster glpkAPI igraph phangorn quadprog]; };
 groupRemMap = derive { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; };
 grouped = derive { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; };
-growcurves = derive { name="growcurves"; version="0.2.3.9"; sha256="1f8hh8ppp6bgrb8crm46xrria3vdnz62aya9lhwcdaggfmy7j25l"; depends=[Rcpp RcppArmadillo reshape2 scales ggplot2 Formula testthat Rcpp RcppArmadillo]; };
-growfunctions = derive { name="growfunctions"; version="0.11"; sha256="087qpykjj46a5zp48dx59k51mdyqckc39zgmrnhc5rhgm5df8sv3"; depends=[Rcpp Matrix spam mvtnorm ggplot2 reshape2 scales Rcpp RcppArmadillo]; };
+growcurves = derive { name="growcurves"; version="0.2.3.9"; sha256="1f8hh8ppp6bgrb8crm46xrria3vdnz62aya9lhwcdaggfmy7j25l"; depends=[Formula ggplot2 Rcpp RcppArmadillo reshape2 scales testthat]; };
+growfunctions = derive { name="growfunctions"; version="0.11"; sha256="087qpykjj46a5zp48dx59k51mdyqckc39zgmrnhc5rhgm5df8sv3"; depends=[ggplot2 Matrix mvtnorm Rcpp RcppArmadillo reshape2 scales spam]; };
 growthmodels = derive { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; };
-growthrate = derive { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[Matrix clime mvtnorm]; };
+growthrate = derive { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[clime Matrix mvtnorm]; };
 grplasso = derive { name="grplasso"; version="0.4-5"; sha256="15bqckq9qjdlllhfpb21vzgi9msbl544alkrz01w1vvb3hk1847y"; depends=[]; };
 grppenalty = derive { name="grppenalty"; version="2.1-0"; sha256="12hbghmg96dwlscjy6nspgkmqqj4vwq2qcwcz1gp50a08qbmdcrk"; depends=[]; };
 grpreg = derive { name="grpreg"; version="2.8-1"; sha256="0n6j4mx2f0khdqz7c7yhmsh6gcxha2ypknqa421qir1nvp0x57c9"; depends=[Matrix]; };
-grt = derive { name="grt"; version="0.2"; sha256="0cqjk7yqk2ryx1pgvjd3x8l25hqv92p8rvdr7xw4jkzillllwmhz"; depends=[MASS rgl misc3d]; };
-gsDesign = derive { name="gsDesign"; version="2.9-3"; sha256="0dd96hciiksf436lpm1q35in06b82p4h09spklf28n0p5hgc9225"; depends=[ggplot2 xtable stringr RUnit plyr]; };
+grt = derive { name="grt"; version="0.2"; sha256="0cqjk7yqk2ryx1pgvjd3x8l25hqv92p8rvdr7xw4jkzillllwmhz"; depends=[MASS misc3d rgl]; };
+gsDesign = derive { name="gsDesign"; version="2.9-3"; sha256="0dd96hciiksf436lpm1q35in06b82p4h09spklf28n0p5hgc9225"; depends=[ggplot2 plyr RUnit stringr xtable]; };
 gsalib = derive { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; };
 gsarima = derive { name="gsarima"; version="0.1-4"; sha256="1ay3iamnvg7mbnl1xaxxcyic559bdnfspy883w2bwgy20yhr34yg"; depends=[MASS]; };
 gsbDesign = derive { name="gsbDesign"; version="0.96-2"; sha256="0sk4a66z9bqi3aa2ky9472p9znfm93kc9p5igdmvii4dr0syyfxd"; depends=[gsDesign lattice]; };
-gset = derive { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc mvtnorm MCMCpack]; };
-gsg = derive { name="gsg"; version="2.0"; sha256="17fjl7aw1s814krnszxd4y1d4210bnkrf4kb2fwsycqwcwms5pm7"; depends=[mgcv mvtnorm boot numDeriv]; };
+gset = derive { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc MCMCpack mvtnorm]; };
+gsg = derive { name="gsg"; version="2.0"; sha256="17fjl7aw1s814krnszxd4y1d4210bnkrf4kb2fwsycqwcwms5pm7"; depends=[boot mgcv mvtnorm numDeriv]; };
 gsheet = derive { name="gsheet"; version="0.1.0"; sha256="02mclvkq9lpp57ii8k3wj8cqjii9zsg4nl4i7zsa8b88r2bjmf9r"; depends=[dplyr rvest stringr]; };
 gskat = derive { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; };
 gsl = derive { name="gsl"; version="1.9-10"; sha256="06n21p0k2ki6nb725a6sxwlb4p7xc5jhg11nq9c3z3dj39r0qgbd"; depends=[]; };
 gsmoothr = derive { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; };
 gss = derive { name="gss"; version="2.1-4"; sha256="0vmyz3q7b2chzmvrwx6bk2yj5kmaxym6lznyrddxgf7xzjipvlii"; depends=[]; };
 gsscopu = derive { name="gsscopu"; version="0.9-2"; sha256="0hg2ry9rhnn51g368fg1zxswx826y3m0yn2wjb2g5rw4a4zn1frr"; depends=[gss]; };
-gstat = derive { name="gstat"; version="1.0-23"; sha256="0as4afwlwzmi37k8sbm0kssin8mikrny88smb71c0wf616yba4xi"; depends=[lattice sp zoo spacetime FNN]; };
+gstat = derive { name="gstat"; version="1.0-23"; sha256="0as4afwlwzmi37k8sbm0kssin8mikrny88smb71c0wf616yba4xi"; depends=[FNN lattice sp spacetime zoo]; };
 gsubfn = derive { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"; depends=[proto]; };
 gsw = derive { name="gsw"; version="1.0-3"; sha256="0ca3h567r23bdldic7labk1vbz8hhslw568lacbdcikm8q16hk72"; depends=[]; };
 gtable = derive { name="gtable"; version="0.1.2"; sha256="0k9hfj6r5y238gqh92s3cbdn34biczx3zfh79ix5xq0c5vkai2xh"; depends=[]; };
 gtcorr = derive { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; };
 gte = derive { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rdi4cqy28qhsfr2dwvxzxchl6h"; depends=[survival]; };
 gtools = derive { name="gtools"; version="3.5.0"; sha256="1xknwk9xlsj027pg0nwiizigcrsc84hdrig0jn0cgcyxj8dabdl6"; depends=[]; };
-gtop = derive { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts quadprog lassoshooting]; };
+gtop = derive { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; };
 gtx = derive { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; };
 gumbel = derive { name="gumbel"; version="1.05"; sha256="0d7isx7bhvryhaa25kxb4fm58ph81xaqscj19aaqzs8yg79ac2ar"; depends=[]; };
 gvc = derive { name="gvc"; version="0.2.0"; sha256="0d7plcd5yy6xw1i6dvh2df8jg6fcyfd6kjypbflppnbl5n1zab12"; depends=[decompr]; };
-gvcm_cat = derive { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[Matrix MASS mgcv]; };
+gvcm_cat = derive { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[MASS Matrix mgcv]; };
 gvlma = derive { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz7a3sbzlbj41ksxchnnlxaxipdf6sl8"; depends=[]; };
 gwerAM = derive { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; };
 gwrr = derive { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; };
-h2o = derive { name="h2o"; version="2.8.4.4"; sha256="03mj2p5wsgdn0jnv1fsrj7012v2am0mvyayj24zp7q56sfsgxigf"; depends=[statmod survival RCurl rjson]; };
-h5 = derive { name="h5"; version="0.9.1"; sha256="1q20i5hnfzr88kb63yvvgn7z39cvk514fj2770i29lm71jdph00q"; depends=[Rcpp Rcpp]; };
+h2o = derive { name="h2o"; version="3.0.0.22"; sha256="0vgm0dn0jgwpg0ak4x62ib8ai891vqqah0fx8sb3kxr0kxy1q0hw"; depends=[RCurl rjson statmod]; };
+h5 = derive { name="h5"; version="0.9.1"; sha256="1q20i5hnfzr88kb63yvvgn7z39cvk514fj2770i29lm71jdph00q"; depends=[Rcpp]; };
 hSDM = derive { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; };
 haarfisz = derive { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; };
 hamlet = derive { name="hamlet"; version="0.7"; sha256="0f3gl5xvgdksaxk76dyv46hahc41f2j3pf9wp0rc0q7wpp5nfsjl"; depends=[]; };
@@ -3909,27 +3923,27 @@ hapassoc = derive { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6p
 haplo_ccs = derive { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; };
 haplo_stats = derive { name="haplo.stats"; version="1.6.11"; sha256="0j3zh4n2rly8dij8srm8ck6fl63haw6d27m3nfnrxywr87pljg14"; depends=[]; };
 haplotypes = derive { name="haplotypes"; version="1.0"; sha256="0pwihfi6g4jrnkha9s9rksq0fc8j04mlrwf0295rmy49y19rg84s"; depends=[network]; };
-harvestr = derive { name="harvestr"; version="0.6.0"; sha256="1jg4d98bwx2cm3hliayqrazq43sa9kd9ynpaid6x4ld3mz5y8mlq"; depends=[plyr digest]; };
+harvestr = derive { name="harvestr"; version="0.6.0"; sha256="1jg4d98bwx2cm3hliayqrazq43sa9kd9ynpaid6x4ld3mz5y8mlq"; depends=[digest plyr]; };
 hash = derive { name="hash"; version="2.2.6"; sha256="0mkx59bmni3b283znvbndnkbar85fzavzdfgmwrhskidsqcz34yz"; depends=[]; };
 hashFunction = derive { name="hashFunction"; version="1.0"; sha256="1v57xj8xwv6xhxvgp0zxgvs5vcjw8z5k2ciwbn0jxf4ilyd66cgj"; depends=[]; };
-hasseDiagram = derive { name="hasseDiagram"; version="0.1.1"; sha256="1szj5pi9i5ijqakxx4vwvwpz7y76jbgcgm76vfg4cnxvndf7sf4l"; depends=[]; };
-haven = derive { name="haven"; version="0.2.0"; sha256="1ww55ciibq62bix3pdwabpycxv1dh01zsrf0vb6jxxh1idxbm5hg"; depends=[Rcpp Rcpp BH]; };
-hawkes = derive { name="hawkes"; version="0.0-4"; sha256="1ghwq3icxwmrai3xn9r8cnvlh3z3j18lznhw1bm31h9mkkp2dk0a"; depends=[Rcpp Rcpp RcppArmadillo]; };
+hasseDiagram = derive { name="hasseDiagram"; version="0.1.1"; sha256="1szj5pi9i5ijqakxx4vwvwpz7y76jbgcgm76vfg4cnxvndf7sf4l"; depends=[Rgraphviz]; };
+haven = derive { name="haven"; version="0.2.0"; sha256="1ww55ciibq62bix3pdwabpycxv1dh01zsrf0vb6jxxh1idxbm5hg"; depends=[BH Rcpp]; };
+hawkes = derive { name="hawkes"; version="0.0-4"; sha256="1ghwq3icxwmrai3xn9r8cnvlh3z3j18lznhw1bm31h9mkkp2dk0a"; depends=[Rcpp RcppArmadillo]; };
 hazus = derive { name="hazus"; version="0.1"; sha256="1c0ahjdy9di1683nk5k4rmr6rhb66523ny039nyv842rgqdy625j"; depends=[reshape2]; };
 hbim = derive { name="hbim"; version="1.0.3"; sha256="1480nydsi2xj7zbfk4zw24mhsjadf83d827kpqzbmn0yh6srp3ps"; depends=[mvtnorm]; };
-hbm = derive { name="hbm"; version="1.0"; sha256="0qz28azm91a6pbss1mfc47a21d3q9rs3mmw0kgwc7i2a2m43mysm"; depends=[Matrix foreach doParallel]; };
+hbm = derive { name="hbm"; version="1.0"; sha256="0qz28azm91a6pbss1mfc47a21d3q9rs3mmw0kgwc7i2a2m43mysm"; depends=[doParallel foreach Matrix]; };
 hbmem = derive { name="hbmem"; version="0.3"; sha256="0ylxp77ack874sadwfnry84a6bg8gdl9xbw821lp5q05nnyg0dcj"; depends=[]; };
-hbsae = derive { name="hbsae"; version="1.0"; sha256="1iwmpi0pn5fxyxkwqkbmy6w1f1wcx0p809jnviim0ypwib32mhh7"; depends=[Matrix arm]; };
+hbsae = derive { name="hbsae"; version="1.0"; sha256="1iwmpi0pn5fxyxkwqkbmy6w1f1wcx0p809jnviim0ypwib32mhh7"; depends=[arm Matrix]; };
 hcc = derive { name="hcc"; version="0.54"; sha256="14b3pamkywb0wsjpbm0wpflcds0b5mfymvgk92rmf6ngz1bkpdbq"; depends=[]; };
 hcci = derive { name="hcci"; version="1.0.0"; sha256="11piy1ajg3j3dbh66szzf7lhc3x28fz75ai39vlx0gl5nc2v5zs5"; depends=[]; };
 hcp = derive { name="hcp"; version="0.1"; sha256="0hhcy70g13kclxv733kgiys7qn5bi28abpkli5n2vj0a58ac333m"; depends=[]; };
 hda = derive { name="hda"; version="0.2-12"; sha256="11z9p35dvhi7bdw09d2yawh46nxk8axw76b51vk089g12nr2b9x7"; depends=[e1071]; };
-hddplot = derive { name="hddplot"; version="0.56"; sha256="0s9iijwq8zfvavqq2bkqm2884sg0957ppkggsv6mmm3cbdi2xrlc"; depends=[MASS]; };
-hddtools = derive { name="hddtools"; version="0.2.4"; sha256="001cm07jvbxzsp64mkjymnsncyrd6r1nxwhjqkk2mb5ldz0541ir"; depends=[sp rgdal raster RCurl XML zoo]; };
+hddplot = derive { name="hddplot"; version="0.56"; sha256="0s9iijwq8zfvavqq2bkqm2884sg0957ppkggsv6mmm3cbdi2xrlc"; depends=[MASS multtest]; };
+hddtools = derive { name="hddtools"; version="0.2.4"; sha256="001cm07jvbxzsp64mkjymnsncyrd6r1nxwhjqkk2mb5ldz0541ir"; depends=[raster RCurl rgdal sp XML zoo]; };
 hdeco = derive { name="hdeco"; version="0.4.1"; sha256="04nggwckvn1kwi238qd33l4pryzn4aq5bmi30bvfi99gwnrlgfgq"; depends=[]; };
 hdi = derive { name="hdi"; version="0.1-2"; sha256="19lc2h34jlj198gchnhbfbb8igwlan2b977a47j8p3q6haj5bcv1"; depends=[glmnet linprog MASS scalreg]; };
-hdlm = derive { name="hdlm"; version="1.2"; sha256="0s4lzg3s2k7f7byygb11s7f78l3rkkb0zn03kh3d7h8250wg9fax"; depends=[glmnet foreach MASS iterators]; };
-hdrcde = derive { name="hdrcde"; version="3.1"; sha256="027nxpzk1g0yx8rns7npdz30afs5hwpdqjiamc7yjrsi0rzm71lw"; depends=[mvtnorm locfit ash ks KernSmooth]; };
+hdlm = derive { name="hdlm"; version="1.2"; sha256="0s4lzg3s2k7f7byygb11s7f78l3rkkb0zn03kh3d7h8250wg9fax"; depends=[foreach glmnet iterators MASS]; };
+hdrcde = derive { name="hdrcde"; version="3.1"; sha256="027nxpzk1g0yx8rns7npdz30afs5hwpdqjiamc7yjrsi0rzm71lw"; depends=[ash KernSmooth ks locfit mvtnorm]; };
 heatex = derive { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; };
 heatmap_plus = derive { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; };
 heatmap3 = derive { name="heatmap3"; version="1.1.1"; sha256="14zkij0gr9awzic71k2j7pniamkywfvwrifdk7jbds70zsi30ph5"; depends=[fastcluster]; };
@@ -3942,14 +3956,14 @@ hergm = derive { name="hergm"; version="2.2-2"; sha256="0jshhf57kybrayk94vv7p1sj
 heritability = derive { name="heritability"; version="1.1"; sha256="05vcprf3rk65197njnhw7n5l19hvy7hfp4fdigkwzvch4rnicidf"; depends=[MASS]; };
 hermite = derive { name="hermite"; version="1.1.0"; sha256="184f7iixsmpli5hp4f0frjxfwpxpicjn1yrk6sf8y4il49cx0s4v"; depends=[maxLik]; };
 het_test = derive { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; };
-hett = derive { name="hett"; version="0.3-1"; sha256="1y0hr9g2pjwzc5azh095h33qidxhhmlvd1csamjnhwdphj5drzz0"; depends=[MASS lattice]; };
+hett = derive { name="hett"; version="0.3-1"; sha256="1y0hr9g2pjwzc5azh095h33qidxhhmlvd1csamjnhwdphj5drzz0"; depends=[lattice MASS]; };
 hexView = derive { name="hexView"; version="0.3-3"; sha256="0cx5hl70sk1wk24na21vjyv50b2358z1plvvcw604qf1zij4icwn"; depends=[]; };
 hexbin = derive { name="hexbin"; version="1.27.0"; sha256="0fs5nsaalic6fj7b347yjczws310y3q2v37yr8sg74yq8wqzsdj8"; depends=[lattice]; };
 hflights = derive { name="hflights"; version="0.1"; sha256="1rb6finck13i6949i6hsgfk90q4ybxh1m3is2mlw2m6087bpzfbd"; depends=[]; };
 hgam = derive { name="hgam"; version="0.1-2"; sha256="1flcc67n8kbh9m5phdfl587xg1x935zbp305y0gdmkc8vpkiwpcf"; depends=[grplasso lattice rgl]; };
-hglasso = derive { name="hglasso"; version="1.2"; sha256="1qq41ma33wz7qjs5zx72yvngpsiq62z9sd6d5hvvl83brq0fcr4b"; depends=[glasso mvtnorm igraph fields]; };
-hglm = derive { name="hglm"; version="2.1-0"; sha256="02d5m7j7c1z40kih1ywvnd32sdlshgsgagsbh9avhhpcg7lxswj9"; depends=[Matrix MASS hglm_data]; };
-hglm_data = derive { name="hglm.data"; version="1.0-0"; sha256="1hrq1jac658z5xjsg03nfkb4kwm9z44bhciv5chk74ww8gjr9j9q"; depends=[Matrix MASS]; };
+hglasso = derive { name="hglasso"; version="1.2"; sha256="1qq41ma33wz7qjs5zx72yvngpsiq62z9sd6d5hvvl83brq0fcr4b"; depends=[fields glasso igraph mvtnorm]; };
+hglm = derive { name="hglm"; version="2.1-0"; sha256="02d5m7j7c1z40kih1ywvnd32sdlshgsgagsbh9avhhpcg7lxswj9"; depends=[hglm_data MASS Matrix]; };
+hglm_data = derive { name="hglm.data"; version="1.0-0"; sha256="1hrq1jac658z5xjsg03nfkb4kwm9z44bhciv5chk74ww8gjr9j9q"; depends=[MASS Matrix]; };
 hgm = derive { name="hgm"; version="1.11"; sha256="1p6391bcvsgf2mvkdrwc3fj3h6hkzshqmzb6f31kmpiihjwv3392"; depends=[deSolve]; };
 hht = derive { name="hht"; version="2.1.2"; sha256="10lpndwpddcqxyrk9pq9dwaqpj4apxdic971nd68cn3pql6fssdn"; depends=[EMD fields spatstat]; };
 hiPOD = derive { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; };
@@ -3957,8 +3971,9 @@ hiddenf = derive { name="hiddenf"; version="1.3"; sha256="02vdvvhfas8ziyipm13ihm
 hier_part = derive { name="hier.part"; version="1.0-4"; sha256="03acdgzkhbk4p0wxw2g1hzklmq9hzmdkkvfj742vzfswdd803yg9"; depends=[gtools]; };
 hierDiversity = derive { name="hierDiversity"; version="0.1"; sha256="1n4jg003h9hvr2n43jwxgfpazvc5ij5lqvspxi49w8fpzpcrqrjj"; depends=[]; };
 hierNet = derive { name="hierNet"; version="1.6"; sha256="08lifk92caa4l9nfb89rl6vby8sd1ba3ay7z29ffirsg7cx07qiw"; depends=[]; };
-hierarchicalDS = derive { name="hierarchicalDS"; version="2.9"; sha256="0ckxy4pww5iik4m4kqs714f00g7lfzsarjdbpd0bcalvq4lmaal2"; depends=[truncnorm mvtnorm Matrix coda xtable mc2d ggplot2 rgeos]; };
-hierfstat = derive { name="hierfstat"; version="0.04-14"; sha256="0zbl5cq0cidv0glgi1g2q0azfw393lnb7hp8m69sxwdjn3y3912c"; depends=[gtools ade4]; };
+hierarchicalDS = derive { name="hierarchicalDS"; version="2.9"; sha256="0ckxy4pww5iik4m4kqs714f00g7lfzsarjdbpd0bcalvq4lmaal2"; depends=[coda ggplot2 Matrix mc2d mvtnorm rgeos truncnorm xtable]; };
+hierband = derive { name="hierband"; version="1.0"; sha256="0d95hrgkd8b5sww3wsgs6v9zg9pm71ick8x8kj8d6vyib350h6yn"; depends=[]; };
+hierfstat = derive { name="hierfstat"; version="0.04-14"; sha256="0zbl5cq0cidv0glgi1g2q0azfw393lnb7hp8m69sxwdjn3y3912c"; depends=[ade4 gtools]; };
 hiertest = derive { name="hiertest"; version="1.1"; sha256="17maf1w4vkqknxff3f00fzv136j3dbbigyzl4vq4sln9j27w10r3"; depends=[]; };
 highD2pop = derive { name="highD2pop"; version="1.0"; sha256="1s4v6m2d3vzvxsgmjzczv1zj3kv3ygvv6gbkkbjwsdhkvc1rdmf0"; depends=[fastclime]; };
 highTtest = derive { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; };
@@ -3967,8 +3982,8 @@ highlight = derive { name="highlight"; version="0.4.7"; sha256="1gpwj4phq45hhx4x
 highr = derive { name="highr"; version="0.5"; sha256="0jnab5pk5sg4f5krsg5jdamr4y40z2pzxhp5h6fb6wys3m75hzny"; depends=[]; };
 hillmakeR = derive { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; };
 hint = derive { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; };
-hisemi = derive { name="hisemi"; version="1.0-319"; sha256="0pm7dsaaqrdhkvxsk2cjvk6qd2rqqmddmv012smnrivi7mpnvd4w"; depends=[Matrix Iso fda]; };
-hisse = derive { name="hisse"; version="1.0"; sha256="0vbwc006ypn9jcaw86dcvmg2hyjwb88h45zx8kjr5w506818phjp"; depends=[ape deSolve GenSA subplex]; };
+hisemi = derive { name="hisemi"; version="1.0-319"; sha256="0pm7dsaaqrdhkvxsk2cjvk6qd2rqqmddmv012smnrivi7mpnvd4w"; depends=[fda Iso Matrix]; };
+hisse = derive { name="hisse"; version="1.1"; sha256="1f35an1zfsy9ziqqb02fss2kss5070pzx7fzrqbrc3a5434qpdf5"; depends=[ape deSolve GenSA phytools subplex]; };
 histmdl = derive { name="histmdl"; version="0.4-1"; sha256="0kiz95hdi658j5s7aqlf8n9k35s30pshc5nymif88gjik9gvrxd0"; depends=[]; };
 histogram = derive { name="histogram"; version="0.0-23"; sha256="0hrhk423wdybqbvgsjn7dxgb95bkvmbh573q1696634hvzfdm68c"; depends=[]; };
 historydata = derive { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; };
@@ -3977,117 +3992,117 @@ hive = derive { name="hive"; version="0.1-16"; sha256="1xaxnr8nfkji2b5f5dq2h01pk
 hlr = derive { name="hlr"; version="0.0-4"; sha256="04w1hzjfg2ly9vm9ynh676fy74d9ncy3a1mak209z2ddgr3m7r2y"; depends=[MASS]; };
 hmeasure = derive { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; };
 hmm_discnp = derive { name="hmm.discnp"; version="0.2-3"; sha256="1r9xxgsqh5pw9incldaxnsqhyanhd4jwm6w0ix1k43i53dw4diyr"; depends=[]; };
-hmmm = derive { name="hmmm"; version="1.0-3"; sha256="0yjx5i13jbv7vzxn84m6305124ri7jnym0bxbdj46s6l7lw025a9"; depends=[quadprog MASS mvtnorm]; };
+hmmm = derive { name="hmmm"; version="1.0-3"; sha256="0yjx5i13jbv7vzxn84m6305124ri7jnym0bxbdj46s6l7lw025a9"; depends=[MASS mvtnorm quadprog]; };
 hnp = derive { name="hnp"; version="1.0"; sha256="1sxbgz57js1vxhz309dnj6jhw4y6c0pzk0a9xk8avacicnv0bxhr"; depends=[MASS]; };
-hoardeR = derive { name="hoardeR"; version="0.0-2"; sha256="1k9a469h6fmr1br93dsk4q14h2bw8225l0v5sfp2wyr8sfpwm1dg"; depends=[httr XML stringr]; };
+hoardeR = derive { name="hoardeR"; version="0.0-2"; sha256="1k9a469h6fmr1br93dsk4q14h2bw8225l0v5sfp2wyr8sfpwm1dg"; depends=[httr stringr XML]; };
 holdem = derive { name="holdem"; version="1.1"; sha256="07h4cbg7hx91hc6ypi6hbalzdd9qz9rfhjgk5sq1srnangwwnxlw"; depends=[]; };
-homals = derive { name="homals"; version="1.0-5"; sha256="1azrwvdzn379in2sz9d94w2f2xp0d6iiayrv0bws44kvdzr95aqm"; depends=[rgl ape scatterplot3d]; };
+homals = derive { name="homals"; version="1.0-5"; sha256="1azrwvdzn379in2sz9d94w2f2xp0d6iiayrv0bws44kvdzr95aqm"; depends=[ape rgl scatterplot3d]; };
 homeR = derive { name="homeR"; version="0.1"; sha256="0yq93b3wkgbnwzpyhx9c73sb9xgz7m3z4p5rflk3lmc0p53h81g5"; depends=[]; };
 homtest = derive { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; };
 hornpa = derive { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; };
 hot_deck = derive { name="hot.deck"; version="1.0"; sha256="11dxj676y55p4n0c27l7f3ns8kk308f6b6lhwfpjqfz0wgysnfq9"; depends=[mice]; };
-hotspots = derive { name="hotspots"; version="1.0.2"; sha256="1cwcwin86y7afjhs8jwlz1m63hh70dcjag0msds4ngksvjh9gj2q"; depends=[lattice ineq]; };
+hotspots = derive { name="hotspots"; version="1.0.2"; sha256="1cwcwin86y7afjhs8jwlz1m63hh70dcjag0msds4ngksvjh9gj2q"; depends=[ineq lattice]; };
 howmany = derive { name="howmany"; version="0.3-1"; sha256="045ck8qahfg2swbgyf7dpl32ryq1m4sbalhr7m5qdgpm62vz8h7f"; depends=[]; };
 hpcwld = derive { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgzh1bivrvrsr8lgxxw3sbkw88lwb40"; depends=[multicool partitions]; };
-hpoPlot = derive { name="hpoPlot"; version="2.0"; sha256="080jzi1zw510clbbkmf2wkwbfgna06kfz91i7d90b9pqi7krj28j"; depends=[functional magrittr]; };
+hpoPlot = derive { name="hpoPlot"; version="2.0"; sha256="080jzi1zw510clbbkmf2wkwbfgna06kfz91i7d90b9pqi7krj28j"; depends=[functional magrittr Rgraphviz]; };
 hqmisc = derive { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; };
 hrr = derive { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; };
-hsdar = derive { name="hsdar"; version="0.1.5"; sha256="1ii83dpndshq8d00f3dxrzcxqplcc5b85b9cixxbda5bpvrlkpg1"; depends=[sp raster rgdal rootSolve signal]; };
+hsdar = derive { name="hsdar"; version="0.1.5"; sha256="1ii83dpndshq8d00f3dxrzcxqplcc5b85b9cixxbda5bpvrlkpg1"; depends=[raster rgdal rootSolve signal sp]; };
 hsicCCA = derive { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
 hsmm = derive { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; };
-hsphase = derive { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[snowfall Rcpp RcppArmadillo Rcpp]; };
-htmlTable = derive { name="htmlTable"; version="1.3"; sha256="00zcismapanyb68657gng5l6g3hsmpls84naracshj4gfk2l1cfs"; depends=[stringr knitr magrittr]; };
+hsphase = derive { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[Rcpp RcppArmadillo snowfall]; };
+htmlTable = derive { name="htmlTable"; version="1.3"; sha256="00zcismapanyb68657gng5l6g3hsmpls84naracshj4gfk2l1cfs"; depends=[knitr magrittr stringr]; };
 htmltools = derive { name="htmltools"; version="0.2.6"; sha256="1gp6f6388xy3cvnb08q08vraidjp740gfxlafdd19m2s04v5hncz"; depends=[digest]; };
 htmlwidgets = derive { name="htmlwidgets"; version="0.4"; sha256="079y3b3d4na582a1wmb5nc5cyrmmld4v7c1vc08cbfsg43w026zn"; depends=[htmltools jsonlite yaml]; };
 hts = derive { name="hts"; version="4.4"; sha256="1dpm669lc4khjkcs49m1nh7i61sclsqy7xbcn4mqqjhfgs7sg7sk"; depends=[forecast SparseM]; };
 httk = derive { name="httk"; version="1.2"; sha256="016njh1cm21bmdrn94cbsmf36gzcwfg21bqp8nl100qb16d6yqq6"; depends=[deSolve msm]; };
 httpRequest = derive { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; };
-httpuv = derive { name="httpuv"; version="1.3.2"; sha256="0vp3bz1nxi0ladlgi1r6wd480y0m2m0gsba2hrs73s9b8afrfh6v"; depends=[Rcpp Rcpp]; };
-httr = derive { name="httr"; version="0.6.1"; sha256="111l6ygwnrzcqwny6ds62np0r2f6x0il7abapq00j1y86nk4p6l6"; depends=[digest jsonlite mime RCurl R6 stringr]; };
-huge = derive { name="huge"; version="1.2.6"; sha256="11njfd4i8q950apga6sdk84p4wk4qvp8bpg6yz9lgjrgj2hn14n2"; depends=[Matrix lattice igraph MASS]; };
+httpuv = derive { name="httpuv"; version="1.3.2"; sha256="0vp3bz1nxi0ladlgi1r6wd480y0m2m0gsba2hrs73s9b8afrfh6v"; depends=[Rcpp]; };
+httr = derive { name="httr"; version="0.6.1"; sha256="111l6ygwnrzcqwny6ds62np0r2f6x0il7abapq00j1y86nk4p6l6"; depends=[digest jsonlite mime R6 RCurl stringr]; };
+huge = derive { name="huge"; version="1.2.6"; sha256="11njfd4i8q950apga6sdk84p4wk4qvp8bpg6yz9lgjrgj2hn14n2"; depends=[igraph lattice MASS Matrix]; };
 humanFormat = derive { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; };
 hwde = derive { name="hwde"; version="0.64"; sha256="1is39zknssqm98577sdjg8gn3h9wsraih19a9nd6n8mxdcsqivh4"; depends=[]; };
 hwriter = derive { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; };
 hwriterPlus = derive { name="hwriterPlus"; version="1.0-3"; sha256="1sk95qgpyxwk1cfkkp91qvn1iklad9glrnljdpidj20lnmpwyikx"; depends=[hwriter TeachingDemos]; };
 hwwntest = derive { name="hwwntest"; version="1.3"; sha256="1b5wfbiwc542vlmn0l2aka75ss1673z8bcszfrlibg9wwqjxlwk5"; depends=[polynom wavethresh]; };
-hybridEnsemble = derive { name="hybridEnsemble"; version="1.0.0"; sha256="08y11cmlhnl456wxsvh3ll1f9ywkmgqjwlwr3v3qhm54nlanwvkr"; depends=[randomForest kernelFactory ada rpart ROCR nnet e1071 NMOF GenSA Rmalschains pso AUC soma genalg reportr nnls quadprog tabuSearch rotationForest FNN glmnet]; };
+hybridEnsemble = derive { 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 = derive { name="hybridHclust"; version="1.0-4"; sha256="1967p6crkrbnlfghd9x1alr2x57nqjl1zh58hhyshgla3xmdmhx5"; depends=[cluster]; };
 hydroApps = derive { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; };
-hydroGOF = derive { name="hydroGOF"; version="0.3-8"; sha256="1ljk2dk5ydsg7qdizyzkbw0b2zdhnb3x9h965d94ygzg8nw5kbak"; depends=[zoo hydroTSM xts]; };
-hydroPSO = derive { name="hydroPSO"; version="0.3-4"; sha256="12md94g78m7m1np36sadx0wxpb149pn5gd8yj2kw7fphb8g6a218"; depends=[Hmisc sp lattice zoo lhs]; };
-hydroTSM = derive { name="hydroTSM"; version="0.4-2-1"; sha256="0z5xw25w2fn67x2dw61msfdnp2dr2s2yi525fcjxn77339x9ksfr"; depends=[zoo xts e1071 gstat automap sp]; };
+hydroGOF = derive { name="hydroGOF"; version="0.3-8"; sha256="1ljk2dk5ydsg7qdizyzkbw0b2zdhnb3x9h965d94ygzg8nw5kbak"; depends=[hydroTSM xts zoo]; };
+hydroPSO = derive { name="hydroPSO"; version="0.3-4"; sha256="12md94g78m7m1np36sadx0wxpb149pn5gd8yj2kw7fphb8g6a218"; depends=[Hmisc lattice lhs sp zoo]; };
+hydroTSM = derive { name="hydroTSM"; version="0.4-2-1"; sha256="0z5xw25w2fn67x2dw61msfdnp2dr2s2yi525fcjxn77339x9ksfr"; depends=[automap e1071 gstat sp xts zoo]; };
 hydrogeo = derive { name="hydrogeo"; version="0.2-3"; sha256="1kvzpdjrzbxy4rbfhjqmxdipaamd2rjdyxjv6vfxv1ixs1bm8cwm"; depends=[]; };
 hydrostats = derive { name="hydrostats"; version="0.2.3"; sha256="1hd4jcdkdl546kqvx9swnqn7gjvd7ppz034cqflpckhn68rc62g7"; depends=[]; };
-hyperSpec = derive { name="hyperSpec"; version="0.98-20150304"; sha256="0fjww2h6vlm53dsnaxb3i11cmary1w8l0jr9c5dy16y7n9cc3hqb"; depends=[lattice ggplot2 mvtnorm latticeExtra svUnit]; };
-hyperdirichlet = derive { name="hyperdirichlet"; version="1.4-9"; sha256="03c2xgfhfbpn1za84ajhvm0i5cpmfnz1makidrr2222addgyp9zx"; depends=[aylmer abind mvtnorm cubature]; };
+hyperSpec = derive { name="hyperSpec"; version="0.98-20150304"; sha256="0fjww2h6vlm53dsnaxb3i11cmary1w8l0jr9c5dy16y7n9cc3hqb"; depends=[ggplot2 lattice latticeExtra mvtnorm svUnit]; };
+hyperdirichlet = derive { name="hyperdirichlet"; version="1.4-9"; sha256="03c2xgfhfbpn1za84ajhvm0i5cpmfnz1makidrr2222addgyp9zx"; depends=[abind aylmer cubature mvtnorm]; };
 hypergea = derive { name="hypergea"; version="1.2.3"; sha256="13a8r7f2qq7wi0h7jrg29mn573njzi1rwna0ch9sj8sdy8w26r6w"; depends=[]; };
-hypergeo = derive { name="hypergeo"; version="1.2-9"; sha256="0ydwza0h8ykzbrsvvp4wd5jiy05rx5bj93c7bplx68j3c68c9f1q"; depends=[elliptic contfrac]; };
-hypervolume = derive { name="hypervolume"; version="1.3.0"; sha256="07pnbkdqm4jssv6h31q68mawckiyxczsjfw4gndpyvxnl44p0qrz"; depends=[Rcpp rgl MASS geometry ks fastcluster Rcpp RcppArmadillo]; };
+hypergeo = derive { name="hypergeo"; version="1.2-9"; sha256="0ydwza0h8ykzbrsvvp4wd5jiy05rx5bj93c7bplx68j3c68c9f1q"; depends=[contfrac elliptic]; };
+hypervolume = derive { name="hypervolume"; version="1.3.0"; sha256="07pnbkdqm4jssv6h31q68mawckiyxczsjfw4gndpyvxnl44p0qrz"; depends=[fastcluster geometry ks MASS Rcpp RcppArmadillo rgl]; };
 hypothesestest = derive { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; };
-hysteresis = derive { name="hysteresis"; version="2.5"; sha256="1b1dd2367pjbg4jnn65l2jcj38ljz7adpdg8f5b9rj1rw7qgikfl"; depends=[car msm MASS]; };
-hzar = derive { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[MCMCpack foreach coda]; };
-iBATCGH = derive { name="iBATCGH"; version="1.2"; sha256="0py83q8fcrh0kjysvljx22b7s2gsccq19rzvwf3alq8vl59sm48i"; depends=[Rcpp msm Rcpp RcppArmadillo]; };
-iBUGS = derive { name="iBUGS"; version="0.1.4"; sha256="0vsxy8pnbix0rg7ksgywx7kypqb5ngkxhldh3cisjkvdv638ybps"; depends=[R2WinBUGS gWidgetsRGtk2]; };
-iC10 = derive { name="iC10"; version="1.1.2"; sha256="1ncxdjw9ary0bs3fvnvyqp356gi4wa177sllkizq71fzn75a03x3"; depends=[pamr iC10TrainingData]; };
+hysteresis = derive { name="hysteresis"; version="2.5"; sha256="1b1dd2367pjbg4jnn65l2jcj38ljz7adpdg8f5b9rj1rw7qgikfl"; depends=[car MASS msm]; };
+hzar = derive { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[coda foreach MCMCpack]; };
+iBATCGH = derive { name="iBATCGH"; version="1.2"; sha256="0py83q8fcrh0kjysvljx22b7s2gsccq19rzvwf3alq8vl59sm48i"; depends=[msm Rcpp RcppArmadillo]; };
+iBUGS = derive { name="iBUGS"; version="0.1.4"; sha256="0vsxy8pnbix0rg7ksgywx7kypqb5ngkxhldh3cisjkvdv638ybps"; depends=[gWidgetsRGtk2 R2WinBUGS]; };
+iC10 = derive { name="iC10"; version="1.1.2"; sha256="1ncxdjw9ary0bs3fvnvyqp356gi4wa177sllkizq71fzn75a03x3"; depends=[iC10TrainingData pamr]; };
 iC10TrainingData = derive { name="iC10TrainingData"; version="1.0.1"; sha256="1x1kgxiib9l7whm2kmbv1s912hgpl7rdpqpn67nlkiswnr27hqn4"; depends=[]; };
-iCluster = derive { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[lattice caTools gdata gtools gplots]; };
-iDynoR = derive { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[XML vegan]; };
-iFad = derive { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[Rlab MASS coda ROCR]; };
-iFes = derive { name="iFes"; version="1.0"; sha256="0in6wy6w567188gylnlvcsk3r3w2nln9h60rj7ng1qwqawrvgwxp"; depends=[ROCR doParallel foreach]; };
-iGasso = derive { name="iGasso"; version="1.2"; sha256="123487slizsmw5b0imwqll8n03navx30kvawr6jfibbjfdd8vfn7"; depends=[lattice CompQuadForm]; };
-iRefR = derive { name="iRefR"; version="1.13"; sha256="17kjfga62xc4s1kii5clxszbag2dr1dyxfm7jasr20prx28ya6pp"; depends=[igraph]; };
+iCluster = derive { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; };
+iDynoR = derive { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[vegan XML]; };
+iFad = derive { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[coda MASS Rlab ROCR]; };
+iFes = derive { name="iFes"; version="1.0"; sha256="0in6wy6w567188gylnlvcsk3r3w2nln9h60rj7ng1qwqawrvgwxp"; depends=[doParallel foreach ROCR]; };
+iGasso = derive { name="iGasso"; version="1.2"; sha256="123487slizsmw5b0imwqll8n03navx30kvawr6jfibbjfdd8vfn7"; depends=[CompQuadForm lattice]; };
+iRefR = derive { name="iRefR"; version="1.13"; sha256="17kjfga62xc4s1kii5clxszbag2dr1dyxfm7jasr20prx28ya6pp"; depends=[graph igraph RBGL]; };
 iRegression = derive { name="iRegression"; version="1.2"; sha256="1fn25xnrvgx2ayhss136rxn1h3c9pvq2gmb5kbp92vsf07klvh6v"; depends=[mgcv]; };
 iRepro = derive { name="iRepro"; version="1.0"; sha256="1knncn47pl411r31z1r5ipsiyagcpjbc2gb972n7l3539pcpf0zy"; depends=[]; };
 iWeigReg = derive { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; };
-ibd = derive { name="ibd"; version="1.2"; sha256="0681v7lgx697yj2d60cw3p5axbbaxanzj291vdf7ailn7300p1ms"; depends=[lpSolve MASS car lsmeans multcompView]; };
+ibd = derive { name="ibd"; version="1.2"; sha256="0681v7lgx697yj2d60cw3p5axbbaxanzj291vdf7ailn7300p1ms"; depends=[car lpSolve lsmeans MASS multcompView]; };
 ibdreg = derive { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; };
-ibeemd = derive { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[fields deldir rgeos sp spdep]; };
+ibeemd = derive { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[deldir fields rgeos sp spdep]; };
 ibelief = derive { name="ibelief"; version="1.1"; sha256="164cd68qq0z68n5j0b192krpk73y8cy15wr5wnb52rzxv5k7rfd4"; depends=[]; };
-ibmdbR = derive { name="ibmdbR"; version="1.36.7"; sha256="0v6l8cm0sww2gm8yal4ffk2wcxfnvfsd76i92f2khank7bhga06r"; depends=[RODBC MASS]; };
+ibmdbR = derive { name="ibmdbR"; version="1.36.7"; sha256="0v6l8cm0sww2gm8yal4ffk2wcxfnvfsd76i92f2khank7bhga06r"; depends=[MASS RODBC]; };
 ibr = derive { name="ibr"; version="1.4.5"; sha256="0nw2j232br06l30v3cn4qcr25vbh911v2mz7nfail40sqxc6wwc4"; depends=[]; };
-ic_infer = derive { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j4321g5g5nawzll8srf302grc39npvv1q17jyz"; depends=[quadprog mvtnorm boot kappalab]; };
+ic_infer = derive { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j4321g5g5nawzll8srf302grc39npvv1q17jyz"; depends=[boot kappalab mvtnorm quadprog]; };
 ic50 = derive { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; };
 ica = derive { name="ica"; version="1.0-0"; sha256="009xv1ycgbnw6ysx1wxrgygny7qa2wd2mcjrg2fwxg958mzyrx4z"; depends=[]; };
 icaOcularCorrection = derive { name="icaOcularCorrection"; version="3.0.0"; sha256="1vmvarc2apipd0vlhprc5wpgh8i38m5myj1gqdymjrnky0azq17f"; depends=[fastICA mgcv]; };
-icamix = derive { name="icamix"; version="1.0.2"; sha256="0rpqx9q5p3nb5gd76zlkqls52a8qiw7y9r26jwxs71nxl85clqcs"; depends=[Rcpp Rcpp RcppArmadillo]; };
+icamix = derive { name="icamix"; version="1.0.2"; sha256="0rpqx9q5p3nb5gd76zlkqls52a8qiw7y9r26jwxs71nxl85clqcs"; depends=[Rcpp RcppArmadillo]; };
 icapca = derive { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; };
-iccbeta = derive { name="iccbeta"; version="1.0"; sha256="0zsf2b5nrv39pssi5walf82892fr8p1f802c96hjjknh78q7gh0h"; depends=[lme4 Rcpp Rcpp RcppArmadillo]; };
-icd9 = derive { name="icd9"; version="1.2"; sha256="0d0dgd5951chyfimzjb00cphdvqzml8p8wr7sad3qfhv44dsypn7"; depends=[Rcpp checkmate Rcpp]; };
-icenReg = derive { name="icenReg"; version="1.2.4"; sha256="0fqwg1xmks9zkmbnr1dala4b13l85ibqfd96w4vvrfhmvakqra1r"; depends=[survival foreach]; };
-icensmis = derive { name="icensmis"; version="1.2.1"; sha256="1h4l9irip4hv34hr92j8756qgmy455mfdblr7ypgsgvr27cgax8h"; depends=[Rcpp Rcpp]; };
+iccbeta = derive { name="iccbeta"; version="1.0"; sha256="0zsf2b5nrv39pssi5walf82892fr8p1f802c96hjjknh78q7gh0h"; depends=[lme4 Rcpp RcppArmadillo]; };
+icd9 = derive { name="icd9"; version="1.2"; sha256="0d0dgd5951chyfimzjb00cphdvqzml8p8wr7sad3qfhv44dsypn7"; depends=[checkmate Rcpp]; };
+icenReg = derive { name="icenReg"; version="1.2.4"; sha256="0fqwg1xmks9zkmbnr1dala4b13l85ibqfd96w4vvrfhmvakqra1r"; depends=[foreach survival]; };
+icensmis = derive { name="icensmis"; version="1.2.1"; sha256="1h4l9irip4hv34hr92j8756qgmy455mfdblr7ypgsgvr27cgax8h"; depends=[Rcpp]; };
 idbg = derive { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; };
 identity = derive { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; };
-idm = derive { name="idm"; version="1.0"; sha256="001zvhw38qgq1l66yxz5kchvjspijdvqwgrdvh5ykiqifi8kc5xm"; depends=[corpcor ggplot2 dummies animation ca]; };
+idm = derive { name="idm"; version="1.0"; sha256="001zvhw38qgq1l66yxz5kchvjspijdvqwgrdvh5ykiqifi8kc5xm"; depends=[animation ca corpcor dummies ggplot2]; };
 idr = derive { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; };
 ieeeround = derive { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; };
 ifa = derive { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; };
 ifctools = derive { name="ifctools"; version="0.3.1"; sha256="0lr1d4z2gzninqchfzmmmymd0ngywrjpbh7bvd6qgxkzabf9yxxx"; depends=[]; };
 ifs = derive { name="ifs"; version="0.1.4"; sha256="0fzani8rnn4rdwlghq967hhi4zfjnk3gwpk3v6wys738xj7yfwp1"; depends=[]; };
-ifultools = derive { name="ifultools"; version="2.0-1"; sha256="16lrmajyfa15akgjq71w9xlfsr4y9aqfw7y0jf6gydaz4y6jq9b9"; depends=[splus2R MASS]; };
+ifultools = derive { name="ifultools"; version="2.0-1"; sha256="16lrmajyfa15akgjq71w9xlfsr4y9aqfw7y0jf6gydaz4y6jq9b9"; depends=[MASS splus2R]; };
 ig_vancouver_2014_topcolour = derive { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; };
 igraph = derive { name="igraph"; version="0.7.1"; sha256="1nvb30zjjw861idbd8zap9qqg22k87zdi6qqvjf1s29v7hkx7kq7"; depends=[Matrix]; };
 igraphdata = derive { name="igraphdata"; version="0.2.2"; sha256="0lmgz9zglz0rn0iyjs9kdcm1xp09kh21sv91wnj74666jp0wsg4x"; depends=[]; };
 igraphtosonia = derive { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; };
 ihs = derive { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; };
-iki_dataclim = derive { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[zoo lubridate climdex_pcic PCICt]; };
-ilc = derive { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[demography rainbow forecast date survival]; };
-imguR = derive { name="imguR"; version="1.0.0"; sha256="0yhlir0qxi6hjmqlmmklwd4vkymc5bzv9id9dlis1fr1f8a64vwp"; depends=[RCurl httr png jpeg]; };
+iki_dataclim = derive { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[climdex_pcic lubridate PCICt zoo]; };
+ilc = derive { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; };
+imguR = derive { name="imguR"; version="1.0.0"; sha256="0yhlir0qxi6hjmqlmmklwd4vkymc5bzv9id9dlis1fr1f8a64vwp"; depends=[httr jpeg png RCurl]; };
 import = derive { name="import"; version="1.0.2"; sha256="1m6xnj08faf5ahb0ga4z13x3pwhvw2gh4wg72m9wcfcyr0rp74lx"; depends=[]; };
 imprProbEst = derive { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; };
-imputeLCMD = derive { name="imputeLCMD"; version="2.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[tmvtnorm norm]; };
+imputeLCMD = derive { name="imputeLCMD"; version="2.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[impute norm pcaMethods tmvtnorm]; };
 imputeMDR = derive { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; };
-imputeR = derive { name="imputeR"; version="1.0.0"; sha256="18rx70w7xb33m84ifxl3p599js78pa748c9lmlkic6yqrgsabcip"; depends=[caret reshape2 glmnet pls rda Cubist ridge gbm mboost rpart]; };
+imputeR = derive { name="imputeR"; version="1.0.0"; sha256="18rx70w7xb33m84ifxl3p599js78pa748c9lmlkic6yqrgsabcip"; depends=[caret Cubist gbm glmnet mboost pls rda reshape2 ridge rpart]; };
 in2extRemes = derive { name="in2extRemes"; version="1.0-1"; sha256="0k5qczs54b7bl71my8xmnqly91g7c5skj0lm2g8dk4hgrx6wwsrf"; depends=[extRemes]; };
-inTrees = derive { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089gzdz1smga6ssj8cxxccyyzci6px85j1"; depends=[RRF arules gbm xtable]; };
-inarmix = derive { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp Rcpp]; };
+inTrees = derive { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089gzdz1smga6ssj8cxxccyyzci6px85j1"; depends=[arules gbm RRF xtable]; };
+inarmix = derive { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp]; };
 incReg = derive { name="incReg"; version="1.0"; sha256="1kckx64hn8g9wvjg7g9xild5hclim1rs7z2m7rgmbdwlbayxpwgv"; depends=[car]; };
-indicoio = derive { name="indicoio"; version="0.3"; sha256="04c2j4l103fiiibf83z7iq95wfnlv9rj46cyp9xy68bzqkbwdi3m"; depends=[httr rjson stringr png]; };
+indicoio = derive { name="indicoio"; version="0.3"; sha256="04c2j4l103fiiibf83z7iq95wfnlv9rj46cyp9xy68bzqkbwdi3m"; depends=[httr png rjson stringr]; };
 indicspecies = derive { name="indicspecies"; version="1.7.5"; sha256="16m4pnfnmaskin4aaalm2cmv3vwzg94045max8nhkgw02kpskz1r"; depends=[permute]; };
 ineq = derive { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; };
 inference = derive { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; };
-inferference = derive { name="inferference"; version="0.4.62"; sha256="12iag6l2digxb056qc765xi27ayc4qyqdqzbhxscr8a5lxfkdn4p"; depends=[numDeriv lme4 Formula]; };
+inferference = derive { name="inferference"; version="0.4.62"; sha256="12iag6l2digxb056qc765xi27ayc4qyqdqzbhxscr8a5lxfkdn4p"; depends=[Formula lme4 numDeriv]; };
 inflection = derive { name="inflection"; version="1.1"; sha256="1nb1pf07c371vwgplfyjs3q1iqgb5hyk9czxqrjiy18g8p7zdln2"; depends=[]; };
-influence_ME = derive { name="influence.ME"; version="0.9-5"; sha256="0sjrajhc198g391xa78l4gicmpyq4h7dnrnncji3qpgbqi772pkn"; depends=[lme4 Matrix lattice]; };
+influence_ME = derive { name="influence.ME"; version="0.9-5"; sha256="0sjrajhc198g391xa78l4gicmpyq4h7dnrnncji3qpgbqi772pkn"; depends=[lattice lme4 Matrix]; };
 influence_SEM = derive { name="influence.SEM"; version="1.5"; sha256="0h920pxa3sk6y7ipkihxm78i06alm5rmlmn5pr937j7abgypkk3p"; depends=[lavaan]; };
 infoDecompuTE = derive { name="infoDecompuTE"; version="0.5.1"; sha256="1aigd1fvpdqjplq1s1js0sy8px68q73lbp5q591rn52c77smdhaj"; depends=[MASS]; };
 informR = derive { name="informR"; version="1.0-5"; sha256="16pz47wlr1gr8z5hdnrjpczm967khqiqgdfiw15a0bby6qdvni2y"; depends=[abind relevent]; };
@@ -4097,58 +4112,58 @@ infuser = derive { name="infuser"; version="0.2"; sha256="1x585glkffw4kq8d13md4k
 infutil = derive { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; };
 inline = derive { name="inline"; version="0.3.14"; sha256="0cf9vya9h4znwgp6s1nayqqmh6mwyw7jl0isk1nx4j2ijszxcd7x"; depends=[]; };
 inlinedocs = derive { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; };
-insideRODE = derive { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve nlme lattice]; };
+insideRODE = derive { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; };
 insol = derive { name="insol"; version="1.1.1"; sha256="0zbawkp4qb0kqb7y9ibiyy8sa9rfgbzwmcdswx6s87p0h7brrqn6"; depends=[]; };
 install_load = derive { name="install.load"; version="1.0.3"; sha256="0fvync9v712r4l6053bncl8a0rgjq0nfnrnpc0yxc2m3mxf5hzvr"; depends=[]; };
 insuranceData = derive { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; };
-intReg = derive { name="intReg"; version="0.2-8"; sha256="0cqf6lbn8aiyj5j7gg1qz80i477bfxbmxp7fjs25ish4bcdsbjja"; depends=[miscTools maxLik sets]; };
+intReg = derive { name="intReg"; version="0.2-8"; sha256="0cqf6lbn8aiyj5j7gg1qz80i477bfxbmxp7fjs25ish4bcdsbjja"; depends=[maxLik miscTools sets]; };
 intRegGOF = derive { name="intRegGOF"; version="0.85-1"; sha256="0fyvhl6jmi6krfbimsq61dhixlz9h9jxk4yjvwbx2vl8d9fnnr54"; depends=[]; };
-intamap = derive { name="intamap"; version="1.3-37"; sha256="17l1bifks0vsk0a3bj2g4w8qrvhmdh0p145kmd09223x9yc4mc9v"; depends=[sp gstat automap mvtnorm MASS evd]; };
-intamapInteractive = derive { name="intamapInteractive"; version="1.1-10"; sha256="073k6sdds40fmlbw1xnp3x5sc9qdyq2s1bhp7av4jjm930hsvsrn"; depends=[intamap spcosa spatstat automap gstat]; };
+intamap = derive { name="intamap"; version="1.3-37"; sha256="17l1bifks0vsk0a3bj2g4w8qrvhmdh0p145kmd09223x9yc4mc9v"; depends=[automap evd gstat MASS mvtnorm sp]; };
+intamapInteractive = derive { name="intamapInteractive"; version="1.1-10"; sha256="073k6sdds40fmlbw1xnp3x5sc9qdyq2s1bhp7av4jjm930hsvsrn"; depends=[automap gstat intamap spatstat spcosa]; };
 intcox = derive { name="intcox"; version="0.9.3"; sha256="1m1lzmymh2pk570k6nxq3nj7wxkvs1s3nvz8cb456fnv72ng8fap"; depends=[survival]; };
-interAdapt = derive { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[shiny knitcitations RCurl mvtnorm knitr]; };
+interAdapt = derive { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; };
 interferenceCI = derive { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; };
-intergraph = derive { name="intergraph"; version="2.0-1"; sha256="03ycay3x4wd3j7r0mad9qgi4h77krapg613ans3jf9qa4ys2njlv"; depends=[network igraph]; };
-internetarchive = derive { name="internetarchive"; version="0.1.2"; sha256="08gbkqbzx963c1jy3a540fsd0ff9ylr7la1clwjn46lp4cc4yv1h"; depends=[httr jsonlite dplyr]; };
-interpretR = derive { name="interpretR"; version="0.2.2"; sha256="048qhq9mf3qna48v8ml7hfa7imrsrhrl0hrb44arh1ik3i5a2xx6"; depends=[randomForest AUC]; };
-interval = derive { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[survival perm MLEcens]; };
+intergraph = derive { name="intergraph"; version="2.0-1"; sha256="03ycay3x4wd3j7r0mad9qgi4h77krapg613ans3jf9qa4ys2njlv"; depends=[igraph network]; };
+internetarchive = derive { name="internetarchive"; version="0.1.2"; sha256="08gbkqbzx963c1jy3a540fsd0ff9ylr7la1clwjn46lp4cc4yv1h"; depends=[dplyr httr jsonlite]; };
+interpretR = derive { name="interpretR"; version="0.2.2"; sha256="048qhq9mf3qna48v8ml7hfa7imrsrhrl0hrb44arh1ik3i5a2xx6"; depends=[AUC randomForest]; };
+interval = derive { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; };
 intervals = derive { name="intervals"; version="0.15.0"; sha256="0lvxaq5ia7hj65n00awz454a2vdxpskxjw45wsakgh0sc60hk8yz"; depends=[]; };
 interventionalDBN = derive { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; };
 intpoint = derive { name="intpoint"; version="1.0"; sha256="0zcv64a0clgf1k3ylh97q1w5ddrv227846gy9a68h6sgwc0ps88b"; depends=[]; };
-introgress = derive { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[nnet genetics RColorBrewer]; };
-intsvy = derive { name="intsvy"; version="1.6"; sha256="1bv8qap3d8yssfm80ilrn6wg3207hiy34sd92wl64bwpvqyi6i7p"; depends=[memisc foreign plyr ggplot2 reshape]; };
-invGauss = derive { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[survival optimx]; };
+introgress = derive { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[genetics nnet RColorBrewer]; };
+intsvy = derive { name="intsvy"; version="1.6"; sha256="1bv8qap3d8yssfm80ilrn6wg3207hiy34sd92wl64bwpvqyi6i7p"; depends=[foreign ggplot2 memisc plyr reshape]; };
+invGauss = derive { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[optimx survival]; };
 investr = derive { name="investr"; version="1.3.0"; sha256="057wq6c5r7hrg1nz7460alsjsk83cvac2d1d4mjjx160q3m0zcvj"; depends=[nlme]; };
 io = derive { name="io"; version="0.2.2"; sha256="07vifr1h8ldiam8ngp6yrx6mvdnmmnnsq3hcs2pyphws6hgdmwwh"; depends=[filenamer stringr]; };
-ionflows = derive { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[]; };
+ionflows = derive { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[Biostrings]; };
 iosmooth = derive { name="iosmooth"; version="0.91"; sha256="03kyzhcl5lipaiajs53dc8jaazxv877nl0njbq88cp4af3gd6s82"; depends=[]; };
 ipdmeta = derive { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; };
-ipdw = derive { name="ipdw"; version="0.2-2"; sha256="1mvxs1039hv9m36jhi11qvjysmpmh7ms522q9phwmljv2nnl7ylz"; depends=[gdistance sp raster]; };
+ipdw = derive { name="ipdw"; version="0.2-2"; sha256="1mvxs1039hv9m36jhi11qvjysmpmh7ms522q9phwmljv2nnl7ylz"; depends=[gdistance raster sp]; };
 ipfp = derive { name="ipfp"; version="1.0"; sha256="1hpfbgygnpnl3fpx7zl728jyw00y3kbbc5f0d407phm56sfqmqwi"; depends=[]; };
-iplots = derive { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[rJava png]; };
-ipred = derive { name="ipred"; version="0.9-4"; sha256="0rig1sj0jqv2rrkgcr6fhr8477wxirxwnwk533l7rn6qr90prjwp"; depends=[rpart MASS survival nnet class prodlim]; };
+iplots = derive { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[png rJava]; };
+ipred = derive { name="ipred"; version="0.9-4"; sha256="0rig1sj0jqv2rrkgcr6fhr8477wxirxwnwk533l7rn6qr90prjwp"; depends=[class MASS nnet prodlim rpart survival]; };
 ips = derive { name="ips"; version="0.0-7"; sha256="0r4394xbchv6czad9jz4ijnfz8ss3wfdvh7ixrdxic2xrw0ic90v"; depends=[ape colorspace XML]; };
 iqLearn = derive { name="iqLearn"; version="1.3"; sha256="05f2spnzyqzbbgwz9llf4x5r6fsz5gxa1ckykv6wxg4sirdqccm1"; depends=[]; };
 irace = derive { name="irace"; version="1.06"; sha256="10dizzjds1aszvyh0fn6ahqvgn2x6sg3lwb7rca8zhgphrjg92bl"; depends=[]; };
 irlba = derive { name="irlba"; version="1.0.3"; sha256="1h2ymk9hg9xj2075w715742j23jl7kqa4cgzl1jvr48gcysq5byy"; depends=[Matrix]; };
 irr = derive { name="irr"; version="0.84"; sha256="0njxackqj8hyf9j1yszwxbnaxgp27fc2bwyyf7dip72wc12f81n5"; depends=[lpSolve]; };
 irtProb = derive { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; };
-irtoys = derive { name="irtoys"; version="0.1.7"; sha256="11nz675haigs6vg08qjibs8yccy2pbz0b9r8761fs8gw3n7bpfz4"; depends=[sm ltm]; };
+irtoys = derive { name="irtoys"; version="0.1.7"; sha256="11nz675haigs6vg08qjibs8yccy2pbz0b9r8761fs8gw3n7bpfz4"; depends=[ltm sm]; };
 irtrees = derive { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; };
 isa2 = derive { name="isa2"; version="0.3.4"; sha256="12qbfvcj8whhy7d68l7ra5wnkpx87ldl6mir7r5n8afb3fkww0kp"; depends=[lattice]; };
 isdals = derive { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; };
 isingLenzMC = derive { name="isingLenzMC"; version="0.2.3"; sha256="1rkry39yhxvq3ypnnxgdv15kd5w0l5w56ywmkcsgkwlxdfrvlyn2"; depends=[]; };
 ismev = derive { name="ismev"; version="1.40"; sha256="1isxgq62q6dk50c3w1l0j4nfgwsj6c2wnx2sm3ncxzlqml0ih6jn"; depends=[mgcv]; };
 isocir = derive { name="isocir"; version="1.1-3"; sha256="1bx68n9wyfs2dcgph66rsy0jw8hjkl5kw212l0563kz3m1nik9sr"; depends=[circular combinat]; };
-isopam = derive { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[vegan cluster]; };
+isopam = derive { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; };
 isopat = derive { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; };
 isotone = derive { name="isotone"; version="1.0-2"; sha256="0qcad691c1dk61a75813hxbc61jllvfc3j21gn85f0kcf4hn6dnz"; depends=[]; };
 isotonic_pen = derive { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; };
-isva = derive { name="isva"; version="1.8"; sha256="09mrvvk09j460dzi45z8hwdpmibfshsii5dcp38g13czr40d48na"; depends=[fastICA]; };
-iteRates = derive { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[partitions VGAM MASS ape apTreeshape geiger gtools]; };
+isva = derive { name="isva"; version="1.8"; sha256="09mrvvk09j460dzi45z8hwdpmibfshsii5dcp38g13czr40d48na"; depends=[fastICA qvalue]; };
+iteRates = derive { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; };
 iterLap = derive { name="iterLap"; version="1.1-2"; sha256="0ixh9aw115496ib0iswfsj97rjcd2f02z116dg57vl9hhzh28f13"; depends=[quadprog randtoolbox]; };
 iterators = derive { name="iterators"; version="1.0.7"; sha256="1zwqawhcpi95fx4qqj4cy31v5qln2z503f7cvv9v5ch3ard4xxqv"; depends=[]; };
-iterpc = derive { name="iterpc"; version="0.2.7"; sha256="041gihbcv9i7f1jzvlldkyfm58p86pyv2sf4hbk09xp00azp8ahf"; depends=[Rcpp polynom Rcpp]; };
+iterpc = derive { name="iterpc"; version="0.2.7"; sha256="041gihbcv9i7f1jzvlldkyfm58p86pyv2sf4hbk09xp00azp8ahf"; depends=[polynom Rcpp]; };
 itertools = derive { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; };
 itertools2 = derive { name="itertools2"; version="0.1.1"; sha256="0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96"; depends=[iterators]; };
 itree = derive { name="itree"; version="0.1"; sha256="164zgr142hcp9plnbccs6m823p4m0prk73bvp54bc7bqnqmc3d9a"; depends=[]; };
@@ -4157,92 +4172,93 @@ itsadug = derive { name="itsadug"; version="0.8"; sha256="1lphbw1d1x1bs625rnr9jl
 itsmr = derive { name="itsmr"; version="1.5"; sha256="0l9m5is6d6pkpfkihx0jir5iv8zmqqav8vh9bkkpqv5iz61p4kxb"; depends=[]; };
 ivbma = derive { name="ivbma"; version="1.05"; sha256="0d7kg6pkdx1aj1i6kqs2r7j1klxxwymml63qnrq6a6fia3ck9kk9"; depends=[]; };
 ivfixed = derive { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; };
-ivivc = derive { name="ivivc"; version="0.2.2"; sha256="1qychbszcg9lmbmrnpv65xcv1i5k2xarsa374fs6gw7zlp5nrvap"; depends=[reshape optimx sciplot png deSolve minpack_lm]; };
-ivlewbel = derive { name="ivlewbel"; version="1.1"; sha256="0ykcfikm2i28s3fm6zzx8cjvpwhksg8an0rfr0b35gf7p69brgag"; depends=[gmm plyr lmtest]; };
+ivivc = derive { name="ivivc"; version="0.2.2"; sha256="1qychbszcg9lmbmrnpv65xcv1i5k2xarsa374fs6gw7zlp5nrvap"; depends=[deSolve minpack_lm optimx png reshape sciplot]; };
+ivlewbel = derive { name="ivlewbel"; version="1.1"; sha256="0ykcfikm2i28s3fm6zzx8cjvpwhksg8an0rfr0b35gf7p69brgag"; depends=[gmm lmtest plyr]; };
 ivmodel = derive { name="ivmodel"; version="1.0"; sha256="14ic49vyikx5fiz2ccjmd53f0vcg3jh3fs6fqhl8w3hm9z9x4qvz"; depends=[Matrix]; };
-ivpack = derive { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER sandwich lmtest]; };
+ivpack = derive { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER lmtest sandwich]; };
 ivpanel = derive { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; };
 ivprobit = derive { name="ivprobit"; version="1.0"; sha256="1kijq7k6iv2ybaxb08kqzm2s2k6wp2z50r01kxcq023pmyfjczwy"; depends=[]; };
-jSonarR = derive { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[RCurl jsonlite]; };
-jaatha = derive { name="jaatha"; version="2.7.0"; sha256="1ibk84x38j03hbdrf9pi0bi025fxlk2ysqxmfrqiqr4zq2rzhbvp"; depends=[phyclust Rcpp reshape2 Rcpp]; };
+jSonarR = derive { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; };
+jaatha = derive { name="jaatha"; version="2.7.0"; sha256="1ibk84x38j03hbdrf9pi0bi025fxlk2ysqxmfrqiqr4zq2rzhbvp"; depends=[phyclust Rcpp reshape2]; };
 jackstraw = derive { name="jackstraw"; version="1.0"; sha256="1irfzivy7c9fb2pr98flx05s5hkk6sid1hkd5b3k9m9mgs6ixbfy"; depends=[corpcor]; };
-jagsUI = derive { name="jagsUI"; version="1.3.7"; sha256="1zdrqxzjip4lgf99b4z76gvlhbmh0gcbkpghrlrj3j25wqzgn5y0"; depends=[lattice rjags coda]; };
-james_analysis = derive { name="james.analysis"; version="1.0.0"; sha256="01nbwhph22nfl0biwcgvb1q76jp79qj7qfn2fxpyx2dkkhzxzrmv"; depends=[rjson naturalsort]; };
-jiebaR = derive { name="jiebaR"; version="0.5"; sha256="1x41jqc1ai3v1fn9f65dk7k4g2llf3pk9z3bwqihb95qf80mhd4v"; depends=[jiebaRD Rcpp Rcpp]; };
+jagsUI = derive { name="jagsUI"; version="1.3.7"; sha256="1zdrqxzjip4lgf99b4z76gvlhbmh0gcbkpghrlrj3j25wqzgn5y0"; depends=[coda lattice rjags]; };
+james_analysis = derive { name="james.analysis"; version="1.0.0"; sha256="01nbwhph22nfl0biwcgvb1q76jp79qj7qfn2fxpyx2dkkhzxzrmv"; depends=[naturalsort rjson]; };
+jiebaR = derive { name="jiebaR"; version="0.5"; sha256="1x41jqc1ai3v1fn9f65dk7k4g2llf3pk9z3bwqihb95qf80mhd4v"; depends=[jiebaRD Rcpp]; };
 jiebaRD = derive { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; };
 jmetrik = derive { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; };
-joineR = derive { name="joineR"; version="1.0-3"; sha256="0q98nswbxk5dz8sazzd66jhlg7hv5x7wyzcvjc6zkr6ffvrl8xj7"; depends=[nlme MASS boot survival lattice statmod gdata]; };
+joineR = derive { name="joineR"; version="1.0-3"; sha256="0q98nswbxk5dz8sazzd66jhlg7hv5x7wyzcvjc6zkr6ffvrl8xj7"; depends=[boot gdata lattice MASS nlme statmod survival]; };
 joint_Cox = derive { name="joint.Cox"; version="1.1"; sha256="1zkj9ynxq521s23dz93m63valjf4amm19dcmcm8844fvnzbr7z4h"; depends=[]; };
 jointDiag = derive { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; };
 jointPm = derive { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; };
-jomo = derive { name="jomo"; version="0.2-0"; sha256="09vccbvy9y5p5w049l2v5qr1xbs915sihpddnrrjr4cc1w17ifzs"; depends=[]; };
+jomo = derive { name="jomo"; version="1.1-0"; sha256="109k9cpkf8wpw1z0g1ilglydx1k9jki2a675q6b19ip2zf2cinsz"; depends=[]; };
 jpeg = derive { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; };
 js = derive { name="js"; version="0.2"; sha256="1dxyyrmwwq07l6pdqsvxscpciy4h1021h9ymx8hi2vqvv0mdrz76"; depends=[V8]; };
 jsonlite = derive { name="jsonlite"; version="0.9.16"; sha256="12whrj9shnf8wd3a5yi9zcvinhgvik9nb2wp6202j869jdwxq5ym"; depends=[]; };
 jtrans = derive { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; };
 kSamples = derive { name="kSamples"; version="1.0.1"; sha256="11qylllwpm3rhrzmdlkbdqixpmx4qlvgmfwp9s4jfy5h3q68mfw7"; depends=[SuppDists]; };
 kappaSize = derive { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; };
-kappalab = derive { name="kappalab"; version="0.4-6"; sha256="0dmzy0d7azzfpnzbf8b7a6zgmmfwzfiybz8610asajyfsj36gszl"; depends=[lpSolve quadprog kernlab]; };
-kaps = derive { name="kaps"; version="1.0.2"; sha256="0jg4smbq51v88i3815icb284j97iam09pc52rv3izxa57nv9a0gz"; depends=[survival Formula coin]; };
-kcirt = derive { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[mvtnorm snowfall corpcor]; };
+kappalab = derive { name="kappalab"; version="0.4-6"; sha256="0dmzy0d7azzfpnzbf8b7a6zgmmfwzfiybz8610asajyfsj36gszl"; depends=[kernlab lpSolve quadprog]; };
+kaps = derive { name="kaps"; version="1.0.2"; sha256="0jg4smbq51v88i3815icb284j97iam09pc52rv3izxa57nv9a0gz"; depends=[coin Formula survival]; };
+kcirt = derive { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; };
+kdecopula = derive { name="kdecopula"; version="0.0.1"; sha256="100b3adwm95zspzzfm9lcbfic71knvzn2d3hs4k4mq187339sdlg"; depends=[cubature lattice locfit Rcpp RcppArmadillo VineCopula]; };
 kdetrees = derive { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; };
 kedd = derive { name="kedd"; version="1.0.2"; sha256="11mfgjr1pl56y4rcychs8xjgazy3vhg1xasr37fd0g32g7w3lxqg"; depends=[]; };
 kelvin = derive { name="kelvin"; version="1.2-2"; sha256="0fl2yxc0dpmkhq3f7711gd08i7jlzlfncin1d6q251dfnmwd7rzf"; depends=[Bessel]; };
-kequate = derive { name="kequate"; version="1.4.0"; sha256="0vr45y4f6x3080pf3k53nifavf8mfhikz54nis66c53fs9rp0jwf"; depends=[ltm equateIRT]; };
-kerdiest = derive { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[date chron evir]; };
-kernelFactory = derive { name="kernelFactory"; version="0.2.2"; sha256="1ms6732s17vx120xr2l423qmj0h880r522zsgp474pq3fxc0mr48"; depends=[randomForest AUC genalg kernlab]; };
+kequate = derive { name="kequate"; version="1.4.0"; sha256="0vr45y4f6x3080pf3k53nifavf8mfhikz54nis66c53fs9rp0jwf"; depends=[equateIRT ltm]; };
+kerdiest = derive { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; };
+kernelFactory = derive { name="kernelFactory"; version="0.2.2"; sha256="1ms6732s17vx120xr2l423qmj0h880r522zsgp474pq3fxc0mr48"; depends=[AUC genalg kernlab randomForest]; };
 kernlab = derive { name="kernlab"; version="0.9-20"; sha256="0gwl3v8gxidzfmvwa2icqla8ypdgnmvcwxf54iwrvvy2csjx0w27"; depends=[]; };
 keypress = derive { name="keypress"; version="1.0.0"; sha256="16msbanmbv2kf09qvl8bd9rf1vr7xgcjzjhzngyfyxv90va3k86b"; depends=[]; };
 kfigr = derive { name="kfigr"; version="1.1.0"; sha256="1mnnd603s741h1vp99q6d8lwvc46k9hmbhylng66wc7a5j6k8psz"; depends=[knitr]; };
 kimisc = derive { name="kimisc"; version="0.2-1"; sha256="1nbhw1q0p87w4z326wj5b4k0xdv0ybkgcc59b3cqbqhrdx8zsvql"; depends=[plyr]; };
 kin_cohort = derive { name="kin.cohort"; version="0.6"; sha256="13gnjk58m5kya9wj87klwm6h7cdqi61ba6y0cg9k1hgbc1ajy3s8"; depends=[survival]; };
-kineticF = derive { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm splancs sp plotrix MASS]; };
+kineticF = derive { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm MASS plotrix sp splancs]; };
 kinfit = derive { name="kinfit"; version="1.1.13"; sha256="1av33f4wns6qp79wyww70f7fsfybcqm83nby1ia65sjp2dz04dk1"; depends=[]; };
 kinship2 = derive { name="kinship2"; version="1.6.0"; sha256="06f544yk61i1xq0rm0r5gpzwfl6rvzyg7gz8z86bjyxg0z44h3vy"; depends=[Matrix quadprog]; };
 kintone = derive { name="kintone"; version="0.1.1"; sha256="13c82vkapks9j2crrb4awnhl60ld8b1r7xmy9yv4zzch868kcl5g"; depends=[RCurl rjson]; };
 kissmig = derive { name="kissmig"; version="1.0-3"; sha256="1pi1x3gdbqrhr1km1hqj15k8wyrgs697fnxgjgxga1irbn8bi482"; depends=[raster]; };
 kitagawa = derive { name="kitagawa"; version="2.1-0"; sha256="1ddyd0rwwmdpbq823qass5dlp2lvi9d64wpl61ik6fghms2p9ryr"; depends=[kelvin]; };
 kknn = derive { name="kknn"; version="1.2-5"; sha256="0c1qnn1lnypjybk2p0dpfrg6hzxflzbwmjb5biq45r57bzji7im7"; depends=[igraph Matrix]; };
-klaR = derive { name="klaR"; version="0.6-12"; sha256="10nkqb1zradbvifgv1fm373mhyydgdjjgmnw2442a2lark59z3vs"; depends=[MASS combinat]; };
-klausuR = derive { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[xtable psychometric polycor]; };
+klaR = derive { name="klaR"; version="0.6-12"; sha256="10nkqb1zradbvifgv1fm373mhyydgdjjgmnw2442a2lark59z3vs"; depends=[combinat MASS]; };
+klausuR = derive { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[polycor psychometric xtable]; };
 klin = derive { name="klin"; version="2007-02-05"; sha256="0j0hr4bppzk754a66q5z42h7jzfavqpxgl7y266804aginfqm1ax"; depends=[Matrix]; };
 km_ci = derive { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwgac56nhwc9p076ivylhms4w7cdf8v"; depends=[survival]; };
-kmc = derive { name="kmc"; version="0.1-2"; sha256="16lv8wk24cp91qg5202zhfmdhg83qw8bwiycknaml5ki820ffdlx"; depends=[rootSolve emplik Rcpp Rcpp]; };
+kmc = derive { name="kmc"; version="0.1-2"; sha256="16lv8wk24cp91qg5202zhfmdhg83qw8bwiycknaml5ki820ffdlx"; depends=[emplik Rcpp rootSolve]; };
 kmconfband = derive { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; };
-kmi = derive { name="kmi"; version="0.5.1"; sha256="0519mi7kwrsfpili7y8nmyiky6qwf8xkd0n7cwj02c8d119bk9sa"; depends=[survival mitools]; };
+kmi = derive { name="kmi"; version="0.5.1"; sha256="0519mi7kwrsfpili7y8nmyiky6qwf8xkd0n7cwj02c8d119bk9sa"; depends=[mitools survival]; };
 kml = derive { name="kml"; version="2.3.1"; sha256="1bnd8ssbhijxd9c9x7qn96jdkj1f1jnm46nw86164issxc6ypm5a"; depends=[clv longitudinalData]; };
-kml3d = derive { name="kml3d"; version="2.3"; sha256="0dlpxp8bbrwgblrl1hnc1ip592abc6sdcl87s4m6jwgfaxjcq7a8"; depends=[clv rgl misc3d longitudinalData kml]; };
+kml3d = derive { name="kml3d"; version="2.3"; sha256="0dlpxp8bbrwgblrl1hnc1ip592abc6sdcl87s4m6jwgfaxjcq7a8"; depends=[clv kml longitudinalData misc3d rgl]; };
 kmlcov = derive { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; };
 kmodR = derive { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; };
-knitcitations = derive { name="knitcitations"; version="1.0.6"; sha256="18jfrzazbk8cy9i7qvmmrn8c5cmkxvmdd894jpvak2gplxvsdx91"; depends=[RefManageR digest httr]; };
-knitr = derive { name="knitr"; version="1.10.5"; sha256="1qxpsnjwb4bdq44k3nglfrznpvqaqj18njx4imbpk3njzcjif7a7"; depends=[evaluate digest formatR highr markdown stringr yaml]; };
+knitcitations = derive { name="knitcitations"; version="1.0.6"; sha256="18jfrzazbk8cy9i7qvmmrn8c5cmkxvmdd894jpvak2gplxvsdx91"; depends=[digest httr RefManageR]; };
+knitr = derive { name="knitr"; version="1.10.5"; sha256="1qxpsnjwb4bdq44k3nglfrznpvqaqj18njx4imbpk3njzcjif7a7"; depends=[digest evaluate formatR highr markdown stringr yaml]; };
 knitrBootstrap = derive { name="knitrBootstrap"; version="0.9.0"; sha256="1cw5dvhjiypk6847qypxphfl9an54qjvd6qv029znhwijsg56mmg"; depends=[knitr markdown]; };
 knnGarden = derive { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; };
 knnIndep = derive { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; };
 knncat = derive { name="knncat"; version="1.2.2"; sha256="1d392910y3yy46j8my1a7m0xkij2rc6vwq5fg22qk00vqli8drz2"; depends=[]; };
 knockoff = derive { name="knockoff"; version="0.2.1"; sha256="197icnyxxmi6f0v0p2zm4910grbgkfjkd3xql79ny04ik047v0kp"; depends=[glmnet RJSONIO]; };
 koRpus = derive { name="koRpus"; version="0.05-5"; sha256="03rw0yb67y652j8hcr5m4c0py0rr3gp87y0hdxpypd81rkikwhfm"; depends=[]; };
-kobe = derive { name="kobe"; version="1.3.2"; sha256="1z64jwrq6ddpm22cvk2swmxl1j7qyz0ddk3880c7zfq6gk7f9bxl"; depends=[plyr reshape ggplot2 MASS emdbook coda]; };
+kobe = derive { name="kobe"; version="1.3.2"; sha256="1z64jwrq6ddpm22cvk2swmxl1j7qyz0ddk3880c7zfq6gk7f9bxl"; depends=[coda emdbook ggplot2 MASS plyr reshape]; };
 kofnGA = derive { name="kofnGA"; version="1.1"; sha256="1ykk3rmyrv8c556rl3wp0i1d522dghaq4qk5acg06hhk9j9962fg"; depends=[]; };
 kohonen = derive { name="kohonen"; version="2.0.18"; sha256="08inl7rx30gjpqbdbhccy65bingimzgi4lckfvs0r6lba04a1f8l"; depends=[class MASS]; };
-kolmim = derive { name="kolmim"; version="0.2"; sha256="1cq1miny83shxas4zijcbzcnxv29vjyxj3pip8brf52sjvrj4max"; depends=[]; };
+kolmim = derive { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; };
 kpodclustr = derive { name="kpodclustr"; version="1.0"; sha256="1fywgdj4q3kg8y9lwnj6vxg9cwgs5ccwj6m3knfgg92f8ghnsbsw"; depends=[clues]; };
 kriging = derive { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; };
 krm = derive { name="krm"; version="2015.3-4"; sha256="0zm2d3naprvv10ac28k4h2r6f1ygi8wic0gwbm6mvgwpb530gga1"; depends=[kyotil]; };
-ks = derive { name="ks"; version="1.9.4"; sha256="0gi93d981y2i5q80wxh7f4dwwh7sjw6iy63y7571nzf01yw00gbx"; depends=[KernSmooth misc3d mvtnorm rgl multicool]; };
+ks = derive { name="ks"; version="1.9.4"; sha256="0gi93d981y2i5q80wxh7f4dwwh7sjw6iy63y7571nzf01yw00gbx"; depends=[KernSmooth misc3d multicool mvtnorm rgl]; };
 kselection = derive { name="kselection"; version="0.2.0"; sha256="1arg96r2pldvb89rfqnfpjxwksyac2mhmbimbkwzm7wrnbnrcn5d"; depends=[]; };
 kst = derive { name="kst"; version="0.2-1"; sha256="1wy9cvvln994qgr0p7qa9qs1jd7gjv6ch65gg6i42cf9681m9h65"; depends=[proxy relations sets]; };
 ktsolve = derive { name="ktsolve"; version="1.1"; sha256="0b5myr093v3qaj9gzbw1w728i5ij418whxxpicj51w657dcy647k"; depends=[]; };
-ktspair = derive { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[]; };
+ktspair = derive { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[Biobase]; };
 kulife = derive { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; };
-kwb_hantush = derive { name="kwb.hantush"; version="0.2.1"; sha256="0rjnhhzvjhhl0r2ixz9vkgnqkrnnk772253zy7xkpadj7ws69jsf"; depends=[lattice hydroGOF]; };
+kwb_hantush = derive { name="kwb.hantush"; version="0.2.1"; sha256="0rjnhhzvjhhl0r2ixz9vkgnqkrnnk772253zy7xkpadj7ws69jsf"; depends=[hydroGOF lattice]; };
 kyotil = derive { name="kyotil"; version="2015.5-20"; sha256="08rpprs58c100x7sjxhvxm76msy888pvr1hy40k1b8gw0yw7fks7"; depends=[]; };
 kza = derive { name="kza"; version="3.0.0"; sha256="0v811ln9vg7msvks9lpgmdi39p01342yi8fj180aclha3mfk6gfw"; depends=[polynom]; };
 kzft = derive { name="kzft"; version="0.17"; sha256="1y6almhs1x21cr4bbf5fj3mnhp65ivzs869660cyg70sva853sv7"; depends=[polynom]; };
 kzs = derive { name="kzs"; version="1.4"; sha256="1srffwfg0ps8zx0c6hs2rc2y2p01qjl5g1ypqsbhq88vkcppx1w9"; depends=[lattice]; };
 l2boost = derive { name="l2boost"; version="1.0"; sha256="1p0sbvlnax4ba4wjkh3r0bmjs601k590g7bdfk6wxvlj42jxcnkl"; depends=[MASS]; };
 laGP = derive { name="laGP"; version="1.1-5"; sha256="15p958c95a68gr2xs8aw0l0sp0appv6islfbidlvxm8ph252hw6d"; depends=[tgp]; };
-labdsv = derive { name="labdsv"; version="1.7-0"; sha256="1r5vbmdijcrw0n3phdmfv8wiy7s08pidvhac4pnsxfmf98f74jby"; depends=[mgcv MASS rgl cluster]; };
+labdsv = derive { name="labdsv"; version="1.7-0"; sha256="1r5vbmdijcrw0n3phdmfv8wiy7s08pidvhac4pnsxfmf98f74jby"; depends=[cluster MASS mgcv rgl]; };
 label_switching = derive { name="label.switching"; version="1.3"; sha256="05kbxvrp0lm5913lhy7pgxr9cq64sm5hiz6ydmmgfmbmfirrcqyx"; depends=[combinat lpSolve]; };
 labeledLoop = derive { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; };
 labeling = derive { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; };
@@ -4250,13 +4266,13 @@ labeltodendro = derive { name="labeltodendro"; version="1.3"; sha256="13kpmv26zz
 labstatR = derive { name="labstatR"; version="1.0.7"; sha256="1p6xav9cb7yx3n8rkh8xm1jkykf3xw974id49j558hmayq47ad4f"; depends=[]; };
 laeken = derive { name="laeken"; version="0.4.6"; sha256="1rhkv1kk508pwln1d325iq4fink2ncssps0ypxi52j9d7wk78la6"; depends=[boot MASS]; };
 laercio = derive { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; };
-lakemorpho = derive { name="lakemorpho"; version="1.0"; sha256="0kxd493cccs24qqyw58110d2v5w8560qfnbm6qz7aki0xa7kaqrg"; depends=[maptools rgdal raster rgeos sp geosphere]; };
+lakemorpho = derive { name="lakemorpho"; version="1.0"; sha256="0kxd493cccs24qqyw58110d2v5w8560qfnbm6qz7aki0xa7kaqrg"; depends=[geosphere maptools raster rgdal rgeos sp]; };
 laketemps = derive { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; };
-lamW = derive { name="lamW"; version="0.1-1"; sha256="1ndf3rkkp87pivhymyqa3n5ng5y1kaa79ay84p4yk4z4h2887nq3"; depends=[Rcpp Rcpp]; };
+lamW = derive { name="lamW"; version="0.1-1"; sha256="1ndf3rkkp87pivhymyqa3n5ng5y1kaa79ay84p4yk4z4h2887nq3"; depends=[Rcpp]; };
 lambda_r = derive { name="lambda.r"; version="1.1.7"; sha256="1lxzrwyminc3dfb07pbn1rmj45kplxgsb17b06pzflj728knbqwa"; depends=[]; };
 lambda_tools = derive { name="lambda.tools"; version="1.0.7"; sha256="1hskmsd51lvfc634r6bb23vfz1vdkpbs9zac3a022cgqvhvnbmxb"; depends=[lambda_r]; };
 landpred = derive { name="landpred"; version="1.0"; sha256="1bl17xkx18i8i7arccnjmxvhjn4yiy7w64hg4n0xmhk8pg0l3mrg"; depends=[survival]; };
-landsat = derive { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[rgdal sp lmodel2 mgcv]; };
+landsat = derive { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[lmodel2 mgcv rgdal sp]; };
 languageR = derive { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; };
 lar = derive { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; };
 lars = derive { name="lars"; version="1.2"; sha256="0blj44wqrx6lmym1m9v6wkz8zxzbjax2zl6swgdczci0ixb5nx34"; depends=[]; };
@@ -4265,25 +4281,25 @@ lasso2 = derive { name="lasso2"; version="1.2-19"; sha256="0zkwjsd42a6z4gylq9xbs
 lassoscore = derive { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; };
 lassoshooting = derive { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; };
 latdiag = derive { name="latdiag"; version="0.2-1"; sha256="1xjy6as3wjrl2y1lc5fgrbhqqcvrhdan89mpgvk9cpx71wxv95vc"; depends=[]; };
-latentnet = derive { name="latentnet"; version="2.7.0"; sha256="0g0a2s00f6rc9r6vmwm32489qqiwihcllmypc2wgqwayfmy8innn"; depends=[statnet_common network ergm sna mvtnorm abind coda]; };
+latentnet = derive { name="latentnet"; version="2.7.0"; sha256="0g0a2s00f6rc9r6vmwm32489qqiwihcllmypc2wgqwayfmy8innn"; depends=[abind coda ergm mvtnorm network sna statnet_common]; };
 lattice = derive { name="lattice"; version="0.20-31"; sha256="1b3m3rg1zd8ssk5jjswk5y93js89vh6939kfajh6i6wphndxigb1"; depends=[]; };
-latticeDensity = derive { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[splancs spdep spatstat spam]; };
-latticeExtra = derive { name="latticeExtra"; version="0.6-26"; sha256="16x00sg76mga8p5q5ybaxs34q0ibml8wq91822faj5fmg7r1050d"; depends=[RColorBrewer lattice]; };
+latticeDensity = derive { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[spam spatstat spdep splancs]; };
+latticeExtra = derive { name="latticeExtra"; version="0.6-26"; sha256="16x00sg76mga8p5q5ybaxs34q0ibml8wq91822faj5fmg7r1050d"; depends=[lattice RColorBrewer]; };
 lava = derive { name="lava"; version="1.4.0"; sha256="0zf62xk2j1gbwxqglq6lsxs3f7fb0hynnlfh1w870xz8imgf20yp"; depends=[numDeriv]; };
 lava_tobit = derive { name="lava.tobit"; version="0.4-7"; sha256="1da98d5pndlbbw37k64fmr2mi1hvkhjxsmm3y9p4b772pz9i1pvj"; depends=[lava mvtnorm survival]; };
 lavaan = derive { name="lavaan"; version="0.5-18"; sha256="0ih5wvhmxln3w5h7q5w6gsmbs3w8118l9hc2afgsnzpg8a5jy1n3"; depends=[MASS mnormt pbivnorm quadprog]; };
-lavaan_survey = derive { name="lavaan.survey"; version="1.1"; sha256="1vscv165kilkc00pgs2s9qn404l3rv45zc9kzmrghxz42jsy04zc"; depends=[lavaan survey MASS Matrix]; };
-lawn = derive { name="lawn"; version="0.1.0"; sha256="0vv2qmz6a692ammh3jxnpq3b669s8cx61krmb97jlwjy2nb6r81i"; depends=[V8 jsonlite magrittr]; };
-lawstat = derive { name="lawstat"; version="2.5"; sha256="01y00jfapmh3bmrmz740flkahw0b8im8sp5ac8hsp4pf9k09cvws"; depends=[mvtnorm VGAM Kendall Hmisc]; };
+lavaan_survey = derive { name="lavaan.survey"; version="1.1"; sha256="1vscv165kilkc00pgs2s9qn404l3rv45zc9kzmrghxz42jsy04zc"; depends=[lavaan MASS Matrix survey]; };
+lawn = derive { name="lawn"; version="0.1.0"; sha256="0vv2qmz6a692ammh3jxnpq3b669s8cx61krmb97jlwjy2nb6r81i"; depends=[jsonlite magrittr V8]; };
+lawstat = derive { name="lawstat"; version="2.5"; sha256="01y00jfapmh3bmrmz740flkahw0b8im8sp5ac8hsp4pf9k09cvws"; depends=[Hmisc Kendall mvtnorm VGAM]; };
 lazy = derive { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; };
 lazyData = derive { name="lazyData"; version="1.0.3"; sha256="1i4jry54id8hhfla77pwk3rj2cci6na36hxj7k35k8lx666fdam2"; depends=[]; };
 lazyWeave = derive { name="lazyWeave"; version="2.2.5"; sha256="18j31lbbplxvrz4wnq7hfw9qcx1s0y4c34lbxwly2wyrvzjhxybl"; depends=[Hmisc survival]; };
 lazyeval = derive { name="lazyeval"; version="0.1.10"; sha256="02qfpn2fmy78vx4jxr7g7rhqzcm1kcivfwai7lbh0vvpawia0qwh"; depends=[]; };
-lba = derive { name="lba"; version="1.0"; sha256="108kfffwpvl6rjcmmxswprxxqcv1sj7w9mmca4pwaiprad7p7x59"; depends=[MASS alabama plotrix ca]; };
-lbfgs = derive { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp Rcpp]; };
+lba = derive { name="lba"; version="1.0"; sha256="108kfffwpvl6rjcmmxswprxxqcv1sj7w9mmca4pwaiprad7p7x59"; depends=[alabama ca MASS plotrix]; };
+lbfgs = derive { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; };
 lbfgsb3 = derive { name="lbfgsb3"; version="2015-2.13"; sha256="1jpy0j52w8kc8qnwcavjp3smvdwm1qgmswa9jyljpf72ln237vqw"; depends=[numDeriv]; };
 lbiassurv = derive { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; };
-lcd = derive { name="lcd"; version="0.7-3"; sha256="1jnnw15d4s8yb5z5jnzvmlrxv5x6n3h7wcdiz2nw4vfiqncnpwx4"; depends=[igraph MASS ggm]; };
+lcd = derive { name="lcd"; version="0.7-3"; sha256="1jnnw15d4s8yb5z5jnzvmlrxv5x6n3h7wcdiz2nw4vfiqncnpwx4"; depends=[ggm igraph MASS]; };
 lcda = derive { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; };
 lcmm = derive { name="lcmm"; version="1.7.2"; sha256="1sg5vx3nx8ik5z2c2pi3p9h5b5k0z7m1jc404jkv3gr17nilcp4i"; depends=[survival]; };
 lctools = derive { name="lctools"; version="0.2-2"; sha256="0yf30gjqp7adjw0l129xzmaj2wmc6hbqhdw35dfwwcxk5nys5dq0"; depends=[reshape weights]; };
@@ -4293,89 +4309,90 @@ ldlasso = derive { name="ldlasso"; version="3.2"; sha256="0ij68zvgm8dfd2qwx6h6yg
 ldr = derive { name="ldr"; version="1.3.3"; sha256="1c48qm388zlya186qmsbxxdcg1mdv3nc3i96lqb40yhcx2yshbip"; depends=[GrassmannOptim Matrix]; };
 leaderCluster = derive { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; };
 leafletR = derive { name="leafletR"; version="0.3-3"; sha256="00xdmlv6wc47lzlm43d2klyzcqljsgrfrmd5cv8brkvvcsyj57kq"; depends=[brew jsonlite]; };
-leapp = derive { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[MASS corpcor]; };
+leapp = derive { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[corpcor MASS sva]; };
 leaps = derive { name="leaps"; version="2.9"; sha256="1ax9v983401hvb6cdswkc1k7j62j8yk6ds22qdj24vdidhdz5979"; depends=[]; };
 learningr = derive { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; };
-learnstats = derive { name="learnstats"; version="0.1.0"; sha256="03rlyh7ynxxvnkx8r8611ss36aqc8mdk6w2kjajmmsdwzp81lgnc"; depends=[RcmdrPlugin_epack ggplot2 shiny rmarkdown Rcmdr]; };
-lefse = derive { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape picante geiger fBasics SDMTools vegan]; };
+learnstats = derive { name="learnstats"; version="0.1.0"; sha256="03rlyh7ynxxvnkx8r8611ss36aqc8mdk6w2kjajmmsdwzp81lgnc"; depends=[ggplot2 Rcmdr RcmdrPlugin_epack rmarkdown shiny]; };
+lefse = derive { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape fBasics geiger picante SDMTools vegan]; };
 leiv = derive { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; };
-lessR = derive { name="lessR"; version="3.3.1"; sha256="1nwvkxi9q7fsjgrfpa16ry54cyk2ja5cy4cq0xzqya6wn04mbicg"; depends=[car leaps MBESS foreign gdata triangle]; };
+lessR = derive { name="lessR"; version="3.3.1"; sha256="1nwvkxi9q7fsjgrfpa16ry54cyk2ja5cy4cq0xzqya6wn04mbicg"; depends=[car foreign gdata leaps MBESS triangle]; };
 lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; };
-letsR = derive { name="letsR"; version="2.1"; sha256="0jgc6k2hbpbr7kl42n01mff7pzjz60zd8mchrfhzgd797pwcqlbq"; depends=[raster maps XML geosphere fields maptools sp rgdal]; };
+letsR = derive { name="letsR"; version="2.1"; sha256="0jgc6k2hbpbr7kl42n01mff7pzjz60zd8mchrfhzgd797pwcqlbq"; depends=[fields geosphere maps maptools raster rgdal sp XML]; };
 lfactors = derive { name="lfactors"; version="0.4.0"; sha256="1f4p5mp6m11njrj421vjl5398laicgyg8m04srshfmpi74hf1nb9"; depends=[]; };
-lfe = derive { name="lfe"; version="2.3-1709"; sha256="0q6va05n38225a7sbk0ykdrygzjk6js6afm2vyy5fac1hbvihb05"; depends=[Matrix Formula xtable]; };
-lfl = derive { name="lfl"; version="1.1"; sha256="1hrdhp2r17qwns5hya9sl03q93h934whqyqsn8mdrsavc64i649v"; depends=[Rcpp foreach forecast plyr tseries e1071 zoo Rcpp]; };
-lfstat = derive { name="lfstat"; version="0.6.1"; sha256="0i3zrinvjxlg9w5zqrv8wzy15vxvi2gw3jrlfs4rddkxnp98ya9d"; depends=[lattice lmom lmomRFA latticeExtra]; };
+lfe = derive { name="lfe"; version="2.3-1709"; sha256="0q6va05n38225a7sbk0ykdrygzjk6js6afm2vyy5fac1hbvihb05"; depends=[Formula Matrix xtable]; };
+lfl = derive { name="lfl"; version="1.1"; sha256="1hrdhp2r17qwns5hya9sl03q93h934whqyqsn8mdrsavc64i649v"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; };
+lfstat = derive { name="lfstat"; version="0.6.1"; sha256="0i3zrinvjxlg9w5zqrv8wzy15vxvi2gw3jrlfs4rddkxnp98ya9d"; depends=[lattice latticeExtra lmom lmomRFA]; };
 lga = derive { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; };
 lgarch = derive { name="lgarch"; version="0.5"; sha256="01y5p3w4i1yfxb647pkdazqn9yac1p6jp7rk92ddxnvvjb6fdp59"; depends=[zoo]; };
-lgcp = derive { name="lgcp"; version="1.3-9"; sha256="093rxvb4irmf04nx1j5zrgh8k0jw78zl9qrmkn314vaqyn3b4608"; depends=[spatstat sp raster RandomFields iterators ncdf rpanel fields maptools Matrix rgeos]; };
+lgcp = derive { name="lgcp"; version="1.3-9"; sha256="093rxvb4irmf04nx1j5zrgh8k0jw78zl9qrmkn314vaqyn3b4608"; depends=[fields iterators maptools Matrix ncdf RandomFields raster rgeos rpanel sp spatstat]; };
 lgtdl = derive { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypdky9rypy607mr8brwimjn8k1f0gx4"; depends=[]; };
 lhs = derive { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; };
 libamtrack = derive { name="libamtrack"; version="0.6.1"; sha256="0kg3lp1f40hymr2nxq7immxnqryavad91xp6l6x4qyp0cb02870a"; depends=[]; };
-lifecontingencies = derive { name="lifecontingencies"; version="1.1.6"; sha256="07gvq93p2f8s4a43h596xmzifnx1jwnfyg5giqhlfvxnq6wdbvrr"; depends=[markovchain Rcpp Rcpp]; };
-likeLTD = derive { name="likeLTD"; version="5.5.0"; sha256="111wdszkk2bdi9sz6gfih32kib0ig9bp4xlq6wl5r5zx3nrlj5zb"; depends=[DEoptim ggplot2 gtools rtf gdata]; };
+lifecontingencies = derive { name="lifecontingencies"; version="1.1.6"; sha256="07gvq93p2f8s4a43h596xmzifnx1jwnfyg5giqhlfvxnq6wdbvrr"; depends=[markovchain Rcpp]; };
+likeLTD = derive { name="likeLTD"; version="5.5.0"; sha256="111wdszkk2bdi9sz6gfih32kib0ig9bp4xlq6wl5r5zx3nrlj5zb"; depends=[DEoptim gdata ggplot2 gtools rtf]; };
 likelihood = derive { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; };
-likert = derive { name="likert"; version="1.2"; sha256="1x1mlaqzwr15xzcfq9934jxb3m5irvw6yivirrj45wscxn3kz5s1"; depends=[ggplot2 xtable psych reshape gridExtra plyr]; };
-limSolve = derive { name="limSolve"; version="1.5.5.1"; sha256="0anrbhw07mird9fj96x1p0gynjnjcj07gpwlq0ffjlqq2qmkzgqs"; depends=[quadprog lpSolve MASS]; };
+likelihoodAsy = derive { name="likelihoodAsy"; version="0.40"; sha256="1zgqs9pcsb45s414kqbhvsb9cxag0imla682981lqvrbli13p2kg"; depends=[alabama cond nleqslv pracma Rsolnp]; };
+likert = derive { name="likert"; version="1.2"; sha256="1x1mlaqzwr15xzcfq9934jxb3m5irvw6yivirrj45wscxn3kz5s1"; depends=[ggplot2 gridExtra plyr psych reshape xtable]; };
+limSolve = derive { name="limSolve"; version="1.5.5.1"; sha256="0anrbhw07mird9fj96x1p0gynjnjcj07gpwlq0ffjlqq2qmkzgqs"; depends=[lpSolve MASS quadprog]; };
 limitplot = derive { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; };
 linLIR = derive { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; };
 linbin = derive { name="linbin"; version="0.1.0"; sha256="0812m19kfscb0d23rv0llziapd269r7zlm2yq8h3yp8c8jl8gdb1"; depends=[]; };
-lineup = derive { name="lineup"; version="0.34-1"; sha256="0p6gxbv8xdrhgk8zdlnqrybald9vqz717czb49b123h84rjr2f19"; depends=[qtl class]; };
+lineup = derive { name="lineup"; version="0.34-1"; sha256="0p6gxbv8xdrhgk8zdlnqrybald9vqz717czb49b123h84rjr2f19"; depends=[class qtl]; };
 linkR = derive { name="linkR"; version="1.0.0"; sha256="1l936i74h1s42w1d7nn220rjygc6n0jkjidvix1df2wlacnswzpg"; depends=[svgViewR]; };
-linkcomm = derive { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[igraph RColorBrewer dynamicTreeCut]; };
+linkcomm = derive { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[dynamicTreeCut igraph RColorBrewer]; };
 linkim = derive { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; };
 linprog = derive { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; };
-lint = derive { name="lint"; version="0.3"; sha256="0lkrn5nsizyixhdp5njxgrgwmygwr663jxv5k9a22a63x1qbwpiq"; depends=[plyr harvestr stringr dostats foreach]; };
-lintr = derive { name="lintr"; version="0.2.0"; sha256="14jaghvd0kz271j6wl8j0y31h48ajvgzd68drdi6pv9nrxqs046n"; depends=[rex crayon codetools stringdist testthat digest igraph]; };
-liso = derive { name="liso"; version="0.2"; sha256="072l7ac1fbkh8baiiwx2psiv1sd7h8ggmgk5xkzml069ihhldj5i"; depends=[MASS Iso]; };
+lint = derive { name="lint"; version="0.3"; sha256="0lkrn5nsizyixhdp5njxgrgwmygwr663jxv5k9a22a63x1qbwpiq"; depends=[dostats foreach harvestr plyr stringr]; };
+lintr = derive { name="lintr"; version="0.2.0"; sha256="14jaghvd0kz271j6wl8j0y31h48ajvgzd68drdi6pv9nrxqs046n"; depends=[codetools crayon digest igraph rex stringdist testthat]; };
+liso = derive { name="liso"; version="0.2"; sha256="072l7ac1fbkh8baiiwx2psiv1sd7h8ggmgk5xkzml069ihhldj5i"; depends=[Iso MASS]; };
 lisp = derive { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; };
 lisrelToR = derive { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; };
-list = derive { name="list"; version="8.0"; sha256="09qpcsygs2clbgd42v6klgh1vjhv64s56ixxqlcpg9v7xqnms56j"; depends=[sandwich VGAM magic gamlss_dist MASS quadprog corpcor mvtnorm coda]; };
+list = derive { name="list"; version="8.0"; sha256="09qpcsygs2clbgd42v6klgh1vjhv64s56ixxqlcpg9v7xqnms56j"; depends=[coda corpcor gamlss_dist magic MASS mvtnorm quadprog sandwich VGAM]; };
 listenv = derive { name="listenv"; version="0.3.0"; sha256="14zi2zs6jxcq0j5knf5nlr06xk7n0vvfgbh2lqdjq0pvjbm8j08b"; depends=[]; };
-llama = derive { name="llama"; version="0.8.1"; sha256="0pv411kj4n3pi2yg35jzjd4zfxkqksbp049v6d9xd2q14i9kphv2"; depends=[mlr rJava parallelMap ggplot2 checkmate]; };
-lle = derive { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[scatterplot3d MASS snowfall]; };
-lllcrc = derive { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[data_table combinat VGAM plyr]; };
+llama = derive { name="llama"; version="0.8.1"; sha256="0pv411kj4n3pi2yg35jzjd4zfxkqksbp049v6d9xd2q14i9kphv2"; depends=[checkmate ggplot2 mlr parallelMap rJava]; };
+lle = derive { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[MASS scatterplot3d snowfall]; };
+lllcrc = derive { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[combinat data_table plyr VGAM]; };
 lm_beta = derive { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; };
-lm_br = derive { name="lm.br"; version="2.6"; sha256="1f7cxd6ksspgpz2lnppyb466lgis5isk0bj8z4bjiwk4abg4lg3i"; depends=[Rcpp Rcpp]; };
-lmSupport = derive { name="lmSupport"; version="2.9.2"; sha256="0mdl5ih7zzxynawxx4prh08nq451x74bfw4ga7cygl2ahi6vqq50"; depends=[car psych gvlma AICcmodavg lme4 pbkrtest]; };
-lme4 = derive { name="lme4"; version="1.1-7"; sha256="0v9vl9rspakyw2dmcl5lbhv1nlg10yhgdvi3gpfnizln7xw9ksyp"; depends=[Matrix Rcpp MASS nlme lattice minqa nloptr Rcpp RcppEigen]; };
-lmeNB = derive { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[numDeriv statmod lmeNBBayes]; };
+lm_br = derive { name="lm.br"; version="2.6"; sha256="1f7cxd6ksspgpz2lnppyb466lgis5isk0bj8z4bjiwk4abg4lg3i"; depends=[Rcpp]; };
+lmSupport = derive { name="lmSupport"; version="2.9.2"; sha256="0mdl5ih7zzxynawxx4prh08nq451x74bfw4ga7cygl2ahi6vqq50"; depends=[AICcmodavg car gvlma lme4 pbkrtest psych]; };
+lme4 = derive { name="lme4"; version="1.1-7"; sha256="0v9vl9rspakyw2dmcl5lbhv1nlg10yhgdvi3gpfnizln7xw9ksyp"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; };
+lmeNB = derive { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; };
 lmeNBBayes = derive { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; };
 lmeSplines = derive { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; };
 lmeVarComp = derive { name="lmeVarComp"; version="1.0"; sha256="17zrl33h4lcd8lpdv3d12h5afj8nxr2lyw6699zq4fds2chbq66l"; depends=[]; };
 lmec = derive { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; };
 lmenssp = derive { name="lmenssp"; version="1.0"; sha256="0a1q9ax0pnz9gcv4nzgay9lznaz9gp27jj6vp6la7vfhrfg5qcg6"; depends=[MASS nlme]; };
-lmerTest = derive { name="lmerTest"; version="2.0-25"; sha256="13psyrll5srxahyk4fhp77fds9mxgnargpv2wxjpy3cv8f5b1vpm"; depends=[Matrix lme4 plyr MASS Hmisc ggplot2]; };
+lmerTest = derive { name="lmerTest"; version="2.0-25"; sha256="13psyrll5srxahyk4fhp77fds9mxgnargpv2wxjpy3cv8f5b1vpm"; depends=[ggplot2 Hmisc lme4 MASS Matrix plyr]; };
 lmf = derive { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; };
-lmfor = derive { name="lmfor"; version="1.1"; sha256="0bbcgpcx0xjla128w80xlxp6i6hnrk4wjwqih66zvyjaf5sz7wx9"; depends=[nlme MASS]; };
+lmfor = derive { name="lmfor"; version="1.1"; sha256="0bbcgpcx0xjla128w80xlxp6i6hnrk4wjwqih66zvyjaf5sz7wx9"; depends=[MASS nlme]; };
 lmm = derive { name="lmm"; version="1.0"; sha256="0x5ikb1db99dsn476mf4253dlznlxa1cwnykg1nwnm2vy5qym2fq"; depends=[]; };
-lmmfit = derive { name="lmmfit"; version="1.0"; sha256="06mzmx7md7qw5mfhgdljc7i40sx9yrx7j57xbbp3fhl2zs1dpb4g"; depends=[nlme MASS]; };
+lmmfit = derive { name="lmmfit"; version="1.0"; sha256="06mzmx7md7qw5mfhgdljc7i40sx9yrx7j57xbbp3fhl2zs1dpb4g"; depends=[MASS nlme]; };
 lmmlasso = derive { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; };
-lmmot = derive { name="lmmot"; version="0.1.2"; sha256="1c7cn1g1fl8nwjzm78a8qgw9da170f1q0z5vxl446f167ix5ppkp"; depends=[maxLik MASS]; };
-lmms = derive { name="lmms"; version="1.2"; sha256="12wli7iwnihq42pa1jy1ml4y3l93grwrv9n7vpgp5wp1hj4d1s8c"; depends=[nlme lmeSplines reshape gdata gplots ggplot2]; };
+lmmot = derive { name="lmmot"; version="0.1.2"; sha256="1c7cn1g1fl8nwjzm78a8qgw9da170f1q0z5vxl446f167ix5ppkp"; depends=[MASS maxLik]; };
+lmms = derive { name="lmms"; version="1.2"; sha256="12wli7iwnihq42pa1jy1ml4y3l93grwrv9n7vpgp5wp1hj4d1s8c"; depends=[gdata ggplot2 gplots lmeSplines nlme reshape]; };
 lmodel2 = derive { name="lmodel2"; version="1.7-2"; sha256="0dyzxflr82k7ns824zlycj502jx3qmgrck125im2k2da34ir3m3q"; depends=[]; };
 lmom = derive { name="lmom"; version="2.5"; sha256="0s2x8k6p71hxdqggy8ajk7p9p040b9xr3lm49g31z3kcsmzvk23q"; depends=[]; };
 lmomRFA = derive { name="lmomRFA"; version="3.0-1"; sha256="0lf8n6bhdv3px6p60smghvmwsbgawvjrmgy2dfhs517n67pxg30i"; depends=[lmom]; };
 lmomco = derive { name="lmomco"; version="2.1.4"; sha256="02c2yhfr08hzlyn2nmfdfvmc3xrc3pp4agc6nkg4w6kk74r003h1"; depends=[]; };
 lmtest = derive { name="lmtest"; version="0.9-34"; sha256="0bhdfwrrwjkmlw0wwx7rh6lhdjp68p7db5zfzginnv3dxmksvvl6"; depends=[zoo]; };
-loa = derive { name="loa"; version="0.2.22"; sha256="13j4d4d35nd2ssmkghpd6azysmy7g8mc9y3glkzjnddp1xxz8icn"; depends=[lattice MASS png RgoogleMaps RColorBrewer]; };
+loa = derive { name="loa"; version="0.2.22"; sha256="13j4d4d35nd2ssmkghpd6azysmy7g8mc9y3glkzjnddp1xxz8icn"; depends=[lattice MASS png RColorBrewer RgoogleMaps]; };
 localdepth = derive { name="localdepth"; version="0.5-7"; sha256="0h0y74xnhdqa7y51ljmpz7ayznppvy2ll06wfds6200lb9cxgr7k"; depends=[circular]; };
-localgauss = derive { name="localgauss"; version="0.34"; sha256="04bn777kcxaa5s4zf0r9gclar32y9wpzqnx2rxxhqrxyy419gw37"; depends=[ggplot2 MASS foreach matrixStats]; };
+localgauss = derive { name="localgauss"; version="0.34"; sha256="04bn777kcxaa5s4zf0r9gclar32y9wpzqnx2rxxhqrxyy419gw37"; depends=[foreach ggplot2 MASS matrixStats]; };
 localsolver = derive { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j9agfp8jysll7lqk1ai23hkdqkn6wwxj442llv4"; depends=[]; };
 locfit = derive { name="locfit"; version="1.5-9.1"; sha256="0lafrmq1q7x026m92h01hc9cjjiximqqi3v1g2hw7ai9vf7i897m"; depends=[lattice]; };
-locits = derive { name="locits"; version="1.4"; sha256="1q9vsf5h4n7r4gy1dwdhfyq3n0rn33akb3nx6yzinncj4w4cqq0h"; depends=[wavethresh igraph]; };
+locits = derive { name="locits"; version="1.4"; sha256="1q9vsf5h4n7r4gy1dwdhfyq3n0rn33akb3nx6yzinncj4w4cqq0h"; depends=[igraph wavethresh]; };
 locpol = derive { name="locpol"; version="0.6-0"; sha256="1zpdh3g7yx3rcn3rhlc3dm19c4b9kx2k8wy8vkwh744a1kysvdga"; depends=[]; };
-lodGWAS = derive { name="lodGWAS"; version="1.0-3"; sha256="1fb70p2mvp742557ns44ilb9m85aqq59p5x6vdrmb22hczsjj6q4"; depends=[survival rms]; };
-loe = derive { name="loe"; version="1.0"; sha256="11wjzq4h7qjrnrj1zg3msg1ksld9c3r3n3biamf2hz8zvi1asvqv"; depends=[igraph MASS vegan Matrix]; };
+lodGWAS = derive { name="lodGWAS"; version="1.0-3"; sha256="1fb70p2mvp742557ns44ilb9m85aqq59p5x6vdrmb22hczsjj6q4"; depends=[rms survival]; };
+loe = derive { name="loe"; version="1.0"; sha256="11wjzq4h7qjrnrj1zg3msg1ksld9c3r3n3biamf2hz8zvi1asvqv"; depends=[igraph MASS Matrix vegan]; };
 log4r = derive { name="log4r"; version="0.2"; sha256="07q8m7z2sxm6n25a62invf76qakxdsijfh3272spc8xrmdmyw6rj"; depends=[]; };
 logbin = derive { name="logbin"; version="1.2"; sha256="1jfkg5rx51hm2skwwafqiw6ajdijdm0cniral3j5flidinsbsbcm"; depends=[glm2]; };
 logconPH = derive { name="logconPH"; version="1.5"; sha256="05fkibgh5nzs8c4f39kzg4zyh2dfhg1k69hlx7l8p442snajsg92"; depends=[]; };
 logconcens = derive { name="logconcens"; version="0.16-4"; sha256="11bk03kjlb747g54axmb0nayz226g41xvanbw79aij76vjbglv7y"; depends=[]; };
 logcondens = derive { name="logcondens"; version="2.1.3"; sha256="0fg7dsila67k80kbh1m1l69pb0pwwr893lkian7a8abx3a1qclij"; depends=[ks]; };
-logcondens_mode = derive { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[logcondens distr]; };
-logcondiscr = derive { name="logcondiscr"; version="1.0.5"; sha256="170rg4rqch0mlhmc1zc59h271b57y3xfxrc3gh9pwvc9r11gw7k5"; depends=[Matrix mvtnorm cobs]; };
+logcondens_mode = derive { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[distr logcondens]; };
+logcondiscr = derive { name="logcondiscr"; version="1.0.5"; sha256="170rg4rqch0mlhmc1zc59h271b57y3xfxrc3gh9pwvc9r11gw7k5"; depends=[cobs Matrix mvtnorm]; };
 logging = derive { name="logging"; version="0.7-103"; sha256="1sp7q217awizb6l8c9p5dix6skpq8j7w8i088x4mm0fc0qr1ba5c"; depends=[]; };
-logistf = derive { name="logistf"; version="1.21"; sha256="0cwbmd0mvj4wywpx7p4lhs70nhab7bfl6fzz2c4snn3ma6sy7x8c"; depends=[mice mgcv]; };
+logistf = derive { name="logistf"; version="1.21"; sha256="0cwbmd0mvj4wywpx7p4lhs70nhab7bfl6fzz2c4snn3ma6sy7x8c"; depends=[mgcv mice]; };
 logitchoice = derive { name="logitchoice"; version="0.9.4"; sha256="1vkw7cwp7nwrsj9ifn4gz21zbw9da5rph9lr3w466zxkzdkbldqj"; depends=[]; };
 logitnorm = derive { name="logitnorm"; version="0.8.29"; sha256="0wbdxh3n44nzb6c0ahyd8gndfql1y56fns2bkmzqi3nxy9blhx18"; depends=[]; };
 loglognorm = derive { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; };
@@ -4386,29 +4403,29 @@ lomb = derive { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvb
 longCatEDA = derive { name="longCatEDA"; version="0.17"; sha256="1yb0117ycj4079590mrx3lg9m5k7xd1dhb779r3rmnww94pmvja9"; depends=[]; };
 longclust = derive { name="longclust"; version="1.2"; sha256="1m270fyvfz0w19p9xdv7ihy19nhrhjq2akymbp774073crznmmw0"; depends=[]; };
 longitudinal = derive { name="longitudinal"; version="1.1.11"; sha256="0rzi177v9k6gy1wv06vf81r1q0ml81ssf83v0z8rpmx5j91d71ac"; depends=[corpcor]; };
-longitudinalData = derive { name="longitudinalData"; version="2.3"; sha256="0ld2saga04if2zp3ylz720q8451f7a7aiva5hpj471wxd0948592"; depends=[clv class rgl misc3d]; };
+longitudinalData = derive { name="longitudinalData"; version="2.3"; sha256="0ld2saga04if2zp3ylz720q8451f7a7aiva5hpj471wxd0948592"; depends=[class clv misc3d rgl]; };
 longmemo = derive { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; };
-longpower = derive { name="longpower"; version="1.0-11"; sha256="1l1icy653d67wlvigcya8glhqh2746cr1vh1khx36qjhfjz6wgyf"; depends=[Matrix lme4 nlme]; };
+longpower = derive { name="longpower"; version="1.0-11"; sha256="1l1icy653d67wlvigcya8glhqh2746cr1vh1khx36qjhfjz6wgyf"; depends=[lme4 Matrix nlme]; };
 loop = derive { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; };
-loopr = derive { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[plyr dplyr magrittr lazyeval R6]; };
-lordif = derive { name="lordif"; version="0.2-2"; sha256="0898k5w9wky318k8x0zknjqdzdify0yyrnb1506j341l4n1bm04s"; depends=[MASS msm mvtnorm polycor sfsmisc ltm Hmisc rms]; };
+loopr = derive { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[dplyr lazyeval magrittr plyr R6]; };
+lordif = derive { name="lordif"; version="0.2-2"; sha256="0898k5w9wky318k8x0zknjqdzdify0yyrnb1506j341l4n1bm04s"; depends=[Hmisc ltm MASS msm mvtnorm polycor rms sfsmisc]; };
 lorec = derive { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; };
 lpSolve = derive { name="lpSolve"; version="5.6.11"; sha256="0mgpns9wflqaz9ynwxwkvmc1694yhf275wgrqfjfy3qxz1hxq7s0"; depends=[]; };
 lpSolveAPI = derive { name="lpSolveAPI"; version="5.5.2.0-14"; sha256="1ffmb9xv6m25ii4n7v576g8xw31qlsxd99ka8cjdhqs7fbr4ng5x"; depends=[]; };
 lpc = derive { name="lpc"; version="1.0.2"; sha256="1r6ynkhqjic1m7fqrqsp7f8rpxqih5idn4j96fqrdj8nj01znv29"; depends=[]; };
 lpint = derive { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; };
-lpme = derive { name="lpme"; version="1.0.1"; sha256="0f0xphlxl0ma3s2miadl74cb1l20cikqgk3nc1dg5ml05cqzhyxr"; depends=[Rcpp Rcpp RcppArmadillo]; };
+lpme = derive { name="lpme"; version="1.0.1"; sha256="0f0xphlxl0ma3s2miadl74cb1l20cikqgk3nc1dg5ml05cqzhyxr"; depends=[Rcpp RcppArmadillo]; };
 lpmodeler = derive { name="lpmodeler"; version="0.2-1"; sha256="17k67l03dkjx61p4hwswghjm6awk0zx173x9xafxrfd8jrgsf6kf"; depends=[slam]; };
 lpridge = derive { name="lpridge"; version="1.0-7"; sha256="0nkl70fwzra308bzlhjfpkxr8hpd8v1xdnah7nscxa10qlisgr2k"; depends=[]; };
 lqa = derive { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxxqch4z3qizvpazjy8qifng29q"; depends=[]; };
-lqmm = derive { name="lqmm"; version="1.5.1"; sha256="1myv2v2059vlni1npxyv6ii846aiqz1mvyz9r9n5vpzgz92abizi"; depends=[SparseGrid nlme]; };
+lqmm = derive { name="lqmm"; version="1.5.1"; sha256="1myv2v2059vlni1npxyv6ii846aiqz1mvyz9r9n5vpzgz92abizi"; depends=[nlme SparseGrid]; };
 lrmest = derive { name="lrmest"; version="1.0"; sha256="1gdj8pmmzvs1li05pwhad63blhibq45xd1acajxsx06k7k21ajs7"; depends=[MASS]; };
 lsa = derive { name="lsa"; version="0.73.1"; sha256="1af8s32hkri1hpngl9skd6s5x6vb8nqzgnkv0s38yvgsja4xm1g5"; depends=[SnowballC]; };
-lsbclust = derive { name="lsbclust"; version="1.0.2"; sha256="03vaf9l0fy3pdr3cqb937nw8s7ky25njc3fnl4hdpc8rj7m44hwf"; depends=[ggplot2 plyr clue gridExtra reshape2 Rcpp Rcpp]; };
+lsbclust = derive { name="lsbclust"; version="1.0.2"; sha256="03vaf9l0fy3pdr3cqb937nw8s7ky25njc3fnl4hdpc8rj7m44hwf"; depends=[clue ggplot2 gridExtra plyr Rcpp reshape2]; };
 lsdv = derive { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; };
-lsgl = derive { name="lsgl"; version="1.0.123.1"; sha256="10q3f56yjgs3kvyk7b7d1xi06sa16pv9y3c6lsp1461whqvinpj4"; depends=[sglOptim Matrix sglOptim Rcpp RcppProgress RcppArmadillo BH]; };
+lsgl = derive { name="lsgl"; version="1.0.123.1"; sha256="10q3f56yjgs3kvyk7b7d1xi06sa16pv9y3c6lsp1461whqvinpj4"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
 lshorth = derive { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; };
-lsmeans = derive { name="lsmeans"; version="2.18"; sha256="1wnpn4hngjcfr44apsw85g3x4wm3ma7msg2n4dnadj0w0zbf0fq4"; depends=[estimability coda multcomp plyr mvtnorm]; };
+lsmeans = derive { name="lsmeans"; version="2.18"; sha256="1wnpn4hngjcfr44apsw85g3x4wm3ma7msg2n4dnadj0w0zbf0fq4"; depends=[coda estimability multcomp mvtnorm plyr]; };
 lspls = derive { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; };
 lsr = derive { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; };
 lss = derive { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; };
@@ -4418,94 +4435,94 @@ ltmle = derive { name="ltmle"; version="0.9-6"; sha256="0q65ha7j3q9myhsafcmjwyxj
 ltsa = derive { name="ltsa"; version="1.4.4"; sha256="06db0d4j0kqp4q6rpa3sawcsm5rfgdhzl8fl7cxivjbbyrfnszqp"; depends=[]; };
 ltsbase = derive { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; };
 ltsk = derive { name="ltsk"; version="1.0.3"; sha256="17l4mwggd4s39l6x1b6gvwgd6gjl0h37wfis1i6l9k6hiaqhb6vr"; depends=[fields]; };
-lubridate = derive { name="lubridate"; version="1.3.3"; sha256="1f07z3f90vbghsarwjzn2nj6qz8qyfkqalszx8cb5kliijdkwy8z"; depends=[plyr stringr memoise]; };
-luca = derive { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[survival genetics]; };
+lubridate = derive { name="lubridate"; version="1.3.3"; sha256="1f07z3f90vbghsarwjzn2nj6qz8qyfkqalszx8cb5kliijdkwy8z"; depends=[memoise plyr stringr]; };
+luca = derive { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[genetics survival]; };
 lucid = derive { name="lucid"; version="1.2"; sha256="1rvc5d7sb0bcncw79g13i1rxjicngbpln9hq0qfdi7yx9hhrdpnz"; depends=[nlme]; };
 lunar = derive { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; };
-lvm4net = derive { name="lvm4net"; version="0.2"; sha256="0al0answp3rngq69bl3ch6ylil22wdp1c047yi5gbga853p7db0c"; depends=[MASS ergm network ellipse igraph]; };
+lvm4net = derive { name="lvm4net"; version="0.2"; sha256="0al0answp3rngq69bl3ch6ylil22wdp1c047yi5gbga853p7db0c"; depends=[ellipse ergm igraph MASS network]; };
 lxb = derive { name="lxb"; version="1.3"; sha256="0mvjk0s9bzvznjy0cxjsqv28f6jjzvr713b2346ym4cm0y4l3mir"; depends=[]; };
-lymphclon = derive { name="lymphclon"; version="1.3.0"; sha256="1jns41sk2rx1j3mg06dzy434k30gpfhbkn6s47fmyv1y8701vfl0"; depends=[MASS expm corpcor]; };
+lymphclon = derive { name="lymphclon"; version="1.3.0"; sha256="1jns41sk2rx1j3mg06dzy434k30gpfhbkn6s47fmyv1y8701vfl0"; depends=[corpcor expm MASS]; };
 m4fe = derive { name="m4fe"; version="0.1"; sha256="06lh45591z2lc6lw91vyn066x0m1zwxxfp6nbirp1rz901v843ph"; depends=[]; };
 mAr = derive { name="mAr"; version="1.1-2"; sha256="0i9zp8n8i3fxldgvwj045scss533zsv8p476lsla294gp174njr7"; depends=[MASS]; };
 mFilter = derive { name="mFilter"; version="0.1-3"; sha256="1cz9d8447iiy7sq47civ1lcjafqdqs40lzxm2a4alw4wy57hc2h6"; depends=[]; };
-mGSZ = derive { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[GSA MASS ismev]; };
-mQTL = derive { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[qtl MASS outliers]; };
-mRMRe = derive { name="mRMRe"; version="2.0.5"; sha256="1lhpamjy8dbk3lzjj0wj041cg99rw6925i9fq297c93jxq562414"; depends=[survival igraph]; };
+mGSZ = derive { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[Biobase GSA ismev limma MASS]; };
+mQTL = derive { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[MASS outliers qtl]; };
+mRMRe = derive { name="mRMRe"; version="2.0.5"; sha256="1lhpamjy8dbk3lzjj0wj041cg99rw6925i9fq297c93jxq562414"; depends=[igraph survival]; };
 mRm = derive { name="mRm"; version="1.1.5"; sha256="0sbpk7z4ij917nw8wyvnm87iav95ybqrzvmsjy3r8nyq55bjzyn7"; depends=[]; };
 maRketSim = derive { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcqgxqkw805s4mr6qp89blgpmpxy8gdrbfj93m4"; depends=[]; };
 maSAE = derive { name="maSAE"; version="0.1-2"; sha256="18a1zbfmjhrmi3fgqd7vaicpsca59kp8r1003pwl7l4032p32fxk"; depends=[]; };
-maboost = derive { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[rpart C50]; };
-mada = derive { name="mada"; version="0.5.7"; sha256="0a2m1rb4d143v9732392xzvbg6x1k3l0g3zscgbx64m21kxshmgb"; depends=[mvtnorm ellipse mvmeta]; };
+maboost = derive { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[C50 rpart]; };
+mada = derive { name="mada"; version="0.5.7"; sha256="0a2m1rb4d143v9732392xzvbg6x1k3l0g3zscgbx64m21kxshmgb"; depends=[ellipse mvmeta mvtnorm]; };
 mads = derive { name="mads"; version="0.1.2"; sha256="1hbanfa1wnfvfs0g8dcf5z4439v0pp3rqhxahiis03jlfxzgd841"; depends=[mrds]; };
 madsim = derive { name="madsim"; version="1.1"; sha256="1d9mv769zia43krdfl43hp22cp5mdi3ycwj3kxyfcjrg23bjnyc0"; depends=[]; };
 magic = derive { name="magic"; version="1.5-6"; sha256="1399w1zhz79nj8cdhslybncd9h6rylfhb548nv22ip0dxxdkyv0v"; depends=[abind]; };
 magicaxis = derive { name="magicaxis"; version="1.9.4"; sha256="0kgr29q4v9aq10l6zkddgv93zl66yzwxx9jsnskkx3r0kk3rlxa3"; depends=[MASS plotrix sm]; };
 magrittr = derive { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; };
 mail = derive { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; };
-mailR = derive { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslpcvhr9gcj7wsamaxzgrcsaxm8fdlw"; depends=[rJava stringr R_utils]; };
+mailR = derive { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslpcvhr9gcj7wsamaxzgrcsaxm8fdlw"; depends=[R_utils rJava stringr]; };
 makeProject = derive { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; };
 mallet = derive { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; };
-managelocalrepo = derive { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[stringr assertthat]; };
-manifestoR = derive { name="manifestoR"; version="1.0-1"; sha256="1008bz2vsmhx0sx6kc55z8dhlfinbadagz4hd0p50c4q86ibl7lh"; depends=[NLP tm dplyr httr jsonlite functional zoo psych]; };
+managelocalrepo = derive { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; };
+manifestoR = derive { name="manifestoR"; version="1.0-1"; sha256="1008bz2vsmhx0sx6kc55z8dhlfinbadagz4hd0p50c4q86ibl7lh"; depends=[dplyr functional httr jsonlite NLP psych tm zoo]; };
 manipulate = derive { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; };
 mapDK = derive { name="mapDK"; version="0.3.0"; sha256="03ksg47caxx3y97p3nsflwpc7i788jw874cixr9gjz756avwkmwp"; depends=[ggplot2 stringi]; };
-mapStats = derive { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[survey lattice maptools RColorBrewer Hmisc classInt sp colorspace reshape2]; };
+mapStats = derive { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; };
 mapdata = derive { name="mapdata"; version="2.2-3"; sha256="1fhj34cgq6rniy0339qv2ghbs0aiq38h9jfwx7szb83yj37v7wm6"; depends=[maps]; };
 mapfit = derive { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; };
-mapmisc = derive { name="mapmisc"; version="1.2.4"; sha256="07h237sgsycagn61rharb09q9s8da777hzngh4py1sbv6gfyqpv8"; depends=[sp raster]; };
+mapmisc = derive { name="mapmisc"; version="1.2.4"; sha256="07h237sgsycagn61rharb09q9s8da777hzngh4py1sbv6gfyqpv8"; depends=[raster sp]; };
 mapplots = derive { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; };
 mapproj = derive { name="mapproj"; version="1.2-2"; sha256="1fdb72hvcp6jm7rhvs8zdkya6ifs92lfqnmq5vj5amwckkxfidc6"; depends=[maps]; };
 maps = derive { name="maps"; version="2.3-9"; sha256="1gzy81sl4vpr4hsnh4jsp5rd26jdkzsw99qxwfmbadjyf55q06wv"; depends=[]; };
-maptools = derive { name="maptools"; version="0.8-36"; sha256="0064b9qqv7241298dswv5kkkqf6y2iyn7dhjcyvfkqn4kvc9g2m8"; depends=[sp foreign lattice]; };
+maptools = derive { name="maptools"; version="0.8-36"; sha256="0064b9qqv7241298dswv5kkkqf6y2iyn7dhjcyvfkqn4kvc9g2m8"; depends=[foreign lattice sp]; };
 maptpx = derive { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; };
 maptree = derive { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; };
 mar1s = derive { name="mar1s"; version="2.1"; sha256="0psjva7nsgar5sj03adjx44pw0sdqnsd96m4g6k8d76pv30m1g7l"; depends=[cmrutils fda zoo]; };
-marelac = derive { name="marelac"; version="2.1.4"; sha256="0mm1rmaxrbhk6r9z62ns832p2q9fajq0jpvd3if3rg2wgdbb1505"; depends=[shape seacarb]; };
+marelac = derive { name="marelac"; version="2.1.4"; sha256="0mm1rmaxrbhk6r9z62ns832p2q9fajq0jpvd3if3rg2wgdbb1505"; depends=[seacarb shape]; };
 marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; };
 markdown = derive { name="markdown"; version="0.7.7"; sha256="00j1hlib3il50azs2vlcyhi0bjpx1r50mxr9w9dl5g1bwjjc71hb"; depends=[mime]; };
-marked = derive { name="marked"; version="1.1.8"; sha256="1xsg0iy8mcy9b98bxmjr3y413xwblbhks3fcydbvjnry0k03gd5i"; depends=[lme4 R2admb truncnorm coda ggplot2 Matrix numDeriv Rcpp plyr optimx expm Rcpp]; };
-markovchain = derive { name="markovchain"; version="0.2.1"; sha256="0ix7sdcnsc4bl9diddfl4q0lmq1nq8bp1d7arxzcjj4zy35vhkv5"; depends=[igraph Matrix matlab expm Rcpp RcppParallel Rcpp RcppParallel]; };
+marked = derive { name="marked"; version="1.1.8"; sha256="1xsg0iy8mcy9b98bxmjr3y413xwblbhks3fcydbvjnry0k03gd5i"; depends=[coda expm ggplot2 lme4 Matrix numDeriv optimx plyr R2admb Rcpp truncnorm]; };
+markovchain = derive { name="markovchain"; version="0.3"; sha256="176cdp99a1d2n8awzpx1mhlvqqp8wc7x37ha03pdsd8hmsb05m5g"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
 marl = derive { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; };
-marmap = derive { name="marmap"; version="0.9.2"; sha256="1csi6v6z2p3nmyqwy8bmbj036693rzmxrc317g0a45gsqxggp3n4"; depends=[DBI RSQLite gdistance geosphere sp raster ncdf plotrix shape reshape2 adehabitatMA ggplot2]; };
+marmap = derive { name="marmap"; version="0.9.2"; sha256="1csi6v6z2p3nmyqwy8bmbj036693rzmxrc317g0a45gsqxggp3n4"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf plotrix raster reshape2 RSQLite shape sp]; };
 marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
-matR = derive { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[MGRASTer BIOM_utils]; };
-matchingMarkets = derive { name="matchingMarkets"; version="0.1-4"; sha256="096yknmzla2qq2vkaxna5f8mclayjn5baff3cm8ik95zy7j3lrjp"; depends=[Rcpp lpSolve partitions Rcpp RcppArmadillo RcppProgress]; };
-matchingR = derive { name="matchingR"; version="1.0.1"; sha256="0qqk2zcyj0m3r9q0lclb39gdrjqqjlaxvk3cxpfah7hxhhkrk4mc"; depends=[Rcpp Rcpp RcppArmadillo]; };
+matR = derive { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[BIOM_utils MGRASTer]; };
+matchingMarkets = derive { name="matchingMarkets"; version="0.1-4"; sha256="096yknmzla2qq2vkaxna5f8mclayjn5baff3cm8ik95zy7j3lrjp"; depends=[lpSolve partitions Rcpp RcppArmadillo RcppProgress]; };
+matchingR = derive { name="matchingR"; version="1.0.1"; sha256="0qqk2zcyj0m3r9q0lclb39gdrjqqjlaxvk3cxpfah7hxhhkrk4mc"; depends=[Rcpp RcppArmadillo]; };
 mathgraph = derive { name="mathgraph"; version="0.9-11"; sha256="0xikgzn24p0qqlrmaydmjk5yz5pq2rilsvpx86n3p2k2fc3wpwjy"; depends=[]; };
-matie = derive { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[dfoptim mvtnorm seriation igraph gplots cba]; };
+matie = derive { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[cba dfoptim gplots igraph mvtnorm seriation]; };
 matlab = derive { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; };
 matpow = derive { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; };
 matrixStats = derive { name="matrixStats"; version="0.14.0"; sha256="1glm3h6d4c6bl3svnfk6fyj59linfc7s6fyrs0nlcwizs4371nis"; depends=[]; };
 matrixcalc = derive { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; };
-matrixpls = derive { name="matrixpls"; version="0.5.0"; sha256="0r1qpfbvaq24d30ck5c5zwsss4rqhl12g3hhmij3cn55hmv26azq"; depends=[assertive matrixcalc lavaan psych MASS]; };
+matrixpls = derive { name="matrixpls"; version="0.5.0"; sha256="0r1qpfbvaq24d30ck5c5zwsss4rqhl12g3hhmij3cn55hmv26azq"; depends=[assertive lavaan MASS matrixcalc psych]; };
 maxLik = derive { name="maxLik"; version="1.2-4"; sha256="1b2qr16s2w76nxqdlq3hflpg0sjnn8mlzas7082y8xpxw3cknpdz"; depends=[miscTools sandwich]; };
-maxent = derive { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[SparseM tm Rcpp Rcpp]; };
+maxent = derive { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[Rcpp SparseM tm]; };
 maxlike = derive { name="maxlike"; version="0.1-5"; sha256="0h544wr7qsyb70vmbk648hfyb6arrsb41gw39svcin412rhw9k9j"; depends=[raster]; };
 maxstat = derive { name="maxstat"; version="0.7-22"; sha256="0fgpc5y3c5cidy7hxil10hxzdjxfmag2pp2ksh02z9smb8m0sdqb"; depends=[exactRankTests mvtnorm]; };
-mbbefd = derive { name="mbbefd"; version="0.7"; sha256="0l8dq1j1ky83jl1cka0mrjcf7rcby36jkp0zn7wmpnxjrmdrixgb"; depends=[actuar gsl Rcpp Rcpp]; };
+mbbefd = derive { name="mbbefd"; version="0.7"; sha256="0l8dq1j1ky83jl1cka0mrjcf7rcby36jkp0zn7wmpnxjrmdrixgb"; depends=[actuar gsl Rcpp]; };
 mbest = derive { name="mbest"; version="0.3"; sha256="0j6v6c1s11gvzwcnj5dnd9anj11hpmy7c83c8ribb7lx75mwj4k4"; depends=[lme4]; };
 mblm = derive { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; };
 mbmdr = derive { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; };
-mboost = derive { name="mboost"; version="2.4-2"; sha256="104qs8hbsm4ps5ybzxrdz6lz0lqn925xy4k3m4rmbk4r62wj9v61"; depends=[stabs Matrix survival lattice nnls quadprog]; };
+mboost = derive { name="mboost"; version="2.4-2"; sha256="104qs8hbsm4ps5ybzxrdz6lz0lqn925xy4k3m4rmbk4r62wj9v61"; depends=[lattice Matrix nnls quadprog stabs survival]; };
 mc2d = derive { name="mc2d"; version="0.1-15"; sha256="1kp2l1gvw3caplq9916s1dmpmfp6fb2xscys9gj6dykl6gi4h4hb"; depends=[mvtnorm]; };
 mcGlobaloptim = derive { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; };
-mcIRT = derive { name="mcIRT"; version="0.41"; sha256="0pbwydl4zjzwdlpzwpqm4xhq716zgq9s7bvcbrqp6q0jkba9zjnw"; depends=[Rcpp Rcpp RcppArmadillo]; };
+mcIRT = derive { name="mcIRT"; version="0.41"; sha256="0pbwydl4zjzwdlpzwpqm4xhq716zgq9s7bvcbrqp6q0jkba9zjnw"; depends=[Rcpp RcppArmadillo]; };
 mcbiopi = derive { name="mcbiopi"; version="1.1.2"; sha256="12h4bv3hx1m6bsqdxj5n3b5gh98ms508am8pigz7ckmv0xkyhx85"; depends=[]; };
 mcc = derive { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; };
 mcclust = derive { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; };
 mcga = derive { name="mcga"; version="2.0.9"; sha256="197yldx03c634f3x0mpxxvqrys93n7z7n3x0alvqa42z3vdkrz7b"; depends=[]; };
 mcgibbsit = derive { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh46966v01dh26fy79dfklk3zjf262zp3c62ld9yf"; depends=[coda]; };
 mcheatmaps = derive { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; };
-mcll = derive { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[statmod locfit]; };
+mcll = derive { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; };
 mclogit = derive { name="mclogit"; version="0.3-1"; sha256="0zyms6v9qjh6a5ccahfanarp4sg49yingb8wpjcz61skqvm8j7qx"; depends=[Matrix]; };
 mclust = derive { name="mclust"; version="5.0.1"; sha256="10h8y4a0v1vq01v8i92yr3dcxfq74xsm44nh0ldh1a4d6j270zyp"; depends=[]; };
 mcmc = derive { name="mcmc"; version="0.9-3"; sha256="148l28nb1qv82x2hj46c26yhn0lw8x5jsrp2dav9sbysv1bdj2f8"; depends=[]; };
-mcmcplots = derive { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda sfsmisc colorspace denstrip]; };
+mcmcplots = derive { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda colorspace denstrip sfsmisc]; };
 mcmcse = derive { name="mcmcse"; version="1.0-1"; sha256="1jn5hl6aw83qmwccyfmcsvcymx9cp4d3qnfzzqvlw22x26rx88r6"; depends=[]; };
 mco = derive { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; };
-mcprofile = derive { name="mcprofile"; version="0.2-1"; sha256="0q1d236mcmgp5p5gl474myp1zz8cbxffd0kvsd8338jijalj05p0"; depends=[ggplot2 quadprog mvtnorm]; };
+mcprofile = derive { name="mcprofile"; version="0.2-1"; sha256="0q1d236mcmgp5p5gl474myp1zz8cbxffd0kvsd8338jijalj05p0"; depends=[ggplot2 mvtnorm quadprog]; };
 mcr = derive { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; };
-mcsm = derive { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[MASS coda]; };
+mcsm = derive { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[coda MASS]; };
 mda = derive { name="mda"; version="0.4-7"; sha256="1hjmjrdr6zfccsd4xln1jvkkvk25igppvnl6mqznfc7qsmk459cy"; depends=[class]; };
 mdatools = derive { name="mdatools"; version="0.6.0"; sha256="13pfzr3lvqifln9lzdd0dpnygdibxp9ka7zwfisxjrw21m8mhmm3"; depends=[]; };
 mded = derive { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; };
@@ -4515,15 +4532,15 @@ measuRing = derive { name="measuRing"; version="0.3"; sha256="16lgvk9lm0vjy50das
 meboot = derive { name="meboot"; version="1.4-6"; sha256="17wjvc375vnya1lhkj10nsn68k1j3zy036031qca3wxx6wqw9kzx"; depends=[dynlm nlme]; };
 medSTC = derive { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; };
 mederrRank = derive { name="mederrRank"; version="0.0.7"; sha256="08jbqmb418qb7v2x6lm4wig1pfzzfx6fhb49mbfhlkbmssbqsjfq"; depends=[BB numDeriv]; };
-medflex = derive { name="medflex"; version="0.5-0"; sha256="06zp0la99ly2vpm97l3qm289inyd0bxgkjd4cv15mvc47w9c9x9x"; depends=[multcomp boot Matrix sandwich]; };
-mediation = derive { name="mediation"; version="4.4.4"; sha256="00w4c51v0xvc8pfpxqn73l8r2j12sv1wf5kj3yjq8g08dgzynham"; depends=[MASS Matrix mvtnorm sandwich lpSolve Hmisc]; };
-medicalrisk = derive { name="medicalrisk"; version="1.1"; sha256="1fb8zp426zcqsnb35sgywnz44lpssa1acfa2aha9bnvyazif3s90"; depends=[plyr reshape2 hash]; };
+medflex = derive { name="medflex"; version="0.5-0"; sha256="06zp0la99ly2vpm97l3qm289inyd0bxgkjd4cv15mvc47w9c9x9x"; depends=[boot Matrix multcomp sandwich]; };
+mediation = derive { name="mediation"; version="4.4.4"; sha256="00w4c51v0xvc8pfpxqn73l8r2j12sv1wf5kj3yjq8g08dgzynham"; depends=[Hmisc lpSolve MASS Matrix mvtnorm sandwich]; };
+medicalrisk = derive { name="medicalrisk"; version="1.1"; sha256="1fb8zp426zcqsnb35sgywnz44lpssa1acfa2aha9bnvyazif3s90"; depends=[hash plyr reshape2]; };
 mefa = derive { name="mefa"; version="3.2-5"; sha256="037vpnwclyj6xgycznh6g6qlirlgy3sjnkjqb1046q80b5ywv2ni"; depends=[]; };
 mefa4 = derive { name="mefa4"; version="0.3-1"; sha256="0zyjhq80krnb11wh8p8006qz0znrps3qsd2qnhkw7zwl5282i1zp"; depends=[Matrix]; };
-megaptera = derive { name="megaptera"; version="1.0-0"; sha256="1fczhdydqca1jcdc315kwrhxcjisxfq23l4sm7m2011k5nrjmv37"; depends=[snowfall ips ape seqinr RPostgreSQL XML]; };
-meifly = derive { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[plyr leaps MASS]; };
-mem = derive { name="mem"; version="1.4"; sha256="1d3fgllh7fhlfz3rz2jm31r8vn7msz4na4762iaw161qp2j101db"; depends=[sm boot]; };
-memgene = derive { name="memgene"; version="1.0"; sha256="00b1mi2hvzzps542mh2p96s27kjqkpcic7djklfcwnfn1m4bz0i5"; depends=[ade4 raster gdistance vegan]; };
+megaptera = derive { name="megaptera"; version="1.0-0"; sha256="1fczhdydqca1jcdc315kwrhxcjisxfq23l4sm7m2011k5nrjmv37"; depends=[ape ips RPostgreSQL seqinr snowfall XML]; };
+meifly = derive { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[leaps MASS plyr]; };
+mem = derive { name="mem"; version="1.4"; sha256="1d3fgllh7fhlfz3rz2jm31r8vn7msz4na4762iaw161qp2j101db"; depends=[boot sm]; };
+memgene = derive { name="memgene"; version="1.0"; sha256="00b1mi2hvzzps542mh2p96s27kjqkpcic7djklfcwnfn1m4bz0i5"; depends=[ade4 gdistance raster vegan]; };
 memisc = derive { name="memisc"; version="0.97"; sha256="069siqkw7ll9n1crsl3yjhybwz0w52576q504cylpvlxx3jm9hfs"; depends=[lattice MASS]; };
 memoise = derive { name="memoise"; version="0.2.1"; sha256="19wm4b3kq6xva43kga3xydnl7ybl5mq7b4y2fczgzzjz63jd75y4"; depends=[digest]; };
 memuse = derive { name="memuse"; version="1.1"; sha256="1i6l3d885b4v01hlkl50m401bwi7akydhh52gf4kya5khanb8n2b"; depends=[]; };
@@ -4531,119 +4548,120 @@ merror = derive { name="merror"; version="2.0.1"; sha256="09v62f7ycywasid3b7x52d
 metRology = derive { name="metRology"; version="0.9-17"; sha256="1g4gv3mpii71i6imfwqg9d5iwfx03bq4lizzhx7dy39b2mj7jd4q"; depends=[MASS numDeriv]; };
 meta = derive { name="meta"; version="4.2-0"; sha256="1cbrgy3ry70l52da02vx2qflxhnqw7kmy6r10d9wzhmc1gf85snp"; depends=[]; };
 metaLik = derive { name="metaLik"; version="0.41.0"; sha256="08wiriq6cm02d0b0q34056y5249daidpjzkwzgjq6dh55v5fp2s4"; depends=[]; };
-metaMA = derive { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[SMVar]; };
-metaMix = derive { name="metaMix"; version="0.2"; sha256="0xlsdgincxwjzyr4i8qfmfw2wvgf41qbmyhf2rxcbarf7rmwhmqf"; depends=[data_table Matrix gtools Rmpi ggplot2]; };
+metaMA = derive { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[limma SMVar]; };
+metaMix = derive { name="metaMix"; version="0.2"; sha256="0xlsdgincxwjzyr4i8qfmfw2wvgf41qbmyhf2rxcbarf7rmwhmqf"; depends=[data_table ggplot2 gtools Matrix Rmpi]; };
 metaRNASeq = derive { name="metaRNASeq"; version="1.0.2"; sha256="1xz7df7ypq4326yg429pgxd6aldp14c3h3qi20j5nqr5xgsdgzqa"; depends=[]; };
-metaSEM = derive { name="metaSEM"; version="0.9.4"; sha256="1d790z462g9qnrxl5p3a50abaachc2wih10zsk6jpbf10z694g13"; depends=[OpenMx Matrix MASS]; };
-metabolomics = derive { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots]; };
-metacom = derive { name="metacom"; version="1.4.3"; sha256="0djq2ry2vriayn839f0pgkq4j8j1zyd8ribmzn6ngfhz305fszlq"; depends=[devtools vegan lattice]; };
-metacor = derive { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[rmeta gsl]; };
-metafolio = derive { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[Rcpp plyr colorspace MASS Rcpp RcppArmadillo]; };
+metaSEM = derive { name="metaSEM"; version="0.9.4"; sha256="1d790z462g9qnrxl5p3a50abaachc2wih10zsk6jpbf10z694g13"; depends=[MASS Matrix OpenMx]; };
+metabolomics = derive { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots limma]; };
+metacom = derive { name="metacom"; version="1.4.3"; sha256="0djq2ry2vriayn839f0pgkq4j8j1zyd8ribmzn6ngfhz305fszlq"; depends=[devtools lattice vegan]; };
+metacor = derive { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[gsl rmeta]; };
+metafolio = derive { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[colorspace MASS plyr Rcpp RcppArmadillo]; };
 metafor = derive { name="metafor"; version="1.9-7"; sha256="1gnq9qrz3ym9az9s6pi48dx7j3znrp9knbdmh4qpdhjkdlpa55d1"; depends=[Matrix]; };
-metagear = derive { name="metagear"; version="0.1"; sha256="1c00y7p7063f3c1ar17r9ij5j4chzyispg0wprkjaaz0mx9w1hb0"; depends=[gWidgetsRGtk2 gWidgets stringr metafor MASS Matrix]; };
-metagen = derive { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[MASS lhs plyr BBmisc ParamHelpers BatchJobs BatchExperiments ggplot2 metafor]; };
-metamisc = derive { name="metamisc"; version="0.1.1"; sha256="1cvlsix3b857xdw6anqhqsrfwxpnf4rbzg4ybf6aw7vcdc05zgwd"; depends=[mvtnorm ellipse bbmle rjags coda]; };
+metagear = derive { name="metagear"; version="0.1"; sha256="1c00y7p7063f3c1ar17r9ij5j4chzyispg0wprkjaaz0mx9w1hb0"; depends=[EBImage gWidgets gWidgetsRGtk2 MASS Matrix metafor stringr]; };
+metagen = derive { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[BatchExperiments BatchJobs BBmisc ggplot2 lhs MASS metafor ParamHelpers plyr]; };
+metamisc = derive { name="metamisc"; version="0.1.1"; sha256="1cvlsix3b857xdw6anqhqsrfwxpnf4rbzg4ybf6aw7vcdc05zgwd"; depends=[bbmle coda ellipse mvtnorm rjags]; };
 metap = derive { name="metap"; version="0.6"; sha256="1iy5cmwrlsr70z0qnqn30n15knsfclg383815a2a8yqpg5gs4953"; depends=[]; };
-metaplus = derive { name="metaplus"; version="0.7-2"; sha256="1d9528z78vmkmv67s29g87kfdwydfwx4cnbcdmd0kq8rch9zjk07"; depends=[bbmle metafor boot numDeriv lme4 MASS]; };
+metaplus = derive { name="metaplus"; version="0.7-2"; sha256="1d9528z78vmkmv67s29g87kfdwydfwx4cnbcdmd0kq8rch9zjk07"; depends=[bbmle boot lme4 MASS metafor numDeriv]; };
 metasens = derive { name="metasens"; version="0.2-0"; sha256="13mncikxzg8cnpbw78ird1xkrjlivmjibhrk700vdx1hygzwi6x0"; depends=[meta]; };
 metatest = derive { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; };
-meteoForecast = derive { name="meteoForecast"; version="0.45"; sha256="0p74w5zcibzw2vpbyl4jb2wzpz0pki1n1l66hjs6dnkrn52zph95"; depends=[raster sp zoo ncdf]; };
+meteoForecast = derive { name="meteoForecast"; version="0.45"; sha256="0p74w5zcibzw2vpbyl4jb2wzpz0pki1n1l66hjs6dnkrn52zph95"; depends=[ncdf raster sp zoo]; };
 meteogRam = derive { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; };
-mets = derive { name="mets"; version="1.1.1"; sha256="1myqcds9glsy3fwzr7v711xzk7gmvy2cb4x3qgj1kxa90d1d50hz"; depends=[timereg lava numDeriv Rcpp survival Rcpp RcppArmadillo]; };
+metricsgraphics = derive { name="metricsgraphics"; version="0.8.5"; sha256="05rjx19qzf2r2hxf8y490xd29n3qy40rp38s2ni989m1p0bzc6c9"; depends=[htmltools htmlwidgets magrittr]; };
+mets = derive { name="mets"; version="1.1.1"; sha256="1myqcds9glsy3fwzr7v711xzk7gmvy2cb4x3qgj1kxa90d1d50hz"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; };
 mewAvg = derive { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; };
 mfp = derive { name="mfp"; version="1.5.1"; sha256="0flqrvicgks7nxxijhndshpf541drlgqjidm3nql1bg5hnpc5fcq"; depends=[survival]; };
-mfx = derive { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[sandwich lmtest MASS betareg]; };
-mgcv = derive { name="mgcv"; version="1.8-6"; sha256="0605cqrbk26zg8s8qdd8kqwq56wihx7r6hfzr4x0xzk4y1g0m2rq"; depends=[nlme Matrix]; };
+mfx = derive { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[betareg lmtest MASS sandwich]; };
+mgcv = derive { name="mgcv"; version="1.8-6"; sha256="0605cqrbk26zg8s8qdd8kqwq56wihx7r6hfzr4x0xzk4y1g0m2rq"; depends=[Matrix nlme]; };
 mglmn = derive { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; };
-mgpd = derive { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[evd numDeriv corpcor fields]; };
+mgpd = derive { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[corpcor evd fields numDeriv]; };
 mgraph = derive { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wcms0n2mm0z3nnl98mx2fy7wz34z8b2"; depends=[rgdal]; };
 mhsmm = derive { name="mhsmm"; version="0.4.14"; sha256="1zrqnzbmlk3kmwbq9rl4bdkc9iawkgn3qr7nzsa782v55i7w2wiz"; depends=[mvtnorm]; };
 mht = derive { name="mht"; version="3.1.2"; sha256="01zcaf9k0qayzm8dn5dvnm5n3qgqpj8r96qhqaa5vbjcr6ci2x2r"; depends=[glmnet Matrix]; };
-mhurdle = derive { name="mhurdle"; version="1.0-1"; sha256="1x631fgbq3ika05svyavzadyjd7vi9bcmsgb58wfhpf9xq6j5rcr"; depends=[Formula truncreg maxLik pbivnorm]; };
-mi = derive { name="mi"; version="1.0"; sha256="1h47k5mpbvhid83277dvvj2di493bgzz9iarpyv3r30y219l7x1l"; depends=[Matrix arm]; };
+mhurdle = derive { name="mhurdle"; version="1.0-1"; sha256="1x631fgbq3ika05svyavzadyjd7vi9bcmsgb58wfhpf9xq6j5rcr"; depends=[Formula maxLik pbivnorm truncreg]; };
+mi = derive { name="mi"; version="1.0"; sha256="1h47k5mpbvhid83277dvvj2di493bgzz9iarpyv3r30y219l7x1l"; depends=[arm Matrix]; };
 miRada = derive { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; };
-miRtest = derive { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor MASS RepeatedHighDim]; };
+miRtest = derive { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor GlobalAncova globaltest limma MASS RepeatedHighDim]; };
 micEcon = derive { name="micEcon"; version="0.6-12"; sha256="1kxhr3qqgswq8glrjfcjz0hyb163lwf303yhwlgrwjciqgp5dq17"; depends=[miscTools]; };
-micEconAids = derive { name="micEconAids"; version="0.6-16"; sha256="07hsabrlkwpdaalh0b7izraz2q5dlxn373ccijc5c4zsrkgk7kij"; depends=[lmtest micEcon systemfit miscTools]; };
-micEconCES = derive { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[minpack_lm DEoptim systemfit car micEcon miscTools]; };
-micEconSNQP = derive { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[miscTools systemfit MASS]; };
-mice = derive { name="mice"; version="2.22"; sha256="1b7ivpa21ipzbmmwjn1ch968zpw6wydg30f7jdk95m40lrk2xs68"; depends=[Rcpp lattice MASS nnet randomForest rpart Rcpp]; };
-miceadds = derive { name="miceadds"; version="1.2-0"; sha256="01gbkpmmd81v5yhj3jparp7li1jzq91f5zk65dhcd8g3a0k0952m"; depends=[MASS mice mvtnorm pan Rcpp sirt TAM lme4 MBESS pls mitools bayesm inline car foreign sjmisc multiwayvcov Rcpp RcppArmadillo]; };
+micEconAids = derive { name="micEconAids"; version="0.6-16"; sha256="07hsabrlkwpdaalh0b7izraz2q5dlxn373ccijc5c4zsrkgk7kij"; depends=[lmtest micEcon miscTools systemfit]; };
+micEconCES = derive { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[car DEoptim micEcon minpack_lm miscTools systemfit]; };
+micEconSNQP = derive { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; };
+mice = derive { name="mice"; version="2.22"; sha256="1b7ivpa21ipzbmmwjn1ch968zpw6wydg30f7jdk95m40lrk2xs68"; depends=[lattice MASS nnet randomForest Rcpp rpart]; };
+miceadds = derive { name="miceadds"; version="1.2-0"; sha256="01gbkpmmd81v5yhj3jparp7li1jzq91f5zk65dhcd8g3a0k0952m"; depends=[bayesm car foreign inline lme4 MASS MBESS mice mitools multiwayvcov mvtnorm pan pls Rcpp RcppArmadillo sirt sjmisc TAM]; };
 microbenchmark = derive { name="microbenchmark"; version="1.4-2"; sha256="05yxvdnkxr2ll94h6f2m5sn3gg7vrlm9nbdxgmj2g8cp8gfxpfkg"; depends=[ggplot2]; };
-micromap = derive { name="micromap"; version="1.9.2"; sha256="1x4v0ibbpfz471dp46agib27i4svs8wyy93ldriryvhpa2w5948y"; depends=[maptools RColorBrewer rgdal sp ggplot2]; };
+micromap = derive { name="micromap"; version="1.9.2"; sha256="1x4v0ibbpfz471dp46agib27i4svs8wyy93ldriryvhpa2w5948y"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; };
 micromapST = derive { name="micromapST"; version="1.0.5"; sha256="1n9mzyl5dj21165j0j99brkqq7c54j3cg6r21ifdzffj2dx29wh0"; depends=[RColorBrewer]; };
 micropan = derive { name="micropan"; version="1.0"; sha256="0qnxm6z2pk1wibchj6rhn3hld77dzl5qgvzl4v9n16ywlgdv09ai"; depends=[igraph]; };
-midasr = derive { name="midasr"; version="0.4"; sha256="190qliv7v80rr3jh9yvchwl3ch7nf5b8p90iywp8qkaav5r8rcdy"; depends=[sandwich optimx MASS numDeriv Matrix forecast]; };
+midasr = derive { name="midasr"; version="0.4"; sha256="190qliv7v80rr3jh9yvchwl3ch7nf5b8p90iywp8qkaav5r8rcdy"; depends=[forecast MASS Matrix numDeriv optimx sandwich]; };
 migest = derive { name="migest"; version="1.6"; sha256="1mjjcba74nk10kdbsaphih3zdyaqmf02hrv13s34klwdwkp3nv0m"; depends=[]; };
 migration_indices = derive { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; };
-migui = derive { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[gWidgets2 mi arm]; };
+migui = derive { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[arm gWidgets2 mi]; };
 mime = derive { name="mime"; version="0.3"; sha256="1i9f9z88cahvb5whdgmp0ipk0b9glk0xn8ik519vzpydnn1slvxk"; depends=[]; };
-minPtest = derive { name="minPtest"; version="1.7"; sha256="088kckpbfy2yp0pk3zrixrimywrvkaib5ywa7fkr5phnzlsl80sv"; depends=[scrime Epi]; };
+minPtest = derive { name="minPtest"; version="1.7"; sha256="088kckpbfy2yp0pk3zrixrimywrvkaib5ywa7fkr5phnzlsl80sv"; depends=[Epi scrime]; };
 minerva = derive { name="minerva"; version="1.4.1"; sha256="0dg5xnl9srdvid49na8478bnvagv0khiv6hl7z8gw6m745681i89"; depends=[]; };
-miniCRAN = derive { name="miniCRAN"; version="0.2.4"; sha256="1p8kypq0r4sckvdq7qfznfjp3mpjy3cvm9dnwpdfn4dnl4n377z0"; depends=[XML httr]; };
+miniCRAN = derive { name="miniCRAN"; version="0.2.4"; sha256="1p8kypq0r4sckvdq7qfznfjp3mpjy3cvm9dnwpdfn4dnl4n377z0"; depends=[httr XML]; };
 miniGUI = derive { name="miniGUI"; version="0.8.0"; sha256="1iq52x7wbcin7ya207jj3k9vym7mavm5z61vggyabdmr768pci39"; depends=[]; };
 minimax = derive { name="minimax"; version="1.0"; sha256="1g0d9q5h1avbb0yg7ajw5330820i3n5cgkpsif754l4j3ikya8p3"; depends=[]; };
 minimist = derive { name="minimist"; version="0.1"; sha256="007y829d766b1v6wkrhk7pkg99r38bvmhc8bwvs8rs13dr7444ln"; depends=[V8]; };
 minpack_lm = derive { name="minpack.lm"; version="1.1-8"; sha256="0nvsxqwg3k9k3dqjzkz1vq2z0xla317011zm9ms8y1qvf75raz83"; depends=[]; };
-minqa = derive { name="minqa"; version="1.2.4"; sha256="036drja6xz7awja9iwb76x91415p26fb0jmg7y7v0p65m6j978fg"; depends=[Rcpp Rcpp]; };
+minqa = derive { name="minqa"; version="1.2.4"; sha256="036drja6xz7awja9iwb76x91415p26fb0jmg7y7v0p65m6j978fg"; depends=[Rcpp]; };
 minque = derive { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s423imk7dzv60mdbzrpbp7la7jk2n57"; depends=[klaR Matrix]; };
 minxent = derive { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; };
-mipfp = derive { name="mipfp"; version="2.0"; sha256="1sh33lgvq31nk8vkl9p195v4z3whv2c1fc7bnhc8wxgglm6vc126"; depends=[cmm Rsolnp numDeriv]; };
-mirt = derive { name="mirt"; version="1.9"; sha256="0bav1ykmbw8d64l61iwd4ma2xz4y3z2wqx8ba63583rmbsynkkvk"; depends=[lattice GPArotation Rcpp sfsmisc numDeriv Rcpp]; };
-mirtCAT = derive { name="mirtCAT"; version="0.5"; sha256="0lv4dxpby3izmh3avl70i0iiaj8rz1fpb666cwga5590ks7rq4lr"; depends=[mirt shiny lattice Rcpp markdown Rcpp RcppArmadillo]; };
+mipfp = derive { name="mipfp"; version="2.0"; sha256="1sh33lgvq31nk8vkl9p195v4z3whv2c1fc7bnhc8wxgglm6vc126"; depends=[cmm numDeriv Rsolnp]; };
+mirt = derive { name="mirt"; version="1.10"; sha256="0bylba0z8g9kx3idfpzf3qbw7pgjvpd8d1vx930nr02vhv3c3cms"; depends=[GPArotation lattice mgcv numDeriv Rcpp sfsmisc]; };
+mirtCAT = derive { name="mirtCAT"; version="0.5"; sha256="0lv4dxpby3izmh3avl70i0iiaj8rz1fpb666cwga5590ks7rq4lr"; depends=[lattice markdown mirt Rcpp RcppArmadillo shiny]; };
 misc3d = derive { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
-miscF = derive { name="miscF"; version="0.1-2"; sha256="195rb9acdirfhap0z35yvcci5xn4j84mlbafki4l1vfgqgnh0ajj"; depends=[MCMCpack mvtnorm Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
-miscFuncs = derive { name="miscFuncs"; version="1.2-7"; sha256="1cnhd23fi6akr3fsr2b85s5cn36ksy4h3c4iyyjqcpc49wa819d0"; depends=[roxygen2 mvtnorm]; };
+miscF = derive { name="miscF"; version="0.1-2"; sha256="195rb9acdirfhap0z35yvcci5xn4j84mlbafki4l1vfgqgnh0ajj"; depends=[MCMCpack mvtnorm Rcpp RcppArmadillo]; };
+miscFuncs = derive { name="miscFuncs"; version="1.2-7"; sha256="1cnhd23fi6akr3fsr2b85s5cn36ksy4h3c4iyyjqcpc49wa819d0"; depends=[mvtnorm roxygen2]; };
 miscTools = derive { name="miscTools"; version="0.6-16"; sha256="19mslb64lm8srrmml1v40rfkxhqw02bplw0yjv7qnkqj44hcqfw1"; depends=[]; };
-miscset = derive { name="miscset"; version="0.4"; sha256="04cl8a2chcynfn5rljqw2ll4ry0wqaslqgjh9ny8ax3hcvyvmmwl"; depends=[data_table gridExtra Rcpp xtable Rcpp]; };
-missForest = derive { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[randomForest foreach itertools]; };
+miscset = derive { name="miscset"; version="0.4"; sha256="04cl8a2chcynfn5rljqw2ll4ry0wqaslqgjh9ny8ax3hcvyvmmwl"; depends=[data_table gridExtra Rcpp xtable]; };
+missForest = derive { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; };
 missMDA = derive { name="missMDA"; version="1.7.3"; sha256="1wg4rgziw2f8asdxi2a5dx1mn4z0sd1lf9a8fp7dg29bnv82brmh"; depends=[FactoMineR]; };
-mistat = derive { name="mistat"; version="1.0-2"; sha256="1n5wdn5pl6mflzxpdwjj0x44c8a3cxxpwhmyw1jkx5r8yk95mh3p"; depends=[]; };
+mistat = derive { name="mistat"; version="1.0-3"; sha256="12fykqkcqfxn8m8wwpw69f7h2f24c5yhg4fw50jsifhcj40kk29q"; depends=[]; };
 mistral = derive { name="mistral"; version="1.1-1"; sha256="19zkc5ddjzw17y70x3l6maljsfvg0295xyzx7kavmjrws74jx4rc"; depends=[DiceKriging e1071 kernlab Matrix mvtnorm rgenoud]; };
-mitml = derive { name="mitml"; version="0.2-2"; sha256="11pgwa1cxf1i2qkm8gyzxsjkhg40r75gk2k1lwaqpqgi7vs3drbs"; depends=[pan haven]; };
+mitml = derive { name="mitml"; version="0.2-2"; sha256="11pgwa1cxf1i2qkm8gyzxsjkhg40r75gk2k1lwaqpqgi7vs3drbs"; depends=[haven pan]; };
 mitools = derive { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; };
 mix = derive { name="mix"; version="1.0-8"; sha256="0wlp6wkn8dwwnjfq3qzk0hjb3xsjh5ld5zxbd6nf12awpkwa1j9y"; depends=[]; };
-mixAK = derive { name="mixAK"; version="4.0-5"; sha256="1kdcia6j2dw4q1rbrswx9h8ivzrnw8hrg5a206jykmsdbngbifx5"; depends=[colorspace lme4 fastGHQuad mnormt coda]; };
-mixOmics = derive { name="mixOmics"; version="5.0-4"; sha256="020cy0x7qf6x7lb1aqfr6qflf08k2phnygcjr7lq4z8q9v502qyh"; depends=[MASS lattice RGCCA igraph rgl pheatmap]; };
-mixPHM = derive { name="mixPHM"; version="0.7-1"; sha256="0v75xv06m40jqq0c4y1gvdrmyddxs814djbpyq61fv8cn22fn7wx"; depends=[survival lattice]; };
+mixAK = derive { name="mixAK"; version="4.0-5"; sha256="1kdcia6j2dw4q1rbrswx9h8ivzrnw8hrg5a206jykmsdbngbifx5"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
+mixOmics = derive { name="mixOmics"; version="5.0-4"; sha256="020cy0x7qf6x7lb1aqfr6qflf08k2phnygcjr7lq4z8q9v502qyh"; depends=[igraph lattice MASS pheatmap RGCCA rgl]; };
+mixPHM = derive { name="mixPHM"; version="0.7-1"; sha256="0v75xv06m40jqq0c4y1gvdrmyddxs814djbpyq61fv8cn22fn7wx"; depends=[lattice survival]; };
 mixRasch = derive { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; };
 mixcat = derive { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; };
 mixdist = derive { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; };
-mixedMem = derive { name="mixedMem"; version="1.0.2"; sha256="1nlnlww2xbmlifcp9l293041csnh38hvr686sczyqpb7c5jf39g3"; depends=[Rcpp gtools Rcpp RcppArmadillo BH]; };
+mixedMem = derive { name="mixedMem"; version="1.0.2"; sha256="1nlnlww2xbmlifcp9l293041csnh38hvr686sczyqpb7c5jf39g3"; depends=[BH gtools Rcpp RcppArmadillo]; };
 mixer = derive { name="mixer"; version="1.8"; sha256="1r831jha7qrxibw5m3nc3l6r887ihzxzsj65yjnbl5cf5b8y19bb"; depends=[]; };
-mixexp = derive { name="mixexp"; version="1.2.1"; sha256="0yjsngr2akj2hhl1hav2kkp8w0g4775qvnbzypa3c1fmx8kf1xvw"; depends=[gdata lattice daewr]; };
-mixlm = derive { name="mixlm"; version="1.0.8.5"; sha256="1xbkh6aaw4j57vkn6ng7i5wkpz2clhvj3sx0mhfmpwhg13rpdkaj"; depends=[multcomp pls pracma leaps lme4 car]; };
+mixexp = derive { name="mixexp"; version="1.2.1"; sha256="0yjsngr2akj2hhl1hav2kkp8w0g4775qvnbzypa3c1fmx8kf1xvw"; depends=[daewr gdata lattice]; };
+mixlm = derive { name="mixlm"; version="1.0.8.5"; sha256="1xbkh6aaw4j57vkn6ng7i5wkpz2clhvj3sx0mhfmpwhg13rpdkaj"; depends=[car leaps lme4 multcomp pls pracma]; };
 mixlow = derive { name="mixlow"; version="1.0.1"; sha256="12vnp3gl3ykxzgvc4bwhi4flmc1sl2y77yi0zi4by17q93a49akm"; depends=[nlme]; };
 mixor = derive { name="mixor"; version="1.0.2"; sha256="1xkwgk4dvjbpqvvbrb8yb88iz4nkv7sykxaygjq7zfcdrdivxz6n"; depends=[]; };
 mixreg = derive { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; };
-mixsep = derive { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[tcltk2 MASS RODBC]; };
+mixsep = derive { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; };
 mixsmsn = derive { name="mixsmsn"; version="1.0-9"; sha256="0pgip1xfgfrdy3g3197d7visn164zi7xnp6wlsgjwxdylvjsxkji"; depends=[mvtnorm]; };
 mixtNB = derive { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; };
 mixtools = derive { name="mixtools"; version="1.0.3"; sha256="01ix019cvplqz09q55pz9w7cc281k37khh1i3xf1k6l9f2cj519z"; depends=[boot MASS segmented]; };
 mixtox = derive { name="mixtox"; version="1.0"; sha256="059vjrz9isyrdqk2ij4b11dawza2yslh67bj7gi9v5awzcf4n2v7"; depends=[]; };
 mixture = derive { name="mixture"; version="1.4"; sha256="0k9pzcgfjyp0rmcma26kr2n8rcwmijznmdpvqidgl3jay20c87ca"; depends=[]; };
-mizer = derive { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[plyr reshape2 ggplot2]; };
-mkde = derive { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[Rcpp raster sp Rcpp]; };
-mkin = derive { name="mkin"; version="0.9-35"; sha256="0ac71wkl8b034l1bbv8qr5ynvpl8l9j31ych5v5pf6mmqs62bwnr"; depends=[minpack_lm rootSolve FME deSolve]; };
+mizer = derive { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[ggplot2 plyr reshape2]; };
+mkde = derive { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; };
+mkin = derive { name="mkin"; version="0.9-35"; sha256="0ac71wkl8b034l1bbv8qr5ynvpl8l9j31ych5v5pf6mmqs62bwnr"; depends=[deSolve FME minpack_lm rootSolve]; };
 mkssd = derive { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; };
-mlDNA = derive { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[snowfall igraph rsgcc e1071 randomForest pROC ROCR]; };
+mlDNA = derive { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[e1071 igraph pROC randomForest ROCR rsgcc snowfall]; };
 mlPhaser = derive { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; };
-mlVAR = derive { name="mlVAR"; version="0.1.0"; sha256="0xychak3xdqnsl9z1ifi0niqsrdc10f6frl6zg162mzpil33wp3g"; depends=[plyr lme4 arm qgraph]; };
+mlVAR = derive { name="mlVAR"; version="0.1.0"; sha256="0xychak3xdqnsl9z1ifi0niqsrdc10f6frl6zg162mzpil33wp3g"; depends=[arm lme4 plyr qgraph]; };
 mlbench = derive { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; };
-mldr = derive { name="mldr"; version="0.1.70"; sha256="08yiglqzlqxlfrxd7l12x59h7a38skrkkf8w7jh620ab7a7w1gyg"; depends=[shiny XML circlize]; };
-mlearning = derive { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class nnet MASS e1071 randomForest ipred]; };
+mldr = derive { name="mldr"; version="0.1.70"; sha256="08yiglqzlqxlfrxd7l12x59h7a38skrkkf8w7jh620ab7a7w1gyg"; depends=[circlize shiny XML]; };
+mlearning = derive { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class e1071 ipred MASS nnet randomForest]; };
 mlegp = derive { name="mlegp"; version="3.1.4"; sha256="1932544irhzhf6a8rjyh66j57h9awlhwd6xam603bamfg106cmg2"; depends=[]; };
-mleur = derive { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[urca stabledist fGarch lattice]; };
+mleur = derive { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; };
 mlgt = derive { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; };
 mlica2 = derive { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; };
 mlmRev = derive { name="mlmRev"; version="1.0-6"; sha256="0mvmahnbbp478xwldj4wlsjib4v4afhs07643gxgcqpi56zbd5h7"; depends=[lme4]; };
 mlmmm = derive { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; };
-mlogit = derive { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ixxnqx9yvbci7n3mb3hm9mnrxwh5v7sx"; depends=[Formula maxLik statmod zoo MASS lmtest]; };
-mlogitBMA = derive { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[BMA abind maxLik]; };
-mlr = derive { name="mlr"; version="2.3"; sha256="0cvg2bxxw3c69lj5wy4ds54wn5h299c5mjcsbax1p0k408z5aa6z"; depends=[ParamHelpers BBmisc ggplot2 checkmate parallelMap plyr reshape2 survival]; };
-mlxR = derive { name="mlxR"; version="2.2.0"; sha256="1ca0vfky45gvr2rqbgli79v1mqhi0d8mpd220xxs1p6xlwbyvn0m"; depends=[ggplot2 XML Rcpp]; };
+mlogit = derive { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ixxnqx9yvbci7n3mb3hm9mnrxwh5v7sx"; depends=[Formula lmtest MASS maxLik statmod zoo]; };
+mlogitBMA = derive { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; };
+mlr = derive { name="mlr"; version="2.4"; sha256="1yd4g749jhj7d2kmzh6bc6lyk3857kfghds8cnqg2j68ak87w5q0"; depends=[BBmisc checkmate ggplot2 ggvis parallelMap ParamHelpers plyr reshape2 shiny survival]; };
+mlxR = derive { name="mlxR"; version="2.2.0"; sha256="1ca0vfky45gvr2rqbgli79v1mqhi0d8mpd220xxs1p6xlwbyvn0m"; depends=[ggplot2 Rcpp XML]; };
 mma = derive { name="mma"; version="2.0-0"; sha256="0fdb2lbg08l47wnrsjf3rarf2n0qsw0qrx9b9aa08ablwpip4k69"; depends=[gbm]; };
-mmand = derive { name="mmand"; version="1.1.0"; sha256="0awi9wxxalz81d6766djbjsk980n65dhz02fcqb69ifc7x80lc33"; depends=[reportr Rcpp Rcpp RcppArmadillo]; };
+mmand = derive { name="mmand"; version="1.1.0"; sha256="0awi9wxxalz81d6766djbjsk980n65dhz02fcqb69ifc7x80lc33"; depends=[Rcpp RcppArmadillo reportr]; };
 mmap = derive { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; };
 mmcm = derive { name="mmcm"; version="1.2-5"; sha256="193mlvl8fp5y2150m0xw5bhr7nkr4fgmwjbv1dg314a7ara42v4y"; depends=[mvtnorm]; };
 mmds = derive { name="mmds"; version="1.1"; sha256="0f5qzkfhi7vg8vsd8r41idmbwrrgc7qzfnp81adms2yzrza17wrw"; depends=[]; };
@@ -4654,7 +4672,8 @@ mmm = derive { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gk
 mmm2 = derive { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; };
 mmod = derive { name="mmod"; version="1.2.1"; sha256="0c2ijg5116hacq0f18xhkbxankjp0k34zfnw8q02ahzwd26ds0z7"; depends=[adegenet pegas]; };
 mmpp = derive { name="mmpp"; version="0.1"; sha256="1m2079vz4h3h90ikh268jwh20ink5n1mri8n7aj50xkfspmwsmpg"; depends=[]; };
-mnlogit = derive { name="mnlogit"; version="1.2.2"; sha256="01wvlmkf9ddcmsb8pw08j05r7kfn8zr76zaaa3mv92h967v79grp"; depends=[mlogit lmtest Formula]; };
+mmtfa = derive { name="mmtfa"; version="0.1"; sha256="113bpcb05i78y78byrdn9j45dfcar7q8z7qmlid8cl6b8cjv1vfz"; depends=[matrixStats mvnfast]; };
+mnlogit = derive { name="mnlogit"; version="1.2.2"; sha256="01wvlmkf9ddcmsb8pw08j05r7kfn8zr76zaaa3mv92h967v79grp"; depends=[Formula lmtest mlogit]; };
 mnormpow = derive { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; };
 mnormt = derive { name="mnormt"; version="1.5-3"; sha256="1mw5fk4q5cnj2x2938di58179fr51l396qd61i6y5vwmcccj0kn9"; depends=[]; };
 modMax = derive { name="modMax"; version="1.0"; sha256="0p8vnlbw53lqbaq3819jhixq6ns2lwxf56w2md7y98rshf92h474"; depends=[gtools igraph]; };
@@ -4664,86 +4683,86 @@ modehunt = derive { name="modehunt"; version="1.0.6"; sha256="15rq1yyrjhsn2rlkyi
 modelObj = derive { name="modelObj"; version="1.0"; sha256="0r4smak9hni9pzih4nzkpv3bq18acrsmmxs1a13wq3pgjfvkwa63"; depends=[]; };
 modelfree = derive { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; };
 modeltools = derive { name="modeltools"; version="0.2-21"; sha256="0ynds453xprxv0jqqzi3blnv5w6vrdww9pvd1sq4lrr5ar3k3cq7"; depends=[]; };
-modiscloud = derive { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date sp sfsmisc raster rgdal]; };
-moduleColor = derive { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut]; };
+modiscloud = derive { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; };
+moduleColor = derive { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut impute]; };
 mokken = derive { name="mokken"; version="2.7.7"; sha256="1v0khh1bb2h7j2x54mdw8vqlimhw25r2ps89hw4l88qfaz05ir77"; depends=[poLCA]; };
-mombf = derive { name="mombf"; version="1.5.9"; sha256="0lc3rrmm2vsa4mg2zkbhp5dpnps7w0ld35lav19ff86kccspw1rg"; depends=[mvtnorm ncvreg actuar mgcv survival]; };
+mombf = derive { name="mombf"; version="1.5.9"; sha256="0lc3rrmm2vsa4mg2zkbhp5dpnps7w0ld35lav19ff86kccspw1rg"; depends=[actuar mgcv mvtnorm ncvreg survival]; };
 momentchi2 = derive { name="momentchi2"; version="0.1.0"; sha256="02k4hzhqmqh7sx7dzb6w84fc1f5523md3284y4gvdbaw9y34ayk8"; depends=[]; };
 moments = derive { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; };
 mondate = derive { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
 mongolite = derive { name="mongolite"; version="0.4"; sha256="0jrjf9sh8y7n4lgy54y5pl9dw6z4c5qb903l0907finm749cb2w1"; depends=[jsonlite]; };
 monitoR = derive { name="monitoR"; version="1.0.3"; sha256="0g2dhyz3411pa6kcsmmi9x77ygvdrvas3k9ps0w2r69mfab785c6"; depends=[tuneR]; };
 monmlp = derive { name="monmlp"; version="1.1.2"; sha256="14x6xz07hg2c5n36rc314z66jqvgmicjxi2vsqyy91vwjxs9akrm"; depends=[]; };
-monomvn = derive { name="monomvn"; version="1.9-5"; sha256="1fh0c1234hb5f3rwy85i4rlzc3n1851q5mivckcjs2vdm9rz25mg"; depends=[pls lars MASS]; };
+monomvn = derive { name="monomvn"; version="1.9-5"; sha256="1fh0c1234hb5f3rwy85i4rlzc3n1851q5mivckcjs2vdm9rz25mg"; depends=[lars MASS pls]; };
 monreg = derive { name="monreg"; version="0.1.3"; sha256="08rcg2xffa61cgqy8g98b0f7jqhd4yp8nx6g4bq3g722aqx4nfg3"; depends=[]; };
 moonBook = derive { name="moonBook"; version="0.1.3"; sha256="1wy8qwzymh482gfb4v9v74k666mq8dz2yird7gz43l3hps22kfgb"; depends=[nortest survival]; };
 moonsun = derive { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fayyi4i0jk1k561dp6cbjg2b3lmdml0whmi"; depends=[]; };
 mopsocd = derive { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; };
 morgenstemning = derive { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; };
 morse = derive { name="morse"; version="1.0.2"; sha256="044aljv48mfq6yj9i77yqf03qa4qqkncaalzhph3wr9w4jvxpxn5"; depends=[plyr]; };
-mosaic = derive { name="mosaic"; version="0.10.0"; sha256="0hhln6kfxdk6z4rmi3378cs18ziwa5awi53ylnx5kva7f42m5jxr"; depends=[car dplyr lattice ggplot2 mosaicData lazyeval MASS reshape2 plyr readr latticeExtra gridExtra ggdendro]; };
+mosaic = derive { name="mosaic"; version="0.10.0"; sha256="0hhln6kfxdk6z4rmi3378cs18ziwa5awi53ylnx5kva7f42m5jxr"; depends=[car dplyr ggdendro ggplot2 gridExtra lattice latticeExtra lazyeval MASS mosaicData plyr readr reshape2]; };
 mosaicData = derive { name="mosaicData"; version="0.9.1"; sha256="0gxnw3x806pm97x1043qq3qf1cwn1z1771cayp3xlh5khn5bijk7"; depends=[]; };
 moult = derive { name="moult"; version="1.4"; sha256="0nglf7wijp2v66fpyh88glbn1glp8vvkbvpc1g6136bg6ahbbkkl"; depends=[Formula Matrix]; };
 mountainplot = derive { name="mountainplot"; version="1.0"; sha256="1hjmzig0s4vjlkpqhvf4v6z2gd8ljy14z5n1m9y21is9yp2cy6xf"; depends=[lattice]; };
 mousetrack = derive { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; };
-movMF = derive { name="movMF"; version="0.2-0"; sha256="1p9ay7w93gyx4janw23iwg2j0wkvnvzalaa20n1rlahhmh327g7i"; depends=[skmeans clue slam]; };
-move = derive { name="move"; version="1.4.496"; sha256="0p20c6rqxk299pqd10icq4a59yn152jfnwh6sw48sg8cc9wp24k3"; depends=[geosphere sp raster rgdal]; };
-mp = derive { name="mp"; version="0.2.0"; sha256="1vpjrx04yn1rdmrhj42rhc757cj02sghrv0i5jfm4k2y28ab7qh1"; depends=[svd Rcpp Rcpp RcppArmadillo]; };
-mpMap = derive { name="mpMap"; version="1.14"; sha256="0gmhg5ps8yli8699a5aw26skfbjxx4zpp0paqxxdc0zl28l0pdff"; depends=[gdata seriation qtl wgaim]; };
+movMF = derive { name="movMF"; version="0.2-0"; sha256="1p9ay7w93gyx4janw23iwg2j0wkvnvzalaa20n1rlahhmh327g7i"; depends=[clue skmeans slam]; };
+move = derive { name="move"; version="1.4.496"; sha256="0p20c6rqxk299pqd10icq4a59yn152jfnwh6sw48sg8cc9wp24k3"; depends=[geosphere raster rgdal sp]; };
+mp = derive { name="mp"; version="0.2.0"; sha256="1vpjrx04yn1rdmrhj42rhc757cj02sghrv0i5jfm4k2y28ab7qh1"; depends=[Rcpp RcppArmadillo svd]; };
+mpMap = derive { name="mpMap"; version="1.14"; sha256="0gmhg5ps8yli8699a5aw26skfbjxx4zpp0paqxxdc0zl28l0pdff"; depends=[gdata qtl seriation wgaim]; };
 mpa = derive { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; };
-mpath = derive { name="mpath"; version="0.1-18"; sha256="04d6lbsqjmr6pkyfpr2vw3rhv5hi044rx1n1isgw96j2c0f7dgzv"; depends=[MASS glmnet pscl numDeriv]; };
+mpath = derive { name="mpath"; version="0.1-18"; sha256="04d6lbsqjmr6pkyfpr2vw3rhv5hi044rx1n1isgw96j2c0f7dgzv"; depends=[glmnet MASS numDeriv pscl]; };
 mpcv = derive { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; };
 mph = derive { name="mph"; version="0.9"; sha256="11wcy23sv8x7aq6ky8wi0cq55yhjkkm9hn672qy803dwzzxv5y61"; depends=[]; };
-mplot = derive { name="mplot"; version="0.6.2"; sha256="0lnslv471abhfr245wx24ps3c97qs54i43ybpc1f8mqsxh0vxz3s"; depends=[leaps foreach bestglm doParallel plyr shinydashboard shiny googleVis]; };
-mpm = derive { name="mpm"; version="1.0-22"; sha256="0wijw8v0wmbfrda5564cmnp788qmlkk21yn5cp5qk8aprm9l1fnk"; depends=[MASS KernSmooth]; };
+mplot = derive { name="mplot"; version="0.6.2"; sha256="0lnslv471abhfr245wx24ps3c97qs54i43ybpc1f8mqsxh0vxz3s"; depends=[bestglm doParallel foreach googleVis leaps plyr shiny shinydashboard]; };
+mpm = derive { name="mpm"; version="1.0-22"; sha256="0wijw8v0wmbfrda5564cmnp788qmlkk21yn5cp5qk8aprm9l1fnk"; depends=[KernSmooth MASS]; };
 mpmcorrelogram = derive { name="mpmcorrelogram"; version="0.1-3"; sha256="0qgzsh744002whh3v1hrxs1i0xnk9zgfgkdgx2f0ffj00vvnwr97"; depends=[vegan]; };
 mpmi = derive { name="mpmi"; version="0.41"; sha256="1iwdhvdglsamzq18f0r5mh0anrd4ffrddafdlbw16kr8jy0c8fdn"; depends=[KernSmooth]; };
-mpoly = derive { name="mpoly"; version="0.1.0"; sha256="0q0ypaj1r12yc72b6qb22rvgrzc703v4n7ns2yg1n9ff20y5m4z0"; depends=[stringr rSymPy rJython rJava rjson partitions plyr]; };
+mpoly = derive { name="mpoly"; version="0.1.0"; sha256="0q0ypaj1r12yc72b6qb22rvgrzc703v4n7ns2yg1n9ff20y5m4z0"; depends=[partitions plyr rJava rjson rJython rSymPy stringr]; };
 mppa = derive { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; };
 mpt = derive { name="mpt"; version="0.5-1"; sha256="1b6n7kivkj4ndcc27jmznx9dh40kvjjk7hfxh21kmnknl5ap4ffb"; depends=[]; };
 mra = derive { name="mra"; version="2.16.4"; sha256="134fw4bv34bycgia58z238acj7kb8jkw51pjfa2cwprrgsjdpf5g"; depends=[]; };
 mratios = derive { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; };
-mrds = derive { name="mrds"; version="2.1.12"; sha256="1v7lv3ssg9m8bx2gskzf31lkg3sxsdkvknrdx9aawdh3mzxwcys7"; depends=[optimx mgcv Rsolnp]; };
+mrds = derive { name="mrds"; version="2.1.12"; sha256="1v7lv3ssg9m8bx2gskzf31lkg3sxsdkvknrdx9aawdh3mzxwcys7"; depends=[mgcv optimx Rsolnp]; };
 mreg = derive { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; };
 mritc = derive { name="mritc"; version="0.5-0"; sha256="1344x7gc7wvmcqp0sydppavavvps5v7bs0dza2fr8rz3sn4as8sa"; depends=[lattice misc3d oro_nifti]; };
 msBP = derive { name="msBP"; version="1.0-2.1"; sha256="1yprhglqykh6v2jicab25a0ny1r49kaj3i04fspi3was2md2qbzd"; depends=[DPpackage]; };
-msSurv = derive { name="msSurv"; version="1.2-2"; sha256="02qm3mq17d2yj5mbz6gapd3zfi1wmiad5hpyimcb39impk43n2hf"; depends=[class lattice]; };
+msSurv = derive { name="msSurv"; version="1.2-2"; sha256="02qm3mq17d2yj5mbz6gapd3zfi1wmiad5hpyimcb39impk43n2hf"; depends=[class graph lattice]; };
 msap = derive { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; };
-msarc = derive { name="msarc"; version="1.4.5"; sha256="1jv364502m6q2w039dmdhwsx5id39jc4xcabyrbwbrgy65kwfspg"; depends=[gplots XLConnect wordcloud RColorBrewer]; };
-msda = derive { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[Matrix MASS]; };
+msarc = derive { name="msarc"; version="1.4.5"; sha256="1jv364502m6q2w039dmdhwsx5id39jc4xcabyrbwbrgy65kwfspg"; depends=[AnnotationDbi gplots RColorBrewer wordcloud XLConnect]; };
+msda = derive { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[MASS Matrix]; };
 mseapca = derive { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; };
-msgl = derive { name="msgl"; version="2.0.125.1"; sha256="1k2n8yn9j5sknw95saq2zgl3jfanyp3c2xyj49wqgawhwsw81jdh"; depends=[Matrix sglOptim Rcpp RcppProgress RcppArmadillo BH sglOptim]; };
+msgl = derive { name="msgl"; version="2.0.125.1"; sha256="1k2n8yn9j5sknw95saq2zgl3jfanyp3c2xyj49wqgawhwsw81jdh"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
 msgpackR = derive { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; };
 msgps = derive { name="msgps"; version="1.3"; sha256="0nvxy9a41z5d111gqr1gh521imm795l1li70g1mzrag1gpg810c5"; depends=[]; };
 msir = derive { name="msir"; version="1.3"; sha256="0d7zxjmhr1ri3qz3fdkf56fi5dz2p9lb2vyqccrpn7js2ibkqhpl"; depends=[mclust]; };
-msm = derive { name="msm"; version="1.5"; sha256="12vw5qmrvmpvg371fx4g55ydwa83y433z6v25b7pnl5hcbc8kfj4"; depends=[survival mvtnorm expm]; };
-msme = derive { name="msme"; version="0.5.1"; sha256="1bkj10pgmv9q61384fwd2pxccclclc3knc5x212p42w4w49hnm1q"; depends=[MASS lattice]; };
+msm = derive { name="msm"; version="1.5"; sha256="12vw5qmrvmpvg371fx4g55ydwa83y433z6v25b7pnl5hcbc8kfj4"; depends=[expm mvtnorm survival]; };
+msme = derive { name="msme"; version="0.5.1"; sha256="1bkj10pgmv9q61384fwd2pxccclclc3knc5x212p42w4w49hnm1q"; depends=[lattice MASS]; };
 msos = derive { name="msos"; version="1.0.1"; sha256="0fbxi8x83sj8a6bahc7q28vql00pxqdia2vxb6ilsc459xaph6vc"; depends=[mclust tree]; };
-msr = derive { name="msr"; version="0.4.1"; sha256="1kfj6xq7l32ligc53akiym3s9if87087gan8nqz4w7d8nxp693s7"; depends=[Matrix class glmnet e1071 rgl RColorBrewer colorspace]; };
-mstate = derive { name="mstate"; version="0.2.7"; sha256="0rys25cwr814k8z65206s12yv18dala66b3nlfq882dw5cfpaybl"; depends=[survival RColorBrewer]; };
-mtk = derive { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[stringr XML sensitivity lhs rgl]; };
+msr = derive { name="msr"; version="0.4.1"; sha256="1kfj6xq7l32ligc53akiym3s9if87087gan8nqz4w7d8nxp693s7"; depends=[class colorspace e1071 glmnet Matrix RColorBrewer rgl]; };
+mstate = derive { name="mstate"; version="0.2.7"; sha256="0rys25cwr814k8z65206s12yv18dala66b3nlfq882dw5cfpaybl"; depends=[RColorBrewer survival]; };
+mtk = derive { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[lhs rgl sensitivity stringr XML]; };
 mtsdi = derive { name="mtsdi"; version="0.3.3"; sha256="1hx4m1jnfhkycxizxaklnd9illajqvv1nml8ajfn3kjmrb5z7qlp"; depends=[gam]; };
 muStat = derive { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; };
 muhaz = derive { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; };
 muir = derive { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; };
-multcomp = derive { name="multcomp"; version="1.4-0"; sha256="1n1qbg7amk385ryni97qdbzcinpwpxldl3r477r1kfgv8csynxhj"; depends=[mvtnorm survival TH_data sandwich codetools]; };
+multcomp = derive { name="multcomp"; version="1.4-0"; sha256="1n1qbg7amk385ryni97qdbzcinpwpxldl3r477r1kfgv8csynxhj"; depends=[codetools mvtnorm sandwich survival TH_data]; };
 multcompView = derive { name="multcompView"; version="0.1-5"; sha256="0vfgvqxqgxyifkqs3r5xxj7rfn8lfmby6wyyiqa5jv01073xchib"; depends=[]; };
 multgee = derive { name="multgee"; version="1.5.1"; sha256="1ycbbri26hahbi3q4mrsyhrh9bwj89dyv6gvrpx58ghrlsnakjy1"; depends=[gnm VGAM]; };
 multiAssetOptions = derive { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; };
-multiDimBio = derive { name="multiDimBio"; version="0.3.3"; sha256="1aj6yam31mr0abjb6m5m85r1w71snha4s7h4ikyw66sc73xkmb9m"; depends=[ggplot2 lme4 misc3d MASS RColorBrewer]; };
+multiDimBio = derive { name="multiDimBio"; version="0.3.3"; sha256="1aj6yam31mr0abjb6m5m85r1w71snha4s7h4ikyw66sc73xkmb9m"; depends=[ggplot2 lme4 MASS misc3d pcaMethods RColorBrewer]; };
 multiPIM = derive { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; };
 multiband = derive { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl05zncvvig6hs4nl1h9wkrkc24rxx9risw9k9"; depends=[]; };
-multibiplotGUI = derive { name="multibiplotGUI"; version="0.0-1"; sha256="14zgn86zwwdchhr5dzqxxxsf0dy6kny4ixvd77y08454lni0a69r"; depends=[rgl tkrplot RODBC]; };
+multibiplotGUI = derive { name="multibiplotGUI"; version="0.0-1"; sha256="14zgn86zwwdchhr5dzqxxxsf0dy6kny4ixvd77y08454lni0a69r"; depends=[rgl RODBC tkrplot]; };
 multic = derive { name="multic"; version="0.3.8.1"; sha256="06lc9kn0z3s7x00hz8vj903q0c6cncnj4v3ygvd2yvkgcbhfvjd0"; depends=[]; };
-multicon = derive { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[psych abind foreach mvtnorm sciplot]; };
-multicool = derive { name="multicool"; version="0.1-6"; sha256="0hzwxrcsz7dm4ilv8rpkcwi61ssym94ki8ayssfh2r2ghy9w9xlw"; depends=[Rcpp Rcpp]; };
+multicon = derive { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[abind foreach mvtnorm psych sciplot]; };
+multicool = derive { name="multicool"; version="0.1-6"; sha256="0hzwxrcsz7dm4ilv8rpkcwi61ssym94ki8ayssfh2r2ghy9w9xlw"; depends=[Rcpp]; };
 multigroup = derive { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; };
-multilevel = derive { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[nlme MASS]; };
-multilevelPSA = derive { name="multilevelPSA"; version="1.2.2"; sha256="0z3qnv14sdkfvyw2wjrfz26r7sr7vv3rlr8n4gf99rwv6k34bdsg"; depends=[ggplot2 xtable PSAgraphics plyr psych reshape proto party]; };
-multimark = derive { name="multimark"; version="1.1.4"; sha256="045lfgzxwz4m1y5gny2y92cmix6wxi1sl486gajal2scfib31rgv"; depends=[statmod Matrix RMark coda Brobdingnag mvtnorm]; };
+multilevel = derive { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[MASS nlme]; };
+multilevelPSA = derive { name="multilevelPSA"; version="1.2.2"; sha256="0z3qnv14sdkfvyw2wjrfz26r7sr7vv3rlr8n4gf99rwv6k34bdsg"; depends=[ggplot2 party plyr proto PSAgraphics psych reshape xtable]; };
+multimark = derive { name="multimark"; version="1.1.4"; sha256="045lfgzxwz4m1y5gny2y92cmix6wxi1sl486gajal2scfib31rgv"; depends=[Brobdingnag coda Matrix mvtnorm RMark statmod]; };
 multinbmod = derive { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
-multinomRob = derive { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[rgenoud MASS mvtnorm]; };
-multipleNCC = derive { name="multipleNCC"; version="1.0"; sha256="13z6yq77h1r6kp8wgza58c6yp9a1gqm0w36x534mxbhcmingdw9f"; depends=[survival gam]; };
+multinomRob = derive { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; };
+multipleNCC = derive { name="multipleNCC"; version="1.0"; sha256="13z6yq77h1r6kp8wgza58c6yp9a1gqm0w36x534mxbhcmingdw9f"; depends=[gam survival]; };
 multiplex = derive { name="multiplex"; version="1.6"; sha256="052qjqkwf2sp4w7hv5gj9x3vhwjpa6k10sr969283z7aw6c1yb4g"; depends=[]; };
 multipol = derive { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; };
 multirich = derive { name="multirich"; version="2.0.2"; sha256="1lqc4np45p9ar9l8l1m5bdh98fsmhvzj8s0b2mcp9cqrvnhp1irc"; depends=[]; };
@@ -4753,95 +4772,95 @@ multitable = derive { name="multitable"; version="1.6"; sha256="067bgl793wwvb1rh
 multitaper = derive { name="multitaper"; version="1.0-11"; sha256="1s0lmjzpyd7zmc2p1ywv5fm7qkq357p70b76gw9wjlms6d81j1n4"; depends=[]; };
 multivator = derive { name="multivator"; version="1.1-4"; sha256="125ifkpm1pny4rjpzirnwpmpjfg0y8w0rygj0way0p1qwm0l207n"; depends=[emulator mvtnorm]; };
 multiway = derive { name="multiway"; version="1.0-0"; sha256="1yp9cgi5pkby1qszc8qrw3pv8q254cr6grhmdlmaf2yrhmpfahv9"; depends=[]; };
-multiwayvcov = derive { name="multiwayvcov"; version="1.2.1"; sha256="15gxcrg2i1aqbxkif5dmdz81yzqj7a4hq0dcd0narzsvm5b4w9py"; depends=[sandwich boot]; };
+multiwayvcov = derive { name="multiwayvcov"; version="1.2.1"; sha256="15gxcrg2i1aqbxkif5dmdz81yzqj7a4hq0dcd0narzsvm5b4w9py"; depends=[boot sandwich]; };
 multxpert = derive { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4zkj1cfh884larpj8cbgg3p9l3pag20snf1l"; depends=[mvtnorm]; };
-muma = derive { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[car pdist pls gplots mvtnorm robustbase gtools bitops caTools pcaPP rrcov]; };
-munfold = derive { name="munfold"; version="0.3-3"; sha256="1szm3c1xi1s7r1w6h7xb4x538sbczrblb70a3ysxf4q8c1ihmly9"; depends=[memisc MASS]; };
+muma = derive { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[bitops car caTools gplots gtools mvtnorm pcaPP pdist pls robustbase rrcov]; };
+munfold = derive { name="munfold"; version="0.3-3"; sha256="1szm3c1xi1s7r1w6h7xb4x538sbczrblb70a3ysxf4q8c1ihmly9"; depends=[MASS memisc]; };
 munsell = derive { name="munsell"; version="0.4.2"; sha256="1bi5yi0i80778bbzx2rm4f0glpc34kvh24pwwfhm4v32izsqgrw4"; depends=[colorspace]; };
 musicNMR = derive { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; };
-mutoss = derive { name="mutoss"; version="0.1-10"; sha256="1pijr3admnciiwdgxbdac4352m7h08jyvpj7vdd27yx07wp2rri3"; depends=[mvtnorm plotrix multcomp]; };
-mutossGUI = derive { name="mutossGUI"; version="0.1-9"; sha256="1xdby6n0w1155kx6mhinvgqm0ssgyy4443pkq3k88a5s4bfxw5bw"; depends=[mutoss multcomp plotrix rJava JavaGD CommonJavaJars JGR]; };
-mvMORPH = derive { name="mvMORPH"; version="1.0.5"; sha256="184ywvgi2dz77ivl2g7spx065wh1ap2lpmvbrhik9sgysygkijs2"; depends=[phytools ape corpcor subplex spam]; };
-mvProbit = derive { name="mvProbit"; version="0.1-0"; sha256="0fnrlralydlsf9iphq385f8hpqigfmi8rafvgp443gygvpq5b6g0"; depends=[mvtnorm maxLik abind bayesm miscTools]; };
-mvSLOUCH = derive { name="mvSLOUCH"; version="1.1.5"; sha256="1cq1j4f1k0xhq2ncmji1a4p4m6h7k2afsr39abib4g3md902v0hp"; depends=[ouch ape numDeriv mvtnorm corpcor]; };
+mutoss = derive { name="mutoss"; version="0.1-10"; sha256="1pijr3admnciiwdgxbdac4352m7h08jyvpj7vdd27yx07wp2rri3"; depends=[multcomp multtest mvtnorm plotrix]; };
+mutossGUI = derive { name="mutossGUI"; version="0.1-9"; sha256="1xdby6n0w1155kx6mhinvgqm0ssgyy4443pkq3k88a5s4bfxw5bw"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; };
+mvMORPH = derive { name="mvMORPH"; version="1.0.5"; sha256="184ywvgi2dz77ivl2g7spx065wh1ap2lpmvbrhik9sgysygkijs2"; depends=[ape corpcor phytools spam subplex]; };
+mvProbit = derive { name="mvProbit"; version="0.1-0"; sha256="0fnrlralydlsf9iphq385f8hpqigfmi8rafvgp443gygvpq5b6g0"; depends=[abind bayesm maxLik miscTools mvtnorm]; };
+mvSLOUCH = derive { name="mvSLOUCH"; version="1.1.5"; sha256="1cq1j4f1k0xhq2ncmji1a4p4m6h7k2afsr39abib4g3md902v0hp"; depends=[ape corpcor mvtnorm numDeriv ouch]; };
 mvShapiroTest = derive { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; };
-mvabund = derive { name="mvabund"; version="3.10.4"; sha256="1hza09nghgz0iyfayqabf5d0yb6zqnvhwmprif6y9qix8jscilwl"; depends=[Rcpp MASS tweedie statmod]; };
+mvabund = derive { name="mvabund"; version="3.10.4"; sha256="1hza09nghgz0iyfayqabf5d0yb6zqnvhwmprif6y9qix8jscilwl"; depends=[MASS Rcpp statmod tweedie]; };
 mvbutils = derive { name="mvbutils"; version="2.7.4.1"; sha256="1vs97yia78xh35sdfv5pj3ddqmy83qgamvyyh9gjg0vdznqhffzg"; depends=[]; };
 mvc = derive { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; };
-mvctm = derive { name="mvctm"; version="1.0"; sha256="1naxjh2k3vv4wlpzzx0y2zwvbn4kdqyls8a8qx6bz609ynzay5r9"; depends=[Formula nlme MNM quantreg Rfit]; };
+mvctm = derive { name="mvctm"; version="1.0"; sha256="1naxjh2k3vv4wlpzzx0y2zwvbn4kdqyls8a8qx6bz609ynzay5r9"; depends=[Formula MNM nlme quantreg Rfit]; };
 mvcwt = derive { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6jd416a0b2rap3dqq3kchnz8h4s2"; depends=[foreach RColorBrewer]; };
 mvglmmRank = derive { name="mvglmmRank"; version="1.0-2"; sha256="0gpp0ibgji86pxscqzcws0d1qn1ciqqvyfb0x2v18580r4cx8jv7"; depends=[Matrix numDeriv]; };
 mvinfluence = derive { name="mvinfluence"; version="0.6"; sha256="1cd5p6cl2zln8madjf3vsbmqlg4nsklzzy6ngdd5glj1a9qapd6c"; depends=[car heplots]; };
 mvmesh = derive { name="mvmesh"; version="1.0"; sha256="168s3n3ibiwdk0wys4kjj1xdpkz891rq5dv3lqf4pil83kbw8jw9"; depends=[rcdd rgl]; };
 mvmeta = derive { name="mvmeta"; version="0.4.7"; sha256="1yadaviq66wdfs0dipn6gxk7jqvzwzjdr8lkfggdsl4vyyi9pwip"; depends=[]; };
 mvna = derive { name="mvna"; version="1.2-3"; sha256="1gwv17j6w9c38bqvnasv9kfigbdxiqkzwj89gqmkxgw715f9nnpp"; depends=[lattice]; };
-mvnfast = derive { name="mvnfast"; version="0.1.3"; sha256="1ghm6zdrh2ax8r4jin8gka0qjwcsixn5faclf17sr5bx7l5b62np"; depends=[Rcpp Rcpp RcppArmadillo BH]; };
+mvnfast = derive { name="mvnfast"; version="0.1.3"; sha256="1ghm6zdrh2ax8r4jin8gka0qjwcsixn5faclf17sr5bx7l5b62np"; depends=[BH Rcpp RcppArmadillo]; };
 mvngGrAd = derive { name="mvngGrAd"; version="0.1.5"; sha256="0ir4pakfb2jq84rbfqix6rph8q6cgadjdn49rrdl4439b8hlsg8k"; depends=[]; };
 mvnmle = derive { name="mvnmle"; version="0.1-11"; sha256="02mpmrr22cqb3v8x7kydgg715yl3lrdgzgdqpchmp0xrl2db8gq4"; depends=[]; };
 mvnormtest = derive { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; };
 mvnpermute = derive { name="mvnpermute"; version="1.0.0"; sha256="0mbyj5i5vysrnl3pgypl0cjf3sylsvzfl1pcxkn0q16560vqh2ba"; depends=[]; };
-mvoutlier = derive { name="mvoutlier"; version="2.0.6"; sha256="00kim5i8xdbaqc0l16w1pif5yfqf741x686lq6drb243jl89rfjv"; depends=[sgeostat robCompositions robustbase]; };
+mvoutlier = derive { name="mvoutlier"; version="2.0.6"; sha256="00kim5i8xdbaqc0l16w1pif5yfqf741x686lq6drb243jl89rfjv"; depends=[robCompositions robustbase sgeostat]; };
 mvprpb = derive { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; };
 mvrtn = derive { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; };
-mvsf = derive { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[nortest mvnormtest]; };
+mvsf = derive { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[mvnormtest nortest]; };
 mvtmeta = derive { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; };
 mvtnorm = derive { name="mvtnorm"; version="1.0-2"; sha256="0v4a05i92g70vf8xkh6as7566zgjcnpzr1ghhyszqk1f0maw9gxc"; depends=[]; };
 mvtsplot = derive { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; };
-mwa = derive { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem rJava MASS]; };
-mwaved = derive { name="mwaved"; version="1.1.1"; sha256="1hn6nbwawkizv9v4k98hm5lz94yha2fng76x0r9f804whmv1pz36"; depends=[Rcpp shiny Rcpp]; };
+mwa = derive { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem MASS rJava]; };
+mwaved = derive { name="mwaved"; version="1.1.1"; sha256="1hn6nbwawkizv9v4k98hm5lz94yha2fng76x0r9f804whmv1pz36"; depends=[Rcpp shiny]; };
 mxkssd = derive { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; };
-myTAI = derive { name="myTAI"; version="0.1.0"; sha256="0qz2mm3ca5i93kz3pg8llpniix3vdy7mxz1n8k36iap09rbsrgmi"; depends=[Rcpp nortest fitdistrplus foreach doParallel dplyr Rcpp]; };
+myTAI = derive { name="myTAI"; version="0.1.0"; sha256="0qz2mm3ca5i93kz3pg8llpniix3vdy7mxz1n8k36iap09rbsrgmi"; depends=[doParallel dplyr fitdistrplus foreach nortest Rcpp]; };
 mycobacrvR = derive { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; };
 mycor = derive { name="mycor"; version="0.1"; sha256="1ibcxl9v2d2mxpwad0rv5dw1j645rrg05f4aqvyhyd40hz9823mr"; depends=[lattice]; };
 myepisodes = derive { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; };
-mztwinreg = derive { name="mztwinreg"; version="1.0-1"; sha256="1rg6ikaqdrc7q44s3r3km8h45prnvcpzpxd7nxbmh209iz9j19ai"; depends=[rms mclogit]; };
+mztwinreg = derive { name="mztwinreg"; version="1.0-1"; sha256="1rg6ikaqdrc7q44s3r3km8h45prnvcpzpxd7nxbmh209iz9j19ai"; depends=[mclogit rms]; };
 nCDunnett = derive { name="nCDunnett"; version="1.0.0"; sha256="0n5zzsdrhra5xql110wrxbfdjm3fwa6qhvnpj89w9ph9nr4ad8gf"; depends=[]; };
 nCal = derive { name="nCal"; version="2015.3-3"; sha256="0vj6l8w29ymj1v18mb4qyw6w1xpmwx5bvil4kjb82gccsb95ir10"; depends=[drc gdata gWidgets kyotil]; };
 nFCA = derive { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; };
-nFactors = derive { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[MASS psych boot lattice]; };
+nFactors = derive { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[boot lattice MASS psych]; };
 nLTT = derive { name="nLTT"; version="1.1"; sha256="0hrrwil7vcym7zjbnzviw13p60y14w660vndvc2lm5lmhbb8nhcn"; depends=[ape coda deSolve]; };
-nabor = derive { name="nabor"; version="0.4.6"; sha256="0kd0h8n5yrn16vrfdchdiqzws05q0fm8z577p20dm18gdcs2vbxv"; depends=[Rcpp Rcpp RcppEigen BH]; };
+nabor = derive { name="nabor"; version="0.4.6"; sha256="0kd0h8n5yrn16vrfdchdiqzws05q0fm8z577p20dm18gdcs2vbxv"; depends=[BH Rcpp RcppEigen]; };
 nadiv = derive { name="nadiv"; version="2.13.3"; sha256="0ph05a1yvphij41fgm4gnvijqni29n4jx2my6s0pd9l67bwa56c8"; depends=[Matrix]; };
 namespace = derive { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
 nanop = derive { name="nanop"; version="2.0-5"; sha256="0zdn2hgp516hcqpc2w2vzhhalcr05dlw539zj3afzi75w8rwb71z"; depends=[distrEx rgl]; };
 nasaweather = derive { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; };
-nat = derive { name="nat"; version="1.6.6"; sha256="0jqpj9hrz8xqikl84b9nzi1hh82cmry18vpca7s8dl4824yadkrw"; depends=[rgl nabor igraph filehash digest nat_utils plyr yaml]; };
-nat_nblast = derive { name="nat.nblast"; version="1.5"; sha256="1slpk126fwgn90j3aazlf3pw2ij050dghc1yqadv6mjcj82qpm5i"; depends=[rgl nat nabor dendroextras plyr spam]; };
-nat_templatebrains = derive { name="nat.templatebrains"; version="0.4.1"; sha256="06vqnrwcara4ljkf5wbwqbsfx1ypd8xsv8pbrs5x6hyj5jxnnvaz"; depends=[rgl nat]; };
+nat = derive { name="nat"; version="1.6.6"; sha256="0jqpj9hrz8xqikl84b9nzi1hh82cmry18vpca7s8dl4824yadkrw"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; };
+nat_nblast = derive { name="nat.nblast"; version="1.5"; sha256="1slpk126fwgn90j3aazlf3pw2ij050dghc1yqadv6mjcj82qpm5i"; depends=[dendroextras nabor nat plyr rgl spam]; };
+nat_templatebrains = derive { name="nat.templatebrains"; version="0.4.1"; sha256="06vqnrwcara4ljkf5wbwqbsfx1ypd8xsv8pbrs5x6hyj5jxnnvaz"; depends=[nat rgl]; };
 nat_utils = derive { name="nat.utils"; version="0.4.2"; sha256="0k5bdqwrbq82bb9ld90ia7b4vjaczba20h231a129rkszsy6sz9v"; depends=[]; };
 naturalsort = derive { name="naturalsort"; version="0.1.2"; sha256="0m8a8z0n5zmmgpmpn5w87j2jfsz1igz3x133z3q25h8jlyaxy750"; depends=[]; };
 nbconvertR = derive { name="nbconvertR"; version="1.0"; sha256="1yjsw5aq68ya4k1nl2n6q5d5z5yzqskgnpj3gms67ha3dhmz78jr"; depends=[]; };
 nbpMatching = derive { name="nbpMatching"; version="1.4.5"; sha256="1bglrzhap9rar6c8c2c5009l1ljq44mys66jpafw4xyw2pq7djqg"; depends=[Hmisc MASS]; };
-ncappc = derive { name="ncappc"; version="0.1"; sha256="1145y9k718245mzs8q33mjwcln79dmiyawy771zrk3kpxhfb5985"; depends=[ggplot2 gridExtra scales gtable PerformanceAnalytics lattice knitr xtable reshape2]; };
+ncappc = derive { name="ncappc"; version="0.1"; sha256="1145y9k718245mzs8q33mjwcln79dmiyawy771zrk3kpxhfb5985"; depends=[ggplot2 gridExtra gtable knitr lattice PerformanceAnalytics reshape2 scales xtable]; };
 ncbit = derive { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; };
 ncdf = derive { name="ncdf"; version="1.6.8"; sha256="1vrbrrqij7p712wfrki09749yryzr9lg4p95yqvb0zzggqpw2snm"; depends=[]; };
-ncdf_tools = derive { name="ncdf.tools"; version="0.7.1.295"; sha256="1jgxivmg2gzvkn09n13i5xr1v0xcyp5ckhwxz6g5kdh9z2dkjhc2"; depends=[RNetCDF chron abind plotrix raster RColorBrewer JBTools]; };
+ncdf_tools = derive { name="ncdf.tools"; version="0.7.1.295"; sha256="1jgxivmg2gzvkn09n13i5xr1v0xcyp5ckhwxz6g5kdh9z2dkjhc2"; depends=[abind chron JBTools plotrix raster RColorBrewer RNetCDF]; };
 ncdf4 = derive { name="ncdf4"; version="1.13"; sha256="07s1lh5cg4fck7sapfka2skky70max1rfhimblnqf41phndxjcsv"; depends=[]; };
-ncdf4_helpers = derive { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[ncdf4 PCICt abind]; };
+ncdf4_helpers = derive { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[abind ncdf4 PCICt]; };
 ncf = derive { name="ncf"; version="1.1-5"; sha256="03nbmg9swxhpwrmfjsanp6fj5l2nw160sys70mj10a0ljlaf904z"; depends=[]; };
 ncg = derive { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; };
 ncvreg = derive { name="ncvreg"; version="3.4-0"; sha256="12ns62l0wdj9vkmqbdyxcwb15g3hz45dxcm7zl189iljcsl65977"; depends=[]; };
-ndl = derive { name="ndl"; version="0.2.16"; sha256="1l56kg3x4579hzr4sig3iwrd81rhm8nmmrqfs54zxqv5yxpk3hp4"; depends=[Rcpp MASS Rcpp]; };
-ndtv = derive { name="ndtv"; version="0.6.1"; sha256="0833n3ddhx1ixqi540j6b2bfmzhpdpg8cwd6d5y7shfxslrnpay9"; depends=[network networkDynamic animation sna MASS statnet_common jsonlite base64]; };
+ndl = derive { name="ndl"; version="0.2.16"; sha256="1l56kg3x4579hzr4sig3iwrd81rhm8nmmrqfs54zxqv5yxpk3hp4"; depends=[MASS Rcpp]; };
+ndtv = derive { name="ndtv"; version="0.6.1"; sha256="0833n3ddhx1ixqi540j6b2bfmzhpdpg8cwd6d5y7shfxslrnpay9"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; };
 neariso = derive { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; };
 needy = derive { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; };
 negenes = derive { name="negenes"; version="1.0-1"; sha256="0g8m3idjm24cf9b1wngw2pv1axgnv9mk5wqs78zgwvn0m67ypsiz"; depends=[]; };
 neldermead = derive { name="neldermead"; version="1.0-10"; sha256="1snavf90yb12sydic7br749njbnfr0k7kk20fy677mg648sf73di"; depends=[optimbase optimsimplex]; };
-neotoma = derive { name="neotoma"; version="1.3.0"; sha256="0a5fmas441zl479vfndgyhanp5iivzdp5zqrpnr3pvgf3wfdnppd"; depends=[RJSONIO RCurl plyr reshape2]; };
+neotoma = derive { name="neotoma"; version="1.3.0"; sha256="0a5fmas441zl479vfndgyhanp5iivzdp5zqrpnr3pvgf3wfdnppd"; depends=[plyr RCurl reshape2 RJSONIO]; };
 nephro = derive { name="nephro"; version="1.1"; sha256="06lxkk67n5whgc78vrr7gxvnrz38pxlsj4plj02zv9fwlzbb9h6p"; depends=[]; };
 nestedRanksTest = derive { name="nestedRanksTest"; version="0.2"; sha256="0r08jp8036cz2dl1mjf4qvv5qdcvsrad3cwj88x31xx35c4dnjgj"; depends=[]; };
-netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[kernlab Matrix ROCR igraph samr]; };
+netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[AnnotationDbi graph igraph kernlab Matrix ROCR samr]; };
 netassoc = derive { name="netassoc"; version="0.4.3"; sha256="153zgnmk9qjcxhfdy9g1fkgjx0vpyv55gmj4spk664igvw6kicf3"; depends=[igraph]; };
-netgen = derive { name="netgen"; version="1.1"; sha256="0wbsssskhih6fyb0xfpnd3sjp25z8h0jyy3437ykgh7g24hh0i1z"; depends=[BBmisc mvtnorm lhs checkmate ggplot2 lpSolve igraph stringr]; };
-netgsa = derive { name="netgsa"; version="2.0"; sha256="04id2wcrmi0lqvn4a8qhqkc3z076b8xd7jhw9hsmaz21g9cxdfx8"; depends=[cvTools corpcor glasso glmnet igraph]; };
-netmeta = derive { name="netmeta"; version="0.7-0"; sha256="0nsy817bj3fh4sz632pljyjn7jphg9w389hhdcyjvkb7i43c9v5c"; depends=[meta magic]; };
+netgen = derive { name="netgen"; version="1.1"; sha256="0wbsssskhih6fyb0xfpnd3sjp25z8h0jyy3437ykgh7g24hh0i1z"; depends=[BBmisc checkmate ggplot2 igraph lhs lpSolve mvtnorm stringr]; };
+netgsa = derive { name="netgsa"; version="2.0"; sha256="04id2wcrmi0lqvn4a8qhqkc3z076b8xd7jhw9hsmaz21g9cxdfx8"; depends=[corpcor cvTools glasso glmnet igraph]; };
+netmeta = derive { name="netmeta"; version="0.7-0"; sha256="0nsy817bj3fh4sz632pljyjn7jphg9w389hhdcyjvkb7i43c9v5c"; depends=[magic meta]; };
 nets = derive { name="nets"; version="0.1"; sha256="0zshiavdi1z8mq6q93vsyb5wx5nq37qln9gcyvamvi2pgy5xg4k2"; depends=[igraph]; };
-nettools = derive { name="nettools"; version="1.0.1"; sha256="13fw316r31g9cjlbyy9qfccsyagxb6pyvn5k32f166b7vj92mk1q"; depends=[rootSolve dtw WGCNA Matrix minerva combinat igraph]; };
-netweavers = derive { name="netweavers"; version="1.1"; sha256="0p8hb3m0lbkf0pw9vdhv94spdba432klpqgn07jvxfhfhmr8cyz0"; depends=[igraph]; };
+nettools = derive { name="nettools"; version="1.0.1"; sha256="13fw316r31g9cjlbyy9qfccsyagxb6pyvn5k32f166b7vj92mk1q"; depends=[combinat dtw igraph Matrix minerva minet rootSolve WGCNA]; };
+netweavers = derive { name="netweavers"; version="1.1"; sha256="0p8hb3m0lbkf0pw9vdhv94spdba432klpqgn07jvxfhfhmr8cyz0"; depends=[Biobase BiocGenerics igraph limma]; };
 network = derive { name="network"; version="1.12.0"; sha256="04n634ia6m86zkmjdla8v6j4x11kdrx72gaj4am7iwv1ha14nfks"; depends=[]; };
-networkD3 = derive { name="networkD3"; version="0.1.2.1"; sha256="0xc3qbcb0xvdfvx2vb68rzif72x3zna32wrhz9lg9s7dfkz4xmfm"; depends=[htmlwidgets plyr rjson]; };
-networkDynamic = derive { name="networkDynamic"; version="0.7.1"; sha256="0iv4lyfxmjllxk0cx09gdrg7zf2myf57wd3a2gqymids5gvpsy2d"; depends=[network statnet_common network]; };
-networkDynamicData = derive { name="networkDynamicData"; version="0.1.0"; sha256="1vln4n8jldqi1a6qb9j9aaxyjb8pfgwd8brnsqr8hp9lm3axd24b"; depends=[networkDynamic network]; };
+networkD3 = derive { name="networkD3"; version="0.1.7"; sha256="08jazv4mf2h4jdwrlpjr6k1dfcj99rs3nabgqw7x8pi3zb9l6m99"; depends=[htmlwidgets plyr rjson]; };
+networkDynamic = derive { name="networkDynamic"; version="0.7.1"; sha256="0iv4lyfxmjllxk0cx09gdrg7zf2myf57wd3a2gqymids5gvpsy2d"; depends=[network statnet_common]; };
+networkDynamicData = derive { name="networkDynamicData"; version="0.1.0"; sha256="1vln4n8jldqi1a6qb9j9aaxyjb8pfgwd8brnsqr8hp9lm3axd24b"; depends=[network networkDynamic]; };
 networkTomography = derive { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; };
 networkreporting = derive { name="networkreporting"; version="0.0.1"; sha256="1vfvx5gf90p31gy6kcv7l2ibzbfl382gffa79dl8gascbsg6s8z8"; depends=[functional ggplot2 plyr reshape2 stringr]; };
 networksis = derive { name="networksis"; version="2.1-3"; sha256="1kvil3qs7xd94ak9jgvj1nss55gjg0y7d35zmass9h1hjkcrq7bg"; depends=[network]; };
@@ -4849,19 +4868,19 @@ neuRosim = derive { name="neuRosim"; version="0.2-12"; sha256="1hsnw9xipdr74fydq
 neural = derive { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; };
 neuralnet = derive { name="neuralnet"; version="1.32"; sha256="0p9r5j8q0flv15wn5s6qi9if7npna107l1ffv37nzx1b4vgswnl9"; depends=[MASS]; };
 neuroblastoma = derive { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; };
-neuroim = derive { name="neuroim"; version="0.0.3"; sha256="0n5jkyvdaiigv51s5bb508w5xkh0qkd1zbs67nnms14s1664fhiz"; depends=[stringr hash iterators abind Matrix yaImpute]; };
+neuroim = derive { name="neuroim"; version="0.0.3"; sha256="0n5jkyvdaiigv51s5bb508w5xkh0qkd1zbs67nnms14s1664fhiz"; depends=[abind hash iterators Matrix stringr yaImpute]; };
 ngram = derive { name="ngram"; version="1.1"; sha256="0p5wm55anch1i0y3478f5d4sivs7q8j3kwlg89nk3337win06499"; depends=[]; };
-ngramr = derive { name="ngramr"; version="1.4.5"; sha256="1cqapla0lknxl669w5x3av9nr4vy9qrfznznqj22xlqaj0p53c18"; depends=[httr RCurl plyr rjson stringr reshape2 ggplot2 scales]; };
+ngramr = derive { name="ngramr"; version="1.4.5"; sha256="1cqapla0lknxl669w5x3av9nr4vy9qrfznznqj22xlqaj0p53c18"; depends=[ggplot2 httr plyr RCurl reshape2 rjson scales stringr]; };
 ngramrr = derive { name="ngramrr"; version="0.1.1"; sha256="1h12nm0dg2mkq5b2zn12cij24nl8inqn04m4jxdi1lr6r81y1wsq"; depends=[tau]; };
-ngspatial = derive { name="ngspatial"; version="1.0-5"; sha256="0dd7gm6irq08054ndj2gykz4nnfqfq3wbivg6fmlkdnn18kbckkk"; depends=[Rcpp batchmeans Rcpp RcppArmadillo]; };
-nhlscrapr = derive { name="nhlscrapr"; version="1.8"; sha256="0y2shw3g84flh88a15czdsb62xwdqxhvzkn4kpbn0k9ddyfzxc48"; depends=[RCurl rjson biglm bitops]; };
+ngspatial = derive { name="ngspatial"; version="1.0-5"; sha256="0dd7gm6irq08054ndj2gykz4nnfqfq3wbivg6fmlkdnn18kbckkk"; depends=[batchmeans Rcpp RcppArmadillo]; };
+nhlscrapr = derive { name="nhlscrapr"; version="1.8"; sha256="0y2shw3g84flh88a15czdsb62xwdqxhvzkn4kpbn0k9ddyfzxc48"; depends=[biglm bitops RCurl rjson]; };
 nice = derive { name="nice"; version="0.4"; sha256="1alq8n8pchn9v0fvwrifdisazkh519x109bqgnpgnwf79wblmnhy"; depends=[]; };
 nicheROVER = derive { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; };
 nlADG = derive { name="nlADG"; version="0.1-0"; sha256="0nvd5hzd1p81jwx5p7js86wblgg615vdnpbvy5rhmhf1ig583z1b"; depends=[ggm]; };
-nlWaldTest = derive { name="nlWaldTest"; version="1.0.1"; sha256="1rwpkkddivpcamhsp22nmy5gz2006y9kbdzj8lhh20s1vsyhn2b3"; depends=[stringr numDeriv]; };
+nlWaldTest = derive { name="nlWaldTest"; version="1.0.1"; sha256="1rwpkkddivpcamhsp22nmy5gz2006y9kbdzj8lhh20s1vsyhn2b3"; depends=[numDeriv stringr]; };
 nleqslv = derive { name="nleqslv"; version="2.8"; sha256="1jkf02mcz16d8h8b7h5m13lpx6z2shpap5vncapszwa9js6vps67"; depends=[]; };
 nlme = derive { name="nlme"; version="3.1-120"; sha256="1ji8nrf714nf18by9g7k4czkgnj1cq464pvjv195c5fnhwhmpmjc"; depends=[lattice]; };
-nlmeODE = derive { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve nlme lattice]; };
+nlmeODE = derive { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; };
 nlmeU = derive { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; };
 nlmrt = derive { name="nlmrt"; version="2013-9.25"; sha256="0z2ih61rpqzk64qagiwbx396vwb28jhqk8b4kxchca0il3fzqqav"; depends=[]; };
 nloptr = derive { name="nloptr"; version="1.0.4"; sha256="1cypz91z28vhvwq2rzqjrbdc6a2lvfr2g16vid2sax618q6ai089"; depends=[]; };
@@ -4871,22 +4890,22 @@ nlsMicrobio = derive { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z0
 nlsem = derive { name="nlsem"; version="0.3"; sha256="1lpp6f6nby1rzxv7hrqnm4qbwj406g9ls9jmidb8rqgy177sk4w6"; depends=[gaussquad mvtnorm nlme]; };
 nlsmsn = derive { name="nlsmsn"; version="0.0-4"; sha256="1gvpy8rq020l64bdw6n7kv354l7gwa2rgxarm6k0mqq7z21fxf58"; depends=[]; };
 nlstools = derive { name="nlstools"; version="1.0-1"; sha256="00m2x587gvrbgs7wdkz2n54ylp0rnrs76rb6xmi3pf9xlbmnplr2"; depends=[]; };
-nlt = derive { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[EbayesThresh adlift]; };
-nlts = derive { name="nlts"; version="0.2-0"; sha256="14kvzc1p4anj9f7pg005pcbmc4k0917r49pvqys9a0a51ira67vb"; depends=[locfit acepack]; };
+nlt = derive { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[adlift EbayesThresh]; };
+nlts = derive { name="nlts"; version="0.2-0"; sha256="14kvzc1p4anj9f7pg005pcbmc4k0917r49pvqys9a0a51ira67vb"; depends=[acepack locfit]; };
 nmcdr = derive { name="nmcdr"; version="0.3.0"; sha256="1557pdv7mqdjwpm6d9zw3zfbm1s8ai3rasd66nigscmlq102w745"; depends=[CDFt]; };
 nnet = derive { name="nnet"; version="7.3-9"; sha256="1z1lhi35w5l7l645d764w9h4aiv6hapjv8fwb9b51b36vyg1r0zg"; depends=[]; };
 nnlasso = derive { name="nnlasso"; version="0.2"; sha256="1q1psc6s5xw2nsz09q20n5rksq07gx21q9ap22dr7haln5jrvpzr"; depends=[]; };
 nnls = derive { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; };
-nodeHarvest = derive { name="nodeHarvest"; version="0.7-2"; sha256="18lmp7mly3ad95yz2cv330bg7y9fwldvagnzvjx0zgsx81f3bncr"; depends=[quadprog randomForest]; };
-nodiv = derive { name="nodiv"; version="1.0.3"; sha256="0fwx7f30qxfnhgzn5lrphwv0clvap3w887xf6316lbr86sjw4x3v"; depends=[picante raster ape sp vegan]; };
+nodeHarvest = derive { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; };
+nodiv = derive { name="nodiv"; version="1.1.0"; sha256="16c7xm46jnzcsd5gyj72krjyizgyf5mh490x2f4khar65gqzqx04"; depends=[ape picante raster sp vegan]; };
 noia = derive { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; };
 nomclust = derive { name="nomclust"; version="0.91.1010"; sha256="02jpzcjclm22bjg59wj4490vh2rp9ma1vqxdnwmppyb478558fz1"; depends=[cluster dummies]; };
 noncensus = derive { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; };
-nonlinearTseries = derive { name="nonlinearTseries"; version="0.2.2"; sha256="1p78a9nqn53v9r885p4lg47vqlryw7335pxrid191xqabxxs3ba7"; depends=[Matrix rgl tseries TSA Rcpp Rcpp]; };
+nonlinearTseries = derive { name="nonlinearTseries"; version="0.2.2"; sha256="1p78a9nqn53v9r885p4lg47vqlryw7335pxrid191xqabxxs3ba7"; depends=[Matrix Rcpp rgl TSA tseries]; };
 nonnest2 = derive { name="nonnest2"; version="0.2"; sha256="0z2ihnhphf6c9cklj1l81kqgyz1h9wl2ziwx7s0ssn3dfgw4fnp7"; depends=[CompQuadForm mvtnorm sandwich]; };
-nonparaeff = derive { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[lpSolve gdata Hmisc rms geometry psych pwt]; };
+nonparaeff = derive { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[gdata geometry Hmisc lpSolve psych pwt rms]; };
 nonrandom = derive { name="nonrandom"; version="1.42"; sha256="0icm23hw593322z41wmjkwxqknh2pa9kpzbrch7xw1mhp93sd5ll"; depends=[lme4]; };
-nontarget = derive { name="nontarget"; version="1.7"; sha256="1hnqkb8bpp89y42gjrfh7m3lxhif9dyhcmr6yfss8x3lzf018gk2"; depends=[enviPat nontargetData mgcv]; };
+nontarget = derive { name="nontarget"; version="1.7"; sha256="1hnqkb8bpp89y42gjrfh7m3lxhif9dyhcmr6yfss8x3lzf018gk2"; depends=[enviPat mgcv nontargetData]; };
 nontargetData = derive { name="nontargetData"; version="1.1"; sha256="07cdbpmn64sg4jfhljdcx503d55azyz58x7nkji044z3jmdryzqw"; depends=[]; };
 nopp = derive { name="nopp"; version="1.0.4"; sha256="00wn0pnqpy9xll0aa8ah45ldgk1ziw464x8zkc8iq4l2a22lgn4v"; depends=[mlogit]; };
 nor1mix = derive { name="nor1mix"; version="1.2-0"; sha256="1s92bwpwq9p0d06adclm43yqq0k7ifv8lknn1scxg8nj4g03qjhs"; depends=[]; };
@@ -4903,7 +4922,7 @@ np = derive { name="np"; version="0.60-2"; sha256="0zs1d4mmgns7s26qcplf9mlz9rkp6
 npIntFactRep = derive { name="npIntFactRep"; version="1.2"; sha256="0fx5923wdzz6122bbyil5imwbhgwlm50wcrscy78qdx8n4n07rv8"; depends=[ez plyr]; };
 nparLD = derive { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; };
 nparcomp = derive { name="nparcomp"; version="2.6"; sha256="111ypwyc885lvn64a5sb2k552j6wr3iihmhgx5y475axdiva5pzf"; depends=[multcomp mvtnorm]; };
-npbr = derive { name="npbr"; version="1.1"; sha256="011zmz1s6kkdgylkl6dc79dpardgpc5dlh6g6y2l84hgax1rbdl6"; depends=[quadprog Rglpk Benchmarking np]; };
+npbr = derive { name="npbr"; version="1.1"; sha256="011zmz1s6kkdgylkl6dc79dpardgpc5dlh6g6y2l84hgax1rbdl6"; depends=[Benchmarking np quadprog Rglpk]; };
 npcp = derive { name="npcp"; version="0.1-1"; sha256="0b2mqx0zrvai5aw6b47qpi4bwcfjrv0bh8ahrgx7n1sf045grm3a"; depends=[]; };
 npde = derive { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; };
 nplplot = derive { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; };
@@ -4911,7 +4930,7 @@ nplr = derive { name="nplr"; version="0.1-1"; sha256="0br7flriqbig8frq0j4lxiv6i8
 npmlreg = derive { name="npmlreg"; version="0.46-1"; sha256="1gddl6diw8ix8vz7n1r4ps9cjx3q00mafpapskjk7pcz69m6hfv1"; depends=[statmod]; };
 npmv = derive { name="npmv"; version="2.2"; sha256="1aqlx1y3bxbqp13q0vajwffj8srb6s04d5r2h08m9fk5hhp9l3jf"; depends=[Formula]; };
 nppbib = derive { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; };
-npsm = derive { name="npsm"; version="0.5"; sha256="12jq6ygp3di5rknh7izrr3bxvpn6bqnj3jhfxzf29yf0bd86hzqk"; depends=[Rfit plyr]; };
+npsm = derive { name="npsm"; version="0.5"; sha256="12jq6ygp3di5rknh7izrr3bxvpn6bqnj3jhfxzf29yf0bd86hzqk"; depends=[plyr Rfit]; };
 npsp = derive { name="npsp"; version="0.3-6"; sha256="1wiv4gp3y1c26xaq8zssias3j3h8mpb6izcmcarghvnfhj32l8jb"; depends=[quadprog]; };
 npst = derive { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; };
 nsRFA = derive { name="nsRFA"; version="0.7-12"; sha256="182zshwyg0l6shb5wcwibqygxs8qmgma9c4s683za8q3f9l94aqj"; depends=[]; };
@@ -4919,21 +4938,21 @@ nscancor = derive { name="nscancor"; version="0.6"; sha256="1wkk08h8yz2mzgvmq0vr
 nsga2R = derive { name="nsga2R"; version="1.0"; sha256="04jj0a3isfc348vg46il5x9l33cr7xawz5w0mm4pwr6djhd8nfhx"; depends=[mco]; };
 nsgp = derive { name="nsgp"; version="1.0.5"; sha256="0piajjz3r71dnjw7lwpjhbaygxcrbbxfvhf8p3n2izyr2pw5fml9"; depends=[MASS]; };
 nsprcomp = derive { name="nsprcomp"; version="0.5"; sha256="1rrjiwkpiaqlp27s5xfd6jwmmpzgxm5d7874gp33511wa0vrhnnf"; depends=[]; };
-nullabor = derive { name="nullabor"; version="0.3.1"; sha256="0anwla6x9y2i7yd6r0yi1xhy0zfqwfpp5h1f18gji11nmiva9d81"; depends=[ggplot2 MASS plyr dplyr moments fpc]; };
+nullabor = derive { name="nullabor"; version="0.3.1"; sha256="0anwla6x9y2i7yd6r0yi1xhy0zfqwfpp5h1f18gji11nmiva9d81"; depends=[dplyr fpc ggplot2 MASS moments plyr]; };
 numDeriv = derive { name="numDeriv"; version="2014.2-1"; sha256="114wd0hwn2mwlyh84hh3yd2bvcy63f166ihbpnp6xn6fqp019skd"; depends=[]; };
 numOSL = derive { name="numOSL"; version="1.8"; sha256="0md55gfxjvdmjy4hy58wp11c788xy7kq9wl32m1r76ja6g03wwbl"; depends=[]; };
 numbers = derive { name="numbers"; version="0.5-6"; sha256="17v7by1gvqg2mdm5vrmf05kfrbvc2yz8ldb7bd0lrhcyrm5bbbwa"; depends=[gmp]; };
-nutshell = derive { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_bbdb nutshell_audioscrobbler]; };
+nutshell = derive { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_audioscrobbler nutshell_bbdb]; };
 nutshell_audioscrobbler = derive { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; };
 nutshell_bbdb = derive { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; };
 nws = derive { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; };
 nycflights13 = derive { name="nycflights13"; version="0.1"; sha256="15bqaphxwqpdzr4bkn6qgbjb3knja5hk34qxjd6xhpjzkgfs5c0b"; depends=[]; };
 oaxaca = derive { name="oaxaca"; version="0.1.2"; sha256="1ghdrpjp2p4nlwskvs8n8d8ixzf3cdq9k9q49zvq8ag0dhwyswzd"; depends=[Formula ggplot2 reshape2]; };
-objectProperties = derive { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals objectSignals]; };
+objectProperties = derive { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals]; };
 objectSignals = derive { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; };
 obliclus = derive { name="obliclus"; version="0.9"; sha256="000r1dx4zbgjxrfs66c1yazm0w6q2z0z1scf45g2qj5ykcm9ylma"; depends=[]; };
-oblique_tree = derive { name="oblique.tree"; version="1.1.1"; sha256="01vyc46gz7qx8fc5bg3zbhjyhnmfgjii120a915vmr38cs51qhqh"; depends=[tree glmnet nnet]; };
-obliqueRF = derive { name="obliqueRF"; version="0.3"; sha256="1bwlgv820mmpc6vg26bsdlfy2p78586i3y42hkzbw3z1fmwq3pz5"; depends=[ROCR pls mda e1071]; };
+oblique_tree = derive { name="oblique.tree"; version="1.1.1"; sha256="01vyc46gz7qx8fc5bg3zbhjyhnmfgjii120a915vmr38cs51qhqh"; depends=[glmnet nnet tree]; };
+obliqueRF = derive { name="obliqueRF"; version="0.3"; sha256="1bwlgv820mmpc6vg26bsdlfy2p78586i3y42hkzbw3z1fmwq3pz5"; depends=[e1071 mda pls ROCR]; };
 obs_agree = derive { name="obs.agree"; version="1.0"; sha256="191xshnrncjqzwd2rdq334vsx0338q3y3k1nbm04hdaysbnla9jv"; depends=[]; };
 obsSens = derive { name="obsSens"; version="1.3"; sha256="1vfm1mzsycwkqa39vf3fcdv1s6adps9hw1rxlvl8v9kq746hcabw"; depends=[]; };
 oc = derive { name="oc"; version="0.95"; sha256="1zmy34fsqcd4rq0v72r514k6gm3jmf9a5zv4m6kj09hl89xvqsci"; depends=[pscl]; };
@@ -4942,73 +4961,73 @@ oce = derive { name="oce"; version="0.9-17"; sha256="0j1sj9qlcg0yrdhpqinrpaa8dv4
 ocean = derive { name="ocean"; version="0.2-4"; sha256="1554iixfbw3k6w9xh3hgbiygszqvj5ci431cfmnx48jm27h2alqg"; depends=[ncdf4 proj4]; };
 ocedata = derive { name="ocedata"; version="0.1.3"; sha256="0lzsyaz8zb6kiw86fnaav2g2wfdhyicxvm81ly5a9z4mjch3qj02"; depends=[]; };
 odds_converter = derive { name="odds.converter"; version="1.1"; sha256="0x57hrb54pvk1prxl87yz3mwvxf3fxranzg706vdiwkcnjc4damm"; depends=[]; };
-odeintr = derive { name="odeintr"; version="1.3"; sha256="12y5hr6f7bj3aqj4gd0hlj495c5163jn0liksspk5jpqcmpsgdg3"; depends=[Rcpp Rcpp BH]; };
+odeintr = derive { name="odeintr"; version="1.3"; sha256="12y5hr6f7bj3aqj4gd0hlj495c5163jn0liksspk5jpqcmpsgdg3"; depends=[BH Rcpp]; };
 odfWeave = derive { name="odfWeave"; version="0.8.4"; sha256="1rp9j3snkkp0fqmkr6h6pxqd4cxkdfajgh4vlhpz56gr2l9j48q5"; depends=[lattice XML]; };
 odfWeave_survey = derive { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; };
-oem = derive { name="oem"; version="1.02.1"; sha256="0z9k0jhpp5dayyin6v8p26rgl8s983hnpsk195c9z458i7nbmrpd"; depends=[Rcpp Rcpp RcppArmadillo]; };
+oem = derive { name="oem"; version="1.02.1"; sha256="0z9k0jhpp5dayyin6v8p26rgl8s983hnpsk195c9z458i7nbmrpd"; depends=[Rcpp RcppArmadillo]; };
 oglmx = derive { name="oglmx"; version="1.0.2"; sha256="1yln1ysk19mxnb0aq74xgqj0qqipqg3qbczyhdygakjd4v4ndvhg"; depends=[maxLik]; };
 okmesonet = derive { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; };
 omd = derive { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; };
 oncomodel = derive { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; };
 onemap = derive { name="onemap"; version="2.0-4"; sha256="00xmhm5qy0ycw0mnlyl20vfw0wxmpb36f07k0jj92c4zbpwjiygx"; depends=[tkrplot]; };
 onion = derive { name="onion"; version="1.2-4"; sha256="0x3n9mwknxjwhpdg8an0ilix5cb8dyy5fqnb6nxx7ww885k0381a"; depends=[]; };
-onlinePCA = derive { name="onlinePCA"; version="1.0-1"; sha256="0gca0ijcc30b3z5i390n1yk6c7sc15z8d0zpxpfb3hh99g7vinx4"; depends=[rARPACK Rcpp Rcpp RcppArmadillo]; };
+onlinePCA = derive { name="onlinePCA"; version="1.0-1"; sha256="0gca0ijcc30b3z5i390n1yk6c7sc15z8d0zpxpfb3hh99g7vinx4"; depends=[rARPACK Rcpp RcppArmadillo]; };
 onls = derive { name="onls"; version="0.1-0"; sha256="1kfgikswddly9lar6wa1hhz89rap0pql9h181s7i68wa20xdg05z"; depends=[minpack_lm]; };
 opefimor = derive { name="opefimor"; version="1.1"; sha256="0xv57l38wx3w67h312g5xcpi9m7ggd6crqvqjh5gddq0g1g93bjq"; depends=[]; };
 openNLP = derive { name="openNLP"; version="0.2-5"; sha256="0jc4ii6zsj0pf6nlx3l0db18p6whp047gzvc7q0dbwpa8q4il2mb"; depends=[NLP openNLPdata rJava]; };
 openNLPdata = derive { name="openNLPdata"; version="1.5.3-1"; sha256="1a048irgv56yi2lvhpqh8vh4dl7g7zfg934qypjxg8mcdcqi820y"; depends=[rJava]; };
-openair = derive { name="openair"; version="1.5"; sha256="0swhaldfhz6zgs50aws18kypilv15k7w99nqcmb7y0wgvkkwda2h"; depends=[lazyeval dplyr maps plyr reshape2 mgcv lattice latticeExtra cluster RColorBrewer mapproj hexbin mapdata RgoogleMaps Rcpp Rcpp]; };
-opencpu = derive { name="opencpu"; version="1.4.6"; sha256="19anprhkwqw2kii417qy3laalrlj207zfvklc05m0vz9sra7sxj0"; depends=[evaluate httpuv knitr jsonlite devtools httr brew openssl]; };
+openair = derive { name="openair"; version="1.5"; sha256="0swhaldfhz6zgs50aws18kypilv15k7w99nqcmb7y0wgvkkwda2h"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval mapdata mapproj maps mgcv plyr RColorBrewer Rcpp reshape2 RgoogleMaps]; };
+opencpu = derive { name="opencpu"; version="1.4.6"; sha256="19anprhkwqw2kii417qy3laalrlj207zfvklc05m0vz9sra7sxj0"; depends=[brew devtools evaluate httpuv httr jsonlite knitr openssl]; };
 openintro = derive { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; };
 openssl = derive { name="openssl"; version="0.4"; sha256="1gfhzxjjssid2z8xmw3vnnd4gj2f6a3zzazkhpg9b1ymmcp9b288"; depends=[]; };
-opentraj = derive { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[plyr maptools openair raster rgdal reshape doParallel foreach sp]; };
-openxlsx = derive { name="openxlsx"; version="2.4.0"; sha256="1jzq3lz9qivsprmn8aibwiidcwsanlnfpmsz2ccw3650gdgk3zdk"; depends=[Rcpp Rcpp]; };
+opentraj = derive { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; };
+openxlsx = derive { name="openxlsx"; version="2.4.0"; sha256="1jzq3lz9qivsprmn8aibwiidcwsanlnfpmsz2ccw3650gdgk3zdk"; depends=[Rcpp]; };
 operator_tools = derive { name="operator.tools"; version="1.4.4"; sha256="1ridxi3pbylb4flfgn371n1v9796rnd1ndxhh6ijyzpysqqmwi08"; depends=[]; };
 operators = derive { name="operators"; version="0.1-7"; sha256="1qik9ihv5blz77bzsnrslf665ndpa8vp3xldqsgvs4gr5bg5algw"; depends=[]; };
 ops = derive { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; };
 optAUC = derive { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; };
-optBiomarker = derive { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[rpanel rgl MASS randomForest e1071 ipred msm Matrix]; };
-optCluster = derive { name="optCluster"; version="1.0.0"; sha256="1qpymgdy4pcl5isz88m2bb734c2c2qlh77c0i8c1wy4hkrx5ndpl"; depends=[clValid RankAggreg mclust cluster gplots kohonen MBCluster_Seq]; };
+optBiomarker = derive { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[e1071 ipred MASS Matrix msm randomForest rgl rpanel]; };
+optCluster = derive { name="optCluster"; version="1.0.0"; sha256="1qpymgdy4pcl5isz88m2bb734c2c2qlh77c0i8c1wy4hkrx5ndpl"; depends=[cluster clValid gplots kohonen MBCluster_Seq mclust RankAggreg]; };
 optR = derive { name="optR"; version="1.1.1"; sha256="1lr5n0g21jayb27b2j8zh16f1k28avzg7k2mwyc7rjhhxv8k9w1j"; depends=[]; };
 optextras = derive { name="optextras"; version="2013-10.28"; sha256="1sm025xwrpm5c63l4kiqfndxb7rwq2bcmidy4k2b24g5a8x7cpfv"; depends=[numDeriv]; };
-optiRum = derive { name="optiRum"; version="0.35"; sha256="0hfby5791jmzpacd8a4jj45b6sr5fph9g24kv6sr9db35y07ca36"; depends=[data_table ggplot2 AUC knitr plyr scales stringr XML]; };
+optiRum = derive { name="optiRum"; version="0.35"; sha256="0hfby5791jmzpacd8a4jj45b6sr5fph9g24kv6sr9db35y07ca36"; depends=[AUC data_table ggplot2 knitr plyr scales stringr XML]; };
 optifunset = derive { name="optifunset"; version="1.0"; sha256="18pvdl04ln1i0w30ljdb3k86j27zg2nvrn3ws54c1g6zg9haqhbg"; depends=[]; };
 optimbase = derive { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; };
 optimsimplex = derive { name="optimsimplex"; version="1.0-5"; sha256="1aiq0w2zlra3k6x4hf2rglb6bj8w25yc8djnpgm508kkrbv3cc17"; depends=[optimbase]; };
-optimx = derive { name="optimx"; version="2013.8.7"; sha256="0pbd7s02isj24npi4m1m1f008xqwzvwp3kn472wz8nmy4zrid30s"; depends=[numDeriv ucminf BB Rcgmin Rvmmin minqa setRNG dfoptim svUnit]; };
+optimx = derive { name="optimx"; version="2013.8.7"; sha256="0pbd7s02isj24npi4m1m1f008xqwzvwp3kn472wz8nmy4zrid30s"; depends=[BB dfoptim minqa numDeriv Rcgmin Rvmmin setRNG svUnit ucminf]; };
 optiscale = derive { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; };
 optmatch = derive { name="optmatch"; version="0.9-3"; sha256="16mhrhdpyqrj1g24mwc3fl0qyqq1kna8z6cj239fpbjhqb1mirjb"; depends=[digest]; };
 optparse = derive { name="optparse"; version="1.3.0"; sha256="02sy28imvssr49pngdbg9qbx1h1fyjl11j7nql55m10a7cdzhwd4"; depends=[getopt]; };
 optpart = derive { name="optpart"; version="2.1-1"; sha256="0m2nsrynqbw9sj7cp7c37grx9g20dld2f26g0xzbj16wz7whgp02"; depends=[cluster labdsv MASS plotrix]; };
 optrees = derive { name="optrees"; version="1.0"; sha256="1zqpjii8dsfs98n58qpif81ckvyxkr0661svhlbgzi19xb2vszqs"; depends=[igraph]; };
-orQA = derive { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[Rcpp gtools nlme Rcpp]; };
+orQA = derive { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[genefilter gtools nlme Rcpp]; };
 ora = derive { name="ora"; version="2.0-1"; sha256="0albxqma220rnrpfdq3z9cawr83q1a0zzczbbcy4nijjm4mswphy"; depends=[DBI ROracle]; };
 orca = derive { name="orca"; version="1.1"; sha256="138qqjklwd3g4dfg9j2438kzpsdc7sf8qdl8ha4kd276n71vkfrh"; depends=[]; };
 orclus = derive { name="orclus"; version="0.2-5"; sha256="0kkxhyqjxib862npinzf3mipqg5imgscdmb5wqm8wf2j2mbislsx"; depends=[]; };
 orcutt = derive { name="orcutt"; version="1.1"; sha256="0hz7aw4jpf4l7ihj4bjnjv1m8ynr71n4l12x046qj8y7mrnl9p4k"; depends=[]; };
-ordBTL = derive { name="ordBTL"; version="0.8"; sha256="09x3zfmss4fsh3rjghgmpv8y34dnkz4mw696b3k3nvlgk55a1423"; depends=[caret VGAM wikibooks gtools]; };
+ordBTL = derive { name="ordBTL"; version="0.8"; sha256="09x3zfmss4fsh3rjghgmpv8y34dnkz4mw696b3k3nvlgk55a1423"; depends=[caret gtools VGAM wikibooks]; };
 ordPens = derive { name="ordPens"; version="0.3-1"; sha256="0yzf3qzi4p7xqimihjvr0wkdvj3sy9n3wc86bf4bjbavniq6m69r"; depends=[grplasso mgcv RLRsim]; };
 orddom = derive { name="orddom"; version="3.1"; sha256="165axs15fvwhrp89xd87l81q3h2qjll1vrwcsap645cwvb85nwsh"; depends=[psych]; };
-orderbook = derive { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[lattice hash]; };
-orderedLasso = derive { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8xscvambcb1y70gqqi5819a2gxh02h4pnyjn8axql"; depends=[Matrix Iso quadprog ggplot2 reshape2]; };
-ordinal = derive { name="ordinal"; version="2015.1-21"; sha256="1vhkxdsapmah09vzy6xd00kb1ck02vbiyamv5ccflxdbdmch1q1y"; depends=[ucminf MASS Matrix]; };
-ordinalCont = derive { name="ordinalCont"; version="0.4"; sha256="1inms74l4zx6r526xd0v79v18bcqa76xwsgfvap0fizyv2dvgpim"; depends=[fastGHQuad boot ucminf]; };
+orderbook = derive { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[hash lattice]; };
+orderedLasso = derive { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8xscvambcb1y70gqqi5819a2gxh02h4pnyjn8axql"; depends=[ggplot2 Iso Matrix quadprog reshape2]; };
+ordinal = derive { name="ordinal"; version="2015.1-21"; sha256="1vhkxdsapmah09vzy6xd00kb1ck02vbiyamv5ccflxdbdmch1q1y"; depends=[MASS Matrix ucminf]; };
+ordinalCont = derive { name="ordinalCont"; version="0.4"; sha256="1inms74l4zx6r526xd0v79v18bcqa76xwsgfvap0fizyv2dvgpim"; depends=[boot fastGHQuad ucminf]; };
 ordinalgmifs = derive { name="ordinalgmifs"; version="1.0.2"; sha256="1rbn2mb516hdr0chny1849m1aq0vb0vmr636b4fp914l5zh75vgi"; depends=[]; };
 ore = derive { name="ore"; version="1.1.0"; sha256="1khgjd5fl8vi9n9pj4nbai6fbfbiwzc121a0gf7dfk727iid8whq"; depends=[]; };
-orgR = derive { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[ggthemes ggplot2 lubridate data_table stringr]; };
+orgR = derive { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[data_table ggplot2 ggthemes lubridate stringr]; };
 orientlib = derive { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; };
 orloca = derive { name="orloca"; version="4.2"; sha256="14accc5kcvvin5qav6g3rx10by00r0b8970nd09w4c09nhwyblcd"; depends=[]; };
 orloca_es = derive { name="orloca.es"; version="4.1"; sha256="0nzhg7vzfxlmryw5ijww8z2b1g9cmgcgzi3gsgigsgn4shnc2hni"; depends=[orloca]; };
 oro_dicom = derive { name="oro.dicom"; version="0.5.0"; sha256="05dmhfglp76apyilwicf3n2ylyjhp1gq6b9bnzsiiblpjnfpia43"; depends=[oro_nifti]; };
-oro_nifti = derive { name="oro.nifti"; version="0.5.2"; sha256="0zf5lb51b81602lwg118x3j2myrbrm6wjaflbpxxzqigz4q60rkg"; depends=[bitops abind]; };
+oro_nifti = derive { name="oro.nifti"; version="0.5.2"; sha256="0zf5lb51b81602lwg118x3j2myrbrm6wjaflbpxxzqigz4q60rkg"; depends=[abind bitops]; };
 oro_pet = derive { name="oro.pet"; version="0.2.3"; sha256="06agl6rvd01h6mnilj0vl52dxw6b7b41vl6vmbvaq5qy1wmiaiz7"; depends=[oro_dicom oro_nifti]; };
 orsk = derive { name="orsk"; version="1.0-1"; sha256="155wc9sfla3717b6xmhmsmvsnh2qbzzkffhibmj4xc0pd9lwwz2v"; depends=[BB BHH2]; };
 orthogonalsplinebasis = derive { name="orthogonalsplinebasis"; version="0.1.6"; sha256="07rbd0fhs2gsk7wj41y2h7wf6pfg324vzv2al753d8kqyx5ns2dj"; depends=[]; };
 orthopolynom = derive { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; };
 osDesign = derive { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; };
-osmar = derive { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[XML RCurl geosphere]; };
+osmar = derive { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; };
 ouch = derive { name="ouch"; version="2.8-4"; sha256="1kx6qjvc8zlcxihqfxs288hwwh9m05s5544w4c6m1wc02083b735"; depends=[subplex]; };
-outbreaker = derive { name="outbreaker"; version="1.1-5"; sha256="1k39pzqbjah4dwwjyaccb13c1aww8i4kdfjanxc4hzkl8av7s8db"; depends=[ape igraph adegenet]; };
+outbreaker = derive { name="outbreaker"; version="1.1-5"; sha256="1k39pzqbjah4dwwjyaccb13c1aww8i4kdfjanxc4hzkl8av7s8db"; depends=[adegenet ape igraph]; };
 outliers = derive { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; };
 overlap = derive { name="overlap"; version="0.2.4"; sha256="1pp3fggkbhif52i5lpihy7syhq2qp56mjvsxgbgwlcfbzy27ph1c"; depends=[]; };
 oz = derive { name="oz"; version="1.0-20"; sha256="1d420606ldyw2rhl8dh5hpscvjx6vanbq0hrg81m7b6v0q5rkfri"; depends=[]; };
@@ -5016,8 +5035,8 @@ p2distance = derive { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kj
 p3state_msm = derive { name="p3state.msm"; version="1.3"; sha256="0gbrka62ylxx64r3abpk60y92k2lk5smlf8na68qazph8llsl2rv"; depends=[survival]; };
 pBrackets = derive { name="pBrackets"; version="1.0"; sha256="0cwv609hzp8anfv3cgfbspz8w0g1ljfz05wm4xfhwy15v32fckrj"; depends=[]; };
 pGLS = derive { name="pGLS"; version="0.0-1"; sha256="1rlk8q09sikf4vpzsx0c7s6qqh2hxf8dy2bgcm4nnkbv2nfjz438"; depends=[MASS]; };
-pRF = derive { name="pRF"; version="1.0"; sha256="17m86l29ys4n6z4ndibwy7yz9shyp7nf9hjnbgbvmc0ycf1may6i"; depends=[dplyr ggplot2 permute randomForest reshape2 magrittr]; };
-pROC = derive { name="pROC"; version="1.8"; sha256="0rva08hnaah9qv6hapzgfsdy2g06fdvnjmw0l733wm5j2g44ps8m"; depends=[plyr Rcpp Rcpp]; };
+pRF = derive { name="pRF"; version="1.0"; sha256="17m86l29ys4n6z4ndibwy7yz9shyp7nf9hjnbgbvmc0ycf1may6i"; depends=[dplyr ggplot2 magrittr multtest permute randomForest reshape2]; };
+pROC = derive { name="pROC"; version="1.8"; sha256="0rva08hnaah9qv6hapzgfsdy2g06fdvnjmw0l733wm5j2g44ps8m"; depends=[plyr Rcpp]; };
 pRSR = derive { name="pRSR"; version="3.0.2"; sha256="1s81mi172mwxhp786c1fl579cg87valppr0z958ssvxsvg5hbfxy"; depends=[]; };
 pSI = derive { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; };
 pa = derive { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; };
@@ -5027,79 +5046,79 @@ packClassic = derive { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0
 packHV = derive { name="packHV"; version="1.8"; sha256="0dr2picjd7mm633vw29524f3n4jpyillpzi9cg7yc2cymxnrgvyg"; depends=[survival WriteXLS]; };
 packS4 = derive { name="packS4"; version="0.9.3"; sha256="0kkh4lfdbr2ydyfpymwrdkms1d4mj8430p6vxvj5wrgl4vh85gwd"; depends=[codetools]; };
 packdep = derive { name="packdep"; version="0.3.1"; sha256="1827h9xcvgdad9nwz9k3hi79jc33yr7dnxy4xn2frp3fdh4q81ll"; depends=[igraph]; };
-packrat = derive { name="packrat"; version="0.4.3"; sha256="0sfv7vl9afvv2rpqk39hbrvhq6z54ilqjrff4j3parsfqvg7gaqf"; depends=[]; };
+packrat = derive { name="packrat"; version="0.4.4"; sha256="1yxcj9jc1cswimirnxxzir1ac0xva57w57365k8406a8dwx1v650"; depends=[]; };
 pacman = derive { name="pacman"; version="0.3.0"; sha256="10fjkr4zjcx7cyfmnpdnb96swxizhdqhvzgb5crymrafxqvg00c7"; depends=[devtools]; };
 paf = derive { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; };
 pairedCI = derive { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; };
 pairheatmap = derive { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; };
 pairsD3 = derive { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; };
 pairwise = derive { name="pairwise"; version="0.2.5"; sha256="0r08v95f6f2safi6c0x84v5gib5qnkv46dmi97rdb9l2xzly249b"; depends=[]; };
-pairwiseCI = derive { name="pairwiseCI"; version="0.1-22"; sha256="1lgir9gcikx8c9pd2wdsqnik9rwr4qkymcf4ndp8s491vj6cm6sa"; depends=[MCPAN coin boot mratios binMto MASS]; };
-palaeoSig = derive { name="palaeoSig"; version="1.1-3"; sha256="1zm8xr7fpnnh6l4421vjavi6bg44iars3mna4r5fw3spmbswyv7b"; depends=[vegan TeachingDemos rioja mgcv MASS]; };
-paleoMAS = derive { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[MASS vegan lattice]; };
+pairwiseCI = derive { name="pairwiseCI"; version="0.1-22"; sha256="1lgir9gcikx8c9pd2wdsqnik9rwr4qkymcf4ndp8s491vj6cm6sa"; depends=[binMto boot coin MASS MCPAN mratios]; };
+palaeoSig = derive { name="palaeoSig"; version="1.1-3"; sha256="1zm8xr7fpnnh6l4421vjavi6bg44iars3mna4r5fw3spmbswyv7b"; depends=[MASS mgcv rioja TeachingDemos vegan]; };
+paleoMAS = derive { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[lattice MASS vegan]; };
 paleoTS = derive { name="paleoTS"; version="0.4-4"; sha256="19acfq5z42blk6ya7sj3sprddlgvhrzb9zqpvpy4q8siqkxxrjah"; depends=[mvtnorm]; };
-paleobioDB = derive { name="paleobioDB"; version="0.3"; sha256="1vcfssi6w0m2wd2smyjxp1zf0y48y95386kkb8qdndqw99g089w8"; depends=[raster maps rjson gtools RCurl plyr scales]; };
-paleofire = derive { name="paleofire"; version="1.1.6"; sha256="1fzmnc4ywhqb6sr3cclsqy6y9v27j69bxszlrrgbnqb0kyg28rd7"; depends=[GCD locfit raster ggplot2 plyr rgdal lattice]; };
+paleobioDB = derive { name="paleobioDB"; version="0.3"; sha256="1vcfssi6w0m2wd2smyjxp1zf0y48y95386kkb8qdndqw99g089w8"; depends=[gtools maps plyr raster RCurl rjson scales]; };
+paleofire = derive { name="paleofire"; version="1.1.6"; sha256="1fzmnc4ywhqb6sr3cclsqy6y9v27j69bxszlrrgbnqb0kyg28rd7"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; };
 paleotree = derive { name="paleotree"; version="2.4"; sha256="1rrsxll5qcvr9a96wg5bdljvyy7zy26zd9f0b17xswmp77gxmahb"; depends=[ape phangorn]; };
 palinsol = derive { name="palinsol"; version="0.92"; sha256="1jxy3qx8w1r8jwgdavf37gqjjqpizdqk218xcc7b77xi8w52vxpg"; depends=[gsl]; };
 palr = derive { name="palr"; version="0.0-4"; sha256="0rcb01lpi8zapnml1spx4ixxwbq9qh42sisqzrg7gxrkcjrbqxgl"; depends=[]; };
-pamctdp = derive { name="pamctdp"; version="0.3.1"; sha256="1fnadgfd2ikis49j9zl2ijj8gim8lpbygwxjj6ri9jyrc1qmj9jb"; depends=[ade4 xtable FactoClass]; };
-pamm = derive { name="pamm"; version="0.7"; sha256="02py4zcymmwnlpsvha5cgc4ik8fp0gbsg86s5q7z5fl3ma3g669j"; depends=[lme4 mvtnorm gmodels]; };
+pamctdp = derive { name="pamctdp"; version="0.3.1"; sha256="1fnadgfd2ikis49j9zl2ijj8gim8lpbygwxjj6ri9jyrc1qmj9jb"; depends=[ade4 FactoClass xtable]; };
+pamm = derive { name="pamm"; version="0.7"; sha256="02py4zcymmwnlpsvha5cgc4ik8fp0gbsg86s5q7z5fl3ma3g669j"; depends=[gmodels lme4 mvtnorm]; };
 pampe = derive { name="pampe"; version="1.1.1"; sha256="1ha4jbmi2j35i375ziv4rbs4rijlp6fxwvb0vfr2905d1vl3cbap"; depends=[leaps]; };
 pamr = derive { name="pamr"; version="1.55"; sha256="1hy3khb0gikdr3vpjz0s245m5zang1vq8k93g7n9fq3sjfa034gd"; depends=[cluster survival]; };
 pan = derive { name="pan"; version="1.3"; sha256="08g0arwwkj9smkzyh6aicfrqvknag3n2xl55f7q7ghj09fhwg1br"; depends=[]; };
-pander = derive { name="pander"; version="0.5.2"; sha256="0zs2c00dr0vph9d4par3zcisnyqa98rqym8fpya02ka28qajjiia"; depends=[digest Rcpp Rcpp]; };
+pander = derive { name="pander"; version="0.5.2"; sha256="0zs2c00dr0vph9d4par3zcisnyqa98rqym8fpya02ka28qajjiia"; depends=[digest Rcpp]; };
 panelAR = derive { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; };
 panelaggregation = derive { name="panelaggregation"; version="0.1"; sha256="19426hab4rvgn8k2c7x327k4ymihas59jbys0nmrfgg074x0xdnm"; depends=[data_table]; };
 papeR = derive { name="papeR"; version="0.6-1"; sha256="1h3mfapn31qphaly01j5pw2ci65g4z0wh4m1wf5r808cspn0mya0"; depends=[car gmodels]; };
 parallelMCMCcombine = derive { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; };
 parallelMap = derive { name="parallelMap"; version="1.3"; sha256="026d018fr2a43cbh8bi2dklzr9fxjzdw5qyq84g2i18v5ibr6bd5"; depends=[BBmisc checkmate]; };
-parallelSVM = derive { name="parallelSVM"; version="0.1-8"; sha256="19hmagv95nx8aw8xylk5vvpxw9a4fsa68r9q0x6irhq50wmah93r"; depends=[e1071 foreach doParallel]; };
+parallelSVM = derive { name="parallelSVM"; version="0.1-8"; sha256="19hmagv95nx8aw8xylk5vvpxw9a4fsa68r9q0x6irhq50wmah93r"; depends=[doParallel e1071 foreach]; };
 parallelize_dynamic = derive { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; };
 paramlink = derive { name="paramlink"; version="0.9-6"; sha256="0pazllkjbqzvl9vmpvr67lkcsd960mipcd1p1nf00y8hknrwh7qp"; depends=[kinship2 maxLik]; };
 paran = derive { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; };
-parboost = derive { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[mboost party iterators plyr caret glmnet doParallel]; };
-parcor = derive { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[MASS glmnet ppls Epi GeneNet]; };
-parfm = derive { name="parfm"; version="2.5.8"; sha256="05bzmm5ahaip5apsv84fbqy8bag9pkkfsxvqw1cbcvlbr2zyxfgp"; depends=[survival eha msm]; };
-parfossil = derive { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq5j0r3jnnrzw1q412dbvmakipyw2yx2l2s7jn"; depends=[fossil foreach]; };
-parma = derive { name="parma"; version="1.5-1"; sha256="0qrq3bx0amri9b3s6bym4znnk140jjd2abnvqyihaj4bf2glbl0g"; depends=[nloptr slam Rglpk quadprog FRAPO corpcor]; };
+parboost = derive { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[caret doParallel glmnet iterators mboost party plyr]; };
+parcor = derive { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[Epi GeneNet glmnet MASS ppls]; };
+parfm = derive { name="parfm"; version="2.5.8"; sha256="05bzmm5ahaip5apsv84fbqy8bag9pkkfsxvqw1cbcvlbr2zyxfgp"; depends=[eha msm survival]; };
+parfossil = derive { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq5j0r3jnnrzw1q412dbvmakipyw2yx2l2s7jn"; depends=[foreach fossil]; };
+parma = derive { name="parma"; version="1.5-1"; sha256="0qrq3bx0amri9b3s6bym4znnk140jjd2abnvqyihaj4bf2glbl0g"; depends=[corpcor FRAPO nloptr quadprog Rglpk slam]; };
 parmigene = derive { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; };
 parsedate = derive { name="parsedate"; version="1.1.1"; sha256="0mr97rw4fzg2v9dh5d4x0b76d5s56gi6zilq69yjhbx78w46apzc"; depends=[]; };
 partDSA = derive { name="partDSA"; version="0.9.10"; sha256="1j6ihgyjiy8dnr89xkqvl1dkmdswvknffq7zc15civy0h781azv6"; depends=[survival]; };
-partialAR = derive { name="partialAR"; version="1.0.5"; sha256="1d8nbv3rkf0p4vg8mlb1l5cqzgsqqhigwiq2bnd4npak6fq6syvg"; depends=[Rcpp zoo ggplot2 MASS tseries data_table FKF urca plot3D Rcpp]; };
+partialAR = derive { name="partialAR"; version="1.0.5"; sha256="1d8nbv3rkf0p4vg8mlb1l5cqzgsqqhigwiq2bnd4npak6fq6syvg"; depends=[data_table FKF ggplot2 MASS plot3D Rcpp tseries urca zoo]; };
 partialOR = derive { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; };
 partitionMap = derive { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; };
 partitionMetric = derive { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; };
 partitions = derive { name="partitions"; version="1.9-15"; sha256="0jgpknm4zah50w9i3fbq2f1whm4hywm2j72vxc3ignx1snx2z0gs"; depends=[gmp polynom]; };
 partools = derive { name="partools"; version="1.0.1"; sha256="0id6fw582ag0zwkp0yjm5vfcd2gv1bsa3zzhfx2fgiaarhnhzmda"; depends=[]; };
 partsm = derive { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
-party = derive { name="party"; version="1.0-21"; sha256="10kk3mw9kbkzhh5qacmq404d1r0scin2vc33wsf152lgc9fhs1xx"; depends=[mvtnorm modeltools strucchange survival coin zoo sandwich mvtnorm]; };
+party = derive { name="party"; version="1.0-21"; sha256="10kk3mw9kbkzhh5qacmq404d1r0scin2vc33wsf152lgc9fhs1xx"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
 partykit = derive { name="partykit"; version="1.0-1"; sha256="12ja72nginkzl9zrpiidqwrih2zgwxksdkhbw7hbdjbsr4zb7q62"; depends=[survival]; };
 parviol = derive { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; };
-pass = derive { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[MASS lars ncvreg]; };
+pass = derive { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[lars MASS ncvreg]; };
 pastecs = derive { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5z5j65lvr92ghpsk9f1ifm94dzjhi6d22i"; depends=[boot]; };
-pastis = derive { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[caper ape]; };
+pastis = derive { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[ape caper]; };
 patchDVI = derive { name="patchDVI"; version="1.9.1616"; sha256="1akdlzw8v2p1zz09bm88d63jyxj7fv5h50p459p9ml4yc816xvji"; depends=[]; };
 patchPlot = derive { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; };
 patchSynctex = derive { name="patchSynctex"; version="0.1-2"; sha256="1ssjs4mcsjad7g0yfi5sxwfyywsziry81rzwb4sly3afw8g538p9"; depends=[stringr]; };
-pathClass = derive { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[svmpath kernlab ROCR igraph lpSolve]; };
+pathClass = derive { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[affy Biobase igraph kernlab lpSolve ROCR svmpath]; };
 pathdiagram = derive { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95nwhk9214kcfpb1qrmw249mjaza7i9gijmlicraxz"; depends=[shape]; };
 pathmox = derive { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; };
 pathological = derive { name="pathological"; version="0.0-6"; sha256="1a6a9q15nk8rcpyz5xpndq0gbdv7y2iq4jgqiv7sgd3j1agh26c6"; depends=[assertive plyr stringr]; };
 pauwels2014 = derive { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; };
-pavo = derive { name="pavo"; version="0.5-2"; sha256="13iy9dmg19v0gqg12224ci0zq8fa0ap2i0is8v0rkfp19wzy0ryg"; depends=[rgl geometry mapproj rcdd]; };
+pavo = derive { name="pavo"; version="0.5-2"; sha256="13iy9dmg19v0gqg12224ci0zq8fa0ap2i0is8v0rkfp19wzy0ryg"; depends=[geometry mapproj rcdd rgl]; };
 pawacc = derive { name="pawacc"; version="1.2.1"; sha256="1l2wn69ynr5mza04a5mmzwzigqac8k9xkiaw7sdqv5hn9y7x3sj9"; depends=[SparseM]; };
 pbapply = derive { name="pbapply"; version="1.1-1"; sha256="1dshpnnmq1g2v223qy7pgbxydy9sqj04zwqxvzylm4mqc91ks4n2"; depends=[]; };
-pbatR = derive { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[survival rootSolve]; };
-pbdBASE = derive { name="pbdBASE"; version="0.2-3"; sha256="1zfz45fnjmp8yz4nlac9q1d49gpczkl2b0rz2s33jbv5i32z3yvs"; depends=[rlecuyer pbdMPI pbdSLAP]; };
-pbdDEMO = derive { name="pbdDEMO"; version="0.2-0"; sha256="0vilri4d25mb339zsgh1zypyqxv1vzfdc8b8ivqi5yz1nrzm05gz"; depends=[rlecuyer pbdMPI pbdSLAP pbdBASE pbdDMAT]; };
-pbdDMAT = derive { name="pbdDMAT"; version="0.2-3"; sha256="18x607r0gx1nnw9p305ci5sfcxbi5zdr2b6yf9y6vqjsckicnw62"; depends=[rlecuyer pbdMPI pbdSLAP pbdBASE]; };
+pbatR = derive { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[rootSolve survival]; };
+pbdBASE = derive { name="pbdBASE"; version="0.2-3"; sha256="1zfz45fnjmp8yz4nlac9q1d49gpczkl2b0rz2s33jbv5i32z3yvs"; depends=[pbdMPI pbdSLAP rlecuyer]; };
+pbdDEMO = derive { name="pbdDEMO"; version="0.2-0"; sha256="0vilri4d25mb339zsgh1zypyqxv1vzfdc8b8ivqi5yz1nrzm05gz"; depends=[pbdBASE pbdDMAT pbdMPI pbdSLAP rlecuyer]; };
+pbdDMAT = derive { name="pbdDMAT"; version="0.2-3"; sha256="18x607r0gx1nnw9p305ci5sfcxbi5zdr2b6yf9y6vqjsckicnw62"; depends=[pbdBASE pbdMPI pbdSLAP rlecuyer]; };
 pbdMPI = derive { name="pbdMPI"; version="0.2-5"; sha256="0g21zyl8dck5mxjsg4iif62ngrigj58hr8mzdvr47r1b081abzb4"; depends=[rlecuyer]; };
 pbdNCDF4 = derive { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; };
 pbdPROF = derive { name="pbdPROF"; version="0.2-3"; sha256="0vk29vgsv7fhw240sagz0szg0wb649sqc05j1aj027zvz931vfl8"; depends=[ggplot2 gridExtra reshape2]; };
-pbdSLAP = derive { name="pbdSLAP"; version="0.2-0"; sha256="06q9k8y7k604wa2zfspjg2v3fybn5my1vyr7zsg6j66n9g4z6039"; depends=[rlecuyer pbdMPI]; };
+pbdSLAP = derive { name="pbdSLAP"; version="0.2-0"; sha256="06q9k8y7k604wa2zfspjg2v3fybn5my1vyr7zsg6j66n9g4z6039"; depends=[pbdMPI rlecuyer]; };
 pbivnorm = derive { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; };
-pbkrtest = derive { name="pbkrtest"; version="0.4-2"; sha256="1yppp24a8rl36x6sn1jjhhgs41irbf0z5nrv454g9qwhbvfgiay5"; depends=[lme4 Matrix MASS]; };
+pbkrtest = derive { name="pbkrtest"; version="0.4-2"; sha256="1yppp24a8rl36x6sn1jjhhgs41irbf0z5nrv454g9qwhbvfgiay5"; depends=[lme4 MASS Matrix]; };
 pbo = derive { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; };
 pbs = derive { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
 pcIRT = derive { name="pcIRT"; version="0.1"; sha256="0vfbbmnp4jyrbi5d9gz1krh707aazbrqfcgc3rjrwwyjld11wyzn"; depends=[combinat]; };
@@ -5107,172 +5126,172 @@ pca3d = derive { name="pca3d"; version="0.3"; sha256="01nc4p68r7bnly18q8rkhnnj6v
 pcaBootPlot = derive { name="pcaBootPlot"; version="0.1.0"; sha256="0h5i5qh4lhnhh7n9k1map10gvw70f7576gnxhjjc6l03sngm0yp7"; depends=[RColorBrewer]; };
 pcaL1 = derive { name="pcaL1"; version="1.3"; sha256="026cgi812kvbkmaryd3lyqnb1m78i3ql2phlvsd2r691y1j8w532"; depends=[]; };
 pcaPP = derive { name="pcaPP"; version="1.9-60"; sha256="1rqq4zgik7cgnnnm8il1rxamp6q9isznac8fhryfsfdcawclfjws"; depends=[mvtnorm]; };
-pcalg = derive { name="pcalg"; version="2.2-0"; sha256="1cgir5h9g8v3kjmdqnnjsc0z1f8wl3flnnxnk9y7km82x5pby0m7"; depends=[abind igraph ggm corpcor robustbase vcd Rcpp bdsmatrix sfsmisc fastICA clue gmp Rcpp RcppArmadillo BH]; };
+pcalg = derive { name="pcalg"; version="2.2-0"; sha256="1cgir5h9g8v3kjmdqnnjsc0z1f8wl3flnnxnk9y7km82x5pby0m7"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
 pcg = derive { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; };
-pcnetmeta = derive { name="pcnetmeta"; version="2.2.1"; sha256="0y4sn1aby38c458667fsy2ndq64i8kknmzdc32mbvzd530p1yxai"; depends=[rjags coda]; };
+pcnetmeta = derive { name="pcnetmeta"; version="2.2.1"; sha256="0y4sn1aby38c458667fsy2ndq64i8kknmzdc32mbvzd530p1yxai"; depends=[coda rjags]; };
 pcrcoal = derive { name="pcrcoal"; version="1.1"; sha256="17mm13xpmghachiqr7v2691jk39mbfsadpg028gs3iiwmh0pksa0"; depends=[ape ggplot2 phylosim]; };
 pcse = derive { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; };
 pdR = derive { name="pdR"; version="1.3"; sha256="0y81nlvq5vwf6021m5ns6j4l44c5456jkbs2x9y7jfkw6r3v2ddf"; depends=[]; };
 pdc = derive { name="pdc"; version="1.0.2"; sha256="0d7p65rkwrh39njhszdrbv25z4jz27746y1qyhqmhkxmvkx6g1fl"; depends=[]; };
 pdfCluster = derive { name="pdfCluster"; version="1.0-2"; sha256="0kbci54dlzn736835fh18xnf2pmzqrdmwa3jim29xcnwa1r2gklb"; depends=[geometry]; };
-pdfetch = derive { name="pdfetch"; version="0.1.6"; sha256="1j3fdjnmfj84pfd5bc37ssbs83ya3ma0hj5iy1a0bg9wb5xqap13"; depends=[httr zoo xts XML lubridate jsonlite reshape2]; };
+pdfetch = derive { name="pdfetch"; version="0.1.6"; sha256="1j3fdjnmfj84pfd5bc37ssbs83ya3ma0hj5iy1a0bg9wb5xqap13"; depends=[httr jsonlite lubridate reshape2 XML xts zoo]; };
 pdist = derive { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; };
 pdmod = derive { name="pdmod"; version="1.0"; sha256="1czpaghp2lcad4j6wxswdfw0n9m0phngy966zr4fr3ciqpx3q129"; depends=[mco]; };
-peacots = derive { name="peacots"; version="1.1"; sha256="042644i8x0s4nd425lp8v1i4jspib3qxkgvprgapdhgqcp6cabk0"; depends=[]; };
+peacots = derive { name="peacots"; version="1.2"; sha256="1qrg6rzdnj0ba6igj4k9m1kc2q7gbwg8kwnmzhkjfza8jl8fqkf2"; depends=[]; };
 pear = derive { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; };
 pearson7 = derive { name="pearson7"; version="1.0-1"; sha256="0li32my02gv5yaf4q1w48pjbmij2njkpd15135n9mzjc5ibvf5kh"; depends=[]; };
-pec = derive { name="pec"; version="2.4.4"; sha256="110v8jb6l79prbkm8vp1qgrdks598q3ygmqj2yyv1d5plmsj9dh6"; depends=[prodlim foreach rms survival]; };
-pedantics = derive { name="pedantics"; version="1.5"; sha256="0m5jxzkf1pf657q2klv6idnywg18ki962666nj7sfyl4rq06xhsi"; depends=[MasterBayes MCMCglmm kinship2]; };
-pedgene = derive { name="pedgene"; version="2.1"; sha256="0nmp1s0i5b4h45p3f4rvvixjz8sgv56as3c85rvv3a8xwfd1gcxq"; depends=[Matrix CompQuadForm survey kinship2]; };
-pedigree = derive { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[Matrix HaploSim reshape]; };
+pec = derive { name="pec"; version="2.4.4"; sha256="110v8jb6l79prbkm8vp1qgrdks598q3ygmqj2yyv1d5plmsj9dh6"; depends=[foreach prodlim rms survival]; };
+pedantics = derive { name="pedantics"; version="1.5"; sha256="0m5jxzkf1pf657q2klv6idnywg18ki962666nj7sfyl4rq06xhsi"; depends=[kinship2 MasterBayes MCMCglmm]; };
+pedgene = derive { name="pedgene"; version="2.1"; sha256="0nmp1s0i5b4h45p3f4rvvixjz8sgv56as3c85rvv3a8xwfd1gcxq"; depends=[CompQuadForm kinship2 Matrix survey]; };
+pedigree = derive { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; };
 pedigreemm = derive { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; };
-pedometrics = derive { name="pedometrics"; version="0.6-2"; sha256="137685gyd7k9vpjnsy6h280cdbl15bchrizfnalnz6nizi0q85lj"; depends=[car gstat Hmisc lattice latticeExtra MASS moments plyr pbapply Rcpp sp spsurvey xtable Rcpp]; };
-pegas = derive { name="pegas"; version="0.8"; sha256="0074r6vsnvdc0gkqhb3cb4dybpgp4ryf38lrfkk8vrs3y9gb7hdh"; depends=[ape adegenet]; };
-penDvine = derive { name="penDvine"; version="0.2.2"; sha256="054vw99z68pk0bi4yzdmvx13x8n75sj2371l8w2yady1lqjj4qi7"; depends=[lattice quadprog TSP fda Matrix]; };
-penMSM = derive { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp Rcpp]; };
+pedometrics = derive { name="pedometrics"; version="0.6-2"; sha256="137685gyd7k9vpjnsy6h280cdbl15bchrizfnalnz6nizi0q85lj"; depends=[car gstat Hmisc lattice latticeExtra MASS moments pbapply plyr Rcpp sp spsurvey xtable]; };
+pegas = derive { name="pegas"; version="0.8"; sha256="0074r6vsnvdc0gkqhb3cb4dybpgp4ryf38lrfkk8vrs3y9gb7hdh"; depends=[adegenet ape]; };
+penDvine = derive { name="penDvine"; version="0.2.2"; sha256="054vw99z68pk0bi4yzdmvx13x8n75sj2371l8w2yady1lqjj4qi7"; depends=[fda lattice Matrix quadprog TSP]; };
+penMSM = derive { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp]; };
 penalized = derive { name="penalized"; version="0.9-45"; sha256="0svmhsh0lv3d571jyhk73zd9slcd6xnp3p0l1ijab9gl2rjhlzz5"; depends=[survival]; };
 penalizedLDA = derive { name="penalizedLDA"; version="1.0"; sha256="1ib33l5nqmvi6qn9ykybkdpc0pp55k1b6x4vqpklzp3dgckg0lp6"; depends=[flsa]; };
-penalizedSVM = derive { name="penalizedSVM"; version="1.1"; sha256="0zc36cgcrdy4rwhg4hhhahymqfalvc5v2zmqq56ikz5blln82qvq"; depends=[e1071 MASS corpcor statmod tgp mlegp lhs]; };
-pencopula = derive { name="pencopula"; version="0.3.5"; sha256="1cy36pprbrfabk9n3x4d1xbj1vd2dda7xq3ihj2hzniwn77j63wi"; depends=[lattice fda quadprog latticeExtra]; };
-pendensity = derive { name="pendensity"; version="0.2.8"; sha256="18mnpsmfnqkbhg75lnqvs0iigx3mk9zr923wpygqviw5qxlwk5km"; depends=[lattice fda]; };
-pensim = derive { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[penalized MASS]; };
+penalizedSVM = derive { name="penalizedSVM"; version="1.1"; sha256="0zc36cgcrdy4rwhg4hhhahymqfalvc5v2zmqq56ikz5blln82qvq"; depends=[corpcor e1071 lhs MASS mlegp statmod tgp]; };
+pencopula = derive { name="pencopula"; version="0.3.5"; sha256="1cy36pprbrfabk9n3x4d1xbj1vd2dda7xq3ihj2hzniwn77j63wi"; depends=[fda lattice latticeExtra quadprog]; };
+pendensity = derive { name="pendensity"; version="0.2.8"; sha256="18mnpsmfnqkbhg75lnqvs0iigx3mk9zr923wpygqviw5qxlwk5km"; depends=[fda lattice]; };
+pensim = derive { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[MASS penalized]; };
 peperr = derive { name="peperr"; version="1.1-7"; sha256="01a6sxcmb8v2iz2xdwhdnr92k3w2vn3hr0hg9b6mkpzjf4n45q3k"; depends=[snowfall survival]; };
 peplib = derive { name="peplib"; version="1.5.1"; sha256="1bdgmwbk76ryl5gxcgf3slds92yilg9p1x1lx0hnzzwcgx99wif3"; depends=[]; };
-peptider = derive { name="peptider"; version="0.2"; sha256="1mrwa5pcmc0vbs7n39003bxia2hd6msjkl0j0b21d05accbvzph1"; depends=[discreteRV plyr dplyr]; };
-pequod = derive { name="pequod"; version="0.0-3"; sha256="14nag0bd2icg294y7n47c6xlw54rrdia887d2ni6achjqgwvffzh"; depends=[ggplot2 car]; };
+peptider = derive { name="peptider"; version="0.2"; sha256="1mrwa5pcmc0vbs7n39003bxia2hd6msjkl0j0b21d05accbvzph1"; depends=[discreteRV dplyr plyr]; };
+pequod = derive { name="pequod"; version="0.0-3"; sha256="14nag0bd2icg294y7n47c6xlw54rrdia887d2ni6achjqgwvffzh"; depends=[car ggplot2]; };
 perARMA = derive { name="perARMA"; version="1.5"; sha256="1d9vrxv8r6qgxhaz3pv8n34c526gi5cd8w7wxy9qc914y8kplmzr"; depends=[corpcor gnm matlab Matrix signal]; };
-performanceEstimation = derive { name="performanceEstimation"; version="1.0.0"; sha256="176crk5vf9fw52qwsbwcwyp0l9v0kg27jwz2krx295d8kq22ygrj"; depends=[ggplot2 foreach doParallel]; };
+performanceEstimation = derive { name="performanceEstimation"; version="1.0.1"; sha256="102f6h8cqmfb1ch9amf9qhm4p5r8i8236z8yfpg645vbkcc3i78n"; depends=[doParallel foreach ggplot2]; };
 perm = derive { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; };
-permGPU = derive { name="permGPU"; version="0.14.6"; sha256="1h01nfq8hn7i29xanma70q6s5mj83znbb2lg9x7bjgdrgj38vy2m"; depends=[RUnit foreach survival]; };
+permGPU = derive { name="permGPU"; version="0.14.6"; sha256="1h01nfq8hn7i29xanma70q6s5mj83znbb2lg9x7bjgdrgj38vy2m"; depends=[Biobase foreach RUnit survival]; };
 permtest = derive { name="permtest"; version="1.2"; sha256="1sciyjs840h004zg8bwclq0j0n22anvjvx3fz62y4dzblrynhrci"; depends=[]; };
 permute = derive { name="permute"; version="0.8-4"; sha256="1z5pmq9dy93rpsdb73waqrqmnvvi9ygx1v5l81a2n1j1kb4lmksv"; depends=[]; };
 perry = derive { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; };
 persiandictionary = derive { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; };
-perspectev = derive { name="perspectev"; version="1.0"; sha256="1qqhja7vqji9313dxxy1a9a50h5zxwxgc5s16lssczjachkqaibk"; depends=[ggplot2 foreach ape doParallel mapproj boot sp]; };
+perspectev = derive { name="perspectev"; version="1.0"; sha256="1qqhja7vqji9313dxxy1a9a50h5zxwxgc5s16lssczjachkqaibk"; depends=[ape boot doParallel foreach ggplot2 mapproj sp]; };
 perturb = derive { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr4fr9r07zyn97v8a1jqz3g9njza983la"; depends=[]; };
 pesticides = derive { name="pesticides"; version="0.1"; sha256="1w180hqqav0mh9sr9djj94sf55fzh4r373a7h08a2nz9nyjpq09w"; depends=[]; };
-pez = derive { name="pez"; version="1.0-0"; sha256="0d1npc2w6gzi4ki7gwqa0f4sklz0sml8q0cmgb77hpvgrny47mk3"; depends=[ape caper picante quantreg mvtnorm vegan ade4 apTreeshape FD plotrix Matrix]; };
+pez = derive { name="pez"; version="1.0-0"; sha256="0d1npc2w6gzi4ki7gwqa0f4sklz0sml8q0cmgb77hpvgrny47mk3"; depends=[ade4 ape apTreeshape caper FD Matrix mvtnorm picante plotrix quantreg vegan]; };
 pgam = derive { name="pgam"; version="0.4.12"; sha256="0vhac2mysd053bswy3xwpiz0q0qh260hziw6bygpf83vkj94qf2v"; depends=[]; };
 pgirmess = derive { name="pgirmess"; version="1.6.2"; sha256="02i2jp345hyzz0s3rfxn3rpx0yl1aw6r0r0zaw471j5l9m6s85kw"; depends=[boot maptools rgdal rgeos sp spdep splancs]; };
 pglm = derive { name="pglm"; version="0.1-2"; sha256="1arn2gf0bkg0s59a96hyhrm7adw66d33qs2al2s0ghln6fyk8674"; depends=[maxLik plm statmod]; };
 pgmm = derive { name="pgmm"; version="1.2"; sha256="0f0wdcirjyxzg2139c055i035qzmhm01yvf97nrhp69h4hpynb2n"; depends=[]; };
 pgs = derive { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; };
 phalen = derive { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; };
-phangorn = derive { name="phangorn"; version="1.99-13"; sha256="1d6awphvzkznqvp30bxdi6j6chlakfxrvmkk9a4by21fxa29xmp9"; depends=[ape quadprog igraph Matrix nnls]; };
+phangorn = derive { name="phangorn"; version="1.99-13"; sha256="1d6awphvzkznqvp30bxdi6j6chlakfxrvmkk9a4by21fxa29xmp9"; depends=[ape igraph Matrix nnls quadprog]; };
 phaseR = derive { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; };
 phcfM = derive { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; };
-pheatmap = derive { name="pheatmap"; version="1.0.2"; sha256="0nmq5w2jcljbd81v428xl4mvqzrm4vxxlwyhkimi4hj8a9rqw743"; depends=[RColorBrewer scales gtable]; };
+pheatmap = derive { name="pheatmap"; version="1.0.2"; sha256="0nmq5w2jcljbd81v428xl4mvqzrm4vxxlwyhkimi4hj8a9rqw743"; depends=[gtable RColorBrewer scales]; };
 phenability = derive { name="phenability"; version="2.0"; sha256="0can8qgdpfr4h6jfg23cnwh7hhmwv6538wg2jla9w138la7rhpd1"; depends=[calibrate]; };
 phenex = derive { name="phenex"; version="1.0-7"; sha256="0q563cv9lskikf3ls0idp56lirw9gxn71rgxp9xn8an05gwdg0xr"; depends=[]; };
-phenmod = derive { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat RColorBrewer lattice pheno]; };
-pheno = derive { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme SparseM quantreg]; };
-pheno2geno = derive { name="pheno2geno"; version="1.3.1"; sha256="1k1hw5qxrwxy502zkcfcz0nxjqmvdk1fgghjc512vq7x5znblz3v"; depends=[qtl VGAM mixtools]; };
-phenology = derive { name="phenology"; version="4.2"; sha256="141k2rfjmrx0cfzzcdf3q67chxq1jqp524rxcpdq3m7bnbkv67k3"; depends=[fields zoo coda HelpersMG shiny]; };
+phenmod = derive { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat lattice pheno RColorBrewer]; };
+pheno = derive { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme quantreg SparseM]; };
+pheno2geno = derive { name="pheno2geno"; version="1.3.1"; sha256="1k1hw5qxrwxy502zkcfcz0nxjqmvdk1fgghjc512vq7x5znblz3v"; depends=[mixtools qtl VGAM]; };
+phenology = derive { name="phenology"; version="4.2"; sha256="141k2rfjmrx0cfzzcdf3q67chxq1jqp524rxcpdq3m7bnbkv67k3"; depends=[coda fields HelpersMG shiny zoo]; };
 phia = derive { name="phia"; version="0.2-0"; sha256="1v2znss1snqrn3bpd0513jmw0x39p9vpwdc60klx725yrr2cfznw"; depends=[car Matrix]; };
-phmm = derive { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02vxdmb0xcc1jdbayjr5jrn9m1zk"; depends=[survival lattice Matrix]; };
-phom = derive { name="phom"; version="1.0.3"; sha256="0x05p6fn4kycilal65k7dy6h3w5i3ca9w93ryp4gqd4lp50l1749"; depends=[Rcpp Rcpp]; };
-phonR = derive { name="phonR"; version="1.0-3"; sha256="09wzsq92jkxy6cd89czshpj1hsp56v9jbgqr5a06rm6bv3spa31i"; depends=[splancs deldir plotrix]; };
+phmm = derive { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02vxdmb0xcc1jdbayjr5jrn9m1zk"; depends=[lattice Matrix survival]; };
+phom = derive { name="phom"; version="1.0.3"; sha256="0x05p6fn4kycilal65k7dy6h3w5i3ca9w93ryp4gqd4lp50l1749"; depends=[Rcpp]; };
+phonR = derive { name="phonR"; version="1.0-3"; sha256="09wzsq92jkxy6cd89czshpj1hsp56v9jbgqr5a06rm6bv3spa31i"; depends=[deldir plotrix splancs]; };
 phonTools = derive { name="phonTools"; version="0.2-2.0"; sha256="1wd1a5506p3ny6vi9pq6yg9gbz082fxw4l3cxsplkdpqgkhryrww"; depends=[]; };
 phreeqc = derive { name="phreeqc"; version="1.0-9102"; sha256="09vwqd4mf64l76vgg32vm9vkc8ra6cls9nvrp3ckkj9l2fwcnbzf"; depends=[]; };
 phtt = derive { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; };
 phyclust = derive { name="phyclust"; version="0.1-15"; sha256="1j643k0mjmswsvp9jyiawkjf2qhfrw6xf4s2viqv987zxif2kd7z"; depends=[ape]; };
 phylin = derive { name="phylin"; version="1.0"; sha256="10pbs4adsyp43i89jb3xi0m55sl1w7ifmc98v74iq9p8xa15sdci"; depends=[]; };
-phyloTop = derive { name="phyloTop"; version="1.1.1"; sha256="046myyr01c4zc6sfy7r6p2vswkqqqd3w4k173gjbjazl1ims1sjs"; depends=[phylobase NHPoisson ape igraph]; };
-phylobase = derive { name="phylobase"; version="0.6.8"; sha256="0xj7x4cdfp0yadvjhdkw1ai3yd081ri4gpdg0n5g0z13cjaa6mjh"; depends=[ade4 ape Rcpp Rcpp]; };
+phyloTop = derive { name="phyloTop"; version="1.1.1"; sha256="046myyr01c4zc6sfy7r6p2vswkqqqd3w4k173gjbjazl1ims1sjs"; depends=[ape igraph NHPoisson phylobase]; };
+phylobase = derive { name="phylobase"; version="0.6.8"; sha256="0xj7x4cdfp0yadvjhdkw1ai3yd081ri4gpdg0n5g0z13cjaa6mjh"; depends=[ade4 ape Rcpp]; };
 phyloclim = derive { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; };
-phylocurve = derive { name="phylocurve"; version="1.1.0"; sha256="03jvq9cdbch860910qjwg16y7h8jq9zn0iaak9daza65arch8fv0"; depends=[drc ape geiger phytools abind phylolm GPfit dtw]; };
+phylocurve = derive { name="phylocurve"; version="1.2.0"; sha256="13yv9q2p141gwvpr413v688iwx9ljf2x315gsc2rxx8q9bbj79dr"; depends=[abind ape drc dtw geiger GPfit phylolm phytools]; };
 phyloland = derive { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; };
 phylolm = derive { name="phylolm"; version="2.2"; sha256="1x1mi1mcq3ijbqhr0951scqzv4zza0r3fcs0hh4gpbr8z49b6d98"; depends=[ape]; };
-phylosim = derive { name="phylosim"; version="2.1.1"; sha256="0rrz5c7zl2hjalwm6m8pydikiwmiq2dybx2yhzp0ps2bcsn02lhn"; depends=[R_oo ape compoisson ggplot2 R_methodsS3]; };
-phylotools = derive { name="phylotools"; version="0.1.2"; sha256="19w7xzk6sk1g9br7vwv338nvszzh0lk5rdzf0khiywka31bbsjyb"; depends=[seqRFLP ape picante spaa fields]; };
+phylosim = derive { name="phylosim"; version="2.1.1"; sha256="0rrz5c7zl2hjalwm6m8pydikiwmiq2dybx2yhzp0ps2bcsn02lhn"; depends=[ape compoisson ggplot2 R_methodsS3 R_oo]; };
+phylotools = derive { name="phylotools"; version="0.1.2"; sha256="19w7xzk6sk1g9br7vwv338nvszzh0lk5rdzf0khiywka31bbsjyb"; depends=[ape fields picante seqRFLP spaa]; };
 phyreg = derive { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; };
 physiology = derive { name="physiology"; version="0.2.2"; sha256="0z394smbnmlrnp9ms5vjczc3avrcn5nxm8np5y58k86x470w6npz"; depends=[]; };
-phytools = derive { name="phytools"; version="0.4-56"; sha256="18cib7yjlbzdpfs5piwx5cw0h7fk26s04wsb2vdfiybr306a9jk2"; depends=[ape maps animation clusterGeneration mnormt msm numDeriv phangorn plotrix scatterplot3d]; };
-phytotools = derive { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[insol FME]; };
-pi0 = derive { name="pi0"; version="1.3-250"; sha256="1561zvf1hcd05iqy245c0z23mi8ypk6q3lkfldcr55cs67w4lmz6"; depends=[LowRankQP Matrix numDeriv limSolve rgl scatterplot3d Iso quadprog kernlab]; };
-picante = derive { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape vegan nlme]; };
-picasso = derive { name="picasso"; version="0.3.0"; sha256="0z314akr1x2a28hh5hbb7mzkyaxsj4dfkdmx10l6gqllgk9j5qca"; depends=[lattice igraph MASS Matrix]; };
+phytools = derive { name="phytools"; version="0.4-56"; sha256="18cib7yjlbzdpfs5piwx5cw0h7fk26s04wsb2vdfiybr306a9jk2"; depends=[animation ape clusterGeneration maps mnormt msm numDeriv phangorn plotrix scatterplot3d]; };
+phytotools = derive { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; };
+pi0 = derive { name="pi0"; version="1.3-250"; sha256="1561zvf1hcd05iqy245c0z23mi8ypk6q3lkfldcr55cs67w4lmz6"; depends=[Iso kernlab limSolve LowRankQP Matrix numDeriv quadprog qvalue rgl scatterplot3d]; };
+picante = derive { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape nlme vegan]; };
+picasso = derive { name="picasso"; version="0.3.0"; sha256="0z314akr1x2a28hh5hbb7mzkyaxsj4dfkdmx10l6gqllgk9j5qca"; depends=[igraph lattice MASS Matrix]; };
 pingr = derive { name="pingr"; version="1.1.0"; sha256="0j03qcsyckv3zh2v4m8wz8kyfl0k8qi71rm20rc0spy1s9ng7fcb"; depends=[]; };
 pipe_design = derive { name="pipe.design"; version="0.2"; sha256="1hmc4g3bnpwicjr53xz8yhhshnfhd2fqx9c6v4af8wvnqpy7mlpq"; depends=[ggplot2 gtools]; };
 pipeR = derive { name="pipeR"; version="0.6"; sha256="15hq6i1cv072jpw71slij534s85xljkjk2ygxpkgq3cyngbq3jxb"; depends=[]; };
-pitchRx = derive { name="pitchRx"; version="1.7"; sha256="0mx948bahw0zr0915hz9lcws7iq2l0ikgx4gjnnfhhpiii86xs57"; depends=[ggplot2 XML2R plyr MASS hexbin mgcv]; };
+pitchRx = derive { name="pitchRx"; version="1.7"; sha256="0mx948bahw0zr0915hz9lcws7iq2l0ikgx4gjnnfhhpiii86xs57"; depends=[ggplot2 hexbin MASS mgcv plyr XML2R]; };
 pixmap = derive { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; };
-pkgKitten = derive { name="pkgKitten"; version="0.1.2"; sha256="0nk51c3cx9hy8dwdi7llf9k6kq8495dvy8bxjlajwiwd39jipvgs"; depends=[]; };
-pkgmaker = derive { name="pkgmaker"; version="0.22"; sha256="0vrqnd3kg6liqvpbd969jjsdx0f0rvmmxgdbwwrp6xfmdg0pib8r"; depends=[registry codetools digest stringr xtable]; };
-pks = derive { name="pks"; version="0.3-0"; sha256="0lvj5kfjf8wikszz1dipwr1fw9xbhy3nx0ksqz4ln240k7fn5kcj"; depends=[sets]; };
+pkgKitten = derive { name="pkgKitten"; version="0.1.3"; sha256="1f7jkriib1f19mc5mdrymg5xzdcyclfvh1220agy4lpyprxgza0f"; depends=[]; };
+pkgmaker = derive { name="pkgmaker"; version="0.22"; sha256="0vrqnd3kg6liqvpbd969jjsdx0f0rvmmxgdbwwrp6xfmdg0pib8r"; depends=[codetools digest registry stringr xtable]; };
+pks = derive { name="pks"; version="0.3-1"; sha256="1nr36k960yv71yfxkzchjk814sf921hdiiakxvv5f9dxpf00hxp4"; depends=[sets]; };
 plRasch = derive { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; };
 plan = derive { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; };
-planar = derive { name="planar"; version="1.5.2"; sha256="1w843qk88x3kzi4q79d5ifzgp975dj4ih93g2g6fa6wh529j4w3h"; depends=[dielectric Rcpp statmod cubature reshape2 plyr Rcpp RcppArmadillo]; };
+planar = derive { name="planar"; version="1.5.2"; sha256="1w843qk88x3kzi4q79d5ifzgp975dj4ih93g2g6fa6wh529j4w3h"; depends=[cubature dielectric plyr Rcpp RcppArmadillo reshape2 statmod]; };
 planor = derive { name="planor"; version="0.2-3"; sha256="1j550zqm3h4kz7jz4fkgp0z92skwpyxz0lnr7pfif4pya1mxd6f9"; depends=[conf_design]; };
 plantecophys = derive { name="plantecophys"; version="0.6"; sha256="1gxc84njpii82p6n04djbp4n9wni49lxfvmljqz48r643hv48a7h"; depends=[]; };
 plaqr = derive { name="plaqr"; version="1.0"; sha256="1vv15zqnmir5hi9ivyifzrc1rkn1sn5qj61by66iczmlmhqh17h8"; depends=[quantreg]; };
-playwith = derive { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[lattice cairoDevice gWidgetsRGtk2 RGtk2 gWidgets gridBase]; };
-plfm = derive { name="plfm"; version="1.1.2"; sha256="1dl2pv2v7kp39hlbk5kb33kzhg9dzxjxhafdjv9dqpqb9b77akm8"; depends=[sfsmisc abind]; };
+playwith = derive { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[cairoDevice gridBase gWidgets gWidgetsRGtk2 lattice RGtk2]; };
+plfm = derive { name="plfm"; version="1.1.2"; sha256="1dl2pv2v7kp39hlbk5kb33kzhg9dzxjxhafdjv9dqpqb9b77akm8"; depends=[abind sfsmisc]; };
 plgp = derive { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; };
-plm = derive { name="plm"; version="1.4-0"; sha256="13y9s7gyrgqmnzafhn4c1zkz6gdawc8nr5nbrx0pn2mbw3fqfrjh"; depends=[Formula MASS bdsmatrix zoo nlme sandwich]; };
-plmDE = derive { name="plmDE"; version="1.0"; sha256="19xxi0zzpxcrsdrbs0hiwqgnv2aaw1q3mi586wv27zz6lfqcr9lr"; depends=[MASS R_oo]; };
-plmm = derive { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[sm Formula nlme]; };
+plm = derive { name="plm"; version="1.4-0"; sha256="13y9s7gyrgqmnzafhn4c1zkz6gdawc8nr5nbrx0pn2mbw3fqfrjh"; depends=[bdsmatrix Formula MASS nlme sandwich zoo]; };
+plmDE = derive { name="plmDE"; version="1.0"; sha256="19xxi0zzpxcrsdrbs0hiwqgnv2aaw1q3mi586wv27zz6lfqcr9lr"; depends=[limma MASS R_oo]; };
+plmm = derive { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; };
 pln = derive { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; };
 plot2groups = derive { name="plot2groups"; version="0.10"; sha256="00mp82vvx6inlc2zj2cqqnzyglrm9x9im2vrqqk8j2jn0hbgfymy"; depends=[ggplot2]; };
 plot3D = derive { name="plot3D"; version="1.0-2"; sha256="0qsrd1na4xw2bm1rzwj3asgkh7xqpyja0dxdmz41f3x58ip9wnz1"; depends=[misc3d]; };
-plot3Drgl = derive { name="plot3Drgl"; version="1.0"; sha256="109vsivif4hmw2hk3hi4y703d3snzxbr9pzhn1846imdclkl12yg"; depends=[rgl plot3D]; };
-plotGoogleMaps = derive { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[sp spacetime rgdal maptools lattice raster]; };
-plotKML = derive { name="plotKML"; version="0.5-2"; sha256="006f6j3k2yb20zcmx2lq9d4yy5awpsaxkcp17r6q42bdrffkc0m9"; depends=[XML sp raster rgdal spacetime colorspace plotrix dismo aqp pixmap plyr stringr colorRamps scales gstat zoo RColorBrewer RSAGA classInt]; };
+plot3Drgl = derive { name="plot3Drgl"; version="1.0"; sha256="109vsivif4hmw2hk3hi4y703d3snzxbr9pzhn1846imdclkl12yg"; depends=[plot3D rgl]; };
+plotGoogleMaps = derive { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[lattice maptools raster rgdal sp spacetime]; };
+plotKML = derive { name="plotKML"; version="0.5-2"; sha256="006f6j3k2yb20zcmx2lq9d4yy5awpsaxkcp17r6q42bdrffkc0m9"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; };
 plotMCMC = derive { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; };
 plotROC = derive { name="plotROC"; version="1.3.3"; sha256="090fpj3b5vp0r2zrn38yxiy205mk9kx1fpwp0g8rl4bsa88v4c9y"; depends=[ggplot2 gridSVG shiny]; };
-plotSEMM = derive { name="plotSEMM"; version="2.0"; sha256="0n30m1nz9fnilbgxg5jcmx2bsscdvz5mkjkyrgx7yr3alazkaimd"; depends=[plyr shiny MplusAutomation Rcpp plotrix Rcpp]; };
-plotmo = derive { name="plotmo"; version="3.1.1"; sha256="08vl41an94l3f7hkd2lzpqgzxsp4wyh24lnay3lpmc3ra2ycpbmg"; depends=[plotrix TeachingDemos]; };
+plotSEMM = derive { name="plotSEMM"; version="2.0"; sha256="0n30m1nz9fnilbgxg5jcmx2bsscdvz5mkjkyrgx7yr3alazkaimd"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; };
+plotmo = derive { name="plotmo"; version="3.1.2"; sha256="13f821w1y7xr535yqykcr3mmrndrg47xk6cfqkyd1z2maw50n2hs"; depends=[plotrix TeachingDemos]; };
 plotpc = derive { name="plotpc"; version="1.0.3"; sha256="0dw9k702a67c2k77dl4k2747lhsr84x41qrgj5mp9jnyfq6naciq"; depends=[]; };
 plotrix = derive { name="plotrix"; version="3.5-12"; sha256="13gffp7zp46wal83609652x48i63zb5i20x6ycmgc97l4nanhrfi"; depends=[]; };
 pls = derive { name="pls"; version="2.4-3"; sha256="114ka4766x8fx0zvvr7cylky1jsy542nj6s7sb2dwv8zjhbclkhn"; depends=[]; };
-plsRbeta = derive { name="plsRbeta"; version="0.2.0"; sha256="1b8yldz5nzw3gilv9wk79bxcqb0hrgsxi2cn6qlby5nf9b4zmzv8"; depends=[mvtnorm boot Formula plsdof MASS betareg plsRglm]; };
-plsRcox = derive { name="plsRcox"; version="1.7.2"; sha256="1c3ll13m27ndwlc9r79ilzl0i6cyp870x66swlbg6387whf7wn2r"; depends=[survival plsRglm lars pls kernlab mixOmics risksetROC survAUC rms]; };
-plsRglm = derive { name="plsRglm"; version="1.1.1"; sha256="1bx1pl1pv47z3yj3ngkd97j10v2h8jqiybcqbm3kvqhgqydm07rp"; depends=[mvtnorm boot bipartite car]; };
+plsRbeta = derive { name="plsRbeta"; version="0.2.0"; sha256="1b8yldz5nzw3gilv9wk79bxcqb0hrgsxi2cn6qlby5nf9b4zmzv8"; depends=[betareg boot Formula MASS mvtnorm plsdof plsRglm]; };
+plsRcox = derive { name="plsRcox"; version="1.7.2"; sha256="1c3ll13m27ndwlc9r79ilzl0i6cyp870x66swlbg6387whf7wn2r"; depends=[kernlab lars mixOmics pls plsRglm risksetROC rms survAUC survcomp survival]; };
+plsRglm = derive { name="plsRglm"; version="1.1.1"; sha256="1bx1pl1pv47z3yj3ngkd97j10v2h8jqiybcqbm3kvqhgqydm07rp"; depends=[bipartite boot car mvtnorm]; };
 plsdepot = derive { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; };
 plsdof = derive { name="plsdof"; version="0.2-7"; sha256="1z8z9m0nsnyy1fipzvm1srpxn3q6wjrlivmmki1f8plwkixkyc5y"; depends=[MASS]; };
-plsgenomics = derive { name="plsgenomics"; version="1.3-1"; sha256="0vddhzqfix8q692mdls227m2l6zjzbjwp1ia5j9shy71ycg2fzn9"; depends=[MASS boot]; };
-plspm = derive { name="plspm"; version="0.4.7"; sha256="0iy4qw4zjgqxg93a827qjcm32yipmnrl4gzn4hmskjd4khm9ngwd"; depends=[tester turner diagram shape amap]; };
+plsgenomics = derive { name="plsgenomics"; version="1.3-1"; sha256="0vddhzqfix8q692mdls227m2l6zjzbjwp1ia5j9shy71ycg2fzn9"; depends=[boot MASS]; };
+plspm = derive { name="plspm"; version="0.4.7"; sha256="0iy4qw4zjgqxg93a827qjcm32yipmnrl4gzn4hmskjd4khm9ngwd"; depends=[amap diagram shape tester turner]; };
 plugdensity = derive { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; };
 plumbr = derive { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; };
 plus = derive { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; };
-plusser = derive { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[RCurl RJSONIO lubridate plyr]; };
-plyr = derive { name="plyr"; version="1.8.2"; sha256="1dizvj3xvp1cg8sm21xpk0kgfpil1n1q60zkanz6yh9cnnp6g306"; depends=[Rcpp Rcpp]; };
+plusser = derive { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[lubridate plyr RCurl RJSONIO]; };
+plyr = derive { name="plyr"; version="1.8.3"; sha256="06v4zxawpjz37rp2q2ii5q43g664z9s29j4ydn0cz3crn7lzl6pk"; depends=[Rcpp]; };
 pmcgd = derive { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; };
-pmclust = derive { name="pmclust"; version="0.1-6"; sha256="05zjx4psvk5zjmr0iwwwig990g6h04ajn5wi0xi8bqv046r47q3h"; depends=[rlecuyer pbdMPI MASS]; };
-pmg = derive { name="pmg"; version="0.9-43"; sha256="0i7d50m4w7p8ipyx2d3qmc54aiqvw0ls8igkk8s1xc7k8ympfqi6"; depends=[gWidgets gWidgetsRGtk2 proto lattice foreign MASS]; };
+pmclust = derive { name="pmclust"; version="0.1-6"; sha256="05zjx4psvk5zjmr0iwwwig990g6h04ajn5wi0xi8bqv046r47q3h"; depends=[MASS pbdMPI rlecuyer]; };
+pmg = derive { name="pmg"; version="0.9-43"; sha256="0i7d50m4w7p8ipyx2d3qmc54aiqvw0ls8igkk8s1xc7k8ympfqi6"; depends=[foreign gWidgets gWidgetsRGtk2 lattice MASS proto]; };
 pmlr = derive { name="pmlr"; version="1.0"; sha256="1z3hbw4wabpai1q8kbn77nzxqziag8y04cidlfiw7z969s4pkmgl"; depends=[]; };
-pmml = derive { name="pmml"; version="1.4.2"; sha256="0588sph67zs58knf4g3fd7c84i2yag81igr882jgbaxhfhxrpk6n"; depends=[XML survival]; };
+pmml = derive { name="pmml"; version="1.4.2"; sha256="0588sph67zs58knf4g3fd7c84i2yag81igr882jgbaxhfhxrpk6n"; depends=[survival XML]; };
 pmmlTransformations = derive { name="pmmlTransformations"; version="1.2.2"; sha256="1p31lakhqwk0qhb565j2sjcfsjsx0i5v8kj8779ryjyvy7717m6m"; depends=[]; };
 pmr = derive { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; };
 png = derive { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; };
 pnmtrem = derive { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; };
 pnn = derive { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; };
-poLCA = derive { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[scatterplot3d MASS]; };
+poLCA = derive { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[MASS scatterplot3d]; };
 pocrm = derive { name="pocrm"; version="0.9"; sha256="0p7a7xm1iyyjgzyi7ik2n34gqc3lsnallrijzdakghb8k5cybm4m"; depends=[dfcrm nnet]; };
 pogit = derive { name="pogit"; version="1.0.0"; sha256="0lgvf4d7b2ycz9wryjrd7qymbx1jmj4mw8jl95ax2jylz4li48zf"; depends=[BayesLogit ggplot2 logistf plyr]; };
 poibin = derive { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; };
 poilog = derive { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; };
 pointRes = derive { name="pointRes"; version="1.0.2"; sha256="1q9vjvmxs1f5g8f2aj674wk8piqzjqxzdrvxnawgw1pfi66adnms"; depends=[ggplot2 gridExtra plyr TripleR]; };
 pointdensityP = derive { name="pointdensityP"; version="0.2.1"; sha256="013vamdh987w56bmz0m6j2xas4ycv1zwxs860rs5z4i55dhgf9kh"; depends=[]; };
-poisDoubleSamp = derive { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp Rcpp]; };
+poisDoubleSamp = derive { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; };
 poisson_glm_mix = derive { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; };
 poistweedie = derive { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; };
 polidata = derive { name="polidata"; version="0.1.0"; sha256="07641v0dnn161kyxx7viplkf8c3r51hd4hd5pzmcph4y4387r01i"; depends=[jsonlite RCurl]; };
-pollstR = derive { name="pollstR"; version="1.2.0"; sha256="1a1qjblxylzpwb1qpy2yyk39022isp8aajds5glspxndapmd4akb"; depends=[httr plyr jsonlite]; };
+pollstR = derive { name="pollstR"; version="1.2.0"; sha256="1a1qjblxylzpwb1qpy2yyk39022isp8aajds5glspxndapmd4akb"; depends=[httr jsonlite plyr]; };
 polspline = derive { name="polspline"; version="1.1.9"; sha256="1n08dhwpf53slk1zib491kii54x9h16g3jgr2kxxpyc5xfv4yj26"; depends=[]; };
 polyCub = derive { name="polyCub"; version="0.5-2"; sha256="1j28ia53za3sh9q7q1g5bnmlb5mbzf44bcwzv0919lvkw01f2lvj"; depends=[sp spatstat]; };
 polySegratio = derive { name="polySegratio"; version="0.2-4"; sha256="05kvj475zhlrmp7rm691cfs28igp4ac2cn2xxf7axx09v1nq33db"; depends=[gdata]; };
-polySegratioMM = derive { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[polySegratio gtools coda lattice]; };
+polySegratioMM = derive { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[coda gtools lattice polySegratio]; };
 polyaAeppli = derive { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; };
 polyapost = derive { name="polyapost"; version="1.1-6"; sha256="1wk85nl2p9plnaavjdr4bqxxhjc84ynv53bh2v1rmq87jymw40b1"; depends=[boot]; };
 polyclip = derive { name="polyclip"; version="1.3-2"; sha256="0gsckb5nwfq1w48g67pszk3ndzvj63r8rp7vhh77idizaczkv0r1"; depends=[]; };
 polycor = derive { name="polycor"; version="0.7-8"; sha256="0hvww5grl68dff23069smfk3isysyi5n2jm4qmaynrk0m3yvhxwn"; depends=[mvtnorm sfsmisc]; };
 polynom = derive { name="polynom"; version="1.3-8"; sha256="05lng88c8cwj65cav31hsrca9nbrqn5rmcz79b17issyk2j0g86p"; depends=[]; };
-polysat = derive { name="polysat"; version="1.3-3"; sha256="02h1lf1bk7hhphfdcql0rmiszp3b3mdfhqfwxj369389dg0q57bd"; depends=[]; };
-polytomous = derive { name="polytomous"; version="0.1.6"; sha256="137qcnncih1lm2wshwrznlcr0k552n0sqhiy73iwis59lg854caa"; depends=[MASS Hmisc lme4]; };
-polywog = derive { name="polywog"; version="0.4-0"; sha256="0wl9br0g4kgi3nz2fq28nsk6fw0ll0y715v4vz8lv3pvfwc7518j"; depends=[miscTools foreach Formula glmnet iterators Matrix ncvreg Rcpp stringr Rcpp]; };
+polysat = derive { name="polysat"; version="1.4-0"; sha256="1m0k6lb9fp05zk39fj6c2d6sj659l8g6lj4wngp9y8vwd9cld88k"; depends=[]; };
+polytomous = derive { name="polytomous"; version="0.1.6"; sha256="137qcnncih1lm2wshwrznlcr0k552n0sqhiy73iwis59lg854caa"; depends=[Hmisc lme4 MASS]; };
+polywog = derive { name="polywog"; version="0.4-0"; sha256="0wl9br0g4kgi3nz2fq28nsk6fw0ll0y715v4vz8lv3pvfwc7518j"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; };
 pom = derive { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; };
-pomp = derive { name="pomp"; version="0.65-1"; sha256="1fxfbqa6lb4x0d4h29in8crhac32aw71chyjyvnhadfqynxhhv4k"; depends=[mvtnorm deSolve coda subplex nloptr]; };
+pomp = derive { name="pomp"; version="0.65-1"; sha256="1fxfbqa6lb4x0d4h29in8crhac32aw71chyjyvnhadfqynxhhv4k"; depends=[coda deSolve mvtnorm nloptr subplex]; };
 pooh = derive { name="pooh"; version="0.3"; sha256="1wcv77vjjp62c5l1mplnkk4vhy2scjrq96cjx58w5jdj46lban2h"; depends=[]; };
 popKorn = derive { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; };
 popRange = derive { name="popRange"; version="1.1.3"; sha256="0kkz6va0p8zv3skaqqcpw42014d9x9x4ilx0czz91qf46h61jgb0"; depends=[findpython]; };
@@ -5280,10 +5299,10 @@ popReconstruct = derive { name="popReconstruct"; version="1.0-4"; sha256="14lp0h
 popbio = derive { name="popbio"; version="2.4"; sha256="12hvxkgbr6snypplxv404sj0ass6ab9i969bb00ipy10gny1w4ww"; depends=[quadprog]; };
 popdemo = derive { name="popdemo"; version="0.1-4"; sha256="0syhmm8fnxbsdzj75y7dpahmpf453a6gwp3yljkvmfl0bfv1g1ng"; depends=[expm]; };
 popgen = derive { name="popgen"; version="1.0-3"; sha256="00rgfwmmiharfxqlpy21n3jbxwr5whzdg8psqylkjf83ls2myqzm"; depends=[cluster]; };
-popgraph = derive { name="popgraph"; version="1.4"; sha256="1z6w6vj3vl2w10hvzwmkw4d475bqcd6ys92xnn445ag6vpq0cvxq"; depends=[ggplot2 igraph MASS sp Matrix sampling]; };
-poplite = derive { name="poplite"; version="0.99.16"; sha256="0yp1hfda2k6c5x0gbcfxj9h6igzx3ra05xs7g88wjz76yxp3wb6w"; depends=[dplyr DBI igraph lazyeval RSQLite]; };
-poppr = derive { name="poppr"; version="1.1.5"; sha256="0whk06gwm171b5j2vcfqi7rdwczv109g7bw2gfnzhz4fm46nhmfk"; depends=[adegenet vegan ggplot2 phangorn ape igraph ade4 pegas reshape2]; };
-popsom = derive { name="popsom"; version="2.3"; sha256="0hdg1nx8mlpqw9aj2q08sb20frsc5jnbvqpfalf5kyvlygnhxdlc"; depends=[som fields]; };
+popgraph = derive { name="popgraph"; version="1.4"; sha256="1z6w6vj3vl2w10hvzwmkw4d475bqcd6ys92xnn445ag6vpq0cvxq"; depends=[ggplot2 igraph MASS Matrix sampling sp]; };
+poplite = derive { name="poplite"; version="0.99.16"; sha256="0yp1hfda2k6c5x0gbcfxj9h6igzx3ra05xs7g88wjz76yxp3wb6w"; depends=[DBI dplyr igraph lazyeval RSQLite]; };
+poppr = derive { name="poppr"; version="1.1.5"; sha256="0whk06gwm171b5j2vcfqi7rdwczv109g7bw2gfnzhz4fm46nhmfk"; depends=[ade4 adegenet ape ggplot2 igraph pegas phangorn reshape2 vegan]; };
+popsom = derive { name="popsom"; version="2.3"; sha256="0hdg1nx8mlpqw9aj2q08sb20frsc5jnbvqpfalf5kyvlygnhxdlc"; depends=[fields som]; };
 portes = derive { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5inkv2cwgzd0zi6ky0vvrc3abchqsjm2ck"; depends=[]; };
 portfolio = derive { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; };
 portfolioSim = derive { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; };
@@ -5296,12 +5315,12 @@ powerMediation = derive { name="powerMediation"; version="0.2.4"; sha256="1b4hza
 powerSurvEpi = derive { name="powerSurvEpi"; version="0.0.6"; sha256="1jsbrj35m296mkk47zcpb2haain6bf23k0xzphnb4sq8f06cmq1p"; depends=[survival]; };
 powerpkg = derive { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; };
 ppcor = derive { name="ppcor"; version="1.0"; sha256="18l5adjysack86ws61xh89z5xfr83v932a0pn6ad8i8py3nd85fj"; depends=[]; };
-ppiPre = derive { name="ppiPre"; version="1.7"; sha256="12my8xqb3zbiji6z6ip079gh8rkfi700pbbj1acrnrcflxz2wqzx"; depends=[igraph e1071]; };
+ppiPre = derive { name="ppiPre"; version="1.7"; sha256="12my8xqb3zbiji6z6ip079gh8rkfi700pbbj1acrnrcflxz2wqzx"; depends=[AnnotationDbi e1071 GOSemSim igraph]; };
 ppls = derive { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; };
 ppmlasso = derive { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; };
 pps = derive { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; };
-pqantimalarials = derive { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[reshape2 RColorBrewer plyr shiny]; };
-prLogistic = derive { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot lme4 Hmisc]; };
+pqantimalarials = derive { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[plyr RColorBrewer reshape2 shiny]; };
+prLogistic = derive { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot Hmisc lme4]; };
 prabclus = derive { name="prabclus"; version="2.2-6"; sha256="0qjsxrx6yv338bxm4ki0w9h8hind1l98abdrz828588bwj02jya1"; depends=[MASS mclust]; };
 pracma = derive { name="pracma"; version="1.8.3"; sha256="06711w5451gb22667i5dx27ysi4pfagkxdfzg270lxwbymcii6pp"; depends=[]; };
 pragma = derive { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; };
@@ -5310,114 +5329,114 @@ praktikum = derive { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh4
 prc = derive { name="prc"; version="2014.11-4"; sha256="0r4c0s80fdzc9ifbfy8aaqi7164blqgiv3vbzp9x70c4dfl3lwxx"; depends=[kyotil nlme]; };
 precintcon = derive { name="precintcon"; version="2.1"; sha256="0cadia7d2pzhnfw00m4k6qgnajv61hj879pafqnnfs6synbp3px6"; depends=[ggplot2 scales]; };
 predfinitepop = derive { name="predfinitepop"; version="1.0"; sha256="1x5ri1kvd1rd9bjp2ygqwl68yp6hyb6aly22bs5kdwv2vn9nlq9w"; depends=[]; };
-predictmeans = derive { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[lme4 nlme ggplot2 lattice pbkrtest plyr]; };
+predictmeans = derive { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[ggplot2 lattice lme4 nlme pbkrtest plyr]; };
 predmixcor = derive { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; };
-prefmod = derive { name="prefmod"; version="0.8-32"; sha256="0v5r195gzbfi6jbqz8r1x2fzj3anqxf4hxaxb9krm9rkwgphrwpi"; depends=[gnm colorspace]; };
+prefmod = derive { name="prefmod"; version="0.8-32"; sha256="0v5r195gzbfi6jbqz8r1x2fzj3anqxf4hxaxb9krm9rkwgphrwpi"; depends=[colorspace gnm]; };
 presens = derive { name="presens"; version="1.0.0"; sha256="0hwciahpfp7h7dchn6k64cwjwxzm6cx28b66kv6flz4yzwvqd3pb"; depends=[birk marelac]; };
 preseqR = derive { name="preseqR"; version="1.2.1"; sha256="1izfykccybnr2pnw043g680wg78hbds6hcfqirqhy1sfn6sf8lz1"; depends=[]; };
 prettyGraphs = derive { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; };
 prettyR = derive { name="prettyR"; version="2.1-1"; sha256="173n0cp0mq00y1ydba9m7l3izz04czg9vvadbflfinpi86wvcgq6"; depends=[]; };
-prettyunits = derive { name="prettyunits"; version="1.0.0"; sha256="0lh83pf30hnqcq6ppq8axlyawp0qxpym0lqq8pchh3gq8mgcdz1h"; depends=[magrittr assertthat]; };
-prevR = derive { name="prevR"; version="3.1"; sha256="1x8ssz1k8vdq3zx1qhfhyq371i8s3bam2rd6bm3biha5i8icglh6"; depends=[sp rgdal ggplot2 directlabels GenKern fields gstat foreign maptools]; };
-prevalence = derive { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[rjags coda]; };
-prim = derive { name="prim"; version="1.0.15"; sha256="008a8fm4as5b6j70xxwiipywhbg1wmdbgjz9r7qfnivcpfarxv7f"; depends=[rgl misc3d]; };
+prettyunits = derive { name="prettyunits"; version="1.0.0"; sha256="0lh83pf30hnqcq6ppq8axlyawp0qxpym0lqq8pchh3gq8mgcdz1h"; depends=[assertthat magrittr]; };
+prevR = derive { name="prevR"; version="3.1"; sha256="1x8ssz1k8vdq3zx1qhfhyq371i8s3bam2rd6bm3biha5i8icglh6"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; };
+prevalence = derive { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; };
+prim = derive { name="prim"; version="1.0.15"; sha256="008a8fm4as5b6j70xxwiipywhbg1wmdbgjz9r7qfnivcpfarxv7f"; depends=[misc3d rgl]; };
 primer = derive { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; };
-primerTree = derive { name="primerTree"; version="1.0.1"; sha256="068j5a2rh8f1h1y7rv2xacnvkn2darzvp1adhi3hqkmwsb3znhjk"; depends=[directlabels gridExtra ggplot2 XML ape httr lubridate plyr scales stringr foreach]; };
+primerTree = derive { name="primerTree"; version="1.0.1"; sha256="068j5a2rh8f1h1y7rv2xacnvkn2darzvp1adhi3hqkmwsb3znhjk"; depends=[ape directlabels foreach ggplot2 gridExtra httr lubridate plyr scales stringr XML]; };
 princurve = derive { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6ann978ilwhh58qi443q25z01qzxml4b5jzsd7w"; depends=[]; };
 prinsimp = derive { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; };
 prob = derive { name="prob"; version="0.9-5"; sha256="05skjqimzhnk99z864466dc8qx58pavrky320il91yqyr8b98j8b"; depends=[combinat fAsianOptions hypergeo VGAM]; };
 probFDA = derive { name="probFDA"; version="1.0.1"; sha256="093k50kyady54rkrz0n9x9z98z5ws36phlj42j25yip7pzhfd6sv"; depends=[MASS]; };
 probemod = derive { name="probemod"; version="0.2.1"; sha256="1cgjr03amssc9rng8ky4w3abhhijj0d2byzm118dfdjzrgmnrf9g"; depends=[]; };
 probsvm = derive { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; };
-prodlim = derive { name="prodlim"; version="1.5.1"; sha256="0qjyx4i66cahiqjqff63ljwxdig4lvfs2asxnhkgylwn2kb3lygv"; depends=[survival KernSmooth lava]; };
+prodlim = derive { name="prodlim"; version="1.5.1"; sha256="0qjyx4i66cahiqjqff63ljwxdig4lvfs2asxnhkgylwn2kb3lygv"; depends=[KernSmooth lava survival]; };
 profdpm = derive { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; };
 profileModel = derive { name="profileModel"; version="0.5-9"; sha256="1p9b9jr5842im195d60ja82pp7vbk85vs8b0r3fnf62j4b92aky9"; depends=[]; };
-profileR = derive { name="profileR"; version="0.2-1"; sha256="1hcydy7hqjac9mvbaim2g75ab1ziyvpbrkb4k21966m54zjk9kka"; depends=[ggplot2 MASS RColorBrewer reshape plyr]; };
-profr = derive { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[stringr plyr]; };
+profileR = derive { name="profileR"; version="0.2-1"; sha256="1hcydy7hqjac9mvbaim2g75ab1ziyvpbrkb4k21966m54zjk9kka"; depends=[ggplot2 MASS plyr RColorBrewer reshape]; };
+profr = derive { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[plyr stringr]; };
 proftools = derive { name="proftools"; version="0.1-0"; sha256="1wzkrz7zr2pjw5id2sp6jdqm5pgrrh35zfwjrkr6mac22lniq4bv"; depends=[]; };
 prognosticROC = derive { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; };
 progress = derive { name="progress"; version="1.0.2"; sha256="1dpcfvdg1rf0fd4whcn7k09x70s7jhz8p7nqkm9p13b4nhil76sj"; depends=[prettyunits R6]; };
 proj4 = derive { name="proj4"; version="1.0-8"; sha256="06r3lavgixrsa52d1v31laqcbw6fb9xn23akv39hvaib78diglv9"; depends=[]; };
-propOverlap = derive { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[]; };
-propagate = derive { name="propagate"; version="1.0-4"; sha256="18vyh4i4zlsmggfyd4w0zrznk75m84k08p1qa9crind04n5581j1"; depends=[MASS tmvtnorm Rcpp ff minpack_lm Rcpp]; };
-prospectr = derive { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[RcppArmadillo foreach iterators Rcpp Rcpp RcppArmadillo]; };
+propOverlap = derive { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[Biobase]; };
+propagate = derive { name="propagate"; version="1.0-4"; sha256="18vyh4i4zlsmggfyd4w0zrznk75m84k08p1qa9crind04n5581j1"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; };
+prospectr = derive { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[foreach iterators Rcpp RcppArmadillo]; };
 protViz = derive { name="protViz"; version="0.2.9"; sha256="0kn2dd3za8mmb6476v3wqnymhihyavw2qsh98i4q3xdiz1g77vql"; depends=[Rcpp]; };
 proteomicdesign = derive { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; };
-proteomics = derive { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbzl624scvjbwhgcsca1wdvvfkhsv7jfwdd2ry2"; depends=[plyr reshape2 ggplot2 foreach]; };
-protiq = derive { name="protiq"; version="1.2"; sha256="1d5wr9w540a79i57nr0arn5xg7s6jhhy5nrgsk8r3ljidld2s2sa"; depends=[mvtnorm]; };
+proteomics = derive { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbzl624scvjbwhgcsca1wdvvfkhsv7jfwdd2ry2"; depends=[foreach ggplot2 plyr reshape2]; };
+protiq = derive { name="protiq"; version="1.2"; sha256="1d5wr9w540a79i57nr0arn5xg7s6jhhy5nrgsk8r3ljidld2s2sa"; depends=[graph mvtnorm RBGL]; };
 proto = derive { name="proto"; version="0.3-10"; sha256="03mvzi529y6kjcp9bkpk7zlgpcakb3iz73hca6rpjy14pyzl3nfh"; depends=[]; };
 protoclass = derive { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; };
 protoclust = derive { name="protoclust"; version="1.5"; sha256="03qhqfqdz45s8c1p8c6sqs10i6c2ilx4fz8wkpwas3j78lgylskg"; depends=[]; };
 protr = derive { name="protr"; version="0.5-1"; sha256="1ji0vpy9rrrvbsfwi4823ywi5zbwl57zw1glxllxgwyv9l6v4bpb"; depends=[]; };
-provenance = derive { name="provenance"; version="0.2"; sha256="07wgfb5hmdd4nddl42wpqsx9vzayvngrgmcsssilbm5qbrvgv4sr"; depends=[MASS smacof vegan shapes]; };
+provenance = derive { name="provenance"; version="0.2"; sha256="07wgfb5hmdd4nddl42wpqsx9vzayvngrgmcsssilbm5qbrvgv4sr"; depends=[MASS shapes smacof vegan]; };
 proxy = derive { name="proxy"; version="0.4-14"; sha256="1ijip1jmpm7dg11yv2rjcpkpg4p30m9acddbn49fbss9kcpl5b5i"; depends=[]; };
-pryr = derive { name="pryr"; version="0.1.1"; sha256="00j81iwf2mka1a953nrgar0r4wcfi4n5nl8pidnhw51lyh2285d8"; depends=[stringr codetools Rcpp Rcpp]; };
+pryr = derive { name="pryr"; version="0.1.1"; sha256="00j81iwf2mka1a953nrgar0r4wcfi4n5nl8pidnhw51lyh2285d8"; depends=[codetools Rcpp stringr]; };
 psData = derive { name="psData"; version="0.1.2"; sha256="0w8kzivqrh1b6gq803rfd10drxdwgy0cxb5sff273m6jxzak52f2"; depends=[countrycode DataCombine foreign xlsx]; };
-psbcGroup = derive { name="psbcGroup"; version="1.1"; sha256="17kpxddvy9m87i9r1hazc8g6mm35p1452ngz80byhgw9p0jkvn5p"; depends=[LearnBayes SuppDists mvtnorm]; };
-pscl = derive { name="pscl"; version="1.4.9"; sha256="15fij6n43hry1plgzrak9vmk9xbb7n4v2frv997bhwxbs6jhhfhf"; depends=[MASS lattice]; };
-psd = derive { name="psd"; version="1.0-1"; sha256="1ssda4g98m0bk6gkrb7c6ylfsd2a84fq4yhp472n4k8wd73mkdn6"; depends=[Rcpp RColorBrewer signal zoo Rcpp RcppArmadillo]; };
-pse = derive { name="pse"; version="0.4.0"; sha256="1ln6b5ch99fmmcsfn8m8fl4ir7cadwq5ckggwizw9cbllw3drv0b"; depends=[Hmisc boot]; };
-pseudo = derive { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[KMsurv geepack]; };
-psgp = derive { name="psgp"; version="0.3-6"; sha256="0h9gyadfy0djj32pgwhg8vy2gfn7i7yj5nnsm6pvfypc3k71s2wf"; depends=[intamap automap gstat Rcpp RcppArmadillo]; };
-psidR = derive { name="psidR"; version="1.3"; sha256="1jdxbjvc309b1bs81v57kc1g7lgfdz84bfakh9qwh8wgjqbjr06i"; depends=[data_table RCurl foreign SAScii]; };
+psbcGroup = derive { name="psbcGroup"; version="1.1"; sha256="17kpxddvy9m87i9r1hazc8g6mm35p1452ngz80byhgw9p0jkvn5p"; depends=[LearnBayes mvtnorm SuppDists]; };
+pscl = derive { name="pscl"; version="1.4.9"; sha256="15fij6n43hry1plgzrak9vmk9xbb7n4v2frv997bhwxbs6jhhfhf"; depends=[lattice MASS]; };
+psd = derive { name="psd"; version="1.0-1"; sha256="1ssda4g98m0bk6gkrb7c6ylfsd2a84fq4yhp472n4k8wd73mkdn6"; depends=[RColorBrewer Rcpp RcppArmadillo signal zoo]; };
+pse = derive { name="pse"; version="0.4.0"; sha256="1ln6b5ch99fmmcsfn8m8fl4ir7cadwq5ckggwizw9cbllw3drv0b"; depends=[boot Hmisc]; };
+pseudo = derive { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[geepack KMsurv]; };
+psgp = derive { name="psgp"; version="0.3-6"; sha256="0h9gyadfy0djj32pgwhg8vy2gfn7i7yj5nnsm6pvfypc3k71s2wf"; depends=[automap gstat intamap Rcpp RcppArmadillo]; };
+psidR = derive { name="psidR"; version="1.3"; sha256="1jdxbjvc309b1bs81v57kc1g7lgfdz84bfakh9qwh8wgjqbjr06i"; depends=[data_table foreign RCurl SAScii]; };
 pso = derive { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; };
 pspearman = derive { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; };
 pspline = derive { name="pspline"; version="1.0-16"; sha256="170apwfv2lbf2rggzzynrf9vi2mr0y15sm4zy8djxxpzv217iaf7"; depends=[]; };
-pssm = derive { name="pssm"; version="1.0"; sha256="1af5zvznh04vz5psbmq3xxclm2zh4gl4gxi1ps6aqmiqjpm57dwq"; depends=[MASS abind numDeriv MHadaptive]; };
+pssm = derive { name="pssm"; version="1.0"; sha256="1af5zvznh04vz5psbmq3xxclm2zh4gl4gxi1ps6aqmiqjpm57dwq"; depends=[abind MASS MHadaptive numDeriv]; };
 psy = derive { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; };
 psych = derive { name="psych"; version="1.5.4"; sha256="04n0rfr7i5yhr5ph0fdp9yrmc8m2i4zbf7bh5pvx7s7lfs08z84a"; depends=[mnormt]; };
-psychometric = derive { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme multilevel nlme]; };
-psychomix = derive { name="psychomix"; version="1.1-2"; sha256="0kah36ps9d0dr594vfk9fy2ag2grknjjgvmkf9vzm0ny52cisc72"; depends=[flexmix psychotools lattice Formula modeltools]; };
+psychometric = derive { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; };
+psychomix = derive { name="psychomix"; version="1.1-2"; sha256="0kah36ps9d0dr594vfk9fy2ag2grknjjgvmkf9vzm0ny52cisc72"; depends=[flexmix Formula lattice modeltools psychotools]; };
 psychotools = derive { name="psychotools"; version="0.4-0"; sha256="17qwlxj00i0aqwf39hwr6mmxa6jy0j6dxfrp9p1xskbgi5cnvslk"; depends=[]; };
-psychotree = derive { name="psychotree"; version="0.15-0"; sha256="08mq4gssrhydn106zm6xxwb1kk43hdzw6jqclx1ya0g8xfri2rrd"; depends=[partykit psychotools Formula]; };
+psychotree = derive { name="psychotree"; version="0.15-0"; sha256="08mq4gssrhydn106zm6xxwb1kk43hdzw6jqclx1ya0g8xfri2rrd"; depends=[Formula partykit psychotools]; };
 psyphy = derive { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; };
-psytabs = derive { name="psytabs"; version="0.5"; sha256="0jcsv771ndf0fv76982rbv099ii4l55a8bj1mhgr54838ins0gg7"; depends=[psych plyr rtf R2HTML mokken lavaan semTools]; };
+psytabs = derive { name="psytabs"; version="0.5"; sha256="0jcsv771ndf0fv76982rbv099ii4l55a8bj1mhgr54838ins0gg7"; depends=[lavaan mokken plyr psych R2HTML rtf semTools]; };
 pt = derive { name="pt"; version="1.0"; sha256="0hjijfmc9dip3ys8xg44w0fwvyzyjyjl9hpwm7j2nzg3plv6i1fz"; depends=[]; };
 ptinpoly = derive { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; };
 ptw = derive { name="ptw"; version="1.0-7"; sha256="195pa6hj3y9spyc7yxfgr8alkp48a7ccnyp64r6fyjwj6ds08b64"; depends=[]; };
-pubmed_mineR = derive { name="pubmed.mineR"; version="1.0.3.1"; sha256="1q1y3sshv5c56qgbbrrlnb1nhg052n8g2vrx32vhg304rqircxkm"; depends=[RCurl XML boot R2HTML]; };
+pubmed_mineR = derive { name="pubmed.mineR"; version="1.0.3.1"; sha256="1q1y3sshv5c56qgbbrrlnb1nhg052n8g2vrx32vhg304rqircxkm"; depends=[boot R2HTML RCurl XML]; };
 pullword = derive { name="pullword"; version="0.1"; sha256="1mxv63q2nfnhxcn8m17d40w792l1i7diykg6h0i42pj0rsa4ww36"; depends=[RCurl]; };
-pumilioR = derive { name="pumilioR"; version="1.3"; sha256="1zmcdp978p73bh9fdshxlrzgfg18j007xgxgr439rq90bwiwva6j"; depends=[XML RCurl]; };
+pumilioR = derive { name="pumilioR"; version="1.3"; sha256="1zmcdp978p73bh9fdshxlrzgfg18j007xgxgr439rq90bwiwva6j"; depends=[RCurl XML]; };
 pushoverr = derive { name="pushoverr"; version="0.1.4"; sha256="1qa7cajgri3dwlvbpwn244m92n3q3apl4m5420mzsa9ngnmm8hj1"; depends=[httr]; };
-pvar = derive { name="pvar"; version="2.2"; sha256="1f58czx14shd02ijyxhn46yrvfh44wrpifja8cjv522gbkrcr7yf"; depends=[Rcpp Rcpp]; };
+pvar = derive { name="pvar"; version="2.2"; sha256="1f58czx14shd02ijyxhn46yrvfh44wrpifja8cjv522gbkrcr7yf"; depends=[Rcpp]; };
 pvclass = derive { name="pvclass"; version="1.2"; sha256="099lk0x24h7g77lpr22mzpl22q2b0nr466ljgm6jcdyjbkzgx237"; depends=[Matrix]; };
 pvclust = derive { name="pvclust"; version="1.3-2"; sha256="0w9cxr0bc591icbyn8239f76ypb2nwv9fa5b1ix05wh55d1h0rgc"; depends=[]; };
 pvrank = derive { name="pvrank"; version="1.0"; sha256="0kvy0b1x7q23pjw2ckyqzyh3ihqnbrd067v85l9rvf0pxyycqyhx"; depends=[Rmpfr]; };
-pvsR = derive { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[XML nnet httr]; };
+pvsR = derive { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[httr nnet XML]; };
 pwr = derive { name="pwr"; version="1.1-2"; sha256="1czganj70qszz32yx2jprhr8h9a2lpg67gwfwfjf8kpk97qvkalj"; depends=[]; };
 pwt = derive { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; };
 pwt8 = derive { name="pwt8"; version="8.0-0"; sha256="12cgyban6waj0cxz9gb35s5v0v29rmx67ipzalzdnrjp5nsmy431"; depends=[]; };
-pxR = derive { name="pxR"; version="0.40.0"; sha256="08s62kzdgak7mjzyhd32qn93q5l7sj01vhsk7fjg9nxjvm78xxka"; depends=[stringr reshape2 RJSONIO plyr]; };
-pxweb = derive { name="pxweb"; version="0.5.54"; sha256="17vg480b54mcv9jbkci1rrn6zi90zzw098xzrcw3kvp583as9mar"; depends=[data_table plyr stringr RJSONIO httr]; };
-pycno = derive { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[sp maptools rgeos]; };
+pxR = derive { name="pxR"; version="0.40.0"; sha256="08s62kzdgak7mjzyhd32qn93q5l7sj01vhsk7fjg9nxjvm78xxka"; depends=[plyr reshape2 RJSONIO stringr]; };
+pxweb = derive { name="pxweb"; version="0.5.54"; sha256="17vg480b54mcv9jbkci1rrn6zi90zzw098xzrcw3kvp583as9mar"; depends=[data_table httr plyr RJSONIO stringr]; };
+pycno = derive { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; };
 pyramid = derive { name="pyramid"; version="1.4"; sha256="0hh0hmckicl0r2r9zlf693j65jr9jgmiz643j2asp57nbs99lgxz"; depends=[]; };
 qLearn = derive { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; };
 qPCR_CT = derive { name="qPCR.CT"; version="1.1"; sha256="19j41fsd2m7p2nxi2h2mj43rjxx6sz2jpf4sk0bfvl1gyj0iz3hi"; depends=[RColorBrewer]; };
-qVarSel = derive { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp Rcpp]; };
-qat = derive { name="qat"; version="0.73"; sha256="1fff4sv1n3i0gfgj83sy4pygxalifdycm27hsw51r72n86049cdc"; depends=[ncdf XML gdata moments boot fields gplots]; };
+qVarSel = derive { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp]; };
+qat = derive { name="qat"; version="0.73"; sha256="1fff4sv1n3i0gfgj83sy4pygxalifdycm27hsw51r72n86049cdc"; depends=[boot fields gdata gplots moments ncdf XML]; };
 qcc = derive { name="qcc"; version="2.6"; sha256="0bsdgpsqvkz2w1qanxwx8kvrpkpzs9jgw8ml2lyqhmhqbxyg125r"; depends=[MASS]; };
 qclust = derive { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm0zy0gyn3brc1mf9jv8gmkl941cp3"; depends=[mclust mvtnorm]; };
 qcr = derive { name="qcr"; version="0.1-18"; sha256="16dfda3rwivsdhp7j5izzbk2rzwfabfmxgpq4kjc4h7r90n2vly2"; depends=[qcc]; };
-qdap = derive { name="qdap"; version="2.2.1"; sha256="0gix6l0h6q0c2pl38d3qp3pzs1m3j96rcb9n6q9k1nh0002vfnsg"; depends=[qdapDictionaries qdapRegex qdapTools RColorBrewer chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; };
+qdap = derive { name="qdap"; version="2.2.1"; sha256="0gix6l0h6q0c2pl38d3qp3pzs1m3j96rcb9n6q9k1nh0002vfnsg"; 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 = derive { name="qdapDictionaries"; version="1.0.6"; sha256="1icivvsi33494ycd7vfqm9zx2g2rc1m3dygs3bi0ndi798z1cvx2"; depends=[]; };
 qdapRegex = derive { name="qdapRegex"; version="0.3.2"; sha256="1hygkck4wilm2f2cg5q82a867608j3dqp7wqj3kbnh5a970lw41y"; depends=[stringi]; };
 qdapTools = derive { name="qdapTools"; version="1.1.0"; sha256="0k3mvcjj2fg2v3z8jm2z02zmrpgjpwbpcaanmp2vlykqzacsrl52"; depends=[chron data_table RCurl XML]; };
 qdm = derive { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; };
-qgraph = derive { name="qgraph"; version="1.3.1"; sha256="1wmpsgmzl9qg4vjjjlbxqav3ck7p26gidsqv3qryx56jx54164wg"; depends=[psych ellipse lavaan sem plyr Hmisc igraph jpeg png colorspace Matrix sna corpcor reshape2 ggplot2 glasso huge fdrtool d3Network ggm gtools]; };
-qgtools = derive { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[Matrix MASS]; };
+qgraph = derive { name="qgraph"; version="1.3.1"; sha256="1wmpsgmzl9qg4vjjjlbxqav3ck7p26gidsqv3qryx56jx54164wg"; depends=[colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix plyr png psych reshape2 sem sna]; };
+qgtools = derive { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[MASS Matrix]; };
 qicharts = derive { name="qicharts"; version="0.1.3"; sha256="1f9flcz4w5s6rahk2bkddwjwba72q8himgaqdgza8phaksdzm58v"; depends=[lattice latticeExtra]; };
 qiimer = derive { name="qiimer"; version="0.9.2"; sha256="08625hz2n7yk9zk1k9sa46n2ggbw5qs0mlqkmzyjjh3qlnb1354a"; depends=[pheatmap]; };
 qlcMatrix = derive { name="qlcMatrix"; version="0.9.4"; sha256="1nkk712h9nnaqshw766mvk72w6gq9abyry4q1a0ghn0naq3gyl0s"; depends=[Matrix slam]; };
 qlspack = derive { name="qlspack"; version="2.2"; sha256="0b9sqvnvldhd8vymajrbql0vn70rml13jgsq5ihm6skzq5qms7y6"; depends=[geepack]; };
 qmap = derive { name="qmap"; version="1.0-3"; sha256="1c7qvmd5whi446nzssqvhz1j2mpx22nlzzdrcql84v18ry0dr18m"; depends=[fitdistrplus]; };
-qmethod = derive { name="qmethod"; version="1.3.1"; sha256="01yj8fr6d615lydb7111lb9qhkg1c6xy8gp2225as53mzbsc890i"; depends=[psych GPArotation digest knitr xtable]; };
+qmethod = derive { name="qmethod"; version="1.3.1"; sha256="01yj8fr6d615lydb7111lb9qhkg1c6xy8gp2225as53mzbsc890i"; depends=[digest GPArotation knitr psych xtable]; };
 qmrparser = derive { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; };
-qpcR = derive { name="qpcR"; version="1.4-0"; sha256="029qhncfiicb3picay5yd42g6qi0x981r6mgd67vdx71cac9fp59"; depends=[MASS minpack_lm rgl robustbase Matrix]; };
+qpcR = derive { name="qpcR"; version="1.4-0"; sha256="029qhncfiicb3picay5yd42g6qi0x981r6mgd67vdx71cac9fp59"; depends=[MASS Matrix minpack_lm rgl robustbase]; };
 qqman = derive { name="qqman"; version="0.1.2"; sha256="024ln79hig5ggcyc3466r6y6zx2hwy2698x65cha5zpm51kq1abs"; depends=[]; };
 qqtest = derive { name="qqtest"; version="1.0"; sha256="12hw4d2gddb4fgdi986pyqgvlpxgk5lngfp989hq2a830kyxz1ds"; depends=[MASS]; };
-qrLMM = derive { name="qrLMM"; version="1.1"; sha256="1yg9ph6jy0sn4d82vn4v7yy3mqczbnzsq8qqp9dw38vh2456rmf2"; depends=[nlme matrixcalc mvtnorm ghyp quantreg psych]; };
-qrNLMM = derive { name="qrNLMM"; version="1.0"; sha256="0vlinc3bggapff29dyz14vn122gy6aq3rp38v2bpnxfkbpj10lvy"; depends=[matrixcalc mvtnorm ghyp quantreg psych ald]; };
-qrfactor = derive { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[mvoutlier mgraph pvclust cluster maptools]; };
+qrLMM = derive { name="qrLMM"; version="1.1"; sha256="1yg9ph6jy0sn4d82vn4v7yy3mqczbnzsq8qqp9dw38vh2456rmf2"; depends=[ghyp matrixcalc mvtnorm nlme psych quantreg]; };
+qrNLMM = derive { name="qrNLMM"; version="1.0"; sha256="0vlinc3bggapff29dyz14vn122gy6aq3rp38v2bpnxfkbpj10lvy"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; };
+qrfactor = derive { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[cluster maptools mgraph mvoutlier pvclust]; };
 qrmtools = derive { name="qrmtools"; version="0.0-1"; sha256="0xjgb8clyhlrl4qdbhi85m97cbhab5q5sy2zr87gamz2y365alpr"; depends=[xts]; };
 qrng = derive { name="qrng"; version="0.0-2"; sha256="0rs4dggvrlc3bi0wgkjw8lhv4b3jpckcfkqzsaz0j46kf6vfgfw1"; depends=[]; };
 qrnn = derive { name="qrnn"; version="1.1.2"; sha256="01wsz9qcdiayi7gsyy2y09jyyapanyhlc4pdyman2f7z5nl9yv9i"; depends=[]; };
@@ -5426,147 +5445,147 @@ qte = derive { name="qte"; version="1.0.1"; sha256="15y6n0c9jinfz7hmm107palgy8fl
 qtl = derive { name="qtl"; version="1.36-6"; sha256="1qn8fv0s2934pbds2962isr8y96s2k0jlh6y27rz21qlpryrbijb"; depends=[]; };
 qtlDesign = derive { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; };
 qtlbook = derive { name="qtlbook"; version="0.18-1"; sha256="09b4w7kqdlmpf0vsjgwbi9sraafzchvk18yzrx72gs151v03nxlm"; depends=[qtl]; };
-qtlhot = derive { name="qtlhot"; version="0.9.0"; sha256="1043rksqqzgmr7q03j18wxgm706prqxq9ki9b9p2dxvc62vfcfih"; depends=[qtl lattice corpcor mnormt]; };
+qtlhot = derive { name="qtlhot"; version="0.9.0"; sha256="1043rksqqzgmr7q03j18wxgm706prqxq9ki9b9p2dxvc62vfcfih"; depends=[corpcor lattice mnormt qtl]; };
 qtlmt = derive { name="qtlmt"; version="0.1-3"; sha256="01ql0fr2mxl8a8nd6lpig5j8vznv594ygn6bj6d31gj15r5rs8fs"; depends=[]; };
-qtlnet = derive { name="qtlnet"; version="1.3.6"; sha256="044a2p3mpp203kb85s2fr3qiyypm461lrzxkfi0hnzq44qqba169"; depends=[qtl igraph sem pcalg]; };
-qtpaint = derive { name="qtpaint"; version="0.9.0"; sha256="06yqakg134mks8q7a40f5knjpcm1k2wdzchs0ywvfpwvpwgwig01"; depends=[qtbase qtbase qtbase]; };
-qtutils = derive { name="qtutils"; version="0.1-3"; sha256="018k9v3mab1mfcjh4mv1a1iish50fwdhb51mqn17k6fyrrrv7vs5"; depends=[qtbase qtbase qtbase]; };
+qtlnet = derive { name="qtlnet"; version="1.3.6"; sha256="044a2p3mpp203kb85s2fr3qiyypm461lrzxkfi0hnzq44qqba169"; depends=[graph igraph pcalg qtl sem]; };
+qtpaint = derive { name="qtpaint"; version="0.9.0"; sha256="06yqakg134mks8q7a40f5knjpcm1k2wdzchs0ywvfpwvpwgwig01"; depends=[qtbase]; };
+qtutils = derive { name="qtutils"; version="0.1-3"; sha256="018k9v3mab1mfcjh4mv1a1iish50fwdhb51mqn17k6fyrrrv7vs5"; depends=[qtbase]; };
 quad = derive { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabzsv7a9i2njw8hnfcs3ndffhv5"; depends=[PearsonDS]; };
 quadprog = derive { name="quadprog"; version="1.5-5"; sha256="0jg3r6abmhp8r9vkbhpx9ldjfw6vyl1m4c5vwlyjhk1mi03656fr"; depends=[]; };
-quadrupen = derive { name="quadrupen"; version="0.2-4"; sha256="0gs565zi5qkccr9f65smvzgq2d97p7i5inksp2492bjvqhsbagxj"; depends=[Rcpp ggplot2 Matrix reshape2 scales Rcpp RcppArmadillo]; };
+quadrupen = derive { name="quadrupen"; version="0.2-4"; sha256="0gs565zi5qkccr9f65smvzgq2d97p7i5inksp2492bjvqhsbagxj"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; };
 qualCI = derive { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; };
 qualV = derive { name="qualV"; version="0.3-1"; sha256="0p4yfgq2wxwis2w28mdb61x6hzm6sb9bczjdm9bc05ga5srr3sdd"; depends=[KernSmooth]; };
 qualityTools = derive { name="qualityTools"; version="1.54"; sha256="0ylp5a49b4q4max4yz30ia7r12s4jrvqn9zx5a21qcnpinf8b932"; depends=[]; };
 quantchem = derive { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; };
-quanteda = derive { name="quanteda"; version="0.7.2-1"; sha256="1j6hjcr3sd1xymzznvz1r2z6rs3m6vp3ji5y6dqq5qr18g1bi4cm"; depends=[Matrix data_table SnowballC wordcloud proxy Rcpp ca Rcpp RcppArmadillo]; };
+quanteda = derive { name="quanteda"; version="0.7.2-1"; sha256="1j6hjcr3sd1xymzznvz1r2z6rs3m6vp3ji5y6dqq5qr18g1bi4cm"; depends=[ca data_table Matrix proxy Rcpp RcppArmadillo SnowballC wordcloud]; };
 quantification = derive { name="quantification"; version="0.1.0"; sha256="0987389rr21fl3khgd3a1yq5821hljwm0xlyxgjy1km5hj81diap"; depends=[car]; };
-quantmod = derive { name="quantmod"; version="0.4-4"; sha256="0a8gr2qb2b2w58zyxbyz3dbprmyiwf5cd62xqv4d3rk29l7vk4n8"; depends=[xts zoo TTR]; };
+quantmod = derive { name="quantmod"; version="0.4-4"; sha256="0a8gr2qb2b2w58zyxbyz3dbprmyiwf5cd62xqv4d3rk29l7vk4n8"; depends=[TTR xts zoo]; };
 quantreg = derive { name="quantreg"; version="5.11"; sha256="0pyc1zknkjyvaix76bn84l90zavajsc7jx17x0zanllnh34siizp"; depends=[SparseM]; };
 quantregForest = derive { name="quantregForest"; version="1.0"; sha256="11mnb32vz6m2g7nggip2y251rkwn6wr7jwdh0hqvl0pgalmipb84"; depends=[randomForest]; };
 quantregGrowth = derive { name="quantregGrowth"; version="0.3-0"; sha256="0iyqd4gf780xqj2gcinlx0h6r6wy4vc7sp8r4qa1s638qcrp3qwa"; depends=[quantreg]; };
-quantspec = derive { name="quantspec"; version="1.0-3"; sha256="1g4arhhybw021dnz0imdfwwj328gc8yw75cgnnd00skdc402cfhk"; depends=[quantreg abind zoo snowfall Rcpp Rcpp]; };
-questionr = derive { name="questionr"; version="0.4.3"; sha256="13mmmjxg9vkn53dp9hng330bkilzdf2zqisgs21ng08b6p9dv7n4"; depends=[shiny highr classInt htmltools]; };
+quantspec = derive { name="quantspec"; version="1.0-3"; sha256="1g4arhhybw021dnz0imdfwwj328gc8yw75cgnnd00skdc402cfhk"; depends=[abind quantreg Rcpp snowfall zoo]; };
+questionr = derive { name="questionr"; version="0.4.3"; sha256="13mmmjxg9vkn53dp9hng330bkilzdf2zqisgs21ng08b6p9dv7n4"; depends=[classInt highr htmltools shiny]; };
 queueing = derive { name="queueing"; version="0.2.5"; sha256="11a44aqq0s50vdbn7rhijajqw1rrcj1qnyjjd8dn1cc5nvq141k7"; depends=[]; };
-quickpsy = derive { name="quickpsy"; version="0.1.0"; sha256="1p1rhv69bh842r77dxn73l0k2lwa5vj2xc27m470pjygap2zaqv0"; depends=[boot DEoptim dplyr ggplot2 tidyr MPDiR]; };
-quint = derive { name="quint"; version="1.0"; sha256="19dxrssy4dw7v3s4hhhy6yilbc7zb6pvcnh3mm1z6vv5a1wfr245"; depends=[partykit Formula rpart]; };
-quipu = derive { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae stringr pixmap shiny xtable]; };
+quickpsy = derive { name="quickpsy"; version="0.1.0"; sha256="1p1rhv69bh842r77dxn73l0k2lwa5vj2xc27m470pjygap2zaqv0"; depends=[boot DEoptim dplyr ggplot2 MPDiR tidyr]; };
+quint = derive { name="quint"; version="1.0"; sha256="19dxrssy4dw7v3s4hhhy6yilbc7zb6pvcnh3mm1z6vv5a1wfr245"; depends=[Formula partykit rpart]; };
+quipu = derive { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae pixmap shiny stringr xtable]; };
 qvcalc = derive { name="qvcalc"; version="0.8-9"; sha256="1ysbsm65n05vypvvpsbdfbrb60gij50vsmybzi4405g5z2ds1j72"; depends=[]; };
 qwraps2 = derive { name="qwraps2"; version="0.1.1"; sha256="1kikw92i9l06rxwlnp2sa17wkd8xshryx1rbk4qjzf4yfgmgbkbd"; depends=[dplyr ggplot2]; };
 r2d2 = derive { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; };
-r2dRue = derive { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[rgdal sp matrixStats]; };
+r2dRue = derive { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[matrixStats rgdal sp]; };
 r2lh = derive { name="r2lh"; version="0.7"; sha256="1kkyjv9x2klrjnaaw4a16sxdfqmpp9s5mlclzlczlqjypbf2aa6d"; depends=[]; };
 r2stl = derive { name="r2stl"; version="1.0.0"; sha256="18lvnxr40cm450s8qh09c3cnkl1hg83jhmv1gzsv6nkjrq4mj5wh"; depends=[]; };
 r4ss = derive { name="r4ss"; version="1.22.1"; sha256="1rjnglwa3i8rlzyqqr5h8yh7vglrh8zpd3829qcc1vfi4swcwwqw"; depends=[coda corpcor gplots gtools maps pso RCurl]; };
-rARPACK = derive { name="rARPACK"; version="0.7-0"; sha256="1r1ypa56wkxvll9yqr50f3x2krimi22lwyrkksf5zf6laksmiq1w"; depends=[Matrix Rcpp Rcpp RcppEigen]; };
-rAltmetric = derive { name="rAltmetric"; version="0.6"; sha256="0ym8p9rq64ig3vlaimk38rmc2h1315bphx7v1rd6g4gypgx4ym15"; depends=[plyr RCurl reshape2 png ggplot2 RJSONIO]; };
+rARPACK = derive { name="rARPACK"; version="0.7-0"; sha256="1r1ypa56wkxvll9yqr50f3x2krimi22lwyrkksf5zf6laksmiq1w"; depends=[Matrix Rcpp RcppEigen]; };
+rAltmetric = derive { name="rAltmetric"; version="0.6"; sha256="0ym8p9rq64ig3vlaimk38rmc2h1315bphx7v1rd6g4gypgx4ym15"; depends=[ggplot2 plyr png RCurl reshape2 RJSONIO]; };
 rAverage = derive { name="rAverage"; version="0.4-13"; sha256="0yfy81p99a3cb31cagxdvby7l2hcc60g3mnfizd9nvgamdmw08sy"; depends=[]; };
-rAvis = derive { name="rAvis"; version="0.1.2"; sha256="0m5dl8as0vmmsd3j0z0xwcpq55yfax42fa67qn4lsnaglyqmd4lm"; depends=[stringr XML RCurl scrapeR gdata scales rgdal maptools raster sp]; };
+rAvis = derive { name="rAvis"; version="0.1.2"; sha256="0m5dl8as0vmmsd3j0z0xwcpq55yfax42fa67qn4lsnaglyqmd4lm"; depends=[gdata maptools raster RCurl rgdal scales scrapeR sp stringr XML]; };
 rBeta2009 = derive { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; };
 rCMA = derive { name="rCMA"; version="1.1"; sha256="0dswshg80hbgcib5x9w791sh71q5s4435q8sm9dh170v4ngbax0w"; depends=[]; };
-rCUR = derive { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[MASS Matrix lattice]; };
-rCarto = derive { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[RColorBrewer maptools classInt]; };
+rCUR = derive { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[lattice MASS Matrix]; };
+rCarto = derive { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[classInt maptools RColorBrewer]; };
 rChoiceDialogs = derive { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; };
-rClinicalCodes = derive { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[stringr RCurl XML rjson tm]; };
-rDEA = derive { name="rDEA"; version="1.1-1"; sha256="17j7cz08nd5sgr1z75jlrdjl9ffkdhmzmqcyrf1qcy36v9i2fqzk"; depends=[slam truncreg truncnorm maxLik]; };
+rClinicalCodes = derive { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[RCurl rjson stringr tm XML]; };
+rDEA = derive { name="rDEA"; version="1.1-1"; sha256="17j7cz08nd5sgr1z75jlrdjl9ffkdhmzmqcyrf1qcy36v9i2fqzk"; depends=[maxLik slam truncnorm truncreg]; };
 rDNA = derive { name="rDNA"; version="1.30.1"; sha256="12h83zirv55sryc1zww97ws8kvsym1z7p7y5d4w43nam8mi3fpcd"; depends=[rJava]; };
 rDVR = derive { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; };
-rEMM = derive { name="rEMM"; version="1.0-9"; sha256="0b3g30s8nw107y5yg113xdw1s2h96mq0j5cldj01z3j676idjgw5"; depends=[proxy igraph clusterGeneration MASS]; };
+rEMM = derive { name="rEMM"; version="1.0-9"; sha256="0b3g30s8nw107y5yg113xdw1s2h96mq0j5cldj01z3j676idjgw5"; depends=[clusterGeneration igraph MASS proxy]; };
 rFDSN = derive { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; };
 rFerns = derive { name="rFerns"; version="1.1.0"; sha256="00ddb9zwf4hqkx9qmrndz182mg69mb5fyg0v0v4b32sy4sixnps5"; depends=[]; };
 rGammaGamma = derive { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; };
 rHealthDataGov = derive { name="rHealthDataGov"; version="1.0.1"; sha256="0lkjprss15yl6n9wgh79r4clip3jndly2ab1lv4iijzxnxay099d"; depends=[bit64 httr jsonlite]; };
 rHpcc = derive { name="rHpcc"; version="1.0"; sha256="0096z90mmf1j2xpb9034a5ph52m8z6n6xjh3km2vrhw63g3cpwap"; depends=[RCurl XML]; };
-rJPSGCS = derive { name="rJPSGCS"; version="0.2-7"; sha256="1j8lc56q20b0qkl20r8mqa6q822rpfphj00dlmj50rgwk02pfc69"; depends=[rJava]; };
+rJPSGCS = derive { name="rJPSGCS"; version="0.2-7"; sha256="1j8lc56q20b0qkl20r8mqa6q822rpfphj00dlmj50rgwk02pfc69"; depends=[chopsticks rJava]; };
 rJava = derive { name="rJava"; version="0.9-6"; sha256="008g6s6rcb5lnz5y2a2rs4iq85a4nl522g714s1w1r153qcc0jz0"; depends=[]; };
 rJavax = derive { name="rJavax"; version="0.3"; sha256="0sv2fjinp4wmdfvcpgm4hv8v3fkiiv84ywqyr4hz86j50ncd79km"; depends=[rJava]; };
 rJython = derive { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; };
 rLTP = derive { name="rLTP"; version="0.1"; sha256="0dv8jj8rgcx4cbbs10sqdblcznxgm9ld5md922ghnka4ymar244m"; depends=[RCurl]; };
 rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.7.6"; sha256="03gdr4swy3dq6vkq4q44sdn7slgjzcqzd2pmhac4bghgzgk3zgj8"; depends=[plyr]; };
-rLiDAR = derive { name="rLiDAR"; version="0.1"; sha256="1zm3c3xpxk1ll0cq589k1kf69wgn93qmaqkvpgcjib0ay35q7c7f"; depends=[spatstat sp deldir plyr raster geometry rgl bitops]; };
+rLiDAR = derive { name="rLiDAR"; version="0.1"; sha256="1zm3c3xpxk1ll0cq589k1kf69wgn93qmaqkvpgcjib0ay35q7c7f"; depends=[bitops deldir geometry plyr raster rgl sp spatstat]; };
 rLindo = derive { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; };
-rNMF = derive { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[nnls knitr]; };
-rNOMADS = derive { name="rNOMADS"; version="2.1.4"; sha256="0a0knxqqbn52i4ixpv16h1hnajhwx788cmdiq78ysds7yfkjrwzy"; depends=[rvest scrapeR stringr fields GEOmap MBA RCurl XML]; };
-rPlant = derive { name="rPlant"; version="2.7"; sha256="0gqxb49d6qzkd533s9qp75byvz66v1csdlnmh3m2zg96aw32178r"; depends=[rjson RCurl seqinr knitcitations]; };
-rPref = derive { name="rPref"; version="0.5"; sha256="0wgyf785izfhx1jvff4as1dir1s432z9v2b2rgdxvay9y5zpc2ar"; depends=[Rcpp RcppParallel dplyr igraph Rcpp RcppParallel]; };
+rNMF = derive { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; };
+rNOMADS = derive { name="rNOMADS"; version="2.1.4"; sha256="0a0knxqqbn52i4ixpv16h1hnajhwx788cmdiq78ysds7yfkjrwzy"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML]; };
+rPlant = derive { name="rPlant"; version="2.7"; sha256="0gqxb49d6qzkd533s9qp75byvz66v1csdlnmh3m2zg96aw32178r"; depends=[knitcitations RCurl rjson seqinr]; };
+rPref = derive { name="rPref"; version="0.5"; sha256="0wgyf785izfhx1jvff4as1dir1s432z9v2b2rgdxvay9y5zpc2ar"; depends=[dplyr igraph Rcpp RcppParallel]; };
 rPython = derive { name="rPython"; version="0.0-5"; sha256="0d608v1x8walwnx7aa3m0n7999jlbiymhl7605z4n7ps6l1140mv"; depends=[RJSONIO]; };
 rSCA = derive { name="rSCA"; version="2.1"; sha256="1lpix8xsjzyhgksmigvqxpv2bvaka0b1q2kcvdyfrfcw713n19rw"; depends=[]; };
 rSFA = derive { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; };
-rSPACE = derive { name="rSPACE"; version="1.1.1"; sha256="03ibsrhvjs5fn6syr65aw07s05apxbbm7biwlylha28yrazp2z89"; depends=[raster RMark ggplot2 tcltk2 sp plyr]; };
+rSPACE = derive { name="rSPACE"; version="1.1.1"; sha256="03ibsrhvjs5fn6syr65aw07s05apxbbm7biwlylha28yrazp2z89"; depends=[ggplot2 plyr raster RMark sp tcltk2]; };
 rSymPy = derive { name="rSymPy"; version="0.2-1.1"; sha256="1mrfpyalrq8b6yicy28jsj0xy7hlawa72imsfhabwd3hrx6ld150"; depends=[rJython]; };
-rTableICC = derive { name="rTableICC"; version="1.0.2"; sha256="11mjlgvmghppy2m35w799z93b4f8wn307dl3c9dyk2sib9nxcpyv"; depends=[partitions aster]; };
+rTableICC = derive { name="rTableICC"; version="1.0.2"; sha256="11mjlgvmghppy2m35w799z93b4f8wn307dl3c9dyk2sib9nxcpyv"; depends=[aster partitions]; };
 rTensor = derive { name="rTensor"; version="1.2"; sha256="1qikicdi8d5yhw43660m8v587f5xzs2k2lpmbhfw037n0liivay2"; depends=[]; };
-rUnemploymentData = derive { name="rUnemploymentData"; version="1.0.0"; sha256="1gbmr3kcv3wv4lmr7171sd76p95nhsa104955yi7y6wd5h0hk1ba"; depends=[stringr choroplethr rvest]; };
-rWBclimate = derive { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr plyr rgdal jsonlite reshape2 sp]; };
-rYoutheria = derive { name="rYoutheria"; version="1.0.0"; sha256="1yj66ars5a8mbv2axl6l5g7wflwz3j4mhwk3iz5w33rfhixixm9l"; depends=[plyr RJSONIO reshape2 RCurl]; };
+rUnemploymentData = derive { name="rUnemploymentData"; version="1.0.0"; sha256="1gbmr3kcv3wv4lmr7171sd76p95nhsa104955yi7y6wd5h0hk1ba"; depends=[choroplethr rvest stringr]; };
+rWBclimate = derive { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr jsonlite plyr reshape2 rgdal sp]; };
+rYoutheria = derive { name="rYoutheria"; version="1.0.0"; sha256="1yj66ars5a8mbv2axl6l5g7wflwz3j4mhwk3iz5w33rfhixixm9l"; depends=[plyr RCurl reshape2 RJSONIO]; };
 race = derive { name="race"; version="0.1.59"; sha256="13jprlnngribgvyr7fbg9d36i8qf3cax85n71dl71iv0y24al1cy"; depends=[]; };
 radar = derive { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; };
-radiant = derive { name="radiant"; version="0.1.83"; sha256="0456iddvsnw2p0mnchig18ccbl0z53spb3nqwx43ms31b1nbfpjw"; depends=[lubridate ggplot2 dplyr magrittr car MASS gridExtra AlgDesign GPArotation psych wordcloud markdown knitr ggdendro broom tidyr pryr shiny shinyAce]; };
+radiant = derive { name="radiant"; version="0.1.83"; sha256="0456iddvsnw2p0mnchig18ccbl0z53spb3nqwx43ms31b1nbfpjw"; depends=[AlgDesign broom car dplyr ggdendro ggplot2 GPArotation gridExtra knitr lubridate magrittr markdown MASS pryr psych shiny shinyAce tidyr wordcloud]; };
 radir = derive { name="radir"; version="1.0"; sha256="1aiy92r854h1l9fsa8j65w495hj7hll7k1csfnvb92h0wh0bxyzy"; depends=[hermite]; };
-rags2ridges = derive { name="rags2ridges"; version="1.4"; sha256="1vwd39vp8xdrcz1kfsjng3lzfrfb3czsxg1kvll5d275xsrhz5ix"; depends=[igraph expm reshape ggplot2 Hmisc fdrtool snowfall]; };
-rainbow = derive { name="rainbow"; version="3.3"; sha256="0xiqljshkdhhkdgcvz5n9qgbxgxskpxbq14vbpil9nqw2syj9xvj"; depends=[MASS pcaPP hdrcde cluster colorspace ks]; };
+rags2ridges = derive { name="rags2ridges"; version="1.4"; sha256="1vwd39vp8xdrcz1kfsjng3lzfrfb3czsxg1kvll5d275xsrhz5ix"; depends=[expm fdrtool ggplot2 Hmisc igraph reshape snowfall]; };
+rainbow = derive { name="rainbow"; version="3.3"; sha256="0xiqljshkdhhkdgcvz5n9qgbxgxskpxbq14vbpil9nqw2syj9xvj"; depends=[cluster colorspace hdrcde ks MASS pcaPP]; };
 raincpc = derive { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; };
 rainfreq = derive { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; };
 ramify = derive { name="ramify"; version="0.3.0"; sha256="1pysv802pyab06zl41b71x91527fw1smw4x2lcj2xc3p95yb4zb9"; depends=[]; };
-ramps = derive { name="ramps"; version="0.6-13"; sha256="1y7jaajzbf6d9xwr0rg0qr43l8kncgwbpfy5rpka90g3244v8nwz"; depends=[coda maps Matrix nlme fields]; };
+ramps = derive { name="ramps"; version="0.6-13"; sha256="1y7jaajzbf6d9xwr0rg0qr43l8kncgwbpfy5rpka90g3244v8nwz"; depends=[coda fields maps Matrix nlme]; };
 randNames = derive { name="randNames"; version="0.2"; sha256="0mgfwdbadfvxg1dp8aqp2c24lkhz3bi9ssmym4ns6xjq088l3ldh"; depends=[dplyr httr jsonlite]; };
 randaes = derive { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; };
 random = derive { name="random"; version="0.2.4"; sha256="17d1gcdymgcc08hx3998vs0x70fn8gxw2a1ycm9z7xrasx03g7kn"; depends=[curl]; };
-random_polychor_pa = derive { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[psych nFactors boot MASS mvtnorm sfsmisc]; };
+random_polychor_pa = derive { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; };
 randomForest = derive { name="randomForest"; version="4.6-10"; sha256="0glj08w6sbabr3n71kzd5w3jb7vhrys8rq904j27a4xk0qp4s5lv"; depends=[]; };
 randomForestSRC = derive { name="randomForestSRC"; version="1.6.1"; sha256="174ky1wwdpq6wkn8hanfpfgy55jf6v1hlm6k688gjs0515y5490r"; depends=[]; };
-randomGLM = derive { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[MASS foreach doParallel]; };
-randomLCA = derive { name="randomLCA"; version="1.0-2"; sha256="14v6jmsbyzmavxjdwh9nb0lljhc7kdly4p1v2a9jypjil6kk5ibc"; depends=[lattice boot fastGHQuad]; };
+randomGLM = derive { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; };
+randomLCA = derive { name="randomLCA"; version="1.0-2"; sha256="14v6jmsbyzmavxjdwh9nb0lljhc7kdly4p1v2a9jypjil6kk5ibc"; depends=[boot fastGHQuad lattice]; };
 randomNames = derive { name="randomNames"; version="0.0-8"; sha256="10fhqxnnw6gk5g8jnb83hh2nvvj65g8mwy7rfln8yzq93gjxnykm"; depends=[data_table]; };
-randomUniformForest = derive { name="randomUniformForest"; version="1.1.5"; sha256="1amr3m7h5xcb8gahrr58233chsnx1naf9x5vpjy9p5ivh71xcxf7"; depends=[Rcpp doParallel iterators foreach ggplot2 pROC gtools cluster MASS Rcpp]; };
-randomizationInference = derive { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[permute matrixStats]; };
+randomUniformForest = derive { name="randomUniformForest"; version="1.1.5"; sha256="1amr3m7h5xcb8gahrr58233chsnx1naf9x5vpjy9p5ivh71xcxf7"; depends=[cluster doParallel foreach ggplot2 gtools iterators MASS pROC Rcpp]; };
+randomizationInference = derive { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[matrixStats permute]; };
 randomizeBE = derive { name="randomizeBE"; version="0.3-1"; sha256="06hj614wp9lb348qwyqgw5zk2vn0m81bkwz4jprgjd72kpy8kv1h"; depends=[]; };
 randomizr = derive { name="randomizr"; version="0.2.2"; sha256="0g870sr8zjfl1dh3ay14kd6v6jg2qw86w2wcdzr8f201xy5i1fgr"; depends=[]; };
 randtests = derive { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; };
 randtoolbox = derive { name="randtoolbox"; version="1.16"; sha256="03z4g2mmdywsgl95xbj80awirkgrghdk2kwhsh58p00aq4bpl5ff"; depends=[rngWELL]; };
-rangeMapper = derive { name="rangeMapper"; version="0.2-8"; sha256="0bxb37gy98smypjj27r3dbd0vfyvaqw2p25qv07j3isykcn2pxpn"; depends=[RSQLite rgdal sp rgeos raster maptools lattice RColorBrewer classInt]; };
-rankdist = derive { name="rankdist"; version="0.4.1"; sha256="11lc7ggi5bv836f3bwk8gb5pry4fw4qwbj95bzg34xdascaapw59"; depends=[Rcpp hash optimx Rcpp]; };
+rangeMapper = derive { name="rangeMapper"; version="0.2-8"; sha256="0bxb37gy98smypjj27r3dbd0vfyvaqw2p25qv07j3isykcn2pxpn"; depends=[classInt lattice maptools raster RColorBrewer rgdal rgeos RSQLite sp]; };
+rankdist = derive { name="rankdist"; version="0.4.1"; sha256="11lc7ggi5bv836f3bwk8gb5pry4fw4qwbj95bzg34xdascaapw59"; depends=[hash optimx Rcpp]; };
 rankhazard = derive { name="rankhazard"; version="1.0"; sha256="1kylg8yjrixbv86i2ffhhn8f5shsj8kvi66k202ari0li92y7dsg"; depends=[survival]; };
 rappdirs = derive { name="rappdirs"; version="0.3"; sha256="1yjd91h1knagri5m4djal25p7925162zz5g6005h1fgcvwz3sszd"; depends=[]; };
-rapport = derive { name="rapport"; version="0.51"; sha256="1qn45nrcawr8d9pkdnpmm37dg31l28gfbnwjl62fs7y691187cqp"; depends=[lattice plyr pander yaml reshape]; };
-rapportools = derive { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12arh5dc3263kjsz3dzg06qihfmrqyax94mv2d01b"; depends=[reshape plyr pander]; };
+rapport = derive { name="rapport"; version="0.51"; sha256="1qn45nrcawr8d9pkdnpmm37dg31l28gfbnwjl62fs7y691187cqp"; depends=[lattice pander plyr reshape yaml]; };
+rapportools = derive { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12arh5dc3263kjsz3dzg06qihfmrqyax94mv2d01b"; depends=[pander plyr reshape]; };
 rareGE = derive { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; };
 rareNMtests = derive { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; };
-rasclass = derive { name="rasclass"; version="0.2.1"; sha256="04g2sirxrf16xjmyn4zcci757k7sgvsjbg0qjfr5phbr1rssy9qf"; depends=[car nnet RSNNS e1071 randomForest]; };
+rasclass = derive { name="rasclass"; version="0.2.1"; sha256="04g2sirxrf16xjmyn4zcci757k7sgvsjbg0qjfr5phbr1rssy9qf"; depends=[car e1071 nnet randomForest RSNNS]; };
 raster = derive { name="raster"; version="2.3-40"; sha256="1swfhf6c70ybvlkw5v2wg0zbzsmzn63n9fkwj4sfp3n08flikma2"; depends=[sp]; };
-rasterVis = derive { name="rasterVis"; version="0.35"; sha256="0kdpng32b3l0hsf24zzj5m5srcka1wr26dpxfjxxsyilg6frp83r"; depends=[raster lattice latticeExtra sp zoo hexbin RColorBrewer]; };
+rasterVis = derive { name="rasterVis"; version="0.35"; sha256="0kdpng32b3l0hsf24zzj5m5srcka1wr26dpxfjxxsyilg6frp83r"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp zoo]; };
 rateratio_test = derive { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; };
 raters = derive { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; };
 rationalfun = derive { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; };
 rattle = derive { name="rattle"; version="3.4.1"; sha256="1ql7zppca6p9cph0wca5wxhhn5f8spzpxa8r65372mvigg0iw6k3"; depends=[]; };
 rawFasta = derive { name="rawFasta"; version="1.0.0"; sha256="0krvs8d1r8hggjg84n7g3ncdkifa3hipbma98f49kf81fzn2npip"; depends=[]; };
 rbamtools = derive { name="rbamtools"; version="2.10.0"; sha256="00y5393nac4x1vz9m5li0053cr679dj29v7ss6njgph8q27mv19c"; depends=[]; };
-rbefdata = derive { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[XML RCurl rjson wordcloud rtematres RColorBrewer]; };
+rbefdata = derive { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; };
 rbenchmark = derive { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; };
-rbhl = derive { name="rbhl"; version="0.1.0"; sha256="1m2n1qczhhdlv9pkmw9dlqi2wmdw8wac8d557c4rk0vnzwzgpgpi"; depends=[httr XML RJSONIO plyr]; };
-rbison = derive { name="rbison"; version="0.4.5"; sha256="1bvirsil4674r5xb0ksmzdrg0km988rsmq93mr0q6a089zw9lhna"; depends=[plyr httr mapproj ggplot2 gridExtra maptools sp dplyr jsonlite]; };
-rbitcoinchartsapi = derive { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RJSONIO RCurl]; };
+rbhl = derive { name="rbhl"; version="0.1.0"; sha256="1m2n1qczhhdlv9pkmw9dlqi2wmdw8wac8d557c4rk0vnzwzgpgpi"; depends=[httr plyr RJSONIO XML]; };
+rbison = derive { name="rbison"; version="0.4.5"; sha256="1bvirsil4674r5xb0ksmzdrg0km988rsmq93mr0q6a089zw9lhna"; depends=[dplyr ggplot2 gridExtra httr jsonlite mapproj maptools plyr sp]; };
+rbitcoinchartsapi = derive { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RCurl RJSONIO]; };
 rbmn = derive { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; };
 rbounds = derive { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; };
 rbugs = derive { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; };
 rbundler = derive { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; };
 rcbalance = derive { name="rcbalance"; version="1.6"; sha256="0nbwsisx4ajdccywwvpg2xcaf8b4b25zij2qcb39yzmlz0yk6jjz"; depends=[MASS plyr]; };
 rcdd = derive { name="rcdd"; version="1.1-8"; sha256="09bb92rp44palx9dvc9pb0gdmb1g22289xjk8p9s918lalc6i9aw"; depends=[]; };
-rcdk = derive { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint rJava rcdklibs png iterators]; };
+rcdk = derive { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint iterators png rcdklibs rJava]; };
 rcdklibs = derive { name="rcdklibs"; version="1.5.8.4"; sha256="0mzkr23f4d639vhxfdbg44hzxapmpqkhc084ikcj93gjwvdz903k"; depends=[rJava]; };
-rchallenge = derive { name="rchallenge"; version="1.1"; sha256="1qad0mcadr3zw5r37rgwnqf4ic9brlw3zl5n4jcxyaj324fj4pa3"; depends=[rmarkdown knitr]; };
-rcicr = derive { name="rcicr"; version="0.3.0"; sha256="0fvv6diqg6sw3ar3gzvhl3mbm6zvx0k12lzsa92mccg0giqa9n0w"; depends=[matlab aspace jpeg]; };
-rclinicaltrials = derive { name="rclinicaltrials"; version="1.4.1"; sha256="1x8mj4gzfpgvdj3glwanr76g5x8pks8fm806bvnfls35g967z4p4"; depends=[httr XML plyr]; };
+rchallenge = derive { name="rchallenge"; version="1.1"; sha256="1qad0mcadr3zw5r37rgwnqf4ic9brlw3zl5n4jcxyaj324fj4pa3"; depends=[knitr rmarkdown]; };
+rcicr = derive { name="rcicr"; version="0.3.0"; sha256="0fvv6diqg6sw3ar3gzvhl3mbm6zvx0k12lzsa92mccg0giqa9n0w"; depends=[aspace jpeg matlab]; };
+rclinicaltrials = derive { name="rclinicaltrials"; version="1.4.1"; sha256="1x8mj4gzfpgvdj3glwanr76g5x8pks8fm806bvnfls35g967z4p4"; depends=[httr plyr XML]; };
 rcorpora = derive { name="rcorpora"; version="1.1.0"; sha256="05i9zqvgg5fxgscqzmbsi84baq9cxs14k70agjy95h61fndaaarf"; depends=[jsonlite]; };
-rcppbugs = derive { name="rcppbugs"; version="0.1.4.1"; sha256="0wb5mzw1sdrr7lc6izilv60k5v0wcvy8q31a863b63a9jvh16g8d"; depends=[Rcpp Rcpp RcppArmadillo BH]; };
-rcrossref = derive { name="rcrossref"; version="0.3.0"; sha256="1w822n6mlld7fa92iy38xjvgnkhyns3mvy7vaqabgr2bikcz6545"; depends=[jsonlite XML httr plyr bibtex dplyr]; };
+rcppbugs = derive { name="rcppbugs"; version="0.1.4.1"; sha256="0wb5mzw1sdrr7lc6izilv60k5v0wcvy8q31a863b63a9jvh16g8d"; depends=[BH Rcpp RcppArmadillo]; };
+rcrossref = derive { name="rcrossref"; version="0.3.0"; sha256="1w822n6mlld7fa92iy38xjvgnkhyns3mvy7vaqabgr2bikcz6545"; depends=[bibtex dplyr httr jsonlite plyr XML]; };
 rda = derive { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; };
-rdatamarket = derive { name="rdatamarket"; version="0.6.5"; sha256="1y4493cvhcgyg2j5hadx1fzmv2lzwan78jighi2dzyxxzv6pxccn"; depends=[zoo RCurl RJSONIO]; };
-rdd = derive { name="rdd"; version="0.56"; sha256="1x61ik606mwn46x3qzgq8wk2f6d5qqr95h30bz6hfbjlpcxw3700"; depends=[sandwich lmtest AER Formula]; };
+rdatamarket = derive { name="rdatamarket"; version="0.6.5"; sha256="1y4493cvhcgyg2j5hadx1fzmv2lzwan78jighi2dzyxxzv6pxccn"; depends=[RCurl RJSONIO zoo]; };
+rdd = derive { name="rdd"; version="0.56"; sha256="1x61ik606mwn46x3qzgq8wk2f6d5qqr95h30bz6hfbjlpcxw3700"; depends=[AER Formula lmtest sandwich]; };
 rdetools = derive { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; };
 rdrobust = derive { name="rdrobust"; version="0.80"; sha256="02adafhbjp259hbbbk32yllgn35xxim2mwn6yixv4wh5dgr974v6"; depends=[]; };
 rdrop2 = derive { name="rdrop2"; version="0.6"; sha256="1yxg38v7r34f9rid5q6q1g9f30q3zc4dnkziyps3514l5dnbvk3j"; depends=[assertthat data_table dplyr httr jsonlite magrittr]; };
-rdryad = derive { name="rdryad"; version="0.1.1"; sha256="0mqpkmwkznyxj0nn1v389p741dlc66dixcvljsn2rvg0q6p75fkj"; depends=[XML RCurl OAIHarvester ape gdata plyr stringr RJSONIO]; };
-reGenotyper = derive { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots zoo MatrixEQTL]; };
+rdryad = derive { name="rdryad"; version="0.1.1"; sha256="0mqpkmwkznyxj0nn1v389p741dlc66dixcvljsn2rvg0q6p75fkj"; depends=[ape gdata OAIHarvester plyr RCurl RJSONIO stringr XML]; };
+reGenotyper = derive { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots MatrixEQTL zoo]; };
 readBrukerFlexData = derive { name="readBrukerFlexData"; version="1.8.2"; sha256="1cagv6l29h3p87h7c2bgba23v2wxrs2kg4zg1dk046m2x11mwx3c"; depends=[]; };
 readGenalex = derive { name="readGenalex"; version="1.0"; sha256="1lhfw8xbwnjhslriaxziw4dskmjfawz5g31h2yl9ds2nwvwhmdwi"; depends=[pegas]; };
 readMLData = derive { name="readMLData"; version="0.9-7"; sha256="0l752j1jq37j9pdcsbmcb23b5l8fkfsbisfr3yjy3q4rxsphc7k6"; depends=[XML]; };
@@ -5574,196 +5593,197 @@ readMzXmlData = derive { name="readMzXmlData"; version="2.8"; sha256="0x5h3dh6fk
 readODS = derive { name="readODS"; version="1.4"; sha256="00xcas8y0cq3scgi9vlfkrjalphmd7bsynlzpy7izxa5w9b7x79f"; depends=[XML]; };
 readbitmap = derive { name="readbitmap"; version="0.1-4"; sha256="08fqqsdb2wsx415mnac9mzl5sr5and0zx72ablnlidqfxv8xsi9d"; depends=[bmp jpeg png]; };
 reader = derive { name="reader"; version="1.0.5"; sha256="1g22pnlfr2c974s6rqnyixknhgy2crqbxg2cg2s3ja1sk29v4gr0"; depends=[NCmisc]; };
-readr = derive { name="readr"; version="0.1.1"; sha256="1raw3kihksqr274p0mdigfxpg8yrhx0phwiab22sdi1vp62c8ja6"; depends=[Rcpp curl Rcpp BH]; };
-readstata13 = derive { name="readstata13"; version="0.7"; sha256="14il790jgn8l9c8gxgl2s11vzff5xz77jsgdgjs044r407a72wkb"; depends=[Rcpp Rcpp]; };
-readxl = derive { name="readxl"; version="0.1.0"; sha256="0a0mjcn70a0nz1bkrdjwq495000kswxvyq1nlad9k3ayni2ixjkd"; depends=[Rcpp Rcpp]; };
+readr = derive { name="readr"; version="0.1.1"; sha256="1raw3kihksqr274p0mdigfxpg8yrhx0phwiab22sdi1vp62c8ja6"; depends=[BH curl Rcpp]; };
+readstata13 = derive { name="readstata13"; version="0.7"; sha256="14il790jgn8l9c8gxgl2s11vzff5xz77jsgdgjs044r407a72wkb"; depends=[Rcpp]; };
+readxl = derive { name="readxl"; version="0.1.0"; sha256="0a0mjcn70a0nz1bkrdjwq495000kswxvyq1nlad9k3ayni2ixjkd"; depends=[Rcpp]; };
 reams = derive { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
-rebird = derive { name="rebird"; version="0.1.1"; sha256="0s8wmp2sghs56ppca57fjfab7wngszmy1g8rd3hiwx6br0sjidcg"; depends=[RJSONIO httr RCurl plyr]; };
+rebird = derive { name="rebird"; version="0.1.1"; sha256="0s8wmp2sghs56ppca57fjfab7wngszmy1g8rd3hiwx6br0sjidcg"; depends=[httr plyr RCurl RJSONIO]; };
 rebmix = derive { name="rebmix"; version="2.7.1"; sha256="1m3mmqi4kfai0hx2khkblqairp59fgh0japg23rgib1djmdcqb4n"; depends=[]; };
 rebus = derive { name="rebus"; version="0.0-5"; sha256="06rl6knnk93k537hhjx4r55hq6hssij7xc426ilki329vwfi5kyf"; depends=[]; };
 recalls = derive { name="recalls"; version="0.1.0"; sha256="121r2lf32x4yq8zxx6pbnphs7ygn382ns85qxws6jnqzy52q41vh"; depends=[RCurl RJSONIO]; };
 reccsim = derive { name="reccsim"; version="0.9-1"; sha256="17nsp91xq20vfwjfwav80qjs2wc7gwpmrdnwv7lc61baq0kkcs7k"; depends=[]; };
-recluster = derive { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[vegan ape picante phangorn phytools cluster]; };
-recommenderlab = derive { name="recommenderlab"; version="0.1-5"; sha256="1hpgd2la4wnlxx5h8cjni4i978hdssr041zrg851lpjrkbxmxfsi"; depends=[Matrix registry arules proxy]; };
+recluster = derive { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; };
+recommenderlab = derive { name="recommenderlab"; version="0.1-5"; sha256="1hpgd2la4wnlxx5h8cjni4i978hdssr041zrg851lpjrkbxmxfsi"; depends=[arules Matrix proxy registry]; };
 recommenderlabBX = derive { name="recommenderlabBX"; version="0.1-0"; sha256="0dl79cxarsfp8l4nxnns05jwnjygigjhwpjrr4lzx4nvsfxmgsr2"; depends=[recommenderlab]; };
 recommenderlabJester = derive { name="recommenderlabJester"; version="0.1-0"; sha256="1m5jg8gs16cwwwcnjzqkyzwyip8fshrwhmqz8g7nlf6g3p9347rl"; depends=[recommenderlab]; };
-reconstructr = derive { name="reconstructr"; version="1.1.0"; sha256="1kswvpmhk3zzwm4nv6pjb80ww95n9bd4q9j7bhk9kql8v5mnfg5m"; depends=[Rcpp Rcpp]; };
-recosystem = derive { name="recosystem"; version="0.3"; sha256="064rnnz4m85mwq3084m0ldj8sb5z6jwzqzkh22fagsq2xyqri15l"; depends=[Rcpp Rcpp]; };
+reconstructr = derive { name="reconstructr"; version="1.1.0"; sha256="1kswvpmhk3zzwm4nv6pjb80ww95n9bd4q9j7bhk9kql8v5mnfg5m"; depends=[Rcpp]; };
+recosystem = derive { name="recosystem"; version="0.3"; sha256="064rnnz4m85mwq3084m0ldj8sb5z6jwzqzkh22fagsq2xyqri15l"; depends=[Rcpp]; };
 redcapAPI = derive { name="redcapAPI"; version="1.3"; sha256="08js2lvrdl9ig0pq1wf7cwkmvaah6xs65bgfysdhsyayx0lz5rii"; depends=[chron DBI Hmisc httr stringr]; };
-redist = derive { name="redist"; version="1.1"; sha256="0ddwvmzmqv5nm3azia1g0x0icj1jcd7s34f1kv01phky2pmz5wy4"; depends=[Rcpp spdep sp coda Rcpp RcppArmadillo]; };
+redist = derive { name="redist"; version="1.1"; sha256="0ddwvmzmqv5nm3azia1g0x0icj1jcd7s34f1kv01phky2pmz5wy4"; depends=[coda Rcpp RcppArmadillo sp spdep]; };
 ref = derive { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; };
-refGenome = derive { name="refGenome"; version="1.3.0"; sha256="121aw4w84hlhxgwlf1gh0w3ydvd8zsijrh0q7fzcwi1vdgnjb7lv"; depends=[doBy RSQLite DBI]; };
-referenceIntervals = derive { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot extremevalues car outliers]; };
+refGenome = derive { name="refGenome"; version="1.3.0"; sha256="121aw4w84hlhxgwlf1gh0w3ydvd8zsijrh0q7fzcwi1vdgnjb7lv"; depends=[DBI doBy RSQLite]; };
+referenceIntervals = derive { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot car extremevalues outliers]; };
 refset = derive { name="refset"; version="0.1.0"; sha256="0yj87sp6ghxv20hz5knmw3d7way1hsggk759wqxsbfprd38y6khd"; depends=[]; };
-refund = derive { name="refund"; version="0.1-11"; sha256="1afsxab1jivs4vj6diqh7352v98divna6az1dxsdn7lvw6cmph6y"; depends=[fda lattice boot mgcv MASS glmnet magic nlme wavethresh Matrix gamm4 matrixStats lme4 RLRsim]; };
+refund = derive { name="refund"; version="0.1-11"; sha256="1afsxab1jivs4vj6diqh7352v98divna6az1dxsdn7lvw6cmph6y"; depends=[boot fda gamm4 glmnet lattice lme4 magic MASS Matrix matrixStats mgcv nlme RLRsim wavethresh]; };
 refund_wave = derive { name="refund.wave"; version="0.1"; sha256="1vnhg7gi5r8scwivqjwhrv72sq8asnm4whx3jk39saphdxpk5hxv"; depends=[glmnet wavethresh]; };
 regRSM = derive { name="regRSM"; version="0.4"; sha256="1rg74jqj8rw69q6my0n4alflx7mgfwng35ff72bxwjhn9ghhj347"; depends=[]; };
 regexr = derive { name="regexr"; version="1.0.2"; sha256="1mr8qmiz9bgq5v6f065z40aj9zllidsv6gg8mjc28zxmkz5zn6gp"; depends=[]; };
 registry = derive { name="registry"; version="0.2"; sha256="1ifv9sql70kylfj12cdb1j1zpk3ix728m8qj46sf1zyc5mhll01s"; depends=[]; };
-reglogit = derive { name="reglogit"; version="1.2-2"; sha256="0nq60s8l860z6nd52l6c77vamis7hl2j667gkxry0jir2pxsk4jp"; depends=[mvtnorm boot Matrix]; };
+reglogit = derive { name="reglogit"; version="1.2-2"; sha256="0nq60s8l860z6nd52l6c77vamis7hl2j667gkxry0jir2pxsk4jp"; depends=[boot Matrix mvtnorm]; };
 regpro = derive { name="regpro"; version="0.1.0"; sha256="0d47ffsqx1633pmf3abi7wksyng2g71mz2z9nb2zqdak794l1n44"; depends=[denpro]; };
 regress = derive { name="regress"; version="1.3-14"; sha256="0qnks28fr8siq95iiiqyvz82cbdg14i18rj7g9rqyjhiam12fshl"; depends=[]; };
 regsubseq = derive { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; };
 regtest = derive { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; };
 rehh = derive { name="rehh"; version="1.13"; sha256="0hi9bfclai1b948yq9fp1q7rxb8nwvdm368l09la8ghlgxi5lnm8"; depends=[gplots]; };
-relSim = derive { name="relSim"; version="0.2-0"; sha256="0cqcp7r263sk874l17wz84mzm4b1dxbfbsk74937rcz1wfc623k5"; depends=[Rcpp Rcpp]; };
+relSim = derive { name="relSim"; version="0.2-0"; sha256="0cqcp7r263sk874l17wz84mzm4b1dxbfbsk74937rcz1wfc623k5"; depends=[Rcpp]; };
 rela = derive { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; };
-relaimpo = derive { name="relaimpo"; version="2.2-2"; sha256="1rxjg2yw2gyshaij98w83cshxwscnq3ql7bg13n7v4nbjsi1l6zh"; depends=[MASS boot survey mitools corpcor]; };
-relations = derive { name="relations"; version="0.6-5"; sha256="00apza97y3v9q95if4fm5w5f7fw1i091pz4avqs1v59kysahdj9h"; depends=[cluster slam sets]; };
+relaimpo = derive { name="relaimpo"; version="2.2-2"; sha256="1rxjg2yw2gyshaij98w83cshxwscnq3ql7bg13n7v4nbjsi1l6zh"; depends=[boot corpcor MASS mitools survey]; };
+relations = derive { name="relations"; version="0.6-5"; sha256="00apza97y3v9q95if4fm5w5f7fw1i091pz4avqs1v59kysahdj9h"; depends=[cluster sets slam]; };
 relax = derive { name="relax"; version="1.3.15"; sha256="0cgvxw3pmy9kx8p81bb5n5nnbn6l9hm07k6hdy7p2j2gl15xxnpq"; depends=[]; };
 relaxnet = derive { name="relaxnet"; version="0.3-2"; sha256="1l83rk7r4vkcxbfljmibzm8lzpx0vf406hv4h5cy9x0k3rz2bfh0"; depends=[glmnet]; };
 relaxo = derive { name="relaxo"; version="0.1-2"; sha256="1rzmq7q3j271s6qwwrmwidv0vxcjpgjhyiqgr6fkczkai2lbnd8x"; depends=[lars]; };
 reldist = derive { name="reldist"; version="1.6-4"; sha256="0v86wws29zy67jidrvfxkfwhpxppqrpq5h3b22cjif5qjqz3kk8f"; depends=[mgcv]; };
-relevent = derive { name="relevent"; version="1.0-4"; sha256="10bf1s7jmas8ck1izqibqcaqg4z55ciwdpd9pm2697y8z0jhr2rj"; depends=[trust sna coda]; };
+relevent = derive { name="relevent"; version="1.0-4"; sha256="10bf1s7jmas8ck1izqibqcaqg4z55ciwdpd9pm2697y8z0jhr2rj"; depends=[coda sna trust]; };
 reliaR = derive { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; };
 relimp = derive { name="relimp"; version="1.0-4"; sha256="1i9j218b6lh6ag4a8x4vwhmqqclbzx46mpwd36s8hdqayzs6lmad"; depends=[]; };
-relsurv = derive { name="relsurv"; version="2.0-5"; sha256="0lwmdz1hm46qlkvfvvyc2v592lx2crs3cxjpkph0vg5w6a0k10i4"; depends=[survival date]; };
+relsurv = derive { name="relsurv"; version="2.0-5"; sha256="0lwmdz1hm46qlkvfvvyc2v592lx2crs3cxjpkph0vg5w6a0k10i4"; depends=[date survival]; };
 remMap = derive { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; };
-remix = derive { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[plyr survival Hmisc ascii]; };
-remote = derive { name="remote"; version="0.3.0"; sha256="1f41j26grkv4830bvi6z16b63yksplrq3yg1amd4l634lwhp6x55"; depends=[Rcpp raster foreach Rcpp]; };
-rentrez = derive { name="rentrez"; version="0.4.1"; sha256="1prpzfq5106f0r5z4ffjvs9qkmfaf67icj8k1wngqwmvl2wg88gq"; depends=[XML httr jsonlite]; };
+remix = derive { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[ascii Hmisc plyr survival]; };
+remote = derive { name="remote"; version="1.0.0"; sha256="09840z50x5i8bsi49s3asqhcz84z16pyq9w50yay4h8x82w3hfh3"; depends=[foreach raster Rcpp]; };
+rentrez = derive { name="rentrez"; version="0.4.1"; sha256="1prpzfq5106f0r5z4ffjvs9qkmfaf67icj8k1wngqwmvl2wg88gq"; depends=[httr jsonlite XML]; };
 repfdr = derive { name="repfdr"; version="1.1-3"; sha256="15f7x7vqwlpyzvzsybyz825a9dmglbrngjmajrsqlwffypgxjvi8"; depends=[]; };
+repijson = derive { name="repijson"; version="0.1.0"; sha256="16iypvsmh5r9pk2k6npp17ya5dgkxihsj29pppd3zvdpm3vvd8k1"; depends=[geojsonio ggplot2 jsonlite OutbreakTools plyr sp]; };
 replicatedpp2w = derive { name="replicatedpp2w"; version="0.1-1"; sha256="0q6mfrdjpx6nh4xgr5i7ka3xvnx9585xdhni020q4pm05rhimid2"; depends=[spatstat]; };
 replicationInterval = derive { name="replicationInterval"; version="0.3"; sha256="1zqs114514xj59dlkhw5kmq73grghmb3i5rnnq05qzgf5wjn581i"; depends=[MBESS]; };
 repmis = derive { name="repmis"; version="0.4.4"; sha256="12sw9l2nifkvri5kvgf0br7yqqmjlq5rj58g6yik8gh7wwy5157z"; depends=[data_table digest httr plyr R_cache]; };
 repolr = derive { name="repolr"; version="2.0"; sha256="10wg07sfxcxzswf3zh5sx2cm9dxjx11zymy82a4q9awnacb5gp9b"; depends=[gee]; };
-reportRx = derive { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[reshape survival xtable aod cmprsk geoR stringr]; };
+reportRx = derive { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[aod cmprsk geoR reshape stringr survival xtable]; };
 reportr = derive { name="reportr"; version="1.1.2"; sha256="0lxnmay9vgg7dsa3scszx3v4lb6m3bv6kjl0dk7hrl7bd67azdrk"; depends=[]; };
 reports = derive { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdxb8gsvzi6v794fh81x4la9davz6w1fnxh"; depends=[]; };
 reporttools = derive { name="reporttools"; version="1.1.1"; sha256="0cnxzq679f860z063j3pbm2c5qcaz45g73khj9rdp3if0cci8ikj"; depends=[xtable]; };
-repra = derive { name="repra"; version="0.4.2"; sha256="1djcs83z8ckpmsbyzscnysmy45z28kswzm852176b9pip21mb1w8"; depends=[data_table dplyr Rcpp reshape2 ggplot2 assertthat Rcpp]; };
+repra = derive { name="repra"; version="0.4.2"; sha256="1djcs83z8ckpmsbyzscnysmy45z28kswzm852176b9pip21mb1w8"; depends=[assertthat data_table dplyr ggplot2 Rcpp reshape2]; };
 represent = derive { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
-reproducer = derive { name="reproducer"; version="0.1.3"; sha256="1pz2l123xc16m1pqi95khg9r267s25igcyjgr7hn9gy623cqgzah"; depends=[openxlsx ggplot2 gridExtra tm wordcloud RColorBrewer xtable metafor]; };
-rerddap = derive { name="rerddap"; version="0.1.0"; sha256="1a58vsm1m9ybafda6pak0fa7kdfscslq9855a5r2x12bzqy98k4f"; depends=[httr dplyr data_table jsonlite xml2 digest ncdf]; };
+reproducer = derive { name="reproducer"; version="0.1.3"; sha256="1pz2l123xc16m1pqi95khg9r267s25igcyjgr7hn9gy623cqgzah"; depends=[ggplot2 gridExtra metafor openxlsx RColorBrewer tm wordcloud xtable]; };
+rerddap = derive { name="rerddap"; version="0.1.0"; sha256="1a58vsm1m9ybafda6pak0fa7kdfscslq9855a5r2x12bzqy98k4f"; depends=[data_table digest dplyr httr jsonlite ncdf xml2]; };
 resample = derive { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; };
-resemble = derive { name="resemble"; version="1.1.1"; sha256="0mz5mxm6p1drfx2s9dx35m2bnvirr8lkjjh5b4vdk9p2cdv1qkkv"; depends=[RcppArmadillo foreach iterators pls Rcpp Rcpp RcppArmadillo]; };
+resemble = derive { name="resemble"; version="1.1.1"; sha256="0mz5mxm6p1drfx2s9dx35m2bnvirr8lkjjh5b4vdk9p2cdv1qkkv"; depends=[foreach iterators pls Rcpp RcppArmadillo]; };
 reshape = derive { name="reshape"; version="0.8.5"; sha256="08jm9fb02g1fp9vmiqmc0yki6n3rnnp2ph1rk8n9lb5c1s390f4k"; depends=[plyr]; };
-reshape2 = derive { name="reshape2"; version="1.4.1"; sha256="0hl082dyk3pk07nqprpn5dvnrkqhnf6zjnjig1ijddxhlmsrzm7v"; depends=[plyr stringr Rcpp Rcpp]; };
-reshapeGUI = derive { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[reshape2 plyr gWidgets gWidgetsRGtk2]; };
+reshape2 = derive { name="reshape2"; version="1.4.1"; sha256="0hl082dyk3pk07nqprpn5dvnrkqhnf6zjnjig1ijddxhlmsrzm7v"; depends=[plyr Rcpp stringr]; };
+reshapeGUI = derive { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[gWidgets gWidgetsRGtk2 plyr reshape2]; };
 restimizeapi = derive { name="restimizeapi"; version="1.0.0"; sha256="1ss6fng5pmqg6cafc256g9ddz8f660c68ysxfan6mn4gdaigz7lb"; depends=[RCurl RJSONIO]; };
-restlos = derive { name="restlos"; version="0.1-3"; sha256="03bsakp9kd8i468wz7xhdjqb6ck6p9wci3gk2b2bykv73c0g6n95"; depends=[som rgl geometry igraph]; };
+restlos = derive { name="restlos"; version="0.1-3"; sha256="03bsakp9kd8i468wz7xhdjqb6ck6p9wci3gk2b2bykv73c0g6n95"; depends=[geometry igraph rgl som]; };
 restorepoint = derive { name="restorepoint"; version="0.1.5"; sha256="0xmpxprirnd1yavwk3vkc0cp715d187mn0amppya7kd47iw10wsy"; depends=[]; };
 retimes = derive { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; };
-retistruct = derive { name="retistruct"; version="0.5.10"; sha256="1wg2a906y09hcqba42hh9r2x59w35dms2aa5mw44avigc1nwm0s2"; depends=[foreign RImageJROI png ttutils sp geometry RTriangle rgl R_matlab]; };
-retrosheet = derive { name="retrosheet"; version="1.0.2"; sha256="079rfc55sy315i7zhv1a8r6drgpiglbf3b4gwyria2mfbn94a5qb"; depends=[RCurl XML data_table stringi]; };
+retistruct = derive { name="retistruct"; version="0.5.10"; sha256="1wg2a906y09hcqba42hh9r2x59w35dms2aa5mw44avigc1nwm0s2"; depends=[foreign geometry png R_matlab rgl RImageJROI RTriangle sp ttutils]; };
+retrosheet = derive { name="retrosheet"; version="1.0.2"; sha256="079rfc55sy315i7zhv1a8r6drgpiglbf3b4gwyria2mfbn94a5qb"; depends=[data_table RCurl stringi XML]; };
 reutils = derive { name="reutils"; version="0.1.2"; sha256="0f2c6zxk6x2plq649b1ml6b112j6y8ys074pn30yw35ncg3h86fa"; depends=[assertthat RCurl XML]; };
 reval = derive { name="reval"; version="2.0.0"; sha256="1yxkyc6wdp5h3cp8i42a9cf0b1cwr4nmpd7svlp7bpfxlcnqqa0d"; depends=[doParallel foreach]; };
-revealedPrefs = derive { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkjznzgwxfbnmrfiafq43cyf0i5hjy68ybxc7bbvfryxc"; depends=[Rcpp Rcpp RcppArmadillo]; };
+revealedPrefs = derive { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkjznzgwxfbnmrfiafq43cyf0i5hjy68ybxc7bbvfryxc"; depends=[Rcpp RcppArmadillo]; };
 reweight = derive { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
-rex = derive { name="rex"; version="1.0.1"; sha256="1k1s5rx3lpyh6apakaf4mw94y72zkxf14c2kj0d9njhf5j6g1sdj"; depends=[magrittr lazyeval]; };
-rexpokit = derive { name="rexpokit"; version="0.24.1"; sha256="143zi6qb0l8vbx87jf58v1zfxqmvv6x4im1knd6q4dpp9gffqs22"; depends=[SparseM Rcpp Rcpp]; };
-rfPermute = derive { name="rfPermute"; version="1.6.2"; sha256="069dhv41bwyp2nywkrr2hihyz8zialhxlyzpfpq4r9lyjnamg2k9"; depends=[ggplot2 randomForest gridExtra]; };
+rex = derive { name="rex"; version="1.0.1"; sha256="1k1s5rx3lpyh6apakaf4mw94y72zkxf14c2kj0d9njhf5j6g1sdj"; depends=[lazyeval magrittr]; };
+rexpokit = derive { name="rexpokit"; version="0.24.1"; sha256="143zi6qb0l8vbx87jf58v1zfxqmvv6x4im1knd6q4dpp9gffqs22"; depends=[Rcpp SparseM]; };
+rfPermute = derive { name="rfPermute"; version="1.7"; sha256="1nnnrbznig7hkdg9hkpw1yfvn2rbgbshjmssz1afk8c1w3q9knsi"; depends=[ggplot2 gridExtra randomForest]; };
 rfUtilities = derive { name="rfUtilities"; version="1.0-1"; sha256="0y0jn4c5dpr9drjyjg2vsgsb37s0l284hvh35zm53hs8f881ycx3"; depends=[randomForest]; };
-rfigshare = derive { name="rfigshare"; version="0.3.6"; sha256="1n6i5ppn3v93126gvva8sn85v1h4f7hgc43pxja9bwr1ypmzgr45"; depends=[RJSONIO httr httpuv plyr yaml ggplot2 XML]; };
-rfishbase = derive { name="rfishbase"; version="0.2-2"; sha256="09pa5zpw9rclf5pqj1wjjhdcblca9sm9xcs9ka3xfa7azj7n9ljd"; depends=[XML RCurl]; };
-rfisheries = derive { name="rfisheries"; version="0.1"; sha256="1g0h3icj7cikfkh76yff84hil23rfshlnnqmgvnfbhykyr2zmk61"; depends=[httr data_table assertthat ggplot2 rjson]; };
+rfigshare = derive { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; };
+rfishbase = derive { name="rfishbase"; version="0.2-2"; sha256="09pa5zpw9rclf5pqj1wjjhdcblca9sm9xcs9ka3xfa7azj7n9ljd"; depends=[RCurl XML]; };
+rfisheries = derive { name="rfisheries"; version="0.1"; sha256="1g0h3icj7cikfkh76yff84hil23rfshlnnqmgvnfbhykyr2zmk61"; depends=[assertthat data_table ggplot2 httr rjson]; };
 rfoaas = derive { name="rfoaas"; version="0.1.6"; sha256="0wfpf6k0xsjzpabyziqyllksj1p9n6ix1lnk02mkz0bzl97hnilq"; depends=[httr]; };
 rfordummies = derive { name="rfordummies"; version="0.1.1"; sha256="0k725wgba9132cfbm0ppgy476iyh9gcn6bdh9gjqab5sj3jb0iva"; depends=[]; };
-rforensicbatwing = derive { name="rforensicbatwing"; version="1.3"; sha256="0ff4v7px4wm5rd4f4z8s4arh48hgayqjfpnni2997c92wlsq3d12"; depends=[Rcpp Rcpp]; };
+rforensicbatwing = derive { name="rforensicbatwing"; version="1.3"; sha256="0ff4v7px4wm5rd4f4z8s4arh48hgayqjfpnni2997c92wlsq3d12"; depends=[Rcpp]; };
 rgabriel = derive { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; };
-rgam = derive { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp Rcpp RcppArmadillo]; };
-rgauges = derive { name="rgauges"; version="0.2.0"; sha256="0p42hh32wcjcchsalpsan52kvz6nd1gw28xnydqgfzkzcqkl22dd"; depends=[ggplot2 lubridate plyr httr reshape2 gridExtra scales data_table]; };
-rgbif = derive { name="rgbif"; version="0.8.4"; sha256="13rcqqa19w3gzab4xg006kj7m5zj4x1hbxpam8yg1r3n9dad1bjz"; depends=[XML ggplot2 httr data_table whisker magrittr jsonlite V8]; };
+rgam = derive { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp RcppArmadillo]; };
+rgauges = derive { name="rgauges"; version="0.2.0"; sha256="0p42hh32wcjcchsalpsan52kvz6nd1gw28xnydqgfzkzcqkl22dd"; depends=[data_table ggplot2 gridExtra httr lubridate plyr reshape2 scales]; };
+rgbif = derive { name="rgbif"; version="0.8.4"; sha256="13rcqqa19w3gzab4xg006kj7m5zj4x1hbxpam8yg1r3n9dad1bjz"; depends=[data_table ggplot2 httr jsonlite magrittr V8 whisker XML]; };
 rgcvpack = derive { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; };
-rgdal = derive { name="rgdal"; version="0.9-3"; sha256="011vw2pgaxgbba0a0c5ha2n0haljbn00z5km13fhgqlvhhdhzd6n"; depends=[sp sp]; };
+rgdal = derive { name="rgdal"; version="0.9-3"; sha256="011vw2pgaxgbba0a0c5ha2n0haljbn00z5km13fhgqlvhhdhzd6n"; depends=[sp]; };
 rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w8c0whcxpchsx7bwjzk1q5sfqxswclqq0g"; depends=[]; };
-rgeos = derive { name="rgeos"; version="0.3-11"; sha256="1x5fna4n5ck0wfdrplj5q5cvv289fzsmlr95q86na78lvwn14fzl"; depends=[sp sp]; };
-rgexf = derive { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[XML Rook igraph]; };
+rgeos = derive { name="rgeos"; version="0.3-11"; sha256="1x5fna4n5ck0wfdrplj5q5cvv289fzsmlr95q86na78lvwn14fzl"; depends=[sp]; };
+rgexf = derive { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; };
 rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; };
 rgl = derive { name="rgl"; version="0.95.1247"; sha256="1zmb09lljng1dmwd23w5ld8z9wr0xd0s365vz54il0ndwrqfhsi1"; depends=[]; };
-rglobi = derive { name="rglobi"; version="0.2.8"; sha256="1033cmwairf4nm9r6nvi1ddgq0j9mzchlzvj1hph0vlcbb53ybqh"; depends=[rjson RCurl]; };
+rglobi = derive { name="rglobi"; version="0.2.8"; sha256="1033cmwairf4nm9r6nvi1ddgq0j9mzchlzvj1hph0vlcbb53ybqh"; depends=[RCurl rjson]; };
 rgp = derive { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq80dy2w1hk4c80pfwrxc6n03g"; depends=[emoa]; };
-rgpui = derive { name="rgpui"; version="0.1-2"; sha256="0sh5wj4f2wj6g3r7xaq95q89n0qjavchi5kfi6sj1j34ykybbs3g"; depends=[rgp shiny emoa]; };
-rgr = derive { name="rgr"; version="1.1.11"; sha256="01hlj3nqzfsffr4k7d3iyp4mfqs1sy94d0scy64wh9kkplrzkh4i"; depends=[MASS fastICA]; };
+rgpui = derive { name="rgpui"; version="0.1-2"; sha256="0sh5wj4f2wj6g3r7xaq95q89n0qjavchi5kfi6sj1j34ykybbs3g"; depends=[emoa rgp shiny]; };
+rgr = derive { name="rgr"; version="1.1.11"; sha256="01hlj3nqzfsffr4k7d3iyp4mfqs1sy94d0scy64wh9kkplrzkh4i"; depends=[fastICA MASS]; };
 rgrass7 = derive { name="rgrass7"; version="0.1-0"; sha256="19fwf3gaq25x3imj9kc1112cf9dhafp0d1gjly2xh2gz1kam5wl6"; depends=[sp XML]; };
 rhosp = derive { name="rhosp"; version="1.06"; sha256="0kii29w292kffxablqnmgvl127jwsriz0p5y5d1xd6n8yzji79j3"; depends=[]; };
 ri = derive { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; };
 riceware = derive { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; };
-rich = derive { name="rich"; version="0.3"; sha256="122xb729xlm8gyb7b3glw4sdvrh98wh89528kcbibpx83bp3frc0"; depends=[boot vegan permute]; };
+rich = derive { name="rich"; version="0.3"; sha256="122xb729xlm8gyb7b3glw4sdvrh98wh89528kcbibpx83bp3frc0"; depends=[boot permute vegan]; };
 ridge = derive { name="ridge"; version="2.1-3"; sha256="1i5klabnv328kgy7p11nwdid2x7hzl1j80yqqshbraladszyfpwk"; depends=[]; };
 ridigbio = derive { name="ridigbio"; version="0.2.2"; sha256="065pad7pprax1mgqikjrl4nygyw5mjr80j21072zb7qcki9ag2k5"; depends=[httr jsonlite]; };
-rinat = derive { name="rinat"; version="0.1.4"; sha256="1m5k1wcinm6is3mf86314scgy3xfifz7ly7il5zgqyg9jkkpywbz"; depends=[httr plyr jsonlite ggplot2 maps]; };
+rinat = derive { name="rinat"; version="0.1.4"; sha256="1m5k1wcinm6is3mf86314scgy3xfifz7ly7il5zgqyg9jkkpywbz"; depends=[ggplot2 httr jsonlite maps plyr]; };
 rindex = derive { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; };
 ringbuffer = derive { name="ringbuffer"; version="1.1"; sha256="1jj6zdvqlkc30bnxapg0sjl5ci5kq76611smqc4jc8adzhzwrh3f"; depends=[]; };
 ringscale = derive { name="ringscale"; version="0.1.2"; sha256="1gnnapkvxmkfws8dw41gj9h3svy3h6mi4zv413aykg9vrmy7d3rp"; depends=[FITSio]; };
-rio = derive { name="rio"; version="0.2"; sha256="0v64zkxcs2bajdh9hqlhacc6msy7l3h31cvcxpj6in5hb3m1wfv3"; depends=[foreign haven openxlsx readODS jsonlite XML curl data_table readxl]; };
-rioja = derive { name="rioja"; version="0.9-5"; sha256="0bi80d8ffn1kgs0b45ia8rj057id8l3mnph16y5wc5nr8fndxrm4"; depends=[vegan mgcv lattice gdata]; };
-ripa = derive { name="ripa"; version="2.0-2"; sha256="0n1gaga0d4bb9qdlm7gksa1nwi4y28kbgwr3icwqgihf1bfb9m81"; depends=[Rcpp Rcpp]; };
-riskRegression = derive { name="riskRegression"; version="1.1.1"; sha256="1qjy2wmbfalbxszjfplisqrdca0n0yccr0wvdf1kbzxblba82mx6"; depends=[prodlim rms pec cmprsk survival randomForestSRC]; };
+rio = derive { name="rio"; version="0.2"; sha256="0v64zkxcs2bajdh9hqlhacc6msy7l3h31cvcxpj6in5hb3m1wfv3"; depends=[curl data_table foreign haven jsonlite openxlsx readODS readxl XML]; };
+rioja = derive { name="rioja"; version="0.9-5"; sha256="0bi80d8ffn1kgs0b45ia8rj057id8l3mnph16y5wc5nr8fndxrm4"; depends=[gdata lattice mgcv vegan]; };
+ripa = derive { name="ripa"; version="2.0-2"; sha256="0n1gaga0d4bb9qdlm7gksa1nwi4y28kbgwr3icwqgihf1bfb9m81"; depends=[Rcpp]; };
+riskRegression = derive { name="riskRegression"; version="1.1.1"; sha256="1qjy2wmbfalbxszjfplisqrdca0n0yccr0wvdf1kbzxblba82mx6"; depends=[cmprsk pec prodlim randomForestSRC rms survival]; };
 riskSimul = derive { name="riskSimul"; version="0.1"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; };
-risksetROC = derive { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[survival MASS]; };
-rite = derive { name="rite"; version="0.3.4"; sha256="196ashcfj5p52qpnpnrkg7vxq87v7vhf1d7z40mk134gmxk2784j"; depends=[tcltk2 RCurl knitr markdown]; };
-riv = derive { name="riv"; version="2.0-4"; sha256="1c9k62plqgxcgcm2j1s26hqvgww96n6bfjz2yk7m3p2wf8gkkyam"; depends=[MASS rrcov quantreg]; };
+risksetROC = derive { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[MASS survival]; };
+rite = derive { name="rite"; version="0.3.4"; sha256="196ashcfj5p52qpnpnrkg7vxq87v7vhf1d7z40mk134gmxk2784j"; depends=[knitr markdown RCurl tcltk2]; };
+riv = derive { name="riv"; version="2.0-4"; sha256="1c9k62plqgxcgcm2j1s26hqvgww96n6bfjz2yk7m3p2wf8gkkyam"; depends=[MASS quantreg rrcov]; };
 rivernet = derive { name="rivernet"; version="1.0"; sha256="0za5k00k9vivpq4wr1xqc4aw7mlcxhjj2b3iiip1qy13fg7bhbjm"; depends=[]; };
 riverplot = derive { name="riverplot"; version="0.3"; sha256="1x02ci6744k3lsqh53vmpmv957b5wwr1idvn16nzixvzknixryq8"; depends=[]; };
 rivervis = derive { name="rivervis"; version="0.46.0"; sha256="19jsl5g46jcbc0kg47bsif1wrw9z9brgvwdcxqjc89shnx3hzzfv"; depends=[]; };
-rivr = derive { name="rivr"; version="0.9.2"; sha256="1xz7l7j8adhlzdasx9ljrh8z6cx017pl6761z8q4ixpcgr3vf5ws"; depends=[Rcpp reshape2 Rcpp]; };
+rivr = derive { name="rivr"; version="0.9.2"; sha256="1xz7l7j8adhlzdasx9ljrh8z6cx017pl6761z8q4ixpcgr3vf5ws"; depends=[Rcpp reshape2]; };
 rjade = derive { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; };
 rjags = derive { name="rjags"; version="3-15"; sha256="02nmaqv0xddh7bgrlwrr30gb10mcz2f5lilbyzfw6wpjgi2aihx5"; depends=[coda]; };
 rje = derive { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; };
 rjson = derive { name="rjson"; version="0.2.15"; sha256="1vzjyvf57k1fjizlk28rby65y5lsww5qnfvgnhln74qwda7hvl3p"; depends=[]; };
-rjstat = derive { name="rjstat"; version="0.2.1"; sha256="0chb3mypmgqz7wncl01yy93xpz1mmlcc6x1cib37zxc8dy79jm1s"; depends=[jsonlite assertthat]; };
-rkafka = derive { name="rkafka"; version="1.0"; sha256="02h3nlffgd48xm38i2arlrgbilraf6r7k65s35906v33i0kjzrgg"; depends=[rJava RUnit rkafkajars]; };
+rjstat = derive { name="rjstat"; version="0.2.1"; sha256="0chb3mypmgqz7wncl01yy93xpz1mmlcc6x1cib37zxc8dy79jm1s"; depends=[assertthat jsonlite]; };
+rkafka = derive { name="rkafka"; version="1.0"; sha256="02h3nlffgd48xm38i2arlrgbilraf6r7k65s35906v33i0kjzrgg"; depends=[rJava rkafkajars RUnit]; };
 rkafkajars = derive { name="rkafkajars"; version="1.0"; sha256="0ss9gjjq92hba6nkhnda0pbm3a5bqm00hy0zbj4kivg5dlsf30q0"; depends=[rJava RUnit]; };
 rknn = derive { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjzb4jzghzd3whgjvm2rsmnabai95"; depends=[gmp]; };
 rkt = derive { name="rkt"; version="1.4"; sha256="01c8fwnml1n0sw5lw9p2nz15i1zhxirr0kh39qvjmdiw97c1v1yq"; depends=[]; };
-rkvo = derive { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp Rcpp]; };
+rkvo = derive { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; };
 rlecuyer = derive { name="rlecuyer"; version="0.3-3"; sha256="1n0vny3k5s5152y0ggz9vfn4bqay9ncbdzkw9g4703pszrbwq7xh"; depends=[]; };
-rlist = derive { name="rlist"; version="0.4"; sha256="00h00jka64m7skrjp1454805fhr3q1k9sqih4pnvbb0maxlzgn7g"; depends=[yaml jsonlite]; };
+rlist = derive { name="rlist"; version="0.4"; sha256="00h00jka64m7skrjp1454805fhr3q1k9sqih4pnvbb0maxlzgn7g"; depends=[jsonlite yaml]; };
 rlm = derive { name="rlm"; version="1.1"; sha256="147hn780hjbp8ly3mc5q05g36b080ndq0z0r0vq75c2qfkhybvdc"; depends=[]; };
-rlme = derive { name="rlme"; version="0.4"; sha256="02683sklihj3726a90jryybf855rvbz9v3dm9z9yhb32q9bfmy34"; depends=[MASS quantreg nlme mgcv stringr magic robustbase Rcpp Rcpp]; };
+rlme = derive { name="rlme"; version="0.4"; sha256="02683sklihj3726a90jryybf855rvbz9v3dm9z9yhb32q9bfmy34"; depends=[magic MASS mgcv nlme quantreg Rcpp robustbase stringr]; };
 rmaf = derive { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; };
-rmarkdown = derive { name="rmarkdown"; version="0.6.1"; sha256="1j6hz7ybyvqzd5zdshb9z1v5y5gfgdlcvzacx06c5kgf8h6i0k3h"; depends=[knitr yaml htmltools caTools]; };
-rmatio = derive { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j46g4dgjy9q1c647rqd9i14hvfrpxzcfa"; depends=[Matrix lattice]; };
+rmarkdown = derive { name="rmarkdown"; version="0.7"; sha256="19vp2kipzw073llgvnqwdaarqf1ny33803gp4rf3lhyyp7y508cg"; depends=[caTools htmltools knitr yaml]; };
+rmatio = derive { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j46g4dgjy9q1c647rqd9i14hvfrpxzcfa"; depends=[lattice Matrix]; };
 rmeta = derive { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; };
-rmetasim = derive { name="rmetasim"; version="2.0.4"; sha256="1a3bhiybzdvgqnnyh3d31d6vdsp4mi33sv8ks9b9xd9r369npk86"; depends=[ape ade4 gtools]; };
-rmgarch = derive { name="rmgarch"; version="1.2-8"; sha256="19q35kzyzzs19b4xgslrnl8ihlx1wlmrwfdimnq8racfx0y46lm5"; depends=[rugarch Rsolnp MASS Matrix zoo xts Bessel ff shape pcaPP spd Rcpp Rcpp RcppArmadillo]; };
-rminer = derive { name="rminer"; version="1.4"; sha256="07s971fpl16l4ryrbb24zwy1xx6dwia1ms4hrcpnpz3kb8f6ydda"; depends=[kknn plotrix lattice nnet pls MASS mda rpart randomForest adabag party Cubist kernlab e1071]; };
+rmetasim = derive { name="rmetasim"; version="2.0.4"; sha256="1a3bhiybzdvgqnnyh3d31d6vdsp4mi33sv8ks9b9xd9r369npk86"; depends=[ade4 ape gtools]; };
+rmgarch = derive { name="rmgarch"; version="1.2-8"; sha256="19q35kzyzzs19b4xgslrnl8ihlx1wlmrwfdimnq8racfx0y46lm5"; depends=[Bessel ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; };
+rminer = derive { name="rminer"; version="1.4"; sha256="07s971fpl16l4ryrbb24zwy1xx6dwia1ms4hrcpnpz3kb8f6ydda"; depends=[adabag Cubist e1071 kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart]; };
 rmngb = derive { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; };
 rmongodb = derive { name="rmongodb"; version="1.8.0"; sha256="035a76ak6wi21hdvgzzbggz0qnb53rrr2wfx97ngc8ijwhw8hjh7"; depends=[jsonlite plyr]; };
 rmp = derive { name="rmp"; version="1.0"; sha256="1g0785fwjbwbj82sir3n7sg3idsjzdhrpxc7z88339cv9g4rl7ry"; depends=[]; };
-rms = derive { name="rms"; version="4.3-1"; sha256="07198lzk3yzl9vnqcfxqgp5kpb50s1ydg33m883rcr3a5pd9m094"; depends=[Hmisc survival lattice ggplot2 SparseM quantreg nlme rpart polspline multcomp]; };
+rms = derive { name="rms"; version="4.3-1"; sha256="07198lzk3yzl9vnqcfxqgp5kpb50s1ydg33m883rcr3a5pd9m094"; depends=[ggplot2 Hmisc lattice multcomp nlme polspline quantreg rpart SparseM survival]; };
 rms_gof = derive { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; };
 rnaseqWrapper = derive { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; };
 rnbn = derive { name="rnbn"; version="1.0.3"; sha256="05amrx12b7p4pca1wbysn1n2rxbg5r54mpmga4i3xlpijx9baj80"; depends=[httr]; };
-rncl = derive { name="rncl"; version="0.2.2"; sha256="1l9g7mylj4ip15x4985i27n42fhi9vyi1ii23dc9k27s84b274y7"; depends=[Rcpp ape Rcpp]; };
+rncl = derive { name="rncl"; version="0.2.2"; sha256="1l9g7mylj4ip15x4985i27n42fhi9vyi1ii23dc9k27s84b274y7"; depends=[ape Rcpp]; };
 rneos = derive { name="rneos"; version="0.2-8"; sha256="0cg88l1irqkx7d72sa5bfqcn5fb5rapvimi1gw15klci39w0s43q"; depends=[RCurl XML]; };
 rngSetSeed = derive { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqkf1kz16gipsf98q62vmhx9v8140qs7c4ljbhc3a"; depends=[]; };
 rngWELL = derive { name="rngWELL"; version="0.10-3"; sha256="1wijscc0s6h1ipc1r8h179y94s1bzf409xlpiyr1njaxvvvpwvw1"; depends=[]; };
-rngtools = derive { name="rngtools"; version="1.2.4"; sha256="1fcgfqrrb48z37xgy8sffx91p9irp39yqzxv7nqp1x2hnwsrh097"; depends=[pkgmaker stringr digest]; };
+rngtools = derive { name="rngtools"; version="1.2.4"; sha256="1fcgfqrrb48z37xgy8sffx91p9irp39yqzxv7nqp1x2hnwsrh097"; depends=[digest pkgmaker stringr]; };
 rngwell19937 = derive { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; };
-rnoaa = derive { name="rnoaa"; version="0.3.3"; sha256="12iwyl0nr6d8xpl5vcqwli4rlh79y8l13sfj34457klqdzmrg126"; depends=[httr lubridate plyr ggplot2 scales sp RCurl rgdal rgeos maptools stringr XML data_table jsonlite digest]; };
-rnrfa = derive { name="rnrfa"; version="0.1.5"; sha256="0lpa0gmf9j9adq0p41jgayzcwg6220bihnsfqj55d217mfalbhnd"; depends=[XML2R RCurl zoo rjson rgdal sp stringr]; };
-robCompositions = derive { name="robCompositions"; version="1.9.1"; sha256="1n8mbm62ywp1wnccv85ydm91bzp05i4fjvyriid8751pcb4zndn9"; depends=[robustbase rrcov GGally MASS pls sROC]; };
+rnoaa = derive { name="rnoaa"; version="0.3.3"; sha256="12iwyl0nr6d8xpl5vcqwli4rlh79y8l13sfj34457klqdzmrg126"; depends=[data_table digest ggplot2 httr jsonlite lubridate maptools plyr RCurl rgdal rgeos scales sp stringr XML]; };
+rnrfa = derive { name="rnrfa"; version="0.1.5"; sha256="0lpa0gmf9j9adq0p41jgayzcwg6220bihnsfqj55d217mfalbhnd"; depends=[RCurl rgdal rjson sp stringr XML2R zoo]; };
+robCompositions = derive { name="robCompositions"; version="1.9.1"; sha256="1n8mbm62ywp1wnccv85ydm91bzp05i4fjvyriid8751pcb4zndn9"; depends=[GGally MASS pls robustbase rrcov sROC]; };
 robcor = derive { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; };
 robeth = derive { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; };
-robfilter = derive { name="robfilter"; version="4.1"; sha256="161rsqyy2gq1n6ysz0l4d4gqvxhs72hznc2d5hljxdaz3sbdzzig"; depends=[robustbase MASS lattice]; };
+robfilter = derive { name="robfilter"; version="4.1"; sha256="161rsqyy2gq1n6ysz0l4d4gqvxhs72hznc2d5hljxdaz3sbdzzig"; depends=[lattice MASS robustbase]; };
 robumeta = derive { name="robumeta"; version="1.6"; sha256="13hwbl4pym3pkxxfbffhv22nn3f4spc6lb4gz1wxi9iha1s9ywi5"; depends=[]; };
-robust = derive { name="robust"; version="0.4-16"; sha256="0psai9d6w7yi0wfm57cc7b2jd5i7wbk2xagrhnvhxknw0dwzf2jh"; depends=[fit_models MASS lattice robustbase rrcov]; };
+robust = derive { name="robust"; version="0.4-16"; sha256="0psai9d6w7yi0wfm57cc7b2jd5i7wbk2xagrhnvhxknw0dwzf2jh"; depends=[fit_models lattice MASS robustbase rrcov]; };
 robustDA = derive { name="robustDA"; version="1.1"; sha256="1yys6adkyms5r4sw887y78gnh97qqr7sbi5lxv5l9bnc4ggcfiz6"; depends=[MASS mclust Rsolnp]; };
-robustHD = derive { name="robustHD"; version="0.5.0"; sha256="14ql2k5880lbwkv1acydrli6jyh6dls32jjhimbz82zzkzfk2cxr"; depends=[ggplot2 perry robustbase MASS Rcpp RcppArmadillo]; };
+robustHD = derive { name="robustHD"; version="0.5.0"; sha256="14ql2k5880lbwkv1acydrli6jyh6dls32jjhimbz82zzkzfk2cxr"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; };
 robustX = derive { name="robustX"; version="1.1-4"; sha256="1s2aav2jr22dgrl7xzk09yn9909k76kpiz271w5r1id6hpfprjwc"; depends=[robustbase]; };
 robustbase = derive { name="robustbase"; version="0.92-4"; sha256="0dyz2wwfjq8bjjwi4fhm6v3sxmlh34bawppakl4l6dv7vpjsv85k"; depends=[DEoptimR]; };
 robustfa = derive { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; };
-robustgam = derive { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[Rcpp RcppArmadillo mgcv robustbase Rcpp RcppArmadillo]; };
-robustlmm = derive { name="robustlmm"; version="1.7-2"; sha256="0cwr5fsl3m78xvfv3cy6n82zsdwsyq2zrlnzdppba9ja6hnh32wm"; depends=[lme4 Matrix ggplot2 lattice nlme robustbase xtable]; };
+robustgam = derive { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[mgcv Rcpp RcppArmadillo robustbase]; };
+robustlmm = derive { name="robustlmm"; version="1.7-2"; sha256="0cwr5fsl3m78xvfv3cy6n82zsdwsyq2zrlnzdppba9ja6hnh32wm"; depends=[ggplot2 lattice lme4 Matrix nlme robustbase xtable]; };
 robustloggamma = derive { name="robustloggamma"; version="0.4-31"; sha256="19ycdvpzns46gjnkddwznnszs0941blpss7l0cqligv91cz7bkjc"; depends=[robustbase]; };
-robustreg = derive { name="robustreg"; version="0.1-7"; sha256="1nrz10065mwccil78c74vmkhinskpnk1vyp1ikrdw23vyk2l00nc"; depends=[Rcpp Matrix Rcpp RcppArmadillo]; };
-robustvarComp = derive { name="robustvarComp"; version="0.1-2"; sha256="187mcpih509hx15wjjr7z2h6h76mz2v0d8xgsxjd8wz7l3dnlp2f"; depends=[robustbase GSE numDeriv robust plyr]; };
+robustreg = derive { name="robustreg"; version="0.1-7"; sha256="1nrz10065mwccil78c74vmkhinskpnk1vyp1ikrdw23vyk2l00nc"; depends=[Matrix Rcpp RcppArmadillo]; };
+robustvarComp = derive { name="robustvarComp"; version="0.1-2"; sha256="187mcpih509hx15wjjr7z2h6h76mz2v0d8xgsxjd8wz7l3dnlp2f"; depends=[GSE numDeriv plyr robust robustbase]; };
 rocc = derive { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; };
-rockchalk = derive { name="rockchalk"; version="1.8.92"; sha256="1mi1w8323m4q0s17cnafnlswgnlxqb5c9nq3rv8fq77k7klmq5rz"; depends=[lme4 car MASS tables]; };
-rococo = derive { name="rococo"; version="1.1.2"; sha256="08204y3g3xd2srpcpnbkq1laqfr3wrhy73whlxf83gffw8j0iyv8"; depends=[Rcpp Rcpp]; };
-rodd = derive { name="rodd"; version="0.1-1"; sha256="0x7w7v04nqb1gl4h32a674gwc68h6p9pff2piisyd74cgx90sm1b"; depends=[numDeriv quadprog Matrix rootSolve matrixcalc]; };
+rockchalk = derive { name="rockchalk"; version="1.8.92"; sha256="1mi1w8323m4q0s17cnafnlswgnlxqb5c9nq3rv8fq77k7klmq5rz"; depends=[car lme4 MASS tables]; };
+rococo = derive { name="rococo"; version="1.1.2"; sha256="08204y3g3xd2srpcpnbkq1laqfr3wrhy73whlxf83gffw8j0iyv8"; depends=[Rcpp]; };
+rodd = derive { name="rodd"; version="0.1-1"; sha256="0x7w7v04nqb1gl4h32a674gwc68h6p9pff2piisyd74cgx90sm1b"; depends=[Matrix matrixcalc numDeriv quadprog rootSolve]; };
 rootSolve = derive { name="rootSolve"; version="1.6.5.1"; sha256="02ydj4ydgljs80nrrrxb4dhfa7m12rw65xy79d7g71w97326w8p2"; depends=[]; };
-ropensecretsapi = derive { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RJSONIO RCurl]; };
-ror = derive { name="ror"; version="1.2"; sha256="0n8mk35rm3rp0c7a3i961kij21a177znh9hkq4snqqlw9vf50hdg"; depends=[rJava ROI ROI_plugin_glpk igraph]; };
-rorutadis = derive { name="rorutadis"; version="0.1.3"; sha256="0ik0dpmsyb4g9wl1fb7mm0dry9s26nfvv1v91cslss82phhf16wd"; depends=[Rglpk ggplot2 gridExtra]; };
+ropensecretsapi = derive { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RCurl RJSONIO]; };
+ror = derive { name="ror"; version="1.2"; sha256="0n8mk35rm3rp0c7a3i961kij21a177znh9hkq4snqqlw9vf50hdg"; depends=[igraph rJava ROI ROI_plugin_glpk]; };
+rorutadis = derive { name="rorutadis"; version="0.1.3"; sha256="0ik0dpmsyb4g9wl1fb7mm0dry9s26nfvv1v91cslss82phhf16wd"; depends=[ggplot2 gridExtra Rglpk]; };
 rotationForest = derive { name="rotationForest"; version="0.1"; sha256="07my0i84jvmjxvg2ifvsrbc0r5z4s32xi0vfdwrkhhdzdn87h527"; depends=[rpart]; };
-rotations = derive { name="rotations"; version="1.3"; sha256="01qqiqlp370llk8w9g0nip08cd54rj9dsvf0qxznalyb7vpnvgxf"; depends=[ggplot2 Rcpp rgl sphereplot Rcpp RcppArmadillo]; };
-roughrf = derive { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[randomForest mice nnet]; };
+rotations = derive { name="rotations"; version="1.3"; sha256="01qqiqlp370llk8w9g0nip08cd54rj9dsvf0qxznalyb7vpnvgxf"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; };
+roughrf = derive { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[mice nnet randomForest]; };
 rowr = derive { name="rowr"; version="1.1.2"; sha256="1hvj17n3fy1jaaz551s1icjv1kgr2s22xvg4fllzs8hpgdsybp1j"; depends=[]; };
-roxygen2 = derive { name="roxygen2"; version="4.1.1"; sha256="0qr562p3jb9kqim6mj344956pikmq1137gv1p086b4k90h5c3wyd"; depends=[stringr brew digest Rcpp Rcpp]; };
-royston = derive { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[nortest moments]; };
+roxygen2 = derive { name="roxygen2"; version="4.1.1"; sha256="0qr562p3jb9kqim6mj344956pikmq1137gv1p086b4k90h5c3wyd"; depends=[brew digest Rcpp stringr]; };
+royston = derive { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; };
 rpanel = derive { name="rpanel"; version="1.1-3"; sha256="1wm0dcbyvxz4ily8skz2yda44n74x2nmc4pg11ja0yvk038gjfns"; depends=[]; };
 rpart = derive { name="rpart"; version="4.1-9"; sha256="108zsalgmp4mj66m2mxr56qrh3yz0pxfij81gri224r5brypqak1"; depends=[]; };
 rpart_plot = derive { name="rpart.plot"; version="1.5.2"; sha256="0aw0bhd0bliih7fsvnfkdkxq65v3v3fl88irp8vxrdblqgjyc09x"; depends=[rpart]; };
@@ -5771,104 +5791,104 @@ rpart_utils = derive { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7q
 rpartScore = derive { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; };
 rpartitions = derive { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; };
 rpf = derive { name="rpf"; version="0.45"; sha256="1d22wjhv14rl16kljn42j4hba30x28zd5svddrpxp1kraxjq5mn7"; depends=[mvtnorm RcppEigen]; };
-rpg = derive { name="rpg"; version="1.4"; sha256="0sisn5l1qxlqg6jq4lzr7w3axkaw5jlpz8vl9gp2hs0spxsjhcyn"; depends=[Rcpp uuid RApiSerialize Rcpp RApiSerialize]; };
+rpg = derive { name="rpg"; version="1.4"; sha256="0sisn5l1qxlqg6jq4lzr7w3axkaw5jlpz8vl9gp2hs0spxsjhcyn"; depends=[RApiSerialize Rcpp uuid]; };
 rphast = derive { name="rphast"; version="1.6"; sha256="0ni8969bj3pv0wl8l0v352pqw2d5mlshsdw1rb6wlxk7qzfi5cl2"; depends=[]; };
-rplexos = derive { name="rplexos"; version="1.1.1"; sha256="1s3srk5f1ciy43vblwsy7wrwp2k2j5q52dfl4vjg69i63bh9yrpf"; depends=[Rcpp dplyr RSQLite DBI data_table tidyr lubridate stringi doParallel foreach Rcpp]; };
-rplos = derive { name="rplos"; version="0.4.7"; sha256="0d6p6cgjmfv615mpvp6vxm92gxfdi6fn4mp0ixhj2gkm1hmpwwc5"; depends=[ggplot2 httr jsonlite XML dplyr plyr lubridate reshape2 whisker solr]; };
+rplexos = derive { name="rplexos"; version="1.1.1"; sha256="1s3srk5f1ciy43vblwsy7wrwp2k2j5q52dfl4vjg69i63bh9yrpf"; depends=[data_table DBI doParallel dplyr foreach lubridate Rcpp RSQLite stringi tidyr]; };
+rplos = derive { name="rplos"; version="0.4.7"; sha256="0d6p6cgjmfv615mpvp6vxm92gxfdi6fn4mp0ixhj2gkm1hmpwwc5"; depends=[dplyr ggplot2 httr jsonlite lubridate plyr reshape2 solr whisker XML]; };
 rplotengine = derive { name="rplotengine"; version="1.0-5"; sha256="1wwpfnr5vi8z26alm8y5gply0y4iniagimldzy2z696djzz8p8p8"; depends=[xtable]; };
 rportfolios = derive { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; };
-rprime = derive { name="rprime"; version="0.1.0"; sha256="1v6n1qi0i7x8xgizbyvp1mnwc316lsan4rvam44fgjj45fcd79gd"; depends=[stringr stringi plyr assertthat]; };
+rprime = derive { name="rprime"; version="0.1.0"; sha256="1v6n1qi0i7x8xgizbyvp1mnwc316lsan4rvam44fgjj45fcd79gd"; depends=[assertthat plyr stringi stringr]; };
 rprintf = derive { name="rprintf"; version="0.1-2"; sha256="1jsn6i3ikcdbrg8g89hmb1ky3a84fykx5gpnbswplhidh2qhb9jz"; depends=[stringr]; };
 rpsychi = derive { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; };
-rpubchem = derive { name="rpubchem"; version="1.5.0.2"; sha256="0lvi7m8jb2izsfia3c0qigsd1k1x9r02gymlwfg29pb8k10lwcjf"; depends=[XML car RCurl RJSONIO]; };
+rpubchem = derive { name="rpubchem"; version="1.5.0.2"; sha256="0lvi7m8jb2izsfia3c0qigsd1k1x9r02gymlwfg29pb8k10lwcjf"; depends=[car RCurl RJSONIO XML]; };
 rpud = derive { name="rpud"; version="0.0.2"; sha256="03xddc6kh39wlcv8dvpnv4h0f5qx5cv327xip26zk7gg7pgrn05x"; depends=[]; };
 rqPen = derive { name="rqPen"; version="1.1"; sha256="0da6pbzx2my052v8s9nyw0j5ljy4pfigyy82n72zp0jzhdzmq479"; depends=[quantreg]; };
-rr = derive { name="rr"; version="1.3"; sha256="00m5h01j3qb83s7bcjp4xx6pf16hjjhl0qryb929cnxn1ln0ddns"; depends=[MASS arm coda]; };
+rr = derive { name="rr"; version="1.3"; sha256="00m5h01j3qb83s7bcjp4xx6pf16hjjhl0qryb929cnxn1ln0ddns"; depends=[arm coda MASS]; };
 rrBLUP = derive { name="rrBLUP"; version="4.3"; sha256="0wydh4sx7b6rcrgb3qvqh0z46pixx63711q2nf8s3c32090a5g81"; depends=[]; };
 rrBlupMethod6 = derive { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; };
-rrcov = derive { name="rrcov"; version="1.3-8"; sha256="0f71khnsvd95yh6y1hnl62vqjp1z3wg74g8jvg2q28v1ysk68p1b"; depends=[robustbase mvtnorm lattice cluster pcaPP]; };
-rrcovHD = derive { name="rrcovHD"; version="0.2-3"; sha256="18k5c590wbi0kmx4nl1mkv7h6339as0s4jcr9am8v9v3w4pn0xni"; depends=[rrcov robustbase pls spls pcaPP]; };
-rrcovNA = derive { name="rrcovNA"; version="0.4-7"; sha256="1b3ffcs1szwswsayz8q3w87wndd7xbcg5rqamhjr2damgialx3bq"; depends=[rrcov robustbase lattice cluster norm]; };
+rrcov = derive { name="rrcov"; version="1.3-8"; sha256="0f71khnsvd95yh6y1hnl62vqjp1z3wg74g8jvg2q28v1ysk68p1b"; depends=[cluster lattice mvtnorm pcaPP robustbase]; };
+rrcovHD = derive { name="rrcovHD"; version="0.2-3"; sha256="18k5c590wbi0kmx4nl1mkv7h6339as0s4jcr9am8v9v3w4pn0xni"; depends=[pcaPP pls robustbase rrcov spls]; };
+rrcovNA = derive { name="rrcovNA"; version="0.4-7"; sha256="1b3ffcs1szwswsayz8q3w87wndd7xbcg5rqamhjr2damgialx3bq"; depends=[cluster lattice norm robustbase rrcov]; };
 rredis = derive { name="rredis"; version="1.6.9"; sha256="00fgrhyj6bai0kc18c2m1fsk9ja5c9q7m6dpsb8wsn4gs79mw3sc"; depends=[]; };
-rriskDistributions = derive { name="rriskDistributions"; version="2.1"; sha256="1sc0bj5sivclbq0grif99vclnlhg1k9dz4xdvng6vv392xkwbmfd"; depends=[mc2d eha msm tkrplot]; };
-rrlda = derive { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[pcaPP mvoutlier glasso matrixcalc]; };
+rriskDistributions = derive { name="rriskDistributions"; version="2.1"; sha256="1sc0bj5sivclbq0grif99vclnlhg1k9dz4xdvng6vv392xkwbmfd"; depends=[eha mc2d msm tkrplot]; };
+rrlda = derive { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[glasso matrixcalc mvoutlier pcaPP]; };
 rrules = derive { name="rrules"; version="0.1-0"; sha256="0f9msp289akzricjrm8dvfbh2dihfbszr7ms4fld1cr30zssajin"; depends=[]; };
 rsae = derive { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; };
 rsatscan = derive { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; };
 rscala = derive { name="rscala"; version="1.0.6"; sha256="065ll2xza09hi05w4hq35jl6y1nvwrv93ld983nxaji81z9pfgzx"; depends=[]; };
 rscproxy = derive { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; };
 rsdepth = derive { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
-rsdmx = derive { name="rsdmx"; version="0.4-6"; sha256="0hsf0jkp31qfvl4pxaqxwz1fvwgmqld3rnbk9g29g5bqwld40syc"; depends=[XML RCurl plyr]; };
+rsdmx = derive { name="rsdmx"; version="0.4-6"; sha256="0hsf0jkp31qfvl4pxaqxwz1fvwgmqld3rnbk9g29g5bqwld40syc"; depends=[plyr RCurl XML]; };
 rseedcalc = derive { name="rseedcalc"; version="1.2"; sha256="1di9bzwxyxm9gs14ks9z6sixi656hz9xwmq3aaqh53cjjr1ka0rc"; depends=[]; };
-rsem = derive { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[MASS lavaan]; };
-rsgcc = derive { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene stringr snowfall]; };
-rsig = derive { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k6xyiwrhw08vhzz6mf3jxlqsh"; depends=[survival BBmisc glmnet superpc Matrix]; };
+rsem = derive { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[lavaan MASS]; };
+rsgcc = derive { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; };
+rsig = derive { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k6xyiwrhw08vhzz6mf3jxlqsh"; depends=[BBmisc glmnet Matrix superpc survcomp survival]; };
 rsm = derive { name="rsm"; version="2.7-2"; sha256="0pn018n36h1xhhlsimggbfgfgl9nh5a49x8amkqy3drrnamjl577"; depends=[]; };
-rsml = derive { name="rsml"; version="1.2"; sha256="1w9bqs32sn5ry5qjgnqnns56ylr59cq5kczjsssw3yvc8a8lr39x"; depends=[XML rgl]; };
-rsnps = derive { name="rsnps"; version="0.1.6"; sha256="1pqdmg1cwpm0cvr5ma7gzni88iq5kqv1w40v8iil3xvcmns8msjk"; depends=[plyr stringr httr RCurl XML jsonlite]; };
+rsml = derive { name="rsml"; version="1.2"; sha256="1w9bqs32sn5ry5qjgnqnns56ylr59cq5kczjsssw3yvc8a8lr39x"; depends=[rgl XML]; };
+rsnps = derive { name="rsnps"; version="0.1.6"; sha256="1pqdmg1cwpm0cvr5ma7gzni88iq5kqv1w40v8iil3xvcmns8msjk"; depends=[httr jsonlite plyr RCurl stringr XML]; };
 rspa = derive { name="rspa"; version="0.1-7"; sha256="0hmdfj1cgy9fjfbrs8qvx79fkv5v1xr6vrwjp89lq0blhsnzn5k2"; depends=[editrules]; };
 rspear = derive { name="rspear"; version="0.1-2"; sha256="1rjg84plnvlcp3p2929f1afl43lb92d3bfsvlhsaw92z7iva1vad"; depends=[plyr]; };
 rstackdeque = derive { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; };
 rstiefel = derive { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9ldd7aihlhl3wndg4i4b3wy6rrrjkficrl1"; depends=[]; };
 rstream = derive { name="rstream"; version="1.3.2"; sha256="1habswhdlx7l92s9p9554px4kf9f9mhk5vkdq2fv4wk3381c0fgi"; depends=[]; };
 rstudioapi = derive { name="rstudioapi"; version="0.3.1"; sha256="0q7671d924nzqsqhs8d9p7l907bcam56wjwm7vvz44xgj0saj8bs"; depends=[]; };
-rsubgroup = derive { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[rJava foreign]; };
-rsunlight = derive { name="rsunlight"; version="0.3.0"; sha256="148byg8180657ny01xny28sdawbq87hf89f8c1rzfjl5qwcxmbqd"; depends=[httr plyr jsonlite stringr assertthat]; };
-rtable = derive { name="rtable"; version="0.1.0"; sha256="1jp7bd782ply2xb8p8xnmrds2w62bp7l2v4vlvbv1468kxhlfgf2"; depends=[xtable ReporteRs knitr tidyr shiny]; };
+rsubgroup = derive { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[foreign rJava]; };
+rsunlight = derive { name="rsunlight"; version="0.3.0"; sha256="148byg8180657ny01xny28sdawbq87hf89f8c1rzfjl5qwcxmbqd"; depends=[assertthat httr jsonlite plyr stringr]; };
+rtable = derive { name="rtable"; version="0.1.0"; sha256="1jp7bd782ply2xb8p8xnmrds2w62bp7l2v4vlvbv1468kxhlfgf2"; depends=[knitr ReporteRs shiny tidyr xtable]; };
 rtape = derive { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; };
-rtdists = derive { name="rtdists"; version="0.2-6"; sha256="1f2yv4qq27i1fc0ys3kk31lsnbdzrmrk44widnxd19hxn4r05cs6"; depends=[evd msm gsl]; };
-rtematres = derive { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[XML RCurl plyr gdata]; };
-rtf = derive { name="rtf"; version="0.4-11"; sha256="04z0s5l9qjlbqahmqdaqv7mkqavsz4yz25swahh99xfwp9plknfl"; depends=[R_oo R_methodsS3]; };
+rtdists = derive { name="rtdists"; version="0.2-6"; sha256="1f2yv4qq27i1fc0ys3kk31lsnbdzrmrk44widnxd19hxn4r05cs6"; depends=[evd gsl msm]; };
+rtematres = derive { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[gdata plyr RCurl XML]; };
+rtf = derive { name="rtf"; version="0.4-11"; sha256="04z0s5l9qjlbqahmqdaqv7mkqavsz4yz25swahh99xfwp9plknfl"; depends=[R_methodsS3 R_oo]; };
 rtfbs = derive { name="rtfbs"; version="0.3.4"; sha256="1z5rhxgi44xdv07g3l18ricxdmp1p59jl8fxawrh5jr83qpcxsks"; depends=[rphast]; };
 rtiff = derive { name="rtiff"; version="1.4.4"; sha256="13cz35dfz735yk2lci8cmjmsg4ddm31lv98lpx8ymy3bwmzdmc3c"; depends=[pixmap]; };
-rtkpp = derive { name="rtkpp"; version="0.8.6"; sha256="0alg3002q8mcqd55prmsa6hfwg0qfrv30aq5p85v094l8cl7qd8l"; depends=[Rcpp Rcpp]; };
-rtop = derive { name="rtop"; version="0.3-45"; sha256="0dh7jlnakk1hd27swspa0fj6pq6yddxhz32w3d7xq8jgr7xm8d70"; depends=[sp gstat]; };
+rtkpp = derive { name="rtkpp"; version="0.8.6"; sha256="0alg3002q8mcqd55prmsa6hfwg0qfrv30aq5p85v094l8cl7qd8l"; depends=[Rcpp]; };
+rtop = derive { name="rtop"; version="0.3-45"; sha256="0dh7jlnakk1hd27swspa0fj6pq6yddxhz32w3d7xq8jgr7xm8d70"; depends=[gstat sp]; };
 rts = derive { name="rts"; version="1.0-3"; sha256="0jqk0p2q1vx9l6zf9pbc5k3lsw4hg5x1r6p0f7wjiks50x55pbl4"; depends=[raster xts zoo]; };
 rtype = derive { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; };
 rucm = derive { name="rucm"; version="0.4"; sha256="1s3q6wfp9nb50rqsaq6h2wb48qvxncmlf8l4gm18pr25wkangfxq"; depends=[KFAS]; };
-rugarch = derive { name="rugarch"; version="1.3-4"; sha256="1za92hqfaws8azf2zml1q8mlbirrdw3rb4rvwg6sclfx7z7gsqkh"; depends=[Rsolnp nloptr ks numDeriv spd xts zoo chron SkewHyperbolic expm Rcpp Rcpp RcppArmadillo]; };
-runjags = derive { name="runjags"; version="2.0.1-4"; sha256="1any5f7paf8a8yyvk594iixvh1l1dc87pil292sd1pq1lh2510lw"; depends=[lattice coda]; };
+rugarch = derive { name="rugarch"; version="1.3-4"; sha256="1za92hqfaws8azf2zml1q8mlbirrdw3rb4rvwg6sclfx7z7gsqkh"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; };
+runjags = derive { name="runjags"; version="2.0.1-4"; sha256="1any5f7paf8a8yyvk594iixvh1l1dc87pil292sd1pq1lh2510lw"; depends=[coda lattice]; };
 ruv = derive { name="ruv"; version="0.9.5"; sha256="19n2zrbfg6kzks395iiv1wbz2zf1j25aap3iy3d8yspmasqxi93x"; depends=[]; };
 rv = derive { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrfb37hzkyy5szai52nqr2xij"; depends=[]; };
 rvHPDT = derive { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; };
 rvTDT = derive { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; };
 rvalues = derive { name="rvalues"; version="0.3"; sha256="0fkf0gngrx1rfa67blzf3xxjwhlp2m2jplxw3z3j9vgl6ray0nqs"; depends=[]; };
 rversions = derive { name="rversions"; version="1.0.1"; sha256="1qqar1cg8218dr4hp09629jx6yvwcnwxzp8grnqcmhbc5xyx76ch"; depends=[curl xml2]; };
-rvertnet = derive { name="rvertnet"; version="0.2.2"; sha256="14afdf0mflpa2arxdy44y8mak9j3cg2cgk97idd7k4pi8vf6q0jg"; depends=[plyr jsonlite httr data_table ggplot2 maps]; };
-rvest = derive { name="rvest"; version="0.2.0"; sha256="1bg9l0wzh9xs7rpacl8s6q33hkjvv85vsl8079qsri0lr856wni7"; depends=[httr XML selectr magrittr]; };
+rvertnet = derive { name="rvertnet"; version="0.2.2"; sha256="14afdf0mflpa2arxdy44y8mak9j3cg2cgk97idd7k4pi8vf6q0jg"; depends=[data_table ggplot2 httr jsonlite maps plyr]; };
+rvest = derive { name="rvest"; version="0.2.0"; sha256="1bg9l0wzh9xs7rpacl8s6q33hkjvv85vsl8079qsri0lr856wni7"; depends=[httr magrittr selectr XML]; };
 rvgtest = derive { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
-rworldmap = derive { name="rworldmap"; version="1.3-1"; sha256="0wrg6ap39bq88sv5axxd90yyqafn77amk5429pxd9v5a2hdm3g8w"; depends=[sp maptools fields]; };
+rworldmap = derive { name="rworldmap"; version="1.3-1"; sha256="0wrg6ap39bq88sv5axxd90yyqafn77amk5429pxd9v5a2hdm3g8w"; depends=[fields maptools sp]; };
 rworldxtra = derive { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; };
 rwt = derive { name="rwt"; version="1.0.0"; sha256="112wp682z4gkxsd3bqnlkdrh42bfzwnnhzyangxi2dh0qw63bgcr"; depends=[matlab]; };
-ryouready = derive { name="ryouready"; version="0.3"; sha256="0nms3zfkis2fsxkyj3dr95vz3kk6pkm7l5ga7iz8pxy1ywrawj2i"; depends=[stringr car]; };
-rysgran = derive { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[soiltexture lattice]; };
+ryouready = derive { name="ryouready"; version="0.3"; sha256="0nms3zfkis2fsxkyj3dr95vz3kk6pkm7l5ga7iz8pxy1ywrawj2i"; depends=[car stringr]; };
+rysgran = derive { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[lattice soiltexture]; };
 rzmq = derive { name="rzmq"; version="0.7.7"; sha256="0gf8gpwidfn4756jqbpdbqsl8l4ahi3jgavrrvbbdi841rxggfmx"; depends=[]; };
 s20x = derive { name="s20x"; version="3.1-16"; sha256="10z19q28wv3jnrs8lhban4a6hxqxgivcalq633p3hpa4zhw7nsj7"; depends=[]; };
-s2dverification = derive { name="s2dverification"; version="2.1.1"; sha256="1m3m5sbq96fhnl4slxgb2j0009kqfdivdn3nbb203pc0knjpflnq"; depends=[GEOmap geomapdata maps mapproj]; };
+s2dverification = derive { name="s2dverification"; version="2.1.1"; sha256="1m3m5sbq96fhnl4slxgb2j0009kqfdivdn3nbb203pc0knjpflnq"; depends=[GEOmap geomapdata mapproj maps]; };
 s4vd = derive { name="s4vd"; version="1.0"; sha256="07pnkhyqf9iymj913813d93dmb3iqbdlcl0gsgacihyyinb4id5s"; depends=[biclust]; };
 sBF = derive { name="sBF"; version="1.1.1"; sha256="0dankakl4rwl9apl46hk57ps4mvn2l1crw4gdqds26fc8w6f6rab"; depends=[]; };
 sExtinct = derive { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94wa6hlv9hj5mcb85fj1y0yparkvvl8249"; depends=[lattice]; };
-sGPCA = derive { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79mksarh6di3vp26kb3d3wx087dx"; depends=[Matrix fields]; };
+sGPCA = derive { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79mksarh6di3vp26kb3d3wx087dx"; depends=[fields Matrix]; };
 sROC = derive { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; };
 sac = derive { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; };
 saccades = derive { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; };
-sadists = derive { name="sadists"; version="0.2.1"; sha256="0m3rlbhgzl0xvx8bcaswbi9nsrgfhdmkywx7ynayl6q0lmslhk6a"; depends=[PDQutils hypergeo orthopolynom]; };
-sads = derive { name="sads"; version="0.1.10"; sha256="02662vbbk3jikp506ljil9zqchs6bq3lsw4fwbbi2wgg7xvb260g"; depends=[MASS bbmle poilog VGAM untb]; };
-sae = derive { name="sae"; version="1.0-5"; sha256="05jvzq4cqb78pgdlxf8vlanx3v10n5njlw7g666nrnziy9ak8z4f"; depends=[nlme MASS]; };
+sadists = derive { name="sadists"; version="0.2.1"; sha256="0m3rlbhgzl0xvx8bcaswbi9nsrgfhdmkywx7ynayl6q0lmslhk6a"; depends=[hypergeo orthopolynom PDQutils]; };
+sads = derive { name="sads"; version="0.2.1"; sha256="08rr3ixz6phrpdwpqk08sk8a5znggd84d7wc1zpm62kfppy0d2hc"; depends=[bbmle GUILDS MASS poilog VGAM]; };
+sae = derive { name="sae"; version="1.0-5"; sha256="05jvzq4cqb78pgdlxf8vlanx3v10n5njlw7g666nrnziy9ak8z4f"; depends=[MASS nlme]; };
 sae2 = derive { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; };
-saeSim = derive { name="saeSim"; version="0.7.0"; sha256="03zfw18fvx8blh9iijh3rnglg8zbsvd9dq3kqv6ajz3hwr90z29g"; depends=[dplyr functional ggplot2 MASS spdep parallelMap]; };
+saeSim = derive { name="saeSim"; version="0.7.0"; sha256="03zfw18fvx8blh9iijh3rnglg8zbsvd9dq3kqv6ajz3hwr90z29g"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; };
 saemix = derive { name="saemix"; version="1.2"; sha256="1whwn54iiapdfig6qpzji3z3skir6jrs34dq78zlynibgrg95hx6"; depends=[]; };
 saery = derive { name="saery"; version="1.0"; sha256="09x1v627llqbpiwkh1wr0z7gsndfdrjzag2hprhq1adbzh05k47z"; depends=[]; };
 safeBinaryRegression = derive { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; };
 safi = derive { name="safi"; version="1.0"; sha256="1km58w57kdmyfj4a97zhnjcka4q4pxm8r2br01qq2niaihpbzp98"; depends=[]; };
-sampSurf = derive { name="sampSurf"; version="0.7-3"; sha256="165y2z9bhf7cyrh177fk87apqpgzyn69gf53f9mmii931cyykihw"; depends=[sp raster rasterVis boot]; };
-sampleSelection = derive { name="sampleSelection"; version="1.0-2"; sha256="1hzvvwvqp6v9d6ldm17kx3g8pbgngw2pxklny0b3man47zh5jshc"; depends=[maxLik miscTools systemfit Formula]; };
+sampSurf = derive { name="sampSurf"; version="0.7-3"; sha256="165y2z9bhf7cyrh177fk87apqpgzyn69gf53f9mmii931cyykihw"; depends=[boot raster rasterVis sp]; };
+sampleSelection = derive { name="sampleSelection"; version="1.0-2"; sha256="1hzvvwvqp6v9d6ldm17kx3g8pbgngw2pxklny0b3man47zh5jshc"; depends=[Formula maxLik miscTools systemfit]; };
 samplesize4surveys = derive { name="samplesize4surveys"; version="2.4.0.900"; sha256="199g2gsbv1w1acn7nnlv2wbrhq7lc1mx8vvs1w9a9a8dkxdmml0g"; depends=[TeachingSampling]; };
-sampling = derive { name="sampling"; version="2.6"; sha256="11r8p29kwc0ggycbv7sm1zmazmfm4p5207l764ad4znjib0cab6p"; depends=[MASS lpSolve]; };
+sampling = derive { name="sampling"; version="2.6"; sha256="11r8p29kwc0ggycbv7sm1zmazmfm4p5207l764ad4znjib0cab6p"; depends=[lpSolve MASS]; };
 samplingEstimates = derive { name="samplingEstimates"; version="0.1-3"; sha256="1srdchlpxksfdqhf5qdvl7nz0qsxkxww7hzqj0q71asbzlq3am3p"; depends=[samplingVarEst]; };
 samplingVarEst = derive { name="samplingVarEst"; version="0.9-9"; sha256="04wgsq3sh69iy8p07ch210p22n5mds7cxp5s6zggzamqpf0hpnw7"; depends=[]; };
 samplingbook = derive { name="samplingbook"; version="1.2.0"; sha256="1vynz6hsnz5d0vg66f8k67h24rb809k9chb4waymk6vwnp8lksz9"; depends=[pps sampling survey]; };
-samr = derive { name="samr"; version="2.0"; sha256="0rsfca07pvmhfn7b49yk2ycw00wsq6dmrpv9haxz8q0xv7n5n2q9"; depends=[matrixStats]; };
+samr = derive { name="samr"; version="2.0"; sha256="0rsfca07pvmhfn7b49yk2ycw00wsq6dmrpv9haxz8q0xv7n5n2q9"; depends=[impute matrixStats]; };
 sand = derive { name="sand"; version="1.0.2"; sha256="1y371ds86gcq2id996vp56h5dax2wm0mlk1ks2mp1k81n63l7wmf"; depends=[igraph igraphdata]; };
 sandwich = derive { name="sandwich"; version="2.3-3"; sha256="1x2x0yxlrhdfyhk6jw4pim03yl5mg1wsi8cxxpbf9x4p68vd0w8y"; depends=[zoo]; };
 sanitizers = derive { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; };
@@ -5881,39 +5901,39 @@ saws = derive { name="saws"; version="0.9-6.1"; sha256="0w40j6xczqs74z1z3na4510w
 sbgcop = derive { name="sbgcop"; version="0.975"; sha256="0f47mvwbsym4khwgl0ic3pqkw3jwdah9a48qi3q93d46p2xich61"; depends=[]; };
 sbioPN = derive { name="sbioPN"; version="1.1.0"; sha256="0yvg55xnkhm35hfl7rldy2grb26hm4a68jr4x9n45fs7hhdylxri"; depends=[]; };
 sca = derive { name="sca"; version="0.8-9"; sha256="024yxm1rlyz3hx9viv2nb6rapy938diaknc3nzkgq0ffky2gf0s3"; depends=[]; };
-scaRabee = derive { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[neldermead lattice deSolve]; };
+scaRabee = derive { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; };
 scagnostics = derive { name="scagnostics"; version="0.2-4"; sha256="0fhc7d2nfhm8w6s6z1ls6i8d7c90h4q7rb92rz8pgq3xh031hpcf"; depends=[rJava]; };
-scales = derive { name="scales"; version="0.2.4"; sha256="08dryii8ibh16wxs61pam07b24rwhqvdcdhk09mij289l309192v"; depends=[RColorBrewer dichromat munsell plyr labeling]; };
+scales = derive { name="scales"; version="0.2.5"; sha256="12xrmn1vh64dl46bq7n7pa427aicb2ifjrby9in3m32nyvir0kac"; depends=[dichromat labeling munsell plyr RColorBrewer Rcpp]; };
 scalreg = derive { name="scalreg"; version="1.0"; sha256="06iqij1cyiw55ijzk2byrwh3m5iwsra7clx8l4v69rc236q8zbdi"; depends=[lars MASS]; };
-scam = derive { name="scam"; version="1.1-8"; sha256="1190xdahr4cx50qn32lxqm3p8m9c3968qx6f5mpyicaw34j9whz4"; depends=[mgcv Matrix]; };
+scam = derive { name="scam"; version="1.1-8"; sha256="1190xdahr4cx50qn32lxqm3p8m9c3968qx6f5mpyicaw34j9whz4"; depends=[Matrix mgcv]; };
 scape = derive { name="scape"; version="2.2-0"; sha256="0dgbh65fg6i5x4lpfkshn382zcc4jk1wp62pwd2l2f59pyfb92a3"; depends=[coda Hmisc lattice]; };
 scar = derive { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; };
 scatterplot3d = derive { name="scatterplot3d"; version="0.3-35"; sha256="1w0r7cyz01rzmgcf2x7wa4xs88ga6fd67wksyjyzrh2pdcbc56yx"; depends=[]; };
 schoRsch = derive { name="schoRsch"; version="1.1"; sha256="0bi2vn9qr49yy3g45xgglqn1b5b6z8cbn9phzmqjc1v7rn80s5zg"; depends=[]; };
-scholar = derive { name="scholar"; version="0.1.2"; sha256="1h1a6psgmiifi7p87ar3fr0mcfmg44yh4683dmqxrxrfcvgaxvca"; depends=[stringr plyr R_cache XML]; };
+scholar = derive { name="scholar"; version="0.1.2"; sha256="1h1a6psgmiifi7p87ar3fr0mcfmg44yh4683dmqxrxrfcvgaxvca"; depends=[plyr R_cache stringr XML]; };
 schoolmath = derive { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; };
 schwartz97 = derive { name="schwartz97"; version="0.0.6"; sha256="0l34f30l75zrg3n377jp0cw7m88cqkgzy6ql78mrx8ra88aspfzn"; depends=[FKF mvtnorm RUnit]; };
-scidb = derive { name="scidb"; version="1.2-0"; sha256="17y1bml8kb896l3hsw356qdj25sfbdvm10dyxhaafdgcbp5ywcrn"; depends=[Matrix iterators RCurl zoo digest]; };
+scidb = derive { name="scidb"; version="1.2-0"; sha256="17y1bml8kb896l3hsw356qdj25sfbdvm10dyxhaafdgcbp5ywcrn"; depends=[digest iterators Matrix RCurl zoo]; };
 scio = derive { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; };
 sciplot = derive { name="sciplot"; version="1.1-0"; sha256="0na4qkslg3lns439q1124y4fl68dgqjck60a7yvgxc76p355spl4"; depends=[]; };
 score = derive { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; };
 scoring = derive { name="scoring"; version="0.5-1"; sha256="0vxjcbp43h2ipc428qc0gx7nh6my7202hixwhnmspl4f3kai3wkp"; depends=[]; };
 scout = derive { name="scout"; version="1.0.3"; sha256="0wmjmk0ckd211cq5ykd0yzjschs7fkg04w67arl4pwma0z5z56lq"; depends=[glasso lars]; };
-scrapeR = derive { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[XML RCurl]; };
+scrapeR = derive { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[RCurl XML]; };
 scrime = derive { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; };
 scriptests = derive { name="scriptests"; version="1.0-15"; sha256="1f55rnz4zbywyn79l2ac2600k95fwxgnyh1wzxvyxjh4qcg50plv"; depends=[]; };
-scrm = derive { name="scrm"; version="1.6.0-2"; sha256="1a3m56j4ca526mjhc7h0967k5bja336dw1bpna119l5yic6hkc1n"; depends=[Rcpp Rcpp]; };
-scrypt = derive { name="scrypt"; version="0.1.0"; sha256="1hc1rziigwggdx2pvklldkw88mdzbwa8b8a2a0ip4cm1w6flsl9n"; depends=[Rcpp Rcpp]; };
+scrm = derive { name="scrm"; version="1.6.0-2"; sha256="1a3m56j4ca526mjhc7h0967k5bja336dw1bpna119l5yic6hkc1n"; depends=[Rcpp]; };
+scrypt = derive { name="scrypt"; version="0.1.0"; sha256="1hc1rziigwggdx2pvklldkw88mdzbwa8b8a2a0ip4cm1w6flsl9n"; depends=[Rcpp]; };
 scuba = derive { name="scuba"; version="1.7-0"; sha256="11mdc8pj552ag36ib4sfbjv8r0psa6wnb13spz0v3rbaslz25hpw"; depends=[]; };
-sda = derive { name="sda"; version="1.3.6"; sha256="1igdkgpxlni4d8h5k912aikbd66jqkabzq144xlgd2vp3kcbw4ly"; depends=[entropy corpcor fdrtool]; };
-sdcMicro = derive { name="sdcMicro"; version="4.5.0"; sha256="1cz34g6si7f8kgybcvcsr0lkcspqp3vrkvfqsfdjd0mb8lv5pbjj"; depends=[brew knitr data_table xtable car robustbase cluster MASS e1071 Rcpp sets Rcpp]; };
-sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.2.0"; sha256="0bhrpric17y1ljm18a00i6bkxfq1cpljfkib8qbb4jyj5s50f3ps"; depends=[sdcMicro gWidgetsRGtk2 gWidgets cairoDevice vcd foreign Hmisc]; };
-sdcTable = derive { name="sdcTable"; version="0.18.1"; sha256="18l6d6q6pawvswj1v9mfmcg4m94dkp38yd2mnndz9l7qmvf6n7kx"; depends=[stringr Rcpp Rglpk lpSolveAPI data_table Rcpp]; };
-sdcTarget = derive { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[magic foreach doParallel tuple]; };
+sda = derive { name="sda"; version="1.3.6"; sha256="1igdkgpxlni4d8h5k912aikbd66jqkabzq144xlgd2vp3kcbw4ly"; depends=[corpcor entropy fdrtool]; };
+sdcMicro = derive { name="sdcMicro"; version="4.5.0"; sha256="1cz34g6si7f8kgybcvcsr0lkcspqp3vrkvfqsfdjd0mb8lv5pbjj"; depends=[brew car cluster data_table e1071 knitr MASS Rcpp robustbase sets xtable]; };
+sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.2.0"; sha256="0bhrpric17y1ljm18a00i6bkxfq1cpljfkib8qbb4jyj5s50f3ps"; depends=[cairoDevice foreign gWidgets gWidgetsRGtk2 Hmisc sdcMicro vcd]; };
+sdcTable = derive { name="sdcTable"; version="0.18.1"; sha256="18l6d6q6pawvswj1v9mfmcg4m94dkp38yd2mnndz9l7qmvf6n7kx"; depends=[data_table lpSolveAPI Rcpp Rglpk stringr]; };
+sdcTarget = derive { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; };
 sddpack = derive { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
-sde = derive { name="sde"; version="2.0.13"; sha256="194dkwrww9win5chhlffjv1xkhpxx2bcv6hf81xaqk7pdf7ifj80"; depends=[MASS fda zoo]; };
+sde = derive { name="sde"; version="2.0.13"; sha256="194dkwrww9win5chhlffjv1xkhpxx2bcv6hf81xaqk7pdf7ifj80"; depends=[fda MASS zoo]; };
 sdef = derive { name="sdef"; version="1.5"; sha256="1xmx3nfjjfh6zw1vq7iip4rnshh40azja83xyvnz04jcv574vhxm"; depends=[]; };
-sdmvspecies = derive { name="sdmvspecies"; version="0.3.1"; sha256="1rpbj55598862vb4bwrvcbskm10xibsvx58fpvkn58zbm6ab2534"; depends=[GPArotation ggplot2 psych raster]; };
+sdmvspecies = derive { name="sdmvspecies"; version="0.3.1"; sha256="1rpbj55598862vb4bwrvcbskm10xibsvx58fpvkn58zbm6ab2534"; depends=[ggplot2 GPArotation psych raster]; };
 sdnet = derive { name="sdnet"; version="2.03.3"; sha256="1884pil3brm7llczacxda6gki501ddyc5m8ggqjix64kbvw37slv"; depends=[]; };
 sdprisk = derive { name="sdprisk"; version="1.1-3"; sha256="1rwzi112fjckzxmhagpg60qm9a35fqx8g8xaypxsmnml6q00ysiq"; depends=[numDeriv PolynomF rootSolve]; };
 sdtoolkit = derive { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
@@ -5922,59 +5942,59 @@ seacarb = derive { name="seacarb"; version="3.0.6"; sha256="0xhyy8nd20f29j9y3x25
 sealasso = derive { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; };
 searchable = derive { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; };
 seas = derive { name="seas"; version="0.4-3"; sha256="1n0acg6fvaym4nx1ihw0vmb79csds0k4x9427qmcyxbl9hxxmllp"; depends=[]; };
-season = derive { name="season"; version="0.3-5"; sha256="08f382kq51r5g9p5hsnjf17dwivhx1vfgmmwp1vzmbqx1drlqkzx"; depends=[ggplot2 MASS mgcv survival coda]; };
+season = derive { name="season"; version="0.3-5"; sha256="08f382kq51r5g9p5hsnjf17dwivhx1vfgmmwp1vzmbqx1drlqkzx"; depends=[coda ggplot2 MASS mgcv survival]; };
 seasonal = derive { name="seasonal"; version="0.90.0"; sha256="0r5l69vl0lqi9hdxi90wx22v38p3izwx3cn124awzlak49i2qn0l"; depends=[]; };
-seawaveQ = derive { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[survival NADA lubridate]; };
-secr = derive { name="secr"; version="2.9.4"; sha256="0g7j68ys9dd8rz1y8wsmy3lwwxpwwkps6wpx67l86lzz99nwh64g"; depends=[abind MASS nlme sp mgcv raster]; };
-secrdesign = derive { name="secrdesign"; version="2.3.0"; sha256="1f5swggkky721z0js2jr1gb3mrx9h6qlld70bjd86x9f73s9cm0n"; depends=[secr abind]; };
-secrlinear = derive { name="secrlinear"; version="1.0.5"; sha256="084d0spshf3lh1m50kyb0r8x9lz4yrfj6b7snywffxhqyjw147hf"; depends=[secr sp igraph maptools MASS]; };
+seawaveQ = derive { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[lubridate NADA survival]; };
+secr = derive { name="secr"; version="2.9.5"; sha256="0qm3blx9m8frxzb5dqxw98ijq5f5gaxn194kcrbiz3wxfqswhn3f"; depends=[abind MASS mgcv nlme raster sp]; };
+secrdesign = derive { name="secrdesign"; version="2.3.0"; sha256="1f5swggkky721z0js2jr1gb3mrx9h6qlld70bjd86x9f73s9cm0n"; depends=[abind secr]; };
+secrlinear = derive { name="secrlinear"; version="1.0.5"; sha256="084d0spshf3lh1m50kyb0r8x9lz4yrfj6b7snywffxhqyjw147hf"; depends=[igraph maptools MASS secr sp]; };
 seedy = derive { name="seedy"; version="1.2"; sha256="1m800b2faaih4xjsl3jwrqd177jjygbvrf9mb1h84hdzy095b5c0"; depends=[]; };
-seeg = derive { name="seeg"; version="1.0"; sha256="1d45vl075p4qbd74gpaa8aw1h82p9n633fym10yp9bmcv4gwksg6"; depends=[car spatstat sgeostat]; };
+seeg = derive { name="seeg"; version="1.0"; sha256="1d45vl075p4qbd74gpaa8aw1h82p9n633fym10yp9bmcv4gwksg6"; depends=[car sgeostat spatstat]; };
 seem = derive { name="seem"; version="1.0"; sha256="0cjdi9c89bqvrx9gzxph958cfqicc1qfnzsair0gvsk3cxsrw6bf"; depends=[]; };
 seewave = derive { name="seewave"; version="1.7.6"; sha256="1sh2i9hb8v0awhczvkj803lmdvg5p1fla685xb3s2a3if1q5zc5i"; depends=[fftw tuneR]; };
 seg = derive { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; };
-segmag = derive { name="segmag"; version="1.2.2"; sha256="130saznhssg0qsc34fcw80x92mmqhjgizrb4fxpjsg7a8jjrclp8"; depends=[Rcpp Rcpp]; };
+segmag = derive { name="segmag"; version="1.2.2"; sha256="130saznhssg0qsc34fcw80x92mmqhjgizrb4fxpjsg7a8jjrclp8"; depends=[Rcpp]; };
 segmented = derive { name="segmented"; version="0.5-1.1"; sha256="0rkbhg8wwqk08jfd29sh4ifx427kmd4mfqrssllckha9hcglqhz7"; depends=[]; };
 seismic = derive { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; };
-seismicRoll = derive { name="seismicRoll"; version="1.0.1"; sha256="1lls2gbx994j7y3kwpf00ngga5qlzqxwc3cy9x21gy9iq2s8hn0x"; depends=[Rcpp Rcpp]; };
+seismicRoll = derive { name="seismicRoll"; version="1.0.1"; sha256="1lls2gbx994j7y3kwpf00ngga5qlzqxwc3cy9x21gy9iq2s8hn0x"; depends=[Rcpp]; };
 selectMeta = derive { name="selectMeta"; version="1.0.7"; sha256="1ibiiddl9km8dahfc3kdpl42k43fx4mqgqibxgv5q8zbcp2829p9"; depends=[DEoptim]; };
 selectiongain = derive { name="selectiongain"; version="2.0.40"; sha256="1xzvz747242wfv789dl3gqvgbc8l1c4i2r3p95766ypcjw51j55d"; depends=[mvtnorm]; };
-selectr = derive { name="selectr"; version="0.2-3"; sha256="1ppm1f6mwfwbq92iwacyjn46k1d8148j4zykmjvw8as6c8blgap1"; depends=[XML stringr]; };
-selectspm = derive { name="selectspm"; version="0.1"; sha256="0bihyjaacpyjnm5vznix8krw2sqmy62in33hmb5yj4yidwz1gpv0"; depends=[spatstat ecespa]; };
-selfea = derive { name="selfea"; version="1.0"; sha256="02ncccyjgdpp9hkd278jg8x1c3566fqhfmmh423596b1slzs8gqm"; depends=[pwr MASS plyr]; };
+selectr = derive { name="selectr"; version="0.2-3"; sha256="1ppm1f6mwfwbq92iwacyjn46k1d8148j4zykmjvw8as6c8blgap1"; depends=[stringr XML]; };
+selectspm = derive { name="selectspm"; version="0.1"; sha256="0bihyjaacpyjnm5vznix8krw2sqmy62in33hmb5yj4yidwz1gpv0"; depends=[ecespa spatstat]; };
+selfea = derive { name="selfea"; version="1.0"; sha256="02ncccyjgdpp9hkd278jg8x1c3566fqhfmmh423596b1slzs8gqm"; depends=[MASS plyr pwr]; };
 selfingTree = derive { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; };
-sem = derive { name="sem"; version="3.1-6"; sha256="1gx0j3ignpmgy3qvnp0qjmhlzbxj0wjfr6jfs9d29cnq8b38p73c"; depends=[matrixcalc MASS boot mi DiagrammeR]; };
-semGOF = derive { name="semGOF"; version="0.2-0"; sha256="1lsv72yaza80jqadmah7v2cpfqfay57y12hcz6brvia6bmr5qagb"; depends=[sem MASS matrixcalc]; };
+sem = derive { name="sem"; version="3.1-6"; sha256="1gx0j3ignpmgy3qvnp0qjmhlzbxj0wjfr6jfs9d29cnq8b38p73c"; depends=[boot DiagrammeR MASS matrixcalc mi]; };
+semGOF = derive { name="semGOF"; version="0.2-0"; sha256="1lsv72yaza80jqadmah7v2cpfqfay57y12hcz6brvia6bmr5qagb"; depends=[MASS matrixcalc sem]; };
 semPLS = derive { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; };
-semPlot = derive { name="semPlot"; version="1.0.1"; sha256="0sdp970qb4mz5vzncfmqxvg1z12gmiyqi3yaz9x2drm3rgzavy83"; depends=[qgraph lavaan sem plyr XML igraph lisrelToR rockchalk colorspace corpcor]; };
+semPlot = derive { name="semPlot"; version="1.0.1"; sha256="0sdp970qb4mz5vzncfmqxvg1z12gmiyqi3yaz9x2drm3rgzavy83"; depends=[colorspace corpcor igraph lavaan lisrelToR plyr qgraph rockchalk sem XML]; };
 semTools = derive { name="semTools"; version="0.4-6"; sha256="1rxs6kwfc4bp273i9p25v4mc2sm91fkgsg178ifd4d3235xawcvz"; depends=[lavaan]; };
 semdiag = derive { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; };
-semiArtificial = derive { name="semiArtificial"; version="1.2.0"; sha256="11pwdqpsf5d5g74s2b8ixmrh2khkha3d4akzlkn652s98qr55dpc"; depends=[CORElearn MASS nnet cluster mclust fpc timeSeries timeDate]; };
+semiArtificial = derive { name="semiArtificial"; version="1.2.0"; sha256="11pwdqpsf5d5g74s2b8ixmrh2khkha3d4akzlkn652s98qr55dpc"; depends=[cluster CORElearn fpc MASS mclust nnet RSNNS timeDate timeSeries]; };
 semisupKernelPCA = derive { name="semisupKernelPCA"; version="0.1.5"; sha256="1v8wdq63b1gqicj8c9a24k0w7cc0bkg0mnc9z5mklsfcl7g0g6k9"; depends=[datautils irlba]; };
-semsfa = derive { name="semsfa"; version="1.0"; sha256="1x227rigjk9glq5x9lp6xxcf3y9i73rv3mrj7lkr2ycnsx8zz57h"; depends=[mgcv np moments doParallel foreach iterators]; };
+semsfa = derive { name="semsfa"; version="1.0"; sha256="1x227rigjk9glq5x9lp6xxcf3y9i73rv3mrj7lkr2ycnsx8zz57h"; depends=[doParallel foreach iterators mgcv moments np]; };
 sendmailR = derive { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; };
 sendplot = derive { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; };
-sensR = derive { name="sensR"; version="1.4-5"; sha256="1vp06ghmk852wkc4vmp4k68z6v623hsay69c8nm3m8xvf2vrqfgb"; depends=[multcomp MASS numDeriv]; };
-sensitivity = derive { name="sensitivity"; version="1.11"; sha256="197gm4ylh8giyh5iv9lf5dyb9ad7m406d08ai3vnf7irj7f8nwp2"; depends=[boot]; };
+sensR = derive { name="sensR"; version="1.4-5"; sha256="1vp06ghmk852wkc4vmp4k68z6v623hsay69c8nm3m8xvf2vrqfgb"; depends=[MASS multcomp numDeriv]; };
+sensitivity = derive { name="sensitivity"; version="1.11.1"; sha256="1v4lzy687r66jmxgm0fy81wgj70ak58hd13h1jn60wb5j3p91qki"; depends=[boot]; };
 sensitivityPStrat = derive { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; };
 sensitivitymv = derive { name="sensitivitymv"; version="1.2"; sha256="0h8lbl5yhxgzdrajjydb2ap9q3dnm1abxdk8gdhp84m1bv8pznkj"; depends=[]; };
 sensitivitymw = derive { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; };
-sensory = derive { name="sensory"; version="1.0"; sha256="0mfjj3lsx5i8bc8ikhqwycmfryzg9vd64m6ahqjf6xva7bj5h1v6"; depends=[Matrix gtools MASS]; };
+sensory = derive { name="sensory"; version="1.0"; sha256="0mfjj3lsx5i8bc8ikhqwycmfryzg9vd64m6ahqjf6xva7bj5h1v6"; depends=[gtools MASS Matrix]; };
 separationplot = derive { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; };
 seqCBS = derive { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; };
 seqDesign = derive { name="seqDesign"; version="1.1"; sha256="1694swd8ik9fbiflmnw4xpq82kq18rqzkw0dv5pvq30c47xjgamv"; depends=[survival xtable]; };
-seqMeta = derive { name="seqMeta"; version="1.5"; sha256="1igag08qkfvkx83w6jjyfmjpxil9wvag1yfnxp3pqbglj9l99pmn"; depends=[survival Matrix coxme CompQuadForm]; };
+seqMeta = derive { name="seqMeta"; version="1.5"; sha256="1igag08qkfvkx83w6jjyfmjpxil9wvag1yfnxp3pqbglj9l99pmn"; depends=[CompQuadForm coxme Matrix survival]; };
 seqPERM = derive { name="seqPERM"; version="1.0"; sha256="1i8ai4gxybh08wxjh96m6xlqxhh7ch0xihjs879snmy4zqfi0pap"; depends=[]; };
 seqRFLP = derive { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; };
 seqinr = derive { name="seqinr"; version="3.1-3"; sha256="0bbjfwbqg74wsamb3iz01g0ssdpdpg65gh00y9xlnpk4wb990n4n"; depends=[ade4]; };
 seqminer = derive { name="seqminer"; version="4.2"; sha256="026minlmqf4n6pznkzkm6daqa7pj7hmis0i2azdy2m56a9hkj52z"; depends=[stringr]; };
 seqmon = derive { name="seqmon"; version="0.2"; sha256="075hc6vgl1w3nisrihf5w6mkkg9q601jsqxm9hk9yagyvvd7d78w"; depends=[]; };
-sequences = derive { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp Rcpp]; };
-sequenza = derive { name="sequenza"; version="2.1.1"; sha256="0vrdmfy8qyzjflyl5skcy9mazl56py5gzb1kn1xh2hiv3mshdrfx"; depends=[squash]; };
-seriation = derive { name="seriation"; version="1.1-0"; sha256="0lbkv005ws4khwp12mygrpvxxdz8g5a7q2xl62k43sz6vj7cp8cn"; depends=[TSP cluster gclus colorspace MASS gplots registry]; };
+sequences = derive { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; };
+sequenza = derive { name="sequenza"; version="2.1.1"; sha256="0vrdmfy8qyzjflyl5skcy9mazl56py5gzb1kn1xh2hiv3mshdrfx"; depends=[copynumber squash]; };
+seriation = derive { name="seriation"; version="1.1-0"; sha256="0lbkv005ws4khwp12mygrpvxxdz8g5a7q2xl62k43sz6vj7cp8cn"; depends=[cluster colorspace gclus gplots MASS registry TSP]; };
 seroincidence = derive { name="seroincidence"; version="1.0.4"; sha256="0m3hlbv3277qyhqi3liwbna7czd6kdc7gqaxc7xn5x8d2hsc45hk"; depends=[]; };
-servr = derive { name="servr"; version="0.2"; sha256="0gah99snaj8lk5zfzbxi3jwvpnlff9diz9gqv4qalfxpmb7fp6lc"; depends=[mime httpuv jsonlite]; };
-sesem = derive { name="sesem"; version="1.0.1"; sha256="0s4xkv6bc5nxhj09mk9agnj11b9h7swccs9jrn4lg3fy12vqhf5a"; depends=[lavaan mgcv gplots]; };
+servr = derive { name="servr"; version="0.2"; sha256="0gah99snaj8lk5zfzbxi3jwvpnlff9diz9gqv4qalfxpmb7fp6lc"; depends=[httpuv jsonlite mime]; };
+sesem = derive { name="sesem"; version="1.0.1"; sha256="0s4xkv6bc5nxhj09mk9agnj11b9h7swccs9jrn4lg3fy12vqhf5a"; depends=[gplots lavaan mgcv]; };
 session = derive { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; };
 setRNG = derive { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; };
 sets = derive { name="sets"; version="1.0-14"; sha256="1wfg4yc3p7zqcj2z3lb5knv6l3lw4pf20s3rkpz4yj4nsb41zs4g"; depends=[]; };
@@ -5985,57 +6005,58 @@ sfa = derive { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa
 sfsmisc = derive { name="sfsmisc"; version="1.0-27"; sha256="16hkm0ylwipc1zqsi8fiwyqvl9hpjgl7kyvgamibxlbp1y669qgm"; depends=[]; };
 sft = derive { name="sft"; version="2.0-7"; sha256="1fq1b32f08i4k9bv4hh7rhk1jj7kgans6dwh1bmawaqkchyab3jr"; depends=[fda]; };
 sgPLS = derive { name="sgPLS"; version="1.2"; sha256="1q3pf4sfh8l2qwxm0qd3sg29kvvprpcyis0afbcjhvfr10w91xpw"; depends=[mixOmics]; };
-sgd = derive { name="sgd"; version="0.1"; sha256="16jqzshkg1n1azyfjadyg454ar0hk2dmw9ba1wrn6rh7mxsngik6"; depends=[Rcpp MASS Rcpp RcppArmadillo BH]; };
+sgRSEA = derive { name="sgRSEA"; version="0.1"; sha256="0vyypnq81l36x0j44q2l9wbf3x4krz4fzypi7vyqhaq97mkzaw5j"; depends=[]; };
+sgd = derive { name="sgd"; version="0.1"; sha256="16jqzshkg1n1azyfjadyg454ar0hk2dmw9ba1wrn6rh7mxsngik6"; depends=[BH MASS Rcpp RcppArmadillo]; };
 sgeostat = derive { name="sgeostat"; version="1.0-25"; sha256="04zl932s6zb26r42h2l8qf3d43bmrq67281mrkh4spn4vcddv5da"; depends=[]; };
-sglOptim = derive { name="sglOptim"; version="1.0.122.1"; sha256="0ld53rdxai85r9hwz9jrsxr08lxin0ksxa6823r7cr96w18c1ssm"; depends=[Matrix Rcpp RcppProgress RcppArmadillo BH]; };
-sglasso = derive { name="sglasso"; version="1.2.1"; sha256="18dag7wvz0l959igg4g77psi8idvqyikg676yy9ga3k69kl11hdk"; depends=[Matrix igraph]; };
+sglOptim = derive { name="sglOptim"; version="1.0.122.1"; sha256="0ld53rdxai85r9hwz9jrsxr08lxin0ksxa6823r7cr96w18c1ssm"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress]; };
+sglasso = derive { name="sglasso"; version="1.2.1"; sha256="18dag7wvz0l959igg4g77psi8idvqyikg676yy9ga3k69kl11hdk"; depends=[igraph Matrix]; };
 sglr = derive { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; };
 sgof = derive { name="sgof"; version="2.2"; sha256="087f4nbx9ppzi5za3f4w4msq2gd3r08v16fihppa30nqydg3ssbj"; depends=[poibin]; };
 sgr = derive { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; };
 sgt = derive { name="sgt"; version="1.1"; sha256="0j4xxh5lypcl0hyfx7gzrhb40z36ygn97hf1nl6m8wj4dncg39jf"; depends=[maxLik]; };
 shape = derive { name="shape"; version="1.4.2"; sha256="0yk3cmsa57svcvbnm21pyr0s0qbhnllka8nmsg4yb41frjlqph66"; depends=[]; };
-shapeR = derive { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg pixmap wavethresh vegan MASS]; };
+shapeR = derive { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg MASS pixmap vegan wavethresh]; };
 shapefiles = derive { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; };
-shapes = derive { name="shapes"; version="1.1-10"; sha256="038xps6f8b6w9qa9csqk33ggmb311h5zxwsxr027bd95a3vmyijx"; depends=[scatterplot3d rgl MASS]; };
-sharpshootR = derive { name="sharpshootR"; version="0.7-2"; sha256="04plsgmyil6znmcqx2j78n2vjj4y4mprb3wqbhwagapdhvp9rcis"; depends=[aqp ape soilDB igraph cluster lattice latticeExtra vegan sp reshape2 Hmisc scales circular RColorBrewer plyr]; };
-sharx = derive { name="sharx"; version="1.0-4"; sha256="1flcflx6w93s8bk4lcwcscwx8vacdl8900ikwkz358jbgywskd5n"; depends=[Formula dcmle dclone]; };
-shiny = derive { name="shiny"; version="0.12.0"; sha256="1mv2l2jlayg8jwr2710mp5awazdxbmq2vz8ld1jr2apq9irai14l"; depends=[httpuv mime jsonlite xtable digest htmltools R6]; };
+shapes = derive { name="shapes"; version="1.1-10"; sha256="038xps6f8b6w9qa9csqk33ggmb311h5zxwsxr027bd95a3vmyijx"; depends=[MASS rgl scatterplot3d]; };
+sharpshootR = derive { name="sharpshootR"; version="0.7-2"; sha256="04plsgmyil6znmcqx2j78n2vjj4y4mprb3wqbhwagapdhvp9rcis"; depends=[ape aqp circular cluster Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; };
+sharx = derive { name="sharx"; version="1.0-4"; sha256="1flcflx6w93s8bk4lcwcscwx8vacdl8900ikwkz358jbgywskd5n"; depends=[dclone dcmle Formula]; };
+shiny = derive { name="shiny"; version="0.12.1"; sha256="041illlgpw47y88razd77xj8q2h3brf582bhh8p8mmn7rn2af0mc"; depends=[digest htmltools httpuv jsonlite mime R6 xtable]; };
 shinyAce = derive { name="shinyAce"; version="0.1.0"; sha256="1031hzh647ys0d5hkw7cqxj0wgry3rxgq95fgs7slbm0rgx9g6f7"; depends=[shiny]; };
-shinyBS = derive { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[shiny htmltools]; };
-shinyFiles = derive { name="shinyFiles"; version="0.6.0"; sha256="08cvpvrsr1bh0yh17ap20bmwxa4bsan3h6bicrxzanl2dlwp8kvr"; depends=[shiny htmltools RJSONIO]; };
+shinyBS = derive { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; };
+shinyFiles = derive { name="shinyFiles"; version="0.6.0"; sha256="08cvpvrsr1bh0yh17ap20bmwxa4bsan3h6bicrxzanl2dlwp8kvr"; depends=[htmltools RJSONIO shiny]; };
 shinyRGL = derive { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; };
 shinyTree = derive { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; };
 shinybootstrap2 = derive { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; };
-shinydashboard = derive { name="shinydashboard"; version="0.4.0"; sha256="0my1bz983ncnvljhz6d25q9bqc510q9dgl9wzcg8c0civyjaps39"; depends=[shiny htmltools]; };
+shinydashboard = derive { name="shinydashboard"; version="0.5.0"; sha256="1q2g0vdid14id489ybfhf6x67bmc4g2zhamw3vx9piqvdlfmnqg5"; depends=[htmltools shiny]; };
 shinyjs = derive { name="shinyjs"; version="0.0.6.2"; sha256="0z9lw680bhfzm40j1ffy6y3vfxjkz9457w62rjrw32nssv8vjqvs"; depends=[shiny]; };
 shinythemes = derive { name="shinythemes"; version="1.0.1"; sha256="0wv579cxjlnd7wkfqzy2x3qk7d1abql1nhw10rx1c4c808vsylkw"; depends=[shiny]; };
-shopifyr = derive { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[RCurl R6 RJSONIO]; };
+shopifyr = derive { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[R6 RCurl RJSONIO]; };
 shotGroups = derive { name="shotGroups"; version="0.6"; sha256="0khcgzli6114yqrglmsvhr8rwkkkwdkd06b50isbc24vpv6xbfx9"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; };
-showtext = derive { name="showtext"; version="0.4-2"; sha256="18r1xwyjca9ccr2yf8r786pgji38myqp35abxsvd7wv7k3avhwd9"; depends=[sysfonts showtextdb]; };
+showtext = derive { name="showtext"; version="0.4-2"; sha256="18r1xwyjca9ccr2yf8r786pgji38myqp35abxsvd7wv7k3avhwd9"; depends=[showtextdb sysfonts]; };
 showtextdb = derive { name="showtextdb"; version="1.0"; sha256="14iv5nyc9wszy1yhbggk7zs042kv10lwk92pn9751hfws53yq6hf"; depends=[sysfonts]; };
-shp2graph = derive { name="shp2graph"; version="0-2"; sha256="09gbb7f9h3q2p56dwb2813mr36115ah70szq47jimpymzkd2x08m"; depends=[maptools igraph]; };
-shrink = derive { name="shrink"; version="1.2.0"; sha256="0r207mj57kjn6wfmz4f2l4wmbz7g1pvj96gpl0s76vkdjzbh1l47"; depends=[survival MASS rms]; };
+shp2graph = derive { name="shp2graph"; version="0-2"; sha256="09gbb7f9h3q2p56dwb2813mr36115ah70szq47jimpymzkd2x08m"; depends=[igraph maptools]; };
+shrink = derive { name="shrink"; version="1.2.0"; sha256="0r207mj57kjn6wfmz4f2l4wmbz7g1pvj96gpl0s76vkdjzbh1l47"; depends=[MASS rms survival]; };
 shuffle = derive { name="shuffle"; version="1.0"; sha256="037i45mfys1nr9sqmmsfb2yd3ba3aa22hc701f5j2zp8jx57qn3k"; depends=[]; };
-siRSM = derive { name="siRSM"; version="1.1"; sha256="0fx6bfb5c8hdlgjxddwhhzr09ls53kfgn36hjk9zi5z8m14a7wbn"; depends=[rsm MASS foreach doSNOW]; };
-siar = derive { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvvksl67pnbaadkc52v84fhzx3r"; depends=[hdrcde coda MASS bayesm mnormt spatstat]; };
-sideChannelAttack = derive { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[MASS corpcor mmap ade4 infotheo]; };
-sidier = derive { name="sidier"; version="3.0.1"; sha256="1vl28biy7inycn74kzq0gm3r2fd5ylkndl863jy8b3jvdrq9achk"; depends=[ape network igraph gridBase ggmap ggplot2]; };
+siRSM = derive { name="siRSM"; version="1.1"; sha256="0fx6bfb5c8hdlgjxddwhhzr09ls53kfgn36hjk9zi5z8m14a7wbn"; depends=[doSNOW foreach MASS rsm]; };
+siar = derive { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvvksl67pnbaadkc52v84fhzx3r"; depends=[bayesm coda hdrcde MASS mnormt spatstat]; };
+sideChannelAttack = derive { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[ade4 corpcor infotheo MASS mmap]; };
+sidier = derive { name="sidier"; version="3.0.1"; sha256="1vl28biy7inycn74kzq0gm3r2fd5ylkndl863jy8b3jvdrq9achk"; depends=[ape ggmap ggplot2 gridBase igraph network]; };
 sievetest = derive { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg60vf065i6mvl5n4a0bvg8vb7dw531vsw2771"; depends=[]; };
 sig = derive { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; };
 sigclust = derive { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; };
-sigloc = derive { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[nleqslv ellipse]; };
+sigloc = derive { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[ellipse nleqslv]; };
 signal = derive { name="signal"; version="0.7-5"; sha256="0v6zmy25ikkrc2ravaj7k1qzxm3zdvj6g0d55lkyjv7pb3kl5m1k"; depends=[MASS]; };
 signal_hsmm = derive { name="signal.hsmm"; version="1.2.1"; sha256="0nxhksvwkidmp5x27hxmwxbv747lrwa19b4vi6dx72hny8prgvpc"; depends=[biogram seqinr shiny]; };
 signmedian_test = derive { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; };
-simFrame = derive { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[Rcpp lattice Rcpp]; };
-simMSM = derive { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[survival mvna]; };
-simPH = derive { name="simPH"; version="1.3.2"; sha256="0zlzlan2syl51smc3wm52yiak82v1f3pjgsba3w677a37g3badls"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv reshape2 stringr survival quadprog]; };
-simPop = derive { name="simPop"; version="0.2.9"; sha256="1vi2jab57aqf1jyf87vrybz5qbhv7wdjhsm963z3cpyva2bj0i60"; depends=[lattice vcd data_table laeken MASS Rcpp e1071 nnet doParallel foreach colorspace Rcpp]; };
-simSummary = derive { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind svUnit gdata]; };
+simFrame = derive { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; };
+simMSM = derive { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[mvna survival]; };
+simPH = derive { name="simPH"; version="1.3.2"; sha256="0zlzlan2syl51smc3wm52yiak82v1f3pjgsba3w677a37g3badls"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog reshape2 stringr survival]; };
+simPop = derive { name="simPop"; version="0.2.9"; sha256="1vi2jab57aqf1jyf87vrybz5qbhv7wdjhsm963z3cpyva2bj0i60"; depends=[colorspace data_table doParallel e1071 foreach laeken lattice MASS nnet Rcpp vcd]; };
+simSummary = derive { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind gdata svUnit]; };
 simTool = derive { name="simTool"; version="1.0.3"; sha256="1x018p5mssrhz2ghs3ly9wss12503h93gl7zk0mqh1bcrzximh0k"; depends=[plyr reshape]; };
 simba = derive { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; };
 simboot = derive { name="simboot"; version="0.2-5"; sha256="0slznwk8i3z76sxbfd4y5rp28jr6jv4i5ynnckpr10i59ba04wlq"; depends=[boot mvtnorm]; };
-simcausal = derive { name="simcausal"; version="0.1"; sha256="0i39rkfmaqw0f9g3mw05rz7bf0vd4nqxwaixf8i8mvhnbn5gglv3"; depends=[data_table reshape2]; };
+simcausal = derive { name="simcausal"; version="0.2.0"; sha256="1isnax63p4xdy820lyfpbjqfz9h7k6zkhpqz87knlnz2ys1dcqa4"; depends=[data_table reshape2]; };
 simctest = derive { name="simctest"; version="2.4.1"; sha256="0v4l3dqhr551kr1kivsndk4ynkiaarp8hp65vgng4q8jm60il98c"; depends=[]; };
 simecol = derive { name="simecol"; version="0.8-6"; sha256="0h48klfwk0836byncqn9d0z8mkh6lc8qm4zivyk5af79mr5s0bn5"; depends=[deSolve]; };
 simex = derive { name="simex"; version="1.5"; sha256="01706vbmfgcg13w1kq8v5rnk5xggbd1n7fv50c6bvhdyc1dly313"; depends=[]; };
@@ -6045,40 +6066,40 @@ simpleNeural = derive { name="simpleNeural"; version="0.1.1"; sha256="0rm6kvz1mp
 simpleboot = derive { name="simpleboot"; version="1.1-3"; sha256="1qprjisfflhzg8ll12p3q1zcfdiyc45glic2j9cw9nhx5rb065fk"; depends=[boot]; };
 simplexreg = derive { name="simplexreg"; version="1.0"; sha256="144kljh968i7n2d21r4204i4h952mfrkfc8b5r6x760msgjphxvh"; depends=[Formula plotrix]; };
 simrel = derive { name="simrel"; version="1.0-1"; sha256="0905rjqh8c08vyg090h0i7sx89vdryignslldzfz2r5yrszl4ga8"; depends=[FrF2 sfsmisc]; };
-simsalapar = derive { name="simsalapar"; version="1.0-5"; sha256="1z3dwylfrl08pq2k5ppfma3ijh356qc7wwdvgyp3wmw1bcq1amyf"; depends=[sfsmisc gridBase colorspace]; };
+simsalapar = derive { name="simsalapar"; version="1.0-5"; sha256="1z3dwylfrl08pq2k5ppfma3ijh356qc7wwdvgyp3wmw1bcq1amyf"; depends=[colorspace gridBase sfsmisc]; };
 simsem = derive { name="simsem"; version="0.5-8"; sha256="1kir1c0g5xb4gzmpvx13qp071b3d5v0br3093q394wzp22d816xk"; depends=[lavaan]; };
 siplab = derive { name="siplab"; version="1.1"; sha256="1b5drhla4p7n1y1cp7kqwqzw0b286kgij9j6wsks5vjgy5qfal1x"; depends=[spatstat]; };
-sirad = derive { name="sirad"; version="2.0-7"; sha256="009icj1jil757vvsf88sgmdz40swrx1qvrhnx7wwj7p3dlh78pvw"; depends=[zoo ncdf RNetCDF raster]; };
-sirt = derive { name="sirt"; version="1.7-0"; sha256="12z1gk92rll5lxycv3gvz6y5ia5pbysq5fr3y62xn3wwgm2vrpch"; depends=[TAM CDM Rcpp mirt lavaan qgraph semPlot combinat ic_infer sfsmisc sm psych pbivnorm gtools igraph coda mvtnorm MASS Matrix lavaan_survey survey Rcpp RcppArmadillo]; };
+sirad = derive { name="sirad"; version="2.0-7"; sha256="009icj1jil757vvsf88sgmdz40swrx1qvrhnx7wwj7p3dlh78pvw"; depends=[ncdf raster RNetCDF zoo]; };
+sirt = derive { name="sirt"; version="1.7-0"; sha256="12z1gk92rll5lxycv3gvz6y5ia5pbysq5fr3y62xn3wwgm2vrpch"; depends=[CDM coda combinat gtools ic_infer igraph lavaan lavaan_survey MASS Matrix mirt mvtnorm pbivnorm psych qgraph Rcpp RcppArmadillo semPlot sfsmisc sm survey TAM]; };
 sisVIVE = derive { name="sisVIVE"; version="1.1"; sha256="1p1l07pgd88ap3bp0zwinnzda07pfg6cn92ync2pkqn5l0gmfxbs"; depends=[lars]; };
-sisus = derive { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[MASS RColorBrewer coda gdata gtools moments polyapost rcdd]; };
+sisus = derive { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[coda gdata gtools MASS moments polyapost rcdd RColorBrewer]; };
 sitar = derive { name="sitar"; version="1.0.2"; sha256="0z9r3z512s0gpkcpdbi45qdl40rp4jacpm9k0c5pjilwiga6p07z"; depends=[nlme quantreg]; };
 sitools = derive { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; };
 sivipm = derive { name="sivipm"; version="1.0-0"; sha256="1r548kfsi90rzisx37nw3w9vwj3gs4ck5zhwlskbdzgigb78spfp"; depends=[seqinr]; };
 sjPlot = derive { name="sjPlot"; version="1.8.1"; sha256="0na5c9fd4irnf1vhqhxgdhwpqyqfsqdxz47gx65r9qq294bhwc75"; depends=[car dplyr ggplot2 MASS psych scales sjmisc tidyr]; };
 sjdbc = derive { name="sjdbc"; version="1.5.0-71"; sha256="0i9wdfadfcabayq78ilcn6x6y5csazbsgd60vssa2hdff0ncgvk1"; depends=[rJava]; };
 sjmisc = derive { name="sjmisc"; version="1.0.2"; sha256="1hgmm5yjgnd2n3k0gjcv58pv0wxzx5pia38ycjix4vyjgbp01kq0"; depends=[MASS]; };
-skatMeta = derive { name="skatMeta"; version="1.4.3"; sha256="0bknv066ya4yl4hl4y02d9lglq2wkl9c2j1shzg3d64dg4sjvbak"; depends=[Matrix coxme survival CompQuadForm]; };
+skatMeta = derive { name="skatMeta"; version="1.4.3"; sha256="0bknv066ya4yl4hl4y02d9lglq2wkl9c2j1shzg3d64dg4sjvbak"; depends=[CompQuadForm coxme Matrix survival]; };
 skda = derive { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
 skewt = derive { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; };
-skmeans = derive { name="skmeans"; version="0.2-6"; sha256="02zw2y7s13hb6mx9w2yr5s2v1p5yxg3k67bhrl92g9n2jkbim3ni"; depends=[slam clue cluster]; };
+skmeans = derive { name="skmeans"; version="0.2-6"; sha256="02zw2y7s13hb6mx9w2yr5s2v1p5yxg3k67bhrl92g9n2jkbim3ni"; depends=[clue cluster slam]; };
 sla = derive { name="sla"; version="0.1"; sha256="0fr5n65ppwsh9z7a6rma9ak0bl8x3nz7v25lij7wb5nrf3sl74yb"; depends=[]; };
-slackr = derive { name="slackr"; version="1.2"; sha256="1ymj3x52wyp0mp41xnnycg0vhdmv8whimwk1hzfsqr30pccnvn9j"; depends=[httr jsonlite data_table ggplot2]; };
+slackr = derive { name="slackr"; version="1.2"; sha256="1ymj3x52wyp0mp41xnnycg0vhdmv8whimwk1hzfsqr30pccnvn9j"; depends=[data_table ggplot2 httr jsonlite]; };
 slam = derive { name="slam"; version="0.1-32"; sha256="000636dwj4kmj5w1w5s6bqixh78m7262y3fgizj7rfhcnc2gz7ad"; depends=[]; };
 sld = derive { name="sld"; version="0.3"; sha256="18xj57v9gg78d894cr1h6wp10i05hrnmwhmq6yh6211kdyj9ljp1"; depends=[lmom]; };
-slfm = derive { name="slfm"; version="0.1"; sha256="0s5q6ank6075sls9pkqhf7jlvi6gyvsbxa99c34d6ccrv88skyzq"; depends=[Rcpp coda Rcpp RcppArmadillo]; };
+slfm = derive { name="slfm"; version="0.1"; sha256="0s5q6ank6075sls9pkqhf7jlvi6gyvsbxa99c34d6ccrv88skyzq"; depends=[coda Rcpp RcppArmadillo]; };
 slp = derive { name="slp"; version="1.0-3"; sha256="09jyrp6y3rigy043d8s5i7nh89pgpvn3cv51mr729c9ccr6jdjb1"; depends=[mgcv]; };
 sm = derive { name="sm"; version="2.2-5.4"; sha256="0hnq5s2fv94gaj0nyqc1vjdjd64vsp9z23nqa8hxvjcaf996rwj9"; depends=[]; };
 smaa = derive { name="smaa"; version="0.2-3"; sha256="1vabxxyz2k10sbvrzdf51jlh59zlkjdq82vblk5s37ddmzgwnif9"; depends=[]; };
 smac = derive { name="smac"; version="1.0"; sha256="1inn7i5k0q5vln24kazh3gl3szf6lxwnjr2rw70jcyn9dr9iy952"; depends=[]; };
-smacof = derive { name="smacof"; version="1.6-2"; sha256="10yg4dxyv08wq1a74jac6jnmzhbjm6qip3vg5ca06w5pqk6lbdgn"; depends=[rgl polynom scatterplot3d Hmisc colorspace nnls]; };
+smacof = derive { name="smacof"; version="1.6-2"; sha256="10yg4dxyv08wq1a74jac6jnmzhbjm6qip3vg5ca06w5pqk6lbdgn"; depends=[colorspace Hmisc nnls polynom rgl scatterplot3d]; };
 smacpod = derive { name="smacpod"; version="1.1.1"; sha256="1pmgxvww24mcgrvv87axqvw457r5wl57scqy93inmzia2mgyva1p"; depends=[spatstat]; };
 smam = derive { name="smam"; version="0.2-2"; sha256="1p6bzk4b9kpmfs4nxmcgc46hgdpldqg0pzpc0zhvs187z2nrfw75"; depends=[Matrix]; };
-smart = derive { name="smart"; version="1.0.1"; sha256="0ki3qn71zrw0nyv395qijcwahnxyv1p21j8x6cxr9spah2wzz8lb"; depends=[Matrix gplots gtools PMA elasticnet pcaPP igraph]; };
+smart = derive { name="smart"; version="1.0.1"; sha256="0ki3qn71zrw0nyv395qijcwahnxyv1p21j8x6cxr9spah2wzz8lb"; depends=[elasticnet gplots gtools igraph Matrix pcaPP PMA]; };
 smatr = derive { name="smatr"; version="3.4-3"; sha256="0iiazln4albj7k5w67slvyn98cqg4f6k409mml0n1pvlkki0h7gy"; depends=[plyr]; };
-smbinning = derive { name="smbinning"; version="0.1"; sha256="1r3l8z875k5sjnbjg0dpkv3x122hn8g601025lfdpl2ndkbz4qms"; depends=[sqldf partykit Formula gsubfn]; };
+smbinning = derive { name="smbinning"; version="0.2"; sha256="1zps1gdn5s7ynbkxmxp5s3xvzixdkcrfyvz5qrv77s4825lkj57x"; depends=[Formula gsubfn partykit sqldf]; };
 smcUtils = derive { name="smcUtils"; version="0.2.2"; sha256="0d1kmg386j0zrpp8vgxjwvpf1i25l86xrh82767xkp0n9qj8srwq"; depends=[]; };
-smcfcs = derive { name="smcfcs"; version="1.0.0"; sha256="04r8a2p8549pq8yl92ajj893w1rj03s14q6dv14vp0873zrxkxza"; depends=[VGAM MASS survival]; };
+smcfcs = derive { name="smcfcs"; version="1.0.0"; sha256="04r8a2p8549pq8yl92ajj893w1rj03s14q6dv14vp0873zrxkxza"; depends=[MASS survival VGAM]; };
 smco = derive { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; };
 smcure = derive { name="smcure"; version="2.0"; sha256="1j7fxnb0sx57a0l929c3haz4f1y829ymlq0cvdh0cia4qp6ydv60"; depends=[survival]; };
 smdata = derive { name="smdata"; version="1.1"; sha256="1hcr093xfkp88fn75imjkmfnp9cfsng5ndxpa8m2g0l29qhpxfvk"; depends=[]; };
@@ -6086,9 +6107,10 @@ smdc = derive { name="smdc"; version="0.0.2"; sha256="1j6xnzjbmmakbmk3lyjck3bsy8
 smds = derive { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxwsx19g6mma8qzgaysdmk6vhbpd"; depends=[MASS]; };
 sme = derive { name="sme"; version="0.8"; sha256="1djrs3z699p6q2y1hfywh27csqc9cp1cfm3lxkigmmvxqjhyshz6"; depends=[lattice]; };
 smfsb = derive { name="smfsb"; version="1.1"; sha256="0khd23b6k9zgxz2x6g6c6k2g32mbpli32izdq6fgk1a990kdsp6j"; depends=[]; };
+smint = derive { name="smint"; version="0.4.0"; sha256="1qbmz67c9v45x9sqqd879gs1k0pq531bgfzg8cbll5nmc9nvig45"; depends=[lattice Matrix]; };
 smirnov = derive { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; };
-smnet = derive { name="smnet"; version="2.0"; sha256="0jd574cjkylcrlnlnw859f4vwadi1v955m2lb5z3w3gdpv0lbx3p"; depends=[SSN spam RSQLite igraph DBI]; };
-smoof = derive { name="smoof"; version="1.0"; sha256="10yvx5lr73kzjk7xn4jy97yzvv8qilrp7ilvk0fg5hyimbwlz13s"; depends=[ParamHelpers BBmisc checkmate ggplot2 RColorBrewer plot3D emoa]; };
+smnet = derive { name="smnet"; version="2.0"; sha256="0jd574cjkylcrlnlnw859f4vwadi1v955m2lb5z3w3gdpv0lbx3p"; depends=[DBI igraph RSQLite spam SSN]; };
+smoof = derive { name="smoof"; version="1.0"; sha256="10yvx5lr73kzjk7xn4jy97yzvv8qilrp7ilvk0fg5hyimbwlz13s"; depends=[BBmisc checkmate emoa ggplot2 ParamHelpers plot3D RColorBrewer]; };
 smoothHR = derive { name="smoothHR"; version="1.0.1"; sha256="02kjqkgnhjwhq1vmva9nmy36a7bc6zjj6g81dw9m4zd3y9nbb005"; depends=[survival]; };
 smoothSurv = derive { name="smoothSurv"; version="1.5-2"; sha256="07yr97nzp4mfj37v9sr37dgriq0a7kbmsj0n3lmxrzfjhinwnhij"; depends=[survival]; };
 smoother = derive { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; };
@@ -6100,30 +6122,30 @@ smss = derive { name="smss"; version="1.0-1"; sha256="17a0x92hxzn212yiz87n7ssyi3
 sn = derive { name="sn"; version="1.2-2"; sha256="1fsl2qjgk7lcjxszdfs7s159qwy6gyg7bsxpfg0l5rcf2mlbwf8m"; depends=[mnormt numDeriv]; };
 sna = derive { name="sna"; version="2.3-2"; sha256="1dmdv1bi22gg4qdrjkdzdc51qsbb2bg4hn47b50lxnrywdj1b5jy"; depends=[]; };
 snapshot = derive { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; };
-snht = derive { name="snht"; version="1.0.2"; sha256="1rs9q8fmvz3x21ymbmgmgkqr7hqf3ya3xb33zj31px799jlldpb9"; depends=[ggplot2 gridExtra mgcv zoo plyr reshape]; };
-snipEM = derive { name="snipEM"; version="1.0"; sha256="0f98c3ycl0g0l3sgjgk7xrjp6ss7n8zzlyzvpcb6agc60cnw3w03"; depends=[Rcpp mvtnorm MASS GSE Rcpp RcppArmadillo]; };
+snht = derive { name="snht"; version="1.0.2"; sha256="1rs9q8fmvz3x21ymbmgmgkqr7hqf3ya3xb33zj31px799jlldpb9"; depends=[ggplot2 gridExtra mgcv plyr reshape zoo]; };
+snipEM = derive { name="snipEM"; version="1.0"; sha256="0f98c3ycl0g0l3sgjgk7xrjp6ss7n8zzlyzvpcb6agc60cnw3w03"; depends=[GSE MASS mvtnorm Rcpp RcppArmadillo]; };
 snow = derive { name="snow"; version="0.3-13"; sha256="1habq43ncac9609xky3nqfkbq52cz36dg8jbdihag269z1kazdnf"; depends=[]; };
 snowFT = derive { name="snowFT"; version="1.3-0"; sha256="10hhhzzzyz1ph7c8k08s79h4pdwq4jk8bh47y37ww0yjq0fd6gik"; depends=[snow]; };
 snowfall = derive { name="snowfall"; version="1.84-6"; sha256="1n9v9m4c02pspgkxfmq7zdk41s2vjcsk06b0kz9km4xy1x7k0hsg"; depends=[snow]; };
 snp_plotter = derive { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; };
-snpEnrichment = derive { name="snpEnrichment"; version="1.6.3"; sha256="0hg1cgyr4nlrqfv60aky8ljwh46ldslca3jmb6v6criyz6knqdv3"; depends=[]; };
+snpEnrichment = derive { name="snpEnrichment"; version="1.6.3"; sha256="0hg1cgyr4nlrqfv60aky8ljwh46ldslca3jmb6v6criyz6knqdv3"; depends=[snpStats]; };
 snpRF = derive { name="snpRF"; version="0.4"; sha256="1amxc4jprrc6n5w5h9jm2as025gqdqkla2asz7x97sjdnnj9kzzn"; depends=[]; };
-snpStatsWriter = derive { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace]; };
+snpStatsWriter = derive { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace snpStats]; };
 snpar = derive { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxgar1wcf6gyg0xwbmw0qc41myzfnq"; depends=[]; };
-snplist = derive { name="snplist"; version="0.13"; sha256="1v9n3gdvygx4s6hlm0ijyw04szxwn9c1dqnhaqn61a8yfkmmnxn8"; depends=[RSQLite Rcpp R_utils DBI Rcpp]; };
-sns = derive { name="sns"; version="1.0.0"; sha256="0qr5gj095xg48mqj7maz1m1zizx1jdjca8qygygqvak1b7nl4ccs"; depends=[mvtnorm coda]; };
-soc_ca = derive { name="soc.ca"; version="0.7.1"; sha256="0lg1bpbd0crywa29xc79cn3kr614wq4hr09xpwk17nv7q8qw8cnh"; depends=[ggplot2 gridExtra ellipse scales]; };
+snplist = derive { name="snplist"; version="0.13"; sha256="1v9n3gdvygx4s6hlm0ijyw04szxwn9c1dqnhaqn61a8yfkmmnxn8"; depends=[biomaRt DBI R_utils Rcpp RSQLite]; };
+sns = derive { name="sns"; version="1.0.0"; sha256="0qr5gj095xg48mqj7maz1m1zizx1jdjca8qygygqvak1b7nl4ccs"; depends=[coda mvtnorm]; };
+soc_ca = derive { name="soc.ca"; version="0.7.1"; sha256="0lg1bpbd0crywa29xc79cn3kr614wq4hr09xpwk17nv7q8qw8cnh"; depends=[ellipse ggplot2 gridExtra scales]; };
 softImpute = derive { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m1455i139952rmryjlic4s2f2hscl5zxxmfdxcq"; depends=[Matrix]; };
 softclassval = derive { name="softclassval"; version="1.0-20150416"; sha256="1zrf0nmyy4pfs4dzardghzznw1ahl21w4nykfh2pp8il4dpi21fs"; depends=[arrayhelpers svUnit]; };
-soil_spec = derive { name="soil.spec"; version="2.1.4"; sha256="129iqr6fdvlchq56jmy34s6qc2j5fcfir6pa5as5prw0djyvbdv0"; depends=[pls KernSmooth wavelets hexView sp GSIF]; };
-soilDB = derive { name="soilDB"; version="1.5-4"; sha256="1n8ybryrg88m12qb6bwiqs04dxgbs4nv8ay27d2vi0xrkqhs99k2"; depends=[aqp plyr Hmisc RCurl XML sp]; };
-soilphysics = derive { name="soilphysics"; version="2.3"; sha256="1d64jaw5ra1l0za2kpigqfdf52a5zrxy9j9g2g7f5yffqsp0jwb5"; depends=[rpanel MASS]; };
+soil_spec = derive { name="soil.spec"; version="2.1.4"; sha256="129iqr6fdvlchq56jmy34s6qc2j5fcfir6pa5as5prw0djyvbdv0"; depends=[GSIF hexView KernSmooth pls sp wavelets]; };
+soilDB = derive { name="soilDB"; version="1.5-4"; sha256="1n8ybryrg88m12qb6bwiqs04dxgbs4nv8ay27d2vi0xrkqhs99k2"; depends=[aqp Hmisc plyr RCurl sp XML]; };
+soilphysics = derive { name="soilphysics"; version="2.3"; sha256="1d64jaw5ra1l0za2kpigqfdf52a5zrxy9j9g2g7f5yffqsp0jwb5"; depends=[MASS rpanel]; };
 soilprofile = derive { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; };
-soiltexture = derive { name="soiltexture"; version="1.3.3"; sha256="1a0j10f6mxwrslqd4fvc1nqvsh47ly1nyhc6l0qq1iz6ffqd37mx"; depends=[sp MASS]; };
+soiltexture = derive { name="soiltexture"; version="1.3.3"; sha256="1a0j10f6mxwrslqd4fvc1nqvsh47ly1nyhc6l0qq1iz6ffqd37mx"; depends=[MASS sp]; };
 soilwater = derive { name="soilwater"; version="1.0.1"; sha256="08rz1i5dsgwfvfd4sl5x9j970v82v3kny0rqg1zbdnr53vp2xc7j"; depends=[]; };
-solaR = derive { name="solaR"; version="0.41"; sha256="003f8dka0jqlfshzc3d4z9frq5jb5nq6sw3sm44x7rj79w3ynpyg"; depends=[zoo lattice latticeExtra RColorBrewer]; };
-solarius = derive { name="solarius"; version="0.2.3"; sha256="164va71v77b0lyhccgrb47idhi7dlgyyw1vbs2iqci77ld6x50yl"; depends=[plyr ggplot2 data_table]; };
-solr = derive { name="solr"; version="0.1.4"; sha256="0b1f6mf8fi2ql8j06b0mkk7nyy5wj1zsg46lfxi6bp8n4ywbym9n"; depends=[plyr httr XML assertthat rjson]; };
+solaR = derive { name="solaR"; version="0.41"; sha256="003f8dka0jqlfshzc3d4z9frq5jb5nq6sw3sm44x7rj79w3ynpyg"; depends=[lattice latticeExtra RColorBrewer zoo]; };
+solarius = derive { name="solarius"; version="0.2.3"; sha256="164va71v77b0lyhccgrb47idhi7dlgyyw1vbs2iqci77ld6x50yl"; depends=[data_table ggplot2 plyr]; };
+solr = derive { name="solr"; version="0.1.4"; sha256="0b1f6mf8fi2ql8j06b0mkk7nyy5wj1zsg46lfxi6bp8n4ywbym9n"; depends=[assertthat httr plyr rjson XML]; };
 som = derive { name="som"; version="0.3-5"; sha256="01xsysmqj0zhzifqpwcrs0mflh56ndv4q3nm5n5imx7wmzx2lrzp"; depends=[]; };
 soma = derive { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; };
 someKfwer = derive { name="someKfwer"; version="1.2"; sha256="0widny5l04ja91fy16x4giwrabwqhx0fs3yl48pv9xh4zj6sx563"; depends=[]; };
@@ -6132,139 +6154,139 @@ somebm = derive { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4c
 somplot = derive { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; };
 sonicLength = derive { name="sonicLength"; version="1.4.4"; sha256="1v46xzx3jxxxs2biyrq6xbv2lhpz1i95la93hj6dl4jfyikmx0im"; depends=[]; };
 soobench = derive { name="soobench"; version="1.0-73"; sha256="1y2r061pd4kr0kdgp8db3qy2aj07jdiyvy2py4fmwg6b8pcf9y0l"; depends=[]; };
-sortinghat = derive { name="sortinghat"; version="0.1"; sha256="1wrxwhdp3gj1ra0rgldnmc0w019bnjb6z9j20c5p1ab09x4dmlny"; depends=[MASS bdsmatrix mvtnorm]; };
-sorvi = derive { name="sorvi"; version="0.7.20"; sha256="1cd0lg74lfdbkp314i40asc3vshs1acb20wz1cxzg62vyz6ia055"; depends=[reshape ggplot2 plyr RColorBrewer XML]; };
+sortinghat = derive { name="sortinghat"; version="0.1"; sha256="1wrxwhdp3gj1ra0rgldnmc0w019bnjb6z9j20c5p1ab09x4dmlny"; depends=[bdsmatrix MASS mvtnorm]; };
+sorvi = derive { name="sorvi"; version="0.7.20"; sha256="1cd0lg74lfdbkp314i40asc3vshs1acb20wz1cxzg62vyz6ia055"; depends=[ggplot2 plyr RColorBrewer reshape XML]; };
 sos = derive { name="sos"; version="1.3-8"; sha256="0vcgq8hpgdnlmkxc7qh1jqigr0gvm9x3w4ijbhma7x4i5fx3c2il"; depends=[brew]; };
-sos4R = derive { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6la32xf928rsiznbywpxghnypsrcgg"; depends=[XML RCurl sp]; };
+sos4R = derive { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6la32xf928rsiznbywpxghnypsrcgg"; depends=[RCurl sp XML]; };
 sotkanet = derive { name="sotkanet"; version="0.9.10"; sha256="0nshd6caxxayr7w39d6ildz42aarr3ff8iyfpwjd544yhblkj7jh"; depends=[ggplot2 RCurl rjson]; };
-soundecology = derive { name="soundecology"; version="1.3"; sha256="1kcmsas359xcwqd0lxffr5p996jikqdag6idibq57qb6rnz3hgfz"; depends=[pracma oce ineq vegan tuneR seewave]; };
+soundecology = derive { name="soundecology"; version="1.3"; sha256="1kcmsas359xcwqd0lxffr5p996jikqdag6idibq57qb6rnz3hgfz"; depends=[ineq oce pracma seewave tuneR vegan]; };
 source_gist = derive { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; };
 sp = derive { name="sp"; version="1.1-1"; sha256="1485jylvwbf99snbmp0xs13h5wlvfgwf04cbny4zgn43nipsvsik"; depends=[lattice]; };
 sp23design = derive { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; };
-spBayes = derive { name="spBayes"; version="0.3-9"; sha256="1zdyz5jqbixwj59q9f1x8f3knz0jwdfl0abj0w6cxrllkb38yg10"; depends=[coda magic abind Formula]; };
-spBayesSurv = derive { name="spBayesSurv"; version="1.0.2"; sha256="0pxndjksrd22p60pvc4czxwqhrpx5ik0yr23nz7kmg6wnp36hc6w"; depends=[Rcpp survival coda Rcpp RcppArmadillo]; };
+spBayes = derive { name="spBayes"; version="0.3-9"; sha256="1zdyz5jqbixwj59q9f1x8f3knz0jwdfl0abj0w6cxrllkb38yg10"; depends=[abind coda Formula magic]; };
+spBayesSurv = derive { name="spBayesSurv"; version="1.0.2"; sha256="0pxndjksrd22p60pvc4czxwqhrpx5ik0yr23nz7kmg6wnp36hc6w"; depends=[coda Rcpp RcppArmadillo survival]; };
 spMC = derive { name="spMC"; version="0.3.6"; sha256="0h71m55jmv80kx5ccsrpsakrh4qw5f3kx2qizwi10jlybwggqv0m"; depends=[]; };
 spTDyn = derive { name="spTDyn"; version="1.0"; sha256="0yrnbf9g1n1hrrra2vp6412wfky1bhy3b6raif9k82xvi9p9m6pz"; depends=[coda sp]; };
 spTest = derive { name="spTest"; version="0.1.0"; sha256="0asfgf0dx72025q41ndzgwm2n471lwha7bcc1dfk3zwib75w3lgl"; depends=[]; };
-spThin = derive { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[spam fields knitr]; };
+spThin = derive { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[fields knitr spam]; };
 spTimer = derive { name="spTimer"; version="2.0-0"; sha256="0ldby68p4y5cz5dj2m33jcbgd3mw9nv0py4llg8aj10bxylarmfv"; depends=[coda sp]; };
 spa = derive { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; };
-spaMM = derive { name="spaMM"; version="1.5.1"; sha256="1sv5ndg7jmyivwkj7y7i4da862qb8p3z7m83vmbphwbykpl7jfs5"; depends=[Matrix MASS lpSolveAPI proxy geometry Rcpp nlme Rcpp RcppEigen]; };
+spaMM = derive { name="spaMM"; version="1.5.1"; sha256="1sv5ndg7jmyivwkj7y7i4da862qb8p3z7m83vmbphwbykpl7jfs5"; depends=[geometry lpSolveAPI MASS Matrix nlme proxy Rcpp RcppEigen]; };
 spaa = derive { name="spaa"; version="0.2.1"; sha256="0qlfbfvv97avbnixm5dz9il3dmd40wnpvv33jh7fa0mh740bircy"; depends=[]; };
 space = derive { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; };
-spaceExt = derive { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[limSolve glasso]; };
+spaceExt = derive { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[glasso limSolve]; };
 spacejam = derive { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; };
-spacetime = derive { name="spacetime"; version="1.1-4"; sha256="1amxdjjqxibllwnb70chqmfnn66n95yf0wjmbrkjnzjszhbb25q2"; depends=[sp zoo xts intervals lattice]; };
-spacodiR = derive { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[picante colorspace Rcpp Rcpp]; };
-spacom = derive { name="spacom"; version="1.0-4"; sha256="1jfsbgy7b0mwl4n2pgrkkghx9p8b0wipvg4c5jar6v8ydby6qg94"; depends=[spdep foreach iterators lme4 nlme Matrix]; };
+spacetime = derive { name="spacetime"; version="1.1-4"; sha256="1amxdjjqxibllwnb70chqmfnn66n95yf0wjmbrkjnzjszhbb25q2"; depends=[intervals lattice sp xts zoo]; };
+spacodiR = derive { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[colorspace picante Rcpp]; };
+spacom = derive { name="spacom"; version="1.0-4"; sha256="1jfsbgy7b0mwl4n2pgrkkghx9p8b0wipvg4c5jar6v8ydby6qg94"; depends=[foreach iterators lme4 Matrix nlme spdep]; };
 spam = derive { name="spam"; version="1.0-1"; sha256="033s5ka05kg97fmc3l1li3z6x5225rwhrdxh57wwn4axrjwy1nyy"; depends=[]; };
 spanel = derive { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; };
 spanr = derive { name="spanr"; version="1.0"; sha256="1x29hky347kvmk9q75884vf6msgcmfi3w4lyarq99aasi442n1ps"; depends=[plyr stringr survival]; };
 sparc = derive { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; };
 sparcl = derive { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; };
-spareserver = derive { name="spareserver"; version="1.0.0"; sha256="0vaql5v3337xh1ifjziav3v7fkjff4zhrz557mgy75ham554gs7c"; depends=[assertthat pingr httr]; };
+spareserver = derive { name="spareserver"; version="1.0.0"; sha256="0vaql5v3337xh1ifjziav3v7fkjff4zhrz557mgy75ham554gs7c"; depends=[assertthat httr pingr]; };
 spark = derive { name="spark"; version="1.0.0"; sha256="0ryc7kq3hx8nd5m999p1y7lxli6x862y6hqpv8xwpqak0y863p6m"; depends=[magrittr]; };
-sparkTable = derive { name="sparkTable"; version="1.0.0"; sha256="1d5vv7whayblq5g4pjrngkqf3d1pi4f0gibnskllv7rdad10n4nd"; depends=[Cairo gridExtra ggplot2 shiny Rglpk xtable StatMatch boot pixmap RGraphics]; };
+sparkTable = derive { name="sparkTable"; version="1.0.0"; sha256="1d5vv7whayblq5g4pjrngkqf3d1pi4f0gibnskllv7rdad10n4nd"; depends=[boot Cairo ggplot2 gridExtra pixmap Rglpk RGraphics shiny StatMatch xtable]; };
 sparktex = derive { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; };
-sparr = derive { name="sparr"; version="0.3-6"; sha256="1imgph2bf575rm06l4vsz0nhizkrwa3p5j6b6gdn30l0hlhxjp0j"; depends=[spatstat rgl MASS]; };
-sparseBC = derive { name="sparseBC"; version="1.1"; sha256="1w60n2875n809lbrn0hd4kdmsyfd64aikgzxchza8b59x77l0psy"; depends=[glasso fields]; };
-sparseHessianFD = derive { name="sparseHessianFD"; version="0.2.0"; sha256="1sj9d2d8bfjd00jr682gj21d4y0hjm91l3hj7356fpq461nb9pl8"; depends=[Rcpp Matrix Rcpp RcppEigen]; };
-sparseLDA = derive { name="sparseLDA"; version="0.1-6"; sha256="0k9v2pjx4q4nhvpjhv496v4gfr5h19w0h2h7za7j6zqfn6aygvz6"; depends=[lars elasticnet MASS mda]; };
-sparseLTSEigen = derive { name="sparseLTSEigen"; version="0.2.0"; sha256="11llmrkq0pnrdphgjvhmg269bq3xbbn4s7kd7xhvk62sigvspkcj"; depends=[robustHD Rcpp RcppEigen Rcpp RcppEigen]; };
+sparr = derive { name="sparr"; version="0.3-6"; sha256="1imgph2bf575rm06l4vsz0nhizkrwa3p5j6b6gdn30l0hlhxjp0j"; depends=[MASS rgl spatstat]; };
+sparseBC = derive { name="sparseBC"; version="1.1"; sha256="1w60n2875n809lbrn0hd4kdmsyfd64aikgzxchza8b59x77l0psy"; depends=[fields glasso]; };
+sparseHessianFD = derive { name="sparseHessianFD"; version="0.2.0"; sha256="1sj9d2d8bfjd00jr682gj21d4y0hjm91l3hj7356fpq461nb9pl8"; depends=[Matrix Rcpp RcppEigen]; };
+sparseLDA = derive { name="sparseLDA"; version="0.1-6"; sha256="0k9v2pjx4q4nhvpjhv496v4gfr5h19w0h2h7za7j6zqfn6aygvz6"; depends=[elasticnet lars MASS mda]; };
+sparseLTSEigen = derive { name="sparseLTSEigen"; version="0.2.0"; sha256="11llmrkq0pnrdphgjvhmg269bq3xbbn4s7kd7xhvk62sigvspkcj"; depends=[Rcpp RcppEigen robustHD]; };
 sparseMVN = derive { name="sparseMVN"; version="0.2.0"; sha256="12g387bvpy4249kwq946v006ab095zsmgfsrkc1yqncxhmjwrgqn"; depends=[Matrix]; };
 sparseSEM = derive { name="sparseSEM"; version="2.5"; sha256="0ig8apsi94kvbcq3i8nzmywbdizlss7c6r9bppcyl9lxgikc3cds"; depends=[]; };
-sparsediscrim = derive { name="sparsediscrim"; version="0.2"; sha256="0m8ccmqpg1np738njavf736qh917hd3blywyzc3vwa1xl59wqccl"; depends=[corpcor bdsmatrix mvtnorm]; };
+sparsediscrim = derive { name="sparsediscrim"; version="0.2"; sha256="0m8ccmqpg1np738njavf736qh917hd3blywyzc3vwa1xl59wqccl"; depends=[bdsmatrix corpcor mvtnorm]; };
 sparsenet = derive { name="sparsenet"; version="1.2"; sha256="106a2q4syrcnmicrx92gnbsf2i5ml7pidwghrpl6926glj59j248"; depends=[glmnet shape]; };
 spartan = derive { name="spartan"; version="2.2.1"; sha256="1syrvx3gmgsi3f49j27zg59b3i29v20352qbsc5mrqnwh5lawi1y"; depends=[]; };
 spatcounts = derive { name="spatcounts"; version="1.1"; sha256="0rp8054aiwc62r1m3l4v5dh3cavbs5h2yb01453bw9rwis1pj2qm"; depends=[]; };
 spate = derive { name="spate"; version="1.4"; sha256="1cr63qm3hgz6viw6ynzjv7q5ckfsan7zhbp224gz4cgx5yjg0pn3"; depends=[mvtnorm truncnorm]; };
 spatgraphs = derive { name="spatgraphs"; version="2.62"; sha256="1h7sv6qc5zhaiaqlrzagrlc2mxlasdzilmi5q9nrd1vsdzsqxvb4"; depends=[]; };
 spatial = derive { name="spatial"; version="7.3-9"; sha256="12qhfqmznij1jddjklhlqzywcfw2hww8sff7b2m6mjxlky08p5jg"; depends=[]; };
-spatial_gev_bma = derive { name="spatial.gev.bma"; version="1.0"; sha256="1rjn0gsbgiv69brhnm0zj25ya3nyfh4yf6jizng85mvss3viv3hj"; depends=[SpatialExtremes msm coda]; };
-spatial_tools = derive { name="spatial.tools"; version="1.4.8"; sha256="0qnsjfx974na87p3n7sp711sc13v6dmpvb2kjpvscixs8rsy03y1"; depends=[iterators foreach rgdal raster mmap abind doParallel]; };
+spatial_gev_bma = derive { name="spatial.gev.bma"; version="1.0"; sha256="1rjn0gsbgiv69brhnm0zj25ya3nyfh4yf6jizng85mvss3viv3hj"; depends=[coda msm SpatialExtremes]; };
+spatial_tools = derive { name="spatial.tools"; version="1.4.8"; sha256="0qnsjfx974na87p3n7sp711sc13v6dmpvb2kjpvscixs8rsy03y1"; depends=[abind doParallel foreach iterators mmap raster rgdal]; };
 spatialCovariance = derive { name="spatialCovariance"; version="0.6-8"; sha256="06z6jz9sadqc382w07ysnnlhqc96hxaasz9wncbhipd4cd1y4daa"; depends=[]; };
-spatialEco = derive { name="spatialEco"; version="0.1-1"; sha256="1k7xdgg541mwr9rk3h8pi7hgb61wza14azvmbxqd92m29p2yqn00"; depends=[RANN rms sp raster spatstat cluster spdep SDMTools RCurl rgeos]; };
+spatialEco = derive { name="spatialEco"; version="0.1-1"; sha256="1k7xdgg541mwr9rk3h8pi7hgb61wza14azvmbxqd92m29p2yqn00"; depends=[cluster RANN raster RCurl rgeos rms SDMTools sp spatstat spdep]; };
 spatialTailDep = derive { name="spatialTailDep"; version="1.0.2"; sha256="107yldc43pgbadxdisnc7vq8vyvcps1b1isyvxd0kyf59xldiq47"; depends=[cubature mvtnorm SpatialExtremes]; };
 spatialkernel = derive { name="spatialkernel"; version="0.4-19"; sha256="0gbl6lrbaxzv2f975k0vd6ghrljgf1kjazld3hm7781kv1f87lji"; depends=[]; };
-spatialnbda = derive { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[SocialNetworks mvtnorm]; };
-spatialprobit = derive { name="spatialprobit"; version="0.9-10"; sha256="1z88nss69pixazqk3b6rpyc7mjryfznrgw9swfyfxky0bsdfj6mv"; depends=[Matrix spdep mvtnorm tmvtnorm]; };
+spatialnbda = derive { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; };
+spatialprobit = derive { name="spatialprobit"; version="0.9-10"; sha256="1z88nss69pixazqk3b6rpyc7mjryfznrgw9swfyfxky0bsdfj6mv"; depends=[Matrix mvtnorm spdep tmvtnorm]; };
 spatialsegregation = derive { name="spatialsegregation"; version="2.40"; sha256="0kpna2198nrj93bjsdgvj85wnjfj18psdq919fjnnhbzgzdkxs7l"; depends=[spatstat]; };
-spatstat = derive { name="spatstat"; version="1.42-1"; sha256="10889xg5l7vjmlv79dhdayifplzxhnykhhgjpsn54rncz0k0hd0p"; depends=[mgcv Matrix deldir abind tensor polyclip goftest]; };
-spatsurv = derive { name="spatsurv"; version="0.9-9"; sha256="1zvf8n4isaxi8n47qvgw6zqrgsnf3g6jpm19k6w6zbp9v5r8fw7r"; depends=[survival sp spatstat raster iterators RandomFields fields rgl Matrix stringr rgeos RColorBrewer geostatsp]; };
+spatstat = derive { name="spatstat"; version="1.42-1"; sha256="10889xg5l7vjmlv79dhdayifplzxhnykhhgjpsn54rncz0k0hd0p"; depends=[abind deldir goftest Matrix mgcv polyclip tensor]; };
+spatsurv = derive { name="spatsurv"; version="0.9-9"; sha256="1zvf8n4isaxi8n47qvgw6zqrgsnf3g6jpm19k6w6zbp9v5r8fw7r"; depends=[fields geostatsp iterators Matrix RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; };
 spc = derive { name="spc"; version="0.5.1"; sha256="1299lhk8snrhm7xpq0ccmq5kmpapc13rxcyvljs4c7frj645rwz4"; depends=[]; };
 spca = derive { name="spca"; version="0.6.0"; sha256="156bz3w3999vhjpsa9cs21rf2r9hv49vw1pfak0r37kbvf2d4rm6"; depends=[MASS]; };
 spcadjust = derive { name="spcadjust"; version="0.1-3"; sha256="1l6m4aisk780znpjr7lnlh0z42rbc2jyblv17hafbr1siymrasc2"; depends=[]; };
-spcosa = derive { name="spcosa"; version="0.3-5"; sha256="15q0f2sfhm1b13zs5a50yfvqhgcn4fyncf0h5ivin2k9g5xvq4k4"; depends=[rJava ggplot2 sp]; };
+spcosa = derive { name="spcosa"; version="0.3-5"; sha256="15q0f2sfhm1b13zs5a50yfvqhgcn4fyncf0h5ivin2k9g5xvq4k4"; depends=[ggplot2 rJava sp]; };
 spcov = derive { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; };
 spcr = derive { name="spcr"; version="1.2.1"; sha256="0cm59cfw3c24i1br08fdzsz426ldljxb41pdrmbmma4a69jkv1sb"; depends=[]; };
 spd = derive { name="spd"; version="2.0-0"; sha256="0aznzj68gynhx295gdb4sb7xxjiya4vbdg3gshfs0mwg1qzrhxy9"; depends=[KernSmooth]; };
-spdep = derive { name="spdep"; version="0.5-88"; sha256="1m2bxbf472xq7wr76znjirslx3hb1ylk6lp7x5003ka3i2zpakxn"; depends=[sp Matrix LearnBayes deldir boot coda nlme MASS]; };
-spdynmod = derive { name="spdynmod"; version="1.0"; sha256="05gaaln14lrrds43l2f9hw43c86gswyzymz97hc3mci1cgiwfwbz"; depends=[deSolve raster animation]; };
+spdep = derive { name="spdep"; version="0.5-88"; sha256="1m2bxbf472xq7wr76znjirslx3hb1ylk6lp7x5003ka3i2zpakxn"; depends=[boot coda deldir LearnBayes MASS Matrix nlme sp]; };
+spdynmod = derive { name="spdynmod"; version="1.0"; sha256="05gaaln14lrrds43l2f9hw43c86gswyzymz97hc3mci1cgiwfwbz"; depends=[animation deSolve raster]; };
 spe = derive { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; };
-speaq = derive { name="speaq"; version="1.2.1"; sha256="0glvw1jdyc8w8b8m7l74d0rl74xfs4zmanmx4i41l7ynswhmqm01"; depends=[]; };
+speaq = derive { name="speaq"; version="1.2.1"; sha256="0glvw1jdyc8w8b8m7l74d0rl74xfs4zmanmx4i41l7ynswhmqm01"; depends=[MassSpecWavelet]; };
 speccalt = derive { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; };
 specificity = derive { name="specificity"; version="0.1.1"; sha256="1gvlyx9crkzm3yyp1ln5j9czcg83k7grm6ijabhl919gjjr1p60n"; depends=[car]; };
-spectral_methods = derive { name="spectral.methods"; version="0.7.2.133"; sha256="0k8kpk94d2qzqdk3fnf6h9jmwdyp8h3klr0ilm5siwq5wkcz339l"; depends=[Rssa raster nnet abind RNetCDF ncdf_tools foreach JBTools DistributionUtils RColorBrewer]; };
+spectral_methods = derive { name="spectral.methods"; version="0.7.2.133"; sha256="0k8kpk94d2qzqdk3fnf6h9jmwdyp8h3klr0ilm5siwq5wkcz339l"; depends=[abind DistributionUtils foreach JBTools ncdf_tools nnet raster RColorBrewer RNetCDF Rssa]; };
 spectralGP = derive { name="spectralGP"; version="1.3.2"; sha256="0gzkwi3npb97y06gvsidaq75h8lg1cvkq8mr9hxp9n7ib6n924v9"; depends=[]; };
-speedglm = derive { name="speedglm"; version="0.3"; sha256="07pq0ymg7x9c9pq79d476slca43jv4682iackd446glw2qffac1y"; depends=[Matrix MASS]; };
+speedglm = derive { name="speedglm"; version="0.3"; sha256="07pq0ymg7x9c9pq79d476slca43jv4682iackd446glw2qffac1y"; depends=[MASS Matrix]; };
 speff2trial = derive { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; };
 sperich = derive { name="sperich"; version="1.5-5"; sha256="0xwzyfx3z06lapvhzdzrfr9hw2hm8d0cyfmc29p5fcplmjm24idh"; depends=[]; };
 sperrorest = derive { name="sperrorest"; version="0.2-1"; sha256="17jq8r98pq3hsyiinxg30lddxwpwi696srsvm3lfxrzk11076j6v"; depends=[ROCR rpart]; };
-spfrontier = derive { name="spfrontier"; version="0.1.12"; sha256="1jy1604gppis7vbn55pv13bywy1aqwzshwj03bbfln0qxikzqzi0"; depends=[moments ezsim tmvtnorm mvtnorm maxLik spdep]; };
+spfrontier = derive { name="spfrontier"; version="0.1.12"; sha256="1jy1604gppis7vbn55pv13bywy1aqwzshwj03bbfln0qxikzqzi0"; depends=[ezsim maxLik moments mvtnorm spdep tmvtnorm]; };
 spgrass6 = derive { name="spgrass6"; version="0.8-6"; sha256="0vpv2vycd6rdnwm1f73733x1nclhr2x4x1s5116szskni77b0pii"; depends=[sp XML]; };
 spgs = derive { name="spgs"; version="1.0"; sha256="1f75dvp6m5w5phg158ykvl4myvw6q4vysb2pc3bgm0f9fpcadfip"; depends=[]; };
 spgwr = derive { name="spgwr"; version="0.6-26"; sha256="02kwpg927r2d2zrnhb5cjp1p8j0pal344hzvzsl4d0hz0xcipp8f"; depends=[sp]; };
 sphereplot = derive { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; };
-sphet = derive { name="sphet"; version="1.6"; sha256="0149wkak7lp2hj69d83rn05fzh9bsvyc1kyg0d3b69sx92kqlwr0"; depends=[nlme spdep Matrix sp]; };
+sphet = derive { name="sphet"; version="1.6"; sha256="0149wkak7lp2hj69d83rn05fzh9bsvyc1kyg0d3b69sx92kqlwr0"; depends=[Matrix nlme sp spdep]; };
 spi = derive { name="spi"; version="1.1"; sha256="0gc504f7sji5x0kmsidnwfm7l5g4b1asl3jkn2jzsf2nvjnplx1z"; depends=[]; };
 spider = derive { name="spider"; version="1.3-0"; sha256="1p6f8mlm055xq3qwa4bqn9kvq60p8fn2w0cc6qcr22cblm5ww7jp"; depends=[ape pegas]; };
 spiders = derive { name="spiders"; version="1.0"; sha256="1n3ym9vc3vzjzm35z29sz4mz8sa25r761y0ph45srhq0lv7c66w6"; depends=[plyr]; };
-spikeSlabGAM = derive { name="spikeSlabGAM"; version="1.1-8"; sha256="0h9b3hhnsqbxbxww7jhbkqf1wl72q347naxpjjbz3q5p2y8yli4z"; depends=[ggplot2 akima coda cluster gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; };
+spikeSlabGAM = derive { name="spikeSlabGAM"; version="1.1-8"; sha256="0h9b3hhnsqbxbxww7jhbkqf1wl72q347naxpjjbz3q5p2y8yli4z"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; };
 spikeslab = derive { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; };
 splancs = derive { name="splancs"; version="2.01-37"; sha256="0q548i76107laa9yrsjxqvwhl8zyhlib557qqr8aa7kjg6j0p5fn"; depends=[sp]; };
 splitstackshape = derive { name="splitstackshape"; version="1.4.2"; sha256="0m9karfh0pcy0jj3dzq87vybxv9gmcrq5m2k7byxpki95apbrsmg"; depends=[data_table]; };
-splm = derive { name="splm"; version="1.3-7"; sha256="1bfi80vg129v8d0vp7sigbhskl227lmbry1vmklvcczrjqf2bh45"; depends=[spdep plm maxLik MASS bdsmatrix ibdreg nlme Matrix spam]; };
+splm = derive { name="splm"; version="1.3-7"; sha256="1bfi80vg129v8d0vp7sigbhskl227lmbry1vmklvcczrjqf2bh45"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; };
 spls = derive { name="spls"; version="2.2-1"; sha256="0zgk9qd825zqgikpkg13jm8hi6ncg48qw5f985bi145nwy9j19xs"; depends=[MASS nnet pls]; };
 splus2R = derive { name="splus2R"; version="1.2-0"; sha256="0kmyr1azyh0m518kzwvvgz7hv1x5myj37xn7w2gfn0vbn5xl8pv1"; depends=[]; };
 splusTimeDate = derive { name="splusTimeDate"; version="2.5.0-135"; sha256="0hghggdcr70vfjx4npj37nmd96qvgrp1gpwa9bznvjkvyfawwy6i"; depends=[]; };
 splusTimeSeries = derive { name="splusTimeSeries"; version="1.5.0-73"; sha256="1csk0ffgg1bi2k1m2bbxl6aqqqxf6i8sc8d4azip8ck7rn8vya46"; depends=[splusTimeDate]; };
-spnet = derive { name="spnet"; version="0.9.0.6"; sha256="1kbf53ww2wdr2nsml9zhzd80dhi48izw1nwjszv9jqidd6nk7v29"; depends=[sp shape]; };
-spocc = derive { name="spocc"; version="0.2.4"; sha256="0hhjdx3vgzfwf368pvmapgb5hll659mwkyzvgagvzz90sm44134a"; depends=[ggplot2 rgbif rinat rbison ecoengine rebird AntWeb ggmap maptools rworldmap sp rgeos lubridate RColorBrewer httr rgdal leafletR whisker gistr]; };
+spnet = derive { name="spnet"; version="0.9.0.6"; sha256="1kbf53ww2wdr2nsml9zhzd80dhi48izw1nwjszv9jqidd6nk7v29"; depends=[shape sp]; };
+spocc = derive { name="spocc"; version="0.2.4"; sha256="0hhjdx3vgzfwf368pvmapgb5hll659mwkyzvgagvzz90sm44134a"; depends=[AntWeb ecoengine ggmap ggplot2 gistr httr leafletR lubridate maptools rbison RColorBrewer rebird rgbif rgdal rgeos rinat rworldmap sp whisker]; };
 sporm = derive { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; };
 sprex = derive { name="sprex"; version="1.1"; sha256="1lwkdi8g1dlfdnxxvspgpz6f5h2gml176xhfrcxa9gcy3y9rlcpm"; depends=[]; };
-sprint = derive { name="sprint"; version="1.0.7"; sha256="1yzx1qjpxx9yc0hbm1mmha5b7aq13iflq66af597b7yj6abm7zjp"; depends=[rlecuyer ff randomForest boot e1071]; };
-sprinter = derive { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs0w4235a8raip5rfbxskl0dw7701ryh7n8g"; depends=[CoxBoost survival GAMBoost randomForestSRC LogicReg]; };
-sprm = derive { name="sprm"; version="1.1"; sha256="0xnbdnzgf54r93bvnyjcdcqlr0q7s7f2cvayw681zi0ig3z633j0"; depends=[ggplot2 cvTools reshape2 pcaPP]; };
+sprint = derive { name="sprint"; version="1.0.7"; sha256="1yzx1qjpxx9yc0hbm1mmha5b7aq13iflq66af597b7yj6abm7zjp"; depends=[boot e1071 ff randomForest rlecuyer]; };
+sprinter = derive { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs0w4235a8raip5rfbxskl0dw7701ryh7n8g"; depends=[CoxBoost GAMBoost LogicReg randomForestSRC survival]; };
+sprm = derive { name="sprm"; version="1.1"; sha256="0xnbdnzgf54r93bvnyjcdcqlr0q7s7f2cvayw681zi0ig3z633j0"; depends=[cvTools ggplot2 pcaPP reshape2]; };
 sprsmdl = derive { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; };
 spsmooth = derive { name="spsmooth"; version="1.1-3"; sha256="09b740586zyi8npq0bmy8qifs9rq0rzhs9c300fr6pjpc7134xn4"; depends=[mgcv]; };
-spsurvey = derive { name="spsurvey"; version="3.0"; sha256="15i10a6hhk1wwnyd4lbrqaql8i4s10302bxmpr0s5cyifs084l77"; depends=[sp deldir foreign MASS rgeos]; };
+spsurvey = derive { name="spsurvey"; version="3.0"; sha256="15i10a6hhk1wwnyd4lbrqaql8i4s10302bxmpr0s5cyifs084l77"; depends=[deldir foreign MASS rgeos sp]; };
 spt = derive { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; };
-sptm = derive { name="sptm"; version="14.10-11"; sha256="1g7dqfsyy0cvv3idx16bpny9z4f638aprbc50x8kk4zfk3km7wnr"; depends=[survival survey kyotil]; };
-spuRs = derive { name="spuRs"; version="2.0.0"; sha256="0lbc3nny6idijdaxrxfkfrn40bxfyp9z3yl9mwb1k6cyd10v5mfj"; depends=[MASS lattice]; };
-sqldf = derive { name="sqldf"; version="0.4-10"; sha256="0n8yvrg3gjgbc3vzq0vlf7fwhgm28kwf0jv25qy44x21n6fg11h7"; depends=[gsubfn proto RSQLite DBI chron]; };
-sqliter = derive { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[stringr functional DBI RSQLite]; };
-sqlshare = derive { name="sqlshare"; version="1.0.3"; sha256="1qy8vlzi6i4wsr53i71jlsv1b7ww254mbk2qzsvmcrranf42zbp8"; depends=[RCurl]; };
-sqlutils = derive { name="sqlutils"; version="1.2"; sha256="0dq4idg8i4hv9xg8jllllizqf3s75pdfm1wgncdjj52xhxh169pf"; depends=[roxygen2 stringr DBI]; };
+sptm = derive { name="sptm"; version="14.10-11"; sha256="1g7dqfsyy0cvv3idx16bpny9z4f638aprbc50x8kk4zfk3km7wnr"; depends=[kyotil survey survival]; };
+spuRs = derive { name="spuRs"; version="2.0.0"; sha256="0lbc3nny6idijdaxrxfkfrn40bxfyp9z3yl9mwb1k6cyd10v5mfj"; depends=[lattice MASS]; };
+sqldf = derive { name="sqldf"; version="0.4-10"; sha256="0n8yvrg3gjgbc3vzq0vlf7fwhgm28kwf0jv25qy44x21n6fg11h7"; depends=[chron DBI gsubfn proto RSQLite]; };
+sqliter = derive { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[DBI functional RSQLite stringr]; };
+sqlutils = derive { name="sqlutils"; version="1.2"; sha256="0dq4idg8i4hv9xg8jllllizqf3s75pdfm1wgncdjj52xhxh169pf"; depends=[DBI roxygen2 stringr]; };
 squash = derive { name="squash"; version="1.0.6"; sha256="16iplngzzlif999z821a9bwx9jlmikdvwnk6p6d9w75b1fsbc0pz"; depends=[]; };
 sra = derive { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; };
-srd = derive { name="srd"; version="1.0"; sha256="04j2gj7fn7p2rm34haayswrfhn6w5lln439d07m9g4c020kqqsr3"; depends=[plyr animation colorspace stringr survival]; };
-ss3sim = derive { name="ss3sim"; version="0.8.2"; sha256="1gj3kf4ccd5n2jr4sm50gny5x1zq4brkhqgw0nww41spnimascfr"; depends=[plyr r4ss gtools lubridate reshape2]; };
+srd = derive { name="srd"; version="1.0"; sha256="04j2gj7fn7p2rm34haayswrfhn6w5lln439d07m9g4c020kqqsr3"; depends=[animation colorspace plyr stringr survival]; };
+ss3sim = derive { name="ss3sim"; version="0.8.2"; sha256="1gj3kf4ccd5n2jr4sm50gny5x1zq4brkhqgw0nww41spnimascfr"; depends=[gtools lubridate plyr r4ss reshape2]; };
 ssanv = derive { name="ssanv"; version="1.0-2"; sha256="18ib0djqxjpp4xgvsffwqgxqljpwc24ysxj26phpr6p8kdl3hr2f"; depends=[]; };
+sscor = derive { name="sscor"; version="0.1"; sha256="0bvj6kzkjgdjwia907if8jlicygkh5gnk3s159gv9wvc50rjjab3"; depends=[mvtnorm pcaPP robustbase]; };
 ssd = derive { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; };
 sse = derive { name="sse"; version="0.5-4"; sha256="126dc4gk0hynwfz887d3wdcs7xacmmjhpf82sbhmhvg73dc1r5jz"; depends=[lattice]; };
-ssfa = derive { name="ssfa"; version="1.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik spdep sp]; };
+ssfa = derive { name="ssfa"; version="1.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik sp spdep]; };
 ssfit = derive { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; };
 ssh_utils = derive { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; };
 ssize_fdr = derive { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; };
-ssizeRNA = derive { name="ssizeRNA"; version="1.1.2"; sha256="11dnc3wqj0i5blzc9ndpgl48xm5fibjgx9sxrzdcza0gbj8qpadm"; depends=[MASS ssize_fdr]; };
-ssmrob = derive { name="ssmrob"; version="0.4"; sha256="1inndspir7571f54kalbj0h599v9k6dxdmp0n1l5r3a62vn45hd3"; depends=[sampleSelection robustbase mvtnorm MASS]; };
+ssizeRNA = derive { name="ssizeRNA"; version="1.1.2"; sha256="11dnc3wqj0i5blzc9ndpgl48xm5fibjgx9sxrzdcza0gbj8qpadm"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; };
+ssmrob = derive { name="ssmrob"; version="0.4"; sha256="1inndspir7571f54kalbj0h599v9k6dxdmp0n1l5r3a62vn45hd3"; depends=[MASS mvtnorm robustbase sampleSelection]; };
 sspline = derive { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; };
 sspse = derive { name="sspse"; version="0.5-1"; sha256="0gih9d0g4kp08c4v01p699lavb491khyj16i8vldhcb194bvs8m5"; depends=[coda]; };
 sss = derive { name="sss"; version="0.0-11"; sha256="0k7p1ws0w7wg9wyxcg1zpk8q6kr32l3jl6yd9r4qmzq04dwqrdgz"; depends=[plyr XML]; };
 ssvd = derive { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; };
-ssym = derive { name="ssym"; version="1.5.3"; sha256="0d8d0s9k87w7mxlvkzj307wkmxghc0qzhn7crm3fvcb1phf115p8"; depends=[GIGrvg numDeriv normalp Formula survival]; };
-st = derive { name="st"; version="1.2.4"; sha256="1lnrzz7kc21mrs8xrqs21fcwd92d5kzhvfiq36j02982n18f6c64"; depends=[sda fdrtool corpcor]; };
-staTools = derive { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[Rcpp VGAM magicaxis Rcpp]; };
+ssym = derive { name="ssym"; version="1.5.3"; sha256="0d8d0s9k87w7mxlvkzj307wkmxghc0qzhn7crm3fvcb1phf115p8"; depends=[Formula GIGrvg normalp numDeriv survival]; };
+st = derive { name="st"; version="1.2.4"; sha256="1lnrzz7kc21mrs8xrqs21fcwd92d5kzhvfiq36j02982n18f6c64"; depends=[corpcor fdrtool sda]; };
+staTools = derive { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; };
 stab = derive { name="stab"; version="0.1.9"; sha256="1awf8bj3c4wvs818g4wfmw23vdhv06kn229cmhqbr7dsz933vwwf"; depends=[MASS reshape]; };
 stabledist = derive { name="stabledist"; version="0.7-0"; sha256="06xd3kkyand0gzyj5phxlfjyygn5jlsq7gbwh62pc390by7ld2c7"; depends=[]; };
 stabs = derive { name="stabs"; version="0.5-1"; sha256="0mlwbf8wf38mr39si31i4iz00hpsmchbhgagwgsf3x9422zpq92p"; depends=[]; };
@@ -6274,15 +6296,17 @@ stagePop = derive { name="stagePop"; version="1.1-1"; sha256="0949r5ibl3sb10sr5x
 stam = derive { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; };
 stargazer = derive { name="stargazer"; version="5.1"; sha256="0ar0qm289ncsns2pqkabpyjc90ws0il1q7fp5206wqghgsvqjcc0"; depends=[]; };
 startupmsg = derive { name="startupmsg"; version="0.9"; sha256="1l75w4v1cf4kkb05akhgzk5n77zsj6h20ds8y0aa6kd2208zxd9f"; depends=[]; };
-stashR = derive { name="stashR"; version="0.3-5"; sha256="1lnpi1vb043aj4b9vmmy56anj4344709986b27hqaqk5ajzq9c3w"; depends=[filehash digest]; };
+stashR = derive { name="stashR"; version="0.3-5"; sha256="1lnpi1vb043aj4b9vmmy56anj4344709986b27hqaqk5ajzq9c3w"; depends=[digest filehash]; };
 statar = derive { name="statar"; version="0.3.0"; sha256="0ynvabdyp5vy90gz7c9ywbdyg8dp4vmmz2zjd7z8b5jjk0f8xsf1"; depends=[data_table dplyr ggplot2 lazyeval matrixStats proto stargazer stringr tidyr]; };
 statcheck = derive { name="statcheck"; version="1.0.1"; sha256="01b40bjagkj6hfyq9ppdlaafwgykv8p9s8sm0abd3if82ivdpixj"; depends=[plyr]; };
-statebins = derive { name="statebins"; version="1.0"; sha256="1mqky4nb31xjhn922csvv8ps2fwgcgazxs56rcn3ka32c59a4mmg"; depends=[ggplot2 scales gridExtra RColorBrewer]; };
+statebins = derive { name="statebins"; version="1.0"; sha256="1mqky4nb31xjhn922csvv8ps2fwgcgazxs56rcn3ka32c59a4mmg"; depends=[ggplot2 gridExtra RColorBrewer scales]; };
 statfi = derive { name="statfi"; version="0.9.8"; sha256="0kg9bj2mmd95ysg604rcg4szqx3whbqm14fwivnd110jgfy20gk2"; depends=[pxR]; };
+stationaRy = derive { name="stationaRy"; version="0.2"; sha256="1ylamq6mc0hq3hq17w7s1v9dv7wdzyn4afxh1zy739532p0xxm41"; depends=[downloader lubridate plyr proj4 sp]; };
 statmod = derive { name="statmod"; version="1.4.21"; sha256="138lh9qa25w6vaksbq43iqisj4c8hvmkjc3q81fn7m8b7zlnz6da"; depends=[]; };
-statnet = derive { name="statnet"; version="2014.2.0"; sha256="0xp8xnqb32wzkxfm7f34z6mnsd9id8an5829n16czwldj9vv6s10"; depends=[network ergm sna networkDynamic tergm ergm_count latentnet statnet_common]; };
+statnet = derive { name="statnet"; version="2014.2.0"; sha256="0xp8xnqb32wzkxfm7f34z6mnsd9id8an5829n16czwldj9vv6s10"; depends=[ergm ergm_count latentnet network networkDynamic sna statnet_common tergm]; };
 statnet_common = derive { name="statnet.common"; version="3.2.2"; sha256="1xdkc1pyf6wfb86dwz6bkjli5qw6yz6dvlxwp5bpgkpg83aa9n7g"; depends=[]; };
-stcm = derive { name="stcm"; version="0.1.0"; sha256="0j2yhmg6m69igg3ilrf7rq3l37aqab7h4fx08k3gfgc8005w7ils"; depends=[QCA plyr ggplot2 XML randomForest caret dendextend magrittr]; };
+statnetWeb = derive { name="statnetWeb"; version="0.3.4"; sha256="1nkis4l6yzpjcwxryskqfjgc2naxplzjc3gpp6xvpl0pcvw9mdk7"; depends=[ergm network RColorBrewer shiny sna]; };
+stcm = derive { name="stcm"; version="0.1.0"; sha256="0j2yhmg6m69igg3ilrf7rq3l37aqab7h4fx08k3gfgc8005w7ils"; depends=[caret dendextend ggplot2 magrittr plyr QCA randomForest XML]; };
 steepness = derive { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; };
 stellaR = derive { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; };
 stepPlr = derive { name="stepPlr"; version="0.92"; sha256="16j32sk7ri4jdgss7vw5zz7s42rxk7rs376iyxzzpy1zcc9b64rv"; depends=[]; };
@@ -6293,37 +6317,38 @@ stheoreme = derive { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq
 stilt = derive { name="stilt"; version="1.0.1"; sha256="1vrbbic0vqzgy574kzcr38iqyhax4wa6zl6w74n65z15map2fyma"; depends=[fields]; };
 stima = derive { name="stima"; version="1.1"; sha256="1i8l7pfnqxx660h3r2jf6a9bj5ikg9hw7v8apwk98ms8l7q77p5l"; depends=[rpart]; };
 stinepack = derive { name="stinepack"; version="1.3"; sha256="0kjpcjqkwndqs7cyc6w62z1nnkqmhkifz2w0bi341jh0ybmak4fq"; depends=[]; };
-stm = derive { name="stm"; version="1.0.8"; sha256="0dnzkqh3hnnjm0wmzpn48bwylmh49a8ib263bzvjaqpi70mck49p"; depends=[matrixStats slam lda stringr Matrix glmnet]; };
+stm = derive { name="stm"; version="1.0.8"; sha256="0dnzkqh3hnnjm0wmzpn48bwylmh49a8ib263bzvjaqpi70mck49p"; depends=[glmnet lda Matrix matrixStats slam stringr]; };
 stmCorrViz = derive { name="stmCorrViz"; version="1.1"; sha256="03bjxil8v4ixgbabg2gq78xgqy4s3wh89hq1z5598gxysz12z3ji"; depends=[jsonlite stm]; };
-stocc = derive { name="stocc"; version="1.23"; sha256="183rv1l1hpa691f3xf455bv8dzdw6ac79zg3v99zksli6i7c8jdz"; depends=[truncnorm coda Matrix fields]; };
+stocc = derive { name="stocc"; version="1.23"; sha256="183rv1l1hpa691f3xf455bv8dzdw6ac79zg3v99zksli6i7c8jdz"; depends=[coda fields Matrix truncnorm]; };
 stochprofML = derive { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; };
-stochvol = derive { name="stochvol"; version="1.1.1"; sha256="1cfav3i7w5i3rayajdybjmwvmqvqj58zk8sk0icw52r5l4ki2d6s"; depends=[coda Rcpp Rcpp]; };
+stochvol = derive { name="stochvol"; version="1.1.1"; sha256="1cfav3i7w5i3rayajdybjmwvmqvqj58zk8sk0icw52r5l4ki2d6s"; depends=[coda Rcpp]; };
 stockPortfolio = derive { name="stockPortfolio"; version="1.2"; sha256="0k5ss6lf9yhcvc4hwqmcfpdn6qkbq5kaw0arldkl46391kac3bd1"; depends=[]; };
-stocks = derive { name="stocks"; version="1.1.1"; sha256="1qwd16bw40w2ns7b0n9wm8l344r4vyk27rmg0vr5512zsrcjkcfb"; depends=[rbenchmark Rcpp Rcpp]; };
+stocks = derive { name="stocks"; version="1.1.1"; sha256="1qwd16bw40w2ns7b0n9wm8l344r4vyk27rmg0vr5512zsrcjkcfb"; depends=[rbenchmark Rcpp]; };
 stoichcalc = derive { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; };
-stosim = derive { name="stosim"; version="0.0.12"; sha256="0c4sj5iirm542hx782izfdmy2m3kl5q28l10xjj0ib4xn5y6yx3c"; depends=[tcltk2 Rcpp Rcpp]; };
-stpp = derive { name="stpp"; version="1.0-5"; sha256="1444dbwm0nyb5k8xjfrm25x984a7h9ln2vddrwjszfpmscv0iwm1"; depends=[splancs KernSmooth spatstat]; };
-stppResid = derive { name="stppResid"; version="1.1"; sha256="0hgzsyy5y0sqd4d2agdr7p2kq0w51vs8f63dvj6j49h8cvgiws2x"; depends=[deldir splancs cubature]; };
+stosim = derive { name="stosim"; version="0.0.12"; sha256="0c4sj5iirm542hx782izfdmy2m3kl5q28l10xjj0ib4xn5y6yx3c"; depends=[Rcpp tcltk2]; };
+stpp = derive { name="stpp"; version="1.0-5"; sha256="1444dbwm0nyb5k8xjfrm25x984a7h9ln2vddrwjszfpmscv0iwm1"; depends=[KernSmooth spatstat splancs]; };
+stppResid = derive { name="stppResid"; version="1.1"; sha256="0hgzsyy5y0sqd4d2agdr7p2kq0w51vs8f63dvj6j49h8cvgiws2x"; depends=[cubature deldir splancs]; };
 strap = derive { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; };
-strataG = derive { name="strataG"; version="0.9.4"; sha256="0lxp6s0gfqxyla7mx19fbx6w8am3islv02iyyixi94xbwphpcqf3"; depends=[swfscMisc pegas ape MASS reshape2 Rcpp]; };
+strataG = derive { name="strataG"; version="0.9.4"; sha256="0lxp6s0gfqxyla7mx19fbx6w8am3islv02iyyixi94xbwphpcqf3"; depends=[ape MASS pegas Rcpp reshape2 swfscMisc]; };
 stratification = derive { name="stratification"; version="2.2-5"; sha256="0cgr49gvh12s6rr43878jxjkir7b7absqgbfsvj1bjlf2r3gyqy9"; depends=[]; };
 stratigraph = derive { name="stratigraph"; version="0.66"; sha256="1idn5rwar9pxp1vsra68wrlhagmc92y5rs7vn4h63p35p357qdwz"; depends=[]; };
 straweib = derive { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; };
-stream = derive { name="stream"; version="1.1-4"; sha256="1pz9ck6rxxwnzrhixs015k3sy2gl8hwxyxwr56ykpkrcn6kgzm3f"; depends=[proxy animation clue cluster clusterGeneration fpc MASS mlbench Rcpp Rcpp]; };
-streamMOA = derive { name="streamMOA"; version="1.1-0"; sha256="0h45saz5jf9jfsajy987ljpfpm2cxigyqkgmybd0m3aqyrqlljbc"; depends=[stream rJava]; };
+stream = derive { name="stream"; version="1.1-4"; sha256="1pz9ck6rxxwnzrhixs015k3sy2gl8hwxyxwr56ykpkrcn6kgzm3f"; depends=[animation clue cluster clusterGeneration fpc MASS mlbench proxy Rcpp]; };
+streamMOA = derive { name="streamMOA"; version="1.1-0"; sha256="0h45saz5jf9jfsajy987ljpfpm2cxigyqkgmybd0m3aqyrqlljbc"; depends=[rJava stream]; };
 streamR = derive { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23xk5d25jkm3qr7rfj2kc5j5vgsih6kr0gl"; depends=[RCurl rjson]; };
-stremo = derive { name="stremo"; version="0.2"; sha256="13b9xnd8ykxrm8gnakh0ixbsb7yppqv3isga8dsz473wzy82y6h1"; depends=[lavaan numDeriv MASS]; };
-stressr = derive { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[xts XML lattice latticeExtra]; };
+stremo = derive { name="stremo"; version="0.2"; sha256="13b9xnd8ykxrm8gnakh0ixbsb7yppqv3isga8dsz473wzy82y6h1"; depends=[lavaan MASS numDeriv]; };
+stressr = derive { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; };
 stringdist = derive { name="stringdist"; version="0.9.0"; sha256="0304a3qyssq2l2c7da5a90fca32n3ph5jixqnqvb3jwzdb8dxm2f"; depends=[]; };
+stringgaussnet = derive { name="stringgaussnet"; version="1.0"; sha256="11pkvbq2lddwhrwrpspqhjkma4ixl9hv8w7m4jrnlx8dkabibw25"; depends=[AnnotationDbi biomaRt httr igraph limma pspearman RCurl RJSONIO simone VennDiagram]; };
 stringi = derive { name="stringi"; version="0.4-1"; sha256="01ig59cmvrk9vfh4l84i2h4vgddfspyrxwh3am33apv8r8vr4bnj"; depends=[]; };
-stringr = derive { name="stringr"; version="1.0.0"; sha256="0jnz6r9yqyf7dschr2fnn1slg4wn6b4ik5q00j4zrh43bfw7s9pq"; depends=[stringi magrittr]; };
-strucchange = derive { name="strucchange"; version="1.5-1"; sha256="0cdgvl6kphm2i59bmnppn1y3kv65ml111bk7yzpcx7vv8wh2w3kl"; depends=[zoo sandwich]; };
-structSSI = derive { name="structSSI"; version="1.1.1"; sha256="06rwmrgqc4qy4x0bhlshjdsjxfmp5fr9d1wjglhlb1gbp72fmkdv"; depends=[igraph rjson ggplot2 reshape2]; };
-strum = derive { name="strum"; version="0.6.1"; sha256="128xrprdmncnn2a7z6g2qzkps323qq33g3fxh1q23ys11p37dnjw"; depends=[pedigree Matrix MASS Rcpp Rcpp RcppArmadillo]; };
-strvalidator = derive { name="strvalidator"; version="1.5.0"; sha256="0b71drc80hqmqi4kspy0700wss4pm88x2gp83jsw1jrfrrrfw9jk"; depends=[gridExtra ggplot2 gWidgets gtable plyr scales gWidgetsRGtk2 RGtk2 data_table]; };
+stringr = derive { name="stringr"; version="1.0.0"; sha256="0jnz6r9yqyf7dschr2fnn1slg4wn6b4ik5q00j4zrh43bfw7s9pq"; depends=[magrittr stringi]; };
+strucchange = derive { name="strucchange"; version="1.5-1"; sha256="0cdgvl6kphm2i59bmnppn1y3kv65ml111bk7yzpcx7vv8wh2w3kl"; depends=[sandwich zoo]; };
+structSSI = derive { name="structSSI"; version="1.1.1"; sha256="06rwmrgqc4qy4x0bhlshjdsjxfmp5fr9d1wjglhlb1gbp72fmkdv"; depends=[ggplot2 igraph multtest reshape2 rjson]; };
+strum = derive { name="strum"; version="0.6.2"; sha256="0f5cb7cfvqhmnv4sjfr58lns4fclmr8iyka595zddy9f6dv5rqp1"; depends=[graph MASS Matrix pedigree Rcpp RcppArmadillo Rgraphviz]; };
+strvalidator = derive { name="strvalidator"; version="1.5.0"; sha256="0b71drc80hqmqi4kspy0700wss4pm88x2gp83jsw1jrfrrrfw9jk"; depends=[data_table ggplot2 gridExtra gtable gWidgets gWidgetsRGtk2 plyr RGtk2 scales]; };
 stsm = derive { name="stsm"; version="1.7"; sha256="080xakf7rf53vzv64g338hz87sk4cqfwd6ly4f122sxvn4xypq3n"; depends=[KFKSDS]; };
 stsm_class = derive { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; };
-stylo = derive { name="stylo"; version="0.5.9"; sha256="061nfjh932qjlzvnarpwvzar0qv7ij8l6m3iax1jilygzhfqfyin"; depends=[tcltk2 ape pamr e1071 class lattice tsne]; };
+stylo = derive { name="stylo"; version="0.5.9"; sha256="061nfjh932qjlzvnarpwvzar0qv7ij8l6m3iax1jilygzhfqfyin"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; };
 suRtex = derive { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; };
 subgroup = derive { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; };
 subplex = derive { name="subplex"; version="1.1-4"; sha256="0c6y5ibyxh0mpn77f7kwrmkpb3mah10hbqhwqmz4i1lfv58mb4zk"; depends=[]; };
@@ -6333,33 +6358,33 @@ subsemble = derive { name="subsemble"; version="0.0.9"; sha256="0vzjmxpdwagqb9p2
 subtype = derive { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; };
 sudoku = derive { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; };
 sudokuAlt = derive { name="sudokuAlt"; version="0.1-4"; sha256="14jqwsp692dq0bfnk2i70qc42inb6jbissvp88c5r2cgzc1ry072"; depends=[]; };
-summarytools = derive { name="summarytools"; version="0.3"; sha256="1hhkhpyaj8sc62vap5s7ds0kmk1jiy6gdvsz65ynqy2qfz58c3ms"; depends=[htmltools pander xtable rapportools rstudioapi]; };
-supclust = derive { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[rpart class]; };
-supcluster = derive { name="supcluster"; version="1.0"; sha256="1rkd4bpzzvzbmqaj907pqv53hxcgic0jklbsf5iayf0ra768b5w6"; depends=[mvtnorm gtools]; };
+summarytools = derive { name="summarytools"; version="0.3"; sha256="1hhkhpyaj8sc62vap5s7ds0kmk1jiy6gdvsz65ynqy2qfz58c3ms"; depends=[htmltools pander rapportools rstudioapi xtable]; };
+supclust = derive { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[class rpart]; };
+supcluster = derive { name="supcluster"; version="1.0"; sha256="1rkd4bpzzvzbmqaj907pqv53hxcgic0jklbsf5iayf0ra768b5w6"; depends=[gtools mvtnorm]; };
 superMDS = derive { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; };
-superbiclust = derive { name="superbiclust"; version="1.1"; sha256="1gzjbzbl8y1nzdfhyd6dlrwjq8mwj43a26qav84s1bdzwx6dra48"; depends=[biclust Matrix]; };
-superdiag = derive { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[coda boa]; };
+superbiclust = derive { name="superbiclust"; version="1.1"; sha256="1gzjbzbl8y1nzdfhyd6dlrwjq8mwj43a26qav84s1bdzwx6dra48"; depends=[biclust fabia Matrix]; };
+superdiag = derive { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[boa coda]; };
 superpc = derive { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; };
 support_BWS = derive { name="support.BWS"; version="0.1-3"; sha256="1qlh2zgmr3b6gz3xmncjawgg08c6kgfg3d2m9x78iw95x7p3p5h8"; depends=[]; };
 support_CEs = derive { name="support.CEs"; version="0.3-3"; sha256="0772j0sssf6fwig9v1ra83fwas8109yf30n0xq8s5cxsnnn41m2y"; depends=[DoE_base MASS simex]; };
-surface = derive { name="surface"; version="0.4-1"; sha256="0z7fh09hjmxfmqzi588gjwqqlpj1a475aixrnvy911lkx3zfk146"; depends=[ape ouch MASS geiger]; };
-surv2sampleComp = derive { name="surv2sampleComp"; version="1.0-4"; sha256="1ihz71vzrkd5ksy7421myrgkbww0z5k0ywcb2bfalxx2bd2cs2wf"; depends=[survival plotrix flexsurv survC1]; };
+surface = derive { name="surface"; version="0.4-1"; sha256="0z7fh09hjmxfmqzi588gjwqqlpj1a475aixrnvy911lkx3zfk146"; depends=[ape geiger MASS ouch]; };
+surv2sampleComp = derive { name="surv2sampleComp"; version="1.0-4"; sha256="1ihz71vzrkd5ksy7421myrgkbww0z5k0ywcb2bfalxx2bd2cs2wf"; depends=[flexsurv plotrix survC1 survival]; };
 survAUC = derive { name="survAUC"; version="1.0-5"; sha256="0bcj982ib1h0sjql09zbvx3h1m96jy9q37krmk6kfzw25ms6bzzr"; depends=[survival]; };
-survAccuracyMeasures = derive { name="survAccuracyMeasures"; version="1.2"; sha256="1i41xkvqpxpq9spryh1syp57ymlzw71ygdjqn41rv8jjc9q52x9g"; depends=[survival Rcpp Rcpp RcppArmadillo]; };
+survAccuracyMeasures = derive { name="survAccuracyMeasures"; version="1.2"; sha256="1i41xkvqpxpq9spryh1syp57ymlzw71ygdjqn41rv8jjc9q52x9g"; depends=[Rcpp RcppArmadillo survival]; };
 survC1 = derive { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; };
-survIDINRI = derive { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survival survC1]; };
-survJamda = derive { name="survJamda"; version="1.1.3"; sha256="03cwp1nw8nnkcjiafysbc1w24fwb7j5ksr01rlpf0g0qdi9zlgwi"; depends=[survival survivalROC ecodist survJamda_data]; };
+survIDINRI = derive { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survC1 survival]; };
+survJamda = derive { name="survJamda"; version="1.1.3"; sha256="03cwp1nw8nnkcjiafysbc1w24fwb7j5ksr01rlpf0g0qdi9zlgwi"; depends=[ecodist survcomp survival survivalROC survJamda_data]; };
 survJamda_data = derive { name="survJamda.data"; version="1.0.2"; sha256="0a010v2ar48i5m0jiqjvdyqm93ckfgfmcmym9a02h0rclnizd75r"; depends=[]; };
-survMisc = derive { name="survMisc"; version="0.4.6"; sha256="1d16kkzg0clwvv5rgv4rlm79dxhxhhzv9bkx6420izmyx0wjcnhn"; depends=[survival KMsurv combinat Hmisc zoo km_ci ggplot2 data_table gridExtra rpart gam]; };
+survMisc = derive { name="survMisc"; version="0.4.6"; sha256="1d16kkzg0clwvv5rgv4rlm79dxhxhhzv9bkx6420izmyx0wjcnhn"; depends=[combinat data_table gam ggplot2 gridExtra Hmisc km_ci KMsurv rpart survival zoo]; };
 survPresmooth = derive { name="survPresmooth"; version="1.1-8"; sha256="1qva7yx4vv99mgh3wqxdnbasa1gy0ixxyxpqrfbn6827whjzf91m"; depends=[]; };
 survRM2 = derive { name="survRM2"; version="1.0-1"; sha256="1qcjdx4a9b9dg8jkzak6rq4d4byf9377h43f1m3icdgf79vghlhr"; depends=[survival]; };
-survSNP = derive { name="survSNP"; version="0.23.2"; sha256="0vpk5qdvsagv5pnap7ja7smqvibvfp5v7smhikbbwl0h6l83jjw4"; depends=[survival Rcpp lattice foreach xtable Rcpp]; };
-surveillance = derive { name="surveillance"; version="1.9-0"; sha256="1v087x0y8i2b4pbikdaj3xdb0qj1lnl8yjrzcp3l0ffcbfb8a8j2"; depends=[sp xtable polyCub Rcpp MASS Matrix spatstat Rcpp]; };
+survSNP = derive { name="survSNP"; version="0.23.2"; sha256="0vpk5qdvsagv5pnap7ja7smqvibvfp5v7smhikbbwl0h6l83jjw4"; depends=[foreach lattice Rcpp survival xtable]; };
+surveillance = derive { name="surveillance"; version="1.9-1"; sha256="0ki5in4pnqsilil76c3fdm3avl9pkb0z4d4jv015vqppp33z32y5"; depends=[MASS Matrix polyCub Rcpp sp spatstat xtable]; };
 survexp_fr = derive { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; };
 survey = derive { name="survey"; version="3.30-3"; sha256="0vcyph1vpnl4xaqd85ffh1gm0dqhvgr3343q0mlycmyq485x0idy"; depends=[]; };
-surveydata = derive { name="surveydata"; version="0.1-14"; sha256="1zcp3wb7yhsa59cl4bdw7p08vpviypvfa9hggwc60w7ashpky73i"; depends=[stringr plyr]; };
+surveydata = derive { name="surveydata"; version="0.1-14"; sha256="1zcp3wb7yhsa59cl4bdw7p08vpviypvfa9hggwc60w7ashpky73i"; depends=[plyr stringr]; };
 surveyeditor = derive { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; };
-survival = derive { name="survival"; version="2.38-1"; sha256="0kq0a6h1bmphp4vi1f3wzs5pddp3zw9vfi7vk6x27zglnwjhkfgm"; depends=[]; };
+survival = derive { name="survival"; version="2.38-2"; sha256="1qy9iav9h459ligpxqhg7rbn6ai39xij5qjyig7pcwmpgxqvdj69"; depends=[]; };
 survivalMPL = derive { name="survivalMPL"; version="0.1.1"; sha256="0c4hr2q50snd5qm2drg4qzfkcz4klxr4jba6xpc8n2i8wn573cvc"; depends=[survival]; };
 survivalROC = derive { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; };
 survrec = derive { name="survrec"; version="1.2-2"; sha256="0b77ncr1wg2xqqg1bv1bvb48kmd9h3ja2dysiggvprzjrj7hdlmx"; depends=[boot]; };
@@ -6383,74 +6408,74 @@ svdvisual = derive { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m
 svgViewR = derive { name="svgViewR"; version="1.0.0"; sha256="0js3mc5lxzfwbnc30mn9k9g9jiy2aivqs08x0zcg9dir5n7gs9sg"; depends=[]; };
 svmpath = derive { name="svmpath"; version="0.953"; sha256="0hqga4cwy1az8cckh3nkknbq1ag67f4m5xdg271f2jxvnmhdv6wv"; depends=[]; };
 svyPVpack = derive { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; };
-swamp = derive { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots MASS]; };
+swamp = derive { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots impute MASS]; };
 sweidnumbr = derive { name="sweidnumbr"; version="0.6.0"; sha256="1qdak16jnm436m7nlngarimlhx9sc6wwq9pfrcijq8240mh7xwa2"; depends=[lubridate stringr]; };
 swfscMisc = derive { name="swfscMisc"; version="1.0.3"; sha256="0ciwvxpafpc6an58r1ffkab8kj4np6l2kbpkijnqnfbf6cya0aim"; depends=[mapdata maps]; };
-swirl = derive { name="swirl"; version="2.2.21"; sha256="0lpin7frm1a6y9lz0nyykhvydr1qbx85iqy24sm52r1vxycv2r8h"; depends=[stringr testthat httr yaml RCurl digest]; };
-switchnpreg = derive { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[MASS fda expm HiddenMarkov]; };
-switchr = derive { name="switchr"; version="0.9.4"; sha256="16a8659x2r9adi3r0cqhsw8qg3jk6pkvrzgx8a50qyk4v50f2jsj"; depends=[]; };
-switchrGist = derive { name="switchrGist"; version="0.2.1"; sha256="0n8fzzsxm0m4yic133q07vki803zywhijadymrgyq7qlx3d1m97d"; depends=[switchr gistr httpuv RJSONIO]; };
-sybil = derive { name="sybil"; version="1.2.6"; sha256="1d7q0dvpqxay86dy4zbllv78dsh0amr8n7wl0vkrb8jbakq4afip"; depends=[Matrix lattice]; };
+swirl = derive { name="swirl"; version="2.2.21"; sha256="0lpin7frm1a6y9lz0nyykhvydr1qbx85iqy24sm52r1vxycv2r8h"; depends=[digest httr RCurl stringr testthat yaml]; };
+switchnpreg = derive { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; };
+switchr = derive { name="switchr"; version="0.9.6"; sha256="0w1nf6jncs85hqbvddcrmdx9y1gd5702ab9180v9icp7al06kxzp"; depends=[]; };
+switchrGist = derive { name="switchrGist"; version="0.2.1"; sha256="0n8fzzsxm0m4yic133q07vki803zywhijadymrgyq7qlx3d1m97d"; depends=[gistr httpuv RJSONIO switchr]; };
+sybil = derive { name="sybil"; version="1.2.6"; sha256="1d7q0dvpqxay86dy4zbllv78dsh0amr8n7wl0vkrb8jbakq4afip"; depends=[lattice Matrix]; };
 sybilDynFBA = derive { name="sybilDynFBA"; version="0.0.2"; sha256="1sqk6dwwfrwvgkwk6mra0i1dszhhvcwm58ax6m89sxk8n0nbmr4b"; depends=[sybil]; };
-sybilEFBA = derive { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j8ixqd2pj43hhyr99vjdh7c106lsmqd1pifa4"; depends=[sybil Matrix]; };
+sybilEFBA = derive { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j8ixqd2pj43hhyr99vjdh7c106lsmqd1pifa4"; depends=[Matrix sybil]; };
 sybilSBML = derive { name="sybilSBML"; version="2.0.8"; sha256="1sxp0naws7d1ak0xna1sy87zzjrravwax0qvcd6vy4p0f39z06ci"; depends=[Matrix sybil]; };
-sybilccFBA = derive { name="sybilccFBA"; version="2.0.0"; sha256="0x0is1a56jyahaba6dk9inj5v248m8n46f70ynqyqp1xpiax1fkr"; depends=[sybil Matrix]; };
-sybilcycleFreeFlux = derive { name="sybilcycleFreeFlux"; version="1.0.1"; sha256="0ffmgnr239xz8864vmrqlhwwc97fqzzib6kwrsm7bszdnw1kkv3r"; depends=[sybil Matrix MASS]; };
-symbolicDA = derive { name="symbolicDA"; version="0.4-2"; sha256="1vn7r7b7yyn2kp8j3ghw50z49yzvwhm0izc6wgc7a99300xrr77s"; depends=[clusterSim XML rgl shapes e1071 ade4 cluster]; };
+sybilccFBA = derive { name="sybilccFBA"; version="2.0.0"; sha256="0x0is1a56jyahaba6dk9inj5v248m8n46f70ynqyqp1xpiax1fkr"; depends=[Matrix sybil]; };
+sybilcycleFreeFlux = derive { name="sybilcycleFreeFlux"; version="1.0.1"; sha256="0ffmgnr239xz8864vmrqlhwwc97fqzzib6kwrsm7bszdnw1kkv3r"; depends=[MASS Matrix sybil]; };
+symbolicDA = derive { name="symbolicDA"; version="0.4-2"; sha256="1vn7r7b7yyn2kp8j3ghw50z49yzvwhm0izc6wgc7a99300xrr77s"; depends=[ade4 cluster clusterSim e1071 rgl shapes XML]; };
 symbols = derive { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; };
-symmoments = derive { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[mvtnorm cubature combinat multipol]; };
-synRNASeqNet = derive { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[parmigene GenKern igraph KernSmooth]; };
-synbreed = derive { name="synbreed"; version="0.11-8"; sha256="1d58rlys0557xs1wwd9mrvsrnx8fkcs4igxwf70rw9zy6nl9zg9k"; depends=[doBy BLR regress abind igraph lattice MASS LDheatmap qtl]; };
+symmoments = derive { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[combinat cubature multipol mvtnorm]; };
+synRNASeqNet = derive { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[GenKern igraph KernSmooth parmigene]; };
+synbreed = derive { name="synbreed"; version="0.11-10"; sha256="094gjps85w120vkj4542781zyf6frh9kv1hvphbmgxhsz8s6mll5"; depends=[abind BLR doBy igraph lattice LDheatmap MASS qtl regress]; };
 synbreedData = derive { name="synbreedData"; version="1.5"; sha256="16wv9r7p0n8726qv0jlizmkvnrqwjj1q4xaxvfmj9611rm47vckx"; depends=[]; };
-synchronicity = derive { name="synchronicity"; version="1.1.4"; sha256="0hcxwgf1irswwabgl0b6vb9q09nhxc1ljsm195lc8ql49sfj9mfz"; depends=[bigmemory_sri BH]; };
+synchronicity = derive { name="synchronicity"; version="1.1.4"; sha256="0hcxwgf1irswwabgl0b6vb9q09nhxc1ljsm195lc8ql49sfj9mfz"; depends=[BH bigmemory_sri]; };
 synchrony = derive { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; };
-synlik = derive { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Rcpp Matrix Rcpp RcppArmadillo]; };
-synthpop = derive { name="synthpop"; version="1.1-0"; sha256="1j9d0jpmr8dva2c7gd6z1q0a3qdxkvmm83xlv08dxkbvsfbzvmmr"; depends=[lattice MASS nnet ggplot2 coefplot rpart party foreign plyr proto]; };
+synlik = derive { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Matrix Rcpp RcppArmadillo]; };
+synthpop = derive { name="synthpop"; version="1.1-0"; sha256="1j9d0jpmr8dva2c7gd6z1q0a3qdxkvmm83xlv08dxkbvsfbzvmmr"; depends=[coefplot foreign ggplot2 lattice MASS nnet party plyr proto rpart]; };
 sysfonts = derive { name="sysfonts"; version="0.5"; sha256="1vppj3jnag88351f8xfk9ds8gbbij3m55iq5rxbnrzy89c04zpzp"; depends=[]; };
-systemfit = derive { name="systemfit"; version="1.1-16"; sha256="0b34cpwhmsmq7dcr3gymdvanj3q493aczgz3af7b14bsp3bbwpw6"; depends=[Matrix car lmtest sandwich MASS]; };
-systemicrisk = derive { name="systemicrisk"; version="0.2"; sha256="06061hca2x9hj0caann69j6x2jgy8bq40nxs27iqb3zfqp2cz44f"; depends=[Rcpp lpSolve Rcpp]; };
-syuzhet = derive { name="syuzhet"; version="0.2.0"; sha256="1l83wjiv1xsxw4wrcgcj3ryisi7zn4sbdl0sail0rhw0g9y9cz76"; depends=[openNLP NLP]; };
-taRifx = derive { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[reshape2 plyr]; };
-taRifx_geo = derive { name="taRifx.geo"; version="1.0.6"; sha256="0w7nwp3kvidqhwaxaiq267h99akkrj6xgkviwj0w01511m2lzghs"; depends=[taRifx sp rgdal RJSONIO rgeos RCurl]; };
-tab = derive { name="tab"; version="3.1.1"; sha256="05wypi4v9r2qlgwafd9f58vnxn2c4fnz18l8xpb24nhdgm35adqy"; depends=[survey survival gee]; };
+systemfit = derive { name="systemfit"; version="1.1-16"; sha256="0b34cpwhmsmq7dcr3gymdvanj3q493aczgz3af7b14bsp3bbwpw6"; depends=[car lmtest MASS Matrix sandwich]; };
+systemicrisk = derive { name="systemicrisk"; version="0.2"; sha256="06061hca2x9hj0caann69j6x2jgy8bq40nxs27iqb3zfqp2cz44f"; depends=[lpSolve Rcpp]; };
+syuzhet = derive { name="syuzhet"; version="0.2.0"; sha256="1l83wjiv1xsxw4wrcgcj3ryisi7zn4sbdl0sail0rhw0g9y9cz76"; depends=[NLP openNLP]; };
+taRifx = derive { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[plyr reshape2]; };
+taRifx_geo = derive { name="taRifx.geo"; version="1.0.6"; sha256="0w7nwp3kvidqhwaxaiq267h99akkrj6xgkviwj0w01511m2lzghs"; depends=[RCurl rgdal rgeos RJSONIO sp taRifx]; };
+tab = derive { name="tab"; version="3.1.1"; sha256="05wypi4v9r2qlgwafd9f58vnxn2c4fnz18l8xpb24nhdgm35adqy"; depends=[gee survey survival]; };
 table1xls = derive { name="table1xls"; version="0.3.1"; sha256="0zd93wrdj4q0ph375qlgdhpqm3n8s941vks5h07ks9gc8id1bnx5"; depends=[XLConnect]; };
 tableone = derive { name="tableone"; version="0.6.3"; sha256="0r91vzq3whz949kxg9q9bf413r41cxqsjvmicmb4najhwzhdr9fv"; depends=[e1071 gmodels]; };
 tableplot = derive { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; };
 tables = derive { name="tables"; version="0.7.79"; sha256="05f23y5ff961ksx4fnmwpf6zvc9573if8s2cmz9bwki66h2g9xb7"; depends=[Hmisc]; };
 tabplot = derive { name="tabplot"; version="1.1"; sha256="0vyc6b6h540sqwhrza2ijg7ghw2x8rla827b8qy2sh0ckm0ybjrx"; depends=[ffbase]; };
-tabplotd3 = derive { name="tabplotd3"; version="0.3.3"; sha256="0mbj45vb17wlnndpkhvq7xaawsb814x7zxa4rqbfgidvbm1p3abv"; depends=[tabplot httpuv Rook brew RJSONIO]; };
+tabplotd3 = derive { name="tabplotd3"; version="0.3.3"; sha256="0mbj45vb17wlnndpkhvq7xaawsb814x7zxa4rqbfgidvbm1p3abv"; depends=[brew httpuv RJSONIO Rook tabplot]; };
 tabuSearch = derive { name="tabuSearch"; version="1.1"; sha256="0bri03jksm314xy537dldbdvgyq6sywfmpmj2g2acdcli31kkpq0"; depends=[]; };
-tagcloud = derive { name="tagcloud"; version="0.5"; sha256="0d6h54p20pjnh1y7bw381nqbml1hv5x71gm33mgrzcib7mqa0c0b"; depends=[Rcpp RColorBrewer Rcpp]; };
+tagcloud = derive { name="tagcloud"; version="0.5"; sha256="0d6h54p20pjnh1y7bw381nqbml1hv5x71gm33mgrzcib7mqa0c0b"; depends=[RColorBrewer Rcpp]; };
 tau = derive { name="tau"; version="0.0-18"; sha256="04rj3jrcz4h60dqm1xmnmpr52csz1s7rf2wv6ivybgyvbq0w2ijf"; depends=[]; };
-tawny = derive { name="tawny"; version="2.1.2"; sha256="0ihg3qlng8swak1dfpbnlx5xc45d1i9rgqawmqa97v5m91smfa71"; depends=[lambda_r lambda_tools futile_logger futile_matrix tawny_types zoo xts PerformanceAnalytics quantmod]; };
-tawny_types = derive { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdczjn5ymsp2fqq0ijnlniyf3bc08ibd8yd1jcdyjnj"; depends=[lambda_r lambda_tools futile_logger futile_options zoo xts quantmod]; };
-taxize = derive { name="taxize"; version="0.5.2"; sha256="1141ypz76nda9ij0fr63kgjagj9al63gnqwxa7ld7v9xzig8zgyp"; depends=[XML RCurl stringr plyr httr jsonlite foreach ape Taxonstand reshape2 data_table vegan bold]; };
-tbart = derive { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp Rcpp]; };
+tawny = derive { name="tawny"; version="2.1.2"; sha256="0ihg3qlng8swak1dfpbnlx5xc45d1i9rgqawmqa97v5m91smfa71"; depends=[futile_logger futile_matrix lambda_r lambda_tools PerformanceAnalytics quantmod tawny_types xts zoo]; };
+tawny_types = derive { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdczjn5ymsp2fqq0ijnlniyf3bc08ibd8yd1jcdyjnj"; depends=[futile_logger futile_options lambda_r lambda_tools quantmod xts zoo]; };
+taxize = derive { name="taxize"; version="0.6.0"; sha256="0zxlawj79l117hj3d93663xdzbkcq5gh6m090yfbvkzrb6a4rq3f"; depends=[ape bold data_table foreach httr jsonlite plyr RCurl reshape2 stringr Taxonstand XML]; };
+tbart = derive { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; };
 tbdiag = derive { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; };
-tcR = derive { name="tcR"; version="2.0"; sha256="05y3nbqdaxry7jwph6z2v8d2304xh791l0vviywyghrw7b2hqw9q"; depends=[ggplot2 dplyr gridExtra reshape2 igraph Rcpp data_table gtable roxygen2 stringdist Rcpp]; };
+tcR = derive { name="tcR"; version="2.0"; sha256="05y3nbqdaxry7jwph6z2v8d2304xh791l0vviywyghrw7b2hqw9q"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 roxygen2 stringdist]; };
 tcltk2 = derive { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; };
-tclust = derive { name="tclust"; version="1.2-3"; sha256="0a1b7yp4l9wf6ic5czizyl2cnxrc1virj0icr8i6m1vv23jd8jfp"; depends=[mvtnorm sn mclust cluster]; };
-tdm = derive { name="tdm"; version="3.0.3"; sha256="01xy090h9idw05jssfgdarbqp5d1vsiir5x7fr1ylaz0k8ai23d4"; depends=[rjags coda png deSolve]; };
-tdr = derive { name="tdr"; version="0.11"; sha256="1ga1lczqj5pka2yz7igxfm83xmkx7lla8pz6ryij0ybn284agszs"; depends=[lattice ggplot2 RColorBrewer]; };
+tclust = derive { name="tclust"; version="1.2-3"; sha256="0a1b7yp4l9wf6ic5czizyl2cnxrc1virj0icr8i6m1vv23jd8jfp"; depends=[cluster mclust mvtnorm sn]; };
+tdm = derive { name="tdm"; version="3.0.3"; sha256="01xy090h9idw05jssfgdarbqp5d1vsiir5x7fr1ylaz0k8ai23d4"; depends=[coda deSolve png rjags]; };
+tdr = derive { name="tdr"; version="0.11"; sha256="1ga1lczqj5pka2yz7igxfm83xmkx7lla8pz6ryij0ybn284agszs"; depends=[ggplot2 lattice RColorBrewer]; };
 tdthap = derive { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; };
 teigen = derive { name="teigen"; version="2.0.81"; sha256="1bssfn487dg1nc7fv73ksciiifnk1mvaqvp8a3gjmrb7bzfyzby7"; depends=[]; };
 tempdisagg = derive { name="tempdisagg"; version="0.24.0"; sha256="02ld14mppyyqvgz537sypr3mqc758cchfcmpj46b7wswwa2y7fyz"; depends=[]; };
 tensor = derive { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; };
 tensorA = derive { name="tensorA"; version="0.36"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; depends=[]; };
-tergm = derive { name="tergm"; version="3.2.4"; sha256="0ndkgkb31bwdy78nw6nq4wfhgzibxsixx3ylsgcs5rv3y0w1pczw"; depends=[statnet_common ergm network networkDynamic robustbase coda nlme ergm]; };
-termstrc = derive { name="termstrc"; version="1.3.7"; sha256="12bycwhjrhkadafcckc30jr0md0ssj21n4v75yjhy21yvqjx1d7a"; depends=[lmtest Rcpp rgl sandwich urca zoo Rcpp]; };
-ternvis = derive { name="ternvis"; version="1.1"; sha256="16q1a1ns7q0d46js2m1hr6zm8msg3ncgp8w7yrwch11xq0759sb4"; depends=[quadprog maps maptools mapdata dichromat]; };
+tergm = derive { name="tergm"; version="3.3.0"; sha256="0dz4cjnsw2gw47jrxnhbbxmwkhq63vwkd5imvbiwvm9ysghrnwjw"; depends=[coda ergm network networkDynamic nlme robustbase statnet_common]; };
+termstrc = derive { name="termstrc"; version="1.3.7"; sha256="12bycwhjrhkadafcckc30jr0md0ssj21n4v75yjhy21yvqjx1d7a"; depends=[lmtest Rcpp rgl sandwich urca zoo]; };
+ternvis = derive { name="ternvis"; version="1.1"; sha256="16q1a1ns7q0d46js2m1hr6zm8msg3ncgp8w7yrwch11xq0759sb4"; depends=[dichromat mapdata maps maptools quadprog]; };
 tester = derive { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; };
 testit = derive { name="testit"; version="0.4"; sha256="1805i82kb2g08r0cqdk6dhfhwqjjdigdm1rqf88sp7435wksyv8i"; depends=[]; };
-testthat = derive { name="testthat"; version="0.10.0"; sha256="0b3akwcx5mv9dmi8vssbk91hr3yrrdxd2fm6zhr31fnyz8kjx4pw"; depends=[digest crayon]; };
+testthat = derive { name="testthat"; version="0.10.0"; sha256="0b3akwcx5mv9dmi8vssbk91hr3yrrdxd2fm6zhr31fnyz8kjx4pw"; depends=[crayon digest]; };
 testthatsomemore = derive { name="testthatsomemore"; version="0.1"; sha256="0j9sszm4l0mn7nqz47li6fq5ycb3yawc2yrad9ngb75cvp47ikkk"; depends=[testthat]; };
 texmex = derive { name="texmex"; version="2.1"; sha256="17x4xw2h4g9a10zk4mvi3jz3gf4rf81b29hg2g3gq6a6nrxsj8sy"; depends=[mvtnorm]; };
 texmexseq = derive { name="texmexseq"; version="0.1"; sha256="18lpihiwpjkjkc1n7ka6rzasrwv8npn4939s1gl8g1jb27vnhzb5"; depends=[]; };
 texreg = derive { name="texreg"; version="1.35"; sha256="0c1w6kzczzflcmvr544v3gdasvyjxcwqgdm2w2i9wp7kd1va37fr"; depends=[]; };
-textcat = derive { name="textcat"; version="1.0-3"; sha256="0j3sp94bz57l70aqm11033nfshxdz3l9m4sq1gsfzkvxgnlpqrm5"; depends=[tau slam]; };
+textcat = derive { name="textcat"; version="1.0-3"; sha256="0j3sp94bz57l70aqm11033nfshxdz3l9m4sq1gsfzkvxgnlpqrm5"; depends=[slam tau]; };
 textir = derive { name="textir"; version="2.0-3"; sha256="039xl2h0igrp3fzr1qiyb0zr6j4bbajhj36apylqvwsczzaywhwb"; depends=[distrom gamlr Matrix]; };
 textometry = derive { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; };
-textreg = derive { name="textreg"; version="0.1.2"; sha256="0qya0czbi78a29jp9pd3lbqh574d9k0i340hrgc6jmdhwzhimhk7"; depends=[tm NLP Rcpp Rcpp]; };
+textreg = derive { name="textreg"; version="0.1.2"; sha256="0qya0czbi78a29jp9pd3lbqh574d9k0i340hrgc6jmdhwzhimhk7"; depends=[NLP Rcpp tm]; };
 tfer = derive { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; };
 tfplot = derive { name="tfplot"; version="2015.4-1"; sha256="1qrw8x7pz7xcmpym3j1d095bhvy2s7znxplml1qyw5minc67n1mh"; depends=[tframe]; };
 tframe = derive { name="tframe"; version="2015.1-1"; sha256="10igwmrfslyz3z3cbyldik8fcxq43pwh60yggka6mkl0nzkxagbd"; depends=[]; };
@@ -6461,36 +6486,36 @@ tgram = derive { name="tgram"; version="0.2-2"; sha256="091g6j5ry1gmjff1kprk5vi2
 thermocouple = derive { name="thermocouple"; version="1.0.0"; sha256="1pawk7aq27vc708xwz997pmxxhipw8449793zv6fw5aj47wcw1l5"; depends=[]; };
 thgenetics = derive { name="thgenetics"; version="0.3-4"; sha256="1316nx0s52y12j9499mvi050p3qvp6b8i01v82na01vidl54b9c2"; depends=[]; };
 threeboost = derive { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; };
-threejs = derive { name="threejs"; version="0.2.1"; sha256="01zfv5lm11i2nkb876f3fg8vsff2wk271jqs6xw1njjdhbnnihs1"; depends=[htmlwidgets base64enc]; };
-threg = derive { name="threg"; version="1.0.2"; sha256="0wb9waj0j83zrj763d3fdnp3lp52gfdyzv23yrvxvd6zmk5clgi2"; depends=[survival Formula]; };
+threejs = derive { name="threejs"; version="0.2.1"; sha256="01zfv5lm11i2nkb876f3fg8vsff2wk271jqs6xw1njjdhbnnihs1"; depends=[base64enc htmlwidgets]; };
+threg = derive { name="threg"; version="1.0.2"; sha256="0wb9waj0j83zrj763d3fdnp3lp52gfdyzv23yrvxvd6zmk5clgi2"; depends=[Formula survival]; };
 thsls = derive { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; };
 tibbrConnector = derive { name="tibbrConnector"; version="1.5.0-71"; sha256="0d8gy126hzzardcwr9ydagdb0dy9bdw30l8s2wwi7zaxx2lpii6q"; depends=[RCurl rjson]; };
 tictoc = derive { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; };
-tidyjson = derive { name="tidyjson"; version="0.2.1"; sha256="178lc4ii4vjzvrkxfdf5cd9ryxva9h2vv4wl6xgxgaixkab9yv9w"; depends=[assertthat jsonlite dplyr]; };
-tidyr = derive { name="tidyr"; version="0.2.0"; sha256="169i6xnr4bs5vqkv6dilj5j8v95giz0b7byhi06qk414gdlj2r8n"; depends=[reshape2 dplyr stringi lazyeval]; };
+tidyjson = derive { name="tidyjson"; version="0.2.1"; sha256="178lc4ii4vjzvrkxfdf5cd9ryxva9h2vv4wl6xgxgaixkab9yv9w"; depends=[assertthat dplyr jsonlite]; };
+tidyr = derive { name="tidyr"; version="0.2.0"; sha256="169i6xnr4bs5vqkv6dilj5j8v95giz0b7byhi06qk414gdlj2r8n"; depends=[dplyr lazyeval reshape2 stringi]; };
 tiff = derive { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; };
-tiger = derive { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin qualV klaR som lattice]; };
-tigerstats = derive { name="tigerstats"; version="0.2-6"; sha256="0niibqhqpjxgq3m7xp0icf98k531ncmm853scvqp5icv2yz5ivav"; depends=[abd mosaic mosaicData ggplot2 lattice MASS]; };
+tiger = derive { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin klaR lattice qualV som]; };
+tigerstats = derive { name="tigerstats"; version="0.2-6"; sha256="0niibqhqpjxgq3m7xp0icf98k531ncmm853scvqp5icv2yz5ivav"; depends=[abd ggplot2 lattice MASS mosaic mosaicData]; };
 tightClust = derive { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; };
 tikzDevice = derive { name="tikzDevice"; version="0.8.1"; sha256="0262szfzv4yrfal19giinrphra1kfcm2arfckql4rf2zsq13rw35"; depends=[filehash]; };
 tileHMM = derive { name="tileHMM"; version="1.0-6"; sha256="18vqj7fdh4knnjk9s7yk2bgn3qwqz92fmm5fdny21gi0wl4qgdsd"; depends=[]; };
 timeDate = derive { name="timeDate"; version="3012.100"; sha256="0cn4h23y2y2bbg62qgm79xx4cvfla5xbpmi9hbdvkvpmm5yfyqk2"; depends=[]; };
-timeROC = derive { name="timeROC"; version="0.3"; sha256="0xl6gpb5ayppzp08wwry4i051rm40lzfx43jw2yn3jy2p3nrcakb"; depends=[pec mvtnorm]; };
-timeSeq = derive { name="timeSeq"; version="1.0.0"; sha256="1b7jcld1h3xsp3nl2nk9nqsgdg1pdi4m54hgsdlvivk9zzv3k6wr"; depends=[gss lattice pheatmap doParallel foreach reshape]; };
+timeROC = derive { name="timeROC"; version="0.3"; sha256="0xl6gpb5ayppzp08wwry4i051rm40lzfx43jw2yn3jy2p3nrcakb"; depends=[mvtnorm pec]; };
+timeSeq = derive { name="timeSeq"; version="1.0.0"; sha256="1b7jcld1h3xsp3nl2nk9nqsgdg1pdi4m54hgsdlvivk9zzv3k6wr"; depends=[doParallel edgeR foreach gss lattice pheatmap reshape]; };
 timeSeries = derive { name="timeSeries"; version="3012.99"; sha256="06lz9xljzadfs94xwn8578h8mw56wp923k0xfppzq69hcpcrhsvf"; depends=[timeDate]; };
 timeit = derive { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; };
 timeline = derive { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; };
 timeordered = derive { name="timeordered"; version="0.9.8"; sha256="1j0x2v22ybyl3l9r3aaz5a3bxh0zq81rbga9gh63zads2xy5axmf"; depends=[igraph plyr]; };
-timereg = derive { name="timereg"; version="1.8.9"; sha256="12l8sz10ic8d34jd7ik8szg2d51pr949nsss20c5l5g3kfnvqkkh"; depends=[survival lava numDeriv]; };
+timereg = derive { name="timereg"; version="1.8.9"; sha256="12l8sz10ic8d34jd7ik8szg2d51pr949nsss20c5l5g3kfnvqkkh"; depends=[lava numDeriv survival]; };
 timesboot = derive { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; };
-timeseriesdb = derive { name="timeseriesdb"; version="0.2.1"; sha256="0150zs8c8184jzry33aki21prmpnxp3rclp84q6igwxi4grdhlr0"; depends=[RPostgreSQL RJSONIO xts zoo reshape2 shiny DBI]; };
+timeseriesdb = derive { name="timeseriesdb"; version="0.2.1"; sha256="0150zs8c8184jzry33aki21prmpnxp3rclp84q6igwxi4grdhlr0"; depends=[DBI reshape2 RJSONIO RPostgreSQL shiny xts zoo]; };
 timetools = derive { name="timetools"; version="1.6.5"; sha256="1ni1dqzkdrzmvr0sbnfdh7kcsd5sgfggfl6w7nqviidcff5dbc9g"; depends=[]; };
-timetree = derive { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[XML phangorn]; };
-timma = derive { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[Rcpp QCA reshape2 Rcpp RcppArmadillo]; };
+timetree = derive { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[phangorn XML]; };
+timma = derive { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[QCA Rcpp RcppArmadillo reshape2]; };
 timsac = derive { name="timsac"; version="1.3.3"; sha256="0jg9mjzzfl94z4dqb2kz0aiccpclnbyf9p08x3a3cw1y6wqmzrmy"; depends=[]; };
 tipom = derive { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; };
 tis = derive { name="tis"; version="1.30"; sha256="0bqvnaxqqq4962wfw4s9rf0qil613mplqcjwjlq1s9yfxl78gzzw"; depends=[]; };
-titan = derive { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762j5ci56964j2466xfbwcywhn9njz5r"; depends=[MASS boot lattice]; };
+titan = derive { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762j5ci56964j2466xfbwcywhn9njz5r"; depends=[boot lattice MASS]; };
 tkrgl = derive { name="tkrgl"; version="0.7"; sha256="1kpq5p6izqrn1zr53firis3rmifq9lf6326lf3z7l1p82nf2yps5"; depends=[rgl]; };
 tkrplot = derive { name="tkrplot"; version="0.0-23"; sha256="1cnyszn3rmr1kwvi5a178dr3074skdijfixf5ln8av5wwcy35947"; depends=[]; };
 tlemix = derive { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; };
@@ -6499,44 +6524,45 @@ tlmec = derive { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7b
 tlnise = derive { name="tlnise"; version="2.0"; sha256="1vh998vqj359249n9zmw04rsivb7nlbdfgzf20pgh2sndm3rh8qz"; depends=[]; };
 tm = derive { name="tm"; version="0.6-1"; sha256="0i32gwic6vi7fkw05vg3rk8lmszzmy6gm9f5hrj0xckx7sf1ilfq"; depends=[NLP slam]; };
 tm_plugin_alceste = derive { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; };
-tm_plugin_dc = derive { name="tm.plugin.dc"; version="0.2-7"; sha256="1ikkxp5jdr385yqvhknvkvs97039jw964pcm6dl1k66nbdv1q59i"; depends=[DSL tm NLP slam]; };
+tm_plugin_dc = derive { name="tm.plugin.dc"; version="0.2-7"; sha256="1ikkxp5jdr385yqvhknvkvs97039jw964pcm6dl1k66nbdv1q59i"; depends=[DSL NLP slam tm]; };
 tm_plugin_europresse = derive { name="tm.plugin.europresse"; version="1.2"; sha256="1sgm9wnzlphl4qhc69nj5im4y1qs6b0vssmn5j98fbc3xlxiyzjx"; depends=[NLP tm XML]; };
 tm_plugin_factiva = derive { name="tm.plugin.factiva"; version="1.5"; sha256="06s75rwx9fzld1dw0nw6q5phc1h0zsdzhy1dcdcvmsf97d4s2qdr"; depends=[NLP tm XML]; };
-tm_plugin_lexisnexis = derive { name="tm.plugin.lexisnexis"; version="1.2"; sha256="0cjw705czzzhd8ybfxkrv0f9kvmv9pcswisc7n9hkx8lxi942h19"; depends=[NLP tm XML ISOcodes]; };
+tm_plugin_lexisnexis = derive { name="tm.plugin.lexisnexis"; version="1.2"; sha256="0cjw705czzzhd8ybfxkrv0f9kvmv9pcswisc7n9hkx8lxi942h19"; depends=[ISOcodes NLP tm XML]; };
 tm_plugin_mail = derive { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; };
-tm_plugin_webmining = derive { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[NLP tm boilerpipeR RCurl XML RJSONIO]; };
-tmap = derive { name="tmap"; version="1.0"; sha256="1807zh2yjgcpjrl1g83ahby7857l7hd5k9shrb1v6vkv6x5rrrkm"; depends=[sp raster gridBase rgdal rgeos classInt RColorBrewer]; };
-tmg = derive { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp Rcpp RcppEigen]; };
+tm_plugin_webmining = derive { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; };
+tmap = derive { name="tmap"; version="1.0"; sha256="1807zh2yjgcpjrl1g83ahby7857l7hd5k9shrb1v6vkv6x5rrrkm"; depends=[classInt gridBase raster RColorBrewer rgdal rgeos sp]; };
+tmg = derive { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp RcppEigen]; };
 tmle = derive { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99wg8a2xyvfgvbyvx3jfxkgk33mybbm"; depends=[SuperLearner]; };
-tmle_npvi = derive { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[R_utils R_methodsS3 R_oo MASS Matrix geometry]; };
-tmvtnorm = derive { name="tmvtnorm"; version="1.4-9"; sha256="1dacdhqv6bb29a81bmxp8hxy4hragpg8mb5kql4cp59q08zmizyi"; depends=[mvtnorm Matrix gmm]; };
+tmle_npvi = derive { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[geometry MASS Matrix R_methodsS3 R_oo R_utils]; };
+tmvtnorm = derive { name="tmvtnorm"; version="1.4-9"; sha256="1dacdhqv6bb29a81bmxp8hxy4hragpg8mb5kql4cp59q08zmizyi"; depends=[gmm Matrix mvtnorm]; };
 tnet = derive { name="tnet"; version="3.0.11"; sha256="00hifb145w0a9f5qi3gx16lm1qg621jp523vswb8h86jqmxcczbc"; depends=[igraph survival]; };
 toOrdinal = derive { name="toOrdinal"; version="0.0-1"; sha256="1rr6liw0krzdarc9gd406mf242n3hl38bn52xphr1g0riq5y2m4q"; depends=[]; };
 tolerance = derive { name="tolerance"; version="1.1.0"; sha256="1mrgvrdlawrmbz8bhq9cxqgn4fxvn18f1gjf9f9s8fvfnc4nda96"; depends=[rgl]; };
 topicmodels = derive { name="topicmodels"; version="0.2-1"; sha256="1if1pdx4jnfx3xi37xs411qv3h449vkwxzzqd7krxaxbj3gqq7n9"; depends=[modeltools slam tm]; };
 topmodel = derive { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; };
-topologyGSA = derive { name="topologyGSA"; version="1.4.4"; sha256="092f57gpm8jlb2y4j74a6dx1lwqjdgcm3yrm1yzy4511j6vg0axh"; depends=[gRbase fields]; };
+topologyGSA = derive { name="topologyGSA"; version="1.4.4"; sha256="092f57gpm8jlb2y4j74a6dx1lwqjdgcm3yrm1yzy4511j6vg0axh"; depends=[fields graph gRbase qpgraph]; };
 topsis = derive { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; };
 tosls = derive { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; };
 tourr = derive { name="tourr"; version="0.5.4"; sha256="11xg5slvx7rgyzrc0lzandw7vr7wzk3w2pplsnyrqq3d990qp40d"; depends=[]; };
-tourrGui = derive { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r201wss3vjd2pngvbaflk5dqh9yf75jpq"; depends=[tourr colorspace RGtk2 gWidgets Cairo]; };
+tourrGui = derive { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r201wss3vjd2pngvbaflk5dqh9yf75jpq"; depends=[Cairo colorspace gWidgets RGtk2 tourr]; };
 toxtestD = derive { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; };
 tpe = derive { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; };
 tpr = derive { name="tpr"; version="0.3-1"; sha256="0nxl0m39zaii6rwm35hxcdk6iy2f729jjmhc2cpr8h0mgvgqf19d"; depends=[lgtdl]; };
 track = derive { name="track"; version="1.1.8"; sha256="0scrww0ba1lrv39fh416wcbzblxnd9f7lp2w24hyp0zbbf1nxs68"; depends=[]; };
 tractor_base = derive { name="tractor.base"; version="2.5.0"; sha256="17s4iyp67w7m8gslm87p3ic5r9iq7x1ifpxqrmnin3y5a3d04f5v"; depends=[reportr]; };
-traitr = derive { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest proto gWidgets]; };
-traj = derive { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster psych pastecs NbClust GPArotation]; };
+traitr = derive { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest gWidgets proto]; };
+traits = derive { name="traits"; version="0.1.0"; sha256="0xn4jznf4fvm7d6yinyw8viik9gdnfskcgavwdb7r9als4qxqs58"; depends=[data_table dplyr httr jsonlite taxize XML]; };
+traj = derive { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; };
 trajectories = derive { name="trajectories"; version="0.1-3"; sha256="1lk2mxfsf8x8idhb4dcj9lqvkjwm2yarvjid42xr2a9wwylvz9vq"; depends=[lattice sp spacetime]; };
-translate = derive { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[RCurl RJSONIO functional lisp]; };
-translateR = derive { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[RJSONIO RCurl textcat httr]; };
+translate = derive { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; };
+translateR = derive { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; };
 transport = derive { name="transport"; version="0.6-3"; sha256="1sldlccsprzan1liyslzp9wzz3d36khyr6zri773npvnss9pa67w"; depends=[]; };
 trapezoid = derive { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; };
 treatSens = derive { name="treatSens"; version="1.1"; sha256="1h49idgv3rsday8xdj3rfqflj42ya9i5sg7cm1026arff1yqxxz8"; depends=[]; };
 tree = derive { name="tree"; version="1.0-35"; sha256="1cxn73rlr8s3qbq3icdh1v3jbbz913ns6xk6yzgk30ncifw4iq6g"; depends=[]; };
-treeClust = derive { name="treeClust"; version="1.0-0"; sha256="1xn6m031vx12wcyyh04yb68cw416a6v5wd8rcp5f9jqirv1hp4xb"; depends=[rpart cluster]; };
-treebase = derive { name="treebase"; version="0.0-7.1"; sha256="0kj1cyk14j4qzm31f47a8g7qh4842rqkzr0fqh9i5c8kzrqxbc0g"; depends=[ape XML RCurl reshape2 data_table]; };
-treeclim = derive { name="treeclim"; version="1.0.11"; sha256="09i7zxwdrbfgridxsm20r554nyvwp40ngc47isy16a7f1q3rwjah"; depends=[Rcpp abind plyr ggplot2 lmtest lmodel2 np boot Rcpp RcppArmadillo]; };
+treeClust = derive { name="treeClust"; version="1.0-0"; sha256="1xn6m031vx12wcyyh04yb68cw416a6v5wd8rcp5f9jqirv1hp4xb"; depends=[cluster rpart]; };
+treebase = derive { name="treebase"; version="0.1.1"; sha256="00xjmvnfh8f05w0076f5rlqa6w5yw0xiqpk076j3ixsv8z6m10hy"; depends=[ape data_table RCurl reshape2 XML]; };
+treeclim = derive { name="treeclim"; version="1.0.11"; sha256="09i7zxwdrbfgridxsm20r554nyvwp40ngc47isy16a7f1q3rwjah"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; };
 treecm = derive { name="treecm"; version="1.2.1"; sha256="02al6iz25pay7y1qmbpy04nw8dj9c5r7km6q5k3v3jdkfal6cm6k"; depends=[plyr]; };
 treelet = derive { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; };
 treemap = derive { name="treemap"; version="2.2"; sha256="0h4wkjw12n9awqsvrs72nmsxq3d5as3zjy8kyhw7715h1cvry769"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; };
@@ -6545,22 +6571,22 @@ treethresh = derive { name="treethresh"; version="0.1-8"; sha256="1xkbqlr9gkpw6a
 trend = derive { name="trend"; version="0.0.1"; sha256="05awwsqp8vm2p00dq2hkb7dglwf45djw2xx2q2mq33blrlhn31sw"; depends=[]; };
 triangle = derive { name="triangle"; version="0.8"; sha256="0jdphz1rf4cx4y28syfffaz7fbl41g3rw3mrv9dywycdznhxdnrp"; depends=[]; };
 trifield = derive { name="trifield"; version="1.1"; sha256="0xk48fkd5xa3mfn3pwdya0ihpkwnh20sgj3rc7fmzjil47kqscvy"; depends=[]; };
-trimTrees = derive { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[randomForest mlbench]; };
+trimTrees = derive { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[mlbench randomForest]; };
 trimcluster = derive { name="trimcluster"; version="0.1-2"; sha256="0lsgbg93hm0w1rdb813ry0ks2l0jfpyqzqkf3h3bj6fch0avcbv2"; depends=[]; };
-trioGxE = derive { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[msm mgcv gtools]; };
-trip = derive { name="trip"; version="1.1-21"; sha256="0rawckw3xd8kz2jn6xgspgl5axabjcp4xh4kp93n3h41xlarv9xa"; depends=[sp maptools MASS raster spatstat]; };
+trioGxE = derive { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[gtools mgcv msm]; };
+trip = derive { name="trip"; version="1.1-21"; sha256="0rawckw3xd8kz2jn6xgspgl5axabjcp4xh4kp93n3h41xlarv9xa"; depends=[maptools MASS raster sp spatstat]; };
 tripEstimation = derive { name="tripEstimation"; version="0.0-42"; sha256="17spnvrrqv89vldd496wc1psmaby0mhw9nh0qnfm7yc2jcqaf5nb"; depends=[lattice mgcv rgdal sp zoo]; };
 tripack = derive { name="tripack"; version="1.3-6"; sha256="1dknz1arzfyknip04a9fxdhqmrkb0r0lr8hgria9s0d57hr1ay12"; depends=[]; };
 trotter = derive { name="trotter"; version="0.6"; sha256="0i8r2f2klkkfnjm7jhvga3gx6m7r97pd73d88004jzlm9ficspgy"; depends=[]; };
 trueskill = derive { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; };
-truncSP = derive { name="truncSP"; version="1.2.2"; sha256="1hdi518j3sg9273g01l1jqlmqya3ppim82ma7zakwqpmsjmzw18q"; depends=[truncreg boot]; };
+truncSP = derive { name="truncSP"; version="1.2.2"; sha256="1hdi518j3sg9273g01l1jqlmqya3ppim82ma7zakwqpmsjmzw18q"; depends=[boot truncreg]; };
 truncdist = derive { name="truncdist"; version="1.0-1"; sha256="0aszs6rz8nydyf2dw1m4fj9fclb0r4vpgqywyaqjkdnhzmyn593g"; depends=[evd]; };
 truncgof = derive { name="truncgof"; version="0.6-0"; sha256="0b499i9zjwvva5jfl9fj02jjrgy8myxqfjwa0cjg0jrpgxczgwg8"; depends=[MASS]; };
 truncnorm = derive { name="truncnorm"; version="1.0-7"; sha256="1qac05z50618y4bw1d7yznsli1bv82s0g8h37iacrjrdkv87bmy7"; depends=[]; };
 truncreg = derive { name="truncreg"; version="0.2-1"; sha256="0qvdfj93phk1s2p4n0rmpf8x9gj5n1j75h4z424mrg10r24699rd"; depends=[maxLik]; };
 trust = derive { name="trust"; version="0.1-6"; sha256="1jghgwnazhqgyn2k0b3x4n8swncyy6dzlkv86chv98zw4s3bnlak"; depends=[]; };
-trustOptim = derive { name="trustOptim"; version="0.8.5"; sha256="1y9krw2z5skkwgfdjagl8l04l9sbiqbk1fbxp30wrf4qj3pba5w6"; depends=[Rcpp Matrix Rcpp RcppEigen]; };
-tsDyn = derive { name="tsDyn"; version="0.9-43"; sha256="0fhqfwhac1ac1vakwll41m54l88b1c5y34hln5i1y2ngvhy277l1"; depends=[mnormt mgcv nnet tseriesChaos tseries vars urca forecast MASS Matrix foreach]; };
+trustOptim = derive { name="trustOptim"; version="0.8.5"; sha256="1y9krw2z5skkwgfdjagl8l04l9sbiqbk1fbxp30wrf4qj3pba5w6"; depends=[Matrix Rcpp RcppEigen]; };
+tsDyn = derive { name="tsDyn"; version="0.9-43"; sha256="0fhqfwhac1ac1vakwll41m54l88b1c5y34hln5i1y2ngvhy277l1"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; };
 tsModel = derive { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; };
 tsallisqexp = derive { name="tsallisqexp"; version="0.9-1"; sha256="0z4csd3ircpf5jync6h1snj1k2awkd0s6vj2k4ij6rvs8w3nf8nn"; depends=[]; };
 tsbridge = derive { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; };
@@ -6569,29 +6595,29 @@ tsc = derive { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw
 tscount = derive { name="tscount"; version="1.0.0"; sha256="0n01biifzjfvnj3zhrn87qigf4l1kij2zfqf6876qz8rps1jz626"; depends=[ltsa]; };
 tseries = derive { name="tseries"; version="0.10-34"; sha256="068mjgjcsvgpynkvga8lv430cg8zhlr9frj5yapsxni2vj534pqj"; depends=[quadprog zoo]; };
 tseriesChaos = derive { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; };
-tsfa = derive { name="tsfa"; version="2014.10-1"; sha256="0gkgl55v08dr288nf8r769f96qri7qbi5src7y6azrykb37nz6iz"; depends=[GPArotation dse EvalEst setRNG tframe tfplot]; };
+tsfa = derive { name="tsfa"; version="2014.10-1"; sha256="0gkgl55v08dr288nf8r769f96qri7qbi5src7y6azrykb37nz6iz"; depends=[dse EvalEst GPArotation setRNG tfplot tframe]; };
 tsintermittent = derive { name="tsintermittent"; version="1.5"; sha256="1qziwdpxfc2v010bk2cnhkrajza0z7lrrsjg06m49msyk5bk62z1"; depends=[MAPA]; };
 tslars = derive { name="tslars"; version="1.0"; sha256="0ylpn4jxmrck7hna3j420kw2yhsrklrq2664w85z30xij3zrrrci"; depends=[]; };
 tsne = derive { name="tsne"; version="0.1-2"; sha256="12q5s79r2949zhm61byd4dbgw6sz3bmxzcwr8b0wlp8g1xg4bhy6"; depends=[]; };
-tsoutliers = derive { name="tsoutliers"; version="0.6"; sha256="1cyh56i7dsnclphi81fab6k8vkdqv8ing2zmpfsjq4gvq76p7piw"; depends=[forecast polynom stsm KFKSDS]; };
-tspmeta = derive { name="tspmeta"; version="1.1"; sha256="11kr5avf67v2cxy3k1yrpv9lcbmiprd0w43w7zvizhsij58h13vm"; depends=[ggplot2 TSP MASS BBmisc fpc vegan stringr splancs]; };
-ttScreening = derive { name="ttScreening"; version="1.5"; sha256="0qn8lkvgvqpmm368fwpqkm09yaj9mw42mjlikyiwpv2wrgbpmg9n"; depends=[matrixStats corpcor MASS]; };
+tsoutliers = derive { name="tsoutliers"; version="0.6"; sha256="1cyh56i7dsnclphi81fab6k8vkdqv8ing2zmpfsjq4gvq76p7piw"; depends=[forecast KFKSDS polynom stsm]; };
+tspmeta = derive { name="tspmeta"; version="1.1"; sha256="11kr5avf67v2cxy3k1yrpv9lcbmiprd0w43w7zvizhsij58h13vm"; depends=[BBmisc fpc ggplot2 MASS splancs stringr TSP vegan]; };
+ttScreening = derive { name="ttScreening"; version="1.5"; sha256="0qn8lkvgvqpmm368fwpqkm09yaj9mw42mjlikyiwpv2wrgbpmg9n"; depends=[corpcor limma MASS matrixStats sva]; };
 tth = derive { name="tth"; version="4.3-2"; sha256="1gs8xjljklvs0pavvn9f59y09hw7x2da58a46b5x01g08i0j8h1d"; depends=[]; };
 ttutils = derive { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; };
 ttwa = derive { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; };
-tufterhandout = derive { name="tufterhandout"; version="1.2.1"; sha256="04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw"; depends=[rmarkdown knitr]; };
-tumblR = derive { name="tumblR"; version="1.1"; sha256="0gl6q6rff9bp21gvi3bz8kmwbhimxqrv1mmzwshl1ys9r7d4dvps"; depends=[httr RCurl stringr RJSONIO]; };
+tufterhandout = derive { name="tufterhandout"; version="1.2.1"; sha256="04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw"; depends=[knitr rmarkdown]; };
+tumblR = derive { name="tumblR"; version="1.1"; sha256="0gl6q6rff9bp21gvi3bz8kmwbhimxqrv1mmzwshl1ys9r7d4dvps"; depends=[httr RCurl RJSONIO stringr]; };
 tuneR = derive { name="tuneR"; version="1.2.1"; sha256="1f6mdkfwfy6r62sbwq37sylvcji6f3mj9w13sgicxjn6swbszf57"; depends=[signal]; };
 tuple = derive { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; };
-turboEM = derive { name="turboEM"; version="2014.8-1"; sha256="0g9nm1m542hslz8272n5qz6h59criyf71l2w218dvq34bcjcd3yy"; depends=[doParallel foreach numDeriv quantreg iterators]; };
+turboEM = derive { name="turboEM"; version="2014.8-1"; sha256="0g9nm1m542hslz8272n5qz6h59criyf71l2w218dvq34bcjcd3yy"; depends=[doParallel foreach iterators numDeriv quantreg]; };
 turfR = derive { name="turfR"; version="0.8-7"; sha256="007jmkppfv1x4zzvvd65fhg5k15ybjhsya2zfjgwm77wm34y81ca"; depends=[dplyr]; };
 turner = derive { name="turner"; version="0.1.7"; sha256="1xckb750hbfmzhvabj0lzrsscib7g187b44ag831z58zvawwh772"; depends=[tester]; };
-tvd = derive { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp Rcpp]; };
+tvd = derive { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp]; };
 tvm = derive { name="tvm"; version="0.2"; sha256="1fwa37xnp3idal8v1xxlc9gr25595f644i7a3h8xpd0k086sp1dg"; depends=[ggplot2 reshape2]; };
-twang = derive { name="twang"; version="1.4-9.3"; sha256="06lgawzq3b2jg84rvg24582ndlk8qji4gcbvxz5acf302cvdnmji"; depends=[gbm survey xtable lattice latticeExtra]; };
+twang = derive { name="twang"; version="1.4-9.3"; sha256="06lgawzq3b2jg84rvg24582ndlk8qji4gcbvxz5acf302cvdnmji"; depends=[gbm lattice latticeExtra survey xtable]; };
 tweedie = derive { name="tweedie"; version="2.2.1"; sha256="1fsi0qf901bvvwa8bb6qvp90fkx1svzswljlvw4zirdavy65w0iq"; depends=[]; };
 twiddler = derive { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; };
-twitteR = derive { name="twitteR"; version="1.1.8"; sha256="1gzahkipzpgfc160sgxzzga7byncih4j30r303m788c9lxk5dbxv"; depends=[bit64 rjson DBI httr]; };
+twitteR = derive { name="twitteR"; version="1.1.8"; sha256="1gzahkipzpgfc160sgxzzga7byncih4j30r303m788c9lxk5dbxv"; depends=[bit64 DBI httr rjson]; };
 twoStageGwasPower = derive { name="twoStageGwasPower"; version="0.99.0"; sha256="1xvy6v444v47i29aw54y29xiizkmryv8p3mjha93xr3xq9bx2mq7"; depends=[]; };
 twostageTE = derive { name="twostageTE"; version="1.2"; sha256="05k9lvkailv06cah71p71hnx8in045nxz6waplsccznplhgqg5ar"; depends=[isotone]; };
 txtplot = derive { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; };
@@ -6606,70 +6632,70 @@ uniReg = derive { name="uniReg"; version="1.0"; sha256="1xl19dqnxxibgiiny9ysll2z
 uniftest = derive { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; };
 uniqtag = derive { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; };
 unittest = derive { name="unittest"; version="1.2-0"; sha256="1g3f36kikxrzsiyhwpl73q2si5k28drcwvvrqzsqmfyhbjb14555"; depends=[]; };
-unmarked = derive { name="unmarked"; version="0.10-6"; sha256="07mw9rg4i81fqdkgkpcb7kd7235hn4nyxpbf5b8vxzsly81ffpz7"; depends=[reshape lattice Rcpp plyr Rcpp RcppArmadillo]; };
+unmarked = derive { name="unmarked"; version="0.10-6"; sha256="07mw9rg4i81fqdkgkpcb7kd7235hn4nyxpbf5b8vxzsly81ffpz7"; depends=[lattice plyr Rcpp RcppArmadillo reshape]; };
 untb = derive { name="untb"; version="1.7-2"; sha256="1ha0xj94sz1r325qb4sb5hla9hw1gbqr76703vk792x9696skhji"; depends=[Brobdingnag partitions polynom]; };
 upclass = derive { name="upclass"; version="2.0"; sha256="0jkxn6jgglw6pzzbcvi1pnq4hwfach3xbi13zwml4i83s3n5b0vg"; depends=[mclust]; };
-uplift = derive { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[RItools MASS coin tables penalized]; };
+uplift = derive { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; };
 urca = derive { name="urca"; version="1.2-8"; sha256="0gyjb99m6w6h701vmsav16jpfl5276vlyaagizax8k20ns9ddl4b"; depends=[nlme]; };
-urltools = derive { name="urltools"; version="1.1.0"; sha256="0l0fqc1zvn8ps1cxxnpglbyfdwibyxaj3c2ivz8js8vphcr5i9zp"; depends=[Rcpp Rcpp]; };
+urltools = derive { name="urltools"; version="1.1.0"; sha256="0l0fqc1zvn8ps1cxxnpglbyfdwibyxaj3c2ivz8js8vphcr5i9zp"; depends=[Rcpp]; };
 usdm = derive { name="usdm"; version="1.1-12"; sha256="0padc9ppfisnjg1nzw5csv2zki6dby7487lis8pixf1hhbinsnci"; depends=[raster]; };
 useful = derive { name="useful"; version="1.1.8"; sha256="1lzl7rr9qxqa0ga6ml7qi7wi02fd4isgpfskvi3igy10iw1zv3hb"; depends=[ggplot2 plyr scales]; };
-userfriendlyscience = derive { name="userfriendlyscience"; version="0.3-0"; sha256="0gz59n315dbjlyh6fdqihr1x458wplnd43q2gw9s6f9b55359m2c"; depends=[ggplot2 plyr psych pwr fBasics ltm MBESS SuppDists GPArotation MASS mosaic foreign car knitr xtable GGally lavaan]; };
-uskewFactors = derive { name="uskewFactors"; version="1.0"; sha256="1ixcxqw8ai77ndn1cfkq53a090fgs95yzvas1qg2siwpfsm4yix6"; depends=[tmvtnorm mvtnorm MCMCpack MASS]; };
+userfriendlyscience = derive { name="userfriendlyscience"; version="0.3-0"; sha256="0gz59n315dbjlyh6fdqihr1x458wplnd43q2gw9s6f9b55359m2c"; depends=[car fBasics foreign GGally ggplot2 GPArotation knitr lavaan ltm MASS MBESS mosaic plyr psych pwr SuppDists xtable]; };
+uskewFactors = derive { name="uskewFactors"; version="1.0"; sha256="1ixcxqw8ai77ndn1cfkq53a090fgs95yzvas1qg2siwpfsm4yix6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; };
 usl = derive { name="usl"; version="1.4.1"; sha256="0z3dvxczp2vp4clnwds34w5rgv4la5hpadbcmdkfqcpdy1vjryv5"; depends=[nlmrt]; };
-ustyc = derive { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[XML plyr]; };
+ustyc = derive { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; };
 utility = derive { name="utility"; version="1.3"; sha256="0ng7jc45k9rgj9055ndmgl308zjvxd2cjsk2pn57x44rl1lldcj5"; depends=[]; };
 uuid = derive { name="uuid"; version="0.1-1"; sha256="1b35h2n86233zb6dwkgxxlvnlld8kmv0j6j3m31xjbpmc3ppr7w3"; depends=[]; };
 vacem = derive { name="vacem"; version="0.1-1"; sha256="0lh32hj4g1hsa45v6pmfyj1hw0klk8gr1k451lvs4hzpkkcwkqbn"; depends=[foreach]; };
-varComp = derive { name="varComp"; version="0.1-360"; sha256="18xazjx102j6v1jgswxjdqjb0hq6hd646yhwb7bcplqyls9hzha0"; depends=[quadprog Matrix MASS CompQuadForm RLRsim SPA3G mvtnorm nlme]; };
+varComp = derive { name="varComp"; version="0.1-360"; sha256="18xazjx102j6v1jgswxjdqjb0hq6hd646yhwb7bcplqyls9hzha0"; depends=[CompQuadForm MASS Matrix mvtnorm nlme quadprog RLRsim SPA3G]; };
 varSelRF = derive { name="varSelRF"; version="0.7-5"; sha256="1800d9vvkqpxjvmiqdr610hw7ji79j0wsbl823s097dndmv51axk"; depends=[randomForest]; };
 varSelectIP = derive { name="varSelectIP"; version="0.2-1"; sha256="180lzsg48hnlcmhpk0a5yzmy2syw8yr7f5npnyspx3897hjag1vp"; depends=[MASS mvtnorm]; };
 varbvs = derive { name="varbvs"; version="1.0"; sha256="0ywgb6ibijffjjzqqb5lvh1lk5qznwwiq7kbsyzkwcxbp8xkabjw"; depends=[]; };
 vardiag = derive { name="vardiag"; version="0.2-0"; sha256="0avj900zx4nr67dk08n0n6arxx2cb2ymm0kd5xxnzsmyrmwm40mm"; depends=[]; };
-vardpoor = derive { name="vardpoor"; version="0.3.2"; sha256="0vb684yhvafdmzphx4vv8gqih10x3mj8vmwshppwfgd3jp76dnps"; depends=[data_table laeken stringr reshape2 foreach plyr gdata MASS]; };
-vars = derive { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[MASS strucchange urca lmtest sandwich]; };
+vardpoor = derive { name="vardpoor"; version="0.3.2"; sha256="0vb684yhvafdmzphx4vv8gqih10x3mj8vmwshppwfgd3jp76dnps"; depends=[data_table foreach gdata laeken MASS plyr reshape2 stringr]; };
+vars = derive { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[lmtest MASS sandwich strucchange urca]; };
 vartors = derive { name="vartors"; version="0.2.6"; sha256="04dynqs903clllk9nyynh3dr7msxn5rr5jmw6ql86ppd5w3da0rl"; depends=[]; };
 vbdm = derive { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; };
 vbsr = derive { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; };
-vcd = derive { name="vcd"; version="1.4-0"; sha256="0gp137hlkg1wm8bhfdpswz0g05a4biprfa5r9i1fz5w0myqgpxca"; depends=[MASS colorspace lmtest]; };
-vcdExtra = derive { name="vcdExtra"; version="0.6-8"; sha256="00nxvq5fn5il3lmip8ag22cqc2sxlbl1rqw5zxp309wp4nrm5i2v"; depends=[vcd gnm MASS]; };
-vcrpart = derive { name="vcrpart"; version="0.3-3"; sha256="0rnf9cwynfwr956hwj4kxqiqq3cdw4wf5ia73s7adxixh5kpqxqa"; depends=[partykit nlme rpart numDeriv ucminf zoo sandwich strucchange]; };
-vdg = derive { name="vdg"; version="1.1"; sha256="08bl7835m5c62lgaghgnd80zlbic6i80sjfxdr39a715bxpr8g3b"; depends=[ggplot2 quantreg proxy gridExtra]; };
-vdmR = derive { name="vdmR"; version="0.1.1"; sha256="0hmn7xgi1dzril6jdwxkpxp8isin0kxn3yb5fmcyfjhf03kcv4d4"; depends=[ggplot2 plyr maptools gridSVG rjson GGally Rook dplyr]; };
+vcd = derive { name="vcd"; version="1.4-0"; sha256="0gp137hlkg1wm8bhfdpswz0g05a4biprfa5r9i1fz5w0myqgpxca"; depends=[colorspace lmtest MASS]; };
+vcdExtra = derive { name="vcdExtra"; version="0.6-8"; sha256="00nxvq5fn5il3lmip8ag22cqc2sxlbl1rqw5zxp309wp4nrm5i2v"; depends=[gnm MASS vcd]; };
+vcrpart = derive { name="vcrpart"; version="0.3-3"; sha256="0rnf9cwynfwr956hwj4kxqiqq3cdw4wf5ia73s7adxixh5kpqxqa"; depends=[nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; };
+vdg = derive { name="vdg"; version="1.1"; sha256="08bl7835m5c62lgaghgnd80zlbic6i80sjfxdr39a715bxpr8g3b"; depends=[ggplot2 gridExtra proxy quantreg]; };
+vdmR = derive { name="vdmR"; version="0.1.1"; sha256="0hmn7xgi1dzril6jdwxkpxp8isin0kxn3yb5fmcyfjhf03kcv4d4"; depends=[dplyr GGally ggplot2 gridSVG maptools plyr rjson Rook]; };
 vec2dtransf = derive { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; };
 vecsets = derive { name="vecsets"; version="1.1"; sha256="0k27g3frc9y9z2qlm19kfpls6wl0422dilhdlk6096f1fp3mc6ij"; depends=[]; };
-vectoptim = derive { name="vectoptim"; version="0.2"; sha256="1n19sipx5r0qy08jmrbsrf0kgwgl31np88wc1zyc2bkx8h1zkmf2"; depends=[foreach doParallel]; };
-vegan = derive { name="vegan"; version="2.3-0"; sha256="1zlz2zq0818735db4l8gfwwxxd5dc0xnx6v8cq6mfclkw1qhcdpx"; depends=[permute lattice MASS cluster mgcv]; };
-vegan3d = derive { name="vegan3d"; version="0.65-1"; sha256="03rzv7l2jjrahj3492ysalyizkv24by35nrhd1bnlb1s88sav7sr"; depends=[vegan rgl scatterplot3d]; };
-vegclust = derive { name="vegclust"; version="1.6.3"; sha256="0l6j4sgzfqvcypx2dszpnsd1sivk33pixlgf9abqifp45skpkwfg"; depends=[vegan sp]; };
+vectoptim = derive { name="vectoptim"; version="0.2"; sha256="1n19sipx5r0qy08jmrbsrf0kgwgl31np88wc1zyc2bkx8h1zkmf2"; depends=[doParallel foreach]; };
+vegan = derive { name="vegan"; version="2.3-0"; sha256="1zlz2zq0818735db4l8gfwwxxd5dc0xnx6v8cq6mfclkw1qhcdpx"; depends=[cluster lattice MASS mgcv permute]; };
+vegan3d = derive { name="vegan3d"; version="0.65-1"; sha256="03rzv7l2jjrahj3492ysalyizkv24by35nrhd1bnlb1s88sav7sr"; depends=[rgl scatterplot3d vegan]; };
+vegclust = derive { name="vegclust"; version="1.6.3"; sha256="0l6j4sgzfqvcypx2dszpnsd1sivk33pixlgf9abqifp45skpkwfg"; depends=[sp vegan]; };
 vegdata = derive { name="vegdata"; version="0.6.9"; sha256="1a8b8wwsxq8090cj8pxw1digllmc2rnby8immjfmbi5rzjbksgi3"; depends=[foreign XML]; };
 vegetarian = derive { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
 venneuler = derive { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; };
-verification = derive { name="verification"; version="1.41"; sha256="1c8l0kqk02xijr4yhgpmhlqsflm3wizybkwpzmlnfanh8vzn49g2"; depends=[fields boot CircStats MASS dtw]; };
-vetools = derive { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[sp stringr tis lubridate maptools plyr xts scales]; };
-vines = derive { name="vines"; version="1.1.3"; sha256="1m862kgcwfz2af00p3vqg959dfldw88bdmb7p4zr3jnqzb6l7rnk"; depends=[copula ADGofTest cubature TSP]; };
+verification = derive { name="verification"; version="1.41"; sha256="1c8l0kqk02xijr4yhgpmhlqsflm3wizybkwpzmlnfanh8vzn49g2"; depends=[boot CircStats dtw fields MASS]; };
+vetools = derive { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; };
+vines = derive { name="vines"; version="1.1.3"; sha256="1m862kgcwfz2af00p3vqg959dfldw88bdmb7p4zr3jnqzb6l7rnk"; depends=[ADGofTest copula cubature TSP]; };
 violinmplot = derive { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; };
 vioplot = derive { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; };
 viopoints = derive { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
-virtualspecies = derive { name="virtualspecies"; version="1.1"; sha256="0znrb6xqyzddd1r999rhx6ix6wgpj1laf5bcns7zgmq6zb39j74s"; depends=[raster ade4 dismo rworldmap]; };
+virtualspecies = derive { name="virtualspecies"; version="1.1"; sha256="0znrb6xqyzddd1r999rhx6ix6wgpj1laf5bcns7zgmq6zb39j74s"; depends=[ade4 dismo raster rworldmap]; };
 visreg = derive { name="visreg"; version="2.2-0"; sha256="1hnyrfgyk5fign5l35aql2q7q4mmw3jby5pkv696h8k1mc8qq096"; depends=[lattice]; };
-visualFields = derive { name="visualFields"; version="0.4.2"; sha256="14plg94g4znl8n6798na2rivjjamjgayqkk1qwn1nx5df040l4q5"; depends=[gridBase flip matrixStats Hmisc]; };
+visualFields = derive { name="visualFields"; version="0.4.2"; sha256="14plg94g4znl8n6798na2rivjjamjgayqkk1qwn1nx5df040l4q5"; depends=[flip gridBase Hmisc matrixStats]; };
 visualize = derive { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; };
 vitality = derive { name="vitality"; version="1.1"; sha256="048i6ralh3gbh3hqkdxj3sdkxp1nrjbp3jpwrva4sa8d69vwxla5"; depends=[IMIS]; };
-vmsbase = derive { name="vmsbase"; version="2.0"; sha256="04j6zibwcn1ywckbdqw5p6da5qpgpll7a96x5a1kyimiwk408j1r"; depends=[sqldf ggmap mapdata maps marmap intervals plotrix sp foreign cluster cairoDevice ggplot2 DBI RSQLite fields gsubfn AMORE ecodist gWidgets gWidgetsRGtk2 chron maptools outliers PBSmapping R6 VennDiagram gmt]; };
+vmsbase = derive { name="vmsbase"; version="2.0"; sha256="04j6zibwcn1ywckbdqw5p6da5qpgpll7a96x5a1kyimiwk408j1r"; 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]; };
 vowels = derive { name="vowels"; version="1.2-1"; sha256="0177xysb5y8jzpxn9wdygq2f74gys67g29cd12zw77vlq3c3kkbr"; depends=[]; };
-vows = derive { name="vows"; version="0.4"; sha256="0cc0znrnzhfgp47dsyncjh7b072mbwk568n2pshxwdfxzh3kj65q"; depends=[fda gamm4 rpanel mgcv RLRsim oro_nifti shape stringr]; };
+vows = derive { name="vows"; version="0.4"; sha256="0cc0znrnzhfgp47dsyncjh7b072mbwk568n2pshxwdfxzh3kj65q"; depends=[fda gamm4 mgcv oro_nifti RLRsim rpanel shape stringr]; };
 vrmlgen = derive { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; };
 vrtest = derive { name="vrtest"; version="0.97"; sha256="00hdgb0r18nwv3qay97b09kqqw9xqsbya06rrjyddqh9r6ggx1y0"; depends=[]; };
-vscc = derive { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[teigen mclust]; };
+vscc = derive { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[mclust teigen]; };
 vudc = derive { name="vudc"; version="1.0"; sha256="1xjbjfya4zn94arc76pcfflc2dcn40qj1fkzwnzqz70czc2msppw"; depends=[]; };
-vwr = derive { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[stringdist lattice latticeExtra]; };
+vwr = derive { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[lattice latticeExtra stringdist]; };
 wSVM = derive { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; };
-waffect = derive { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an658wkqkhqq2xaqzqpnh4sh4wbak35a"; depends=[Rcpp Rcpp]; };
-waffle = derive { name="waffle"; version="0.3.1"; sha256="0z6snwf29n1p1i4zc3hx95yq388jgw8v3mcmjhsa2w95zsz9dxr0"; depends=[ggplot2 RColorBrewer gridExtra gtable]; };
+waffect = derive { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an658wkqkhqq2xaqzqpnh4sh4wbak35a"; depends=[Rcpp]; };
+waffle = derive { name="waffle"; version="0.3.1"; sha256="0z6snwf29n1p1i4zc3hx95yq388jgw8v3mcmjhsa2w95zsz9dxr0"; depends=[ggplot2 gridExtra gtable RColorBrewer]; };
 wahc = derive { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; };
 walkscoreAPI = derive { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
-wasim = derive { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[MASS qualV tiger fast]; };
+wasim = derive { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[fast MASS qualV tiger]; };
 waterData = derive { name="waterData"; version="1.0.4"; sha256="0wk49f079jfbjncyirdvq50wswf9g361iivshjfhyndv83gbqrzk"; depends=[lattice latticeExtra XML]; };
 waterfall = derive { name="waterfall"; version="0.9.9.20121030"; sha256="140s5639ayd9qgn4i1s1qk541vi34ndzdcqpaps7q53g42n8akfw"; depends=[lattice]; };
 waveband = derive { name="waveband"; version="4.6"; sha256="1y2qi2zb8l2ap6f8ihnpq2yavic464bl5mp5yv1dscbk0nmfn966"; depends=[wavethresh]; };
@@ -6680,60 +6706,60 @@ waveslim = derive { name="waveslim"; version="1.7.5"; sha256="0lqslkihgrd7rbihqh
 wavethresh = derive { name="wavethresh"; version="4.6.6"; sha256="1ykhfw1bdibvq2b3rrgqszvwqmzkd3fgxqg7p36ms1cxph68g2r9"; depends=[MASS]; };
 wbs = derive { name="wbs"; version="1.3"; sha256="1fdf3dj23n63nfnzafq88sxqvi15cbrzsvc8wrljw1raq5z012yv"; depends=[]; };
 weatherData = derive { name="weatherData"; version="0.4.1"; sha256="19ynb9w52ay15awaf4bqm9lj2w6pk70lyaipn46jrspwxqsvfhlc"; depends=[plyr]; };
-webchem = derive { name="webchem"; version="0.0.1"; sha256="0hfsjaffxz78mxxh2wx5api2blnpg5y16lyc0jf1zmq7zkhccx3l"; depends=[XML RCurl RJSONIO]; };
+webchem = derive { name="webchem"; version="0.0.1"; sha256="0hfsjaffxz78mxxh2wx5api2blnpg5y16lyc0jf1zmq7zkhccx3l"; depends=[RCurl RJSONIO XML]; };
 webutils = derive { name="webutils"; version="0.3"; sha256="1wzpwigc5mmdnz453qr4s1viaslgdrcg238n25qcg4xjakmnxrss"; depends=[jsonlite]; };
 webvis = derive { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m0daqr7fqiw3xy1lg0i0qn9cpvi348f"; depends=[]; };
-weightedKmeans = derive { name="weightedKmeans"; version="1.2.0"; sha256="140cvl1jwwqyvcsf7pbsxh9k4bynd7c1q159pp7ia1f1sgimxafb"; depends=[lattice latticeExtra clv]; };
+weightedKmeans = derive { name="weightedKmeans"; version="1.2.0"; sha256="140cvl1jwwqyvcsf7pbsxh9k4bynd7c1q159pp7ia1f1sgimxafb"; depends=[clv lattice latticeExtra]; };
 weightedScores = derive { name="weightedScores"; version="0.9.1"; sha256="0wd2ymxy8yh3l4xd3xgifbihi89h53wy6n84x7x26px12c70q8fa"; depends=[mvtnorm rootSolve]; };
-weights = derive { name="weights"; version="0.80"; sha256="147fgs99sg1agq081ikj2fhb4b2vzsppdg1h1w036bb92vsjb0g5"; depends=[Hmisc gdata]; };
+weights = derive { name="weights"; version="0.80"; sha256="147fgs99sg1agq081ikj2fhb4b2vzsppdg1h1w036bb92vsjb0g5"; depends=[gdata Hmisc]; };
 weirs = derive { name="weirs"; version="0.24"; sha256="15iffimdr01m92wq6srb49vf900c3cbipj99sk7rxbqbdzbb0y6g"; depends=[]; };
 wesanderson = derive { name="wesanderson"; version="0.3.2"; sha256="17acf9ydi2sw7q887ni9ly12mdmip66ix6gdkh68rncj8sx3csrd"; depends=[]; };
-wfe = derive { name="wfe"; version="1.3"; sha256="16b39i60x10kw6yz44ff19h638s9lsgnz8azc76zl9b8s64jliya"; depends=[arm Matrix MASS]; };
-wgaim = derive { name="wgaim"; version="1.4-8"; sha256="1x1dgxw1viswdqd1k1gfbpipzhgy13lhncji0wlsgpcgfa40ap1a"; depends=[qtl lattice]; };
-wgsea = derive { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[]; };
+wfe = derive { name="wfe"; version="1.3"; sha256="16b39i60x10kw6yz44ff19h638s9lsgnz8azc76zl9b8s64jliya"; depends=[arm MASS Matrix]; };
+wgaim = derive { name="wgaim"; version="1.4-8"; sha256="1x1dgxw1viswdqd1k1gfbpipzhgy13lhncji0wlsgpcgfa40ap1a"; depends=[lattice qtl]; };
+wgsea = derive { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[snpStats]; };
 whisker = derive { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; };
 whoami = derive { name="whoami"; version="1.1.0"; sha256="15mj1s0dfr9y14b23nx0506r0vz48bm1f6mf0fi7b390q0zmndq7"; depends=[httr jsonlite]; };
 widals = derive { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; };
 widenet = derive { name="widenet"; version="0.1-2"; sha256="1nimm8szbg82vg00f5c7b3f3sk0gplssbl4ggasjnh7dl621vfny"; depends=[glmnet relaxnet]; };
 wikibooks = derive { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; };
-wikipediatrend = derive { name="wikipediatrend"; version="1.1.4"; sha256="1ccqwnlp0zchjqwxpy1li4wlgjlmdq3vdz6nrcgg7npplq4f6pjl"; depends=[jsonlite stringr rvest httr RCurl]; };
-wildlifeDI = derive { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[sp rgeos adehabitatLT]; };
-windex = derive { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[geiger ape scatterplot3d]; };
+wikipediatrend = derive { name="wikipediatrend"; version="1.1.4"; sha256="1ccqwnlp0zchjqwxpy1li4wlgjlmdq3vdz6nrcgg7npplq4f6pjl"; depends=[httr jsonlite RCurl rvest stringr]; };
+wildlifeDI = derive { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[adehabitatLT rgeos sp]; };
+windex = derive { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; };
 witness = derive { name="witness"; version="1.2"; sha256="1pccn7czm1q0w31zpmky5arkcbnfl94gh1nnkf8kmcccdrr3lxph"; depends=[]; };
 wkb = derive { name="wkb"; version="0.1-0"; sha256="0ynamg8zrk80j5ysyg7pymdcxzlscbhhygp8czmsd33p2y31pggd"; depends=[sp]; };
 wle = derive { name="wle"; version="0.9-9"; sha256="032zqfqg6ghg56zgr005g8q94zskmbzv1p08lxv227ikkbmnwn53"; depends=[circular]; };
 wmlf = derive { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; };
-wmtsa = derive { name="wmtsa"; version="2.0-0"; sha256="0y2bv166xwwpb1wf6897qybyf84f34qjsmygdbv90r637c050yk5"; depends=[splus2R ifultools MASS]; };
+wmtsa = derive { name="wmtsa"; version="2.0-0"; sha256="0y2bv166xwwpb1wf6897qybyf84f34qjsmygdbv90r637c050yk5"; depends=[ifultools MASS splus2R]; };
 wnominate = derive { name="wnominate"; version="0.99"; sha256="19pis0p4kkwyddn8f93p4ff7l1hvcdr7m3hrv4bzmm9nd8iy8mk1"; depends=[pscl]; };
 wombsoft = derive { name="wombsoft"; version="2.0"; sha256="11ri29vj1yg2lpr6vf1i45w20hqh8dswj04ylbq0vy27cwmxqljd"; depends=[]; };
-wordcloud = derive { name="wordcloud"; version="2.5"; sha256="1ajqdkm8h1wid3d41zd8v7xzf2swid998w31zrghd45a5lcp7qcm"; depends=[RColorBrewer slam Rcpp Rcpp]; };
+wordcloud = derive { name="wordcloud"; version="2.5"; sha256="1ajqdkm8h1wid3d41zd8v7xzf2swid998w31zrghd45a5lcp7qcm"; depends=[RColorBrewer Rcpp slam]; };
 wordmatch = derive { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; };
 wordnet = derive { name="wordnet"; version="0.1-10"; sha256="1k0ncxqsvv5vd5xm6nxs66hvqic9zbxf63sshszgpva2cqlyj4q8"; depends=[rJava]; };
 wpp2008 = derive { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jpc24f76i0pxsjs5pb1v3k2si6df7q4msd"; depends=[]; };
 wpp2010 = derive { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; };
 wpp2012 = derive { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; };
-wppExplorer = derive { name="wppExplorer"; version="1.6-2"; sha256="1y9mdghq4is81gabx47pm1kfay67zv3b9hxz58lhml68wwwsfmsj"; depends=[shiny plyr reshape2 googleVis wpp2012 Hmisc ggplot2]; };
-wq = derive { name="wq"; version="0.4.3"; sha256="1lgxf5pfw3563dpyq0dgj4ps2mc5nqh56y1i77ypscj5lrcgjxrf"; depends=[zoo ggplot2 reshape2]; };
+wppExplorer = derive { name="wppExplorer"; version="1.6-2"; sha256="1y9mdghq4is81gabx47pm1kfay67zv3b9hxz58lhml68wwwsfmsj"; depends=[ggplot2 googleVis Hmisc plyr reshape2 shiny wpp2012]; };
+wq = derive { name="wq"; version="0.4.3"; sha256="1lgxf5pfw3563dpyq0dgj4ps2mc5nqh56y1i77ypscj5lrcgjxrf"; depends=[ggplot2 reshape2 zoo]; };
 wrassp = derive { name="wrassp"; version="0.1.3"; sha256="1xza4w5dgc6gda9ybmq386jnb1gkahdi6sds5dqay7pm5mjql6fl"; depends=[]; };
 write_snns = derive { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
-wrspathrow = derive { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[wrspathrowData sp raster rgeos rgdal]; };
+wrspathrow = derive { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[raster rgdal rgeos sp wrspathrowData]; };
 wrspathrowData = derive { name="wrspathrowData"; version="1.0"; sha256="0a1aggcll0fmkwfg4h7rs4j5h3v1bh95dkbriwrb0bx0cikg63x3"; depends=[]; };
-wskm = derive { name="wskm"; version="1.4.19"; sha256="16smir0b4pxkaxgr2vclq8kprpwn0y3fb43ba79q94d6m5hm844y"; depends=[lattice latticeExtra clv]; };
-wsrf = derive { name="wsrf"; version="1.5.14"; sha256="0j0zlnazz40sv02fl8m5z7rv877m6ak2cms2q3ivy344k8ynjs0m"; depends=[Rcpp Rcpp]; };
+wskm = derive { name="wskm"; version="1.4.19"; sha256="16smir0b4pxkaxgr2vclq8kprpwn0y3fb43ba79q94d6m5hm844y"; depends=[clv lattice latticeExtra]; };
+wsrf = derive { name="wsrf"; version="1.5.14"; sha256="0j0zlnazz40sv02fl8m5z7rv877m6ak2cms2q3ivy344k8ynjs0m"; depends=[Rcpp]; };
 wtcrsk = derive { name="wtcrsk"; version="1.3"; sha256="1viddyms2d9q2hb9z788fcs8vp7gp6vzlsszcnyxgganfjsd85zy"; depends=[]; };
-wux = derive { name="wux"; version="2.0-0"; sha256="04casnfx5cam5a1iqm2x6lldicv11zqxgxjb61qcivga781g5sxg"; depends=[sp ncdf reshape abind fields rgdal rgeos class stringr Hmisc gdata corpcor rworldmap]; };
-x_ent = derive { name="x.ent"; version="1.1.2"; sha256="1wq1gf656jpd6aw08b0g9319gb087zqgn7bzw4amq4k8vk9vjkjm"; depends=[opencpu rJava stringr xtable jsonlite venneuler ggplot2 statmod]; };
+wux = derive { name="wux"; version="2.0-2"; sha256="0y0pn1hr94wgr6v8xac4hf3g137rx1zr1vdplgpjz1k5v41xvagk"; depends=[abind class corpcor fields gdata Hmisc ncdf reshape rgdal rgeos rworldmap sp stringr]; };
+x_ent = derive { name="x.ent"; version="1.1.2"; sha256="0wbbhsnlm5yln72h648nz3y5w83kq9qvpw0pk56lsc1bafps712p"; depends=[ggplot2 jsonlite opencpu rJava statmod stringr venneuler xtable]; };
 x12 = derive { name="x12"; version="1.6.0"; sha256="0bl50nva4ai8p24f9hr622m0fc5nmbjakn3rsvl79g050gjsd4i3"; depends=[stringr]; };
-x12GUI = derive { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[x12 Hmisc RGtk2 cairoDevice lattice stringr]; };
-xergm = derive { name="xergm"; version="1.4.1"; sha256="1lcqa2vxdg4ljk2p0m8cqw68bqxycxql57nr3n4ggic2ys0sbrxa"; depends=[statnet statnet_common network sna ergm texreg Matrix boot coda ROCR igraph vegan lme4 Rcpp speedglm Rcpp]; };
+x12GUI = derive { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; };
+xergm = derive { name="xergm"; version="1.5"; sha256="1gjdcvpi84s0cy52a27n872ygb50mqw0w5117s3h7v1j68w88wv8"; depends=[boot coda ergm igraph lme4 Matrix network Rcpp ROCR sna speedglm statnet statnet_common texreg vegan]; };
 xgobi = derive { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; };
 xhmmScripts = derive { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; };
-xkcd = derive { name="xkcd"; version="0.0.4"; sha256="1hwr3ylgflzizgp8ffwdv9cgcngpjwmpxvgrvg8ad89a40l1mxcr"; depends=[ggplot2 extrafont Hmisc]; };
+xkcd = derive { name="xkcd"; version="0.0.4"; sha256="1hwr3ylgflzizgp8ffwdv9cgcngpjwmpxvgrvg8ad89a40l1mxcr"; depends=[extrafont ggplot2 Hmisc]; };
 xlsx = derive { name="xlsx"; version="0.5.7"; sha256="0qxkdpf1dvi0x7fy65abjx2j60rdx7fv5yi8l2wdm0f2631pnwin"; depends=[rJava xlsxjars]; };
 xlsxjars = derive { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; };
-xml2 = derive { name="xml2"; version="0.1.1"; sha256="1k6xzgx87vqzg1lkc1jaxxlw7zyhzqsis51q5p9jn0q3pw02qf53"; depends=[Rcpp Rcpp BH]; };
+xml2 = derive { name="xml2"; version="0.1.1"; sha256="1k6xzgx87vqzg1lkc1jaxxlw7zyhzqsis51q5p9jn0q3pw02qf53"; depends=[BH Rcpp]; };
 xoi = derive { name="xoi"; version="0.61-1"; sha256="0ypy0rb0f0bns41vjzyln04k3hypgr3wysqbdi0b0r14ip5rb47k"; depends=[qtl]; };
-xpose4 = derive { name="xpose4"; version="4.5.3"; sha256="02m3ad4287ljsi4qrzwd84lfj1y6rz9nias2zk4cbqm14gf19pdf"; depends=[lattice gam Hmisc survival]; };
+xpose4 = derive { name="xpose4"; version="4.5.3"; sha256="02m3ad4287ljsi4qrzwd84lfj1y6rz9nias2zk4cbqm14gf19pdf"; depends=[gam Hmisc lattice survival]; };
 xtable = derive { name="xtable"; version="1.7-4"; sha256="1fvx4p058ygsyj9f4xb9k5h0fdi4zibadqrsn4qbx4am30qrlqj7"; depends=[]; };
 xtal = derive { name="xtal"; version="1.0"; sha256="1717pl64nbliwbdg5fs6cwj7zvgrm00zlyj2dhi06yyg16gq1w8k"; depends=[]; };
 xtermStyle = derive { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; };
@@ -6742,22 +6768,22 @@ yaImpute = derive { name="yaImpute"; version="1.0-24"; sha256="0vqzcxkrnsj99kpc4
 yacca = derive { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11mshrdb8w4r2pqq360dracpn0ak6x"; depends=[]; };
 yaml = derive { name="yaml"; version="2.1.13"; sha256="18kz5mfn7qpif5pn91w4vbrc5bkycsj85vwm5wxwzjlb02i9mxi6"; depends=[]; };
 ycinterextra = derive { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; };
-yhat = derive { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[yacca miscTools plotrix boot]; };
-yhatr = derive { name="yhatr"; version="0.13.4"; sha256="1z1i48nhyadn1l00sw50qif2zyjvy1jbvq91chnapfdbjjsgfv2x"; depends=[httr RCurl rjson plyr jsonlite stringr]; };
-ykmeans = derive { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[plyr foreach]; };
-yuima = derive { name="yuima"; version="1.0.71"; sha256="0aqb87jlvlq6iw2mlngiylvayd6y2wrc82zl1za442gqq8py00if"; depends=[zoo expm cubature mvtnorm]; };
+yhat = derive { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[boot miscTools plotrix yacca]; };
+yhatr = derive { name="yhatr"; version="0.13.4"; sha256="1z1i48nhyadn1l00sw50qif2zyjvy1jbvq91chnapfdbjjsgfv2x"; depends=[httr jsonlite plyr RCurl rjson stringr]; };
+ykmeans = derive { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; };
+yuima = derive { name="yuima"; version="1.0.71"; sha256="0aqb87jlvlq6iw2mlngiylvayd6y2wrc82zl1za442gqq8py00if"; depends=[cubature expm mvtnorm zoo]; };
 zCompositions = derive { name="zCompositions"; version="1.0.3"; sha256="0lxy201ys9dvv8c09q8wbks1c2jkjyd1bbrxhjr7zi9j7m0parl7"; depends=[MASS NADA truncnorm]; };
 zendeskR = derive { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
 zetadiv = derive { name="zetadiv"; version="0.1"; sha256="1p9mxy70mgqxjn7szh44217nvhjh90237kp5znli1r01ch64mx6b"; depends=[car mgcv vegan]; };
-zic = derive { name="zic"; version="0.8.1"; sha256="05mn894qdx6k7158dbsjy2b49n0gz5xnmlixr2dhkxc12ydj6zs5"; depends=[Rcpp RcppArmadillo coda Rcpp RcppArmadillo]; };
+zic = derive { name="zic"; version="0.8.1"; sha256="05mn894qdx6k7158dbsjy2b49n0gz5xnmlixr2dhkxc12ydj6zs5"; depends=[coda Rcpp RcppArmadillo]; };
 zipcode = derive { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; };
 zipfR = derive { name="zipfR"; version="0.6-6"; sha256="1y3nqfjg5m89mdvcmqwjmwlc8p3hpcqnwv4ji1a7ggg4n63lwl3j"; depends=[]; };
 zoeppritz = derive { name="zoeppritz"; version="1.0-5"; sha256="0a501411gjs02vvhxdy8z3a5449arkamdidf2q6qswkkiv68qq04"; depends=[]; };
-zoib = derive { name="zoib"; version="1.3.0"; sha256="15i2gczc6sh0vyi51k105qd3bymwkpbpv2xm99jwflpa170yd8jp"; depends=[rjags coda matrixcalc Formula]; };
+zoib = derive { name="zoib"; version="1.3.0"; sha256="15i2gczc6sh0vyi51k105qd3bymwkpbpv2xm99jwflpa170yd8jp"; depends=[coda Formula matrixcalc rjags]; };
 zoo = derive { name="zoo"; version="1.7-12"; sha256="1n64pdmk2vrmiprwkncaaf936c97nlc1l78bvmzp991rijr9vqg5"; depends=[lattice]; };
 zooaRch = derive { name="zooaRch"; version="1.0"; sha256="1krzwrk2cknlsmd3hn8c2lly10pd8k8jj2x12mbjhr2wws0i5fj4"; depends=[ggplot2]; };
-zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[svMisc svDialogs mlearning filehash jpeg png]; };
+zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[filehash jpeg mlearning png svDialogs svMisc]; };
 zoom = derive { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; };
 ztable = derive { name="ztable"; version="0.1.5"; sha256="1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r"; depends=[]; };
-zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; }; 
+zyp = derive { 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 fb197545571..34dbf4cba52 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -205,8 +205,8 @@ let
   # `self` is `_self` with overridden packages;
   # packages in `_self` may depends on overridden packages.
   self = (defaultOverrides _self self) // overrides;
-  _self = import ./cran-packages.nix { inherit self; derive = deriveCran; }
-       // import ./bioc-packages.nix { inherit self; derive = deriveBioc; };
+  _self = import ./bioc-packages.nix { inherit self; derive = deriveBioc; } //
+          import ./cran-packages.nix { inherit self; derive = deriveCran; };
 
   # tweaks for the individual packages and "in self" follow
 
@@ -223,12 +223,16 @@ let
     BayesVarSel = [ pkgs.gsl ];
     BayesXsrc = [ pkgs.readline pkgs.ncurses ];
     bigGP = [ pkgs.openmpi ];
+    BiocCheck = [ pkgs.which ];
+    Biostrings = [ pkgs.zlib ];
     bnpmr = [ pkgs.gsl ];
     BNSP = [ pkgs.gsl ];
     cairoDevice = [ pkgs.gtk2 ];
     Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo ];
+    Cardinal = [ pkgs.which ];
     CARramps = [ pkgs.linuxPackages.nvidia_x11 pkgs.liblapack ];
     chebpol = [ pkgs.fftw ];
+    ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ];
     cit = [ pkgs.gsl ];
     curl = [ pkgs.curl ];
     devEMF = [ pkgs.xlibs.libXft ];
@@ -239,11 +243,13 @@ let
     Formula = [ pkgs.gmp ];
     geoCount = [ pkgs.gsl ];
     git2r = [ pkgs.zlib pkgs.openssl ];
+    GLAD = [ pkgs.gsl ];
     glpkAPI = [ pkgs.gmp pkgs.glpk ];
     gmp = [ pkgs.gmp ];
     graphscan = [ pkgs.gsl ];
     gsl = [ pkgs.gsl ];
     HiCseg = [ pkgs.gsl ];
+    iBMQ = [ pkgs.gsl ];
     igraph = [ pkgs.gmp ];
     JavaGD = [ pkgs.jdk ];
     jpeg = [ pkgs.libjpeg ];
@@ -271,8 +277,8 @@ let
     R2GUESS = [ pkgs.gsl ];
     R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype ];
     RAppArmor = [ pkgs.libapparmor ];
-    rapport = [ pkgs.which ];
     rapportools = [ pkgs.which ];
+    rapport = [ pkgs.which ];
     rbamtools = [ pkgs.zlib ];
     RCA = [ pkgs.gmp ];
     rcdd = [ pkgs.gmp ];
@@ -287,6 +293,7 @@ let
     Rglpk = [ pkgs.glpk ];
     RGtk2 = [ pkgs.gtk2 ];
     Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ];
+    Rhtslib = [ pkgs.zlib ];
     ridge = [ pkgs.gsl ];
     RJaCGH = [ pkgs.zlib ];
     rjags = [ pkgs.jags ];
@@ -391,251 +398,242 @@ let
   };
 
   packagesRequireingX = [
+    "accrual"
+    "ade4TkGUI"
+    "adehabitat"
+    "analogue"
+    "analogueExtra"
     "AnalyzeFMRI"
     "AnnotLists"
     "AnthropMMD"
+    "aplpack"
+    "aqfig"
+    "arf3DS4"
+    "asbio"
     "AtelieR"
     "BAT"
+    "bayesDem"
     "BCA"
     "BEQI2"
+    "betapart"
+    "betaper"
     "BHMSMAfMRI"
-    "BioGeoBEARS"
     "BiodiversityR"
+    "BioGeoBEARS"
+    "bio_infer"
+    "bipartite"
+    "biplotbootGUI"
+    "blender"
+    "cairoDevice"
     "CCTpack"
+    "cncaGUI"
+    "cocorresp"
     "CommunityCorrelogram"
+    "confidence"
+    "constrainedKriging"
     "ConvergenceConcepts"
+    "cpa"
     "DALY"
-    "DSpat"
+    "dave"
+    "debug"
     "Deducer"
     "DeducerExtras"
     "DeducerPlugInExample"
     "DeducerPlugInScaling"
     "DeducerSpatial"
     "DeducerSurvival"
-    "HomoPolymer"
-    "MetSizeR"
     "DeducerText"
     "Demerelate"
     "DescTools"
-    "DivMelt"
-    "ENiRG"
-    "EcoVirtual"
-    "EnQuireR"
-    "FAiR"
-    "FD"
-    "FFD"
-    "FeedbackTS"
-    "FreeSortR"
-    "GGEBiplotGUI"
-    "GPCSIV"
-    "GUniFrac"
-    "Geneland"
-    "GeoGenetix"
-    "GeoXp"
-    "GrammR"
-    "GrapheR"
-    "GroupSeq"
-    "HH"
-    "HiveR"
-    "IsotopeR"
-    "JGR"
-    "KappaGUI"
-    "LS2Wstat"
-    "MAR1"
-    "MTurkR"
-    "MareyMap"
-    "MergeGUI"
-    "Meth27QC"
-    "MicroStrategyR"
-    "MissingDataGUI"
-    "MplusAutomation"
-    "OligoSpecificitySystem"
-    "OpenRepGrid"
-    "PBSadmb"
-    "PBSmodelling"
-    "PCPS"
-    "PKgraph"
-    "PopGenReport"
-    "PredictABEL"
-    "PrevMap"
-    "ProbForecastGOP"
-    "QCAGUI"
-    "R2STATS"
-    "RHRV"
-    "RNCEP"
-    "RQDA"
-    "RSDA"
-    "RSurvey"
-    "RandomFields"
-    "Rcmdr"
-    "RcmdrPlugin_BCA"
-    "RcmdrPlugin_DoE"
-    "RcmdrPlugin_EACSPIR"
-    "RcmdrPlugin_EBM"
-    "RcmdrPlugin_EZR"
-    "RcmdrPlugin_EcoVirtual"
-    "RcmdrPlugin_FactoMineR"
-    "RcmdrPlugin_HH"
-    "RcmdrPlugin_IPSUR"
-    "RcmdrPlugin_KMggplot2"
-    "RcmdrPlugin_MA"
-    "RcmdrPlugin_MPAStats"
-    "RcmdrPlugin_ROC"
-    "RcmdrPlugin_SCDA"
-    "RcmdrPlugin_SLC"
-    "RcmdrPlugin_SM"
-    "RcmdrPlugin_StatisticalURV"
-    "RcmdrPlugin_TeachingDemos"
-    "RcmdrPlugin_UCA"
-    "RcmdrPlugin_coin"
-    "RcmdrPlugin_depthTools"
-    "RcmdrPlugin_doex"
-    "RcmdrPlugin_epack"
-    "RcmdrPlugin_lfstat"
-    "RcmdrPlugin_mosaic"
-    "RcmdrPlugin_orloca"
-    "RcmdrPlugin_plotByGroup"
-    "RcmdrPlugin_pointG"
-    "RcmdrPlugin_qual"
-    "RcmdrPlugin_sampling"
-    "RcmdrPlugin_sos"
-    "RcmdrPlugin_steepness"
-    "RcmdrPlugin_survival"
-    "RcmdrPlugin_temis"
-    "RenextGUI"
-    "RunuranGUI"
-    "SOLOMON"
-    "SPACECAP"
-    "SRRS"
-    "SSDforR"
-    "STEPCAM"
-    "SYNCSA"
-    "Simile"
-    "SimpleTable"
-    "StatDA"
-    "SyNet"
-    "TDMR"
-    "TED"
-    "TIMP"
-    "TTAinterfaceTrendAnalysis"
-    "TestScorer"
-    "VIMGUI"
-    "VecStatGraphs3D"
-    "WMCapacity"
-    "accrual"
-    "ade4TkGUI"
-    "adehabitat"
-    "analogue"
-    "analogueExtra"
-    "aplpack"
-    "aqfig"
-    "arf3DS4"
-    "asbio"
-    "bayesDem"
-    "betapart"
-    "betaper"
-    "bio_infer"
-    "bipartite"
-    "biplotbootGUI"
-    "blender"
-    "cairoDevice"
-    "cncaGUI"
-    "cocorresp"
-    "confidence"
-    "constrainedKriging"
-    "cpa"
-    "dave"
-    "debug"
     "detrendeR"
     "dgmb"
+    "DivMelt"
     "dpa"
-    "dynBiplotGUI"
+    "DSpat"
     "dynamicGraph"
+    "dynBiplotGUI"
+    "EasyqpcR"
+    "EcoVirtual"
+    "ENiRG"
+    "EnQuireR"
     "eVenn"
     "exactLoglinTest"
-    "fSRM"
+    "FAiR"
     "fat2Lpoly"
     "fbati"
+    "FD"
     "feature"
+    "FeedbackTS"
+    "FFD"
     "fgui"
     "fisheyeR"
     "fit4NM"
     "forams"
     "forensim"
+    "FreeSortR"
     "fscaret"
+    "fSRM"
+    "gcmr"
+    "Geneland"
+    "GeoGenetix"
+    "geomorph"
+    "geoR"
+    "geoRglm"
+    "georob"
+    "GeoXp"
+    "GGEBiplotGUI"
+    "gnm"
+    "GPCSIV"
+    "GrammR"
+    "GrapheR"
+    "GroupSeq"
+    "gsubfn"
+    "GUniFrac"
     "gWidgets2RGtk2"
     "gWidgets2tcltk"
     "gWidgetsRGtk2"
     "gWidgetstcltk"
-    "gcmr"
-    "geoR"
-    "geoRglm"
-    "geomorph"
-    "georob"
-    "gnm"
-    "gsubfn"
+    "HH"
+    "HiveR"
+    "HomoPolymer"
     "iBUGS"
-    "iDynoR"
     "ic50"
+    "iDynoR"
     "in2extRemes"
     "iplots"
     "isopam"
+    "IsotopeR"
+    "JGR"
+    "KappaGUI"
     "likeLTD"
     "loe"
     "logmult"
+    "LS2Wstat"
+    "MAR1"
+    "MareyMap"
     "memgene"
+    "MergeGUI"
     "metacom"
+    "Meth27QC"
+    "MetSizeR"
+    "MicroStrategyR"
     "migui"
     "miniGUI"
+    "MissingDataGUI"
     "mixsep"
     "mlDNA"
+    "MplusAutomation"
     "mpmcorrelogram"
     "mritc"
+    "MTurkR"
     "multgee"
     "multibiplotGUI"
     "nodiv"
+    "OligoSpecificitySystem"
     "onemap"
+    "OpenRepGrid"
     "palaeoSig"
     "paleoMAS"
     "pbatR"
+    "PBSadmb"
+    "PBSmodelling"
+    "PCPS"
     "pez"
     "phylotools"
     "picante"
+    "PKgraph"
     "playwith"
     "plotSEMM"
     "plsRbeta"
     "plsRglm"
     "pmg"
+    "PopGenReport"
     "poppr"
     "powerpkg"
+    "PredictABEL"
     "prefmod"
+    "PrevMap"
+    "ProbForecastGOP"
+    "QCAGUI"
     "qtbase"
     "qtpaint"
     "qtutils"
+    "R2STATS"
     "r4ss"
-    "rAverage"
+    "RandomFields"
     "rareNMtests"
+    "rAverage"
+    "Rcmdr"
+    "RcmdrPlugin_BCA"
+    "RcmdrPlugin_coin"
+    "RcmdrPlugin_depthTools"
+    "RcmdrPlugin_DoE"
+    "RcmdrPlugin_doex"
+    "RcmdrPlugin_EACSPIR"
+    "RcmdrPlugin_EBM"
+    "RcmdrPlugin_EcoVirtual"
+    "RcmdrPlugin_epack"
+    "RcmdrPlugin_EZR"
+    "RcmdrPlugin_FactoMineR"
+    "RcmdrPlugin_HH"
+    "RcmdrPlugin_IPSUR"
+    "RcmdrPlugin_KMggplot2"
+    "RcmdrPlugin_lfstat"
+    "RcmdrPlugin_MA"
+    "RcmdrPlugin_mosaic"
+    "RcmdrPlugin_MPAStats"
+    "RcmdrPlugin_orloca"
+    "RcmdrPlugin_plotByGroup"
+    "RcmdrPlugin_pointG"
+    "RcmdrPlugin_qual"
+    "RcmdrPlugin_ROC"
+    "RcmdrPlugin_sampling"
+    "RcmdrPlugin_SCDA"
+    "RcmdrPlugin_SLC"
+    "RcmdrPlugin_SM"
+    "RcmdrPlugin_sos"
+    "RcmdrPlugin_StatisticalURV"
+    "RcmdrPlugin_steepness"
+    "RcmdrPlugin_survival"
+    "RcmdrPlugin_TeachingDemos"
+    "RcmdrPlugin_temis"
+    "RcmdrPlugin_UCA"
     "recluster"
     "relax"
     "relimp"
+    "RenextGUI"
     "reportRx"
     "reshapeGUI"
     "rgl"
+    "RHRV"
     "rich"
     "ringscale"
     "rioja"
     "ripa"
     "rite"
     "rnbn"
+    "RNCEP"
+    "RQDA"
+    "RSDA"
     "rsgcc"
+    "RSurvey"
+    "RunuranGUI"
     "sdcMicroGUI"
     "sharpshootR"
     "simba"
+    "Simile"
+    "SimpleTable"
+    "SOLOMON"
     "soundecology"
+    "SPACECAP"
     "spacodiR"
     "spatsurv"
     "sqldf"
+    "SRRS"
+    "SSDforR"
     "statcheck"
+    "StatDA"
+    "STEPCAM"
     "stosim"
     "strvalidator"
     "stylo"
@@ -643,17 +641,27 @@ let
     "svIDE"
     "svSocket"
     "svWidgets"
+    "SYNCSA"
+    "SyNet"
     "tcltk2"
+    "TDMR"
+    "TED"
+    "TestScorer"
+    "TIMP"
     "titan"
     "tkrgl"
     "tkrplot"
     "tmap"
     "tspmeta"
+    "TTAinterfaceTrendAnalysis"
     "twiddler"
     "vcdExtra"
+    "VecStatGraphs3D"
     "vegan"
     "vegan3d"
     "vegclust"
+    "VIMGUI"
+    "WMCapacity"
     "x12GUI"
     "xergm"
   ];
@@ -667,572 +675,832 @@ let
 
   # Packages which cannot be installed due to lack of dependencies or other reasons.
   brokenPackages = [
-    "abd" # requires nlopt
-    "ACNE" # requires aroma_affymetrix
-    "Actigraphy" # SDMTools.so: undefined symbol: X
-    "adabag" # requires nlopt
-    "adaptsmoFMRI" # requires spatstat
-    "ads" # requires spatstat
-    "AER" # REQUIRES NLOPT
-    "afex" # requires nlopt
-    "agRee" # requires nlopt
-    "agridat" # requires pcaMethods
-    "aLFQ" # requires protiq
-    "alr3" # requires nlopt
-    "alr4" # requires nlopt
-    "anacor" # requires nlopt
-    "AntWeb" # requires leafletR
-    "aods3" # requires nlopt
-    "aoristic" # requires spatstat
-    "apmsWAPP" # requires genefilter, Biobase, multtest, edgeR, DESeq, and aroma.light
-    "apt" # requires nlopt
-    "ArfimaMLM" # Requires Nlopt
-    "arm" # requires nlopt
-    "aroma_affymetrix" # requires aroma_core
-    "aroma_cn" # requires PSCBS
-    "aroma_core" # requires PSCBS
-    "ArrayBin" # requires SAGx
-    "ARTool" # Requires Nlopt
-    "babel" # requires edgeR
-    "BACA" # requires RDAVIDWebService
-    "backShift" # requires pcalg to build
-    "bartMachine" # requires nlopt
-    "bayesDem" # requires nlopt
-    "bayesLife" # requires nlopt
-    "bayesPop" # requires nlopt
-    "Bayesthresh" # Requires Nlopt
-    "BBRecapture" # Requires Nlopt
-    "BCA" # REQUIRES NLOPT
-    "BcDiag" # requires fabia
-    "bdvis" # requres taxize
-    "beadarrayFilter" # requires beadarray
-    "beadarrayMSV" # requires Biobase, geneplotter, andlimma
-    "bgmm" # requires nlopt
-    "BIFIEsurvey" # requires DiagrammeR to build
-    "bigGP" # requires MPI running. HELP WANTED!
-    "bigpca" # requires NCmisc
-    "BiodiversityR" # Requires Nlopt
-    "Biograph" # requires mvna
-    "biotools" # requires rpanel
-    "BiSEp" # requires GOSemSim, GO.db, and org.Hs.eg.db
-    "BLCOP" # depends on broken fPortfolio
-    "blmeco" # requires nlopt
-    "blme" # requires nlopt
-    "bmd" # requires nlopt
-    "bmem" # requires DiagrammeR to build
-    "bmrm" # requires clpAPI
-    "bootnet" # requires IsingFit
-    "boss" # requires nlopt
-    "BradleyTerry2" # Requires Nlopt
-    "branchLars" # requires Rgraphviz
-    "BRugs" # requires OpenBUGS
-    "CADFtest" # Requires Nlopt
-    "cAIC4" # requires nlopt
-    "calmate" # requires aroma_core
-    "candisc" # requires nlopt
-    "carcass" # requires nlopt
-    "caretEnsemble" # requires nlopt
-    "caret" # requires nlopt
-    "CARrampsOcl" # depends on OpenCL
-    "car" # requires nlopt
-    "CCpop" # Requires Nlopt
-    "ChainLadder" # Requires Nlopt
-    "CHAT" # requires DNAcopy
-    "ChemoSpec" # depends on broken speaq
-    "classGraph" # requires graph, and Rgraphviz
-    "climwin" # requires nlopt
-    "CLME" # REQUIRES NLOPT
-    "clpAPI" # requires clp
-    "clusterPower" # requires nlopt
-    "compendiumdb" # requires Biobase
-    "conformal" # requires nlopt
-    "corHMM" # requires nlopt
-    "CORM" # requires limma
-    "CosmoPhotoz" # Requires Nlopt
-    "cp4p" # build is broken
-    "cplexAPI" # requires CPLEX
-    "Crossover" # fails self-test
-    "cudaBayesreg" # requres Rmath
-    "daff" # requires V8 to build
-    "dagbag" # requires Rlapack
-    "DAMisc" # Requires Nlopt
-    "DBKGrad" # requires SDD
-    "dbmss" # requires spatstat
-    "DCGL" # requires limma
-    "dcGOR" # requires dnet
-    "DeducerExtras" # Requires Nlopt
-    "DeducerPlugInExample" # Requires Nlopt
-    "DeducerPlugInScaling" # Requires Nlopt
-    "Deducer" # Requires Nlopt
-    "DeducerSpatial" # Requires Nlopt
-    "DeducerSurvival" # Requires Nlopt
-    "DeducerText" # Requires Nlopt
-    "demi" # requires affy, affxparser, and oligo
-    "DepthProc" # requires samr
-    "DiagrammeR" # requires V8 to build
-    "DiagTest3Grp" # Requires Nlopt
-    "DiffCorr" # misses undeclared dependencies 'pcaMethods', 'multtest'
-    "difR" # requires nlopt
-    "Digiroo2" # requires spatstat
-    "discSurv" # requires nlopt
-    "DistatisR" # Requires Nlopt
-    "diveRsity" # requires DiagrammeR to build
-    "dixon" # requires spatstat
-    "dnet" # requires supraHex, graph, Rgraphviz, and Biobase
-    "doMPI" # requires MPI running. HELP WANTED!
-    "dpa" # requires DiagrammeR to build
-    "dpcR" # requires spatstat
-    "drc" # requires nlopt
-    "drfit" # requires nlopt
-    "drsmooth" # requires nlopt
-    "DSpat" # requires spatstat
-    "dynlm" # requires nlopt
-    "easyanova" # requires nlopt
-    "ecespa" # requires spatstat
-    "ecoengine" # requires leafletR
-    "ecospat" # requires spatstat
-    "edgeRun" # requires edgeR
-    "eeptools" # requires nlopt
-    "EffectLiteR" # Requires Nlopt
-    "effects" # requires nlopt
-    "EMA" # requires siggenes, affy, multtest, gcrma, biomaRt, and AnnotationDbi
-    "empiricalFDR_DESeq2" # requires DESeq2, and GenomicRanges
-    "EnQuireR" # Requires Nlopt
-    "episplineDensity" # requires nlopt
-    "epoc" # requires graph, and Rgraphviz
-    "epr" # requires nlopt
-    "erer" # requires nlopt
-    "erpR" # requires rpanel
-    "ETAS" # requires spatstat
-    "eulerian" # requires graph
-    "evobiR" # requres taxiz
-    "evora" # requires qvalue
-    "ExomeDepth" # requires GenomicRanges, and Rsamtools
-    "extRemes" # requires nlopt
-    "ez" # requires nlopt
-    "FactoMineR" # Requires Nlopt
-    "Factoshiny" # Requires Nlopt
-    "FAMT" # requires impute
-    "faoutlier" # requires DiagrammeR to build
-    "fastR" # requires nlopt
-    "fdrDiscreteNull" # requires edgeR
-    "FDRreg" # Requires Nlopt
-    "FHtest" # requires interval
-    "flexCWM" # depends on broken mixture
-    "fPortfolio" # requires rneos
-    "freqweights" # requires nlopt
-    "fscaret" # requires nlopt
-    "FunctionalNetworks" # requires breastCancerVDX
-    "FunctionalNetworks" # requires breastCancerVDX, and Biobase
-    "fxregime" # requires nlopt
-    "gamclass" # requires nlopt
-    "gamlss_demo" # requires rpanel
-    "gamm4" # requires nlopt
-    "gcmr" # requires nlopt
-    "GDAtools" # Requires Nlopt
-    "GeneticTools" # requires snpStats
-    "genridge" # requires nlopt
-    "geojsonio" # requires V8 to build
-    "GExMap" # requires Biobase and multtest
-    "gimme" # requires DiagrammeR to build
-    "gitter" # requires EBImage
-    "glmgraph" # test suite says: "undefined symbol: dgemv_"
-    "gmatrix" # depends on proprietary cudatoolkit
-    "gmatrix" # requires CUDA runtime
-    "gMCP" # fails self-test
-    "GOGANPA" # requires WGCNA
-    "gplm" # requires nlopt
-    "gputools" # depends on proprietary cudatoolkit
-    "gRain" # requires gRbase
-    "granova" # requires nlopt
-    "gRapHD" # requires graph
-    "graphicalVAR" # requires DiagrammeR to build
-    "GraphPCA" # Requires Nlopt
-    "gRbase" # requires RBGL, and graph
-    "gRc" # requires gRbase
-    "gridDebug" # requires gridGraphviz
-    "gridGraphviz" # requires graph, and Rgraphviz
-    "GriegSmith" # requires spatstat
-    "gRim" # requires gRbase
-    "GSAgm" # requires edgeR
-    "GUIDE" # requires rpanel
-    "GWAF" # REQUIRES NLOPT
-    "h2o" # tries to download some h2o.jar during its build
-    "h5" # depends on missing h5 system library
-    "hasseDiagram" # requires Rgraphviz
-    "hbsae" # requires nlopt
-    "hddplot" # requires multtest
-    "heplots" # requires nlopt
-    "HH" # REQUIRES NLOPT
-    "HierO" # requires rneos
-    "HiPLARM" # requires MAGMA or PLASMA
-    "HistDAWass" # Requires Nlopt
-    "HLMdiag" # Requires Nlopt
-    "hpoPlot" # requires Rgraphviz
-    "hsdar" # fails to build
-    "HTSCluster" # requires edgeR
-    "hysteresis" # requires nlopt
-    "IATscores" # requires DiagrammeR to build
-    "ibd" # requires nlopt
-    "iccbeta" # requires nlopt
-    "iFes" # depends on proprietary cudatoolkit
-    "imputeLCMD" # requires pcaMethods, and impute
-    "imputeR" # requires nlopt
-    "in2extRemes" # requires nlopt
-    "incReg" # requires nlopt
-    "inferference" # requires nlopt
-    "influence_ME" # requires nlopt
-    "intamapInteractive" # requires spatstat
-    "interval" # requires Icens
-    "ionflows" # requires Biostrings
-    "iRefR" # requires graph, and RBGL
-    "IsingFit" # requires DiagrammeR to build
-    "IsoGene" # requires Biobase, and affy
-    "isva" # requires qvalue
-    "ivpack" # requires nlopt
-    "JAGUAR" # REQUIRES NLOPT
-    "jomo" # linking errors
-    "js" # requires broken V8
-    "KANT" # requires affy, and Biobase
-    "ktspair" # requires Biobase
-    "latticeDensity" # requires spatstat
-    "lawn" # requires DiagrammeR to build
-    "lawn" # requires V8 to build
-    "leapp" # requires sva
-    "learnstats" # requires nlopt
-    "lefse" # SDMTools.so: undefined symbol: X
-    "lessR" # requires nlopt
-    "lfe" # fails to compile
-    "lgcp" # requires rpanel
-    "LinRegInteractive" # requires Rpanel
-    "lme4" # requires nlopt
-    "LMERConvenienceFunctions" # Requires Nlopt
-    "lmerTest" # requires nlopt
-    "lmSupport" # requires nlopt
-    "LogisticDx" # requires gRbase
-    "longpower" # requires nlopt
-    "LOST" # requires pcaMethods
-    "ltsk" # requires Rlapack and Rblas
-    "magma" # requires MAGMA
-    "MAMA" # requires metaMA
-    "marked" # requires nlopt
-    "MaxPro" # Requires Nlopt
-    "mbest" # requires nlopt
-    "meboot" # requires nlopt
-    "MEET" # requires pcaMethods, and seqLogo
-    "MEMSS" # REQUIRES NLOPT
-    "metabolomics" # depends on broken crmn
-    "MetaDE" # requires impute, and Biobase
-    "metagear" # build is broken
-    "MetaLandSim" # requires Biobase
-    "metaMA" # requires limma
-    "metaMix" # requires MPI running. HELP WANTED!
-    "metaplus" # requires nlopt
-    "metaSEM" # requires OpenMx
-    "Metatron" # Requires Nlopt
-    "mGSZ" # requires Biobase, and limma
-    "miceadds" # requires DiagrammeR to build
-    "micEconAids" # requires nlopt
-    "micEconCES" # requires nlopt
-    "micEconSNQP" # requires nlopt
-    "MigClim" # SDMTools.So: Undefined Symbol: X
-    "migui" # requires nlopt
-    "minimist" # requires broken V8
-    "mi" # requires nlopt
-    "miRtest" # requires globaltest, GlobalAncova, and limma
-    "missMDA" # requires nlopt
-    "mixAK" # requires nlopt
-    "MixGHD" # requires mixture to build
-    "mixlm" # requires nlopt
-    "MixMAP" # Requires Nlopt
-    "mixture" # mixture.so: undefined symbol: dtrmm_
-    "mlmRev" # requires nlopt
-    "mlVAR" # requires DiagrammeR to build
-    "MM2S" # BUILD IS BROKEN
-    "moduleColor" # requires impute
-    "mongolite" # doesn't find OpenSSL
-    "mosaic" # requires nlopt
-    "msarc" # requires AnnotationDbi
-    "MSeasy" # requires mzR, and xcms
-    "MSeasyTkGUI" # requires MSeasyTkGUI
-    "MSIseq" # requires IRanges
-    "msSurv" # requires graph
-    "muir" # requires DiagrammeR to build
-    "multiDimBio" # requires pcaMethods
-    "MultiRR" # Requires Nlopt
-    "muma" # requires nlopt
-    "mutossGUI" # requires mutoss
-    "mutoss" # requires multtest
-    "mvinfluence" # requires nlopt
-    "MXM" # depends on broken gRbase
-    "NBPSeq" # requires qvalue
-    "nCal" # requires nlopt
-    "NCmisc" # requires BiocInstaller
-    "netClass" # requires samr
-    "nettools" # requires WGCNA
-    "netweavers" # requires BiocGenerics, Biobase, and limma
-    "NHPoisson" # Requires Nlopt
-    "nloptr" # requires nlopt
-    "NLPutils" # requires qdap
-    "nonrandom" # requires nlopt
-    "NORRRM" # can't load SDMTools properly
-    "npIntFactRep" # requires nlopt
-    "NSA" # requires aroma_core
-    "OpenCL" # FIXME: requires CL/opencl.h
-    "OpenMx" # Build Is Broken
-    "optBiomarker" # requires rpanel
-    "ora" # requires ROracle
-    "ordBTL" # requires nlopt
-    "orQA" # requires genefilter
-    "OUwie" # Requires Nlopt
-    "PairViz" # requires graph
-    "pamm" # requires nlopt
-    "PANDA" # requires GO.db
-    "panelAR" # requires nlopt
-    "papeR" # requires nlopt
-    "parboost" # requires nlopt
-    "ParDNAcopy" # requires DNAcopy
-    "parma" # requires nlopt
-    "pathClass" # requires affy, and Biobase
-    "PatternClass" # SDMTools.So: Undefined Symbol: X
-    "pbdBASE" # requires pbdMPI
-    "pbdDEMO" # requires pbdMPI
-    "pbdDMAT" # requires pbdMPI
-    "pbdSLAP" # requires pbdMPI
-    "PBImisc" # Requires Nlopt
-    "pbkrtest" # requires nlopt
-    "PBSddesolve" # fails its test suite for unclear reasons
-    "PBSmapping" # fails its test suite for unclear reasons
-    "pcaL1" # requires clp
-    "pcalg" # requires graph, and RBGL
-    "PCGSE" # requires safe
-    "PCS" # requires multtest
-    "pedigreemm" # requires nlopt
-    "pedometrics" # requires nlopt
-    "PepPrep" # requires biomaRt
-    "pequod" # requires nlopt
-    "PerfMeas" # requires limma, graph, and RBGL
-    "permGPU" # requires Biobase
-    "phia" # requires nlopt
-    "PhViD" # requires LBE
-    "phylocurve" # requires nlopt
-    "phyloTop" # requires nlopt
-    "pi0" # requires qvalue
-    "plmDE" # requires limma
-    "plsRbeta" # requires nlopt
-    "plsRcox" # requires survcomp
-    "plsRglm" # requires nlopt
-    "PMA" # requires impute
-    "pmcgd" # depends on broken mixture
-    "pmclust" # requires MPI running. HELP WANTED!
-    "polyCub" # requires spatstat
-    "polytomous" # requires nlopt
-    "pomp" # requires nlopt
-    "ppiPre" # requires AnnotationDbi, GOSemSim, GO.db
-    "ppiPre" # requires GO.db
-    "predictmeans" # requires nlopt
-    "pRF" # requires multtest
-    "prLogistic" # requires nlopt
-    "propOverlap" # requires Biobase
-    "protiq" # requires graph, and RBGL
-    "PSAboot" # Requires Nlopt
-    "PSCBS" # requires DNAcopy
-    "pubmed_mineR" # requires SSOAP
-    "PubMedWordcloud" # requires GOsummaries
-    "qdap" # requires gender
-    "qgraph" # requires DiagrammeR to build
+    "a4Base" # depends on broken package annaffy-1.41.1
+    "a4" # depends on broken package annaffy-1.41.1
+    "a4Reporting" # depends on broken package annaffy-1.41.1
+    "abd" # depends on broken package nlopt-2.4.2
+    "adabag" # depends on broken package nlopt-2.4.2
+    "ADaCGH2" # depends on broken package tilingArray-1.47.0
+    "adSplit" # build is broken
+    "AER" # depends on broken package nlopt-2.4.2
+    "afex" # depends on broken package nlopt-2.4.2
+    "affyContam" # depends on broken package affyio-1.37.0
+    "affycoretools" # depends on broken package affyio-1.37.0
+    "affy" # depends on broken package affyio-1.37.0
+    "AffyExpress" # depends on broken package affyio-1.37.0
+    "affyILM" # depends on broken package affyio-1.37.0
+    "affyio" # build is broken
+    "affylmGUI" # depends on broken package affyio-1.37.0
+    "affyPara" # depends on broken package affyio-1.37.0
+    "affypdnn" # depends on broken package affyio-1.37.0
+    "affyPLM" # depends on broken package affyio-1.37.0
+    "affyQCReport" # depends on broken package affyio-1.37.0
+    "AffyRNADegradation" # depends on broken package affyio-1.37.0
+    "AffyTiling" # depends on broken package affyio-1.37.0
+    "AgiMicroRna" # depends on broken package affyio-1.37.0
+    "agRee" # depends on broken package nlopt-2.4.2
+    "aLFQ" # depends on broken package nlopt-2.4.2
+    "alr3" # depends on broken package nlopt-2.4.2
+    "alr4" # depends on broken package nlopt-2.4.2
+    "altcdfenvs" # depends on broken package affyio-1.37.0
+    "anacor" # depends on broken package nlopt-2.4.2
+    "annaffy" # build is broken
+    "AnnotationForge" # Build Is Broken
+    "AnnotationHub" # depends on broken package interactiveDisplayBase-1.7.0
+    "aods3" # depends on broken package nlopt-2.4.2
+    "apComplex" # build is broken
+    "apt" # depends on broken package nlopt-2.4.2
+    "ArfimaMLM" # depends on broken package nlopt-2.4.2
+    "arm" # depends on broken package nlopt-2.4.2
+    "ArrayExpress" # depends on broken package affyio-1.37.0
+    "arrayMvout" # depends on broken package affyio-1.37.0
+    "arrayQualityMetrics" # depends on broken package affyio-1.37.0
+    "ArrayTools" # depends on broken package affyio-1.37.0
+    "ArrayTV" # depends on broken package affyio-1.37.0
+    "ARRmNormalization" # Build Is Broken
+    "ARTool" # depends on broken package nlopt-2.4.2
+    "attract" # depends on broken package AnnotationForge-1.11.3
+    "BACA" # depends on broken package Category-2.35.1
+    "BAGS" # build is broken
+    "bartMachine" # depends on broken package nlopt-2.4.2
+    "bayesDem" # depends on broken package nlopt-2.4.2
+    "bayesLife" # depends on broken package nlopt-2.4.2
+    "bayesPop" # depends on broken package nlopt-2.4.2
+    "Bayesthresh" # depends on broken package nlopt-2.4.2
+    "BBRecapture" # depends on broken package nlopt-2.4.2
+    "BCA" # depends on broken package nlopt-2.4.2
+    "bgmm" # depends on broken package nlopt-2.4.2
+    "bgx" # depends on broken package affyio-1.37.0
+    "BIFIEsurvey" # depends on broken package nlopt-2.4.2
+    "BiGGR" # depends on broken package rsbml-2.27.0
+    "BiodiversityR" # depends on broken package nlopt-2.4.2
+    "birte" # build is broken
+    "BiSEp" # depends on broken package GOSemSim-1.27.3
+    "blmeco" # depends on broken package nlopt-2.4.2
+    "blme" # depends on broken package nlopt-2.4.2
+    "bmd" # depends on broken package nlopt-2.4.2
+    "bmem" # depends on broken package nlopt-2.4.2
+    "bootnet" # depends on broken package nlopt-2.4.2
+    "boss" # depends on broken package nlopt-2.4.2
+    "BradleyTerry2" # depends on broken package nlopt-2.4.2
+    "BRugs" # build is broken
+    "CADFtest" # depends on broken package nlopt-2.4.2
+    "CAFE" # depends on broken package affyio-1.37.0
+    "cAIC4" # depends on broken package nlopt-2.4.2
+    "canceR" # depends on broken package Category-2.35.1
+    "candisc" # depends on broken package nlopt-2.4.2
+    "carcass" # depends on broken package nlopt-2.4.2
+    "car" # depends on broken package nlopt-2.4.2
+    "caret" # depends on broken package nlopt-2.4.2
+    "caretEnsemble" # depends on broken package nlopt-2.4.2
+    "Category" # Build Is Broken
+    "categoryCompare" # depends on broken package Category-2.35.1
+    "CCpop" # depends on broken package nlopt-2.4.2
+    "cellHTS2" # depends on broken package Category-2.35.1
+    "ChainLadder" # depends on broken package nlopt-2.4.2
+    "ChAMP" # depends on broken package affyio-1.37.0
+    "charm" # depends on broken package affyio-1.37.0
+    "ChemmineR" # Build Is Broken
+    "chipenrich" # build is broken
+    "ChIPQC" # depends on broken package AnnotationForge-1.11.3
+    "ChIPXpress" # depends on broken package affyio-1.37.0
+    "climwin" # depends on broken package nlopt-2.4.2
+    "CLME" # depends on broken package nlopt-2.4.2
+    "clpAPI" # build is broken
+    "clusterPower" # depends on broken package nlopt-2.4.2
+    "Actigraphy" # Build Is Broken
+    "Crossover" # Build Is Broken
+    "FunctionalNetworks" # Build Is Broken
+    "HiPLARM" # Build Is Broken
+    "HierO" # Build Is Broken
+    "KEGGprofile" # Build Is Broken
+    "MigClim" # Build Is Broken
+    "ROracle" # Build Is Broken
+    "Rcplex" # Build Is Broken
+    "RcppAPT" # Build Is Broken
+    "RnaSeqSampleSize" # Build Is Broken
+    "Rsamtools" # Build Is Broken
+    "SeqGrapheR" # Build Is Broken
+    "bamsignals" # build is broken
+    "bigGP" # build is broken
+    "cudaBayesreg" # build is broken
+    "dagbag" # build is broken
+    "gMCP" # build is broken
+    "h5" # build is broken
+    "lefse" # build is broken
+    "metaMix" # build is broken
+    "mirIntegrator" # build is broken
+    "pathview" # build is broken
+    "pcaL1" # build is broken
+    "permGPU" # build is broken
+    "pmclust" # build is broken
     "qtbase" # build is broken
-    "qtlnet" # requires pcalg
-    "qtpaint" # can't find QtCore libraries
-    "qtutils" # requires qtbase
-    "QuACN" # requires graph, RBGL
-    "quanteda" # fails to build
-    "quantification" # requires nlopt
-    "QuasiSeq" # requires edgeR
-    "R2STATS" # REQUIRES NLOPT
-    "RADami" # requires Biostrings
-    "radiant" # requires nlopt
-    "raincpc" # SDMTools.so: undefined symbol: X
-    "rainfreq" # SDMTools.so: undefined symbol: X
-    "RAM" # requires Heatplus
-    "RapidPolygonLookup" # depends on broken PBSmapping
-    "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges
-    "rasclass" # requires nlopt
-    "RbioRXN" # requires fmcsR, and KEGGREST
-    "RcmdrMisc" # Requires Nlopt
-    "RcmdrPlugin_BCA" # Requires Nlopt
-    "RcmdrPlugin_coin" # requires nlopt
-    "RcmdrPlugin_depthTools" # requires nlopt
-    "RcmdrPlugin_DoE" # Requires Nlopt
-    "RcmdrPlugin_doex" # requires nlopt
-    "RcmdrPlugin_EACSPIR" # Requires Nlopt
-    "RcmdrPlugin_EBM" # Requires Nlopt
-    "RcmdrPlugin_EcoVirtual" # Requires Nlopt
-    "RcmdrPlugin_epack" # requires nlopt
-    "RcmdrPlugin_EZR" # Requires Nlopt
-    "RcmdrPlugin_FactoMineR" # Requires Nlopt
-    "RcmdrPlugin_HH" # Requires Nlopt
-    "RcmdrPlugin_IPSUR" # Requires Nlopt
-    "RcmdrPlugin_KMggplot2" # Requires Nlopt
-    "RcmdrPlugin_lfstat" # requires nlopt
-    "RcmdrPlugin_MA" # Requires Nlopt
-    "RcmdrPlugin_mosaic" # requires nlopt
-    "RcmdrPlugin_MPAStats" # Requires Nlopt
-    "RcmdrPlugin_NMBU" # Requires Nlopt
-    "RcmdrPlugin_orloca" # requires nlopt
-    "RcmdrPlugin_plotByGroup" # requires nlopt
-    "RcmdrPlugin_pointG" # requires nlopt
-    "RcmdrPlugin_qual" # requires nlopt
-    "RcmdrPlugin_RMTCJags" # Requires Nlopt
-    "RcmdrPlugin_ROC" # Requires Nlopt
-    "RcmdrPlugin_sampling" # requires nlopt
-    "RcmdrPlugin_SCDA" # Requires Nlopt
-    "RcmdrPlugin_seeg" # requires seeg
-    "RcmdrPlugin_SLC" # Requires Nlopt
-    "RcmdrPlugin_SM" # Requires Nlopt
-    "RcmdrPlugin_sos" # requires nlopt
-    "RcmdrPlugin_StatisticalURV" # Requires Nlopt
-    "RcmdrPlugin_steepness" # requires nlopt
-    "RcmdrPlugin_survival" # requires nlopt
-    "RcmdrPlugin_TeachingDemos" # Requires Nlopt
-    "RcmdrPlugin_temis" # requires nlopt
-    "RcmdrPlugin_UCA" # Requires Nlopt
-    "Rcmdr" # Requires Nlopt
-    "Rcplex" # requires cplexAPI
-    "RcppAPT" # configure script depends on /bin/sh
-    "RcppOctave" # Build Is Broken
-    "RcppRedis" # requires Hiredis
-    "rdd" # requires nlopt
-    "rDEA" # no such file or directory
-    "RDieHarder" # requires libdieharder
-    "reader" # requires NCmisc
-    "REBayes" # requires Rmosek
-    "referenceIntervals" # requires nlopt
-    "RefFreeEWAS" # requires isva
-    "refund" # requires nlopt
-    "REST" # REQUIRES NLOPT
-    "retistruct" # depends on broken RImageJROI
-    "rgbif" # requires V8 to build
-    "rgp" # fails self-test
-    "rgpui" # depends on broken rgp
-    "rjade" # requires V8 to build
-    "rJPSGCS" # requires chopsticks
-    "rLindo" # requires LINDO API
-    "rmgarch" # requires nlopt
-    "rminer" # requires nlopt
-    "Rmosek" # requires mosek
-    "RnavGraph" # requires graph, and RBGL
-    "rneos" # requires XMLRPC
-    "RNeXML" # requres taxize
-    "RobLoxBioC" # requires Biobase
-    "RobLox" # requires Biobase
-    "robustlmm" # requires nlopt
-    "rockchalk" # requires nlopt
-    "RockFab" # requires EBImage
-    "ROI_plugin_symphony" # depends on broken Rsymphony
-    "ROracle" # requires OCI
-    "rpanel" # I could not make Tcl to recognize BWidget. HELP WANTED!
-    "rpubchem" # requires nlopt
-    "RQuantLib" # requires QuantLib
-    "rr" # requires nlopt
-    "RSAP" # requires SAPNWRFCSDK
+    "rDEA" # build is broken
+    "rJPSGCS" # build is broken
+    "rLindo" # build is broken
+    "seqCNA" # build is broken
+    "sybilSBML" # build is broken
+    "AllelicImbalance" # depends on broken package Rsamtools-1.21.8
+    "ArrayExpressHTS" # depends on broken package Rsamtools-1.21.8
+    "BEAT" # depends on broken package Rsamtools-1.21.8
+    "BLCOP" # depends on broken package Rsymphony-0.1-20
+    "BSgenome" # depends on broken package Rsamtools-1.21.8
+    "Basic4Cseq" # depends on broken package Rsamtools-1.21.8
+    "BiSeq" # depends on broken package Rsamtools-1.21.8
+    "BitSeq" # depends on broken package Rsamtools-1.21.8
+    "CAGEr" # depends on broken package Rsamtools-1.21.8
+    "CAMERA" # depends on broken package mzR-2.3.1
+    "CARrampsOcl" # depends on broken package OpenCL-0.1-3
+    "CNEr" # depends on broken package Rsamtools-1.21.8
+    "CNVrd2" # depends on broken package Rsamtools-1.21.8
+    "CODEX" # depends on broken package Rsamtools-1.21.8
+    "CRISPRseek" # depends on broken package Rsamtools-1.21.8
+    "CexoR" # depends on broken package Rsamtools-1.21.8
+    "ChIPpeakAnno" # depends on broken package Rsamtools-1.21.8
+    "ChIPseeker" # depends on broken package Rsamtools-1.21.8
+    "ChIPseqR" # depends on broken package Rsamtools-1.21.8
+    "ChIPsim" # depends on broken package Rsamtools-1.21.8
+    "ChromHeatMap" # depends on broken package Rsamtools-1.21.8
+    "CopyNumber450k" # depends on broken package Rsamtools-1.21.8
+    "CopywriteR" # depends on broken package Rsamtools-1.21.8
+    "CoverageView" # depends on broken package Rsamtools-1.21.8
+    "DBKGrad" # depends on broken package rpanel-1.1-3
+    "DEXSeq" # depends on broken package Rsamtools-1.21.8
+    "DMRcate" # depends on broken package Rsamtools-1.21.8
+    "DMRforPairs" # depends on broken package Rsamtools-1.21.8
+    "DOQTL" # depends on broken package Rsamtools-1.21.8
+    "EDASeq" # depends on broken package Rsamtools-1.21.8
+    "ELMER" # depends on broken package Rsamtools-1.21.8
+    "ExomeDepth" # depends on broken package Rsamtools-1.21.8
+    "FourCSeq" # depends on broken package Rsamtools-1.21.8
+    "GOGANPA" # depends on broken package WGCNA-1.47
+    "GOTHiC" # depends on broken package Rsamtools-1.21.8
+    "GUIDE" # depends on broken package rpanel-1.1-3
+    "GenoView" # depends on broken package Rsamtools-1.21.8
+    "GenomicAlignments" # depends on broken package Rsamtools-1.21.8
+    "GenomicFeatures" # depends on broken package Rsamtools-1.21.8
+    "GenomicFiles" # depends on broken package Rsamtools-1.21.8
+    "GenomicInteractions" # depends on broken package Rsamtools-1.21.8
+    "GoogleGenomics" # depends on broken package Rsamtools-1.21.8
+    "GreyListChIP" # depends on broken package Rsamtools-1.21.8
+    "Gviz" # depends on broken package Rsamtools-1.21.8
+    "HTSeqGenie" # depends on broken package Rsamtools-1.21.8
+    "HiTC" # depends on broken package Rsamtools-1.21.8
+    "IdeoViz" # depends on broken package Rsamtools-1.21.8
+    "InPAS" # depends on broken package Rsamtools-1.21.8
+    "LinRegInteractive" # depends on broken package rpanel-1.1-3
+    "LowMACA" # depends on broken package Rsamtools-1.21.8
+    "M3D" # depends on broken package Rsamtools-1.21.8
+    "MEDIPS" # depends on broken package Rsamtools-1.21.8
+    "MSeasy" # depends on broken package mzR-2.3.1
+    "MSeasyTkGUI" # depends on broken package mzR-2.3.1
+    "Metab" # depends on broken package mzR-2.3.1
+    "MethylAid" # depends on broken package Rsamtools-1.21.8
+    "MethylSeekR" # depends on broken package Rsamtools-1.21.8
+    "MotIV" # depends on broken package Rsamtools-1.21.8
+    "MotifDb" # depends on broken package Rsamtools-1.21.8
+    "OTUbase" # depends on broken package Rsamtools-1.21.8
+    "OrganismDbi" # depends on broken package Rsamtools-1.21.8
+    "PGA" # depends on broken package Rsamtools-1.21.8
+    "PICS" # depends on broken package Rsamtools-1.21.8
+    "PING" # depends on broken package Rsamtools-1.21.8
+    "Pviz" # depends on broken package Rsamtools-1.21.8
+    "QDNAseq" # depends on broken package Rsamtools-1.21.8
+    "QuasR" # depends on broken package Rsamtools-1.21.8
+    "R3CPET" # depends on broken package Rsamtools-1.21.8
+    "R453Plus1Toolbox" # depends on broken package Rsamtools-1.21.8
+    "RAPIDR" # depends on broken package Rsamtools-1.21.8
+    "REBayes" # depends on broken package Rmosek-1.2.5.1
+    "REDseq" # depends on broken package Rsamtools-1.21.8
+    "RIPSeeker" # depends on broken package Rsamtools-1.21.8
+    "RMassBank" # depends on broken package mzR-2.3.1
+    "RNAprobR" # depends on broken package Rsamtools-1.21.8
+    "ROI_plugin_symphony" # depends on broken package Rsymphony-0.1-20
+    "RSVSim" # depends on broken package Rsamtools-1.21.8
+    "RUVSeq" # depends on broken package Rsamtools-1.21.8
+    "RVideoPoker" # depends on broken package rpanel-1.1-3
+    "RapidPolygonLookup" # depends on broken package PBSmapping-2.69.76
+    "Rariant" # depends on broken package Rsamtools-1.21.8
+    "Rcade" # depends on broken package Rsamtools-1.21.8
+    "ReQON" # depends on broken package Rsamtools-1.21.8
+    "RnBeads" # depends on broken package Rsamtools-1.21.8
+    "Rolexa" # depends on broken package Rsamtools-1.21.8
+    "Rqc" # depends on broken package Rsamtools-1.21.8
+    "SDD" # depends on broken package rpanel-1.1-3
+    "SGSeq" # depends on broken package Rsamtools-1.21.8
+    "SIMAT" # depends on broken package mzR-2.3.1
+    "SNPtools" # depends on broken package Rsamtools-1.21.8
+    "SVM2CRM" # depends on broken package Rsamtools-1.21.8
+    "SeqArray" # depends on broken package Rsamtools-1.21.8
+    "SeqVarTools" # depends on broken package Rsamtools-1.21.8
+    "ShortRead" # depends on broken package Rsamtools-1.21.8
+    "SimRAD" # depends on broken package Rsamtools-1.21.8
+    "SomaticSignatures" # depends on broken package Rsamtools-1.21.8
+    "SplicingGraphs" # depends on broken package Rsamtools-1.21.8
+    "TEQC" # depends on broken package Rsamtools-1.21.8
+    "TIN" # depends on broken package WGCNA-1.47
+    "TargetSearch" # depends on broken package mzR-2.3.1
+    "TitanCNA" # depends on broken package Rsamtools-1.21.8
+    "ToPASeq" # depends on broken package Rsamtools-1.21.8
+    "TransView" # depends on broken package Rsamtools-1.21.8
+    "VariantAnnotation" # depends on broken package Rsamtools-1.21.8
+    "VariantFiltering" # depends on broken package Rsamtools-1.21.8
+    "VariantTools" # depends on broken package Rsamtools-1.21.8
+    "ampliQueso" # depends on broken package Rsamtools-1.21.8
+    "annmap" # depends on broken package Rsamtools-1.21.8
+    "ballgown" # depends on broken package Rsamtools-1.21.8
+    "biomvRCNS" # depends on broken package Rsamtools-1.21.8
+    "biotools" # depends on broken package rpanel-1.1-3
+    "biovizBase" # depends on broken package Rsamtools-1.21.8
+    "bumphunter" # depends on broken package Rsamtools-1.21.8
+    "casper" # depends on broken package Rsamtools-1.21.8
+    "chimera" # depends on broken package Rsamtools-1.21.8
+    "chipseq" # depends on broken package Rsamtools-1.21.8
+    "cleanUpdTSeq" # depends on broken package Rsamtools-1.21.8
+    "clipper" # depends on broken package Rsamtools-1.21.8
+    "cn_mops" # depends on broken package Rsamtools-1.21.8
+    "coMET" # depends on broken package Rsamtools-1.21.8
+    "cobindR" # depends on broken package Rsamtools-1.21.8
+    "conumee" # depends on broken package Rsamtools-1.21.8
+    "cosmiq" # depends on broken package mzR-2.3.1
+    "cpvSNP" # depends on broken package Rsamtools-1.21.8
+    "csaw" # depends on broken package Rsamtools-1.21.8
+    "cummeRbund" # depends on broken package Rsamtools-1.21.8
+    "customProDB" # depends on broken package Rsamtools-1.21.8
+    "daff" # depends on broken package V8-0.6
+    "dagLogo" # depends on broken package Rsamtools-1.21.8
+    "deepSNV" # depends on broken package Rsamtools-1.21.8
+    "derfinder" # depends on broken package Rsamtools-1.21.8
+    "derfinderPlot" # depends on broken package Rsamtools-1.21.8
+    "easyRNASeq" # depends on broken package Rsamtools-1.21.8
+    "ensemblVEP" # depends on broken package Rsamtools-1.21.8
+    "epigenomix" # depends on broken package Rsamtools-1.21.8
+    "epivizr" # depends on broken package Rsamtools-1.21.8
+    "erpR" # depends on broken package rpanel-1.1-3
+    "exomeCopy" # depends on broken package Rsamtools-1.21.8
+    "exomePeak" # depends on broken package Rsamtools-1.21.8
+    "fPortfolio" # depends on broken package Rsymphony-0.1-20
+    "fastLiquidAssociation" # depends on broken package LiquidAssociation-1.23.0
+    "flagme" # depends on broken package mzR-2.3.1
+    "gamlss_demo" # depends on broken package rpanel-1.1-3
+    "genomation" # depends on broken package Rsamtools-1.21.8
+    "geojsonio" # depends on broken package V8-0.6
+    "ggbio" # depends on broken package Rsamtools-1.21.8
+    "girafe" # depends on broken package Rsamtools-1.21.8
+    "gmapR" # depends on broken package Rsamtools-1.21.8
+    "groHMM" # depends on broken package Rsamtools-1.21.8
+    "hiAnnotator" # depends on broken package Rsamtools-1.21.8
+    "hiReadsProcessor" # depends on broken package Rsamtools-1.21.8
+    "htSeqTools" # depends on broken package Rsamtools-1.21.8
+    "intansv" # depends on broken package Rsamtools-1.21.8
+    "js" # depends on broken package V8-0.6
+    "lawn" # depends on broken package V8-0.6
+    "lgcp" # depends on broken package rpanel-1.1-3
+    "mcaGUI" # depends on broken package Rsamtools-1.21.8
+    "metaMS" # depends on broken package mzR-2.3.1
+    "metaSEM" # depends on broken package OpenMx-2.2.4
+    "metagene" # depends on broken package Rsamtools-1.21.8
+    "methylPipe" # depends on broken package Rsamtools-1.21.8
+    "methylumi" # depends on broken package Rsamtools-1.21.8
+    "minfi" # depends on broken package Rsamtools-1.21.8
+    "minimist" # depends on broken package V8-0.6
+    "missMethyl" # depends on broken package Rsamtools-1.21.8
+    "motifRG" # depends on broken package Rsamtools-1.21.8
+    "motifStack" # depends on broken package Rsamtools-1.21.8
+    "mygene" # depends on broken package Rsamtools-1.21.8
+    "nettools" # depends on broken package WGCNA-1.47
+    "nucleR" # depends on broken package Rsamtools-1.21.8
+    "optBiomarker" # depends on broken package rpanel-1.1-3
+    "ora" # depends on broken package ROracle-1.1-12
+    "pbdBASE" # depends on broken package pbdSLAP-0.2-0
+    "pbdDEMO" # depends on broken package pbdSLAP-0.2-0
+    "pbdDMAT" # depends on broken package pbdSLAP-0.2-0
+    "podkat" # depends on broken package Rsamtools-1.21.8
+    "proBAMr" # depends on broken package Rsamtools-1.21.8
+    "qpgraph" # depends on broken package Rsamtools-1.21.8
+    "qrqc" # depends on broken package Rsamtools-1.21.8
+    "qtpaint" # depends on broken package qtbase-1.0.9
+    "qtutils" # depends on broken package qtbase-1.0.9
+    "quantro" # depends on broken package Rsamtools-1.21.8
+    "r3Cseq" # depends on broken package Rsamtools-1.21.8
+    "rGADEM" # depends on broken package Rsamtools-1.21.8
+    "rSFFreader" # depends on broken package Rsamtools-1.21.8
+    "rTRMui" # depends on broken package Rsamtools-1.21.8
+    "regionReport" # depends on broken package Rsamtools-1.21.8
+    "regioneR" # depends on broken package Rsamtools-1.21.8
+    "repijson" # depends on broken package V8-0.6
+    "rfPred" # depends on broken package Rsamtools-1.21.8
+    "rgbif" # depends on broken package V8-0.6
+    "rgpui" # depends on broken package rgp-0.4-1
+    "rjade" # depends on broken package V8-0.6
+    "rnaSeqMap" # depends on broken package Rsamtools-1.21.8
+    "roar" # depends on broken package Rsamtools-1.21.8
+    "rtracklayer" # depends on broken package Rsamtools-1.21.8
+    "sapFinder" # depends on broken package rTANDEM-1.9.0
+    "segmentSeq" # depends on broken package Rsamtools-1.21.8
+    "seq2pathway" # depends on broken package WGCNA-1.47
+    "seqbias" # depends on broken package Rsamtools-1.21.8
+    "seqplots" # depends on broken package Rsamtools-1.21.8
+    "shinyMethyl" # depends on broken package Rsamtools-1.21.8
+    "shinyTANDEM" # depends on broken package rTANDEM-1.9.0
+    "similaRpeak" # depends on broken package Rsamtools-1.21.8
+    "soGGi" # depends on broken package Rsamtools-1.21.8
+    "soilphysics" # depends on broken package rpanel-1.1-3
+    "spliceR" # depends on broken package Rsamtools-1.21.8
+    "spocc" # depends on broken package V8-0.6
+    "ssviz" # depends on broken package Rsamtools-1.21.8
+    "stagePop" # depends on broken package PBSddesolve-1.11.29
+    "topologyGSA" # depends on broken package Rsamtools-1.21.8
+    "trackViewer" # depends on broken package Rsamtools-1.21.8
+    "tracktables" # depends on broken package Rsamtools-1.21.8
+    "vmsbase" # depends on broken package PBSmapping-2.69.76
+    "wavClusteR" # depends on broken package Rsamtools-1.21.8
+    "xcms" # depends on broken package mzR-2.3.1
+    "clusterProfiler" # depends on broken package GOSemSim-1.27.3
+    "cn_farms" # depends on broken package affyio-1.37.0
+    "CNORfuzzy" # depends on broken package nlopt-2.4.2
+    "CoCiteStats" # Build Is Broken
+    "COHCAP" # build is broken
+    "compEpiTools" # depends on broken package topGO-2.21.0
+    "CompGO" # depends on broken package Category-2.35.1
+    "conformal" # depends on broken package nlopt-2.4.2
+    "ConsensusClusterPlus" # Build Is Broken
+    "corHMM" # depends on broken package nlopt-2.4.2
+    "Cormotif" # depends on broken package affyio-1.37.0
+    "coRNAi" # depends on broken package Category-2.35.1
+    "CosmoPhotoz" # depends on broken package nlopt-2.4.2
+    "cplexAPI" # build is broken
+    "crlmm" # depends on broken package affyio-1.37.0
+    "CrypticIBDcheck" # depends on broken package nlopt-2.4.2
+    "DAMisc" # depends on broken package nlopt-2.4.2
+    "Deducer" # depends on broken package nlopt-2.4.2
+    "DeducerExtras" # depends on broken package nlopt-2.4.2
+    "DeducerPlugInExample" # depends on broken package nlopt-2.4.2
+    "DeducerPlugInScaling" # depends on broken package nlopt-2.4.2
+    "DeducerSpatial" # depends on broken package nlopt-2.4.2
+    "DeducerSurvival" # depends on broken package nlopt-2.4.2
+    "DeducerText" # depends on broken package nlopt-2.4.2
+    "DEGraph" # depends on broken package RCytoscape-1.19.0
+    "demi" # depends on broken package affyio-1.37.0
+    "DiagTest3Grp" # depends on broken package nlopt-2.4.2
+    "DiffBind" # depends on broken package AnnotationForge-1.11.3
+    "diffHic" # depends on broken package rhdf5-2.13.1
+    "difR" # depends on broken package nlopt-2.4.2
+    "DirichletMultinomial" # Build Is Broken
+    "discSurv" # depends on broken package nlopt-2.4.2
+    "DistatisR" # depends on broken package nlopt-2.4.2
+    "diveRsity" # depends on broken package nlopt-2.4.2
+    "domainsignatures" # build is broken
+    "doMPI" # build is broken
+    "DOSE" # depends on broken package GOSemSim-1.27.3
+    "dpa" # depends on broken package nlopt-2.4.2
+    "drc" # depends on broken package nlopt-2.4.2
+    "drfit" # depends on broken package nlopt-2.4.2
+    "drsmooth" # depends on broken package nlopt-2.4.2
+    "DrugVsDisease" # depends on broken package affyio-1.37.0
+    "dualKS" # depends on broken package affyio-1.37.0
+    "dynlm" # depends on broken package nlopt-2.4.2
+    "easyanova" # depends on broken package nlopt-2.4.2
+    "edge" # depends on broken package nlopt-2.4.2
+    "eeptools" # depends on broken package nlopt-2.4.2
+    "EffectLiteR" # depends on broken package nlopt-2.4.2
+    "effects" # depends on broken package nlopt-2.4.2
+    "eiR" # depends on broken package ChemmineR-2.21.7
+    "eisa" # depends on broken package Category-2.35.1
+    "EMA" # depends on broken package nlopt-2.4.2
+    "ENmix" # depends on broken package affyio-1.37.0
+    "EnQuireR" # depends on broken package nlopt-2.4.2
+    "ensembldb" # depends on broken package interactiveDisplayBase-1.7.0
+    "episplineDensity" # depends on broken package nlopt-2.4.2
+    "epr" # depends on broken package nlopt-2.4.2
+    "erer" # depends on broken package nlopt-2.4.2
+    "ExiMiR" # depends on broken package affyio-1.37.0
+    "ExpressionView" # depends on broken package Category-2.35.1
+    "extRemes" # depends on broken package nlopt-2.4.2
+    "ez" # depends on broken package nlopt-2.4.2
+    "facopy" # depends on broken package nlopt-2.4.2
+    "FactoMineR" # depends on broken package nlopt-2.4.2
+    "Factoshiny" # depends on broken package nlopt-2.4.2
+    "faoutlier" # depends on broken package nlopt-2.4.2
+    "farms" # depends on broken package affyio-1.37.0
+    "fastR" # depends on broken package nlopt-2.4.2
+    "FDRreg" # depends on broken package nlopt-2.4.2
+    "FEM" # build is broken
+    "ffpe" # depends on broken package affyio-1.37.0
+    "flowDensity" # depends on broken package nlopt-2.4.2
+    "flowPeaks" # build is broken
+    "flowQ" # build is broken
+    "FlowSOM" # depends on broken package ConsensusClusterPlus-1.23.0
+    "flowStats" # depends on broken package ncdfFlow-2.15.2
+    "flowVS" # depends on broken package ncdfFlow-2.15.2
+    "flowWorkspace" # depends on broken package ncdfFlow-2.15.2
+    "fmcsR" # depends on broken package ChemmineR-2.21.7
+    "freqweights" # depends on broken package nlopt-2.4.2
+    "frma" # depends on broken package affyio-1.37.0
+    "frmaTools" # depends on broken package affyio-1.37.0
+    "fscaret" # depends on broken package nlopt-2.4.2
+    "FunciSNP" # depends on broken package snpStats-1.19.0
+    "fxregime" # depends on broken package nlopt-2.4.2
+    "gamclass" # depends on broken package nlopt-2.4.2
+    "gamm4" # depends on broken package nlopt-2.4.2
+    "gCMAP" # depends on broken package Category-2.35.1
+    "gCMAPWeb" # depends on broken package Category-2.35.1
+    "gcmr" # depends on broken package nlopt-2.4.2
+    "gcrma" # depends on broken package affyio-1.37.0
+    "GDAtools" # depends on broken package nlopt-2.4.2
+    "GENE_E" # depends on broken package rhdf5-2.13.1
+    "GeneExpressionSignature" # depends on broken package annaffy-1.41.1
+    "GeneticTools" # depends on broken package snpStats-1.19.0
+    "genridge" # depends on broken package nlopt-2.4.2
+    "GEOsubmission" # depends on broken package affyio-1.37.0
+    "gespeR" # depends on broken package Category-2.35.1
+    "GEWIST" # depends on broken package nlopt-2.4.2
+    "GGBase" # depends on broken package snpStats-1.19.0
+    "GGtools" # depends on broken package snpStats-1.19.0
+    "gimme" # depends on broken package nlopt-2.4.2
+    "gmatrix" # depends on broken package cudatoolkit-5.5.22
+    "GOFunction" # build is broken
+    "goProfiles" # build is broken
+    "GOSemSim" # Build Is Broken
+    "goseq" # build is broken
+    "GOSim" # depends on broken package topGO-2.21.0
+    "GOstats" # depends on broken package AnnotationForge-1.11.3
+    "goTools" # build is broken
+    "gplm" # depends on broken package nlopt-2.4.2
+    "gputools" # depends on broken package cudatoolkit-5.5.22
+    "gQTLstats" # depends on broken package snpStats-1.19.0
+    "granova" # depends on broken package nlopt-2.4.2
+    "graphicalVAR" # depends on broken package nlopt-2.4.2
+    "GraphPCA" # depends on broken package nlopt-2.4.2
+    "GSCA" # depends on broken package rhdf5-2.13.1
+    "GWAF" # depends on broken package nlopt-2.4.2
+    "gwascat" # depends on broken package interactiveDisplayBase-1.7.0
+    "h2o" # build is broken
+    "h5vc" # depends on broken package rhdf5-2.13.1
+    "Harshlight" # depends on broken package affyio-1.37.0
+    "hbsae" # depends on broken package nlopt-2.4.2
+    "heplots" # depends on broken package nlopt-2.4.2
+    "HilbertVisGUI" # Build Is Broken
+    "HistDAWass" # depends on broken package nlopt-2.4.2
+    "HLMdiag" # depends on broken package nlopt-2.4.2
+    "HTqPCR" # depends on broken package affyio-1.37.0
+    "HTSanalyzeR" # depends on broken package Category-2.35.1
+    "hysteresis" # depends on broken package nlopt-2.4.2
+    "IATscores" # depends on broken package nlopt-2.4.2
+    "ibd" # depends on broken package nlopt-2.4.2
+    "ibh" # build is broken
+    "iccbeta" # depends on broken package nlopt-2.4.2
+    "iFes" # depends on broken package cudatoolkit-5.5.22
+    "imageHTS" # depends on broken package Category-2.35.1
+    "immunoClust" # build is broken
+    "imputeR" # depends on broken package nlopt-2.4.2
+    "in2extRemes" # depends on broken package nlopt-2.4.2
+    "incReg" # depends on broken package nlopt-2.4.2
+    "inferference" # depends on broken package nlopt-2.4.2
+    "influence_ME" # depends on broken package nlopt-2.4.2
+    "inSilicoMerging" # build is broken
+    "interactiveDisplayBase" # build is broken
+    "interactiveDisplay" # depends on broken package Category-2.35.1
+    "IsingFit" # depends on broken package nlopt-2.4.2
+    "IsoGene" # depends on broken package affyio-1.37.0
+    "IsoGeneGUI" # depends on broken package affyio-1.37.0
+    "ITALICS" # depends on broken package oligo-1.33.0
+    "IVAS" # depends on broken package nlopt-2.4.2
+    "ivpack" # depends on broken package nlopt-2.4.2
+    "JAGUAR" # depends on broken package nlopt-2.4.2
+    "joda" # depends on broken package nlopt-2.4.2
+    "jomo" # build is broken
+    "KANT" # depends on broken package affyio-1.37.0
+    "keggorthology" # build is broken
+    "learnstats" # depends on broken package nlopt-2.4.2
+    "lessR" # depends on broken package nlopt-2.4.2
+    "lfe" # build is broken
+    "limmaGUI" # depends on broken package affyio-1.37.0
+    "LiquidAssociation" # build is broken
+    "lmdme" # build is broken
+    "lme4" # depends on broken package nlopt-2.4.2
+    "LMERConvenienceFunctions" # depends on broken package nlopt-2.4.2
+    "lmerTest" # depends on broken package nlopt-2.4.2
+    "LMGene" # depends on broken package affyio-1.37.0
+    "lmSupport" # depends on broken package nlopt-2.4.2
+    "LogisticDx" # depends on broken package nlopt-2.4.2
+    "logitT" # depends on broken package affyio-1.37.0
+    "longpower" # depends on broken package nlopt-2.4.2
+    "lumi" # depends on broken package affyio-1.37.0
+    "LVSmiRNA" # depends on broken package affyio-1.37.0
+    "MAIT" # depends on broken package nlopt-2.4.2
+    "makecdfenv" # depends on broken package affyio-1.37.0
+    "mAPKL" # build is broken
+    "maPredictDSC" # depends on broken package nlopt-2.4.2
+    "marked" # depends on broken package nlopt-2.4.2
+    "maskBAD" # depends on broken package affyio-1.37.0
+    "MatrixRider" # depends on broken package DirichletMultinomial-1.11.1
+    "MaxPro" # depends on broken package nlopt-2.4.2
+    "mbest" # depends on broken package nlopt-2.4.2
+    "mBPCR" # depends on broken package affyio-1.37.0
+    "MCRestimate" # build is broken
+    "mdgsa" # build is broken
+    "meboot" # depends on broken package nlopt-2.4.2
+    "MEDME" # depends on broken package nlopt-2.4.2
+    "MEMSS" # depends on broken package nlopt-2.4.2
+    "meshr" # depends on broken package Category-2.35.1
+    "metagear" # build is broken
+    "metaplus" # depends on broken package nlopt-2.4.2
+    "metaseqR" # depends on broken package affyio-1.37.0
+    "Metatron" # depends on broken package nlopt-2.4.2
+    "methyAnalysis" # depends on broken package affyio-1.37.0
+    "miceadds" # depends on broken package nlopt-2.4.2
+    "micEconAids" # depends on broken package nlopt-2.4.2
+    "micEconCES" # depends on broken package nlopt-2.4.2
+    "micEconSNQP" # depends on broken package nlopt-2.4.2
+    "mi" # depends on broken package nlopt-2.4.2
+    "migui" # depends on broken package nlopt-2.4.2
+    "MineICA" # depends on broken package AnnotationForge-1.11.3
+    "MinimumDistance" # depends on broken package affyio-1.37.0
+    "missMDA" # depends on broken package nlopt-2.4.2
+    "mitoODE" # build is broken
+    "mixAK" # depends on broken package nlopt-2.4.2
+    "mixlm" # depends on broken package nlopt-2.4.2
+    "MixMAP" # depends on broken package nlopt-2.4.2
+    "mlmRev" # depends on broken package nlopt-2.4.2
+    "MLP" # depends on broken package affyio-1.37.0
+    "MLSeq" # depends on broken package nlopt-2.4.2
+    "mlVAR" # depends on broken package nlopt-2.4.2
+    "MMDiff" # depends on broken package AnnotationForge-1.11.3
+    "MmPalateMiRNA" # depends on broken package affyio-1.37.0
+    "mongolite" # build is broken
+    "monocle" # build is broken
+    "mosaic" # depends on broken package nlopt-2.4.2
+    "MSGFgui" # depends on broken package MSGFplus-1.3.0
+    "MSGFplus" # Build Is Broken
+    "msmsEDA" # depends on broken package affyio-1.37.0
+    "msmsTests" # depends on broken package affyio-1.37.0
+    "MSnbase" # depends on broken package affyio-1.37.0
+    "MSnID" # depends on broken package affyio-1.37.0
+    "MSstats" # depends on broken package nlopt-2.4.2
+    "multiDimBio" # depends on broken package nlopt-2.4.2
+    "MultiRR" # depends on broken package nlopt-2.4.2
+    "muma" # depends on broken package nlopt-2.4.2
+    "mutossGUI" # build is broken
+    "mvGST" # depends on broken package AnnotationForge-1.11.3
+    "mvinfluence" # depends on broken package nlopt-2.4.2
+    "mzR" # build is broken
+    "NanoStringQCPro" # build is broken
+    "nCal" # depends on broken package nlopt-2.4.2
+    "ncdfFlow" # build is broken
+    "NCIgraph" # depends on broken package RCytoscape-1.19.0
+    "netbenchmark" # build is broken
+    "NHPoisson" # depends on broken package nlopt-2.4.2
+    "nloptr" # depends on broken package nlopt-2.4.2
+    "nondetects" # depends on broken package affyio-1.37.0
+    "nonrandom" # depends on broken package nlopt-2.4.2
+    "NormqPCR" # depends on broken package affyio-1.37.0
+    "NORRRM" # build is broken
+    "npIntFactRep" # depends on broken package nlopt-2.4.2
+    "oligoClasses" # depends on broken package affyio-1.37.0
+    "oligo" # depends on broken package affyio-1.37.0
+    "OmicsMarkeR" # depends on broken package nlopt-2.4.2
+    "oneChannelGUI" # depends on broken package affyio-1.37.0
+    "OpenCL" # build is broken
+    "openCyto" # depends on broken package ncdfFlow-2.15.2
+    "OpenMx" # build is broken
+    "OperaMate" # depends on broken package Category-2.35.1
+    "ordBTL" # depends on broken package nlopt-2.4.2
+    "OUwie" # depends on broken package nlopt-2.4.2
+    "PADOG" # build is broken
+    "pamm" # depends on broken package nlopt-2.4.2
+    "PANDA" # build is broken
+    "panelAR" # depends on broken package nlopt-2.4.2
+    "panp" # depends on broken package affyio-1.37.0
+    "papeR" # depends on broken package nlopt-2.4.2
+    "parboost" # depends on broken package nlopt-2.4.2
+    "parma" # depends on broken package nlopt-2.4.2
+    "pathClass" # depends on broken package affyio-1.37.0
+    "pathRender" # build is broken
+    "PatternClass" # build is broken
+    "Pbase" # depends on broken package affyio-1.37.0
+    "pbdSLAP" # build is broken
+    "PBImisc" # depends on broken package nlopt-2.4.2
+    "pbkrtest" # depends on broken package nlopt-2.4.2
+    "PBSddesolve" # build is broken
+    "PBSmapping" # build is broken
+    "PCpheno" # depends on broken package Category-2.35.1
+    "pdInfoBuilder" # depends on broken package affyio-1.37.0
+    "pdmclass" # build is broken
+    "PECA" # depends on broken package affyio-1.37.0
+    "pedigreemm" # depends on broken package nlopt-2.4.2
+    "pedometrics" # depends on broken package nlopt-2.4.2
+    "pequod" # depends on broken package nlopt-2.4.2
+    "PGSEA" # depends on broken package annaffy-1.41.1
+    "phenoDist" # depends on broken package Category-2.35.1
+    "phenoTest" # depends on broken package Category-2.35.1
+    "PhenStat" # depends on broken package nlopt-2.4.2
+    "phia" # depends on broken package nlopt-2.4.2
+    "phylocurve" # depends on broken package nlopt-2.4.2
+    "phyloTop" # depends on broken package nlopt-2.4.2
+    "plateCore" # depends on broken package ncdfFlow-2.15.2
+    "plier" # depends on broken package affyio-1.37.0
+    "plsRbeta" # depends on broken package nlopt-2.4.2
+    "plsRcox" # depends on broken package nlopt-2.4.2
+    "plsRglm" # depends on broken package nlopt-2.4.2
+    "plw" # depends on broken package affyio-1.37.0
+    "pmm" # depends on broken package nlopt-2.4.2
+    "polytomous" # depends on broken package nlopt-2.4.2
+    "pomp" # depends on broken package nlopt-2.4.2
+    "ppiPre" # depends on broken package GOSemSim-1.27.3
+    "ppiStats" # depends on broken package Category-2.35.1
+    "prebs" # depends on broken package affyio-1.37.0
+    "predictmeans" # depends on broken package nlopt-2.4.2
+    "prLogistic" # depends on broken package nlopt-2.4.2
+    "ProCoNA" # depends on broken package AnnotationForge-1.11.3
+    "pRoloc" # depends on broken package nlopt-2.4.2
+    "pRolocGUI" # depends on broken package nlopt-2.4.2
+    "proteoQC" # depends on broken package affyio-1.37.0
+    "PSAboot" # depends on broken package nlopt-2.4.2
+    "puma" # depends on broken package affyio-1.37.0
+    "pvac" # depends on broken package affyio-1.37.0
+    "pvca" # depends on broken package nlopt-2.4.2
+    "pwOmics" # depends on broken package interactiveDisplayBase-1.7.0
+    "qcmetrics" # build is broken
+    "qgraph" # depends on broken package nlopt-2.4.2
+    "qpcrNorm" # depends on broken package affyio-1.37.0
+    "qtlnet" # depends on broken package nlopt-2.4.2
+    "QUALIFIER" # depends on broken package ncdfFlow-2.15.2
+    "quantification" # depends on broken package nlopt-2.4.2
+    "R2STATS" # depends on broken package nlopt-2.4.2
+    "radiant" # depends on broken package nlopt-2.4.2
+    "raincpc" # build is broken
+    "rainfreq" # build is broken
+    "RamiGO" # depends on broken package RCytoscape-1.19.0
+    "rasclass" # depends on broken package nlopt-2.4.2
+    "RbioRXN" # depends on broken package ChemmineR-2.21.7
+    "Rchemcpp" # depends on broken package ChemmineR-2.21.7
+    "Rcmdr" # depends on broken package nlopt-2.4.2
+    "RcmdrMisc" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_BCA" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_coin" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_depthTools" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_DoE" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_doex" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_EACSPIR" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_EBM" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_EcoVirtual" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_epack" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_EZR" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_FactoMineR" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_HH" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_IPSUR" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_KMggplot2" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_lfstat" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_MA" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_mosaic" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_MPAStats" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_NMBU" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_orloca" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_plotByGroup" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_pointG" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_qual" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_RMTCJags" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_ROC" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_sampling" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_SCDA" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_seeg" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_SLC" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_SM" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_sos" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_StatisticalURV" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_steepness" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_survival" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_TeachingDemos" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_temis" # depends on broken package nlopt-2.4.2
+    "RcmdrPlugin_UCA" # depends on broken package nlopt-2.4.2
+    "Rcpi" # depends on broken package ChemmineR-2.21.7
+    "RcppOctave" # build is broken
+    "RcppRedis" # build is broken
+    "RCytoscape" # Build Is Broken
+    "RDAVIDWebService" # depends on broken package Category-2.35.1
+    "rdd" # depends on broken package nlopt-2.4.2
+    "RDieHarder" # build is broken
+    "ReactomePA" # depends on broken package GOSemSim-1.27.3
+    "ReadqPCR" # depends on broken package affyio-1.37.0
+    "referenceIntervals" # depends on broken package nlopt-2.4.2
+    "RefNet" # depends on broken package interactiveDisplayBase-1.7.0
+    "RefPlus" # depends on broken package affyio-1.37.0
+    "refund" # depends on broken package nlopt-2.4.2
+    "Repitools" # depends on broken package affyio-1.37.0
+    "ReportingTools" # depends on broken package Category-2.35.1
+    "REST" # depends on broken package nlopt-2.4.2
+    "rgp" # build is broken
+    "rgsepd" # depends on broken package goseq-1.21.1
+    "rhdf5" # build is broken
+    "rHVDM" # depends on broken package affyio-1.37.0
+    "Ringo" # depends on broken package affyio-1.37.0
+    "Risa" # depends on broken package affyio-1.37.0
+    "rMAT" # build is broken
+    "rmgarch" # depends on broken package nlopt-2.4.2
+    "rminer" # depends on broken package nlopt-2.4.2
+    "RmiR" # Build Is Broken
+    "Rmosek" # build is broken
+    "RNAinteract" # depends on broken package Category-2.35.1
+    "RNAither" # depends on broken package nlopt-2.4.2
+    "RnavGraph" # build is broken
+    "Rnits" # depends on broken package affyio-1.37.0
+    "RobLoxBioC" # depends on broken package affyio-1.37.0
+    "robustlmm" # depends on broken package nlopt-2.4.2
+    "rockchalk" # depends on broken package nlopt-2.4.2
+    "rols" # build is broken
+    "RPA" # depends on broken package affyio-1.37.0
+    "rpanel" # build is broken
+    "rpubchem" # depends on broken package nlopt-2.4.2
+    "RQuantLib" # build is broken
+    "rr" # depends on broken package nlopt-2.4.2
+    "RSAP" # build is broken
+    "rsbml" # build is broken
     "rscala" # build is broken
-    "RSDA" # REQUIRES NLOPT
-    "RSeed" # requires RBGL, and graph
-    "rsig" # requires survcomp
-    "RSNPset" # requires qvalue
-    "rsprng" # requres sprng
-    "Rsymphony" # FIXME: requires SYMPHONY
-    "rugarch" # requires nlopt
-    "RVAideMemoire" # Requires Nlopt
-    "RVFam" # Requires Nlopt
-    "RVideoPoker" # requires Rpanel
-    "ryouready" # requires nlopt
-    "rysgran" # requires soiltexture
-    "sampleSelection" # requires nlopt
-    "samr" # requires impute
-    "sdcMicroGUI" # requires nlopt
-    "sdcMicro" # requires nlopt
-    "SDD" # requires rpanel
-    "seeg" # requires spatstat
-    "selectspm" # depends on broken ecespa
-    "semdiag" # requires DiagrammeR to build
-    "semGOF" # requires DiagrammeR to build
-    "semiArtificial" # requires RSNNS
-    "semPlot" # requires DiagrammeR to build
-    "sem" # requires DiagrammeR to build
-    "SensoMineR" # Requires Nlopt
-    "SeqFeatR" # requires Biostrings, qvalue, and widgetTools
-    "SeqGrapheR" # depends on Biostrings
-    "sequenza" # requires copynumber
-    "SGCS" # requires spatstat
-    "siar" # requires spatstat
-    "SID" # requires pcalg
-    "SimRAD" # requires Biostrings, and ShortRead
-    "SimSeq" # requires edgeR
-    "siplab" # requires spatstat
-    "sirt" # requires DiagrammeR to build
-    "sjPlot" # requires nlopt
-    "smart" # requires PMA
-    "snpEnrichment" # requires snpStats
-    "snplist" # requires biomaRt
-    "snpStatsWriter" # requires snpStats
-    "SNPtools" # requires IRanges, GenomicRanges, Biostrings, and Rsamtools
-    "SOD" # depends on proprietary cudatoolkit
-    "soilphysics" # requires rpanel
-    "spacom" # requires nlopt
-    "sparr" # requires spatstat
-    "spatialsegregation" # requires spatstat
-    "SpatialVx" # requires spatstat
-    "speaq" # requires MassSpecWavelet
-    "specificity" # requires nlopt
-    "spocc" # requires leafletR
-    "SQDA" # requires limma
-    "ssizeRNA" # depends on missing 'Biobase', 'edgeR', 'limma', 'qvalue'
-    "ssmrob" # requires nlopt
-    "stagePop" # depends on broken PBSddesolve
-    "statar" # depends on broken lfe
-    "Statomica" # requires Biobase, multtest
-    "stcm" # requires nlopt
-    "stepp" # requires nlopt
-    "stpp" # requires spatstat
-    "structSSI" # requires multtest
-    "strum" # requires Rgraphviz
-    "superbiclust" # requires fabia
-    "Surrogate" # Requires Nlopt
-    "surveillance" # requires polyCub
-    "survJamda" # depends on missing survcomp
-    "swamp" # requires impute
-    "switchr" # build is broken
-    "switchrGist" # requires switchr
-    "sybilSBML" # requires libSBML
-    "systemfit" # requires nlopt
-    "taxize" # requres bold
-    "TcGSA" # requires multtest
-    "TDMR" # REQUIRES NLOPT
-    "tigerstats" # requires nlopt
-    "timeSeq" # depends on missing edgeR
-    "topologyGSA" # requires gRbase
-    "TR8" # requres taxize
-    "TriMatch" # Requires Nlopt
-    "trip" # requires spatstat
-    "TROM" # misses undeclared dependencies topGO', 'AnnotationDbi', 'GO.db'
-    "ttScreening" # requires sva, and limma
-    "userfriendlyscience" # requires nlopt
-    "V8" # compilation error
-    "VIMGUI" # REQUIRES NLOPT
-    "VIM" # REQUIRES NLOPT
-    "vmsbase" # depends on broken PBSmapping
-    "vows" # requires rpanel
-    "wfe" # requires nlopt
-    "WGCNA" # requires impute
-    "wgsea" # requires snpStats
-    "WideLM" # depends on proprietary cudatoolkit
-    "x_ent" # requires opencpu
-    "xergm" # requires nlopt
-    "ZeligMultilevel" # Requires Nlopt
-    "zetadiv" # requires nlopt
-    "zoib" # tarball is invalid on server
+    "RSDA" # depends on broken package nlopt-2.4.2
+    "Rsubread" # Build Is Broken
+    "Rsymphony" # build is broken
+    "rTANDEM" # build is broken
+    "RTN" # depends on broken package nlopt-2.4.2
+    "rugarch" # depends on broken package nlopt-2.4.2
+    "RUVcorr" # build is broken
+    "RUVnormalize" # Build Is Broken
+    "RVAideMemoire" # depends on broken package nlopt-2.4.2
+    "RVFam" # depends on broken package nlopt-2.4.2
+    "ryouready" # depends on broken package nlopt-2.4.2
+    "sampleSelection" # depends on broken package nlopt-2.4.2
+    "SCAN_UPC" # depends on broken package affyio-1.37.0
+    "ScISI" # depends on broken package apComplex-2.35.0
+    "sdcMicro" # depends on broken package nlopt-2.4.2
+    "sdcMicroGUI" # depends on broken package nlopt-2.4.2
+    "seeg" # depends on broken package nlopt-2.4.2
+    "sem" # depends on broken package nlopt-2.4.2
+    "semdiag" # depends on broken package nlopt-2.4.2
+    "SemDist" # Build Is Broken
+    "semGOF" # depends on broken package nlopt-2.4.2
+    "semPlot" # depends on broken package nlopt-2.4.2
+    "SensoMineR" # depends on broken package nlopt-2.4.2
+    "SEPA" # depends on broken package topGO-2.21.0
+    "seqTools" # build is broken
+    "SimBindProfiles" # depends on broken package affyio-1.37.0
+    "simpleaffy" # depends on broken package affyio-1.37.0
+    "sirt" # depends on broken package nlopt-2.4.2
+    "sjPlot" # depends on broken package nlopt-2.4.2
+    "skewr" # depends on broken package affyio-1.37.0
+    "SLGI" # depends on broken package apComplex-2.35.0
+    "SNAGEE" # build is broken
+    "snapCGH" # depends on broken package tilingArray-1.47.0
+    "snm" # depends on broken package nlopt-2.4.2
+    "SNPchip" # depends on broken package affyio-1.37.0
+    "snpEnrichment" # depends on broken package snpStats-1.19.0
+    "snpStats" # build is broken
+    "snpStatsWriter" # depends on broken package snpStats-1.19.0
+    "SOD" # depends on broken package cudatoolkit-5.5.22
+    "spacom" # depends on broken package nlopt-2.4.2
+    "specificity" # depends on broken package nlopt-2.4.2
+    "sscore" # depends on broken package affyio-1.37.0
+    "ssmrob" # depends on broken package nlopt-2.4.2
+    "staRank" # depends on broken package Category-2.35.1
+    "Starr" # depends on broken package affyio-1.37.0
+    "STATegRa" # depends on broken package affyio-1.37.0
+    "stcm" # depends on broken package nlopt-2.4.2
+    "stepp" # depends on broken package nlopt-2.4.2
+    "stringgaussnet" # build is broken
+    "Surrogate" # depends on broken package nlopt-2.4.2
+    "synapter" # depends on broken package affyio-1.37.0
+    "systemfit" # depends on broken package nlopt-2.4.2
+    "systemPipeR" # depends on broken package AnnotationForge-1.11.3
+    "TcGSA" # depends on broken package nlopt-2.4.2
+    "TDMR" # depends on broken package nlopt-2.4.2
+    "TFBSTools" # depends on broken package DirichletMultinomial-1.11.1
+    "tigerstats" # depends on broken package nlopt-2.4.2
+    "tilingArray" # depends on broken package affyio-1.37.0
+    "topGO" # build is broken
+    "tRanslatome" # depends on broken package GOSemSim-1.27.3
+    "TriMatch" # depends on broken package nlopt-2.4.2
+    "TROM" # depends on broken package topGO-2.21.0
+    "TurboNorm" # depends on broken package affyio-1.37.0
+    "unifiedWMWqPCR" # depends on broken package affyio-1.37.0
+    "userfriendlyscience" # depends on broken package nlopt-2.4.2
+    "V8" # build is broken
+    "VanillaICE" # depends on broken package affyio-1.37.0
+    "VIM" # depends on broken package nlopt-2.4.2
+    "VIMGUI" # depends on broken package nlopt-2.4.2
+    "vows" # depends on broken package nlopt-2.4.2
+    "vsn" # depends on broken package affyio-1.37.0
+    "vtpnet" # depends on broken package interactiveDisplayBase-1.7.0
+    "wateRmelon" # depends on broken package affyio-1.37.0
+    "waveTiling" # depends on broken package affyio-1.37.0
+    "webbioc" # depends on broken package affyio-1.37.0
+    "wfe" # depends on broken package nlopt-2.4.2
+    "WGCNA" # build is broken
+    "wgsea" # depends on broken package snpStats-1.19.0
+    "WideLM" # depends on broken package cudatoolkit-5.5.22
+    "xergm" # depends on broken package nlopt-2.4.2
+    "xps" # build is broken
+    "yaqcaffy" # depends on broken package affyio-1.37.0
+    "ZeligMultilevel" # depends on broken package nlopt-2.4.2
+    "zetadiv" # depends on broken package nlopt-2.4.2
   ];
 
   otherOverrides = old: new: {
@@ -1391,6 +1659,10 @@ let
       ];
     });
 
+    V8 = old.V8.overrideDerivation (attrs: {
+      preConfigure = "export V8_INCLUDES=${pkgs.v8}/include";
+    });
+
   };
 in
   self
diff --git a/pkgs/development/r-modules/generate-r-packages.R b/pkgs/development/r-modules/generate-r-packages.R
index f9346ddc127..d7884579637 100755
--- a/pkgs/development/r-modules/generate-r-packages.R
+++ b/pkgs/development/r-modules/generate-r-packages.R
@@ -5,47 +5,54 @@ library(parallel)
 cl <- makeCluster(10)
 
 mirrorType <- commandArgs(trailingOnly=TRUE)[1]
-packagesFile <- paste(mirrorType, 'packages.nix', sep='-')
-mirrorUrls <- list(
-  bioc="http://bioconductor.statistik.tu-dortmund.de/packages/3.0/bioc",
-  cran="http://cran.r-project.org"
-)
-mirrorUrl <- paste(mirrorUrls[mirrorType], "/src/contrib/", sep="")
+stopifnot(mirrorType %in% c("bioc","cran"))
 
+packagesFile <- paste(mirrorType, 'packages.nix', sep='-')
 readFormatted <- as.data.table(read.table(skip=6, sep='"', text=head(readLines(packagesFile), -1)))
 
+mirrorUrls <- list( bioc="http://bioconductor.statistik.tu-dortmund.de/packages/3.2/bioc/src/contrib/"
+                  , cran="http://cran.r-project.org/src/contrib/"
+                  )
+mirrorUrl <- mirrorUrls[mirrorType][[1]]
+knownPackages <- lapply(mirrorUrls, function(url) as.data.table(available.packages(url, filters=c("R_version", "OS_type", "duplicates"))))
+pkgs <- knownPackages[mirrorType][[1]]
+setkey(pkgs, Package)
+knownPackages <- c(unique(do.call("rbind", knownPackages)$Package))
+knownPackages <- sapply(knownPackages, gsub, pattern=".", replacement="_", fixed=TRUE)
+
 nixPrefetch <- function(name, version) {
   prevV <- readFormatted$V2 == name & readFormatted$V4 == version
   if (sum(prevV) == 1) as.character(readFormatted$V6[ prevV ]) else
     system(paste0("nix-prefetch-url --type sha256 ", mirrorUrl, name, "_", version, ".tar.gz"), intern=TRUE)
 }
 
-formatPackage <- function(name, version, sha256, depends, imports, linkingTo, knownPackages) {
+formatPackage <- function(name, version, sha256, depends, imports, linkingTo) {
     attr <- gsub(".", "_", name, fixed=TRUE)
-    if (is.na(depends)) depends <- "";
-    depends <- unlist(strsplit(depends, split="[ \t\n]*,[ \t\n]*", fixed=FALSE))
-    depends <- c(depends, unlist(strsplit(imports, split="[ \t\n]*,[ \t\n]*", fixed=FALSE)))
-    depends <- c(depends, unlist(strsplit(linkingTo, split="[ \t\n]*,[ \t\n]*", fixed=FALSE)))
+    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 <- depends[depends %in% knownPackages]
     depends <- sapply(depends, gsub, pattern=".", replacement="_", fixed=TRUE)
-    depends <- paste(depends, collapse=" ")
+    depends <- depends[depends %in% knownPackages]
+    depends <- paste(sort(unique(depends)), collapse=" ")
     paste0(attr, " = derive { name=\"", name, "\"; version=\"", version, "\"; sha256=\"", sha256, "\"; depends=[", depends, "]; };")
 }
 
-clusterExport(cl, c("nixPrefetch","readFormatted", "mirrorUrl"))
+clusterExport(cl, c("nixPrefetch","readFormatted", "mirrorUrl", "knownPackages"))
 
 pkgs <- as.data.table(available.packages(mirrorUrl, filters=c("R_version", "OS_type", "duplicates")))
 pkgs <- pkgs[order(Package)]
 pkgs$sha256 <- parApply(cl, pkgs, 1, function(p) nixPrefetch(p[1], p[2]))
-knownPackages <- unique(pkgs$Package)
 
-nix <- apply(pkgs, 1, function(p) formatPackage(p[1], p[2], p[18], p[4], p[5], p[6], knownPackages))
+nix <- apply(pkgs, 1, function(p) formatPackage(p[1], p[2], p[18], p[4], p[5], p[6]))
 
 cat("# This file is generated from generate-r-packages.R. DO NOT EDIT.\n")
 cat("# Execute the following command to update the file.\n")
 cat("#\n")
-cat(paste("# Rscript generate-r-packages.R", mirrorType, ">", packagesFile))
+cat(paste("# Rscript generate-r-packages.R", mirrorType, ">new && mv new", packagesFile))
 cat("\n\n")
 cat("{ self, derive }: with self; {\n")
 cat(paste(nix, collapse="\n"), "\n")
diff --git a/pkgs/development/r-modules/test-evaluation.nix b/pkgs/development/r-modules/test-evaluation.nix
new file mode 100644
index 00000000000..2ca0d42c6db
--- /dev/null
+++ b/pkgs/development/r-modules/test-evaluation.nix
@@ -0,0 +1,21 @@
+# Run
+#
+#   nix-build test-evaluation.nix --dry-run
+#
+# to test whether the R package set evaluates properly.
+
+let
+
+  config = {
+    allowBroken = true;
+    allowUnfree = true;
+  };
+
+  inherit (import ../../.. { inherit config; }) pkgs;
+
+  rWrapper = pkgs.rWrapper.override {
+    packages = pkgs.lib.filter pkgs.lib.isDerivation (pkgs.lib.attrValues pkgs.rPackages);
+  };
+
+in
+  rWrapper

From 4e5e44140bfc27211dffbb3cd727842ab02eb9d6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 17 Jun 2015 23:24:31 +0200
Subject: [PATCH 1272/2322] dpkg, x2goclient: fix evaluation

Bed time.
---
 pkgs/applications/networking/remote/x2goclient/default.nix | 2 +-
 pkgs/tools/package-management/dpkg/default.nix             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 4353f251038..30e40a965f7 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ];
-  nativeBuildInputs [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   patchPhase = ''
      substituteInPlace Makefile \
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index dbe1e665411..022b8dfc2ca 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   '';
 
   buildInputs = [ perl zlib bzip2 xz ];
-  nativeBuildInputs [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   postInstall =
     ''

From ebb2e416111e56ee066fa7fb6369679289e43f58 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 17 Jun 2015 17:50:52 -0700
Subject: [PATCH 1273/2322] openldap: Add gcc5 compat patch

---
 .../libraries/openldap/default.nix            | 11 ++++-
 .../openldap/fix-libdb-detection-gcc5.patch   | 43 +++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/openldap/fix-libdb-detection-gcc5.patch

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 3513d83e867..97752a268f7 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, openssl, cyrus_sasl, db, groff}:
+{ stdenv, fetchurl, autoconf, openssl, cyrus_sasl, db, groff }:
 
 stdenv.mkDerivation rec {
   name = "openldap-2.4.40";
@@ -8,8 +8,17 @@ stdenv.mkDerivation rec {
     sha256 = "1nyslrgwxwilgv5sixc37svls5rbvhsv9drb7hlrjr2vqaji29ni";
   };
 
+  # Last tested for openldap 2.4.40
+  patches = [ ./fix-libdb-detection-gcc5.patch ];
+
+  nativeBuildInputs = [ autoconf ];
   buildInputs = [ openssl cyrus_sasl db groff ];
 
+  # NOTE: Only needed for the gcc5 patch
+  preConfigure = ''
+    autoconf
+  '';
+
   configureFlags =
     [ "--enable-overlays"
       "--disable-dependency-tracking"   # speeds up one-time build
diff --git a/pkgs/development/libraries/openldap/fix-libdb-detection-gcc5.patch b/pkgs/development/libraries/openldap/fix-libdb-detection-gcc5.patch
new file mode 100644
index 00000000000..40ba9de7375
--- /dev/null
+++ b/pkgs/development/libraries/openldap/fix-libdb-detection-gcc5.patch
@@ -0,0 +1,43 @@
+From f0409f40dab6013d1aec05f5c86ae31d2f49b485 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Wed, 11 Feb 2015 10:32:28 +0100
+Subject: [PATCH] fix libdb detection with gcc 5
+
+The old cpp version generated:
+__db_version 5
+
+The new output:
+__db_version
+            5
+
+Running cpp with -P (inhibit linemarkers generation) fixes this when using gcc 5.
+Behavior with older versions of gcc is not changed.
+---
+ build/openldap.m4 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/openldap.m4 b/build/openldap.m4
+index caf8fc2..bdcb4d6 100644
+--- a/build/openldap.m4
++++ b/build/openldap.m4
+@@ -328,7 +328,7 @@ AC_DEFUN([OL_BDB_HEADER_VERSION],
+ #endif
+ __db_version DB_VERSION_MAJOR
+ ])
+-	set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
++	set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
+ 	ol_cv_bdb_major=${3}
+ ])
+ case $ol_cv_bdb_major in [[1-9]]*) : ;; *)
+@@ -344,7 +344,7 @@ AC_CACHE_CHECK([for Berkeley DB minor version in db.h], [ol_cv_bdb_minor],[
+ #endif
+ __db_version DB_VERSION_MINOR
+ ])
+-	set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
++	set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
+ 	ol_cv_bdb_minor=${3}
+ ])
+ case $ol_cv_bdb_minor in [[0-9]]*) : ;; *)
+-- 
+2.1.0
+

From 2ae75f3a854bd5b37a4e2be63c922177a1701803 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 17 Jun 2015 18:33:10 -0700
Subject: [PATCH 1274/2322] gnutls: 3.4.1 -> 3.4.2

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

diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix
index fe44ce3621f..614834252fa 100644
--- a/pkgs/development/libraries/gnutls/3.4.nix
+++ b/pkgs/development/libraries/gnutls/3.4.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.4.1";
+  version = "3.4.2";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.lz";
-    sha256 = "06wiwsydfpy5fn86ip4x2s507483l4y847kr1p2chgjw0wqc8vjy";
+    sha256 = "1wzasbrs4ncq4yisqyvifl7mzlyyg1pb0idr4fhjmcfpi13sxlaw";
   };
 })

From e6f81661aa172c5cbb4d7fc3ef1727dec1fa11f1 Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <e.bachmakov@gmail.com>
Date: Wed, 17 Jun 2015 21:59:54 -0400
Subject: [PATCH 1275/2322] rsyslog: 8.9.0 -> 8.10.0

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

diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index a9fdcf6fa64..0878902af86 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -11,11 +11,11 @@ let
   mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
 in
 stdenv.mkDerivation rec {
-  name = "rsyslog-8.9.0";
+  name = "rsyslog-8.10.0";
 
   src = fetchurl {
     url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz";
-    sha256 = "1p3saxfs723479rbsdyvqwfrblcp0bw6mkz2ncrxvnccfn70xc7a";
+    sha256 = "04k90v7fm1czg3lm5anfnf5cnxcxyhxldkgwzzi1k0hhczrz6bdr";
   };
 
   buildInputs = [

From 295846a2545c91567a21f375c181aa5c51da42e2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 17 Jun 2015 19:10:23 -0700
Subject: [PATCH 1276/2322] nixos/nix-serve: Run as a separate user and add a
 signing key parameter

---
 nixos/modules/misc/ids.nix                      |  2 ++
 nixos/modules/services/networking/nix-serve.nix | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index d283a633734..ce935915abf 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -220,6 +220,7 @@
       grafana = 196;
       skydns = 197;
       ripple-rest = 198;
+      nix-serve = 199;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -418,6 +419,7 @@
       #grafana = 196; #unused
       #skydns = 197; #unused
       #ripple-rest = 198; #unused
+      #nix-serve = 199; #unused
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix
index c2c579c3177..4f8b9357a82 100644
--- a/nixos/modules/services/networking/nix-serve.nix
+++ b/nixos/modules/services/networking/nix-serve.nix
@@ -26,6 +26,14 @@ in
         '';
       };
 
+      secretKeyFile = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          The path to the file used for signing derivation data.
+        '';
+      };
+
       extraParams = mkOption {
         type = types.string;
         default = "";
@@ -44,13 +52,19 @@ in
 
       path = [ config.nix.package pkgs.bzip2 ];
       environment.NIX_REMOTE = "daemon";
+      environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile;
 
       serviceConfig = {
         ExecStart = "${pkgs.nix-serve}/bin/nix-serve " +
           "--port ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}";
-        User = "nobody";
+        User = "nix-serve";
         Group = "nogroup";
       };
     };
+
+    users.extraUsers.nix-serve = {
+      description = "Nix-serve user";
+      uid = config.ids.uids.nix-serve;
+    };
   };
 }

From c4406c585c675e7cffe03fded30c51459e0ad91b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 18 Jun 2015 10:27:35 +0200
Subject: [PATCH 1277/2322] makeDesktopItem: don't generated a deprecated key

Fixes #4319. We even seem we never override it anywhere.
http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.1.html#deprecated-items
---
 pkgs/build-support/make-desktopitem/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix
index c7f2aea2339..1a03faae54c 100644
--- a/pkgs/build-support/make-desktopitem/default.nix
+++ b/pkgs/build-support/make-desktopitem/default.nix
@@ -9,7 +9,6 @@
 , genericName
 , mimeType ? ""
 , categories ? "Application;Other;"
-, encoding ? "UTF-8"
 }:
 
 stdenv.mkDerivation {
@@ -27,7 +26,6 @@ stdenv.mkDerivation {
     GenericName=${genericName}
     MimeType=${mimeType}
     Categories=${categories}
-    Encoding=${encoding}
     EOF
   '';
 }

From 8297a9eef97456a80d42ae4ff9bf84e84569cc0c Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 18 Jun 2015 10:44:27 +0200
Subject: [PATCH 1278/2322] Change where window managers should be

This patch reflects current practice.

Fixes issue #8364.
---
 doc/coding-conventions.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index 4967295db08..e7166a64919 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -451,12 +451,17 @@ splitting up an existing category.</para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term>If it’s a <emphasis>desktop environment</emphasis>
-    (including <emphasis>window managers</emphasis>):</term>
+    <term>If it’s a <emphasis>desktop environment</emphasis>:</term>
     <listitem>
       <para><filename>desktops</filename> (e.g. <filename>kde</filename>, <filename>gnome</filename>, <filename>enlightenment</filename>)</para>
     </listitem>
   </varlistentry>
+  <varlistentry>
+    <term>If it’s a <emphasis>window manager</emphasis>:</term>
+    <listitem>
+      <para><filename>applications/window-managers</filename> (e.g. <filename>awesome</filename>, <filename>compiz</filename>, <filename>stumpwm</filename>)</para>
+    </listitem>
+  </varlistentry>
   <varlistentry>
     <term>If it’s an <emphasis>application</emphasis>:</term>
     <listitem>

From ca407f3738b5f534afed739434de9ec785cfd5b1 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 18 Jun 2015 10:51:35 +0200
Subject: [PATCH 1279/2322] xdg_utils: fixing some of the impurities in
 xdg-utilso, #8377

---
 pkgs/tools/X11/xdg-utils/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 53b3531b685..5f5619002d6 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchgit, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto, w3m }:
+{ stdenv, fetchgit, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto
+, w3m, which, gnugrep, gnused, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "xdg-utils-1.1.0-rc3p7";
@@ -13,7 +14,14 @@ stdenv.mkDerivation rec {
   buildInputs = [ libxslt docbook_xml_dtd_412 docbook_xsl xmlto w3m ];
 
   postInstall = ''
-    substituteInPlace $out/bin/xdg-mime --replace /usr/bin/file ${file}/bin/file
+    for item in $out/bin/*; do
+      substituteInPlace $item --replace "cut " "${coreutils}/bin/cut "
+      substituteInPlace $item --replace "sed " "${gnused}/bin/sed "
+      substituteInPlace $item --replace "grep " "${gnugrep}/bin/grep "
+      substituteInPlace $item --replace "egrep " "${gnugrep}/bin/egrep "
+      substituteInPlace $item --replace "which " "${which}/bin/which "
+      substituteInPlace $item --replace "/usr/bin/file" "${file}/bin/file"
+    done
   '';
 
   meta = {

From b2b724515571bec88c6c05b5a39753d31598d578 Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Wed, 17 Jun 2015 22:48:29 +0200
Subject: [PATCH 1280/2322] Update syncthing to 0.11.9

---
 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 30fda1e0fac..9a91f3090a1 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,12 +4,12 @@ with goPackages;
 
 buildGoPackage rec {
   name = "syncthing-${version}";
-  version = "0.11.8";
+  version = "0.11.9";
   goPackagePath = "github.com/syncthing/syncthing";
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "fed98ac47fd84aecee7770dd59e5e68c5bc429d50b361f13b9ea2e28c3be62cf";
+    sha256 = "353528e152bbfd5075c4f85a54bce507ab3d8855f702a1399a48196bc19d226b";
   };
 
   subPackages = [ "cmd/syncthing" ];

From cec71a01d944c0dba6d7957ed68a92b011fbcdd1 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Wed, 17 Jun 2015 05:58:24 +0000
Subject: [PATCH 1281/2322] libuv: 1.5.0 -> 1.6.1, closes #8365

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

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 37f09d4adf0..08a969033db 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -105,5 +105,5 @@ in
   //
   mapAttrs (v: h: mkWithAutotools stable (toVersion v) h) {
     v1_2_0 = "1nbp8qpgw64gl9nrjzxw0ndv1m64cfms0cy5a2883vw6877kizmx";
-    v1_5_0 = "1j0871mxw97680ghlqy0dpyfmr26kqa0lk26a2bgcqf4ghqap24x";
+    v1_6_1 = "10w9pjbmqcv03v04rnjd8mdh886j7v4y0svdsdklz69zskgdvvqg";
   }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fa0e45cd47..ee7c55cecb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1971,7 +1971,7 @@ let
   else
     nodePackages_0_12;
 
-  iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_5_0; };
+  iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_6_1; };
 
   iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; };
 
@@ -7243,7 +7243,7 @@ let
     automake = automake113x; # fails with 14
   });
 
-  libuv = libuvVersions.v1_5_0;
+  libuv = libuvVersions.v1_6_1;
 
   libv4l = lowPrio (v4l_utils.override {
     alsaLib = null;

From deadb4e0aaad0e0a2eeb68dbf4dce03115b30646 Mon Sep 17 00:00:00 2001
From: hiberno <mail@elfsechsundzwanzig.de>
Date: Thu, 18 Jun 2015 10:51:13 +0200
Subject: [PATCH 1282/2322] tor-browser: update 4.5.1 to 4.5.2, closes #8379

---
 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 4ab0cabbcd3..34803f03cd1 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -20,13 +20,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "4.5.1";
+  version = "4.5.2";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz";
     sha256 = if bits == "64" then
-      "0nbjw04xbzb5d4q0j05nq9p8vdpzqxzhbywjxdgpc5mc73jyv8mr" else
-      "0fkzgdyxi7gl3kyfp0jmbky61a1b2yg9747h75bgkkndnqxnmkqw";
+      "139c85096ee85a65222753fbbee7c04e8cc494021f9afaf5c1a0f520dd7869b9" else
+      "960277aea38a3958f3ac573535302e61b3b0137169e5d7b9687cee648a5d5bec";
   };
 
   patchPhase = ''

From 03f0f41db5e5e3bf04b6f1c13695e5ccb560d98e Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 12 Jun 2015 01:28:41 +0200
Subject: [PATCH 1283/2322] add pkgs: sqlite-amalgamation

---
 .../libraries/sqlite-amalgamation/default.nix | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/libraries/sqlite-amalgamation/default.nix

diff --git a/pkgs/development/libraries/sqlite-amalgamation/default.nix b/pkgs/development/libraries/sqlite-amalgamation/default.nix
new file mode 100644
index 00000000000..2ee3b6f2ecb
--- /dev/null
+++ b/pkgs/development/libraries/sqlite-amalgamation/default.nix
@@ -0,0 +1,33 @@
+{ lib, stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation {
+  name = "sqlite-amalgamation-201505302257";
+
+  src = fetchurl {
+    url = "https://www.sqlite.org/snapshot/sqlite-amalgamation-201505302257.zip";
+    sha256 = "0488wjrpnxd61g7pcka6fckx0q8yl1k26i6q5hrmkm92qcpml76h";
+  };
+
+  phases = [ "unpackPhase" "buildPhase" ];
+
+  buildInputs = [ unzip ];
+
+  unpackPhase = ''
+    unzip $src
+  '';
+
+  buildPhase = ''
+    mkdir -p $out
+    cp sqlite3.c $out/
+    cp sqlite3.h $out/
+    cp sqlite3ext.h $out/
+    cp shell.c $out/
+  '';
+
+  meta = {
+    homepage = http://www.sqlite.org/;
+    description = "A single C code file, named sqlite3.c, that contains all C code for the core SQLite library and the FTS3 and RTREE extensions";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ lib.maintainers.lassulus ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee7c55cecb4..46f59d43fc1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8009,6 +8009,8 @@ let
 
   sqlite3_analyzer = lowPrio (callPackage ../development/libraries/sqlite/sqlite3_analyzer.nix { });
 
+  sqlite-amalgamation = callPackage ../development/libraries/sqlite-amalgamation { };
+
   sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; });
 
   sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher {

From 24dc9d7160823b89a9af3acad072b972900479ff Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 12 Jun 2015 13:29:12 +0200
Subject: [PATCH 1284/2322] add pkgs: fmod42416

---
 pkgs/development/libraries/fmod/4.24.16.nix | 50 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/libraries/fmod/4.24.16.nix

diff --git a/pkgs/development/libraries/fmod/4.24.16.nix b/pkgs/development/libraries/fmod/4.24.16.nix
new file mode 100644
index 00000000000..d1768d656b4
--- /dev/null
+++ b/pkgs/development/libraries/fmod/4.24.16.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl }:
+
+assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux");
+let
+  bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64";
+
+  libPath = stdenv.lib.makeLibraryPath
+    [ stdenv.cc.libc stdenv.cc.cc ] + ":${stdenv.cc.cc}/lib64";
+  patchLib = x: "patchelf --set-rpath ${libPath} ${x}";
+
+  src =
+    (if (bits == "64") then
+      fetchurl {
+        url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi42416linux64.tar.gz";
+        sha256 = "0hkwlzchzzgd7fanqznbv5bs53z2qy8iiv9l2y77l4sg1jwmlm6y";
+      }
+    else
+      fetchurl {
+        url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi42416linux.tar.gz";
+        sha256 = "13diw3ax2slkr99mwyjyc62b8awc30k0z08cvkpk2p3i1j6f85m5";
+      }
+    );
+in
+stdenv.mkDerivation rec {
+  inherit src;
+
+  name    = "fmod-${version}";
+  version = "4.24.16";
+
+  dontStrip = true;
+  buildPhase = "true";
+  installPhase = ''
+    mkdir -p $out/lib $out/include/fmodex
+
+    cd api/inc && cp * $out/include/fmodex && cd ../lib
+    cp libfmodex${bits}-${version}.so $out/lib/libfmodex.so
+    cp libfmodex${bits}L-${version}.so $out/lib/libfmodexL.so
+
+    ${patchLib "$out/lib/libfmodex.so"}
+    ${patchLib "$out/lib/libfmodexL.so"}
+  '';
+
+  meta = {
+    description = "Programming library and toolkit for the creation and playback of interactive audio";
+    homepage    = "http://www.fmod.org/";
+    license     = stdenv.lib.licenses.unfreeRedistributable;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.lassulus ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46f59d43fc1..f40d7fc466f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6065,6 +6065,8 @@ let
 
   fmod = callPackage ../development/libraries/fmod { };
 
+  fmod42416 = callPackage ../development/libraries/fmod/4.24.16.nix { };
+
   freeimage = callPackage ../development/libraries/freeimage { };
 
   freetts = callPackage ../development/libraries/freetts { };

From 099923c7be4cb5921e6c238da8c5e7ad8048fb12 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 12 Jun 2015 13:29:47 +0200
Subject: [PATCH 1285/2322] add pkgs: zandronum, zandronum-{server,bin}, closes
 #8338

---
 pkgs/games/zandronum/bin.nix     | 82 ++++++++++++++++++++++++++++++++
 pkgs/games/zandronum/default.nix | 43 +++++++++++++++++
 pkgs/games/zandronum/server.nix  | 44 +++++++++++++++++
 pkgs/top-level/all-packages.nix  |  4 ++
 4 files changed, 173 insertions(+)
 create mode 100644 pkgs/games/zandronum/bin.nix
 create mode 100644 pkgs/games/zandronum/default.nix
 create mode 100644 pkgs/games/zandronum/server.nix

diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix
new file mode 100644
index 00000000000..5d20686c2ae
--- /dev/null
+++ b/pkgs/games/zandronum/bin.nix
@@ -0,0 +1,82 @@
+{ stdenv
+, atk
+, bzip2
+, cairo
+, fetchurl
+, fontconfig
+, freetype
+, gdk_pixbuf
+, glib
+, gtk
+, libjpeg_turbo
+, mesa_glu
+, mesa_noglu
+, openssl
+, pango
+, SDL
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+  name = "zandronum-2.0";
+  src = fetchurl {
+    url = "http://zandronum.com/downloads/zandronum2.0-linux-x86_64.tar.bz2";
+    sha256 = "1k49az7x0ig40r2xisscpyhfcx9zzivx8w1l1ispj58g6qivicgc";
+  };
+
+  libPath = stdenv.lib.makeLibraryPath [
+    atk
+    bzip2
+    cairo
+    fontconfig
+    freetype
+    gdk_pixbuf
+    glib
+    gtk
+    libjpeg_turbo
+    mesa_glu
+    mesa_noglu
+    openssl
+    pango
+    SDL
+    stdenv.cc.cc
+    zlib
+  ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  unpackPhase = ''
+    tar xf $src
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share
+    cp * $out/share
+
+    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/share/zandronum
+    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/share/zandronum-server
+
+    cat > $out/bin/zandronum << EOF
+    #!/bin/sh
+
+    LD_LIBRARY_PATH=$libPath:$out/share $out/share/zandronum "\$@"
+    EOF
+
+    cat > $out/bin/zandronum-server << EOF
+    #!/bin/sh
+
+    LD_LIBRARY_PATH=$libPath:$out/share $out/share/zandronum-server "\$@"
+    EOF
+
+    chmod +x "$out/bin/zandronum"
+    chmod +x "$out/bin/zandronum-server"
+  '';
+
+  meta = {
+    homepage = http://zandronum.com/;
+    description = "multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play.";
+    maintainer = [ stdenv.lib.maintainers.lassulus ];
+  };
+}
+
diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix
new file mode 100644
index 00000000000..ca60c364f0f
--- /dev/null
+++ b/pkgs/games/zandronum/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchhg, cmake, SDL, mesa, fmod42416, openssl, sqlite, sqlite-amalgamation }:
+
+stdenv.mkDerivation {
+  name = "zandronum-2.0";
+  src = fetchhg {
+    url = "https://bitbucket.org/Torr_Samaho/zandronum";
+    rev = "2fc02c0";
+    sha256 = "1syzy0iphm6jj5wag3xyr2fx7vyg2cjcmijhvgw2rc67rww85pv2";
+  };
+
+  phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ];
+
+  buildInputs = [ cmake SDL mesa fmod42416 openssl sqlite sqlite-amalgamation ];
+
+  preConfigure = ''
+    cp ${sqlite-amalgamation}/* sqlite/
+  '';
+
+  cmakeFlags = [
+    "-DFMOD_LIBRARY=${fmod42416}/lib/libfmodex.so"
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share
+    cp zandronum zandronum.pk3 skulltag_actors.pk3 liboutput_sdl.so $out/share
+
+    cat > $out/bin/zandronum << EOF
+    #!/bin/sh
+
+    LD_LIBRARY_PATH=$out/share $out/share/zandronum "\$@"
+    EOF
+
+    chmod +x "$out/bin/zandronum"
+  '';
+
+  meta = {
+    homepage = http://zandronum.com/;
+    description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software.";
+    maintainer = [ stdenv.lib.maintainers.lassulus ];
+  };
+}
+
diff --git a/pkgs/games/zandronum/server.nix b/pkgs/games/zandronum/server.nix
new file mode 100644
index 00000000000..506eee0e54f
--- /dev/null
+++ b/pkgs/games/zandronum/server.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchhg, cmake, openssl, sqlite, sqlite-amalgamation, SDL }:
+
+stdenv.mkDerivation {
+  name = "zandronum-server-2.0";
+  src = fetchhg {
+    url = "https://bitbucket.org/Torr_Samaho/zandronum";
+    rev = "2fc02c0";
+    sha256 = "1syzy0iphm6jj5wag3xyr2fx7vyg2cjcmijhvgw2rc67rww85pv2";
+  };
+
+  phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ];
+
+  buildInputs = [ cmake openssl sqlite sqlite-amalgamation SDL ];
+
+  preConfigure = ''
+    cp ${sqlite-amalgamation}/* sqlite/
+  '';
+
+  cmakeFlags = [
+    "-DSERVERONLY=ON"
+  ];
+
+  installPhase = ''
+    find
+    mkdir -p $out/bin
+    mkdir -p $out/share
+    cp zandronum-server zandronum.pk3 skulltag_actors.pk3 $out/share
+
+    cat > $out/bin/zandronum-server << EOF
+    #!/bin/sh
+
+    LD_LIBRARY_PATH=$out/share $out/share/zandronum-server "\$@"
+    EOF
+
+    chmod +x "$out/bin/zandronum-server"
+  '';
+
+  meta = {
+    homepage = http://zandronum.com/;
+    description = "Server of the multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software";
+    maintainer = [ stdenv.lib.maintainers.lassulus ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f40d7fc466f..de9cea273a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13580,6 +13580,10 @@ let
     inherit (xlibs) libX11 xproto libXpm libXt;
   };
 
+  zandronum = callPackage ../games/zandronum { };
+  zandronum-server = callPackage ../games/zandronum/server.nix { };
+  zandronum-bin = callPackage ../games/zandronum/bin.nix { };
+
   zdoom = callPackage ../games/zdoom { };
 
   zod = callPackage ../games/zod { };

From f1195081403ff72edb33565d3669251addd41f86 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 17 Jun 2015 15:21:22 +0200
Subject: [PATCH 1286/2322] darwin os-specific: rez and derez packages

---
 lib/maintainers.nix                       |  1 +
 pkgs/os-specific/darwin/derez/default.nix | 34 +++++++++++++++++++++++
 pkgs/os-specific/darwin/rez/default.nix   | 33 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  3 ++
 4 files changed, 71 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/derez/default.nix
 create mode 100644 pkgs/os-specific/darwin/rez/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index eaee076635f..88c513eacab 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -133,6 +133,7 @@
   lhvwb = "Nathaniel Baxter <nathaniel.baxter@gmail.com>";
   linquize = "Linquize <linquize@yahoo.com.hk>";
   linus = "Linus Arver <linusarver@gmail.com>";
+  lnl7 = "Daiderd Jordan <daiderd@gmail.com>";
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
diff --git a/pkgs/os-specific/darwin/derez/default.nix b/pkgs/os-specific/darwin/derez/default.nix
new file mode 100644
index 00000000000..f64f05aadf0
--- /dev/null
+++ b/pkgs/os-specific/darwin/derez/default.nix
@@ -0,0 +1,34 @@
+{ stdenv }:
+
+# this tool only exists on darwin
+assert stdenv.isDarwin;
+
+stdenv.mkDerivation {
+  name = "derez";
+
+  src = "/usr/bin/DeRez";
+
+  unpackPhase = "true";
+  configurePhase = "true";
+  buildPhase = "true";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    ln -s $src "$out/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Decompiles resources";
+    homepage    = "https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/DeRez.1.html";
+    maintainers = [ maintainers.lnl7 ];
+    platforms   = platforms.darwin;
+
+    longDescription = ''
+      The DeRez tool decompiles the resource fork of resourceFile according to the type declarations
+      supplied by the type declaration files. The resource description produced by this decompilation
+      contains the resource definitions (resource and data statements) associated with these type
+      declarations. If for some reason it cannot reproduce the appropriate resource statements, DeRez
+      generates hexadecimal data statements instead.
+    '';
+  };
+}
diff --git a/pkgs/os-specific/darwin/rez/default.nix b/pkgs/os-specific/darwin/rez/default.nix
new file mode 100644
index 00000000000..847dfc6e6f3
--- /dev/null
+++ b/pkgs/os-specific/darwin/rez/default.nix
@@ -0,0 +1,33 @@
+{ stdenv }:
+
+# this tool only exists on darwin
+assert stdenv.isDarwin;
+
+stdenv.mkDerivation {
+  name = "rez";
+
+  src = "/usr/bin/Rez";
+
+  unpackPhase = "true";
+  configurePhase = "true";
+  buildPhase = "true";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    ln -s $src "$out/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Compiles resources";
+    homepage    = "https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/Rez.1.html";
+    maintainers = [ maintainers.lnl7 ];
+    platforms   = platforms.darwin;
+
+    longDescription = ''
+      The Rez tool compiles the resource fork of a file according to the textual description contained in
+      the resource description files. These resource description files must contain both the type
+      declarations and the resource definitions needed to compile the resources. This data can come
+      directly from the resource description files.
+    '';
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de9cea273a3..35a9ca58854 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -635,6 +635,9 @@ let
 
   oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { };
 
+  derez = callPackage ../os-specific/darwin/derez { };
+  rez = callPackage ../os-specific/darwin/rez { };
+
   setfile = callPackage ../os-specific/darwin/setfile { };
 
   install_name_tool = callPackage ../os-specific/darwin/install_name_tool { };

From 8a074996201c64d8642a2d8bc89a2eb9c753a420 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 17 Jun 2015 15:22:33 +0200
Subject: [PATCH 1287/2322] wxmac: new package

- based on the current homebrew package
---
 pkgs/development/libraries/wxmac/default.nix | 55 ++++++++++++++++++
 pkgs/development/libraries/wxmac/wx.patch    | 59 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 3 files changed, 116 insertions(+)
 create mode 100644 pkgs/development/libraries/wxmac/default.nix
 create mode 100644 pkgs/development/libraries/wxmac/wx.patch

diff --git a/pkgs/development/libraries/wxmac/default.nix b/pkgs/development/libraries/wxmac/default.nix
new file mode 100644
index 00000000000..1437f8c807e
--- /dev/null
+++ b/pkgs/development/libraries/wxmac/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, setfile, rez, derez,
+  expat, libjpeg, libpng, libtiff, zlib
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  version = "3.0.2";
+  name = "wxmac-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2";
+    sha256 = "346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d";
+  };
+
+  patches = [ ./wx.patch ];
+
+  buildInputs = [ setfile rez derez expat libjpeg libpng libtiff zlib ];
+
+  configureFlags = [
+    "--enable-unicode"
+    "--with-osx_cocoa"
+    "--enable-std_string"
+    "--enable-display"
+    "--with-opengl"
+    "--with-libjpeg"
+    "--with-libtiff"
+    "--without-liblzma"
+    "--with-libpng"
+    "--with-zlib"
+    "--enable-dnd"
+    "--enable-clipboard"
+    "--enable-webkit"
+    "--enable-svg"
+    "--enable-graphics_ctx"
+    "--enable-controls"
+    "--enable-dataviewctrl"
+    "--with-expat"
+    "--disable-precomp-headers"
+    "--disable-mediactrl"
+  ];
+
+  checkPhase = ''
+    ./wx-config --libs
+  '';
+
+  doCheck = true;
+
+  enableParallelBuilding = true;
+
+  meta = {
+    platforms = platforms.darwin;
+    maintainers = [ maintainers.lnl7 ];
+  };
+}
diff --git a/pkgs/development/libraries/wxmac/wx.patch b/pkgs/development/libraries/wxmac/wx.patch
new file mode 100644
index 00000000000..622e22d1fdb
--- /dev/null
+++ b/pkgs/development/libraries/wxmac/wx.patch
@@ -0,0 +1,59 @@
+diff --git a/include/wx/defs.h b/include/wx/defs.h
+index 397ddd7..d128083 100644
+--- a/include/wx/defs.h
++++ b/include/wx/defs.h
+@@ -3169,12 +3169,20 @@ DECLARE_WXCOCOA_OBJC_CLASS(UIImage);
+ DECLARE_WXCOCOA_OBJC_CLASS(UIEvent);
+ DECLARE_WXCOCOA_OBJC_CLASS(NSSet);
+ DECLARE_WXCOCOA_OBJC_CLASS(EAGLContext);
++DECLARE_WXCOCOA_OBJC_CLASS(UIWebView);
+ 
+ typedef WX_UIWindow WXWindow;
+ typedef WX_UIView WXWidget;
+ typedef WX_EAGLContext WXGLContext;
+ typedef WX_NSString* WXGLPixelFormat;
+ 
++typedef WX_UIWebView OSXWebViewPtr;
++
++#endif
++
++#if wxOSX_USE_COCOA_OR_CARBON
++DECLARE_WXCOCOA_OBJC_CLASS(WebView);
++typedef WX_WebView OSXWebViewPtr;
+ #endif
+ 
+ #endif /* __WXMAC__ */
+diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
+index 8700367..f805099 100644
+--- a/include/wx/html/webkit.h
++++ b/include/wx/html/webkit.h
+@@ -18,7 +18,6 @@
+ #endif
+ 
+ #include "wx/control.h"
+-DECLARE_WXCOCOA_OBJC_CLASS(WebView); 
+ 
+ // ----------------------------------------------------------------------------
+ // Web Kit Control
+@@ -107,7 +106,7 @@ private:
+     wxString m_currentURL;
+     wxString m_pageTitle;
+ 
+-    WX_WebView m_webView;
++    OSXWebViewPtr m_webView;
+ 
+     // we may use this later to setup our own mouse events,
+     // so leave it in for now.
+diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
+index 803f8b0..438e532 100644
+--- a/include/wx/osx/webview_webkit.h
++++ b/include/wx/osx/webview_webkit.h
+@@ -158,7 +158,7 @@ private:
+     wxWindowID m_windowID;
+     wxString m_pageTitle;
+ 
+-    wxObjCID m_webView;
++    OSXWebViewPtr m_webView;
+ 
+     // we may use this later to setup our own mouse events,
+     // so leave it in for now.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35a9ca58854..ab01a5ccbf6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8233,6 +8233,8 @@ let
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
   };
 
+  wxmac = callPackage ../development/libraries/wxmac { };
+
   wtk = callPackage ../development/libraries/wtk { };
 
   x264 = callPackage ../development/libraries/x264 { };

From b66942702b3a65882517e0db2b12788f7d67a2cb Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 17 Jun 2015 15:50:01 +0200
Subject: [PATCH 1288/2322] erlang: use wxmac on darwin

---
 pkgs/development/interpreters/erlang/R17.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix
index 6b64fc32e12..3a3d7434515 100644
--- a/pkgs/development/interpreters/erlang/R17.nix
+++ b/pkgs/development/interpreters/erlang/R17.nix
@@ -1,11 +1,15 @@
 { stdenv, fetchurl, perl, gnum4, ncurses, openssl
 , gnused, gawk, makeWrapper
 , odbcSupport ? false, unixODBC ? null
-, wxSupport ? true, mesa ? null, wxGTK ? null, xlibs ? null
+, wxSupport ? true, mesa ? null, wxGTK ? null, xlibs ? null, wxmac ? null
 , javacSupport ? false, openjdk ? null
-, enableHipe ? true}:
+, enableHipe ? true
+}:
+
+assert wxSupport -> (if stdenv.isDarwin
+  then wxmac != null
+  else mesa != null && wxGTK != null && xlibs != null);
 
-assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
 assert odbcSupport -> unixODBC != null;
 assert javacSupport ->  openjdk != null;
 
@@ -23,7 +27,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ perl gnum4 ncurses openssl makeWrapper
-    ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ]
+    ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xlibs.libX11 ])
       ++ optional odbcSupport [ unixODBC ]
       ++ optional javacSupport [ openjdk ];
 
@@ -34,7 +38,13 @@ stdenv.mkDerivation rec {
     sed -e s@/bin/pwd@pwd@g -i otp_build
   '';
 
-  configureFlags= "--with-ssl=${openssl} ${optionalString enableHipe "--enable-hipe"} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"} ${optionalString javacSupport "--with-javac"}";
+  configureFlags= [
+    "--with-ssl=${openssl}"
+  ] ++ optional enableHipe "--enable-hipe"
+    ++ optional wxSupport "--enable-wx"
+    ++ optional odbcSupport "--with-odbc=${unixODBC}"
+    ++ optional javacSupport "--with-javac"
+    ++ optional stdenv.isDarwin "--enable-darwin-64bit";
 
   postInstall = let
     manpages = fetchurl {

From 8dba95502db088546eafc74897c9cde7caef15cc Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 18 Jun 2015 11:09:03 +0200
Subject: [PATCH 1289/2322] wxmac: fixed impure libiconv, closes #8367

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

diff --git a/pkgs/development/libraries/wxmac/default.nix b/pkgs/development/libraries/wxmac/default.nix
index 1437f8c807e..9734fd358ea 100644
--- a/pkgs/development/libraries/wxmac/default.nix
+++ b/pkgs/development/libraries/wxmac/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, setfile, rez, derez,
-  expat, libjpeg, libpng, libtiff, zlib
+  expat, libiconv, libjpeg, libpng, libtiff, zlib
 }:
 
 with stdenv.lib;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./wx.patch ];
 
-  buildInputs = [ setfile rez derez expat libjpeg libpng libtiff zlib ];
+  buildInputs = [ setfile rez derez expat libiconv libjpeg libpng libtiff zlib ];
 
   configureFlags = [
     "--enable-unicode"

From 4ed0a4eaf857e228ad5af95eed3beb40931ca3cd Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 15 Jun 2015 00:55:24 +0200
Subject: [PATCH 1290/2322] add pkg: vbam, closes #8339

---
 pkgs/misc/emulators/vbam/default.nix | 59 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  4 ++
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/misc/emulators/vbam/default.nix

diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix
new file mode 100644
index 00000000000..9c79852a4aa
--- /dev/null
+++ b/pkgs/misc/emulators/vbam/default.nix
@@ -0,0 +1,59 @@
+{ stdenv
+, cairo
+, cmake
+, fetchsvn
+, ffmpeg
+, gettext
+, libpng
+, libpthreadstubs
+, libXdmcp
+, libxshmfence
+, mesa
+, openal
+, pkgconfig
+, SDL
+, wxGTK
+, zip
+, zlib
+}:
+
+stdenv.mkDerivation {
+  name = "VBAM-1507";
+  src = fetchsvn {
+    url = "svn://svn.code.sf.net/p/vbam/code/trunk";
+    rev = 1507;
+    sha256 = "0fqvgi5s0sacqr9yi7kv1klqlvfzr13sjq5ikipirz0jv50kjxa7";
+  };
+
+  buildInputs = [
+    cairo
+    cmake
+    ffmpeg
+    gettext
+    libpng
+    libpthreadstubs
+    libXdmcp
+    libxshmfence
+    mesa
+    openal
+    pkgconfig
+    SDL
+    wxGTK
+    zip
+    zlib
+  ];
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE='Release'"
+    "-DENABLE_FFMPEG='true'"
+    #"-DENABLE_LINK='true'" currently broken :/
+    "-DSYSCONFDIR='$out/etc'"
+  ];
+
+  meta = {
+    description = "A merge of the original Visual Boy Advance forks";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.lassulus ];
+    homepage = http://vba-m.com/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab01a5ccbf6..beb11e03d7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14710,6 +14710,10 @@ let
 
   utf8proc = callPackage ../development/libraries/utf8proc { };
 
+  vbam = callPackage ../misc/emulators/vbam {
+    inherit (xlibs) libpthreadstubs;
+  };
+
   vice = callPackage ../misc/emulators/vice {
     libX11 = xlibs.libX11;
     giflib = giflib_4_1;

From 4e78d76c18ce4e4f30b66781c4a519de6b699de7 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 16 Jun 2015 22:20:25 +0900
Subject: [PATCH 1291/2322] thunderbird-bin: update to version 38.0.1, closes
 #8357

---
 .../mailreaders/thunderbird-bin/default.nix   |  22 +-
 .../mailreaders/thunderbird-bin/sources.nix   | 228 +++++++++---------
 pkgs/top-level/all-packages.nix               |   4 +-
 3 files changed, 128 insertions(+), 126 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 23e4f397e82..a5806b7dfe8 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -19,7 +19,10 @@
 , kerberos
 , libX11
 , libXScrnSaver
+, libXcomposite
+, libXdamage
 , libXext
+, libXfixes
 , libXinerama
 , libXrender
 , libXt
@@ -88,7 +91,10 @@ stdenv.mkDerivation {
       kerberos
       libX11
       libXScrnSaver
+      libXcomposite
+      libXdamage
       libXext
+      libXfixes
       libXinerama
       libXrender
       libXt
@@ -112,25 +118,15 @@ stdenv.mkDerivation {
       ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/"
 
       for executable in \
-        thunderbird mozilla-xremote-client thunderbird-bin plugin-container \
-        updater
+        thunderbird crashreporter thunderbird-bin plugin-container updater
       do
         patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
           "$out/usr/lib/thunderbird-bin-${version}/$executable"
       done
 
-      for executable in \
-        thunderbird mozilla-xremote-client thunderbird-bin plugin-container \
-        updater \
-        components/libdbusservice.so components/libmozgnome.so \
-        libnssdbm3.so libsmime3.so libxul.so libprldap60.so libnss3.so \
-        libplc4.so libfreebl3.so libmozsqlite3.so libmozalloc.so libnspr4.so \
-        libssl3.so libldif60.so libsoftokn3.so libldap60.so libnssutil3.so \
-        libnssckbi.so libplds4.so
-      do
+      find . -executable -type f -exec \
         patchelf --set-rpath "$libPath" \
-          "$out/usr/lib/thunderbird-bin-${version}/$executable"
-      done
+          "$out/usr/lib/thunderbird-bin-${version}/{}" \;
 
       # Create a desktop item.
       mkdir -p $out/share/applications
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index 8dce20f60da..66f2fa87e39 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -4,117 +4,123 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "31.7.0";
+  version = "38.0.1";
   sources = [
-    { locale = "ar"; arch = "linux-i686"; sha1 = "8d5dd6af05d9a285097db7f96372464e2c48a7fe"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "07866e3716bc3bd370e4aa4711ee2882be8380b9"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "f9c353e03792ade2c3df9842bad6707c50b59395"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "ecbfaa883c2dda597213ca739e92c30ec9c2eac1"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "ac1abca375cfbc2e45b7eb0f66b9cef73924ae4e"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "5f296643c42890a200416678a6ed8240ee219d9f"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "4b59b171b67641097da95fd76113efe1019fd2aa"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "13d5124fd8925de174f83a8075fb711aa14438b7"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "833c826ee2be3c8664060d4ad24c508b5c122a5e"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "b29fb50d9eb83e98802655236a6c1ccb56bf6be3"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "5985c09eab409db0c62e525e9cd3d7469b82f0e1"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "2e4e3efe1d89b8cf329a64894807b69555e505e2"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "1a81aabe1ded11bde92349e8b9f5ae499aaebdfa"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "406212f107939a627f2166d8fc6a72a0dcff56a4"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "6cc272e25d45e54c6008da968884de039eba9db9"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "6f7e54ff4fe7d8bfa477475aaad371fc8b2f85d4"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "8f944829ef98bfdb46eadfd10fafe75a353c1a4a"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "f22e4293a3462effa0a928be3ae1ddbd8273450f"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "c115ea9356b457b25526c8469ebcf7a8e1c6241a"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "04ac40b3e10f96e17db70c9541040970cbe2e480"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "b0ccb81db2b8cb505ade10a0fc1eaf4322f7de0d"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "410da87c432e3d4e4ddfbe4912bc00c8fcfb8dfd"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "b91bea9a1813f1772a85873fb712c9857234864f"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "f6a08558fb3b6ebd79fdf9b359286b7ba58f2a9c"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "b433601ffdf83cc2a90224f683f627f562d8e3e3"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "68624fead16c459f87cbdeefd75326bcabccd805"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "14c4a6abb6269dea926efccfdae41d2eeab9031a"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "ffd800950b8a768d4e7ec4c8666fc2e7a390a080"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "61889cee58be7c5da0f3424faae5192f07d31651"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "360335d5c3a1eccaba29095f88d9b50dc04fbc6d"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "ba1e1dbcb1c0c87ba1c916b1053cf876e42d76bf"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "c40a2e0c70d3c3af5e0c34045864a7279f95b2fa"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "45c6270bb1350799df089620cdae4919833d5a54"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "ee8cacf035658fda1605f3a2968c56fa03cd73d4"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "45329cd3222d74cefaa0e96e18b71b6ddc844e77"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "47c1ec1e67829a86111a76f6ea6cb40c9f178066"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "1f2e1edbb49f141c1ac63f20e47bc4bcbe0361f4"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "cf70711b4fb6130b31d3286ad1b2a102d5cb8fc5"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "938ee57e657b3b2f0a228bc1dc7a9bc2eebee1cc"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "5c807541fa4e232b6b5119cbc482a79dd9e4f54e"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "6f2ef03c505f4936f6263b643bbfd6e0befd54f4"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "7246ed88b0c3f504ca0043f3f20c5cc86eea8ac6"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "130f7ae3c0127d00e24946e9ec2558161fd3fcf1"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "aed0e1e7e699c6df4538663dc6a0556a106cb35f"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "69fca12c63c023f689463de709db731073a3c812"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "45ab4866e3f6989e4a08920564292622abea7f97"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "2898eed89af21c6a4122937bf596b97828cb9271"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "a3fb3b8564fcbe8cad29d430665d3f369d765369"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "143d8dcbccd3ad219330d7389e93597cb98d20f8"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "3fdc0095646678c2885e374e277ab50c4a4ffe53"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "4c135cfaa8644fab4558d53eb7f5f0ae53ed3704"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "a4faeb5aa6dc7f6a16d436a56ef9f954c80271fd"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "f3e60e515fa20c4092ecf4df64970bc750c849e5"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "2d6ea4a41a33db4e2aeb67d7bcd38f32f427f757"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "cd97780c5f70dca5e9c2a61e9af11f38f79b014b"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "da2ae751b6b0dd2caf5c54fcd30560a57c6746cb"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "f6f3b56e8b134e93e30ecfcf706e9ddbb9b181cc"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "a922a569b293005e5efc797bf51e0c33e87cea7f"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "2643526d774e44fc41b0b7b6872ba683b01a9c77"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "e91689f635060087f8c8c9806ac1607a59e26776"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "dafca3f2c34ae417b5bd3065026af4a075c9bee7"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "6a1d03062d599ea35af8479dea3e6cfc45840ba1"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "9b92baecd3906b35499513723685cd791e1aab9e"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "116c8b02f8be6c739595cc88888a19e225ed865d"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "85f44f77cc27deb9cf95487a9a3673918f102bd9"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "0bd82afbe4c27318ce8882eff62e53fda13d3590"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "07cd4e46a5811096759c565bb533adf1ee9cb0d9"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "ece8a8b69aef74f9c22db1660a14ae5205aa7ff7"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "1f1e30f5aef29bf96d0e2b8609acb03d1b6ec0aa"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "5a0ffeb38b183b835966568c1b3fc719c0908fea"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "9bbb5e61eecf09d059cfb17bd75fd0e64c455d78"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "e1115c4451ede51833387ef8c592ce7342d508d3"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "65dcef7d9bfcdbd35a09ff6a9e436261b79e4d90"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "cd64fb45459e699e0c8c2269a52bb0512e592db0"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "ea2650cb700a42dc96fb56ad1860061e87626bc9"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "976a52d128e8d912363fadb7e14adec0a7c9d973"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "323b876b6c11c4881c280cdb64d2867076970abf"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "952d5b82b0d3d47d5494f2d9667fc2a5b88408df"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "5ce1feb2446c6dba96c3b3a0e9afd6a00655b738"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "83115d2fdc8494451b79cc67d581c77b64c27af4"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "a26678482d8c425f3291116e99e0196952d0cb09"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "327391e44d43d58b4d3fee97904a336f5c52648e"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "8b67f03c053f89af7d50331eec056402cfbd5bf4"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "15ec5c6fa7e6aa843910bc6c6479bf308393b52f"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "09127b5202cf63c7b9715813061ca79bc27c2f37"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "8b409350741edcd33b3eeaf7928a133eb1c2a399"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "733d049ffd66d5007ef68c761f2d84ab579bd400"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "dc5460e82bdf613e9d778687d11533dc97b77ffb"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "b4b9b10b53c48adf224507faf77a04c19c750d58"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "81aeb1d95fd2b220c17f388ba882127fc6d290de"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "a621f04b7e5accf05f946ce775391667579679e6"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "f9086f1ce56d84e3b732f22d086fcce43d2373a7"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "1b2b11fd04b7d1979f88268db37510ef231c158b"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "f06ad4d533c7144695fbe2eb3ba700bb1d5151b7"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "92d4cd9bbc5f24045295bda6c75420708d593aac"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "53e661b5c485fae7c27770d2a2701d6d21e481c9"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "e4614597ef42eaa6ede065b4c3b9f11de491dd5b"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "e3c8af45ab65e7977a350ae617cd55afa685e8d0"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "17b3d419fe769a02a360b96042c78c497063b9e8"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "cbc34ab650bfc95926b98e63c474f1997a1256fa"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "ba63efda6864a6984d492cda30d4fca6157e26a8"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "9b8cb45aab578b3dbfeace90f44dad26eda6e798"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "36a9867155fa0e6924ed62d7dbc350a2425178e1"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "abbc155c34c5d404b3143ccc63a1bb5c99c3d395"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "850ac8190adef8d227166b9b4478ea8c88c90287"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "afba1f0043ba96a89bc8ab23fe6b6e19af4f826b"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "acda86b5c48b751eb06719754921e7604a1c222e"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "a88745a4a8f85d5d2861e40ba8d72b0af73bb055"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "c03e6e4fae7fec1ae0b30e5cb600a4cf28151cc7"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "c5788c6672b230681cfb3ee2fe97763ef81d34b1"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "b61125483c46602e64ab7c4b56ff2f9612453ad3"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "4ac5de506c61fc769e6805f599cb7131b243812c"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "07ea0b98e651e650d2f11322b5c8ce55bb083217"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "b0b37462e0bb5443f408724b62421e59ae68389b"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "61feae6377bcca63225ba945b7067dad8eb5a0fa"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "b58385f605b7a08f17e06faa922899c42a2076c0"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "ddbb0681076511828c91373354aa9a3861ee3943"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "734acaa1870773d9ccf687e65d553797b3d00bca"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "32ad3307c919ec10bcbb9f99f8d37bb5daec5903"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "4e87b8ff753b1680b0b9b5149fc75238bff91c6d"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "b319d6f853311b103c439a482ee12652d751e22f"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "0254d1edcc2b1fbc8cec01c96482c381d34be88b"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "deb0caf34895379b2e7dd01871c510f92ba96561"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "f580f9044bb115b3077ba012fe1b3be289853911"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "045f3d7adade1133325e6607971ec70cad85c91a"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "9fc2fa5a44886db96bcdb4d23d69593954a84ca2"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "6fb9ca5be336db1b149e4ac6e53e51fd32fbd84e"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "517dfd262c4f23fba743299381f51f7863cd32d7"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "bdd5d63545fb09540a5ff8ada7d421deb865dc61"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "fa4f26001b4281f4bd9b741a897e1a420c40b604"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "566603c44ba6df21d7504bfb49ea235f5cb64e00"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "60675d5905838ac54c0c2a961d88d021c446ec50"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "74feac72b6ad05b00a6c4495f751f106b77b3997"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "fbb936459a2287117e5638ef78ba1d647f4be41f"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "eedbcc1df60912b2f5be83dc2459cd06914b91f5"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "ead82b60f2b07a63ff84ed6f35f9527c1b030c24"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "17ed78e8f063f39a7c73795e9a251f187dc2a04c"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "42f427fe628cbc182459f66a7d87d78845d50e57"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "9f264dbd88d96149a92601e33dbed497189b281d"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "a8df74c9655501ee9e4c876b05e14b9a2605a591"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "4e467b8e662345bba07ec768055899175823764b"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "96994e1c9b6e8d27d1b7bf91a2d0d47b25d67bcb"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "db1574237be55846c386138b55beacf247cdf8b8"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "1e474e7001a14bfba44e933cca875b10032b22fc"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "3385f3aa8432a66b4f400158ba079808a0982c6b"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "aad77f411f5c3a6161bbb6b80566d9065e15c8a0"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "98820960354c89dc9e7178b3c783df733597ef27"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "77c3946d778ccea30f22a08f38d5336110d87d43"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "63c7a82cbfc8d5c52424244ccab51868aa498416"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "a590ff89b5616463ce32091c09c0b74d6f6a8773"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "4e7902977f83139926131db13731632a9c4e105c"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "2d7a1e725ae2aad6dfcc2e9d891999a40a242fe9"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "fad0d47e75d9191d85d5d1e6bf2f9f4f5ec08fb2"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "ab42e792567affd3007848822eb26afc2bea0e94"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "3faa798e14f9acd36a120b9f4e9c961c27df825c"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "afe90e25771a101286365d37470f00c52a8f2392"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "aed0d96aa093a9f168c702d4e1c39d5c6077df3b"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "e3faf40265be42ca2c0412a97b4ac689c9d5d6a4"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "1ef2f1f69c042a2aeb340df9faf9019df19dbf35"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "bc026a910ea03aa795d59d81836ec5dd6efb1370"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "87a2923688d5a9eb63b8a41200ba5afc6c00d954"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "5067560a1a56d6cbbb163d2b73bce68451956413"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "74605669d56d0cc6e93fecce04d52771680f39f6"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "d749c4ad35a02c01e50358d11a1d7034ad402bce"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "1e0a75dfa4627afa34e2348c71c64501b6ebac12"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "43f703566076db2e3b08703d6e3faac336ffff88"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "b1bc08f9fd116d022c9c2710a9e25d176a1ee2a7"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "8fe7b6923d46f30ffbac5a97fe9bde7625a9bc26"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "93f2e69df2c32eb2c33d9a6bf91c00224f5de9e8"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "52341cf14ddb124bd591f161eb2c3c566307e6c0"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "733d6833cb71d5bd6727991c76f7907b4efeb1c9"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "2a5fe37753a3399ea8626615493fe3cac4b79586"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "0d1bf6bf337598d6e72762716264cb2662ab542c"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "5dbe72779e2c58cb0d0224e08582cfb1358fc47b"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "7bf51283965c48dad5aac2bffbd8223e83bc5c6f"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "2634b404ca6a9f6a3a194c911ca514311646461f"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "82ed3c27de426361f2cb73c9a34197d2548546d5"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "9e9a0eda6fd9354a06071b580686a5387ad291ec"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "e1416907d5748d10a5b0e74c4687787e7343db57"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "629ad488888ad62e60bd340e17d565af76b48337"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "d58c886482404929c18fe25cf3aece121eb6a8e7"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "e0cfc0a747aae13cf5cf54db6b72e72a5780372f"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "a2e5612b0007a11f74cb3fe330e2234d84f5d35c"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "eba10f9d0de6b9937f297ec742e05df53460bfec"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "a1ce06ca18bf93ff87c91fd8677dbe06eadf1159"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "180b531bf58f08d89c668b578a3c7c5380900f9f"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "484546422728623005a2d20470c7f6d06870ce96"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "f4526c827dcf1d0a11d38bd834807eb4b7f2923f"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "c75275e6a8a19213ea5eb063c8988634bbbe13cc"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "0fce05e81e0bb2bf6f7ce051cdee10ceaaaee4cb"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "6d8657b489008122b0a3dabc3b9bb5112529ae16"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "b5eff0843c96947d5aa7f7f74ec899630cb9e039"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "f2359b80b8afad50aab695d3cc14e461c21e46e3"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "b946a90928e0c7a389dbcf5728c08e7fc5042025"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "dbc60c45551b8db4be970efed6a397bf81d108e6"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "77c53b3a401dbfc930f2c5d94ebe6f1a090954e7"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "290f420ba933251168dce7c8e588541cdec886da"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "7c40435683e29fd3c7b541cd3ed2a69e39a14245"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "93d016bd3dfbd8b7ad4d8eceb94a638f6e66e751"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "2d05ef4da4eac47ee2b37d9d207a20b875ab6c3f"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "4c80bf8509b725c861ee744676e5f8229edd9acd"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "60406c09cef691b892dfffffe05d06182a0f5b03"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "f7f98b929f290a757dcd67d2f0abc09272e1524f"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "f73185d1c4d78247154ff4133092f12bcace0189"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "bc78cf179d1145771bc3d76808f47c3074aa848f"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "b6cd85fe49e367d36f75c89596cc6826de936c03"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "cc7468c85efaae4ad8f3c4dd629c07420095d6b7"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "51236372848448ad80210d340ba5f03b851b1434"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "1cd44cdb36f17d922b04e6f1f31721495b30d9a8"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "604de9669330503ea07e24d6f65c2586c6748730"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "ea9f909fd9b7c9125fc109db81ed313bad19ca26"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "d71c0b6d31940f24562a74b30349ecd4645b0ee9"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "0c4193b4dc6eae8b5f9515ca8a534f127ee083d8"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "cd254aabf8c7cf63c83bec1005ef0e9f540eed7c"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "9944dd6c0cb20bcd8f513c0cdabe62245b0212dc"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "7452f16a96293f871ac9ac99b37f7b855b8e2acf"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "2036043c9edcaf3e85c2c9b33ae4166d339c3185"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "6b4018c8c4f6f6161f51b1fd629fa5c0ddf452d2"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "af09c61146d407ab2e6baa3f71ce859a246cb559"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "8b41790e1c6941c1b46c1e06b21c6254fee49c51"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "fbaee422c7746c10e2537fbc8fdf86d322e49a6c"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "65d5ce60fc3848c46b88c5e7229e25f412e1d5bf"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "b865c22c6c60d21ba00a60a54a9d03a5c34254cf"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "648dec573c9d0f680be469bad8b38fe6d3550899"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "b3f58a6053079be6231f843f05daf481c39edf6d"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "bab9d483870909d705fa77bcfb9d8c08966bae50"; }
   ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index beb11e03d7b..e232a8a52bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12608,8 +12608,8 @@ let
   thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin {
     gconf = pkgs.gnome.GConf;
     inherit (pkgs.gnome) libgnome libgnomeui;
-    inherit (pkgs.xlibs) libX11 libXScrnSaver libXext
-      libXinerama libXrender libXt;
+    inherit (pkgs.xlibs) libX11 libXScrnSaver libXcomposite libXdamage libXext
+      libXfixes libXinerama libXrender libXt;
   };
 
   tig = gitAndTools.tig;

From 2205847614a3b0fab586f58981b6899d631529fd Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 12 Jun 2015 15:10:26 +0200
Subject: [PATCH 1292/2322] ocaml-menhir: update from 20130116 to 20140422

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

diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix
index 0a73f8aa04a..5cf2f97e4b7 100644
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/pkgs/development/ocaml-modules/menhir/default.nix
@@ -5,11 +5,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "menhir-20130116";
+  name = "menhir-20140422";
 
   src = fetchurl {
-    url = http://pauillac.inria.fr/~fpottier/menhir/menhir-20130116.tar.gz;
-    sha256 = "65cd9e4f813c62697c60c344963ca11bd461169f574ba3a866c2691541cb4682";
+    url = http://pauillac.inria.fr/~fpottier/menhir/menhir-20140422.tar.gz;
+    sha256 = "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d";
   };
 
   buildInputs = [ocaml findlib];

From 2583b22573310b866348ab05564c3e37a409392c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 12 Jun 2015 15:28:34 +0200
Subject: [PATCH 1293/2322] frama-c: fix hash, closes #8308

---
 pkgs/development/tools/analysis/frama-c/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index b7c71475d6c..2132d1e19b4 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url    = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz";
-    sha256 = "0wackacnnpxnh3612ld68bal8b1dm9cdsi180lw42bsyks03h5mn";
+    sha256 = "0zask160vj8bxgc07dzxj5hqbdp6gz5g00j6za5397961imxhxaq";
   };
 
   why2 = fetchurl {

From d59aee74066239f9ed6ad8b187a73d71224041d9 Mon Sep 17 00:00:00 2001
From: Siarhei Zirukin <ftrvxmtrx@gmail.com>
Date: Tue, 9 Jun 2015 12:57:18 +0200
Subject: [PATCH 1294/2322] efl, elementary: 1.14.0 -> 1.14.1, closes #8242

---
 pkgs/desktops/e19/efl.nix        | 4 ++--
 pkgs/desktops/e19/elementary.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix
index 6fb262ac50a..7c2e0c3e378 100644
--- a/pkgs/desktops/e19/efl.nix
+++ b/pkgs/desktops/e19/efl.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";
-  version = "1.14.0";
+  version = "1.14.1";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz";
-    sha256 = "0sb2104b2rayr2ag0n3g8zqds9nxd53mlyvq7650c3cy8hws5a1h";
+    sha256 = "16rj4qnpw1ya0bsp9a69w6zjmmhzni7vnc0z4wg819jg5k2njzjf";
   };
 
   buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix
index 30d0761c99e..15bdc08b6d3 100644
--- a/pkgs/desktops/e19/elementary.nix
+++ b/pkgs/desktops/e19/elementary.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, e19, libcap, automake114x, autoconf, libdrm, gdbm }:
 stdenv.mkDerivation rec {
   name = "elementary-${version}";
-  version = "1.14.0";
+  version = "1.14.1";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz";
-    sha256 = "03h9sv5c3473wxf7hcimdf80d2phxl81yv0kzngx4g1b6cdwl1ma";
+    sha256 = "100bfzw6q57dnzcqg4zm0rqpvkk7zykfklnn6kcymv80j43xg0p1";
   };
   buildInputs = [ pkgconfig e19.efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
   NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ];

From 801a392932b1cdfd00b7f9b6b9d5714598d9ea28 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Tue, 16 Jun 2015 01:52:16 -0700
Subject: [PATCH 1295/2322] groovebasin: init at 1.5.1

---
 .../audio/groovebasin/default.nix             |   64 +
 .../audio/groovebasin/package.nix             | 4396 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |    2 +
 3 files changed, 4462 insertions(+)
 create mode 100644 pkgs/applications/audio/groovebasin/default.nix
 create mode 100644 pkgs/applications/audio/groovebasin/package.nix

diff --git a/pkgs/applications/audio/groovebasin/default.nix b/pkgs/applications/audio/groovebasin/default.nix
new file mode 100644
index 00000000000..e7ac20367dd
--- /dev/null
+++ b/pkgs/applications/audio/groovebasin/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchFromGitHub, makeWrapper, callPackage, libgroove, python, utillinux }:
+
+with stdenv.lib;
+
+let
+  nodePackages = callPackage (import ../../../top-level/node-packages.nix) {
+    neededNatives = [ libgroove python utillinux ];
+    self = nodePackages;
+    generated = ./package.nix;
+  };
+
+in nodePackages.buildNodePackage rec {
+  version = "1.5.1";
+  name = "groovebasin-${version}";
+
+  src = fetchFromGitHub {
+    owner = "andrewrk";
+    repo = "groovebasin";
+    rev = "${version}";
+    sha256 = "1g7v0qhvgzpb050hf45pibp68qd67hnnry5npw58f4dvaxdd8yhd";
+  };
+
+  deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
+
+  buildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    mkdir -p "$out/lib/node_modules/groovebasin/public"
+    stylus -o "$out/lib/node_modules/groovebasin/public/" -c --include-css "$out/lib/node_modules/groovebasin/src/client/styles"
+    browserify-lite "$out/lib/node_modules/groovebasin/src/client/app.js" --outfile "$out/lib/node_modules/groovebasin/public/app.js"
+    wrapProgram "$out/bin/groovebasin" --set NODE_PATH "$out/lib/node_modules/groovebasin/node_modules/"
+  '';
+
+  passthru.names = ["groovebasin"];
+
+  meta = {
+    description = "Music player server with a web-based user interface";
+    homepage = http://groovebasin.com/;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    longDescription = ''
+      Groove Basin runs on a server optionally connected to speakers. Guests can
+      control the music player by connecting with a laptop, tablet, or smart phone.
+      Further, users can stream their music libraries remotely.
+
+      Groove Basin comes with a fast, responsive web interface that supports keyboard
+      shortcuts and drag drop. It also provides the ability to upload songs,
+      download songs, and import songs by URL, including YouTube URLs.
+
+      Groove Basin supports Dynamic Mode which automatically queues random songs,
+      favoring songs that have not been queued recently.
+
+      Groove Basin automatically performs ReplayGain scanning on every song using
+      the EBU R128 loudness standard, and automatically switches between track
+      and album mode.
+
+      Groove Basin supports the MPD protocol, which means it is compatible with MPD
+      clients. There is also a more powerful Groove Basin protocol which you can
+      use if the MPD protocol does not meet your needs.
+
+      Groove Basin supports Last.fm scrobbling.
+    '';
+  };
+}
diff --git a/pkgs/applications/audio/groovebasin/package.nix b/pkgs/applications/audio/groovebasin/package.nix
new file mode 100644
index 00000000000..3f307cd32f0
--- /dev/null
+++ b/pkgs/applications/audio/groovebasin/package.nix
@@ -0,0 +1,4396 @@
+{ self, fetchurl, fetchgit ? null, lib }:
+
+{
+  by-spec."CSSselect"."~0.4.0" =
+    self.by-version."CSSselect"."0.4.1";
+  by-version."CSSselect"."0.4.1" = self.buildNodePackage {
+    name = "CSSselect-0.4.1";
+    version = "0.4.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz";
+      name = "CSSselect-0.4.1.tgz";
+      sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2";
+    };
+    deps = {
+      "CSSwhat-0.4.7" = self.by-version."CSSwhat"."0.4.7";
+      "domutils-1.4.3" = self.by-version."domutils"."1.4.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."CSSwhat"."0.4" =
+    self.by-version."CSSwhat"."0.4.7";
+  by-version."CSSwhat"."0.4.7" = self.buildNodePackage {
+    name = "CSSwhat-0.4.7";
+    version = "0.4.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz";
+      name = "CSSwhat-0.4.7.tgz";
+      sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."abbrev"."1" =
+    self.by-version."abbrev"."1.0.7";
+  by-version."abbrev"."1.0.7" = self.buildNodePackage {
+    name = "abbrev-1.0.7";
+    version = "1.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz";
+      name = "abbrev-1.0.7.tgz";
+      sha1 = "5b6035b2ee9d4fb5cf859f08a9be81b208491843";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."abstract-leveldown"."~2.2.1" =
+    self.by-version."abstract-leveldown"."2.2.2";
+  by-version."abstract-leveldown"."2.2.2" = self.buildNodePackage {
+    name = "abstract-leveldown-2.2.2";
+    version = "2.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.2.2.tgz";
+      name = "abstract-leveldown-2.2.2.tgz";
+      sha1 = "ecaff98c20641422710ab04b01e8f04d6b64fe77";
+    };
+    deps = {
+      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."accepts"."~1.2.7" =
+    self.by-version."accepts"."1.2.9";
+  by-version."accepts"."1.2.9" = self.buildNodePackage {
+    name = "accepts-1.2.9";
+    version = "1.2.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/accepts/-/accepts-1.2.9.tgz";
+      name = "accepts-1.2.9.tgz";
+      sha1 = "76e9631d05e3ff192a34afb9389f7b3953ded001";
+    };
+    deps = {
+      "mime-types-2.1.1" = self.by-version."mime-types"."2.1.1";
+      "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."amdefine".">=0.0.4" =
+    self.by-version."amdefine"."0.1.1";
+  by-version."amdefine"."0.1.1" = self.buildNodePackage {
+    name = "amdefine-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz";
+      name = "amdefine-0.1.1.tgz";
+      sha1 = "b5c75c532052dccd6a39c0064c772c8d57a06cd2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi-regex"."^1.0.0" =
+    self.by-version."ansi-regex"."1.1.1";
+  by-version."ansi-regex"."1.1.1" = self.buildNodePackage {
+    name = "ansi-regex-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz";
+      name = "ansi-regex-1.1.1.tgz";
+      sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi-regex"."^1.1.0" =
+    self.by-version."ansi-regex"."1.1.1";
+  by-spec."ansi-styles"."^2.0.1" =
+    self.by-version."ansi-styles"."2.0.1";
+  by-version."ansi-styles"."2.0.1" = self.buildNodePackage {
+    name = "ansi-styles-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz";
+      name = "ansi-styles-2.0.1.tgz";
+      sha1 = "b033f57f93e2d28adeb8bc11138fa13da0fd20a3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."asn1"."0.1.11" =
+    self.by-version."asn1"."0.1.11";
+  by-version."asn1"."0.1.11" = self.buildNodePackage {
+    name = "asn1-0.1.11";
+    version = "0.1.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
+      name = "asn1-0.1.11.tgz";
+      sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."assert-plus"."^0.1.5" =
+    self.by-version."assert-plus"."0.1.5";
+  by-version."assert-plus"."0.1.5" = self.buildNodePackage {
+    name = "assert-plus-0.1.5";
+    version = "0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
+      name = "assert-plus-0.1.5.tgz";
+      sha1 = "ee74009413002d84cec7219c6ac811812e723160";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async"."~0.9.0" =
+    self.by-version."async"."0.9.2";
+  by-version."async"."0.9.2" = self.buildNodePackage {
+    name = "async-0.9.2";
+    version = "0.9.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz";
+      name = "async-0.9.2.tgz";
+      sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."aws-sign2"."~0.5.0" =
+    self.by-version."aws-sign2"."0.5.0";
+  by-version."aws-sign2"."0.5.0" = self.buildNodePackage {
+    name = "aws-sign2-0.5.0";
+    version = "0.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
+      name = "aws-sign2-0.5.0.tgz";
+      sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."base64url"."0.0.3" =
+    self.by-version."base64url"."0.0.3";
+  by-version."base64url"."0.0.3" = self.buildNodePackage {
+    name = "base64url-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64url/-/base64url-0.0.3.tgz";
+      name = "base64url-0.0.3.tgz";
+      sha1 = "50c20edac277dde1a0b15059954ced7a2d102d57";
+    };
+    deps = {
+      "tap-0.3.3" = self.by-version."tap"."0.3.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."base64url"."~0.0.4" =
+    self.by-version."base64url"."0.0.6";
+  by-version."base64url"."0.0.6" = self.buildNodePackage {
+    name = "base64url-0.0.6";
+    version = "0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64url/-/base64url-0.0.6.tgz";
+      name = "base64url-0.0.6.tgz";
+      sha1 = "9597b36b330db1c42477322ea87ea8027499b82b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."base64url"."~1.0.4" =
+    self.by-version."base64url"."1.0.4";
+  by-version."base64url"."1.0.4" = self.buildNodePackage {
+    name = "base64url-1.0.4";
+    version = "1.0.4";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64url/-/base64url-1.0.4.tgz";
+      name = "base64url-1.0.4.tgz";
+      sha1 = "29a2a7ade9791fbb25f312ab35a2fd3126ceac0e";
+    };
+    deps = {
+      "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10";
+      "meow-2.0.0" = self.by-version."meow"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bindings"."~1.2.1" =
+    self.by-version."bindings"."1.2.1";
+  by-version."bindings"."1.2.1" = self.buildNodePackage {
+    name = "bindings-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
+      name = "bindings-1.2.1.tgz";
+      sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bl"."~0.9.0" =
+    self.by-version."bl"."0.9.4";
+  by-version."bl"."0.9.4" = self.buildNodePackage {
+    name = "bl-0.9.4";
+    version = "0.9.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz";
+      name = "bl-0.9.4.tgz";
+      sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7";
+    };
+    deps = {
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bl"."~0.9.4" =
+    self.by-version."bl"."0.9.4";
+  by-spec."bluebird"."^2.9.26" =
+    self.by-version."bluebird"."2.9.30";
+  by-version."bluebird"."2.9.30" = self.buildNodePackage {
+    name = "bluebird-2.9.30";
+    version = "2.9.30";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.30.tgz";
+      name = "bluebird-2.9.30.tgz";
+      sha1 = "edda875ec9aad1f29cf1f56d6e82fbab2b0df556";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."boom"."0.4.x" =
+    self.by-version."boom"."0.4.2";
+  by-version."boom"."0.4.2" = self.buildNodePackage {
+    name = "boom-0.4.2";
+    version = "0.4.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
+      name = "boom-0.4.2.tgz";
+      sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
+    };
+    deps = {
+      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."boom"."2.x.x" =
+    self.by-version."boom"."2.8.0";
+  by-version."boom"."2.8.0" = self.buildNodePackage {
+    name = "boom-2.8.0";
+    version = "2.8.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/boom/-/boom-2.8.0.tgz";
+      name = "boom-2.8.0.tgz";
+      sha1 = "317bdfd47018fe7dd79b0e9da73efe244119fdf1";
+    };
+    deps = {
+      "hoek-2.14.0" = self.by-version."hoek"."2.14.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."browserify-lite"."~0.2.4" =
+    self.by-version."browserify-lite"."0.2.4";
+  by-version."browserify-lite"."0.2.4" = self.buildNodePackage {
+    name = "browserify-lite-0.2.4";
+    version = "0.2.4";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browserify-lite/-/browserify-lite-0.2.4.tgz";
+      name = "browserify-lite-0.2.4.tgz";
+      sha1 = "00a32f466c8f3dbbd1074250fd0aa775716ab140";
+    };
+    deps = {
+      "pend-1.2.0" = self.by-version."pend"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "browserify-lite" = self.by-version."browserify-lite"."0.2.4";
+  by-spec."buffer-crc32"."~0.2.3" =
+    self.by-version."buffer-crc32"."0.2.5";
+  by-version."buffer-crc32"."0.2.5" = self.buildNodePackage {
+    name = "buffer-crc32-0.2.5";
+    version = "0.2.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz";
+      name = "buffer-crc32-0.2.5.tgz";
+      sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."buffer-equal"."~0.0.0" =
+    self.by-version."buffer-equal"."0.0.1";
+  by-version."buffer-equal"."0.0.1" = self.buildNodePackage {
+    name = "buffer-equal-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz";
+      name = "buffer-equal-0.0.1.tgz";
+      sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."buffer-equal-constant-time"."^1.0.1" =
+    self.by-version."buffer-equal-constant-time"."1.0.1";
+  by-version."buffer-equal-constant-time"."1.0.1" = self.buildNodePackage {
+    name = "buffer-equal-constant-time-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz";
+      name = "buffer-equal-constant-time-1.0.1.tgz";
+      sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bunker"."0.1.X" =
+    self.by-version."bunker"."0.1.2";
+  by-version."bunker"."0.1.2" = self.buildNodePackage {
+    name = "bunker-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz";
+      name = "bunker-0.1.2.tgz";
+      sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c";
+    };
+    deps = {
+      "burrito-0.2.12" = self.by-version."burrito"."0.2.12";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."burrito".">=0.2.5 <0.3" =
+    self.by-version."burrito"."0.2.12";
+  by-version."burrito"."0.2.12" = self.buildNodePackage {
+    name = "burrito-0.2.12";
+    version = "0.2.12";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz";
+      name = "burrito-0.2.12.tgz";
+      sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b";
+    };
+    deps = {
+      "traverse-0.5.2" = self.by-version."traverse"."0.5.2";
+      "uglify-js-1.1.1" = self.by-version."uglify-js"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."camelcase"."^1.0.1" =
+    self.by-version."camelcase"."1.1.0";
+  by-version."camelcase"."1.1.0" = self.buildNodePackage {
+    name = "camelcase-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz";
+      name = "camelcase-1.1.0.tgz";
+      sha1 = "953b25c3bc98671ee59a44cb9d542672da7331b9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."camelcase-keys"."^1.0.0" =
+    self.by-version."camelcase-keys"."1.0.0";
+  by-version."camelcase-keys"."1.0.0" = self.buildNodePackage {
+    name = "camelcase-keys-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz";
+      name = "camelcase-keys-1.0.0.tgz";
+      sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec";
+    };
+    deps = {
+      "camelcase-1.1.0" = self.by-version."camelcase"."1.1.0";
+      "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."caseless"."~0.10.0" =
+    self.by-version."caseless"."0.10.0";
+  by-version."caseless"."0.10.0" = self.buildNodePackage {
+    name = "caseless-0.10.0";
+    version = "0.10.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/caseless/-/caseless-0.10.0.tgz";
+      name = "caseless-0.10.0.tgz";
+      sha1 = "ed6b2719adcd1fd18f58dc081c0f1a5b43963909";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."caseless"."~0.8.0" =
+    self.by-version."caseless"."0.8.0";
+  by-version."caseless"."0.8.0" = self.buildNodePackage {
+    name = "caseless-0.8.0";
+    version = "0.8.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz";
+      name = "caseless-0.8.0.tgz";
+      sha1 = "5bca2881d41437f54b2407ebe34888c7b9ad4f7d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."caseless"."~0.9.0" =
+    self.by-version."caseless"."0.9.0";
+  by-version."caseless"."0.9.0" = self.buildNodePackage {
+    name = "caseless-0.9.0";
+    version = "0.9.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz";
+      name = "caseless-0.9.0.tgz";
+      sha1 = "b7b65ce6bf1413886539cfd533f0b30effa9cf88";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."chalk"."^1.0.0" =
+    self.by-version."chalk"."1.0.0";
+  by-version."chalk"."1.0.0" = self.buildNodePackage {
+    name = "chalk-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz";
+      name = "chalk-1.0.0.tgz";
+      sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc";
+    };
+    deps = {
+      "ansi-styles-2.0.1" = self.by-version."ansi-styles"."2.0.1";
+      "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
+      "has-ansi-1.0.3" = self.by-version."has-ansi"."1.0.3";
+      "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
+      "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."charm"."0.1.x" =
+    self.by-version."charm"."0.1.2";
+  by-version."charm"."0.1.2" = self.buildNodePackage {
+    name = "charm-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz";
+      name = "charm-0.1.2.tgz";
+      sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cheerio"."^0.18.0" =
+    self.by-version."cheerio"."0.18.0";
+  by-version."cheerio"."0.18.0" = self.buildNodePackage {
+    name = "cheerio-0.18.0";
+    version = "0.18.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cheerio/-/cheerio-0.18.0.tgz";
+      name = "cheerio-0.18.0.tgz";
+      sha1 = "4e1c06377e725b740e996e0dfec353863de677fa";
+    };
+    deps = {
+      "CSSselect-0.4.1" = self.by-version."CSSselect"."0.4.1";
+      "entities-1.1.1" = self.by-version."entities"."1.1.1";
+      "htmlparser2-3.8.3" = self.by-version."htmlparser2"."3.8.3";
+      "dom-serializer-0.0.1" = self.by-version."dom-serializer"."0.0.1";
+      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."clarinet"."~0.8.1" =
+    self.by-version."clarinet"."0.8.1";
+  by-version."clarinet"."0.8.1" = self.buildNodePackage {
+    name = "clarinet-0.8.1";
+    version = "0.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/clarinet/-/clarinet-0.8.1.tgz";
+      name = "clarinet-0.8.1.tgz";
+      sha1 = "ddfd10cd292abf5cab239140774e394bfd1ee7a6";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."combined-stream"."~0.0.4" =
+    self.by-version."combined-stream"."0.0.7";
+  by-version."combined-stream"."0.0.7" = self.buildNodePackage {
+    name = "combined-stream-0.0.7";
+    version = "0.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
+      name = "combined-stream-0.0.7.tgz";
+      sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
+    };
+    deps = {
+      "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."combined-stream"."~0.0.5" =
+    self.by-version."combined-stream"."0.0.7";
+  by-spec."combined-stream"."~1.0.1" =
+    self.by-version."combined-stream"."1.0.5";
+  by-version."combined-stream"."1.0.5" = self.buildNodePackage {
+    name = "combined-stream-1.0.5";
+    version = "1.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
+      name = "combined-stream-1.0.5.tgz";
+      sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
+    };
+    deps = {
+      "delayed-stream-1.0.0" = self.by-version."delayed-stream"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."commander"."^2.8.1" =
+    self.by-version."commander"."2.8.1";
+  by-version."commander"."2.8.1" = self.buildNodePackage {
+    name = "commander-2.8.1";
+    version = "2.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz";
+      name = "commander-2.8.1.tgz";
+      sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
+    };
+    deps = {
+      "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."concat-stream"."~1.4.7" =
+    self.by-version."concat-stream"."1.4.10";
+  by-version."concat-stream"."1.4.10" = self.buildNodePackage {
+    name = "concat-stream-1.4.10";
+    version = "1.4.10";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz";
+      name = "concat-stream-1.4.10.tgz";
+      sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "typedarray-0.0.6" = self.by-version."typedarray"."0.0.6";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."connect-static"."~1.5.0" =
+    self.by-version."connect-static"."1.5.0";
+  by-version."connect-static"."1.5.0" = self.buildNodePackage {
+    name = "connect-static-1.5.0";
+    version = "1.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connect-static/-/connect-static-1.5.0.tgz";
+      name = "connect-static-1.5.0.tgz";
+      sha1 = "f8b455532e04de7c3dc7c1e062207f0b7a626ec7";
+    };
+    deps = {
+      "findit2-2.2.3" = self.by-version."findit2"."2.2.3";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "pend-1.2.0" = self.by-version."pend"."1.2.0";
+      "streamsink-1.2.0" = self.by-version."streamsink"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "connect-static" = self.by-version."connect-static"."1.5.0";
+  by-spec."content-disposition"."0.5.0" =
+    self.by-version."content-disposition"."0.5.0";
+  by-version."content-disposition"."0.5.0" = self.buildNodePackage {
+    name = "content-disposition-0.5.0";
+    version = "0.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz";
+      name = "content-disposition-0.5.0.tgz";
+      sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."content-disposition"."~0.5.0" =
+    self.by-version."content-disposition"."0.5.0";
+  "content-disposition" = self.by-version."content-disposition"."0.5.0";
+  by-spec."content-type"."~1.0.1" =
+    self.by-version."content-type"."1.0.1";
+  by-version."content-type"."1.0.1" = self.buildNodePackage {
+    name = "content-type-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz";
+      name = "content-type-1.0.1.tgz";
+      sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cookie"."0.1.2" =
+    self.by-version."cookie"."0.1.2";
+  by-version."cookie"."0.1.2" = self.buildNodePackage {
+    name = "cookie-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
+      name = "cookie-0.1.2.tgz";
+      sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cookie-signature"."1.0.6" =
+    self.by-version."cookie-signature"."1.0.6";
+  by-version."cookie-signature"."1.0.6" = self.buildNodePackage {
+    name = "cookie-signature-1.0.6";
+    version = "1.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz";
+      name = "cookie-signature-1.0.6.tgz";
+      sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cookies"."~0.5.0" =
+    self.by-version."cookies"."0.5.0";
+  by-version."cookies"."0.5.0" = self.buildNodePackage {
+    name = "cookies-0.5.0";
+    version = "0.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cookies/-/cookies-0.5.0.tgz";
+      name = "cookies-0.5.0.tgz";
+      sha1 = "164cac46a1d3ca3b3b87427414c24931d8381025";
+    };
+    deps = {
+      "keygrip-1.0.1" = self.by-version."keygrip"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "cookies" = self.by-version."cookies"."0.5.0";
+  by-spec."core-util-is"."~1.0.0" =
+    self.by-version."core-util-is"."1.0.1";
+  by-version."core-util-is"."1.0.1" = self.buildNodePackage {
+    name = "core-util-is-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
+      name = "core-util-is-1.0.1.tgz";
+      sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."crc"."3.2.1" =
+    self.by-version."crc"."3.2.1";
+  by-version."crc"."3.2.1" = self.buildNodePackage {
+    name = "crc-3.2.1";
+    version = "3.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz";
+      name = "crc-3.2.1.tgz";
+      sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cryptiles"."0.2.x" =
+    self.by-version."cryptiles"."0.2.2";
+  by-version."cryptiles"."0.2.2" = self.buildNodePackage {
+    name = "cryptiles-0.2.2";
+    version = "0.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
+      name = "cryptiles-0.2.2.tgz";
+      sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
+    };
+    deps = {
+      "boom-0.4.2" = self.by-version."boom"."0.4.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cryptiles"."2.x.x" =
+    self.by-version."cryptiles"."2.0.4";
+  by-version."cryptiles"."2.0.4" = self.buildNodePackage {
+    name = "cryptiles-2.0.4";
+    version = "2.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz";
+      name = "cryptiles-2.0.4.tgz";
+      sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285";
+    };
+    deps = {
+      "boom-2.8.0" = self.by-version."boom"."2.8.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."css-parse"."1.7.x" =
+    self.by-version."css-parse"."1.7.0";
+  by-version."css-parse"."1.7.0" = self.buildNodePackage {
+    name = "css-parse-1.7.0";
+    version = "1.7.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz";
+      name = "css-parse-1.7.0.tgz";
+      sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ctype"."0.5.3" =
+    self.by-version."ctype"."0.5.3";
+  by-version."ctype"."0.5.3" = self.buildNodePackage {
+    name = "ctype-0.5.3";
+    version = "0.5.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
+      name = "ctype-0.5.3.tgz";
+      sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."curlydiff"."~2.0.1" =
+    self.by-version."curlydiff"."2.0.1";
+  by-version."curlydiff"."2.0.1" = self.buildNodePackage {
+    name = "curlydiff-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/curlydiff/-/curlydiff-2.0.1.tgz";
+      name = "curlydiff-2.0.1.tgz";
+      sha1 = "6ac4b754ea5b63af2632022d03a152306f7eac0b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "curlydiff" = self.by-version."curlydiff"."2.0.1";
+  by-spec."debug"."*" =
+    self.by-version."debug"."2.2.0";
+  by-version."debug"."2.2.0" = self.buildNodePackage {
+    name = "debug-2.2.0";
+    version = "2.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
+      name = "debug-2.2.0.tgz";
+      sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
+    };
+    deps = {
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."debug"."~2.2.0" =
+    self.by-version."debug"."2.2.0";
+  by-spec."deep-equal"."~0.0.0" =
+    self.by-version."deep-equal"."0.0.0";
+  by-version."deep-equal"."0.0.0" = self.buildNodePackage {
+    name = "deep-equal-0.0.0";
+    version = "0.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
+      name = "deep-equal-0.0.0.tgz";
+      sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."deep-is"."0.1.x" =
+    self.by-version."deep-is"."0.1.3";
+  by-version."deep-is"."0.1.3" = self.buildNodePackage {
+    name = "deep-is-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
+      name = "deep-is-0.1.3.tgz";
+      sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."delayed-stream"."0.0.5" =
+    self.by-version."delayed-stream"."0.0.5";
+  by-version."delayed-stream"."0.0.5" = self.buildNodePackage {
+    name = "delayed-stream-0.0.5";
+    version = "0.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
+      name = "delayed-stream-0.0.5.tgz";
+      sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."delayed-stream"."~1.0.0" =
+    self.by-version."delayed-stream"."1.0.0";
+  by-version."delayed-stream"."1.0.0" = self.buildNodePackage {
+    name = "delayed-stream-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+      name = "delayed-stream-1.0.0.tgz";
+      sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."depd"."~1.0.1" =
+    self.by-version."depd"."1.0.1";
+  by-version."depd"."1.0.1" = self.buildNodePackage {
+    name = "depd-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz";
+      name = "depd-1.0.1.tgz";
+      sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."destroy"."1.0.3" =
+    self.by-version."destroy"."1.0.3";
+  by-version."destroy"."1.0.3" = self.buildNodePackage {
+    name = "destroy-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
+      name = "destroy-1.0.3.tgz";
+      sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."diacritics"."~1.2.1" =
+    self.by-version."diacritics"."1.2.1";
+  by-version."diacritics"."1.2.1" = self.buildNodePackage {
+    name = "diacritics-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/diacritics/-/diacritics-1.2.1.tgz";
+      name = "diacritics-1.2.1.tgz";
+      sha1 = "e4d323a7c564197f7af514c5964bd45d0eb8cf77";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."difflet"."~0.2.0" =
+    self.by-version."difflet"."0.2.6";
+  by-version."difflet"."0.2.6" = self.buildNodePackage {
+    name = "difflet-0.2.6";
+    version = "0.2.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz";
+      name = "difflet-0.2.6.tgz";
+      sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa";
+    };
+    deps = {
+      "traverse-0.6.6" = self.by-version."traverse"."0.6.6";
+      "charm-0.1.2" = self.by-version."charm"."0.1.2";
+      "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."dom-serializer"."0" =
+    self.by-version."dom-serializer"."0.1.0";
+  by-version."dom-serializer"."0.1.0" = self.buildNodePackage {
+    name = "dom-serializer-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
+      name = "dom-serializer-0.1.0.tgz";
+      sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
+    };
+    deps = {
+      "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
+      "entities-1.1.1" = self.by-version."entities"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."dom-serializer"."~0.0.0" =
+    self.by-version."dom-serializer"."0.0.1";
+  by-version."dom-serializer"."0.0.1" = self.buildNodePackage {
+    name = "dom-serializer-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz";
+      name = "dom-serializer-0.0.1.tgz";
+      sha1 = "9589827f1e32d22c37c829adabd59b3247af8eaf";
+    };
+    deps = {
+      "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
+      "entities-1.1.1" = self.by-version."entities"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."domelementtype"."1" =
+    self.by-version."domelementtype"."1.3.0";
+  by-version."domelementtype"."1.3.0" = self.buildNodePackage {
+    name = "domelementtype-1.3.0";
+    version = "1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
+      name = "domelementtype-1.3.0.tgz";
+      sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."domelementtype"."~1.1.1" =
+    self.by-version."domelementtype"."1.1.3";
+  by-version."domelementtype"."1.1.3" = self.buildNodePackage {
+    name = "domelementtype-1.1.3";
+    version = "1.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
+      name = "domelementtype-1.1.3.tgz";
+      sha1 = "bd28773e2642881aec51544924299c5cd822185b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."domhandler"."2.3" =
+    self.by-version."domhandler"."2.3.0";
+  by-version."domhandler"."2.3.0" = self.buildNodePackage {
+    name = "domhandler-2.3.0";
+    version = "2.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
+      name = "domhandler-2.3.0.tgz";
+      sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
+    };
+    deps = {
+      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."domutils"."1.4" =
+    self.by-version."domutils"."1.4.3";
+  by-version."domutils"."1.4.3" = self.buildNodePackage {
+    name = "domutils-1.4.3";
+    version = "1.4.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz";
+      name = "domutils-1.4.3.tgz";
+      sha1 = "0865513796c6b306031850e175516baf80b72a6f";
+    };
+    deps = {
+      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."domutils"."1.5" =
+    self.by-version."domutils"."1.5.1";
+  by-version."domutils"."1.5.1" = self.buildNodePackage {
+    name = "domutils-1.5.1";
+    version = "1.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
+      name = "domutils-1.5.1.tgz";
+      sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
+    };
+    deps = {
+      "dom-serializer-0.1.0" = self.by-version."dom-serializer"."0.1.0";
+      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ee-first"."1.1.0" =
+    self.by-version."ee-first"."1.1.0";
+  by-version."ee-first"."1.1.0" = self.buildNodePackage {
+    name = "ee-first-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz";
+      name = "ee-first-1.1.0.tgz";
+      sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."entities"."1.0" =
+    self.by-version."entities"."1.0.0";
+  by-version."entities"."1.0.0" = self.buildNodePackage {
+    name = "entities-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
+      name = "entities-1.0.0.tgz";
+      sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."entities"."~1.1.1" =
+    self.by-version."entities"."1.1.1";
+  by-version."entities"."1.1.1" = self.buildNodePackage {
+    name = "entities-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
+      name = "entities-1.1.1.tgz";
+      sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."escape-html"."1.0.1" =
+    self.by-version."escape-html"."1.0.1";
+  by-version."escape-html"."1.0.1" = self.buildNodePackage {
+    name = "escape-html-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
+      name = "escape-html-1.0.1.tgz";
+      sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."escape-string-regexp"."^1.0.2" =
+    self.by-version."escape-string-regexp"."1.0.3";
+  by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage {
+    name = "escape-string-regexp-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz";
+      name = "escape-string-regexp-1.0.3.tgz";
+      sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."etag"."~1.6.0" =
+    self.by-version."etag"."1.6.0";
+  by-version."etag"."1.6.0" = self.buildNodePackage {
+    name = "etag-1.6.0";
+    version = "1.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/etag/-/etag-1.6.0.tgz";
+      name = "etag-1.6.0.tgz";
+      sha1 = "8bcb2c6af1254c481dfc8b997c906ef4e442c207";
+    };
+    deps = {
+      "crc-3.2.1" = self.by-version."crc"."3.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."express"."~4.12.3" =
+    self.by-version."express"."4.12.4";
+  by-version."express"."4.12.4" = self.buildNodePackage {
+    name = "express-4.12.4";
+    version = "4.12.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express/-/express-4.12.4.tgz";
+      name = "express-4.12.4.tgz";
+      sha1 = "8fec2510255bc6b2e58107c48239c0fa307c1aa2";
+    };
+    deps = {
+      "accepts-1.2.9" = self.by-version."accepts"."1.2.9";
+      "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
+      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
+      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+      "etag-1.6.0" = self.by-version."etag"."1.6.0";
+      "finalhandler-0.3.6" = self.by-version."finalhandler"."0.3.6";
+      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
+      "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0";
+      "methods-1.1.1" = self.by-version."methods"."1.1.1";
+      "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
+      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+      "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
+      "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8";
+      "qs-2.4.2" = self.by-version."qs"."2.4.2";
+      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+      "send-0.12.3" = self.by-version."send"."0.12.3";
+      "serve-static-1.9.3" = self.by-version."serve-static"."1.9.3";
+      "type-is-1.6.3" = self.by-version."type-is"."1.6.3";
+      "vary-1.0.0" = self.by-version."vary"."1.0.0";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "express" = self.by-version."express"."4.12.4";
+  by-spec."fast-future"."~1.0.0" =
+    self.by-version."fast-future"."1.0.1";
+  by-version."fast-future"."1.0.1" = self.buildNodePackage {
+    name = "fast-future-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fast-future/-/fast-future-1.0.1.tgz";
+      name = "fast-future-1.0.1.tgz";
+      sha1 = "6cbd22d999ab39cd10fc79392486e7a678716818";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."fd-slicer"."~1.0.0" =
+    self.by-version."fd-slicer"."1.0.1";
+  by-version."fd-slicer"."1.0.1" = self.buildNodePackage {
+    name = "fd-slicer-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz";
+      name = "fd-slicer-1.0.1.tgz";
+      sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
+    };
+    deps = {
+      "pend-1.2.0" = self.by-version."pend"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."fd-slicer"."~1.0.1" =
+    self.by-version."fd-slicer"."1.0.1";
+  by-spec."finalhandler"."0.3.6" =
+    self.by-version."finalhandler"."0.3.6";
+  by-version."finalhandler"."0.3.6" = self.buildNodePackage {
+    name = "finalhandler-0.3.6";
+    version = "0.3.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.6.tgz";
+      name = "finalhandler-0.3.6.tgz";
+      sha1 = "daf9c4161b1b06e001466b1411dfdb6973be138b";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+      "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."findit2"."~2.2.3" =
+    self.by-version."findit2"."2.2.3";
+  by-version."findit2"."2.2.3" = self.buildNodePackage {
+    name = "findit2-2.2.3";
+    version = "2.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/findit2/-/findit2-2.2.3.tgz";
+      name = "findit2-2.2.3.tgz";
+      sha1 = "58a466697df8a6205cdfdbf395536b8bd777a5f6";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "findit2" = self.by-version."findit2"."2.2.3";
+  by-spec."forever-agent"."~0.5.0" =
+    self.by-version."forever-agent"."0.5.2";
+  by-version."forever-agent"."0.5.2" = self.buildNodePackage {
+    name = "forever-agent-0.5.2";
+    version = "0.5.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
+      name = "forever-agent-0.5.2.tgz";
+      sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."forever-agent"."~0.6.0" =
+    self.by-version."forever-agent"."0.6.1";
+  by-version."forever-agent"."0.6.1" = self.buildNodePackage {
+    name = "forever-agent-0.6.1";
+    version = "0.6.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+      name = "forever-agent-0.6.1.tgz";
+      sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."form-data"."~0.2.0" =
+    self.by-version."form-data"."0.2.0";
+  by-version."form-data"."0.2.0" = self.buildNodePackage {
+    name = "form-data-0.2.0";
+    version = "0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz";
+      name = "form-data-0.2.0.tgz";
+      sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466";
+    };
+    deps = {
+      "async-0.9.2" = self.by-version."async"."0.9.2";
+      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."forwarded"."~0.1.0" =
+    self.by-version."forwarded"."0.1.0";
+  by-version."forwarded"."0.1.0" = self.buildNodePackage {
+    name = "forwarded-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz";
+      name = "forwarded-0.1.0.tgz";
+      sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."fresh"."0.2.4" =
+    self.by-version."fresh"."0.2.4";
+  by-version."fresh"."0.2.4" = self.buildNodePackage {
+    name = "fresh-0.2.4";
+    version = "0.2.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz";
+      name = "fresh-0.2.4.tgz";
+      sha1 = "3582499206c9723714190edd74b4604feb4a614c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."gapitoken"."~0.1.2" =
+    self.by-version."gapitoken"."0.1.4";
+  by-version."gapitoken"."0.1.4" = self.buildNodePackage {
+    name = "gapitoken-0.1.4";
+    version = "0.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/gapitoken/-/gapitoken-0.1.4.tgz";
+      name = "gapitoken-0.1.4.tgz";
+      sha1 = "643dedb26cb142466f62b73d2782e7822a6f1ad8";
+    };
+    deps = {
+      "jws-0.0.2" = self.by-version."jws"."0.0.2";
+      "request-2.57.0" = self.by-version."request"."2.57.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."generate-function"."^2.0.0" =
+    self.by-version."generate-function"."2.0.0";
+  by-version."generate-function"."2.0.0" = self.buildNodePackage {
+    name = "generate-function-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
+      name = "generate-function-2.0.0.tgz";
+      sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."generate-object-property"."^1.1.0" =
+    self.by-version."generate-object-property"."1.2.0";
+  by-version."generate-object-property"."1.2.0" = self.buildNodePackage {
+    name = "generate-object-property-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
+      name = "generate-object-property-1.2.0.tgz";
+      sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
+    };
+    deps = {
+      "is-property-1.0.2" = self.by-version."is-property"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."get-stdin"."^4.0.1" =
+    self.by-version."get-stdin"."4.0.1";
+  by-version."get-stdin"."4.0.1" = self.buildNodePackage {
+    name = "get-stdin-4.0.1";
+    version = "4.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
+      name = "get-stdin-4.0.1.tgz";
+      sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."glob"."3.2.x" =
+    self.by-version."glob"."3.2.11";
+  by-version."glob"."3.2.11" = self.buildNodePackage {
+    name = "glob-3.2.11";
+    version = "3.2.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
+      name = "glob-3.2.11.tgz";
+      sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."google-auth-library"."~0.9.3" =
+    self.by-version."google-auth-library"."0.9.6";
+  by-version."google-auth-library"."0.9.6" = self.buildNodePackage {
+    name = "google-auth-library-0.9.6";
+    version = "0.9.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/google-auth-library/-/google-auth-library-0.9.6.tgz";
+      name = "google-auth-library-0.9.6.tgz";
+      sha1 = "57aa09f2621d6eafe8852b0167c9100759a67220";
+    };
+    deps = {
+      "async-0.9.2" = self.by-version."async"."0.9.2";
+      "gtoken-1.1.1" = self.by-version."gtoken"."1.1.1";
+      "lodash.noop-3.0.0" = self.by-version."lodash.noop"."3.0.0";
+      "jws-3.0.0" = self.by-version."jws"."3.0.0";
+      "request-2.51.0" = self.by-version."request"."2.51.0";
+      "string-template-0.2.1" = self.by-version."string-template"."0.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."google-p12-pem"."^0.0.1" =
+    self.by-version."google-p12-pem"."0.0.1";
+  by-version."google-p12-pem"."0.0.1" = self.buildNodePackage {
+    name = "google-p12-pem-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.0.1.tgz";
+      name = "google-p12-pem-0.0.1.tgz";
+      sha1 = "965638d464f13b4a866356a5ba047163ec0b08b7";
+    };
+    deps = {
+      "node-forge-0.6.16" = self.by-version."node-forge"."0.6.16";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."googleapis"."~2.0.3" =
+    self.by-version."googleapis"."2.0.5";
+  by-version."googleapis"."2.0.5" = self.buildNodePackage {
+    name = "googleapis-2.0.5";
+    version = "2.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/googleapis/-/googleapis-2.0.5.tgz";
+      name = "googleapis-2.0.5.tgz";
+      sha1 = "fb2d678f97152eb0a336da84bbc1eeb16a9c8310";
+    };
+    deps = {
+      "async-0.9.2" = self.by-version."async"."0.9.2";
+      "gapitoken-0.1.4" = self.by-version."gapitoken"."0.1.4";
+      "google-auth-library-0.9.6" = self.by-version."google-auth-library"."0.9.6";
+      "request-2.54.0" = self.by-version."request"."2.54.0";
+      "string-template-0.2.1" = self.by-version."string-template"."0.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "googleapis" = self.by-version."googleapis"."2.0.5";
+  by-spec."graceful-readlink".">= 1.0.0" =
+    self.by-version."graceful-readlink"."1.0.1";
+  by-version."graceful-readlink"."1.0.1" = self.buildNodePackage {
+    name = "graceful-readlink-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
+      name = "graceful-readlink-1.0.1.tgz";
+      sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."groove"."~2.3.3" =
+    self.by-version."groove"."2.3.4";
+  by-version."groove"."2.3.4" = self.buildNodePackage {
+    name = "groove-2.3.4";
+    version = "2.3.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/groove/-/groove-2.3.4.tgz";
+      name = "groove-2.3.4.tgz";
+      sha1 = "bbfb8e40584c5921f6df9d52d4017f2acb0a7e45";
+    };
+    deps = {
+      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
+      "nan-1.8.4" = self.by-version."nan"."1.8.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "groove" = self.by-version."groove"."2.3.4";
+  by-spec."gtoken"."^1.1.0" =
+    self.by-version."gtoken"."1.1.1";
+  by-version."gtoken"."1.1.1" = self.buildNodePackage {
+    name = "gtoken-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/gtoken/-/gtoken-1.1.1.tgz";
+      name = "gtoken-1.1.1.tgz";
+      sha1 = "969af828d1f7efea32a500ea09b0edfa8e0c438a";
+    };
+    deps = {
+      "google-p12-pem-0.0.1" = self.by-version."google-p12-pem"."0.0.1";
+      "jws-3.0.0" = self.by-version."jws"."3.0.0";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "request-2.57.0" = self.by-version."request"."2.57.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."har-validator"."^1.4.0" =
+    self.by-version."har-validator"."1.7.1";
+  by-version."har-validator"."1.7.1" = self.buildNodePackage {
+    name = "har-validator-1.7.1";
+    version = "1.7.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/har-validator/-/har-validator-1.7.1.tgz";
+      name = "har-validator-1.7.1.tgz";
+      sha1 = "8ec8952f8287d21b451ba3e36f27ed8d997d8a95";
+    };
+    deps = {
+      "bluebird-2.9.30" = self.by-version."bluebird"."2.9.30";
+      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
+      "commander-2.8.1" = self.by-version."commander"."2.8.1";
+      "is-my-json-valid-2.12.0" = self.by-version."is-my-json-valid"."2.12.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."har-validator"."^1.6.1" =
+    self.by-version."har-validator"."1.7.1";
+  by-spec."has-ansi"."^1.0.3" =
+    self.by-version."has-ansi"."1.0.3";
+  by-version."has-ansi"."1.0.3" = self.buildNodePackage {
+    name = "has-ansi-1.0.3";
+    version = "1.0.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz";
+      name = "has-ansi-1.0.3.tgz";
+      sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538";
+    };
+    deps = {
+      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
+      "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hawk"."1.1.1" =
+    self.by-version."hawk"."1.1.1";
+  by-version."hawk"."1.1.1" = self.buildNodePackage {
+    name = "hawk-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz";
+      name = "hawk-1.1.1.tgz";
+      sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9";
+    };
+    deps = {
+      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+      "boom-0.4.2" = self.by-version."boom"."0.4.2";
+      "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
+      "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hawk"."~2.3.0" =
+    self.by-version."hawk"."2.3.1";
+  by-version."hawk"."2.3.1" = self.buildNodePackage {
+    name = "hawk-2.3.1";
+    version = "2.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz";
+      name = "hawk-2.3.1.tgz";
+      sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f";
+    };
+    deps = {
+      "hoek-2.14.0" = self.by-version."hoek"."2.14.0";
+      "boom-2.8.0" = self.by-version."boom"."2.8.0";
+      "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4";
+      "sntp-1.0.9" = self.by-version."sntp"."1.0.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hoek"."0.9.x" =
+    self.by-version."hoek"."0.9.1";
+  by-version."hoek"."0.9.1" = self.buildNodePackage {
+    name = "hoek-0.9.1";
+    version = "0.9.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
+      name = "hoek-0.9.1.tgz";
+      sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hoek"."2.x.x" =
+    self.by-version."hoek"."2.14.0";
+  by-version."hoek"."2.14.0" = self.buildNodePackage {
+    name = "hoek-2.14.0";
+    version = "2.14.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz";
+      name = "hoek-2.14.0.tgz";
+      sha1 = "81211691f52a5a835ae49edbf1e89c9003476aa4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."htmlparser2"."~3.8.1" =
+    self.by-version."htmlparser2"."3.8.3";
+  by-version."htmlparser2"."3.8.3" = self.buildNodePackage {
+    name = "htmlparser2-3.8.3";
+    version = "3.8.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz";
+      name = "htmlparser2-3.8.3.tgz";
+      sha1 = "996c28b191516a8be86501a7d79757e5c70c1068";
+    };
+    deps = {
+      "domhandler-2.3.0" = self.by-version."domhandler"."2.3.0";
+      "domutils-1.5.1" = self.by-version."domutils"."1.5.1";
+      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "entities-1.0.0" = self.by-version."entities"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."http-signature"."~0.10.0" =
+    self.by-version."http-signature"."0.10.1";
+  by-version."http-signature"."0.10.1" = self.buildNodePackage {
+    name = "http-signature-0.10.1";
+    version = "0.10.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
+      name = "http-signature-0.10.1.tgz";
+      sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
+    };
+    deps = {
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+      "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
+      "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."http-signature"."~0.11.0" =
+    self.by-version."http-signature"."0.11.0";
+  by-version."http-signature"."0.11.0" = self.buildNodePackage {
+    name = "http-signature-0.11.0";
+    version = "0.11.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz";
+      name = "http-signature-0.11.0.tgz";
+      sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6";
+    };
+    deps = {
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+      "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
+      "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."httpolyglot"."~0.1.1" =
+    self.by-version."httpolyglot"."0.1.1";
+  by-version."httpolyglot"."0.1.1" = self.buildNodePackage {
+    name = "httpolyglot-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/httpolyglot/-/httpolyglot-0.1.1.tgz";
+      name = "httpolyglot-0.1.1.tgz";
+      sha1 = "cd0f5c995cbb95dde325d16a7537f90c0048e53d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "httpolyglot" = self.by-version."httpolyglot"."0.1.1";
+  by-spec."human-size"."~1.1.0" =
+    self.by-version."human-size"."1.1.0";
+  by-version."human-size"."1.1.0" = self.buildNodePackage {
+    name = "human-size-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/human-size/-/human-size-1.1.0.tgz";
+      name = "human-size-1.1.0.tgz";
+      sha1 = "052562be999841c037022c20259990c56ea996f9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "human-size" = self.by-version."human-size"."1.1.0";
+  by-spec."indent-string"."^1.1.0" =
+    self.by-version."indent-string"."1.2.1";
+  by-version."indent-string"."1.2.1" = self.buildNodePackage {
+    name = "indent-string-1.2.1";
+    version = "1.2.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz";
+      name = "indent-string-1.2.1.tgz";
+      sha1 = "294c5930792f8bb5b14462a4aa425b94f07d3a56";
+    };
+    deps = {
+      "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
+      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
+      "repeating-1.1.3" = self.by-version."repeating"."1.1.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."inherits"."*" =
+    self.by-version."inherits"."2.0.1";
+  by-version."inherits"."2.0.1" = self.buildNodePackage {
+    name = "inherits-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+      name = "inherits-2.0.1.tgz";
+      sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."inherits"."2" =
+    self.by-version."inherits"."2.0.1";
+  by-spec."inherits"."~2.0.1" =
+    self.by-version."inherits"."2.0.1";
+  by-spec."ipaddr.js"."1.0.1" =
+    self.by-version."ipaddr.js"."1.0.1";
+  by-version."ipaddr.js"."1.0.1" = self.buildNodePackage {
+    name = "ipaddr.js-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz";
+      name = "ipaddr.js-1.0.1.tgz";
+      sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-finite"."^1.0.0" =
+    self.by-version."is-finite"."1.0.1";
+  by-version."is-finite"."1.0.1" = self.buildNodePackage {
+    name = "is-finite-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz";
+      name = "is-finite-1.0.1.tgz";
+      sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b";
+    };
+    deps = {
+      "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-my-json-valid"."^2.12.0" =
+    self.by-version."is-my-json-valid"."2.12.0";
+  by-version."is-my-json-valid"."2.12.0" = self.buildNodePackage {
+    name = "is-my-json-valid-2.12.0";
+    version = "2.12.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.0.tgz";
+      name = "is-my-json-valid-2.12.0.tgz";
+      sha1 = "8fa6c408b26be95b45a23e8f8c4b464a53874d2b";
+    };
+    deps = {
+      "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0";
+      "generate-object-property-1.2.0" = self.by-version."generate-object-property"."1.2.0";
+      "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0";
+      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-property"."^1.0.0" =
+    self.by-version."is-property"."1.0.2";
+  by-version."is-property"."1.0.2" = self.buildNodePackage {
+    name = "is-property-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
+      name = "is-property-1.0.2.tgz";
+      sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."isarray"."0.0.1" =
+    self.by-version."isarray"."0.0.1";
+  by-version."isarray"."0.0.1" = self.buildNodePackage {
+    name = "isarray-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+      name = "isarray-0.0.1.tgz";
+      sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."isstream"."~0.1.1" =
+    self.by-version."isstream"."0.1.2";
+  by-version."isstream"."0.1.2" = self.buildNodePackage {
+    name = "isstream-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+      name = "isstream-0.1.2.tgz";
+      sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."json-stringify-safe"."~5.0.0" =
+    self.by-version."json-stringify-safe"."5.0.1";
+  by-version."json-stringify-safe"."5.0.1" = self.buildNodePackage {
+    name = "json-stringify-safe-5.0.1";
+    version = "5.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+      name = "json-stringify-safe-5.0.1.tgz";
+      sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jsonpointer"."^1.1.0" =
+    self.by-version."jsonpointer"."1.1.0";
+  by-version."jsonpointer"."1.1.0" = self.buildNodePackage {
+    name = "jsonpointer-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz";
+      name = "jsonpointer-1.1.0.tgz";
+      sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jstream"."~0.2.7" =
+    self.by-version."jstream"."0.2.7";
+  by-version."jstream"."0.2.7" = self.buildNodePackage {
+    name = "jstream-0.2.7";
+    version = "0.2.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jstream/-/jstream-0.2.7.tgz";
+      name = "jstream-0.2.7.tgz";
+      sha1 = "55f06cd6d4204caeac4907a5de1b90aabf4d60da";
+    };
+    deps = {
+      "clarinet-0.8.1" = self.by-version."clarinet"."0.8.1";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jwa"."~1.0.0" =
+    self.by-version."jwa"."1.0.0";
+  by-version."jwa"."1.0.0" = self.buildNodePackage {
+    name = "jwa-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jwa/-/jwa-1.0.0.tgz";
+      name = "jwa-1.0.0.tgz";
+      sha1 = "040b64fb582171a65f3368e96837ea4dcf42f3d8";
+    };
+    deps = {
+      "base64url-0.0.6" = self.by-version."base64url"."0.0.6";
+      "buffer-equal-constant-time-1.0.1" = self.by-version."buffer-equal-constant-time"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jws"."0.0.2" =
+    self.by-version."jws"."0.0.2";
+  by-version."jws"."0.0.2" = self.buildNodePackage {
+    name = "jws-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jws/-/jws-0.0.2.tgz";
+      name = "jws-0.0.2.tgz";
+      sha1 = "8c6916977183cce3361da48c8c2e0c606e7a95c6";
+    };
+    deps = {
+      "tap-0.3.3" = self.by-version."tap"."0.3.3";
+      "base64url-0.0.3" = self.by-version."base64url"."0.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jws"."^3.0.0" =
+    self.by-version."jws"."3.0.0";
+  by-version."jws"."3.0.0" = self.buildNodePackage {
+    name = "jws-3.0.0";
+    version = "3.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jws/-/jws-3.0.0.tgz";
+      name = "jws-3.0.0.tgz";
+      sha1 = "da5f267897dd4e9cf8137979db33fc54a3c05418";
+    };
+    deps = {
+      "jwa-1.0.0" = self.by-version."jwa"."1.0.0";
+      "base64url-1.0.4" = self.by-version."base64url"."1.0.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jws"."~3.0.0" =
+    self.by-version."jws"."3.0.0";
+  by-spec."keese"."~1.1.1" =
+    self.by-version."keese"."1.1.1";
+  by-version."keese"."1.1.1" = self.buildNodePackage {
+    name = "keese-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/keese/-/keese-1.1.1.tgz";
+      name = "keese-1.1.1.tgz";
+      sha1 = "69a1f971e64ee5d2094af002f6d92fa806250842";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "keese" = self.by-version."keese"."1.1.1";
+  by-spec."keygrip"."~1.0.0" =
+    self.by-version."keygrip"."1.0.1";
+  by-version."keygrip"."1.0.1" = self.buildNodePackage {
+    name = "keygrip-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz";
+      name = "keygrip-1.0.1.tgz";
+      sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lastfm"."~0.9.2" =
+    self.by-version."lastfm"."0.9.2";
+  by-version."lastfm"."0.9.2" = self.buildNodePackage {
+    name = "lastfm-0.9.2";
+    version = "0.9.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lastfm/-/lastfm-0.9.2.tgz";
+      name = "lastfm-0.9.2.tgz";
+      sha1 = "d00ca2e3b30eb484e510792875525900e4d77d88";
+    };
+    deps = {
+      "underscore-1.6.0" = self.by-version."underscore"."1.6.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "lastfm" = self.by-version."lastfm"."0.9.2";
+  by-spec."leveldown"."~1.0.6" =
+    self.by-version."leveldown"."1.0.7";
+  by-version."leveldown"."1.0.7" = self.buildNodePackage {
+    name = "leveldown-1.0.7";
+    version = "1.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/leveldown/-/leveldown-1.0.7.tgz";
+      name = "leveldown-1.0.7.tgz";
+      sha1 = "39bbe95f92ce09992ec12de47ade5167be2b6874";
+    };
+    deps = {
+      "abstract-leveldown-2.2.2" = self.by-version."abstract-leveldown"."2.2.2";
+      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
+      "fast-future-1.0.1" = self.by-version."fast-future"."1.0.1";
+      "nan-1.8.4" = self.by-version."nan"."1.8.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "leveldown" = self.by-version."leveldown"."1.0.7";
+  by-spec."lodash"."~2.4.1" =
+    self.by-version."lodash"."2.4.2";
+  by-version."lodash"."2.4.2" = self.buildNodePackage {
+    name = "lodash-2.4.2";
+    version = "2.4.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
+      name = "lodash-2.4.2.tgz";
+      sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.noop"."~3.0.0" =
+    self.by-version."lodash.noop"."3.0.0";
+  by-version."lodash.noop"."3.0.0" = self.buildNodePackage {
+    name = "lodash.noop-3.0.0";
+    version = "3.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.0.tgz";
+      name = "lodash.noop-3.0.0.tgz";
+      sha1 = "f383ca8dba97d8f217e49afcd2b824db9e5e8d68";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lru-cache"."2" =
+    self.by-version."lru-cache"."2.6.4";
+  by-version."lru-cache"."2.6.4" = self.buildNodePackage {
+    name = "lru-cache-2.6.4";
+    version = "2.6.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz";
+      name = "lru-cache-2.6.4.tgz";
+      sha1 = "2675190ccd1b0701ec2f652a4d0d3d400d76c0dd";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."map-obj"."^1.0.0" =
+    self.by-version."map-obj"."1.0.1";
+  by-version."map-obj"."1.0.1" = self.buildNodePackage {
+    name = "map-obj-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
+      name = "map-obj-1.0.1.tgz";
+      sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."media-typer"."0.3.0" =
+    self.by-version."media-typer"."0.3.0";
+  by-version."media-typer"."0.3.0" = self.buildNodePackage {
+    name = "media-typer-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
+      name = "media-typer-0.3.0.tgz";
+      sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."meow"."~2.0.0" =
+    self.by-version."meow"."2.0.0";
+  by-version."meow"."2.0.0" = self.buildNodePackage {
+    name = "meow-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/meow/-/meow-2.0.0.tgz";
+      name = "meow-2.0.0.tgz";
+      sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1";
+    };
+    deps = {
+      "camelcase-keys-1.0.0" = self.by-version."camelcase-keys"."1.0.0";
+      "indent-string-1.2.1" = self.by-version."indent-string"."1.2.1";
+      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
+      "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."merge-descriptors"."1.0.0" =
+    self.by-version."merge-descriptors"."1.0.0";
+  by-version."merge-descriptors"."1.0.0" = self.buildNodePackage {
+    name = "merge-descriptors-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz";
+      name = "merge-descriptors-1.0.0.tgz";
+      sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mess"."~0.1.2" =
+    self.by-version."mess"."0.1.2";
+  by-version."mess"."0.1.2" = self.buildNodePackage {
+    name = "mess-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mess/-/mess-0.1.2.tgz";
+      name = "mess-0.1.2.tgz";
+      sha1 = "2c81a424efc87a69ad11f1c7129d1f6f6353b9c0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "mess" = self.by-version."mess"."0.1.2";
+  by-spec."methods"."~1.1.1" =
+    self.by-version."methods"."1.1.1";
+  by-version."methods"."1.1.1" = self.buildNodePackage {
+    name = "methods-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz";
+      name = "methods-1.1.1.tgz";
+      sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime"."1.3.4" =
+    self.by-version."mime"."1.3.4";
+  by-version."mime"."1.3.4" = self.buildNodePackage {
+    name = "mime-1.3.4";
+    version = "1.3.4";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
+      name = "mime-1.3.4.tgz";
+      sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime"."^1.2.11" =
+    self.by-version."mime"."1.3.4";
+  by-spec."mime"."~1.2.11" =
+    self.by-version."mime"."1.2.11";
+  by-version."mime"."1.2.11" = self.buildNodePackage {
+    name = "mime-1.2.11";
+    version = "1.2.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+      name = "mime-1.2.11.tgz";
+      sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-db"."~1.12.0" =
+    self.by-version."mime-db"."1.12.0";
+  by-version."mime-db"."1.12.0" = self.buildNodePackage {
+    name = "mime-db-1.12.0";
+    version = "1.12.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz";
+      name = "mime-db-1.12.0.tgz";
+      sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-db"."~1.13.0" =
+    self.by-version."mime-db"."1.13.0";
+  by-version."mime-db"."1.13.0" = self.buildNodePackage {
+    name = "mime-db-1.13.0";
+    version = "1.13.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.13.0.tgz";
+      name = "mime-db-1.13.0.tgz";
+      sha1 = "fd6808168fe30835e7ea2205fc981d3b633e4e34";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-types"."~1.0.1" =
+    self.by-version."mime-types"."1.0.2";
+  by-version."mime-types"."1.0.2" = self.buildNodePackage {
+    name = "mime-types-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
+      name = "mime-types-1.0.2.tgz";
+      sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-types"."~2.0.1" =
+    self.by-version."mime-types"."2.0.14";
+  by-version."mime-types"."2.0.14" = self.buildNodePackage {
+    name = "mime-types-2.0.14";
+    version = "2.0.14";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz";
+      name = "mime-types-2.0.14.tgz";
+      sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6";
+    };
+    deps = {
+      "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-types"."~2.0.3" =
+    self.by-version."mime-types"."2.0.14";
+  by-spec."mime-types"."~2.1.1" =
+    self.by-version."mime-types"."2.1.1";
+  by-version."mime-types"."2.1.1" = self.buildNodePackage {
+    name = "mime-types-2.1.1";
+    version = "2.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.1.tgz";
+      name = "mime-types-2.1.1.tgz";
+      sha1 = "c7b692796d5166f4826d10b4675c8a916657d04e";
+    };
+    deps = {
+      "mime-db-1.13.0" = self.by-version."mime-db"."1.13.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."minimatch"."0.3" =
+    self.by-version."minimatch"."0.3.0";
+  by-version."minimatch"."0.3.0" = self.buildNodePackage {
+    name = "minimatch-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
+      name = "minimatch-0.3.0.tgz";
+      sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
+    };
+    deps = {
+      "lru-cache-2.6.4" = self.by-version."lru-cache"."2.6.4";
+      "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."minimist"."0.0.8" =
+    self.by-version."minimist"."0.0.8";
+  by-version."minimist"."0.0.8" = self.buildNodePackage {
+    name = "minimist-0.0.8";
+    version = "0.0.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+      name = "minimist-0.0.8.tgz";
+      sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."minimist"."^1.1.0" =
+    self.by-version."minimist"."1.1.1";
+  by-version."minimist"."1.1.1" = self.buildNodePackage {
+    name = "minimist-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz";
+      name = "minimist-1.1.1.tgz";
+      sha1 = "1bc2bc71658cdca5712475684363615b0b4f695b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mkdirp"."0.3.x" =
+    self.by-version."mkdirp"."0.3.5";
+  by-version."mkdirp"."0.3.5" = self.buildNodePackage {
+    name = "mkdirp-0.3.5";
+    version = "0.3.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+      name = "mkdirp-0.3.5.tgz";
+      sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mkdirp"."~0.3" =
+    self.by-version."mkdirp"."0.3.5";
+  by-spec."mkdirp"."~0.5.0" =
+    self.by-version."mkdirp"."0.5.1";
+  by-version."mkdirp"."0.5.1" = self.buildNodePackage {
+    name = "mkdirp-0.5.1";
+    version = "0.5.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+      name = "mkdirp-0.5.1.tgz";
+      sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+    };
+    deps = {
+      "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mkdirp"."~0.5.1" =
+    self.by-version."mkdirp"."0.5.1";
+  "mkdirp" = self.by-version."mkdirp"."0.5.1";
+  by-spec."ms"."0.7.1" =
+    self.by-version."ms"."0.7.1";
+  by-version."ms"."0.7.1" = self.buildNodePackage {
+    name = "ms-0.7.1";
+    version = "0.7.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
+      name = "ms-0.7.1.tgz";
+      sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."multiparty"."~4.1.2" =
+    self.by-version."multiparty"."4.1.2";
+  by-version."multiparty"."4.1.2" = self.buildNodePackage {
+    name = "multiparty-4.1.2";
+    version = "4.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/multiparty/-/multiparty-4.1.2.tgz";
+      name = "multiparty-4.1.2.tgz";
+      sha1 = "54f8ec9712052fa1dfd8ec975056c8230d6f2370";
+    };
+    deps = {
+      "fd-slicer-1.0.1" = self.by-version."fd-slicer"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "multiparty" = self.by-version."multiparty"."4.1.2";
+  by-spec."music-library-index"."~1.3.0" =
+    self.by-version."music-library-index"."1.3.0";
+  by-version."music-library-index"."1.3.0" = self.buildNodePackage {
+    name = "music-library-index-1.3.0";
+    version = "1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/music-library-index/-/music-library-index-1.3.0.tgz";
+      name = "music-library-index-1.3.0.tgz";
+      sha1 = "f7dbf6f7df5a0c8c50382542183872aedc5cb86a";
+    };
+    deps = {
+      "diacritics-1.2.1" = self.by-version."diacritics"."1.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "music-library-index" = self.by-version."music-library-index"."1.3.0";
+  by-spec."mv"."~2.0.3" =
+    self.by-version."mv"."2.0.3";
+  by-version."mv"."2.0.3" = self.buildNodePackage {
+    name = "mv-2.0.3";
+    version = "2.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mv/-/mv-2.0.3.tgz";
+      name = "mv-2.0.3.tgz";
+      sha1 = "e9ab707d71dc38de24edcc637a8e2f5f480c7f32";
+    };
+    deps = {
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "ncp-0.6.0" = self.by-version."ncp"."0.6.0";
+      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "mv" = self.by-version."mv"."2.0.3";
+  by-spec."nan"."~1.8.4" =
+    self.by-version."nan"."1.8.4";
+  by-version."nan"."1.8.4" = self.buildNodePackage {
+    name = "nan-1.8.4";
+    version = "1.8.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nan/-/nan-1.8.4.tgz";
+      name = "nan-1.8.4.tgz";
+      sha1 = "3c76b5382eab33e44b758d2813ca9d92e9342f34";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ncp"."~0.6.0" =
+    self.by-version."ncp"."0.6.0";
+  by-version."ncp"."0.6.0" = self.buildNodePackage {
+    name = "ncp-0.6.0";
+    version = "0.6.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz";
+      name = "ncp-0.6.0.tgz";
+      sha1 = "df8ce021e262be21b52feb3d3e5cfaab12491f0d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."negotiator"."0.5.3" =
+    self.by-version."negotiator"."0.5.3";
+  by-version."negotiator"."0.5.3" = self.buildNodePackage {
+    name = "negotiator-0.5.3";
+    version = "0.5.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz";
+      name = "negotiator-0.5.3.tgz";
+      sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-forge"."0.6.16" =
+    self.by-version."node-forge"."0.6.16";
+  by-version."node-forge"."0.6.16" = self.buildNodePackage {
+    name = "node-forge-0.6.16";
+    version = "0.6.16";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-forge/-/node-forge-0.6.16.tgz";
+      name = "node-forge-0.6.16.tgz";
+      sha1 = "aae85babf97034d46f1b74a39bfe5891282ae842";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-uuid"."~1.4.0" =
+    self.by-version."node-uuid"."1.4.3";
+  by-version."node-uuid"."1.4.3" = self.buildNodePackage {
+    name = "node-uuid-1.4.3";
+    version = "1.4.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
+      name = "node-uuid-1.4.3.tgz";
+      sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."nopt"."~2" =
+    self.by-version."nopt"."2.2.1";
+  by-version."nopt"."2.2.1" = self.buildNodePackage {
+    name = "nopt-2.2.1";
+    version = "2.2.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
+      name = "nopt-2.2.1.tgz";
+      sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
+    };
+    deps = {
+      "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."number-is-nan"."^1.0.0" =
+    self.by-version."number-is-nan"."1.0.0";
+  by-version."number-is-nan"."1.0.0" = self.buildNodePackage {
+    name = "number-is-nan-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz";
+      name = "number-is-nan-1.0.0.tgz";
+      sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."oauth-sign"."~0.5.0" =
+    self.by-version."oauth-sign"."0.5.0";
+  by-version."oauth-sign"."0.5.0" = self.buildNodePackage {
+    name = "oauth-sign-0.5.0";
+    version = "0.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz";
+      name = "oauth-sign-0.5.0.tgz";
+      sha1 = "d767f5169325620eab2e087ef0c472e773db6461";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."oauth-sign"."~0.6.0" =
+    self.by-version."oauth-sign"."0.6.0";
+  by-version."oauth-sign"."0.6.0" = self.buildNodePackage {
+    name = "oauth-sign-0.6.0";
+    version = "0.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz";
+      name = "oauth-sign-0.6.0.tgz";
+      sha1 = "7dbeae44f6ca454e1f168451d630746735813ce3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."oauth-sign"."~0.8.0" =
+    self.by-version."oauth-sign"."0.8.0";
+  by-version."oauth-sign"."0.8.0" = self.buildNodePackage {
+    name = "oauth-sign-0.8.0";
+    version = "0.8.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz";
+      name = "oauth-sign-0.8.0.tgz";
+      sha1 = "938fdc875765ba527137d8aec9d178e24debc553";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."object-assign"."^1.0.0" =
+    self.by-version."object-assign"."1.0.0";
+  by-version."object-assign"."1.0.0" = self.buildNodePackage {
+    name = "object-assign-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
+      name = "object-assign-1.0.0.tgz";
+      sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."on-finished"."~2.2.1" =
+    self.by-version."on-finished"."2.2.1";
+  by-version."on-finished"."2.2.1" = self.buildNodePackage {
+    name = "on-finished-2.2.1";
+    version = "2.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz";
+      name = "on-finished-2.2.1.tgz";
+      sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029";
+    };
+    deps = {
+      "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."os-tmpdir"."^1.0.0" =
+    self.by-version."os-tmpdir"."1.0.1";
+  by-version."os-tmpdir"."1.0.1" = self.buildNodePackage {
+    name = "os-tmpdir-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz";
+      name = "os-tmpdir-1.0.1.tgz";
+      sha1 = "e9b423a1edaf479882562e92ed71d7743a071b6e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."osenv"."~0.1.0" =
+    self.by-version."osenv"."0.1.2";
+  by-version."osenv"."0.1.2" = self.buildNodePackage {
+    name = "osenv-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/osenv/-/osenv-0.1.2.tgz";
+      name = "osenv-0.1.2.tgz";
+      sha1 = "f4d23ebeceaef078600fb78c0ea58fac5996a02d";
+    };
+    deps = {
+      "os-tmpdir-1.0.1" = self.by-version."os-tmpdir"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "osenv" = self.by-version."osenv"."0.1.2";
+  by-spec."parseurl"."~1.3.0" =
+    self.by-version."parseurl"."1.3.0";
+  by-version."parseurl"."1.3.0" = self.buildNodePackage {
+    name = "parseurl-1.3.0";
+    version = "1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz";
+      name = "parseurl-1.3.0.tgz";
+      sha1 = "b58046db4223e145afa76009e61bac87cc2281b3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."path-to-regexp"."0.1.3" =
+    self.by-version."path-to-regexp"."0.1.3";
+  by-version."path-to-regexp"."0.1.3" = self.buildNodePackage {
+    name = "path-to-regexp-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
+      name = "path-to-regexp-0.1.3.tgz";
+      sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pend"."~1.2.0" =
+    self.by-version."pend"."1.2.0";
+  by-version."pend"."1.2.0" = self.buildNodePackage {
+    name = "pend-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pend/-/pend-1.2.0.tgz";
+      name = "pend-1.2.0.tgz";
+      sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "pend" = self.by-version."pend"."1.2.0";
+  by-spec."proxy-addr"."~1.0.8" =
+    self.by-version."proxy-addr"."1.0.8";
+  by-version."proxy-addr"."1.0.8" = self.buildNodePackage {
+    name = "proxy-addr-1.0.8";
+    version = "1.0.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz";
+      name = "proxy-addr-1.0.8.tgz";
+      sha1 = "db54ec878bcc1053d57646609219b3715678bafe";
+    };
+    deps = {
+      "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0";
+      "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."qs"."2.4.2" =
+    self.by-version."qs"."2.4.2";
+  by-version."qs"."2.4.2" = self.buildNodePackage {
+    name = "qs-2.4.2";
+    version = "2.4.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-2.4.2.tgz";
+      name = "qs-2.4.2.tgz";
+      sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."qs"."~2.3.1" =
+    self.by-version."qs"."2.3.3";
+  by-version."qs"."2.3.3" = self.buildNodePackage {
+    name = "qs-2.3.3";
+    version = "2.3.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
+      name = "qs-2.3.3.tgz";
+      sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."qs"."~2.4.0" =
+    self.by-version."qs"."2.4.2";
+  by-spec."qs"."~3.1.0" =
+    self.by-version."qs"."3.1.0";
+  by-version."qs"."3.1.0" = self.buildNodePackage {
+    name = "qs-3.1.0";
+    version = "3.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-3.1.0.tgz";
+      name = "qs-3.1.0.tgz";
+      sha1 = "d0e9ae745233a12dc43fb4f3055bba446261153c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."range-parser"."~1.0.2" =
+    self.by-version."range-parser"."1.0.2";
+  by-version."range-parser"."1.0.2" = self.buildNodePackage {
+    name = "range-parser-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz";
+      name = "range-parser-1.0.2.tgz";
+      sha1 = "06a12a42e5131ba8e457cd892044867f2344e549";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."readable-stream"."1.1" =
+    self.by-version."readable-stream"."1.1.13";
+  by-version."readable-stream"."1.1.13" = self.buildNodePackage {
+    name = "readable-stream-1.1.13";
+    version = "1.1.13";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz";
+      name = "readable-stream-1.1.13.tgz";
+      sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e";
+    };
+    deps = {
+      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."readable-stream"."~1.0.26" =
+    self.by-version."readable-stream"."1.0.33";
+  by-version."readable-stream"."1.0.33" = self.buildNodePackage {
+    name = "readable-stream-1.0.33";
+    version = "1.0.33";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
+      name = "readable-stream-1.0.33.tgz";
+      sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c";
+    };
+    deps = {
+      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."readable-stream"."~1.1.9" =
+    self.by-version."readable-stream"."1.1.13";
+  by-spec."repeating"."^1.1.0" =
+    self.by-version."repeating"."1.1.3";
+  by-version."repeating"."1.1.3" = self.buildNodePackage {
+    name = "repeating-1.1.3";
+    version = "1.1.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz";
+      name = "repeating-1.1.3.tgz";
+      sha1 = "3d4114218877537494f97f77f9785fab810fa4ac";
+    };
+    deps = {
+      "is-finite-1.0.1" = self.by-version."is-finite"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."request"."^2.37.0" =
+    self.by-version."request"."2.57.0";
+  by-version."request"."2.57.0" = self.buildNodePackage {
+    name = "request-2.57.0";
+    version = "2.57.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.57.0.tgz";
+      name = "request-2.57.0.tgz";
+      sha1 = "d445105a42d009b9d724289633b449a6d723d989";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "caseless-0.10.0" = self.by-version."caseless"."0.10.0";
+      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
+      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "qs-3.1.0" = self.by-version."qs"."3.1.0";
+      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
+      "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0";
+      "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0";
+      "oauth-sign-0.8.0" = self.by-version."oauth-sign"."0.8.0";
+      "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
+      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "har-validator-1.7.1" = self.by-version."har-validator"."1.7.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."request"."^2.54.0" =
+    self.by-version."request"."2.57.0";
+  by-spec."request"."^2.55.0" =
+    self.by-version."request"."2.57.0";
+  by-spec."request"."~2.51.0" =
+    self.by-version."request"."2.51.0";
+  by-version."request"."2.51.0" = self.buildNodePackage {
+    name = "request-2.51.0";
+    version = "2.51.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.51.0.tgz";
+      name = "request-2.51.0.tgz";
+      sha1 = "35d00bbecc012e55f907b1bd9e0dbd577bfef26e";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "caseless-0.8.0" = self.by-version."caseless"."0.8.0";
+      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "qs-2.3.3" = self.by-version."qs"."2.3.3";
+      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
+      "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0";
+      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
+      "oauth-sign-0.5.0" = self.by-version."oauth-sign"."0.5.0";
+      "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
+      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
+      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."request"."~2.54.0" =
+    self.by-version."request"."2.54.0";
+  by-version."request"."2.54.0" = self.buildNodePackage {
+    name = "request-2.54.0";
+    version = "2.54.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.54.0.tgz";
+      name = "request-2.54.0.tgz";
+      sha1 = "a13917cd8e8fa73332da0bf2f84a30181def1953";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "caseless-0.9.0" = self.by-version."caseless"."0.9.0";
+      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
+      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "qs-2.4.2" = self.by-version."qs"."2.4.2";
+      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
+      "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0";
+      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
+      "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0";
+      "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
+      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
+      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "har-validator-1.7.1" = self.by-version."har-validator"."1.7.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."rimraf"."~2.2.8" =
+    self.by-version."rimraf"."2.2.8";
+  by-version."rimraf"."2.2.8" = self.buildNodePackage {
+    name = "rimraf-2.2.8";
+    version = "2.2.8";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
+      name = "rimraf-2.2.8.tgz";
+      sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."runforcover"."~0.0.2" =
+    self.by-version."runforcover"."0.0.2";
+  by-version."runforcover"."0.0.2" = self.buildNodePackage {
+    name = "runforcover-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz";
+      name = "runforcover-0.0.2.tgz";
+      sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc";
+    };
+    deps = {
+      "bunker-0.1.2" = self.by-version."bunker"."0.1.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sax"."0.5.x" =
+    self.by-version."sax"."0.5.8";
+  by-version."sax"."0.5.8" = self.buildNodePackage {
+    name = "sax-0.5.8";
+    version = "0.5.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
+      name = "sax-0.5.8.tgz";
+      sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."semver"."~4.3.4" =
+    self.by-version."semver"."4.3.6";
+  by-version."semver"."4.3.6" = self.buildNodePackage {
+    name = "semver-4.3.6";
+    version = "4.3.6";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz";
+      name = "semver-4.3.6.tgz";
+      sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "semver" = self.by-version."semver"."4.3.6";
+  by-spec."send"."0.12.3" =
+    self.by-version."send"."0.12.3";
+  by-version."send"."0.12.3" = self.buildNodePackage {
+    name = "send-0.12.3";
+    version = "0.12.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/send/-/send-0.12.3.tgz";
+      name = "send-0.12.3.tgz";
+      sha1 = "cd12dc58fde21e4f91902b39b2fda05a7a6d9bdc";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
+      "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+      "etag-1.6.0" = self.by-version."etag"."1.6.0";
+      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
+      "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
+      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."serve-static"."~1.9.3" =
+    self.by-version."serve-static"."1.9.3";
+  by-version."serve-static"."1.9.3" = self.buildNodePackage {
+    name = "serve-static-1.9.3";
+    version = "1.9.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.3.tgz";
+      name = "serve-static-1.9.3.tgz";
+      sha1 = "5f8da07323ad385ff3dc541f1a7917b2e436eb57";
+    };
+    deps = {
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+      "send-0.12.3" = self.by-version."send"."0.12.3";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "serve-static" = self.by-version."serve-static"."1.9.3";
+  by-spec."sigmund"."~1.0.0" =
+    self.by-version."sigmund"."1.0.1";
+  by-version."sigmund"."1.0.1" = self.buildNodePackage {
+    name = "sigmund-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
+      name = "sigmund-1.0.1.tgz";
+      sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."slide"."*" =
+    self.by-version."slide"."1.1.6";
+  by-version."slide"."1.1.6" = self.buildNodePackage {
+    name = "slide-1.1.6";
+    version = "1.1.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
+      name = "slide-1.1.6.tgz";
+      sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sntp"."0.2.x" =
+    self.by-version."sntp"."0.2.4";
+  by-version."sntp"."0.2.4" = self.buildNodePackage {
+    name = "sntp-0.2.4";
+    version = "0.2.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
+      name = "sntp-0.2.4.tgz";
+      sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
+    };
+    deps = {
+      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sntp"."1.x.x" =
+    self.by-version."sntp"."1.0.9";
+  by-version."sntp"."1.0.9" = self.buildNodePackage {
+    name = "sntp-1.0.9";
+    version = "1.0.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
+      name = "sntp-1.0.9.tgz";
+      sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
+    };
+    deps = {
+      "hoek-2.14.0" = self.by-version."hoek"."2.14.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."source-map"."0.1.x" =
+    self.by-version."source-map"."0.1.43";
+  by-version."source-map"."0.1.43" = self.buildNodePackage {
+    name = "source-map-0.1.43";
+    version = "0.1.43";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
+      name = "source-map-0.1.43.tgz";
+      sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
+    };
+    deps = {
+      "amdefine-0.1.1" = self.by-version."amdefine"."0.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."streamsink"."~1.2.0" =
+    self.by-version."streamsink"."1.2.0";
+  by-version."streamsink"."1.2.0" = self.buildNodePackage {
+    name = "streamsink-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/streamsink/-/streamsink-1.2.0.tgz";
+      name = "streamsink-1.2.0.tgz";
+      sha1 = "efafee9f1e22d3591ed7de3dcaa95c3f5e79f73c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."string-template"."~0.2.0" =
+    self.by-version."string-template"."0.2.1";
+  by-version."string-template"."0.2.1" = self.buildNodePackage {
+    name = "string-template-0.2.1";
+    version = "0.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz";
+      name = "string-template-0.2.1.tgz";
+      sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."string_decoder"."~0.10.x" =
+    self.by-version."string_decoder"."0.10.31";
+  by-version."string_decoder"."0.10.31" = self.buildNodePackage {
+    name = "string_decoder-0.10.31";
+    version = "0.10.31";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+      name = "string_decoder-0.10.31.tgz";
+      sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."stringstream"."~0.0.4" =
+    self.by-version."stringstream"."0.0.4";
+  by-version."stringstream"."0.0.4" = self.buildNodePackage {
+    name = "stringstream-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";
+      name = "stringstream-0.0.4.tgz";
+      sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."strip-ansi"."^2.0.1" =
+    self.by-version."strip-ansi"."2.0.1";
+  by-version."strip-ansi"."2.0.1" = self.buildNodePackage {
+    name = "strip-ansi-2.0.1";
+    version = "2.0.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz";
+      name = "strip-ansi-2.0.1.tgz";
+      sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e";
+    };
+    deps = {
+      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."stylus"."~0.49.3" =
+    self.by-version."stylus"."0.49.3";
+  by-version."stylus"."0.49.3" = self.buildNodePackage {
+    name = "stylus-0.49.3";
+    version = "0.49.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stylus/-/stylus-0.49.3.tgz";
+      name = "stylus-0.49.3.tgz";
+      sha1 = "1fbdabe479ed460872c71a6252a67f95040ba511";
+    };
+    deps = {
+      "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0";
+      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "sax-0.5.8" = self.by-version."sax"."0.5.8";
+      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "stylus" = self.by-version."stylus"."0.49.3";
+  by-spec."supports-color"."^1.3.0" =
+    self.by-version."supports-color"."1.3.1";
+  by-version."supports-color"."1.3.1" = self.buildNodePackage {
+    name = "supports-color-1.3.1";
+    version = "1.3.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz";
+      name = "supports-color-1.3.1.tgz";
+      sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tap"."~0.3.3" =
+    self.by-version."tap"."0.3.3";
+  by-version."tap"."0.3.3" = self.buildNodePackage {
+    name = "tap-0.3.3";
+    version = "0.3.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tap/-/tap-0.3.3.tgz";
+      name = "tap-0.3.3.tgz";
+      sha1 = "c862237af0a213f97fff46594bd1d44eca705d63";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "yamlish-0.0.7" = self.by-version."yamlish"."0.0.7";
+      "slide-1.1.6" = self.by-version."slide"."1.1.6";
+      "runforcover-0.0.2" = self.by-version."runforcover"."0.0.2";
+      "nopt-2.2.1" = self.by-version."nopt"."2.2.1";
+      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+      "difflet-0.2.6" = self.by-version."difflet"."0.2.6";
+      "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0";
+      "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tough-cookie".">=0.12.0" =
+    self.by-version."tough-cookie"."2.0.0";
+  by-version."tough-cookie"."2.0.0" = self.buildNodePackage {
+    name = "tough-cookie-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz";
+      name = "tough-cookie-2.0.0.tgz";
+      sha1 = "41ce08720b35cf90beb044dd2609fb19e928718f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."traverse"."0.6.x" =
+    self.by-version."traverse"."0.6.6";
+  by-version."traverse"."0.6.6" = self.buildNodePackage {
+    name = "traverse-0.6.6";
+    version = "0.6.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz";
+      name = "traverse-0.6.6.tgz";
+      sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."traverse"."~0.5.1" =
+    self.by-version."traverse"."0.5.2";
+  by-version."traverse"."0.5.2" = self.buildNodePackage {
+    name = "traverse-0.5.2";
+    version = "0.5.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz";
+      name = "traverse-0.5.2.tgz";
+      sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tunnel-agent"."~0.4.0" =
+    self.by-version."tunnel-agent"."0.4.0";
+  by-version."tunnel-agent"."0.4.0" = self.buildNodePackage {
+    name = "tunnel-agent-0.4.0";
+    version = "0.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
+      name = "tunnel-agent-0.4.0.tgz";
+      sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."type-is"."~1.6.2" =
+    self.by-version."type-is"."1.6.3";
+  by-version."type-is"."1.6.3" = self.buildNodePackage {
+    name = "type-is-1.6.3";
+    version = "1.6.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/type-is/-/type-is-1.6.3.tgz";
+      name = "type-is-1.6.3.tgz";
+      sha1 = "d87d201777f76dfc526ac202679715d41a28c580";
+    };
+    deps = {
+      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
+      "mime-types-2.1.1" = self.by-version."mime-types"."2.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."typedarray"."~0.0.5" =
+    self.by-version."typedarray"."0.0.6";
+  by-version."typedarray"."0.0.6" = self.buildNodePackage {
+    name = "typedarray-0.0.6";
+    version = "0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
+      name = "typedarray-0.0.6.tgz";
+      sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."uglify-js"."~1.1.1" =
+    self.by-version."uglify-js"."1.1.1";
+  by-version."uglify-js"."1.1.1" = self.buildNodePackage {
+    name = "uglify-js-1.1.1";
+    version = "1.1.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz";
+      name = "uglify-js-1.1.1.tgz";
+      sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."underscore"."^1.6.0" =
+    self.by-version."underscore"."1.8.3";
+  by-version."underscore"."1.8.3" = self.buildNodePackage {
+    name = "underscore-1.8.3";
+    version = "1.8.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
+      name = "underscore-1.8.3.tgz";
+      sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."underscore"."~1.6.0" =
+    self.by-version."underscore"."1.6.0";
+  by-version."underscore"."1.6.0" = self.buildNodePackage {
+    name = "underscore-1.6.0";
+    version = "1.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
+      name = "underscore-1.6.0.tgz";
+      sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."utils-merge"."1.0.0" =
+    self.by-version."utils-merge"."1.0.0";
+  by-version."utils-merge"."1.0.0" = self.buildNodePackage {
+    name = "utils-merge-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
+      name = "utils-merge-1.0.0.tgz";
+      sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."vary"."~1.0.0" =
+    self.by-version."vary"."1.0.0";
+  by-version."vary"."1.0.0" = self.buildNodePackage {
+    name = "vary-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz";
+      name = "vary-1.0.0.tgz";
+      sha1 = "c5e76cec20d3820d8f2a96e7bee38731c34da1e7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xtend"."^4.0.0" =
+    self.by-version."xtend"."4.0.0";
+  by-version."xtend"."4.0.0" = self.buildNodePackage {
+    name = "xtend-4.0.0";
+    version = "4.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz";
+      name = "xtend-4.0.0.tgz";
+      sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xtend"."~4.0.0" =
+    self.by-version."xtend"."4.0.0";
+  by-spec."yamlish"."*" =
+    self.by-version."yamlish"."0.0.7";
+  by-version."yamlish"."0.0.7" = self.buildNodePackage {
+    name = "yamlish-0.0.7";
+    version = "0.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.7.tgz";
+      name = "yamlish-0.0.7.tgz";
+      sha1 = "b4af9a1dcc63618873c3d6e451ec3213c39a57fb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."yauzl"."~2.3.0" =
+    self.by-version."yauzl"."2.3.1";
+  by-version."yauzl"."2.3.1" = self.buildNodePackage {
+    name = "yauzl-2.3.1";
+    version = "2.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/yauzl/-/yauzl-2.3.1.tgz";
+      name = "yauzl-2.3.1.tgz";
+      sha1 = "6707fe2b6a4dac9445cc429bf04a11c7dedfa36a";
+    };
+    deps = {
+      "fd-slicer-1.0.1" = self.by-version."fd-slicer"."1.0.1";
+      "pend-1.2.0" = self.by-version."pend"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "yauzl" = self.by-version."yauzl"."2.3.1";
+  by-spec."yawl"."~1.0.2" =
+    self.by-version."yawl"."1.0.2";
+  by-version."yawl"."1.0.2" = self.buildNodePackage {
+    name = "yawl-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/yawl/-/yawl-1.0.2.tgz";
+      name = "yawl-1.0.2.tgz";
+      sha1 = "df1301cb50e5bc74cc36d5c1ef9cfbd1f84b408e";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "pend-1.2.0" = self.by-version."pend"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "yawl" = self.by-version."yawl"."1.0.2";
+  by-spec."yazl"."~2.2.2" =
+    self.by-version."yazl"."2.2.2";
+  by-version."yazl"."2.2.2" = self.buildNodePackage {
+    name = "yazl-2.2.2";
+    version = "2.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/yazl/-/yazl-2.2.2.tgz";
+      name = "yazl-2.2.2.tgz";
+      sha1 = "60187f4ce6df314e7501c3c0e40bcf1b58fda183";
+    };
+    deps = {
+      "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "yazl" = self.by-version."yazl"."2.2.2";
+  by-spec."ytdl-core".">=0.5.1" =
+    self.by-version."ytdl-core"."0.5.1";
+  by-version."ytdl-core"."0.5.1" = self.buildNodePackage {
+    name = "ytdl-core-0.5.1";
+    version = "0.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ytdl-core/-/ytdl-core-0.5.1.tgz";
+      name = "ytdl-core-0.5.1.tgz";
+      sha1 = "3c48d696b019d7faae635a3f1e4eaa9131110f43";
+    };
+    deps = {
+      "cheerio-0.18.0" = self.by-version."cheerio"."0.18.0";
+      "jstream-0.2.7" = self.by-version."jstream"."0.2.7";
+      "request-2.57.0" = self.by-version."request"."2.57.0";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "ytdl-core" = self.by-version."ytdl-core"."0.5.1";
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e232a8a52bf..589003df7bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8776,6 +8776,8 @@ let
 
   ghostOne = callPackage ../servers/games/ghost-one { };
 
+  groovebasin = callPackage ../applications/audio/groovebasin { };
+
   ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
 
   jboss = callPackage ../servers/http/jboss { };

From 46d46fd05a8b7516ab70ed4101130013a45435cb Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Thu, 18 Jun 2015 14:00:29 +0200
Subject: [PATCH 1296/2322] R: update to 3.2.1

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

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 72de0677e73..0f13faf7513 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "R-3.2.0";
+  name = "R-3.2.1";
 
   src = fetchurl {
     url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
-    sha256 = "0dagyqgvi8i3nw158qi2zpwm04s4ffzvnmk5niaksvxs30zrbbpm";
+    sha256 = "d59dbc3f04f4604a5cf0fb210b8ea703ef2438b3ee65fd5ab536ec5234f4c982";
   };
 
   buildInputs = [ bzip2 gfortran libX11 libXmu libXt

From 7b207ab10b3580a4727c52c9d0af204162b785cd Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Thu, 18 Jun 2015 14:08:39 +0200
Subject: [PATCH 1297/2322] nsd: update 4.1.1 -> 4.1.2

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

diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index a6bb4171934..d3f6cc24e3b 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -13,11 +13,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nsd-4.1.1";
+  name = "nsd-4.1.2";
 
   src = fetchurl {
     url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
-    sha256 = "b0c3fab40ac7a8b5ffca642bc9e1b424aa72aebd03adf13a1f24ab4874734640";
+    sha256 = "0kb4jcckf4di9c88c09vb8ngbq19yh8njrp16yk2cic8p1dvf545";
   };
 
   buildInputs = [ libevent openssl ];

From e88de8308bcf8f97621bae1bf60f81383e163797 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 18 Jun 2015 14:11:55 +0200
Subject: [PATCH 1298/2322] pinentry: 0.9.1 -> 0.9.4

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

diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 757959f5345..2b41ce9ee4d 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -10,11 +10,11 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "pinentry-0.9.1";
+  name = "pinentry-0.9.4";
 
   src = fetchurl {
     url = "mirror://gnupg/pinentry/${name}.tar.bz2";
-    sha256 = "15cn7q6wg3k433l9ks48pz4dbikp7ysp0h8jqynz6p9rdf2qxl4w";
+    sha256 = "1q72ir9r9j70px61rdpd80an56k4ixmzy810nr14aildffxkb22b";
   };
 
   buildInputs = [ libcap gtk2 ncurses qt4 ];

From fe010d893df559395d68d36ea567d68b355227bc Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Thu, 18 Jun 2015 14:13:27 +0200
Subject: [PATCH 1299/2322] darktable: update 1.6.6 -> 1.6.7

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

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 3398fed6595..b89d59217ac 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -9,12 +9,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "1.6.6";
+  version = "1.6.7";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "1991zm0ly2j69vq9jsijfrjw0vnchh3il7m4ylsblzk73614nppq";
+    sha256 = "162c9kdj71az0ipaw4kiqcxhig0hcbmzw936d390r8zhkns76l57";
   };
 
   buildInputs =

From fd799c878e2f740b648e1b6979d589947dab6609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Thu, 18 Jun 2015 14:22:17 +0200
Subject: [PATCH 1300/2322] setbfree: update from 0.7.5 to 0.8.0

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

diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix
index 5119c384cf6..5a5d500a0e7 100644
--- a/pkgs/applications/audio/setbfree/default.nix
+++ b/pkgs/applications/audio/setbfree/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation  rec {
   name = "setbfree-${version}";
-  version = "0.7.5";
+  version = "0.8.0";
 
   src = fetchurl {
     url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz";
-    sha256 = "1chlmgwricc6l4kyg35vc9v8f1n8psr28iihn4a9q2prj1ihqcbc";
+    sha256 = "1lfylai4gyk512dknj16w2aq9ka8hvqca46nmq5b4rfjmi6dkxf6";
   };
 
   patchPhase = ''

From ddeb2f5cceef9d5cc146972850e6990cec1e7981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 18 Jun 2015 14:45:43 +0200
Subject: [PATCH 1301/2322] firefox: fix file-dialogs and icons with gtk3

There was the usual crashing and a few icons missing.
@lethalman: I think it's best to start putting $XDG_ICON_DIRS into suffix
instead of prefix (as here), so user-installed icons take precedence.

/cc #7743.
---
 pkgs/applications/networking/browsers/firefox/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 727f89fe668..f10df2dc996 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -95,6 +95,11 @@ stdenv.mkDerivation rec {
 
       # Remove SDK cruft. FIXME: move to a separate output?
       rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
+    '' + lib.optionalString enableGTK3
+    ''
+      wrapProgram "$out/bin/firefox" \
+        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \
+        --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
     '';
 
   meta = {

From 3b00ee222873e4d79c61264544f8d5cafeb8910c Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 18 Jun 2015 15:10:04 +0200
Subject: [PATCH 1302/2322] Add setuptools_scm package

---
 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 e829be5a21e..cb1fb7285e1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11485,6 +11485,29 @@ let
     '';
   };
 
+  setuptools_scm = buildPythonPackage rec {
+    name = "setuptools_scm-${version}";
+    version = "1.5.4";
+
+    src = pkgs.fetchurl {
+      url = "https://bitbucket.org/pypa/setuptools_scm/get/v${version}.tar.bz2";
+      sha256 = "0vd6xsl7r0vn5gpw87d31s195j33sqw5c26zdagimy9qzydgq6y6";
+    };
+
+    buildInputs = with self; [ pip ];
+
+    preBuild = ''
+      ${python.interpreter} setup.py egg_info
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = https://bitbucket.org/pypa/setuptools_scm/;
+      description = "Handles managing your python package versions in scm metadata";
+      license = licenses.mit;
+      maintainers = with maintainers; [ jgeerds ];
+    };
+  };
+
   setuptoolsDarcs = buildPythonPackage {
     name = "setuptools-darcs-1.2.9";
 

From 9df19f6c0a2f6fa178dcf9282e1b7dfc5d9ac6dd Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 18 Jun 2015 15:15:49 +0200
Subject: [PATCH 1303/2322] requests_toolbelt: 0.3.0 -> 0.4.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 cb1fb7285e1..45148de8ac3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10775,12 +10775,12 @@ let
   };
 
   requests_toolbelt = buildPythonPackage rec {
-    version = "0.3.0";
+    version = "0.4.0";
     name = "requests-toolbelt-${version}";
 
     src = pkgs.fetchurl {
       url = "https://github.com/sigmavirus24/requests-toolbelt/archive/${version}.tar.gz";
-      sha256 = "177lqpm2czx81pjg0zfs1dkbbmcn5yf1y5qxj23x6y5d28518qwl";
+      sha256 = "0zvfz4c9lqiwh2qh51rba6ckpjl3pbp9fcm0ri58qhcjd8mh8k34";
     };
 
     propagatedBuildInputs = with self; [ requests2 ];
@@ -10788,7 +10788,7 @@ let
     meta = {
       description = "A toolbelt of useful classes and functions to be used with python-requests";
       homepage = http://toolbelt.rtfd.org;
-      maintainers = with maintainers; [ matthiasbeyer ];
+      maintainers = with maintainers; [ matthiasbeyer jgeerds ];
     };
 
   };

From 124c2b14bbcbb663eed0431c18c56f6b4a390ea0 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Thu, 18 Jun 2015 14:40:11 +0200
Subject: [PATCH 1304/2322] vdirsyncer: 0.4.3 -> 0.5.2

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

diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 86e424ad08b..abe6a8adc14 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "0.4.3";
+  version = "0.5.2";
   name = "vdirsyncer-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/untitaker/vdirsyncer/archive/${version}.tar.gz";
-    sha256 = "0jrxmq8lq0dvqflmh42hhyvc3jjrg1cg3gzfhdcsskj9zz0m6wai";
+    sha256 = "02k6ijj0z0r08l50ignm2ngd4ax84l0r1wshh1is0wcfr70d94h9";
   };
 
   propagatedBuildInputs = with pythonPackages; [
-    icalendar
     click
     lxml
     setuptools
+    setuptools_scm
     requests_toolbelt
     requests2
     atomicwrites

From 0a597ec0947fcd928d588ac428b596a876c71d1b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 8 Jun 2015 01:19:14 +0300
Subject: [PATCH 1305/2322] tmux: Homepage & releases no longer hosted at
 sourceforge

---
 pkgs/tools/misc/tmux/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index f559c77712a..c906f0a2910 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, ncurses, libevent, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "tmux-2.0";
+  name = "tmux-${version}";
+  version = "2.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/tmux/${name}.tar.gz";
+    url = "https://github.com/tmux/tmux/releases/download/${version}/${name}.tar.gz";
     sha256 = "0qnkda8kb747vmbldjpb23ksv9pq3s65xhh1ja5rdsmh8r24npvr";
   };
 
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://tmux.sourceforge.net/;
+    homepage = http://tmux.github.io/;
     description = "Terminal multiplexer";
 
     longDescription =

From d691bf0d4f2dec6170f4961fcaafdef242b772c5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 7 Jun 2015 10:59:57 +0200
Subject: [PATCH 1306/2322] proj: update from 4.8.0 to 4.9.1 (close #8235)

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

diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 85962d56cc3..87f5fe96f1a 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -1,22 +1,13 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "proj-4.8.0";
+  name = "proj-4.9.1";
 
   src = fetchurl {
-    url = http://download.osgeo.org/proj/proj-4.8.0.tar.gz;
-    sha256 = "1dfim63ks298204lv2z0v16njz6fs7bf0m4icy09i3ffzvqdpcid";
+    url = http://download.osgeo.org/proj/proj-4.9.1.tar.gz;
+    sha256 = "06f36s7yi6yky92g235kj9wkcckm04qgzxnj0fla3icb7y7ki87w";
   };
 
-  postConfigure = ''
-    patch src/Makefile <<EOF
-    272c272
-    < include_HEADERS = proj_api.h org_proj4_Projections.h
-    ---
-    > include_HEADERS = proj_api.h org_proj4_Projections.h projects.h
-    EOF
-  '';
-
   meta = with stdenv.lib; {
     description = "Cartographic Projections Library";
     homepage = http://trac.osgeo.org/proj/;

From a0301e9ce2fd8e4b9973ab04ba7e054bafd31740 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 14 Jun 2015 21:27:14 -0500
Subject: [PATCH 1307/2322] nixpkgs: saw-tools 0.1-20150609

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/saw-tools/default.nix       | 61 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/applications/science/logic/saw-tools/default.nix

diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix
new file mode 100644
index 00000000000..3231e2a7b80
--- /dev/null
+++ b/pkgs/applications/science/logic/saw-tools/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, gmp4, ncurses, zlib, makeWrapper, clang_35 }:
+
+let
+  libPath = stdenv.lib.makeLibraryPath
+    [ stdenv.cc.libc
+      stdenv.cc.cc
+      gmp4
+      ncurses
+      zlib
+    ] + ":${stdenv.cc.cc}/lib64";
+
+  url = "https://github.com/GaloisInc/saw-script/releases/download";
+
+  saw-bin =
+    if stdenv.system == "i686-linux"
+    then fetchurl {
+      url    = url + "/v0.1-dev/saw-0.1-dev-2015-06-09-CentOS6-32.tar.gz";
+      sha256 = "0hfb3a749fvwn33jnj1bgpk7v4pbvjjjffhafck6s8yz2sknnq4w";
+    }
+    else fetchurl {
+      url    = url + "/v0.1-dev/saw-0.1-dev-2015-06-09-CentOS6-64.tar.gz";
+      sha256 = "1yz56kr8s0jcrfk1i87x63ngxip2i1s123arydnqq8myjyfz8id9";
+    };
+in
+stdenv.mkDerivation rec {
+  name    = "saw-tools-${version}";
+  version = "0.1-20150609";
+
+  src = saw-bin;
+
+  installPhase = ''
+    mkdir -p $out/lib $out/share
+
+    mv bin $out/bin
+    mv doc $out/share
+
+    # Hack around lack of libtinfo in NixOS
+    ln -s ${ncurses}/lib/libncursesw.so.5       $out/lib/libtinfo.so.5
+    ln -s ${stdenv.cc.libc}/lib/libpthread.so.0 $out/lib/libpthread.so.0
+
+    # Add a clang symlink for easy building with a suitable compiler.
+    ln -s ${clang_35}/bin/clang $out/bin/saw-clang
+  '';
+
+  fixupPhase = ''
+    for x in bin/bcdump bin/extcore-info bin/jss bin/llvm-disasm bin/lss bin/saw; do
+      patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        --set-rpath "$out/lib:${libPath}" $out/$x;
+    done
+  '';
+
+  phases = "unpackPhase installPhase fixupPhase";
+
+  meta = {
+    description = "Tools for software verification and analysis";
+    homepage    = "https://saw.galois.com";
+    license     = stdenv.lib.licenses.unfreeRedistributable;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a91cb010a39..fd1633ebe73 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14169,6 +14169,8 @@ let
 
   satallax = callPackage ../applications/science/logic/satallax {};
 
+  saw-tools = callPackage ../applications/science/logic/saw-tools {};
+
   spass = callPackage ../applications/science/logic/spass {};
 
   tptp = callPackage ../applications/science/logic/tptp {};

From c3fcd5ecb777099e3f5a9c26da7503afd0cee9d2 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 18 Jun 2015 11:37:06 -0500
Subject: [PATCH 1308/2322] nixpkgs: Remove bunk 'infer' expression

This was accidentally committed because I'm a goof - see
1ee742b0ef2904788e1775d73de42c00492e8c4f.

Thanks to ftrvxmtrx on IRC for spotting.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../tools/analysis/infer/default.nix          | 33 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 35 deletions(-)
 delete mode 100644 pkgs/development/tools/analysis/infer/default.nix

diff --git a/pkgs/development/tools/analysis/infer/default.nix b/pkgs/development/tools/analysis/infer/default.nix
deleted file mode 100644
index 35dbd08a870..00000000000
--- a/pkgs/development/tools/analysis/infer/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, python }:
-
-stdenv.mkDerivation rec {
-  name    = "infer-${version}";
-  version = "0.1.0";
-
-  src = fetchurl {
-    url = "https://github.com/facebook/infer/releases/download/v${version}/infer-linux64-v${version}.tar.xz";
-    sha256 = "1kppiayzqwmm13aq8x1jxd3j4jywh3h37jxrgyipz8li1ddpdq3m";
-  };
-
-  buildInputs = [ python ];
-  buildPhase = "true";
-  installPhase = ''
-    mkdir -p $out/libexec $out/bin;
-    cp -R facebook-clang-plugin $out/libexec
-    cp -R infer $out/libexec
-    for x in `ls $out/libexec/infer/infer/bin`; do
-      ln -s $out/libexec/infer/infer/bin/$x $out/bin/$x;
-    done
-  '';
-  fixupPhase = ''
-    patchShebangs $out
-  '';
-
-  meta = {
-    description = "Scalable static analyzer for Java, C and Objective-C";
-    homepage    = http://fbinfer.com;
-    license     = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
-    platforms   = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd1633ebe73..1e2dd6ad220 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5313,8 +5313,6 @@ let
 
   csslint = callPackage ../development/web/csslint { };
 
-  infer = callPackage ../development/tools/analysis/infer { };
-
   libcxx = llvmPackages.libcxx;
   libcxxabi = llvmPackages.libcxxabi;
 

From 710b3e6d79e06ed9b95f60067a3fcf567da895e5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 18 Jun 2015 18:41:25 +0200
Subject: [PATCH 1309/2322] proj: add myself as maintainer

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

diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 87f5fe96f1a..597dc2c4786 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -13,5 +13,6 @@ stdenv.mkDerivation {
     homepage = http://trac.osgeo.org/proj/;
     license = licenses.mit;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ vbgl ];
   };
 }

From 5c7fb3a9b52c158e6f0915924563148b529ad5f8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 18 Jun 2015 12:58:16 -0500
Subject: [PATCH 1310/2322] haskell-bindings-levmar: build with openblasCompat

---
 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 8a9127307e4..751e0fb4825 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -132,7 +132,7 @@ self: super: {
       sed -i bindings-levmar.cabal \
           -e 's,extra-libraries: lapack blas,extra-libraries: openblas,'
     '';
-    extraLibraries = [ pkgs.openblas ];
+    extraLibraries = [ pkgs.openblasCompat ];
   });
 
   # The Haddock phase fails for one reason or another.

From 8925d17034b21a719701f94a9a500f9e24b4fd64 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Thu, 18 Jun 2015 11:52:39 -0700
Subject: [PATCH 1311/2322] add myself as maintainer

---
 lib/maintainers.nix                               | 1 +
 pkgs/applications/audio/groovebasin/default.nix   | 1 +
 pkgs/development/libraries/libebur128/default.nix | 1 +
 pkgs/development/libraries/libgroove/default.nix  | 1 +
 pkgs/tools/security/rhash/default.nix             | 1 +
 5 files changed, 5 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 88c513eacab..018d515155a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -22,6 +22,7 @@
   AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>";
   anderspapitto = "Anders Papitto <anderspapitto@gmail.com>";
   andres = "Andres Loeh <ksnixos@andres-loeh.de>";
+  andrewrk = "Andrew Kelley <superjoe30@gmail.com>";
   antono = "Antono Vasiljev <self@antono.info>";
   ardumont = "Antoine R. Dumont <eniotna.t@gmail.com>";
   aristid = "Aristid Breitkreuz <aristidb@gmail.com>";
diff --git a/pkgs/applications/audio/groovebasin/default.nix b/pkgs/applications/audio/groovebasin/default.nix
index e7ac20367dd..5a5f8c30da2 100644
--- a/pkgs/applications/audio/groovebasin/default.nix
+++ b/pkgs/applications/audio/groovebasin/default.nix
@@ -38,6 +38,7 @@ in nodePackages.buildNodePackage rec {
     homepage = http://groovebasin.com/;
     license = licenses.mit;
     platforms = platforms.unix;
+    maintainers = [ maintainers.andrewrk ];
     longDescription = ''
       Groove Basin runs on a server optionally connected to speakers. Guests can
       control the music player by connecting with a laptop, tablet, or smart phone.
diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix
index e11e2b1db85..db8363d8522 100644
--- a/pkgs/development/libraries/libebur128/default.nix
+++ b/pkgs/development/libraries/libebur128/default.nix
@@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
     description = "Implementation of the EBU R128 loudness standard";
     homepage = https://github.com/jiixyj/libebur128;
     license = licenses.mit;
+    maintainers = [ maintainers.andrewrk ];
   };
 }
diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix
index 69545e4720c..ac6c9d297cc 100644
--- a/pkgs/development/libraries/libgroove/default.nix
+++ b/pkgs/development/libraries/libgroove/default.nix
@@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/andrewrk/libgroove;
     license = licenses.mit;
     platforms = platforms.unix;
+    maintainers = [ maintainers.andrewrk ];
   };
 }
diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix
index 643053d9cac..40f5163d89d 100644
--- a/pkgs/tools/security/rhash/default.nix
+++ b/pkgs/tools/security/rhash/default.nix
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
     homepage = http://rhash.anz.ru;
     description = "Console utility and library for computing and verifying hash sums of files";
     platforms = platforms.linux;
+    maintainers = [ maintainers.andrewrk ];
   };
 }

From fa9c81f69468098e0dd0ca79ea4d2ef74ec6bc0c Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 11 Jun 2015 17:58:26 -0700
Subject: [PATCH 1312/2322] pure darwin stdenv

---
 .../compilers/llvm/3.6/default.nix            |   2 +-
 .../interpreters/perl/5.16/default.nix        |  11 +
 .../interpreters/perl/5.20/default.nix        |  11 +
 .../interpreters/python/2.7/default.nix       |   4 +
 .../development/libraries/gettext/default.nix |   7 +-
 pkgs/development/libraries/icu/default.nix    |   5 +
 .../development/libraries/libedit/default.nix |   2 +-
 pkgs/development/libraries/zlib/default.nix   |   7 +
 .../tools/misc/binutils/default.nix           |   6 +-
 pkgs/os-specific/darwin/adv_cmds/locale.nix   |  29 ++
 pkgs/os-specific/darwin/binutils/default.nix  |  39 ++
 pkgs/stdenv/darwin/default.nix                | 362 +++++++++++++-----
 pkgs/stdenv/darwin/make-bootstrap-tools.nix   |  10 +-
 pkgs/stdenv/default.nix                       |   2 +-
 pkgs/stdenv/generic/default.nix               |  27 +-
 pkgs/tools/archivers/gnutar/default.nix       |   6 +
 pkgs/tools/archivers/sharutils/default.nix    |   2 +-
 pkgs/tools/text/gawk/default.nix              |  11 +-
 pkgs/top-level/all-packages.nix               |  24 +-
 19 files changed, 435 insertions(+), 132 deletions(-)
 create mode 100644 pkgs/os-specific/darwin/adv_cmds/locale.nix
 create mode 100644 pkgs/os-specific/darwin/binutils/default.nix

diff --git a/pkgs/development/compilers/llvm/3.6/default.nix b/pkgs/development/compilers/llvm/3.6/default.nix
index 3321e38949f..d95ffe47326 100644
--- a/pkgs/development/compilers/llvm/3.6/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/default.nix
@@ -1,6 +1,6 @@
 { pkgs, newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
 let
-  callPackage = newScope (self // { inherit isl version fetch; });
+  callPackage = newScope (self // { inherit stdenv isl version fetch; });
 
   version = "3.6.1";
 
diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index 9ed3aa54f51..568025edfd4 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -24,6 +24,17 @@ stdenv.mkDerivation rec {
     ++ lib.optional stdenv.isSunOS  ./ld-shared.patch
     ++ lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ;
 
+  # There's an annoying bug on sandboxed Darwin in Perl's Cwd.pm where it looks for pwd
+  # in /bin/pwd and /usr/bin/pwd and then falls back on just "pwd" if it can't get them
+  # while at the same time erasing the PATH environment variable so it unconditionally
+  # fails. The code in question is guarded by a check for Mac OS, but the patch below
+  # doesn't have any runtime effect on other platforms.
+  postPatch = ''
+    pwd="$(type -P pwd)"
+    substituteInPlace dist/Cwd/Cwd.pm \
+      --replace "pwd_cmd = 'pwd'" "pwd_cmd = '$pwd'"
+  '';
+
   # Build a thread-safe Perl with a dynamic libperls.o.  We need the
   # "installstyle" option to ensure that modules are put under
   # $out/lib/perl5 - this is the general default, but because $out
diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix
index 0ad955d0363..bfdb09e779a 100644
--- a/pkgs/development/interpreters/perl/5.20/default.nix
+++ b/pkgs/development/interpreters/perl/5.20/default.nix
@@ -35,6 +35,17 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.isSunOS ./ld-shared.patch
     ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ;
 
+  # There's an annoying bug on sandboxed Darwin in Perl's Cwd.pm where it looks for pwd
+  # in /bin/pwd and /usr/bin/pwd and then falls back on just "pwd" if it can't get them
+  # while at the same time erasing the PATH environment variable so it unconditionally
+  # fails. The code in question is guarded by a check for Mac OS, but the patch below
+  # doesn't have any runtime effect on other platforms.
+  postPatch = ''
+    pwd="$(type -P pwd)"
+    substituteInPlace dist/PathTools/Cwd.pm \
+      --replace "pwd_cmd = 'pwd'" "pwd_cmd = '$pwd'"
+  '';
+
   # Build a thread-safe Perl with a dynamic libperls.o.  We need the
   # "installstyle" option to ensure that modules are put under
   # $out/lib/perl5 - this is the general default, but because $out
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 4ad4679bd6e..9e1f0e61744 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -62,6 +62,8 @@ let
       for i in Lib/plat-*/regen; do
         substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/
       done
+    '' + optionalString stdenv.isDarwin ''
+      substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
     '';
 
   configureFlags = [
@@ -72,6 +74,8 @@ let
     "--with-system-ffi"
     "--with-system-expat"
     "ac_cv_func_bind_textdomain_codeset=yes"
+  ] ++ optionals stdenv.isDarwin [
+    "--disable-toolbox-glue"
   ];
 
   postConfigure = if stdenv.isCygwin then ''
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 15f11f8a133..f86a15cb0d6 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -19,7 +19,12 @@ stdenv.mkDerivation (rec {
             "--with-included-gettext"
             "--with-included-glib"
             "--with-included-libcroco"
-          ]);
+          ])
+     # avoid retaining reference to CF during stdenv bootstrap
+     ++ (stdenv.lib.optionals stdenv.isDarwin [
+        "gt_cv_func_CFPreferencesCopyAppValue=no"
+        "gt_cv_func_CFLocaleCopyCurrent=no"
+      ]);
 
   # On cross building, gettext supposes that the wchar.h from libc
   # does not fulfill gettext needs, so it tries to work with its
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index e95cb7ad097..909f4e936a9 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -32,6 +32,11 @@ stdenv.mkDerivation {
   configureFlags = "--disable-debug" +
     stdenv.lib.optionalString 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
+  '';
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index dc2f5842b28..5adef716eb0 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   ] else null;
 
   postInstall = ''
-    sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.nativeTools) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc
+    sed -i s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc
   '';
 
   configureFlags = [ "--enable-widec" ];
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 419a2584ca8..93474d14344 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -13,6 +13,13 @@ stdenv.mkDerivation (rec {
     sha256 = "039agw5rqvqny92cpkrfn243x2gd4xn13hs3xi6isk55d2vqqr9n";
   };
 
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace configure \
+      --replace '/usr/bin/libtool' 'ar' \
+      --replace 'AR="libtool"' 'AR="ar"' \
+      --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
+  '';
+
   configureFlags = if static then "" else "--shared";
 
   preConfigure = ''
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index f740c60c487..4b2a55c1d90 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -2,8 +2,6 @@
 , cross ? null, gold ? true, bison ? null
 }:
 
-assert !stdenv.isDarwin;
-
 let basename = "binutils-2.23.1"; in
 
 with { inherit (stdenv.lib) optional optionals optionalString; };
@@ -56,7 +54,9 @@ stdenv.mkDerivation rec {
 
   # As binutils takes part in the stdenv building, we don't want references
   # to the bootstrap-tools libgcc (as uses to happen on arm/mips)
-  NIX_CFLAGS_COMPILE = "-static-libgcc";
+  NIX_CFLAGS_COMPILE = if stdenv.isDarwin
+    then "-Wno-string-plus-int -Wno-deprecated-declarations"
+    else "-static-libgcc";
 
   configureFlags =
     [ "--enable-shared" "--enable-deterministic-archives" ]
diff --git a/pkgs/os-specific/darwin/adv_cmds/locale.nix b/pkgs/os-specific/darwin/adv_cmds/locale.nix
new file mode 100644
index 00000000000..92de8a242e2
--- /dev/null
+++ b/pkgs/os-specific/darwin/adv_cmds/locale.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "locale-${version}";
+  version = "153";
+
+  src = fetchurl {
+    url    = "http://opensource.apple.com/tarballs/adv_cmds/adv_cmds-${version}.tar.gz";
+    sha256 = "174v6a4zkcm2pafzgdm6kvs48z5f911zl7k49hv7kjq6gm58w99v";
+  };
+
+  buildPhase = ''
+    cd locale
+    c++ -Os -Wall -o locale locale.cc
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man1
+
+    cp locale   $out/bin/locale
+    cp locale.1 $out/share/man/man1
+  '';
+
+
+  meta = {
+    platforms = stdenv.lib.platforms.darwin;
+    maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
+  };
+}
diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix
new file mode 100644
index 00000000000..abe4aa67b14
--- /dev/null
+++ b/pkgs/os-specific/darwin/binutils/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, binutils-raw, cctools }:
+
+stdenv.mkDerivation {
+  name = "cctools-binutils-darwin";
+  buildCommand = ''
+    mkdir -p $out/bin $out/include
+
+    ln -s ${binutils-raw}/bin/c++filt $out/bin/c++filt
+
+    # We specifically need:
+    # - ld: binutils doesn't provide it on darwin
+    # - as: as above
+    # - ar: the binutils one prodices .a files that the cctools ld doesn't like
+    # - ranlib: for compatibility with ar
+    # - dsymutil: soon going away once it goes into LLVM (this one is fake anyway)
+    # - otool: we use it for some of our name mangling
+    # - install_name_tool: we use it to rewrite stuff in our bootstrap tools
+    # - strip: the binutils one seems to break mach-o files
+    # - lipo: gcc build assumes it exists
+    # - nm: the gnu one doesn't understand many new load commands
+    for i in ar ranlib as dsymutil install_name_tool ld strip otool lipo nm strings size; do
+      ln -sf "${cctools}/bin/$i" "$out/bin/$i"
+    done
+
+    for i in ${binutils-raw}/include/*.h; do
+      ln -s "$i" "$out/include/$(basename $i)"
+    done
+
+    for i in ${cctools}/include/*; do
+      ln -s "$i" "$out/include/$(basename $i)"
+    done
+
+    # FIXME: this will give us incorrect man pages for bits of cctools
+    ln -s ${binutils-raw}/share $out/share
+    ln -s ${binutils-raw}/lib $out/lib
+
+    ln -s ${cctools}/libexec $out/libexec
+  '';
+}
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index ac396ecdf12..d4b17a7909c 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -4,144 +4,294 @@
 , config      ? {}
 }:
 
-rec {
+let
+  fetch = { file, sha256 }: import <nix/fetchurl.nix> {
+    url = "https://dl.dropboxusercontent.com/u/2857322/${file}";
+    inherit sha256;
+    executable = true;
+  };
+
+  bootstrapFiles = {
+    sh    = fetch { file = "sh";    sha256 = "1qakpg37vl61jnkplz13m3g1csqr85cg8ybp6jwiv6apmg26isnm"; };
+    bzip2 = fetch { file = "bzip2"; sha256 = "1gxa67255q9v00j1vn1mzyrnbwys2g1102cx02vpcyvvrl4vqxr0"; };
+    mkdir = fetch { file = "mkdir"; sha256 = "1yfl8w65ksji7fggrbvqxw8lp0gm02qilk11n9axj2jxay53ngvg"; };
+    cpio  = fetch { file = "cpio";  sha256 = "0nssyg19smgcblwq1mfcw4djbd85md84d2f093qcqkbigdjg484b"; };
+  };
+  tarball = fetch { file = "bootstrap-tools.9.cpio.bz2"; sha256 = "0fd79k7gy3z3sba5w4f4lnrcpiwff31vw02480x1pdry8bbgbf2j"; };
+in rec {
   allPackages = import ../../top-level/all-packages.nix;
 
-  bootstrapTools = derivation {
-    inherit system;
-
-    name    = "trivial-bootstrap-tools";
-    builder = "/bin/sh";
-    args    = [ ./trivial-bootstrap.sh ];
-
-    mkdir   = "/bin/mkdir";
-    ln      = "/bin/ln";
-  };
-
-  # The simplest stdenv possible to run fetchadc and get the Apple command-line tools
-  stage0 = rec {
-    fetchurl = import ../../build-support/fetchurl {
-      inherit stdenv;
-      curl = bootstrapTools;
-    };
-
-    stdenv = import ../generic {
-      inherit system config;
-      name         = "stdenv-darwin-boot-0";
-      shell        = "/bin/bash";
-      initialPath  = [ bootstrapTools ];
-      fetchurlBoot = fetchurl;
-      cc           = "/no-such-path";
-    };
-  };
-
-  buildTools = import ../../os-specific/darwin/command-line-tools {
-    inherit (stage0) stdenv fetchurl;
-    xar  = bootstrapTools;
-    gzip = bootstrapTools;
-    cpio = bootstrapTools;
-  };
-
-  preHook = ''
+  commonPreHook = ''
+    export NIX_ENFORCE_PURITY=1
     export NIX_IGNORE_LD_THROUGH_GCC=1
-    export NIX_DONT_SET_RPATH=1
-    export NIX_NO_SELF_RPATH=1
-    dontFixLibtool=1
     stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
-    xargsFlags=" "
     export MACOSX_DEPLOYMENT_TARGET=10.7
-    # Use the 10.9 SDK if we're running on 10.9, and 10.10 if we're
-    # running on 10.10. We need to use the 10.10 headers for functions
-    # like readlinkat() that are dynamically detected by configure
-    # scripts. Very impure, obviously.
-    export SDKROOT=$(/usr/bin/xcrun --sdk macosx"$(/usr/bin/sw_vers -productVersion | /usr/bin/cut -d. -f1,2)" --show-sdk-path 2> /dev/null || echo /)
-    export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$SDKROOT/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations"
-    export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib"
+    export SDKROOT=
     export CMAKE_OSX_ARCHITECTURES=x86_64
   '';
 
-  # A stdenv that wraps the Apple command-line tools and our other trivial symlinked bootstrap tools
-  stage1 = rec {
-    nativePrefix = "${buildTools.tools}/Library/Developer/CommandLineTools/usr";
+  # libSystem and its transitive dependencies. Get used to this; it's a recurring theme in darwin land
+  libSystemClosure = [
+    "/usr/lib/libSystem.dylib"
+    "/usr/lib/libSystem.B.dylib"
+    "/usr/lib/libobjc.A.dylib"
+    "/usr/lib/libobjc.dylib"
+    "/usr/lib/libauto.dylib"
+    "/usr/lib/libc++abi.dylib"
+    "/usr/lib/libc++.1.dylib"
+    "/usr/lib/libDiagnosticMessagesClient.dylib"
+    "/usr/lib/system"
+  ];
 
-    stdenv = import ../generic {
-      name = "stdenv-darwin-boot-1";
+  # The one dependency of /bin/sh :(
+  binShClosure = [ "/usr/lib/libncurses.5.4.dylib" ];
 
-      inherit system config;
-      inherit (stage0.stdenv) shell fetchurlBoot;
+  bootstrapTools = derivation rec {
+    inherit system tarball;
 
-      initialPath = stage0.stdenv.initialPath ++ [ nativePrefix ];
+    name    = "bootstrap-tools";
+    builder = bootstrapFiles.sh; # Not a filename! Attribute 'sh' on bootstrapFiles
+    args    = [ ./unpack-bootstrap-tools.sh ];
 
-      preHook = preHook + "\n" + ''
-        export NIX_LDFLAGS_AFTER+=" -L/usr/lib"
-        export NIX_ENFORCE_PURITY=
-        export NIX_CFLAGS_COMPILE+=" -isystem ${nativePrefix}/include/c++/v1 -stdlib=libc++"
-        export NIX_CFLAGS_LINK+=" -stdlib=libc++ -Wl,-rpath,${nativePrefix}/lib"
-      '';
+    inherit (bootstrapFiles) mkdir bzip2 cpio;
 
-      cc = import ../../build-support/cc-wrapper {
-        nativeTools  = true;
-        nativePrefix = nativePrefix;
-        nativeLibc   = true;
-        stdenv       = stage0.stdenv;
-        shell        = "/bin/bash";
-        cc           = {
-          name    = "clang-9.9.9";
-          cc      = "/usr";
-          outPath = nativePrefix;
+    __impureHostDeps  = binShClosure ++ libSystemClosure;
+  };
+
+  stageFun = step: last: {shell             ? "${bootstrapTools}/bin/sh",
+                          overrides         ? (pkgs: {}),
+                          extraPreHook      ? "",
+                          extraBuildInputs  ? with last.pkgs; [ xz darwin.CF libcxx ],
+                          extraInitialPath  ? [],
+                          allowedRequisites ? null}:
+    let
+      thisStdenv = import ../generic {
+        inherit system config shell extraBuildInputs allowedRequisites;
+
+        name = "stdenv-darwin-boot-${toString step}";
+
+        cc = if isNull last then "/no-such-path" else import ../../build-support/cc-wrapper {
+          inherit shell;
+          inherit (last) stdenv;
+          inherit (last.pkgs.darwin) dyld;
+
+          nativeTools  = true;
+          nativePrefix = bootstrapTools;
+          nativeLibc   = false;
+          libc         = last.pkgs.darwin.Libsystem;
+          cc           = { name = "clang-9.9.9"; outPath = bootstrapTools; };
         };
-        isClang      = true;
+
+        preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/sh") ''
+          # Don't patch #!/interpreter because it leads to retained
+          # dependencies on the bootstrapTools in the final stdenv.
+          dontPatchShebangs=1
+        '' + ''
+          ${commonPreHook}
+          ${extraPreHook}
+        '';
+        initialPath  = extraInitialPath ++ [ bootstrapTools ];
+        fetchurlBoot = import ../../build-support/fetchurl {
+          stdenv = stage0.stdenv;
+          curl   = bootstrapTools;
+        };
+
+        # The stdenvs themselves don't use mkDerivation, so I need to specify this here
+        __stdenvImpureHostDeps = binShClosure ++ libSystemClosure;
+        __extraImpureHostDeps  = binShClosure ++ libSystemClosure;
+
+        extraAttrs = { inherit platform; };
+        overrides  = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; };
       };
+
+      thisPkgs = allPackages {
+        inherit system platform;
+        bootStdenv = thisStdenv;
+      };
+    in { stdenv = thisStdenv; pkgs = thisPkgs; };
+
+  stage0 = stageFun 0 null {
+    overrides = orig: with stage0; rec {
+      darwin = orig.darwin // {
+        Libsystem = stdenv.mkDerivation {
+          name = "bootstrap-Libsystem";
+          buildCommand = ''
+            mkdir -p $out
+            ln -s ${bootstrapTools}/lib $out/lib
+            ln -s ${bootstrapTools}/include-Libsystem $out/include
+          '';
+        };
+        dyld = bootstrapTools;
+      };
+
+      libcxx = stdenv.mkDerivation {
+        name = "bootstrap-libcxx";
+        phases = [ "installPhase" "fixupPhase" ];
+        installPhase = ''
+          mkdir -p $out/lib $out/include
+          ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib
+          ln -s ${bootstrapTools}/include/c++      $out/include/c++
+        '';
+        setupHook = ../../development/compilers/llvm/3.5/libc++/setup-hook.sh;
+      };
+
+      libcxxabi = stdenv.mkDerivation {
+        name = "bootstrap-libcxxabi";
+        buildCommand = ''
+          mkdir -p $out/lib
+          ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib
+        '';
+      };
+
     };
-    pkgs = allPackages {
-      inherit system platform;
-      bootStdenv = stdenv;
+
+    extraBuildInputs = [];
+  };
+
+  persistent0 = _: {};
+
+  stage1 = with stage0; stageFun 1 stage0 {
+    extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
+    extraBuildInputs = [ pkgs.libcxx ];
+
+    allowedRequisites =
+      [ bootstrapTools ] ++ (with pkgs; [ libcxx libcxxabi ]) ++ [ pkgs.darwin.Libsystem ];
+
+    overrides = persistent0;
+  };
+
+  persistent1 = orig: with stage1.pkgs; {
+    inherit
+      zlib patchutils m4 scons flex perl bison unifdef unzip openssl icu python
+      libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff
+      openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz
+      findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils;
+
+    darwin = orig.darwin // {
+      inherit (darwin)
+        dyld Libsystem xnu configd libdispatch libclosure launchd;
     };
   };
 
-  stage2 = rec {
-    stdenv = import ../generic {
-      name = "stdenv-darwin-boot-2";
+  stage2 = with stage1; stageFun 2 stage1 {
+    allowedRequisites =
+      [ bootstrapTools ] ++
+      (with pkgs; [ xz libcxx libcxxabi icu ]) ++
+      (with pkgs.darwin; [ dyld Libsystem CF ]);
 
-      inherit system config;
-      inherit (stage1.stdenv) shell fetchurlBoot preHook cc;
+    overrides = persistent1;
+  };
 
-      initialPath = [ stage1.pkgs.xz ] ++ stage1.stdenv.initialPath;
-    };
-    pkgs = allPackages {
-      inherit system platform;
-      bootStdenv = stdenv;
+  persistent2 = orig: with stage2.pkgs; {
+    inherit
+      patchutils m4 scons flex perl bison unifdef unzip openssl python
+      gettext sharutils libarchive pkg-config groff bash subversion
+      openssh sqlite sed serf openldap db cyrus-sasl expat apr-util
+      findfreetype libssh curl cmake autoconf automake libtool cpio
+      libcxx libcxxabi;
+
+    darwin = orig.darwin // {
+      inherit (darwin)
+        dyld Libsystem xnu configd libdispatch libclosure launchd libiconv;
     };
   };
 
-  # Use stage1 to build a whole set of actual tools so we don't have to rely on the Apple prebuilt ones or
-  # the ugly symlinked bootstrap tools anymore.
-  stage3 = with stage2; import ../generic {
-    name = "stdenv-darwin-boot-3";
+  stage3 = with stage2; stageFun 3 stage2 {
+    shell = "${pkgs.bash}/bin/bash";
 
+    # We have a valid shell here (this one has no bootstrap-tools runtime deps) so stageFun
+    # enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting
+    # and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and
+    # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first.
+    extraInitialPath = [ pkgs.bash ];
+
+    allowedRequisites =
+      [ bootstrapTools ] ++
+      (with pkgs; [ icu bash libcxx libcxxabi ]) ++
+      (with pkgs.darwin; [ dyld Libsystem ]);
+
+    overrides = persistent2;
+  };
+
+  persistent3 = orig: with stage3.pkgs; {
+    inherit
+      gnumake gzip gnused bzip2 gawk ed xz patch bash
+      libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep
+      coreutils findutils diffutils patchutils;
+
+    llvmPackages = orig.llvmPackages // {
+      inherit (llvmPackages) llvm clang-unwrapped;
+    };
+
+    darwin = orig.darwin // {
+      inherit (darwin) dyld Libsystem libiconv;
+    };
+  };
+
+  stage4 = with stage3; stageFun 4 stage3 {
+    shell = "${pkgs.bash}/bin/bash";
+    extraInitialPath = [ pkgs.bash ];
+    overrides = persistent3;
+  };
+
+  persistent4 = orig: with stage4.pkgs; {
+    inherit
+      gnumake gzip gnused bzip2 gawk ed xz patch bash
+      libcxxabi libcxx ncurses libffi zlib icu llvm gmp pcre gnugrep
+      coreutils findutils diffutils patchutils binutils binutils-raw;
+
+    llvmPackages = orig.llvmPackages // {
+      inherit (llvmPackages) llvm clang-unwrapped;
+    };
+
+    darwin = orig.darwin // {
+      inherit (darwin) dyld Libsystem cctools CF libiconv;
+    };
+  };
+
+  stage5 = with stage4; import ../generic rec {
     inherit system config;
     inherit (stdenv) fetchurlBoot;
 
-    initialPath = (import ../common-path.nix) { inherit pkgs; };
+    name = "stdenv-darwin";
 
-    preHook = preHook + "\n" + ''
-      export NIX_ENFORCE_PURITY=1
-    '';
+    preHook = commonPreHook;
+
+    __stdenvImpureHostDeps = binShClosure ++ libSystemClosure;
+    __extraImpureHostDeps  = binShClosure ++ libSystemClosure;
+
+    initialPath = import ../common-path.nix { inherit pkgs; };
+    shell       = "${pkgs.bash}/bin/bash";
 
     cc = import ../../build-support/cc-wrapper {
-      inherit stdenv;
-      nativeTools   = false;
-      nativeLibc    = true;
-      binutils      = pkgs.darwin.cctools;
-      cc            = pkgs.llvmPackages.clang-unwrapped;
-      coreutils     = pkgs.coreutils;
-      shell         = "${pkgs.bash}/bin/bash";
-      extraPackages = [ pkgs.libcxx ];
-      isClang       = true;
+      inherit stdenv shell;
+      nativeTools = false;
+      nativeLibc  = false;
+      inherit (pkgs) coreutils binutils;
+      inherit (pkgs.darwin) dyld;
+      cc   = pkgs.llvmPackages.clang-unwrapped;
+      libc = pkgs.darwin.Libsystem;
     };
 
-    shell = "${pkgs.bash}/bin/bash";
-  };
+    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
 
-  stdenvDarwin = stage3;
+    extraAttrs = {
+      inherit platform bootstrapTools;
+      libc         = pkgs.darwin.Libsystem;
+      shellPackage = pkgs.bash;
+    };
+
+    allowedRequisites = (with pkgs; [
+      xz libcxx libcxxabi icu gmp gnumake findutils bzip2 llvm zlib libffi
+      coreutils ed diffutils gnutar gzip ncurses gnused bash gawk
+      gnugrep llvmPackages.clang-unwrapped patch pcre binutils-raw binutils gettext
+    ]) ++ (with pkgs.darwin; [
+      dyld Libsystem CF cctools libiconv
+    ]);
+
+    overrides = orig: persistent4 orig // {
+      clang = cc;
+      inherit cc;
+    };
+  };
 }
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 636410fdd78..433638dd1bd 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -63,13 +63,15 @@ rec {
 
       cp -d ${gnugrep.pcre}/lib/libpcre*.dylib $out/lib
       cp -d ${libiconv}/lib/libiconv*.dylib $out/lib
+      cp -d ${gettext}/lib/libintl*.dylib $out/lib
+      chmod +x $out/lib/libintl*.dylib
 
       # Copy what we need of clang
-      cp -d ${llvmPackages.clang}/bin/clang $out/bin
-      cp -d ${llvmPackages.clang}/bin/clang++ $out/bin
-      cp -d ${llvmPackages.clang}/bin/clang-3.5 $out/bin
+      cp -d ${llvmPackages.clang-unwrapped}/bin/clang $out/bin
+      cp -d ${llvmPackages.clang-unwrapped}/bin/clang++ $out/bin
+      cp -d ${llvmPackages.clang-unwrapped}/bin/clang-3.6 $out/bin
 
-      cp -rL ${llvmPackages.clang}/lib/clang $out/lib
+      cp -rL ${llvmPackages.clang-unwrapped}/lib/clang $out/lib
 
       cp -d ${libcxx}/lib/libc++*.dylib $out/lib
       cp -d ${libcxxabi}/lib/libc++abi*.dylib $out/lib
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 545a3d748eb..28ba8001471 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -37,7 +37,7 @@ rec {
   stdenvLinux = (import ./linux { inherit system allPackages platform config lib; }).stdenvLinux;
 
   # Darwin standard environment.
-  stdenvDarwin = (import ./darwin { inherit system allPackages platform config;}).stdenvDarwin;
+  stdenvDarwin = (import ./darwin { inherit system allPackages platform config;}).stage5;
 
   # Select the appropriate stdenv for the platform `system'.
   stdenv =
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 863acc31a61..67adaf42a8d 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -10,6 +10,8 @@ let lib = import ../../../lib; in lib.makeOverridable (
 , setupScript ? ./setup.sh
 
 , extraBuildInputs ? []
+, __stdenvImpureHostDeps ? []
+, __extraImpureHostDeps ? []
 }:
 
 let
@@ -131,7 +133,19 @@ let
 
       lib.addPassthru (derivation (
         (removeAttrs attrs ["meta" "passthru" "crossAttrs" "pos"])
-        //
+        // (let
+          buildInputs = attrs.buildInputs or [];
+          nativeBuildInputs = attrs.nativeBuildInputs or [];
+          propagatedBuildInputs = attrs.propagatedBuildInputs or [];
+          propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or [];
+          crossConfig = attrs.crossConfig or null;
+
+          __impureHostDeps = attrs.__impureHostDeps or [];
+          __propagatedImpureHostDeps = attrs.__propagatedImpureHostDeps or [];
+
+          computedImpureHostDeps           = lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs);
+          computedPropagatedImpureHostDeps = lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs);
+        in
         {
           builder = attrs.realBuilder or shell;
           args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
@@ -147,7 +161,15 @@ let
           nativeBuildInputs = nativeBuildInputs ++ (if crossConfig == null then buildInputs else []);
           propagatedNativeBuildInputs = propagatedNativeBuildInputs ++
             (if crossConfig == null then propagatedBuildInputs else []);
-        })) (
+
+          __impureHostDeps = lib.unique (lib.sort (x: y: x < y) (computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ __extraImpureHostDeps ++ [
+            "/dev/zero"
+            "/dev/random"
+            "/dev/urandom"
+            "/bin/sh"
+          ]));
+          __propagatedImpureHostDeps = lib.unique (lib.sort (x: y: x < y) (computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps));
+        }))) (
       {
         # The meta attribute is passed in the resulting attribute set,
         # but it's not part of the actual derivation, i.e., it's not
@@ -171,6 +193,7 @@ let
     (if isNull allowedRequisites then {} else { allowedRequisites = allowedRequisites ++ defaultNativeBuildInputs; }) //
     {
       inherit system name;
+      __impureHostDeps = __stdenvImpureHostDeps;
 
       builder = shell;
 
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 00be3967768..71b43bf2de9 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
 
   patches = stdenv.lib.optional stdenv.isDarwin ./gnutar-1.28-darwin.patch;
 
+  # avoid retaining reference to CF during stdenv bootstrap
+  configureFlags = stdenv.lib.optionals stdenv.isDarwin [
+    "gt_cv_func_CFPreferencesCopyAppValue=no"
+    "gt_cv_func_CFLocaleCopyCurrent=no"
+  ];
+
   # gnutar tries to call into gettext between `fork` and `exec`,
   # which is not safe on darwin.
   # see http://article.gmane.org/gmane.os.macosx.fink.devel/21882
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index 146f9bea87a..bfeda5085b6 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/pkgs/tools/archivers/sharutils/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     ''
        # Fix for building on Glibc 2.16.  Won't be needed once the
        # gnulib in sharutils is updated.
-       sed -i ${stdenv.lib.optionalString ((stdenv.isFreeBSD || stdenv.isOpenBSD || stdenv.isDarwin) && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h
+       sed -i ${stdenv.lib.optionalString ((stdenv.isFreeBSD || stdenv.isOpenBSD) && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h
     '';
 
   # GNU Gettext is needed on non-GNU platforms.
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index c6eb7ba1101..001a50458e2 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, libsigsegv, readline, readlineSupport ? false }:
+{ stdenv, fetchurl, libsigsegv, readline, readlineSupport ? false
+, locale ? null }:
 
 stdenv.mkDerivation rec {
   name = "gawk-4.1.3";
@@ -8,10 +9,14 @@ stdenv.mkDerivation rec {
     sha256 = "09d6pmx6h3i2glafm0jd1v1iyrs03vcyv2rkz12jisii3vlmbkz3";
   };
 
-  doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1
+  doCheck = !(
+       stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1
+    || stdenv.isDarwin # XXX: `locale' segfaults
+  );
 
   buildInputs = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv
-    ++ stdenv.lib.optional readlineSupport readline;
+    ++ stdenv.lib.optional readlineSupport readline
+    ++ stdenv.lib.optional stdenv.isDarwin locale;
 
   configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}"
     ++ stdenv.lib.optional readlineSupport "--with-readline=${readline}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e2dd6ad220..e903f6395b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1512,7 +1512,7 @@ let
 
   garmintools = callPackage ../development/libraries/garmintools {};
 
-  gawk = callPackage ../tools/text/gawk { };
+  gawk = callPackage ../tools/text/gawk { inherit (darwin) locale; };
 
   gawkInteractive = appendToName "interactive"
     (gawk.override { readlineSupport = true; });
@@ -4670,12 +4670,13 @@ let
     nativePrefix = stdenv.cc.nativePrefix or "";
     cc = baseCC;
     libc = libc;
+    dyld = if stdenv.isDarwin then darwin.dyld else null;
     isGNU = baseCC.isGNU or false;
     isClang = baseCC.isClang or false;
     inherit stdenv binutils coreutils zlib;
   };
 
-  wrapCC = wrapCCWith (makeOverridable (import ../build-support/cc-wrapper)) glibc;
+  wrapCC = wrapCCWith (makeOverridable (import ../build-support/cc-wrapper)) stdenv.cc.libc;
   # legacy version, used for gnat bootstrapping
   wrapGCC-old = baseGCC: (makeOverridable (import ../build-support/gcc-wrapper-old)) {
     nativeTools = stdenv.cc.nativeTools or false;
@@ -5182,11 +5183,9 @@ let
 
   bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { };
 
-  binutils = if stdenv.isDarwin
-    then import ../build-support/native-darwin-cctools-wrapper {inherit stdenv;}
-    else callPackage ../development/tools/misc/binutils {
-      inherit noSysDirs;
-    };
+  binutils = if stdenv.isDarwin then darwin.binutils else binutils-raw;
+
+  binutils-raw = callPackage ../development/tools/misc/binutils { inherit noSysDirs; };
 
   binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils {
     inherit noSysDirs;
@@ -6942,7 +6941,10 @@ let
   # glibc provides libiconv so systems with glibc don't need to build libiconv
   # separately, but we also provide libiconvReal, which will always be a
   # standalone libiconv, just in case you want it
-  libiconv = if stdenv.isGlibc then stdenv.cc.libc else libiconvReal;
+  libiconv =
+    if stdenv.isGlibc then stdenv.cc.libc
+    else if stdenv.isDarwin then darwin.libiconv
+    else libiconvReal;
 
   libiconvReal = callPackage ../development/libraries/libiconv {
     fetchurl = fetchurlBoot;
@@ -9279,7 +9281,7 @@ let
       xctoolchain = xcode.toolchain;
     };
 
-    cctools = (callPackage ../os-specific/darwin/cctools/port.nix {}).native;
+    cctools = (callPackage ../os-specific/darwin/cctools/port.nix { inherit libobjc; }).native;
 
     maloader = callPackage ../os-specific/darwin/maloader {
       inherit opencflite;
@@ -9294,8 +9296,12 @@ let
 
     ps = callPackage ../os-specific/darwin/adv_cmds/ps.nix {};
 
+    locale = callPackage ../os-specific/darwin/adv_cmds/locale.nix {};
+
     security_tool = callPackage ../os-specific/darwin/security-tool { inherit osx_private_sdk; };
 
+    binutils = callPackage ../os-specific/darwin/binutils { inherit cctools; };
+
     cmdline_sdk   = cmdline.sdk;
     cmdline_tools = cmdline.tools;
 

From ee951a92d346e5147001bcb290b3923b0fdcb607 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 17 Jun 2015 20:52:27 -0700
Subject: [PATCH 1313/2322] relocate adv_cmds

---
 pkgs/os-specific/darwin/adv_cmds/locale.nix   | 29 ---------------
 pkgs/os-specific/darwin/adv_cmds/ps.nix       | 35 -------------------
 .../adv_cmds/default.nix                      | 15 +++++---
 pkgs/top-level/all-packages.nix               | 12 +++----
 4 files changed, 15 insertions(+), 76 deletions(-)
 delete mode 100644 pkgs/os-specific/darwin/adv_cmds/locale.nix
 delete mode 100644 pkgs/os-specific/darwin/adv_cmds/ps.nix

diff --git a/pkgs/os-specific/darwin/adv_cmds/locale.nix b/pkgs/os-specific/darwin/adv_cmds/locale.nix
deleted file mode 100644
index 92de8a242e2..00000000000
--- a/pkgs/os-specific/darwin/adv_cmds/locale.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "locale-${version}";
-  version = "153";
-
-  src = fetchurl {
-    url    = "http://opensource.apple.com/tarballs/adv_cmds/adv_cmds-${version}.tar.gz";
-    sha256 = "174v6a4zkcm2pafzgdm6kvs48z5f911zl7k49hv7kjq6gm58w99v";
-  };
-
-  buildPhase = ''
-    cd locale
-    c++ -Os -Wall -o locale locale.cc
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin $out/share/man/man1
-
-    cp locale   $out/bin/locale
-    cp locale.1 $out/share/man/man1
-  '';
-
-
-  meta = {
-    platforms = stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
-  };
-}
diff --git a/pkgs/os-specific/darwin/adv_cmds/ps.nix b/pkgs/os-specific/darwin/adv_cmds/ps.nix
deleted file mode 100644
index c3d3d158862..00000000000
--- a/pkgs/os-specific/darwin/adv_cmds/ps.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "ps-${version}";
-  version = "153";
-
-  src = fetchurl {
-    url    = "http://opensource.apple.com/tarballs/adv_cmds/adv_cmds-${version}.tar.gz";
-    sha256 = "174v6a4zkcm2pafzgdm6kvs48z5f911zl7k49hv7kjq6gm58w99v";
-  };
-
-  buildPhase = ''
-    cd ps
-    cc -Os -Wall -I. -c -o fmt.o fmt.c
-    cc -Os -Wall -I. -c -o keyword.o keyword.c
-    cc -Os -Wall -I. -c -o nlist.o nlist.c
-    cc -Os -Wall -I. -c -o print.o print.c
-    cc -Os -Wall -I. -c -o ps.o ps.c
-    cc -Os -Wall -I. -c -o tasks.o tasks.c
-    cc -o ps fmt.o keyword.o nlist.o print.o ps.o tasks.o
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin $out/share/man/man1
-
-    cp ps   $out/bin/ps
-    cp ps.1 $out/share/man/man1
-  '';
-
-
-  meta = {
-    platforms = stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
-  };
-}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
index db467254f17..4bc3a7a7fa4 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
@@ -2,10 +2,8 @@
 
 appleDerivation {
   # Will override the name until we provide all of adv_cmds
-  name = "ps-${version}";
-
   buildPhase = ''
-    cd ps
+    pushd ps
     cc -Os -Wall -I. -c -o fmt.o fmt.c
     cc -Os -Wall -I. -c -o keyword.o keyword.c
     cc -Os -Wall -I. -c -o nlist.o nlist.c
@@ -13,13 +11,20 @@ appleDerivation {
     cc -Os -Wall -I. -c -o ps.o ps.c
     cc -Os -Wall -I. -c -o tasks.o tasks.c
     cc -o ps fmt.o keyword.o nlist.o print.o ps.o tasks.o
+    popd
+
+    pushd locale
+    c++ -o locale locale.cc
+    popd
   '';
 
   installPhase = ''
     mkdir -p $out/bin $out/share/man/man1
 
-    cp ps   $out/bin/ps
-    cp ps.1 $out/share/man/man1
+    cp ps/ps   $out/bin/ps
+    cp ps/ps.1 $out/share/man/man1
+    cp locale/locale   $out/bin/locale
+    cp locale/locale.1 $out/share/man/man1
   '';
 
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e903f6395b9..dc41bf4064d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1512,7 +1512,9 @@ let
 
   garmintools = callPackage ../development/libraries/garmintools {};
 
-  gawk = callPackage ../tools/text/gawk { inherit (darwin) locale; };
+  gawk = callPackage ../tools/text/gawk {
+    locale = darwin.adv_cmds;
+  };
 
   gawkInteractive = appendToName "interactive"
     (gawk.override { readlineSupport = true; });
@@ -5282,12 +5284,12 @@ let
 
   cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix {
     wantPS = stdenv.isDarwin;
-    ps     = if stdenv.isDarwin then darwin.ps else null;
+    ps     = if stdenv.isDarwin then darwin.adv_cmds else null;
   };
 
   cmake = callPackage ../development/tools/build-managers/cmake {
     wantPS = stdenv.isDarwin;
-    ps     = if stdenv.isDarwin then darwin.ps else null;
+    ps     = if stdenv.isDarwin then darwin.adv_cmds else null;
   };
 
   cmakeCurses = cmake.override { useNcurses = true; };
@@ -9294,10 +9296,6 @@ let
     osx_sdk = callPackage ../os-specific/darwin/osx-sdk {};
     osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk { inherit osx_sdk; };
 
-    ps = callPackage ../os-specific/darwin/adv_cmds/ps.nix {};
-
-    locale = callPackage ../os-specific/darwin/adv_cmds/locale.nix {};
-
     security_tool = callPackage ../os-specific/darwin/security-tool { inherit osx_private_sdk; };
 
     binutils = callPackage ../os-specific/darwin/binutils { inherit cctools; };

From 87bca3698a753199a234fca9ca9c64ab60c99983 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 17 Jun 2015 21:54:29 -0700
Subject: [PATCH 1314/2322] remove sort and unique from stdenv

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

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 67adaf42a8d..bdad5194930 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -162,12 +162,12 @@ let
           propagatedNativeBuildInputs = propagatedNativeBuildInputs ++
             (if crossConfig == null then propagatedBuildInputs else []);
 
-          __impureHostDeps = lib.unique (lib.sort (x: y: x < y) (computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ __extraImpureHostDeps ++ [
+          __impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ __extraImpureHostDeps ++ [
             "/dev/zero"
             "/dev/random"
             "/dev/urandom"
             "/bin/sh"
-          ]));
+          ];
           __propagatedImpureHostDeps = lib.unique (lib.sort (x: y: x < y) (computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps));
         }))) (
       {

From fe75f160324672d639469dc2da69f70d4eb466a4 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 18 Jun 2015 10:03:32 -0700
Subject: [PATCH 1315/2322] move pure stdenv into a new directory, bring back
 the old one

remove __impure from non-darwin OSes
---
 pkgs/stdenv/darwin/default.nix                | 362 +++++-------------
 pkgs/stdenv/darwin/make-bootstrap-tools.nix   |  10 +-
 pkgs/stdenv/default.nix                       |   8 +-
 pkgs/stdenv/generic/default.nix               |  14 +-
 pkgs/stdenv/pure-darwin/default.nix           | 297 ++++++++++++++
 .../pure-darwin/make-bootstrap-tools.nix      | 286 ++++++++++++++
 pkgs/stdenv/pure-darwin/trivial-bootstrap.sh  |  66 ++++
 .../pure-darwin/unpack-bootstrap-tools.sh     |  54 +++
 8 files changed, 830 insertions(+), 267 deletions(-)
 create mode 100644 pkgs/stdenv/pure-darwin/default.nix
 create mode 100644 pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix
 create mode 100644 pkgs/stdenv/pure-darwin/trivial-bootstrap.sh
 create mode 100644 pkgs/stdenv/pure-darwin/unpack-bootstrap-tools.sh

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index d4b17a7909c..ac396ecdf12 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -4,294 +4,144 @@
 , config      ? {}
 }:
 
-let
-  fetch = { file, sha256 }: import <nix/fetchurl.nix> {
-    url = "https://dl.dropboxusercontent.com/u/2857322/${file}";
-    inherit sha256;
-    executable = true;
-  };
-
-  bootstrapFiles = {
-    sh    = fetch { file = "sh";    sha256 = "1qakpg37vl61jnkplz13m3g1csqr85cg8ybp6jwiv6apmg26isnm"; };
-    bzip2 = fetch { file = "bzip2"; sha256 = "1gxa67255q9v00j1vn1mzyrnbwys2g1102cx02vpcyvvrl4vqxr0"; };
-    mkdir = fetch { file = "mkdir"; sha256 = "1yfl8w65ksji7fggrbvqxw8lp0gm02qilk11n9axj2jxay53ngvg"; };
-    cpio  = fetch { file = "cpio";  sha256 = "0nssyg19smgcblwq1mfcw4djbd85md84d2f093qcqkbigdjg484b"; };
-  };
-  tarball = fetch { file = "bootstrap-tools.9.cpio.bz2"; sha256 = "0fd79k7gy3z3sba5w4f4lnrcpiwff31vw02480x1pdry8bbgbf2j"; };
-in rec {
+rec {
   allPackages = import ../../top-level/all-packages.nix;
 
-  commonPreHook = ''
-    export NIX_ENFORCE_PURITY=1
+  bootstrapTools = derivation {
+    inherit system;
+
+    name    = "trivial-bootstrap-tools";
+    builder = "/bin/sh";
+    args    = [ ./trivial-bootstrap.sh ];
+
+    mkdir   = "/bin/mkdir";
+    ln      = "/bin/ln";
+  };
+
+  # The simplest stdenv possible to run fetchadc and get the Apple command-line tools
+  stage0 = rec {
+    fetchurl = import ../../build-support/fetchurl {
+      inherit stdenv;
+      curl = bootstrapTools;
+    };
+
+    stdenv = import ../generic {
+      inherit system config;
+      name         = "stdenv-darwin-boot-0";
+      shell        = "/bin/bash";
+      initialPath  = [ bootstrapTools ];
+      fetchurlBoot = fetchurl;
+      cc           = "/no-such-path";
+    };
+  };
+
+  buildTools = import ../../os-specific/darwin/command-line-tools {
+    inherit (stage0) stdenv fetchurl;
+    xar  = bootstrapTools;
+    gzip = bootstrapTools;
+    cpio = bootstrapTools;
+  };
+
+  preHook = ''
     export NIX_IGNORE_LD_THROUGH_GCC=1
+    export NIX_DONT_SET_RPATH=1
+    export NIX_NO_SELF_RPATH=1
+    dontFixLibtool=1
     stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
+    xargsFlags=" "
     export MACOSX_DEPLOYMENT_TARGET=10.7
-    export SDKROOT=
+    # Use the 10.9 SDK if we're running on 10.9, and 10.10 if we're
+    # running on 10.10. We need to use the 10.10 headers for functions
+    # like readlinkat() that are dynamically detected by configure
+    # scripts. Very impure, obviously.
+    export SDKROOT=$(/usr/bin/xcrun --sdk macosx"$(/usr/bin/sw_vers -productVersion | /usr/bin/cut -d. -f1,2)" --show-sdk-path 2> /dev/null || echo /)
+    export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$SDKROOT/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations"
+    export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib"
     export CMAKE_OSX_ARCHITECTURES=x86_64
   '';
 
-  # libSystem and its transitive dependencies. Get used to this; it's a recurring theme in darwin land
-  libSystemClosure = [
-    "/usr/lib/libSystem.dylib"
-    "/usr/lib/libSystem.B.dylib"
-    "/usr/lib/libobjc.A.dylib"
-    "/usr/lib/libobjc.dylib"
-    "/usr/lib/libauto.dylib"
-    "/usr/lib/libc++abi.dylib"
-    "/usr/lib/libc++.1.dylib"
-    "/usr/lib/libDiagnosticMessagesClient.dylib"
-    "/usr/lib/system"
-  ];
+  # A stdenv that wraps the Apple command-line tools and our other trivial symlinked bootstrap tools
+  stage1 = rec {
+    nativePrefix = "${buildTools.tools}/Library/Developer/CommandLineTools/usr";
 
-  # The one dependency of /bin/sh :(
-  binShClosure = [ "/usr/lib/libncurses.5.4.dylib" ];
+    stdenv = import ../generic {
+      name = "stdenv-darwin-boot-1";
 
-  bootstrapTools = derivation rec {
-    inherit system tarball;
+      inherit system config;
+      inherit (stage0.stdenv) shell fetchurlBoot;
 
-    name    = "bootstrap-tools";
-    builder = bootstrapFiles.sh; # Not a filename! Attribute 'sh' on bootstrapFiles
-    args    = [ ./unpack-bootstrap-tools.sh ];
+      initialPath = stage0.stdenv.initialPath ++ [ nativePrefix ];
 
-    inherit (bootstrapFiles) mkdir bzip2 cpio;
+      preHook = preHook + "\n" + ''
+        export NIX_LDFLAGS_AFTER+=" -L/usr/lib"
+        export NIX_ENFORCE_PURITY=
+        export NIX_CFLAGS_COMPILE+=" -isystem ${nativePrefix}/include/c++/v1 -stdlib=libc++"
+        export NIX_CFLAGS_LINK+=" -stdlib=libc++ -Wl,-rpath,${nativePrefix}/lib"
+      '';
 
-    __impureHostDeps  = binShClosure ++ libSystemClosure;
-  };
-
-  stageFun = step: last: {shell             ? "${bootstrapTools}/bin/sh",
-                          overrides         ? (pkgs: {}),
-                          extraPreHook      ? "",
-                          extraBuildInputs  ? with last.pkgs; [ xz darwin.CF libcxx ],
-                          extraInitialPath  ? [],
-                          allowedRequisites ? null}:
-    let
-      thisStdenv = import ../generic {
-        inherit system config shell extraBuildInputs allowedRequisites;
-
-        name = "stdenv-darwin-boot-${toString step}";
-
-        cc = if isNull last then "/no-such-path" else import ../../build-support/cc-wrapper {
-          inherit shell;
-          inherit (last) stdenv;
-          inherit (last.pkgs.darwin) dyld;
-
-          nativeTools  = true;
-          nativePrefix = bootstrapTools;
-          nativeLibc   = false;
-          libc         = last.pkgs.darwin.Libsystem;
-          cc           = { name = "clang-9.9.9"; outPath = bootstrapTools; };
+      cc = import ../../build-support/cc-wrapper {
+        nativeTools  = true;
+        nativePrefix = nativePrefix;
+        nativeLibc   = true;
+        stdenv       = stage0.stdenv;
+        shell        = "/bin/bash";
+        cc           = {
+          name    = "clang-9.9.9";
+          cc      = "/usr";
+          outPath = nativePrefix;
         };
-
-        preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/sh") ''
-          # Don't patch #!/interpreter because it leads to retained
-          # dependencies on the bootstrapTools in the final stdenv.
-          dontPatchShebangs=1
-        '' + ''
-          ${commonPreHook}
-          ${extraPreHook}
-        '';
-        initialPath  = extraInitialPath ++ [ bootstrapTools ];
-        fetchurlBoot = import ../../build-support/fetchurl {
-          stdenv = stage0.stdenv;
-          curl   = bootstrapTools;
-        };
-
-        # The stdenvs themselves don't use mkDerivation, so I need to specify this here
-        __stdenvImpureHostDeps = binShClosure ++ libSystemClosure;
-        __extraImpureHostDeps  = binShClosure ++ libSystemClosure;
-
-        extraAttrs = { inherit platform; };
-        overrides  = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; };
+        isClang      = true;
       };
-
-      thisPkgs = allPackages {
-        inherit system platform;
-        bootStdenv = thisStdenv;
-      };
-    in { stdenv = thisStdenv; pkgs = thisPkgs; };
-
-  stage0 = stageFun 0 null {
-    overrides = orig: with stage0; rec {
-      darwin = orig.darwin // {
-        Libsystem = stdenv.mkDerivation {
-          name = "bootstrap-Libsystem";
-          buildCommand = ''
-            mkdir -p $out
-            ln -s ${bootstrapTools}/lib $out/lib
-            ln -s ${bootstrapTools}/include-Libsystem $out/include
-          '';
-        };
-        dyld = bootstrapTools;
-      };
-
-      libcxx = stdenv.mkDerivation {
-        name = "bootstrap-libcxx";
-        phases = [ "installPhase" "fixupPhase" ];
-        installPhase = ''
-          mkdir -p $out/lib $out/include
-          ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib
-          ln -s ${bootstrapTools}/include/c++      $out/include/c++
-        '';
-        setupHook = ../../development/compilers/llvm/3.5/libc++/setup-hook.sh;
-      };
-
-      libcxxabi = stdenv.mkDerivation {
-        name = "bootstrap-libcxxabi";
-        buildCommand = ''
-          mkdir -p $out/lib
-          ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib
-        '';
-      };
-
     };
-
-    extraBuildInputs = [];
-  };
-
-  persistent0 = _: {};
-
-  stage1 = with stage0; stageFun 1 stage0 {
-    extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
-    extraBuildInputs = [ pkgs.libcxx ];
-
-    allowedRequisites =
-      [ bootstrapTools ] ++ (with pkgs; [ libcxx libcxxabi ]) ++ [ pkgs.darwin.Libsystem ];
-
-    overrides = persistent0;
-  };
-
-  persistent1 = orig: with stage1.pkgs; {
-    inherit
-      zlib patchutils m4 scons flex perl bison unifdef unzip openssl icu python
-      libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff
-      openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz
-      findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils;
-
-    darwin = orig.darwin // {
-      inherit (darwin)
-        dyld Libsystem xnu configd libdispatch libclosure launchd;
+    pkgs = allPackages {
+      inherit system platform;
+      bootStdenv = stdenv;
     };
   };
 
-  stage2 = with stage1; stageFun 2 stage1 {
-    allowedRequisites =
-      [ bootstrapTools ] ++
-      (with pkgs; [ xz libcxx libcxxabi icu ]) ++
-      (with pkgs.darwin; [ dyld Libsystem CF ]);
+  stage2 = rec {
+    stdenv = import ../generic {
+      name = "stdenv-darwin-boot-2";
 
-    overrides = persistent1;
-  };
+      inherit system config;
+      inherit (stage1.stdenv) shell fetchurlBoot preHook cc;
 
-  persistent2 = orig: with stage2.pkgs; {
-    inherit
-      patchutils m4 scons flex perl bison unifdef unzip openssl python
-      gettext sharutils libarchive pkg-config groff bash subversion
-      openssh sqlite sed serf openldap db cyrus-sasl expat apr-util
-      findfreetype libssh curl cmake autoconf automake libtool cpio
-      libcxx libcxxabi;
-
-    darwin = orig.darwin // {
-      inherit (darwin)
-        dyld Libsystem xnu configd libdispatch libclosure launchd libiconv;
+      initialPath = [ stage1.pkgs.xz ] ++ stage1.stdenv.initialPath;
+    };
+    pkgs = allPackages {
+      inherit system platform;
+      bootStdenv = stdenv;
     };
   };
 
-  stage3 = with stage2; stageFun 3 stage2 {
-    shell = "${pkgs.bash}/bin/bash";
+  # Use stage1 to build a whole set of actual tools so we don't have to rely on the Apple prebuilt ones or
+  # the ugly symlinked bootstrap tools anymore.
+  stage3 = with stage2; import ../generic {
+    name = "stdenv-darwin-boot-3";
 
-    # We have a valid shell here (this one has no bootstrap-tools runtime deps) so stageFun
-    # enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting
-    # and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and
-    # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first.
-    extraInitialPath = [ pkgs.bash ];
-
-    allowedRequisites =
-      [ bootstrapTools ] ++
-      (with pkgs; [ icu bash libcxx libcxxabi ]) ++
-      (with pkgs.darwin; [ dyld Libsystem ]);
-
-    overrides = persistent2;
-  };
-
-  persistent3 = orig: with stage3.pkgs; {
-    inherit
-      gnumake gzip gnused bzip2 gawk ed xz patch bash
-      libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep
-      coreutils findutils diffutils patchutils;
-
-    llvmPackages = orig.llvmPackages // {
-      inherit (llvmPackages) llvm clang-unwrapped;
-    };
-
-    darwin = orig.darwin // {
-      inherit (darwin) dyld Libsystem libiconv;
-    };
-  };
-
-  stage4 = with stage3; stageFun 4 stage3 {
-    shell = "${pkgs.bash}/bin/bash";
-    extraInitialPath = [ pkgs.bash ];
-    overrides = persistent3;
-  };
-
-  persistent4 = orig: with stage4.pkgs; {
-    inherit
-      gnumake gzip gnused bzip2 gawk ed xz patch bash
-      libcxxabi libcxx ncurses libffi zlib icu llvm gmp pcre gnugrep
-      coreutils findutils diffutils patchutils binutils binutils-raw;
-
-    llvmPackages = orig.llvmPackages // {
-      inherit (llvmPackages) llvm clang-unwrapped;
-    };
-
-    darwin = orig.darwin // {
-      inherit (darwin) dyld Libsystem cctools CF libiconv;
-    };
-  };
-
-  stage5 = with stage4; import ../generic rec {
     inherit system config;
     inherit (stdenv) fetchurlBoot;
 
-    name = "stdenv-darwin";
+    initialPath = (import ../common-path.nix) { inherit pkgs; };
 
-    preHook = commonPreHook;
-
-    __stdenvImpureHostDeps = binShClosure ++ libSystemClosure;
-    __extraImpureHostDeps  = binShClosure ++ libSystemClosure;
-
-    initialPath = import ../common-path.nix { inherit pkgs; };
-    shell       = "${pkgs.bash}/bin/bash";
+    preHook = preHook + "\n" + ''
+      export NIX_ENFORCE_PURITY=1
+    '';
 
     cc = import ../../build-support/cc-wrapper {
-      inherit stdenv shell;
-      nativeTools = false;
-      nativeLibc  = false;
-      inherit (pkgs) coreutils binutils;
-      inherit (pkgs.darwin) dyld;
-      cc   = pkgs.llvmPackages.clang-unwrapped;
-      libc = pkgs.darwin.Libsystem;
+      inherit stdenv;
+      nativeTools   = false;
+      nativeLibc    = true;
+      binutils      = pkgs.darwin.cctools;
+      cc            = pkgs.llvmPackages.clang-unwrapped;
+      coreutils     = pkgs.coreutils;
+      shell         = "${pkgs.bash}/bin/bash";
+      extraPackages = [ pkgs.libcxx ];
+      isClang       = true;
     };
 
-    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
-
-    extraAttrs = {
-      inherit platform bootstrapTools;
-      libc         = pkgs.darwin.Libsystem;
-      shellPackage = pkgs.bash;
-    };
-
-    allowedRequisites = (with pkgs; [
-      xz libcxx libcxxabi icu gmp gnumake findutils bzip2 llvm zlib libffi
-      coreutils ed diffutils gnutar gzip ncurses gnused bash gawk
-      gnugrep llvmPackages.clang-unwrapped patch pcre binutils-raw binutils gettext
-    ]) ++ (with pkgs.darwin; [
-      dyld Libsystem CF cctools libiconv
-    ]);
-
-    overrides = orig: persistent4 orig // {
-      clang = cc;
-      inherit cc;
-    };
+    shell = "${pkgs.bash}/bin/bash";
   };
+
+  stdenvDarwin = stage3;
 }
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 433638dd1bd..636410fdd78 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -63,15 +63,13 @@ rec {
 
       cp -d ${gnugrep.pcre}/lib/libpcre*.dylib $out/lib
       cp -d ${libiconv}/lib/libiconv*.dylib $out/lib
-      cp -d ${gettext}/lib/libintl*.dylib $out/lib
-      chmod +x $out/lib/libintl*.dylib
 
       # Copy what we need of clang
-      cp -d ${llvmPackages.clang-unwrapped}/bin/clang $out/bin
-      cp -d ${llvmPackages.clang-unwrapped}/bin/clang++ $out/bin
-      cp -d ${llvmPackages.clang-unwrapped}/bin/clang-3.6 $out/bin
+      cp -d ${llvmPackages.clang}/bin/clang $out/bin
+      cp -d ${llvmPackages.clang}/bin/clang++ $out/bin
+      cp -d ${llvmPackages.clang}/bin/clang-3.5 $out/bin
 
-      cp -rL ${llvmPackages.clang-unwrapped}/lib/clang $out/lib
+      cp -rL ${llvmPackages.clang}/lib/clang $out/lib
 
       cp -d ${libcxx}/lib/libc++*.dylib $out/lib
       cp -d ${libcxxabi}/lib/libc++abi*.dylib $out/lib
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 28ba8001471..71bdc3e8f82 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -37,7 +37,13 @@ rec {
   stdenvLinux = (import ./linux { inherit system allPackages platform config lib; }).stdenvLinux;
 
   # Darwin standard environment.
-  stdenvDarwin = (import ./darwin { inherit system allPackages platform config;}).stage5;
+  stdenvDarwin = (import ./darwin { inherit system allPackages platform config;}).stdenvDarwin;
+
+  # Pure Darwin standard environment. Allows building with the sandbox enabled. To use,
+  # you can add this to your nixpkgs config:
+  #
+  #   replaceStdenv = {pkgs}: pkgs.allStdenvs.stdenvDarwinPure
+  stdenvDarwinPure = (import ./pure-darwin { inherit system allPackages platform config;}).stage5;
 
   # Select the appropriate stdenv for the platform `system'.
   stdenv =
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index bdad5194930..07486093da8 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -21,6 +21,8 @@ let
   whitelist = config.whitelistedLicenses or [];
   blacklist = config.blacklistedLicenses or [];
 
+  ifDarwin = attrs: if system == "x86_64-darwin" then attrs else {};
+
   onlyLicenses = list:
     lib.lists.all (license:
       let l = lib.licenses.${license.shortName or "BROKEN"} or false; in
@@ -132,7 +134,9 @@ let
       assert licenseAllowed attrs;
 
       lib.addPassthru (derivation (
-        (removeAttrs attrs ["meta" "passthru" "crossAttrs" "pos"])
+        (removeAttrs attrs
+          ["meta" "passthru" "crossAttrs" "pos"
+           "__impureHostDeps" "__propagatedImpureHostDeps"])
         // (let
           buildInputs = attrs.buildInputs or [];
           nativeBuildInputs = attrs.nativeBuildInputs or [];
@@ -161,14 +165,14 @@ let
           nativeBuildInputs = nativeBuildInputs ++ (if crossConfig == null then buildInputs else []);
           propagatedNativeBuildInputs = propagatedNativeBuildInputs ++
             (if crossConfig == null then propagatedBuildInputs else []);
-
+        } // ifDarwin {
           __impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ __extraImpureHostDeps ++ [
             "/dev/zero"
             "/dev/random"
             "/dev/urandom"
             "/bin/sh"
           ];
-          __propagatedImpureHostDeps = lib.unique (lib.sort (x: y: x < y) (computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps));
+          __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;
         }))) (
       {
         # The meta attribute is passed in the resulting attribute set,
@@ -193,7 +197,6 @@ let
     (if isNull allowedRequisites then {} else { allowedRequisites = allowedRequisites ++ defaultNativeBuildInputs; }) //
     {
       inherit system name;
-      __impureHostDeps = __stdenvImpureHostDeps;
 
       builder = shell;
 
@@ -202,6 +205,9 @@ let
       setup = setupScript;
 
       inherit preHook initialPath shell defaultNativeBuildInputs;
+    }
+    // ifDarwin {
+      __impureHostDeps = __stdenvImpureHostDeps;
     })
 
     // rec {
diff --git a/pkgs/stdenv/pure-darwin/default.nix b/pkgs/stdenv/pure-darwin/default.nix
new file mode 100644
index 00000000000..d4b17a7909c
--- /dev/null
+++ b/pkgs/stdenv/pure-darwin/default.nix
@@ -0,0 +1,297 @@
+{ system      ? builtins.currentSystem
+, allPackages ? import ../../top-level/all-packages.nix
+, platform    ? null
+, config      ? {}
+}:
+
+let
+  fetch = { file, sha256 }: import <nix/fetchurl.nix> {
+    url = "https://dl.dropboxusercontent.com/u/2857322/${file}";
+    inherit sha256;
+    executable = true;
+  };
+
+  bootstrapFiles = {
+    sh    = fetch { file = "sh";    sha256 = "1qakpg37vl61jnkplz13m3g1csqr85cg8ybp6jwiv6apmg26isnm"; };
+    bzip2 = fetch { file = "bzip2"; sha256 = "1gxa67255q9v00j1vn1mzyrnbwys2g1102cx02vpcyvvrl4vqxr0"; };
+    mkdir = fetch { file = "mkdir"; sha256 = "1yfl8w65ksji7fggrbvqxw8lp0gm02qilk11n9axj2jxay53ngvg"; };
+    cpio  = fetch { file = "cpio";  sha256 = "0nssyg19smgcblwq1mfcw4djbd85md84d2f093qcqkbigdjg484b"; };
+  };
+  tarball = fetch { file = "bootstrap-tools.9.cpio.bz2"; sha256 = "0fd79k7gy3z3sba5w4f4lnrcpiwff31vw02480x1pdry8bbgbf2j"; };
+in rec {
+  allPackages = import ../../top-level/all-packages.nix;
+
+  commonPreHook = ''
+    export NIX_ENFORCE_PURITY=1
+    export NIX_IGNORE_LD_THROUGH_GCC=1
+    stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
+    export MACOSX_DEPLOYMENT_TARGET=10.7
+    export SDKROOT=
+    export CMAKE_OSX_ARCHITECTURES=x86_64
+  '';
+
+  # libSystem and its transitive dependencies. Get used to this; it's a recurring theme in darwin land
+  libSystemClosure = [
+    "/usr/lib/libSystem.dylib"
+    "/usr/lib/libSystem.B.dylib"
+    "/usr/lib/libobjc.A.dylib"
+    "/usr/lib/libobjc.dylib"
+    "/usr/lib/libauto.dylib"
+    "/usr/lib/libc++abi.dylib"
+    "/usr/lib/libc++.1.dylib"
+    "/usr/lib/libDiagnosticMessagesClient.dylib"
+    "/usr/lib/system"
+  ];
+
+  # The one dependency of /bin/sh :(
+  binShClosure = [ "/usr/lib/libncurses.5.4.dylib" ];
+
+  bootstrapTools = derivation rec {
+    inherit system tarball;
+
+    name    = "bootstrap-tools";
+    builder = bootstrapFiles.sh; # Not a filename! Attribute 'sh' on bootstrapFiles
+    args    = [ ./unpack-bootstrap-tools.sh ];
+
+    inherit (bootstrapFiles) mkdir bzip2 cpio;
+
+    __impureHostDeps  = binShClosure ++ libSystemClosure;
+  };
+
+  stageFun = step: last: {shell             ? "${bootstrapTools}/bin/sh",
+                          overrides         ? (pkgs: {}),
+                          extraPreHook      ? "",
+                          extraBuildInputs  ? with last.pkgs; [ xz darwin.CF libcxx ],
+                          extraInitialPath  ? [],
+                          allowedRequisites ? null}:
+    let
+      thisStdenv = import ../generic {
+        inherit system config shell extraBuildInputs allowedRequisites;
+
+        name = "stdenv-darwin-boot-${toString step}";
+
+        cc = if isNull last then "/no-such-path" else import ../../build-support/cc-wrapper {
+          inherit shell;
+          inherit (last) stdenv;
+          inherit (last.pkgs.darwin) dyld;
+
+          nativeTools  = true;
+          nativePrefix = bootstrapTools;
+          nativeLibc   = false;
+          libc         = last.pkgs.darwin.Libsystem;
+          cc           = { name = "clang-9.9.9"; outPath = bootstrapTools; };
+        };
+
+        preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/sh") ''
+          # Don't patch #!/interpreter because it leads to retained
+          # dependencies on the bootstrapTools in the final stdenv.
+          dontPatchShebangs=1
+        '' + ''
+          ${commonPreHook}
+          ${extraPreHook}
+        '';
+        initialPath  = extraInitialPath ++ [ bootstrapTools ];
+        fetchurlBoot = import ../../build-support/fetchurl {
+          stdenv = stage0.stdenv;
+          curl   = bootstrapTools;
+        };
+
+        # The stdenvs themselves don't use mkDerivation, so I need to specify this here
+        __stdenvImpureHostDeps = binShClosure ++ libSystemClosure;
+        __extraImpureHostDeps  = binShClosure ++ libSystemClosure;
+
+        extraAttrs = { inherit platform; };
+        overrides  = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; };
+      };
+
+      thisPkgs = allPackages {
+        inherit system platform;
+        bootStdenv = thisStdenv;
+      };
+    in { stdenv = thisStdenv; pkgs = thisPkgs; };
+
+  stage0 = stageFun 0 null {
+    overrides = orig: with stage0; rec {
+      darwin = orig.darwin // {
+        Libsystem = stdenv.mkDerivation {
+          name = "bootstrap-Libsystem";
+          buildCommand = ''
+            mkdir -p $out
+            ln -s ${bootstrapTools}/lib $out/lib
+            ln -s ${bootstrapTools}/include-Libsystem $out/include
+          '';
+        };
+        dyld = bootstrapTools;
+      };
+
+      libcxx = stdenv.mkDerivation {
+        name = "bootstrap-libcxx";
+        phases = [ "installPhase" "fixupPhase" ];
+        installPhase = ''
+          mkdir -p $out/lib $out/include
+          ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib
+          ln -s ${bootstrapTools}/include/c++      $out/include/c++
+        '';
+        setupHook = ../../development/compilers/llvm/3.5/libc++/setup-hook.sh;
+      };
+
+      libcxxabi = stdenv.mkDerivation {
+        name = "bootstrap-libcxxabi";
+        buildCommand = ''
+          mkdir -p $out/lib
+          ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib
+        '';
+      };
+
+    };
+
+    extraBuildInputs = [];
+  };
+
+  persistent0 = _: {};
+
+  stage1 = with stage0; stageFun 1 stage0 {
+    extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
+    extraBuildInputs = [ pkgs.libcxx ];
+
+    allowedRequisites =
+      [ bootstrapTools ] ++ (with pkgs; [ libcxx libcxxabi ]) ++ [ pkgs.darwin.Libsystem ];
+
+    overrides = persistent0;
+  };
+
+  persistent1 = orig: with stage1.pkgs; {
+    inherit
+      zlib patchutils m4 scons flex perl bison unifdef unzip openssl icu python
+      libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff
+      openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz
+      findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils;
+
+    darwin = orig.darwin // {
+      inherit (darwin)
+        dyld Libsystem xnu configd libdispatch libclosure launchd;
+    };
+  };
+
+  stage2 = with stage1; stageFun 2 stage1 {
+    allowedRequisites =
+      [ bootstrapTools ] ++
+      (with pkgs; [ xz libcxx libcxxabi icu ]) ++
+      (with pkgs.darwin; [ dyld Libsystem CF ]);
+
+    overrides = persistent1;
+  };
+
+  persistent2 = orig: with stage2.pkgs; {
+    inherit
+      patchutils m4 scons flex perl bison unifdef unzip openssl python
+      gettext sharutils libarchive pkg-config groff bash subversion
+      openssh sqlite sed serf openldap db cyrus-sasl expat apr-util
+      findfreetype libssh curl cmake autoconf automake libtool cpio
+      libcxx libcxxabi;
+
+    darwin = orig.darwin // {
+      inherit (darwin)
+        dyld Libsystem xnu configd libdispatch libclosure launchd libiconv;
+    };
+  };
+
+  stage3 = with stage2; stageFun 3 stage2 {
+    shell = "${pkgs.bash}/bin/bash";
+
+    # We have a valid shell here (this one has no bootstrap-tools runtime deps) so stageFun
+    # enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting
+    # and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and
+    # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first.
+    extraInitialPath = [ pkgs.bash ];
+
+    allowedRequisites =
+      [ bootstrapTools ] ++
+      (with pkgs; [ icu bash libcxx libcxxabi ]) ++
+      (with pkgs.darwin; [ dyld Libsystem ]);
+
+    overrides = persistent2;
+  };
+
+  persistent3 = orig: with stage3.pkgs; {
+    inherit
+      gnumake gzip gnused bzip2 gawk ed xz patch bash
+      libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep
+      coreutils findutils diffutils patchutils;
+
+    llvmPackages = orig.llvmPackages // {
+      inherit (llvmPackages) llvm clang-unwrapped;
+    };
+
+    darwin = orig.darwin // {
+      inherit (darwin) dyld Libsystem libiconv;
+    };
+  };
+
+  stage4 = with stage3; stageFun 4 stage3 {
+    shell = "${pkgs.bash}/bin/bash";
+    extraInitialPath = [ pkgs.bash ];
+    overrides = persistent3;
+  };
+
+  persistent4 = orig: with stage4.pkgs; {
+    inherit
+      gnumake gzip gnused bzip2 gawk ed xz patch bash
+      libcxxabi libcxx ncurses libffi zlib icu llvm gmp pcre gnugrep
+      coreutils findutils diffutils patchutils binutils binutils-raw;
+
+    llvmPackages = orig.llvmPackages // {
+      inherit (llvmPackages) llvm clang-unwrapped;
+    };
+
+    darwin = orig.darwin // {
+      inherit (darwin) dyld Libsystem cctools CF libiconv;
+    };
+  };
+
+  stage5 = with stage4; import ../generic rec {
+    inherit system config;
+    inherit (stdenv) fetchurlBoot;
+
+    name = "stdenv-darwin";
+
+    preHook = commonPreHook;
+
+    __stdenvImpureHostDeps = binShClosure ++ libSystemClosure;
+    __extraImpureHostDeps  = binShClosure ++ libSystemClosure;
+
+    initialPath = import ../common-path.nix { inherit pkgs; };
+    shell       = "${pkgs.bash}/bin/bash";
+
+    cc = import ../../build-support/cc-wrapper {
+      inherit stdenv shell;
+      nativeTools = false;
+      nativeLibc  = false;
+      inherit (pkgs) coreutils binutils;
+      inherit (pkgs.darwin) dyld;
+      cc   = pkgs.llvmPackages.clang-unwrapped;
+      libc = pkgs.darwin.Libsystem;
+    };
+
+    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
+
+    extraAttrs = {
+      inherit platform bootstrapTools;
+      libc         = pkgs.darwin.Libsystem;
+      shellPackage = pkgs.bash;
+    };
+
+    allowedRequisites = (with pkgs; [
+      xz libcxx libcxxabi icu gmp gnumake findutils bzip2 llvm zlib libffi
+      coreutils ed diffutils gnutar gzip ncurses gnused bash gawk
+      gnugrep llvmPackages.clang-unwrapped patch pcre binutils-raw binutils gettext
+    ]) ++ (with pkgs.darwin; [
+      dyld Libsystem CF cctools libiconv
+    ]);
+
+    overrides = orig: persistent4 orig // {
+      clang = cc;
+      inherit cc;
+    };
+  };
+}
diff --git a/pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix b/pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix
new file mode 100644
index 00000000000..433638dd1bd
--- /dev/null
+++ b/pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix
@@ -0,0 +1,286 @@
+{system ? builtins.currentSystem}:
+
+with import ../../top-level/all-packages.nix {inherit system;};
+
+rec {
+  # We want coreutils without ACL support.
+  coreutils_ = coreutils.override (orig: {
+    aclSupport = false;
+  });
+
+  build = stdenv.mkDerivation {
+    name = "build";
+
+    buildInputs = [nukeReferences cpio];
+
+    buildCommand = ''
+      mkdir -p $out/bin $out/lib
+
+      # Our (fake) loader
+      cp -d ${darwin.dyld}/lib/dyld $out/lib/
+
+      # C standard library stuff
+      cp -d ${darwin.Libsystem}/lib/*.o $out/lib/
+      cp -d ${darwin.Libsystem}/lib/*.dylib $out/lib/
+      cp -d ${darwin.Libsystem}/lib/system/*.dylib $out/lib/
+
+      # Resolv is actually a link to another package, so let's copy it properly
+      rm $out/lib/libresolv.9.dylib
+      cp -L ${darwin.Libsystem}/lib/libresolv.9.dylib $out/lib
+
+      cp -rL ${darwin.Libsystem}/include $out
+      chmod -R u+w $out/include
+      cp -rL ${icu}/include*             $out/include
+      cp -rL ${libiconv}/include/*       $out/include
+      cp -rL ${gnugrep.pcre}/include/*   $out/include
+      mv $out/include $out/include-Libsystem
+
+      # Copy coreutils, bash, etc.
+      cp ${coreutils_}/bin/* $out/bin
+      (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
+
+      cp ${bash}/bin/bash $out/bin
+      cp ${findutils}/bin/find $out/bin
+      cp ${findutils}/bin/xargs $out/bin
+      cp -d ${diffutils}/bin/* $out/bin
+      cp -d ${gnused}/bin/* $out/bin
+      cp -d ${gnugrep}/bin/grep $out/bin
+      cp ${gawk}/bin/gawk $out/bin
+      cp -d ${gawk}/bin/awk $out/bin
+      cp ${gnutar}/bin/tar $out/bin
+      cp ${gzip}/bin/gzip $out/bin
+      cp ${bzip2}/bin/bzip2 $out/bin
+      cp -d ${gnumake}/bin/* $out/bin
+      cp -d ${patch}/bin/* $out/bin
+      cp -d ${xz}/bin/xz $out/bin
+
+      # This used to be in-nixpkgs, but now is in the bundle
+      # because I can't be bothered to make it partially static
+      cp ${curl}/bin/curl $out/bin
+      cp -d ${curl}/lib/libcurl*.dylib $out/lib
+      cp -d ${libssh2}/lib/libssh*.dylib $out/lib
+      cp -d ${openssl}/lib/*.dylib $out/lib
+
+      cp -d ${gnugrep.pcre}/lib/libpcre*.dylib $out/lib
+      cp -d ${libiconv}/lib/libiconv*.dylib $out/lib
+      cp -d ${gettext}/lib/libintl*.dylib $out/lib
+      chmod +x $out/lib/libintl*.dylib
+
+      # Copy what we need of clang
+      cp -d ${llvmPackages.clang-unwrapped}/bin/clang $out/bin
+      cp -d ${llvmPackages.clang-unwrapped}/bin/clang++ $out/bin
+      cp -d ${llvmPackages.clang-unwrapped}/bin/clang-3.6 $out/bin
+
+      cp -rL ${llvmPackages.clang-unwrapped}/lib/clang $out/lib
+
+      cp -d ${libcxx}/lib/libc++*.dylib $out/lib
+      cp -d ${libcxxabi}/lib/libc++abi*.dylib $out/lib
+
+      mkdir $out/include
+      cp -rd ${libcxx}/include/c++     $out/include
+
+      cp -d ${icu}/lib/libicu*.dylib $out/lib
+      cp -d ${zlib}/lib/libz.*       $out/lib
+      cp -d ${gmpxx}/lib/libgmp*.*   $out/lib
+      cp -d ${xz}/lib/liblzma*.*     $out/lib
+
+      # Copy binutils.
+      for i in as ld ar ranlib nm strip otool install_name_tool dsymutil; do
+        cp ${darwin.cctools}/bin/$i $out/bin
+      done
+
+      cp -rd ${pkgs.darwin.CF}/Library $out
+
+      chmod -R u+w $out
+
+      nuke-refs $out/bin/*
+
+      rpathify() {
+        local libs=$(${darwin.cctools}/bin/otool -L "$1" | tail -n +2 | grep -o "$NIX_STORE.*-\S*") || true
+        for lib in $libs; do
+          ${darwin.cctools}/bin/install_name_tool -change $lib "@rpath/$(basename $lib)" "$1"
+        done
+      }
+
+      fix_dyld() {
+        # This is clearly a hack. Once we have an install_name_tool-alike that can patch dyld, this will be nicer.
+        ${perl}/bin/perl -i -0777 -pe 's/\/nix\/store\/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-dyld-239\.4\/lib\/dyld/\/usr\/lib\/dyld\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00/sg' "$1"
+      }
+
+      # Strip executables even further
+      for i in $out/bin/*; do
+        if test -x $i -a ! -L $i; then
+          chmod +w $i
+
+          fix_dyld $i
+          strip $i || true
+        fi
+      done
+
+      for i in $out/bin/* $out/lib/*.dylib $out/lib/clang/3.5.0/lib/darwin/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do
+        if test -x $i -a ! -L $i; then
+          echo "Adding rpath to $i"
+          rpathify $i
+        fi
+      done
+
+      nuke-refs $out/lib/*
+      nuke-refs $out/lib/clang/3.5.0/lib/darwin/*
+      nuke-refs $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
+
+      mkdir $out/.pack
+      mv $out/* $out/.pack
+      mv $out/.pack $out/pack
+
+      mkdir $out/on-server
+      (cd $out/pack && (find | cpio -o -H newc)) | bzip2 > $out/on-server/bootstrap-tools.cpio.bz2
+
+      mkdir $out/in-nixpkgs
+      cp ${stdenv.shell} $out/in-nixpkgs/sh
+      cp ${cpio}/bin/cpio $out/in-nixpkgs
+      cp ${coreutils_}/bin/mkdir $out/in-nixpkgs
+      cp ${bzip2}/bin/bzip2 $out/in-nixpkgs
+
+      chmod u+w $out/in-nixpkgs/*
+      strip $out/in-nixpkgs/*
+      nuke-refs $out/in-nixpkgs/*
+
+      for i in $out/in-nixpkgs/*; do
+        fix_dyld $i
+      done
+    '';
+
+    allowedReferences = [];
+  };
+
+  host = stdenv.mkDerivation {
+    name = "host";
+
+    buildCommand = ''
+      mkdir -p $out/nix-support
+
+      for i in "${build}/on-server/"*; do
+        echo "file binary-dist $i" >> $out/nix-support/hydra-build-products
+      done
+
+      echo "darwin-bootstrap-tools-$(date +%Y.%m.%d)" >> $out/nix-support/hydra-release-name
+    '';
+
+    allowedReferences = [ build ];
+  };
+
+  unpack = stdenv.mkDerivation {
+    name = "unpack";
+
+    # This is by necessity a near-duplicate of unpack-bootstrap-tools.sh. If we refer to it directly,
+    # we can't make any changes to it due to our testing stdenv depending on it. Think of this as the
+    # unpack-bootstrap-tools.sh for the next round of bootstrap tools.
+    # TODO: think through alternate designs, such as hosting this script as an output of the process.
+    buildCommand = ''
+      # Unpack the bootstrap tools tarball.
+      echo Unpacking the bootstrap tools...
+      $mkdir $out
+      $bzip2 -d < $tarball | (cd $out && $cpio -i)
+
+      # Set the ELF interpreter / RPATH in the bootstrap binaries.
+      echo Patching the tools...
+
+      export PATH=$out/bin
+
+      for i in $out/bin/*; do
+        if ! test -L $i; then
+          echo patching $i
+          install_name_tool -add_rpath $out/lib $i || true
+        fi
+      done
+
+      for i in $out/lib/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do
+        if ! test -L $i; then
+          echo patching $i
+
+          id=$(otool -D "$i" | tail -n 1)
+          install_name_tool -id "$(dirname $i)/$(basename $id)" $i
+
+          libs=$(otool -L "$i" | tail -n +2 | grep -v Libsystem | cat)
+          if [ -n "$libs" ]; then
+            install_name_tool -add_rpath $out/lib $i
+          fi
+        fi
+      done
+
+      ln -s bash $out/bin/sh
+      ln -s bzip2 $out/bin/bunzip2
+
+      cat >$out/bin/dsymutil << EOF
+      #!$out/bin/sh
+      EOF
+    '';
+
+    tarball = "${build}/on-server/bootstrap-tools.cpio.bz2";
+
+    mkdir = "${build}/in-nixpkgs/mkdir";
+    bzip2 = "${build}/in-nixpkgs/bzip2";
+    cpio  = "${build}/in-nixpkgs/cpio";
+
+    allowedReferences = [ "out" ];
+  };
+
+  test = stdenv.mkDerivation {
+    name = "test";
+
+    realBuilder = "${unpack}/bin/bash";
+
+    buildCommand = ''
+      export PATH=${unpack}/bin
+      ls -l
+      mkdir $out
+      mkdir $out/bin
+      sed --version
+      find --version
+      diff --version
+      patch --version
+      make --version
+      awk --version
+      grep --version
+      clang --version
+      xz --version
+
+      # The grep will return a nonzero exit code if there is no match, and we want to assert that we have
+      # an SSL-capable curl
+      curl --version | grep SSL
+
+      ${build}/in-nixpkgs/sh -c 'echo Hello World'
+
+      export flags="-idirafter ${unpack}/include-Libsystem --sysroot=${unpack} -L${unpack}/lib"
+
+      export CPP="clang -E $flags"
+      export CC="clang $flags -Wl,-rpath,${unpack}/lib -Wl,-v"
+      export CXX="clang++ $flags --stdlib=libc++ -lc++abi -isystem${unpack}/include/c++/v1 -Wl,-rpath,${unpack}/lib -Wl,-v"
+
+      echo '#include <stdio.h>' >> foo.c
+      echo '#include <float.h>' >> foo.c
+      echo '#include <limits.h>' >> foo.c
+      echo 'int main() { printf("Hello World\n"); return 0; }' >> foo.c
+      $CC -o $out/bin/foo foo.c
+      $out/bin/foo
+
+      echo '#include <CoreFoundation/CoreFoundation.h>' >> bar.c
+      echo 'int main() { CFShow(CFSTR("Hullo")); return 0; }' >> bar.c
+      $CC -F${unpack}/Library/Frameworks -framework CoreFoundation -o $out/bin/bar bar.c
+      $out/bin/bar
+
+      echo '#include <iostream>' >> bar.cc
+      echo 'int main() { std::cout << "Hello World\n"; }' >> bar.cc
+      $CXX -v -o $out/bin/bar bar.cc
+      $out/bin/bar
+
+      tar xvf ${hello.src}
+      cd hello-*
+      ./configure --prefix=$out
+      make
+      make install
+
+      $out/bin/hello
+    '';
+  };
+}
diff --git a/pkgs/stdenv/pure-darwin/trivial-bootstrap.sh b/pkgs/stdenv/pure-darwin/trivial-bootstrap.sh
new file mode 100644
index 00000000000..0915b378d4f
--- /dev/null
+++ b/pkgs/stdenv/pure-darwin/trivial-bootstrap.sh
@@ -0,0 +1,66 @@
+
+# Building bootstrap tools
+echo Building the trivial bootstrap environment...
+$mkdir -p $out/bin
+
+$ln -s $ln $out/bin/ln
+
+PATH=$out/bin/
+
+cd $out/bin
+
+ln -s $mkdir
+ln -s /bin/sh
+ln -s /bin/cp
+ln -s /bin/mv
+ln -s /bin/rm
+ln -s /bin/ls
+ln -s /bin/ps
+ln -s /bin/cat
+ln -s /bin/bash
+ln -s /bin/echo
+ln -s /bin/expr
+ln -s /bin/test
+ln -s /bin/date
+ln -s /bin/chmod
+ln -s /bin/rmdir
+ln -s /bin/sleep
+ln -s /bin/hostname
+
+ln -s /usr/bin/id
+ln -s /usr/bin/od
+ln -s /usr/bin/tr
+ln -s /usr/bin/wc
+ln -s /usr/bin/cut
+ln -s /usr/bin/cmp
+ln -s /usr/bin/sed
+ln -s /usr/bin/tar
+ln -s /usr/bin/xar
+ln -s /usr/bin/awk
+ln -s /usr/bin/env
+ln -s /usr/bin/tee
+ln -s /usr/bin/comm
+ln -s /usr/bin/cpio
+ln -s /usr/bin/curl
+ln -s /usr/bin/find
+ln -s /usr/bin/grep
+ln -s /usr/bin/gzip
+ln -s /usr/bin/head
+ln -s /usr/bin/tail
+ln -s /usr/bin/sort
+ln -s /usr/bin/uniq
+ln -s /usr/bin/less
+ln -s /usr/bin/true
+ln -s /usr/bin/diff
+ln -s /usr/bin/egrep
+ln -s /usr/bin/fgrep
+ln -s /usr/bin/patch
+ln -s /usr/bin/uname
+ln -s /usr/bin/touch
+ln -s /usr/bin/split
+ln -s /usr/bin/xargs
+ln -s /usr/bin/which
+ln -s /usr/bin/install
+ln -s /usr/bin/basename
+ln -s /usr/bin/dirname
+ln -s /usr/bin/readlink
\ No newline at end of file
diff --git a/pkgs/stdenv/pure-darwin/unpack-bootstrap-tools.sh b/pkgs/stdenv/pure-darwin/unpack-bootstrap-tools.sh
new file mode 100644
index 00000000000..8033c7004d9
--- /dev/null
+++ b/pkgs/stdenv/pure-darwin/unpack-bootstrap-tools.sh
@@ -0,0 +1,54 @@
+set -e
+
+# Unpack the bootstrap tools tarball.
+echo Unpacking the bootstrap tools...
+$mkdir $out
+$bzip2 -d < $tarball | (cd $out && $cpio -i)
+
+# Set the ELF interpreter / RPATH in the bootstrap binaries.
+echo Patching the tools...
+
+export PATH=$out/bin
+
+for i in $out/bin/*; do
+  if ! test -L $i; then
+    echo patching $i
+    install_name_tool -add_rpath $out/lib $i || true
+  fi
+done
+
+for i in $out/lib/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do
+  if ! test -L $i; then
+    echo patching $i
+
+    id=$(otool -D "$i" | tail -n 1)
+    install_name_tool -id "$(dirname $i)/$(basename $id)" $i
+
+    libs=$(otool -L "$i" | tail -n +2 | grep -v libSystem | cat)
+    if [ -n "$libs" ]; then
+      install_name_tool -add_rpath $out/lib $i
+    fi
+  fi
+done
+
+ln -s bash $out/bin/sh
+ln -s bzip2 $out/bin/bunzip2
+
+# Provide a gunzip script.
+cat > $out/bin/gunzip <<EOF
+#!$out/bin/sh
+exec $out/bin/gzip -d "\$@"
+EOF
+chmod +x $out/bin/gunzip
+
+# Provide fgrep/egrep.
+echo "#! $out/bin/sh" > $out/bin/egrep
+echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep
+echo "#! $out/bin/sh" > $out/bin/fgrep
+echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep
+
+cat >$out/bin/dsymutil << EOF
+#!$out/bin/sh
+EOF
+
+chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/dsymutil

From e26b421b71d442949839c4fc65090219f7c491ab Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 18 Jun 2015 13:40:17 -0700
Subject: [PATCH 1316/2322] fix conditionals for bootstrap sed calls

---
 pkgs/development/libraries/libedit/default.nix | 2 +-
 pkgs/tools/archivers/sharutils/default.nix     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index 5adef716eb0..167aa206865 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   ] else null;
 
   postInstall = ''
-    sed -i s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc
+    sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.nativeLibc) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc
   '';
 
   configureFlags = [ "--enable-widec" ];
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index bfeda5085b6..cc9618c4dcc 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/pkgs/tools/archivers/sharutils/default.nix
@@ -9,10 +9,12 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure =
-    ''
+    let needSedSpace = ((stdenv.isFreeBSD || stdenv.isOpenBSD) && stdenv.cc.nativeTools)
+                    || (stdenv.isDarwin && stdenv.cc.nativeLibc);
+    in ''
        # Fix for building on Glibc 2.16.  Won't be needed once the
        # gnulib in sharutils is updated.
-       sed -i ${stdenv.lib.optionalString ((stdenv.isFreeBSD || stdenv.isOpenBSD) && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h
+       sed -i ${stdenv.lib.optionalString needSedSpace "''"} '/gets is a security hole/d' lib/stdio.in.h
     '';
 
   # GNU Gettext is needed on non-GNU platforms.

From 3790cb7d439c71ee4e5bddcda1f32d44ad4aa6d3 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 18 Jun 2015 13:44:40 -0700
Subject: [PATCH 1317/2322] fix nonexistent cc path in bootstrap stdenv

---
 pkgs/stdenv/pure-darwin/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/pure-darwin/default.nix b/pkgs/stdenv/pure-darwin/default.nix
index d4b17a7909c..79925a2edfd 100644
--- a/pkgs/stdenv/pure-darwin/default.nix
+++ b/pkgs/stdenv/pure-darwin/default.nix
@@ -70,7 +70,7 @@ in rec {
 
         name = "stdenv-darwin-boot-${toString step}";
 
-        cc = if isNull last then "/no-such-path" else import ../../build-support/cc-wrapper {
+        cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper {
           inherit shell;
           inherit (last) stdenv;
           inherit (last.pkgs.darwin) dyld;

From 3d68e0b0e21f072810be3bf492ee3bfcfd4ae589 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Wed, 4 Mar 2015 16:10:13 +0000
Subject: [PATCH 1318/2322] new package: maim

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

diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
new file mode 100644
index 00000000000..425fa5fb6cd
--- /dev/null
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, cmake, gengetopt, imlib2, libXrandr, libXfixes
+, cppcheck}:
+
+stdenv.mkDerivation rec {
+  name = "maim-${version}";
+  version = "3.3.41";
+
+  src = fetchurl {
+    url = "https://github.com/naelstrof/maim/archive/v${version}.tar.gz";
+    sha256 = "12p9zd4skxds26hicy6hrxkxnhbqv1c5ys1h6jchaypvwdggcgnc";
+  };
+
+  buildInputs = [ cmake gengetopt imlib2 libXrandr libXfixes ]
+                ++ stdenv.lib.optional doCheck cppcheck;
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/naelstrof/maim;
+    description = "A command-line screenshot utility";
+    longDescription = ''
+      maim (make image) takes screenshots of your desktop. It has options to
+      take only a region, and relies on slop to query for regions. maim is
+      supposed to be an improved scrot.
+    '';
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with maintainers; [ mbakke ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cf9fed11ae..5d4516d9f6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2065,6 +2065,8 @@ let
     guile = guile_1_8;
   };
 
+  maim = callPackage ../tools/graphics/maim {};
+
   mairix = callPackage ../tools/text/mairix { };
 
   makemkv = callPackage ../applications/video/makemkv { };

From 10ff6c3fe0827a6fa213c620a1ca06989755c6d1 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Wed, 4 Mar 2015 17:41:01 +0000
Subject: [PATCH 1319/2322] new package: slop

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

diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix
new file mode 100644
index 00000000000..62ec5ab2d63
--- /dev/null
+++ b/pkgs/tools/misc/slop/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, gengetopt, libX11, libXext, cppcheck}:
+
+stdenv.mkDerivation rec {
+  name = "slop-${version}";
+  version = "4.1.15";
+
+  src = fetchurl {
+    url = "https://github.com/naelstrof/slop/archive/v${version}.tar.gz";
+    sha256 = "e20fd47de898abcb537c8100faed859eef4955d7784dbc52470570dae403f02e";
+  };
+
+  buildInputs = [ cmake gengetopt libX11 libXext ]
+                ++ stdenv.lib.optional doCheck cppcheck;
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/naelstrof/slop;
+    description = "Queries a selection from the user and prints to stdout";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with maintainers; [ mbakke ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d4516d9f6f..3f3deeff7bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12321,6 +12321,8 @@ let
 
   slmenu = callPackage ../applications/misc/slmenu {};
 
+  slop = callPackage ../tools/misc/slop {};
+
   slrn = callPackage ../applications/networking/newsreaders/slrn { };
 
   sooperlooper = callPackage ../applications/audio/sooperlooper { };

From 09c505c1116c4cf05ded61c3cc9a54f4538488f3 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Thu, 18 Jun 2015 22:02:31 +0100
Subject: [PATCH 1320/2322] add self to maintainers

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index df7a442ac52..a80065aceeb 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -138,6 +138,7 @@
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
   matejc = "Matej Cotman <cotman.matej@gmail.com>";
   matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>";
+  mbakke = "Marius Bakke <ymse@tuta.io>";
   meditans = "Carlo Nucera <meditans@gmail.com>";
   meisternu = "Matt Miemiec <meister@krutt.org>";
   michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";

From bb1ea06dd8d1c7a43d840e74a88a55453c9ee4c2 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Thu, 18 Jun 2015 23:10:01 +0100
Subject: [PATCH 1321/2322] rofi 0.15.2 -> 0.15.5

---
 pkgs/applications/misc/rofi/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 1bbe026cfeb..55f63d99ce2 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,17 +1,15 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig
+{ stdenv, fetchurl, autoconf, automake, pkgconfig
 , libX11, libXinerama, libXft, pango
 , i3Support ? false, i3
 }:
 
 stdenv.mkDerivation rec {
   name = "rofi-${version}";
-  version = "0.15.2";
+  version = "0.15.5";
 
-  src = fetchFromGitHub {
-    repo = "rofi";
-    owner = "DaveDavenport";
-    rev = "${version}";
-    sha256 = "0b8k5g2fpqrz1yac09kmfk4caxcc107qq4yhncnl159xdxw66vz8";
+  src = fetchurl {
+    url = "https://github.com/DaveDavenport/rofi/archive/${version}.tar.gz";
+    sha256 = "16dffwxqxcx5krb6v1m6gh0r6d0a4hwl0jq4fdyblcv9xid5hxf5";
   };
 
   buildInputs = [ autoconf automake pkgconfig libX11 libXinerama libXft pango
@@ -25,5 +23,6 @@ stdenv.mkDerivation rec {
       description = "Window switcher, run dialog and dmenu replacement";
       homepage = https://davedavenport.github.io/rofi;
       license = stdenv.lib.licenses.mit;
+      maintainers = [ stdenv.lib.maintainers.mbakke ];
   };
 }

From 7d790284568863efc8616f154374304eeb73dbd3 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Thu, 18 Jun 2015 23:26:52 +0100
Subject: [PATCH 1322/2322] rofi-pass: rename to rofi-pass

---
 pkgs/applications/misc/rofi/pass.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix
index 8a7382ae737..ccde370c292 100644
--- a/pkgs/applications/misc/rofi/pass.nix
+++ b/pkgs/applications/misc/rofi/pass.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, rofi, wmctrl, xprop, xdotool}:
 
 stdenv.mkDerivation rec {
-  name = "rofi-${version}";
+  name = "rofi-pass-${version}";
   version = "2015-06-08";
 
   src = fetchgit {

From 9fd1920d8fdfaede3cf15773dd4a794d1abea4df Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 18 Jun 2015 17:04:09 -0700
Subject: [PATCH 1323/2322] fix ncurses renames on darwin

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

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 0c789fc4460..6da81faf47a 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -9,7 +9,9 @@
 , abiVersion ? "5"
 }:
 
-stdenv.mkDerivation rec {
+let libSuffix = if stdenv.isDarwin then "dylib" else "so";
+
+in stdenv.mkDerivation rec {
   name = "ncurses-5.9";
 
   src = fetchurl {
@@ -63,9 +65,9 @@ stdenv.mkDerivation rec {
     # Create non-unicode compatability
     libs="$(find $out/lib -name \*w.a | sed 's,.*lib\(.*\)w.a.*,\1,g')"
     for lib in $libs; do
-      if [ -e "$out/lib/lib''${lib}w.so" ]; then
-        ln -svf lib''${lib}w.so $out/lib/lib$lib.so
-        ln -svf lib''${lib}w.so.${abiVersion} $out/lib/lib$lib.so.${abiVersion}
+      if [ -e "$out/lib/lib''${lib}w.${libSuffix}" ]; then
+        ln -svf lib''${lib}w.${libSuffix} $out/lib/lib$lib.${libSuffix}
+        ln -svf lib''${lib}w.${libSuffix}.${abiVersion} $out/lib/lib$lib.${libSuffix}.${abiVersion}
       fi
       ln -svf lib''${lib}w.a $out/lib/lib$lib.a
       ln -svf ''${lib}w.pc $out/lib/pkgconfig/$lib.pc

From 10d06f4252fdda6c3faac97828ad8ef06bf2d61f Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 18 Jun 2015 17:54:12 -0700
Subject: [PATCH 1324/2322] darwin purity: gmp-4.3.2

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

diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix
index 39d84c4f6fe..02d24d21900 100644
--- a/pkgs/development/libraries/gmp/4.3.2.nix
+++ b/pkgs/development/libraries/gmp/4.3.2.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
     then "ln -sf configfsf.guess config.guess"
     else ''echo "Darwin host is `./config.guess`."'';
 
-  configureFlags = if cxx then "--enable-cxx" else "--disable-cxx";
+  configureFlags = (if cxx then "--enable-cxx" else "--disable-cxx") +
+    stdenv.lib.optionalString stdenv.isDarwin " ac_cv_build=x86_64-apple-darwin13.4.0 ac_cv_host=x86_64-apple-darwin13.4.0";
 
   # The test t-lucnum_ui fails (on Linux/x86_64) when built with GCC 4.8.
   # Newer versions of GMP don't have that issue anymore.

From 3a60e40d9b195d06d7a536e38d327c36950600da Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 19:29:24 -0700
Subject: [PATCH 1325/2322] nix-serve: Update

---
 pkgs/tools/package-management/nix-serve/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index 9b42a722e96..332576a9873 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -1,18 +1,19 @@
 { lib, stdenv, fetchFromGitHub, perl, nix, perlPackages }:
 
-let rev = "4c24e3ffa7d267d67d87135e7ac4c9198e449cd3"; in
+let rev = "7e09caa2a7a435aeb2cd5446aa590d6f9ae1699d"; in
 
 stdenv.mkDerivation rec {
-  name = "nix-serve-0.1-${lib.substring 0 7 rev}";
+  name = "nix-serve-0.2-${lib.substring 0 7 rev}";
 
   src = fetchFromGitHub {
     owner = "edolstra";
     repo = "nix-serve";
     inherit rev;
-    sha256 = "1c0ip4w00j86412l2qf0dwzjr9jzimiygbx82x15r46kr3cpk7kp";
+    sha256 = "0mjzsiknln3isdri9004wwjjjpak5fj8ncizyncf5jv7g4m4q1pj";
   };
 
-  buildInputs = [ perl nix perlPackages.Plack perlPackages.Starman ];
+  buildInputs = [ perl nix ]
+    ++ (with perlPackages; [ DBI DBDSQLite Plack Starman ]);
 
   buildPhase = "true";
 

From 5191f5be2e2e34365a7da313913fefd7f0bc9a4c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 20:00:18 -0700
Subject: [PATCH 1326/2322] ncurses: Fix up library linking

---
 .../development/libraries/ncurses/default.nix | 73 ++++++++-----------
 1 file changed, 29 insertions(+), 44 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 6da81faf47a..7697aa1a9ac 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -9,9 +9,7 @@
 , abiVersion ? "5"
 }:
 
-let libSuffix = if stdenv.isDarwin then "dylib" else "so";
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "ncurses-5.9";
 
   src = fetchurl {
@@ -50,50 +48,37 @@ in stdenv.mkDerivation rec {
   # When building a wide-character (Unicode) build, create backward
   # compatibility links from the the "normal" libraries to the
   # wide-character libraries (e.g. libncurses.so to libncursesw.so).
-  postInstall = if unicode then (''
-    # Create a non-abi versioned config
+  postInstall = ''
+    # Determine what suffixes our libraries have
+    suffix="$(awk -F': ' 'f{print $3; f=0} /default library suffix/{f=1}' config.log)"
+    libs="$(ls $out/lib/pkgconfig | tr ' ' '\n' | sed "s,\(.*\)$suffix\.pc,\1,g")"
+    suffixes="$(echo "$suffix" | awk '{for (i=1; i < length($0); i++) {x=substr($0, i+1, length($0)-i); print x}}')"
+
+    # Get the path to the config util
     cfg=$(basename $out/bin/ncurses*-config)
-    ln -svf $cfg $out/bin/ncursesw-config
-    ln -svf $cfg $out/bin/ncurses-config
 
-    # Allow for end users who #include <ncurses?w/*.h>
-    mv "$out"/include/ncursesw/* "$out"/include/
-    rmdir "$out"/include/ncursesw
-    ln -svf . $out/include/ncursesw
-    ln -svf . $out/include/ncurses
+    for newsuffix in $suffixes ""; do
+      # Create a non-abi versioned config util links
+      ln -svf $cfg $out/bin/ncurses$newsuffix-config
 
-    # Create non-unicode compatability
-    libs="$(find $out/lib -name \*w.a | sed 's,.*lib\(.*\)w.a.*,\1,g')"
-    for lib in $libs; do
-      if [ -e "$out/lib/lib''${lib}w.${libSuffix}" ]; then
-        ln -svf lib''${lib}w.${libSuffix} $out/lib/lib$lib.${libSuffix}
-        ln -svf lib''${lib}w.${libSuffix}.${abiVersion} $out/lib/lib$lib.${libSuffix}.${abiVersion}
-      fi
-      ln -svf lib''${lib}w.a $out/lib/lib$lib.a
-      ln -svf ''${lib}w.pc $out/lib/pkgconfig/$lib.pc
+      # Allow for end users who #include <ncurses?w/*.h>
+      ln -svf . $out/include/ncurses$newsuffix
+
+      for lib in $libs; do
+        for dylibtype in so dll dylib; do
+          if [ -e "$out/lib/lib''${lib}$suffix.$dylibtype" ]; then
+            ln -svf lib''${lib}$suffix.$dylibtype $out/lib/lib$lib$newsuffix.$dylibtype
+            ln -svf lib''${lib}$suffix.$dylibtype.${abiVersion} $out/lib/lib$lib$newsuffix.$dylibtype.${abiVersion}
+          fi
+        done
+        for statictype in a dll.a la; do
+          if [ -e "$out/lib/lib''${lib}$suffix.$statictype" ]; then
+            ln -svf lib''${lib}$suffix.$statictype $out/lib/lib$lib$newsuffix.$statictype
+          fi
+        done
+        ln -svf ''${lib}$suffix.pc $out/lib/pkgconfig/$lib$newsuffix.pc
+      done
     done
-
-    # Create curses compatability
-    ln -svf libncursesw.so $out/lib/libcursesw.so
-    ln -svf libncursesw.so $out/lib/libcurses.so
-  '' + lib.optionalString stdenv.isCygwin ''
-    for lib in $libs; do
-      if test -e $out/lib/lib''${lib}w.dll.a; then
-          ln -svf lib''${lib}w.dll.a $out/lib/lib$lib.dll.a
-      fi
-    done
-  '') else ''
-    # Create a non-abi versioned config
-    cfg=$(basename $out/bin/ncurses*-config)
-    ln -svf $cfg $out/bin/ncurses-config
-
-    # Allow for end users who #include <ncurses/*.h>
-    mv "$out"/include/ncurses/* "$out"/include/
-    rmdir "$out"/include/ncurses
-    ln -svf . $out/include/ncurses
-
-    # Create curses compatability
-    ln -svf libncurses.so $out/lib/libcurses.so
   '';
 
   preFixup = ''
@@ -124,5 +109,5 @@ in stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.wkennington ];
   };
 
-  passthru.ldflags = if unicode then "-lncursesw" else "-lncurses";
+  passthru.ldflags = "-lncurses";
 }

From d05873a5099343119a7990a7b96a247ffc1f6e5c Mon Sep 17 00:00:00 2001
From: Marcell Vazquez-Chanlatte <mvc@linux.com>
Date: Thu, 18 Jun 2015 23:28:01 -0400
Subject: [PATCH 1327/2322] bump version of taskwarrior 2.4.0 -> 2.4.4

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

diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index fa8b11adbf8..20f7bfec646 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "taskwarrior-${version}";
-  version = "2.4.0";
+  version = "2.4.4";
 
   enableParallelBuilding = true;
 
   src = fetchurl {
     url = "http://www.taskwarrior.org/download/task-${version}.tar.gz";
-    sha256 = "17hiv7zld06zb5xmyp96bw9xl6vp178fhffs660fxxpxn3srb9bg";
+    sha256 = "7ff406414e0be480f91981831507ac255297aab33d8246f98dbfd2b1b2df8e3b";
   };
 
   nativeBuildInputs = [ cmake libuuid gnutls ];

From 663b6f2eaa5b72cafca29ac545ca9d141a537a35 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 20:50:30 -0700
Subject: [PATCH 1328/2322] nghttp2: 0.7.14 -> 1.0.2

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

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index bc8c599a901..e5e4f1cfff3 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -34,12 +34,12 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${prefix}nghttp2-${version}";
-  version = "0.7.14";
+  version = "1.0.2";
 
   # Don't use fetchFromGitHub since this needs a bootstrap curl
   src = fetchurl {
     url = "http://pub.wak.io/nixos/tarballs/nghttp2-${version}.tar.bz2";
-    sha256 = "000d50yzyysbr9ldhvnbpzn35vplqm08dnmh55wc5zk273gy383f";
+    sha256 = "633dd6d5d1f29a4d802d6c9e5b9eeb0b9104f35652396f26999a27515b6c1c14";
   };
 
   # Configure script searches for a symbol which does not exist in jemalloc on Darwin

From 3d9be37df731e471f18d22d78ffba5fb1e4377e3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 20:55:19 -0700
Subject: [PATCH 1329/2322] curl: 7.42.1 -> 7.43.0

---
 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 28f28c9a4f9..6901c74cc48 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -16,11 +16,11 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.42.1";
+  name = "curl-7.43.0";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "11y8racpj6m4j9w7wa9sifmqvdgf22nk901sfkbxzhhy75rmk472";
+    sha256 = "1ycdhp47v8z6y64s7ihi5jl28dzc5w8wqn0wrhy4hc152ahm99ms";
   };
 
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains

From d8c746601e7666c53bc563c3fd1875d4f6b7e481 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 21:12:57 -0700
Subject: [PATCH 1330/2322] libjpeg-turbo: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index c9de127c905..158b8825db4 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, nasm }:
 
 stdenv.mkDerivation rec {
-  name = "libjpeg-turbo-1.4.0";
+  name = "libjpeg-turbo-1.4.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz";
-    sha256 = "1vmv5ciqq98gi2ishqbvlx9hsk7sl06lr6xkcgw480jiddadhfnr";
+    sha256 = "027vz97064bjmwj7gdw2p47y1437w08j54frpgzmnql5rvabmxab";
   };
 
   buildInputs = [ nasm ];

From c0b553c12c4e5eca45c4b77cadf667d4999a98e8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 21:17:51 -0700
Subject: [PATCH 1331/2322] zeromq: 4.1.1 -> 4.1.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 87417d1b77a..5cf9098bec6 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libuuid, pkgconfig, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "zeromq-4.1.1";
+  name = "zeromq-4.1.2";
 
   src = fetchurl {
     url = "http://download.zeromq.org/${name}.tar.gz";
-    sha256 = "1nxqvb1n8yy6953nv095riirrpmw4w340qd6sjm4cfdl0rbixmj3";
+    sha256 = "09sr6ix4k25m3fw6c8xhicq5g27q0k1vlwfqai8iwlk8dnnjw5pr";
   };
 
   buildInputs = [ libuuid pkgconfig libsodium ];

From 4468d52cbb0640089827d1c934e9b06701097127 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 21:19:33 -0700
Subject: [PATCH 1332/2322] libndp: 1.4 -> 1.5

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

diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/development/libraries/libndp/default.nix
index ae0db409a1a..c32e6999ecf 100644
--- a/pkgs/development/libraries/libndp/default.nix
+++ b/pkgs/development/libraries/libndp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libndp-1.4";
+  name = "libndp-1.5";
 
   src = fetchurl {
     url = "http://libndp.org/files/${name}.tar.gz";
-    sha256 = "0pym5xxq3avg348q61xggwy05i0r2m4sj3mlwlpxfjq2xi3y42rs";
+    sha256 = "15f743hjc7yy2sv3hzvfc27s1gny4mh5aww59vn195fff2midwgs";
   };
 
   meta = with stdenv.lib; {

From 7fd80890c77e4a38cfef67438df4364ab51a74d1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 21:24:46 -0700
Subject: [PATCH 1333/2322] git: 2.4.2 -> 2.4.4

---
 .../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 29ec3b50786..ee001917746 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "2.4.2";
+  version = "2.4.4";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "1rf942v2yk49xgy0asgk4vi4mmshpz823iyvrxc5n5y2v0ffq0a8";
+    sha256 = "0q02ygsk1gvn07bb7gnwrp9kr2p405fjj8arpby7851889fv2wzq";
   };
 
   patches = [

From 6c4dad169240992a0a607287060e38c41dcdc905 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 21:27:21 -0700
Subject: [PATCH 1334/2322] wiredtiger: 2.6.0 -> 2.6.1

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

diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index da4dc9d6bbc..5fe75248e35 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -26,13 +26,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "wiredtiger-${version}";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     repo = "wiredtiger";
     owner = "wiredtiger";
     rev = version;
-    sha256 = "0i2r03bpq9xzp5pw7c67kjac5j7mssiawd9id8lqjdbr6c6772cv";
+    sha256 = "1nj319w3hvkq3za2dz9m0p1w683gycdb392v1jb910bhzpsq30pd";
   };
 
   nativeBuildInputs = [ automake autoconf libtool ];

From 14792f12d649e58a4b799da30637e5a2607801d7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 21:35:12 -0700
Subject: [PATCH 1335/2322] mongodb: 3.0.3 -> 3.0.4

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

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index a465d1c4a59..153f2f584d1 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 
-let version = "3.0.3";
+let version = "3.0.4";
     system-libraries = [
       "pcre"
       "wiredtiger"
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
-    sha256 = "01q8fas8afch50h4kjdrdrcrb1qx243wafz6zdsbc2waq60mlxjp";
+    sha256 = "0q23hvi0axc14s1ah1p67rxvi36skw34kj9ahpijx2dd2a5smrvd";
   };
 
   nativeBuildInputs = [ scons ];

From 7aa425e541d37edd155cbb6992a9978eae3ac1d2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 21:39:39 -0700
Subject: [PATCH 1336/2322] lftp: 4.6.1 -> 4.6.3a

---
 pkgs/tools/networking/lftp/default.nix   |  6 ++----
 pkgs/tools/networking/lftp/no-gets.patch | 15 ---------------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/tools/networking/lftp/no-gets.patch

diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index 1e1f1bd8b76..c77e20c2413 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -1,18 +1,16 @@
 { stdenv, fetchurl, gnutls, pkgconfig, readline, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "lftp-4.6.1";
+  name = "lftp-4.6.3a";
 
   src = fetchurl {
     urls = [
       "http://lftp.yar.ru/ftp/${name}.tar.bz2"
       "http://lftp.yar.ru/ftp/old/${name}.tar.bz2"
       ];
-    sha256 = "0w9nb24abqlnjzi30q8s0yv3h0zjxhynliyxwdgnrv0qag0k401s";
+    sha256 = "0846p1z5v997lxaqanj8n1qkv470s8nlhs420kiby67k4j2zl576";
   };
 
-  patches = [ ./no-gets.patch ];
-
   buildInputs = [ gnutls pkgconfig readline zlib ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/lftp/no-gets.patch b/pkgs/tools/networking/lftp/no-gets.patch
deleted file mode 100644
index 0c2cb7c8ae6..00000000000
--- a/pkgs/tools/networking/lftp/no-gets.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -702,10 +702,12 @@
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning; besides, C11
-    removed it.  */
-+#ifdef gets
- #undef gets
- #if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-+#endif
- 
- 
- #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@

From 1bb39e282de259e7c6f2785d63263e0e54bc8fb5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 21:45:51 -0700
Subject: [PATCH 1337/2322] nvidia-x11: 346 -> 352.21

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index e660004d172..a1278af8084 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
 
 let
 
-  versionNumber = "346.59";
+  versionNumber = "352.21";
 
   # Policy: use the highest stable version as the default (on our master).
   inherit (stdenv.lib) makeLibraryPath;
@@ -28,12 +28,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "0a91mmv9846chyx6rbf3hx39gr344cffmgic45a9sf82rky87kv5";
+        sha256 = "1l206091frcpql8ql82i5jkf955wdr56ikh9aprwhqkyyjjq4qv1";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "0rz7pdzdviz1086w8ks6qiv83ah84y13h3051xr1p4wa4kll2yac";
+        sha256 = "1sv495i5s1fd7j4k4yr53xbgc9jind0y74mqivv36p5z6m8z5k6g";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From d5e841765e67f00526cbe6d6788543ce579cc70b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 21:50:29 -0700
Subject: [PATCH 1338/2322] mbedtls: 1.3.10 -> 1.3.11

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

diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index 1b0c1186f28..ae8ff907f25 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-1.3.10";
+  name = "mbedtls-1.3.11";
 
   src = fetchurl {
     url = "https://polarssl.org/download/${name}-gpl.tgz";
-    sha256 = "0zj0vdmam52hk7c6s3y81bdb4mqawi9fskkcqlgnj8v61j7dhvvl";
+    sha256 = "1js1lk6hvw9l3nhjhnhzfazfbnlcmk229hmnlm7jli3agc1979b7";
   };
 
   nativeBuildInputs = [ perl ];

From af178cbc4e76898b291b5239f76fa411e75af802 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 21:50:39 -0700
Subject: [PATCH 1339/2322] bluez: 5.30 -> 5.31

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

diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index 6e8fbdacf84..03c3d5943fe 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -5,11 +5,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "bluez-5.30";
+  name = "bluez-5.31";
    
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
-    sha256 = "0b1qbnq1xzcdw5rajg9yyg31bf21jnff0n6gnf1snz89bbdllfhy";
+    sha256 = "13w1cdybwyb9pww64hp8dwxqq9zs58wh1mq8sslsknb6b3663dn4";
   };
 
   pythonPath = with pythonPackages;

From 2f63137a4488c4eb9fdcfe97f3dfcec158ef3c3d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 21:50:53 -0700
Subject: [PATCH 1340/2322] lvm2: 2.02.118 -> 2.02.120

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

diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 228f7b34be0..250baa3fbc2 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }:
 
 let
-  version = "2.02.118";
+  version = "2.02.120";
 in
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz";
-    sha256 = "1ishsibxn1l5fymrrc5fd3z05x1z2zh0y8939wpvwz0qp9rwxazn";
+    sha256 = "06h8csqjy6b0khi73kklkp10j5yq3j1kxklfaf158c80glpx0swd";
   };
 
   configureFlags =

From bdeac100db00955133a7d48f6e3563eff8fabd59 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 21:56:18 -0700
Subject: [PATCH 1341/2322] dnsmasq: 2.72 -> 2.73

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

diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 4ae571f99e0..8883334fe6d 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -1,11 +1,11 @@
 { pkgconfig, dbus_libs, nettle, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dnsmasq-2.72";
+  name = "dnsmasq-2.73";
 
   src = fetchurl {
     url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz";
-    sha256 = "1c80hq09hfm8cp5pirfb8wdlc7dqkp7zzmbmdaradcvlblzx42vx";
+    sha256 = "1xnqfaw2l78f4zw4z9sgr9nl9yc233gxc3sd7hxapz2k7q883zqb";
   };
 
   # Can't rely on make flags because of space in one of the parameters

From 0967c0fcdbe5716207f6c25d1a2b7c5703d83999 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 21:58:45 -0700
Subject: [PATCH 1342/2322] wayland: 1.7.0 -> 1.8.1

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

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 11cf77668d7..9736d651404 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -8,11 +8,11 @@ assert expat != null;
 
 stdenv.mkDerivation rec {
   name = "wayland-${version}";
-  version = "1.7.0";
+  version = "1.8.1";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "173w0pqzk2m7hjlg15bymrx7ynxgq1ciadg03hzybxwnvfi4gsmx";
+    sha256 = "1j3gfzn8i0xhk3j34mwb2srrscjxfyi279jhyq80mz943j6r6z7i";
   };
 
   configureFlags = "--with-scanner --disable-documentation";

From 0b9419f4a94174161cb351b02945cd09fe9bddd3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 22:03:00 -0700
Subject: [PATCH 1343/2322] efivar: 0.15 -> 0.20

---
 pkgs/tools/system/efivar/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index fadf99f9b97..4ba747bda1a 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, popt }:
+{ stdenv, fetchFromGitHub, popt }:
 
 stdenv.mkDerivation rec {
   name = "efivar-${version}";
-  version = "0.15";
+  version = "0.20";
 
-  src = fetchgit {
-    url = "git://github.com/rhinstaller/efivar.git";
-    rev = "refs/tags/${version}";
-    sha256 = "1k5krjghb2r04wv6kxnhs1amqwzk7khzm7bsh0wnbsz7qn92masr";
+  src = fetchFromGitHub {
+    owner = "rhinstaller";
+    repo = "efivar";
+    rev = version;
+    sha256 = "14c8x9dhi4scj42n1cf513b551c1ccm8lwpaqx8h8ydpm2k35qi4";
   };
 
   buildInputs = [ popt ];

From 81636c4e60f4b2af6d11e242bc79e43a9a751458 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 22:06:59 -0700
Subject: [PATCH 1344/2322] dosfstools: 3.0.26 -> 3.0.28

---
 pkgs/tools/filesystems/dosfstools/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index 6bd6bfe368c..76df4f41257 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "dosfstools-3.0.26";
+  name = "dosfstools-${version}";
+  version = "3.0.28";
 
-  src = fetchurl {
-    url = "http://daniel-baumann.ch/files/software/dosfstools/${name}.tar.xz";
-    sha256 = "0x9yi6s1419k678pr9h3a5bjccbrcxxpzmjwgl262ffrikz45126";
+  src = fetchFromGitHub {
+    owner = "dosfstools";
+    repo = "dosfstools";
+    rev = "v${version}";
+    sha256 = "0lqirpxcn8ml0anq8aqmaljfsji9h6mdzz0jrs0yqqfhgg90bkg2";
   };
 
   makeFlags = "PREFIX=$(out)";

From 99dea2b61a88dd8d1910648fddbc80c40e2a9945 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 22:13:56 -0700
Subject: [PATCH 1345/2322] libssh2: 1.5.0 -> 1.6.0

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

diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index daeb39bc982..2bd7950751b 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurlBoot, openssl, zlib}:
 
 stdenv.mkDerivation rec {
-  name = "libssh2-1.5.0";
+  name = "libssh2-1.6.0";
 
   src = fetchurlBoot {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "1z6hfgak00yz0azx6lk6n688mywhdxx03j6sdf95p3w6ssnnn6c3";
+    sha256 = "05c2is69c50lyikkh29nk6zhghjk4i7hjx0zqfhq47aald1jj82s";
   };
 
   buildInputs = [ openssl zlib ];

From 549eb64bc3c8023dfc17e727e8741e2353f23412 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 22:19:59 -0700
Subject: [PATCH 1346/2322] libinput: 0.15.0 -> 0.17.0

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

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 87d8154e5aa..28880a3ac68 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -15,11 +15,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-0.15.0";
+  name = "libinput-0.17.0";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "07gw2bhjikiix6bgln03n0zqnbqw18svlf2dfpsv893xjwcdnmhn";
+    sha256 = "1nr8zg99hk6lz2g2kdvlz13i7cwvrsakakrn3c1w2id7wcxj9nxp";
   };
 
   configureFlags = [

From a8d04d9d1b178f2e142740b7ab70ecc5f79c1301 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 22:20:22 -0700
Subject: [PATCH 1347/2322] libraw: 0.16.0 -> 0.16.1

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

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index f0012f552c1..3e0d2348a50 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, lcms2, jasper, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "libraw-0.16.0";
+  name = "libraw-${version}";
+  version = "0.16.1";
 
   src = fetchurl {
-    url = http://www.libraw.org/data/LibRaw-0.16.0.tar.gz;
+    url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
     sha256 = "15ng4s24grib39r0nlgrf18r2j9yh43qyx4vbif38d95xiqkix3i";
   };
 

From 5668e3911c93392b6f68935003bda492711c550b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 22:34:29 -0700
Subject: [PATCH 1348/2322] efivar: Fix linking against libdl

---
 pkgs/tools/system/efivar/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index 4ba747bda1a..d0c84d52daa 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ popt ];
 
+  # 0.20 Relies on symbols from libdl.so which breaks efibootmgr
+  NIX_LDFLAGS = "-ldl";
+
   installFlags = [
     "libdir=$(out)/lib"
     "mandir=$(out)/share/man"

From 8b7d3127b5f74f66815131ac242ff57b25864f34 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 22:34:43 -0700
Subject: [PATCH 1349/2322] efibootmgr: 0.11.0 -> 0.12

---
 pkgs/tools/system/efibootmgr/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix
index 3f26760e621..6364267fc47 100644
--- a/pkgs/tools/system/efibootmgr/default.nix
+++ b/pkgs/tools/system/efibootmgr/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchgit, perl, efivar, pciutils, zlib }:
+{ stdenv, fetchFromGitHub, perl, efivar, pciutils, zlib }:
 
 stdenv.mkDerivation rec {
   name = "efibootmgr-${version}";
-  version = "0.11.0";
+  version = "0.12";
 
   buildInputs = [ perl efivar pciutils zlib ];
 
-  src = fetchgit {
-    url = "git://github.com/rhinstaller/efibootmgr.git";
-    rev = "refs/tags/${name}";
-    sha256 = "1di7cipi6jh4qaiq1ckyk6aimgpagb85yr37k3c1kj1m9p5qra4j";
+  src = fetchFromGitHub {
+    owner = "rhinstaller";
+    repo = "efibootmgr";
+    rev = name;
+    sha256 = "0fmrsp67dln76896fvxalj2pamyp9dszf32kl06wdfi0km42z8sh";
   };
 
+  NIX_CFLAGS_COMPILE = "-I${efivar}/include/efivar";
+  NIX_LDFLAGS = "-lefiboot -lefivar";
+
   postPatch = ''
     substituteInPlace "./tools/install.pl" \
       --replace "/usr/bin/perl" "${perl}/bin/perl"

From c64747c44a01fca42e9b66a964b9c5ce4d86bb9d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 22:34:55 -0700
Subject: [PATCH 1350/2322] mumble: 1.2.8 -> 1.2.9

---
 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 611d77eb215..cd361fe7ede 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -15,11 +15,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "mumble-${version}";
-  version = "1.2.8";
+  version = "1.2.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/mumble/${name}.tar.gz";
-    sha256 = "0ng1xd7i0951kqnd9visf84y2dcwia79a1brjwfvr1wnykgw6bsc";
+    sha256 = "1frc6b284cl36czrsrg47mnmg1im0pjqscp877gz2rrjc62pxlab";
   };
 
   patches = optional jackSupport ./mumble-jack-support.patch;

From 66c6b8543a65029824ddd824c68ea955c21c0358 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 22:46:11 -0700
Subject: [PATCH 1351/2322] tdb: 1.3.4 -> 1.3.6

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

diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix
index 81227f0829b..46f4bb68347 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/pkgs/development/libraries/tdb/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tdb-1.3.4";
+  name = "tdb-1.3.6";
 
   src = fetchurl {
     url = "mirror://samba/tdb/${name}.tar.gz";
-    sha256 = "0a8pa4ar7dxkbsgv1447av2rn35a1m6l1v2s9hgz3ccwni9wv1gm";
+    sha256 = "19arbbicw469q6a9m8yyaigrxzrxkb1jnajlvq1v7n2qgqjdvmw5";
   };
 
   buildInputs = [

From a41a8cee039c082cd10131d276c0b7514b141b6e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 22:48:43 -0700
Subject: [PATCH 1352/2322] tevent: 0.9.24 -> 0.9.25

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

diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix
index baa7e288178..2e9c83755a6 100644
--- a/pkgs/development/libraries/tevent/default.nix
+++ b/pkgs/development/libraries/tevent/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tevent-0.9.24";
+  name = "tevent-0.9.25";
 
   src = fetchurl {
     url = "mirror://samba/tevent/${name}.tar.gz";
-    sha256 = "0l1zjx2z6nhvn6gwbcvzn8w0cca53j717fwi10s7a5v1jb04rfad";
+    sha256 = "0sf694bdp2l6s48gmr8hxlcpdmjbwhr9ph1faqxmkcqibbav1ppy";
   };
 
   buildInputs = [

From b8f3c4c659a2a9ed19458cd93b0494b7e57b6e98 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 22:52:41 -0700
Subject: [PATCH 1353/2322] ttylog: 0.25 -> 0.26

---
 pkgs/tools/misc/ttylog/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix
index 1c90bb842d6..16db6b62eb7 100644
--- a/pkgs/tools/misc/ttylog/default.nix
+++ b/pkgs/tools/misc/ttylog/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, fetchurl, cmake }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "ttylog-0.25";
+  name = "ttylog-${version}";
+  version = "0.26";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/ttylog/${name}.tar.gz";
-    sha256 = "0546mj5gcxi7idvfw82p8qw27lk7wsk6j4b6zw7nb6z2wi517l40";
+  src = fetchFromGitHub {
+    owner = "rocasa";
+    repo = "ttylog";
+    rev = version;
+    sha256 = "1xvqch1dwpl2d89n9cjcxhqbpvm50fspj5yn883wbii6dpg62p84";
   };
 
   nativeBuildInputs = [ cmake ];

From dbed487998132e12f80982800e3bd9c7f097c753 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 22:55:12 -0700
Subject: [PATCH 1354/2322] rabbitmq-c: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix
index b9962c2a2d7..639c8fb1ead 100644
--- a/pkgs/development/libraries/rabbitmq-c/default.nix
+++ b/pkgs/development/libraries/rabbitmq-c/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "rabbitmq-c-${version}";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "alanxz";
     repo = "rabbitmq-c";
     rev = "v${version}";
-    sha256 = "00264mvwwcibd36w9a3s3cv2x7pvz88al64q2maaw1kbd9mg1ky5";
+    sha256 = "1nfb82lbccr46wr4a2fsrkvpvdvmnyx8kn275hvdfz7mxpkd5qy6";
   };
 
   buildInputs = [ cmake openssl popt xmlto ];

From 588d20ea393262dd65a482988cc152db0cc16f02 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 22:59:38 -0700
Subject: [PATCH 1355/2322] opensc: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix
index 8d9366bdc0f..672b95dec45 100644
--- a/pkgs/tools/security/opensc/default.nix
+++ b/pkgs/tools/security/opensc/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "opensc-${version}";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "OpenSC";
     rev = version;
-    sha256 = "02q3rndcfd7lga1ph0xcl556rgigzpp9bpwqyn42rfbx8lll7gzv";
+    sha256 = "16y3ryx606nry2li05hm88bllrragdj3sfl3yh7pf71777n4lsk4";
   };
 
   postPatch = ''
@@ -37,6 +37,10 @@ stdenv.mkDerivation rec {
     "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so"
   ];
 
+  installFlags = [
+    "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 0952b3717711a146bd9726507281cc83ab829b7f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 23:04:56 -0700
Subject: [PATCH 1356/2322] lightdm-gtk-greeter: 2.0.0 -> 2.0.1

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

diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
index 2ae6b2aeb26..ea80957afb0 100644
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@@ -8,14 +8,14 @@
 
 let
   ver_branch = "2.0";
-  version = "2.0.0";
+  version = "2.0.1";
 in
 stdenv.mkDerivation rec {
   name = "lightdm-gtk-greeter-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
-    sha256 = "1134q8qd7gr34jkivqxckdnwbpa8pl7dhjpdi9fci0pcs4hh22jc";
+    sha256 = "031iv7zrpv27zsvahvfyrm75zdrh7591db56q89k8cjiiy600r1j";
   };
 
   buildInputs = [ pkgconfig lightdm intltool makeWrapper ]

From d12cc767bdf66948e2838664a6d2e39971289fba Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 23:33:29 -0700
Subject: [PATCH 1357/2322] file: 5.22 -> 5.23

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

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 2cf8d50bbe5..f4e89b197e6 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "file-5.22";
+  name = "file-5.23";
 
   buildInputs = [ zlib ];
 
   src = fetchurl {
     url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz";
-    sha256 = "02zw14hw3gqlw91w2f2snbirvyrp7r83irvnnkjcb25q9kjaiqy4";
+    sha256 = "0z0mwqayrrf3w734rjp9rysf0y8az191ff7fxjsxyb1y2kzv72ic";
   };
 
   meta = {

From 31cedc7ee73b8c0c1dc92894e21c7c6ad11460f0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 23:47:08 -0700
Subject: [PATCH 1358/2322] mariadb: Fix for darwin

---
 pkgs/servers/sql/mariadb/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 21ccd50e3ef..ab93c3499dc 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -49,9 +49,10 @@ stdenv.mkDerivation rec {
     "-DWITH_PARTITION_STORAGE_ENGINE=1"
     "-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1"
     "-DWITHOUT_FEDERATED_STORAGE_ENGINE=1"
-  ] ++ stdenv.lib.optional stdenv.isDarwin "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1";
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1"
+    "-DWITHOUT_TOKUDB=1"
+  ];
 
   enableParallelBuilding = true;
 

From ad9081411c2a9458ed0b51d9ba758f5a570c0a73 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 23:50:41 -0700
Subject: [PATCH 1359/2322] kmod: 20 -> 21

---
 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 1d190be71b8..b5559e535ec 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xz, zlib, pkgconfig, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "kmod-20";
+  name = "kmod-21";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz";
-    sha256 = "186sz8b82n02yykza6a1q8fk80fl5gx0nr42wpmzjc9w36ia3hc9";
+    sha256 = "1h4m1mkknxcshsz1qbg9riszmynix2ikg7q8inq7bkvlmx4982hn";
   };
 
   # Disable xz/zlib support to prevent needing them in the initrd.

From be9a0a8943282140520522c8910755b30959dae2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 18 Jun 2015 23:52:33 -0700
Subject: [PATCH 1360/2322] logrotate: 3.8.9 -> 3.9.1

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

diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix
index 771de9205a9..af7e4543579 100644
--- a/pkgs/tools/system/logrotate/default.nix
+++ b/pkgs/tools/system/logrotate/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gzip, popt }:
 
 stdenv.mkDerivation rec {
-  name = "logrotate-3.8.9";
+  name = "logrotate-3.9.1";
 
   src = fetchurl {
     url = "https://fedorahosted.org/releases/l/o/logrotate/${name}.tar.gz";
-    sha256 = "19yzs7gc8ixr6iqq22n5gbixmvzsgmwp96kp4jiwr8bjj37df3kh";
+    sha256 = "0i95qnacv5wf7kfkcpi38ys3i14fr01ifhm8b4ari04c53inj9q2";
   };
 
   # Logrotate wants to access the 'mail' program; to be done.

From e837e025ea3cecab35b38c6f8b3792fbe579dadd Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <e.bachmakov@gmail.com>
Date: Fri, 12 Jun 2015 19:51:05 -0400
Subject: [PATCH 1361/2322] mesa: minor update to 10.5.7

Picked from #8369.
---
 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 f2b36dd8c3e..0279bfd51ba 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "10.5.6";
+  version = "10.5.7";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "66017853bde5f7a6647db3eede30512a091a3491daa1708e0ad8027c328ba595";
+    sha256 = "0648cga781b2pqr8ny59wk7wmyfw8q7g8xnass4q1bv9rn86il04";
   };
 
   prePatch = "patchShebangs .";

From 6f4fbcc9817c8c69a8339a269c2aca9d5db22233 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 19 Jun 2015 00:54:41 -0700
Subject: [PATCH 1362/2322] dnsmasq: Fix build

---
 pkgs/tools/networking/dnsmasq/default.nix | 33 ++++++++++++++++-------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 8883334fe6d..7752338c6bb 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -1,5 +1,15 @@
-{ pkgconfig, dbus_libs, nettle, stdenv, fetchurl }:
+{ stdenv, fetchurl, pkgconfig, dbus_libs, nettle, libidn, libnetfilter_conntrack }:
 
+with stdenv.lib;
+let
+  copts = concatStringsSep " " ([
+    "-DHAVE_DBUS"
+    "-DHAVE_IDN"
+    "-DHAVE_DNSSEC"
+  ] ++ optionals stdenv.isLinux [
+    "-DHAVE_CONNTRACK"
+  ]);
+in
 stdenv.mkDerivation rec {
   name = "dnsmasq-2.73";
 
@@ -8,13 +18,16 @@ stdenv.mkDerivation rec {
     sha256 = "1xnqfaw2l78f4zw4z9sgr9nl9yc233gxc3sd7hxapz2k7q883zqb";
   };
 
-  # Can't rely on make flags because of space in one of the parameters
-  buildPhase = ''
-    make COPTS="-DHAVE_DNSSEC -DHAVE_DBUS"
+  preBuild = ''
+    makeFlagsArray=("COPTS=${copts}")
   '';
 
-  # make flags used for installation only
-  makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale";
+  makeFlags = [
+    "DESTDIR="
+    "BINDIR=$(out)/bin"
+    "MANDIR=$(out)/man"
+    "LOCALEDIR=$(out)/share/locale"
+  ];
 
   postInstall = ''
     install -Dm644 dbus/dnsmasq.conf $out/etc/dbus-1/system.d/dnsmasq.conf
@@ -24,15 +37,17 @@ stdenv.mkDerivation rec {
     cat <<END > $out/share/dbus-1/system-services/uk.org.thekelleys.dnsmasq.service
     [D-BUS Service]
     Name=uk.org.thekelleys.dnsmasq
-    Exec=$out/sbin/dnsmasq -k -1
+    Exec=$out/bin/dnsmasq -k -1
     User=root
     SystemdService=dnsmasq.service
     END
   '';
 
-  buildInputs = [ pkgconfig dbus_libs nettle ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ dbus_libs nettle libidn ]
+    ++ optional stdenv.isLinux libnetfilter_conntrack;
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "An integrated DNS, DHCP and TFTP server for small networks";
     homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html;
     license = licenses.gpl2;

From 26e424a4aa2c4efdedbd68e119728400c99a017b Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Fri, 19 Jun 2015 11:16:32 +0200
Subject: [PATCH 1363/2322] Explanation to desktopManagerHandlesLidAndPower

With this patch, systemd-inhibit outputs a descriptive message when
desktopManagerHandlesLidAndPower=true (the default).

Before the patch:

    $ systemd-inhibit
         Who: /nix/store/[...]-xsession [...] (UID 1000/cassou, PID 18561/systemd-inhibit)
        What: handle-power-key:handle-lid-switch
         Why: Unknown reason
        Mode: block

After the patch:

    $ systemd-inhibit
         Who: /nix/store/[...]-xsession [...] (UID 1000/cassou, PID 18561/systemd-inhibit)
        What: handle-power-key:handle-lid-switch
         Why: See NixOS configuration option 'services.xserver.displayManager.desktopManagerHandlesLidAndPower' for more information.
        Mode: block
---
 nixos/modules/services/x11/display-managers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index c5012dbb5e3..70a4303d897 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -56,7 +56,7 @@ let
         if [ -z "$_INHIBITION_LOCK_TAKEN" ]; then
           export _INHIBITION_LOCK_TAKEN=1
           if ! ${config.systemd.package}/bin/loginctl show-session $XDG_SESSION_ID | grep -q '^RemoteHost='; then
-            exec ${config.systemd.package}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key "$0" "$sessionType"
+            exec ${config.systemd.package}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key --why="See NixOS configuration option 'services.xserver.displayManager.desktopManagerHandlesLidAndPower' for more information." "$0" "$sessionType"
           fi
         fi
 

From f1480c829691ccb2e6815e68f4f7ecb43c136de4 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 19 Jun 2015 13:23:55 +0200
Subject: [PATCH 1364/2322] goPackages: fix influxdb8 and related packages

---
 pkgs/top-level/go-packages.nix | 111 +++++++++++++++++++++++++++++++--
 1 file changed, 106 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index ce8e529a921..874a5d316e6 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -102,6 +102,22 @@ let
     };
   };
 
+  gogo.protobuf = buildGoPackage rec {
+    rev = "499788908625f4d83de42a204d1350fde8588e4f";
+    name = "protobuf-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/gogo/protobuf";
+    goPackageAliases = [ "code.google.com/p/gogoprotobuf/proto" "code.google.com/p/goprotobuf/proto" ];
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "gogo";
+      repo = "protobuf";
+      sha256 = "09h2j0apl70709nbqasqrkss6fdk99xm7xr5ci311dl48rmm1dzn";
+    };
+
+    subPackages = [ "proto" ];
+  };
+
   text = buildGoPackage rec {
     rev = "c93e7c9fff19fb9139b5ab04ce041833add0134e";
     name = "text-${stdenv.lib.strings.substring 0 7 rev}";
@@ -553,6 +569,19 @@ let
     buildInputs = [ go-multierror go-syslog hcl logutils mapstructure ];
   };
 
+  context = buildGoPackage rec {
+    rev = "215affda49addc4c8ef7e2534915df2c8c35c6cd";
+    name = "config-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/gorilla/context";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "gorilla";
+      repo = "context";
+      sha256 = "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g";
+    };
+  };
+
   dbus = buildGoPackage rec {
     rev = "a5942dec6340eb0d57f43f2003c190ce06e43dea";
     name = "dbus-${stdenv.lib.strings.substring 0 7 rev}";
@@ -757,6 +786,20 @@ let
     };
   };
 
+  dgnorton.goback = buildGoPackage rec {
+    rev = "a49ca3c0a18f50ae0b8a247e012db4385e516cf4";
+    name = "goback-${stdenv.lib.strings.substring 0 7 rev}";
+
+    goPackagePath = "github.com/dgnorton/goback";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "dgnorton";
+      repo = "goback";
+      sha256 = "1nyg6sckwd0iafs9vcmgbga2k3hid2q0avhwj29qbdhj3l78xi47";
+    };
+  };
+
   gocheck = buildGoPackage rec {
     rev = "87";
     name = "gocheck-${rev}";
@@ -807,6 +850,19 @@ let
     };
   };
 
+  influx.gomdb = buildGoPackage rec {
+    rev = "29fe330c5ab33c4e48470bd4b980bf522471190a";
+    name = "gomdb-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/influxdb/gomdb";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "influxdb";
+      repo = "gomdb";
+      sha256 = "0yg1jpr7lcaqh6i8n9wbs9r128kk541qjv06r9a6fp9vj56rqr3m";
+    };
+  };
+
   govers = buildGoPackage rec {
     rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9";
     name = "govers-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1215,7 +1271,7 @@ let
       sha256 = "07dc74kiam8v5my7rhi3yxqrpnaapladhk8b3qbnrpjk3shvnx5f";
     };
 
-    buildInputs = [ influxdb stathat ];
+    buildInputs = [ influxdb8 stathat ];
   };
 
   appengine = buildGoPackage rec {
@@ -1550,7 +1606,7 @@ let
   };
 
   influxdb = buildGoPackage rec {
-    rev = "d80ef2286d476d9e306548305e47c3ba967f5bc2";
+    rev = "50a2b9ba0f189213fc399f59247787e71b872b2d";
     name = "influxdb-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/influxdb/influxdb";
     goPackageAliases = [
@@ -1561,10 +1617,10 @@ let
       inherit rev;
       owner = "influxdb";
       repo = "influxdb";
-      sha256 = "0p3s0pbn5x294qg2r0qgysb5wmspsvjxhccxh2hs6hc24dl6y93b";
+      sha256 = "0spwnr9dwxwrjxrajpcspj3aci2ylkrm085jhq7rd99nmbsms6jq";
     };
 
-    propagatedBuildInputs = [ bolt crypto statik liner toml pat gollectd ];
+    propagatedBuildInputs = [ bolt crypto statik liner toml pat gollectd gogo.protobuf raft raft-boltdb pool ];
   };
 
   influxdb8 = buildGoPackage rec {
@@ -1582,7 +1638,7 @@ let
       sha256 = "0xpigp76rlsxqj93apjzkbi98ha5g4678j584l6hg57p711gqsdv";
     };
 
-    buildInputs = [ statik crypto protobuf log4go toml pmylund.go-cache ];
+    buildInputs = [ statik crypto gogo.protobuf log4go toml pmylund.go-cache gollectd pat dgnorton.goback mux context gocheck influx.gomdb levigo ];
   };
 
   eckardt.influxdb-go = buildGoPackage rec {
@@ -1638,6 +1694,23 @@ let
     propagatedBuildInputs = [ asn1-ber ];
   };
 
+  levigo = buildGoPackage rec {
+    rev = "1ddad808d437abb2b8a55a950ec2616caa88969b";
+    name = "logrus-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/jmhodges/levigo";
+
+    excludedPackages = "examples";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "jmhodges";
+      repo = "levigo";
+      sha256 = "1lmafyk7nglhig3n471jq4hmnqf45afj5ldb2jx0253f5ii4r2yq";
+    };
+
+    buildInputs = [ pkgs.leveldb ];
+  };
+
   liner = buildGoPackage rec {
     rev = "1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced";
     name = "liner-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1808,6 +1881,21 @@ let
     };
   };
 
+  mux = buildGoPackage rec {
+    rev = "47e8f450ef38c857cdd922ec08862ca9d65a1c6d";
+    name = "mux-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/gorilla/mux";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "gorilla";
+      repo = "mux";
+      sha256 = "03z7pk95z3314s3jryp6vs33209fj147g5jb2f331567gzld3b9g";
+    };
+
+    buildInputs = [ context ];
+  };
+
   muxado = buildGoPackage rec {
     rev = "f693c7e88ba316d1a0ae3e205e22a01aa3ec2848";
     name = "muxado-${stdenv.lib.strings.substring 0 7 rev}";
@@ -2035,6 +2123,19 @@ let
     doCheck = false; # bad import path in tests
   };
 
+  pool = buildGoPackage rec {
+    rev = "v2.0.0";
+    name = "pq-${rev}";
+    goPackagePath = "gopkg.in/fatih/pool.v2";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "fatih";
+      repo = "pool";
+      sha256 = "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0";
+    };
+  };
+
   pq = buildGoPackage rec {
     rev = "93e9980741c9e593411b94e07d5bad8cfb4809db";
     name = "pq-${stdenv.lib.strings.substring 0 7 rev}";

From ef1f827671b544a14dc00df2f877ad310fa3f8dd Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 19 Jun 2015 13:33:53 +0200
Subject: [PATCH 1365/2322] skydns: update to 2.5.0a

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

diff --git a/pkgs/servers/dns/skydns/default.nix b/pkgs/servers/dns/skydns/default.nix
index ba311918c71..054c5c422e1 100644
--- a/pkgs/servers/dns/skydns/default.nix
+++ b/pkgs/servers/dns/skydns/default.nix
@@ -4,15 +4,15 @@ with goPackages;
 
 buildGoPackage rec {
   name = "skydns-${version}";
-  version = "2.1.0a";
+  version = "2.5.0a";
 
   goPackagePath = "github.com/skynetservices/skydns";
 
   src = fetchFromGitHub {
     owner = "skynetservices";
     repo = "skydns";
-    rev = "f5141ee69309fb4c542d5a0b50fc7616370c5c06";
-    sha256 = "1bnc9r22kwvmn1bgz7zaidkjqm7pmw99bn5n87r76vcrd7n2a9pd";
+    rev = version;
+    sha256 = "18mw8bcz54i4yrv6pc73s3ffcj1vv9cwnn76c9k0bj1mxp1pmdl2";
   };
 
   buildInputs = with goPackages; [ go-etcd rcrowley.go-metrics influxdb go-systemd go-log dns stathat osext etcd ];

From ab7c9e49c260f5ccfd41de611f7b120470b2d72b Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 18 Jun 2015 18:43:07 +0200
Subject: [PATCH 1366/2322] dropbox: 3.4.6 -> 3.6.7

---
 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 14360f9ff0b..33df71c62c3 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -19,11 +19,11 @@
 
 let
   # NOTE: When updating, please also update in current stable, as older versions stop working
-  version = "3.4.6";
+  version = "3.6.7";
   sha256 =
     {
-      "x86_64-linux" = "0crhv21q48lwa86qcqgbcd9g73biibfrc2vgbavi67cwxvzcskky";
-      "i686-linux" = "0kli84kzg1wcwszjni948zb4qih8mynmyqhdwyiv1l7v5lrhb8k2";
+      "x86_64-linux" = "1jwzrpw382amx0jap9m411a3yvkc9iwnw6n35kwq3infmbwjs6q8";
+      "i686-linux" = "0rjd908bhfk00qh6gvizf2fyfb3cccd78spyvh435z377x2pmxzy";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From d8c9fa5043da74e93fd44a3375a6d8e1d9056ded Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Jun 2015 14:00:43 +0200
Subject: [PATCH 1367/2322] Remove meta.license hack

---
 pkgs/applications/networking/mailreaders/mailpile/default.nix | 2 +-
 pkgs/development/compilers/rustc/makeRustcDerivation.nix      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 695e2b38157..c43944dc597 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -27,7 +27,7 @@ pythonPackages.buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "A modern, fast web-mail client with user-friendly encryption and privacy features";
     homepage = https://www.mailpile.is/;
-    license = map (getAttr "shortName") [ licenses.asl20 licenses.agpl3 ];
+    license = [ licenses.asl20 licenses.agpl3 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.iElectric ];
   };
diff --git a/pkgs/development/compilers/rustc/makeRustcDerivation.nix b/pkgs/development/compilers/rustc/makeRustcDerivation.nix
index 6208190f8df..9c95dbb1003 100644
--- a/pkgs/development/compilers/rustc/makeRustcDerivation.nix
+++ b/pkgs/development/compilers/rustc/makeRustcDerivation.nix
@@ -63,7 +63,7 @@ let version = if isRelease then
       homepage = http://www.rust-lang.org/;
       description = "A safe, concurrent, practical language";
       maintainers = with maintainers; [ madjar cstrahan wizeman globin ];
-      license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ];
+      license = [ licenses.mit licenses.asl20 ];
       platforms = platforms.linux;
     };
 

From fef61416624724600b74cf7dc30f16e5fce959e6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Jun 2015 14:13:25 +0200
Subject: [PATCH 1368/2322] Revert "procps-ng: Refactor a bit"

This reverts commit dceff137e107fdbcf13b0d645be48e3cc4256d7f. It was
described as a "refactoring", but actually made procps depend on
systemd (which is a heavy dependency) and changed the name of the
package.
---
 pkgs/os-specific/linux/procps-ng/default.nix | 26 +++++++-------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 9ecc0c5bcb5..7a810e9fff9 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, ncurses, systemd }:
+{ lib, stdenv, fetchurl, ncurses }:
 
-stdenv.mkDerivation rec {
-  name = "procps-ng-3.3.10";
+stdenv.mkDerivation {
+  name = "procps-3.3.10";
 
   src = fetchurl {
-    url = "mirror://sourceforge/procps-ng/${name}.tar.xz";
+    url = mirror://sourceforge/procps-ng/procps-ng-3.3.10.tar.xz;
     sha256 = "013z4rzy3p5m1zp6mmynpblv0c6zlcn91pw4k2vymz2djyc6ybm0";
   };
 
-  buildInputs = [ pkgconfig ncurses systemd ];
+  buildInputs = [ ncurses ];
 
   makeFlags = "usrbin_execdir=$(out)/bin";
 
@@ -19,21 +19,13 @@ stdenv.mkDerivation rec {
   };
 
   # Too red
-  configureFlags = [
-    "--disable-modern-top"
-    "--enable-watch8bit"
-    "--with-systemd"
-    "--enable-skill"
-    "--enable-oomem"
-    "--enable-sigwinch"
-  ];
+  configureFlags = [ "--disable-modern-top" ];
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = http://sourceforge.net/projects/procps-ng/;
     description = "Utilities that give information about processes using the /proc filesystem";
     priority = 10; # less than coreutils, which also provides "kill" and "uptime"
-    maintainers = with maintainers; [ wkennington ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
   };
 }

From d92ce0d552bc01b6945fb238a01a2ac63aa59838 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 19 Jun 2015 14:03:34 +0200
Subject: [PATCH 1369/2322] guix: use libgcrypt_1_5, fix compilation but not
 tests (ZHF)

---
 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 1e2dd6ad220..c48bf060d4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14428,7 +14428,9 @@ let
   gnuk-unstable = callPackage ../misc/gnuk/unstable.nix { };
   gnuk-git = callPackage ../misc/gnuk/git.nix { };
 
-  guix = callPackage ../tools/package-management/guix { };
+  guix = callPackage ../tools/package-management/guix {
+    libgcrypt = libgcrypt_1_5;
+  };
 
   gxemul = callPackage ../misc/emulators/gxemul { };
 

From 005837d85ff9d62d4c74e6f1574b48336fb85271 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 19 Jun 2015 14:19:27 +0200
Subject: [PATCH 1370/2322] remove duplicated gtk-vnc

---
 .../gnome-3/3.16/apps/vinagre/default.nix     |  4 +--
 .../gnome-3/3.16/core/gtk-vnc/default.nix     | 30 -------------------
 pkgs/desktops/gnome-3/3.16/default.nix        |  2 --
 3 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gtk-vnc/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix
index 38263ac73f8..b2cf8277641 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtkvnc, intltool
 , libsecret, itstool, makeWrapper, librsvg }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0gs8sqd4r6jlgxn1b7ggyfcisig50z79p0rmigpzwpjjx1bh0z6p";
   };
 
-  buildInputs = [ pkgconfig gtk3 vte libxml2 gtk-vnc intltool libsecret
+  buildInputs = [ pkgconfig gtk3 vte libxml2 gtkvnc intltool libsecret
                   itstool makeWrapper gnome3.defaultIconTheme librsvg ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.16/core/gtk-vnc/default.nix b/pkgs/desktops/gnome-3/3.16/core/gtk-vnc/default.nix
deleted file mode 100644
index ebe7370aba7..00000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gtk-vnc/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, gdk_pixbuf, pkgconfig, gtk3, cyrus_sasl
-, gnutls, gobjectIntrospection, vala, intltool, libgcrypt }:
-
-stdenv.mkDerivation rec {
-  versionMajor = "0.5";
-  versionMinor = "4";
-  moduleName   = "gtk-vnc";
-
-  name = "${moduleName}-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "1rwwdh7lb16xdmy76ca6mpqfc3zfl3a4bkcr0qb6hs6ffrxak2j8";
-  };
-
-  buildInputs = [ pkgconfig gtk3 gdk_pixbuf gnutls cyrus_sasl
-                  gobjectIntrospection vala intltool libgcrypt ];
-
-  configureFlags = [ "--with-gtk=3.0" ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/gtk-vnc;
-    description = "A VNC viewer widget for GTK+";
-    license = licenses.lgpl2;
-    maintainers = with maintainers; [ lethalman ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 0c3d49f769f..f92d09e9fe5 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -151,8 +151,6 @@ let
 
   gtksourceview = callPackage ./core/gtksourceview { };
 
-  gtk-vnc = callPackage ./core/gtk-vnc { };
-
   gucharmap = callPackage ./core/gucharmap { };
 
   gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };

From ffb70f9c51b35bf7a66f5daa20345bad7b97f4c1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Jun 2015 14:23:18 +0200
Subject: [PATCH 1371/2322] Don't use camelCase in file names

---
 pkgs/development/compilers/rustc/1.0.0.nix                      | 2 +-
 .../compilers/rustc/{makeRustcDerivation.nix => generic.nix}    | 0
 pkgs/development/compilers/rustc/head.nix                       | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/development/compilers/rustc/{makeRustcDerivation.nix => generic.nix} (100%)

diff --git a/pkgs/development/compilers/rustc/1.0.0.nix b/pkgs/development/compilers/rustc/1.0.0.nix
index a85ed9290fe..5bb03b592b9 100644
--- a/pkgs/development/compilers/rustc/1.0.0.nix
+++ b/pkgs/development/compilers/rustc/1.0.0.nix
@@ -1,5 +1,5 @@
 { stdenv, callPackage }:
-callPackage ./makeRustcDerivation.nix {
+callPackage ./generic.nix {
   shortVersion = "1.0.0";
   isRelease = true;
   srcSha = "14brziw91d3r88fa1kvpvhap5ws4z8h2mas7h6k9lpsc2zl9blak";
diff --git a/pkgs/development/compilers/rustc/makeRustcDerivation.nix b/pkgs/development/compilers/rustc/generic.nix
similarity index 100%
rename from pkgs/development/compilers/rustc/makeRustcDerivation.nix
rename to pkgs/development/compilers/rustc/generic.nix
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index c73a12c6f6e..5e5b41e8b25 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -1,5 +1,5 @@
 { stdenv, callPackage }:
-callPackage ./makeRustcDerivation.nix {
+callPackage ./generic.nix {
   shortVersion = "1.0.0-dev";
   isRelease = false;
   # src rev for master on 2015-05-13

From 45be5244a4b060413b1e1337309ce0fcfaa21ca6 Mon Sep 17 00:00:00 2001
From: Robin Gloster <robin@loc-com.de>
Date: Sun, 17 May 2015 12:50:01 +0200
Subject: [PATCH 1372/2322] Wrap the python scripts in lxc

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

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 8115aa1055b..1c6847cce82 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, docbook2x
-, docbook_xml_dtd_45, systemd
+, docbook_xml_dtd_45, systemd, wrapPython
 , libapparmor ? null, gnutls ? null, libseccomp ? null, cgmanager ? null
-, libnih ? null, dbus ? null, libcap ? null
+, libnih ? null, dbus ? null, libcap ? null, python3 ? null
 }:
 
 let
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     autoreconfHook pkgconfig perl docbook2x systemd
-    libapparmor gnutls libseccomp cgmanager libnih dbus libcap
+    libapparmor gnutls libseccomp cgmanager libnih dbus libcap python3
+    wrapPython
   ];
 
   patches = [ ./support-db2x.patch ];
@@ -49,6 +50,8 @@ stdenv.mkDerivation rec {
     "LXCPATH=\${TMPDIR}/var/lib/lxc"
   ];
 
+  postInstall = "wrapPythonPrograms";
+
   meta = {
     homepage = "http://lxc.sourceforge.net";
     description = "userspace tools for Linux Containers, a lightweight virtualization system";
@@ -63,6 +66,6 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = platforms.linux;
-    maintainers = with maintainers; [ simons wkennington ];
+    maintainers = with maintainers; [ simons wkennington globin ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c48bf060d4f..dd320355528 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2046,7 +2046,9 @@ let
 
   lshw = callPackage ../tools/system/lshw { };
 
-  lxc = callPackage ../os-specific/linux/lxc { };
+  lxc = callPackage ../os-specific/linux/lxc {
+    wrapPython = python3Packages.wrapPython;
+  };
 
   lzip = callPackage ../tools/compression/lzip { };
 

From 6551af69eb9b1865d2797712aeea25b174a738fd Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 19 Jun 2015 15:54:35 +0200
Subject: [PATCH 1373/2322] add tk-8_5 and fix xconq (XHF)

---
 pkgs/development/libraries/tk/8.5.nix               | 11 +++++++++++
 pkgs/development/libraries/tk/8.6.nix               | 13 +++++++++++++
 .../libraries/tk/{default.nix => generic.nix}       |  9 ++-------
 pkgs/top-level/all-packages.nix                     | 10 ++++++++--
 4 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/libraries/tk/8.5.nix
 create mode 100644 pkgs/development/libraries/tk/8.6.nix
 rename pkgs/development/libraries/tk/{default.nix => generic.nix} (76%)

diff --git a/pkgs/development/libraries/tk/8.5.nix b/pkgs/development/libraries/tk/8.5.nix
new file mode 100644
index 00000000000..c3396dcdad2
--- /dev/null
+++ b/pkgs/development/libraries/tk/8.5.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchurl, tcl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+
+  src = fetchurl {
+    url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
+    sha256 = "0an3wqkjzlyyq6l9l3nawz76axsrsppbyylx0zk9lkv7llrala03";
+  };
+
+})
+
diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix
new file mode 100644
index 00000000000..110151227bd
--- /dev/null
+++ b/pkgs/development/libraries/tk/8.6.nix
@@ -0,0 +1,13 @@
+{ callPackage, fetchurl, tcl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+
+  src = fetchurl {
+    url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
+    sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88";
+  };
+
+  patches = [ ./different-prefix-with-tcl.patch ];
+
+})
+
diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/generic.nix
similarity index 76%
rename from pkgs/development/libraries/tk/default.nix
rename to pkgs/development/libraries/tk/generic.nix
index a847f848a02..c3bab0b2f86 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/generic.nix
@@ -1,14 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, tcl, libXft, fontconfig }:
+{ stdenv, src, pkgconfig, tcl, libXft, fontconfig, patches ? [], ... }:
 
 stdenv.mkDerivation {
   name = "tk-${tcl.version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
-    sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88";
-  };
-
-  patches = [ ./different-prefix-with-tcl.patch ];
+  inherit src patches;
 
   postInstall = ''
     ln -s $out/bin/wish* $out/bin/wish
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c48bf060d4f..278c8d62379 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8087,7 +8087,10 @@ let
 
   tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };
 
-  tk = callPackage ../development/libraries/tk { };
+  tk = tk-8_6;
+
+  tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { };
+  tk-8_5 = callPackage ../development/libraries/tk/8.5.nix { tcl = tcl-8_5; };
 
   tnt = callPackage ../development/libraries/tnt { };
 
@@ -13568,7 +13571,10 @@ let
 
   xboard =  callPackage ../games/xboard { };
 
-  xconq = callPackage ../games/xconq {};
+  xconq = callPackage ../games/xconq {
+    tcl = tcl-8_5;
+    tk = tk-8_5;
+  };
 
   # TODO: the corresponding nix file is missing
   # xracer = callPackage ../games/xracer { };

From 8def3d69c724b4313fcfd01534054c043a637047 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Jun 2015 17:59:43 +0200
Subject: [PATCH 1374/2322] rustc: Install docs in a separator output

This reduces rustc's size from 359 MiB to 186 MiB.

Maybe we should disable doc generation altogether, since it's very
slow and people who need docs will JFGI anyway. But for now I've left
it.
---
 pkgs/development/compilers/rustc/generic.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix
index 9c95dbb1003..d1091643f77 100644
--- a/pkgs/development/compilers/rustc/generic.nix
+++ b/pkgs/development/compilers/rustc/generic.nix
@@ -136,6 +136,8 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  outputs = [ "out" "doc" ];
+
   preCheck = "export TZDIR=${tzdata}/share/zoneinfo";
 
   doCheck = true;

From e6b29c024be556362552b6879534e4d372bd8dfd Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 28 May 2015 14:10:39 +0200
Subject: [PATCH 1375/2322] coq-ssreflect: also build and install the
 documentation

---
 pkgs/development/coq-modules/ssreflect/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix
index 75112ec9663..bb91c3e270b 100644
--- a/pkgs/development/coq-modules/ssreflect/default.nix
+++ b/pkgs/development/coq-modules/ssreflect/default.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurl, coq}:
+{ stdenv, fetchurl, coq
+, graphviz, withDoc ? true
+}:
 
 assert coq.coq-version == "8.4";
 
@@ -11,6 +13,7 @@ stdenv.mkDerivation {
     sha256 = "0hm1ha7sxqfqhc7iwhx6zdz3nki4rj5nfd3ab24hmz8v7mlpinds";
   };
 
+  nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
   buildInputs = [ coq.ocaml coq.camlp5 ];
   propagatedBuildInputs = [ coq ];
 
@@ -22,12 +25,17 @@ stdenv.mkDerivation {
     sed -i 's/^#SSRCOQ/SSRCOQ/' Make
   '';
 
+  buildFlags = stdenv.lib.optionalString withDoc "doc";
+
   installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
 
   postInstall = ''
     mkdir -p $out/bin
     cp -p bin/ssrcoq $out/bin
     cp -p bin/ssrcoq.byte $out/bin
+  '' + stdenv.lib.optionalString withDoc ''
+    mkdir -p $out/share/doc/coq/${coq.coq-version}/user-contrib/Ssreflect/
+    cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/Ssreflect/
   '';
 
   meta = with stdenv.lib; {

From 0f6b981fbabf22cc816fe09846e6452e22ea6ae2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 28 May 2015 14:11:58 +0200
Subject: [PATCH 1376/2322] coq-mathcomp: also build and install the
 documentation

---
 pkgs/development/coq-modules/mathcomp/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index 02d06edd538..9ebfba98d83 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurl, coq, ssreflect}:
+{ stdenv, fetchurl, coq, ssreflect
+, graphviz, ocaml, withDoc ? true
+}:
 
 stdenv.mkDerivation {
 
@@ -9,12 +11,19 @@ stdenv.mkDerivation {
     sha256 = "1297svwi18blrlyd8vsqilar2h5nfixlvlifdkbx47aljq4m5bam";
   };
 
+  nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ocaml ];
   propagatedBuildInputs = [ coq ssreflect ];
 
   enableParallelBuilding = true;
 
+  buildFlags = stdenv.lib.optionalString withDoc "doc";
+
   installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
 
+  postInstall = stdenv.lib.optionalString withDoc ''
+    make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://ssr.msr-inria.inria.fr/;
     license = licenses.cecill-b;

From 524b7fe178e7ff909d9eef1e8fab78e227076de7 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 28 May 2015 16:09:05 +0200
Subject: [PATCH 1377/2322] coq-ssreflect: refactor

---
 .../coq-modules/ssreflect/default.nix         | 47 +++++--------------
 .../ssreflect/{1.5.nix => generic.nix}        | 22 +++++----
 pkgs/top-level/all-packages.nix               | 15 +++---
 3 files changed, 33 insertions(+), 51 deletions(-)
 rename pkgs/development/coq-modules/ssreflect/{1.5.nix => generic.nix} (59%)

diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix
index bb91c3e270b..a0b0d951c0d 100644
--- a/pkgs/development/coq-modules/ssreflect/default.nix
+++ b/pkgs/development/coq-modules/ssreflect/default.nix
@@ -1,48 +1,27 @@
-{ stdenv, fetchurl, coq
-, graphviz, withDoc ? true
-}:
+{ callPackage, fetchurl, coq }:
 
-assert coq.coq-version == "8.4";
+if coq.coq-version == "8.4" then
 
-stdenv.mkDerivation {
-
-  name = "coq-ssreflect-1.5";
+callPackage ./generic.nix {
 
   src = fetchurl {
     url = http://ssr.msr-inria.inria.fr/FTP/ssreflect-1.5.tar.gz;
     sha256 = "0hm1ha7sxqfqhc7iwhx6zdz3nki4rj5nfd3ab24hmz8v7mlpinds";
   };
 
-  nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
-  buildInputs = [ coq.ocaml coq.camlp5 ];
-  propagatedBuildInputs = [ coq ];
+}
 
-  enableParallelBuilding = true;
+else if coq.coq-version == "8.5" then
 
-  patchPhase = ''
-    # Permit building of the ssrcoq statically-bound executable
-    sed -i 's/^#-custom/-custom/' Make
-    sed -i 's/^#SSRCOQ/SSRCOQ/' Make
-  '';
+callPackage ./generic.nix {
 
-  buildFlags = stdenv.lib.optionalString withDoc "doc";
-
-  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
-
-  postInstall = ''
-    mkdir -p $out/bin
-    cp -p bin/ssrcoq $out/bin
-    cp -p bin/ssrcoq.byte $out/bin
-  '' + stdenv.lib.optionalString withDoc ''
-    mkdir -p $out/share/doc/coq/${coq.coq-version}/user-contrib/Ssreflect/
-    cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/Ssreflect/
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://ssr.msr-inria.inria.fr/;
-    license = licenses.cecill-b;
-    maintainers = with maintainers; [ vbgl jwiegley ];
-    platforms = coq.meta.platforms;
+  src = fetchurl {
+    url = http://ssr.msr-inria.inria.fr/FTP/ssreflect-1.5.coq85beta2.tar.gz;
+    sha256 = "084l9xd5vgb8jml0dkm66g8cil5rsf04w821pjhn2qk9mdbwaagf";
   };
 
+  patches = [ ./threads.patch ];
+
 }
+
+else throw "No ssreflect package for Coq version ${coq.coq-version}"
diff --git a/pkgs/development/coq-modules/ssreflect/1.5.nix b/pkgs/development/coq-modules/ssreflect/generic.nix
similarity index 59%
rename from pkgs/development/coq-modules/ssreflect/1.5.nix
rename to pkgs/development/coq-modules/ssreflect/generic.nix
index 7c16b43ba8c..dffa895da5f 100644
--- a/pkgs/development/coq-modules/ssreflect/1.5.nix
+++ b/pkgs/development/coq-modules/ssreflect/generic.nix
@@ -1,22 +1,21 @@
-{stdenv, fetchurl, coq}:
-
-assert coq.coq-version == "8.5";
+{ stdenv, fetchurl, coq
+, graphviz, withDoc ? true
+, src, patches ? []
+}:
 
 stdenv.mkDerivation {
 
-  name = "coq-ssreflect-1.5-8.5b2";
+  name = "coq-${coq.coq-version}-ssreflect-1.5";
 
-  src = fetchurl {
-    url = http://ssr.msr-inria.inria.fr/FTP/ssreflect-1.5.coq85beta2.tar.gz;
-    sha256 = "084l9xd5vgb8jml0dkm66g8cil5rsf04w821pjhn2qk9mdbwaagf";
-  };
+  inherit src;
 
+  nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
   buildInputs = [ coq.ocaml coq.camlp5 ];
   propagatedBuildInputs = [ coq ];
 
   enableParallelBuilding = true;
 
-  patches = [ ./threads.patch ];
+  inherit patches;
 
   postPatch = ''
     # Permit building of the ssrcoq statically-bound executable
@@ -24,12 +23,17 @@ stdenv.mkDerivation {
     sed -i 's/^#SSRCOQ/SSRCOQ/' Make
   '';
 
+  buildFlags = stdenv.lib.optionalString withDoc "doc";
+
   installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
 
   postInstall = ''
     mkdir -p $out/bin
     cp -p bin/ssrcoq $out/bin
     cp -p bin/ssrcoq.byte $out/bin
+  '' + stdenv.lib.optionalString withDoc ''
+    mkdir -p $out/share/doc/coq/${coq.coq-version}/user-contrib/Ssreflect/
+    cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/Ssreflect/
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc4a490902d..ef80fcd5e08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14090,19 +14090,18 @@ let
 
   mkCoqPackages_8_5 = self: let callPackage = newScope self; in rec {
 
-    mathcomp = callPackage ../development/coq-modules/mathcomp/1.5.nix {
-      coq = coq_8_5;
-      ssreflect = ssreflect;
-    };
+    inherit callPackage;
 
-    ssreflect = callPackage ../development/coq-modules/ssreflect/1.5.nix {
-      coq = coq_8_5;
-    };
+    coq = coq_8_5;
+
+    mathcomp = callPackage ../development/coq-modules/mathcomp/1.5.nix { };
+
+    ssreflect = callPackage ../development/coq-modules/ssreflect { };
 
   };
 
   coqPackages = recurseIntoAttrs (mkCoqPackages_8_4 coqPackages);
-  coqPackages_8_5 = recurseIntoAttrs (mkCoqPackages_8_5 coqPackages);
+  coqPackages_8_5 = recurseIntoAttrs (mkCoqPackages_8_5 coqPackages_8_5);
 
   cvc3 = callPackage ../applications/science/logic/cvc3 {};
   cvc4 = callPackage ../applications/science/logic/cvc4 {};

From 01571ab2d796d136987c8759fe9b7347ea9a7720 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 28 May 2015 20:31:12 +0200
Subject: [PATCH 1378/2322] coq-mathcomp: refactor

---
 pkgs/development/coq-modules/mathcomp/1.5.nix | 26 -----------
 .../coq-modules/mathcomp/default.nix          | 43 +++++++------------
 .../coq-modules/mathcomp/generic.nix          | 33 ++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 4 files changed, 52 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/development/coq-modules/mathcomp/1.5.nix
 create mode 100644 pkgs/development/coq-modules/mathcomp/generic.nix

diff --git a/pkgs/development/coq-modules/mathcomp/1.5.nix b/pkgs/development/coq-modules/mathcomp/1.5.nix
deleted file mode 100644
index c984bab4917..00000000000
--- a/pkgs/development/coq-modules/mathcomp/1.5.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{stdenv, fetchurl, coq, ssreflect}:
-
-stdenv.mkDerivation {
-
-  name = "coq-mathcomp-1.5-8.5b2";
-
-  src = fetchurl {
-    url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.5.coq85beta2.tar.gz;
-    sha256 = "03bnq44ym43x8shi7whc02l0g5vy6rx8f1imjw478chlgwcxazqy";
-  };
-
-  propagatedBuildInputs = [ coq ssreflect ];
-
-  enableParallelBuilding = true;
-
-  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
-
-  meta = with stdenv.lib; {
-    homepage = http://ssr.msr-inria.inria.fr/;
-    license = licenses.cecill-b;
-    maintainers = [ maintainers.vbgl maintainers.jwiegley ];
-    platforms = coq.meta.platforms;
-    hydraPlatforms = [];
-  };
-
-}
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index 9ebfba98d83..7c34e186717 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -1,35 +1,24 @@
-{ stdenv, fetchurl, coq, ssreflect
-, graphviz, ocaml, withDoc ? true
-}:
+{ callPackage, coq, fetchurl }:
 
-stdenv.mkDerivation {
+let src = 
+  if coq.coq-version == "8.4" then
 
-  name = "coq-mathcomp-1.5";
+    fetchurl {
+      url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.5.tar.gz;
+      sha256 = "1297svwi18blrlyd8vsqilar2h5nfixlvlifdkbx47aljq4m5bam";
+    }
 
-  src = fetchurl {
-    url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.5.tar.gz;
-    sha256 = "1297svwi18blrlyd8vsqilar2h5nfixlvlifdkbx47aljq4m5bam";
-  };
+  else if coq.coq-version == "8.5" then
 
-  nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ocaml ];
-  propagatedBuildInputs = [ coq ssreflect ];
+    fetchurl {
+      url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.5.coq85beta2.tar.gz;
+      sha256 = "03bnq44ym43x8shi7whc02l0g5vy6rx8f1imjw478chlgwcxazqy";
+    }
 
-  enableParallelBuilding = true;
+  else throw "No mathcomp package for Coq version ${coq.coq-version}";
 
-  buildFlags = stdenv.lib.optionalString withDoc "doc";
-
-  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
-
-  postInstall = stdenv.lib.optionalString withDoc ''
-    make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://ssr.msr-inria.inria.fr/;
-    license = licenses.cecill-b;
-    maintainers = [ maintainers.vbgl maintainers.jwiegley ];
-    platforms = coq.meta.platforms;
-    hydraPlatforms = [];
-  };
+in
 
+callPackage ./generic.nix {
+  inherit src;
 }
diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix
new file mode 100644
index 00000000000..3748152b68a
--- /dev/null
+++ b/pkgs/development/coq-modules/mathcomp/generic.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, coq, ssreflect
+, graphviz, ocamlPackages, withDoc ? true
+, src
+}:
+
+stdenv.mkDerivation {
+
+  name = "coq-${coq.coq-version}-mathcomp-1.5";
+
+  inherit src;
+
+  nativeBuildInputs = stdenv.lib.optionals withDoc
+    ([ graphviz ] ++ (with ocamlPackages; [ ocaml camlp5_transitional ]));
+  propagatedBuildInputs = [ ssreflect ];
+
+  enableParallelBuilding = true;
+
+  buildFlags = stdenv.lib.optionalString withDoc "doc";
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  postInstall = stdenv.lib.optionalString withDoc ''
+    make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://ssr.msr-inria.inria.fr/;
+    license = licenses.cecill-b;
+    maintainers = [ maintainers.vbgl maintainers.jwiegley ];
+    platforms = coq.meta.platforms;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef80fcd5e08..0959b25fad5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14048,6 +14048,8 @@ let
 
   mkCoqPackages_8_4 = self: let callPackage = newScope self; in {
 
+    inherit callPackage;
+
     bedrock = callPackage ../development/coq-modules/bedrock {};
 
     contribs =
@@ -14094,7 +14096,7 @@ let
 
     coq = coq_8_5;
 
-    mathcomp = callPackage ../development/coq-modules/mathcomp/1.5.nix { };
+    mathcomp = callPackage ../development/coq-modules/mathcomp { };
 
     ssreflect = callPackage ../development/coq-modules/ssreflect { };
 

From cd3a7d5be6f9ae699fd4d1f3f4101fa31ba96ed6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 17 Jun 2015 11:06:51 +0200
Subject: [PATCH 1379/2322] ssreflect, mathcomp: better package names

---
 pkgs/development/coq-modules/mathcomp/generic.nix  | 2 +-
 pkgs/development/coq-modules/ssreflect/generic.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix
index 3748152b68a..56838734b6d 100644
--- a/pkgs/development/coq-modules/mathcomp/generic.nix
+++ b/pkgs/development/coq-modules/mathcomp/generic.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation {
 
-  name = "coq-${coq.coq-version}-mathcomp-1.5";
+  name = "coq-mathcomp-1.5-${coq.coq-version}";
 
   inherit src;
 
diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix
index dffa895da5f..e208f1cc25a 100644
--- a/pkgs/development/coq-modules/ssreflect/generic.nix
+++ b/pkgs/development/coq-modules/ssreflect/generic.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation {
 
-  name = "coq-${coq.coq-version}-ssreflect-1.5";
+  name = "coq-ssreflect-1.5-${coq.coq-version}";
 
   inherit src;
 

From 7250ecc44fc694ecac50ad2bb1b8c8ac16bb1d3e Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 19 Jun 2015 19:00:02 +0200
Subject: [PATCH 1380/2322] hstr: update from 1.16 to 1.17

---
 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 f4d4af0e12d..bf2fd97f26e 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.16";
+  version = "1.17";
 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 = "1hl3fn6kravx5gsdsr0l824vnkj5aiz0dybhd3ak932v95b5knyg";
+    sha256 = "0vjc4d8cl3sfbv9lywdpd2slffqyp3cpj52yp29g9lr2n3nfksk8";
   };
 
   buildInputs = [ readline ncurses ];

From a80b77890a75995f13255f47e11865cc4a470f8b Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 19 Jun 2015 19:01:47 +0200
Subject: [PATCH 1381/2322] scim: update from 0.1.8 to 0.1.9

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

diff --git a/pkgs/applications/misc/scim/default.nix b/pkgs/applications/misc/scim/default.nix
index ef1bb0bed1d..98594157211 100644
--- a/pkgs/applications/misc/scim/default.nix
+++ b/pkgs/applications/misc/scim/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, yacc, ncurses, libxml2 }:
 
 let
-  version = "0.1.8";
+  version = "0.1.9";
 in
 stdenv.mkDerivation rec {
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/andmarti1424/scim/archive/v${version}.tar.gz";
-    sha256 = "0qjixb1hzbdrypbmzwb2iaw5wp57kn7fmm1zpjp4gzjyanrhazs2";
+    sha256 = "00rjz344acw0bxv78x1w9jz8snl9lb9qhr9z22phxinidnd3vaaz";
   };
 
   buildInputs = [ yacc ncurses libxml2 ];

From c96d269ad73ad22045507c548b0fef7722ae1a47 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 19 Jun 2015 11:23:43 -0700
Subject: [PATCH 1382/2322] coreutils: Fix gmp in cross build

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

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index c65ed30dd71..e2d0670a826 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -33,7 +33,7 @@ let
       ++ optionals selinuxSupport [ libselinux libsepol ];
 
     crossAttrs = {
-      buildInputs = [ gmp ]
+      buildInputs = [ gmp.crossDrv ]
         ++ optional aclSupport acl.crossDrv
         ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ]
         ++ optional (stdenv.ccCross.libc ? libiconv)

From 1bb72a819849af23da8d399ca0c6048391c32e57 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Fri, 19 Jun 2015 20:58:50 +0300
Subject: [PATCH 1383/2322] tabbed: update and add xft patch

---
 .../window-managers/tabbed/default.nix        |  25 +-
 .../window-managers/tabbed/xft.patch          | 234 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   4 +-
 3 files changed, 250 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/applications/window-managers/tabbed/xft.patch

diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix
index 4e6c9c9a83e..a7e2059cd04 100644
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@@ -1,24 +1,25 @@
-{stdenv, fetchhg, xproto, libX11, patches ? []}:
+{stdenv, fetchgit, xproto, libX11, enableXft, libXft}:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "tabbed-20120209";
- 
-  src = fetchhg {
-    url = http://hg.suckless.org/tabbed;
-    rev = "d7542a6f6dc5";
-    sha256 = "1963jsazfmh5k7923c1mfwppz1xbh48z16j0sa64fiscq22as2gj";
+  name = "tabbed-20150509";
+
+  src = fetchgit {
+    url = http://git.suckless.org/tabbed;
+    rev = "55dc32b27b73c121cab18009bf087e95ef3d9c18";
+    sha256 = "0c5ayf1lrb1xiz5h8dfd4mh05kas42zzi5m5ylrvl67sfz3z4wg1";
   };
 
-  # Allow users set their own list of patches
-  inherit patches;
+  patches = optional enableXft ./xft.patch;
 
-  buildInputs = [ xproto libX11 ];
+  buildInputs = [ xproto libX11 ] ++ optional enableXft libXft;
 
   preInstall = ''
     export makeFlags="PREFIX=$out"
   '';
- 
-  meta = with stdenv.lib; {
+
+  meta = {
     homepage = http://tools.suckless.org/tabbed;
     description = "Simple generic tabbed fronted to xembed aware applications";
     license = licenses.mit;
diff --git a/pkgs/applications/window-managers/tabbed/xft.patch b/pkgs/applications/window-managers/tabbed/xft.patch
new file mode 100644
index 00000000000..f4f1e82e705
--- /dev/null
+++ b/pkgs/applications/window-managers/tabbed/xft.patch
@@ -0,0 +1,234 @@
+diff --git a/config.def.h b/config.def.h
+index b3da7f0..ce43686 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -1,7 +1,7 @@
+ /* See LICENSE file for copyright and license details. */
+ 
+ /* appearance */
+-static const char font[]        = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*";
++static const char font[]        = "monospace-9";
+ static const char* normbgcolor  = "#222222";
+ static const char* normfgcolor  = "#cccccc";
+ static const char* selbgcolor   = "#555555";
+diff --git a/config.mk b/config.mk
+index dd741e4..ed3a2e9 100644
+--- a/config.mk
++++ b/config.mk
+@@ -9,7 +9,7 @@ MANPREFIX = ${PREFIX}/share/man
+ 
+ # includes and libs
+ INCS = -I. -I/usr/include
+-LIBS = -L/usr/lib -lc -lX11
++LIBS = -L/usr/lib -lc -lXft -lX11
+ 
+ # flags
+ CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
+diff --git a/tabbed.c b/tabbed.c
+index b15f9cb..6e50c41 100644
+--- a/tabbed.c
++++ b/tabbed.c
+@@ -15,6 +15,7 @@
+ #include <X11/Xproto.h>
+ #include <X11/Xutil.h>
+ #include <X11/XKBlib.h>
++#include <X11/Xft/Xft.h>
+ 
+ #include "arg.h"
+ 
+@@ -64,17 +65,16 @@ typedef struct {
+ 
+ typedef struct {
+ 	int x, y, w, h;
+-	unsigned long norm[ColLast];
+-	unsigned long sel[ColLast];
+-	unsigned long urg[ColLast];
++	XftColor norm[ColLast];
++	XftColor sel[ColLast];
++	XftColor urg[ColLast];
+ 	Drawable drawable;
+ 	GC gc;
+ 	struct {
+ 		int ascent;
+ 		int descent;
+ 		int height;
+-		XFontSet set;
+-		XFontStruct *xfont;
++		XftFont *xfont;
+ 	} font;
+ } DC; /* draw context */
+ 
+@@ -97,7 +97,7 @@ static void unmapnotify(const XEvent *e);
+ static void destroynotify(const XEvent *e);
+ static void die(const char *errstr, ...);
+ static void drawbar(void);
+-static void drawtext(const char *text, unsigned long col[ColLast]);
++static void drawtext(const char *text, XftColor col[ColLast]);
+ static void *ecalloc(size_t n, size_t size);
+ static void *erealloc(void *o, size_t size);
+ static void expose(const XEvent *e);
+@@ -107,7 +107,7 @@ static void focusonce(const Arg *arg);
+ static void fullscreen(const Arg *arg);
+ static char* getatom(int a);
+ static int getclient(Window w);
+-static unsigned long getcolor(const char *colstr);
++static XftColor getcolor(const char *colstr);
+ static int getfirsttab(void);
+ static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
+ static void initfont(const char *fontstr);
+@@ -220,12 +220,6 @@ cleanup(void) {
+ 	free(clients);
+ 	clients = NULL;
+ 
+-	if(dc.font.set) {
+-		XFreeFontSet(dpy, dc.font.set);
+-	} else {
+-		XFreeFont(dpy, dc.font.xfont);
+-	}
+-
+ 	XFreePixmap(dpy, dc.drawable);
+ 	XFreeGC(dpy, dc.gc);
+ 	XDestroyWindow(dpy, win);
+@@ -315,7 +309,7 @@ die(const char *errstr, ...) {
+ 
+ void
+ drawbar(void) {
+-	unsigned long *col;
++	XftColor *col;
+ 	int c, cc, fc, width;
+ 	char *name = NULL;
+ 
+@@ -368,12 +362,13 @@ drawbar(void) {
+ }
+ 
+ void
+-drawtext(const char *text, unsigned long col[ColLast]) {
++drawtext(const char *text, XftColor col[ColLast]) {
+ 	int i, x, y, h, len, olen;
+ 	char buf[256];
++	XftDraw *d;
+ 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+ 
+-	XSetForeground(dpy, dc.gc, col[ColBG]);
++	XSetForeground(dpy, dc.gc, col[ColBG].pixel);
+ 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+ 	if(!text)
+ 		return;
+@@ -394,13 +389,12 @@ drawtext(const char *text, unsigned long col[ColLast]) {
+ 		for(i = len; i && i > len - 3; buf[--i] = '.');
+ 	}
+ 
+-	XSetForeground(dpy, dc.gc, col[ColFG]);
+-	if(dc.font.set) {
+-		XmbDrawString(dpy, dc.drawable, dc.font.set,
+-				dc.gc, x, y, buf, len);
+-	} else {
+-		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+-	}
++	XSetForeground(dpy, dc.gc, col[ColFG].pixel);
++
++	d = XftDrawCreate(dpy, dc.drawable, DefaultVisual(dpy, screen), DefaultColormap(dpy,screen));
++
++	XftDrawStringUtf8(d, &col[ColFG], dc.font.xfont, x, y, (XftChar8 *) buf, len);
++	XftDrawDestroy(d);
+ }
+ 
+ void *
+@@ -537,15 +531,14 @@ getclient(Window w) {
+ 	return -1;
+ }
+ 
+-unsigned long
++XftColor
+ getcolor(const char *colstr) {
+-	Colormap cmap = DefaultColormap(dpy, screen);
+-	XColor color;
++	XftColor color;
+ 
+-	if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
++	if(!XftColorAllocName(dpy, DefaultVisual(dpy, screen), DefaultColormap(dpy, screen), colstr, &color))
+ 		die("tabbed: cannot allocate color '%s'\n", colstr);
+ 
+-	return color.pixel;
++	return color;
+ }
+ 
+ int
+@@ -594,41 +587,11 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
+ 
+ void
+ initfont(const char *fontstr) {
+-	char *def, **missing, **font_names;
+-	int i, n;
+-	XFontStruct **xfonts;
+-
+-	missing = NULL;
+-	if(dc.font.set)
+-		XFreeFontSet(dpy, dc.font.set);
+-
+-	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+-	if(missing) {
+-		while(n--)
+-			fprintf(stderr, "tabbed: missing fontset: %s\n", missing[n]);
+-		XFreeStringList(missing);
+-	}
+-
+-	if(dc.font.set) {
+-		dc.font.ascent = dc.font.descent = 0;
+-		n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
+-		for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
+-			dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
+-			dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent);
+-			xfonts++;
+-		}
+-	} else {
+-		if(dc.font.xfont)
+-			XFreeFont(dpy, dc.font.xfont);
+-		dc.font.xfont = NULL;
+-		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
+-				&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed"))) {
+-			die("tabbed: cannot load font: '%s'\n", fontstr);
+-		}
++	if(!(dc.font.xfont = XftFontOpenName(dpy,screen,fontstr)) && !(dc.font.xfont = XftFontOpenName(dpy,screen,"fixed")))
++		die("error, cannot load font: '%s'\n", fontstr);
+ 
+-		dc.font.ascent = dc.font.xfont->ascent;
+-		dc.font.descent = dc.font.xfont->descent;
+-	}
++	dc.font.ascent = dc.font.xfont->ascent;
++	dc.font.descent = dc.font.xfont->descent;
+ 	dc.font.height = dc.font.ascent + dc.font.descent;
+ }
+ 
+@@ -1000,11 +963,9 @@ setup(void) {
+ 	dc.drawable = XCreatePixmap(dpy, root, ww, wh,
+ 			DefaultDepth(dpy, screen));
+ 	dc.gc = XCreateGC(dpy, root, 0, 0);
+-	if(!dc.font.set)
+-		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
+ 
+ 	win = XCreateSimpleWindow(dpy, root, wx, wy, ww, wh, 0,
+-			dc.norm[ColFG], dc.norm[ColBG]);
++			dc.norm[ColFG].pixel, dc.norm[ColBG].pixel);
+ 	XMapRaised(dpy, win);
+ 	XSelectInput(dpy, win, SubstructureNotifyMask|FocusChangeMask|
+ 			ButtonPressMask|ExposureMask|KeyPressMask|PropertyChangeMask|
+@@ -1070,15 +1031,9 @@ spawn(const Arg *arg) {
+ 
+ int
+ textnw(const char *text, unsigned int len) {
+-	XRectangle r;
+-
+-	if(dc.font.set) {
+-		XmbTextExtents(dc.font.set, text, len, NULL, &r);
+-
+-		return r.width;
+-	}
+-
+-	return XTextWidth(dc.font.xfont, text, len);
++	XGlyphInfo ext;
++	XftTextExtentsUtf8(dpy, dc.font.xfont, (XftChar8 *) text, len, &ext);
++	return ext.xOff;
+ }
+ 
+ void
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26aa616b4e0..81360747ce7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12545,7 +12545,9 @@ let
   # linux only by now
   synergy = callPackage ../applications/misc/synergy { };
 
-  tabbed = callPackage ../applications/window-managers/tabbed { };
+  tabbed = callPackage ../applications/window-managers/tabbed {
+    enableXft = true;
+  };
 
   tagainijisho = callPackage ../applications/office/tagainijisho {};
 

From a35263d75e53aaaddabc26b053d51e60fd83698d Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Fri, 19 Jun 2015 21:44:34 +0300
Subject: [PATCH 1384/2322] dmenu: build with Xft
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It doesn’t make any sense to build dmenu without Xft. Really.
Extra bonus: getting rid of deprecated config.
---
 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 26aa616b4e0..4323c9a9121 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10793,7 +10793,7 @@ let
   djview4 = pkgs.djview;
 
   dmenu = callPackage ../applications/misc/dmenu {
-    enableXft = config.dmenu.enableXft or false;
+    enableXft = true;
   };
 
   dmenu2 = callPackage ../applications/misc/dmenu2 { };

From 4ac7c02d8e87dae68e0e7dacbcba4452d21c74f1 Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Sat, 23 May 2015 13:54:27 -0700
Subject: [PATCH 1385/2322] Disable i3 tests due to unfixed errors

---
 pkgs/applications/window-managers/i3/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 21836bd4fff..b5029d3c141 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -24,7 +24,13 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  doCheck = stdenv.system == "x86_64-linux";
+  # Tests have been failing (at least for some people in some cases)
+  # and have been disabled until someone wants to fix them. Some
+  # initial digging uncovers that the tests call out to `git`, which
+  # they shouldn't, and then even once that's fixed have some
+  # perl-related errors later on. For more, see
+  # https://github.com/NixOS/nixpkgs/issues/7957
+  doCheck = false; # stdenv.system == "x86_64-linux";
 
   checkPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
   ''
@@ -60,4 +66,3 @@ stdenv.mkDerivation rec {
   };
 
 }
-

From 3d7125d1a783545f962dc12c3dfc81bc31c09128 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Fri, 19 Jun 2015 02:17:51 -0700
Subject: [PATCH 1386/2322] wolfebin: init at 5.4

---
 pkgs/tools/networking/wolfebin/default.nix | 29 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  4 +++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/networking/wolfebin/default.nix

diff --git a/pkgs/tools/networking/wolfebin/default.nix b/pkgs/tools/networking/wolfebin/default.nix
new file mode 100644
index 00000000000..05bf8d5dd11
--- /dev/null
+++ b/pkgs/tools/networking/wolfebin/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, python }:
+
+stdenv.mkDerivation rec {
+  version = "5.4";
+  name = "wolfebin-${version}";
+  
+  src = fetchFromGitHub {
+    owner = "thejoshwolfe";
+    repo = "wolfebin";
+    rev = "${version}";
+    sha256 = "16xj6zz30sn9q05p211bmmsl0i6fknfxf8dssn6knm6nkiym8088";
+  };
+
+  buildInputs = [ python ];
+
+  installPhase = ''
+    install -m 755 -d $out/bin
+    install -m 755 wolfebin $out/bin
+    install -m 755 wolfebin_server.py $out/bin/wolfebin_server
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/thejoshwolfe/wolfebin;
+    description = "Quick and easy file sharing";
+    license = licenses.mit;
+    maintainers = [ maintainers.andrewrk ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e2dd6ad220..071f0ded12c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3180,6 +3180,10 @@ let
 
   welkin = callPackage ../tools/graphics/welkin {};
 
+  wolfebin = callPackage ../tools/networking/wolfebin {
+    python = python2;
+  };
+
   xl2tpd = callPackage ../tools/networking/xl2tpd { };
 
   testdisk = callPackage ../tools/misc/testdisk { };

From e039794e5bfbbf4720337194c88f34eb4af9c300 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 19 Jun 2015 12:55:48 -0700
Subject: [PATCH 1387/2322] apply perl-5.20 fix to pure darwin only

---
 pkgs/development/interpreters/perl/5.20/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix
index 8cb07621ef1..e8eb3a70e37 100644
--- a/pkgs/development/interpreters/perl/5.20/default.nix
+++ b/pkgs/development/interpreters/perl/5.20/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   # while at the same time erasing the PATH environment variable so it unconditionally
   # fails. The code in question is guarded by a check for Mac OS, but the patch below
   # doesn't have any runtime effect on other platforms.
-  postPatch = ''
+  postPatch = stdenv.lib.optional (stdenv.isDarwin && !stdenv.cc.nativeLibc) ''
     pwd="$(type -P pwd)"
     substituteInPlace dist/PathTools/Cwd.pm \
       --replace "pwd_cmd = 'pwd'" "pwd_cmd = '$pwd'"

From f048ff3969abf7528f3569f7214995ecd5e0e619 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 19 Jun 2015 12:56:00 -0700
Subject: [PATCH 1388/2322] darwin purity: python-2.7

---
 pkgs/development/interpreters/python/2.7/default.nix | 5 ++++-
 pkgs/top-level/all-packages.nix                      | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 792e2a67974..a24135ed83b 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -8,6 +8,8 @@
 , tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? !stdenv.isCygwin
 , zlib ? null, zlibSupport ? true
 , expat, libffi
+
+, CF, configd
 }:
 
 assert zlibSupport -> zlib != null;
@@ -92,7 +94,8 @@ let
         [ db gdbm ncurses sqlite readline
         ] ++ optionals x11Support [ tcl tk x11 libX11 ]
     )
-    ++ optional zlibSupport zlib;
+    ++ optional zlibSupport zlib
+    ++ optionals stdenv.isDarwin [ CF configd ];
 
   # Build the basic Python interpreter without modules that have
   # external dependencies.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ee30b3d3a6..52f4b6a7538 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4910,6 +4910,7 @@ let
   };
   python27 = callPackage ../development/interpreters/python/2.7 {
     self = python27;
+    inherit (darwin) CF configd;
   };
   python32 = callPackage ../development/interpreters/python/3.2 {
     self = python32;

From d3ef216c54ad47bc7c96b3d82c1308e90d5c5fc3 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 19 Jun 2015 12:56:12 -0700
Subject: [PATCH 1389/2322] darwin purity: libusb1

---
 pkgs/development/libraries/libusb1/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 884db2b3b25..82e10eba331 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, udev ? null }:
+{ stdenv, fetchurl, pkgconfig, udev ? null, libobjc, IOKit }:
 
 stdenv.mkDerivation rec {
   name = "libusb-1.0.19";
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig ];
-  propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux udev;
+  propagatedBuildInputs =
+    stdenv.lib.optional stdenv.isLinux udev ++
+    stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52f4b6a7538..1bcca87b678 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7210,7 +7210,9 @@ let
 
   libusb = callPackage ../development/libraries/libusb {};
 
-  libusb1 = callPackage ../development/libraries/libusb1 { };
+  libusb1 = callPackage ../development/libraries/libusb1 {
+    inherit (darwin) libobjc IOKit;
+  };
 
   libusbmuxd = callPackage ../development/libraries/libusbmuxd { };
 

From 2c79dcd5ceb0023bf2b06e2190ab71a1d6e4ec87 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 19 Jun 2015 12:56:20 -0700
Subject: [PATCH 1390/2322] darwin purity: pkgconfig

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

diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index f01b52cbba7..f1471d51e1f 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation (rec {
     sha256 = "0igqq5m204w71m11y0nipbdf5apx87hwfll6axs12hn4dqfb6vkb";
   };
 
-  buildInputs = stdenv.lib.optional stdenv.isCygwin libiconv;
+  buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin) libiconv;
 
   configureFlags = [ "--with-internal-glib" ];
 

From 099f85465c344e49875385dd35bbba9fa72b5aa7 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 19 Jun 2015 12:56:29 -0700
Subject: [PATCH 1391/2322] darwin purity: tetex-3.0

---
 pkgs/tools/typesetting/tex/tetex/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix
index 24ab02e97d7..ab3d49c6b11 100644
--- a/pkgs/tools/typesetting/tex/tetex/default.nix
+++ b/pkgs/tools/typesetting/tex/tetex/default.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation {
     mkdir -p $out/share/texmf
     mkdir -p $out/share/texmf-dist
     gunzip < $texmf | (cd $out/share/texmf-dist && tar xvf -)
+
+    substituteInPlace ./tetex-src-3.0/configure --replace /usr/bin/install $(type -P install)
   '';
 
   meta = with stdenv.lib; {

From 359215e3fd2b40de03b86773bada903a075e6695 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 12 Jun 2015 14:19:23 +0200
Subject: [PATCH 1392/2322] dnscrypt-proxy: 1.4.3 -> 1.5.0

---
 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 11dadf9dcd8..c2b9638c233 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "dnscrypt-proxy-1.4.3";
+  name = "dnscrypt-proxy-${version}";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "http://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2";
-    sha256 = "0cij80ryxnikpmm6s79c2fqg6bdiz1wdy50xrnd7w954vw9mhr0b";
+    sha256 = "1cp3ivxngrihil6i7b659d39v9v6iwjs16s2kj9wz1anzyx0j6nx";
   };
 
   buildInputs = [ libsodium ];

From 236f8c720da861408029c65e07b32b545365ab70 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Mon, 8 Jun 2015 19:33:23 +0200
Subject: [PATCH 1393/2322] added popcorntime package

---
 .../video/popcorntime/default.nix             | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/video/popcorntime/default.nix

diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
new file mode 100644
index 00000000000..80ec5051dae
--- /dev/null
+++ b/pkgs/applications/video/popcorntime/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, pkgs, fetchurl, runCommand, makeWrapper, node_webkit_0_9
+}:
+
+let
+  node-webkit = node_webkit_0_9;
+  version = "0.3.7.2";
+  popcorntimePackage = stdenv.mkDerivation rec {
+    name = "popcorntime-package-${version}";
+    src = fetchurl {
+      url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux64.tar.xz";
+     sha256 = "0lm9k4fr73a9p00i3xj2ywa4wvjf9csadm0pcz8d6imwwq44sa8b";
+    };
+    sourceRoot = ".";
+    installPhase = ''
+      mkdir -p $out
+      cp -r *.so *.pak $out/
+      cat ${node-webkit}/bin/nw package.nw > $out/Popcorn-Time
+      chmod 555 $out/Popcorn-Time
+    '';
+  };
+in
+  runCommand "popcorntime-${version}" {
+    buildInputs = [ makeWrapper ];
+    meta = with stdenv.lib; {
+      homepage = http://popcorntime.io/;
+      description = "An application that streams movies and TV shows from torrents";
+      license = stdenv.lib.licenses.gpl3;
+      platforms = platforms.linux;
+      maintainers = with maintainers; [ bobvanderlinden ];
+    };
+  }
+  ''
+    mkdir -p $out/bin
+    makeWrapper ${popcorntimePackage}/Popcorn-Time $out/bin/popcorntime
+  ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7a08a42898..ffc4f347b1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2582,6 +2582,8 @@ let
 
   polkit_gnome = callPackage ../tools/security/polkit-gnome { };
 
+  popcorntime = callPackage ../applications/video/popcorntime { };
+
   ponysay = callPackage ../tools/misc/ponysay { };
 
   povray = callPackage ../tools/graphics/povray {

From f2f0d98e53d6960610b2d811a8a364e7fa235417 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Fri, 19 Jun 2015 23:18:05 +0200
Subject: [PATCH 1394/2322] popcorntime: added support for i686-linux

---
 pkgs/applications/video/popcorntime/default.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
index 80ec5051dae..8d294325a91 100644
--- a/pkgs/applications/video/popcorntime/default.nix
+++ b/pkgs/applications/video/popcorntime/default.nix
@@ -4,12 +4,21 @@
 let
   node-webkit = node_webkit_0_9;
   version = "0.3.7.2";
+
+  srcs = {
+    x86_64-linux = fetchurl {
+      url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux64.tar.xz";
+      sha256 = "0lm9k4fr73a9p00i3xj2ywa4wvjf9csadm0pcz8d6imwwq44sa8b";
+    };
+    i686-linux = fetchurl {
+      url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux32.tar.xz";
+      sha256 = "1dz1cp31qbwamm9pf8ydmzzhnb6d9z73bigdv3y74dgicz3dpr91";
+    };
+  };
+
   popcorntimePackage = stdenv.mkDerivation rec {
     name = "popcorntime-package-${version}";
-    src = fetchurl {
-      url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux64.tar.xz";
-     sha256 = "0lm9k4fr73a9p00i3xj2ywa4wvjf9csadm0pcz8d6imwwq44sa8b";
-    };
+    src = srcs."${stdenv.system}";
     sourceRoot = ".";
     installPhase = ''
       mkdir -p $out

From e315d0599df1ba01a4bc9edbc1197a2544058d49 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Fri, 19 Jun 2015 23:19:00 +0200
Subject: [PATCH 1395/2322] popcorntime: allow different versions of
 node_webkit

---
 pkgs/applications/video/popcorntime/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
index 8d294325a91..ab22a30d866 100644
--- a/pkgs/applications/video/popcorntime/default.nix
+++ b/pkgs/applications/video/popcorntime/default.nix
@@ -1,8 +1,7 @@
-{ stdenv, pkgs, fetchurl, runCommand, makeWrapper, node_webkit_0_9
+{ stdenv, pkgs, fetchurl, runCommand, makeWrapper, node_webkit ? pkgs.node_webkit_0_9
 }:
 
 let
-  node-webkit = node_webkit_0_9;
   version = "0.3.7.2";
 
   srcs = {
@@ -23,7 +22,7 @@ let
     installPhase = ''
       mkdir -p $out
       cp -r *.so *.pak $out/
-      cat ${node-webkit}/bin/nw package.nw > $out/Popcorn-Time
+      cat ${node_webkit}/bin/nw package.nw > $out/Popcorn-Time
       chmod 555 $out/Popcorn-Time
     '';
   };

From caa216b640a78e04615f529adecd1374344205e6 Mon Sep 17 00:00:00 2001
From: "Travis B. Hartwell" <nafai@travishartwell.net>
Date: Fri, 19 Jun 2015 15:17:00 -0600
Subject: [PATCH 1396/2322] atom-shell: renamed to electron and updated 0.19.1
 -> 0.28.2

Added systemd to buildEnv path because of new libudev dependency.
---
 nixos/doc/manual/release-notes/rl-unstable.xml |  4 ++++
 .../tools/{atom-shell => electron}/default.nix | 18 +++++++++---------
 pkgs/top-level/all-packages.nix                |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)
 rename pkgs/development/tools/{atom-shell => electron}/default.nix (75%)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index fcbf6ed0add..063663d9bbc 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -59,6 +59,10 @@ and old <literal>steam</literal> package -- to <literal>steamOriginal</literal>.
 was accordingly renamed to <literal>bomi</literal>
 </para></listitem>
 
+<listitem><para>Atom Shell has been renamed to Electron upstream.  Package <literal>atom-shell</literal>
+was accordingly renamed to <literal>electron</literal>
+</para></listitem>
+
 <listitem>
     <para>
         The default <literal>NIX_PATH</literal> for NixOS now includes
diff --git a/pkgs/development/tools/atom-shell/default.nix b/pkgs/development/tools/electron/default.nix
similarity index 75%
rename from pkgs/development/tools/atom-shell/default.nix
rename to pkgs/development/tools/electron/default.nix
index 4e5413b5012..4589b07343b 100644
--- a/pkgs/development/tools/atom-shell/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
 , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
 , cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, unzip
+, systemd
 }:
 let
   atomEnv = buildEnv {
@@ -10,16 +11,16 @@ let
       fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
       xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
       xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr
-      xlibs.libXcursor libcap
+      xlibs.libXcursor libcap systemd
     ];
   };
 in stdenv.mkDerivation rec {
-  name = "atom-shell-${version}";
-  version = "0.19.1";
+  name = "electron-${version}";
+  version = "0.28.2";
 
   src = fetchurl {
-    url = "https://github.com/atom/atom-shell/releases/download/v0.19.1/atom-shell-v0.19.1-linux-x64.zip";
-    sha256 = "10q1slwv2lkiqqxpv0m5a1k0gj2yp8bi9a7ilb05zz1wg7j3yw4y";
+    url = "https://github.com/atom/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
+    sha256 = "55b0880e2f78a60d95a58e83cd75006c34cb6ed90836e1f34e3359c3e5d0b8f0";
     name = "${name}.zip";
   };
 
@@ -33,15 +34,14 @@ in stdenv.mkDerivation rec {
     mkdir -p $out/bin
     unzip -d $out/bin $src
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-    $out/bin/atom
-    mv $out/bin/atom $out/bin/atom-shell
-    wrapProgram $out/bin/atom-shell \
+    $out/bin/electron
+    wrapProgram $out/bin/electron \
     --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64"
   '';
 
   meta = with stdenv.lib; {
     description = "Cross platform desktop application shell";
-    homepage = https://github.com/atom/atom-shell;
+    homepage = https://github.com/atom/electron;
     license = licenses.mit;
     maintainers = [ maintainers.fluffynukeit ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26aa616b4e0..e5070a8f5f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5143,7 +5143,7 @@ let
 
   astyle = callPackage ../development/tools/misc/astyle { };
 
-  atom-shell = callPackage ../development/tools/atom-shell {
+  electron = callPackage ../development/tools/electron {
     gconf = pkgs.gnome.GConf;
   };
 

From a768954d63e39b85327842662b5f464c832ca6a0 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Fri, 19 Jun 2015 23:56:30 +0200
Subject: [PATCH 1397/2322] git-cola: update from 2.1.1 to 2.2.1, potentially
 fixes CVE-2012-0845, CVE-2012-1150, CVE-2014-9365

---
 .../version-management/git-and-tools/git-cola/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 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 a43bd8d3a37..c10ab14f639 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
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "git-cola-${version}";
-  version = "2.1.1";
+  version = "2.2.1";
 
   src = fetchurl {
     url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz";
-    sha256 = "0fpi5nvhyqkx67ak5pfcpgxbc3m19dqlvdh2c9igv2j0vp5rzkj1";
+    sha256 = "1v1s9gx16xihdcck4qp92bdci8zc6pb5a3z3y8k9jqj97hfkw2nz";
   };
 
   buildInputs = [ makeWrapper gettext ];

From 5bb9988ce95fa0954298d3f2ef4d861cb4b6eb57 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sat, 20 Jun 2015 12:46:26 +1200
Subject: [PATCH 1398/2322] maintainers: add myself for upcoming packages

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 10036c19360..9cc992914a4 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -132,6 +132,7 @@
   lassulus = "Lassulus <lassulus@gmail.com>";
   lethalman = "Luca Bruno <lucabru@src.gnome.org>";
   lhvwb = "Nathaniel Baxter <nathaniel.baxter@gmail.com>";
+  lihop = "Leroy Hopson <nixos@leroy.geek.nz>";
   linquize = "Linquize <linquize@yahoo.com.hk>";
   linus = "Linus Arver <linusarver@gmail.com>";
   lnl7 = "Daiderd Jordan <daiderd@gmail.com>";

From 9b623def113f757b330cdf7fa4e555356f14bd12 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sat, 20 Jun 2015 12:47:05 +1200
Subject: [PATCH 1399/2322] jdcal: init at 1.0

a dependency of openpyxl
---
 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 45148de8ac3..ec15c4540a7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3446,6 +3446,26 @@ let
     };
   };
 
+  jdcal = buildPythonPackage rec {
+    version = "1.0";
+    name = "jdcal-${version}";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "phn";
+      repo = "jdcal";
+      rev = "v${version}";
+      sha256 = "0jjgrrylraqzk3n97hay4gj00ky6vlvkfaapfgqlbcxyq30j24vq";
+    };
+
+    meta = {
+      description = "A module containing functions for converting between Julian dates and calendar dates";
+      homepage = "https://github.com/phn/jdcal";
+      license = licenses.bsd2;
+      maintainers = with maintainers; [ lihop ];
+      platforms = platforms.all;
+    };
+  };
+
   jsonwatch = buildPythonPackage rec {
     name = "jsonwatch-0.2.0";
 

From 108dbfba9a9aae8a3b5ebaab5425e7d08f021ca4 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sat, 20 Jun 2015 12:48:00 +1200
Subject: [PATCH 1400/2322] openpyxl: init at 2.2.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ec15c4540a7..6e6e9d4ddc2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8099,6 +8099,27 @@ let
     doCheck = false;
   };
 
+  openpyxl = buildPythonPackage rec {
+    version = "2.2.4";
+    name = "openpyxl-${version}";
+
+    src = pkgs.fetchhg {
+      url = "https://bitbucket.org/openpyxl/openpyxl";
+      rev = "${version}";
+      sha256 = "1g9imbg4sjfyv5sqg2s7h4svhdmbnvq16hvc1a8jpaqq8nc2vjj2";
+    };
+
+    propagatedBuildInputs = with self; [ jdcal ];
+
+    meta = {
+      description = "A Python library to read/write Excel 2007 xlsx/xlsm files";
+      homepage = "https://openpyxl.readthedocs.org";
+      license = licenses.mit;
+      maintainers = with maintainers; [ lihop ];
+      platforms = platforms.all;
+    };
+  };
+
   # optfunc = buildPythonPackage ( rec {
   #   name = "optfunc-git";
   #

From 0da4293c2c601a49e66a3622201f41576697cdbd Mon Sep 17 00:00:00 2001
From: Tanner Doshier <doshitan@gmail.com>
Date: Sun, 31 May 2015 12:54:33 -0500
Subject: [PATCH 1401/2322] steam: add xrandr binary to env

Games utilizing LWJGL >= 2.4 && < 3.0 need this as the framework parses
display information from the command line output of xrandr[1] on Linux.
There are a number of LWJGL games on Steam currently.

[1]: https://github.com/LWJGL/lwjgl/blob/46f602f0c680a92349b4185f886609200d614990/src/java/org/lwjgl/opengl/XRandR.java#L72
---
 pkgs/games/steam/chrootenv.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 1876e81dc31..96f409faef8 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -13,6 +13,7 @@ buildFHSUserEnv {
       pkgs.python
       pkgs.gnome2.zenity
       pkgs.xdg_utils
+      pkgs.xlibs.xrandr
     ]
     ++ lib.optional (config.steam.java or false) pkgs.jdk
     ++ lib.optional (config.steam.primus or false) pkgs.primus

From 14d83e9565ea6179c07999fde0be1f516889d005 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 19 Jun 2015 22:08:01 -0700
Subject: [PATCH 1402/2322] add gnused to impure darwin stdenv

---
 pkgs/development/libraries/libedit/default.nix |  2 +-
 pkgs/stdenv/darwin/default.nix                 |  2 +-
 pkgs/stdenv/darwin/trivial-bootstrap.sh        |  3 ++-
 pkgs/tools/archivers/sharutils/default.nix     | 13 +++++--------
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index 167aa206865..5adef716eb0 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   ] else null;
 
   postInstall = ''
-    sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.nativeLibc) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc
+    sed -i s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc
   '';
 
   configureFlags = [ "--enable-widec" ];
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 98fc35074c2..9ad2c8504d1 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -106,7 +106,7 @@ rec {
       inherit system config;
       inherit (stage1.stdenv) shell fetchurlBoot preHook cc;
 
-      initialPath = [ stage1.pkgs.xz ] ++ stage1.stdenv.initialPath;
+      initialPath = [ stage1.pkgs.xz stage1.pkgs.gnused ] ++ stage1.stdenv.initialPath;
     };
     pkgs = allPackages {
       inherit system platform;
diff --git a/pkgs/stdenv/darwin/trivial-bootstrap.sh b/pkgs/stdenv/darwin/trivial-bootstrap.sh
index 0915b378d4f..487f1488658 100644
--- a/pkgs/stdenv/darwin/trivial-bootstrap.sh
+++ b/pkgs/stdenv/darwin/trivial-bootstrap.sh
@@ -12,6 +12,7 @@ cd $out/bin
 ln -s $mkdir
 ln -s /bin/sh
 ln -s /bin/cp
+ln -s /bin/dd
 ln -s /bin/mv
 ln -s /bin/rm
 ln -s /bin/ls
@@ -63,4 +64,4 @@ ln -s /usr/bin/which
 ln -s /usr/bin/install
 ln -s /usr/bin/basename
 ln -s /usr/bin/dirname
-ln -s /usr/bin/readlink
\ No newline at end of file
+ln -s /usr/bin/readlink
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index cc9618c4dcc..a7135346d2f 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/pkgs/tools/archivers/sharutils/default.nix
@@ -8,14 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "1mallg1gprimlggdisfzdmh1xi676jsfdlfyvanlcw72ny8fsj3g";
   };
 
-  preConfigure =
-    let needSedSpace = ((stdenv.isFreeBSD || stdenv.isOpenBSD) && stdenv.cc.nativeTools)
-                    || (stdenv.isDarwin && stdenv.cc.nativeLibc);
-    in ''
-       # Fix for building on Glibc 2.16.  Won't be needed once the
-       # gnulib in sharutils is updated.
-       sed -i ${stdenv.lib.optionalString needSedSpace "''"} '/gets is a security hole/d' lib/stdio.in.h
-    '';
+  preConfigure = ''
+     # Fix for building on Glibc 2.16.  Won't be needed once the
+     # gnulib in sharutils is updated.
+     sed -i ${stdenv.lib.optionalString ((stdenv.isFreeBSD || stdenv.isOpenBSD) && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h
+  '';
 
   # GNU Gettext is needed on non-GNU platforms.
   buildInputs = [ gettext coreutils ];

From e3927f6b928952921296754804c90ed554b941ac Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 19 Jun 2015 22:08:11 -0700
Subject: [PATCH 1403/2322] remove unbuildables from impure darwin stdenv

---
 pkgs/development/interpreters/python/2.7/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index a24135ed83b..195caa583ad 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -95,7 +95,11 @@ let
         ] ++ optionals x11Support [ tcl tk x11 libX11 ]
     )
     ++ optional zlibSupport zlib
-    ++ optionals stdenv.isDarwin [ CF configd ];
+
+    # depend on CF and configd only if purity is an issue
+    # the impure bootstrap compiler can't build CoreFoundation currently. it requires
+    # <mach-o/dyld.h> which is in our pure bootstrapTools, but not in the system headers.
+    ++ optionals (stdenv.isDarwin && !stdenv.cc.nativeLibc) [ CF configd ];
 
   # Build the basic Python interpreter without modules that have
   # external dependencies.

From 42f88b5ba744ada078f95998c499cc6a3092d0ee Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Tue, 16 Jun 2015 02:04:55 -0700
Subject: [PATCH 1404/2322] liblaxjson: init at 1.0.5

---
 .../libraries/liblaxjson/default.nix          | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/liblaxjson/default.nix

diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix
new file mode 100644
index 00000000000..cafd6a66aa0
--- /dev/null
+++ b/pkgs/development/libraries/liblaxjson/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.5";
+  name = "liblaxjson-${version}";
+
+  src = fetchFromGitHub {
+    owner = "andrewrk";
+    repo = "liblaxjson";
+    rev = "${version}";
+    sha256 = "01iqbpbhnqfifhv82m6hi8190w5sdim4qyrkss7z1zyv3gpchc5s";
+  };
+
+  buildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "Library for parsing JSON config files";
+    homepage = https://github.com/andrewrk/liblaxjson;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.andrewrk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5eb6ce270e..552694be44c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6794,6 +6794,8 @@ let
 
   libLAS = callPackage ../development/libraries/libLAS { };
 
+  liblaxjson = callPackage ../development/libraries/liblaxjson { };
+
   liblo = callPackage ../development/libraries/liblo { };
 
   liblrdf = librdf;

From f5cae290056d15d2580360687060a2ff25692524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 20 Jun 2015 09:10:19 +0200
Subject: [PATCH 1405/2322] openssl-1.0.2: bug+security upate (Fixes #8415)

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

diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix
index 18c533ea188..52867440191 100644
--- a/pkgs/development/libraries/openssl/1.0.2.x.nix
+++ b/pkgs/development/libraries/openssl/1.0.2.x.nix
@@ -2,7 +2,7 @@
 , withCryptodev ? false, cryptodevHeaders }:
 
 let
-  name = "openssl-1.0.2a";
+  name = "openssl-1.0.2c";
 
   opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
     (throw "openssl needs its platform name cross building" null)
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
       "http://www.openssl.org/source/${name}.tar.gz"
       "http://openssl.linux-mirror.org/source/${name}.tar.gz"
     ];
-    sha256 = "0jijgzf72659pikms2bc5w31h78xrd1h5zp2r01an2h340y3kdhm";
+    sha256 = "10vasdg52qiyqvgbp14n9z7ghglmhzvag9qpiz2nfqssycvvlf00";
   };
 
   patches = (patchesCross false) ++ extraPatches;

From 55262f98b6324e93578990ba124fca68f19a30a3 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Tue, 16 Jun 2015 02:13:27 -0700
Subject: [PATCH 1406/2322] rucksack: init at 3.1.0

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

diff --git a/pkgs/development/tools/rucksack/default.nix b/pkgs/development/tools/rucksack/default.nix
new file mode 100644
index 00000000000..09008c9d63d
--- /dev/null
+++ b/pkgs/development/tools/rucksack/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, liblaxjson, cmake, freeimage }:
+
+stdenv.mkDerivation rec {
+  version = "3.1.0";
+  name = "rucksack-${version}";
+
+  src = fetchFromGitHub {
+    owner = "andrewrk";
+    repo = "rucksack";
+    rev = "${version}";
+    sha256 = "0bcm20hqxqnq1j0zghb9i7z9frri6bbf7rmrv5g8dd626sq07vyv";
+  };
+
+  buildInputs = [ cmake liblaxjson freeimage ];
+
+  meta = with stdenv.lib; {
+    description = "Texture packer and resource bundler";
+    platforms = platforms.unix;
+    homepage = https://github.com/andrewrk/rucksack;
+    license = licenses.mit;
+    maintainers = [ maintainers.andrewrk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 552694be44c..d62ba6f55d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14554,6 +14554,8 @@ let
 
   robomongo = callPackage ../applications/misc/robomongo { };
 
+  rucksack = callPackage ../development/tools/rucksack { };
+
   opkg = callPackage ../tools/package-management/opkg { };
 
   opkg-utils = callPackage ../tools/package-management/opkg-utils { };

From c0d4cdce07f0676a319e83c7aeb3e8a9059700c9 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Sat, 28 Feb 2015 19:25:19 +0000
Subject: [PATCH 1407/2322] add sipcalc

---
 pkgs/tools/networking/sipcalc/default.nix | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/tools/networking/sipcalc/default.nix

diff --git a/pkgs/tools/networking/sipcalc/default.nix b/pkgs/tools/networking/sipcalc/default.nix
new file mode 100644
index 00000000000..4ff383b1cf1
--- /dev/null
+++ b/pkgs/tools/networking/sipcalc/default.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation rec {
+  name = "sipcalc-${version}";
+  version = "1.1.6";
+  src = fetchurl {
+    url = "http://www.routemeister.net/projects/sipcalc/files/${name}.tar.gz";
+    sha256 = "cfd476c667f7a119e49eb5fe8adcfb9d2339bc2e0d4d01a1d64b7c229be56357";
+  };
+  meta = {
+    description = "Advanced console ip subnet calculator";
+    homepage = "http://www.routemeister.net/projects/sipcalc/";
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cf9fed11ae..02d984875c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2850,6 +2850,8 @@ let
 
   skydns = callPackage ../servers/dns/skydns { };
 
+  sipcalc = callPackage ../tools/networking/sipcalc { };
+
   sleuthkit = callPackage ../tools/system/sleuthkit {};
 
   slimrat = callPackage ../tools/networking/slimrat {

From aef2a813a80fb332f956b12ae8090239f1f7a8f5 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Thu, 5 Feb 2015 15:46:50 +0000
Subject: [PATCH 1408/2322] add ipcalc

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

diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix
new file mode 100644
index 00000000000..10b1e93bde2
--- /dev/null
+++ b/pkgs/tools/networking/ipcalc/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, perl}:
+stdenv.mkDerivation rec {
+  name = "ipcalc-${version}";
+  version = "0.41";
+  src = fetchurl {
+    url = "http://jodies.de/ipcalc-archive/${name}.tar.gz";
+    sha256 = "dda9c571ce3369e5b6b06e92790434b54bec1f2b03f1c9df054c0988aa4e2e8a";
+  };
+  buildInputs = [perl];
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ipcalc $out/bin
+  '';
+  meta = {
+    description = "Simple IP network calculator";
+    homepage = "http://jodies.de/ipcalc";
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02d984875c1..41335382e87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1840,6 +1840,8 @@ let
 
   ipmiutil = callPackage ../tools/system/ipmiutil {};
 
+  ipcalc = callPackage ../tools/networking/ipcalc {};
+
   ipv6calc = callPackage ../tools/networking/ipv6calc {};
 
   ipxe = callPackage ../tools/misc/ipxe { };

From db2b0ce90db4343cca9c1755fb85a514be12da05 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 20 Jun 2015 12:45:26 +0000
Subject: [PATCH 1409/2322] libasr: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix
index b919aef5658..2f4a122d61e 100644
--- a/pkgs/development/libraries/libasr/default.nix
+++ b/pkgs/development/libraries/libasr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libasr-${version}";
-  version=  "1.0.1";
+  version=  "1.0.2";
 
   src = fetchurl {
     url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
-    sha256 = "10h1c9b58msbggns8k2m0857zmbldb0x8ghk3aay88yn2bip2916";
+    sha256 = "0d4blm0kzdhb75fq8sbcpvkc25lv5dbjaxa2ldniaf39633d3xd6";
   };
 
   buildInputs = [ libevent openssl ];

From 8e7b1f2ac2e261d5a644fef860a0d050ea227c06 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 20 Jun 2015 18:24:40 +0200
Subject: [PATCH 1410/2322] ocaml-herelib: works also with OCaml-4.0+

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

diff --git a/pkgs/development/ocaml-modules/herelib/default.nix b/pkgs/development/ocaml-modules/herelib/default.nix
index fd955602844..716e31b2bfe 100644
--- a/pkgs/development/ocaml-modules/herelib/default.nix
+++ b/pkgs/development/ocaml-modules/herelib/default.nix
@@ -4,7 +4,7 @@ buildOcaml rec {
   version = "109.35.02";
   name = "herelib";
 
-  minimumSupportedOcamlVersion = "4.02";
+  minimumSupportedOcamlVersion = "4.00";
 
   src = fetchurl {
     url = "https://github.com/janestreet/herelib/archive/${version}.tar.gz";

From 1682bd707a8e94b92866f802fdbfb5cc093d37b0 Mon Sep 17 00:00:00 2001
From: "Travis B. Hartwell" <nafai@travishartwell.net>
Date: Sat, 20 Jun 2015 12:43:10 -0600
Subject: [PATCH 1411/2322] electron: Added myself as maintainer.

Per https://github.com/NixOS/nixpkgs/pull/8422#issuecomment-113695261
---
 lib/maintainers.nix                         | 1 +
 pkgs/development/tools/electron/default.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 10036c19360..7c47e724938 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -226,6 +226,7 @@
   thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
   titanous = "Jonathan Rudenberg <jonathan@titanous.com>";
   tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
+  travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>";
   trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>";
   tstrobel = "Thomas Strobel <ts468@cam.ac.uk>";
   ttuegel = "Thomas Tuegel <ttuegel@gmail.com>";
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 4589b07343b..b3867be6377 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
     description = "Cross platform desktop application shell";
     homepage = https://github.com/atom/electron;
     license = licenses.mit;
-    maintainers = [ maintainers.fluffynukeit ];
+    maintainers = [ maintainers.travisbhartwell ];
     platforms = [ "x86_64-linux" ];
   };
 }

From 105feaa9f4efe0b0dae348b007702e7fd8691460 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 20 Jun 2015 12:59:30 -0700
Subject: [PATCH 1412/2322] Cleanup some top-level cross compiling toolchain
 things

Also, switch the cross gcc to use the default gcc.
---
 pkgs/top-level/all-packages.nix | 114 +++++++++-----------------------
 1 file changed, 32 insertions(+), 82 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1bcca87b678..1609c6fac7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1127,11 +1127,9 @@ let
 
   cool-retro-term = callPackage ../applications/misc/cool-retro-term { };
 
-  coreutils = callPackage ../tools/misc/coreutils
-    {
-      # TODO: Add ACL support for cross-Linux.
-      aclSupport = crossSystem == null && stdenv.isLinux;
-    };
+  coreutils = callPackage ../tools/misc/coreutils {
+    aclSupport = stdenv.isLinux;
+  };
 
   cpio = callPackage ../tools/archivers/cpio { };
 
@@ -3602,36 +3600,22 @@ let
 
   gccApple = throw "gccApple is no longer supported";
 
-  gcc48_realCross = lib.addMetaAttrs { hydraPlatforms = []; }
-    (callPackage ../development/compilers/gcc/4.8 {
-      inherit noSysDirs;
-      binutilsCross = binutilsCross;
-      libcCross = libcCross;
-      profiledCompiler = false;
-      enableMultilib = false;
-      crossStageStatic = false;
-      cross = assert crossSystem != null; crossSystem;
-    });
-
-  gcc_realCross = gcc48_realCross;
-
   gccCrossStageStatic = let
-      libcCross1 =
-        if stdenv.cross.libc == "msvcrt" then windows.mingw_w64_headers
-        else if stdenv.cross.libc == "libSystem" then darwin.xcode
-        else null;
-    in
-      wrapGCCCross {
-      gcc = forceNativeDrv (lib.addMetaAttrs { hydraPlatforms = []; } (
-        gcc_realCross.override {
-          crossStageStatic = true;
-          langCC = false;
-          libcCross = libcCross1;
-          enableShared = false;
-        }));
+    libcCross1 =
+      if stdenv.cross.libc == "msvcrt" then windows.mingw_w64_headers
+      else if stdenv.cross.libc == "libSystem" then darwin.xcode
+      else null;
+    in wrapGCCCross {
+      gcc = forceNativeDrv (gcc.cc.override {
+        cross = crossSystem;
+        crossStageStatic = true;
+        langCC = false;
+        libcCross = libcCross1;
+        enableShared = false;
+      });
       libc = libcCross1;
       binutils = binutilsCross;
-      cross = assert crossSystem != null; crossSystem;
+      cross = crossSystem;
   };
 
   # Only needed for mingw builds
@@ -3643,21 +3627,17 @@ let
   };
 
   gccCrossStageFinal = wrapGCCCross {
-    gcc = forceNativeDrv (gcc_realCross.override {
-      libpthreadCross =
-        # FIXME: Don't explicitly refer to `i586-pc-gnu'.
-        if crossSystem != null && crossSystem.config == "i586-pc-gnu"
-        then gnu.libpthreadCross
-        else null;
+    gcc = forceNativeDrv (gcc.cc.override {
+      cross = crossSystem;
+      crossStageStatic = false;
 
       # XXX: We have troubles cross-compiling libstdc++ on MinGW (see
       # <http://hydra.nixos.org/build/4268232>), so don't even try.
-      langCC = (crossSystem == null
-                || crossSystem.config != "i686-pc-mingw32");
-     });
+      langCC = crossSystem.config != "i686-pc-mingw32";
+    });
     libc = libcCross;
     binutils = binutilsCross;
-    cross = assert crossSystem != null; crossSystem;
+    cross = crossSystem;
   };
 
   gcc44 = lowPrio (wrapCC (makeOverridable (import ../development/compilers/gcc/4.4) {
@@ -3684,10 +3664,6 @@ let
     # be passed.
     cross = null;
     libcCross = if crossSystem != null then libcCross else null;
-    libpthreadCross =
-      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
-      then gnu.libpthreadCross
-      else null;
   }));
 
   gcc46 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.6 {
@@ -3705,10 +3681,6 @@ let
     # be passed.
     cross = null;
     libcCross = if crossSystem != null then libcCross else null;
-    libpthreadCross =
-      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
-      then gnu.libpthreadCross
-      else null;
     texinfo = texinfo413;
   }));
 
@@ -3723,10 +3695,6 @@ let
     # be passed.
     cross = null;
     libcCross = if crossSystem != null then libcCross else null;
-    libpthreadCross =
-      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
-      then gnu.libpthreadCross
-      else null;
   }));
 
   gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 {
@@ -3740,10 +3708,6 @@ let
     # be passed.
     cross = null;
     libcCross = if crossSystem != null then libcCross else null;
-    libpthreadCross =
-      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
-      then gnu.libpthreadCross
-      else null;
 
     isl = isl_0_11;
 
@@ -3761,10 +3725,6 @@ let
     # be passed.
     cross = null;
     libcCross = if crossSystem != null then libcCross else null;
-    libpthreadCross =
-      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
-      then gnu.libpthreadCross
-      else null;
 
     isl = isl_0_14;
   }));
@@ -5172,12 +5132,11 @@ let
     gold = false;
   });
 
-  binutilsCross =
-    if crossSystem != null && crossSystem.libc == "libSystem" then darwin.cctools_cross
-    else lowPrio (forceNativeDrv (import ../development/tools/misc/binutils {
-      inherit stdenv fetchurl zlib bison;
+  binutilsCross = lowPrio (forceNativeDrv (
+    if crossSystem.libc == "libSystem" then darwin.cctools_cross
+    else binutils.override {
       noSysDirs = true;
-      cross = assert crossSystem != null; crossSystem;
+      cross = crossSystem;
     }));
 
   bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { };
@@ -6158,28 +6117,19 @@ let
     withGd = true;
   };
 
-  glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc)
-    (let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu";
-     in {
-       inherit stdenv fetchurl;
-       gccCross = gccCrossStageStatic;
-       kernelHeaders = if crossGNU then gnu.hurdHeaders else linuxHeadersCross;
-       installLocales = config.glibc.locales or false;
-     }
-     // lib.optionalAttrs crossGNU {
-        inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig;
-        inherit fetchgit;
-      }));
-
+  glibcCross = forceNativeDrv (glibc.override {
+    gccCross = gccCrossStageStatic;
+    kernelHeaders = linuxHeadersCross;
+  });
 
   # We can choose:
-  libcCrossChooser = name : if name == "glibc" then glibcCross
+  libcCrossChooser = name: if name == "glibc" then glibcCross
     else if name == "uclibc" then uclibcCross
     else if name == "msvcrt" then windows.mingw_w64
     else if name == "libSystem" then darwin.xcode
     else throw "Unknown libc";
 
-  libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc;
+  libcCross = libcCrossChooser crossSystem.libc;
 
   # Only supported on Linux
   glibcLocales = if stdenv.isLinux then callPackage ../development/libraries/glibc/locales.nix { } else null;

From faf33749ce53f859c7bcb3d4e25ad101fbad0c26 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sat, 20 Jun 2015 13:13:33 -0700
Subject: [PATCH 1413/2322] install ncurses headers in the correct place

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

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 7697aa1a9ac..abfa184daf0 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
   # the place we want to put *.pc files from other packages anyway. So we must
   # tell it explicitly where to install with PKG_CONFIG_LIBDIR.
   preConfigure = ''
+    export configureFlags="$configureFlags --includedir=$out/include"
     export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig"
     mkdir -p "$PKG_CONFIG_LIBDIR"
   '' + lib.optionalString stdenv.isCygwin ''

From d78d168096fbbf39a7a6604a38844f8a8b2b8bb1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 20 Jun 2015 21:15:39 +0300
Subject: [PATCH 1414/2322] travis-nox-review-pr: Try to detect if the build
 ran out of memory

Travis builds sometimes fail because Travis doesn't have much memory.
When it happens, the failure reason is often hard to see in the logs and
is confusing (especially for new contributors).

Try to detect OOM errors in dmesg and give a warning when it happens.
---
 maintainers/scripts/travis-nox-review-pr.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh
index 3c3f9151d83..54549955747 100755
--- a/maintainers/scripts/travis-nox-review-pr.sh
+++ b/maintainers/scripts/travis-nox-review-pr.sh
@@ -31,7 +31,15 @@ elif [[ $1 == build ]]; then
         echo "=== Not a pull request"
     else
         echo "=== Checking PR"
-        nox-review pr ${TRAVIS_PULL_REQUEST}
+
+        if ! nox-review pr ${TRAVIS_PULL_REQUEST}; then
+            if sudo dmesg | egrep 'Out of memory|Killed process' > /tmp/oom-log; then
+                echo "=== The build failed due to running out of memory:"
+                cat /tmp/oom-log
+                echo "=== Please disregard the result of this Travis build."
+            fi
+            exit 1
+        fi
     fi
     # echo "=== Checking tarball creation"
     # nix-build pkgs/top-level/release.nix -A tarball

From d4f176f70dedf0671a5d24514fefa8c8986a501c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 31 May 2015 18:00:33 -0700
Subject: [PATCH 1415/2322] Fix libiconv handling when using a crossSystem

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1609c6fac7e..2cd659a5e75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6871,8 +6871,11 @@ let
   # glibc provides libiconv so systems with glibc don't need to build libiconv
   # separately, but we also provide libiconvReal, which will always be a
   # standalone libiconv, just in case you want it
-  libiconv =
-    if stdenv.isGlibc then stdenv.cc.libc
+  libiconv = if crossSystem != null then
+    (if crossSystem.libc == "glibc" then libcCross
+      else if crossSystem.libc == "libSystem" then darwin.libiconv
+      else libiconvReal)
+    else if stdenv.isGlibc then stdenv.cc.libc
     else if stdenv.isDarwin then darwin.libiconv
     else libiconvReal;
 

From c49301b2f76c4de1261089c6fa761dae5116c22a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 20 Jun 2015 13:59:11 -0700
Subject: [PATCH 1416/2322] ncurses: Cleanup some old hacks

---
 .../development/libraries/ncurses/default.nix | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index abfa184daf0..7315d0679bb 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -20,23 +20,17 @@ stdenv.mkDerivation rec {
   # gcc-5.patch should be removed after 5.9
   patches = [ ./clang.patch ./gcc-5.patch ];
 
-  configureFlags =
-    [ "--with-shared" "--without-debug" "--enable-pc-files" "--enable-symlinks" ]
-    ++ lib.optional unicode "--enable-widec";
+  configureFlags = [
+    "--with-shared"
+    "--without-debug"
+    "--enable-pc-files"
+    "--enable-symlinks"
+    "--includedir=\${out}/include"
+  ] ++ lib.optional unicode "--enable-widec";
 
   buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
 
-  # PKG_CONFIG_LIBDIR is where the *.pc files will be installed. If this
-  # directory doesn't exist, the configure script will disable installation of
-  # *.pc files. The configure script usually (on LSB distros) pick $(path of
-  # pkg-config)/../lib/pkgconfig. On NixOS that path doesn't exist and is not
-  # the place we want to put *.pc files from other packages anyway. So we must
-  # tell it explicitly where to install with PKG_CONFIG_LIBDIR.
-  preConfigure = ''
-    export configureFlags="$configureFlags --includedir=$out/include"
-    export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig"
-    mkdir -p "$PKG_CONFIG_LIBDIR"
-  '' + lib.optionalString stdenv.isCygwin ''
+  preConfigure = lib.optionalString stdenv.isCygwin ''
     sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure
   '';
 
@@ -46,6 +40,11 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
+  # The install expects the pkgconfig directory to exist in 5.9
+  preInstall = ''
+    mkdir -p "$out/lib/pkgconfig"
+  '';
+
   # When building a wide-character (Unicode) build, create backward
   # compatibility links from the the "normal" libraries to the
   # wide-character libraries (e.g. libncurses.so to libncursesw.so).

From 507bb016cc1acb39f1a913b60a5c5241157ce45b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 20 Jun 2015 14:26:47 -0700
Subject: [PATCH 1417/2322] openssl: Clean up the cross compile arguments

Also add a check to make sure we don't depend on perl in the output
---
 .../development/libraries/openssl/default.nix | 77 +++++++++----------
 1 file changed, 36 insertions(+), 41 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index f0212aeabee..d05e3f21e8a 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,22 +1,14 @@
 { stdenv, fetchurl, perl
 , withCryptodev ? false, cryptodevHeaders }:
 
+with stdenv.lib;
 let
-  name = "openssl-1.0.1o";
-
-  opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
+  opensslCrossSystem = attrByPath [ "openssl" "system" ]
     (throw "openssl needs its platform name cross building" null)
     stdenv.cross;
-
-  patchesCross = isCross: let
-    isDarwin = stdenv.isDarwin || (isCross && stdenv.cross.libc == "libSystem");
-  in stdenv.lib.optional isDarwin ./darwin-arch.patch;
-
-  extraPatches = stdenv.lib.optional stdenv.isCygwin ./1.0.1-cygwin64.patch;
 in
-
-stdenv.mkDerivation {
-  inherit name;
+stdenv.mkDerivation rec {
+  name = "openssl-1.0.1o";
 
   src = fetchurl {
     urls = [
@@ -26,11 +18,11 @@ stdenv.mkDerivation {
     sha1 = "b003e3382607ef2c6d85b51e4ed7a4c0a76b8d5a";
   };
 
-  patches = (patchesCross false) ++ extraPatches;
-
-  buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
+  patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch
+    ++ optional (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")) ./darwin-arch.patch;
 
   nativeBuildInputs = [ perl ];
+  buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
 
   # On x86_64-darwin, "./config" misdetects the system as
   # "darwin-i386-cc".  So specify the system type explicitly.
@@ -39,45 +31,48 @@ stdenv.mkDerivation {
     else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc"
     else "./config";
 
-  configureFlags = "shared --libdir=lib --openssldir=etc/ssl" +
-    stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS";
+  configureFlags = [
+    "shared"
+    "--libdir=lib"
+    "--openssldir=etc/ssl"
+  ] ++ stdenv.lib.optionals withCryptodev [
+    "-DHAVE_CRYPTODEV"
+    "-DUSE_CRYPTODEV_DIGESTS"
+  ];
 
-  makeFlags = "MANDIR=$(out)/share/man";
+  makeFlags = [
+    "MANDIR=$(out)/share/man"
+  ];
 
   # Parallel building is broken in OpenSSL.
   enableParallelBuilding = false;
 
-  postInstall =
-    ''
-      # If we're building dynamic libraries, then don't install static
-      # libraries.
-      if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib)" ]; then
-          rm "$out/lib/"*.a
-      fi
+  postInstall = ''
+    # If we're building dynamic libraries, then don't install static
+    # libraries.
+    if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
+        rm "$out/lib/"*.a
+    fi
 
-      # remove dependency on Perl at runtime
-      rm -rf $out/etc/ssl/misc
-    '';
+    # remove dependency on Perl at runtime
+    rm -r $out/etc/ssl/misc $out/bin/c_rehash
+  '';
+
+  postFixup = ''
+    # Check to make sure we don't depend on perl
+    if grep -r '${perl}' $out; then
+      echo "Found an erroneous dependency on perl ^^^" >&2
+      exit 1
+    fi
+  '';
 
   crossAttrs = {
-    patches = patchesCross true;
-
     preConfigure=''
       # It's configure does not like --build or --host
-      export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}"
+      export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}"
     '';
 
-    postInstall = ''
-      # Openssl installs readonly files, which otherwise we can't strip.
-      # This could at some stdenv hash change be put out of crossAttrs, too
-      chmod -R +w $out
-
-      # Remove references to perl, to avoid depending on it at runtime
-      rm $out/bin/c_rehash $out/ssl/misc/CA.pl $out/ssl/misc/tsget
-    '';
     configureScript = "./Configure";
-  } // stdenv.lib.optionalAttrs (opensslCrossSystem == "darwin64-x86_64-cc") {
-    CC = "gcc";
   };
 
   meta = {

From a4fbe26ec808c139c1cba8676095645dcbdde5f7 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sat, 20 Jun 2015 15:29:42 -0700
Subject: [PATCH 1418/2322] darwin purity: haskell-hfsevents

---
 .../haskell-modules/configuration-common.nix  |   6 +-
 pkgs/os-specific/darwin/apple-sdk/default.nix | 150 ++++++++++++++++++
 .../darwin/apple-sdk/frameworks.nix           | 119 ++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 4 files changed, 276 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/darwin/apple-sdk/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-sdk/frameworks.nix

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 751e0fb4825..32098b0c7db 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -192,7 +192,11 @@ self: super: {
 
   # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
   # on darwin: https://github.com/NixOS/cabal2nix/issues/146
-  hinotify = if pkgs.stdenv.isDarwin then super.hfsevents else super.hinotify;
+  hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
+
+  hfsevents = if pkgs.stdenv.isDarwin
+    then addBuildTool super.hfsevents pkgs.darwin.apple_sdk.frameworks.CoreServices
+    else super.hfsevents;
 
   # FSEvents API is very buggy and tests are unreliable. See
   # http://openradar.appspot.com/10207999 and similar issues
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
new file mode 100644
index 00000000000..520158b30ad
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -0,0 +1,150 @@
+{ stdenv, fetchurl, xar, gzip, cpio }:
+
+let
+  # I'd rather not "export" this, since they're somewhat monolithic and encourage bad habits.
+  # Also, the include directory inside here should be captured (almost?) entirely by our more
+  # precise Apple package structure, so with any luck it's unnecessary.
+  sdk = stdenv.mkDerivation rec {
+    version = "10.9";
+    name    = "MacOS_SDK-${version}";
+
+    src = fetchurl {
+      url    = "http://swcdn.apple.com/content/downloads/27/02/031-06182/xxog8vxu8i6af781ivf4uhy6yt1lslex34/DevSDK_OSX109.pkg";
+      sha256 = "16b7aplha5573yl1d44nl2yxzp0w2hafihbyh7930wrcvba69iy4";
+    };
+
+    buildInputs = [ xar gzip cpio ];
+
+    phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+    unpackPhase = ''
+      xar -x -f $src
+    '';
+
+    installPhase = ''
+      start="$(pwd)"
+      mkdir -p $out
+      cd $out
+      cat $start/Payload | gzip -d | cpio -idm
+
+      mv usr/* .
+      rmdir usr
+
+      mv System/* .
+      rmdir System
+
+      cd Library/Frameworks/QuartzCore.framework/Versions/A/Headers
+      for file in CI*.h; do
+        rm $file
+        ln -s ../Frameworks/CoreImage.framework/Versions/A/Headers/$file
+      done
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Apple SDK ${version}";
+      maintainers = with maintainers; [ copumpkin ];
+      platforms   = platforms.darwin;
+    };
+  };
+
+  framework = name: deps: stdenv.mkDerivation {
+    name = "apple-framework-${name}";
+
+    phases = [ "installPhase" "fixupPhase" ];
+
+    installPhase = ''
+      linkFramework() {
+        local path="$1"
+        local dest="$out/Library/Frameworks/$path"
+        local name="$(basename "$path" .framework)"
+        local current="$(readlink "/System/Library/Frameworks/$path/Versions/Current")"
+
+        mkdir -p "$dest"
+        pushd "$dest" >/dev/null
+
+        ln -s "${sdk}/Library/Frameworks/$path/Versions/$current/Headers"
+        ln -s -L "/System/Library/Frameworks/$path/Versions/$current/$name"
+        ln -s -L "/System/Library/Frameworks/$path/Versions/$current/Resources"
+
+        if [ -f "/System/Library/Frameworks/$path/module.map" ]; then
+          ln -s "/System/Library/Frameworks/$path/module.map"
+        fi
+
+        pushd "${sdk}/Library/Frameworks/$path/Versions/$current" >/dev/null
+        local children=$(echo Frameworks/*.framework)
+        popd >/dev/null
+
+        for child in $children; do
+          childpath="$path/Versions/$current/$child"
+          linkFramework "$childpath"
+        done
+
+        if [ -d "$dest/Versions/$current" ]; then
+          mv $dest/Versions/$current/* .
+        fi
+
+        popd >/dev/null
+      }
+
+      linkFramework "${name}.framework"
+    '';
+
+    propagatedBuildInputs = deps;
+
+    # Not going to bother being more precise than this...
+    __propagatedImpureHostDeps = [ "/System/Library/Frameworks/${name}.framework/Versions" ];
+
+    meta = with stdenv.lib; {
+      description = "Apple SDK framework ${name}";
+      maintainers = with maintainers; [ copumpkin ];
+      platforms   = platforms.darwin;
+    };
+  };
+in rec {
+  libs = {
+    xpc = stdenv.mkDerivation {
+      name   = "apple-lib-xpc";
+      phases = [ "installPhase" "fixupPhase" ];
+
+      installPhase = ''
+        mkdir -p $out/include
+        pushd $out/include >/dev/null
+        ln -s "${sdk}/include/xpc"
+        popd >/dev/null
+      '';
+    };
+
+    Xplugin = stdenv.mkDerivation {
+      name   = "apple-lib-Xplugin";
+      phases = [ "installPhase" "fixupPhase" ];
+
+      # Not enough
+      __propagatedImpureHostDeps = [ "/usr/lib/libXplugin.1.dylib" ];
+
+      propagatedBuildInputs = with frameworks; [
+        OpenGL ApplicationServices Carbon IOKit CoreFoundation CoreGraphics CoreServices CoreText
+      ];
+
+      installPhase = ''
+        mkdir -p $out/include $out/lib
+        ln -s "${sdk}/include/Xplugin.h" $out/include/Xplugin.h
+        ln -s "/usr/lib/libXplugin.1.dylib" $out/lib/libXplugin.dylib
+      '';
+    };
+
+    utmp = stdenv.mkDerivation {
+      name   = "apple-lib-utmp";
+      phases = [ "installPhase" "fixupPhase" ];
+
+      installPhase = ''
+        mkdir -p $out/include
+        pushd $out/include >/dev/null
+        ln -s "${sdk}/include/utmp.h"
+        ln -s "${sdk}/include/utmpx.h"
+        popd >/dev/null
+      '';
+    };
+  };
+
+  frameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix { inherit frameworks libs; });
+}
diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
new file mode 100644
index 00000000000..60ed091a1e4
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
@@ -0,0 +1,119 @@
+# Current as of 10.9
+# Epic weird knot-tying happening here.
+# TODO: clean up the process for generating this and include it
+
+{ frameworks, libs }:
+
+with frameworks; with libs; {
+  AGL                     = [ Carbon OpenGL ];
+  AVFoundation            = [ ApplicationServices CoreGraphics ];
+  AVKit                   = [];
+  Accounts                = [];
+  AddressBook             = [ Carbon CoreFoundation ];
+  AppKit                  = [ QuartzCore ];
+  AppKitScripting         = [];
+  AppleScriptKit          = [];
+  AppleScriptObjC         = [];
+  AppleShareClientCore    = [ CoreServices ];
+  AudioToolbox            = [ AudioUnit CoreAudio CoreFoundation CoreMIDI ];
+  AudioUnit               = [ Carbon CoreAudio CoreFoundation ];
+  AudioVideoBridging      = [ Foundation ];
+  Automator               = [];
+  CFNetwork               = [ CoreFoundation ];
+  CalendarStore           = [];
+  Cocoa                   = [];
+  Collaboration           = [];
+  CoreAudio               = [ CoreFoundation IOKit ];
+  CoreAudioKit            = [ AudioUnit ];
+  CoreData                = [];
+  CoreFoundation          = [];
+  CoreGraphics            = [ CoreFoundation IOKit IOSurface ];
+  CoreLocation            = [];
+  CoreMIDI                = [ CoreFoundation ];
+  CoreMIDIServer          = [];
+  CoreMedia               = [ ApplicationServices AudioToolbox CoreAudio CoreFoundation CoreGraphics CoreVideo ];
+  CoreMediaIO             = [ CoreFoundation CoreMedia ];
+  CoreText                = [ CoreFoundation CoreGraphics ];
+  CoreVideo               = [ ApplicationServices CoreFoundation CoreGraphics IOSurface OpenGL ];
+  CoreWLAN                = [];
+  DVComponentGlue         = [ CoreServices QuickTime ];
+  DVDPlayback             = [];
+  DirectoryService        = [ CoreFoundation ];
+  DiscRecording           = [ CoreFoundation CoreServices IOKit ];
+  DiscRecordingUI         = [];
+  DiskArbitration         = [ CoreFoundation IOKit ];
+  DrawSprocket            = [ Carbon ];
+  EventKit                = [];
+  ExceptionHandling       = [];
+  FWAUserLib              = [];
+  ForceFeedback           = [ CoreFoundation IOKit ];
+  Foundation              = [ CoreFoundation Security ApplicationServices AppKit ];
+  GLKit                   = [ CoreFoundation ];
+  GLUT                    = [ GL OpenGL ];
+  GSS                     = [];
+  GameController          = [];
+  GameKit                 = [ Foundation ];
+  ICADevices              = [ Carbon CoreFoundation IOBluetooth ];
+  IMServicePlugIn         = [];
+  IOBluetoothUI           = [ IOBluetooth ];
+  IOKit                   = [ CoreFoundation ];
+  IOSurface               = [ CoreFoundation IOKit xpc ];
+  ImageCaptureCore        = [];
+  ImageIO                 = [ CoreFoundation CoreGraphics ];
+  InputMethodKit          = [ Carbon ];
+  InstallerPlugins        = [];
+  InstantMessage          = [];
+  JavaFrameEmbedding      = [];
+  JavaScriptCore          = [ CoreFoundation ];
+  Kerberos                = [];
+  Kernel                  = [ CoreFoundation IOKit ];
+  LDAP                    = [];
+  LatentSemanticMapping   = [ Carbon CoreFoundation ];
+  MapKit                  = [];
+  MediaAccessibility      = [ CoreFoundation CoreGraphics CoreText QuartzCore ];
+  MediaToolbox            = [ AudioToolbox CoreFoundation CoreMedia ];
+  NetFS                   = [ CoreFoundation ];
+  OSAKit                  = [ Carbon ];
+  OpenAL                  = [];
+  OpenCL                  = [ CL IOSurface OpenGL ];
+  OpenGL                  = [];
+  PCSC                    = [];
+  PreferencePanes         = [];
+  PubSub                  = [];
+  Python                  = [ ApplicationServices ];
+  QTKit                   = [ QuickTime ];
+  QuickLook               = [ ApplicationServices CoreFoundation ];
+  QuickTime               = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ];
+  Ruby                    = [];
+  RubyCocoa               = [];
+  SceneKit                = [];
+  ScreenSaver             = [];
+  Scripting               = [];
+  ScriptingBridge         = [];
+  Security                = [ CoreFoundation ];
+  SecurityFoundation      = [];
+  SecurityInterface       = [ Security ];
+  ServiceManagement       = [ CoreFoundation Security ];
+  Social                  = [];
+  SpriteKit               = [];
+  StoreKit                = [];
+  SyncServices            = [];
+  SystemConfiguration     = [ CoreFoundation Security ];
+  TWAIN                   = [ Carbon ];
+  Tcl                     = [];
+  Tk                      = [ ApplicationServices Carbon X11 ];
+  VideoDecodeAcceleration = [ CoreFoundation CoreVideo ];
+  VideoToolbox            = [ CoreFoundation CoreMedia CoreVideo ];
+  WebKit                  = [ ApplicationServices Carbon JavaScriptCore OpenGL X11 ];
+
+  # Umbrellas
+  Accelerate          = [ CoreGraphics ];
+  ApplicationServices = [ CoreFoundation CoreServices CoreText ImageIO ];
+  Carbon              = [ ApplicationServices CoreFoundation CoreServices IOKit Security ];
+  CoreServices        = [ CFNetwork CoreFoundation DiskArbitration Security ];
+  IOBluetooth         = [ IOKit ];
+  JavaVM              = [];
+  OpenDirectory       = [ CoreFoundation Foundation ];
+  Quartz              = [ QuickLook ];
+  QuartzCore          = [ ApplicationServices CoreFoundation CoreVideo ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2cd659a5e75..8daac14761f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9235,6 +9235,8 @@ let
     cmdline_sdk   = cmdline.sdk;
     cmdline_tools = cmdline.tools;
 
+    apple_sdk = callPackage ../os-specific/darwin/apple-sdk {};
+
     libobjc = apple-source-releases.objc4;
   };
 

From 72737118fd1bee5ea05987725e46f0aefdd10503 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sat, 20 Jun 2015 15:29:49 -0700
Subject: [PATCH 1419/2322] darwin purity: libuv

---
 pkgs/development/libraries/libuv/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix              | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 08a969033db..fc61b79bb28 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }:
+{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, CoreServices }:
 
 let
   stable = "stable";
@@ -59,7 +59,8 @@ let
   mkWithAutotools = stability: version: sha256: stdenv.mkDerivation {
     name = mkName stability version;
     src = mkSrc version sha256;
-    buildInputs = [ automake autoconf libtool pkgconfig ];
+    buildInputs = [ automake autoconf libtool pkgconfig ]
+      ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
     preConfigure = ''
       LIBTOOLIZE=libtoolize ./autogen.sh
     '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8daac14761f..d7bc21e38d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7177,6 +7177,7 @@ let
 
   libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv {
     automake = automake113x; # fails with 14
+    inherit (darwin.apple_sdk.frameworks) CoreServices;
   });
 
   libuv = libuvVersions.v1_6_1;

From 542d20384fd423caa3a40f358debe52671877eb9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 21 Jun 2015 00:45:38 +0200
Subject: [PATCH 1420/2322] Isabelle: fix download URL

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

diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix
index 88bbe820e2f..97534b0ddd3 100644
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@@ -12,11 +12,11 @@ stdenv.mkDerivation {
 
   src = if stdenv.isDarwin
     then fetchurl {
-      url = http://isabelle.in.tum.de/dist/Isabelle2014_macos.tar.gz;
+      url = http://isabelle.in.tum.de/website-Isabelle2014/dist/Isabelle2014_macos.tar.gz;
       sha256 = "1aa3vz2nnkkyd4mlsqbs69jqfxlll5h0k5fj9m1j9wqiddqwvwcf";
     }
     else fetchurl {
-      url = http://isabelle.in.tum.de/dist/Isabelle2014_linux.tar.gz;
+      url = http://isabelle.in.tum.de/website-Isabelle2014/dist/Isabelle2014_linux.tar.gz;
       sha256 = "0z81pwwllavka4r57fx6yi9kbpbb9xbanp8dsjix49qpyj2a72jy";
     };
 

From 0d6ef780c7dd6be8452b82329d4b2d5d8aec8fb3 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 21 Jun 2015 06:47:40 +0200
Subject: [PATCH 1421/2322] attic: 0.15 -> 0.16

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

diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix
index fba7a28eded..e0428193687 100644
--- a/pkgs/tools/backup/attic/default.nix
+++ b/pkgs/tools/backup/attic/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchzip, python3Packages, openssl, acl }:
 
 python3Packages.buildPythonPackage rec {
-  name = "attic-0.15";
+  name = "attic-${version}";
+  version = "0.16";
   namePrefix = "";
 
   src = fetchzip {
     name = "${name}-src";
-    url = "https://github.com/jborg/attic/archive/0.15.tar.gz";
-    sha256 = "0c5rsxxcg897a619cbv75hzi1ahpkym8dccf6y3jlcs98z11vm5d";
+    url = "https://github.com/jborg/attic/archive/${version}.tar.gz";
+    sha256 = "008566hhsd3ck70ql0fdn4vaqjfcnf493gwd49d6294f8r7qn06z";
   };
 
   propagatedBuildInputs = with python3Packages;
@@ -18,8 +19,8 @@ python3Packages.buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A deduplication backup program";
-    homepage = "https://attic-backup.org";
+    description = "A deduplicating backup program";
+    homepage = https://attic-backup.org;
     license = licenses.bsd3;
     maintainers = [ maintainers.wscott ];
     platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage

From f4d876f73c4cc67f03d1e5529c8db4a6087ab7fe Mon Sep 17 00:00:00 2001
From: "Travis B. Hartwell" <nafai@travishartwell.net>
Date: Sat, 20 Jun 2015 23:30:09 -0600
Subject: [PATCH 1422/2322] i3-py: init at 0.6.4

Extract i3-py from i3minator so it can be installed on its own.
---
 pkgs/tools/misc/i3minator/default.nix | 17 ++---------------
 pkgs/top-level/python-packages.nix    | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix
index 02b80493654..0c3907b89bf 100644
--- a/pkgs/tools/misc/i3minator/default.nix
+++ b/pkgs/tools/misc/i3minator/default.nix
@@ -1,19 +1,6 @@
 { stdenv, fetchurl, buildPythonPackage, pythonPackages, python }:
 
-let
-  i3-py = buildPythonPackage rec {
-    version = "0.6.4";
-    name = "i3-py-${version}";
-
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/source/i/i3-py/i3-py-${version}.tar.gz";
-      sha256 = "1sgl438jrb4cdyl7hbc3ymwsf7y3zy09g1gh7ynilxpllp37jc8y";
-    };
-
-    # no tests in tarball
-    doCheck = false;
-  };
-in buildPythonPackage rec {
+buildPythonPackage rec {
   name = "i3minator-${version}";
   version = "0.0.4";
 
@@ -22,7 +9,7 @@ in buildPythonPackage rec {
     sha256 = "11dn062788kwfs8k2ry4v8zr2gn40r6lsw770s9g2gvhl5n469dw";
   };
 
-  propagatedBuildInputs = [ pythonPackages.pyyaml i3-py ];
+  propagatedBuildInputs = [ pythonPackages.pyyaml pythonPackages.i3-py ];
 
   meta = with stdenv.lib; {
     description = "i3 project manager similar to tmuxinator";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6e6e9d4ddc2..de5afad6c47 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3410,6 +3410,26 @@ let
     };
   };
 
+  i3-py = buildPythonPackage rec {
+    version = "0.6.4";
+    name = "i3-py-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/i/i3-py/i3-py-${version}.tar.gz";
+      sha256 = "1sgl438jrb4cdyl7hbc3ymwsf7y3zy09g1gh7ynilxpllp37jc8y";
+    };
+
+    # no tests in tarball
+    doCheck = false;
+
+    meta = {
+      description = "tools for i3 users and developers";
+      homepage =  "https://github.com/ziberna/i3-py";
+      license = licenses.gpl3;
+      platforms = platforms.linux;
+    };
+  };
+
   jsonpatch = buildPythonPackage rec {
     name = "jsonpatch-1.8";
 

From 2959f193a9fa9a0fed0db6dc87b8463e4e11eb39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 21 Jun 2015 09:22:39 +0200
Subject: [PATCH 1423/2322] update flash player
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 48b41f0e9524db37f45818f71aa7b55a9c462900)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 .../browsers/mozilla-plugins/flashplayer-11/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index 79d95571f2f..e736c90d6bb 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -36,7 +36,7 @@
 
 let
   # -> http://get.adobe.com/flashplayer/
-  version = "11.2.202.460";
+  version = "11.2.202.466";
 
   src =
     if stdenv.system == "x86_64-linux" then
@@ -47,7 +47,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "152hhxismgvz6hkh5m8z5x1drpwflymd2zk3v96nszpkb2xxirnr";
+        sha256 = "1clwfhq57gck638sj7i19gxar1z5ks2zfdw1p9iln515a57ik158";
       }
     else if stdenv.system == "i686-linux" then
       if debug then
@@ -60,7 +60,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "15655c3kzk1mk00737wgc52i4zz5jh9fkjgjs747qwiik5pnh7x1";
+        sha256 = "1vzxai3b6d7xs34h7qj1nal9i7vvnv6k7rb37rqxaiv2yf58nw9h";
       }
     else throw "Flash Player is not supported on this platform";
 

From 6f3729e3b31a16c3c8d8ecde78bf0a715675e24f Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sun, 21 Jun 2015 00:56:26 -0700
Subject: [PATCH 1424/2322] darwin purity: nodejs

---
 pkgs/development/web/nodejs/default.nix | 17 +++++++++--------
 pkgs/top-level/all-packages.nix         |  5 ++++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index f91a7c3b41d..8162dc4a8c5 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
-, pkgconfig, runCommand, which, unstableVersion ? false
+, pkgconfig, runCommand, which, libtool, unstableVersion ? false
 }:
 
 # nodejs 0.12 can't be built on armv5tel. Armv6 with FPU, minimum I think.
@@ -7,11 +7,6 @@
 assert stdenv.system != "armv5tel-linux";
 
 let
-  dtrace = runCommand "dtrace-native" {} ''
-    mkdir -p $out/bin
-    ln -sv /usr/sbin/dtrace $out/bin
-  '';
-
   version = "0.12.0";
 
   deps = {
@@ -39,7 +34,7 @@ in stdenv.mkDerivation {
     sha256 = "0cifd2qhpyrbxx71a4hsagzk24qas8m5zvwcyhx69cz9yhxf404p";
   };
 
-  configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);
+  configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];
 
   prePatch = ''
     sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure
@@ -51,11 +46,17 @@ in stdenv.mkDerivation {
     (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch})
   '' else null;
 
+  preBuild = if stdenv.isDarwin then ''
+    patchShebangs .
+  '' else null;
+
   buildInputs = [ python which ]
     ++ (optional stdenv.isLinux utillinux)
-    ++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ];
+    ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ];
   setupHook = ./setup-hook.sh;
 
+  enableParallelBuilding = true;
+
   passthru.interpreterName = "nodejs";
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7bc21e38d8..ea8e18f77f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1952,7 +1952,10 @@ let
 
   ninka = callPackage ../development/tools/misc/ninka { };
 
-  nodejs-0_12 = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; };
+  nodejs-0_12 = callPackage ../development/web/nodejs {
+    libuv = libuvVersions.v1_2_0;
+    libtool = darwin.cctools;
+  };
   nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; };
   nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { };
 

From 26da697f73d6c459c9558be1e4267b8c51a8e35e Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sun, 21 Jun 2015 00:56:48 -0700
Subject: [PATCH 1425/2322] darwin purity: libuv, again

---
 pkgs/development/libraries/libuv/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix              | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index fc61b79bb28..5ef7b3e6a27 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, CoreServices }:
+{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig
+
+, ApplicationServices, CoreServices }:
 
 let
   stable = "stable";
@@ -60,7 +62,7 @@ let
     name = mkName stability version;
     src = mkSrc version sha256;
     buildInputs = [ automake autoconf libtool pkgconfig ]
-      ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
+      ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
     preConfigure = ''
       LIBTOOLIZE=libtoolize ./autogen.sh
     '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea8e18f77f4..68bfd571ce4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7180,7 +7180,7 @@ let
 
   libuvVersions = recurseIntoAttrs (callPackage ../development/libraries/libuv {
     automake = automake113x; # fails with 14
-    inherit (darwin.apple_sdk.frameworks) CoreServices;
+    inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
   });
 
   libuv = libuvVersions.v1_6_1;

From d28e5f1c61e160ddc8bcdc93b11c4cda0f7a9a91 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sun, 21 Jun 2015 00:57:17 -0700
Subject: [PATCH 1426/2322] fix ncurses pkgconfig path a final time

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

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 7315d0679bb..15e711b096b 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -30,7 +30,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
 
-  preConfigure = lib.optionalString stdenv.isCygwin ''
+  preConfigure = ''
+    export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig"
+    mkdir -p "$PKG_CONFIG_LIBDIR"
+  '' + lib.optionalString stdenv.isCygwin ''
     sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure
   '';
 
@@ -40,11 +43,6 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
-  # The install expects the pkgconfig directory to exist in 5.9
-  preInstall = ''
-    mkdir -p "$out/lib/pkgconfig"
-  '';
-
   # When building a wide-character (Unicode) build, create backward
   # compatibility links from the the "normal" libraries to the
   # wide-character libraries (e.g. libncurses.so to libncursesw.so).

From 3af62f18f2e78ae312486862e20959086e10f5ce Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sun, 21 Jun 2015 00:57:41 -0700
Subject: [PATCH 1427/2322] darwin purity: haskell-system-fileio

---
 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 32098b0c7db..0ea34e55cb8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -194,6 +194,7 @@ self: super: {
   # on darwin: https://github.com/NixOS/cabal2nix/issues/146
   hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
 
+  # hfsevents needs CoreServices in scope
   hfsevents = if pkgs.stdenv.isDarwin
     then addBuildTool super.hfsevents pkgs.darwin.apple_sdk.frameworks.CoreServices
     else super.hfsevents;
@@ -202,6 +203,9 @@ self: super: {
   # http://openradar.appspot.com/10207999 and similar issues
   fsnotify = if pkgs.stdenv.isDarwin then dontCheck super.fsnotify else super.fsnotify;
 
+  # the system-fileio tests use canonicalizePath, which fails in the sandbox
+  system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio;
+
   # Prevents needing to add security_tool as a build tool to all of x509-system's
   # dependencies.
   # TODO: use pkgs.darwin.security_tool once we can build it

From c779fe98043ee2123fa36187837423469d0cbc50 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sun, 21 Jun 2015 00:57:50 -0700
Subject: [PATCH 1428/2322] darwin purity: haskell-double-conversion

---
 .../development/haskell-modules/configuration-common.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0ea34e55cb8..bc9cfe8173b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -216,6 +216,15 @@ self: super: {
     '';
   });
 
+  double-conversion = if !pkgs.stdenv.isDarwin
+    then super.double-conversion
+    else overrideCabal super.double-conversion (drv:
+      {
+        patchPhase = ''
+          substituteInPlace double-conversion.cabal --replace stdc++ c++
+        '';
+      });
+
   # Does not compile: "fatal error: ieee-flpt.h: No such file or directory"
   base_4_8_0_0 = markBroken super.base_4_8_0_0;
 

From 08bdb6fe6d6403252bccc1719e6c8c56de1ca4d4 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 21 Jun 2015 10:37:41 +0200
Subject: [PATCH 1429/2322] calibre: update from 2.30.0 to 2.31.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 b5dbfe207fe..fe6a3932af9 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-2.30.0";
+  name = "calibre-2.31.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "1k2rpn06nfzqjy5k6fh8pwfj8vbhpn7rgkpkkpz5n2fqg3z8ph1j";
+    sha256 = "1414c324alvgwbiszalklck1kay41yca2wnm488imr2768fihzkz";
   };
 
   inherit python;

From de76ce46e68c4d0a3d1b52530de6c1ded4b825bd Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 19 Jun 2015 19:10:20 +0200
Subject: [PATCH 1430/2322] rtv: 1.2.2 -> 1.4

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

diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 30ce67a82f6..d79ef187377 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchurl, pkgs, python, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "1.2.2";
+  version = "1.4";
   name = "rtv-${version}";
 
   src = fetchurl {
     url = "https://github.com/michael-lazar/rtv/archive/v${version}.tar.gz";
-    sha256 = "0pisairv28lhqvq8zs0whz3ww8fraj98941kk5idyxadbq0icmk3";
+    sha256 = "0qi45was70p3z15pnh25hkbliya440jldlzmpasqvbdy9zdgpv0w";
   };
 
   propagatedBuildInputs = with pythonPackages; [
     requests
     six
     praw
+    kitchen
     python.modules.curses
   ];
 

From ef50db91f7327fa0a333431dfb274d567b6715f0 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Sun, 21 Jun 2015 13:23:38 +0200
Subject: [PATCH 1431/2322] rtv: Add jgeerds to maintainers

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

diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index d79ef187377..a94308a65ad 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -17,12 +17,10 @@ pythonPackages.buildPythonPackage rec {
     python.modules.curses
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/michael-lazar/rtv;
     description = "Browse Reddit from your Terminal";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ matthiasbeyer jgeerds ];
   };
 }
-
-

From 563167bbe73a7be4e6269db4e4a2c39121c623fc Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 7 Mar 2015 15:48:35 +0100
Subject: [PATCH 1432/2322] tasknc: init at 0.8

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

diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix
new file mode 100644
index 00000000000..f7460618d96
--- /dev/null
+++ b/pkgs/applications/misc/tasknc/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, taskwarrior, perl, ncurses }:
+
+stdenv.mkDerivation rec {
+  version = "0.8";
+  name = "tasknc-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/mjheagle8/tasknc/archive/v${version}.tar.gz";
+    sha256 = "0max5schga9hmf3vfqk2ic91dr6raxglyyjcqchzla280kxn5c28";
+  };
+
+  #
+  # I know this is ugly, but the Makefile does strange things in this package,
+  # so we have to:
+  #
+  #   1. Remove the "doc" task dependency from the "all" target
+  #   2. Remove the "tasknc.1" task dependency from the "install" target
+  #   3. Remove the installing of the tasknc.1 file from the install target as
+  #      we just removed the build target for it.
+  #
+  # TODO : One could also provide a patch for the doc/manual.pod file so it
+  # actually builds, but I'm not familiar with this, so this is the faster
+  # approach for me. We have no manpage, though.
+  #
+  preConfigure = ''
+    sed -i -r 's,(all)(.*)doc,\1\2,' Makefile
+    sed -i -r 's,(install)(.*)tasknc\.1,\1\2,' Makefile
+    sed -i -r 's,install\ -D\ -m644\ tasknc\.1\ (.*),,' Makefile
+  '';
+
+  installPhase = ''
+    mkdir $out/bin/ -p
+    mkdir $out/share/man1 -p
+    mkdir $out/share/tasknc -p
+    DESTDIR=$out PREFIX= MANPREFIX=share make install
+  '';
+
+  buildInputs = [ taskwarrior perl ncurses ];
+
+  meta = {
+    homepage = "https://github.com/mjheagle8/tasknc";
+    description = "a ncurses wrapper around taskwarrior";
+    maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
+    platforms = stdenv.lib.platforms.linux; # Cannot test others
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 552694be44c..afecd3b7433 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12576,6 +12576,8 @@ let
 
   taskjuggler = callPackage ../applications/misc/taskjuggler { };
 
+  tasknc = callPackage ../applications/misc/tasknc { };
+
   taskwarrior = callPackage ../applications/misc/taskwarrior { };
 
   taskserver = callPackage ../servers/misc/taskserver { };

From ef22e1157bfa33e47c11e5134b85af0244046998 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sun, 21 Jun 2015 15:29:30 +0300
Subject: [PATCH 1433/2322] CONTRIBUTING.md: fix examples

---
 CONTRIBUTING.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 195d1ae6d0a..76343b0434f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,10 +30,10 @@
         Additional information.
         ```
   * Examples:
-    * `foo-pkg: init at 2.0.1`
-    * `bar-pkg: update 3.0 -> 3.1.1`
-    * `lala-service: add bazBaz option`
-    * `tata-service: refactor config generation`
+    * `nginx: init at 2.0.1`
+    * `firefox: update 3.0 -> 3.1.1`
+    * `hydra service: add bazBaz option`
+    * `nginx service: refactor config generation`
 * Test your changes. If you work with 
   * nixpkgs
     * update pkg -> 

From 75f4709fe3835d56cee1860696fa421d96165b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 21 Jun 2015 14:37:54 +0200
Subject: [PATCH 1434/2322] CONTRIBUTING.md: mostly style fixes

---
 CONTRIBUTING.md | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 76343b0434f..af89187af29 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,15 +3,16 @@
 ## Opening issues
 
 * Make sure you have a [GitHub account](https://github.com/signup/free)
-* Submit a ticket for your issue, assuming one does not already exist.
-  * Clearly describe the issue including steps to reproduce when it is a bug.
+* [Submit an issue](https://github.com/NixOS/nixpkgs/issues) - assuming one does not already exist
+  * Clearly describe the issue including steps to reproduce when it is a bug
+  * Include information what version of nixpkgs and Nix are you using (nixos-version or git revision)
 
 ## Making patches
 
 * Read [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/)
 * Fork the repository on GitHub.
 * Create a branch for your future fix.
-  * You can make branch from a commit of your local `nixos-version`. That will help you to avoid additional local compilations. Because you will recieve some packages from cache server.
+  * You can make branch from a commit of your local `nixos-version`. That will help you to avoid additional local compilations. Because you will recieve packages from binary cache.
     * For example: `nixos-version` returns `15.05.git.0998212 (Dingo)`. So you can do:
 
         ```bash
@@ -20,22 +21,22 @@
         ```
   * Please avoid working directly on the `master` branch.
 * Make commits of logical units. 
-  * If you removed pkgs, made some major changes etc., write about them in `nixos/doc/manual/release-notes/rl-unstable.xml`.
+  * If you removed pkgs, made some major NixOS changes etc., write about them in `nixos/doc/manual/release-notes/rl-unstable.xml`.
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * Format the commit in a following way:
 
         ```
-        (pkg-name | service-name): (update from -> to | init at version | refactor | etc)
+        (pkg-name | service-name): (from -> to | init at version | refactor | etc)
 
         Additional information.
         ```
   * Examples:
     * `nginx: init at 2.0.1`
-    * `firefox: update 3.0 -> 3.1.1`
+    * `firefox: 3.0 -> 3.1.1`
     * `hydra service: add bazBaz option`
     * `nginx service: refactor config generation`
 * Test your changes. If you work with 
-  * nixpkgs
+  a) nixpkgs
     * update pkg -> 
       * `nix-env -i pkg-name -f <path to your local nixpkgs folder>`
     * add pkg -> 
@@ -44,8 +45,8 @@
     * _If you don't want to install pkg in you profile_. 
       * `nix-build -A pkg-attribute-name <path to your local nixpkgs folder>/default.nix` and check results in the folder `result`. It will appear in the same directory where you did `nix-build`.
     * If you did `nix-env -i pkg-name` you can do `nix-env -e pkg-name` to uninstall it from your system.
-  * nixos and its modules
-    * You can add new module to you `nixos-configuration file` (usually it's `/etc/nixos/configuration.nix`.  
+  b) NixOS and its modules
+    * You can add new module to your NixOS configuration file (usually it's `/etc/nixos/configuration.nix`.
     And do `sudo nixos-rebuild test -I nixpkgs=<path to your local nixpkgs folder> --fast`
 * If you have commits `pkg-name: oh, forgot to insert whitespace`: squash commits in this case. Use `git rebase -i`.
 * Rebase you branch against current `master`.
@@ -57,12 +58,12 @@
   * Write the title in format `(pkg-name | service): improvement`
     * If you update the pkg, write versions `from -> to`
   * Write in comment if you have tested your patch. Do not rely much on `TravisCI`.
-  * If you make an improvement, write why is it good.
+  * If you make an improvement, write about your motivation
   * Notify maintainers of the package. For example add to the message: `cc @jagajaga @domenkozar`
 
 ## Hotfixing pull requests
 
-* Make the appropriate changes in you branch.
-* Don't create additional commits.
+* Make the appropriate changes in you branch
+* Don't create additional commits
   * `git rebase`
-  * `git push --force` to your branch.
+  * `git push --force` to your branch

From eb6be740eca0907793b3b2c3ad34be3a9b2dbde8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 21 Jun 2015 14:39:46 +0200
Subject: [PATCH 1435/2322] CONTRIBUTING.md: fix style

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index af89187af29..3cc4f5619d9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,7 +36,7 @@
     * `hydra service: add bazBaz option`
     * `nginx service: refactor config generation`
 * Test your changes. If you work with 
-  a) nixpkgs
+  * nixpkgs
     * update pkg -> 
       * `nix-env -i pkg-name -f <path to your local nixpkgs folder>`
     * add pkg -> 
@@ -45,7 +45,7 @@
     * _If you don't want to install pkg in you profile_. 
       * `nix-build -A pkg-attribute-name <path to your local nixpkgs folder>/default.nix` and check results in the folder `result`. It will appear in the same directory where you did `nix-build`.
     * If you did `nix-env -i pkg-name` you can do `nix-env -e pkg-name` to uninstall it from your system.
-  b) NixOS and its modules
+  * NixOS and its modules
     * You can add new module to your NixOS configuration file (usually it's `/etc/nixos/configuration.nix`.
     And do `sudo nixos-rebuild test -I nixpkgs=<path to your local nixpkgs folder> --fast`
 * If you have commits `pkg-name: oh, forgot to insert whitespace`: squash commits in this case. Use `git rebase -i`.

From ec31bead9fc015a9df4ad8557bd96dcbe163dd81 Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sun, 21 Jun 2015 14:37:43 +0100
Subject: [PATCH 1436/2322] kpcli: 2.8 -> 3.0

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

diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix
index ca3cad5129e..58ea52bc4c0 100644
--- a/pkgs/tools/security/kpcli/default.nix
+++ b/pkgs/tools/security/kpcli/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, perl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  version = "2.8";
+  version = "3.0";
   name = "kpcli-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/kpcli/${name}.pl";
-    sha256 = "1vmj131ii3skm1dx0pmcvq19h6a94a2vjldmqlf1b3dxjvz1ld91";
+    sha256 = "1704b412f8h9cls85xcpqm9k4n5vga26r4xq9ghp4pr1hl27nywl";
   };
 
   buildInputs = [ makeWrapper perl ];

From cf44a27fc45514737e54d27c9b513a1a4d6885ff Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sun, 21 Jun 2015 18:19:46 +0300
Subject: [PATCH 1437/2322] fix argument in mkEnableOption

---
 nixos/modules/services/cluster/kubernetes.nix               | 2 +-
 nixos/modules/services/misc/confd.nix                       | 2 +-
 nixos/modules/services/misc/plex.nix                        | 2 +-
 nixos/modules/services/misc/ripple-data-api.nix             | 2 +-
 nixos/modules/services/misc/ripple-rest.nix                 | 6 +++---
 nixos/modules/services/misc/rippled.nix                     | 4 ++--
 nixos/modules/services/monitoring/das_watchdog.nix          | 2 +-
 nixos/modules/services/monitoring/grafana.nix               | 2 +-
 nixos/modules/services/monitoring/graphite.nix              | 2 +-
 nixos/modules/services/networking/consul.nix                | 2 +-
 .../modules/services/networking/docker-registry-server.nix  | 2 +-
 nixos/modules/services/networking/racoon.nix                | 2 +-
 nixos/modules/services/networking/skydns.nix                | 2 +-
 nixos/modules/virtualisation/vmware-guest.nix               | 2 +-
 14 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index a7f4ec7b008..86b8817c28c 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -324,7 +324,7 @@ in {
     };
 
     kube2sky = {
-      enable = mkEnableOption "Whether to enable kube2sky dns service.";
+      enable = mkEnableOption "kube2sky dns service";
 
       domain = mkOption  {
         description = "Kuberntes kube2sky domain under which all DNS names will be hosted.";
diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix
index 7094bb46089..98738b6497b 100644
--- a/nixos/modules/services/misc/confd.nix
+++ b/nixos/modules/services/misc/confd.nix
@@ -17,7 +17,7 @@ let
 
 in {
   options.services.confd = {
-    enable = mkEnableOption "Whether to enable confd service.";
+    enable = mkEnableOption "confd service";
 
     backend = mkOption {
       description = "Confd config storage backend to use.";
diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index f5f0a8c1816..de8bc71a271 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -9,7 +9,7 @@ in
 {
   options = {
     services.plex = {
-      enable = mkEnableOption "Enable Plex Media Server";
+      enable = mkEnableOption "Plex Media Server";
 
       # FIXME: In order for this config option to work, symlinks in the Plex
       # package in the Nix store have to be changed to point to this directory.
diff --git a/nixos/modules/services/misc/ripple-data-api.nix b/nixos/modules/services/misc/ripple-data-api.nix
index 3b281449a25..dbca56b1333 100644
--- a/nixos/modules/services/misc/ripple-data-api.nix
+++ b/nixos/modules/services/misc/ripple-data-api.nix
@@ -35,7 +35,7 @@ let
 in {
   options = {
     services.rippleDataApi = {
-      enable = mkEnableOption "Whether to enable ripple data api.";
+      enable = mkEnableOption "ripple data api";
 
       port = mkOption {
         description = "Ripple data api port";
diff --git a/nixos/modules/services/misc/ripple-rest.nix b/nixos/modules/services/misc/ripple-rest.nix
index dc07ee132fa..49520f68a50 100644
--- a/nixos/modules/services/misc/ripple-rest.nix
+++ b/nixos/modules/services/misc/ripple-rest.nix
@@ -23,9 +23,9 @@ let
 
 in {
   options.services.rippleRest = {
-    enable = mkEnableOption "Whether to enable ripple rest.";
+    enable = mkEnableOption "ripple rest";
 
-    debug = mkEnableOption "Wheter to enable debug for ripple-rest.";
+    debug = mkEnableOption "debug for ripple-rest";
 
     host = mkOption {
       description = "Ripple rest host.";
@@ -40,7 +40,7 @@ in {
     };
 
     ssl = {
-      enable = mkEnableOption "Whether to enable ssl.";
+      enable = mkEnableOption "ssl";
 
       keyPath = mkOption {
         description = "Path to the ripple rest key file.";
diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix
index 045330eb551..d940c1bc900 100644
--- a/nixos/modules/services/misc/rippled.nix
+++ b/nixos/modules/services/misc/rippled.nix
@@ -202,7 +202,7 @@ in
 
   options = {
     services.rippled = {
-      enable = mkEnableOption "Whether to enable rippled";
+      enable = mkEnableOption "rippled";
 
       package = mkOption {
 	description = "Which rippled package to use.";
@@ -373,7 +373,7 @@ in
       };
 
       statsd = {
-        enable = mkEnableOption "Whether enable statsd monitoring for rippled";
+        enable = mkEnableOption "statsd monitoring for rippled";
 
         address = mkOption {
           description = "The UDP address and port of the listening StatsD server.";
diff --git a/nixos/modules/services/monitoring/das_watchdog.nix b/nixos/modules/services/monitoring/das_watchdog.nix
index 785b4289dff..6e2653836d5 100644
--- a/nixos/modules/services/monitoring/das_watchdog.nix
+++ b/nixos/modules/services/monitoring/das_watchdog.nix
@@ -12,7 +12,7 @@ in {
   ###### interface
 
   options = {
-    services.das_watchdog.enable = mkEnableOption "Whether to enable realtime watchdog";
+    services.das_watchdog.enable = mkEnableOption "realtime watchdog";
   };
 
   ###### implementation
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index ef0cc68a535..6a1799dedc8 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -154,7 +154,7 @@ let
 
 in {
   options.services.grafana = {
-    enable = mkEnableOption "Whether to enable grafana.";
+    enable = mkEnableOption "grafana";
 
     protocol = mkOption {
       description = "Which protocol to listen.";
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index fb30daba1dc..ac0fba597a0 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -356,7 +356,7 @@ in {
     };
 
     beacon = {
-      enable = mkEnableOption "Whether to enable graphite beacon.";
+      enable = mkEnableOption "graphite beacon";
 
       config = mkOption {
         description = "Graphite beacon configuration.";
diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index 31bae628050..66838735c4d 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -104,7 +104,7 @@ in
       };
 
       alerts = {
-        enable = mkEnableOption "Whether to enable consul-alerts";
+        enable = mkEnableOption "consul-alerts";
 
         package = mkOption {
           description = "Package to use for consul-alerts.";
diff --git a/nixos/modules/services/networking/docker-registry-server.nix b/nixos/modules/services/networking/docker-registry-server.nix
index 093d20ecb16..d21bbb6a86c 100644
--- a/nixos/modules/services/networking/docker-registry-server.nix
+++ b/nixos/modules/services/networking/docker-registry-server.nix
@@ -7,7 +7,7 @@ let
 
 in {
   options.services.nodeDockerRegistry = {
-    enable = mkEnableOption "Whether to enable docker registry service.";
+    enable = mkEnableOption "docker registry service";
 
     port = mkOption {
       description = "Docker registry listening port.";
diff --git a/nixos/modules/services/networking/racoon.nix b/nixos/modules/services/networking/racoon.nix
index 00986bbbd84..9428d9112a1 100644
--- a/nixos/modules/services/networking/racoon.nix
+++ b/nixos/modules/services/networking/racoon.nix
@@ -6,7 +6,7 @@ let
   cfg = config.services.racoon;
 in {
   options.services.racoon = {
-    enable = mkEnableOption "Whether to enable racoon.";
+    enable = mkEnableOption "racoon";
 
     config = mkOption {
       description = "Contents of racoon configuration file.";
diff --git a/nixos/modules/services/networking/skydns.nix b/nixos/modules/services/networking/skydns.nix
index 2d0129d6310..045e908a3b1 100644
--- a/nixos/modules/services/networking/skydns.nix
+++ b/nixos/modules/services/networking/skydns.nix
@@ -7,7 +7,7 @@ let
 
 in {
   options.services.skydns = {
-    enable = mkEnableOption "Whether to enable skydns service.";
+    enable = mkEnableOption "skydns service";
 
     etcd = {
       machines = mkOption {
diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix
index 3f19f6a28b2..ac2415a22b5 100644
--- a/nixos/modules/virtualisation/vmware-guest.nix
+++ b/nixos/modules/virtualisation/vmware-guest.nix
@@ -8,7 +8,7 @@ let
 in
 {
   options = {
-    services.vmwareGuest.enable = mkEnableOption "Enable VMWare Guest Support";
+    services.vmwareGuest.enable = mkEnableOption "VMWare Guest Support";
   };
 
   config = mkIf cfg.enable {

From 0ba0ae752ceaac8fe97f91e3253fba0b0098c369 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sun, 21 Jun 2015 18:32:54 +0300
Subject: [PATCH 1438/2322] CONTRIBUTING.md: fix typos

---
 CONTRIBUTING.md | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3cc4f5619d9..764508ca25f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,13 +3,13 @@
 ## Opening issues
 
 * Make sure you have a [GitHub account](https://github.com/signup/free)
-* [Submit an issue](https://github.com/NixOS/nixpkgs/issues) - assuming one does not already exist
-  * Clearly describe the issue including steps to reproduce when it is a bug
-  * Include information what version of nixpkgs and Nix are you using (nixos-version or git revision)
+* [Submit an issue](https://github.com/NixOS/nixpkgs/issues) - assuming one does not already exist.
+  * Clearly describe the issue including steps to reproduce when it is a bug.
+  * Include information what version of nixpkgs and Nix are you using (nixos-version or git revision).
 
 ## Making patches
 
-* Read [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/)
+* Read [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/).
 * Fork the repository on GitHub.
 * Create a branch for your future fix.
   * You can make branch from a commit of your local `nixos-version`. That will help you to avoid additional local compilations. Because you will recieve packages from binary cache.
@@ -35,8 +35,8 @@
     * `firefox: 3.0 -> 3.1.1`
     * `hydra service: add bazBaz option`
     * `nginx service: refactor config generation`
-* Test your changes. If you work with 
-  * nixpkgs
+* Test your changes. If you work with
+  * nixpkgs:
     * update pkg -> 
       * `nix-env -i pkg-name -f <path to your local nixpkgs folder>`
     * add pkg -> 
@@ -45,25 +45,25 @@
     * _If you don't want to install pkg in you profile_. 
       * `nix-build -A pkg-attribute-name <path to your local nixpkgs folder>/default.nix` and check results in the folder `result`. It will appear in the same directory where you did `nix-build`.
     * If you did `nix-env -i pkg-name` you can do `nix-env -e pkg-name` to uninstall it from your system.
-  * NixOS and its modules
-    * You can add new module to your NixOS configuration file (usually it's `/etc/nixos/configuration.nix`.
-    And do `sudo nixos-rebuild test -I nixpkgs=<path to your local nixpkgs folder> --fast`
+  * NixOS and its modules:
+    * You can add new module to your NixOS configuration file (usually it's `/etc/nixos/configuration.nix`).
+    And do `sudo nixos-rebuild test -I nixpkgs=<path to your local nixpkgs folder> --fast`.
 * If you have commits `pkg-name: oh, forgot to insert whitespace`: squash commits in this case. Use `git rebase -i`.
 * Rebase you branch against current `master`.
 
 ## Submitting changes
 
 * Push your changes to your fork of nixpkgs.
-* Create pull request.
-  * Write the title in format `(pkg-name | service): improvement`
-    * If you update the pkg, write versions `from -> to`
+* Create pull request:
+  * Write the title in format `(pkg-name | service): improvement`.
+    * If you update the pkg, write versions `from -> to`.
   * Write in comment if you have tested your patch. Do not rely much on `TravisCI`.
-  * If you make an improvement, write about your motivation
-  * Notify maintainers of the package. For example add to the message: `cc @jagajaga @domenkozar`
+  * If you make an improvement, write about your motivation.
+  * Notify maintainers of the package. For example add to the message: `cc @jagajaga @domenkozar`.
 
 ## Hotfixing pull requests
 
-* Make the appropriate changes in you branch
-* Don't create additional commits
-  * `git rebase`
-  * `git push --force` to your branch
+* Make the appropriate changes in you branch.
+* Don't create additional commits, do
+  * `git rebase -i`
+  * `git push --force` to your branch.

From 0654e658cd7262ec1c49aa726a743668b2c1bf4f Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sun, 21 Jun 2015 18:34:33 +0300
Subject: [PATCH 1439/2322] README.md: remove graph, it doesn't work properly

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 672fc7495de..dc00a0ebd69 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,3 @@ Communication:
 
 * [Mailing list](http://lists.science.uu.nl/mailman/listinfo/nix-dev)
 * [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)
-
----
-[![Throughput Graph](https://graphs.waffle.io/nixos/nixpkgs/throughput.svg)](https://waffle.io/nixos/nixpkgs/metrics)

From 2caa1513542e0e404ffdc64c2d5dd90440289737 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 21 Jun 2015 23:00:42 +0300
Subject: [PATCH 1440/2322] bastet: Add platforms

I had initially forgotten to add this.
---
 pkgs/games/bastet/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/bastet/default.nix b/pkgs/games/bastet/default.nix
index a729a5b014f..682756c7787 100644
--- a/pkgs/games/bastet/default.nix
+++ b/pkgs/games/bastet/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     homepage = http://fph.altervista.org/prog/bastet.html;
     license = licenses.gpl3;
     maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.linux;
   };
 }

From 998036763943e73f796b46c908d80175f5015225 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Sun, 21 Jun 2015 22:06:58 +0200
Subject: [PATCH 1441/2322] ipfs: added to go-packages

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 874a5d316e6..bab63e87b30 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1676,6 +1676,19 @@ let
     };
   };
 
+  ipfs = buildGoPackage rec {
+    rev = "952dc9c60fdff27902749222fdc30164e7eea1ee";
+    name = "ipfs-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/ipfs/go-ipfs";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "ipfs";
+      repo   = "go-ipfs";
+      sha256 = "1mlilx1i77px85jag4jwpcy8fy0vv15hsmpr1d9zvcs3b7qhskqp";
+    };
+  };
+
   vanackere.ldap = buildGoPackage rec {
     rev = "e29b797d1abde6567ccb4ab56236e033cabf845a";
     name = "ldap-${stdenv.lib.strings.substring 0 7 rev}";

From 066d4d92f550a72da173d229cf641da654252884 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 21 Jun 2015 14:21:30 +0200
Subject: [PATCH 1442/2322] stress-ng -> 0.04.07

* Make semaphore stressors linux only because of timeout
* Make stress-sem conditional on STRESS_SEMAPHORE_POSIX
* stress-sem{,-sysv}: Add timeout to semaphore wait
* stress-sem{,-sysv}: ensure parent is waiting and not thrashing
* stress-sem: remove verbose timeout info, it can spam the output
---
 pkgs/tools/system/stress-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index af09b7af030..74410426010 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, attr }:
 
-let version = "0.04.06"; in
+let version = "0.04.07"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "1iwl16gzxl1gq7gkn6pwhk6ss641n11wgf37yd47jcdr5pac6z9s";
+    sha256 = "0yzh0lkjll4qwhgjlrji9n9qps4nmh10240nsyqkgr4yv3my9fi0";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 

From 30bda340f5ce1f07c2272d1eb190ec5beab0297c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 21 Jun 2015 14:27:11 +0200
Subject: [PATCH 1443/2322] python-packages: prompt_toolkit -> 0.41

Fixes:
- Emacs Control-T key binding.
- Color fix for Windows consoles.

New features:
- Allow both booleans and Filters in many places.
- `password` can be a Filter now.
---
 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 de5afad6c47..1469bfcbcfd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8945,10 +8945,10 @@ let
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "0.40";
+    version = "0.41";
 
     src = pkgs.fetchurl {
-      sha256 = "0zyp2zpbckpdhapijvg7jwli71ilhp02awn99ly70q3l1f44m9dj";
+      sha256 = "0s8zsa06vbs8n959ri2cc2fk5dkxjfr0zabqzjvx7klasxwzmsra";
       url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
     };
 

From 46b47fa2b7a85f0657ff096467cebddc5a177922 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 22 Jun 2015 00:25:02 +0200
Subject: [PATCH 1444/2322] Update perl-List-AllUtils to 0.09.

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c166457add2..76354c559ad 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5142,11 +5142,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   ListAllUtils = buildPerlPackage {
-    name = "List-AllUtils-0.03";
+    name = "List-AllUtils-0.09";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.03.tar.gz;
-      sha256 = "05d1q88pr4wgsqcla0g4kd45mxg7h9v3z3f4pv830xaviiqwq1j8";
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.09.tar.gz;
+      sha256 = "4cfe6359cc6c9f4ba0d178e223f4b468d3cf7768d645334962f05de069bdaee2";
     };
+    buildInputs = [ TestWarnings ];
     propagatedBuildInputs = [ ListMoreUtils ];
     meta = {
       description = "Combines List::Util and List::MoreUtils in one bite-sized package";

From 17402efed016b878d75f9273414190d50f02c5b1 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 21 Jun 2015 18:46:53 +0200
Subject: [PATCH 1445/2322] Update core Perl DateTime packages.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change includes the following updates:

 - DateTime 1.08 → 1.19,
 - DateTimeFormatStrptime 1.54 → 1.56,
 - DateTimeLocale 0.45 → 0.46, and
 - DateTimeTimeZone 1.63 → 1.91.
---
 pkgs/top-level/perl-packages.nix | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 76354c559ad..362aa821ca6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2250,12 +2250,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   DateTime = buildPerlModule {
-    name = "DateTime-1.08";
+    name = "DateTime-1.19";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.08.tar.gz;
-      sha256 = "0ijhb1mqrfp1pbj4r3wkpp0hdj3zg355skxdn6dsiv439fp65asf";
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.19.tar.gz;
+      sha256 = "07c8624a7827277e8eda35c77cfc6fd056bf2782238597f424ef6a6e33ed6009";
     };
-    buildInputs = [ TestFatal ];
+    buildInputs = [ TestFatal TestWarnings ];
     propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate TryTiny ];
     meta = {
       description = "A date and time object";
@@ -2382,10 +2382,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DateTimeFormatStrptime = buildPerlPackage {
-    name = "DateTime-Format-Strptime-1.54";
+    name = "DateTime-Format-Strptime-1.56";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.54.tar.gz;
-      sha256 = "00bb61b12472fb1a637ec55bbd8878db05b3aac89a67b7991b281e32896db9de";
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.56.tar.gz;
+      sha256 = "2ff69d0f5a0359aab04e7276db5bee3be10040da24fbf09de1d904e7ead78b28";
     };
     propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone ParamsValidate ];
     meta = {
@@ -2395,11 +2395,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   DateTimeLocale = buildPerlPackage {
-    name = "DateTime-Locale-0.45";
+    name = "DateTime-Locale-0.46";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-0.45.tar.gz;
-      sha256 = "8aa1b8db0baccc26ed88f8976a228d2cdf4f6ed4e10fc88c1501ecd8f3ccaf9c";
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-0.46.tar.gz;
+      sha256 = "b4ceaa0dc0b89d4eb180eb970a927cf376e3d04ef42de98de2e034cd2021348d";
     };
+    buildInputs = [ DistCheckConflicts ];
     propagatedBuildInputs = [ ListMoreUtils ParamsValidate ];
     meta = {
       homepage = http://datetime.perl.org/;
@@ -2422,13 +2423,13 @@ let self = _self // overrides; _self = with self; {
   };
 
   DateTimeTimeZone = buildPerlPackage {
-    name = "DateTime-TimeZone-1.63";
+    name = "DateTime-TimeZone-1.91";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.63.tar.gz;
-      sha256 = "02a3kyz3cyrag98b1949k19axm03fa5ri82gdc1y4lnxjvjvxkfw";
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.91.tar.gz;
+      sha256 = "0b0899a1b1a32ed3928397323a06692223688db2c3c050734e7ff4c7b231bd32";
     };
-    buildInputs = [ TestOutput ];
-    propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate ];
+    buildInputs = [ TestFatal TestRequires ];
+    propagatedBuildInputs = [ ClassSingleton ListAllUtils ModuleRuntime ParamsValidate TryTiny ];
     meta = {
       description = "Time zone object base class and factory";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From f63e764bb6bf636ddcdfb841072cdc4ef3712135 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 21 Jun 2015 22:24:03 -0400
Subject: [PATCH 1446/2322] Add buildMaven

---
 pkgs/build-support/build-maven.nix | 58 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/build-support/build-maven.nix

diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix
new file mode 100644
index 00000000000..bde95080e74
--- /dev/null
+++ b/pkgs/build-support/build-maven.nix
@@ -0,0 +1,58 @@
+{ stdenv, maven, runCommand, writeText, fetchurl, lib }:
+/* Takes an info file generated by mvn2nix
+ * (https://github.com/shlevy/mvn2nix-maven-plugin) and builds the maven
+ * project with it.
+ *
+ * repo: A local maven repository with the project's dependencies.
+ *
+ * settings: A settings.xml to pass to maven to use the repo.
+ *
+ * build: A simple build derivation that uses mvn compile and package to build
+ *        the project.
+ */
+infoFile: let
+  info = builtins.fromJSON (builtins.readFile infoFile);
+
+  repo = runCommand "maven-repository" {} ''
+    ${lib.concatStrings (map (dep: let
+      inherit (dep) url sha1 groupId artifactId version;
+
+      fetch = fetchurl { inherit url sha1; };
+    in ''
+      dir=$out/$(echo ${groupId} | sed 's|\.|/|g')/${artifactId}/${version}
+      mkdir -p $dir
+      ln -sv ${fetch} $dir/${fetch.name}
+    '') info.dependencies)}
+  '';
+
+  settings = writeText "settings.xml" ''
+    <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                          http://maven.apache.org/xsd/settings-1.0.0.xsd">
+      <localRepository>${repo}</localRepository>
+    </settings>
+  '';
+
+  src = dirOf infoFile;
+in {
+  inherit repo settings;
+
+  build = stdenv.mkDerivation {
+    name = "${info.project.artifactId}-${info.project.version}.jar";
+
+    src = builtins.filterSource (path: type:
+      (toString path) != (toString (src + "/target")) &&
+        (toString path) != (toString (src + "/.git"))
+    ) src;
+
+    buildInputs = [ maven ];
+
+    buildPhase = "mvn --offline --settings ${settings} compile";
+
+    installPhase = ''
+      mvn --offline --settings ${settings} package
+      mv target/*.jar $out
+    '';
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6d6a979185..94a6d6740ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -280,6 +280,8 @@ let
     runScript = args.runScript;
   };
 
+  buildMaven = callPackage ../build-support/build-maven.nix {};
+
   dotnetenv = import ../build-support/dotnetenv {
     inherit stdenv;
     dotnetfx = dotnetfx40;

From bd399f2647fc7858116891c1ac01f25afd7e5679 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Sun, 21 Jun 2015 21:19:17 -0700
Subject: [PATCH 1447/2322] add qt5.x11extras to obs-studio

fixes build
---
 pkgs/applications/video/obs-studio/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 67f5e11de68..894a51c58cc 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
                   libv4l
                   libxkbcommon
                   qt5.base
+                  qt5.x11extras
                   x264
                 ];
 

From 655cda730d14b7da25e23eb87ef4d42d6c32a8b8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 21 Jun 2015 22:55:10 +0200
Subject: [PATCH 1448/2322] eagle 6.5.0 -> 6.6.0

CC @bjornfor:

Version 6.5.0 has disappeared from Cadsoft's FTP site. This is the
closest version that's still available. Not extensively tested, but
works fine here.

Current version is 7.3.0. I leave that to someone more interested.
---
 pkgs/applications/science/electronics/eagle/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/electronics/eagle/default.nix b/pkgs/applications/science/electronics/eagle/default.nix
index e4cb4685f16..da4894c11a8 100644
--- a/pkgs/applications/science/electronics/eagle/default.nix
+++ b/pkgs/applications/science/electronics/eagle/default.nix
@@ -13,11 +13,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "eagle-${version}";
-  version = "6.5.0";
+  version = "6.6.0";
 
   src = fetchurl {
-    url = "ftp://ftp.cadsoft.de/eagle/program/6.5/eagle-lin-${version}.run";
-    sha256 = "17plwx2p8q2ylk0nzj5crfbdm7jc35pw7v3j8f4j81yl37l7bj22";
+    url = "ftp://ftp.cadsoft.de/eagle/program/6.6/eagle-lin-${version}.run";
+    sha256 = "0m5289daah85b2rwpivnh2z1573v6j4alzjy9hg78fkb9jdgbn0x";
   };
 
   desktopItem = makeDesktopItem {

From 3f66bb7ff2efcd1556d82c165f7e151c243539f8 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 22 Jun 2015 08:25:07 +0200
Subject: [PATCH 1449/2322] Add myself as maintainer

---
 pkgs/applications/audio/morituri/default.nix              | 2 +-
 pkgs/applications/audio/pavucontrol/default.nix           | 2 +-
 pkgs/applications/misc/keepassx/2.0.nix                   | 2 +-
 pkgs/applications/misc/keepassx/default.nix               | 2 +-
 pkgs/applications/misc/taskwarrior/default.nix            | 8 ++++----
 pkgs/applications/networking/irc/hexchat/default.nix      | 8 ++++----
 pkgs/applications/networking/mumble/default.nix           | 2 +-
 .../version-management/git-and-tools/gitflow/default.nix  | 2 +-
 pkgs/development/tools/misc/strace/default.nix            | 2 +-
 pkgs/development/tools/vagrant/default.nix                | 2 +-
 pkgs/os-specific/linux/dstat/default.nix                  | 8 ++++----
 pkgs/shells/ipython/default.nix                           | 2 +-
 pkgs/tools/filesystems/sshfs-fuse/default.nix             | 5 +++--
 pkgs/tools/misc/detox/default.nix                         | 8 +++++---
 pkgs/tools/misc/pv/default.nix                            | 2 +-
 pkgs/tools/misc/rockbox-utility/default.nix               | 2 +-
 pkgs/tools/misc/screen/default.nix                        | 2 +-
 pkgs/tools/misc/stow/default.nix                          | 2 +-
 pkgs/tools/networking/tcpdump/default.nix                 | 2 +-
 pkgs/tools/system/lshw/default.nix                        | 2 +-
 pkgs/tools/text/silver-searcher/default.nix               | 8 ++++----
 21 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix
index 6498f48351d..4dc150d0642 100644
--- a/pkgs/applications/audio/morituri/default.nix
+++ b/pkgs/applications/audio/morituri/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://thomas.apestaart.org/morituri/trac/;
     description = "A CD ripper aiming for accuracy over speed";
-    maintainers = [ maintainers.rycee ];
+    maintainers = with maintainers; [ rycee jgeerds ];
     license = licenses.gpl3Plus;
   };
 }
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index 8db0a94a990..2c6f70195b1 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
 
-    maintainers = [ maintainers.abbradar ];
+    maintainers = with maintainers; [ abbradar jgeerds ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix
index c39c72398f7..1c5f2c6e781 100644
--- a/pkgs/applications/misc/keepassx/2.0.nix
+++ b/pkgs/applications/misc/keepassx/2.0.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     description = "Qt password manager compatible with its Win32 and Pocket PC versions";
     homepage = http://www.keepassx.org/;
     license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [qknight];
+    maintainers = with stdenv.lib.maintainers; [ qknight jgeerds ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix
index fc089f4fa5b..02a299922f1 100644
--- a/pkgs/applications/misc/keepassx/default.nix
+++ b/pkgs/applications/misc/keepassx/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "Qt password manager compatible with its Win32 and Pocket PC versions";
     homepage = http://www.keepassx.org/;
     license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [qknight];
+    maintainers = with stdenv.lib.maintainers; [ qknight jgeerds ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index 20f7bfec646..7f3ca422323 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
     ln -s "../../share/doc/task/scripts/bash/task.sh" "$out/etc/bash_completion.d/"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "GTD (getting things done) implementation";
     homepage = http://taskwarrior.org;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.mit;
+    maintainers = with maintainers; [ marcweber jgeerds ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index f1cc7df1904..99e35364000 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -22,11 +22,11 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-shm" "--enable-textfe" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A popular and easy to use graphical IRC (chat) client";
     homepage = http://hexchat.github.io/;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo jgeerds ];
   };
 }
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index cd361fe7ede..4eabdadc487 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     description = "Low-latency, high quality voice chat software";
     homepage = "http://mumble.sourceforge.net/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ viric ];
+    maintainers = with maintainers; [ viric jgeerds ];
     platforms = platforms.linux;
   };
 }
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 0898345c30b..09124592f19 100644
--- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     description = "A collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model";
     license = licenses.bsd2;
     platforms = platforms.all;
-    maintainers = [ maintainers.offline ];
+    maintainers = with maintainers; [ offline jgeerds ];
   };
 }
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 43959c8a43c..07e67b558d2 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     description = "A system call tracer for Linux";
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = [ maintainers.mornfall ];
+    maintainers = with maintainers; [ mornfall jgeerds ];
   };
 }
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 84bfcce541a..16b6981fdb8 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     description = "A tool for building complete development environments";
     homepage    = http://vagrantup.com;
     license     = licenses.mit;
-    maintainers = with maintainers; [ lovek323 globin ];
+    maintainers = with maintainers; [ lovek323 globin jgeerds ];
     platforms   = platforms.linux;
   };
 
diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix
index c95532f1360..b12ed2ee6ec 100644
--- a/pkgs/os-specific/linux/dstat/default.nix
+++ b/pkgs/os-specific/linux/dstat/default.nix
@@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = "prefix=$(out)";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://dag.wieers.com/home-made/dstat/;
     description = "Versatile resource statistics tool";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jgeerds ];
   };
 }
diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix
index a9c672471a8..f53bed62e44 100644
--- a/pkgs/shells/ipython/default.nix
+++ b/pkgs/shells/ipython/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
       enhanced interactive Python shell and an architecture for
       interactive parallel computing.
     '';
-    maintainers = [ stdenv.lib.maintainers.bjornfor ];
+    maintainers = with stdenv.lib.maintainers; [ bjornfor jgeerds ];
   };
 }
diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index 98cf3c533ae..d1e33098a94 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -14,9 +14,10 @@ stdenv.mkDerivation rec {
     ln -sf $out/bin/sshfs $out/sbin/mount.sshfs
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://fuse.sourceforge.net/sshfs.html;
     description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jgeerds ];
   };
 }
diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix
index 65a0047738b..bdc018aec34 100644
--- a/pkgs/tools/misc/detox/default.nix
+++ b/pkgs/tools/misc/detox/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
 
   buildInputs = [flex];
 
-  meta = {
+  meta = with stdenv.lib; {
+    homepage = http://detox.sourceforge.net/;
     description = "Utility designed to clean up filenames";
     longDescription = ''
       Detox is a utility designed to clean up filenames. It replaces
@@ -18,7 +19,8 @@ stdenv.mkDerivation {
       equivalents. It will also clean up filenames with UTF-8 or Latin-1
       (or CP-1252) characters in them.
     '';
-    homepage = "http://detox.sourceforge.net/";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jgeerds ];
   };
 }
diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix
index a2d8c535d06..8a3aa08abb7 100644
--- a/pkgs/tools/misc/pv/default.nix
+++ b/pkgs/tools/misc/pv/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.ivarch.com/programs/pv;
     description = "Tool for monitoring the progress of data through a pipeline";
     license = stdenv.lib.licenses.artistic2;
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [ viric jgeerds ];
     platforms = with stdenv.lib.platforms; all;
   };
 }
diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix
index eac12bae381..c9c0cf6949f 100644
--- a/pkgs/tools/misc/rockbox-utility/default.nix
+++ b/pkgs/tools/misc/rockbox-utility/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation  rec {
     homepage = http://www.rockbox.org;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
+    maintainers = with maintainers; [ goibhniu jgeerds ];
   };
 }
diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index e8a39623d9a..d329106b979 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
       '';
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = with stdenv.lib.maintainers; [ simons jgeerds ];
   };
 }
diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix
index a6afe475e3b..a9d8554525b 100644
--- a/pkgs/tools/misc/stow/default.nix
+++ b/pkgs/tools/misc/stow/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl3Plus;
     homepage = http://www.gnu.org/software/stow/;
 
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+    maintainers = with stdenv.lib.maintainers; [ the-kenny jgeerds ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index 4edfdf6af1e..a50fad8b374 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "Network sniffer";
     homepage = http://www.tcpdump.org/;
     license = "BSD-style";
-    maintainers = [ stdenv.lib.maintainers.mornfall ];
+    maintainers = with stdenv.lib.maintainers; [ mornfall jgeerds ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix
index e9d8e8aabd9..02b331a36de 100644
--- a/pkgs/tools/system/lshw/default.nix
+++ b/pkgs/tools/system/lshw/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     homepage = http://ezix.org/project/wiki/HardwareLiSter;
     description = "Provide detailed information on the hardware configuration of the machine";
     license = licenses.gpl2;
-    maintainers = [ maintainers.phreedom ];
+    maintainers = with maintainers; [ phreedom jgeerds ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
index ae3bb94fb90..c26a60c5764 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -14,11 +14,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ autoreconfHook pkgconfig pcre zlib lzma ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/ggreer/the_silver_searcher/;
     description = "A code-searching tool similar to ack, but faster";
-    maintainers = [ stdenv.lib.maintainers.madjar ];
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.asl20;
+    maintainers = with maintainers; [ madjar jgeerds ];
+    platforms = platforms.all;
+    license = licenses.asl20;
   };
 }

From 3113d31070f0a0d4a1cdbad2336e32c2a2312031 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 22 Jun 2015 08:45:48 +0200
Subject: [PATCH 1450/2322] dnscrypt-proxy: Add myself as maintainer

---
 pkgs/tools/networking/dnscrypt-proxy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index c2b9638c233..e975cb1e738 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     description = "A tool for securing communications between a client and a DNS resolver";
     homepage = http://dnscrypt.org/;
     license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ joachifm ];
+    maintainers = with stdenv.lib.maintainers; [ joachifm jgeerds ];
     platforms = stdenv.lib.platforms.all;
   };
 }

From b9cebbe9b10fe3328e9d1f8656f3a7fba1ee91c4 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 22 Jun 2015 12:10:03 +0200
Subject: [PATCH 1451/2322] silver-searcher: 0.29.1 -> 0.30.0

---
 pkgs/tools/text/silver-searcher/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
index c26a60c5764..cebcd565d5b 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -1,13 +1,12 @@
-{stdenv, fetchgit, autoreconfHook, pkgconfig, pcre, zlib, lzma}:
+{stdenv, fetchurl, autoreconfHook, pkgconfig, pcre, zlib, lzma}:
 
-let release = "0.29.1"; in
-stdenv.mkDerivation {
-  name = "silver-searcher-${release}";
+stdenv.mkDerivation rec {
+  name = "silver-searcher-${version}";
+  version = "0.30.0";
 
-  src = fetchgit {
-    url = "https://github.com/ggreer/the_silver_searcher.git";
-    rev = "refs/tags/${release}";
-    sha256 = "05508c2714d356464a0de6f41a6a8408ccd861b967e968302c4b72feade89581";
+  src = fetchurl {
+    url = "https://github.com/ggreer/the_silver_searcher/archive/${version}.tar.gz";
+    sha256 = "1nx5glgd0x55z073qcaazav5sm0jfvxai2bykkldniv6z601pdm3";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

From 01e43fcd1d3f5e7b3267f40b4ab9b201926a37fc Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 22 Jun 2015 12:17:50 +0200
Subject: [PATCH 1452/2322] gitflow: 1.7.0 -> 1.8.0

---
 .../git-and-tools/gitflow/default.nix                | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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 09124592f19..99c1db20fb2 100644
--- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gitflow-${version}";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchurl {
     url = "https://github.com/petervanderdoes/gitflow/archive/${version}.tar.gz";
-    sha256 = "0rppgyqgk0drip6852bdm2479zks16cb3mj1jdw6jq80givrqnjx";
+    sha256 = "1vxdawx4sinl19g59ifmrdalmr2dl5pkgawyj9z0s5mcildi6fc2";
   };
 
   preBuild = ''
@@ -15,7 +15,13 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://github.com/petervanderdoes/gitflow;
-    description = "A collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model";
+    description = "Extend git with the Gitflow branching model";
+    longDescription = ''
+      A set of scripts that provide high-level repository operations
+      for managing feature/release/hotfix branches in a Git repository,
+      particularly suited to be utilised to follow Vincent Driessen's
+      branching model.
+    '';
     license = licenses.bsd2;
     platforms = platforms.all;
     maintainers = with maintainers; [ offline jgeerds ];

From 51fa6826559888cfc5dce2a93159b2474bf4eb1d Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 22 Jun 2015 12:28:28 +0200
Subject: [PATCH 1453/2322] hexchat: 2.9.6.1 -> 2.10.2

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

diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index 99e35364000..dfe5c3b0182 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchurl, pkgconfig, gtk, perl, python, gettext
 , libtool, pciutils, dbus_glib, libcanberra, libproxy
-, libsexy, enchant, libnotify, openssl
+, libsexy, enchant, libnotify, openssl, intltool
 , desktop_file_utils, hicolor_icon_theme
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.9.6.1";
+  version = "2.10.2";
   name = "hexchat-${version}";
 
   src = fetchurl {
     url = "http://dl.hexchat.net/hexchat/${name}.tar.xz";
-    sha256 = "0w34jr1pqril6r011fwxv40m17bnb88q9cv5hf08mv0a9lygyrv2";
+    sha256 = "0b5mw6jxa7c93nbgiwijm7j7klm6nccx6l9zyainyrbnqmjz7sw7";
   };
 
   buildInputs = [
     pkgconfig gtk perl python gettext
     libtool pciutils dbus_glib libcanberra libproxy
-    libsexy libnotify openssl
+    libsexy libnotify openssl intltool
     desktop_file_utils hicolor_icon_theme
   ];
 

From f50b2e58927dba9187e5b0cdfea94113a4aa50f9 Mon Sep 17 00:00:00 2001
From: Markus Kohlhase <mail@markus-kohlhase.de>
Date: Mon, 22 Jun 2015 12:34:00 +0200
Subject: [PATCH 1454/2322] k9copy: init at 3.0.3

---
 pkgs/applications/video/k9copy/default.nix | 53 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  4 ++
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/applications/video/k9copy/default.nix

diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix
new file mode 100644
index 00000000000..ad5dc58cbeb
--- /dev/null
+++ b/pkgs/applications/video/k9copy/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl, cmake, automoc4, kf5, dvdauthor, xineLib, libmpeg2, libav,
+libdvdread, libdvdnav, dvdplusrwtools }:
+
+stdenv.mkDerivation rec {
+  version = "3.0.3";
+  name = "k9copy-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/k9copy-reloaded/${name}.tar.gz";
+    sha256 = "0dp06rwihks50c57bbv04d6bj2qc88isl91971r4lii2xp0qn7sg";
+  };
+
+  cmakeFlags = [
+    "-DQT5_BUILD=ON"
+    "-DCMAKE_MINIMUM_REQUIRED_VERSION=3.0"
+  ];
+
+  # Hack to disable documentation
+  preConfigure = ''
+   substituteInPlace ./CMakeLists.txt \
+     --replace "add_subdirectory(doc)" ""
+  '';
+
+  buildInputs = [
+    cmake
+    dvdauthor
+    xineLib
+    libmpeg2
+    libav
+    libdvdread
+    libdvdnav
+    dvdplusrwtools
+    automoc4
+  ] ++ (with kf5; [
+    extra-cmake-modules
+    kio
+    solid
+    scope.Phonon4Qt5
+    scope.Qt5X11Extras
+    kiconthemes
+    ki18n
+    kdesu
+    kdoctools
+  ]);
+
+  meta = {
+    description = "DVD backup and DVD authoring program";
+    homepage = "http://k9copy-reloaded.sourceforge.net/";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ flosse ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94a6d6740ac..5720e029b9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6542,6 +6542,10 @@ let
     lua = lua5_1;
   };
 
+  k9copy = callPackage ../applications/video/k9copy {
+    kf5 = kf510;
+  };
+
   keybinder3 = callPackage ../development/libraries/keybinder3 {
     automake = automake111x;
   };

From e08074ff6d57890ea7c1c526e73c998d2dcdcefa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 22 Jun 2015 12:31:44 +0200
Subject: [PATCH 1455/2322] nixos: fix code that sets up /etc/postfix

The sample config files have moved from ${postfix}/share to ${postfix}/etc in
version 2.11.4.
---
 nixos/modules/services/mail/postfix.nix | 39 ++++++++++++-------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 24bcc6bb57c..d81380aac23 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -369,31 +369,30 @@ in
 
         daemonType = "fork";
 
-        preStart =
-          ''
-            if ! [ -d /var/spool/postfix ]; then
-              ${pkgs.coreutils}/bin/mkdir -p /var/spool/mail /var/postfix/conf /var/postfix/queue
-            fi
+        preStart = ''
+          if ! [ -d /var/spool/postfix ]; then
+            ${pkgs.coreutils}/bin/mkdir -p /var/spool/mail /var/postfix/conf /var/postfix/queue
+          fi
 
-            ${pkgs.coreutils}/bin/chown -R ${user}:${group} /var/postfix
-            ${pkgs.coreutils}/bin/chown -R ${user}:${setgidGroup} /var/postfix/queue
-            ${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue
-            ${pkgs.coreutils}/bin/chown root:root /var/spool/mail
-            ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
-            ${pkgs.coreutils}/bin/ln -sf /var/spool/mail /var/mail
+          ${pkgs.coreutils}/bin/chown -R ${user}:${group} /var/postfix
+          ${pkgs.coreutils}/bin/chown -R ${user}:${setgidGroup} /var/postfix/queue
+          ${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue
+          ${pkgs.coreutils}/bin/chown root:root /var/spool/mail
+          ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
+          ${pkgs.coreutils}/bin/ln -sf /var/spool/mail /var/mail
 
-            ln -sf "${pkgs.postfix}/share/postfix/conf/"* /var/postfix/conf
+          ln -sf "${pkgs.postfix}/etc/postfix/"* /var/postfix/conf
 
-            ln -sf ${aliasesFile} /var/postfix/conf/aliases
-            ln -sf ${virtualFile} /var/postfix/conf/virtual
-            ln -sf ${mainCfFile} /var/postfix/conf/main.cf
-            ln -sf ${masterCfFile} /var/postfix/conf/master.cf
+          ln -sf ${aliasesFile} /var/postfix/conf/aliases
+          ln -sf ${virtualFile} /var/postfix/conf/virtual
+          ln -sf ${mainCfFile} /var/postfix/conf/main.cf
+          ln -sf ${masterCfFile} /var/postfix/conf/master.cf
 
-            ${pkgs.postfix}/sbin/postalias -c /var/postfix/conf /var/postfix/conf/aliases
-            ${pkgs.postfix}/sbin/postmap -c /var/postfix/conf /var/postfix/conf/virtual
+          ${pkgs.postfix}/sbin/postalias -c /var/postfix/conf /var/postfix/conf/aliases
+          ${pkgs.postfix}/sbin/postmap -c /var/postfix/conf /var/postfix/conf/virtual
 
-            ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start
-          '';
+          ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start
+        '';
 
         preStop = ''
             ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf stop

From 88f4b75a00855c878624e465e1a83930aaa92858 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 22 Jun 2015 12:33:11 +0200
Subject: [PATCH 1456/2322] nixos: recipientDelimiter is no longer a valid
 configuration option in Postfix 2.11.x or later

Note that this change in Postfix might affect the mlmmj.nix service in
ways I don't fully understand.
---
 nixos/modules/services/mail/mlmmj.nix   |  1 -
 nixos/modules/services/mail/postfix.nix | 10 ----------
 2 files changed, 11 deletions(-)

diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix
index db3a266d011..1545c60f4de 100644
--- a/nixos/modules/services/mail/mlmmj.nix
+++ b/nixos/modules/services/mail/mlmmj.nix
@@ -88,7 +88,6 @@ in
 
     services.postfix = {
       enable = true;
-      recipientDelimiter= "+";
       extraMasterConf = ''
         mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L ${spoolDir}/$nextHop
       '';
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index d81380aac23..3d9bb9ccf24 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -77,8 +77,6 @@ let
       smtpd_tls_key_file = ${cfg.sslKey}
 
       smtpd_use_tls = yes
-
-      recipientDelimiter = ${cfg.recipientDelimiter}
     ''
     + optionalString (cfg.virtual != "") ''
       virtual_alias_maps = hash:/etc/postfix/virtual
@@ -291,14 +289,6 @@ in
         description = "SSL key to use.";
       };
 
-      recipientDelimiter = mkOption {
-        default = "";
-        example = "+";
-        description = "
-          Delimiter for address extension: so mail to user+test can be handled by ~user/.forward+test
-        ";
-      };
-
       virtual = mkOption {
         default = "";
         description = "

From 4ac3bc3330ec5077830fbb01a69948041f1595bf Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 24 Apr 2015 21:49:12 +0300
Subject: [PATCH 1457/2322] ckbcomp: init at 1.129

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

diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
new file mode 100644
index 00000000000..90eaef73e16
--- /dev/null
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchgit, perl, xkeyboard_config }:
+
+stdenv.mkDerivation rec {
+  name = "ckbcomp-${version}";
+  version = "1.129";
+
+  src = fetchgit {
+    url = "git://anonscm.debian.org/d-i/console-setup.git";
+    rev = "refs/tags/${version}";
+    sha256 = "1shbqnjhdmy7qwz2kwfhrdxbjw1vv98rpz1x7wlgqxr812aqcfdd";
+  };
+
+  buildInputs = [ perl ];
+
+  patchPhase = ''
+    substituteInPlace Keyboard/ckbcomp --replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb"
+    substituteInPlace Keyboard/ckbcomp --replace "rules = 'xorg'" "rules = 'base'"
+  '';
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p "$out"/bin
+    cp Keyboard/ckbcomp "$out"/bin/
+    mkdir -p "$out"/share/man/man1
+    cp man/ckbcomp.1 "$out"/share/man/man1
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Compiles a XKB keyboard description to a keymap suitable for loadkeys";
+    homepage = http://anonscm.debian.org/cgit/d-i/console-setup.git;
+    license = licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ dezgeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26aa616b4e0..f12bfab5127 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -779,6 +779,8 @@ let
 
   ccnet = callPackage ../tools/networking/ccnet { };
 
+  ckbcomp = callPackage ../tools/X11/ckbcomp { };
+
   cli53 = callPackage ../tools/admin/cli53 { };
 
   cloud-init = callPackage ../tools/virtualization/cloud-init { };

From 67f3c77fe6d7fb432243114e8814fee7f23ff5df Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 22 Jun 2015 14:38:34 +0200
Subject: [PATCH 1458/2322] simple-scan -> 3.17.3

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

diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index b96688333a2..744f789e55c 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cairo, colord, glib, gtk3, intltool, itstool, libxml2
 , makeWrapper, pkgconfig, saneBackends, systemd, vala }:
 
-let version = "3.17.2"; in
+let version = "3.17.3"; in
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
 
   src = fetchurl {
-    sha256 = "07r32hsafb8is2fs0flk7dvi5agyzf9jqs96sbgia2pizmyl1s1m";
+    sha256 = "1kb2xk4vr2nab3hfjfnfyapv2z65h99c3g7mfkmanzrng5xwrj8q";
     url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz";
   };
 
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ cairo colord glib gtk3 intltool itstool libxml2
+  buildInputs = [ cairo colord glib gtk3 libxml2
     saneBackends systemd vala ];
-  nativeBuildInputs = [ makeWrapper pkgconfig ];
+  nativeBuildInputs = [ intltool itstool makeWrapper pkgconfig ];
 
   enableParallelBuilding = true;
 

From 7c3bf186a6b5ca41f66f4edc72dd7c3187a69bb5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jun 2015 14:40:29 +0200
Subject: [PATCH 1459/2322] bash: Update to 4.3-p39

---
 pkgs/shells/bash/bash-4.3-patches.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/shells/bash/bash-4.3-patches.nix b/pkgs/shells/bash/bash-4.3-patches.nix
index 49360bd9a02..cd085f78700 100644
--- a/pkgs/shells/bash/bash-4.3-patches.nix
+++ b/pkgs/shells/bash/bash-4.3-patches.nix
@@ -34,4 +34,10 @@ patch: [
 (patch "031" "07d62bl3z7qa8v6kgk47vzzazw563mlk9zhrsr4xsbqgvmcrylnd")
 (patch "032" "0jjgapfq4qhmndfrw8c3q3lva8xjdhlbd9cc631v41b0kb95g4w8")
 (patch "033" "05ma5rlxiadnfh925p4y7s0vvk917kmsdb1mfdx05gizl63pfapv")
+(patch "034" "12gq9whkq3naa3iy7c7x5pfpvrg7d0kwqld8609zxphhy424ysgi")
+(patch "035" "1qy1jflmbazjykq766gwabkaiswnx7pwa66whqiny0w02zjqa39p")
+(patch "036" "0z6jbyy70lfdm6d3x0sbazbqdxb3xnpn9bmz7madpvrnbd284pxc")
+(patch "037" "04sqr8zkl6s5fccfvb775ppn3ldij5imria9swc39aq0fkfp1w9k")
+(patch "038" "0rv3g14mpgv8br267bf7rmgqlgwnc4v6g3g8y0sjba571i8amgmd")
+(patch "039" "1v3l3vkc3g2b6fjycqwlakr8xhiw6bmw6q0zd6bi0m0m4bnxr55b")
 ]

From fd6600c809701543afe3e3d12f5993c4849bf72c Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 22 Jun 2015 14:04:14 +0100
Subject: [PATCH 1460/2322] bluejeans: New Mozilla plugin

---
 .../mozilla-plugins/bluejeans/default.nix     | 56 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
new file mode 100644
index 00000000000..64ceebfa527
--- /dev/null
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, xorg, gtk, glib, gdk_pixbuf, dpkg, libXext, libXfixes
+, libXrender, libuuid, libXrandr, libXcomposite
+}:
+
+with stdenv.lib;
+
+let
+
+  rpathInstaller = makeLibraryPath
+    [gtk glib stdenv.cc.cc];
+
+  rpathPlugin = makeLibraryPath
+    [ stdenv.cc.cc gtk glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libuuid libXcomposite ];
+
+in
+
+stdenv.mkDerivation rec {
+  name = "bluejeans-2.100.41.8";
+
+  version = "2.100.41.8";
+
+  src = fetchurl {
+    url = "https://swdl.bluejeans.com/skinny/bjnplugin_2.100.41.8-1_amd64.deb";
+    sha256 = "013m17lpgi6nhw2df10wvrsnsjxy5n7z41ab69vj5m9h0prw9vd1";
+  };
+
+  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+  unpackPhase = "${dpkg}/bin/dpkg-deb -x $src .";
+
+  installPhase =
+    ''
+      mkdir -p $out
+      cp -R usr/lib $out/
+
+      plugins=$out/lib/mozilla/plugins
+      patchelf \
+        --set-rpath "${rpathPlugin}" \
+        $plugins/npbjnplugin_2.100.41.8.so
+
+      patchelf \
+        --set-rpath "${rpathInstaller}" \
+        $plugins/npbjninstallplugin_2.100.41.8.so
+    '';
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  passthru.mozillaPlugin = "/lib/mozilla/plugins";
+
+  meta = {
+    homepage = http://bluejeans.com;
+    license = stdenv.lib.licenses.unfree;
+    maintainers = [ stdenv.lib.maintainers.ocharles ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94a6d6740ac..9e34b1e6e05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10610,6 +10610,8 @@ let
     gtk = gtk3;
   };
 
+  bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { };
+
   bristol = callPackage ../applications/audio/bristol { };
 
   bspwm = callPackage ../applications/window-managers/bspwm { };
@@ -12939,6 +12941,7 @@ let
           ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
           ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell
           ++ lib.optional (cfg.enableTrezor or false) trezor-bridge
+          ++ lib.optional (cfg.enableBluejeans or false) bluejeans
          );
       libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)
              (with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])

From a612e397d8e85c2eedb131d558464c6782d03b47 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 22 Jun 2015 16:19:23 +0200
Subject: [PATCH 1461/2322] silver-searcher: Replace fetchurl with
 fetchFromGitHub

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

diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
index cebcd565d5b..fbd33ce68da 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -1,12 +1,14 @@
-{stdenv, fetchurl, autoreconfHook, pkgconfig, pcre, zlib, lzma}:
+{stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcre, zlib, lzma}:
 
 stdenv.mkDerivation rec {
   name = "silver-searcher-${version}";
   version = "0.30.0";
 
-  src = fetchurl {
-    url = "https://github.com/ggreer/the_silver_searcher/archive/${version}.tar.gz";
-    sha256 = "1nx5glgd0x55z073qcaazav5sm0jfvxai2bykkldniv6z601pdm3";
+  src = fetchFromGitHub {
+    owner = "ggreer";
+    repo = "the_silver_searcher";
+    rev = "${version}";
+    sha256 = "07fz0hyisy3kisisxy558lfmmjdxq03x5ljdfxfkpw0xbfwgz14j";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

From 4f4c573f9b2a9fd516f39c21a871b01a6ad4dc19 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 22 Jun 2015 17:20:00 +0200
Subject: [PATCH 1462/2322] Use gtkvnc compiled for gtk3 in gnome3

---
 pkgs/desktops/gnome-3/3.16/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index f92d09e9fe5..7387ee710d0 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -41,6 +41,7 @@ let
   cogl = pkgs.cogl_1_20;
   gtk = gtk3;
   gtkmm = gtkmm3;
+  gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };
   vala = pkgs.vala_0_26;
   gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
 

From 783af9a96056ad02e04039f50dfb23b55bca61be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 22 Jun 2015 17:33:06 +0200
Subject: [PATCH 1463/2322] wpa_supplicant: disable TLS-1.2 for now (fixes
 #8332)

---
 pkgs/os-specific/linux/wpa_supplicant/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 3cf45697129..8f8ed2541af 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     CONFIG_IEEE80211W=y
     CONFIG_TLS=openssl
     CONFIG_TLSV11=y
-    CONFIG_TLSV12=y
+    #CONFIG_TLSV12=y see #8332
     CONFIG_IEEE80211R=y
     CONFIG_DEBUG_SYSLOG=y
     #CONFIG_PRIVSEP=y

From fc4be77491859281f5bfd44ad04fd54161a11d05 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 22 Jun 2015 19:03:12 +0300
Subject: [PATCH 1464/2322] calamares: Patch out all file references to /usr

This makes the timezone selection page as well as the keyboard layout
selection page work correctly.
---
 pkgs/tools/misc/calamares/default.nix | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index c8fe39f6a7a..e2b8c70c6e2 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchgit, cmake, qt5, polkit_qt5, libyamlcpp, python, boost, parted
-, extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart }:
+, extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart
+, ckbcomp, glibc, tzdata, xkeyboard_config }:
 
 stdenv.mkDerivation rec {
   name = "calamares-${version}";
@@ -22,6 +23,25 @@ stdenv.mkDerivation rec {
     "-DWITH_PARTITIONMANAGER=1"
   ];
 
+  patchPhase = ''
+      sed -e "s,/usr/bin/calamares,$out/bin/calamares," \
+          -i calamares.desktop \
+          -i com.github.calamares.calamares.policy
+
+      sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \
+          -i src/modules/locale/timezonewidget/localeconst.h \
+          -i src/modules/locale/SetTimezoneJob.cpp
+
+      sed -e 's,/usr/share/i18n/locales,${glibc}/share/i18n/locales,' \
+          -i src/modules/locale/timezonewidget/localeconst.h
+
+      sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \
+          -i src/modules/keyboard/keyboardwidget/keyboardglobal.h
+
+      sed -e 's,"ckbcomp","${ckbcomp}/bin/ckbcomp",' \
+          -i src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
+  '';
+
   preInstall = ''
     substituteInPlace cmake_install.cmake --replace "${polkit_qt5}" "$out"
   '';

From d8c91a6d27976bd27cb9e7ce63e0d1710559c7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 22 Jun 2015 18:04:09 +0200
Subject: [PATCH 1465/2322] mesa: maintenance update

---
 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 0279bfd51ba..ed6ba30626c 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "10.5.7";
+  version = "10.5.8";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "0648cga781b2pqr8ny59wk7wmyfw8q7g8xnass4q1bv9rn86il04";
+    sha256 = "2866b855c5299a4aed066338c77ff6467c389b2c30ada7647be8758663da2b54";
   };
 
   prePatch = "patchShebangs .";

From c53ed1038c534e438ab78e7e5630f815db49cfc7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jun 2015 18:08:16 +0200
Subject: [PATCH 1466/2322] emacs-offlineimap: Mark as broken

This package has never built:

  http://hydra.nixos.org/job/nixpkgs/trunk/emacsPackages.offlineimap.x86_64-linux/all
---
 pkgs/applications/editors/emacs-modes/offlineimap/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/emacs-modes/offlineimap/default.nix b/pkgs/applications/editors/emacs-modes/offlineimap/default.nix
index d94da4f88d9..f61eaa98266 100644
--- a/pkgs/applications/editors/emacs-modes/offlineimap/default.nix
+++ b/pkgs/applications/editors/emacs-modes/offlineimap/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     homepage = "http://julien.danjou.info/projects/emacs-packages#offlineimap";
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.garbas ];
+    broken = true;
   };
 }

From f10c6bef56deee84d5170ba2e78199a433b22250 Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-github@meterriblecrew.net>
Date: Mon, 22 Jun 2015 15:17:36 +0200
Subject: [PATCH 1467/2322] Added entry to maintainers.nix

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9cc992914a4..dfcf3b9b559 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -215,6 +215,7 @@
   sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>";
   skeidel = "Sven Keidel <svenkeidel@gmail.com>";
   smironov = "Sergey Mironov <ierton@gmail.com>";
+  spacefrogg = "Michael Raitza <spacefrogg-nixos@meterriblecrew.net>";
   sprock = "Roger Mason <rmason@mun.ca>";
   spwhitt = "Spencer Whitt <sw@swhitt.me>";
   stephenmw = "Stephen Weinberg <stephen@q5comm.com>";

From 7907a8bcba6fe50e1f7fa8f8ee6a98df884031ad Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-github@meterriblecrew.net>
Date: Mon, 22 Jun 2015 14:40:55 +0200
Subject: [PATCH 1468/2322] dialog: init at 1.2-20150225, closes #8457

 Generate ncurses dialogs from shell scripts.
---
 .../development/libraries/ncurses/default.nix |  5 ++-
 .../development/tools/misc/dialog/default.nix | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/misc/dialog/default.nix

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index bea4754a1f5..9df56212ad2 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -160,5 +160,8 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ wkennington ];
   };
 
-  passthru.ldflags = if unicode then "-lncursesw" else "-lncurses";
+  passthru = {
+    ldflags = if unicode then "-lncursesw" else "-lncurses";
+    inherit unicode abiVersion;
+  };
 }
diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix
new file mode 100644
index 00000000000..d70f409f343
--- /dev/null
+++ b/pkgs/development/tools/misc/dialog/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, ncurses, gettext
+, withLibrary ? false, libtool
+, unicodeSupport ? true
+}:
+
+let optional = stdenv.lib.optional;
+    optStr = stdenv.lib.optionalString;
+    buildShared = !stdenv.isDarwin;
+in
+
+assert withLibrary -> libtool != null;
+assert unicodeSupport -> ncurses.unicode && ncurses != null;
+
+stdenv.mkDerivation rec {
+  name = "dialog-${version}";
+  version = "1.2-20150225";
+
+  src = fetchurl {
+    url = "ftp://invisible-island.net/dialog/${name}.tgz";
+    sha256 = "6844b13a7a1fea568a8d5bb3004e1af90888cd4a5e8c2ded2c38f34fcc7397ff";
+  };
+
+  buildInputs = [ ncurses ];
+
+  configureFlags = ''
+    --disable-rpath-hacks
+    ${optStr withLibrary "--with-libtool"}
+    --with-libtool-opts=${optStr buildShared "-shared"}
+    --with-ncurses${optStr unicodeSupport "w"}
+  '';
+
+  installTargets = "install${optStr withLibrary "-full"}";
+
+  meta = {
+    homepage = http://invisible-island.net/dialog/dialog.html;
+    description = "Display dialog boxes from shell";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    maintainers = [ stdenv.lib.maintainers.spacefrogg ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 480864fb9e2..a014ee2b633 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -827,6 +827,8 @@ let
     inherit (haskellngPackages) ghcWithPackages diagrams-builder;
   };
 
+  dialog = callPackage ../development/tools/misc/dialog { };
+
   direnv = callPackage ../tools/misc/direnv { };
 
   discount = callPackage ../tools/text/discount { };

From f00440fac5552b92098c020946a2ac45a2fe613b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 22 Jun 2015 16:08:29 +0000
Subject: [PATCH 1469/2322] nixos/x11: start session with dbus-launch

This is needed by most window managers. Desktop environments
usually launch dbus-launch if a session hasn't been started yet
so this shouldn't hurt. The worst it can happen is that one
dbus session will be unused in case it's started twice.

The GDM change is backported from recent gdm.
---
 .../services/x11/display-managers/default.nix |  6 ++++++
 nixos/modules/services/x11/xserver.nix        |  8 ++++++++
 .../gnome-3/3.16/core/gdm/default.nix         |  3 +--
 .../3.16/core/gdm/no-dbus-launch.patch        | 20 +++++++++++++++++++
 4 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/no-dbus-launch.patch

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 736621a14a4..7e05cd84be6 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -50,6 +50,12 @@ let
         exec > ~/.xsession-errors 2>&1
       ''}
 
+      ${optionalString cfg.startDbusSession ''
+        if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+          exec ${pkgs.dbus.tools}/bin/dbus-launch --exit-with-session "$0" "$sessionType"
+        fi
+      ''}
+
       ${optionalString cfg.displayManager.desktopManagerHandlesLidAndPower ''
         # Stop systemd from handling the power button and lid switch,
         # since presumably the desktop environment will handle these.
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 9fddc6a7210..1ec098fded6 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -238,6 +238,14 @@ in
         '';
       };
 
+      startDbusSession = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to start a new DBus session when you log in with dbus-launch.
+        '';
+      };
+
       layout = mkOption {
         type = types.str;
         default = "us";
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
index 43a3d450ac7..17245bd9d2a 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
@@ -27,11 +27,10 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
-    substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
   '';
 
   # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ];
+  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ./no-dbus-launch.patch ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/GDM;
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/no-dbus-launch.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/no-dbus-launch.patch
new file mode 100644
index 00000000000..c87554078c7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/no-dbus-launch.patch
@@ -0,0 +1,20 @@
+--- a/daemon/gdm-launch-environment.c	2015-06-22 15:11:07.277474398 +0000
++++ b/daemon/gdm-launch-environment.c	2015-06-22 15:12:31.301157665 +0000
+@@ -48,8 +48,6 @@
+ #include "gdm-session-enum-types.h"
+ #include "gdm-launch-environment.h"
+ 
+-#define DBUS_LAUNCH_COMMAND BINDIR "/dbus-launch --exit-with-session"
+-
+ extern char **environ;
+ 
+ #define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate))
+@@ -512,7 +510,7 @@
+                 gdm_session_select_program (launch_environment->priv->session, launch_environment->priv->command);
+         } else {
+                 /* wrap it in dbus-launch */
+-                char *command = g_strdup_printf ("%s %s", DBUS_LAUNCH_COMMAND, launch_environment->priv->command);
++                char *command = g_strdup (launch_environment->priv->command);
+ 
+                 gdm_session_select_program (launch_environment->priv->session, command);
+                 g_free (command);

From 2204206a477281b17b3113db412db732e352c38b Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 22 Jun 2015 16:40:12 +0200
Subject: [PATCH 1470/2322] asciinema: init at 1.1.1, closes #8459

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

diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix
new file mode 100644
index 00000000000..626fb5c2321
--- /dev/null
+++ b/pkgs/tools/misc/asciinema/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, goPackages }:
+
+goPackages.buildGoPackage rec {
+  name = "asciinema-${version}";
+  version = "1.1.1";
+
+  goPackagePath = "github.com/asciinema/asciinema";
+
+  src = fetchFromGitHub {
+    owner = "asciinema";
+    repo = "asciinema";
+    rev = "d6f7cabcd085e237872f13d0ab5580964cb64fb2";
+    sha256 = "0ip7wcqzf5wax99c1fjmnwd38q88z1xiyv9cfbjyk47npdqb8173";
+  };
+
+  meta = {
+    homepage = https://asciinema.org/;
+    license = stdenv.lib.licenses.gpl3;
+    description = "Terminal session recorder";
+    maintainers = with stdenv.lib.maintainers; [ lassulus ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a014ee2b633..d221d41d9d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -588,6 +588,8 @@ let
 
   ascii = callPackage ../tools/text/ascii { };
 
+  asciinema = callPackage ../tools/misc/asciinema { };
+
   asymptote = callPackage ../tools/graphics/asymptote {
     texLive = texLiveAggregationFun {
       paths = [ texLive texLiveExtra texLiveCMSuper ];

From e716dc9058e24da268f4106e725771d6882a798e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 22 Jun 2015 18:19:35 +0200
Subject: [PATCH 1471/2322] zandronum-bin: fix evaluation/tarball by assertion

The expression seems usable only on x86_64-linux anyway.
/cc maintainer @lassulus.
---
 pkgs/games/zandronum/bin.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix
index 5d20686c2ae..baf91a66622 100644
--- a/pkgs/games/zandronum/bin.nix
+++ b/pkgs/games/zandronum/bin.nix
@@ -17,6 +17,8 @@
 , zlib
 }:
 
+assert stdenv.system == "x86_64-linux";
+
 stdenv.mkDerivation rec {
   name = "zandronum-2.0";
   src = fetchurl {

From f0b40653924b114b169b89531a6043068747c1f0 Mon Sep 17 00:00:00 2001
From: laMudri <lamudri@gmail.com>
Date: Mon, 22 Jun 2015 15:21:14 +0100
Subject: [PATCH 1472/2322] ibus-table: init at 1.9.6

---
 lib/maintainers.nix                           |  1 +
 .../tools/inputmethods/ibus-table/default.nix | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/ibus-table/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index dfcf3b9b559..9a5ec73ebd0 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -156,6 +156,7 @@
   MP2E = "Cray Elliott <MP2E@archlinux.us>";
   msackman = "Matthew Sackman <matthew@wellquite.org>";
   mtreskin = "Max Treskin <zerthurd@gmail.com>";
+  mudri = "James Wood <lamudri@gmail.com>";
   muflax = "Stefan Dorn <mail@muflax.com>";
   nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
   nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>";
diff --git a/pkgs/tools/inputmethods/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-table/default.nix
new file mode 100644
index 00000000000..58b890b0c92
--- /dev/null
+++ b/pkgs/tools/inputmethods/ibus-table/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ibus, pkgconfig, python3, pythonPackages }:
+
+stdenv.mkDerivation rec {
+  name = "ibus-table-${version}";
+  version = "1.9.6";
+
+  src = fetchurl {
+    url = "https://github.com/kaio/ibus-table/releases/download/${version}/${name}.tar.gz";
+    sha256 = "0xygfscmsx0x80c4d4v40k9bc7831kgdsc74mc84ljxbjg9p9lcf";
+  };
+
+  buildInputs = [ ibus pkgconfig python3 pythonPackages.pygobject3 ];
+
+  meta = with stdenv.lib; {
+    description = "An IBus framework for table-based input methods";
+    homepage    = https://github.com/kaio/ibus-table/wiki;
+    license     = licenses.lgpl21;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ mudri ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d221d41d9d8..01b5bb21e57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1112,6 +1112,8 @@ let
 
   ibus-anthy = callPackage ../tools/inputmethods/ibus-anthy { };
 
+  ibus-table = callPackage ../tools/inputmethods/ibus-table { };
+
   biosdevname = callPackage ../tools/networking/biosdevname { };
 
   checkbashism = callPackage ../development/tools/misc/checkbashisms { };

From 22172b8e43dfac3486d108a085b5911d7e2d8c5a Mon Sep 17 00:00:00 2001
From: laMudri <lamudri@gmail.com>
Date: Mon, 22 Jun 2015 15:24:27 +0100
Subject: [PATCH 1473/2322] ibus-table-others: init at 1.3.7, closes #8460

---
 .../ibus-table-others/default.nix             | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/ibus-table-others/default.nix

diff --git a/pkgs/tools/inputmethods/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-table-others/default.nix
new file mode 100644
index 00000000000..f356bcdee85
--- /dev/null
+++ b/pkgs/tools/inputmethods/ibus-table-others/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, ibus, ibus-table, pkgconfig, python3 }:
+
+stdenv.mkDerivation rec {
+  name = "ibus-table-others-${version}";
+  version = "1.3.7";
+
+  src = fetchurl {
+    url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${name}.tar.gz";
+    sha256 = "0vmz82il796062jbla5pawsr5dqyhs7ald7xjp84zfccc09dg9kx";
+  };
+
+  buildInputs = [ ibus ibus-table pkgconfig python3 ];
+
+  preBuild = ''
+    export HOME=/tmp/ibus-table-others
+  '';
+
+  postFixup = ''
+    rm -rf /tmp/ibus-table-others
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Various table-based input methods for IBus";
+    homepage    = https://github.com/moebiuscurve/ibus-table-others;
+    license     = licenses.gpl3;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ mudri ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01b5bb21e57..27169e6ee0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1114,6 +1114,8 @@ let
 
   ibus-table = callPackage ../tools/inputmethods/ibus-table { };
 
+  ibus-table-others = callPackage ../tools/inputmethods/ibus-table-others { };
+
   biosdevname = callPackage ../tools/networking/biosdevname { };
 
   checkbashism = callPackage ../development/tools/misc/checkbashisms { };

From ad779acd3be0a29bcda55f760eee6de35cfedef5 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 14 Jun 2015 11:20:43 +0000
Subject: [PATCH 1474/2322] findutils: disable test_canonicalize (close #8324)

It fails when user doesn't have permission to list all TMPDIR's parent directories.
---
 pkgs/tools/misc/findutils/default.nix                |  2 +-
 .../misc/findutils/disable-test-canonicalize.patch   | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/misc/findutils/disable-test-canonicalize.patch

diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 188b573efec..16d53c9f436 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [coreutils];
 
-  patches = [ ./findutils-path.patch ./change_echo_path.patch ];
+  patches = [ ./findutils-path.patch ./change_echo_path.patch ./disable-test-canonicalize.patch ];
 
   doCheck = true;
 
diff --git a/pkgs/tools/misc/findutils/disable-test-canonicalize.patch b/pkgs/tools/misc/findutils/disable-test-canonicalize.patch
new file mode 100644
index 00000000000..3a8d42eb560
--- /dev/null
+++ b/pkgs/tools/misc/findutils/disable-test-canonicalize.patch
@@ -0,0 +1,12 @@
+diff -ruN findutils-4.4.2/tests/test-canonicalize.sh findutils-4.4.2_edited/tests/test-canonicalize.sh
+--- findutils-4.4.2/tests/test-canonicalize.sh	2008-12-23 12:50:15.000000000 +0000
++++ findutils-4.4.2_edited/tests/test-canonicalize.sh	2015-06-14 10:51:19.000000000 +0000
+@@ -1,5 +1,8 @@
+ #!/bin/sh
+ 
++# skipped because user might not have directory listing permission for all parents of TMPDIR
++exit 77
++
+ tmpfiles=""
+ trap 'rm -fr $tmpfiles' 1 2 3 15
+ 

From bd003198b374c445caa56bd710eb93a01ae733ae Mon Sep 17 00:00:00 2001
From: Mike Sperber <sperber@deinprogramm.de>
Date: Mon, 22 Jun 2015 13:24:33 +0200
Subject: [PATCH 1475/2322] openssl: patch not needed anymore for darwin
 platform, closes #8456

The darwin-arch.patch that was needed for previous releases doesn't
apply, and also doesn't work anymore. It builds fine without.
---
 pkgs/development/libraries/openssl/1.0.2.x.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix
index 52867440191..e5237515f20 100644
--- a/pkgs/development/libraries/openssl/1.0.2.x.nix
+++ b/pkgs/development/libraries/openssl/1.0.2.x.nix
@@ -31,9 +31,7 @@ let
     ++ stdenv.lib.optionals (stdenv.system == "x86_64-kfreebsd-gnu")
         [ ./gnu.patch
           ./kfreebsd-gnu.patch
-        ]
-
-    ++ stdenv.lib.optional isDarwin ./darwin-arch.patch;
+        ];
 
   extraPatches = stdenv.lib.optional stdenv.isCygwin ./1.0.1-cygwin64.patch;
 in

From aecc7bd6aa79e337de67502e440e7d10615aeefb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 22 Jun 2015 20:38:43 +0200
Subject: [PATCH 1476/2322] idea updates

idea.clion: 1.0.3 -> 1.0.4
idea.idea-{community,ultimate}: 14.1.3 -> 14.1.4
idea.pycharm-{community,professional}: 4.5.1 -> 4.5.2
idea.webstorm: 10.0.3 -> 10.0.4
---
 pkgs/applications/editors/idea/default.nix | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index d22f03d56d9..ff6d3d57eff 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -225,37 +225,37 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "1.0.3";
-    build = "141.873";
+    version = "1.0.4";
+    build = "141.874";
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/${name}.tar.gz";
-      sha256 = "0ksxpml6fzj91hnzy59wlgz7q76dhc3715jalacq748y0i1jdh3f";
+      sha256 = "1cz59h2znzjy7zncc049f2w30kc89rvmk7l51a1y6ymf9s7cj4cm";
     };
   };
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "14.1.3";
-    build = "IC-141.1010.3";
+    version = "14.1.4";
+    build = "IC-141.1532.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 = "104ba057p49l41g9gdcgbywdxyqzkm4rfm7yivkcsddh5drsk4jv";
+      sha256 = "1yx93dfbajk2icm2jkfp5s5jnr1czyk179va3n5zndzzhzags4xx";
     };
   };
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "14.1.3";
-    build = "IU-141.1010.3";
+    version = "14.1.4";
+    build = "IU-141.1532.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 = "1flg3rpb86xfcxlys5rxywa0z9c6j9h3qd8mkadx5pnay1f97pwi";
+      sha256 = "1hxs0mh35r43iqd1i1s2g1ha91q2wnb6xs95w572khzjm5dznvaw";
     };
   };
 
@@ -273,25 +273,25 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "4.5.1";
-    build = "141.1245";
+    version = "4.5.2";
+    build = "141.1580";
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1rjl8r863cm7bn3bkp8kbkb9f35rb344pycg5qlvjlvwvp2f448f";
+      sha256 = "09v1ni06h381y7d5cglifwsz81kln2y4ld7hgpz1sn56fwbi8ld9";
     };
   };
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "4.5.1";
-    build = "141.1245";
+    version = "4.5.2";
+    build = "141.1580";
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1wwyggl6941hd034xfsb3avjgvvah9lh0pdmzlndmvm677cdgzz1";
+      sha256 = "1dgpzn7wgaxicgw48z83fp462g5mxsr7iwkgp11ffypz93ba2dm7";
     };
   };
 
@@ -309,13 +309,13 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "10.0.3";
-    build = "141.1237";
+    version = "10.0.4";
+    build = "141.1550";
     description = "Professional IDE for Web and JavaScript devlopment";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "06m852mbiij2dbmiz5y10bd4mhsdg5dmpy8arg75psl2j354spf8";
+      sha256 = "171i544ssvjnbr1vq6ncxlj38swsygacavsa427qa4s5wzyvdipj";
     };
   };
 

From 094bf83b26f396e9d7171fe770303eda0f14187d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 22 Jun 2015 12:25:53 -0700
Subject: [PATCH 1477/2322] Fix the usage of cross packages during nix-env
 listings

---
 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 0c436808c78..d71e3c4393e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5155,7 +5155,7 @@ let
     gold = false;
   });
 
-  binutilsCross = lowPrio (forceNativeDrv (
+  binutilsCross = assert crossSystem != null; lowPrio (forceNativeDrv (
     if crossSystem.libc == "libSystem" then darwin.cctools_cross
     else binutils.override {
       noSysDirs = true;
@@ -6152,7 +6152,7 @@ let
     else if name == "libSystem" then darwin.xcode
     else throw "Unknown libc";
 
-  libcCross = libcCrossChooser crossSystem.libc;
+  libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc;
 
   # Only supported on Linux
   glibcLocales = if stdenv.isLinux then callPackage ../development/libraries/glibc/locales.nix { } else null;

From c48433d5759c06172662d95549f7ffc14f6d1852 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 22 Jun 2015 12:35:37 -0700
Subject: [PATCH 1478/2322] kernel: 3.4.107 -> 3.4.108

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index eaf5bfad6d8..a0ba7f46c68 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.4.107";
+  version = "3.4.108";
   extraMeta.branch = "3.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1y3mxisdcnz3kj416bpnnn9cn3wqqjqvcjadhylc1wypqkpcvphq";
+    sha256 = "0xdycfbn2j398n1763zkhiv08xsya52acic1zign4s315b45pijm";
   };
 
   kernelPatches = args.kernelPatches ++

From bd9433c90de37852bdb276b5737762bb8c24557b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 22 Jun 2015 12:41:23 -0700
Subject: [PATCH 1479/2322] kernel: Add version 4.1 latest

---
 pkgs/os-specific/linux/kernel/linux-4.1.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix             | 13 ++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-4.1.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
new file mode 100644
index 00000000000..baee61940cd
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.1";
+  modDirVersion = "4.1.0";
+  extraMeta.branch = "4.1";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+    sha256 = "17rdly75zh49m6r32yy03xappl7ajcqbznq09pm1q7mcb841zxfa";
+  };
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27169e6ee0d..e35ac93700e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9588,6 +9588,16 @@ let
       ];
   };
 
+  linux_4_1 = makeOverridable (import ../os-specific/linux/kernel/linux-4.1.nix) {
+    inherit fetchurl stdenv perl buildLinux;
+    kernelPatches = [ kernelPatches.bridge_stp_helper ]
+      ++ lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
   linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) {
     inherit fetchurl stdenv perl buildLinux;
     kernelPatches = [ kernelPatches.bridge_stp_helper ]
@@ -9754,7 +9764,7 @@ let
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!
-  linuxPackages_latest = pkgs.linuxPackages_4_0;
+  linuxPackages_latest = pkgs.linuxPackages_4_1;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
@@ -9768,6 +9778,7 @@ let
   linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18);
   linuxPackages_3_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_19 linuxPackages_3_19);
   linuxPackages_4_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_0 linuxPackages_4_0);
+  linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1);
   linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);
   linuxPackages_custom = {version, src, configfile}:
                            let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile;

From b92905e0979167f01084d8f586e2dbdda2907d5a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 22 Jun 2015 22:42:40 +0200
Subject: [PATCH 1480/2322] dejavu_fonts: update from 2.34 to 2.35

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

diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index 88596bb4fd9..21028ee0b32 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -1,6 +1,6 @@
 {fetchurl, stdenv, fontforge, perl, fontconfig, FontTTF}:
 
-let version = "2.34" ; in
+let version = "2.35" ; in
 
 stdenv.mkDerivation rec {
   name = "dejavu-fonts-${version}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/dejavu/dejavu-fonts-${version}.tar.bz2";
-    sha256 = "09wh9c9kk82i4kwy73fcqa0779bvf0ncikciqw2gxa9m2rkrxjmm";
+    sha256 = "1xdbi4llrq1qbkd73352ibrfqcbz93dww8hab216qz5szd95yvv4";
   };
   buildFlags = "full-ttf";
   preBuild = ''

From abee7fbe2cfd0938d30795c995bb999695368bed Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 22 Jun 2015 23:23:54 +0200
Subject: [PATCH 1481/2322] mysql55: update from 5.5.43 to 5.5.44

---
 pkgs/servers/sql/mysql/5.5.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index 8469ae4e948..0a95db91d87 100644
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mysql-${version}";
-  version = "5.5.43";
+  version = "5.5.44";
 
   src = fetchurl {
     url = "http://mysql.mirrors.pair.com/Downloads/MySQL-5.5/${name}.tar.gz";
-    sha256 = "1kbl8xp6xi9yclc4q0q97s89rr498mm0avpbkmsa4ff8wmwxzls3";
+    sha256 = "1pp5ngm4ibnp8xnn9haz1db0favd1i7cxdgl5z4677mkgljmpw45";
   };
 
   patches = if stdenv.isCygwin then [

From 4bfcfef9fc655dd302488485b3415753de874d76 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 22 Jun 2015 23:13:35 +0200
Subject: [PATCH 1482/2322] cassandra 2.1.6 -> 2.1.7

---
 pkgs/servers/nosql/cassandra/2.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix
index 94f920ffe11..2f8cb84117a 100644
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/pkgs/servers/nosql/cassandra/2.1.nix
@@ -10,8 +10,8 @@
 
 let
 
-  version = "2.1.6";
-  sha256 = "1xq96h33f4xmld114mrd57z396f9ykcj0xy50fnnhy5mhafkn4n2";
+  version = "2.1.7";
+  sha256 = "12chnxcl9zg20d0l4rlzp13cnxvdqr8bx3bbvwbcpnh7ir5s7ldd";
 
 in
 

From 5cd1fd8012f045177fe030a0e3b1313bec44973d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 22 Jun 2015 23:14:05 +0200
Subject: [PATCH 1483/2322] cassandra 2.0.15 -> 2.0.16

---
 pkgs/servers/nosql/cassandra/2.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix
index 4f27452a065..e3ed35241fa 100644
--- a/pkgs/servers/nosql/cassandra/2.0.nix
+++ b/pkgs/servers/nosql/cassandra/2.0.nix
@@ -10,8 +10,8 @@
 
 let
 
-  version = "2.0.15";
-  sha256 = "00rxmf8il9w1fmfpxfy9gbhbvgid5h8d80g3ljw25jscr00lcyh0";
+  version = "2.0.16";
+  sha256 = "1fpvgmakmxy1lnygccpc32q53pa36bwy0lqdvb6hsifkxymdw8y5";
 
 in
 

From e6e04d3a455d6f3a33b5dad444e7d1a6be6d96e7 Mon Sep 17 00:00:00 2001
From: Henry Till <henrytill@gmail.com>
Date: Mon, 22 Jun 2015 19:28:43 -0400
Subject: [PATCH 1484/2322] racket: 6.1.1 -> 6.2

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

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index e0181c6ed58..1affd1fa582 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -31,11 +31,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "racket-${version}";
-  version = "6.1.1";
+  version = "6.2";
 
   src = fetchurl {
     url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
-    sha256 = "090269522d20e7a5ce85d2251a126745746ebf5e87554c05efe03f3b7173da75";
+    sha256 = "05g60fzb9dzf52xj9n7s4prybwbr8dqjq94mbdmw5cxk88vi2c8k";
   };
 
   FONTCONFIG_FILE = fontsConf;

From d2df553da17e38eb73fde1ebcb1664ebe80ddd62 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 19 Jun 2015 18:50:08 +0200
Subject: [PATCH 1485/2322] fetchpatch: Allow to pass a postFetch attribute.

Comes in handy if we want to make additional modificiations to the
output file. While I wasn't sure whether to invoke the passed postFetch
directly before the patch or afterwards, I thought it would be better
afterwards because "postFetch of fetchpatch" at least to my intuition
would sound that after whatever "fetchpatch" does - it comes afterwards.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/fetchpatch/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix
index 29ff5c31e45..60785f42b54 100644
--- a/pkgs/build-support/fetchpatch/default.nix
+++ b/pkgs/build-support/fetchpatch/default.nix
@@ -18,5 +18,6 @@ fetchurl ({
         --strip=${toString stripLen} \
         --clean "$out" > "$tmpfile"
     mv "$tmpfile" "$out"
+    ${args.postFetch or ""}
   '';
 } // builtins.removeAttrs args ["stripLen"])

From c290595e5b60822d342c5e6354da4dac35a87c5a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 19 Jun 2015 04:34:47 +0200
Subject: [PATCH 1486/2322] chromium: Update all channels to latest versions.

Overview of the updated versions:

stable: 43.0.2357.124 -> 43.0.2357.125
beta:   44.0.2403.39  -> 44.0.2403.52  [1]
dev:    45.0.2421.0   -> 45.0.2431.0   [2]

[1] Beta channel fixes:

    I had to fetch a patch from a newer revision of Blink (r195908), see
    https://codereview.chromium.org/1157943002/ for more information
    about the patch.

    Here is the failing build log:

    https://headcounter.org/hydra/build/704037/nixlog/2

    Another fix for Blink, was needed in order to get it to build,
    see: https://codereview.chromium.org/1156113007/

    Also I needed to revert https://codereview.chromium.org/1150543002/
    using another patch, because the build won't succeed and bail out
    with WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE not being found (it's only
    used once in the source, but isn't defined anywhere). Here are the
    trybot results:

    https://chromium-cq-status.appspot.com/patch-status/1150543002/20001

[2] Dev channel fixes:

    The "ffmpegsumo" shared library is now no longer built, because it
    is now statically linked against Chromium, for details see:

    https://codereview.chromium.org/1141703002

All channels built and tested on my Hydra at:

https://headcounter.org/hydra/eval/178458

Test reports:

x86:    https://headcounter.org/hydra/build/704908/download/1/log.html
x86_64: https://headcounter.org/hydra/build/704914/download/1/log.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/browser.nix  |  4 +-
 .../browsers/chromium/source/default.nix      | 41 ++++++++++++++++---
 .../browsers/chromium/source/sources.nix      | 24 +++++------
 3 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 41617d0182a..29e0da60ea0 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -12,7 +12,9 @@ mkChromiumDerivation (base: rec {
     cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
     cp -v "$buildPath/icudtl.dat" "$libExecPath/"
     cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
-    cp -v "$buildPath/libffmpegsumo.so" "$libExecPath/"
+    ${optionalString (versionOlder base.version "45.0.0.0") ''
+      cp -v "$buildPath/libffmpegsumo.so" "$libExecPath/"
+    ''}
     ${optionalString (versionOlder base.version "42.0.0.0") ''
       cp -v "$buildPath/libpdf.so" "$libExecPath/"
     ''}
diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index a3a46631484..f9c5c6e0265 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python
+{ stdenv, fetchurl, fetchpatch, patchutils, python
 , channel ? "stable"
 , useOpenSSL # XXX
 }:
@@ -19,6 +19,7 @@ let
   ]);
 
   pre44 = versionOlder version "44.0.0.0";
+  is44 = versionOlder version "45.0.0.0" && !pre44;
 
 in stdenv.mkDerivation {
   name = "chromium-source-${version}";
@@ -47,11 +48,39 @@ in stdenv.mkDerivation {
     done
   '';
 
-  patches = if pre44 then [
-    ./nix_plugin_paths_42.patch
-  ] else [
-    ./nix_plugin_paths_44.patch
-  ];
+  patches = let
+    baseURL = "https://codereview.chromium.org/download";
+
+    mkBlinkFix = issue: sha256: fetchpatch {
+      url = "${baseURL}/issue${issue}.diff";
+      inherit sha256;
+      postFetch = ''
+        sed -i -e 's,^\(---\|+++\) *[ab]/,&third_party/WebKit/,' "$out"
+      '';
+    };
+
+    fixes44 = [
+      # WebPluginContainer::setNeedsLayout
+      # https://codereview.chromium.org/1157943002/
+      (mkBlinkFix "1157943002_20001"
+                  "0932yd15zlh2g5a5bbm6qrnfvv22jlfdg8pj0w9z58m5zdzw1p82")
+      # WebRuntimeFeatures::enablePermissionsAPI
+      # https://codereview.chromium.org/1156113007/
+      (mkBlinkFix "1156113007_1"
+                  "1v76brrgdziv1q62ba4bimg0my2dmnkyl68b21nv2vw661v0hzwh")
+      # Revert of https://codereview.chromium.org/1150543002/
+      (fetchpatch {
+        url = "${baseURL}/issue1150543002_1.diff";
+        sha256 = "0x9sya0m1zcb2vcp2vfss88qqdrh6bzcbx2ngfiql7rkbynnpqn6";
+        postFetch = ''
+          ${patchutils}/bin/interdiff "$out" /dev/null > reversed.patch
+          mv reversed.patch "$out"
+        '';
+      })
+    ];
+    pluginPaths = if pre44 then singleton ./nix_plugin_paths_42.patch
+                  else singleton ./nix_plugin_paths_44.patch;
+  in pluginPaths ++ optionals is44 fixes44;
 
   patchPhase = let
     diffmod = sym: "/^${sym} /{s/^${sym} //;${transform ""};s/^/${sym} /}";
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 3adbbab8392..2ffb8c970e4 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,21 +1,21 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
-    version = "45.0.2421.0";
-    sha256 = "1qc80y0mhwnvxrvpc3csskgb536wq34c0fgk19h1qb4xc62lxhsk";
-    sha256bin32 = "1xqhyrlmh00md6i1q4wr0xihqbvcpshzscnjclrn53dlw5zs2s89";
-    sha256bin64 = "0akdhwwdfcbqfh65a82zigbhsi8sbhhw6904cjprb3bmv4l3c598";
+    version = "45.0.2431.0";
+    sha256 = "0irlrym8r1wa6zb5bg4paxy3h5fg300k5c9vkj3xmhdp567clfja";
+    sha256bin32 = "1lfrd7x7cav5mr7pg0a3d4a9dyy6f0rklarprfrcvqwipjkddb3f";
+    sha256bin64 = "1jzmkgiqn17ynbv0xljiifvlj1136jq98zrkd4hdmkgv8xrrzd74";
   };
   beta = {
-    version = "44.0.2403.39";
-    sha256 = "15c4adg0r9ym3pxya7vv4d148gv2pdwaaymxvvw511fjwffdv71n";
-    sha256bin32 = "1gaypkah10y31gb5f7vnyv0v73z5zjznmsp6vh2m4hfajx7s55jn";
-    sha256bin64 = "1j1ma6asl3ibjv3apyw24vhyi1qy64f586w8jizqzp4h962gj95c";
+    version = "44.0.2403.52";
+    sha256 = "0zgcqbxm2slxpj6i50w7r3xxql1k6kgd51qn8w8gwfzhmad4zxyx";
+    sha256bin32 = "1kfgl2l7j5fhj6wg4i3bsany2rlwspprypdy0z7k3pqiwwyiw658";
+    sha256bin64 = "1sabqqh1hii7appmx6xwabnapf4cv7smsy31nvz063fa5p6h21m8";
   };
   stable = {
-    version = "43.0.2357.124";
-    sha256 = "09m8bb5f17mx6cd3h5irslw07h2s0drda35v17vcr7qfhk8jdh92";
-    sha256bin32 = "15n2fla1ixrqzi0in0vyl8n5wkv20fpd96lff65rwr9diylz287p";
-    sha256bin64 = "0x6igpcf29zmwqgphvy9nm527k9g7na2cvgc5nimw4fs5dakzzjr";
+    version = "43.0.2357.125";
+    sha256 = "01alba50zrc50bn4p3f298khk8fam2rv5wyysz7rq3zrjg8785xg";
+    sha256bin32 = "0527bdlf4nd4b1ydmwn6rnxy377388qb98v9anicfd4bc2p9jjml";
+    sha256bin64 = "0yhgcjaxcpgk32l1sjrgkq447ywcj156a7372v87m22dcwl8fi01";
   };
 }

From cadd675e7ae4dc1572b0536b8f036b0901dfacde Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 19 Jun 2015 04:15:49 +0200
Subject: [PATCH 1487/2322] chromium: Disable "hotwording" by default.

There has been some recent news about that component extension on hacker
news:

https://news.ycombinator.com/item?id=9724409

Even though on our side it won't work, because we don't have NaCl
enabled by default or even working (I honestly haven't tested if it even
builds if enabled), we might get to the point where we can build with
NaCl enabled.

But until and even after that day, we want to have explicit control on
whether this extension is enabled.

Please also have a look at these two issues explaining the details
(about component extensions and the hotwording extension in particular):

https://crbug.com/491435
https://crbug.com/500922

Fixes issue #8358.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/common.nix  | 2 ++
 pkgs/applications/networking/browsers/chromium/default.nix | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index d3a0c86daf4..f54f21ef8c0 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -21,6 +21,7 @@
 # package customization
 , enableSELinux ? false, libselinux ? null
 , enableNaCl ? false
+, enableHotwording ? false
 , useOpenSSL ? false, nss ? null, openssl ? null
 , gnomeSupport ? false, gnome ? null
 , gnomeKeyringSupport ? false, libgnome_keyring3 ? null
@@ -158,6 +159,7 @@ let
       use_pulseaudio = pulseSupport;
       linux_link_pulseaudio = pulseSupport;
       disable_nacl = !enableNaCl;
+      enable_hotwording = enableHotwording;
       use_openssl = useOpenSSL;
       selinux = enableSELinux;
       use_cups = cupsSupport;
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 85b2e9b8051..a69b44c637a 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -4,6 +4,7 @@
 , channel ? "stable"
 , enableSELinux ? false
 , enableNaCl ? false
+, enableHotwording ? false
 , useOpenSSL ? false
 , gnomeSupport ? false
 , gnomeKeyringSupport ? false
@@ -26,9 +27,9 @@ let
     };
 
     mkChromiumDerivation = callPackage ./common.nix {
-      inherit enableSELinux enableNaCl useOpenSSL gnomeSupport
-              gnomeKeyringSupport proprietaryCodecs cupsSupport
-              pulseSupport hiDPISupport;
+      inherit enableSELinux enableNaCl enableHotwording useOpenSSL gnomeSupport
+              gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport
+              hiDPISupport;
     };
 
     browser = callPackage ./browser.nix { };

From 7143f34970dbf642c103f76c6387e6c6301d27b5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 19 Jun 2015 19:35:30 +0200
Subject: [PATCH 1488/2322] chromium: Drop references to version 42 and below.

Since 7d217e3 the lowest version number is 43, so all those conditionals
are no longer needed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../applications/networking/browsers/chromium/browser.nix | 3 ---
 pkgs/applications/networking/browsers/chromium/common.nix | 8 +-------
 .../applications/networking/browsers/chromium/default.nix | 3 ---
 .../applications/networking/browsers/chromium/plugins.nix | 3 +--
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 29e0da60ea0..a0bdc70f9f5 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -15,9 +15,6 @@ mkChromiumDerivation (base: rec {
     ${optionalString (versionOlder base.version "45.0.0.0") ''
       cp -v "$buildPath/libffmpegsumo.so" "$libExecPath/"
     ''}
-    ${optionalString (versionOlder base.version "42.0.0.0") ''
-      cp -v "$buildPath/libpdf.so" "$libExecPath/"
-    ''}
     cp -v "$buildPath/chrome" "$libExecPath/$packageName"
 
     mkdir -vp "$out/share/man/man1"
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index f54f21ef8c0..714058d81e0 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -131,11 +131,7 @@ let
       chmod -R u+w third_party
     '';
 
-    postPatch = optionalString (versionOlder version "42.0.0.0") ''
-      sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \
-        sandbox_binary = base::FilePath(getenv("CHROMIUM_SANDBOX_BINARY_PATH"));
-      ' sandbox/linux/suid/client/setuid_sandbox_client.cc
-    '' + ''
+    postPatch = ''
       sed -i -e '/module_path *=.*libexif.so/ {
         s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")|
       }' chrome/utility/media_galleries/image_metadata_extractor.cc
@@ -163,8 +159,6 @@ let
       use_openssl = useOpenSSL;
       selinux = enableSELinux;
       use_cups = cupsSupport;
-    } // optionalAttrs (versionOlder version "42.0.0.0") {
-      linux_sandbox_chrome_path="${libExecPath}/${packageName}";
     } // {
       werror = "";
       clang = false;
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index a69b44c637a..7a355cbf59a 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -74,15 +74,12 @@ in stdenv.mkDerivation {
     sandboxBinary = "${chromium.sandbox}/bin/chromium-sandbox";
     mkEnvVar = key: val: "--set '${key}' '${val}'";
     envVars = chromium.plugins.settings.envVars or {};
-    isVer42 = !stdenv.lib.versionOlder chromium.browser.version "42.0.0.0";
     flags = chromium.plugins.settings.flags or [];
-    setBinPath = "--set CHROMIUM_SANDBOX_BINARY_PATH \"${sandboxBinary}\"";
   in with stdenv.lib; ''
     mkdir -p "$out/bin" "$out/share/applications"
 
     ln -s "${chromium.browser}/share" "$out/share"
     makeWrapper "${browserBinary}" "$out/bin/chromium" \
-      ${optionalString (!isVer42) setBinPath} \
       ${concatStrings (mapAttrsToList mkEnvVar envVars)} \
       --add-flags "${concatStringsSep " " flags}"
 
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index b4766cee434..5bb6a93d8d7 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -21,10 +21,9 @@ let
       chan = if source.channel == "dev"    then "chrome-unstable"
         else if source.channel == "stable" then "chrome"
         else "chrome-${source.channel}";
-      cext = if versionOlder source.version "41.0.0.0" then "lzma" else "xz";
     in ''
       mkdir -p plugins
-      ar p "$src" data.tar.${cext} | tar xJ -C plugins --strip-components=4 \
+      ar p "$src" data.tar.xz | tar xJ -C plugins --strip-components=4 \
         ./opt/google/${chan}/PepperFlash \
         ./opt/google/${chan}/libwidevinecdm.so \
         ./opt/google/${chan}/libwidevinecdmadapter.so

From 7f9a4957eec02bf979e9505d8733246c53aa7cc2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 22 Jun 2015 20:00:02 -0700
Subject: [PATCH 1489/2322] openssl: Make 1.0.2 conform to the 1.0.1 derivation

---
 .../development/libraries/openssl/1.0.2.x.nix | 75 +++++++++----------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix
index 637f5d30cb2..2320d7c8a45 100644
--- a/pkgs/development/libraries/openssl/1.0.2.x.nix
+++ b/pkgs/development/libraries/openssl/1.0.2.x.nix
@@ -1,32 +1,27 @@
 { stdenv, fetchurl, perl
 , withCryptodev ? false, cryptodevHeaders }:
 
+with stdenv.lib;
 let
-  name = "openssl-1.0.2c";
-
-  opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
+  opensslCrossSystem = attrByPath [ "openssl" "system" ]
     (throw "openssl needs its platform name cross building" null)
     stdenv.cross;
-
-  extraPatches = stdenv.lib.optional stdenv.isCygwin ./1.0.1-cygwin64.patch;
 in
-
-stdenv.mkDerivation {
-  inherit name;
+stdenv.mkDerivation rec {
+  name = "openssl-1.0.2c";
 
   src = fetchurl {
     urls = [
       "http://www.openssl.org/source/${name}.tar.gz"
       "http://openssl.linux-mirror.org/source/${name}.tar.gz"
     ];
-    sha256 = "10vasdg52qiyqvgbp14n9z7ghglmhzvag9qpiz2nfqssycvvlf00";
+    sha1 = "6e4a5e91159eb32383296c7c83ac0e59b83a0a44";
   };
 
-  patches = extraPatches;
-
-  buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
+  patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch;
 
   nativeBuildInputs = [ perl ];
+  buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
 
   # On x86_64-darwin, "./config" misdetects the system as
   # "darwin-i386-cc".  So specify the system type explicitly.
@@ -35,44 +30,48 @@ stdenv.mkDerivation {
     else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc"
     else "./config";
 
-  configureFlags = "shared --libdir=lib --openssldir=etc/ssl" +
-    stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS";
+  configureFlags = [
+    "shared"
+    "--libdir=lib"
+    "--openssldir=etc/ssl"
+  ] ++ stdenv.lib.optionals withCryptodev [
+    "-DHAVE_CRYPTODEV"
+    "-DUSE_CRYPTODEV_DIGESTS"
+  ];
 
-  # CYGXXX: used to be set for cygwin with optionalString. Not needed
-  # anymore but kept to prevent rebuild.
-  preBuild = "";
-
-  makeFlags = "MANDIR=$(out)/share/man";
+  makeFlags = [
+    "MANDIR=$(out)/share/man"
+  ];
 
   # Parallel building is broken in OpenSSL.
   enableParallelBuilding = false;
 
-  postInstall =
-    ''
-      # If we're building dynamic libraries, then don't install static
-      # libraries.
-      if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib)" ]; then
-          rm $out/lib/*.a
-      fi
-    ''; # */
+  postInstall = ''
+    # If we're building dynamic libraries, then don't install static
+    # libraries.
+    if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
+        rm "$out/lib/"*.a
+    fi
+
+    # remove dependency on Perl at runtime
+    rm -r $out/etc/ssl/misc $out/bin/c_rehash
+  '';
+
+  postFixup = ''
+    # Check to make sure we don't depend on perl
+    if grep -r '${perl}' $out; then
+      echo "Found an erroneous dependency on perl ^^^" >&2
+      exit 1
+    fi
+  '';
 
   crossAttrs = {
     preConfigure=''
       # It's configure does not like --build or --host
-      export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}"
+      export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}"
     '';
 
-    postInstall = ''
-      # Openssl installs readonly files, which otherwise we can't strip.
-      # This could at some stdenv hash change be put out of crossAttrs, too
-      chmod -R +w $out
-
-      # Remove references to perl, to avoid depending on it at runtime
-      rm $out/bin/c_rehash $out/ssl/misc/CA.pl $out/ssl/misc/tsget
-    '';
     configureScript = "./Configure";
-  } // stdenv.lib.optionalAttrs (opensslCrossSystem == "darwin64-x86_64-cc") {
-    CC = "gcc";
   };
 
   meta = {

From bdd88582e37f0b11830899bd4cba3058934ac5a1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 22 Jun 2015 20:25:26 -0700
Subject: [PATCH 1490/2322] ncurses: Add a symlink to the fully suffixed
 directory which was incorrectly skipped when this code was modified

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

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 36cc4d55933..de3b42027f2 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -55,6 +55,9 @@ stdenv.mkDerivation rec {
     # Get the path to the config util
     cfg=$(basename $out/bin/ncurses*-config)
 
+    # symlink the full suffixed include directory
+    ln -svf . $out/include/ncurses$suffix
+
     for newsuffix in $suffixes ""; do
       # Create a non-abi versioned config util links
       ln -svf $cfg $out/bin/ncurses$newsuffix-config

From fd829968c7b6734e04d7c720d51a174b4e8a8412 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 22 Jun 2015 23:42:10 -0700
Subject: [PATCH 1491/2322] jack2: 1.9.10 -> 2015-06-02

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

diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 47511cf58b0..eb80937b6a3 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -23,13 +23,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${prefix}jack2-${version}";
-  version = "1.9.10";
+  version = "2015-06-02";
 
   src = fetchFromGitHub {
     owner = "jackaudio";
     repo = "jack2";
-    rev = "v${version}";
-    sha256 = "1a2213l7x6sgqg2hq3yhnpvvvqyskhsmx8j3z0jgjsqwz9xa3wbr";
+    rev = "b5bceb50c708f55cc569c3e1f0f1876a49fbdade";
+    sha256 = "0dc00729wkbxnbhnmyfam1wdwd5m8jvrjccypb32bj072jqaqaw7";
   };
 
   nativeBuildInputs = [ pkgconfig python makeWrapper ];

From fb0bc10de49124fddb60b9ec4b4d052af718e8a4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 22 Jun 2015 23:45:10 -0700
Subject: [PATCH 1492/2322] ncurses: Fix includedir in the pkgconfig
 referencing ${out}

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

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index de3b42027f2..c505d89a6d8 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -25,12 +25,12 @@ stdenv.mkDerivation rec {
     "--without-debug"
     "--enable-pc-files"
     "--enable-symlinks"
-    "--includedir=\${out}/include"
   ] ++ lib.optional unicode "--enable-widec";
 
   buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
 
   preConfigure = ''
+    configureFlagsArray+=("--includedir=$out/include")
     export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig"
     mkdir -p "$PKG_CONFIG_LIBDIR"
   '' + lib.optionalString stdenv.isCygwin ''

From 634d9eb4c1a1260d7719b8d38b15613a9dd975cc Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Mon, 22 Jun 2015 17:48:41 -0700
Subject: [PATCH 1493/2322] clib: a micro-package manager for C

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

diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix
new file mode 100644
index 00000000000..ae1213aee7c
--- /dev/null
+++ b/pkgs/tools/package-management/clib/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchzip, curl  }:
+
+stdenv.mkDerivation rec {
+  version = "1.4.2";
+  name = "clib-${version}";
+
+  src = fetchzip {
+    url = "https://github.com/clibs/clib/archive/${version}.zip";
+    sha256 = "0hbi5hf4w0iim96h89j7krxv61x92ffxjbldxp3zk92m5sgpldnm";
+  };
+
+  makeFlags = "PREFIX=$(out)";
+
+  buildInputs = [ curl ];
+
+  meta = with stdenv.lib; {
+    description = "C micro-package manager";
+    homepage = https://github.com/clibs/clib;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jb55 ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e35ac93700e..ada3e3bd1f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -789,6 +789,8 @@ let
 
   cloud-init = callPackage ../tools/virtualization/cloud-init { };
 
+  clib = callPackage ../tools/package-management/clib { };
+
   consul = goPackages.consul;
 
   consul-ui = callPackage ../servers/consul/ui.nix { };

From 5c4a2d311fb01cedb70defdacd505317e765a64a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Tue, 23 Jun 2015 09:48:48 +0200
Subject: [PATCH 1494/2322] yoshimi: update from 1.3.4 to 1.3.5.1

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

diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 5164c80695b..0132d4a4c4c 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.3.4";
+  version = "1.3.5.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
-    sha256 = "0vfk90jwn3r21703yizrfc4bmiz70fh8kd8w892s14d3k0kvhcwv";
+    sha256 = "1c7049pnvadxndk1rbja77kyr0rwnqca2546pxjnxksg923s5l8n";
   };
 
   buildInputs = [

From af5472a739e8afba0b2e2b238396dc4c94e9134c Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 23 Jun 2015 11:23:45 +0200
Subject: [PATCH 1495/2322] google-cloud-sdk: Update from 0.9.58 to 0.9.65

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index d2c22b055be..adfdad1f9b1 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, python27, python27Packages, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  version = "0.9.58";
+  version = "0.9.65";
   name = "google-cloud-sdk-${version}";
 
   src = fetchurl {
-    url = "https://dl.google.com/dl/cloudsdk/release/packages/google-cloud-sdk-coretools-linux-static-20150429151447.tar.gz";
-    sha256 = "0sak1fmm7z7ry1k2r67a13mpgi55rbnx81s0y0xhd86dm5aw4f48";
+    url = "https://dl.google.com/dl/cloudsdk/release/packages/google-cloud-sdk-coretools-linux-static-20150619081534.tar.gz";
+    sha256 = "10158kyihkmwmb6i8n0fh1dzjvqs8xpwqp6i9xfaxsr2yzxdkqs2";
   };
 
   buildInputs = [python27 makeWrapper];

From 32af0c1f7dbe962c3a1e801ad2439351cf78bdd1 Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Tue, 23 Jun 2015 12:11:27 +0300
Subject: [PATCH 1496/2322] spotify: remove broken 32-bit support and cleanup
 workarounds

---
 pkgs/applications/audio/spotify/default.nix | 36 ++++-----------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index d66029199ce..005b3e1b60d 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -3,12 +3,10 @@
 , libgcrypt, chromium, udev, fontconfig
 , dbus, expat }:
 
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+assert stdenv.system == "x86_64-linux";
 
 let
-  version = if stdenv.system == "i686-linux"
-    then "0.9.4.183.g644e24e.428"
-    else "0.9.17.1.g9b85d43.7";
+  version = "0.9.17.1.g9b85d43.7";
 
   deps = [
     alsaLib
@@ -29,6 +27,7 @@ let
     pango
     qt4
     stdenv.cc.cc
+    udev
     xlibs.libX11
     xlibs.libXcomposite
     xlibs.libXdamage
@@ -47,17 +46,10 @@ stdenv.mkDerivation {
   name = "spotify-${version}";
 
   src =
-    if stdenv.system == "i686-linux" then
-      fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_i386.deb";
-        sha256 = "1wl6v5x8vm74h5lxp8fhvmih8l122aadsf1qxvpk0k3y6mbx0ifa";
-      }
-    else if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_amd64.deb";
-        sha256 = "0x87q7gd2997sgppsm4lmdiz1cm11x5vnd5c34nqb5d4ry5qfyki";
-      }
-    else throw "Spotify not supported on this platform.";
+    fetchurl {
+      url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_amd64.deb";
+      sha256 = "0x87q7gd2997sgppsm4lmdiz1cm11x5vnd5c34nqb5d4ry5qfyki";
+    };
 
   buildInputs = [ dpkg makeWrapper ];
 
@@ -74,24 +66,10 @@ stdenv.mkDerivation {
       # Work around Spotify referring to a specific minor version of
       # OpenSSL.
 
-      ln -s ${nss}/lib/libnss3.so $libdir/libnss3.so.1d
-      ln -s ${nss}/lib/libnssutil3.so $libdir/libnssutil3.so.1d
-      ln -s ${nss}/lib/libsmime3.so $libdir/libsmime3.so.1d
-
-      ${if stdenv.system == "x86_64-linux" then ''
       ln -s ${openssl}/lib/libssl.so $libdir/libssl.so.1.0.0
       ln -s ${openssl}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0
       ln -s ${nspr}/lib/libnspr4.so $libdir/libnspr4.so
       ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so
-      '' else ''
-      ln -s ${openssl}/lib/libssl.so $libdir/libssl.so.0.9.8
-      ln -s ${openssl}/lib/libcrypto.so $libdir/libcrypto.so.0.9.8
-      ln -s ${nspr}/lib/libnspr4.so $libdir/libnspr4.so.0d
-      ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so.0d
-      ''}
-
-      # Work around Spotify trying to open libudev.so.1 (which we don't have)
-      ln -s ${udev}/lib/libudev.so.1 $libdir/libudev.so.1
 
       mkdir -p $out/bin
 

From d9085b845ea0c8c0faf0d4b8144462bbf2f6ed6a Mon Sep 17 00:00:00 2001
From: Erik Hahn <erik_hahn@gmx.de>
Date: Tue, 23 Jun 2015 03:27:12 +0200
Subject: [PATCH 1497/2322] pypeg2: init at 2.15.1

---
 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 1469bfcbcfd..cf8e91ee187 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16043,5 +16043,21 @@ let
     };
   };
 
+  pypeg2 = buildPythonPackage rec {
+    version = "2.15.1";
+    name = "pypeg2-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pyPEG2/pyPEG2-${version}.tar.gz";
+      sha256 = "f4814a5f9c84bbb0794bef8d2a5871f4aed25366791c55e2162681873ad8bd21";
+    };
+
+    meta = {
+      description = "PEG parser interpreter in Python";
+      homepage = http://fdik.org/pyPEG;
+      license = licenses.gpl2;
+    };
+  };
+
 
 }; in pythonPackages

From 006e7ae04e8b99020f192310a77eccd93e841633 Mon Sep 17 00:00:00 2001
From: Erik Hahn <erik_hahn@gmx.de>
Date: Tue, 23 Jun 2015 03:25:25 +0200
Subject: [PATCH 1498/2322] qutebrowser: init at 0.2.1

---
 .../browsers/qutebrowser/default.nix          | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/qutebrowser/default.nix

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
new file mode 100644
index 00000000000..da514c614b0
--- /dev/null
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2}:
+
+let version = "0.2.1"; in
+
+buildPythonPackage {
+  name = "qutebrowser-${version}";
+  namePrefix = "";
+  
+  src = fetchurl {
+    url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";
+    sha256 = "b741a1a0336b8d36133603a3318d1c4c63c9abf50212919200cd2ae665b07111";
+    };
+    # Needs tox
+    doCheck = false;
+
+    propagatedBuildInputs = [
+      python pyyaml pyqt5 jinja2 pygments pypeg2
+    ];
+    
+    meta = {
+      homepage = https://github.com/The-Compiler/qutebrowser;
+      description = "Keyboard-focused browser with a minimal GUI";
+      license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ada3e3bd1f7..d74550f2c79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12299,6 +12299,10 @@ let
     gst_plugins_bad = null;
   };
 
+  qutebrowser = callPackage ../applications/networking/browsers/qutebrowser {
+    inherit (python34Packages) buildPythonPackage python pyqt5 jinja2 pygments pyyaml pypeg2;
+  };
+
   rakarrack = callPackage ../applications/audio/rakarrack {
     inherit (xorg) libXpm libXft;
     fltk = fltk13;

From 04f6a1c6656a69d3a7b9786a69051da5eceaa4c5 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Thu, 11 Jun 2015 15:22:18 +0100
Subject: [PATCH 1499/2322] pandas: Update to 0.16.1, closes #8288

Note that I could remove the line-switching hack because
the problem has been fixed upstream:

https://github.com/fvia/pandas/commit/09a7a69e116
---
 pkgs/top-level/python-packages.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1469bfcbcfd..3563f5a3bad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8241,11 +8241,11 @@ let
   };
 
   pandas = buildPythonPackage rec {
-    name = "pandas-0.15.0";
+    name = "pandas-0.16.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pandas/${name}.tar.gz";
-      sha256 = "1w3wjnn3v37hf3hrd24lfgk6vpykarv9mihhpcfq6y7rg586bgjk";
+      sha256 = "1dpq5p4iym7y13wkrm0hma87rvvv5rfj5fb10iwbys5hihzj83ap";
     };
 
     buildInputs = [ self.nose ];
@@ -8259,18 +8259,18 @@ let
       bottleneck
       sqlalchemy9
       lxml
+      html5lib
       modules.sqlite3
+      beautifulsoup4
     ];
 
     preCheck = ''
-      # Need to do this patch or tests will fail (swaps 1st and 2nd lines).
-      # See: https://github.com/pydata/pandas/commit/c4bcc2054bfd2f89b640bea0c9a109b0184d6710
-      first=$(sed -n '1p' < pandas/tests/test_format.py)
-      second=$(sed -n '2p' < pandas/tests/test_format.py)
-      rest=$(tail -n +3 pandas/tests/test_format.py)
-      echo $second > pandas/tests/test_format.py
-      echo $first >> pandas/tests/test_format.py
-      echo "$rest" >> pandas/tests/test_format.py
+      # Broken test, probably https://github.com/pydata/pandas/issues/10312:
+      rm pandas/io/tests/test_html.py
+
+      # Hitting https://github.com/pydata/pandas/pull/7362 on python
+      # 3.3 and 3.4, not sure why:
+      rm pandas/tseries/tests/test_daterange.py
 
       # Need to skip this test; insert a line here... hacky but oh well.
       badtest=pandas/tseries/tests/test_timezones.py

From 110aabbb67475c3f8cfba06739811b7b43384adb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 23 Jun 2015 15:10:03 +0200
Subject: [PATCH 1500/2322] liferea: maintenance update

---
 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 28baa2f7b67..ebf90f8f59f 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -6,14 +6,14 @@
 }:
 
 let pname = "liferea";
-    version = "1.10.15";
+    version = "1.10.16";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "0iicw42rf0vhq4xs81awlj5v3v7xfid3h5fh87f3bqbpn9pmifdg";
+    sha256 = "0b8cvlyiamc4hwjcxzs0h3mk3gxnmnwyi79mjv36601xgfjs5f9j";
   };
 
   buildInputs = with gst_all_1; [

From c491e4669d173fbfc02a1b064ddc02b1b0e7cbc2 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 23 Jun 2015 15:37:36 +0200
Subject: [PATCH 1501/2322] parallel: update from 20150522 to 20150622

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index c78bf748296..cfbe32e579c 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20150522";
+  name = "parallel-20150622";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "01pkckrad3d2i7mkw98zxymp22rsngyjknhh18i4m6hq82bijjjc";
+    sha256 = "0j7gg88zk2r4jv3mvmrl4bhwcv9k8rxanygp6lssbx685ab9qfln";
   };
 
   patchPhase =

From 3dd96b1a2ca5c7ac8ce9e1613852aa9ded43e6c1 Mon Sep 17 00:00:00 2001
From: Richard Wallace <rwallace@thewallacepack.net>
Date: Sat, 20 Jun 2015 22:33:08 -0700
Subject: [PATCH 1502/2322] hoogle files are generated correctly with ghc
 7.10.1, hipbot builds correctly.

---
 .../haskell-modules/configuration-ghc-7.10.x.nix           | 7 -------
 1 file changed, 7 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 f2e0fb056e7..92417e5e681 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -44,10 +44,6 @@ self: super: {
   # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
   jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal;
 
-  # GHC 7.10.x's Haddock binary cannot generate hoogle files.
-  # https://ghc.haskell.org/trac/ghc/ticket/9921
-  mkDerivation = drv: super.mkDerivation (drv // { doHoogle = false; });
-
   idris =
     let idris' = overrideCabal super.idris (drv: {
       # "idris" binary cannot find Idris library otherwise while building.
@@ -231,9 +227,6 @@ self: super: {
   seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0;
   vector_0_10_9_3 = markBroken super.vector_0_10_9_3;
 
-  # https://github.com/purefn/hipbot/issues/1
-  hipbot = dontDistribute super.hipbot;
-
   # https://github.com/HugoDaniel/RFC3339/issues/14
   timerep = dontCheck super.timerep;
 

From 296870710107f1ce0c84faa36a8486c88a003417 Mon Sep 17 00:00:00 2001
From: Susan Potter <me@susanpotter.net>
Date: Mon, 22 Jun 2015 13:14:19 -0500
Subject: [PATCH 1503/2322] jruby: 1.7.12 -> 1.7.20.1

Security release which only updates Rubygems to version 2.4.8. Rubygems 2.4.8
addresses CVE-2015-1855 to resolve some problems with wildcard matching of
hostnames.

See following entry for more information:
http://jruby.org/2015/06/10/jruby-1-7-20-1.html
---
 pkgs/development/interpreters/jruby/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index ab559aa9e65..bc76e334b55 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "jruby-${version}";
 
-  version = "1.7.12";
+  version = "1.7.20.1";
 
   src = fetchurl {
     url = "http://jruby.org.s3.amazonaws.com/downloads/${version}/jruby-bin-${version}.tar.gz";
-    sha1 = "056cee1138e49da40a77f179b771372692479002";
+    sha1 = "6a6e701a3a5769ec5d53a78660521c37da36e41f";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27169e6ee0d..d0cc669f425 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5104,7 +5104,7 @@ let
 
   jdtsdk = callPackage ../development/eclipse/jdt-sdk { };
 
-  jruby165 = callPackage ../development/interpreters/jruby { };
+  jruby = callPackage ../development/interpreters/jruby { };
 
   jython = callPackage ../development/interpreters/jython {};
 

From 6532863ac4328f5f65edc179b4b98cefbec02267 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 23 Jun 2015 10:09:34 -0700
Subject: [PATCH 1504/2322] unifi: 3.2.10 -> 4.6.3

---
 nixos/modules/services/networking/unifi.nix | 2 +-
 pkgs/servers/unifi/default.nix              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index fd9e58f24a4..be8f12ecd32 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -71,7 +71,7 @@ in
         rm -rf "${stateDir}/webapps"
         mkdir -p "${stateDir}/webapps"
         chown unifi "${stateDir}/webapps"
-        ln -s "${pkgs.unifi}/webapps/ROOT.war" "${stateDir}/webapps/ROOT.war"
+        ln -s "${pkgs.unifi}/webapps/ROOT" "${stateDir}/webapps/ROOT"
       '';
 
       postStop = ''
diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index 7b8aa58e305..2f3230d148e 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 = "3.2.10";
+  version = "4.6.3";
 
   src = fetchurl {
     url = "http://dl.ubnt.com/unifi/${version}/UniFi.unix.zip";
-    sha256 = "0hrb8bbpkz1ijgsqsxhwjx1iq11ircr0pb2n5nr6hna9zxkkkb04";
+    sha256 = "046qx7ghz5b1s4kg6aqvdiq7ck589c8x2cc3x03crcdjjj33rirq";
   };
 
   buildInputs = [ unzip ];

From c8e66bb9acaa3b70a02cdd043b6f2bc8a39c41a0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 23 Jun 2015 23:46:53 +0200
Subject: [PATCH 1505/2322] autoconf-archive: update from 2014.10.15 to
 2015.02.25

and use mirror://
---
 pkgs/development/tools/misc/autoconf-archive/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix
index c5c965ac58e..76806bebd26 100644
--- a/pkgs/development/tools/misc/autoconf-archive/default.nix
+++ b/pkgs/development/tools/misc/autoconf-archive/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xz }:
 stdenv.mkDerivation rec {
   name = "autoconf-archive-${version}";
-  version = "2014.10.15";
+  version = "2015.02.24";
 
   src = fetchurl {
-    url = "http://ftp.heanet.ie/mirrors/gnu/autoconf-archive/autoconf-archive-${version}.tar.xz";
-    sha256 = "198yrdf8bhrpl7insdyzn65zd60qll0gr9vpz7fl7dpcj78yc7gy";
+    url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz";
+    sha256 = "1i8d5cvijkfqhjdnb7imy36qpjqi7ra992j9bsl2qmcg0zfmnwb9";
   };
   buildInputs = [ xz ];
 

From d6acec03bbbc883555f24ad28ce3d28a181d67e5 Mon Sep 17 00:00:00 2001
From: Erik Hahn <erik_hahn@gmx.de>
Date: Wed, 24 Jun 2015 00:10:54 +0200
Subject: [PATCH 1506/2322] qutebrowser: fix license

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

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index da514c614b0..d97f36f1151 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -20,6 +20,6 @@ buildPythonPackage {
     meta = {
       homepage = https://github.com/The-Compiler/qutebrowser;
       description = "Keyboard-focused browser with a minimal GUI";
-      license = stdenv.lib.licenses.gpl3;
+      license = stdenv.lib.licenses.gpl3Plus;
   };
 }

From 3f762e27ec9a28f680eb0dc5f2987f53b528daab Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Sun, 14 Jun 2015 22:21:11 -0500
Subject: [PATCH 1507/2322]  monodevelop: 5.9.0.431 -> 5.9.4.5

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

diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index b27bc75ed59..69d6a3b2789 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -5,13 +5,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.9.0.431";
-  revision = "7560726734fc7267de2fa9abed2509968deefaa8";
+  version = "5.9.4.5";
+  revision = "8010a90f6e246b32364e3fb46ef2c9d1be9c9a2b";
   name = "monodevelop-${version}";
 
   src = fetchurl {
     url = "http://download.mono-project.com/sources/monodevelop/${name}.tar.bz2";
-    sha256 = "1bgqvlfi6pilj2zxsviqilh63qq98wsijqdiqwpkqchcw741zlyn";
+    sha256 = "0bim4bfv3zwijafl9g0cx3159zq43dlcv74mnyrda41j4p52w5ji";
   };
 
   nunit2510 = fetchurl {

From 24bb5d1a944f4aa4e14790e107c6fd9cada7b932 Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Sat, 13 Jun 2015 00:56:47 -0400
Subject: [PATCH 1508/2322] dotnet: Paket 1.6.2 -> 1.18.2

---
 pkgs/top-level/dotnet-packages.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index e08af379da8..fb9988eac92 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -426,12 +426,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
   Paket = buildDotnetPackage rec {
     baseName = "Paket";
-    version = "1.6.2";
+    version = "1.18.2";
 
-    src = fetchurl {
-      name = "${baseName}-${version}.tar.gz";
-      url = "https://github.com/fsprojects/Paket/archive/${version}.tar.gz";
-      sha256 = "1ryslxdgc3r7kcn1gq4bqcyrqdi8z6364aj3lr7yjz71wi22fca8";
+    src = fetchFromGitHub {
+      owner = "fsprojects";
+      repo = "Paket";
+      rev = version;
+      sha256 = "04iwy3mggz7xn36lhzyrwqzlw451a16jblwx131qjm6fnac6rq1m";
     };
 
     buildInputs = [
@@ -447,12 +448,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
       sha256 = "1zxigqgb2s2v755622jbbzibvf91990x2dijhbdgg646vsybkpdp";
     };
 
-    # fileOctokit = fetchurl {
-    #   name = "Octokit.fsx";
-    #   url = https://raw.githubusercontent.com/fsharp/FAKE/8e65e2fc1406f326b44f3f87ec9ca9b3127a6e78/modules/Octokit/Octokit.fsx;
-    #   sha256 = "16qxwmgyg3fn3z9a8hppv1m579828x7lvfj8qflcgs2g6ciagsir";
-    # };
-
     fileGlobbing = fetchurl {
       name = "Globbing.fs";
       url = https://raw.githubusercontent.com/fsharp/FAKE/8e65e2fc1406f326b44f3f87ec9ca9b3127a6e78/src/app/FakeLib/Globbing/Globbing.fs;
@@ -477,7 +472,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
        cp -v "${fileErrorHandling}" "paket-files/fsprojects/Chessie/src/Chessie/ErrorHandling.fs"
     '';
 
-    xBuildFiles = [ ];
+    xBuildFiles = [ "Paket.sln" ];
 
     outputFiles = [ "bin/*" ];
     exeFiles = [ "paket.exe" ];

From 58418eaa67eb2903c307706b48ed0bcc0886854f Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Sat, 13 Jun 2015 09:17:39 -0400
Subject: [PATCH 1509/2322] dotnet: FSharp.AutoComplete 0.16.0 -> 0.18.2

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index fb9988eac92..3a6c452ffec 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -149,12 +149,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
   FSharpAutoComplete = buildDotnetPackage rec {
     baseName = "FSharp.AutoComplete";
-    version = "0.16.0";
+    version = "0.18.2";
 
-    src = fetchurl {
-      name = "${baseName}-${version}.tar.gz";
-      url = "https://github.com/fsharp/FSharp.AutoComplete/archive/${version}.tar.gz";
-      sha256 = "0mwp456zfw1sjy2mafz2shx0sjn4f858pfnsmawy50g8l2znw8qg";
+    src = fetchFromGitHub {
+      owner = "fsharp";
+      repo = "FSharp.AutoComplete";
+      rev = version;
+      sha256 = "1ikl72003xzqq2dc8i6h404hnq3q5g1p1q4rmzz9bdm7282q2jgs";
     };
 
     buildInputs = [

From 14dcf50cb171b729ed4e6d0a11f4a39cd966721a Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Sat, 13 Jun 2015 09:29:48 -0400
Subject: [PATCH 1510/2322] dotnet: package MathNet.Numerics 3.7.0

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 3a6c452ffec..20dfe4e47b7 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -278,6 +278,30 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
   #   };
   # };
 
+  MathNetNumerics = buildDotnetPackage rec {
+    baseName = "MathNet.Numerics";
+    version = "3.7.0";
+
+    src = fetchurl {
+      name = "${baseName}-${version}.tar.gz";
+      url = "https://github.com/mathnet/mathnet-numerics/archive/v${version}.tar.gz";
+      sha256 = "1yq6aqmc2gwh96z544qn83kby01lv1lsxm158hq0bimv2i9yywc7";
+    };
+
+    buildInputs = [ fsharp ];
+
+    xBuildFiles = [ "MathNet.Numerics.sln" ];
+    outputFiles = [ "out/lib/Net40/*" "src/FSharp/MathNet.Numerics.fsx" "src/FSharp/MathNet.Numerics.IfSharp.fsx" ];
+
+    meta = {
+      description = "Math.NET Numerics is an opensource numerical library for .Net, Silverlight and Mono.";
+      homepage = http://numerics.mathdotnet.com/;
+      license = stdenv.lib.licenses.mit;
+      maintainers = with stdenv.lib.maintainers; [ obadz ];
+      platforms = with stdenv.lib.platforms; linux;
+    };
+  };
+
   MonoDevelopFSharpBinding = buildDotnetPackage rec {
     baseName = "MonoDevelop.FSharpBinding";
     version = "git-a09c8185eb";

From 9c205124e4547da214df4f1b73937dce0cbcc350 Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Sun, 14 Jun 2015 01:42:09 -0400
Subject: [PATCH 1511/2322] dotnet: package ExcelDna 0.32.0 +
 ExcelDna.Registration

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 20dfe4e47b7..a6ff1d0924d 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -113,6 +113,65 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
   # SOURCE PACKAGES
 
+  ExcelDna = buildDotnetPackage rec {
+    baseName = "Excel-DNA";
+    version = "0.32.0";
+
+    src = fetchFromGitHub {
+      owner = "Excel-DNA";
+      repo = "ExcelDna";
+      rev = "10a163843bcc2fb5517f6f3d499e18a8b64df511";
+      sha256 = "1w2ag9na20ly0m2sic3nkgdc4qqyb4x4c9iv588ynpkgd1pjndrk";
+    };
+
+    buildInputs = [ ];
+
+    preConfigure = ''
+      rm -vf Distribution/*.dll Distribution/*.exe # Make sure we don't use those
+      substituteInPlace Source/ExcelDna.Integration/ExcelDna.Integration.csproj --replace LogDisplay.designer.cs LogDisplay.Designer.cs
+    '';
+
+    xBuildFiles = [ "Source/ExcelDna.sln" ];
+    outputFiles = [ "Source/ExcelDnaPack/bin/Release/*" "Distribution/ExcelDna.xll" "Distribution/ExcelDna64.xll" ];
+
+    meta = {
+      description = "Excel-DNA is an independent project to integrate .NET into Excel";
+      homepage = "http://excel-dna.net/";
+      license = stdenv.lib.licenses.mit;
+      maintainers = with stdenv.lib.maintainers; [ obadz ];
+      platforms = with stdenv.lib.platforms; linux;
+    };
+  };
+
+  ExcelDnaRegistration = buildDotnetPackage rec {
+    baseName = "Excel-DNA.Registration";
+    version = "git-" + (builtins.substring 0 10 rev);
+    rev = "69abb1b3528f40dbcf425e13690aaeab5f707bb6";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "Excel-DNA";
+      repo = "Registration";
+      sha256 = "094932h6r2f4x9r5mnw8rm4jzz8vkfv90d95qi3h0i89ws2dnn07";
+    };
+
+    buildInputs = [
+      fsharp
+      dotnetPackages.ExcelDna
+    ];
+
+    xBuildFiles = [ "Source/ExcelDna.Registration/ExcelDna.Registration.csproj" "Source/ExcelDna.Registration.FSharp/ExcelDna.Registration.FSharp.fsproj" ];
+    outputFiles = [ "Source/ExcelDna.Registration/bin/Release/*" "Source/ExcelDna.Registration.FSharp/bin/Release/*FSharp*" ];
+
+    meta = {
+      description = "This library implements helper functions to assist and modify the Excel-DNA function registration";
+      homepage = "https://github.com/Excel-DNA/Registration";
+      license = stdenv.lib.licenses.mit;
+      maintainers = with stdenv.lib.maintainers; [ obadz ];
+      platforms = with stdenv.lib.platforms; linux;
+    };
+  };
+
   ExtCore = buildDotnetPackage rec {
     baseName = "ExtCore";
     version = "0.8.46";

From 3e6d95fc2ae8b543c2146e2b1ec94e946536c73a Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Sun, 14 Jun 2015 22:42:41 -0500
Subject: [PATCH 1512/2322] dotnet: FSharp.Data 2.2.2 -> 2.2.3

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index a6ff1d0924d..6e2f0371e3d 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -264,12 +264,12 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
   FSharpData = buildDotnetPackage rec {
     baseName = "FSharp.Data";
-    version = "2.2.2";
+    version = "2.2.3";
 
     src = fetchurl {
       name = "${baseName}-${version}.tar.gz";
       url = "https://github.com/fsharp/FSharp.Data/archive/${version}.tar.gz";
-      sha256 = "1li33ydjxz18v8siw53vv1nmkp5w7sdlsjcrfp6dzcynpvwbjw3s";
+      sha256 = "162ncwjyc74ndh3m5dpppg9aag1f8ijkjwv5dx0mid3mw592bjh1";
     };
 
     buildInputs = [ fsharp ];

From 0092d04d259eb401b6e7a56667608b36d33becd4 Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Mon, 15 Jun 2015 01:12:07 -0500
Subject: [PATCH 1513/2322] dotnet: package Deedle 1.2.0

---
 pkgs/top-level/dotnet-packages.nix | 62 ++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 6e2f0371e3d..b08d5d5f90b 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -81,6 +81,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "Lib/Net40/*" ];
   };
 
+  FSharpFormatting = fetchNuGet {
+    baseName = "FSharp.Formatting";
+    version = "2.9.8";
+    sha256 = "1bswcpa68i2lqds4kkl2qxgkfrppbpxa4jkyja48azljajh0df3m";
+    outputFiles = [ "lib/net40/*" ];
+  };
+
   NUnit = fetchNuGet {
     baseName = "NUnit";
     version = "2.6.4";
@@ -113,6 +120,52 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
   # SOURCE PACKAGES
 
+  Deedle = buildDotnetPackage rec {
+    baseName = "Deedle";
+    version = "1.2.0";
+
+    src = fetchFromGitHub {
+      owner = "BlueMountainCapital";
+      repo = baseName;
+      rev = "v${version}";
+      sha256 = "115zzh3q57w8wr02cl2v8wijnj1rg01j1mk9zbzixbb4aird72n5";
+    };
+
+    # Enough files from this repo are needed that it will be quicker to just get the entire repo
+    fsharpDataSrc = fetchFromGitHub {
+      owner = "fsharp";
+      repo = "FSharp.Data";
+      rev = "2.2.3";
+      sha256 = "1h3v9rc8k0khp61cv5n01larqbxd3xcx3q52sw5zf9l0661vw7qr";
+    };
+
+    buildInputs = [
+      fsharp
+      dotnetPackages.FsCheck
+      dotnetPackages.FSharpCompilerService
+      dotnetPackages.FSharpData
+      dotnetPackages.FSharpFormatting
+      dotnetPackages.MathNetNumerics
+      dotnetPackages.NUnit
+    ];
+
+    preConfigure = ''
+      mkdir -vp paket-files/fsharp
+      ln -sv ${fsharpDataSrc} paket-files/fsharp/FSharp.Data
+    '';
+
+    xBuildFiles = [ "Deedle.Core.sln" ];  # Come back later to get RProvider as well
+    outputFiles = [ "bin/*" "LICENSE.md" ];
+
+    meta = {
+      description = "Deedle is an easy to use library for data and time series manipulation and for scientific programming";
+      homepage = "http://bluemountaincapital.github.io/Deedle/";
+      license = stdenv.lib.licenses.free;
+      maintainers = with stdenv.lib.maintainers; [ obadz ];
+      platforms = with stdenv.lib.platforms; linux;
+    };
+  };
+
   ExcelDna = buildDotnetPackage rec {
     baseName = "Excel-DNA";
     version = "0.32.0";
@@ -266,10 +319,11 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     baseName = "FSharp.Data";
     version = "2.2.3";
 
-    src = fetchurl {
-      name = "${baseName}-${version}.tar.gz";
-      url = "https://github.com/fsharp/FSharp.Data/archive/${version}.tar.gz";
-      sha256 = "162ncwjyc74ndh3m5dpppg9aag1f8ijkjwv5dx0mid3mw592bjh1";
+    src = fetchFromGitHub {
+      owner = "fsharp";
+      repo = baseName;
+      rev = version;
+      sha256 = "1h3v9rc8k0khp61cv5n01larqbxd3xcx3q52sw5zf9l0661vw7qr";
     };
 
     buildInputs = [ fsharp ];

From e45788993b5bbf26df97b0d39360feadab1724ec Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Tue, 23 Jun 2015 22:43:39 +0100
Subject: [PATCH 1514/2322] dotnet: FSharp.Compiler.Service 0.0.89 -> 0.0.90

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index b08d5d5f90b..97e0f62cf8b 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -290,13 +290,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
   FSharpCompilerService = buildDotnetPackage rec {
     baseName = "FSharp.Compiler.Service";
-    version = "0.0.89";
+    version = "0.0.90";
 
     src = fetchFromGitHub {
       owner = "fsharp";
       repo = "FSharp.Compiler.Service";
-      rev = "55a8143a82bb31c3e8c1ad2af64eb64162fed0d7";
-      sha256 = "1f5f97382h8v9p0j7c2gksrps12d869m752n692b3g0k8h4zpial";
+      rev = "a87939ab3f3c571cad79bc3b5f298aa3e180e6b3";
+      sha256 = "0axr38q8m0h11hhbxg5myd1wwfgysadriln8c7bqsv5sf9djihvd";
     };
 
     buildInputs = [

From 33e0dbbc4ba2eb4f3566dff2029ff45bf5e8938f Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Tue, 23 Jun 2015 22:26:16 +0100
Subject: [PATCH 1515/2322] dotnet: package Projekt

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 97e0f62cf8b..21b42d1273b 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -624,6 +624,39 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     };
   };
 
+  Projekt = buildDotnetPackage rec {
+    baseName = "projekt";
+    version = "git-" + (builtins.substring 0 10 rev);
+    rev = "715a21e5cd3c86310387562618b04e979d0ec9c4";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "kjnilsson";
+      repo = "projekt";
+      sha256 = "1ph3af07wmia6qkiq1qlywaj2xh6zn5drdx19dwb1g3237h5fnz0";
+    };
+
+    buildInputs = [
+      fsharp
+      dotnetPackages.UnionArgParser
+      dotnetPackages.FsUnit
+    ];
+
+    preConfigure = ''
+      sed -i -e "s/FSharp.Core, Version=\$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a/FSharp.Core/" src/Projekt/Projekt.fsproj
+    '';
+
+    outputFiles = [ "src/Projekt/bin/Release/*" ];
+
+    meta = {
+      description = "A command-line tool for manipulating F# project files";
+      homepage = "https://github.com/kjnilsson/projekt";
+      license = stdenv.lib.licenses.mit;
+      maintainers = with stdenv.lib.maintainers; [ obadz ];
+      platforms = with stdenv.lib.platforms; linux;
+    };
+  };
+
   UnionArgParser = buildDotnetPackage rec {
     baseName = "UnionArgParser";
     version = "0.8.7";

From 3ec096f65bb69eeee85fc1afa4dc75ed3201bac4 Mon Sep 17 00:00:00 2001
From: "Ryan Scheel (Havvy)" <ryan.havvy@gmail.com>
Date: Wed, 24 Jun 2015 01:51:05 +0200
Subject: [PATCH 1516/2322] iojs: 2.2.1 -> 2.3.1, closes #8478

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

diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix
index 2ed6e1adade..8c90e421944 100644
--- a/pkgs/development/web/iojs/default.nix
+++ b/pkgs/development/web/iojs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }:
 
 let
-  version = "2.2.1";
+  version = "2.3.1";
   inherit (stdenv.lib) optional maintainers licenses platforms;
 in stdenv.mkDerivation {
   name = "iojs-${version}";
 
   src = fetchurl {
     url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
-    sha256 = "1ylmj69nwhqqwn1grphlrzny9dp4bspx4172q41izr6dyk29rrsm";
+    sha256 = "1vkahs7ky551gl52l8j8f2w8ajasjblqqmhird5ll87wccx8w6f2";
   };
 
   prePatch = ''

From 723cd518b9a29be5e1c5f0015aa4a1563af830ac Mon Sep 17 00:00:00 2001
From: laMudri <lamudri@gmail.com>
Date: Tue, 23 Jun 2015 23:17:51 +0100
Subject: [PATCH 1517/2322] hol: k.8 -> k.10, closes #8477

---
 .../science/logic/hol/default.nix             | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix
index a7cdf7f3097..f8a57aebb6d 100644
--- a/pkgs/applications/science/logic/hol/default.nix
+++ b/pkgs/applications/science/logic/hol/default.nix
@@ -1,22 +1,33 @@
-{stdenv, fetchurl, polyml, graphviz, fontconfig, liberation_ttf,
+{stdenv, pkgs, fetchurl, graphviz, fontconfig, liberation_ttf,
  experimentalKernel ? true}:
 
 let
   pname = "hol4";
-  version = "k.8";
-  holsubdir = "hol-kananaskis-8";
+  vnum = "10";
+in
+
+let
+  version = "k.${vnum}";
+  longVersion = "kananaskis-${vnum}";
+  holsubdir = "hol-${longVersion}";
   kernelFlag = if experimentalKernel then "-expk" else "-stdknl";
 in
 
+let
+  polymlEnableShared = with pkgs; lib.overrideDerivation polyml (attrs: {
+    configureFlags = "--enable-shared";
+  });
+in
+
 stdenv.mkDerivation {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = mirror://sourceforge/hol/hol/kananaskis-8/kananaskis-8.tar.gz;
-    sha256 = "5ce4c1e37301dbc38772694e98f1c7eabf69255908de204b280d8b2b1709e9d0";
+    url = "mirror://sourceforge/hol/hol/${longVersion}/${holsubdir}.tar.gz";
+    sha256 = "0x2wxksr305h1lrbklf6p42lp09rbhb4rsh74g0l70sgapyiac9b";
   };
 
-  buildInputs = [polyml graphviz fontconfig liberation_ttf];
+  buildInputs = [polymlEnableShared graphviz fontconfig liberation_ttf];
 
   buildCommand = ''
 
@@ -46,7 +57,7 @@ stdenv.mkDerivation {
     #sed -ie "/compute/,999 d" tools/build-sequence # for testing
 
     poly < tools/smart-configure.sml
-    
+
     bin/build ${kernelFlag} -symlink
 
     mkdir -p "$out/bin"
@@ -54,7 +65,7 @@ stdenv.mkDerivation {
     # ln -s $out/src/hol4.${version}/bin $out/bin
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Interactive theorem prover based on Higher-Order Logic";
     longDescription = ''
       HOL4 is the latest version of the HOL interactive proof
@@ -69,6 +80,7 @@ stdenv.mkDerivation {
       checking.
     '';
     homepage = "http://hol.sourceforge.net/";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ mudri ];
   };
 }

From 17898cf533203035122ddc454e5bc1478762330d Mon Sep 17 00:00:00 2001
From: Michael Phillips <michaelalanphillips@gmail.com>
Date: Mon, 22 Jun 2015 18:17:02 -0500
Subject: [PATCH 1518/2322] gyp: fix cflags on darwin

---
 .../python-modules/gyp/no-darwin-cflags.patch | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/gyp/no-darwin-cflags.patch b/pkgs/development/python-modules/gyp/no-darwin-cflags.patch
index d81ea0d1c12..353cc133b53 100644
--- a/pkgs/development/python-modules/gyp/no-darwin-cflags.patch
+++ b/pkgs/development/python-modules/gyp/no-darwin-cflags.patch
@@ -1,8 +1,8 @@
 Index: gyp/pylib/gyp/xcode_emulation.py
 ===================================================================
---- gyp/pylib/gyp/xcode_emulation.py	(revision 1635)
-+++ gyp/pylib/gyp/xcode_emulation.py	(working copy)
-@@ -280,9 +280,6 @@
+--- gyp/pylib/gyp/xcode_emulation.py
++++ gyp/pylib/gyp/xcode_emulation.py
+@@ -483,9 +483,6 @@
      if self._Test('GCC_CHAR_IS_UNSIGNED_CHAR', 'YES', default='NO'):
        cflags.append('-funsigned-char')
  
@@ -12,7 +12,7 @@ Index: gyp/pylib/gyp/xcode_emulation.py
      if 'GCC_DYNAMIC_NO_PIC' in self._Settings():
        if self._Settings()['GCC_DYNAMIC_NO_PIC'] == 'YES':
          cflags.append('-mdynamic-no-pic')
-@@ -292,9 +289,6 @@
+@@ -495,9 +492,6 @@
        # mdynamic-no-pic by default for executable and possibly static lib
        # according to mento
  
@@ -22,7 +22,7 @@ Index: gyp/pylib/gyp/xcode_emulation.py
      self._Appendf(cflags, 'GCC_OPTIMIZATION_LEVEL', '-O%s', default='s')
  
      if self._Test('GCC_GENERATE_DEBUGGING_SYMBOLS', 'YES', default='YES'):
-@@ -311,12 +305,6 @@
+@@ -519,12 +513,6 @@
      if self._Test('GCC_SYMBOLS_PRIVATE_EXTERN', 'YES', default='NO'):
        cflags.append('-fvisibility=hidden')
  
@@ -32,10 +32,10 @@ Index: gyp/pylib/gyp/xcode_emulation.py
 -    if self._Test('GCC_WARN_ABOUT_MISSING_NEWLINE', 'YES', default='NO'):
 -      cflags.append('-Wnewline-eof')
 -
-     self._AppendPlatformVersionMinFlags(cflags)
- 
-     # TODO:
-@@ -334,7 +322,6 @@
+     # In Xcode, this is only activated when GCC_COMPILER_VERSION is clang or
+     # llvm-gcc. It also requires a fairly recent libtool, and
+     # if the system clang isn't used, DYLD_LIBRARY_PATH needs to contain the
+@@ -553,7 +541,6 @@
        # TODO: Supporting fat binaries will be annoying.
        self._WarnUnimplemented('ARCHS')
        archs = ['i386']
@@ -43,7 +43,7 @@ Index: gyp/pylib/gyp/xcode_emulation.py
  
      if archs[0] in ('i386', 'x86_64'):
        if self._Test('GCC_ENABLE_SSE3_EXTENSIONS', 'YES', default='NO'):
-@@ -570,7 +557,6 @@
+@@ -811,7 +798,6 @@
        # TODO: Supporting fat binaries will be annoying.
        self._WarnUnimplemented('ARCHS')
        archs = ['i386']

From e17494956bff369782e38c3c7f3ba43da020c390 Mon Sep 17 00:00:00 2001
From: Michael Phillips <michaelalanphillips@gmail.com>
Date: Mon, 22 Jun 2015 18:19:01 -0500
Subject: [PATCH 1519/2322] powerline: 2.1 -> 2.1.4, closes #8466

Makes powerline work again with tmux 2.0
---
 pkgs/top-level/python-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 48468554a10..3b104d27f14 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8862,12 +8862,12 @@ let
 
 
   powerline = buildPythonPackage rec {
-    rev  = "8164f42fb924f38dc5b9dd6d32063e8c3d41e504";
-    name = "powerline-2.1";
+    rev  = "2.1.4";
+    name = "powerline-${rev}";
     src = pkgs.fetchurl {
-      url    = "https://github.com/powerline/powerline/tarball/${rev}";
-      name   = "${name}.tar.bz";
-      sha256 = "0xrasj1lh9ypz1q6q4k997rfym9r16bclfbpzjqj8qfkp4i62lz6";
+      url    = "https://github.com/powerline/powerline/archive/${rev}.tar.gz";
+      name   = "${name}.tar.gz";
+      sha256 = "0gnh5yyackmqcphiympan48dm5lc834yzspss1lp4g1wq3vpyraf";
     };
 
     propagatedBuildInputs = with self; [ pkgs.git pkgs.mercurial pkgs.bazaar self.psutil self.pygit2 ];

From 1776016bf7f6a62edcd3b83e770f6a61c45702b9 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 24 Jun 2015 10:46:34 +0200
Subject: [PATCH 1520/2322] filezilla: update from 3.10.3 to 3.11.0.2

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

diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index e102f8037f1..98e2f613760 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 }:
 
-let version = "3.10.3"; in
+let version = "3.11.0.2"; in
 stdenv.mkDerivation {
   name = "filezilla-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "13fyg64vszq8zm1qb8g963cjar8mfz0gnymx86bvih1pjiwy4s3r";
+    sha256 = "1nc9d46jwz3x9dd6na1ds8rq8a797xr29r9wkhgxv6y20cla06rl";
   };
 
   configureFlags = [
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "http://filezilla-project.org/";
+    homepage = http://filezilla-project.org/;
     description = "Graphical FTP, FTPS and SFTP client";
     license = licenses.gpl2;
     longDescription = ''
@@ -29,5 +29,6 @@ stdenv.mkDerivation {
       provided.
     '';
     platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
   };
 }

From 7c0c2dc15bd6599fe818651a9ba8d05dbadd896f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Wed, 24 Jun 2015 17:12:07 +0800
Subject: [PATCH 1521/2322] tiled: update to 0.12.3 and build with qt5

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

diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 92cd5071306..b885e26fbef 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -1,14 +1,19 @@
-{ stdenv, fetchurl, qt }:
+{ stdenv, fetchurl, qt5, pkgconfig, python }:
+
+let
+  version = "0.12.3";
+  sha256 = "001j4lvb5d9h3m6vgz2na07637x6xg4bdvxi2hg4a0j9rikb4y40";
+in
 
 stdenv.mkDerivation rec {
-  name = "tiled-0.11.0";
+  name = "tiled-${version}";
 
   src = fetchurl {
-    url = "https://github.com/bjorn/tiled/archive/v0.11.0.tar.gz";
-    sha256 = "03a15vbzjfwc8dpifbjvd0gnr208mzmdkgs2nlc8zq6z0a4h4jqd";
+    url = "https://github.com/bjorn/tiled/archive/v${version}.tar.gz";
+    inherit sha256;
   };
 
-  buildInputs = [ qt ];
+  buildInputs = [ qt5.base qt5.tools pkgconfig python ];
 
   preConfigure = "qmake -r PREFIX=$out";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7831467504..72dfe213a88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3043,7 +3043,7 @@ let
 
   thc-hydra = callPackage ../tools/security/thc-hydra { };
 
-  tiled = callPackage ../applications/editors/tiled { qt = qt4; };
+  tiled = callPackage ../applications/editors/tiled { };
 
   tinc = callPackage ../tools/networking/tinc { };
 

From cf13409313993738332c6a4e33decab23c9bbb7c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 24 Jun 2015 11:15:44 +0200
Subject: [PATCH 1522/2322] fityk: update 1.2.9 to 1.3.0

---
 pkgs/applications/science/misc/fityk/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix
index 7a534fce4f6..7d9f8542eed 100644
--- a/pkgs/applications/science/misc/fityk/default.nix
+++ b/pkgs/applications/science/misc/fityk/default.nix
@@ -1,18 +1,22 @@
-{ stdenv, fetchurl, wxGTK30, boost, lua, zlib, bzip2, xylib, readline, gnuplot }:
+{ stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, boost, lua, zlib, bzip2
+, xylib, readline, gnuplot, swig3 }:
 
 let
   name    = "fityk";
-  version = "1.2.9";
+  version = "1.3.0";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/wojdyr/fityk/releases/download/v${version}/${name}-${version}.tar.bz2";
-    sha256 = "1gl938nd2jyya8b3gzbagm1jab2mkc9zvr6zsg5d0vkfdqlk0pv1";
+  src = fetchFromGitHub {
+    owner = "wojdyr";
+    repo = "fityk";
+    rev = "v${version}";
+    sha256 = "07xzhy47q5ddg1qn51qds4wp6r5g2cx8bla0hm0a9ipr2hg92lm9";
   };
 
-  buildInputs = [wxGTK30 boost lua zlib bzip2 xylib readline gnuplot ];
+  buildInputs = [ autoreconfHook wxGTK30 boost lua zlib bzip2 xylib readline
+    gnuplot swig3 ];
 
   meta = {
     description = "Curve fitting and peak fitting software";

From c112c3f51feb677ae268ad53255288d57a32f843 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 24 Jun 2015 11:30:38 +0200
Subject: [PATCH 1523/2322] hg-git: update to version 0.8.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 3b104d27f14..7c416a5295d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4916,14 +4916,14 @@ let
 
   hg-git = buildPythonPackage rec {
     name = "hg-git-${version}";
-    version = "0.7.0";
+    version = "0.8.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/h/hg-git/${name}.tar.gz";
-      sha256 = "1ab1phaqa8jrba6dqsf3b0lgx912j41b8dlkna9c2wxip63wvfcx";
+      sha256 = "07a5p5wfs60hmzv3h64fysvm91ablhiaf5ccpv3f8q61insdzvff";
     };
 
-    propagatedBuildInputs = with self; [ pkgs.mercurial dulwich ];
+    propagatedBuildInputs = with self; [ dulwich ];
 
     meta = {
       description = "Push and pull from a Git server using Mercurial";

From 922c5550154a3d6c518279835161757cc1c3a941 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 24 Jun 2015 11:30:59 +0200
Subject: [PATCH 1524/2322] mercurial: add hg-git support

Enable this feature by putting these lines into your ~/.hgrc file:

  [extensions]
  hgext.bookmarks =
  hggit =
---
 pkgs/applications/version-management/mercurial/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 565c95af508..2db8cf72350 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, makeWrapper, docutils, unzip
+{ stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich
 , guiSupport ? false, tk ? null, curses, cacert }:
 
 let
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     ''
       for i in $(cd $out/bin && ls); do
         wrapProgram $out/bin/$i \
-          --prefix PYTHONPATH : "$(toPythonPath "$out ${curses}")" \
+          --prefix PYTHONPATH : "$(toPythonPath "$out ${curses}"):$(toPythonPath "$out ${hg-git}"):$(toPythonPath "$out ${dulwich}")" \
           $WRAP_TK
       done
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efd2257ce57..26a7fbe3377 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11833,7 +11833,7 @@ let
   mendeley = callPackage ../applications/office/mendeley { };
 
   mercurial = callPackage ../applications/version-management/mercurial {
-    inherit (pythonPackages) curses docutils;
+    inherit (pythonPackages) curses docutils hg-git dulwich;
     guiSupport = false; # use mercurialFull to get hgk GUI
   };
 

From 4ad434e521fb27ecf9f3667a43307ee7a4346115 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 24 Jun 2015 11:37:30 +0200
Subject: [PATCH 1525/2322] python-dulwich: update to version 0.10.1a

---
 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 7c416a5295d..bd5cc9ed316 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4895,11 +4895,11 @@ let
 
   dulwich = buildPythonPackage rec {
     name = "dulwich-${version}";
-    version = "0.9.8";
+    version = "0.10.1a";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/d/dulwich/${name}.tar.gz";
-      sha256 = "0iwxp9n2c09wahq8bqnc5z431kq5bs75vbwl93nzwm2grj00l6lb";
+      sha256 = "02rknqarwy7p50693cqswbibqwgxzrfzdq4yhwqxbdmhbsmh0rk6";
     };
 
     # Only test dependencies

From ab8a2b0c78d2dda116e922f34162ef3a3e493ec1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 24 Jun 2015 12:19:37 +0200
Subject: [PATCH 1526/2322] vlc: Don't depend on JACK by default

To reduce dependency bloat, packages should not depend on non-standard
audio systems by default.
---
 pkgs/applications/video/vlc/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 85fc6f6b6ba..adf5aed3f55 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -9,6 +9,7 @@
 , libvdpau
 , onlyLibVLC ? false
 , qt4 ? null, qt5 ? null, withQt5 ? false
+, jackSupport ? false
 }:
 
 with stdenv.lib;
@@ -29,11 +30,13 @@ stdenv.mkDerivation rec {
     [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
       libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt
       libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
-      udev gnutls avahi libcddb jack2 SDL SDL_image libmtp unzip taglib
+      udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib
       libkate libtiger libv4l samba liboggz libass libdvbpsi libva
       xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
       libdc1394 libraw1394 libopus libebml libmatroska libvdpau
-    ] ++ (if withQt5 then with qt5; [ base ] else [qt4]);
+    ]
+    ++ (if withQt5 then with qt5; [ base ] else [qt4])
+    ++ optional jackSupport jack2;
 
   nativeBuildInputs = [ pkgconfig ];
 

From 0d919b374c1611f5e5cc082577111dba797f2e4d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 18 Jun 2015 12:01:54 +0200
Subject: [PATCH 1527/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/79a194bc9a4d949f07eb32341b4a2312e516ee49
 with hackage2nix revision 1c5ac72f817d996a1ccec3e5a14496fb49806755

---
 .../haskell-modules/hackage-packages.nix      | 1463 +++++++++++------
 1 file changed, 961 insertions(+), 502 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 42ec33178f7..ba22bdaee6c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2393,11 +2393,10 @@ self: {
      }:
      mkDerivation {
        pname = "ChasingBottoms";
-       version = "1.3.0.12";
-       sha256 = "0z844mxvkhg114wvbs8z3cvhmhsrzx344yj7yh4fzfm4fcx5j3k9";
+       version = "1.3.0.13";
+       sha256 = "1fb86jd6cdz4rx3fj3r9n8d60kx824ywwy7dw4qnrdran46ja3pl";
        buildDepends = [ base containers mtl QuickCheck random syb ];
        testDepends = [ array base containers mtl QuickCheck random syb ];
-       jailbreak = true;
        description = "For testing partial and infinite values";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -3040,24 +3039,23 @@ self: {
 
   "DAV" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , data-default, either, errors, exceptions, http-client
-     , http-client-tls, http-types, lens, mtl, network, network-uri
-     , optparse-applicative, transformers, transformers-base
-     , utf8-string, xml-conduit, xml-hamlet
+     , data-default, either, exceptions, http-client, http-client-tls
+     , http-types, lens, mtl, network, network-uri, optparse-applicative
+     , transformers, transformers-base, utf8-string, xml-conduit
+     , xml-hamlet
      }:
      mkDerivation {
        pname = "DAV";
-       version = "1.0.5";
-       sha256 = "0kfbvrkhj7dfk45q3nhpgif2glnf4ng9s5w3ljf0kijh11m39b21";
+       version = "1.0.7";
+       sha256 = "0bkwcgxisp1ipnc1v63z16mcw40dy6fxszjrr2b251sfah5h1ad8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base bytestring case-insensitive containers data-default either
-         errors exceptions http-client http-client-tls http-types lens mtl
-         network network-uri optparse-applicative transformers
-         transformers-base utf8-string xml-conduit xml-hamlet
+         exceptions http-client http-client-tls http-types lens mtl network
+         network-uri optparse-applicative transformers transformers-base
+         utf8-string xml-conduit xml-hamlet
        ];
-       jailbreak = true;
        homepage = "http://floss.scru.org/hDAV";
        description = "RFC 4918 WebDAV support";
        license = stdenv.lib.licenses.gpl3;
@@ -7253,8 +7251,8 @@ self: {
      }:
      mkDerivation {
        pname = "HTTP";
-       version = "4000.2.19";
-       sha256 = "1yzm8gimh8g0wwbixcbxg60v4l3vgi63w9v55ms0x9qnm6vrgysz";
+       version = "4000.2.20";
+       sha256 = "0nyqdxr5ls2dxkf4a1f3x15xzwdm46ppn99nkcbhswlr6s3cq1s4";
        buildDepends = [
          array base bytestring mtl network network-uri old-time parsec
        ];
@@ -8512,16 +8510,15 @@ self: {
 
   "HueAPI" = callPackage
     ({ mkDerivation, aeson, base, containers, lens, lens-aeson, mtl
-     , time, transformers, wreq
+     , transformers, wreq
      }:
      mkDerivation {
        pname = "HueAPI";
-       version = "0.2.4";
-       sha256 = "0qpa2cmsqpxb311f2vyy0zm52c6z71yxbzl9ih1f8x2fz4cm5g6n";
+       version = "0.2.5";
+       sha256 = "1yz0cjacywrv72hj9dqf9c3zqslhcfz68z149hhv49f7g7k5m64i";
        buildDepends = [
-         aeson base containers lens lens-aeson mtl time transformers wreq
+         aeson base containers lens lens-aeson mtl transformers wreq
        ];
-       jailbreak = true;
        homepage = "https://github.com/sjoerdvisscher/HueAPI";
        description = "API for controlling Philips Hue lights";
        license = stdenv.lib.licenses.bsd3;
@@ -10736,12 +10733,11 @@ self: {
      }:
      mkDerivation {
        pname = "NetSNMP";
-       version = "0.3.1.0";
-       sha256 = "17lmxwcc3z69dgxipi776m2wpwa1lz84w9v2wirw08wb9fba2gdr";
+       version = "0.3.2.0";
+       sha256 = "1z3d4qmwzg3hkx78z4fbdsdh6vxnw95fkvfxgzng4bq10y6d2bb8";
        buildDepends = [ base bytestring utf8-string ];
        testDepends = [ base bytestring HUnit process utf8-string ];
        extraLibraries = [ net_snmp ];
-       jailbreak = true;
        homepage = "https://github.com/ptek/netsnmp";
        description = "Bindings for net-snmp's C API for clients";
        license = stdenv.lib.licenses.bsd3;
@@ -13517,8 +13513,8 @@ self: {
      }:
      mkDerivation {
        pname = "ShellCheck";
-       version = "0.3.7";
-       sha256 = "1mwpgg8plkj99hp1gab417w78rkcmdpfajj4dyv6gnl49vmr0z21";
+       version = "0.3.8";
+       sha256 = "06k5adw28abdfpvfjq0zka05211w6nlbf1ry3d9hck3jcrqvg1f1";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -13531,7 +13527,7 @@ self: {
        ];
        homepage = "http://www.shellcheck.net/";
        description = "Shell script analysis tool";
-       license = stdenv.lib.licenses.agpl3;
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "Shellac" = callPackage
@@ -15971,12 +15967,12 @@ self: {
      }) {};
 
   "Yampa" = callPackage
-    ({ mkDerivation, base, random }:
+    ({ mkDerivation, base, deepseq, random }:
      mkDerivation {
        pname = "Yampa";
-       version = "0.10.1.1";
-       sha256 = "1gx0ai040plh99ixamb1sj8sh7lhx7lniy068d2syv9nhvc55mbf";
-       buildDepends = [ base random ];
+       version = "0.10.2";
+       sha256 = "1pmszrbf1fxid4km0jdam8iqfba2mfyz8mzn6vxfb0da19vlz4cq";
+       buildDepends = [ base deepseq random ];
        homepage = "http://www.haskell.org/haskellwiki/Yampa";
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
@@ -16905,6 +16901,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "acme-one" = callPackage
+    ({ mkDerivation }:
+     mkDerivation {
+       pname = "acme-one";
+       version = "0.0.2";
+       sha256 = "11sgx648g5594w8m8x8r25x7s61jyyxazp5dcfyglvhc7zlrrvbb";
+       homepage = "https://github.com/ion1/acme-zero-one";
+       description = "The identity element of package dependencies";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "acme-php" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -17028,6 +17035,18 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "acme-zero" = callPackage
+    ({ mkDerivation }:
+     mkDerivation {
+       pname = "acme-zero";
+       version = "0.0.2";
+       sha256 = "06d4hpda8qwwq9wzkgx6fpiq39l1md8sfm9hnvh4r95xyg5q53f6";
+       jailbreak = true;
+       homepage = "https://github.com/ion1/acme-zero-one";
+       description = "The absorbing element of package dependencies";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "action-permutations" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -19249,8 +19268,8 @@ self: {
      }:
      mkDerivation {
        pname = "amqp";
-       version = "0.12.2";
-       sha256 = "07nk8xxpkdh9w19rwwc87h2vbhfam339czkvyrmx7jh2dp51pnag";
+       version = "0.12.3";
+       sha256 = "17kvhn6s3grv5ygswkk0x8qclr8j4nxgv04z9q6wac9vydjsaz8m";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -19701,15 +19720,14 @@ self: {
      }:
      mkDerivation {
        pname = "apache-md5";
-       version = "0.6.1.1";
-       sha256 = "1i5nrhd0xzpfqbm7f5w9d8kyw3n2ywxdb9yhwmbzfjmgdmzriagl";
+       version = "0.6.1.4";
+       sha256 = "1dwnn200sjp2pvriii3y4srrms0gyicd6qp6kvc74yyad8pqhky8";
        buildDepends = [ base bytestring ];
        testDepends = [
          base bytestring HUnit MonadRandom process random test-framework
          test-framework-hunit transformers
        ];
        extraLibraries = [ openssl ];
-       jailbreak = true;
        homepage = "https://github.com/trskop/apache-md5";
        description = "Apache specific MD5 digest algorighm";
        license = stdenv.lib.licenses.bsd3;
@@ -19744,8 +19762,8 @@ self: {
      }:
      mkDerivation {
        pname = "api-builder";
-       version = "0.7.1.0";
-       sha256 = "1kvn725ac7d8mx6r3wak046i706v8m7b7wlaxkkm8lc9b7hr5s9z";
+       version = "0.7.4.0";
+       sha256 = "0af0ld0rlrpvbl4iw3g5n5bjij5z5jq2sbd9fqila5891qkvb30d";
        buildDepends = [
          aeson attoparsec base bifunctors bytestring either HTTP http-client
          http-conduit http-types text transformers
@@ -20003,15 +20021,14 @@ self: {
      mkDerivation {
        pname = "apiary-persistent";
        version = "1.4.0";
-       revision = "1";
+       revision = "2";
        sha256 = "00jaiykbxj1lh8qgv4y0ma9awaj1ymrjskwr9ra5pmka1mrwbih9";
-       editedCabalFile = "23a9ba31cd7fab41378b61a82e5ad92d04b6f3a32e32edca3217f5f824c13736";
+       editedCabalFile = "7f1c18de1d41b15397df81d9a3377e109cc07f6efc07390584e0e2952d34e889";
        buildDepends = [
          apiary apiary-logger base monad-control monad-logger persistent
          resource-pool resourcet transformers transformers-base types-compat
          web-routing
        ];
-       jailbreak = true;
        homepage = "https://github.com/philopon/apiary";
        description = "persistent support for apiary web framework";
        license = stdenv.lib.licenses.mit;
@@ -21346,8 +21363,8 @@ self: {
      }:
      mkDerivation {
        pname = "atlassian-connect-core";
-       version = "0.6.0.0";
-       sha256 = "02kngpf1ply4222p4ahqndnlk8sz7w3d5i1411csh1g3nr9zsdw8";
+       version = "0.7.0.1";
+       sha256 = "16pf2ir84fx6x01mpp109qh9rf96fp57230qr4k4n7qms068dgpy";
        buildDepends = [
          aeson atlassian-connect-descriptor base base64-bytestring
          bytestring case-insensitive cipher-aes configurator containers
@@ -21975,8 +21992,8 @@ self: {
      }:
      mkDerivation {
        pname = "auto";
-       version = "0.4.2.3";
-       sha256 = "1vzsmmim3h3r0ikzci9zb32rm42gr0x2m1lmm11my5jcf88gwck7";
+       version = "0.4.3.0";
+       sha256 = "13ic0sh45ixxg456yg3y47f6b3avqn2l5ds0jc933ldk0z0wsdn8";
        buildDepends = [
          base base-orphans bytestring cereal containers deepseq MonadRandom
          profunctors random semigroups transformers
@@ -22075,21 +22092,27 @@ self: {
 
   "avers" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , bytestring, containers, cryptohash, inflections, influxdb
-     , MonadRandom, mtl, network, resource-pool, rethinkdb-client-driver
-     , scrypt, stm, template-haskell, text, time, unordered-containers
-     , vector
+     , bytestring, clock, containers, cryptohash, filepath, hspec
+     , inflections, MonadRandom, mtl, network, resource-pool
+     , rethinkdb-client-driver, scrypt, stm, template-haskell, text
+     , time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "avers";
-       version = "0.0.6";
-       sha256 = "0x89zacl658376j4w4jk39fnlx99r10qqw01fg4vcvx7kgqdlsgc";
+       version = "0.0.8";
+       sha256 = "1wnhzkjwp6243mqfwxmw8lhs59vn5v0544hsivcfps427cqamrbq";
        buildDepends = [
-         aeson attoparsec base base16-bytestring bytestring containers
-         cryptohash inflections influxdb MonadRandom mtl network
+         aeson attoparsec base base16-bytestring bytestring clock containers
+         cryptohash filepath inflections MonadRandom mtl network
          resource-pool rethinkdb-client-driver scrypt stm template-haskell
          text time unordered-containers vector
        ];
+       testDepends = [
+         aeson attoparsec base base16-bytestring bytestring containers
+         cryptohash hspec inflections MonadRandom mtl resource-pool
+         rethinkdb-client-driver scrypt stm text time unordered-containers
+         vector
+       ];
        description = "empty";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22848,19 +22871,23 @@ self: {
      }) {};
 
   "bake" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cmdargs, deepseq
-     , directory, extra, filepath, hashable, HTTP, http-types, process
-     , random, shake, text, time, wai, warp
+    ({ 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.2";
-       sha256 = "1j7m9q5vk35sqs6if9rzb72avi7xbjhbcv0hpg9qvn9nvs38dgiw";
+       version = "0.3";
+       sha256 = "0h0byqv9m0jp5awbjcad0gggbgp66qqws6qvyfxwzk5jgwdifa0k";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson base bytestring cmdargs deepseq directory extra filepath
-         hashable HTTP http-types process random shake text time wai warp
+         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";
@@ -23190,6 +23217,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "base-generics" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "base-generics";
+       version = "0.1.0.1";
+       sha256 = "19k6kl66p71pza23b1n5njmj97k1pdlcm6brl1danfaxlflsmcms";
+       buildDepends = [ base ];
+       jailbreak = true;
+       homepage = "https://github.com/HaskellZhangSong/base-generics";
+       description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well.";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "base-io-access" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -23219,8 +23259,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, hspec }:
      mkDerivation {
        pname = "base-orphans";
-       version = "0.3.2";
-       sha256 = "1qbnhxchl2kdjbwqz3mp7rq963w6y6ws4kflmv6hmcp25aaqh6pl";
+       version = "0.3.3";
+       sha256 = "1z1xjlk056lfs4na430zw8ckc3b0k5hfn1i0i46i8ny40w8r85pk";
        buildDepends = [ base ghc-prim ];
        testDepends = [ base hspec ];
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
@@ -23428,7 +23468,9 @@ self: {
      mkDerivation {
        pname = "basic-prelude";
        version = "0.5.0";
+       revision = "1";
        sha256 = "1l8hc99sxm27gd93zq6v0l0x2rzl6fd9zp7snh14m4yriqrn5xfi";
+       editedCabalFile = "2ddf5a9d3413a8e7c877c488f63451357fcde4d187f7c560f5281a0c4856fd0b";
        buildDepends = [
          base bytestring containers filepath hashable lifted-base ReadArgs
          safe text transformers unordered-containers vector
@@ -25912,8 +25954,8 @@ self: {
      }:
      mkDerivation {
        pname = "bitx-bitcoin";
-       version = "0.2.0.1";
-       sha256 = "0lg6zmyf299gh8921qxm2xxqv8hsz4p2rpslfcsic5k4bqm2nswg";
+       version = "0.2.0.2";
+       sha256 = "0m91zh2g6ahpzwgfhj2phhghylgjp6qksca741bdffkax7xd6x17";
        buildDepends = [
          aeson base bytestring http-conduit network record scientific split
          text time
@@ -27816,10 +27858,11 @@ self: {
      mkDerivation {
        pname = "bytestring-read";
        version = "0.3.1";
+       revision = "1";
        sha256 = "0df6mb5fhfd1kgah5gv4q4ykxvl0y8hbqrdvm17nh33cxj2csj00";
+       editedCabalFile = "8a8b5f5c2f109a11df1cf47ffec170b810e02186f0406fd6c7f4155bfd2de0b6";
        buildDepends = [ base bytestring types-compat ];
        testDepends = [ base bytestring doctest tasty tasty-quickcheck ];
-       jailbreak = true;
        homepage = "https://github.com/philopon/bytestring-read";
        description = "fast ByteString to number converting library";
        license = stdenv.lib.licenses.mit;
@@ -28197,8 +28240,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-debian";
-       version = "4.29";
-       sha256 = "1kx8mivm2vm0bgnrzvccnd2x3ww913h64bwcawzpbcgjv7cpihlj";
+       version = "4.30";
+       sha256 = "07wv05fi9sgh8v9239c4rvwrxrmwk7awmk5hpcnpyx8yj8z9z7q5";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -29362,20 +29405,32 @@ self: {
      }) {};
 
   "canteven-config" = callPackage
-    ({ mkDerivation, aeson, base, directory, filepath, hslogger, text
-     , unix, yaml
-     }:
+    ({ mkDerivation, base, unix, yaml }:
      mkDerivation {
        pname = "canteven-config";
-       version = "0.1.0.1";
-       sha256 = "0p7gqn95hkm9m7dbmj8zgghsq89j82m9i8xd9w28rm0060nvj69l";
-       buildDepends = [
-         aeson base directory filepath hslogger text unix yaml
-       ];
+       version = "1.0.0.0";
+       sha256 = "1dkw0w43ajjgpczp8hmclr93v9scl75rlnsmxdjvwmv9phpj5559";
+       buildDepends = [ base unix yaml ];
        description = "A pattern for configuring programs";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "canteven-log" = callPackage
+    ({ mkDerivation, aeson, base, canteven-config, directory, filepath
+     , hslogger, text, yaml
+     }:
+     mkDerivation {
+       pname = "canteven-log";
+       version = "0.2.0.0";
+       sha256 = "15gfic3yzi4wc06s9zfpxs0ygxbhasarfn92dj7h0aqfgqa0wvff";
+       buildDepends = [
+         aeson base canteven-config directory filepath hslogger text yaml
+       ];
+       homepage = "https://github.com/SumAll/haskell-canteven-log";
+       description = "A canteven way of setting up logging for your program";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "cantor" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, hspec, hxt, hxt-xpath, parsec, QuickCheck, split
@@ -30327,14 +30382,13 @@ self: {
      }:
      mkDerivation {
        pname = "cf";
-       version = "0.4";
-       sha256 = "172nm38gvjriznnyks958bfzwd2zy59662i6zjzvj3nr0kdkiiap";
+       version = "0.4.1";
+       sha256 = "1z8hqd06nrrbgmg2gpryalhnk4z0sxm7is46sgpy09x9p6xd0fqx";
        buildDepends = [ base ];
        testDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
-       jailbreak = true;
        homepage = "http://github.com/mvr/cf";
        description = "Exact real arithmetic using continued fractions";
        license = stdenv.lib.licenses.mit;
@@ -31154,8 +31208,8 @@ self: {
      }:
      mkDerivation {
        pname = "cipher-aes";
-       version = "0.2.10";
-       sha256 = "1sglxv66byib2bcwhilcf4m4glhz02vxy2lxa0hvpwa9c0ifhcxz";
+       version = "0.2.11";
+       sha256 = "05ahz6kjq0fl1w66gpiqy0vndli5yx1pbsbw9ni3viwqas4p3cfk";
        buildDepends = [
          base byteable bytestring crypto-cipher-types securemem
        ];
@@ -31600,10 +31654,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-prelude";
-       version = "0.8";
-       revision = "1";
-       sha256 = "0hd8faq69wvm679gyplbzccz3k4iyp1108xm0hc4x7cdrkmg01r1";
-       editedCabalFile = "e549747128c6452eca30da937a03b8d0ff2577466a5a242f50754db3d3f6a648";
+       version = "0.8.1";
+       sha256 = "1xxjahk78a73jbavd4fwgljdsb23s44z0jdv29n6mdi86bzsn24h";
        buildDepends = [
          base data-default ghc-prim ghc-typelits-natnormalise integer-gmp
          lens QuickCheck singletons template-haskell th-lift
@@ -33704,12 +33756,13 @@ self: {
      mkDerivation {
        pname = "compressed";
        version = "3.10";
+       revision = "1";
        sha256 = "1y290n421knfh8k8zbcabhw24hb13xj9pkxx4h4v15yji97p5mcw";
+       editedCabalFile = "0ab968cb9d6a6da40cb91befc6051d91b77039f8f64442eecf7a61bd508f61bb";
        buildDepends = [
          base comonad containers fingertree hashable keys pointed reducers
          semigroupoids semigroups unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/compressed/";
        description = "Compressed containers and reducers";
        license = stdenv.lib.licenses.bsd3;
@@ -33925,18 +33978,21 @@ self: {
      }) {};
 
   "concrete-typerep" = callPackage
-    ({ mkDerivation, base, binary, ghc, hashable, QuickCheck
-     , test-framework, test-framework-quickcheck2
+    ({ mkDerivation, base, binary, hashable, QuickCheck, test-framework
+     , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "concrete-typerep";
        version = "0.1.0.2";
+       revision = "1";
        sha256 = "07wy8drg4723zdy2172jrcvd5ir2c4ggcfz1n33jhm9iv3cl2app";
-       buildDepends = [ base binary ghc hashable ];
+       editedCabalFile = "cdcd034ff6ff0e8cf9313f312294e12494f3f021c4bf562b9c1365b91715ff4e";
+       buildDepends = [ base binary hashable ];
        testDepends = [
          base binary hashable QuickCheck test-framework
          test-framework-quickcheck2
        ];
+       jailbreak = true;
        description = "Binary and Hashable instances for TypeRep";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33991,6 +34047,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "concurrent-machines" = callPackage
+    ({ mkDerivation, async, base, containers, lifted-async, machines
+     , monad-control, semigroups, tasty, tasty-hunit, time, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "concurrent-machines";
+       version = "0.1.0.0";
+       sha256 = "1rlxb9cjzjfzj3xj3m6cab3h6pqazi850lkglc6palamn6yd2vw4";
+       buildDepends = [
+         async base containers lifted-async machines monad-control
+         semigroups time transformers transformers-base
+       ];
+       testDepends = [
+         base machines tasty tasty-hunit time transformers
+       ];
+       description = "Concurrent networked stream transducers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "concurrent-sa" = callPackage
     ({ mkDerivation, base, MonadRandom }:
      mkDerivation {
@@ -34633,17 +34709,16 @@ self: {
 
   "connection" = callPackage
     ({ mkDerivation, base, byteable, bytestring, containers
-     , crypto-random, data-default-class, network, securemem, socks, tls
-     , x509, x509-store, x509-system, x509-validation
+     , data-default-class, network, socks, tls, x509, x509-store
+     , x509-system, x509-validation
      }:
      mkDerivation {
        pname = "connection";
-       version = "0.2.4";
-       sha256 = "0sl0vxn02bbyk7lcclr7ml93wpap2f042da3c9v9ppvbvs8jmf7j";
+       version = "0.2.5";
+       sha256 = "090il95jnm7ihwvcx3s9v6iwnp37nnsdx15q7722l845g51d95c8";
        buildDepends = [
-         base byteable bytestring containers crypto-random
-         data-default-class network securemem socks tls x509 x509-store
-         x509-system x509-validation
+         base byteable bytestring containers data-default-class network
+         socks tls x509 x509-store x509-system x509-validation
        ];
        homepage = "http://github.com/vincenthz/hs-connection";
        description = "Simple and easy network connections API";
@@ -35387,10 +35462,8 @@ self: {
      }:
      mkDerivation {
        pname = "cookie";
-       version = "0.4.1.5";
-       revision = "2";
-       sha256 = "0n1kil6z2sgaj8p67wbi7gaaz5rs78aagcnbk2338xhpd69wgrmn";
-       editedCabalFile = "f9789afefed0c211dfe33d029f26bd464a3ca2f51b277629230a68ed58ee49e2";
+       version = "0.4.1.6";
+       sha256 = "0b6ym6fn29p5az4dwydy036lxj131kagrmgb93w4bbkqfkds8b9s";
        buildDepends = [
          base blaze-builder bytestring data-default-class deepseq old-locale
          text time
@@ -36945,8 +37018,29 @@ self: {
      }:
      mkDerivation {
        pname = "cryptonite";
-       version = "0.2";
-       sha256 = "11mhfw3qpm71nq6wclj3g9vv66n6fhrvlmdr9byd08imxqlxb8kx";
+       version = "0.4";
+       sha256 = "0328nvw9k8bf6kc1h3kkhxgb1f4k5ay20439zszmlag6i3c3x9v2";
+       buildDepends = [
+         base bytestring deepseq ghc-prim integer-gmp memory
+       ];
+       testDepends = [
+         base byteable bytestring memory tasty tasty-hunit tasty-kat
+         tasty-quickcheck
+       ];
+       homepage = "https://github.com/vincenthz/cryptonite";
+       description = "Cryptography Primitives sink";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "cryptonite_0_5" = callPackage
+    ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim
+     , integer-gmp, memory, tasty, tasty-hunit, tasty-kat
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "cryptonite";
+       version = "0.5";
+       sha256 = "17b2axxb9i9cmwjhji1lm5nwhqm2wikxzy1cwmk2v8h64dy0rjc5";
        buildDepends = [
          base bytestring deepseq ghc-prim integer-gmp memory
        ];
@@ -38550,16 +38644,16 @@ self: {
      }:
      mkDerivation {
        pname = "data-easy";
-       version = "0.6";
-       sha256 = "1gqc7833lz3n1mqah4mall1m32slz79hifp8381p1qdj2hkirypc";
+       version = "0.6.1";
+       sha256 = "01plc0cs3bgyq16j94qqvswwmi12iqfxyxgw9jipqgvi7vbf5h9v";
        buildDepends = [ base containers safe ];
        testDepends = [
          base containers directory errors haskell-src-exts hlint hspec HUnit
          QuickCheck safe text transformers unix
        ];
        jailbreak = true;
-       homepage = "https://github.com/jcristovao/easy-data";
-       description = "Consistent set of utility functions for Maybe, Either, List, Monoids";
+       homepage = "https://github.com/jcristovao/data-easy";
+       description = "Consistent set of utility functions for Maybe, Either, List and Monoids";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -39181,6 +39275,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "data-tensor" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "data-tensor";
+       version = "0.1.0.0";
+       sha256 = "0j6jsgj3lhx6ps3xs90vbgyvzmlr3sfl33r6rz34rvb29gs171n8";
+       buildDepends = [ base ];
+       homepage = "https://bitbucket.org/tdammers/data-tensor";
+       description = "Tensor and Group typeclasses";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "data-textual" = callPackage
     ({ mkDerivation, base, bytestring, parsers, QuickCheck
      , test-framework, test-framework-quickcheck2, text, text-latin1
@@ -40488,18 +40594,18 @@ self: {
      }) {};
 
   "delta" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, fs-events
-     , sodium, time
+    ({ mkDerivation, base, containers, directory, filepath, sodium
+     , time
      }:
      mkDerivation {
        pname = "delta";
-       version = "0.1.0.1";
-       sha256 = "0kjii2hqwzzsb8i09547y0qxrdak3xkhgv7dqahbpypzh8hldgzf";
+       version = "0.1.2.0";
+       revision = "1";
+       sha256 = "1yk4cb21n4kq0wvsw6lw8s8sc69gnmzfdn9f5zgwsknza0vayi39";
+       editedCabalFile = "5f7c4ae62f0d0758b892ac7002bc31eebfc4e4dcbe1ff141f0135daf5788e6e9";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [
-         base containers directory filepath fs-events sodium time
-       ];
+       buildDepends = [ base containers directory filepath sodium time ];
        homepage = "https://github.com/kryoxide/delta";
        description = "A library for detecting file changes";
        license = stdenv.lib.licenses.gpl3;
@@ -41790,6 +41896,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "digitalocean-kzs" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, doctest, hspec, HTTP
+     , http-conduit, http-types, text, transformers
+     }:
+     mkDerivation {
+       pname = "digitalocean-kzs";
+       version = "0.1.0.0";
+       sha256 = "0y6n5s285aywjiwq6haxw0siy45crmkv3jj43gfx5svhgs72wfma";
+       buildDepends = [
+         aeson base bytestring HTTP http-conduit http-types text
+         transformers
+       ];
+       testDepends = [ base doctest hspec ];
+       jailbreak = true;
+       homepage = "https://github.com/KazumaSATO/digitalocean-kzs";
+       description = "digitalocean api for haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "digits" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
@@ -42155,17 +42280,34 @@ self: {
      }:
      mkDerivation {
        pname = "discrete-space-map";
-       version = "0.0.3";
-       sha256 = "1f3idrz60plnsp5hc6xad0pfx292m9m8aiax2rw2q8gj0smzqv3k";
+       version = "0.0.4";
+       sha256 = "1dci1yk1xpndszwcxshdh6sz6ibzxk6l2726b550xx1wffakpmcq";
        buildDepends = [
          adjunctions base comonad distributive keys semigroupoids
        ];
-       jailbreak = true;
        homepage = "https://github.com/sjoerdvisscher/discrete-space-map";
        description = "A discrete space map";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "discrimination" = callPackage
+    ({ mkDerivation, array, base, containers, contravariant, deepseq
+     , ghc-prim, primitive, profunctors, promises, semigroups
+     , transformers, vector, void
+     }:
+     mkDerivation {
+       pname = "discrimination";
+       version = "0.1";
+       sha256 = "11ddphyjqc1zhsr6l94hyvxmz68sbjfwaasms7ilf55x5h61g3l1";
+       buildDepends = [
+         array base containers contravariant deepseq ghc-prim primitive
+         profunctors promises semigroups transformers vector void
+       ];
+       homepage = "http://github.com/ekmett/discrimination/";
+       description = "Fast generic linear-time sorting, joins and container construction";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "disjoint-set" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, QuickCheck
      , transformers
@@ -45028,13 +45170,12 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-bosun";
-       version = "1.0.3";
-       sha256 = "0mlfsmw1aa24p6fhml8m2dj2v7hrp91a9d3cfl74rr8z8am61mqc";
+       version = "1.0.4";
+       sha256 = "0cjwv99dbb1spfn25vdl4ikxr10s7yqr9ih36amvs02rnb47lx7f";
        buildDepends = [
          aeson base ekg-core http-client lens network network-uri old-locale
          text time unordered-containers vector wreq
        ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/ekg-bosun";
        description = "Send ekg metrics to a Bosun instance";
        license = stdenv.lib.licenses.bsd3;
@@ -45716,8 +45857,8 @@ self: {
     ({ mkDerivation, base, between, transformers }:
      mkDerivation {
        pname = "endo";
-       version = "0.2.0.0";
-       sha256 = "1gqw14nadw1cb49m251swly35gjkb2xhqi0cqhm17ww8r13mzp31";
+       version = "0.2.0.1";
+       sha256 = "0szbv44sgsnbkcdmmsvbiy539iiyd608p513slfw1pbb240sabii";
        buildDepends = [ base between transformers ];
        homepage = "https://github.com/trskop/endo";
        description = "Endomorphism utilities";
@@ -46338,8 +46479,8 @@ self: {
     ({ mkDerivation, base, mtl, text, text-render }:
      mkDerivation {
        pname = "error-list";
-       version = "0.1.0.2";
-       sha256 = "1g50wwgs9xxwc03mhch89rcfnj62mpisl8ihw8yy5c3pp0kag2mm";
+       version = "0.1.0.3";
+       sha256 = "0k0rpscg4h55215mgkd72yd5la3f2im21vlsgyg7v4pkrxd1cj1j";
        buildDepends = [ base mtl text text-render ];
        homepage = "http://github.com/thinkpad20/error-list";
        description = "A useful type for collecting error messages";
@@ -46515,8 +46656,8 @@ self: {
      }:
      mkDerivation {
        pname = "esqueleto";
-       version = "2.2.3";
-       sha256 = "11njnccxkhv2g6v8vh8jclhf0wxl0q4f61197qm439j64whzdj2c";
+       version = "2.2.4";
+       sha256 = "1l72md0zac19mdvs0x9mp5j60qaa4z9vkiy8dcyiqmvvfp1lvzh0";
        buildDepends = [
          base conduit monad-logger persistent resourcet tagged text
          transformers unordered-containers
@@ -46550,10 +46691,9 @@ self: {
      }:
      mkDerivation {
        pname = "estimator";
-       version = "1.1.0.0";
-       sha256 = "1qwbjy71zshlg8vp0qm5wya8ikgac9jpc5xr0x31i85p3yv5xl1p";
+       version = "1.1.0.1";
+       sha256 = "1sf378qhmsxxazkk7nn1d7nvrq1ladsfvkzshqjwsnyl5pgj7sgq";
        buildDepends = [ ad base distributive lens linear reflection ];
-       jailbreak = true;
        homepage = "https://github.com/GaloisInc/estimator";
        description = "State-space estimation algorithms such as Kalman Filters";
        license = stdenv.lib.licenses.bsd3;
@@ -47089,15 +47229,14 @@ self: {
      }:
      mkDerivation {
        pname = "exherbo-cabal";
-       version = "0.1.0.0";
-       sha256 = "0ap3j5shgy5l1crsyq6dkz2g4gd9y7r8vx4rsppib7y0gqqczpfm";
+       version = "0.1.0.3";
+       sha256 = "1i1p9pwzdf44cp8d1crq40g1hv84gpimywq5kdpz2nfgcnr17ans";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          base bytestring Cabal containers haddock-library http-client
          pcre-light pretty
        ];
-       jailbreak = true;
        description = "Exheres generator for cabal packages";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47512,8 +47651,8 @@ self: {
      }:
      mkDerivation {
        pname = "extra";
-       version = "1.2";
-       sha256 = "1bj84p3jpbv1vyjbm22plp56jnkas5qwx4bqvbcqgy843mr41225";
+       version = "1.3";
+       sha256 = "12n67ibj6zk7r8hzk0vn6ijfr926h0g6jkwn5krkp79xzdq82apr";
        buildDepends = [ base directory filepath process time unix ];
        testDepends = [ base directory filepath QuickCheck time unix ];
        homepage = "https://github.com/ndmitchell/extra#readme";
@@ -47952,8 +48091,8 @@ self: {
     ({ mkDerivation, base, fay }:
      mkDerivation {
        pname = "fay-base";
-       version = "0.20.0.0";
-       sha256 = "07hizichy7jnlirxq3sh2gjw4k21cfnqpswihbzkcvz0fnmd9sw3";
+       version = "0.20.0.1";
+       sha256 = "17mfblr40jhn93vz6vn0n0xsk4lwf5d5cavfy5zy8sg4inp6dkjr";
        buildDepends = [ base fay ];
        homepage = "https://github.com/faylang/fay/";
        description = "The base package for Fay";
@@ -48608,6 +48747,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fgl-arbitrary" = callPackage
+    ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "fgl-arbitrary";
+       version = "0.1.0.0";
+       sha256 = "0npgwg2lgi8rr3wm40q4a9srpnih3mzy1add2aazc4ahr32dfzm1";
+       buildDepends = [ base containers fgl QuickCheck ];
+       testDepends = [ base containers fgl hspec QuickCheck ];
+       description = "QuickCheck support for fgl";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fgl-extras-decompositions" = callPackage
     ({ mkDerivation, base, containers, fgl }:
      mkDerivation {
@@ -49689,8 +49840,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "floating-bits";
-       version = "0.2.0.0";
-       sha256 = "0b50pabkwvlj90vyld795k072am1w387215lz1cvm42pwb6m6ara";
+       version = "0.3.0.0";
+       sha256 = "1cp2k9rks0g8i6lf6j3zrz7wxh42qmsqwvf26dkdqnnzi0aqkkxj";
        buildDepends = [ base ];
        testDepends = [ base ];
        description = "Conversions between floating and integral values";
@@ -49986,6 +50137,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fold-debounce-conduit" = callPackage
+    ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
+     , stm, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "fold-debounce-conduit";
+       version = "0.1.0.0";
+       sha256 = "0d5yw44zbkissnw7f0zssrr3f3m8ymkskizvjp6rhsiyx3iafj5k";
+       buildDepends = [
+         base conduit fold-debounce resourcet stm transformers
+         transformers-base
+       ];
+       testDepends = [ base conduit hspec resourcet stm transformers ];
+       homepage = "https://github.com/debug-ito/fold-debounce-conduit";
+       description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "foldl" = callPackage
     ({ mkDerivation, base, bytestring, containers, mwc-random
      , primitive, profunctors, text, transformers, vector
@@ -50083,6 +50252,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "foma" = callPackage
+    ({ mkDerivation, base, foma }:
+     mkDerivation {
+       pname = "foma";
+       version = "0.1.1.0";
+       sha256 = "1aiy4bizzx5g87lvlx8xy24rxvzh093mlaavxkcr542fq9ki8yb3";
+       buildDepends = [ base ];
+       extraLibraries = [ foma ];
+       homepage = "http://github.com/joom/foma.hs";
+       description = "Simple Haskell bindings for Foma";
+       license = stdenv.lib.licenses.mit;
+     }) { foma = null;};
+
   "font-opengl-basic4x6" = callPackage
     ({ mkDerivation, base, GLFW-b, OpenGL }:
      mkDerivation {
@@ -50320,7 +50502,9 @@ self: {
      mkDerivation {
        pname = "formatting";
        version = "6.2.0";
+       revision = "1";
        sha256 = "13w2322djffajqdy48lwfngcrbh5pc9ivhy1w5zgxcjqc0amlv5v";
+       editedCabalFile = "299d43483dfe38a5e95061fb943cb63fa252d7fd38212c42e9bb022f49407a89";
        buildDepends = [
          base clock old-locale scientific text text-format time
        ];
@@ -53209,8 +53393,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghcid";
-       version = "0.4.2";
-       sha256 = "094ffwwlxg7qgrcgw35rmzincfrwyhxkh6iw9bqdib5l8w9gcr6d";
+       version = "0.5";
+       sha256 = "1b5d70f1422lwn8xmcdn6b52qwqp3aax0h7q3zfnkv2ima18yk6l";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -53270,8 +53454,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghcjs-websockets";
-       version = "0.3.0.3";
-       sha256 = "0fj2ya2irfhpgqz4n0cszs4s7p359k8aywdbmsw9q18w2z9gicz7";
+       version = "0.3.0.4";
+       sha256 = "03ycfbp756hiivbynfsmkn4ddh5gj82dswzkj3cm8dwq94m8wd16";
        buildDepends = [ base base64-bytestring binary bytestring text ];
        homepage = "http://github.com/mstksg/ghcjs-websockets";
        description = "GHCJS interface for the Javascript Websocket API";
@@ -53353,19 +53537,20 @@ self: {
 
   "ginsu" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , directory, mtl, network, old-locale, old-time, openssl, parsec
-     , pretty, process, random, regex-posix, syb, unix, utf8-string
+     , directory, hashable, hashtables, mtl, network, old-locale
+     , old-time, openssl, parsec, pretty, process, random, regex-posix
+     , syb, unix, utf8-string
      }:
      mkDerivation {
        pname = "ginsu";
-       version = "0.8.1";
-       sha256 = "0gnmdw430zfxhfhjimaminbdi13acwmb85a38hdyhfranra9yiif";
+       version = "0.8.1.1";
+       sha256 = "0qvhdzmqi1pppfcfld27mjzbzj9h6yaz2n7b6inp0ybr80vm6x4w";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         array base binary bytestring containers directory mtl network
-         old-locale old-time parsec pretty process random regex-posix syb
-         unix utf8-string
+         array base binary bytestring containers directory hashable
+         hashtables mtl network old-locale old-time parsec pretty process
+         random regex-posix syb unix utf8-string
        ];
        extraLibraries = [ openssl ];
        homepage = "http://repetae.net/computer/ginsu/";
@@ -53390,19 +53575,21 @@ self: {
      }) {};
 
   "gipeda" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cassava, containers
-     , directory, filepath, shake, split, text, unordered-containers
-     , vector, yaml
+    ({ mkDerivation, aeson, base, bytestring, cassava
+     , conduit-combinators, containers, directory, extra, filepath
+     , gitlib, gitlib-libgit2, scientific, shake, split, tagged, text
+     , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "gipeda";
-       version = "0.1.0.2";
-       sha256 = "0d3pbssndmlzmhk88214mz77jmgqh3ca2l8si9fr5v9wi0v5d8yz";
+       version = "0.1.1";
+       sha256 = "0swsc35z5xyl84wwfjcgcjkayim4jy9lgmk0x6fvb7g7dg8g7lip";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         aeson base bytestring cassava containers directory filepath shake
-         split text unordered-containers vector yaml
+         aeson base bytestring cassava conduit-combinators containers
+         directory extra filepath gitlib gitlib-libgit2 scientific shake
+         split tagged text unordered-containers vector yaml
        ];
        jailbreak = true;
        homepage = "https://github.com/nomeata/gipeda";
@@ -53795,8 +53982,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-backup";
-       version = "1.20150617";
-       sha256 = "1qg0mksvbnlfpi9dykg5595d6plgxlcbzrbm4al4cm5m6w0d2a73";
+       version = "1.20150618";
+       sha256 = "110nivss9436ls2mr5bl0m6fzg6ds5m0ams803zq60b8dya96wic";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -54260,8 +54447,8 @@ self: {
      }:
      mkDerivation {
        pname = "glib";
-       version = "0.13.1.0";
-       sha256 = "11scv2imljnr6ng7692jdagr7fc924hgfwfbnw4a5sra3w7ja7fz";
+       version = "0.13.1.1";
+       sha256 = "1wa3kfwwb7hf5g0hw1vcmrgcxd4pykvzbvc6ylx7903vxqbb9574";
        buildDepends = [ base bytestring containers text utf8-string ];
        buildTools = [ gtk2hs-buildtools ];
        pkgconfigDepends = [ glib ];
@@ -54591,6 +54778,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) glpk;};
 
+  "glue" = callPackage
+    ({ mkDerivation, async, base, ekg-core, hashable, hspec
+     , lifted-base, monad-control, QuickCheck, quickcheck-instances
+     , text, time, transformers, transformers-base, unordered-containers
+     }:
+     mkDerivation {
+       pname = "glue";
+       version = "0.1.0.0";
+       sha256 = "1msdvm4a5arw4msp6km667sbvw830wsirvb0pxnjxrhnmy0h03gl";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         async base ekg-core hashable lifted-base monad-control text time
+         transformers transformers-base unordered-containers
+       ];
+       testDepends = [
+         async base ekg-core hashable hspec lifted-base monad-control
+         QuickCheck quickcheck-instances text time transformers
+         transformers-base unordered-containers
+       ];
+       description = "Make better services";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gluturtle" = callPackage
     ({ mkDerivation, base, convertible, GLUT, stm, yjsvg, yjtools }:
      mkDerivation {
@@ -54726,8 +54937,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnutls";
-       version = "0.1.6";
-       sha256 = "03xas76prffkzckpcrsqi6izj415yd172v3knpjbb0za4m489n63";
+       version = "0.2";
+       sha256 = "1c5pm0d80wpgh2bkcgbvmc72agf89h8ghfnrn1m1x3fljbgzvrn0";
        buildDepends = [ base bytestring monads-tf transformers ];
        extraLibraries = [ gnutls ];
        pkgconfigDepends = [ gnutls ];
@@ -56125,8 +56336,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk";
-       version = "0.13.7";
-       sha256 = "1mrrd8hkpyhk40x9yg2b62i1d5d72p8g561wrhp80cd8f654cfij";
+       version = "0.13.8.1";
+       sha256 = "1p1s67swsiq8kr1l07zpghmyzww882kgzz38z41ykwzwj471zqjp";
        buildDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
@@ -56267,8 +56478,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk2hs-buildtools";
-       version = "0.13.0.3";
-       sha256 = "1ijcmcjp8mralpzl1gvh24bzq8njlzkvck1r07b010rrklv04arp";
+       version = "0.13.0.4";
+       sha256 = "041mprflgqc74qb21czzy3m2nzj5mc3ji4i60f04dh2f2bac491a";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -56418,8 +56629,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk3";
-       version = "0.13.7";
-       sha256 = "15jgv5ci79r36jy6h5hq04zffryx5bbv2sknxnydn0cxng6kvgr9";
+       version = "0.13.8";
+       sha256 = "18z1drng10l3z2arn2lrwsdaxx8q9yrdvdhzixya1vhs8za3m4pk";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -56528,8 +56739,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtksourceview3";
-       version = "0.13.1.3";
-       sha256 = "1h23wy26mjivr4wmdscsnjzsija1g560a1bgcxvmrl4k1x9799d0";
+       version = "0.13.1.5";
+       sha256 = "15bm58pr92izhwa0sqf8vkzfcg1455947cgl29ak2kwaj3fkzbq1";
        buildDepends = [ array base containers glib gtk3 mtl text ];
        buildTools = [ gtk2hs-buildtools ];
        pkgconfigDepends = [ gtksourceview ];
@@ -58240,34 +58451,32 @@ self: {
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
      , cmdargs, containers, cryptohash, data-default, deepseq, directory
      , filepath, fsnotify, http-conduit, http-types, HUnit, lrucache
-     , mtl, network, network-uri, old-locale, old-time, pandoc
-     , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base
-     , regex-tdfa, snap-core, snap-server, system-filepath, tagsoup
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, time-locale-compat
+     , mtl, network, network-uri, pandoc, pandoc-citeproc, parsec
+     , process, QuickCheck, random, regex-base, regex-tdfa, snap-core
+     , snap-server, system-filepath, tagsoup, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.7.0.0";
-       sha256 = "1c2awifpsplfr3x5aj7v9pymfmfj74i4j3djgggxr9vj5d372njq";
+       version = "4.7.1.0";
+       sha256 = "11lv7p8c4vka2rf47f1fhyvfax7rjb1i1i12mlrikj16vvsrixh2";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base binary blaze-html blaze-markup bytestring cmdargs containers
          cryptohash data-default deepseq directory filepath fsnotify
-         http-conduit http-types lrucache mtl network network-uri old-locale
-         old-time pandoc pandoc-citeproc parsec process random regex-base
-         regex-tdfa snap-core snap-server system-filepath tagsoup text time
-         time-locale-compat
+         http-conduit http-types lrucache mtl network network-uri pandoc
+         pandoc-citeproc parsec process random regex-base regex-tdfa
+         snap-core snap-server system-filepath tagsoup text time
        ];
        testDepends = [
          base binary blaze-html blaze-markup bytestring cmdargs containers
          cryptohash data-default deepseq directory filepath fsnotify
          http-conduit http-types HUnit lrucache mtl network network-uri
-         old-locale old-time pandoc pandoc-citeproc parsec process
-         QuickCheck random regex-base regex-tdfa snap-core snap-server
-         system-filepath tagsoup test-framework test-framework-hunit
-         test-framework-quickcheck2 text time time-locale-compat
+         pandoc pandoc-citeproc parsec process QuickCheck random regex-base
+         regex-tdfa snap-core snap-server system-filepath tagsoup
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time
        ];
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
@@ -58473,10 +58682,8 @@ self: {
      }:
      mkDerivation {
        pname = "halive";
-       version = "0.1.0.1";
-       revision = "1";
-       sha256 = "0wzajzh7lihj5l906ia5ni12dih0ar7f8apnq4ncypkw4ym1d4j6";
-       editedCabalFile = "60b322e7402b0dc957944334003fdf00ae5cdf0233663904dc397409aa153598";
+       version = "0.1.0.3";
+       sha256 = "1m2x50cpxffiywii26vl37lfi77yl7an5ln2h5anmkb3pmajdabc";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -60046,15 +60253,14 @@ self: {
      }:
      mkDerivation {
        pname = "haskanoid";
-       version = "0.1.4";
-       sha256 = "1qyk3lwzykc3vamm5ddv9733b2mc3p0rafcawi0hm87y01gc4w6q";
+       version = "0.1.5";
+       sha256 = "1k2y406kjxyv3sdpa50m6i15z2aiysy43xhjgln99v21x6rp08ia";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          base freenect hcwiid IfElse MissingH mtl SDL SDL-image SDL-mixer
          SDL-ttf transformers vector Yampa
        ];
-       jailbreak = true;
        homepage = "http://github.com/ivanperez-keera/haskanoid";
        description = "A breakout game written in Yampa using SDL";
        license = "unknown";
@@ -61951,8 +62157,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-postgres";
-       version = "0.10.3.2";
-       sha256 = "1n5r46is6kh1mk20pkkmw3v8gnqlsk2riq2a39kv7j384is02dp3";
+       version = "0.10.3.3";
+       sha256 = "0xwc1r7jirscsn1f11s7hkhc5knzzhb5l6if7c5w4skfx0vla7rh";
        buildDepends = [
          aeson attoparsec base-prelude bytestring either free hashable
          hashtables hasql-backend list-t loch-th mmorph placeholders
@@ -63195,8 +63401,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedis";
-       version = "0.6.7";
-       sha256 = "181anz8f2qi08f96ns0kxy09y18q4854brdycwhdij5yn7fl9kdg";
+       version = "0.6.8";
+       sha256 = "0n6x7dbdbfrxn3y6q9vp7x6vqgdc9nb3w85xjmim7agdf088zzh6";
        buildDepends = [
          attoparsec base BoundedChan bytestring bytestring-lexing mtl
          network resource-pool time vector
@@ -64583,6 +64789,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hid" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, hidapi-libusb
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hid";
+       version = "0.2.1";
+       sha256 = "18svis0bs4cilks71rih9m89mcdrll5hnjy18ccw81wj32cw9mdh";
+       buildDepends = [ base bytestring transformers ];
+       buildTools = [ c2hs ];
+       pkgconfigDepends = [ hidapi-libusb ];
+       description = "Interface to hidapi library";
+       license = stdenv.lib.licenses.bsd3;
+     }) { hidapi-libusb = null;};
+
   "hidapi" = callPackage
     ({ mkDerivation, base, bytestring, deepseq-generics, systemd }:
      mkDerivation {
@@ -64886,8 +65107,8 @@ self: {
      }:
      mkDerivation {
        pname = "hindent";
-       version = "4.5.3";
-       sha256 = "0fnkqdxqnfmh4mg844vbgbp4s31pq4jkc00n7dkg81xq0983nsxc";
+       version = "4.5.4";
+       sha256 = "09pywkm5xjk6djfwml1frnl21zndw03wp47a30vcnqcqf2a3awi0";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -66432,6 +66653,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) netcdf;};
 
+  "hnix" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, containers, data-fix
+     , parsers, tasty, tasty-hunit, tasty-th, text, transformers
+     , trifecta, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hnix";
+       version = "0.2.0";
+       sha256 = "02aygnc0hhg3gsj9z323pq6i6v9ijjj5r6i8g1zx1cnwd51dw1aj";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         ansi-wl-pprint base containers data-fix parsers text transformers
+         trifecta unordered-containers
+       ];
+       testDepends = [
+         base containers data-fix tasty tasty-hunit tasty-th text
+       ];
+       homepage = "http://github.com/jwiegley/hnix";
+       description = "Haskell implementation of the Nix language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hnn" = callPackage
     ({ mkDerivation, base, binary, bytestring, hmatrix, mwc-random
      , random, vector, vector-binary-instances, zlib
@@ -67627,8 +67871,10 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.3.1";
-       sha256 = "178pdk9rhqiyzjpdvkfvjs4gfc27k1limi7qpnpqyxzlcrcsplvb";
+       version = "0.3.2";
+       revision = "1";
+       sha256 = "1y29d7bd297yy1j0cl17q98ibdr26gksvd6fwbwgpx43y5mpq08x";
+       editedCabalFile = "d622462298731362fa33e09dd6b559cf1d6ba676c78864d4da2c1275dca11bae";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -67639,7 +67885,7 @@ self: {
          aeson base base-compat deepseq directory filepath hspec interpolate
          mockery text unordered-containers yaml
        ];
-       homepage = "https://github.com/sol/hpack#readme";
+       homepage = "https://github.com/haskell-tinc/hpack#readme";
        description = "An alternative format for Haskell packages";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -69320,15 +69566,15 @@ self: {
      }:
      mkDerivation {
        pname = "hscuid";
-       version = "1.0.0";
-       sha256 = "19py373zmfmfr52grvv4gimm4i0gnsiy6xxp60m8b6bb4cbiyj75";
+       version = "1.2.0.0";
+       sha256 = "01dmxckv9rlgb87ms5xbysw2cc7prmfww8g2n98ncgnc0lh3pc5l";
        buildDepends = [
          base formatting hostname random text time transformers unix
        ];
        testDepends = [ base containers ];
        homepage = "https://github.com/eightyeight/hscuid";
        description = "Collision-resistant IDs";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hscurses" = callPackage
@@ -69867,20 +70113,6 @@ self: {
      }) {};
 
   "hslua" = callPackage
-    ({ mkDerivation, base, lua, mtl }:
-     mkDerivation {
-       pname = "hslua";
-       version = "0.3.13";
-       sha256 = "02j3hrzq3dgcv4bvf4xz14qxvzlb0vlxrf7lk9wqwdy43b978mz9";
-       buildDepends = [ base mtl ];
-       testDepends = [ base ];
-       pkgconfigDepends = [ lua ];
-       configureFlags = [ "-fsystem-lua" ];
-       description = "A Lua language interpreter embedding in Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) lua;};
-
-  "hslua_0_4_0" = callPackage
     ({ mkDerivation, base, bytestring, hspec, hspec-contrib, HUnit, lua
      , text
      }:
@@ -70773,14 +71005,18 @@ self: {
      }) {};
 
   "hsqml-demo-notes" = callPackage
-    ({ mkDerivation, base, hsqml, sqlite-simple, text }:
+    ({ mkDerivation, base, containers, hsqml, sqlite-simple, text
+     , transformers
+     }:
      mkDerivation {
        pname = "hsqml-demo-notes";
-       version = "0.3.2.0";
-       sha256 = "0d754caiip1hgzhw2lc09bqyk7g3zqlyr3y51fa76v4dl7d0maxj";
+       version = "0.3.3.0";
+       sha256 = "0gjlsqlspchav6lvc4ld15192x70j8cyzw903dgla7g9sj8fg813";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base hsqml sqlite-simple text ];
+       buildDepends = [
+         base containers hsqml sqlite-simple text transformers
+       ];
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Sticky notes example program implemented in HsQML";
        license = stdenv.lib.licenses.bsd3;
@@ -71613,8 +71849,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.11.3";
-       sha256 = "04f9xb1hz5i9sm14nlasia86vjwsx0nmjh1kpk21axvvkbgcnrrq";
+       version = "0.4.13";
+       sha256 = "1vxjcvwlqp9n8r2lp21mxxklq1ia4bvzl778b7digzhdhpn405mi";
        buildDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -71624,7 +71860,8 @@ self: {
        testDepends = [
          async base base64-bytestring blaze-builder bytestring
          case-insensitive containers deepseq directory hspec http-types
-         monad-control network streaming-commons text time transformers zlib
+         monad-control network network-uri streaming-commons text time
+         transformers zlib
        ];
        homepage = "https://github.com/snoyberg/http-client";
        description = "An HTTP client engine, intended as a base layer for more user-friendly packages";
@@ -73487,6 +73724,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hyperfunctions" = callPackage
+    ({ mkDerivation, adjunctions, base, distributive, profunctors
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hyperfunctions";
+       version = "0";
+       sha256 = "0q452g2qzlw961zwkdihwi8d8hknxavfgd8vkjdhiazx5anbqzkm";
+       buildDepends = [
+         adjunctions base distributive profunctors transformers
+       ];
+       homepage = "http://github.com/ekmett/hyperfunctions";
+       description = "Hyperfunctions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hyperloglog" = callPackage
     ({ mkDerivation, approximate, base, binary, bits, bytes, cereal
      , cereal-vector, comonad, deepseq, directory, distributive, doctest
@@ -73497,7 +73750,9 @@ self: {
      mkDerivation {
        pname = "hyperloglog";
        version = "0.3.1";
+       revision = "1";
        sha256 = "13pmqkqldy5n274rld9acdypp39f51qmc9v14kwpw95lkpd9bxnl";
+       editedCabalFile = "9656873f269cef1f68eaa95e106bb49f6f5f5538bef06d82244d566e344c3ef6";
        buildDepends = [
          approximate base binary bits bytes cereal cereal-vector comonad
          deepseq distributive generic-deriving hashable hashable-extras lens
@@ -73507,7 +73762,6 @@ self: {
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
-       jailbreak = true;
        homepage = "http://github.com/analytics/hyperloglog";
        description = "An approximate streaming (constant space) unique object counter";
        license = stdenv.lib.licenses.bsd3;
@@ -75596,8 +75850,8 @@ self: {
      }:
      mkDerivation {
        pname = "intricacy";
-       version = "0.4.3";
-       sha256 = "07ha7vl8qzvfyk776f0pr6wb9fjcwmmqplp91bfpmzslifw2k01r";
+       version = "0.5";
+       sha256 = "1cy8i6iqgka0696d84nqswg90q3a1yn9s480ffx8s1i2sy7msjyg";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -75943,7 +76197,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;  inherit (pkgs) nlopt;};
+     }) { inherit (pkgs) ipopt;  nlopt = null;};
 
   "ipprint" = callPackage
     ({ mkDerivation, base, Extra, haskell-src }:
@@ -76131,9 +76385,9 @@ self: {
      mkDerivation {
        pname = "irc-core";
        version = "1.1.0.1";
-       revision = "1";
+       revision = "2";
        sha256 = "01n10wcnq4h2wpmxl1rh9zgqayk3mllbz563fg8qw1k01n7q9257";
-       editedCabalFile = "e0fedfac6e4dccddc4034d99d9123c69127309df42c2a338a8643f4cf48b1a50";
+       editedCabalFile = "dd561722689f1891016d9ea0ce11ef7752853160fc8da43625f803839f55059c";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -77180,8 +77434,8 @@ self: {
      }:
      mkDerivation {
        pname = "jespresso";
-       version = "1.0.1.1";
-       sha256 = "0lxkn0zd4y7b36y42hxpfan5jcy910ksl044yvmrk634p7s3996h";
+       version = "1.0.2";
+       sha256 = "0wka2wq89x6vzhvr93wrlc8dp7shd8jic11camrgpqqsqk3j0pnd";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -77404,7 +77658,9 @@ self: {
      mkDerivation {
        pname = "jose-jwt";
        version = "0.6.2";
+       revision = "1";
        sha256 = "0fw3b34ghpjpm56iln1i46kr8dcj1yv8gmalgdl7ym7n9bvgrfzq";
+       editedCabalFile = "5aa6637a051160937328c7ff477615ff8424212374f46e41386c705e4db425c0";
        buildDepends = [
          aeson base base64-bytestring byteable bytestring cereal cipher-aes
          containers crypto-cipher-types crypto-numbers crypto-pubkey
@@ -78263,8 +78519,10 @@ self: {
      }:
      mkDerivation {
        pname = "kansas-lava";
-       version = "0.2.4.2";
-       sha256 = "1rng6hjkp6rqqp18dnfm3aps8k5hkxcjm9q1yynyzn12prv4xb1q";
+       version = "0.2.4.3";
+       revision = "1";
+       sha256 = "0i2k5jzirgn68g685azyjp2x96fd2mif56ghxvi566aa1qs5gw1v";
+       editedCabalFile = "7b1860125ab2958d3831cb2536a6b939879f09951199649182bb848e70b583eb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -78285,8 +78543,8 @@ self: {
      }:
      mkDerivation {
        pname = "kansas-lava-cores";
-       version = "0.1.2.1";
-       sha256 = "0x2rgl3cf06srsfvcrrg8kf9r42x3qrvch7kk97zh9vp1f19jd9q";
+       version = "0.1.2.2";
+       sha256 = "076hd8c59hivdirpf4y5vgdlvhq74lfd5zm6np34y8hblq6jyl0m";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -78306,8 +78564,8 @@ self: {
      }:
      mkDerivation {
        pname = "kansas-lava-papilio";
-       version = "0.3.0";
-       sha256 = "1dyvw2n25cd22zdpzyy8ipsxr3lbvhq10xbaz83l94rcf2k9yhqj";
+       version = "0.3.1";
+       sha256 = "0n8ffiygl72cbqza0whmkhsqyg6d7flfdz1jvr22g68x3005r00y";
        buildDepends = [
          ansi-terminal base bytestring data-default directory filepath
          kansas-lava kansas-lava-cores netlist network sized-types
@@ -78565,8 +78823,8 @@ self: {
      }:
      mkDerivation {
        pname = "keera-hails-mvc-solutions-gtk";
-       version = "0.0.3.3";
-       sha256 = "1j0821aysvzpa8qnnz9066gwxk1bwn0sykihb5p5br62n7xzhgkf";
+       version = "0.0.3.4";
+       sha256 = "01sksznn8rxv4ww3p99qm8dhjlpy03ygavp512zmyrpvydhp86mm";
        buildDepends = [
          base gtk hslogger HTTP keera-hails-mvc-environment-gtk
          keera-hails-mvc-model-protectedmodel keera-hails-mvc-view
@@ -78624,8 +78882,8 @@ self: {
      }:
      mkDerivation {
        pname = "keera-hails-reactive-gtk";
-       version = "0.0.3.5";
-       sha256 = "01hvakmxjm9vpfwp4s7c1s3jqiy21yqb9rgjs2drf2kb66ndvsq9";
+       version = "0.0.3.6";
+       sha256 = "1i7l330y10vf35b61y9r5wij0gm871n4bc6lij56nx20msi66ch4";
        buildDepends = [
          base gtk gtk-helpers keera-hails-reactivevalues mtl transformers
        ];
@@ -78700,6 +78958,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "keera-posture" = callPackage
+    ({ mkDerivation, allocated-processor, base, bytestring, cmdargs
+     , containers, cv-combinators, directory, filepath, gio, glib, gtk
+     , gtk-helpers, hgettext, HOpenCV, HTTP, IfElse, keera-hails-i18n
+     , keera-hails-mvc-controller, keera-hails-mvc-environment-gtk
+     , keera-hails-mvc-model-protectedmodel
+     , keera-hails-mvc-solutions-config, keera-hails-mvc-solutions-gtk
+     , keera-hails-mvc-view-gtk, keera-hails-reactive-gtk
+     , keera-hails-reactivevalues, MissingK, mtl, network, process, SDL
+     , SDL-mixer, setlocale, time, utf8-string
+     }:
+     mkDerivation {
+       pname = "keera-posture";
+       version = "0.1.4.4";
+       sha256 = "0nlq68da3yfmp058j637xy25jjdwia8b1z49zf70rhdmyh8kvh60";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         allocated-processor base bytestring cmdargs containers
+         cv-combinators directory filepath gio glib gtk gtk-helpers hgettext
+         HOpenCV HTTP IfElse keera-hails-i18n keera-hails-mvc-controller
+         keera-hails-mvc-environment-gtk
+         keera-hails-mvc-model-protectedmodel
+         keera-hails-mvc-solutions-config keera-hails-mvc-solutions-gtk
+         keera-hails-mvc-view-gtk keera-hails-reactive-gtk
+         keera-hails-reactivevalues MissingK mtl network process SDL
+         SDL-mixer setlocale time utf8-string
+       ];
+       homepage = "http://keera.co.uk/projects/keera-posture";
+       description = "Get notifications when your sitting posture is inappropriate";
+       license = "unknown";
+     }) {};
+
   "keiretsu" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring
      , conduit, conduit-extra, directory, filepath, hslogger, network
@@ -80410,6 +80701,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-kort" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, QuickCheck
+     , random, razom-text-util, regex-applicative, smaoin, text
+     , text-position, utf8-string, vocabulary-kadma
+     }:
+     mkDerivation {
+       pname = "language-kort";
+       version = "0.1.0.0";
+       sha256 = "0dhrzd470hfvkjpizgg9czgyz80nc9sq86r2zcimsch6rxmid0i0";
+       buildDepends = [
+         base base64-bytestring bytestring random razom-text-util
+         regex-applicative smaoin text text-position utf8-string
+         vocabulary-kadma
+       ];
+       testDepends = [
+         base bytestring QuickCheck smaoin text vocabulary-kadma
+       ];
+       homepage = "http://rel4tion.org/projects/language-kort/";
+       description = "Parser and serializer for the Kort information language";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "language-lua" = callPackage
     ({ mkDerivation, alex, array, base, deepseq, directory, filepath
      , mtl, parsec, QuickCheck, safe, tasty, tasty-hunit
@@ -80529,6 +80842,7 @@ self: {
          ansi-wl-pprint base either Glob hspec HUnit lens parsec parsers
          strict-base-types temporary text unix unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
@@ -81179,8 +81493,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah";
-       version = "0.15.0.3";
-       sha256 = "11b4kp1bbw35gsrdcr5kjyjrfiqrqfy645nbpngjz7rzivjl6n4s";
+       version = "0.15.0.5";
+       sha256 = "0k2mbhzjjs8a6bg83iwsjw454pm42179wr2l4vh35cvc5bxii33w";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -81214,8 +81528,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah-server";
-       version = "0.15.0.2";
-       sha256 = "090nz2kvsf83jdp2lhng5x87a96xzxknsr4vx2jc2r2vs60841lx";
+       version = "0.15.0.3";
+       sha256 = "1lh4jwm6x5axhhv5micd03wgv063p71z6vdmszsjpkhfsi9pmgh3";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -81496,8 +81810,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "0.1.1.3";
-       sha256 = "0m2k3ba4b9dxd5ql8z3m9lmbc9lbxl1d2vi0k0024mjlpp0kdwwm";
+       version = "0.1.2.4";
+       sha256 = "1iv3lk4jjp7yvqhfnqxsg8rgkbwzjhmnny6rrqk3njir76b378ra";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -85364,10 +85678,8 @@ self: {
     ({ mkDerivation, base, containers, srcloc, text }:
      mkDerivation {
        pname = "mainland-pretty";
-       version = "0.2.7.2";
-       revision = "1";
-       sha256 = "0spn95apa05bx2akcl13kmg0vlyyakca3jx1960ja4z9dm9lwadd";
-       editedCabalFile = "e766e6766217250919472995c93de5f98496d1b03d73d498668400408f845ee6";
+       version = "0.3.0.0";
+       sha256 = "1fqb03rph3zwl46wkfzbm5hsqhyjn2vvwks506mybabqv3sg24kn";
        buildDepends = [ base containers srcloc text ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "Pretty printing designed for printing source code";
@@ -85859,8 +86171,8 @@ self: {
      }:
      mkDerivation {
        pname = "mandrill";
-       version = "0.2.2.0";
-       sha256 = "186svy4m93r5p25kv1k5bwfpwgmxzf20rhpr6ah4pbavcys6jiyh";
+       version = "0.2.2.1";
+       sha256 = "0fs9fid7d87cnx5wi513xjqkgq425pfd4v9dx82x2c0pvnyfdvhk";
        buildDepends = [
          aeson base base64-bytestring blaze-html bytestring containers
          email-validate http-client http-client-tls http-types lens mtl
@@ -85870,7 +86182,6 @@ self: {
          aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
          tasty-quickcheck text
        ];
-       jailbreak = true;
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -87040,22 +87351,18 @@ self: {
      }) {};
 
   "messagepack" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, cereal, containers
-     , QuickCheck, test-framework, test-framework-quickcheck2
-     , test-framework-th, text
+    ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck
+     , test-framework, test-framework-quickcheck2, test-framework-th
      }:
      mkDerivation {
        pname = "messagepack";
-       version = "0.3.0";
-       sha256 = "1icl40fh9glzr105aha3971gnbnzw528sgdia8kwlj751v3nnpa0";
-       buildDepends = [
-         attoparsec base bytestring cereal containers text
-       ];
+       version = "0.4.0";
+       sha256 = "198rd9yy99zsgp48gmz3kxzljcpmbqh2gghzndn3q0n7cv0lls0i";
+       buildDepends = [ base bytestring cereal containers ];
        testDepends = [
          base bytestring cereal containers QuickCheck test-framework
-         test-framework-quickcheck2 test-framework-th text
+         test-framework-quickcheck2 test-framework-th
        ];
-       jailbreak = true;
        homepage = "https://github.com/rodrigosetti/messagepack";
        description = "Serialize instance for Message Pack Object";
        license = stdenv.lib.licenses.mit;
@@ -87533,8 +87840,8 @@ self: {
      }:
      mkDerivation {
        pname = "mighttpd2";
-       version = "3.2.7";
-       sha256 = "1l1d7hbx0ffxgfjvm8v4ay2pmw50yifw9g31mqa88pfwnjb4v5sp";
+       version = "3.2.8";
+       sha256 = "07fjmflyblyhrkj0477d83dqfkvcq4g2sh7g40x5yr3iawi1kdsp";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -87970,8 +88277,8 @@ self: {
      }:
      mkDerivation {
        pname = "misfortune";
-       version = "0.1.1.1";
-       sha256 = "0knb31jxxn7zds13a90d4lir39386nwzd181mlzkrw5niw1zwmhb";
+       version = "0.1.1.2";
+       sha256 = "0j93zqgqskrj2zc0vwsmwldidr6nkcxq2v3mmzv7l7l1bwhl8jxf";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -88663,12 +88970,13 @@ self: {
      }) {};
 
   "monad-loops" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, tasty, tasty-hunit }:
      mkDerivation {
        pname = "monad-loops";
-       version = "0.4.2.1";
-       sha256 = "1dprwndc0bxzpmrkj1xb9kzjrg3i06zsg43yaabn5x5gcaj8is56";
+       version = "0.4.3";
+       sha256 = "062c2sn3hc8h50p1mhqkpyv6x8dydz2zh3ridvlfjq9nqimszaky";
        buildDepends = [ base ];
+       testDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/mokus0/monad-loops";
        description = "Monadic loops";
        license = stdenv.lib.licenses.publicDomain;
@@ -88881,9 +89189,10 @@ self: {
      mkDerivation {
        pname = "monad-products";
        version = "4.0.0.1";
+       revision = "1";
        sha256 = "017cxiavxfw0f08sr0d6m3avla1lplmdj51rxpf1103ripq20r53";
+       editedCabalFile = "fb4d07af0ad3081f3f2a252c99b777fafa6b3ece61ca81642f8a889ef370710e";
        buildDepends = [ base semigroupoids ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/monad-products";
        description = "Monad products";
        license = stdenv.lib.licenses.bsd3;
@@ -89692,17 +90001,16 @@ self: {
      }) {};
 
   "moonshine" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, canteven-config
-     , directory, ekg, ekg-core, filepath, hslogger, snap, text, time
-     , transformers, yaml
+    ({ mkDerivation, aeson, base, bytestring, canteven-config, ekg
+     , ekg-core, hslogger, snap, text, time, transformers, yaml
      }:
      mkDerivation {
        pname = "moonshine";
-       version = "1.2.2.1";
-       sha256 = "0x8rck2s7a8zhclhn9n6zfyx1p4z1krfg4vyv7gm0djasmcpwdp8";
+       version = "2.0.0.0";
+       sha256 = "1b8b7h9nk5nzk9q5ysg57q1rain36bxhvx4l7qwidsx30rdfs6qs";
        buildDepends = [
-         aeson base bytestring canteven-config directory ekg ekg-core
-         filepath hslogger snap text time transformers yaml
+         aeson base bytestring canteven-config ekg ekg-core hslogger snap
+         text time transformers yaml
        ];
        homepage = "https://github.com/SumAll/moonshine";
        description = "A web service framework for Haskell, similar in purpose to dropwizard";
@@ -90050,6 +90358,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "msi-kb-backlit" = callPackage
+    ({ mkDerivation, base, bytestring, hid, split }:
+     mkDerivation {
+       pname = "msi-kb-backlit";
+       version = "0.1.0.1";
+       sha256 = "1lq1a13h74dkhmh6mkg9mzksvzc2mjb8ynsbs9856z7079ifsdw4";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ base bytestring hid split ];
+       description = "A command line tool to change backlit colors of your MSI keyboards";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mstate" = callPackage
     ({ mkDerivation, base, monad-peel, mtl, stm }:
      mkDerivation {
@@ -90563,7 +90884,9 @@ self: {
      mkDerivation {
        pname = "multiset-comb";
        version = "0.2.4";
+       revision = "1";
        sha256 = "0j7vxm67aws7dzlmdkvx2aja888jp22qdzz8hgmhvbpcr4p7lz99";
+       editedCabalFile = "b6ecbed315e0578b665644b8a73ed1e348968e5a93bb1d491fb5a6faf79d7545";
        buildDepends = [ base containers transformers ];
        description = "Combinatorial algorithms over multisets";
        license = stdenv.lib.licenses.bsd3;
@@ -91838,6 +92161,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "neet" = callPackage
+    ({ mkDerivation, base, cereal, containers, graphviz, MonadRandom
+     , multimap, parallel, random, transformers
+     }:
+     mkDerivation {
+       pname = "neet";
+       version = "0.2.0.0";
+       sha256 = "1gcg172ghdqnrazx4zwy05jpm6vy5li49v42rwdcjggyx6nc0mhi";
+       buildDepends = [
+         base cereal containers graphviz MonadRandom multimap parallel
+         random transformers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/raymoo/NEET";
+       description = "A NEAT library for Haskell";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "nehe-tuts" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, directory, GLFW-b
      , GLURaw, OpenGLRaw, random
@@ -92577,8 +92918,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-conduit-tls";
-       version = "1.2.0";
-       sha256 = "16x334ly9lgrdp9prc9aqjraigqzlgsi9607alaj2pf2qbqa0ipg";
+       version = "1.2.0.1";
+       sha256 = "17d267sg74snq626kk8n9yy9njspjzivwjg60l69879z4nsvp200";
        buildDepends = [
          base bytestring conduit conduit-extra connection cprng-aes
          data-default monad-control network streaming-commons tls
@@ -92673,8 +93014,8 @@ self: {
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "network-fancy";
-       version = "0.2.2";
-       sha256 = "12q2ifjwg4ss5l2pv42nfhsawncbwm6y4dwrspadkjv9b8idl91j";
+       version = "0.2.3";
+       sha256 = "1b4hbwqbir3qw3hs1mxdqdz0lnagyqrp5r383b6cm7yvjy3q3if5";
        buildDepends = [ base bytestring ];
        homepage = "http://github.com/taruti/network-fancy";
        description = "Networking support with a cleaner API";
@@ -92837,8 +93178,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-protocol-xmpp";
-       version = "0.4.7";
-       sha256 = "12xvg21lxvssnaxvzis49xqsccx2siymrva5702m1npdd6f9y81h";
+       version = "0.4.8";
+       sha256 = "07hy8byhaakjwfidrvkjp07jn25aw21g8wcs93ni3njj0kh2jxza";
        buildDepends = [
          base bytestring gnuidn gnutls gsasl libxml-sax monads-tf network
          text transformers xml-types
@@ -93467,28 +93808,27 @@ self: {
 
   "nixfromnpm" = callPackage
     ({ mkDerivation, aeson, base, bytestring, classy-prelude
-     , data-default, directory, error-list, filepath, github, hspec
-     , hspec-expectations, http-client-streams, io-streams, MissingH
-     , mtl, network-uri, parsec, shelly, simple-nix, system-filepath
-     , text, text-render, unordered-containers
+     , containers, data-default, directory, docopt, error-list, filepath
+     , github, hnix, hspec, hspec-expectations, http-client-streams
+     , io-streams, MissingH, mtl, network-uri, parsec, shelly
+     , system-filepath, text, text-render, unordered-containers
      }:
      mkDerivation {
        pname = "nixfromnpm";
-       version = "0.1.0.0";
-       sha256 = "16m7rish1n8292virv0dgzvxwjhy73blmdpcfwdkmb2qvkvvv93j";
-       isLibrary = false;
+       version = "0.1.0.7";
+       sha256 = "0pl00kiirpmhzsyr96gzkjrzps69vycpabrjjdq31ngckwqvjib1";
+       isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson base bytestring classy-prelude data-default directory
-         error-list filepath MissingH mtl network-uri parsec shelly
-         simple-nix system-filepath text text-render unordered-containers
+         aeson base bytestring classy-prelude containers data-default
+         directory docopt error-list filepath hnix MissingH mtl network-uri
+         parsec shelly system-filepath text text-render unordered-containers
        ];
        testDepends = [
-         aeson base bytestring classy-prelude data-default directory
-         error-list filepath github hspec hspec-expectations
+         aeson base bytestring classy-prelude containers data-default
+         directory error-list filepath github hnix hspec hspec-expectations
          http-client-streams io-streams MissingH mtl network-uri parsec
-         shelly simple-nix system-filepath text text-render
-         unordered-containers
+         shelly system-filepath text text-render unordered-containers
        ];
        description = "Generate nix expressions from npm packages";
        license = stdenv.lib.licenses.mit;
@@ -93892,8 +94232,8 @@ self: {
      }:
      mkDerivation {
        pname = "notzero";
-       version = "0.0.7";
-       sha256 = "1247jhaqlmw720x5j2h6mj677jrg392f4i38zign05ral11xh4xf";
+       version = "0.0.10";
+       sha256 = "0g4l4b5f6m3da172k9n49zkcisbv88b3601zabb474l6a80zrz8p";
        buildDepends = [
          base bifunctors lens mtl semigroupoids semigroups transformers
        ];
@@ -94147,7 +94487,9 @@ self: {
      mkDerivation {
        pname = "numeric-prelude";
        version = "0.4.2";
+       revision = "1";
        sha256 = "1i6qavz3av3dbf70li7yqsh184bl618l1sm9s9ia15srrkzsj9sk";
+       editedCabalFile = "acbf128b14ff1177ed767ec9ebb89b1c3c0e998d5d031fdd0e4bc64ebc6bffe2";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -95560,6 +95902,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "optparse-declarative" = callPackage
+    ({ mkDerivation, base, bytestring, fast-logger, monad-logger, mtl
+     }:
+     mkDerivation {
+       pname = "optparse-declarative";
+       version = "0.2.0";
+       sha256 = "189fh9f2k2bzjl0c4mxhg23m87fhmnmszl2qym6ni2npb58df0qa";
+       buildDepends = [ base bytestring fast-logger monad-logger mtl ];
+       homepage = "https://github.com/tanakh/optparse-declarative";
+       description = "Declarative command line option parser";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "optparse-simple" = callPackage
     ({ mkDerivation, base, either, gitrev, optparse-applicative
      , template-haskell, transformers
@@ -96148,8 +96503,8 @@ self: {
      }:
      mkDerivation {
        pname = "pagerduty";
-       version = "0.0.3.1";
-       sha256 = "1l68a5s4w3x2n1qqmd2g6q7925rpvyqf1b9gisq8nsxs1dknin2r";
+       version = "0.0.3.2";
+       sha256 = "0cdn5xmqpfl85nair2ns3dv690wgyfiapks0lnc3aqi8nnly7bws";
        buildDepends = [
          aeson base bifunctors bytestring bytestring-conversion conduit
          data-default-class exceptions generics-sop http-client http-types
@@ -96157,7 +96512,6 @@ self: {
          time-locale-compat transformers transformers-base
          transformers-compat unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://github.com/brendanhay/pagerduty";
        description = "Client library for PagerDuty Integration and REST APIs";
        license = "unknown";
@@ -97157,8 +97511,8 @@ self: {
      }:
      mkDerivation {
        pname = "path";
-       version = "0.5.1";
-       sha256 = "181dq5r4nslh37yy3hs1k20vd2w9yyp8ccjvxcmq12czfzgzz8bi";
+       version = "0.5.2";
+       sha256 = "10ai0ygal1pipdi6221nhv0apgv8hzrra7jpgkn7nl62dbj2sl34";
        buildDepends = [ base exceptions filepath template-haskell ];
        testDepends = [ base hspec HUnit mtl ];
        description = "Path";
@@ -98931,6 +99285,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pipe-enumerator" = callPackage
+    ({ mkDerivation, base, enumerator, pipes, transformers }:
+     mkDerivation {
+       pname = "pipe-enumerator";
+       version = "0.3.0.0";
+       sha256 = "0ralmrhyz88dmnlggmw7kq2gfw5xdb5xypjmmmlgs478z7f2qyd8";
+       buildDepends = [ base enumerator pipes transformers ];
+       homepage = "https://github.com/zadarnowski/pipe-enumerator";
+       description = "A bidirectional bridge between pipes and iteratees";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipeclip" = callPackage
     ({ mkDerivation, base, bytestring, editor-open, Hclip, safe }:
      mkDerivation {
@@ -100269,9 +100635,10 @@ self: {
      mkDerivation {
        pname = "polysoup";
        version = "0.5.2";
+       revision = "1";
        sha256 = "13923ff6lzvl6j059gyhcb3cx27plkxgbyjr7skg9g5hxia5j73b";
+       editedCabalFile = "28bbd0ec4944d449118244081956e0d6d5b0c8c787cdb77509c028d3ee4c222f";
        buildDepends = [ base containers polyparse tagsoup ];
-       jailbreak = true;
        homepage = "https://github.com/kawu/polysoup";
        description = "Online XML parsing with polyparse and tagsoup";
        license = stdenv.lib.licenses.bsd3;
@@ -100848,8 +101215,10 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-query";
-       version = "1.2.0";
-       sha256 = "0syjgaxp77dq7yk9hhyf5mfznf4z0wlfdsxh9dz92krfs5kl3wqr";
+       version = "1.2.1";
+       revision = "1";
+       sha256 = "0dkbg55y4dmdka0ks2mz5m1dk17r5gdhkhk3bypjwchb4nyjvx1f";
+       editedCabalFile = "a751cfcead636156595561698606a6ddb945d763156414c71854a718494768e0";
        buildDepends = [
          aeson attoparsec base blaze-builder bytestring containers
          data-default either exceptions file-embed haskell-src-meta
@@ -100862,7 +101231,6 @@ self: {
          quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th
          text
        ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/s9gf4ult/postgresql-query";
        description = "Sql interpolating quasiquote plus some kind of primitive ORM using it";
        license = stdenv.lib.licenses.bsd3;
@@ -102421,6 +102789,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "promises" = callPackage
+    ({ mkDerivation, base, primitive }:
+     mkDerivation {
+       pname = "promises";
+       version = "0.2";
+       sha256 = "0fgczzjf93fvrfh9sgy49072c6qw27626qwla0qwl0wvfhaal7ah";
+       buildDepends = [ base primitive ];
+       homepage = "http://github.com/ekmett/promises/";
+       description = "Lazy demand-driven promises";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "propane" = callPackage
     ({ mkDerivation, base, colour, containers, directory, filepath
      , repa, repa-devil, spawn
@@ -102473,16 +102853,17 @@ self: {
 
   "property-list" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, cereal
-     , containers, free, old-locale, oneOfN, recursion-schemes, syb
-     , template-haskell, text, time, transformers, vector, xml
+     , containers, free, oneOfN, recursion-schemes, syb
+     , template-haskell, text, time, time-locale-compat, transformers
+     , vector, xml
      }:
      mkDerivation {
        pname = "property-list";
-       version = "0.1.0.4";
-       sha256 = "19i0pzdys7k0gavax6ygk0x58cf636phzp2r99glyn8qcb51yj0z";
+       version = "0.1.0.5";
+       sha256 = "0wv97v6b7yfkwaz6mpw3l12q34k620jb1clz0j9a1kvysm1r005k";
        buildDepends = [
-         base base64-bytestring bytestring cereal containers free old-locale
-         oneOfN recursion-schemes syb template-haskell text time
+         base base64-bytestring bytestring cereal containers free oneOfN
+         recursion-schemes syb template-haskell text time time-locale-compat
          transformers vector xml
        ];
        homepage = "https://github.com/mokus0/property-list";
@@ -102735,8 +103116,8 @@ self: {
      }:
      mkDerivation {
        pname = "pseudo-boolean";
-       version = "0.1.0.1";
-       sha256 = "1a46dx6xxnzhf66kym9xbxxcbqkmqbadg7gxhd2clsahbwlm4w4d";
+       version = "0.1.1.0";
+       sha256 = "0j80pwmp8jpkmh0k76v9mqa3xcbdhb0r4sgq1nkfdf4gm5mn7v03";
        buildDepends = [
          attoparsec base bytestring bytestring-builder containers deepseq
          dlist hashable parsec
@@ -104791,14 +105172,16 @@ self: {
      }) {};
 
   "razom-text-util" = callPackage
-    ({ mkDerivation, base, QuickCheck, regex-applicative, smaoin
+    ({ mkDerivation, base, QuickCheck, regex-applicative, smaoin, text
      , text-position
      }:
      mkDerivation {
        pname = "razom-text-util";
-       version = "0.1.1.0";
-       sha256 = "1zmqfjbhvszf2ky6556q1311x23y1h0v90yqaa1mynn8lqhplgkv";
-       buildDepends = [ base regex-applicative smaoin text-position ];
+       version = "0.1.2.0";
+       sha256 = "0sfqc222pplsdmbrhwvbdf6pmqa18vgjd83rk7hqixzp6rk9h7pg";
+       buildDepends = [
+         base regex-applicative smaoin text text-position
+       ];
        testDepends = [ base QuickCheck regex-applicative smaoin ];
        homepage = "http://rel4tion.org/projects/razom-text-util/";
        description = "Common text/parsing tools for Razom language packages";
@@ -105345,9 +105728,9 @@ self: {
      }:
      mkDerivation {
        pname = "record-preprocessor";
-       version = "0.1.0.0";
-       sha256 = "0ign3zvpnz4zrzfqglf34xbcrb21dq8hyzwkzlq9y26r9g3nmbd5";
-       isLibrary = false;
+       version = "0.1.0.3";
+       sha256 = "0vfij2kj4lg9pvyrcq3x33vnibq441fc80cpd67c9ik9axgf0r3y";
+       isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base base-prelude conversion conversion-text record-syntax text
@@ -105365,8 +105748,8 @@ self: {
      }:
      mkDerivation {
        pname = "record-syntax";
-       version = "0.1.0.0";
-       sha256 = "115z96ific9n3612yzkfmj7hxnbjc8xjz5nmfiddklx9zjih7h40";
+       version = "0.1.0.2";
+       sha256 = "177zy0j05yvpalflja5wpp0a45nplhpa9vq8ssfxw2nw9ydam637";
        buildDepends = [
          base base-prelude conversion conversion-text haskell-src-exts
          parsec record template-haskell text transformers
@@ -106132,8 +106515,11 @@ self: {
      mkDerivation {
        pname = "regex-tdfa-text";
        version = "1.0.0.2";
+       revision = "1";
        sha256 = "1p17xv3j2xd74iilyqwlqhkmyp26asq4k1pb0h2f0wdqqfr87bfd";
+       editedCabalFile = "e445c4a0ce6f4723af060b4ea64d4926c573f43fe41aad883bae464704720243";
        buildDepends = [ array base regex-base regex-tdfa text ];
+       jailbreak = true;
        description = "Text interface for regex-tdfa";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106551,8 +106937,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.5.0.2";
-       sha256 = "1n9x0yrfjgyf49b19vjp0n57h88vvj6bzc8nz0c9z0568cdb9fsh";
+       version = "0.5.0.3";
+       sha256 = "0kqhlnyl6gn1mm7ixz284xk78xrk1j80id6s0znpa6lpck2bszfz";
        buildDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -107450,8 +107836,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-core";
-       version = "0.36.0.4";
-       sha256 = "07ypxsf15ghcnlb706cnl3jw275jlwa158dxb0gkr6ab8sq5f2zk";
+       version = "0.36.0.5";
+       sha256 = "1xvhhj03kyv39w8s330gn3pxz4431xmcbiacf6y8a4d0nd6fw8qf";
        buildDepends = [
          aeson aeson-utils base bytestring case-insensitive errors fclabels
          hxt hxt-pickle-utils json-schema mtl mtl-compat multipart random
@@ -108554,8 +108940,8 @@ self: {
      }:
      mkDerivation {
        pname = "roshask";
-       version = "0.2";
-       sha256 = "1zgvvf7dvfazb4if9wmapgnklh561mjikn21w0ch43zxaqpx6b6k";
+       version = "0.2.1";
+       sha256 = "12sa8ir9cl2gygayk3vhd00shv3wy3sqyhf4hh6arml5q7wz1f3m";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -109291,7 +109677,9 @@ self: {
      mkDerivation {
        pname = "safecopy";
        version = "0.8.5";
+       revision = "1";
        sha256 = "1r0v2276hynxkysyrdmy2334gwxgaz2v6j8g0hd5jzfj2kmnnmk9";
+       editedCabalFile = "9b7af1be25774add78e43c0f9a4f1fe55ce2a98fb00738400661835adf1672c0";
        buildDepends = [
          array base bytestring cereal containers old-time template-haskell
          text time vector
@@ -110092,18 +110480,19 @@ self: {
      }) {};
 
   "schedule-planner" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, http-types
-     , mtl, options, text, transformers, wai, warp
+    ({ mkDerivation, aeson, base, bytestring, composition, containers
+     , HTTP, http-types, mtl, options, text, text-icu, transformers, wai
+     , warp
      }:
      mkDerivation {
        pname = "schedule-planner";
-       version = "1.0.1.0";
-       sha256 = "0vlr4wwazpr7xf5pym2f42gwniy017h02wwymn0zn80wypiv6dz1";
+       version = "1.0.1.1";
+       sha256 = "1x42jm9fciwdp1khlvcw5vl748pw12n8xk4phbnd6iwqaazf9wv8";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         aeson base bytestring containers http-types mtl options text
-         transformers wai warp
+         aeson base bytestring composition containers HTTP http-types mtl
+         options text text-icu transformers wai warp
        ];
        description = "Find the ideal lesson layout";
        license = stdenv.lib.licenses.gpl3;
@@ -110452,20 +110841,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "scotty_0_10_0" = callPackage
+  "scotty_0_10_1" = callPackage
     ({ mkDerivation, aeson, async, base, blaze-builder, bytestring
      , case-insensitive, data-default-class, directory, hspec, hspec-wai
-     , http-types, lifted-base, monad-control, mtl, network
+     , http-types, lifted-base, monad-control, mtl, nats, network
      , regex-compat, text, transformers, transformers-base
      , transformers-compat, wai, wai-extra, warp
      }:
      mkDerivation {
        pname = "scotty";
-       version = "0.10.0";
-       sha256 = "0r1k96cf5nykgg987hfqfayyix23rjfn73njqqsfxjiai1dgrnzn";
+       version = "0.10.1";
+       sha256 = "0rz7m12pqyrw1ihvg7lhciy5lvn1g5mmdrbcyc5z32icqys3qi8v";
        buildDepends = [
          aeson base blaze-builder bytestring case-insensitive
-         data-default-class http-types monad-control mtl network
+         data-default-class http-types monad-control mtl nats network
          regex-compat text transformers transformers-base
          transformers-compat wai wai-extra warp
        ];
@@ -110732,8 +111121,8 @@ self: {
      }:
      mkDerivation {
        pname = "scyther-proof";
-       version = "0.10.0.0";
-       sha256 = "1mzv56d1v4r0024azz7s1yfxpdq53yf6231657y9hnc5z1ybsig3";
+       version = "0.10.0.1";
+       sha256 = "0c4djdr2lq6kbi726zmjicscsc2ksj4l787pzyj5lfbl9c11fb6j";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -110741,7 +111130,6 @@ self: {
          pretty process safe tagsoup time uniplate utf8-string
        ];
        buildTools = [ alex ];
-       jailbreak = true;
        description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110801,8 +111189,8 @@ self: {
     ({ mkDerivation, base, SDL2, sdl2, SDL2_image }:
      mkDerivation {
        pname = "sdl2-image";
-       version = "0.1.1.0";
-       sha256 = "1rxkb4fl3350vxzwvsj25a1m8s7s179anaal33kq3q3kn0jfa72i";
+       version = "0.1.3.1";
+       sha256 = "1czkx3b9grdka0plgpxrk48vygaxc9mfl772kjpm0wvvwgywk9sf";
        buildDepends = [ base sdl2 ];
        extraLibraries = [ SDL2 ];
        pkgconfigDepends = [ SDL2 SDL2_image ];
@@ -110968,14 +111356,16 @@ self: {
      }:
      mkDerivation {
        pname = "second-transfer";
-       version = "0.5.3.2";
-       sha256 = "0qc6xm7c37n2r9xnqc6njkm2d8lkwmripcr3q1q4m7q97qsvjbdl";
+       version = "0.5.4.0";
+       sha256 = "0942z5pdwy4dck3iprx9qafwzv006vkma0626yfarqqw2k5a4jjb";
        buildDepends = [
          attoparsec base base16-bytestring binary bytestring conduit
          containers exceptions hashable hashtables hslogger http2 lens
          network network-uri text time transformers
        ];
-       testDepends = [ base bytestring conduit http2 HUnit lens ];
+       testDepends = [
+         base bytestring conduit http2 HUnit lens transformers
+       ];
        buildTools = [ cpphs ];
        extraLibraries = [ openssl ];
        homepage = "https://www.httptwo.com/second-transfer/";
@@ -111472,12 +111862,12 @@ self: {
      }) {};
 
   "seqid" = callPackage
-    ({ mkDerivation, base, transformers }:
+    ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "seqid";
-       version = "0.3.2";
-       sha256 = "03xyvjflas8sfnsxzpcnm0k3kf8x72y9hwfayxn8zn3gjmwl3b3y";
-       buildDepends = [ base transformers ];
+       version = "0.4.1";
+       sha256 = "0lfgw2fwizhid58aj4ncia8pqldzmkpzrmpgmvw51pgd0c25wjz0";
+       buildDepends = [ base mtl transformers ];
        description = "Sequence ID production and consumption";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -111498,8 +111888,8 @@ self: {
     ({ mkDerivation, base, io-streams, seqid }:
      mkDerivation {
        pname = "seqid-streams";
-       version = "0.3.3";
-       sha256 = "0jddjsvkc2fdnz9yny44ikrqwwx500rd0cgh8fz1894c6p6qfgkm";
+       version = "0.4.0";
+       sha256 = "05h2878dlrnlv66lsf41bngk4w9nwqviq4jl3bj0wdhcdvy9d9il";
        buildDepends = [ base io-streams seqid ];
        jailbreak = true;
        description = "Sequence ID IO-Streams";
@@ -112249,9 +112639,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "setlocale";
-       version = "1.0.0.2";
-       sha256 = "07yby0lz51b9pazh1abpgp1m86gxydkzky51ba04h771nschjj50";
+       version = "1.0.0.3";
+       sha256 = "17n173byca8k5cmqmnzgjk7772ibhg5am5sd1adfp0zd0rcqnqsd";
        buildDepends = [ base ];
+       homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale";
        description = "Haskell bindings to setlocale";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -112533,8 +112924,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake";
-       version = "0.15.2";
-       sha256 = "1vjvfmscmja4f60ag619bca9xdpqlaj3ra2yacrmh1wdi5fzcrdf";
+       version = "0.15.4";
+       sha256 = "189qyxvy6rxlkgmssy2v66f7anp4q9xjmwqcpwxq86h0pj7vr3i9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -112791,6 +113182,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "shared-fields" = callPackage
+    ({ mkDerivation, base, Cabal, hspec, lens, template-haskell, text
+     }:
+     mkDerivation {
+       pname = "shared-fields";
+       version = "0.1.0.0";
+       sha256 = "178jpksnxmyc07nc49wdalyh63bxwshddif9fb48p1fzcy2z5aph";
+       buildDepends = [ base template-haskell ];
+       testDepends = [ base Cabal hspec lens text ];
+       homepage = "http://github.com/intolerable/shared-fields";
+       description = "a tiny library for using shared lens fields";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "shared-memory" = callPackage
     ({ mkDerivation, base, bytestring, unix }:
      mkDerivation {
@@ -113586,17 +113991,22 @@ self: {
      }) {};
 
   "simple-nix" = callPackage
-    ({ mkDerivation, base, classy-prelude, error-list, MissingH, mtl
-     , parsec, system-filepath, text, text-render, unordered-containers
+    ({ mkDerivation, base, classy-prelude, error-list, hspec
+     , hspec-expectations, MissingH, mtl, parsec, system-filepath, text
+     , text-render, unordered-containers
      }:
      mkDerivation {
        pname = "simple-nix";
-       version = "0.1.0.0";
-       sha256 = "18bvqc3gkbczgvipsv6rn71vmw8ybbgvyxccm6q5fgniv1knzh0i";
+       version = "0.1.0.4";
+       sha256 = "1kyarxkp9zdf6k1jpx9a5yjrjghbr52ranfzrbcnb8kdnzi0mh0f";
        buildDepends = [
          base classy-prelude error-list MissingH mtl parsec system-filepath
          text text-render unordered-containers
        ];
+       testDepends = [
+         base classy-prelude error-list hspec hspec-expectations MissingH
+         mtl parsec system-filepath text text-render unordered-containers
+       ];
        homepage = "https://github.com/adnelson/simple-nix";
        description = "Simple parsing/pretty printing for Nix expressions";
        license = stdenv.lib.licenses.mit;
@@ -114051,8 +114461,8 @@ self: {
     ({ mkDerivation, base, singletons }:
      mkDerivation {
        pname = "singleton-nats";
-       version = "0.2.0.0";
-       sha256 = "0qq5zg2m5w55fimz9xm7dc9953zlm345whvlf2j0gk1iw7n6a1ax";
+       version = "0.3.0.1";
+       sha256 = "1zgrvpszlvbq3mhfrs50dz2wd3bx6zxpyh0cj1zlwbn62psbdqxm";
        buildDepends = [ base singletons ];
        description = "Unary natural numbers relying on the singletons infrastructure";
        license = stdenv.lib.licenses.bsd3;
@@ -114577,8 +114987,8 @@ self: {
      }:
      mkDerivation {
        pname = "smaoin";
-       version = "0.2.0.0";
-       sha256 = "1zciyb1kknhnrnkw57bfi28sc80fbz6dq4vrnyq1b63b4nmhl2sd";
+       version = "0.3.0.0";
+       sha256 = "0j18pdpywgb01679b4f2aj7pzna1njh45giw1b1dsqqdp45gz2rp";
        buildDepends = [ base bytestring random text uuid ];
        testDepends = [ base bytestring QuickCheck ];
        homepage = "http://rel4tion.org/projects/smaoin-hs/";
@@ -114782,6 +115192,7 @@ self: {
          cprng-aes data-default filepath mime-mail network resourcet
          stringsearch text tls transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/enzoh/smtps-gmail";
        description = "Gmail SMTP Client";
        license = stdenv.lib.licenses.bsd3;
@@ -115031,15 +115442,12 @@ self: {
      }:
      mkDerivation {
        pname = "snap-loader-dynamic";
-       version = "0.10.0.2";
-       revision = "1";
-       sha256 = "0fnpzhwnj3dsqwx880391x9x6y0ry8f6dfrzkfs963zib9l3qvh7";
-       editedCabalFile = "2f64bcfd0c84d6f6f161c4418778e5c463d127a383c2f3f8216155d161d87d7d";
+       version = "0.10.0.3";
+       sha256 = "0nk4knkxnfffs5pgf6x3ld83l174aymqlyasxbf7j10w0w8srmvw";
        buildDepends = [
          base directory directory-tree hint mtl snap-core template-haskell
          time unix
        ];
-       jailbreak = true;
        homepage = "http://snapframework.com/";
        description = "Snap: A Haskell Web Framework: dynamic loader";
        license = stdenv.lib.licenses.bsd3;
@@ -115308,15 +115716,12 @@ self: {
      }:
      mkDerivation {
        pname = "snaplet-fay";
-       version = "0.3.3.11";
-       revision = "2";
-       sha256 = "18g61qivc49g37zmb4qv2piwlgs572fmngdpsjdhjmrgqn049fjr";
-       editedCabalFile = "6b536ac4ad158ceed55ca18802caf4e970caabce93af33d95579ac431a003e9d";
+       version = "0.3.3.12";
+       sha256 = "1j9khzd1zalzkli0p139fx48dljn76f4g851k889q3zq5lriihps";
        buildDepends = [
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/faylang/snaplet-fay";
        description = "Fay integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
@@ -115735,13 +116140,12 @@ self: {
      }:
      mkDerivation {
        pname = "snaplet-sass";
-       version = "0.1.1.0";
-       sha256 = "05vif2rz0dj2b3vm0yh0bwj234xjnjpiaf2fk8vlv00jirgrdr40";
+       version = "0.1.2.0";
+       sha256 = "1aiznsi54lxzwxnilckspvp6rdfmksxppa3964kqxh93a9gvkr9z";
        buildDepends = [
          base bytestring configurator directory filepath mtl process snap
          snap-core transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/lukerandall/snaplet-sass";
        description = "Sass integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
@@ -116184,8 +116588,8 @@ self: {
     ({ mkDerivation, async, base, bytestring }:
      mkDerivation {
        pname = "socket";
-       version = "0.4.0.1";
-       sha256 = "0xb5mdx8mxyy1h0kccgkj8qc3qkpi1rn1l0z52rid716yw1lia42";
+       version = "0.5.1.0";
+       sha256 = "1kmaw7m44iq1mk643y3kif9g2dmcyirnsv2y7gvf6c12xwrf5adh";
        buildDepends = [ base bytestring ];
        testDepends = [ async base bytestring ];
        homepage = "https://github.com/lpeterse/haskell-socket";
@@ -116222,6 +116626,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "socket-sctp" = callPackage
+    ({ mkDerivation, base, bytestring, sctp, socket }:
+     mkDerivation {
+       pname = "socket-sctp";
+       version = "0.1.0.0";
+       sha256 = "1xdrc3d31xzi0q8arh8liv1h9xqinscaa5ip2xs6dvf4gap7rvs8";
+       buildDepends = [ base bytestring socket ];
+       testDepends = [ base bytestring socket ];
+       extraLibraries = [ sctp ];
+       homepage = "https://github.com/lpeterse/haskell-socket-sctp";
+       description = "STCP socket extensions library";
+       license = stdenv.lib.licenses.mit;
+     }) { sctp = null;};
+
   "socketio" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , blaze-builder, bytestring, conduit, conduit-extra, http-types
@@ -116827,8 +117245,8 @@ self: {
      }:
      mkDerivation {
        pname = "species";
-       version = "0.3.4.1";
-       sha256 = "0nn8s43d6r297my3y3m83qv082j2if32c7pyy14c5ll893v16nvw";
+       version = "0.3.4.2";
+       sha256 = "07xixq45wbfqmdiykra2fpsfjv1n5s1zn0jvqrhja5d2i92865ly";
        buildDepends = [
          base containers multiset-comb np-extras numeric-prelude
          template-haskell
@@ -117774,20 +118192,21 @@ self: {
      , base64-bytestring, bifunctors, binary, bytestring, Cabal, conduit
      , conduit-combinators, conduit-extra, containers, cryptohash
      , cryptohash-conduit, deepseq, directory, either
-     , enclosed-exceptions, exceptions, fast-logger, filepath, hashable
-     , hspec, http-client, http-client-tls, http-conduit, http-types
-     , lifted-base, monad-control, monad-logger, monad-loops, mtl
-     , old-locale, optparse-applicative, optparse-simple, path
-     , persistent, persistent-sqlite, persistent-template, pretty
-     , process, resourcet, safe, split, stm, streaming-commons, tar
-     , template-haskell, temporary, text, time, transformers
-     , transformers-base, unix, unordered-containers, vector
-     , vector-binary-instances, void, yaml, zlib
+     , enclosed-exceptions, exceptions, fast-logger, file-embed
+     , filepath, hashable, hspec, http-client, http-client-tls
+     , http-conduit, http-types, lifted-base, monad-control
+     , monad-logger, monad-loops, mtl, old-locale, optparse-applicative
+     , optparse-simple, path, persistent, persistent-sqlite
+     , persistent-template, pretty, process, resourcet, safe, split, stm
+     , streaming-commons, tar, template-haskell, temporary, text, time
+     , transformers, transformers-base, unix, unix-compat
+     , unordered-containers, vector, vector-binary-instances, void
+     , word8, yaml, zlib
      }:
      mkDerivation {
        pname = "stack";
-       version = "0.0.2.1";
-       sha256 = "1gv2cbjnr93s4cyhybpd8nsqa8gqd9hpm9wyrh19fl82p8db46x6";
+       version = "0.1.0.0";
+       sha256 = "0ws0d1gran02jag06176w5c2wrc13q5hp82mxdmm9sif93k2cvg6";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -117795,22 +118214,22 @@ self: {
          bifunctors binary bytestring Cabal conduit conduit-combinators
          conduit-extra containers cryptohash cryptohash-conduit deepseq
          directory either enclosed-exceptions exceptions fast-logger
-         filepath hashable http-client http-client-tls http-conduit
-         http-types lifted-base monad-control monad-logger monad-loops mtl
-         old-locale optparse-applicative optparse-simple path persistent
-         persistent-sqlite persistent-template pretty process resourcet safe
-         split stm streaming-commons tar template-haskell temporary text
-         time transformers transformers-base unix unordered-containers
-         vector vector-binary-instances void yaml zlib
+         file-embed filepath hashable http-client http-client-tls
+         http-conduit http-types lifted-base monad-control monad-logger
+         monad-loops mtl old-locale optparse-applicative optparse-simple
+         path persistent persistent-sqlite persistent-template pretty
+         process resourcet safe split stm streaming-commons tar
+         template-haskell temporary text time transformers transformers-base
+         unix unordered-containers vector vector-binary-instances void word8
+         yaml zlib
        ];
        testDepends = [
-         base Cabal conduit conduit-extra containers cryptohash directory
-         exceptions filepath hspec http-conduit monad-logger path resourcet
-         temporary transformers
+         async base bytestring Cabal conduit conduit-extra containers
+         cryptohash directory exceptions filepath hspec http-conduit
+         monad-logger path process resourcet temporary text transformers
+         unix-compat
        ];
-       homepage = "https://github.com/commercialhaskell/stack
-test/package-dump/ghc-7.8.txt
-test/package-dump/ghc-7.10.txt";
+       homepage = "https://github.com/commercialhaskell/stack";
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120923,6 +121342,27 @@ test/package-dump/ghc-7.10.txt";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "sys-process" = callPackage
+    ({ mkDerivation, base, bifunctors, directory, doctest, filepath
+     , lens, mtl, notzero, process, QuickCheck, semigroupoids
+     , semigroups, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "sys-process";
+       version = "0.1.5";
+       sha256 = "1lpysza901xv4942pixbgccpxh4rc8z9v819fb45zyxfakjcywbj";
+       buildDepends = [
+         base bifunctors directory filepath lens mtl notzero process
+         semigroupoids semigroups transformers
+       ];
+       testDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/NICTA/sys-process";
+       description = "A replacement for System.Exit and System.Process.";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "system-argv0" = callPackage
     ({ mkDerivation, base, bytestring, system-filepath, text }:
      mkDerivation {
@@ -121505,8 +121945,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "taggy";
-       version = "0.1.4";
-       sha256 = "1fanngprqscpjczqi7v0h5s6qd52y3vj11jv1fasp4hwj6gx92f7";
+       version = "0.2.0";
+       sha256 = "01q2ccf3a8akaifh79ajnfr5yrjsq4xihq0pl7lsz173n7mhnsy3";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -123436,13 +123876,13 @@ test/package-dump/ghc-7.10.txt";
 
   "text-ldap" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
-     , Cabal, cabal-test-compat, containers, dlist, QuickCheck, random
+     , containers, dlist, QuickCheck, quickcheck-simple, random
      , semigroups, transformers
      }:
      mkDerivation {
        pname = "text-ldap";
-       version = "0.1.1.5";
-       sha256 = "164kyvcmbhpvpqb5yvr55zd90cq2lw6q5qqd6wb4caa668badpzb";
+       version = "0.1.1.6";
+       sha256 = "12r0bcj83qfaaj6q1sw21dh3y4c82rxas1s5nzyn650pfnpvv2mq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -123450,8 +123890,7 @@ test/package-dump/ghc-7.10.txt";
          semigroups transformers
        ];
        testDepends = [
-         base bytestring Cabal cabal-test-compat QuickCheck random
-         semigroups
+         base bytestring QuickCheck quickcheck-simple random semigroups
        ];
        description = "Parser and Printer for LDAP text data stream";
        license = stdenv.lib.licenses.bsd3;
@@ -123564,12 +124003,12 @@ test/package-dump/ghc-7.10.txt";
      }) {};
 
   "text-render" = callPackage
-    ({ mkDerivation, base, mtl, parsec, text }:
+    ({ mkDerivation, base, classy-prelude, mtl, parsec, text }:
      mkDerivation {
        pname = "text-render";
-       version = "0.1.0.1";
-       sha256 = "1viy7amiy6pz2mcay70r952jham9mnkmf70icfzd25cjzqx1h8wn";
-       buildDepends = [ base mtl parsec text ];
+       version = "0.1.0.2";
+       sha256 = "17fgnddp4cfh9l6vlwyq4fnrws56gxxgdvq06fnvz0x8rd0c72wp";
+       buildDepends = [ base classy-prelude mtl parsec text ];
        homepage = "http://github.com/thinkpad20/text-render";
        description = "A type class for rendering objects as text, pretty-printing, etc";
        license = stdenv.lib.licenses.mit;
@@ -123890,8 +124329,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "th-desugar";
-       version = "1.5.3";
-       sha256 = "1bnbx5fpdnw24q3cjq1riccing8wadhl2xa588kf1qdf1nd9g7i0";
+       version = "1.5.4";
+       sha256 = "1dwp77gys84bb0v2af33knhwnj37rg5r662d9kcvhvqk5z4i6c68";
        buildDepends = [
          base containers mtl syb template-haskell th-lift th-orphans
        ];
@@ -124919,8 +125358,8 @@ test/package-dump/ghc-7.10.txt";
     ({ mkDerivation, base, time }:
      mkDerivation {
        pname = "time-locale-compat";
-       version = "0.1.0.1";
-       sha256 = "0q5d134cvcy7hlr473fanqqixqnqpqvz9ka2r45m59l6kzrws95c";
+       version = "0.1.1.0";
+       sha256 = "0mdl1i17hcbka8miq1n6mscrr84vnmx5a3mqgwv2yb28k404v815";
        buildDepends = [ base time ];
        homepage = "http://twitter.com/khibino/";
        description = "Compatibility of TimeLocale between old-locale and time-1.5";
@@ -125437,27 +125876,22 @@ test/package-dump/ghc-7.10.txt";
 
   "tls" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, async, base, byteable
-     , bytestring, cereal, cipher-aes, cipher-des, cipher-rc4, cprng-aes
-     , crypto-cipher-types, crypto-numbers, crypto-pubkey
-     , crypto-pubkey-types, crypto-random, cryptohash
-     , data-default-class, hourglass, mtl, network, QuickCheck, tasty
-     , tasty-quickcheck, transformers, x509, x509-store, x509-validation
+     , bytestring, cereal, cryptonite, data-default-class, hourglass
+     , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck
+     , transformers, x509, x509-store, x509-validation
      }:
      mkDerivation {
        pname = "tls";
-       version = "1.2.17";
-       sha256 = "0j0a16zwpycp0drsjar0rpcs5vd1ljymhclfjls6091ph917rzn6";
+       version = "1.3.1";
+       sha256 = "1l6maasf4pr70cxasn6bwcy2aydlmiadmd28ymz0fp8ifw388zvl";
        buildDepends = [
          asn1-encoding asn1-types async base byteable bytestring cereal
-         cipher-aes cipher-des cipher-rc4 crypto-cipher-types crypto-numbers
-         crypto-pubkey crypto-pubkey-types crypto-random cryptohash
-         data-default-class mtl network transformers x509 x509-store
-         x509-validation
+         cryptonite data-default-class memory mtl network transformers x509
+         x509-store x509-validation
        ];
        testDepends = [
-         base bytestring cereal cprng-aes crypto-pubkey crypto-random
-         data-default-class hourglass mtl QuickCheck tasty tasty-quickcheck
-         x509 x509-validation
+         base bytestring cereal cryptonite data-default-class hourglass mtl
+         QuickCheck tasty tasty-quickcheck x509 x509-validation
        ];
        homepage = "http://github.com/vincenthz/hs-tls";
        description = "TLS/SSL protocol native implementation (Server and Client)";
@@ -125465,19 +125899,18 @@ test/package-dump/ghc-7.10.txt";
      }) {};
 
   "tls-debug" = callPackage
-    ({ mkDerivation, base, bytestring, cprng-aes, crypto-pubkey
-     , data-default-class, network, pem, time, tls, x509, x509-system
-     , x509-validation
+    ({ mkDerivation, base, bytestring, cryptonite, data-default-class
+     , network, pem, time, tls, x509, x509-system, x509-validation
      }:
      mkDerivation {
        pname = "tls-debug";
-       version = "0.3.4";
-       sha256 = "08bxcl0lf07fx3xfajd99090glvgnpn5s4826g2hirr75b9a5b93";
+       version = "0.4.0";
+       sha256 = "06hvnyg89n4zplw2p4rnqwyyqc5r204pfdmpvim8y119pllg3mij";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base bytestring cprng-aes crypto-pubkey data-default-class network
-         pem time tls x509 x509-system x509-validation
+         base bytestring cryptonite data-default-class network pem time tls
+         x509 x509-system x509-validation
        ];
        homepage = "http://github.com/vincenthz/hs-tls";
        description = "Set of programs for TLS testing and debugging";
@@ -125920,6 +126353,7 @@ test/package-dump/ghc-7.10.txt";
          prettyclass QuickCheck random stm tasty tasty-hunit
          tasty-quickcheck tasty-th vector-space
        ];
+       jailbreak = true;
        description = "Assorted decision procedures for SAT, Max-SAT, PB, MIP, etc";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126508,8 +126942,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "trurl";
-       version = "0.3.0.4";
-       sha256 = "1ync81dhac7m62fq15ciipy2lbrqph2riq1af1z70ah30vyzr415";
+       version = "0.3.1.0";
+       sha256 = "0byg9gp6xgdy30mrjdlsijr87d6ivhj35baz5zpjxi6vgn8pa87v";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -126668,8 +127102,8 @@ test/package-dump/ghc-7.10.txt";
     ({ mkDerivation, base, comonad, free, mtl, transformers }:
      mkDerivation {
        pname = "tubes";
-       version = "0.2.1.0";
-       sha256 = "1j1pzsmr4djjvhmix6ffsapm30lv4iim1jvcq454r1kxi0yid76z";
+       version = "0.2.2.1";
+       sha256 = "1zl7rnkind38a4ixxwq9qqxllrqi6aig6jnamda3r4nw1xh3ysxw";
        buildDepends = [ base comonad free mtl transformers ];
        homepage = "https://github.com/gatlin/tubes";
        description = "Effectful, iteratee-inspired stream processing based on a free monad";
@@ -128786,20 +129220,20 @@ test/package-dump/ghc-7.10.txt";
 
   "units" = callPackage
     ({ mkDerivation, base, containers, HUnit-approx, mtl, multimap
-     , parsec, singletons, syb, tasty, tasty-hunit, template-haskell
-     , th-desugar, vector-space
+     , singletons, syb, tasty, tasty-hunit, template-haskell, th-desugar
+     , units-parser, vector-space
      }:
      mkDerivation {
        pname = "units";
-       version = "2.2.1";
-       sha256 = "0b4h8kv8yraqs4rxidqi60833iib0zvqdnsywi4aryw14zkpvl17";
+       version = "2.3";
+       sha256 = "14h5566b68wr5qln3x4a862j0zmfdlishipbj9mhd2wmpri6bmzj";
        buildDepends = [
-         base containers mtl multimap parsec singletons syb template-haskell
-         th-desugar vector-space
+         base containers mtl multimap singletons syb template-haskell
+         th-desugar units-parser vector-space
        ];
        testDepends = [
-         base containers HUnit-approx mtl multimap parsec singletons syb
-         tasty tasty-hunit template-haskell th-desugar vector-space
+         base containers HUnit-approx mtl multimap singletons syb tasty
+         tasty-hunit template-haskell th-desugar units-parser vector-space
        ];
        homepage = "https://github.com/goldfirere/units";
        description = "A domain-specific type system for dimensional analysis";
@@ -128807,6 +129241,22 @@ test/package-dump/ghc-7.10.txt";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "units-attoparsec" = callPackage
+    ({ mkDerivation, attoparsec, base, template-haskell, text, units
+     , units-defs
+     }:
+     mkDerivation {
+       pname = "units-attoparsec";
+       version = "1.0";
+       sha256 = "11saazsgx7gpbfhwwgvrp3zwirkvv8h8c61rrsczfq1qmsljxxiz";
+       buildDepends = [
+         attoparsec base template-haskell text units units-defs
+       ];
+       homepage = "https://github.com/jcristovao/units-attoparsec";
+       description = "Attoparsec parsers for the units package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "units-defs" = callPackage
     ({ mkDerivation, base, template-haskell, units }:
      mkDerivation {
@@ -131482,6 +131932,18 @@ test/package-dump/ghc-7.10.txt";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vocabulary-kadma" = callPackage
+    ({ mkDerivation, base, smaoin }:
+     mkDerivation {
+       pname = "vocabulary-kadma";
+       version = "0.1.0.0";
+       sha256 = "1qzx1kl93ic68rvpwf1y9q3gn5c2zf5536ajp6l4xh75dykl8mpb";
+       buildDepends = [ base smaoin ];
+       homepage = "http://rel4tion.org/projects/vocabularies-hs/";
+       description = "Smaoin vocabulary definitions of the base framework";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "void" = callPackage
     ({ mkDerivation, base, ghc-prim, hashable, semigroups }:
      mkDerivation {
@@ -132530,13 +132992,12 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "wai-routes";
-       version = "0.7.0";
-       sha256 = "1adiijvnwgm7j3qdr5ngxcc59amzcphgww3drj308hq278fpac08";
+       version = "0.7.1";
+       sha256 = "053bgiw2abwjlc6ap9ka4kdg410gxxmyqdfzsxiva94sp3w816xx";
        buildDepends = [
          aeson base blaze-builder bytestring containers http-types mtl
          path-pieces random template-haskell text wai
        ];
-       jailbreak = true;
        homepage = "https://github.com/ajnsit/wai-routes";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
@@ -132841,8 +133302,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "warp-tls";
-       version = "3.0.4.1";
-       sha256 = "0p9472j9sa584gw8i1jg89rhbl0kv6r1d6naiqfmmirxii4pmp4y";
+       version = "3.0.4.2";
+       sha256 = "070bq28mg29yw5w7n92j73b74amqxn0yb5cx9z28p8ilmx3y03v1";
        buildDepends = [
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
@@ -133279,12 +133740,13 @@ test/package-dump/ghc-7.10.txt";
      mkDerivation {
        pname = "web-routing";
        version = "0.6.2";
+       revision = "1";
        sha256 = "1x7imgnpq3998fk4pi2z5ba0r9xc7blf61rn1i51yqqd24la887f";
+       editedCabalFile = "4aa263239149f8ef52999fdc29c8e90c552081672a4476adedce903248e15524";
        buildDepends = [
          base bytestring primitive text types-compat unordered-containers
        ];
        testDepends = [ base doctest ];
-       jailbreak = true;
        homepage = "https://github.com/philopon/web-routing";
        description = "simple routing library";
        license = stdenv.lib.licenses.mit;
@@ -134206,7 +134668,9 @@ test/package-dump/ghc-7.10.txt";
      mkDerivation {
        pname = "word-trie";
        version = "0.3.0";
+       revision = "1";
        sha256 = "10ljyb1hl4awg2c3wq5shdqj2s53q5fklf7p6np1jhn6i30c5wx3";
+       editedCabalFile = "85582eefb0020e6e35a0e2588e1dd647fb20bb7f70108f29493f994af5b74a05";
        buildDepends = [ base binary containers ];
        testDepends = [ base binary containers hspec QuickCheck ];
        homepage = "https://github.com/yi-editor/word-trie";
@@ -134862,21 +135326,19 @@ test/package-dump/ghc-7.10.txt";
 
   "x509" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
-     , bytestring, containers, crypto-pubkey-types, cryptohash
-     , directory, filepath, hourglass, mtl, pem, process, tasty
-     , tasty-quickcheck
+     , bytestring, containers, cryptonite, directory, filepath
+     , hourglass, memory, mtl, pem, process, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "x509";
-       version = "1.5.1";
-       sha256 = "1mxg3bill1zqxdn6x0ayf8dja7y3xqikjaj9dhwf22y24vsj6v2n";
+       version = "1.6.0";
+       sha256 = "0fy2jyqkz6qi4x5x9hipnkwqcp3iqyb8h3cj23b69mqx98bfr7lk";
        buildDepends = [
          asn1-encoding asn1-parse asn1-types base bytestring containers
-         crypto-pubkey-types cryptohash directory filepath hourglass mtl pem
-         process
+         cryptonite directory filepath hourglass memory mtl pem process
        ];
        testDepends = [
-         asn1-types base bytestring crypto-pubkey-types hourglass mtl tasty
+         asn1-types base bytestring cryptonite hourglass mtl tasty
          tasty-quickcheck
        ];
        homepage = "http://github.com/vincenthz/hs-certificate";
@@ -134886,16 +135348,16 @@ test/package-dump/ghc-7.10.txt";
 
   "x509-store" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
-     , containers, crypto-pubkey-types, directory, filepath, mtl, pem
-     , process, x509
+     , containers, cryptonite, directory, filepath, mtl, pem, process
+     , x509
      }:
      mkDerivation {
        pname = "x509-store";
-       version = "1.5.0";
-       sha256 = "1w9sqb007s4avjzvrdwq13a4c528h7h2lg3m8cl31syrgznc9ny5";
+       version = "1.6.0";
+       sha256 = "08ifb2gy2ssq7ci1rlmxvm344rvcil8418ymj95l5c361nl4gcym";
        buildDepends = [
-         asn1-encoding asn1-types base bytestring containers
-         crypto-pubkey-types directory filepath mtl pem process x509
+         asn1-encoding asn1-types base bytestring containers cryptonite
+         directory filepath mtl pem process x509
        ];
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "X.509 collection accessing and storing methods";
@@ -134908,8 +135370,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "x509-system";
-       version = "1.5.0";
-       sha256 = "159zwg35nq42j1rl0p4x00hdf3iy48hd7kavz0rnpwd2p7ljamr3";
+       version = "1.6.0";
+       sha256 = "0d8ppvszc1xlvz7ixb8bbqmvhv2d9yyrrh51f5yng8mb2d2w5yah";
        buildDepends = [
          base bytestring containers directory filepath mtl pem process x509
          x509-store
@@ -134942,19 +135404,18 @@ test/package-dump/ghc-7.10.txt";
 
   "x509-validation" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, byteable
-     , bytestring, containers, crypto-pubkey, crypto-pubkey-types
-     , cryptohash, data-default-class, directory, filepath, hourglass
-     , mtl, network, pem, process, x509, x509-store
+     , bytestring, containers, cryptonite, data-default-class, directory
+     , filepath, hourglass, memory, mtl, network, pem, process, x509
+     , x509-store
      }:
      mkDerivation {
        pname = "x509-validation";
-       version = "1.5.2";
-       sha256 = "1w97x9075kib88vxhxsgndhsw2bhg31sdw0czcvl16zsgj8998ay";
+       version = "1.6.0";
+       sha256 = "07lz6klfslrlkc5zn8x4ynkpa9vfbn19vz7i67ygm1g608jcj1yc";
        buildDepends = [
          asn1-encoding asn1-types base byteable bytestring containers
-         crypto-pubkey crypto-pubkey-types cryptohash data-default-class
-         directory filepath hourglass mtl network pem process x509
-         x509-store
+         cryptonite data-default-class directory filepath hourglass memory
+         mtl network pem process x509 x509-store
        ];
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "X.509 Certificate and CRL validation";
@@ -135481,8 +135942,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "xml-conduit-parse";
-       version = "0.2.0.1";
-       sha256 = "04cs7bfdyia56vp9khdszxap1ri2riymmhsdb8shkcypf4ndhyyw";
+       version = "0.3.0.0";
+       sha256 = "0dhg2wgb7gbyn5h1z8fq813l158c49lazfxp1kx9p5jfbc12kk7s";
        buildDepends = [
          base conduit conduit-parse containers exceptions parsers text
          xml-conduit xml-types
@@ -135778,8 +136239,8 @@ test/package-dump/ghc-7.10.txt";
     ({ mkDerivation, base, deepseq, text }:
      mkDerivation {
        pname = "xml-types";
-       version = "0.3.4";
-       sha256 = "1689ijr4xxh4shxxvd51wdkpc535kzv6liqg4m1prag96aq05r8y";
+       version = "0.3.5";
+       sha256 = "0vddb60a5yi7cxwyxik7vwnlrpwmvfz7jq20pdp355q61qc842sa";
        buildDepends = [ base deepseq text ];
        homepage = "https://john-millikin.com/software/haskell-xml/";
        description = "Basic types for representing XML";
@@ -137049,8 +137510,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "yesod-auth-account";
-       version = "1.4.0";
-       sha256 = "15b9pwxgh73wa7bmydkh4wdndfkn85v0f7q4mfi582vk272n3ra0";
+       version = "1.4.1";
+       sha256 = "18bi75kx89gfzh7vi5p8pcqwip1qfpkab415bmn6pcqrlh3jd90i";
        buildDepends = [
          base blaze-html bytestring mtl nonce persistent pwstore-fast text
          yesod-auth yesod-core yesod-form yesod-persistent
@@ -137059,7 +137520,6 @@ test/package-dump/ghc-7.10.txt";
          base bytestring hspec monad-logger mtl persistent-sqlite resourcet
          text xml-conduit yesod yesod-auth yesod-test
        ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/wuzzeb/yesod-auth-account";
        description = "An account authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
@@ -138191,8 +138651,8 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "yesod-static-angular";
-       version = "0.1.3";
-       sha256 = "115lrq6mga31qhdwa3f3hrnxcn8ifgas97hy8mg4wv6ijbzw680y";
+       version = "0.1.4";
+       sha256 = "0yqqy2fpnrqhlljm3pk8d5nxqp1fiqnyf1cd4h6c8yfrs46w41d5";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -138205,7 +138665,6 @@ test/package-dump/ghc-7.10.txt";
          base bytestring hamlet hspec HUnit shakespeare template-haskell
          text yesod-core yesod-static yesod-test
        ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/wuzzeb/yesod-static-generators";
        description = "Yesod generators for embedding AngularJs code into yesod-static at compile time";
        license = stdenv.lib.licenses.mit;
@@ -138290,13 +138749,12 @@ test/package-dump/ghc-7.10.txt";
      }:
      mkDerivation {
        pname = "yesod-text-markdown";
-       version = "0.1.7";
-       sha256 = "133zv2f8240qbygpza39m28k4hfy2aiqmr6ds8ihwbb8dz98d5rr";
+       version = "0.1.8";
+       sha256 = "1k48wjnn4vvlh9cvh8p3yanjmr772vqz4jbz9nxk0vv9ab9dns81";
        buildDepends = [
          aeson base markdown persistent shakespeare text yesod-core
          yesod-form yesod-persistent
        ];
-       jailbreak = true;
        description = "Yesod support for Text.Markdown.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -139357,9 +139815,10 @@ test/package-dump/ghc-7.10.txt";
      mkDerivation {
        pname = "zlib-lens";
        version = "0.1.2";
+       revision = "1";
        sha256 = "1vm12sm9ypik5qnnizmwx56fmpjghldzb06kn020hwlabz8c4j8n";
+       editedCabalFile = "353e3ef6e0281894cd494b95563bb93a30ec0ff96e309a173c36bddfc4069e66";
        buildDepends = [ base bytestring profunctors zlib ];
-       jailbreak = true;
        homepage = "http://lens.github.io/";
        description = "Lenses for zlib";
        license = stdenv.lib.licenses.bsd3;

From ae7140f69357f8ab0b194ba9064b11161a6a4519 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 18 Jun 2015 21:00:43 +0200
Subject: [PATCH 1528/2322] haskell-hslua: drop obsolete override

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 751e0fb4825..fe73afa0729 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -27,7 +27,6 @@ self: super: {
 
   # Doesn't compile with lua 5.2.
   hslua = super.hslua.override { lua = pkgs.lua5_1; };
-  hslua_0_4_0 = super.hslua_0_4_0.override { lua = pkgs.lua5_1; };
 
   # Use the default version of mysql to build this package (which is actually mariadb).
   mysql = super.mysql.override { mysql = pkgs.mysql.lib; };

From ddcdeaf2c13929cc26b99c28392400256c88e670 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Jun 2015 11:22:15 +0200
Subject: [PATCH 1529/2322] haskell-units-attoparsec: build depends on broken
 singletons library

---
 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 fe73afa0729..7c2eb296a3a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -806,6 +806,7 @@ self: super: {
   hipe = dontDistribute super.hipe;
   singleton-nats = dontDistribute super.singleton-nats;
   singletons = markBroken super.singletons;
+  units-attoparsec = dontDistribute super.units-attoparsec;
 
   # https://github.com/anton-k/temporal-music-notation/issues/1
   temporal-music-notation = markBroken super.temporal-music-notation;

From 56b293231b3b09734c293bb1fb3d57e60dc75aba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Jun 2015 11:38:18 +0200
Subject: [PATCH 1530/2322] haskell-shake: disable test suite because of
 https://github.com/ndmitchell/shake/issues/267

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7c2eb296a3a..269c020c376 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -792,7 +792,8 @@ self: super: {
   HGamer3D-Data = markBroken super.HGamer3D-Data;
 
   # https://github.com/ndmitchell/shake/issues/206
-  shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin; });
+  # https://github.com/ndmitchell/shake/issues/267
+  shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin && false; });
 
   # https://github.com/nushio3/doctest-prop/issues/1
   doctest-prop = dontCheck super.doctest-prop;

From 2c944fd4dd8c067d3b7badf5f0d0bf46367c63eb Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 24 Jun 2015 12:37:11 +0200
Subject: [PATCH 1531/2322] pythonPackages.jenkins-job-builder: init at 1.2.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bd5cc9ed316..044b3d3c77d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16059,5 +16059,40 @@ let
     };
   };
 
+  jenkins-job-builder = buildPythonPackage rec {
+    name = "jenkins-job-builder-1.2.0";
+    disabled = ! (isPy26 || isPy27);
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/j/jenkins-job-builder/${name}.tar.gz";
+      md5 = "79e44ef0d3fffc19f415d8c0caac6b7b";
+    };
+
+    # pbr required for jenkins-job-builder is <1.0.0 while many of the test
+    # dependencies require pbr>=1.1
+    doCheck = false;
+
+    buildInputs = with self; [
+      pip
+    ];
+
+    propagatedBuildInputs = with self; [
+      pbr
+      python-jenkins
+      pyyaml
+      six
+    ] ++ optionals isPy26 [
+      argparse
+      ordereddict
+    ];
+
+    meta = {
+      description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git.";
+      homepage = "http://docs.openstack.org/infra/system-config/jjb.html";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ garbas ];
+    };
+  };
+
 
 }; in pythonPackages

From 700e11dfeec9cc29fffec4ecb9919401eaafe3ed Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Wed, 24 Jun 2015 13:05:29 +0200
Subject: [PATCH 1532/2322] Update syncthing to 0.11.10

---
 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 9a91f3090a1..22727dcc07a 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,12 +4,12 @@ with goPackages;
 
 buildGoPackage rec {
   name = "syncthing-${version}";
-  version = "0.11.9";
+  version = "0.11.10";
   goPackagePath = "github.com/syncthing/syncthing";
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "353528e152bbfd5075c4f85a54bce507ab3d8855f702a1399a48196bc19d226b";
+    sha256 = "f8260d17519ff71232ab60551b444c0138d3391426ab2ef7f9f8e4d2fdac7c40";
   };
 
   subPackages = [ "cmd/syncthing" ];

From 9dab1a840cced57bd86c9f006dc44b21699d6660 Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Sat, 20 Jun 2015 20:33:57 +0000
Subject: [PATCH 1533/2322] tvheadend: init at 4.0.4

---
 lib/maintainers.nix                           |  1 +
 .../doc/manual/release-notes/rl-unstable.xml  |  1 +
 nixos/modules/misc/ids.nix                    |  2 +
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/networking/tvheadend.nix | 61 +++++++++++++++++++
 pkgs/servers/tvheadend/default.nix            | 31 ++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 7 files changed, 99 insertions(+)
 create mode 100644 nixos/modules/services/networking/tvheadend.nix
 create mode 100644 pkgs/servers/tvheadend/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9af84929aa0..eb5dcbf4313 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -212,6 +212,7 @@
   shell = "Shell Turner <cam.turn@gmail.com>";
   shlevy = "Shea Levy <shea@shealevy.com>";
   simons = "Peter Simons <simons@cryp.to>";
+  simonvandel = "Simon Vandel Sillesen <simon.vandel@gmail.com>";
   sjagoe = "Simon Jagoe <simon@simonjagoe.com>";
   sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>";
   skeidel = "Sven Keidel <svenkeidel@gmail.com>";
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 063663d9bbc..0af85374566 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -41,6 +41,7 @@
 <itemizedlist>
 <listitem><para><literal>brltty</literal></para></listitem>
 <listitem><para><literal>marathon</literal></para></listitem>
+<listitem><para><literal>Tvheadend</literal></para></listitem>
 </itemizedlist>
 </para>
 
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index ce935915abf..0b0be87347d 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -221,6 +221,7 @@
       skydns = 197;
       ripple-rest = 198;
       nix-serve = 199;
+      tvheadend = 200;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -420,6 +421,7 @@
       #skydns = 197; #unused
       #ripple-rest = 198; #unused
       #nix-serve = 199; #unused
+      #tvheadend = 200; #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/module-list.nix b/nixos/modules/module-list.nix
index d33d3ca91d4..12a6a9374ff 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -333,6 +333,7 @@
   ./services/networking/tftpd.nix
   ./services/networking/tlsdated.nix
   ./services/networking/tox-bootstrapd.nix
+  ./services/networking/tvheadend.nix
   ./services/networking/unbound.nix
   ./services/networking/unifi.nix
   ./services/networking/vsftpd.nix
diff --git a/nixos/modules/services/networking/tvheadend.nix b/nixos/modules/services/networking/tvheadend.nix
new file mode 100644
index 00000000000..cdd8747ba89
--- /dev/null
+++ b/nixos/modules/services/networking/tvheadend.nix
@@ -0,0 +1,61 @@
+{ config, coreutils, lib, pkgs, ... }:
+
+with lib;
+
+let cfg     = config.services.tvheadend;
+    pidFile = "${config.users.extraUsers.tvheadend.home}/tvheadend.pid";
+in
+
+{
+  options = {
+    services.tvheadend = {
+      enable = mkEnableOption "Tvheadend";
+      httpPort = mkOption {
+        type        = types.int;
+        default     = 9981;
+        description = "Port to bind HTTP to.";
+      };
+
+      htspPort = mkOption {
+        type        = types.int;
+        default     = 9982;
+        description = "Port to bind HTSP to.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users.extraUsers.tvheadend = {
+      description = "Tvheadend Service user";
+      home        = "/var/lib/tvheadend";
+      createHome  = true;
+      uid         = config.ids.uids.tvheadend;
+    };
+
+    systemd.services.tvheadend = {
+      description = "Tvheadend TV streaming server";
+      wantedBy    = [ "multi-user.target" ];
+      after       = [ "network.target" ];
+
+      serviceConfig = {
+        Type         = "forking";
+        PIDFile      = pidFile;
+        Restart      = "always";
+        RestartSec   = 5;
+        User         = "tvheadend";
+        Group        = "video";
+        ExecStart    = ''
+                       ${pkgs.tvheadend}/bin/tvheadend \
+                       --http_port ${toString cfg.httpPort} \
+                       --htsp_port ${toString cfg.htspPort} \
+                       -f \
+                       -C \
+                       -p ${pidFile} \
+                       -u tvheadend \
+                       -g video
+                       '';
+        ExecStop     = "${pkgs.coreutils}/bin/rm ${pidFile}";
+      };
+    };
+  };
+}
diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix
new file mode 100644
index 00000000000..7eb2c527406
--- /dev/null
+++ b/pkgs/servers/tvheadend/default.nix
@@ -0,0 +1,31 @@
+{avahi, dbus, fetchurl, git, gzip, libav, libiconv, openssl, pkgconfig, python, stdenv, which, zlib}:
+
+let version = "4.0.4";
+    pkgName = "tvheadend"; in
+
+stdenv.mkDerivation rec {
+  name = "${pkgName}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/tvheadend/tvheadend/archive/v${version}.tar.gz";
+    sha256 = "acc5c852bccb32d6a281f523e78a1cceb4d41987fe015aba3f66e1898b02c168";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ avahi dbus git gzip libav libiconv openssl pkgconfig python which zlib];
+
+  preConfigure = "patchShebangs ./configure";
+
+  meta = {
+    description = "TV steaming 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.
+	Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.'';
+    homepage = "https://tvheadend.org";
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simonvandel ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09769abd259..54e9f416b64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14775,6 +14775,8 @@ let
 
   tup = callPackage ../development/tools/build-managers/tup { };
 
+  tvheadend = callPackage ../servers/tvheadend { };
+
   utf8proc = callPackage ../development/libraries/utf8proc { };
 
   vbam = callPackage ../misc/emulators/vbam {

From dbdc9eee05d516cbd49ea6c395b0ea61282be6aa Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 15 Jun 2015 13:16:27 +0200
Subject: [PATCH 1534/2322] cygwin: apr-util now also building on cygwin

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

diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index bceb10e3355..c35520f22fd 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -9,9 +9,7 @@ assert sslSupport -> openssl != null;
 assert bdbSupport -> db != null;
 assert ldapSupport -> openldap != null;
 
-let
-  optional = stdenv.lib.optional;
-in
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "apr-util-1.5.4";
@@ -23,10 +21,11 @@ stdenv.mkDerivation rec {
 
   configureFlags = ''
     --with-apr=${apr} --with-expat=${expat}
-    ${if !stdenv.isCygwin then "--with-crypto" else "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"}
+    ${optionalString (!stdenv.isCygwin) "--with-crypto"}
     ${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"}
     ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"}
-    ${stdenv.lib.optionalString ldapSupport "--with-ldap"}
+    ${stdenv.lib.optionalString ldapSupport "--with-ldap"}${
+      optionalString stdenv.isCygwin "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"}
   '';
 
   propagatedBuildInputs = [ makeWrapper apr expat libiconv ]

From 30bd03a3e26b24184c7518515161178aafa2bc72 Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Wed, 24 Jun 2015 12:56:24 +0100
Subject: [PATCH 1535/2322] dotnet: package coreclr (from git)

---
 .../development/compilers/coreclr/default.nix | 67 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 69 insertions(+)
 create mode 100644 pkgs/development/compilers/coreclr/default.nix

diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix
new file mode 100644
index 00000000000..094df5b5b63
--- /dev/null
+++ b/pkgs/development/compilers/coreclr/default.nix
@@ -0,0 +1,67 @@
+{ stdenv
+, fetchFromGitHub
+, which
+, cmake
+, clang_35
+, llvmPackages_36
+, libunwind
+, gettext
+, openssl
+}:
+
+stdenv.mkDerivation rec {
+  name = "coreclr-${version}";
+  version = "git-" + (builtins.substring 0 10 rev);
+  rev = "8c70800b5e8dc5535c379dec4a6fb32f7ab5e878";
+
+  src = fetchFromGitHub {
+    owner = "dotnet";
+    repo = "coreclr";
+    inherit rev;
+    sha256 = "1galskbnr9kdjjxpx5qywh49400swchhq5f54i16kxyr9k4mvq1f";
+  };
+
+  buildInputs = [
+    which
+    cmake
+    clang_35
+    llvmPackages_36.llvm
+    llvmPackages_36.lldb
+    libunwind
+    gettext
+    openssl
+  ];
+
+  configurePhase = ''
+    # Prevent clang-3.5 (rather than just clang) from being selected as the compiler as that's
+    # not wrapped
+    substituteInPlace src/pal/tools/gen-buildsys-clang.sh --replace "which \"clang-" "which \"clang-DoNotFindThisOne"
+
+    # Prevent the -nostdinc++ flag to be passed to clang, which causes a compilation error
+    substituteInPlace src/CMakeLists.txt --replace "if(NOT CLR_CMAKE_PLATFORM_DARWIN)" "if(FALSE)"
+
+    patchShebangs build.sh
+    patchShebangs src/pal/tools/gen-buildsys-clang.sh
+  '';
+
+  buildPhase = "./build.sh";
+
+  installPhase = ''
+    pushd bin/Product/Linux.x64.Debug/
+    mkdir -v -p $out/bin
+    cp -v coreconsole corerun crossgen $out/bin
+    cp -rv lib $out
+    cp -v *.so $out/lib
+    cp -rv inc $out/include
+    cp -rv gcinfo $out/include
+    popd
+  '';
+
+  meta = {
+    homepage = http://dotnet.github.io/core/;
+    description = ".NET is a general purpose development platform.";
+    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [ obadz ];
+    license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cf9fed11ae..1cbb13e72aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10169,6 +10169,8 @@ let
 
   comic-relief = callPackage ../data/fonts/comic-relief {};
 
+  coreclr = callPackage ../development/compilers/coreclr { };
+
   corefonts = callPackage ../data/fonts/corefonts { };
 
   wrapFonts = paths : ((import ../data/fonts/fontWrap) {

From ba7e7e1c9a8ce358371f7137c94e856af571f309 Mon Sep 17 00:00:00 2001
From: Alexander Foremny <aforemny@posteo.de>
Date: Wed, 24 Jun 2015 16:06:09 +0200
Subject: [PATCH 1536/2322] Update flashplayer-11

---
 .../mozilla-plugins/flashplayer-11/default.nix       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index e736c90d6bb..cff6f33a49d 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -36,7 +36,7 @@
 
 let
   # -> http://get.adobe.com/flashplayer/
-  version = "11.2.202.466";
+  version = "11.2.202.468";
 
   src =
     if stdenv.system == "x86_64-linux" then
@@ -46,21 +46,21 @@ let
         throw "no x86_64 debugging version available"
       else rec {
         inherit version;
-        url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "1clwfhq57gck638sj7i19gxar1z5ks2zfdw1p9iln515a57ik158";
+        url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
+        sha256 = "1vybrw5cwhl4zz9z4fy1lnvs60zz382blas7kann7wj8r4pvx0zl";
       }
     else if stdenv.system == "i686-linux" then
       if debug then
         throw "flash debugging version is outdated and probably broken" /* {
         # The debug version also contains a player
         version = "11.1";
-        url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
+        url = http://fpdownload.adobe.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
         sha256 = "0jn7klq2cyqasj6nxfka2l8nsf7sn7hi6443nv6dd2sb3g7m6x92";
       }*/
       else rec {
         inherit version;
-        url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "1vzxai3b6d7xs34h7qj1nal9i7vvnv6k7rb37rqxaiv2yf58nw9h";
+        url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
+        sha256 = "1bczdgda040nnfmr9sq4q1a0dy9zbnq76g4dsjw3md4glxkmqv8l";
       }
     else throw "Flash Player is not supported on this platform";
 

From 97ae36691ef34f01e5f3fb2b7370be186af17b3f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 24 Jun 2015 16:41:02 +0200
Subject: [PATCH 1537/2322] radeontop 2015-05-28 -> 2015-06-24

New features:
- Make coloured output toggleable

Fixes:
- Release libpciaccess resources
- Make the check for quit case-insensitive
---
 pkgs/os-specific/linux/radeontop/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix
index 05442abc5e8..205171ec928 100644
--- a/pkgs/os-specific/linux/radeontop/default.nix
+++ b/pkgs/os-specific/linux/radeontop/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, pkgconfig, gettext, ncurses, libdrm, libpciaccess }:
 
-let version = "2015-05-28"; in
+let version = "2015-06-24"; in
 stdenv.mkDerivation {
   name = "radeontop-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0s281fblqbvl7vgaqiwh3s16y0bah3z0i1ssf4mbwl2iayj1cliq";
-    rev = "b9428f18ea4631fdd5f9ccee81570aa7ac472c07";
+    sha256 = "06cn7lixxx94c1fki0plg9f4rdy459mgi9yl80m0k1a20jqykz2a";
+    rev = "976cae0be0ffb9142d5e63e435960c6b2bb0eb34";
     repo = "radeontop";
     owner = "clbr";
   };
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   patchPhase = ''
-    substituteInPlace getver.sh --replace ver=unknown ver=${version}-git
+    substituteInPlace getver.sh --replace ver=unknown ver=${version}
   '';
 
   makeFlags = "PREFIX=$(out)";

From 46f06ccde7deb76bc1b8a04671ecdf486480c74e Mon Sep 17 00:00:00 2001
From: Russell O'Connor <oconnorr@google.com>
Date: Wed, 24 Jun 2015 14:42:43 +0000
Subject: [PATCH 1538/2322] uwsgi-service: Add user/group for uwsgi service.
 Also add a uwsgi directory under /run (defaulting to /run/uwsgi) where the
 uwsgi user can place sockets.

---
 nixos/modules/misc/ids.nix                   |  2 +
 nixos/modules/services/web-servers/uwsgi.nix | 42 ++++++++++++++++----
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 0b0be87347d..e6357d138ca 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -222,6 +222,7 @@
       ripple-rest = 198;
       nix-serve = 199;
       tvheadend = 200;
+      uwsgi = 201;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -422,6 +423,7 @@
       #ripple-rest = 198; #unused
       #nix-serve = 199; #unused
       #tvheadend = 200; #unused
+      uwsgi = 201;
 
       # 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/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix
index 6e454a2dacd..3e18a6f0e98 100644
--- a/nixos/modules/services/web-servers/uwsgi.nix
+++ b/nixos/modules/services/web-servers/uwsgi.nix
@@ -47,13 +47,19 @@ in {
 
   options = {
     services.uwsgi = {
-      
+
       enable = mkOption {
         type = types.bool;
         default = false;
         description = "Enable uWSGI";
       };
 
+      runDir = mkOption {
+        type = types.string;
+        default = "/run/uwsgi";
+        description = "Where uWSGI communication sockets can live";
+      };
+
       instance = mkOption {
         type = types.attrs;
         default = {
@@ -66,7 +72,7 @@ in {
               moin = {
                 type = "normal";
                 python2Packages = self: with self; [ moinmoin ];
-                socket = "/run/uwsgi.sock";
+                socket = "${config.services.uwsgi.runDir}/uwsgi.sock";
               };
             };
           }
@@ -89,24 +95,46 @@ in {
         description = "Plugins used with uWSGI";
       };
 
-    };
+      user = mkOption {
+        type = types.str;
+        default = "uwsgi";
+        description = "User account under which uwsgi runs.";
+      };
 
+      group = mkOption {
+        type = types.str;
+        default = "uwsgi";
+        description = "Group account under which uwsgi runs.";
+      };
+    };
   };
 
   config = mkIf cfg.enable {
-
     systemd.services.uwsgi = {
       wantedBy = [ "multi-user.target" ];
-      
+      preStart = ''
+        mkdir -p ${cfg.runDir}
+        chown ${cfg.user}:${cfg.group} ${cfg.runDir}
+      '';
       serviceConfig = {
         Type = "notify";
-        ExecStart = "${uwsgi}/bin/uwsgi --json ${pkgs.writeText "uwsgi.json" (buildCfg cfg.instance)}";
+        ExecStart = "${uwsgi}/bin/uwsgi --uid ${cfg.user} --gid ${cfg.group} --json ${pkgs.writeText "uwsgi.json" (buildCfg cfg.instance)}";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
         NotifyAccess = "main";
         KillSignal = "SIGQUIT";
       };
-
     };
+
+    users.extraUsers = optionalAttrs (cfg.user == "uwsgi") (singleton
+      { name = "uwsgi";
+        group = cfg.group;
+        uid = config.ids.uids.uwsgi;
+      });
+
+    users.extraGroups = optionalAttrs (cfg.group == "uwsgi") (singleton
+      { name = "uwsgi";
+        gid = config.ids.gids.uwsgi;
+      });
   };
 }

From e14c8fd368b369f97b86b535f4c724d6895635d9 Mon Sep 17 00:00:00 2001
From: "tv@shackspace.de" <tv@shackspace.de>
Date: Thu, 18 Jun 2015 16:07:55 +0200
Subject: [PATCH 1539/2322] highlight: fixes an issue locating the default
 conf_dir, closes #8385

---
 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 585f501e1fc..debf862672c 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ getopt lua boost pkgconfig ];
 
-  preConfigure = ''makeFlags="PREFIX=$out conf_dir=$out/etc/highlight"'';
+  preConfigure = ''makeFlags="PREFIX=$out conf_dir=$out/etc/highlight/"'';
 
   meta = {
     description = "Source code highlighting tool";

From df92d1c711434ab864115597edd00bd4fa0d805c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Wed, 24 Jun 2015 17:23:23 +0200
Subject: [PATCH 1540/2322] xf86_input_wacom: update from 0.29.0 to 0.30.0

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

diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index a3d5aeeb40f..9e475f7aed9 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -3,11 +3,11 @@
 , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
 
 stdenv.mkDerivation rec {
-  name = "xf86-input-wacom-0.29.0";
+  name = "xf86-input-wacom-0.30.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
-    sha256 = "15lbzjkaf690i69qy0n0ibwczbclqq1nx0418c6a567by5v7wl48";
+    sha256 = "1xa1i2ks00fa20c5dlpqzlapzj638a7qm5c0wqc3qvgwliwy9m4a";
   };
 
   buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender

From 2d7da5a62e0159eee6cb6e32f19629432be5b27b Mon Sep 17 00:00:00 2001
From: "Tommy M. McGuire" <mcguire@crsr.net>
Date: Wed, 24 Jun 2015 11:36:02 -0500
Subject: [PATCH 1541/2322] es: bugfix for man page install

See Issue #8487.
---
 pkgs/shells/es/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix
index 236c5d1f00f..3a4574fb8e1 100644
--- a/pkgs/shells/es/default.nix
+++ b/pkgs/shells/es/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation {
   configureFlags="--with-readline --prefix=$(out) --bindir=$(out)/bin --mandir=$(out)/man";
 
   preInstall = ''
-    mkdir -p $out/{bin,man}
+    mkdir -p $out/bin
+    mkdir -p $out/man/man1
   '';
 
   meta = with stdenv.lib; {

From 0cf1a5c5e1ffa4ca95f417c2741df98702533add Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 24 Jun 2015 19:14:41 +0200
Subject: [PATCH 1542/2322] netsniff-ng -> 0.5.9-18-g9977ec6

New features:
- netsniff-ng: use Linux "cooked" header for Netlink interface
  automatically or as replacement of L2 header if "--cooked"
  option is specified.
- nlmsg: print rtnl neigh info
---
 pkgs/tools/networking/netsniff-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index a9591a3ecde..cc9b3554515 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -2,7 +2,7 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-let version = "0.5.9-10-gb7ece46"; in
+let version = "0.5.9-18-g9977ec6"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "b7ece46f62b1fbece160cc7bd2905a6d0d3970a9";
-    sha256 = "1m44ssvkzp4xrkwc61gsmn2vkbmf9r5mp1zjz8cj8w120703cljj";
+    rev = "9977ec6012452bfc5053dbc90aed53f55064c86b";
+    sha256 = "1ww0pm3v9wphjzfanswx2przps33v26q38alxljigj5cigh8ffms";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

From cb757098d5ddbb5b0d2e2061f167722f08e7d963 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 24 Jun 2015 19:19:40 +0200
Subject: [PATCH 1543/2322] cv: update from 0.6 to 0.7.1

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

diff --git a/pkgs/tools/misc/cv/default.nix b/pkgs/tools/misc/cv/default.nix
index b953ffc1897..5b54ed1d4cf 100644
--- a/pkgs/tools/misc/cv/default.nix
+++ b/pkgs/tools/misc/cv/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cv-${version}";
-  version = "0.6";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "Xfennec";
     repo = "cv";
     rev = "v${version}";
-    sha256 = "0nhhgkaghfp8rw23013j17yn9bqcwcrz0fylwkvx1krp5r8dalis";
+    sha256 = "1dcq45mz443mzzf344ap5dgsazhcrn3aislxs57jqbg4p5bbmh1b";
   };
 
   buildInputs = [ ncurses ];

From 96749220c7f32dce14d1560932d16e4e5d267f24 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 24 Jun 2015 13:24:41 -0400
Subject: [PATCH 1544/2322] haskellPackages.ip-quoter: bump

---
 .../development/haskell-modules/hackage-packages.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ba22bdaee6c..a9f389805fe 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -76097,17 +76097,15 @@ self: {
      }) {};
 
   "ip-quoter" = callPackage
-    ({ mkDerivation, base, network, split, tasty, tasty-hunit
+    ({ mkDerivation, base, network, cpu, tasty, tasty-hunit
      , template-haskell
      }:
      mkDerivation {
        pname = "ip-quoter";
-       version = "1.0.0.0";
-       revision = "1";
-       sha256 = "1idi03f6l9nwnsfp2mvkxz4sgwqlpa8ag3h5drb3i4hwgx0mkhfg";
-       editedCabalFile = "5cd6b449c4acd24b27d27a839acdab85f65b5556dd7bc8be115b7e2f6dc5df11";
-       buildDepends = [ base network split template-haskell ];
-       testDepends = [ base network tasty tasty-hunit ];
+       version = "1.0.1.1";
+       sha256 = "1819742yjdl96k2z8s55a5x9xw9mg4lps1dq1f55zvc31afkdi4l";
+       buildDepends = [ base network cpu template-haskell ];
+       testDepends = [ base network tasty tasty-hunit cpu ];
        homepage = "https://github.com/shlevy/ip-quoter";
        description = "Quasiquoter for IP addresses";
        license = stdenv.lib.licenses.mit;

From 5c4a6b59c319048b1b3aadf6875a518ecfc77101 Mon Sep 17 00:00:00 2001
From: Tomasz Kontusz <tomasz.kontusz@gmail.com>
Date: Wed, 24 Jun 2015 20:57:03 +0200
Subject: [PATCH 1545/2322] d-feet: 0.3.9 -> 0.3.10

Also added license. This is based on COPYING inside the archive.
---
 pkgs/development/tools/misc/d-feet/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix
index e13145ee71a..b75ff5e6a4d 100644
--- a/pkgs/development/tools/misc/d-feet/default.nix
+++ b/pkgs/development/tools/misc/d-feet/default.nix
@@ -3,7 +3,7 @@
 , pygobject3, gobjectIntrospection, libwnck3 }:
 
 let
-  version = "${major}.9";
+  version = "${major}.10";
   major = "0.3";
 in
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz";
-    sha256 = "0lvrrbxkvw495jn4vj64r8vd3hng5v0lvagfzcbk5x1f3ky1gybd";
+    sha256 = "88f0df5fcb862387ff3d1793873c5eb368c3e4db0bbd82ea65f748cbf70a6359";
   };
 
   buildInputs = [
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
 
     homepage = https://wiki.gnome.org/action/show/Apps/DFeet;
     platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ ktosiek ];
   };
 }

From bc4b46c14232a93783c09f71d676a5bd7bf4b87b Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Wed, 24 Jun 2015 21:45:31 +0200
Subject: [PATCH 1546/2322] rtv: Replace fetchurl with fetchFromGitHub

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

diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index a94308a65ad..d190ed706c4 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, pkgs, python, pythonPackages }:
+{ stdenv, fetchFromGitHub, pkgs, python, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
   version = "1.4";
   name = "rtv-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/michael-lazar/rtv/archive/v${version}.tar.gz";
-    sha256 = "0qi45was70p3z15pnh25hkbliya440jldlzmpasqvbdy9zdgpv0w";
+  src = fetchFromGitHub {
+    owner = "michael-lazar";
+    repo = "rtv";
+    rev = "v${version}";
+    sha256 = "071p7idprknpra6mrdjjka8lrr80ykag62rhbsaf6zcz1d9p55cp";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 42bd1dc12f9ff42cf5de54fa28e079069a941a0d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 24 Jun 2015 17:49:48 -0700
Subject: [PATCH 1547/2322] accelio: 1.3 -> 1.4

---
 .../libraries/accelio/cflags.patch            | 21 -------------------
 .../development/libraries/accelio/default.nix | 10 +++++----
 2 files changed, 6 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/development/libraries/accelio/cflags.patch

diff --git a/pkgs/development/libraries/accelio/cflags.patch b/pkgs/development/libraries/accelio/cflags.patch
deleted file mode 100644
index a0904519122..00000000000
--- a/pkgs/development/libraries/accelio/cflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 6ce6b6b..72d2e65 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -110,14 +110,10 @@ AC_MSG_RESULT([$enable_debug])
- 
- if test "$enable_debug" = "yes"; then
- 	AC_DEFINE([DEBUG],[],[Debug Mode])
--	AM_CFLAGS="$AM_CFLAGS -g -ggdb -Wall -Werror -Wdeclaration-after-statement \
--		  -Wsign-compare -Wc++-compat \
--		   -fno-omit-frame-pointer -O0 -D_REENTRANT -D_GNU_SOURCE"
-+	AM_CFLAGS="$AM_CFLAGS -g -ggdb -fno-omit-frame-pointer -O0 -D_REENTRANT -D_GNU_SOURCE"
- else
- 	AC_DEFINE([NDEBUG],[],[No-debug Mode])
--	AM_CFLAGS="$AM_CFLAGS -g -ggdb -Wall -Werror -Wpadded -Wdeclaration-after-statement \
--		  -Wsign-compare -Wc++-compat \
--		  -O3 -D_REENTRANT -D_GNU_SOURCE"
-+	AM_CFLAGS="$AM_CFLAGS -O3 -D_REENTRANT -D_GNU_SOURCE"
- fi
- 
- AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix
index b56f2d81389..7a96e5923b6 100644
--- a/pkgs/development/libraries/accelio/default.nix
+++ b/pkgs/development/libraries/accelio/default.nix
@@ -6,23 +6,25 @@
 
 stdenv.mkDerivation rec {
   name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}";
-  version = "1.3";
+  version = "1.4";
 
   src = fetchFromGitHub {
     owner = "accelio";
     repo = "accelio";
     rev = "v${version}";
-    sha256 = "05yqzjs12nymhs0pq1ypnfszgbmvfprjqd3gr2iz3vqbkpzi9n2c";
+    sha256 = "0cxiwn63481m88zisd0pqs6g0h5k1amz2kidwyxkdbl6xgf70cwd";
   };
 
-  patches = [ ./cflags.patch ];
-
   postPatch = ''
     # Don't build broken examples
     sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\)\/kernel/d' configure.ac
 
     # Allow the installation of xio kernel headers
     sed -i 's,/opt/xio,''${out},g' src/kernel/xio/Makefile.in
+
+    # Don't install ldconfig entries
+    sed -i '\,/etc/ld.so.conf.d/libxio.conf,d' src/usr/Makefile.am
+    sed -i '\,/sbin/ldconfig,d' src/usr/Makefile.am
   '';
 
   nativeBuildInputs = [ autoreconfHook ];

From 9031daf8068c1166d13ef1d52c6b8d7cd5a6edae Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 16 Jun 2015 17:32:15 -0700
Subject: [PATCH 1548/2322] gflags: 2.0 -> 2.1.2

---
 .../libraries/google-gflags/default.nix       | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/google-gflags/default.nix
index 3631d4927a3..1423a5a9efc 100644
--- a/pkgs/development/libraries/google-gflags/default.nix
+++ b/pkgs/development/libraries/google-gflags/default.nix
@@ -1,14 +1,25 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "google-gflags-2.0";
+  name = "google-gflags-${version}";
+  version = "2.1.2";
 
-  src = fetchurl {
-    url = "https://gflags.googlecode.com/files/gflags-2.0.tar.gz";
-    sha256 = "1mypfahsfy0piavhf7il2jfs1gq7jp6yarl9sq5hhypj34s5sjnf";
+  src = fetchFromGitHub {
+    owner = "gflags";
+    repo = "gflags";
+    rev = "v${version}";
+    sha256 = "0qxvr9cyxq3px60jglkm94pq5bil8dkjjdb99l3ypqcds7iypx9w";
   };
 
-  doCheck = true;
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DBUILD_STATIC_LIBS=ON"
+    "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}"
+  ];
+
+  doCheck = false;
 
   meta = {
     description = "A C++ library that implements commandline flags processing";

From 63448b5dacb313289d00429be5c14a887e442a53 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 16 Jun 2015 17:32:34 -0700
Subject: [PATCH 1549/2322] rocksdb: 3.11 -> 3.11.2

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

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 9a720a35ff0..7759aa79981 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 = "3.11";
+  version = "3.11.2";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "rocksdb";
-    rev = "v${version}";
-    sha256 = "06gf0k6hjarc7iw0w0p8814d27f8vrc3s0laarh7qdd4wshw02s8";
+    rev = "rocksdb-${version}";
+    sha256 = "0cjwr7n5l2wdzdv4b0p90k0ijg9ka28akpq2aqa8lknsa1kb1cyv";
   };
 
   buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ];

From 7a0bbce2e6fd99009853d548d97491eb0dd724f5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 16 Jun 2015 17:32:49 -0700
Subject: [PATCH 1550/2322] lz4: Don't test by default as it takes forever

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

diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index fc3eca6ab10..be0053c2165 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = "PREFIX=$(out)";
 
-  doCheck = true;
+  doCheck = false;
   checkTarget = "test";
   checkFlags = "-j1 -C programs"; # -j1 required since version 128, -C should be temporary
 

From 5edbc2846eb83e68bd5a219764b8e9f81a09944e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 23 Jun 2015 11:37:50 -0700
Subject: [PATCH 1551/2322] librdmacm: 1.0.19.1 -> 1.0.21

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

diff --git a/pkgs/development/libraries/librdmacm/default.nix b/pkgs/development/libraries/librdmacm/default.nix
index 498463b2aea..2b8720357a1 100644
--- a/pkgs/development/libraries/librdmacm/default.nix
+++ b/pkgs/development/libraries/librdmacm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libibverbs }:
 
 stdenv.mkDerivation rec {
-  name = "librdmacm-1.0.19.1";
+  name = "librdmacm-1.0.21";
 
   src = fetchurl {
     url = "https://www.openfabrics.org/downloads/rdmacm/${name}.tar.gz";
-    sha256 = "0aq9x2aq62j9qn5yqifp4f2y7w2l35571ns260bwd2c60jf5fjlm";
+    sha256 = "0yx2wr5dvmf5apvc4f4r2f2mlvn05piwvxsqfb60p3rk4jfx56dx";
   };
 
   buildInputs = [ libibverbs ];

From 24f47ac4bed171fa9d1725c29c0a90482db32e85 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 24 Jun 2015 18:09:07 -0700
Subject: [PATCH 1552/2322] libevdev: 1.4.1 - 1.4.3

---
 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 9a003de80f1..0083ec42ee4 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.1";
+  name = "libevdev-1.4.3";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz";
-    sha256 = "11dfiz7pkb2jbavr1ba8phn86qavvgf1xwlxmfs69mqxlz4x6yai";
+    sha256 = "16wn4zb0wrqvzmgcgiafndvwh4akzdvjzgkj128fkc3qzlk8nh8w";
   };
 
   buildInputs = [ python ];

From 16e0a984830b5ce216c5bbba43683dedb52bcb33 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 24 Jun 2015 18:09:40 -0700
Subject: [PATCH 1553/2322] kernel: 3.10.80 -> 3.10.81

---
 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 6365e133c10..01e5e941118 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, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.80";
+  version = "3.10.81";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "09x4931p2s0m7cngw4wcpiij2392js60ivki476pdyndxi0wh2nm";
+    sha256 = "0hza9wsy9x2113crlwygl06lspwlahq09nifnmdacfkqcxp4r3ng";
   };
 
   features.iwlwifi = true;

From 2f255eafd9bd02c68379613ccb8f1d875ea7d598 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 24 Jun 2015 18:09:55 -0700
Subject: [PATCH 1554/2322] kernel: 4.0.5 -> 4.0.6

---
 pkgs/os-specific/linux/kernel/linux-4.0.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-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix
index b919fc7d901..89cd34182cf 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.0.5";
+  version = "4.0.6";
   # Remember to update grsecurity!
   extraMeta.branch = "4.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1l9kxicadn980wrypi2qm3nx12g513acvryq58m7a0xjdf6ksjz2";
+    sha256 = "0n0w2k52m3cn286f413jmzwffyk3g28y4n7d41wc93zvgm720lr9";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 4815cae259b..b309113bc57 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -72,10 +72,10 @@ rec {
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "4.0.5";
-      revision  = "201506082251";
+    { kversion  = "4.0.6";
+      revision  = "201506232104";
       branch    = "test";
-      sha256    = "03im0gq8b2n6fdxvrdd5iyi1viwl83zfjwqbamqyvkhmi2vbvhwk";
+      sha256    = "0him41fm0hw857ibvfmvpsrk2a8x492d4cy4hlbqyfk35rcmpfdf";
     };
 
   grsec_fix_path =

From b08d384da831ab361e023f7c04dec8efb6538524 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 24 Jun 2015 18:09:47 -0700
Subject: [PATCH 1555/2322] kernel: 3.14.44 -> 3.14.45

---
 pkgs/os-specific/linux/kernel/linux-3.14.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-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 66f6d8293ee..e6e7f4130a7 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.44";
+  version = "3.14.45";
   # Remember to update grsecurity!
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1kgzvdrxslrmb10cwx64qvzijq41kgiz8qy5xpa858mkynq8ydg8";
+    sha256 = "0jfbwl0daba41cwkn67rk7an9g6cbljxq8wlwnr321mfnd3mnx4c";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index b309113bc57..af63b0a5f55 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -65,10 +65,10 @@ rec {
   };
 
   grsecurity_stable = grsecPatch
-    { kversion  = "3.14.44";
-      revision  = "201506082249";
+    { kversion  = "3.14.45";
+      revision  = "201506232103";
       branch    = "stable";
-      sha256    = "11lclmiyg37bq3sgf6d6lky5yngr15hgmgkilrhy3081ifnsf7ax";
+      sha256    = "1f4fm7r6pbspdw9l1d1mrjj1jpyh0l2vlq1lnqs54v3xzwr933py";
     };
 
   grsecurity_unstable = grsecPatch

From f80dc98ca90e16efc6cd2406d9f0867816db2dc7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 24 Jun 2015 18:14:17 -0700
Subject: [PATCH 1556/2322] nss: 3.19.1 -> 3.19.2

---
 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 f8822c9d0a4..b9c737e231b 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.19.1";
+  version = "3.19.2";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_1_RTM/src/${name}.tar.gz";
-    sha256 = "b7be709551ec13206d8e3e8c065b894fa981c11573115e9478fa051029c52fff";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_2_RTM/src/${name}.tar.gz";
+    sha256 = "1306663e8f61d8449ad8cbcffab743a604dcd9f6f34232c210847c51dce2c9ae";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];

From 6b0f0c6f41d69c02cfb26f50195deea3ea3f2321 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 24 Jun 2015 18:25:53 -0700
Subject: [PATCH 1557/2322] ceph: Changes rollup from triton

---
 pkgs/tools/filesystems/ceph/0.94.nix    |   4 +-
 pkgs/tools/filesystems/ceph/dev.nix     |  12 +-
 pkgs/tools/filesystems/ceph/generic.nix | 169 +++++++++++++++---------
 pkgs/tools/filesystems/ceph/git.nix     |   6 +-
 4 files changed, 123 insertions(+), 68 deletions(-)
 mode change 120000 => 100644 pkgs/tools/filesystems/ceph/dev.nix

diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix
index 90c23665508..9b9455b9061 100644
--- a/pkgs/tools/filesystems/ceph/0.94.nix
+++ b/pkgs/tools/filesystems/ceph/0.94.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "0.94.1.2";
+  version = "0.94.2";
 
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "0ks5djgfhjpydjdlw7s940m3mlzrvz0xhhk75nqx7sbvymgcc73q";
+    sha256 = "1nhqzmxv7bz93b8rbd88wgmw9icm2lhmc94dfscgh23kfpipyd6l";
   };
 
   patches = [ ./fix-pgrefdebugging.patch ];
diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
deleted file mode 120000
index 31d5e95359c..00000000000
--- a/pkgs/tools/filesystems/ceph/dev.nix
+++ /dev/null
@@ -1 +0,0 @@
-0.94.nix
\ No newline at end of file
diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
new file mode 100644
index 00000000000..3a9aacbcd30
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/dev.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchgit, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "9.0.1";
+
+  src = fetchgit {
+    url = "https://github.com/ceph/ceph.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "1sq6gim7dik04lih5krwm4qpnf2blby3xj2vz9n4cknjnj0dbg7x";
+  };
+})
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 33d9b3dc64f..4d358d6a9c5 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -26,43 +26,79 @@
 # We must have one crypto library
 assert cryptopp != null || (nss != null && nspr != null);
 
+with stdenv;
 with stdenv.lib;
 let
   mkFlag = trueStr: falseStr: cond: name: val:
     if cond == null then null else
-      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+      "--${if cond != false then trueStr else falseStr}${name}"
+      + "${if val != null && cond != false then "=${val}" else ""}";
+
   mkEnable = mkFlag "enable-" "disable-";
   mkWith = mkFlag "with-" "without-";
   mkOther = mkFlag "" "" true;
 
-  hasServer = snappy != null && leveldb != null;
+  shouldUsePkg = pkg_: let pkg = (builtins.tryEval pkg_).value;
+    in if lib.any (x: x == system) (pkg.meta.platforms or [])
+      then pkg else null;
+
+  optSnappy = shouldUsePkg snappy;
+  optLeveldb = shouldUsePkg leveldb;
+  optYasm = shouldUsePkg yasm;
+  optFcgi = shouldUsePkg fcgi;
+  optExpat = shouldUsePkg expat;
+  optCurl = shouldUsePkg curl;
+  optFuse = shouldUsePkg fuse;
+  optAccelio = shouldUsePkg accelio;
+  optLibibverbs = shouldUsePkg libibverbs;
+  optLibrdmacm = shouldUsePkg librdmacm;
+  optLibedit = shouldUsePkg libedit;
+  optLibatomic_ops = shouldUsePkg libatomic_ops;
+  optKinetic-cpp-client = shouldUsePkg kinetic-cpp-client;
+  optRocksdb = shouldUsePkg rocksdb;
+  optLibs3 = shouldUsePkg libs3;
+
+  optJemalloc = shouldUsePkg jemalloc;
+  optGperftools = shouldUsePkg gperftools;
+
+  optCryptopp = shouldUsePkg cryptopp;
+  optNss = shouldUsePkg nss;
+  optNspr = shouldUsePkg nspr;
+
+  optLibaio = shouldUsePkg libaio;
+  optLibxfs = shouldUsePkg libxfs;
+  optZfs = shouldUsePkg zfs;
+
+  hasServer = optSnappy != null && optLeveldb != null;
   hasMon = hasServer;
   hasMds = hasServer;
   hasOsd = hasServer;
-  hasRadosgw = fcgi != null && expat != null && curl != null && libedit != null;
+  hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null;
 
-  hasXio = (stdenv.isLinux || stdenv.isFreeBSD) &&
-    versionAtLeast version "0.95" &&
-    accelio != null && libibverbs != null && librdmacm != null;
+  /*hasXio = (stdenv.isLinux || stdenv.isFreeBSD) &&
+    versionAtLeast version "9.0.0" &&
+    optAccelio != null && optLibibverbs != null && optLibrdmacm != null;*/
+  hasXio = false;  # Broken with xio 1.4
 
-  hasRocksdb = versionAtLeast version "0.95" && rocksdb != null;
+  hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null;
 
   # TODO: Reenable when kinetic support is fixed
-  hasKinetic = versionAtLeast version "0.95" && kinetic-cpp-client != null && false;
+  #hasKinetic = versionAtLeast version "9.0.0" && optKinetic-cpp-client != null;
+  hasKinetic = false;
 
   # Malloc implementation (can be jemalloc, tcmalloc or null)
-  malloc = if jemalloc != null then jemalloc else gperftools;
+  malloc = if optJemalloc != null then optJemalloc else optGperftools;
 
   # We prefer nss over cryptopp
-  cryptoStr = if nss != null && nspr != null then "nss" else
-    if cryptopp != null then "cryptopp" else "none";
+  cryptoStr = if optNss != null && optNspr != null then "nss" else
+    if optCryptopp != null then "cryptopp" else "none";
   cryptoLibsMap = {
-    nss = [ nss nspr ];
-    cryptopp = [ cryptopp ];
+    nss = [ optNss optNspr ];
+    cryptopp = [ optCryptopp ];
     none = [ ];
   };
 
-  wrapArgs = "--set PYTHONPATH : \"$(toPythonPath $lib)\""
+  wrapArgs = "--set PYTHONPATH \"$(toPythonPath $lib)\""
     + " --prefix PYTHONPATH : \"$(toPythonPath ${python.modules.readline})\""
     + " --prefix PYTHONPATH : \"$(toPythonPath ${pythonPackages.flask})\""
     + " --set PATH : \"$out/bin\"";
@@ -76,24 +112,25 @@ stdenv.mkDerivation {
     ./0001-Makefile-env-Don-t-force-sbin.patch
   ];
 
-  nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ];
+  nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]
+    ++ optionals (versionAtLeast version "10.0.0") [ pythonPackages.setuptools ];
   buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
-    boost python libxml2 yasm libatomic_ops libs3 malloc pythonPackages.flask zlib
+    boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib
   ] ++ optional (versionAtLeast version "9.0.0") [
     git                   # Used for the gitversion string
     pythonPackages.sphinx # Used for docs
   ] ++ optional stdenv.isLinux [
-    linuxHeaders libuuid udev keyutils libaio libxfs zfs
+    linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs
   ] ++ optional hasServer [
-    snappy leveldb
+    optSnappy optLeveldb
   ] ++ optional hasRadosgw [
-    fcgi expat curl fuse libedit
+    optFcgi optExpat optCurl optFuse optLibedit
   ] ++ optional hasXio [
-    accelio libibverbs librdmacm
+    optAccelio optLibibverbs optLibrdmacm
   ] ++ optional hasRocksdb [
-    rocksdb
+    optRocksdb
   ] ++ optional hasKinetic [
-    kinetic-cpp-client
+    optKinetic-cpp-client
   ];
 
   postPatch = ''
@@ -102,6 +139,9 @@ stdenv.mkDerivation {
 
     # Fix seagate kinetic linking
     sed -i 's,libcrypto.a,-lcrypto,g' src/os/Makefile.am
+  '' + optionalString (versionAtLeast version "9.0.0") ''
+    # Fix gmock
+    patchShebangs src/gmock
   '';
 
   preConfigure = ''
@@ -120,50 +160,55 @@ stdenv.mkDerivation {
   '';
 
   configureFlags = [
-    "--exec_prefix=\${out}"
-    "--sysconfdir=/etc"
-    "--localstatedir=/var"
-    "--libdir=\${lib}/lib"
-    "--includedir=\${lib}/include"
-
-    (mkWith   true                         "rbd"               null)
-    (mkWith   true                         "cephfs"            null)
-    (mkWith   hasRadosgw                   "radosgw"           null)
-    (mkWith   true                         "radosstriper"      null)
-    (mkWith   hasServer                    "mon"               null)
-    (mkWith   hasServer                    "osd"               null)
-    (mkWith   hasServer                    "mds"               null)
-    (mkEnable true                         "client"            null)
-    (mkEnable hasServer                    "server"            null)
-    (mkWith   (cryptoStr == "cryptopp")    "cryptopp"          null)
-    (mkWith   (cryptoStr == "nss")         "nss"               null)
-    (mkEnable false                        "root-make-check"   null)
-    (mkWith   false                        "profiler"          null)
-    (mkWith   false                        "debug"             null)
-    (mkEnable false                        "coverage"          null)
-    (mkWith   (fuse != null)               "fuse"              null)
-    (mkWith   (malloc == jemalloc)         "jemalloc"          null)
-    (mkWith   (malloc == gperftools)       "tcmalloc"          null)
-    (mkEnable false                        "pgrefdebugging"    null)
-    (mkEnable false                        "cephfs-java"       null)
-    (mkEnable hasXio                       "xio"               null)
-    (mkWith   (libatomic_ops != null)      "libatomic-ops"     null)
-    (mkWith   true                         "ocf"               null)
-    (mkWith   hasKinetic                   "kinetic"           null)
-    (mkWith   hasRocksdb                   "librocksdb"        null)
-    (mkWith   false                        "librocksdb-static" null)
-    (mkWith   (libs3 != null)              "system-libs3"      null)
-    (mkWith   true                         "rest-bench"        null)
+    (mkOther                               "exec_prefix"        "\${out}")
+    (mkOther                               "sysconfdir"         "/etc")
+    (mkOther                               "localstatedir"      "/var")
+    (mkOther                               "libdir"             "\${lib}/lib")
+    (mkOther                               "includedir"         "\${lib}/include")
+    (mkWith   true                         "rbd"                 null)
+    (mkWith   true                         "cephfs"              null)
+    (mkWith   hasRadosgw                   "radosgw"             null)
+    (mkWith   true                         "radosstriper"        null)
+    (mkWith   hasServer                    "mon"                 null)
+    (mkWith   hasServer                    "osd"                 null)
+    (mkWith   hasServer                    "mds"                 null)
+    (mkEnable true                         "client"              null)
+    (mkEnable hasServer                    "server"              null)
+    (mkWith   (cryptoStr == "cryptopp")    "cryptopp"            null)
+    (mkWith   (cryptoStr == "nss")         "nss"                 null)
+    (mkEnable false                        "root-make-check"     null)
+    (mkWith   false                        "profiler"            null)
+    (mkWith   false                        "debug"               null)
+    (mkEnable false                        "coverage"            null)
+    (mkWith   (optFuse != null)            "fuse"                null)
+    (mkWith   (malloc == optJemalloc)      "jemalloc"            null)
+    (mkWith   (malloc == optGperftools)    "tcmalloc"            null)
+    (mkEnable false                        "pgrefdebugging"      null)
+    (mkEnable false                        "cephfs-java"         null)
+    (mkEnable hasXio                       "xio"                 null)
+    (mkWith   (optLibatomic_ops != null)   "libatomic-ops"       null)
+    (mkWith   true                         "ocf"                 null)
+    (mkWith   hasKinetic                   "kinetic"             null)
+    (mkWith   hasRocksdb                   "librocksdb"          null)
+    (mkWith   false                        "librocksdb-static"   null)
+    (mkWith   (optLibs3 != null)           "system-libs3"        null)
+    (mkWith   true                         "rest-bench"          null)
   ] ++ optional stdenv.isLinux [
-    (mkWith   (libaio != null)             "libaio"            null)
-    (mkWith   (libxfs != null)             "libxfs"            null)
-    (mkWith   (zfs != null)                "libzfs"            null)
+    (mkWith   (optLibaio != null)          "libaio"              null)
+    (mkWith   (optLibxfs != null)          "libxfs"              null)
+    (mkWith   (optZfs != null)             "libzfs"              null)
+  ] ++ optional (versionAtLeast version "9.0.1") [
+    (mkWith   false                        "tcmalloc-minimal"    null)
+    (mkWith   false                        "valgrind"            null)
   ] ++ optional (versionAtLeast version "10.0.0") [
-    (mkWith   true                         "man-pages"         null)
-    (mkWith   false                        "tcmalloc-minimal"  null)
-    (mkWith   false                        "valgrind"          null)
+    (mkWith   true                         "man-pages"           null)
+    (mkWith   true                         "systemd-libexec-dir" "\${TMPDIR}")
   ];
 
+  preBuild = optionalString (versionAtLeast version "9.0.0") ''
+    (cd src/gmock; make -j $NIX_BUILD_CORES)
+  '';
+
   installFlags = [ "sysconfdir=\${out}/etc" ];
 
   outputs = [ "out" "lib" ];
diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
index 8aa4bbd34bb..df209b080b0 100644
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ b/pkgs/tools/filesystems/ceph/git.nix
@@ -1,11 +1,11 @@
 { callPackage, fetchgit, git, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-04-22";
+  version = "2015-06-06";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
-    rev = "89262abc53e324f3ef4d504473a4f1d6eb337c20";
-    sha256 = "0d6hlk1nwgx9cdhvppggz6sbjc1jl8j26l9739qspw1sviac5lcb";
+    rev = "efededa0107eebd4abc0e08dd34200d6ca175626";
+    sha256 = "18lcn4misyvgjh7r0vkal480x23yr8pcjwzl4k4hbrpqmm97znp9";
   };
 })

From 6bb4c1e89f71f8bcbd8b0bf3338c278c7f4d45fd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 24 Jun 2015 18:34:07 -0700
Subject: [PATCH 1558/2322] ceph: 0.80.9 -> 0.80.10

---
 pkgs/tools/filesystems/ceph/0.80.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/0.80.nix b/pkgs/tools/filesystems/ceph/0.80.nix
index 2faf30f570c..302a65f626b 100644
--- a/pkgs/tools/filesystems/ceph/0.80.nix
+++ b/pkgs/tools/filesystems/ceph/0.80.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "0.80.9";
+  version = "0.80.10";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "0c1hwl2jzghvbrnddwbp748b02jqznvigwriqx447iz2xyrz2w8q";
+    sha256 = "1arajccczjdqp7igs17569xlq5cj4azcm5wwixg6ryypjr2grcbl";
   };
 
   patches = [

From 45a7d4829efdffe7471551f101a281db422f5c45 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 24 Jun 2015 21:57:59 -0700
Subject: [PATCH 1559/2322] phonon: Fix building (on gcc5 maybe)

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

diff --git a/pkgs/development/libraries/phonon/qt5/default.nix b/pkgs/development/libraries/phonon/qt5/default.nix
index 94d3b0fc0de..3dddd60b59f 100644
--- a/pkgs/development/libraries/phonon/qt5/default.nix
+++ b/pkgs/development/libraries/phonon/qt5/default.nix
@@ -18,11 +18,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
+  NIX_CFLAGS_COMPILE = "-fPIC";
+
   cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}"
     "-DPHONON_BUILD_PHONON4QT5=ON"
     "-DCMAKE_INSTALL_LIBDIR=lib"
-  ]
-  ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
+  ];
 
   meta = {
     homepage = http://phonon.kde.org/;

From c5b17670e11283bfee64d123163067d3b29ae47f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 24 Jun 2015 23:04:29 -0700
Subject: [PATCH 1560/2322] firefox: 38.0.5 -> 38.0.6

---
 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 f10df2dc996..942823a4295 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -16,14 +16,14 @@
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = "38.0.5"; in
+let version = "38.0.6"; in
 
 stdenv.mkDerivation rec {
   name = "firefox-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
-    sha1 = "74da3e225d5b542e784549be63475802c45e1b02";
+    sha1 = "d6103cdcc6a6eda029d44104354d3a5cafbf8d45";
   };
 
   buildInputs =

From 4fe22edf142411019a681a29f04bad9c43a0b675 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 24 Jun 2015 23:04:41 -0700
Subject: [PATCH 1561/2322] mongodb: Build on gcc5

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

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 153f2f584d1..81205c92d4c 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -27,6 +27,7 @@ let version = "3.0.4";
       "--wiredtiger=${if stdenv.is64bit then "on" else "off"}"
       "--js-engine=v8-3.25"
       "--use-sasl-client"
+      "--disable-warnings-as-errors"
       "--variant-dir=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld
       "--extrapath=${concatStringsSep "," buildInputs}"
     ] ++ map (lib: "--use-system-${lib}") system-libraries);

From 2a8cf39952860d455133b14b8accfef0e711c9fe Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 24 Jun 2015 23:33:28 -0700
Subject: [PATCH 1562/2322] zfs: Fix kernel 4.1 compat

---
 pkgs/os-specific/linux/zfs/default.nix        |   5 +-
 .../linux/zfs/kernel-4.1-compat.patch         | 149 ++++++++++++++++++
 2 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/zfs/kernel-4.1-compat.patch

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index bd4b0c23c8b..6ed168c70be 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -10,5 +10,8 @@ callPackage ./generic.nix (args // rec {
     sha256 = "15fh1b2rvzvx4j3vgkwrgy2sd553bzwcvk1zai6phjhb6i2rw8v4";
   };
 
-  patches = [ ./nix-build.patch ];
+  patches = [
+    ./nix-build.patch
+    ./kernel-4.1-compat.patch
+  ];
 })
diff --git a/pkgs/os-specific/linux/zfs/kernel-4.1-compat.patch b/pkgs/os-specific/linux/zfs/kernel-4.1-compat.patch
new file mode 100644
index 00000000000..7e75e843af3
--- /dev/null
+++ b/pkgs/os-specific/linux/zfs/kernel-4.1-compat.patch
@@ -0,0 +1,149 @@
+diff --git a/config/kernel-vfs-rw-iterate.m4 b/config/kernel-vfs-rw-iterate.m4
+new file mode 100644
+index 0000000..f8dc422
+--- /dev/null
++++ b/config/kernel-vfs-rw-iterate.m4
+@@ -0,0 +1,27 @@
++dnl #
++dnl # Linux 4.1.x API
++dnl #
++AC_DEFUN([ZFS_AC_KERNEL_VFS_RW_ITERATE],
++	[AC_MSG_CHECKING([whether fops->read/write_iter() are available])
++	ZFS_LINUX_TRY_COMPILE([
++		#include <linux/fs.h>
++
++		ssize_t test_read(struct kiocb *kiocb, struct iov_iter *to)
++		    { return 0; }
++		ssize_t test_write(struct kiocb *kiocb, struct iov_iter *from)
++		    { return 0; }
++
++		static const struct file_operations
++		    fops __attribute__ ((unused)) = {
++		    .read_iter = test_read,
++		    .write_iter = test_write,
++		};
++	],[
++	],[
++		AC_MSG_RESULT(yes)
++		AC_DEFINE(HAVE_VFS_RW_ITERATE, 1,
++			[fops->read/write_iter() are available])
++	],[
++		AC_MSG_RESULT(no)
++	])
++])
+diff --git a/config/kernel.m4 b/config/kernel.m4
+index a9f2f58..fe42e17 100644
+--- a/config/kernel.m4
++++ b/config/kernel.m4
+@@ -96,6 +96,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
+ 	ZFS_AC_KERNEL_5ARG_SGET
+ 	ZFS_AC_KERNEL_LSEEK_EXECUTE
+ 	ZFS_AC_KERNEL_VFS_ITERATE
++	ZFS_AC_KERNEL_VFS_RW_ITERATE
+ 
+ 	AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
+ 		KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
+diff --git a/module/zfs/zpl_file.c b/module/zfs/zpl_file.c
+index 66db113..5471140 100644
+--- a/module/zfs/zpl_file.c
++++ b/module/zfs/zpl_file.c
+@@ -196,8 +196,7 @@ zpl_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
+ static int
+ zpl_aio_fsync(struct kiocb *kiocb, int datasync)
+ {
+-	return (zpl_fsync(kiocb->ki_filp, kiocb->ki_pos,
+-	    kiocb->ki_pos + kiocb->ki_nbytes, datasync));
++	return (zpl_fsync(kiocb->ki_filp, kiocb->ki_pos, -1, datasync));
+ }
+ #else
+ #error "Unsupported fops->fsync() implementation"
+@@ -261,12 +260,11 @@ zpl_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos)
+ }
+ 
+ static ssize_t
+-zpl_aio_read(struct kiocb *kiocb, const struct iovec *iovp,
+-	unsigned long nr_segs, loff_t pos)
++zpl_iter_read_common(struct kiocb *kiocb, const struct iovec *iovp,
++    unsigned long nr_segs, size_t count)
+ {
+ 	cred_t *cr = CRED();
+ 	struct file *filp = kiocb->ki_filp;
+-	size_t count = kiocb->ki_nbytes;
+ 	ssize_t read;
+ 	size_t alloc_size = sizeof (struct iovec) * nr_segs;
+ 	struct iovec *iov_tmp = kmem_alloc(alloc_size, KM_SLEEP);
+@@ -284,6 +282,22 @@ zpl_aio_read(struct kiocb *kiocb, const struct iovec *iovp,
+ 	return (read);
+ }
+ 
++#if defined(HAVE_VFS_RW_ITERATE)
++static ssize_t
++zpl_iter_read(struct kiocb *kiocb, struct iov_iter *to)
++{
++	return (zpl_iter_read_common(kiocb, to->iov, to->nr_segs,
++	    iov_iter_count(to)));
++}
++#else
++static ssize_t
++zpl_aio_read(struct kiocb *kiocb, const struct iovec *iovp,
++    unsigned long nr_segs, loff_t pos)
++{
++	return (zpl_iter_read_common(kiocb, iovp, nr_segs, kiocb->ki_nbytes));
++}
++#endif /* HAVE_VFS_RW_ITERATE */
++
+ static inline ssize_t
+ zpl_write_common_iovec(struct inode *ip, const struct iovec *iovp, size_t count,
+     unsigned long nr_segs, loff_t *ppos, uio_seg_t segment,
+@@ -344,12 +358,11 @@ zpl_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
+ }
+ 
+ static ssize_t
+-zpl_aio_write(struct kiocb *kiocb, const struct iovec *iovp,
+-	unsigned long nr_segs, loff_t pos)
++zpl_iter_write_common(struct kiocb *kiocb, const struct iovec *iovp,
++    unsigned long nr_segs, size_t count)
+ {
+ 	cred_t *cr = CRED();
+ 	struct file *filp = kiocb->ki_filp;
+-	size_t count = kiocb->ki_nbytes;
+ 	ssize_t wrote;
+ 	size_t alloc_size = sizeof (struct iovec) * nr_segs;
+ 	struct iovec *iov_tmp = kmem_alloc(alloc_size, KM_SLEEP);
+@@ -367,6 +380,22 @@ zpl_aio_write(struct kiocb *kiocb, const struct iovec *iovp,
+ 	return (wrote);
+ }
+ 
++#if defined(HAVE_VFS_RW_ITERATE)
++static ssize_t
++zpl_iter_write(struct kiocb *kiocb, struct iov_iter *from)
++{
++	return (zpl_iter_write_common(kiocb, from->iov, from->nr_segs,
++	    iov_iter_count(from)));
++}
++#else
++static ssize_t
++zpl_aio_write(struct kiocb *kiocb, const struct iovec *iovp,
++    unsigned long nr_segs, loff_t pos)
++{
++	return (zpl_iter_write_common(kiocb, iovp, nr_segs, kiocb->ki_nbytes));
++}
++#endif /* HAVE_VFS_RW_ITERATE */
++
+ static loff_t
+ zpl_llseek(struct file *filp, loff_t offset, int whence)
+ {
+@@ -778,8 +807,13 @@ const struct file_operations zpl_file_operations = {
+ 	.llseek		= zpl_llseek,
+ 	.read		= zpl_read,
+ 	.write		= zpl_write,
++#ifdef HAVE_VFS_RW_ITERATE
++	.read_iter	= zpl_iter_read,
++	.write_iter	= zpl_iter_write,
++#else
+ 	.aio_read	= zpl_aio_read,
+ 	.aio_write	= zpl_aio_write,
++#endif
+ 	.mmap		= zpl_mmap,
+ 	.fsync		= zpl_fsync,
+ 	.aio_fsync	= zpl_aio_fsync,

From 6af1fe35199eb62b33a94e7a3fee2b9ef11f839f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 24 Jun 2015 23:38:37 -0700
Subject: [PATCH 1563/2322] spl_git: 2015-04-24 -> 2015-06-10

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

diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix
index 0748da25f16..da9f57824b9 100644
--- a/pkgs/os-specific/linux/spl/git.nix
+++ b/pkgs/os-specific/linux/spl/git.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-04-24";
+  version = "2015-06-10";
 
   src = fetchgit {
     url = git://github.com/zfsonlinux/spl.git;
-    rev = "62e2eb2329d99f7c39bcda47bc9ecb2887608fa5";
-    sha256 = "1i59sps2y0mgm9sj4a0h03xl0hlgiym4637j5j6zc5g125zzcnrd";
+    rev = "2345368646151718fa59986d9e2d9d38bcdecb2c";
+    sha256 = "08k7ahqgqrf9i118mkfxm01h8s607zp8lyvbvm1crii50dwlvl3g";
   };
 
   patches = [ ./const.patch ./install_prefix.patch ];

From 59faa759dade5c629409d683e72523548c40f554 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 24 Jun 2015 23:41:29 -0700
Subject: [PATCH 1564/2322] zfs_git: 2015-05-13 -> 2015-06-22

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

diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix
index 130a02c86e8..c6088595dcf 100644
--- a/pkgs/os-specific/linux/zfs/git.nix
+++ b/pkgs/os-specific/linux/zfs/git.nix
@@ -1,12 +1,12 @@
 { callPackage, stdenv, fetchgit, spl_git, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-05-13";
+  version = "2015-06-22";
 
   src = fetchgit {
     url = git://github.com/zfsonlinux/zfs.git;
-    rev = "7fec46b9d8967109ad289d208e8cf36a0c16e40c";
-    sha256 = "0gvzw6vn7wyq2g9psv0fdars7ssidqc5l85x4yym5niccy1xl437";
+    rev = "72540ea3148a2bc03860d7d59b2b5fdc9a5cdee7";
+    sha256 = "0428xg5whr7y7r6r1jcfk8q944j948vj2nnzwgsx7cgn3n3v1yyn";
   };
 
   patches = [ ./nix-build.patch ];

From af3f91085a0c7b8f8b9a7c0cdd780463d4fc473d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 11 Jun 2015 23:52:16 +0200
Subject: [PATCH 1565/2322] mldonkey: move package out of ocamlPackages

as it does not provides any library but only an executable program
---
 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 e7d5caa4471..d520d202dad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4380,8 +4380,6 @@ let
 
     mezzo = callPackage ../development/compilers/mezzo { };
 
-    mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
-
     mlgmp =  callPackage ../development/ocaml-modules/mlgmp { };
 
     ocaml_batteries = callPackage ../development/ocaml-modules/batteries { };
@@ -11876,6 +11874,8 @@ let
 
   mjpg-streamer = callPackage ../applications/video/mjpg-streamer { };
 
+  mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
+
   mmex = callPackage ../applications/office/mmex { };
 
   moc = callPackage ../applications/audio/moc { };

From d440059e7d828518735134aed8826da5214e6efa Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 11 Jun 2015 23:59:55 +0200
Subject: [PATCH 1566/2322] OCaml-4.02: fix ocamlbuild

This addresses the issue described at http://caml.inria.fr/mantis/view.php?id=6605
---
 pkgs/development/compilers/ocaml/4.02.1.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/compilers/ocaml/4.02.1.nix b/pkgs/development/compilers/ocaml/4.02.1.nix
index 6f4cce522e4..d70fe3384e0 100644
--- a/pkgs/development/compilers/ocaml/4.02.1.nix
+++ b/pkgs/development/compilers/ocaml/4.02.1.nix
@@ -9,6 +9,10 @@ assert useX11 -> !stdenv.isArm && !stdenv.isMips;
 let
    useNativeCompilers = !stdenv.isMips;
    inherit (stdenv.lib) optionals optionalString;
+   patchOcamlBuild = fetchurl {
+     url = https://github.com/ocaml/ocaml/pull/117.patch;
+     sha256 = "0x2cdn2sgzq29qzqg5y2ial0jqy8gjg5a7jf8qqch55dc4vkyjw0";
+   };
 in
 
 stdenv.mkDerivation rec {
@@ -24,6 +28,8 @@ stdenv.mkDerivation rec {
     sha256 = "1p7lqvh64xpykh99014mz21q8fs3qyjym2qazhhbq8scwldv1i38";
   };
 
+  patches = [ patchOcamlBuild ];
+
   prefixKey = "-prefix ";
   configureFlags = optionals useX11 [ "-x11lib" x11lib
                                       "-x11include" x11inc ];

From e63c1ea33e5871082d6400718e7dad2ba4e3a08a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 12 Jun 2015 00:03:00 +0200
Subject: [PATCH 1567/2322] ocaml-ulex: fix build with OCaml-4.02 (depends on
 camlp4)

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

diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix
index 28950078f39..7c8acafe769 100644
--- a/pkgs/development/ocaml-modules/ulex/default.nix
+++ b/pkgs/development/ocaml-modules/ulex/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib }:
+{ stdenv, fetchurl, ocaml, findlib, camlp4 }:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -17,7 +17,8 @@ stdenv.mkDerivation {
 
   createFindlibDestdir = true;
 
-  buildInputs = [ocaml findlib];
+  buildInputs = [ ocaml findlib ];
+  propagatedBuildInputs = [ camlp4 ];
 
   buildFlags = "all all.opt";
 

From bce75f1d1a4fe9887cdfb3921fdef5ab1539abb1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 12 Jun 2015 00:04:24 +0200
Subject: [PATCH 1568/2322] eliom: fix build with OCaml-4.02

---
 .../ocaml-modules/eliom/camlp4.patch          | 24 +++++++++++++++++++
 .../ocaml-modules/eliom/default.nix           |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/eliom/camlp4.patch

diff --git a/pkgs/development/ocaml-modules/eliom/camlp4.patch b/pkgs/development/ocaml-modules/eliom/camlp4.patch
new file mode 100644
index 00000000000..561d5305bef
--- /dev/null
+++ b/pkgs/development/ocaml-modules/eliom/camlp4.patch
@@ -0,0 +1,24 @@
+--- a/src/_tags	2014-10-01 16:19:35.000000000 +0100
++++ b/src/_tags	2014-11-09 16:55:34.470663377 +0000
+@@ -39,7 +39,7 @@
+ <lib/server/monitor/*.ml{,i}>:I(src/lib/server)
+ 
+ <syntax/pa_*.ml{,i}>: syntax(camlp4o),package(camlp4.quotations.o,camlp4.extend)
+-<syntax/pa_*.ml{,i}>: I(+camlp4/Camlp4Parsers)
++<syntax/pa_*.ml{,i}>: use_camlp4_full
+ 
+ 
+ <ocamlbuild/ocamlbuild_eliom.ml{,i}>: package(ocamlbuild,js_of_ocaml.ocamlbuild)
+
+--- a/src/lib/eliom_registration.server.ml	2014-10-01 16:19:35.000000000 +0100
++++ b/src/lib/eliom_registration.server.ml	2014-11-09 17:26:16.093198699 +0000
+@@ -2440,7 +2440,7 @@
+       (Ocaml.register_post_coservice'
+          ?scope ?options ?charset ?code ?content_type ?headers ?secure_session ?name
+          ?csrf_safe ?csrf_scope ?csrf_secure ?max_use ?timeout ?https ?error_handler
+-         ~post_params:Eliom_parameter.(ocaml "argument" argument_type)
++         ~post_params:(Eliom_parameter.ocaml "argument" argument_type)
+          (fun () argument -> f argument))
+       (Eliom_wrap.create_unwrapper
+          (Eliom_wrap.id_of_int Eliom_common_base.server_function_unwrap_id_int))
+
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 54644d83699..7fe26863b3d 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec
     sha256 = "10v7mrq3zsbxdlg8k8xif777mbvcdpabvnd1g7p2yqivr7f1qm24";
   };
 
+  patches = [ ./camlp4.patch ];
+
   buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving
                  js_of_ocaml ocaml_optcomp opam];
 

From 8263cd29177f2783a881c76856447100116438c6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 18 Jun 2015 00:37:09 +0200
Subject: [PATCH 1569/2322] ocaml-mysql: fix build with OCaml-4.02 (needs
 camlp4)

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

diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix
index 4ffef60c4bf..fc26d8b989c 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}:
+{ stdenv, fetchurl, ocaml, findlib, mysql, camlp4 }:
 
 # TODO: la versione stabile da' un errore di compilazione dovuto a
 # qualche cambiamento negli header .h
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
      "--libdir=$out/lib/ocaml/${ocaml_version}/site-lib/mysql"
   ];
 
-  buildInputs = [ocaml findlib mysql.lib ];
+  buildInputs = [ocaml findlib mysql.lib camlp4 ];
 
   createFindlibDestdir = true;
 

From 5beebaca58d071a1fa0e0a92e15cbecbcf192ff5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 18 Jun 2015 01:12:53 +0200
Subject: [PATCH 1570/2322] fix glsurf

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

diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix
index 1439d327d6e..2c09f572d12 100644
--- a/pkgs/applications/science/math/glsurf/default.nix
+++ b/pkgs/applications/science/math/glsurf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchdarcs, ocaml, findlib,  lablgl, camlimages, mesa, freeglut, ocaml_mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng, giflib }:
+{ stdenv, fetchdarcs, ocaml, findlib,  lablgl, camlimages, mesa, freeglut, ocaml_mysql, mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng, giflib }:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -10,11 +10,11 @@ stdenv.mkDerivation {
   src = fetchdarcs {
     url = "http://lama.univ-savoie.fr/~raffalli/GlSurf";
     rev = "3.3";
-    sha256 = ""; md5="";
+    sha256 = "0ljvvzz31j7l8rvsv63x1kj70nhw3al3k294m79hpmwjvym1mzfa";
   };
 
   buildInputs = [ ocaml findlib freeglut mesa
-  	          lablgl camlimages ocaml_mysql mlgmp mpfr gmp
+  	          lablgl camlimages ocaml_mysql mysql.lib mlgmp mpfr gmp
 		  libtiff libjpeg libpng giflib ];
 
   installPhase = ''

From ca48e509465d08690472d9ab3f7242184c12b886 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 25 Jun 2015 00:15:05 +0200
Subject: [PATCH 1571/2322] bolt: fix build with OCaml 4.02

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

diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix
index 9b0efd816bd..61c3d6f23b4 100644
--- a/pkgs/development/ocaml-modules/bolt/default.nix
+++ b/pkgs/development/ocaml-modules/bolt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, which }:
+{ stdenv, fetchurl, ocaml, findlib, which, camlp4 }:
 
 let inherit (stdenv.lib) getVersion versionAtLeast; in
 
@@ -14,7 +14,20 @@ stdenv.mkDerivation rec {
     sha256 = "1c807wrpxra9sbb34lajhimwra28ldxv04m570567lh2b04n38zy";
   };
 
-  buildInputs = [ ocaml findlib which ];
+  buildInputs = [ ocaml findlib which camlp4 ];
+
+  patchPhase = ''
+    patch myocamlbuild.ml <<EOF
+70,74c70
+<         let camlp4of =
+<           try
+<             let path_bin = Filename.concat (Sys.getenv "PATH_OCAML_PREFIX") "bin" in
+<             Filename.concat path_bin "camlp4of"
+<           with _ -> "camlp4of" in
+---
+>         let camlp4of = "camlp4of" in
+EOF
+  '';
 
   # The custom `configure` script does not expect the --prefix
   # option. Installation is handled by ocamlfind.

From f7dc2df7c07a6b27785e9b3789309271e7620c03 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 25 Jun 2015 00:24:04 +0200
Subject: [PATCH 1572/2322] acgtk: fix build with OCaml 4.02

---
 pkgs/applications/science/logic/acgtk/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix
index 41c6cf75f32..0fd90ac13b6 100644
--- a/pkgs/applications/science/logic/acgtk/default.nix
+++ b/pkgs/applications/science/logic/acgtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, dypgen, bolt, ansiterminal,
+{ stdenv, fetchurl, ocaml, findlib, dypgen, bolt, ansiterminal, camlp4,
   buildBytecode ? true,
   buildNative ? true,
   installExamples ? true,
@@ -22,11 +22,16 @@ stdenv.mkDerivation {
     sha256 = "1k1ldqg34bwmgdpmi9gry9czlsk85ycjxnkd25fhlf3mmgg4n9p6";
   };
 
-  buildInputs = [ ocaml findlib dypgen bolt ansiterminal ];
+  buildInputs = [ ocaml findlib dypgen bolt ansiterminal camlp4 ];
 
   patches = [ ./install-emacs-to-site-lisp.patch
               ./use-nix-ocaml-byteflags.patch ];
 
+  postPatch = stdenv.lib.optionalString (camlp4 != null) ''
+    substituteInPlace src/Makefile.master.in \
+      --replace "+camlp4" "${camlp4}/lib/ocaml/${getVersion ocaml}/site-lib/camlp4/"
+  '';
+
   # The bytecode executable is dependent on the dynamic library provided by
   # ANSITerminal. We can use the -dllpath flag of ocamlc (analogous to
   # -rpath) to make sure that ocamlrun is able to link the library at

From 3105b66dbdf14231744762b6d7d8c40cebc00eae Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 25 Jun 2015 00:30:10 +0200
Subject: [PATCH 1573/2322] lablgtk-2.14: fix build with OCaml-4.02 (needs
 camlp4)

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

diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
index 2e50b897f3d..1815bfc64dd 100644
--- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview}:
+{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview, camlp4 }:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -14,7 +14,7 @@ stdenv.mkDerivation (rec {
     sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9";
   };
 
-  buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview];
+  buildInputs = [ ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4 ];
 
   configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib";
   buildFlags = "world";

From 2727ecec3744e5c271c0040f94ca436068b309a1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 25 Jun 2015 00:57:16 +0200
Subject: [PATCH 1574/2322] js_of_ocaml: propagate camlp4 dependency

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

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index 9989afdefc4..eaabd50059d 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation {
     };
   
   buildInputs = [ocaml findlib menhir ocsigen_deriving
-                 cmdliner tyxml camlp4 reactivedata];
-  propagatedBuildInputs = [ ocaml_lwt ];
+                 cmdliner tyxml reactivedata];
+  propagatedBuildInputs = [ ocaml_lwt camlp4 ];
 
   patches = [ ./Makefile.conf.diff ];  
 

From 1d72ce49cf8d6c4d68360b113513d1d87ce66d61 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 25 Jun 2015 02:04:23 +0200
Subject: [PATCH 1575/2322] coq-8.3: fix (needs make 3)

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

diff --git a/pkgs/applications/science/logic/coq/8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix
index 63aaa02e67a..c59c4b06270 100644
--- a/pkgs/applications/science/logic/coq/8.3.nix
+++ b/pkgs/applications/science/logic/coq/8.3.nix
@@ -1,6 +1,6 @@
 # - coqide compilation can be disabled by setting lablgtk to null;
 
-{stdenv, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
+{ stdenv, make, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null }:
 
 let 
   version = "8.3pl4";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     sha256 = "17d3lmchmqir1rawnr52g78srg4wkd7clzpzfsivxc4y1zp6rwkr";
   };
 
-  buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
+  buildInputs = [ make ocaml findlib camlp5 ncurses lablgtk ];
 
   prefixKey = "-prefix ";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d520d202dad..39b2e9b30bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14095,6 +14095,7 @@ let
   };
 
   coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix {
+    make = gnumake3;
     inherit (ocamlPackages_3_12_1) ocaml findlib;
     camlp5 = ocamlPackages_3_12_1.camlp5_transitional;
     lablgtk = ocamlPackages_3_12_1.lablgtk_2_14;

From 3a7dd86842e5d2a702f06e9302244e9e2942f7be Mon Sep 17 00:00:00 2001
From: j-keck <jhyphenkeck@gmail.com>
Date: Thu, 25 Jun 2015 09:28:43 +0200
Subject: [PATCH 1576/2322] scala: update to 2.11.7

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

diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index 9e55d9f3ac2..289c63f7bcf 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.11.6";
+  name = "scala-2.11.7";
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "10v58jm0wbb4v71sfi03gskd6n84jqn6nvd62x166104c3j4bfj1";
+    sha256 = "1l16571fw5l339wd02w2pnr3556j804zpbsbymnad67f2dpikr7z";
   };
 
   buildInputs = [ jre makeWrapper ] ;

From 1281f51b6972ec61101bf54e05daf338c8209ca9 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Wed, 24 Jun 2015 23:47:44 -0700
Subject: [PATCH 1577/2322] obs-studio: audio support

---
 pkgs/applications/video/obs-studio/default.nix | 10 ++++++++--
 pkgs/top-level/all-packages.nix                |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 894a51c58cc..953f0c3a8b2 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -7,9 +7,14 @@
 , qt5
 , libv4l
 , x264
+
+, pulseaudioSupport ? false
+, libpulseaudio
 }:
 
-stdenv.mkDerivation rec {
+let
+  optional = stdenv.lib.optional;
+in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
   version = "0.10.0";
 
@@ -26,7 +31,8 @@ stdenv.mkDerivation rec {
                   qt5.base
                   qt5.x11extras
                   x264
-                ];
+                ]
+                ++ optional pulseaudioSupport libpulseaudio;
 
   # obs attempts to dlopen libobs-opengl, it fails unless we make sure
   # DL_OPENGL is an explicit path. Not sure if there's a better way
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7d5caa4471..b29a88eea6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12089,7 +12089,9 @@ let
     inherit (gnome) libglade;
   };
 
-  obs-studio = callPackage ../applications/video/obs-studio { };
+  obs-studio = callPackage ../applications/video/obs-studio {
+    pulseaudioSupport = config.pulseaudio or false;
+  };
 
   ocrad = callPackage ../applications/graphics/ocrad { };
 

From 4736b3b1ae0d80a364d9ce0c181cb459fa93fb55 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 25 Jun 2015 11:38:32 +0200
Subject: [PATCH 1578/2322] spice-gtk: update to 0.27

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

diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index d525c143d9c..b1004f65a79 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -6,11 +6,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "spice-gtk-0.25";
+  name = "spice-gtk-0.27";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2";
-    sha256 = "11yh593frbafp0ywkk7pfc2k17q1fwrl8zcjclph3xfr1alccc07";
+    sha256 = "0323j3q7gagi83fvxd7v9vdxqv2s3ziss44ici342hyv21qf0xah";
   };
 
   buildInputs = [

From 2ca1a7a2344f1f2475f84f38f3ffbe1e70047b72 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 25 Jun 2015 11:38:39 +0200
Subject: [PATCH 1579/2322] gnome-boxes: fix 3.16 version

---
 pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
index 3b30cdbbcfb..cc3640fd09f 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
@@ -3,6 +3,7 @@
 , spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
 , libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
 , hicolor_icon_theme, desktop_file_utils, mtools, cdrkit, libcdio
+, libusb, libarchive, acl
 }:
 
 # TODO: ovirt (optional)
@@ -23,8 +24,8 @@ stdenv.mkDerivation rec {
     makeWrapper pkgconfig intltool itstool libvirt-glib glib
     gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
     libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp
-    gdbm cyrus_sasl gnome3.adwaita-icon-theme
-    librsvg hicolor_icon_theme desktop_file_utils
+    gdbm cyrus_sasl gnome3.adwaita-icon-theme libusb libarchive
+    librsvg hicolor_icon_theme desktop_file_utils acl
   ];
 
   preFixup = ''

From 66bd251a7c7a3b14818d6c714b8d2e25bf19ccfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 25 Jun 2015 12:04:59 +0200
Subject: [PATCH 1580/2322] Adding internetarchive 0.8.3.

---
 pkgs/top-level/python-packages.nix | 109 +++++++++++++++++++----------
 1 file changed, 71 insertions(+), 38 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 044b3d3c77d..3d121874e18 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -572,6 +572,21 @@ let
     };
   };
 
+  args = buildPythonPackage rec {
+    name = "args-0.1.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/a/args/${name}.tar.gz";
+      md5 = "66faf79ba2511def7b8b81d542482046";
+    };
+
+    meta = {
+      description = "Command Arguments for Humans";
+      homepage = "https://github.com/kennethreitz/args";
+      license = stdenv.lib.licenses.bsd;
+    };
+  };
+
   area53 = buildPythonPackage (rec {
     name = "Area53-0.94";
 
@@ -3430,42 +3445,6 @@ let
     };
   };
 
-  jsonpatch = buildPythonPackage rec {
-    name = "jsonpatch-1.8";
-
-    src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/j/jsonpatch/jsonpatch-1.8.tar.gz";
-      sha256 = "0xhp6prvk219vnzixbj231wymd458nqbnmsf5fn4252092prvig5";
-    };
-
-    propagatedBuildInputs = with self; [ six jsonpointer ];
-
-    meta = {
-      description = "Apply JSON-Patches (RFC 6902)";
-      homepage = "https://github.com/stefankoegl/python-json-patch";
-      license = licenses.bsd3;
-      platforms = platforms.all;
-    };
-  };
-
-  jsonpointer = buildPythonPackage rec {
-    name = "jsonpointer-1.4";
-
-    src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/j/jsonpointer/jsonpointer-1.4.tar.gz";
-      sha256 = "1d0555smqwdbi0nm48hyqzywb9m2jlz5izgv56ll3zk7viz3b7fb";
-    };
-
-    #propagatedBuildInputs = with self; [ six jsonpointer ];
-
-    meta = {
-      description = "Identify specific nodes in a JSON document (RFC 6901)";
-      homepage = "https://github.com/stefankoegl/python-json-pointer";
-      license = licenses.bsd3;
-      platforms = platforms.all;
-    };
-  };
-
   jdcal = buildPythonPackage rec {
     version = "1.0";
     name = "jdcal-${version}";
@@ -3486,6 +3465,60 @@ let
     };
   };
 
+  internetarchive = let ver = "0.8.3"; in buildPythonPackage rec {
+    name = "internetarchive-${ver}";
+
+    src = pkgs.fetchurl {
+      url = "https://github.com/jjjake/internetarchive/archive/v${ver}.tar.gz";
+      sha256 = "0j3l13zvbx50j66l6pnf8y8y8m6gk1sc3yssvfd2scvmv4gnmm8n";
+    };
+
+    # It is hardcoded to specific versions, I don't know why.
+    preConfigure = ''
+        sed 's/==/>=/' -i setup.py
+    '';
+
+    propagatedBuildInputs = with self; [ six clint pyyaml docopt pytest
+      requests2 jsonpatch args ];
+
+    meta = with stdenv.lib; {
+      description = "A python wrapper for the various Internet Archive APIs";
+      homepage = "https://github.com/jjjake/internetarchive";
+    };
+  };
+
+  jsonpatch = buildPythonPackage rec {
+    name = "jsonpatch-1.11";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/j/jsonpatch/${name}.tar.gz";
+      md5 = "9f2d0aa31f99cc97089a203c5bed3924";
+    };
+
+    propagatedBuildInputs = with self; [ jsonpointer ];
+
+    meta = {
+      description = "Library to apply JSON Patches according to RFC 6902";
+      homepage = "https://github.com/stefankoegl/python-json-patch";
+      license = stdenv.lib.licenses.bsd2; # "Modified BSD licence, says pypi"
+    };
+  };
+
+  jsonpointer = buildPythonPackage rec {
+    name = "jsonpointer-1.9";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/j/jsonpointer/${name}.tar.gz";
+      md5 = "c4d3f28e72ba77062538d1c0864c40a9";
+    };
+
+    meta = {
+      description = "Library to apply JSON Patches according to RFC 6902";
+      homepage = "https://github.com/stefankoegl/python-json-patch";
+      license = stdenv.lib.licenses.bsd2; # "Modified BSD licence, says pypi"
+    };
+  };
+
   jsonwatch = buildPythonPackage rec {
     name = "jsonwatch-0.2.0";
 
@@ -11862,11 +11895,11 @@ let
   };
 
   clint = buildPythonPackage rec {
-    name = "clint-0.3.1";
+    name = "clint-0.4.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/c/clint/${name}.tar.gz";
-      md5 = "7dcd43fb08bfb84c7d63e9356ada7b73";
+      md5 = "d0a0952bfcc5f4c5e03c36854665b298";
     };
 
     checkPhase = ''

From b64021cdaa459492d4157b451401066aa98b66c5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 24 Jun 2015 12:29:02 +0200
Subject: [PATCH 1581/2322] haskell-gnutls: linker errors have been fixed
 upstream

---
 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 269c020c376..50bf89c3001 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -820,9 +820,6 @@ self: super: {
   # https://github.com/bos/aeson/issues/253
   aeson = dontCheck super.aeson;
 
-  # GNUTLS 3.4 causes linker errors: http://hydra.cryp.to/build/839563/nixlog/2/raw
-  gnutls = super.gnutls.override { gnutls = pkgs.gnutls33; };
-
   # Won't compile with recent versions of QuickCheck.
   testpack = markBroken super.testpack;
   MissingH = dontCheck super.MissingH;

From 8e68d55b0419f6dfbdb79948f9415026a334209f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 25 Jun 2015 11:31:09 +0200
Subject: [PATCH 1582/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/d107d75494718d2f240ffbf27e68babdad7028ce
 with hackage2nix revision de16283b7d550f2f74d936477f2ab475e3a30669

---
 .../haskell-modules/hackage-packages.nix      | 488 +++++++++---------
 1 file changed, 255 insertions(+), 233 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a9f389805fe..cbc01eb3f8d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -11369,8 +11369,8 @@ self: {
     ({ mkDerivation, base, mesa, transformers }:
      mkDerivation {
        pname = "OpenGLRaw";
-       version = "2.5.0.0";
-       sha256 = "008w16flhil8ndrik0nmf0cjjcvh7s69gq8h9nff77dlbvjx1rl8";
+       version = "2.5.1.0";
+       sha256 = "1kfq24mxg922ml3kkmym2qfpc56jbmrfbiix4rc2cxlwv05i191k";
        buildDepends = [ base transformers ];
        extraLibraries = [ mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
@@ -17412,6 +17412,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-applicative" = callPackage
+    ({ mkDerivation, aeson, base, text, unordered-containers }:
+     mkDerivation {
+       pname = "aeson-applicative";
+       version = "0.1.0.0";
+       sha256 = "0plbpln1glmf8a53f4nag1lx7sy8lcali6f1m526zifgak99p3qz";
+       buildDepends = [ aeson base text unordered-containers ];
+       jailbreak = true;
+       homepage = "https://github.com/gregwebs/aeson-applicative-dsl";
+       description = "make To/From JSOn instances from an applicative description";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "aeson-better-errors" = callPackage
     ({ mkDerivation, aeson, base, bytestring, dlist, mtl, scientific
      , text, transformers, transformers-compat, unordered-containers
@@ -17930,8 +17943,8 @@ self: {
     ({ mkDerivation, array, base, containers, mtl, random, vector }:
      mkDerivation {
        pname = "aivika";
-       version = "4.0.3";
-       sha256 = "1z5szc15qg7hqgz67b6m9is2dwkfcz50rw393nkpq7q2w6sjlf5m";
+       version = "4.1";
+       sha256 = "1w7xj3yjhdgldd1x1cfz7allsxycq0kcdpx46idl665dss2mvj5r";
        buildDepends = [ array base containers mtl random vector ];
        homepage = "http://github.com/dsorokin/aivika";
        description = "A multi-paradigm simulation library";
@@ -21467,6 +21480,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "atom-conduit" = callPackage
+    ({ mkDerivation, base, conduit, conduit-parse, containers
+     , data-default, exceptions, hlint, lens, mono-traversable
+     , network-uri, parsers, quickcheck-instances, resourcet, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, timerep, xml-conduit
+     , xml-conduit-parse, xml-types
+     }:
+     mkDerivation {
+       pname = "atom-conduit";
+       version = "0.1.0.0";
+       sha256 = "1jhd7036ga1sf1zgclc1m5gjzj5smf84rzvy5xac70wgcaa8iajk";
+       buildDepends = [
+         base conduit conduit-parse containers exceptions lens
+         mono-traversable network-uri parsers text time timerep xml-conduit
+         xml-conduit-parse xml-types
+       ];
+       testDepends = [
+         base conduit conduit-parse data-default exceptions hlint lens
+         mono-traversable network-uri parsers quickcheck-instances resourcet
+         tasty tasty-hunit tasty-quickcheck text time xml-conduit
+         xml-conduit-parse xml-types
+       ];
+       description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
+       license = "unknown";
+     }) {};
+
   "atom-msp430" = callPackage
     ({ mkDerivation, atom, base, mtl }:
      mkDerivation {
@@ -26516,8 +26555,8 @@ self: {
      }:
      mkDerivation {
        pname = "bloodhound";
-       version = "0.6.0.0";
-       sha256 = "0qybsmfkip5cjanmhj2av4rl5hig6x4wn97cmlajhszqd5ddsis9";
+       version = "0.6.0.1";
+       sha256 = "0xnq8iph7dmc3bd2lvbbjdqqgwjynqz7pywh7qkclqn8rz27flfi";
        buildDepends = [
          aeson base bytestring containers data-default-class exceptions
          http-client http-types mtl semigroups text time transformers
@@ -26528,7 +26567,6 @@ self: {
          http-client http-types mtl QuickCheck quickcheck-properties
          semigroups text time unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/bitemyapp/bloodhound";
        description = "ElasticSearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -28363,20 +28401,20 @@ self: {
   "cabal-helper" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, data-default, directory
      , extra, filepath, ghc-prim, mtl, process, template-haskell
-     , temporary, transformers, unix
+     , temporary, transformers, unix, utf8-string
      }:
      mkDerivation {
        pname = "cabal-helper";
-       version = "0.3.5.0";
-       sha256 = "02qzji8jzbg19pmhmqg0kylvmm0libq7v99rws67bh015gb829kk";
+       version = "0.3.6.0";
+       sha256 = "1c6pdrq8ypy9halw6cqdasr0zdr0hdb76h66vs9g0qkqqbpgiyyq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base bytestring Cabal data-default directory filepath ghc-prim mtl
-         process template-haskell temporary transformers
+         process template-haskell temporary transformers utf8-string
        ];
        testDepends = [ base extra unix ];
-       description = "Simple interface to Cabal's configuration state used by ghc-mod";
+       description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
@@ -35852,13 +35890,12 @@ self: {
      }:
      mkDerivation {
        pname = "country-codes";
-       version = "0.1.1";
-       sha256 = "1pv8sxq999437azc2w8qs9p27346sc1fpv9vwlny6rym19avknm5";
+       version = "0.1.2";
+       sha256 = "16729grgn4bgnh9nw51h3pil054bixqxfa8lxwfz8xf3b6lcm774";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ aeson base shakespeare tagsoup text ];
        testDepends = [ aeson base HTF HUnit ];
-       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/country-codes";
        description = "ISO 3166 country codes and i18n names";
        license = stdenv.lib.licenses.bsd3;
@@ -41755,8 +41792,8 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-aeson";
-       version = "1.1.14";
-       sha256 = "0j6pxvxcisnj5gx0vr0d845j380q0qqkw93b811bnz767zskmm7n";
+       version = "1.1.15";
+       sha256 = "19zjn3cykxyrk0dblmrvbrmggnsxigfxvhjnjmrq60z1iljvrqrr";
        buildDepends = [
          aeson base containers digestive-functors lens lens-aeson safe text
          vector
@@ -41765,7 +41802,6 @@ self: {
          aeson base bytestring digestive-functors HUnit mtl scientific tasty
          tasty-hunit text
        ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/digestive-functors-aeson";
        description = "Run digestive-functors forms against JSON";
        license = stdenv.lib.licenses.gpl3;
@@ -45188,13 +45224,12 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-carbon";
-       version = "1.0.2";
-       sha256 = "0m8cv2hsn1745f7pj552rp9sjsyfh7fbgjw6k2ippqcbxmhqmf4i";
+       version = "1.0.3";
+       sha256 = "0138r186w56qxkrm0akzx60j25gkhg0a9nbhhhjj3f3igaxjm6br";
        buildDepends = [
          base ekg-core network network-carbon text time unordered-containers
          vector
        ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/ekg-carbon";
        description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
@@ -46656,8 +46691,8 @@ self: {
      }:
      mkDerivation {
        pname = "esqueleto";
-       version = "2.2.4";
-       sha256 = "1l72md0zac19mdvs0x9mp5j60qaa4z9vkiy8dcyiqmvvfp1lvzh0";
+       version = "2.2.6";
+       sha256 = "079yiq5idkwvcmjc75m24smyf4f0cvmy2f537v0dx8dgi6nqpr62";
        buildDepends = [
          base conduit monad-logger persistent resourcet tagged text
          transformers unordered-containers
@@ -46667,7 +46702,6 @@ self: {
          persistent persistent-sqlite persistent-template QuickCheck
          resourcet text transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/esqueleto";
        description = "Type-safe EDSL for SQL queries on persistent backends";
        license = stdenv.lib.licenses.bsd3;
@@ -48234,10 +48268,9 @@ self: {
     ({ mkDerivation, base, cereal, fb, persistent, text, time }:
      mkDerivation {
        pname = "fb-persistent";
-       version = "0.3.4";
-       sha256 = "07hrifzwvv7fzqh70igfbxzn854yvyx7406s8byn0arhmp21ka3b";
+       version = "0.3.5";
+       sha256 = "0idxwm4brbn73s8azxsys6lxg9c4vzs0b123h9lg4qs4ks5451hh";
        buildDepends = [ base cereal fb persistent text time ];
-       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/fb-persistent";
        description = "Provides Persistent instances to Facebook types";
        license = stdenv.lib.licenses.bsd3;
@@ -53575,23 +53608,21 @@ self: {
      }) {};
 
   "gipeda" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cassava
-     , conduit-combinators, containers, directory, extra, filepath
-     , gitlib, gitlib-libgit2, scientific, shake, split, tagged, text
-     , unordered-containers, vector, yaml
+    ({ mkDerivation, aeson, base, bytestring, cassava, containers
+     , directory, extra, filepath, gitlib, gitlib-libgit2, scientific
+     , shake, split, tagged, text, unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "gipeda";
-       version = "0.1.1";
-       sha256 = "0swsc35z5xyl84wwfjcgcjkayim4jy9lgmk0x6fvb7g7dg8g7lip";
+       version = "0.1.2";
+       sha256 = "0a32q4gi0vfmgvy4ir0ng52nk2gkfxcivyybh5bfh04b3saf5ya4";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         aeson base bytestring cassava conduit-combinators containers
-         directory extra filepath gitlib gitlib-libgit2 scientific shake
-         split tagged text unordered-containers vector yaml
+         aeson base bytestring cassava containers directory extra filepath
+         gitlib gitlib-libgit2 scientific shake split tagged text
+         unordered-containers vector yaml
        ];
-       jailbreak = true;
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
@@ -60993,13 +61024,12 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-src-meta";
-       version = "0.6.0.9";
-       sha256 = "18dhgfaski58lxgfga9dy1kcmb049758z2r55y0yyw855rdi1rxf";
+       version = "0.6.0.10";
+       sha256 = "0flcyimibz4flq66isshn2zsmzlly6sja6gfb0a0xn4ns4xpwpy1";
        buildDepends = [
          base haskell-src-exts pretty syb template-haskell th-orphans
          uniplate
        ];
-       jailbreak = true;
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66807,17 +66837,18 @@ self: {
      }) {};
 
   "hoe" = callPackage
-    ({ mkDerivation, base, cmdargs, exceptions, hint, mtl, regex-posix
-     , split, time
+    ({ mkDerivation, base, exceptions, hint, mtl, optparse-declarative
+     , regex-posix, split, text, time
      }:
      mkDerivation {
        pname = "hoe";
-       version = "1.0.1";
-       sha256 = "06z44i4lmd44l9fjdd49lf0j4a8gmh5njiwlr77ycsyxf9mcwaa1";
+       version = "1.1.0";
+       sha256 = "0g8528jllh90f8zbrs229ms07lg7b397pm2zjccd6kriqpq1vfv0";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base cmdargs exceptions hint mtl regex-posix split time
+         base exceptions hint mtl optparse-declarative regex-posix split
+         text time
        ];
        homepage = "http://github.com/tanakh/hoe";
        description = "hoe: Haskell One-liner Evaluator";
@@ -69780,6 +69811,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hset" = callPackage
+    ({ mkDerivation, base, mtl }:
+     mkDerivation {
+       pname = "hset";
+       version = "0.0.2";
+       sha256 = "13jq033g20mzvc424g6p1rixhw0gl681dpbc0dlrdpnpk2pm1m7l";
+       buildDepends = [ base mtl ];
+       homepage = "https://bitbucket.org/s9gf4ult/hset";
+       description = "Primitive heterogenous read-only set";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hsexif" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit
      , iconv, text, time
@@ -71572,8 +71615,8 @@ self: {
      }:
      mkDerivation {
        pname = "html-entities";
-       version = "1.0.1.0";
-       sha256 = "0s44w6nhp6xlibh1740paa21rbjvbnkhjdf35d9yw5hycjwyjwqc";
+       version = "1.0.1.1";
+       sha256 = "13mavik2bl95dnisag9aqwjl9mdqq9vib8brmvldp74zijhfr1dx";
        buildDepends = [
          attoparsec base-prelude text unordered-containers
        ];
@@ -71628,8 +71671,8 @@ self: {
      }:
      mkDerivation {
        pname = "html-tokenizer";
-       version = "0.3.0.1";
-       sha256 = "1xvqxybmjy0xyik6ss1hmrfd4k1pdd8sqnz1cs9pl6xjz3wwclwr";
+       version = "0.3.0.2";
+       sha256 = "1cd332xv2acx626hkiaakng1fwwkg9m2mg7p6jj1zzb981r6xh6y";
        buildDepends = [
          attoparsec base-prelude case-insensitive conversion
          conversion-case-insensitive conversion-text text
@@ -74003,8 +74046,8 @@ self: {
      }:
      mkDerivation {
        pname = "ide-backend";
-       version = "0.9.0.9";
-       sha256 = "0zpavp3q70h8mnjz7w4shxfbh6dzdv00f9igldygzhhr9xmr192m";
+       version = "0.9.0.11";
+       sha256 = "06ip0yq8vb8i0qcz2l7z4s1myxm6ix3l44gmjpvspj9vwlsrfxpp";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -74022,7 +74065,6 @@ self: {
          template-haskell temporary test-framework test-framework-hunit text
          unix utf8-string
        ];
-       jailbreak = true;
        description = "An IDE backend library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -74035,17 +74077,14 @@ self: {
      }:
      mkDerivation {
        pname = "ide-backend-common";
-       version = "0.9.1.2";
-       revision = "1";
-       sha256 = "1cj594vq0x87h9mvwsj9mplacrdn999bbsknjwdpvrpsbadlx5q7";
-       editedCabalFile = "cdbec9d6422b6888b23622286333a5119e9913f82e49f85676bb56d6ca850b38";
+       version = "0.9.1.3";
+       sha256 = "11dnm1ibgibrjkxigzh9l442npb2br5rchahm6gza88imy3xcd96";
        buildDepends = [
          aeson async attoparsec base binary bytestring bytestring-trie
          containers crypto-api data-accessor directory filepath fingertree
          mtl pretty-show pureMD5 tagged template-haskell temporary text
          transformers unix
        ];
-       jailbreak = true;
        description = "Shared library used be ide-backend and ide-backend-server";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -74398,38 +74437,34 @@ self: {
 
   "ihaskell" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bin-package-db
-     , bytestring, cereal, classy-prelude, cmdargs, containers
-     , directory, filepath, ghc, ghc-parser, ghc-paths, haskeline
-     , haskell-src-exts, here, hlint, hspec, http-client
-     , http-client-tls, HUnit, ipython-kernel, MissingH
-     , mono-traversable, mtl, parsec, process, random, setenv, shelly
-     , split, stm, strict, system-argv0, system-filepath, tar, text
-     , transformers, unix, unordered-containers, utf8-string, uuid
-     , vector
+     , bytestring, cereal, cmdargs, containers, directory, filepath, ghc
+     , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
+     , hspec, http-client, http-client-tls, HUnit, ipython-kernel, mtl
+     , parsec, process, random, setenv, shelly, split, stm, strict
+     , system-argv0, text, transformers, unix, unordered-containers
+     , utf8-string, uuid, vector
      }:
      mkDerivation {
        pname = "ihaskell";
-       version = "0.6.3.0";
-       sha256 = "0apkidaa0b8xq80y8hvijpkwyv6vl3v8pq19lxjq53y3hs3nqcqm";
+       version = "0.6.4.0";
+       sha256 = "1jcksbc82csr11lpy5jakf7g6wj2w7mx27cp7knlbi65fsablsk5";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base base64-bytestring bin-package-db bytestring cereal
-         classy-prelude cmdargs containers directory filepath ghc ghc-parser
-         ghc-paths haskeline haskell-src-exts here hlint hspec http-client
-         http-client-tls HUnit ipython-kernel MissingH mono-traversable mtl
-         parsec process random shelly split stm strict system-argv0
-         system-filepath tar text transformers unix unordered-containers
+         cmdargs containers directory filepath ghc ghc-parser ghc-paths
+         haskeline haskell-src-exts here hlint http-client http-client-tls
+         ipython-kernel mtl parsec process random shelly split stm strict
+         system-argv0 text transformers unix unordered-containers
          utf8-string uuid vector
        ];
        testDepends = [
          aeson base base64-bytestring bin-package-db bytestring cereal
-         classy-prelude cmdargs containers directory filepath ghc ghc-parser
-         ghc-paths haskeline haskell-src-exts here hlint hspec http-client
-         http-client-tls HUnit ipython-kernel MissingH mono-traversable mtl
-         parsec process random setenv shelly split stm strict system-argv0
-         system-filepath tar text transformers unix unordered-containers
-         utf8-string uuid vector
+         cmdargs containers directory filepath ghc ghc-parser ghc-paths
+         haskeline haskell-src-exts here hlint hspec http-client
+         http-client-tls HUnit ipython-kernel mtl parsec process random
+         setenv shelly split stm strict system-argv0 text transformers unix
+         unordered-containers utf8-string uuid vector
        ];
        jailbreak = true;
        homepage = "http://gibiansky.github.io/IHaskell/";
@@ -74439,17 +74474,16 @@ self: {
      }) {};
 
   "ihaskell-aeson" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, chunked-data
-     , classy-prelude, here, ihaskell
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here
+     , ihaskell, text
      }:
      mkDerivation {
        pname = "ihaskell-aeson";
-       version = "0.2.0.0";
-       sha256 = "1ag8xv456r4dgibqsazmw6xhhfvplc8sw128prr26hw2139ci6w9";
+       version = "0.3.0.0";
+       sha256 = "0h2bbkqwl8mdyn24n0lphcjfrvmfq8ckincv3rncspp9h0v705m7";
        buildDepends = [
-         aeson aeson-pretty base chunked-data classy-prelude here ihaskell
+         aeson aeson-pretty base bytestring here ihaskell text
        ];
-       jailbreak = true;
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for Aeson";
        license = stdenv.lib.licenses.mit;
@@ -74457,13 +74491,12 @@ self: {
      }) {};
 
   "ihaskell-basic" = callPackage
-    ({ mkDerivation, base, classy-prelude, ihaskell }:
+    ({ mkDerivation, base, ihaskell }:
      mkDerivation {
        pname = "ihaskell-basic";
-       version = "0.2.0.0";
-       sha256 = "0xf2z4xr0gkq3zvpiwvl73b6wbql4x8fdbw81kz990ifb0vwq65w";
-       buildDepends = [ base classy-prelude ihaskell ];
-       jailbreak = true;
+       version = "0.3.0.0";
+       sha256 = "1vb4x6h6bs3liq1bbnhs3ns0zrk4czy63zmkp1q075g7fq1fh7hw";
+       buildDepends = [ base ihaskell ];
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for basic types";
        license = stdenv.lib.licenses.mit;
@@ -74471,17 +74504,12 @@ self: {
      }) {};
 
   "ihaskell-blaze" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, classy-prelude
-     , ihaskell
-     }:
+    ({ mkDerivation, base, blaze-html, blaze-markup, ihaskell }:
      mkDerivation {
        pname = "ihaskell-blaze";
-       version = "0.2.0.0";
-       sha256 = "1z3fcfyvx1is30ami7bfmcq6xxfj0l8bymyc85k8rgzjfirqfcdd";
-       buildDepends = [
-         base blaze-html blaze-markup classy-prelude ihaskell
-       ];
-       jailbreak = true;
+       version = "0.3.0.0";
+       sha256 = "1il3iz1nksh5v753srvchrjdazf7dqsd3q59w7crzbyrlx81v97b";
+       buildDepends = [ base blaze-html blaze-markup ihaskell ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for blaze-html types";
        license = stdenv.lib.licenses.mit;
@@ -74490,15 +74518,15 @@ self: {
 
   "ihaskell-charts" = callPackage
     ({ mkDerivation, base, bytestring, Chart, Chart-cairo
-     , classy-prelude, data-default-class, directory, ihaskell
+     , data-default-class, directory, ihaskell
      }:
      mkDerivation {
        pname = "ihaskell-charts";
-       version = "0.2.1.0";
-       sha256 = "0gw737kg5sjmlf43b2wmnjq9k1p4mc5j4b5q50qa2q1n48lz8c0q";
+       version = "0.3.0.0";
+       sha256 = "0nlimyx953v1s4xgzdb9987i9bw1bdralkg2x6cp41kzqd49i4f3";
        buildDepends = [
-         base bytestring Chart Chart-cairo classy-prelude data-default-class
-         directory ihaskell
+         base bytestring Chart Chart-cairo data-default-class directory
+         ihaskell
        ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for charts types";
@@ -74507,16 +74535,16 @@ self: {
      }) {};
 
   "ihaskell-diagrams" = callPackage
-    ({ mkDerivation, active, base, bytestring, classy-prelude, diagrams
-     , diagrams-cairo, diagrams-lib, directory, ihaskell
+    ({ mkDerivation, active, base, bytestring, diagrams, diagrams-cairo
+     , diagrams-lib, directory, ihaskell, text
      }:
      mkDerivation {
        pname = "ihaskell-diagrams";
-       version = "0.2.2.0";
-       sha256 = "0nxspimzzz7pn7lbbgqfq3k83gp4kdxw3cj2c6dlzjvx1bhpqp74";
+       version = "0.3.0.0";
+       sha256 = "0w1jzsrn9lpgrwbr1wsy7kqvkdbq5v21fm67gxif0xrv6hgavzca";
        buildDepends = [
-         active base bytestring classy-prelude diagrams diagrams-cairo
-         diagrams-lib directory ihaskell
+         active base bytestring diagrams diagrams-cairo diagrams-lib
+         directory ihaskell text
        ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for diagram types";
@@ -74552,16 +74580,13 @@ self: {
      }) {};
 
   "ihaskell-juicypixels" = callPackage
-    ({ mkDerivation, base, bytestring, classy-prelude, directory
-     , ihaskell, JuicyPixels
+    ({ mkDerivation, base, bytestring, directory, ihaskell, JuicyPixels
      }:
      mkDerivation {
        pname = "ihaskell-juicypixels";
-       version = "0.2.2.0";
-       sha256 = "0c50xsdlmaq4fz92hicljjdpqwvsprw3a1z7fdfzwjdc25gkd2mr";
-       buildDepends = [
-         base bytestring classy-prelude directory ihaskell JuicyPixels
-       ];
+       version = "0.3.0.0";
+       sha256 = "0apsll540z4hzzs39bqk14iadnr4rjp873q712la7lp2xnyf4k0y";
+       buildDepends = [ base bytestring directory ihaskell JuicyPixels ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package";
        license = stdenv.lib.licenses.mit;
@@ -74569,19 +74594,17 @@ self: {
      }) {};
 
   "ihaskell-magic" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring
-     , classy-prelude, ihaskell, ipython-kernel, magic, text
-     , utf8-string
+    ({ mkDerivation, base, base64-bytestring, bytestring, ihaskell
+     , ipython-kernel, magic, text, utf8-string
      }:
      mkDerivation {
        pname = "ihaskell-magic";
-       version = "0.2.0.0";
-       sha256 = "0kmvhxc9bw7zg16m9pcs5ck3akc0fwnz3w6mmzj7dkc7avafmwcg";
+       version = "0.3.0.0";
+       sha256 = "05jvyca163daqrmpb7fhk1wng04vk4bayffp0lp68sy3zskrjndl";
        buildDepends = [
-         base base64-bytestring bytestring classy-prelude ihaskell
-         ipython-kernel magic text utf8-string
+         base base64-bytestring bytestring ihaskell ipython-kernel magic
+         text utf8-string
        ];
-       jailbreak = true;
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for bytestrings";
        license = stdenv.lib.licenses.mit;
@@ -74589,16 +74612,15 @@ self: {
      }) {};
 
   "ihaskell-parsec" = callPackage
-    ({ mkDerivation, aeson, base, classy-prelude, here, ihaskell
-     , parsec, random, unordered-containers
+    ({ mkDerivation, aeson, base, here, ihaskell, parsec, random, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "ihaskell-parsec";
-       version = "0.2.1.0";
-       sha256 = "1fxwv7z5ypim4cqb0sfba36g8gmk57blp6pcmgrikpdzjpyjmmzl";
+       version = "0.3.0.0";
+       sha256 = "0n1awvn81228cci1q1rvy7p91zfl29byp5imkiwqbxswzz5sq8n4";
        buildDepends = [
-         aeson base classy-prelude here ihaskell parsec random
-         unordered-containers
+         aeson base here ihaskell parsec random text unordered-containers
        ];
        jailbreak = true;
        homepage = "http://www.github.com/gibiansky/ihaskell";
@@ -74608,13 +74630,12 @@ self: {
      }) {};
 
   "ihaskell-plot" = callPackage
-    ({ mkDerivation, base, bytestring, classy-prelude, ihaskell, plot
-     }:
+    ({ mkDerivation, base, bytestring, ihaskell, plot }:
      mkDerivation {
        pname = "ihaskell-plot";
-       version = "0.2.0.0";
-       sha256 = "18ghf6fscqqbk3rag1g9rz3knm39r7i4mhj8sxmj195skrmkydpc";
-       buildDepends = [ base bytestring classy-prelude ihaskell plot ];
+       version = "0.3.0.0";
+       sha256 = "17qp2ln9v4sv9i3biyxgyq0csqikxwm5gs612fn5zsl1ixznj1h1";
+       buildDepends = [ base bytestring ihaskell plot ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instance for Plot (from plot package)";
        license = stdenv.lib.licenses.mit;
@@ -74628,8 +74649,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-rlangqq";
-       version = "0.2.2.0";
-       sha256 = "1kjp7nmmwjh4wc2b5xqw5f8hg9jq3a8p6rdxcd61qp2iizm4r372";
+       version = "0.3.0.0";
+       sha256 = "1w2ywl3m122d56cvgnhll6dpjw03y2jy3nc8v325291zhknrziaj";
        buildDepends = [
          base base64-bytestring blaze-html bytestring directory filepath
          ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat
@@ -76097,15 +76118,15 @@ self: {
      }) {};
 
   "ip-quoter" = callPackage
-    ({ mkDerivation, base, network, cpu, tasty, tasty-hunit
+    ({ mkDerivation, base, cpu, network, tasty, tasty-hunit
      , template-haskell
      }:
      mkDerivation {
        pname = "ip-quoter";
        version = "1.0.1.1";
        sha256 = "1819742yjdl96k2z8s55a5x9xw9mg4lps1dq1f55zvc31afkdi4l";
-       buildDepends = [ base network cpu template-haskell ];
-       testDepends = [ base network tasty tasty-hunit cpu ];
+       buildDepends = [ base cpu network template-haskell ];
+       testDepends = [ base cpu network tasty tasty-hunit ];
        homepage = "https://github.com/shlevy/ip-quoter";
        description = "Quasiquoter for IP addresses";
        license = stdenv.lib.licenses.mit;
@@ -77819,12 +77840,11 @@ self: {
      }:
      mkDerivation {
        pname = "json-assertions";
-       version = "1.0.5";
-       sha256 = "1vf6y8xbl48giq1p6d62294rfvfdw62l1q4dspy990ii0v5gkyck";
+       version = "1.0.6";
+       sha256 = "00bjmbx4rbbijdhcpbnbjilfm030ml2lpvsf4c89vx1fyzin1nrj";
        buildDepends = [
          aeson base indexed indexed-free lens lens-aeson text
        ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/json-assertions.git";
        description = "Test that your (Aeson) JSON encoding matches your expectations";
        license = stdenv.lib.licenses.bsd3;
@@ -77838,8 +77858,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-autotype";
-       version = "1.0.2";
-       sha256 = "00s25fy0w00sbxlgl04jfzipm419dl48mryv7k8pg91nks3vfvdw";
+       version = "1.0.6";
+       sha256 = "1s8zizl0mxc4vy1s050sgfv8abzq8qp844ih5xywn2wccp090gc7";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -77852,7 +77872,6 @@ self: {
          hashable hflags lens mtl pretty process QuickCheck scientific
          smallcheck text uniplate unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/mgajda/json-autotype";
        description = "Automatic type declaration for JSON input data";
        license = stdenv.lib.licenses.bsd3;
@@ -79683,8 +79702,8 @@ self: {
      }:
      mkDerivation {
        pname = "laika";
-       version = "0.1.3";
-       sha256 = "1j9f76sch91igpgarw7pwzhymd6ji7wnwr9l8riallglphc55g7l";
+       version = "0.1.3.1";
+       sha256 = "0brysrzz0cci6hqm5ldl7fk5zqhcjp7naifabks1zk3mzg8kr1x1";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -81172,8 +81191,8 @@ self: {
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "lazy-csv";
-       version = "0.5";
-       sha256 = "0xm5j3why2wfajcn7r8my63ranq2mm7jlj15dj153n2izgvd1dh0";
+       version = "0.5.1";
+       sha256 = "17v495xnv38bx9zfjfa8dl3prj94lg74dhn1jzqrjq488gfwp2w8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base bytestring ];
@@ -83605,15 +83624,14 @@ self: {
      }:
      mkDerivation {
        pname = "list-t-attoparsec";
-       version = "0.4.0.1";
-       sha256 = "0qxxs1hw4bimssjds2xh70mnwdc68zii5dm5klsml3kjynwi1nj3";
+       version = "0.4.0.2";
+       sha256 = "02sr57qpw8r38s9hb0wj0pik7x4rqgs51hl4s1mmnihgdflm0jb1";
        buildDepends = [
          attoparsec base-prelude either list-t text transformers
        ];
        testDepends = [
          attoparsec base-prelude either hspec list-t list-t-text text
        ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/list-t-attoparsec";
        description = "An \"attoparsec\" adapter for \"list-t\"";
        license = stdenv.lib.licenses.mit;
@@ -85356,6 +85374,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mac" = callPackage
+    ({ mkDerivation, base, network, transformers }:
+     mkDerivation {
+       pname = "mac";
+       version = "0.1.0.0";
+       sha256 = "1ym5hk774y65mjxhp1vwa40ji2yjf4abqrpf3v9dknc28r64v8bi";
+       buildDepends = [ base network transformers ];
+       description = "Static Mandatory Access Control in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "maccatcher" = callPackage
     ({ mkDerivation, base, binary, parsec, process }:
      mkDerivation {
@@ -86214,8 +86243,8 @@ self: {
      }:
      mkDerivation {
        pname = "mangopay";
-       version = "1.11.1";
-       sha256 = "0yiy432i4pbq4wd2p52f060qb9wbqqfrw4fv6li0w3ls668pc6pc";
+       version = "1.11.2";
+       sha256 = "06f1gj877cnhjp5dh4gxza9vr6x3l2c3ppschdhkyj1ly65q3z5q";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -86234,7 +86263,6 @@ self: {
          template-haskell text time tls transformers transformers-base
          unordered-containers utf8-string vector wai warp x509-system
        ];
-       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Bindings to the MangoPay API";
        license = stdenv.lib.licenses.bsd3;
@@ -86717,8 +86745,8 @@ self: {
      }:
      mkDerivation {
        pname = "matrices";
-       version = "0.4.1";
-       sha256 = "16xx6cdz90an0ifpvkpmchiqhijgxmi1cn5qq4171jhi87sswm7z";
+       version = "0.4.2";
+       sha256 = "1mcv3ihaf15biai6m98jfgv31whgmwbzgagxyj3bfpnilslp98l6";
        buildDepends = [ base primitive vector ];
        testDepends = [ base tasty tasty-hunit tasty-quickcheck vector ];
        description = "native matrix based on vector";
@@ -86859,6 +86887,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "maybe-justify" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "maybe-justify";
+       version = "0.1.0.0";
+       sha256 = "0zgc3niz0vz4b3xcxj6s4fpxzizgkimllyd0r6vcafbl9ffv2a38";
+       buildDepends = [ base ];
+       testDepends = [ base tasty tasty-hunit ];
+       description = "Simple higher order function for Maybe";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "maybench" = callPackage
     ({ mkDerivation, base, benchpress, Cabal, directory, filepath, mtl
      , old-time, process, time
@@ -92165,8 +92205,8 @@ self: {
      }:
      mkDerivation {
        pname = "neet";
-       version = "0.2.0.0";
-       sha256 = "1gcg172ghdqnrazx4zwy05jpm6vy5li49v42rwdcjggyx6nc0mhi";
+       version = "0.3.0.0";
+       sha256 = "1zbpnm0hlcga54x9jbxg748my9s1k2nj97p4haq6pkhbayskz1zi";
        buildDepends = [
          base cereal containers graphviz MonadRandom multimap parallel
          random transformers
@@ -92888,10 +92928,9 @@ self: {
     ({ mkDerivation, base, bytestring, network, text, time, vector }:
      mkDerivation {
        pname = "network-carbon";
-       version = "1.0.2";
-       sha256 = "0r9riydwvmn8v9iih475agl4idb3z6v3djmn3pjlda28g3p0zw9h";
+       version = "1.0.3";
+       sha256 = "0wk3rds1d2c6nr9gdz9qgpqhmkqkdkk0rqxzj3rznv0n9m9sylcr";
        buildDepends = [ base bytestring network text time vector ];
-       jailbreak = true;
        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;
@@ -94295,8 +94334,8 @@ self: {
      }:
      mkDerivation {
        pname = "nsis";
-       version = "0.2.5";
-       sha256 = "1lbd1yx2yr96mv58jk3d9qpxpvc9nqkgvi62z4jahwv6wz5wap61";
+       version = "0.3";
+       sha256 = "0w7mip0dxpzdfdxj8gdk58zfz5n4aasd60ql546hx3yv5r65dbq3";
        buildDepends = [ base transformers uniplate ];
        testDepends = [ base directory process transformers uniplate ];
        homepage = "https://github.com/ndmitchell/nsis#readme";
@@ -95901,13 +95940,12 @@ self: {
      }) {};
 
   "optparse-declarative" = callPackage
-    ({ mkDerivation, base, bytestring, fast-logger, monad-logger, mtl
-     }:
+    ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "optparse-declarative";
-       version = "0.2.0";
-       sha256 = "189fh9f2k2bzjl0c4mxhg23m87fhmnmszl2qym6ni2npb58df0qa";
-       buildDepends = [ base bytestring fast-logger monad-logger mtl ];
+       version = "0.3.0";
+       sha256 = "1avy0g6jk34jbfp1xzqcyhb4j53knsbzx1pssl4b5f6nn981mbj8";
+       buildDepends = [ base mtl ];
        homepage = "https://github.com/tanakh/optparse-declarative";
        description = "Declarative command line option parser";
        license = stdenv.lib.licenses.mit;
@@ -100629,14 +100667,13 @@ self: {
      }) {};
 
   "polysoup" = callPackage
-    ({ mkDerivation, base, containers, polyparse, tagsoup }:
+    ({ mkDerivation, base, containers, deepseq, polyparse, tagsoup }:
      mkDerivation {
        pname = "polysoup";
-       version = "0.5.2";
-       revision = "1";
-       sha256 = "13923ff6lzvl6j059gyhcb3cx27plkxgbyjr7skg9g5hxia5j73b";
-       editedCabalFile = "28bbd0ec4944d449118244081956e0d6d5b0c8c787cdb77509c028d3ee4c222f";
-       buildDepends = [ base containers polyparse tagsoup ];
+       version = "0.6";
+       sha256 = "1c7lmx7waj2p9gn9k0hsvnmzrxf3ryz5q7zr4770g3nj8yvbpyp2";
+       buildDepends = [ base containers deepseq polyparse tagsoup ];
+       jailbreak = true;
        homepage = "https://github.com/kawu/polysoup";
        description = "Online XML parsing with polyparse and tagsoup";
        license = stdenv.lib.licenses.bsd3;
@@ -101537,12 +101574,9 @@ self: {
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
        pname = "pqueue";
-       version = "1.2.1";
-       revision = "1";
-       sha256 = "1fily60f4njby7zknmik7a2wxsm3y77ckr69w9bb3fgq22gbzky6";
-       editedCabalFile = "ea1de2ab89c2b8b16eb189910b568409e2a5b4af283cf19e179a6fd95fe15fa3";
+       version = "1.3.0";
+       sha256 = "0nandznr9dmyvxxb4pfrcc21zyhbkn2q6ny0m60943kdmisf4401";
        buildDepends = [ base deepseq ];
-       jailbreak = true;
        description = "Reliable, persistent, fast priority queues";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106513,11 +106547,10 @@ self: {
      mkDerivation {
        pname = "regex-tdfa-text";
        version = "1.0.0.2";
-       revision = "1";
+       revision = "2";
        sha256 = "1p17xv3j2xd74iilyqwlqhkmyp26asq4k1pb0h2f0wdqqfr87bfd";
-       editedCabalFile = "e445c4a0ce6f4723af060b4ea64d4926c573f43fe41aad883bae464704720243";
+       editedCabalFile = "4b0e54f79540143c88adb071ea8e0aa3734a625db026a6a44ca2ef45b870b07c";
        buildDepends = [ array base regex-base regex-tdfa text ];
-       jailbreak = true;
        description = "Text interface for regex-tdfa";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112390,8 +112423,8 @@ self: {
      }:
      mkDerivation {
        pname = "serversession-backend-persistent";
-       version = "1.0";
-       sha256 = "1rcfff45qm8akjbby1j64lmc8gff96gzssk2jaw8x5k5nn2pdgq0";
+       version = "1.0.1";
+       sha256 = "0n4l2hgfzlg1ra4blq6dcp61mvcfm6k8cwafi6rrzid67amr022k";
        buildDepends = [
          aeson base base64-bytestring bytestring cereal path-pieces
          persistent serversession tagged text time transformers
@@ -112403,7 +112436,6 @@ self: {
          persistent-template QuickCheck resource-pool serversession text
          time transformers unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using persistent and an RDBMS";
        license = stdenv.lib.licenses.mit;
@@ -115353,13 +115385,12 @@ self: {
      }:
      mkDerivation {
        pname = "snap-cors";
-       version = "1.2.8";
-       sha256 = "1ycqfx4qv00cxjrddch1wxadrffq55zbv6bhcahan93wq3a5lb7w";
+       version = "1.2.9";
+       sha256 = "0s6bl9nldr96l0zjx1qh3zq9fs5wlrmagaalxsppjsln456gzjcd";
        buildDepends = [
          attoparsec base bytestring case-insensitive hashable network
          network-uri snap text transformers unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/snap-cors";
        description = "Add CORS headers to Snap applications";
        license = stdenv.lib.licenses.bsd3;
@@ -115388,13 +115419,12 @@ self: {
      }:
      mkDerivation {
        pname = "snap-error-collector";
-       version = "1.1.0";
-       sha256 = "06pqlv93qgibl5gbrp7p1vg6x421nrpkvhazbrcipdpbawrsgaj2";
+       version = "1.1.1";
+       sha256 = "1b0wsbk01zjxqmilan94h0dprnvnq4j8rhair54ra2lzyqsbdbcx";
        buildDepends = [
          async base containers monad-loops MonadCatchIO-transformers snap
          stm time transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/snap-error-collector";
        description = "Collect errors in batches and dispatch them";
        license = stdenv.lib.licenses.bsd3;
@@ -118334,36 +118364,43 @@ self: {
      }) {};
 
   "stackage-curator" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, Cabal
+    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
+     , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal
      , classy-prelude-conduit, conduit, conduit-extra, containers
-     , data-default-class, directory, filepath, hspec, http-client
-     , http-client-tls, http-conduit, monad-unlift, mono-traversable
-     , mtl, old-locale, optparse-applicative, optparse-simple, process
-     , QuickCheck, semigroups, stackage-cli, stackage-types
-     , stackage-update, stm, streaming-commons, system-fileio
-     , system-filepath, tar, temporary, text, time, transformers
-     , unix-compat, utf8-string, xml-conduit, yaml, zlib
+     , cryptohash, cryptohash-conduit, data-default-class, directory
+     , filepath, hspec, html-conduit, http-client, http-client-tls
+     , http-conduit, mime-types, monad-unlift, mono-traversable, mtl
+     , old-locale, optparse-applicative, optparse-simple, process
+     , QuickCheck, resourcet, semigroups, stackage-cli, stackage-install
+     , stackage-metadata, stackage-types, stackage-update, stm
+     , streaming-commons, system-fileio, system-filepath, tar, temporary
+     , text, time, transformers, unix-compat, utf8-string, xml-conduit
+     , xml-types, yaml, zlib
      }:
      mkDerivation {
        pname = "stackage-curator";
-       version = "0.8.1";
-       sha256 = "1fjyh8lgkf4z36jwxy45rbl4sqzg7j51gaymrqig5c0434canyqc";
+       version = "0.9.0";
+       sha256 = "1mp05hv45nfysc43mdcjlhgpwkks4h533m5xf9h86xc1pmc563xf";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson async base bytestring Cabal classy-prelude-conduit conduit
-         conduit-extra containers data-default-class directory filepath
-         http-client http-client-tls http-conduit monad-unlift
-         mono-traversable mtl old-locale optparse-applicative
-         optparse-simple process semigroups stackage-cli stackage-types
-         stackage-update stm streaming-commons system-fileio system-filepath
-         tar temporary text time transformers unix-compat utf8-string
-         xml-conduit yaml zlib
+         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 filepath
+         html-conduit http-client http-client-tls http-conduit mime-types
+         monad-unlift mono-traversable mtl old-locale optparse-applicative
+         optparse-simple process resourcet semigroups stackage-cli
+         stackage-install stackage-metadata stackage-types stackage-update
+         stm streaming-commons system-fileio system-filepath tar temporary
+         text time transformers unix-compat utf8-string xml-conduit
+         xml-types yaml zlib
        ];
        testDepends = [
          base Cabal classy-prelude-conduit containers hspec http-client
          http-client-tls QuickCheck text yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/fpco/stackage";
        description = "Tools for curating Stackage bundles";
        license = stdenv.lib.licenses.mit;
@@ -120199,8 +120236,8 @@ self: {
      }:
      mkDerivation {
        pname = "stylish-haskell";
-       version = "0.5.14.0";
-       sha256 = "1z8fya123cldakf15fc4p9vp0gp9gxql4x7faz12gfp9d6ffj4f5";
+       version = "0.5.14.1";
+       sha256 = "055kvwf158m91kx2y3ysiqpjgf15w6r8ryzm4yj0jhy48ymgil5j";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -120212,7 +120249,6 @@ self: {
          haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
          yaml
        ];
-       jailbreak = true;
        homepage = "https://github.com/jaspervdj/stylish-haskell";
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
@@ -124483,22 +124519,6 @@ self: {
      }) {};
 
   "th-orphans" = callPackage
-    ({ mkDerivation, base, hspec, mtl, nats, template-haskell, th-lift
-     , th-reify-many
-     }:
-     mkDerivation {
-       pname = "th-orphans";
-       version = "0.11.1";
-       sha256 = "111ckvvicr953aqnnkn7rn089dprz57h95cg95rs7f1zz318h2xy";
-       buildDepends = [
-         base mtl nats template-haskell th-lift th-reify-many
-       ];
-       testDepends = [ base hspec template-haskell ];
-       description = "Orphan instances for TH datatypes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-orphans_0_12_1" = callPackage
     ({ mkDerivation, base, hspec, mtl, nats, template-haskell, th-lift
      , th-reify-many
      }:
@@ -130073,10 +130093,13 @@ self: {
      mkDerivation {
        pname = "urlencoded";
        version = "0.4.0";
+       revision = "1";
        sha256 = "0idh70apfxx8bkbsxda4xhb0b5xf4x237dwi4v55ildrhxx4b68k";
+       editedCabalFile = "50c264958ee35f9fedb8b5e7e9640cb46d802b8f64dacc48802993e280c806a9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base mtl network split ];
+       jailbreak = true;
        homepage = "https://github.com/pheaver/urlencoded";
        description = "Generate or process x-www-urlencoded data";
        license = stdenv.lib.licenses.bsd3;
@@ -138192,8 +138215,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-mangopay";
-       version = "1.11.1";
-       sha256 = "0haz7zd9s9c12fcz11wkhw50hni08g2an1f65bd6cj871zzz3mnl";
+       version = "1.11.2";
+       sha256 = "1jyn38q0q4s4lrnw93yzvnn49js4jf6zhq8wb7whyxks1jbkjxbv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -138205,7 +138228,6 @@ self: {
          wai-logger warp yaml yesod yesod-auth yesod-core yesod-form
          yesod-persistent yesod-static
        ];
-       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Yesod library for MangoPay API access";
        license = stdenv.lib.licenses.bsd3;

From 160e342dbd11e8b53f8793c46db99abd0ec8a442 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 25 Jun 2015 12:19:58 +0200
Subject: [PATCH 1583/2322] python-args: drop bogus reference to
 "stdenv.lib.licenses.bsd"

---
 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 3d121874e18..adfb1f48fa9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -583,7 +583,6 @@ let
     meta = {
       description = "Command Arguments for Humans";
       homepage = "https://github.com/kennethreitz/args";
-      license = stdenv.lib.licenses.bsd;
     };
   };
 

From ec08cb90367b276432f7c90d30365c4d2208d31e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 25 Jun 2015 14:05:56 +0200
Subject: [PATCH 1584/2322] haskell-stack: disable failing test suite

Works around https://github.com/commercialhaskell/stack/issues/408 and
https://github.com/commercialhaskell/stack/issues/409. Closes
https://github.com/NixOS/nixpkgs/pull/8497.
---
 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 50bf89c3001..4954e5b01c9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -880,4 +880,8 @@ self: super: {
   wai-session = markBroken super.wai-session;
   serversession-frontend-wai = dontDistribute super.serversession-frontend-wai;
 
+  # https://github.com/commercialhaskell/stack/issues/408
+  # https://github.com/commercialhaskell/stack/issues/409
+  stack = overrideCabal super.stack (drv: { preCheck = "export HOME=$TMPDIR"; doCheck = false; });
+
 }

From 4bc436ca3ab84867edebbdfb843c4a3f27cb199c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 25 Jun 2015 15:07:05 +0200
Subject: [PATCH 1585/2322] libusb1: fix .la file

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

diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 884db2b3b25..160e53714fb 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
+  preFixup = ''
+    sed 's,-ludev,-L${udev}/lib -ludev,' -i $out/lib/libusb-1.0.la
+  '';
+
   meta = {
     homepage = http://www.libusb.info;
     description = "User-space USB library";

From 1baf402f8a3022b13f6082e270593b3e4b6a11c5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 25 Jun 2015 15:07:16 +0200
Subject: [PATCH 1586/2322] gtk-vnc: fix .la file

---
 pkgs/tools/admin/gtk-vnc/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index 15cb56926a8..fddb9505c98 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -29,6 +29,11 @@ stdenv.mkDerivation rec {
   makeFlags = stdenv.lib.optionalString (!enableGTK3)
     "CODEGENDIR=${pygobject}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/";
 
+  # Fix broken .la files
+  preFixup = ''
+    sed 's,-lgpg-error,-L${libgpgerror}/lib -lgpg-error,' -i $out/lib/*.la
+  '';
+
   meta = with stdenv.lib; {
     description = "A GTK VNC widget";
     maintainers = with maintainers; [ raskin offline ];

From d405d036c53ce4bccfd06f47b824604746b38919 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 25 Jun 2015 15:24:57 +0200
Subject: [PATCH 1587/2322] redmine service: fixing a typo, pointing to bundler
 package

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

diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix
index 059cc18733b..eb6575887d5 100644
--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixos/modules/services/misc/redmine.nix
@@ -154,7 +154,7 @@ in {
       environment.HOME = "${pkgs.redmine}/share/redmine";
       environment.REDMINE_LANG = "en";
       environment.GEM_HOME = "${pkgs.redmine}/share/redmine/vendor/bundle/ruby/1.9.1";
-      environment.GEM_PATH = "${bundler}/${bundler.ruby.gemPath}";
+      environment.GEM_PATH = "${pkgs.bundler}/${pkgs.bundler.ruby.gemPath}";
       path = with pkgs; [
         imagemagickBig
         subversion

From fad9d34452648e666ffe45e9056fb185bba0bd58 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Thu, 25 Jun 2015 13:45:42 +0200
Subject: [PATCH 1588/2322] Add j2cli package, a shell script templating helper

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index adfb1f48fa9..f6aa638ef22 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6496,6 +6496,34 @@ let
     };
   };
 
+  j2cli = buildPythonPackage rec {
+    name = "j2cli-${version}";
+    version = "0.3.1-0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/j/j2cli/${name}.tar.gz";
+      sha256 = "0y3w1x9935qzx8w6m2r6g4ghyjmxn33wryiif6xb56q7cj9w1433";
+    };
+
+    disabled = ! (isPy26 || isPy27);
+
+    buildInputs = [ self.nose ];
+
+    propagatedBuildInputs = with self; [ jinja2 pyyaml ];
+
+    meta = {
+      homepage = https://github.com/kolypto/j2cli;
+      description = "Jinja2 Command-Line Tool";
+      license = licenses.bsd3;
+      longDescription = ''
+        J2Cli is a command-line tool for templating in shell-scripts,
+        leveraging the Jinja2 library.
+      '';
+      platforms = platforms.all;
+      maintainers = with maintainers; [ rushmorem ];
+    };
+  };
+
   jinja2 = buildPythonPackage rec {
     name = "Jinja2-2.7.3";
 

From e7d10c4190096ddf0551a5ab82533aac574d12cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 25 Jun 2015 15:39:38 +0200
Subject: [PATCH 1589/2322] Updating podofo to 0.9.3.

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

diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 2a35fbd7515..0b67ce16331 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -2,11 +2,11 @@
 , openssl, libpng, lua5 }:
 
 stdenv.mkDerivation rec {
-  name = "podofo-0.9.2";
+  name = "podofo-0.9.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/podofo/${name}.tar.gz";
-    sha256 = "1wx3s0718rmhdzdwyi8hgpf2s92sk3hijy8f4glrmnjpiihr2la6";
+    sha256 = "1n12lbq9x15vqn7dc0hsccp56l5jdff1xrhvlfqlbklxx0qiw9pc";
   };
 
   propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];

From 662a94312de8af4a77be5958cc94bb9fa3b157ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 25 Jun 2015 15:43:08 +0200
Subject: [PATCH 1590/2322] Fix python-json-pointer meta.

(cherry picked from commit f1f5441b50ea5ebf8df275bc76aef16f5e33d817)
---
 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 adfb1f48fa9..f315b2e24ab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3512,8 +3512,8 @@ let
     };
 
     meta = {
-      description = "Library to apply JSON Patches according to RFC 6902";
-      homepage = "https://github.com/stefankoegl/python-json-patch";
+      description = "Resolve JSON Pointers in Python";
+      homepage = "https://github.com/stefankoegl/python-json-pointer";
       license = stdenv.lib.licenses.bsd2; # "Modified BSD licence, says pypi"
     };
   };

From 0aa8e649673d802f8c315b88254812bf826ec672 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 15 Jun 2015 10:50:39 -0500
Subject: [PATCH 1591/2322] kde5: JSON manifest format

---
 .../services/x11/desktop-managers/kde5.nix    |    6 +-
 pkgs/applications/kde-apps-15.04/default.nix  |  656 +-
 .../kde-apps-15.04/dependencies.nix           | 1812 ----
 .../kde-apps-15.04/dependencies.sh            |   12 -
 .../kde-apps-15.04/kf5-renames.json           |   70 +
 pkgs/applications/kde-apps-15.04/manifest.nix | 8158 -----------------
 pkgs/applications/kde-apps-15.04/manifest.sh  |   20 -
 .../applications/kde-apps-15.04/packages.json | 5693 ++++++++++++
 pkgs/applications/kde-apps-15.04/packages.sh  |   22 +
 .../kde-apps-15.04/plasma5-renames.json       |   20 +
 pkgs/applications/kde-apps-15.04/renames.json |   31 +
 pkgs/applications/kde-apps-15.04/renames.nix  |   34 -
 pkgs/build-support/autonix/default.nix        |  100 +-
 pkgs/build-support/autonix/manifest.sh        |   35 +-
 pkgs/desktops/plasma-5.3/default.nix          |  329 +-
 pkgs/desktops/plasma-5.3/dependencies.nix     |  300 -
 pkgs/desktops/plasma-5.3/dependencies.sh      |   22 -
 pkgs/desktops/plasma-5.3/kf5-renames.json     |   70 +
 pkgs/desktops/plasma-5.3/manifest.nix         |  328 -
 pkgs/desktops/plasma-5.3/packages.json        | 1358 +++
 pkgs/desktops/plasma-5.3/packages.sh          |   22 +
 pkgs/desktops/plasma-5.3/renames.json         |   20 +
 pkgs/desktops/plasma-5.3/renames.nix          |   23 -
 .../libraries/kde-frameworks-5.10/default.nix |  331 +-
 .../kde-frameworks-5.10/dependencies.nix      |  524 --
 .../kde-frameworks-5.10/manifest.nix          | 1174 ---
 .../libraries/kde-frameworks-5.10/manifest.sh |   18 -
 .../kde-frameworks-5.10/packages.json         | 2090 +++++
 .../libraries/kde-frameworks-5.10/packages.sh |   22 +
 .../kde-frameworks-5.10/renames.json          |   70 +
 .../libraries/kde-frameworks-5.10/renames.nix |   72 -
 pkgs/top-level/all-packages.nix               |    5 +-
 32 files changed, 10273 insertions(+), 13174 deletions(-)
 delete mode 100644 pkgs/applications/kde-apps-15.04/dependencies.nix
 delete mode 100755 pkgs/applications/kde-apps-15.04/dependencies.sh
 create mode 100644 pkgs/applications/kde-apps-15.04/kf5-renames.json
 delete mode 100644 pkgs/applications/kde-apps-15.04/manifest.nix
 delete mode 100755 pkgs/applications/kde-apps-15.04/manifest.sh
 create mode 100644 pkgs/applications/kde-apps-15.04/packages.json
 create mode 100755 pkgs/applications/kde-apps-15.04/packages.sh
 create mode 100644 pkgs/applications/kde-apps-15.04/plasma5-renames.json
 create mode 100644 pkgs/applications/kde-apps-15.04/renames.json
 delete mode 100644 pkgs/applications/kde-apps-15.04/renames.nix
 delete mode 100644 pkgs/desktops/plasma-5.3/dependencies.nix
 delete mode 100755 pkgs/desktops/plasma-5.3/dependencies.sh
 create mode 100644 pkgs/desktops/plasma-5.3/kf5-renames.json
 delete mode 100644 pkgs/desktops/plasma-5.3/manifest.nix
 create mode 100644 pkgs/desktops/plasma-5.3/packages.json
 create mode 100755 pkgs/desktops/plasma-5.3/packages.sh
 create mode 100644 pkgs/desktops/plasma-5.3/renames.json
 delete mode 100644 pkgs/desktops/plasma-5.3/renames.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/dependencies.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/manifest.nix
 delete mode 100755 pkgs/development/libraries/kde-frameworks-5.10/manifest.sh
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.10/packages.json
 create mode 100755 pkgs/development/libraries/kde-frameworks-5.10/packages.sh
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.10/renames.json
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.10/renames.nix

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 7c8cd8aeb85..5061d59b7c7 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -35,11 +35,11 @@ let
   phononBackendPackages = flip concatMap cfg.phononBackends
     (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends);
 
-  kf5 = plasma5.kf5;
+  kf5 = pkgs.kf5_stable;
 
-  plasma5 = pkgs.plasma5_stable;
+  plasma5 = pkgs.plasma5_stable.override { inherit kf5; };
 
-  kdeApps = pkgs.kdeApps_stable;
+  kdeApps = pkgs.kdeApps_stable.override { inherit kf5; };
 
 in
 
diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 91583d75ead..e325c5ccfc2 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -12,9 +12,11 @@
 #  make a copy of this directory first. After copying, be sure to delete ./tmp
 #  if it exists. Then follow the minor update instructions.
 
-{ autonix, symlinkJoin, kde4, kf5, pkgs, qt4, qt5, stdenv, callPackage, debug ? false }:
+{ autonix, symlinkJoin, kde4, kf5, pkgs, qt4, qt5, stdenv, newScope, debug ? false }:
 
-with stdenv.lib; with autonix;
+with autonix;
+
+let inherit (stdenv) lib; in
 
 let kf5Orig = kf5; in
 
@@ -22,406 +24,378 @@ let
 
   kf5 = kf5Orig.override { inherit debug qt5; };
 
-  mirror = "mirror://kde";
-
-  renames =
-    (builtins.removeAttrs
-      (import ./renames.nix {})
-      ["Backend" "CTest"])
-    // {
-      "KDE4" = "kdelibs";
-      "KF5KDEGames" = "libkdegames";
-      "Kexiv2" = "libkexiv2";
-      "Kdcraw" = "libkdcraw";
-      "Kipi" = "libkipi";
-      "LibKonq" = "kde-baseapps";
-      "Marble" = "marble";
+  kdePackage = pkg:
+    (kf5.kdePackage pkg).override {
+      inherit (stdenv) mkDerivation;
+      inherit scope;
     };
 
-  mkDerivation = drv: kf5.mkDerivation (drv // {
-    preHook = (drv.preHook or "") + ''
-      addQt4Plugins() {
-        if [[ -d "$1/lib/qt4/plugins" ]]; then
-            propagatedUserEnvPkgs+=" $1"
-        fi
+  kdeOrL10nPackage = name: pkg:
+    assert (builtins.isAttrs pkg);
+    if lib.hasPrefix "kde-l10n" pkg.name
+      then l10nPackage name pkg
+    else kdePackage name pkg;
 
-        if [[ -d "$1/lib/kde4/plugins" ]]; then
-            propagatedUserEnvPkgs+=" $1"
-        fi
-      }
+  kdePackage = name: pkg:
+    let defaultOverride = drv: drv // {
+          setupHook = ./setup-hook.sh;
+          cmakeFlags =
+            (drv.cmakeFlags or [])
+            ++ [ "-DBUILD_TESTING=OFF" ]
+            ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+          meta = {
+            license = with stdenv.lib.licenses; [
+              lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+            ];
+            platforms = stdenv.lib.platforms.linux;
+            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+            homepage = "http://www.kde.org";
+          };
+        };
+        callPackage = newScope {
+          inherit (stdenv) mkDerivation;
+          inherit (pkgs) fetchurl;
+          inherit scope;
+        };
+    in mkPackage callPackage defaultOverride name pkg;
 
-      envHooks+=(addQt4Plugins)
-    '';
-  });
+  l10nPackage = name: pkg:
+    let nameVersion = builtins.parseDrvName pkg.name;
+
+        pkgQt4 = pkg // {
+          name = "${nameVersion.name}-qt4-${nameVersion.version}";
+          buildInputs = [ "kdelibs" "qt4" ];
+          nativeBuildInputs = [ "cmake" "gettext" "perl" ];
+          propagatedBuildInputs = [];
+          propagatedNativeBuildInputs = [];
+          propagatedUserEnvPkgs = [];
+        };
+        drvQt4 = overrideDerivation (kdePackage name pkgQt4) (drv: {
+          preConfigure = (drv.preConfigure or "") + ''
+            cd 4/
+          '';
+        });
+
+        pkgQt5 = pkg // {
+          name = "${nameVersion.name}-qt5-${nameVersion.version}";
+          buildInputs = [ "kdoctools" "ki18n" ];
+          nativeBuildInputs = [ "cmake" "extra-cmake-modules" "gettext" "perl" ];
+          propagatedBuildInputs = [];
+          propagatedNativeBuildInputs = [];
+          propagatedUserEnvPkgs = [];
+        };
+        drvQt5 = overrideDerivation (kdePackage name pkgQt5) (drv: {
+          preConfigure = (drv.preConfigure or "") + ''
+            cd 5/
+          '';
+        });
+    in symlinkJoin pkg.name [ drvQt4 drvQt5 ];
+
+  super =
+    let json = builtins.fromJSON (builtins.readFile ./packages.json);
+        mirrorUrl = n: pkg: pkg // {
+          src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
+        };
+        renames =
+          (builtins.fromJSON (builtins.readFile ./kf5-renames.json))
+          // (builtins.fromJSON (builtins.readFile ./plasma5-renames.json))
+          // (builtins.fromJSON (builtins.readFile ./renames.json));
+        propagated = [ "extra-cmake-modules" ];
+        native = [
+          "bison"
+          "extra-cmake-modules"
+          "flex"
+          "kdoctools"
+          "ki18n"
+          "libxslt"
+          "perl"
+          "pythoninterp"
+        ];
+        user = [
+          "shareddesktopontologies"
+          "sharedmimeinfo"
+        ];
+    in lib.fold (f: attrs: f attrs) json [
+      (lib.mapAttrs kdeOrL10nPackage)
+      (userEnvDeps user)
+      (nativeDeps native)
+      (propagateDeps propagated)
+      (renameDeps renames)
+      (lib.mapAttrs mirrorUrl)
+    ];
+
+  overrideDerivation = pkg: f:
+    let mkDerivation = super: drv: super.mkDerivation (drv // f drv);
+    in pkg.override (super: super // { mkDerivation = mkDerivation super; });
 
   scope =
     # packages in this collection
-    (mapAttrs (dep: name: kdeApps."${name}") renames) //
+    self //
+    {
+      kf5kdegames = self.libkdegames;
+      libkonq = self.kde-baseapps;
+    } //
     # packages from KDE Frameworks 5
     kf5.scope //
+    # packages requiring same Qt 5
+    (with pkgs; {
+      accountsqt5 = accounts-qt.override { inherit qt5; };
+      dbusmenuqt = libdbusmenu_qt;
+      grantlee5 = grantlee5.override { inherit qt5; };
+      mlt = pkgs.mlt-qt5.override { inherit qt5; };
+      qca-qt5 = qca-qt5.override { inherit qt5; };
+      signonqt5 = signon.override { inherit qt5; };
+      telepathyqt5 = telepathy_qt5.override { inherit qt5; };
+    }) //
+    # packages from KDE 4
+    (with kde4; {
+      inherit akonadi baloo kactivities libkdegames libkmahjongg;
+      kde4 = self.kdelibs;
+    }) //
     # packages from nixpkgs
-    (with pkgs;
-      {
-        ACL = acl;
-        AccountsQt5 = accounts-qt.override { inherit qt5; };
-        Akonadi = kde4.akonadi;
-        Alsa = alsaLib;
-        Automoc4 = automoc4;
-        Avahi = avahi;
-        BISON = bison;
-        Baloo = kde4.baloo;
-        Boost = boost156;
-        CFitsio = cfitsio;
-        CUPS = cups;
-        Canberra = libcanberra;
-        Cdparanoia = cdparanoia;
-        DBusMenuQt = libdbusmenu_qt;
-        DjVuLibre = djvulibre;
-        ENCHANT = enchant;
-        EPub = ebook_tools;
-        Eigen2 = eigen2;
-        Eigen3 = eigen;
-        Exiv2 = exiv2;
-        FAM = fam;
-        FFmpeg = ffmpeg;
-        Flac = flac;
-        FLEX = flex;
-        Freetype = freetype;
-        GMP = gmp;
-        Gettext = gettext;
-        Gpgme = gpgme;
-        Gphoto2 = libgphoto2;
-        Grantlee = grantlee;
-        Grantlee5 = grantlee5;
-        GSL = gsl;
-        HUNSPELL = hunspell;
-        HUpnp = herqq;
-        INDI = indilib;
-        Intltool = intltool;
-        Jasper = jasper;
-        KActivities = kde4.kactivities;
-        KDEGames = kde4.libkdegames;
-        LCMS2 = lcms2;
-        Ldap = openldap;
-        LibAttica = attica;
-        LibGcrypt = libgcrypt;
-        LibKMahjongg = kde4.libkmahjongg;
-        LibSSH = libssh;
-        LibSpectre = libspectre;
-        LibVNCServer = libvncserver;
-        Libical = libical;
-        MusicBrainz3 = libmusicbrainz;
-        NetworkManager = networkmanager;
-        OggVorbis = libvorbis;
-        OpenAL = openal;
-        OpenEXR = openexr;
-        Poppler = poppler_qt4;
-        Prison = prison;
-        PulseAudio = libpulseaudio;
-        PythonLibrary = python;
-        Qalculate = libqalculate;
-        QCA2 = qca2;
-        Qca-qt5 = qca-qt5.override { inherit qt5; };
-        QImageBlitz = qimageblitz;
-        QJSON = qjson;
-        Qt4 = qt4;
-        Samba = samba;
-        Sasl2 = cyrus_sasl;
-        SharedDesktopOntologies = shared_desktop_ontologies;
-        SignOnQt5 = signon.override { inherit qt5; };
-        SndFile = libsndfile;
-        Speechd = speechd;
-        TIFF = libtiff;
-        Taglib = taglib;
-        TelepathyQt4 = telepathy_qt;
-        TelepathyQt5 = telepathy_qt5;
-        TunePimp = libtunepimp;
-        UDev = udev;
-        USB = libusb;
-        Xplanet = xplanet;
-        Xscreensaver = xscreensaver;
-        Xsltproc = libxslt;
-      }
-    );
+    (with pkgs; {
+      inherit acl attr automoc4 avahi bison cdparanoia cfitsio cups
+              djvulibre docbook_xml_dtd_42 docbook_xsl enchant eigen2
+              exiv2 fam ffmpeg flac flex freetype gmp gettext gpgme
+              grantlee gsl hunspell ilmbase intltool jasper lcms2
+              libgcrypt libraw libssh libspectre libvncserver libical
+              networkmanager openal opencv openexr phonon pkgconfig
+              polkit_qt4 prison python qca2 qimageblitz qjson qt4
+              samba saneBackends soprano
+              speechd strigi taglib udev xplanet xscreensaver xz;
+      alsa = alsaLib;
+      assuan = libassuan;
+      boost = boost156;
+      canberra = libcanberra;
+      epub = ebook_tools;
+      gphoto2 = libgphoto2;
+      hupnp = herqq;
+      indi = indilib;
+      ldap = openldap;
+      libattica = attica;
+      musicbrainz3 = libmusicbrainz;
+      oggvorbis = libvorbis;
+      poppler = poppler_qt4;
+      pulseaudio = libpulseaudio;
+      qalculate = libqalculate;
+      sasl2 = cyrus_sasl;
+      shareddesktopontologies = shared_desktop_ontologies;
+      sndfile = libsndfile;
+      tiff = libtiff;
+      telepathyqt4 = telepathy_qt;
+      tunepimp = libtunepimp;
+      usb = libusb;
+      xsltproc = libxslt;
+    });
 
-  qt5Only = tgt:
-    let qt4Deps = [ "KDE4" "Phonon" ];
-    in mapAttrs (name: if name == tgt then removePkgDeps qt4Deps else id);
+  self =
+    (builtins.removeAttrs super [ "artikulate" # build failure; wrong boost?
+      "kde-dev-scripts" "kde-dev-utils" # docbook errors
+      "kdewebdev" # unknown build failure
+    ]) // {
+      inherit kdePackage qt5 scope;
 
-  preResolve = super:
-    fold (f: x: f x) super
-      [
-        (qt5Only "kmix")
-        (userEnvPkg "SharedMimeInfo")
-        (userEnvPkg "SharedDesktopOntologies")
-        (blacklist ["artikulate"]) # build failure, wrong boost?
-        (blacklist ["kde-dev-scripts" "kde-dev-utils"]) # docbook errors
-        (blacklist ["kdewebdev"]) # unknown build failure
-      ];
-
-  l10nPkgQt4 = orig:
-    let drvName = builtins.parseDrvName orig.name; in
-    mkDerivation {
-      name = "${drvName.name}-qt4-${drvName.version}";
-      inherit (orig) src;
-      buildInputs = [ kdeApps.kdelibs ];
-      nativeBuildInputs = with pkgs; [ cmake gettext perl ];
-      preConfigure = ''
-        cd 4/
-      '';
-    };
-
-  l10nPkgQt5 = orig:
-    let drvName = builtins.parseDrvName orig.name; in
-    mkDerivation {
-      name = "${drvName.name}-qt5-${drvName.version}";
-      inherit (orig) src;
-      buildInputs = with kf5; [ kdoctools ki18n ];
-      nativeBuildInputs = with pkgs; [ cmake kf5.extra-cmake-modules gettext perl ];
-      preConfigure = ''
-        cd 5/
-      '';
-    };
-
-  l10nPkg = name: orig: symlinkJoin orig.name [(l10nPkgQt4 orig) (l10nPkgQt5 orig)];
-
-  removeL10nPkgs = filterAttrs (n: v: !(hasPrefix "kde-l10n") n);
-
-  postResolve = super:
-    (removeL10nPkgs super) // {
-
-      ark = with pkgs; super.ark // {
-        buildInputs = (super.ark.buildInputs or []) ++ [ makeWrapper ];
-        postInstall = ''
-          wrapProgram $out/bin/ark --prefix PATH : "${unzipNLS}/bin"
+      ark = overrideDerivation super.ark (drv: {
+        buildInputs = (drv.buildInputs or []) ++ [ pkgs.makeWrapper ];
+        # runtime dependency
+        postInstall = (drv.postInstall or "") + ''
+          wrapProgram $out/bin/ark --prefix PATH : "${pkgs.unzipNLS}/bin"
         '';
-      };
+      });
 
-      ffmpegthumbs = with pkgs; super.ffmpegthumbs // {
-        nativeBuildInputs = super.ffmpegthumbs.nativeBuildInputs ++ [pkgconfig];
-      };
+      ffmpegthumbs = overrideDerivation super.ffmpegthumbs (drv: {
+        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
+      });
 
-      kaccounts-providers = super.kaccounts-providers // {
-        buildInputs = super.kaccounts-providers.buildInputs
-          ++ (with pkgs; [ libaccounts-glib ]);
-        preConfigure = ''
-          ${super.kaccounts-providers.preConfigure or ""}
+      kaccounts-providers = overrideDerivation super.kaccounts-providers (drv: {
+        buildInputs = (drv.buildInputs or []) ++ [ pkgs.libaccounts-glib ];
+        # hard-coded install path
+        preConfigure = (drv.preConfigure or "") + ''
           substituteInPlace webkit-options/CMakeLists.txt \
-            --replace "/etc/signon-ui/webkit-options.d/" "$out/etc/signon-ui/webkit-options.d/"
+            --replace "/etc/signon-ui/webkit-options.d/" \
+                      "$out/etc/signon-ui/webkit-options.d/"
         '';
-      };
+      });
 
-      kalzium = with pkgs; super.kalzium // {
-        nativeBuildInputs = super.kalzium.nativeBuildInputs ++ [pkgconfig];
-      };
+      kalzium = overrideDerivation super.kalzium (drv: {
+        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
+      });
 
-      kate = super.kate // {
+      kate = overrideDerivation super.kate (drv: {
         buildInputs =
-          super.kate.buildInputs
+          (drv.buildInputs or [])
           ++ (with kf5; [ kconfig kguiaddons kiconthemes ki18n kinit kjobwidgets
                           kio kparts ktexteditor kwindowsystem kxmlgui ]);
-        nativeBuildInputs = super.kate.nativeBuildInputs ++ (with kf5; [ kdoctools ]);
-      };
+        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ ([ kf5.kdoctools ]);
+      });
 
-      kde-runtime = with pkgs; super.kde-runtime // {
-        buildInputs =
-          super.kde-runtime.buildInputs ++ [libcanberra];
-        nativeBuildInputs =
-          super.kde-runtime.nativeBuildInputs ++ [pkgconfig];
+      /*
+      kde-baseapps = overrideDerivation super.kde-baseapps (drv: {
+        buildInputs = (drv.buildInputs or []) ++ [ scope.qt4 ];
+      });
+      */
+
+      kde-runtime = overrideDerivation super.kde-runtime (drv: {
+        buildInputs = (drv.buildInputs or []) ++ [ scope.canberra ];
+        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
+        # cmake does not detect path to `ilmbase`
         NIX_CFLAGS_COMPILE =
-          (super.kde-runtime.NIX_CFLAGS_COMPILE or "")
-          + " -I${ilmbase}/include/OpenEXR";
+          (drv.NIX_CFLAGS_COMPILE or "") + " -I${scope.ilmbase}/include/OpenEXR";
+        # some components of this package have been replaced in other packages
         meta = { priority = 10; };
-      };
+      });
 
-      kde-workspace = with pkgs; super.kde-workspace // {
-        buildInputs = with xlibs;
-          super.kde-workspace.buildInputs
-          ++
-          [
-            libxkbfile libXcomposite xcbutilimage xcbutilkeysyms
-            xcbutilrenderutil
-          ];
-        nativeBuildInputs =
-          super.kde-workspace.nativeBuildInputs
-          ++ [ pkgconfig ];
-        meta = { priority = 10; };
-      };
-
-      kdelibs = with pkgs; super.kdelibs // {
+      kde-workspace = overrideDerivation super.kde-workspace (drv: {
         buildInputs =
-          super.kdelibs.buildInputs ++ [ attr libxslt polkit_qt4 xz ];
+          (drv.buildInputs or []) ++
+          (with pkgs.xlibs; [
+            libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil
+          ]);
+        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
+        # some components of this package have been replaced in other packages
+        meta = { priority = 10; };
+      });
 
-        nativeBuildInputs =
-          super.kdelibs.nativeBuildInputs ++ [ pkgconfig ];
+      kdelibs = overrideDerivation super.kdelibs (drv: {
+        buildInputs =
+          (drv.buildInputs or []) ++ (with scope; [ attr polkit_qt4 xsltproc xz ]);
 
-        NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
+
+        # cmake does not detect path to `ilmbase`
+        NIX_CFLAGS_COMPILE =
+          (drv.NIX_CFLAGS_COMPILE or "") + " -I${scope.ilmbase}/include/OpenEXR";
 
         propagatedBuildInputs =
-          super.kdelibs.propagatedBuildInputs ++ [ qt4 soprano phonon strigi ];
+          (drv.propagatedBuildInputs or [])
+          ++ (with scope; [ qt4 soprano phonon strigi ]);
 
         propagatedNativeBuildInputs =
-          super.kdelibs.propagatedNativeBuildInputs
-          ++ [ automoc4 cmake perl shared_mime_info ];
+          (drv.propagatedNativeBuildInputs or [])
+          ++ (with scope; [ automoc4 cmake perl sharedmimeinfo ]);
 
-        patches = [ ./kdelibs/polkit-install.patch ];
+        patches = (drv.patches or []) ++ [ ./kdelibs/polkit-install.patch ];
 
-        cmakeFlags = [
-          "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
-          "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
+        cmakeFlags = (drv.cmakeFlags or []) ++ [
+          "-DDOCBOOKXML_CURRENTDTD_DIR=${scope.docbook_xml_dtd_42}/xml/dtd/docbook"
+          "-DDOCBOOKXSL_DIR=${scope.docbook_xsl}/xml/xsl/docbook"
           "-DHUPNP_ENABLED=ON"
           "-DWITH_SOLID_UDISKS2=ON"
           "-DKDE_DEFAULT_HOME=.kde"
         ];
-      };
+      });
 
-      kdenlive =
-        let mlt = pkgs.mlt-qt5.override { inherit qt5; };
-        in super.kdenlive // {
-          buildInputs = super.kdenlive.buildInputs ++ [ mlt ];
-        };
+      kdenlive = overrideDerivation super.kdenlive (drv: {
+        buildInputs = (drv.buildInputs or []) ++ [ scope.mlt ];
+      });
 
-      kdepim = with pkgs; super.kdepim // {
+      kdepim = overrideDerivation super.kdepim (drv: {
+        buildInputs = (drv.buildInputs or []) ++ (with scope; [ gpgme assuan ]);
+        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
+      });
+
+      kdepimlibs = overrideDerivation super.kdepimlibs (drv: {
+        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
+      });
+
+      kdesdk-thumbnailers = overrideDerivation super.kdesdk-thumbnailers (drv: {
+        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.gettext ];
+      });
+
+      kgpg = overrideDerivation super.kgpg (drv: {
+        buildInputs = (drv.buildInputs or []) ++ [ scope.boost ];
+      });
+
+      khangman = overrideDerivation super.khangman (drv: {
+        buildInputs = (drv.buildInputs or []) ++ [ kf5.kio ];
+      });
+
+      kmix = overrideDerivation super.kmix (drv: {
+        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
+        cmakeFlags = (drv.cmakeFlags or []) ++ [ "-DKMIX_KF5_BUILD=ON" ];
+      });
+
+      kmousetool = overrideDerivation super.kmousetool (drv: {
+        buildInputs = (drv.buildInputs or []) ++ (with pkgs.xlibs; [ libXtst libXt ]);
+      });
+
+      kremotecontrol = overrideDerivation super.kremotecontrol (drv: {
+        buildInputs = (drv.buildInputs or []) ++ [ pkgs.xlibs.libXtst ];
+      });
+
+      krfb = overrideDerivation super.krfb (drv: {
         buildInputs =
-          super.kdepim.buildInputs ++ [ gpgme libassuan ];
-        nativeBuildInputs =
-          super.kdepim.nativeBuildInputs ++ [ pkgconfig ];
-      };
+          (drv.buildInputs or [])
+          ++ [ pkgs.xlibs.libXtst scope.ktp-common-internals ];
+      });
 
-      kdepimlibs = with pkgs; super.kdepimlibs // {
-        nativeBuildInputs =
-          super.kdepimlibs.nativeBuildInputs ++ [ pkgconfig ];
-      };
+      kstars = overrideDerivation super.kstars (drv: {
+        buildInputs = (drv.buildInputs or []) ++ (with scope; [ kparts cfitsio ]);
+      });
 
-      kdesdk-thumbnailers = with pkgs; super.kdesdk-thumbnailers // {
-        nativeBuildInputs =
-          super.kdesdk-thumbnailers.nativeBuildInputs
-          ++ [gettext];
-      };
+      ktp-accounts-kcm = overrideDerivation super.ktp-accounts-kcm (drv: {
+        buildInputs = (drv.buildInputs or []) ++ [ pkgs.libaccounts-glib ];
+      });
 
-      kgpg = with pkgs; super.kgpg // {
-        buildInputs = super.kgpg.buildInputs ++ [boost];
-      };
-
-      khangman = super.khangman // {
+      ktp-common-internals = overrideDerivation super.ktp-common-internals (drv: {
         buildInputs =
-          super.khangman.buildInputs
-          ++ [ kf5.kio ];
-      };
-
-      kmix = with pkgs; super.kmix // {
-        nativeBuildInputs = super.kmix.nativeBuildInputs ++ [pkgconfig];
-        cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ];
-      };
-
-      kmousetool = with pkgs; super.kmousetool // {
-        buildInputs = with xlibs;
-          super.kmousetool.buildInputs
-          ++ [libXtst libXt];
-      };
-
-      kremotecontrol = with pkgs; super.kremotecontrol // {
-        buildInputs = super.kremotecontrol.buildInputs ++ [xlibs.libXtst];
-      };
-
-      krfb = super.krfb // {
-        buildInputs =
-          super.krfb.buildInputs
-          ++ [pkgs.xlibs.libXtst kdeApps.ktp-common-internals];
-      };
-
-      kstars = super.kstars // {
-        buildInputs =
-          super.kstars.buildInputs
-          ++ (with kf5; [ kparts ])
-          ++ [ pkgs.cfitsio ];
-      };
-
-      ktp-accounts-kcm = super.ktp-accounts-kcm // {
-        buildInputs =
-          super.ktp-accounts-kcm.buildInputs
-          ++ [ pkgs.libaccounts-glib ];
-      };
-
-      ktp-common-internals = super.ktp-common-internals // {
-        buildInputs =
-          super.ktp-common-internals.buildInputs
-          ++ (with kf5; [ kdelibs4support kparts ])
+          (drv.buildInputs or [])
+          ++ (with scope; [ kdelibs4support kparts ])
           ++ [ pkgs.libotr ]; # needed for ktp-text-ui
-      };
+      });
 
-      ktp-text-ui = super.ktp-text-ui // {
-        buildInputs =
-          super.ktp-text-ui.buildInputs
-          ++ (with kf5; [ kdbusaddons ]);
-      };
+      ktp-text-ui = overrideDerivation super.ktp-text-ui (drv: {
+        buildInputs = (drv.buildInputs or []) ++ [ scope.kdbusaddons ];
+      });
 
-      lokalize = super.lokalize // {
-        buildInputs =
-          super.lokalize.buildInputs
-          ++ [ kf5.kdbusaddons ];
-      };
+      lokalize = overrideDerivation super.lokalize (drv: {
+        buildInputs = (drv.buildInputs or []) ++ [ scope.kdbusaddons ];
+      });
 
-      libkdcraw = with pkgs; super.libkdcraw // {
-        buildInputs = super.libkdcraw.buildInputs ++ [scope.KDE4 libraw];
-        nativeBuildInputs = super.libkdcraw.nativeBuildInputs ++ [pkgconfig];
-      };
+      libkdcraw = overrideDerivation super.libkdcraw (drv: {
+        buildInputs = (drv.buildInputs or []) ++ (with scope; [ kdelibs libraw ]);
+        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
+      });
 
-      libkexiv2 = with pkgs; super.libkexiv2 // {
-        buildInputs = super.libkexiv2.buildInputs ++ [exiv2 scope.KDE4];
-      };
+      libkexiv2 = overrideDerivation super.libkexiv2 (drv: {
+        buildInputs = (drv.buildInputs or []) ++ (with scope; [ exiv2 kdelibs ]);
+      });
 
-      libkface = with pkgs; super.libkface // {
-        buildInputs = super.libkface.buildInputs ++ [scope.KDE4 opencv];
-      };
+      libkface = overrideDerivation super.libkface (drv: {
+        buildInputs = (drv.buildInputs or []) ++ (with scope; [ kdelibs opencv ]);
+      });
 
-      libkgeomap = super.libkgeomap // {
+      libkgeomap = overrideDerivation super.libkgeomap (drv: {
         cmakeFlags =
-          (super.libkgeomap.cmakeFlags or [])
-          ++ [
-            "-DCMAKE_MODULE_PATH=${kdeApps.marble}/share/apps/cmake/modules"
-          ];
-      };
+          (drv.cmakeFlags or [])
+          ++ [ "-DCMAKE_MODULE_PATH=${scope.marble}/share/apps/cmake/modules" ];
+      });
 
-      libkipi = with pkgs; super.libkipi // {
-        buildInputs = super.libkipi.buildInputs ++ [scope.KDE4];
-      };
+      libkipi = overrideDerivation super.libkipi (drv: {
+        buildInputs = (drv.buildInputs or []) ++ [ scope.kdelibs ];
+      });
 
-      libksane = with pkgs; super.libksane // {
-        buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends];
-      };
+      libksane = overrideDerivation super.libksane (drv: {
+        buildInputs = (drv.buildInputs or []) ++ (with scope; [ kdelibs saneBackends]);
+      });
 
-      okular = super.okular // {
-        nativeBuildInputs =
-          super.okular.nativeBuildInputs
-          ++ [ pkgs.pkgconfig ];
-      };
+      okular = overrideDerivation super.okular (drv: {
+        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
+      });
 
-      rocs = super.rocs // {
-        buildInputs = super.rocs.buildInputs ++ (with kf5; [ kdelibs4support ]);
-      };
+      rocs = overrideDerivation super.rocs (drv: {
+        buildInputs = (drv.buildInputs or []) ++ [ scope.kdelibs4support ];
+      });
 
       signon-kwallet-extension =
-        let signon = pkgs.signon.override { inherit qt5; };
-        in super.signon-kwallet-extension // {
-          buildInputs = super.signon-kwallet-extension.buildInputs ++ [ signon ];
-          preConfigure = ''
-            ${super.signon-kwallet-extension.preConfigure or ""}
-            sed -e "s,\''${SIGNONEXTENSION_PLUGINDIR},$out/lib/signon/extensions," \
-                -i src/CMakeLists.txt
+        overrideDerivation super.signon-kwallet-extension (drv: {
+          buildInputs = (drv.buildInputs or []) ++ [ scope.signonqt5 ];
+          preConfigure = (drv.preConfigure or "") + ''
+            sed -i src/CMakeLists.txt \
+                -e "s,\''${SIGNONEXTENSION_PLUGINDIR},$out/lib/signon/extensions,"
           '';
-        };
+        });
 
     };
 
-  l10nManifest =
-    filterAttrs
-      (n: v: hasPrefix "kde-l10n" n)
-      (importManifest ./manifest.nix { inherit mirror; });
-
-  kdeApps = generateCollection ./. {
-    inherit mkDerivation;
-    inherit mirror preResolve postResolve renames scope;
-  };
-
-in kdeApps // (mapAttrs l10nPkg l10nManifest)
+in self
diff --git a/pkgs/applications/kde-apps-15.04/dependencies.nix b/pkgs/applications/kde-apps-15.04/dependencies.nix
deleted file mode 100644
index a66843197f7..00000000000
--- a/pkgs/applications/kde-apps-15.04/dependencies.nix
+++ /dev/null
@@ -1,1812 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-  amor = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  analitza = {
-    buildInputs = [ "ECM" "Eigen3" "GLEW" "OpenGL" "Qt5" "Qt5NO_MODULE" "Qt5OpenGL" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ark = {
-    buildInputs = [ "BZip2" "KDE4" "LibArchive" "LibKonq" "LibLZMA" "QJSON" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  artikulate = {
-    buildInputs = [ "KDE4" "KDeclarative" "QtGStreamer" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  audiocd-kio = {
-    buildInputs = [ "Cdparanoia" "Flac" "KDE4" "Libkcddb" "Libkcompactdisc" "OggVorbis" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  blinken = {
-    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5Core" "Qt5Svg" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  bomber = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5KDEGames" "KF5KIO" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5NO_MODULE" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  bovo = {
-    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5Declarative" "KF5KDEGames" "KF5NewStuff" "KF5XmlGui" "Qt5" "Qt5Concurrent" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  cantor = {
-    buildInputs = [ "Analitza5" "ECM" "KDE4" "KF5" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5KDELibs4Support" "KF5NewStuff" "KF5Parts" "KF5Pty" "KF5TextEditor" "LibSpectre" "LuaJIT" "PythonLibs" "PythonLibs3" "Qalculate" "Qt5" "Qt5Core" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5Xml" "Qt5XmlPatterns" "R" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  cervisia = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  dolphin-plugins = {
-    buildInputs = [ "KDE4" "LibKonq" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  dragon = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ffmpegthumbs = {
-    buildInputs = [ "FFmpeg" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  filelight = {
-    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Parts" "KF5Solid" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  granatier = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDEGames" "KF5KIO" "KF5NewStuff" "KF5NotifyConfig" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Svg" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  gwenview = {
-    buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Activities" "KF5Baloo" "KF5KDELibs4Support" "KF5KDcraw" "KF5KIO" "KF5Kipi" "LCMS2" "PNG" "Phonon4Qt5" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5OpenGL" "Qt5QUIET" "Qt5Script" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  jovie = {
-    buildInputs = [ "KDE4" "Qt4" "Speechd" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  juk = {
-    buildInputs = [ "KDE4" "Taglib" "TunePimp" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kaccessible = {
-    buildInputs = [ "KDE4" "Qt4" "Speechd" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kaccounts-integration = {
-    buildInputs = [ "AccountsQt5" "ECM" "KF5" "KF5Akonadi" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KIO" "KF5Wallet" "KF5WidgetsAddons" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" "SignOnQt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "AccountsQt5" "KF5CoreAddons" "Qt5Widgets" "SignOnQt5" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kaccounts-providers = {
-    buildInputs = [ "AccountsFileDir" "ECM" "Intltool" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kajongg = {
-    buildInputs = [ "KDE4" "Twisted" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kalgebra = {
-    buildInputs = [ "Analitza5" "Curses" "ECM" "KF5ConfigWidgets" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5WidgetsAddons" "OpenGL" "Qt5" "Qt5NO_MODULE" "Qt5OpenGL" "Qt5PrintSupport" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5WebKitWidgets" "Qt5Xml" "Readline" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kalzium = {
-    buildInputs = [ "KDE4" "KDEWIN32" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kamera = {
-    buildInputs = [ "Gphoto2" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kanagram = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5NewStuff" "KF5Sonnet" "LibKEduVocDocument" "Qt5" "Qt5Core" "Qt5OPTIONAL_COMPONENTS" "Qt5OpenGL" "Qt5QUIET" "Qt5Qml" "Qt5Quick" "Qt5TextToSpeech" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kapman = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KDEGames" "KF5KIO" "KF5NotifyConfig" "KF5WindowSystem" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5NO_MODULE" "Qt5Svg" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kapptemplate = {
-    buildInputs = [ "ECM" "KDE4" "KF5" "KF5Archive" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5XmlGui" "KdepimLibs" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "RBKCONFIG_COMPILER4" "RBUIC4" "XSLTPROC_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kate = {
-    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "LibGit2" "PyKDE4" "PyQt4" "PythonLibrary" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Script" "Qt5Sql" "Qt5Test" "Qt5Widgets" "SIP" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  katomic = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDEGames" "KF5KIO" "KF5NewStuff" "KF5NotifyConfig" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kblackbox = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KDEGames" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Svg" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kblocks = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5ItemModels" "KF5KDEGames" "KF5KIO" "KF5NewStuff" "KF5NotifyConfig" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kbounce = {
-    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KDEGames" "KF5KIO" "KF5NotifyConfig" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5NO_MODULE" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kbreakout = {
-    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KDEGames" "KF5KIO" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kbruch = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcachegrind = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcalc = {
-    buildInputs = [ "ECM" "GMP" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5Init" "KF5Notifications" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcharselect = {
-    buildInputs = [ "ECM" "KF5" "KF5DocTools" "KF5I18n" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcolorchooser = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcron = {
-    buildInputs = [ "ECM" "KF5" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5PrintSupport" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-base-artwork = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-baseapps = {
-    buildInputs = [ "Baloo" "BalooWidgets" "GLIB2" "KActivities" "KDE4" "KFileMetaData" "LibTidy" "X11" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-dev-scripts = {
-    buildInputs = [ "ECM" "KDE4" "KF5DocTools" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-dev-utils = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ar = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-bg = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-bs = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ca = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ca_valencia = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-cs = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-da = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-de = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-el = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-en_gb = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-eo = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-es = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-et = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-eu = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-fa = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-fi = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-fr = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ga = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-gl = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-he = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-hi = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-hr = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-hu = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ia = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-id = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-is = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-it = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ja = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-kk = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-km = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ko = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-lt = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-lv = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-mr = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-nb = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-nds = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-nl = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-nn = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-pa = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-pl = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-pt = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-pt_br = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ro = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ru = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-sk = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-sl = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-sr = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-sv = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-tr = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ug = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-uk = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-wa = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-zh_cn = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-zh_tw = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-runtime = {
-    buildInputs = [ "Alsa" "BZip2" "Exiv2" "GLIB2" "Gpgme" "JPEG" "KActivities" "KDE4" "KDeclarative" "KdepimLibs" "LibAttica" "LibGcrypt" "LibLZMA" "LibSSH" "NepomukCore" "NetworkManager" "OpenEXR" "PulseAudio" "QCA2" "QGpgme" "QNtrack" "SLP" "Samba" "SharedMimeInfo" "Soprano" ];
-    nativeBuildInputs = [ "MD5SUM_EXECUTABLE" "WINDRES_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kde-wallpapers = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-workspace = {
-    buildInputs = [ "Akonadi" "Boost" "DBusMenuQt" "Fontconfig" "Freetype" "GLIB2" "JPEG" "KActivities" "KDE4" "KDeclarative" "KdepimLibs" "NepomukCore" "OpenGL" "OpenGLES" "PCIUTILS" "PNG" "Prison" "PythonLibrary" "QImageBlitz" "QJSON" "Qalculate" "Qt4" "RAW1394" "Sensors" "Soprano" "Strigi" "UDev" "USB" "Wayland" "X11" "X11_XCB" "XCB" "Xmms" "ZLIB" "libgps" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdeartwork = {
-    buildInputs = [ "Eigen3" "KDE4" "KDE4Workspace" "Kexiv2" "OpenGL" "Xscreensaver" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdeedu-data = {
-    buildInputs = [ "ECM" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdegraphics-mobipocket = {
-    buildInputs = [ "KDE4" "Strigi" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdegraphics-strigi-analyzer = {
-    buildInputs = [ "KDE4" "OpenEXR" "Strigi" "TIFF" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdegraphics-thumbnailers = {
-    buildInputs = [ "KDE4" "Kdcraw" "Kexiv2" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdelibs = {
-    buildInputs = [ "ACL" "AGG" "ASPELL" "Automoc4" "Avahi" "BZip2" "Blitz" "BlueZ" "Carbon" "DBusMenuQt" "DNSSD" "DocBookXML" "DocBookXSL" "ENCHANT" "Eigen2" "FAM" "FFmpeg" "Flac" "Flex" "GIF" "GObject" "GSSAPI" "GStreamer" "Grantlee" "HSPELL" "HUNSPELL" "HUpnp" "IOKit" "JPEG" "Jasper" "KDE4" "KDE4Internal" "LCMS" "LibArt" "LibAttica" "LibXml2" "Libintl" "OpenEXR" "OpenSSL" "PCRE" "PNG" "QCA2" "QImageBlitz" "Qt4" "SharedDesktopOntologies" "SharedMimeInfo" "Soprano" "Sqlite" "Strigi" "UDev" "USB" "Xine" "Xmms" "ZLIB" ];
-    nativeBuildInputs = [ "BISON" "FLEX" "LibXslt" "Perl" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kdenetwork-filesharing = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdenetwork-strigi-analyzers = {
-    buildInputs = [ "Boost" "KDE4" "Strigi" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdenlive = {
-    buildInputs = [ "ECM" "Git" "KF5" "KF5Archive" "KF5Bookmarks" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5GuiAddons" "KF5IconThemes" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5NotifyConfig" "KF5Plotting" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "LibV4L2" "MLT" "OpenGL" "Qt5" "Qt5Core" "Qt5DBus" "Qt5OpenGL" "Qt5Script" "Qt5Svg" "Qt5Test" "Qt5Widgets" "SDL" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kdepim = {
-    buildInputs = [ "Akonadi" "Baloo" "Boost" "Git" "Grantlee" "KDE4" "KdepimLibs" "LibKGAPI2" "Prison" "QGpgme" "QJSON" "Sasl2" "Xsltproc" "ZLIB" ];
-    nativeBuildInputs = [ "DBLATEX_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdepim-runtime = {
-    buildInputs = [ "AccountsQt" "Akonadi" "Boost" "KDE4" "KdepimLibs" "LibKFbAPI" "LibKGAPI2" "Libkolab" "Libkolabxml" "QJSON" "Qt4" "Sasl2" "SharedMimeInfo" "SignOnQt" "Xsltproc" ];
-    nativeBuildInputs = [ "_testrunner" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kdepimlibs = {
-    buildInputs = [ "Akonadi" "Boost" "Gpgme" "KDE4" "Ldap" "LibXml2" "Libical" "Prison" "QJSON" "Sasl2" "SharedMimeInfo" "Xsltproc" ];
-    nativeBuildInputs = [ "LibXslt" "PERL_EXECUTABLE" "_testrunner" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kdesdk-kioslaves = {
-    buildInputs = [ "KDE4" "SVN" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesdk-strigi-analyzers = {
-    buildInputs = [ "KDE4" "Strigi" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesdk-thumbnailers = {
-    buildInputs = [ "GettextPO" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdewebdev = {
-    buildInputs = [ "KDE4" "KdepimLibs" "LibTidy" "RUBY" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdf = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdiamond = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KDEGames" "KF5NotifyConfig" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kfloppy = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kfourinline = {
-    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DNSSD" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5ItemModels" "KF5ItemViews" "KF5KDEGames" "KF5KDELibs4Support" "KF5KIO" "KF5NotifyConfig" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kgamma = {
-    buildInputs = [ "KDE4" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kgeography = {
-    buildInputs = [ "ECM" "KF5" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kget = {
-    buildInputs = [ "Boost" "KDE4" "KDE4Workspace" "KTorrent" "LibMms" "NepomukCore" "NepomukWidgets" "QCA2" "QGpgme" "SharedDesktopOntologies" "Soprano" "Sqlite" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kgoldrunner = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kgpg = {
-    buildInputs = [ "Gpgme" "KDE4" "KdepimLibs" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  khangman = {
-    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5NewStuff" "KF5Notifications" "KF5XmlGui" "LibKEduVocDocument" "Qt5" "Qt5Core" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kig = {
-    buildInputs = [ "BoostPython" "ECM" "KF5Archive" "KF5ConfigWidgets" "KF5DocTools" "KF5Emoticons" "KF5I18n" "KF5IconThemes" "KF5ItemModels" "KF5KDELibs4Support" "KF5Parts" "KF5TextEditor" "KF5XmlGui" "Qt5PrintSupport" "Qt5Svg" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kigo = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  killbots = {
-    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDEGames" "KF5KIO" "KF5NotifyConfig" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kiriki = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kiten = {
-    buildInputs = [ "ECM" "KF5" "KF5Archive" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5KHtml" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjumpingcube = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5ItemModels" "KF5KDEGames" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5NotifyConfig" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  klettres = {
-    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5Emoticons" "KF5I18n" "KF5ItemModels" "KF5KDELibs4Support" "KF5NewStuff" "KF5WidgetsAddons" "Phonon4Qt5" "Qt5" "Qt5Core" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  klickety = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  klines = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDEGames" "KF5KIO" "KF5NewStuff" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmag = {
-    buildInputs = [ "KDE4" "QAccessibilityClient" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmahjongg = {
-    buildInputs = [ "KDE4" "KDEGames" "LibKMahjongg" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmines = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5KDEGames" "KF5KIO" "KF5NotifyConfig" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmix = {
-    buildInputs = [ "Alsa" "Canberra" "ECM" "GLIB2" "KDE4" "KF5" "KF5ConfigWidgets" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5XmlGui" "Phonon" "PulseAudio" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmousetool = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmouth = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmplot = {
-    buildInputs = [ "ECM" "KF5" "KF5GuiAddons" "KF5I18n" "KF5KDELibs4Support" "KF5Parts" "KF5WidgetsAddons" "Qt5" "Qt5Core" "Qt5Gui" "Qt5PrintSupport" "Qt5Svg" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knavalbattle = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knetwalk = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDEGames" "KF5KIO" "KF5NotifyConfig" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kolf = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kollision = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5KDEGames" "KF5KIO" "KF5NewStuff" "KF5NotifyConfig" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kolourpaint = {
-    buildInputs = [ "KDE4" "QImageBlitz" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kompare = {
-    buildInputs = [ "ECM" "KF5" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5IconThemes" "KF5JobWidgets" "KF5Parts" "KF5TextEditor" "KF5WidgetsAddons" "LibKompareDiff2" "Qt5" "Qt5Core" "Qt5PrintSupport" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  konquest = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  konsole = {
-    buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5KDELibs4Support" "KF5KIO" "KF5Notifications" "KF5NotifyConfig" "KF5Parts" "KF5Pty" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Script" "Qt5Test" "Qt5Widgets" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kopete = {
-    buildInputs = [ "Alsa" "Boost" "Expat" "GIF" "GLIB2" "IDN" "Jasper" "JsonCpp" "KDE4" "KdepimLibs" "Kleopatra" "LibMeanwhile" "LibOTR" "LibV4L2" "LibXml2" "Libgadu" "Libmsn" "LiboRTP" "Mediastreamer" "OpenSSL" "QCA2" "QGpgme" "QImageBlitz" "Qt4" "Qt5Core" "Qt5Network" "Qt5QUIET" "SRTP" "Speex" "Sqlite" "Xmms" "ZLIB" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpat = {
-    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDEGames" "KF5KIO" "KF5NewStuff" "KF5NotifyConfig" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kppp = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kqtquickcharts = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  krdc = {
-    buildInputs = [ "KDE4" "LibNXCL" "LibVNCServer" "TelepathyQt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kremotecontrol = {
-    buildInputs = [ "KDE4" "Qt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kreversi = {
-    buildInputs = [ "KDE4" "KDEGames" "KDeclarative" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  krfb = {
-    buildInputs = [ "KDE4" "KTp" "LibVNCServer" "TelepathyQt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kruler = {
-    buildInputs = [ "ECM" "KF5" "KF5DocTools" "KF5I18n" "KF5Notifications" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksaneplugin = {
-    buildInputs = [ "KDE4" "KSane" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kscd = {
-    buildInputs = [ "Alsa" "KDE4" "MusicBrainz3" "Qt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kshisen = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5DNSSD" "KF5Declarative" "KF5DocTools" "KF5KDEGames" "KF5KIO" "KF5KMahjongglib" "KF5NewStuff" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5Core" "Qt5Gui" "Qt5NO_MODULE" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksirk = {
-    buildInputs = [ "KDE4" "KDEGames" "QCA2" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksnakeduel = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksnapshot = {
-    buildInputs = [ "KDE4" "Kipi" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kspaceduel = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksquares = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDEGames" "KF5KIO" "KF5NotifyConfig" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kstars = {
-    buildInputs = [ "AstrometryNet" "CFitsio" "ECM" "Eigen3" "INDI" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5JobWidgets" "KF5KIO" "KF5NewStuff" "KF5Plotting" "KF5TextEditor" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenGL" "Qt5" "Qt5Gui" "Qt5Multimedia" "Qt5OpenGL" "Qt5PrintSupport" "Qt5Qml" "Qt5Quick" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5Xml" "WCSLIB" "Xplanet" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksudoku = {
-    buildInputs = [ "KDE4" "KDEGames" "OpenGL" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksystemlog = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kteatime = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5NotifyConfig" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktimer = {
-    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktouch = {
-    buildInputs = [ "KDE4" "KDeclarative" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktp-accounts-kcm = {
-    buildInputs = [ "AccountsFileDir" "AccountsQt5" "ECM" "Intltool" "KAccounts" "KF5" "KF5Codecs" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KIO" "KF5WidgetsAddons" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" "SignOnQt5" "TelepathyQt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktp-approver = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5I18n" "KF5Notifications" "KF5Service" "Qt5" "Qt5Network" "Qt5Widgets" "TelepathyQt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktp-auth-handler = {
-    buildInputs = [ "AccountsQt5" "ECM" "KAccounts" "KF5" "KF5I18n" "KF5KIO" "KF5Wallet" "KF5WebKit" "KF5WidgetsAddons" "KTp" "Qca-qt5" "Qca-qt5-ossl" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5Network" "SignOnQt5" "TelepathyQt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktp-common-internals = {
-    buildInputs = [ "AccountsQt5" "Doxygen" "ECM" "KAccounts" "KF5" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5KCMUtils" "KF5KIO" "KF5Notifications" "KF5NotifyConfig" "KF5People" "KF5TextEditor" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "LibOTR" "Libgcrypt" "Qt5" "Qt5Qml" "Qt5Sql" "Qt5Test" "TelepathyLoggerQt" "TelepathyQt5" "TelepathyQt5Service" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Wallet" "TelepathyLoggerQt" "TelepathyQt5" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktp-contact-list = {
-    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KIO" "KF5Notifications" "KF5NotifyConfig" "KF5People" "KF5WindowSystem" "KF5XmlGui" "KTp" "Qt5" "Qt5Widgets" "Qt5Xml" "TelepathyQt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktp-contact-runner = {
-    buildInputs = [ "ECM" "KF5" "KF5I18n" "KF5Runner" "KF5Service" "KTp" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Network" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktp-desktop-applets = {
-    buildInputs = [ "ECM" "KF5" "KF5Plasma" "KF5WindowSystem" "Qt5" "Qt5Qml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktp-filetransfer-handler = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KTp" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktp-kded-module = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5DBusAddons" "KF5I18n" "KF5IdleTime" "KF5KCMUtils" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "KTp" "Qt5" "Qt5Concurrent" "Qt5Network" "Qt5Sql" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktp-send-file = {
-    buildInputs = [ "ECM" "KF5" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KIO" "KTp" "Qt5" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktp-text-ui = {
-    buildInputs = [ "ECM" "KF5" "KF5Archive" "KF5Emoticons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KIO" "KF5Notifications" "KF5NotifyConfig" "KF5People" "KF5Service" "KF5Sonnet" "KF5TextWidgets" "KF5WebKit" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KTp" "Qt5" "Qt5WebKitWidgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktuberling = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kturtle = {
-    buildInputs = [ "ECM" "KF5" "KF5I18n" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Svg" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktux = {
-    buildInputs = [ "KDE4" "KDE4Workspace" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kubrick = {
-    buildInputs = [ "KDE4" "KDEGames" "OpenGL" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kuser = {
-    buildInputs = [ "KDE4" "KdepimLibs" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwalletmanager = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwordquiz = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5NotifyConfig" "KF5Sonnet" "KF5XmlGui" "LibKEduVocDocument" "Phonon4Qt5" "Qt5" "Qt5Core" "Qt5PrintSupport" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkcddb = {
-    buildInputs = [ "KDE4" "MusicBrainz5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkcompactdisc = {
-    buildInputs = [ "Alsa" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkdcraw = {
-    buildInputs = [ "KDE4" "LibRaw" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkdeedu = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkdegames = {
-    buildInputs = [ "ECM" "KF5" "KF5Archive" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DNSSD" "KF5Declarative" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5JobWidgets" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "OpenAL" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "SndFile" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KDELibs4Support" "KF5WidgetsAddons" "Qt5Network" "Qt5Qml" "Qt5QuickWidgets" "Qt5Widgets" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkeduvocdocument = {
-    buildInputs = [ "ECM" "KF5" "KF5Archive" "KF5I18n" "KF5KIO" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkexiv2 = {
-    buildInputs = [ "Exiv2" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkface = {
-    buildInputs = [ "KDE4" "Qt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkgeomap = {
-    buildInputs = [ "KDE4" "Marble" "MarbleWidget" "Qt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkipi = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkmahjongg = {
-    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" "Qt5Core" "Qt5Gui" "Qt5NO_MODULE" "Qt5Svg" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkomparediff2 = {
-    buildInputs = [ "ECM" "KF5" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5Parts" "KF5XmlGui" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libksane = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  lokalize = {
-    buildInputs = [ "ECM" "HUNSPELL" "KF5" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Kross" "KF5Notifications" "KF5Sonnet" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Script" "Qt5Sql" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  lskat = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  marble = {
-    buildInputs = [ "KDE4" "Phonon" "Protobuf" "PyQt4" "PythonLibrary" "QextSerialPort" "Qt4" "Qt5Concurrent" "Qt5Core" "Qt5Designer" "Qt5Network" "Qt5PrintSupport" "Qt5Quick" "Qt5Script" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5Xml" "QtLocation" "SIP" "SharedMimeInfo" "ZLIB" "libgps" "liblocation" "libshp" "libwlocate" "quazip" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  mplayerthumbs = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  okteta = {
-    buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5ConfigWidgets" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qca-qt5" "Qt5" "Qt5Core" "Qt5Designer" "Qt5NO_MODULE" "Qt5Network" "Qt5PrintSupport" "Qt5QUIET" "Qt5Script" "Qt5ScriptTools" "Qt5Test" "Qt5Widgets" "Qt5Xml" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" "KastenCore" "KastenGui" "OktetaCore" "OktetaGui" "OktetaKastenCore" "OktetaKastenGui" "Qt5Core" "Qt5Gui" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  okular = {
-    buildInputs = [ "ActiveApp" "CHM" "DjVuLibre" "EPub" "Freetype" "JPEG" "KActivities" "KDE4" "Kexiv2" "LibKScreen" "LibSpectre" "Poppler" "QCA2" "QImageBlitz" "QMobipocket" "TIFF" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  oxygen-icons = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  pairs = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  palapeli = {
-    buildInputs = [ "KDE4" "KDEGames" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "QVORONOI_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  parley = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Kross" "KF5MODULE" "KF5NewStuff" "KF5Notifications" "KF5Sonnet" "KF5XmlGui" "KF5docbook" "KF5produce" "KF5the" "LibAttica" "LibKEduVocDocument" "LibXml2" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Multimedia" "Qt5Svg" "Qt5Test" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  picmi = {
-    buildInputs = [ "KDE4" "KDEGames" "Qt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  poxml = {
-    buildInputs = [ "Gettext" "GettextPO" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  print-manager = {
-    buildInputs = [ "CUPS" "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KIO" "KF5Notifications" "KF5Plasma" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5Quick" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  rocs = {
-    buildInputs = [ "Boost" "ECM" "Grantlee5" "KF5" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5ItemViews" "KF5TextEditor" "KF5XmlGui" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5NO_MODULE" "Qt5QUIET" "Qt5QuickWidgets" "Qt5Script" "Qt5ScriptTools" "Qt5Svg" "Qt5Test" "Qt5WebKit" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5XmlPatterns" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  signon-kwallet-extension = {
-    buildInputs = [ "ECM" "KF5" "KF5Wallet" "Qt5" "Qt5Core" "Qt5DBus" "Qt5QUIET" "Qt5Test" "SignOnExtension" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  step = {
-    buildInputs = [ "ECM" "Eigen3" "GSL" "KF5" "KF5Config" "KF5DocTools" "KF5KDELibs4Support" "KF5KHtml" "KF5NewStuff" "KF5Plotting" "Qalculate" "Qt5" "Qt5NO_MODULE" "Qt5OpenGL" "Qt5PrintSupport" "Qt5QUIET" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "PythonInterp" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  superkaramba = {
-    buildInputs = [ "KDE4" "PythonLibs" "QImageBlitz" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  svgpart = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  sweeper = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  umbrello = {
-    buildInputs = [ "KDE4" "LibXml2" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  zeroconf-ioslave = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-}
diff --git a/pkgs/applications/kde-apps-15.04/dependencies.sh b/pkgs/applications/kde-apps-15.04/dependencies.sh
deleted file mode 100755
index e00c7770ab8..00000000000
--- a/pkgs/applications/kde-apps-15.04/dependencies.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-manifestXML=$(nix-build -E 'with (import ../../.. {}); autonix.writeManifestXML ./manifest.nix')
-
-autonixDepsKf5=""
-if [[ -z $1 ]]; then
-    autonixDepsKF5=$(nix-build ../../.. -A haskellngPackages.autonix-deps-kf5)/bin
-else
-    autonixDepsKF5="$1/dist/build/kf5-deps"
-fi
-
-exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
diff --git a/pkgs/applications/kde-apps-15.04/kf5-renames.json b/pkgs/applications/kde-apps-15.04/kf5-renames.json
new file mode 100644
index 00000000000..4da5f8272ee
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.04/kf5-renames.json
@@ -0,0 +1,70 @@
+{
+    "kf5widgetsaddons": "kwidgetsaddons",
+    "kf5texteditor": "ktexteditor",
+    "kf5designerplugin": "kdesignerplugin",
+    "kf5bookmarks": "kbookmarks",
+    "kf5frameworkintegration": "frameworkintegration",
+    "kf5package": "kpackage",
+    "kf5archive": "karchive",
+    "kf5plasma": "plasma-framework",
+    "kf5kcmutils": "kcmutils",
+    "kf5configwidgets": "kconfigwidgets",
+    "ctest": "attica",
+    "kf5kio": "kio",
+    "kf5networkmanagerqt": "networkmanager-qt",
+    "kf5coreaddons": "kcoreaddons",
+    "kf5guiaddons": "kguiaddons",
+    "kf5jobwidgets": "kjobwidgets",
+    "kf5modemmanagerqt": "modemmanager-qt",
+    "kf5runner": "krunner",
+    "kf5globalaccel": "kglobalaccel",
+    "kf5dbusaddons": "kdbusaddons",
+    "kf5crash": "kcrash",
+    "kf5itemviews": "kitemviews",
+    "kf5doctools": "kdoctools",
+    "kf5i18n": "ki18n",
+    "kf5webkit": "kdewebkit",
+    "kf5newstuff": "knewstuff",
+    "kded": "kded",
+    "kf5notifications": "knotifications",
+    "kf5activitiesexperimentalstats": "kactivities",
+    "kf5dnssd": "kdnssd",
+    "kf5notifyconfig": "knotifyconfig",
+    "kf5iconthemes": "kiconthemes",
+    "kf5js": "kjs",
+    "kf5kde4support": "kdelibs4support",
+    "kf5parts": "kparts",
+    "backend": "plasma-framework",
+    "kf5completion": "kcompletion",
+    "kf5threadweaver": "threadweaver",
+    "kf5mediaplayer": "kmediaplayer",
+    "kf5plasmaquick": "plasma-framework",
+    "kf5wallet": "kwallet",
+    "kf5xmlgui": "kxmlgui",
+    "kf5attica": "attica",
+    "kf5declarative": "kdeclarative",
+    "kf5config": "kconfig",
+    "kf5init": "kinit",
+    "kf5textwidgets": "ktextwidgets",
+    "kf5jsembed": "kjsembed",
+    "kf5codecs": "kcodecs",
+    "kf5service": "kservice",
+    "kf5sonnet": "sonnet",
+    "kf5kdelibs4support": "kdelibs4support",
+    "kf5pty": "kpty",
+    "kf5solid": "solid",
+    "kf5auth": "kauth",
+    "ecm": "extra-cmake-modules",
+    "kf5activities": "kactivities",
+    "kf5plotting": "kplotting",
+    "kf5people": "kpeople",
+    "kf5emoticons": "kemoticons",
+    "kf5kross": "kross",
+    "kf5su": "kdesu",
+    "kf5khtml": "khtml",
+    "kf5unitconversion": "kunitconversion",
+    "kf5idletime": "kidletime",
+    "kf5windowsystem": "kwindowsystem",
+    "kf5xmlrpcclient": "kxmlrpcclient",
+    "kf5itemmodels": "kitemmodels"
+}
\ No newline at end of file
diff --git a/pkgs/applications/kde-apps-15.04/manifest.nix b/pkgs/applications/kde-apps-15.04/manifest.nix
deleted file mode 100644
index d59a3d66966..00000000000
--- a/pkgs/applications/kde-apps-15.04/manifest.nix
+++ /dev/null
@@ -1,8158 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
-[
-  {
-    name = stdenv.lib.nameFromURL "kaccessible-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/51djz0y5i1mr90pv9fmxi0vwzrrj2ygq-kaccessible-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kaccessible-15.04.0.tar.xz";
-      sha256 = "1q90ak7yxvvi5scxajb3d4nid2h7y7xfvdbqfd9a6w312r6lcvz8";
-      name = "kaccessible-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kuser-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/4q0xn6h1mf6plwikl16v490hbcm1c3jf-kuser-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kuser-15.04.0.tar.xz";
-      sha256 = "0fgjfd76iiyp98013x9la61qxnw454kcrl7vpikg37hqaqbzmgkh";
-      name = "kuser-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiriki-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/p393dfammjyxak0wm3vblzcb8n7r0gnw-kiriki-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kiriki-15.04.0.tar.xz";
-      sha256 = "0cg4iijyk96lwc48ifs5arip3y51wpb4fd4slgjbkhvg4fc859sa";
-      name = "kiriki-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.7.tar.xz" ".tar";
-    store = "/nix/store/819bf5a5q4b4l0w9yi099capf9il9whz-kdepimlibs-4.14.7.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdepimlibs-4.14.7.tar.xz";
-      sha256 = "1cmqyx0shm0ss48pjh9jm9g9bghkkl6fg5wgw4yhs4dgz1nj9qn1";
-      name = "kdepimlibs-4.14.7.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "amor-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/fmbdfhm9703yaq7x619d1s97il6prp7r-amor-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/amor-15.04.0.tar.xz";
-      sha256 = "167j2qqkivrc2pid11nmnllw2m2amr8d9jvafy54j3i7mcbs788k";
-      name = "amor-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knavalbattle-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/y9k66adhrcr1vxyzdvsx3zymkd7b4zaa-knavalbattle-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/knavalbattle-15.04.0.tar.xz";
-      sha256 = "0hgwx63g1lrzrszajya4va2pidh2xm1qy7b8iw5xi1yz1khn6cvd";
-      name = "knavalbattle-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiten-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/zb4wpb0g4vbkrnwrk7d54l2dd88cz4b2-kiten-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kiten-15.04.0.tar.xz";
-      sha256 = "0lpvwm20zr7zq7p09igbacqhm7pv4bv7r701nijw5l9l4d58hq3y";
-      name = "kiten-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwalletmanager-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/4i8v7c1a44idrlpdqc6yk41w6r34259x-kwalletmanager-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kwalletmanager-15.04.0.tar.xz";
-      sha256 = "0c5r6pfinb509a0mn2k31wksiya9b52pjm77bbaq60k1y39fsizc";
-      name = "kwalletmanager-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalzium-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/6ivi9a4yilhb621zj0kz07yzbxa5wpxs-kalzium-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kalzium-15.04.0.tar.xz";
-      sha256 = "1x3vdi9h5px84cm7k1nbrlakkb13xrc25d6yw22pnfsf3v4n66f5";
-      name = "kalzium-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfloppy-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/7w91cal36byklnn0mzzclgjj5hpjzb2j-kfloppy-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kfloppy-15.04.0.tar.xz";
-      sha256 = "1nmcdzd7zhr4vfxb8lgl7dxfs01wy81kcag36s43hg7mfs5xb0k4";
-      name = "kfloppy-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolf-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/76g0y1k03dlc50d5wfdgpb2grsy9p0qa-kolf-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kolf-15.04.0.tar.xz";
-      sha256 = "0nzqvq5y2mvh7x2lsq8prkyn99j8137hq5pyk5d9yhla4lpq2lr4";
-      name = "kolf-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "print-manager-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/rmvqcnl3b77hxhcw7z22vx03pi1gk3gp-print-manager-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/print-manager-15.04.0.tar.xz";
-      sha256 = "0yn8dhvpxv5dxdn41c6rzar66gvlqmgb3m9f0rdrxzqmw9xidzrg";
-      name = "print-manager-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "poxml-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/kinljjyys5d6s5rfyhl6jzmh8z5bm92d-poxml-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/poxml-15.04.0.tar.xz";
-      sha256 = "1cziw2ydylsx45s5hrg1bfwk8qv9jbvji3hyzwi6jqc72fpv9q5x";
-      name = "poxml-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblocks-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/jjkr9khw6fzh7hb4xss9jx2qwz05jral-kblocks-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kblocks-15.04.0.tar.xz";
-      sha256 = "0q32xvajnv7x3fmhax1bmc4f7530cijisn48hpnpkm4g4mn68qb0";
-      name = "kblocks-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdf-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1wrgspd1n890ln1dffghslw86z2ynfz3-kdf-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdf-15.04.0.tar.xz";
-      sha256 = "18i9rbl210vj370n3irjy2ai4vrhg26ivfs37wl0zdvz4i81ncg7";
-      name = "kdf-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkomparediff2-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/krsghsp3cs3wmib774g36933smh1bldv-libkomparediff2-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/libkomparediff2-15.04.0.tar.xz";
-      sha256 = "0i9vyc4bfqj22a1v48f3gyfkxl3pi9smsg0lql1bs0x8rsn7iznd";
-      name = "libkomparediff2-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/659kk26hrkssc4xkyda1kwf41ri00csx-kde-dev-scripts-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-dev-scripts-15.04.0.tar.xz";
-      sha256 = "09r8wcln0m5akwjs939dbbz20kdqyxag91028vfmwzkw9r99604y";
-      name = "kde-dev-scripts-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-4.14.7.tar.xz" ".tar";
-    store = "/nix/store/i8i89jlpkd3rmgyfbw8xbv67az4xkmjq-kdepim-4.14.7.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdepim-4.14.7.tar.xz";
-      sha256 = "0hnmpjrcv0qcyn6hagpayza2bjkyd2v8y02rriifq9q99j7rwyj0";
-      name = "kdepim-4.14.7.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/xdmcjjrfxhwwigf32sbafbakczc9jfyd-kde-l10n-km-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-km-15.04.0.tar.xz";
-      sha256 = "1rv7pp35sgqppqs320pnlpqrjs0ljix9dd92fl2jrfpag15fi887";
-      name = "kde-l10n-km-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0kz1fd8ha3m8r5kmqa9phr607ayry1ds-kde-l10n-es-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-es-15.04.0.tar.xz";
-      sha256 = "0bjh1x3snldbmfvdamgid23cxv1sn3qwsdpy92h1djb49zbm51a0";
-      name = "kde-l10n-es-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/brvc7zjfmcvif2y8n4zrmlva72v243md-kde-l10n-fi-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fi-15.04.0.tar.xz";
-      sha256 = "0xh66i7wgapi6bhig712mlq8dkaml9dpzsj43dic58xw8bx4n6s4";
-      name = "kde-l10n-fi-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/h0hfrfigk06zqqgl0crsah3sqgh05syp-kde-l10n-nn-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nn-15.04.0.tar.xz";
-      sha256 = "1d2yvvl6rralsw77vg6hmbi84dswf116dpab7r5039nqgxnr8k81";
-      name = "kde-l10n-nn-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/r2mbi7gj1a4f71cp6xgjxfkbmx1qzzrp-kde-l10n-it-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-it-15.04.0.tar.xz";
-      sha256 = "1izidgcrzyvxka143cpnvrcnf2ddzp8384sjw6bvw32wsxi3v0mp";
-      name = "kde-l10n-it-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/kxaxpwzy0bs1675by3qhhvj1hlvvig7a-kde-l10n-pt_BR-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pt_BR-15.04.0.tar.xz";
-      sha256 = "0s6pc40ig83zjqbgqwhfkxzhp9wcrgac6hs5qhcxbs3awfmxi5hn";
-      name = "kde-l10n-pt_BR-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/mxmsybkjr2pr2xwfrxciwf6jjn2mp1vj-kde-l10n-kk-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-kk-15.04.0.tar.xz";
-      sha256 = "0czb1dmrdciim910bnazvsvi7lcvq27bj055f36w6y6l1zgvv8c3";
-      name = "kde-l10n-kk-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/cj9bhf10x4rcvcia97l9qhjnzll979ls-kde-l10n-fr-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fr-15.04.0.tar.xz";
-      sha256 = "0g94wik9q6c9w5x851k76qfk0fknv6ga497vwqka1h4yrmdmc1vl";
-      name = "kde-l10n-fr-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/pyl52lwdrvfi3xpby5yyi93204jp3mjx-kde-l10n-he-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-he-15.04.0.tar.xz";
-      sha256 = "0hpnn6rci0bavl6hqs6v2ylz26sjyf5siwi2klfc3fsw6a04in43";
-      name = "kde-l10n-he-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/rn2hih1b8fdbjahg1va76kn7cdjq05g9-kde-l10n-nb-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nb-15.04.0.tar.xz";
-      sha256 = "1mz3bcm92745zr6gn7q85p72l57sh19bcvvkpg40c63k34xpwpan";
-      name = "kde-l10n-nb-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/8mvkdlcf0azzq8y5g1r2bbq15z92b8df-kde-l10n-fa-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fa-15.04.0.tar.xz";
-      sha256 = "1jmwjlbnlciy4k9szqi7vjwjpx94faixjg2mmg42cjfx5as9ws5x";
-      name = "kde-l10n-fa-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/01ryc8gdgvjawaki8qaw5dpbyibvng63-kde-l10n-nl-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nl-15.04.0.tar.xz";
-      sha256 = "0a3c7fkw0cczdd5733c7klfsffpi5ah1i6alqknm15y534bsigzc";
-      name = "kde-l10n-nl-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/g71kfpca8y88a0dmcrphban2vjvyr85m-kde-l10n-cs-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-cs-15.04.0.tar.xz";
-      sha256 = "1bl0w1qhk05xqniv1piik9gkj5nlcsb90bpxlvj0sd5ivcqxma53";
-      name = "kde-l10n-cs-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/afq8qa9cr7yli1djasn7xs9fg781b3dd-kde-l10n-ko-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ko-15.04.0.tar.xz";
-      sha256 = "181gzqhg6lc5z045l05zxz4zrc6hx36fmb91v62sfn2w70dc6jmd";
-      name = "kde-l10n-ko-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0whvwp9h1lrnqcf68qihaq5mlz73lm5b-kde-l10n-is-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-is-15.04.0.tar.xz";
-      sha256 = "050fdym6mlj1m1m594jglhjcxwk8dx4hc6p1428ldc19m4b9q06c";
-      name = "kde-l10n-is-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/fd72fjmwlgy7znmi7gz71qzd6fb9w5k7-kde-l10n-zh_CN-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-zh_CN-15.04.0.tar.xz";
-      sha256 = "0klkxznhfc5sfrlnz80fqf06lzk8g411cz2v0wpd2wjafk1pyf56";
-      name = "kde-l10n-zh_CN-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/g1nxxpcihfcb0kwk0bm53acvv8b0yfgh-kde-l10n-hi-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hi-15.04.0.tar.xz";
-      sha256 = "12qgzwiy0igz7i352dwk5ipsxhia0spi74ibk70xr7irr9axgidr";
-      name = "kde-l10n-hi-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/knj0hcr1dirq6rlhmw9dg1vl5ag52h6k-kde-l10n-ja-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ja-15.04.0.tar.xz";
-      sha256 = "1b8741fzhimf3bch6mc9hzdj040y50gf7fgd7ja5n5ipi0ma2drf";
-      name = "kde-l10n-ja-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/lg8jgickpm35z3mfypigxhngq4r93c2h-kde-l10n-mr-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-mr-15.04.0.tar.xz";
-      sha256 = "0v2mcmrpqz31yix7z7kcjcfpwpghsifnvwmdf1k1lif0a9mq5qq1";
-      name = "kde-l10n-mr-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/yq2f4v4vfafxk8j1j1v97jbh39bklnag-kde-l10n-pl-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pl-15.04.0.tar.xz";
-      sha256 = "002nladxsgh9pamcaibsx7z7dcvcpbii9dyql8v3845wqjpgj8wk";
-      name = "kde-l10n-pl-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1i36fnf4018v9zc0awz7raqbv7269cay-kde-l10n-ug-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ug-15.04.0.tar.xz";
-      sha256 = "094x3jnaby75q1j7q6c79y0sw63hsqqvw1qv0dzjgghky7qs584s";
-      name = "kde-l10n-ug-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0svv0vq2dl7cm4wihdsp459m404jvimk-kde-l10n-pt-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pt-15.04.0.tar.xz";
-      sha256 = "177b455rgdrm021lvwlx6xgbnk3mh38l6080i2v52rzjm6bmchsy";
-      name = "kde-l10n-pt-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/h1i1cg1qhsxfiffalx4j4bar3nbwjpjr-kde-l10n-gl-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-gl-15.04.0.tar.xz";
-      sha256 = "0l27hrsd1pbk3w0lgz34zspmc6b4cs4y0p8i6y1sq51sd5p8qwd4";
-      name = "kde-l10n-gl-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/vsqwvz9r39nypa1hcxnn3figzyngpf6v-kde-l10n-ar-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ar-15.04.0.tar.xz";
-      sha256 = "04djbcdq3z4iysbvdiai2qd7wm9zx5fp400k3zsw36150g93ar7q";
-      name = "kde-l10n-ar-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/vaih1nkjz81vm6vgfy25iqd8dxrivsqc-kde-l10n-ca_valencia-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca_valencia-15.04.0.tar.xz";
-      sha256 = "0ij9xp47mv63hgdbri7cmvld3zgg0sfgip0gg7iqinzkj1cifj9f";
-      name = "kde-l10n-ca_valencia-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/sc5haa7ci8zwglc03s60bc5and8ydqgi-kde-l10n-uk-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-uk-15.04.0.tar.xz";
-      sha256 = "0n01ypzyqr8k30hakahpm68430bgr207yv5mbw2parzj3xbwzpbl";
-      name = "kde-l10n-uk-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/fn45av76smcp2bj01aphy1m49na74jlz-kde-l10n-el-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-el-15.04.0.tar.xz";
-      sha256 = "0xxfqc1hzf3nbvja8c6aq6axpwx64ifqz32nxw4171valjj1faqv";
-      name = "kde-l10n-el-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eo-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ijscp8qiliavdzda0k4vzgmfp30a065q-kde-l10n-eo-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-eo-15.04.0.tar.xz";
-      sha256 = "12j9ggkgjbz229iwzpb19hjnl6zy2fvgkk68mh133ij3ik70i3bd";
-      name = "kde-l10n-eo-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/lm8d1vbsplg0r6z7ksir7z9nqjy7c0pj-kde-l10n-hr-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hr-15.04.0.tar.xz";
-      sha256 = "0a0p1bspv849zdja86rw7lvg60h6rgl1g5hc4zajmq9sviknsy3k";
-      name = "kde-l10n-hr-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/bm9c9n9jln8aadmjmqhjqh67vd2d3126-kde-l10n-lt-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-lt-15.04.0.tar.xz";
-      sha256 = "1l899bj9zw5db9wf6zhd6f9mpyynwagk907q8ws2xh6nlgrs9ydx";
-      name = "kde-l10n-lt-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/bp31anbdx5f3blgdnhl205vrqw9jgfx0-kde-l10n-de-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-de-15.04.0.tar.xz";
-      sha256 = "1hd0pz2n0l1hs5dy8426n53w8d0a4mys7m7wyihs0a7akf76cy4s";
-      name = "kde-l10n-de-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0a57w09ilczqr5dwwz8x8qvgqq4wbzpj-kde-l10n-ia-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ia-15.04.0.tar.xz";
-      sha256 = "03wir3y5hz3fnkqqv97bcjv4rc768f953y8dqsc362a61zidw70l";
-      name = "kde-l10n-ia-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/whhz3930c4q5n50v7n9xbzc6l4xblf3m-kde-l10n-tr-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-tr-15.04.0.tar.xz";
-      sha256 = "0h1997x62ycisnfnbawjfqfwblh6fhqqscns79f7d7krxhfyq7cr";
-      name = "kde-l10n-tr-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/22fjrzh19zha3ldbwkb7l64gnnq60i5h-kde-l10n-zh_TW-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-zh_TW-15.04.0.tar.xz";
-      sha256 = "077pr968z7d8ldnv87vsfn9j13llx3qqw9gwc041c9av73vp4ccg";
-      name = "kde-l10n-zh_TW-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/16bpvmlzzw1cqjmrlvznd5751p1fsi18-kde-l10n-sr-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sr-15.04.0.tar.xz";
-      sha256 = "0yicfyaj6zckk0x9skw9q3qnh0f0vz6pmahgh1pd5ayl3sqs8dhk";
-      name = "kde-l10n-sr-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/zv04hsibpg539rzkg1g7h2nfm946pz8h-kde-l10n-lv-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-lv-15.04.0.tar.xz";
-      sha256 = "1r2fahydjybk5zparmn4wjciys5kjsjps2mkhlk1x5k9aa0wimjg";
-      name = "kde-l10n-lv-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/04hs3q4dknk3b305zqibxskqnzm4f6r0-kde-l10n-hu-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hu-15.04.0.tar.xz";
-      sha256 = "010d3x7l1kadp3wj2v9jg0bjd9d3xw2q3ql7i21705s2zi2any7k";
-      name = "kde-l10n-hu-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/5n06i2kass6wqnl6ql28s1ryrbj2399y-kde-l10n-nds-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nds-15.04.0.tar.xz";
-      sha256 = "0asgj3dkbjgcabl4qrz3i8dv0i0348dg6q0fk1sgicm4257y0a7l";
-      name = "kde-l10n-nds-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ai53nz76fbqj1adsl4lb0byvvcn8bg2v-kde-l10n-sl-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sl-15.04.0.tar.xz";
-      sha256 = "0jm6b37irpp0jabad4jpqlvpw6ir5ygc0cs49138hb58kcjwi54v";
-      name = "kde-l10n-sl-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/p18pga44549fxqa0ksijc057dd5phbd6-kde-l10n-ro-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ro-15.04.0.tar.xz";
-      sha256 = "1lmjz5578b1xbgdgrrlgv6vyiara2n5595kd0pg70s1ixvd986as";
-      name = "kde-l10n-ro-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/6grb8a1wydjjdkn2vkv2sj1dd8wp4317-kde-l10n-ca-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca-15.04.0.tar.xz";
-      sha256 = "16n29ja4d83g001js682ijibblhfwfb8pww561bcvda84qbvhham";
-      name = "kde-l10n-ca-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/izn9fzf1r2xyc57rj889rc6ziv9kjsiz-kde-l10n-ga-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ga-15.04.0.tar.xz";
-      sha256 = "1n8prxqxxr8r76ry0jaszsn446y8vdk9b629ypj8s4d0byz336bq";
-      name = "kde-l10n-ga-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/pbaf3bd49drbap8bx58pgz85xllqvjhh-kde-l10n-pa-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pa-15.04.0.tar.xz";
-      sha256 = "18rqlh26qc4h7jbsa6jq27k5d1d5kwdbrd1slm8fcw67r6iw72ai";
-      name = "kde-l10n-pa-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/311y10ml4kxpkicjlja7k6wwm05yd75p-kde-l10n-et-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-et-15.04.0.tar.xz";
-      sha256 = "0hkh800rx03w5gvy1lc7fn0s5kldihcaml5ryvx0g1qrj5k61b3r";
-      name = "kde-l10n-et-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/lld8r34x3lclrb30p8w0qr6gw117h923-kde-l10n-wa-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-wa-15.04.0.tar.xz";
-      sha256 = "0mivzilb2f3fp5wn2vc6c3z20n0l4cdpckyk43fdb4h9sys02xs3";
-      name = "kde-l10n-wa-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ajsr93ly7db9pwjjbrkvr5r4n0cx03fx-kde-l10n-bs-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-bs-15.04.0.tar.xz";
-      sha256 = "0zw2q22lm73k04c3nb0596xd3hknfhc7gq9i4n7kj55sblv0mqzz";
-      name = "kde-l10n-bs-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/45bg2qd1nyjnnqi4yzpkkwcimlnr5fs5-kde-l10n-da-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-da-15.04.0.tar.xz";
-      sha256 = "1v07bazlq6420zkfy6m3jvwcyy2snz93967209204jnxkzf3ssk6";
-      name = "kde-l10n-da-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ack1f3vdjkjbzpdsai22ki3lncc5v6s9-kde-l10n-id-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-id-15.04.0.tar.xz";
-      sha256 = "10mr2d24akz5la2bz88y827dcv061sqrbi9awbiirgd2wqisnn8z";
-      name = "kde-l10n-id-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/gcnmv26q44ya6jb2xwhm4kvp8aqr059l-kde-l10n-sk-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sk-15.04.0.tar.xz";
-      sha256 = "13v871ahfj3bwaj0ha6fm6gpn7x9qw9m5dz89mfg3h5vskqv7akl";
-      name = "kde-l10n-sk-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/v7ln63jsr0v32l86rqyg6fpinzpjpns0-kde-l10n-bg-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-bg-15.04.0.tar.xz";
-      sha256 = "1p4y9rbxwwnghslwjk1m32a26h6pnssyj73ns1az3saqyfb85gkw";
-      name = "kde-l10n-bg-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/rkbbjy12la1p7l7vm5xk4hwy72f4piys-kde-l10n-eu-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-eu-15.04.0.tar.xz";
-      sha256 = "129k6m59x8f63f393jxx61s67f9gmaab9ilaqy2978d64l3z0bpv";
-      name = "kde-l10n-eu-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/fzwxz4747hfpjisg7n5kc77gb92dm3c8-kde-l10n-en_GB-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-en_GB-15.04.0.tar.xz";
-      sha256 = "16c255j3klss711iqk41k1kcf5nn0lwg0qr74c1abvgrnpsm261h";
-      name = "kde-l10n-en_GB-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/49fv8h0b5lzf4cm5qc6baj9sk9k29pnz-kde-l10n-sv-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sv-15.04.0.tar.xz";
-      sha256 = "17z9yvw9mrjb7h3qa4zc18f5z2n6b0gr4y76s7jfnh8kpjgm1sgr";
-      name = "kde-l10n-sv-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/30j0lkfk4p7pwv4nyknvm1wbd93cfji7-kde-l10n-ru-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ru-15.04.0.tar.xz";
-      sha256 = "18l7wnfr1indy8im131lxd45da9x49ii1iavi8g1lzmqq0av097z";
-      name = "kde-l10n-ru-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcalc-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/4qsl43z86wq82bpspki2y4gfn8iy6xag-kcalc-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kcalc-15.04.0.tar.xz";
-      sha256 = "0rkvxbz9s5wqa054bf1xg3rza95plvnakydlny04iw5w8i33i5yc";
-      name = "kcalc-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkexiv2-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/dnl3qi3ldzmf1yl7m8yzlgxyzvj6bm4k-libkexiv2-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/libkexiv2-15.04.0.tar.xz";
-      sha256 = "0zv8yjgwfdvkl2ss2gyv6bqbc3qgnz3hryhcjdyfa56kys6xz7n3";
-      name = "libkexiv2-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kigo-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/yvj9sxfh55nvnlvcz4b12iqqgnd3p33y-kigo-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kigo-15.04.0.tar.xz";
-      sha256 = "00ggvrs3mm5f2q6zkdsxbrhw8vgb0h4p4dk3v0agf3q4bqr86akr";
-      name = "kigo-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kopete-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/9yn7mj3csimgx1r4q6bp9gknh5bqnw49-kopete-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kopete-15.04.0.tar.xz";
-      sha256 = "01wl7n535j9l21zbzjhix33rhr0i4rg2bb25zxwk6sc2ahbsqcp7";
-      name = "kopete-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccounts-integration-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/qpc0c00mhc367aivilvkp329a4g6iqj4-kaccounts-integration-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kaccounts-integration-15.04.0.tar.xz";
-      sha256 = "1g2rn256wfl78ajxircaikq3hpj5nxfnk0294wz10srmg5a4hgji";
-      name = "kaccounts-integration-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdeedu-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/wyk34ah7lc3vvrcq4ldik6brm2jk9fiv-libkdeedu-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/libkdeedu-15.04.0.tar.xz";
-      sha256 = "140ri9whmvxjlj2i0bdpyr07zwspyl5d1bh91vm8hv2zdgmxh1rl";
-      name = "libkdeedu-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "superkaramba-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1ck2s3vi0dksdlis3cghy8advap8y5a3-superkaramba-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/superkaramba-15.04.0.tar.xz";
-      sha256 = "05j93sa39m78vlxdy4haqj5913dyi6kab5sspi8ky0why17zmaav";
-      name = "superkaramba-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klines-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1zsl1wawlhzgyr53hfrn5dzqwii51ib8-klines-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/klines-15.04.0.tar.xz";
-      sha256 = "0c0saaybxjshwap5rydc0606xkwmzl696r41fhkvr26c077p09p4";
-      name = "klines-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cervisia-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/qmkqp9sgai9djwishibis5qckhl9dnrf-cervisia-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/cervisia-15.04.0.tar.xz";
-      sha256 = "097hayf2k2fv3d90jnhlh4iq4qvk3v0qg7ywchgipzsz0w6nayki";
-      name = "cervisia-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ark-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/nms2hq3a33k03lmhh8y7swiggglcysxv-ark-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ark-15.04.0.tar.xz";
-      sha256 = "09jcz7x5rjazz8xvxy3kx32v21ig736m5gxyxhl48inxaypxxd21";
-      name = "ark-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "palapeli-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/zsh3ssjxmxggzf54kw9f73kzpy7y3n9d-palapeli-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/palapeli-15.04.0.tar.xz";
-      sha256 = "1iql188gysjnhym1mj9h2cizydgd97pal37zkxljc9qhqb58wq3d";
-      name = "palapeli-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnakeduel-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/9qg39s2sb7r8sdy37hm185jn7dsv24q1-ksnakeduel-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ksnakeduel-15.04.0.tar.xz";
-      sha256 = "1i32mrc50isz0q0gzfkd0fz8in2hhc8d61q55dprq3ps28lgd77n";
-      name = "ksnakeduel-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kollision-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/qxc07ckfn60wcyb8cs75dy2d8gbj211z-kollision-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kollision-15.04.0.tar.xz";
-      sha256 = "0ch3h3g0hgm52l13v6wdrvacabwkvzx537bhfib05prb9604vkn8";
-      name = "kollision-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kamera-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/6l8pgg55qph99rmprrgz56vvv621zbjk-kamera-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kamera-15.04.0.tar.xz";
-      sha256 = "1mjpbcslba9wnxrvm4xg6kfy11msn7kvxln98ak55gvpfh7zhm5r";
-      name = "kamera-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klickety-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/iwlkabdklb3v1md6vdsjw8x09vv0kzzv-klickety-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/klickety-15.04.0.tar.xz";
-      sha256 = "0l8vk4gkfjs71xfzw9lg18g9xg4yf4l9jy1f9plikw9gfm7br90p";
-      name = "klickety-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolourpaint-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/h5x9pzbiq62jgwfln5gx6agzcfyz2j3s-kolourpaint-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kolourpaint-15.04.0.tar.xz";
-      sha256 = "00vyblqgp7hqigid6xgj31b8jkqb8jlsvnbd2ci4zg7s778l10sz";
-      name = "kolourpaint-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/zdqama1r97132n4ks422yzr4zhh6fjmq-kde-base-artwork-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-base-artwork-15.04.0.tar.xz";
-      sha256 = "1r3w4ab9vls7wyzy6g7ashnnixxid894ghqc5yzhpn4x999y65lp";
-      name = "kde-base-artwork-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "gwenview-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/3wkajcx7p2wdzldbjb94brqlfqhdn54k-gwenview-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/gwenview-15.04.0.tar.xz";
-      sha256 = "0h8ndywh8w9wx0zisl1b9681d7zqx2d3ki40zxdgk4clyl34aijb";
-      name = "gwenview-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/lgapni2v7qsl3wsi8wx0vwcav9almhs8-ktp-desktop-applets-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-desktop-applets-15.04.0.tar.xz";
-      sha256 = "1byv8dk864vwl4s5c18xjh3ckdzr9d7gq1mjrlaslxang7fr97cx";
-      name = "ktp-desktop-applets-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/lqdl7ks619gxdhnaa9q0axni4pz3h5v5-kdesdk-kioslaves-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdesdk-kioslaves-15.04.0.tar.xz";
-      sha256 = "116xj9i3iwzbz41n3bka6xg0yq88iwzw066dy5dbs3yxbpmky19g";
-      name = "kdesdk-kioslaves-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/dymdah33hpq9qn07qcz402ijmwc67bvd-kdenetwork-strigi-analyzers-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdenetwork-strigi-analyzers-15.04.0.tar.xz";
-      sha256 = "1zsa3ky6plfksm8k8hgd93d0awrsi5gqz3qbqfbzj3a2qic7nim6";
-      name = "kdenetwork-strigi-analyzers-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmix-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ql4a0i42ij33kd9y7qg4ng1a0p5j2sqs-kmix-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kmix-15.04.0.tar.xz";
-      sha256 = "0yj0byy98243c83bw938i1x8yxgbib8vr2s831hpmqi8h3v7xvyg";
-      name = "kmix-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktuberling-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/7cp8mnviqns6ij94xxz3mpizdc1avln9-ktuberling-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ktuberling-15.04.0.tar.xz";
-      sha256 = "1kqz1g0r3icgx3brd8qlln29mxcx9b54kvl8wdar04r8ckk0m733";
-      name = "ktuberling-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kturtle-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0a3rrj74sfwhqwjql88gqzw8qbmf8llr-kturtle-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kturtle-15.04.0.tar.xz";
-      sha256 = "00r3lzqa0sazccy28kmackqgqwcyqsl3mzjs7vpg4i76f0agfx4h";
-      name = "kturtle-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/gszm27h7rghsvkvhyf15xnp5bgjj18in-kde-dev-utils-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-dev-utils-15.04.0.tar.xz";
-      sha256 = "1vvrrb4c94apc67fg3gpzgfmhylx6m7xfyq0y5kjxk8l91fl2bdi";
-      name = "kde-dev-utils-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktux-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/cd126p5pizh2ha1jadg82csdzazlln49-ktux-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ktux-15.04.0.tar.xz";
-      sha256 = "1j5h65vdigym6ldz7fpn2kidxphfl02l4afg0jmj55wrym1vvc0r";
-      name = "ktux-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/xbdr5s1xf4f58lpshppamii1j5rl5ll8-mplayerthumbs-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/mplayerthumbs-15.04.0.tar.xz";
-      sha256 = "12d60nkmfp16pgrfh5brl80n1y7crmdzk5k3ad313l4ani99z45r";
-      name = "mplayerthumbs-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblackbox-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/72rhcbzax6ahi3myznpi1fkh0x9cq6ay-kblackbox-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kblackbox-15.04.0.tar.xz";
-      sha256 = "1w55nzadmkgspngxwazm6nfdf3s72rw4l0absx1jhinln7mif8w8";
-      name = "kblackbox-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktouch-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0p1m96gmy2rw5pyy029j4257b32ziyvx-ktouch-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ktouch-15.04.0.tar.xz";
-      sha256 = "16gd6rghz1caw88yh32728kcxj79688g4hw3dkmgkayb5wcwnwl0";
-      name = "ktouch-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dragon-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ha0s2dfbqb6gjgwq5451gbcgq6h3q16r-dragon-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/dragon-15.04.0.tar.xz";
-      sha256 = "0rzyra1xqjyrnx7926dql2fw9avy7rwx9x86v894xppcjqsyr3jx";
-      name = "dragon-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "katomic-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/dzv478dhlwj11gpfd0k7npmyw8z09yfw-katomic-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/katomic-15.04.0.tar.xz";
-      sha256 = "0vbcv973ppijip8l1y2kkj93rjxbcj3xw6pypw50w3pg168s1ylv";
-      name = "katomic-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmousetool-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/8ws0s6acsrrq7x0lvy61vy4sqhndbakm-kmousetool-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kmousetool-15.04.0.tar.xz";
-      sha256 = "005y7jp52f4x9193dxql8wwmimbylkazl671di2gfvrmcrh164n6";
-      name = "kmousetool-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "rocs-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/palrbcvrwp2vxf67myadgcvr5wl8v3pq-rocs-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/rocs-15.04.0.tar.xz";
-      sha256 = "03ibi17331vcjzfc38agalbybn7k06favm0sgcyg68qribpcwmg1";
-      name = "rocs-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/b7716r5kxhznfdlp9cwp3vf2vhsv1r1c-kde-wallpapers-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-wallpapers-15.04.0.tar.xz";
-      sha256 = "0ckvbsdim0485h4f9sz1z0qgbb61n8l7ncwr80zm7vpnx46xzavm";
-      name = "kde-wallpapers-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdiamond-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/p1f9xs4wkbdi9cmry7wc5686dxy2fvsg-kdiamond-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdiamond-15.04.0.tar.xz";
-      sha256 = "01ri6nj217dmg2xgm4ra4gdsabk28c8bkw6z69x5smbczjshdcr4";
-      name = "kdiamond-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkipi-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/jckns8avmk0k34k62f77bdrl9cbf01nr-libkipi-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/libkipi-15.04.0.tar.xz";
-      sha256 = "0c90y8f70k83pxxfx6mk6ar6zw7lf2l7mib526x8s7j534ya57ad";
-      name = "libkipi-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebdev-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/wlx7pxcwlq5f0w2hrlms5gfxfixzfzbc-kdewebdev-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdewebdev-15.04.0.tar.xz";
-      sha256 = "17gizsgvw5ihibsf8z2rmczzkqp1gp5jbyvvsairgzv1izryi6ah";
-      name = "kdewebdev-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccounts-providers-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/3vyd044k6qmjnxc7sfig6q90g2dr58lf-kaccounts-providers-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kaccounts-providers-15.04.0.tar.xz";
-      sha256 = "1b5cp6winxa9slqaq6mrf4y4py1d7ps55088gs35qcwrzyna04l7";
-      name = "kaccounts-providers-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "marble-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/7kh58mg7dnd0yr6nksbfki20rncdqm1w-marble-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/marble-15.04.0.tar.xz";
-      sha256 = "0d6i7wwf220790ld5qgd30gph9y71a75ybjjfg81k13a4jg0ndk4";
-      name = "marble-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/rrdyv611nn7kbnkr1fnvn6xkd01k8zwb-libkcompactdisc-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/libkcompactdisc-15.04.0.tar.xz";
-      sha256 = "0nisrgpcgf4r83q7p82b8xfpzq96qjk8362i6dalsb0jcakia4c2";
-      name = "libkcompactdisc-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.7.tar.xz" ".tar";
-    store = "/nix/store/fjrkx2vwb6m4kfl01sa4r23wbvmsmh05-kdepim-runtime-4.14.7.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdepim-runtime-4.14.7.tar.xz";
-      sha256 = "0ywg703sqidxif853gfmqriymkkp9xzkfxd863p1sw35n1zhfkam";
-      name = "kdepim-runtime-4.14.7.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-icons-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/akq8y3wjkvbzwyzwxyd1vkmqygmc78p4-oxygen-icons-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/oxygen-icons-15.04.0.tar.xz";
-      sha256 = "1ysy82war9n1dm5nwj69aasz9abp2zf5dmw92gv8brzyrn8svn9d";
-      name = "oxygen-icons-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpat-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/af38swaxzd4yavh6iaxq3ha8xn3q9gmf-kpat-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kpat-15.04.0.tar.xz";
-      sha256 = "076jrjrs97353pw39gbanjf5s8l4cj8g2zapngyc1kwm6q0jry5w";
-      name = "kpat-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "juk-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/bbvywnmrg713gdmzxkndkcyjs7jmdazj-juk-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/juk-15.04.0.tar.xz";
-      sha256 = "160n9wpx0krf1nlpa3hbj0b1yblgq68mw3c9is2j41k0p2b7divi";
-      name = "juk-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kspaceduel-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/zx8jk8s9mrfga1467a42hfdz0w144p66-kspaceduel-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kspaceduel-15.04.0.tar.xz";
-      sha256 = "0drb3628l47qp35h8vyz66ma6ph5v9sg2k9dp0fghrhwp1x983fv";
-      name = "kspaceduel-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "picmi-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/rrqb0hx0kb96y9x2j65vbyq12pk4m875-picmi-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/picmi-15.04.0.tar.xz";
-      sha256 = "0abas2qx83a35dghrr5gbsvgc0lg0vk0br18nizi82sbiawls24w";
-      name = "picmi-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "artikulate-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/a4vr2g2m7hr6svmbdkg89na3zvsh4fg5-artikulate-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/artikulate-15.04.0.tar.xz";
-      sha256 = "1ghffybaq2p9jx7cppbji8jk0dbblw3mh3czfzfms92ahy9xzcbz";
-      name = "artikulate-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeartwork-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/3yyj9dcqj7b2zjrz5w7j20h0pv10gnid-kdeartwork-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdeartwork-15.04.0.tar.xz";
-      sha256 = "0kwscj036gjvai5knw1jpxjacllza4y8wnlv24lp19f2s61jqq24";
-      name = "kdeartwork-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksquares-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ayr2hry1z8z3v8q8a4iamck9bsxy1pdw-ksquares-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ksquares-15.04.0.tar.xz";
-      sha256 = "15a605pc7jfsrsj1jj3lqy42z1bnw4pppx0hv51xlhiza00s2kww";
-      name = "ksquares-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/4kb7k1cfzksinnw0d08nginvli44rwx8-zeroconf-ioslave-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/zeroconf-ioslave-15.04.0.tar.xz";
-      sha256 = "0fqqx0ji1v0cz87qb0kig9kkfdigmdfmz5qw1y2kx25mb0rp1g2i";
-      name = "zeroconf-ioslave-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "svgpart-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/n8v8kbzq9vsghk0nc47rl49zqfz1w182-svgpart-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/svgpart-15.04.0.tar.xz";
-      sha256 = "0985jjy2mghs57sy53mkas5p9ya0makrkklq99s04rgl93f2akj1";
-      name = "svgpart-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bovo-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/sigbrnva6hymkgnjd48aw65s7vrysi2g-bovo-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/bovo-15.04.0.tar.xz";
-      sha256 = "0iffvb4m9bszpxh8s8yrpyzawyflwcbkajib5h1lw8xsgi6vcqhc";
-      name = "bovo-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kig-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/lv7d5hvgs42razrzhd3g60i1gpzb8w06-kig-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kig-15.04.0.tar.xz";
-      sha256 = "1v9p9f9dk3f2bfbwic1vf8ky5ziac4vx0vh8wxshzbjjb89kxkq6";
-      name = "kig-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/8g1l1dd5cccy6ncaywfhpf1x2633dk37-ffmpegthumbs-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ffmpegthumbs-15.04.0.tar.xz";
-      sha256 = "0j0x8b0gcwyzx307rvhrx4k4g530lgyl5rzvdpkjqpga2qjg8q96";
-      name = "ffmpegthumbs-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "parley-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/piznlrz9g0kvy1262p87db03830mx6by-parley-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/parley-15.04.0.tar.xz";
-      sha256 = "1f6nmnjz84cm8yk53whjm7k471y2vj106m7q230xj1g56mb5adrc";
-      name = "parley-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lskat-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/6bdihbmhk9vdr9mzj52alqhvav2x1lc5-lskat-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/lskat-15.04.0.tar.xz";
-      sha256 = "12mnvbisbaiychdgk6fb464lwvpjlkrwdz5101sdrw466c16a2a2";
-      name = "lskat-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgpg-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/fys5hj4c13arjjqrh4kn8vyk92zrgz25-kgpg-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kgpg-15.04.0.tar.xz";
-      sha256 = "1n37jh3zl4zb3dnb9lvjpni7gl6sb9s1jwmvf4jvqmqnlqny1b4f";
-      name = "kgpg-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kruler-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/2c9221fqxkz6ajx8g2l7xnhcfj8iivki-kruler-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kruler-15.04.0.tar.xz";
-      sha256 = "1pnhram0g6hfi2k13xhixwpr9vx1dhkvivn1y1ydvwk26klala1w";
-      name = "kruler-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscd-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/9yidmqhziwp6sj4l0pzh1gvmhi5g1ny6-kscd-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kscd-15.04.0.tar.xz";
-      sha256 = "079sj1g5mn32b2l2l9qap55s5sr6bv44a9ncswibkr49vwq7va10";
-      name = "kscd-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdcraw-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/5y5x3vr7zibkhk5pk7hz5ibkza56d54s-libkdcraw-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/libkdcraw-15.04.0.tar.xz";
-      sha256 = "0h7m6m27jsp4xh6ywrbxad3c413ipzfgz357ahffqcafdjw6yfx5";
-      name = "libkdcraw-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksaneplugin-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0z48pwb041r7sfwzvsxdqyw46bxy6d7d-ksaneplugin-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ksaneplugin-15.04.0.tar.xz";
-      sha256 = "1wh83c31x1n7vipi6m29hsinrpzwsvjnj3psg6s7bywnb6if2ir7";
-      name = "ksaneplugin-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lokalize-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/5by08m2jgiap41wrk8kg7lc8b6q6ifwh-lokalize-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/lokalize-15.04.0.tar.xz";
-      sha256 = "1nikpfjnmm3ws2qd46zq6g5v64dbfa7pmbp8nw1sv7dcin3k42ll";
-      name = "lokalize-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "granatier-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/w9bkpa3frqgnh07gbaln9m15nhj0vdcj-granatier-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/granatier-15.04.0.tar.xz";
-      sha256 = "1s5jkwqzjlcd343sm6akzx56a48yvx7z9n3cww9gxrjl76q1a19c";
-      name = "granatier-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksudoku-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0ssavwdndi5h0mc3cjrgn1vpfz20wmdm-ksudoku-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ksudoku-15.04.0.tar.xz";
-      sha256 = "0bxcjqpkqr5zbjrx8drmjvjgnyjvpqbvmqgyfsidm8rgfg6mi3fz";
-      name = "ksudoku-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmplot-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/76appqh3cg62681baq1cy6fymadaq2c8-kmplot-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kmplot-15.04.0.tar.xz";
-      sha256 = "0fnvjixnp2iyjg0hgm6lkry407f0fh39kb184jzaakrp703m3jmi";
-      name = "kmplot-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcachegrind-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ys2xzw0hck8gp7g79m933580y7rix754-kcachegrind-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kcachegrind-15.04.0.tar.xz";
-      sha256 = "1q1z0w7c7j8ii97n4vcd80qi6hb7gsg6j9l3md37ls8c4qvhknx7";
-      name = "kcachegrind-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbreakout-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/x4rsvf3qzl921vgamzjxkvwjw971r917-kbreakout-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kbreakout-15.04.0.tar.xz";
-      sha256 = "039g4qmmkf3lq8jx5vgasvqx19k3xbvfkm0j9his61z021ldjxla";
-      name = "kbreakout-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapman-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/82vlfb4yna41mip5zpkal4kpy67w4kjv-kapman-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kapman-15.04.0.tar.xz";
-      sha256 = "0glc8hcjs89s5cxa77f12pzlnmvr74kiqhcrk7djz98pnqwlsn5v";
-      name = "kapman-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalgebra-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/346qqpdqx5hdzyvd4dlkag3ir951fjp7-kalgebra-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kalgebra-15.04.0.tar.xz";
-      sha256 = "07czg7i344qq93y95f46qvk3zpghkl3gcr8cd8wgc0v0b1mdmyfm";
-      name = "kalgebra-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "pairs-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/cd5q5wchjl2ncm44pwl156jks832y96z-pairs-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/pairs-15.04.0.tar.xz";
-      sha256 = "1d1va0b55fwivsvcz3izr680nl4zbyn44fdnirglw7q25278p7bh";
-      name = "pairs-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khangman-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/krpgzhpksq4kr9r78w9f6rk2q0963lwv-khangman-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/khangman-15.04.0.tar.xz";
-      sha256 = "0cnaih6xhg11wrg0c3v7lir2yknc4k6m490aw7bhraz98kfxr905";
-      name = "khangman-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konsole-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/qb3gypyd97v9cakicf44q7xnwfmyqsyz-konsole-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/konsole-15.04.0.tar.xz";
-      sha256 = "10qgynn6x7cxyp6lgri0vggmzmcvckwvrg9mrycdnwwrsfabscrc";
-      name = "konsole-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "analitza-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/c9xwpgl8bdp582w91zrchhywr1j9xm9r-analitza-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/analitza-15.04.0.tar.xz";
-      sha256 = "03kaaa8kp92lsva5shzqb9497wmhksm79pc39ip5l50lqac9gr1l";
-      name = "analitza-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksane-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/6qn668dc4yppjwyc1ms0698nkmxj4sxm-libksane-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/libksane-15.04.0.tar.xz";
-      sha256 = "0rnja700hwjn4bvy06lijndic2zryn64kybvj71ip6knq3nx77x6";
-      name = "libksane-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbruch-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/g1hbkl20wkzglhaabxizzhrl1xpkfiy2-kbruch-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kbruch-15.04.0.tar.xz";
-      sha256 = "1662hqqsf1rnfwrqwx5wpl0cvr9313sh8bla2sig8v2s8v2lyyi6";
-      name = "kbruch-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmouth-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/dwkbfqj5a21hcryw42dwqw9lq1r4ld0d-kmouth-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kmouth-15.04.0.tar.xz";
-      sha256 = "1swvdrlcfxv312kncihvxba0cklmv47qyr2dbrkhb9s9v6jbiqb3";
-      name = "kmouth-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kppp-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/8c2srwnwg41aypvjqzs08129wm391p2q-kppp-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kppp-15.04.0.tar.xz";
-      sha256 = "1ml5lc20jg05zfq9d274vqp7k7fh5369zshp073bi6zjj4cm7gss";
-      name = "kppp-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmag-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/gi6kw8zlmpy8gjijr34620dzp858h657-kmag-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kmag-15.04.0.tar.xz";
-      sha256 = "0wmarmybn56mppwb33cjg96906hh4vbnwxqpw2441axn5vqmf90j";
-      name = "kmag-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-workspace-4.11.18.tar.xz" ".tar";
-    store = "/nix/store/b65xpr56hpmfinssggl4fq88lky5czlm-kde-workspace-4.11.18.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-workspace-4.11.18.tar.xz";
-      sha256 = "1rvi88flk8c1j6qdkxak3sy1yf646ql3zipxw2azchwzd4k54mzv";
-      name = "kde-workspace-4.11.18.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnapshot-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/zim1ydmdxhwv0cypdviqdnn0nwz2d66q-ksnapshot-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ksnapshot-15.04.0.tar.xz";
-      sha256 = "1577ybwpa52lmv5pd0223pz5l3q4h3475fz5qp3sm1rwi0nzmawq";
-      name = "ksnapshot-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okteta-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/8z78fks7wl0rf3077yrz8hzvqvmxn516-okteta-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/okteta-15.04.0.tar.xz";
-      sha256 = "0svgsy838dlc2krn2rzb65a6i0dfav4xlmi4174d23qhaikl1z42";
-      name = "okteta-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "step-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/argcpdljdar6ga3psyz4wzr3kmvkmf07-step-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/step-15.04.0.tar.xz";
-      sha256 = "1fl4zmj4k3g8c7bas7dj2n82qlbq8k5p3s5bflcillrz6pdd4s50";
-      name = "step-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-kded-module-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/n3b0rfacc8i5p5hlgal66zr9gjfrkda1-ktp-kded-module-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-kded-module-15.04.0.tar.xz";
-      sha256 = "0ijinvp48aixx8fjdc8fxpm8ilzsn9pkhsiinh47wiabyjb8rj3z";
-      name = "ktp-kded-module-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwordquiz-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/yik5ibmcy9k87y41nk3b03w1j2p3012c-kwordquiz-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kwordquiz-15.04.0.tar.xz";
-      sha256 = "10rq7zdd8i8dgmjzxgn6139ixzm5kzwiswal0cmkd42wwbdn6fml";
-      name = "kwordquiz-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs-4.14.7.tar.xz" ".tar";
-    store = "/nix/store/xd5jr85rzdnsrw18ab811q6hcwq1f4vk-kdelibs-4.14.7.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdelibs-4.14.7.tar.xz";
-      sha256 = "1zhqvyx8gq7514mr0423z0gl1yn33snh53fj2ijkk4blhjga601q";
-      name = "kdelibs-4.14.7.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "killbots-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/nshwyzk14mam2av602sqzcxnwjzpny6k-killbots-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/killbots-15.04.0.tar.xz";
-      sha256 = "0a9jn8i5hw3v7kr6vqagxkqvvjs6qsb23g2khaxgbw0x0cz5nqx4";
-      name = "killbots-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/55ksfn4hq342qbl8cm4jf8k8mmra096n-kdesdk-strigi-analyzers-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdesdk-strigi-analyzers-15.04.0.tar.xz";
-      sha256 = "0k00ip8ll1i96cazs78c6al1yjcnvpr1awb6g7yvvq019icjmzvn";
-      name = "kdesdk-strigi-analyzers-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-send-file-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/90s1naljnqa6r99nl2dpjsf8rjb3k7cp-ktp-send-file-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-send-file-15.04.0.tar.xz";
-      sha256 = "03i6irask1ccngwapirnc9vpk4nw7r82zl6jdnh7w9988c2wdl22";
-      name = "ktp-send-file-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/n2vy60sdgnx3gb6fmmgd03d4jnn29nmz-dolphin-plugins-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/dolphin-plugins-15.04.0.tar.xz";
-      sha256 = "0a1f1si598cmqd0j9v6pz0w8s6286xg2wcfxzrmkr994bfkydd8c";
-      name = "dolphin-plugins-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksystemlog-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1wy9hsww32i53nv94bnzj83hfqw3x1ir-ksystemlog-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ksystemlog-15.04.0.tar.xz";
-      sha256 = "104yg6mjnhznsylpv8faqih9rpdxyp4667dagq7f1kfajy59jh1y";
-      name = "ksystemlog-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/x1qmhlskhz0ibs1pnxcb30bj1yk3f447-libkeduvocdocument-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/libkeduvocdocument-15.04.0.tar.xz";
-      sha256 = "0lqp2qfsdjkchnb5xrbj9hax2bf4ls1wk7pmb364qvkkhfia8qv4";
-      name = "libkeduvocdocument-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmines-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/3vf7rffgww1k7byna7p05d0115p6924y-kmines-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kmines-15.04.0.tar.xz";
-      sha256 = "015xximi3xydkbygzlka7y8nmls3dc8jvr3dvvidl57gl1szmx73";
-      name = "kmines-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkgeomap-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/amqrx3hwvwrz8rgk3dljj11bvfpx4plm-libkgeomap-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/libkgeomap-15.04.0.tar.xz";
-      sha256 = "0yd17xa085rvxsnsah6ny7w88lbs7c1ilxrvbpsf2rvjkbl96giv";
-      name = "libkgeomap-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "umbrello-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/5lahf10pz3vdh0dngi3fsmyn9g8cmk5v-umbrello-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/umbrello-15.04.0.tar.xz";
-      sha256 = "14lw9rnqv7bgni1rxwmgm4jnx2l2x5524wysqlhyp7np35mzdnlc";
-      name = "umbrello-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bomber-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/7mf874dsxa6wj59zfr6s1n7399rvl7m9-bomber-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/bomber-15.04.0.tar.xz";
-      sha256 = "1hpss9jmjsjl2shm2y50s5js33rpn0gd20il6wq454wm0k0q7rpj";
-      name = "bomber-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "jovie-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/35zcglbjikb4ayp14d9l6hgs5myv5i6l-jovie-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/jovie-15.04.0.tar.xz";
-      sha256 = "1sa6agn9zp12n98v7i9rxng2yn25b4yf2s8q8rjb3qg93kmzzx4v";
-      name = "jovie-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-auth-handler-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/9vacywnw3knldygpgxjghjbw2nfqdszn-ktp-auth-handler-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-auth-handler-15.04.0.tar.xz";
-      sha256 = "1hj3vc6wj768xdpr02v64p9wbrh1y61zg2fal3bk3fzrlz2yslg5";
-      name = "ktp-auth-handler-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kubrick-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/9rjk1xbzbnc2qqrni0ng2spbzailrb25-kubrick-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kubrick-15.04.0.tar.xz";
-      sha256 = "1qxyymrqav9hwa2ldqqpr49aj5sqzmiin6c4rmbirxmaasmyqn6a";
-      name = "kubrick-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgoldrunner-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/l2lbbhnr6r0q1sf3rzzjnwina7gvlllg-kgoldrunner-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kgoldrunner-15.04.0.tar.xz";
-      sha256 = "1hsrjszck17gqnnpxzbdknj579n7xpmbq813a77736cmi95qr4h3";
-      name = "kgoldrunner-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "filelight-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/pr78axnbpxwah326z7jqhq4cz1p7h7wr-filelight-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/filelight-15.04.0.tar.xz";
-      sha256 = "18vcm8f8wgl0hqlycljv7kbq8iip5vadrsyhr58pw60cr8h36n0s";
-      name = "filelight-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kajongg-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/13030n2xwx0rnbd0myy87pfzrd93rpkw-kajongg-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kajongg-15.04.0.tar.xz";
-      sha256 = "0aa2c2c4322lv4prwxkhanw0lbrv1145w6fz473f6ybfhg9isc7d";
-      name = "kajongg-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-contact-runner-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/kw08x6m9wzrmhm6av38hz2nd18agxapj-ktp-contact-runner-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-contact-runner-15.04.0.tar.xz";
-      sha256 = "179q9707cxmd57iyadasdr9rvcqxwrahccc8vjylzh1x5p2arib8";
-      name = "ktp-contact-runner-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sweeper-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/yz48bx3mdyvapyz52aa846f32102jh7w-sweeper-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/sweeper-15.04.0.tar.xz";
-      sha256 = "15amamnrg7d52l0agkw66k96xk0j5shk2667wc9p2jy6g96cw53c";
-      name = "sweeper-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfourinline-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/s96mhycwzwrv5w708mz6appsbf1vivz7-kfourinline-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kfourinline-15.04.0.tar.xz";
-      sha256 = "1wpcdzlpy8jdnlzzhys8n08pknk7ncq41dchs2ii3v30w1dnwln2";
-      name = "kfourinline-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-common-internals-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0q8wks5hqas02y3j384lwqy2a1npvmch-ktp-common-internals-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-common-internals-15.04.0.tar.xz";
-      sha256 = "0y6jwqaxvkzjqdz4j3b4z5ybz4d3ci09x8apfr3h0q5pf4crkv8p";
-      name = "ktp-common-internals-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krdc-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ch18h2226p60xnyjndy40r8fgwajd80p-krdc-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/krdc-15.04.0.tar.xz";
-      sha256 = "1ikm5a8lb65iljdvs16ipclkassjjdf7i49whcvz71rx8agp01hr";
-      name = "krdc-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeedu-data-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/05dzvpk81hhrfp0yncmgnq8q8nlps3z3-kdeedu-data-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdeedu-data-15.04.0.tar.xz";
-      sha256 = "1r157dbi75ayxww57vhww3cjxv1z2y2mv54xh2cf3zfjv6kmp7lc";
-      name = "kdeedu-data-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1z4nb0mp0d654n7wmyddxslx82rh2y10-signon-kwallet-extension-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/signon-kwallet-extension-15.04.0.tar.xz";
-      sha256 = "1s3nm7vrwwgin278vif6w8yyi1vg9hk401swvlhwmn9305bxqm01";
-      name = "signon-kwallet-extension-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcron-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/8qjk4ri8l2cvvqaf5qpmzwz33gx0n9kn-kcron-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kcron-15.04.0.tar.xz";
-      sha256 = "0srq463k37klfbvrclhrni1kbn2bxxsfzp8l8lbx4dz8p93fcvdp";
-      name = "kcron-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksirk-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/hngc4aajjzr5qszkxi745fi8l28k8wp4-ksirk-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ksirk-15.04.0.tar.xz";
-      sha256 = "1rl2c1yjiiw3gy4kblxgf2lh2sd5bpwz36hi9kv1dvf00bwi1w0x";
-      name = "ksirk-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/br98dpkixyvcr4dwp6fqfcgzrvgqvps1-kdenetwork-filesharing-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdenetwork-filesharing-15.04.0.tar.xz";
-      sha256 = "1296rg0axk6gc765kv3wnqqb7mp45sqw8rvhz631ybbsvcy9vk6c";
-      name = "kdenetwork-filesharing-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okular-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/8lzrv2slw0ck39i94w8ms8zm5vfx2x9v-okular-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/okular-15.04.0.tar.xz";
-      sha256 = "1xfj7hm8149xn5g9yy56zd93bjs38k10009l6d2xynvqcd2k5sl7";
-      name = "okular-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-runtime-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1zj95rkrgbp4s8khzd7hjdnz9ndib9q3-kde-runtime-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-runtime-15.04.0.tar.xz";
-      sha256 = "0dpbmg8w5b2hq3fw38v3fa4w45lm1p06sh72rscsz2mc2ly6bkxr";
-      name = "kde-runtime-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konquest-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/p08rr4gqznxl4w3gfd7na11v8l1s8afq-konquest-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/konquest-15.04.0.tar.xz";
-      sha256 = "154vbny41axcckdi4dw928kvhfvw8j5b34l79dqa15lnsml92m6f";
-      name = "konquest-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-baseapps-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/g2j9js2pgakja03ljw9zl4xp9v2pn8l4-kde-baseapps-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-baseapps-15.04.0.tar.xz";
-      sha256 = "1xiv9qmv7x6djv7fg7khsqhzrnypr8dg1c3ximi9r32jvcfcda7q";
-      name = "kde-baseapps-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kreversi-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/h39cafz2080k7xih81jn5f7scfpvszdw-kreversi-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kreversi-15.04.0.tar.xz";
-      sha256 = "0z7rp0d52cgc8lsnjj0p0qh7fydgk1348ljymfmw8kr41848fag7";
-      name = "kreversi-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kate-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/17j3xfw2gjbvkb6k09ykyf8avx7fip38-kate-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kate-15.04.0.tar.xz";
-      sha256 = "1g4dh9d55mbdnxrxp8kyid52gg649rnd6xhv1di3k1zz6x5jjnr1";
-      name = "kate-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkface-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/f6n75hb70xfprv3rpa78n59icxglv3n8-libkface-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/libkface-15.04.0.tar.xz";
-      sha256 = "0hm3llyjprfhj5l7y97kyyk61cbis7hmlgpf3qfin958hmip7kds";
-      name = "libkface-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/frl8ikxyck6mv44rdwlca5dg64vlar20-kdesdk-thumbnailers-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdesdk-thumbnailers-15.04.0.tar.xz";
-      sha256 = "1y3wix763ndi3xfwpm3h3cfj3r446jkrslgn09bplm4x36jdd2wv";
-      name = "kdesdk-thumbnailers-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kremotecontrol-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/mxrd14q1c9hbw5lnpvk32s2jb18cjyrn-kremotecontrol-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kremotecontrol-15.04.0.tar.xz";
-      sha256 = "110bcp9b4y1mwpvd6r09zlrr54f1qdncxixliivclx9y0nrf9ljf";
-      name = "kremotecontrol-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmahjongg-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/gaj2cqkjp0ynwsywrshpy7glfagz37ds-kmahjongg-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kmahjongg-15.04.0.tar.xz";
-      sha256 = "0agqvghlvw3n8xr15n44zjidxqghpmpzf5834n7d18yllnkmyqzz";
-      name = "kmahjongg-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-text-ui-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/5vsvkxwxycdr0qk54ksiyrlbdfqxc7qq-ktp-text-ui-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-text-ui-15.04.0.tar.xz";
-      sha256 = "0az6ziraqslcidjflljc25scrg1i2kgkppm93bd8y8zy4a2q1wns";
-      name = "ktp-text-ui-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kshisen-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/jdmiqffbirvn2pzxx0vfia6v9mq9q1jx-kshisen-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kshisen-15.04.0.tar.xz";
-      sha256 = "011a3gqij509vl74v03s24in83i2qyylrpasi8cpx81hgbwd7zkd";
-      name = "kshisen-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krfb-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/r0b24gfzlljxq2wxxs6pyfvgacarvp7n-krfb-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/krfb-15.04.0.tar.xz";
-      sha256 = "1j1mfjgza7zs3dsvm7aqr0w3lnia1svxrc47gd5imagqxzi5xb5i";
-      name = "krfb-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/qqn7jza6dgshhapkvj97a4i4960dy5da-ktp-accounts-kcm-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-accounts-kcm-15.04.0.tar.xz";
-      sha256 = "1a45apf4vmjpsrbm98ym8k7qivmfaiwsdsf0f65vi91imlkfdd2x";
-      name = "ktp-accounts-kcm-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgeography-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/arp2vca2a13jqqc37cv5pa03s4aayg1y-kgeography-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kgeography-15.04.0.tar.xz";
-      sha256 = "1gm17z7a4dgmqds3gvwf1scgxb2js5xvaq4f74hr1042jq2br0dk";
-      name = "kgeography-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/7iwcjypw2l9kkgm8l3dbchm47jziyjh0-kqtquickcharts-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kqtquickcharts-15.04.0.tar.xz";
-      sha256 = "08p53xa49hwgwcp1vgp1c0pghj2l5a2g71s0q30xn7vz7y91bi92";
-      name = "kqtquickcharts-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/28krw7dahfrcmwlbfqabzd6bmxqx9fia-kdegraphics-strigi-analyzer-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdegraphics-strigi-analyzer-15.04.0.tar.xz";
-      sha256 = "02zpwqcfi0v0f53y4i2x1yn6d3nynlp8x7xb4ciacvmxzssh9g0i";
-      name = "kdegraphics-strigi-analyzer-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "blinken-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/pr2d0pipsss9n5xdd9zrgv939smlrvwk-blinken-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/blinken-15.04.0.tar.xz";
-      sha256 = "1475yf37nlmnqq5sh2gc8x1nbkypxy560qmdyar3m5cs69r77679";
-      name = "blinken-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdegames-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/w7f148vp2gdz22fhs5g65qjzbl9h36kh-libkdegames-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/libkdegames-15.04.0.tar.xz";
-      sha256 = "1rwbr5pqn347rfhz56phswfzxmm37xpnw699si1612mkmmbl92ba";
-      name = "libkdegames-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/jn27x6czz0lripamkjgkwga4cxyicmcm-kdegraphics-thumbnailers-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdegraphics-thumbnailers-15.04.0.tar.xz";
-      sha256 = "1p0alpdmhl3fm1r27cqiz80w9r1zmwj7pmdxf4f6mv2pf5q7z5kw";
-      name = "kdegraphics-thumbnailers-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcharselect-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1xvdiwnp84qn7cvcissssf92w4nx8y7g-kcharselect-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kcharselect-15.04.0.tar.xz";
-      sha256 = "1jfh1kzcazb4b4wqv6mjy69h8fx78zzf7xk60vzaks07b4c7x9x7";
-      name = "kcharselect-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcddb-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/7in63wvw5njm2gqxqbsjvj8sh7j5zbsf-libkcddb-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/libkcddb-15.04.0.tar.xz";
-      sha256 = "1ldjfkppfhknln6hn3py8519p5jc63pf9apwx7h5jf3z6ci1k29p";
-      name = "libkcddb-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kstars-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/vqrsgg7jlr6h8y6m2cp2fvv0jpbv8jvk-kstars-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kstars-15.04.0.tar.xz";
-      sha256 = "0mj6haknp9y03md9j007w5sf66529chififw0xy6a7bvnagaph2g";
-      name = "kstars-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kget-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/cglfzvjxh6b61dyvla9q9g0qnw6rzlm9-kget-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kget-15.04.0.tar.xz";
-      sha256 = "0v4gfik9ddzpddknrj9vp2d2awn2bjzn74n173njf90pbfnql3y5";
-      name = "kget-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kanagram-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/dh926v6zz23z9lqqqvhia5ilwxazd4lq-kanagram-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kanagram-15.04.0.tar.xz";
-      sha256 = "1iw2vp82ax93kbc7ffmh9wsgjp0a772vb2bxsmm5g5jcmjd8vcr4";
-      name = "kanagram-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kteatime-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/mrdsmb6qaj32np3p3mcwi3sx38kmgvjj-kteatime-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kteatime-15.04.0.tar.xz";
-      sha256 = "0g1hhlqhag0lllm8s10ylw5a6qwgsmb5hj33l2knbifa2sdg4v0c";
-      name = "kteatime-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-contact-list-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/44z86p3l3axqq54wnvbbjavifp6jrnxn-ktp-contact-list-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-contact-list-15.04.0.tar.xz";
-      sha256 = "08k2yplr67s66y4134n007kzsdxnrwgjhv09babprb4cbcm7pdgm";
-      name = "ktp-contact-list-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/a66l0r6622i36x7njknq4rw77wq1z8f1-ktp-filetransfer-handler-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-filetransfer-handler-15.04.0.tar.xz";
-      sha256 = "0z50v3bq4i618c1sh5fa67il4vhn8mk5c55wlhxc2q8srr85ii92";
-      name = "ktp-filetransfer-handler-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kompare-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/lmbjfk56h71c44paw60x7wl6pd58yc0w-kompare-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kompare-15.04.0.tar.xz";
-      sha256 = "1pf693s580p208dbjj6d4w11i62bwfifjn3wmn2fd8fip3ajdgxh";
-      name = "kompare-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/54xdq0xdkmw2z3j0zhfxi6gjvm60g919-kdegraphics-mobipocket-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdegraphics-mobipocket-15.04.0.tar.xz";
-      sha256 = "00m5i5jdnj92jnjm32ryh8dlf3fzl2mzybm5w5y1a82fq9l7j774";
-      name = "kdegraphics-mobipocket-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenlive-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/dacxkxjxhz3afz4165nv4siyn6sb5jws-kdenlive-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kdenlive-15.04.0.tar.xz";
-      sha256 = "1ski64rqa1h1aqr16vwnvpqpww7vgfzbnlki3998k8gbc703q512";
-      name = "kdenlive-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktimer-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/nab346b2rb5dwkj4gdnjm2pyhnzf0i4h-ktimer-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ktimer-15.04.0.tar.xz";
-      sha256 = "014jfyx4lizq2bh5yx73zarn9mzp4lkyaxvml0m8i53zdnacnqvr";
-      name = "ktimer-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkmahjongg-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1rqzjg16kl3m8cc6pjf2cakhjx90kkhw-libkmahjongg-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/libkmahjongg-15.04.0.tar.xz";
-      sha256 = "1912k9h4j8rhly5x03anf4gzjs0aypbwh8ifvhn289gydccqfcyy";
-      name = "libkmahjongg-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-approver-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ijsjgpid0pnrq1d174gpbma6xfik9989-ktp-approver-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-approver-15.04.0.tar.xz";
-      sha256 = "0sfi4i071iini7bv9i7d4f952rnd5r89vqnhkqqrzbnmi9bh4rx4";
-      name = "ktp-approver-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cantor-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/7rf8al4ncyxkhzg899mssimw3lwf0qy8-cantor-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/cantor-15.04.0.tar.xz";
-      sha256 = "0npl1p3gwflfl9rrvbi9ql28af6m1h2w46vkqh4ksp4d6jh9lx3p";
-      name = "cantor-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbounce-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/9b915jv5dcm7kinwvj9yrxs72vbsravw-kbounce-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kbounce-15.04.0.tar.xz";
-      sha256 = "1jllvam65kjfanry4wl2yhhgi5hak0swiradyh15b73rb89w2lj2";
-      name = "kbounce-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcolorchooser-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/zhlxa8x34g7yz6wwqnhn062d4yxgl214-kcolorchooser-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kcolorchooser-15.04.0.tar.xz";
-      sha256 = "0g51v8641712fyycm3d6pkx8mlxkpp832l5i77f557lgi3dqfnh8";
-      name = "kcolorchooser-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "audiocd-kio-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/gcg36nagmfjc9w510pbihc44gz765nh6-audiocd-kio-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/audiocd-kio-15.04.0.tar.xz";
-      sha256 = "05by4zrd3s2rkv915dq3ri6rhq39sl9wkw46diajkwzqdg6ajbiz";
-      name = "audiocd-kio-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgamma-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/zd7r3mali9j223lm28w0xx6fl4jkiyfd-kgamma-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kgamma-15.04.0.tar.xz";
-      sha256 = "17xfiaz751q38q29s20k6fffshd3jndydnj54q4bd5l08fwmxmq6";
-      name = "kgamma-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knetwalk-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/65sm832j0rnm215vmd7gcrnnbj1gd2cj-knetwalk-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/knetwalk-15.04.0.tar.xz";
-      sha256 = "0ljwgb5sb8x2g2qrvnl1lzmk34zcg6g1qfyp6p74h8lbhfk1vbgl";
-      name = "knetwalk-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klettres-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/bnd0dnbv8ybywwzaskjlx2dvdw3l9afc-klettres-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/klettres-15.04.0.tar.xz";
-      sha256 = "1kzcqj1w5dcmc54v96q3s6v4fj86kgc9vdllg7l98bv9d2zcxpph";
-      name = "klettres-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapptemplate-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/qg0q54wpsmr1y9dfa72y24fjr1faqd8y-kapptemplate-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kapptemplate-15.04.0.tar.xz";
-      sha256 = "01ldjxgsv422l9lay5yg5b9y0cbbwpfl8x41a1wvm9h2l4k0mn3r";
-      name = "kapptemplate-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjumpingcube-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/g3mfvybxvh2rws76bdsvd7fcnkc3cjdh-kjumpingcube-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/kde/stable/applications/15.04.0/src/kjumpingcube-15.04.0.tar.xz";
-      sha256 = "0mj33yz2565px6ljlw6k0pgd2ljq9gsjx4x9jzq6wbcjg6vbiyah";
-      name = "kjumpingcube-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okular-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/0j337gxam8fflqmaq9ggjgdjqmz53ank-okular-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/okular-15.04.1.tar.xz";
-      sha256 = "0yg9ivscx8nrdb9gq6xq6fm3y8lksnkcjdi0908axmqr8gxnh5c5";
-      name = "okular-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktux-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/909abb7a2m5zlw96wycw77ry7na2y6fc-ktux-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ktux-15.04.1.tar.xz";
-      sha256 = "07v559yw4dpryfi7x4c7305dac9i5pkaj0m5dxbgsvsyc5qmmv18";
-      name = "ktux-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcalc-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/gy0khp88rwah803y4r9q6jfghkjf857h-kcalc-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kcalc-15.04.1.tar.xz";
-      sha256 = "1w279713fipi82skai7f31q5yzn6yjm3bhd236igd9a24blzr2xa";
-      name = "kcalc-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kollision-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/sr1wh5xb0kj4yw5qy5qqf5mfrbwva980-kollision-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kollision-15.04.1.tar.xz";
-      sha256 = "0pq8pvqjynfmkafaxx9hl4dd8i0blq8vkzpnkhn3zkd450bwjdpc";
-      name = "kollision-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgamma-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/3nifa51gknij2kxwlhsi70qz5xmc36dg-kgamma-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kgamma-15.04.1.tar.xz";
-      sha256 = "1w0sb9yk3wj38jqhbr1g72jagy99v2ihrm81r4wp274i602h9s2s";
-      name = "kgamma-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapptemplate-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/illwb8qn9c9s67m5y4f5cx0d5f3l860k-kapptemplate-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kapptemplate-15.04.1.tar.xz";
-      sha256 = "09s0bk8kp338iy2bpq3gaa3sa52qk42zw4wxccgvxj9hjhh894nk";
-      name = "kapptemplate-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalgebra-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/0dz4823nkpmlvxby7ki3vb0ppfshwz45-kalgebra-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kalgebra-15.04.1.tar.xz";
-      sha256 = "17qxij5kdk0vymqfq1csmp071sscjc19pw9y39g59njk4bbdih3m";
-      name = "kalgebra-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-icons-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/ck0pb49q3kv6jzkmwliw1sdp8qbpzplr-oxygen-icons-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/oxygen-icons-15.04.1.tar.xz";
-      sha256 = "0asr2k1i0bm8pm9kj12c9s5bkwvz25pgsv167hb2cvfgm8ahyvlj";
-      name = "oxygen-icons-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/6w7jbq7m0kfjc37rnd6yf0ww3xdmb27x-kdesdk-kioslaves-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdesdk-kioslaves-15.04.1.tar.xz";
-      sha256 = "1pb258bhqikc9nmzs10y98gzd6na0sqyhgfzm1rq1hkmg4dkslwa";
-      name = "kdesdk-kioslaves-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "pairs-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/ky762jidy4zxzwbllfxz46h7bq76v2df-pairs-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/pairs-15.04.1.tar.xz";
-      sha256 = "078j19w99v50zck64mrir0pr1r45k136lprdndxrpdmxq3zx36px";
-      name = "pairs-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "svgpart-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/qgdyrm00y38n3xidjc5hqyi1aid7hn0y-svgpart-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/svgpart-15.04.1.tar.xz";
-      sha256 = "0mwbbx490i1z038jxkl8pyjaisks2k18nn5ccs1d65k5p67pcf3b";
-      name = "svgpart-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "amor-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/qjyg81gbsdbdwc4vzxhfwvbc2r5jqbxc-amor-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/amor-15.04.1.tar.xz";
-      sha256 = "071wnfp1p9xd6asir4ssvb19jcfbwqg472znl5bw7n09qp5i7w9m";
-      name = "amor-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/zi9amimbp5ag5frcx0myg5ksc25whknc-kde-l10n-bs-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-bs-15.04.1.tar.xz";
-      sha256 = "1il3l1fmavigjndy8pwb0m9jvz0wzm39p0pm10b12vv394623i5f";
-      name = "kde-l10n-bs-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/zs5dds7lhag23vwc2f83bd9wchi6k0zh-kde-l10n-he-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-he-15.04.1.tar.xz";
-      sha256 = "1jn8b5m4i9gxyfi2acjxjqcq0rzp9b70miji17vjc8q1a7241pmg";
-      name = "kde-l10n-he-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/8nlrz9m17ljb459zm6zq5nx8nnpwly16-kde-l10n-ug-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ug-15.04.1.tar.xz";
-      sha256 = "184xqway79p33fi8mc1xx6h0lply1r8xsj4qjjqnd30sg5hzn0lp";
-      name = "kde-l10n-ug-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/zgij63xalg6c9i3nm1bc6ap6zvspm8p2-kde-l10n-nb-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nb-15.04.1.tar.xz";
-      sha256 = "1zlarins81lj11ljr1k1ma27wy6jyl7q33p2xisjwqi4qw6jmhza";
-      name = "kde-l10n-nb-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/xy0x7in8bkpn6z6ac2v6cx3rvzij2jma-kde-l10n-de-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-de-15.04.1.tar.xz";
-      sha256 = "0gki5x7nlpvhxqwg6gqajh5swql6vvi9c37lys7ng2hpqc5xy7pf";
-      name = "kde-l10n-de-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/pr9ckm8k6y78gqb5y33ny8zm6hgbm6iy-kde-l10n-it-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-it-15.04.1.tar.xz";
-      sha256 = "1grfxlcc896zgq74q6cqy6l878bkyhchr4n8jcjiqzl7xn3p2q5c";
-      name = "kde-l10n-it-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/rqbgin8gv0jy20hgl2j0pp56k93k4hp6-kde-l10n-sv-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sv-15.04.1.tar.xz";
-      sha256 = "1wzpisiqdcsw698j1bf22gzjqawwmmcpslx6yhmrn8462k5iq0d7";
-      name = "kde-l10n-sv-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/5vbrfwv9s2klrxw3k6vz4833qvldarp0-kde-l10n-ja-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ja-15.04.1.tar.xz";
-      sha256 = "0jsnx9sjs1wz2f8i9bbl2v59f56azggqbl610idj0xdjn7zhk311";
-      name = "kde-l10n-ja-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/j9mbwhpxw612xc9bilzhdgsayi9bqwjl-kde-l10n-lv-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-lv-15.04.1.tar.xz";
-      sha256 = "1c6g0rkd209j2q9m2q5rcf8j24gnc1g11kq87cjyj88jvidc0jpl";
-      name = "kde-l10n-lv-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/wziwfgk9xh3k79xz9pvpfjvjavjalc37-kde-l10n-mr-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-mr-15.04.1.tar.xz";
-      sha256 = "02hd8p6fzralbhz622nzxyn13p1lqxzyi229vc8ni7qz9mqia02k";
-      name = "kde-l10n-mr-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/vg6xw3206sf0nys7179l6a04ymiwqy3w-kde-l10n-nds-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nds-15.04.1.tar.xz";
-      sha256 = "10hija63jh38pqm9j9lln2n705sfm13zn2h3rv4jl0q7m75hdl0m";
-      name = "kde-l10n-nds-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/2fk00654fxijdpmzqpf5qwbbxdlfxs25-kde-l10n-zh_CN-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-zh_CN-15.04.1.tar.xz";
-      sha256 = "16rsjrwfafvrgl48dnpbd2lnzja186zq7sq83dafg9hs636md6ff";
-      name = "kde-l10n-zh_CN-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/i30703ryicxz0zf6fk08mzpcr7wvyps8-kde-l10n-ca-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ca-15.04.1.tar.xz";
-      sha256 = "1008mb8ygak03dg0xxwsb54px0qashh1nnrpj0wwfqvgfbqa19fm";
-      name = "kde-l10n-ca-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/mdcybgna88hx6jlmyj2m6ss32yw4i7z3-kde-l10n-nl-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nl-15.04.1.tar.xz";
-      sha256 = "1s6zrnbhnpqwpb1mgrnayqvzggb1wrmc4w166y8j9bvjc0jahlfp";
-      name = "kde-l10n-nl-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/k179rl7a4avlv20w4spxzl19mk567jv3-kde-l10n-sr-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sr-15.04.1.tar.xz";
-      sha256 = "1k6q4l7xllrs26xvrhfp8lbq0rgp49aq3r9y85crdmf5xy1zk4bc";
-      name = "kde-l10n-sr-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/8i9bjzsxfxh4n5w385k0figmm9cwfy65-kde-l10n-ro-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ro-15.04.1.tar.xz";
-      sha256 = "1svqhp23y5xmnmrba8vzamac6zf4lz02gfck9xi8kq5zhs1zky7w";
-      name = "kde-l10n-ro-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/vd6ihrlxp8m0hf7x3b05sglmn9xggjy1-kde-l10n-hr-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-hr-15.04.1.tar.xz";
-      sha256 = "00rn1947pw57cl4lwyx3hm7ic4w45lsh82m3sr3l8wa26qm6qz17";
-      name = "kde-l10n-hr-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/8rp1dba5nc9b2b2m4dvl51rd74xrnkdn-kde-l10n-pl-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pl-15.04.1.tar.xz";
-      sha256 = "09rs6abbm4bj0wy2s0y7b44lacraq1ypxvmil5cxj95apk6qy4sa";
-      name = "kde-l10n-pl-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/bnwiza33rhdlnc61bvfx521cy02d8scc-kde-l10n-cs-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-cs-15.04.1.tar.xz";
-      sha256 = "1xl397n7vdfcpzg5qfcdbmw92p6ail90s15vvbxq2c4didysgrcz";
-      name = "kde-l10n-cs-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/7mxx0v3fd90vi123hw0k9hinmzxh4z1z-kde-l10n-is-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-is-15.04.1.tar.xz";
-      sha256 = "0c03jsb4lbp5wn0inzv3z86as0din40ypjh5jwj6zparjgg7v017";
-      name = "kde-l10n-is-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/lwqhr1l80ki47ysz51ckiz05z9wxfphv-kde-l10n-hi-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-hi-15.04.1.tar.xz";
-      sha256 = "0gwin6w51iskb9wss97mg3pvwbfca67jqisz3v6qljy770p8d16j";
-      name = "kde-l10n-hi-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/iqfv8rf2qlaif5k6km6i68qpdha2p8ib-kde-l10n-es-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-es-15.04.1.tar.xz";
-      sha256 = "00j195zzqmirq3d64sq86n11fhp4gzd8wq7bvr4byg76crv1wsqv";
-      name = "kde-l10n-es-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eo-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/zkjp2bbs8d6j6k3wgwij5q1zaiaxvzhi-kde-l10n-eo-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-eo-15.04.1.tar.xz";
-      sha256 = "1kpd83bf72hjp8dir6cv75rb9wjnljdwxk4ff1mp2ph7rzhm8hxf";
-      name = "kde-l10n-eo-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/09hg9zfgwdgvdaxx985kk1xf9hky3r7h-kde-l10n-zh_TW-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-zh_TW-15.04.1.tar.xz";
-      sha256 = "1k4f9031572mxkg5rk2i98angr9rqcbqkp3zrg7blfpndbqbhzzl";
-      name = "kde-l10n-zh_TW-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/5lzgd16vdwbziizylnx114dpaycm0xmy-kde-l10n-sk-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sk-15.04.1.tar.xz";
-      sha256 = "1j96parls7psj0nr0305wdpdjxdrh8bqgbs89mrbk8wgzj9agsh8";
-      name = "kde-l10n-sk-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/hf6x95pyziykm6j2kxlaavr4585l19x5-kde-l10n-ru-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ru-15.04.1.tar.xz";
-      sha256 = "1lqc7fvw4spca4va4id24ni19s4gzxzf5qrzfqgav4xf6hwndi3c";
-      name = "kde-l10n-ru-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/x29ma96kp1mf389k6kjpl65fwqbkkjzk-kde-l10n-ga-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ga-15.04.1.tar.xz";
-      sha256 = "1m1dihyak0z5h6932rmb09q3hhbyzkck0gwnp3gdqa84m1b8kmid";
-      name = "kde-l10n-ga-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/iacgwmkzrc75y7xf281zcfz7fha9c740-kde-l10n-kk-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-kk-15.04.1.tar.xz";
-      sha256 = "1lcan2x6f7v159zmix2h730pj21rlqmqxvizcd0jrwmnqxf9ww1k";
-      name = "kde-l10n-kk-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/lk6ncn5aa4p373igs7j8g6mwa4a2iqma-kde-l10n-pt-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pt-15.04.1.tar.xz";
-      sha256 = "07pqq7yggq2cjsn60wygbzz37dprp30dhabqj6il6gahl9y5y1fj";
-      name = "kde-l10n-pt-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/adcsrsz6kj7605a7whakszmsjrb3r0nc-kde-l10n-pt_BR-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pt_BR-15.04.1.tar.xz";
-      sha256 = "0c5z73pr7m4pq52pjk7q097755g2kswjzjcq5pwc94za0yj055l2";
-      name = "kde-l10n-pt_BR-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/i9kc413jrn1l9rywv7vsbhgsvz7lffis-kde-l10n-ko-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ko-15.04.1.tar.xz";
-      sha256 = "1i34awq71si561p6ggahk6phav9p7rlyc34lg38w7mlqb0d6bjqq";
-      name = "kde-l10n-ko-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/s9rqm9a1rvwx7zikmm5fwydsaggsgk25-kde-l10n-da-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-da-15.04.1.tar.xz";
-      sha256 = "0h5784ba12yh5szyilbw6l4alac4kvgq9bmzpmga032jpc0g9k0l";
-      name = "kde-l10n-da-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/4pxnpsmz3siicy40i3m1x4ji852ps53s-kde-l10n-et-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-et-15.04.1.tar.xz";
-      sha256 = "0x208lv7qrhflgz5qmpp64wqx4avb3mbjr625nqpk8c5w9swqify";
-      name = "kde-l10n-et-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/0bdylm7gbn4ddfw95mz3zwvpizjfflgz-kde-l10n-fa-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-fa-15.04.1.tar.xz";
-      sha256 = "11lsciiys8dk6mzvd5fp4kypk2355ppdd20fkqd99vp2z3rknv9r";
-      name = "kde-l10n-fa-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/1pxdddwrqh1lwq69ybfc3bq4wqyp4wsp-kde-l10n-nn-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nn-15.04.1.tar.xz";
-      sha256 = "1vn9bcjba6wcym0cvfwhzyn7n4aa9jc3w7apahc72sqzq1irjapl";
-      name = "kde-l10n-nn-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/k8jamljw1l6zrpqwl4ai6103rcxlkxr6-kde-l10n-en_GB-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-en_GB-15.04.1.tar.xz";
-      sha256 = "10gypxkclg037crrv5ifyrj5yahjmfr8x7h41b2zrxy2mvibfpw8";
-      name = "kde-l10n-en_GB-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/cr32nv49a2k622v9g0x8c3wbq0ydv9g4-kde-l10n-gl-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-gl-15.04.1.tar.xz";
-      sha256 = "1wjw21vifqzr35rpmffavxljbw6h9ci7awllj447sgqyw2c59pls";
-      name = "kde-l10n-gl-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/kxabywd2fc6249jy9pwqkjmbigi11hca-kde-l10n-ar-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ar-15.04.1.tar.xz";
-      sha256 = "0ngff802m80bi28khp9m60j5j2fh8f3nghp81l8a27kmlzl0np9j";
-      name = "kde-l10n-ar-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/7xgibrqzv5gsvswx0k5y52pawd5fd14k-kde-l10n-eu-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-eu-15.04.1.tar.xz";
-      sha256 = "0fpfahmlniyhsxlx7p1ln9ldy3zjxak8cqi24p2rv8xcm3238dlf";
-      name = "kde-l10n-eu-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/fk5q2f8nwj9cw94k036yf1fgn5kg4g1c-kde-l10n-tr-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-tr-15.04.1.tar.xz";
-      sha256 = "1r40gg4cz5s7g5c54a8c6mmx6v27lqx1sbygm5cb9xsqqp0il1yi";
-      name = "kde-l10n-tr-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/j3xp083a1ggngx4rkbg7jzvci8nmpwkh-kde-l10n-ca_valencia-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ca@valencia-15.04.1.tar.xz";
-      sha256 = "0gm5aljn22jf5vpanvmhxviyqr3wbi5rn3m6dkx552j2rw2qkazd";
-      name = "kde-l10n-ca_valencia-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/zqkgqclj5c9ssqnzycg6449740s6n1rm-kde-l10n-km-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-km-15.04.1.tar.xz";
-      sha256 = "0prmwyjjmw5mimbi5dkzcmgynazi5lvrjkinfl9z49l2dcqmwkks";
-      name = "kde-l10n-km-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/hicn3pxa99ihaj704v6f1l1kfmxdfm98-kde-l10n-pa-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pa-15.04.1.tar.xz";
-      sha256 = "1civainv5170xvn20vx8rmghkfdlc6554nncq22l55q2f78pgg29";
-      name = "kde-l10n-pa-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/m08cm6y7gnpyhdszbza3id8j08v1qvsn-kde-l10n-fi-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-fi-15.04.1.tar.xz";
-      sha256 = "1q3b25h983y2jin4llml0s4wm5ja0rplsczr5zci99vyi1jv2i3w";
-      name = "kde-l10n-fi-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/c5ssvbyi0gdr7da99a3mg0snwwmqzi1c-kde-l10n-id-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-id-15.04.1.tar.xz";
-      sha256 = "0gs7l2i71hzwyn12gjrdqr5lm996vglrbqbvn0jmzyp6zjzha6ah";
-      name = "kde-l10n-id-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/j3xp083a1ggngx4rkbg7jzvci8nmpwkh-kde-l10n-ca_valencia-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ca_valencia-15.04.1.tar.xz";
-      sha256 = "0gm5aljn22jf5vpanvmhxviyqr3wbi5rn3m6dkx552j2rw2qkazd";
-      name = "kde-l10n-ca_valencia-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/hslbisaanz2z17mvspp4jbsx95pgwsgh-kde-l10n-lt-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-lt-15.04.1.tar.xz";
-      sha256 = "02qmdg0gkcmcgj9gffawij8c64fjs7s70yysnlnp3wmb7vy4ppqh";
-      name = "kde-l10n-lt-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/3lzxjwp4rrgp3rn6f3x42ylfk1qf4g12-kde-l10n-wa-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-wa-15.04.1.tar.xz";
-      sha256 = "139v2k0jvm7xndwhgrs0x15l1plb49qpzbdny928gjymxq5x66ar";
-      name = "kde-l10n-wa-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/yzfn0nlwhlm1q6x04ydz4p4rdinwazpn-kde-l10n-fr-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-fr-15.04.1.tar.xz";
-      sha256 = "1x36334bi1q4sii7j24xr39jxw6k22p4m1c2mz43s0ix0gzyx6n0";
-      name = "kde-l10n-fr-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/v3qlbc9qq7m6pa8m1iz6qw3wam7c8qh4-kde-l10n-bg-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-bg-15.04.1.tar.xz";
-      sha256 = "1frd276wzvhwczdws589xy4bpg58yill263lfg8bjvg1v00pr6j8";
-      name = "kde-l10n-bg-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/sjnpw624x3hm8spj91lfy2aqilfn9vv4-kde-l10n-uk-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-uk-15.04.1.tar.xz";
-      sha256 = "041zhdfmdbca74cgc69dzspn670i9cv32mhb8319q85xp1jr3wbs";
-      name = "kde-l10n-uk-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/k5f977w8bgbi72wcf00p1wng4wr58y2q-kde-l10n-sl-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sl-15.04.1.tar.xz";
-      sha256 = "078r48vgbi72wrx5hnjbgkakp108v79lyb6jpllcn7a8sd71cm6s";
-      name = "kde-l10n-sl-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/rck5qqcnw6id22p4ak703wbpygwxl3gx-kde-l10n-hu-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-hu-15.04.1.tar.xz";
-      sha256 = "1vbbv0lmim0368kc328x430s69fybsg3mh5wnadfrkmlzliigh3l";
-      name = "kde-l10n-hu-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/ydwfc2skbipdis45li6vj1qahaxdqxxj-kde-l10n-el-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-el-15.04.1.tar.xz";
-      sha256 = "131064jjxqqi50ywljic71fdismqpqg9h1yjyv8wxs9rl1mb8s90";
-      name = "kde-l10n-el-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/l89gan31lfivzmmjq1wvqgk6jaqvi6bw-kde-l10n-ia-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ia-15.04.1.tar.xz";
-      sha256 = "092s5b2abb8amiqcvg95p84b91jncxcmbad3yhkxw2lkzllrl83y";
-      name = "kde-l10n-ia-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksystemlog-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/42gd0z1f41kc9jfk2sdqyx7lr5dzyh6l-ksystemlog-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ksystemlog-15.04.1.tar.xz";
-      sha256 = "0zf7vzlxvby6kf8ccydy4dxwwkmr3lhhpklgiywz6m26i4iapjdg";
-      name = "ksystemlog-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdeedu-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/8pcp0gamz0v2vfjgvjr2avgchwzrs128-libkdeedu-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/libkdeedu-15.04.1.tar.xz";
-      sha256 = "1y3zmhbbwl98cm8whkpafsrk4n9pn7ass6pyn9pnwz8g1lc853ig";
-      name = "libkdeedu-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcharselect-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/gwccqzp4a5glln0zpp179j932l9cdwbd-kcharselect-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kcharselect-15.04.1.tar.xz";
-      sha256 = "1v4j2jn05vynnzpk11r2vg79v8ih945vkv37xw4isvfcicd5bjjh";
-      name = "kcharselect-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krfb-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/k67yxmxak82q0bigh94har3zd57g8ijb-krfb-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/krfb-15.04.1.tar.xz";
-      sha256 = "0mscrcvbhmhm7a330rwxywxpk09h4255j0ah3f5lq08zwhrpzd9r";
-      name = "krfb-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "palapeli-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/zyqcyz9b4g57ww1cwz6hmhga1nwhmcjd-palapeli-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/palapeli-15.04.1.tar.xz";
-      sha256 = "17xxsmrksxvf4km7a1dbcx2fsbiiwkhszdr17gywlz6b1k2rpybj";
-      name = "palapeli-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwalletmanager-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/c7m3wis5dcxivjswlzcw8pp216pq813a-kwalletmanager-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kwalletmanager-15.04.1.tar.xz";
-      sha256 = "0j197d8cmmgv8mz1scgp9qdq87sx318nkb7jymc28cc6d49mrwgx";
-      name = "kwalletmanager-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgeography-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/bzaka1rvr5lr71h054w8zw10xlqpgd70-kgeography-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kgeography-15.04.1.tar.xz";
-      sha256 = "0g4wxd3qzsp99m4h5aga5cwky1xffwpys3lm29083agl8gvyrs0p";
-      name = "kgeography-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "blinken-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/wdnknychhn65zahmpka1x60n082mqjfg-blinken-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/blinken-15.04.1.tar.xz";
-      sha256 = "0vavcjbsc4lx0a715pwqshc5l03h3nlpk8lpbbswik47rs10k156";
-      name = "blinken-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "rocs-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/im5b97nl4p7f5f1pkzrhjbqbhx6p5ap7-rocs-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/rocs-15.04.1.tar.xz";
-      sha256 = "1cplxlv8a7vsa18j7m629h06v4a0z123mhmg8blzqwh0wwsj71r8";
-      name = "rocs-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.8.tar.xz" ".tar";
-    store = "/nix/store/mxcxsdllc81x1w8y4p40b1s5gkkbzsqm-kdepimlibs-4.14.8.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdepimlibs-4.14.8.tar.xz";
-      sha256 = "0522aby3gm99n18g7p59vi0rzz0ysj9rzljlci5j873mv7yff242";
-      name = "kdepimlibs-4.14.8.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knetwalk-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/kmp1kna6sixbxjdzcnn1agarx8xq9ps4-knetwalk-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/knetwalk-15.04.1.tar.xz";
-      sha256 = "1hq7cldh4n9kbfhc1bj3mra9dgafk6hkn5pazp2rfipmfmxj3w3b";
-      name = "knetwalk-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "marble-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/klfb6qwspc6raf7kw49s3y5xgdxn9l77-marble-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/marble-15.04.1.tar.xz";
-      sha256 = "0aqgh7s07ryhyz0a62pzj3a73ip26df1cw9g103x5iapia5lyp3p";
-      name = "marble-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolf-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/xd8id5gbv47bg5jrk8qammqviv861s60-kolf-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kolf-15.04.1.tar.xz";
-      sha256 = "1r8zqlmwz2dr3pgh921z3j8pvcry7366qyr6kybkjhyjqr1rmhdh";
-      name = "kolf-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbounce-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/vhp18ifxb0v5nnfna3z8qnkpdksc51bd-kbounce-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kbounce-15.04.1.tar.xz";
-      sha256 = "0qxmvkwcanm50w8jd2fcf0q557ywz198ifgsx8piyxmjg8j0hal6";
-      name = "kbounce-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "audiocd-kio-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/3ma0rszdvi8hsz0r5f27yafarzmbr1l0-audiocd-kio-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/audiocd-kio-15.04.1.tar.xz";
-      sha256 = "1gxr9ny09sqb80bhkd21wfl902j8kl5qlgvs9amasabgq7450rbq";
-      name = "audiocd-kio-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwordquiz-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/l1yn11z138jfwx11qz2hdvklsvray4ml-kwordquiz-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kwordquiz-15.04.1.tar.xz";
-      sha256 = "0xjk9ihlvs8v79mwqry91lzr5kqnj80wfg84gab8djz7gsixgp0y";
-      name = "kwordquiz-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmousetool-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/wwv9f44nhm3rqhw2x67yb9fvxsc31shf-kmousetool-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kmousetool-15.04.1.tar.xz";
-      sha256 = "1833yjmgky80w8l06k31j5fd607kada5pi85rcc1730i3g18mqys";
-      name = "kmousetool-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/zsx5r10khmay1jfph7202zd9k0kqk68f-kdesdk-strigi-analyzers-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdesdk-strigi-analyzers-15.04.1.tar.xz";
-      sha256 = "1yhaixb6dqpw02v1y0zqj6yl2i4lr1m69ns20bb2qaz44kbril7k";
-      name = "kdesdk-strigi-analyzers-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksaneplugin-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/6jdycwm8ads0midd532mh8g4rc3zis63-ksaneplugin-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ksaneplugin-15.04.1.tar.xz";
-      sha256 = "0wlirj6dqigdnz2xy5yab0cf6npzvx91zbyg9plfqig4h0m5vjrw";
-      name = "ksaneplugin-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccessible-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/f7ik0yppcn93na9m9dm7qxkfykm7n0im-kaccessible-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kaccessible-15.04.1.tar.xz";
-      sha256 = "01jnaz0n81vyy8wghy21h5ignx4sllv56g3dpck86cj16dh2ymiz";
-      name = "kaccessible-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/ypf8qvq4gmys2llq8v7nzayi7nw782lj-kqtquickcharts-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kqtquickcharts-15.04.1.tar.xz";
-      sha256 = "0spg0hfhsngipbdbm8c6yxfw538jk5rdfs83rp2hk7zhhkqvphmj";
-      name = "kqtquickcharts-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbreakout-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/i08nk9biny2fqal1kkzs9lwpxxp2rwf5-kbreakout-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kbreakout-15.04.1.tar.xz";
-      sha256 = "0fg6z8b2p43c0p11ijbha2f6dycc4f0z487sg6y8jr6vqszqwm6q";
-      name = "kbreakout-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnakeduel-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/r12i36mznnvlgwxm6x3vazwnvargpc60-ksnakeduel-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ksnakeduel-15.04.1.tar.xz";
-      sha256 = "00b0ssad8cvjbp30n5lif41ni1515r892xxfvmyl50ajn0s484g1";
-      name = "ksnakeduel-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kreversi-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/qqw2j0bsr3s5rn9s0a32ia15ciqa0ggj-kreversi-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kreversi-15.04.1.tar.xz";
-      sha256 = "0czkvks9i7i4nl64afml9g029ahp9xxqyfv2jqphhyrz7al36l81";
-      name = "kreversi-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdcraw-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/xca9i6zvlnrnn6cqvab1dj91id7ns8bz-libkdcraw-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/libkdcraw-15.04.1.tar.xz";
-      sha256 = "115b8m4f588mxmq8f4chg10nbb3wry3zvxgmji7pac49aszvdgj0";
-      name = "libkdcraw-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "artikulate-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/b5ybam6zgslfklbmr1nvj8xxb2n0ay27-artikulate-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/artikulate-15.04.1.tar.xz";
-      sha256 = "1498gndm0w96s7v109f8fc9y4bkb6bl9c0jaw24i1wn97hiiwigf";
-      name = "artikulate-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkipi-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/czagm2ybdwy6z3672z5ck07pqjjkdh7z-libkipi-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/libkipi-15.04.1.tar.xz";
-      sha256 = "12rmhva1kcjvcb21rhb5r6kx5bhs3zp66zg05zp0r4r5kbcf7rir";
-      name = "libkipi-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiriki-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/4dv1qqm1cvl2lym8yppwgiqj3bxbas7k-kiriki-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kiriki-15.04.1.tar.xz";
-      sha256 = "0fqx790jz7pfajqjhpza2fz3vr7q8mxixx6nvv8shfsqxaqi1xf8";
-      name = "kiriki-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kremotecontrol-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/4wd2nryy9gg0x5p1vm5fv3hxl48bxcw2-kremotecontrol-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kremotecontrol-15.04.1.tar.xz";
-      sha256 = "1nrnq46qa2m5rh4lj9sxrqb130jljfwafw6asz8gm32202xg4fqi";
-      name = "kremotecontrol-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kigo-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/s7my7ndzl4cf3nkxhp23krf8cc0rxpb6-kigo-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kigo-15.04.1.tar.xz";
-      sha256 = "0a2a39x1249vjgwc7sxvf1kxmkjd6nq97rhh7cp7j3ssa2gggspn";
-      name = "kigo-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "jovie-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/9dhsv2hxy8pwh8i6sp9dmirz3d7hlk77-jovie-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/jovie-15.04.1.tar.xz";
-      sha256 = "051ycpgifz9si8301167rr7h50qcnkhffk0wyr59iqxyyf69aqbf";
-      name = "jovie-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdf-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/m088jnlvz3b3fabza6hcy3dh57mbs3f5-kdf-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdf-15.04.1.tar.xz";
-      sha256 = "0by7dn3r22cx9slibc2jplbi6k498xiizidymaxkf6wa9f6m76yn";
-      name = "kdf-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapman-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/4lnw56hhsqbrgp60fwwcf62wdxb3k2aq-kapman-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kapman-15.04.1.tar.xz";
-      sha256 = "1pwbxc9pbhr2cbr4n48hsnja7fghr2af02aifvrsj6jgcxzryfgd";
-      name = "kapman-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kanagram-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/kgjhkp3h6gaz1pi62mmyg8z0xyb1h4lz-kanagram-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kanagram-15.04.1.tar.xz";
-      sha256 = "1i9z5hyqj326iim43mlrvvpl47b4244s1spk3xf8a3a929bwlf9l";
-      name = "kanagram-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-send-file-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/5bs3g1zqj5b13h4flvy9v4m620lcw7lf-ktp-send-file-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ktp-send-file-15.04.1.tar.xz";
-      sha256 = "0dzyvsnnxi6n3hy3rwyng4pszx4ghcgry3cvw6d3jrzlg4y3afmz";
-      name = "ktp-send-file-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmines-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/rqnvyiybcn99da45q2bvl8dwpa4y764z-kmines-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kmines-15.04.1.tar.xz";
-      sha256 = "1g02fbyqz8nb0qlz49dqn5jay4kdafpdmjx127n0p8wmkw4lh261";
-      name = "kmines-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bovo-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/yrgnwbhl85qivg7hglzgaqqv0hwm91rv-bovo-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/bovo-15.04.1.tar.xz";
-      sha256 = "10y1px3vk9iv19m6m4jlh6bxky10vhyd1r0q7s50rhr44i3ibwml";
-      name = "bovo-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kruler-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/vhls9fra4la0ymwa2s387mw5n119hf47-kruler-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kruler-15.04.1.tar.xz";
-      sha256 = "0vhwg4qqiv4gflvqspjibm7zh2zgaxql5xmaylpr90hyc1k3vykl";
-      name = "kruler-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/a7lgl9rd9bpmh8yqdibk0zym25mfc3gm-ktp-desktop-applets-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ktp-desktop-applets-15.04.1.tar.xz";
-      sha256 = "19rzq0k2dklzrlpn1qkad1x0v72dk6szya8fsfgxcv1047cczrma";
-      name = "ktp-desktop-applets-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpat-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/r4n7jrlw47j1mvipzyfw9mx6cksk3rpy-kpat-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kpat-15.04.1.tar.xz";
-      sha256 = "1aa6m64slfg12zg02an8sbv51k5jnq9bs95y666bc1697yij8sag";
-      name = "kpat-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/vnpm0h4amj9pxqbrgn8m7xjl04x2ybb7-libkcompactdisc-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/libkcompactdisc-15.04.1.tar.xz";
-      sha256 = "0lis8llzl684z12yzvrc74zckxxbi06fn1krqkiawhpafl0kc8qs";
-      name = "libkcompactdisc-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgpg-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/6ampb59zxfj4qm8a7fxs0kqchwcxv5kl-kgpg-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kgpg-15.04.1.tar.xz";
-      sha256 = "013z6ryq1khk1hwird678n4rfikgyl173j5chkqpgw7nrz93770c";
-      name = "kgpg-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/7ajx21aws82z92wiqc041jmbysna95cn-kdenetwork-filesharing-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdenetwork-filesharing-15.04.1.tar.xz";
-      sha256 = "1f26z4zm0bzkbsanj9rw704s25iq0ahw3mi51sgj4ak8gb9r6ibb";
-      name = "kdenetwork-filesharing-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kubrick-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/clxa7535xdqii03b5rp3p8vs2xpc6263-kubrick-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kubrick-15.04.1.tar.xz";
-      sha256 = "0anysvrnyj5pafy7svgszqaj68ryvgbmc8s9xcaw7xpqxxjv2bvd";
-      name = "kubrick-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfourinline-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/xk72vmcz1gl5w05wsv0f5qw182hy72vf-kfourinline-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kfourinline-15.04.1.tar.xz";
-      sha256 = "1qg8cg4w207f9ir9saraxyvrhz7y0hr8di9yjv3i32hhmi36v35a";
-      name = "kfourinline-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/b0381wzz8yr0g7a5f89cxq0ay0vvskq7-libkeduvocdocument-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/libkeduvocdocument-15.04.1.tar.xz";
-      sha256 = "0lky05kb4yqggfzwips4jagfsmi7lc5fwp1zv4mlgh0w68rbzq0f";
-      name = "libkeduvocdocument-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/7wjw21kqy746kxq8ciprhc2jn9sda1qw-mplayerthumbs-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/mplayerthumbs-15.04.1.tar.xz";
-      sha256 = "0a5w3cz6pdsj6vn1zzsjx61x52lqmfnblad0gjv29h7rzxx4p8vr";
-      name = "mplayerthumbs-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/9i6281xfgc9xs8r16kvj96r3f5sq4sx2-kdegraphics-thumbnailers-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdegraphics-thumbnailers-15.04.1.tar.xz";
-      sha256 = "1lpr7k7mhlrl4f8psixkp64j5igv0kbmfyml618pydbdbkyzy7wb";
-      name = "kdegraphics-thumbnailers-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/gplbfp23pqx6kklb57j6p4pw2hnfy98h-kde-dev-scripts-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-dev-scripts-15.04.1.tar.xz";
-      sha256 = "0yg2xw7ni25i1dvnfd18p0vdpli66xx9dn351av22k313wa7dyw2";
-      name = "kde-dev-scripts-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblocks-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/9rkp8602jhay2myxc1wm1s3511ivf1ix-kblocks-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kblocks-15.04.1.tar.xz";
-      sha256 = "19dhccamka291p75brd03a3r5zll7yfzk9hd9dr52xr45lpbhqd9";
-      name = "kblocks-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klines-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/1hb2447kzfdymip921a3k08rdvls1b10-klines-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/klines-15.04.1.tar.xz";
-      sha256 = "1yb4qya06b3ld0xmnvqxzn6lgvxr8nyfwihgi4ldysxap6v629ra";
-      name = "klines-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/z1pwkj78q3vrjh6yvs5p8wdikl67skgm-kdenetwork-strigi-analyzers-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdenetwork-strigi-analyzers-15.04.1.tar.xz";
-      sha256 = "03dc3h6r06dzl6z7nagmsahrzivylyiqlnwin9qjm1jw7wvcfdvk";
-      name = "kdenetwork-strigi-analyzers-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeartwork-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/3aj5jpa1s6hzqiwlws6vg00qkn7m49jd-kdeartwork-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdeartwork-15.04.1.tar.xz";
-      sha256 = "023d74d1k6lriy7hg1xigp2dv053dc6cnf74kxj4sgglg8qqnph3";
-      name = "kdeartwork-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-common-internals-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/83s2nk00gahqlc1akhv6gv72w165ab4j-ktp-common-internals-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ktp-common-internals-15.04.1.tar.xz";
-      sha256 = "1g7ms93b756iksjimf0vmrrv1cva0956yjyrxa6zx86z2gsqai0m";
-      name = "ktp-common-internals-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "granatier-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/vs49yw5vjlplwgsskrwv1i6dva0x12x6-granatier-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/granatier-15.04.1.tar.xz";
-      sha256 = "09dazsxch26kh7pvakqzdcmb1vwx5dakq693v692payxgsrbd9zv";
-      name = "granatier-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kspaceduel-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/flf9jk3v67l044291iscpc7yxqynr8s0-kspaceduel-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kspaceduel-15.04.1.tar.xz";
-      sha256 = "1ypiyj7vz4g8dpzd2lygnlrv4gmzfjwbqflzkqq6gsx2a5v671v8";
-      name = "kspaceduel-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lskat-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/2rrzkyrqqmxphhcszdii2qrfag7y91bg-lskat-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/lskat-15.04.1.tar.xz";
-      sha256 = "1nyjhispwf7brg4a1a50br3k583jh734vqj8v8gwjq68q7sig1an";
-      name = "lskat-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcddb-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/s34in46wqxw0pyf0fgzmagbi9r18r1i5-libkcddb-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/libkcddb-15.04.1.tar.xz";
-      sha256 = "1fp8zq00nijwygap3571lpcyy3qn318djv0gj6vjyzfxlkijl745";
-      name = "libkcddb-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/yrpx93448287fy645dnvwkc21c5fw41y-kdegraphics-mobipocket-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdegraphics-mobipocket-15.04.1.tar.xz";
-      sha256 = "1y4ci3l837l3pi308jzh1mvw9rxhyjdx8hgz29vca2gpwyp0v6zi";
-      name = "kdegraphics-mobipocket-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkface-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/7pmab8n861ng48b8483d2l71qy7prm75-libkface-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/libkface-15.04.1.tar.xz";
-      sha256 = "1iannhmn3gh7j3q8x9dm4jvkilrnpkvzhqz4rs4cksr1q49hh8ah";
-      name = "libkface-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbruch-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/n7n2q3a4r9par2kc13nixqidwl5z1qwg-kbruch-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kbruch-15.04.1.tar.xz";
-      sha256 = "0d747mv9mwp0kk6q2bx0h3bn1km99wcxljhsz62kd9g3myzga6sj";
-      name = "kbruch-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cantor-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/5dbbmdm1w5r7hsy2z999aj8b7amy5mz8-cantor-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/cantor-15.04.1.tar.xz";
-      sha256 = "0rlldfww4rzhxvsq3yl2a5ybcd4h4xihcy4924dbjzp15zgxjzyb";
-      name = "cantor-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnapshot-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/xya1fmdi09yiq9xvvpqp5bks628n6yqz-ksnapshot-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ksnapshot-15.04.1.tar.xz";
-      sha256 = "0bmq7qvi5522qcj1ksjy9m7pf3yr6n8hf809isvbamvqk285vln6";
-      name = "ksnapshot-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kopete-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/qq5dm0qrnb40nk2lhdyhhwxwnm2w73ry-kopete-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kopete-15.04.1.tar.xz";
-      sha256 = "195vdbnk9azfhk7i3vq5zbw1c8f7wz3xdjm2n5g2sv3gnmgm598q";
-      name = "kopete-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kteatime-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/cgc2v9iffy7a48sn95rr9x05xwi6h1cy-kteatime-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kteatime-15.04.1.tar.xz";
-      sha256 = "0sxdnk9v1p5mcwp8wka60saiqdm4r9bfpyh40qksd89jkjzw7aj9";
-      name = "kteatime-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs-4.14.8.tar.xz" ".tar";
-    store = "/nix/store/jwibw4jpjfxxhkv6kps17yqmaljsymi0-kdelibs-4.14.8.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdelibs-4.14.8.tar.xz";
-      sha256 = "1fwvqgxxwy9ka6wq4ysn5x6blqw8wqrfnh6hk6m65jdknflshpvh";
-      name = "kdelibs-4.14.8.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kajongg-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/r34lymfzw7s9j1j30llnkj9b0nn0pxr3-kajongg-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kajongg-15.04.1.tar.xz";
-      sha256 = "15yn5ixkwmwg1hvkdr6sl26zch5rdmjq0iqmc1kyrdipdhdp5mzm";
-      name = "kajongg-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "print-manager-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/7a9mkd04lsih0rq5dld1mnsx3cxrkr1z-print-manager-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/print-manager-15.04.1.tar.xz";
-      sha256 = "05dpx0cwlpy17x2knq98kf6s1bh72lfn8i5l5xzf4bxil9s2fir9";
-      name = "print-manager-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-baseapps-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/lz0chc1pimbj5ddi5bkp2nlrlbvgi5l1-kde-baseapps-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-baseapps-15.04.1.tar.xz";
-      sha256 = "0970mw5ywjimrmhcfskwiwc048w1rvjffs3d2a9v74yvv64irkgv";
-      name = "kde-baseapps-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiten-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/f02ixhrvj27hwwsswk7p8n9hdwfrlyms-kiten-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kiten-15.04.1.tar.xz";
-      sha256 = "0l85ccy71ag6nn8fn7b3yr8pjikzivrq6dxka2342nfqidhfpzfh";
-      name = "kiten-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krdc-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/kcp6bc4c7vwnrvpjgvlwx0q3ss74f3ay-krdc-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/krdc-15.04.1.tar.xz";
-      sha256 = "1d1cjy9b5sx533j1aayw503b65gg7pc5wk3n9hy3x9f1a2yywv1i";
-      name = "krdc-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "superkaramba-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/akzfq1iqi1p5zyy4ha003jxq93hx41bk-superkaramba-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/superkaramba-15.04.1.tar.xz";
-      sha256 = "1ncvmmvsfs4jp67ij1vs87sjg59x960pqqxblq49m0l6vmp0l6j8";
-      name = "superkaramba-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "katomic-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/xqifvkcnpvncp34cz72axncvfm4ar17r-katomic-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/katomic-15.04.1.tar.xz";
-      sha256 = "1lpsvi2hnf4f5ngdkcg56j73qwjzm8zahl2pm5l0r53i95kxlqyd";
-      name = "katomic-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "killbots-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/rzm4an2qh22q4d8gxn7hf2lc1h8apblj-killbots-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/killbots-15.04.1.tar.xz";
-      sha256 = "1wrdwjcpr75lwbrb6ijbwi8ghkgdlp3sv5sbbmws9p77xa13scyk";
-      name = "killbots-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkgeomap-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/2sprrk9f1bp0i1pyprzkbfx93p44qr3h-libkgeomap-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/libkgeomap-15.04.1.tar.xz";
-      sha256 = "1zj7wimigjlrg2sq3288wc1h5by155ngascwbbn1x9zy86akb5dj";
-      name = "libkgeomap-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konsole-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/6p788sim5alh13lbgfc4095nas0rav9m-konsole-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/konsole-15.04.1.tar.xz";
-      sha256 = "0fddv6ag23m5ks1cj8rrfbd2xcifxwijkypx6dhxk4pbgkhy0m8m";
-      name = "konsole-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kuser-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/0z7jv74ig27pxaf6fw9sq33r4xvanm4k-kuser-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kuser-15.04.1.tar.xz";
-      sha256 = "1gvpqazrij2ipdfhyfbsw1vgv4173j4r4qnbp2sd8kjibryqcm76";
-      name = "kuser-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-kded-module-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/8krkra77y0vck4pki2r25zivig521cqk-ktp-kded-module-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ktp-kded-module-15.04.1.tar.xz";
-      sha256 = "0hyyz9f8qjzcqj6g92a4g4a3xp7fgyfgznir65mx2kka6fq7532s";
-      name = "ktp-kded-module-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/lbvr1zi1lipmmdx5pkga2k06isy0kk5y-ktp-accounts-kcm-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ktp-accounts-kcm-15.04.1.tar.xz";
-      sha256 = "0s2nny6l744fvf45yczzbcrx1win47b0xvxgf16s29q3y2l51y3s";
-      name = "ktp-accounts-kcm-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klettres-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/xdqivsid3wvc73mxnwzn7ayva3002l3a-klettres-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/klettres-15.04.1.tar.xz";
-      sha256 = "1shlhdmzmis0szafk6kvjy0w25xr7p261zj1fi4gz5hr7262lirz";
-      name = "klettres-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/ayi379ldyhmq5cn53nf89lmvwwfyp9gm-signon-kwallet-extension-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/signon-kwallet-extension-15.04.1.tar.xz";
-      sha256 = "0nk1gjz2bw6kssv09kwksj8p5qpzz90plpnd4nd19qnhgz0a0v7r";
-      name = "signon-kwallet-extension-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-runtime-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/wg7pzsw9s8lm35cxihc08fs9jd21jm13-kde-runtime-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-runtime-15.04.1.tar.xz";
-      sha256 = "178n0zfjzzfpr1shqxyixlb2swmkz2n17xhnmf04hql2l4yj3khp";
-      name = "kde-runtime-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccounts-providers-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/k0ph8jkjq43ym4851swr12csj53vdh6m-kaccounts-providers-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kaccounts-providers-15.04.1.tar.xz";
-      sha256 = "1bd9v89r6y90r8bkm9m46p8yzpbv1zyf4bg0c3scbaqkviqihi09";
-      name = "kaccounts-providers-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bomber-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/sczdf7d6q8qr4kjlyk1q4s573mr7g0fd-bomber-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/bomber-15.04.1.tar.xz";
-      sha256 = "0mzik0cfz6v0jd31z5q9hkfxsynrhiwm704ns4pgb8qsww41yzrf";
-      name = "bomber-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkexiv2-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/qc76hz1v7rawy1xb3d7dlf4yxw9d6clz-libkexiv2-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/libkexiv2-15.04.1.tar.xz";
-      sha256 = "0f3ljs8n2gc9frn3j0cjy60hp8wq0f66ry2qpmdaypdswr7vx04n";
-      name = "libkexiv2-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-auth-handler-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/lmzsbajhy53ay7swff47gsq3il629wfj-ktp-auth-handler-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ktp-auth-handler-15.04.1.tar.xz";
-      sha256 = "1ixxvf5lvy0isv0gqc6sw2pfjqz139kcd0pncq4i89kwqnca8jkp";
-      name = "ktp-auth-handler-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.8.tar.xz" ".tar";
-    store = "/nix/store/xxnnkp49p5s0hc4sgsb0id14mnfsd6f5-kdepim-runtime-4.14.8.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdepim-runtime-4.14.8.tar.xz";
-      sha256 = "1c9lmacadkxdl8kaxn823a7r07w67hrzdypijvvz3ms7k5i84k0z";
-      name = "kdepim-runtime-4.14.8.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klickety-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/wffyflkf9im135fdalll1x68cm523rgm-klickety-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/klickety-15.04.1.tar.xz";
-      sha256 = "0igw7rm7ii30x3971gg5zjpzljlr1ajxbk5bjylizxbl960dx0kw";
-      name = "klickety-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkomparediff2-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/rmzhngxxfnvbr76mm85zgp4zlqbjid9z-libkomparediff2-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/libkomparediff2-15.04.1.tar.xz";
-      sha256 = "16fkixmpvxn7459v41418rs49n6knnf1lpfz1mjidaz6q7ii5y8p";
-      name = "libkomparediff2-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-contact-list-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/c6yg7sc1xnla574r1bc122gp63y8wvyp-ktp-contact-list-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ktp-contact-list-15.04.1.tar.xz";
-      sha256 = "1vmcs0ww4hv7ckb9nddkpci57ha7j6wqrwiikq4rxcvq9a4z1g7x";
-      name = "ktp-contact-list-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-contact-runner-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/v7wjiq2vwpv0r1c6rqfxhjsdcvcr9ffd-ktp-contact-runner-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ktp-contact-runner-15.04.1.tar.xz";
-      sha256 = "19hin3qmcznxlp1lypka7h1nqj4n40hys6sxf6m74fx0myk6jia9";
-      name = "ktp-contact-runner-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcolorchooser-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/al6rmbszcmx8m2fk4i2ihxxp4wk2n06p-kcolorchooser-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kcolorchooser-15.04.1.tar.xz";
-      sha256 = "1q1ipvvd02kgrvz322m7gn6rwxdnpkkj4575yrn6vpxx616q1pf7";
-      name = "kcolorchooser-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfloppy-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/4zgqikwm771c85nkd20xw9lplpyqhycf-kfloppy-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kfloppy-15.04.1.tar.xz";
-      sha256 = "1rqccsiyfazsbfjs8mpjsqbbw9pd6fakdb076q0mj2syrlm7xr36";
-      name = "kfloppy-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/277d4282d2h3cqrjrrlh6w6z0f9sp12l-kde-wallpapers-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-wallpapers-15.04.1.tar.xz";
-      sha256 = "0nbv456714vr5mp125bdza3czgxzhbv2wglsmxj0sqc1k6fiadfi";
-      name = "kde-wallpapers-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksirk-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/vzxblpcsa0jrzcwcp5a9pnax60dkjwav-ksirk-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ksirk-15.04.1.tar.xz";
-      sha256 = "1v56n78cxd9201r5pz3vn4mkpry2rihy138ar7kpqvcp7radipr6";
-      name = "ksirk-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmag-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/ir7qgza1smfbnwdxf1aj60p1xqmgb44p-kmag-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kmag-15.04.1.tar.xz";
-      sha256 = "0xh66mpddlriivcqg931nd5bbqvrylq1gpccqbajahhr0jbp6lzf";
-      name = "kmag-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-text-ui-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/xli6mjyym1qql8id8fwjvx9yils6kihx-ktp-text-ui-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ktp-text-ui-15.04.1.tar.xz";
-      sha256 = "00nbzyh2m9gg401krcnm5p38xj6xyp8n6v4lh779hdx63d755myw";
-      name = "ktp-text-ui-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okteta-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/gxnx1dmd8964wj7cz37c50i382sg2gbp-okteta-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/okteta-15.04.1.tar.xz";
-      sha256 = "17jvf6ca27xj1vv7yss2886imdaws2xpkibz13aicjvw23xhxhvj";
-      name = "okteta-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmix-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/0wvrlr0afl9j7mwn6qp59qb5662bnjv4-kmix-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kmix-15.04.1.tar.xz";
-      sha256 = "0gf1a63ycz8hmlzz7xm361hszzr4l7dibwam9pwg4wipankdipxh";
-      name = "kmix-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kget-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/0yx4x1f5rxhk7wg1fj9ck54z5b9wim8q-kget-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kget-15.04.1.tar.xz";
-      sha256 = "0qckya9r4gic6axq4fi5r5qv4wj31jahbyv1jlyi468wv16cxmnq";
-      name = "kget-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kate-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/0ky72glm45d5p7knpg00xzjp08shjc1b-kate-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kate-15.04.1.tar.xz";
-      sha256 = "0ykppas7fnnslj71y77y2p2qv4jnnv8gdmmfaz5plxkcdjk63a87";
-      name = "kate-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kamera-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/331lhb9vdk6jr5bcd9z9kdg0nsy74sha-kamera-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kamera-15.04.1.tar.xz";
-      sha256 = "1g1lq4g1gk9cw6l1pxaaxzqy4qrqr0f4idkg9bkqbhj20xrl51xd";
-      name = "kamera-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kstars-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/29wwk2c90zcifni2hra686nwqlxjqh4m-kstars-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kstars-15.04.1.tar.xz";
-      sha256 = "1r2sf1ifgkmg8f59jj1j41js538h2x9nr2j6bppd16bbp8gzs2na";
-      name = "kstars-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmouth-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/vwkzr7jkym3x2lhilv4vp92pzsc7zj69-kmouth-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kmouth-15.04.1.tar.xz";
-      sha256 = "0qq45lmgxy5wn24wwi8d5p1vc8h25a70xzaw2gdhj1m2vq37sn5p";
-      name = "kmouth-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "poxml-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/nfm24h17jvwp3sbl9r4wyjqhm1ly853h-poxml-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/poxml-15.04.1.tar.xz";
-      sha256 = "0by57c11p2g82cbl4pmv281dnkdky2943bzcy4yb0qnhihpl99nh";
-      name = "poxml-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/zcadi1mwn8qb0s4j9y33cm46z07wlnlv-kdegraphics-strigi-analyzer-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdegraphics-strigi-analyzer-15.04.1.tar.xz";
-      sha256 = "1xp7k0m2blm6nfzv6pf8vqc2wfdw1pp08dfgg9qvvl4ar80wi62v";
-      name = "kdegraphics-strigi-analyzer-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksudoku-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/iz57bv4hld01cxkdm6dv2i0n72ckv8g9-ksudoku-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ksudoku-15.04.1.tar.xz";
-      sha256 = "1x81q0bya702dcksn86pi8qzw13zb8x558nw3wv8q3z4cp7bzwba";
-      name = "ksudoku-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/33kal7ji8dw5a89n6m7wpfpf519kdwbp-kde-dev-utils-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-dev-utils-15.04.1.tar.xz";
-      sha256 = "01ivnsjvpbl1i55zgrcz01hzcn02mrvr14a0nz8bi5s5l53r88sy";
-      name = "kde-dev-utils-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kompare-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/if8mcxgb9bf6i7hmrvlgmwjvjq92p6k1-kompare-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kompare-15.04.1.tar.xz";
-      sha256 = "1h9xvd48kixrffr89kj3lr6nwbj4jvrw5nqz05jl7q6a4rd11p47";
-      name = "kompare-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kppp-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/k2vyy51405ds24y3mm1dz8y8yifwk60x-kppp-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kppp-15.04.1.tar.xz";
-      sha256 = "0d4mk303yw1f17sw517ni8g0lqr3wdl9r2whz2l3pznnd3hh447q";
-      name = "kppp-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dragon-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/nk9ya7riashh1gaw9jnqwypdalr5sq2l-dragon-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/dragon-15.04.1.tar.xz";
-      sha256 = "1kmp3klp86mmkgvdy973cpnqw9ghbvvs7iqbsqkg19gqg5p3qi6n";
-      name = "dragon-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdegames-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/kl3yj4xk86l67vl3lahdzq4x6gi8w8yv-libkdegames-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/libkdegames-15.04.1.tar.xz";
-      sha256 = "0jwvywzamfnjv9lfyxbvki9j1y8ksk6x54v4p16k7mkz7dx7qmd7";
-      name = "libkdegames-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgoldrunner-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/bfyd2yxzm5y2bc8mvchpa5scd297lx5h-kgoldrunner-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kgoldrunner-15.04.1.tar.xz";
-      sha256 = "19aiabdyyyfsc8vdgvh26sh9i2cg4lcvgfca296ch0wdlbs8xdd3";
-      name = "kgoldrunner-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebdev-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/l3hf3r3q9a0mas8i2br6ajlq1h1wnm9h-kdewebdev-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdewebdev-15.04.1.tar.xz";
-      sha256 = "00av449nc04mascih5ii17hbjxxpanr8gbdimjjhdp2z9dvgnb0h";
-      name = "kdewebdev-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knavalbattle-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/vkm47y3nws18va3cz13isi02g1wrkf6p-knavalbattle-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/knavalbattle-15.04.1.tar.xz";
-      sha256 = "0d94bmd2jvd6jzjxzdbc4rgq1k1a22md4azddqm6z1yc1n41qkyc";
-      name = "knavalbattle-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmahjongg-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/n5dxy147bwqxx9i49h2lia68846f1zwg-kmahjongg-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kmahjongg-15.04.1.tar.xz";
-      sha256 = "0zl0z3p07hxyiy5p894cf0rai0ad0i4sihxgj8n23cqs653wglb7";
-      name = "kmahjongg-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ark-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/shl563g5w7cn13zynzpbm94ri1ccy6lm-ark-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ark-15.04.1.tar.xz";
-      sha256 = "077xvn6symzzr9jb5cdfvzf1xbpliq2krnw1ab1c9a251x90zclw";
-      name = "ark-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "gwenview-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/ccy2m84g722ihs95n2kindl14n93ir6n-gwenview-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/gwenview-15.04.1.tar.xz";
-      sha256 = "07vvcamksgvk8xgj872ql8a7ml7drw3pbv4z7zgrprzracniapwr";
-      name = "gwenview-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksquares-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/n63xlpj38d1ziy7fg5y5fa0smw12whpa-ksquares-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ksquares-15.04.1.tar.xz";
-      sha256 = "0i6rf5x6wsij05xgv9rzizax7j029am7xgwrzzjdk7anph1mx6i9";
-      name = "ksquares-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "umbrello-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/g91s71jw5mbiy8y2gdknkqnxyklm39wj-umbrello-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/umbrello-15.04.1.tar.xz";
-      sha256 = "1sp8f2bjgp5gv9834csa42531psx0sq43ldjgsgygrnbggzmv8nw";
-      name = "umbrello-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblackbox-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/w1s27mkqknc6q7ni39641vgviyqgnxk0-kblackbox-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kblackbox-15.04.1.tar.xz";
-      sha256 = "02b9kfqm64qz0jnyviag02rd0h36ajmfbnswwgin3i7zbvd5xph0";
-      name = "kblackbox-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolourpaint-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/xsvwhyp6j478pjbjslilb62s89ljdfrd-kolourpaint-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kolourpaint-15.04.1.tar.xz";
-      sha256 = "04vamlgbsmpkfw4g3hrm9mm6imnrk3gk994pqb35ajvz8089prwp";
-      name = "kolourpaint-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "step-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/gjcms2qdl726gv00644ljmsl6ddyywwl-step-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/step-15.04.1.tar.xz";
-      sha256 = "1sy42yxpp1qkpcj151xpi2576j59s0cznig3bj65klm5iamiar48";
-      name = "step-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcachegrind-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/3x1mlqph515m8nf31pdk8wxhhrcbj444-kcachegrind-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kcachegrind-15.04.1.tar.xz";
-      sha256 = "16fvs27gbpsras3q2qva9x9sc4r056rk2q5b0jijqpncha51wnr2";
-      name = "kcachegrind-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/x3hq5g8vcvm5a9npa7amn5w492rh9fhw-ffmpegthumbs-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ffmpegthumbs-15.04.1.tar.xz";
-      sha256 = "196hc96ifqq1m5jja8gkl83a23206l304kqh9rngqbqx2xqbis7g";
-      name = "ffmpegthumbs-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "parley-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/qj4bmbkiah1jrf0arh2r1ygd6ki0vi6q-parley-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/parley-15.04.1.tar.xz";
-      sha256 = "1mz2s4l3bzdpz3jd2rkamwvjiqx133sq7agmrg3ssmhl583bgyln";
-      name = "parley-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmplot-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/4s3kx66a51gj19imxp7y73q59dx3dsb1-kmplot-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kmplot-15.04.1.tar.xz";
-      sha256 = "1rz7l1lggpprmanyr6d1hpyjw6c3z1gdpcf475573y5gip1sylvj";
-      name = "kmplot-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kturtle-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/6irgf5syddcsvyn8jpfmzjmdccy9mp3j-kturtle-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kturtle-15.04.1.tar.xz";
-      sha256 = "0qkaspwdb60cqizf3ph9w245nqg7rarb7riwzdpf007kcpx16905";
-      name = "kturtle-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccounts-integration-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/2xabxjp756c62b9l4iaqjb2hn6jm57bn-kaccounts-integration-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kaccounts-integration-15.04.1.tar.xz";
-      sha256 = "0rm4i69b63vmcjcdvgc5bj3sygdjxkk5bx12vm70h2wx72zi7bmm";
-      name = "kaccounts-integration-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktouch-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/889f6956q1d0k0m9n1j9bx36y446zaqd-ktouch-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ktouch-15.04.1.tar.xz";
-      sha256 = "040xb5bpc848g4m7lpgh2qp7zn3x88pi8lx49rvd7cwy9r0yypxg";
-      name = "ktouch-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "analitza-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/ci7yardryphabk0561gfqv9w3bg2dld9-analitza-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/analitza-15.04.1.tar.xz";
-      sha256 = "0ndz76kdk0x63269324c516d7vyssni8q89im62hkcvsjv0y1wb5";
-      name = "analitza-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cervisia-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/6v595hx7jz5v0k6pvmxixva0pz9a86c2-cervisia-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/cervisia-15.04.1.tar.xz";
-      sha256 = "01j8ai5s5gqh5wb6c74yrpr6x8652zdmh25dchpafih5sm5y1s8l";
-      name = "cervisia-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "filelight-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/kxzx5vxg5cl6v99c2q0dx6svzq66lmq3-filelight-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/filelight-15.04.1.tar.xz";
-      sha256 = "1pi3j10h23s7ianr5dhf17skdspnxgqfv9hxzfi0pyy3z9yfhs9r";
-      name = "filelight-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktimer-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/bfgk2rpkifs0kmmg8a9cw2sbcw9x4acj-ktimer-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ktimer-15.04.1.tar.xz";
-      sha256 = "0avscwyksa6rba9ppp6pcd332phd2zwsvpbprn0sbsias63mx7rb";
-      name = "ktimer-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "picmi-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/adzmd2pnn5lss9fm35x6hqvb6jfb3dc5-picmi-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/picmi-15.04.1.tar.xz";
-      sha256 = "06v2cxdlg8366r122gfs03y2zfhcml2bp0q79a357b4aj14xah76";
-      name = "picmi-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/g7mzrah5zhp760dw67z836yjb9ycscqb-dolphin-plugins-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/dolphin-plugins-15.04.1.tar.xz";
-      sha256 = "1zw626gzrc0sxbif1y2mnqm96s2yap3fnh3ij1cv81v43yy12jsk";
-      name = "dolphin-plugins-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkmahjongg-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/9awn6c5akngz6f7h9xbwvnxfjh7k4k6c-libkmahjongg-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/libkmahjongg-15.04.1.tar.xz";
-      sha256 = "1lw9k7h2cli65738lp06wwn763aggqdaqm52gf4s25ia6sqa1vs2";
-      name = "libkmahjongg-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/wygvvlqqdcah3ilsr18n32jbidb3vjp2-kde-base-artwork-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-base-artwork-15.04.1.tar.xz";
-      sha256 = "1jxmg1s11kj1qiwlh5jji2bhcgn2d0sx6lljh65snwxg26liwz6v";
-      name = "kde-base-artwork-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscd-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/k6bz5mzppxksahygjg51bfyr2lmb56vq-kscd-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kscd-15.04.1.tar.xz";
-      sha256 = "17spvnflbq2wq80awk6y895ls214n8h0ssk87r7qmr03pvzhnyaa";
-      name = "kscd-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sweeper-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/s35plhhx4ic5ghzqa9v3ivsvr1rynang-sweeper-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/sweeper-15.04.1.tar.xz";
-      sha256 = "0vzqpyhi5kn2p6waj2pn1myaz44v7dw2ll0hz8vp0rfh9qnwq70l";
-      name = "sweeper-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-workspace-4.11.19.tar.xz" ".tar";
-    store = "/nix/store/lxglid45py66valnl34y41z7ny1zyla3-kde-workspace-4.11.19.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kde-workspace-4.11.19.tar.xz";
-      sha256 = "1hn5q86p1wpv6y4wia0sxfn83iya00d6y70gdq3svmhj1bdjj50w";
-      name = "kde-workspace-4.11.19.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konquest-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/wags5sgprgy7cngppjj2n9b29625yp1r-konquest-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/konquest-15.04.1.tar.xz";
-      sha256 = "078503rf9r7rb161xi5j22d08imk2b1g4ma5xyaap8j7jr8qykak";
-      name = "konquest-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kig-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/pii50yzi2wkj384pvswiqcqf3m6w2b22-kig-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kig-15.04.1.tar.xz";
-      sha256 = "07dw82q68akjzc3v1igx1ah1j4b53ph4pgpkrxzh3468nrhkrxqc";
-      name = "kig-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-approver-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/0z3zii1zjnnjk34x0i94nc41i2cdi0gw-ktp-approver-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ktp-approver-15.04.1.tar.xz";
-      sha256 = "158c93kmwffnsx78qr84qqjb34p7czynrqbz3iyj29s79kkx4ix0";
-      name = "ktp-approver-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalzium-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/f4jk61d6sgcx57k7ppjql6qml9q2pazn-kalzium-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kalzium-15.04.1.tar.xz";
-      sha256 = "1islh3c67hlar51hf2hx31c1pg8kkw6h7c6vl3mv442wl468ilvl";
-      name = "kalzium-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcron-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/q6dydf2sgx486rf4rfm3sfbbbsrcns89-kcron-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kcron-15.04.1.tar.xz";
-      sha256 = "0ppdydcasrigqmpldjgvrxmjffizf9gnqbxrjypwirhsay2z5clv";
-      name = "kcron-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktuberling-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/z7nqzkmyfc7fw4a2c4kwh8flvx9309pb-ktuberling-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ktuberling-15.04.1.tar.xz";
-      sha256 = "1nm0g089c22nc06xi7446drsgllsxrsfd68r7mm5p38fdh1rmxll";
-      name = "ktuberling-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "juk-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/k9pq6074j197y1hz9hr3xdcla9pcqhic-juk-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/juk-15.04.1.tar.xz";
-      sha256 = "158mxy9c73g27i3plndik4zw8p527zgqq7rj1mrdlj2sic1jd6df";
-      name = "juk-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdiamond-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/266jwjlfnq0njn09f26xnif9bl3v12h8-kdiamond-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdiamond-15.04.1.tar.xz";
-      sha256 = "0kkprlaghidb0skmra1ja9vwncg0zsvawvnjrzb0fgi065iz6bc2";
-      name = "kdiamond-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/cw3cr2nrhmid0miwp6nfh7c3kqwf072k-ktp-filetransfer-handler-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/ktp-filetransfer-handler-15.04.1.tar.xz";
-      sha256 = "1dzkbgpv9fbkwxlzdch0axc722m5kq6viy33isihv2j0hcxvjjzy";
-      name = "ktp-filetransfer-handler-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-4.14.8.tar.xz" ".tar";
-    store = "/nix/store/2jiwn6rshw66kv3v058w34qv45qgkrna-kdepim-4.14.8.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdepim-4.14.8.tar.xz";
-      sha256 = "19z3pfmb8d6gsr9njyfyrjl4llzkk7q6fcl0ng0k0w1q4i4igd2j";
-      name = "kdepim-4.14.8.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/3hz1jgliry4xb27cbn4khkynvz42asfm-kdesdk-thumbnailers-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdesdk-thumbnailers-15.04.1.tar.xz";
-      sha256 = "104wyrapk77mi11a72p03liln0qh0mq84hbgklyf3rwxbdsmysz9";
-      name = "kdesdk-thumbnailers-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeedu-data-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/c4kzdj7sq4557wcmhwf2cg566b04x617-kdeedu-data-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdeedu-data-15.04.1.tar.xz";
-      sha256 = "1fvvam4wilijvmlfklqwgvl47ffy7w7lhp61hjgn6chjhrk3wxd1";
-      name = "kdeedu-data-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksane-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/l09dwrlxm13fl8qnk7cpgs66537287cb-libksane-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/libksane-15.04.1.tar.xz";
-      sha256 = "1wlp09c2djprwwsbip0i1jx3d9cj16axbvbyn1hhc1hzaim3wnsc";
-      name = "libksane-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kshisen-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/2mb9v1738cif1qwwkfqyqgbs3lysg0ij-kshisen-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kshisen-15.04.1.tar.xz";
-      sha256 = "0vgh980plqrd0r8s4pp79xy39j7n6z2xjrj62z6bna65wywv8cim";
-      name = "kshisen-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjumpingcube-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/ap7dpxkmh50bay925x93hhchdvga0zc0-kjumpingcube-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kjumpingcube-15.04.1.tar.xz";
-      sha256 = "0lsd14qpb1c6hs9ff9fwpmrbdn7khk6lwdar82l9dwvzd9zk9vpd";
-      name = "kjumpingcube-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/ncrdk952fj4sg748lqfdm9xf5wi5rm2d-zeroconf-ioslave-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/zeroconf-ioslave-15.04.1.tar.xz";
-      sha256 = "181q88i8ygqp2g4c78qr2flwbrnwphix0ksm2qrinrchbc7v7mxm";
-      name = "zeroconf-ioslave-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenlive-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/qcwij9xp4fv8s5zgizij3rmb220r7193-kdenlive-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/kdenlive-15.04.1.tar.xz";
-      sha256 = "0v4qx1r5kkkiqvxzdvr2467dhx0ndylvwl1vd723lbdi9vk9gg4q";
-      name = "kdenlive-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khangman-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/g1f0f255pjr3wd2jh10q05xjkgm3340h-khangman-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/khangman-15.04.1.tar.xz";
-      sha256 = "1jnc5cjij32sbxcq2bvmzkdsj2f7w194lwkj48gdkkwfplbn4kwc";
-      name = "khangman-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lokalize-15.04.1.tar.xz" ".tar";
-    store = "/nix/store/1j2l2qhfkxrgqbwiglg8mn60480sanfy-lokalize-15.04.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.1/src/lokalize-15.04.1.tar.xz";
-      sha256 = "0h46kf14i4gd17k2fad629b7yq66mcy2cp5w0ir0f071z2s9jvg3";
-      name = "lokalize-15.04.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccessible-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/51djz0y5i1mr90pv9fmxi0vwzrrj2ygq-kaccessible-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kaccessible-15.04.0.tar.xz";
-      sha256 = "1q90ak7yxvvi5scxajb3d4nid2h7y7xfvdbqfd9a6w312r6lcvz8";
-      name = "kaccessible-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kuser-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/4q0xn6h1mf6plwikl16v490hbcm1c3jf-kuser-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kuser-15.04.0.tar.xz";
-      sha256 = "0fgjfd76iiyp98013x9la61qxnw454kcrl7vpikg37hqaqbzmgkh";
-      name = "kuser-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiriki-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/p393dfammjyxak0wm3vblzcb8n7r0gnw-kiriki-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kiriki-15.04.0.tar.xz";
-      sha256 = "0cg4iijyk96lwc48ifs5arip3y51wpb4fd4slgjbkhvg4fc859sa";
-      name = "kiriki-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.7.tar.xz" ".tar";
-    store = "/nix/store/819bf5a5q4b4l0w9yi099capf9il9whz-kdepimlibs-4.14.7.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdepimlibs-4.14.7.tar.xz";
-      sha256 = "1cmqyx0shm0ss48pjh9jm9g9bghkkl6fg5wgw4yhs4dgz1nj9qn1";
-      name = "kdepimlibs-4.14.7.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "amor-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/fmbdfhm9703yaq7x619d1s97il6prp7r-amor-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/amor-15.04.0.tar.xz";
-      sha256 = "167j2qqkivrc2pid11nmnllw2m2amr8d9jvafy54j3i7mcbs788k";
-      name = "amor-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knavalbattle-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/y9k66adhrcr1vxyzdvsx3zymkd7b4zaa-knavalbattle-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/knavalbattle-15.04.0.tar.xz";
-      sha256 = "0hgwx63g1lrzrszajya4va2pidh2xm1qy7b8iw5xi1yz1khn6cvd";
-      name = "knavalbattle-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiten-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/zb4wpb0g4vbkrnwrk7d54l2dd88cz4b2-kiten-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kiten-15.04.0.tar.xz";
-      sha256 = "0lpvwm20zr7zq7p09igbacqhm7pv4bv7r701nijw5l9l4d58hq3y";
-      name = "kiten-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwalletmanager-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/4i8v7c1a44idrlpdqc6yk41w6r34259x-kwalletmanager-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kwalletmanager-15.04.0.tar.xz";
-      sha256 = "0c5r6pfinb509a0mn2k31wksiya9b52pjm77bbaq60k1y39fsizc";
-      name = "kwalletmanager-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalzium-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/6ivi9a4yilhb621zj0kz07yzbxa5wpxs-kalzium-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kalzium-15.04.0.tar.xz";
-      sha256 = "1x3vdi9h5px84cm7k1nbrlakkb13xrc25d6yw22pnfsf3v4n66f5";
-      name = "kalzium-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfloppy-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/7w91cal36byklnn0mzzclgjj5hpjzb2j-kfloppy-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kfloppy-15.04.0.tar.xz";
-      sha256 = "1nmcdzd7zhr4vfxb8lgl7dxfs01wy81kcag36s43hg7mfs5xb0k4";
-      name = "kfloppy-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolf-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/76g0y1k03dlc50d5wfdgpb2grsy9p0qa-kolf-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kolf-15.04.0.tar.xz";
-      sha256 = "0nzqvq5y2mvh7x2lsq8prkyn99j8137hq5pyk5d9yhla4lpq2lr4";
-      name = "kolf-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "print-manager-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/rmvqcnl3b77hxhcw7z22vx03pi1gk3gp-print-manager-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/print-manager-15.04.0.tar.xz";
-      sha256 = "0yn8dhvpxv5dxdn41c6rzar66gvlqmgb3m9f0rdrxzqmw9xidzrg";
-      name = "print-manager-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "poxml-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/kinljjyys5d6s5rfyhl6jzmh8z5bm92d-poxml-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/poxml-15.04.0.tar.xz";
-      sha256 = "1cziw2ydylsx45s5hrg1bfwk8qv9jbvji3hyzwi6jqc72fpv9q5x";
-      name = "poxml-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblocks-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/jjkr9khw6fzh7hb4xss9jx2qwz05jral-kblocks-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kblocks-15.04.0.tar.xz";
-      sha256 = "0q32xvajnv7x3fmhax1bmc4f7530cijisn48hpnpkm4g4mn68qb0";
-      name = "kblocks-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdf-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1wrgspd1n890ln1dffghslw86z2ynfz3-kdf-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdf-15.04.0.tar.xz";
-      sha256 = "18i9rbl210vj370n3irjy2ai4vrhg26ivfs37wl0zdvz4i81ncg7";
-      name = "kdf-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkomparediff2-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/krsghsp3cs3wmib774g36933smh1bldv-libkomparediff2-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/libkomparediff2-15.04.0.tar.xz";
-      sha256 = "0i9vyc4bfqj22a1v48f3gyfkxl3pi9smsg0lql1bs0x8rsn7iznd";
-      name = "libkomparediff2-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/659kk26hrkssc4xkyda1kwf41ri00csx-kde-dev-scripts-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-dev-scripts-15.04.0.tar.xz";
-      sha256 = "09r8wcln0m5akwjs939dbbz20kdqyxag91028vfmwzkw9r99604y";
-      name = "kde-dev-scripts-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-4.14.7.tar.xz" ".tar";
-    store = "/nix/store/i8i89jlpkd3rmgyfbw8xbv67az4xkmjq-kdepim-4.14.7.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdepim-4.14.7.tar.xz";
-      sha256 = "0hnmpjrcv0qcyn6hagpayza2bjkyd2v8y02rriifq9q99j7rwyj0";
-      name = "kdepim-4.14.7.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/xdmcjjrfxhwwigf32sbafbakczc9jfyd-kde-l10n-km-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-km-15.04.0.tar.xz";
-      sha256 = "1rv7pp35sgqppqs320pnlpqrjs0ljix9dd92fl2jrfpag15fi887";
-      name = "kde-l10n-km-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0kz1fd8ha3m8r5kmqa9phr607ayry1ds-kde-l10n-es-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-es-15.04.0.tar.xz";
-      sha256 = "0bjh1x3snldbmfvdamgid23cxv1sn3qwsdpy92h1djb49zbm51a0";
-      name = "kde-l10n-es-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/brvc7zjfmcvif2y8n4zrmlva72v243md-kde-l10n-fi-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fi-15.04.0.tar.xz";
-      sha256 = "0xh66i7wgapi6bhig712mlq8dkaml9dpzsj43dic58xw8bx4n6s4";
-      name = "kde-l10n-fi-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/h0hfrfigk06zqqgl0crsah3sqgh05syp-kde-l10n-nn-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nn-15.04.0.tar.xz";
-      sha256 = "1d2yvvl6rralsw77vg6hmbi84dswf116dpab7r5039nqgxnr8k81";
-      name = "kde-l10n-nn-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/r2mbi7gj1a4f71cp6xgjxfkbmx1qzzrp-kde-l10n-it-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-it-15.04.0.tar.xz";
-      sha256 = "1izidgcrzyvxka143cpnvrcnf2ddzp8384sjw6bvw32wsxi3v0mp";
-      name = "kde-l10n-it-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/kxaxpwzy0bs1675by3qhhvj1hlvvig7a-kde-l10n-pt_BR-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pt_BR-15.04.0.tar.xz";
-      sha256 = "0s6pc40ig83zjqbgqwhfkxzhp9wcrgac6hs5qhcxbs3awfmxi5hn";
-      name = "kde-l10n-pt_BR-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/mxmsybkjr2pr2xwfrxciwf6jjn2mp1vj-kde-l10n-kk-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-kk-15.04.0.tar.xz";
-      sha256 = "0czb1dmrdciim910bnazvsvi7lcvq27bj055f36w6y6l1zgvv8c3";
-      name = "kde-l10n-kk-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/cj9bhf10x4rcvcia97l9qhjnzll979ls-kde-l10n-fr-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fr-15.04.0.tar.xz";
-      sha256 = "0g94wik9q6c9w5x851k76qfk0fknv6ga497vwqka1h4yrmdmc1vl";
-      name = "kde-l10n-fr-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/pyl52lwdrvfi3xpby5yyi93204jp3mjx-kde-l10n-he-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-he-15.04.0.tar.xz";
-      sha256 = "0hpnn6rci0bavl6hqs6v2ylz26sjyf5siwi2klfc3fsw6a04in43";
-      name = "kde-l10n-he-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/rn2hih1b8fdbjahg1va76kn7cdjq05g9-kde-l10n-nb-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nb-15.04.0.tar.xz";
-      sha256 = "1mz3bcm92745zr6gn7q85p72l57sh19bcvvkpg40c63k34xpwpan";
-      name = "kde-l10n-nb-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/8mvkdlcf0azzq8y5g1r2bbq15z92b8df-kde-l10n-fa-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fa-15.04.0.tar.xz";
-      sha256 = "1jmwjlbnlciy4k9szqi7vjwjpx94faixjg2mmg42cjfx5as9ws5x";
-      name = "kde-l10n-fa-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/01ryc8gdgvjawaki8qaw5dpbyibvng63-kde-l10n-nl-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nl-15.04.0.tar.xz";
-      sha256 = "0a3c7fkw0cczdd5733c7klfsffpi5ah1i6alqknm15y534bsigzc";
-      name = "kde-l10n-nl-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/g71kfpca8y88a0dmcrphban2vjvyr85m-kde-l10n-cs-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-cs-15.04.0.tar.xz";
-      sha256 = "1bl0w1qhk05xqniv1piik9gkj5nlcsb90bpxlvj0sd5ivcqxma53";
-      name = "kde-l10n-cs-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/afq8qa9cr7yli1djasn7xs9fg781b3dd-kde-l10n-ko-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ko-15.04.0.tar.xz";
-      sha256 = "181gzqhg6lc5z045l05zxz4zrc6hx36fmb91v62sfn2w70dc6jmd";
-      name = "kde-l10n-ko-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0whvwp9h1lrnqcf68qihaq5mlz73lm5b-kde-l10n-is-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-is-15.04.0.tar.xz";
-      sha256 = "050fdym6mlj1m1m594jglhjcxwk8dx4hc6p1428ldc19m4b9q06c";
-      name = "kde-l10n-is-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/fd72fjmwlgy7znmi7gz71qzd6fb9w5k7-kde-l10n-zh_CN-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-zh_CN-15.04.0.tar.xz";
-      sha256 = "0klkxznhfc5sfrlnz80fqf06lzk8g411cz2v0wpd2wjafk1pyf56";
-      name = "kde-l10n-zh_CN-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/g1nxxpcihfcb0kwk0bm53acvv8b0yfgh-kde-l10n-hi-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hi-15.04.0.tar.xz";
-      sha256 = "12qgzwiy0igz7i352dwk5ipsxhia0spi74ibk70xr7irr9axgidr";
-      name = "kde-l10n-hi-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/knj0hcr1dirq6rlhmw9dg1vl5ag52h6k-kde-l10n-ja-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ja-15.04.0.tar.xz";
-      sha256 = "1b8741fzhimf3bch6mc9hzdj040y50gf7fgd7ja5n5ipi0ma2drf";
-      name = "kde-l10n-ja-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/lg8jgickpm35z3mfypigxhngq4r93c2h-kde-l10n-mr-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-mr-15.04.0.tar.xz";
-      sha256 = "0v2mcmrpqz31yix7z7kcjcfpwpghsifnvwmdf1k1lif0a9mq5qq1";
-      name = "kde-l10n-mr-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/yq2f4v4vfafxk8j1j1v97jbh39bklnag-kde-l10n-pl-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pl-15.04.0.tar.xz";
-      sha256 = "002nladxsgh9pamcaibsx7z7dcvcpbii9dyql8v3845wqjpgj8wk";
-      name = "kde-l10n-pl-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1i36fnf4018v9zc0awz7raqbv7269cay-kde-l10n-ug-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ug-15.04.0.tar.xz";
-      sha256 = "094x3jnaby75q1j7q6c79y0sw63hsqqvw1qv0dzjgghky7qs584s";
-      name = "kde-l10n-ug-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0svv0vq2dl7cm4wihdsp459m404jvimk-kde-l10n-pt-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pt-15.04.0.tar.xz";
-      sha256 = "177b455rgdrm021lvwlx6xgbnk3mh38l6080i2v52rzjm6bmchsy";
-      name = "kde-l10n-pt-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/h1i1cg1qhsxfiffalx4j4bar3nbwjpjr-kde-l10n-gl-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-gl-15.04.0.tar.xz";
-      sha256 = "0l27hrsd1pbk3w0lgz34zspmc6b4cs4y0p8i6y1sq51sd5p8qwd4";
-      name = "kde-l10n-gl-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/vsqwvz9r39nypa1hcxnn3figzyngpf6v-kde-l10n-ar-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ar-15.04.0.tar.xz";
-      sha256 = "04djbcdq3z4iysbvdiai2qd7wm9zx5fp400k3zsw36150g93ar7q";
-      name = "kde-l10n-ar-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/vaih1nkjz81vm6vgfy25iqd8dxrivsqc-kde-l10n-ca_valencia-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca_valencia-15.04.0.tar.xz";
-      sha256 = "0ij9xp47mv63hgdbri7cmvld3zgg0sfgip0gg7iqinzkj1cifj9f";
-      name = "kde-l10n-ca_valencia-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/sc5haa7ci8zwglc03s60bc5and8ydqgi-kde-l10n-uk-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-uk-15.04.0.tar.xz";
-      sha256 = "0n01ypzyqr8k30hakahpm68430bgr207yv5mbw2parzj3xbwzpbl";
-      name = "kde-l10n-uk-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/fn45av76smcp2bj01aphy1m49na74jlz-kde-l10n-el-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-el-15.04.0.tar.xz";
-      sha256 = "0xxfqc1hzf3nbvja8c6aq6axpwx64ifqz32nxw4171valjj1faqv";
-      name = "kde-l10n-el-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eo-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ijscp8qiliavdzda0k4vzgmfp30a065q-kde-l10n-eo-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-eo-15.04.0.tar.xz";
-      sha256 = "12j9ggkgjbz229iwzpb19hjnl6zy2fvgkk68mh133ij3ik70i3bd";
-      name = "kde-l10n-eo-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/lm8d1vbsplg0r6z7ksir7z9nqjy7c0pj-kde-l10n-hr-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hr-15.04.0.tar.xz";
-      sha256 = "0a0p1bspv849zdja86rw7lvg60h6rgl1g5hc4zajmq9sviknsy3k";
-      name = "kde-l10n-hr-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/bm9c9n9jln8aadmjmqhjqh67vd2d3126-kde-l10n-lt-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-lt-15.04.0.tar.xz";
-      sha256 = "1l899bj9zw5db9wf6zhd6f9mpyynwagk907q8ws2xh6nlgrs9ydx";
-      name = "kde-l10n-lt-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/bp31anbdx5f3blgdnhl205vrqw9jgfx0-kde-l10n-de-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-de-15.04.0.tar.xz";
-      sha256 = "1hd0pz2n0l1hs5dy8426n53w8d0a4mys7m7wyihs0a7akf76cy4s";
-      name = "kde-l10n-de-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0a57w09ilczqr5dwwz8x8qvgqq4wbzpj-kde-l10n-ia-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ia-15.04.0.tar.xz";
-      sha256 = "03wir3y5hz3fnkqqv97bcjv4rc768f953y8dqsc362a61zidw70l";
-      name = "kde-l10n-ia-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/whhz3930c4q5n50v7n9xbzc6l4xblf3m-kde-l10n-tr-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-tr-15.04.0.tar.xz";
-      sha256 = "0h1997x62ycisnfnbawjfqfwblh6fhqqscns79f7d7krxhfyq7cr";
-      name = "kde-l10n-tr-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/22fjrzh19zha3ldbwkb7l64gnnq60i5h-kde-l10n-zh_TW-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-zh_TW-15.04.0.tar.xz";
-      sha256 = "077pr968z7d8ldnv87vsfn9j13llx3qqw9gwc041c9av73vp4ccg";
-      name = "kde-l10n-zh_TW-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/16bpvmlzzw1cqjmrlvznd5751p1fsi18-kde-l10n-sr-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sr-15.04.0.tar.xz";
-      sha256 = "0yicfyaj6zckk0x9skw9q3qnh0f0vz6pmahgh1pd5ayl3sqs8dhk";
-      name = "kde-l10n-sr-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/zv04hsibpg539rzkg1g7h2nfm946pz8h-kde-l10n-lv-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-lv-15.04.0.tar.xz";
-      sha256 = "1r2fahydjybk5zparmn4wjciys5kjsjps2mkhlk1x5k9aa0wimjg";
-      name = "kde-l10n-lv-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/04hs3q4dknk3b305zqibxskqnzm4f6r0-kde-l10n-hu-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hu-15.04.0.tar.xz";
-      sha256 = "010d3x7l1kadp3wj2v9jg0bjd9d3xw2q3ql7i21705s2zi2any7k";
-      name = "kde-l10n-hu-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/5n06i2kass6wqnl6ql28s1ryrbj2399y-kde-l10n-nds-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nds-15.04.0.tar.xz";
-      sha256 = "0asgj3dkbjgcabl4qrz3i8dv0i0348dg6q0fk1sgicm4257y0a7l";
-      name = "kde-l10n-nds-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ai53nz76fbqj1adsl4lb0byvvcn8bg2v-kde-l10n-sl-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sl-15.04.0.tar.xz";
-      sha256 = "0jm6b37irpp0jabad4jpqlvpw6ir5ygc0cs49138hb58kcjwi54v";
-      name = "kde-l10n-sl-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/p18pga44549fxqa0ksijc057dd5phbd6-kde-l10n-ro-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ro-15.04.0.tar.xz";
-      sha256 = "1lmjz5578b1xbgdgrrlgv6vyiara2n5595kd0pg70s1ixvd986as";
-      name = "kde-l10n-ro-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/6grb8a1wydjjdkn2vkv2sj1dd8wp4317-kde-l10n-ca-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca-15.04.0.tar.xz";
-      sha256 = "16n29ja4d83g001js682ijibblhfwfb8pww561bcvda84qbvhham";
-      name = "kde-l10n-ca-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/izn9fzf1r2xyc57rj889rc6ziv9kjsiz-kde-l10n-ga-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ga-15.04.0.tar.xz";
-      sha256 = "1n8prxqxxr8r76ry0jaszsn446y8vdk9b629ypj8s4d0byz336bq";
-      name = "kde-l10n-ga-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/pbaf3bd49drbap8bx58pgz85xllqvjhh-kde-l10n-pa-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pa-15.04.0.tar.xz";
-      sha256 = "18rqlh26qc4h7jbsa6jq27k5d1d5kwdbrd1slm8fcw67r6iw72ai";
-      name = "kde-l10n-pa-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/311y10ml4kxpkicjlja7k6wwm05yd75p-kde-l10n-et-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-et-15.04.0.tar.xz";
-      sha256 = "0hkh800rx03w5gvy1lc7fn0s5kldihcaml5ryvx0g1qrj5k61b3r";
-      name = "kde-l10n-et-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/lld8r34x3lclrb30p8w0qr6gw117h923-kde-l10n-wa-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-wa-15.04.0.tar.xz";
-      sha256 = "0mivzilb2f3fp5wn2vc6c3z20n0l4cdpckyk43fdb4h9sys02xs3";
-      name = "kde-l10n-wa-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ajsr93ly7db9pwjjbrkvr5r4n0cx03fx-kde-l10n-bs-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-bs-15.04.0.tar.xz";
-      sha256 = "0zw2q22lm73k04c3nb0596xd3hknfhc7gq9i4n7kj55sblv0mqzz";
-      name = "kde-l10n-bs-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/45bg2qd1nyjnnqi4yzpkkwcimlnr5fs5-kde-l10n-da-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-da-15.04.0.tar.xz";
-      sha256 = "1v07bazlq6420zkfy6m3jvwcyy2snz93967209204jnxkzf3ssk6";
-      name = "kde-l10n-da-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ack1f3vdjkjbzpdsai22ki3lncc5v6s9-kde-l10n-id-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-id-15.04.0.tar.xz";
-      sha256 = "10mr2d24akz5la2bz88y827dcv061sqrbi9awbiirgd2wqisnn8z";
-      name = "kde-l10n-id-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/gcnmv26q44ya6jb2xwhm4kvp8aqr059l-kde-l10n-sk-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sk-15.04.0.tar.xz";
-      sha256 = "13v871ahfj3bwaj0ha6fm6gpn7x9qw9m5dz89mfg3h5vskqv7akl";
-      name = "kde-l10n-sk-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/v7ln63jsr0v32l86rqyg6fpinzpjpns0-kde-l10n-bg-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-bg-15.04.0.tar.xz";
-      sha256 = "1p4y9rbxwwnghslwjk1m32a26h6pnssyj73ns1az3saqyfb85gkw";
-      name = "kde-l10n-bg-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/vaih1nkjz81vm6vgfy25iqd8dxrivsqc-kde-l10n-ca_valencia-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca@valencia-15.04.0.tar.xz";
-      sha256 = "0ij9xp47mv63hgdbri7cmvld3zgg0sfgip0gg7iqinzkj1cifj9f";
-      name = "kde-l10n-ca_valencia-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/rkbbjy12la1p7l7vm5xk4hwy72f4piys-kde-l10n-eu-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-eu-15.04.0.tar.xz";
-      sha256 = "129k6m59x8f63f393jxx61s67f9gmaab9ilaqy2978d64l3z0bpv";
-      name = "kde-l10n-eu-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/fzwxz4747hfpjisg7n5kc77gb92dm3c8-kde-l10n-en_GB-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-en_GB-15.04.0.tar.xz";
-      sha256 = "16c255j3klss711iqk41k1kcf5nn0lwg0qr74c1abvgrnpsm261h";
-      name = "kde-l10n-en_GB-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/49fv8h0b5lzf4cm5qc6baj9sk9k29pnz-kde-l10n-sv-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sv-15.04.0.tar.xz";
-      sha256 = "17z9yvw9mrjb7h3qa4zc18f5z2n6b0gr4y76s7jfnh8kpjgm1sgr";
-      name = "kde-l10n-sv-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/30j0lkfk4p7pwv4nyknvm1wbd93cfji7-kde-l10n-ru-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ru-15.04.0.tar.xz";
-      sha256 = "18l7wnfr1indy8im131lxd45da9x49ii1iavi8g1lzmqq0av097z";
-      name = "kde-l10n-ru-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcalc-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/4qsl43z86wq82bpspki2y4gfn8iy6xag-kcalc-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kcalc-15.04.0.tar.xz";
-      sha256 = "0rkvxbz9s5wqa054bf1xg3rza95plvnakydlny04iw5w8i33i5yc";
-      name = "kcalc-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkexiv2-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/dnl3qi3ldzmf1yl7m8yzlgxyzvj6bm4k-libkexiv2-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/libkexiv2-15.04.0.tar.xz";
-      sha256 = "0zv8yjgwfdvkl2ss2gyv6bqbc3qgnz3hryhcjdyfa56kys6xz7n3";
-      name = "libkexiv2-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kigo-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/yvj9sxfh55nvnlvcz4b12iqqgnd3p33y-kigo-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kigo-15.04.0.tar.xz";
-      sha256 = "00ggvrs3mm5f2q6zkdsxbrhw8vgb0h4p4dk3v0agf3q4bqr86akr";
-      name = "kigo-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kopete-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/9yn7mj3csimgx1r4q6bp9gknh5bqnw49-kopete-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kopete-15.04.0.tar.xz";
-      sha256 = "01wl7n535j9l21zbzjhix33rhr0i4rg2bb25zxwk6sc2ahbsqcp7";
-      name = "kopete-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccounts-integration-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/qpc0c00mhc367aivilvkp329a4g6iqj4-kaccounts-integration-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kaccounts-integration-15.04.0.tar.xz";
-      sha256 = "1g2rn256wfl78ajxircaikq3hpj5nxfnk0294wz10srmg5a4hgji";
-      name = "kaccounts-integration-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdeedu-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/wyk34ah7lc3vvrcq4ldik6brm2jk9fiv-libkdeedu-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/libkdeedu-15.04.0.tar.xz";
-      sha256 = "140ri9whmvxjlj2i0bdpyr07zwspyl5d1bh91vm8hv2zdgmxh1rl";
-      name = "libkdeedu-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "superkaramba-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1ck2s3vi0dksdlis3cghy8advap8y5a3-superkaramba-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/superkaramba-15.04.0.tar.xz";
-      sha256 = "05j93sa39m78vlxdy4haqj5913dyi6kab5sspi8ky0why17zmaav";
-      name = "superkaramba-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klines-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1zsl1wawlhzgyr53hfrn5dzqwii51ib8-klines-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/klines-15.04.0.tar.xz";
-      sha256 = "0c0saaybxjshwap5rydc0606xkwmzl696r41fhkvr26c077p09p4";
-      name = "klines-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cervisia-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/qmkqp9sgai9djwishibis5qckhl9dnrf-cervisia-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/cervisia-15.04.0.tar.xz";
-      sha256 = "097hayf2k2fv3d90jnhlh4iq4qvk3v0qg7ywchgipzsz0w6nayki";
-      name = "cervisia-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ark-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/nms2hq3a33k03lmhh8y7swiggglcysxv-ark-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ark-15.04.0.tar.xz";
-      sha256 = "09jcz7x5rjazz8xvxy3kx32v21ig736m5gxyxhl48inxaypxxd21";
-      name = "ark-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "palapeli-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/zsh3ssjxmxggzf54kw9f73kzpy7y3n9d-palapeli-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/palapeli-15.04.0.tar.xz";
-      sha256 = "1iql188gysjnhym1mj9h2cizydgd97pal37zkxljc9qhqb58wq3d";
-      name = "palapeli-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnakeduel-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/9qg39s2sb7r8sdy37hm185jn7dsv24q1-ksnakeduel-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ksnakeduel-15.04.0.tar.xz";
-      sha256 = "1i32mrc50isz0q0gzfkd0fz8in2hhc8d61q55dprq3ps28lgd77n";
-      name = "ksnakeduel-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kollision-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/qxc07ckfn60wcyb8cs75dy2d8gbj211z-kollision-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kollision-15.04.0.tar.xz";
-      sha256 = "0ch3h3g0hgm52l13v6wdrvacabwkvzx537bhfib05prb9604vkn8";
-      name = "kollision-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kamera-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/6l8pgg55qph99rmprrgz56vvv621zbjk-kamera-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kamera-15.04.0.tar.xz";
-      sha256 = "1mjpbcslba9wnxrvm4xg6kfy11msn7kvxln98ak55gvpfh7zhm5r";
-      name = "kamera-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klickety-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/iwlkabdklb3v1md6vdsjw8x09vv0kzzv-klickety-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/klickety-15.04.0.tar.xz";
-      sha256 = "0l8vk4gkfjs71xfzw9lg18g9xg4yf4l9jy1f9plikw9gfm7br90p";
-      name = "klickety-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolourpaint-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/h5x9pzbiq62jgwfln5gx6agzcfyz2j3s-kolourpaint-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kolourpaint-15.04.0.tar.xz";
-      sha256 = "00vyblqgp7hqigid6xgj31b8jkqb8jlsvnbd2ci4zg7s778l10sz";
-      name = "kolourpaint-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/zdqama1r97132n4ks422yzr4zhh6fjmq-kde-base-artwork-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-base-artwork-15.04.0.tar.xz";
-      sha256 = "1r3w4ab9vls7wyzy6g7ashnnixxid894ghqc5yzhpn4x999y65lp";
-      name = "kde-base-artwork-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "gwenview-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/3wkajcx7p2wdzldbjb94brqlfqhdn54k-gwenview-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/gwenview-15.04.0.tar.xz";
-      sha256 = "0h8ndywh8w9wx0zisl1b9681d7zqx2d3ki40zxdgk4clyl34aijb";
-      name = "gwenview-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/lgapni2v7qsl3wsi8wx0vwcav9almhs8-ktp-desktop-applets-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ktp-desktop-applets-15.04.0.tar.xz";
-      sha256 = "1byv8dk864vwl4s5c18xjh3ckdzr9d7gq1mjrlaslxang7fr97cx";
-      name = "ktp-desktop-applets-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/lqdl7ks619gxdhnaa9q0axni4pz3h5v5-kdesdk-kioslaves-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdesdk-kioslaves-15.04.0.tar.xz";
-      sha256 = "116xj9i3iwzbz41n3bka6xg0yq88iwzw066dy5dbs3yxbpmky19g";
-      name = "kdesdk-kioslaves-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/dymdah33hpq9qn07qcz402ijmwc67bvd-kdenetwork-strigi-analyzers-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdenetwork-strigi-analyzers-15.04.0.tar.xz";
-      sha256 = "1zsa3ky6plfksm8k8hgd93d0awrsi5gqz3qbqfbzj3a2qic7nim6";
-      name = "kdenetwork-strigi-analyzers-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmix-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ql4a0i42ij33kd9y7qg4ng1a0p5j2sqs-kmix-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kmix-15.04.0.tar.xz";
-      sha256 = "0yj0byy98243c83bw938i1x8yxgbib8vr2s831hpmqi8h3v7xvyg";
-      name = "kmix-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktuberling-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/7cp8mnviqns6ij94xxz3mpizdc1avln9-ktuberling-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ktuberling-15.04.0.tar.xz";
-      sha256 = "1kqz1g0r3icgx3brd8qlln29mxcx9b54kvl8wdar04r8ckk0m733";
-      name = "ktuberling-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kturtle-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0a3rrj74sfwhqwjql88gqzw8qbmf8llr-kturtle-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kturtle-15.04.0.tar.xz";
-      sha256 = "00r3lzqa0sazccy28kmackqgqwcyqsl3mzjs7vpg4i76f0agfx4h";
-      name = "kturtle-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/gszm27h7rghsvkvhyf15xnp5bgjj18in-kde-dev-utils-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-dev-utils-15.04.0.tar.xz";
-      sha256 = "1vvrrb4c94apc67fg3gpzgfmhylx6m7xfyq0y5kjxk8l91fl2bdi";
-      name = "kde-dev-utils-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktux-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/cd126p5pizh2ha1jadg82csdzazlln49-ktux-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ktux-15.04.0.tar.xz";
-      sha256 = "1j5h65vdigym6ldz7fpn2kidxphfl02l4afg0jmj55wrym1vvc0r";
-      name = "ktux-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/xbdr5s1xf4f58lpshppamii1j5rl5ll8-mplayerthumbs-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/mplayerthumbs-15.04.0.tar.xz";
-      sha256 = "12d60nkmfp16pgrfh5brl80n1y7crmdzk5k3ad313l4ani99z45r";
-      name = "mplayerthumbs-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblackbox-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/72rhcbzax6ahi3myznpi1fkh0x9cq6ay-kblackbox-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kblackbox-15.04.0.tar.xz";
-      sha256 = "1w55nzadmkgspngxwazm6nfdf3s72rw4l0absx1jhinln7mif8w8";
-      name = "kblackbox-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktouch-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0p1m96gmy2rw5pyy029j4257b32ziyvx-ktouch-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ktouch-15.04.0.tar.xz";
-      sha256 = "16gd6rghz1caw88yh32728kcxj79688g4hw3dkmgkayb5wcwnwl0";
-      name = "ktouch-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dragon-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ha0s2dfbqb6gjgwq5451gbcgq6h3q16r-dragon-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/dragon-15.04.0.tar.xz";
-      sha256 = "0rzyra1xqjyrnx7926dql2fw9avy7rwx9x86v894xppcjqsyr3jx";
-      name = "dragon-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "katomic-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/dzv478dhlwj11gpfd0k7npmyw8z09yfw-katomic-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/katomic-15.04.0.tar.xz";
-      sha256 = "0vbcv973ppijip8l1y2kkj93rjxbcj3xw6pypw50w3pg168s1ylv";
-      name = "katomic-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmousetool-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/8ws0s6acsrrq7x0lvy61vy4sqhndbakm-kmousetool-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kmousetool-15.04.0.tar.xz";
-      sha256 = "005y7jp52f4x9193dxql8wwmimbylkazl671di2gfvrmcrh164n6";
-      name = "kmousetool-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "rocs-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/palrbcvrwp2vxf67myadgcvr5wl8v3pq-rocs-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/rocs-15.04.0.tar.xz";
-      sha256 = "03ibi17331vcjzfc38agalbybn7k06favm0sgcyg68qribpcwmg1";
-      name = "rocs-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/b7716r5kxhznfdlp9cwp3vf2vhsv1r1c-kde-wallpapers-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-wallpapers-15.04.0.tar.xz";
-      sha256 = "0ckvbsdim0485h4f9sz1z0qgbb61n8l7ncwr80zm7vpnx46xzavm";
-      name = "kde-wallpapers-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdiamond-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/p1f9xs4wkbdi9cmry7wc5686dxy2fvsg-kdiamond-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdiamond-15.04.0.tar.xz";
-      sha256 = "01ri6nj217dmg2xgm4ra4gdsabk28c8bkw6z69x5smbczjshdcr4";
-      name = "kdiamond-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkipi-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/jckns8avmk0k34k62f77bdrl9cbf01nr-libkipi-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/libkipi-15.04.0.tar.xz";
-      sha256 = "0c90y8f70k83pxxfx6mk6ar6zw7lf2l7mib526x8s7j534ya57ad";
-      name = "libkipi-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebdev-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/wlx7pxcwlq5f0w2hrlms5gfxfixzfzbc-kdewebdev-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdewebdev-15.04.0.tar.xz";
-      sha256 = "17gizsgvw5ihibsf8z2rmczzkqp1gp5jbyvvsairgzv1izryi6ah";
-      name = "kdewebdev-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccounts-providers-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/3vyd044k6qmjnxc7sfig6q90g2dr58lf-kaccounts-providers-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kaccounts-providers-15.04.0.tar.xz";
-      sha256 = "1b5cp6winxa9slqaq6mrf4y4py1d7ps55088gs35qcwrzyna04l7";
-      name = "kaccounts-providers-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "marble-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/7kh58mg7dnd0yr6nksbfki20rncdqm1w-marble-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/marble-15.04.0.tar.xz";
-      sha256 = "0d6i7wwf220790ld5qgd30gph9y71a75ybjjfg81k13a4jg0ndk4";
-      name = "marble-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/rrdyv611nn7kbnkr1fnvn6xkd01k8zwb-libkcompactdisc-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/libkcompactdisc-15.04.0.tar.xz";
-      sha256 = "0nisrgpcgf4r83q7p82b8xfpzq96qjk8362i6dalsb0jcakia4c2";
-      name = "libkcompactdisc-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.7.tar.xz" ".tar";
-    store = "/nix/store/fjrkx2vwb6m4kfl01sa4r23wbvmsmh05-kdepim-runtime-4.14.7.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdepim-runtime-4.14.7.tar.xz";
-      sha256 = "0ywg703sqidxif853gfmqriymkkp9xzkfxd863p1sw35n1zhfkam";
-      name = "kdepim-runtime-4.14.7.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-icons-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/akq8y3wjkvbzwyzwxyd1vkmqygmc78p4-oxygen-icons-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/oxygen-icons-15.04.0.tar.xz";
-      sha256 = "1ysy82war9n1dm5nwj69aasz9abp2zf5dmw92gv8brzyrn8svn9d";
-      name = "oxygen-icons-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpat-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/af38swaxzd4yavh6iaxq3ha8xn3q9gmf-kpat-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kpat-15.04.0.tar.xz";
-      sha256 = "076jrjrs97353pw39gbanjf5s8l4cj8g2zapngyc1kwm6q0jry5w";
-      name = "kpat-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "juk-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/bbvywnmrg713gdmzxkndkcyjs7jmdazj-juk-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/juk-15.04.0.tar.xz";
-      sha256 = "160n9wpx0krf1nlpa3hbj0b1yblgq68mw3c9is2j41k0p2b7divi";
-      name = "juk-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kspaceduel-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/zx8jk8s9mrfga1467a42hfdz0w144p66-kspaceduel-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kspaceduel-15.04.0.tar.xz";
-      sha256 = "0drb3628l47qp35h8vyz66ma6ph5v9sg2k9dp0fghrhwp1x983fv";
-      name = "kspaceduel-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "picmi-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/rrqb0hx0kb96y9x2j65vbyq12pk4m875-picmi-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/picmi-15.04.0.tar.xz";
-      sha256 = "0abas2qx83a35dghrr5gbsvgc0lg0vk0br18nizi82sbiawls24w";
-      name = "picmi-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "artikulate-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/a4vr2g2m7hr6svmbdkg89na3zvsh4fg5-artikulate-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/artikulate-15.04.0.tar.xz";
-      sha256 = "1ghffybaq2p9jx7cppbji8jk0dbblw3mh3czfzfms92ahy9xzcbz";
-      name = "artikulate-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeartwork-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/3yyj9dcqj7b2zjrz5w7j20h0pv10gnid-kdeartwork-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdeartwork-15.04.0.tar.xz";
-      sha256 = "0kwscj036gjvai5knw1jpxjacllza4y8wnlv24lp19f2s61jqq24";
-      name = "kdeartwork-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksquares-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ayr2hry1z8z3v8q8a4iamck9bsxy1pdw-ksquares-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ksquares-15.04.0.tar.xz";
-      sha256 = "15a605pc7jfsrsj1jj3lqy42z1bnw4pppx0hv51xlhiza00s2kww";
-      name = "ksquares-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/4kb7k1cfzksinnw0d08nginvli44rwx8-zeroconf-ioslave-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/zeroconf-ioslave-15.04.0.tar.xz";
-      sha256 = "0fqqx0ji1v0cz87qb0kig9kkfdigmdfmz5qw1y2kx25mb0rp1g2i";
-      name = "zeroconf-ioslave-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "svgpart-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/n8v8kbzq9vsghk0nc47rl49zqfz1w182-svgpart-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/svgpart-15.04.0.tar.xz";
-      sha256 = "0985jjy2mghs57sy53mkas5p9ya0makrkklq99s04rgl93f2akj1";
-      name = "svgpart-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bovo-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/sigbrnva6hymkgnjd48aw65s7vrysi2g-bovo-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/bovo-15.04.0.tar.xz";
-      sha256 = "0iffvb4m9bszpxh8s8yrpyzawyflwcbkajib5h1lw8xsgi6vcqhc";
-      name = "bovo-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kig-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/lv7d5hvgs42razrzhd3g60i1gpzb8w06-kig-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kig-15.04.0.tar.xz";
-      sha256 = "1v9p9f9dk3f2bfbwic1vf8ky5ziac4vx0vh8wxshzbjjb89kxkq6";
-      name = "kig-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/8g1l1dd5cccy6ncaywfhpf1x2633dk37-ffmpegthumbs-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ffmpegthumbs-15.04.0.tar.xz";
-      sha256 = "0j0x8b0gcwyzx307rvhrx4k4g530lgyl5rzvdpkjqpga2qjg8q96";
-      name = "ffmpegthumbs-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "parley-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/piznlrz9g0kvy1262p87db03830mx6by-parley-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/parley-15.04.0.tar.xz";
-      sha256 = "1f6nmnjz84cm8yk53whjm7k471y2vj106m7q230xj1g56mb5adrc";
-      name = "parley-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lskat-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/6bdihbmhk9vdr9mzj52alqhvav2x1lc5-lskat-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/lskat-15.04.0.tar.xz";
-      sha256 = "12mnvbisbaiychdgk6fb464lwvpjlkrwdz5101sdrw466c16a2a2";
-      name = "lskat-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgpg-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/fys5hj4c13arjjqrh4kn8vyk92zrgz25-kgpg-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kgpg-15.04.0.tar.xz";
-      sha256 = "1n37jh3zl4zb3dnb9lvjpni7gl6sb9s1jwmvf4jvqmqnlqny1b4f";
-      name = "kgpg-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kruler-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/2c9221fqxkz6ajx8g2l7xnhcfj8iivki-kruler-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kruler-15.04.0.tar.xz";
-      sha256 = "1pnhram0g6hfi2k13xhixwpr9vx1dhkvivn1y1ydvwk26klala1w";
-      name = "kruler-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscd-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/9yidmqhziwp6sj4l0pzh1gvmhi5g1ny6-kscd-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kscd-15.04.0.tar.xz";
-      sha256 = "079sj1g5mn32b2l2l9qap55s5sr6bv44a9ncswibkr49vwq7va10";
-      name = "kscd-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdcraw-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/5y5x3vr7zibkhk5pk7hz5ibkza56d54s-libkdcraw-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/libkdcraw-15.04.0.tar.xz";
-      sha256 = "0h7m6m27jsp4xh6ywrbxad3c413ipzfgz357ahffqcafdjw6yfx5";
-      name = "libkdcraw-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksaneplugin-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0z48pwb041r7sfwzvsxdqyw46bxy6d7d-ksaneplugin-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ksaneplugin-15.04.0.tar.xz";
-      sha256 = "1wh83c31x1n7vipi6m29hsinrpzwsvjnj3psg6s7bywnb6if2ir7";
-      name = "ksaneplugin-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lokalize-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/5by08m2jgiap41wrk8kg7lc8b6q6ifwh-lokalize-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/lokalize-15.04.0.tar.xz";
-      sha256 = "1nikpfjnmm3ws2qd46zq6g5v64dbfa7pmbp8nw1sv7dcin3k42ll";
-      name = "lokalize-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "granatier-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/w9bkpa3frqgnh07gbaln9m15nhj0vdcj-granatier-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/granatier-15.04.0.tar.xz";
-      sha256 = "1s5jkwqzjlcd343sm6akzx56a48yvx7z9n3cww9gxrjl76q1a19c";
-      name = "granatier-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksudoku-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0ssavwdndi5h0mc3cjrgn1vpfz20wmdm-ksudoku-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ksudoku-15.04.0.tar.xz";
-      sha256 = "0bxcjqpkqr5zbjrx8drmjvjgnyjvpqbvmqgyfsidm8rgfg6mi3fz";
-      name = "ksudoku-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmplot-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/76appqh3cg62681baq1cy6fymadaq2c8-kmplot-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kmplot-15.04.0.tar.xz";
-      sha256 = "0fnvjixnp2iyjg0hgm6lkry407f0fh39kb184jzaakrp703m3jmi";
-      name = "kmplot-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcachegrind-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ys2xzw0hck8gp7g79m933580y7rix754-kcachegrind-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kcachegrind-15.04.0.tar.xz";
-      sha256 = "1q1z0w7c7j8ii97n4vcd80qi6hb7gsg6j9l3md37ls8c4qvhknx7";
-      name = "kcachegrind-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbreakout-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/x4rsvf3qzl921vgamzjxkvwjw971r917-kbreakout-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kbreakout-15.04.0.tar.xz";
-      sha256 = "039g4qmmkf3lq8jx5vgasvqx19k3xbvfkm0j9his61z021ldjxla";
-      name = "kbreakout-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapman-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/82vlfb4yna41mip5zpkal4kpy67w4kjv-kapman-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kapman-15.04.0.tar.xz";
-      sha256 = "0glc8hcjs89s5cxa77f12pzlnmvr74kiqhcrk7djz98pnqwlsn5v";
-      name = "kapman-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalgebra-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/346qqpdqx5hdzyvd4dlkag3ir951fjp7-kalgebra-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kalgebra-15.04.0.tar.xz";
-      sha256 = "07czg7i344qq93y95f46qvk3zpghkl3gcr8cd8wgc0v0b1mdmyfm";
-      name = "kalgebra-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "pairs-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/cd5q5wchjl2ncm44pwl156jks832y96z-pairs-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/pairs-15.04.0.tar.xz";
-      sha256 = "1d1va0b55fwivsvcz3izr680nl4zbyn44fdnirglw7q25278p7bh";
-      name = "pairs-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khangman-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/krpgzhpksq4kr9r78w9f6rk2q0963lwv-khangman-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/khangman-15.04.0.tar.xz";
-      sha256 = "0cnaih6xhg11wrg0c3v7lir2yknc4k6m490aw7bhraz98kfxr905";
-      name = "khangman-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konsole-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/qb3gypyd97v9cakicf44q7xnwfmyqsyz-konsole-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/konsole-15.04.0.tar.xz";
-      sha256 = "10qgynn6x7cxyp6lgri0vggmzmcvckwvrg9mrycdnwwrsfabscrc";
-      name = "konsole-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "analitza-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/c9xwpgl8bdp582w91zrchhywr1j9xm9r-analitza-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/analitza-15.04.0.tar.xz";
-      sha256 = "03kaaa8kp92lsva5shzqb9497wmhksm79pc39ip5l50lqac9gr1l";
-      name = "analitza-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksane-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/6qn668dc4yppjwyc1ms0698nkmxj4sxm-libksane-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/libksane-15.04.0.tar.xz";
-      sha256 = "0rnja700hwjn4bvy06lijndic2zryn64kybvj71ip6knq3nx77x6";
-      name = "libksane-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbruch-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/g1hbkl20wkzglhaabxizzhrl1xpkfiy2-kbruch-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kbruch-15.04.0.tar.xz";
-      sha256 = "1662hqqsf1rnfwrqwx5wpl0cvr9313sh8bla2sig8v2s8v2lyyi6";
-      name = "kbruch-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmouth-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/dwkbfqj5a21hcryw42dwqw9lq1r4ld0d-kmouth-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kmouth-15.04.0.tar.xz";
-      sha256 = "1swvdrlcfxv312kncihvxba0cklmv47qyr2dbrkhb9s9v6jbiqb3";
-      name = "kmouth-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kppp-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/8c2srwnwg41aypvjqzs08129wm391p2q-kppp-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kppp-15.04.0.tar.xz";
-      sha256 = "1ml5lc20jg05zfq9d274vqp7k7fh5369zshp073bi6zjj4cm7gss";
-      name = "kppp-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmag-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/gi6kw8zlmpy8gjijr34620dzp858h657-kmag-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kmag-15.04.0.tar.xz";
-      sha256 = "0wmarmybn56mppwb33cjg96906hh4vbnwxqpw2441axn5vqmf90j";
-      name = "kmag-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-workspace-4.11.18.tar.xz" ".tar";
-    store = "/nix/store/b65xpr56hpmfinssggl4fq88lky5czlm-kde-workspace-4.11.18.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-workspace-4.11.18.tar.xz";
-      sha256 = "1rvi88flk8c1j6qdkxak3sy1yf646ql3zipxw2azchwzd4k54mzv";
-      name = "kde-workspace-4.11.18.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnapshot-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/zim1ydmdxhwv0cypdviqdnn0nwz2d66q-ksnapshot-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ksnapshot-15.04.0.tar.xz";
-      sha256 = "1577ybwpa52lmv5pd0223pz5l3q4h3475fz5qp3sm1rwi0nzmawq";
-      name = "ksnapshot-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okteta-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/8z78fks7wl0rf3077yrz8hzvqvmxn516-okteta-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/okteta-15.04.0.tar.xz";
-      sha256 = "0svgsy838dlc2krn2rzb65a6i0dfav4xlmi4174d23qhaikl1z42";
-      name = "okteta-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "step-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/argcpdljdar6ga3psyz4wzr3kmvkmf07-step-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/step-15.04.0.tar.xz";
-      sha256 = "1fl4zmj4k3g8c7bas7dj2n82qlbq8k5p3s5bflcillrz6pdd4s50";
-      name = "step-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-kded-module-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/n3b0rfacc8i5p5hlgal66zr9gjfrkda1-ktp-kded-module-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ktp-kded-module-15.04.0.tar.xz";
-      sha256 = "0ijinvp48aixx8fjdc8fxpm8ilzsn9pkhsiinh47wiabyjb8rj3z";
-      name = "ktp-kded-module-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwordquiz-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/yik5ibmcy9k87y41nk3b03w1j2p3012c-kwordquiz-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kwordquiz-15.04.0.tar.xz";
-      sha256 = "10rq7zdd8i8dgmjzxgn6139ixzm5kzwiswal0cmkd42wwbdn6fml";
-      name = "kwordquiz-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs-4.14.7.tar.xz" ".tar";
-    store = "/nix/store/xd5jr85rzdnsrw18ab811q6hcwq1f4vk-kdelibs-4.14.7.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdelibs-4.14.7.tar.xz";
-      sha256 = "1zhqvyx8gq7514mr0423z0gl1yn33snh53fj2ijkk4blhjga601q";
-      name = "kdelibs-4.14.7.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "killbots-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/nshwyzk14mam2av602sqzcxnwjzpny6k-killbots-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/killbots-15.04.0.tar.xz";
-      sha256 = "0a9jn8i5hw3v7kr6vqagxkqvvjs6qsb23g2khaxgbw0x0cz5nqx4";
-      name = "killbots-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/55ksfn4hq342qbl8cm4jf8k8mmra096n-kdesdk-strigi-analyzers-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdesdk-strigi-analyzers-15.04.0.tar.xz";
-      sha256 = "0k00ip8ll1i96cazs78c6al1yjcnvpr1awb6g7yvvq019icjmzvn";
-      name = "kdesdk-strigi-analyzers-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-send-file-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/90s1naljnqa6r99nl2dpjsf8rjb3k7cp-ktp-send-file-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ktp-send-file-15.04.0.tar.xz";
-      sha256 = "03i6irask1ccngwapirnc9vpk4nw7r82zl6jdnh7w9988c2wdl22";
-      name = "ktp-send-file-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/n2vy60sdgnx3gb6fmmgd03d4jnn29nmz-dolphin-plugins-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/dolphin-plugins-15.04.0.tar.xz";
-      sha256 = "0a1f1si598cmqd0j9v6pz0w8s6286xg2wcfxzrmkr994bfkydd8c";
-      name = "dolphin-plugins-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksystemlog-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1wy9hsww32i53nv94bnzj83hfqw3x1ir-ksystemlog-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ksystemlog-15.04.0.tar.xz";
-      sha256 = "104yg6mjnhznsylpv8faqih9rpdxyp4667dagq7f1kfajy59jh1y";
-      name = "ksystemlog-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/x1qmhlskhz0ibs1pnxcb30bj1yk3f447-libkeduvocdocument-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/libkeduvocdocument-15.04.0.tar.xz";
-      sha256 = "0lqp2qfsdjkchnb5xrbj9hax2bf4ls1wk7pmb364qvkkhfia8qv4";
-      name = "libkeduvocdocument-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmines-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/3vf7rffgww1k7byna7p05d0115p6924y-kmines-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kmines-15.04.0.tar.xz";
-      sha256 = "015xximi3xydkbygzlka7y8nmls3dc8jvr3dvvidl57gl1szmx73";
-      name = "kmines-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkgeomap-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/amqrx3hwvwrz8rgk3dljj11bvfpx4plm-libkgeomap-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/libkgeomap-15.04.0.tar.xz";
-      sha256 = "0yd17xa085rvxsnsah6ny7w88lbs7c1ilxrvbpsf2rvjkbl96giv";
-      name = "libkgeomap-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "umbrello-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/5lahf10pz3vdh0dngi3fsmyn9g8cmk5v-umbrello-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/umbrello-15.04.0.tar.xz";
-      sha256 = "14lw9rnqv7bgni1rxwmgm4jnx2l2x5524wysqlhyp7np35mzdnlc";
-      name = "umbrello-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bomber-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/7mf874dsxa6wj59zfr6s1n7399rvl7m9-bomber-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/bomber-15.04.0.tar.xz";
-      sha256 = "1hpss9jmjsjl2shm2y50s5js33rpn0gd20il6wq454wm0k0q7rpj";
-      name = "bomber-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "jovie-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/35zcglbjikb4ayp14d9l6hgs5myv5i6l-jovie-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/jovie-15.04.0.tar.xz";
-      sha256 = "1sa6agn9zp12n98v7i9rxng2yn25b4yf2s8q8rjb3qg93kmzzx4v";
-      name = "jovie-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-auth-handler-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/9vacywnw3knldygpgxjghjbw2nfqdszn-ktp-auth-handler-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ktp-auth-handler-15.04.0.tar.xz";
-      sha256 = "1hj3vc6wj768xdpr02v64p9wbrh1y61zg2fal3bk3fzrlz2yslg5";
-      name = "ktp-auth-handler-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kubrick-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/9rjk1xbzbnc2qqrni0ng2spbzailrb25-kubrick-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kubrick-15.04.0.tar.xz";
-      sha256 = "1qxyymrqav9hwa2ldqqpr49aj5sqzmiin6c4rmbirxmaasmyqn6a";
-      name = "kubrick-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgoldrunner-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/l2lbbhnr6r0q1sf3rzzjnwina7gvlllg-kgoldrunner-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kgoldrunner-15.04.0.tar.xz";
-      sha256 = "1hsrjszck17gqnnpxzbdknj579n7xpmbq813a77736cmi95qr4h3";
-      name = "kgoldrunner-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "filelight-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/pr78axnbpxwah326z7jqhq4cz1p7h7wr-filelight-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/filelight-15.04.0.tar.xz";
-      sha256 = "18vcm8f8wgl0hqlycljv7kbq8iip5vadrsyhr58pw60cr8h36n0s";
-      name = "filelight-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kajongg-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/13030n2xwx0rnbd0myy87pfzrd93rpkw-kajongg-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kajongg-15.04.0.tar.xz";
-      sha256 = "0aa2c2c4322lv4prwxkhanw0lbrv1145w6fz473f6ybfhg9isc7d";
-      name = "kajongg-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-contact-runner-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/kw08x6m9wzrmhm6av38hz2nd18agxapj-ktp-contact-runner-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ktp-contact-runner-15.04.0.tar.xz";
-      sha256 = "179q9707cxmd57iyadasdr9rvcqxwrahccc8vjylzh1x5p2arib8";
-      name = "ktp-contact-runner-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sweeper-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/yz48bx3mdyvapyz52aa846f32102jh7w-sweeper-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/sweeper-15.04.0.tar.xz";
-      sha256 = "15amamnrg7d52l0agkw66k96xk0j5shk2667wc9p2jy6g96cw53c";
-      name = "sweeper-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfourinline-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/s96mhycwzwrv5w708mz6appsbf1vivz7-kfourinline-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kfourinline-15.04.0.tar.xz";
-      sha256 = "1wpcdzlpy8jdnlzzhys8n08pknk7ncq41dchs2ii3v30w1dnwln2";
-      name = "kfourinline-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-common-internals-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/0q8wks5hqas02y3j384lwqy2a1npvmch-ktp-common-internals-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ktp-common-internals-15.04.0.tar.xz";
-      sha256 = "0y6jwqaxvkzjqdz4j3b4z5ybz4d3ci09x8apfr3h0q5pf4crkv8p";
-      name = "ktp-common-internals-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krdc-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ch18h2226p60xnyjndy40r8fgwajd80p-krdc-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/krdc-15.04.0.tar.xz";
-      sha256 = "1ikm5a8lb65iljdvs16ipclkassjjdf7i49whcvz71rx8agp01hr";
-      name = "krdc-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeedu-data-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/05dzvpk81hhrfp0yncmgnq8q8nlps3z3-kdeedu-data-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdeedu-data-15.04.0.tar.xz";
-      sha256 = "1r157dbi75ayxww57vhww3cjxv1z2y2mv54xh2cf3zfjv6kmp7lc";
-      name = "kdeedu-data-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1z4nb0mp0d654n7wmyddxslx82rh2y10-signon-kwallet-extension-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/signon-kwallet-extension-15.04.0.tar.xz";
-      sha256 = "1s3nm7vrwwgin278vif6w8yyi1vg9hk401swvlhwmn9305bxqm01";
-      name = "signon-kwallet-extension-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcron-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/8qjk4ri8l2cvvqaf5qpmzwz33gx0n9kn-kcron-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kcron-15.04.0.tar.xz";
-      sha256 = "0srq463k37klfbvrclhrni1kbn2bxxsfzp8l8lbx4dz8p93fcvdp";
-      name = "kcron-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksirk-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/hngc4aajjzr5qszkxi745fi8l28k8wp4-ksirk-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ksirk-15.04.0.tar.xz";
-      sha256 = "1rl2c1yjiiw3gy4kblxgf2lh2sd5bpwz36hi9kv1dvf00bwi1w0x";
-      name = "ksirk-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/br98dpkixyvcr4dwp6fqfcgzrvgqvps1-kdenetwork-filesharing-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdenetwork-filesharing-15.04.0.tar.xz";
-      sha256 = "1296rg0axk6gc765kv3wnqqb7mp45sqw8rvhz631ybbsvcy9vk6c";
-      name = "kdenetwork-filesharing-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okular-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/8lzrv2slw0ck39i94w8ms8zm5vfx2x9v-okular-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/okular-15.04.0.tar.xz";
-      sha256 = "1xfj7hm8149xn5g9yy56zd93bjs38k10009l6d2xynvqcd2k5sl7";
-      name = "okular-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-runtime-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1zj95rkrgbp4s8khzd7hjdnz9ndib9q3-kde-runtime-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-runtime-15.04.0.tar.xz";
-      sha256 = "0dpbmg8w5b2hq3fw38v3fa4w45lm1p06sh72rscsz2mc2ly6bkxr";
-      name = "kde-runtime-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konquest-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/p08rr4gqznxl4w3gfd7na11v8l1s8afq-konquest-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/konquest-15.04.0.tar.xz";
-      sha256 = "154vbny41axcckdi4dw928kvhfvw8j5b34l79dqa15lnsml92m6f";
-      name = "konquest-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-baseapps-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/g2j9js2pgakja03ljw9zl4xp9v2pn8l4-kde-baseapps-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kde-baseapps-15.04.0.tar.xz";
-      sha256 = "1xiv9qmv7x6djv7fg7khsqhzrnypr8dg1c3ximi9r32jvcfcda7q";
-      name = "kde-baseapps-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kreversi-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/h39cafz2080k7xih81jn5f7scfpvszdw-kreversi-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kreversi-15.04.0.tar.xz";
-      sha256 = "0z7rp0d52cgc8lsnjj0p0qh7fydgk1348ljymfmw8kr41848fag7";
-      name = "kreversi-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kate-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/17j3xfw2gjbvkb6k09ykyf8avx7fip38-kate-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kate-15.04.0.tar.xz";
-      sha256 = "1g4dh9d55mbdnxrxp8kyid52gg649rnd6xhv1di3k1zz6x5jjnr1";
-      name = "kate-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkface-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/f6n75hb70xfprv3rpa78n59icxglv3n8-libkface-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/libkface-15.04.0.tar.xz";
-      sha256 = "0hm3llyjprfhj5l7y97kyyk61cbis7hmlgpf3qfin958hmip7kds";
-      name = "libkface-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/frl8ikxyck6mv44rdwlca5dg64vlar20-kdesdk-thumbnailers-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdesdk-thumbnailers-15.04.0.tar.xz";
-      sha256 = "1y3wix763ndi3xfwpm3h3cfj3r446jkrslgn09bplm4x36jdd2wv";
-      name = "kdesdk-thumbnailers-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kremotecontrol-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/mxrd14q1c9hbw5lnpvk32s2jb18cjyrn-kremotecontrol-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kremotecontrol-15.04.0.tar.xz";
-      sha256 = "110bcp9b4y1mwpvd6r09zlrr54f1qdncxixliivclx9y0nrf9ljf";
-      name = "kremotecontrol-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmahjongg-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/gaj2cqkjp0ynwsywrshpy7glfagz37ds-kmahjongg-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kmahjongg-15.04.0.tar.xz";
-      sha256 = "0agqvghlvw3n8xr15n44zjidxqghpmpzf5834n7d18yllnkmyqzz";
-      name = "kmahjongg-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-text-ui-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/5vsvkxwxycdr0qk54ksiyrlbdfqxc7qq-ktp-text-ui-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ktp-text-ui-15.04.0.tar.xz";
-      sha256 = "0az6ziraqslcidjflljc25scrg1i2kgkppm93bd8y8zy4a2q1wns";
-      name = "ktp-text-ui-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kshisen-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/jdmiqffbirvn2pzxx0vfia6v9mq9q1jx-kshisen-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kshisen-15.04.0.tar.xz";
-      sha256 = "011a3gqij509vl74v03s24in83i2qyylrpasi8cpx81hgbwd7zkd";
-      name = "kshisen-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krfb-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/r0b24gfzlljxq2wxxs6pyfvgacarvp7n-krfb-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/krfb-15.04.0.tar.xz";
-      sha256 = "1j1mfjgza7zs3dsvm7aqr0w3lnia1svxrc47gd5imagqxzi5xb5i";
-      name = "krfb-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/qqn7jza6dgshhapkvj97a4i4960dy5da-ktp-accounts-kcm-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ktp-accounts-kcm-15.04.0.tar.xz";
-      sha256 = "1a45apf4vmjpsrbm98ym8k7qivmfaiwsdsf0f65vi91imlkfdd2x";
-      name = "ktp-accounts-kcm-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgeography-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/arp2vca2a13jqqc37cv5pa03s4aayg1y-kgeography-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kgeography-15.04.0.tar.xz";
-      sha256 = "1gm17z7a4dgmqds3gvwf1scgxb2js5xvaq4f74hr1042jq2br0dk";
-      name = "kgeography-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/7iwcjypw2l9kkgm8l3dbchm47jziyjh0-kqtquickcharts-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kqtquickcharts-15.04.0.tar.xz";
-      sha256 = "08p53xa49hwgwcp1vgp1c0pghj2l5a2g71s0q30xn7vz7y91bi92";
-      name = "kqtquickcharts-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/28krw7dahfrcmwlbfqabzd6bmxqx9fia-kdegraphics-strigi-analyzer-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdegraphics-strigi-analyzer-15.04.0.tar.xz";
-      sha256 = "02zpwqcfi0v0f53y4i2x1yn6d3nynlp8x7xb4ciacvmxzssh9g0i";
-      name = "kdegraphics-strigi-analyzer-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "blinken-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/pr2d0pipsss9n5xdd9zrgv939smlrvwk-blinken-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/blinken-15.04.0.tar.xz";
-      sha256 = "1475yf37nlmnqq5sh2gc8x1nbkypxy560qmdyar3m5cs69r77679";
-      name = "blinken-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdegames-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/w7f148vp2gdz22fhs5g65qjzbl9h36kh-libkdegames-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/libkdegames-15.04.0.tar.xz";
-      sha256 = "1rwbr5pqn347rfhz56phswfzxmm37xpnw699si1612mkmmbl92ba";
-      name = "libkdegames-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/jn27x6czz0lripamkjgkwga4cxyicmcm-kdegraphics-thumbnailers-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdegraphics-thumbnailers-15.04.0.tar.xz";
-      sha256 = "1p0alpdmhl3fm1r27cqiz80w9r1zmwj7pmdxf4f6mv2pf5q7z5kw";
-      name = "kdegraphics-thumbnailers-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcharselect-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1xvdiwnp84qn7cvcissssf92w4nx8y7g-kcharselect-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kcharselect-15.04.0.tar.xz";
-      sha256 = "1jfh1kzcazb4b4wqv6mjy69h8fx78zzf7xk60vzaks07b4c7x9x7";
-      name = "kcharselect-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcddb-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/7in63wvw5njm2gqxqbsjvj8sh7j5zbsf-libkcddb-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/libkcddb-15.04.0.tar.xz";
-      sha256 = "1ldjfkppfhknln6hn3py8519p5jc63pf9apwx7h5jf3z6ci1k29p";
-      name = "libkcddb-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kstars-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/vqrsgg7jlr6h8y6m2cp2fvv0jpbv8jvk-kstars-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kstars-15.04.0.tar.xz";
-      sha256 = "0mj6haknp9y03md9j007w5sf66529chififw0xy6a7bvnagaph2g";
-      name = "kstars-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kget-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/cglfzvjxh6b61dyvla9q9g0qnw6rzlm9-kget-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kget-15.04.0.tar.xz";
-      sha256 = "0v4gfik9ddzpddknrj9vp2d2awn2bjzn74n173njf90pbfnql3y5";
-      name = "kget-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kanagram-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/dh926v6zz23z9lqqqvhia5ilwxazd4lq-kanagram-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kanagram-15.04.0.tar.xz";
-      sha256 = "1iw2vp82ax93kbc7ffmh9wsgjp0a772vb2bxsmm5g5jcmjd8vcr4";
-      name = "kanagram-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kteatime-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/mrdsmb6qaj32np3p3mcwi3sx38kmgvjj-kteatime-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kteatime-15.04.0.tar.xz";
-      sha256 = "0g1hhlqhag0lllm8s10ylw5a6qwgsmb5hj33l2knbifa2sdg4v0c";
-      name = "kteatime-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-contact-list-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/44z86p3l3axqq54wnvbbjavifp6jrnxn-ktp-contact-list-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ktp-contact-list-15.04.0.tar.xz";
-      sha256 = "08k2yplr67s66y4134n007kzsdxnrwgjhv09babprb4cbcm7pdgm";
-      name = "ktp-contact-list-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/a66l0r6622i36x7njknq4rw77wq1z8f1-ktp-filetransfer-handler-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ktp-filetransfer-handler-15.04.0.tar.xz";
-      sha256 = "0z50v3bq4i618c1sh5fa67il4vhn8mk5c55wlhxc2q8srr85ii92";
-      name = "ktp-filetransfer-handler-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kompare-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/lmbjfk56h71c44paw60x7wl6pd58yc0w-kompare-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kompare-15.04.0.tar.xz";
-      sha256 = "1pf693s580p208dbjj6d4w11i62bwfifjn3wmn2fd8fip3ajdgxh";
-      name = "kompare-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/54xdq0xdkmw2z3j0zhfxi6gjvm60g919-kdegraphics-mobipocket-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdegraphics-mobipocket-15.04.0.tar.xz";
-      sha256 = "00m5i5jdnj92jnjm32ryh8dlf3fzl2mzybm5w5y1a82fq9l7j774";
-      name = "kdegraphics-mobipocket-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenlive-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/dacxkxjxhz3afz4165nv4siyn6sb5jws-kdenlive-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kdenlive-15.04.0.tar.xz";
-      sha256 = "1ski64rqa1h1aqr16vwnvpqpww7vgfzbnlki3998k8gbc703q512";
-      name = "kdenlive-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktimer-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/nab346b2rb5dwkj4gdnjm2pyhnzf0i4h-ktimer-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ktimer-15.04.0.tar.xz";
-      sha256 = "014jfyx4lizq2bh5yx73zarn9mzp4lkyaxvml0m8i53zdnacnqvr";
-      name = "ktimer-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkmahjongg-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/1rqzjg16kl3m8cc6pjf2cakhjx90kkhw-libkmahjongg-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/libkmahjongg-15.04.0.tar.xz";
-      sha256 = "1912k9h4j8rhly5x03anf4gzjs0aypbwh8ifvhn289gydccqfcyy";
-      name = "libkmahjongg-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-approver-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/ijsjgpid0pnrq1d174gpbma6xfik9989-ktp-approver-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/ktp-approver-15.04.0.tar.xz";
-      sha256 = "0sfi4i071iini7bv9i7d4f952rnd5r89vqnhkqqrzbnmi9bh4rx4";
-      name = "ktp-approver-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cantor-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/7rf8al4ncyxkhzg899mssimw3lwf0qy8-cantor-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/cantor-15.04.0.tar.xz";
-      sha256 = "0npl1p3gwflfl9rrvbi9ql28af6m1h2w46vkqh4ksp4d6jh9lx3p";
-      name = "cantor-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbounce-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/9b915jv5dcm7kinwvj9yrxs72vbsravw-kbounce-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kbounce-15.04.0.tar.xz";
-      sha256 = "1jllvam65kjfanry4wl2yhhgi5hak0swiradyh15b73rb89w2lj2";
-      name = "kbounce-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcolorchooser-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/zhlxa8x34g7yz6wwqnhn062d4yxgl214-kcolorchooser-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kcolorchooser-15.04.0.tar.xz";
-      sha256 = "0g51v8641712fyycm3d6pkx8mlxkpp832l5i77f557lgi3dqfnh8";
-      name = "kcolorchooser-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "audiocd-kio-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/gcg36nagmfjc9w510pbihc44gz765nh6-audiocd-kio-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/audiocd-kio-15.04.0.tar.xz";
-      sha256 = "05by4zrd3s2rkv915dq3ri6rhq39sl9wkw46diajkwzqdg6ajbiz";
-      name = "audiocd-kio-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgamma-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/zd7r3mali9j223lm28w0xx6fl4jkiyfd-kgamma-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kgamma-15.04.0.tar.xz";
-      sha256 = "17xfiaz751q38q29s20k6fffshd3jndydnj54q4bd5l08fwmxmq6";
-      name = "kgamma-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knetwalk-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/65sm832j0rnm215vmd7gcrnnbj1gd2cj-knetwalk-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/knetwalk-15.04.0.tar.xz";
-      sha256 = "0ljwgb5sb8x2g2qrvnl1lzmk34zcg6g1qfyp6p74h8lbhfk1vbgl";
-      name = "knetwalk-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klettres-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/bnd0dnbv8ybywwzaskjlx2dvdw3l9afc-klettres-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/klettres-15.04.0.tar.xz";
-      sha256 = "1kzcqj1w5dcmc54v96q3s6v4fj86kgc9vdllg7l98bv9d2zcxpph";
-      name = "klettres-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapptemplate-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/qg0q54wpsmr1y9dfa72y24fjr1faqd8y-kapptemplate-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kapptemplate-15.04.0.tar.xz";
-      sha256 = "01ldjxgsv422l9lay5yg5b9y0cbbwpfl8x41a1wvm9h2l4k0mn3r";
-      name = "kapptemplate-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjumpingcube-15.04.0.tar.xz" ".tar";
-    store = "/nix/store/g3mfvybxvh2rws76bdsvd7fcnkc3cjdh-kjumpingcube-15.04.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.0/src/kjumpingcube-15.04.0.tar.xz";
-      sha256 = "0mj33yz2565px6ljlw6k0pgd2ljq9gsjx4x9jzq6wbcjg6vbiyah";
-      name = "kjumpingcube-15.04.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kajongg-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/8j49syr25zv04wxivlj2r50blfkiih8p-kajongg-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kajongg-15.04.2.tar.xz";
-      sha256 = "1ih2gz0i4r1pbx0ys6wi0fgwwh6c5mlq1hy8qfhbb1kanpl0v30k";
-      name = "kajongg-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnapshot-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/xbh4flc44pyhmd9wfm14zjr8vz58447c-ksnapshot-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ksnapshot-15.04.2.tar.xz";
-      sha256 = "1zpc9pasw5r68rmkaz8la75hbp9na4114j7w0a9fcgjlvllaij57";
-      name = "ksnapshot-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfourinline-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/8fnj1fgszjbr1cjcds8wd0bzbyw09zll-kfourinline-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kfourinline-15.04.2.tar.xz";
-      sha256 = "1r53xqvgsvy1las85jccya2xxfk43bwzbzr6lp2vny1624g3vhdc";
-      name = "kfourinline-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khangman-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/a04bnnsv7r4bhnq3pbsv8nk77749d9vn-khangman-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/khangman-15.04.2.tar.xz";
-      sha256 = "0wpgm0ipm9n6lhyiymf0ncmw8lgz2pc0fh4ghs4n692ihipiw4xf";
-      name = "khangman-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeedu-data-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/nsxh9zscy67b1srj8asi1jc2x9mdwdhh-kdeedu-data-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdeedu-data-15.04.2.tar.xz";
-      sha256 = "04m14g1b8bkngawjx3x9sdla7p10dhxqwvfv29nkm1lblmc547ia";
-      name = "kdeedu-data-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-runtime-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/cj5sh5gsz4hvg7y5rfjw24bbfrgs133m-kde-runtime-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-runtime-15.04.2.tar.xz";
-      sha256 = "1bcg5g6b8vij6zf1s6y4m5296yqiaavgbfcg1xzfcs8b5l7pckrn";
-      name = "kde-runtime-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblocks-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/x3j7xjkpkd7v61ismj3ids9m4910yv7f-kblocks-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kblocks-15.04.2.tar.xz";
-      sha256 = "1bpvw5sghg7qiqs97p0xn7b23jgmzk590kmdjcwigfz788ac4ylv";
-      name = "kblocks-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfloppy-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/76qvy4lfsqyk4qnc1n5cd4wbahfhc6ci-kfloppy-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kfloppy-15.04.2.tar.xz";
-      sha256 = "0r8cgmwa0b9r6dl5vslw4g03mm3qvrswqhk4pdbph3iw1qykxypw";
-      name = "kfloppy-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/bvgf4ym7568ig6mnk4x3jwcfgx1qp51y-kdesdk-thumbnailers-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdesdk-thumbnailers-15.04.2.tar.xz";
-      sha256 = "048i3xy580gpgbk9m42wv2v0cf1gk2zlx52dvf4izczracsvl2n7";
-      name = "kdesdk-thumbnailers-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkexiv2-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/s6g8walp07ncl0xmkv0lkw5dmykjz49n-libkexiv2-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/libkexiv2-15.04.2.tar.xz";
-      sha256 = "0nycanbbk50flb92bgk9zddpny8fb74k2b5fb26x33msx04854vb";
-      name = "libkexiv2-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdf-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/2nnqn0syqqm4j4k3z33vx8mhzcis1rx3-kdf-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdf-15.04.2.tar.xz";
-      sha256 = "17mb2hmbm1r0rq5nnh0xmrv3gqcs0ywan8jvxagvli350xgrn2ck";
-      name = "kdf-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/81ca4iky2x83laf1wls5v5mvsfvvj9pz-kde-l10n-pl-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-pl-15.04.2.tar.xz";
-      sha256 = "1zs799470abqq9hxgik0wka2im6fi12057jg6id7fi9d58h3lyap";
-      name = "kde-l10n-pl-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/6l77zbzh2rdrrg3y329i1rbii74dd66f-kde-l10n-ia-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ia-15.04.2.tar.xz";
-      sha256 = "0rg8zwwmwwm373fnsrcj3cdx88c1z674n398kyv3v6xdi31j2f5p";
-      name = "kde-l10n-ia-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/1py0dsvx6lr9ww09qskvx0pdlg82rcjd-kde-l10n-he-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-he-15.04.2.tar.xz";
-      sha256 = "04kayv647nj3hrxl0863gks5z53v1ax9pafncm70ls79rzz95zsa";
-      name = "kde-l10n-he-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/1sjw15pmf6v8fbrmrrxrp3ifafskhgzh-kde-l10n-nn-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-nn-15.04.2.tar.xz";
-      sha256 = "0j0nn7qk7shq5xi9zma0fl7fibsaindsai8lrvfvaphrbdylp3cx";
-      name = "kde-l10n-nn-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/qg6j8j8gcx7vglnxyr2f3lnzsrdzvadd-kde-l10n-fr-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-fr-15.04.2.tar.xz";
-      sha256 = "1rgy0qw313wk39f8lxb812kfh7i0b3fqgdz1dv22mpd143ywz0xr";
-      name = "kde-l10n-fr-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/qawjvxq649zk7lnr3wb8kgw93pm9szfw-kde-l10n-ja-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ja-15.04.2.tar.xz";
-      sha256 = "02b3243zbnrkygnbiq7nxrl2sq6ssi27kpn9382aa8b19w96gcsz";
-      name = "kde-l10n-ja-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/klmfi9iwf6jzg2aq04bg4l011m46snk4-kde-l10n-el-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-el-15.04.2.tar.xz";
-      sha256 = "1y2q5vqm9xkv2yxzwqxrsyqnd8zdfzz5vyza3g4aisawh3xhwq25";
-      name = "kde-l10n-el-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/sd55g871lxn0isd486flqhaikaaa00rs-kde-l10n-pa-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-pa-15.04.2.tar.xz";
-      sha256 = "1wi9l74fln9q92l1qmxgb2223gwkb6x2v753mzm7607hbcx9y8dx";
-      name = "kde-l10n-pa-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/cklv18g85z9irf5drphwndjpya812yl1-kde-l10n-pt_BR-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-pt_BR-15.04.2.tar.xz";
-      sha256 = "0xfcid4xqcjnlq83ql4rlhb8swn2y9ixzfyx3zbdwjjlkaaqmnr4";
-      name = "kde-l10n-pt_BR-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/br5h37sf6ynlvspbn03lifqhwmqbiica-kde-l10n-sv-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-sv-15.04.2.tar.xz";
-      sha256 = "11mnbalw3lpdgv3bbhhh658cs34impi7gymhcw129il0jsc5yz53";
-      name = "kde-l10n-sv-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/wkxyp7415d8q79wjp8sjkkn9bcf8d5i4-kde-l10n-is-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-is-15.04.2.tar.xz";
-      sha256 = "0xf361dsvlg525w10y1p638ksrb5x381sw322rs14dlpqn89ywl0";
-      name = "kde-l10n-is-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/20sv7j17wyswmiwy24p34hgm75wkfiv2-kde-l10n-uk-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-uk-15.04.2.tar.xz";
-      sha256 = "1hbwwj1k4g4z6wkrxd3aalbhvsqvnzgv56s1m748vp7196d7h6wk";
-      name = "kde-l10n-uk-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/kb9xr7rxa8w6lcrm8yc3nqvvyiwjmzcl-kde-l10n-it-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-it-15.04.2.tar.xz";
-      sha256 = "156j8dj9c44j6mbqka3d0rpkdp2wg5hj7l1kzd2lb0ybvk7vr0r0";
-      name = "kde-l10n-it-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/7arrlm64k6n3fc4f9glgy8synk5mri64-kde-l10n-da-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-da-15.04.2.tar.xz";
-      sha256 = "1np194cir3wh9sm8pqr4s3sx3k8p4rdndvpx7vgw63jlazrw4rlj";
-      name = "kde-l10n-da-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/7x2sq5fhsb84slfylvsg9ds8rkfln7xb-kde-l10n-zh_CN-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-zh_CN-15.04.2.tar.xz";
-      sha256 = "08p3nlyigw1mxqajm2z0gs2ils8aymizmb3iiprnzi3zgcnbg45y";
-      name = "kde-l10n-zh_CN-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/s5k7qadd3n5l1zipxylll7qnig20clla-kde-l10n-bs-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-bs-15.04.2.tar.xz";
-      sha256 = "0vlsij3zfbqlcl9xg3iwvyi112d8i00rjbrpwc15lyhw19xzjakb";
-      name = "kde-l10n-bs-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/crk06pmaf55p78z6pi4fi8hbp0bkf4qm-kde-l10n-km-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-km-15.04.2.tar.xz";
-      sha256 = "1bs10bgnzqwj9adq6xl1y534br74hcvickf2ylw27wqgszwzvd18";
-      name = "kde-l10n-km-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/vldyy2rw01z1qbcd256qapbpxwpqa7ci-kde-l10n-lt-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-lt-15.04.2.tar.xz";
-      sha256 = "03vwx16wwihq0qlzs8w1rdlld0951x0yr9w36bvjsrl985n500ip";
-      name = "kde-l10n-lt-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/bkr5x2mq2cp5zb950p81hkdjg844zlmw-kde-l10n-lv-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-lv-15.04.2.tar.xz";
-      sha256 = "1skw7d5yxdy7vd2z6fnslcp7xpwjrvxzgl7kd9shvj7px988bfng";
-      name = "kde-l10n-lv-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/zzspql9rdl8v5jxajkzg00zz29v9g0wv-kde-l10n-sk-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-sk-15.04.2.tar.xz";
-      sha256 = "1nhvb2kdlxfvch0hly80lm4z17kijy860z2pk23n65r8lmhngf07";
-      name = "kde-l10n-sk-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/525xf0fhgxxi9hxy3nlp911a65pwk9v2-kde-l10n-kk-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-kk-15.04.2.tar.xz";
-      sha256 = "0xgncx5xbhnzxzpzaawvj9d19s8zzdrc76qa986xf37zahjv7v1r";
-      name = "kde-l10n-kk-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/2qq4c0yr5hpfffwqddcxkqkzp2dr6zcb-kde-l10n-ca_valencia-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ca@valencia-15.04.2.tar.xz";
-      sha256 = "0cg2is4lzy9fxz37ciy3ddjd5z1i2ni8gg5pq7v7hz7fqa8bb3w6";
-      name = "kde-l10n-ca_valencia-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/gda3hz81ilizglmrc1m03gy40n1rp89f-kde-l10n-nl-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-nl-15.04.2.tar.xz";
-      sha256 = "0l4frxfrpii14iisjnnpzz0yja6mb6qlz05v1wn6sqqqvv8snq17";
-      name = "kde-l10n-nl-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/hm8y22jy2dhnpdhyp0g3m8fz8mf7dhjy-kde-l10n-wa-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-wa-15.04.2.tar.xz";
-      sha256 = "10vzzwhgnxx5rj7h99b63kgpak2mkmdjr7381w7q1iwq816qxxy8";
-      name = "kde-l10n-wa-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/193h8asiqnbfnhackzybxbqgwhghsdb2-kde-l10n-sl-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-sl-15.04.2.tar.xz";
-      sha256 = "03chmprkais0cq3z4j9xzy3lq91imf3q4mcaccpknla247a8viqf";
-      name = "kde-l10n-sl-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/p6h22zlpyglzksa6rb1xc042lmpn0hds-kde-l10n-ca-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ca-15.04.2.tar.xz";
-      sha256 = "00imm41b9769j0pwgcgavdcwmy59qwnab3qkf8xq22899fvadq7b";
-      name = "kde-l10n-ca-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/mmdpma42n33irvf9hs4frn1y60q0r4mh-kde-l10n-hu-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-hu-15.04.2.tar.xz";
-      sha256 = "1ilhnp6x3lahhc0rkhn2zv6g9ck8w7b9qaw8fgqkiz0n19hv564f";
-      name = "kde-l10n-hu-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/sgcdmfnga8nmyg1pq19cjn5dzdm14c6g-kde-l10n-hi-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-hi-15.04.2.tar.xz";
-      sha256 = "1yqk7wva2r6smasgxzw6f1pw43z1jddf4br1rzq3k7f18np89im7";
-      name = "kde-l10n-hi-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/sf5s50gzjamhmzvbdsymscm0y63k1vsk-kde-l10n-ga-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ga-15.04.2.tar.xz";
-      sha256 = "0wn2q9vbaqkhb60q7x70b2j3yh8k21y4isk5js2ardzz1gpzmrxk";
-      name = "kde-l10n-ga-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/5wri2078sl0r7xv1j2b8x182v2ilpny1-kde-l10n-hr-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-hr-15.04.2.tar.xz";
-      sha256 = "0r5hfhdnjj9j0zzs6yr7a6hc1aidki5far9njn88c78ialw4y9kn";
-      name = "kde-l10n-hr-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/970bcajr5cmcq01z4pkglgw9dpwigpz3-kde-l10n-gl-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-gl-15.04.2.tar.xz";
-      sha256 = "1mnyc9ms863s3x6l85kfglz7q8h9faqgkv7vcf8qfjs1vs6qbh6x";
-      name = "kde-l10n-gl-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/60k5g06hvgpx407f6zbd1q5jm12rzqwv-kde-l10n-es-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-es-15.04.2.tar.xz";
-      sha256 = "1clrjb4wgwx8ijykrdylfgscwimkawpaq13a32m6dka4ipk58399";
-      name = "kde-l10n-es-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/vrhsyhk9sz6117hgbjgy6498nvcprxdd-kde-l10n-pt-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-pt-15.04.2.tar.xz";
-      sha256 = "0bkdm2skvkaqspfq7rsqwahm6h17j46fd97wkqrkmdswgnbn14fw";
-      name = "kde-l10n-pt-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/w9nhhcra2rjpjsc6apgfrlzwqgp7sx77-kde-l10n-bg-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-bg-15.04.2.tar.xz";
-      sha256 = "1jap82rz52a43rad33hidsyvvzm3s4ma5yk75clv5f8fhnjc946k";
-      name = "kde-l10n-bg-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/3lqnb375jd1z7ky7y8nrnpgx93ncassv-kde-l10n-fa-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-fa-15.04.2.tar.xz";
-      sha256 = "0kb7lxvgbdwlyi1rli7xrk4ykdnljdcm0clkgl1bla6vgxhlc7mj";
-      name = "kde-l10n-fa-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/2xsadiy29hblc06v6n3ax9y72k2a32vi-kde-l10n-id-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-id-15.04.2.tar.xz";
-      sha256 = "1vadznjjy32brc76d2wzq31xf69dq2fxipg8rhvjh2f8cy068blf";
-      name = "kde-l10n-id-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/h7838chap1cxjw66pw6914jpl48n6knf-kde-l10n-ar-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ar-15.04.2.tar.xz";
-      sha256 = "05wspvz4fk6xy3d9zjgrj7kzj213hhkv7fvs43iy2l4vm8b3vski";
-      name = "kde-l10n-ar-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/qzx5vs924pzqyxj6mxmn3p9wq0q05vw1-kde-l10n-de-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-de-15.04.2.tar.xz";
-      sha256 = "0fvb169pl9ibppiinc2sq164i7cikn7qxvycdv1whk3bcv376rrh";
-      name = "kde-l10n-de-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/6rs8knkgfs23qa2cwm5s9yp661z37ws1-kde-l10n-eu-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-eu-15.04.2.tar.xz";
-      sha256 = "18bry21g828n0rvaq4510pj8fb4f49jn5yxvf1jm6qn3wcfg5qws";
-      name = "kde-l10n-eu-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/1kl0887wqmnvhiw9318ihvfwwdkxjhrj-kde-l10n-en_GB-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-en_GB-15.04.2.tar.xz";
-      sha256 = "10db8pnbbxc35shx0f7vfiz0glm9kb521b99iksjkwnxpss9kyvx";
-      name = "kde-l10n-en_GB-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/h8r3j2113d0h034vbgz0d61ybnicc5g6-kde-l10n-nds-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-nds-15.04.2.tar.xz";
-      sha256 = "0ryjlw2d9lrzzf08v1vscjr6mp2ckpbd0f2hkxg0ck8wgn7c2mxd";
-      name = "kde-l10n-nds-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/namy5fby5nck67cdgk4ywb7khd43cacr-kde-l10n-fi-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-fi-15.04.2.tar.xz";
-      sha256 = "0zpkcs64g5si5r5q075vkva41sx39qp30hycdzhvbs72hkjkp6m8";
-      name = "kde-l10n-fi-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/zyb7zb7w4y79s5kl6d2p5awpbn3912mv-kde-l10n-ro-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ro-15.04.2.tar.xz";
-      sha256 = "05pgpshvs08inygighi3ya0bl49238l96sgqql0377cm9cw2hj9l";
-      name = "kde-l10n-ro-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/cy7mih4b17vvbfmw86n6bl103xcixhpv-kde-l10n-mr-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-mr-15.04.2.tar.xz";
-      sha256 = "1clmi1vflqi63kihv9ljkbns4r0v7yb65zkdv642kdcfmwz9kgw8";
-      name = "kde-l10n-mr-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eo-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/ngffzrfy1r1x9rlx1h6ivfhif79g6fpx-kde-l10n-eo-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-eo-15.04.2.tar.xz";
-      sha256 = "020zq1ygjkpx5y2isqqp3chk0s1jcd29zy6fwr6jyxvj0260fa8q";
-      name = "kde-l10n-eo-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/l46m8w2hl6wrdns1qwvm5hd4dlbyxpkj-kde-l10n-cs-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-cs-15.04.2.tar.xz";
-      sha256 = "0ks75clbhywql9pgchxi5phc50n9qama5v4crngwkxfbs2lhp05d";
-      name = "kde-l10n-cs-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/7q7ws7qcbnrm5ivxiq1kdfjih1aa44g1-kde-l10n-zh_TW-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-zh_TW-15.04.2.tar.xz";
-      sha256 = "1gvr4k48qjwgw9qsv3rlz210slqdvsxvqxwsy7j5ndcjfs2724wi";
-      name = "kde-l10n-zh_TW-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/nzql394zszp4wan26pr336i20ipirh9q-kde-l10n-ru-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ru-15.04.2.tar.xz";
-      sha256 = "155mbg25anmdy6vgz3fsn4p8m7c8syfwiy70jsgqv9751dvkajlk";
-      name = "kde-l10n-ru-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/z0ncv2c97if41g7qln16vx9kr166zvc5-kde-l10n-tr-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-tr-15.04.2.tar.xz";
-      sha256 = "1ddbxlf9bqd3zqwxfhygfmy15prhh0albp83saprk94bbdirp0lq";
-      name = "kde-l10n-tr-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/s8sr6jzaydgc64r1dbgqzns682avkd7p-kde-l10n-ko-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ko-15.04.2.tar.xz";
-      sha256 = "1knsgxhgz0cvxk0y460zyzk5n9q0rk8p3cdf0wlpxf7z8wvxcab0";
-      name = "kde-l10n-ko-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/rsdm9ds9pn5iqsk6dgbr6mnpliisby3c-kde-l10n-ug-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-ug-15.04.2.tar.xz";
-      sha256 = "0ck01ygnz7ycfpff7g2zyix0zv19ia8csmggvyv07lp0k84asxr1";
-      name = "kde-l10n-ug-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/5dhk16y2w9sibzqlv50w5d18js7mjrpf-kde-l10n-nb-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-nb-15.04.2.tar.xz";
-      sha256 = "16ya60pxn30rpwidijcycmjxm8c61hiykzfirba73i0pkzq13nij";
-      name = "kde-l10n-nb-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/cpfz2g7z1al6p5yadjj6y314ws0fmpg4-kde-l10n-sr-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-sr-15.04.2.tar.xz";
-      sha256 = "1pwwvj7s6ivmx6c5gh6dvfrvi5xp66b40fsnn04zwsp0iamxkdqi";
-      name = "kde-l10n-sr-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/7n1ka8pz70xfznm3q3qvmcbrr74yb6by-kde-l10n-et-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-l10n/kde-l10n-et-15.04.2.tar.xz";
-      sha256 = "1w08blhf6adlj0yanfac2b3kk0ag3gbazjdywz9cf21ks6ni6bsn";
-      name = "kde-l10n-et-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/lniq3v7dr7wqagi4c7cjwdig0ds5bndp-libkcompactdisc-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/libkcompactdisc-15.04.2.tar.xz";
-      sha256 = "14qryxim0fhx7npbicv1pvkr42544jzplfmng7z2cjxx4c636j9v";
-      name = "libkcompactdisc-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksaneplugin-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/v1mywghcpyff25izr0iimzyr9vh3pfnj-ksaneplugin-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ksaneplugin-15.04.2.tar.xz";
-      sha256 = "0s69h4swdcxagv45v8y0kbg4ik3pyl7asiryvz9dip7yznwlxlz9";
-      name = "ksaneplugin-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kamera-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/s9h0gx53bwvg5f8z34drzwkf0ybg602h-kamera-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kamera-15.04.2.tar.xz";
-      sha256 = "01r16868mdmpfjwzz7wa1qykc6lif9yi7fp0zxyk5hy77wp4jwdy";
-      name = "kamera-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kubrick-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/scjxw225n4i6s702ggd5mnblyfgaf9sh-kubrick-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kubrick-15.04.2.tar.xz";
-      sha256 = "16ndnx92mb307qjkwljdbgp69aamk268yqn2w9w8y4yjhmvsmx3d";
-      name = "kubrick-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "jovie-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/ja9lwsb9crzqd8q5vnhw66f5ianimzg7-jovie-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/jovie-15.04.2.tar.xz";
-      sha256 = "0lc751p2s96qjqh7dccjm498m7c370dcsm5bxqks9imyi9l7syyx";
-      name = "jovie-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ark-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/cbpf87yihk31gjc5glvfbsb1r470n0zy-ark-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ark-15.04.2.tar.xz";
-      sha256 = "0pssyyk8kf0qy9vh71kx3h5f1fs26k21cql97mfsl4hz181mfxkq";
-      name = "ark-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdiamond-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/cdw9y1cx7gjfsj6b1hd43mmjjd2k715d-kdiamond-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdiamond-15.04.2.tar.xz";
-      sha256 = "1k0w2d0ysvwhvmsn0smi1s5dwrcwdnqfzny5dgblc3p62xw1wm1j";
-      name = "kdiamond-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klettres-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/x4147vkla2llia02yj1m1rrjs425lm4a-klettres-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/klettres-15.04.2.tar.xz";
-      sha256 = "1rmf5hpc9zwaham157xzn3dvh0z6scpr2i38i513b0ji0kdizikc";
-      name = "klettres-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bomber-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/9w7iv272z8lkpp66di0l0f3z79hjvahg-bomber-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/bomber-15.04.2.tar.xz";
-      sha256 = "1xn52p5apfbm3iyjq1hw2mg5isl3jcbq4x8wfzil2vp3ir16f1j3";
-      name = "bomber-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "superkaramba-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/gsrfn2v5lli7fykmq0864j95mxkdn22r-superkaramba-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/superkaramba-15.04.2.tar.xz";
-      sha256 = "1x8kxj2ndpnpfbxk33rqyq64y1chlll8j3331skzss9117fsp7z1";
-      name = "superkaramba-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkgeomap-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/fsr2vij54z8zwj9rzgfy1x22ivcs2i3s-libkgeomap-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/libkgeomap-15.04.2.tar.xz";
-      sha256 = "091jl7zdcvj91xqr6fh8vvn5wrbg86ykczj43lgvnnph28h1xpyh";
-      name = "libkgeomap-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kteatime-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/fqm7q93457lrg91b5w8jr2lfx3ypa18p-kteatime-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kteatime-15.04.2.tar.xz";
-      sha256 = "0cpy6z6nxys307247l9rcms9f4n2qpnvij1c20s0bcb03n5ya0vp";
-      name = "kteatime-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "granatier-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/3flm8w829k0ygcs24j5smhsq69r1isdp-granatier-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/granatier-15.04.2.tar.xz";
-      sha256 = "1jcxnm1hy6s6g6yls8ljcrhhp3qsp58gcs46hy4s25nacx5m4kh6";
-      name = "granatier-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/aj12ls0r62c66f0gv1w0dv37a9wbx0mm-libkeduvocdocument-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/libkeduvocdocument-15.04.2.tar.xz";
-      sha256 = "13hzs4lrlrnyya3321iqky2nxjlh65fs2lr0nbl3g6k9wxdxlqfw";
-      name = "libkeduvocdocument-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "blinken-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/nh2kasqpz3iwhc2hwv6di51vp7xnnfd3-blinken-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/blinken-15.04.2.tar.xz";
-      sha256 = "1k0idsbqnhmrlnsl8l45wkipb6hch1imrkxglxl1xw0pr0s7c8rg";
-      name = "blinken-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpat-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/hasm2996yj2yljjc6wk50naqm1bal8mh-kpat-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kpat-15.04.2.tar.xz";
-      sha256 = "0vhrq3ssfqwpkrx355v91gg1kdl8sjfpkp4fqyi9h36nps7qdiqj";
-      name = "kpat-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapman-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/wfi3wjr0yyn72aqh31hvfinghl73z7ay-kapman-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kapman-15.04.2.tar.xz";
-      sha256 = "1jxxs2ljfci9llfv1pyybrw10nbajk06k8yhw4yswn23j544049a";
-      name = "kapman-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscd-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/vzwm2r7kypa7vmvxldsqmm27gw0a7bl8-kscd-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kscd-15.04.2.tar.xz";
-      sha256 = "1066yavabxax059fwgp0rmspfsy065x0nisci0ybyfh0y9m8m48j";
-      name = "kscd-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs-4.14.9.tar.xz" ".tar";
-    store = "/nix/store/5wy5pdqpd3c3zhwm93dnasw605abglz3-kdelibs-4.14.9.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdelibs-4.14.9.tar.xz";
-      sha256 = "07klv3hxgq1w85lx2myw131r4v3fd726fljipkd7arwzp8mbwcix";
-      name = "kdelibs-4.14.9.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-4.14.9.tar.xz" ".tar";
-    store = "/nix/store/bskv830n49z3ib444qh1vb87d712q0iw-kdepim-4.14.9.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdepim-4.14.9.tar.xz";
-      sha256 = "0l4nfcf0k958w37bzmbfpvs96yba0r22q16z4d1ksqbyrr6v7ycf";
-      name = "kdepim-4.14.9.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/p0n3h5a2p5wh5l31ldn2cslbvfbvlwl4-kde-wallpapers-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-wallpapers-15.04.2.tar.xz";
-      sha256 = "1qcj8qdryqsqv430bmzv0hir7gbqbfw9sc3x7i4692h8cwvzkw5d";
-      name = "kde-wallpapers-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmix-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/sdwpx6s19zjckj3lgzc5isiab0cigy8n-kmix-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kmix-15.04.2.tar.xz";
-      sha256 = "0g601dmd7f0j70y50xkw4y8vpb5xgjz938m266sklkkwjdcf2fg9";
-      name = "kmix-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krdc-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/3x1axf8f8qcpg3898r90yi35sh06vsh6-krdc-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/krdc-15.04.2.tar.xz";
-      sha256 = "0m7jmwrzihzm8iswzvw5ajz4yiaxdsprdkhgl1a59hgm7wgrp8yg";
-      name = "krdc-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konsole-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/h70w08hzqsnp9rs11mr5m7yizc8yzdgw-konsole-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/konsole-15.04.2.tar.xz";
-      sha256 = "1cy71kfv1f9bq3y3n73brm6wzl03qgcvx5rg0kflx3ihjl1aclgc";
-      name = "konsole-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kanagram-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/73v4cznbqfpidrdg6gbra0qlpf43hb3q-kanagram-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kanagram-15.04.2.tar.xz";
-      sha256 = "1zqjms2ai4bpfmbf136q94gbl59vjszlfsp8xi0pmpp138yii9a8";
-      name = "kanagram-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "umbrello-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/va7y8idm0hjzhfhicl6xlsyz61cp37gz-umbrello-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/umbrello-15.04.2.tar.xz";
-      sha256 = "08bz8lg2arrwsnf0gjjjrf6bihrv9bdz8n4hdvilhpy0ls78v2va";
-      name = "umbrello-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktux-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/6rn0kw9p0vxk4hd60l6ksyxrlczksbac-ktux-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ktux-15.04.2.tar.xz";
-      sha256 = "0pdgbqbk3iwjywvhm6bzwqc6acfnyjixj2j3yxczn2k6fy5k0vkf";
-      name = "ktux-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krfb-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/70w7yfkg79g199z7sb5nk3xaknwjirwm-krfb-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/krfb-15.04.2.tar.xz";
-      sha256 = "1ynvwvhkshjrh1d1rifawzwv0srqj9wlqhhiv5nr8lwd4m29pdj2";
-      name = "krfb-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwalletmanager-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/59i6az9vcq1b9vqx9rwibv7i0iwj2wc5-kwalletmanager-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kwalletmanager-15.04.2.tar.xz";
-      sha256 = "0wch3bm2c7xjbrjvn1ka3iyawi6h6snfab7dzp6na8n4ck7y9s4p";
-      name = "kwalletmanager-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "palapeli-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/kigl3wjr17nq1mh6wqfd3kc4sbh8dqfm-palapeli-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/palapeli-15.04.2.tar.xz";
-      sha256 = "0jsgbddk631z010dam8khbcq9qphkgax9rbgn26r9cv29cfd0h5j";
-      name = "palapeli-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/3r1ibr6rqz6lmgxxscgbkx7ffkpiad0y-kdenetwork-strigi-analyzers-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdenetwork-strigi-analyzers-15.04.2.tar.xz";
-      sha256 = "13bc2a1m64k6iki12kpynf3f1wijxch8rg9nn7xc8rl3bjms8x9k";
-      name = "kdenetwork-strigi-analyzers-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "gwenview-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/zv987ag77hm9wx1gk7nqrrk629dr1q4m-gwenview-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/gwenview-15.04.2.tar.xz";
-      sha256 = "1c1fqwgq91s0c9f85g3i3dwaq16r260jj4wx4xcr3qi4bm12lq5k";
-      name = "gwenview-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kruler-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/ps63vs05fy6jk669grmm3ddb5f0hl00m-kruler-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kruler-15.04.2.tar.xz";
-      sha256 = "0rl81v1lhljfqvz98zfvnfbnylxn3l9qzy7b33hfkpmm9bjkp0i2";
-      name = "kruler-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knavalbattle-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/ajmnqxshv1vg44acwgyy1k3l5fjiadga-knavalbattle-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/knavalbattle-15.04.2.tar.xz";
-      sha256 = "15pmbj230rhiyxx2cz1wsx29zp0p4my54i8099yv943w8wswwy8x";
-      name = "knavalbattle-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgoldrunner-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/j9gqvnw6d4qaf09vsiinzdnpiy3nrgl4-kgoldrunner-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kgoldrunner-15.04.2.tar.xz";
-      sha256 = "1x5pza747k69wx54fiparqx43pk112cma2pq6c4ndycrm5lqxg5v";
-      name = "kgoldrunner-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmag-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/1cz44lqkfc63qgxap5qi59qviwrszif9-kmag-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kmag-15.04.2.tar.xz";
-      sha256 = "1kbxhq9mfjxswds60pa6v1ixc8grn0m1f84da7s18ph5r1wdpkr3";
-      name = "kmag-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-send-file-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/x1p55ssi0cx67z1q2pbqkzaxpaps3lv6-ktp-send-file-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ktp-send-file-15.04.2.tar.xz";
-      sha256 = "1jygvxc8ajy6p6qhpfwj0chc0571x50h7n2nzwqiz3nhs3avqxnx";
-      name = "ktp-send-file-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/jma476qyvnw2qr4fhsx0kdmif55inr4p-kdesdk-strigi-analyzers-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdesdk-strigi-analyzers-15.04.2.tar.xz";
-      sha256 = "0wbm6q02zkqbvcq716v468mjxw3zd8xcjqyc3vvz80zfgpbm2dnd";
-      name = "kdesdk-strigi-analyzers-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-text-ui-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/1c0qqm7946lgjk4p8am0dd54x9q59jdk-ktp-text-ui-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ktp-text-ui-15.04.2.tar.xz";
-      sha256 = "15kh8jwysvzlxrp4r4vhnla0lmwpxcyaf3gyy2lz0lb1k2k368n4";
-      name = "ktp-text-ui-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/5cxhms6vyqxx75cqv6b0899585hq06np-dolphin-plugins-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/dolphin-plugins-15.04.2.tar.xz";
-      sha256 = "19hyki0k06bma2a236w45hip6gb8fzwcm51qx8xxbii4di6qrkvx";
-      name = "dolphin-plugins-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjumpingcube-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/41gx49qgr229s409f1nfjv0s0xc0rr7w-kjumpingcube-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kjumpingcube-15.04.2.tar.xz";
-      sha256 = "04c0klbgsnp6brf8zml8sz6iyi9m7gidwpgdzrrnnhzwfpgaf9zc";
-      name = "kjumpingcube-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/676j87fj0mj0aqyz62729l7fwnl3dvnm-ktp-desktop-applets-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ktp-desktop-applets-15.04.2.tar.xz";
-      sha256 = "00jlhfm7sbg73y9zbkjicz7wr8740qi3ifm493m2f37cndljllhn";
-      name = "ktp-desktop-applets-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdcraw-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/nkjk53cfw4lm95jgwxvccsk4ln4dp5yx-libkdcraw-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/libkdcraw-15.04.2.tar.xz";
-      sha256 = "1j277ydzn35hzk5v0vf50giw1j3yibskpkb4kr5kirszs8m2yqkf";
-      name = "libkdcraw-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcharselect-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/x07k1rddjvi45jdbn6r1bgrc8a6pcbn5-kcharselect-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kcharselect-15.04.2.tar.xz";
-      sha256 = "084qzv8x6262xsl5n4ynkm3zsqf2wdlj5gn4y9jql7in1b92w293";
-      name = "kcharselect-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgpg-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/x5w1brmq7c4jkfx2dj335akvc7bqwhkv-kgpg-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kgpg-15.04.2.tar.xz";
-      sha256 = "1z3p0131hvnj3mm53n3q1hdkpvi77x1k8gv1bi3wblqin41dgmfx";
-      name = "kgpg-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/qf4pgkwm97jp6m634xaagz95l371qzrm-signon-kwallet-extension-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/signon-kwallet-extension-15.04.2.tar.xz";
-      sha256 = "0bp1j0hc0a7lwmzi97hymd83vb5x8ks4m4a1k3h2h86wq3gnnfyj";
-      name = "signon-kwallet-extension-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kshisen-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/l868j4vsnxzdjxx4albmff4532pk5x5y-kshisen-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kshisen-15.04.2.tar.xz";
-      sha256 = "0syx9x96zm4hlmpz644sn2rfb4phyzrgvcr0kl38l9aj1i56q81a";
-      name = "kshisen-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lokalize-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/jxqly6p40ss9aprr12zmabghxphhid17-lokalize-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/lokalize-15.04.2.tar.xz";
-      sha256 = "1hj36k0arfqbyyxccbk6n9skc38a7g6vs3l4r0pdz40b4s65l4hz";
-      name = "lokalize-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccounts-integration-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/b7ckd23lzwf8xhrc6qpmyrha6dibk5k2-kaccounts-integration-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kaccounts-integration-15.04.2.tar.xz";
-      sha256 = "1586bv0h98rqbigrcsqx51nvzxk0zzxvqcxgncnjxknn4rhdkk86";
-      name = "kaccounts-integration-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-contact-list-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/7kn6vi1rmf7nddb0xcy3njyf0fhzgicy-ktp-contact-list-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ktp-contact-list-15.04.2.tar.xz";
-      sha256 = "10zjv2imp03p2wh9vj217skx5fmmscb5l8nwlcv7mlh0b74mlx5n";
-      name = "ktp-contact-list-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kremotecontrol-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/acyvv1x0q022axz5l6xz65cs54xqpq4q-kremotecontrol-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kremotecontrol-15.04.2.tar.xz";
-      sha256 = "0npdbdjcfa8y7lmzl80fgbvv94hj2v0fc1lfmii0k0xnb6jv8cvl";
-      name = "kremotecontrol-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-workspace-4.11.20.tar.xz" ".tar";
-    store = "/nix/store/kfm7vk5zlq9rpak25j4gkdaw1hsq6ap5-kde-workspace-4.11.20.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-workspace-4.11.20.tar.xz";
-      sha256 = "06n4aq0mi36d1ssqbvwxgy6jc18q70xp772i58ni0akw0ckrp33c";
-      name = "kde-workspace-4.11.20.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalgebra-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/jvkznsklm87lnyvwkvn06wzp7irzlj80-kalgebra-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kalgebra-15.04.2.tar.xz";
-      sha256 = "1h8rpikyigx9804pn0624g83ja1wlb2m4hfc29jpi4j6va4h8j4f";
-      name = "kalgebra-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmplot-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/qln1l2y7b5nnwnvgis2ms2cp4iqz7672-kmplot-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kmplot-15.04.2.tar.xz";
-      sha256 = "0p1qkhmdn7wqggk1z4c8mwbgrk7daxgfjg6yhhscaj13ikg2l4qc";
-      name = "kmplot-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kate-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/vzxl3wf0dr7rnzb2xr9pkbdwirjryrv4-kate-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kate-15.04.2.tar.xz";
-      sha256 = "1llsg7ywl9mwl4gc25vw44v708r9k960c2lgqkfjpxnxpjlwk5vp";
-      name = "kate-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwordquiz-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/a2rnncjw6jn5si9pjcg4gv3fy0fd9pd8-kwordquiz-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kwordquiz-15.04.2.tar.xz";
-      sha256 = "0irs4nchd0fwxvv4c9wxww6vbi97ffz4rihwg1p5jipcad2l13ch";
-      name = "kwordquiz-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbounce-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/707rjgg0a9m8bpizypgkzp1g09zyd1hh-kbounce-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kbounce-15.04.2.tar.xz";
-      sha256 = "094cwq972h36mznl9snc52248vag1myxlndykagv13kdj7jwynx8";
-      name = "kbounce-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "marble-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/3cr2qy4k771c14nfm98zmash1s6p8f0c-marble-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/marble-15.04.2.tar.xz";
-      sha256 = "1jwh0vqdzj7r039pg84rh6jk4dznyanirv286v8anf23s3mjwf6a";
-      name = "marble-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.9.tar.xz" ".tar";
-    store = "/nix/store/h1g3dk80b67dqbx33zg1v3wb9141ic2j-kdepim-runtime-4.14.9.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdepim-runtime-4.14.9.tar.xz";
-      sha256 = "0h6q08j5i2lhvlv92daxdyf7vncisbx0ya11vh45wmbv30xv2cl0";
-      name = "kdepim-runtime-4.14.9.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiriki-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/7sp21hpwl9dbr9h4nqn6xpmqb74zvmcc-kiriki-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kiriki-15.04.2.tar.xz";
-      sha256 = "0sdpswz6gvk03sza5n7n9kf6xi0p7azkgkn27hn0ydh5fm7rfi98";
-      name = "kiriki-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okteta-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/lzis9waz781v2n789qy6cc5za4xxb6hp-okteta-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/okteta-15.04.2.tar.xz";
-      sha256 = "00y3kcl57crwkycd7ahf9cw20bnjwzjrxnlkvdpqansmcqvmmih5";
-      name = "okteta-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "amor-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/g5a3dbqpf454c7lxi1k1r5d2sgdicl8q-amor-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/amor-15.04.2.tar.xz";
-      sha256 = "1kbdarrf2jxr5f458m28fg19g29xpj5n7fb9w2311052xaywf0rr";
-      name = "amor-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-approver-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/wxfmvnsjxnaiiflbcc7v38h2ax27m5fi-ktp-approver-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ktp-approver-15.04.2.tar.xz";
-      sha256 = "1qik158frx7208adk7r573a85y8xjd1q8r9yw4fb592hvlkdk3i7";
-      name = "ktp-approver-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/wdi23i8hk6c4fnvkw6bs75s8jkc0wxc0-kde-base-artwork-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-base-artwork-15.04.2.tar.xz";
-      sha256 = "0if4i3zag7hzgrf89bswfg7c95m066phjs89fk4ss45ak25rgddy";
-      name = "kde-base-artwork-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.9.tar.xz" ".tar";
-    store = "/nix/store/75yrqw2cr3b7kv1hsvlz4m9j6gm36akk-kdepimlibs-4.14.9.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdepimlibs-4.14.9.tar.xz";
-      sha256 = "0mjbaszc14ilvcjmr7aqy41py7yfriz1glvwpbr89z9nqjvy62yj";
-      name = "kdepimlibs-4.14.9.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kstars-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/mqk73kl61afzbysc7isfli9ashgl29j9-kstars-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kstars-15.04.2.tar.xz";
-      sha256 = "01mzd0qbfjx6fzbaii6al6r62frygf9psi4av1227p3drwmnxrz6";
-      name = "kstars-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccessible-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/yrs4k4mal8rdpy1781jblbapf9xz201v-kaccessible-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kaccessible-15.04.2.tar.xz";
-      sha256 = "1aa4c5r0bm0azm8dhkvnrk87669vp397xzz0v0d3ih7ffmh72il1";
-      name = "kaccessible-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnakeduel-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/0zkd1qcv6k52avkv235108rrqn2fifd8-ksnakeduel-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ksnakeduel-15.04.2.tar.xz";
-      sha256 = "1zzwkc6k6315a02il4sp4zswz0i1031bcvsvxrpxb45s4rqhds3b";
-      name = "ksnakeduel-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalzium-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/l50svmrk7acq79f1ab284q61jm1164li-kalzium-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kalzium-15.04.2.tar.xz";
-      sha256 = "1mcfw1l0qqzr212ysgppva8s4dn3dfhzqh712fc3kd416azz985x";
-      name = "kalzium-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-icons-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/wlna2q3x6crc3xj7a7x09r0fxzsxfl27-oxygen-icons-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/oxygen-icons-15.04.2.tar.xz";
-      sha256 = "1xwa8y6alrk6faf6bw3wc0y2vxjx32wzl9ncywisb4823xc8njbi";
-      name = "oxygen-icons-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cervisia-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/h9i6iisfnqyz340z2izl02n8nyz2l82b-cervisia-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/cervisia-15.04.2.tar.xz";
-      sha256 = "10a6k6x5mxcp3ark71rjcsbvi9q7r7sqc0pqx6wqg8wrvqng776i";
-      name = "cervisia-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmahjongg-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/yhhpl1hamlamb7kfi1njlp60fg59xiqn-kmahjongg-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kmahjongg-15.04.2.tar.xz";
-      sha256 = "17jlb1nr2i79s4m3srv0fm4zwqqknabfa0zwb6y5bdlk9bjpphaq";
-      name = "kmahjongg-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdegames-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/qffj5v8rmrlnqm7y7l68kwhy4cx9hhqa-libkdegames-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/libkdegames-15.04.2.tar.xz";
-      sha256 = "0r3mnbc4ka8whmdjadnr6wyac4bwfv6w01l6nm2k7gsq2n38q2yj";
-      name = "libkdegames-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kspaceduel-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/zsrxzn4zp9a4v9xfaqr27d4nnmgycdc2-kspaceduel-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kspaceduel-15.04.2.tar.xz";
-      sha256 = "07pgrdywj0jbvqw21qkblax30jym9x8y94ig5jn3jl19ax7a8wqy";
-      name = "kspaceduel-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmouth-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/pybi47055hcdlpliqari9p8gki1yj8iz-kmouth-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kmouth-15.04.2.tar.xz";
-      sha256 = "1hjn1fb5c7a5yw0yzsb7v3wdgq1wyqj7zs7jw71gsgkq3sy0as47";
-      name = "kmouth-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/2y66l1759ipk2dk46b0imh1r6vwb3yrx-kde-dev-utils-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-dev-utils-15.04.2.tar.xz";
-      sha256 = "100kia4fd6gc10mh1nmadrm60wwnciyq5nlm0m4c1cjbp9ypyfh5";
-      name = "kde-dev-utils-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/3ywzsbp1lvq98ikalwlxs57x9w2zh47x-mplayerthumbs-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/mplayerthumbs-15.04.2.tar.xz";
-      sha256 = "0lgag714pqpqnf6v9dz5xlriswcyqvjnj309gk0wji523hny3mim";
-      name = "mplayerthumbs-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konquest-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/sqjrx2z8pig68sfifdcykksys2kifi2h-konquest-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/konquest-15.04.2.tar.xz";
-      sha256 = "1w03w8nxkbz9ng2spa3pc5gmigajm7k8dcz2j1nly44a6g85rxnn";
-      name = "konquest-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcolorchooser-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/3cz810cqihfw4jyfi8bdg9fi5bzs1rga-kcolorchooser-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kcolorchooser-15.04.2.tar.xz";
-      sha256 = "1hypa5q9vfk3imc6fng7li3jkh51phsk2cq1sjri1czl547ij38h";
-      name = "kcolorchooser-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/fzz2pwgl8jx0flydbv67f494rqs2lrdd-ffmpegthumbs-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ffmpegthumbs-15.04.2.tar.xz";
-      sha256 = "122mfd85yzkmyg1wzz7fz4v0jnxxifinckc9rb5ydjlj3c85y9qg";
-      name = "ffmpegthumbs-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "print-manager-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/zfiqwh08ccppyzvqd8wrlmc0zf7nbj54-print-manager-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/print-manager-15.04.2.tar.xz";
-      sha256 = "0hry52ypcchzbsvg5y4mw2h494l3cp4lqflhw48pilgzmz6pa1rk";
-      name = "print-manager-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "step-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/b51g9dz39d5raxgvl9fbmdbmsxjpniyg-step-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/step-15.04.2.tar.xz";
-      sha256 = "0skcnrdb3gcl8z2krmhi38dz5gr9a0bzvfgiv953bbr93hkjsscf";
-      name = "step-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "poxml-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/s9c62j11m3rc9w3i586hjwk1k29lhxwa-poxml-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/poxml-15.04.2.tar.xz";
-      sha256 = "09rvf4yzrncc0q3975mwj37a3pm0l07r3jnqzhbapdkkwjqs9ad3";
-      name = "poxml-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/dwy5s9x602rr1m5cdjigk7mjvkab7h1c-ktp-filetransfer-handler-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ktp-filetransfer-handler-15.04.2.tar.xz";
-      sha256 = "15y53z3kbbvk6vg1f3ns88mq6c9hmd41s2ayixhg109nwp7q0177";
-      name = "ktp-filetransfer-handler-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/bxd782i7kh5ssxcsvd7b25rx9mwywlpj-zeroconf-ioslave-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/zeroconf-ioslave-15.04.2.tar.xz";
-      sha256 = "0129dc6r1sfxjg3bdfbnprgvf7iricshw1l879cw2lzb7wmqdpm9";
-      name = "zeroconf-ioslave-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgeography-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/7fh80id5rynq5wigvx95r5jldyj09f8a-kgeography-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kgeography-15.04.2.tar.xz";
-      sha256 = "1iddjjpvyimbc9p0z2qzqc2v1q48pvm1d6qd4pdbycshpcm4wjwd";
-      name = "kgeography-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcddb-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/wqlwval30d2jii0cpcnhyr7hvhn18yck-libkcddb-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/libkcddb-15.04.2.tar.xz";
-      sha256 = "1yrmvy8kldhh312dk4kipr15hr4zhsg2yj645naybfh2dya89q6m";
-      name = "libkcddb-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkmahjongg-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/i1rmk34a0bl0088ypi1vr3zgm22s0qxq-libkmahjongg-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/libkmahjongg-15.04.2.tar.xz";
-      sha256 = "1xrdv1p5gjzg4cs35y2kmd49lwiinl1wqaw76y5lq3p303k7vvm1";
-      name = "libkmahjongg-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksquares-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/091km97cfa95lqa9ll2bmy1j4ayijc94-ksquares-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ksquares-15.04.2.tar.xz";
-      sha256 = "01h8kcahn72lh9hdqljz9fx9wdh3gx7rk7fk0xpc7fh0qqwcdv9i";
-      name = "ksquares-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksudoku-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/6056jj6bns8mgr6ss3jqfdrwm1nlmvm2-ksudoku-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ksudoku-15.04.2.tar.xz";
-      sha256 = "1xn2d7aiqv0q3lg5iwhjp2abwq2ssxa8gdjawvj40xq4zffr0wna";
-      name = "ksudoku-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kollision-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/47lslszl9rlnpiw1ic2lxkrd5302kswb-kollision-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kollision-15.04.2.tar.xz";
-      sha256 = "0jqjg6dr2ff5qb5f23kfd017m1lm7h2rim6q8dkbxk4xm92f5kqi";
-      name = "kollision-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcron-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/ilz3z9pv0axrikakkrl1ibkv496r34ys-kcron-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kcron-15.04.2.tar.xz";
-      sha256 = "0fszrwgsib82glm0hi2iq11b8z3w8j14vp8hqfxp8ccggk1a0xaf";
-      name = "kcron-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bovo-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/4lz289bp3agyw5igfvpdzi123m7qmiy4-bovo-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/bovo-15.04.2.tar.xz";
-      sha256 = "00w5d9mapy4f634ys1k45fhpa50h5299y9q6wann9phrmf8kj8y2";
-      name = "bovo-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "filelight-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/654c7xpn6kvbvglh0sxg5qz75w52nfsi-filelight-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/filelight-15.04.2.tar.xz";
-      sha256 = "0ynrirvrisswaia9894wd4b6f97h04bd3w9zlv28nc9ck1p2d5zv";
-      name = "filelight-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "picmi-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/1xlxqdznc1w89hvz6ykzpbd4pkrxifmh-picmi-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/picmi-15.04.2.tar.xz";
-      sha256 = "06dz8552rfydirvmnibvpw0ahg4f2za82qkv2j2crfqm2iigp9rv";
-      name = "picmi-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kig-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/0g5k9zx2d4fxpsa4pifpilrm9xamq40g-kig-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kig-15.04.2.tar.xz";
-      sha256 = "19wv15ji7f0m0zzymw11g28sa5n1kyhpnqbcgpfkaqxynv2fn4cv";
-      name = "kig-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksirk-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/81c1aijibwhrdhn149m3wx2zxv3l2r8f-ksirk-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ksirk-15.04.2.tar.xz";
-      sha256 = "0w6j3z8vzj3wnnwkpm2gv533jkjwdx8f2m6hnqa3ckzashmlqx7w";
-      name = "ksirk-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okular-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/9i3ma5arv1bfij2f92lmrg4z1fz7jr2v-okular-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/okular-15.04.2.tar.xz";
-      sha256 = "0cqqh4f4ymyx7204ba0afy2hscayd8aqg8dpbv13xxhs8m1aa3p7";
-      name = "okular-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksystemlog-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/635srb7rlzyzlii3qf1j9p85fn18cdw6-ksystemlog-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ksystemlog-15.04.2.tar.xz";
-      sha256 = "00il9r3n5756n0n6k515fdm9z7mfa1gd1n6kac4vr7yldvll9wh1";
-      name = "ksystemlog-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmousetool-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/fchxy0dfggh8hgd1z8yp13qgn1xrhxvl-kmousetool-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kmousetool-15.04.2.tar.xz";
-      sha256 = "1nkn25zg6bb4pc7s93f6igcpspy1a1wlzh2ckmm2613594jh1qr9";
-      name = "kmousetool-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/ah5gjm6qdj22i62i1davbd88hwpp7bb0-kdegraphics-mobipocket-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdegraphics-mobipocket-15.04.2.tar.xz";
-      sha256 = "1y3w477bws206fx1rymvp9dr7z8bxy1l2p0cdawlnbir9bamsnnc";
-      name = "kdegraphics-mobipocket-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-kded-module-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/n874w08k1vfkinc01hr4hlvd4qg9ln8r-ktp-kded-module-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ktp-kded-module-15.04.2.tar.xz";
-      sha256 = "1a7jfa8lqb24dpckiix13lhdgb18rv4v9ib908jqqqnk8rphac5n";
-      name = "ktp-kded-module-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klines-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/6wl8yszqa313v9w1b8l05qc2ajdxn9vj-klines-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/klines-15.04.2.tar.xz";
-      sha256 = "11ksr0khyj29bbzcavpxm4kc109m2g2gbhi4qhsyanfj8a0811az";
-      name = "klines-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/hdkpbx4z3d9wx6zmhcdfsj8rmxsyh3ay-kdenetwork-filesharing-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdenetwork-filesharing-15.04.2.tar.xz";
-      sha256 = "0l7s9a8ngwvz11bk5d5q4vxi0xvqc2jk62zcqq0mjiznd3vwiqdy";
-      name = "kdenetwork-filesharing-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klickety-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/4k68344zgzdb3a11zgjlv4npcc16gxag-klickety-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/klickety-15.04.2.tar.xz";
-      sha256 = "149jka949jcpd75kg9rk2xa6m3hvkaiif57a35bg2pdzs41dqnn5";
-      name = "klickety-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-contact-runner-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/79xzz7i1yspf2mlzzbzzgaxk8szx0a8p-ktp-contact-runner-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ktp-contact-runner-15.04.2.tar.xz";
-      sha256 = "00r8z9zg9g1lpr6jmkr5l0n4w7zsskl35spral6ibbnnvfcv7jrf";
-      name = "ktp-contact-runner-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenlive-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/5q0r2446rj0dkxc3k5m96rjbbcgvyg4a-kdenlive-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdenlive-15.04.2.tar.xz";
-      sha256 = "1q17b5gihcgi5svs123h0vl25ij4ajybk16is9hjyfpmhkl7nyfa";
-      name = "kdenlive-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lskat-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/6gskfm2ymh6mnv2irgj5v21r3hhypf9s-lskat-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/lskat-15.04.2.tar.xz";
-      sha256 = "1ydmglbihijpsgq29nz3sg3g8sja9nzqd7czpg8z8zy9gylh6cl4";
-      name = "lskat-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblackbox-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/16pvgzgzp6y44n3cmpnajgw74m92wd9i-kblackbox-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kblackbox-15.04.2.tar.xz";
-      sha256 = "1ib9a9pp9mdp2kbz2gb4lnrlf66v7170y4qrg24vmvpsa7csgmx3";
-      name = "kblackbox-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapptemplate-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/33rnc300y683cxcp50mi1awdk4rxpp18-kapptemplate-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kapptemplate-15.04.2.tar.xz";
-      sha256 = "092wysas8zfhz8af4fvizbn148c4jhj4vk2cy6z94qih8hnry294";
-      name = "kapptemplate-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbreakout-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/s3ni25fyw0i7jykk0bdybq4jq60yfgi5-kbreakout-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kbreakout-15.04.2.tar.xz";
-      sha256 = "1wrggwcgyc6vlxy0zx8y69lvz0njalbfw54sgnrnc8ka65mjr0pg";
-      name = "kbreakout-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktimer-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/wr8lj1871w99ffd0dgjyn3rgr2kix9sm-ktimer-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ktimer-15.04.2.tar.xz";
-      sha256 = "19ah9r92i8r4059apvv1aj25hvkhq3dw9vmvi5r8sxrdbd3m0yw0";
-      name = "ktimer-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "juk-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/rcckq4x2wvg7rgm4nbwlmzqhxsasmbd4-juk-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/juk-15.04.2.tar.xz";
-      sha256 = "08lwi7yakry6cwrr0hxmrb9h2nm5xkx39bwfsphrd4vkyfd94awp";
-      name = "juk-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebdev-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/1b0cd8ahc9841k5f3yp8mnfi43gmca5b-kdewebdev-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdewebdev-15.04.2.tar.xz";
-      sha256 = "0cq2zyi4j6z70ghy8x1hhi3bgph6ql2k71vllfc37gb5h8gqpfh4";
-      name = "kdewebdev-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "pairs-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/8n1ls70j6sp30v5172f8b4pni77h612w-pairs-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/pairs-15.04.2.tar.xz";
-      sha256 = "11hbzh8nk38m1n61vcyzz1v6q1fpwyiv9l6s05mrsm4krny2bi4a";
-      name = "pairs-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kopete-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/qxv3q0s8qvkmw3gv186zb5h8ds9qif9c-kopete-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kopete-15.04.2.tar.xz";
-      sha256 = "1zvf0y7f8r97lvwcspp2bwph5wsh1rcac9hp6vg0hkama3iqfbk3";
-      name = "kopete-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kreversi-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/1d78nc8bn6q9pya6fmbvpv1j504h2p74-kreversi-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kreversi-15.04.2.tar.xz";
-      sha256 = "0qzwk8yj5dk01n6w1jmrqncy48cpg2xriqqiachx4gh878f2y4cs";
-      name = "kreversi-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knetwalk-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/40vin5w140gna791rbdvgiqv6gmdy5a6-knetwalk-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/knetwalk-15.04.2.tar.xz";
-      sha256 = "0j2zkh87wd2xhd0aaad40cjq1na4kg18y0bnpiqdgwgmvvss18cn";
-      name = "knetwalk-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeartwork-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/nfikvnas8aa532z85hra7d5lbdcp0sjb-kdeartwork-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdeartwork-15.04.2.tar.xz";
-      sha256 = "0dhm6n5x8pq4nl8f5gnr2cdgy3fjkqyhij9gdxqan5s7rhfq7j4n";
-      name = "kdeartwork-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "artikulate-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/ch4qds4ksc7bxc7qvnp594bcq15f7lfg-artikulate-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/artikulate-15.04.2.tar.xz";
-      sha256 = "1hi57rl5ibs28l5w3gwciv9yi9gw7q22say8w5b34b5kjw0cyg2v";
-      name = "artikulate-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccounts-providers-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/br9b5cwnam0xgh9pm3sa1gf6r4wmr2pf-kaccounts-providers-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kaccounts-providers-15.04.2.tar.xz";
-      sha256 = "1a2mwv1lvmnw7apb94w4620ip3d3p8xxp3ff0yg633x60g0wnkiv";
-      name = "kaccounts-providers-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiten-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/kpd3k77yxizdi9x0063m6dwjlw002xmh-kiten-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kiten-15.04.2.tar.xz";
-      sha256 = "0yr7i1k3qpifwy2a58b899nfglkyf8gdrbakhdd9j2rlyyk3hya3";
-      name = "kiten-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksane-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/3058pvg2jwnd405awd0ajk78qbn3pgr2-libksane-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/libksane-15.04.2.tar.xz";
-      sha256 = "0s2jmp1596qnjff2fqmlmg3qzfhf2wjfvazkrrndfr6dzn4sz72s";
-      name = "libksane-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/jw8kq5lv729dyz48fr0ynck8l1fi5lz9-kdegraphics-strigi-analyzer-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdegraphics-strigi-analyzer-15.04.2.tar.xz";
-      sha256 = "1gf6n1bdhbizfgpbn1p81gzz09a028dadij7gn016vkfczjkl1k8";
-      name = "kdegraphics-strigi-analyzer-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cantor-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/kay8y3b2yqw6x5n6d0bjh86x76p1pvr3-cantor-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/cantor-15.04.2.tar.xz";
-      sha256 = "0y7gs13s38swvicfw9wlxgqr96bvny4d2rsvnkb0cn1d68vmb7jm";
-      name = "cantor-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dragon-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/v0ig7hdlixwprlrjpirxsj3mqg3mzj34-dragon-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/dragon-15.04.2.tar.xz";
-      sha256 = "0kf692d3wsj32iry3dl148f4i04y9y26nc9v4skpwf5pvsgp2d5s";
-      name = "dragon-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-auth-handler-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/58nbpzqmcw17152bs24lh6h3mj6c6nlf-ktp-auth-handler-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ktp-auth-handler-15.04.2.tar.xz";
-      sha256 = "1fp1yks0k2mfn9kqfsy5y27ibpfjvmlx4h1ah6sy5mmqvh96s04h";
-      name = "ktp-auth-handler-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "katomic-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/hxhzw8r4ji2z6m1scybs90q3n4sf0p34-katomic-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/katomic-15.04.2.tar.xz";
-      sha256 = "1gpg01ngqmfkiwzfcx686x2yzd4sjlp5xkdrgdwy20czl1i6rras";
-      name = "katomic-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "svgpart-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/9kjmy8gy1lybbgv45m3jpi5dg2f0d9xl-svgpart-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/svgpart-15.04.2.tar.xz";
-      sha256 = "09f9zfppa82zxzrm7b1c7q6hn3dry0rwzz3xpx26dsh219qaax29";
-      name = "svgpart-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/bg5g9qpbzwrp50ipg3x9mi54dmp04hnw-kdegraphics-thumbnailers-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdegraphics-thumbnailers-15.04.2.tar.xz";
-      sha256 = "15w0bli83ykqdxv37zpmdgf66gkqmb3gf1wxqfhw241pfcqbsxc3";
-      name = "kdegraphics-thumbnailers-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/2ws9qacikk9az2dj6lxmg1swm7kwvyk4-ktp-accounts-kcm-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ktp-accounts-kcm-15.04.2.tar.xz";
-      sha256 = "1icmsax7abwfjavmq9vn2l3hj7hbjdhky60hga52sdnw7hy58n01";
-      name = "ktp-accounts-kcm-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktuberling-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/qvbh4g988977fqahh0vdy6y2mcsa03sq-ktuberling-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ktuberling-15.04.2.tar.xz";
-      sha256 = "1kf2gwxwh0v9lai5lwbgd9d8d27d9p6vxj6i4291w5wv9plld9my";
-      name = "ktuberling-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-baseapps-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/y8fy3h6ypqnzr883hq02c8p0rfilizs5-kde-baseapps-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-baseapps-15.04.2.tar.xz";
-      sha256 = "0yqg1z6c9ma8cfhpb21jgk5hcpg0dscm89sy5jxwflg1n355jkhv";
-      name = "kde-baseapps-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcalc-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/q36zxbwxvwhmccqsqvjp7s0amc56ci9g-kcalc-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kcalc-15.04.2.tar.xz";
-      sha256 = "0sk431vrz8xc12fc6qfdlxcnkr5yl729pk450pj90xm6x0jj24lp";
-      name = "kcalc-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sweeper-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/ailfyyak31rbjd1syva34lh8ldqa589i-sweeper-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/sweeper-15.04.2.tar.xz";
-      sha256 = "0nyl587zrmz4aynbp7g7415gczilmb02h79s4xpfxilmxc9910w3";
-      name = "sweeper-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kuser-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/841sa28hlcjqbh223vfyhf90xk2v7fwk-kuser-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kuser-15.04.2.tar.xz";
-      sha256 = "0b2q616nzqjb0q9as71x2njdjlcd3576rkwnyv5acjgb5bq7wgg4";
-      name = "kuser-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kturtle-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/b7v36hd1nplcfjn9j4sphxh08mw366l8-kturtle-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kturtle-15.04.2.tar.xz";
-      sha256 = "0xgb2ahzyg88iz1dgvbc5n17fbds56mixcfk4mmi2hgycckjk910";
-      name = "kturtle-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkface-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/gpvb35d3ri6z7bxvczhhq4d04a59aa32-libkface-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/libkface-15.04.2.tar.xz";
-      sha256 = "08xc93jjplqc6y0m9q6krwplfjj2cklvbw8m9dhhv1w6mn8qp8r3";
-      name = "libkface-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "audiocd-kio-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/92qgv319y1sypkgcgzhr8k2m2ii992kb-audiocd-kio-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/audiocd-kio-15.04.2.tar.xz";
-      sha256 = "1vxqabysh3mjmrzaxz2kldx2a6w07rxf1adka1fwp2yhajb1bzlh";
-      name = "audiocd-kio-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kppp-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/jw9l8530fgdkkzyxdmf90g1p3s7phhs2-kppp-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kppp-15.04.2.tar.xz";
-      sha256 = "0g89b800v06p1ymxdm7g04ajdmdh86y740hnzr0r64rdhsxq0wn9";
-      name = "kppp-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kget-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/57ri311sxq7bq64by12vgjqsgmajrfk7-kget-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kget-15.04.2.tar.xz";
-      sha256 = "0cc7rva5yig01kfih1im0ncf0jk7hq1pwyqr9486n024161fc1n0";
-      name = "kget-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolourpaint-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/1n2511qxgqb7prz2l85psdq1dypq3qms-kolourpaint-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kolourpaint-15.04.2.tar.xz";
-      sha256 = "04rly3wrh8hibaps90mphvbb35d9c308czfmnhqxyk6np4bfvrk6";
-      name = "kolourpaint-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktouch-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/fbf91j6jf0f3ws7sa8spsk2zkm08s5j4-ktouch-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ktouch-15.04.2.tar.xz";
-      sha256 = "18f0r9d0hs1prrwj33iwik9ipdf3hyf316yz7jbg3iyygp8xa1wf";
-      name = "ktouch-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbruch-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/zf38d9iax1bnwga069a921zc7156f6sy-kbruch-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kbruch-15.04.2.tar.xz";
-      sha256 = "0w1fw3lydp5znk3n5fhg30gj7mxi7v6y7hv46wl01cysd73m7825";
-      name = "kbruch-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolf-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/mbfh9c9jrs8a8xb6srhny9ipjs52nx01-kolf-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kolf-15.04.2.tar.xz";
-      sha256 = "0fifvpsp6nbr58r1pammynw4zh4k9z51vgm5xbcl1k6pblh6hn6l";
-      name = "kolf-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgamma-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/i6k8yvh7rf1dqd2kn6aqmyzzcayxp3sy-kgamma-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kgamma-15.04.2.tar.xz";
-      sha256 = "08ia2skz3w6zwzm9jlgiyrlxnn7mx83d78350plr5k6qrszn483l";
-      name = "kgamma-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kigo-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/9ca8cpnw78bnlrqi1yyy192qbb93y82q-kigo-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kigo-15.04.2.tar.xz";
-      sha256 = "00hhdhv905l1y79i2vsz65r7vqbz2vlzl57y4sdcjpk65ababcrc";
-      name = "kigo-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/vdwv4ww6n28gpc2rkylml28yalihy1q6-kdesdk-kioslaves-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kdesdk-kioslaves-15.04.2.tar.xz";
-      sha256 = "0fpmn0cv95jicxq6zbxivarlyhmjbi3a2brnz9xb4jznx06c2cz8";
-      name = "kdesdk-kioslaves-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/qc0mhibyrkipf7ryl45d0caaj5xsvmpc-kde-dev-scripts-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kde-dev-scripts-15.04.2.tar.xz";
-      sha256 = "07lliwm96m2nvwa52vsch9x85vxxj7cqlvfm3ynv8nw49pmlkdi5";
-      name = "kde-dev-scripts-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcachegrind-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/l7vgzgq9zh2q3nm6lvvxg57p86qr6z8a-kcachegrind-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kcachegrind-15.04.2.tar.xz";
-      sha256 = "1f3iqjd4dk3agk6kw096199yrd8ag3zjx9zz58gvlkdww9rlap13";
-      name = "kcachegrind-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkomparediff2-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/ayx65a6hvxxyw4cclvw8f9c79pixbklf-libkomparediff2-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/libkomparediff2-15.04.2.tar.xz";
-      sha256 = "0qj9ih96v3r2l9nq68z4y175nhizl8rmd4nypswy5lzi7k8m9q99";
-      name = "libkomparediff2-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "killbots-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/v7qcb9dvh0sg031y8s7qlhjj7bfi0hba-killbots-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/killbots-15.04.2.tar.xz";
-      sha256 = "1xr7857fi5l5h6d6fsyqsb803h29gprfsxz4h73scnnn70bkkm9q";
-      name = "killbots-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "rocs-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/llzpz351096v1jq26pnpq38s353rijfk-rocs-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/rocs-15.04.2.tar.xz";
-      sha256 = "0zgxgbmmc3wy0k0s6dx7gprw4dl1rgdrq2ah98zr658bpwkkm9aw";
-      name = "rocs-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmines-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/678x21vwippxpjg2bsv79127s6852clb-kmines-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kmines-15.04.2.tar.xz";
-      sha256 = "1n49vzbyiiya0inxp0kydh47mm5m2qgm8x3n6yj9hjhllvjm885s";
-      name = "kmines-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdeedu-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/ykck6cw92ddmlcarb2b5rkqcsshrk54w-libkdeedu-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/libkdeedu-15.04.2.tar.xz";
-      sha256 = "1pvipdv3zhqpnmz4x68jdfml2hjamlb591r9qcibw1pzgx7bz77q";
-      name = "libkdeedu-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-common-internals-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/aifqj9bdnahhjisqbiamcx8mq8fkw234-ktp-common-internals-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/ktp-common-internals-15.04.2.tar.xz";
-      sha256 = "0b255d8yf8xi426kpsqb3s1dqsqvypk485pw327kvqg2jj2jdmiq";
-      name = "ktp-common-internals-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kompare-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/3z0xfsx62crxyp35in81zz5y84dcrfgr-kompare-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kompare-15.04.2.tar.xz";
-      sha256 = "0c3kyfqz6mp4mj0ryhjgqwp2x93bj0nsbgp2vf9rgvkcdvhd6fqk";
-      name = "kompare-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "analitza-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/qfq2a23wsl1lws544pp5p0hgmprr2kaj-analitza-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/analitza-15.04.2.tar.xz";
-      sha256 = "117mw7c74vxh6mp76lxw1jc231b2zvif8d721dl5nshggkxhmf9j";
-      name = "analitza-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "parley-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/fcj9c30mhz0s2qhlch2sc1bsy52vp1hk-parley-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/parley-15.04.2.tar.xz";
-      sha256 = "1xzjpm8vfxp7g5497n95r3x4pbs6s29jaf6rlkb3lm72x7yml7fc";
-      name = "parley-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkipi-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/3c6adpvdmw4yvwqa4ivn3mqf0himjf1f-libkipi-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/libkipi-15.04.2.tar.xz";
-      sha256 = "1fn671kjmin20bgi6h34fvcn3811ms34i9xbpxc3vv2s4sgn2v72";
-      name = "libkipi-15.04.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-15.04.2.tar.xz" ".tar";
-    store = "/nix/store/q3m5pc6n5f7l2hipmfplsjbswzg8n0vh-kqtquickcharts-15.04.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.04.2/src/kqtquickcharts-15.04.2.tar.xz";
-      sha256 = "02fclmqa845cd6gll89m2fi382syani9r84w0hnnsyc77dqrlqi6";
-      name = "kqtquickcharts-15.04.2.tar.xz";
-    };
-  }
-]
diff --git a/pkgs/applications/kde-apps-15.04/manifest.sh b/pkgs/applications/kde-apps-15.04/manifest.sh
deleted file mode 100755
index d74d9cbbfbc..00000000000
--- a/pkgs/applications/kde-apps-15.04/manifest.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
-KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
-
-if [ $# -eq 0 ]; then
-
-  # The extra slash at the end of the URL is necessary to stop wget
-  # from recursing over the whole server! (No, it's not a bug.)
-  $(nix-build ../../.. -A autonix.manifest) \
-      "${KDE_MIRROR}/stable/applications/15.04.0/" \
-      "${KDE_MIRROR}/stable/applications/15.04.1/" \
-      "${KDE_MIRROR}/stable/applications/15.04.2/" \
-      $MANIFEST_EXTRA_ARGS -A '*.tar.xz'
-
-else
-
-  $(nix-build ../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
-
-fi
diff --git a/pkgs/applications/kde-apps-15.04/packages.json b/pkgs/applications/kde-apps-15.04/packages.json
new file mode 100644
index 00000000000..7c0251c9441
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.04/packages.json
@@ -0,0 +1,5693 @@
+{
+    "libkexiv2": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "libkexiv2-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/libkexiv2-15.04.2.tar.xz",
+            "name": "libkexiv2-15.04.2.tar.xz",
+            "sha256": "0nycanbbk50flb92bgk9zddpny8fb74k2b5fb26x33msx04854vb"
+        },
+        "buildInputs": [
+            "exiv2",
+            "kde4"
+        ]
+    },
+    "kde-l10n-bg": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-bg-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-bg-15.04.2.tar.xz",
+            "name": "kde-l10n-bg-15.04.2.tar.xz",
+            "sha256": "1jap82rz52a43rad33hidsyvvzm3s4ma5yk75clv5f8fhnjc946k"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kqtquickcharts": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kqtquickcharts-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kqtquickcharts-15.04.2.tar.xz",
+            "name": "kqtquickcharts-15.04.2.tar.xz",
+            "sha256": "02fclmqa845cd6gll89m2fi382syani9r84w0hnnsyc77dqrlqi6"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "palapeli": {
+        "nativeBuildInputs": [
+            "cmake",
+            "qvoronoi_executable"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "palapeli-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/palapeli-15.04.2.tar.xz",
+            "name": "palapeli-15.04.2.tar.xz",
+            "sha256": "0jsgbddk631z010dam8khbcq9qphkgax9rbgn26r9cv29cfd0h5j"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdegames",
+            "sharedmimeinfo"
+        ]
+    },
+    "kmahjongg": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kmahjongg-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kmahjongg-15.04.2.tar.xz",
+            "name": "kmahjongg-15.04.2.tar.xz",
+            "sha256": "17jlb1nr2i79s4m3srv0fm4zwqqknabfa0zwb6y5bdlk9bjpphaq"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdegames",
+            "libkmahjongg"
+        ]
+    },
+    "analitza": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "analitza-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/analitza-15.04.2.tar.xz",
+            "name": "analitza-15.04.2.tar.xz",
+            "sha256": "117mw7c74vxh6mp76lxw1jc231b2zvif8d721dl5nshggkxhmf9j"
+        },
+        "buildInputs": [
+            "ecm",
+            "eigen3",
+            "glew",
+            "opengl",
+            "qt5",
+            "qt5opengl",
+            "qt5qml",
+            "qt5quick",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kfourinline": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kfourinline-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kfourinline-15.04.2.tar.xz",
+            "name": "kfourinline-15.04.2.tar.xz",
+            "sha256": "1r53xqvgsvy1las85jccya2xxfk43bwzbzr6lp2vny1624g3vhdc"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5declarative",
+            "kf5dnssd",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemmodels",
+            "kf5itemviews",
+            "kf5kdegames",
+            "kf5kdelibs4support",
+            "kf5kio",
+            "kf5notifyconfig",
+            "kf5xmlgui",
+            "qt5",
+            "qt5qml",
+            "qt5quick",
+            "qt5quickwidgets",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "juk": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "juk-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/juk-15.04.2.tar.xz",
+            "name": "juk-15.04.2.tar.xz",
+            "sha256": "08lwi7yakry6cwrr0hxmrb9h2nm5xkx39bwfsphrd4vkyfd94awp"
+        },
+        "buildInputs": [
+            "kde4",
+            "taglib",
+            "tunepimp"
+        ]
+    },
+    "kde-l10n-id": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-id-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-id-15.04.2.tar.xz",
+            "name": "kde-l10n-id-15.04.2.tar.xz",
+            "sha256": "1vadznjjy32brc76d2wzq31xf69dq2fxipg8rhvjh2f8cy068blf"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kde-wallpapers": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-wallpapers-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-wallpapers-15.04.2.tar.xz",
+            "name": "kde-wallpapers-15.04.2.tar.xz",
+            "sha256": "1qcj8qdryqsqv430bmzv0hir7gbqbfw9sc3x7i4692h8cwvzkw5d"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "libkipi": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "libkipi-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/libkipi-15.04.2.tar.xz",
+            "name": "libkipi-15.04.2.tar.xz",
+            "sha256": "1fn671kjmin20bgi6h34fvcn3811ms34i9xbpxc3vv2s4sgn2v72"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "artikulate": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "artikulate-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/artikulate-15.04.2.tar.xz",
+            "name": "artikulate-15.04.2.tar.xz",
+            "sha256": "1hi57rl5ibs28l5w3gwciv9yi9gw7q22say8w5b34b5kjw0cyg2v"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdeclarative",
+            "qtgstreamer"
+        ]
+    },
+    "kde-l10n-it": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-it-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-it-15.04.2.tar.xz",
+            "name": "kde-l10n-it-15.04.2.tar.xz",
+            "sha256": "156j8dj9c44j6mbqka3d0rpkdp2wg5hj7l1kzd2lb0ybvk7vr0r0"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kde-l10n-da": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-da-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-da-15.04.2.tar.xz",
+            "name": "kde-l10n-da-15.04.2.tar.xz",
+            "sha256": "1np194cir3wh9sm8pqr4s3sx3k8p4rdndvpx7vgw63jlazrw4rlj"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kde-l10n-km": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-km-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-km-15.04.2.tar.xz",
+            "name": "kde-l10n-km-15.04.2.tar.xz",
+            "sha256": "1bs10bgnzqwj9adq6xl1y534br74hcvickf2ylw27wqgszwzvd18"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kde-l10n-ca_valencia": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-ca_valencia-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ca@valencia-15.04.2.tar.xz",
+            "name": "kde-l10n-ca_valencia-15.04.2.tar.xz",
+            "sha256": "0cg2is4lzy9fxz37ciy3ddjd5z1i2ni8gg5pq7v7hz7fqa8bb3w6"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kde-l10n-wa": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-wa-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-wa-15.04.2.tar.xz",
+            "name": "kde-l10n-wa-15.04.2.tar.xz",
+            "sha256": "10vzzwhgnxx5rj7h99b63kgpak2mkmdjr7381w7q1iwq816qxxy8"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "libkomparediff2": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "libkomparediff2-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/libkomparediff2-15.04.2.tar.xz",
+            "name": "libkomparediff2-15.04.2.tar.xz",
+            "sha256": "0qj9ih96v3r2l9nq68z4y175nhizl8rmd4nypswy5lzi7k8m9q99"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5codecs",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5kio",
+            "kf5parts",
+            "kf5xmlgui",
+            "qt5core",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kwalletmanager": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kwalletmanager-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kwalletmanager-15.04.2.tar.xz",
+            "name": "kwalletmanager-15.04.2.tar.xz",
+            "sha256": "0wch3bm2c7xjbrjvn1ka3iyawi6h6snfab7dzp6na8n4ck7y9s4p"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "ktp-auth-handler": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktp-auth-handler-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ktp-auth-handler-15.04.2.tar.xz",
+            "name": "ktp-auth-handler-15.04.2.tar.xz",
+            "sha256": "1fp1yks0k2mfn9kqfsy5y27ibpfjvmlx4h1ah6sy5mmqvh96s04h"
+        },
+        "buildInputs": [
+            "accountsqt5",
+            "ecm",
+            "kaccounts",
+            "kf5",
+            "kf5i18n",
+            "kf5kio",
+            "kf5wallet",
+            "kf5webkit",
+            "kf5widgetsaddons",
+            "ktp",
+            "qca-qt5",
+            "qca-qt5-ossl",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5gui",
+            "qt5network",
+            "signonqt5",
+            "telepathyqt5"
+        ]
+    },
+    "kde-l10n-ga": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-ga-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ga-15.04.2.tar.xz",
+            "name": "kde-l10n-ga-15.04.2.tar.xz",
+            "sha256": "0wn2q9vbaqkhb60q7x70b2j3yh8k21y4isk5js2ardzz1gpzmrxk"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "ksnapshot": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ksnapshot-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ksnapshot-15.04.2.tar.xz",
+            "name": "ksnapshot-15.04.2.tar.xz",
+            "sha256": "1zpc9pasw5r68rmkaz8la75hbp9na4114j7w0a9fcgjlvllaij57"
+        },
+        "buildInputs": [
+            "kde4",
+            "kipi"
+        ]
+    },
+    "kreversi": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kreversi-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kreversi-15.04.2.tar.xz",
+            "name": "kreversi-15.04.2.tar.xz",
+            "sha256": "0qzwk8yj5dk01n6w1jmrqncy48cpg2xriqqiachx4gh878f2y4cs"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdeclarative",
+            "kdegames"
+        ]
+    },
+    "kmix": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kmix-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kmix-15.04.2.tar.xz",
+            "name": "kmix-15.04.2.tar.xz",
+            "sha256": "0g601dmd7f0j70y50xkw4y8vpb5xgjz938m266sklkkwjdcf2fg9"
+        },
+        "buildInputs": [
+            "alsa",
+            "canberra",
+            "ecm",
+            "glib2",
+            "kde4",
+            "kf5",
+            "kf5configwidgets",
+            "kf5dbusaddons",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kcmutils",
+            "kf5kdelibs4support",
+            "kf5xmlgui",
+            "phonon",
+            "pulseaudio"
+        ]
+    },
+    "signon-kwallet-extension": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "signon-kwallet-extension-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/signon-kwallet-extension-15.04.2.tar.xz",
+            "name": "signon-kwallet-extension-15.04.2.tar.xz",
+            "sha256": "0bp1j0hc0a7lwmzi97hymd83vb5x8ks4m4a1k3h2h86wq3gnnfyj"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5wallet",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5test",
+            "signonextension"
+        ]
+    },
+    "kde-l10n-es": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-es-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-es-15.04.2.tar.xz",
+            "name": "kde-l10n-es-15.04.2.tar.xz",
+            "sha256": "1clrjb4wgwx8ijykrdylfgscwimkawpaq13a32m6dka4ipk58399"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kompare": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kompare-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kompare-15.04.2.tar.xz",
+            "name": "kompare-15.04.2.tar.xz",
+            "sha256": "0c3kyfqz6mp4mj0ryhjgqwp2x93bj0nsbgp2vf9rgvkcdvhd6fqk"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5codecs",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5iconthemes",
+            "kf5jobwidgets",
+            "kf5parts",
+            "kf5texteditor",
+            "kf5widgetsaddons",
+            "libkomparediff2",
+            "qt5",
+            "qt5core",
+            "qt5printsupport",
+            "qt5widgets"
+        ]
+    },
+    "kdiamond": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdiamond-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdiamond-15.04.2.tar.xz",
+            "name": "kdiamond-15.04.2.tar.xz",
+            "sha256": "1k0w2d0ysvwhvmsn0smi1s5dwrcwdnqfzny5dgblc3p62xw1wm1j"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kdegames",
+            "kf5notifyconfig",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5widgets"
+        ]
+    },
+    "kaccounts-integration": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "accountsqt5",
+            "kf5coreaddons",
+            "qt5widgets",
+            "signonqt5"
+        ],
+        "name": "kaccounts-integration-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kaccounts-integration-15.04.2.tar.xz",
+            "name": "kaccounts-integration-15.04.2.tar.xz",
+            "sha256": "1586bv0h98rqbigrcsqx51nvzxk0zzxvqcxgncnjxknn4rhdkk86"
+        },
+        "buildInputs": [
+            "accountsqt5",
+            "ecm",
+            "kf5",
+            "kf5akonadi",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kcmutils",
+            "kf5kio",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5core",
+            "qt5test",
+            "qt5widgets",
+            "signonqt5"
+        ]
+    },
+    "kde-l10n-gl": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-gl-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-gl-15.04.2.tar.xz",
+            "name": "kde-l10n-gl-15.04.2.tar.xz",
+            "sha256": "1mnyc9ms863s3x6l85kfglz7q8h9faqgkv7vcf8qfjs1vs6qbh6x"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kwordquiz": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kwordquiz-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kwordquiz-15.04.2.tar.xz",
+            "name": "kwordquiz-15.04.2.tar.xz",
+            "sha256": "0irs4nchd0fwxvv4c9wxww6vbi97ffz4rihwg1p5jipcad2l13ch"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5crash",
+            "kf5declarative",
+            "kf5doctools",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kdelibs4support",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5notifications",
+            "kf5notifyconfig",
+            "kf5sonnet",
+            "kf5xmlgui",
+            "libkeduvocdocument",
+            "phonon4qt5",
+            "qt5",
+            "qt5core",
+            "qt5printsupport",
+            "qt5widgets"
+        ]
+    },
+    "kigo": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kigo-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kigo-15.04.2.tar.xz",
+            "name": "kigo-15.04.2.tar.xz",
+            "sha256": "00hhdhv905l1y79i2vsz65r7vqbz2vlzl57y4sdcjpk65ababcrc"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdegames"
+        ]
+    },
+    "ktp-desktop-applets": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktp-desktop-applets-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ktp-desktop-applets-15.04.2.tar.xz",
+            "name": "ktp-desktop-applets-15.04.2.tar.xz",
+            "sha256": "00jlhfm7sbg73y9zbkjicz7wr8740qi3ifm493m2f37cndljllhn"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5plasma",
+            "kf5windowsystem",
+            "qt5",
+            "qt5qml"
+        ]
+    },
+    "kolourpaint": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kolourpaint-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kolourpaint-15.04.2.tar.xz",
+            "name": "kolourpaint-15.04.2.tar.xz",
+            "sha256": "04rly3wrh8hibaps90mphvbb35d9c308czfmnhqxyk6np4bfvrk6"
+        },
+        "buildInputs": [
+            "kde4",
+            "qimageblitz"
+        ]
+    },
+    "kapptemplate": {
+        "nativeBuildInputs": [
+            "cmake",
+            "rbkconfig_compiler4",
+            "rbuic4",
+            "xsltproc_executable"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kapptemplate-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kapptemplate-15.04.2.tar.xz",
+            "name": "kapptemplate-15.04.2.tar.xz",
+            "sha256": "092wysas8zfhz8af4fvizbn148c4jhj4vk2cy6z94qih8hnry294"
+        },
+        "buildInputs": [
+            "ecm",
+            "kde4",
+            "kdepimlibs",
+            "kf5",
+            "kf5archive",
+            "kf5completion",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5kio",
+            "kf5plasma",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5gui",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kdegraphics-thumbnailers": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdegraphics-thumbnailers-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdegraphics-thumbnailers-15.04.2.tar.xz",
+            "name": "kdegraphics-thumbnailers-15.04.2.tar.xz",
+            "sha256": "15w0bli83ykqdxv37zpmdgf66gkqmb3gf1wxqfhw241pfcqbsxc3"
+        },
+        "buildInputs": [
+            "kdcraw",
+            "kde4",
+            "kexiv2"
+        ]
+    },
+    "kde-l10n-pt_BR": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-pt_BR-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-pt_BR-15.04.2.tar.xz",
+            "name": "kde-l10n-pt_BR-15.04.2.tar.xz",
+            "sha256": "0xfcid4xqcjnlq83ql4rlhb8swn2y9ixzfyx3zbdwjjlkaaqmnr4"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "ksystemlog": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ksystemlog-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ksystemlog-15.04.2.tar.xz",
+            "name": "ksystemlog-15.04.2.tar.xz",
+            "sha256": "00il9r3n5756n0n6k515fdm9z7mfa1gd1n6kac4vr7yldvll9wh1"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "kuser": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kuser-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kuser-15.04.2.tar.xz",
+            "name": "kuser-15.04.2.tar.xz",
+            "sha256": "0b2q616nzqjb0q9as71x2njdjlcd3576rkwnyv5acjgb5bq7wgg4"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdepimlibs"
+        ]
+    },
+    "libksane": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "libksane-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/libksane-15.04.2.tar.xz",
+            "name": "libksane-15.04.2.tar.xz",
+            "sha256": "0s2jmp1596qnjff2fqmlmg3qzfhf2wjfvazkrrndfr6dzn4sz72s"
+        },
+        "buildInputs": []
+    },
+    "knavalbattle": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "knavalbattle-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/knavalbattle-15.04.2.tar.xz",
+            "name": "knavalbattle-15.04.2.tar.xz",
+            "sha256": "15pmbj230rhiyxx2cz1wsx29zp0p4my54i8099yv943w8wswwy8x"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdegames"
+        ]
+    },
+    "kaccessible": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kaccessible-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kaccessible-15.04.2.tar.xz",
+            "name": "kaccessible-15.04.2.tar.xz",
+            "sha256": "1aa4c5r0bm0azm8dhkvnrk87669vp397xzz0v0d3ih7ffmh72il1"
+        },
+        "buildInputs": [
+            "kde4",
+            "qt4",
+            "speechd",
+            "x11"
+        ]
+    },
+    "knetwalk": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "knetwalk-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/knetwalk-15.04.2.tar.xz",
+            "name": "knetwalk-15.04.2.tar.xz",
+            "sha256": "0j2zkh87wd2xhd0aaad40cjq1na4kg18y0bnpiqdgwgmvvss18cn"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kdegames",
+            "kf5kio",
+            "kf5notifyconfig",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5qml",
+            "qt5quick",
+            "qt5quickwidgets",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kdewebdev": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdewebdev-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdewebdev-15.04.2.tar.xz",
+            "name": "kdewebdev-15.04.2.tar.xz",
+            "sha256": "0cq2zyi4j6z70ghy8x1hhi3bgph6ql2k71vllfc37gb5h8gqpfh4"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdepimlibs",
+            "libtidy",
+            "ruby",
+            "zlib"
+        ]
+    },
+    "kget": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kget-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kget-15.04.2.tar.xz",
+            "name": "kget-15.04.2.tar.xz",
+            "sha256": "0cc7rva5yig01kfih1im0ncf0jk7hq1pwyqr9486n024161fc1n0"
+        },
+        "buildInputs": [
+            "boost",
+            "kde4",
+            "kde4workspace",
+            "ktorrent",
+            "libmms",
+            "nepomukcore",
+            "nepomukwidgets",
+            "qca2",
+            "qgpgme",
+            "shareddesktopontologies",
+            "soprano",
+            "sqlite"
+        ]
+    },
+    "kalzium": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kalzium-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kalzium-15.04.2.tar.xz",
+            "name": "kalzium-15.04.2.tar.xz",
+            "sha256": "1mcfw1l0qqzr212ysgppva8s4dn3dfhzqh712fc3kd416azz985x"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdewin32"
+        ]
+    },
+    "marble": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "marble-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/marble-15.04.2.tar.xz",
+            "name": "marble-15.04.2.tar.xz",
+            "sha256": "1jwh0vqdzj7r039pg84rh6jk4dznyanirv286v8anf23s3mjwf6a"
+        },
+        "buildInputs": [
+            "kde4",
+            "libgps",
+            "liblocation",
+            "libshp",
+            "libwlocate",
+            "perl",
+            "phonon",
+            "protobuf",
+            "pyqt4",
+            "pythonlibrary",
+            "qextserialport",
+            "qt4",
+            "qt5concurrent",
+            "qt5core",
+            "qt5designer",
+            "qt5network",
+            "qt5printsupport",
+            "qt5quick",
+            "qt5script",
+            "qt5sql",
+            "qt5svg",
+            "qt5test",
+            "qt5webkitwidgets",
+            "qt5widgets",
+            "qt5xml",
+            "qtlocation",
+            "quazip",
+            "sharedmimeinfo",
+            "sip",
+            "zlib"
+        ]
+    },
+    "kig": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kig-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kig-15.04.2.tar.xz",
+            "name": "kig-15.04.2.tar.xz",
+            "sha256": "19wv15ji7f0m0zzymw11g28sa5n1kyhpnqbcgpfkaqxynv2fn4cv"
+        },
+        "buildInputs": [
+            "boostpython",
+            "ecm",
+            "kf5archive",
+            "kf5configwidgets",
+            "kf5doctools",
+            "kf5emoticons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemmodels",
+            "kf5kdelibs4support",
+            "kf5parts",
+            "kf5texteditor",
+            "kf5xmlgui",
+            "qt5printsupport",
+            "qt5svg",
+            "qt5test"
+        ]
+    },
+    "kiten": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kiten-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kiten-15.04.2.tar.xz",
+            "name": "kiten-15.04.2.tar.xz",
+            "sha256": "0yr7i1k3qpifwy2a58b899nfglkyf8gdrbakhdd9j2rlyyk3hya3"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5archive",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5khtml",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5widgets"
+        ]
+    },
+    "ktp-contact-list": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktp-contact-list-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ktp-contact-list-15.04.2.tar.xz",
+            "name": "ktp-contact-list-15.04.2.tar.xz",
+            "sha256": "10zjv2imp03p2wh9vj217skx5fmmscb5l8nwlcv7mlh0b74mlx5n"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5dbusaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kcmutils",
+            "kf5kio",
+            "kf5notifications",
+            "kf5notifyconfig",
+            "kf5people",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "ktp",
+            "qt5",
+            "qt5widgets",
+            "qt5xml",
+            "telepathyqt5"
+        ]
+    },
+    "kde-l10n-pt": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-pt-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-pt-15.04.2.tar.xz",
+            "name": "kde-l10n-pt-15.04.2.tar.xz",
+            "sha256": "0bkdm2skvkaqspfq7rsqwahm6h17j46fd97wkqrkmdswgnbn14fw"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kde-l10n-fr": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-fr-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-fr-15.04.2.tar.xz",
+            "name": "kde-l10n-fr-15.04.2.tar.xz",
+            "sha256": "1rgy0qw313wk39f8lxb812kfh7i0b3fqgdz1dv22mpd143ywz0xr"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kmouth": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kmouth-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kmouth-15.04.2.tar.xz",
+            "name": "kmouth-15.04.2.tar.xz",
+            "sha256": "1hjn1fb5c7a5yw0yzsb7v3wdgq1wyqj7zs7jw71gsgkq3sy0as47"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "filelight": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "filelight-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/filelight-15.04.2.tar.xz",
+            "name": "filelight-15.04.2.tar.xz",
+            "sha256": "0ynrirvrisswaia9894wd4b6f97h04bd3w9zlv28nc9ck1p2d5zv"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5kio",
+            "kf5parts",
+            "kf5solid",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5script",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kdesdk-kioslaves": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdesdk-kioslaves-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdesdk-kioslaves-15.04.2.tar.xz",
+            "name": "kdesdk-kioslaves-15.04.2.tar.xz",
+            "sha256": "0fpmn0cv95jicxq6zbxivarlyhmjbi3a2brnz9xb4jznx06c2cz8"
+        },
+        "buildInputs": [
+            "kde4",
+            "perl",
+            "svn"
+        ]
+    },
+    "kde-baseapps": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-baseapps-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-baseapps-15.04.2.tar.xz",
+            "name": "kde-baseapps-15.04.2.tar.xz",
+            "sha256": "0yqg1z6c9ma8cfhpb21jgk5hcpg0dscm89sy5jxwflg1n355jkhv"
+        },
+        "buildInputs": [
+            "baloo",
+            "baloowidgets",
+            "glib2",
+            "kactivities",
+            "kde4",
+            "kfilemetadata",
+            "libtidy",
+            "x11",
+            "zlib"
+        ]
+    },
+    "ksirk": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ksirk-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ksirk-15.04.2.tar.xz",
+            "name": "ksirk-15.04.2.tar.xz",
+            "sha256": "0w6j3z8vzj3wnnwkpm2gv533jkjwdx8f2m6hnqa3ckzashmlqx7w"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdegames",
+            "qca2"
+        ]
+    },
+    "killbots": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "killbots-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/killbots-15.04.2.tar.xz",
+            "name": "killbots-15.04.2.tar.xz",
+            "sha256": "1xr7857fi5l5h6d6fsyqsb803h29gprfsxz4h73scnnn70bkkm9q"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kdegames",
+            "kf5kio",
+            "kf5notifyconfig",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kjumpingcube": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kjumpingcube-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kjumpingcube-15.04.2.tar.xz",
+            "name": "kjumpingcube-15.04.2.tar.xz",
+            "sha256": "04c0klbgsnp6brf8zml8sz6iyi9m7gidwpgdzrrnnhzwfpgaf9zc"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5i18n",
+            "kf5itemmodels",
+            "kf5kdegames",
+            "kf5kdelibs4support",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5notifyconfig",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "phonon4qt5",
+            "qt5",
+            "qt5qml",
+            "qt5quick",
+            "qt5quickwidgets",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kde-l10n-sr": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-sr-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-sr-15.04.2.tar.xz",
+            "name": "kde-l10n-sr-15.04.2.tar.xz",
+            "sha256": "1pwwvj7s6ivmx6c5gh6dvfrvi5xp66b40fsnn04zwsp0iamxkdqi"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kde-l10n-et": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-et-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-et-15.04.2.tar.xz",
+            "name": "kde-l10n-et-15.04.2.tar.xz",
+            "sha256": "1w08blhf6adlj0yanfac2b3kk0ag3gbazjdywz9cf21ks6ni6bsn"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kmag": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kmag-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kmag-15.04.2.tar.xz",
+            "name": "kmag-15.04.2.tar.xz",
+            "sha256": "1kbxhq9mfjxswds60pa6v1ixc8grn0m1f84da7s18ph5r1wdpkr3"
+        },
+        "buildInputs": [
+            "kde4",
+            "qaccessibilityclient"
+        ]
+    },
+    "kdenetwork-strigi-analyzers": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdenetwork-strigi-analyzers-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdenetwork-strigi-analyzers-15.04.2.tar.xz",
+            "name": "kdenetwork-strigi-analyzers-15.04.2.tar.xz",
+            "sha256": "13bc2a1m64k6iki12kpynf3f1wijxch8rg9nn7xc8rl3bjms8x9k"
+        },
+        "buildInputs": [
+            "boost",
+            "kde4",
+            "strigi"
+        ]
+    },
+    "kcharselect": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kcharselect-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kcharselect-15.04.2.tar.xz",
+            "name": "kcharselect-15.04.2.tar.xz",
+            "sha256": "084qzv8x6262xsl5n4ynkm3zsqf2wdlj5gn4y9jql7in1b92w293"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5widgets"
+        ]
+    },
+    "kdegraphics-strigi-analyzer": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdegraphics-strigi-analyzer-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdegraphics-strigi-analyzer-15.04.2.tar.xz",
+            "name": "kdegraphics-strigi-analyzer-15.04.2.tar.xz",
+            "sha256": "1gf6n1bdhbizfgpbn1p81gzz09a028dadij7gn016vkfczjkl1k8"
+        },
+        "buildInputs": [
+            "kde4",
+            "openexr",
+            "strigi",
+            "tiff"
+        ]
+    },
+    "libkmahjongg": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5configwidgets",
+            "qt5gui"
+        ],
+        "name": "libkmahjongg-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/libkmahjongg-15.04.2.tar.xz",
+            "name": "libkmahjongg-15.04.2.tar.xz",
+            "sha256": "1xrdv1p5gjzg4cs35y2kmd49lwiinl1wqaw76y5lq3p303k7vvm1"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5core",
+            "qt5gui",
+            "qt5svg",
+            "qt5test"
+        ]
+    },
+    "ktp-kded-module": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktp-kded-module-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ktp-kded-module-15.04.2.tar.xz",
+            "name": "ktp-kded-module-15.04.2.tar.xz",
+            "sha256": "1a7jfa8lqb24dpckiix13lhdgb18rv4v9ib908jqqqnk8rphac5n"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5dbusaddons",
+            "kf5i18n",
+            "kf5idletime",
+            "kf5kcmutils",
+            "kf5kio",
+            "kf5notifications",
+            "kf5widgetsaddons",
+            "ktp",
+            "qt5",
+            "qt5concurrent",
+            "qt5network",
+            "qt5sql",
+            "qt5widgets"
+        ]
+    },
+    "ktuberling": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktuberling-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ktuberling-15.04.2.tar.xz",
+            "name": "ktuberling-15.04.2.tar.xz",
+            "sha256": "1kf2gwxwh0v9lai5lwbgd9d8d27d9p6vxj6i4291w5wv9plld9my"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdegames"
+        ]
+    },
+    "kcron": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kcron-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kcron-15.04.2.tar.xz",
+            "name": "kcron-15.04.2.tar.xz",
+            "sha256": "0fszrwgsib82glm0hi2iq11b8z3w8j14vp8hqfxp8ccggk1a0xaf"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5printsupport",
+            "qt5widgets"
+        ]
+    },
+    "kde-l10n-nl": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-nl-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-nl-15.04.2.tar.xz",
+            "name": "kde-l10n-nl-15.04.2.tar.xz",
+            "sha256": "0l4frxfrpii14iisjnnpzz0yja6mb6qlz05v1wn6sqqqvv8snq17"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "parley": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "parley-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/parley-15.04.2.tar.xz",
+            "name": "parley-15.04.2.tar.xz",
+            "sha256": "1xzjpm8vfxp7g5497n95r3x4pbs6s29jaf6rlkb3lm72x7yml7fc"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5docbook",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5kcmutils",
+            "kf5khtml",
+            "kf5kio",
+            "kf5kross",
+            "kf5module",
+            "kf5newstuff",
+            "kf5notifications",
+            "kf5produce",
+            "kf5sonnet",
+            "kf5the",
+            "kf5xmlgui",
+            "libattica",
+            "libkeduvocdocument",
+            "libxml2",
+            "libxslt",
+            "qt5",
+            "qt5concurrent",
+            "qt5core",
+            "qt5multimedia",
+            "qt5svg",
+            "qt5test"
+        ]
+    },
+    "kgoldrunner": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kgoldrunner-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kgoldrunner-15.04.2.tar.xz",
+            "name": "kgoldrunner-15.04.2.tar.xz",
+            "sha256": "1x5pza747k69wx54fiparqx43pk112cma2pq6c4ndycrm5lqxg5v"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdegames"
+        ]
+    },
+    "kiriki": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kiriki-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kiriki-15.04.2.tar.xz",
+            "name": "kiriki-15.04.2.tar.xz",
+            "sha256": "0sdpswz6gvk03sza5n7n9kf6xi0p7azkgkn27hn0ydh5fm7rfi98"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdegames"
+        ]
+    },
+    "sweeper": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "sweeper-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/sweeper-15.04.2.tar.xz",
+            "name": "sweeper-15.04.2.tar.xz",
+            "sha256": "0nyl587zrmz4aynbp7g7415gczilmb02h79s4xpfxilmxc9910w3"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "lokalize": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "lokalize-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/lokalize-15.04.2.tar.xz",
+            "name": "lokalize-15.04.2.tar.xz",
+            "sha256": "1hj36k0arfqbyyxccbk6n9skc38a7g6vs3l4r0pdz40b4s65l4hz"
+        },
+        "buildInputs": [
+            "ecm",
+            "hunspell",
+            "kf5",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5kio",
+            "kf5kross",
+            "kf5notifications",
+            "kf5sonnet",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5script",
+            "qt5sql",
+            "qt5widgets"
+        ]
+    },
+    "kbounce": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kbounce-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kbounce-15.04.2.tar.xz",
+            "name": "kbounce-15.04.2.tar.xz",
+            "sha256": "094cwq972h36mznl9snc52248vag1myxlndykagv13kdj7jwynx8"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kdegames",
+            "kf5kio",
+            "kf5notifyconfig",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "phonon4qt5",
+            "qt5",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kde-l10n-eo": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-eo-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-eo-15.04.2.tar.xz",
+            "name": "kde-l10n-eo-15.04.2.tar.xz",
+            "sha256": "020zq1ygjkpx5y2isqqp3chk0s1jcd29zy6fwr6jyxvj0260fa8q"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kde-l10n-is": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-is-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-is-15.04.2.tar.xz",
+            "name": "kde-l10n-is-15.04.2.tar.xz",
+            "sha256": "0xf361dsvlg525w10y1p638ksrb5x381sw322rs14dlpqn89ywl0"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kde-l10n-sl": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-sl-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-sl-15.04.2.tar.xz",
+            "name": "kde-l10n-sl-15.04.2.tar.xz",
+            "sha256": "03chmprkais0cq3z4j9xzy3lq91imf3q4mcaccpknla247a8viqf"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "libkcompactdisc": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "libkcompactdisc-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/libkcompactdisc-15.04.2.tar.xz",
+            "name": "libkcompactdisc-15.04.2.tar.xz",
+            "sha256": "14qryxim0fhx7npbicv1pvkr42544jzplfmng7z2cjxx4c636j9v"
+        },
+        "buildInputs": [
+            "alsa",
+            "kde4"
+        ]
+    },
+    "picmi": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "picmi-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/picmi-15.04.2.tar.xz",
+            "name": "picmi-15.04.2.tar.xz",
+            "sha256": "06dz8552rfydirvmnibvpw0ahg4f2za82qkv2j2crfqm2iigp9rv"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdegames",
+            "qt4"
+        ]
+    },
+    "superkaramba": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "superkaramba-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/superkaramba-15.04.2.tar.xz",
+            "name": "superkaramba-15.04.2.tar.xz",
+            "sha256": "1x8kxj2ndpnpfbxk33rqyq64y1chlll8j3331skzss9117fsp7z1"
+        },
+        "buildInputs": [
+            "kde4",
+            "pythonlibs",
+            "qimageblitz"
+        ]
+    },
+    "gwenview": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "gwenview-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/gwenview-15.04.2.tar.xz",
+            "name": "gwenview-15.04.2.tar.xz",
+            "sha256": "1c1fqwgq91s0c9f85g3i3dwaq16r260jj4wx4xcr3qi4bm12lq5k"
+        },
+        "buildInputs": [
+            "ecm",
+            "exiv2",
+            "jpeg",
+            "kf5",
+            "kf5activities",
+            "kf5baloo",
+            "kf5kdcraw",
+            "kf5kdelibs4support",
+            "kf5kio",
+            "kf5kipi",
+            "lcms2",
+            "phonon4qt5",
+            "png",
+            "qt5",
+            "qt5concurrent",
+            "qt5core",
+            "qt5dbus",
+            "qt5opengl",
+            "qt5script",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "kde-l10n-fa": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-fa-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-fa-15.04.2.tar.xz",
+            "name": "kde-l10n-fa-15.04.2.tar.xz",
+            "sha256": "0kb7lxvgbdwlyi1rli7xrk4ykdnljdcm0clkgl1bla6vgxhlc7mj"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kpat": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kpat-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kpat-15.04.2.tar.xz",
+            "name": "kpat-15.04.2.tar.xz",
+            "sha256": "0vhrq3ssfqwpkrx355v91gg1kdl8sjfpkp4fqyi9h36nps7qdiqj"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5declarative",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kdegames",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5notifyconfig",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "phonon4qt5",
+            "qt5",
+            "qt5qml",
+            "qt5quick",
+            "qt5quickwidgets",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "sharedmimeinfo"
+        ]
+    },
+    "klettres": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "klettres-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/klettres-15.04.2.tar.xz",
+            "name": "klettres-15.04.2.tar.xz",
+            "sha256": "1rmf5hpc9zwaham157xzn3dvh0z6scpr2i38i513b0ji0kdizikc"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5completion",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5emoticons",
+            "kf5i18n",
+            "kf5itemmodels",
+            "kf5kdelibs4support",
+            "kf5newstuff",
+            "kf5widgetsaddons",
+            "phonon4qt5",
+            "qt5",
+            "qt5core",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kdelibs": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdelibs-4.14.9",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdelibs-4.14.9.tar.xz",
+            "name": "kdelibs-4.14.9.tar.xz",
+            "sha256": "07klv3hxgq1w85lx2myw131r4v3fd726fljipkd7arwzp8mbwcix"
+        },
+        "buildInputs": [
+            "acl",
+            "agg",
+            "aspell",
+            "automoc4",
+            "avahi",
+            "bison",
+            "blitz",
+            "bluez",
+            "bzip2",
+            "carbon",
+            "dbusmenuqt",
+            "dnssd",
+            "docbookxml",
+            "docbookxsl",
+            "eigen2",
+            "enchant",
+            "fam",
+            "ffmpeg",
+            "flac",
+            "flex",
+            "gif",
+            "gobject",
+            "grantlee",
+            "gssapi",
+            "gstreamer",
+            "hspell",
+            "hunspell",
+            "hupnp",
+            "iokit",
+            "jasper",
+            "jpeg",
+            "kde4",
+            "kde4internal",
+            "lcms",
+            "libart",
+            "libattica",
+            "libintl",
+            "libxml2",
+            "libxslt",
+            "openexr",
+            "openssl",
+            "pcre",
+            "perl",
+            "png",
+            "qca2",
+            "qimageblitz",
+            "qt4",
+            "shareddesktopontologies",
+            "sharedmimeinfo",
+            "soprano",
+            "sqlite",
+            "strigi",
+            "udev",
+            "usb",
+            "xine",
+            "xmms",
+            "zlib"
+        ]
+    },
+    "katomic": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "katomic-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/katomic-15.04.2.tar.xz",
+            "name": "katomic-15.04.2.tar.xz",
+            "sha256": "1gpg01ngqmfkiwzfcx686x2yzd4sjlp5xkdrgdwy20czl1i6rras"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kdegames",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5notifyconfig",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5widgets"
+        ]
+    },
+    "kollision": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kollision-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kollision-15.04.2.tar.xz",
+            "name": "kollision-15.04.2.tar.xz",
+            "sha256": "0jqjg6dr2ff5qb5f23kfd017m1lm7h2rim6q8dkbxk4xm92f5kqi"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5i18n",
+            "kf5kdegames",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5notifyconfig",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "phonon4qt5",
+            "qt5",
+            "qt5qml",
+            "qt5quick",
+            "qt5quickwidgets",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "klines": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "klines-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/klines-15.04.2.tar.xz",
+            "name": "klines-15.04.2.tar.xz",
+            "sha256": "11ksr0khyj29bbzcavpxm4kc109m2g2gbhi4qhsyanfj8a0811az"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kdegames",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5service",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5qml",
+            "qt5quick",
+            "qt5quickwidgets",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kde-l10n-ru": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-ru-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ru-15.04.2.tar.xz",
+            "name": "kde-l10n-ru-15.04.2.tar.xz",
+            "sha256": "155mbg25anmdy6vgz3fsn4p8m7c8syfwiy70jsgqv9751dvkajlk"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kcalc": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kcalc-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kcalc-15.04.2.tar.xz",
+            "name": "kcalc-15.04.2.tar.xz",
+            "sha256": "0sk431vrz8xc12fc6qfdlxcnkr5yl729pk450pj90xm6x0jj24lp"
+        },
+        "buildInputs": [
+            "ecm",
+            "gmp",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5doctools",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5init",
+            "kf5notifications",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5widgets"
+        ]
+    },
+    "kde-l10n-mr": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-mr-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-mr-15.04.2.tar.xz",
+            "name": "kde-l10n-mr-15.04.2.tar.xz",
+            "sha256": "1clmi1vflqi63kihv9ljkbns4r0v7yb65zkdv642kdcfmwz9kgw8"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "lskat": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "lskat-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/lskat-15.04.2.tar.xz",
+            "name": "lskat-15.04.2.tar.xz",
+            "sha256": "1ydmglbihijpsgq29nz3sg3g8sja9nzqd7czpg8z8zy9gylh6cl4"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdegames"
+        ]
+    },
+    "kcolorchooser": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kcolorchooser-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kcolorchooser-15.04.2.tar.xz",
+            "name": "kcolorchooser-15.04.2.tar.xz",
+            "sha256": "1hypa5q9vfk3imc6fng7li3jkh51phsk2cq1sjri1czl547ij38h"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "kde-l10n-kk": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-kk-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-kk-15.04.2.tar.xz",
+            "name": "kde-l10n-kk-15.04.2.tar.xz",
+            "sha256": "0xgncx5xbhnzxzpzaawvj9d19s8zzdrc76qa986xf37zahjv7v1r"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kblocks": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kblocks-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kblocks-15.04.2.tar.xz",
+            "name": "kblocks-15.04.2.tar.xz",
+            "sha256": "1bpvw5sghg7qiqs97p0xn7b23jgmzk590kmdjcwigfz788ac4ylv"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5i18n",
+            "kf5itemmodels",
+            "kf5kdegames",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5notifyconfig",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "phonon4qt5",
+            "qt5",
+            "qt5qml",
+            "qt5quick",
+            "qt5quickwidgets",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kde-l10n-lt": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-lt-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-lt-15.04.2.tar.xz",
+            "name": "kde-l10n-lt-15.04.2.tar.xz",
+            "sha256": "03vwx16wwihq0qlzs8w1rdlld0951x0yr9w36bvjsrl985n500ip"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kde-l10n-cs": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-cs-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-cs-15.04.2.tar.xz",
+            "name": "kde-l10n-cs-15.04.2.tar.xz",
+            "sha256": "0ks75clbhywql9pgchxi5phc50n9qama5v4crngwkxfbs2lhp05d"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kblackbox": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kblackbox-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kblackbox-15.04.2.tar.xz",
+            "name": "kblackbox-15.04.2.tar.xz",
+            "sha256": "1ib9a9pp9mdp2kbz2gb4lnrlf66v7170y4qrg24vmvpsa7csgmx3"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kdegames",
+            "kf5xmlgui",
+            "qt5",
+            "qt5svg",
+            "qt5widgets"
+        ]
+    },
+    "libkdeedu": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "libkdeedu-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/libkdeedu-15.04.2.tar.xz",
+            "name": "libkdeedu-15.04.2.tar.xz",
+            "sha256": "1pvipdv3zhqpnmz4x68jdfml2hjamlb591r9qcibw1pzgx7bz77q"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "amor": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "amor-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/amor-15.04.2.tar.xz",
+            "name": "amor-15.04.2.tar.xz",
+            "sha256": "1kbdarrf2jxr5f458m28fg19g29xpj5n7fb9w2311052xaywf0rr"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "kde-l10n-eu": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-eu-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-eu-15.04.2.tar.xz",
+            "name": "kde-l10n-eu-15.04.2.tar.xz",
+            "sha256": "18bry21g828n0rvaq4510pj8fb4f49jn5yxvf1jm6qn3wcfg5qws"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kamera": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kamera-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kamera-15.04.2.tar.xz",
+            "name": "kamera-15.04.2.tar.xz",
+            "sha256": "01r16868mdmpfjwzz7wa1qykc6lif9yi7fp0zxyk5hy77wp4jwdy"
+        },
+        "buildInputs": [
+            "gphoto2",
+            "kde4"
+        ]
+    },
+    "pairs": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "pairs-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/pairs-15.04.2.tar.xz",
+            "name": "pairs-15.04.2.tar.xz",
+            "sha256": "11hbzh8nk38m1n61vcyzz1v6q1fpwyiv9l6s05mrsm4krny2bi4a"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "dragon": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "dragon-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/dragon-15.04.2.tar.xz",
+            "name": "dragon-15.04.2.tar.xz",
+            "sha256": "0kf692d3wsj32iry3dl148f4i04y9y26nc9v4skpwf5pvsgp2d5s"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "kmplot": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kmplot-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kmplot-15.04.2.tar.xz",
+            "name": "kmplot-15.04.2.tar.xz",
+            "sha256": "0p1qkhmdn7wqggk1z4c8mwbgrk7daxgfjg6yhhscaj13ikg2l4qc"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5kdelibs4support",
+            "kf5parts",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5core",
+            "qt5gui",
+            "qt5printsupport",
+            "qt5svg",
+            "qt5widgets"
+        ]
+    },
+    "kde-base-artwork": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-base-artwork-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-base-artwork-15.04.2.tar.xz",
+            "name": "kde-base-artwork-15.04.2.tar.xz",
+            "sha256": "0if4i3zag7hzgrf89bswfg7c95m066phjs89fk4ss45ak25rgddy"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "blinken": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "blinken-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/blinken-15.04.2.tar.xz",
+            "name": "blinken-15.04.2.tar.xz",
+            "sha256": "1k0idsbqnhmrlnsl8l45wkipb6hch1imrkxglxl1xw0pr0s7c8rg"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5dbusaddons",
+            "kf5doctools",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5xmlgui",
+            "phonon4qt5",
+            "qt5",
+            "qt5core",
+            "qt5svg",
+            "qt5widgets"
+        ]
+    },
+    "konquest": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "konquest-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/konquest-15.04.2.tar.xz",
+            "name": "konquest-15.04.2.tar.xz",
+            "sha256": "1w03w8nxkbz9ng2spa3pc5gmigajm7k8dcz2j1nly44a6g85rxnn"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdegames"
+        ]
+    },
+    "kde-l10n-he": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-he-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-he-15.04.2.tar.xz",
+            "name": "kde-l10n-he-15.04.2.tar.xz",
+            "sha256": "04kayv647nj3hrxl0863gks5z53v1ax9pafncm70ls79rzz95zsa"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "bovo": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "bovo-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/bovo-15.04.2.tar.xz",
+            "name": "bovo-15.04.2.tar.xz",
+            "sha256": "00w5d9mapy4f634ys1k45fhpa50h5299y9q6wann9phrmf8kj8y2"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5coreaddons",
+            "kf5declarative",
+            "kf5kdegames",
+            "kf5newstuff",
+            "kf5xmlgui",
+            "qt5",
+            "qt5concurrent",
+            "qt5qml",
+            "qt5quick",
+            "qt5quickwidgets",
+            "qt5svg",
+            "qt5widgets"
+        ]
+    },
+    "ktimer": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktimer-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ktimer-15.04.2.tar.xz",
+            "name": "ktimer-15.04.2.tar.xz",
+            "sha256": "19ah9r92i8r4059apvv1aj25hvkhq3dw9vmvi5r8sxrdbd3m0yw0"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5dbusaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5notifications",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5widgets"
+        ]
+    },
+    "kde-l10n-hu": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-hu-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-hu-15.04.2.tar.xz",
+            "name": "kde-l10n-hu-15.04.2.tar.xz",
+            "sha256": "1ilhnp6x3lahhc0rkhn2zv6g9ck8w7b9qaw8fgqkiz0n19hv564f"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kde-l10n-ro": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-ro-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ro-15.04.2.tar.xz",
+            "name": "kde-l10n-ro-15.04.2.tar.xz",
+            "sha256": "05pgpshvs08inygighi3ya0bl49238l96sgqql0377cm9cw2hj9l"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kde-l10n-sv": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-sv-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-sv-15.04.2.tar.xz",
+            "name": "kde-l10n-sv-15.04.2.tar.xz",
+            "sha256": "11mnbalw3lpdgv3bbhhh658cs34impi7gymhcw129il0jsc5yz53"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kgamma": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kgamma-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kgamma-15.04.2.tar.xz",
+            "name": "kgamma-15.04.2.tar.xz",
+            "sha256": "08ia2skz3w6zwzm9jlgiyrlxnn7mx83d78350plr5k6qrszn483l"
+        },
+        "buildInputs": [
+            "kde4",
+            "x11"
+        ]
+    },
+    "kanagram": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kanagram-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kanagram-15.04.2.tar.xz",
+            "name": "kanagram-15.04.2.tar.xz",
+            "sha256": "1zqjms2ai4bpfmbf136q94gbl59vjszlfsp8xi0pmpp138yii9a8"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5declarative",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5sonnet",
+            "libkeduvocdocument",
+            "qt5",
+            "qt5core",
+            "qt5opengl",
+            "qt5optional_components",
+            "qt5qml",
+            "qt5quick",
+            "qt5texttospeech"
+        ]
+    },
+    "kstars": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kstars-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kstars-15.04.2.tar.xz",
+            "name": "kstars-15.04.2.tar.xz",
+            "sha256": "01mzd0qbfjx6fzbaii6al6r62frygf9psi4av1227p3drwmnxrz6"
+        },
+        "buildInputs": [
+            "astrometrynet",
+            "cfitsio",
+            "ecm",
+            "eigen3",
+            "indi",
+            "kf5",
+            "kf5config",
+            "kf5dbusaddons",
+            "kf5doctools",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5init",
+            "kf5jobwidgets",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5plotting",
+            "kf5texteditor",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "opengl",
+            "qt5",
+            "qt5gui",
+            "qt5multimedia",
+            "qt5opengl",
+            "qt5printsupport",
+            "qt5qml",
+            "qt5quick",
+            "qt5sql",
+            "qt5svg",
+            "qt5test",
+            "qt5xml",
+            "wcslib",
+            "xplanet"
+        ]
+    },
+    "kdeartwork": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdeartwork-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdeartwork-15.04.2.tar.xz",
+            "name": "kdeartwork-15.04.2.tar.xz",
+            "sha256": "0dhm6n5x8pq4nl8f5gnr2cdgy3fjkqyhij9gdxqan5s7rhfq7j4n"
+        },
+        "buildInputs": [
+            "eigen3",
+            "kde4",
+            "kde4workspace",
+            "kexiv2",
+            "opengl",
+            "xscreensaver"
+        ]
+    },
+    "kfloppy": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kfloppy-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kfloppy-15.04.2.tar.xz",
+            "name": "kfloppy-15.04.2.tar.xz",
+            "sha256": "0r8cgmwa0b9r6dl5vslw4g03mm3qvrswqhk4pdbph3iw1qykxypw"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "jovie": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "jovie-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/jovie-15.04.2.tar.xz",
+            "name": "jovie-15.04.2.tar.xz",
+            "sha256": "0lc751p2s96qjqh7dccjm498m7c370dcsm5bxqks9imyi9l7syyx"
+        },
+        "buildInputs": [
+            "kde4",
+            "qt4",
+            "speechd"
+        ]
+    },
+    "kde-l10n-zh_TW": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-zh_TW-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-zh_TW-15.04.2.tar.xz",
+            "name": "kde-l10n-zh_TW-15.04.2.tar.xz",
+            "sha256": "1gvr4k48qjwgw9qsv3rlz210slqdvsxvqxwsy7j5ndcjfs2724wi"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kscd": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kscd-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kscd-15.04.2.tar.xz",
+            "name": "kscd-15.04.2.tar.xz",
+            "sha256": "1066yavabxax059fwgp0rmspfsy065x0nisci0ybyfh0y9m8m48j"
+        },
+        "buildInputs": [
+            "alsa",
+            "kde4",
+            "musicbrainz3",
+            "qt4"
+        ]
+    },
+    "kde-l10n-uk": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-uk-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-uk-15.04.2.tar.xz",
+            "name": "kde-l10n-uk-15.04.2.tar.xz",
+            "sha256": "1hbwwj1k4g4z6wkrxd3aalbhvsqvnzgv56s1m748vp7196d7h6wk"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "konsole": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "konsole-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/konsole-15.04.2.tar.xz",
+            "name": "konsole-15.04.2.tar.xz",
+            "sha256": "1cy71kfv1f9bq3y3n73brm6wzl03qgcvx5rg0kflx3ihjl1aclgc"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5bookmarks",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5init",
+            "kf5kdelibs4support",
+            "kf5kio",
+            "kf5notifications",
+            "kf5notifyconfig",
+            "kf5parts",
+            "kf5pty",
+            "kf5service",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5script",
+            "qt5test",
+            "qt5widgets",
+            "x11"
+        ]
+    },
+    "kruler": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kruler-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kruler-15.04.2.tar.xz",
+            "name": "kruler-15.04.2.tar.xz",
+            "sha256": "0rl81v1lhljfqvz98zfvnfbnylxn3l9qzy7b33hfkpmm9bjkp0i2"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5notifications",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "kubrick": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kubrick-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kubrick-15.04.2.tar.xz",
+            "name": "kubrick-15.04.2.tar.xz",
+            "sha256": "16ndnx92mb307qjkwljdbgp69aamk268yqn2w9w8y4yjhmvsmx3d"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdegames",
+            "opengl"
+        ]
+    },
+    "kdenetwork-filesharing": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdenetwork-filesharing-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdenetwork-filesharing-15.04.2.tar.xz",
+            "name": "kdenetwork-filesharing-15.04.2.tar.xz",
+            "sha256": "0l7s9a8ngwvz11bk5d5q4vxi0xvqc2jk62zcqq0mjiznd3vwiqdy"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "dolphin-plugins": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "dolphin-plugins-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/dolphin-plugins-15.04.2.tar.xz",
+            "name": "dolphin-plugins-15.04.2.tar.xz",
+            "sha256": "19hyki0k06bma2a236w45hip6gb8fzwcm51qx8xxbii4di6qrkvx"
+        },
+        "buildInputs": [
+            "kde4",
+            "libkonq"
+        ]
+    },
+    "kmines": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kmines-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kmines-15.04.2.tar.xz",
+            "name": "kmines-15.04.2.tar.xz",
+            "sha256": "1n49vzbyiiya0inxp0kydh47mm5m2qgm8x3n6yj9hjhllvjm885s"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5i18n",
+            "kf5kdegames",
+            "kf5kio",
+            "kf5notifyconfig",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "phonon4qt5",
+            "qt5",
+            "qt5qml",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kspaceduel": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kspaceduel-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kspaceduel-15.04.2.tar.xz",
+            "name": "kspaceduel-15.04.2.tar.xz",
+            "sha256": "07pgrdywj0jbvqw21qkblax30jym9x8y94ig5jn3jl19ax7a8wqy"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdegames"
+        ]
+    },
+    "kde-l10n-tr": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-tr-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-tr-15.04.2.tar.xz",
+            "name": "kde-l10n-tr-15.04.2.tar.xz",
+            "sha256": "1ddbxlf9bqd3zqwxfhygfmy15prhh0albp83saprk94bbdirp0lq"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "libkdcraw": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "libkdcraw-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/libkdcraw-15.04.2.tar.xz",
+            "name": "libkdcraw-15.04.2.tar.xz",
+            "sha256": "1j277ydzn35hzk5v0vf50giw1j3yibskpkb4kr5kirszs8m2yqkf"
+        },
+        "buildInputs": [
+            "kde4",
+            "libraw"
+        ]
+    },
+    "ktp-approver": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktp-approver-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ktp-approver-15.04.2.tar.xz",
+            "name": "ktp-approver-15.04.2.tar.xz",
+            "sha256": "1qik158frx7208adk7r573a85y8xjd1q8r9yw4fb592hvlkdk3i7"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5dbusaddons",
+            "kf5i18n",
+            "kf5notifications",
+            "kf5service",
+            "qt5",
+            "qt5network",
+            "qt5widgets",
+            "telepathyqt5"
+        ]
+    },
+    "ktp-contact-runner": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktp-contact-runner-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ktp-contact-runner-15.04.2.tar.xz",
+            "name": "ktp-contact-runner-15.04.2.tar.xz",
+            "sha256": "00r8z9zg9g1lpr6jmkr5l0n4w7zsskl35spral6ibbnnvfcv7jrf"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5i18n",
+            "kf5runner",
+            "kf5service",
+            "ktp",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5network",
+            "qt5widgets"
+        ]
+    },
+    "kdepim-runtime": {
+        "nativeBuildInputs": [
+            "_testrunner",
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdepim-runtime-4.14.9",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdepim-runtime-4.14.9.tar.xz",
+            "name": "kdepim-runtime-4.14.9.tar.xz",
+            "sha256": "0h6q08j5i2lhvlv92daxdyf7vncisbx0ya11vh45wmbv30xv2cl0"
+        },
+        "buildInputs": [
+            "accountsqt",
+            "akonadi",
+            "boost",
+            "kde4",
+            "kdepimlibs",
+            "libkfbapi",
+            "libkgapi2",
+            "libkolab",
+            "libkolabxml",
+            "qjson",
+            "qt4",
+            "sasl2",
+            "sharedmimeinfo",
+            "signonqt",
+            "xsltproc"
+        ]
+    },
+    "print-manager": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "print-manager-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/print-manager-15.04.2.tar.xz",
+            "name": "print-manager-15.04.2.tar.xz",
+            "sha256": "0hry52ypcchzbsvg5y4mw2h494l3cp4lqflhw48pilgzmz6pa1rk"
+        },
+        "buildInputs": [
+            "cups",
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kcmutils",
+            "kf5kio",
+            "kf5notifications",
+            "kf5plasma",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5network",
+            "qt5qml",
+            "qt5quick",
+            "qt5widgets"
+        ]
+    },
+    "oxygen-icons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "oxygen-icons-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/oxygen-icons-15.04.2.tar.xz",
+            "name": "oxygen-icons-15.04.2.tar.xz",
+            "sha256": "1xwa8y6alrk6faf6bw3wc0y2vxjx32wzl9ncywisb4823xc8njbi"
+        },
+        "buildInputs": []
+    },
+    "umbrello": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "umbrello-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/umbrello-15.04.2.tar.xz",
+            "name": "umbrello-15.04.2.tar.xz",
+            "sha256": "08bz8lg2arrwsnf0gjjjrf6bihrv9bdz8n4hdvilhpy0ls78v2va"
+        },
+        "buildInputs": [
+            "kde4",
+            "libxml2",
+            "libxslt"
+        ]
+    },
+    "kde-l10n-ar": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-ar-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ar-15.04.2.tar.xz",
+            "name": "kde-l10n-ar-15.04.2.tar.xz",
+            "sha256": "05wspvz4fk6xy3d9zjgrj7kzj213hhkv7fvs43iy2l4vm8b3vski"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "ktp-filetransfer-handler": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktp-filetransfer-handler-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ktp-filetransfer-handler-15.04.2.tar.xz",
+            "name": "ktp-filetransfer-handler-15.04.2.tar.xz",
+            "sha256": "15y53z3kbbvk6vg1f3ns88mq6c9hmd41s2ayixhg109nwp7q0177"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5kio",
+            "ktp",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5widgets"
+        ]
+    },
+    "kdepimlibs": {
+        "nativeBuildInputs": [
+            "_testrunner",
+            "cmake",
+            "perl_executable"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdepimlibs-4.14.9",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdepimlibs-4.14.9.tar.xz",
+            "name": "kdepimlibs-4.14.9.tar.xz",
+            "sha256": "0mjbaszc14ilvcjmr7aqy41py7yfriz1glvwpbr89z9nqjvy62yj"
+        },
+        "buildInputs": [
+            "akonadi",
+            "boost",
+            "gpgme",
+            "kde4",
+            "ldap",
+            "libical",
+            "libxml2",
+            "libxslt",
+            "prison",
+            "qjson",
+            "sasl2",
+            "sharedmimeinfo",
+            "xsltproc"
+        ]
+    },
+    "step": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "step-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/step-15.04.2.tar.xz",
+            "name": "step-15.04.2.tar.xz",
+            "sha256": "0skcnrdb3gcl8z2krmhi38dz5gr9a0bzvfgiv953bbr93hkjsscf"
+        },
+        "buildInputs": [
+            "ecm",
+            "eigen3",
+            "gsl",
+            "kf5",
+            "kf5config",
+            "kf5doctools",
+            "kf5kdelibs4support",
+            "kf5khtml",
+            "kf5newstuff",
+            "kf5plotting",
+            "pythoninterp",
+            "qalculate",
+            "qt5",
+            "qt5opengl",
+            "qt5printsupport",
+            "qt5qml",
+            "qt5quick",
+            "qt5svg",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "kmousetool": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kmousetool-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kmousetool-15.04.2.tar.xz",
+            "name": "kmousetool-15.04.2.tar.xz",
+            "sha256": "1nkn25zg6bb4pc7s93f6igcpspy1a1wlzh2ckmm2613594jh1qr9"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "kde-l10n-ja": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-ja-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ja-15.04.2.tar.xz",
+            "name": "kde-l10n-ja-15.04.2.tar.xz",
+            "sha256": "02b3243zbnrkygnbiq7nxrl2sq6ssi27kpn9382aa8b19w96gcsz"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kdenlive": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdenlive-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdenlive-15.04.2.tar.xz",
+            "name": "kdenlive-15.04.2.tar.xz",
+            "sha256": "1q17b5gihcgi5svs123h0vl25ij4ajybk16is9hjyfpmhkl7nyfa"
+        },
+        "buildInputs": [
+            "ecm",
+            "git",
+            "kf5",
+            "kf5archive",
+            "kf5bookmarks",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5doctools",
+            "kf5guiaddons",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5notifications",
+            "kf5notifyconfig",
+            "kf5plotting",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "libv4l2",
+            "mlt",
+            "opengl",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5opengl",
+            "qt5script",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "sdl",
+            "sharedmimeinfo"
+        ]
+    },
+    "kbreakout": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kbreakout-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kbreakout-15.04.2.tar.xz",
+            "name": "kbreakout-15.04.2.tar.xz",
+            "sha256": "1wrggwcgyc6vlxy0zx8y69lvz0njalbfw54sgnrnc8ka65mjr0pg"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5jobwidgets",
+            "kf5kdegames",
+            "kf5kio",
+            "kf5service",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5qml",
+            "qt5quick",
+            "qt5quickwidgets",
+            "qt5svg",
+            "qt5widgets"
+        ]
+    },
+    "kde-workspace": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-workspace-4.11.20",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-workspace-4.11.20.tar.xz",
+            "name": "kde-workspace-4.11.20.tar.xz",
+            "sha256": "06n4aq0mi36d1ssqbvwxgy6jc18q70xp772i58ni0akw0ckrp33c"
+        },
+        "buildInputs": [
+            "akonadi",
+            "boost",
+            "dbusmenuqt",
+            "fontconfig",
+            "freetype",
+            "glib2",
+            "jpeg",
+            "kactivities",
+            "kde4",
+            "kdeclarative",
+            "kdepimlibs",
+            "libgps",
+            "nepomukcore",
+            "opengl",
+            "opengles",
+            "pciutils",
+            "png",
+            "prison",
+            "pythonlibrary",
+            "qalculate",
+            "qimageblitz",
+            "qjson",
+            "qt4",
+            "raw1394",
+            "sensors",
+            "soprano",
+            "strigi",
+            "udev",
+            "usb",
+            "wayland",
+            "x11",
+            "x11_xcb",
+            "xcb",
+            "xmms",
+            "zlib"
+        ]
+    },
+    "ffmpegthumbs": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ffmpegthumbs-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ffmpegthumbs-15.04.2.tar.xz",
+            "name": "ffmpegthumbs-15.04.2.tar.xz",
+            "sha256": "122mfd85yzkmyg1wzz7fz4v0jnxxifinckc9rb5ydjlj3c85y9qg"
+        },
+        "buildInputs": [
+            "ffmpeg",
+            "kde4"
+        ]
+    },
+    "ktux": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktux-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ktux-15.04.2.tar.xz",
+            "name": "ktux-15.04.2.tar.xz",
+            "sha256": "0pdgbqbk3iwjywvhm6bzwqc6acfnyjixj2j3yxczn2k6fy5k0vkf"
+        },
+        "buildInputs": [
+            "kde4",
+            "kde4workspace"
+        ]
+    },
+    "kde-dev-utils": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-dev-utils-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-dev-utils-15.04.2.tar.xz",
+            "name": "kde-dev-utils-15.04.2.tar.xz",
+            "sha256": "100kia4fd6gc10mh1nmadrm60wwnciyq5nlm0m4c1cjbp9ypyfh5"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "libkeduvocdocument": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "libkeduvocdocument-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/libkeduvocdocument-15.04.2.tar.xz",
+            "name": "libkeduvocdocument-15.04.2.tar.xz",
+            "sha256": "13hzs4lrlrnyya3321iqky2nxjlh65fs2lr0nbl3g6k9wxdxlqfw"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5archive",
+            "kf5i18n",
+            "kf5kio",
+            "qt5",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "kde-l10n-pl": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-pl-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-pl-15.04.2.tar.xz",
+            "name": "kde-l10n-pl-15.04.2.tar.xz",
+            "sha256": "1zs799470abqq9hxgik0wka2im6fi12057jg6id7fi9d58h3lyap"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "ktp-send-file": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktp-send-file-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ktp-send-file-15.04.2.tar.xz",
+            "name": "ktp-send-file-15.04.2.tar.xz",
+            "sha256": "1jygvxc8ajy6p6qhpfwj0chc0571x50h7n2nzwqiz3nhs3avqxnx"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kcmutils",
+            "kf5kio",
+            "ktp",
+            "qt5",
+            "qt5widgets"
+        ]
+    },
+    "cantor": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "cantor-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/cantor-15.04.2.tar.xz",
+            "name": "cantor-15.04.2.tar.xz",
+            "sha256": "0y7gs13s38swvicfw9wlxgqr96bvny4d2rsvnkb0cn1d68vmb7jm"
+        },
+        "buildInputs": [
+            "analitza5",
+            "ecm",
+            "kde4",
+            "kf5",
+            "kf5archive",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5kdelibs4support",
+            "kf5newstuff",
+            "kf5parts",
+            "kf5pty",
+            "kf5texteditor",
+            "libspectre",
+            "luajit",
+            "pythonlibs",
+            "pythonlibs3",
+            "qalculate",
+            "qt5",
+            "qt5core",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml",
+            "qt5xmlpatterns",
+            "r"
+        ]
+    },
+    "libkcddb": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "libkcddb-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/libkcddb-15.04.2.tar.xz",
+            "name": "libkcddb-15.04.2.tar.xz",
+            "sha256": "1yrmvy8kldhh312dk4kipr15hr4zhsg2yj645naybfh2dya89q6m"
+        },
+        "buildInputs": [
+            "kde4",
+            "musicbrainz5"
+        ]
+    },
+    "bomber": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "bomber-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/bomber-15.04.2.tar.xz",
+            "name": "bomber-15.04.2.tar.xz",
+            "sha256": "1xn52p5apfbm3iyjq1hw2mg5isl3jcbq4x8wfzil2vp3ir16f1j3"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5i18n",
+            "kf5kdegames",
+            "kf5kio",
+            "kf5xmlgui",
+            "phonon4qt5",
+            "qt5",
+            "qt5widgets"
+        ]
+    },
+    "libkface": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "libkface-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/libkface-15.04.2.tar.xz",
+            "name": "libkface-15.04.2.tar.xz",
+            "sha256": "08xc93jjplqc6y0m9q6krwplfjj2cklvbw8m9dhhv1w6mn8qp8r3"
+        },
+        "buildInputs": [
+            "kde4",
+            "qt4"
+        ]
+    },
+    "kde-l10n-nb": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-nb-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-nb-15.04.2.tar.xz",
+            "name": "kde-l10n-nb-15.04.2.tar.xz",
+            "sha256": "16ya60pxn30rpwidijcycmjxm8c61hiykzfirba73i0pkzq13nij"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kturtle": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kturtle-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kturtle-15.04.2.tar.xz",
+            "name": "kturtle-15.04.2.tar.xz",
+            "sha256": "0xgb2ahzyg88iz1dgvbc5n17fbds56mixcfk4mmi2hgycckjk910"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5i18n",
+            "kf5kdelibs4support",
+            "kf5kio",
+            "kf5newstuff",
+            "qt5",
+            "qt5core",
+            "qt5gui",
+            "qt5svg",
+            "qt5widgets"
+        ]
+    },
+    "svgpart": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "svgpart-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/svgpart-15.04.2.tar.xz",
+            "name": "svgpart-15.04.2.tar.xz",
+            "sha256": "09f9zfppa82zxzrm7b1c7q6hn3dry0rwzz3xpx26dsh219qaax29"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "kdegraphics-mobipocket": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdegraphics-mobipocket-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdegraphics-mobipocket-15.04.2.tar.xz",
+            "name": "kdegraphics-mobipocket-15.04.2.tar.xz",
+            "sha256": "1y3w477bws206fx1rymvp9dr7z8bxy1l2p0cdawlnbir9bamsnnc"
+        },
+        "buildInputs": [
+            "kde4",
+            "strigi"
+        ]
+    },
+    "krfb": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "krfb-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/krfb-15.04.2.tar.xz",
+            "name": "krfb-15.04.2.tar.xz",
+            "sha256": "1ynvwvhkshjrh1d1rifawzwv0srqj9wlqhhiv5nr8lwd4m29pdj2"
+        },
+        "buildInputs": [
+            "kde4",
+            "ktp",
+            "libvncserver",
+            "telepathyqt4"
+        ]
+    },
+    "kde-l10n-ko": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-ko-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ko-15.04.2.tar.xz",
+            "name": "kde-l10n-ko-15.04.2.tar.xz",
+            "sha256": "1knsgxhgz0cvxk0y460zyzk5n9q0rk8p3cdf0wlpxf7z8wvxcab0"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "libkgeomap": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "libkgeomap-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/libkgeomap-15.04.2.tar.xz",
+            "name": "libkgeomap-15.04.2.tar.xz",
+            "sha256": "091jl7zdcvj91xqr6fh8vvn5wrbg86ykczj43lgvnnph28h1xpyh"
+        },
+        "buildInputs": [
+            "kde4",
+            "marble",
+            "marblewidget",
+            "qt4"
+        ]
+    },
+    "kalgebra": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kalgebra-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kalgebra-15.04.2.tar.xz",
+            "name": "kalgebra-15.04.2.tar.xz",
+            "sha256": "1h8rpikyigx9804pn0624g83ja1wlb2m4hfc29jpi4j6va4h8j4f"
+        },
+        "buildInputs": [
+            "analitza5",
+            "curses",
+            "ecm",
+            "kf5configwidgets",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5kio",
+            "kf5widgetsaddons",
+            "opengl",
+            "qt5",
+            "qt5opengl",
+            "qt5printsupport",
+            "qt5qml",
+            "qt5quick",
+            "qt5svg",
+            "qt5test",
+            "qt5webkitwidgets",
+            "qt5xml",
+            "readline"
+        ]
+    },
+    "rocs": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "rocs-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/rocs-15.04.2.tar.xz",
+            "name": "rocs-15.04.2.tar.xz",
+            "sha256": "0zgxgbmmc3wy0k0s6dx7gprw4dl1rgdrq2ah98zr658bpwkkm9aw"
+        },
+        "buildInputs": [
+            "boost",
+            "ecm",
+            "grantlee5",
+            "kf5",
+            "kf5archive",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5declarative",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5itemviews",
+            "kf5texteditor",
+            "kf5xmlgui",
+            "qt5",
+            "qt5concurrent",
+            "qt5core",
+            "qt5gui",
+            "qt5quickwidgets",
+            "qt5script",
+            "qt5scripttools",
+            "qt5svg",
+            "qt5test",
+            "qt5webkit",
+            "qt5webkitwidgets",
+            "qt5widgets",
+            "qt5xmlpatterns"
+        ]
+    },
+    "kbruch": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kbruch-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kbruch-15.04.2.tar.xz",
+            "name": "kbruch-15.04.2.tar.xz",
+            "sha256": "0w1fw3lydp5znk3n5fhg30gj7mxi7v6y7hv46wl01cysd73m7825"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5crash",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5widgets"
+        ]
+    },
+    "ksudoku": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ksudoku-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ksudoku-15.04.2.tar.xz",
+            "name": "ksudoku-15.04.2.tar.xz",
+            "sha256": "1xn2d7aiqv0q3lg5iwhjp2abwq2ssxa8gdjawvj40xq4zffr0wna"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdegames",
+            "opengl"
+        ]
+    },
+    "kde-l10n-el": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-el-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-el-15.04.2.tar.xz",
+            "name": "kde-l10n-el-15.04.2.tar.xz",
+            "sha256": "1y2q5vqm9xkv2yxzwqxrsyqnd8zdfzz5vyza3g4aisawh3xhwq25"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kopete": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kopete-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kopete-15.04.2.tar.xz",
+            "name": "kopete-15.04.2.tar.xz",
+            "sha256": "1zvf0y7f8r97lvwcspp2bwph5wsh1rcac9hp6vg0hkama3iqfbk3"
+        },
+        "buildInputs": [
+            "alsa",
+            "boost",
+            "expat",
+            "gif",
+            "glib2",
+            "idn",
+            "jasper",
+            "jsoncpp",
+            "kde4",
+            "kdepimlibs",
+            "kleopatra",
+            "libgadu",
+            "libmeanwhile",
+            "libmsn",
+            "libortp",
+            "libotr",
+            "libv4l2",
+            "libxml2",
+            "libxslt",
+            "mediastreamer",
+            "openssl",
+            "qca2",
+            "qgpgme",
+            "qimageblitz",
+            "qt4",
+            "qt5core",
+            "qt5network",
+            "speex",
+            "sqlite",
+            "srtp",
+            "xmms",
+            "zlib"
+        ]
+    },
+    "kde-l10n-de": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-de-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-de-15.04.2.tar.xz",
+            "name": "kde-l10n-de-15.04.2.tar.xz",
+            "sha256": "0fvb169pl9ibppiinc2sq164i7cikn7qxvycdv1whk3bcv376rrh"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kde-l10n-nds": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-nds-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-nds-15.04.2.tar.xz",
+            "name": "kde-l10n-nds-15.04.2.tar.xz",
+            "sha256": "0ryjlw2d9lrzzf08v1vscjr6mp2ckpbd0f2hkxg0ck8wgn7c2mxd"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kde-l10n-pa": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-pa-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-pa-15.04.2.tar.xz",
+            "name": "kde-l10n-pa-15.04.2.tar.xz",
+            "sha256": "1wi9l74fln9q92l1qmxgb2223gwkb6x2v753mzm7607hbcx9y8dx"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "okteta": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kastencore",
+            "kastengui",
+            "kf5kio",
+            "oktetacore",
+            "oktetagui",
+            "oktetakastencore",
+            "oktetakastengui",
+            "qt5core",
+            "qt5gui",
+            "qt5widgets"
+        ],
+        "name": "okteta-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/okteta-15.04.2.tar.xz",
+            "name": "okteta-15.04.2.tar.xz",
+            "sha256": "00y3kcl57crwkycd7ahf9cw20bnjwzjrxnlkvdpqansmcqvmmih5"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5bookmarks",
+            "kf5codecs",
+            "kf5completion",
+            "kf5configwidgets",
+            "kf5dbusaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kcmutils",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5parts",
+            "kf5service",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qca-qt5",
+            "qt5",
+            "qt5core",
+            "qt5designer",
+            "qt5network",
+            "qt5printsupport",
+            "qt5script",
+            "qt5scripttools",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml",
+            "sharedmimeinfo"
+        ]
+    },
+    "ktp-accounts-kcm": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktp-accounts-kcm-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ktp-accounts-kcm-15.04.2.tar.xz",
+            "name": "ktp-accounts-kcm-15.04.2.tar.xz",
+            "sha256": "1icmsax7abwfjavmq9vn2l3hj7hbjdhky60hga52sdnw7hy58n01"
+        },
+        "buildInputs": [
+            "accountsfiledir",
+            "accountsqt5",
+            "ecm",
+            "intltool",
+            "kaccounts",
+            "kf5",
+            "kf5codecs",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kcmutils",
+            "kf5kio",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5widgets",
+            "signonqt5",
+            "telepathyqt5"
+        ]
+    },
+    "zeroconf-ioslave": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "zeroconf-ioslave-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/zeroconf-ioslave-15.04.2.tar.xz",
+            "name": "zeroconf-ioslave-15.04.2.tar.xz",
+            "sha256": "0129dc6r1sfxjg3bdfbnprgvf7iricshw1l879cw2lzb7wmqdpm9"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "kremotecontrol": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kremotecontrol-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kremotecontrol-15.04.2.tar.xz",
+            "name": "kremotecontrol-15.04.2.tar.xz",
+            "sha256": "0npdbdjcfa8y7lmzl80fgbvv94hj2v0fc1lfmii0k0xnb6jv8cvl"
+        },
+        "buildInputs": [
+            "kde4",
+            "qt4"
+        ]
+    },
+    "kde-l10n-bs": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-bs-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-bs-15.04.2.tar.xz",
+            "name": "kde-l10n-bs-15.04.2.tar.xz",
+            "sha256": "0vlsij3zfbqlcl9xg3iwvyi112d8i00rjbrpwc15lyhw19xzjakb"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "ark": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ark-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ark-15.04.2.tar.xz",
+            "name": "ark-15.04.2.tar.xz",
+            "sha256": "0pssyyk8kf0qy9vh71kx3h5f1fs26k21cql97mfsl4hz181mfxkq"
+        },
+        "buildInputs": [
+            "bzip2",
+            "kde4",
+            "libarchive",
+            "libkonq",
+            "liblzma",
+            "qjson",
+            "zlib"
+        ]
+    },
+    "libkdegames": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5kdelibs4support",
+            "kf5widgetsaddons",
+            "qt5network",
+            "qt5qml",
+            "qt5quickwidgets",
+            "qt5widgets",
+            "qt5xml"
+        ],
+        "name": "libkdegames-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/libkdegames-15.04.2.tar.xz",
+            "name": "libkdegames-15.04.2.tar.xz",
+            "sha256": "0r3mnbc4ka8whmdjadnr6wyac4bwfv6w01l6nm2k7gsq2n38q2yj"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5archive",
+            "kf5bookmarks",
+            "kf5codecs",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5declarative",
+            "kf5dnssd",
+            "kf5globalaccel",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5jobwidgets",
+            "kf5kdelibs4support",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5service",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "openal",
+            "qt5",
+            "qt5qml",
+            "qt5quick",
+            "qt5quickwidgets",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "sndfile"
+        ]
+    },
+    "kde-l10n-hi": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-hi-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-hi-15.04.2.tar.xz",
+            "name": "kde-l10n-hi-15.04.2.tar.xz",
+            "sha256": "1yqk7wva2r6smasgxzw6f1pw43z1jddf4br1rzq3k7f18np89im7"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "cervisia": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "cervisia-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/cervisia-15.04.2.tar.xz",
+            "name": "cervisia-15.04.2.tar.xz",
+            "sha256": "10a6k6x5mxcp3ark71rjcsbvi9q7r7sqc0pqx6wqg8wrvqng776i"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "kde-l10n-en_GB": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-en_GB-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-en_GB-15.04.2.tar.xz",
+            "name": "kde-l10n-en_GB-15.04.2.tar.xz",
+            "sha256": "10db8pnbbxc35shx0f7vfiz0glm9kb521b99iksjkwnxpss9kyvx"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kapman": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kapman-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kapman-15.04.2.tar.xz",
+            "name": "kapman-15.04.2.tar.xz",
+            "sha256": "1jxxs2ljfci9llfv1pyybrw10nbajk06k8yhw4yswn23j544049a"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5kdegames",
+            "kf5kio",
+            "kf5notifyconfig",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "phonon4qt5",
+            "qt5",
+            "qt5svg",
+            "qt5widgets"
+        ]
+    },
+    "kdeedu-data": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdeedu-data-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdeedu-data-15.04.2.tar.xz",
+            "name": "kdeedu-data-15.04.2.tar.xz",
+            "sha256": "04m14g1b8bkngawjx3x9sdla7p10dhxqwvfv29nkm1lblmc547ia"
+        },
+        "buildInputs": [
+            "ecm"
+        ]
+    },
+    "kgeography": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kgeography-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kgeography-15.04.2.tar.xz",
+            "name": "kgeography-15.04.2.tar.xz",
+            "sha256": "1iddjjpvyimbc9p0z2qzqc2v1q48pvm1d6qd4pdbycshpcm4wjwd"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5service",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5widgets"
+        ]
+    },
+    "kdesdk-thumbnailers": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdesdk-thumbnailers-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdesdk-thumbnailers-15.04.2.tar.xz",
+            "name": "kdesdk-thumbnailers-15.04.2.tar.xz",
+            "sha256": "048i3xy580gpgbk9m42wv2v0cf1gk2zlx52dvf4izczracsvl2n7"
+        },
+        "buildInputs": [
+            "gettextpo",
+            "kde4"
+        ]
+    },
+    "kppp": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kppp-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kppp-15.04.2.tar.xz",
+            "name": "kppp-15.04.2.tar.xz",
+            "sha256": "0g89b800v06p1ymxdm7g04ajdmdh86y740hnzr0r64rdhsxq0wn9"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "kde-l10n-ug": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-ug-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ug-15.04.2.tar.xz",
+            "name": "kde-l10n-ug-15.04.2.tar.xz",
+            "sha256": "0ck01ygnz7ycfpff7g2zyix0zv19ia8csmggvyv07lp0k84asxr1"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kgpg": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kgpg-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kgpg-15.04.2.tar.xz",
+            "name": "kgpg-15.04.2.tar.xz",
+            "sha256": "1z3p0131hvnj3mm53n3q1hdkpvi77x1k8gv1bi3wblqin41dgmfx"
+        },
+        "buildInputs": [
+            "gpgme",
+            "kde4",
+            "kdepimlibs"
+        ]
+    },
+    "kde-l10n-lv": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-lv-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-lv-15.04.2.tar.xz",
+            "name": "kde-l10n-lv-15.04.2.tar.xz",
+            "sha256": "1skw7d5yxdy7vd2z6fnslcp7xpwjrvxzgl7kd9shvj7px988bfng"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kde-l10n-hr": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-hr-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-hr-15.04.2.tar.xz",
+            "name": "kde-l10n-hr-15.04.2.tar.xz",
+            "sha256": "0r5hfhdnjj9j0zzs6yr7a6hc1aidki5far9njn88c78ialw4y9kn"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kde-l10n-ca": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-ca-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ca-15.04.2.tar.xz",
+            "name": "kde-l10n-ca-15.04.2.tar.xz",
+            "sha256": "00imm41b9769j0pwgcgavdcwmy59qwnab3qkf8xq22899fvadq7b"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "mplayerthumbs": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "mplayerthumbs-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/mplayerthumbs-15.04.2.tar.xz",
+            "name": "mplayerthumbs-15.04.2.tar.xz",
+            "sha256": "0lgag714pqpqnf6v9dz5xlriswcyqvjnj309gk0wji523hny3mim"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "kate": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kate-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kate-15.04.2.tar.xz",
+            "name": "kate-15.04.2.tar.xz",
+            "sha256": "1llsg7ywl9mwl4gc25vw44v708r9k960c2lgqkfjpxnxpjlwk5vp"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5dbusaddons",
+            "libgit2",
+            "pykde4",
+            "pyqt4",
+            "pythonlibrary",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5script",
+            "qt5sql",
+            "qt5test",
+            "qt5widgets",
+            "sip"
+        ]
+    },
+    "ksaneplugin": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ksaneplugin-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ksaneplugin-15.04.2.tar.xz",
+            "name": "ksaneplugin-15.04.2.tar.xz",
+            "sha256": "0s69h4swdcxagv45v8y0kbg4ik3pyl7asiryvz9dip7yznwlxlz9"
+        },
+        "buildInputs": [
+            "kde4",
+            "ksane"
+        ]
+    },
+    "kde-runtime": {
+        "nativeBuildInputs": [
+            "cmake",
+            "md5sum_executable",
+            "windres_executable"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-runtime-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-runtime-15.04.2.tar.xz",
+            "name": "kde-runtime-15.04.2.tar.xz",
+            "sha256": "1bcg5g6b8vij6zf1s6y4m5296yqiaavgbfcg1xzfcs8b5l7pckrn"
+        },
+        "buildInputs": [
+            "alsa",
+            "bzip2",
+            "exiv2",
+            "glib2",
+            "gpgme",
+            "jpeg",
+            "kactivities",
+            "kde4",
+            "kdeclarative",
+            "kdepimlibs",
+            "libattica",
+            "libgcrypt",
+            "liblzma",
+            "libssh",
+            "nepomukcore",
+            "networkmanager",
+            "openexr",
+            "pulseaudio",
+            "qca2",
+            "qgpgme",
+            "qntrack",
+            "samba",
+            "sharedmimeinfo",
+            "slp",
+            "soprano"
+        ]
+    },
+    "ktp-text-ui": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktp-text-ui-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ktp-text-ui-15.04.2.tar.xz",
+            "name": "ktp-text-ui-15.04.2.tar.xz",
+            "sha256": "15kh8jwysvzlxrp4r4vhnla0lmwpxcyaf3gyy2lz0lb1k2k368n4"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5archive",
+            "kf5dbusaddons",
+            "kf5emoticons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kcmutils",
+            "kf5kio",
+            "kf5notifications",
+            "kf5notifyconfig",
+            "kf5people",
+            "kf5service",
+            "kf5sonnet",
+            "kf5textwidgets",
+            "kf5webkit",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "ktp",
+            "qt5",
+            "qt5webkitwidgets"
+        ]
+    },
+    "kaccounts-providers": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kaccounts-providers-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kaccounts-providers-15.04.2.tar.xz",
+            "name": "kaccounts-providers-15.04.2.tar.xz",
+            "sha256": "1a2mwv1lvmnw7apb94w4620ip3d3p8xxp3ff0yg633x60g0wnkiv"
+        },
+        "buildInputs": [
+            "accountsfiledir",
+            "ecm",
+            "intltool"
+        ]
+    },
+    "kteatime": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kteatime-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kteatime-15.04.2.tar.xz",
+            "name": "kteatime-15.04.2.tar.xz",
+            "sha256": "0cpy6z6nxys307247l9rcms9f4n2qpnvij1c20s0bcb03n5ya0vp"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5crash",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5notifications",
+            "kf5notifyconfig",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5widgets"
+        ]
+    },
+    "krdc": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "krdc-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/krdc-15.04.2.tar.xz",
+            "name": "krdc-15.04.2.tar.xz",
+            "sha256": "0m7jmwrzihzm8iswzvw5ajz4yiaxdsprdkhgl1a59hgm7wgrp8yg"
+        },
+        "buildInputs": [
+            "kde4",
+            "libnxcl",
+            "libvncserver",
+            "telepathyqt4"
+        ]
+    },
+    "klickety": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "klickety-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/klickety-15.04.2.tar.xz",
+            "name": "klickety-15.04.2.tar.xz",
+            "sha256": "149jka949jcpd75kg9rk2xa6m3hvkaiif57a35bg2pdzs41dqnn5"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdegames"
+        ]
+    },
+    "kolf": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kolf-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kolf-15.04.2.tar.xz",
+            "name": "kolf-15.04.2.tar.xz",
+            "sha256": "0fifvpsp6nbr58r1pammynw4zh4k9z51vgm5xbcl1k6pblh6hn6l"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdegames"
+        ]
+    },
+    "ktouch": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktouch-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ktouch-15.04.2.tar.xz",
+            "name": "ktouch-15.04.2.tar.xz",
+            "sha256": "18f0r9d0hs1prrwj33iwik9ipdf3hyf316yz7jbg3iyygp8xa1wf"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdeclarative",
+            "x11"
+        ]
+    },
+    "kdepim": {
+        "nativeBuildInputs": [
+            "cmake",
+            "dblatex_executable"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdepim-4.14.9",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdepim-4.14.9.tar.xz",
+            "name": "kdepim-4.14.9.tar.xz",
+            "sha256": "0l4nfcf0k958w37bzmbfpvs96yba0r22q16z4d1ksqbyrr6v7ycf"
+        },
+        "buildInputs": [
+            "akonadi",
+            "baloo",
+            "boost",
+            "git",
+            "grantlee",
+            "kde4",
+            "kdepimlibs",
+            "libkgapi2",
+            "prison",
+            "qgpgme",
+            "qjson",
+            "sasl2",
+            "xsltproc",
+            "zlib"
+        ]
+    },
+    "poxml": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "poxml-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/poxml-15.04.2.tar.xz",
+            "name": "poxml-15.04.2.tar.xz",
+            "sha256": "09rvf4yzrncc0q3975mwj37a3pm0l07r3jnqzhbapdkkwjqs9ad3"
+        },
+        "buildInputs": [
+            "gettext",
+            "gettextpo",
+            "kde4"
+        ]
+    },
+    "okular": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "okular-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/okular-15.04.2.tar.xz",
+            "name": "okular-15.04.2.tar.xz",
+            "sha256": "0cqqh4f4ymyx7204ba0afy2hscayd8aqg8dpbv13xxhs8m1aa3p7"
+        },
+        "buildInputs": [
+            "activeapp",
+            "chm",
+            "djvulibre",
+            "epub",
+            "freetype",
+            "jpeg",
+            "kactivities",
+            "kde4",
+            "kexiv2",
+            "libkscreen",
+            "libspectre",
+            "poppler",
+            "qca2",
+            "qimageblitz",
+            "qmobipocket",
+            "tiff",
+            "zlib"
+        ]
+    },
+    "kde-l10n-fi": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-fi-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-fi-15.04.2.tar.xz",
+            "name": "kde-l10n-fi-15.04.2.tar.xz",
+            "sha256": "0zpkcs64g5si5r5q075vkva41sx39qp30hycdzhvbs72hkjkp6m8"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "ktp-common-internals": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5wallet",
+            "telepathyloggerqt",
+            "telepathyqt5"
+        ],
+        "name": "ktp-common-internals-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ktp-common-internals-15.04.2.tar.xz",
+            "name": "ktp-common-internals-15.04.2.tar.xz",
+            "sha256": "0b255d8yf8xi426kpsqb3s1dqsqvypk485pw327kvqg2jj2jdmiq"
+        },
+        "buildInputs": [
+            "accountsqt5",
+            "doxygen",
+            "ecm",
+            "kaccounts",
+            "kf5",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5iconthemes",
+            "kf5kcmutils",
+            "kf5kio",
+            "kf5notifications",
+            "kf5notifyconfig",
+            "kf5people",
+            "kf5texteditor",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "libgcrypt",
+            "libotr",
+            "qt5",
+            "qt5qml",
+            "qt5sql",
+            "qt5test",
+            "telepathyloggerqt",
+            "telepathyqt5",
+            "telepathyqt5service"
+        ]
+    },
+    "kcachegrind": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kcachegrind-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kcachegrind-15.04.2.tar.xz",
+            "name": "kcachegrind-15.04.2.tar.xz",
+            "sha256": "1f3iqjd4dk3agk6kw096199yrd8ag3zjx9zz58gvlkdww9rlap13"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "kdf": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdf-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdf-15.04.2.tar.xz",
+            "name": "kdf-15.04.2.tar.xz",
+            "sha256": "17mb2hmbm1r0rq5nnh0xmrv3gqcs0ywan8jvxagvli350xgrn2ck"
+        },
+        "buildInputs": [
+            "kde4"
+        ]
+    },
+    "kajongg": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kajongg-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kajongg-15.04.2.tar.xz",
+            "name": "kajongg-15.04.2.tar.xz",
+            "sha256": "1ih2gz0i4r1pbx0ys6wi0fgwwh6c5mlq1hy8qfhbb1kanpl0v30k"
+        },
+        "buildInputs": [
+            "kde4",
+            "twisted"
+        ]
+    },
+    "ksquares": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ksquares-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ksquares-15.04.2.tar.xz",
+            "name": "ksquares-15.04.2.tar.xz",
+            "sha256": "01h8kcahn72lh9hdqljz9fx9wdh3gx7rk7fk0xpc7fh0qqwcdv9i"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kdegames",
+            "kf5kio",
+            "kf5notifyconfig",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kshisen": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kshisen-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kshisen-15.04.2.tar.xz",
+            "name": "kshisen-15.04.2.tar.xz",
+            "sha256": "0syx9x96zm4hlmpz644sn2rfb4phyzrgvcr0kl38l9aj1i56q81a"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5declarative",
+            "kf5dnssd",
+            "kf5doctools",
+            "kf5kdegames",
+            "kf5kio",
+            "kf5kmahjongglib",
+            "kf5newstuff",
+            "kf5xmlgui",
+            "phonon4qt5",
+            "qt5",
+            "qt5core",
+            "qt5gui"
+        ]
+    },
+    "kde-l10n-nn": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-nn-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-nn-15.04.2.tar.xz",
+            "name": "kde-l10n-nn-15.04.2.tar.xz",
+            "sha256": "0j0nn7qk7shq5xi9zma0fl7fibsaindsai8lrvfvaphrbdylp3cx"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "kdesdk-strigi-analyzers": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdesdk-strigi-analyzers-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kdesdk-strigi-analyzers-15.04.2.tar.xz",
+            "name": "kdesdk-strigi-analyzers-15.04.2.tar.xz",
+            "sha256": "0wbm6q02zkqbvcq716v468mjxw3zd8xcjqyc3vvz80zfgpbm2dnd"
+        },
+        "buildInputs": [
+            "kde4",
+            "strigi"
+        ]
+    },
+    "kde-l10n-zh_CN": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-zh_CN-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-zh_CN-15.04.2.tar.xz",
+            "name": "kde-l10n-zh_CN-15.04.2.tar.xz",
+            "sha256": "08p3nlyigw1mxqajm2z0gs2ils8aymizmb3iiprnzi3zgcnbg45y"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "ksnakeduel": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ksnakeduel-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/ksnakeduel-15.04.2.tar.xz",
+            "name": "ksnakeduel-15.04.2.tar.xz",
+            "sha256": "1zzwkc6k6315a02il4sp4zswz0i1031bcvsvxrpxb45s4rqhds3b"
+        },
+        "buildInputs": [
+            "kde4",
+            "kdegames"
+        ]
+    },
+    "kde-l10n-ia": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-ia-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ia-15.04.2.tar.xz",
+            "name": "kde-l10n-ia-15.04.2.tar.xz",
+            "sha256": "0rg8zwwmwwm373fnsrcj3cdx88c1z674n398kyv3v6xdi31j2f5p"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "granatier": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "granatier-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/granatier-15.04.2.tar.xz",
+            "name": "granatier-15.04.2.tar.xz",
+            "sha256": "1jcxnm1hy6s6g6yls8ljcrhhp3qsp58gcs46hy4s25nacx5m4kh6"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kdegames",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5notifyconfig",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5svg",
+            "qt5widgets"
+        ]
+    },
+    "kde-dev-scripts": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-dev-scripts-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-dev-scripts-15.04.2.tar.xz",
+            "name": "kde-dev-scripts-15.04.2.tar.xz",
+            "sha256": "07lliwm96m2nvwa52vsch9x85vxxj7cqlvfm3ynv8nw49pmlkdi5"
+        },
+        "buildInputs": [
+            "ecm",
+            "kde4",
+            "kf5doctools"
+        ]
+    },
+    "khangman": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "khangman-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/khangman-15.04.2.tar.xz",
+            "name": "khangman-15.04.2.tar.xz",
+            "sha256": "0wpgm0ipm9n6lhyiymf0ncmw8lgz2pc0fh4ghs4n692ihipiw4xf"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5declarative",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5notifications",
+            "kf5xmlgui",
+            "libkeduvocdocument",
+            "qt5",
+            "qt5core",
+            "qt5qml",
+            "qt5quick",
+            "qt5quickwidgets",
+            "qt5svg"
+        ]
+    },
+    "kde-l10n-sk": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-l10n-sk-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-sk-15.04.2.tar.xz",
+            "name": "kde-l10n-sk-15.04.2.tar.xz",
+            "sha256": "1nhvb2kdlxfvch0hly80lm4z17kijy860z2pk23n65r8lmhngf07"
+        },
+        "buildInputs": [
+            "ecm",
+            "gettext",
+            "kde4",
+            "kf5doctools",
+            "kf5i18n"
+        ]
+    },
+    "audiocd-kio": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "audiocd-kio-15.04.2",
+        "src": {
+            "url": "stable/applications/15.04.2/src/audiocd-kio-15.04.2.tar.xz",
+            "name": "audiocd-kio-15.04.2.tar.xz",
+            "sha256": "1vxqabysh3mjmrzaxz2kldx2a6w07rxf1adka1fwp2yhajb1bzlh"
+        },
+        "buildInputs": [
+            "cdparanoia",
+            "flac",
+            "kde4",
+            "libkcddb",
+            "libkcompactdisc",
+            "oggvorbis"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/pkgs/applications/kde-apps-15.04/packages.sh b/pkgs/applications/kde-apps-15.04/packages.sh
new file mode 100755
index 00000000000..49c125a9f1a
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.04/packages.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -x
+
+origin="$(pwd)"
+
+# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
+KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
+
+alias nix-build="nix-build --no-out-link \"$origin/../../..\""
+
+# The extra slash at the end of the URL is necessary to stop wget
+# from recursing over the whole server! (No, it's not a bug.)
+$(nix-build -A autonix.manifest) \
+    "${KDE_MIRROR}/stable/applications/15.04.2/" \
+    "$@" -A '*.tar.xz'
+
+AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}
+
+$AUTONIX_DEPS_KF5 manifest.json
+
+rm manifest.json
diff --git a/pkgs/applications/kde-apps-15.04/plasma5-renames.json b/pkgs/applications/kde-apps-15.04/plasma5-renames.json
new file mode 100644
index 00000000000..98141d29cc5
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.04/plasma5-renames.json
@@ -0,0 +1,20 @@
+{
+    "kf5sysguard": "libksysguard",
+    "kf5baloo": "baloo",
+    "krunnerappdbusinterface": "plasma-workspace",
+    "screensaverdbusinterface": "plasma-workspace",
+    "ctest": "kdeplasma-addons",
+    "kf5filemetadata": "kfilemetadata",
+    "kwindbusinterface": "kwin",
+    "kf5activitiesexperimentalstats": "plasma-desktop",
+    "khotkeysdbusinterface": "khotkeys",
+    "libkworkspace": "plasma-workspace",
+    "libtaskmanager": "plasma-workspace",
+    "backend": "powerdevil",
+    "kf5screen": "libkscreen",
+    "ksmserverdbusinterface": "plasma-workspace",
+    "kf5wayland": "kwayland",
+    "kdecoration2": "kdecoration",
+    "kf5bluezqt": "bluez-qt",
+    "oxygenfont": "oxygen-fonts"
+}
\ No newline at end of file
diff --git a/pkgs/applications/kde-apps-15.04/renames.json b/pkgs/applications/kde-apps-15.04/renames.json
new file mode 100644
index 00000000000..42b2e53df9a
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.04/renames.json
@@ -0,0 +1,31 @@
+{
+    "libkomparediff2": "libkomparediff2",
+    "kdegames": "libkdegames",
+    "ksane": "libksane",
+    "ctest": "sweeper",
+    "kastencore": "okteta",
+    "kastengui": "okteta",
+    "gpgmepp": "kdepimlibs",
+    "oktetacore": "okteta",
+    "kf5kmahjongglib": "libkmahjongg",
+    "oktetagui": "okteta",
+    "libkcompactdisc": "libkcompactdisc",
+    "libkdeedu": "libkdeedu",
+    "kaccounts": "kaccounts-integration",
+    "kastencontrollers": "okteta",
+    "backend": "kde-workspace",
+    "ktp": "ktp-common-internals",
+    "kdepimlibs": "kdepimlibs",
+    "qjdns": "kopete",
+    "libkeduvocdocument": "libkeduvocdocument",
+    "oktetakastencore": "okteta",
+    "libkcddb": "libkcddb",
+    "oktetakastengui": "okteta",
+    "kde4workspace": "kde-workspace",
+    "jdns": "kopete",
+    "okular": "okular",
+    "qmobipocket": "kdegraphics-mobipocket",
+    "kdeclarative": "kdelibs",
+    "analitza5": "analitza",
+    "oktetakastencontrollers": "okteta"
+}
\ No newline at end of file
diff --git a/pkgs/applications/kde-apps-15.04/renames.nix b/pkgs/applications/kde-apps-15.04/renames.nix
deleted file mode 100644
index 37b4ef4f8be..00000000000
--- a/pkgs/applications/kde-apps-15.04/renames.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-"Analitza5" = "analitza";
-"Backend" = "kde-workspace";
-"CTest" = "sweeper";
-"ECM" = "extra-cmake-modules";
-"Gpgmepp" = "kdepimlibs";
-"JDns" = "kopete";
-"KAccounts" = "kaccounts-integration";
-"KDE4Workspace" = "kde-workspace";
-"KDEGames" = "libkdegames";
-"KDeclarative" = "kdelibs";
-"KF5KMahjongglib" = "libkmahjongg";
-"KSane" = "libksane";
-"KTp" = "ktp-common-internals";
-"KastenControllers" = "okteta";
-"KastenCore" = "okteta";
-"KastenGui" = "okteta";
-"KdepimLibs" = "kdepimlibs";
-"LibKEduVocDocument" = "libkeduvocdocument";
-"LibKdeEdu" = "libkdeedu";
-"LibKompareDiff2" = "libkomparediff2";
-"Libkcddb" = "libkcddb";
-"Libkcompactdisc" = "libkcompactdisc";
-"OktetaCore" = "okteta";
-"OktetaGui" = "okteta";
-"OktetaKastenControllers" = "okteta";
-"OktetaKastenCore" = "okteta";
-"OktetaKastenGui" = "okteta";
-"Okular" = "okular";
-"QJDns" = "kopete";
-"QMobipocket" = "kdegraphics-mobipocket";
-}
diff --git a/pkgs/build-support/autonix/default.nix b/pkgs/build-support/autonix/default.nix
index 02862abca49..5aba2620cda 100644
--- a/pkgs/build-support/autonix/default.nix
+++ b/pkgs/build-support/autonix/default.nix
@@ -146,11 +146,11 @@ let
 
   mkDerivation = drv: stdenv.mkDerivation (drv // { src = fetchurl drv.src; });
 
-  resolveDeps = scope:
-    let resolveDeps_go = dep:
+  resolveDeps = scope: deps:
+    let resolve = dep:
           let res = scope."${dep}" or [];
-          in if isList res then res else [res];
-    in concatMap resolveDeps_go;
+          in if lib.isList res then res else [res];
+    in lib.concatMap resolve deps;
 
   userEnvPkg = dep:
     mapAttrs
@@ -176,4 +176,96 @@ in
       removeDeps = deps: mapAttrs (name: removePkgDeps deps);
       removePkgs = names: pkgs: builtins.removeAttrs pkgs names;
     in removeDeps names (removePkgs names pkgs);
+
+  lib = rec {
+    mkPackage = callPackage: defaultOverride: name: pkg: let drv =
+      { mkDerivation, fetchurl, scope }:
+
+      mkDerivation (defaultOverride {
+        inherit (pkg) name;
+
+        src = fetchurl pkg.src;
+
+        buildInputs = resolveDeps scope pkg.buildInputs;
+        nativeBuildInputs = resolveDeps scope pkg.nativeBuildInputs;
+        propagatedBuildInputs = resolveDeps scope pkg.propagatedBuildInputs;
+        propagatedNativeBuildInputs =
+          resolveDeps scope pkg.propagatedNativeBuildInputs;
+        propagatedUserEnvPkgs = resolveDeps scope pkg.propagatedUserEnvPkgs;
+
+        enableParallelBuilding = true;
+      });
+    in callPackage drv {};
+
+    renameDeps = renames: lib.mapAttrs (name: pkg:
+      let breakCycles = lib.filter (dep: dep != name);
+          rename = dep: renames."${dep}" or dep;
+      in pkg // {
+        buildInputs = breakCycles (map rename pkg.buildInputs);
+        nativeBuildInputs = breakCycles (map rename pkg.nativeBuildInputs);
+        propagatedBuildInputs = breakCycles (map rename pkg.propagatedBuildInputs);
+        propagatedNativeBuildInputs = breakCycles (map rename pkg.propagatedNativeBuildInputs);
+        propagatedUserEnvPkgs = breakCycles (map rename pkg.propagatedUserEnvPkgs);
+      });
+
+    propagateDeps = propagated: lib.mapAttrs (name: pkg:
+      let isPropagated = dep: lib.elem dep propagated;
+          isNotPropagated = dep: !(isPropagated dep);
+      in pkg // {
+        buildInputs = lib.filter isNotPropagated pkg.buildInputs;
+        nativeBuildInputs = lib.filter isNotPropagated pkg.nativeBuildInputs;
+        propagatedBuildInputs =
+          pkg.propagatedBuildInputs
+          ++ lib.filter isPropagated pkg.buildInputs;
+        propagatedNativeBuildInputs =
+          pkg.propagatedNativeBuildInputs
+          ++ lib.filter isPropagated pkg.nativeBuildInputs;
+      });
+
+    nativeDeps = native: lib.mapAttrs (name: pkg:
+      let isNative = dep: lib.elem dep native;
+          isNotNative = dep: !(isNative dep);
+      in pkg // {
+        buildInputs = lib.filter isNotNative pkg.buildInputs;
+        nativeBuildInputs =
+          pkg.nativeBuildInputs
+          ++ lib.filter isNative pkg.buildInputs;
+        propagatedBuildInputs = lib.filter isNotNative pkg.propagatedBuildInputs;
+        propagatedNativeBuildInputs =
+          pkg.propagatedNativeBuildInputs
+          ++ lib.filter isNative pkg.propagatedBuildInputs;
+      });
+
+    userEnvDeps = user: lib.mapAttrs (name: pkg:
+      let allDeps = with pkg; lib.concatLists [
+            buildInputs
+            nativeBuildInputs
+            propagatedBuildInputs
+            propagatedNativeBuildInputs
+          ];
+      in assert (lib.isList allDeps); pkg // {
+        propagatedUserEnvPkgs = lib.filter (dep: lib.elem dep user) allDeps;
+      });
+
+    overrideDerivation = pkg: f: pkg.override (super: super // {
+      mkDerivation = drv: super.mkDerivation (drv // f drv);
+    });
+
+    extendDerivation = pkg: attrs:
+      let mergeAttrBy = lib.mergeAttrBy // {
+            propagatedNativeBuildInputs = a: b: a ++ b;
+            NIX_CFLAGS_COMPILE = a: b: "${a} ${b}";
+            cmakeFlags = a: b: a ++ b;
+          };
+          mergeAttrsByFunc = sets:
+            let merged = lib.foldl lib.mergeAttrByFunc { inherit mergeAttrBy; } sets;
+            in builtins.removeAttrs merged ["mergeAttrBy"];
+      in overrideDerivation pkg (drv: mergeAttrsByFunc [ drv attrs ]);
+
+    overrideScope = pkg: fnOrSet: pkg.override (super: super // {
+      scope = if builtins.isFunction fnOrSet
+                then super.scope // fnOrSet super.scope
+              else super.scope // fnOrSet;
+    });
+  };
 }
diff --git a/pkgs/build-support/autonix/manifest.sh b/pkgs/build-support/autonix/manifest.sh
index df0f52a73b5..5be69cc6175 100755
--- a/pkgs/build-support/autonix/manifest.sh
+++ b/pkgs/build-support/autonix/manifest.sh
@@ -4,38 +4,41 @@
 
 @wget@/bin/wget -nH -r -c --no-parent $*
 
-cat >../manifest.nix <<EOF
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
+cat >../manifest.json <<EOF
 [
 EOF
 
 workdir=$(pwd)
+sep=""
 
 @findutils@/bin/find . | while read path; do
     if [[ -f "${path}" ]]; then
+        [[ -n "${sep}" ]] && echo "$sep" >>../manifest.json
         url="${path:2}"
         # Sanitize file name
-        name=$(@coreutils@/bin/basename "${path}" | tr '@' '_')
+        filename=$(@coreutils@/bin/basename "${path}" | tr '@' '_')
+        nameversion="${filename%.tar.*}"
+        name="${nameversion%-*}"
         dirname=$(@coreutils@/bin/dirname "${path}")
-        mv "${workdir}/${path}" "${workdir}/${dirname}/${name}"
+        mv "${workdir}/${path}" "${workdir}/${dirname}/${filename}"
         # Prefetch and hash source file
-        sha256=$(@nix@/bin/nix-prefetch-url "file://${workdir}/${dirname}/${name}")
-        store=$(@nix@/bin/nix-store --print-fixed-path sha256 "$sha256" "$name")
-        cat >>../manifest.nix <<EOF
+        sha256=$(@nix@/bin/nix-prefetch-url "file://${workdir}/${dirname}/${filename}")
+        store=$(@nix@/bin/nix-store --print-fixed-path sha256 "$sha256" "$filename")
+        cat >>../manifest.json <<EOF
   {
-    name = stdenv.lib.nameFromURL "${name}" ".tar";
-    store = "${store}";
-    src = fetchurl {
-      url = "\${mirror}/${url}";
-      sha256 = "${sha256}";
-      name = "${name}";
-    };
+    "name": "${nameversion}",
+    "store": "${store}",
+    "src": {
+      "url": "${url}",
+      "sha256": "${sha256}",
+      "name": "${filename}"
+    }
   }
 EOF
+        sep=","
     fi
 done
 
-echo "]" >>../manifest.nix
+echo "]" >>../manifest.json
 
 cd ..
diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index 39ccb4e3c30..ba1c1b78fc7 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -12,181 +12,224 @@
 #  make a copy of this directory first. After copying, be sure to delete ./tmp
 #  if it exists. Then follow the minor update instructions.
 
-{ autonix, kf5, kdeApps, pkgs, qt5, stdenv, debug ? false }:
+{ pkgs, newScope, kf5 ? null, qt5 ? null, debug ? false }:
 
-with stdenv.lib; with autonix;
+let inherit (pkgs) autonix stdenv symlinkJoin; in
 
 let kf5Orig = kf5; in
 
 let
+  kf5_ = if kf5 != null then kf5 else pkgs.kf510;
+  qt5_ = if qt5 != null then qt5 else pkgs.qt54;
+in
 
-  kf5 = kf5Orig.override { inherit debug qt5; };
+let
 
-  mirror = "mirror://kde";
+  qt5 = qt5_;
+  kf5 = kf5_.override { inherit qt5; };
 
-  renames =
-    builtins.removeAttrs
-      (import ./renames.nix {})
-      ["Backend" "CTest"];
+  kdePackage = name: pkg:
+    let defaultOverride = drv: drv // {
+          setupHook = ./setup-hook.sh;
+          cmakeFlags =
+            (drv.cmakeFlags or [])
+            ++ [ "-DBUILD_TESTING=OFF" ]
+            ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+          meta = {
+            license = with stdenv.lib.licenses; [
+              lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+            ];
+            platforms = stdenv.lib.platforms.linux;
+            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+            homepage = "http://www.kde.org";
+          };
+        };
+        callPackage = newScope {
+          inherit (stdenv) mkDerivation;
+          inherit (pkgs) fetchurl;
+          inherit scope;
+        };
+    in mkPackage callPackage defaultOverride name pkg;
+
+  super =
+    let json = builtins.fromJSON (builtins.readFile ./packages.json);
+        mirrorUrl = n: pkg: pkg // {
+          src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
+        };
+        renames =
+          (builtins.fromJSON (builtins.readFile ./kf5-renames.json))
+          // (builtins.fromJSON (builtins.readFile ./renames.json));
+        propagated = [ "extra-cmake-modules" ];
+        native = [
+          "bison"
+          "extra-cmake-modules"
+          "flex"
+          "kdoctools"
+          "ki18n"
+          "libxslt"
+          "perl"
+          "pythoninterp"
+        ];
+        user = [
+          "shareddesktopontologies"
+          "sharedmimeinfo"
+        ];
+    in lib.fold (f: attrs: f attrs) json [
+      (lib.mapAttrs kdePackage)
+      (userEnvDeps user)
+      (nativeDeps native)
+      (propagateDeps propagated)
+      (renameDeps renames)
+      (lib.mapAttrs mirrorUrl)
+    ];
 
   scope =
+    # KDE Frameworks 5
+    kf5 //
     # packages in this collection
-    (mapAttrs (dep: name: plasma5."${name}") renames) //
-    # packages from KDE Frameworks 5
-    kf5.scope //
+    self //
     # packages pinned to this version of Qt 5
     {
-      LibBlueDevil = pkgs.libbluedevil;
-      PolkitQt5-1 = pkgs.polkit_qt5.override { inherit qt5; };
-      PopplerQt5 = pkgs.poppler_qt5.override { inherit qt5; };
+      dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
+      libbluedevil = pkgs.libbluedevil.override { inherit qt5; };
+      phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
+      polkitqt5-1 = pkgs.polkit_qt5.override { inherit qt5; };
+      poppler_qt5 = pkgs.poppler_qt5.override { inherit qt5; };
+      qt5script = qt5.script;
+      qt5tools = qt5.tools;
+      qt5x11extras = qt5.x11extras;
     } //
     # packages from nixpkgs
-    (with pkgs;
-      {
-        inherit epoxy;
-        Epub = ebook_tools;
-        Exiv2 = exiv2;
-        FFmpeg = ffmpeg;
-        FONTFORGE_EXECUTABLE = fontforge;
-        Freetype = freetype;
-        GTK2 = gtk2;
-        GTK3 = gtk3;
-        Libinput = libinput;
-        LibSSH = libssh;
-        PulseAudio = libpulseaudio;
-        Taglib = taglib;
-        USB = libusb;
-        Wayland = wayland;
-        Xapian = xapian;
-      }
-    );
+    (with pkgs; {
+      inherit attr bash cairo cmake dbus epoxy exiv2 ffmpeg freetype
+              glib gnugrep gnused gtk2 gtk3 libinput libssh
+              modemmanager openconnect openexr pam pango qt4 samba
+              socat substituteAll taglib utillinux wayland xapian
+              xkeyboard_config xlibs xorg;
+      boost = boost155;
+      canberra = libcanberra;
+      epub = ebook_tools;
+      fontforge_executable = fontforge;
+      mobilebroadbandproviderinfo = mobile_broadband_provider_info;
+      mtp = libmtp;
+      pulseaudio = libpulseaudio;
+      shareddesktopontologies = shared_desktop_ontologies;
+      sharedmimeinfo = shared_mime_info;
+      usb = libusb;
+    });
 
-  preResolve = super:
-    fold (f: x: f x) super
-      [
-        (userEnvPkg "SharedMimeInfo")
-        (userEnvPkg "SharedDesktopOntologies")
-        (blacklist ["bluedevil"])
-      ];
+  self = (builtins.removeAttrs super ["bluedevil"]) // {
 
-  postResolve = super:
-    (builtins.removeAttrs super ["breeze"]) // {
+    bluez-qt = overrideDerivation super.bluez-qt (drv: {
+      preConfigure = ''
+        substituteInPlace CMakeLists.txt \
+          --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
+      '';
+    });
 
-      bluez-qt = super.bluez-qt // {
-        preConfigure = ''
-          substituteInPlace CMakeLists.txt \
-            --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
-        '';
-      };
+    breeze =
+      let
+        version = (builtins.parseDrvName super.breeze.name).version;
 
-      breeze-qt4 = with pkgs; super.breeze // {
-        name = "breeze-qt4-" + (builtins.parseDrvName super.breeze.name).version;
-        buildInputs = [ xlibs.xproto kde4.kdelibs qt4 ];
-        nativeBuildInputs = [ cmake pkgconfig ];
-        cmakeFlags =
-          [
+        breeze-qt4 = overrideDerivation super.breeze (drv: {
+          name = "breeze-qt4-${version}";
+          buildInputs = [ pkgs.xlibs.xproto pkgs.kde4.kdelibs pkgs.qt4 ];
+          nativeBuildInputs = [ scope.cmake pkgs.pkgconfig ];
+          cmakeFlags = [
             "-DUSE_KDE4=ON"
-            "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
+            "-DQT_QMAKE_EXECUTABLE=${scope.qt4}/bin/qmake"
           ];
-      };
+        });
 
-      breeze-qt5 = with pkgs; super.breeze // {
-        name = "breeze-qt5-" + (builtins.parseDrvName super.breeze.name).version;
-        buildInputs = with kf5; with plasma5;
-          [
-            kcompletion kconfig kconfigwidgets kcoreaddons kdecoration kguiaddons
-            frameworkintegration ki18n kwindowsystem qt5.base qt5.x11extras
+        breeze-qt5 = overrideDerivation super.breeze (drv: {
+          name = "breeze-qt5-${version}";
+          buildInputs = with kf5; with self; [
+            kcompletion kconfig kconfigwidgets kcoreaddons kdecoration
+            kguiaddons frameworkintegration ki18n kwindowsystem qt5.base
+            qt5.x11extras
           ];
-        nativeBuildInputs = [ cmake kf5.extra-cmake-modules pkgconfig ];
-        cmakeFlags = [ "-DUSE_KDE4=OFF" ];
-      };
+          nativeBuildInputs = [ scope.cmake kf5.extra-cmake-modules pkgs.pkgconfig ];
+          cmakeFlags = [ "-DUSE_KDE4=OFF" ];
+        });
+      in symlinkJoin "breeze-${version}" [ breeze-qt4 breeze-qt5 ];
 
-      kde-gtk-config = with pkgs; super.kde-gtk-config // {
-        NIX_CFLAGS_COMPILE =
-          (super.kde-gtk-config.NIX_CFLAGS_COMPILE or "")
-          + " -I${cairo}/include/cairo"
-          + " -I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include"
-          + " -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"
-          + " -I${pango}/include/pango-1.0";
-      };
-
-      kfilemetadata = super.kfilemetadata // {
-        buildInputs = with pkgs; super.kfilemetadata.buildInputs ++ [ attr ];
-      };
-
-      kwin = with pkgs; super.kwin // {
-        buildInputs = with xlibs;
-          super.kwin.buildInputs ++ [ libICE libSM libXcursor ];
-        patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ];
-      };
-
-      libkscreen = with pkgs; super.libkscreen // {
-        buildInputs = with xlibs; super.libkscreen.buildInputs ++ [libXrandr];
-      };
-
-      plasma-desktop = with pkgs; super.plasma-desktop // {
-        buildInputs = with xlibs;
-          super.plasma-desktop.buildInputs ++
-          [ pkgs.libcanberra libxkbfile libXcursor libXft ];
-        patches = [
-          ./plasma-desktop/plasma-desktop-hwclock.patch
-          ./plasma-desktop/plasma-desktop-zoneinfo.patch
-          (substituteAll {
-            src = ./plasma-desktop/plasma-desktop-xkb-rules.patch;
-            xkb = pkgs.xkeyboard_config;
-          })
+    kde-gtk-config = overrideDerivation super.kde-gtk-config (drv: {
+      NIX_CFLAGS_COMPILE = with scope;
+        lib.concatStringsSep " " [
+          "-I${cairo}/include/cairo"
+          "-I${gtk2}/include/gtk-2.0"
+          "-I${gtk2}/lib/gtk-2.0/include"
+          "-I${glib}/include/glib-2.0"
+          "-I${glib}/lib/glib-2.0/include"
+          "-I${pango}/include/pango-1.0"
         ];
-        preConfigure = ''
-          substituteInPlace kcms/dateandtime/helper.cpp \
-            --subst-var-by hwclock "${utillinux}/sbin/hwclock"
-        '';
-      };
+    });
 
-      plasma-workspace = with pkgs; super.plasma-workspace // {
-        patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ];
-        buildInputs = with xlibs;
-          super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ];
+    kfilemetadata = overrideDerivation super.kfilemetadata (drv: {
+      buildInputs = drv.buildInputs ++ [ pkgs.attr ];
+    });
 
-        inherit (pkgs) bash gnused gnugrep socat;
-        inherit (kf5) kconfig kinit kservice;
-        inherit (pkgs.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
-        kde_workspace = kdeApps.kde-workspace;
-        qt5tools = qt5.tools;
-        dbus_tools = pkgs.dbus.tools;
+    kwin = overrideDerivation super.kwin (drv: {
+      buildInputs =
+        drv.buildInputs ++ (with pkgs.xlibs; [ libICE libSM libXcursor ]);
+      patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ];
+    });
 
-        postPatch = ''
-          substituteAllInPlace startkde/startkde.cmake
-          substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
-            --replace kdostartupconfig5 $out/bin/kdostartupconfig5
-        '';
-        preConfigure = ''
-          substituteInPlace startkde/startkde.cmake \
-            --subst-var-by plasmaWorkspace "$out"
-        '';
-      };
+    libkscreen = overrideDerivation super.libkscreen (drv: {
+      buildInputs = drv.buildInputs ++ [ pkgs.xlibs.libXrandr];
+    });
 
-      powerdevil = with pkgs; super.powerdevil // {
-        buildInputs = with xlibs; super.powerdevil.buildInputs ++ [libXrandr];
-      };
+    plasma-desktop = overrideDerivation super.plasma-desktop (drv: {
+      buildInputs =
+        drv.buildInputs
+        ++ [ pkgs.libcanberra ]
+        ++ (with pkgs.xlibs; [ libxkbfile libXcursor libXft ]);
+      patches = [
+        ./plasma-desktop/plasma-desktop-hwclock.patch
+        ./plasma-desktop/plasma-desktop-zoneinfo.patch
+        (pkgs.substituteAll {
+          src = ./plasma-desktop/plasma-desktop-xkb-rules.patch;
+          xkb = pkgs.xkeyboard_config;
+        })
+      ];
+      preConfigure = ''
+        substituteInPlace kcms/dateandtime/helper.cpp \
+          --subst-var-by hwclock "${scope.utillinux}/sbin/hwclock"
+      '';
+    });
 
-      sddm-kcm = with pkgs; super.sddm-kcm // {
-        buildInputs = with xlibs; super.sddm-kcm.buildInputs ++ [libXcursor];
-      };
+    plasma-workspace = overrideDerivation super.plasma-workspace (drv: {
+      patches = [
+        (pkgs.substituteAll {
+          src = ./plasma-workspace/0001-startkde-NixOS-patches.patch;
+          inherit (pkgs) bash gnused gnugrep socat;
+          inherit (kf5) kconfig kinit kservice;
+          inherit (pkgs.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
+          qt5tools = qt5.tools;
+          dbus_tools = pkgs.dbus.tools;
+        })
+      ];
+      buildInputs =
+        (drv.buildInputs or [])
+        ++ (with pkgs.xlibs; [ libSM libXcursor scope.pam ]);
+      postPatch = ''
+        substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
+          --replace kdostartupconfig5 $out/bin/kdostartupconfig5
+      '';
+      preConfigure = ''
+        substituteInPlace startkde/startkde.cmake \
+          --subst-var-by plasmaWorkspace "$out"
+      '';
+    });
 
-      /*
-      user-manager = super.user-manager // {
-        buildInputs = with pkgs; super.user-manager.buildInputs ++ [ libpwquality ];
-      };
-      */
+    powerdevil = overrideDerivation super.powerdevil (drv: {
+      buildInputs = drv.buildInputs ++ [pkgs.xlibs.libXrandr];
+    });
 
-    };
+    sddm-kcm = overrideDerivation super.sddm-kcm (drv: {
+      buildInputs = drv.buildInputs ++ [pkgs.xlibs.libXcursor];
+    });
 
-  plasma5 = generateCollection ./. {
-    inherit (kf5) mkDerivation;
-    inherit mirror preResolve postResolve renames scope;
   };
 
-in
-  plasma5 // {
-    inherit kf5 scope;
-  }
+in self
diff --git a/pkgs/desktops/plasma-5.3/dependencies.nix b/pkgs/desktops/plasma-5.3/dependencies.nix
deleted file mode 100644
index 3a813402f2c..00000000000
--- a/pkgs/desktops/plasma-5.3/dependencies.nix
+++ /dev/null
@@ -1,300 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-  baloo = {
-    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5Crash" "KF5DBusAddons" "KF5FileMetaData" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5Solid" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" "Xapian" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "KF5FileMetaData" "Qt5Core" "Xapian" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  bluedevil = {
-    buildInputs = [ "ECM" "KDED" "KF5" "KF5BluezQt" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5MODULE" "KF5Notifications" "KF5Plasma" "KF5WidgetsAddons" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Qml" "Qt5Widgets" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  bluez-qt = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5QuickTest" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  breeze = {
-    buildInputs = [ "ECM" "KDE4" "KDecoration2" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5KCMUtils" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-cli-tools = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5Su" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-gtk-config = {
-    buildInputs = [ "ECM" "GTK2" "GTK3" "KF5" "KF5Archive" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "Qt5" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdecoration = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdeplasma-addons = {
-    buildInputs = [ "ECM" "GIO" "GLIB2" "GObject" "IBus" "KDE4" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Kross" "KF5NewStuff" "KF5Plasma" "KF5Purpose" "KF5QUIET" "KF5Runner" "KF5Service" "KF5UnitConversion" "KdepimLibs" "Kexiv2" "Lancelot" "Lancelot-Datamodels" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5Qml" "Qt5Quick" "Qt5Widgets" "Qt5X11Extras" "SCIM" "SharedMimeInfo" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kfilemetadata = {
-    buildInputs = [ "ECM" "EPub" "Exiv2" "FFmpeg" "KF5" "KF5Archive" "KF5I18n" "PopplerQt5" "QMobipocket" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Xml" "Taglib" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  khelpcenter = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KHtml" "Qt5" "Qt5DBus" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  khotkeys = {
-    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Plasma" "KF5XmlGui" "LibKWorkspace" "Qt5" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kinfocenter = {
-    buildInputs = [ "ECM" "EGL" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Package" "KF5Service" "KF5Solid" "KF5Wayland" "KF5WidgetsAddons" "KF5XmlGui" "OpenGL" "OpenGLES" "PCIUTILS" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Widgets" "RAW1394" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kio-extras = {
-    buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Archive" "KF5Bookmarks" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DNSSD" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KHtml" "KF5KIO" "KF5Pty" "KF5Solid" "LibSSH" "Mtp" "OpenEXR" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5Network" "Qt5QUIET" "Qt5Svg" "Qt5Test" "Qt5Widgets" "SLP" "Samba" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "MD5SUM_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kmenuedit = {
-    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KIO" "KF5Sonnet" "KF5XmlGui" "KHotKeysDBusInterface" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kscreen = {
-    buildInputs = [ "ECM" "KF5" "KF5ConfigWidgets" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5Screen" "KF5XmlGui" "Qt5" "Qt5QuickWidgets" "Qt5Test" "Qt5X11Extras" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksshaskpass = {
-    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5Wallet" "KF5WidgetsAddons" "Qt5" "Qt5Core" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksysguard = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDELibs4Support" "KF5NewStuff" "KF5SysGuard" "Qt5" "Qt5Core" "Qt5Widgets" "Sensors" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwayland = {
-    buildInputs = [ "ECM" "EGL" "Qt5" "Qt5COMPONENT" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5Private" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5_check_private" "Wayland" "WaylandScanner" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwin = {
-    buildInputs = [ "ECM" "EGL" "KDecoration2" "KF5" "KF5Activities" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Wayland" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Libinput" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5Multimedia" "Qt5QUIET" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5X11Extras" "Threads" "UDev" "Wayland" "X11" "X11_XCB" "XCB" "XKB" "epoxy" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwrited = {
-    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5Notifications" "KF5Pty" "Qt5" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkscreen = {
-    buildInputs = [ "Doxygen" "ECM" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5Test" "Qt5X11Extras" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libksysguard = {
-    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5Plasma" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Network" "Qt5Script" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5X11Extras" "X11" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5I18n" "KF5IconThemes" "Qt5Core" "Qt5Network" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  milou = {
-    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5Declarative" "KF5I18n" "KF5Plasma" "KF5Runner" "KF5Service" "KdepimLibs" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  muon = {
-    buildInputs = [ "AkabeiClient" "AppstreamQt" "BODEGA" "DebconfKDE" "ECM" "KF5" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "Phonon4Qt5" "QApt" "Qca-qt5" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5Xml" "QtOAuth" "packagekitqt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  oxygen = {
-    buildInputs = [ "ECM" "KDE4" "KDE4Workspace" "KDecoration2" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  oxygen-fonts = {
-    buildInputs = [ "ECM" ];
-    nativeBuildInputs = [ "FONTFORGE_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-desktop = {
-    buildInputs = [ "Boost" "Canberra" "ECM" "Fontconfig" "Freetype" "GLIB2" "KDE4" "KF5" "KF5Activities" "KF5Attica" "KF5Auth" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5Emoticons" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5ItemModels" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5NotifyConfig" "KF5People" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Wallet" "KRunnerAppDBusInterface" "KSMServerDBusInterface" "KWinDBusInterface" "LibKWorkspace" "LibTaskManager" "OpenGL" "OpenGLES" "PackageKitQt5" "Phonon4Qt5" "PulseAudio" "Qt4" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "ScreenSaverDBusInterface" "Strigi" "Synaptics" "USB" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-mediacenter = {
-    buildInputs = [ "ECM" "KF5" "KF5Baloo" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Declarative" "KF5FileMetaData" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5PlasmaQuick" "KF5Service" "KF5WindowSystem" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Multimedia" "Qt5QUIET" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Xml" "Taglib" "mockcpp" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-nm = {
-    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5ModemManagerQt" "KF5NetworkManagerQt" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "MobileBroadbandProviderInfo" "ModemManager" "NetworkManager" "OpenConnect" "OpenSSL" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Network" "Qt5Quick" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-sdk = {
-    buildInputs = [ "ActiveApp" "ECM" "KDevPlatform" "KF5" "KF5Archive" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5Parts" "KF5Plasma" "KF5PlasmaQuick" "KF5Service" "KF5TextEditor" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "QGpgme" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5WebKit" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "GIT_EXECUTABLE_FOUND" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-workspace = {
-    buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5JsEmbed" "KF5KCMUtils" "KF5KDELibs4Support" "KF5NO_MODULE" "KF5NetworkManagerQt" "KF5NewStuff" "KF5NotifyConfig" "KF5Package" "KF5Plasma" "KF5PlasmaQuick" "KF5Prison" "KF5Runner" "KF5Screen" "KF5Solid" "KF5Su" "KF5SysGuard" "KF5TextEditor" "KF5TextWidgets" "KF5Wallet" "KF5Wayland" "KF5WebKit" "KF5XmlRpcClient" "KWinDBusInterface" "Phonon4Qt5" "Qalculate" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Sql" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5X11Extras" "Wayland" "WaylandScanner" "X11" "XCB" "ZLIB" "dbusmenu-qt5" "libgps" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5SysGuard" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-workspace-wallpapers = {
-    buildInputs = [ "ECM" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  polkit-kde-agent = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5WidgetsAddons" "KF5WindowSystem" "PolkitQt5-1" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  powerdevil = {
-    buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Auth" "KF5Config" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5NotifyConfig" "KF5Screen" "KF5Solid" "LibKWorkspace" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "UDev" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  sddm-kcm = {
-    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Designer" "Qt5Gui" "Qt5Quick" "Qt5QuickWidgets" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  systemsettings = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  user-manager = {
-    buildInputs = [ "ECM" "KF5" "KF5I18n" "KF5KDELibs4Support" "PWQuality" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-}
diff --git a/pkgs/desktops/plasma-5.3/dependencies.sh b/pkgs/desktops/plasma-5.3/dependencies.sh
deleted file mode 100755
index e614efc5475..00000000000
--- a/pkgs/desktops/plasma-5.3/dependencies.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# This script rebuilds dependencies.nix.
-# You must run manifest.sh first to download the packages.
-
-# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
-# If you are working on the packages, this is probably what you want.
-
-# You can also pass the path to a source tree where you have built
-# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
-# probably what you want.
-
-manifestXML=$(nix-build -E 'with (import ../../.. {}); autonix.writeManifestXML ./manifest.nix')
-
-autonixDepsKf5=""
-if [[ -z $1 ]]; then
-    autonixDepsKF5=$(nix-build ../../.. -A haskellngPackages.autonix-deps-kf5)/bin
-else
-    autonixDepsKF5="$1/dist/build/kf5-deps"
-fi
-
-exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
diff --git a/pkgs/desktops/plasma-5.3/kf5-renames.json b/pkgs/desktops/plasma-5.3/kf5-renames.json
new file mode 100644
index 00000000000..4da5f8272ee
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/kf5-renames.json
@@ -0,0 +1,70 @@
+{
+    "kf5widgetsaddons": "kwidgetsaddons",
+    "kf5texteditor": "ktexteditor",
+    "kf5designerplugin": "kdesignerplugin",
+    "kf5bookmarks": "kbookmarks",
+    "kf5frameworkintegration": "frameworkintegration",
+    "kf5package": "kpackage",
+    "kf5archive": "karchive",
+    "kf5plasma": "plasma-framework",
+    "kf5kcmutils": "kcmutils",
+    "kf5configwidgets": "kconfigwidgets",
+    "ctest": "attica",
+    "kf5kio": "kio",
+    "kf5networkmanagerqt": "networkmanager-qt",
+    "kf5coreaddons": "kcoreaddons",
+    "kf5guiaddons": "kguiaddons",
+    "kf5jobwidgets": "kjobwidgets",
+    "kf5modemmanagerqt": "modemmanager-qt",
+    "kf5runner": "krunner",
+    "kf5globalaccel": "kglobalaccel",
+    "kf5dbusaddons": "kdbusaddons",
+    "kf5crash": "kcrash",
+    "kf5itemviews": "kitemviews",
+    "kf5doctools": "kdoctools",
+    "kf5i18n": "ki18n",
+    "kf5webkit": "kdewebkit",
+    "kf5newstuff": "knewstuff",
+    "kded": "kded",
+    "kf5notifications": "knotifications",
+    "kf5activitiesexperimentalstats": "kactivities",
+    "kf5dnssd": "kdnssd",
+    "kf5notifyconfig": "knotifyconfig",
+    "kf5iconthemes": "kiconthemes",
+    "kf5js": "kjs",
+    "kf5kde4support": "kdelibs4support",
+    "kf5parts": "kparts",
+    "backend": "plasma-framework",
+    "kf5completion": "kcompletion",
+    "kf5threadweaver": "threadweaver",
+    "kf5mediaplayer": "kmediaplayer",
+    "kf5plasmaquick": "plasma-framework",
+    "kf5wallet": "kwallet",
+    "kf5xmlgui": "kxmlgui",
+    "kf5attica": "attica",
+    "kf5declarative": "kdeclarative",
+    "kf5config": "kconfig",
+    "kf5init": "kinit",
+    "kf5textwidgets": "ktextwidgets",
+    "kf5jsembed": "kjsembed",
+    "kf5codecs": "kcodecs",
+    "kf5service": "kservice",
+    "kf5sonnet": "sonnet",
+    "kf5kdelibs4support": "kdelibs4support",
+    "kf5pty": "kpty",
+    "kf5solid": "solid",
+    "kf5auth": "kauth",
+    "ecm": "extra-cmake-modules",
+    "kf5activities": "kactivities",
+    "kf5plotting": "kplotting",
+    "kf5people": "kpeople",
+    "kf5emoticons": "kemoticons",
+    "kf5kross": "kross",
+    "kf5su": "kdesu",
+    "kf5khtml": "khtml",
+    "kf5unitconversion": "kunitconversion",
+    "kf5idletime": "kidletime",
+    "kf5windowsystem": "kwindowsystem",
+    "kf5xmlrpcclient": "kxmlrpcclient",
+    "kf5itemmodels": "kitemmodels"
+}
\ No newline at end of file
diff --git a/pkgs/desktops/plasma-5.3/manifest.nix b/pkgs/desktops/plasma-5.3/manifest.nix
deleted file mode 100644
index a815327826a..00000000000
--- a/pkgs/desktops/plasma-5.3/manifest.nix
+++ /dev/null
@@ -1,328 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
-[
-  {
-    name = stdenv.lib.nameFromURL "breeze-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/wksay8grc0ihprrjkvfwaa5n0v1dsn7p-breeze-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/breeze-5.3.1.tar.xz";
-      sha256 = "0sh7vgg3dz0cs6mqs4c3ygw5qg4lcjm0vdh4mm4xfxnizagkqrr5";
-      name = "breeze-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "baloo-5.9.1.tar.xz" ".tar";
-    store = "/nix/store/yljbiij3svkkmmqpwqxyc5gf8p4gz9zl-baloo-5.9.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/baloo-5.9.1.tar.xz";
-      sha256 = "0wx9n3l4f1ibddvhbiharhgd20s8hzs64b2c0686bm82qmbkkl7n";
-      name = "baloo-5.9.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksshaskpass-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/8p1spxbb4iv5wrccipby7khh6r5pj4gb-ksshaskpass-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/ksshaskpass-5.3.1.tar.xz";
-      sha256 = "0ids7vbi46bdd5dbjgv0wfv4rfv03kpln5vr3rwavah892q1dad2";
-      name = "ksshaskpass-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscreen-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/0gf4avv67cspclipvs1934fa9vn5bday-kscreen-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kscreen-5.3.1.tar.xz";
-      sha256 = "008ys3glpvpcvjh7n2gls3m13q9qswmnc5l2lz4zs1dvcrk5z7yr";
-      name = "kscreen-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwayland-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/fqs8y8fmkk23biqlicq50m281jf45qbj-kwayland-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kwayland-5.3.1.tar.xz";
-      sha256 = "1vsdsf00py6i16zwbwpplq1v7m3fy1j0dskvkb080wm0fskz1r8f";
-      name = "kwayland-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "muon-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/glhhnkdnn4sancq176mwd3pdw51xg58s-muon-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/muon-5.3.1.tar.xz";
-      sha256 = "0k2c625d9i5gyyvdzlajkb0kcvss60lhs7qssil1a4w34ch3zfmk";
-      name = "muon-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khelpcenter-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/s676r82b3lpr3fzrqcw0srl8zx9mj57l-khelpcenter-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/khelpcenter-5.3.1.tar.xz";
-      sha256 = "0dik353w6ri6mfkvkz3v5xva6x59zlbz1sj522li0gbd73x4bzf2";
-      name = "khelpcenter-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeplasma-addons-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/his4ak4djxslvmrdznyzf3v6mr3aq40s-kdeplasma-addons-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kdeplasma-addons-5.3.1.tar.xz";
-      sha256 = "1myk3508jqgalyqa1rlx1dq5afppvhvsnd7irf4wywpgls20nwnv";
-      name = "kdeplasma-addons-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "systemsettings-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/8fyfslw9ip7fsn6gb55v6i1cxajgxmjb-systemsettings-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/systemsettings-5.3.1.tar.xz";
-      sha256 = "06m3r31dr0ivhn25fg0sg8pbxyzvm8slsmqkqsm4cbypg028axx0";
-      name = "systemsettings-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kinfocenter-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/flpcnl0mn3mma12nkgymabjgzm1yc4kf-kinfocenter-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kinfocenter-5.3.1.tar.xz";
-      sha256 = "02gqlidh9pb924vhhaxnidpjz3cb32r6icikhcv7csrll13wgp1a";
-      name = "kinfocenter-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkscreen-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/3i82s0x8hsi0q9hyp8m42m8nxcm6cwx5-libkscreen-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/libkscreen-5.3.1.tar.xz";
-      sha256 = "00g401yfiyqh09ajkinlkzhfpb7lsy0wpnrk1ba8vm4wmcvkp63l";
-      name = "libkscreen-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksysguard-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/8jaxispzwkpdy6kazyhdy6k00f0s7dla-libksysguard-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/libksysguard-5.3.1.tar.xz";
-      sha256 = "115iwqq4y6pnhqsa5yn30q6wdpad5v48m7hjrn7jbpm3gsiwq1ym";
-      name = "libksysguard-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmenuedit-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/p6x58nfjkml2125rpvkr7zcvrv11fn1l-kmenuedit-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kmenuedit-5.3.1.tar.xz";
-      sha256 = "0vyy3xb32nb2qxfv3qvrrzlnck6gas0gwyncbn4rzimaygm2vzqz";
-      name = "kmenuedit-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-mediacenter-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/g9r436iff0714c2ya9xbm0sgd4gdiaq5-plasma-mediacenter-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/plasma-mediacenter-5.3.1.tar.xz";
-      sha256 = "0h8dpyszn7hk7b1y1m9qb83gzjnp8ymslpranxdan36r5bm2ayd8";
-      name = "plasma-mediacenter-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-sdk-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/mifrpgvf29kzr7n4lk1xq8s1b3a1d29q-plasma-sdk-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/plasma-sdk-5.3.1.tar.xz";
-      sha256 = "157742d7wm21y4g7gs0483jd4sd6q2a0ppyk3mr544nagydvpqfs";
-      name = "plasma-sdk-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwrited-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/agrv0yx7fzkjyx8b4bl0anbhi99v6l6y-kwrited-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kwrited-5.3.1.tar.xz";
-      sha256 = "0qivfycr4ak5zsplnzv968sya2rc3vz9z6h8gv4b2scf99zjp2g8";
-      name = "kwrited-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khotkeys-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/m1v47sjjn9hz8pdfzql5xx9r0j1zpd4q-khotkeys-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/khotkeys-5.3.1.tar.xz";
-      sha256 = "11mzrjzk2j9x32mg77d2al19b4iin0rfxs710mhsjbgriq144smv";
-      name = "khotkeys-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-nm-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/r8sbla68dniy9snbni1g4h9rwwm5bghh-plasma-nm-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/plasma-nm-5.3.1.tar.xz";
-      sha256 = "0jgrz9j2228aya7n1dg4npicsbgv93f8n80b9yjax8mrd6qhq55k";
-      name = "plasma-nm-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdecoration-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/g9163zl8sjxnr32mmy70cbw0a0arsm8c-kdecoration-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kdecoration-5.3.1.tar.xz";
-      sha256 = "19qxz5ivrjq9a1shk7mjin0r9v37g33l762nf7lb1xf29y13mhsn";
-      name = "kdecoration-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/8z7cjvfh9bw6402ccipzpgfh4a5rwvmd-oxygen-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/oxygen-5.3.1.tar.xz";
-      sha256 = "03b8rxgspkv5p8mfb53v92bi62cqp7rcma2fjarmgw4ri5w6cwx9";
-      name = "oxygen-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-gtk-config-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/safa43z9955m484jnfagz4rxby5jhn9l-kde-gtk-config-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kde-gtk-config-5.3.1.tar.xz";
-      sha256 = "1frykdckgrfbiyjshdkjv6hp8mrpfz3g461w6snb65yly02qjb5l";
-      name = "kde-gtk-config-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bluez-qt-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/s8k9h017za3z3j3h046ialysxxna2avs-bluez-qt-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/bluez-qt-5.3.1.tar.xz";
-      sha256 = "13i5ybmkf6xg49jh5fbbayxg3gp5h8g1gayc0mdc4cwzx1v6g70l";
-      name = "bluez-qt-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/z9hb5dcjbvnrrkhba58vbhism9djavh9-polkit-kde-agent-1-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/polkit-kde-agent-1-5.3.1.tar.xz";
-      sha256 = "01ragaa1r144g25kqdc157d7lbq69cclanaljgwkvs2mn0ib031c";
-      name = "polkit-kde-agent-1-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-cli-tools-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/gfah83qmrzhfjxjvgaczz4bggyvxqq2l-kde-cli-tools-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kde-cli-tools-5.3.1.tar.xz";
-      sha256 = "0x4k3yi4qccvfp4ia75alihcivk4slwsx8i0wdb00qjl1nj7jbc1";
-      name = "kde-cli-tools-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sddm-kcm-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/mhvhgh8n3a6dzjsxzgp8ynsryv3y54kv-sddm-kcm-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/sddm-kcm-5.3.1.tar.xz";
-      sha256 = "16viwz7b8s77g5fqw7g7asrrk44fif4fmmif7g3bkmq7rncd3hw9";
-      name = "sddm-kcm-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "powerdevil-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/y571p4chd574qvzjbc7pbbixsb7g4g45-powerdevil-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/powerdevil-5.3.1.tar.xz";
-      sha256 = "07kcqd7qzblapxnwczfdj4vwb8s6s8mp7qhl4mb663f2a0z6fn8l";
-      name = "powerdevil-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-workspace-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/kxn9mq9hrqzwpw8ldxqjdaxm5zqnq1jb-plasma-workspace-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/plasma-workspace-5.3.1.tar.xz";
-      sha256 = "1cjg8rhwhm015fg36idn4shddcy6sjnb4y0x9vmxbsdvfx2nnhr1";
-      name = "plasma-workspace-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "milou-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/02qx55q40iwpwwdr5dmnpdg5hhzcdb7a-milou-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/milou-5.3.1.tar.xz";
-      sha256 = "17xw62pngq3bb7vkbkn8c099ivsf1xmns0f65v7j112yqpz33b8a";
-      name = "milou-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksysguard-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/m8q2mc88168lkh4j3jxqjyshf0h5d7gs-ksysguard-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/ksysguard-5.3.1.tar.xz";
-      sha256 = "1z1qgf5qskzf4r524lf75pdyw7gdwrx2yr8nac9622hvgrfh7yhj";
-      name = "ksysguard-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-desktop-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/bilfn2r9akz2mxyl03q1a9i8nndbabhg-plasma-desktop-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/plasma-desktop-5.3.1.tar.xz";
-      sha256 = "079v2pbpgn1gr03l3qcxk3rsgbip318xpjbni4vxf08fhsh1ixlp";
-      name = "plasma-desktop-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwin-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/0b3mjqqacgl23xqkhimqpgswwvsqz7bc-kwin-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kwin-5.3.1.tar.xz";
-      sha256 = "04bxf45lcbmnl8fks1k6j6i0sk7x5abzhmyrziliz2yx5kyi4m36";
-      name = "kwin-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/mfn2ga4yr0v8pgknsxsgnvxayn6p7sal-plasma-workspace-wallpapers-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/plasma-workspace-wallpapers-5.3.1.tar.xz";
-      sha256 = "1y6gdzs0qxiw4hl9r6v3blcm8gq61wapagn6sj5ixagvwlhf2w5y";
-      name = "plasma-workspace-wallpapers-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfilemetadata-5.9.1.tar.xz" ".tar";
-    store = "/nix/store/pshcx9qvc0z4w486q4a51ygm86p7w06a-kfilemetadata-5.9.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kfilemetadata-5.9.1.tar.xz";
-      sha256 = "02gffgwbic4h8zdknp32cczplw3cc9ahg483aa3frhhgvgvrq8hs";
-      name = "kfilemetadata-5.9.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kio-extras-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/gy53gcnhk83ab62a2w1x0lm7lxxkn9wh-kio-extras-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/kio-extras-5.3.1.tar.xz";
-      sha256 = "1m1gc0m9xhapnchiicsn93spylczkggj8c79ixgk99b1ha7vbc87";
-      name = "kio-extras-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bluedevil-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/v3k1px6zx4dqz77s0l48lky1zh22c2ps-bluedevil-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/bluedevil-5.3.1.tar.xz";
-      sha256 = "050hpiifrhm2vzab527anfncdf04cikz5149iabz3aflxcvabqpl";
-      name = "bluedevil-5.3.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-fonts-5.3.1.tar.xz" ".tar";
-    store = "/nix/store/lbvr2fw8361mmd8gpqk9m917qmg8h381-oxygen-fonts-5.3.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.3.1/oxygen-fonts-5.3.1.tar.xz";
-      sha256 = "0zp81c4s0xvr1d0nvlssk3k3456farz157sqnjvgbsarxnzmgppv";
-      name = "oxygen-fonts-5.3.1.tar.xz";
-    };
-  }
-]
diff --git a/pkgs/desktops/plasma-5.3/packages.json b/pkgs/desktops/plasma-5.3/packages.json
new file mode 100644
index 00000000000..22f7c05de5a
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/packages.json
@@ -0,0 +1,1358 @@
+{
+    "bluez-qt": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "bluez-qt-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/bluez-qt-5.3.1.tar.xz",
+            "name": "bluez-qt-5.3.1.tar.xz",
+            "sha256": "13i5ybmkf6xg49jh5fbbayxg3gp5h8g1gayc0mdc4cwzx1v6g70l"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5network",
+            "qt5qml",
+            "qt5quicktest",
+            "qt5test"
+        ]
+    },
+    "kmenuedit": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kmenuedit-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/kmenuedit-5.3.1.tar.xz",
+            "name": "kmenuedit-5.3.1.tar.xz",
+            "sha256": "0vyy3xb32nb2qxfv3qvrrzlnck6gas0gwyncbn4rzimaygm2vzqz"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5dbusaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kdelibs4support",
+            "kf5kio",
+            "kf5sonnet",
+            "kf5xmlgui",
+            "khotkeysdbusinterface",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5xml"
+        ]
+    },
+    "plasma-nm": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "plasma-nm-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/plasma-nm-5.3.1.tar.xz",
+            "name": "plasma-nm-5.3.1.tar.xz",
+            "sha256": "0jgrz9j2228aya7n1dg4npicsbgv93f8n80b9yjax8mrd6qhq55k"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5completion",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5declarative",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5init",
+            "kf5itemviews",
+            "kf5kdelibs4support",
+            "kf5kio",
+            "kf5modemmanagerqt",
+            "kf5networkmanagerqt",
+            "kf5notifications",
+            "kf5plasma",
+            "kf5service",
+            "kf5solid",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "mobilebroadbandproviderinfo",
+            "modemmanager",
+            "networkmanager",
+            "openconnect",
+            "openssl",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5network",
+            "qt5quick",
+            "qt5widgets"
+        ]
+    },
+    "khotkeys": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "khotkeys-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/khotkeys-5.3.1.tar.xz",
+            "name": "khotkeys-5.3.1.tar.xz",
+            "sha256": "11mzrjzk2j9x32mg77d2al19b4iin0rfxs710mhsjbgriq144smv"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5dbusaddons",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5kcmutils",
+            "kf5kdelibs4support",
+            "kf5kio",
+            "kf5plasma",
+            "kf5xmlgui",
+            "libkworkspace",
+            "qt5",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "plasma-workspace-wallpapers": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "plasma-workspace-wallpapers-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/plasma-workspace-wallpapers-5.3.1.tar.xz",
+            "name": "plasma-workspace-wallpapers-5.3.1.tar.xz",
+            "sha256": "1y6gdzs0qxiw4hl9r6v3blcm8gq61wapagn6sj5ixagvwlhf2w5y"
+        },
+        "buildInputs": [
+            "ecm"
+        ]
+    },
+    "kscreen": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kscreen-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/kscreen-5.3.1.tar.xz",
+            "name": "kscreen-5.3.1.tar.xz",
+            "sha256": "008ys3glpvpcvjh7n2gls3m13q9qswmnc5l2lz4zs1dvcrk5z7yr"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5configwidgets",
+            "kf5dbusaddons",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5screen",
+            "kf5xmlgui",
+            "qt5",
+            "qt5quickwidgets",
+            "qt5test"
+        ]
+    },
+    "oxygen-fonts": {
+        "nativeBuildInputs": [
+            "cmake",
+            "fontforge_executable"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "oxygen-fonts-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/oxygen-fonts-5.3.1.tar.xz",
+            "name": "oxygen-fonts-5.3.1.tar.xz",
+            "sha256": "0zp81c4s0xvr1d0nvlssk3k3456farz157sqnjvgbsarxnzmgppv"
+        },
+        "buildInputs": [
+            "ecm"
+        ]
+    },
+    "breeze": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "breeze-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/breeze-5.3.1.tar.xz",
+            "name": "breeze-5.3.1.tar.xz",
+            "sha256": "0sh7vgg3dz0cs6mqs4c3ygw5qg4lcjm0vdh4mm4xfxnizagkqrr5"
+        },
+        "buildInputs": [
+            "ecm",
+            "kde4",
+            "kdecoration2",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5frameworkintegration",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5kcmutils",
+            "kf5windowsystem",
+            "pkgconfig",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5widgets",
+            "qt5x11extras",
+            "xcb"
+        ]
+    },
+    "oxygen": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "oxygen-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/oxygen-5.3.1.tar.xz",
+            "name": "oxygen-5.3.1.tar.xz",
+            "sha256": "03b8rxgspkv5p8mfb53v92bi62cqp7rcma2fjarmgw4ri5w6cwx9"
+        },
+        "buildInputs": [
+            "ecm",
+            "kde4",
+            "kde4workspace",
+            "kdecoration2",
+            "kf5",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5frameworkintegration",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5service",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "pkgconfig",
+            "qt5",
+            "qt5dbus",
+            "qt5widgets",
+            "qt5x11extras",
+            "xcb"
+        ]
+    },
+    "plasma-workspace": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5sysguard"
+        ],
+        "name": "plasma-workspace-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/plasma-workspace-5.3.1.tar.xz",
+            "name": "plasma-workspace-5.3.1.tar.xz",
+            "sha256": "1cjg8rhwhm015fg36idn4shddcy6sjnb4y0x9vmxbsdvfx2nnhr1"
+        },
+        "buildInputs": [
+            "dbusmenu-qt5",
+            "ecm",
+            "kf5",
+            "kf5activities",
+            "kf5baloo",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5declarative",
+            "kf5doctools",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5idletime",
+            "kf5jsembed",
+            "kf5kcmutils",
+            "kf5kdelibs4support",
+            "kf5networkmanagerqt",
+            "kf5newstuff",
+            "kf5notifyconfig",
+            "kf5package",
+            "kf5plasma",
+            "kf5plasmaquick",
+            "kf5prison",
+            "kf5runner",
+            "kf5screen",
+            "kf5solid",
+            "kf5su",
+            "kf5sysguard",
+            "kf5texteditor",
+            "kf5textwidgets",
+            "kf5wallet",
+            "kf5wayland",
+            "kf5webkit",
+            "kf5xmlrpcclient",
+            "kwindbusinterface",
+            "libgps",
+            "phonon4qt5",
+            "qalculate",
+            "qt5",
+            "qt5concurrent",
+            "qt5dbus",
+            "qt5network",
+            "qt5qml",
+            "qt5quick",
+            "qt5quickwidgets",
+            "qt5script",
+            "qt5sql",
+            "qt5test",
+            "qt5webkitwidgets",
+            "qt5widgets",
+            "qt5x11extras",
+            "wayland",
+            "waylandscanner",
+            "x11",
+            "xcb",
+            "zlib"
+        ]
+    },
+    "kwrited": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kwrited-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/kwrited-5.3.1.tar.xz",
+            "name": "kwrited-5.3.1.tar.xz",
+            "sha256": "0qivfycr4ak5zsplnzv968sya2rc3vz9z6h8gv4b2scf99zjp2g8"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5i18n",
+            "kf5notifications",
+            "kf5pty",
+            "qt5",
+            "qt5widgets"
+        ]
+    },
+    "plasma-desktop": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "plasma-desktop-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/plasma-desktop-5.3.1.tar.xz",
+            "name": "plasma-desktop-5.3.1.tar.xz",
+            "sha256": "079v2pbpgn1gr03l3qcxk3rsgbip318xpjbni4vxf08fhsh1ixlp"
+        },
+        "buildInputs": [
+            "boost",
+            "canberra",
+            "ecm",
+            "evdev",
+            "fontconfig",
+            "freetype",
+            "glib2",
+            "kde4",
+            "kded",
+            "kf5",
+            "kf5activities",
+            "kf5attica",
+            "kf5auth",
+            "kf5baloo",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5declarative",
+            "kf5doctools",
+            "kf5emoticons",
+            "kf5globalaccel",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5itemmodels",
+            "kf5kcmutils",
+            "kf5kdelibs4support",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5notifications",
+            "kf5notifyconfig",
+            "kf5people",
+            "kf5plasma",
+            "kf5plasmaquick",
+            "kf5runner",
+            "kf5wallet",
+            "krunnerappdbusinterface",
+            "ksmserverdbusinterface",
+            "kwindbusinterface",
+            "libkworkspace",
+            "libtaskmanager",
+            "opengl",
+            "opengles",
+            "packagekitqt5",
+            "phonon4qt5",
+            "pulseaudio",
+            "qt4",
+            "qt5",
+            "qt5concurrent",
+            "qt5dbus",
+            "qt5qml",
+            "qt5quick",
+            "qt5quickwidgets",
+            "qt5sql",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "screensaverdbusinterface",
+            "strigi",
+            "synaptics",
+            "usb",
+            "x11",
+            "xcb"
+        ]
+    },
+    "systemsettings": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "systemsettings-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/systemsettings-5.3.1.tar.xz",
+            "name": "systemsettings-5.3.1.tar.xz",
+            "sha256": "06m3r31dr0ivhn25fg0sg8pbxyzvm8slsmqkqsm4cbypg028axx0"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5dbusaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kcmutils",
+            "kf5khtml",
+            "kf5kio",
+            "kf5service",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "qt5",
+            "qt5widgets"
+        ]
+    },
+    "libkscreen": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "libkscreen-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/libkscreen-5.3.1.tar.xz",
+            "name": "libkscreen-5.3.1.tar.xz",
+            "sha256": "00g401yfiyqh09ajkinlkzhfpb7lsy0wpnrk1ba8vm4wmcvkp63l"
+        },
+        "buildInputs": [
+            "doxygen",
+            "ecm",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5gui",
+            "qt5test",
+            "qt5x11extras",
+            "xcb"
+        ]
+    },
+    "plasma-sdk": {
+        "nativeBuildInputs": [
+            "cmake",
+            "git_executable_found"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "plasma-sdk-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/plasma-sdk-5.3.1.tar.xz",
+            "name": "plasma-sdk-5.3.1.tar.xz",
+            "sha256": "157742d7wm21y4g7gs0483jd4sd6q2a0ppyk3mr544nagydvpqfs"
+        },
+        "buildInputs": [
+            "activeapp",
+            "ecm",
+            "kdepimlibs",
+            "kdevplatform",
+            "kf5",
+            "kf5archive",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5declarative",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kdelibs4support",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5parts",
+            "kf5plasma",
+            "kf5plasmaquick",
+            "kf5service",
+            "kf5texteditor",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "qgpgme",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5svg",
+            "qt5test",
+            "qt5webkit",
+            "qt5webkitwidgets",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kwin": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kwin-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/kwin-5.3.1.tar.xz",
+            "name": "kwin-5.3.1.tar.xz",
+            "sha256": "04bxf45lcbmnl8fks1k6j6i0sk7x5abzhmyrziliz2yx5kyi4m36"
+        },
+        "buildInputs": [
+            "ecm",
+            "egl",
+            "epoxy",
+            "kdecoration2",
+            "kf5",
+            "kf5activities",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5declarative",
+            "kf5doctools",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5init",
+            "kf5kcmutils",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5notifications",
+            "kf5plasma",
+            "kf5service",
+            "kf5wayland",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "libinput",
+            "qt5",
+            "qt5concurrent",
+            "qt5core",
+            "qt5dbus",
+            "qt5multimedia",
+            "qt5quick",
+            "qt5quickwidgets",
+            "qt5script",
+            "qt5test",
+            "qt5uitools",
+            "qt5widgets",
+            "qt5x11extras",
+            "threads",
+            "udev",
+            "wayland",
+            "x11",
+            "x11_xcb",
+            "xcb",
+            "xkb"
+        ]
+    },
+    "kdeplasma-addons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdeplasma-addons-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/kdeplasma-addons-5.3.1.tar.xz",
+            "name": "kdeplasma-addons-5.3.1.tar.xz",
+            "sha256": "1myk3508jqgalyqa1rlx1dq5afppvhvsnd7irf4wywpgls20nwnv"
+        },
+        "buildInputs": [
+            "ecm",
+            "gio",
+            "glib2",
+            "gobject",
+            "ibus",
+            "kde4",
+            "kdepimlibs",
+            "kexiv2",
+            "kf5",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5kcmutils",
+            "kf5kdelibs4support",
+            "kf5kio",
+            "kf5kross",
+            "kf5newstuff",
+            "kf5plasma",
+            "kf5purpose",
+            "kf5runner",
+            "kf5service",
+            "kf5unitconversion",
+            "lancelot",
+            "lancelot-datamodels",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5widgets",
+            "qt5x11extras",
+            "scim",
+            "sharedmimeinfo",
+            "x11",
+            "xcb"
+        ]
+    },
+    "sddm-kcm": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "sddm-kcm-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/sddm-kcm-5.3.1.tar.xz",
+            "name": "sddm-kcm-5.3.1.tar.xz",
+            "sha256": "16viwz7b8s77g5fqw7g7asrrk44fif4fmmif7g3bkmq7rncd3hw9"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5auth",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5kio",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5designer",
+            "qt5gui",
+            "qt5quick",
+            "qt5quickwidgets",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "khelpcenter": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "khelpcenter-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/khelpcenter-5.3.1.tar.xz",
+            "name": "khelpcenter-5.3.1.tar.xz",
+            "sha256": "0dik353w6ri6mfkvkz3v5xva6x59zlbz1sj522li0gbd73x4bzf2"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5i18n",
+            "kf5init",
+            "kf5kcmutils",
+            "kf5kdelibs4support",
+            "kf5khtml",
+            "qt5",
+            "qt5dbus",
+            "qt5widgets"
+        ]
+    },
+    "bluedevil": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "bluedevil-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/bluedevil-5.3.1.tar.xz",
+            "name": "bluedevil-5.3.1.tar.xz",
+            "sha256": "050hpiifrhm2vzab527anfncdf04cikz5149iabz3aflxcvabqpl"
+        },
+        "buildInputs": [
+            "ecm",
+            "kded",
+            "kf5",
+            "kf5bluezqt",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5module",
+            "kf5notifications",
+            "kf5plasma",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5qml",
+            "qt5widgets",
+            "sharedmimeinfo"
+        ]
+    },
+    "ksysguard": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ksysguard-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/ksysguard-5.3.1.tar.xz",
+            "name": "ksysguard-5.3.1.tar.xz",
+            "sha256": "1z1qgf5qskzf4r524lf75pdyw7gdwrx2yr8nac9622hvgrfh7yhj"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kdelibs4support",
+            "kf5newstuff",
+            "kf5sysguard",
+            "qt5",
+            "qt5core",
+            "qt5widgets",
+            "sensors"
+        ]
+    },
+    "baloo": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5coreaddons",
+            "kf5filemetadata",
+            "qt5core",
+            "xapian"
+        ],
+        "name": "baloo-5.9.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/baloo-5.9.1.tar.xz",
+            "name": "baloo-5.9.1.tar.xz",
+            "sha256": "0wx9n3l4f1ibddvhbiharhgd20s8hzs64b2c0686bm82qmbkkl7n"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5auth",
+            "kf5config",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5filemetadata",
+            "kf5i18n",
+            "kf5idletime",
+            "kf5kdelibs4support",
+            "kf5kio",
+            "kf5solid",
+            "qt5",
+            "qt5dbus",
+            "qt5quick",
+            "qt5sql",
+            "qt5test",
+            "qt5widgets",
+            "xapian"
+        ]
+    },
+    "kde-cli-tools": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-cli-tools-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/kde-cli-tools-5.3.1.tar.xz",
+            "name": "kde-cli-tools-5.3.1.tar.xz",
+            "sha256": "0x4k3yi4qccvfp4ia75alihcivk4slwsx8i0wdb00qjl1nj7jbc1"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kcmutils",
+            "kf5kdelibs4support",
+            "kf5su",
+            "kf5windowsystem",
+            "qt5",
+            "qt5dbus",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "milou": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "milou-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/milou-5.3.1.tar.xz",
+            "name": "milou-5.3.1.tar.xz",
+            "sha256": "17xw62pngq3bb7vkbkn8c099ivsf1xmns0f65v7j112yqpz33b8a"
+        },
+        "buildInputs": [
+            "ecm",
+            "kdepimlibs",
+            "kf5",
+            "kf5coreaddons",
+            "kf5declarative",
+            "kf5i18n",
+            "kf5plasma",
+            "kf5runner",
+            "kf5service",
+            "qt5",
+            "qt5qml",
+            "qt5quick",
+            "qt5script",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "powerdevil": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "powerdevil-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/powerdevil-5.3.1.tar.xz",
+            "name": "powerdevil-5.3.1.tar.xz",
+            "sha256": "07kcqd7qzblapxnwczfdj4vwb8s6s8mp7qhl4mb663f2a0z6fn8l"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5activities",
+            "kf5auth",
+            "kf5config",
+            "kf5dbusaddons",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5idletime",
+            "kf5kdelibs4support",
+            "kf5kio",
+            "kf5notifyconfig",
+            "kf5screen",
+            "kf5solid",
+            "libkworkspace",
+            "qt5",
+            "qt5dbus",
+            "qt5widgets",
+            "qt5x11extras",
+            "udev",
+            "xcb"
+        ]
+    },
+    "libksysguard": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5config",
+            "kf5i18n",
+            "kf5iconthemes",
+            "qt5core",
+            "qt5network",
+            "qt5widgets"
+        ],
+        "name": "libksysguard-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/libksysguard-5.3.1.tar.xz",
+            "name": "libksysguard-5.3.1.tar.xz",
+            "sha256": "115iwqq4y6pnhqsa5yn30q6wdpad5v48m7hjrn7jbpm3gsiwq1ym"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5auth",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5plasma",
+            "kf5service",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5dbus",
+            "qt5network",
+            "qt5script",
+            "qt5test",
+            "qt5webkitwidgets",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "zlib"
+        ]
+    },
+    "plasma-mediacenter": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "plasma-mediacenter-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/plasma-mediacenter-5.3.1.tar.xz",
+            "name": "plasma-mediacenter-5.3.1.tar.xz",
+            "sha256": "0h8dpyszn7hk7b1y1m9qb83gzjnp8ymslpranxdan36r5bm2ayd8"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5baloo",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5declarative",
+            "kf5filemetadata",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5kio",
+            "kf5plasma",
+            "kf5plasmaquick",
+            "kf5service",
+            "kf5windowsystem",
+            "mockcpp",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5multimedia",
+            "qt5quick",
+            "qt5sql",
+            "qt5test",
+            "qt5xml",
+            "taglib"
+        ]
+    },
+    "kfilemetadata": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kfilemetadata-5.9.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/kfilemetadata-5.9.1.tar.xz",
+            "name": "kfilemetadata-5.9.1.tar.xz",
+            "sha256": "02gffgwbic4h8zdknp32cczplw3cc9ahg483aa3frhhgvgvrq8hs"
+        },
+        "buildInputs": [
+            "ecm",
+            "epub",
+            "exiv2",
+            "ffmpeg",
+            "kf5",
+            "kf5archive",
+            "kf5i18n",
+            "popplerqt5",
+            "qmobipocket",
+            "qt5",
+            "qt5test",
+            "qt5xml",
+            "taglib"
+        ]
+    },
+    "kde-gtk-config": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kde-gtk-config-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/kde-gtk-config-5.3.1.tar.xz",
+            "name": "kde-gtk-config-5.3.1.tar.xz",
+            "sha256": "1frykdckgrfbiyjshdkjv6hp8mrpfz3g461w6snb65yly02qjb5l"
+        },
+        "buildInputs": [
+            "ecm",
+            "gtk2",
+            "gtk3",
+            "kf5",
+            "kf5archive",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kcmutils",
+            "kf5kio",
+            "kf5newstuff",
+            "qt5",
+            "qt5test",
+            "qt5widgets",
+            "x11"
+        ]
+    },
+    "kwayland": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5gui"
+        ],
+        "name": "kwayland-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/kwayland-5.3.1.tar.xz",
+            "name": "kwayland-5.3.1.tar.xz",
+            "sha256": "1vsdsf00py6i16zwbwpplq1v7m3fy1j0dskvkb080wm0fskz1r8f"
+        },
+        "buildInputs": [
+            "ecm",
+            "egl",
+            "qt5",
+            "qt5_check_private",
+            "qt5component",
+            "qt5concurrent",
+            "qt5core",
+            "qt5gui",
+            "qt5private",
+            "qt5test",
+            "qt5widgets",
+            "wayland",
+            "waylandscanner"
+        ]
+    },
+    "ksshaskpass": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ksshaskpass-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/ksshaskpass-5.3.1.tar.xz",
+            "name": "ksshaskpass-5.3.1.tar.xz",
+            "sha256": "0ids7vbi46bdd5dbjgv0wfv4rfv03kpln5vr3rwavah892q1dad2"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5core"
+        ]
+    },
+    "kinfocenter": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kinfocenter-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/kinfocenter-5.3.1.tar.xz",
+            "name": "kinfocenter-5.3.1.tar.xz",
+            "sha256": "02gqlidh9pb924vhhaxnidpjz3cb32r6icikhcv7csrll13wgp1a"
+        },
+        "buildInputs": [
+            "ecm",
+            "egl",
+            "kf5",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5declarative",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kcmutils",
+            "kf5kdelibs4support",
+            "kf5kio",
+            "kf5package",
+            "kf5service",
+            "kf5solid",
+            "kf5wayland",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "opengl",
+            "opengles",
+            "pciutils",
+            "qt5",
+            "qt5core",
+            "qt5gui",
+            "qt5widgets",
+            "raw1394",
+            "x11"
+        ]
+    },
+    "polkit-kde-agent": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "polkit-kde-agent-1-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/polkit-kde-agent-1-5.3.1.tar.xz",
+            "name": "polkit-kde-agent-1-5.3.1.tar.xz",
+            "sha256": "01ragaa1r144g25kqdc157d7lbq69cclanaljgwkvs2mn0ib031c"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5notifications",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "polkitqt5-1",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5widgets"
+        ]
+    },
+    "kdecoration": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5gui"
+        ],
+        "name": "kdecoration-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/kdecoration-5.3.1.tar.xz",
+            "name": "kdecoration-5.3.1.tar.xz",
+            "sha256": "19qxz5ivrjq9a1shk7mjin0r9v37g33l762nf7lb1xf29y13mhsn"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5core",
+            "qt5gui",
+            "qt5test"
+        ]
+    },
+    "kio-extras": {
+        "nativeBuildInputs": [
+            "cmake",
+            "md5sum_executable"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kio-extras-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/kio-extras-5.3.1.tar.xz",
+            "name": "kio-extras-5.3.1.tar.xz",
+            "sha256": "1m1gc0m9xhapnchiicsn93spylczkggj8c79ixgk99b1ha7vbc87"
+        },
+        "buildInputs": [
+            "ecm",
+            "exiv2",
+            "jpeg",
+            "kf5",
+            "kf5archive",
+            "kf5bookmarks",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5dnssd",
+            "kf5doctools",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kdelibs4support",
+            "kf5khtml",
+            "kf5kio",
+            "kf5pty",
+            "kf5solid",
+            "libssh",
+            "mtp",
+            "openexr",
+            "phonon4qt5",
+            "qt5",
+            "qt5dbus",
+            "qt5network",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "samba",
+            "sharedmimeinfo",
+            "slp"
+        ]
+    },
+    "muon": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "muon-5.3.1",
+        "src": {
+            "url": "stable/plasma/5.3.1/muon-5.3.1.tar.xz",
+            "name": "muon-5.3.1.tar.xz",
+            "sha256": "0k2c625d9i5gyyvdzlajkb0kcvss60lhs7qssil1a4w34ch3zfmk"
+        },
+        "buildInputs": [
+            "akabeiclient",
+            "appstreamqt",
+            "bodega",
+            "debconfkde",
+            "ecm",
+            "kf5",
+            "kf5attica",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5declarative",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kdelibs4support",
+            "kf5kio",
+            "kf5newstuff",
+            "kf5notifications",
+            "kf5plasma",
+            "kf5solid",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "packagekitqt5",
+            "phonon4qt5",
+            "qapt",
+            "qca-qt5",
+            "qt5",
+            "qt5concurrent",
+            "qt5dbus",
+            "qt5network",
+            "qt5qml",
+            "qt5quickwidgets",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml",
+            "qtoauth"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/pkgs/desktops/plasma-5.3/packages.sh b/pkgs/desktops/plasma-5.3/packages.sh
new file mode 100755
index 00000000000..3c8e0757552
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/packages.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -x
+
+origin="$(pwd)"
+
+# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
+KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
+
+alias nix-build="nix-build --no-out-link \"$origin/../../..\""
+
+# The extra slash at the end of the URL is necessary to stop wget
+# from recursing over the whole server! (No, it's not a bug.)
+$(nix-build -A autonix.manifest) \
+    "${KDE_MIRROR}/stable/plasma/5.3.1/" \
+    "$@" -A '*.tar.xz'
+
+AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}
+
+$AUTONIX_DEPS_KF5 manifest.json
+
+rm manifest.json
diff --git a/pkgs/desktops/plasma-5.3/renames.json b/pkgs/desktops/plasma-5.3/renames.json
new file mode 100644
index 00000000000..98141d29cc5
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/renames.json
@@ -0,0 +1,20 @@
+{
+    "kf5sysguard": "libksysguard",
+    "kf5baloo": "baloo",
+    "krunnerappdbusinterface": "plasma-workspace",
+    "screensaverdbusinterface": "plasma-workspace",
+    "ctest": "kdeplasma-addons",
+    "kf5filemetadata": "kfilemetadata",
+    "kwindbusinterface": "kwin",
+    "kf5activitiesexperimentalstats": "plasma-desktop",
+    "khotkeysdbusinterface": "khotkeys",
+    "libkworkspace": "plasma-workspace",
+    "libtaskmanager": "plasma-workspace",
+    "backend": "powerdevil",
+    "kf5screen": "libkscreen",
+    "ksmserverdbusinterface": "plasma-workspace",
+    "kf5wayland": "kwayland",
+    "kdecoration2": "kdecoration",
+    "kf5bluezqt": "bluez-qt",
+    "oxygenfont": "oxygen-fonts"
+}
\ No newline at end of file
diff --git a/pkgs/desktops/plasma-5.3/renames.nix b/pkgs/desktops/plasma-5.3/renames.nix
deleted file mode 100644
index e099edd8d83..00000000000
--- a/pkgs/desktops/plasma-5.3/renames.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-"Backend" = "powerdevil";
-"CTest" = "kdeplasma-addons";
-"ECM" = "extra-cmake-modules";
-"KDecoration2" = "kdecoration";
-"KF5ActivitiesExperimentalStats" = "plasma-desktop";
-"KF5Baloo" = "baloo";
-"KF5BluezQt" = "bluez-qt";
-"KF5FileMetaData" = "kfilemetadata";
-"KF5Screen" = "libkscreen";
-"KF5SysGuard" = "libksysguard";
-"KF5Wayland" = "kwayland";
-"KHotKeysDBusInterface" = "khotkeys";
-"KRunnerAppDBusInterface" = "plasma-workspace";
-"KSMServerDBusInterface" = "plasma-workspace";
-"KWinDBusInterface" = "kwin";
-"LibKWorkspace" = "plasma-workspace";
-"LibTaskManager" = "plasma-workspace";
-"OxygenFont" = "oxygen-fonts";
-"ScreenSaverDBusInterface" = "plasma-workspace";
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix
index f4c98c7da33..abcae401423 100644
--- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix
@@ -12,199 +12,198 @@
 #  make a copy of this directory first. After copying, be sure to delete ./tmp
 #  if it exists. Then follow the minor update instructions.
 
-{ autonix, fetchurl, pkgs, qt5, stdenv, debug ? false }:
+{ autonix, fetchurl, pkgs, qt5, stdenv, newScope, debug ? false }:
 
-with stdenv.lib; with autonix;
+with autonix;
+
+let inherit (stdenv) lib; in
 
 let
 
-  mkDerivation = drv:
-    let inherit (builtins.parseDrvName drv.name) version; in
-    stdenv.mkDerivation
-      (drv // {
-        setupHook = ./setup-hook.sh;
+  super =
+    let json = builtins.fromJSON (builtins.readFile ./packages.json);
+        mirrorUrl = n: pkg: pkg // {
+          src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
+        };
+        renames = builtins.fromJSON (builtins.readFile ./renames.json);
+        propagated = [ "extra-cmake-modules" ];
+        native = [
+          "bison"
+          "extra-cmake-modules"
+          "flex"
+          "kdoctools"
+          "ki18n"
+          "libxslt"
+          "perl"
+          "pythoninterp"
+        ];
+        user = [
+          "shareddesktopontologies"
+          "sharedmimeinfo"
+        ];
+    in lib.fold (f: attrs: f attrs) json [
+      (lib.mapAttrs kdePackage)
+      (userEnvDeps user)
+      (nativeDeps native)
+      (propagateDeps propagated)
+      (renameDeps renames)
+      (lib.mapAttrs mirrorUrl)
+    ];
 
-        enableParallelBuilding = drv.enableParallelBuilding or true;
-        cmakeFlags =
-          (drv.cmakeFlags or [])
-          ++ [ "-DBUILD_TESTING=OFF" ]
-          ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-        meta =
-          {
+  kdePackage = name: pkg:
+    let defaultOverride = drv: drv // {
+          setupHook = ./setup-hook.sh;
+          cmakeFlags =
+            (drv.cmakeFlags or [])
+            ++ [ "-DBUILD_TESTING=OFF" ]
+            ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+          meta = {
             license = with stdenv.lib.licenses; [
               lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
             ];
             platforms = stdenv.lib.platforms.linux;
             maintainers = with stdenv.lib.maintainers; [ ttuegel ];
             homepage = "http://www.kde.org";
-            inherit version;
-            branch = intersperse "." (take 2 (splitString "." version));
-          } // (drv.meta or {});
-      });
-
-  renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"];
+          };
+        };
+        callPackage = newScope {
+          inherit (stdenv) mkDerivation;
+          inherit (pkgs) fetchurl;
+          inherit scope;
+        };
+    in mkPackage callPackage defaultOverride name pkg;
 
   scope =
     # packages in this collection
-    (mapAttrs (dep: name: kf5."${name}") renames) //
+    self //
     # packages pinned to this version of Qt 5
     {
-      Phonon4Qt5 = pkgs.phonon_qt5.override { inherit qt5; };
-      Qt5 = qt5.base;
-      Qt5Core = qt5.base;
-      Qt5DBus = qt5.base;
-      Qt5Gui = qt5.base;
-      Qt5LinguistTools = qt5.tools;
-      Qt5Qml = [qt5.declarative qt5.graphicaleffects];
-      Qt5Quick = [qt5.quickcontrols qt5.graphicaleffects];
-      Qt5Script = qt5.script;
-      Qt5Svg = qt5.svg;
-      Qt5WebkitWidgets = qt5.webkit;
-      Qt5Widgets = qt5.base;
-      Qt5X11Extras = qt5.x11extras;
-      Qt5XmlPatterns = qt5.xmlpatterns;
+      phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
+      polkit_qt5 = pkgs.polkit_qt5.override { inherit qt5; };
+      qt5 = qt5.base;
+      qt5core = qt5.base;
+      qt5dbus = qt5.base;
+      qt5gui = qt5.base;
+      qt5linguisttools = qt5.tools;
+      qt5qml = [qt5.declarative qt5.graphicaleffects];
+      qt5quick = [qt5.quickcontrols qt5.graphicaleffects];
+      qt5script = qt5.script;
+      qt5svg = qt5.svg;
+      qt5webkitwidgets = qt5.webkit;
+      qt5widgets = qt5.base;
+      qt5x11extras = qt5.x11extras;
+      qt5xmlpatterns = qt5.xmlpatterns;
       dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
     } //
     # packages from the nixpkgs collection
     (with pkgs;
       {
-        Boost = boost155;
-        inherit cmake;
-        inherit epoxy;
-        GIF = giflib;
-        GLIB2 = glib;
-        Gpgme = gpgme;
-        JPEG = libjpeg;
-        LibGcrypt = libgcrypt;
-        LibGit2 = libgit2;
-        LibIntl = gettext;
-        LibLZMA = lzma;
-        ModemManager = modemmanager;
-        NetworkManager = networkmanager;
-        Perl = perl;
-        PythonInterp = python;
-        QImageBlitz = qimageblitz;
-        SharedMimeInfo = shared_mime_info;
-        ZLIB = zlib;
+        inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme
+                libgcrypt libgit2 modemmanager networkmanager perl
+                perlPackages qimageblitz xlibs zlib;
+        boost = boost156;
+        gif = giflib;
+        glib2 = glib;
+        jpeg = libjpeg;
+        libintl = gettext;
+        liblzma = lzma;
+        pythoninterp = python;
+        pythonlibrary = python;
+        sharedmimeinfo = shared_mime_info;
       }
     );
 
-  mirror = "mirror://kde";
+  self = super // {
+    inherit kdePackage scope;
 
-  preResolve = super:
-    fold (f: x: f x) super
-      [
-        (userEnvPkg "SharedMimeInfo")
-        (userEnvPkg "SharedDesktopOntologies")
+    extra-cmake-modules = overrideDerivation super.extra-cmake-modules (drv: {
+      buildInputs = [];
+      nativeBuildInputs = [];
+      propagatedBuildInputs = [];
+      propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
+      propagatedUserEnvPkgs = [];
+      cmakeFlags = ["-DBUILD_TESTING=OFF"];
+      patches = [./extra-cmake-modules/0001-extra-cmake-modules-paths.patch];
+      meta = {
+        license = stdenv.lib.licenses.bsd2;
+        platforms = stdenv.lib.platforms.linux;
+        maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+        homepage = "http://www.kde.org";
+      };
+    });
+
+    frameworkintegration = overrideDerivation super.frameworkintegration (drv: {
+      buildInputs = drv.buildInputs ++ [ pkgs.xlibs.libXcursor ];
+    });
+
+    kauth = overrideDerivation super.kauth (drv: {
+      buildInputs = drv.buildInputs ++ [ scope.polkit_qt5 ];
+      patches = [./kauth/kauth-policy-install.patch];
+    });
+
+    kcmutils = overrideDerivation super.kcmutils (drv: {
+      patches = [./kcmutils/kcmutils-pluginselector-follow-symlinks.patch];
+    });
+
+    kconfigwidgets = overrideDerivation super.kconfigwidgets (drv: {
+      patches = [./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch];
+    });
+
+    kdelibs4support = overrideDerivation super.kdelibs4support (drv: {
+      buildInputs = drv.buildInputs ++ [ scope.networkmanager pkgs.xlibs.libSM ];
+      cmakeFlags =
+        drv.cmakeFlags
+        ++ [
+          "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook"
+          "-DDocBookXML4_DTD_VERSION=4.5"
+        ];
+    });
+
+    kdoctools = overrideDerivation super.kdoctools (drv: {
+      propagatedNativeBuildInputs =
+        drv.propagatedNativeBuildInputs ++ [ scope.perl scope.perlPackages.URI ];
+      cmakeFlags =
+        drv.cmakeFlags
+        ++ [
+          "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook"
+          "-DDocBookXML4_DTD_VERSION=4.5"
+          "-DDocBookXSL_DIR=${pkgs.docbook5_xsl}/xml/xsl/docbook"
+        ];
+      patches = [./kdoctools/kdoctools-no-find-docbook-xml.patch];
+    });
+
+    ki18n = overrideDerivation super.ki18n (drv: {
+      propagatedNativeBuildInputs =
+        drv.propagatedNativeBuildInputs ++ [ scope.libintl scope.pythoninterp ];
+    });
+
+    kimageformats = overrideDerivation super.kimageformats (drv: {
+      NIX_CFLAGS_COMPILE = "-I${pkgs.ilmbase}/include/OpenEXR";
+    });
+
+    kinit = overrideDerivation super.kinit (drv: {
+      patches = [./kinit/0001-kinit-libpath.patch];
+    });
+
+    kpackage = overrideDerivation super.kpackage (drv: {
+      patches = [./kpackage/0001-allow-external-paths.patch];
+    });
+
+    kservice = overrideDerivation super.kservice (drv: {
+      buildInputs = drv.buildInputs ++ [ self.kwindowsystem ];
+      patches = [
+        ./kservice/kservice-kbuildsycoca-follow-symlinks.patch
+        ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
       ];
+    });
 
-  postResolve = super:
-    super // {
-      extra-cmake-modules = {
-        inherit (super.extra-cmake-modules) name src;
+    ktexteditor = overrideDerivation super.ktexteditor (drv: {
+      patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
+    });
 
-        propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
-        cmakeFlags = ["-DBUILD_TESTING=OFF"];
-        patches =
-          [
-            ./extra-cmake-modules/0001-extra-cmake-modules-paths.patch
-          ];
-        meta =
-          let inherit (builtins.parseDrvName super.extra-cmake-modules.name) version; in
-          {
-            license = stdenv.lib.licenses.bsd2;
-            platforms = stdenv.lib.platforms.linux;
-            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-            homepage = "http://www.kde.org";
-            inherit version;
-            branch = intersperse "." (take 2 (splitString "." version));
-          };
-      };
-
-      frameworkintegration = super.frameworkintegration // {
-        buildInputs = with pkgs.xlibs; super.frameworkintegration.buildInputs ++ [ libXcursor ];
-      };
-
-      kauth = super.kauth // {
-        buildInputs =
-          super.kauth.buildInputs
-          ++ [(pkgs.polkit_qt5.override { inherit qt5; })];
-        patches = [./kauth/kauth-policy-install.patch];
-      };
-
-      kcmutils = super.kcmutils // {
-        patches =
-          [./kcmutils/kcmutils-pluginselector-follow-symlinks.patch];
-      };
-
-      kconfigwidgets = super.kconfigwidgets // {
-        patches =
-          [./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch];
-      };
-
-      kdelibs4support = with pkgs; super.kdelibs4support // {
-        buildInputs =
-          super.kdelibs4support.buildInputs
-          ++ [networkmanager xlibs.libSM];
-        cmakeFlags =
-          (super.kdelibs4support.cmakeFlags or [])
-          ++ [
-            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-            "-DDocBookXML4_DTD_VERSION=4.5"
-          ];
-      };
-
-      kdoctools = with pkgs; super.kdoctools // {
-        propagatedNativeBuildInputs = [ perl perlPackages.URI ];
-        cmakeFlags =
-          (super.kdoctools.cmakeFlags or [])
-          ++ [
-            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-            "-DDocBookXML4_DTD_VERSION=4.5"
-            "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
-          ];
-        patches = [./kdoctools/kdoctools-no-find-docbook-xml.patch];
-      };
-
-      ki18n = with pkgs; super.ki18n // {
-        propagatedNativeBuildInputs =
-          super.ki18n.propagatedNativeBuildInputs ++ [gettext python];
-      };
-
-      kimageformats = with pkgs; super.kimageformats // {
-        NIX_CFLAGS_COMPILE =
-          (super.kimageformats.NIX_CFLAGS_COMPILE or "")
-          + " -I${ilmbase}/include/OpenEXR";
-      };
-
-      kinit = super.kinit // { patches = [ ./kinit/0001-kinit-libpath.patch ]; };
-
-      kpackage = super.kpackage // { patches = [ ./kpackage/0001-allow-external-paths.patch ]; };
-
-      kservice = super.kservice // {
-        buildInputs = super.kservice.buildInputs ++ [kf5.kwindowsystem];
-        patches =
-          [
-            ./kservice/kservice-kbuildsycoca-follow-symlinks.patch
-            ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
-          ];
-      };
-
-      ktexteditor = super.ktexteditor // {
-        patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
-      };
-
-      networkmanager-qt = super.networkmanager-qt // {
-        propagatedBuildInputs = with pkgs; super.networkmanager-qt.propagatedBuildInputs ++ [ networkmanager ];
-      };
-
-    };
-
-  kf5 = generateCollection ./. {
-    inherit mirror mkDerivation preResolve postResolve renames scope;
+    networkmanager-qt = overrideDerivation super.networkmanager-qt (drv: {
+      propagatedBuildInputs = drv.propagatedBuildInputs ++ [ scope.networkmanager ];
+    });
   };
 
-in
-
-  kf5 // { inherit mkDerivation qt5 scope; }
+in self
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/dependencies.nix b/pkgs/development/libraries/kde-frameworks-5.10/dependencies.nix
deleted file mode 100644
index 8e0b434d5bd..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.10/dependencies.nix
+++ /dev/null
@@ -1,524 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-  attica = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  extra-cmake-modules = {
-    buildInputs = [ "AGG" "Blitz" "BlueZ" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "Flex" "GObject" "GStreamer" "LCMS" "LibArt" "OpenEXR" "PCRE" "QCA2" "QImageBlitz" "Qt5Core" "Qt5LinguistTools" "Qt5QUIET" "Sqlite" "Strigi" "USB" "Xine" "Xmms" ];
-    nativeBuildInputs = [ "LibXslt" "QCOLLECTIONGENERATOR_EXECUTABLE" "SPHINX_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  frameworkintegration = {
-    buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Qml" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kactivities = {
-    buildInputs = [ "Boost" "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kapidox = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "PythonInterp" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  karchive = {
-    buildInputs = [ "BZip2" "ECM" "KF5Archive" "LibLZMA" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kauth = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kbookmarks = {
-    buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5WidgetsAddons" "Qt5Widgets" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcmutils = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Package" "KF5Service" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5Service" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcodecs = {
-    buildInputs = [ "ECM" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcompletion = {
-    buildInputs = [ "ECM" "KF5Config" "KF5WidgetsAddons" "Qt5" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kconfig = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kconfigwidgets = {
-    buildInputs = [ "ECM" "KF5Auth" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Auth" "KF5Codecs" "KF5Config" "KF5WidgetsAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcoreaddons = {
-    buildInputs = [ "ECM" "FAM" "Qt5" "Qt5Core" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kcrash = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WindowSystem" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdbusaddons = {
-    buildInputs = [ "ECM" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5X11Extras" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5DBus" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdeclarative = {
-    buildInputs = [ "ActiveApp" "ECM" "KF5Config" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Package" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Test" "epoxy" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5Package" "Qt5Qml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kded = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5Init" "KF5Service" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdelibs4support = {
-    buildInputs = [ "AGG" "Blitz" "BlueZ" "DocBookXML4" "ECM" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "GObject" "GStreamer" "KDEWin" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5DBusAddons" "KF5DesignerPlugin" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Service" "KF5TextWidgets" "KF5UnitConversion" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LCMS" "LibArt" "NetworkManager" "OpenEXR" "OpenSSL" "PCRE" "QCA2" "QImageBlitz" "QNtrack" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Designer" "Qt5NO_MODULE" "Qt5Network" "Qt5PrintSupport" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Sqlite" "USB" "X11" "Xine" "Xmms" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KDEWin" "KF5Archive" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DesignerPlugin" "KF5DocTools" "KF5Emoticons" "KF5GuiAddons" "KF5IconThemes" "KF5Init" "KF5ItemModels" "KF5KDELibs4Support" "KF5Notifications" "KF5Parts" "KF5TextWidgets" "KF5UnitConversion" "KF5WindowSystem" "Qt5DBus" "Qt5PrintSupport" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesignerplugin = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Plotting" "KF5Sonnet" "KF5TextWidgets" "KF5WebKit" "KF5WidgetsAddons" "KF5XmlGui" "Qt5Core" "Qt5Designer" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesu = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "KF5Pty" "KF5Service" "Qt5Core" "Qt5NO_MODULE" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Pty" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdewebkit = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5JobWidgets" "KF5KIO" "KF5Parts" "KF5Service" "KF5Wallet" "Qt5" "Qt5Core" "Qt5Network" "Qt5WebKitWidgets" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5WebKitWidgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdnssd = {
-    buildInputs = [ "Avahi" "DNSSD" "ECM" "Qt5" "Qt5DBus" "Qt5Network" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Network" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdoctools = {
-    buildInputs = [ "DocBookXML4" "DocBookXSL" "ECM" "KF5Archive" "KF5DocTools" "KF5I18n" "LibXml2" "Qt5Core" "Qt5NO_MODULE" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kemoticons = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Service" "Qt5" "Qt5Gui" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Service" "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kglobalaccel = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5DBus" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kguiaddons = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  khtml = {
-    buildInputs = [ "ECM" "GIF" "JPEG" "KDEWin" "KF5Archive" "KF5Codecs" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenSSL" "PNG" "Phonon4Qt5" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "KF5Bookmarks" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ki18n = {
-    buildInputs = [ "ECM" "LibIntl" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Script" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kiconthemes = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kidletime = {
-    buildInputs = [ "ECM" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "X11" "X11_XCB" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kimageformats = {
-    buildInputs = [ "ECM" "Jasper" "OpenEXR" "Qt5Gui" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5QUIET" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kinit = {
-    buildInputs = [ "ECM" "KF5Config" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Service" "KF5WindowSystem" "Libcap" "Qt5" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kio = {
-    buildInputs = [ "ACL" "ECM" "GSSAPI" "KF5Archive" "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5JobWidgets" "KF5Notifications" "KF5Service" "KF5Solid" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LibXml2" "OpenSSL" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Qt5Xml" "Strigi" "X11" "ZLIB" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [ "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5ItemViews" "KF5JobWidgets" "KF5Service" "KF5Solid" "KF5XmlGui" "Qt5Network" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kitemmodels = {
-    buildInputs = [ "ECM" "Grantlee" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5QuickWidgets" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kitemviews = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjobwidgets = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjs = {
-    buildInputs = [ "ECM" "KF5DocTools" "PCRE" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjsembed = {
-    buildInputs = [ "ECM" "KF5DocTools" "KF5I18n" "KF5JS" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5JS" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmediaplayer = {
-    buildInputs = [ "ECM" "KF5Parts" "KF5XmlGui" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Parts" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knewstuff = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Attica" "KF5Service" "KF5XmlGui" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knotifications = {
-    buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5Service" "KF5WindowSystem" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5OPTIONAL_COMPONENTS" "Qt5QUIET" "Qt5Test" "Qt5TextToSpeech" "Qt5Widgets" "Qt5X11Extras" "X11" "dbusmenu-qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knotifyconfig = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5OPTIONAL_COMPONENTS" "Qt5QUIET" "Qt5Test" "Qt5TextToSpeech" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpackage = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kparts = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KIO" "KF5Notifications" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" "KF5TextWidgets" "KF5XmlGui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpeople = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "KF5ItemViews" "KF5Service" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5Gui" "Qt5Qml" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kplotting = {
-    buildInputs = [ "ECM" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpty = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "Qt5" "UTEMPTER" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kross = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5QUIET" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5WidgetsAddons" "Qt5Script" "Qt5Widgets" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  krunner = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5Service" "KF5Solid" "KF5ThreadWeaver" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Quick" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Plasma" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kservice = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5CoreAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktexteditor = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Sonnet" "LibGit2" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5Xml" "Qt5XmlPatterns" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktextwidgets = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5Sonnet" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kunitconversion = {
-    buildInputs = [ "ECM" "KF5I18n" "Qt5" "Qt5Core" "Qt5Network" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwallet = {
-    buildInputs = [ "ECM" "Gpgme" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Gpgmepp" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "LibGcrypt" "Qt5" "Qt5DBus" "Qt5Gui" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwidgetsaddons = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5UiTools" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwindowsystem = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5Widgets" "Qt5WinExtras" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kxmlgui = {
-    buildInputs = [ "ECM" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Network" "Qt5PrintSupport" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5ConfigWidgets" "Qt5DBus" "Qt5Widgets" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kxmlrpcclient = {
-    buildInputs = [ "ECM" "KF5I18n" "KF5KIO" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  modemmanager-qt = {
-    buildInputs = [ "ECM" "KF5ModemManagerQt" "ModemManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  networkmanager-qt = {
-    buildInputs = [ "ECM" "NetworkManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-framework = {
-    buildInputs = [ "ECM" "EGL" "Gpgme" "KActivities" "KCoreAddons" "KDE4Support" "KDESu" "KDeclarative" "KF5" "KF5Activities" "KF5Archive" "KF5Auth" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5IdleTime" "KF5Init" "KF5ItemModels" "KF5ItemViews" "KF5JS" "KF5JobWidgets" "KF5KArchive" "KF5KAuth" "KF5KBookmarks" "KF5KCodecs" "KF5KCompletion" "KF5KConfig" "KF5KConfigWidgets" "KF5KCoreAddons" "KF5KCrash" "KF5KDBusAddons" "KF5KDE4Support" "KF5KDESu" "KF5KDeclarative" "KF5KDocTools" "KF5KF5GlobalAccel" "KF5KGuiAddons" "KF5KI18n" "KF5KIO" "KF5KIconThemes" "KF5KIdleTime" "KF5KInit" "KF5KJS" "KF5KJobWidgets" "KF5KNotifications" "KF5KParts" "KF5KService" "KF5KTextWidgets" "KF5KUnitConversion" "KF5KWallet" "KF5KWidgetsAddons" "KF5KWindowSystem" "KF5Kross" "KF5NO_MODULE" "KF5Notifications" "KF5Package" "KF5Parts" "KF5Service" "KF5Solid" "KF5Sonnet" "KF5Su" "KF5TextWidgets" "KF5ThreadWeaver" "KF5UnitConversion" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "OpenGL" "QCA2" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Solid" "X11" "XCB" ];
-    nativeBuildInputs = [ "SH" "cmake" ];
-    propagatedBuildInputs = [ "KF5Package" "KF5Service" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  solid = {
-    buildInputs = [ "ECM" "IOKit" "MediaPlayerInfo" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5QUIET" "Qt5Qml" "Qt5Test" "Qt5Widgets" "Qt5Xml" "UDev" ];
-    nativeBuildInputs = [ "BISON" "FLEX" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  sonnet = {
-    buildInputs = [ "ASPELL" "ECM" "ENCHANT" "HSPELL" "HUNSPELL" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  threadweaver = {
-    buildInputs = [ "ECM" "KF5ThreadWeaver" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "SNIPPETEXTRACTOR" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.10/manifest.nix
deleted file mode 100644
index 83d10f9def6..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.10/manifest.nix
+++ /dev/null
@@ -1,1174 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
-[
-  {
-    name = stdenv.lib.nameFromURL "kemoticons-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/cl9lk2n5vyfm0rdpxh3qz90mp5g9im5p-kemoticons-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kemoticons-5.9.0.tar.xz";
-      sha256 = "1zr8izm75q18saylqm6p8c4lfickpwpa5s1qz1avz66dprp822jh";
-      name = "kemoticons-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpeople-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/vadyk6vf9rpzb77ighjzqd6gh1sjlllk-kpeople-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kpeople-5.9.0.tar.xz";
-      sha256 = "1qfr5k80kymfr2d955vq3nrbqg4mw22d5k6pgnq06mszvp2fg6k4";
-      name = "kpeople-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kconfigwidgets-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/j2b1174ycr31ij9knwqhv429yh1hm7ck-kconfigwidgets-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kconfigwidgets-5.9.0.tar.xz";
-      sha256 = "081wq0blpl3gpzvljf3pfa8rlbwmrnpihckn6vbpzaaiy5mcwjkr";
-      name = "kconfigwidgets-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ki18n-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/iqwywmpdn4kmxkvkiq0jcmhmss1z13ih-ki18n-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/ki18n-5.9.0.tar.xz";
-      sha256 = "0ply8mb2yg3wx6qqvg8zyj3icgpwk3qw6v56qxjq6zzscf9gl7jc";
-      name = "ki18n-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kplotting-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/y200vzw2amcq3xhb8yd76aysh6d2f0fk-kplotting-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kplotting-5.9.0.tar.xz";
-      sha256 = "1hvjy9bm1jk8msz6fzb32phrvl91fh838mswkfib0b770jqfrvvy";
-      name = "kplotting-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kservice-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/jcbm2l3hqv69hplj3vglc8837ax09fx7-kservice-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kservice-5.9.0.tar.xz";
-      sha256 = "1s854v2dlq8wz2ka068ycwaw1a1lhhb7jy576c4gw96ak1bcplj9";
-      name = "kservice-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbookmarks-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/9wkwlci1l6xcf9zgwnxnpsz2fqwx3lw0-kbookmarks-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kbookmarks-5.9.0.tar.xz";
-      sha256 = "0arh7bzq2nanjy6bdd9zi8jcsnf6anhpam167i16plyq7jdpxd06";
-      name = "kbookmarks-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kded-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/88mbi3xwlccpbgg879df0w5kiwb6cx68-kded-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kded-5.9.0.tar.xz";
-      sha256 = "1kq75p9dbmckgazzxd499qsqyyzr88n0jxy41c10ay2paqfjrrrp";
-      name = "kded-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knewstuff-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/qxlar4y9n5m6c3n6pqh6hjar8kv4h6vp-knewstuff-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/knewstuff-5.9.0.tar.xz";
-      sha256 = "1f9qgj87wd5w8gg2cglgzvxw5imcmw2pxv08p8c8as8xnh1b8iq0";
-      name = "knewstuff-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knotifyconfig-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/x5v2g50d4x92rsnyfywc6600y1bzr4lp-knotifyconfig-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/knotifyconfig-5.9.0.tar.xz";
-      sha256 = "0hdxwcqhi56yaafbl0mc34vc6nbxj3ddm4jl15ykgs1d83pcprp7";
-      name = "knotifyconfig-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "threadweaver-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/cpbmzpqihxbb2a60asc5spc0fc2xri7d-threadweaver-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/threadweaver-5.9.0.tar.xz";
-      sha256 = "1wsnb4ghnibpmypr49nrhpbq9l0cxrr5ak19vhj223ifh09kiqfq";
-      name = "threadweaver-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcmutils-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/icr4xva0xdqidpdb42ijxr7ra8xcx2ag-kcmutils-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kcmutils-5.9.0.tar.xz";
-      sha256 = "0mzj1fddcvcnxqyz2z6acbi724dz43x957nfs2ifn82ahjcpp05m";
-      name = "kcmutils-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwindowsystem-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/q5ny2mnrcz46jdr7vsjmgf24xrscly6d-kwindowsystem-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kwindowsystem-5.9.0.tar.xz";
-      sha256 = "09c752jv1z1x2g3japivmj0ycpsx7fjkwswjibnm3av3j2k7if7z";
-      name = "kwindowsystem-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "extra-cmake-modules-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/jd48z703zmnfhc8a0bz33i9p4ssl6gix-extra-cmake-modules-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/extra-cmake-modules-5.9.0.tar.xz";
-      sha256 = "1iqbcj4zf4pwad5pc2pwnyjs6zswwwp1lsp5a8g9999adgqz54f9";
-      name = "extra-cmake-modules-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwallet-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/h53bsfzw71z8d6qx2g0j9v3g5q6zrn51-kwallet-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kwallet-5.9.0.tar.xz";
-      sha256 = "1sbp512dg2mz10jrv2p8pglancaxbxi2bbmp05rfwfbz0bxyahld";
-      name = "kwallet-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kguiaddons-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/4wb3a0ig4a4bpivyrjq8q7c79dqzzjkx-kguiaddons-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kguiaddons-5.9.0.tar.xz";
-      sha256 = "0rk9bnln6g7xdw8vlldyqsfim75npi0adq627dqi3xfx03ccnp10";
-      name = "kguiaddons-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-framework-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/kzqjb4w2py8ip75j19nfhqsldwg8d4x7-plasma-framework-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/plasma-framework-5.9.0.tar.xz";
-      sha256 = "061b883vj27by3g8j087f2i6z0v76h6jljm5q2zs2dvr92jyqw8x";
-      name = "plasma-framework-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcodecs-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/ahzrjx81z3dmp8f2gs7qb8r0mz3c9ml6-kcodecs-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kcodecs-5.9.0.tar.xz";
-      sha256 = "1y1s7rzh5g2cj4f8xq6sfw06rnabg1z0y49rafhvx03w9fck9pib";
-      name = "kcodecs-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kxmlgui-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/sm45sg21cyp099s4apn6p0pypcm33ijx-kxmlgui-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kxmlgui-5.9.0.tar.xz";
-      sha256 = "0hwbzvyb2psys2bbxw05r2jyiigay4dwwad636yhqqgcqv8zk2wv";
-      name = "kxmlgui-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktextwidgets-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/acizf5h2fcmjsriwnkszrk8yv9zhxzgh-ktextwidgets-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/ktextwidgets-5.9.0.tar.xz";
-      sha256 = "0ld3z2l96710yali3l83410yblgw2fjdm1hyqhjp94vvhabzvzgr";
-      name = "ktextwidgets-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kinit-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/7zd0kxdpf33p7cc158sakl0h76l9bgik-kinit-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kinit-5.9.0.tar.xz";
-      sha256 = "110s0yparwim7lnj7rcaqc00z0vx36cwyx74hx9vm4kfqvi11yav";
-      name = "kinit-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdbusaddons-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/c382r0g1wh1jgplfidaf57in3j7c3mnk-kdbusaddons-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdbusaddons-5.9.0.tar.xz";
-      sha256 = "1s92y1rha9kqys808zpl6cbzrzbxp4asrlwyl1djbyjv4gccs1zh";
-      name = "kdbusaddons-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "frameworkintegration-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/78mqjc0zpiwzi7vwymz8jl1sr82pfhd2-frameworkintegration-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/frameworkintegration-5.9.0.tar.xz";
-      sha256 = "0fnjx6vsfx71iq7nyxfp2msg6mdgp1kwy16ayrxmm4sfs1g7bdx9";
-      name = "frameworkintegration-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjobwidgets-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/f4zqsfim0xj45pciv87xf237mr3bi6qm-kjobwidgets-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kjobwidgets-5.9.0.tar.xz";
-      sha256 = "11ib74i7w05p31m0wfkrwxwaa47gsfmnfggdnxc8aziswqww0x9n";
-      name = "kjobwidgets-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "networkmanager-qt-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/9a8yy0x7gb64wnjzb3q09kww47iv74zp-networkmanager-qt-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/networkmanager-qt-5.9.0.tar.xz";
-      sha256 = "0z7bbx9hzifsfr7pycj4lbhr0nbzvvy3zwirgkx401dxqyz063g4";
-      name = "networkmanager-qt-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpty-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/dxw9x2xnwlp0iz6x3q7dfjkdqyh23lkg-kpty-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kpty-5.9.0.tar.xz";
-      sha256 = "1s3hj5s9ph0v7ndhmajn3avjbrrir52fk1hzxp0b1smv95hf1gli";
-      name = "kpty-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcompletion-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/jkz4hm0bbzk1z4rdw7mk11dmp73mdpn7-kcompletion-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kcompletion-5.9.0.tar.xz";
-      sha256 = "0grmgzqfbi87agil0vygpf8x0kfzhl4h8kn2ljhmm8nqp5g9ah0k";
-      name = "kcompletion-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kio-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/pamd5nf7v353zl3wqnmxaabwb3as2vrm-kio-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kio-5.9.0.tar.xz";
-      sha256 = "0n8kf728zlyivz0vhp9lnygj2cwazll5llv227fvimh5mcsw68y4";
-      name = "kio-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kparts-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/lrdpdzaqiqbqvdvmxwdgaawrafd5z8kd-kparts-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kparts-5.9.0.tar.xz";
-      sha256 = "0kqa5s0j8smy31ql2y4niabp95c4c237spqcgllcpjz1kq2vbg2l";
-      name = "kparts-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiconthemes-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/ig6smkn1wq8yzcpmdlziqaqwsk0jbm84-kiconthemes-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kiconthemes-5.9.0.tar.xz";
-      sha256 = "1nzfsn6asr91skxzd7i4d9qkn5rl6dylha37mxrlc9m6dhanf5zm";
-      name = "kiconthemes-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kglobalaccel-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/n7x2xk0wnclxh8s2mlnw997376363i55-kglobalaccel-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kglobalaccel-5.9.0.tar.xz";
-      sha256 = "07652pxqql2dj7280vryk5agank0rd3wmj93isbfak61q20y4snx";
-      name = "kglobalaccel-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapidox-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/525lhwwpxc9h9pbiyzr0qspk8sp0ml60-kapidox-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kapidox-5.9.0.tar.xz";
-      sha256 = "1pva41v0x67nmpp4kiwmm61laxym3lj2jhc37d5b6qhsbvyq48jm";
-      name = "kapidox-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kauth-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/xmziq9qlxfxmvl4bdxaf16z497fb38fi-kauth-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kauth-5.9.0.tar.xz";
-      sha256 = "00kvdhxspkwy21fd1kvfh253cl3i5qkf6hlf3y75yjpsl2bh6vqz";
-      name = "kauth-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpackage-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/ib2x9bcdi7lm0gppw1q39p1mmwbid6f4-kpackage-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kpackage-5.9.0.tar.xz";
-      sha256 = "04z6qqbb16y38g3bdbd209wh9k2bg9mw7zkzbkknz3xkd8b17fbf";
-      name = "kpackage-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knotifications-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/jic7izn9i0mblgxm8qfyvdrlgby8p7l7-knotifications-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/knotifications-5.9.0.tar.xz";
-      sha256 = "1s1zqxcm1dwz5sjardddgyz2zdcdzpnyzlr9f9wy89jbkvji63wa";
-      name = "knotifications-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesu-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/njrnjrpi0qsvvnpzx673gygyifp22xn4-kdesu-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdesu-5.9.0.tar.xz";
-      sha256 = "0j1f64pp6sisw1nrg0510nn5n0z734lkyn4nin4pv1qzsxjxs39r";
-      name = "kdesu-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcrash-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/gfz9mm191zrdwlv5l622gvgskg5aipy6-kcrash-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kcrash-5.9.0.tar.xz";
-      sha256 = "0y4s68f580v2qyjygi33avn8a5aww5j4n25ci2qw1nhqz4jvvji7";
-      name = "kcrash-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdnssd-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/h4xfhg3m2qbhiqncz687abvcibanq84j-kdnssd-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdnssd-5.9.0.tar.xz";
-      sha256 = "086182qfm0jbap1wk1br9c0gzwbnxrsrm5nsh7d9h2k0fbd74cf2";
-      name = "kdnssd-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kunitconversion-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/b5lgglmahl4cyrnnl3a8dr17j5bym6yj-kunitconversion-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kunitconversion-5.9.0.tar.xz";
-      sha256 = "0ngbfma7nf5pjqra6378slqyqy8b9fqlyp3cb27n6qwcqn9pjfif";
-      name = "kunitconversion-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kidletime-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/3ksyripr9w13540dmgpxf3pr4djn47wr-kidletime-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kidletime-5.9.0.tar.xz";
-      sha256 = "135y54hkxyd19szb6zkin5l6n0mmfakl3asqnd0pxyh8a9nbdjz5";
-      name = "kidletime-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjsembed-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/9s6zm801gizhls4rpmrij23jzqnkcbjy-kjsembed-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/kjsembed-5.9.0.tar.xz";
-      sha256 = "1rvr9nkw7c5a433sqsjdaz1wrja4kny3kc74550qpimwjlcwirix";
-      name = "kjsembed-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs4support-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/zx5l2jjfrfhb7i8x0m7abdw3qzcp8lhz-kdelibs4support-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/kdelibs4support-5.9.0.tar.xz";
-      sha256 = "1fvwwd2gj1wdfgd9jczvgm6fi2i08y9mdmvfc7cjh7rnwps5hy7d";
-      name = "kdelibs4support-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krunner-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/ng08bafm24q6nl1gfdschnljm3zly8rm-krunner-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/krunner-5.9.0.tar.xz";
-      sha256 = "1m95gm32rmvm9p4422if89vid4k29q0i7qdyakdn3z5zks23scdl";
-      name = "krunner-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kross-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/ddrjg3drx3hj3bwf120y8pq1wq7q5m0s-kross-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/kross-5.9.0.tar.xz";
-      sha256 = "0brzycpqjyqryj86scv52m3p9mvhlq1swrmh22gpwwnvmh6ngdvj";
-      name = "kross-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khtml-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/qx36l5jwllflpamxwrn9v3ff2fhv33iz-khtml-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/khtml-5.9.0.tar.xz";
-      sha256 = "19m01gg5gz02i4z85jnlspb441v906cakd53mgwl1028r8h498pv";
-      name = "khtml-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjs-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/z4898f54az0nb4j4ydjsakiqpn6rz3zr-kjs-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/kjs-5.9.0.tar.xz";
-      sha256 = "1v6sk4kjf70ypgl7wxqfsjg6q5ms3qac1zjw54nw94qq55b9psvl";
-      name = "kjs-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmediaplayer-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/bzy6c2shbkv003dsh08ccn208lqdd17a-kmediaplayer-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/portingAids/kmediaplayer-5.9.0.tar.xz";
-      sha256 = "13zswmpdidlpxa1h4dg1s74m584syqrrsgxll6b5yl1p7j4x0g5z";
-      name = "kmediaplayer-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kitemmodels-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/4s94ln9czamd4p6gkllvp5b8plw35xmk-kitemmodels-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kitemmodels-5.9.0.tar.xz";
-      sha256 = "0m5ag09narwglg799f4ahpjgxlxvnxjrshv1cbszp7v2naxh1365";
-      name = "kitemmodels-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "modemmanager-qt-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/fdhdk8m0jy1g72k8mm11ljnmyw6ldp71-modemmanager-qt-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/modemmanager-qt-5.9.0.tar.xz";
-      sha256 = "0ap1gr2xjnzmgl7cpi66xdgw14g4m0ax3q74vr86vdcsrmcql0b3";
-      name = "modemmanager-qt-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdoctools-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/b5fd64g9rrd46qakpzkrydnj6chpcx5c-kdoctools-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdoctools-5.9.0.tar.xz";
-      sha256 = "1iqp7d09j572splxr92gkadhmbd3rs4661ky45pajrk79g53brmk";
-      name = "kdoctools-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcoreaddons-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/zr152vxn36ph75ilmwyf5xc9vikczcap-kcoreaddons-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kcoreaddons-5.9.0.tar.xz";
-      sha256 = "0cb5j65y7yv27d3dm3jzrparn5h6knk635sxnpdxvcjdgbpr93hi";
-      name = "kcoreaddons-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebkit-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/0x0j7zm9p1hrxq2793cf4dv9sjyn6k23-kdewebkit-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdewebkit-5.9.0.tar.xz";
-      sha256 = "08f1jfnxi3znyk20gszr79wwlx55dp0qavpy0ifm7s22vl3bswdy";
-      name = "kdewebkit-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kimageformats-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/n7k5dazmp4rppbagy5b0frf1q72l5kcw-kimageformats-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kimageformats-5.9.0.tar.xz";
-      sha256 = "114rrk1hpyfr4dq7kriddgd9nh0x2r1ylk4sa2sx8avhfqh01bmg";
-      name = "kimageformats-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "karchive-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/yzy2r8ajkdw8g3qwbdjkf689b9qrsanl-karchive-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/karchive-5.9.0.tar.xz";
-      sha256 = "1cmh06grw77fkj7fg4w6mpv3y0zyq25pwzl7vh00pyd9wqsgv89z";
-      name = "karchive-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeclarative-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/x6j9vl25c8ixw1bv3zan69likxv2x5yr-kdeclarative-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdeclarative-5.9.0.tar.xz";
-      sha256 = "1x515r5w107g5zy6hhqmhh14ww2ar81zdlbhzm0ki5id16vmzcc4";
-      name = "kdeclarative-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kitemviews-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/r0yi07vv52dbvfx1pgxidxqcdx7bbqii-kitemviews-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kitemviews-5.9.0.tar.xz";
-      sha256 = "0xymycick40mxc6prvxyrqvg6ig9c9q2k3kp4i40468id88m8p8s";
-      name = "kitemviews-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sonnet-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/y4sh847b3hgkk6ikdr0rl3lljylzrz1k-sonnet-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/sonnet-5.9.0.tar.xz";
-      sha256 = "06c78qdn9azadghz0jyzky4mk1qk51v6zyb7m2yrnisn2miyhv28";
-      name = "sonnet-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesignerplugin-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/v5ad3dhkisy4rag5zqk3zx9lmc5hx4hm-kdesignerplugin-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kdesignerplugin-5.9.0.tar.xz";
-      sha256 = "03x2vg2va2s323ynyqpin1srhwlak1yrl6hkzcxmyirqd36rq2ik";
-      name = "kdesignerplugin-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kconfig-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/h4856ysd2x370375vdm1hfcbhxm3g49c-kconfig-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kconfig-5.9.0.tar.xz";
-      sha256 = "1mhqlrsxnfqpafpjf3y4v4q5d1wqv404wkzfll07pihkivq52jd1";
-      name = "kconfig-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kactivities-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/n2i4dy75ms4kjvv8m7rwxywwv8zvxhmk-kactivities-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kactivities-5.9.0.tar.xz";
-      sha256 = "0lphz9jybmphdbbcdm74dzrlb01m8q7saxz04c30pl37kaxrplam";
-      name = "kactivities-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "solid-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/h68n4cp0lkdclnww7mc7xfh4f7nyzjdi-solid-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/solid-5.9.0.tar.xz";
-      sha256 = "1z8qxjpl7gbfhii2lz0g62vpip6iw998aq6xaxswgfy3l558xqwn";
-      name = "solid-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kxmlrpcclient-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/2klkxcvdwqmfq5xwq7dsgk675vdxssz2-kxmlrpcclient-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kxmlrpcclient-5.9.0.tar.xz";
-      sha256 = "1igjrq1z0cfgfkgifdjfyfcbvgabgn3gg85g7hxvqz262lscilwg";
-      name = "kxmlrpcclient-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktexteditor-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/04kkss23ry8qhsd97w80q37958b25wa9-ktexteditor-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/ktexteditor-5.9.0.tar.xz";
-      sha256 = "12ci3qhbq8hxvsv2q4rkr4q2sbs11zxn8afn7wwh4za1b80vgi4b";
-      name = "ktexteditor-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "attica-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/75ipp7rrjrx3csia7blhwh9nf7jchprk-attica-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/attica-5.9.0.tar.xz";
-      sha256 = "0wymjj5sch638hrn6z9xrmw8n9avrci16qxvig5sapr0wn2r51vj";
-      name = "attica-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwidgetsaddons-5.9.0.tar.xz" ".tar";
-    store = "/nix/store/s1gh5sqrpjicv1vxzb8affi51js2zk4j-kwidgetsaddons-5.9.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.9/kwidgetsaddons-5.9.0.tar.xz";
-      sha256 = "1s8lbj779rkxd878v15awcbxpmvrm95cahiq9a54mv75mhlix1j1";
-      name = "kwidgetsaddons-5.9.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kunitconversion-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/zfya6451kbd13sqbvn37as2pbvwzblb2-kunitconversion-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kunitconversion-5.10.0.tar.xz";
-      sha256 = "0dxawvihm2bnc9l9vx90bq50sbcgrnkfvlsixkwhirw2cvvz0v5p";
-      name = "kunitconversion-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kauth-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/4895lldwv2v8vmravprlvy18qrbj83ha-kauth-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kauth-5.10.0.tar.xz";
-      sha256 = "074xr0qzknh9d0f6lisbyf612p4drlqscs7lqkasmd8f0r14ixlq";
-      name = "kauth-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kio-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/360wiiib4wjpc6anq8yk3xsl52bmfi5p-kio-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kio-5.10.0.tar.xz";
-      sha256 = "1lbbxn5s6p8fsgyr4nwwyawgcw4ywldwy7mbvn8pk5xrzai3c04r";
-      name = "kio-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "threadweaver-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/ha4rcc73g899c7qsngjyjqww5wn8d24y-threadweaver-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/threadweaver-5.10.0.tar.xz";
-      sha256 = "1lfdxin8rjvjpqky3g416magsg9ivf5kjmh9r37rz4v0mxsv5knd";
-      name = "threadweaver-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcrash-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/jakl1nm1lvnyscpx35d21l4whc8p6h8n-kcrash-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kcrash-5.10.0.tar.xz";
-      sha256 = "1imgn8a8ns15f2alp5xljy6llmqy0dv7yiqqjb1n8klvyp5mynlx";
-      name = "kcrash-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "karchive-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/9lh3nmzwia4akk6zi426admgq1sd1ybx-karchive-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/karchive-5.10.0.tar.xz";
-      sha256 = "19lzv1fi7vw95l9mx0qx10nfn5q7wzkqahsg2jswp31vgf977wfw";
-      name = "karchive-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "networkmanager-qt-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/mx64rg2lj5vmx2ggijrwv8iqp5lrm2ac-networkmanager-qt-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/networkmanager-qt-5.10.0.tar.xz";
-      sha256 = "0a9yg40rmvl7mxscyx6ndq4fwqxfy6rfy6a6cb8b6wm2im29njc4";
-      name = "networkmanager-qt-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kguiaddons-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/wd7s3v68xjshl9jjy974pidv0bar6j9f-kguiaddons-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kguiaddons-5.10.0.tar.xz";
-      sha256 = "033z4difclwbmy4bi0c819i08x8pb5znr0kd27c3l9xaf2z3kaxr";
-      name = "kguiaddons-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kparts-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/q4xmlj9k2lc0ansqm982xcczna33d0y4-kparts-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kparts-5.10.0.tar.xz";
-      sha256 = "0k1zkr2qvl65cgk0j3ybvmxs8wwjl0641yrgl36ngbk23lyi35rv";
-      name = "kparts-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kemoticons-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/8vyxpyy2ym3zza3rgh97ny034prss6f0-kemoticons-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kemoticons-5.10.0.tar.xz";
-      sha256 = "0i3hj04k0dh2rx77sig9qdpjh2rik0n2snpr61ckiw9ixh8fggkr";
-      name = "kemoticons-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwindowsystem-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/ay11avkmb2sslf4r4ibi00sj7sndfvw0-kwindowsystem-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kwindowsystem-5.10.0.tar.xz";
-      sha256 = "0grxbydcc9k88nnlav7vcn3lajzswcsim5cpjcsysx9irx8rbiqf";
-      name = "kwindowsystem-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kconfigwidgets-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/2lpy9ar6qh2i3bn3vn3n9kckj5inryc4-kconfigwidgets-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kconfigwidgets-5.10.0.tar.xz";
-      sha256 = "19p073fzpvm6hn85qk959s6dlnizywwcipw4rfm92b3y3jqg77i0";
-      name = "kconfigwidgets-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjobwidgets-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/vh5k90s0ni97ffz23fgfngqxay542xb4-kjobwidgets-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kjobwidgets-5.10.0.tar.xz";
-      sha256 = "0b2n0wn2l4k8xsjgycv7123xvlbq06g0pmbn5q6akywr0lrnyd16";
-      name = "kjobwidgets-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwidgetsaddons-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/2i00n76b27gj6cpzqsqyahjdpiqncvxa-kwidgetsaddons-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kwidgetsaddons-5.10.0.tar.xz";
-      sha256 = "0c9gzwsacm4zjjqc25akzf88fgrp9nraqid3c4na6asyn1pxzkmh";
-      name = "kwidgetsaddons-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwallet-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/xdgfmrz0zga3ffrmhh6svc0xwk9j8hz4-kwallet-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kwallet-5.10.0.tar.xz";
-      sha256 = "0nrb67shmdfaw2naa87gp29f2y3nnscj6ipw854j7shxz4fl2nr4";
-      name = "kwallet-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kded-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/aw04kz9cvgl089fi7dria4bjj6lsx0gy-kded-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kded-5.10.0.tar.xz";
-      sha256 = "0n2nd96j09igbxwq4697gyl45sfij22hs5mkys1gnaw5j8byaj4a";
-      name = "kded-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcompletion-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/9x8g7xf6da032y48bjwb0qgn256nxjid-kcompletion-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kcompletion-5.10.0.tar.xz";
-      sha256 = "1cb8b7qij67bghg35xcbs2lpkh5jzl7illln7h6h9jyygzv6vq7m";
-      name = "kcompletion-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "attica-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/78shcdc7hazqjpb9zw9fi48i783dcnx9-attica-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/attica-5.10.0.tar.xz";
-      sha256 = "1immb10bvpkscdawyv1n0y52jjnfy0y3hnjxxzfwci9fj24da625";
-      name = "attica-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kitemviews-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/3z0i50s73z4ah1wxw0gv9r5ayllm2ws3-kitemviews-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kitemviews-5.10.0.tar.xz";
-      sha256 = "0dihi79j7iqy2x3qivjalsj9qa2b17g7jl7j705fjjfnw64xj8bi";
-      name = "kitemviews-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdbusaddons-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/fnjbqxb8pb2z48c7a3i7ngma7lalmvsq-kdbusaddons-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kdbusaddons-5.10.0.tar.xz";
-      sha256 = "0lk7h424lc015asqpnldck18zcjki4672fkswy3qdvmkkpzdgx3m";
-      name = "kdbusaddons-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcoreaddons-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/71ql005nih2qjlybsal2rdg4h1fgj3rf-kcoreaddons-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kcoreaddons-5.10.0.tar.xz";
-      sha256 = "0y1j50axd6i0givknp9xfk81jdcdzz5p7m761qvbbjflqrnznvc1";
-      name = "kcoreaddons-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knotifications-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/8raimajcs7nc091fa75wbli2d1rz74my-knotifications-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/knotifications-5.10.0.tar.xz";
-      sha256 = "16qh492wwcyxanwmaqp1979wh3mrzmjkhvgnig5fxfvqzh9hxp0p";
-      name = "knotifications-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kglobalaccel-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/s9fnk5qs8qjsnf1yqdh09xf3ad7p4k6s-kglobalaccel-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kglobalaccel-5.10.0.tar.xz";
-      sha256 = "02nr4f991zi03spq4m9rlj11m5kvhmqghkfl2ijqnwv8m4dq2afy";
-      name = "kglobalaccel-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebkit-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/36lvpr42574d8cia2ldszawfbm88jiha-kdewebkit-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kdewebkit-5.10.0.tar.xz";
-      sha256 = "08bw2ximj3z6rs06przf6kah1mczlv2nri99cgiihin99jx8f98h";
-      name = "kdewebkit-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kconfig-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/7hk4bl92kfr9a3qs4wz52a8w7ij8336a-kconfig-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kconfig-5.10.0.tar.xz";
-      sha256 = "1r7r4yihlnld09l9qmq2q8h9xk7clmgbry8vnggzih1bamid79dq";
-      name = "kconfig-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ki18n-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/cnhv0jch823qnim7z0zdvbyjd5vrcg3y-ki18n-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/ki18n-5.10.0.tar.xz";
-      sha256 = "0xa27c42bnvhks6mdz593hxwl3idagyz6mbmp8p5dj6xsfdabrcs";
-      name = "ki18n-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kimageformats-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/0hc6flqibi46fbrc3cdfynyvhpq458z0-kimageformats-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kimageformats-5.10.0.tar.xz";
-      sha256 = "140s1lydikb87rpaxqmv6ccp139ch9vsi62r6fmyvwx6l0ffh2ay";
-      name = "kimageformats-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbookmarks-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/4w5fasxqv1s6rx9ri3jg1dppikm2hpci-kbookmarks-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kbookmarks-5.10.0.tar.xz";
-      sha256 = "040n5xv8n357smmhsq24hgv43dcsbpc0wfyjhfznz41azcibbydw";
-      name = "kbookmarks-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kactivities-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/5aq6q69jylvagidgawig2laf1lqlks8l-kactivities-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kactivities-5.10.0.tar.xz";
-      sha256 = "0d2cyjv9hb4zd99sp598miwq4k1nzv4ssbgak7jmifqcimjpjjsk";
-      name = "kactivities-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktextwidgets-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/8w02lcpf5pr1y6nhr7jx33xf266napd4-ktextwidgets-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/ktextwidgets-5.10.0.tar.xz";
-      sha256 = "0mpsikpy1i3j1dx352a5c77xx5m6iv4lfnff58yi5z0m31002mv6";
-      name = "ktextwidgets-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "extra-cmake-modules-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/m4lgg75y8c1fcw2gsskyk14x011ydbvk-extra-cmake-modules-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/extra-cmake-modules-5.10.0.tar.xz";
-      sha256 = "00h62mmxl8jwslssczv14dmydgmg3rr12dd8b5471xbmx8kvqb86";
-      name = "extra-cmake-modules-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-framework-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/yy7r7d0m4l75v0l7dr9krjcgbkpq2nrw-plasma-framework-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/plasma-framework-5.10.0.tar.xz";
-      sha256 = "0a2lkxbpry8p8sar7ai2fcnjciiik4ir9y9snkmxci26vgql8j8a";
-      name = "plasma-framework-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kidletime-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/0n2i32wrhvwpq63xvqxf2ibgil9fmljy-kidletime-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kidletime-5.10.0.tar.xz";
-      sha256 = "0rvw4b22x9jgkqx64wisc0qnl6kx2b97sz2hxcpqh2lkj1cql4r0";
-      name = "kidletime-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kservice-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/gzc1wc32ggqrmvvzg36p6n7g5zlvxl48-kservice-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kservice-5.10.0.tar.xz";
-      sha256 = "15dmfd8ddjaac5mdb041ddhpkr3bh6gcgy0wfg404xiy1sx12dr6";
-      name = "kservice-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdnssd-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/q2pbpwp8al275xk7sd4smwzyi9yahfsh-kdnssd-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kdnssd-5.10.0.tar.xz";
-      sha256 = "0frar6j0n6m43l7hdc14n0vbvs63fjg2gv5q59zwsx856rrqfszi";
-      name = "kdnssd-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcmutils-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/nx5s67hxxldmws5292cqgwr8xjxr2dli-kcmutils-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kcmutils-5.10.0.tar.xz";
-      sha256 = "1995jbnnkwmkyiq8jav4r3x3mi3w5kv0am10c0d6g1pxjsig1xrx";
-      name = "kcmutils-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapidox-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/ymkxbdnjg74454a4k4s5i1y29cfxf6zc-kapidox-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kapidox-5.10.0.tar.xz";
-      sha256 = "1zjjj951vfnwc8833lh6schdcva0dhiws56kmhclg7m9mpnvbav4";
-      name = "kapidox-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeclarative-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/k58nmr9k6qib3kbp6yxwkbw90fxxydhv-kdeclarative-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kdeclarative-5.10.0.tar.xz";
-      sha256 = "1kfsqg43inn2is991nzcgcicd7aa7yg6bzsxac3c3136p32ii9yg";
-      name = "kdeclarative-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdoctools-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/jzw1pnsjcl6xv8gfqdi02gcnr5x1301s-kdoctools-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kdoctools-5.10.0.tar.xz";
-      sha256 = "0v00pjm0jsqkxq52ndpds7qn5vbsxkgzvvy379id1ag692s55jkp";
-      name = "kdoctools-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krunner-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/dac20ijml2z02bbslxpzxlmpzsbfp4r1-krunner-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/portingAids/krunner-5.10.0.tar.xz";
-      sha256 = "15adxzsh27s6h37mfa8pwwdf47gp8whfsshj5chl7h3zdj5aa04i";
-      name = "krunner-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjs-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/qm70n66sxh6zgxc02sh2k0ii1xw2g8yk-kjs-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/portingAids/kjs-5.10.0.tar.xz";
-      sha256 = "0l3pn9g7mv5wklihgd7v3c83563ly9swwayivqlyz4rj35m7lvq1";
-      name = "kjs-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmediaplayer-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/h0k2i2vx7r57by15bx23paay9q4fah3x-kmediaplayer-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/portingAids/kmediaplayer-5.10.0.tar.xz";
-      sha256 = "0q17lgajv3844d2nccnfyzg6g55wx79fxij2iw42m25wyxg7b4df";
-      name = "kmediaplayer-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjsembed-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/3z1phizh6lphvihqgg63ajlfqj3hbn54-kjsembed-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/portingAids/kjsembed-5.10.0.tar.xz";
-      sha256 = "1922bvs3p2ffax5h8kmg4llw65h00m22qfs8n3qhcc952zgv1wxl";
-      name = "kjsembed-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kross-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/ifg2nrl5zk707f510nkv8cnzjwdrrc2h-kross-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/portingAids/kross-5.10.0.tar.xz";
-      sha256 = "02mz7w920vka5wwgbnf0m774s56r4qkwplakdyal92ip3zc3m6jq";
-      name = "kross-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khtml-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/h9zaw11asgbhgxwqbsnvcdg0h97rcqfd-khtml-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/portingAids/khtml-5.10.0.tar.xz";
-      sha256 = "0wzzcysgvjkibs8j277z75b0s5dvjwby7c6lnyyzmnm5vmsw2dj2";
-      name = "khtml-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs4support-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/ii9a8qxf2xh1ijx4m5zfssjrvgfsf1wf-kdelibs4support-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/portingAids/kdelibs4support-5.10.0.tar.xz";
-      sha256 = "0j7ah078ckz8zcdb417j7dmzpcbs9vvbr42r6c49fk7rp7vy4ly2";
-      name = "kdelibs4support-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "frameworkintegration-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/7rbwib0mgkm5pl8ai6q6fjdq87zyk99d-frameworkintegration-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/frameworkintegration-5.10.0.tar.xz";
-      sha256 = "00plajvkp19njdyq37qmf0q5xvwvl3vgx0vmls4hf2mk179yqm63";
-      name = "frameworkintegration-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knewstuff-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/k4zm5y96427bwdjfjinnj8p2knkgn12h-knewstuff-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/knewstuff-5.10.0.tar.xz";
-      sha256 = "1z24h7rk7vyavw3949gj06y924x1sbyy8jh3krr1ngpddlrsk5l7";
-      name = "knewstuff-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpackage-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/j9p1kdz7wknxjk33b92aicqx2f021i10-kpackage-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kpackage-5.10.0.tar.xz";
-      sha256 = "0c5xnks7k85lj6pkbylnlcmlhxns95zs6km9hfvdi7zh0i26y8qb";
-      name = "kpackage-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "modemmanager-qt-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/lqd4bh2da4v002ckm5cz5clzmddkvyil-modemmanager-qt-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/modemmanager-qt-5.10.0.tar.xz";
-      sha256 = "1whhc8clibiwzda4zbk8asry65c7nlnlgq10sbmh7gq008l0z9l1";
-      name = "modemmanager-qt-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktexteditor-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/x83fw1z7h9s2h03m4slydvpafzxvi1lq-ktexteditor-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/ktexteditor-5.10.0.tar.xz";
-      sha256 = "1axs21vklg392hxcm8j6y01qk3wphsfldh0caqnv6ifhamvcvkhh";
-      name = "ktexteditor-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knotifyconfig-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/chvplwyglb6zwhjhxyrb91f0rg4k2g1a-knotifyconfig-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/knotifyconfig-5.10.0.tar.xz";
-      sha256 = "1zhddbynsk4b27sldmbd8q8mk8kbjyfv5k27vrqahlbq7ysrhflm";
-      name = "knotifyconfig-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcodecs-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/184rzn1mjkmv6dvqs8rmjhwxzsbp04yb-kcodecs-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kcodecs-5.10.0.tar.xz";
-      sha256 = "1izw6rpvpxhwnl6aqrfqh2m3v3ia5gynpsxd8syi1cxnzmajgwic";
-      name = "kcodecs-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpeople-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/1vqn907gx0b0h238zwys8v3ryxf8yqlh-kpeople-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kpeople-5.10.0.tar.xz";
-      sha256 = "0b56c3pha1rgz9h8ia0vd4k5nvmxh64wgk5vgfnxa0znij47wcka";
-      name = "kpeople-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kinit-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/rmrvk7308bi4kzximn9pzzgij9mihnll-kinit-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kinit-5.10.0.tar.xz";
-      sha256 = "02da17n19xx9cqiyzh7qlbqyy0mpy4gr3pdja1xlqaapc52k99sz";
-      name = "kinit-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kxmlrpcclient-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/bijjk36yvjjcmnckvm3ccw9zs40ckjcx-kxmlrpcclient-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kxmlrpcclient-5.10.0.tar.xz";
-      sha256 = "1cjwqxpwwx9gxxb43dncyfcn3rjfx28af6dbh4zx7l0yqw4z4cxi";
-      name = "kxmlrpcclient-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kxmlgui-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/fafv3gxzbrvrjvxvng6is8k9a3869g1s-kxmlgui-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kxmlgui-5.10.0.tar.xz";
-      sha256 = "1m22ld9pd2z287j8nj9alk1pychq04r0w1g1vqhgr0shlxzx91pf";
-      name = "kxmlgui-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "solid-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/6shp9pnj9p4lpb2kzzdfqz2pf6ivy2gc-solid-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/solid-5.10.0.tar.xz";
-      sha256 = "1qy3bic39jffc2pl1wh36qm8sizjld6gd2qx6y4j9xzkv723r864";
-      name = "solid-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiconthemes-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/h5i2pk6zy3k4h23q1jfdbarc8fm1614b-kiconthemes-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kiconthemes-5.10.0.tar.xz";
-      sha256 = "19vvg63ld4388jd47245zqzbj5bs8qj69524bvwqbv77201qg7j1";
-      name = "kiconthemes-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesignerplugin-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/jdyk0kl1ccbnnb83mzda670bg93z3w0w-kdesignerplugin-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kdesignerplugin-5.10.0.tar.xz";
-      sha256 = "1z82kxn5hpbmhsrh4ic7mcmsz115p39gph7ysjz9fh6ylfdgcrpm";
-      name = "kdesignerplugin-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kplotting-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/b5h0i3mcfb9g7krd7pc5c0f1c2q0jma5-kplotting-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kplotting-5.10.0.tar.xz";
-      sha256 = "0g7riml9nbs762s1pld9d3y743z52kxdaiaklg3ai5cljp5v5skh";
-      name = "kplotting-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sonnet-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/ivjvsiqv1gjb0cq5lkxa7a3kb9pjcvrw-sonnet-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/sonnet-5.10.0.tar.xz";
-      sha256 = "1ad205mldwk234vwjkbalx6pnib02mz68drajg07ii5ycsczgk93";
-      name = "sonnet-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesu-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/h3vphpz0fdw7v339bcf0krqm2rgwqzsl-kdesu-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kdesu-5.10.0.tar.xz";
-      sha256 = "002ryv2svl1hmapflg0cvl7xd7qa4sh2msxnma9ijsad1ypv9nrw";
-      name = "kdesu-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpty-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/1k73m5m6vkl6p9gcn8ik4cvh0k5chlxa-kpty-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kpty-5.10.0.tar.xz";
-      sha256 = "1ys8wv1hirv6jk6jdzjnvkhw2lx3rxj8xp4sgvxfbfs833vdnqx6";
-      name = "kpty-5.10.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kitemmodels-5.10.0.tar.xz" ".tar";
-    store = "/nix/store/v1lmfs7h4q0d6wmp7xz21ad5sm50bxx2-kitemmodels-5.10.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.10/kitemmodels-5.10.0.tar.xz";
-      sha256 = "1c63wsy9iy842ljv2vmnjcn6p3ahnv6pm73p1kayjdqq6wy0lmq6";
-      name = "kitemmodels-5.10.0.tar.xz";
-    };
-  }
-]
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/manifest.sh b/pkgs/development/libraries/kde-frameworks-5.10/manifest.sh
deleted file mode 100755
index 28870e48964..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.10/manifest.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
-KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
-
-if [ $# -eq 0 ]; then
-
-  # The extra slash at the end of the URL is necessary to stop wget
-  # from recursing over the whole server! (No, it's not a bug.)
-  $(nix-build ../../../.. -A autonix.manifest) \
-      "${KDE_MIRROR}/stable/frameworks/5.10/" \
-      $MANIFEST_EXTRA_ARGS -A '*.tar.xz'
-
-else
-
-  $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
-
-fi
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/packages.json b/pkgs/development/libraries/kde-frameworks-5.10/packages.json
new file mode 100644
index 00000000000..c5e704e62b1
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.10/packages.json
@@ -0,0 +1,2090 @@
+{
+    "kwallet": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5gui"
+        ],
+        "name": "kwallet-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kwallet-5.10.0.tar.xz",
+            "name": "kwallet-5.10.0.tar.xz",
+            "sha256": "0nrb67shmdfaw2naa87gp29f2y3nnscj6ipw854j7shxz4fl2nr4"
+        },
+        "buildInputs": [
+            "ecm",
+            "gpgme",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5gpgmepp",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5notifications",
+            "kf5service",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "libgcrypt",
+            "qt5",
+            "qt5dbus",
+            "qt5gui",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kdewebkit": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5webkitwidgets"
+        ],
+        "name": "kdewebkit-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kdewebkit-5.10.0.tar.xz",
+            "name": "kdewebkit-5.10.0.tar.xz",
+            "sha256": "08bw2ximj3z6rs06przf6kah1mczlv2nri99cgiihin99jx8f98h"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5jobwidgets",
+            "kf5kio",
+            "kf5parts",
+            "kf5service",
+            "kf5wallet",
+            "qt5",
+            "qt5core",
+            "qt5network",
+            "qt5webkitwidgets",
+            "qt5widgets"
+        ]
+    },
+    "kbookmarks": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5widgetsaddons",
+            "qt5widgets",
+            "qt5xml"
+        ],
+        "name": "kbookmarks-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kbookmarks-5.10.0.tar.xz",
+            "name": "kbookmarks-5.10.0.tar.xz",
+            "sha256": "040n5xv8n357smmhsq24hgv43dcsbpc0wfyjhfznz41azcibbydw"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5codecs",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5iconthemes",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "threadweaver": {
+        "nativeBuildInputs": [
+            "cmake",
+            "snippetextractor"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "threadweaver-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/threadweaver-5.10.0.tar.xz",
+            "name": "threadweaver-5.10.0.tar.xz",
+            "sha256": "1lfdxin8rjvjpqky3g416magsg9ivf5kjmh9r37rz4v0mxsv5knd"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5threadweaver",
+            "qt5",
+            "qt5core",
+            "qt5network",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kcompletion": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kcompletion-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kcompletion-5.10.0.tar.xz",
+            "name": "kcompletion-5.10.0.tar.xz",
+            "sha256": "1cb8b7qij67bghg35xcbs2lpkh5jzl7illln7h6h9jyygzv6vq7m"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kwidgetsaddons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kwidgetsaddons-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kwidgetsaddons-5.10.0.tar.xz",
+            "name": "kwidgetsaddons-5.10.0.tar.xz",
+            "sha256": "0c9gzwsacm4zjjqc25akzf88fgrp9nraqid3c4na6asyn1pxzkmh"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5test",
+            "qt5uitools",
+            "qt5widgets"
+        ]
+    },
+    "kxmlrpcclient": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5kio"
+        ],
+        "name": "kxmlrpcclient-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kxmlrpcclient-5.10.0.tar.xz",
+            "name": "kxmlrpcclient-5.10.0.tar.xz",
+            "sha256": "1cjwqxpwwx9gxxb43dncyfcn3rjfx28af6dbh4zx7l0yqw4z4cxi"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5i18n",
+            "kf5kio",
+            "qt5test"
+        ]
+    },
+    "extra-cmake-modules": {
+        "nativeBuildInputs": [
+            "cmake",
+            "qcollectiongenerator_executable",
+            "sphinx_executable"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "extra-cmake-modules-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/extra-cmake-modules-5.10.0.tar.xz",
+            "name": "extra-cmake-modules-5.10.0.tar.xz",
+            "sha256": "00h62mmxl8jwslssczv14dmydgmg3rr12dd8b5471xbmx8kvqb86"
+        },
+        "buildInputs": [
+            "agg",
+            "blitz",
+            "bluez",
+            "eigen2",
+            "enchant",
+            "ffmpeg",
+            "flac",
+            "flex",
+            "gobject",
+            "gstreamer",
+            "lcms",
+            "libart",
+            "libxslt",
+            "openexr",
+            "pcre",
+            "qca2",
+            "qimageblitz",
+            "qt5core",
+            "qt5linguisttools",
+            "sqlite",
+            "strigi",
+            "usb",
+            "xine",
+            "xmms"
+        ]
+    },
+    "kidletime": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kidletime-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kidletime-5.10.0.tar.xz",
+            "name": "kidletime-5.10.0.tar.xz",
+            "sha256": "0rvw4b22x9jgkqx64wisc0qnl6kx2b97sz2hxcpqh2lkj1cql4r0"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5dbus",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "x11_xcb",
+            "xcb"
+        ]
+    },
+    "kitemmodels": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kitemmodels-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kitemmodels-5.10.0.tar.xz",
+            "name": "kitemmodels-5.10.0.tar.xz",
+            "sha256": "1c63wsy9iy842ljv2vmnjcn6p3ahnv6pm73p1kayjdqq6wy0lmq6"
+        },
+        "buildInputs": [
+            "ecm",
+            "grantlee",
+            "qt5",
+            "qt5core",
+            "qt5quickwidgets",
+            "qt5script",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "attica": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "attica-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/attica-5.10.0.tar.xz",
+            "name": "attica-5.10.0.tar.xz",
+            "sha256": "1immb10bvpkscdawyv1n0y52jjnfy0y3hnjxxzfwci9fj24da625"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5core",
+            "qt5network",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kwindowsystem": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kwindowsystem-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kwindowsystem-5.10.0.tar.xz",
+            "name": "kwindowsystem-5.10.0.tar.xz",
+            "sha256": "0grxbydcc9k88nnlav7vcn3lajzswcsim5cpjcsysx9irx8rbiqf"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5test",
+            "qt5widgets",
+            "qt5winextras",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "ki18n": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ki18n-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/ki18n-5.10.0.tar.xz",
+            "name": "ki18n-5.10.0.tar.xz",
+            "sha256": "0xa27c42bnvhks6mdz593hxwl3idagyz6mbmp8p5dj6xsfdabrcs"
+        },
+        "buildInputs": [
+            "ecm",
+            "libintl",
+            "qt5",
+            "qt5concurrent",
+            "qt5core",
+            "qt5script",
+            "qt5test"
+        ]
+    },
+    "knewstuff": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5attica",
+            "kf5service",
+            "kf5xmlgui",
+            "qt5widgets"
+        ],
+        "name": "knewstuff-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/knewstuff-5.10.0.tar.xz",
+            "name": "knewstuff-5.10.0.tar.xz",
+            "sha256": "1z24h7rk7vyavw3949gj06y924x1sbyy8jh3krr1ngpddlrsk5l7"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5archive",
+            "kf5attica",
+            "kf5completion",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kio",
+            "kf5service",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kdelibs4support": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kdewin",
+            "kf5archive",
+            "kf5auth",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5designerplugin",
+            "kf5doctools",
+            "kf5emoticons",
+            "kf5guiaddons",
+            "kf5iconthemes",
+            "kf5init",
+            "kf5itemmodels",
+            "kf5kdelibs4support",
+            "kf5notifications",
+            "kf5parts",
+            "kf5textwidgets",
+            "kf5unitconversion",
+            "kf5windowsystem",
+            "qt5dbus",
+            "qt5printsupport",
+            "qt5xml"
+        ],
+        "name": "kdelibs4support-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/portingAids/kdelibs4support-5.10.0.tar.xz",
+            "name": "kdelibs4support-5.10.0.tar.xz",
+            "sha256": "0j7ah078ckz8zcdb417j7dmzpcbs9vvbr42r6c49fk7rp7vy4ly2"
+        },
+        "buildInputs": [
+            "agg",
+            "blitz",
+            "bluez",
+            "docbookxml4",
+            "ecm",
+            "eigen2",
+            "enchant",
+            "ffmpeg",
+            "flac",
+            "gobject",
+            "gstreamer",
+            "kdewin",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5designerplugin",
+            "kf5doctools",
+            "kf5globalaccel",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5notifications",
+            "kf5parts",
+            "kf5service",
+            "kf5textwidgets",
+            "kf5unitconversion",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "lcms",
+            "libart",
+            "networkmanager",
+            "openexr",
+            "openssl",
+            "pcre",
+            "qca2",
+            "qimageblitz",
+            "qntrack",
+            "qt5",
+            "qt5concurrent",
+            "qt5dbus",
+            "qt5designer",
+            "qt5network",
+            "qt5printsupport",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "sqlite",
+            "usb",
+            "x11",
+            "xine",
+            "xmms"
+        ]
+    },
+    "sonnet": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "sonnet-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/sonnet-5.10.0.tar.xz",
+            "name": "sonnet-5.10.0.tar.xz",
+            "sha256": "1ad205mldwk234vwjkbalx6pnib02mz68drajg07ii5ycsczgk93"
+        },
+        "buildInputs": [
+            "aspell",
+            "ecm",
+            "enchant",
+            "hspell",
+            "hunspell",
+            "qt5",
+            "qt5test",
+            "qt5widgets",
+            "zlib"
+        ]
+    },
+    "networkmanager-qt": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "networkmanager-qt-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/networkmanager-qt-5.10.0.tar.xz",
+            "name": "networkmanager-qt-5.10.0.tar.xz",
+            "sha256": "0a9yg40rmvl7mxscyx6ndq4fwqxfy6rfy6a6cb8b6wm2im29njc4"
+        },
+        "buildInputs": [
+            "ecm",
+            "networkmanager",
+            "qt4",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5network",
+            "qt5test"
+        ]
+    },
+    "solid": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "solid-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/solid-5.10.0.tar.xz",
+            "name": "solid-5.10.0.tar.xz",
+            "sha256": "1qy3bic39jffc2pl1wh36qm8sizjld6gd2qx6y4j9xzkv723r864"
+        },
+        "buildInputs": [
+            "bison",
+            "ecm",
+            "flex",
+            "iokit",
+            "mediaplayerinfo",
+            "qt5",
+            "qt5concurrent",
+            "qt5dbus",
+            "qt5network",
+            "qt5qml",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml",
+            "udev"
+        ]
+    },
+    "modemmanager-qt": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "modemmanager-qt-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/modemmanager-qt-5.10.0.tar.xz",
+            "name": "modemmanager-qt-5.10.0.tar.xz",
+            "sha256": "1whhc8clibiwzda4zbk8asry65c7nlnlgq10sbmh7gq008l0z9l1"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5modemmanagerqt",
+            "modemmanager",
+            "qt4",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "kactivities": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kactivities-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kactivities-5.10.0.tar.xz",
+            "name": "kactivities-5.10.0.tar.xz",
+            "sha256": "0d2cyjv9hb4zd99sp598miwq4k1nzv4ssbgak7jmifqcimjpjjsk"
+        },
+        "buildInputs": [
+            "boost",
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5declarative",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5kcmutils",
+            "kf5kio",
+            "kf5service",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5sql",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kpeople": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kpeople-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kpeople-5.10.0.tar.xz",
+            "name": "kpeople-5.10.0.tar.xz",
+            "sha256": "0b56c3pha1rgz9h8ia0vd4k5nvmxh64wgk5vgfnxa0znij47wcka"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5itemviews",
+            "kf5service",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5dbus",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5sql",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kcrash": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kcrash-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kcrash-5.10.0.tar.xz",
+            "name": "kcrash-5.10.0.tar.xz",
+            "sha256": "1imgn8a8ns15f2alp5xljy6llmqy0dv7yiqqjb1n8klvyp5mynlx"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5core",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "kglobalaccel": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5dbus",
+            "qt5widgets"
+        ],
+        "name": "kglobalaccel-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kglobalaccel-5.10.0.tar.xz",
+            "name": "kglobalaccel-5.10.0.tar.xz",
+            "sha256": "02nr4f991zi03spq4m9rlj11m5kvhmqghkfl2ijqnwv8m4dq2afy"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5i18n",
+            "kf5windowsystem",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "kitemviews": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kitemviews-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kitemviews-5.10.0.tar.xz",
+            "name": "kitemviews-5.10.0.tar.xz",
+            "sha256": "0dihi79j7iqy2x3qivjalsj9qa2b17g7jl7j705fjjfnw64xj8bi"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kplotting": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kplotting-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kplotting-5.10.0.tar.xz",
+            "name": "kplotting-5.10.0.tar.xz",
+            "sha256": "0g7riml9nbs762s1pld9d3y743z52kxdaiaklg3ai5cljp5v5skh"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kauth": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5coreaddons"
+        ],
+        "name": "kauth-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kauth-5.10.0.tar.xz",
+            "name": "kauth-5.10.0.tar.xz",
+            "sha256": "074xr0qzknh9d0f6lisbyf612p4drlqscs7lqkasmd8f0r14ixlq"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "plasma-framework": {
+        "nativeBuildInputs": [
+            "cmake",
+            "sh"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5package",
+            "kf5service"
+        ],
+        "name": "plasma-framework-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/plasma-framework-5.10.0.tar.xz",
+            "name": "plasma-framework-5.10.0.tar.xz",
+            "sha256": "0a2lkxbpry8p8sar7ai2fcnjciiik4ir9y9snkmxci26vgql8j8a"
+        },
+        "buildInputs": [
+            "ecm",
+            "egl",
+            "gpgme",
+            "kactivities",
+            "kcoreaddons",
+            "kde4support",
+            "kdeclarative",
+            "kdepimlibs",
+            "kdesu",
+            "kf5",
+            "kf5activities",
+            "kf5archive",
+            "kf5auth",
+            "kf5bookmarks",
+            "kf5codecs",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5declarative",
+            "kf5doctools",
+            "kf5globalaccel",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5idletime",
+            "kf5init",
+            "kf5itemmodels",
+            "kf5itemviews",
+            "kf5jobwidgets",
+            "kf5js",
+            "kf5karchive",
+            "kf5kauth",
+            "kf5kbookmarks",
+            "kf5kcodecs",
+            "kf5kcompletion",
+            "kf5kconfig",
+            "kf5kconfigwidgets",
+            "kf5kcoreaddons",
+            "kf5kcrash",
+            "kf5kdbusaddons",
+            "kf5kde4support",
+            "kf5kdeclarative",
+            "kf5kdesu",
+            "kf5kdoctools",
+            "kf5kf5globalaccel",
+            "kf5kguiaddons",
+            "kf5ki18n",
+            "kf5kiconthemes",
+            "kf5kidletime",
+            "kf5kinit",
+            "kf5kio",
+            "kf5kjobwidgets",
+            "kf5kjs",
+            "kf5knotifications",
+            "kf5kparts",
+            "kf5kross",
+            "kf5kservice",
+            "kf5ktextwidgets",
+            "kf5kunitconversion",
+            "kf5kwallet",
+            "kf5kwidgetsaddons",
+            "kf5kwindowsystem",
+            "kf5notifications",
+            "kf5package",
+            "kf5parts",
+            "kf5service",
+            "kf5solid",
+            "kf5sonnet",
+            "kf5su",
+            "kf5textwidgets",
+            "kf5threadweaver",
+            "kf5unitconversion",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "opengl",
+            "qca2",
+            "qt5",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5script",
+            "qt5sql",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "solid",
+            "x11",
+            "xcb"
+        ]
+    },
+    "kguiaddons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5gui"
+        ],
+        "name": "kguiaddons-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kguiaddons-5.10.0.tar.xz",
+            "name": "kguiaddons-5.10.0.tar.xz",
+            "sha256": "033z4difclwbmy4bi0c819i08x8pb5znr0kd27c3l9xaf2z3kaxr"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5gui",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "kservice": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5config",
+            "kf5coreaddons"
+        ],
+        "name": "kservice-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kservice-5.10.0.tar.xz",
+            "name": "kservice-5.10.0.tar.xz",
+            "sha256": "15dmfd8ddjaac5mdb041ddhpkr3bh6gcgy0wfg404xiy1sx12dr6"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "qt5",
+            "qt5concurrent",
+            "qt5dbus",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "khtml": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5archive",
+            "kf5bookmarks",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5js",
+            "kf5kio",
+            "kf5notifications",
+            "kf5parts",
+            "kf5sonnet",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5core"
+        ],
+        "name": "khtml-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/portingAids/khtml-5.10.0.tar.xz",
+            "name": "khtml-5.10.0.tar.xz",
+            "sha256": "0wzzcysgvjkibs8j277z75b0s5dvjwby7c6lnyyzmnm5vmsw2dj2"
+        },
+        "buildInputs": [
+            "ecm",
+            "gif",
+            "jpeg",
+            "kdewin",
+            "kf5archive",
+            "kf5codecs",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5js",
+            "kf5kio",
+            "kf5notifications",
+            "kf5parts",
+            "kf5sonnet",
+            "kf5textwidgets",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "openssl",
+            "perl",
+            "phonon4qt5",
+            "png",
+            "qt5",
+            "qt5test",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "kded": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kded-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kded-5.10.0.tar.xz",
+            "name": "kded-5.10.0.tar.xz",
+            "sha256": "0n2nd96j09igbxwq4697gyl45sfij22hs5mkys1gnaw5j8byaj4a"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5doctools",
+            "kf5init",
+            "kf5service",
+            "qt5"
+        ]
+    },
+    "kpty": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5coreaddons"
+        ],
+        "name": "kpty-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kpty-5.10.0.tar.xz",
+            "name": "kpty-5.10.0.tar.xz",
+            "sha256": "1ys8wv1hirv6jk6jdzjnvkhw2lx3rxj8xp4sgvxfbfs833vdnqx6"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5i18n",
+            "qt5",
+            "utempter"
+        ]
+    },
+    "kross": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5parts",
+            "kf5widgetsaddons",
+            "qt5script",
+            "qt5widgets",
+            "qt5xml"
+        ],
+        "name": "kross-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/portingAids/kross-5.10.0.tar.xz",
+            "name": "kross-5.10.0.tar.xz",
+            "sha256": "02mz7w920vka5wwgbnf0m774s56r4qkwplakdyal92ip3zc3m6jq"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5completion",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5parts",
+            "kf5service",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5script",
+            "qt5test",
+            "qt5uitools",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kxmlgui": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5config",
+            "kf5configwidgets",
+            "qt5dbus",
+            "qt5widgets",
+            "qt5xml"
+        ],
+        "name": "kxmlgui-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kxmlgui-5.10.0.tar.xz",
+            "name": "kxmlgui-5.10.0.tar.xz",
+            "sha256": "1m22ld9pd2z287j8nj9alk1pychq04r0w1g1vqhgr0shlxzx91pf"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5attica",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5dbus",
+            "qt5network",
+            "qt5printsupport",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kconfig": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5xml"
+        ],
+        "name": "kconfig-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kconfig-5.10.0.tar.xz",
+            "name": "kconfig-5.10.0.tar.xz",
+            "sha256": "1r7r4yihlnld09l9qmq2q8h9xk7clmgbry8vnggzih1bamid79dq"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5concurrent",
+            "qt5core",
+            "qt5gui",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "kinit": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kinit-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kinit-5.10.0.tar.xz",
+            "name": "kinit-5.10.0.tar.xz",
+            "sha256": "02da17n19xx9cqiyzh7qlbqyy0mpy4gr3pdja1xlqaapc52k99sz"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5crash",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5kio",
+            "kf5service",
+            "kf5windowsystem",
+            "libcap",
+            "qt5",
+            "x11"
+        ]
+    },
+    "kpackage": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5coreaddons"
+        ],
+        "name": "kpackage-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kpackage-5.10.0.tar.xz",
+            "name": "kpackage-5.10.0.tar.xz",
+            "sha256": "0c5xnks7k85lj6pkbylnlcmlhxns95zs6km9hfvdi7zh0i26y8qb"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5archive",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "qt5",
+            "qt5core",
+            "qt5test"
+        ]
+    },
+    "karchive": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "karchive-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/karchive-5.10.0.tar.xz",
+            "name": "karchive-5.10.0.tar.xz",
+            "sha256": "19lzv1fi7vw95l9mx0qx10nfn5q7wzkqahsg2jswp31vgf977wfw"
+        },
+        "buildInputs": [
+            "bzip2",
+            "ecm",
+            "kf5archive",
+            "liblzma",
+            "qt5core",
+            "qt5test",
+            "zlib"
+        ]
+    },
+    "kdesu": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5pty"
+        ],
+        "name": "kdesu-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kdesu-5.10.0.tar.xz",
+            "name": "kdesu-5.10.0.tar.xz",
+            "sha256": "002ryv2svl1hmapflg0cvl7xd7qa4sh2msxnma9ijsad1ypv9nrw"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5pty",
+            "kf5service",
+            "qt5core",
+            "x11"
+        ]
+    },
+    "kimageformats": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kimageformats-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kimageformats-5.10.0.tar.xz",
+            "name": "kimageformats-5.10.0.tar.xz",
+            "sha256": "140s1lydikb87rpaxqmv6ccp139ch9vsi62r6fmyvwx6l0ffh2ay"
+        },
+        "buildInputs": [
+            "ecm",
+            "jasper",
+            "openexr",
+            "qt5gui",
+            "qt5printsupport",
+            "qt5test"
+        ]
+    },
+    "kmediaplayer": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5parts"
+        ],
+        "name": "kmediaplayer-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/portingAids/kmediaplayer-5.10.0.tar.xz",
+            "name": "kmediaplayer-5.10.0.tar.xz",
+            "sha256": "0q17lgajv3844d2nccnfyzg6g55wx79fxij2iw42m25wyxg7b4df"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5parts",
+            "kf5xmlgui",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "ktexteditor": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktexteditor-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/ktexteditor-5.10.0.tar.xz",
+            "name": "ktexteditor-5.10.0.tar.xz",
+            "sha256": "1axs21vklg392hxcm8j6y01qk3wphsfldh0caqnv6ifhamvcvkhh"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5archive",
+            "kf5config",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5parts",
+            "kf5sonnet",
+            "libgit2",
+            "perl",
+            "qt5",
+            "qt5core",
+            "qt5printsupport",
+            "qt5script",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml",
+            "qt5xmlpatterns"
+        ]
+    },
+    "kdesignerplugin": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdesignerplugin-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kdesignerplugin-5.10.0.tar.xz",
+            "name": "kdesignerplugin-5.10.0.tar.xz",
+            "sha256": "1z82kxn5hpbmhsrh4ic7mcmsz115p39gph7ysjz9fh6ylfdgcrpm"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kio",
+            "kf5plotting",
+            "kf5sonnet",
+            "kf5textwidgets",
+            "kf5webkit",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5core",
+            "qt5designer",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kparts": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5kio",
+            "kf5textwidgets",
+            "kf5xmlgui"
+        ],
+        "name": "kparts-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kparts-5.10.0.tar.xz",
+            "name": "kparts-5.10.0.tar.xz",
+            "sha256": "0k1zkr2qvl65cgk0j3ybvmxs8wwjl0641yrgl36ngbk23lyi35rv"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5jobwidgets",
+            "kf5kio",
+            "kf5notifications",
+            "kf5service",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kcmutils": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5configwidgets",
+            "kf5service"
+        ],
+        "name": "kcmutils-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kcmutils-5.10.0.tar.xz",
+            "name": "kcmutils-5.10.0.tar.xz",
+            "sha256": "1995jbnnkwmkyiq8jav4r3x3mi3w5kv0am10c0d6g1pxjsig1xrx"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5declarative",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5package",
+            "kf5service",
+            "kf5xmlgui",
+            "qt5",
+            "qt5dbus",
+            "qt5qml",
+            "qt5quick",
+            "qt5widgets"
+        ]
+    },
+    "frameworkintegration": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5configwidgets",
+            "kf5iconthemes"
+        ],
+        "name": "frameworkintegration-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/frameworkintegration-5.10.0.tar.xz",
+            "name": "frameworkintegration-5.10.0.tar.xz",
+            "sha256": "00plajvkp19njdyq37qmf0q5xvwvl3vgx0vmls4hf2mk179yqm63"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5notifications",
+            "kf5widgetsaddons",
+            "oxygenfont",
+            "qt5",
+            "qt5dbus",
+            "qt5qml",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "kiconthemes": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kiconthemes-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kiconthemes-5.10.0.tar.xz",
+            "name": "kiconthemes-5.10.0.tar.xz",
+            "sha256": "19vvg63ld4388jd47245zqzbj5bs8qj69524bvwqbv77201qg7j1"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5itemviews",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5dbus",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kjs": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kjs-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/portingAids/kjs-5.10.0.tar.xz",
+            "name": "kjs-5.10.0.tar.xz",
+            "sha256": "0l3pn9g7mv5wklihgd7v3c83563ly9swwayivqlyz4rj35m7lvq1"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5doctools",
+            "pcre",
+            "perl",
+            "qt5core",
+            "qt5test"
+        ]
+    },
+    "knotifyconfig": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "knotifyconfig-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/knotifyconfig-5.10.0.tar.xz",
+            "name": "knotifyconfig-5.10.0.tar.xz",
+            "sha256": "1zhddbynsk4b27sldmbd8q8mk8kbjyfv5k27vrqahlbq7ysrhflm"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5kio",
+            "kf5notifications",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "phonon4qt5",
+            "qt5",
+            "qt5dbus",
+            "qt5optional_components",
+            "qt5test",
+            "qt5texttospeech",
+            "qt5widgets"
+        ]
+    },
+    "kio": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5bookmarks",
+            "kf5completion",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5itemviews",
+            "kf5jobwidgets",
+            "kf5service",
+            "kf5solid",
+            "kf5xmlgui",
+            "qt5network"
+        ],
+        "name": "kio-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kio-5.10.0.tar.xz",
+            "name": "kio-5.10.0.tar.xz",
+            "sha256": "1lbbxn5s6p8fsgyr4nwwyawgcw4ywldwy7mbvn8pk5xrzai3c04r"
+        },
+        "buildInputs": [
+            "acl",
+            "ecm",
+            "gssapi",
+            "kf5archive",
+            "kf5bookmarks",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5jobwidgets",
+            "kf5notifications",
+            "kf5service",
+            "kf5solid",
+            "kf5textwidgets",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "libxml2",
+            "libxslt",
+            "openssl",
+            "qt5",
+            "qt5concurrent",
+            "qt5core",
+            "qt5dbus",
+            "qt5network",
+            "qt5script",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "qt5xml",
+            "strigi",
+            "x11",
+            "zlib"
+        ]
+    },
+    "kunitconversion": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kunitconversion-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kunitconversion-5.10.0.tar.xz",
+            "name": "kunitconversion-5.10.0.tar.xz",
+            "sha256": "0dxawvihm2bnc9l9vx90bq50sbcgrnkfvlsixkwhirw2cvvz0v5p"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5i18n",
+            "qt5",
+            "qt5core",
+            "qt5network",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "kdnssd": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5network"
+        ],
+        "name": "kdnssd-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kdnssd-5.10.0.tar.xz",
+            "name": "kdnssd-5.10.0.tar.xz",
+            "sha256": "0frar6j0n6m43l7hdc14n0vbvs63fjg2gv5q59zwsx856rrqfszi"
+        },
+        "buildInputs": [
+            "avahi",
+            "dnssd",
+            "ecm",
+            "qt5",
+            "qt5dbus",
+            "qt5network"
+        ]
+    },
+    "knotifications": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "knotifications-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/knotifications-5.10.0.tar.xz",
+            "name": "knotifications-5.10.0.tar.xz",
+            "sha256": "16qh492wwcyxanwmaqp1979wh3mrzmjkhvgnig5fxfvqzh9hxp0p"
+        },
+        "buildInputs": [
+            "dbusmenu-qt5",
+            "ecm",
+            "kf5codecs",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5iconthemes",
+            "kf5service",
+            "kf5windowsystem",
+            "phonon4qt5",
+            "qt5",
+            "qt5dbus",
+            "qt5optional_components",
+            "qt5test",
+            "qt5texttospeech",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "kdbusaddons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5dbus"
+        ],
+        "name": "kdbusaddons-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kdbusaddons-5.10.0.tar.xz",
+            "name": "kdbusaddons-5.10.0.tar.xz",
+            "sha256": "0lk7h424lc015asqpnldck18zcjki4672fkswy3qdvmkkpzdgx3m"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5dbus",
+            "qt5test",
+            "qt5x11extras"
+        ]
+    },
+    "kemoticons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5service",
+            "qt5gui"
+        ],
+        "name": "kemoticons-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kemoticons-5.10.0.tar.xz",
+            "name": "kemoticons-5.10.0.tar.xz",
+            "sha256": "0i3hj04k0dh2rx77sig9qdpjh2rik0n2snpr61ckiw9ixh8fggkr"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5archive",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5service",
+            "qt5",
+            "qt5gui",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kdoctools": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kdoctools-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kdoctools-5.10.0.tar.xz",
+            "name": "kdoctools-5.10.0.tar.xz",
+            "sha256": "0v00pjm0jsqkxq52ndpds7qn5vbsxkgzvvy379id1ag692s55jkp"
+        },
+        "buildInputs": [
+            "docbookxml4",
+            "docbookxsl",
+            "ecm",
+            "kf5archive",
+            "kf5doctools",
+            "kf5i18n",
+            "libxml2",
+            "libxslt",
+            "qt5core"
+        ]
+    },
+    "kapidox": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kapidox-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kapidox-5.10.0.tar.xz",
+            "name": "kapidox-5.10.0.tar.xz",
+            "sha256": "1zjjj951vfnwc8833lh6schdcva0dhiws56kmhclg7m9mpnvbav4"
+        },
+        "buildInputs": [
+            "pythoninterp"
+        ]
+    },
+    "kcoreaddons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kcoreaddons-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kcoreaddons-5.10.0.tar.xz",
+            "name": "kcoreaddons-5.10.0.tar.xz",
+            "sha256": "0y1j50axd6i0givknp9xfk81jdcdzz5p7m761qvbbjflqrnznvc1"
+        },
+        "buildInputs": [
+            "ecm",
+            "fam",
+            "qt5",
+            "qt5core",
+            "qt5test",
+            "qt5widgets",
+            "sharedmimeinfo"
+        ]
+    },
+    "krunner": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5plasma",
+            "qt5core"
+        ],
+        "name": "krunner-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/portingAids/krunner-5.10.0.tar.xz",
+            "name": "krunner-5.10.0.tar.xz",
+            "sha256": "15adxzsh27s6h37mfa8pwwdf47gp8whfsshj5chl7h3zdj5aa04i"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5kio",
+            "kf5plasma",
+            "kf5service",
+            "kf5solid",
+            "kf5threadweaver",
+            "qt5",
+            "qt5gui",
+            "qt5quick",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kjobwidgets": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5coreaddons",
+            "qt5widgets"
+        ],
+        "name": "kjobwidgets-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kjobwidgets-5.10.0.tar.xz",
+            "name": "kjobwidgets-5.10.0.tar.xz",
+            "sha256": "0b2n0wn2l4k8xsjgycv7123xvlbq06g0pmbn5q6akywr0lrnyd16"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "kcodecs": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kcodecs-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kcodecs-5.10.0.tar.xz",
+            "name": "kcodecs-5.10.0.tar.xz",
+            "sha256": "1izw6rpvpxhwnl6aqrfqh2m3v3ia5gynpsxd8syi1cxnzmajgwic"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5core",
+            "qt5test"
+        ]
+    },
+    "kconfigwidgets": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5auth",
+            "kf5codecs",
+            "kf5config",
+            "kf5widgetsaddons"
+        ],
+        "name": "kconfigwidgets-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kconfigwidgets-5.10.0.tar.xz",
+            "name": "kconfigwidgets-5.10.0.tar.xz",
+            "sha256": "19p073fzpvm6hn85qk959s6dlnizywwcipw4rfm92b3y3jqg77i0"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5auth",
+            "kf5codecs",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5test"
+        ]
+    },
+    "kdeclarative": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5config",
+            "kf5package",
+            "qt5qml"
+        ],
+        "name": "kdeclarative-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/kdeclarative-5.10.0.tar.xz",
+            "name": "kdeclarative-5.10.0.tar.xz",
+            "sha256": "1kfsqg43inn2is991nzcgcicd7aa7yg6bzsxac3c3136p32ii9yg"
+        },
+        "buildInputs": [
+            "activeapp",
+            "ecm",
+            "epoxy",
+            "kf5config",
+            "kf5globalaccel",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5package",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5test"
+        ]
+    },
+    "ktextwidgets": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5i18n",
+            "kf5sonnet",
+            "qt5widgets"
+        ],
+        "name": "ktextwidgets-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/ktextwidgets-5.10.0.tar.xz",
+            "name": "ktextwidgets-5.10.0.tar.xz",
+            "sha256": "0mpsikpy1i3j1dx352a5c77xx5m6iv4lfnff58yi5z0m31002mv6"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5service",
+            "kf5sonnet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kjsembed": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5i18n",
+            "kf5js"
+        ],
+        "name": "kjsembed-5.10.0",
+        "src": {
+            "url": "stable/frameworks/5.10/portingAids/kjsembed-5.10.0.tar.xz",
+            "name": "kjsembed-5.10.0.tar.xz",
+            "sha256": "1922bvs3p2ffax5h8kmg4llw65h00m22qfs8n3qhcc952zgv1wxl"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5js",
+            "qt5"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/packages.sh b/pkgs/development/libraries/kde-frameworks-5.10/packages.sh
new file mode 100755
index 00000000000..6889773a55e
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.10/packages.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -x
+
+origin="$(pwd)"
+
+# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
+KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
+
+alias nix-build="nix-build --no-out-link \"$origin/../../../..\""
+
+# The extra slash at the end of the URL is necessary to stop wget
+# from recursing over the whole server! (No, it's not a bug.)
+$(nix-build -A autonix.manifest) \
+    "${KDE_MIRROR}/stable/frameworks/5.10/" \
+    "$@" -A '*.tar.xz'
+
+AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}
+
+$AUTONIX_DEPS_KF5 manifest.json
+
+rm manifest.json
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/renames.json b/pkgs/development/libraries/kde-frameworks-5.10/renames.json
new file mode 100644
index 00000000000..4da5f8272ee
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.10/renames.json
@@ -0,0 +1,70 @@
+{
+    "kf5widgetsaddons": "kwidgetsaddons",
+    "kf5texteditor": "ktexteditor",
+    "kf5designerplugin": "kdesignerplugin",
+    "kf5bookmarks": "kbookmarks",
+    "kf5frameworkintegration": "frameworkintegration",
+    "kf5package": "kpackage",
+    "kf5archive": "karchive",
+    "kf5plasma": "plasma-framework",
+    "kf5kcmutils": "kcmutils",
+    "kf5configwidgets": "kconfigwidgets",
+    "ctest": "attica",
+    "kf5kio": "kio",
+    "kf5networkmanagerqt": "networkmanager-qt",
+    "kf5coreaddons": "kcoreaddons",
+    "kf5guiaddons": "kguiaddons",
+    "kf5jobwidgets": "kjobwidgets",
+    "kf5modemmanagerqt": "modemmanager-qt",
+    "kf5runner": "krunner",
+    "kf5globalaccel": "kglobalaccel",
+    "kf5dbusaddons": "kdbusaddons",
+    "kf5crash": "kcrash",
+    "kf5itemviews": "kitemviews",
+    "kf5doctools": "kdoctools",
+    "kf5i18n": "ki18n",
+    "kf5webkit": "kdewebkit",
+    "kf5newstuff": "knewstuff",
+    "kded": "kded",
+    "kf5notifications": "knotifications",
+    "kf5activitiesexperimentalstats": "kactivities",
+    "kf5dnssd": "kdnssd",
+    "kf5notifyconfig": "knotifyconfig",
+    "kf5iconthemes": "kiconthemes",
+    "kf5js": "kjs",
+    "kf5kde4support": "kdelibs4support",
+    "kf5parts": "kparts",
+    "backend": "plasma-framework",
+    "kf5completion": "kcompletion",
+    "kf5threadweaver": "threadweaver",
+    "kf5mediaplayer": "kmediaplayer",
+    "kf5plasmaquick": "plasma-framework",
+    "kf5wallet": "kwallet",
+    "kf5xmlgui": "kxmlgui",
+    "kf5attica": "attica",
+    "kf5declarative": "kdeclarative",
+    "kf5config": "kconfig",
+    "kf5init": "kinit",
+    "kf5textwidgets": "ktextwidgets",
+    "kf5jsembed": "kjsembed",
+    "kf5codecs": "kcodecs",
+    "kf5service": "kservice",
+    "kf5sonnet": "sonnet",
+    "kf5kdelibs4support": "kdelibs4support",
+    "kf5pty": "kpty",
+    "kf5solid": "solid",
+    "kf5auth": "kauth",
+    "ecm": "extra-cmake-modules",
+    "kf5activities": "kactivities",
+    "kf5plotting": "kplotting",
+    "kf5people": "kpeople",
+    "kf5emoticons": "kemoticons",
+    "kf5kross": "kross",
+    "kf5su": "kdesu",
+    "kf5khtml": "khtml",
+    "kf5unitconversion": "kunitconversion",
+    "kf5idletime": "kidletime",
+    "kf5windowsystem": "kwindowsystem",
+    "kf5xmlrpcclient": "kxmlrpcclient",
+    "kf5itemmodels": "kitemmodels"
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/renames.nix b/pkgs/development/libraries/kde-frameworks-5.10/renames.nix
deleted file mode 100644
index 7dcf3bf81d7..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.10/renames.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-"Backend" = "plasma-framework";
-"CTest" = "attica";
-"ECM" = "extra-cmake-modules";
-"KDED" = "kded";
-"KF5Activities" = "kactivities";
-"KF5ActivitiesExperimentalStats" = "kactivities";
-"KF5Archive" = "karchive";
-"KF5Attica" = "attica";
-"KF5Auth" = "kauth";
-"KF5Bookmarks" = "kbookmarks";
-"KF5Codecs" = "kcodecs";
-"KF5Completion" = "kcompletion";
-"KF5Config" = "kconfig";
-"KF5ConfigWidgets" = "kconfigwidgets";
-"KF5CoreAddons" = "kcoreaddons";
-"KF5Crash" = "kcrash";
-"KF5DBusAddons" = "kdbusaddons";
-"KF5DNSSD" = "kdnssd";
-"KF5Declarative" = "kdeclarative";
-"KF5DesignerPlugin" = "kdesignerplugin";
-"KF5DocTools" = "kdoctools";
-"KF5Emoticons" = "kemoticons";
-"KF5FrameworkIntegration" = "frameworkintegration";
-"KF5GlobalAccel" = "kglobalaccel";
-"KF5GuiAddons" = "kguiaddons";
-"KF5I18n" = "ki18n";
-"KF5IconThemes" = "kiconthemes";
-"KF5IdleTime" = "kidletime";
-"KF5Init" = "kinit";
-"KF5ItemModels" = "kitemmodels";
-"KF5ItemViews" = "kitemviews";
-"KF5JS" = "kjs";
-"KF5JobWidgets" = "kjobwidgets";
-"KF5JsEmbed" = "kjsembed";
-"KF5KCMUtils" = "kcmutils";
-"KF5KDE4Support" = "kdelibs4support";
-"KF5KDELibs4Support" = "kdelibs4support";
-"KF5KHtml" = "khtml";
-"KF5KIO" = "kio";
-"KF5Kross" = "kross";
-"KF5MediaPlayer" = "kmediaplayer";
-"KF5ModemManagerQt" = "modemmanager-qt";
-"KF5NetworkManagerQt" = "networkmanager-qt";
-"KF5NewStuff" = "knewstuff";
-"KF5Notifications" = "knotifications";
-"KF5NotifyConfig" = "knotifyconfig";
-"KF5Package" = "kpackage";
-"KF5Parts" = "kparts";
-"KF5People" = "kpeople";
-"KF5Plasma" = "plasma-framework";
-"KF5PlasmaQuick" = "plasma-framework";
-"KF5Plotting" = "kplotting";
-"KF5Pty" = "kpty";
-"KF5Runner" = "krunner";
-"KF5Service" = "kservice";
-"KF5Solid" = "solid";
-"KF5Sonnet" = "sonnet";
-"KF5Su" = "kdesu";
-"KF5TextEditor" = "ktexteditor";
-"KF5TextWidgets" = "ktextwidgets";
-"KF5ThreadWeaver" = "threadweaver";
-"KF5UnitConversion" = "kunitconversion";
-"KF5Wallet" = "kwallet";
-"KF5WebKit" = "kdewebkit";
-"KF5WidgetsAddons" = "kwidgetsaddons";
-"KF5WindowSystem" = "kwindowsystem";
-"KF5XmlGui" = "kxmlgui";
-"KF5XmlRpcClient" = "kxmlrpcclient";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7d5caa4471..1b21df48dae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13940,10 +13940,7 @@ let
 
   numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
 
-  plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 {
-    kf5 = kf510;
-    kdeApps = kdeApps_15_04;
-  });
+  plasma53 = recurseIntoAttrs (import ../desktops/plasma-5.3 { inherit pkgs newScope; });
   plasma5_latest = plasma53;
   plasma5_stable = plasma53;
 

From 8862d8d9c98cf4d8ee66f8bf94f51294af74090d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 18 Jun 2015 14:25:51 -0500
Subject: [PATCH 1592/2322] autonix: JSON manifest format

---
 pkgs/applications/kde-apps-15.04/default.nix  | 468 +++++++++++-------
 .../applications/kde-apps-15.04/setup-hook.sh |  11 +
 pkgs/build-support/autonix/default.nix        | 319 ++++--------
 pkgs/desktops/plasma-5.3/default.nix          |  76 ++-
 .../libraries/kde-frameworks-5.10/default.nix | 114 +++--
 pkgs/top-level/all-packages.nix               |   8 +-
 6 files changed, 494 insertions(+), 502 deletions(-)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index e325c5ccfc2..7910046d774 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -12,23 +12,23 @@
 #  make a copy of this directory first. After copying, be sure to delete ./tmp
 #  if it exists. Then follow the minor update instructions.
 
-{ autonix, symlinkJoin, kde4, kf5, pkgs, qt4, qt5, stdenv, newScope, debug ? false }:
+{ pkgs, newScope, kf5 ? null, plasma5 ? null, qt5 ? null, debug ? false }:
 
-with autonix;
+let inherit (pkgs) autonix kde4 stdenv symlinkJoin; in
 
-let inherit (stdenv) lib; in
+with autonix; let inherit (stdenv) lib; in
 
-let kf5Orig = kf5; in
+let
+  kf5_ = if kf5 != null then kf5 else pkgs.kf510;
+  plasma5_ = if plasma5 != null then plasma5 else pkgs.plasma53;
+  qt5_ = if qt5 != null then qt5 else pkgs.qt54;
+in
 
 let
 
-  kf5 = kf5Orig.override { inherit debug qt5; };
-
-  kdePackage = pkg:
-    (kf5.kdePackage pkg).override {
-      inherit (stdenv) mkDerivation;
-      inherit scope;
-    };
+  kf5 = kf5_.override { inherit debug qt5; };
+  plasma5 = plasma5_.override { inherit debug kf5 qt5; };
+  qt5 = qt5_;
 
   kdeOrL10nPackage = name: pkg:
     assert (builtins.isAttrs pkg);
@@ -124,53 +124,58 @@ let
       (lib.mapAttrs mirrorUrl)
     ];
 
-  overrideDerivation = pkg: f:
-    let mkDerivation = super: drv: super.mkDerivation (drv // f drv);
-    in pkg.override (super: super // { mkDerivation = mkDerivation super; });
+  kde4Package = pkg: overrideScope pkg (with kde4; {
+    inherit akonadi baloo kactivities libkdegames libkmahjongg;
+    kde4 = self.kdelibs;
+  });
 
   scope =
+    # KDE Frameworks 5
+    kf5 //
     # packages in this collection
     self //
     {
+      kf5baloo = plasma5.baloo;
+      kf5kdcraw = self.libkdcraw;
       kf5kdegames = self.libkdegames;
+      kf5kipi = self.libkipi;
       libkonq = self.kde-baseapps;
     } //
-    # packages from KDE Frameworks 5
-    kf5.scope //
     # packages requiring same Qt 5
     (with pkgs; {
       accountsqt5 = accounts-qt.override { inherit qt5; };
       dbusmenuqt = libdbusmenu_qt;
       grantlee5 = grantlee5.override { inherit qt5; };
       mlt = pkgs.mlt-qt5.override { inherit qt5; };
+      phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
       qca-qt5 = qca-qt5.override { inherit qt5; };
+      qt5script = qt5.script;
+      qt5x11extras = qt5.x11extras;
       signonqt5 = signon.override { inherit qt5; };
       telepathyqt5 = telepathy_qt5.override { inherit qt5; };
     }) //
-    # packages from KDE 4
-    (with kde4; {
-      inherit akonadi baloo kactivities libkdegames libkmahjongg;
-      kde4 = self.kdelibs;
-    }) //
     # packages from nixpkgs
     (with pkgs; {
-      inherit acl attr automoc4 avahi bison cdparanoia cfitsio cups
+      inherit acl attr automoc4 avahi bison cdparanoia cfitsio cmake cups
               djvulibre docbook_xml_dtd_42 docbook_xsl enchant eigen2
               exiv2 fam ffmpeg flac flex freetype gmp gettext gpgme
               grantlee gsl hunspell ilmbase intltool jasper lcms2
-              libgcrypt libraw libssh libspectre libvncserver libical
-              networkmanager openal opencv openexr phonon pkgconfig
-              polkit_qt4 prison python qca2 qimageblitz qjson qt4
-              samba saneBackends soprano
-              speechd strigi taglib udev xplanet xscreensaver xz;
+              libaccounts-glib libgcrypt libotr libraw libssh libspectre
+              libvncserver libical networkmanager openal opencv
+              openexr perl phonon pkgconfig polkit_qt4 prison python qca2
+              qimageblitz qjson qt4 samba saneBackends soprano speechd
+              strigi taglib udev xlibs xplanet xscreensaver xz;
       alsa = alsaLib;
       assuan = libassuan;
       boost = boost156;
       canberra = libcanberra;
+      eigen3 = eigen;
       epub = ebook_tools;
+      gif = giflib;
       gphoto2 = libgphoto2;
       hupnp = herqq;
       indi = indilib;
+      jpeg = libjpeg;
       ldap = openldap;
       libattica = attica;
       musicbrainz3 = libmusicbrainz;
@@ -180,6 +185,7 @@ let
       qalculate = libqalculate;
       sasl2 = cyrus_sasl;
       shareddesktopontologies = shared_desktop_ontologies;
+      sharedmimeinfo = shared_mime_info;
       sndfile = libsndfile;
       tiff = libtiff;
       telepathyqt4 = telepathy_qt;
@@ -189,212 +195,330 @@ let
     });
 
   self =
-    (builtins.removeAttrs super [ "artikulate" # build failure; wrong boost?
+    (builtins.removeAttrs super [
+      "artikulate" # build failure; wrong boost?
       "kde-dev-scripts" "kde-dev-utils" # docbook errors
       "kdewebdev" # unknown build failure
+      "kde-l10n-sr" # missing CMake command
     ]) // {
-      inherit kdePackage qt5 scope;
+      audiocd-kio = kde4Package super.audiocd-kio;
 
-      ark = overrideDerivation super.ark (drv: {
-        buildInputs = (drv.buildInputs or []) ++ [ pkgs.makeWrapper ];
+      amor = kde4Package super.amor;
+
+      ark = extendDerivation (kde4Package super.ark) {
+        buildInputs = [ pkgs.makeWrapper ];
         # runtime dependency
-        postInstall = (drv.postInstall or "") + ''
+        postInstall = ''
           wrapProgram $out/bin/ark --prefix PATH : "${pkgs.unzipNLS}/bin"
         '';
-      });
+      };
 
-      ffmpegthumbs = overrideDerivation super.ffmpegthumbs (drv: {
-        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
-      });
+      cervisia = kde4Package super.cervisia;
 
-      kaccounts-providers = overrideDerivation super.kaccounts-providers (drv: {
-        buildInputs = (drv.buildInputs or []) ++ [ pkgs.libaccounts-glib ];
+      dolphin-plugins = kde4Package super.dolphin-plugins;
+
+      dragon = kde4Package super.dragon;
+
+      ffmpegthumbs = extendDerivation (kde4Package super.ffmpegthumbs) {
+        nativeBuildInputs = [ scope.pkgconfig ];
+      };
+
+      juk = kde4Package super.juk;
+
+      jovie = kde4Package super.jovie;
+
+      kaccessible = kde4Package super.kaccessible;
+
+      kaccounts-providers = extendDerivation super.kaccounts-providers {
+        buildInputs = [ pkgs.libaccounts-glib ];
         # hard-coded install path
-        preConfigure = (drv.preConfigure or "") + ''
+        preConfigure = ''
           substituteInPlace webkit-options/CMakeLists.txt \
             --replace "/etc/signon-ui/webkit-options.d/" \
                       "$out/etc/signon-ui/webkit-options.d/"
         '';
-      });
+      };
 
-      kalzium = overrideDerivation super.kalzium (drv: {
-        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
-      });
+      kajongg = kde4Package super.kajongg;
 
-      kate = overrideDerivation super.kate (drv: {
-        buildInputs =
-          (drv.buildInputs or [])
-          ++ (with kf5; [ kconfig kguiaddons kiconthemes ki18n kinit kjobwidgets
-                          kio kparts ktexteditor kwindowsystem kxmlgui ]);
-        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ ([ kf5.kdoctools ]);
-      });
+      kalzium = extendDerivation (kde4Package super.kalzium) {
+        nativeBuildInputs = [ scope.pkgconfig ];
+      };
 
-      /*
-      kde-baseapps = overrideDerivation super.kde-baseapps (drv: {
-        buildInputs = (drv.buildInputs or []) ++ [ scope.qt4 ];
-      });
-      */
+      kamera = kde4Package super.kamera;
 
-      kde-runtime = overrideDerivation super.kde-runtime (drv: {
-        buildInputs = (drv.buildInputs or []) ++ [ scope.canberra ];
-        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
+      kate = extendDerivation super.kate {
+        buildInputs = with scope; [
+          kconfig kguiaddons kiconthemes ki18n kinit kjobwidgets kio
+          kparts ktexteditor kwindowsystem kxmlgui
+        ];
+        nativeBuildInputs = [ scope.kdoctools ];
+      };
+
+      kcachegrind = kde4Package super.kcachegrind;
+
+      kcolorchooser = kde4Package super.kcolorchooser;
+
+      kde-base-artwork = kde4Package super.kde-base-artwork;
+
+      kde-baseapps = kde4Package super.kde-baseapps;
+
+      kde-runtime = extendDerivation (kde4Package super.kde-runtime) {
+        buildInputs = [ scope.canberra ];
+        nativeBuildInputs = [ scope.pkgconfig ];
         # cmake does not detect path to `ilmbase`
-        NIX_CFLAGS_COMPILE =
-          (drv.NIX_CFLAGS_COMPILE or "") + " -I${scope.ilmbase}/include/OpenEXR";
+        NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR";
         # some components of this package have been replaced in other packages
         meta = { priority = 10; };
-      });
+      };
 
-      kde-workspace = overrideDerivation super.kde-workspace (drv: {
-        buildInputs =
-          (drv.buildInputs or []) ++
-          (with pkgs.xlibs; [
+      kde-wallpapers = kde4Package super.kde-wallpapers;
+
+      kde-workspace = extendDerivation (kde4Package super.kde-workspace) {
+        buildInputs = with scope.xlibs; [
             libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil
-          ]);
-        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
+        ];
+        nativeBuildInputs = [ scope.pkgconfig ];
         # some components of this package have been replaced in other packages
         meta = { priority = 10; };
-      });
+      };
 
-      kdelibs = overrideDerivation super.kdelibs (drv: {
-        buildInputs =
-          (drv.buildInputs or []) ++ (with scope; [ attr polkit_qt4 xsltproc xz ]);
+      kdeartwork = kde4Package super.kdeartwork;
 
-        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
+      kdegraphics-mobipocket = kde4Package super.kdegraphics-mobipocket;
+
+      kdegraphics-strigi-analyzer = kde4Package super.kdegraphics-strigi-analyzer;
+
+      kdegraphics-thumbnailers = kde4Package super.kdegraphics-thumbnailers;
+
+      kdelibs = extendDerivation super.kdelibs {
+        buildInputs = with scope; [ attr polkit_qt4 xsltproc xz ];
+        propagatedBuildInputs = with scope; [ qt4 soprano phonon strigi ];
+        nativeBuildInputs = [ scope.pkgconfig ];
+        propagatedNativeBuildInputs = with scope; [
+          automoc4 cmake perl sharedmimeinfo
+        ];
+
+        patches = [ ./kdelibs/polkit-install.patch ];
 
         # cmake does not detect path to `ilmbase`
-        NIX_CFLAGS_COMPILE =
-          (drv.NIX_CFLAGS_COMPILE or "") + " -I${scope.ilmbase}/include/OpenEXR";
+        NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR";
 
-        propagatedBuildInputs =
-          (drv.propagatedBuildInputs or [])
-          ++ (with scope; [ qt4 soprano phonon strigi ]);
-
-        propagatedNativeBuildInputs =
-          (drv.propagatedNativeBuildInputs or [])
-          ++ (with scope; [ automoc4 cmake perl sharedmimeinfo ]);
-
-        patches = (drv.patches or []) ++ [ ./kdelibs/polkit-install.patch ];
-
-        cmakeFlags = (drv.cmakeFlags or []) ++ [
+        cmakeFlags = [
           "-DDOCBOOKXML_CURRENTDTD_DIR=${scope.docbook_xml_dtd_42}/xml/dtd/docbook"
           "-DDOCBOOKXSL_DIR=${scope.docbook_xsl}/xml/xsl/docbook"
           "-DHUPNP_ENABLED=ON"
           "-DWITH_SOLID_UDISKS2=ON"
           "-DKDE_DEFAULT_HOME=.kde"
         ];
-      });
+      };
 
-      kdenlive = overrideDerivation super.kdenlive (drv: {
-        buildInputs = (drv.buildInputs or []) ++ [ scope.mlt ];
-      });
+      kdenetwork-filesharing = kde4Package super.kdenetwork-filesharing;
 
-      kdepim = overrideDerivation super.kdepim (drv: {
-        buildInputs = (drv.buildInputs or []) ++ (with scope; [ gpgme assuan ]);
-        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
-      });
+      kdenetwork-strigi-analyzers = kde4Package super.kdenetwork-strigi-analyzers;
 
-      kdepimlibs = overrideDerivation super.kdepimlibs (drv: {
-        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
-      });
+      kdenlive = extendDerivation super.kdenlive { buildInputs = [ scope.mlt ]; };
 
-      kdesdk-thumbnailers = overrideDerivation super.kdesdk-thumbnailers (drv: {
-        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.gettext ];
-      });
+      kdepim = extendDerivation (kde4Package super.kdepim) {
+        buildInputs = with scope; [ gpgme assuan ];
+        nativeBuildInputs = [ scope.pkgconfig ];
+      };
 
-      kgpg = overrideDerivation super.kgpg (drv: {
-        buildInputs = (drv.buildInputs or []) ++ [ scope.boost ];
-      });
+      kdepim-runtime = kde4Package super.kdepim-runtime;
 
-      khangman = overrideDerivation super.khangman (drv: {
-        buildInputs = (drv.buildInputs or []) ++ [ kf5.kio ];
-      });
+      kdepimlibs = extendDerivation (kde4Package super.kdepimlibs) {
+        nativeBuildInputs = [ scope.pkgconfig ];
+      };
 
-      kmix = overrideDerivation super.kmix (drv: {
-        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
-        cmakeFlags = (drv.cmakeFlags or []) ++ [ "-DKMIX_KF5_BUILD=ON" ];
-      });
+      kdesdk-kioslaves = kde4Package super.kdesdk-kioslaves;
 
-      kmousetool = overrideDerivation super.kmousetool (drv: {
-        buildInputs = (drv.buildInputs or []) ++ (with pkgs.xlibs; [ libXtst libXt ]);
-      });
+      kdesdk-strigi-analyzers = kde4Package super.kdesdk-strigi-analyzers;
 
-      kremotecontrol = overrideDerivation super.kremotecontrol (drv: {
-        buildInputs = (drv.buildInputs or []) ++ [ pkgs.xlibs.libXtst ];
-      });
+      kdesdk-thumbnailers =
+        extendDerivation (kde4Package super.kdesdk-thumbnailers) {
+          nativeBuildInputs = [ scope.gettext ];
+        };
 
-      krfb = overrideDerivation super.krfb (drv: {
-        buildInputs =
-          (drv.buildInputs or [])
-          ++ [ pkgs.xlibs.libXtst scope.ktp-common-internals ];
-      });
+      kdf = kde4Package super.kdf;
 
-      kstars = overrideDerivation super.kstars (drv: {
-        buildInputs = (drv.buildInputs or []) ++ (with scope; [ kparts cfitsio ]);
-      });
+      kfloppy = kde4Package super.kfloppy;
 
-      ktp-accounts-kcm = overrideDerivation super.ktp-accounts-kcm (drv: {
-        buildInputs = (drv.buildInputs or []) ++ [ pkgs.libaccounts-glib ];
-      });
+      kgamma = kde4Package super.kgamma;
 
-      ktp-common-internals = overrideDerivation super.ktp-common-internals (drv: {
-        buildInputs =
-          (drv.buildInputs or [])
-          ++ (with scope; [ kdelibs4support kparts ])
-          ++ [ pkgs.libotr ]; # needed for ktp-text-ui
-      });
+      kget = kde4Package super.kget;
 
-      ktp-text-ui = overrideDerivation super.ktp-text-ui (drv: {
-        buildInputs = (drv.buildInputs or []) ++ [ scope.kdbusaddons ];
-      });
+      kgoldrunner = kde4Package super.kgoldrunner;
 
-      lokalize = overrideDerivation super.lokalize (drv: {
-        buildInputs = (drv.buildInputs or []) ++ [ scope.kdbusaddons ];
-      });
+      kgpg = extendDerivation (kde4Package super.kgpg) {
+        buildInputs = [ scope.boost ];
+      };
 
-      libkdcraw = overrideDerivation super.libkdcraw (drv: {
-        buildInputs = (drv.buildInputs or []) ++ (with scope; [ kdelibs libraw ]);
-        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
-      });
+      khangman = extendDerivation super.khangman { buildInputs = [ scope.kio ]; };
 
-      libkexiv2 = overrideDerivation super.libkexiv2 (drv: {
-        buildInputs = (drv.buildInputs or []) ++ (with scope; [ exiv2 kdelibs ]);
-      });
+      kigo = kde4Package super.kigo;
 
-      libkface = overrideDerivation super.libkface (drv: {
-        buildInputs = (drv.buildInputs or []) ++ (with scope; [ kdelibs opencv ]);
-      });
+      kiriki = kde4Package super.kiriki;
 
-      libkgeomap = overrideDerivation super.libkgeomap (drv: {
+      klickety = kde4Package super.klickety;
+
+      kmag = kde4Package super.kmag;
+
+      kmahjongg = kde4Package super.kmahjongg;
+
+      kmix = extendDerivation super.kmix {
+        nativeBuildInputs = [ scope.pkgconfig ];
+        cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ];
+      };
+
+      kmousetool = extendDerivation (kde4Package super.kmousetool) {
+        buildInputs = with scope.xlibs; [ libXtst libXt ];
+      };
+
+      kmouth = kde4Package super.kmouth;
+
+      knavalbattle = kde4Package super.knavalbattle;
+
+      kolf = kde4Package super.kolf;
+
+      kolourpaint = kde4Package super.kolourpaint;
+
+      konquest = kde4Package super.konquest;
+
+      kopete = kde4Package super.kopete;
+
+      kppp = kde4Package super.kppp;
+
+      kqtquickcharts = kde4Package super.kqtquickcharts;
+
+      krdc = kde4Package super.krdc;
+
+      kremotecontrol = extendDerivation (kde4Package super.kremotecontrol) {
+        buildInputs = [ scope.xlibs.libXtst ];
+      };
+
+      kreversi = kde4Package super.kreversi;
+
+      krfb = extendDerivation (kde4Package super.krfb) {
+        buildInputs = with scope; [ xlibs.libXtst ktp-common-internals ];
+      };
+
+      ksaneplugin = kde4Package super.ksaneplugin;
+
+      kscd = kde4Package super.kscd;
+
+      ksirk = kde4Package super.ksirk;
+
+      ksnakeduel = kde4Package super.ksnakeduel;
+
+      ksnapshot = kde4Package super.ksnapshot;
+
+      kspaceduel = kde4Package super.kspaceduel;
+
+      kstars = extendDerivation super.kstars {
+        buildInputs = with scope; [ kparts cfitsio ];
+      };
+
+      ksudoku = kde4Package super.ksudoku;
+
+      ksystemlog = kde4Package super.ksystemlog;
+
+      ktp-accounts-kcm = extendDerivation super.ktp-accounts-kcm {
+        buildInputs = [ scope.libaccounts-glib ];
+      };
+
+      ktp-common-internals = extendDerivation super.ktp-common-internals {
+        buildInputs = with scope; [ kdelibs4support kparts libotr ];
+      };
+
+      ktp-text-ui = extendDerivation super.ktp-text-ui {
+        buildInputs = [ scope.kdbusaddons ];
+      };
+
+      ktuberling = kde4Package super.ktuberling;
+
+      ktux = kde4Package super.ktux;
+
+      kubrick = kde4Package super.kubrick;
+
+      kuser = kde4Package super.kuser;
+
+      kwalletmanager = kde4Package super.kwalletmanager;
+
+      lokalize = extendDerivation super.lokalize {
+        buildInputs = [ scope.kdbusaddons ];
+      };
+
+      libkcddb = kde4Package super.libkcddb;
+
+      libkcompactdisc = kde4Package super.libkcompactdisc;
+
+      libkdcraw = extendDerivation super.libkdcraw {
+        buildInputs = with scope; [ kdelibs libraw ];
+        nativeBuildInputs = [ scope.pkgconfig ];
+      };
+
+      libkdeedu = kde4Package super.libkdeedu;
+
+      libkexiv2 = extendDerivation super.libkexiv2 {
+        buildInputs = with scope; [ exiv2 kdelibs ];
+      };
+
+      libkface = extendDerivation super.libkface {
+        buildInputs = with scope; [ kdelibs opencv ];
+      };
+
+      libkgeomap = extendDerivation (kde4Package super.libkgeomap) {
         cmakeFlags =
-          (drv.cmakeFlags or [])
-          ++ [ "-DCMAKE_MODULE_PATH=${scope.marble}/share/apps/cmake/modules" ];
-      });
+          [ "-DCMAKE_MODULE_PATH=${scope.marble}/share/apps/cmake/modules" ];
+      };
 
-      libkipi = overrideDerivation super.libkipi (drv: {
-        buildInputs = (drv.buildInputs or []) ++ [ scope.kdelibs ];
-      });
+      libkipi = extendDerivation super.libkipi {
+        buildInputs = [ scope.kdelibs ];
+      };
 
-      libksane = overrideDerivation super.libksane (drv: {
-        buildInputs = (drv.buildInputs or []) ++ (with scope; [ kdelibs saneBackends]);
-      });
+      libksane = extendDerivation super.libksane {
+        buildInputs = with scope; [ kdelibs saneBackends];
+      };
 
-      okular = overrideDerivation super.okular (drv: {
-        nativeBuildInputs = (drv.nativeBuildInputs or []) ++ [ scope.pkgconfig ];
-      });
+      lskat = kde4Package super.lskat;
 
-      rocs = overrideDerivation super.rocs (drv: {
-        buildInputs = (drv.buildInputs or []) ++ [ scope.kdelibs4support ];
-      });
+      marble = kde4Package super.marble;
 
-      signon-kwallet-extension =
-        overrideDerivation super.signon-kwallet-extension (drv: {
-          buildInputs = (drv.buildInputs or []) ++ [ scope.signonqt5 ];
-          preConfigure = (drv.preConfigure or "") + ''
-            sed -i src/CMakeLists.txt \
-                -e "s,\''${SIGNONEXTENSION_PLUGINDIR},$out/lib/signon/extensions,"
-          '';
-        });
+      mplayerthumbs = kde4Package super.mplayerthumbs;
+
+      okular = extendDerivation (kde4Package super.okular) {
+        nativeBuildInputs = [ scope.pkgconfig ];
+      };
+
+      pairs = kde4Package super.pairs;
+
+      palapeli = kde4Package super.palapeli;
+
+      picmi = kde4Package super.picmi;
+
+      poxml = kde4Package super.poxml;
+
+      rocs = extendDerivation super.rocs {
+        buildInputs = [ scope.kdelibs4support ];
+      };
+
+      signon-kwallet-extension = extendDerivation super.signon-kwallet-extension {
+        buildInputs = [ scope.signonqt5 ];
+        preConfigure = ''
+          sed -i src/CMakeLists.txt \
+              -e "s,\''${SIGNONEXTENSION_PLUGINDIR},$out/lib/signon/extensions,"
+        '';
+      };
+
+      superkaramba = kde4Package super.superkaramba;
+
+      svgpart = kde4Package super.svgpart;
+
+      sweeper = kde4Package super.sweeper;
+
+      umbrello = kde4Package super.umbrello;
+
+      zeroconf-ioslave = kde4Package super.zeroconf-ioslave;
 
     };
 
diff --git a/pkgs/applications/kde-apps-15.04/setup-hook.sh b/pkgs/applications/kde-apps-15.04/setup-hook.sh
index a8d9b7e0e36..636669d4c62 100644
--- a/pkgs/applications/kde-apps-15.04/setup-hook.sh
+++ b/pkgs/applications/kde-apps-15.04/setup-hook.sh
@@ -1 +1,12 @@
 addToSearchPath XDG_DATA_DIRS @out@/share
+
+addQt4Plugins() {
+  if [[ -d "$1/lib/qt4/plugins" ]]; then
+      propagatedUserEnvPkgs+=" $1"
+  fi
+
+  if [[ -d "$1/lib/kde4/plugins" ]]; then
+      propagatedUserEnvPkgs+=" $1"
+  fi
+}
+envHooks+=(addQt4Plugins)
diff --git a/pkgs/build-support/autonix/default.nix b/pkgs/build-support/autonix/default.nix
index 5aba2620cda..1f71d2cbb3b 100644
--- a/pkgs/build-support/autonix/default.nix
+++ b/pkgs/build-support/autonix/default.nix
@@ -1,5 +1,8 @@
-{ bash, callPackage, coreutils, fetchurl, findutils, nix, runCommand, stdenv
-, substituteAll, wget, writeText }:
+{ pkgs }:
+
+let inherit (pkgs) bash coreutils findutils nix wget;
+    inherit (pkgs) callPackage fetchurl runCommand stdenv substituteAll writeText;
+in
 
 /* autonix is a collection of tools to automate packaging large collections
  * of software, particularly KDE. It consists of three components:
@@ -10,10 +13,18 @@
  *      expressions from the output of the previous steps.
  */
 
-with stdenv.lib;
+let inherit (stdenv) lib; in
 
 let
 
+  resolveDeps = scope: deps:
+    let resolve = dep:
+          let res = scope."${dep}" or [];
+          in if lib.isList res then res else [res];
+    in lib.concatMap resolve deps;
+
+in rec {
+
   /* Download the packages into the Nix store, compute their hashes,
    * and generate a package manifest in ./manifest.nix.
    */
@@ -32,240 +43,94 @@ let
           chmod +x $out
         '';
 
-  /* Convert a manifest.nix file to XML to be read by autonix-deps. */
-  writeManifestXML = filename:
-    let
-      generateStores = mapAttrs (n: pkg: pkg.store);
-      manifest = importManifest filename { mirror = ""; };
-      stores = generateStores manifest;
-    in
-      writeText "manifest.xml" (builtins.toXML stores);
+  mkPackage = callPackage: defaultOverride: name: pkg: let drv =
+    { mkDerivation, fetchurl, scope }:
 
-  /* Generate a set of Nix expressions for the collection, given a
-   * manifest.nix, dependencies.nix, and renames.nix in the same directory.
-   */
-  generateCollection = dir: # path to directory
-    { mirror # mirror to download packages from
-    , mkDerivation ? mkDerivation
-    , preResolve ? id # modify package set before dependency resolution
-    , postResolve ? id # modify package set after dependency resolution
-    , renames ? {}
-    , scope ? {}
-    }:
-    let
+    mkDerivation (defaultOverride {
+      inherit (pkg) name;
 
-      fix = f: let x = f x; in x;
+      src = fetchurl pkg.src;
 
-      resolvePkg = name:
-        mapAttrs (attr: if isDepAttr attr then resolveDeps scope else id);
+      buildInputs = resolveDeps scope pkg.buildInputs;
+      nativeBuildInputs = resolveDeps scope pkg.nativeBuildInputs;
+      propagatedBuildInputs = resolveDeps scope pkg.propagatedBuildInputs;
+      propagatedNativeBuildInputs =
+        resolveDeps scope pkg.propagatedNativeBuildInputs;
+      propagatedUserEnvPkgs = resolveDeps scope pkg.propagatedUserEnvPkgs;
 
-      resolve = mapAttrs resolvePkg;
+      enableParallelBuilding = true;
+    });
+  in callPackage drv {};
 
-      derive = mapAttrs (name: mkDerivation);
+  renameDeps = renames: lib.mapAttrs (name: pkg:
+    let breakCycles = lib.filter (dep: dep != name);
+        rename = dep: renames."${dep}" or dep;
+    in pkg // {
+      buildInputs = breakCycles (map rename pkg.buildInputs);
+      nativeBuildInputs = breakCycles (map rename pkg.nativeBuildInputs);
+      propagatedBuildInputs = breakCycles (map rename pkg.propagatedBuildInputs);
+      propagatedNativeBuildInputs =
+        breakCycles (map rename pkg.propagatedNativeBuildInputs);
+      propagatedUserEnvPkgs = breakCycles (map rename pkg.propagatedUserEnvPkgs);
+    });
 
-      renames_ =
-        if renames == {} then (import (dir + "/renames.nix") {}) else renames;
+  propagateDeps = propagated: lib.mapAttrs (name: pkg:
+    let isPropagated = dep: lib.elem dep propagated;
+        isNotPropagated = dep: !(isPropagated dep);
+    in pkg // {
+      buildInputs = lib.filter isNotPropagated pkg.buildInputs;
+      nativeBuildInputs = lib.filter isNotPropagated pkg.nativeBuildInputs;
+      propagatedBuildInputs =
+        pkg.propagatedBuildInputs
+        ++ lib.filter isPropagated pkg.buildInputs;
+      propagatedNativeBuildInputs =
+        pkg.propagatedNativeBuildInputs
+        ++ lib.filter isPropagated pkg.nativeBuildInputs;
+    });
 
-      packages = importPackages dir renames_ { inherit mirror; };
+  nativeDeps = native: lib.mapAttrs (name: pkg:
+    let isNative = dep: lib.elem dep native;
+        isNotNative = dep: !(isNative dep);
+    in pkg // {
+      buildInputs = lib.filter isNotNative pkg.buildInputs;
+      nativeBuildInputs =
+        pkg.nativeBuildInputs
+        ++ lib.filter isNative pkg.buildInputs;
+      propagatedBuildInputs = lib.filter isNotNative pkg.propagatedBuildInputs;
+      propagatedNativeBuildInputs =
+        pkg.propagatedNativeBuildInputs
+        ++ lib.filter isNative pkg.propagatedBuildInputs;
+    });
 
-    in derive (postResolve (resolve (preResolve packages)));
+  userEnvDeps = user: lib.mapAttrs (name: pkg:
+    let allDeps = with pkg; lib.concatLists [
+          buildInputs
+          nativeBuildInputs
+          propagatedBuildInputs
+          propagatedNativeBuildInputs
+        ];
+    in assert (lib.isList allDeps); pkg // {
+      propagatedUserEnvPkgs = lib.filter (dep: lib.elem dep user) allDeps;
+    });
 
-  pkgAttrName = pkg: (builtins.parseDrvName pkg.name).name;
-  pkgVersion = pkg: (builtins.parseDrvName pkg.name).version;
+  overrideDerivation = pkg: f: pkg.override (super: super // {
+    mkDerivation = drv: super.mkDerivation (drv // f drv);
+  });
 
-  depAttrNames = [
-    "buildInputs" "nativeBuildInputs"
-    "propagatedBuildInputs" "propagatedNativeBuildInputs"
-    "propagatedUserEnvPkgs"
-  ];
-
-  isDepAttr = name: builtins.elem name depAttrNames;
-
-  removePkgDeps = deps:
-    let removeDepsIfDepAttr = attr: value:
-          if isDepAttr attr then fold remove value deps else value;
-    in mapAttrs removeDepsIfDepAttr;
-
-  hasDep = dep: pkg:
-    let depAttrs = attrValues (filterAttrs (n: v: isDepAttr n) pkg);
-        allDeps = concatLists depAttrs;
-    in elem dep allDeps;
-
-  importManifest = path: { mirror }:
-    let
-      uniqueNames = manifest:
-        unique (map pkgAttrName manifest);
-
-      versionsOf = manifest: name:
-        filter (pkg: pkgAttrName pkg == name) manifest;
-
-      bestVersions = manifest:
-        let best = versions:
-              let
-                strictlyLess = a: b:
-                  builtins.compareVersions (pkgVersion a) (pkgVersion b) > 0;
-                sorted = sort strictlyLess versions;
-              in head sorted;
-        in map (name: best (versionsOf manifest name)) (uniqueNames manifest);
-
-      withNames = manifest:
-        builtins.listToAttrs
-          (map (p: nameValuePair (toLower (pkgAttrName p)) p) manifest);
-
-      orig = import path { inherit stdenv fetchurl mirror; };
-    in
-      fold (f: x: f x) orig [ withNames bestVersions ];
-
-  importPackages = path: renames: manifestScope:
-    let
-
-      # Do not allow any package to depend on itself.
-      breakRecursion =
-        let removeSelfDep = pkg:
-              mapAttrs
-                (n: if isDepAttr n
-                      then filter (dep: dep != pkg && renamed dep != pkg)
-                    else id);
-        in mapAttrs removeSelfDep;
-
-      renamed = dep: renames."${dep}" or dep;
-
-      manifest = importManifest (path + "/manifest.nix") manifestScope;
-
-      deps = import (path + "/dependencies.nix") {};
-
-      mkPkg = name: manifest:
-        {
-          inherit (manifest) name src;
-          inherit (deps."${name}")
-            buildInputs nativeBuildInputs propagatedBuildInputs
-            propagatedNativeBuildInputs propagatedUserEnvPkgs;
+  extendDerivation = pkg: attrs:
+    let mergeAttrBy = lib.mergeAttrBy // {
+          propagatedNativeBuildInputs = a: b: a ++ b;
+          NIX_CFLAGS_COMPILE = a: b: "${a} ${b}";
+          cmakeFlags = a: b: a ++ b;
         };
+        mergeAttrsByFunc = sets:
+          let merged = lib.foldl lib.mergeAttrByFunc { inherit mergeAttrBy; } sets;
+          in builtins.removeAttrs merged ["mergeAttrBy"];
+    in overrideDerivation pkg (drv: mergeAttrsByFunc [ drv attrs ]);
 
-    in breakRecursion (mapAttrs mkPkg manifest);
-
-  mkDerivation = drv: stdenv.mkDerivation (drv // { src = fetchurl drv.src; });
-
-  resolveDeps = scope: deps:
-    let resolve = dep:
-          let res = scope."${dep}" or [];
-          in if lib.isList res then res else [res];
-    in lib.concatMap resolve deps;
-
-  userEnvPkg = dep:
-    mapAttrs
-      (name: pkg: pkg // {
-        propagatedUserEnvPkgs =
-          (pkg.propagatedUserEnvPkgs or [])
-          ++ optional (hasDep dep pkg) dep;
-      });
-
-in
-{
-  inherit generateCollection;
-  inherit importManifest;
-  inherit isDepAttr;
-  inherit manifest;
-  inherit removePkgDeps;
-  inherit resolveDeps;
-  inherit userEnvPkg;
-  inherit writeManifestXML;
-
-  blacklist = names: pkgs:
-    let
-      removeDeps = deps: mapAttrs (name: removePkgDeps deps);
-      removePkgs = names: pkgs: builtins.removeAttrs pkgs names;
-    in removeDeps names (removePkgs names pkgs);
-
-  lib = rec {
-    mkPackage = callPackage: defaultOverride: name: pkg: let drv =
-      { mkDerivation, fetchurl, scope }:
-
-      mkDerivation (defaultOverride {
-        inherit (pkg) name;
-
-        src = fetchurl pkg.src;
-
-        buildInputs = resolveDeps scope pkg.buildInputs;
-        nativeBuildInputs = resolveDeps scope pkg.nativeBuildInputs;
-        propagatedBuildInputs = resolveDeps scope pkg.propagatedBuildInputs;
-        propagatedNativeBuildInputs =
-          resolveDeps scope pkg.propagatedNativeBuildInputs;
-        propagatedUserEnvPkgs = resolveDeps scope pkg.propagatedUserEnvPkgs;
-
-        enableParallelBuilding = true;
-      });
-    in callPackage drv {};
-
-    renameDeps = renames: lib.mapAttrs (name: pkg:
-      let breakCycles = lib.filter (dep: dep != name);
-          rename = dep: renames."${dep}" or dep;
-      in pkg // {
-        buildInputs = breakCycles (map rename pkg.buildInputs);
-        nativeBuildInputs = breakCycles (map rename pkg.nativeBuildInputs);
-        propagatedBuildInputs = breakCycles (map rename pkg.propagatedBuildInputs);
-        propagatedNativeBuildInputs = breakCycles (map rename pkg.propagatedNativeBuildInputs);
-        propagatedUserEnvPkgs = breakCycles (map rename pkg.propagatedUserEnvPkgs);
-      });
-
-    propagateDeps = propagated: lib.mapAttrs (name: pkg:
-      let isPropagated = dep: lib.elem dep propagated;
-          isNotPropagated = dep: !(isPropagated dep);
-      in pkg // {
-        buildInputs = lib.filter isNotPropagated pkg.buildInputs;
-        nativeBuildInputs = lib.filter isNotPropagated pkg.nativeBuildInputs;
-        propagatedBuildInputs =
-          pkg.propagatedBuildInputs
-          ++ lib.filter isPropagated pkg.buildInputs;
-        propagatedNativeBuildInputs =
-          pkg.propagatedNativeBuildInputs
-          ++ lib.filter isPropagated pkg.nativeBuildInputs;
-      });
-
-    nativeDeps = native: lib.mapAttrs (name: pkg:
-      let isNative = dep: lib.elem dep native;
-          isNotNative = dep: !(isNative dep);
-      in pkg // {
-        buildInputs = lib.filter isNotNative pkg.buildInputs;
-        nativeBuildInputs =
-          pkg.nativeBuildInputs
-          ++ lib.filter isNative pkg.buildInputs;
-        propagatedBuildInputs = lib.filter isNotNative pkg.propagatedBuildInputs;
-        propagatedNativeBuildInputs =
-          pkg.propagatedNativeBuildInputs
-          ++ lib.filter isNative pkg.propagatedBuildInputs;
-      });
-
-    userEnvDeps = user: lib.mapAttrs (name: pkg:
-      let allDeps = with pkg; lib.concatLists [
-            buildInputs
-            nativeBuildInputs
-            propagatedBuildInputs
-            propagatedNativeBuildInputs
-          ];
-      in assert (lib.isList allDeps); pkg // {
-        propagatedUserEnvPkgs = lib.filter (dep: lib.elem dep user) allDeps;
-      });
-
-    overrideDerivation = pkg: f: pkg.override (super: super // {
-      mkDerivation = drv: super.mkDerivation (drv // f drv);
-    });
-
-    extendDerivation = pkg: attrs:
-      let mergeAttrBy = lib.mergeAttrBy // {
-            propagatedNativeBuildInputs = a: b: a ++ b;
-            NIX_CFLAGS_COMPILE = a: b: "${a} ${b}";
-            cmakeFlags = a: b: a ++ b;
-          };
-          mergeAttrsByFunc = sets:
-            let merged = lib.foldl lib.mergeAttrByFunc { inherit mergeAttrBy; } sets;
-            in builtins.removeAttrs merged ["mergeAttrBy"];
-      in overrideDerivation pkg (drv: mergeAttrsByFunc [ drv attrs ]);
-
-    overrideScope = pkg: fnOrSet: pkg.override (super: super // {
-      scope = if builtins.isFunction fnOrSet
-                then super.scope // fnOrSet super.scope
-              else super.scope // fnOrSet;
-    });
-  };
+  overrideScope = pkg: fnOrSet: pkg.override (super: super // {
+    scope = if builtins.isFunction fnOrSet
+              then super.scope // fnOrSet super.scope
+            else super.scope // fnOrSet;
+  });
 }
diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index ba1c1b78fc7..33165afd03e 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -16,7 +16,7 @@
 
 let inherit (pkgs) autonix stdenv symlinkJoin; in
 
-let kf5Orig = kf5; in
+with autonix; let inherit (stdenv) lib; in
 
 let
   kf5_ = if kf5 != null then kf5 else pkgs.kf510;
@@ -26,7 +26,7 @@ in
 let
 
   qt5 = qt5_;
-  kf5 = kf5_.override { inherit qt5; };
+  kf5 = kf5_.override { inherit debug qt5; };
 
   kdePackage = name: pkg:
     let defaultOverride = drv: drv // {
@@ -106,7 +106,7 @@ let
               modemmanager openconnect openexr pam pango qt4 samba
               socat substituteAll taglib utillinux wayland xapian
               xkeyboard_config xlibs xorg;
-      boost = boost155;
+      boost = boost156;
       canberra = libcanberra;
       epub = ebook_tools;
       fontforge_executable = fontforge;
@@ -153,7 +153,7 @@ let
         });
       in symlinkJoin "breeze-${version}" [ breeze-qt4 breeze-qt5 ];
 
-    kde-gtk-config = overrideDerivation super.kde-gtk-config (drv: {
+    kde-gtk-config = extendDerivation super.kde-gtk-config {
       NIX_CFLAGS_COMPILE = with scope;
         lib.concatStringsSep " " [
           "-I${cairo}/include/cairo"
@@ -163,55 +163,51 @@ let
           "-I${glib}/lib/glib-2.0/include"
           "-I${pango}/include/pango-1.0"
         ];
-    });
+    };
 
-    kfilemetadata = overrideDerivation super.kfilemetadata (drv: {
-      buildInputs = drv.buildInputs ++ [ pkgs.attr ];
-    });
+    kfilemetadata = extendDerivation super.kfilemetadata {
+      buildInputs = [ scope.attr ];
+    };
 
-    kwin = overrideDerivation super.kwin (drv: {
-      buildInputs =
-        drv.buildInputs ++ (with pkgs.xlibs; [ libICE libSM libXcursor ]);
+    kwin = extendDerivation super.kwin {
+      buildInputs = with scope.xlibs; [ libICE libSM libXcursor ];
       patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ];
-    });
+    };
 
-    libkscreen = overrideDerivation super.libkscreen (drv: {
-      buildInputs = drv.buildInputs ++ [ pkgs.xlibs.libXrandr];
-    });
+    libkscreen = extendDerivation super.libkscreen {
+      buildInputs = [ scope.xlibs.libXrandr];
+    };
 
-    plasma-desktop = overrideDerivation super.plasma-desktop (drv: {
-      buildInputs =
-        drv.buildInputs
-        ++ [ pkgs.libcanberra ]
-        ++ (with pkgs.xlibs; [ libxkbfile libXcursor libXft ]);
+    plasma-desktop = extendDerivation super.plasma-desktop {
+      buildInputs = with scope;
+        [ canberra ]
+        ++ (with xlibs; [ libxkbfile libXcursor libXft ]);
       patches = [
         ./plasma-desktop/plasma-desktop-hwclock.patch
         ./plasma-desktop/plasma-desktop-zoneinfo.patch
-        (pkgs.substituteAll {
+        (scope.substituteAll {
           src = ./plasma-desktop/plasma-desktop-xkb-rules.patch;
-          xkb = pkgs.xkeyboard_config;
+          xkb = scope.xkeyboard_config;
         })
       ];
       preConfigure = ''
         substituteInPlace kcms/dateandtime/helper.cpp \
           --subst-var-by hwclock "${scope.utillinux}/sbin/hwclock"
       '';
-    });
+    };
 
-    plasma-workspace = overrideDerivation super.plasma-workspace (drv: {
+    plasma-workspace = extendDerivation super.plasma-workspace {
       patches = [
-        (pkgs.substituteAll {
+        (scope.substituteAll {
           src = ./plasma-workspace/0001-startkde-NixOS-patches.patch;
-          inherit (pkgs) bash gnused gnugrep socat;
-          inherit (kf5) kconfig kinit kservice;
-          inherit (pkgs.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
-          qt5tools = qt5.tools;
-          dbus_tools = pkgs.dbus.tools;
+          inherit (scope) bash gnused gnugrep socat;
+          inherit (scope) kconfig kinit kservice;
+          inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
+          qt5tools = scope.qt5tools;
+          dbus_tools = scope.dbus.tools;
         })
       ];
-      buildInputs =
-        (drv.buildInputs or [])
-        ++ (with pkgs.xlibs; [ libSM libXcursor scope.pam ]);
+      buildInputs = with scope.xlibs; [ libSM libXcursor scope.pam ];
       postPatch = ''
         substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
           --replace kdostartupconfig5 $out/bin/kdostartupconfig5
@@ -220,15 +216,15 @@ let
         substituteInPlace startkde/startkde.cmake \
           --subst-var-by plasmaWorkspace "$out"
       '';
-    });
+    };
 
-    powerdevil = overrideDerivation super.powerdevil (drv: {
-      buildInputs = drv.buildInputs ++ [pkgs.xlibs.libXrandr];
-    });
+    powerdevil = extendDerivation super.powerdevil {
+      buildInputs = [ scope.xlibs.libXrandr ];
+    };
 
-    sddm-kcm = overrideDerivation super.sddm-kcm (drv: {
-      buildInputs = drv.buildInputs ++ [pkgs.xlibs.libXcursor];
-    });
+    sddm-kcm = extendDerivation super.sddm-kcm {
+      buildInputs = [ scope.xlibs.libXcursor ];
+    };
 
   };
 
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix
index abcae401423..b473a3453f3 100644
--- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix
@@ -12,13 +12,19 @@
 #  make a copy of this directory first. After copying, be sure to delete ./tmp
 #  if it exists. Then follow the minor update instructions.
 
-{ autonix, fetchurl, pkgs, qt5, stdenv, newScope, debug ? false }:
+{ pkgs, newScope, qt5 ? null, debug ? false }:
 
-with autonix;
+let inherit (pkgs) autonix stdenv symlinkJoin; in
 
-let inherit (stdenv) lib; in
+with autonix; let inherit (stdenv) lib; in
 
 let
+  qt5_ = if qt5 != null then qt5 else pkgs.qt54;
+in
+
+let
+
+  qt5 = qt5_;
 
   super =
     let json = builtins.fromJSON (builtins.readFile ./packages.json);
@@ -114,8 +120,6 @@ let
     );
 
   self = super // {
-    inherit kdePackage scope;
-
     extra-cmake-modules = overrideDerivation super.extra-cmake-modules (drv: {
       buildInputs = [];
       nativeBuildInputs = [];
@@ -132,78 +136,72 @@ let
       };
     });
 
-    frameworkintegration = overrideDerivation super.frameworkintegration (drv: {
-      buildInputs = drv.buildInputs ++ [ pkgs.xlibs.libXcursor ];
-    });
+    frameworkintegration = extendDerivation super.frameworkintegration {
+      buildInputs = [ scope.xlibs.libXcursor ];
+    };
 
-    kauth = overrideDerivation super.kauth (drv: {
-      buildInputs = drv.buildInputs ++ [ scope.polkit_qt5 ];
-      patches = [./kauth/kauth-policy-install.patch];
-    });
+    kauth = extendDerivation super.kauth {
+      buildInputs = [ scope.polkit_qt5 ];
+      patches = [ ./kauth/kauth-policy-install.patch ];
+    };
 
-    kcmutils = overrideDerivation super.kcmutils (drv: {
-      patches = [./kcmutils/kcmutils-pluginselector-follow-symlinks.patch];
-    });
+    kcmutils = extendDerivation super.kcmutils {
+      patches = [ ./kcmutils/kcmutils-pluginselector-follow-symlinks.patch ];
+    };
 
-    kconfigwidgets = overrideDerivation super.kconfigwidgets (drv: {
-      patches = [./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch];
-    });
+    kconfigwidgets = extendDerivation super.kconfigwidgets {
+      patches = [ ./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch ];
+    };
 
-    kdelibs4support = overrideDerivation super.kdelibs4support (drv: {
-      buildInputs = drv.buildInputs ++ [ scope.networkmanager pkgs.xlibs.libSM ];
-      cmakeFlags =
-        drv.cmakeFlags
-        ++ [
-          "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook"
-          "-DDocBookXML4_DTD_VERSION=4.5"
-        ];
-    });
+    kdelibs4support = extendDerivation super.kdelibs4support {
+      buildInputs = [ scope.networkmanager scope.xlibs.libSM ];
+      cmakeFlags = [
+        "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook"
+        "-DDocBookXML4_DTD_VERSION=4.5"
+      ];
+    };
 
-    kdoctools = overrideDerivation super.kdoctools (drv: {
-      propagatedNativeBuildInputs =
-        drv.propagatedNativeBuildInputs ++ [ scope.perl scope.perlPackages.URI ];
-      cmakeFlags =
-        drv.cmakeFlags
-        ++ [
-          "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook"
-          "-DDocBookXML4_DTD_VERSION=4.5"
-          "-DDocBookXSL_DIR=${pkgs.docbook5_xsl}/xml/xsl/docbook"
-        ];
-      patches = [./kdoctools/kdoctools-no-find-docbook-xml.patch];
-    });
+    kdoctools = extendDerivation super.kdoctools {
+      propagatedNativeBuildInputs = [ scope.perl scope.perlPackages.URI ];
+      cmakeFlags = [
+        "-DDocBookXML4_DTD_DIR=${scope.docbook_xml_dtd_45}/xml/dtd/docbook"
+        "-DDocBookXML4_DTD_VERSION=4.5"
+        "-DDocBookXSL_DIR=${scope.docbook5_xsl}/xml/xsl/docbook"
+      ];
+      patches = [ ./kdoctools/kdoctools-no-find-docbook-xml.patch ];
+    };
 
-    ki18n = overrideDerivation super.ki18n (drv: {
-      propagatedNativeBuildInputs =
-        drv.propagatedNativeBuildInputs ++ [ scope.libintl scope.pythoninterp ];
-    });
+    ki18n = extendDerivation super.ki18n {
+      propagatedNativeBuildInputs = with scope; [ libintl pythoninterp ];
+    };
 
-    kimageformats = overrideDerivation super.kimageformats (drv: {
+    kimageformats = extendDerivation super.kimageformats {
       NIX_CFLAGS_COMPILE = "-I${pkgs.ilmbase}/include/OpenEXR";
-    });
+    };
 
-    kinit = overrideDerivation super.kinit (drv: {
+    kinit = extendDerivation super.kinit {
       patches = [./kinit/0001-kinit-libpath.patch];
-    });
+    };
 
-    kpackage = overrideDerivation super.kpackage (drv: {
-      patches = [./kpackage/0001-allow-external-paths.patch];
-    });
+    kpackage = extendDerivation super.kpackage {
+      patches = [ ./kpackage/0001-allow-external-paths.patch ];
+    };
 
-    kservice = overrideDerivation super.kservice (drv: {
-      buildInputs = drv.buildInputs ++ [ self.kwindowsystem ];
+    kservice = extendDerivation super.kservice {
+      buildInputs = [ scope.kwindowsystem ];
       patches = [
         ./kservice/kservice-kbuildsycoca-follow-symlinks.patch
         ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
       ];
-    });
+    };
 
-    ktexteditor = overrideDerivation super.ktexteditor (drv: {
+    ktexteditor = extendDerivation super.ktexteditor {
       patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
-    });
+    };
 
-    networkmanager-qt = overrideDerivation super.networkmanager-qt (drv: {
-      propagatedBuildInputs = drv.propagatedBuildInputs ++ [ scope.networkmanager ];
-    });
+    networkmanager-qt = extendDerivation super.networkmanager-qt {
+      propagatedBuildInputs = [ scope.networkmanager ];
+    };
   };
 
 in self
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b21df48dae..696d10e4c88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -251,7 +251,7 @@ let
     theAttrSet = arg;
   };
 
-  autonix = callPackage ../build-support/autonix {};
+  autonix = import ../build-support/autonix { inherit pkgs; };
 
   autoreconfHook = makeSetupHook
     { substitutions = { inherit autoconf automake libtool gettext; }; }
@@ -11658,9 +11658,7 @@ let
     boost = boost155;
   };
 
-  kdeApps_15_04 = recurseIntoAttrs (callPackage ../applications/kde-apps-15.04 {
-    kf5 = kf510;
-  });
+  kdeApps_15_04 = recurseIntoAttrs (callPackage ../applications/kde-apps-15.04 {});
   kdeApps_stable = kdeApps_15_04;
   kdeApps_latest = kdeApps_15_04;
 
@@ -13940,7 +13938,7 @@ let
 
   numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
 
-  plasma53 = recurseIntoAttrs (import ../desktops/plasma-5.3 { inherit pkgs newScope; });
+  plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 { inherit pkgs newScope; });
   plasma5_latest = plasma53;
   plasma5_stable = plasma53;
 

From 5560585d4c243c1d957aae40dcb3ad867e44ec52 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 19 Jun 2015 10:14:48 -0500
Subject: [PATCH 1593/2322] plasma53.plasma-desktop: fix missing paths

---
 pkgs/desktops/plasma-5.3/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index 33165afd03e..dfe58181db6 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -183,17 +183,26 @@ let
         [ canberra ]
         ++ (with xlibs; [ libxkbfile libXcursor libXft ]);
       patches = [
-        ./plasma-desktop/plasma-desktop-hwclock.patch
+        (scope.substituteAll {
+          src = ./plasma-desktop/plasma-desktop-hwclock.patch;
+          hwclock = "${scope.utillinux}/sbin/hwclock";
+        })
         ./plasma-desktop/plasma-desktop-zoneinfo.patch
         (scope.substituteAll {
           src = ./plasma-desktop/plasma-desktop-xkb-rules.patch;
           xkb = scope.xkeyboard_config;
         })
       ];
-      preConfigure = ''
-        substituteInPlace kcms/dateandtime/helper.cpp \
-          --subst-var-by hwclock "${scope.utillinux}/sbin/hwclock"
-      '';
+      NIX_CFLAGS_COMPILE = with scope.xlibs;
+        lib.concatStringsSep " " [
+          "-I${xf86inputsynaptics}/include/xorg"
+          "-I${xf86inputevdev}/include/xorg"
+          "-I${xorgserver}/include/xorg"
+        ];
+      cmakeFlags = with scope.xlibs; [
+        "-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include"
+        "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include"
+      ];
     };
 
     plasma-workspace = extendDerivation super.plasma-workspace {

From e5e32e45a55c2d1ca1f737aae40db16c87abab49 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 19 Jun 2015 10:15:23 -0500
Subject: [PATCH 1594/2322] plasma53.plasma-workspace: patch startkde paths
 correctly

---
 pkgs/desktops/plasma-5.3/default.nix | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index dfe58181db6..15fd9e071e8 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -206,24 +206,17 @@ let
     };
 
     plasma-workspace = extendDerivation super.plasma-workspace {
-      patches = [
-        (scope.substituteAll {
-          src = ./plasma-workspace/0001-startkde-NixOS-patches.patch;
-          inherit (scope) bash gnused gnugrep socat;
-          inherit (scope) kconfig kinit kservice;
-          inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
-          qt5tools = scope.qt5tools;
-          dbus_tools = scope.dbus.tools;
-        })
-      ];
+      patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ];
       buildInputs = with scope.xlibs; [ libSM libXcursor scope.pam ];
+
+      inherit (scope) bash gnused gnugrep socat;
+      inherit (scope) kconfig kinit kservice qt5tools;
+      inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
+      dbus_tools = scope.dbus.tools;
       postPatch = ''
         substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
           --replace kdostartupconfig5 $out/bin/kdostartupconfig5
-      '';
-      preConfigure = ''
-        substituteInPlace startkde/startkde.cmake \
-          --subst-var-by plasmaWorkspace "$out"
+        substituteAllInPlace startkde/startkde.cmake
       '';
     };
 

From 9899ce476d9a220c0976386027dbe76fd9611973 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 19 Jun 2015 10:16:47 -0500
Subject: [PATCH 1595/2322] plasma53: build bluedevil

---
 pkgs/desktops/plasma-5.3/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index 15fd9e071e8..16dcbc5878a 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -118,7 +118,7 @@ let
       usb = libusb;
     });
 
-  self = (builtins.removeAttrs super ["bluedevil"]) // {
+  self = super // {
 
     bluez-qt = overrideDerivation super.bluez-qt (drv: {
       preConfigure = ''

From 2faa29d12911ae104408991b85adfb8b9b2bd567 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 19 Jun 2015 15:36:07 -0500
Subject: [PATCH 1596/2322] plasma53.plasma-workspace: fix path to
 kapplymousetheme

---
 pkgs/desktops/plasma-5.3/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index 16dcbc5878a..de5fe5ec98d 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -12,21 +12,23 @@
 #  make a copy of this directory first. After copying, be sure to delete ./tmp
 #  if it exists. Then follow the minor update instructions.
 
-{ pkgs, newScope, kf5 ? null, qt5 ? null, debug ? false }:
+{ pkgs, newScope, kdeApps ? null, kf5 ? null, qt5 ? null, debug ? false }:
 
 let inherit (pkgs) autonix stdenv symlinkJoin; in
 
 with autonix; let inherit (stdenv) lib; in
 
 let
+  kdeApps_ = if kdeApps != null then kdeApps else pkgs.kdeApps_15_04;
   kf5_ = if kf5 != null then kf5 else pkgs.kf510;
   qt5_ = if qt5 != null then qt5 else pkgs.qt54;
 in
 
 let
 
-  qt5 = qt5_;
+  kdeApps = kdeApps_.override { inherit debug kf5 qt5; plasma5 = self; };
   kf5 = kf5_.override { inherit debug qt5; };
+  qt5 = qt5_;
 
   kdePackage = name: pkg:
     let defaultOverride = drv: drv // {
@@ -113,6 +115,7 @@ let
       mobilebroadbandproviderinfo = mobile_broadband_provider_info;
       mtp = libmtp;
       pulseaudio = libpulseaudio;
+      qalculate = libqalculate;
       shareddesktopontologies = shared_desktop_ontologies;
       sharedmimeinfo = shared_mime_info;
       usb = libusb;
@@ -213,6 +216,7 @@ let
       inherit (scope) kconfig kinit kservice qt5tools;
       inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
       dbus_tools = scope.dbus.tools;
+      kde_workspace = kdeApps.kde-workspace;
       postPatch = ''
         substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
           --replace kdostartupconfig5 $out/bin/kdostartupconfig5

From fa9ed761228ccdb2359890b8805a135f9b0f845e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 24 Jun 2015 07:55:33 -0500
Subject: [PATCH 1597/2322] qt54: regenerate manifest

---
 .../libraries/qt-5/5.4/default.nix            |  11 +-
 .../libraries/qt-5/5.4/manifest.json          | 301 ++++++++++++++++++
 .../libraries/qt-5/5.4/manifest.nix           | 274 ----------------
 .../libraries/qt-5/5.4/manifest.sh            |  18 +-
 4 files changed, 315 insertions(+), 289 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.4/manifest.json
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/manifest.nix

diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
index 139bba2db89..5862fb6708d 100644
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/default.nix
@@ -27,9 +27,14 @@ with autonix;
 with stdenv.lib;
 
 let
-  manifest =
-    importManifest ./manifest.nix { mirror = "http://download.qt.io"; };
-  srcs = mapAttrs (name: manifest: manifest.src) manifest;
+  srcs =
+    let
+      manifest = builtins.fromJSON (builtins.readFile ./manifest.json);
+      mirror = "http://download.qt.io";
+      fetch = src: fetchurl (src // { url = "${mirror}/${src.url}"; });
+      mkPair = pkg: nameValuePair (builtins.parseDrvName pkg.name).name (fetch pkg.src);
+      pairs = map mkPair manifest;
+    in listToAttrs pairs;
 
   version = "5.4.2";
 
diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.json b/pkgs/development/libraries/qt-5/5.4/manifest.json
new file mode 100644
index 00000000000..83dedb41706
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.4/manifest.json
@@ -0,0 +1,301 @@
+[
+  {
+    "name": "qtbase-opensource-src-5.4.2",
+    "store": "/nix/store/60xy2xnsl5kwraqkgh8d950nj1pk3kmi-qtbase-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz",
+      "sha256": "0x2szpjjvsrpcqw0dd3gsim7b1jv9p716pnllzjbia5mp0hggi4z",
+      "name": "qtbase-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtenginio-opensource-src-5.4.2",
+    "store": "/nix/store/4iprnq6sm0b1pnxmxb5krip7kk40xqmr-qtenginio-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtenginio-opensource-src-5.4.2.tar.xz",
+      "sha256": "082i3fapjw6xs0jkz7x529dn3pb6w1pfli3cjrgvggff86gwlgwn",
+      "name": "qtenginio-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtserialport-opensource-src-5.4.2",
+    "store": "/nix/store/l9k1v23ddnhjch5b2p3l28xbqkhz63yl-qtserialport-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtserialport-opensource-src-5.4.2.tar.xz",
+      "sha256": "1h6p5rb0ldxgzd4md3n79gy0j9blhj736670xqjd9vlvh1743kck",
+      "name": "qtserialport-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtscript-opensource-src-5.4.2",
+    "store": "/nix/store/n4ixnakw3fiflyimshkp43h7ijlpiif6-qtscript-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtscript-opensource-src-5.4.2.tar.xz",
+      "sha256": "0izsmy0cr8iii78r10ndkidyljxqd2k9g03f5xb9nxacvr2f8hp0",
+      "name": "qtscript-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwebchannel-opensource-src-5.4.2",
+    "store": "/nix/store/qbkqkn4ck0fqbndl9fzp7iaz6c475xq8-qtwebchannel-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebchannel-opensource-src-5.4.2.tar.xz",
+      "sha256": "0vy1zjbghfa1wirxd8fd2n2n8yryykzr09913qm2nlfbcxdsgqsn",
+      "name": "qtwebchannel-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwinextras-opensource-src-5.4.2",
+    "store": "/nix/store/9kmig3lg8d8s5r1jl3xj5q3jrkp3p8sx-qtwinextras-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwinextras-opensource-src-5.4.2.tar.xz",
+      "sha256": "0sgybvr1y2xsddlqc95ninxj3rfmd4gv7a8f7rqcxdynjan5gij0",
+      "name": "qtwinextras-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwebsockets-opensource-src-5.4.2",
+    "store": "/nix/store/zk4s5pgp3mh6xdq6z3svi305vn0pli27-qtwebsockets-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebsockets-opensource-src-5.4.2.tar.xz",
+      "sha256": "0lv1la8333qnirxmscs42xnnra0xry1gjbhi3bxrf1hrfs2im9j4",
+      "name": "qtwebsockets-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtmultimedia-opensource-src-5.4.2",
+    "store": "/nix/store/n8wpy6b8jw1rf51z1qhxbbym7j8rr8ay-qtmultimedia-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtmultimedia-opensource-src-5.4.2.tar.xz",
+      "sha256": "0h29cs8ajnjarhjx1aczdnxqwvg6pqs9s8w28hw488s149wqqrnj",
+      "name": "qtmultimedia-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtgraphicaleffects-opensource-src-5.4.2",
+    "store": "/nix/store/2q2vk530mf32zzd1v8bpax8iixviw6q5-qtgraphicaleffects-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtgraphicaleffects-opensource-src-5.4.2.tar.xz",
+      "sha256": "02p8xm5ajicjam30ry3g1lm2p4nja2q0sls8dzimqrxhw5xlg3xs",
+      "name": "qtgraphicaleffects-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtxmlpatterns-opensource-src-5.4.2",
+    "store": "/nix/store/3fqgpa668hb1xmwjw056cw58qzb3r0g4-qtxmlpatterns-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtxmlpatterns-opensource-src-5.4.2.tar.xz",
+      "sha256": "0ar7znqp1i02ha5ngy2kzk3hlgkafjbn2xa8j2k78gzmwsmdhzxa",
+      "name": "qtxmlpatterns-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qttranslations-opensource-src-5.4.2",
+    "store": "/nix/store/mg9b5z2nznzxrz501hm06b7l27jjwaca-qttranslations-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qttranslations-opensource-src-5.4.2.tar.xz",
+      "sha256": "0b4l69c16z8gjd4mq75zz3lj2gxarr9wyk0vk60jg1mi62vxvdls",
+      "name": "qttranslations-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtdeclarative-opensource-src-5.4.2",
+    "store": "/nix/store/bjmv4fgphx9bggzcwy4lcdas9phbwjsg-qtdeclarative-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtdeclarative-opensource-src-5.4.2.tar.xz",
+      "sha256": "1bj1wwms6lpj8s70y8by3j0hjsw6g9v8m6fybx68krzzizbj2c5p",
+      "name": "qtdeclarative-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwebkit-opensource-src-5.4.2",
+    "store": "/nix/store/pfhq8ask8jhzdh2x882d014b10ddywma-qtwebkit-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebkit-opensource-src-5.4.2.tar.xz",
+      "sha256": "0vffbpiczag2n2hp5gc0nii8n7vkidr8f8pp8a47px0183hl6hiy",
+      "name": "qtwebkit-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtquick1-opensource-src-5.4.2",
+    "store": "/nix/store/n807cxddkvhbzw3ciqs29zc5mw47z2qs-qtquick1-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtquick1-opensource-src-5.4.2.tar.xz",
+      "sha256": "0178z15a31fw3l6933fwxs7sk0csifpwckydp3rqnn3fg5f2fwvp",
+      "name": "qtquick1-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtquickcontrols-opensource-src-5.4.2",
+    "store": "/nix/store/gq8afk8zr2vrrsfmp4caqv02209qk9xb-qtquickcontrols-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtquickcontrols-opensource-src-5.4.2.tar.xz",
+      "sha256": "137z3c3drxlvkdfc7zgcl0xqmavw0ladzqy0i3bq51h756qdc877",
+      "name": "qtquickcontrols-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtimageformats-opensource-src-5.4.2",
+    "store": "/nix/store/cmpx0338z1j0wzk6scfpay5k10023d46-qtimageformats-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtimageformats-opensource-src-5.4.2.tar.xz",
+      "sha256": "1nny6j9pm5ri3n1vwl5lrfrdz0fl81rx127wa49rkg2rjai2aawb",
+      "name": "qtimageformats-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtdoc-opensource-src-5.4.2",
+    "store": "/nix/store/jv4wgs6pz9xqmin9m4q4mifr2vfcjn3h-qtdoc-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtdoc-opensource-src-5.4.2.tar.xz",
+      "sha256": "15lamv6jvd7v33ldpcrazcdksv6qibdcgh4ncbyh774k8avgrlh8",
+      "name": "qtdoc-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwayland-opensource-src-5.4.2",
+    "store": "/nix/store/qa3yi9lyx2dm4wqzb3qzvzba1sgnj74z-qtwayland-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwayland-opensource-src-5.4.2.tar.xz",
+      "sha256": "14pmpkfq70plw07igxjaiji4vnjg5kg7izlb0wwym1lisg7bwkg0",
+      "name": "qtwayland-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtmacextras-opensource-src-5.4.2",
+    "store": "/nix/store/wdq1z3bzr9n11yln8avx10sgzgyvp8cl-qtmacextras-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtmacextras-opensource-src-5.4.2.tar.xz",
+      "sha256": "0h0p3s0rvd3g9rgr4hwcggdbsav2g30vijqwmdxgxd8c00yply80",
+      "name": "qtmacextras-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtactiveqt-opensource-src-5.4.2",
+    "store": "/nix/store/0ik7vc3zwdjvrp4fpyqf1zpyqdxvvqvq-qtactiveqt-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtactiveqt-opensource-src-5.4.2.tar.xz",
+      "sha256": "014kwficqydciwdm1yw88yms81qm8pmi6xfhhfpbc9k85pc6jlla",
+      "name": "qtactiveqt-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtlocation-opensource-src-5.4.2",
+    "store": "/nix/store/sa4dawsw2wv45ld3afbz9nfc64qkyx1s-qtlocation-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtlocation-opensource-src-5.4.2.tar.xz",
+      "sha256": "1v43hl2zzi90vaw11y8dvsksrjn0r2v0br7pw6njl8lqadpg4jnw",
+      "name": "qtlocation-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtconnectivity-opensource-src-5.4.2",
+    "store": "/nix/store/v2aiscvf582azyzg696rglway56l7xl2-qtconnectivity-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtconnectivity-opensource-src-5.4.2.tar.xz",
+      "sha256": "1nj68bzgm3r1gg171kj0acnifzb3jx0m5pf4f81xb7zl4hfxasrs",
+      "name": "qtconnectivity-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtx11extras-opensource-src-5.4.2",
+    "store": "/nix/store/nz62qld9h96z5a0b7fg52fsh5d6q0kqw-qtx11extras-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtx11extras-opensource-src-5.4.2.tar.xz",
+      "sha256": "0jgyywjxavfpiz8202g3s0g9izfl185mmak4fs9h80w1i3gn5zzn",
+      "name": "qtx11extras-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qttools-opensource-src-5.4.2",
+    "store": "/nix/store/i8n6xrhalg3z4i0min4w79rq9h9hch0x-qttools-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz",
+      "sha256": "1d5nx01r7wxhdg9f1i9xhsvsbwgaz3yv516s068riy970bhdgwzd",
+      "name": "qttools-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtsensors-opensource-src-5.4.2",
+    "store": "/nix/store/0ar28gp8klqxynjnc1r4kj9x7g8cknk2-qtsensors-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtsensors-opensource-src-5.4.2.tar.xz",
+      "sha256": "1yawvjbdymgw8af7ir9zcin89xxck9dm2l6hnc43lwrky0frcvcf",
+      "name": "qtsensors-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwebengine-opensource-src-5.4.2",
+    "store": "/nix/store/ikr8cc3bn62jlv9afpzhxvqs5qhsc2yc-qtwebengine-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebengine-opensource-src-5.4.2.tar.xz",
+      "sha256": "06cyl733prakniqrn8sd807lclk5im2vmysjdcijry2mcyah2ih8",
+      "name": "qtwebengine-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtsvg-opensource-src-5.4.2",
+    "store": "/nix/store/0llm31zpiaqig940a8dsp1dk2npxsnjc-qtsvg-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtsvg-opensource-src-5.4.2.tar.xz",
+      "sha256": "1dsyncp154xvb7d82nmnfjm0ngymnhqmliq58ljwxsjmpjlncakz",
+      "name": "qtsvg-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qt5-opensource-src-5.4.2",
+    "store": "/nix/store/0jrx1clg8vqid9b2n9z8f0xbwjm0yynr-qt5-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qt5-opensource-src-5.4.2.tar.xz",
+      "sha256": "17a0pybr4bpyv9pj7cr5hl4g31biv89bjr8zql723h0b12ql1w44",
+      "name": "qt5-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtwebkit-examples-opensource-src-5.4.2",
+    "store": "/nix/store/6pmmi9bjbdxkbw2xkkc1srk5ambnjcxv-qtwebkit-examples-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtwebkit-examples-opensource-src-5.4.2.tar.xz",
+      "sha256": "0pm9ik1j09jfb5xflc16449nff2xsfyfms7vxlcdjg4dhcqfmll8",
+      "name": "qtwebkit-examples-opensource-src-5.4.2.tar.xz"
+    }
+  }
+,
+  {
+    "name": "qtandroidextras-opensource-src-5.4.2",
+    "store": "/nix/store/grrsklibvplaj5pdwjp2zirxmqnq10hf-qtandroidextras-opensource-src-5.4.2.tar.xz",
+    "src": {
+      "url": "official_releases/qt/5.4/5.4.2/submodules/qtandroidextras-opensource-src-5.4.2.tar.xz",
+      "sha256": "0krfm0wg26x7575p8isswdhrkb0jxyp169grwklil7mfw8yg3xhx",
+      "name": "qtandroidextras-opensource-src-5.4.2.tar.xz"
+    }
+  }
+]
diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.nix b/pkgs/development/libraries/qt-5/5.4/manifest.nix
deleted file mode 100644
index 5fdda35f76a..00000000000
--- a/pkgs/development/libraries/qt-5/5.4/manifest.nix
+++ /dev/null
@@ -1,274 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
-[
-  {
-    name = stdenv.lib.nameFromURL "qtbase-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/60xy2xnsl5kwraqkgh8d950nj1pk3kmi-qtbase-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz";
-      sha256 = "0x2szpjjvsrpcqw0dd3gsim7b1jv9p716pnllzjbia5mp0hggi4z";
-      name = "qtbase-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtenginio-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/4iprnq6sm0b1pnxmxb5krip7kk40xqmr-qtenginio-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtenginio-opensource-src-5.4.2.tar.xz";
-      sha256 = "082i3fapjw6xs0jkz7x529dn3pb6w1pfli3cjrgvggff86gwlgwn";
-      name = "qtenginio-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtserialport-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/l9k1v23ddnhjch5b2p3l28xbqkhz63yl-qtserialport-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtserialport-opensource-src-5.4.2.tar.xz";
-      sha256 = "1h6p5rb0ldxgzd4md3n79gy0j9blhj736670xqjd9vlvh1743kck";
-      name = "qtserialport-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtscript-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/n4ixnakw3fiflyimshkp43h7ijlpiif6-qtscript-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtscript-opensource-src-5.4.2.tar.xz";
-      sha256 = "0izsmy0cr8iii78r10ndkidyljxqd2k9g03f5xb9nxacvr2f8hp0";
-      name = "qtscript-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwebchannel-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/qbkqkn4ck0fqbndl9fzp7iaz6c475xq8-qtwebchannel-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebchannel-opensource-src-5.4.2.tar.xz";
-      sha256 = "0vy1zjbghfa1wirxd8fd2n2n8yryykzr09913qm2nlfbcxdsgqsn";
-      name = "qtwebchannel-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwinextras-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/9kmig3lg8d8s5r1jl3xj5q3jrkp3p8sx-qtwinextras-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwinextras-opensource-src-5.4.2.tar.xz";
-      sha256 = "0sgybvr1y2xsddlqc95ninxj3rfmd4gv7a8f7rqcxdynjan5gij0";
-      name = "qtwinextras-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwebsockets-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/zk4s5pgp3mh6xdq6z3svi305vn0pli27-qtwebsockets-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebsockets-opensource-src-5.4.2.tar.xz";
-      sha256 = "0lv1la8333qnirxmscs42xnnra0xry1gjbhi3bxrf1hrfs2im9j4";
-      name = "qtwebsockets-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtmultimedia-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/n8wpy6b8jw1rf51z1qhxbbym7j8rr8ay-qtmultimedia-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtmultimedia-opensource-src-5.4.2.tar.xz";
-      sha256 = "0h29cs8ajnjarhjx1aczdnxqwvg6pqs9s8w28hw488s149wqqrnj";
-      name = "qtmultimedia-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtgraphicaleffects-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/2q2vk530mf32zzd1v8bpax8iixviw6q5-qtgraphicaleffects-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtgraphicaleffects-opensource-src-5.4.2.tar.xz";
-      sha256 = "02p8xm5ajicjam30ry3g1lm2p4nja2q0sls8dzimqrxhw5xlg3xs";
-      name = "qtgraphicaleffects-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtxmlpatterns-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/3fqgpa668hb1xmwjw056cw58qzb3r0g4-qtxmlpatterns-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtxmlpatterns-opensource-src-5.4.2.tar.xz";
-      sha256 = "0ar7znqp1i02ha5ngy2kzk3hlgkafjbn2xa8j2k78gzmwsmdhzxa";
-      name = "qtxmlpatterns-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qttranslations-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/mg9b5z2nznzxrz501hm06b7l27jjwaca-qttranslations-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qttranslations-opensource-src-5.4.2.tar.xz";
-      sha256 = "0b4l69c16z8gjd4mq75zz3lj2gxarr9wyk0vk60jg1mi62vxvdls";
-      name = "qttranslations-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtdeclarative-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/bjmv4fgphx9bggzcwy4lcdas9phbwjsg-qtdeclarative-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtdeclarative-opensource-src-5.4.2.tar.xz";
-      sha256 = "1bj1wwms6lpj8s70y8by3j0hjsw6g9v8m6fybx68krzzizbj2c5p";
-      name = "qtdeclarative-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwebkit-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/pfhq8ask8jhzdh2x882d014b10ddywma-qtwebkit-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-opensource-src-5.4.2.tar.xz";
-      sha256 = "0vffbpiczag2n2hp5gc0nii8n7vkidr8f8pp8a47px0183hl6hiy";
-      name = "qtwebkit-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtquick1-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/n807cxddkvhbzw3ciqs29zc5mw47z2qs-qtquick1-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtquick1-opensource-src-5.4.2.tar.xz";
-      sha256 = "0178z15a31fw3l6933fwxs7sk0csifpwckydp3rqnn3fg5f2fwvp";
-      name = "qtquick1-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtquickcontrols-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/gq8afk8zr2vrrsfmp4caqv02209qk9xb-qtquickcontrols-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtquickcontrols-opensource-src-5.4.2.tar.xz";
-      sha256 = "137z3c3drxlvkdfc7zgcl0xqmavw0ladzqy0i3bq51h756qdc877";
-      name = "qtquickcontrols-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtimageformats-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/cmpx0338z1j0wzk6scfpay5k10023d46-qtimageformats-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtimageformats-opensource-src-5.4.2.tar.xz";
-      sha256 = "1nny6j9pm5ri3n1vwl5lrfrdz0fl81rx127wa49rkg2rjai2aawb";
-      name = "qtimageformats-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtdoc-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/jv4wgs6pz9xqmin9m4q4mifr2vfcjn3h-qtdoc-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtdoc-opensource-src-5.4.2.tar.xz";
-      sha256 = "15lamv6jvd7v33ldpcrazcdksv6qibdcgh4ncbyh774k8avgrlh8";
-      name = "qtdoc-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwayland-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/qa3yi9lyx2dm4wqzb3qzvzba1sgnj74z-qtwayland-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwayland-opensource-src-5.4.2.tar.xz";
-      sha256 = "14pmpkfq70plw07igxjaiji4vnjg5kg7izlb0wwym1lisg7bwkg0";
-      name = "qtwayland-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtmacextras-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/wdq1z3bzr9n11yln8avx10sgzgyvp8cl-qtmacextras-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtmacextras-opensource-src-5.4.2.tar.xz";
-      sha256 = "0h0p3s0rvd3g9rgr4hwcggdbsav2g30vijqwmdxgxd8c00yply80";
-      name = "qtmacextras-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtactiveqt-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/0ik7vc3zwdjvrp4fpyqf1zpyqdxvvqvq-qtactiveqt-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtactiveqt-opensource-src-5.4.2.tar.xz";
-      sha256 = "014kwficqydciwdm1yw88yms81qm8pmi6xfhhfpbc9k85pc6jlla";
-      name = "qtactiveqt-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtlocation-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/sa4dawsw2wv45ld3afbz9nfc64qkyx1s-qtlocation-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtlocation-opensource-src-5.4.2.tar.xz";
-      sha256 = "1v43hl2zzi90vaw11y8dvsksrjn0r2v0br7pw6njl8lqadpg4jnw";
-      name = "qtlocation-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtconnectivity-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/v2aiscvf582azyzg696rglway56l7xl2-qtconnectivity-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtconnectivity-opensource-src-5.4.2.tar.xz";
-      sha256 = "1nj68bzgm3r1gg171kj0acnifzb3jx0m5pf4f81xb7zl4hfxasrs";
-      name = "qtconnectivity-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtx11extras-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/nz62qld9h96z5a0b7fg52fsh5d6q0kqw-qtx11extras-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtx11extras-opensource-src-5.4.2.tar.xz";
-      sha256 = "0jgyywjxavfpiz8202g3s0g9izfl185mmak4fs9h80w1i3gn5zzn";
-      name = "qtx11extras-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qttools-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/i8n6xrhalg3z4i0min4w79rq9h9hch0x-qttools-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz";
-      sha256 = "1d5nx01r7wxhdg9f1i9xhsvsbwgaz3yv516s068riy970bhdgwzd";
-      name = "qttools-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtsensors-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/0ar28gp8klqxynjnc1r4kj9x7g8cknk2-qtsensors-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtsensors-opensource-src-5.4.2.tar.xz";
-      sha256 = "1yawvjbdymgw8af7ir9zcin89xxck9dm2l6hnc43lwrky0frcvcf";
-      name = "qtsensors-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwebengine-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/ikr8cc3bn62jlv9afpzhxvqs5qhsc2yc-qtwebengine-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebengine-opensource-src-5.4.2.tar.xz";
-      sha256 = "06cyl733prakniqrn8sd807lclk5im2vmysjdcijry2mcyah2ih8";
-      name = "qtwebengine-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtsvg-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/0llm31zpiaqig940a8dsp1dk2npxsnjc-qtsvg-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtsvg-opensource-src-5.4.2.tar.xz";
-      sha256 = "1dsyncp154xvb7d82nmnfjm0ngymnhqmliq58ljwxsjmpjlncakz";
-      name = "qtsvg-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qt5-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/0jrx1clg8vqid9b2n9z8f0xbwjm0yynr-qt5-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qt5-opensource-src-5.4.2.tar.xz";
-      sha256 = "17a0pybr4bpyv9pj7cr5hl4g31biv89bjr8zql723h0b12ql1w44";
-      name = "qt5-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtwebkit-examples-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/6pmmi9bjbdxkbw2xkkc1srk5ambnjcxv-qtwebkit-examples-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-examples-opensource-src-5.4.2.tar.xz";
-      sha256 = "0pm9ik1j09jfb5xflc16449nff2xsfyfms7vxlcdjg4dhcqfmll8";
-      name = "qtwebkit-examples-opensource-src-5.4.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "qtandroidextras-opensource-src-5.4.2.tar.xz" ".tar";
-    store = "/nix/store/grrsklibvplaj5pdwjp2zirxmqnq10hf-qtandroidextras-opensource-src-5.4.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtandroidextras-opensource-src-5.4.2.tar.xz";
-      sha256 = "0krfm0wg26x7575p8isswdhrkb0jxyp169grwklil7mfw8yg3xhx";
-      name = "qtandroidextras-opensource-src-5.4.2.tar.xz";
-    };
-  }
-]
diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.sh b/pkgs/development/libraries/qt-5/5.4/manifest.sh
index d4441cecbb3..780269a6417 100755
--- a/pkgs/development/libraries/qt-5/5.4/manifest.sh
+++ b/pkgs/development/libraries/qt-5/5.4/manifest.sh
@@ -1,15 +1,9 @@
 #!/bin/sh
 
-if [ $# -eq 0 ]; then
+set -x
 
-  # The extra slash at the end of the URL is necessary to stop wget
-  # from recursing over the whole server! (No, it's not a bug.)
-  $(nix-build ../../../../.. -A autonix.manifest) \
-    http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/ \
-      -A '*.tar.xz'
-
-else
-
-  $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
-
-fi
+# The extra slash at the end of the URL is necessary to stop wget
+# from recursing over the whole server! (No, it's not a bug.)
+$(nix-build ../../../../.. --no-out-link -A autonix.manifest) \
+  http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/ \
+    -A '*.tar.xz'

From 09a53440f172d911e93f4537cf0a89f595c7c8a8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 24 Jun 2015 07:57:45 -0500
Subject: [PATCH 1598/2322] qt54: don't propagate build inputs

This disables propagated of Qt 5 build inputs at the request of
@edolstra. If this breaks your build, you need to add the missing
dependencies yourself. If this breaks your package at runtime, you need
to wrap your package to set either the plugin path or the QML import
path.
---
 pkgs/development/libraries/qt-5/5.4/setup-hook.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
index 8ab4071becf..af581f033ba 100644
--- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
@@ -24,12 +24,6 @@ addQtModule() {
             @lndir@/bin/lndir -silent "$1/lib" "$qtOut/lib"
             find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs"
         fi
-
-        propagatedBuildInputs+=" $1"
-    fi
-
-    if [[ -d "$1/lib/qt5/qml" ]] || [[ -d "$1/lib/qt5/plugins" ]] || [[ -d "$1/lib/qt5/imports" ]]; then
-        propagatedUserEnvPkgs+=" $1"
     fi
 }
 

From 6c1d645bd0f0ea37995a2e2d8e8202cf0f434348 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 24 Jun 2015 17:27:36 -0500
Subject: [PATCH 1599/2322] kde5: propagate plugin and QML dependencies

---
 pkgs/applications/kde-apps-15.04/default.nix  | 10 +++++++++
 pkgs/desktops/plasma-5.3/default.nix          | 21 +++++++++++++++++++
 .../libraries/kde-frameworks-5.10/default.nix | 12 ++++++++++-
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 7910046d774..5c36b735338 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -112,6 +112,16 @@ let
           "pythoninterp"
         ];
         user = [
+          "qt5"
+          "qt5core"
+          "qt5dbus"
+          "qt5gui"
+          "qt5qml"
+          "qt5quick"
+          "qt5svg"
+          "qt5webkitwidgets"
+          "qt5widgets"
+          "qt5x11extras"
           "shareddesktopontologies"
           "sharedmimeinfo"
         ];
diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index de5fe5ec98d..c9e26f7264c 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -73,6 +73,16 @@ let
           "pythoninterp"
         ];
         user = [
+          "qt5"
+          "qt5core"
+          "qt5dbus"
+          "qt5gui"
+          "qt5qml"
+          "qt5quick"
+          "qt5svg"
+          "qt5webkitwidgets"
+          "qt5widgets"
+          "qt5x11extras"
           "shareddesktopontologies"
           "sharedmimeinfo"
         ];
@@ -97,9 +107,20 @@ let
       phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
       polkitqt5-1 = pkgs.polkit_qt5.override { inherit qt5; };
       poppler_qt5 = pkgs.poppler_qt5.override { inherit qt5; };
+      qt5 = qt5.base;
+      qt5core = qt5.base;
+      qt5dbus = qt5.base;
+      qt5gui = qt5.base;
+      qt5linguisttools = qt5.tools;
+      qt5qml = [qt5.declarative qt5.graphicaleffects];
+      qt5quick = [qt5.quickcontrols qt5.graphicaleffects];
       qt5script = qt5.script;
+      qt5svg = qt5.svg;
       qt5tools = qt5.tools;
+      qt5webkitwidgets = qt5.webkit;
+      qt5widgets = qt5.base;
       qt5x11extras = qt5.x11extras;
+      qt5xmlpatterns = qt5.xmlpatterns;
     } //
     # packages from nixpkgs
     (with pkgs; {
diff --git a/pkgs/development/libraries/kde-frameworks-5.10/default.nix b/pkgs/development/libraries/kde-frameworks-5.10/default.nix
index b473a3453f3..d5bb3f78ce8 100644
--- a/pkgs/development/libraries/kde-frameworks-5.10/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.10/default.nix
@@ -44,6 +44,16 @@ let
           "pythoninterp"
         ];
         user = [
+          "qt5"
+          "qt5core"
+          "qt5dbus"
+          "qt5gui"
+          "qt5qml"
+          "qt5quick"
+          "qt5svg"
+          "qt5webkitwidgets"
+          "qt5widgets"
+          "qt5x11extras"
           "shareddesktopontologies"
           "sharedmimeinfo"
         ];
@@ -84,6 +94,7 @@ let
     self //
     # packages pinned to this version of Qt 5
     {
+      dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
       phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
       polkit_qt5 = pkgs.polkit_qt5.override { inherit qt5; };
       qt5 = qt5.base;
@@ -99,7 +110,6 @@ let
       qt5widgets = qt5.base;
       qt5x11extras = qt5.x11extras;
       qt5xmlpatterns = qt5.xmlpatterns;
-      dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
     } //
     # packages from the nixpkgs collection
     (with pkgs;

From 9e1704c1bb704ed27645f914d917c40d3a88eb94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 25 Jun 2015 16:12:01 +0200
Subject: [PATCH 1600/2322] file: add another mirror (macports, fixes #8500)

---
 pkgs/tools/misc/file/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 2cf8d50bbe5..26df6b3b22a 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -6,7 +6,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib ];
 
   src = fetchurl {
-    url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz";
+    urls = [
+      "ftp://ftp.astron.com/pub/file/${name}.tar.gz"
+      "http://distfiles.macports.org/file/${name}.tar.gz"
+    ];
     sha256 = "02zw14hw3gqlw91w2f2snbirvyrp7r83irvnnkjcb25q9kjaiqy4";
   };
 

From 011993c86abf2742237da0d41ac23e02149a61be Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Thu, 25 Jun 2015 16:21:14 +0200
Subject: [PATCH 1601/2322] wordpress: usability updates

---
 .../web-servers/apache-httpd/wordpress.nix    | 120 ++++++++++++------
 1 file changed, 84 insertions(+), 36 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
index 01b6cfc62af..df099754b54 100644
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -1,22 +1,12 @@
 { config, lib, pkgs, serverInfo, php, ... }:
+# http://codex.wordpress.org/Hardening_WordPress
 
 with lib;
 
 let
-  # https://wordpress.org/plugins/postgresql-for-wordpress/
-  # Wordpress plugin 'postgresql-for-wordpress' installation example
-  postgresqlForWordpressPlugin = pkgs.stdenv.mkDerivation {
-    name = "postgresql-for-wordpress-plugin";
-    # Download the theme from the wordpress site
-    src = pkgs.fetchurl {
-      url = https://downloads.wordpress.org/plugin/postgresql-for-wordpress.1.3.1.zip;
-      sha256 = "f11a5d76af884c7bec2bc653ed5bd29d3ede9a8657bd67ab7824e329e5d809e8";
-    };
-    # We need unzip to build this package
-    buildInputs = [ pkgs.unzip ];
-    # Installing simply means copying all files to the output directory
-    installPhase = "mkdir -p $out; cp -R * $out/";
-  };
+
+  version = "4.2";
+  fullversion = "${version}.2";
 
   # Our bare-bones wp-config.php file using the above settings
   wordpressConfig = pkgs.writeText "wp-config.php" ''
@@ -38,38 +28,88 @@ let
     <IfModule mod_rewrite.c>
     RewriteEngine On
     RewriteBase /
-    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteCond %{REQUEST_FILENAME} !-d
-    RewriteRule . /index.php [L]
+    RewriteRule ^index\.php$ - [L]
+
+    # add a trailing slash to /wp-admin
+    RewriteRule ^wp-admin$ wp-admin/ [R=301,L]
+
+    RewriteCond %{REQUEST_FILENAME} -f [OR]
+    RewriteCond %{REQUEST_FILENAME} -d
+    RewriteRule ^ - [L]
+    RewriteRule ^(wp-(content|admin|includes).*) $1 [L]
+    RewriteRule ^(.*\.php)$ $1 [L]
+    RewriteRule . index.php [L]
     </IfModule>
   '';
 
+  # WP translation can be found here:
+  #   https://make.wordpress.org/polyglots/teams/
+  # FIXME: 
+  #  - add all these languages: 
+  #    sq ar az eu bs bg ca zh-cn zh-tw hr da nl en-au 
+  #    en-ca en-gb eo fi fr gl de el he hu is id it ja 
+  #    ko lt nb nn oci pl pt-br pt ro ru sr sk es-mx es 
+  #    sv th tr uk cy
+  #  - cache the files on github.com/qknight/WordpressLanguages and use fetchFromGithub instead
+  #    note: this implementation of supportedLanguages will only work for me (qknight) as i'm using nix-prefetch-url
+  #          as the sha256 changes like every download. 
+  # note: this is also true for plugins and themes but these are controlled not from withing wordpress.nix
+  supportedLanguages = {
+    en_GB = "1yf1sb6ji3l4lg8nkkjhckbwl81jly8z93jf06pvk6a1p6bsr6l6";
+    de_DE = "3881221f337799b88f9562df8b3f1560f2c49a8f662297561a5b25ce77f22e17";
+  };
+
+  downloadLanguagePack = language: sha256:
+    pkgs.stdenv.mkDerivation rec {
+      name = "wp_${language}-${version}";
+      src = pkgs.fetchurl {
+        url = "https://downloads.wordpress.org/translation/core/${version}/${language}.zip";
+        sha256 = "${sha256}";
+      };
+      buildInputs = [ pkgs.unzip ];
+      unpackPhase = ''
+        unzip $src
+        export sourceRoot=.
+      '';
+      installPhase = "mkdir -p $out; cp -R * $out/";
+    };
+
+  selectedLanguages = map (lang: downloadLanguagePack lang supportedLanguages.${lang}) (config.languages);
+
   # The wordpress package itself
   wordpressRoot = pkgs.stdenv.mkDerivation rec {
     name = "wordpress";
-    # Fetch directly from the wordpress site, want to upgrade?
-    # Just change the version URL and update the hash
-    src = pkgs.fetchurl {
-      url = http://wordpress.org/wordpress-4.1.1.tar.gz;
-      sha256 = "1s9y0i9ms3m6dswb9gqrr95plnx6imahc07fyhvrp5g35f6c12k1";
+    src = pkgs.fetchFromGitHub {
+      owner = "WordPress";
+      repo = "WordPress";
+      rev = "${fullversion}";
+      sha256 = "0gq1j9b0d0rykql3jzdb2yn4adj0rrcsvqrmj3dzx11ir57ilsgc";
     };
     installPhase = ''
       mkdir -p $out
-      # Copy all the wordpress files we downloaded
+      # copy all the wordpress files we downloaded
       cp -R * $out/
-      # We'll symlink the wordpress config
+
+      # symlink the wordpress config
       ln -s ${wordpressConfig} $out/wp-config.php
-      # As well as our custom .htaccess
+      # symlink custom .htaccess
       ln -s ${htaccess} $out/.htaccess
-      # And the uploads directory
+      # symlink uploads directory
       ln -s ${config.wordpressUploads} $out/wp-content/uploads
-      # And the theme(s)
+
+      # remove bundled plugins(s) coming with wordpress
+      rm -Rf $out/wp-content/plugins/*
+      # remove bundled themes(s) coming with wordpress
+      rm -Rf $out/wp-content/themes/*
+
+      # symlink additional theme(s)
       ${concatMapStrings (theme: "ln -s ${theme} $out/wp-content/themes/${theme.name}\n") config.themes}
-      # And the plugin(s)
-      # remove bundled plugin(s) coming with wordpress
-      rm -Rf $out/wp-content/plugins/akismet
-      # install plugins
-      ${concatMapStrings (plugin: "ln -s ${plugin} $out/wp-content/plugins/${plugin.name}\n") (config.plugins ++ [ postgresqlForWordpressPlugin]) }
+      # symlink additional plugin(s)
+      ${concatMapStrings (plugin: "ln -s ${plugin} $out/wp-content/plugins/${plugin.name}\n") (config.plugins) }
+
+      # symlink additional translation(s) 
+      mkdir -p $out/wp-content/languages
+      ${concatMapStrings (language: "ln -s ${language}/*.mo ${language}/*.po $out/wp-content/languages/\n") (selectedLanguages) }
     '';
   };
 
@@ -102,12 +142,12 @@ in
     };
     dbUser = mkOption {
       default = "wordpress";
-      description = "The dbUser, read the username, for the database.";
+      description = "The dbUser, read: the username, for the database.";
       example = "wordpress";
     };
     dbPassword = mkOption {
       default = "wordpress";
-      description = "The password to the respective dbUser.";
+      description = "The mysql password to the respective dbUser.";
       example = "wordpress";
     };
     tablePrefix = mkOption {
@@ -127,7 +167,7 @@ in
       type = types.listOf types.path;
       description =
         ''
-          List of path(s) to respective plugin(s) which are symlinked from the 'plugins' directory. Note: These plugins need to be packaged before use.
+          List of path(s) to respective plugin(s) which are symlinked from the 'plugins' directory. Note: These plugins need to be packaged before use, see example.
         '';
       example = ''
         # Wordpress plugin 'akismet' installation example
@@ -153,7 +193,7 @@ in
       type = types.listOf types.path;
       description =
         ''
-          List of path(s) to respective theme(s) which are symlinked from the 'theme' directory. Note: These themes need to be packaged before use.
+          List of path(s) to respective theme(s) which are symlinked from the 'theme' directory. Note: These themes need to be packaged before use, see example.
         '';
       example = ''
         # For shits and giggles, let's package the responsive theme
@@ -174,6 +214,11 @@ in
           themes = [ responsiveTheme ];
       '';
     };
+    languages = mkOption {
+          default = [];
+          description = "Installs wordpress language packs based on the list, see wordpress.nix for possible translations.";
+          example = "[ \"en_GB\" \"de_DE\" ];";
+    };
     extraConfig = mkOption {
       default = "";
       example =
@@ -198,12 +243,15 @@ in
     # we should use systemd dependencies here
     #waitForUnit("network-interfaces.target");
     if [ ! -d ${serverInfo.fullConfig.services.mysql.dataDir}/${config.dbName} ]; then
+      echo "Need to create the database '${config.dbName}' and grant permissions to user named '${config.dbUser}'."
       # Wait until MySQL is up
       while [ ! -e /var/run/mysql/mysqld.pid ]; do
         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}";'
+    else 
+      echo "Good, no need to do anything database related."
     fi
   '';
 }

From 7f54f99656de36558a6ca7d78f7e42411aa2163c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 25 Jun 2015 17:24:59 +0200
Subject: [PATCH 1602/2322] Don't build texLive in Hydra

It's way too big (texlive-core-2014 alone is > 1.5 GB).
---
 pkgs/tools/typesetting/tex/texlive/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                | 2 +-
 pkgs/top-level/release-lib.nix                 | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index b21c937e785..7e0a165ae89 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -1,6 +1,7 @@
 args : with args;
+
 rec {
-  src = fetchurl {
+  src = assert !config.inHydra or false; fetchurl {
     url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140926.35254.orig.tar.xz;
     sha256 = "1c39x059jhn5jsy6i9j3akjbkm1kmmzssy1jyi1aw20rl2vp86w3";
   };
@@ -147,5 +148,6 @@ rec {
     license     = stdenv.lib.licenses.gpl2;
     maintainers = with maintainers; [ lovek323 raskin jwiegley ];
     platforms   = platforms.unix;
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 696d10e4c88..3fe7ae37b21 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14703,7 +14703,7 @@ let
     inherit builderDefs zlib bzip2 ncurses libpng ed lesstif ruby potrace
       gd t1lib freetype icu perl expat curl xz pkgconfig zziplib texinfo
       libjpeg bison python fontconfig flex poppler libpaper graphite2
-      makeWrapper gmp mpfr xpdf;
+      makeWrapper gmp mpfr xpdf config;
     inherit (xlibs) libXaw libX11 xproto libXt libXpm
       libXmu libXext xextproto libSM libICE;
     ghostscript = ghostscriptX;
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 2f272ced4af..8c66964ba72 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -7,6 +7,7 @@ rec {
   # Ensure that we don't build packages marked as unfree.
   allPackages = args: packageSet (args // {
     config.allowUnfree = false;
+    config.inHydra = true;
   });
 
   pkgs = pkgsFor "x86_64-linux";

From bb10e48573ee9cd644fa7ecaf64ea5586b4ffc8d Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Thu, 25 Jun 2015 19:05:52 +0200
Subject: [PATCH 1603/2322] popcorntime: don't use pkgs in argument

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

diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
index ab22a30d866..0db56cc6fcd 100644
--- a/pkgs/applications/video/popcorntime/default.nix
+++ b/pkgs/applications/video/popcorntime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchurl, runCommand, makeWrapper, node_webkit ? pkgs.node_webkit_0_9
+{ stdenv, fetchurl, runCommand, makeWrapper, node_webkit_0_9
 }:
 
 let
@@ -22,7 +22,7 @@ let
     installPhase = ''
       mkdir -p $out
       cp -r *.so *.pak $out/
-      cat ${node_webkit}/bin/nw package.nw > $out/Popcorn-Time
+      cat ${node_webkit_0_9}/bin/nw package.nw > $out/Popcorn-Time
       chmod 555 $out/Popcorn-Time
     '';
   };

From f5f24dd95afd5603f495a3c64c5be42cad49c063 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 25 Jun 2015 21:56:42 +0200
Subject: [PATCH 1604/2322] gnome3: add glib to systemPackages

---
 pkgs/desktops/gnome-3/3.16/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 7387ee710d0..cc825f0cc6c 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -16,6 +16,7 @@ let
   corePackages = with gnome3; [
     pkgs.desktop_file_utils pkgs.ibus
     pkgs.shared_mime_info # for update-mime-database
+    glib # for gsettings
     gtk3 # for gtk-update-icon-cache
     glib_networking gvfs dconf gnome-backgrounds gnome_control_center
     gnome-menus gnome_settings_daemon gnome_shell

From 78d4f1dec6d19a56e0974e99da316d3a33babe71 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 19 Jun 2015 15:07:27 +0200
Subject: [PATCH 1605/2322] codeville: delete expression

Codeville is abandonware. The homepage returns 404, and the last release
is 8 years old ...
---
 .../version-management/codeville/0.8.0.nix    | 23 -------------------
 pkgs/top-level/all-packages.nix               |  5 ----
 2 files changed, 28 deletions(-)
 delete mode 100644 pkgs/applications/version-management/codeville/0.8.0.nix

diff --git a/pkgs/applications/version-management/codeville/0.8.0.nix b/pkgs/applications/version-management/codeville/0.8.0.nix
deleted file mode 100644
index 0c0f3c4c19c..00000000000
--- a/pkgs/applications/version-management/codeville/0.8.0.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-args : with args; 
-
-if (! python ? dbSupport) || (! python.dbSupport) then 
-  throw ''Python DB4 support is required for codeville.'' 
-else
-
-rec {
-  src = fetchurl {
-    url = http://codeville.org/download/Codeville-0.8.0.tar.gz;
-    sha256 = "1p8zc4ijwcwf5bxl34n8d44mlxk1zhbpca68r93ywxqkqm2aqz37";
-  };
-
-  buildInputs = [python makeWrapper];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["installPythonPackage" (makeManyWrappers ''$out/bin/*'' ''--prefix PYTHONPATH : $(toPythonPath $out)'')];
-      
-  name = "codeville-0.8.0";
-  meta = {
-    description = "RCS with powerful merge";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cf9fed11ae..b12e7208c41 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10673,11 +10673,6 @@ let
   codeblocks = callPackage ../applications/editors/codeblocks { };
   codeblocksFull = callPackage ../applications/editors/codeblocks { contribPlugins = true; };
 
-  codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) {
-    inherit makeWrapper;
-    python = pythonFull;
-  };
-
   comical = callPackage ../applications/graphics/comical { };
 
   conkeror = callPackage ../applications/networking/browsers/conkeror { };

From 94d79cc9bea20d11746f7c30c25ab53dae7299cd Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Thu, 25 Jun 2015 22:56:09 +0200
Subject: [PATCH 1606/2322] vigra: 0.9.0 -> 0.10.0

---
 pkgs/development/libraries/vigra/default.nix | 35 +++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 04bef5ef41c..28852fd97d6 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -1,28 +1,31 @@
-{ stdenv, fetchurl, cmake, libtiff, libpng, libjpeg, doxygen, python,
-  fftw, fftwSinglePrec, hdf5, boost, numpy }:
+{ stdenv, fetchurl, boost, cmake, doxygen, fftw, fftwSinglePrec, hdf5, ilmbase
+, libjpeg, libpng, libtiff, numpy, openexr, python }:
+
 stdenv.mkDerivation rec {
-  name = "vigra-1.9.0";
+  name = "vigra-${version}";
+  version = "1.10.0";
 
   src = fetchurl {
-    urls = [
-      "${meta.homepage}/${name}-src.tar.gz"
-      "${meta.homepage}-old-versions/${name}-src.tar.gz"
-      ];
-    sha256 = "00fg64da6dj9k42d90dz6y7x91xw1xqppcla14im74m4afswrgcg";
+    url = "https://github.com/ukoethe/vigra/archive/Version-${stdenv.lib.replaceChars ["."] ["-"] version}.tar.gz";
+    sha256 = "1y3yii8wnyz68n0mzcmjylwd6jchqa3l913v39l2zsd2rv5nyvs0";
   };
 
-  buildInputs = [ cmake fftw fftwSinglePrec libtiff libpng libjpeg python boost
-    numpy hdf5 ];
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
+  buildInputs = [ boost cmake fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng
+                  libtiff numpy openexr python ];
 
   preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\"";
-  cmakeFlags = stdenv.lib.optionals (stdenv.system == "x86_64-linux")
-      [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
 
-  meta = {
+  cmakeFlags = [ "-DWITH_OPENEXR=1" ]
+            ++ stdenv.lib.optionals (stdenv.system == "x86_64-linux")
+                  [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
+
+  meta = with stdenv.lib; {
     description = "Novel computer vision C++ library with customizable algorithms and data structures";
     homepage = http://hci.iwr.uni-heidelberg.de/vigra;
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.mit;
+    maintainers = [ maintainers.viric ];
+    platforms = platforms.linux;
   };
 }

From 715f78be7e5f4b6e14a4e7e26b74233684566303 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 25 Jun 2015 23:21:25 +0200
Subject: [PATCH 1607/2322] E prover: do not build the manual

---
 pkgs/applications/science/logic/eprover/default.nix | 10 +++-------
 pkgs/top-level/all-packages.nix                     |  8 +-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
index 35e70a4b0d7..bb0e34d45bc 100644
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, which, texLive }:
+{ stdenv, fetchurl, which }:
 let
   s = # Generated upstream information
   rec {
@@ -18,26 +18,22 @@ stdenv.mkDerivation {
     inherit (s) url sha256;
   };
 
-  buildInputs = [which texLive];
+  buildInputs = [ which ];
 
   preConfigure = "sed -e 's@^EXECPATH\\s.*@EXECPATH = '\$out'/bin@' -i Makefile.vars";
 
   buildPhase = "make install";
 
-  # HOME=. allows to build missing TeX formats
   installPhase = ''
     mkdir -p $out/bin
     make install
-    HOME=. make documentation
-    mkdir -p $out/share/doc
-    cp -r DOC $out/share/doc/EProver
     echo eproof -xAuto --tstp-in --tstp-out '"$@"' > $out/bin/eproof-tptp
     chmod a+x $out/bin/eproof-tptp
   '';
 
   meta = {
     inherit (s) version;
-    description = "E automated theorem prover";
+    description = "Automated theorem prover for full first-order logic with equality";
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fe7ae37b21..e5f03b68bb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14159,13 +14159,7 @@ let
 
   ekrhyper = callPackage ../applications/science/logic/ekrhyper {};
 
-  eprover = callPackage ../applications/science/logic/eprover {
-    texLive = texLiveAggregationFun {
-      paths = [
-        texLive texLiveExtra
-      ];
-    };
-  };
+  eprover = callPackage ../applications/science/logic/eprover { };
 
   gappa = callPackage ../applications/science/logic/gappa { };
 

From 46f5efa0182beaa2dee5fd6ec335e791d83a4e9f Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@daemon.hole.ru>
Date: Fri, 26 Jun 2015 00:31:57 +0300
Subject: [PATCH 1608/2322] Add myself as maintainer

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index eb5dcbf4313..c1e25d40d10 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -31,6 +31,7 @@
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
   aszlig = "aszlig <aszlig@redmoonstudios.org>";
   auntie = "Jonathan Glines <auntieNeo@gmail.com>";
+  avnik = "Alexander V. Nikolaev <avn@avnik.info>";
   aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";
   balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>";
   bbenoist = "Baptist BENOIST <return_0@live.com>";

From 41bbb904ebc930cd35558b299519a3c963b62929 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@daemon.hole.ru>
Date: Fri, 26 Jun 2015 00:33:02 +0300
Subject: [PATCH 1609/2322] vault: init at v0.1.2

---
 pkgs/servers/vault/default.nix  | 48 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/servers/vault/default.nix

diff --git a/pkgs/servers/vault/default.nix b/pkgs/servers/vault/default.nix
new file mode 100644
index 00000000000..ddaaca8083b
--- /dev/null
+++ b/pkgs/servers/vault/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchgit, go, gox }:
+
+let
+  name = "vault";
+  version = "0.1.2";
+  namespace = "github.com/hashicorp/vault";
+in
+stdenv.mkDerivation rec {
+  name = "vault-${version}";
+  rev = "v${version}";
+
+  src = fetchgit {
+    url = "https://github.com/hashicorp/vault";
+    sha256 = "a4267105dab56c6d0571f69ea0abc167c5debd3b6c0795b8b69e15a285e12f01";
+    rev = "refs/tags/${rev}";
+  };
+
+  buildInputs = [ go gox ];
+
+  buildPhase = ''
+    mkdir -p "$(dirname Godeps/_workspace/src/${namespace})"
+    ln -sf $src "Godeps/_workspace/src/${namespace}"
+    export GOPATH=$PWD/Godeps/_workspace
+    XC_OS=$(go env GOOS)
+    XC_ARCH=$(go env GOARCH)
+    mkdir -p bin/
+    gox \
+      -os "$XC_OS" \
+      -arch "$XC_ARCH" \
+      -ldflags "-X github.com/hashicorp/vault/cli.GitCommit ${rev}" \
+      -output $PWD/bin/vault \
+      -verbose \
+      .
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/vault $out/bin/vault
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.vaultproject.io";
+    description = "A tool for securely accessing secrets";
+    maintainers = with maintainers; [ avnik ];
+    license     = licenses.mit ;
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fe7ae37b21..85f4265d4ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14776,6 +14776,8 @@ let
 
   utf8proc = callPackage ../development/libraries/utf8proc { };
 
+  vault = callPackage ../servers/vault {};
+
   vbam = callPackage ../misc/emulators/vbam {
     inherit (xlibs) libpthreadstubs;
   };

From c0e1f2e34f56f4179672199d9e6141005c1cd4bd Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Mon, 22 Jun 2015 14:10:41 -0700
Subject: [PATCH 1610/2322] darwin purity: weechat

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

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 8825e16b90f..c39c5be1d4c 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls
 , zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile
-, pythonPackages, cacert, cmake, makeWrapper
+, pythonPackages, cacert, cmake, makeWrapper, libobjc
 , extraBuildInputs ? [] }:
 
 stdenv.mkDerivation rec {
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
     [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig
       libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper
       cacert cmake ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ pythonPackages.pync libobjc ]
     ++ extraBuildInputs;
 
   NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad90e54ccbc..dadca8f6861 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12834,7 +12834,9 @@ let
     graphicsSupport = false;
   };
 
-  weechat = callPackage ../applications/networking/irc/weechat { };
+  weechat = callPackage ../applications/networking/irc/weechat {
+    inherit (darwin) libobjc;
+  };
 
   westonLite = callPackage ../applications/window-managers/weston {
     pango = null;

From a8c98bc0135b223de97d293aeeea6bc617523d9d Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Mon, 22 Jun 2015 14:10:56 -0700
Subject: [PATCH 1611/2322] darwin purity: mercurial

---
 pkgs/applications/version-management/mercurial/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix                            | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 2db8cf72350..6c58fbd3689 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich
-, guiSupport ? false, tk ? null, curses, cacert }:
+, guiSupport ? false, tk ? null, curses, cacert
+
+, ApplicationServices }:
 
 let
   version = "3.3.3";
@@ -17,7 +19,8 @@ stdenv.mkDerivation {
   inherit python; # pass it so that the same version can be used in hg2git
   pythonPackages = [ curses ];
 
-  buildInputs = [ python makeWrapper docutils unzip ];
+  buildInputs = [ python makeWrapper docutils unzip ]
+    ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
 
   makeFlags = "PREFIX=$(out)";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dadca8f6861..6df02e2aa89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11776,6 +11776,7 @@ let
 
   mercurial = callPackage ../applications/version-management/mercurial {
     inherit (pythonPackages) curses docutils hg-git dulwich;
+    inherit (darwin.apple_sdk.frameworks) ApplicationServices;
     guiSupport = false; # use mercurialFull to get hgk GUI
   };
 

From 80c62d132588f0fe7609118226617d7cd72faa43 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Mon, 22 Jun 2015 14:11:21 -0700
Subject: [PATCH 1612/2322] darwin purity: ruby-1.9.3

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

diff --git a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix
index c53a012d753..f0da9173bac 100644
--- a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix
+++ b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix
@@ -6,6 +6,7 @@
 , groff, docSupport ? false
 , libyaml, yamlSupport ? true
 , ruby_1_9_3, autoreconfHook, bison, useRailsExpress ? true
+, libiconv, libobjc
 }:
 
 let
@@ -44,7 +45,8 @@ stdenv.mkDerivation rec {
     # support is not enabled, so add readline to the build inputs if curses
     # support is disabled (if it's enabled, we already have it) and we're
     # running on darwin
-    ++ (op (!cursesSupport && stdenv.isDarwin) readline);
+    ++ (op (!cursesSupport && stdenv.isDarwin) readline)
+    ++ (ops stdenv.isDarwin [ libiconv libobjc ]);
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6df02e2aa89..4a7384b587b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4965,7 +4965,9 @@ let
   bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { };
 
   ruby_1_8_7 = callPackage ../development/interpreters/ruby/ruby-1.8.7.nix { };
-  ruby_1_9_3 = callPackage ../development/interpreters/ruby/ruby-1.9.3.nix { };
+  ruby_1_9_3 = callPackage ../development/interpreters/ruby/ruby-1.9.3.nix {
+    inherit (darwin) libobjc;
+  };
   ruby_2_0_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.0.0.nix { });
   ruby_2_1_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.0.nix { });
   ruby_2_1_1 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { });

From d2167b3f5de8c3e09446b1506f37da19022dcd4c Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Mon, 22 Jun 2015 14:11:40 -0700
Subject: [PATCH 1613/2322] darwin purity: libnatspec

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

diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix
index 985745c3898..7dafe3434f9 100644
--- a/pkgs/development/libraries/libnatspec/default.nix
+++ b/pkgs/development/libraries/libnatspec/default.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation (rec {
     maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 } // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
-  NIX_CFLAGS_COMPILE = "-I${libiconv}/include";
-
-  NIX_CFLAGS_LINK = "-L${libiconv}/lib -liconv";
+  NIX_LDFLAGS = "-liconv";
+  propagatedBuildInputs = [ libiconv ];
 })

From bf95812c995fba710c51c2147ff66758bdaff5ed Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Mon, 22 Jun 2015 14:11:48 -0700
Subject: [PATCH 1614/2322] darwin purity: pixman

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

diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index d50c0c5d69c..74d7706ec59 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   postInstall = glib.flattenInclude;
 
-  patches = stdenv.lib.optional stdenv.cc.isClang ./fix-clang36.patch;
+  patches = stdenv.lib.optional stdenv.isDarwin ./fix-clang36.patch;
 
   meta = {
     homepage = http://pixman.org;

From 9f6f29944888696554e313a885a833e914208f69 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Mon, 22 Jun 2015 17:00:15 -0700
Subject: [PATCH 1615/2322] darwin purity: subversion

---
 pkgs/applications/version-management/subversion/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index ef400af7308..c28459018ca 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (rec {
     ${if httpServer then "--with-apxs=${apacheHttpd}/bin/apxs" else "--without-apxs"}
     ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}
     ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""}
-    ${if stdenv.isDarwin then "--enable-keychain" else "--disable-keychain"}
+    --disable-keychain
     ${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"}
     ${if httpSupport then "--with-serf=${serf}" else "--without-serf"}
     --with-zlib=${zlib}

From 4fd74930ce41757d5994e1d6db073950ca7313a5 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Mon, 22 Jun 2015 17:00:28 -0700
Subject: [PATCH 1616/2322] darwin purity: gdk-pixbuf

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

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 1fa57b5adb5..fafff05a032 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
     + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
     ;
 
-  doCheck = true;
+  # Seems to randomly fail sometimes with a bus error. FIXME
+  doCheck = !stdenv.isDarwin;
 
   postInstall = "rm -rf $out/share/gtk-doc";
 

From d0951cb68dae675269232464ee1a46bd614b5036 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Mon, 22 Jun 2015 17:00:44 -0700
Subject: [PATCH 1617/2322] darwin purity: recode

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

diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix
index bf95125b208..004a93f6ebd 100644
--- a/pkgs/tools/text/recode/default.nix
+++ b/pkgs/tools/text/recode/default.nix
@@ -1,6 +1,5 @@
-# XXX: this may need -liconv on non-glibc systems.. 
-
-{ stdenv, fetchFromGitHub, python, perl, autoconf, automake, libtool, intltool, flex, texinfo }:
+{ stdenv, fetchFromGitHub, python, perl, autoconf, automake, libtool, intltool, flex,
+texinfo, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "recode-3.7-2fd838565";
@@ -12,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "06vyjqaraamcc5vka66mlvxj27ihccqc74aymv2wn8nphr2rhh03";
   };
 
-  nativeBuildInputs = [ python perl autoconf automake libtool intltool flex texinfo ];
+  nativeBuildInputs = [ python perl autoconf automake libtool intltool flex texinfo
+  libiconv ];
 
   preConfigure = ''
     # fix build with new automake, https://bugs.gentoo.org/show_bug.cgi?id=419455

From 33de26c029b4472bdb71adcae92d0dcc76ce76c2 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Mon, 22 Jun 2015 17:00:57 -0700
Subject: [PATCH 1618/2322] darwin purity: wget

---
 pkgs/tools/networking/wget/default.nix | 27 +++++++++++++-------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 7277b2a1fe7..196bcd024d9 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -10,20 +10,19 @@ stdenv.mkDerivation rec {
     sha256 = "0dzv5xf9qxc2bp4cyifmaghh3h464wbm73xiwcrvckf1ynqbgxv7";
   };
 
-  preConfigure = stdenv.lib.optionalString doCheck
-    '' for i in "doc/texi2pod.pl" "util/rmold.pl"
-       do
-         sed -i "$i" -e 's|/usr/bin.*perl|${perl}/bin/perl|g'
-       done
-
-       # Work around lack of DNS resolution in chroots.
-       for i in "tests/"*.pm "tests/"*.px
-       do
-         sed -i "$i" -e's/localhost/127.0.0.1/g'
-       done
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
-       export LIBS="-liconv -lintl"
-    '';
+  preConfigure = ''
+    for i in "doc/texi2pod.pl" "util/rmold.pl"; do
+      sed -i "$i" -e 's|/usr/bin.*perl|${perl}/bin/perl|g'
+    done
+  '' + stdenv.lib.optionalString doCheck ''
+    # Work around lack of DNS resolution in chroots.
+    for i in "tests/"*.pm "tests/"*.px
+    do
+      sed -i "$i" -e's/localhost/127.0.0.1/g'
+    done
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    export LIBS="-liconv -lintl"
+  '';
 
   nativeBuildInputs = [ gettext pkgconfig ];
   buildInputs = [ libidn libiconv libpsl ]

From 7e4f41b16f275f57546d8e0e23a20c7d650630a9 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 24 Jun 2015 17:13:40 -0700
Subject: [PATCH 1619/2322] patch pinentry to work with ncurses

---
 pkgs/tools/security/pinentry/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 6c87d8062ec..7b8e2fe2761 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libcap gtk2 ncurses qt4 ];
 
+  prePatch = ''
+    substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses
+  '';
+
   # configure cannot find moc on its own
   preConfigure = stdenv.lib.optionalString (qt4 != null) ''
     export QTDIR="${qt4}"

From 942cde614bb1ff13d8fa94598aaa69d38942e98e Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 24 Jun 2015 17:16:09 -0700
Subject: [PATCH 1620/2322] darwin purity: rustc

---
 pkgs/development/compilers/rustc/generic.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix
index d1091643f77..25504dadf41 100644
--- a/pkgs/development/compilers/rustc/generic.nix
+++ b/pkgs/development/compilers/rustc/generic.nix
@@ -84,6 +84,8 @@ stdenv.mkDerivation {
   inherit version;
   inherit meta;
 
+  __impureHostDeps = [ "/usr/lib/libedit.3.dylib" ];
+
   src = if isRelease then
       fetchzip {
         url = "http://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
@@ -107,16 +109,16 @@ stdenv.mkDerivation {
     installPhase = ''
       mkdir -p "$out"
       cp -r bin "$out/bin"
-    '' + (if stdenv.isLinux then ''
+    '' + stdenv.lib.optionalString stdenv.isLinux ''
       patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
                --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/" \
                "$out/bin/rustc"
-    '' else "");
+    '';
   };
 
   configureFlags = configureFlags
-                ++ [ "--enable-local-rust" "--local-rust-root=$snapshot" ]
-                ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang";
+                ++ [ "--enable-local-rust" "--local-rust-root=$snapshot" "--enable-rpath" ]
+                ++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang";
 
   inherit patches;
 
@@ -132,7 +134,8 @@ stdenv.mkDerivation {
       --replace /bin/echo "${coreutils}/bin/echo"
   '';
 
-  buildInputs = [ which file perl curl python27 makeWrapper git valgrind procps ];
+  buildInputs = [ which file perl curl python27 makeWrapper git ]
+    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ procps valgrind ];
 
   enableParallelBuilding = true;
 

From d51a81690ca014d97153b688aa6ec89ace4ce321 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Thu, 25 Jun 2015 21:06:55 -0500
Subject: [PATCH 1621/2322] libtsm: fix building with clang for darwin

---
 .../development/libraries/libtsm/darwin.patch | 37 +++++++++++++++++++
 pkgs/development/libraries/libtsm/default.nix | 18 ++++++---
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/libtsm/darwin.patch

diff --git a/pkgs/development/libraries/libtsm/darwin.patch b/pkgs/development/libraries/libtsm/darwin.patch
new file mode 100644
index 00000000000..d447be456e0
--- /dev/null
+++ b/pkgs/development/libraries/libtsm/darwin.patch
@@ -0,0 +1,37 @@
+From 4e7b7b1124bfbccb43820997164b00720bf5ca31 Mon Sep 17 00:00:00 2001
+From: Florian Gilcher <florian.gilcher@asquera.de>
+Date: Sun, 23 Mar 2014 23:05:44 +0100
+Subject: [PATCH] Remove GCC specific flags
+
+---
+ Makefile.am | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index f1e872b..c011f02 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -69,11 +69,7 @@ AM_CFLAGS = \
+ AM_CPPFLAGS = \
+ 	-include $(top_builddir)/config.h \
+ 	-I $(srcdir)/src
+-AM_LDFLAGS = \
+-	-Wl,--as-needed \
+-	-Wl,--gc-sections \
+-	-Wl,-z,relro \
+-	-Wl,-z,now
++AM_LDFLAGS =
+ 
+ if BUILD_ENABLE_DEBUG
+ AM_CFLAGS += -g
+@@ -134,9 +130,7 @@ libtsm_la_CPPFLAGS = $(AM_CPPFLAGS)
+ libtsm_la_LIBADD = libshl.la
+ EXTRA_libtsm_la_DEPENDENCIES = $(top_srcdir)/docs/libtsm.sym
+ libtsm_la_LDFLAGS = \
+-	$(AM_LDFLAGS) \
+-	-version-info $(LIBTSM_CURRENT):$(LIBTSM_REVISION):$(LIBTSM_AGE) \
+-	-Wl,--version-script="$(top_srcdir)/docs/libtsm.sym"
++	$(AM_LDFLAGS)
+ 
+ if BUILD_HAVE_XKBCOMMON
+ libtsm_la_CPPFLAGS += $(XKBCOMMON_CFLAGS)
diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix
index 66e1698b11d..febdb0914d6 100644
--- a/pkgs/development/libraries/libtsm/default.nix
+++ b/pkgs/development/libraries/libtsm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxkbcommon, pkgconfig }:
+{ stdenv, lib, fetchurl, libxkbcommon, pkgconfig, autoconf, automake }:
 
 stdenv.mkDerivation rec {
   name = "libtsm-3";
@@ -8,14 +8,22 @@ stdenv.mkDerivation rec {
     sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i";
   };
 
-  buildInputs = [ libxkbcommon pkgconfig ];
+  buildInputs = [ libxkbcommon pkgconfig ] ++ lib.optionals stdenv.isDarwin [
+    autoconf automake
+   ];
+
+  preConfigure = lib.optionalString stdenv.isDarwin ''
+    aclocal
+  '';
 
   configureFlags = [ "--disable-debug" ];
 
-  meta = {
+  patches = lib.optional stdenv.isDarwin ./darwin.patch;
+
+  meta = with lib; {
     description = "Terminal-emulator State Machine";
     homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ shlevy cstrahan ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 300b9ac4d33..920423b54a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7224,7 +7224,9 @@ let
 
   libtoxcore = callPackage ../development/libraries/libtoxcore { };
 
-  libtsm = callPackage ../development/libraries/libtsm { };
+  libtsm = callPackage ../development/libraries/libtsm {
+    automake = automake114x;
+  };
 
   libtunepimp = callPackage ../development/libraries/libtunepimp { };
 

From bc975c36d14dd77759c78a3625bed243f0ce9f4b Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Thu, 25 Jun 2015 15:37:15 +0200
Subject: [PATCH 1622/2322] qtpass: init at 0.8.4

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

diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
new file mode 100644
index 00000000000..828019011fc
--- /dev/null
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, git, gnupg, makeWrapper, pass, qt5 }:
+
+stdenv.mkDerivation rec {
+  name = "qtpass-${version}";
+  version = "0.8.4";
+
+  src = fetchurl {
+    url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz";
+    sha256 = "14avh04q559p64ska1w814pbwv0742aaqln036pw99fjxav685g0";
+  };
+
+  buildInputs = [ git gnupg makeWrapper pass qt5.base ];
+
+  configurePhase = "qmake CONFIG+=release PREFIX=$out DESTDIR=$out";
+
+  installPhase = ''
+    mkdir $out/bin
+    mv $out/qtpass $out/bin
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/qtpass \
+        --suffix PATH : ${git}/bin \
+        --suffix PATH : ${gnupg}/bin \
+        --suffix PATH : ${pass}/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A multi-platform GUI for pass, the standard unix password manager";
+    homepage = https://github.com/IJHack/qtpass;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.hrdinka ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7d5caa4471..96e07883aef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12266,6 +12266,8 @@ let
 
   qtox = callPackage ../applications/networking/instant-messengers/qtox { };
 
+  qtpass = callPackage ../applications/misc/qtpass { };
+
   qtpfsgui = callPackage ../applications/graphics/qtpfsgui { };
 
   qtractor = callPackage ../applications/audio/qtractor { };

From 86dbc9b5e2f11de545a64cd17afd5d76e34081ac Mon Sep 17 00:00:00 2001
From: Markus Kohlhase <mail@markus-kohlhase.de>
Date: Fri, 26 Jun 2015 10:08:53 +0200
Subject: [PATCH 1623/2322] k9copy: fixed attributes to evaluate with current
 master

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

diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix
index ad5dc58cbeb..70558eb39a4 100644
--- a/pkgs/applications/video/k9copy/default.nix
+++ b/pkgs/applications/video/k9copy/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, cmake, automoc4, kf5, dvdauthor, xineLib, libmpeg2, libav,
-libdvdread, libdvdnav, dvdplusrwtools }:
+{ stdenv, fetchurl, cmake, automoc4, qt5, kf5, dvdauthor, xineLib, libmpeg2, libav,
+libdvdread, libdvdnav, dvdplusrwtools, phonon_qt5 }:
 
 stdenv.mkDerivation rec {
   version = "3.0.3";
@@ -31,12 +31,12 @@ stdenv.mkDerivation rec {
     libdvdnav
     dvdplusrwtools
     automoc4
+    phonon_qt5
   ] ++ (with kf5; [
     extra-cmake-modules
     kio
     solid
-    scope.Phonon4Qt5
-    scope.Qt5X11Extras
+    qt5.x11extras
     kiconthemes
     ki18n
     kdesu

From 0bd3737bd05d75697e5103322f52d880882241ab Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 24 Jun 2015 13:58:37 +0200
Subject: [PATCH 1624/2322] stumpwm: don't block after starting stumpwm

This is important to let nixos configure everything, e.g., a desktop
manager.
---
 nixos/modules/services/x11/window-managers/stumpwm.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/stumpwm.nix b/nixos/modules/services/x11/window-managers/stumpwm.nix
index a876f13fd21..eb7b8665f23 100644
--- a/nixos/modules/services/x11/window-managers/stumpwm.nix
+++ b/nixos/modules/services/x11/window-managers/stumpwm.nix
@@ -21,9 +21,10 @@ in
   config = mkIf cfg.enable {
     services.xserver.windowManager.session = singleton {
       name = "stumpwm";
-      start = "
-        ${pkgs.stumpwm}/bin/stumpwm
-      ";
+      start = ''
+        ${pkgs.stumpwm}/bin/stumpwm &
+        waitPID=$!
+      '';
     };
     environment.systemPackages = [ pkgs.stumpwm ];
   };

From 6839ad653a1be04546f4d1bd7e2c1fa7f2b25eed Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 26 Jun 2015 14:03:21 +0200
Subject: [PATCH 1625/2322] postfix: fix recipient_delimiter option

This reverts commit 88f4b75a00855c878624e465e1a83930aaa92858 and fixes the
recipientDelimiter config option. Till then the camel case variant was used
while recipient_delimiter would have been right.
---
 nixos/modules/services/mail/mlmmj.nix   |  1 +
 nixos/modules/services/mail/postfix.nix | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix
index 1545c60f4de..db3a266d011 100644
--- a/nixos/modules/services/mail/mlmmj.nix
+++ b/nixos/modules/services/mail/mlmmj.nix
@@ -88,6 +88,7 @@ in
 
     services.postfix = {
       enable = true;
+      recipientDelimiter= "+";
       extraMasterConf = ''
         mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L ${spoolDir}/$nextHop
       '';
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 3d9bb9ccf24..29e0cf7a882 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -77,6 +77,8 @@ let
       smtpd_tls_key_file = ${cfg.sslKey}
 
       smtpd_use_tls = yes
+
+      recipient_delimiter = ${cfg.recipientDelimiter}
     ''
     + optionalString (cfg.virtual != "") ''
       virtual_alias_maps = hash:/etc/postfix/virtual
@@ -289,6 +291,14 @@ in
         description = "SSL key to use.";
       };
 
+      recipientDelimiter = mkOption {
+        default = "";
+        example = "+";
+        description = "
+          Delimiter for address extension: so mail to user+test can be handled by ~user/.forward+test
+        ";
+      };
+
       virtual = mkOption {
         default = "";
         description = "

From 7f5f9072ad487ff6b3bffce716943d46fb167813 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 24 Jun 2015 22:57:37 +0200
Subject: [PATCH 1626/2322] all-packages.nix: Add pkgs.overridePackages

---
 doc/functions.xml               | 57 +++++++++++++++++++++++++++++++++
 doc/manual.xml                  |  1 +
 pkgs/top-level/all-packages.nix | 21 ++++++++++--
 3 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 doc/functions.xml

diff --git a/doc/functions.xml b/doc/functions.xml
new file mode 100644
index 00000000000..16f4f262a25
--- /dev/null
+++ b/doc/functions.xml
@@ -0,0 +1,57 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+	 xmlns:xlink="http://www.w3.org/1999/xlink"
+	 xml:id="chap-functions">
+
+<title>Functions reference</title>
+
+<para>
+  The nixpkgs repository has several utility functions to manipulate Nix expressions.
+</para>
+
+<section xml:id="sec-pkgs-overridePackages">
+  <title>pkgs.overridePackages</title>
+
+  <para>
+    This function inside the nixpkgs expression (<varname>pkgs</varname>)
+    can be used to override the set of packages itself.
+  </para>
+  <para>
+    Warning: this function is expensive and must not be used from within
+    the nixpkgs repository.
+  </para>
+  <para>
+    Example usage:
+
+    <programlisting>let
+  pkgs = import &lt;nixpkgs&gt; {};
+  newpkgs = pkgs.overridePackages (self: super: {
+    foo = super.foo.override { ... };
+  };
+in ...</programlisting>
+  </para>
+
+  <para>
+    The resulting <varname>newpkgs</varname> will have the new <varname>foo</varname>
+    expression, and all other expressions depending on <varname>foo</varname> will also
+    use the new <varname>foo</varname> expression.
+  </para>
+
+  <para>
+    The behavior of this function is similar to <link 
+    linkend="sec-modify-via-packageOverrides">config.packageOverrides</link>.
+  </para>
+
+  <para>
+    The <varname>self</varname> parameter refers to the final package set with the
+    applied overrides. Using this parameter may lead to infinite recursion if not
+    used consciously.
+  </para>
+
+  <para>
+    The <varname>super</varname> parameter refers to the old package set.
+    It's equivalent to <varname>pkgs</varname> in the above example.
+  </para>
+
+</section>
+
+</chapter>
diff --git a/doc/manual.xml b/doc/manual.xml
index a6400c98d6e..11f37184e6d 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -13,6 +13,7 @@
   <xi:include href="quick-start.xml" />
   <xi:include href="stdenv.xml" />
   <xi:include href="packageconfig.xml" />
+  <xi:include href="functions.xml" />
   <xi:include href="meta.xml" />
   <xi:include href="language-support.xml" />
   <xi:include href="package-notes.xml" />
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7d5caa4471..876db4b0236 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -100,6 +100,8 @@ let
   # ... pkgs.foo ...").
   pkgs = applyGlobalOverrides (config.packageOverrides or (pkgs: {}));
 
+  mkOverrides = pkgsOrig: overrides: overrides //
+        (lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) (pkgsOrig.stdenv.overrides pkgsOrig));
 
   # Return the complete set of packages, after applying the overrides
   # returned by the `overrider' function (see above).  Warning: this
@@ -110,8 +112,7 @@ let
       # in the case of cross-building, or otherwise the basic
       # overrided packages will not be built with the crossStdenv
       # adapter.
-      overrides = overrider pkgsOrig //
-        (lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) (pkgsOrig.stdenv.overrides pkgsOrig));
+      overrides = mkOverrides pkgsOrig (overrider pkgsOrig);
 
       # The un-overriden packages, passed to `overrider'.
       pkgsOrig = pkgsFun pkgs {};
@@ -142,6 +143,22 @@ let
 
   newScope = extra: lib.callPackageWith (defaultScope // extra);
 
+  # Easily override this package set.
+  # Warning: this function is very expensive and must not be used
+  # from within the nixpkgs repository.
+  #
+  # Example:
+  #  pkgs.overridePackages (self: super: {
+  #    foo = super.foo.override { ... };
+  #  }
+  #
+  # The result is `pkgs' where all the derivations depending on `foo'
+  # will use the new version.
+  overridePackages = f:
+    let
+      newpkgs = pkgsFun newpkgs overrides;
+      overrides = mkOverrides pkgs (f newpkgs pkgs);
+    in newpkgs;
 
   # Override system. This is useful to build i686 packages on x86_64-linux.
   forceSystem = system: kernel: (import ./all-packages.nix) {

From 550663247375914d43179dbd605beffdb0c79ee4 Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <couchemar@yandex.ru>
Date: Fri, 26 Jun 2015 09:59:11 +0300
Subject: [PATCH 1627/2322] erlang: add Erlang R18, closes #8515

---
 lib/maintainers.nix                          |  1 +
 pkgs/development/interpreters/erlang/R18.nix | 87 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              | 14 ++--
 3 files changed, 97 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/interpreters/erlang/R18.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index c1e25d40d10..5077ac233f2 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -61,6 +61,7 @@
   codyopel = "Cody Opel <codyopel@gmail.com>";
   copumpkin = "Dan Peebles <pumpkingod@gmail.com>";
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
+  couchemar = "Andrey Pavlov <couchemar@yandex.ru>";
   cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>";
   cwoac = "Oliver Matthews <oliver@codersoffortune.net>";
   DamienCassou = "Damien Cassou <damien.cassou@gmail.com>";
diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix
new file mode 100644
index 00000000000..9bc36ee47de
--- /dev/null
+++ b/pkgs/development/interpreters/erlang/R18.nix
@@ -0,0 +1,87 @@
+{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
+, gnused, gawk, makeWrapper
+, odbcSupport ? false, unixODBC ? null
+, wxSupport ? true, mesa ? null, wxGTK ? null, xlibs ? null, wxmac ? null
+, javacSupport ? false, openjdk ? null
+, enableHipe ? true
+}:
+
+assert wxSupport -> (if stdenv.isDarwin
+  then wxmac != null
+  else mesa != null && wxGTK != null && xlibs != null);
+
+assert odbcSupport -> unixODBC != null;
+assert javacSupport ->  openjdk != null;
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"
+  + "${optionalString javacSupport "-javac"}";
+  version = "18.0";
+
+  src = fetchurl {
+    url = "http://www.erlang.org/download/otp_src_${version}.tar.gz";
+    sha256 = "1ahi865ii3iqzd00yyn3nrxjb9qa2by9d7ixssvqw8ag9firvdm0";
+  };
+
+  buildInputs =
+    [ perl gnum4 ncurses openssl makeWrapper
+    ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xlibs.libX11 ])
+      ++ optional odbcSupport [ unixODBC ]
+      ++ optional javacSupport [ openjdk ];
+
+  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}"
+  ] ++ optional enableHipe "--enable-hipe"
+    ++ optional wxSupport "--enable-wx"
+    ++ optional odbcSupport "--with-odbc=${unixODBC}"
+    ++ optional javacSupport "--with-javac"
+    ++ optional stdenv.isDarwin "--enable-darwin-64bit";
+
+  postInstall = let
+    manpages = fetchurl {
+      url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz";
+      sha256 = "0wsnp7sp21ydinwkg3rkazyrs382pdzwra9apikkhs70dv1hwkz4";
+    };
+  in ''
+    ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call
+    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"
+  '';
+
+  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 = platforms.unix;
+    maintainers = with maintainers; [ the-kenny sjmackenzie couchemar ];
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 920423b54a2..79759faaf61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4779,10 +4779,14 @@ let
   erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; };
   erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; };
   erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; odbcSupport = true; };
-  erlang = erlangR17;
-  erlang_odbc = erlangR17_odbc;
-  erlang_javac = erlangR17_javac;
-  erlang_odbc_javac = erlangR17_odbc_javac;
+  erlangR18 = callPackage ../development/interpreters/erlang/R18.nix { };
+  erlangR18_odbc = callPackage ../development/interpreters/erlang/R18.nix { odbcSupport = true; };
+  erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix { javacSupport = true; };
+  erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix { javacSupport = true; odbcSupport = true; };
+  erlang = erlangR18;
+  erlang_odbc = erlangR18_odbc;
+  erlang_javac = erlangR18_javac;
+  erlang_odbc_javac = erlangR18_odbc_javac;
 
   rebar = callPackage ../development/tools/build-managers/rebar { };
 
@@ -9191,7 +9195,7 @@ let
 
   xwayland = with xorg; callPackage ../servers/x11/xorg/xwayland.nix { };
 
-  yaws = callPackage ../servers/http/yaws { };
+  yaws = callPackage ../servers/http/yaws { erlang = erlangR17; };
 
   zabbix = recurseIntoAttrs (import ../servers/monitoring/zabbix {
     inherit fetchurl stdenv pkgconfig postgresql curl openssl zlib;

From 8b86e245bc56898aae15aae6db80fb2ee52b295a Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Fri, 26 Jun 2015 12:05:04 +0200
Subject: [PATCH 1628/2322] stumpwm: use full-path of xdpyinfo, closes #8518

---
 pkgs/applications/window-managers/stumpwm/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index d44ac128d80..88faae64be7 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     cp -r --no-preserve=mode ${contrib} modules
+    substituteInPlace  head.lisp \
+      --replace 'run-shell-command "xdpyinfo' 'run-shell-command "${xdpyinfo}/bin/xdpyinfo'
   '';
 
   installPhase = ''

From 8c4fcc87f8320004e924f53bbaee29ae3b7b4692 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 26 Jun 2015 17:39:40 +0200
Subject: [PATCH 1629/2322] autobuild: 3.5 -> 5.3

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

diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix
index b35ec4357c4..f3d88361a11 100644
--- a/pkgs/development/tools/misc/autobuild/default.nix
+++ b/pkgs/development/tools/misc/autobuild/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, makeWrapper, perl, openssh, rsync }:
 
 stdenv.mkDerivation rec {
-  name = "autobuild-3.5";
+  name = "autobuild-5.3";
 
   src = fetchurl {
     url = "http://savannah.spinellicreations.com/autobuild/${name}.tar.gz";
-    sha256 = "0ik13913x1yj8lsaf65chpiw13brl3q6kx7s1fa41a7s2krl1xvi";
+    sha256 = "0gv7g61ja9q9zg1m30k4snqwwy1kq7b4df6sb7d2qra7kbdq8af1";
   };
 
   buildInputs = [ makeWrapper perl openssh rsync ];

From 62921384e059fcfb09755e4e98442c99a10f8d90 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 26 Jun 2015 04:28:04 +0200
Subject: [PATCH 1630/2322] stow: patch that removes warning for 2.2.0, closes
 #8513

---
 pkgs/tools/misc/stow/default.nix            |  2 ++
 pkgs/tools/misc/stow/precedence-issue.patch | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/tools/misc/stow/precedence-issue.patch

diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix
index a9d8554525b..6eddcf89b91 100644
--- a/pkgs/tools/misc/stow/default.nix
+++ b/pkgs/tools/misc/stow/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ perl perlPackages.TestOutput ];
 
+  patches = [ ./precedence-issue.patch ];
+
   doCheck = true;
 
   meta = {
diff --git a/pkgs/tools/misc/stow/precedence-issue.patch b/pkgs/tools/misc/stow/precedence-issue.patch
new file mode 100644
index 00000000000..d9542573bac
--- /dev/null
+++ b/pkgs/tools/misc/stow/precedence-issue.patch
@@ -0,0 +1,15 @@
+diff --git a/lib/Stow.pm.in b/lib/Stow.pm.in
+index 101a422..f80b1ac 100755
+--- a/lib/Stow.pm.in
++++ b/lib/Stow.pm.in
+@@ -1732,8 +1732,8 @@ sub read_a_link {
+     }
+     elsif (-l $path) {
+         debug(4, "  read_a_link($path): real link");
+-        return readlink $path
+-            or error("Could not read link: $path");
++        my $target = readlink $path or error("Could not read link: $path ($!)");
++        return $target;
+     }
+     internal_error("read_a_link() passed a non link path: $path\n");
+ }

From 946a6823b27010787bd43ae8de74b3ff2f42783e Mon Sep 17 00:00:00 2001
From: Russell O'Connor <oconnorr@google.com>
Date: Thu, 25 Jun 2015 21:55:04 +0000
Subject: [PATCH 1631/2322] cassandra: add procps depencency, closes #8512

${cassandra}/conf/cassandra-env.sh calls free program on Linux systems in
calculate_heap_sizes().

Adding procps to the path makes the free program available.
---
 pkgs/servers/nosql/cassandra/2.0.nix | 4 +++-
 pkgs/servers/nosql/cassandra/2.1.nix | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix
index e3ed35241fa..a4aca1c55c1 100644
--- a/pkgs/servers/nosql/cassandra/2.0.nix
+++ b/pkgs/servers/nosql/cassandra/2.0.nix
@@ -6,6 +6,7 @@
 , gawk
 , bash
 , getopt
+, procps
 }:
 
 let
@@ -34,7 +35,8 @@ stdenv.mkDerivation rec {
         --set JAVA_HOME ${jre} \
         --prefix PATH : ${bash}/bin \
         --prefix PATH : ${getopt}/bin \
-        --prefix PATH : ${gawk}/bin
+        --prefix PATH : ${gawk}/bin \
+        --prefix PATH : ${procps}/bin
     done
 
     wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix
index 2f8cb84117a..f82daee7b14 100644
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/pkgs/servers/nosql/cassandra/2.1.nix
@@ -6,6 +6,7 @@
 , gawk
 , bash
 , getopt
+, procps
 }:
 
 let
@@ -34,7 +35,8 @@ stdenv.mkDerivation rec {
         --set JAVA_HOME ${jre} \
         --prefix PATH : ${bash}/bin \
         --prefix PATH : ${getopt}/bin \
-        --prefix PATH : ${gawk}/bin
+        --prefix PATH : ${gawk}/bin \
+        --prefix PATH : ${procps}/bin
     done
 
     wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin

From fb203a34c01d1df38bae24804f879b7ac013e88e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 26 Jun 2015 18:12:47 +0200
Subject: [PATCH 1632/2322] nix.buildMachines: Don't require sshUser

---
 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 6d25fef4576..a3473cdd91e 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -296,7 +296,7 @@ in
       { enable = cfg.buildMachines != [];
         text =
           concatMapStrings (machine:
-            "${machine.sshUser}@${machine.hostName} "
+            "${if machine ? sshUser then "${machine.sshUser}@" else ""}${machine.hostName} "
             + (if machine ? system then machine.system else concatStringsSep "," machine.systems)
             + " ${machine.sshKey} ${toString machine.maxJobs} "
             + (if machine ? speedFactor then toString machine.speedFactor else "1" )

From 1f3f31b2a875e8f05ab97af1da2e7bb9c743a3ac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 26 Jun 2015 18:33:01 +0200
Subject: [PATCH 1633/2322] Add options nix.{trustedUsers,allowedUsers}

These are just trusted-users and allowed-users in nix.conf. It's
useful to have options for them so that different modules can specify
trusted/allowed users.
---
 nixos/modules/services/misc/nix-daemon.nix | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index a3473cdd91e..daf1fac08a6 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -47,6 +47,8 @@ let
         ${optionalString cfg.requireSignedBinaryCaches ''
           signed-binary-caches = *
         ''}
+        trusted-users = ${toString cfg.trustedUsers}
+        allowed-users = ${toString cfg.allowedUsers}
         $extraOptions
         END
       '';
@@ -277,6 +279,36 @@ in
         '';
       };
 
+      trustedUsers = mkOption {
+        type = types.listOf types.str;
+        default = [ "root" ];
+        example = [ "root" "alice" "@wheel" ];
+        description = ''
+          A list of names of users that have additional rights when
+          connecting to the Nix daemon, such as the ability to specify
+          additional binary caches, or to import unsigned NARs. You
+          can also specify groups by prefixing them with
+          <literal>@</literal>; for instance,
+          <literal>@wheel</literal> means all users in the wheel
+          group.
+        '';
+      };
+
+      allowedUsers = mkOption {
+        type = types.listOf types.str;
+        default = [ "*" ];
+        example = [ "@wheel" "@builders" "alice" "bob" ];
+        description = ''
+          A list of names of users (separated by whitespace) that are
+          allowed to connect to the Nix daemon. As with
+          <option>nix.trustedUsers</option>, you can specify groups by
+          prefixing them with <literal>@</literal>. Also, you can
+          allow all users by specifying <literal>*</literal>. The
+          default is <literal>*</literal>. Note that trusted users are
+          always allowed to connect.
+        '';
+      };
+
     };
 
   };

From 616ed6ee152ac16dd617fbbab2ee275e2e36d401 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 26 Jun 2015 09:53:10 -0700
Subject: [PATCH 1634/2322] darwin purity: libev

---
 pkgs/development/libraries/libev/default.nix    |  4 +++-
 pkgs/development/libraries/libev/noreturn.patch | 13 +++++++++++++
 pkgs/top-level/python-packages.nix              |  6 ++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/libev/noreturn.patch

diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix
index ce7d7b9e275..d27df16eb94 100644
--- a/pkgs/development/libraries/libev/default.nix
+++ b/pkgs/development/libraries/libev/default.nix
@@ -4,10 +4,12 @@ stdenv.mkDerivation rec {
   name = "libev-${version}";
   version="4.19";
   src = fetchurl {
-    url = "http://dist.schmorp.de/libev/${name}.tar.gz";
+    url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz";
     sha256 = "1jyw7qbl0spxqa0dccj9x1jsw7cj7szff43cq4acmklnra4mzz48";
   };
 
+  patches = [ ./noreturn.patch ];
+
   # Version 4.19 is not valid C11 (which Clang default to)
   # Check if this is still necessary on upgrade
   NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-std=c99" else null;
diff --git a/pkgs/development/libraries/libev/noreturn.patch b/pkgs/development/libraries/libev/noreturn.patch
new file mode 100644
index 00000000000..85e2eaee6b4
--- /dev/null
+++ b/pkgs/development/libraries/libev/noreturn.patch
@@ -0,0 +1,13 @@
+diff --git a/ev.c b/ev.c
+index 6f36c6d..b8a1c5f 100644
+--- a/ev.c
++++ b/ev.c
+@@ -1026,7 +1026,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (
+   #define ecb_unreachable() __builtin_unreachable ()
+ #else
+   /* this seems to work fine, but gcc always emits a warning for it :/ */
+-  ecb_inline void ecb_unreachable (void) ecb_noreturn;
++  ecb_inline ecb_noreturn void ecb_unreachable (void);
+   ecb_inline void ecb_unreachable (void) { }
+ #endif
+ 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f315b2e24ab..87acf28cef9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5743,6 +5743,12 @@ let
       sha256 = "0cds7yvwdlqmd590i59vzxaviwxk4js6dkhnmdxb3p1xac7wmq9s";
     };
 
+    patchPhase = ''
+      pushd libev
+      patch -p1 < ${../development/libraries/libev/noreturn.patch}
+      popd
+    '';
+
     buildInputs = with self; [ pkgs.libev ];
     propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ];
 

From 20268f6382dccc77bc9aba0e9b067c3fdf03613e Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 26 Jun 2015 09:53:28 -0700
Subject: [PATCH 1635/2322] darwin purity: libusb1 (depend on udev on linux
 only)

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

diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index b2d75e15554..75d6bdb4cc6 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
-  preFixup = ''
+  preFixup = stdenv.lib.optionalString stdenv.isLinux ''
     sed 's,-ludev,-L${udev}/lib -ludev,' -i $out/lib/libusb-1.0.la
   '';
 

From 363d1bf07a8d3bf067b9e7691ea58d29ca40eb97 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 26 Jun 2015 09:53:44 -0700
Subject: [PATCH 1636/2322] darwin purity: vim

---
 pkgs/applications/editors/vim/default.nix     |  10 +-
 pkgs/applications/editors/vim/impure-deps.nix | 129 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   5 +-
 3 files changed, 141 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/editors/vim/impure-deps.nix

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 7a1ce7aa1f2..4d1840ab895 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchhg, ncurses, gettext, pkgconfig }:
+{ stdenv, fetchhg, ncurses, gettext, pkgconfig
+
+# apple frameworks
+, CoreServices, CoreData, Cocoa, Foundation, libobjc }:
 
 stdenv.mkDerivation rec {
   name = "vim-${version}";
@@ -13,9 +16,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ ncurses pkgconfig ];
+  buildInputs = [ ncurses pkgconfig ]
+    ++ stdenv.lib.optional stdenv.isDarwin [ CoreData CoreServices Cocoa Foundation libobjc ];
   nativeBuildInputs = [ gettext ];
 
+  __impureHostDeps = import ./impure-deps.nix;
+
   configureFlags = [
     "--enable-multibyte"
     "--enable-nls"
diff --git a/pkgs/applications/editors/vim/impure-deps.nix b/pkgs/applications/editors/vim/impure-deps.nix
new file mode 100644
index 00000000000..d6dc3a08627
--- /dev/null
+++ b/pkgs/applications/editors/vim/impure-deps.nix
@@ -0,0 +1,129 @@
+[
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Accelerate"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vImage.framework/Versions/A/vImage"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLinearAlgebra.dylib"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvDSP.dylib"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvMisc.dylib"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/vecLib"
+  "/System/Library/Frameworks/AppKit.framework/Versions/C/AppKit"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontParser.dylib"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontRegistry.dylib"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSync.framework/Versions/A/ColorSync"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis"
+  "/System/Library/Frameworks/AudioToolbox.framework/Versions/A/AudioToolbox"
+  "/System/Library/Frameworks/AudioUnit.framework/Versions/A/AudioUnit"
+  "/System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork"
+  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/CarbonSound.framework/Versions/A/CarbonSound"
+  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox"
+  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Ink.framework/Versions/A/Ink"
+  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition"
+  "/System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa"
+  "/System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio"
+  "/System/Library/Frameworks/CoreBluetooth.framework/Versions/A/CoreBluetooth"
+  "/System/Library/Frameworks/CoreData.framework/Versions/A/CoreData"
+  "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"
+  "/System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit"
+  "/System/Library/Frameworks/CoreText.framework/Versions/A/CoreText"
+  "/System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo"
+  "/System/Library/Frameworks/CoreWLAN.framework/Versions/A/CoreWLAN"
+  "/System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration"
+  "/System/Library/Frameworks/Foundation.framework/Versions/C/Foundation"
+  "/System/Library/Frameworks/GSS.framework/Versions/A/GSS"
+  "/System/Library/Frameworks/IOBluetooth.framework/Versions/A/IOBluetooth"
+  "/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit"
+  "/System/Library/Frameworks/IOSurface.framework/Versions/A/IOSurface"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libGIF.dylib"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJP2.dylib"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libRadiance.dylib"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib"
+  "/System/Library/Frameworks/Kerberos.framework/Versions/A/Kerberos"
+  "/System/Library/Frameworks/NetFS.framework/Versions/A/NetFS"
+  "/System/Library/Frameworks/OpenCL.framework/Versions/A/OpenCL"
+  "/System/Library/Frameworks/OpenDirectory.framework/Versions/A/Frameworks/CFOpenDirectory.framework/Versions/A/CFOpenDirectory"
+  "/System/Library/Frameworks/OpenDirectory.framework/Versions/A/OpenDirectory"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCVMSPluginSupport.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCoreVMClient.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGFXShared.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLImage.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL"
+  "/System/Library/Frameworks/QuartzCore.framework/Versions/A/Frameworks/CoreImage.framework/Versions/A/CoreImage"
+  "/System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore"
+  "/System/Library/Frameworks/Security.framework/Versions/A/Security"
+  "/System/Library/Frameworks/SecurityFoundation.framework/Versions/A/SecurityFoundation"
+  "/System/Library/Frameworks/ServiceManagement.framework/Versions/A/ServiceManagement"
+  "/System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration"
+  "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Apple80211"
+  "/System/Library/PrivateFrameworks/AppleJPEG.framework/Versions/A/AppleJPEG"
+  "/System/Library/PrivateFrameworks/AppleVPA.framework/Versions/A/AppleVPA"
+  "/System/Library/PrivateFrameworks/Backup.framework/Versions/A/Backup"
+  "/System/Library/PrivateFrameworks/ChunkingLibrary.framework/Versions/A/ChunkingLibrary"
+  "/System/Library/PrivateFrameworks/CommonAuth.framework/Versions/A/CommonAuth"
+  "/System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/CoreSymbolication"
+  "/System/Library/PrivateFrameworks/CoreUI.framework/Versions/A/CoreUI"
+  "/System/Library/PrivateFrameworks/CoreWiFi.framework/Versions/A/CoreWiFi"
+  "/System/Library/PrivateFrameworks/CrashReporterSupport.framework/Versions/A/CrashReporterSupport"
+  "/System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore"
+  "/System/Library/PrivateFrameworks/DebugSymbols.framework/Versions/A/DebugSymbols"
+  "/System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv"
+  "/System/Library/PrivateFrameworks/FaceCore.framework/Versions/A/FaceCore"
+  "/System/Library/PrivateFrameworks/GenerationalStorage.framework/Versions/A/GenerationalStorage"
+  "/System/Library/PrivateFrameworks/Heimdal.framework/Versions/A/Heimdal"
+  "/System/Library/PrivateFrameworks/IconServices.framework/Versions/A/IconServices"
+  "/System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling"
+  "/System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport"
+  "/System/Library/PrivateFrameworks/NetAuth.framework/Versions/A/NetAuth"
+  "/System/Library/PrivateFrameworks/PerformanceAnalysis.framework/Versions/A/PerformanceAnalysis"
+  "/System/Library/PrivateFrameworks/RemoteViewServices.framework/Versions/A/RemoteViewServices"
+  "/System/Library/PrivateFrameworks/Sharing.framework/Versions/A/Sharing"
+  "/System/Library/PrivateFrameworks/SpeechRecognitionCore.framework/Versions/A/SpeechRecognitionCore"
+  "/System/Library/PrivateFrameworks/Symbolication.framework/Versions/A/Symbolication"
+  "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC"
+  "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation"
+  "/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity"
+  "/System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport"
+  "/usr/lib/libCRFSuite.dylib"
+  "/usr/lib/libOpenScriptingUtil.dylib"
+  "/usr/lib/libarchive.2.dylib"
+  "/usr/lib/libbsm.0.dylib"
+  "/usr/lib/libbz2.1.0.dylib"
+  "/usr/lib/libc++.1.dylib"
+  "/usr/lib/libc++abi.dylib"
+  "/usr/lib/libcmph.dylib"
+  "/usr/lib/libcups.2.dylib"
+  "/usr/lib/libextension.dylib"
+  "/usr/lib/libheimdal-asn1.dylib"
+  "/usr/lib/libiconv.2.dylib"
+  "/usr/lib/libicucore.A.dylib"
+  "/usr/lib/liblangid.dylib"
+  "/usr/lib/liblzma.5.dylib"
+  "/usr/lib/libmecabra.dylib"
+  "/usr/lib/libpam.2.dylib"
+  "/usr/lib/libresolv.9.dylib"
+  "/usr/lib/libsqlite3.dylib"
+  "/usr/lib/libxar.1.dylib"
+  "/usr/lib/libxml2.2.dylib"
+  "/usr/lib/libxslt.1.dylib"
+  "/usr/lib/libz.1.dylib"
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a7384b587b..4c68386b17c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12718,7 +12718,10 @@ let
     flup = pythonPackages.flup;
   };
 
-  vim = callPackage ../applications/editors/vim { };
+  vim = callPackage ../applications/editors/vim {
+    inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData;
+    inherit (darwin) libobjc;
+  };
 
   macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; };
 

From 05fe0da05950b57b15555da876038f8c5321f3b7 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 26 Jun 2015 09:53:58 -0700
Subject: [PATCH 1637/2322] remove obsolete part of gyp patch

---
 .../python-modules/gyp/no-darwin-cflags.patch       | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/development/python-modules/gyp/no-darwin-cflags.patch b/pkgs/development/python-modules/gyp/no-darwin-cflags.patch
index 353cc133b53..798d0f0b16d 100644
--- a/pkgs/development/python-modules/gyp/no-darwin-cflags.patch
+++ b/pkgs/development/python-modules/gyp/no-darwin-cflags.patch
@@ -22,19 +22,6 @@ Index: gyp/pylib/gyp/xcode_emulation.py
      self._Appendf(cflags, 'GCC_OPTIMIZATION_LEVEL', '-O%s', default='s')
  
      if self._Test('GCC_GENERATE_DEBUGGING_SYMBOLS', 'YES', default='YES'):
-@@ -519,12 +513,6 @@
-     if self._Test('GCC_SYMBOLS_PRIVATE_EXTERN', 'YES', default='NO'):
-       cflags.append('-fvisibility=hidden')
- 
--    if self._Test('GCC_TREAT_WARNINGS_AS_ERRORS', 'YES', default='NO'):
--      cflags.append('-Werror')
--
--    if self._Test('GCC_WARN_ABOUT_MISSING_NEWLINE', 'YES', default='NO'):
--      cflags.append('-Wnewline-eof')
--
-     # In Xcode, this is only activated when GCC_COMPILER_VERSION is clang or
-     # llvm-gcc. It also requires a fairly recent libtool, and
-     # if the system clang isn't used, DYLD_LIBRARY_PATH needs to contain the
 @@ -553,7 +541,6 @@
        # TODO: Supporting fat binaries will be annoying.
        self._WarnUnimplemented('ARCHS')

From e130e9d3a3225622194b4edbd9073547d6acb984 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 26 Jun 2015 09:54:29 -0700
Subject: [PATCH 1638/2322] fix bundler hash

---
 pkgs/development/interpreters/ruby/bundler-head.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix
index 6edc01041f2..2087485e3ef 100644
--- a/pkgs/development/interpreters/ruby/bundler-head.nix
+++ b/pkgs/development/interpreters/ruby/bundler-head.nix
@@ -5,7 +5,7 @@ buildRubyGem {
   src = fetchgit {
     url = "https://github.com/bundler/bundler.git";
     rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157";
-    sha256 = "11pbg71bhp66nyhwk0cpbcn1fhp4amv8sr2vx8dw83dcnqqafn92";
+    sha256 = "1vzm21fc37w89psxfk2fzi64zyb3gyhzr9smd6jk2r2kvgp6d38b";
     leaveDotGit = true;
   };
   dontPatchShebangs = true;

From da4266afb617e3167d459ad6dbf69179934d936e Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sat, 27 Jun 2015 02:05:15 +0300
Subject: [PATCH 1639/2322] vimPlugins: update 2015-06-27

---
 pkgs/misc/vim-plugins/default.nix | 93 +++++++++++++++----------------
 1 file changed, 45 insertions(+), 48 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 28db4c343c1..6f6c8fd6e7b 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -81,14 +81,13 @@ rec {
   watchdogs           = vim-watchdogs;
   webapi-vim          = WebAPI;
   yankring            = YankRing;
-  
 
   Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Gist-2015-06-09";
+    name = "Gist-2015-06-24";
     src = fetchgit {
       url = "git://github.com/mattn/gist-vim";
-      rev = "c39e5e317d88da71da338c07af492c7a27efcf0a";
-      sha256 = "97fa171cf239b54ee4ab102dd9f87810744bfa3edd34fe04d4dd8a879b22d5b4";
+      rev = "297c4b90511b6daf7b35c219652a56ac2f0209ee";
+      sha256 = "f7da15fd5c4dbd0e7fb5a66b7212f11db1f05ccbe53ccc06c9d3b1d4bd205923";
     };
     dependencies = [];
 
@@ -139,11 +138,11 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2015-06-12";
+    name = "Syntastic-2015-06-26";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "b8682c3029de5913e0a63a45e5f4d6f3b5e4920e";
-      sha256 = "6ec2a6a3b4b3998612d21fcdccdb82799f8cf4022d6bc38e16f85ece8692d3a3";
+      rev = "8e672780e76c0a774b7fe834eed9652ccd684c24";
+      sha256 = "10b113c456387ebe2b08f81f6464408382a525d9b37e4e6b3fd54808dd25c1a4";
     };
     dependencies = [];
 
@@ -161,11 +160,11 @@ rec {
   };
 
   Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tagbar-2015-05-10";
+    name = "Tagbar-2015-06-19";
     src = fetchgit {
       url = "git://github.com/majutsushi/tagbar";
-      rev = "399b75256ac7333d7119d11047f6b3aff8fa2828";
-      sha256 = "8562fac0f2d690537b4c1049ba67b440116135167b48b9feb21655c9931b875c";
+      rev = "7b36c46d17d57db34fdb0adac9ba6382d0bb5e66";
+      sha256 = "346773e772772d1c68318effd8e6c8c8b36f61cfd9c72a85c0bfcec9843f13c7";
     };
     dependencies = [];
 
@@ -183,11 +182,11 @@ rec {
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2015-05-13";
+    name = "The_NERD_tree-2015-06-17";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "af85499edace2acca27ce41790ac333f62b689bb";
-      sha256 = "12f68eb374ccc8cbfcf88b85cf44a4a18856be4e30a50850b8f3d0b186207f0c";
+      rev = "96c07746b46c12d0aca7a5276cc5bd0a260b82fe";
+      sha256 = "0a3854121674fed598b21154f749a5eadd590a2e5632dd6fc8a9307bdb4cf4d8";
     };
     dependencies = [];
 
@@ -364,11 +363,11 @@ rec {
   };
 
   idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "idris-vim-2014-12-29";
+    name = "idris-vim-2015-06-23";
     src = fetchgit {
       url = "git://github.com/idris-hackers/idris-vim";
-      rev = "6bdb44b85406b75e3b3a4fa265deab1dbe8c6ff1";
-      sha256 = "87677f3aa81f15dbaf4337f709952fd47c9fa28e8086033f2cfbd5b1f256e5ff";
+      rev = "4c1723c34a434aad2455c7c2f2a30d97ed691191";
+      sha256 = "db09ad5a7c75d9ac2ccb1be2b85d6ed9cd507ec0fc736e994d8d315c5916170d";
     };
     dependencies = [];
 
@@ -397,11 +396,11 @@ rec {
   };
 
   vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-ipython-2015-05-30";
+    name = "vim-ipython-2015-06-23";
     src = fetchgit {
       url = "git://github.com/ivanov/vim-ipython";
-      rev = "5876b483902313143adc2dcdfd8de94036e191a6";
-      sha256 = "6c0f3011dca269d8c862abb5477bcdbe3ec2fbe4fc6cebeb38e7f0816cedaae5";
+      rev = "42499f094b805b90b683afa5009cee99abd0bb75";
+      sha256 = "7f59c3edde4c2b8555d703c96e855ca36665aacdca5a30d1e9e21c31bc252f2d";
     };
     dependencies = [];
 
@@ -507,11 +506,11 @@ rec {
   };
 
   vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easymotion-2015-04-21";
+    name = "vim-easymotion-2015-06-22";
     src = fetchgit {
       url = "git://github.com/lokaltog/vim-easymotion";
-      rev = "9f1c449edfce6d61c7f620e3a9c1389b7b7e334f";
-      sha256 = "ba358f3acc120d9cf1854205bde0fa345d156e7f69a1854987e74bb137889c54";
+      rev = "ef0cb2b0a0feee865e70c42fdaf03a4f8e621f38";
+      sha256 = "13f0d18f0c822dc7ba99f2365539de1e2c63817b89a6d0d2e9c2e8689ee85cb7";
     };
     dependencies = [];
 
@@ -566,11 +565,11 @@ rec {
   };
 
   racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "racer-2015-06-15";
+    name = "racer-2015-06-24";
     src = fetchgit {
       url = "git://github.com/phildawes/racer";
-      rev = "dd0671b8d6e66e3e503bd7049561fb08e7815ed3";
-      sha256 = "ec996e7cbf46aec545b70781108f4290dacecd02b599a0d13b8b0cf431205403";
+      rev = "8f9d14b381a1624389df78ed8d3a38bc1c85d0f4";
+      sha256 = "34db058ca1d5dd979db1208b5f90716145eb416c931445213a8dfac3d8b0bcdb";
     };
     dependencies = [];
     buildPhase = ''
@@ -580,33 +579,33 @@ rec {
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2015-06-15";
+    name = "neocomplete-vim-2015-06-23";
     src = fetchgit {
       url = "git://github.com/shougo/neocomplete.vim";
-      rev = "15c6a63ca8807493df273c77be0754f44d68d30b";
-      sha256 = "1a2a30da610e5f252bbe43717cf2cad76b8b09916c2082541fc3bb456b9b97a9";
+      rev = "72bf34c349078ae0e4691f7e00dd2a7ab5714a69";
+      sha256 = "72dff487613de3e18c561b45658ec2eda66a686e1d73159c03bee1313d6d74ff";
     };
     dependencies = [];
 
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2015-06-11";
+    name = "neosnippet-snippets-2015-06-26";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet-snippets";
-      rev = "522c38e28949ae53af8c96d7bcbda192b92e3656";
-      sha256 = "ff0c09fb5a70e011cb7570951a67ef0253f544b3f61c8e7741d65d27b4d418c1";
+      rev = "81c7c9840352126d1fa3748c014d00188b5a1afa";
+      sha256 = "977ef9fd855a03ba16c01b990bfd4121eb3a4516e7446bcb8806c41490515ec3";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2015-06-13";
+    name = "neosnippet-vim-2015-06-23";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet.vim";
-      rev = "3cfe8368cfccffdeab660ca1019696e0fd1aa944";
-      sha256 = "049555be6a2aedee7fffc583d43c0cbe3aecc2f0efcf6cfab826e30b2e83f2fd";
+      rev = "f1980468b0a397d36318a409d3677bc13d307392";
+      sha256 = "b28bf490a809e4dee474480436e0aa1c64612e4788c4f9a0afe856cf2432cfaf";
     };
     dependencies = [];
 
@@ -629,11 +628,11 @@ rec {
   };
 
   vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimshell-vim-2015-05-01";
+    name = "vimshell-vim-2015-06-21";
     src = fetchgit {
       url = "git://github.com/shougo/vimshell.vim";
-      rev = "4939e10609c434becf6423b2f3876bb9c2be3464";
-      sha256 = "72bc6ca7b8ebcdf1d4617c73fc2688486f71a9f8b8601627fbbada3a4cfb28ca";
+      rev = "ce5ce77133dd16bd33a57b0776de0cbaead45722";
+      sha256 = "7c44556f28a06083ba9485af74fcc2e510e3e1830cfce6670c899329c2c85012";
     };
     dependencies = [ "vimproc-vim" ];
   };
@@ -683,11 +682,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2015-06-12";
+    name = "youcompleteme-2015-06-23";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "d77ef96ebcca90381f38604d7fb2e90da91bd503";
-      sha256 = "7a794986eebd8fa952be3dc903588d124dd14377a07bff1b877279c3b7d498f9";
+      rev = "66dcc9581c7d237f4d839389bee055df6788fbc9";
+      sha256 = "91971f0640d462622a31ea64c5c41df7649a6c6e6e4d93220554a7d910a11fdf";
     };
     dependencies = [];
     buildInputs = [
@@ -773,11 +772,11 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2015-06-11";
+    name = "vim-wakatime-2015-06-23";
     src = fetchgit {
       url = "git://github.com/wakatime/vim-wakatime";
-      rev = "b2dcc7ccc2247274fe63168952de5db595a01e1c";
-      sha256 = "883f92fcd45a824009e613d8a527effd1eac8bef0fe4299c0df366376afb6273";
+      rev = "2ee2b4ea56ae1b56ce77a1b9e5d2c51fc6768842";
+      sha256 = "440b6027921fce801255eedd29d24b43975038e78dfe465a381ae76e443480c2";
     };
     dependencies = [];
     buildInputs = [ python ];
@@ -1174,11 +1173,11 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2015-06-09";
+    name = "vim-airline-2015-06-26";
     src = fetchgit {
       url = "git://github.com/bling/vim-airline";
-      rev = "b29e01fa22ee8b8eb02cf505382a90b045b4bc64";
-      sha256 = "e943dd5900d4d49a6f7dd02434b394167a3802d68d17072fc767552a9fd16001";
+      rev = "9afda181dddd0a0ae34aa10e7faad4a66e94676b";
+      sha256 = "1e3b540353b4e047de7c26d8e02de5e68c02a5a1fccc946faa494bcad44bc6b1";
     };
     dependencies = [];
 
@@ -1306,8 +1305,6 @@ rec {
     meta = {
        url = "http://www.vim.org/scripts/script.php?script_id=2465";
     };
-
-
   };
 
 }

From fee9ef865900beb626e4317d39154bd666b722bd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 26 Jun 2015 17:09:58 -0700
Subject: [PATCH 1640/2322] nixos: Replace pkgs.openssh with
 config.programs.ssh.package

---
 nixos/modules/config/system-path.nix                            | 2 +-
 .../modules/services/continuous-integration/jenkins/default.nix | 2 +-
 nixos/modules/services/misc/gitolite.nix                        | 2 +-
 nixos/modules/services/misc/nix-daemon.nix                      | 2 +-
 nixos/modules/virtualisation/ec2-data.nix                       | 2 +-
 nixos/modules/virtualisation/nova.nix                           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index d22f9ebd1df..62390f452ba 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -38,7 +38,7 @@ let
       pkgs.nano
       pkgs.ncurses
       pkgs.netcat
-      pkgs.openssh
+      config.programs.ssh.package
       pkgs.perl
       pkgs.procps
       pkgs.rsync
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index ccea85faa3e..95d2aecfac7 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -57,7 +57,7 @@ in {
       };
 
       packages = mkOption {
-        default = [ pkgs.stdenv pkgs.git pkgs.jdk pkgs.openssh pkgs.nix ];
+        default = [ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ];
         type = types.listOf types.package;
         description = ''
           Packages to add to PATH for the jenkins process.
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
index 16335c8aca7..5012bed0c42 100644
--- a/nixos/modules/services/misc/gitolite.nix
+++ b/nixos/modules/services/misc/gitolite.nix
@@ -75,7 +75,7 @@ in
       serviceConfig.Type = "oneshot";
       serviceConfig.RemainAfterExit = true;
 
-      path = [ pkgs.gitolite pkgs.git pkgs.perl pkgs.bash pkgs.openssh ];
+      path = [ pkgs.gitolite pkgs.git pkgs.perl pkgs.bash config.programs.ssh.package ];
       script = ''
         cd ${cfg.dataDir}
         mkdir -p .gitolite/logs
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index daf1fac08a6..e5948e223d5 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -345,7 +345,7 @@ in
     systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ];
 
     systemd.services.nix-daemon =
-      { path = [ nix pkgs.openssl pkgs.utillinux pkgs.openssh ]
+      { path = [ nix pkgs.openssl pkgs.utillinux config.programs.ssh.package ]
           ++ optionals cfg.distributedBuilds [ pkgs.gzip ];
 
         environment = cfg.envVars
diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
index fd062237bb0..0b2479c1046 100644
--- a/nixos/modules/virtualisation/ec2-data.nix
+++ b/nixos/modules/virtualisation/ec2-data.nix
@@ -91,7 +91,7 @@ with lib;
             # can obtain it securely by parsing the output of
             # ec2-get-console-output.
             echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" > /dev/console
-            ${pkgs.openssh}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console
+            ${config.programs.ssh.package}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console
             echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console
           '';
         serviceConfig.Type = "oneshot";
diff --git a/nixos/modules/virtualisation/nova.nix b/nixos/modules/virtualisation/nova.nix
index 21e060cf266..f356445abe4 100644
--- a/nixos/modules/virtualisation/nova.nix
+++ b/nixos/modules/virtualisation/nova.nix
@@ -100,7 +100,7 @@ in
 
         # `openssl' is required to generate the CA.  `openssh' is
         # required to generate key pairs.
-        path = [ pkgs.openssl pkgs.openssh pkgs.bash ];
+        path = [ pkgs.openssl config.programs.ssh.package pkgs.bash ];
 
         respawn = false;
 

From eb8a411a18bc63e1ffba9f0c282b6206ce0b18a0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 26 Jun 2015 17:16:27 -0700
Subject: [PATCH 1641/2322] Add kerberos library references for later use

---
 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 ff0788b6686..5af77d8717d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6461,6 +6461,7 @@ let
     };
     cyrus_sasl = cyrus_sasl.override { kerberos = null; };
   };
+  libheimdal = heimdal;
 
   harfbuzz = callPackage ../development/libraries/harfbuzz { };
   harfbuzz-icu = callPackage ../development/libraries/harfbuzz {
@@ -6597,6 +6598,7 @@ let
     };
     inherit (darwin) bootstrap_cmds;
   };
+  libkrb5 = krb5;
 
   LASzip = callPackage ../development/libraries/LASzip { };
 

From fa1bdb8cbd9abd6a0148e8afee03fea0851445c2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 26 Jun 2015 17:19:12 -0700
Subject: [PATCH 1642/2322] Migrate all krb5 -> libkrb5

---
 .../gnome-3/3.16/core/gnome-control-center/default.nix      | 4 ++--
 pkgs/development/compilers/hhvm/default.nix                 | 4 ++--
 pkgs/development/libraries/ti-rpc/default.nix               | 4 ++--
 pkgs/tools/system/rsyslog/default.nix                       | 6 +++---
 pkgs/top-level/all-packages.nix                             | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
index e2ec96b5469..0c676c38efa 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -2,7 +2,7 @@
 , libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio, fontconfig
 , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
-, cracklib, python, krb5, networkmanagerapplet, networkmanager
+, cracklib, python, libkrb5, networkmanagerapplet, networkmanager
 , libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev
 , docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
       libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
       gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality
-      accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile
+      accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
       shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
       gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
       gnome3.vino udev libcanberra_gtk3
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index 72bdabb4349..a5586117588 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached, pcre
 , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c
-, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, krb5
+, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
 , libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit
 , libvpx, imagemagick, fribidi
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb git perl
       libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
       oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
-      libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml krb5
+      libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5
       gmp libyaml libedit libvpx imagemagick fribidi
     ];
 
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index b135e49f52b..eb795d6b28e 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, krb5 }:
+{ fetchurl, stdenv, libkrb5 }:
 
 stdenv.mkDerivation rec {
   name = "libtirpc-0.3.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "07d1wlfzf3ia09mjn3f3ay8isk7yx4a6ckfkzx5khnqlc7amkzna";
   };
 
-  propagatedBuildInputs = [ krb5 ];
+  propagatedBuildInputs = [ libkrb5 ];
 
   # http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf
   preConfigure = ''
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 0878902af86..e3e9d6a64d8 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libestr, json_c, zlib, pythonPackages
-, krb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null
+, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null
 , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null
 , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null
 , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig libestr json_c zlib pythonPackages.docutils
-    krb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls
+    libkrb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls
     libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka
     libmongo-client czmq rabbitmq-c hiredis
   ] ++ stdenv.lib.optional stdenv.isLinux systemd;
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     "--with-systemdsystemunitdir=\${out}/etc/systemd/system"
     (mkFlag true                      "largefile")
     (mkFlag true                      "regexp")
-    (mkFlag (krb5 != null)            "gssapi-krb5")
+    (mkFlag (libkrb5 != null)         "gssapi-krb5")
     (mkFlag true                      "klog")
     (mkFlag true                      "kmsg")
     (mkFlag (systemd != null)         "imjournal")
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5af77d8717d..de0afef2fd5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -907,7 +907,7 @@ let
   };
 
   rsyslog-light = callPackage ../tools/system/rsyslog {
-    krb5 = null;
+    libkrb5 = null;
     systemd = null;
     jemalloc = null;
     libmysql = null;
@@ -8691,7 +8691,7 @@ let
   ### SERVERS
 
   "389-ds-base" = callPackage ../servers/ldap/389 {
-    kerberos = krb5;
+    kerberos = libkrb5;
   };
 
   rdf4store = callPackage ../servers/http/4store { };

From adeab5e81577e98a5b7cb003d383c91314227c2f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 26 Jun 2015 17:22:58 -0700
Subject: [PATCH 1643/2322] Migrate all heimdal -> libheimdal

Also disable heimdal references in samba as it uses internal api
features not guaranteed to be stable
---
 pkgs/applications/networking/browsers/firefox-bin/default.nix | 4 ++--
 pkgs/applications/office/zotero/firefox-bin/default.nix       | 4 ++--
 pkgs/top-level/all-packages.nix                               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 62afcc2583a..ebc05a79af9 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -30,7 +30,7 @@
 , nspr
 , nss
 , pango
-, heimdal
+, libheimdal
 , libpulseaudio
 , systemd
 }:
@@ -102,7 +102,7 @@ stdenv.mkDerivation {
       nspr
       nss
       pango
-      heimdal
+      libheimdal
       libpulseaudio
       systemd
     ] + ":" + stdenv.lib.makeSearchPath "lib64" [
diff --git a/pkgs/applications/office/zotero/firefox-bin/default.nix b/pkgs/applications/office/zotero/firefox-bin/default.nix
index 52751908fa7..edf56c3eb4d 100644
--- a/pkgs/applications/office/zotero/firefox-bin/default.nix
+++ b/pkgs/applications/office/zotero/firefox-bin/default.nix
@@ -30,7 +30,7 @@
 , nspr
 , nss
 , pango
-, heimdal
+, libheimdal
 , libpulseaudio
 , systemd
 }:
@@ -102,7 +102,7 @@ stdenv.mkDerivation {
       nspr
       nss
       pango
-      heimdal
+      libheimdal
       libpulseaudio
       systemd
     ] + ":" + stdenv.lib.makeSearchPath "lib64" [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de0afef2fd5..a640579e227 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9097,7 +9097,7 @@ let
 
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
-    kerberos = heimdal;
+    kerberos = null;  # Bundle kerberos because samba uses internal, non-stable functions
     gnutls = gnutls33;
     # enableLDAP
   };

From 8ce4cb4de81fd2b79d8e99e74be4e4a1c481f030 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 26 Jun 2015 17:24:11 -0700
Subject: [PATCH 1644/2322] Also fix the default reference for kerberos

---
 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 a640579e227..591a1adc400 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6453,7 +6453,7 @@ let
 
   # TODO : Add MIT Kerberos and let admin choose.
   # TODO : Fix kerberos on Darwin
-  kerberos = if stdenv.isDarwin then null else heimdal;
+  kerberos = if stdenv.isDarwin then null else libheimdal;
 
   heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
     openldap = openldap.override {

From b6322e121583f8d31d6514e7dfd1195906b928e3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 26 Jun 2015 22:04:45 -0700
Subject: [PATCH 1645/2322] krb5: Break out into a lib and not lib version

---
 nixos/modules/config/krb5.nix                |  2 +-
 pkgs/development/libraries/kerberos/krb5.nix | 54 ++++++++++++++------
 pkgs/top-level/all-packages.nix              |  7 +--
 3 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/config/krb5.nix b/nixos/modules/config/krb5.nix
index 991b5b16cc6..d2198e4ac1a 100644
--- a/nixos/modules/config/krb5.nix
+++ b/nixos/modules/config/krb5.nix
@@ -48,7 +48,7 @@ in
 
   config = mkIf config.krb5.enable {
 
-    environment.systemPackages = [ pkgs.krb5 ];
+    environment.systemPackages = [ pkgs.krb5Full ];
 
     environment.etc."krb5.conf".text =
       ''
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 41c570ee554..4a97ab8fb54 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -1,41 +1,61 @@
-{ stdenv, fetchurl, pkgconfig, perl, ncurses, yacc, openssl, openldap, bootstrap_cmds }:
+{ stdenv, fetchurl, pkgconfig, perl, yacc, bootstrap_cmds
+, openssl, openldap, libedit
+
+# Extra Arguments
+, type ? ""
+}:
 
 let
-  pname = "krb5";
-  version = "1.13.1";
-  name = "${pname}-${version}";
-  webpage = http://web.mit.edu/kerberos/;
+  libOnly = type == "lib";
 in
-
-stdenv.mkDerivation (rec {
-  inherit name;
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "${type}krb5-${version}";
+  version = "1.13.1";
 
   src = fetchurl {
-    url = "${webpage}dist/krb5/1.13/${name}-signed.tar";
+    url = "${meta.homepage}dist/krb5/1.13/krb5-${version}-signed.tar";
     sha256 = "0gk6jvr64rf6l4xcyxn8i3fr5d1j7dhqvwyv3vw2qdkzz7yjkxjd";
   };
 
-  buildInputs = [ pkgconfig perl ncurses yacc openssl openldap ]
+  nativeBuildInputs = [ pkgconfig perl yacc ]
     # Provides the mig command used by the build scripts
-    ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds ;
+    ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds;
+  buildInputs = [ openssl ]
+    ++ optionals (!libOnly) [ openldap libedit ];
 
   unpackPhase = ''
     tar -xf $src
-    tar -xzf ${name}.tar.gz
-    cd ${name}/src
+    tar -xzf krb5-${version}.tar.gz
+    cd krb5-${version}/src
   '';
 
-  configureFlags = [ "--with-tcl=no" ];
+  buildPhase = optionalString libOnly ''
+    (cd util; make -j $NIX_BUILD_CORES)
+    (cd include; make -j $NIX_BUILD_CORES)
+    (cd lib; make -j $NIX_BUILD_CORES)
+    (cd build-tools; make -j $NIX_BUILD_CORES)
+  '';
+
+  installPhase = optionalString libOnly ''
+    mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}}
+    (cd util; make -j $NIX_BUILD_CORES install)
+    (cd include; make -j $NIX_BUILD_CORES install)
+    (cd lib; make -j $NIX_BUILD_CORES install)
+    (cd build-tools; make -j $NIX_BUILD_CORES install)
+    rm -rf $out/{sbin,share}
+    find $out/bin -type f | grep -v 'krb5-config' | xargs rm
+  '';
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "MIT Kerberos 5";
-    homepage = webpage;
-    license = "MPL";
+    homepage = http://web.mit.edu/kerberos/;
+    license = licenses.mit;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
   };
 
   passthru.implementation = "krb5";
-})
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d86ca00d6c..33424e100ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6526,13 +6526,10 @@ let
 
   kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
 
-  krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
-    openldap = openldap.override {
-      cyrus_sasl = cyrus_sasl.override { kerberos = null; };
-    };
+  krb5Full = callPackage ../development/libraries/kerberos/krb5.nix {
     inherit (darwin) bootstrap_cmds;
   };
-  libkrb5 = krb5;
+  libkrb5 = krb5Full.override { type = "lib"; };
 
   LASzip = callPackage ../development/libraries/LASzip { };
 

From ccc47a6a420f5d7f3ee7c677c994505444b88234 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 26 Jun 2015 22:06:16 -0700
Subject: [PATCH 1646/2322] kerberos: Use mit by default as it is has more
 upstream support / bugfixes

---
 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 33424e100ef..247ff38acd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6385,9 +6385,9 @@ let
 
   hamlib = callPackage ../development/libraries/hamlib { };
 
-  # TODO : Add MIT Kerberos and let admin choose.
-  # TODO : Fix kerberos on Darwin
-  kerberos = if stdenv.isDarwin then null else libheimdal;
+  # TODO : Let admin choose.
+  # We are using mit-krb5 because it is better maintained
+  kerberos = libkrb5;
 
   heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
     openldap = openldap.override {

From 769ea09360b8bbc8e5410dfac1d05206ee38b2eb Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 26 Jun 2015 22:41:25 -0700
Subject: [PATCH 1647/2322] heimdal: Use the git version and breakout into a
 library

---
 .../libraries/kerberos/heimdal.nix            | 71 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  9 +--
 2 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 320e161d3da..f61af50088b 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,54 +1,79 @@
-{ stdenv, fetchurl, pkgconfig, flex, yacc, readline, openldap, libcap_ng
-, sqlite, db, ncurses, openssl, cyrus_sasl
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python, perl, yacc, flex
+, texinfo, perlPackages
+, openldap, libcap_ng, sqlite, openssl, db, libedit, pam
+
+# Extra Args
+, type ? ""
 }:
 
+let
+  libOnly = type == "lib";
+in
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "heimdal-1.5.3";
+  name = "${type}heimdal-2015-06-17";
 
-  src = fetchurl {
-    urls = [
-      "http://www.h5l.org/dist/src/${name}.tar.gz"
-      "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz"
-    ];
-    sha256 = "19gypf9vzfrs2bw231qljfl4cqc1riyg0ai0xmm1nd1wngnpphma";
+  src = fetchFromGitHub {
+    owner = "heimdal";
+    repo = "heimdal";
+    rev = "be63a2914adcbea7d42d56e674ee6edb4883ebaf";
+    sha256 = "147gv49gmy94y6f0x1vx523qni0frgcp3r7fill0r06rkfgfzc0j";
   };
 
+  nativeBuildInputs = [ autoreconfHook pkgconfig python perl yacc flex ]
+    ++ (with perlPackages; [ JSON ])
+    ++ optional (!libOnly) texinfo;
+  buildInputs = [ libcap_ng sqlite openssl db libedit ]
+    ++ optionals (!libOnly) [ openldap pam ];
+
   ## ugly, X should be made an option
   configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
     "--enable-hdb-openldap-module"
     "--with-capng"
-    "--with-openldap=${openldap}"
     "--with-sqlite3=${sqlite}"
-    "--with-openssl-lib=${openssl}/lib"
+    "--with-berkeley-db=${db}"
+    "--with-libedit=${libedit}"
+    "--with-openssl=${openssl}"
     "--without-x"
+  ] ++ optionals (!libOnly) [
+    "--with-openldap=${openldap}"
   ];
 
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -pthread"
+  buildPhase = optionalString libOnly ''
+    (cd include; make -j $NIX_BUILD_CORES)
+    (cd lib; make -j $NIX_BUILD_CORES)
+    (cd tools; make -j $NIX_BUILD_CORES)
+  '';
+
+  installPhase = optionalString libOnly ''
+    (cd include; make -j $NIX_BUILD_CORES install)
+    (cd lib; make -j $NIX_BUILD_CORES install)
+    (cd tools; make -j $NIX_BUILD_CORES install)
+    rm -rf $out/{libexec,sbin,share}
+    find $out/bin -type f | grep -v 'krb5-config' | xargs rm
   '';
 
   # We need to build hcrypt for applications like samba
   postBuild = ''
-    (cd lib/hcrypto; make)
-    (cd include/hcrypto; make)
+    (cd include/hcrypto; make -j $NIX_BUILD_CORES)
+    (cd lib/hcrypto; make -j $NIX_BUILD_CORES)
   '';
 
   postInstall = ''
     # Install hcrypto
-    (cd lib/hcrypto; make install)
-    (cd include/hcrypto; make install)
+    (cd include/hcrypto; make -j $NIX_BUILD_CORES install)
+    (cd lib/hcrypto; make -j $NIX_BUILD_CORES install)
 
-    # dont succeed with --libexec=$out/sbin, so
+    # Doesn't succeed with --libexec=$out/sbin, so
     mv "$out/libexec/"* $out/sbin/
     rmdir $out/libexec
   '';
 
-  buildInputs = [
-    pkgconfig flex yacc readline openldap libcap_ng sqlite db ncurses
-    cyrus_sasl openssl
-  ];
+  enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "an implementation of Kerberos 5 (and some more stuff) largely written in Sweden";
     license = licenses.bsd3;
     platforms = platforms.linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 247ff38acd7..a7f70abcee2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6389,13 +6389,8 @@ let
   # We are using mit-krb5 because it is better maintained
   kerberos = libkrb5;
 
-  heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
-    openldap = openldap.override {
-      cyrus_sasl = cyrus_sasl.override { kerberos = null; };
-    };
-    cyrus_sasl = cyrus_sasl.override { kerberos = null; };
-  };
-  libheimdal = heimdal;
+  heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
+  libheimdal = heimdal.override { type = "lib"; };
 
   harfbuzz = callPackage ../development/libraries/harfbuzz { };
   harfbuzz-icu = callPackage ../development/libraries/harfbuzz {

From a13fe2db47fe10e9aeaec0b8a7b476ef9d865016 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 26 Jun 2015 22:41:58 -0700
Subject: [PATCH 1648/2322] Fix redundancy

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

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 4a97ab8fb54..dacd454111b 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "MIT Kerberos 5";
     homepage = http://web.mit.edu/kerberos/;
     license = licenses.mit;

From 943b282800994bf09c4fb91c4b5ccd0cdbae4f3a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 26 Jun 2015 22:45:20 -0700
Subject: [PATCH 1649/2322] heimdal: Always install hcrypto

---
 pkgs/development/libraries/kerberos/heimdal.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index f61af50088b..159b53b7650 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -45,12 +45,16 @@ stdenv.mkDerivation rec {
     (cd include; make -j $NIX_BUILD_CORES)
     (cd lib; make -j $NIX_BUILD_CORES)
     (cd tools; make -j $NIX_BUILD_CORES)
+    (cd include/hcrypto; make -j $NIX_BUILD_CORES)
+    (cd lib/hcrypto; make -j $NIX_BUILD_CORES)
   '';
 
   installPhase = optionalString libOnly ''
     (cd include; make -j $NIX_BUILD_CORES install)
     (cd lib; make -j $NIX_BUILD_CORES install)
     (cd tools; make -j $NIX_BUILD_CORES install)
+    (cd include/hcrypto; make -j $NIX_BUILD_CORES install)
+    (cd lib/hcrypto; make -j $NIX_BUILD_CORES install)
     rm -rf $out/{libexec,sbin,share}
     find $out/bin -type f | grep -v 'krb5-config' | xargs rm
   '';

From 9c5ef0469c82839d66ba39d7b971e521d15f5bf8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 26 Jun 2015 23:02:20 -0700
Subject: [PATCH 1650/2322] krb5: 1.13.1 -> 1.13.2

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

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index dacd454111b..2e5e48891b8 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -11,11 +11,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "${type}krb5-${version}";
-  version = "1.13.1";
+  version = "1.13.2";
 
   src = fetchurl {
     url = "${meta.homepage}dist/krb5/1.13/krb5-${version}-signed.tar";
-    sha256 = "0gk6jvr64rf6l4xcyxn8i3fr5d1j7dhqvwyv3vw2qdkzz7yjkxjd";
+    sha256 = "1qbdzyrws7d0q4filsibh28z54pd5l987jr0ygv43iq9085w6a75";
   };
 
   nativeBuildInputs = [ pkgconfig perl yacc ]

From 559cbdaab74e69361cbd688b6ccf1789b7e30ef1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 26 Jun 2015 23:07:10 -0700
Subject: [PATCH 1651/2322] heimdal: Rename to heimdalFull

---
 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 a7f70abcee2..e702f32a1fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6389,7 +6389,7 @@ let
   # We are using mit-krb5 because it is better maintained
   kerberos = libkrb5;
 
-  heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
+  heimdalFull = callPackage ../development/libraries/kerberos/heimdal.nix { };
   libheimdal = heimdal.override { type = "lib"; };
 
   harfbuzz = callPackage ../development/libraries/harfbuzz { };

From 729725501922fad5955b86bf0e06a2f6fee659f6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 27 Jun 2015 00:17:52 -0700
Subject: [PATCH 1652/2322] Convert all jack references to libjack2

---
 pkgs/applications/audio/QmidiNet/default.nix         |  4 ++--
 pkgs/applications/audio/a2jmidid/default.nix         |  4 ++--
 pkgs/applications/audio/ardour/ardour3.nix           |  4 ++--
 pkgs/applications/audio/ardour/default.nix           |  4 ++--
 pkgs/applications/audio/artyFX/default.nix           |  4 ++--
 pkgs/applications/audio/bitmeter/default.nix         |  4 ++--
 pkgs/applications/audio/bristol/default.nix          |  4 ++--
 pkgs/applications/audio/calf/default.nix             |  4 ++--
 pkgs/applications/audio/dirt/default.nix             |  4 ++--
 pkgs/applications/audio/distrho/default.nix          |  4 ++--
 pkgs/applications/audio/drumgizmo/default.nix        |  4 ++--
 pkgs/applications/audio/drumkv1/default.nix          |  6 +++---
 pkgs/applications/audio/faust/faust2jack.nix         |  4 ++--
 pkgs/applications/audio/faust/faust2jaqt.nix         |  4 ++--
 pkgs/applications/audio/fluidsynth/default.nix       |  4 ++--
 pkgs/applications/audio/fmit/default.nix             |  4 ++--
 pkgs/applications/audio/foo-yc20/default.nix         |  4 ++--
 pkgs/applications/audio/freewheeling/default.nix     |  4 ++--
 pkgs/applications/audio/guitarix/default.nix         |  4 ++--
 pkgs/applications/audio/hydrogen/default.nix         |  4 ++--
 pkgs/applications/audio/ingen/default.nix            |  4 ++--
 pkgs/applications/audio/jaaa/default.nix             |  4 ++--
 pkgs/applications/audio/jack-capture/default.nix     |  4 ++--
 .../audio/jack-oscrolloscope/default.nix             |  4 ++--
 pkgs/applications/audio/jack-rack/default.nix        |  4 ++--
 pkgs/applications/audio/jackmeter/default.nix        |  4 ++--
 pkgs/applications/audio/jalv/default.nix             |  4 ++--
 pkgs/applications/audio/lash/default.nix             |  4 ++--
 pkgs/applications/audio/linuxsampler/default.nix     |  4 ++--
 pkgs/applications/audio/lmms/default.nix             |  4 ++--
 pkgs/applications/audio/mhwaveedit/default.nix       |  4 ++--
 pkgs/applications/audio/milkytracker/default.nix     |  4 ++--
 pkgs/applications/audio/moc/default.nix              |  4 ++--
 pkgs/applications/audio/musescore/default.nix        |  4 ++--
 pkgs/applications/audio/petrifoo/default.nix         |  4 ++--
 pkgs/applications/audio/projectm/default.nix         |  4 ++--
 pkgs/applications/audio/puredata/default.nix         |  4 ++--
 pkgs/applications/audio/qjackctl/default.nix         |  4 ++--
 pkgs/applications/audio/qsynth/default.nix           |  4 ++--
 pkgs/applications/audio/qtractor/default.nix         |  4 ++--
 pkgs/applications/audio/rakarrack/default.nix        |  4 ++--
 pkgs/applications/audio/samplv1/default.nix          |  6 +++---
 pkgs/applications/audio/seq24/default.nix            |  4 ++--
 pkgs/applications/audio/setbfree/default.nix         |  4 ++--
 pkgs/applications/audio/sonic-visualiser/default.nix |  4 ++--
 pkgs/applications/audio/sooperlooper/default.nix     |  4 ++--
 pkgs/applications/audio/synthv1/default.nix          |  6 +++---
 pkgs/applications/audio/tetraproc/default.nix        |  6 +++---
 pkgs/applications/audio/vmpk/default.nix             |  4 ++--
 pkgs/applications/audio/x42-plugins/default.nix      |  4 ++--
 pkgs/applications/audio/xsynth-dssi/default.nix      |  4 ++--
 pkgs/applications/audio/yoshimi/default.nix          |  4 ++--
 pkgs/applications/audio/zam-plugins/default.nix      |  4 ++--
 pkgs/applications/audio/zynaddsubfx/default.nix      |  4 ++--
 pkgs/applications/misc/blender/default.nix           |  4 ++--
 pkgs/applications/video/mplayer/default.nix          |  6 +++---
 pkgs/applications/video/mpv/default.nix              |  6 +++---
 .../video/simplescreenrecorder/default.nix           |  4 ++--
 pkgs/applications/video/vlc/default.nix              |  4 ++--
 .../development/haskell-modules/hackage-packages.nix | 12 ++++++------
 .../interpreters/supercollider/default.nix           |  4 ++--
 pkgs/development/libraries/aubio/default.nix         |  4 ++--
 pkgs/development/libraries/dssi/default.nix          |  2 +-
 pkgs/development/libraries/ffmpeg-full/default.nix   |  6 +++---
 pkgs/development/libraries/mlt/default.nix           |  4 ++--
 pkgs/development/libraries/mlt/qt5.nix               |  4 ++--
 pkgs/misc/emulators/mednafen/default.nix             |  4 ++--
 pkgs/servers/mpd/default.nix                         |  4 ++--
 pkgs/tools/audio/darkice/default.nix                 |  4 ++--
 pkgs/tools/audio/liquidsoap/full.nix                 |  4 ++--
 pkgs/tools/misc/timidity/default.nix                 |  6 +++---
 pkgs/top-level/all-packages.nix                      |  4 ++--
 pkgs/top-level/python-packages.nix                   |  2 +-
 73 files changed, 156 insertions(+), 156 deletions(-)

diff --git a/pkgs/applications/audio/QmidiNet/default.nix b/pkgs/applications/audio/QmidiNet/default.nix
index 4ab871c22a0..4e89f125dd9 100644
--- a/pkgs/applications/audio/QmidiNet/default.nix
+++ b/pkgs/applications/audio/QmidiNet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, alsaLib, jack2 }:
+{ stdenv, fetchurl, qt4, alsaLib, libjack2 }:
 
 stdenv.mkDerivation rec {
   version = "0.2.1";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1a1pj4w74wj1gcfv4a0vzcglmr5sw0xp0y56w8rk3ig4k11xi8sa";
   };
 
-  buildInputs = [ qt4 alsaLib jack2 ];
+  buildInputs = [ qt4 alsaLib libjack2 ];
 
   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";
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index 218a0f8c6d9..7b0aad152ab 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, alsaLib, dbus, jack2
+{ stdenv, fetchurl, makeWrapper, pkgconfig, alsaLib, dbus, libjack2
 , python, pythonDBus }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia";
   };
 
-  buildInputs = [ makeWrapper pkgconfig alsaLib dbus jack2 python pythonDBus ];
+  buildInputs = [ makeWrapper pkgconfig alsaLib dbus libjack2 python pythonDBus ];
 
   configurePhase = "python waf configure --prefix=$out";
 
diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix
index aca04f299c2..a501fd95427 100644
--- a/pkgs/applications/audio/ardour/ardour3.nix
+++ b/pkgs/applications/audio/ardour/ardour3.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw
-, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, jack2
+, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, libjack2
 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
 , libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = 
     [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc
-      glibmm graphviz gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
+      glibmm graphviz gtk gtkmm libjack2 libgnomecanvas libgnomecanvasmm liblo
       libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
       libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2
       makeWrapper pango perl pkgconfig python rubberband serd sord-svn sratom suil taglib vampSDK
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 280cf6e8042..5327b6b77d7 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw
-, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, jack2
+, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, libjack2
 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
 , libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = 
     [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc
-      glibmm graphviz gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
+      glibmm graphviz gtk gtkmm libjack2 libgnomecanvas libgnomecanvasmm liblo
       libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
       libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2
       makeWrapper pango perl pkgconfig python rubberband serd sord-svn sratom suil taglib vampSDK
diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix
index e60381710c3..345d8f6ff0a 100644
--- a/pkgs/applications/audio/artyFX/default.nix
+++ b/pkgs/applications/audio/artyFX/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cairomm, cmake, jack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }:
+{ stdenv, fetchgit, cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "artyFX-git-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "2e3f6ab6f829c0ec177e85f4e419286616cf35fb7303445caa09d3438cac27d5";
   };
 
-  buildInputs = [ cairomm cmake jack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk pkgconfig   ];
+  buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk pkgconfig   ];
 
   meta = with stdenv.lib; {
     homepage = http://openavproductions.com/artyfx/;
diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix
index 2084ab481fa..0ca3d99ddc6 100644
--- a/pkgs/applications/audio/bitmeter/default.nix
+++ b/pkgs/applications/audio/bitmeter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jack2, gtk2, pkgconfig }:
+{ stdenv, fetchurl, libjack2, gtk2, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "bitmeter-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7";
   };
 
-  buildInputs = [ jack2 gtk2 pkgconfig ];
+  buildInputs = [ libjack2 gtk2 pkgconfig ];
 
   meta = with stdenv.lib; {
     homepage = http://devel.tlrmx.org/audio/bitmeter/;
diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix
index d45ab818273..db1f7895f4b 100644
--- a/pkgs/applications/audio/bristol/default.nix
+++ b/pkgs/applications/audio/bristol/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, libpulseaudio, xlibs }:
+{ stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xlibs }:
 
 stdenv.mkDerivation  rec {
   name = "bristol-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation  rec {
   };
 
   buildInputs = [
-    alsaLib jack2 pkgconfig libpulseaudio xlibs.libX11 xlibs.libXext
+    alsaLib libjack2 pkgconfig libpulseaudio xlibs.libX11 xlibs.libXext
     xlibs.xproto
   ];
 
diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix
index 0f6ebfcedb5..5f6538ec4bc 100644
--- a/pkgs/applications/audio/calf/default.nix
+++ b/pkgs/applications/audio/calf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib
-, gtk, jack2, ladspaH , libglade, lv2, pkgconfig }:
+, gtk, libjack2, ladspaH , libglade, lv2, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "calf-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ 
-    cairo expat fftwSinglePrec fluidsynth glib gtk jack2 ladspaH
+    cairo expat fftwSinglePrec fluidsynth glib gtk libjack2 ladspaH
     libglade lv2 pkgconfig
   ];
 
diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix
index 74adf4533fa..4da15a4b8e3 100644
--- a/pkgs/applications/audio/dirt/default.nix
+++ b/pkgs/applications/audio/dirt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, jack2 }:
+{ stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }:
 
 stdenv.mkDerivation rec {
   name = "dirt-2015-04-28";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     rev = "cfc5e85318defda7462192b5159103c823ce61f7";
     sha256 = "1shbyp54q64g6bsl6hhch58k3z1dyyy9ph6cq2xvdf8syy00sisz";
   };
-  buildInputs = [ libsndfile libsamplerate liblo jack2 ];
+  buildInputs = [ libsndfile libsamplerate liblo libjack2 ];
   postPatch = ''
     sed -i "s|./samples|$out/share/dirt/samples|" file.h
   '';
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index e6d5971b6fd..1e52e842330 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jack2
+{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2
 , libxslt, lv2, pkgconfig, premake3, xlibs }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    alsaLib fftwSinglePrec freetype jack2 pkgconfig premake3
+    alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3
     xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext
     xlibs.libXinerama xlibs.libXrender
   ];
diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix
index 2daafda554e..92ea6ee2fae 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, expat, glib, jack2, libX11, libpng
+{ stdenv, fetchurl, alsaLib, expat, glib, libjack2, libX11, libpng
 , libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--enable-lv2" ];
 
   buildInputs = [
-    alsaLib expat glib jack2 libX11 libpng libpthreadstubs libsmf
+    alsaLib expat glib libjack2 libX11 libpng libpthreadstubs libsmf
     libsndfile lv2 pkgconfig
   ];
 
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index b3a496c26a1..6d585905766 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jack2, libsndfile, lv2, qt4 }:
+{ stdenv, fetchurl, libjack2, libsndfile, lv2, qt4 }:
 
 stdenv.mkDerivation rec {
   name = "drumkv1-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1f0vpwq7vydldrq9fdfipbkzqqndyxlx0n81ch1i9kw81xj3sxjq";
   };
 
-  buildInputs = [ jack2 libsndfile lv2 qt4 ];
+  buildInputs = [ libjack2 libsndfile lv2 qt4 ];
 
   meta = with stdenv.lib; {
     description = "An old-school drum-kit sampler synthesizer with stereo fx";
@@ -18,4 +18,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix
index bec523ad021..9dfb7f875c5 100644
--- a/pkgs/applications/audio/faust/faust2jack.nix
+++ b/pkgs/applications/audio/faust/faust2jack.nix
@@ -1,6 +1,6 @@
 { faust
 , gtk
-, jack2
+, jack2Full
 , opencv
 }:
 
@@ -16,7 +16,7 @@ faust.wrapWithBuildEnv {
 
   propagatedBuildInputs = [
     gtk
-    jack2
+    jack2Full
     opencv
   ];
 
diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix
index 3590bc6860d..c0911b31538 100644
--- a/pkgs/applications/audio/faust/faust2jaqt.nix
+++ b/pkgs/applications/audio/faust/faust2jaqt.nix
@@ -1,5 +1,5 @@
 { faust
-, jack2
+, jack2Full
 , opencv
 , qt4
 }:
@@ -14,7 +14,7 @@ faust.wrapWithBuildEnv {
   ];
 
   propagatedBuildInputs = [
-    jack2
+    jack2Full
     opencv
     qt4
   ];
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index 339cccfca70..bd35b78fbc0 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, glib, jack2, libsndfile, pkgconfig
+{ stdenv, fetchurl, alsaLib, glib, libjack2, libsndfile, pkgconfig
 , libpulseaudio }:
 
 stdenv.mkDerivation  rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation  rec {
     "-framework CoreAudio";
 
   buildInputs = [ glib libsndfile pkgconfig ]
-    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio jack2 ];
+    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ];
 
   meta = with stdenv.lib; {
     description = "Real-time software synthesizer based on the SoundFont 2 specifications";
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index a8acfbffb05..712b3df9f25 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, alsaLib, cmake, fftw
-, freeglut, jack2, libXmu, qt4 }:
+, freeglut, libjack2, libXmu, qt4 }:
 
 let version = "1.0.0"; in
 stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     owner = "gillesdegottex";
   };
 
-  buildInputs = [ alsaLib fftw freeglut jack2 libXmu qt4 ];
+  buildInputs = [ alsaLib fftw freeglut libjack2 libXmu qt4 ];
   nativeBuildInputs = [ cmake ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix
index d0de8c9f9a7..025ca594dff 100644
--- a/pkgs/applications/audio/foo-yc20/default.nix
+++ b/pkgs/applications/audio/foo-yc20/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub,  jack2, gtk2, lv2, faust, pkgconfig }:
+{ stdenv, fetchFromGitHub,  libjack2, gtk2, lv2, faust, pkgconfig }:
 
 stdenv.mkDerivation rec {
   version = "git-2015-05-21";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0i8261n95n4xic766h70xkrpbvw3sag96n1883ahmg6h7yb94avq";
   };
 
-  buildInputs = [ jack2 gtk2 lv2 faust pkgconfig ];
+  buildInputs = [ libjack2 gtk2 lv2 faust pkgconfig ];
 
   makeFlags = "PREFIX=$(out)";
 
diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix
index 0e7f8ad9957..63917cac6c0 100644
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/pkgs/applications/audio/freewheeling/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls33, freetype
-, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, jack2, libvorbis
+, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis
 , libsndfile, libogg
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     pkgconfig autoconf automake gnutls33 freetype SDL SDL_gfx SDL_ttf
-    liblo libxml2 jack2 alsaLib libvorbis libsndfile libogg
+    liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg
   ];
 
   preConfigure = "autoreconf -vfi";
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 9c1859cacf4..c3e0fc79e21 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, gettext, intltool, pkgconfig, python
-, avahi, bluez, boost, eigen, fftw, glib, glibmm, gtk, gtkmm, jack2
+, avahi, bluez, boost, eigen, fftw, glib, glibmm, gtk, gtkmm, libjack2
 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
 ,  zita-convolver, zita-resampler
 , optimizationSupport ? false # Enable support for native CPU extensions
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ gettext intltool pkgconfig python ];
 
   buildInputs = [
-    avahi bluez boost eigen fftw glib glibmm gtk gtkmm jack2
+    avahi bluez boost eigen fftw glib glibmm gtk gtkmm libjack2
     ladspaH librdf libsndfile lilv lv2 serd sord sratom
     zita-convolver zita-resampler
   ];
diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix
index 434f683bd5c..21767e3079f 100644
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/pkgs/applications/audio/hydrogen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, boost, cmake, glib, jack2, libarchive
+{ stdenv, fetchurl, alsaLib, boost, cmake, glib, libjack2, libarchive
 , liblrdf, libsndfile, pkgconfig, qt4 }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ 
-    alsaLib boost cmake glib jack2 libarchive liblrdf libsndfile pkgconfig qt4
+    alsaLib boost cmake glib libjack2 libarchive liblrdf libsndfile pkgconfig qt4
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index 40ba278f7a0..ab8f7af1bd5 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jack2, lilv-svn
+{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, libjack2, lilv-svn
 , lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord-svn, sratom
 , suil
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation  rec {
   };
 
   buildInputs = [
-    boost ganv glibmm gtk gtkmm jack2 lilv-svn lv2 makeWrapper pkgconfig
+    boost ganv glibmm gtk gtkmm libjack2 lilv-svn lv2 makeWrapper pkgconfig
     python raul serd sord-svn sratom suil
   ];
 
diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix
index 0b8f8863d6c..0427283d54d 100644
--- a/pkgs/applications/audio/jaaa/default.nix
+++ b/pkgs/applications/audio/jaaa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, jack2, xlibs, zita-alsa-pcmi }:
+{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xlibs, zita-alsa-pcmi }:
 
 stdenv.mkDerivation rec {
   name = "jaaa-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    alsaLib libclthreads libclxclient libX11 libXft libXrender fftwFloat jack2 zita-alsa-pcmi
+    alsaLib libclthreads libclxclient libX11 libXft libXrender fftwFloat libjack2 zita-alsa-pcmi
   ];
 
   makeFlags = [
diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix
index 2e6f6b0dd82..ef6d13e5696 100644
--- a/pkgs/applications/audio/jack-capture/default.nix
+++ b/pkgs/applications/audio/jack-capture/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jack2, libsndfile, pkgconfig }:
+{ stdenv, fetchurl, libjack2, libsndfile, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "jack_capture-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv";
   };
 
-  buildInputs = [ jack2 libsndfile pkgconfig ];
+  buildInputs = [ libjack2 libsndfile pkgconfig ];
 
   buildPhase = "PREFIX=$out make jack_capture";
 
diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix
index 7b4d12a5b87..5f796a29035 100644
--- a/pkgs/applications/audio/jack-oscrolloscope/default.nix
+++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL, jack2, mesa, pkgconfig }:
+{ stdenv, fetchurl, SDL, libjack2, mesa, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "jack_oscrolloscope-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash";
   };
 
-  buildInputs = [ SDL jack2 mesa pkgconfig ];
+  buildInputs = [ SDL libjack2 mesa pkgconfig ];
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix
index 8ac47c570df..e4a48230e23 100644
--- a/pkgs/applications/audio/jack-rack/default.nix
+++ b/pkgs/applications/audio/jack-rack/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, jack2, ladspaH, gtk, alsaLib, libxml2, librdf }:
+{ stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk, alsaLib, libxml2, librdf }:
 stdenv.mkDerivation rec {
   name = "jack-rack-1.4.7";
   src = fetchurl {
     url = "mirror://sourceforge/jack-rack/${name}.tar.bz2";
     sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
   };
-  buildInputs = [ pkgconfig jack2 ladspaH gtk alsaLib libxml2 librdf ];
+  buildInputs = [ pkgconfig libjack2 ladspaH gtk alsaLib libxml2 librdf ];
 
   meta = {
     description = ''An effects "rack" for the JACK low latency audio API'';
diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix
index 74d98184d9d..c709483a3b2 100644
--- a/pkgs/applications/audio/jackmeter/default.nix
+++ b/pkgs/applications/audio/jackmeter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jack2, pkgconfig }:
+{ stdenv, fetchurl, libjack2, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "jackmeter-0.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r";
   };
 
-  buildInputs = [ jack2 pkgconfig ];
+  buildInputs = [ libjack2 pkgconfig ];
 
   meta = { 
     description = "Console jack loudness meter";
diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix
index bf01fe1a935..5e99e60c818 100644
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk, jack2, lilv, lv2, pkgconfig, python
+{ stdenv, fetchurl, gtk, libjack2, lilv, lv2, pkgconfig, python
 , serd, sord , sratom, suil }:
 
 stdenv.mkDerivation  rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation  rec {
   };
 
   buildInputs = [
-    gtk jack2 lilv lv2 pkgconfig python serd sord sratom suil
+    gtk libjack2 lilv lv2 pkgconfig python serd sord sratom suil
   ];
 
   configurePhase = "python waf configure --prefix=$out";
diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix
index e42babf13ef..8d1b561cb87 100644
--- a/pkgs/applications/audio/lash/default.nix
+++ b/pkgs/applications/audio/lash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, gtk, jack2, libuuid, libxml2
+{ stdenv, fetchurl, alsaLib, gtk, libjack2, libuuid, libxml2
 , makeWrapper, pkgconfig, readline }:
 
 assert libuuid != null;
@@ -15,7 +15,7 @@ stdenv.mkDerivation  rec {
   # http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346
   patches = [ ./socket.patch ./gcc-47.patch ];
 
-  buildInputs = [ alsaLib gtk jack2 libuuid libxml2 makeWrapper
+  buildInputs = [ alsaLib gtk libjack2 libuuid libxml2 makeWrapper
     pkgconfig readline ];
 
   postInstall = ''
diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix
index 2c4b26543eb..4dad6e58fee 100644
--- a/pkgs/applications/audio/linuxsampler/default.nix
+++ b/pkgs/applications/audio/linuxsampler/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison
-, jack2, libgig, libsndfile, libtool, lv2, pkgconfig }:
+, libjack2, libgig, libsndfile, libtool, lv2, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "linuxsampler-svn-${version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ 
-   alsaLib asio autoconf automake bison jack2 libgig libsndfile
+   alsaLib asio autoconf automake bison libjack2 libgig libsndfile
    libtool lv2 pkgconfig
   ];
 
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index 830d42eb91b..783b506c4d7 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, fluidsynth
-, fltk13, jack2, libvorbis , libsamplerate, libsndfile, pkgconfig
+, fltk13, libjack2, libvorbis , libsamplerate, libsndfile, pkgconfig
 , libpulseaudio, qt4, freetype
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation  rec {
   };
 
   buildInputs = [
-    SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth jack2
+    SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth libjack2
     libsamplerate libsndfile libvorbis pkgconfig libpulseaudio qt4
   ];
 
diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix
index 0234a1d3fe5..d0259ada3cf 100644
--- a/pkgs/applications/audio/mhwaveedit/default.nix
+++ b/pkgs/applications/audio/mhwaveedit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL , alsaLib, gtk, jack2, ladspaH
+{ stdenv, fetchurl, SDL , alsaLib, gtk, libjack2, ladspaH
 , ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio }:
 
 stdenv.mkDerivation  rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation  rec {
   };
 
   buildInputs =
-   [ SDL alsaLib gtk jack2 ladspaH libsamplerate libsndfile
+   [ SDL alsaLib gtk libjack2 ladspaH libsamplerate libsndfile
      pkgconfig libpulseaudio
    ];
 
diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix
index d5d7ea7be76..8bc0aebba5a 100644
--- a/pkgs/applications/audio/milkytracker/default.nix
+++ b/pkgs/applications/audio/milkytracker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, jack2, perl
+{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, libjack2, perl
 , zlib, zziplib
 }:
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     export CPATH=${zlib}/lib
   '';
 
-  buildInputs = [ SDL alsaLib autoconf automake jack2 perl zlib zziplib ];
+  buildInputs = [ SDL alsaLib autoconf automake libjack2 perl zlib zziplib ];
 
   meta = {
     description = "Music tracker application, similar to Fasttracker II";
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
index a87e74dc87c..4cb7668a43f 100644
--- a/pkgs/applications/audio/moc/default.nix
+++ b/pkgs/applications/audio/moc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg
-, libvorbis, libmpc, libsndfile, jack2, db, libmodplug, timidity, libid3tag
+, libvorbis, libmpc, libsndfile, libjack2, db, libmodplug, timidity, libid3tag
 , libtool
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis
-    libmpc libsndfile jack2 db libmodplug timidity libid3tag libtool
+    libmpc libsndfile libjack2 db libmodplug timidity libid3tag libtool
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index bfbfa577531..7f34d5df550 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, pkgconfig
-, alsaLib, freetype, jack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
+, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
 , portaudio, qt5 #, tesseract
 }:
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    alsaLib jack2 freetype lame libogg libpulseaudio libsndfile libvorbis
+    alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
     portaudio qt5.base qt5.declarative qt5.enginio qt5.script qt5.svg qt5.tools
     qt5.webkit qt5.xmlpatterns #tesseract
   ];
diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix
index 197a0aa1bbe..ffd920427ac 100644
--- a/pkgs/applications/audio/petrifoo/default.nix
+++ b/pkgs/applications/audio/petrifoo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, cmake, gtk, jack2, libgnomecanvas
+{ stdenv, fetchurl, alsaLib, cmake, gtk, libjack2, libgnomecanvas
 , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
 , pkgconfig }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation  rec {
   };
 
   buildInputs =
-   [ alsaLib cmake  gtk jack2 libgnomecanvas libpthreadstubs
+   [ alsaLib cmake  gtk libjack2 libgnomecanvas libpthreadstubs
      libsamplerate libsndfile libtool libxml2 pkgconfig
    ];
 
diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix
index fcfde86f7ee..764ee629dbf 100644
--- a/pkgs/applications/audio/projectm/default.nix
+++ b/pkgs/applications/audio/projectm/default.nix
@@ -2,7 +2,7 @@
 , glew, ftgl, ttf_bitstream_vera
 , withQt ? true, qt4
 , withLibvisual ? false, libvisual, SDL
-, withJack ? false, jack2
+, withJack ? false, libjack2
 , withPulseAudio ? true, libpulseaudio
 }:
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
     [ glew ftgl ]
     ++ optional withQt qt4
     ++ optionals withLibvisual [ libvisual SDL ]
-    ++ optional withJack jack2
+    ++ optional withJack libjack2
     ++ optional withPulseAudio libpulseaudio
     ;
 }
diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix
index 9abca0cb014..8fddcccd51c 100644
--- a/pkgs/applications/audio/puredata/default.nix
+++ b/pkgs/applications/audio/puredata/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoreconfHook, gettext, makeWrapper
-, alsaLib, jack2, tk
+, alsaLib, libjack2, tk
 }:
 
 stdenv.mkDerivation  rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation  rec {
 
   nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];
 
-  buildInputs = [ alsaLib jack2 ];
+  buildInputs = [ alsaLib libjack2 ];
 
   configureFlags = ''
     --enable-alsa
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 9b87dd53bf6..c200e39887a 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, alsaLib, jack2, dbus }:
+{ stdenv, fetchurl, qt4, alsaLib, libjack2, dbus }:
 
 stdenv.mkDerivation rec {
   version = "0.3.12";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "14yvnc4k3hwsjflg8b2d04bc63pdl0gyqjc7vl6rdn29nbr23zwc";
   };
 
-  buildInputs = [ qt4 alsaLib jack2 dbus ];
+  buildInputs = [ qt4 alsaLib libjack2 dbus ];
 
   configureFlags = "--enable-jack-version";
 
diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix
index a8ff526fad9..77c0ba9b2d4 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/pkgs/applications/audio/qsynth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, fluidsynth, jack2, qt4 }:
+{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qt4 }:
 
 stdenv.mkDerivation  rec {
   name = "qsynth-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation  rec {
     sha256 = "08kyn6cl755l9i1grzjx8yi3f8mgiz4gx0hgqad1n0d8yz85087b";
   };
 
-  buildInputs = [ alsaLib fluidsynth jack2 qt4 ];
+  buildInputs = [ alsaLib fluidsynth libjack2 qt4 ];
 
   meta = with stdenv.lib; {
     description = "Fluidsynth GUI";
diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
index d3d3a71febc..418efa23b20 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -1,4 +1,4 @@
-{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jack2
+{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, libjack2
 , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile
 , libtool, libvorbis, lilv, lv2, pkgconfig, qt4, rubberband, serd
 , sord, sratom, stdenv, suil }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ alsaLib autoconf automake dssi gtk jack2 ladspaH
+    [ alsaLib autoconf automake dssi gtk libjack2 ladspaH
       ladspaPlugins liblo libmad libsamplerate libsndfile libtool
       libvorbis lilv lv2 pkgconfig qt4 rubberband serd sord sratom
       suil
diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix
index 257a9967a5b..b746cccd113 100644
--- a/pkgs/applications/audio/rakarrack/default.nix
+++ b/pkgs/applications/audio/rakarrack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, alsaUtils, fltk, jack2, libXft,
+{ stdenv, fetchurl, alsaLib, alsaUtils, fltk, libjack2, libXft,
 libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }:
 
 stdenv.mkDerivation  rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation  rec {
 
   patches = [ ./fltk-path.patch ];
 
-  buildInputs = [ alsaLib alsaUtils fltk jack2 libXft libXpm libjpeg
+  buildInputs = [ alsaLib alsaUtils fltk libjack2 libXft libXpm libjpeg
     libpng libsamplerate libsndfile zlib ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 15bb1e0a17d..fd3f7791c1a 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jack2, libsndfile, lv2, qt4 }:
+{ stdenv, fetchurl, libjack2, libsndfile, lv2, qt4 }:
 
 stdenv.mkDerivation rec {
   name = "samplv1-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1c62fpfl9xv93m04hfh72vzbljr0c5p409vzf3xxmvj9x610yx1w";
   };
 
-  buildInputs = [ jack2 libsndfile lv2 qt4 ];
+  buildInputs = [ libjack2 libsndfile lv2 qt4 ];
 
   meta = with stdenv.lib; {
     description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx";
@@ -18,4 +18,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix
index 10376e02f43..63db865eba5 100644
--- a/pkgs/applications/audio/seq24/default.nix
+++ b/pkgs/applications/audio/seq24/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, gtkmm, jack2, pkgconfig }:
+{ stdenv, fetchurl, alsaLib, gtkmm, libjack2, pkgconfig }:
 
 stdenv.mkDerivation  rec {
   name = "seq24-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation  rec {
     sha256 = "07n80zj95i80vjmsflnlbqx5vv90qmp5f6a0zap8d30849l4y258";
   };
 
-  buildInputs = [ alsaLib gtkmm jack2 pkgconfig ];
+  buildInputs = [ alsaLib gtkmm libjack2 pkgconfig ];
 
   meta = with stdenv.lib; {
     description = "minimal loop based midi sequencer";
diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix
index 5a5d500a0e7..2a534047ae3 100644
--- a/pkgs/applications/audio/setbfree/default.nix
+++ b/pkgs/applications/audio/setbfree/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, freetype, ftgl, jack2, libX11, lv2
+{ stdenv, fetchurl, alsaLib, freetype, ftgl, libjack2, libX11, lv2
 , mesa, pkgconfig, ttf_bitstream_vera
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation  rec {
   '';
 
   buildInputs = [
-    alsaLib freetype ftgl jack2 libX11 lv2 mesa pkgconfig
+    alsaLib freetype ftgl libjack2 libX11 lv2 mesa pkgconfig
     ttf_bitstream_vera
   ];
 
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index 70162b9d185..e0aa6e00a46 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -1,6 +1,6 @@
 # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
 
-{ stdenv, fetchurl, alsaLib, bzip2, fftw, jack2, libX11, liblo
+{ stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
 , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
 , libsndfile, pkgconfig, libpulseaudio, qt5, redland
 , rubberband, serd, sord, vampSDK, fftwFloat
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       sord
       pkgconfig
       # optional
-      jack2
+      libjack2
       # portaudio
       libpulseaudio
       libmad
diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix
index b40e2187175..372339474a5 100644
--- a/pkgs/applications/audio/sooperlooper/default.nix
+++ b/pkgs/applications/audio/sooperlooper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, liblo, libxml2, jack2, libsndfile, wxGTK, libsigcxx
+{ stdenv, fetchurl, liblo, libxml2, libjack2, libsndfile, wxGTK, libsigcxx
 ,libsamplerate, rubberband, pkgconfig, ncurses
 }:
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-   liblo libxml2 jack2 libsndfile wxGTK libsigcxx
+   liblo libxml2 libjack2 libsndfile wxGTK libsigcxx
    libsamplerate rubberband pkgconfig ncurses
   ];
 
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index 7b00e8ac060..4a126f8774f 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, jack2, lv2 }:
+{ stdenv, fetchurl, qt4, libjack2, lv2 }:
 
 stdenv.mkDerivation rec {
   name = "synthv1-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "19zyvrvnmi7ahwg121vl2q17j9y8ln6lvpj5wxxcwif5538q75iw";
   };
 
-  buildInputs = [ qt4 jack2 lv2 ];
+  buildInputs = [ qt4 libjack2 lv2 ];
 
   meta = with stdenv.lib; {
     description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx";
@@ -18,4 +18,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix
index 309a400c555..a107dd9794b 100644
--- a/pkgs/applications/audio/tetraproc/default.nix
+++ b/pkgs/applications/audio/tetraproc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper
-, expat, fftwFloat, fontconfig, freetype, jack2, libclthreads, libclxclient
+, expat, fftwFloat, fontconfig, freetype, libjack2, jack2Full, libclthreads, libclxclient
 , libsndfile, libxcb, xlibs
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
 
   buildInputs = [
-    expat jack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype
+    expat libjack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype
     libxcb xlibs.libX11 xlibs.libXau xlibs.libXdmcp xlibs.libXft xlibs.libXrender
   ];
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     # Make sure Jack is avalable in $PATH for tetraproc
-    wrapProgram $out/bin/tetraproc --prefix PATH : "${jack2}/bin"
+    wrapProgram $out/bin/tetraproc --prefix PATH : "${jack2Full}/bin"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix
index 9a75fa5f383..5db7fe5afbc 100644
--- a/pkgs/applications/audio/vmpk/default.nix
+++ b/pkgs/applications/audio/vmpk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, pkgconfig
-, qt4, jack2
+, qt4, libjack2
 }:
 
 let
@@ -22,5 +22,5 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ qt4 jack2 ];
+  buildInputs = [ qt4 libjack2 ];
 }
diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index aabb6308c14..5603bc2fefc 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, ftgl, freefont_ttf, jack2, mesa_glu, pkgconfig
+{ stdenv, fetchurl, fetchgit, ftgl, freefont_ttf, libjack2, mesa_glu, pkgconfig
 , libltc, libsndfile, libsamplerate
 , lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }:
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0pjdhj58hb4n2053v92l7v7097fjm4xzrl8ks4g1hc7miy98ymdk";
   };
 
-  buildInputs = [ mesa_glu ftgl freefont_ttf jack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig  zita-convolver];
+  buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig  zita-convolver];
 
   makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ];
 
diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix
index 85e7235400b..c4ed20defd6 100644
--- a/pkgs/applications/audio/xsynth-dssi/default.nix
+++ b/pkgs/applications/audio/xsynth-dssi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, jack2,
+{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, libjack2,
 ladspaH, ladspaPlugins, liblo, pkgconfig }:
 
 stdenv.mkDerivation  rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation  rec {
     sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk";
   };
 
-  buildInputs = [ alsaLib autoconf automake dssi gtk jack2 ladspaH
+  buildInputs = [ alsaLib autoconf automake dssi gtk libjack2 ladspaH
     ladspaPlugins liblo pkgconfig ];
 
   installPhase = ''
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 0132d4a4c4c..9aafae7a5f4 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk
-, jack2, libsndfile, lv2, mesa, minixml, pkgconfig, zlib, xorg
+, libjack2, libsndfile, lv2, mesa, minixml, pkgconfig, zlib, xorg
 }:
 
 assert stdenv ? glibc;
@@ -14,7 +14,7 @@ stdenv.mkDerivation  rec {
   };
 
   buildInputs = [
-    alsaLib boost cairo fftwSinglePrec fltk jack2 libsndfile lv2 mesa
+    alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile lv2 mesa
     minixml zlib xorg.libpthreadstubs
   ];
 
diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix
index 8d383ca39d6..1ac7921119a 100644
--- a/pkgs/applications/audio/zam-plugins/default.nix
+++ b/pkgs/applications/audio/zam-plugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, libX11, mesa, liblo, jack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile }:
+{ stdenv, fetchurl, boost, libX11, mesa, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile }:
 
 stdenv.mkDerivation rec {
   name = "zam-plugins-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0icdrs4vaaj8gqi76jkkx5yk9h3agipa11cyb5h52y814q6mx6vm";
   };
 
-  buildInputs = [ boost libX11 mesa liblo jack2 ladspaH lv2 pkgconfig rubberband libsndfile ];
+  buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 pkgconfig rubberband libsndfile ];
 
   patchPhase = ''
     patchShebangs ./libs/generate-ttl.sh
diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index 3a89b406742..ec8971d319f 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, cmake, jack2, fftw, fltk13, libjpeg
+{ stdenv, fetchurl, alsaLib, cmake, libjack2, fftw, fltk13, libjpeg
 , minixml, pkgconfig, zlib
 }:
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation  rec {
     sha256 = "15byz08p5maf3v8l1zz11xan6s0qcfasjf1b81xc8rffh13x5f53";
   };
 
-  buildInputs = [ alsaLib jack2 fftw fltk13 libjpeg minixml zlib ];
+  buildInputs = [ alsaLib libjack2 fftw fltk13 libjpeg minixml zlib ];
   nativeBuildInputs = [ cmake pkgconfig ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 5e746716119..b717f3044bc 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -2,7 +2,7 @@
 , ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile
 , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
 , zlib, fftw
-, jackaudioSupport ? false, jack2
+, jackaudioSupport ? false, libjack2
 , cudaSupport ? false, cudatoolkit65
 , colladaSupport ? true, opencollada
 }:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       libjpeg libpng libsamplerate libsndfile libtiff mesa openal
       opencolorio openexr openimageio /* openjpeg */ python zlib fftw
     ]
-    ++ optional jackaudioSupport jack2
+    ++ optional jackaudioSupport libjack2
     ++ optional cudaSupport cudatoolkit65
     ++ optional colladaSupport opencollada;
 
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index 57f8289a1f9..a317e1d4fe5 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -17,7 +17,7 @@
 , speexSupport ? true, speex ? null
 , theoraSupport ? true, libtheora ? null
 , x264Support ? false, x264 ? null
-, jackaudioSupport ? false, jack2 ? null
+, jackaudioSupport ? false, libjack2 ? null
 , pulseSupport ? false, libpulseaudio ? null
 , bs2bSupport ? false, libbs2b ? null
 # For screenshots
@@ -44,7 +44,7 @@ assert lameSupport -> lame != null;
 assert speexSupport -> speex != null;
 assert theoraSupport -> libtheora != null;
 assert x264Support -> x264 != null;
-assert jackaudioSupport -> jack2 != null;
+assert jackaudioSupport -> libjack2 != null;
 assert pulseSupport -> libpulseaudio != null;
 assert bs2bSupport -> libbs2b != null;
 assert libpngSupport -> libpng != null;
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
     ++ optional dvdnavSupport libdvdnav
     ++ optional bluraySupport libbluray
     ++ optional cddaSupport cdparanoia
-    ++ optional jackaudioSupport jack2
+    ++ optional jackaudioSupport libjack2
     ++ optionals amrSupport [ amrnb amrwb ]
     ++ optional x264Support x264
     ++ optional pulseSupport libpulseaudio
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 03cb5154f85..1be0f5b9e0a 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -12,7 +12,7 @@
 , bluraySupport ? true, libbluray ? null
 , speexSupport ? true, speex ? null
 , theoraSupport ? true, libtheora ? null
-, jackaudioSupport ? true, jack2 ? null
+, jackaudioSupport ? true, libjack2 ? null
 , pulseSupport ? true, libpulseaudio ? null
 , bs2bSupport ? true, libbs2b ? null
 # For screenshots
@@ -39,7 +39,7 @@ assert dvdnavSupport -> libdvdnav != null;
 assert bluraySupport -> libbluray != null;
 assert speexSupport -> speex != null;
 assert theoraSupport -> libtheora != null;
-assert jackaudioSupport -> jack2 != null;
+assert jackaudioSupport -> libjack2 != null;
 assert pulseSupport -> libpulseaudio != null;
 assert bs2bSupport -> libbs2b != null;
 assert libpngSupport -> libpng != null;
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
     ++ optional dvdreadSupport libdvdread
     ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
     ++ optional bluraySupport libbluray
-    ++ optional jackaudioSupport jack2
+    ++ optional jackaudioSupport libjack2
     ++ optional pulseSupport libpulseaudio
     ++ optional screenSaverSupport libXScrnSaver
     ++ optional vdpauSupport libvdpau
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index 453829bc580..8560b83d5fa 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, ffmpeg, jack2, libX11, libXext
+{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext
 , libXfixes, mesa, pkgconfig, libpulseaudio, qt4
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    alsaLib ffmpeg jack2 libX11 libXext libXfixes mesa pkgconfig
+    alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa pkgconfig
     libpulseaudio qt4
   ];
 
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index adf5aed3f55..ae7f71e607e 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -3,7 +3,7 @@
 , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska
 , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
 , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg
-, mpeg2dec, udev, gnutls, avahi, libcddb, jack2, SDL, SDL_image
+, mpeg2dec, udev, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
 , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
 , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
 , libvdpau
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       libdc1394 libraw1394 libopus libebml libmatroska libvdpau
     ]
     ++ (if withQt5 then with qt5; [ base ] else [qt4])
-    ++ optional jackSupport jack2;
+    ++ optional jackSupport libjack2;
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index cbc01eb3f8d..2bf10c605af 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -77147,7 +77147,7 @@ self: {
 
   "jack" = callPackage
     ({ mkDerivation, array, base, bytestring, enumset, event-list
-     , explicit-exception, jack2, midi, non-negative, transformers, unix
+     , explicit-exception, libjack2, midi, non-negative, transformers, unix
      }:
      mkDerivation {
        pname = "jack";
@@ -77159,25 +77159,25 @@ self: {
          array base bytestring enumset event-list explicit-exception midi
          non-negative transformers unix
        ];
-       pkgconfigDepends = [ jack2 ];
+       pkgconfigDepends = [ libjack2 ];
        homepage = "http://www.haskell.org/haskellwiki/JACK";
        description = "Bindings for the JACK Audio Connection Kit";
        license = "GPL";
-     }) { inherit (pkgs) jack2;};
+     }) { inherit (pkgs) libjack2;};
 
   "jack-bindings" = callPackage
-    ({ mkDerivation, base, c2hs, jack2, mtl }:
+    ({ mkDerivation, base, c2hs, libjack2, mtl }:
      mkDerivation {
        pname = "jack-bindings";
        version = "0.1.1";
        sha256 = "1gmz2qiz7wzydj0rhswbfhwi0zbdcbps29l1lryzqxm8chfc9mbm";
        buildDepends = [ base mtl ];
        buildTools = [ c2hs ];
-       pkgconfigDepends = [ jack2 ];
+       pkgconfigDepends = [ libjack2 ];
        description = "DEPRECATED Bindings to the JACK Audio Connection Kit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) jack2;};
+     }) { inherit (pkgs) libjack2;};
 
   "jackminimix" = callPackage
     ({ mkDerivation, base, hosc }:
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index a8c967b5967..a20d5b1dfd1 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, pkgconfig
-, jack2, libsndfile, fftw, curl
+, libjack2, libsndfile, fftw, curl
 , libXt, qt, readline
 , useSCEL ? false, emacs
 }:
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [ 
-    jack2 libsndfile fftw curl libXt qt readline ]
+    libjack2 libsndfile fftw curl libXt qt readline ]
     ++ optional useSCEL emacs;
 }
diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index 7a5351da10e..472a2ad9807 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, fftw, jack2, libsamplerate
+{ stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate
 , libsndfile, pkgconfig, python
 }:
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    alsaLib fftw jack2 libsamplerate libsndfile pkgconfig python
+    alsaLib fftw libjack2 libsamplerate libsndfile pkgconfig python
   ];
 
   configurePhase = "python waf configure --prefix=$out";
diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix
index ae276c6aa0a..a544baf7d6d 100644
--- a/pkgs/development/libraries/dssi/default.nix
+++ b/pkgs/development/libraries/dssi/default.nix
@@ -1,5 +1,5 @@
 x@{builderDefsPackage
-  , ladspaH, jack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM
+  , ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM
   , libsamplerate, libtool, autoconf, automake, xproto, libICE, pkgconfig
   , ...}:
 builderDefsPackage
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index aee67f5cd77..7d108ba81ef 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -67,7 +67,7 @@
 , gnutls ? null
 , gsm ? null # GSM de/encoder
 #, ilbc ? null # iLBC de/encoder
-, jack2 ? null # Jack audio (only version 2 is supported in this build)
+, libjack2 ? null # Jack audio (only version 2 is supported in this build)
 , ladspaH ? null # LADSPA audio filtering
 , lame ? null # LAME MP3 encoder
 , libass ? null # (Advanced) SubStation Alpha subtitle rendering
@@ -157,7 +157,7 @@
  *   utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video
  *
  * Need fixes to support Darwin:
- *   frei0r, game-music-emu, gsm, jack2, libssh, libvpx(stable 1.3.0), openal, openjpeg_1,
+ *   frei0r, game-music-emu, gsm, libjack2, libssh, libvpx(stable 1.3.0), openal, openjpeg_1,
  *   pulseaudio, rtmpdump, samba, vid-stab, wavpack, x265. xavs
  *
  * Not supported:
@@ -397,7 +397,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
-    jack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
+    libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
     libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11
     libxcb libXext libXfixes libXv lzma openal openjpeg_1 libpulseaudio rtmpdump
     samba SDL soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 7cfbc8dfb87..2bb709612b4 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL, ffmpeg, frei0r, jack2, libdv, libsamplerate
+{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
 , libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    SDL ffmpeg frei0r jack2 libdv libsamplerate libvorbis libxml2
+    SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
     makeWrapper movit pkgconfig qt sox
   ];
 
diff --git a/pkgs/development/libraries/mlt/qt5.nix b/pkgs/development/libraries/mlt/qt5.nix
index 4fcd029971c..d3d8f6c6b86 100644
--- a/pkgs/development/libraries/mlt/qt5.nix
+++ b/pkgs/development/libraries/mlt/qt5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL, ffmpeg, frei0r, jack2, libdv, libsamplerate
+{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
 , libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt5, sox
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    SDL ffmpeg frei0r jack2 libdv libsamplerate libvorbis libxml2
+    SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
     makeWrapper movit pkgconfig qt5.base qt5.svg sox
   ];
 
diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
index 6fe92e4cfb6..e87ac98c838 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig
 , libX11, mesa, freeglut
-, jack2, libcdio, libsndfile, libsamplerate
+, libjack2, libcdio, libsndfile, libsamplerate
 , SDL, SDL_net, zlib
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = with stdenv.lib;
-  [ pkgconfig libX11 mesa freeglut jack2 libcdio libsndfile libsamplerate SDL SDL_net zlib ];
+  [ pkgconfig libX11 mesa freeglut libjack2 libcdio libsndfile libsamplerate SDL SDL_net zlib ];
   
 
   # Install docs
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 90dd2040e5d..c7380b02306 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -18,7 +18,7 @@
 , mpg123Support ? true, mpg123
 , aacSupport ? true, faad2
 , pulseaudioSupport ? true, libpulseaudio
-, jackSupport ? true, jack2
+, jackSupport ? true, libjack2
 , gmeSupport ? true, game-music-emu
 , icuSupport ? true, icu
 , clientSupport ? false, mpd_clientlib
@@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
     ++ opt aacSupport faad2
     ++ opt zipSupport zziplib
     ++ opt pulseaudioSupport libpulseaudio
-    ++ opt jackSupport jack2
+    ++ opt jackSupport libjack2
     ++ opt gmeSupport game-music-emu
     ++ opt icuSupport icu
     ++ opt clientSupport mpd_clientlib
diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix
index 8a9393cd1f6..edc8fe2dffc 100644
--- a/pkgs/tools/audio/darkice/default.nix
+++ b/pkgs/tools/audio/darkice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, faac, jack2, lame, libopus, libpulseaudio, libsamplerate, libvorbis }:
+{ stdenv, fetchurl, alsaLib, faac, libjack2, lame, libopus, libpulseaudio, libsamplerate, libvorbis }:
 
 with stdenv.lib;
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-alsa-prefix=${alsaLib}"
     "--with-faac-prefix=${faac}"
-    "--with-jack-prefix=${jack2}"
+    "--with-jack-prefix=${libjack2}"
     "--with-lame-prefix=${lame}"
     "--with-opus-prefix=${libopus}"
     "--with-pulseaudio-prefix=${libpulseaudio}"
diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix
index 1da9a6f465c..859fe4bb183 100644
--- a/pkgs/tools/audio/liquidsoap/full.nix
+++ b/pkgs/tools/audio/liquidsoap/full.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, which, pkgconfig
 , ocaml, ocamlPackages
-, libao, portaudio, alsaLib, libpulseaudio, jack2
+, libao, portaudio, alsaLib, libpulseaudio, libjack2
 , libsamplerate, libmad, taglib, lame, libogg
 , libvorbis, speex, libtheora, libopus, fdk_aac
 , faad2, flac, ladspaH, ffmpeg, frei0r, dssi
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
 
   buildInputs =
     [ which ocaml ocamlPackages.findlib pkgconfig
-      libao portaudio alsaLib libpulseaudio jack2
+      libao portaudio alsaLib libpulseaudio libjack2
       libsamplerate libmad taglib lame libogg
       libvorbis speex libtheora libopus fdk_aac
       faad2 flac ladspaH ffmpeg frei0r dssi
diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix
index 664647514aa..5655e27dc2e 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/pkgs/tools/misc/timidity/default.nix
@@ -1,4 +1,4 @@
-{ composableDerivation, stdenv, fetchurl, alsaLib, jack2, ncurses }:
+{ composableDerivation, stdenv, fetchurl, alsaLib, libjack2, ncurses }:
 
 let inherit (composableDerivation) edf; in
 
@@ -30,8 +30,8 @@ composableDerivation.composableDerivation {} {
     };
     jack = {
       audioModes = "jack";
-      buildInputs = [jack2];
-      NIX_LDFLAGS = ["-ljack -L${jack2}/lib64"];
+      buildInputs = [libjack2];
+      NIX_LDFLAGS = ["-ljack -L${libjack2}/lib"];
     };
   } // edf { name = "ncurses"; enable = { buildInputs = [ncurses]; };};
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 591a1adc400..df4cf0c8cec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14522,10 +14522,10 @@ let
   # using the new configuration style proposal which is unstable
   jack1 = callPackage ../misc/jackaudio/jack1.nix { };
 
-  jack2 = callPackage ../misc/jackaudio {
+  jack2Full = callPackage ../misc/jackaudio {
     libopus = libopus.override { withCustomModes = true; };
   };
-  libjack2 = jack2.override { prefix = "lib"; };
+  libjack2 = jack2Full.override { prefix = "lib"; };
 
   keynav = callPackage ../tools/X11/keynav { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 910d763bac3..a299f931278 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4434,7 +4434,7 @@ let
       sed -i "/use_setuptools/d" setup.py
     '';
 
-    buildInputs = with self; [ pkgs.alsaLib pkgs.jack2 ];
+    buildInputs = with self; [ pkgs.alsaLib pkgs.libjack2 ];
 
     meta = {
       description = "A Python wrapper for the RtMidi C++ library written with Cython";

From 9bf2c6a8ab2f910fa23b71f7f2b680c54a57a02e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 27 Jun 2015 11:40:38 +0300
Subject: [PATCH 1653/2322] Fix wrong condition related to enableKerberos

---
 pkgs/servers/samba/4.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 269ba2ec186..ab3aac54cdd 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
       "--private-libraries=NONE"
       "--builtin-libraries=replace"
     ]
-    ++ optional (enableKerberos != null && kerberos.implementation == "krb5") "--with-system-mitkrb5"
+    ++ optional (enableKerberos && kerberos.implementation == "krb5") "--with-system-mitkrb5"
     ++ optional (!enableDomainController) "--without-ad-dc"
     ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ];
 

From 637873d8fb4c49cd90813379f6ca7b54c9c97f14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 27 Jun 2015 10:28:31 +0200
Subject: [PATCH 1654/2322] crypto++: fix tests by not using -O3, refactor

Tests were segfaulting due to compilation with -O3,
most likely since building with gcc-4.9.
AFAIK it isn't generally safe/advisable to use -O3 anyway.

Also do some cleanup and expression refactoring, mostly.
---
 .../libraries/crypto++/default.nix            | 56 +++++++++----------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index 053937f1c56..788d488659a 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, unzip, libtool }:
+{ fetchurl, stdenv, unzip }:
 
 stdenv.mkDerivation rec {
   name = "crypto++-5.6.2";
@@ -8,45 +8,38 @@ stdenv.mkDerivation rec {
     sha256 = "0x1mqpz1v071cfrw4grbw7z734cxnpry1qh2b6rsmcx6nkyd5gsw";
   };
 
-  patches = (stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch)
-            ++ (stdenv.lib.optional stdenv.isDarwin ./GNUmakefile.patch);
+  patches = with stdenv;
+    lib.optional (system != "i686-cygwin") ./dll.patch
+    ++ lib.optional isDarwin ./GNUmakefile.patch;
 
-  buildInputs = [ unzip libtool ];
+  buildInputs = [ unzip ];
 
-  # Unpack the thing in a subdirectory.
-  unpackPhase = ''
-    echo "unpacking Crypto++ to \`${name}' from \`$PWD'..."
-    mkdir "${name}" && (cd "${name}" && unzip "$src")
-    sourceRoot="$PWD/${name}"
-  '';
+  sourceRoot = ".";
 
-  cxxflags = if stdenv.isi686 then "-march=i686" else
-             if stdenv.isx86_64 then "-march=nocona -fPIC" else
-             "";
+  configurePhase = let
+    marchflags =
+      if stdenv.isi686 then "-march=i686" else
+      if stdenv.isx86_64 then "-march=nocona -mtune=generic" else
+      "";
+    in
+    ''
+      sed -i GNUmakefile \
+        -e 's|-march=native|${marchflags} -fPIC|g' \
+        -e 's|-mtune=native||g' \
+        -e '/^CXXFLAGS =/s|-g ||'
+    '';
 
-  configurePhase = ''
-    sed -i GNUmakefile \
-      -e 's|-march=native|${cxxflags}|g' \
-      -e 's|-mtune=native||g' \
-      -e '/^CXXFLAGS =/s|-g -O2|-O3|'
-  '';
+  enableParallelBuilding = true;
 
-  # I add what 'enableParallelBuilding' would add to the make call,
-  # if we were using the generic build phase.
-  buildPhase = ''
-    make PREFIX="$out" all libcryptopp.so -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
-  '';
-
-  # TODO: Installing cryptotest.exe doesn't seem to be necessary. We run
-  # that binary during this build anyway to verify everything works.
-  installPhase = ''
-    mkdir "$out"
-    make install PREFIX="$out"
-  '';
+  makeFlags = "PREFIX=$(out)";
+  buildFlags = "libcryptopp.so";
 
   doCheck = true;
   checkPhase = "LD_LIBRARY_PATH=`pwd` make test";
 
+  # prefer -fPIC and .so to .a; cryptotest.exe seems superfluous
+  postInstall = ''rm "$out"/lib/*.a -r "$out/bin" '';
+
   meta = with stdenv.lib; {
     description = "Crypto++, a free C++ class library of cryptographic schemes";
     homepage = http://cryptopp.com/;
@@ -55,3 +48,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
   };
 }
+

From 9c5f76bc0ff4e7b0d0c48b809809117e9d538e99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 27 Jun 2015 10:47:58 +0200
Subject: [PATCH 1655/2322] gnome-menus: fix build by dropping wrong
 patchShebangs

Strange error, probably hidden by #7524 until recently.
/cc @lethalman.
---
 pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix
index 37d2ea1c086..90209634fbf 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
 
   makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
 
-  preBuild = "patchShebangs ./scripts";
-
   buildInputs = [ intltool pkgconfig glib gobjectIntrospection ];
 
   meta = {

From 58f7bf5b684a77f9a7debf0b0adaf050271cd5f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 27 Jun 2015 11:28:21 +0200
Subject: [PATCH 1656/2322] gsl: fix i686 tests by upstream patch

---
 pkgs/development/libraries/gsl/default.nix       | 15 +++++++++++----
 pkgs/development/libraries/gsl/disable-fma.patch |  4 ++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index da4796fba89..011e4ecd48e 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, fetchpatch, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "gsl-1.16";
@@ -8,9 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k";
   };
 
-  # ToDo: there might be more impurities than FMA support check
-  patches = [ ./disable-fma.patch ]; # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
-  patchFlags = "-p0";
+  patches = [
+    # ToDo: there might be more impurities than FMA support check
+    ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
+
+    (fetchpatch {
+      name = "bug-39055.patch";
+      url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d0377";
+      sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8";
+    })
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/gsl/disable-fma.patch b/pkgs/development/libraries/gsl/disable-fma.patch
index d5c0d620863..bb1eda9cccc 100644
--- a/pkgs/development/libraries/gsl/disable-fma.patch
+++ b/pkgs/development/libraries/gsl/disable-fma.patch
@@ -1,5 +1,5 @@
---- configure.ac        2011-09-22 16:13:22 +0000
-+++ configure.ac        2011-11-26 23:55:24 +0000
+--- a/configure.ac        2011-09-22 16:13:22 +0000
++++ b/configure.ac        2011-11-26 23:55:24 +0000
 @@ -381,6 +381,28 @@
  AC_SUBST(HAVE_DARWIN_IEEE_INTERFACE)
  AC_SUBST(HAVE_DARWIN86_IEEE_INTERFACE)

From e6ca18e9bfd50cc4340b716cae752742b4f9461d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 27 Jun 2015 11:40:04 +0200
Subject: [PATCH 1657/2322] xwayland: fix build

Maybe it was just covered by #7524 until now.
/cc #5061 and @echo-oddly.
---
 pkgs/servers/x11/xorg/xwayland.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index f43a9c67160..729fcc2e344 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -20,7 +20,7 @@ overrideDerivation xorgserver (oldAttrs: {
     "--with-default-font-path="
     "--with-xkb-bin-directory=${xkbcomp}/bin"
     "--with-xkb-path=${xkeyboard_config}/etc/X11/xkb"
-    "--with-xkb-output=$out/share/X11/xkb/compiled"
+    "--with-xkb-output=$(out)/share/X11/xkb/compiled"
   ];
 
   postInstall = ''

From 658c8c5e38da54808c8a025a7aa2251554cbad8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Sat, 27 Jun 2015 14:18:31 +0200
Subject: [PATCH 1658/2322] eyeD3: fix and update to 0.7.8

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c324ae1c00c..93b74c80514 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3006,20 +3006,21 @@ let
 
 
   eyeD3 = buildPythonPackage rec {
-    version = "0.7.4";
+    version = "0.7.8";
     name    = "eyeD3-${version}";
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
-      url = "http://eyed3.nicfit.net/releases/${name}.tgz";
-      sha256 = "001hzgqqnf2ig432mq78jsxidpky2rl2ilm28xwjp32vzphycf51";
+      url = "http://eyed3.nicfit.net/releases/${name}.tar.gz";
+      sha256 = "1nv7nhfn1d0qm7rgkzksbccgqisng8klf97np0nwaqwd5dbmdf86";
     };
 
     buildInputs = with self; [ paver ];
 
     postInstall = ''
       for prog in "$out/bin/"*; do
-        wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH"
+        wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH" \
+                            --prefix PATH : ${python}/bin
       done
     '';
 

From 8658ab967548837389dc9530bd69585e46900ef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Sat, 27 Jun 2015 14:19:22 +0200
Subject: [PATCH 1659/2322] abcde: update to 2.7 and fix mp3 tagging

It now depends on eyeD3 (python), but that's an upstream decision.
---
 pkgs/applications/audio/abcde/default.nix | 16 ++++++++--------
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index b8c8c183753..eec1bdcf31c 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, lame, flac, eject, mkcue
+{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, eyeD3
+, lame, flac, eject, mkcue
 , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
 , makeWrapper }:
 
-let version = "2.6";
+let version = "2.7";
 in
   stdenv.mkDerivation {
     name = "abcde-${version}";
     src = fetchurl {
-      url = "mirror://debian/pool/main/a/abcde/abcde_${version}.orig.tar.gz";
-      sha256 = "0y2cg233n2hixs0ji76dggpzgf52v4c4mnpwiai889ql2piafgk8";
+      url = "http://abcde.einval.com/download/abcde-${version}.tar.gz";
+      sha256 = "0ikpffzvacadh6vj9qlary8126j1zrd2knp9gvivmp7y1656jj01";
     };
 
-    # FIXME: This package does not support MP3 encoding (only Ogg),
-    # nor `distmp3', `eject', etc.
+    # FIXME: This package does not support `distmp3', `eject', etc.
 
     patches = [ ./abcde.patch ];
 
@@ -50,7 +50,7 @@ in
          --replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
 
       wrapProgram "$out/bin/abcde" --prefix PATH ":" \
-        "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin:${id3v2}/bin:${lame}/bin"
+        "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin:${id3v2}/bin:${eyeD3}/bin:${lame}/bin"
 
       wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \
         "${wget}/bin"
@@ -60,7 +60,7 @@ in
     '';
 
     meta = {
-      homepage = "http://lly.org/~rcw/abcde/page/";
+      homepage = http://abcde.einval.com/wiki/;
       license = stdenv.lib.licenses.gpl2Plus;
       description = "Command-line audio CD ripper";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cf9fed11ae..6b73976de7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10407,6 +10407,7 @@ let
 
   abcde = callPackage ../applications/audio/abcde {
     inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID;
+    inherit (pythonPackages) eyeD3;
     libcdio = libcdio082;
   };
 

From e4d16dcc720c947993ab6306235c9305c85e4580 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 27 Jun 2015 14:36:29 +0200
Subject: [PATCH 1660/2322] ocaml-io-page: 1.4.0 -> 1.5.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 25fa60139d6..c883175f6e0 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, cstruct }:
 
-let version = "1.4.0"; in
+let version = "1.5.1"; in
 
 stdenv.mkDerivation {
   name = "ocaml-io-page-${version}";
 
   src = fetchzip {
     url = "https://github.com/mirage/io-page/archive/v${version}.tar.gz";
-    sha256 = "05m1gbcy72i6gikdijbkpw8pfygc86a3l4k8ayyl58019l6qa2fq";
+    sha256 = "0y92wbvi129d0i7wr4lpk1ps9l247zaf1ibqqz0i6spgl28dyq79";
   };
 
   buildInputs = [ ocaml findlib ];

From 3dafe7a46645ecf5e6a09e7cda0e00b112c26533 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 27 Jun 2015 18:44:06 +0300
Subject: [PATCH 1661/2322] xfig: Fix build failure now visible due to #7524

The first 'find' command in postUnpack that attempts to add +x
permissions fails, because the +x permission is needed by the find
itself, and with the xargs method it's added too late.
---
 pkgs/applications/graphics/xfig/builder.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/xfig/builder.sh b/pkgs/applications/graphics/xfig/builder.sh
index bb1cd7f49c4..9d95eca0122 100644
--- a/pkgs/applications/graphics/xfig/builder.sh
+++ b/pkgs/applications/graphics/xfig/builder.sh
@@ -5,8 +5,7 @@ makeFlags="XAWLIB=-lXaw3d BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults
 # We need chmod +wx on dirs, not just chmod +w
 dontMakeSourcesWritable=1
 postUnpack() {
-	find . -type d | xargs -n1 chmod +x
-	find . -type d | xargs -n1 chmod +x
+    find . -type d -exec chmod +x '{}' \;
 }
 
 preBuild() {

From 90a4de0f1b70db2e8f9a47d04a11919fc798e652 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <maurer@matthewmaurer.org>
Date: Wed, 10 Jun 2015 18:05:23 +0200
Subject: [PATCH 1662/2322] ocaml-bitstring: init at 2.0.4 and f1673f8

---
 lib/maintainers.nix                           |  1 +
 .../ocaml-modules/bitstring/2.0.4.nix         | 25 ++++++
 .../ocaml-modules/bitstring/camlp4-git.patch  | 44 ++++++++++
 .../ocaml-modules/bitstring/camlp4.patch      | 84 +++++++++++++++++++
 .../ocaml-modules/bitstring/default.nix       | 28 +++++++
 .../ocaml-modules/bitstring/meta.patch        | 15 ++++
 pkgs/top-level/all-packages.nix               |  8 ++
 7 files changed, 205 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/bitstring/2.0.4.nix
 create mode 100644 pkgs/development/ocaml-modules/bitstring/camlp4-git.patch
 create mode 100644 pkgs/development/ocaml-modules/bitstring/camlp4.patch
 create mode 100644 pkgs/development/ocaml-modules/bitstring/default.nix
 create mode 100644 pkgs/development/ocaml-modules/bitstring/meta.patch

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 5077ac233f2..e5a199e2181 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -145,6 +145,7 @@
   malyn = "Michael Alyn Miller <malyn@strangeGizmo.com>";
   manveru = "Michael Fellinger <m.fellinger@gmail.com>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
+  maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>";
   matejc = "Matej Cotman <cotman.matej@gmail.com>";
   matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>";
   mbakke = "Marius Bakke <ymse@tuta.io>";
diff --git a/pkgs/development/ocaml-modules/bitstring/2.0.4.nix b/pkgs/development/ocaml-modules/bitstring/2.0.4.nix
new file mode 100644
index 00000000000..da4bcdcb527
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bitstring/2.0.4.nix
@@ -0,0 +1,25 @@
+{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 ];
+
+  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-git.patch b/pkgs/development/ocaml-modules/bitstring/camlp4-git.patch
new file mode 100644
index 00000000000..24d2e362dfa
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bitstring/camlp4-git.patch
@@ -0,0 +1,44 @@
+diff --git a/Makefile.in b/Makefile.in
+index d040f4c..cc1a8f5 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -40,7 +40,7 @@ pkg_extlib	= @OCAML_PKG_extlib@
+ enable_coverage = @enable_coverage@
+ 
+ OCAMLCFLAGS	= -g
+-OCAMLCPACKAGES	=
++OCAMLCPACKAGES	= -package camlp4
+ OCAMLCLIBS	= -linkpkg
+ OCAMLOPTFLAGS	= $(OCAMLCFLAGS)
+ OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
+@@ -110,12 +110,13 @@ bitstring_persistent.cmi: bitstring_persistent.mli
+ 	  -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 \
+-	  $(OCAMLCFLAGS) $(OCAMLCLIBS) \
++	  $(OCAMLCFLAGS) $(OCAMLCLIBS) $(OCAMLCPACKAGES) \
+ 	  bitstring.cma bitstring_persistent.cma \
+ 	  $< -o $@
+ 
+@@ -158,12 +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 \
++	  unix.cma -I `ocamlfind query camlp4` dynlink.cma camlp4lib.cma \
+ 	  $(OCAMLCLIBS) \
+ 	  -I . bitstring.cma bitstring_persistent.cma $< -o $@
+ 
+ create_test_pattern.cmo: create_test_pattern.ml
+ 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
++	  $(OCAMLCPACKAGES) \
+ 	  unix.cma -I +camlp4 \
+ 	  -I . -c $< -o $@
+ 
diff --git a/pkgs/development/ocaml-modules/bitstring/camlp4.patch b/pkgs/development/ocaml-modules/bitstring/camlp4.patch
new file mode 100644
index 00000000000..920c78007bb
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bitstring/camlp4.patch
@@ -0,0 +1,84 @@
+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/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix
new file mode 100644
index 00000000000..b612ec1c0bd
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bitstring/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchgit, buildOcaml, time, autoconf, automake}:
+
+buildOcaml rec {
+  name = "bitstring";
+  version = "f1673f8"; 
+  src = fetchgit {
+    url = "https://code.google.com/p/bitstring/";
+    rev = "f1673f8";
+    sha256 = "1lh97qf1b7mq64pxkphr2w91ri5hfwg58cpjb2xd8a453c9jylw4";
+  };
+
+  patches = [ ./camlp4-git.patch ./meta.patch ];
+
+  buildInputs = [time autoconf automake];
+  doCheck = true;
+
+  createFindlibDestdir = true;
+  hasSharedObjects = true;
+
+  preConfigure = "./bootstrap; echo breakhash";
+
+  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/meta.patch b/pkgs/development/ocaml-modules/bitstring/meta.patch
new file mode 100644
index 00000000000..78f44cbe15f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bitstring/meta.patch
@@ -0,0 +1,15 @@
+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/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff0788b6686..a3d44ea6523 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4213,6 +4213,14 @@ 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;
+
     camlidl = callPackage ../development/tools/ocaml/camlidl { };
 
     camlp4 =

From 1d79d840b126ccebb21e4cd5ff1022d81141fab5 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <maurer@matthewmaurer.org>
Date: Wed, 10 Jun 2015 22:35:22 +0200
Subject: [PATCH 1663/2322] piqi: init at 0.6.12

---
 .../ocaml-modules/piqi/default.nix            | 30 +++++++++++++++++++
 .../piqi/no-ocamlpath-override.patch          | 17 +++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/piqi/default.nix
 create mode 100644 pkgs/development/ocaml-modules/piqi/no-ocamlpath-override.patch

diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix
new file mode 100644
index 00000000000..7cca68c4f79
--- /dev/null
+++ b/pkgs/development/ocaml-modules/piqi/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, ocaml, findlib, camlp4, which, ulex, easy-format, ocaml_optcomp, xmlm, base64}:
+
+stdenv.mkDerivation rec {
+  version = "0.6.12";
+  name    = "piqi-${version}";
+ 
+  src = fetchurl {
+    url = "https://github.com/alavrik/piqi/archive/v${version}.tar.gz";
+    sha256 = "1ifnawnblvibf5rgp6gr4f20266dckfrlryikg1iiq3dx2wfl7f8";
+  };
+
+  buildInputs = [ocaml findlib camlp4 which ocaml_optcomp base64];
+  propagatedBuildInputs = [ulex xmlm easy-format];
+
+  patches = [ ./no-ocamlpath-override.patch ];
+
+  createFindlibDestdir = true;
+
+  installPhase = ''
+    make install;
+    make ocaml-install;
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://piqi.org;
+    description = "Universal schema language and a collection of tools built around it.";
+    license = licenses.asl20;
+    maintainers = [ maintainers.maurer ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/piqi/no-ocamlpath-override.patch b/pkgs/development/ocaml-modules/piqi/no-ocamlpath-override.patch
new file mode 100644
index 00000000000..bf85a42551c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/piqi/no-ocamlpath-override.patch
@@ -0,0 +1,17 @@
+diff -rupN piqi-0.6.12.orig/make/Makefile.ocaml piqi-0.6.12/make/Makefile.ocaml
+--- piqi-0.6.12.orig/make/Makefile.ocaml	2015-03-13 13:35:19.000000000 +0100
++++ piqi-0.6.12/make/Makefile.ocaml	2015-06-10 21:19:57.231000000 +0200
+@@ -1,13 +1,5 @@
+ OCAMLMAKEFILE := $(PIQI_ROOT)/make/OCamlMakefile
+ 
+-
+-OCAMLPATH := $(PIQI_BUILD)/lib/ocaml
+-ifeq ($(SYSTEM),$(filter $(SYSTEM),mingw mingw64))
+-OCAMLPATH := $(shell cygpath -w $(OCAMLPATH))
+-endif
+-export OCAMLPATH
+-
+-
+ # make sure camlp4o produces pretty-printed text instead of AST
+ export CAMLP4_O = $(CAMLP4)o -printer o
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a3d44ea6523..2d4577efd4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4478,6 +4478,8 @@ let
 
     ounit = callPackage ../development/ocaml-modules/ounit { };
 
+    piqi = callPackage ../development/ocaml-modules/piqi { };
+
     re2 = callPackage ../development/ocaml-modules/re2 { };
 
     tyxml = callPackage ../development/ocaml-modules/tyxml { };

From 289e2a10dbb26c368aa9b82229b17ea545b6d93d Mon Sep 17 00:00:00 2001
From: Matthew Maurer <maurer@matthewmaurer.org>
Date: Wed, 10 Jun 2015 23:26:31 +0200
Subject: [PATCH 1664/2322] ocaml-faillib: init at 111.17.00

---
 .../ocaml-modules/faillib/default.nix         | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/faillib/default.nix

diff --git a/pkgs/development/ocaml-modules/faillib/default.nix b/pkgs/development/ocaml-modules/faillib/default.nix
new file mode 100644
index 00000000000..98acc8032e3
--- /dev/null
+++ b/pkgs/development/ocaml-modules/faillib/default.nix
@@ -0,0 +1,24 @@
+{stdenv, buildOcaml, fetchurl, herelib, camlp4}:
+
+buildOcaml rec {
+  minimumSupportedOcamlVersion = "4.00";
+  name = "faillib";
+  version = "111.17.00";
+
+  src = fetchurl {
+    url = "https://github.com/janestreet/faillib/archive/${version}.tar.gz";
+    sha256 = "12dvaxkmgf7yzzvbadcyk1n17llgh6p8qr33867d21npaljy7l9v"; 
+  };
+
+  propagatedBuildInputs = [ camlp4 herelib ];
+
+  doCheck = true;
+  checkPhase = "make test";
+
+  meta = with stdenv.lib; {
+    homepage = https://ocaml.janestreet.com/;
+    description = "Library for dealing with failure in OCaml";
+    license = licenses.asl20;
+    maintainers = [ maintainers.maurer ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d4577efd4c..9ff13ba10c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4326,6 +4326,8 @@ let
       lwt = ocaml_lwt;
     };
 
+    faillib = callPackage ../development/ocaml-modules/faillib { };
+
     fieldslib = callPackage ../development/ocaml-modules/fieldslib { };
 
     fileutils = callPackage ../development/ocaml-modules/fileutils { };

From 8c875e76f091b60e641d31d03c2621e4ac47734f Mon Sep 17 00:00:00 2001
From: Matthew Maurer <maurer@matthewmaurer.org>
Date: Wed, 10 Jun 2015 23:41:15 +0200
Subject: [PATCH 1665/2322] uuidm: init at 0.9.5

---
 .../ocaml-modules/uuidm/default.nix           | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/uuidm/default.nix

diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix
new file mode 100644
index 00000000000..0473f64bcdf
--- /dev/null
+++ b/pkgs/development/ocaml-modules/uuidm/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, ocaml, findlib}:
+
+stdenv.mkDerivation rec {
+  version = "0.9.5";
+  name = "uuidm-${version}"; 
+  src = fetchurl {
+    url = "http://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz";
+    sha256 = "03bgxs119bphv9ggg97nsl5m61s43ixgby05hhggv16iadx9zndm";
+  };
+
+  unpackCmd = "tar -xf $curSrc";
+
+  buildInputs = [ocaml findlib];
+
+  configurePhase = "ocaml setup.ml -configure --prefix $prefix";
+  buildPhase = "ocaml setup.ml -build";
+  installPhase = "ocaml setup.ml -install";
+
+  createFindlibDestdir = true;
+
+  meta = with stdenv.lib; {
+    description = "An OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122.";
+    homepage = http://erratique.ch/software/uuidm;
+    license = licenses.bsd3;
+    platforms = ocaml.meta.platforms;
+    maintainers = [ maintainers.maurer ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ff13ba10c4..0193b64e299 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4556,6 +4556,8 @@ let
 
     utop = callPackage ../development/tools/ocaml/utop { };
 
+    uuidm = callPackage ../development/ocaml-modules/uuidm { };
+
     sawja = callPackage ../development/ocaml-modules/sawja { };
 
     uucd = callPackage ../development/ocaml-modules/uucd { };

From 9c0f1eefc616bcf7d83fb834d448d1b4aa6e434f Mon Sep 17 00:00:00 2001
From: Matthew Maurer <maurer@matthewmaurer.org>
Date: Wed, 10 Jun 2015 23:00:52 +0200
Subject: [PATCH 1666/2322] piqi-ocaml: init at 0.7.4

---
 .../ocaml-modules/piqi-ocaml/default.nix      | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/piqi-ocaml/default.nix

diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
new file mode 100644
index 00000000000..fea1ee15044
--- /dev/null
+++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, base64, camlp4}:
+
+stdenv.mkDerivation rec {
+  version = "0.7.4";
+  name    = "piqi-ocaml-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/alavrik/piqi-ocaml/archive/v${version}.tar.gz";
+    sha256 = "064c74f031l847q6s1vilj77n7h7i84jn8c83yid9nha3dssaf7m";
+  };
+
+  buildInputs = [ocaml findlib piqi base64 camlp4];
+
+  createFindlibDestdir = true;
+
+  installPhase = "DESTDIR=$out make install";
+
+  meta = with stdenv.lib; {
+    homepage = http://piqi.org;
+    description = "Universal schema language and a collection of tools built around it. These are the ocaml bindings.";
+    license = licenses.asl20;
+    maintainers = [ maintainers.maurer ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0193b64e299..43949d5c0b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4481,6 +4481,7 @@ let
     ounit = callPackage ../development/ocaml-modules/ounit { };
 
     piqi = callPackage ../development/ocaml-modules/piqi { };
+    piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { };
 
     re2 = callPackage ../development/ocaml-modules/re2 { };
 

From 430c8520b2c1ac92816ec4fc53c97bc92e44d7f3 Mon Sep 17 00:00:00 2001
From: Nicolas Dudebout <nicolas.dudebout@gmail.com>
Date: Sat, 27 Jun 2015 13:20:56 -0400
Subject: [PATCH 1667/2322] One more change for jack2 to libjack2

729725501922fad5955b86bf0e06a2f6fee659f6 did break things and this change seems to fix them.
---
 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 7769f40789b..a5ba99bb73e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6089,7 +6089,7 @@ let
     frei0r = if stdenv.isDarwin then null else frei0r;
     game-music-emu = if stdenv.isDarwin then null else game-music-emu;
     gsm = if stdenv.isDarwin then null else gsm;
-    jack2 = if stdenv.isDarwin then null else jack2;
+    libjack2 = if stdenv.isDarwin then null else libjack2;
     libmodplug = if stdenv.isDarwin then null else libmodplug;
     libssh = if stdenv.isDarwin then null else libssh;
     libvpx = if stdenv.isDarwin then null else libvpx;

From 7ea32d390b292f780ce00f494441f6179b4395b0 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 27 Jun 2015 19:40:56 +0200
Subject: [PATCH 1668/2322] mdp: 0.93 -> 1.0.0

---
 pkgs/applications/misc/mdp/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index 2e94414235d..02202fd332c 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchFromGitHub, ncurses }:
+{ stdenv, fetchurl, ncurses }:
 
-stdenv.mkDerivation {
-  name = "mdp-0.93";
+stdenv.mkDerivation rec {
+  version = "1.0.0";
+  name = "mdp-${version}";
 
-  src = fetchFromGitHub {
-    owner = "visit1985";
-    repo = "mdp";
-    rev = "09d6bd1a8a33fac75a999f0822ec10cb77fbc072";
-    sha256 = "0ksa0zqzv1yb8nspxp2vww7bp9y99pcma1vx3cixd3qb5y5ljn1n";
+  src = fetchurl {
+    url = "https://github.com/visit1985/mdp/archive/${version}.tar.gz";
+    sha256 = "1xkmzcwa5ml1xfv92brwirnm00a44jkj7wpfimxbny98zgmad8vn";
   };
 
   makeFlags = "PREFIX=$(out)";

From c37e2745bd82050b9b238c04d512bfb7652aa07e Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 27 Jun 2015 19:41:11 +0200
Subject: [PATCH 1669/2322] mdp: Add license, pkg maintainer

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

diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index 02202fd332c..aa2045cc8e8 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -13,8 +13,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ncurses ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/visit1985/mdp;
     description = "A command-line based markdown presentation tool";
+    maintainers = with maintainers; [ matthiasbeyer ];
+    license = licenses.gpl3;
   };
 }

From 8b844dce2d35a445bc89322052375e0f2aced094 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 27 Jun 2015 10:42:13 -0700
Subject: [PATCH 1670/2322] ffado -> ffadoFull

---
 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 a5ba99bb73e..118a4e5e49a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9435,8 +9435,8 @@ let
 
   fatrace = callPackage ../os-specific/linux/fatrace { };
 
-  ffado = callPackage ../os-specific/linux/ffado { };
-  libffado = ffado.override { prefix = "lib"; };
+  ffadoFull = callPackage ../os-specific/linux/ffado { };
+  libffado = ffadoFull.override { prefix = "lib"; };
 
   fbterm = callPackage ../os-specific/linux/fbterm { };
 

From e080827fdb1727b86390284833245da1d4ab9854 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 27 Jun 2015 10:43:45 -0700
Subject: [PATCH 1671/2322] Fix heimdal reference

---
 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 d3c52fbb228..386ee50c2be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6390,7 +6390,7 @@ let
   kerberos = libkrb5;
 
   heimdalFull = callPackage ../development/libraries/kerberos/heimdal.nix { };
-  libheimdal = heimdal.override { type = "lib"; };
+  libheimdal = heimdalFull.override { type = "lib"; };
 
   harfbuzz = callPackage ../development/libraries/harfbuzz { };
   harfbuzz-icu = callPackage ../development/libraries/harfbuzz {

From ca2cf48e1035c3f92579efe3825e787292c0c182 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 27 Jun 2015 11:31:10 -0700
Subject: [PATCH 1672/2322] tinc_pre: 2015-05-15 -> 2015-06-20

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

diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index 2eb003bacb0..f05ffdd6a46 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "tinc-1.1pre-2015-05-15";
+  name = "tinc-1.1pre-2015-06-20";
 
   src = fetchgit {
     url = "git://tinc-vpn.org/tinc";
-    rev = "613c121cdceec0199dc4d056857be021ed1d21de";
-    sha256 = "1l99bvqmb35hwb63fcy9gbjxasxnrgqw3i9f14f26dq3sz2j035l";
+    rev = "ebffa40aa7832459f63801e3a91cc741e6b339a8";
+    sha256 = "0yp40n5cgfadd7lmi28qv7cf5s14qqw5ga76y5xd0fjpacv6akcp";
   };
 
   buildInputs = [ autoreconfHook texinfo ncurses readline zlib lzo openssl ];

From 512beee9621b2cd7610b112cd9bb0d8f1d4d95dd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 27 Jun 2015 12:38:21 -0700
Subject: [PATCH 1673/2322] zeroc-ice: 3.5.1 -> 3.6.0

---
 .../libraries/zeroc-ice/default.nix           | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix
index 29e92d0b6ec..d89fae5c964 100644
--- a/pkgs/development/libraries/zeroc-ice/default.nix
+++ b/pkgs/development/libraries/zeroc-ice/default.nix
@@ -1,24 +1,29 @@
-{ stdenv, fetchurl, mcpp, bzip2, expat, openssl, db5 }:
+{ stdenv, fetchFromGitHub, mcpp, bzip2, expat, openssl, db5 }:
 
 stdenv.mkDerivation rec {
-  name = "zeroc-ice-3.5.1";
+  name = "zeroc-ice-${version}";
+  version = "3.6.0";
 
-  src = fetchurl {
-    url = "http://www.zeroc.com/download/Ice/3.5/Ice-3.5.1.tar.gz";
-    sha256 = "14pk794p0fq3hcp50xmqnf9pp15dggiqhcnsav8xpnka9hcm37lq";
+  src = fetchFromGitHub {
+    owner = "zeroc-ice";
+    repo = "ice";
+    rev = "v${version}";
+    sha256 = "192lhynf369bbrvbb9nldc49n09kyxp8vg8j9d7w5h2c1yxpjgjq";
   };
 
   buildInputs = [ mcpp bzip2 expat openssl db5 ];
 
   buildPhase = ''
     cd cpp
-    make OPTIMIZE=yes
+    make -j $NIX_BUILD_CORES OPTIMIZE=yes
   '';
 
   installPhase = ''
-    make prefix=$out install
+    make -j $NIX_BUILD_CORES prefix=$out install
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = "http://www.zeroc.com/ice.html";
     description = "The internet communications engine";

From cab3572e99c7266c507174cb073fcb2f91ef154c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 27 Jun 2015 12:39:52 -0700
Subject: [PATCH 1674/2322] btrfsprogs: 4.0.1 -> 4.1

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

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index c50367726db..7b29e0a783b 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }:
 
-let version = "4.0.1"; in
+let version = "4.1"; in
 
 stdenv.mkDerivation (rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "1jwk0bnb4nvhw6b7i9mw5wkvqc6igx99qqg8zwpaj5nxkvki0bic";
+    sha256 = "1s5pzvi30mivxgbkx7nbqn38pfiw20rdnd6xiqsyfj7rpffzzimb";
   };
 
   buildInputs = [

From 6b829e73024841fc2bf9cf50b5696b64b261dc8f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 27 Jun 2015 23:53:49 +0300
Subject: [PATCH 1675/2322] libxcomp: Fix build

The mkdirs were failing since the 'out' and 'lib' directories are
already created by 'make install' (#7524 fallout). And in fact, the
entire postInstall script is doing the exact same thing as installPhase,
so it can be simply dropped.
---
 pkgs/development/libraries/libxcomp/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix
index ed9e4b26944..3be3598169e 100644
--- a/pkgs/development/libraries/libxcomp/default.nix
+++ b/pkgs/development/libraries/libxcomp/default.nix
@@ -25,11 +25,4 @@ stdenv.mkDerivation {
   '';
 
   enableParallelBuilding = true;
-
-  postInstall = ''
-    mkdir $out/lib
-    cp libXcomp.so* $out/lib
-    mkdir $out/include
-    cp NX.h $out/include
-  '';
 }

From ae7d918499ff7d9933f68dd493262943c0e20c62 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sun, 28 Jun 2015 00:27:26 +0300
Subject: [PATCH 1676/2322] sip: 4.16.4 -> 4.16.6

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

diff --git a/pkgs/development/python-modules/sip/4.16.nix b/pkgs/development/python-modules/sip/4.16.nix
index b10852d17f3..adb6c7ef80d 100644
--- a/pkgs/development/python-modules/sip/4.16.nix
+++ b/pkgs/development/python-modules/sip/4.16.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, isPyPy }:
 
 if isPyPy then throw "sip not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {
-  name = "sip-4.16.4";
+  name = "sip-4.16.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz";
-    sha256 = "1xapklcz5ndilax0gr2h1fqzhdzh7yvxfb3y0rxfcag1qlzl9nnf";
+    sha256 = "0lj5f581dkwswlwpg7lbicqf940dvrp8vjbkhmyywd99ynxb4zcc";
   };
 
   configurePhase = ''

From f893ac062256017c40d69b826e09eaa8792c7f1f Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sat, 27 Jun 2015 23:15:18 +0300
Subject: [PATCH 1677/2322] pyqt5: 5.3 -> 5.4.2

---
 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 83dac459284..7d5b4e3ec47 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python, pkgconfig, qt5, sip, pythonDBus, lndir, makeWrapper }:
 
 let
-  version = "5.3";
+  version = "5.4.2";
 in stdenv.mkDerivation {
   name = "PyQt-${version}";
 
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt-gpl-${version}.tar.gz";
-    sha256 = "0xc1cc68fi989rfybibimhhi3mqn3b93n0p3jdqznzabgilcb1m2";
+    sha256 = "1402n5kwzd973b65avxk1j9js96wzfm0yw4rshjfy8l7an00bnac";
   };
 
   buildInputs = [ python pkgconfig makeWrapper lndir qt5 ];

From 511fc648b53398c618ac0fa8e8e5869813aee06b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 27 Jun 2015 14:33:21 -0700
Subject: [PATCH 1678/2322] keepalived: Add derivation

---
 pkgs/tools/networking/keepalived/default.nix | 35 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/tools/networking/keepalived/default.nix

diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix
new file mode 100644
index 00000000000..8331e4af683
--- /dev/null
+++ b/pkgs/tools/networking/keepalived/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, openssl, net_snmp }:
+
+stdenv.mkDerivation rec {
+  name = "keepalived-1.2.17";
+
+  src = fetchurl {
+    url = "http://keepalived.org/software/${name}.tar.gz";
+    sha256 = "1w7px8phx3pyb3b56m3nz1a9ncx26q34fgy8j4n2dpi284jmqm6z";
+  };
+
+  buildInputs = [ openssl net_snmp ];
+
+  postPatch = ''
+    sed -i 's,$(DESTDIR)/usr/share,$out/share,g' Makefile.in
+  '';
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--enable-snmp"
+    "--enable-sha1"
+  ];
+
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://keepalived.org;
+    description = "routing software written in C";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 118a4e5e49a..dff4a09436b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1927,6 +1927,8 @@ let
 
   kdbplus = callPackage_i686 ../applications/misc/kdbplus { };
 
+  keepalived = callPackage ../tools/networking/keepalived { };
+
   kexectools = callPackage ../os-specific/linux/kexectools { };
 
   keybase = callPackage ../applications/misc/keybase { };

From b6adf14ebfc7e598d97ae88450b217ed9000c4d2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 27 Jun 2015 15:34:35 -0700
Subject: [PATCH 1679/2322] reiserfsprogs: Fix gcc5 compiling

---
 pkgs/tools/filesystems/reiserfsprogs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix
index 899f9463951..e41318a982c 100644
--- a/pkgs/tools/filesystems/reiserfsprogs/default.nix
+++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libuuid ];
 
+  NIX_CFLAGS_COMPILE = "-std=gnu90";
+
   meta = {
     inherit version;
     homepage = http://www.namesys.com/;

From 06b2804bea7f83e9cf68fbc40360e8a4697344d9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 27 Jun 2015 15:49:30 -0700
Subject: [PATCH 1680/2322] memtest86+: Make compatible with gcc5

---
 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 dbd5a46e10a..7e382426336 100644
--- a/pkgs/tools/misc/memtest86+/default.nix
+++ b/pkgs/tools/misc/memtest86+/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     fi
   '';
 
-  NIX_CFLAGS_COMPILE = "-I.";
+  NIX_CFLAGS_COMPILE = "-I. -std=gnu90";
 
   buildFlags = "memtest.bin";
 

From 6209961810837508bf63ba1cb4666c44fc4c2d24 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sun, 28 Jun 2015 01:10:32 +0300
Subject: [PATCH 1681/2322] pyqt5: make it actually 5.4.2

---
 pkgs/development/python-modules/pyqt/5.x.nix | 5 ++++-
 pkgs/top-level/python-packages.nix           | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 7d5b4e3ec47..b89052602d9 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -18,7 +18,10 @@ in stdenv.mkDerivation {
     sha256 = "1402n5kwzd973b65avxk1j9js96wzfm0yw4rshjfy8l7an00bnac";
   };
 
-  buildInputs = [ python pkgconfig makeWrapper lndir qt5 ];
+  buildInputs = [
+    python pkgconfig makeWrapper lndir
+    qt5.base qt5.svg qt5.webkit
+  ];
 
   propagatedBuildInputs = [ sip ];
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a299f931278..334eb8f083d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -171,7 +171,7 @@ let
   pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix {
     sip = self.sip_4_16;
     pythonDBus = self.dbus;
-    qt5 = pkgs.qt53;
+    qt5 = pkgs.qt5;
   };
 
   sip = callPackage ../development/python-modules/sip { };

From e2398a2361d1f3c2f6e46ff6cb3b5f92f39a21a2 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sun, 28 Jun 2015 02:22:48 +0300
Subject: [PATCH 1682/2322] qutebrowser: update to git master
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

qutebrowser is actively developed, sticking to stable
versions doesn’t make any sense.
Also fixed formatting.
---
 .../browsers/qutebrowser/default.nix          | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index d97f36f1151..f0c411f4570 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchurl, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2}:
+{ stdenv, fetchgit, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2 }:
 
-let version = "0.2.1"; in
+let version = "0.3-pre"; in
 
 buildPythonPackage {
   name = "qutebrowser-${version}";
   namePrefix = "";
-  
-  src = fetchurl {
-    url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";
-    sha256 = "b741a1a0336b8d36133603a3318d1c4c63c9abf50212919200cd2ae665b07111";
-    };
-    # Needs tox
-    doCheck = false;
 
-    propagatedBuildInputs = [
-      python pyyaml pyqt5 jinja2 pygments pypeg2
-    ];
-    
-    meta = {
-      homepage = https://github.com/The-Compiler/qutebrowser;
-      description = "Keyboard-focused browser with a minimal GUI";
-      license = stdenv.lib.licenses.gpl3Plus;
+  src = fetchgit {
+    url = "https://github.com/The-Compiler/qutebrowser.git";
+    rev = "f31f254d9bf3ffd4ef95089f4924e5c45d8c0f78";
+    sha256 = "0virh71q9qyh7ggk5p6h3gjv30gr2jn8am6yq8xzbslchck0rkcr";
+  };
+
+  # Needs tox
+  doCheck = false;
+
+  propagatedBuildInputs = [
+    python pyyaml pyqt5 jinja2 pygments pypeg2
+  ];
+
+  meta = {
+    homepage = https://github.com/The-Compiler/qutebrowser;
+    description = "Keyboard-focused browser with a minimal GUI";
+    license = stdenv.lib.licenses.gpl3Plus;
   };
 }

From f49e9ce1bee0f0b20dd5ece0e5b8f527c583c64c Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sun, 28 Jun 2015 02:38:01 +0300
Subject: [PATCH 1683/2322] qutebrowser: Add @jagajaga as a maintainer

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

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index f0c411f4570..f93ec35db34 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -23,5 +23,6 @@ buildPythonPackage {
     homepage = https://github.com/The-Compiler/qutebrowser;
     description = "Keyboard-focused browser with a minimal GUI";
     license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = [ stdenv.lib.maintainers.jagajaga ];
   };
 }

From 3ea1c5bc0c40342e4270443d6f8808210de4a045 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 27 Jun 2015 19:59:44 -0700
Subject: [PATCH 1684/2322] keepalived: Add libnl support

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

diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix
index 8331e4af683..1e4e6f82092 100644
--- a/pkgs/tools/networking/keepalived/default.nix
+++ b/pkgs/tools/networking/keepalived/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, net_snmp }:
+{ stdenv, fetchurl, openssl, net_snmp, libnl }:
 
 stdenv.mkDerivation rec {
   name = "keepalived-1.2.17";
@@ -8,12 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "1w7px8phx3pyb3b56m3nz1a9ncx26q34fgy8j4n2dpi284jmqm6z";
   };
 
-  buildInputs = [ openssl net_snmp ];
+  buildInputs = [ openssl net_snmp libnl ];
 
   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}/include/libnl3";
+  NIX_LDFLAGS="-lnl-3 -lnl-genl-3";
+
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"

From 90d041b4b5e530b8c818cfa0d0395b7db2ff1d35 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 27 Jun 2015 23:19:05 -0700
Subject: [PATCH 1685/2322] keepalived: Fix ip release

---
 pkgs/tools/networking/keepalived/default.nix  |  3 ++
 .../keepalived/fix-ip-release.patch           | 39 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/tools/networking/keepalived/fix-ip-release.patch

diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix
index 1e4e6f82092..8ad0021e6ae 100644
--- a/pkgs/tools/networking/keepalived/default.nix
+++ b/pkgs/tools/networking/keepalived/default.nix
@@ -10,6 +10,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl net_snmp libnl ];
 
+  # Remove in 1.2.18
+  patches = [ ./fix-ip-release.patch ];
+
   postPatch = ''
     sed -i 's,$(DESTDIR)/usr/share,$out/share,g' Makefile.in
   '';
diff --git a/pkgs/tools/networking/keepalived/fix-ip-release.patch b/pkgs/tools/networking/keepalived/fix-ip-release.patch
new file mode 100644
index 00000000000..0fa828a3ee5
--- /dev/null
+++ b/pkgs/tools/networking/keepalived/fix-ip-release.patch
@@ -0,0 +1,39 @@
+From d80c171e7e8fe7fb4e0878a15027ac80c23b0a14 Mon Sep 17 00:00:00 2001
+From: David Stapleton <dstaplet@brocade.com>
+Date: Mon, 15 Jun 2015 13:07:21 +0100
+Subject: [PATCH] Fix vrrp removes incorrect IPv4 address when VIPs are removed
+
+When vrrp has an IPv4 VIP that matches the primary interface
+address, when the VIP is removed from the interface, the original
+address ends up getting removed instead of the VIP.
+
+The kernel receives a netlink message instructing it to remove
+address x from a particular interface. For IPv4, address x can
+be configured multiple times providing the prefix lengths differ.
+If the IFA_ADDRESS attribute is not specified in a RTM_DELADDR
+message, the kernel will delete the first address it finds a
+match on, prefix length is not taken into account.
+
+This fix therefore adds the IFA_ADDRESS attribute when deleting
+IPv4 addresses so that the address removed is actually the VIP.
+---
+ keepalived/vrrp/vrrp_ipaddress.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/keepalived/vrrp/vrrp_ipaddress.c b/keepalived/vrrp/vrrp_ipaddress.c
+index 0f9ce23..698f35c 100644
+--- a/keepalived/vrrp/vrrp_ipaddress.c
++++ b/keepalived/vrrp/vrrp_ipaddress.c
+@@ -86,6 +86,9 @@ netlink_ipaddress(ip_address_t *ipaddress, int cmd)
+ 	} else {
+ 		addattr_l(&req.n, sizeof(req), IFA_LOCAL,
+ 			  &ipaddress->u.sin.sin_addr, sizeof(ipaddress->u.sin.sin_addr));
++		if (cmd == IPADDRESS_DEL)
++			addattr_l(&req.n, sizeof(req), IFA_ADDRESS,
++			  &ipaddress->u.sin.sin_addr, sizeof(ipaddress->u.sin.sin_addr));
+ 		if (ipaddress->u.sin.sin_brd.s_addr)
+ 			addattr_l(&req.n, sizeof(req), IFA_BROADCAST,
+ 				  &ipaddress->u.sin.sin_brd, sizeof(ipaddress->u.sin.sin_brd));
+-- 
+2.4.4
+

From 124a61f10d6c93440a9733b665ff6fdea2c90969 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 28 Jun 2015 13:41:27 +0300
Subject: [PATCH 1686/2322] Fix alternative samba configuration evaluations

---
 pkgs/servers/samba/4.x.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index ab3aac54cdd..1d957a8ec60 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -61,11 +61,13 @@ stdenv.mkDerivation rec {
       "--enable-fhs"
       "--sysconfdir=/etc"
       "--localstatedir=/var"
-      "--bundled-libraries=${if enableKerberos && kerberos.implementation == "heimdal" then "NONE" else "com_err"}"
+      "--bundled-libraries=${if enableKerberos && kerberos != null &&
+        kerberos.implementation == "heimdal" then "NONE" else "com_err"}"
       "--private-libraries=NONE"
       "--builtin-libraries=replace"
     ]
-    ++ optional (enableKerberos && kerberos.implementation == "krb5") "--with-system-mitkrb5"
+    ++ optional (enableKerberos && kerberos != null &&
+      kerberos.implementation == "krb5") "--with-system-mitkrb5"
     ++ optional (!enableDomainController) "--without-ad-dc"
     ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ];
 

From ed9dc1fd9e1dec564e74f7b95f87f84613c81040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 9 Jun 2015 00:11:24 +0200
Subject: [PATCH 1687/2322] nixos: added gitit service

---
 nixos/modules/misc/ids.nix            |   2 +
 nixos/modules/module-list.nix         |   1 +
 nixos/modules/services/misc/gitit.nix | 659 ++++++++++++++++++++++++++
 3 files changed, 662 insertions(+)
 create mode 100644 nixos/modules/services/misc/gitit.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index e6357d138ca..8a2cde50e1e 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -223,6 +223,7 @@
       nix-serve = 199;
       tvheadend = 200;
       uwsgi = 201;
+      gitit = 202;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -424,6 +425,7 @@
       #nix-serve = 199; #unused
       #tvheadend = 200; #unused
       uwsgi = 201;
+      gitit = 202;
 
       # 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 12a6a9374ff..042824bc829 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -194,6 +194,7 @@
   ./services/misc/etcd.nix
   ./services/misc/felix.nix
   ./services/misc/folding-at-home.nix
+  ./services/misc/gitit.nix
   ./services/misc/gitlab.nix
   ./services/misc/gitolite.nix
   ./services/misc/gpsd.nix
diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix
new file mode 100644
index 00000000000..56e735d7356
--- /dev/null
+++ b/nixos/modules/services/misc/gitit.nix
@@ -0,0 +1,659 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.gitit;
+
+  homeDir = "/var/lib/gitit";
+
+  gititShared = with cfg.haskellPackages; gitit + "/share/" + pkgs.stdenv.system + "-" + ghc.name + "/" + gitit.pname + "-" + gitit.version;
+
+  gititWithPkgs = hsPkgs: extras: hsPkgs.ghcWithPackages (self: with self; [ gitit ] ++ (extras self));
+
+  gititSh = hsPkgs: extras: with pkgs; let
+    env = gititWithPkgs hsPkgs extras;
+  in writeScript "gitit" ''
+    #!${stdenv.shell}
+    cd $HOME
+    export PATH="${makeSearchPath "bin" (
+      [ git curl ] ++ (if cfg.pdfExport == "yes" then [texLiveFull] else [])
+      )}:$PATH";
+    export NIX_GHC="${env}/bin/ghc"
+    export NIX_GHCPKG="${env}/bin/ghc-pkg"
+    export NIX_GHC_DOCDIR="${env}/share/doc/ghc/html"
+    export NIX_GHC_LIBDIR=$( $NIX_GHC --print-libdir )
+    ${env}/bin/gitit -f ${configFile}
+  '';
+
+  gititOptions = let
+
+    yesNo = types.enum [ "yes" "no" ];
+
+  in {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Enable the gitit service.";
+      };
+
+      haskellPackages = mkOption {
+        default = pkgs.haskellPackages;
+        defaultText = "pkgs.haskellPackages";
+        example = literalExample "pkgs.haskell.packages.ghc784";
+        description = "haskellPackages used to build gitit and plugins.";
+      };
+
+      extraPackages = mkOption {
+        default = self: [];
+        example = literalExample ''
+          haskellPackages: [
+            haskellPackages.wreq
+          ]
+        '';
+        description = ''
+          Extra packages available to ghc when running gitit. The
+          value must be a function which receives the attrset defined
+          in <varname>haskellPackages</varname> as the sole argument.
+        '';
+      };
+
+      address = mkOption {
+        type = types.str;
+        default = "0.0.0.0";
+        description = "IP address on which the web server will listen.";
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 5001;
+        description = "Port on which the web server will run.";
+      };
+
+      wikiTitle = mkOption {
+        type = types.str;
+        default = "Gitit!";
+        description = "The wiki title.";
+      };
+
+      repositoryType = mkOption {
+        type = types.enum ["git" "darcs" "mercurial"];
+        default = "git";
+        description = "Specifies the type of repository used for wiki content.";
+      };
+
+      repositoryPath = mkOption {
+        type = types.path;
+        default = homeDir + "/wiki";
+        description = ''
+          Specifies the path of the repository directory. If it does not
+          exist, gitit will create it on startup.
+        '';
+      };
+
+      requireAuthentication = mkOption {
+        type = types.enum [ "none" "modify" "read" ];
+        default = "modify";
+        description = ''
+          If 'none', login is never required, and pages can be edited
+          anonymously.  If 'modify', login is required to modify the wiki
+          (edit, add, delete pages, upload files).  If 'read', login is
+          required to see any wiki pages.
+        '';
+      };
+
+      authenticationMethod = mkOption {
+        type = types.enum [ "form" "http" "generic"];
+        default = "form";
+        description = ''
+          'form' means that users will be logged in and registered using forms
+          in the gitit web interface.  'http' means that gitit will assume that
+          HTTP authentication is in place and take the logged in username from
+          the "Authorization" field of the HTTP request header (in addition,
+          the login/logout and registration links will be suppressed).
+          'generic' means that gitit will assume that some form of
+          authentication is in place that directly sets REMOTE_USER to the name
+          of the authenticated user (e.g. mod_auth_cas on apache).  'rpx' means
+          that gitit will attempt to log in through https://rpxnow.com.  This
+          requires that 'rpx-domain', 'rpx-key', and 'base-url' be set below,
+          and that 'curl' be in the system path.
+        '';
+      };
+
+      userFile = mkOption {
+        type = types.path;
+        default = homeDir + "/gitit-users";
+        description = ''
+          Specifies the path of the file containing user login information.  If
+          it does not exist, gitit will create it (with an empty user list).
+          This file is not used if 'http' is selected for
+          authentication-method.
+        '';
+      };
+
+      sessionTimeout = mkOption {
+        type = types.int;
+        default = 60;
+        description = ''
+          Number of minutes of inactivity before a session expires.
+        '';
+      };
+
+      staticDir = mkOption {
+        type = types.path;
+        default = gititShared + "/data/static";
+        description = ''
+          Specifies the path of the static directory (containing javascript,
+          css, and images).  If it does not exist, gitit will create it and
+          populate it with required scripts, stylesheets, and images.
+        '';
+      };
+
+      defaultPageType = mkOption {
+        type = types.enum [ "markdown" "rst" "latex" "html" "markdown+lhs" "rst+lhs" "latex+lhs" ];
+        default = "markdown";
+        description = ''
+          Specifies the type of markup used to interpret pages in the wiki.
+          Possible values are markdown, rst, latex, html, markdown+lhs,
+          rst+lhs, and latex+lhs. (the +lhs variants treat the input as
+          literate Haskell. See pandoc's documentation for more details.) If
+          Markdown is selected, pandoc's syntax extensions (for footnotes,
+          delimited code blocks, etc.) will be enabled. Note that pandoc's
+          restructuredtext parser is not complete, so some pages may not be
+          rendered correctly if rst is selected. The same goes for latex and
+          html.
+        '';
+      };
+
+      math = mkOption {
+        type = types.enum [ "mathml" "raw" "mathjax" "jsmath" "google" ];
+        default = "mathml";
+        description = ''
+          Specifies how LaTeX math is to be displayed.  Possible values are
+          mathml, raw, mathjax, jsmath, and google.  If mathml is selected,
+          gitit will convert LaTeX math to MathML and link in a script,
+          MathMLinHTML.js, that allows the MathML to be seen in Gecko browsers,
+          IE + mathplayer, and Opera. In other browsers you may get a jumble of
+          characters.  If raw is selected, the LaTeX math will be displayed as
+          raw LaTeX math.  If mathjax is selected, gitit will link to the
+          remote mathjax script.  If jsMath is selected, gitit will link to the
+          script /js/jsMath/easy/load.js, and will assume that jsMath has been
+          installed into the js/jsMath directory.  This is the most portable
+          solution. If google is selected, the google chart API is called to
+          render the formula as an image. This requires a connection to google,
+          and might raise a technical or a privacy problem.
+        '';
+      };
+
+      mathJaxScript = mkOption {
+        type = types.str;
+        default = "https://d3eoax9i5htok0.cloudfront.net/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
+        description = ''
+          Specifies the path to MathJax rendering script.  You might want to
+          use your own MathJax script to render formulas without Internet
+          connection or if you want to use some special LaTeX packages.  Note:
+          path specified there cannot be an absolute path to a script on your
+          hdd, instead you should run your (local if you wish) HTTP server
+          which will serve the MathJax.js script. You can easily (in four lines
+          of code) serve MathJax.js using
+          http://happstack.com/docs/crashcourse/FileServing.html Do not forget
+          the "http://" prefix (e.g. http://localhost:1234/MathJax.js).
+        '';
+      };
+
+      showLhsBirdTracks = mkOption {
+        type = yesNo;
+        default = "no";
+        description = ''
+          Specifies whether to show Haskell code blocks in "bird style", with
+          "> " at the beginning of each line.
+        '';
+      };
+
+      templatesDir = mkOption {
+        type = types.path;
+        default = gititShared + "/data/templates";
+        description = ''
+          Specifies the path of the directory containing page templates.  If it
+          does not exist, gitit will create it with default templates.  Users
+          may wish to edit the templates to customize the appearance of their
+          wiki. The template files are HStringTemplate templates.  Variables to
+          be interpolated appear between $\'s. Literal $\'s must be
+          backslash-escaped.
+        '';
+      };
+
+      logFile = mkOption {
+        type = types.path;
+        default = homeDir + "/gitit.log";
+        description = ''
+          Specifies the path of gitit's log file.  If it does not exist, gitit
+          will create it. The log is in Apache combined log format.
+        '';
+      };
+
+      logLevel = mkOption {
+        type = types.enum [ "DEBUG" "INFO" "NOTICE" "WARNING" "ERROR" "CRITICAL" "ALERT" "EMERGENCY" ];
+        default = "ERROR";
+        description = ''
+          Determines how much information is logged.  Possible values (from
+          most to least verbose) are DEBUG, INFO, NOTICE, WARNING, ERROR,
+          CRITICAL, ALERT, EMERGENCY.
+        '';
+      };
+
+      frontPage = mkOption {
+        type = types.str;
+        default = "Front Page";
+        description = ''
+          Specifies which wiki page is to be used as the wiki's front page.
+          Gitit creates a default front page on startup, if one does not exist
+          already.
+        '';
+      };
+
+      noDelete = mkOption {
+        type = types.str;
+        default = "Front Page, Help";
+        description = ''
+          Specifies pages that cannot be deleted through the web interface.
+          (They can still be deleted directly using git or darcs.) A
+          comma-separated list of page names.  Leave blank to allow every page
+          to be deleted.
+        '';
+      };
+
+      noEdit = mkOption {
+        type = types.str;
+        default = "Help";
+        description = ''
+          Specifies pages that cannot be edited through the web interface.
+          Leave blank to allow every page to be edited.
+        '';
+      };
+
+      defaultSummary = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          Specifies text to be used in the change description if the author
+          leaves the "description" field blank.  If default-summary is blank
+          (the default), the author will be required to fill in the description
+          field.
+        '';
+      };
+
+      tableOfContents = mkOption {
+        type = yesNo;
+        default = "yes";
+        description = ''
+          Specifies whether to print a tables of contents (with links to
+          sections) on each wiki page.
+        '';
+      };
+
+      plugins = mkOption {
+        type = types.path;
+        default = gititShared + "/plugins/Dot.hs";
+        description = ''
+          Specifies a list of plugins to load.  Plugins may be specified either
+          by their path or by their module name.  If the plugin name starts
+          with Gitit.Plugin., gitit will assume that the plugin is an installed
+          module and will not try to find a source file.
+          Examples:
+          plugins: plugins/DotPlugin.hs, CapitalizeEmphasisPlugin.hs
+          plugins: plugins/DotPlugin
+          plugins: Gitit.Plugin.InterwikiLinks
+        '';
+      };
+
+      useCache = mkOption {
+        type = yesNo;
+        default = "no";
+        description = ''
+          Specifies whether to cache rendered pages.  Note that if use-feed is
+          selected, feeds will be cached regardless of the value of use-cache.
+        '';
+      };
+
+      cacheDir = mkOption {
+        type = types.path;
+        default = homeDir + "/cache";
+        description = "Path where rendered pages will be cached.";
+      };
+
+      maxUploadSize = mkOption {
+        type = types.str;
+        default = "1000K";
+        description = ''
+          Specifies an upper limit on the size (in bytes) of files uploaded
+          through the wiki's web interface.  To disable uploads, set this to
+          0K.  This will result in the uploads link disappearing and the
+          _upload url becoming inactive.
+        '';
+      };
+
+      maxPageSize = mkOption {
+        type = types.str;
+        default = "1000K";
+        description = "Specifies an upper limit on the size (in bytes) of pages.";
+      };
+
+      debugMode = mkOption {
+        type = yesNo;
+        default = "no";
+        description = "Causes debug information to be logged while gitit is running.";
+      };
+
+      compressResponses = mkOption {
+        type = yesNo;
+        default = "yes";
+        description = "Specifies whether HTTP responses should be compressed.";
+      };
+
+      mimeTypesFile = mkOption {
+        type = types.path;
+        default = "/etc/mime/types.info";
+        description = ''
+          Specifies the path of a file containing mime type mappings.  Each
+          line of the file should contain two fields, separated by whitespace.
+          The first field is the mime type, the second is a file extension.
+          For example:
+          video/x-ms-wmx                    wmx
+          If the file is not found, some simple defaults will be used.
+        '';
+      };
+
+      useReCaptcha = mkOption {
+        type = yesNo;
+        default = "no";
+        description = ''
+          If "yes", causes gitit to use the reCAPTCHA service
+          (http://recaptcha.net) to prevent bots from creating accounts.
+        '';
+      };
+
+      reCaptchaPrivateKey = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          Specifies the private key for the reCAPTCHA service.  To get
+          these, you need to create an account at http://recaptcha.net.
+        '';
+      };
+
+      reCaptchaPublicKey = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          Specifies the public key for the reCAPTCHA service.  To get
+          these, you need to create an account at http://recaptcha.net.
+        '';
+      };
+
+      accessQuestion = mkOption {
+        type = types.str;
+        default = "What is the code given to you by Ms. X?";
+        description = ''
+          Specifies a question that users must answer when they attempt to
+          create an account
+        '';
+      };
+
+      accessQuestionAnswers = mkOption {
+        type = types.str;
+        default = "RED DOG, red dog";
+        description = ''
+          Specifies a question that users must answer when they attempt to
+          create an account, along with a comma-separated list of acceptable
+          answers.  This can be used to institute a rudimentary password for
+          signing up as a user on the wiki, or as an alternative to reCAPTCHA.
+          Example:
+          access-question:  What is the code given to you by Ms. X?
+          access-question-answers:  RED DOG, red dog
+        '';
+      };
+
+      rpxDomain = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          Specifies the domain and key of your RPX account.  The domain is just
+          the prefix of the complete RPX domain, so if your full domain is
+          'https://foo.rpxnow.com/', use 'foo' as the value of rpx-domain.
+        '';
+      };
+
+      rpxKey = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = "RPX account access key.";
+      };
+
+      mailCommand = mkOption {
+        type = types.str;
+        default = "sendmail %s";
+        description = ''
+          Specifies the command to use to send notification emails.  '%s' will
+          be replaced by the destination email address.  The body of the
+          message will be read from stdin.  If this field is left blank,
+          password reset will not be offered.
+        '';
+      };
+
+      resetPasswordMessage = mkOption {
+        type = types.lines;
+        default = ''
+          > From: gitit@$hostname$
+          > To: $useremail$
+          > Subject: Wiki password reset
+          >
+          > Hello $username$,
+          >
+          > To reset your password, please follow the link below:
+          > http://$hostname$:$port$$resetlink$
+          >
+          > Regards
+        '';
+        description = ''
+          Gives the text of the message that will be sent to the user should
+          she want to reset her password, or change other registration info.
+          The lines must be indented, and must begin with '>'.  The initial
+          spaces and '> ' will be stripped off.  $username$ will be replaced by
+          the user's username, $useremail$ by her email address, $hostname$ by
+          the hostname on which the wiki is running (as returned by the
+          hostname system call), $port$ by the port on which the wiki is
+          running, and $resetlink$ by the relative path of a reset link derived
+          from the user's existing hashed password. If your gitit wiki is being
+          proxied to a location other than the root path of $port$, you should
+          change the link to reflect this: for example, to
+          http://$hostname$/path/to/wiki$resetlink$ or
+          http://gitit.$hostname$$resetlink$
+        '';
+      };
+
+      useFeed = mkOption {
+        type = yesNo;
+        default = "no";
+        description = ''
+          Specifies whether an ATOM feed should be enabled (for the site and
+          for individual pages).
+        '';
+      };
+
+      baseUrl = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          The base URL of the wiki, to be used in constructing feed IDs and RPX
+          token_urls.  Set this if use-feed is 'yes' or authentication-method
+          is 'rpx'.
+        '';
+      };
+
+      absoluteUrls = mkOption {
+        type = yesNo;
+        default = "no";
+        description = ''
+          Make wikilinks absolute with respect to the base-url.  So, for
+          example, in a wiki served at the base URL '/wiki', on a page
+          Sub/Page, the wikilink '[Cactus]()' will produce a link to
+          '/wiki/Cactus' if absolute-urls is 'yes', and a relative link to
+          'Cactus' (referring to '/wiki/Sub/Cactus') if absolute-urls is 'no'.
+        '';
+      };
+
+      feedDays = mkOption {
+        type = types.int;
+        default = 14;
+        description = "Number of days to be included in feeds.";
+      };
+
+      feedRefreshTime = mkOption {
+        type = types.int;
+        default = 60;
+        description = "Number of minutes to cache feeds before refreshing.";
+      };
+
+      pdfExport = mkOption {
+        type = yesNo;
+        default = "no";
+        description = ''
+          If yes, PDF will appear in export options. PDF will be created using
+          pdflatex, which must be installed and in the path. Note that PDF
+          exports create significant additional server load.
+        '';
+      };
+
+      pandocUserData = mkOption {
+        type = with types; nullOr path;
+        default = null;
+        description = ''
+          If a directory is specified, this will be searched for pandoc
+          customizations. These can include a templates/ directory for custom
+          templates for various export formats, an S5 directory for custom S5
+          styles, and a reference.odt for ODT exports. If no directory is
+          specified, $HOME/.pandoc will be searched. See pandoc's README for
+          more information.
+        '';
+      };
+
+      xssSanitize = mkOption {
+        type = yesNo;
+        default = "yes";
+        description = ''
+          If yes, all HTML (including that produced by pandoc) is filtered
+          through xss-sanitize.  Set to no only if you trust all of your users.
+        '';
+      };
+  };
+
+  configFile = pkgs.writeText "gitit.conf" ''
+    address: ${cfg.address}
+    port: ${toString cfg.port}
+    wiki-title: ${cfg.wikiTitle}
+    repository-type: ${cfg.repositoryType}
+    repository-path: ${cfg.repositoryPath}
+    require-authentication: ${cfg.requireAuthentication}
+    authentication-method: ${cfg.authenticationMethod}
+    user-file: ${cfg.userFile}
+    session-timeout: ${toString cfg.sessionTimeout}
+    static-dir: ${cfg.staticDir}
+    default-page-type: ${cfg.defaultPageType}
+    math: ${cfg.math}
+    mathjax-script: ${cfg.mathJaxScript}
+    show-lhs-bird-tracks: ${cfg.showLhsBirdTracks}
+    templates-dir: ${cfg.templatesDir}
+    log-file: ${cfg.logFile}
+    log-level: ${cfg.logLevel}
+    front-page: ${cfg.frontPage}
+    no-delete: ${cfg.noDelete}
+    no-edit: ${cfg.noEdit}
+    default-summary: ${cfg.defaultSummary}
+    table-of-contents: ${cfg.tableOfContents}
+    plugins: ${cfg.plugins}
+    use-cache: ${cfg.useCache}
+    cache-dir: ${cfg.cacheDir}
+    max-upload-size: ${cfg.maxUploadSize}
+    max-page-size: ${cfg.maxPageSize}
+    debug-mode: ${cfg.debugMode}
+    compress-responses: ${cfg.compressResponses}
+    mime-types-file: ${cfg.mimeTypesFile}
+    use-recaptcha: ${cfg.useReCaptcha}
+    recaptcha-private-key: ${toString cfg.reCaptchaPrivateKey}
+    recaptcha-public-key: ${toString cfg.reCaptchaPublicKey}
+    access-question: ${cfg.accessQuestion}
+    access-question-answers: ${cfg.accessQuestionAnswers}
+    rpx-domain: ${toString cfg.rpxDomain}
+    rpx-key: ${toString cfg.rpxKey}
+    mail-command: ${cfg.mailCommand}
+    reset-password-message: ${cfg.resetPasswordMessage}
+    use-feed: ${cfg.useFeed}
+    base-url: ${toString cfg.baseUrl}
+    absolute-urls: ${cfg.absoluteUrls}
+    feed-days: ${toString cfg.feedDays}
+    feed-refresh-time: ${toString cfg.feedRefreshTime}
+    pdf-export: ${cfg.pdfExport}
+    pandoc-user-data: ${toString cfg.pandocUserData}
+    xss-sanitize: ${cfg.xssSanitize}
+  '';
+
+in
+
+{
+
+  options.services.gitit = gititOptions;
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers.gitit = {
+      group = config.users.extraGroups.gitit.name;
+      description = "Gitit user";
+      home = homeDir;
+      createHome = true;
+      uid = config.ids.uids.gitit;
+    };
+
+    users.extraGroups.gitit.gid = config.ids.gids.gitit;
+
+    systemd.services.gitit = let
+      uid = toString config.ids.uids.gitit;
+      gid = toString config.ids.gids.gitit;
+    in {
+      description = "Git and Pandoc Powered Wiki";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      preStart = with cfg; ''
+        chown ${uid}:${gid} -R ${homeDir}
+        for dir in ${repositoryPath} ${staticDir} ${templatesDir} ${cacheDir}
+        do
+          if [ ! -d $dir ]
+          then
+            mkdir -p $dir
+            find $dir -type d -exec chmod 0750 {} +
+            find $dir -type f -exec chmod 0640 {} +
+          fi
+        done
+        cd ${repositoryPath}
+        if [ ! -d  .git ]
+        then
+          ${pkgs.git}/bin/git init
+          ${pkgs.git}/bin/git config user.email "gitit@${config.networking.hostName}"
+          ${pkgs.git}/bin/git config user.name "gitit"
+          chown ${uid}:${gid} -R {repositoryPath}
+        fi
+        cd -
+      '';
+
+      serviceConfig = {
+        User = config.users.extraUsers.gitit.name;
+        Group = config.users.extraGroups.gitit.name;
+        ExecStart = with cfg; gititSh haskellPackages extraPackages;
+      };
+    };
+  };
+}
+

From da7355e562d79d23b10f32766b69e1b05eda5d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 22 Jun 2015 20:10:15 +0200
Subject: [PATCH 1688/2322] pkgs.haskellPackages.gitit: unmark as broken

---
 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 4954e5b01c9..c0d231616d9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -851,9 +851,6 @@ self: super: {
   # https://github.com/DanielG/cabal-helper/issues/2
   cabal-helper = overrideCabal super.cabal-helper (drv: { preCheck = "export HOME=$TMPDIR"; });
 
-  # https://github.com/jgm/gitit/issues/494
-  gitit = markBroken super.gitit;
-
   # https://github.com/ekmett/comonad/issues/25
   comonad = dontCheck super.comonad;
 

From c45b5aba92cc6b7d7e3602335c97a084f2ed0144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 30 Apr 2015 13:46:31 +0200
Subject: [PATCH 1689/2322] Document the different license base cases

---
 doc/meta.xml | 39 +++++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/doc/meta.xml b/doc/meta.xml
index 14a01ccb3c0..b36f3915ec1 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -138,12 +138,39 @@ meta-attributes</title>
 
   <varlistentry>
     <term><varname>license</varname></term>
-    <listitem><para>The license for the package. One from the
-    attribute set defined in <link
-    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
-    <filename>nixpkgs/lib/licenses.nix</filename></link>.  Example:
-    <literal>stdenv.lib.licenses.gpl3</literal>. For details, see
-    <xref linkend='sec-meta-license'/>.</para></listitem>
+    <listitem>
+      <para>
+        The license, or licenses, for the package. One from the attribute set
+        defined in <link
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
+          <filename>nixpkgs/lib/licenses.nix</filename></link>. At this moment
+        using both a list of licenses and a single license is valid. If the
+        license field is in the form of a list representation, then it means
+        that parts of the package are licensed differently.  Each license
+        should preferably be referenced by their attribute. The non-list
+        attribute value can also be a space delimited string representation of
+        the contained attribute shortNames or spdxIds. The following are all valid
+        examples:
+        <itemizedlist>
+          <listitem><para>Single license referenced by attribute (preferred)
+              <literal>stdenv.lib.licenses.gpl3</literal>.
+          </para></listitem>
+          <listitem><para>Single license referenced by its attribute shortName (frowned upon)
+              <literal>"gpl3"</literal>.
+          </para></listitem>
+          <listitem><para>Single license referenced by its attribute spdxId (frowned upon)
+              <literal>"GPL-3.0"</literal>.
+          </para></listitem>
+          <listitem><para>Multiple licenses referenced by attribute (preferred)
+              <literal>with stdenv.lib.licenses; [ asl20 free ofl ]</literal>.
+          </para></listitem>
+          <listitem><para>Multiple licenses referenced as a space delimited string of attribute shortNames (frowned upon)
+              <literal>"asl20 free ofl"</literal>.
+          </para></listitem>
+        </itemizedlist>
+        For details, see <xref linkend='sec-meta-license'/>.
+      </para>
+    </listitem>
   </varlistentry>
 
   <varlistentry>

From d0633a28ffddb78f6a1e7340f67e3aad663c87d0 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sun, 28 Jun 2015 22:34:44 +1200
Subject: [PATCH 1690/2322] Fix SSL/TLS support for shellinaboxd

shellinboxd was not finding libssl.so in it's library path, so it was
falling back to ssl disabled mode. Also, the path to openssl was
hardcoded to /usr/bin/openssl, so shellinaboxd could not generate SSL
certificates once libssl.so was added to LD_LIBRARY_PATH.
---
 pkgs/servers/shellinabox/default.nix | 31 ++++++++++++++++++----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix
index 2d827c737d8..5d870c7e6bd 100644
--- a/pkgs/servers/shellinabox/default.nix
+++ b/pkgs/servers/shellinabox/default.nix
@@ -1,29 +1,38 @@
-{ stdenv, fetchurl, pam, openssl, openssh, shadow }:
+{ stdenv, fetchurl, pam, openssl, openssh, shadow, makeWrapper }:
 
-stdenv.mkDerivation {
-  name = "shellinabox-2.14";
+stdenv.mkDerivation rec {
+  version = "2.14";
+  name = "shellinabox-${version}";
 
   src = fetchurl {
-    url = "https://shellinabox.googlecode.com/files/shellinabox-2.14.tar.gz";
+    url = "https://shellinabox.googlecode.com/files/shellinabox-${version}.tar.gz";
     sha1 = "9e01f58c68cb53211b83d0f02e676e0d50deb781";
   };
 
-  buildInputs = [pam openssl openssh];
+  buildInputs = [ pam openssl openssh makeWrapper ];
 
   patches = [ ./shellinabox-minus.patch ];
 
-  # Disable GSSAPIAuthentication errors as well as correct hardcoded path. Take /usr/games's place. 
+  # Disable GSSAPIAuthentication errors. Also, paths in certain source files are
+  # hardcoded. Replace the hardcoded paths with correct paths.
   preConfigure = ''
     substituteInPlace ./shellinabox/service.c --replace "-oGSSAPIAuthentication=no" ""
     substituteInPlace ./shellinabox/launcher.c --replace "/usr/games" "${openssh}/bin"
     substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login"
     substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login"
-    '';
-  meta = {
+    substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl}/bin"
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/shellinaboxd \
+      --prefix LD_LIBRARY_PATH : ${openssl}/lib
+  '';
+
+  meta = with stdenv.lib; {
     homepage = https://code.google.com/p/shellinabox;
     description = "Web based AJAX terminal emulator";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [stdenv.lib.maintainers.tomberek];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ tomberek lihop ];
+    platforms = platforms.linux;
   };
 }

From 0d24a16bdf2aa06db1fdceb765c439fa9626ec59 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 28 Jun 2015 19:06:26 +0300
Subject: [PATCH 1691/2322] Minimal fix to make XConq playable again

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

diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix
index 1af7f42beb1..413ecccc76e 100644
--- a/pkgs/games/xconq/default.nix
+++ b/pkgs/games/xconq/default.nix
@@ -1,5 +1,6 @@
 x@{builderDefsPackage
   , rpm, cpio, xproto, libX11, libXmu, libXaw, libXt, tcl, tk, libXext
+  , fontconfig
   , makeWrapper
   , ...}:
 builderDefsPackage
@@ -33,7 +34,7 @@ rec {
   phaseNames = ["addInputs" "doUnpack" "fixMakefiles" "fixCfiles" "fixTCLfiles" 
     "doConfigure" "doMakeInstall" "doWrap"];
       
-  doWrap = a.makeManyWrappers ''$out/bin/*'' ''--prefix TCLLIBPATH : "${tk}/lib"'';
+  doWrap = a.makeManyWrappers ''$out/bin/*'' ''--prefix TCLLIBPATH ' ' "${tk}/lib"'';
 
   fixMakefiles = a.fullDepEntry ''
     find . -name 'Makefile.in' -exec sed -re 's@^        ( *)(cd|[&][&])@	\1\2@' -i '{}' ';'

From 52339c7c70069269239ab5b3cfa4bb3edbeac3df Mon Sep 17 00:00:00 2001
From: Phil Scott <me@philscotted.com>
Date: Sun, 28 Jun 2015 16:17:51 +0000
Subject: [PATCH 1692/2322] tome4: add new maintainer

---
 lib/maintainers.nix          | 1 +
 pkgs/games/tome4/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e5a199e2181..2aeedbfa9c2 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -56,6 +56,7 @@
   cdepillabout = "Dennis Gosnell <cdep.illabout@gmail.com>";
   cfouche = "Chaddaï Fouché <chaddai.fouche@gmail.com>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
+  chattered = "Phil Scott <me@philscotted.com>";
   christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   codyopel = "Cody Opel <codyopel@gmail.com>";
diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix
index 8ff82767cb7..7b7b0808aa9 100644
--- a/pkgs/games/tome4/default.nix
+++ b/pkgs/games/tome4/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://te4.org/";
     description = "Tales of Maj'eyal (rogue-like game)";
+    maintainers = [ stdenv.lib.maintainers.chattered  ];
     license = stdenv.lib.licenses.gpl3;
   };
 }

From 172ed10426df966ee5df76a1ef18f683698fe23f Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Sun, 28 Jun 2015 20:58:31 +0200
Subject: [PATCH 1693/2322] Fix libcxxStdenv on Linux

This corrects linkage failures arising from missing -lc++abi and
resolves "unused argument" warnings arising due to -stdlib=libc++
serving no purpose when search paths are being supplied explicitly.
---
 pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh | 6 ++----
 pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh | 6 ++----
 pkgs/top-level/all-packages.nix                          | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
index 8a45be7e85a..62ab46ac310 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
@@ -1,4 +1,2 @@
-export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1"
-
-export NIX_CXXSTDLIB_COMPILE=" -stdlib=libc++"
-export NIX_CXXSTDLIB_LINK=" -stdlib=libc++"
+export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_CXXSTDLIB_LINK=" -lc++ -lc++abi"
diff --git a/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh
index 8a45be7e85a..62ab46ac310 100644
--- a/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh
@@ -1,4 +1,2 @@
-export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1"
-
-export NIX_CXXSTDLIB_COMPILE=" -stdlib=libc++"
-export NIX_CXXSTDLIB_LINK=" -stdlib=libc++"
+export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_CXXSTDLIB_LINK=" -lc++ -lc++abi"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cf9fed11ae..b8ef6fc1c5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3531,7 +3531,7 @@ let
     libc = glibc;
     binutils = binutils;
     inherit coreutils zlib;
-    extraPackages = [ libcxx ];
+    extraPackages = [ libcxx libcxxabi ];
     nativeTools = false;
     nativeLibc = false;
   };

From b0ad2da4ede8413c3bba63325493a125d0f242b0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 8 Jun 2015 01:13:44 +0300
Subject: [PATCH 1694/2322] dtc: init at 1.4.1

Compiling U-Boot for the Jetson TK1 board requires this.
---
 pkgs/development/compilers/dtc/default.nix | 24 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/compilers/dtc/default.nix

diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix
new file mode 100644
index 00000000000..84673dfc724
--- /dev/null
+++ b/pkgs/development/compilers/dtc/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchgit, flex, bison }:
+
+stdenv.mkDerivation rec {
+  name = "dtc-${version}";
+  version = "1.4.1";
+
+  src = fetchgit {
+    url = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "0z7yrv0sdhsh5wwy7yd1fvs4pqaq0n9m5i8w65lyibg77ahkasdg";
+  };
+
+  buildInputs = [ flex bison ];
+
+  installFlags = [ "INSTALL=install" "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Device Tree Compiler";
+    homepage = https://git.kernel.org/cgit/utils/dtc/dtc.git;
+    license = licenses.gpl2; # dtc itself is GPLv2, libfdt is dual GPL/BSD
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e028080155..ac6607daf92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1318,6 +1318,8 @@ let
 
   dtach = callPackage ../tools/misc/dtach { };
 
+  dtc = callPackage ../development/compilers/dtc { };
+
   dub = callPackage ../development/tools/build-managers/dub { };
 
   duff = callPackage ../tools/filesystems/duff { };

From cf98387f738b05aa801a0658ba5f82bad3865559 Mon Sep 17 00:00:00 2001
From: C0DEHERO <codehero@nerdpol.ch>
Date: Sun, 28 Jun 2015 12:23:07 -0400
Subject: [PATCH 1695/2322] voxelands: 1504.01 -> 1506.00

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

diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix
index b6bd54f779d..7d96829f12b 100644
--- a/pkgs/games/voxelands/default.nix
+++ b/pkgs/games/voxelands/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "voxelands-${version}";
-  version = "1504.01";
+  version = "1506.00";
 
   src = fetchurl {
       url = "http://voxelands.com/downloads/${name}-src.tar.bz2";
-      sha256 = "17jv2pz0mbkkf7jw3jcpix8hb46b382hc7vki42n9rrdynydq5zp";
+      sha256 = "0j82zidxv2rzx7fmw5z27nfldqkixbrs1f6l3fs433xr3d05406y";
   };
 
   cmakeFlags = [

From a145a70f1a6e3cef05de0b700727615b600c1380 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <maurer@matthewmaurer.org>
Date: Sun, 28 Jun 2015 21:09:24 +0000
Subject: [PATCH 1696/2322] ocaml-bitstring: debug message removal

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

diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix
index b612ec1c0bd..d48f93bd626 100644
--- a/pkgs/development/ocaml-modules/bitstring/default.nix
+++ b/pkgs/development/ocaml-modules/bitstring/default.nix
@@ -17,7 +17,7 @@ buildOcaml rec {
   createFindlibDestdir = true;
   hasSharedObjects = true;
 
-  preConfigure = "./bootstrap; echo breakhash";
+  preConfigure = "./bootstrap";
 
   meta = with stdenv.lib; {
     description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml.";

From f9bd72f24cfc8c160d144615522b0bc692cde9d0 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 28 Jun 2015 23:26:54 +0200
Subject: [PATCH 1697/2322] nixos/iso-image: Allow to customize menu label.

It comes in handy to alter the menu label if you're not building a NixOS
installer image but for example if you want to build a live system and
still want to re-use the iso-image.nix module.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/installer/cd-dvd/iso-image.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index c546b8df474..0128fa9f33d 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -40,7 +40,7 @@ let
     DEFAULT boot
 
     LABEL boot
-    MENU LABEL NixOS ${config.system.nixosVersion} Installer
+    MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel}
     LINUX /boot/bzImage
     APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
     INITRD /boot/initrd
@@ -192,6 +192,18 @@ in
       '';
     };
 
+    isoImage.appendToMenuLabel = mkOption {
+      default = " Installer";
+      example = " Live System";
+      description = ''
+        The string to append after the menu label for the NixOS system.
+        This will be directly appended (without whitespace) to the NixOS version
+        string, like for example if it is set to <literal>XXX</literal>:
+
+        <para><literal>NixOS 99.99-pre666XXX</literal></para>
+      '';
+    };
+
   };
 
   config = {

From d94285788f854b91dc34b9b084b291606d3b1a60 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 29 Jun 2015 01:15:19 +0200
Subject: [PATCH 1698/2322] python-packages: repocheck 2015-05-04 -> 2015-06-27

---
 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 334eb8f083d..bfe21546f5a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11007,12 +11007,12 @@ let
   };
 
   repocheck = buildPythonPackage rec {
-    name = "repocheck-2015-05-04";
+    name = "repocheck-2015-06-27";
     disabled = isPy26 || isPy27;
 
     src = pkgs.fetchFromGitHub {
-      sha256 = "0zk8n4sm7i488wgqljkfjd2j0hm0qimxr9dhdz6d7xal7apwh71x";
-      rev = "db8c336f071ead3375805b7a78ca3d7c862536db";
+      sha256 = "0psihwph10sx07xc2gfch739laz7x1kwl5c991cci8cfn5jzy8bp";
+      rev = "231e05b4fa55955ef8492581a15f508ffa0037d4";
       repo = "repocheck";
       owner = "kynikos";
     };

From 8e997a4b6def7b620d5bd3f0b8063ec9aa62f6ed Mon Sep 17 00:00:00 2001
From: hiberno <mail@elfsechsundzwanzig.de>
Date: Mon, 29 Jun 2015 09:45:55 +0200
Subject: [PATCH 1699/2322] powerline-fonts: bump to latest revision

---
 pkgs/data/fonts/powerline-fonts/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix
index 3ae436179ba..3c8d2735a41 100644
--- a/pkgs/data/fonts/powerline-fonts/default.nix
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "powerline-fonts-2014-12-27";
+  name = "powerline-fonts-2015-06-29";
 
   src = fetchFromGitHub {
     owner = "powerline";
     repo = "fonts";
-    rev = "39c99c02652f25290b64e24a7e9a7cfb8ce89a3e";
-    sha256 = "9c83a30f36dc980582c0a079bd2896f95d19e1cb0ba5afbd8cae936c944256dd";
+    rev = "97dc451724fb24e1dd9892c988642b239b5dc67c";
+    sha256 = "1m0a8k916s74iv2k0kk36dz7d2hfb2zgf8m0b9hg71w4yd3bmj4w";
   };
 
   buildPhase = "true";

From 439ce0d07ddedae399b20e702206a003ba1c9145 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 29 Jun 2015 10:13:44 +0200
Subject: [PATCH 1700/2322] checkstyle: update from 6.7 to 6.8

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

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 3addd0f5a25..994f59c5228 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.7";
+  version = "6.8";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz";
-    sha256 = "0na3gfkxzgnnbjvr4sys4x3mb1s1hn9xy9krmvnxqq0wmm4lysjd";
+    sha256 = "1g1hlsyriciipllw4ki21sbdh5br225w0n86w9i3m2a9slac1rdq";
   };
 
   installPhase = ''

From bd65e8afb48bcac4fa2f80b4cc590db5bf7b5d59 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 29 Jun 2015 12:50:08 +0200
Subject: [PATCH 1701/2322] bro: update from 2.3.2 to 2.4

---
 pkgs/applications/networking/ids/bro/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix
index c3641903a75..8d6515f2dd2 100644
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ b/pkgs/applications/networking/ids/bro/default.nix
@@ -1,14 +1,16 @@
-{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, perl, zlib, file, curl, geoip, gperftools }:
+{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, perl, zlib, file, curl
+, geoip, gperftools }:
 
 stdenv.mkDerivation rec {
-  name = "bro-2.3.2";
+  name = "bro-2.4";
   
   src = fetchurl {
     url = "http://www.bro.org/downloads/release/${name}.tar.gz";
-    sha256 = "16y6924brh7sw6l0nry6y4q8sif2lkcpymkd26aabdc61bdgpr9g";
+    sha256 = "1ch8w8iakr2ajbigaad70b6mfv01s2sbdqgmrqm9q9zc1c5hs33l";
   };
   
-  buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip gperftools ];
+  buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip
+   gperftools ];
 
   enableParallelBuilding = true;
   

From 512225ef8156ae5610b65f1b7f42a8d649b0853f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 29 Jun 2015 16:20:58 +0200
Subject: [PATCH 1702/2322] Fixed some descriptions

---
 .../development/libraries/audio/ntk/default.nix |  4 ++--
 .../libraries/oracle-instantclient/default.nix  |  2 +-
 .../ocaml-modules/bitstring/default.nix         |  2 +-
 pkgs/os-specific/linux/edac-utils/default.nix   |  2 +-
 .../monitoring/prometheus/prom2json/default.nix |  2 +-
 pkgs/servers/nosql/eventstore/default.nix       |  2 +-
 pkgs/tools/security/signing-party/default.nix   |  2 +-
 pkgs/top-level/dotnet-packages.nix              | 17 +++++++++++------
 pkgs/top-level/python-packages.nix              |  7 ++++---
 9 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix
index 647d0962f0a..af98592e06d 100644
--- a/pkgs/development/libraries/audio/ntk/default.nix
+++ b/pkgs/development/libraries/audio/ntk/default.nix
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Fork of FLTK 1.3.0 with additional functionality.";
+    description = "Fork of FLTK 1.3.0 with additional functionality";
     version = "${version}";
-    homepage = "http://non.tuxfamily.org/";
+    homepage = http://non.tuxfamily.org/;
     license = stdenv.lib.licenses.lgpl21;
     maintainers = [ stdenv.lib.maintainers.magnetophon ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index a2c00719463..c29a5da9f21 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -57,7 +57,7 @@ let requireSource = version: part: hash: (requireFile rec {
   dontPatchELF = true;
 
   meta = with stdenv.lib; {
-    description = "Oracle instant client libraries and sqlplus CLI.";
+    description = "Oracle instant client libraries and sqlplus CLI";
     longDescription = ''
       Oracle instant client provides access to Oracle databases (OCI,
       OCCI, Pro*C, ODBC or JDBC). This package includes the sqlplus
diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix
index d48f93bd626..ae01cf9d7b5 100644
--- a/pkgs/development/ocaml-modules/bitstring/default.nix
+++ b/pkgs/development/ocaml-modules/bitstring/default.nix
@@ -20,7 +20,7 @@ buildOcaml rec {
   preConfigure = "./bootstrap";
 
   meta = with stdenv.lib; {
-    description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml.";
+    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/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix
index 0a2f38ffd8a..b24099f9599 100644
--- a/pkgs/os-specific/linux/edac-utils/default.nix
+++ b/pkgs/os-specific/linux/edac-utils/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage = http://github.com/grondo/edac-utils;
-    description = "handles the reporting of hardware-related memory errors.";
+    description = "Handles the reporting of hardware-related memory errors";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/servers/monitoring/prometheus/prom2json/default.nix b/pkgs/servers/monitoring/prometheus/prom2json/default.nix
index 95457758cd2..368ea3ae214 100644
--- a/pkgs/servers/monitoring/prometheus/prom2json/default.nix
+++ b/pkgs/servers/monitoring/prometheus/prom2json/default.nix
@@ -19,7 +19,7 @@ goPackages.buildGoPackage rec {
   ];
 
   meta = with lib; {
-    description = "A tool to scrape a Prometheus client and dump the result as JSON.";
+    description = "A tool to scrape a Prometheus client and dump the result as JSON";
     homepage = https://github.com/prometheus/prom2json;
     license = licenses.asl20;
     maintainers = with maintainers; [ benley ];
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index fd83ba889b9..9cb5dd41c1c 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = https://geteventstore.com/;
-    description = "Event sourcing database with processing logic in JavaScript.";
+    description = "Event sourcing database with processing logic in JavaScript";
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix
index dd05030e712..21e0bb4c4a9 100644
--- a/pkgs/tools/security/signing-party/default.nix
+++ b/pkgs/tools/security/signing-party/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   doCheck = false; # no check rule
 
   meta = {
-    description = "PGP Tools is a collection for all kinds of pgp related things, including signing scripts, party preparation scripts etc.";
+    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;
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 21b42d1273b..bef3f9c0a01 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -280,8 +280,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "FSharp.AutoComplete/bin/Release/*" ];
 
     meta = {
-      description = "This project provides a command-line interface to the FSharp.Compiler.Service project. It is intended to be used as a backend service for rich editing or 'intellisense' features for editors.";
-      homepage = "https://github.com/fsharp/FSharp.AutoComplete";
+      description = "An interface to the FSharp.Compiler.Service project";
+      longDescription = ''
+        This project provides a command-line interface to the
+        FSharp.Compiler.Service project. It is intended to be used as a backend
+        service for rich editing or 'intellisense' features for editors.
+        '';
+      homepage = https://github.com/fsharp/FSharp.AutoComplete;
       license = stdenv.lib.licenses.asl20;
       maintainers = with stdenv.lib.maintainers; [ obadz ];
       platforms = with stdenv.lib.platforms; linux;
@@ -498,8 +503,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     dontStrip = true;
 
     meta = {
-      description = "NDesk.Options is a callback-based program option parser for C#.";
-      homepage = "http://www.ndesk.org/Options";
+      description = "A callback-based program option parser for C#";
+      homepage = http://www.ndesk.org/Options;
       license = stdenv.lib.licenses.mit;
       maintainers = with stdenv.lib.maintainers; [ obadz ];
       platforms = with stdenv.lib.platforms; linux;
@@ -677,8 +682,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "bin/net40/*" ];
 
     meta = {
-      description = "A declarative CLI argument/XML configuration parser for F# applications.";
-      homepage = "http://nessos.github.io/UnionArgParser/";
+      description = "A declarative CLI argument/XML configuration parser for F# applications";
+      homepage = http://nessos.github.io/UnionArgParser/;
       license = stdenv.lib.licenses.mit;
       maintainers = with stdenv.lib.maintainers; [ obadz ];
       platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bfe21546f5a..24f39b3bc93 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5195,8 +5195,8 @@ let
     };
 
     meta = {
-      description = "simple wrapper around fribidi.";
-      homepage = "https://github.com/pediapress/pyfribidi";
+      description = "A simple wrapper around fribidi";
+      homepage = https://github.com/pediapress/pyfribidi;
       license = stdenv.lib.licenses.gpl2;
     };
   };
@@ -9295,7 +9295,8 @@ let
     };
 
     meta = {
-      description = ''PicoSAT is a popular SAT solver written by Armin
+      description = "Python bindings for PicoSAT";
+      longDescription = ''PicoSAT is a popular SAT solver written by Armin
           Biere in pure C. This package provides efficient Python bindings
           to picosat on the C level, i.e. when importing pycosat, the
           picosat solver becomes part of the Python process itself. For

From 15fd734a589017fb5c797525623c7d479310bad8 Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <couchemar@yandex.ru>
Date: Mon, 29 Jun 2015 17:30:59 +0300
Subject: [PATCH 1703/2322] elixir: 1.0.4 -> 1.0.5

---
 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 6bb8c0565d5..99d649f3f68 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash, cacert }:
 
 let
-  version = "1.0.4";
+  version = "1.0.5";
 in
 stdenv.mkDerivation {
   name = "elixir-${version}";
 
   src = fetchurl {
     url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
-    sha256 = "1babp3ff6hajdm247zl9rc311k973cdnv6dqaai7l8817gg1yd3r";
+    sha256 = "1f419pzlcgqx68rygwwyp2hzh4vgp0avjydd84dpa7finckc5raw";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];

From 5ade71b1d748283bd1fd1c8266e5fc077cce9ddb Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 29 Jun 2015 17:03:33 +0200
Subject: [PATCH 1704/2322] pencil: wrap bin/pencil correctly, fixes #8551

---
 pkgs/applications/graphics/pencil/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index e6e72cfd6e6..19c6334d1d6 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xulrunner }:
+{ stdenv, fetchurl, makeWrapper, xulrunner }:
 
 stdenv.mkDerivation rec {
   version = "2.0.11";
@@ -12,15 +12,19 @@ stdenv.mkDerivation rec {
 
   buildPhase = "";
 
+  buildInputs = [ makeWrapper ];
+
   installPhase = ''
     mkdir -p "$out"
     cp -r usr/* "$out"
-    sed -e "s|/usr/bin/xulrunner|${xulrunner}/bin/xulrunner|" \
-        -e "s|/usr/share/evolus-pencil|$out/share/evolus-pencil|" \
+    sed -e "s|/usr/share/evolus-pencil|$out/share/evolus-pencil|" \
         -i "$out/bin/pencil"
     sed -e "s|/usr/bin/pencil|$out/bin/pencil|" \
         -e "s|Icon=.*|Icon=$out/share/evolus-pencil/skin/classic/icon.svg|" \
         -i "$out/share/applications/pencil.desktop"
+
+    wrapProgram $out/bin/pencil \
+      --prefix PATH ":" ${xulrunner}/bin
   '';
 
   meta = with stdenv.lib; {

From c1becad3eb8b5cef1f0db046295edcab35a5b080 Mon Sep 17 00:00:00 2001
From: Marcin Falkiewicz <avalatron@gmail.com>
Date: Mon, 29 Jun 2015 10:56:19 +0200
Subject: [PATCH 1705/2322] nixos/modules/system/boot/luksroot.nix: allow for
 LUKS devices with detached header

---
 nixos/modules/system/boot/luksroot.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 3799e5d7ddb..1b4f0d401e6 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -5,7 +5,7 @@ with lib;
 let
   luks = config.boot.initrd.luks;
 
-  openCommand = { name, device, keyFile, keyFileSize, allowDiscards, yubikey, ... }: ''
+  openCommand = { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, ... }: ''
     # 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.
@@ -33,6 +33,7 @@ let
 
     open_normally() {
         cryptsetup luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} \
+          ${optionalString (header != null) "--header=${header}"} \
           ${optionalString (keyFile != null) "--key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}"}
     }
 
@@ -251,6 +252,16 @@ in
           description = "Path of the underlying block device.";
         };
 
+        header = mkOption {
+          default = null;
+          example = "/root/header.img";
+          type = types.nullOr types.string;
+          description = ''
+            The name of the file or block device that
+            should be used as header for the encrypted device.
+          '';
+        };
+
         keyFile = mkOption {
           default = null;
           example = "/dev/sdb1";

From 886a8728534021101f9901e3ce11cd76fccf9295 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 27 Jun 2015 17:00:31 +0200
Subject: [PATCH 1706/2322] humanize: init at 0.5.1

---
 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 a299f931278..fe29ba8bfb2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3386,6 +3386,29 @@ let
     };
   };
 
+  humanize = buildPythonPackage rec {
+    version = "0.5.1";
+    name = "humanize-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/h/humanize/${name}.tar.gz";
+      md5 = "e8473d9dc1b220911cac2edd53b1d973";
+    };
+
+    buildInputs = with self; [ mock ];
+
+    doCheck = false;
+
+    meta = {
+      description = "python humanize utilities";
+      homepage = https://github.com/jmoiron/humanize;
+      license = licenses.mit;
+      maintainers = with maintainers; [ matthiasbeyer ];
+      platforms = platforms.linux; # can only test on linux
+    };
+
+  };
+
   hovercraft = buildPythonPackage rec {
     disabled = ! isPy3k;
     name = "hovercraft-${version}";

From ce10f31e0e218de4b75becd588ea61a4ab44a710 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 27 Jun 2015 17:00:43 +0200
Subject: [PATCH 1707/2322] httpauth: init at 0.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fe29ba8bfb2..a2423e8073b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3433,6 +3433,25 @@ let
     };
   };
 
+  httpauth = buildPythonPackage rec {
+    version = "0.2";
+    name = "httpauth-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/h/httpauth/${name}.tar.gz";
+      md5 = "78d1835a80955e68e98a3ca5ab7f7dbd";
+    };
+
+    doCheck = false;
+
+    meta = {
+      description = "WSGI HTTP Digest Authentication middleware";
+      homepage = https://github.com/jonashaag/httpauth;
+      license = licenses.bsd2;
+      maintainers = with maintainers; [ matthiasbeyer ];
+    };
+  };
+
   itsdangerous = buildPythonPackage rec {
     name = "itsdangerous-0.24";
 

From 5344e4db4d1d47dc0c406d12e366afc7fdf3c325 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 27 Jun 2015 17:00:55 +0200
Subject: [PATCH 1708/2322] klaus: init at 0.4.9

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a2423e8073b..362b0623569 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6652,6 +6652,27 @@ let
     };
   };
 
+  klaus = buildPythonPackage rec {
+    version = "0.4.9";
+    name = "klaus-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://github.com/jonashaag/klaus/archive/${version}.tar.gz";
+      sha256 = "0qcbv3shz530mn53pdc68fx38ylz72033xsrz77ffi0cks32az2w";
+    };
+
+    propagatedBuildInputs = with self;
+      [ humanize httpauth dulwich pygments flask ];
+
+    meta = {
+      description = "The first Git web viewer that Just Works";
+      homepage    = "https://github.com/jonashaag/klaus";
+      #license     = licenses.mit; # I'm not sure about the license
+      maintainers = with maintainers; [ matthiasbeyer ];
+      platforms   = platforms.linux; # Can only test linux
+    };
+  };
+
   kombu = buildPythonPackage rec {
     name = "kombu-${version}";
     version = "3.0.24";

From 7e9cba3a2d6b3378309a9c82a104d06a971a297a Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Mon, 29 Jun 2015 19:05:51 +0300
Subject: [PATCH 1709/2322] qutebrowser: 0.3-pre -> 0.3

---
 .../networking/browsers/qutebrowser/default.nix             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index f93ec35db34..04df4da450c 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2 }:
 
-let version = "0.3-pre"; in
+let version = "0.3"; in
 
 buildPythonPackage {
   name = "qutebrowser-${version}";
@@ -8,8 +8,8 @@ buildPythonPackage {
 
   src = fetchgit {
     url = "https://github.com/The-Compiler/qutebrowser.git";
-    rev = "f31f254d9bf3ffd4ef95089f4924e5c45d8c0f78";
-    sha256 = "0virh71q9qyh7ggk5p6h3gjv30gr2jn8am6yq8xzbslchck0rkcr";
+    rev = "b3cd31a808789932a0a4cb7aa8d9280b6d3a12e7";
+    sha256 = "fea7fd9de8a930da7af0111739ae88851cb965b30751858d1aba5bbd15277652";
   };
 
   # Needs tox

From 03dbba975706c03f41600b174f1a50f072712d02 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 29 Jun 2015 13:41:24 -0400
Subject: [PATCH 1710/2322] build-maven: Handle very long dependency lists

---
 pkgs/build-support/build-maven.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix
index bde95080e74..284be201ff0 100644
--- a/pkgs/build-support/build-maven.nix
+++ b/pkgs/build-support/build-maven.nix
@@ -13,7 +13,7 @@
 infoFile: let
   info = builtins.fromJSON (builtins.readFile infoFile);
 
-  repo = runCommand "maven-repository" {} ''
+  script = writeText "build-maven-repository.sh" ''
     ${lib.concatStrings (map (dep: let
       inherit (dep) url sha1 groupId artifactId version;
 
@@ -25,6 +25,10 @@ infoFile: let
     '') info.dependencies)}
   '';
 
+  repo = runCommand "maven-repository" {} ''
+    bash ${script}
+  '';
+
   settings = writeText "settings.xml" ''
     <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From b62baacbc177cf799d88c2b519015a13ef91891c Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Mon, 29 Jun 2015 13:55:12 -0700
Subject: [PATCH 1711/2322] Revert "Fix libcxxStdenv on Linux"

This reverts commit 172ed10426df966ee5df76a1ef18f683698fe23f.
---
 pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh | 6 ++++--
 pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh | 6 ++++--
 pkgs/top-level/all-packages.nix                          | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
index 62ab46ac310..8a45be7e85a 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
@@ -1,2 +1,4 @@
-export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_CXXSTDLIB_LINK=" -lc++ -lc++abi"
+export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1"
+
+export NIX_CXXSTDLIB_COMPILE=" -stdlib=libc++"
+export NIX_CXXSTDLIB_LINK=" -stdlib=libc++"
diff --git a/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh
index 62ab46ac310..8a45be7e85a 100644
--- a/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh
@@ -1,2 +1,4 @@
-export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_CXXSTDLIB_LINK=" -lc++ -lc++abi"
+export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1"
+
+export NIX_CXXSTDLIB_COMPILE=" -stdlib=libc++"
+export NIX_CXXSTDLIB_LINK=" -stdlib=libc++"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5875abfaa4b..afcda331b49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3597,7 +3597,7 @@ let
     libc = glibc;
     binutils = binutils;
     inherit coreutils zlib;
-    extraPackages = [ libcxx libcxxabi ];
+    extraPackages = [ libcxx ];
     nativeTools = false;
     nativeLibc = false;
   };

From a9b3d75e9ea16e546621cd0821584c784acf0591 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 30 Jun 2015 00:50:01 +0200
Subject: [PATCH 1712/2322] nix.buildMachines: Fewer required fields

---
 nixos/modules/services/misc/nix-daemon.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index e5948e223d5..b79a69e2ba8 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -329,13 +329,13 @@ in
         text =
           concatMapStrings (machine:
             "${if machine ? sshUser then "${machine.sshUser}@" else ""}${machine.hostName} "
-            + (if machine ? system then machine.system else concatStringsSep "," machine.systems)
-            + " ${machine.sshKey} ${toString machine.maxJobs} "
-            + (if machine ? speedFactor then toString machine.speedFactor else "1" )
+            + machine.system or (concatStringsSep "," machine.systems)
+            + " ${machine.sshKey or "-"} ${toString machine.maxJobs or 1} "
+            + toString (machine.speedFactor or 1)
             + " "
-            + (if machine ? supportedFeatures then concatStringsSep "," machine.supportedFeatures else "" )
+            + concatStringsSep "," (machine.mandatoryFeatures or [] ++ machine.supportedFeatures or [])
             + " "
-            + (if machine ? mandatoryFeatures then concatStringsSep "," machine.mandatoryFeatures else "" )
+            + concatStringsSep "," machine.mandatoryFeatures or []
             + "\n"
           ) cfg.buildMachines;
       };

From d8b4cff390da46395aad7f45f0cad93844a3fe2c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 30 Jun 2015 10:30:41 +0300
Subject: [PATCH 1713/2322] dtc: Fix cross compilation

Flex and Bison are need to be executable by the build system.
---
 pkgs/development/compilers/dtc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix
index 84673dfc724..59c85d03d4b 100644
--- a/pkgs/development/compilers/dtc/default.nix
+++ b/pkgs/development/compilers/dtc/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0z7yrv0sdhsh5wwy7yd1fvs4pqaq0n9m5i8w65lyibg77ahkasdg";
   };
 
-  buildInputs = [ flex bison ];
+  nativeBuildInputs = [ flex bison ];
 
   installFlags = [ "INSTALL=install" "PREFIX=$(out)" ];
 

From 1793fdbfb196b3af8f0fe17021b5873daffd3e33 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 7 Jun 2015 21:07:45 +0300
Subject: [PATCH 1714/2322] platforms.nix: Remove IntegratorCP and Versatile

These ARM boards are very old and quite likely used only for booting in
QEMU emulation. I'll focus on making the multiplatform image easy to
boot in QEMU instead.
---
 pkgs/top-level/platforms.nix | 74 ------------------------------------
 1 file changed, 74 deletions(-)

diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index 4a6dc5aacf6..c331278046c 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -303,80 +303,6 @@ rec {
     #kernelHeadersBaseConfig = "guruplug_defconfig";
   };
 
-  versatileARM = {
-    name = "versatileARM";
-    kernelMajor = "2.6";
-    kernelHeadersBaseConfig = "versatile_defconfig";
-    kernelBaseConfig = "versatile_defconfig";
-    kernelArch = "arm";
-    kernelAutoModules = false;
-    kernelTarget = "zImage";
-    kernelExtraConfig =
-      ''
-        MMC_ARMMMCI y
-        #MMC_SDHCI y
-        SERIO_AMBAKMI y
-
-        AEABI y
-        RTC_CLASS y
-        RTC_DRV_PL031 y
-        PCI y
-        SCSI y
-        SCSI_DMA y
-        SCSI_ATA y
-        BLK_DEV_SD y
-        BLK_DEV_SR y
-        SCSI_SYM53C8XX_2 y
-
-        TMPFS y
-        IPV6 m
-        REISERFS_FS m
-        EXT4_FS m
-
-        IP_PNP y
-        IP_PNP_DHCP y
-        IP_PNP_BOOTP y
-        ROOT_NFS y
-      '';
-    uboot = null;
-  };
-
-  integratorCP = {
-    name = "integratorCP";
-    kernelMajor = "2.6";
-    kernelHeadersBaseConfig = "integrator_defconfig";
-    kernelBaseConfig = "integrator_defconfig";
-    kernelArch = "arm";
-    kernelAutoModules = false;
-    kernelTarget = "zImage";
-    kernelExtraConfig =
-      ''
-        # needed for qemu integrator/cp
-        SERIAL_AMBA_PL011 y
-        SERIAL_AMBA_PL011_CONSOLE y
-        SERIAL_AMBA_PL010 n
-        SERIAL_AMBA_PL010_CONSOLE n
-
-        MMC_ARMMMCI y
-        MMC_SDHCI y
-        SERIO_AMBAKMI y
-
-        CPU_ARM926T y
-        ARCH_INTEGRATOR_CP y
-        VGA_CONSOLE n
-        AEABI y
-      '';
-    uboot = null;
-    ubootConfig = "integratorcp_config";
-  };
-
-  integratorCPuboot = integratorCP // {
-    name = "integratorCPuboot";
-    kernelTarget = "uImage";
-    uboot = "upstream";
-    ubootConfig = "integratorcp_config";
-  };
-
   fuloong2f_n32 = {
     name = "fuloong2f_n32";
     kernelMajor = "2.6";

From e0038d7571f6eed78961309fd1a9b4ea4a91e719 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 30 Jun 2015 09:25:46 +0200
Subject: [PATCH 1715/2322] lz4 130 -> 131

Changes:
- liblz4: xxhash symbols are dynamically changed (namespace
  emulation) to avoid symbol conflict
- liblz4.a (static library) no longer compiled with -fPIC by
  default
---
 pkgs/tools/compression/lz4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index be0053c2165..57f0327fa1e 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, valgrind }:
 
-let version = "130"; in
+let version = "131"; in
 stdenv.mkDerivation rec {
   name = "lz4-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1050hwnbqyz2m26vayv942dh92689qp73chrbnqlg8awhlb5kyi5";
+    sha256 = "1bhvcq8fxxsqnpg5qa6k3nsyhq0nl0iarh08sqzclww27hlpyay2";
     rev = "r${version}";
     repo = "lz4";
     owner = "Cyan4973";

From d013de6d32fa315a100c11150965f83edb0f794a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 7 Jun 2015 22:12:18 +0300
Subject: [PATCH 1716/2322] U-Boot: Update to 2015.04 and major refactor

Instead of selecting the defconfig based on stdenv.platform.uboot,
provide different ubootFoo packages. Otherwise we couldn't easily build
U-Boots for different platforms than what we are currently running on.

All users of the ubootChooser function appear to be using only CLI tools
like mkimage, whose behaviour is not affected by the defconfig (their
build outputs are bitwise-identical). So add a separate package for the
CLI tools.

Of the removed patches, some version of sheevaplug-sdio.patch has
apparently been applied upstream (with at least mv_sdio.c renamed to
mvebu_mmc.c). sheevaplug-config.patch needs rebasing & re-testing on
real hardware.

Tested boards and input/output methods that upstream supports:
 - Raspberry Pi:
    - HDMI works, USB keyboard not yet supported
    - Serial via the 26-pin connector (3.3V)
 - pcDuino3 Nano:
    - HDMI + USB keyboard (only if attached to a hub)
    - Serial via the 3-pin connector (3.3V)
 - Jetson TK1: RS-232 serial port only
 - Versatile Express CA9 (for QEMU only): Serial via '-serial stdio'
---
 pkgs/misc/uboot/default.nix             |   89 +-
 pkgs/misc/uboot/sheevaplug-config.patch |   57 --
 pkgs/misc/uboot/sheevaplug-sdio.patch   | 1091 -----------------------
 pkgs/top-level/all-packages.nix         |   40 +-
 4 files changed, 73 insertions(+), 1204 deletions(-)
 delete mode 100644 pkgs/misc/uboot/sheevaplug-config.patch
 delete mode 100644 pkgs/misc/uboot/sheevaplug-sdio.patch

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 5928406eb54..5f4bab9138f 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,71 +1,60 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchurl, bc, dtc
+, toolsOnly ? false
+, defconfig ? "allnoconfig"
+, targetPlatforms
+, filesToInstall
+}:
 
 let
   platform = stdenv.platform;
-  configureFun = ubootConfig :
+  crossPlatform = stdenv.cross.platform;
+  makeTarget = if toolsOnly then "tools NO_SDL=1" else "all";
+  installDir = if toolsOnly then "$out/bin" else "$out";
+  buildFun = kernelArch:
     ''
-      make mrproper
-      make ${ubootConfig} NBOOT=1 LE=1
-    '';
-
-  buildFun = kernelArch :
-    ''
-      unset src
       if test -z "$crossConfig"; then
-          make clean all
+          make ${makeTarget}
       else
-          make clean all ARCH=${kernelArch} CROSS_COMPILE=$crossConfig-
+          make ${makeTarget} ARCH=${kernelArch} CROSS_COMPILE=$crossConfig-
       fi
     '';
 in
 
-stdenv.mkDerivation {
-  name = "uboot-2012.07";
-   
+stdenv.mkDerivation rec {
+  name = "uboot-${defconfig}-${version}";
+  version = "2015.04";
+
   src = fetchurl {
-    url = "ftp://ftp.denx.de/pub/u-boot/u-boot-2012.07.tar.bz2";
-    sha256 = "15nli6h9a127ldizsck3g4ysy5j4m910wawspgpadz4vjyk213p0";
+    url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
+    sha256 = "0q2x1wh1f6rjh9rmcnkf28dxcvp9hkhi4vzspqkzamb6b3gp06ha";
   };
 
-  nativeBuildInputs = [ unzip ];
+  nativeBuildInputs = [ bc dtc ];
 
-  dontStrip = true;
-
-  installPhase = ''
-    mkdir -p $out
-    cp u-boot.bin $out
-    cp u-boot u-boot.map $out
-
-    mkdir -p $out/bin
-    cp tools/{envcrc,mkimage} $out/bin
+  configurePhase = ''
+    make ${defconfig}
   '';
 
-  # They have 'errno.h' included by a "-idirafter". As the gcc
-  # wrappers add the glibc include as "-idirafter", the only way
-  # we can make the glibc take priority is to -include errno.h.
-  postPatch = if stdenv ? glibc && stdenv.glibc != null then ''
-    sed -i 's,$(HOSTCPPFLAGS),-include ${stdenv.glibc}/include/errno.h $(HOSTCPPFLAGS),' config.mk
-  '' else "";
-
-  patches = [ ./sheevaplug-sdio.patch ./sheevaplug-config.patch ];
-
-  configurePhase =
-    assert platform ? uboot && platform.uboot != null;
-    assert (platform ? ubootConfig);
-      configureFun platform.ubootConfig;
-
   buildPhase = assert (platform ? kernelArch);
     buildFun platform.kernelArch;
 
-  crossAttrs = let
-      cp = stdenv.cross.platform;
-    in
-    assert cp ? uboot && cp.uboot != null;
-    {
-      configurePhase = assert (cp ? ubootConfig);
-        configureFun cp.ubootConfig;
+  installPhase = ''
+    mkdir -p ${installDir}
+    cp ${stdenv.lib.concatStringsSep " " filesToInstall} ${installDir}
+  '';
 
-      buildPhase = assert (cp ? kernelArch);
-        buildFun cp.kernelArch;
-    };
+  dontStrip = !toolsOnly;
+
+  crossAttrs = {
+    buildPhase = assert (crossPlatform ? kernelArch);
+      buildFun crossPlatform.kernelArch;
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.denx.de/wiki/U-Boot/";
+    description = "Boot loader for embedded systems";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.dezgeg ];
+    platforms = targetPlatforms;
+  };
 }
diff --git a/pkgs/misc/uboot/sheevaplug-config.patch b/pkgs/misc/uboot/sheevaplug-config.patch
deleted file mode 100644
index 487756217bf..00000000000
--- a/pkgs/misc/uboot/sheevaplug-config.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
-index 7c8497c..b0da1e5 100644
---- a/include/configs/sheevaplug.h
-+++ b/include/configs/sheevaplug.h
-@@ -50,7 +50,6 @@
- #define CONFIG_CMD_MII
- #define CONFIG_CMD_MMC
- #define CONFIG_CMD_NAND
--#define CONFIG_JFFS2_NAND
- #define CONFIG_CMD_PING
- #define CONFIG_CMD_USB
- /*
-@@ -73,25 +72,36 @@
-  * it has to be rounded to sector size
-  */
- #define CONFIG_ENV_SIZE			0x20000	/* 128k */
--#define CONFIG_ENV_ADDR			0xa0000
--#define CONFIG_ENV_OFFSET		0xa0000	/* env starts here */
-+#define CONFIG_ENV_ADDR			0x60000
-+#define CONFIG_ENV_OFFSET		0x60000	/* env starts here */
- 
- /*
-  * Default environment variables
-  */
--#define CONFIG_BOOTCOMMAND		"${x_bootcmd_kernel}; "	\
-+#define CONFIG_BOOTCOMMAND		"${x_bootcmd_ubi0}; "	\
-+	"${x_bootcmd_ubi1}; " \
-+	"${x_bootcmd_ubi2}; " \
-+	"${x_bootcmd_ubi3}; " \
- 	"setenv bootargs ${x_bootargs} ${x_bootargs_root}; "	\
--	"${x_bootcmd_usb}; bootm 0x6400000;"
-+	"${x_bootcmd_usb}; bootm 0x200000 0x1100000;"
- 
- #define CONFIG_MTDPARTS		"orion_nand:512k(uboot),"	\
--	"0x1ff00000@512k(rootfs) rw\0"
-+	"0x1ff00000@512k(rootfs)\0"
-+#define CONFIG_MTDPARTSK		"orion_nand:512k(uboot),"	\
-+	"0x1ff00000@512k(rootfs)rw\0"
- 
- #define CONFIG_EXTRA_ENV_SETTINGS	"x_bootargs=console"	\
--	"=ttyS0,115200 mtdparts="CONFIG_MTDPARTS	\
-+	"=ttyS0,115200 mtdparts="CONFIG_MTDPARTSK	\
-+	"mtdparts=mtdparts="CONFIG_MTDPARTS	\
- 	"mtdids=nand0=orion_nand\0"	\
--	"x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \
-+	"ipaddr=192.168.1.4\0"	\
-+	"x_bootcmd_ubi0=ubi part nand0,1\0" \
-+	"x_bootcmd_ubi1=ubifsmount rootfs\0" \
-+	"x_bootcmd_ubi2=ubifsload 0x200000 /nixos-kernel\0" \
-+	"x_bootcmd_ubi3=ubifsload 0x1100000 /nixos-initrd\0" \
- 	"x_bootcmd_usb=usb start\0" \
--	"x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"
-+	"x_bootargs_root=ubi.mtd=rootfs root=ubi0:rootfs rw rootfstype=ubifs " \
-+	"init=/boot/nixos-init systemConfig=/boot/default/system\0"
- 
- /*
-  * Ethernet Driver configuration
diff --git a/pkgs/misc/uboot/sheevaplug-sdio.patch b/pkgs/misc/uboot/sheevaplug-sdio.patch
deleted file mode 100644
index 3a4ea2933a3..00000000000
--- a/pkgs/misc/uboot/sheevaplug-sdio.patch
+++ /dev/null
@@ -1,1091 +0,0 @@
-diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h
-index a9499b7..1294d7f 100644
---- a/arch/arm/include/asm/arch-kirkwood/config.h
-+++ b/arch/arm/include/asm/arch-kirkwood/config.h
-@@ -66,6 +66,7 @@
- #define MV_SATA_BASE		KW_SATA_BASE
- #define MV_SATA_PORT0_OFFSET	KW_SATA_PORT0_OFFSET
- #define MV_SATA_PORT1_OFFSET	KW_SATA_PORT1_OFFSET
-+#define MV_SDIO_BASE		KW_SDIO_BASE
- 
- /*
-  * NAND configuration
-@@ -107,6 +108,14 @@
- #endif /* CONFIG_CMD_NET */
- 
- /*
-+ * SDIO/MMC Card Configuration
-+ */
-+#ifdef CONFIG_CMD_MMC
-+#define CONFIG_MMC
-+#define CONFIG_MV_SDIO
-+#endif /* CONFIG_CMD_MMC */
-+
-+/*
-  * USB/EHCI
-  */
- #ifdef CONFIG_CMD_USB
-diff --git a/arch/arm/include/asm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h
-index 47771d5..343214b 100644
---- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h
-+++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h
-@@ -55,6 +55,7 @@
- #define KW_EGIGA0_BASE			(KW_REGISTER(0x72000))
- #define KW_EGIGA1_BASE			(KW_REGISTER(0x76000))
- #define KW_SATA_BASE			(KW_REGISTER(0x80000))
-+#define KW_SDIO_BASE			(KW_REGISTER(0x90000))
- 
- /* Kirkwood Sata controller has two ports */
- #define KW_SATA_PORT0_OFFSET		0x2000
-diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
-index c567737..081d5f4 100644
---- a/drivers/mmc/Makefile
-+++ b/drivers/mmc/Makefile
-@@ -34,6 +34,7 @@ COBJS-$(CONFIG_GENERIC_ATMEL_MCI) += gen_atmel_mci.o
- COBJS-$(CONFIG_MMC_SPI) += mmc_spi.o
- COBJS-$(CONFIG_ARM_PL180_MMCI) += arm_pl180_mmci.o
- COBJS-$(CONFIG_MV_SDHCI) += mv_sdhci.o
-+COBJS-$(CONFIG_MV_SDIO) += mv_sdio.o
- COBJS-$(CONFIG_MXC_MMC) += mxcmmc.o
- COBJS-$(CONFIG_MXS_MMC) += mxsmmc.o
- COBJS-$(CONFIG_OMAP_HSMMC) += omap_hsmmc.o
-diff --git a/drivers/mmc/mv_sdio.c b/drivers/mmc/mv_sdio.c
-new file mode 100644
-index 0000000..35969d3
---- /dev/null
-+++ b/drivers/mmc/mv_sdio.c
-@@ -0,0 +1,675 @@
-+/*
-+ * (C) Copyright 2009
-+ * Marvell Semiconductor <www.marvell.com>
-+ * Written-by: Gérald Kerma <geraker@gmail.com>
-+ *
-+ * (C) Copyright 2003
-+ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ */
-+
-+#include <config.h>
-+#include <common.h>
-+#include <malloc.h>
-+#include <mmc.h>
-+#include <asm/errno.h>
-+#include <part.h>
-+#include <asm/io.h>
-+#ifdef CONFIG_KIRKWOOD
-+#include <asm/arch/kirkwood.h>
-+#endif
-+#include "mv_sdio.h"
-+
-+#ifdef CONFIG_MMC
-+
-+#define DRIVER_NAME "mv-sdio"
-+
-+#ifdef DEBUG
-+#define pr_debug(fmt, args...) printf(fmt, ##args)
-+#else
-+#define pr_debug(...) do { } while(0)
-+#endif
-+
-+//static mv_sdio_t *mvsd = (mv_sdio_t *)mmc->priv;
-+static mv_sdio_t *mvsd = (mv_sdio_t *)MV_SDIO_BASE;
-+	
-+static int is_sdhc;
-+extern int fat_register_device(block_dev_desc_t *dev_desc, int part_no);
-+static block_dev_desc_t mmc_dev;
-+block_dev_desc_t * mmc_get_dev(int dev)
-+{
-+	return ((block_dev_desc_t *)&mmc_dev);
-+}
-+
-+/*
-+ * FIXME needs to read cid and csd info to determine block size
-+ * and other parameters
-+ */
-+static uchar mmc_buf[MMC_BLOCK_SIZE];
-+static mv_mmc_csd_t mv_mmc_csd;
-+static int mmc_ready = 0;
-+
-+/* MMC_DEFAULT_RCA should probably be just 1, but this may break other code
-+   that expects it to be shifted. */
-+static u_int16_t rca = 0;
-+
-+/* used for debug */
-+static u_int32_t mv_mmc_size(const struct mv_mmc_csd *csd)
-+{
-+	u_int32_t block_len, mult, blocknr;
-+
-+	block_len = csd->read_bl_len << 12;
-+	mult = csd->c_size_mult1 << 8;
-+	blocknr = (csd->c_size+1) * mult;
-+
-+	return blocknr * block_len;
-+}
-+
-+static int isprint (unsigned char ch)
-+{
-+	if (ch >= 32 && ch < 127)
-+		return (1);
-+
-+	return (0);
-+}
-+
-+static int toprint(char *dst, char c)
-+{
-+	if (isprint(c)) {
-+		*dst = c;
-+		return 1;
-+	}
-+
-+	return sprintf(dst,"\\x%02x", c);
-+
-+}
-+
-+static void print_mmc_cid(mv_mmc_cid_t *cid)
-+{
-+	printf("MMC found. Card desciption is:\n");
-+	printf("Manufacturer ID = %02x%02x%02x\n",
-+		cid->id[0], cid->id[1], cid->id[2]);
-+	printf("HW/FW Revision = %x %x\n",cid->hwrev, cid->fwrev);
-+	cid->hwrev = cid->fwrev = 0;	/* null terminate string */
-+	printf("Product Name = %s\n",cid->name);
-+	printf("Serial Number = %02x%02x%02x\n",
-+		cid->sn[0], cid->sn[1], cid->sn[2]);
-+	printf("Month = %d\n",cid->month);
-+	printf("Year = %d\n",1997 + cid->year);
-+}
-+
-+static void print_sd_cid(mv_sd_cid_t *cid)
-+{
-+	int len;
-+	char tbuf[64];
-+
-+	printf("SD%s found. Card desciption is:\n", is_sdhc?"HC":"");
-+
-+	len = 0;
-+	len += toprint(&tbuf[len], cid->oid_0);
-+	len += toprint(&tbuf[len], cid->oid_1);
-+	tbuf[len] = 0;
-+
-+	printf("Manufacturer:       0x%02x, OEM \"%s\"\n",
-+	    cid->mid, tbuf);
-+
-+	len = 0;
-+	len += toprint(&tbuf[len], cid->pnm_0);
-+	len += toprint(&tbuf[len], cid->pnm_1);
-+	len += toprint(&tbuf[len], cid->pnm_2);
-+	len += toprint(&tbuf[len], cid->pnm_3);
-+	len += toprint(&tbuf[len], cid->pnm_4);
-+	tbuf[len] = 0;
-+
-+	printf("Product name:       \"%s\", revision %d.%d\n",
-+		tbuf,
-+	    cid->prv >> 4, cid->prv & 15);
-+
-+	printf("Serial number:      %u\n",
-+	    cid->psn_0 << 24 | cid->psn_1 << 16 | cid->psn_2 << 8 |
-+	    cid->psn_3);
-+	printf("Manufacturing date: %d/%d\n",
-+	    cid->mdt_1 & 15,
-+	    2000+((cid->mdt_0 & 15) << 4)+((cid->mdt_1 & 0xf0) >> 4));
-+
-+	printf("CRC:                0x%02x, b0 = %d\n",
-+	    cid->crc >> 1, cid->crc & 1);
-+}
-+
-+static void mvsdio_set_clock(unsigned int clock)
-+{
-+	unsigned int m;
-+
-+	m = MVSDMMC_BASE_FAST_CLOCK/(2*clock) - 1;
-+
-+	pr_debug("mvsdio_set_clock: dividor = 0x%x clock=%d\n",
-+		      m, clock);
-+
-+
-+	writew(m & 0x7ff, &mvsd->CLK_DIV);
-+
-+	if (isprint(1))
-+	udelay(10*1000);
-+}
-+
-+/****************************************************/
-+static ulong * mv_mmc_cmd(ulong cmd, ulong arg, ushort xfermode, ushort resptype, ushort waittype)
-+/****************************************************/
-+{
-+	static ulong resp[4];
-+	ushort done ;
-+	int err = 0 ;
-+	ulong curr, start, diff, hz;
-+	ushort response[8];
-+
-+	pr_debug("mv_mmc_cmd %x, arg: %x,xfer: %x,resp: %x, wait : %x\n"
-+	, (unsigned int)cmd, (unsigned int)arg, xfermode, resptype, waittype);
-+
-+
-+	/* clear status */
-+	writew(0xffff, &mvsd->NOR_INTR_STATUS);
-+	writew(0xffff, &mvsd->ERR_INTR_STATUS);
-+
-+	start = get_timer(0);
-+	hz = CONFIG_SYS_HZ;
-+
-+	while((readw(&mvsd->PRESENT_STATE0) & CARD_BUSY)) {
-+		curr = get_timer(0);
-+		diff = (long) curr - (long) start;
-+		if (diff > (3*hz))
-+		{
-+			/* 3 seconds timeout, card busy, can't sent cmd */
-+			printf("card too busy \n");
-+			return 0;
-+		}
-+	}
-+
-+	writew((ushort)(arg&0xffff), &mvsd->ARG_LOW);
-+	writew((ushort)(arg>>16), &mvsd->ARG_HI);
-+	writew(xfermode, &mvsd->XFER_MODE);
-+	if( (cmd == MMC_CMD_READ_BLOCK) || (cmd == 25) )
-+	{
-+		writew(((cmd << 8) | resptype | 0x3c ) , &mvsd->CMD);
-+	pr_debug("cmd reg : %x\n", readw(&mvsd->CMD)) ;
-+
-+	}
-+	else
-+	{
-+		writew(((cmd << 8) | resptype ), &mvsd->CMD);
-+	}
-+
-+	done = readw(&mvsd->NOR_INTR_STATUS) & waittype;
-+	start = get_timer(0);
-+
-+	while( done!=waittype)
-+	{
-+		done = readw(&mvsd->NOR_INTR_STATUS) & waittype;
-+
-+		if( readw(&mvsd->NOR_INTR_STATUS) & 0x8000 )
-+		{		
-+			pr_debug("Error! cmd : %d, err : %04x\n", (unsigned int)cmd, readw(&mvsd->ERR_INTR_STATUS)) ;
-+
-+			return 0 ;	/* error happen */
-+		}
-+
-+		curr = get_timer(0);
-+		diff = (long) curr - (long) start;
-+		if (diff > (3*hz))
-+		{
-+			pr_debug("cmd timeout, status : %04x\n", readw(&mvsd->NOR_INTR_STATUS));
-+			pr_debug("xfer mode : %04x\n", readw(&mvsd->XFER_MODE));
-+
-+			err = 1 ;
-+			break;
-+		}
-+	}
-+
-+	response[0] = readw(&mvsd->RSP0);
-+	response[1] = readw(&mvsd->RSP1);
-+	response[2] = readw(&mvsd->RSP2);
-+	response[3] = readw(&mvsd->RSP3);
-+	response[4] = readw(&mvsd->RSP4);
-+	response[5] = readw(&mvsd->RSP5);
-+	response[6] = readw(&mvsd->RSP6);
-+	response[7] = readw(&mvsd->RSP7);
-+
-+	memset(resp, 0, sizeof(resp));
-+
-+	switch (resptype & 0x3) {
-+		case SDIO_CMD_RSP_48:
-+		case SDIO_CMD_RSP_48BUSY:
-+			resp[0] = ((response[2] & 0x3f) << (8 - 8)) |
-+				((response[1] & 0xffff) << (14 - 8)) |
-+				((response[0] & 0x3ff) << (30 - 8));
-+			resp[1] = ((response[0] & 0xfc00) >> 10);
-+			break;
-+
-+		case SDIO_CMD_RSP_136:
-+			resp[3] = ((response[7] & 0x3fff) << 8)	|
-+				((response[6] & 0x3ff) << 22);
-+			resp[2] = ((response[6] & 0xfc00) >> 10)	|
-+				((response[5] & 0xffff) << 6)	|
-+				((response[4] & 0x3ff) << 22);
-+			resp[1] = ((response[4] & 0xfc00) >> 10)	|
-+				((response[3] & 0xffff) << 6)	|
-+				((response[2] & 0x3ff) << 22);
-+			resp[0] = ((response[2] & 0xfc00) >> 10)	|
-+				((response[1] & 0xffff) << 6)	|
-+				((response[0] & 0x3ff) << 22);
-+			break;
-+		default:
-+			return 0;
-+	}
-+	int i;
-+	pr_debug("MMC resp :");
-+	for (i=0; i<4; ++i ) {
-+		pr_debug(" %08x", (unsigned int)resp[i]);
-+	}
-+	pr_debug("\n");
-+	if( err )
-+		return NULL ;
-+	else
-+		return resp;
-+}
-+
-+/****************************************************/
-+static int mv_mmc_block_read(uchar *dst, ulong src, ulong len)
-+/****************************************************/
-+{
-+	ulong *resp;
-+
-+	if (len == 0) {
-+		return 0;
-+	}
-+
-+	if (is_sdhc) {
-+		/* SDHC: use block address */
-+		src >>= 9;
-+	}
-+
-+	pr_debug("mmc_block_rd dst %lx src %lx len %d\n", (ulong)dst, src, (int)len);
-+
-+	/* prepare for dma transfer */
-+	writew(((ulong)(dst))&0xffff,&mvsd->SYS_ADDR_LOW);
-+	writew(((ulong)(dst)>>16)&0xffff,&mvsd->SYS_ADDR_HI);
-+	writew(len,&mvsd->BLK_SIZE);
-+	writew(1,&mvsd->BLK_COUNT);
-+	
-+	/* send read command */
-+	resp = mv_mmc_cmd(MMC_CMD_READ_BLOCK, src, 0x10 ,
-+			SDIO_CMD_RSP_48, SDIO_NOR_XFER_DONE);
-+	if (!resp) {
-+		pr_debug("mv_mmc_block_read: mmc read block cmd fails\n");
-+		return -EIO;
-+	}
-+
-+	return 0;
-+}
-+
-+/****************************************************/
-+int mv_mmc_read(ulong src, uchar *dst, int size)
-+/****************************************************/
-+{
-+	ulong end, part_start, part_end, part_len, aligned_start, aligned_end;
-+	ulong mmc_block_size, mmc_block_address;
-+
-+	if (size == 0) {
-+		return 0;
-+	}
-+
-+	if (!mmc_ready) {
-+		printf("Please initial the MMC first\n");
-+		return -1;
-+	}
-+
-+	mmc_block_size = MMC_BLOCK_SIZE;
-+	mmc_block_address = ~(mmc_block_size - 1);
-+
-+	end = src + size;
-+	part_start = ~mmc_block_address & src;
-+	part_end = ~mmc_block_address & end;
-+	aligned_start = mmc_block_address & src;
-+	aligned_end = mmc_block_address & end;
-+
-+	/* all block aligned accesses */
-+	pr_debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
-+	(long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
-+
-+	if (part_start) {
-+		part_len = mmc_block_size - part_start;
-+		pr_debug("ps src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
-+		(long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
-+
-+		if ((mv_mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) < 0) {
-+			return -1;
-+		}
-+		memcpy(dst, mmc_buf+part_start, part_len);
-+		dst += part_len;
-+		src += part_len;
-+	}
-+	pr_debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
-+	(long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
-+
-+	for (; src < aligned_end; aligned_start +=mmc_block_size, src += mmc_block_size, dst += mmc_block_size) {
-+		pr_debug("al src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
-+		(long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
-+
-+		if ((mv_mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) < 0) {
-+		 	printf("mmc block read error\n");
-+			return -1;
-+		}
-+		memcpy(dst, mmc_buf, mmc_block_size);
-+	}
-+	pr_debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
-+	(long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
-+
-+	if (part_end && src < end) {
-+		pr_debug("pe src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
-+		(long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
-+
-+		if ((mv_mmc_block_read(mmc_buf, aligned_end, mmc_block_size)) < 0) {
-+			return -1;
-+		}
-+		memcpy(dst, mmc_buf, part_end);
-+	}
-+	return 0;
-+}
-+
-+/****************************************************/
-+static ulong mv_mmc_bread(int dev_num, ulong blknr, ulong blkcnt, ulong *dst)
-+/****************************************************/
-+{
-+	int mmc_block_size = MMC_BLOCK_SIZE;
-+	ulong src = blknr * mmc_block_size;
-+
-+	mv_mmc_read(src, (uchar *)dst, blkcnt*mmc_block_size);
-+	return blkcnt;
-+}
-+
-+/****************************************************/
-+int mmc_legacy_init(int verbose)
-+/****************************************************/
-+{
-+	int retries, rc = -ENODEV;
-+	ulong *resp;
-+	int sd_ver20;
-+	int is_sd;
-+	ushort reg;
-+	uchar cidbuf[64];
-+
-+	sd_ver20 = 0;
-+	is_sdhc = 0;
-+	is_sd = 0;
-+
-+	/* Initial Host Ctrl : Timeout : max , Normal Speed mode, 4-bit data mode */
-+	/* Big Endian, SD memory Card, Push_pull CMD Line */
-+	writew( SDIO_HOST_CTRL_TMOUT(0xf) |
-+		SDIO_HOST_CTRL_DATA_WIDTH_4_BITS |
-+		SDIO_HOST_CTRL_BIG_ENDIAN |
-+		SDIO_HOST_CTRL_PUSH_PULL_EN |
-+		SDIO_HOST_CTRL_CARD_TYPE_MEM_ONLY ,
-+		&mvsd->HOST_CTRL);
-+
-+	writew( 0, &mvsd->CLK_CTRL);
-+
-+	/* enable status */
-+	writew( 0xffff, &mvsd->NOR_STATUS_EN);
-+	writew( 0xffff, &mvsd->ERR_STATUS_EN);
-+
-+	/* disable interrupts */
-+	writew( 0, &mvsd->NOR_INTR_EN);
-+	writew( 0, &mvsd->ERR_INTR_EN);
-+
-+	writew( 0x100, &mvsd->SW_RESET);
-+	udelay(10000);
-+
-+	mv_mmc_csd.c_size = 0;
-+
-+	/* reset */
-+	retries = 10;
-+	resp = mv_mmc_cmd(0, 0, 0, SDIO_CMD_RSP_NONE, SDIO_NOR_CMD_DONE );
-+	pr_debug("cmd 0 resp : %08x %08x %08x %08x\n",
-+	(unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] );
-+
-+
-+	pr_debug ("trying to detect SD card version\n");
-+
-+	resp = mv_mmc_cmd(8, 0x000001aa, 0,  SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
-+	pr_debug("cmd 8 resp : %08x %08x %08x %08x\n",
-+	(unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] );
-+
-+	if (resp && (resp[0] & 0x1ff)==0x1aa) {
-+		pr_debug ("SD version 2.0 card detected\n");
-+
-+		sd_ver20 = 1;
-+	}
-+
-+	if (sd_ver20)
-+		retries = 50;
-+	else
-+		retries = 10;
-+
-+	while (retries--) {
-+		resp = mv_mmc_cmd(55, 0, 0,  SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
-+		pr_debug("cmd 55 resp : %08x %08x %08x %08x\n",
-+		(unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] );
-+
-+
-+		if (sd_ver20)
-+			resp = mv_mmc_cmd(41, 0x40300000, 0,  SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
-+		else
-+			resp = mv_mmc_cmd(41, 0x00300000, 0,  SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
-+
-+		pr_debug("cmd 41 resp : %08x %08x %08x %08x\n",
-+		(unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] );
-+
-+
-+		if (resp && (resp[0] & 0x80000000)) {
-+			pr_debug ("detected SD card\n");
-+
-+			is_sd = 1;
-+			break;
-+		}
-+
-+		udelay(100*1000);
-+	}
-+
-+	if (retries <= 0 && !is_sd) {
-+		pr_debug ("failed to detect SD card, trying MMC\n");
-+
-+		retries = 10;
-+		while (retries--) {
-+			resp = mv_mmc_cmd(1, 0, 0,  SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
-+			pr_debug("cmd 01 resp : %08x %08x %08x %08x\n",
-+			(unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] );
-+
-+
-+			if (resp && (resp[0] & 0x80000000)) {
-+				printf ("detected MMC card\n");
-+				reg = readw(&mvsd->HOST_CTRL);
-+				reg &= ~(0x3<<1);
-+				reg |= SDIO_HOST_CTRL_CARD_TYPE_IO_MMC;
-+				writew( reg, &mvsd->HOST_CTRL);
-+				break;
-+			}
-+
-+			udelay(100*1000);
-+		}
-+	}
-+		
-+	if (retries <= 0) {
-+		pr_debug ("detect fails\n");
-+
-+		return -ENODEV;
-+	}
-+
-+	/* try to get card id */
-+	resp = mv_mmc_cmd(2, 0, 0, SDIO_CMD_RSP_136, SDIO_NOR_CMD_DONE );
-+	pr_debug("cmd 2 resp : %08x %08x %08x %08x\n",
-+	(unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] );
-+
-+
-+	if (resp == NULL) {
-+		pr_debug ("read cid fails\n");
-+
-+		return -ENODEV;
-+	}
-+
-+	if (is_sd) {
-+		mv_sd_cid_t *cid = (mv_sd_cid_t *) resp;
-+
-+		memcpy(cidbuf, resp, sizeof(mv_sd_cid_t));
-+
-+		sprintf((char *) mmc_dev.vendor,
-+			"Man %02x OEM %c%c \"%c%c%c%c%c\"",
-+			cid->mid, cid->oid_0, cid->oid_1,
-+			cid->pnm_0, cid->pnm_1, cid->pnm_2, cid->pnm_3, cid->pnm_4);
-+
-+		sprintf((char *) mmc_dev.product, "%d",
-+			(cid->psn_0 << 24) | (cid->psn_1 <<16) | (cid->psn_2 << 8) | (cid->psn_3 << 8));
-+		
-+		sprintf((char *) mmc_dev.revision, "%d.%d", cid->prv>>4, cid->prv & 0xff);
-+		
-+	} else {
-+		/* TODO configure mmc driver depending on card attributes */
-+		mv_mmc_cid_t *cid = (mv_mmc_cid_t *) resp;
-+
-+		memcpy(cidbuf, resp, sizeof(mv_sd_cid_t));
-+
-+
-+		sprintf((char *) mmc_dev.vendor,
-+			"Man %02x%02x%02x Snr %02x%02x%02x",
-+			cid->id[0], cid->id[1], cid->id[2],
-+			cid->sn[0], cid->sn[1], cid->sn[2]);
-+		sprintf((char *) mmc_dev.product, "%s", cid->name);
-+		sprintf((char *) mmc_dev.revision, "%x %x", cid->hwrev, cid->fwrev);
-+	}
-+	
-+	/* fill in device description */
-+	mmc_dev.if_type = IF_TYPE_MMC;
-+	mmc_dev.part_type = PART_TYPE_DOS;
-+	mmc_dev.dev = 0;
-+	mmc_dev.lun = 0;
-+	mmc_dev.type = 0;
-+
-+	/* FIXME fill in the correct size (is set to 128MByte) */
-+	mmc_dev.blksz = MMC_BLOCK_SIZE;
-+	mmc_dev.lba = 0x10000;
-+
-+	mmc_dev.removable = 0;
-+	mmc_dev.block_read = (unsigned long) mv_mmc_bread;
-+
-+	/* MMC exists, get CSD too */
-+	resp = mv_mmc_cmd(MMC_CMD_SET_RCA, 0, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
-+	if (resp == NULL) {
-+		pr_debug ("set rca fails\n");
-+
-+		return -ENODEV;
-+	}
-+	pr_debug("cmd3 resp : 0x%08x 0x%08x 0x%08x 0x%08x\n",
-+	(unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3]);
-+
-+
-+	if (is_sd)
-+		rca = resp[0] >> 16;
-+	else
-+		rca = 0;
-+
-+	resp = mv_mmc_cmd(MMC_CMD_SEND_CSD, rca<<16, 0, SDIO_CMD_RSP_136,SDIO_NOR_CMD_DONE );
-+	pr_debug("cmd 9 resp : %08x %08x %08x %08x\n",
-+	(unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] );
-+
-+	if (resp == NULL) {
-+		pr_debug ("read csd fails\n");
-+
-+		return -ENODEV;
-+	}
-+
-+	memcpy(&mv_mmc_csd, (mv_mmc_csd_t *) resp, sizeof(mv_mmc_csd_t));
-+	rc = 0;
-+	mmc_ready = 1;
-+
-+	/* FIXME add verbose printout for csd */
-+	pr_debug ("size = %u\n", mv_mmc_size(&mv_mmc_csd));
-+
-+
-+	resp = mv_mmc_cmd(7, rca<<16, 0, SDIO_CMD_RSP_48BUSY, SDIO_NOR_CMD_DONE);
-+	if (resp == NULL) {
-+		pr_debug ("select card fails\n");
-+
-+		return -ENODEV;
-+	}
-+	pr_debug("cmd 7 resp : %08x %08x %08x %08x\n",
-+	(unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] );
-+
-+
-+	if (is_sd) {
-+		resp = mv_mmc_cmd(55, rca<<16, 0,  SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
-+		if (resp == NULL) {
-+			pr_debug ("cmd55 fails\n");
-+
-+			return -ENODEV;
-+		}
-+		pr_debug("cmd55 resp : 0x%08x 0x%08x 0x%08x 0x%08x\n",
-+		(unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3]);
-+
-+
-+		resp = mv_mmc_cmd(6, (rca<<16) | 0x2 , 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
-+		if (resp == NULL) {
-+			pr_debug ("cmd55 fails\n");
-+
-+			return -ENODEV;
-+		}
-+	pr_debug("cmd6 resp : 0x%08x 0x%08x 0x%08x 0x%08x\n",
-+	(unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3]);
-+
-+	}
-+
-+	resp = (ulong *) &mv_mmc_csd;
-+	pr_debug("csd: 0x%08x 0x%08x 0x%08x 0x%08x\n",
-+	(unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3]);
-+
-+
-+	/* check SDHC */
-+	if ((resp[0]&0xf0000000)==0x40000000)
-+		is_sdhc = 1;
-+
-+	/* set block len */
-+	resp = mv_mmc_cmd(MMC_CMD_SET_BLOCKLEN, MMC_BLOCK_SIZE, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
-+	if (!resp) {
-+		pr_debug("mv_mmc_block_read: set blk len fails\n");
-+	 	return -ENODEV;
-+	}
-+
-+	if (verbose) {
-+		if (is_sd)
-+			print_sd_cid((mv_sd_cid_t *) cidbuf);
-+		else
-+			print_mmc_cid((mv_mmc_cid_t *) cidbuf);
-+	}
-+
-+	mvsdio_set_clock(CONFIG_SYS_MMC_CLK_PP);
-+
-+	fat_register_device(&mmc_dev,1); /* partitions start counting with 1 */
-+
-+	return 0;
-+}
-+
-+#endif	/* CONFIG_MMC */
-diff --git a/drivers/mmc/mv_sdio.h b/drivers/mmc/mv_sdio.h
-new file mode 100644
-index 0000000..9707000
---- /dev/null
-+++ b/drivers/mmc/mv_sdio.h
-@@ -0,0 +1,310 @@
-+/*
-+ * (C) Copyright 2009
-+ * Marvell Semiconductor <www.marvell.com>
-+ * Written-by: Gérald Kerma <geraker@gmail.com>
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ */
-+
-+#ifndef _MVSDIO_INCLUDE
-+#define _MVSDIO_INCLUDE
-+
-+//#define SDIO_REG(x) (MV_SDIO_BASE + (x))
-+
-+#define MVSDMMC_DMA_SIZE			65536
-+#define MVSDMMC_CMD_TIMEOUT			2 /* 100 usec*/
-+
-+/*
-+ * Clock rates
-+ */
-+
-+#define MVSD_CLOCKRATE_MAX			50000000
-+#define MVSD_BASE_DIV_MAX			0x7ff
-+
-+#define CONFIG_SYS_MMC_CLK_PP			25000000
-+
-+/*
-+ * The base MMC clock rate
-+ */
-+
-+#define MVSDMMC_CLOCKRATE_MIN			100000
-+#define MVSDMMC_CLOCKRATE_MAX			MVSD_CLOCKRATE_MAX
-+#define MVSDMMC_BASE_FAST_CLOCK			CONFIG_SYS_TCLK
-+
-+
-+/*
-+ * SDIO register
-+ */
-+#ifndef __ASSEMBLY__
-+
-+/*
-+ * Structure for struct SoC access.
-+ * Names starting with '_' are fillers.
-+ */
-+typedef struct mv_sdio {
-+	/*	reg			Offset */
-+	u32	SYS_ADDR_LOW;		/* 0x00 */
-+	u32	SYS_ADDR_HI;		/* 0x04 */
-+	u32	BLK_SIZE;		/* 0x08 */
-+	u32	BLK_COUNT;		/* 0x0c */
-+	u32	ARG_LOW;		/* 0x10 */
-+	u32	ARG_HI;			/* 0x14 */
-+	u32	XFER_MODE;		/* 0x18 */
-+	u32	CMD;			/* 0x1c */
-+	u32	RSP0;			/* 0x20 */
-+	u32	RSP1;			/* 0x24 */
-+	u32	RSP2;			/* 0x28 */
-+	u32	RSP3;			/* 0x2c */
-+	u32	RSP4;			/* 0x30 */
-+	u32	RSP5;			/* 0x34 */
-+	u32	RSP6;			/* 0x38 */
-+	u32	RSP7;			/* 0x3c */
-+	u32	BUF_DATA_PORT;		/* 0x40 */
-+	u32	RSVED;			/* 0x44 */
-+	u32	PRESENT_STATE0;		/* 0x48 */
-+	u32	PRESENT_STATE1;		/* 0x4c */
-+	u32	HOST_CTRL;		/* 0x50 */
-+	u32	BLK_GAP_CTRL;		/* 0x54 */
-+	u32	CLK_CTRL;		/* 0x58 */
-+	u32	SW_RESET;		/* 0x5c */
-+	u32	NOR_INTR_STATUS;	/* 0x60 */
-+	u32	ERR_INTR_STATUS;	/* 0x64 */
-+	u32	NOR_STATUS_EN;		/* 0x68 */
-+	u32	ERR_STATUS_EN;		/* 0x6c */
-+	u32	NOR_INTR_EN;		/* 0x70 */
-+	u32	ERR_INTR_EN;		/* 0x74 */
-+	u32	AUTOCMD12_ERR_STATUS;	/* 0x78 */
-+	u32	CURR_BYTE_LEFT;		/* 0x7c */
-+	u32	CURR_BLK_LEFT;		/* 0x80 */
-+	u32	AUTOCMD12_ARG_LOW;	/* 0x84 */
-+	u32	AUTOCMD12_ARG_HI;	/* 0x88 */
-+	u32	AUTOCMD12_INDEX;	/* 0x8c */
-+	u32	AUTO_RSP0;		/* 0x90 */
-+	u32	AUTO_RSP1;		/* 0x94 */
-+	u32	AUTO_RSP2;		/* 0x98 */
-+	u32	_9c;			/* 0x9c */
-+	u32	_a0[0x78];		/* 0xa0 */
-+	u32	CLK_DIV;		/* 0x128 */
-+
-+} mv_sdio_t;
-+
-+#endif /* __ASSEMBLY__ */
-+
-+/*
-+ * SDIO_PRESENT_STATE
-+ */
-+
-+#define CARD_BUSY				(1 << 1)
-+#define CMD_INHIBIT				(1 << 0)
-+#define CMD_TXACTIVE				(1 << 8)
-+#define CMD_RXACTIVE				(1 << 9)
-+#define CMD_AUTOCMD12ACTIVE			(1 << 14)
-+
-+#define CMD_BUS_BUSY				(CMD_AUTOCMD12ACTIVE|	\
-+						CMD_RXACTIVE|	\
-+						CMD_TXACTIVE|	\
-+						CMD_INHIBIT|	\
-+						CARD_BUSY)
-+
-+/*
-+ * SDIO_CMD
-+ */
-+
-+#define SDIO_CMD_RSP_NONE			(0 << 0)
-+#define SDIO_CMD_RSP_136			(1 << 0)
-+#define SDIO_CMD_RSP_48				(2 << 0)
-+#define SDIO_CMD_RSP_48BUSY			(3 << 0)
-+
-+#define SDIO_CMD_CHECK_DATACRC16		(1 << 2)
-+#define SDIO_CMD_CHECK_CMDCRC			(1 << 3)
-+#define SDIO_CMD_INDX_CHECK			(1 << 4)
-+#define SDIO_CMD_DATA_PRESENT			(1 << 5)
-+#define SDIO_UNEXPECTED_RESP			(1 << 7)
-+
-+
-+/*
-+ * SDIO_XFER_MODE
-+ */
-+
-+#define SDIO_XFER_MODE_STOP_CLK			(1 << 5)
-+#define SDIO_XFER_MODE_HW_WR_DATA_EN		(1 << 1)
-+#define SDIO_XFER_MODE_AUTO_CMD12		(1 << 2)
-+#define SDIO_XFER_MODE_INT_CHK_EN		(1 << 3)
-+#define SDIO_XFER_MODE_TO_HOST			(1 << 4)
-+
-+
-+/*
-+ * SDIO_HOST_CTRL
-+ */
-+
-+#define SDIO_HOST_CTRL_PUSH_PULL_EN 		(1 << 0)
-+
-+#define SDIO_HOST_CTRL_CARD_TYPE_MEM_ONLY 	(0 << 1)
-+#define SDIO_HOST_CTRL_CARD_TYPE_IO_ONLY 	(1 << 1)
-+#define SDIO_HOST_CTRL_CARD_TYPE_IO_MEM_COMBO 	(2 << 1)
-+#define SDIO_HOST_CTRL_CARD_TYPE_IO_MMC 	(3 << 1)
-+#define SDIO_HOST_CTRL_CARD_TYPE_MASK	 	(3 << 1)
-+
-+#define SDIO_HOST_CTRL_BIG_ENDIAN 		(1 << 3)
-+#define SDIO_HOST_CTRL_LSB_FIRST 		(1 << 4)
-+#define SDIO_HOST_CTRL_ID_MODE_LOW_FREQ 	(1 << 5)
-+#define SDIO_HOST_CTRL_HALF_SPEED 		(1 << 6)
-+#define SDIO_HOST_CTRL_DATA_WIDTH_4_BITS 	(1 << 9)
-+#define SDIO_HOST_CTRL_HI_SPEED_EN 		(1 << 10)
-+
-+
-+#define SDIO_HOST_CTRL_TMOUT_MASK 		(0xf << 11)
-+#define SDIO_HOST_CTRL_TMOUT_MAX 		(0xf << 11)
-+#define SDIO_HOST_CTRL_TMOUT(x) 		((x) << 11)
-+#define SDIO_HOST_CTRL_TMOUT_EN 		(1 << 15)
-+
-+#define SDIO_HOST_CTRL_DFAULT_OPEN_DRAIN 	\
-+		(SDIO_HOST_CTRL_TMOUT(x)(0xf))
-+#define SDIO_HOST_CTRL_DFAULT_PUSH_PULL 	\
-+		(SDIO_HOST_CTRL_TMOUT(x)(0xf) | SDIO_HOST_CTRL_PUSH_PULL_EN)
-+
-+
-+/*
-+ * NOR status bits
-+ */
-+
-+#define SDIO_NOR_ERROR				(1 << 15)
-+#define SDIO_NOR_UNEXP_RSP			(1 << 14)
-+#define SDIO_NOR_AUTOCMD12_DONE			(1 << 13)
-+#define SDIO_NOR_SUSPEND_ON			(1 << 12)
-+#define SDIO_NOR_LMB_FF_8W_AVAIL		(1 << 11)
-+#define SDIO_NOR_LMB_FF_8W_FILLED		(1 << 10)
-+#define SDIO_NOR_READ_WAIT_ON			(1 << 9)
-+#define SDIO_NOR_CARD_INT			(1 << 8)
-+#define SDIO_NOR_READ_READY			(1 << 5)
-+#define SDIO_NOR_WRITE_READY			(1 << 4)
-+#define SDIO_NOR_DMA_INI			(1 << 3)
-+#define SDIO_NOR_BLK_GAP_EVT			(1 << 2)
-+#define SDIO_NOR_XFER_DONE			(1 << 1)
-+#define SDIO_NOR_CMD_DONE			(1 << 0)
-+
-+
-+/*
-+ * ERR status bits
-+ */
-+
-+#define SDIO_ERR_CRC_STATUS			(1 << 14)
-+#define SDIO_ERR_CRC_STARTBIT			(1 << 13)
-+#define SDIO_ERR_CRC_ENDBIT			(1 << 12)
-+#define SDIO_ERR_RESP_TBIT			(1 << 11)
-+#define SDIO_ERR_SIZE				(1 << 10)
-+#define SDIO_ERR_CMD_STARTBIT			(1 << 9)
-+#define SDIO_ERR_AUTOCMD12			(1 << 8)
-+#define SDIO_ERR_DATA_ENDBIT			(1 << 6)
-+#define SDIO_ERR_DATA_CRC			(1 << 5)
-+#define SDIO_ERR_DATA_TIMEOUT			(1 << 4)
-+#define SDIO_ERR_CMD_INDEX			(1 << 3)
-+#define SDIO_ERR_CMD_ENDBIT			(1 << 2)
-+#define SDIO_ERR_CMD_CRC			(1 << 1)
-+#define SDIO_ERR_CMD_TIMEOUT			(1 << 0)
-+
-+#define SDIO_ERR_INTR_MASK			0xFFFF
-+
-+
-+#define MMC_BLOCK_SIZE                  512
-+#define MMC_CMD_RESET                   0
-+#define MMC_CMD_SEND_OP_COND            1
-+#define MMC_CMD_ALL_SEND_CID            2
-+#define MMC_CMD_SET_RCA                 3
-+#define MMC_CMD_SELECT_CARD		7
-+#define MMC_CMD_SEND_CSD                9
-+#define MMC_CMD_SEND_CID                10
-+#define MMC_CMD_SEND_STATUS             13
-+#define MMC_CMD_SET_BLOCKLEN            16
-+#define MMC_CMD_READ_BLOCK              17
-+#define MMC_CMD_RD_BLK_MULTI            18
-+#define MMC_CMD_WRITE_BLOCK             24
-+#define MMC_MAX_BLOCK_SIZE              512
-+
-+typedef struct mv_mmc_cid
-+{
-+	/* FIXME: BYTE_ORDER */
-+	uchar year:4,
-+	month:4;
-+	uchar sn[3];
-+	uchar fwrev:4,
-+	hwrev:4;
-+	uchar name[6];
-+	uchar id[3];
-+} mv_mmc_cid_t;
-+
-+typedef struct mv_mmc_csd
-+{
-+	uchar   ecc:2,
-+		file_format:2,
-+		tmp_write_protect:1,
-+		perm_write_protect:1,
-+		copy:1,
-+		file_format_grp:1;
-+	uint64_t content_prot_app:1,
-+		rsvd3:4,
-+		write_bl_partial:1,
-+		write_bl_len:4,
-+		r2w_factor:3,
-+		default_ecc:2,
-+		wp_grp_enable:1,
-+		wp_grp_size:5,
-+		erase_grp_mult:5,
-+		erase_grp_size:5,
-+		c_size_mult1:3,
-+		vdd_w_curr_max:3,
-+		vdd_w_curr_min:3,
-+		vdd_r_curr_max:3,
-+		vdd_r_curr_min:3,
-+		c_size:12,
-+		rsvd2:2,
-+		dsr_imp:1,
-+		read_blk_misalign:1,
-+		write_blk_misalign:1,
-+		read_bl_partial:1;
-+	ushort  read_bl_len:4,
-+		ccc:12;
-+	uchar   tran_speed;
-+	uchar   nsac;
-+	uchar   taac;
-+	uchar   rsvd1:2,
-+		spec_vers:4,
-+		csd_structure:2;
-+} mv_mmc_csd_t;
-+
-+typedef struct {
-+	char		pnm_0;	/* product name */
-+	char		oid_1;	/* OEM/application ID */
-+	char		oid_0;
-+	uint8_t		mid;	/* manufacturer ID */
-+	char		pnm_4;
-+	char		pnm_3;
-+	char		pnm_2;
-+	char		pnm_1;
-+	uint8_t		psn_2;	/* product serial number */
-+	uint8_t		psn_1;
-+	uint8_t		psn_0;	/* MSB */
-+	uint8_t		prv;	/* product revision */
-+	uint8_t		crc;	/* CRC7 checksum, b0 is unused and set to 1 */
-+	uint8_t		mdt_1;	/* manufacturing date, LSB, RRRRyyyy yyyymmmm */
-+	uint8_t		mdt_0;	/* MSB */
-+	uint8_t		psn_3;	/* LSB */
-+} mv_sd_cid_t;
-+
-+#endif /* _MVSDIO_INCLUDE */
-diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
-index 83dd8ff..7c8497c 100644
---- a/include/configs/sheevaplug.h
-+++ b/include/configs/sheevaplug.h
-@@ -1,3 +1,4 @@
-+
- /*
-  * (C) Copyright 2009
-  * Marvell Semiconductor <www.marvell.com>
-@@ -47,7 +48,9 @@
- #define CONFIG_CMD_DHCP
- #define CONFIG_CMD_ENV
- #define CONFIG_CMD_MII
-+#define CONFIG_CMD_MMC
- #define CONFIG_CMD_NAND
-+#define CONFIG_JFFS2_NAND
- #define CONFIG_CMD_PING
- #define CONFIG_CMD_USB
- /*
-@@ -70,8 +73,8 @@
-  * it has to be rounded to sector size
-  */
- #define CONFIG_ENV_SIZE			0x20000	/* 128k */
--#define CONFIG_ENV_ADDR			0x60000
--#define CONFIG_ENV_OFFSET		0x60000	/* env starts here */
-+#define CONFIG_ENV_ADDR			0xa0000
-+#define CONFIG_ENV_OFFSET		0xa0000	/* env starts here */
- 
- /*
-  * Default environment variables
-@@ -81,10 +84,11 @@
- 	"${x_bootcmd_usb}; bootm 0x6400000;"
- 
- #define CONFIG_MTDPARTS		"orion_nand:512k(uboot),"	\
--	"3m@1m(kernel),1m@4m(psm),13m@5m(rootfs) rw\0"
-+	"0x1ff00000@512k(rootfs) rw\0"
- 
- #define CONFIG_EXTRA_ENV_SETTINGS	"x_bootargs=console"	\
- 	"=ttyS0,115200 mtdparts="CONFIG_MTDPARTS	\
-+	"mtdids=nand0=orion_nand\0"	\
- 	"x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \
- 	"x_bootcmd_usb=usb start\0" \
- 	"x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac6607daf92..cdf01002506 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10108,14 +10108,42 @@ let
 
   tunctl = callPackage ../os-specific/linux/tunctl { };
 
-  ubootChooser = name : if name == "upstream" then ubootUpstream
-    else if name == "sheevaplug" then ubootSheevaplug
-    else if name == "guruplug" then ubootGuruplug
-    else if name == "nanonote" then ubootNanonote
-    else throw "Unknown uboot";
+  # TODO(dezgeg): either refactor & use ubootTools directly, or remove completely
+  ubootChooser = name: ubootTools;
 
-  ubootUpstream = callPackage ../misc/uboot { };
+  # Upstream U-Boots:
+  ubootTools = callPackage ../misc/uboot {
+    toolsOnly = true;
+    targetPlatforms = lib.platforms.linux;
+    filesToInstall = ["tools/dumpimage" "tools/mkenvimage" "tools/mkimage"];
+  };
 
+  ubootJetsonTK1 = callPackage ../misc/uboot {
+    defconfig = "jetson-tk1_defconfig";
+    targetPlatforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot-dtb-tegra.bin"];
+  };
+
+  ubootPcduino3Nano = callPackage ../misc/uboot {
+    defconfig = "Linksprite_pcDuino3_Nano_defconfig";
+    targetPlatforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+  };
+
+  ubootRaspberryPi = callPackage ../misc/uboot {
+    defconfig = "rpi_defconfig";
+    targetPlatforms = ["armv6l-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
+  # Intended only for QEMU's vexpress-a9 emulation target!
+  ubootVersatileExpressCA9 = callPackage ../misc/uboot {
+    defconfig = "vexpress_ca9x4_defconfig";
+    targetPlatforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot"];
+  };
+
+  # Non-upstream U-Boots:
   ubootSheevaplug = callPackage ../misc/uboot/sheevaplug.nix { };
 
   ubootNanonote = callPackage ../misc/uboot/nanonote.nix { };

From 0ec0790348c9788e87bd261734714d96d3e3d211 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 19 Jun 2015 06:13:34 +0300
Subject: [PATCH 1717/2322] U-Boot: Patch Versatile Express to use
 config_distro_bootcmd.h

With this patch in place, ARMv7 NixOS can be booted in QEMU:

qemu-system-arm -kernel u-boot -M vexpress-a9 -serial stdio -sd nixos-sd-image-armv7l-linux.img -m 1024

...with all the features that boot.loader.generic-extlinux-compatible
supports, like the boot generation menu and seamless kernel upgrades
in the VM.
---
 pkgs/misc/uboot/default.nix                   |   2 +
 .../vexpress-Use-config_distro_bootcmd.patch  | 141 ++++++++++++++++++
 2 files changed, 143 insertions(+)
 create mode 100644 pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 5f4bab9138f..675a6839c86 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
     sha256 = "0q2x1wh1f6rjh9rmcnkf28dxcvp9hkhi4vzspqkzamb6b3gp06ha";
   };
 
+  patches = [ ./vexpress-Use-config_distro_bootcmd.patch ];
+
   nativeBuildInputs = [ bc dtc ];
 
   configurePhase = ''
diff --git a/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch b/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch
new file mode 100644
index 00000000000..9c61847f02e
--- /dev/null
+++ b/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch
@@ -0,0 +1,141 @@
+From 53a8612ff19f360363edaaf70137968f7fd6a1cd Mon Sep 17 00:00:00 2001
+From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
+Date: Mon, 8 Jun 2015 22:29:23 +0300
+Subject: [PATCH] vexpress: Use config_distro_bootcmd
+
+Also had to hack cli_readline.c, as one codepath in
+cli_readline_into_buffer doesn't respect the timeout.
+---
+ common/cli_readline.c             | 12 +++++++++++-
+ include/configs/vexpress_ca9x4.h  |  1 -
+ include/configs/vexpress_common.h | 35 +++++++++++++++++++++++------------
+ 3 files changed, 34 insertions(+), 14 deletions(-)
+
+diff --git a/common/cli_readline.c b/common/cli_readline.c
+index 9a9fb35..ca997a9 100644
+--- a/common/cli_readline.c
++++ b/common/cli_readline.c
+@@ -517,6 +517,7 @@ int cli_readline_into_buffer(const char *const prompt, char *buffer,
+ 	int	plen = 0;			/* prompt length	*/
+ 	int	col;				/* output column cnt	*/
+ 	char	c;
++	int first = 1;
+ 
+ 	/* print prompt */
+ 	if (prompt) {
+@@ -528,7 +529,16 @@ int cli_readline_into_buffer(const char *const prompt, char *buffer,
+ 	for (;;) {
+ 		if (bootretry_tstc_timeout())
+ 			return -2;	/* timed out */
+-		WATCHDOG_RESET();	/* Trigger watchdog, if needed */
++		if (first && timeout) {
++			uint64_t etime = endtick(timeout);
++
++			while (!tstc()) {	/* while no incoming data */
++				if (get_ticks() >= etime)
++					return -2;	/* timed out */
++				WATCHDOG_RESET();
++			}
++			first = 0;
++		}
+ 
+ #ifdef CONFIG_SHOW_ACTIVITY
+ 		while (!tstc()) {
+diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h
+index 38ac4ed..993398c 100644
+--- a/include/configs/vexpress_ca9x4.h
++++ b/include/configs/vexpress_ca9x4.h
+@@ -13,6 +13,5 @@
+ 
+ #define CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
+ #include "vexpress_common.h"
+-#define CONFIG_BOOTP_VCI_STRING     "U-boot.armv7.vexpress_ca9x4"
+ 
+ #endif /* VEXPRESS_CA9X4_H */
+diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
+index db78c85..1dd069b 100644
+--- a/include/configs/vexpress_common.h
++++ b/include/configs/vexpress_common.h
+@@ -123,7 +123,6 @@
+ #define CONFIG_SYS_L2CACHE_OFF		1
+ #define CONFIG_INITRD_TAG		1
+ #define CONFIG_SYS_GENERIC_BOARD
+-#define CONFIG_OF_LIBFDT		1
+ 
+ /* Size of malloc() pool */
+ #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128 * 1024)
+@@ -152,6 +151,8 @@
+ #define CONFIG_SYS_SERIAL0		V2M_UART0
+ #define CONFIG_SYS_SERIAL1		V2M_UART1
+ 
++#include <config_distro_defaults.h>
++#include <config_cmd_default.h>
+ /* Command line configuration */
+ #define CONFIG_CMD_BDI
+ #define CONFIG_CMD_DHCP
+@@ -169,7 +170,6 @@
+ #define CONFIG_SUPPORT_RAW_INITRD
+ 
+ #define CONFIG_CMD_FAT
+-#define CONFIG_DOS_PARTITION		1
+ #define CONFIG_MMC			1
+ #define CONFIG_CMD_MMC
+ #define CONFIG_GENERIC_MMC
+@@ -207,17 +207,28 @@
+ 					 GENERATED_GBL_DATA_SIZE)
+ #define CONFIG_SYS_INIT_SP_ADDR		CONFIG_SYS_GBL_DATA_OFFSET
+ 
++#define BOOT_TARGET_DEVICES(func) \
++	func(MMC, mmc, 0)
++#include <config_distro_bootcmd.h>
++
+ /* Basic environment settings */
+-#define CONFIG_BOOTCOMMAND		"run bootflash;"
+ #ifdef CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
++/*
++ * RAM starts at 0x6000_0000
++ *  - U-Boot loaded @ 8M
++ *  - Kernel loaded @ 32M
++ *  - Initrd loaded @ 128M
++ *  - DTB    loaded @ 240M
++ */
+ #define CONFIG_PLATFORM_ENV_SETTINGS \
+-		"loadaddr=0x80008000\0" \
+-		"ramdisk_addr_r=0x61000000\0" \
+-		"kernel_addr=0x44100000\0" \
+-		"ramdisk_addr=0x44800000\0" \
+-		"maxramdisk=0x1800000\0" \
+-		"pxefile_addr_r=0x88000000\0" \
+-		"kernel_addr_r=0x80008000\0"
++		"fdtfile=vexpress-v2p-ca9.dtb\0" \
++		"kernel_addr_r=0x62000000\0" \
++		"ramdisk_addr_r=0x68000000\0" \
++		"maxramdisk=0x06000000\0" \
++		"fdt_addr_r=0x6f000000\0" \
++		"loadaddr=0x70000000\0" \
++		"pxefile_addr_r=0x71000000\0" \
++		"scriptaddr=0x72000000\0"
+ #elif defined(CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP)
+ #define CONFIG_PLATFORM_ENV_SETTINGS \
+ 		"loadaddr=0xa0008000\0" \
+@@ -240,7 +251,8 @@
+ 			"devtmpfs.mount=0  vmalloc=256M\0" \
+ 		"bootflash=run flashargs; " \
+ 			"cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \
+-			"bootm ${kernel_addr} ${ramdisk_addr_r}\0"
++			"bootm ${kernel_addr} ${ramdisk_addr_r}\0" \
++                BOOTENV
+ 
+ /* FLASH and environment organization */
+ #define PHYS_FLASH_SIZE			0x04000000	/* 64MB */
+@@ -294,7 +306,6 @@
+ #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE /* Boot args buffer */
+ #define CONFIG_CMD_SOURCE
+ #define CONFIG_SYS_LONGHELP
+-#define CONFIG_CMDLINE_EDITING		1
+ #define CONFIG_SYS_MAXARGS		16	/* max command args */
+ 
+ #endif /* VEXPRESS_COMMON_H */
+-- 
+2.4.4
+

From 36cd08e3749e342cd7e5e157af617498f539f3b5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 30 Jun 2015 11:04:46 +0200
Subject: [PATCH 1718/2322] nixpkgs-manual: fix callouts

---
 doc/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/default.nix b/doc/default.nix
index 1e8974d6026..b68194b97a7 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -36,6 +36,9 @@ stdenv.mkDerivation {
 
     cp ${./style.css} $dst/style.css
 
+    mkdir -p $dst/images/callouts
+    cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/images/callouts/
+
     mkdir -p $out/nix-support
     echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products
   '';

From 01ce5ce0501327d37aa123c0ded432a5b87cea4b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 30 Jun 2015 11:26:14 +0200
Subject: [PATCH 1719/2322] doc: document .override

---
 doc/functions.xml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/doc/functions.xml b/doc/functions.xml
index 16f4f262a25..89f2fda0ad4 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -54,4 +54,35 @@ in ...</programlisting>
 
 </section>
 
+<section xml:id="sec-pkg-override">
+  <title>&lt;pkg&gt;.override</title>
+
+  <para>
+    The function <varname>override</varname> is usually available for all the
+    derivations in the nixpkgs expression (<varname>pkgs</varname>).
+  </para>
+  <para>
+    It is used to override the arguments passed to a function.
+  </para>
+  <para>
+    Example usages:
+
+    <programlisting>pkgs.foo.override { arg1 = val1; arg2 = val2; ... }</programlisting>
+    <programlisting>pkgs.overridePackages (self: super: {
+  foo = super.foo.override { barSupport = true ; };
+})</programlisting>
+    <programlisting>mypkg = pkgs.callPackage ./mypkg.nix {
+  mydep = pkgs.mydep.override { ... };
+})</programlisting>
+  </para>
+
+  <para>
+    In the first example, <varname>pkgs.foo</varname> is the result of a function call
+    with some default arguments, usually a derivation.
+    Using <varname>pkgs.foo.override</varname> will call the same function with
+    the given new arguments.
+  </para>
+
+</section>
+
 </chapter>

From e06f494a81d65177404cf9b1d28a5fbffda0f146 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 30 Jun 2015 12:19:49 +0200
Subject: [PATCH 1720/2322] doc: document lib.makeOverridable

---
 doc/functions.xml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/doc/functions.xml b/doc/functions.xml
index 89f2fda0ad4..2aae3cfb2ae 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -85,4 +85,36 @@ in ...</programlisting>
 
 </section>
 
+<section xml:id="sec-lib-makeOverridable">
+  <title>lib.makeOverridable</title>
+
+  <para>
+    The function <varname>lib.makeOverridable</varname> is used make the result
+    of a function easily customizable. This utility only makes sense for functions
+    that accept an argument set and return an attribute set.
+  </para>
+
+  <para>
+    Example usage:
+
+    <programlisting>f = { a, b }: { result = a+b; }
+c = lib.makeOverridable f { a = 1; b = 2; }</programlisting>
+
+  </para>
+
+  <para>
+    The variable <varname>c</varname> is the value of the <varname>f</varname> function
+    applied with some default arguments. Hence the value of <varname>c.result</varname>
+    is <literal>3</literal>, in this example.
+  </para>
+
+  <para>
+    The variable <varname>c</varname> however also has some additional functions, like
+    <link linkend="sec-pkg-override">c.override</link> which can be used to
+    override the default arguments. In this example the value of
+    <varname>(c.override { a = 4; }).result</varname> is 6.
+  </para>
+
+</section>
+
 </chapter>

From e7d81a371bb2151a346576ac9526e89a99d6f346 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 30 Jun 2015 12:25:18 +0200
Subject: [PATCH 1721/2322] doc: make it clear the Contributing section is for
 the docs

---
 doc/contributing.xml | 2 +-
 doc/manual.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/contributing.xml b/doc/contributing.xml
index ee93be4447a..a83059aa36e 100644
--- a/doc/contributing.xml
+++ b/doc/contributing.xml
@@ -2,7 +2,7 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-contributing">
 
-<title>Contributing</title>
+<title>Contributing to this documentation</title>
 
 <para>The DocBook sources of the Nixpkgs manual are in the <filename
 xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename>
diff --git a/doc/manual.xml b/doc/manual.xml
index 11f37184e6d..1321f4b7ad2 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -18,7 +18,7 @@
   <xi:include href="language-support.xml" />
   <xi:include href="package-notes.xml" />
   <xi:include href="coding-conventions.xml" />
-  <xi:include href="contributing.xml" />
   <xi:include href="haskell-users-guide.xml" />
+  <xi:include href="contributing.xml" />
 
 </book>

From 18308e6b563cef25f126cd434255f236ebdd6cde Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 30 Jun 2015 12:58:28 +0200
Subject: [PATCH 1722/2322] tvheadend: fix build by disabling dvbscan

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

diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix
index 7eb2c527406..c7b4e515317 100644
--- a/pkgs/servers/tvheadend/default.nix
+++ b/pkgs/servers/tvheadend/default.nix
@@ -1,4 +1,5 @@
-{avahi, dbus, fetchurl, git, gzip, libav, libiconv, openssl, pkgconfig, python, stdenv, which, zlib}:
+{avahi, dbus, fetchurl, git, gzip, libav, libiconv, openssl, pkgconfig, python
+, stdenv, which, zlib}:
 
 let version = "4.0.4";
     pkgName = "tvheadend"; in
@@ -13,7 +14,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ avahi dbus git gzip libav libiconv openssl pkgconfig python which zlib];
+  configureFlags = [ "--disable-dvbscan" ];
+
+  buildInputs = [ avahi dbus git gzip libav libiconv openssl pkgconfig python
+    which zlib ];
 
   preConfigure = "patchShebangs ./configure";
 

From 2cdbe82ada2ead4f993e40521305d6184970be0b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 30 Jun 2015 13:07:06 +0200
Subject: [PATCH 1723/2322] llpp: update from 2015-06-06 to 2015-06-27

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

diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index 601ffe25200..bd0727ccab1 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -4,12 +4,12 @@
 let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
 in stdenv.mkDerivation rec {
   name = "llpp-${version}";
-  version = "21-git-2015-06-06";
+  version = "21-git-2015-06-27";
 
   src = fetchgit {
     url = "git://repo.or.cz/llpp.git";
-    rev = "492d761c0c7c8c4ccdd4f0d3fa7c51434ce8acf2";
-    sha256 = "14dp5sw7cd6bja9d3zpxmswbk0k0b7x2fzb1fflhnnnhjc39irk9";
+    rev = "843c42ef41bb78a3b1ee995fc2bab91f8796e8ad";
+    sha256 = "0h8wa7f5bj5sm3sr8namcyy81s4s80hyasimyfw935lqyw2q2k60";
   };
 
   buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl

From 16406e63b310e832b017bf9ef0473a6aa792f7da Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 30 Jun 2015 15:41:22 +0200
Subject: [PATCH 1724/2322] xdg_utils: fix handling of runtime dependencies,
 closes #8564

'egrep' was substituted with the path to the grep binary
---
 pkgs/tools/X11/xdg-utils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 5f5619002d6..7ba20480b6f 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
     for item in $out/bin/*; do
       substituteInPlace $item --replace "cut " "${coreutils}/bin/cut "
       substituteInPlace $item --replace "sed " "${gnused}/bin/sed "
-      substituteInPlace $item --replace "grep " "${gnugrep}/bin/grep "
       substituteInPlace $item --replace "egrep " "${gnugrep}/bin/egrep "
+      sed -i $item -e "s#[^e]grep #${gnugrep}/bin/grep #g" # Don't replace 'egrep'
       substituteInPlace $item --replace "which " "${which}/bin/which "
       substituteInPlace $item --replace "/usr/bin/file" "${file}/bin/file"
     done

From 32b9ca3219e38b4a0b8d01156ac93c4c92413b08 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 30 Jun 2015 17:03:11 +0200
Subject: [PATCH 1725/2322] EC2: Don't blackhole 169.254.169.254

https://github.com/NixOS/nixops/issues/267
---
 nixos/modules/virtualisation/ec2-data.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
index 0b2479c1046..cc641b1a987 100644
--- a/nixos/modules/virtualisation/ec2-data.nix
+++ b/nixos/modules/virtualisation/ec2-data.nix
@@ -31,8 +31,6 @@ with lib;
 
         script =
           ''
-            ip route del blackhole 169.254.169.254/32 || true
-
             wget="wget -q --retry-connrefused -O -"
 
             ${optionalString (config.networking.hostName == "") ''
@@ -67,14 +65,6 @@ with lib;
                 (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key)
                 echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub
             fi
-
-            ${optionalString (! config.ec2.metadata) ''
-              # Since the user data is sensitive, prevent it from
-              # being accessed from now on. FIXME: remove at some
-              # point, since current NixOps no longer relies on
-              # metadata secrecy.
-              ip route add blackhole 169.254.169.254/32
-            ''}
           '';
 
         serviceConfig.Type = "oneshot";

From 433a13d12aa4f97bb003ea5561758ff5858d632a Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 30 Jun 2015 11:11:43 -0400
Subject: [PATCH 1726/2322] taffybar: init with-packages wrapper

This provides a wrapper around taffybar, in a fashion similar to how
package xmonad.
---
 .../window-managers/taffybar/default.nix          | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix                   |  4 ++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/applications/window-managers/taffybar/default.nix

diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix
new file mode 100644
index 00000000000..66e880197bb
--- /dev/null
+++ b/pkgs/applications/window-managers/taffybar/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, ghcWithPackages, xmessage, makeWrapper, packages ? (x: []) }:
+
+let
+taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self);
+in stdenv.mkDerivation {
+  name = "taffybar-with-packages";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildCommand = ''
+    mkdir -p $out/bin
+    makeWrapper ${taffybarEnv}/bin/taffybar $out/bin/taffybar \
+      --set NIX_GHC "${taffybarEnv}/bin/ghc"
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2566783eb5..0e746243fea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12668,6 +12668,10 @@ let
     enableXft = true;
   };
 
+  taffybar = callPackage ../applications/window-managers/taffybar {
+    inherit (haskellPackages) ghcWithPackages;
+  };
+
   tagainijisho = callPackage ../applications/office/tagainijisho {};
 
   tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs {

From 96b325b0b7d2fab8ea8ec8e06f2e8868d5f45d8b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 30 Jun 2015 17:25:30 +0200
Subject: [PATCH 1727/2322] Remove option ec2.metadata

---
 nixos/modules/rename.nix                     |  1 +
 nixos/modules/virtualisation/amazon-init.nix |  1 -
 nixos/modules/virtualisation/ec2-data.nix    | 10 ----------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index fc83e7ed590..dd80d006591 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -148,5 +148,6 @@ in zipModules ([]
 ++ obsolete' [ "services" "samba" "defaultShare" ]
 ++ obsolete' [ "services" "syslog-ng" "serviceName" ]
 ++ obsolete' [ "services" "syslog-ng" "listenToJournal" ]
+++ obsolete' [ "ec2" "metadata" ]
 
 )
diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index 6058a7019e8..21cbbfda0b6 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -45,7 +45,6 @@ let
   '';
 in {
   imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ];
-  ec2.metadata = true;
   boot.postBootCommands = ''
     ${bootScript} &
   '';
diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
index cc641b1a987..44a582ba766 100644
--- a/nixos/modules/virtualisation/ec2-data.nix
+++ b/nixos/modules/virtualisation/ec2-data.nix
@@ -7,16 +7,6 @@
 with lib;
 
 {
-  options = {
-    ec2.metadata = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Whether to allow access to EC2 metadata.
-      '';
-    };
-  };
-
   config = {
 
     systemd.services."fetch-ec2-data" =

From e46933f5546b23dfea1a586a4abec9de583f582b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 30 Jun 2015 18:21:51 +0200
Subject: [PATCH 1728/2322] bmon: update from 3.6 to 3.7

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

diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix
index 4416c3e1625..308232ac2fe 100644
--- a/pkgs/tools/misc/bmon/default.nix
+++ b/pkgs/tools/misc/bmon/default.nix
@@ -3,18 +3,15 @@
 
 stdenv.mkDerivation rec {
   name = "bmon-${version}";
-  version = "3.6";
+  version = "3.7";
 
   src = fetchFromGitHub {
     owner = "tgraf";
     repo = "bmon";
     rev = "v${version}";
-    sha256 = "16qwazays2j448kmfckv6wvh4rhmhc9q4vp1s75hm9z02cmhvk8q";
+    sha256 = "0rh0r8gabcsqq3d659yqk8nz6y4smsi7p1vwa2v584m2l2d0rqd6";
   };
 
-  # https://github.com/tgraf/bmon/pull/24#issuecomment-98068887
-  postPatch = "sed '1i#include <net/if.h>' -i src/in_netlink.c";
-
   buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ];
 
   preConfigure = "sh ./autogen.sh";

From f5268e9f094e61c91c8e777c714503755d1af818 Mon Sep 17 00:00:00 2001
From: Lane Seppala <lane@helium.com>
Date: Tue, 30 Jun 2015 11:11:13 -0600
Subject: [PATCH 1729/2322] Enable uuid-ossp in Postgres 9.4 on Darwin

Based on documentation section F.44.2 at
http://www.postgresql.org/docs/9.4/static/uuid-ossp.html
---
 pkgs/servers/sql/postgresql/9.4.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix
index 5c795329b2d..cdb689fc110 100644
--- a/pkgs/servers/sql/postgresql/9.4.x.nix
+++ b/pkgs/servers/sql/postgresql/9.4.x.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "world" ];
 
   configureFlags = [ "--with-openssl" ]
+                   ++ optional (stdenv.isDarwin)  "--with-uuid=e2fs"
                    ++ optional (!stdenv.isDarwin) "--with-ossp-uuid";
 
   patches = [ ./disable-resolve_symlinks-94.patch ./less-is-more.patch ];

From 90b4054aa00353f06011e85719edc1c9eff23b04 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <oconnorr@google.com>
Date: Mon, 29 Jun 2015 22:35:54 +0000
Subject: [PATCH 1730/2322] cassandra-driver: init at 2.6.0c2

---
 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 d89b40dfa9a..417e1beaa89 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1689,6 +1689,29 @@ let
     };
   };
 
+  cassandraDriver = buildPythonPackage rec {
+    name = "cassandra-driver-2.6.0c2";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/c/cassandra-driver/${name}.tar.gz";
+      sha256 = "00cc2rkvkxaxn7sf2qzy29s6h394fla73rbdh9krxbswp5nvp27r";
+    };
+
+    propagatedBuildInputs = with self; [
+      futures
+      nose
+      six
+      sure
+      pytz
+      pyyaml
+    ];
+
+    meta = {
+      homepage = http://datastax.github.io/python-driver/;
+      description = "A Python client driver for Apache Cassandra";
+    };
+  };
+
 
   celery = buildPythonPackage rec {
     name = "celery-${version}";

From 4527d6a7def13607d45b2ee10f118843e4b28a88 Mon Sep 17 00:00:00 2001
From: i-bot <i-bot@openmailbox.org>
Date: Tue, 30 Jun 2015 19:56:52 +0200
Subject: [PATCH 1731/2322] eclipse-sdk: 4.4.2 -> 4.5

---
 pkgs/applications/editors/eclipse/default.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 0373791dcca..d2e6116fec7 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -302,4 +302,20 @@ in {
         };
     };
   };
+
+  eclipse_sdk_45 = buildEclipse {
+    name = "eclipse-sdk-4.5";
+    description = "Eclipse Mars Classic";
+    sources = {
+      "x86_64-linux" = fetchurl {
+          url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk-x86_64.tar.gz;
+          sha256 = "0vfql4gh263ms8bg7sgn05gnjajplx304cn3nr03jlacgr3pkarf";
+
+        };
+      "i686-linux" = fetchurl {
+          url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk.tar.gz;
+          sha256 = "0xv66l6hdlvxpswcqrsh398wg6xhy30f833dr7jvvz45s5437hm3";
+        };
+    };
+  };
 }

From 34cb1a202b954378f2f81c6e0b92eb544d354bc5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 30 Jun 2015 11:16:21 -0700
Subject: [PATCH 1732/2322] kernel: 3.10.81 -> 3.10.82

---
 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 01e5e941118..42b90a48097 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, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.81";
+  version = "3.10.82";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0hza9wsy9x2113crlwygl06lspwlahq09nifnmdacfkqcxp4r3ng";
+    sha256 = "177rzyd9mxvbacy242abk7annhlm48rbdspr78y5qqsqsgihh88y";
   };
 
   features.iwlwifi = true;

From 3f7d195762fa60d8c39df966c49c9238ffefd184 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 30 Jun 2015 11:18:01 -0700
Subject: [PATCH 1733/2322] kernel: 4.1 -> 4.1.1

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index baee61940cd..5d9a026f614 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1";
-  modDirVersion = "4.1.0";
+  version = "4.1.1";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "17rdly75zh49m6r32yy03xappl7ajcqbznq09pm1q7mcb841zxfa";
+    sha256 = "12bfih081cbqlgmgq1fqdvvpxga5saj4kkvhawsl4fpg4mybrml8";
   };
 
   features.iwlwifi = true;

From b25930c4c8cd53b1b4affa6e20c657338a0d80a7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 30 Jun 2015 11:17:51 -0700
Subject: [PATCH 1734/2322] kernel: 4.0.6 -> 4.0.7

---
 pkgs/os-specific/linux/kernel/linux-4.0.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-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix
index 89cd34182cf..3ea4257a1e9 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.0.6";
+  version = "4.0.7";
   # Remember to update grsecurity!
   extraMeta.branch = "4.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0n0w2k52m3cn286f413jmzwffyk3g28y4n7d41wc93zvgm720lr9";
+    sha256 = "01c68w6lygzjzllv7xgnd1hm3339rs0fvd8q26n6bdfa95aj554m";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index af63b0a5f55..f49c8726297 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -72,10 +72,10 @@ rec {
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "4.0.6";
-      revision  = "201506232104";
+    { kversion  = "4.0.7";
+      revision  = "201506300712";
       branch    = "test";
-      sha256    = "0him41fm0hw857ibvfmvpsrk2a8x492d4cy4hlbqyfk35rcmpfdf";
+      sha256    = "0rw0wx5nc244m2q7f9y832mmkv8gb8yv1rn1w2pyq8brckiswni7";
     };
 
   grsec_fix_path =

From 43eda80b092861376740807745e663483bf7dd89 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 30 Jun 2015 11:16:46 -0700
Subject: [PATCH 1735/2322] kernel: 3.18.16 -> 3.18.17

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 168bfe5e94c..843172581cc 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.18.16";
+  version = "3.18.17";
   extraMeta.branch = "3.18";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0c2530amgsk29ina9mfvlncki64w0zs16d2k8bghq3fv9k2qv3nr";
+    sha256 = "08512kqvy91jh26jld2h3d9xq3wsfbyylzawjgn75x4r5li6y5ha";
   };
 
   features.iwlwifi = true;

From d64b3c8a5cea93ee24cb6680ccbadd501e7067bb Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 30 Jun 2015 11:16:33 -0700
Subject: [PATCH 1736/2322] kernel: 3.14.45 -> 3.14.46

---
 pkgs/os-specific/linux/kernel/linux-3.14.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-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index e6e7f4130a7..103fbcbcfb9 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.45";
+  version = "3.14.46";
   # Remember to update grsecurity!
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0jfbwl0daba41cwkn67rk7an9g6cbljxq8wlwnr321mfnd3mnx4c";
+    sha256 = "1ran8fi1ldc89x3gpxwkkfl64mln4sl0rq5bbl8imlca5nljmzkb";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index f49c8726297..ed202d77b38 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -65,10 +65,10 @@ rec {
   };
 
   grsecurity_stable = grsecPatch
-    { kversion  = "3.14.45";
-      revision  = "201506232103";
+    { kversion  = "3.14.46";
+      revision  = "201506300711";
       branch    = "stable";
-      sha256    = "1f4fm7r6pbspdw9l1d1mrjj1jpyh0l2vlq1lnqs54v3xzwr933py";
+      sha256    = "0xjqh7yc4vzgbnql16aylla9b0cjh442sywp8bvkh0ny5m3rj64l";
     };
 
   grsecurity_unstable = grsecPatch

From 83895f49014106b5c76887cd3f2110594b3988b5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 30 Jun 2015 13:11:18 -0700
Subject: [PATCH 1737/2322] keepalived: 1.2.17 -> 1.2.18

---
 pkgs/tools/networking/keepalived/default.nix  |  7 +---
 .../keepalived/fix-ip-release.patch           | 39 -------------------
 2 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/tools/networking/keepalived/fix-ip-release.patch

diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix
index 8ad0021e6ae..bde3a74f8b7 100644
--- a/pkgs/tools/networking/keepalived/default.nix
+++ b/pkgs/tools/networking/keepalived/default.nix
@@ -1,18 +1,15 @@
 { stdenv, fetchurl, openssl, net_snmp, libnl }:
 
 stdenv.mkDerivation rec {
-  name = "keepalived-1.2.17";
+  name = "keepalived-1.2.18";
 
   src = fetchurl {
     url = "http://keepalived.org/software/${name}.tar.gz";
-    sha256 = "1w7px8phx3pyb3b56m3nz1a9ncx26q34fgy8j4n2dpi284jmqm6z";
+    sha256 = "07l1ywg44zj2s3wn9mh6y7qbcc0cgp6q1q39hnm0c5iv5izakkg5";
   };
 
   buildInputs = [ openssl net_snmp libnl ];
 
-  # Remove in 1.2.18
-  patches = [ ./fix-ip-release.patch ];
-
   postPatch = ''
     sed -i 's,$(DESTDIR)/usr/share,$out/share,g' Makefile.in
   '';
diff --git a/pkgs/tools/networking/keepalived/fix-ip-release.patch b/pkgs/tools/networking/keepalived/fix-ip-release.patch
deleted file mode 100644
index 0fa828a3ee5..00000000000
--- a/pkgs/tools/networking/keepalived/fix-ip-release.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d80c171e7e8fe7fb4e0878a15027ac80c23b0a14 Mon Sep 17 00:00:00 2001
-From: David Stapleton <dstaplet@brocade.com>
-Date: Mon, 15 Jun 2015 13:07:21 +0100
-Subject: [PATCH] Fix vrrp removes incorrect IPv4 address when VIPs are removed
-
-When vrrp has an IPv4 VIP that matches the primary interface
-address, when the VIP is removed from the interface, the original
-address ends up getting removed instead of the VIP.
-
-The kernel receives a netlink message instructing it to remove
-address x from a particular interface. For IPv4, address x can
-be configured multiple times providing the prefix lengths differ.
-If the IFA_ADDRESS attribute is not specified in a RTM_DELADDR
-message, the kernel will delete the first address it finds a
-match on, prefix length is not taken into account.
-
-This fix therefore adds the IFA_ADDRESS attribute when deleting
-IPv4 addresses so that the address removed is actually the VIP.
----
- keepalived/vrrp/vrrp_ipaddress.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/keepalived/vrrp/vrrp_ipaddress.c b/keepalived/vrrp/vrrp_ipaddress.c
-index 0f9ce23..698f35c 100644
---- a/keepalived/vrrp/vrrp_ipaddress.c
-+++ b/keepalived/vrrp/vrrp_ipaddress.c
-@@ -86,6 +86,9 @@ netlink_ipaddress(ip_address_t *ipaddress, int cmd)
- 	} else {
- 		addattr_l(&req.n, sizeof(req), IFA_LOCAL,
- 			  &ipaddress->u.sin.sin_addr, sizeof(ipaddress->u.sin.sin_addr));
-+		if (cmd == IPADDRESS_DEL)
-+			addattr_l(&req.n, sizeof(req), IFA_ADDRESS,
-+			  &ipaddress->u.sin.sin_addr, sizeof(ipaddress->u.sin.sin_addr));
- 		if (ipaddress->u.sin.sin_brd.s_addr)
- 			addattr_l(&req.n, sizeof(req), IFA_BROADCAST,
- 				  &ipaddress->u.sin.sin_brd, sizeof(ipaddress->u.sin.sin_brd));
--- 
-2.4.4
-

From db53d84a98fd2bd90779fd85672f82f99ea947ac Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Tue, 30 Jun 2015 22:59:15 +0200
Subject: [PATCH 1738/2322] screen: 4.3.0 -> 4.3.1

---
 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 d329106b979..1fe71ae9616 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, pam ? null }:
 
 stdenv.mkDerivation rec {
-  name = "screen-4.3.0";
+  name = "screen-4.3.1";
 
   src = fetchurl {
     url = "mirror://gnu/screen/${name}.tar.gz";
-    sha256 = "0ilccnwszaxr9wbrx0swh4fisha2rj2jiq76fwqikmv0rjdyhr2i";
+    sha256 = "0qwxd4axkgvxjigz9xs0kcv6qpfkrzr2gm43w9idx0z2mvw4jh7s";
   };
 
   preConfigure = ''

From d35cf0c0804d5fc072b0aeb2148b923bdbb08841 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 30 Jun 2015 23:05:17 +0200
Subject: [PATCH 1739/2322] xapian: 1.2.19 -> 1.2.21

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

diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 575fb73084c..a9334f31ecd 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchurl, libuuid, zlib }:
 
-stdenv.mkDerivation {
-  name = "xapian-1.2.19";
+stdenv.mkDerivation rec {
+  name = "xapian-${version}";
+  version = "1.2.21";
 
   src = fetchurl {
-    url = http://oligarchy.co.uk/xapian/1.2.19/xapian-core-1.2.19.tar.xz;
-    sha256 = "11a7lm3w3pchk4rx144nc2p31994spyqmldm18ph86zzi01jcy2a";
+    url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
+    sha256 = "0grd2s6gf8yzqwdaa50g57j9d81mxkrrpkyldm2shgyizdc8gx33";
   };
 
   buildInputs = [ libuuid zlib ];
 
   meta = { 
     description = "Search engine library";
-    homepage = "http://xapian.org";
+    homepage = http://xapian.org/;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.chaoflow ];
   };

From bbb36ea0398400d34d2d5e24bb7978133efbc180 Mon Sep 17 00:00:00 2001
From: Robert Pitts and Trenton Strong <dev+rbxbx+trentonstrong@projector.com>
Date: Tue, 30 Jun 2015 17:16:51 -0400
Subject: [PATCH 1740/2322] Add riemann-tools to nixpkgs

Adds package via bundlerEnv and service for Riemann health.
---
 nixos/modules/misc/ids.nix                    |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../services/monitoring/riemann-tools.nix     |  62 +++
 pkgs/tools/misc/riemann-tools/Gemfile         |   3 +
 pkgs/tools/misc/riemann-tools/Gemfile.lock    | 142 ++++++
 pkgs/tools/misc/riemann-tools/default.nix     |   8 +
 pkgs/tools/misc/riemann-tools/gemset.nix      | 444 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   1 +
 8 files changed, 663 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/riemann-tools.nix
 create mode 100644 pkgs/tools/misc/riemann-tools/Gemfile
 create mode 100644 pkgs/tools/misc/riemann-tools/Gemfile.lock
 create mode 100644 pkgs/tools/misc/riemann-tools/default.nix
 create mode 100644 pkgs/tools/misc/riemann-tools/gemset.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index ce935915abf..c1f55da67a0 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -221,6 +221,7 @@
       skydns = 197;
       ripple-rest = 198;
       nix-serve = 199;
+      riemanntools = 200;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -420,6 +421,7 @@
       #skydns = 197; #unused
       #ripple-rest = 198; #unused
       #nix-serve = 199; #unused
+      riemanntools = 200;
 
       # 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 d33d3ca91d4..bc67b6bdfa6 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -233,6 +233,7 @@
   ./services/monitoring/nagios.nix
   ./services/monitoring/riemann.nix
   ./services/monitoring/riemann-dash.nix
+  ./services/monitoring/riemann-tools.nix
   ./services/monitoring/scollector.nix
   ./services/monitoring/smartd.nix
   ./services/monitoring/statsd.nix
diff --git a/nixos/modules/services/monitoring/riemann-tools.nix b/nixos/modules/services/monitoring/riemann-tools.nix
new file mode 100644
index 00000000000..ce277f09464
--- /dev/null
+++ b/nixos/modules/services/monitoring/riemann-tools.nix
@@ -0,0 +1,62 @@
+{ config, pkgs, lib, ... }:
+
+with pkgs;
+with lib;
+
+let
+
+  cfg = config.services.riemann-tools;
+
+  riemannHost = "${cfg.riemannHost}";
+
+  healthLauncher = writeScriptBin "riemann-health" ''
+    #!/bin/sh
+    exec ${pkgs.riemann-tools}/bin/riemann-health --host ${riemannHost}
+  '';
+
+
+in {
+
+  options = {
+
+    services.riemann-tools = {
+      enableHealth = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable the riemann-health daemon.
+        '';
+      };
+      riemannHost = mkOption {
+        type = types.str;
+        default = "127.0.0.1";
+        description = ''
+          Address of the host riemann node. Defaults to localhost.
+        '';
+      };
+    };
+
+  };
+
+  config = mkIf cfg.enableHealth {
+
+    users.extraGroups.riemanntools.gid = config.ids.gids.riemanntools;
+
+    users.extraUsers.riemanntools = {
+      description = "riemann-tools daemon user";
+      uid = config.ids.uids.riemanntools;
+      group = "riemanntools";
+    };
+
+    systemd.services.riemann-health = {
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        User = "riemanntools";
+        ExecStart = "${healthLauncher}/bin/riemann-health";
+        PermissionsStartOnly = true;
+      };
+    };
+
+  };
+
+}
diff --git a/pkgs/tools/misc/riemann-tools/Gemfile b/pkgs/tools/misc/riemann-tools/Gemfile
new file mode 100644
index 00000000000..3d56cd85c61
--- /dev/null
+++ b/pkgs/tools/misc/riemann-tools/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem "riemann-tools", "0.2.6"
diff --git a/pkgs/tools/misc/riemann-tools/Gemfile.lock b/pkgs/tools/misc/riemann-tools/Gemfile.lock
new file mode 100644
index 00000000000..58c12fd5151
--- /dev/null
+++ b/pkgs/tools/misc/riemann-tools/Gemfile.lock
@@ -0,0 +1,142 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (2.3.1)
+    beefcake (1.1.0)
+    builder (3.2.2)
+    excon (0.45.3)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
+    fog (1.31.0)
+      fog-atmos
+      fog-aws (~> 0.0)
+      fog-brightbox (~> 0.4)
+      fog-core (~> 1.30)
+      fog-ecloud
+      fog-google (>= 0.0.2)
+      fog-json
+      fog-local
+      fog-powerdns (>= 0.1.1)
+      fog-profitbricks
+      fog-radosgw (>= 0.0.2)
+      fog-riakcs
+      fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
+      fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-xml (~> 0.1.1)
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (0.6.0)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.7.2)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto (~> 0.0.2)
+    fog-core (1.31.1)
+      builder
+      excon (~> 0.45)
+      formatador (~> 0.2)
+      mime-types
+      net-scp (~> 1.1)
+      net-ssh (>= 2.1.3)
+    fog-ecloud (0.3.0)
+      fog-core
+      fog-xml
+    fog-google (0.0.6)
+      fog-core
+      fog-json
+      fog-xml
+    fog-json (1.0.2)
+      fog-core (~> 1.0)
+      multi_json (~> 1.10)
+    fog-local (0.2.1)
+      fog-core (~> 1.27)
+    fog-powerdns (0.1.1)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+    fog-profitbricks (0.0.3)
+      fog-core
+      fog-xml
+      nokogiri
+    fog-radosgw (0.0.4)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-riakcs (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-sakuracloud (1.0.1)
+      fog-core
+      fog-json
+    fog-serverlove (0.1.2)
+      fog-core
+      fog-json
+    fog-softlayer (0.4.7)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.1)
+      fog-core
+      fog-json
+    fog-terremark (0.1.0)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.1.0)
+      fission
+      fog-core
+    fog-voxel (0.1.0)
+      fog-core
+      fog-xml
+    fog-xml (0.1.2)
+      fog-core
+      nokogiri (~> 1.5, >= 1.5.11)
+    formatador (0.2.5)
+    inflecto (0.0.2)
+    ipaddress (0.8.0)
+    mime-types (2.6.1)
+    mini_portile (0.6.2)
+    mtrc (0.0.4)
+    multi_json (1.11.1)
+    multipart-post (2.0.0)
+    munin-ruby (0.2.5)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    riemann-client (0.2.5)
+      beefcake (>= 0.3.5)
+      mtrc (>= 0.0.4)
+      trollop (>= 1.16.2)
+    riemann-tools (0.2.6)
+      faraday (>= 0.8.5)
+      fog (>= 1.4.0)
+      munin-ruby (>= 0.2.1)
+      nokogiri (>= 1.5.6)
+      riemann-client (>= 0.2.2)
+      trollop (>= 1.16.2)
+      yajl-ruby (>= 1.1.0)
+    trollop (2.1.2)
+    yajl-ruby (1.2.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  riemann-tools (= 0.2.6)
+
+BUNDLED WITH
+   1.10.2
diff --git a/pkgs/tools/misc/riemann-tools/default.nix b/pkgs/tools/misc/riemann-tools/default.nix
new file mode 100644
index 00000000000..c518bc66984
--- /dev/null
+++ b/pkgs/tools/misc/riemann-tools/default.nix
@@ -0,0 +1,8 @@
+{ bundlerEnv }:
+
+bundlerEnv {
+  name = "riemann-tools-0.2.6";
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+}
diff --git a/pkgs/tools/misc/riemann-tools/gemset.nix b/pkgs/tools/misc/riemann-tools/gemset.nix
new file mode 100644
index 00000000000..07818fc76bc
--- /dev/null
+++ b/pkgs/tools/misc/riemann-tools/gemset.nix
@@ -0,0 +1,444 @@
+{
+  "CFPropertyList" = {
+    version = "2.3.1";
+    source = {
+      type = "gem";
+      sha256 = "1wnk3gxnhfafbhgp0ic7qhzlx3lhv04v8nws2s31ii5s8135hs6k";
+    };
+  };
+  "beefcake" = {
+    version = "1.1.0";
+    source = {
+      type = "gem";
+      sha256 = "009gzy9jp81lsnxnwisinhc58cd0qljdiipj2701lzzrha5d826z";
+    };
+  };
+  "builder" = {
+    version = "3.2.2";
+    source = {
+      type = "gem";
+      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
+    };
+  };
+  "excon" = {
+    version = "0.45.3";
+    source = {
+      type = "gem";
+      sha256 = "183kfxfjjlc97w4rxkrxjw3kis4lxm65vppmvl4bkblvlw4nq94j";
+    };
+  };
+  "faraday" = {
+    version = "0.9.1";
+    source = {
+      type = "gem";
+      sha256 = "1h33znnfzxpscgpq28i9fcqijd61h61zgs3gabpdgqfa1043axsn";
+    };
+    dependencies = [
+      "multipart-post"
+    ];
+  };
+  "fission" = {
+    version = "0.5.0";
+    source = {
+      type = "gem";
+      sha256 = "09pmp1j1rr8r3pcmbn2na2ls7s1j9ijbxj99xi3a8r6v5xhjdjzh";
+    };
+    dependencies = [
+      "CFPropertyList"
+    ];
+  };
+  "fog" = {
+    version = "1.31.0";
+    source = {
+      type = "gem";
+      sha256 = "0xr8xyrrkljm2hxi420x4qr5v6wqcj8d63v0qy1g6rkb3b1yhl9i";
+    };
+    dependencies = [
+      "fog-atmos"
+      "fog-aws"
+      "fog-brightbox"
+      "fog-core"
+      "fog-ecloud"
+      "fog-google"
+      "fog-json"
+      "fog-local"
+      "fog-powerdns"
+      "fog-profitbricks"
+      "fog-radosgw"
+      "fog-riakcs"
+      "fog-sakuracloud"
+      "fog-serverlove"
+      "fog-softlayer"
+      "fog-storm_on_demand"
+      "fog-terremark"
+      "fog-vmfusion"
+      "fog-voxel"
+      "fog-xml"
+      "ipaddress"
+      "nokogiri"
+    ];
+  };
+  "fog-atmos" = {
+    version = "0.1.0";
+    source = {
+      type = "gem";
+      sha256 = "1aaxgnw9zy96gsh4h73kszypc32sx497s6bslvhfqh32q9d1y8c9";
+    };
+    dependencies = [
+      "fog-core"
+      "fog-xml"
+    ];
+  };
+  "fog-aws" = {
+    version = "0.6.0";
+    source = {
+      type = "gem";
+      sha256 = "1m79s5ha6qq60pxqqxr9qs9fg8fwaz79sfxckidyhxdydcsjwx6z";
+    };
+    dependencies = [
+      "fog-core"
+      "fog-json"
+      "fog-xml"
+      "ipaddress"
+    ];
+  };
+  "fog-brightbox" = {
+    version = "0.7.2";
+    source = {
+      type = "gem";
+      sha256 = "0636sqaf2w1rh4i2hxfgs24374l4ai8dgch8a7nycqhvjk2dm0aq";
+    };
+    dependencies = [
+      "fog-core"
+      "fog-json"
+      "inflecto"
+    ];
+  };
+  "fog-core" = {
+    version = "1.31.1";
+    source = {
+      type = "gem";
+      sha256 = "1bcsy4cq7vyjmdf3h2v7q6hfj64v6phn0rfvwgj5wfza7yaxnhk7";
+    };
+    dependencies = [
+      "builder"
+      "excon"
+      "formatador"
+      "mime-types"
+      "net-scp"
+      "net-ssh"
+    ];
+  };
+  "fog-ecloud" = {
+    version = "0.3.0";
+    source = {
+      type = "gem";
+      sha256 = "18rb4qjad9xwwqvvpj8r2h0hi9svy71pm4d3fc28cdcnfarmdi06";
+    };
+    dependencies = [
+      "fog-core"
+      "fog-xml"
+    ];
+  };
+  "fog-google" = {
+    version = "0.0.6";
+    source = {
+      type = "gem";
+      sha256 = "1g3ykk239nxpdsr5anhprkp8vzk106gi4q6aqjh4z8q4bii0dflm";
+    };
+    dependencies = [
+      "fog-core"
+      "fog-json"
+      "fog-xml"
+    ];
+  };
+  "fog-json" = {
+    version = "1.0.2";
+    source = {
+      type = "gem";
+      sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r";
+    };
+    dependencies = [
+      "fog-core"
+      "multi_json"
+    ];
+  };
+  "fog-local" = {
+    version = "0.2.1";
+    source = {
+      type = "gem";
+      sha256 = "0i5hxwzmc2ag3z9nlligsaf679kp2pz39cd8n2s9cmxaamnlh2s3";
+    };
+    dependencies = [
+      "fog-core"
+    ];
+  };
+  "fog-powerdns" = {
+    version = "0.1.1";
+    source = {
+      type = "gem";
+      sha256 = "08zavzwfkk344gz83phz4sy9nsjznsdjsmn1ifp6ja17bvydlhh7";
+    };
+    dependencies = [
+      "fog-core"
+      "fog-json"
+      "fog-xml"
+    ];
+  };
+  "fog-profitbricks" = {
+    version = "0.0.3";
+    source = {
+      type = "gem";
+      sha256 = "01a3ylfkjkyagf4b4xg9x2v20pzapr3ivn9ydd92v402bjsm1nmr";
+    };
+    dependencies = [
+      "fog-core"
+      "fog-xml"
+      "nokogiri"
+    ];
+  };
+  "fog-radosgw" = {
+    version = "0.0.4";
+    source = {
+      type = "gem";
+      sha256 = "1pxbvmr4dsqx4x2klwnciyhki4r5ryr9y0hi6xmm3n6fdv4ii7k3";
+    };
+    dependencies = [
+      "fog-core"
+      "fog-json"
+      "fog-xml"
+    ];
+  };
+  "fog-riakcs" = {
+    version = "0.1.0";
+    source = {
+      type = "gem";
+      sha256 = "1nbxc4dky3agfwrmgm1aqmi59p6vnvfnfbhhg7xpg4c2cf41whxm";
+    };
+    dependencies = [
+      "fog-core"
+      "fog-json"
+      "fog-xml"
+    ];
+  };
+  "fog-sakuracloud" = {
+    version = "1.0.1";
+    source = {
+      type = "gem";
+      sha256 = "1s16b48kh7y03hjv74ccmlfwhqqq7j7m4k6cywrgbyip8n3258n8";
+    };
+    dependencies = [
+      "fog-core"
+      "fog-json"
+    ];
+  };
+  "fog-serverlove" = {
+    version = "0.1.2";
+    source = {
+      type = "gem";
+      sha256 = "0hxgmwzygrw25rbsy05i6nzsyr0xl7xj5j2sjpkb9n9wli5sagci";
+    };
+    dependencies = [
+      "fog-core"
+      "fog-json"
+    ];
+  };
+  "fog-softlayer" = {
+    version = "0.4.7";
+    source = {
+      type = "gem";
+      sha256 = "0fgfbhqnyp8ywymvflflhvbns54d1432x57pgpnfy8k1cxvhv9b8";
+    };
+    dependencies = [
+      "fog-core"
+      "fog-json"
+    ];
+  };
+  "fog-storm_on_demand" = {
+    version = "0.1.1";
+    source = {
+      type = "gem";
+      sha256 = "0fif1x8ci095b2yyilf65n7x6iyvn448azrsnmwsdkriy8vxxv3y";
+    };
+    dependencies = [
+      "fog-core"
+      "fog-json"
+    ];
+  };
+  "fog-terremark" = {
+    version = "0.1.0";
+    source = {
+      type = "gem";
+      sha256 = "01lfkh9jppj0iknlklmwyb7ym3bfhkq58m3absb6rf5a5mcwi3lf";
+    };
+    dependencies = [
+      "fog-core"
+      "fog-xml"
+    ];
+  };
+  "fog-vmfusion" = {
+    version = "0.1.0";
+    source = {
+      type = "gem";
+      sha256 = "0g0l0k9ylxk1h9pzqr6h2ba98fl47lpp3j19lqv4jxw0iw1rqxn4";
+    };
+    dependencies = [
+      "fission"
+      "fog-core"
+    ];
+  };
+  "fog-voxel" = {
+    version = "0.1.0";
+    source = {
+      type = "gem";
+      sha256 = "10skdnj59yf4jpvq769njjrvh2l0wzaa7liva8n78qq003mvmfgx";
+    };
+    dependencies = [
+      "fog-core"
+      "fog-xml"
+    ];
+  };
+  "fog-xml" = {
+    version = "0.1.2";
+    source = {
+      type = "gem";
+      sha256 = "1576sbzza47z48p0k9h1wg3rhgcvcvdd1dfz3xx1cgahwr564fqa";
+    };
+    dependencies = [
+      "fog-core"
+      "nokogiri"
+    ];
+  };
+  "formatador" = {
+    version = "0.2.5";
+    source = {
+      type = "gem";
+      sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0";
+    };
+  };
+  "inflecto" = {
+    version = "0.0.2";
+    source = {
+      type = "gem";
+      sha256 = "085l5axmvqw59mw5jg454a3m3gr67ckq9405a075isdsn7bm3sp4";
+    };
+  };
+  "ipaddress" = {
+    version = "0.8.0";
+    source = {
+      type = "gem";
+      sha256 = "0cwy4pyd9nl2y2apazp3hvi12gccj5a3ify8mi8k3knvxi5wk2ir";
+    };
+  };
+  "mime-types" = {
+    version = "2.6.1";
+    source = {
+      type = "gem";
+      sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv";
+    };
+  };
+  "mini_portile" = {
+    version = "0.6.2";
+    source = {
+      type = "gem";
+      sha256 = "0h3xinmacscrnkczq44s6pnhrp4nqma7k056x5wv5xixvf2wsq2w";
+    };
+  };
+  "mtrc" = {
+    version = "0.0.4";
+    source = {
+      type = "gem";
+      sha256 = "0xj2pv4cpn0ad1xw38sinsxfzwhgqs6ff18hw0cwz5xmsf3zqmiz";
+    };
+  };
+  "multi_json" = {
+    version = "1.11.1";
+    source = {
+      type = "gem";
+      sha256 = "0lrmadw2scqwz7nw3j5pfdnmzqimlbaxlxi37xsydrpbbr78qf6g";
+    };
+  };
+  "multipart-post" = {
+    version = "2.0.0";
+    source = {
+      type = "gem";
+      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+    };
+  };
+  "munin-ruby" = {
+    version = "0.2.5";
+    source = {
+      type = "gem";
+      sha256 = "0378jyf0hdbfs2vvk7v8k7hqilzi1rfkpn271dyrqqal7g2lnjl2";
+    };
+  };
+  "net-scp" = {
+    version = "1.2.1";
+    source = {
+      type = "gem";
+      sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
+    };
+    dependencies = [
+      "net-ssh"
+    ];
+  };
+  "net-ssh" = {
+    version = "2.9.2";
+    source = {
+      type = "gem";
+      sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r";
+    };
+  };
+  "nokogiri" = {
+    version = "1.6.6.2";
+    source = {
+      type = "gem";
+      sha256 = "1j4qv32qjh67dcrc1yy1h8sqjnny8siyy4s44awla8d6jk361h30";
+    };
+    dependencies = [
+      "mini_portile"
+    ];
+  };
+  "riemann-client" = {
+    version = "0.2.5";
+    source = {
+      type = "gem";
+      sha256 = "1myhyh31f290jm1wlhhjvf331n5l8qdm7axkxyacdgjsfg4szsjc";
+    };
+    dependencies = [
+      "beefcake"
+      "mtrc"
+      "trollop"
+    ];
+  };
+  "riemann-tools" = {
+    version = "0.2.6";
+    source = {
+      type = "gem";
+      sha256 = "0qjm7p55h70l5bs876hhvz3isr204663f97py9g0ajxz2z8jkzpi";
+    };
+    dependencies = [
+      "faraday"
+      "fog"
+      "munin-ruby"
+      "nokogiri"
+      "riemann-client"
+      "trollop"
+      "yajl-ruby"
+    ];
+  };
+  "trollop" = {
+    version = "2.1.2";
+    source = {
+      type = "gem";
+      sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8";
+    };
+  };
+  "yajl-ruby" = {
+    version = "1.2.1";
+    source = {
+      type = "gem";
+      sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf";
+    };
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e34b1e6e05..c7ca6e24072 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2737,6 +2737,7 @@ let
   rhash = callPackage ../tools/security/rhash { };
 
   riemann_c_client = callPackage ../tools/misc/riemann-c-client { };
+  riemann-tools = callPackage ../tools/misc/riemann-tools { };
 
   ripmime = callPackage ../tools/networking/ripmime {};
 

From 4d3da76c280af2994b87976e299cb400c275bfd2 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 30 Jun 2015 23:04:07 +0200
Subject: [PATCH 1741/2322] recoll: 1.18.1 -> 1.20.6

---
 pkgs/applications/search/recoll/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 4274f73c7e5..0eb4632a4c0 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -6,12 +6,12 @@
 assert stdenv.system != "powerpc-linux";
 
 stdenv.mkDerivation rec {
-  ver = "1.18.1";
+  ver = "1.20.6";
   name = "recoll-${ver}";
 
   src = fetchurl {
     url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz";
-    sha256 = "0cyrkx5aza3485avb2kxc6cbsqqrb32l1kq8ravr9d828331v84f";
+    sha256 = "0ympk2w21cxfvysyx96p0npsa54csfc84cicpi8nsj1qp824zxwq";
   };
 
   configureFlags = [ "--with-inotify" ];
@@ -47,15 +47,15 @@ stdenv.mkDerivation rec {
     #substituteInPlace  $f --replace untex         ${untex}/bin/untex
     #substituteInPlace  $f --replace wpd2html      ${wpd2html}/bin/wpd2html
 
-  meta = {
-    description = "finds keywords inside documents as well as file names";
+  meta = with stdenv.lib; {
+    description = "A full-text search tool";
     longDescription = ''
       Recoll is an Xapian frontend that can search through files, archive
       members, email attachments. 
     '';
     homepage = http://www.lesbonscomptes.com/recoll/;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ jcumming ];
   };
 }

From 8712de495fda190720d9c6a65405071142080384 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 30 Jun 2015 10:01:45 +0200
Subject: [PATCH 1742/2322] netsniff-ng: 0.5.9-18-g9977ec6 -> 0.5.9-21-g8c75168

Relevant changes:
- netsniff-ng: nlmsg: Define NTF_* constants if not provided by kernel
  headers
---
 pkgs/tools/networking/netsniff-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index cc9b3554515..feeb505b4c5 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -2,7 +2,7 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-let version = "0.5.9-18-g9977ec6"; in
+let version = "0.5.9-21-g8c75168"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "9977ec6012452bfc5053dbc90aed53f55064c86b";
-    sha256 = "1ww0pm3v9wphjzfanswx2przps33v26q38alxljigj5cigh8ffms";
+    rev = "8c75168ed5005f70955dd4ade93dec6abf481852";
+    sha256 = "10awwwmpm555wl1z07pz20cq1lsy37r36m0aamck9ri5vyq6fdzw";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

From 5429e06f58b9a445088b1b89c84de1c6fb2d774a Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 30 Jun 2015 16:11:04 -0700
Subject: [PATCH 1743/2322] move impure deps to a separate file

---
 pkgs/os-specific/darwin/apple-sdk/default.nix |  2 +-
 .../darwin/apple-sdk/impure-deps.nix          | 48 +++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/darwin/apple-sdk/impure-deps.nix

diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 520158b30ad..cc1032fc03d 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -92,7 +92,7 @@ let
     propagatedBuildInputs = deps;
 
     # Not going to bother being more precise than this...
-    __propagatedImpureHostDeps = [ "/System/Library/Frameworks/${name}.framework/Versions" ];
+    __propagatedImpureHostDeps = (import ./impure-deps.nix).${name};
 
     meta = with stdenv.lib; {
       description = "Apple SDK framework ${name}";
diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
new file mode 100644
index 00000000000..77ac47bed4f
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
@@ -0,0 +1,48 @@
+{
+  CoreFoundation = [
+    "/System/Library/Frameworks/CoreFoundation.framework"
+  ];
+  CFNetwork = [
+    "/System/Library/Frameworks/CFNetwork.framework"
+  ];
+  IOKit = [
+    "/System/Library/Frameworks/IOKit.framework"
+  ];
+  DiskArbitration = [
+    "/System/Library/Frameworks/DiskArbitration.framework"
+  ];
+  Security = [
+    "/System/Library/Frameworks/Security.framework"
+  ];
+  CoreServices = [
+    "/System/Library/Frameworks/CoreServices.framework"
+  ];
+  IOSurface = [
+    "/System/Library/Frameworks/IOSurface.framework"
+  ];
+  CoreGraphics = [
+    "/System/Library/Frameworks/CoreGraphics.framework"
+  ];
+  CoreText = [
+    "/System/Library/Frameworks/CoreText.framework"
+  ];
+  ImageIO = [
+    "/System/Library/Frameworks/ImageIO.framework"
+  ];
+  ApplicationServices = [
+    "/System/Library/Frameworks/ApplicationServices.framework"
+  ];
+  OpenGL = [];
+  CoreVideo = [];
+  QuartzCore = [];
+  PCSC = [
+    "/System/Library/Frameworks/PCSC.framework"
+  ];
+  AppKit = [
+    "/System/Library/Frameworks/AppKit.framework"
+  ];
+  Foundation = [
+    "/System/Library/Frameworks/Foundation.framework"
+    "/usr/lib/libextension.dylib"
+  ];
+}

From 013f88ac7e4c679868bfac5c6d9b896c9b13fd99 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 1 Jul 2015 02:22:27 +0200
Subject: [PATCH 1744/2322] nixos: gnome-keyring: fix module description

---
 nixos/modules/services/desktops/gnome3/gnome-keyring.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
index 566c8a50e26..a8f1bcc28fb 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
@@ -21,7 +21,7 @@ in
         description = ''
           Whether to enable GNOME Keyring daemon, a service designed to
           take care of the user's security credentials,
-          such as user names and passwordsa search engine.
+          such as user names and passwords.
         '';
       };
 

From 857efa12fb54a05674406fafcdc43b0576d17eb2 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 30 Jun 2015 17:34:13 -0700
Subject: [PATCH 1745/2322] make vim frameworks-compliant

---
 pkgs/applications/editors/vim/default.nix     |   4 +-
 pkgs/applications/editors/vim/impure-deps.nix | 129 ------------------
 .../darwin/apple-sdk/frameworks.nix           |  18 +--
 .../darwin/apple-sdk/impure-deps.nix          | 115 +++++++++++++++-
 4 files changed, 122 insertions(+), 144 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/impure-deps.nix

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 4d1840ab895..385611a167a 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -17,11 +17,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   buildInputs = [ ncurses pkgconfig ]
-    ++ stdenv.lib.optional stdenv.isDarwin [ CoreData CoreServices Cocoa Foundation libobjc ];
+    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreData CoreServices Cocoa Foundation libobjc ];
   nativeBuildInputs = [ gettext ];
 
-  __impureHostDeps = import ./impure-deps.nix;
-
   configureFlags = [
     "--enable-multibyte"
     "--enable-nls"
diff --git a/pkgs/applications/editors/vim/impure-deps.nix b/pkgs/applications/editors/vim/impure-deps.nix
deleted file mode 100644
index d6dc3a08627..00000000000
--- a/pkgs/applications/editors/vim/impure-deps.nix
+++ /dev/null
@@ -1,129 +0,0 @@
-[
-  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Accelerate"
-  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vImage.framework/Versions/A/vImage"
-  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib"
-  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib"
-  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLinearAlgebra.dylib"
-  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvDSP.dylib"
-  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvMisc.dylib"
-  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/vecLib"
-  "/System/Library/Frameworks/AppKit.framework/Versions/C/AppKit"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontParser.dylib"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontRegistry.dylib"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSync.framework/Versions/A/ColorSync"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis"
-  "/System/Library/Frameworks/AudioToolbox.framework/Versions/A/AudioToolbox"
-  "/System/Library/Frameworks/AudioUnit.framework/Versions/A/AudioUnit"
-  "/System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork"
-  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/CarbonSound.framework/Versions/A/CarbonSound"
-  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox"
-  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Ink.framework/Versions/A/Ink"
-  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition"
-  "/System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa"
-  "/System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio"
-  "/System/Library/Frameworks/CoreBluetooth.framework/Versions/A/CoreBluetooth"
-  "/System/Library/Frameworks/CoreData.framework/Versions/A/CoreData"
-  "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"
-  "/System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit"
-  "/System/Library/Frameworks/CoreText.framework/Versions/A/CoreText"
-  "/System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo"
-  "/System/Library/Frameworks/CoreWLAN.framework/Versions/A/CoreWLAN"
-  "/System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration"
-  "/System/Library/Frameworks/Foundation.framework/Versions/C/Foundation"
-  "/System/Library/Frameworks/GSS.framework/Versions/A/GSS"
-  "/System/Library/Frameworks/IOBluetooth.framework/Versions/A/IOBluetooth"
-  "/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit"
-  "/System/Library/Frameworks/IOSurface.framework/Versions/A/IOSurface"
-  "/System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO"
-  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libGIF.dylib"
-  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJP2.dylib"
-  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib"
-  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib"
-  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libRadiance.dylib"
-  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib"
-  "/System/Library/Frameworks/Kerberos.framework/Versions/A/Kerberos"
-  "/System/Library/Frameworks/NetFS.framework/Versions/A/NetFS"
-  "/System/Library/Frameworks/OpenCL.framework/Versions/A/OpenCL"
-  "/System/Library/Frameworks/OpenDirectory.framework/Versions/A/Frameworks/CFOpenDirectory.framework/Versions/A/CFOpenDirectory"
-  "/System/Library/Frameworks/OpenDirectory.framework/Versions/A/OpenDirectory"
-  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCVMSPluginSupport.dylib"
-  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCoreVMClient.dylib"
-  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGFXShared.dylib"
-  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
-  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLImage.dylib"
-  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib"
-  "/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL"
-  "/System/Library/Frameworks/QuartzCore.framework/Versions/A/Frameworks/CoreImage.framework/Versions/A/CoreImage"
-  "/System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore"
-  "/System/Library/Frameworks/Security.framework/Versions/A/Security"
-  "/System/Library/Frameworks/SecurityFoundation.framework/Versions/A/SecurityFoundation"
-  "/System/Library/Frameworks/ServiceManagement.framework/Versions/A/ServiceManagement"
-  "/System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration"
-  "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Apple80211"
-  "/System/Library/PrivateFrameworks/AppleJPEG.framework/Versions/A/AppleJPEG"
-  "/System/Library/PrivateFrameworks/AppleVPA.framework/Versions/A/AppleVPA"
-  "/System/Library/PrivateFrameworks/Backup.framework/Versions/A/Backup"
-  "/System/Library/PrivateFrameworks/ChunkingLibrary.framework/Versions/A/ChunkingLibrary"
-  "/System/Library/PrivateFrameworks/CommonAuth.framework/Versions/A/CommonAuth"
-  "/System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/CoreSymbolication"
-  "/System/Library/PrivateFrameworks/CoreUI.framework/Versions/A/CoreUI"
-  "/System/Library/PrivateFrameworks/CoreWiFi.framework/Versions/A/CoreWiFi"
-  "/System/Library/PrivateFrameworks/CrashReporterSupport.framework/Versions/A/CrashReporterSupport"
-  "/System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore"
-  "/System/Library/PrivateFrameworks/DebugSymbols.framework/Versions/A/DebugSymbols"
-  "/System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv"
-  "/System/Library/PrivateFrameworks/FaceCore.framework/Versions/A/FaceCore"
-  "/System/Library/PrivateFrameworks/GenerationalStorage.framework/Versions/A/GenerationalStorage"
-  "/System/Library/PrivateFrameworks/Heimdal.framework/Versions/A/Heimdal"
-  "/System/Library/PrivateFrameworks/IconServices.framework/Versions/A/IconServices"
-  "/System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling"
-  "/System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport"
-  "/System/Library/PrivateFrameworks/NetAuth.framework/Versions/A/NetAuth"
-  "/System/Library/PrivateFrameworks/PerformanceAnalysis.framework/Versions/A/PerformanceAnalysis"
-  "/System/Library/PrivateFrameworks/RemoteViewServices.framework/Versions/A/RemoteViewServices"
-  "/System/Library/PrivateFrameworks/Sharing.framework/Versions/A/Sharing"
-  "/System/Library/PrivateFrameworks/SpeechRecognitionCore.framework/Versions/A/SpeechRecognitionCore"
-  "/System/Library/PrivateFrameworks/Symbolication.framework/Versions/A/Symbolication"
-  "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC"
-  "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation"
-  "/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity"
-  "/System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport"
-  "/usr/lib/libCRFSuite.dylib"
-  "/usr/lib/libOpenScriptingUtil.dylib"
-  "/usr/lib/libarchive.2.dylib"
-  "/usr/lib/libbsm.0.dylib"
-  "/usr/lib/libbz2.1.0.dylib"
-  "/usr/lib/libc++.1.dylib"
-  "/usr/lib/libc++abi.dylib"
-  "/usr/lib/libcmph.dylib"
-  "/usr/lib/libcups.2.dylib"
-  "/usr/lib/libextension.dylib"
-  "/usr/lib/libheimdal-asn1.dylib"
-  "/usr/lib/libiconv.2.dylib"
-  "/usr/lib/libicucore.A.dylib"
-  "/usr/lib/liblangid.dylib"
-  "/usr/lib/liblzma.5.dylib"
-  "/usr/lib/libmecabra.dylib"
-  "/usr/lib/libpam.2.dylib"
-  "/usr/lib/libresolv.9.dylib"
-  "/usr/lib/libsqlite3.dylib"
-  "/usr/lib/libxar.1.dylib"
-  "/usr/lib/libxml2.2.dylib"
-  "/usr/lib/libxslt.1.dylib"
-  "/usr/lib/libz.1.dylib"
-]
diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
index 60ed091a1e4..bedf39764a9 100644
--- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
@@ -10,7 +10,7 @@ with frameworks; with libs; {
   AVKit                   = [];
   Accounts                = [];
   AddressBook             = [ Carbon CoreFoundation ];
-  AppKit                  = [ QuartzCore ];
+  AppKit                  = [ AudioToolbox QuartzCore ];
   AppKitScripting         = [];
   AppleScriptKit          = [];
   AppleScriptObjC         = [];
@@ -27,7 +27,7 @@ with frameworks; with libs; {
   CoreAudioKit            = [ AudioUnit ];
   CoreData                = [];
   CoreFoundation          = [];
-  CoreGraphics            = [ CoreFoundation IOKit IOSurface ];
+  CoreGraphics            = [ Accelerate CoreFoundation IOKit IOSurface ];
   CoreLocation            = [];
   CoreMIDI                = [ CoreFoundation ];
   CoreMIDIServer          = [];
@@ -35,7 +35,7 @@ with frameworks; with libs; {
   CoreMediaIO             = [ CoreFoundation CoreMedia ];
   CoreText                = [ CoreFoundation CoreGraphics ];
   CoreVideo               = [ ApplicationServices CoreFoundation CoreGraphics IOSurface OpenGL ];
-  CoreWLAN                = [];
+  CoreWLAN                = [ SecurityFoundation ];
   DVComponentGlue         = [ CoreServices QuickTime ];
   DVDPlayback             = [];
   DirectoryService        = [ CoreFoundation ];
@@ -47,7 +47,7 @@ with frameworks; with libs; {
   ExceptionHandling       = [];
   FWAUserLib              = [];
   ForceFeedback           = [ CoreFoundation IOKit ];
-  Foundation              = [ CoreFoundation Security ApplicationServices AppKit ];
+  Foundation              = [ CoreFoundation Security ApplicationServices AppKit SystemConfiguration ];
   GLKit                   = [ CoreFoundation ];
   GLUT                    = [ GL OpenGL ];
   GSS                     = [];
@@ -75,7 +75,7 @@ with frameworks; with libs; {
   NetFS                   = [ CoreFoundation ];
   OSAKit                  = [ Carbon ];
   OpenAL                  = [];
-  OpenCL                  = [ CL IOSurface OpenGL ];
+  OpenCL                  = [ IOSurface OpenGL ];
   OpenGL                  = [];
   PCSC                    = [];
   PreferencePanes         = [];
@@ -107,13 +107,13 @@ with frameworks; with libs; {
   WebKit                  = [ ApplicationServices Carbon JavaScriptCore OpenGL X11 ];
 
   # Umbrellas
-  Accelerate          = [ CoreGraphics ];
+  Accelerate          = [ CoreWLAN IOBluetooth ];
   ApplicationServices = [ CoreFoundation CoreServices CoreText ImageIO ];
   Carbon              = [ ApplicationServices CoreFoundation CoreServices IOKit Security ];
-  CoreServices        = [ CFNetwork CoreFoundation DiskArbitration Security ];
+  CoreServices        = [ CFNetwork CoreFoundation DiskArbitration Security NetFS OpenDirectory ServiceManagement ];
   IOBluetooth         = [ IOKit ];
   JavaVM              = [];
-  OpenDirectory       = [ CoreFoundation Foundation ];
+  OpenDirectory       = [];
   Quartz              = [ QuickLook ];
-  QuartzCore          = [ ApplicationServices CoreFoundation CoreVideo ];
+  QuartzCore          = [ ApplicationServices CoreFoundation CoreVideo OpenCL ];
 }
diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
index 77ac47bed4f..8a9860c9c77 100644
--- a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
@@ -32,17 +32,126 @@
   ApplicationServices = [
     "/System/Library/Frameworks/ApplicationServices.framework"
   ];
-  OpenGL = [];
-  CoreVideo = [];
-  QuartzCore = [];
+  OpenGL = [
+    "/System/Library/Frameworks/OpenGL.framework"
+  ];
+  CoreVideo = [
+    "/System/Library/Frameworks/CoreVideo.framework"
+  ];
+  QuartzCore = [
+    "/System/Library/Frameworks/QuartzCore.framework"
+  ];
   PCSC = [
     "/System/Library/Frameworks/PCSC.framework"
   ];
   AppKit = [
     "/System/Library/Frameworks/AppKit.framework"
+    "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Apple80211"
+    "/System/Library/PrivateFrameworks/AppleJPEG.framework/Versions/A/AppleJPEG"
+    "/System/Library/PrivateFrameworks/AppleVPA.framework/Versions/A/AppleVPA"
+    "/System/Library/PrivateFrameworks/Backup.framework/Versions/A/Backup"
+    "/System/Library/PrivateFrameworks/ChunkingLibrary.framework/Versions/A/ChunkingLibrary"
+    "/System/Library/PrivateFrameworks/CommonAuth.framework/Versions/A/CommonAuth"
+    "/System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/CoreSymbolication"
+    "/System/Library/PrivateFrameworks/CoreUI.framework/Versions/A/CoreUI"
+    "/System/Library/PrivateFrameworks/CoreWiFi.framework/Versions/A/CoreWiFi"
+    "/System/Library/PrivateFrameworks/CrashReporterSupport.framework/Versions/A/CrashReporterSupport"
+    "/System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore"
+    "/System/Library/PrivateFrameworks/DebugSymbols.framework/Versions/A/DebugSymbols"
+    "/System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv"
+    "/System/Library/PrivateFrameworks/FaceCore.framework/Versions/A/FaceCore"
+    "/System/Library/PrivateFrameworks/GenerationalStorage.framework/Versions/A/GenerationalStorage"
+    "/System/Library/PrivateFrameworks/Heimdal.framework/Versions/A/Heimdal"
+    "/System/Library/PrivateFrameworks/IconServices.framework/Versions/A/IconServices"
+    "/System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling"
+    "/System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport"
+    "/System/Library/PrivateFrameworks/NetAuth.framework/Versions/A/NetAuth"
+    "/System/Library/PrivateFrameworks/PerformanceAnalysis.framework/Versions/A/PerformanceAnalysis"
+    "/System/Library/PrivateFrameworks/RemoteViewServices.framework/Versions/A/RemoteViewServices"
+    "/System/Library/PrivateFrameworks/Sharing.framework/Versions/A/Sharing"
+    "/System/Library/PrivateFrameworks/SpeechRecognitionCore.framework/Versions/A/SpeechRecognitionCore"
+    "/System/Library/PrivateFrameworks/Symbolication.framework/Versions/A/Symbolication"
+    "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC"
+    "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation"
+    "/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity"
+    "/System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport"
+    "/usr/lib/libCRFSuite.dylib"
+    "/usr/lib/libOpenScriptingUtil.dylib"
+    "/usr/lib/libarchive.2.dylib"
+    "/usr/lib/libbsm.0.dylib"
+    "/usr/lib/libbz2.1.0.dylib"
+    "/usr/lib/libc++.1.dylib"
+    "/usr/lib/libc++abi.dylib"
+    "/usr/lib/libcmph.dylib"
+    "/usr/lib/libcups.2.dylib"
+    "/usr/lib/libextension.dylib"
+    "/usr/lib/libheimdal-asn1.dylib"
+    "/usr/lib/libiconv.2.dylib"
+    "/usr/lib/libicucore.A.dylib"
+    "/usr/lib/liblangid.dylib"
+    "/usr/lib/liblzma.5.dylib"
+    "/usr/lib/libmecabra.dylib"
+    "/usr/lib/libpam.2.dylib"
+    "/usr/lib/libresolv.9.dylib"
+    "/usr/lib/libsqlite3.dylib"
+    "/usr/lib/libxar.1.dylib"
+    "/usr/lib/libxml2.2.dylib"
+    "/usr/lib/libxslt.1.dylib"
+    "/usr/lib/libz.1.dylib"
   ];
   Foundation = [
     "/System/Library/Frameworks/Foundation.framework"
     "/usr/lib/libextension.dylib"
   ];
+  CoreData = [
+    "/System/Library/Frameworks/CoreData.framework"
+  ];
+  Cocoa = [
+    "/System/Library/Frameworks/Cocoa.framework"
+    "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation"
+    "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A"
+  ];
+  Carbon = [
+    "/System/Library/Frameworks/Carbon.framework"
+  ];
+  CoreAudio = [
+    "/System/Library/Frameworks/CoreAudio.framework"
+  ];
+  AudioUnit = [
+    "/System/Library/Frameworks/AudioUnit.framework"
+  ];
+  CoreMIDI = [
+    "/System/Library/Frameworks/CoreMIDI.framework"
+  ];
+  AudioToolbox = [
+    "/System/Library/Frameworks/AudioToolbox.framework"
+  ];
+  SystemConfiguration = [
+    "/System/Library/Frameworks/SystemConfiguration.framework"
+  ];
+  NetFS = [
+    "/System/Library/Frameworks/NetFS.framework"
+  ];
+  Accelerate = [
+    "/System/Library/Frameworks/Accelerate.framework"
+  ];
+  OpenDirectory = [
+    "/System/Library/Frameworks/OpenDirectory.framework"
+  ];
+  ServiceManagement = [
+    "/System/Library/Frameworks/ServiceManagement.framework"
+  ];
+  OpenCL = [
+    "/System/Library/Frameworks/OpenCL.framework"
+  ];
+  CoreWLAN = [
+    "/System/Library/Frameworks/CoreWLAN.framework"
+  ];
+  IOBluetooth = [
+    "/System/Library/Frameworks/IOBluetooth.framework"
+    "/System/Library/Frameworks/CoreBluetooth.framework/Versions/A/CoreBluetooth"
+  ];
+  SecurityFoundation = [
+    "/System/Library/Frameworks/SecurityFoundation.framework"
+  ];
 }

From d612a9e132bbdbb50924569dd97ef3fa8bcb04c9 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Tue, 30 Jun 2015 23:53:09 -0400
Subject: [PATCH 1746/2322] meld: fix for hicolor theme breakage

This breakage was cause by the package outputing its own
version of index.cache to `share/icons/hicolor`.

Used the `hicolor_icon_theme` hook to perform automated cleanup.
---
 pkgs/applications/version-management/meld/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index a892d7decc0..2a69d140669 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, itstool, buildPythonPackage, python27, intltool, makeWrapper
 , libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo
+, hicolor_icon_theme
 }:
 
 
@@ -20,6 +21,7 @@ buildPythonPackage rec {
   buildInputs = [
     python27 intltool makeWrapper itstool libxml2
     gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo
+    hicolor_icon_theme
   ];
   propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ];
 

From 8edc6b07dfff2baa358cbbd6ca0420f638ba0ee8 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Tue, 23 Jun 2015 19:54:59 -0400
Subject: [PATCH 1747/2322] libspotify: support `i686-linux` platform.

---
 .../libraries/libspotify/default.nix          | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix
index 56d15cd1e80..02bd1f966e6 100644
--- a/pkgs/development/libraries/libspotify/default.nix
+++ b/pkgs/development/libraries/libspotify/default.nix
@@ -1,8 +1,11 @@
 { stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey, unzip, gnused }:
 
-let version = "12.1.51"; in
+let 
+  version = "12.1.51"; 
+  isLinux = (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux");
+in
 
-if (stdenv.system != "x86_64-linux" && stdenv.system != "x86_64-darwin")
+if (stdenv.system != "x86_64-linux" && stdenv.system != "x86_64-darwin" && stdenv.system != "i686-linux")
 then throw "Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here"
 else stdenv.mkDerivation {
   name = "libspotify-${version}";
@@ -18,6 +21,11 @@ else stdenv.mkDerivation {
         url    = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Darwin-universal.zip";
         sha256 = "1gcgrc8arim3hnszcc886lmcdb4iigc08abkaa02l6gng43ky1c0";
       }
+    else if stdenv.system == "i686-linux" then
+      fetchurl {
+        url    = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Linux-i686-release.tar.gz";
+        sha256 = "1bjmn64gbr4p9irq426yap4ipq9rb84zsyhjjr7frmmw22xb86ll";
+      }
     else
       null;
 
@@ -26,9 +34,9 @@ else stdenv.mkDerivation {
   # no patch or build phase for darwin
   phases = 
     [ "unpackPhase" ] ++ 
-    (stdenv.lib.optionals (stdenv.system == "x86_64-linux") [ "patchPhase" "buildPhase" ]) ++
+    (stdenv.lib.optionals (isLinux) [ "patchPhase" "buildPhase" ]) ++
     [ "installPhase" ];
-  installPhase = if (stdenv.system == "x86_64-linux")
+  installPhase = if (isLinux)
     then "installPhase"
     else ''
       mkdir -p "$out"/include/libspotify
@@ -46,11 +54,11 @@ else stdenv.mkDerivation {
   buildInputs = stdenv.lib.optional (stdenv.system == "x86_64-darwin") unzip;
 
   # linux-specific
-  installFlags = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+  installFlags = stdenv.lib.optionalString (isLinux)
     "prefix=$(out)";
-  patchPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+  patchPhase = stdenv.lib.optionalString (isLinux)
     "${gnused}/bin/sed -i 's/ldconfig//' Makefile";
-  postInstall = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
+  postInstall = stdenv.lib.optionalString (isLinux)
     "mv -v share $out";
 
   passthru = {

From 942f5070107213a884e2fe9cb987abd07df15aad Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Sun, 28 Jun 2015 16:07:17 -0400
Subject: [PATCH 1748/2322] ghcjs: Updated from
 15b7a34ddc11075a335e097f6109ad57ca03edab to
 c1b6239b0289371dc6b8d17dfd845c14bd4dc490.

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

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 696415f4562..80679374e6d 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -55,8 +55,8 @@ in mkDerivation (rec {
   inherit version;
   src = fetchgit {
     url = git://github.com/ghcjs/ghcjs.git;
-    rev = "15b7a34ddc11075a335e097f6109ad57ca03edab"; # master branch
-    sha256 = "0h6jdwd7lh3rkfsqpq3s6iavqkz1a88grzcxrcqj4rjilzdw288q";
+    rev = "c1b6239b0289371dc6b8d17dfd845c14bd4dc490"; # master branch
+    sha256 = "0ncbk7m1l7cpdgmabm14d7f97fw3vy0hmpj4vs4kkwhhfjf6kp8s";
   };
   isLibrary = true;
   isExecutable = true;

From ddf15bc78a869ec61487aa20edd4e8d9ba044519 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 30 Jun 2015 23:54:42 -0700
Subject: [PATCH 1749/2322] glusterfs: Propagate acl due to header references

---
 pkgs/tools/filesystems/glusterfs/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 57b36875a51..bfb739fa84a 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -17,11 +17,15 @@ let
     autoconf automake libtool pkgconfig zlib libaio libxml2
     acl sqlite liburcu attr
   ];
+  # Some of the headers reference acl
+  propagatedBuildInputs = [
+    acl
+  ];
 in
 stdenv.mkDerivation
 rec {
   inherit (s) name version;
-  inherit buildInputs;
+  inherit buildInputs propagatedBuildInputs;
 
   preConfigure = ''
     ./autogen.sh

From 7bf25187bc0e8e26fa677fee7509a6d87665505c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 1 Jul 2015 00:41:57 -0700
Subject: [PATCH 1750/2322] zenity: 3.14.0 -> 3.16.3

---
 pkgs/desktops/gnome-3/3.16/core/zenity/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
index 72e8ee6a593..aca42f1dbc2 100644
--- a/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
@@ -3,16 +3,20 @@
 
 stdenv.mkDerivation rec {
 
-  versionMajor = "3.14";
-  versionMinor = "0";
+  versionMajor = "3.16";
+  versionMinor = "3";
 
   name = "zenity-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/zenity/${versionMajor}/${name}.tar.xz";
-    sha256 = "0bw95d6ns67h0mw90qcbhxvhbglbpgd66vinvha7gwba8mnfqmvb";
+    sha256 = "1fhyzcmhrzqi10ks1gy8cxyqnbdfsnmqw3bkixnzrcf5zcb81qkz";
   };
 
+  preBuild = ''
+    mkdir -p $out/include
+  '';
+
   buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
 
   nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];

From a77d26b6571687b224b1f39501758f514ee0f919 Mon Sep 17 00:00:00 2001
From: "Travis B. Hartwell" <nafai@travishartwell.net>
Date: Fri, 19 Jun 2015 15:05:00 -0600
Subject: [PATCH 1751/2322] atom: update 0.187.0 -> 1.0.0

Added systemd to buildEnv path because of new dependency on libudev.
---
 pkgs/applications/editors/atom/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 31142efcc89..dc7975f5dcd 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
 , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
-, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap
+, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, systemd
 }:
 
 let
@@ -11,16 +11,16 @@ let
       fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
       xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
       xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr
-      xlibs.libXcursor libcap
+      xlibs.libXcursor libcap systemd
     ];
   };
 in stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "0.187.0";
+  version = "1.0.0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0s6173dg5m52zc8kqwlgjn113d84cskrv9v29fb0nrvwvkv2xzmw";
+    sha256 = "434be52726fed9804ddb8c07dba200d774d145d0a870d2a013b5f95eb882fa7e";
     name = "${name}.deb";
   };
 

From fd4c675c7746e28d71e046e4c41b5ba1a585b21c Mon Sep 17 00:00:00 2001
From: "Travis B. Hartwell" <nafai@travishartwell.net>
Date: Fri, 19 Jun 2015 15:10:05 -0600
Subject: [PATCH 1752/2322] atom: update desktop file and remove unneeded
 lintian directory.

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index dc7975f5dcd..fc2f9265ed6 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -31,7 +31,10 @@ in stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out
     ar p $src data.tar.gz | tar -C $out -xz ./usr
+    substituteInPlace $out/usr/share/applications/atom.desktop \
+      --replace /usr/share/atom $out/bin
     mv $out/usr/* $out/
+    rm -r $out/share/lintian
     rm -r $out/usr/
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       $out/share/atom/atom

From 98eebe7ee4f7a21038033f54317f1b9fca6710b4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 1 Jul 2015 00:54:46 -0700
Subject: [PATCH 1753/2322] openldap: 2.4.40 -> 2.4.41

---
 .../libraries/openldap/default.nix            |  7 +--
 .../openldap/fix-libdb-detection-gcc5.patch   | 43 -------------------
 2 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/development/libraries/openldap/fix-libdb-detection-gcc5.patch

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 97752a268f7..e5b7ce10719 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,16 +1,13 @@
 { stdenv, fetchurl, autoconf, openssl, cyrus_sasl, db, groff }:
 
 stdenv.mkDerivation rec {
-  name = "openldap-2.4.40";
+  name = "openldap-2.4.41";
 
   src = fetchurl {
     url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz";
-    sha256 = "1nyslrgwxwilgv5sixc37svls5rbvhsv9drb7hlrjr2vqaji29ni";
+    sha256 = "0vkzfd1pmin6xsv8lb1nabfxma8n1q00khr6nfifqkxlm2s6p197";
   };
 
-  # Last tested for openldap 2.4.40
-  patches = [ ./fix-libdb-detection-gcc5.patch ];
-
   nativeBuildInputs = [ autoconf ];
   buildInputs = [ openssl cyrus_sasl db groff ];
 
diff --git a/pkgs/development/libraries/openldap/fix-libdb-detection-gcc5.patch b/pkgs/development/libraries/openldap/fix-libdb-detection-gcc5.patch
deleted file mode 100644
index 40ba9de7375..00000000000
--- a/pkgs/development/libraries/openldap/fix-libdb-detection-gcc5.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f0409f40dab6013d1aec05f5c86ae31d2f49b485 Mon Sep 17 00:00:00 2001
-From: Jan Synacek <jsynacek@redhat.com>
-Date: Wed, 11 Feb 2015 10:32:28 +0100
-Subject: [PATCH] fix libdb detection with gcc 5
-
-The old cpp version generated:
-__db_version 5
-
-The new output:
-__db_version
-            5
-
-Running cpp with -P (inhibit linemarkers generation) fixes this when using gcc 5.
-Behavior with older versions of gcc is not changed.
----
- build/openldap.m4 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/build/openldap.m4 b/build/openldap.m4
-index caf8fc2..bdcb4d6 100644
---- a/build/openldap.m4
-+++ b/build/openldap.m4
-@@ -328,7 +328,7 @@ AC_DEFUN([OL_BDB_HEADER_VERSION],
- #endif
- __db_version DB_VERSION_MAJOR
- ])
--	set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
-+	set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
- 	ol_cv_bdb_major=${3}
- ])
- case $ol_cv_bdb_major in [[1-9]]*) : ;; *)
-@@ -344,7 +344,7 @@ AC_CACHE_CHECK([for Berkeley DB minor version in db.h], [ol_cv_bdb_minor],[
- #endif
- __db_version DB_VERSION_MINOR
- ])
--	set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
-+	set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
- 	ol_cv_bdb_minor=${3}
- ])
- case $ol_cv_bdb_minor in [[0-9]]*) : ;; *)
--- 
-2.1.0
-

From 9694112d6fc8a1f20fb5f8c45d0d437e4af9b6ce Mon Sep 17 00:00:00 2001
From: Marcin Falkiewicz <avalatron@gmail.com>
Date: Wed, 1 Jul 2015 10:49:46 +0200
Subject: [PATCH 1754/2322] virt-manager: 1.1.0 -> 1.2.1

---
 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 67e3f9ade98..604cad4c066 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -9,12 +9,12 @@ with pythonPackages;
 
 buildPythonPackage rec {
   name = "virt-manager-${version}";
-  version = "1.1.0";
+  version = "1.2.1";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
-    sha256 = "0hbr1wf4byfvbqlbq3w6s71ckhn626i4rb497y4z2cm12p5hc2db";
+    sha256 = "1gp6ijrwl6kjs54l395002pc9sblp08p4nqx9zcb9qg5f87aifvl";
   };
 
   propagatedBuildInputs =

From feac3e67770f8e4535738690e861e883b590d85b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 1 Jul 2015 11:48:28 +0200
Subject: [PATCH 1755/2322] mbedtls: fix postInstall (ZHF)

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

diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index ae8ff907f25..75ce53f8db3 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-    rm $out/lib/lib{mbedtls.so.8,polarssl.{a,so}}
+    rm -f $out/lib/lib{mbedtls.so.8,polarssl.{a,so}}
     ln -s libmbedtls.so $out/lib/libmbedtls.so.8
     ln -s libmbedtls.so $out/lib/libpolarssl.so
     ln -s libmbedtls.a $out/lib/libpolarssl.a

From 22fce483712927c40c491c1204b214db91bb1e14 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 1 Jul 2015 12:31:01 +0200
Subject: [PATCH 1756/2322] php: fix broken build inputs (ZHF)

---
 pkgs/development/interpreters/php/generic.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix
index 33b5b0f9024..10f40c4dd2f 100644
--- a/pkgs/development/interpreters/php/generic.nix
+++ b/pkgs/development/interpreters/php/generic.nix
@@ -18,7 +18,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
 
   enableParallelBuilding = true;
 
-  buildInputs = ["flex" "bison" "pkgconfig"];
+  buildInputs = [ flex bison pkgconfig ];
 
   flags = {
 
@@ -146,7 +146,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
 
     openssl = {
       configureFlags = ["--with-openssl=${openssl}"];
-      buildInputs = ["openssl"];
+      buildInputs = [openssl];
     };
 
     mbstring = {

From 6a6ecde159848ac21f491226ab542b39cbd58744 Mon Sep 17 00:00:00 2001
From: Artjom Vejsel <akawolf0@gmail.com>
Date: Mon, 29 Jun 2015 20:42:31 +0300
Subject: [PATCH 1757/2322] filter-audio library: init at 20150624

---
 .../libraries/filter-audio/default.nix        | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/filter-audio/default.nix

diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix
new file mode 100644
index 00000000000..989d9518a0e
--- /dev/null
+++ b/pkgs/development/libraries/filter-audio/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "filter-audio-20150624";
+
+  src = fetchgit {
+    url = "https://github.com/irungentoo/filter_audio.git";
+    rev = "612c5a102550c614e4c8f859e753ea64c0b7250c";
+    sha256 = "0bmf8dxnr4vb6y36lvlwqd5x68r4cbsd625kbw3pypm5yqp0n5na";
+  };
+
+  doCheck = false;
+
+  makeFlags = "PREFIX=$(out)";
+
+  meta = with stdenv.lib; {
+    description = "Lightweight audio filtering library made from webrtc code";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ viric jgeerds ];
+    platforms = platforms.all;
+  };
+}
+
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac6607daf92..0f457aa5cd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6116,6 +6116,8 @@ let
   fftwSinglePrec = fftw.override { precision = "single"; };
   fftwFloat = fftwSinglePrec; # the configure option is just an alias
 
+  filter-audio = callPackage ../development/libraries/filter-audio {};
+
   fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
 
   flann = callPackage ../development/libraries/flann { };

From 68f4a0f0eaf175eea2f17383105dae7b97d526f2 Mon Sep 17 00:00:00 2001
From: Artjom Vejsel <akawolf0@gmail.com>
Date: Wed, 1 Jul 2015 10:16:09 +0300
Subject: [PATCH 1758/2322] libtoxcore: added new-api version

---
 .../libraries/libtoxcore/new-api/default.nix  | 60 +++++++++++++++++++
 .../libtoxcore/{ => old-api}/default.nix      |  0
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/libtoxcore/new-api/default.nix
 rename pkgs/development/libraries/libtoxcore/{ => old-api}/default.nix (100%)

diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix
new file mode 100644
index 00000000000..42f81cf6a9d
--- /dev/null
+++ b/pkgs/development/libraries/libtoxcore/new-api/default.nix
@@ -0,0 +1,60 @@
+{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses, libopus
+, libvpx, check, libconfig, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "tox-core-dev-20150629";
+
+  src = fetchFromGitHub {
+    owner  = "irungentoo";
+    repo   = "toxcore";
+    rev    = "219fabc0f5dbaac7968cb7728d25dface3ebb2ea";
+    sha256 = "1rsnxa5b7i2zclx0kzbf4a5mds0jfkvfjz1s4whzk7rf8w3vpqkh";
+  };
+
+  NIX_LDFLAGS = "-lgcc_s";
+
+  postPatch = ''
+    # within Nix chroot builds, localhost is unresolvable
+    sed -i -e '/DEFTESTCASE(addr_resolv_localhost)/d' \
+      auto_tests/network_test.c
+    # takes WAAAY too long (~10 minutes) and would timeout
+    sed -i -e '/DEFTESTCASE[^(]*(many_clients\>/d' \
+      auto_tests/tox_test.c
+  '';
+
+  preConfigure = ''
+    autoreconf -i
+  '';
+
+  configureFlags = [
+    "--with-libsodium-headers=${libsodium}/include"
+    "--with-libsodium-libs=${libsodium}/lib"
+    "--enable-ntox"
+    "--enable-daemon"
+  ];
+
+  buildInputs = [
+    autoconf libtool automake libsodium ncurses
+    check libconfig pkgconfig
+  ] ++ stdenv.lib.optionals (!stdenv.isArm) [
+    libopus
+  ];
+
+  propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ];
+
+  # Some tests fail randomly due to timeout. This kind of problem is well known
+  # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054}
+  # They don't recommend running tests on 50core machines with other cpu-bound
+  # tests running in parallel.
+  #
+  # NOTE: run the tests locally on your machine before upgrading this package!
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ viric jgeerds ];
+    platforms = platforms.all;
+  };
+}
+
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/old-api/default.nix
similarity index 100%
rename from pkgs/development/libraries/libtoxcore/default.nix
rename to pkgs/development/libraries/libtoxcore/old-api/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f457aa5cd7..f83d01c055e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7268,7 +7268,9 @@ let
       else stdenv;
   };
 
-  libtoxcore = callPackage ../development/libraries/libtoxcore { };
+  libtoxcore = callPackage ../development/libraries/libtoxcore/old-api { };
+
+  libtoxcore-dev = callPackage ../development/libraries/libtoxcore/new-api { };
 
   libtsm = callPackage ../development/libraries/libtsm {
     automake = automake114x;

From 25ee65de97617364413f3e69686b186d30e89107 Mon Sep 17 00:00:00 2001
From: Artjom Vejsel <akawolf0@gmail.com>
Date: Mon, 29 Jun 2015 20:43:40 +0300
Subject: [PATCH 1759/2322] qtox: 20150128 -> 20150624

---
 .../instant-messengers/qtox/default.nix       | 56 +++++++++----------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 874f68f0ec2..cba5bdeec7e 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -1,41 +1,38 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openal, opencv
-, libsodium, libXScrnSaver }:
+{ stdenv, fetchgit, pkgconfig, libtoxcore-dev, qt5, openal, opencv,
+  libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo,
+  pango, atk, qrencode, ffmpeg, filter-audio }:
 
-let
+stdenv.mkDerivation rec {
+  name = "qtox-dev-20150624";
 
-  filteraudio = stdenv.mkDerivation rec {
-    name = "filter_audio-20150128";
-
-    src = fetchFromGitHub {
-      owner = "irungentoo";
-      repo = "filter_audio";
-      rev = "76428a6cda";
-      sha256 = "0c4wp9a7dzbj9ykfkbsxrkkyy0nz7vyr5map3z7q8bmv9pjylbk9";
-    };
-
-    doCheck = false;
-
-    makeFlags = "PREFIX=$(out)";
-  };
-
-in stdenv.mkDerivation rec {
-  name = "qtox-dev-20150130";
-
-  src = fetchFromGitHub {
-    owner = "tux3";
-    repo = "qTox";
-    rev = "7574569b3d";
-    sha256 = "0a7zkhl4w2r5ifzs7vwws2lpplp6q5c4jllyf4ld64njgiz6jzip";
+  src = fetchgit {
+      url = "https://github.com/tux3/qTox.git";
+      rev = "9f386135a2cf428d2802b158c70be4beee5abf86";
+      sha256 = "1m2y50q5yim1q75k48cy5daq5qm77cvb3kcla7lpqv54xnfdwxk8";
   };
 
   buildInputs =
     [
-      libtoxcore openal opencv libsodium filteraudio
-      qt5.base qt5.tools libXScrnSaver
+      libtoxcore-dev openal opencv libsodium filter-audio
+      qt5.base qt5.tools libXScrnSaver glib gtk2 cairo
+      pango atk qrencode ffmpeg qt5.translations
     ];
+
   nativeBuildInputs = [ pkgconfig ];
 
-  configurePhase = "qmake";
+  preConfigure = ''
+    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)"
+  '';
+
+  configurePhase = ''
+    runHook preConfigure
+    qmake
+  '';
 
   installPhase = ''
     mkdir -p $out/bin
@@ -49,3 +46,4 @@ in stdenv.mkDerivation rec {
     platforms = platforms.all;
   };
 }
+

From a012ece2f9976072c8d54ca1deadf2fd470b3cb6 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 1 Jul 2015 13:46:27 +0200
Subject: [PATCH 1760/2322] 2dfsb: fix installation (ZHF)

---
 pkgs/applications/misc/3dfsb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/3dfsb/default.nix b/pkgs/applications/misc/3dfsb/default.nix
index 96bcfbd6bfe..fe173b21b57 100644
--- a/pkgs/applications/misc/3dfsb/default.nix
+++ b/pkgs/applications/misc/3dfsb/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   buildPhase = "sh ./compile.sh";
   dontStrip = true;
 
-  installPhase = "mkdir $out/bin/ && cp 3dfsb $out/bin/";
+  installPhase = "mkdir -p $out/bin/ && cp 3dfsb $out/bin/";
 
   preFixup = ''
     wrapProgram $out/bin/3dfsb \

From f667310c066ca7f773518b2efb94e76ebea08163 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 1 Jul 2015 13:46:38 +0200
Subject: [PATCH 1761/2322] Use mkAfter for services.postgresql.authentication

Authentication methods are tried in order, so if another NixOS module
defines a specific ident mapping like

  local hydra all ident map=hydra-users

it should appear before the generic

  local all all ident
---
 nixos/modules/services/databases/postgresql.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index de14c56f797..328e864ced3 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -154,7 +154,7 @@ in
 
   config = mkIf config.services.postgresql.enable {
 
-    services.postgresql.authentication =
+    services.postgresql.authentication = mkAfter
       ''
         # Generated file; do not edit!
         local all all              ident ${optionalString pre84 "sameuser"}

From 145768bf9b96f2d7cd8fdc8ce9dbf3b27a713796 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 1 Jul 2015 08:11:05 -0400
Subject: [PATCH 1762/2322] Unmaintain a bunch of packages

---
 pkgs/applications/misc/audio/sox/default.nix  |  2 +-
 .../office/todo.txt-cli/default.nix           |  1 -
 .../version-management/src/default.nix        |  2 --
 .../virtualization/OVMF/default.nix           |  1 -
 .../virtualization/qemu/default.nix           |  2 +-
 pkgs/build-support/build-maven.nix            |  2 +-
 .../compilers/ats-extsolve/default.nix        | 34 -------------------
 pkgs/development/compilers/edk2/default.nix   |  1 -
 .../development/compilers/gcc/4.8/default.nix |  2 +-
 .../development/compilers/gcc/4.9/default.nix |  2 +-
 pkgs/development/compilers/gcc/5/default.nix  |  2 +-
 pkgs/development/compilers/llvm/3.4/clang.nix |  1 -
 .../compilers/llvm/3.4/dragonegg.nix          |  2 +-
 pkgs/development/compilers/llvm/3.4/lld.nix   |  1 -
 pkgs/development/compilers/llvm/3.4/lldb.nix  |  1 -
 pkgs/development/compilers/llvm/3.4/llvm.nix  |  2 +-
 pkgs/development/compilers/llvm/3.4/polly.nix |  1 -
 pkgs/development/compilers/llvm/3.5/clang.nix |  1 -
 .../compilers/llvm/3.5/dragonegg.nix          |  2 +-
 .../compilers/llvm/3.5/libc++/default.nix     |  1 -
 .../compilers/llvm/3.5/libc++abi/default.nix  |  2 +-
 pkgs/development/compilers/llvm/3.5/lld.nix   |  1 -
 pkgs/development/compilers/llvm/3.5/lldb.nix  |  1 -
 pkgs/development/compilers/llvm/3.5/llvm.nix  |  2 +-
 pkgs/development/compilers/llvm/3.5/polly.nix |  1 -
 .../compilers/llvm/3.6/clang/default.nix      |  1 -
 .../compilers/llvm/3.6/libc++/default.nix     |  1 -
 .../compilers/llvm/3.6/libc++abi.nix          |  2 +-
 pkgs/development/compilers/llvm/3.6/lldb.nix  |  1 -
 pkgs/development/compilers/llvm/3.6/llvm.nix  |  2 +-
 .../development/compilers/openjdk/default.nix |  2 +-
 .../interpreters/nix-exec/default.nix         |  2 --
 pkgs/development/libraries/c-ares/default.nix |  1 -
 pkgs/development/libraries/cloog/0.18.0.nix   |  2 --
 pkgs/development/libraries/cloog/default.nix  |  2 --
 .../libraries/cpp-netlib/default.nix          |  1 -
 .../development/libraries/gnu-efi/default.nix |  1 -
 .../libraries/http-parser/default.nix         |  2 --
 pkgs/development/libraries/isl/0.11.1.nix     |  1 -
 pkgs/development/libraries/isl/0.12.2.nix     |  1 -
 pkgs/development/libraries/isl/0.14.1.nix     |  1 -
 pkgs/development/libraries/isl/default.nix    |  1 -
 pkgs/development/libraries/libtsm/default.nix |  2 +-
 .../libraries/nix-plugins/default.nix         |  1 -
 pkgs/development/web/nodejs/default.nix       |  2 +-
 pkgs/development/web/nodejs/v0_10.nix         |  2 +-
 .../linux/kernel/manual-config.nix            |  1 -
 pkgs/os-specific/linux/kmod/default.nix       |  1 -
 pkgs/os-specific/linux/kmscon/default.nix     |  1 -
 pkgs/servers/http/jetty/9.2.nix               |  2 --
 pkgs/servers/irc/ngircd/default.nix           |  1 -
 .../monitoring/newrelic-sysmond/default.nix   |  2 --
 pkgs/servers/sql/mariadb/default.nix          |  2 +-
 .../filesystems/unionfs-fuse/default.nix      |  1 -
 pkgs/tools/misc/gummiboot/default.nix         |  2 --
 pkgs/tools/misc/tmux/default.nix              |  2 +-
 pkgs/tools/networking/strongswan/default.nix  |  1 -
 pkgs/tools/security/rng-tools/default.nix     |  2 --
 pkgs/tools/system/efibootmgr/default.nix      |  1 -
 pkgs/tools/system/gptfdisk/default.nix        |  2 --
 pkgs/top-level/all-packages.nix               |  1 -
 61 files changed, 19 insertions(+), 104 deletions(-)
 delete mode 100644 pkgs/development/compilers/ats-extsolve/default.nix

diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix
index 07dbde2939b..fa6e53bcf97 100644
--- a/pkgs/applications/misc/audio/sox/default.nix
+++ b/pkgs/applications/misc/audio/sox/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Sample Rate Converter for audio";
     homepage = http://sox.sourceforge.net/;
-    maintainers = [ lib.maintainers.marcweber lib.maintainers.shlevy ];
+    maintainers = [ lib.maintainers.marcweber ];
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix
index eb4c31ed9d2..70d4a0bf888 100644
--- a/pkgs/applications/office/todo.txt-cli/default.nix
+++ b/pkgs/applications/office/todo.txt-cli/default.nix
@@ -22,7 +22,6 @@ in stdenv.mkDerivation {
     description = "Simple plaintext todo list manager";
     homepage = "http://todotxt.com";
     license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index eede33c2145..0e98791d823 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -31,8 +31,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.bsd3;
 
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
-
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index e29ab11947f..479d625c7de 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
     description = "Sample UEFI firmware for QEMU and KVM";
     homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF;
     license = stdenv.lib.licenses.bsd2;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms = ["x86_64-linux" "i686-linux"];
   };
 })
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 5fc502a5846..a5d403457de 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.qemu.org/;
     description = "A generic and open source machine emulator and virtualizer";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ viric shlevy eelco ];
+    maintainers = with maintainers; [ viric eelco ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix
index 284be201ff0..26be7d2aebb 100644
--- a/pkgs/build-support/build-maven.nix
+++ b/pkgs/build-support/build-maven.nix
@@ -1,6 +1,6 @@
 { stdenv, maven, runCommand, writeText, fetchurl, lib }:
 /* Takes an info file generated by mvn2nix
- * (https://github.com/shlevy/mvn2nix-maven-plugin) and builds the maven
+ * (https://github.com/NixOS/mvn2nix-maven-plugin) and builds the maven
  * project with it.
  *
  * repo: A local maven repository with the project's dependencies.
diff --git a/pkgs/development/compilers/ats-extsolve/default.nix b/pkgs/development/compilers/ats-extsolve/default.nix
deleted file mode 100644
index c1a7f2882a0..00000000000
--- a/pkgs/development/compilers/ats-extsolve/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, ats2, python, z3, pkgconfig, json_c }:
-
-stdenv.mkDerivation {
-  name = "ats-extsolve-0pre11177d9";
-
-  buildInputs = [ python z3 ats2 pkgconfig json_c ];
-
-  src = fetchurl {
-    url = "https://github.com/wdblair/ATS-Postiats-contrib/archive/11177d9194b852392d5e92e67d0ecc7b6abc02bf.tar.gz";
-    sha256 = "12fhlcpq5b4pc3h21w1i7yv1ymrll2g4zlf1pvg0v8cr6aa6i813";
-  };
-
-  postUnpack = ''
-    export PATSHOMERELOC="$PWD/$sourceRoot"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$PATSHOMERELOC"
-    export INCLUDE_ATS="-IATS $PATSHOMERELOC"
-  '';
-
-  preBuild = "cd projects/MEDIUM/ATS-extsolve";
-
-  buildFlags = [ "setup" "patsolve" ];
-
-  installPhase = ''
-    install -d -m755 $out/bin
-    install -m755 patsolve $out/bin
-  '';
-
-  meta = {
-    platforms = ats2.meta.platforms;
-    homepage = http://www.illtyped.com/projects/patsolve;
-    description = "External Constraint-Solving for ATS2";
-    maintainer = [ stdenv.lib.maintainers.shlevy ];
-  };
-}
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index 02e22e82029..ebbac8ec355 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -35,7 +35,6 @@ edk2 = stdenv.mkDerivation {
     description = "Intel EFI development kit";
     homepage = http://sourceforge.net/projects/edk2/;
     license = stdenv.lib.licenses.bsd2;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms = ["x86_64-linux" "i686-linux"];
   };
 
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 6d5627c34d6..06ca29cd092 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -510,7 +510,7 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ viric shlevy simons ];
+    maintainers = with stdenv.lib.maintainers; [ viric simons ];
 
     # gnatboot is not available out of linux platforms, so we disable the darwin build
     # for the gnat (ada compiler).
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 16737ffc896..1824931eee5 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -509,7 +509,7 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ viric shlevy simons ];
+    maintainers = with stdenv.lib.maintainers; [ viric simons ];
 
     # gnatboot is not available out of linux platforms, so we disable the darwin build
     # for the gnat (ada compiler).
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 95125d99893..323a87bc774 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -507,7 +507,7 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ viric shlevy simons ];
+    maintainers = with stdenv.lib.maintainers; [ viric simons ];
 
     # gnatboot is not available out of linux platforms, so we disable the darwin build
     # for the gnat (ada compiler).
diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index 51e871f2ca4..2dd3a23d766 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -48,7 +48,6 @@ stdenv.mkDerivation {
     description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.4/dragonegg.nix b/pkgs/development/compilers/llvm/3.4/dragonegg.nix
index 2ebdc10654b..b2f41914d96 100644
--- a/pkgs/development/compilers/llvm/3.4/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/3.4/dragonegg.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     homepage = http://dragonegg.llvm.org/;
     description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM";
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric shlevy];
+    maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
     broken = true;
   };
diff --git a/pkgs/development/compilers/llvm/3.4/lld.nix b/pkgs/development/compilers/llvm/3.4/lld.nix
index c28c03fbdd1..4360ec9ad1b 100644
--- a/pkgs/development/compilers/llvm/3.4/lld.nix
+++ b/pkgs/development/compilers/llvm/3.4/lld.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation {
     description = "A set of modular code for creating linker tools";
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     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 7b35119a93f..540faf01e07 100644
--- a/pkgs/development/compilers/llvm/3.4/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.4/lldb.nix
@@ -38,7 +38,6 @@ stdenv.mkDerivation {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     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 a44f157a13e..4c9235681e3 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 {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ];
+    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 61721ffad67..2e0018c34c2 100644
--- a/pkgs/development/compilers/llvm/3.4/polly.nix
+++ b/pkgs/development/compilers/llvm/3.4/polly.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation {
     description = "A polyhedral optimizer for llvm";
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     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 05ac4be01e5..292154eb67a 100644
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/pkgs/development/compilers/llvm/3.5/clang.nix
@@ -49,7 +49,6 @@ in stdenv.mkDerivation {
     description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
index ac433ac90a1..a7d405fd55a 100644
--- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     homepage = http://dragonegg.llvm.org/;
     description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM";
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric shlevy];
+    maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
index d2796d678d0..a23daf4f14a 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
@@ -40,7 +40,6 @@ stdenv.mkDerivation rec {
     homepage = http://libcxx.llvm.org/;
     description = "A new implementation of the C++ standard library, targeting C++11";
     license = "BSD";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     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 ca8558f7147..c84ce2a4435 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
@@ -53,7 +53,7 @@ in stdenv.mkDerivation {
     homepage = http://libcxxabi.llvm.org/;
     description = "A new implementation of low level support for a standard C++ library";
     license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [ shlevy vlstill ];
+    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 000b3c9d57a..6bd8c029231 100644
--- a/pkgs/development/compilers/llvm/3.5/lld.nix
+++ b/pkgs/development/compilers/llvm/3.5/lld.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation {
     description = "A set of modular code for creating linker tools";
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     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 92ba4108a4d..574d706a3fd 100644
--- a/pkgs/development/compilers/llvm/3.5/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.5/lldb.nix
@@ -38,7 +38,6 @@ stdenv.mkDerivation {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     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 7e11caa66f0..b569997acc6 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ];
+    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 6de420397af..03bfe0d154b 100644
--- a/pkgs/development/compilers/llvm/3.5/polly.nix
+++ b/pkgs/development/compilers/llvm/3.5/polly.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation {
     description = "A polyhedral optimizer for llvm";
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.6/clang/default.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix
index ecca67398ec..93c45c4efb4 100644
--- a/pkgs/development/compilers/llvm/3.6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix
@@ -50,7 +50,6 @@ in stdenv.mkDerivation {
     description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.6/libc++/default.nix b/pkgs/development/compilers/llvm/3.6/libc++/default.nix
index 5bc122fa5ce..d83ca83bbae 100644
--- a/pkgs/development/compilers/llvm/3.6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/libc++/default.nix
@@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
     homepage = http://libcxx.llvm.org/;
     description = "A new implementation of the C++ standard library, targeting C++11";
     license = "BSD";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.6/libc++abi.nix b/pkgs/development/compilers/llvm/3.6/libc++abi.nix
index 6cd08e46e63..53a01c95c8a 100644
--- a/pkgs/development/compilers/llvm/3.6/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.6/libc++abi.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
     homepage = http://libcxxabi.llvm.org/;
     description = "A new implementation of low level support for a standard C++ library";
     license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [ shlevy vlstill ];
+    maintainers = with stdenv.lib.maintainers; [ vlstill ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.6/lldb.nix b/pkgs/development/compilers/llvm/3.6/lldb.nix
index 4740c97cb9b..334810917fa 100644
--- a/pkgs/development/compilers/llvm/3.6/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.6/lldb.nix
@@ -38,7 +38,6 @@ stdenv.mkDerivation {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.6/llvm.nix b/pkgs/development/compilers/llvm/3.6/llvm.nix
index f23ac614b5c..1b7e9d86a03 100644
--- a/pkgs/development/compilers/llvm/3.6/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.6/llvm.nix
@@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ];
+    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index be4ca84bd8d..19dec917bf8 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -233,7 +233,7 @@ let
       homepage = http://openjdk.java.net/;
       license = stdenv.lib.licenses.gpl2;
       description = "The open-source Java Development Kit";
-      maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.shlevy ];
+      maintainers = [ stdenv.lib.maintainers.eelco ];
       platforms = stdenv.lib.platforms.linux;
     };
 
diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix
index 92df954e5e0..72641161c75 100644
--- a/pkgs/development/interpreters/nix-exec/default.nix
+++ b/pkgs/development/interpreters/nix-exec/default.nix
@@ -18,8 +18,6 @@ in stdenv.mkDerivation {
 
     license = stdenv.lib.licenses.mit;
 
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
-
     platforms = nix.meta.platforms;
   };
 }
diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index 678c7e15112..eb68a7b9a91 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -13,6 +13,5 @@ stdenv.mkDerivation rec {
     homepage = http://c-ares.haxx.se;
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ shlevy ];
   };
 }
diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/pkgs/development/libraries/cloog/0.18.0.nix
index 926da22b280..ccd93828319 100644
--- a/pkgs/development/libraries/cloog/0.18.0.nix
+++ b/pkgs/development/libraries/cloog/0.18.0.nix
@@ -39,8 +39,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
 
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
-
     /* Leads to an ICE on Cygwin:
 
        make[3]: Entering directory `/tmp/nix-build-9q5gw5m37q5l4f0kjfv9ar8fsc9plk27-ppl-0.10.2.drv-1/ppl-0.10.2/src'
diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix
index 629cdba1fd4..55f70597170 100644
--- a/pkgs/development/libraries/cloog/default.nix
+++ b/pkgs/development/libraries/cloog/default.nix
@@ -40,8 +40,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
 
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
-
     /* Leads to an ICE on Cygwin:
 
        make[3]: Entering directory `/tmp/nix-build-9q5gw5m37q5l4f0kjfv9ar8fsc9plk27-ppl-0.10.2.drv-1/ppl-0.10.2/src'
diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix
index 2f088b4d304..57e518635ce 100644
--- a/pkgs/development/libraries/cpp-netlib/default.nix
+++ b/pkgs/development/libraries/cpp-netlib/default.nix
@@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
     description = "A collection of open-source libraries for high level network programming";
     homepage    = http://cpp-netlib.org;
     license     = licenses.boost;
-    maintainers = with maintainers; [ shlevy ];
     platforms   = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index 43479a8f66d..d21cc0ddd0a 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
     description = "GNU EFI development toolchain";
     homepage = http://sourceforge.net/projects/gnu-efi/;
     license = licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index e7247332059..e2f06cab5cf 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -42,7 +42,5 @@ in stdenv.mkDerivation {
     homepage = https://github.com/joyent/http-parser;
 
     license = stdenv.lib.licenses.mit;
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix
index 931ee831b73..63140dba37f 100644
--- a/pkgs/development/libraries/isl/0.11.1.nix
+++ b/pkgs/development/libraries/isl/0.11.1.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix
index 67620881bca..d7143b8747e 100644
--- a/pkgs/development/libraries/isl/0.12.2.nix
+++ b/pkgs/development/libraries/isl/0.12.2.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/pkgs/development/libraries/isl/0.14.1.nix
index dc13bbae989..8196dec283a 100644
--- a/pkgs/development/libraries/isl/0.14.1.nix
+++ b/pkgs/development/libraries/isl/0.14.1.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix
index 5fa009277e1..9518a0c0e65 100644
--- a/pkgs/development/libraries/isl/default.nix
+++ b/pkgs/development/libraries/isl/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix
index febdb0914d6..b1d149a0445 100644
--- a/pkgs/development/libraries/libtsm/default.nix
+++ b/pkgs/development/libraries/libtsm/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     description = "Terminal-emulator State Machine";
     homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/";
     license = licenses.mit;
-    maintainers = with maintainers; [ shlevy cstrahan ];
+    maintainers = with maintainers; [ cstrahan ];
   };
 }
diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index 2c208ce86bb..2db193abe59 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation {
     description = "Collection of miscellaneous plugins for the nix expression language";
     homepage = https://github.com/shlevy/nix-plugins;
     license = stdenv.lib.licenses.mit;
-    maintaners = [ stdenv.lib.maintainers.shlevy ];
     platforms = stdenv.lib.platforms.all;
     broken = true;
   };
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index f91a7c3b41d..c8f2d94e40a 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -62,7 +62,7 @@ in stdenv.mkDerivation {
     description = "Event-driven I/O framework for the V8 JavaScript engine";
     homepage = http://nodejs.org;
     license = licenses.mit;
-    maintainers = [ maintainers.goibhniu maintainers.shlevy maintainers.havvy ];
+    maintainers = [ maintainers.goibhniu maintainers.havvy ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix
index 9d714be1cdd..739a0ff9389 100644
--- a/pkgs/development/web/nodejs/v0_10.nix
+++ b/pkgs/development/web/nodejs/v0_10.nix
@@ -60,7 +60,7 @@ in stdenv.mkDerivation {
     description = "Event-driven I/O framework for the V8 JavaScript engine";
     homepage = http://nodejs.org;
     license = licenses.mit;
-    maintainers = [ maintainers.goibhniu maintainers.shlevy ];
+    maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 963e10a5964..a14088c81ef 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -209,7 +209,6 @@ let
         homepage = http://www.kernel.org/;
         repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git;
         maintainers = [
-          maintainers.shlevy
           maintainers.thoughtpolice
         ];
         platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index b5559e535ec..45ca5d0d21d 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.kernel.org/pub/linux/utils/kernel/kmod/;
     description = "Tools for loading and managing Linux kernel modules";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix
index 4f9b872ce1c..ed2cb76e820 100644
--- a/pkgs/os-specific/linux/kmscon/default.nix
+++ b/pkgs/os-specific/linux/kmscon/default.nix
@@ -44,7 +44,6 @@ stdenv.mkDerivation rec {
     description = "KMS/DRM based System Console";
     homepage = "http://www.freedesktop.org/wiki/Software/kmscon/";
     license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/http/jetty/9.2.nix b/pkgs/servers/http/jetty/9.2.nix
index 4ac38e8d3cb..7bef32f3db2 100644
--- a/pkgs/servers/http/jetty/9.2.nix
+++ b/pkgs/servers/http/jetty/9.2.nix
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.eclipse.org/jetty/;
 
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
-
     platforms = stdenv.lib.platforms.all;
 
     license = [ stdenv.lib.licenses.asl20 stdenv.lib.licenses.epl10 ];
diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix
index 50bc86e805e..ebc7e7c3128 100644
--- a/pkgs/servers/irc/ngircd/default.nix
+++ b/pkgs/servers/irc/ngircd/default.nix
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
     description = "Next Generation IRC Daemon";
     homepage    = http://ngircd.barton.de;
     license     = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix
index 777cfe805bf..a300d3514ee 100644
--- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix
+++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix
@@ -24,7 +24,5 @@ stdenv.mkDerivation rec {
     description = "System-wide monitoring for newrelic";
 
     license = stdenv.lib.licenses.unfree;
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 21ccd50e3ef..7ca962b6f47 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
     description = "An enhanced, drop-in replacement for MySQL";
     homepage    = https://mariadb.org/;
     license     = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ shlevy thoughtpolice wkennington ];
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice wkennington ];
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix
index 1d39108afb1..73db9e2ca20 100644
--- a/pkgs/tools/filesystems/unionfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix
@@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
     description = "FUSE UnionFS implementation";
     homepage = http://podgorny.cz/moin/UnionFsFuse;
     license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix
index 8adea97ff14..9d9b7700c90 100644
--- a/pkgs/tools/misc/gummiboot/default.nix
+++ b/pkgs/tools/misc/gummiboot/default.nix
@@ -25,7 +25,5 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl21Plus;
 
     platforms = [ "x86_64-linux" "i686-linux" ];
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index c906f0a2910..6cc54536eb1 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.bsd3;
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ shlevy thammers ];
+    maintainers = with stdenv.lib.maintainers; [ thammers ];
   };
 }
diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index d65f1ac4335..7d427ac9622 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = "-lgcc_s" ;
 
   meta = {
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
     description = "OpenSource IPsec-based VPN Solution";
     homepage = https://www.strongswan.org;
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix
index 989b84ef957..75a865917ec 100644
--- a/pkgs/tools/security/rng-tools/default.nix
+++ b/pkgs/tools/security/rng-tools/default.nix
@@ -17,7 +17,5 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2;
 
     platforms = stdenv.lib.platforms.linux;
-
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix
index 6364267fc47..39fe1bdf09a 100644
--- a/pkgs/tools/system/efibootmgr/default.nix
+++ b/pkgs/tools/system/efibootmgr/default.nix
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
     description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager";
     homepage = http://linux.dell.com/efibootmgr/;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ shlevy ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index b8c92eeab56..6551f27e772 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.rodsbooks.com/gdisk/;
 
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
-
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e746243fea..89e6857130a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3553,7 +3553,6 @@ let
 
   ats = callPackage ../development/compilers/ats { };
   ats2 = callPackage ../development/compilers/ats2 { };
-  ats-extsolve = callPackage ../development/compilers/ats-extsolve { };
 
   avra = callPackage ../development/compilers/avra { };
 

From 1969397eadb5097e6818514d7dacb043121b8359 Mon Sep 17 00:00:00 2001
From: Robbin C <robbinch33@gmail.com>
Date: Wed, 1 Jul 2015 18:45:22 +0800
Subject: [PATCH 1763/2322] atomiclong: init at 0.1.1.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bfe21546f5a..304f1f44ad4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -633,6 +633,27 @@ let
     };
   };
 
+  atomiclong = buildPythonPackage rec {
+    version = "0.1.1";
+    name = "atomiclong-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/a/atomiclong/atomiclong-${version}.tar.gz";
+      sha256 = "1gjbc9lvpkgg8vj7dspif1gz9aq4flkhxia16qj6yvb7rp27h4yb";
+    };
+
+    buildInputs = with self; [ pytest ];
+    propagatedBuildInputs = with self; [ cffi ];
+
+    meta = {
+      description = "Long data type with atomic operations using CFFI";
+      homepage = https://github.com/dreid/atomiclong;
+      license = licenses.mit;
+      maintainers = with maintainers; [ robbinch ];
+    };
+
+  };
+
   atomicwrites = buildPythonPackage rec {
     version = "0.1.0";
     name = "atomicwrites-${version}";

From db5d03c4f1d80039f39c0ddf090801f4036af0af Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 1 Jul 2015 13:57:56 +0200
Subject: [PATCH 1764/2322] phpPackages.xdebug: update from 2.2.5 to 2.3.1 and
 enable tests

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index fe06043a859..6390ff9ad40 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -28,9 +28,12 @@ let self = with self; {
   };
 
   xdebug = buildPecl {
-    name = "xdebug-2.2.5";
+    name = "xdebug-2.3.1";
 
-    sha256 = "0vss35da615709kdvqji8pblckfvmabmj2njjjz6h8zzvj9gximd";
+    sha256 = "0k567i6w7cw14m13s7ip0946pvy5ii16cjwjcinnviw9c24na0xm";
+
+    doCheck = true;
+    checkTarget = "test";
   };
 
   zendopcache = buildPecl {

From f41564389b8a6a4ec8d1fc7622304cf799f73d28 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 1 Jul 2015 13:53:47 +0200
Subject: [PATCH 1765/2322] phpPackages.xcache: update from 3.1.0 to 3.2.0 and
 enable tests

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 6390ff9ad40..21c935d9aad 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -57,13 +57,16 @@ let self = with self; {
   xcache = buildPecl rec {
     name = "xcache-${version}";
 
-    version = "3.1.0";
+    version = "3.2.0";
 
     src = pkgs.fetchurl {
       url = "http://xcache.lighttpd.net/pub/Releases/${version}/${name}.tar.bz2";
-      sha256 = "1saysvzwkfmcyg53za4j7qnranxd6871spjzfpclhdlqm043xbw6";
+      sha256 = "1gbcpw64da9ynjxv70jybwf9y88idm01kb16j87vfagpsp5s64kx";
     };
 
+    doCheck = true;
+    checkTarget = "test";
+
     configureFlags = [
       "--enable-xcache"
       "--enable-xcache-coverager"

From 0cc53d07110ee4cb4600a66b345eb4db4cd3d2e6 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 1 Jul 2015 13:47:53 +0200
Subject: [PATCH 1766/2322] phpPackages.memcached: update from 2.1.0. to 2.2.0

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 21c935d9aad..03259dde82d 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -15,16 +15,16 @@ let self = with self; {
   };
 
   memcached = buildPecl {
-    name = "memcached-2.1.0";
+    name = "memcached-2.2.0";
 
-    sha256 = "1by4zhkq4mbk9ja6s0vlavv5ng8aw5apn3a1in84fkz7bc0l0jdw";
+    sha256 = "0n4z2mp4rvrbmxq079zdsrhjxjkmhz6mzi7mlcipz02cdl7n1f8p";
 
     configureFlags = [
       "--with-zlib-dir=${pkgs.zlib}"
       "--with-libmemcached-dir=${pkgs.libmemcached}"
     ];
 
-    buildInputs = [ pkgs.cyrus_sasl ];
+    buildInputs = with pkgs; [ pkgconfig cyrus_sasl ];
   };
 
   xdebug = buildPecl {

From 3eafad1a3cb7fa06a248c97aba0fa6fa6b001785 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 1 Jul 2015 18:30:55 +0200
Subject: [PATCH 1767/2322] vimpc: refactor and adopt

---
 pkgs/applications/audio/vimpc/default.nix | 29 ++++++++++-------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix
index 71a07f18e08..25292a4408f 100644
--- a/pkgs/applications/audio/vimpc/default.nix
+++ b/pkgs/applications/audio/vimpc/default.nix
@@ -1,34 +1,29 @@
-{ stdenv, fetchurl, autoconf, automake, mpd_clientlib, ncurses, pcre, pkgconfig, taglib }:
+{ stdenv, fetchFromGitHub, autoreconfHook, mpd_clientlib, ncurses, pcre, pkgconfig
+, taglib }:
 
 stdenv.mkDerivation rec {
   version = "0.09.0";
   name = "vimpc-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/boysetsfrog/vimpc/archive/v${version}.tar.gz";
-    sha256 = "13eb229a5e9eee491765ee89f7fe6a38140a41a01434b117da3869d725c15706";
+  src = fetchFromGitHub {
+    owner = "boysetsfrog";
+    repo = "vimpc";
+    rev = "v${version}";
+    sha256 = "1z9yx2pz84lyng1ig9y4z6pdalwxb80ig7nnzhqfy3pl36hq6shi";
   };
 
-  buildInputs = [ autoconf
-                  automake
-                  mpd_clientlib
-                  ncurses
-                  pcre
-                  pkgconfig
-                  taglib
-                ];
-
-  preConfigure = "./autogen.sh";
+  buildInputs = [ autoreconfHook mpd_clientlib ncurses pcre pkgconfig taglib ];
 
   postInstall = ''
     mkdir -p $out/etc
     cp doc/vimpcrc.example $out/etc
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A vi/vim inspired client for the Music Player Daemon (mpd)";
     homepage = https://github.com/boysetsfrog/vimpc;
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
   };
 }

From 9333155666844d7512309a3bac91e719256d4f6a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 1 Jul 2015 12:14:33 -0500
Subject: [PATCH 1768/2322] qt5: set paths correctly

---
 pkgs/development/libraries/qt-5/5.4/setup-hook.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
index af581f033ba..10b684630df 100644
--- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
@@ -44,9 +44,9 @@ cp "@out@/bin/qmake" "$qtOut/bin"
 cat >"$qtOut/bin/qt.conf" <<EOF
 [Paths]
 Prefix = $qtOut
-Plugins = $qtOut/lib/qt5/plugins
-Imports = $qtOut/lib/qt5/imports
-Qml2Imports = $qtOut/lib/qt5/qml
+Plugins = lib/qt5/plugins
+Imports = lib/qt5/imports
+Qml2Imports = lib/qt5/qml
 EOF
 
 envHooks+=(addQtModule)

From 036f11f323e1fb1cf5bca63ba3778efd3b8a0355 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 1 Jul 2015 12:14:43 -0500
Subject: [PATCH 1769/2322] qt5: set location to qmake in setup-hook

---
 pkgs/development/libraries/qt-5/5.4/setup-hook.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
index 10b684630df..82d4ed5af92 100644
--- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
@@ -48,6 +48,7 @@ Plugins = lib/qt5/plugins
 Imports = lib/qt5/imports
 Qml2Imports = lib/qt5/qml
 EOF
+export QMAKE="$qtOut/bin/qmake"
 
 envHooks+=(addQtModule)
 preConfigurePhases+=" setQMakePath"

From 95578b07f7c75fb637dd11748fe3f7f26f7ebf2b Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 30 Jan 2015 17:02:05 +0100
Subject: [PATCH 1770/2322] khard: init at 0.4.0

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

diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
new file mode 100644
index 00000000000..2eda8acf4b8
--- /dev/null
+++ b/pkgs/applications/misc/khard/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgs, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  version = "0.4.0";
+  name = "khard-${version}";
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
+    sha256 = "0xvg8725297faw5mk7ka4xjc968vq3ix7izd4vmsaqysl43gnh21";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [
+    configobj
+    vobject
+    argparse
+  ];
+
+  buildInputs = with pythonPackages; [
+    pkgs.vdirsyncer
+  ];
+
+  meta = {
+    homepage = https://github.com/scheibler/khard;
+    description = "Console carddav client";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73cf8a6496e..50d083ecafa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11748,6 +11748,8 @@ let
 
   khal = callPackage ../applications/misc/khal { };
 
+  khard = callPackage ../applications/misc/khard { };
+
   kid3 = callPackage ../applications/audio/kid3 {
     qt = qt4;
   };

From f5c91c445f548caf083fa30c523b9cb4d19aaf91 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 1 Jul 2015 20:21:33 +0200
Subject: [PATCH 1771/2322] checkstyle: update from 6.8 to 6.8.1

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

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 994f59c5228..f5c6a9bcd1a 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.8";
+  version = "6.8.1";
   name = "checkstyle-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz";
-    sha256 = "1g1hlsyriciipllw4ki21sbdh5br225w0n86w9i3m2a9slac1rdq";
+    url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
+    sha256 = "12da8msz5459ra0g5smr8daqh88mfa653nn475acjp1ycsm395hv";
   };
 
   installPhase = ''

From ee34bde5e5087c9b11a48f81022485f073e4fed3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 1 Jul 2015 20:14:00 +0200
Subject: [PATCH 1772/2322] ocaml-csv: 1.3.3 -> 1.4

---
 .../development/ocaml-modules/csv/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix
index 09679ced744..16f755f17b3 100644
--- a/pkgs/development/ocaml-modules/csv/default.nix
+++ b/pkgs/development/ocaml-modules/csv/default.nix
@@ -1,29 +1,30 @@
-{stdenv, fetchurl, ocaml, findlib}:
-
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
+{ stdenv, fetchzip, ocaml, findlib }:
 
 stdenv.mkDerivation {
 
-  name = "ocaml-csv-1.3.3";
+  name = "ocaml-csv-1.4";
 
-  src = fetchurl {
-    url = "https://forge.ocamlcore.org/frs/download.php/1376/csv-1.3.3.tar.gz";
-    sha256 = "19qsvw3n7k4xpy0sw7n5s29kzj91myihjljhr5js6xcxwj4cydh2";
+  src = fetchzip {
+    url = https://github.com/Chris00/ocaml-csv/releases/download/1.4/csv-1.4.tar.gz;
+    sha256 = "0si0v79rxzyzmgyhd6lidpzxdlcpprlhg0pgrsf688g83xsclkwa";
   };
 
   buildInputs = [ ocaml findlib ];
 
   createFindlibDestdir = true;
 
-  configurePhase = "ocaml setup.ml -configure --prefix $out";
+  configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests";
 
   buildPhase = "ocaml setup.ml -build";
 
+  doCheck = true;
+  checkPhase = "ocaml setup.ml -test";
+
   installPhase = "ocaml setup.ml -install";
 
   meta = with stdenv.lib; {
     description = "A pure OCaml library to read and write CSV files";
-    homepage = "https://forge.ocamlcore.org/projects/csv/";
+    homepage = https://github.com/Chris00/ocaml-csv;
     license = licenses.lgpl21;
     maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms;

From af7b23649aa67b16603f56f3cb80474e09e44054 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 1 Jul 2015 20:16:50 +0200
Subject: [PATCH 1773/2322] ocaml-re: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix
index 457b45a575e..5e7ae1cba09 100644
--- a/pkgs/development/ocaml-modules/re/default.nix
+++ b/pkgs/development/ocaml-modules/re/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchzip, ocaml, findlib }:
+{ stdenv, fetchzip, ocaml, findlib, ounit }:
 
 stdenv.mkDerivation rec {
-  name = "ocaml-re-1.4.0";
+  name = "ocaml-re-1.4.1";
 
   src = fetchzip {
     url = "https://github.com/ocaml/ocaml-re/archive/${name}.tar.gz";
-    sha256 = "1xcfmhjgd7prqx2g1addlrk84xpfafmqnpjkqrvg7mw0hn1p7v2m";
+    sha256 = "1wmfgazydd20hc796zisqpmsw0sb5lv9g3x77ckmf50v3z8hyhvk";
   };
 
-  buildInputs = [ ocaml findlib ];
+  buildInputs = [ ocaml findlib ounit ];
 
-  configurePhase = "ocaml setup.ml -configure --prefix $out";
+  configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests";
   buildPhase = "ocaml setup.ml -build";
+  doCheck = true;
+  checkPhase = "ocaml setup.ml -test";
   installPhase = "ocaml setup.ml -install";
 
   createFindlibDestdir = true;

From dab57252b1b47c70dc209a8b1fa4fbafc04b323a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 1 Jul 2015 20:17:49 +0200
Subject: [PATCH 1774/2322] ocaml-qcheck: init at 0.4.0.1

---
 .../ocaml-modules/qcheck/default.nix          | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/qcheck/default.nix

diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix
new file mode 100644
index 00000000000..260a1fc9811
--- /dev/null
+++ b/pkgs/development/ocaml-modules/qcheck/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchzip, ocaml, findlib, oasis, ounit }:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4";
+
+stdenv.mkDerivation {
+
+  name = "ocaml-qcheck-0.4.0.1";
+  src = fetchzip {
+    url = https://github.com/c-cube/qcheck/archive/0.4.0.1.tar.gz;
+    sha256 = "0j2jdrfz8rrslgjihnfgg8yy12860z2vvf7hqzjbmfmf03hz4pgv";
+  };
+
+  buildInputs = [ ocaml findlib oasis ounit ];
+
+  configureFlags = "--enable-tests --enable-ounit";
+
+  doCheck = true;
+  checkPhase = "ocaml setup.ml -test";
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "QuickCheck inspired property-based testing for OCaml";
+    homepage = https://github.com/c-cube/qcheck/;
+    license = stdenv.lib.licenses.bsd2;
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73cf8a6496e..495f0d35988 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4545,6 +4545,10 @@ let
 
     pycaml = callPackage ../development/ocaml-modules/pycaml { };
 
+    qcheck = callPackage ../development/ocaml-modules/qcheck {
+      oasis = ocaml_oasis;
+    };
+
     qtest = callPackage ../development/ocaml-modules/qtest {
       oasis = ocaml_oasis;
     };

From 9a97c3c7aed398d1d86f93a817f3cdf7ea1a3d85 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 1 Jul 2015 20:19:50 +0200
Subject: [PATCH 1775/2322] ocaml-stringext: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/pkgs/development/ocaml-modules/stringext/default.nix
index dae947035d2..961ee4b1fcd 100644
--- a/pkgs/development/ocaml-modules/stringext/default.nix
+++ b/pkgs/development/ocaml-modules/stringext/default.nix
@@ -1,19 +1,25 @@
-{ stdenv, fetchzip, ocaml, findlib }:
+{ stdenv, fetchzip, ocaml, findlib, ounit, qcheck
+# Optionally enable tests; test script use OCaml-4.01+ features
+, doCheck ? stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"
+}:
 
-let version = "1.3.0"; in
+let version = "1.4.0"; in
 
 stdenv.mkDerivation {
   name = "ocaml-stringext-${version}";
 
   src = fetchzip {
     url = "https://github.com/rgrinberg/stringext/archive/v${version}.tar.gz";
-    sha256 = "0sd1chyxclmip0nxqhasp1ri91bwxr8nszkkr5kpja45f6bav6k9";
+    sha256 = "1jp0x9rkss8a48z9wbnc4v5zvmnysin30345psl3xnxb2aqzwlii";
   };
 
-  buildInputs = [ ocaml findlib ];
+  buildInputs = [ ocaml findlib ounit qcheck ];
 
-  configurePhase = "ocaml setup.ml -configure --prefix $out";
+  configurePhase = "ocaml setup.ml -configure --prefix $out"
+  + stdenv.lib.optionalString doCheck " --enable-tests";
   buildPhase = "ocaml setup.ml -build";
+  inherit doCheck;
+  checkPhase = "ocaml setup.ml -test";
   installPhase = "ocaml setup.ml -install";
 
   createFindlibDestdir = true;

From ba4ddf51efe55707eac722f5bf00c12f250864ff Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 1 Jul 2015 20:20:19 +0200
Subject: [PATCH 1776/2322] ocaml-uri: 1.9.0 -> 1.9.1

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

diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix
index 41cd2f64823..03620d05f54 100644
--- a/pkgs/development/ocaml-modules/uri/default.nix
+++ b/pkgs/development/ocaml-modules/uri/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchzip, ocaml, findlib, re, sexplib, stringext }:
+{ stdenv, fetchzip, ocaml, findlib, re, sexplib, stringext, ounit }:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4";
 
-let version = "1.9.0"; in
+let version = "1.9.1"; in
 
 stdenv.mkDerivation {
   name = "ocaml-uri-${version}";
 
   src = fetchzip {
     url = "https://github.com/mirage/ocaml-uri/archive/v${version}.tar.gz";
-    sha256 = "13vbv6q7npl2bvvqfw03mav90jcrrvjbdpdp4y8mcjz0iax5ww9b";
+    sha256 = "0v3jxqgyi4kj92r3x83rszfpnvvzy9lyb913basch4q64yka3w85";
   };
 
-  buildInputs = [ ocaml findlib ];
+  buildInputs = [ ocaml findlib ounit ];
   propagatedBuildInputs = [ re sexplib stringext ];
 
-  configurePhase = "ocaml setup.ml -configure --prefix $out";
+  configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests";
   buildPhase = ''
     ocaml setup.ml -build
     ocaml setup.ml -doc
   '';
+  doCheck = true;
+  checkPhase = "ocaml setup.ml -test";
   installPhase = "ocaml setup.ml -install";
 
   createFindlibDestdir = true;

From 2663f24a4861b5cb3fd86845bc222a3d219d4130 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 1 Jul 2015 20:22:55 +0200
Subject: [PATCH 1777/2322] ocp-index: 1.1.1 -> 1.1.2

---
 pkgs/development/tools/ocaml/ocp-index/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix
index 767a5e17cb4..c901d676b90 100644
--- a/pkgs/development/tools/ocaml/ocp-index/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-index/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }:
+{ stdenv, fetchurl, fetchzip, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }:
 
 let inherit (stdenv.lib) getVersion versionAtLeast optional; in
 
@@ -6,7 +6,13 @@ assert versionAtLeast (getVersion ocaml) "3.12.1";
 assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
 assert versionAtLeast (getVersion ocpIndent) "1.4.2";
 
-let version = "1.1.1"; in
+let
+  version = "1.1.2";
+  patch402 = fetchurl {
+    url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocp-index/ocp-index.1.1.2/files/ocaml.4.02.patch;
+    sha256 = "1wcpn2pv7h8ia3ybmzdlm8v5hfvq1rgmlj02wwj0yh3vqjvxqvsm";
+  };
+in
 
 stdenv.mkDerivation {
 
@@ -14,9 +20,11 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "http://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz";
-    sha256 = "173lqbyivwv1zf9ifpxa9f8m2y3kybzs3idrwyzy824ixdqv2fww";
+    sha256 = "0cz0bz5nisc5r23b1w07q2bl489gd09mg8rp9kyq9m6rj669b18l";
   };
 
+  patches = optional (versionAtLeast (getVersion ocaml) "4.02") patch402;
+
   buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ]
   ++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm;
   propagatedBuildInputs = [ ocpIndent ];

From 8a3a3c7c4bf67bc4812279f53a789e9d8b695c59 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 1 Jul 2015 20:38:03 +0200
Subject: [PATCH 1778/2322] qt54: fix setup-hook.sh, lib/ was not populated in
 some cases

---
 pkgs/development/libraries/qt-5/5.4/setup-hook.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
index af581f033ba..8c1a6094dc5 100644
--- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
@@ -20,9 +20,11 @@ addQtModule() {
             fi
         fi
 
-        if [[ -n $qtSubmodule ]] && [[ -d "$1/lib" ]]; then
+        if [[ -d "$1/lib" ]]; then
             @lndir@/bin/lndir -silent "$1/lib" "$qtOut/lib"
-            find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs"
+            if [[ -n $qtSubmodule ]]; then
+                find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs"
+            fi
         fi
     fi
 }

From c148309f944a515b8c27d997e43701207cd730d2 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 1 Jul 2015 20:07:29 +0200
Subject: [PATCH 1779/2322] gpgme: 1.5.4 -> 1.5.5

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

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index d4913ef21f6..8cab2c25fc4 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -11,11 +11,11 @@ let
     "${gnupg}/bin/gpg2";
 in
 stdenv.mkDerivation rec {
-  name = "gpgme-1.5.4";
+  name = "gpgme-1.5.5";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${name}.tar.bz2";
-    sha256 = "0v7azxazsfakvhrxzj5ysvcxma0892c89d27c17fkj8mi3nc0f5v";
+    sha256 = "01y28fkq52wwf4p470wscaxd2vgzl615irmafx3mj3380x8ksg8b";
   };
 
   propagatedBuildInputs = [ libgpgerror glib libassuan pth ];

From ab9e8538012cee71575ca4c019b1e67621515831 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 1 Jul 2015 20:41:40 +0200
Subject: [PATCH 1780/2322] cloc: 1.62 -> 1.64

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

diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index 8d7ba0c70c8..bb278dbe1b1 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
 
   name = "cloc-${version}";
 
-  version = "1.62";
+  version = "1.64";
 
   src = fetchurl {
     url = "mirror://sourceforge/cloc/cloc-${version}.tar.gz";
-    sha256 = "1cxc663dccd0sc2m0aj5lxdbnbzrys6rh9n8q122h74bfvsiw4f4";
+    sha256 = "1w3mz69h2i7pscvi9q7yp7wimds8g38c5ph78cj5pvjl5wa035rh";
   };
 
   buildInputs = [ perl AlgorithmDiff RegexpCommon ];

From 279057da8d1f64dd627768e134807e45a8727d63 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 1 Jul 2015 20:46:19 +0200
Subject: [PATCH 1781/2322] klaus: 0.4.9 -> 0.4.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 2281b566fca..e077ff2cff8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6654,12 +6654,12 @@ let
   };
 
   klaus = buildPythonPackage rec {
-    version = "0.4.9";
+    version = "0.4.10";
     name = "klaus-${version}";
 
     src = pkgs.fetchurl {
       url = "https://github.com/jonashaag/klaus/archive/${version}.tar.gz";
-      sha256 = "0qcbv3shz530mn53pdc68fx38ylz72033xsrz77ffi0cks32az2w";
+      sha256 = "1yq1dz3cd2qdn8vi1ivf6biab76cfmcvis07d6a8039w5wxdzc80";
     };
 
     propagatedBuildInputs = with self;

From 5f462f0eae09402cbd06603c0094cbe58c5881e0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 1 Jul 2015 22:06:39 +0200
Subject: [PATCH 1782/2322] xconq: fix build and refactor

---
 pkgs/games/xconq/default.nix | 100 +++++++++++++----------------------
 1 file changed, 38 insertions(+), 62 deletions(-)

diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix
index 413ecccc76e..53c3ec7dec8 100644
--- a/pkgs/games/xconq/default.nix
+++ b/pkgs/games/xconq/default.nix
@@ -1,55 +1,18 @@
-x@{builderDefsPackage
-  , rpm, cpio, xproto, libX11, libXmu, libXaw, libXt, tcl, tk, libXext
-  , fontconfig
-  , makeWrapper
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, cpio, xproto, libX11, libXmu, libXaw, libXt, tcl, tk
+, libXext, fontconfig, makeWrapper }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="xconq";
-    version="7.5.0-0pre.0.20050612";
-    name="${baseName}-${version}";
-    extension="src.rpm";
-    project="${baseName}";
-    url="mirror://sourceforge/project/${project}/${baseName}/${name}/${baseName}-${version}.${extension}";
-    hash="0i41dz95af2pzmmjz0sc1n0wdxy7gjqlfcl503hw1xd5zza2lw2j";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "${baseName}-${version}";
+  baseName="xconq";
+  version = "7.5.0-0pre.0.20050612";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/project/${baseName}/${baseName}/${name}/${name}.tar.gz";
+    sha256 = "1za78yx57mgwcmmi33wx3533yz1x093dnqis8q2qmqivxav51lca";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["addInputs" "doUnpack" "fixMakefiles" "fixCfiles" "fixTCLfiles" 
-    "doConfigure" "doMakeInstall" "doWrap"];
-      
-  doWrap = a.makeManyWrappers ''$out/bin/*'' ''--prefix TCLLIBPATH ' ' "${tk}/lib"'';
-
-  fixMakefiles = a.fullDepEntry ''
-    find . -name 'Makefile.in' -exec sed -re 's@^        ( *)(cd|[&][&])@	\1\2@' -i '{}' ';'
-    find . -name 'Makefile.in' -exec sed -e '/chown/d; /chgrp/d' -i '{}' ';'
-    sed -e '/^			* *[$][(]tcltkdir[)]\/[*][.][*]/d' -i tcltk/Makefile.in
-  '' ["minInit" "doUnpack"];
-
-  fixCfiles = a.fullDepEntry ''
-    sed -re 's@[(]int[)]color@(long)color@' -i tcltk/tkmap.c
-    sed -re '/unitp = view_unit[(]uview[)]/aelse *unitp = NULL\;' -i tcltk/tkmap.c
-  '' ["minInit" "doUnpack"];
-
-  fixTCLfiles = a.fullDepEntry ''
-    sed -re 's@MediumBlue@LightBlue@g' -i tcltk/tkconq.tcl
-  '' ["minInit" "doUnpack"];
+  buildInputs = [ cpio xproto libX11 libXmu libXaw libXt tcl tk libXext
+    fontconfig makeWrapper ];
 
   configureFlags = [
     "--enable-alternate-scoresdir=scores"
@@ -57,17 +20,30 @@ rec {
     "--with-tkconfig=${tk}/lib"
   ];
 
-  meta = {
-    description = "A programmable turn-based strategy game";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.gpl2;
-  };
-  passthru = {
-  };
-}) x
+  patchPhase = ''
+    # Fix Makefiles
+    find . -name 'Makefile.in' -exec sed -re 's@^        ( *)(cd|[&][&])@	\1\2@' -i '{}' ';'
+    find . -name 'Makefile.in' -exec sed -e '/chown/d; /chgrp/d' -i '{}' ';'
+    sed -e '/^			* *[$][(]tcltkdir[)]\/[*][.][*]/d' -i tcltk/Makefile.in
 
+    # Fix C files
+    sed -re 's@[(]int[)]color@(long)color@' -i tcltk/tkmap.c
+    sed -re '/unitp = view_unit[(]uview[)]/aelse *unitp = NULL\;' -i tcltk/tkmap.c
+
+    # Fix TCL files
+    sed -re 's@MediumBlue@LightBlue@g' -i tcltk/tkconq.tcl
+  '';
+
+  postInstall = ''
+    for file in $out/bin/*; do
+      wrapProgram $file --prefix TCLLIBPATH ' ' "${tk}/lib"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A programmable turn-based strategy game";
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+  };
+}

From 028f6b3b625fa6602392b3ca2114fa95d73567a5 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <maurer@matthewmaurer.org>
Date: Wed, 1 Jul 2015 19:19:04 +0000
Subject: [PATCH 1783/2322] ulex: enable mac building

I've tested that ulex builds (and works) on OSX, and see no reason
it would not do so on other platforms, so I'm lifting the linux
restriction in platforms.
---
 pkgs/development/ocaml-modules/ulex/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix
index 7c8acafe769..61c52278621 100644
--- a/pkgs/development/ocaml-modules/ulex/default.nix
+++ b/pkgs/development/ocaml-modules/ulex/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     homepage = http://www.cduce.org/download.html;
     description = "A lexer generator for Unicode and OCaml";
     license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = ocaml.meta.platforms;
     maintainers = [ stdenv.lib.maintainers.roconnor ];
   };
 }

From 05aa0c09909c1fafaf95f29f8905ba9002922ba2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 1 Jul 2015 13:28:55 -0700
Subject: [PATCH 1784/2322] mbedtls: Remove postInstall workarounds that were
 fixed upstream

Fixed by upstream commit f5203e0bb5a33b65aafdeb35fb6082ea69d700ff.
---
 pkgs/development/libraries/mbedtls/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index 75ce53f8db3..c37aea46eed 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -22,13 +22,6 @@ stdenv.mkDerivation rec {
     "DESTDIR=\${out}"
   ];
 
-  postInstall = ''
-    rm -f $out/lib/lib{mbedtls.so.8,polarssl.{a,so}}
-    ln -s libmbedtls.so $out/lib/libmbedtls.so.8
-    ln -s libmbedtls.so $out/lib/libpolarssl.so
-    ln -s libmbedtls.a $out/lib/libpolarssl.a
-  '';
-
   doCheck = true;
 
   meta = with stdenv.lib; {

From f6edc25af64800cb326b6dcdbb198df9e6fba690 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 1 Jul 2015 23:12:03 +0200
Subject: [PATCH 1785/2322] blitz: fix build

---
 pkgs/development/libraries/blitz/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix
index a64a8bd5943..e6f59ca8efe 100644
--- a/pkgs/development/libraries/blitz/default.nix
+++ b/pkgs/development/libraries/blitz/default.nix
@@ -32,8 +32,7 @@ stdenv.mkDerivation rec {
   patches = [ ./blitz-gcc47.patch ./blitz-testsuite-stencil-et.patch ];
 
   buildInputs = [ pkgconfig gfortran texinfo ]
-    ++ optional (boost != null) boost
-    ;
+    ++ optional (boost != null) [ boost.lib ];
 
   configureFlags =
     [ "--enable-shared"

From b6db9b95533c363e81f7487b4d797a304aad2aa4 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 1 Jul 2015 23:42:49 +0200
Subject: [PATCH 1786/2322] src: update from 0.13 to 0.19

---
 .../version-management/src/default.nix        | 19 +++---------
 .../version-management/src/path.patch         | 30 -------------------
 2 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/applications/version-management/src/path.patch

diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index 0e98791d823..f6fdff16204 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -1,24 +1,16 @@
 { stdenv, fetchurl, python, rcs, git }:
 
 stdenv.mkDerivation rec {
-  name = "src-0.13";
+  name = "src-0.19";
 
   src = fetchurl {
     url = "http://www.catb.org/~esr/src/${name}.tar.gz";
-    sha256 = "03x0slgi6bnzgfn7f9qbl6jma0pj7357kwdh832l3v8zafk41p51";
+    sha256 = "0p56g09ndbmnxxjz2rn7fq3yjx572ywj0xdim9rz5cqnx0pmr71x";
   };
 
-  buildInputs = [ python ];
+  buildInputs = [ python rcs git ];
 
-  patches = [ ./path.patch ];
-
-  postPatch = ''
-    sed -i \
-      -e 's|@python@|${python}|' \
-      -e 's|@rcs@|${rcs}|' \
-      -e 's|@git@|${git}|' \
-      src srctest
-  '';
+  preConfigure = "patchShebangs .";
 
   makeFlags = [ "prefix=$(out)" ];
 
@@ -26,11 +18,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Simple single-file revision control";
-
     homepage = http://www.catb.org/~esr/src/;
-
     license = stdenv.lib.licenses.bsd3;
-
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/applications/version-management/src/path.patch b/pkgs/applications/version-management/src/path.patch
deleted file mode 100644
index ef500c8e04e..00000000000
--- a/pkgs/applications/version-management/src/path.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur src-0.13-orig/src src-0.13/src
---- src-0.13-orig/src	2014-11-24 03:56:16.000000000 -0500
-+++ src-0.13/src	2014-11-26 16:32:32.925151003 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2
-+#!@python@/bin/python
- #
- # src - simple revision control.
- #
-@@ -51,6 +51,8 @@
- 
- import sys, os, subprocess, time, calendar, stat, glob, shutil, hashlib
- 
-+os.environ['PATH'] = "@rcs@/bin:@git@/bin:" + os.environ['PATH']
-+
- version="0.13"
- 
- def rfc3339(t):
-diff -Naur src-0.13-orig/srctest src-0.13/srctest
---- src-0.13-orig/srctest	2014-11-21 08:12:00.000000000 -0500
-+++ src-0.13/srctest	2014-11-26 16:33:13.627715388 -0500
-@@ -12,7 +12,7 @@
- 
- # Set the PATH to include the current directory, so the repository
- # head version of src can always be tested.
--PATH="$(pwd)":$PATH
-+PATH="$(pwd)":@git@/bin:$PATH
- 
- trap "rm -fr $SANDBOX" 0 1 2 15
- 

From 571d878e4090b0985ff44d0ddcd9dda75467823f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 2 Jul 2015 00:02:24 +0200
Subject: [PATCH 1787/2322] botan: fix build

---
 pkgs/development/libraries/botan/generic.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index 5880ae772ce..c4a13b55fd8 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -26,10 +26,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  preInstall = ''
-    patchShebangs src/scripts
-  '';
-
   postInstall = ''
     cd "$out"/lib/pkgconfig
     ln -s botan-*.pc botan.pc || true

From f0c00accd46479a95518fa91f0f1a258a6f74b41 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 2 Jul 2015 00:17:58 +0200
Subject: [PATCH 1788/2322] crackxls: fix build

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

diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix
index 37e3e048a76..f4c92ac701f 100644
--- a/pkgs/tools/security/crackxls/default.nix
+++ b/pkgs/tools/security/crackxls/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   installPhase =
   ''
-    mkdir $out/bin
+    mkdir -p $out/bin
     cp crackxls2003 $out/bin/
   '';
 

From 4023da623702c40bb8f998fbc32f6e9596688052 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 1 Jul 2015 17:43:04 +0200
Subject: [PATCH 1789/2322] ccache: drop unnecessary perl dependency

Backport a one-line patch to remove the test suite's dependency on
perl, which, while not exactly heavy, is unnecessary.
---
 .../development/tools/misc/ccache/default.nix | 13 +++----
 .../ccache/test-drop-perl-requirement.patch   | 36 +++++++++++++++++++
 2 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/tools/misc/ccache/test-drop-perl-requirement.patch

diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index f7d2dfc4957..0762d175e89 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchurl, runCommand, gcc, perl, zlib }:
+{ stdenv, fetchurl, runCommand, gcc, zlib }:
 
 let
   # TODO: find out if there's harm in just using 'rec' instead.
   name = "ccache-${version}";
   version = "3.2.2";
   sha256 = "1jm0qb3h5sypllaiyj81zp6m009vm50hzjnx994ril94kxlrj3ag";
-  doCheck = true;
 
   ccache =
 stdenv.mkDerivation {
-  inherit name doCheck;
+  inherit name;
   src = fetchurl {
     inherit sha256;
     url = "mirror://samba/ccache/${name}.tar.xz";
   };
 
-  # The test dependency on perl should be gone in the next release:
-  buildInputs = [ zlib ]
-    ++ stdenv.lib.optionals doCheck [ perl ];
+  patches = [ ./test-drop-perl-requirement.patch ];
+
+  buildInputs = [ zlib ];
+
+  doCheck = true;
 
   passthru = {
     # A derivation that provides gcc and g++ commands, but that
diff --git a/pkgs/development/tools/misc/ccache/test-drop-perl-requirement.patch b/pkgs/development/tools/misc/ccache/test-drop-perl-requirement.patch
new file mode 100644
index 00000000000..ca4c39edc30
--- /dev/null
+++ b/pkgs/development/tools/misc/ccache/test-drop-perl-requirement.patch
@@ -0,0 +1,36 @@
+Since perl is used in just one place and can easily be replaced by a
+little bit of shell, do so.  This makes testing on limited systems
+easier.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ INSTALL.txt | 1 -
+ test.sh     | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/INSTALL.txt b/INSTALL.txt
+index 256beab..f77cbe6 100644
+--- a/INSTALL.txt
++++ b/INSTALL.txt
+@@ -67,7 +67,6 @@ In addition to the prerequisites mentioned above, you also need:
+
+ To debug and run the performance test suite you'll also need:
+
+-- Perl (http://www.perl.org/)
+ - Python (http://www.python.org/)
+
+ Run "./autogen.sh" and then follow the steps mentioned under "Installation"
+diff --git a/test.sh b/test.sh
+index f14e287..1090649 100755
+--- a/test.sh
++++ b/test.sh
+@@ -1834,7 +1834,7 @@ prepare_cleanup_test() {
+     mkdir -p $dir
+     i=0
+     while [ $i -lt 10 ]; do
+-        perl -e 'print "A" x 4017' >$dir/result$i-4017.o
++        printf '%4017s' '' | tr ' ' 'A' >$dir/result$i-4017.o
+         touch $dir/result$i-4017.stderr
+         touch $dir/result$i-4017.d
+         if [ $i -gt 5 ]; then
+--

From 1ea70323d64792ffc23acd96620bf6839a8afd1e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 2 Jul 2015 03:31:00 +0200
Subject: [PATCH 1790/2322] mcelog: 120 -> 121

---
 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 63bab2ddd76..31c360051bb 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "120"; in
+let version = "121"; in
 stdenv.mkDerivation {
   name = "mcelog-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1x50g0vrarcv31x4xszcxkpwklkq6mrv2xr1dxbbds26qz8jk11l";
+    sha256 = "1psdcbr3ssavl35svjzgsy5xl0f2s57s740anvyqy8ziy4k5fjyv";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

From 4fc07740c662ec259c20215b6021e794ca5a5390 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 1 Jul 2015 22:48:21 -0700
Subject: [PATCH 1791/2322] spl: 0.6.4.1 -> 0.6.4.2

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

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index b3332d88512..e28412a2904 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -1,13 +1,13 @@
 { callPackage, fetchFromGitHub, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "0.6.4.1";
+  version = "0.6.4.2";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "spl";
     rev = "spl-${version}";
-    sha256 = "1rlflraj66ag2gcvzsyfl4zwhq4846ifyzdmnnmscwmdf2qxc1l8";
+    sha256 = "101c5fzhnz67ix5w33rb2pwazxmyz6rfvyszbwy1kgh6rz75bjr4";
   };
 
   patches = [ ./const.patch ./install_prefix.patch ];

From ca5c1e418716896d5f7251ba3c720076f00ee69a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 1 Jul 2015 22:49:36 -0700
Subject: [PATCH 1792/2322] spl_git: 2015-06-10 -> 2015-06-29

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

diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix
index da9f57824b9..b2a2f9ffebc 100644
--- a/pkgs/os-specific/linux/spl/git.nix
+++ b/pkgs/os-specific/linux/spl/git.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-06-10";
+  version = "2015-06-29";
 
   src = fetchgit {
     url = git://github.com/zfsonlinux/spl.git;
-    rev = "2345368646151718fa59986d9e2d9d38bcdecb2c";
-    sha256 = "08k7ahqgqrf9i118mkfxm01h8s607zp8lyvbvm1crii50dwlvl3g";
+    rev = "77ab5dd33a99bdf7fb062f0ea327582236a225b3";
+    sha256 = "1hbn8hi305cn15nlcm9x99nczjqjkhdc38hzww11xn78py8d90w9";
   };
 
   patches = [ ./const.patch ./install_prefix.patch ];

From f6f9b9574d32db0e2baeb21eca5bc0d6fb67b9ab Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 1 Jul 2015 22:50:49 -0700
Subject: [PATCH 1793/2322] zfs: 0.6.4.1 -> 0.6.4.2

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

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 6ed168c70be..399169b364e 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -1,17 +1,14 @@
 { callPackage, fetchFromGitHub, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "0.6.4.1";
+  version = "0.6.4.2";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "zfs";
     rev = "zfs-${version}";
-    sha256 = "15fh1b2rvzvx4j3vgkwrgy2sd553bzwcvk1zai6phjhb6i2rw8v4";
+    sha256 = "192x4z5am5wgrr4hb5skshyr5a6af52xpnk6pni4hs4pxvlpcs37";
   };
 
-  patches = [
-    ./nix-build.patch
-    ./kernel-4.1-compat.patch
-  ];
+  patches = [ ./nix-build.patch ];
 })

From 54022375eb3ae3375385717690ef133c819c9bf1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 1 Jul 2015 22:52:09 -0700
Subject: [PATCH 1794/2322] zfs_git: 2015-06-22 -> 2015-07-01

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

diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix
index c6088595dcf..0df47e612e2 100644
--- a/pkgs/os-specific/linux/zfs/git.nix
+++ b/pkgs/os-specific/linux/zfs/git.nix
@@ -1,12 +1,12 @@
 { callPackage, stdenv, fetchgit, spl_git, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-06-22";
+  version = "2015-07-01";
 
   src = fetchgit {
     url = git://github.com/zfsonlinux/zfs.git;
-    rev = "72540ea3148a2bc03860d7d59b2b5fdc9a5cdee7";
-    sha256 = "0428xg5whr7y7r6r1jcfk8q944j948vj2nnzwgsx7cgn3n3v1yyn";
+    rev = "a7b10a931911d3a98a90965795daad031c6d33a2";
+    sha256 = "0llqbc37f4szx7mwi6j3xmxxz03g3ib7cwypmpcyi0nwkssav5xi";
   };
 
   patches = [ ./nix-build.patch ];

From 20dadbe525e7fe2abba4a45cf3d4153de7511a36 Mon Sep 17 00:00:00 2001
From: Artjom Vejsel <akawolf0@gmail.com>
Date: Thu, 2 Jul 2015 09:08:13 +0300
Subject: [PATCH 1795/2322] qtcreator: 3.2.1 -> 3.4.2

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

diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index 47564a112ee..2f8068b9723 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -3,8 +3,8 @@
 with stdenv.lib;
 
 let
-  baseVersion = "3.2";
-  revision = "1";
+  baseVersion = "3.4";
+  revision = "2";
   version = "${baseVersion}.${revision}";
 in
 

From b21fd5d066baadb06ca8e9a2accfcb4e94c60a09 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 2 Jul 2015 00:08:02 -0700
Subject: [PATCH 1796/2322] nixos/postgresql: Fix initdb for existing, empty
 postgres partitions

---
 nixos/modules/services/databases/postgresql.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 328e864ced3..97927055ce3 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -186,8 +186,9 @@ in
         preStart =
           ''
             # Initialise the database.
-            if ! test -e ${cfg.dataDir}; then
+            if ! test -e ${cfg.dataDir}/PG_VERSION; then
                 mkdir -m 0700 -p ${cfg.dataDir}
+                rm -f ${cfg.dataDir}/*.conf
                 if [ "$(id -u)" = 0 ]; then
                   chown -R postgres ${cfg.dataDir}
                   su -s ${pkgs.stdenv.shell} postgres -c 'initdb -U root'
@@ -195,8 +196,6 @@ in
                   # For non-root operation.
                   initdb
                 fi
-                rm -f ${cfg.dataDir}/*.conf
-                touch "${cfg.dataDir}/.first_startup"
             fi
 
             ln -sfn "${configFile}" "${cfg.dataDir}/postgresql.conf"

From 60c33c16a0a1c3ab4f2b093c215d5f43f213fece Mon Sep 17 00:00:00 2001
From: Alexander Flatter <flatter@fastmail.fm>
Date: Thu, 2 Jul 2015 11:10:24 +0200
Subject: [PATCH 1797/2322] nodejs: Don't apply no-darwin-cflags

The no-darwin-cflags patch does not apply cleanly anymore, but
apparently it's also not necessary.
---
 pkgs/development/web/nodejs/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index c8f2d94e40a..151033bfe24 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -47,9 +47,6 @@ in stdenv.mkDerivation {
 
   patches = if stdenv.isDarwin then [ ./no-xcode.patch ] else null;
 
-  postPatch = if stdenv.isDarwin then ''
-    (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch})
-  '' else null;
 
   buildInputs = [ python which ]
     ++ (optional stdenv.isLinux utillinux)

From b65d351c30ffa5a69f9614468c28b7b435339024 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 2 Jul 2015 12:26:44 +0200
Subject: [PATCH 1798/2322] duperemove: Update from 0.09.beta2 to 0.09.4.

Also switches to fetchFromGitHub to remove the need to depend on Git for
fetching the source tarball.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/filesystems/duperemove/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix
index 087012d62a1..4836e39d439 100644
--- a/pkgs/tools/filesystems/duperemove/default.nix
+++ b/pkgs/tools/filesystems/duperemove/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, libgcrypt, pkgconfig, glib, linuxHeaders }:
+{ lib, stdenv, fetchFromGitHub, libgcrypt, pkgconfig, glib, linuxHeaders }:
 
 stdenv.mkDerivation rec {
   name = "duperemove-${version}";
-  version = "0.09.beta2";
+  version = "0.09.4";
 
-  src = fetchurl {
-    url = "https://github.com/markfasheh/duperemove/archive/v${version}.tar.gz";
-    sha256 = "0rn7lf9rjf4ypgfwms2y7b459rri4rfn809h6wx8xl9nbm5niil4";
+  src = fetchFromGitHub {
+    owner = "markfasheh";
+    repo = "duperemove";
+    rev = "v${version}";
+    sha256 = "1d586k6rbfqb5557i1p5xq8ngbppbwpxlkw8wqm7d900a3hp36nl";
   };
 
   buildInputs = [ libgcrypt pkgconfig glib linuxHeaders ];

From 05baf485f6bc1acc463b37693ac33846beaa854a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Jul 2015 14:27:47 +0200
Subject: [PATCH 1799/2322] ilmbase, openexr: Use fetchurl

Also, enable parallel building.

(cherry picked from commit 6c06d7467edea0a5163aeb53f72750abcb044bbe)
---
 .../development/libraries/ilmbase/default.nix | 15 +++++------
 .../development/libraries/openexr/default.nix | 27 ++++++++-----------
 pkgs/development/libraries/openexr/source.nix | 11 --------
 3 files changed, 18 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/development/libraries/openexr/source.nix

diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix
index 816a9c023e1..742048c9ae6 100644
--- a/pkgs/development/libraries/ilmbase/default.nix
+++ b/pkgs/development/libraries/ilmbase/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, openexr, automake, autoconf, libtool, which }:
+{ stdenv, fetchurl, automake, autoconf, libtool, which }:
 
-stdenv.mkDerivation {
-  name = "ilmbase-${openexr.source.version}";
-  
-  src = openexr.source.src;
+stdenv.mkDerivation rec {
+  name = "ilmbase-2.2.0";
 
-  prePatch = ''
-    cd IlmBase
-  '';
+  src = fetchurl {
+    url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
+    sha256 = "1izddjwbh1grs8080vmaix72z469qy29wrvkphgmqmcm0sv1by7c";
+  };
 
   preConfigure = ''
     ./bootstrap
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 63a8c11a341..71420ba425c 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -1,33 +1,28 @@
-{ stdenv, callPackage, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
-let
-  source = callPackage ./source.nix { };
-in
-stdenv.mkDerivation rec {
-  name = "openexr-${source.version}";
-  
-  src = source.src;
+{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
 
-  prePatch = ''
-    cd OpenEXR
-  '';
+stdenv.mkDerivation rec {
+  name = "openexr-${lib.getVersion ilmbase}";
+
+  src = fetchurl {
+    url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
+    sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n";
+  };
 
   preConfigure = ''
     ./bootstrap
   '';
 
-  configureFlags = [ "--enable-imfexamples" ];
-  
   buildInputs = [ autoconf automake libtool pkgconfig ];
   propagatedBuildInputs = [ ilmbase zlib ];
 
+  enableParallelBuilding = true;
+
   patches = [ ./bootstrap.patch ];
-  
+
   meta = with stdenv.lib; {
     homepage = http://www.openexr.com/;
     license = licenses.bsd3;
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington ];
   };
-
-  passthru.source = source;
 }
diff --git a/pkgs/development/libraries/openexr/source.nix b/pkgs/development/libraries/openexr/source.nix
deleted file mode 100644
index 30675dc54ec..00000000000
--- a/pkgs/development/libraries/openexr/source.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ fetchFromGitHub }:
-rec {
-  version = "2.2.0";
-
-  src = fetchFromGitHub {
-    owner = "openexr";
-    repo = "openexr";
-    rev = "v${version}";
-    sha256 = "030vj2jk3n65x1wl0rmxzpl1bd5mzmld2lzn7sg92svpnghry6a8";
-  };
-}

From 24d922ec3a7c7125d1b26cd8d76f90d4a613cde2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Jul 2015 15:01:04 +0200
Subject: [PATCH 1800/2322] openimageio: Update to 1.4.16 and fix name

(cherry picked from commit 17994d9e54448d71246f1221b188118fa7653ff7)
---
 pkgs/applications/graphics/openimageio/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index 473db68dc27..de37482d51e 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "oiio-${version}";
-  version = "1.4.15";
+  name = "openimageio-${version}";
+  version = "1.4.16";
 
   src = fetchurl {
     url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
-    sha256 = "1fc5v3qmrzf9qx765fd15r2dc3ccrz4xf4f9q4cwsrspmaxqyqzs";
+    sha256 = "0f9gspsjhniz992c04dm4lvffzz7zjqn1n34nqn6c32r498kimcj";
   };
 
   buildInputs = [
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
       INSTALLDIR=$out dist_dir=
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = http://www.openimageio.org;
     description = "A library and tools for reading and writing images";

From f3e2b312978c7e2ce0d1cb3a0ba0fd72e945f450 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Jul 2015 14:50:57 +0200
Subject: [PATCH 1801/2322] blender: Update to 2.75

(cherry picked from commit 36779d90e2b7e93ec5387cc5b5d106a037eb3d11)
---
 pkgs/applications/misc/blender/default.nix         |  6 ++----
 pkgs/applications/misc/blender/sm52.patch          | 12 ------------
 pkgs/development/libraries/opencollada/default.nix |  4 ++--
 3 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/applications/misc/blender/sm52.patch

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index b717f3044bc..c0420d6ac67 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -10,15 +10,13 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "blender-2.74";
+  name = "blender-2.75";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "178i19pz7jl79b4wn92869j6qymawsa0kaw1dxaprbjnqsvcx8qc";
+    sha256 = "1r3qyj57g06ir424q7szxkyb6h0b7laq7f126158kgs94xpkhlsz";
   };
 
-  patches = [ ./sm52.patch ];
-
   buildInputs =
     [ SDL boost cmake ffmpeg gettext glew ilmbase libXi
       libjpeg libpng libsamplerate libsndfile libtiff mesa openal
diff --git a/pkgs/applications/misc/blender/sm52.patch b/pkgs/applications/misc/blender/sm52.patch
deleted file mode 100644
index 7cb86c53bdd..00000000000
--- a/pkgs/applications/misc/blender/sm52.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' blender-2.73a-orig/CMakeLists.txt blender-2.73a/CMakeLists.txt
---- blender-2.73a-orig/CMakeLists.txt	2015-01-21 13:31:24.000000000 +0100
-+++ blender-2.73a/CMakeLists.txt	2015-03-01 23:14:22.962585422 +0100
-@@ -351,7 +351,7 @@
- option(WITH_CYCLES_STANDALONE_GUI	"Build cycles standalone with GUI" OFF)
- option(WITH_CYCLES_OSL				"Build Cycles with OSL support" ${_init_CYCLES_OSL})
- option(WITH_CYCLES_CUDA_BINARIES	"Build cycles CUDA binaries" OFF)
--set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_50 CACHE STRING "CUDA architectures to build binaries for")
-+set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_50 sm_52 CACHE STRING "CUDA architectures to build binaries for")
- mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
- unset(PLATFORM_DEFAULT)
- option(WITH_CYCLES_LOGGING	"Build cycles with logging support" ON)
diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix
index 20003f23874..eaa90efc131 100644
--- a/pkgs/development/libraries/opencollada/default.nix
+++ b/pkgs/development/libraries/opencollada/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre }:
 
 # The exact revision specified by Blender's install_deps.sh script.
-let rev = "18da7f4109a8eafaa290a33f5550501cc4c8bae8"; in
+let rev = "3335ac164e68b2512a40914b14c74db260e6ff7d"; in
 
 stdenv.mkDerivation {
   name = "opencollada-1.3-${rev}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     owner = "KhronosGroup";
     repo = "OpenCOLLADA";
     inherit rev;
-    sha256 = "0ach32ws95mh0ijd8sr22kxka3riq72bb9ng46vs3615dxn7h18d";
+    sha256 = "0s2m8crbg1kf09hpscrplv65a45dlg157b9c20chrv7wy0qizbw5";
   };
 
   buildInputs = [ cmake pkgconfig ];

From a5360c5b6edd150673b29b90f95e0eee840d6766 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 2 Jul 2015 16:25:24 +0200
Subject: [PATCH 1802/2322] libbladeRF: update from 1.1.0 to 1.4.0

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

diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix
index 18bb9f002e5..b8a4466c8c3 100644
--- a/pkgs/development/libraries/libbladeRF/default.nix
+++ b/pkgs/development/libraries/libbladeRF/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchgit, pkgconfig, cmake, git, doxygen, help2man, tecla, libusb1, udev }:
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, tecla
+, libusb1, udev }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.0";
+  version = "1.4.0";
   name = "libbladeRF-v${version}";
 
-  src = fetchgit {
-    url = "https://github.com/Nuand/bladeRF/";
-    rev = "refs/tags/libbladeRF_v${version}";
-    sha256 = "19qd26yflig51scknyjf3r3nmnc2bni75294jpsv0idzqfj87lbr";
-    name = "libbladeRF_v${version}-checkout";
+  src = fetchFromGitHub {
+    owner = "Nuand";
+    repo = "bladeRF";
+    rev = "libbladeRF_v${version}";
+    sha256 = "1y00hqsmqaix4dql8mb75zx87zvn8b483yxv53x9qyjspksbs60c";
   };
 
   buildInputs = [ pkgconfig cmake git doxygen help2man tecla libusb1 udev ];
@@ -19,7 +20,6 @@ stdenv.mkDerivation rec {
   # Let us avoid nettools as a dependency.
   patchPhase = ''
     sed -i 's/$(hostname)/hostname/' host/utilities/bladeRF-cli/src/cmd/doc/generate.bash
-    sed -i 's/ --no-info/ --no-info --no-discard-stderr/' host/utilities/bladeRF-cli/CMakeLists.txt
   '';
 
   cmakeFlags = [
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
     "-DBUILD_DOCUMENTATION=ON"
   ];
 
-  meta = {
-    homepage = "https://www.nuand.com/";
+  meta = with stdenv.lib; {
+    homepage = https://www.nuand.com/;
     description = "Supporting library of the BladeRF SDR opensource hardware";
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ stdenv.lib.maintainers.funfunctor ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ funfunctor ];
+    platforms = platforms.linux;
   };
 }

From 8f911263e9304740b182ff3781a2a1ace0de5b42 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Tue, 23 Jun 2015 13:36:32 +0200
Subject: [PATCH 1803/2322] Xen Dom0: add dnsmasq to xen-bridge.

---
 nixos/modules/virtualisation/xen-dom0.nix | 101 +++++++++++++++++++---
 1 file changed, 90 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 7b5d714622c..c750286a397 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -47,13 +47,32 @@ in
           '';
       };
 
-    virtualisation.xen.bridge =
-      mkOption {
-        default = "xenbr0";
-        description =
-          ''
-            Create a bridge for the Xen domUs to connect to.
+    virtualisation.xen.bridge = {
+        name = mkOption {
+          default = "xenbr0";
+          description = ''
+              Name of bridge the Xen domUs connect to.
+            '';
+        };
+
+        address = mkOption {
+          type = types.str;
+          default = "172.16.0.1";
+          description = ''
+            IPv4 address of the bridge.
           '';
+        };
+
+        prefixLength = mkOption {
+          type = types.addCheck types.int (n: n >= 0 && n <= 32);
+          default = 16;
+          description = ''
+            Subnet mask of the bridge interface, specified as the number of
+            bits in the prefix (<literal>24</literal>).
+            A DHCP server will provide IP addresses for the whole, remaining
+            subnet.
+          '';
+        };
       };
 
     virtualisation.xen.stored =
@@ -261,11 +280,71 @@ in
       description = "Xen bridge";
       wantedBy = [ "multi-user.target" ];
       before = [ "xen-domains.service" ];
-      serviceConfig.RemainAfterExit = "yes";
-      serviceConfig.ExecStart = "${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge}";
-      postStart = "${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} up";
-      serviceConfig.ExecStop = "${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} down";
-      postStop = "${pkgs.bridge-utils}/bin/brctl delbr ${cfg.bridge}";
+      preStart = ''
+        mkdir -p /var/run/xen
+        touch /var/run/xen/dnsmasq.pid
+        touch /var/run/xen/dnsmasq.etherfile
+        touch /var/run/xen/dnsmasq.leasefile
+
+        IFS='-' read -a data <<< `${pkgs.sipcalc}/bin/sipcalc ${cfg.bridge.address}/${toString cfg.bridge.prefixLength} | grep Usable\ range`
+        export XEN_BRIDGE_IP_RANGE_START="${"\${data[1]//[[:blank:]]/}"}"
+        export XEN_BRIDGE_IP_RANGE_END="${"\${data[2]//[[:blank:]]/}"}"
+
+        IFS='-' read -a data <<< `${pkgs.sipcalc}/bin/sipcalc ${cfg.bridge.address}/${toString cfg.bridge.prefixLength} | grep Network\ address`
+        export XEN_BRIDGE_NETWORK_ADDRESS="${"\${data[1]//[[:blank:]]/}"}"
+
+        echo "${cfg.bridge.address} host gw dns" > /var/run/xen/dnsmasq.hostsfile
+
+        cat <<EOF > /var/run/xen/dnsmasq.conf
+        no-daemon
+        pid-file=/var/run/xen/dnsmasq.pid
+        interface=${cfg.bridge.name}
+        except-interface=lo
+        bind-interfaces
+        auth-server=dns.xen.local,${cfg.bridge.name}
+        auth-zone=xen.local,$XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength}
+        domain=xen.local
+        addn-hosts=/var/run/xen/dnsmasq.hostsfile
+        expand-hosts
+        strict-order
+        no-hosts
+        bogus-priv
+        no-resolv
+        no-poll
+        filterwin2k
+        clear-on-reload
+        domain-needed
+        dhcp-hostsfile=/var/run/xen/dnsmasq.etherfile
+        dhcp-authoritative
+        dhcp-range=$XEN_BRIDGE_IP_RANGE_START,$XEN_BRIDGE_IP_RANGE_END,$XEN_BRIDGE_NETWORK_ADDRESS
+        dhcp-no-override
+        no-ping
+        dhcp-leasefile=/var/run/xen/dnsmasq.leasefile
+        EOF
+
+        # DHCP
+        ${pkgs.iptables}/bin/iptables -I INPUT  -i ${cfg.bridge.name} -p tcp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT
+        ${pkgs.iptables}/bin/iptables -I INPUT  -i ${cfg.bridge.name} -p udp -s $XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength} --sport 68 --dport 67 -j ACCEPT
+        # DNS
+        ${pkgs.iptables}/bin/iptables -I INPUT  -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT
+        ${pkgs.iptables}/bin/iptables -I INPUT  -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT
+
+        ${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge.name}
+        ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} ${cfg.bridge.address}
+        ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} up
+      '';
+      serviceConfig.ExecStart = "${pkgs.dnsmasq}/bin/dnsmasq --conf-file=/var/run/xen/dnsmasq.conf";
+      postStop = ''
+        ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} down
+        ${pkgs.bridge-utils}/bin/brctl delbr ${cfg.bridge.name}
+
+        # DNS
+        ${pkgs.iptables}/bin/iptables -D INPUT  -i ${cfg.bridge.name} -p udp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT
+        ${pkgs.iptables}/bin/iptables -D INPUT  -i ${cfg.bridge.name} -p tcp -d ${cfg.bridge.address} --dport 53 -m state --state NEW,ESTABLISHED -j ACCEPT
+        # DHCP
+        ${pkgs.iptables}/bin/iptables -D INPUT  -i ${cfg.bridge.name} -p udp --sport 68 --dport 67 -j ACCEPT
+        ${pkgs.iptables}/bin/iptables -D INPUT  -i ${cfg.bridge.name} -p tcp --sport 68 --dport 67 -j ACCEPT
+      '';
     };
 
 

From 6bd694321dfb3eec78d515c31654fa86e656f11b Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Thu, 2 Jul 2015 16:33:01 +0200
Subject: [PATCH 1804/2322] Xen: enable Spice/QXL + add libhvm + minor fixes

---
 .../0000-qemu-seabios-enable-ATA_DMA.patch    |  23 +++
 ...e-compression-setting-support-for-up.patch | 104 +++++++++++
 ...aming-video-setting-support-for-upst.patch | 104 +++++++++++
 ...a-interface-support-for-upstream-qem.patch | 165 ++++++++++++++++++
 .../applications/virtualization/xen/4.4.1.nix |  36 ++--
 .../applications/virtualization/xen/4.5.0.nix |  53 ++++--
 .../virtualization/xen/generic.nix            |  35 ++--
 7 files changed, 473 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch
 create mode 100644 pkgs/applications/virtualization/xen/0001-libxl-Spice-image-compression-setting-support-for-up.patch
 create mode 100644 pkgs/applications/virtualization/xen/0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
 create mode 100644 pkgs/applications/virtualization/xen/0003-Add-qxl-vga-interface-support-for-upstream-qem.patch

diff --git a/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch b/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch
new file mode 100644
index 00000000000..1eb3d5949de
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch
@@ -0,0 +1,23 @@
+diff --git a/src/Kconfig b/src/Kconfig
+index 45ca59c..faf8951 100644
+--- a/src/Kconfig
++++ b/src/Kconfig
+@@ -144,13 +144,13 @@ menu "Hardware support"
+     config ATA_DMA
+         depends on ATA
+         bool "ATA DMA"
+-        default n
++        default y
+         help
+             Detect and try to use ATA bus mastering DMA controllers.
+     config ATA_PIO32
+         depends on ATA
+         bool "ATA 32bit PIO"
+-        default n
++        default y
+         help
+             Use 32bit PIO accesses on ATA (minor optimization on PCI 
+transfers).
+     config AHCI
+-- 
+1.7.10.4
diff --git a/pkgs/applications/virtualization/xen/0001-libxl-Spice-image-compression-setting-support-for-up.patch b/pkgs/applications/virtualization/xen/0001-libxl-Spice-image-compression-setting-support-for-up.patch
new file mode 100644
index 00000000000..67b7ac777b5
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/0001-libxl-Spice-image-compression-setting-support-for-up.patch
@@ -0,0 +1,104 @@
+From bd71555985efc423b1a119b6a3177de855763453 Mon Sep 17 00:00:00 2001
+From: Fabio Fantoni <fabio.fantoni@m2r.biz>
+Date: Tue, 20 Jan 2015 11:26:30 +0100
+Subject: [PATCH] libxl: Spice image compression setting support for upstream
+ qemu
+
+Usage:
+spice_image_compression=[auto_glz|auto_lz|quic|glz|lz|off]
+
+Specifies what image compression is to be used by spice (if given),
+otherwise the qemu default will be used.
+
+Signed-off-by: Fabio Fantoni <fabio.fantoni@m2r.biz>
+Acked-by: Wei Liu <wei.liu2@citrix.com>
+---
+ docs/man/xl.cfg.pod.5       |  6 ++++++
+ tools/libxl/libxl.h         | 11 +++++++++++
+ tools/libxl/libxl_dm.c      |  4 ++++
+ tools/libxl/libxl_types.idl |  1 +
+ tools/libxl/xl_cmdimpl.c    |  2 ++
+ 5 files changed, 24 insertions(+)
+
+diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5
+index e2f91fc..0c2cbac 100644
+--- a/docs/man/xl.cfg.pod.5
++++ b/docs/man/xl.cfg.pod.5
+@@ -1427,6 +1427,12 @@ for redirection of up to 4 usb devices from spice client to domU's qemu.
+ It requires an usb controller and if not defined it will automatically adds
+ an usb2 controller. The default is disabled (0).
+ 
++=item B<spice_image_compression=[auto_glz|auto_lz|quic|glz|lz|off]>
++
++Specifies what image compression is to be used by spice (if given), otherwise
++the qemu default will be used. Please see documentations of your current qemu
++version for details.
++
+ =back
+ 
+ =head3 Miscellaneous Emulated Hardware
+diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
+index 0a123f1..b8e0b67 100644
+--- a/tools/libxl/libxl.h
++++ b/tools/libxl/libxl.h
+@@ -528,6 +528,17 @@ typedef struct libxl__ctx libxl_ctx;
+ #define LIBXL_HAVE_SPICE_USBREDIREDIRECTION 1
+ 
+ /*
++ * LIBXL_HAVE_SPICE_IMAGECOMPRESSION
++ *
++ * If defined, then the libxl_spice_info structure will contain a string type
++ * field: image_compression. This value defines what Spice image compression
++ * is used.
++ *
++ * If this is not defined, the Spice image compression setting support is ignored.
++ */
++#define LIBXL_HAVE_SPICE_IMAGECOMPRESSION 1
++
++/*
+  * LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS 1
+  *
+  * If this is defined, libxl_domain_create_restore()'s API has changed to
+diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
+index c2b0487..40c8649 100644
+--- a/tools/libxl/libxl_dm.c
++++ b/tools/libxl/libxl_dm.c
+@@ -398,6 +398,10 @@ static char *dm_spice_options(libxl__gc *gc,
+     if (!libxl_defbool_val(spice->clipboard_sharing))
+         opt = libxl__sprintf(gc, "%s,disable-copy-paste", opt);
+ 
++    if (spice->image_compression)
++        opt = libxl__sprintf(gc, "%s,image-compression=%s", opt,
++                             spice->image_compression);
++
+     return opt;
+ }
+ 
+diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
+index 1214d2e..052ded9 100644
+--- a/tools/libxl/libxl_types.idl
++++ b/tools/libxl/libxl_types.idl
+@@ -241,6 +241,7 @@ libxl_spice_info = Struct("spice_info", [
+     ("vdagent",     libxl_defbool),
+     ("clipboard_sharing", libxl_defbool),
+     ("usbredirection", integer),
++    ("image_compression", string),
+     ])
+ 
+ libxl_sdl_info = Struct("sdl_info", [
+diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
+index 0b02a6c..00aa69d 100644
+--- a/tools/libxl/xl_cmdimpl.c
++++ b/tools/libxl/xl_cmdimpl.c
+@@ -1948,6 +1948,8 @@ skip_vfb:
+                             &b_info->u.hvm.spice.clipboard_sharing, 0);
+         if (!xlu_cfg_get_long (config, "spiceusbredirection", &l, 0))
+             b_info->u.hvm.spice.usbredirection = l;
++        xlu_cfg_replace_string (config, "spice_image_compression",
++                                &b_info->u.hvm.spice.image_compression, 0);
+         xlu_cfg_get_defbool(config, "nographic", &b_info->u.hvm.nographic, 0);
+         xlu_cfg_get_defbool(config, "gfx_passthru",
+                             &b_info->u.hvm.gfx_passthru, 0);
+-- 
+1.9.2
+
diff --git a/pkgs/applications/virtualization/xen/0002-libxl-Spice-streaming-video-setting-support-for-upst.patch b/pkgs/applications/virtualization/xen/0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
new file mode 100644
index 00000000000..acf9cff9925
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
@@ -0,0 +1,104 @@
+From 296c7f3284efe655d95a8ae045a5dc1a20d6fff0 Mon Sep 17 00:00:00 2001
+From: Fabio Fantoni <fabio.fantoni@m2r.biz>
+Date: Tue, 20 Jan 2015 11:33:17 +0100
+Subject: [PATCH] libxl: Spice streaming video setting support for upstream
+ qemu
+
+Usage:
+spice_streaming_video=[filter|all|off]
+
+Specifies what streaming video setting is to be used by spice (if
+given),
+otherwise the qemu default will be used.
+
+Signed-off-by: Fabio Fantoni <fabio.fantoni@m2r.biz>
+Acked-by: Wei Liu <wei.liu2@citrix.com>
+---
+ docs/man/xl.cfg.pod.5       |  5 +++++
+ tools/libxl/libxl.h         | 11 +++++++++++
+ tools/libxl/libxl_dm.c      |  4 ++++
+ tools/libxl/libxl_types.idl |  1 +
+ tools/libxl/xl_cmdimpl.c    |  2 ++
+ 5 files changed, 23 insertions(+)
+
+diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5
+index 0c2cbac..408653f 100644
+--- a/docs/man/xl.cfg.pod.5
++++ b/docs/man/xl.cfg.pod.5
+@@ -1433,6 +1433,11 @@ Specifies what image compression is to be used by spice (if given), otherwise
+ the qemu default will be used. Please see documentations of your current qemu
+ version for details.
+ 
++=item B<spice_streaming_video=[filter|all|off]>
++
++Specifies what streaming video setting is to be used by spice (if given),
++otherwise the qemu default will be used.
++
+ =back
+ 
+ =head3 Miscellaneous Emulated Hardware
+diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
+index b8e0b67..c219f59 100644
+--- a/tools/libxl/libxl.h
++++ b/tools/libxl/libxl.h
+@@ -539,6 +539,17 @@ typedef struct libxl__ctx libxl_ctx;
+ #define LIBXL_HAVE_SPICE_IMAGECOMPRESSION 1
+ 
+ /*
++ * LIBXL_HAVE_SPICE_STREAMINGVIDEO
++ *
++ * If defined, then the libxl_spice_info structure will contain a string type
++ * field: streaming_video. This value defines what Spice streaming video setting
++ * is used.
++ *
++ * If this is not defined, the Spice streaming video setting support is ignored.
++ */
++#define LIBXL_HAVE_SPICE_STREAMINGVIDEO 1
++
++/*
+  * LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS 1
+  *
+  * If this is defined, libxl_domain_create_restore()'s API has changed to
+diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
+index 40c8649..d8d6f0c 100644
+--- a/tools/libxl/libxl_dm.c
++++ b/tools/libxl/libxl_dm.c
+@@ -402,6 +402,10 @@ static char *dm_spice_options(libxl__gc *gc,
+         opt = libxl__sprintf(gc, "%s,image-compression=%s", opt,
+                              spice->image_compression);
+ 
++    if (spice->streaming_video)
++        opt = libxl__sprintf(gc, "%s,streaming-video=%s", opt,
++                             spice->streaming_video);
++
+     return opt;
+ }
+ 
+diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
+index 052ded9..02be466 100644
+--- a/tools/libxl/libxl_types.idl
++++ b/tools/libxl/libxl_types.idl
+@@ -242,6 +242,7 @@ libxl_spice_info = Struct("spice_info", [
+     ("clipboard_sharing", libxl_defbool),
+     ("usbredirection", integer),
+     ("image_compression", string),
++    ("streaming_video", string),
+     ])
+ 
+ libxl_sdl_info = Struct("sdl_info", [
+diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
+index 00aa69d..b7eac29 100644
+--- a/tools/libxl/xl_cmdimpl.c
++++ b/tools/libxl/xl_cmdimpl.c
+@@ -1950,6 +1950,8 @@ skip_vfb:
+             b_info->u.hvm.spice.usbredirection = l;
+         xlu_cfg_replace_string (config, "spice_image_compression",
+                                 &b_info->u.hvm.spice.image_compression, 0);
++        xlu_cfg_replace_string (config, "spice_streaming_video",
++                                &b_info->u.hvm.spice.streaming_video, 0);
+         xlu_cfg_get_defbool(config, "nographic", &b_info->u.hvm.nographic, 0);
+         xlu_cfg_get_defbool(config, "gfx_passthru",
+                             &b_info->u.hvm.gfx_passthru, 0);
+-- 
+1.9.2
+
diff --git a/pkgs/applications/virtualization/xen/0003-Add-qxl-vga-interface-support-for-upstream-qem.patch b/pkgs/applications/virtualization/xen/0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
new file mode 100644
index 00000000000..1771b662bc3
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
@@ -0,0 +1,165 @@
+From 161212ef02312c0681d2d809c8ff1e1f0ea6f6f9 Mon Sep 17 00:00:00 2001
+From: Fabio Fantoni <fabio.fantoni@m2r.biz>
+Date: Wed, 29 Apr 2015 11:20:28 +0200
+Subject: [PATCH] libxl: Add qxl vga interface support for upstream qemu
+
+Usage:
+vga="qxl"
+
+Qxl vga support many resolutions that not supported by stdvga,
+mainly the 16:9 ones and other high up to 2560x1600.
+With QXL you can get improved performance and smooth video also
+with high resolutions and high quality.
+Require their drivers installed in the domU and spice used
+otherwise act as a simple stdvga.
+
+Signed-off-by: Fabio Fantoni <fabio.fantoni@m2r.biz>
+Signed-off-by: Zhou Peng <zpengxen@gmail.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
+Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
+Acked-by: George Dunlap <george.dunlap@eu.citrix.com>
+---
+ docs/man/xl.cfg.pod.5       | 10 +++++++++-
+ tools/libxl/libxl.h         | 10 ++++++++++
+ tools/libxl/libxl_create.c  | 13 +++++++++++++
+ tools/libxl/libxl_dm.c      |  8 ++++++++
+ tools/libxl/libxl_types.idl |  1 +
+ tools/libxl/xl_cmdimpl.c    |  2 ++
+ 6 files changed, 43 insertions(+), 1 deletion(-)
+
+diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5
+index f936dfc..8e4154f 100644
+--- a/docs/man/xl.cfg.pod.5
++++ b/docs/man/xl.cfg.pod.5
+@@ -1360,6 +1360,9 @@ qemu-xen-traditional device-model, the amount of video RAM is fixed at 4 MB,
+ which is sufficient for 1024x768 at 32 bpp. For the upstream qemu-xen
+ device-model, the default and minimum is 8 MB.
+ 
++For B<qxl> vga, the default is both default and minimal 128MB.
++If B<videoram> is set less than 128MB, an error will be triggered.
++
+ =item B<stdvga=BOOLEAN>
+ 
+ Select a standard VGA card with VBE (VESA BIOS Extensions) as the
+@@ -1371,9 +1374,14 @@ This option is deprecated, use vga="stdvga" instead.
+ 
+ =item B<vga="STRING">
+ 
+-Selects the emulated video card (none|stdvga|cirrus).
++Selects the emulated video card (none|stdvga|cirrus|qxl).
+ The default is cirrus.
+ 
++In general, QXL should work with the Spice remote display protocol
++for acceleration, and QXL driver is necessary in guest in this case.
++QXL can also work with the VNC protocol, but it will be like a standard
++VGA without acceleration.
++
+ =item B<vnc=BOOLEAN>
+ 
+ Allow access to the display via the VNC protocol.  This enables the
+diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
+index 44bd8e2..efc0617 100644
+--- a/tools/libxl/libxl.h
++++ b/tools/libxl/libxl.h
+@@ -535,6 +535,16 @@ typedef struct libxl__ctx libxl_ctx;
+ #define LIBXL_HAVE_DOMINFO_OUTSTANDING_MEMKB 1
+ 
+ /*
++ * LIBXL_HAVE_QXL
++ *
++ * If defined, then the libxl_vga_interface_type will contain another value:
++ * "QXL". This value define if qxl vga is supported.
++ *
++ * If this is not defined, the qxl vga support is missed.
++ */
++#define LIBXL_HAVE_QXL 1
++
++/*
+  * LIBXL_HAVE_SPICE_VDAGENT
+  *
+  * If defined, then the libxl_spice_info structure will contain a boolean type:
+diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
+index e5a343f..188f7df 100644
+--- a/tools/libxl/libxl_create.c
++++ b/tools/libxl/libxl_create.c
+@@ -248,6 +248,10 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
+                 if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT)
+                     b_info->video_memkb = 0;
+                 break;
++            case LIBXL_VGA_INTERFACE_TYPE_QXL:
++                LOG(ERROR,"qemu upstream required for qxl vga");
++                return ERROR_INVAL;
++                break;
+             case LIBXL_VGA_INTERFACE_TYPE_STD:
+                 if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT)
+                     b_info->video_memkb = 8 * 1024;
+@@ -272,6 +276,15 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
+                 if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT)
+                     b_info->video_memkb = 0;
+                 break;
++            case LIBXL_VGA_INTERFACE_TYPE_QXL:
++                if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) {
++                    b_info->video_memkb = (128 * 1024);
++                } else if (b_info->video_memkb < (128 * 1024)) {
++                    LOG(ERROR,
++                        "128 Mib videoram is the minimum for qxl default");
++                    return ERROR_INVAL;
++                }
++                break;
+             case LIBXL_VGA_INTERFACE_TYPE_STD:
+                 if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT)
+                     b_info->video_memkb = 16 * 1024;
+diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
+index 30c1578..58c9b99 100644
+--- a/tools/libxl/libxl_dm.c
++++ b/tools/libxl/libxl_dm.c
+@@ -251,6 +251,8 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc,
+         case LIBXL_VGA_INTERFACE_TYPE_NONE:
+             flexarray_append_pair(dm_args, "-vga", "none");
+             break;
++        case LIBXL_VGA_INTERFACE_TYPE_QXL:
++            break;
+         }
+ 
+         if (b_info->u.hvm.boot) {
+@@ -625,6 +627,12 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc,
+             break;
+         case LIBXL_VGA_INTERFACE_TYPE_NONE:
+             break;
++        case LIBXL_VGA_INTERFACE_TYPE_QXL:
++            /* QXL have 2 ram regions, ram and vram */
++            flexarray_append_pair(dm_args, "-device",
++                GCSPRINTF("qxl-vga,vram_size_mb=%"PRIu64",ram_size_mb=%"PRIu64,
++                (b_info->video_memkb/2/1024), (b_info->video_memkb/2/1024) ) );
++            break;
+         }
+ 
+         if (b_info->u.hvm.boot) {
+diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
+index 117b61d..023b21e 100644
+--- a/tools/libxl/libxl_types.idl
++++ b/tools/libxl/libxl_types.idl
+@@ -183,6 +183,7 @@ libxl_vga_interface_type = Enumeration("vga_interface_type", [
+     (1, "CIRRUS"),
+     (2, "STD"),
+     (3, "NONE"),
++    (4, "QXL"),
+     ], init_val = "LIBXL_VGA_INTERFACE_TYPE_CIRRUS")
+ 
+ libxl_vendor_device = Enumeration("vendor_device", [
+diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
+index 648ca08..526a1f6 100644
+--- a/tools/libxl/xl_cmdimpl.c
++++ b/tools/libxl/xl_cmdimpl.c
+@@ -2115,6 +2115,8 @@ skip_vfb:
+                 b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_CIRRUS;
+             } else if (!strcmp(buf, "none")) {
+                 b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_NONE;
++            } else if (!strcmp(buf, "qxl")) {
++                b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_QXL;
+             } else {
+                 fprintf(stderr, "Unknown vga \"%s\" specified\n", buf);
+                 exit(1);
+-- 
+1.9.2
+
diff --git a/pkgs/applications/virtualization/xen/4.4.1.nix b/pkgs/applications/virtualization/xen/4.4.1.nix
index a13a51a1d4e..ec2056cc547 100644
--- a/pkgs/applications/virtualization/xen/4.4.1.nix
+++ b/pkgs/applications/virtualization/xen/4.4.1.nix
@@ -14,30 +14,34 @@ let
     # Sources needed to build the xen tools and tools/firmware.
     toolsGits =
       [ # tag qemu-xen-4.4.1
-        { name = "qemu-xen";
-          url = git://xenbits.xen.org/qemu-upstream-4.4-testing.git;
-          rev = "65fc9b78ba3d868a26952db0d8e51cecf01d47b4";
-          sha256 = "e24fb58f773fd9134c5aae6d3ca7e9f754dc9822de92b1eb2cedc76faf911f18";
+        { git = { name = "qemu-xen";
+                  url = git://xenbits.xen.org/qemu-upstream-4.4-testing.git;
+                  rev = "65fc9b78ba3d868a26952db0d8e51cecf01d47b4";
+                  sha256 = "e24fb58f773fd9134c5aae6d3ca7e9f754dc9822de92b1eb2cedc76faf911f18";
+                };
         }
         # tag xen-4.4.1
-        {  name = "qemu-xen-traditional";
-          url = git://xenbits.xen.org/qemu-xen-4.4-testing.git;
-          rev = "6ae4e588081620b141071eb010ec40aca7e12876";
-          sha256 = "b1ed1feb92fbe658273a8d6d38d6ea60b79c1658413dd93979d6d128d8554ded";
+        { git = { name = "qemu-xen-traditional";
+                  url = git://xenbits.xen.org/qemu-xen-4.4-testing.git;
+                  rev = "6ae4e588081620b141071eb010ec40aca7e12876";
+                  sha256 = "b1ed1feb92fbe658273a8d6d38d6ea60b79c1658413dd93979d6d128d8554ded";
+                };
         }
       ];
 
     firmwareGits =
       [ # tag 1.7.3.1
-        { name = "seabios";
-          url = git://xenbits.xen.org/seabios.git;
-          rev = "7d9cbe613694924921ed1a6f8947d711c5832eee";
-          sha256 = "c071282bbcb1dd0d98536ef90cd1410f5d8da19648138e0e3863bc540d954a87";
+        { git = { name = "seabios";
+                  url = git://xenbits.xen.org/seabios.git;
+                  rev = "7d9cbe613694924921ed1a6f8947d711c5832eee";
+                  sha256 = "c071282bbcb1dd0d98536ef90cd1410f5d8da19648138e0e3863bc540d954a87";
+                };
         }
-        { name = "ovmf";
-          url = git://xenbits.xen.org/ovmf.git;
-          rev = "447d264115c476142f884af0be287622cd244423";
-          sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b";
+        { git = { name = "ovmf";
+                  url = git://xenbits.xen.org/ovmf.git;
+                  rev = "447d264115c476142f884af0be287622cd244423";
+                  sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b";
+                };
         }
       ];
 
diff --git a/pkgs/applications/virtualization/xen/4.5.0.nix b/pkgs/applications/virtualization/xen/4.5.0.nix
index 176e15ea2c7..156255be0d7 100644
--- a/pkgs/applications/virtualization/xen/4.5.0.nix
+++ b/pkgs/applications/virtualization/xen/4.5.0.nix
@@ -14,30 +14,47 @@ let
     # Sources needed to build the xen tools and tools/firmware.
     firmwareGits =
       [ # tag 1.7.5
-        { name = "seabios";
-          url = git://xenbits.xen.org/seabios.git;
-          rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2";
-          sha256 = "b96a0b9f31cab0f3993d007dcbe5f1bd69ad02b0a23eb2dc8a3ed1aafe7985cb";
+        { git = { name = "seabios";
+                  url = git://xenbits.xen.org/seabios.git;
+                  rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2";
+                  sha256 = "b96a0b9f31cab0f3993d007dcbe5f1bd69ad02b0a23eb2dc8a3ed1aafe7985cb";
+                };
+          patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ];
         }
-        { name = "ovmf";
-          url = git://xenbits.xen.org/ovmf.git;
-          rev = "447d264115c476142f884af0be287622cd244423";
-          sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b";
+        { git = { name = "ovmf";
+                  url = git://xenbits.xen.org/ovmf.git;
+                  rev = "447d264115c476142f884af0be287622cd244423";
+                  sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b";
+                };
         }
       ];
 
     toolsGits =
       [ # tag qemu-xen-4.5.0
-        { name = "qemu-xen";
-          url = git://xenbits.xen.org/qemu-upstream-4.5-testing.git;
-          rev = "1ebb75b1fee779621b63e84fefa7b07354c43a99";
-          sha256 = "1j312q2mqvkvby9adkkxf7f1pn3nz85g5mr9nbg4qpf2y9cg122z";
+        { git = { name = "qemu-xen";
+                  url = git://xenbits.xen.org/qemu-upstream-4.5-testing.git;
+                  rev = "1ebb75b1fee779621b63e84fefa7b07354c43a99";
+                  sha256 = "1j312q2mqvkvby9adkkxf7f1pn3nz85g5mr9nbg4qpf2y9cg122z";
+                };
         }
         # tag xen-4.5.0
-        { name = "qemu-xen-traditional";
-          url = git://xenbits.xen.org/qemu-xen-4.5-testing.git;
-          rev = "b0d42741f8e9a00854c3b3faca1da84bfc69bf22";
-          sha256 = "ce52b5108936c30ab85ec0c9554f88d5e7b34896f3acb666d56765b49c86f2af";
+        { git = { name = "qemu-xen-traditional";
+                  url = git://xenbits.xen.org/qemu-xen-4.5-testing.git;
+                  rev = "b0d42741f8e9a00854c3b3faca1da84bfc69bf22";
+                  sha256 = "ce52b5108936c30ab85ec0c9554f88d5e7b34896f3acb666d56765b49c86f2af";
+                };
+        }
+        { 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;
         }
       ];
 
@@ -52,6 +69,10 @@ let
         quilt push -a
         substituteInPlace tools/xenguest/Makefile --replace "_BSD_SOURCE" "_DEFAULT_SOURCE"
         '';
+
+    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 ];
   };
 
 in callPackage ./generic.nix (args // { xenConfig=xenConfig; })
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 711fd505efa..2c92a983474 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -3,7 +3,7 @@
 , lvm2, utillinux, procps, texinfo, perl, pythonPackages
 , glib, bridge-utils, xlibs, pixman, iproute, udev, bison
 , flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl
-, checkpolicy, transfig, glusterfs, fetchgit, xz, spice
+, checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice
 , spice_protocol, usbredir, alsaLib, quilt
 , coreutils, gawk, gnused, gnugrep, diffutils, multipath_tools
 , inetutils, iptables, openvswitch, nbd, drbd, xenConfig
@@ -69,15 +69,14 @@ stdenv.mkDerivation {
       glib bridge-utils pixman iproute udev bison xlibs.libX11
       flex ocaml ocamlPackages.findlib figlet libaio
       checkpolicy pythonPackages.markdown transfig
-      glusterfs cmake spice spice_protocol usbredir
+      glusterfs acl cmake spice spice_protocol usbredir
       alsaLib quilt
     ];
 
   pythonPath = [ pythonPackages.curses ];
 
-  patchPhase = if ((xenserverPatched == true) && (builtins.hasAttr "xenserverPatches" xenConfig))
-    then xenConfig.xenserverPatches
-    else "";
+  patches = stdenv.lib.optionals ((xenserverPatched == false) && (builtins.hasAttr "xenPatches" xenConfig)) xenConfig.xenPatches;
+  patchPhase = stdenv.lib.optional ((xenserverPatched == true) && (builtins.hasAttr "xenserverPatches" xenConfig)) xenConfig.xenserverPatches;
 
   preConfigure = ''
     # Fake wget: copy prefetched downloads instead
@@ -87,13 +86,9 @@ stdenv.mkDerivation {
     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"
   '';
 
-  # TODO: If multiple arguments are given with with-extra-qemuu,
-  #       then the configuration aborts; the reason is unclear.
-  #       If you know how to fix it, please let me know! :)
-  #configureFlags = "--with-extra-qemuu-configure-args='--enable-spice --enable-usb-redir --enable-linux-aio'";
-
   # 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 ";
@@ -154,13 +149,17 @@ stdenv.mkDerivation {
 
       # 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; in ''
+      ${flip concatMapStrings xenConfig.toolsGits (x: let src = fetchgit x.git; in ''
         cp -r ${src} tools/${src.name}-dir-remote
-        chmod +w 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; in ''
+      ${flip concatMapStrings xenConfig.firmwareGits (x: let src = fetchgit x.git; in ''
         cp -r ${src} tools/firmware/${src.name}-dir-remote
-        chmod +w 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)} )
       '')}
 
       # Xen's stubdoms and firmwares need various sources that are usually fetched
@@ -178,6 +177,9 @@ stdenv.mkDerivation {
   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)
     '';
 
   installPhase =
@@ -192,8 +194,11 @@ stdenv.mkDerivation {
 
       shopt -s extglob
       for i in $out/etc/xen/scripts/!(*.sh); do
-        sed -i '2s@^@export PATH=$out/bin:${scriptEnvPath}@' $i
+        sed -i "2s@^@export PATH=$out/bin:${scriptEnvPath}\n@" $i
       done
+
+      (cd tools/xen-libhvm-dir-remote; make install)
+      cp tools/xen-libhvm-dir-remote/biospt/biospt $out/bin/.
     '';
 
   meta = {

From 649697ddcf201c5d63cc7cca48299d006b5bc27a Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Thu, 2 Jul 2015 16:37:03 +0200
Subject: [PATCH 1805/2322] Xen: add XEN 4.5.1

---
 .../applications/virtualization/xen/4.5.1.nix | 67 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/virtualization/xen/4.5.1.nix

diff --git a/pkgs/applications/virtualization/xen/4.5.1.nix b/pkgs/applications/virtualization/xen/4.5.1.nix
new file mode 100644
index 00000000000..3412a0bd6ec
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/4.5.1.nix
@@ -0,0 +1,67 @@
+{ callPackage, fetchurl, fetchgit, ... } @ args:
+
+let
+  # Xen 4.5.1
+  xenConfig = {
+    name = "xen-4.5.1";
+    version = "4.5.1";
+
+    src = fetchurl {
+      url = "http://bits.xensource.com/oss-xen/release/4.5.1/xen-4.5.1.tar.gz";
+      sha256 = "0w8kbqy7zixacrpbk3yj51xx7b3f6l8ghsg3551w8ym6zka13336";
+    };
+
+    # Sources needed to build the xen tools and tools/firmware.
+    firmwareGits =
+      [ # tag 1.7.5
+        { git = { name = "seabios";
+                  url = git://xenbits.xen.org/seabios.git;
+                  rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2";
+                  sha256 = "b96a0b9f31cab0f3993d007dcbe5f1bd69ad02b0a23eb2dc8a3ed1aafe7985cb";
+                };
+          patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ];
+        }
+        { git = { name = "ovmf";
+                  url = git://xenbits.xen.org/ovmf.git;
+                  rev = "447d264115c476142f884af0be287622cd244423";
+                  sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b";
+                };
+        }
+      ];
+
+    toolsGits =
+      [ # tag qemu-xen-4.5.1
+        { git = { name = "qemu-xen";
+                  url = git://xenbits.xen.org/qemu-upstream-4.5-testing.git;
+                  rev = "d9552b0af21c27535cd3c8549bb31d26bbecd506";
+                  sha256 = "15dbz8j26wl4vs5jijhccwgd8c6wkmpj4mz899fa7i1bbh8yysfy";
+                };
+        }
+        # tag xen-4.5.1
+        { git = { name = "qemu-xen-traditional";
+                  url = git://xenbits.xen.org/qemu-xen-4.5-testing.git;
+                  rev = "afaa35b4bc975b2b89ad44c481d0d7623e3d1c49";
+                  sha256 = "906b31cf32b52d29e521abaa76d641123bdf24f33fa53c6f109b6d7834e514be";
+                };
+        }
+        { 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 ];
+  };
+
+in callPackage ./generic.nix (args // { xenConfig=xenConfig; })
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4add3d4badd..47510d8424d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13104,8 +13104,9 @@ let
 
   xen_4_4_1 = callPackage ../applications/virtualization/xen/4.4.1.nix { };
   xen_4_5_0 = callPackage ../applications/virtualization/xen/4.5.0.nix { };
+  xen_4_5_1 = callPackage ../applications/virtualization/xen/4.5.1.nix { };
   xen_xenServer = callPackage ../applications/virtualization/xen/4.5.0.nix { xenserverPatched = true; };
-  xen = xen_4_5_0;
+  xen = xen_4_5_1;
 
   xfe = callPackage ../applications/misc/xfe {
     fox = fox_1_6;

From 31ba3ab30dcbb69e9f82c5b2f118ddb010be9121 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Thu, 2 Jul 2015 16:41:22 +0200
Subject: [PATCH 1806/2322] pam_mount: version update: 2.14 -> 2.15

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

diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix
index 05438c6945c..0cf41276153 100644
--- a/pkgs/os-specific/linux/pam_mount/default.nix
+++ b/pkgs/os-specific/linux/pam_mount/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, utillinux, libxml2, pcre, perl, openssl, cryptsetup }:
 
 stdenv.mkDerivation rec {
-  name = "pam_mount-2.14";
+  name = "pam_mount-2.15";
 
   src = fetchurl {
-    url = "mirror://sourceforge/pam-mount/pam_mount/2.14/${name}.tar.xz";
-    sha256 = "1yfwg8i4n7af8yi3w3pkqzqz75wgjjlg5lslv1r5g1v88nrwnrkg";
+    url = "mirror://sourceforge/pam-mount/pam_mount/2.15/${name}.tar.xz";
+    sha256 = "091aq5zyc60wh21m1ryanjwknwxlaj9nvlswn5vjrmcdir5gnkm5";
   };
 
   buildInputs = [ autoconf automake pkgconfig libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ];

From 7735b2e4c53f394349ddff2e50da21ced473c164 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 2 Jul 2015 09:05:15 -0700
Subject: [PATCH 1807/2322] udisks: 2.1.4 -> 2.1.6

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

diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index 2dc99504c58..9b7a7501629 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "udisks-2.1.4";
+  name = "udisks-2.1.6";
 
   src = fetchurl {
     url = "http://udisks.freedesktop.org/releases/${name}.tar.bz2";
-    sha256 = "1fqrwmdyn5vc5r7wixh2f013ca1qf3kwy4ia8mh9282a7bfliqd4";
+    sha256 = "0spl155k0g2l2hvqf8xyjv08i68gfyhzpjva6cwlzxx0bz4gbify";
   };
 
   patches = [ ./force-path.patch ];

From 278287a99b8f042ca268485b4ee27940937ad8ad Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Fri, 3 Jul 2015 03:09:26 +0300
Subject: [PATCH 1808/2322] emacs: fix to use
 \${gettext}/share/locale/locale.alias

---
 pkgs/applications/editors/emacs-24/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index e0439f45a9c..5d6d576af8e 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
-, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
+, pkgconfig, gettext, gtk, libXft, dbus, libpng, libjpeg, libungif
 , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
 , alsaLib, cairo, acl, gpm
 , withX ? !stdenv.isDarwin
@@ -35,8 +35,12 @@ stdenv.mkDerivation rec {
     ./at-fdcwd.patch
   ];
 
+  postPatch = ''
+    sed -i 's|/usr/share/locale|${gettext}/share/locale|g' lisp/international/mule-cmds.el
+  '';
+
   buildInputs =
-    [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm ]
+    [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext ]
     ++ stdenv.lib.optional stdenv.isLinux dbus
     ++ stdenv.lib.optionals withX
       [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft

From 209837a59a74d41236488241bbb80f987527deb6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 2 Jul 2015 19:04:18 +0200
Subject: [PATCH 1809/2322] redshift: 1.9.1 -> 1.10

Notes:
- The current linking to geoclue2 looks nice but doesn't actually do
  anything. Only clients whitelisted by the geoclue package are
  allowed. Use static locations for now, like the NixOS service does.
- redshift-gtk still needs some work (icon?). It at least runs now,
  but can't control non-user instances like the NixOS service uses.
  This isn't a bug, but will confuse people.
- Add myself as a maintainer.
---
 pkgs/applications/misc/redshift/default.nix | 35 +++++++++------------
 pkgs/top-level/all-packages.nix             |  5 +--
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 6070c560815..d554752e8a8 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -1,45 +1,40 @@
-{ fetchurl, stdenv, libX11, libXrandr, libXxf86vm, libxcb, pkgconfig, python
-, randrproto, xcbutil, xf86vidmodeproto, autoconf, automake, gettext, glib
-, GConf, dbus, dbus_glib, makeWrapper, gtk, pygtk, pyxdg, geoclue }:
+{ fetchurl, stdenv, gettext, geoclue, intltool, makeWrapper
+, pkgconfig , python, pygobject3, pyxdg }:
 
-stdenv.mkDerivation rec {
-  version = "1.9.1";
+let version = "1.10"; in
+stdenv.mkDerivation {
   name = "redshift-${version}";
   src = fetchurl {
-    url = "https://github.com/jonls/redshift/archive/v${version}.tar.gz";
-    sha256 = "0rj7lyg4ikwpk1hr1k2bgk9gjqvvv51z8hydsgpx2k2lqdv6lqri";
+    sha256 = "19pfk9il5x2g2ivqix4a555psz8mj3m0cvjwnjpjvx0llh5fghjv";
+    url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz";
   };
 
   buildInputs = [
-    libX11 libXrandr libXxf86vm libxcb pkgconfig python randrproto xcbutil
-    xf86vidmodeproto autoconf automake gettext glib GConf dbus dbus_glib
-    makeWrapper gtk pygtk pyxdg geoclue
+    gettext intltool makeWrapper pkgconfig python pygobject3 pyxdg
   ];
 
-  preConfigure = ''
-    ./bootstrap
-  '';
-
   preInstall = ''
-    substituteInPlace src/redshift-gtk/redshift-gtk python --replace "/usr/bin/env python" "${python}/bin/${python.executable}"
+    substituteInPlace src/redshift-gtk/redshift-gtk python \
+      --replace "/usr/bin/env python3" "${python}/bin/${python.executable}"
   '';
 
   postInstall = ''
-    wrapProgram "$out/bin/redshift-gtk" --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0:${pyxdg}/lib/${python.libPrefix}/site-packages/pyxdg:$out/lib/${python.libPrefix}/site-packages
+    wrapProgram "$out/bin/redshift-gtk" --prefix PYTHONPATH : $PYTHONPATH
   '';
 
   meta = with stdenv.lib; {
-    description = "changes the color temperature of your screen gradually";
+    inherit version;
+    description = "Gradually change screen color temperature";
     longDescription = ''
       The color temperature is set according to the position of the
       sun. A different color temperature is set during night and
       daytime. During twilight and early morning, the color
       temperature transitions smoothly from night to daytime
       temperature to allow your eyes to slowly adapt.
-      '';
-    license = stdenv.lib.licenses.gpl3Plus;
+    '';
+    license = licenses.gpl3Plus;
     homepage = http://jonls.dk/redshift;
     platforms = platforms.linux;
-    maintainers = [ maintainers.mornfall ];
+    maintainers = with maintainers; [ mornfall nckx ];
   }; 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46daef79b3a..aec53c73d24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13999,10 +13999,7 @@ let
   };
 
   redshift = callPackage ../applications/misc/redshift {
-    inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm
-      xf86vidmodeproto;
-    inherit (gnome) GConf;
-    inherit (pythonPackages) pyxdg;
+    inherit (python3Packages) python pygobject3 pyxdg;
     geoclue = geoclue2;
   };
 

From 1869f171fdc1ad89fae180ca0a252a1936aed332 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 3 Jul 2015 04:08:49 +0200
Subject: [PATCH 1810/2322] stress-ng: 0.04.07 -> 0.04.10

---
 pkgs/tools/system/stress-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index 74410426010..4093eb7879d 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, attr }:
 
-let version = "0.04.07"; in
+let version = "0.04.10"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "0yzh0lkjll4qwhgjlrji9n9qps4nmh10240nsyqkgr4yv3my9fi0";
+    sha256 = "1y0jmcgwn8np22r3ajg7giai8dvfg0r5ddpgbiqs48cx2gz7iyhf";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 

From dfdcbb3640dde3d88cbe758a8ed07a4193399aec Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 3 Jul 2015 04:12:33 +0200
Subject: [PATCH 1811/2322] python-packages: prompt_toolkit 0.41 -> 0.42

---
 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 e077ff2cff8..0d51996499d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9069,10 +9069,10 @@ let
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "0.41";
+    version = "0.42";
 
     src = pkgs.fetchurl {
-      sha256 = "0s8zsa06vbs8n959ri2cc2fk5dkxjfr0zabqzjvx7klasxwzmsra";
+      sha256 = "04nywwyxzkl3qgah29i959irsbqi8viiadxfkxycqh7hq2yq8h86";
       url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
     };
 

From 63041a7ecb9404ea2c309c7cd4146d003380727d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 3 Jul 2015 04:28:43 +0200
Subject: [PATCH 1812/2322] kexec-tools: 2.0.9 -> 2.0.10

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

diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index f26c72bd6e5..483cdef079d 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -1,16 +1,18 @@
 { stdenv, fetchurl, zlib }:
 
+let version = "2.0.10"; in
 stdenv.mkDerivation rec {
-  name = "kexec-tools-2.0.9";
+  name = "kexec-tools-${version}";
 
   src = fetchurl {
     url = "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz";
-    sha256 = "0wag8pxn13i0j91x2bszpmi5i88xnndcmqz1w5a0jdbnxff4mqwa";
+    sha256 = "18x134nj37j1rshn5hxbyhdcv9kk5sfshs72alkip1icf54l2gp2";
   };
 
   buildInputs = [ zlib ];
 
   meta = with stdenv.lib; {
+    inherit version;
     homepage = http://horms.net/projects/kexec/kexec-tools;
     description = "Tools related to the kexec Linux feature";
     platforms = with platforms; linux;

From 8e16c57424c5462f0e4c842aac2b5f0c379559a5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 3 Jul 2015 04:52:06 +0200
Subject: [PATCH 1813/2322] nox: show trace for evaluation errors

Backports upstream commit 8900531.
---
 pkgs/tools/package-management/nox/default.nix |  2 +
 .../package-management/nox/show-trace.patch   | 41 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/tools/package-management/nox/show-trace.patch

diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix
index 32af196c46e..bbb576400f0 100644
--- a/pkgs/tools/package-management/nox/default.nix
+++ b/pkgs/tools/package-management/nox/default.nix
@@ -10,6 +10,8 @@ pythonPackages.buildPythonPackage rec {
     sha256 = "1s1jhickdhym70qrb5h4qxq1mvkpwgdppqpfb2jnpfaf1az6c207";
   };
 
+  patches = [ ./show-trace.patch ];
+
   buildInputs = [ pythonPackages.pbr ];
 
   pythonPath = with pythonPackages; [
diff --git a/pkgs/tools/package-management/nox/show-trace.patch b/pkgs/tools/package-management/nox/show-trace.patch
new file mode 100644
index 00000000000..6b464d3a4b2
--- /dev/null
+++ b/pkgs/tools/package-management/nox/show-trace.patch
@@ -0,0 +1,41 @@
+From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
+Date: Tue, 2 Jun 2015 13:04:19 +0200
+Subject: [PATCH] Run `nix-env` & `nix-shell` with `--show-trace`
+
+Evaluation is broken often enough that this seems wise.
+Debugging such errors without a backtrace is most unpleasant.
+
+diff -Naur nix-nox-0.0.1/nox/nixpkgs_repo.py nix-nox-0.0.1b/nox/nixpkgs_repo.py
+--- nox/nox/nixpkgs_repo.py	2014-10-26 21:50:33.000000000 +0100
++++ nox/nox/nixpkgs_repo.py	2015-07-03 04:46:08.114975479 +0200
+@@ -75,7 +75,7 @@
+ 
+ def packages(path):
+     """List all nix packages in the repo, as a set"""
+-    output = subprocess.check_output(['nix-env', '-f', path, '-qaP', '--drv-path'],
++    output = subprocess.check_output(['nix-env', '-f', path, '-qaP', '--drv-path', '--show-trace'],
+                                      universal_newlines=True)
+     return set(output.split('\n'))
+ 
+diff -Naur nix-nox-0.0.1/nox/search.py nix-nox-0.0.1b/nox/search.py
+--- nox/nox/search.py	2014-09-20 14:55:33.000000000 +0200
++++ nox/nox/search.py	2015-07-03 04:46:54.264813143 +0200
+@@ -10,7 +10,7 @@
+ 
+ def nix_packages_json():
+     click.echo('Refreshing cache')
+-    output = subprocess.check_output(['nix-env', '-qa', '--json'],
++    output = subprocess.check_output(['nix-env', '-qa', '--json', '--show-trace'],
+                                      universal_newlines=True)
+     return json.loads(output)
+ 
+@@ -70,7 +70,7 @@
+                                         value_proc=parse_input)
+         attributes = [p.attribute for p in packages]
+         if action == 'install':
+-            subprocess.check_call(['nix-env', '-iA'] + attributes)
++            subprocess.check_call(['nix-env', '-iA', '--show-trace'] + attributes)
+         elif action == 'shell':
+             attributes = [a[len('nixpkgs.'):] for a in attributes]
+-            subprocess.check_call(['nix-shell', '-p'] + attributes)
++            subprocess.check_call(['nix-shell', '-p', '--show-trace'] + attributes)

From 6db7437a64b83e5bf11d10c2344b4cceae0a2de5 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jul 2015 08:01:04 +0200
Subject: [PATCH 1814/2322] New GTK theme - Albatross from Shimmer Project
 http://shimmerproject.org/our-projects/albatross/

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

diff --git a/pkgs/misc/themes/albatross/default.nix b/pkgs/misc/themes/albatross/default.nix
new file mode 100644
index 00000000000..01b9d59aa7b
--- /dev/null
+++ b/pkgs/misc/themes/albatross/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchgit}:
+
+stdenv.mkDerivation rec {
+  name = "Albatross-${version}";
+  version = "1.7.3";
+
+  src = fetchgit {
+    url = git://github.com/shimmerproject/Albatross.git;
+    rev = "refs/tags/v${version}";
+    sha256 = "7a585068dd59f753149c0d390f2ef541f2ace67e7d681613588edb9f962e3196";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    install -dm 755 $out/share/themes/Albatross
+    cp -dr --no-preserve='ownership' {LICENSE.GPL,README,index.theme,gtk-2.0,gtk-3.0,metacity-1,xfwm4} $out/share/themes/Albatross/
+  '';
+
+  meta = {
+    description = "Albatross";
+    homepage = "http://shimmerproject.org/our-projects/albatross/";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdf01002506..8899ad6e132 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13993,6 +13993,8 @@ let
 
   orion = callPackage ../misc/themes/orion {};
 
+  albatross = callPackage ../misc/themes/albatross { };
+
   oxygen-gtk2 = callPackage ../misc/themes/gtk2/oxygen-gtk { };
 
   oxygen-gtk3 = callPackage ../misc/themes/gtk3/oxygen-gtk3 { };

From 6257425dabe7ad9190d7e5d5fab3d0bc5dad366e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 3 Jul 2015 09:28:07 +0200
Subject: [PATCH 1815/2322] linuxPackages.nvidia_x11_legacy340: fix cr4
 references

Patch was copied from here:
https://devtalk.nvidia.com/default/topic/813458/linux-4-0-rc1-346-47-build-error-_cr4-functions-fix/

Reference to kernel change, also noted in the forum post:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/arch/x86/include/asm/paravirt.h?id=1e02ce4cccdcb9688386e5b8d2c9fa4660b45389
---
 .../linux/nvidia-x11/legacy340.nix            |  2 ++
 .../nvidia-x11/nvidia-340.76-kernel-4.0.patch | 28 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch

diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix
index 7fcdb40de03..a53906ed020 100644
--- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation {
 
   builder = ./builder-legacy340.sh;
 
+  patches = [ ./nvidia-340.76-kernel-4.0.patch ];
+
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch
new file mode 100644
index 00000000000..c959190023b
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch
@@ -0,0 +1,28 @@
+--- a/kernel/nv-pat.c	2015-07-03 08:39:35.417031728 +0200
++++ b/kernel/nv-pat.c	2015-07-03 08:42:15.631838988 +0200
+@@ -35,8 +35,13 @@
+     unsigned long cr0 = read_cr0();
+     write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
+     wbinvd();
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
+     *cr4 = read_cr4();
+     if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
++#else
++    *cr4 = __read_cr4();
++    if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80);
++#endif
+     __flush_tlb();
+ }
+
+@@ -46,7 +51,11 @@
+     wbinvd();
+     __flush_tlb();
+     write_cr0((cr0 & 0x9fffffff));
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
+     if (cr4 & 0x80) write_cr4(cr4);
++#else
++    if (cr4 & 0x80) __write_cr4(cr4);
++#endif
+ }
+
+ static int nv_determine_pat_mode(void)

From d5275c70c3515b62ce19bffebfa45e9bdb1356ac Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 3 Jul 2015 10:18:04 +0200
Subject: [PATCH 1816/2322] mcabber: update from 0.10.3 to 1.0.0

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

diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index 17ad6c25da7..ef6ce6076d9 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mcabber-${version}";
-  version = "0.10.3";
+  version = "1.0.0";
 
   src = fetchurl {
     url = "http://mcabber.com/files/mcabber-${version}.tar.bz2";
-    sha256 = "0vgsqw6yn0lzzcnr4fql4ycgf3gwqj6w4p0l4nqnvhkc94w62ikp";
+    sha256 = "0ckh2l5fbnykzbvdrqjwd1ppalaifb79nnizh8kra2sy76xbqxjl";
   };
 
   buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ];

From 11cd596aea11b9f820e37aca80db57be1b3aa2d0 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Fri, 3 Jul 2015 13:06:02 +0200
Subject: [PATCH 1817/2322] wordpress: language downloads are now reproducible

---
 .../web-servers/apache-httpd/wordpress.nix    | 38 +++++++------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
index df099754b54..8884569c7bc 100644
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -43,38 +43,27 @@ let
   '';
 
   # WP translation can be found here:
-  #   https://make.wordpress.org/polyglots/teams/
-  # FIXME: 
-  #  - add all these languages: 
-  #    sq ar az eu bs bg ca zh-cn zh-tw hr da nl en-au 
-  #    en-ca en-gb eo fi fr gl de el he hu is id it ja 
-  #    ko lt nb nn oci pl pt-br pt ro ru sr sk es-mx es 
-  #    sv th tr uk cy
-  #  - cache the files on github.com/qknight/WordpressLanguages and use fetchFromGithub instead
-  #    note: this implementation of supportedLanguages will only work for me (qknight) as i'm using nix-prefetch-url
-  #          as the sha256 changes like every download. 
-  # note: this is also true for plugins and themes but these are controlled not from withing wordpress.nix
+  #   https://github.com/nixcloud/wordpress-translations
   supportedLanguages = {
-    en_GB = "1yf1sb6ji3l4lg8nkkjhckbwl81jly8z93jf06pvk6a1p6bsr6l6";
-    de_DE = "3881221f337799b88f9562df8b3f1560f2c49a8f662297561a5b25ce77f22e17";
+    en_GB = { revision="d6c005372a5318fd758b710b77a800c86518be13"; sha256="0qbbsi87k47q4rgczxx541xz4z4f4fr49hw4lnaxkdsf5maz8p9p"; };
+    de_DE = { revision="3c62955c27baaae98fd99feb35593d46562f4736"; sha256="1shndgd11dk836dakrjlg2arwv08vqx6j4xjh4jshvwmjab6ng6p"; };
+    zh_ZN = { revision="12b9f811e8cae4b6ee41de343d35deb0a8fdda6d"; sha256="1339ggsxh0g6lab37jmfxicsax4h702rc3fsvv5azs7mcznvwh47"; };
+    fr_FR = { revision="688c8b1543e3d38d9e8f57e0a6f2a2c3c8b588bd"; sha256="1j41iak0i6k7a4wzyav0yrllkdjjskvs45w53db8vfm8phq1n014"; };
   };
 
-  downloadLanguagePack = language: sha256:
+  downloadLanguagePack = language: revision: sha256s:
     pkgs.stdenv.mkDerivation rec {
-      name = "wp_${language}-${version}";
-      src = pkgs.fetchurl {
-        url = "https://downloads.wordpress.org/translation/core/${version}/${language}.zip";
-        sha256 = "${sha256}";
+      name = "wp_${language}";
+      src = pkgs.fetchFromGitHub {
+        owner = "nixcloud";
+        repo = "wordpress-translations";
+        rev = revision;
+        sha256 = sha256s;
       };
-      buildInputs = [ pkgs.unzip ];
-      unpackPhase = ''
-        unzip $src
-        export sourceRoot=.
-      '';
       installPhase = "mkdir -p $out; cp -R * $out/";
     };
 
-  selectedLanguages = map (lang: downloadLanguagePack lang supportedLanguages.${lang}) (config.languages);
+  selectedLanguages = map (lang: downloadLanguagePack lang supportedLanguages.${lang}.revision supportedLanguages.${lang}.sha256) (config.languages);
 
   # The wordpress package itself
   wordpressRoot = pkgs.stdenv.mkDerivation rec {
@@ -235,6 +224,7 @@ in
 
   documentRoot = wordpressRoot;
 
+  # FIXME adding the user has to be done manually for the time being
   startupScript = pkgs.writeScript "init-wordpress.sh" ''
     #!/bin/sh
     mkdir -p ${config.wordpressUploads}

From a28f0340e192f790ba2d05fba31b32a71bcd0ee4 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Fri, 3 Jul 2015 20:08:22 +1200
Subject: [PATCH 1818/2322] vimPlugins: add CSApprox

---
 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 6f6c8fd6e7b..383a4c4f3bd 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -82,6 +82,17 @@ rec {
   webapi-vim          = WebAPI;
   yankring            = YankRing;
 
+  CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "CSApprox-2013-07-26";
+    src = fetchgit {
+      url = "git://github.com/godlygeek/csapprox";
+      rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd";
+      sha256 = "8ccb47eb79c7ab63109d32158388812bdca340985527af4f2a5489ff8683389f";
+    };
+    dependencies = [];
+
+  };
+
   Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "Gist-2015-06-24";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index c095237bc9a..e6e8e8d04d0 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,3 +1,4 @@
+"CSApprox"
 "Gist"
 "Gundo"
 "Hoogle"

From b0e6cedf6eda39380aa6f532970e0b66fc972780 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Fri, 3 Jul 2015 20:11:22 +1200
Subject: [PATCH 1819/2322] vimPlugins: add vim-sleuth

---
 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 383a4c4f3bd..b91a1a2ae10 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -887,6 +887,17 @@ rec {
 
   };
 
+  sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "sleuth-2015-06-07";
+    src = fetchgit {
+      url = "git://github.com/tpope/vim-sleuth";
+      rev = "a17462708aa40a7fc0afd4effa559087d8a2c908";
+      sha256 = "72f4b7c5e60c942592e624806960736e71b9f109fbbfa3a5a2a37970b90f6025";
+    };
+    dependencies = [];
+
+  };
+
   snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "snipmate-2015-04-04";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index e6e8e8d04d0..972754ec2ba 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -64,6 +64,7 @@
 "quickfixstatus"
 "rainbow_parentheses"
 "rust"
+"sleuth"
 "sensible"
 "snipmate"
 "sourcemap"

From c1dd5018ccf1737c0d2818949c2c2d576aab58e5 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Fri, 3 Jul 2015 20:08:31 +0300
Subject: [PATCH 1820/2322] libev:  make the url stable

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

diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix
index ce7d7b9e275..c9b48d724dd 100644
--- a/pkgs/development/libraries/libev/default.nix
+++ b/pkgs/development/libraries/libev/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libev-${version}";
   version="4.19";
   src = fetchurl {
-    url = "http://dist.schmorp.de/libev/${name}.tar.gz";
+    url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz";
     sha256 = "1jyw7qbl0spxqa0dccj9x1jsw7cj7szff43cq4acmklnra4mzz48";
   };
 

From 7e1be588bf38ccec937d1ec6dbc0e851cd9180ce Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Fri, 3 Jul 2015 22:58:33 +0200
Subject: [PATCH 1821/2322] Leveldb: export helper functions of leveldb

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

diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index fd668fbcad9..c32372e841c 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ sqlite kyotocabinet ];
 
   buildPhase = ''
-    make all db_bench{,_sqlite3,_tree_db} leveldbutil
+    make all db_bench{,_sqlite3,_tree_db} leveldbutil libmemenv.a
   '';
 
   installPhase = "
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     cp -r include $out
     cp lib* $out/lib
     cp db_bench{,_sqlite3,_tree_db} leveldbutil $out/bin
+    mkdir -p $out/include/leveldb/helpers
+    cp helpers/memenv/memenv.h $out/include/leveldb/helpers
   ";
 
   meta = with stdenv.lib; {

From 91b85236d0651983b2d2162623309f497cc0f225 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Thu, 2 Jul 2015 16:38:17 +0200
Subject: [PATCH 1822/2322] Virtualization: add XEN/KVM related drivers for
 Windows

---
 .../driver/win-pvdrivers/default.nix          | 30 ++++++++
 .../driver/win-qemu/default.nix               | 38 ++++++++++
 .../win-signed-gplpv-drivers/default.nix      | 46 +++++++++++++
 .../driver/win-spice/default.nix              | 69 +++++++++++++++++++
 .../driver/win-virtio/default.nix             | 37 ++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++
 6 files changed, 226 insertions(+)
 create mode 100644 pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
 create mode 100644 pkgs/applications/virtualization/driver/win-qemu/default.nix
 create mode 100644 pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
 create mode 100644 pkgs/applications/virtualization/driver/win-spice/default.nix
 create mode 100644 pkgs/applications/virtualization/driver/win-virtio/default.nix

diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
new file mode 100644
index 00000000000..faa1076e299
--- /dev/null
+++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation  {
+  name = "win-pvdrivers-git-20150701";
+  version = "20150701";
+
+  src = fetchgit {
+    url = "https://github.com/ts468/win-pvdrivers";
+    rev = "3054d645fc3ee182bea3e97ff01869f01cc3637a";
+    sha256 = "6232ca2b7c9af874abbcb9262faf2c74c819727ed2eb64599c790879df535106";
+  };
+
+  buildPhase =
+    let unpack = x: "tar xf $src/${x}.tar; mkdir -p x86/${x} amd64/${x}; cp ${x}/x86/* x86/${x}/.; cp ${x}/x64/* amd64/${x}/.";
+    in stdenv.lib.concatStringsSep "\n" (map unpack ["xenbus" "xeniface" "xenvif" "xennet" "xenvbd"]);
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r x86 $out/.
+    cp -r amd64 $out/.
+    '';
+
+  meta = with stdenv.lib; {
+    description = "Xen Subproject: Windows PV Driver";
+    homepage = "http://xenproject.org/downloads/windows-pv-drivers.html";
+    maintainers = [ maintainers.tstrobel ];
+    platforms = platforms.linux;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/pkgs/applications/virtualization/driver/win-qemu/default.nix
new file mode 100644
index 00000000000..97a1f0b3039
--- /dev/null
+++ b/pkgs/applications/virtualization/driver/win-qemu/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, p7zip }:
+
+stdenv.mkDerivation  {
+  name = "win-qemu-0.1.105-1";
+  version = "0.1.105-1";
+
+  phases = [ "buildPhase" "installPhase" ];
+
+  src = fetchurl {
+    url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.105-1/virtio-win.iso";
+    sha256 = "065gz7s77y0q9kfqbr27451sr28rm9azpi88sqjkfph8c6r8q3wc";
+  };
+
+  buildPhase = ''
+    ${p7zip}/bin/7z x $src
+    '';
+
+  installPhase =
+    let
+      copy_pvpanic = arch: version: "mkdir -p $out/${arch}/qemupanic; cp pvpanic/${version}/${arch}/* $out/${arch}/qemupanic/. \n";
+      copy_pciserial = arch: "mkdir -p $out/${arch}/qemupciserial; cp qemupciserial/* $out/${arch}/qemupciserial/. \n";
+      copy_agent = arch: ''
+        mkdir -p $out/${arch}/qemuagent
+        cp guest-agent/${if arch=="x86" then "qemu-ga-x86.msi" else "qemu-ga-x64.msi"} $out/${arch}/qemuagent/qemu-guest-agent.msi
+        (cd $out/${arch}/qemuagent; ${p7zip}/bin/7z x qemu-guest-agent.msi; rm qemu-guest-agent.msi)
+        '';
+      copy = arch: version: (copy_pvpanic arch version) + (copy_pciserial arch) + (copy_agent arch);
+    in
+      (copy "amd64" "w8.1") + (copy "x86" "w8.1");
+
+  meta = with stdenv.lib; {
+    description = "Windows QEMU Drivers";
+    homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers";
+    maintainers = [ maintainers.tstrobel ];
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
new file mode 100644
index 00000000000..c4684a20914
--- /dev/null
+++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, p7zip }:
+
+let
+  src_x86 = fetchurl {
+    url = "http://apt.univention.de/download/addons/gplpv-drivers/gplpv_Vista2008x32_signed_0.11.0.373.msi";
+    sha256 = "04r11xw8ikjmcdhrsk878c86g0d0pvras5arsas3zs6dhgjykqap";
+  };
+
+  src_amd64 = fetchurl {
+    url = "http://apt.univention.de/download/addons/gplpv-drivers/gplpv_Vista2008x64_signed_0.11.0.373.msi";
+    sha256 = "00k628mg9b039p8lmg2l9n81dr15svy70p3m6xmq6f0frmci38ph";
+  };
+in
+
+stdenv.mkDerivation  {
+  name = "gplpv-0.11.0.373";
+  version = "0.11.0.373";
+
+  phases = [ "buildPhase" "installPhase" ];
+
+  buildPhase = ''
+    mkdir -p x86
+    (cd x86; ${p7zip}/bin/7z e ${src_x86})
+    mkdir -p amd64
+    (cd amd64; ${p7zip}/bin/7z e ${src_amd64})
+    '';
+
+  installPhase = ''
+    mkdir -p $out/x86 $out/amd64
+    cp x86/* $out/x86/.
+    cp amd64/* $out/amd64/.
+    '';
+
+  meta = with stdenv.lib; {
+    description = ''
+      A collection of open source Window PV drivers that allow
+      Windows to be para-virtualized.
+      The drivers are signed by Univention with a Software Publishers
+      Certificate obtained from the VeriSign CA.
+      '';
+    homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers";
+    maintainers = [ maintainers.tstrobel ];
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/applications/virtualization/driver/win-spice/default.nix
new file mode 100644
index 00000000000..689d36e7110
--- /dev/null
+++ b/pkgs/applications/virtualization/driver/win-spice/default.nix
@@ -0,0 +1,69 @@
+{ stdenv, fetchurl, p7zip, win-virtio }:
+
+let
+  src_usbdk_x86 = fetchurl {
+    url = "http://www.spice-space.org/download/windows/usbdk/UsbDk_1.0.4_x86.msi";
+    sha256 = "17hv8034wk1xqnanm5jxs4741nl7asps1fdz6lhnrpp6gvj6yg9y";
+  };
+
+  src_usbdk_amd64 = fetchurl {
+    url = "http://www.spice-space.org/download/windows/usbdk/UsbDk_1.0.4_x64.msi";
+    sha256 = "0alcqsivp33pm8sy0lmkvq7m5yh6mmcmxdl39zjxjra67kw8r2sd";
+  };
+
+  src_qxlwddm = fetchurl {
+    url = "http://people.redhat.com/~vrozenfe/qxlwddm/qxlwddm-0.11.zip";
+    sha256 = "082zdpbh9i3bq2ds8g33rcbcw390jsm7cqf46rrlx02x8r03dm98";
+  };
+
+  src_vdagent_x86 = fetchurl {
+    url = "http://www.spice-space.org/download/windows/vdagent/vdagent-win-0.7.3/vdagent_0_7_3_x86.zip";
+    sha256 = "0d928g49rf4dl79jmvnqh6g864hp1flw1f0384sfp82himm3bxjs";
+  };
+
+  src_vdagent_amd64 = fetchurl {
+    url = "http://www.spice-space.org/download/windows/vdagent/vdagent-win-0.7.3/vdagent_0_7_3_x64.zip";
+    sha256 = "0djmvm66jcmcyhhbjppccbai45nqpva7vyvry6w8nyc0fwi1vm9l";
+  };
+in
+
+stdenv.mkDerivation  {
+  # use version number of qxlwddm as qxlwddm is the most important component
+  name = "win-spice-0.11";
+  version = "0.11";
+
+  phases = [ "buildPhase" "installPhase" ];
+
+  buildPhase = ''
+    mkdir -p usbdk/x86 usbdk/amd64
+    (cd usbdk/x86; ${p7zip}/bin/7z x ${src_usbdk_x86})
+    (cd usbdk/amd64; ${p7zip}/bin/7z x ${src_usbdk_amd64})
+
+    mkdir -p vdagent/x86 vdagent/amd64
+    (cd vdagent/x86; ${p7zip}/bin/7z x ${src_vdagent_x86}; mv vdagent_0_7_3_x86/* .; rm -r vdagent_0_7_3_x86)
+    (cd vdagent/amd64; ${p7zip}/bin/7z x ${src_vdagent_amd64}; mv vdagent_0_7_3_x64/* .; rm -r vdagent_0_7_3_x64)
+
+    mkdir -p qxlwddm
+    (cd qxlwddm; ${p7zip}/bin/7z x ${src_qxlwddm}; mv Win8 w8.1; cd w8.1; mv x64 amd64)
+    '';
+
+  installPhase =
+    let
+      copy_qxl = arch: version: "mkdir -p $out/${arch}/qxl; cp qxlwddm/${version}/${arch}/* $out/${arch}/qxl/. \n";
+      copy_usbdk = arch: "mkdir -p $out/${arch}/usbdk; cp usbdk/${arch}/* $out/${arch}/usbdk/. \n";
+      copy_vdagent = arch: "mkdir -p $out/${arch}/vdagent; cp vdagent/${arch}/* $out/${arch}/vdagent/. \n";
+      # SPICE needs vioserial
+      # TODO: Link windows version in win-spice (here) to version used in win-virtio.
+      #       That way it would never matter whether vioserial is installed from win-virtio or win-spice.
+      copy_vioserial = arch: "mkdir -p $out/${arch}/vioserial; cp ${win-virtio}/${arch}/vioserial/* $out/${arch}/vioserial/. \n";
+      copy = arch: version: (copy_qxl arch version) + (copy_usbdk arch) + (copy_vdagent arch) + (copy_vioserial arch);
+    in
+      (copy "amd64" "w8.1") + (copy "x86" "w8.1");
+
+  meta = with stdenv.lib; {
+    description = ''Windows SPICE Drivers'';
+    homepage = "http://www.spice-space.org";
+    maintainers = [ maintainers.tstrobel ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix
new file mode 100644
index 00000000000..5cf2e0a3062
--- /dev/null
+++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, p7zip }:
+
+stdenv.mkDerivation  {
+  name = "win-virtio-0.1.105-1";
+  version = "0.1.105-1";
+
+  phases = [ "buildPhase" "installPhase" ];
+
+  src = fetchurl {
+    url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.105-1/virtio-win.iso";
+    sha256 = "065gz7s77y0q9kfqbr27451sr28rm9azpi88sqjkfph8c6r8q3wc";
+  };
+
+  buildPhase = ''
+    ${p7zip}/bin/7z x $src
+    '';
+
+  installPhase =
+    let
+      copy = arch: version: {input, output}: "mkdir -p $out/${arch}/${output}; cp ${input}/${version}/${arch}/* $out/${arch}/${output}/.";
+      virtio = [{input="Balloon"; output="vioballoon";}
+                {input="NetKVM"; output="vionet";}
+                {input="vioscsi"; output="vioscsi";}
+                {input="vioserial"; output="vioserial";}
+                {input="viostor"; output="viostor";}
+                {input="viorng"; output="viorng";}
+               ];
+    in
+      stdenv.lib.concatStringsSep "\n" ((map (copy "amd64" "w8.1") virtio) ++ (map (copy "x86" "w8.1") virtio));
+
+  meta = with stdenv.lib; {
+    description = "Windows VirtIO Drivers";
+    homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers";
+    maintainers = [ maintainers.tstrobel ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47510d8424d..404a6c063e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13108,6 +13108,12 @@ let
   xen_xenServer = callPackage ../applications/virtualization/xen/4.5.0.nix { xenserverPatched = true; };
   xen = xen_4_5_1;
 
+  win-spice = callPackage ../applications/virtualization/driver/win-spice { };
+  win-virtio = callPackage ../applications/virtualization/driver/win-virtio { };
+  win-qemu = callPackage ../applications/virtualization/driver/win-qemu { };
+  win-pvdrivers = callPackage ../applications/virtualization/driver/win-pvdrivers { };
+  win-signed-gplpv-drivers = callPackage ../applications/virtualization/driver/win-signed-gplpv-drivers { };
+
   xfe = callPackage ../applications/misc/xfe {
     fox = fox_1_6;
   };

From 882f3ad0db526ef811343f8d6c176b5dd3ce4e3f Mon Sep 17 00:00:00 2001
From: Kevin Quick <quick@sparq.org>
Date: Fri, 3 Jul 2015 15:33:26 -0700
Subject: [PATCH 1823/2322] htmlize: update source location

---
 .../editors/emacs-modes/htmlize/builder.sh     |  4 ----
 .../editors/emacs-modes/htmlize/default.nix    | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/htmlize/builder.sh

diff --git a/pkgs/applications/editors/emacs-modes/htmlize/builder.sh b/pkgs/applications/editors/emacs-modes/htmlize/builder.sh
deleted file mode 100644
index ccbd9d8e8a7..00000000000
--- a/pkgs/applications/editors/emacs-modes/htmlize/builder.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/share/emacs/site-lisp
-cp $src $out/share/emacs/site-lisp/htmlize.el
diff --git a/pkgs/applications/editors/emacs-modes/htmlize/default.nix b/pkgs/applications/editors/emacs-modes/htmlize/default.nix
index 96cc4e040c4..c16f449c3a2 100644
--- a/pkgs/applications/editors/emacs-modes/htmlize/default.nix
+++ b/pkgs/applications/editors/emacs-modes/htmlize/default.nix
@@ -1,15 +1,21 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   name = "htmlize-1.47";
 
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.cgi;
-    sha256 = "0m7lby95w9sj0xlqv39imlbp80x8ajd295cs6079jyhmryf6mr10";
+  src = fetchFromGitHub {
+    owner = "emacsmirror";
+    repo = "htmlize";
+    rev = "release/1.47";
+    name = "htmlize-1.47-src";
+    sha256 = "1vkqxgirc82vc44g7xhhr041arf93yirjin3h144kjyfkgkplnkp";
   };
 
+  installPhase = ''
+     mkdir -p $out/share/emacs/site-lisp
+     cp htmlize.el $out/share/emacs/site-lisp/
+  '';
+
   meta = {
     description = "Convert buffer text and decorations to HTML";
   };

From 06efb2e937c1335a4c6c8fd509b98ad54d65c1db Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 4 Jul 2015 00:39:44 +0200
Subject: [PATCH 1824/2322] chefdk: fix build

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

diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix
index ee49423a8b1..043ee8adf42 100644
--- a/pkgs/development/tools/chefdk/default.nix
+++ b/pkgs/development/tools/chefdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby, perl }:
+{ stdenv, lib, bundlerEnv, ruby, perl, autoconf }:
 
 bundlerEnv {
   name = "chefdk-0.4.0";
@@ -8,7 +8,7 @@ bundlerEnv {
   lockfile = ./Gemfile.lock;
   gemset = ./gemset.nix;
 
-  buildInputs = [ perl ];
+  buildInputs = [ perl autoconf ];
 
   meta = with lib; {
     description = "A streamlined development and deployment workflow for Chef platform";

From 443e9843eba8e8fb46675dd28fb9be09435a4f9a Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 3 Jul 2015 21:35:18 +0900
Subject: [PATCH 1825/2322] firefox-bin: 38.0.5 -> 39.0

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

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index aaaeb354f40..ebb5348795c 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,185 +4,185 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "38.0.5";
+  version = "39.0";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "71e7e8194190bebcdde40a0e265b7dcb3d6173d1"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "eda799cc394838cf2a5eea4a182149ff2616bc00"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "9162c87b2d1f420ccc5475b59bca72d45918fed3"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "4f1d9f1bebea6a9adb085191b4bdb7b3367c4b9b"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "537e6ea08c546d1ed704b1e9dd28b1219e1e5e8a"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "34b9e09b3f29e1263105b713e743038b3a166cec"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "17b25623c086778caffd7ed45e10870a3d17baa1"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "4e35d4704dfd1218b783156d0a97340480eabe30"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "596d66e6b3a8818ddd07ea285c08ca6ad508e4f6"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "80b92c1881e2841dee4f955156237aadfdf37a33"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "7f6b67bbf751fb55419bb3893e121b50f4d5e34b"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "4705cda1e366b2be2be5164fedf22f5724454101"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "5fa3021fcb1c0f7317738dcdd95f0f76ca70eb55"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "b16d8a1e56ba3818f590952c19463b4eb08bb4a4"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "300fca8783d59df6b4459760d0aaa5ac6af2a6cc"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "d8d56febf53ed513628dc1604f65c60ac8460a37"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "4aad8ed44d69c3aecb9c629168f62d0e4711eea6"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "9eaddf470789ca0574ea07bbfdfbbcaca635c69d"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "873db2012724c313f956ee0aca72341d443ff201"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "3192ab016485d10abfb0dd7bccdbd94f3d33a706"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "bb7b5dee4134546ce341e324a53c77e35e95b627"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "057e4c7bc2a06c53209e87804516cb12a644be12"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "d3a08e420b46d17f702c5b4bf1ed52160e8532c8"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "e18d7a198b0bd1c08a3b0ef5ab453daacc7528a2"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "5ccfa1e2e8058707c6d0428bab370f8517c4e231"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "98e7ae1ca507e58b297acb39b7aa026530b75974"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "ff54c24002b0b1161a859771497f9a31013c265b"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "781161113c8719d8932365f113c1bfa1994caa63"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "f697723873da7961159ef17318b1b64c2d021a7c"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "44d20f198bbeca2c69fccbfc8d21c2861145102e"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "8ae202815c3c60aef0287f18b857ba432f122a84"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "c06b25151929540760d2d10dcdb0f4087a9f531a"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "02690ab49d10976d5176c95f0cbc72509908fc1f"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "0a4733b4e56e99976a53d99e209f84527c2a3059"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "e3e067f028a018e4ae61542da9ae4e43c736f65b"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "8161109d11373b07626b563c4ca494feca3abd41"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "01fc9ebe4ac4a86a2bd4fedb6b07a9a832980a57"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "7de40c35552ce74b66bdcf56a5e4edb75995f8d5"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "f53b5bb439e882701dfe1efdcb7fb42ba15cc72d"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "05843b9324fc255a4123a70d460e6db421cf55a7"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "c93568ad64a96235aec83ff8740335b07191d2ef"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "536b58997a39aed71a985d9eb9ab96602c9ab057"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "8bfc35a45e9d0f2a2d4359ccaaee54c564d3b5e3"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "b86e07f455da243f1236b8044aeccf41c4ade1b0"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "cd3722feaebc63944e927ab244a95deb2a55aced"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "0daf7c897bf695338310050374d29c2acdaea553"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "d79ecbf48f47a3e34e0bcf897d37d2a2abbf466a"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "95c616e21fe9d948d363db89c0a6a1a4e31301db"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "5ab97d5aebbde63477cf1868bf0cb5f1b79ee820"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "02d49650094d336e17f57fa43c9969d0b3221ca3"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "e8d10a3465e7efd01ee03e57316d60176710b124"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "f40a1ec33e5018d423b65bd26563ac8db100e50d"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "66a1bc0c31061d5738bc80e9254262ada65bfb71"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "8f22bab29fb4e7359aa1261f2333faecbafe4c08"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "34f60fef14360b754510a5378d4b5d6855d49326"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "9d024945473b55373c155dbbec8880f79ee2de5e"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "2fd526c6fd23e5b0e7b292d99a60cf1530bb84e1"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "15628af429866cac3a1604f587b08d4bbeccb7e9"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "ea55480fd572173c1461a9e41c2080af890c4667"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "1e7f8cd86df1cf74525f8d07d13bcd8ea2a22b87"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "24982ebb6d6cac67673a9c39c91da7adc4c825c2"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "02f221c5526e03edadb2c36bfa5d9e35557d03a3"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "f3b8962106a9a4bc5b4f1d2928255cfaaa9094b0"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "3a8ebe66407e6369ebc26757562b4f48a6773cdd"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "c8a838618b2a8d267e24596c6cbc25f539676762"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "3382937e58f6e244d3c6dcef1051aa6bdd38692c"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "6fefc6e8548fa8fcc7182a05b06b00a3b50bb5d6"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "5b58fe2c383d4d43d1731f25dc52754712bc207d"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "118c326cdedbc4e5a1bac1ff6b1bb92f5d054847"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "384e13b51d09e99b2abce566d06d7cd522a532a7"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "ae6002a1a9b1be4f29a56176aa4dfd2fee543bdd"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c87ac5ff79b4dbf3d8738cc3309c882d7573eb3b"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "2bfd0ccec6d84b22d3f6f471f4ad096e6dc1edd3"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "cc919edd60169de8167c9e9fcf32f94fe9df4f52"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "70cdf62012d3d98b028d6b9fb9adf077c37e7c0c"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "a090ce8a36f3182aba809823ba171a0702bf17b5"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "5698a36c3f1372446e38ada59e45468f07fd5d19"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "18b49c1004778b8b11d2f3961dfed29ba562430a"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "9edddef1ce1361d76917ce255f348e208bb16697"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "64136eeab22a5150a95bdc916ce81e2f1b42a6df"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "314f99e05cf58ec8a2c50f8fe93ebe648a62a570"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "2e9245f46a28c70aa5451011bd2c59e8100a1804"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "4cc1112e81ec7f8df2ef95bbab3b3eb398ea67eb"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "e9d643c799542b118ce8cf274ab36aaec89850b3"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "e525b1c0a77274c851417c1d3af887657d9dcb18"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "016e3fcbaeb7844e3639e1c2599172de5c3f7b2f"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "2234cff2bb19e849d1a6ace38dd63258a54c192f"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "9498c156b33d8a9f90ccef6ccc202c69e4ee6c3d"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "49e7923e60daea2e0df4c27d1f6baad70b24b030"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "c9bed347d74b399901ee3f8e745ed1832462357e"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "7fecad428f80346a6333aa6cdc912cec0644b306"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "7370cb725b9087e5bff8943208762bc5bf4d01d9"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "c1139da81e8e581e7ddd511d0ce16c0b169d46f0"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "63c64558cd22ac170b39e186c1dd0e77a09c3200"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "4eb39e3fc5c3847a85a618100d3a9edc9d3bfe78"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "37fa87367363d7e337e75da89f8e5ce8f762c755"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "47b6d53050cf10535a5f7d6a8cee78ab15ad36b7"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "48b20dd2a743a1b887d15179c87b266dbe89a1ae"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "4046e0f75d4657d7423b4a0da53778348442ee5e"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "039f3c025f562e9278b16fb065d07511a3ca1f54"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "7baebf01741af616e69520f4bc95dd56187c12a2"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "f1a0557ac698f79bf926756cca2c33bd12a8ae83"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "1d2c2f8d9f455e0b6c793749f2298436167c25e4"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "473abeac7637b82d910427cac7e6da8ece20a4e5"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "41fe278dc963a7464679f4ec8a9e586666e7ceb3"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "58563ea60e40b73d1d5c9b10797d05aba5d13c95"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "dfa1c12416a9e7e6d04e5f4aaed3a03731d98372"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "75f9fb66b6610b65b402d3c8664096b4194ce1b0"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "667f035cb58c56967ed28f9cde44864cb15d5afa"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "d5709105b8255ee94c96358d2ac447dc5e4acc2d"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "b090761ded023ed465fc9629873e08ecdbaf924b"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "529312d4e7109472bf5b97ed4a9fff58bb8adbd5"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "d2ced083aefcdcd5aca84471bc382be8247e8745"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "be7a808a391a4fd1dde215834756bc61ae5e85fa"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "8a079d8ee62e3bf8fb37f81385a270af5e474aef"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "c644e5c7a6506ab203d1be61264f6bcf9fa52946"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "d3bd6308643ae805c69eeee8b716b97dc844ed9c"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "33f0f47e125f8a67a30d807775c7d0743135da84"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "9d38caee6d6c0baa8a7ea6148c65e7a28362a0fe"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "3c3f93fd22c8ae7d7056bbfae3df0ecaa7d7dcaf"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "8486b9a81265430e876410a6040e09f0bf6d4eed"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "6cd3c0ab1c33d8eb3de6f68ce7c7a219e80f49f9"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "bcd8e685a023c9919479ffe0f77c16df4fe3e2e8"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "8052c43680c9720783b6e1947c949030f1cfa51a"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "c0ae9e1fb361a7d085ef296f5afcc61a5b106c94"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "246213bd7baa7bb32b15c39237c0eece624a8dae"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "f5f7b590544228f110ddb1153f1c5354bea58656"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "c62e1e681736dbdf19d1a8c6a7f3eff01764d050"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "8008fd2095b86bd05daee4e48f95aa9003982ebf"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "a52d6d27d9612fe9b1aa3dac377d783bcc53baa1"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "a819a01f2968030cc2102640f50e31cb340e5044"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "2b8e58cf70e8cc841e720706a511e0626439b8ac"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "db1bb9bbf35166ba760274dd4c813bf4b52db2da"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "1a97efa01142188d282743bd3f97dec2bf51067a"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "d3b3f3de01e6970909d6083a2164eb840897d46e"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "e842275df31fa1202a6e5214424b870ed8e04789"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "86001510f93e7063442415325cea1772a8fe04e8"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "7090a6adb110be77527bca5a40ea5c44515e07d3"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "42087d61aed17ce567503cc944bbada7d5bc77a4"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "7b3a8078235ca307dc75b931b060d46a7b3e8e95"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "1ff6eb3feef71d37f943667945f4547fe9daca37"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "acf3f0c0ad5bd9b3c2edcafe7dd7b6e8e45a7ec4"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "3e9b32187704caec231fce83e5519d2b2fc066a7"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "065fee4f21ff6ebdc21a81aadc86a20ab3281dad"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "d742e451a73195d0445b393b0f1127835ad4684b"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "6341e742bfab7379d8a9de9545a126efa9f129ba"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "c714445df861c7073e8c840d904c91578c08db7a"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "a8fbdfa4c68092ff5258f88b7413d64fd0729ce6"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "dc4ef7a8aedbebcd3b9a0e6701c8b2fb245f784a"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "6165e3a1ef198eae25d56fa5b8dde4e37b037b9f"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "2dd5909759dc85ae7a9401eb4c759748805b0729"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "d09741294a24d80ddacb80676a2824cbd51a5585"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "1f2e3fa864c7c8f7f2d0ecca7812bfdfe7991d29"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "db5c95f01d258db2dfc04b7efecd1d7826663db8"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "54c0f91e41622e8263f7897d0b5a385870ae0d7a"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "b8b9c9001ed87429ce868144a50e6ab1ac7ccd5f"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "667ed9f21997fc79e9ce40b8bf5e607258292699"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "cb5abaca549b30ba5385ea3ef0a57be0bf446d44"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "13fdda06ab9a36a24128e12651a06f0499fbe581"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "95cd3149f404cfd0beadcdece8dfd5c102dbc72a"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "4ec9f9b30078e70451bbf5bb06cc1c07530ed5a8"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "1d5cbfee0731dfe10e3eb3aafe102e73c9e9eede"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "a6809b082761293aca28b456b1489f270234f8bf"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "77dba4a3eec1474be026dfc9021420af889172ad"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "eaa7a43b155ffbfc23e72b48fe0e150695a779e7"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "dfc241131ef4e46801e86bfe10e80b4c2bb5fdb3"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "fa5346d0c36f88a6a50259f0e170bbe5167f2393"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "bb5d61d9c14997958af850d663d48b607aa3e43e"; }
-    { locale = "uz"; arch = "linux-i686"; sha1 = "d634d94bc28779757535d05295db33e186c15abc"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha1 = "0f469e0d5f2d92b4b3f2b47efef3aa44cd25803f"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "639aa1abebe1b670ecef9df6e9d06841124ddf0b"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "16f1319cb63cc4634a215a1c9b3e0e65c1833003"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "960338fec19485c733ebd7fbacd9b55ebd1b9981"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "3a795ffee6d119741fceaa0a4825e72f5cc4e0f2"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "63dbb0328ea991b827fd5747d99aa3075486fce0"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "a1d047de7685d70750850cfb0084259041d33cd4"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "6f56944d2e31ab714d648bfd9262d39731e167b9"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "d3cd71c2ceeb1856bea66de8d7220a8529888e86"; }
+    { locale = "ach"; arch = "linux-i686"; sha1 = "802ac533ba95ecfb4780f84d52698a2cc2d7ac82"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha1 = "3c000ef496165cb4e0e104d72a381040a3bc6787"; }
+    { locale = "af"; arch = "linux-i686"; sha1 = "6fa249f63fe690f3459f4b0112f4945a502a79eb"; }
+    { locale = "af"; arch = "linux-x86_64"; sha1 = "f22b92d0fb0ed21f0e6a3a47c5f2fe873b3bfb56"; }
+    { locale = "an"; arch = "linux-i686"; sha1 = "650c772ef89bc5ef6efe5129ddf8feaf993c8f1d"; }
+    { locale = "an"; arch = "linux-x86_64"; sha1 = "e722d65e3b9b706e6b9214ae79543130ad6dba95"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "8ff6fbc92e5b9cedfa17eda240fc89f14eb68f73"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "a1e94f56148a554e522cd317d0f2384073020278"; }
+    { locale = "as"; arch = "linux-i686"; sha1 = "c6815876c23117a462d79eb5da291610c1d96feb"; }
+    { locale = "as"; arch = "linux-x86_64"; sha1 = "629997b112da84852a01606f7fa4f15448c0ebb3"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "acda6aefe872e4982d0e8f3ac337d4243bb5e00f"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "181d998305bb75ea5e99bb1b4b5059b54a724ab9"; }
+    { locale = "az"; arch = "linux-i686"; sha1 = "230ebfaf61efac65c9daae983ec2fd854a9c1dac"; }
+    { locale = "az"; arch = "linux-x86_64"; sha1 = "a8ddb38542bce008924e4b593691ae84a839e564"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "47a242cd2c91cd7435c8c959d5eaa8595710f6aa"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "db62ad921f9df2683522db1968db9b79edfbadf2"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "c2fddb3667c5bb50fee3011cfb782b2dff7f4063"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "1b891a9df513e9f099f68fe2f0429b00bd12505b"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "0ad965be5c9ce5468e65667dcb0390a9afabd7b0"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "301b659d5689de81ca60f7092176efaf48a50a18"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "df99d9e80ebda8c146724f893ae2de77cf2518ab"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "4b4cc8e588a518af8a922d32163249af115fac42"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "39976bf6a0c7bdfc1832a6f2c48e92324f4a6727"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "ea66a36ea70486f39c7cf7abbf637d37c04d32ef"; }
+    { locale = "bs"; arch = "linux-i686"; sha1 = "71eeeccd5bf5757d6ec4f9e1442c4fcfbf312d79"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha1 = "10911d28d56d4083aea7eb2174d0d7dd78772215"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "434532ff2cca7a0401a7aed8753d1c5578e98c1a"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "2a6aaed334856d06ce8c426282f3345d9bcaa435"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "e2445b13ab680f5dfd5d67e4e796170fbd6bd120"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "ef1df48bd465a3b05d1046bf4627c1ae4f60ee06"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "f95974e478e2d0fec7400424a33202e1e2b1e5b9"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "c521abab2bffe24863c087f02d57ffafae47def7"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "f11b050caae304029ccf23ce2906fe18115adbc8"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "800e0f3b649c9a03d4e9cd2a4ccd8f14bbb5ed95"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "b9502be9396e00b69946f0094c5939a8a57da64b"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "84fab2779bc055821afdb5d7ff45e3ffe95e2858"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "5eee946bc2182990b310ed57fbf527e82f93bc8b"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "8b3219b071e836ecc4966e153ec0adb4e691de89"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "9759c69061d6419edb949c55f7e797302b477c78"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "db5025d393a763c7cd4ed447d61b640ee77e7e79"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "4fdc423d6d15bd6a14030a526ad7017fd5bdf937"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "0d8637f1ca6acfe494f963c936d8510c6c11f8bf"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "e05722e42ea1d844d8fe40672026cacb19575ccf"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "8143b339d0ceedaf797b49ca4b54bcc0c91925e3"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "fac507eebec642fd50f248ac184dbde4538ad0bb"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "2670a80c7ca5d5390df9fcee907afbe7a01f9f37"; }
+    { locale = "eo"; arch = "linux-i686"; sha1 = "a134117ddd446b63f325a38f818a80921adb5b2f"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha1 = "5b073a912221e8e734ba17ecfe735d820f5febf3"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "0e518d9fe0644a6ada9463ae14fa67c2c49bfd5f"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "fa33935aa4abb696ea9a399cff0c1dc29beffab0"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha1 = "3c7df32ed5d2570e62e35dcb9f9d91588d7584d2"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "ced3821f7e334b2f0d5b5115cc04cbaf5bcdbe15"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "6af75a3e116162591dd6a15c8903ee5182afe03b"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "fa1ddbc5a3d9bd7c9cc424fe6c5e94c87d51eab2"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha1 = "8110bdf4c8657e88f71b8a6bec1ca92f2eac0538"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "30df4777fde7eba8724fab002cb7387203eeb82e"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "2f16472e5cd030a14e3cfa761a32c0ef5ffd395e"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "19a96b008a49e7a223ea2463edab7cda504e2ba5"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "786db5ad8d92324d3086f7b2b8da71767829a8f2"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "31273f797cb90615032611d2d86cac8cf6d28994"; }
+    { locale = "fa"; arch = "linux-i686"; sha1 = "e2980430f1cd25edb401862b83fb49f2d730ff5e"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha1 = "dae850824c3eaaa31fec4aad19e38e2073d96f10"; }
+    { locale = "ff"; arch = "linux-i686"; sha1 = "f865672eaa7815f3bb527baf3946c62c01c76dbb"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha1 = "aa207b51d24ca275b0cbd5ba4cd93ce16a6bd28a"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "30ef856ecdadeba171977859324f010d441a51e9"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "3ebbabc2346eeac01aaf88e91fd1fd55538c0770"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "4dd376ccc6811d46be052fcf1aab82e50a3e0999"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "f6409e276b400ecaa689d92fe5387662d1b5f2ab"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "751cd1092a58a8b6cde5d9e80790715d249ac11b"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "3cc75c55220f81b0291c16d2f237cb6a2d2609f0"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "2bfa436c566a4e2f0fe7847feccf3c157e026d4b"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "0b2ce0b246e107d99b13e497c64ad169e85eec51"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "3afc8ad8747bfcbc5a7e6f2e6de37cbefb3967e7"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "5bec8bcc0a67f304485b1efa7be5d952ce7985ce"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "8fa3dfdc0d2da19f6c98dc76363c9e0d9d10f978"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "4345cf5673267fb41c2c38f5fb92a3b0a9208cf0"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "e57883626a22d3935716417194e78a689c5535c2"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "be6095129ee3f3fc80f6705594a53c6ced996cb2"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "7ca70c0648b2f3928c1dc33288b48f488cf1d19b"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "f2eb7c6c33e8b4bc9a03bee587de4fe5b442ac95"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "32b242a2c6865fdad63ba4de701c566ffb33ef99"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "f83ceece81a71e6fb1494863b2970b2dc384d4c4"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "77f9c855e5f728dcd3b4ff27ed656aa67217dd35"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "f48bcf72d740f4a34bb7f888d977d4d39c141567"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "2db09bd59f3761bfdba8bad565e27e1b42a93727"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "99e0f119e5e79df5b20f686dd065fee5bda4511f"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "0d601a679675c517a535bf706e7cbad9882a5d7c"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "dbd3d180342d0946ab857bdd8d6bc30373e991b5"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "5f3e01cf375af38bee7014ff21fe75daf4e27071"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "a78fbb1cc4e6d10056cc7a3ccecf4750979c5953"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "7efc031614247ddb93a27531d3fa1d19ce21d516"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "e409bb73aad373791d83569dfb4a475bc617eac8"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "0e5c4e9173379457b6c8edd1812121fce84cda07"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "dc6cbffde61b6188080e458b4a31b634f4c0434c"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "d75318f8421f634eeacf15aaa91a28261324044c"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "b024d0e3498c3dd32757997a273d9f1051ccd47f"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "f74c1c567582a207efb501892845d1c28d7b8751"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "cb4151c0c1c6efa4c8ec5e4656de60b1abd65bac"; }
+    { locale = "kk"; arch = "linux-i686"; sha1 = "1e9d43eedb0bab9f428a80ee3c2721a944961562"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha1 = "18a55f6ea18663922052411ebaed18c16c9f3050"; }
+    { locale = "km"; arch = "linux-i686"; sha1 = "f4f6af5a09072e004e7c8db7a10edc9ab8d474c3"; }
+    { locale = "km"; arch = "linux-x86_64"; sha1 = "43694f66fea7caf9b2f4d976564c00a99f7092e7"; }
+    { locale = "kn"; arch = "linux-i686"; sha1 = "3a94f8a0cadc729e97bb6a7b273b02d79c9012dd"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha1 = "ec51644f69354aebac67f36e387d1a5b45d0dfa8"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "599de739c08799b8e4082190a53de3ae0dfc6617"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "338825804362d34911beaad146ca6d104bc69788"; }
+    { locale = "lij"; arch = "linux-i686"; sha1 = "f2a6112a81043cc9608594cd56680a2e075dfd36"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha1 = "8650de76d89abdcba3d0e4bba8c2b90533e54ce6"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "0ea6e49b51dfd12150334b6023e26419716cdb65"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "a16c9e916462e3780159677528ffa35b9569a80b"; }
+    { locale = "lv"; arch = "linux-i686"; sha1 = "0255634959aa739ae6807a1c249e4c78f51f8316"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha1 = "ada8dc2d3ea22c2afffac88b581dfc72a27f2f89"; }
+    { locale = "mai"; arch = "linux-i686"; sha1 = "fa932b9e6d9798753e7b89b91a5db6565fe2b695"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha1 = "8a9252658d549d2cbc764197265275461db605b6"; }
+    { locale = "mk"; arch = "linux-i686"; sha1 = "641c882870dfa7fb23bed9c07def585477ff459d"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha1 = "4b68d11f2a613bc8350d37dae899c2c65afe5dc9"; }
+    { locale = "ml"; arch = "linux-i686"; sha1 = "f636e9b8d5e268f7c124ef3f35f6933de83fed62"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha1 = "ed98b20d8eb88a73b119c3a1435904f69529eabd"; }
+    { locale = "mr"; arch = "linux-i686"; sha1 = "d5ef4d4dbf4d0b63f526d102e95f28078096032a"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha1 = "8e92bf456593359afb256c387578042c6085916f"; }
+    { locale = "ms"; arch = "linux-i686"; sha1 = "d94320d0c8aee23b6d3c603664caab45180b6069"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha1 = "b9fdc0248d9656b3555c475643c7e07ca3c6b222"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "d49719c255a43151ed5e94d7024c39914ea27ec7"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "f2b1f00254ef350f817b5c1958384a9f5144f83e"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "cc54828041f57f623de691a49e4bb055bd059c54"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "5728a30bf53644a3b13bc00f5652e067cbe9100b"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "0f69ddbd963a19d104ee96589c405c55aa7140b2"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "26af2b8cf928fedb5442c5257289f5e38c4f8432"; }
+    { locale = "or"; arch = "linux-i686"; sha1 = "2da0842ebe8ae5a8e80061d0fc159a5d408c4464"; }
+    { locale = "or"; arch = "linux-x86_64"; sha1 = "b7cc446178a493589d8654236f6e9113aee48455"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "dd81dc403366a7fd0d395338878b8b8fcb858365"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "2ca8cc4c491f0ded4cef8e3826a3c1419a580051"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "468d45392126ac7852012ed43d76d83e238dc2ac"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "ed20af16563516671f32bb588728e90f29955964"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "b197bca20e972ce2f8851dc128fb212a7d293454"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "2cd05329c3612330fdc1354fe651cc13ab8d9a5f"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "1087ba6ba17aa102888e929ccf7acc6b2476e447"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "aa1907c10e980a8466c1604519ffa08aaabb2d7c"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "fdb717a0f40b94a53077ff036a55c0f93b61a2cc"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "af10206080a7ad21e5fda9cdf66a734ee33b07ac"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "f08c67c6ea2a63c216f944453b4ce8b36f4ed840"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "07efb37804ffab35f117eb32f9f645b554ac1dd8"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "874f588d7ac5554ae4e8e134bfc272897f839f97"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "af64b6eb8d33d6bd78ce86e4785be50babe5c919"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "672523b996c7021e06b4a713f7ac1239a3b1800f"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "2e594b56230c079a9f1735e9bab9dc4a9d9e31ab"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "6edffa576d9829673c65400d4570b34dc787faad"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "7b506fedbf3a25cd1ed54b05c9b5cb7b8c237ad8"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "e8d1fea389b7cb75b7ccbf22ad5b8691e9bf1b6a"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "20163798733ee36ffa510987b18d1eb67b82aca1"; }
+    { locale = "son"; arch = "linux-i686"; sha1 = "9076d0e9de6adb7fbd26dbd3cd89dd5728939aab"; }
+    { locale = "son"; arch = "linux-x86_64"; sha1 = "352aeb9f5ccb1e3bb87c8e47f93e96a049991412"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "838c4c525a9f93117704851ad81b2c199a9c28fc"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "0139a064056da0ed1730fd768da1322a9661bca9"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "7d74018cd9948ee31e05b30ff1fb45a84d417494"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "85c43e2359f444faf111efd83fb0dc3e1b0edb48"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "bc95ee926f82aba58691d923eb4cb963aa4cb64a"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "7c8946d6180e2c48a80958b6a790bf6c9231591e"; }
+    { locale = "ta"; arch = "linux-i686"; sha1 = "dfaad8f934869d714c94a95a775bcdcd67fda3c4"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha1 = "5523c6df4e2b03ae71c865aabe6bb0dd0446fc87"; }
+    { locale = "te"; arch = "linux-i686"; sha1 = "7a61ca88c832af3d15f197ba01d66c6fc43465d3"; }
+    { locale = "te"; arch = "linux-x86_64"; sha1 = "696823890791a05c6cf0230d1063a30012873090"; }
+    { locale = "th"; arch = "linux-i686"; sha1 = "4a3b932813ad0ab07f467a598e9e85b847bbe142"; }
+    { locale = "th"; arch = "linux-x86_64"; sha1 = "f847f3f0fb07f97053066f4b4314d93e9614e6cf"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "59eee567e30cf6321c234c60002b416faec07aa4"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "b64dfdbdc75f87003f00883173084646a2617a29"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "44e6b53ede97835847ed84defe4235cad513c653"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "bb6f84f58a19c6287bbc84e0e7101fcd48bd720a"; }
+    { locale = "uz"; arch = "linux-i686"; sha1 = "1aec3ba9efd52a1f386e0bb075745a7c01c443a2"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha1 = "2ce2caccb638c0467ba1382a15146ef1cc33fa72"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "d8b339892c152254c89ec1d42ff9b7f128455aab"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "e4503686f2a997e1c793ef8e3c80bccd3dc0e2f0"; }
+    { locale = "xh"; arch = "linux-i686"; sha1 = "d130fae691b91a1f1f7d15ca84f643ccf299b0e3"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha1 = "18b5d09571f4db7b18dbbdb3f3c29c80480a16aa"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "303816f99659e2bbb8ecc4f9b1c83932a0c9205d"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "238b50b8bb745f2d80099354592c9b710c55f1d8"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "9159a6fea44a97a33390c527abf7730cdbbc9216"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "74e3c2292aed9c2a7de24d6f3693ac1d0ba4c41f"; }
   ];
 }

From 97ddd04ca96a7219bd254f1d89a63f51ba119830 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 2 Jul 2015 09:25:50 +0200
Subject: [PATCH 1826/2322] chromium: Remove obsolete sandbox_userns_36.patch.

The file is no longer referenced since 6a8afa4 and thus can be safely
dropped.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../chromium/source/sandbox_userns_36.patch   | 287 ------------------
 1 file changed, 287 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch

diff --git a/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch b/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch
deleted file mode 100644
index 6f5d52b72af..00000000000
--- a/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-commit 0fec7e4a742f001c9816a8b58a1120fb44230867
-Author: aszlig <aszlig@redmoonstudios.org>
-Date:   Thu May 16 14:17:56 2013 +0200
-
-    zygote: Add support for user namespaces on Linux.
-    
-    The implementation is done by patching the Zygote host to execute the sandbox
-    binary with CLONE_NEWUSER and setting the uid and gid mapping so that the child
-    process is using uid 0 and gid 0 which map to the current user of the parent.
-    Afterwards, the sandbox will continue as if it was called as a setuid binary.
-    
-    In addition, this adds new_user_namespace as an option in process_util in order
-    to set the UID and GID mapping correctly. The reason for this is that just
-    passing CLONE_NEWUSER to clone_flags doesn't help in LaunchProcess(), because
-    without setting the mappings exec*() will clear the process's capability sets.
-    
-    If the kernel doesn't support unprivileged user namespaces and the sandbox
-    binary doesn't have the setuid flag, the Zygote main process will run without a
-    sandbox. This is to mimic the behaviour if no SUID sandbox binary path is set.
-    
-    Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-
-diff --git a/base/process/launch.cc b/base/process/launch.cc
-index 81748f5..930f20f 100644
---- a/base/process/launch.cc
-+++ b/base/process/launch.cc
-@@ -26,6 +26,7 @@ LaunchOptions::LaunchOptions()
- #if defined(OS_LINUX)
-       , clone_flags(0)
-       , allow_new_privs(false)
-+      , new_user_namespace(false)
- #endif  // OS_LINUX
- #if defined(OS_CHROMEOS)
-       , ctrl_terminal_fd(-1)
-diff --git a/base/process/launch.h b/base/process/launch.h
-index 9e39fba..00e4c79 100644
---- a/base/process/launch.h
-+++ b/base/process/launch.h
-@@ -115,6 +115,9 @@ struct BASE_EXPORT LaunchOptions {
-   // By default, child processes will have the PR_SET_NO_NEW_PRIVS bit set. If
-   // true, then this bit will not be set in the new child process.
-   bool allow_new_privs;
-+
-+  // If true, start the process in a new user namespace.
-+  bool new_user_namespace;
- #endif  // defined(OS_LINUX)
- 
- #if defined(OS_CHROMEOS)
-diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc
-index 457234f..a99ce9b 100644
---- a/base/process/launch_posix.cc
-+++ b/base/process/launch_posix.cc
-@@ -40,6 +40,10 @@
- 
- #if defined(OS_LINUX)
- #include <sys/prctl.h>
-+#include <sched.h>
-+#if !defined(CLONE_NEWUSER)
-+#define CLONE_NEWUSER 0x10000000
-+#endif
- #endif
- 
- #if defined(OS_CHROMEOS)
-@@ -301,13 +305,23 @@ bool LaunchProcess(const std::vector<std::string>& argv,
- 
-   pid_t pid;
- #if defined(OS_LINUX)
--  if (options.clone_flags) {
-+  int map_pipe_fd[2];
-+  int flags = options.clone_flags;
-+
-+  if (options.new_user_namespace) {
-+    flags |= CLONE_NEWUSER;
-+    if (pipe(map_pipe_fd) < 0) {
-+      DPLOG(ERROR) << "user namespace pipe";
-+      return false;
-+    }
-+  }
-+
-+  if (options.clone_flags || options.new_user_namespace) {
-     // Signal handling in this function assumes the creation of a new
-     // process, so we check that a thread is not being created by mistake
-     // and that signal handling follows the process-creation rules.
--    RAW_CHECK(
--        !(options.clone_flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM)));
--    pid = syscall(__NR_clone, options.clone_flags, 0, 0, 0);
-+    RAW_CHECK(!(flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM)));
-+    pid = syscall(__NR_clone, flags, 0, 0, 0);
-   } else
- #endif
-   {
-@@ -328,6 +342,21 @@ bool LaunchProcess(const std::vector<std::string>& argv,
-     // DANGER: no calls to malloc or locks are allowed from now on:
-     // http://crbug.com/36678
- 
-+#if defined(OS_LINUX)
-+    if (options.new_user_namespace) {
-+      // Close the write end of the pipe so we get an EOF when the parent closes
-+      // the FD. This is to avoid race conditions when the UID/GID mappings are
-+      // written _after_ execvp().
-+      close(map_pipe_fd[1]);
-+
-+      char dummy;
-+      if (HANDLE_EINTR(read(map_pipe_fd[0], &dummy, 1)) != 0) {
-+        RAW_LOG(ERROR, "Unexpected input in uid/gid mapping pipe.");
-+        _exit(127);
-+      }
-+    }
-+#endif
-+
-     // DANGER: fork() rule: in the child, if you don't end up doing exec*(),
-     // you call _exit() instead of exit(). This is because _exit() does not
-     // call any previously-registered (in the parent) exit handlers, which
-@@ -452,6 +481,40 @@ bool LaunchProcess(const std::vector<std::string>& argv,
-     _exit(127);
-   } else {
-     // Parent process
-+#if defined(OS_LINUX)
-+    if (options.new_user_namespace) {
-+      // We need to write UID/GID mapping here to map the current user outside
-+      // the namespace to the root user inside the namespace in order to
-+      // correctly "fool" the child process.
-+      char buf[256];
-+      int map_fd, map_len;
-+
-+      snprintf(buf, sizeof(buf), "/proc/%d/uid_map", pid);
-+      map_fd = open(buf, O_RDWR);
-+      DPCHECK(map_fd >= 0);
-+      snprintf(buf, sizeof(buf), "0 %d 1", geteuid());
-+      map_len = strlen(buf);
-+      if (write(map_fd, buf, map_len) != map_len) {
-+        RAW_LOG(WARNING, "Can't write to uid_map.");
-+      }
-+      close(map_fd);
-+
-+      snprintf(buf, sizeof(buf), "/proc/%d/gid_map", pid);
-+      map_fd = open(buf, O_RDWR);
-+      DPCHECK(map_fd >= 0);
-+      snprintf(buf, sizeof(buf), "0 %d 1", getegid());
-+      map_len = strlen(buf);
-+      if (write(map_fd, buf, map_len) != map_len) {
-+        RAW_LOG(WARNING, "Can't write to gid_map.");
-+      }
-+      close(map_fd);
-+
-+      // Close the pipe on the parent, so the child can continue doing the
-+      // execvp() call.
-+      close(map_pipe_fd[1]);
-+    }
-+#endif
-+
-     if (options.wait) {
-       // While this isn't strictly disk IO, waiting for another process to
-       // finish is the sort of thing ThreadRestrictions is trying to prevent.
-diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc
-index 9d63ad9..0885705 100644
---- a/content/browser/zygote_host/zygote_host_impl_linux.cc
-+++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
-@@ -144,6 +144,9 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
-   // A non empty sandbox_cmd means we want a SUID sandbox.
-   using_suid_sandbox_ = !sandbox_cmd.empty();
- 
-+  bool userns_sandbox = false;
-+  const std::vector<std::string> cmd_line_unwrapped(cmd_line.argv());
-+
-   // Start up the sandbox host process and get the file descriptor for the
-   // renderers to talk to it.
-   const int sfd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
-@@ -156,11 +159,24 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
-     sandbox_client->PrependWrapper(&cmd_line);
-     sandbox_client->SetupLaunchOptions(&options, &fds_to_map, &dummy_fd);
-     sandbox_client->SetupLaunchEnvironment();
-+    userns_sandbox = sandbox_client->IsNoSuid();
-   }
- 
-   base::ProcessHandle process = -1;
-   options.fds_to_remap = &fds_to_map;
-+  if (userns_sandbox)
-+    options.new_user_namespace = true;
-   base::LaunchProcess(cmd_line.argv(), options, &process);
-+
-+  if (process == -1 && userns_sandbox) {
-+    LOG(ERROR) << "User namespace sandbox failed to start, running without "
-+               << "sandbox! You need at least kernel 3.8.0 with CONFIG_USER_NS "
-+               << "enabled in order to use the sandbox without setuid bit.";
-+    using_suid_sandbox_ = false;
-+    options.new_user_namespace = false;
-+    base::LaunchProcess(cmd_line_unwrapped, options, &process);
-+  }
-+
-   CHECK(process != -1) << "Failed to launch zygote process";
-   dummy_fd.reset();
- 
-diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc
-index 11f0602..b7b8214 100644
---- a/content/zygote/zygote_main_linux.cc
-+++ b/content/zygote/zygote_main_linux.cc
-@@ -389,6 +389,13 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox) {
-     CHECK(CreateInitProcessReaper());
-   }
- 
-+  // Don't set non-dumpable, as it causes trouble when the host tries to find
-+  // the zygote process (XXX: Not quite sure why this happens with user
-+  // namespaces). Fortunately, we also have the seccomp filter sandbox which
-+  // should disallow the use of ptrace.
-+  if (setuid_sandbox->IsNoSuid())
-+    return true;
-+
- #if !defined(OS_OPENBSD)
-   // Previously, we required that the binary be non-readable. This causes the
-   // kernel to mark the process as non-dumpable at startup. The thinking was
-diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc
-index fc03cdd..a972faa 100644
---- a/sandbox/linux/suid/client/setuid_sandbox_client.cc
-+++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc
-@@ -229,6 +229,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const {
-   return env_->HasVar(kSandboxNETNSEnvironmentVarName);
- }
- 
-+bool SetuidSandboxClient::IsNoSuid() const {
-+  return env_->HasVar(kSandboxNoSuidVarName);
-+}
-+
- bool SetuidSandboxClient::IsSandboxed() const {
-   return sandboxed_;
- }
-@@ -277,8 +281,7 @@ void SetuidSandboxClient::PrependWrapper(base::CommandLine* cmd_line) {
-                                     "LinuxSUIDSandboxDevelopment.";
-   }
- 
--  if (access(sandbox_binary.c_str(), X_OK) != 0 || (st.st_uid != 0) ||
--      ((st.st_mode & S_ISUID) == 0) || ((st.st_mode & S_IXOTH)) == 0) {
-+  if (access(sandbox_binary.c_str(), X_OK) != 0) {
-     LOG(FATAL) << "The SUID sandbox helper binary was found, but is not "
-                   "configured correctly. Rather than run without sandboxing "
-                   "I'm aborting now. You need to make sure that "
-@@ -286,6 +289,12 @@ void SetuidSandboxClient::PrependWrapper(base::CommandLine* cmd_line) {
-   }
- 
-   cmd_line->PrependWrapper(sandbox_binary);
-+
-+  if (!((st.st_uid == 0) &&
-+        (st.st_mode & S_ISUID) &&
-+        (st.st_mode & S_IXOTH))) {
-+    env_->SetVar(kSandboxNoSuidVarName, "1");
-+  }
- }
- 
- void SetuidSandboxClient::SetupLaunchOptions(
-diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h
-index 2bbad7a..8605475 100644
---- a/sandbox/linux/suid/client/setuid_sandbox_client.h
-+++ b/sandbox/linux/suid/client/setuid_sandbox_client.h
-@@ -66,6 +66,8 @@ class SANDBOX_EXPORT SetuidSandboxClient {
-   bool IsInNewPIDNamespace() const;
-   // Did the setuid helper create a new network namespace ?
-   bool IsInNewNETNamespace() const;
-+  // Is sandboxed without SUID binary ?
-+  bool IsNoSuid() const;
-   // Are we done and fully sandboxed ?
-   bool IsSandboxed() const;
- 
-diff --git a/sandbox/linux/suid/common/sandbox.h b/sandbox/linux/suid/common/sandbox.h
-index 9345287..2db659e 100644
---- a/sandbox/linux/suid/common/sandbox.h
-+++ b/sandbox/linux/suid/common/sandbox.h
-@@ -15,6 +15,7 @@ static const char kAdjustOOMScoreSwitch[] = "--adjust-oom-score";
- 
- static const char kSandboxDescriptorEnvironmentVarName[] = "SBX_D";
- static const char kSandboxHelperPidEnvironmentVarName[] = "SBX_HELPER_PID";
-+static const char kSandboxNoSuidVarName[] = "SBX_NO_SUID";
- 
- static const long kSUIDSandboxApiNumber = 1;
- static const char kSandboxEnvironmentApiRequest[] = "SBX_CHROME_API_RQ";
-diff --git a/sandbox/linux/suid/sandbox.c b/sandbox/linux/suid/sandbox.c
-index 7410b71..a83593d 100644
---- a/sandbox/linux/suid/sandbox.c
-+++ b/sandbox/linux/suid/sandbox.c
-@@ -330,7 +330,7 @@ static bool DropRoot() {
-     return false;
-   }
- 
--  if (setresgid(rgid, rgid, rgid)) {
-+  if (egid != rgid && setresgid(rgid, rgid, rgid)) {
-     perror("setresgid");
-     return false;
-   }

From a80437e2360197aaf89a54a97f5aa2ee1c89eb44 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 2 Jul 2015 10:24:19 +0200
Subject: [PATCH 1827/2322] chromium: Remove out-of-tree sandbox derivation.

Since 0aad4b7, we no longer need to have an external sandbox binary,
because the upstream implementation of the user namespace sandbox no
longer needs an external sandbox binary.

In our implementation of the user namespace sandbox, we (ab)used the
setuid sandbox to run non-setuid and set up user namespaces instead.

Because our implementation is no longer needed, we can safely drop the
external binary entirely.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/common.nix   |  1 -
 .../networking/browsers/chromium/default.nix  |  2 --
 .../networking/browsers/chromium/sandbox.nix  | 21 -------------------
 .../browsers/chromium/source/default.nix      |  3 +--
 4 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/chromium/sandbox.nix

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 714058d81e0..7c55b06a3c4 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -126,7 +126,6 @@ let
     #      derivations.
     prePatch = ''
       cp -dr --no-preserve=mode "${source.main}"/* .
-      cp -dr --no-preserve=mode "${source.sandbox}" sandbox
       cp -dr "${source.bundled}" third_party
       chmod -R u+w third_party
     '';
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 7a355cbf59a..1b5da0763e7 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -33,7 +33,6 @@ let
     };
 
     browser = callPackage ./browser.nix { };
-    sandbox = callPackage ./sandbox.nix { };
 
     plugins = callPackage ./plugins.nix {
       inherit enablePepperFlash enableWideVine;
@@ -71,7 +70,6 @@ in stdenv.mkDerivation {
 
   buildCommand = let
     browserBinary = "${chromium.browser}/libexec/chromium/chromium";
-    sandboxBinary = "${chromium.sandbox}/bin/chromium-sandbox";
     mkEnvVar = key: val: "--set '${key}' '${val}'";
     envVars = chromium.plugins.settings.envVars or {};
     flags = chromium.plugins.settings.flags or [];
diff --git a/pkgs/applications/networking/browsers/chromium/sandbox.nix b/pkgs/applications/networking/browsers/chromium/sandbox.nix
deleted file mode 100644
index b470ed63325..00000000000
--- a/pkgs/applications/networking/browsers/chromium/sandbox.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, source }:
-
-stdenv.mkDerivation {
-  name = "chromium-sandbox-${source.version}";
-  src = source.sandbox;
-
-  patchPhase = ''
-    sed -i -e '/#include.*base_export/c \
-      #define BASE_EXPORT __attribute__((visibility("default")))
-    /#include/s|sandbox/linux|'"$(pwd)"'/linux|
-    ' linux/suid/*.[hc]
-  '';
-
-  buildPhase = ''
-    gcc -Wall -std=gnu99 -o sandbox linux/suid/*.c
-  '';
-
-  installPhase = ''
-    install -svD sandbox "$out/bin/chromium-sandbox"
-  '';
-}
diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index f9c5c6e0265..68573d0c6af 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -14,7 +14,6 @@ let
     "s,^[^/]+(.*)$,$main\\1,"
     "s,$main/(build|tools)(/.*)?$,$out/\\1\\2,"
     "s,$main/third_party(/.*)?$,$bundled\\1,"
-    "s,$main/sandbox(/.*)?$,$sandbox\\1,"
     "s,^/,,"
   ]);
 
@@ -29,7 +28,7 @@ in stdenv.mkDerivation {
   buildInputs = [ python ]; # cannot patch shebangs otherwise
 
   phases = [ "unpackPhase" "patchPhase" ];
-  outputs = [ "out" "sandbox" "bundled" "main" ];
+  outputs = [ "out" "bundled" "main" ];
 
   unpackPhase = ''
     tar xf "$src" -C / \

From 7e6d6e034db419c0da2743f1aca90e1d50f97135 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 2 Jul 2015 10:41:51 +0200
Subject: [PATCH 1828/2322] chromium: Disable setuid sandbox without errors.

Just silencing the error will not prevent Chromium from trying to start
up the SUID sandbox anyway, thus flooding stderr with:

LaunchProcess: failed to execvp:

After digging a bit in the source code I found out that the SUID sandbox
binary is indeed used, but only for setting oom_score_adj within the
user namespace (as "root"). So let's build the sandbox binary and of
course don't set setuid bit.

These annoying error messages were originally introduced by 0aad4b7 and
I'm deeply sorry for annoying you guys out there with them.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/browser.nix     | 3 ++-
 .../networking/browsers/chromium/source/default.nix            | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index a0bdc70f9f5..626a2b8a81a 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -5,7 +5,7 @@ with stdenv.lib;
 mkChromiumDerivation (base: rec {
   name = "chromium-browser";
   packageName = "chromium";
-  buildTargets = [ "mksnapshot" "chrome" ];
+  buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ];
 
   installPhase = ''
     mkdir -p "$libExecPath"
@@ -16,6 +16,7 @@ mkChromiumDerivation (base: rec {
       cp -v "$buildPath/libffmpegsumo.so" "$libExecPath/"
     ''}
     cp -v "$buildPath/chrome" "$libExecPath/$packageName"
+    cp -v "$buildPath/chrome_sandbox" "$libExecPath/chrome-sandbox"
 
     mkdir -vp "$out/share/man/man1"
     cp -v "$buildPath/chrome.1" "$out/share/man/man1/$packageName.1"
diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index 68573d0c6af..bb68e4a0ca8 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -101,8 +101,6 @@ in stdenv.mkDerivation {
       -e 's|/bin/echo|echo|' \
       -e "/python_arch/s/: *'[^']*'/: '""'/" \
       "$out/build/common.gypi" "$main/chrome/chrome_tests.gypi"
-    sed -i -e '/LOG.*no_suid_error/d' \
-      "$main/content/browser/browser_main_loop.cc"
   '' + optionalString useOpenSSL ''
     cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl"
   '';

From 9bc2f77daa1ba67d7e83e6a163b371b54e7c8506 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 2 Jul 2015 10:51:52 +0200
Subject: [PATCH 1829/2322] nixos/tests/chromium: Improve sandbox checking.

We no longer need have "SUID sandbox" enabled in the chrome://sandbox
status page and we now also check for "You are adequately sandboxed." to
be absolutely sure that we're running with proper sandboxing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/tests/chromium.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 2241bc9c3bc..6c2302594b9 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -157,10 +157,11 @@ import ./make-test.nix (
 
           my $clipboard = $machine->succeed("${pkgs.xclip}/bin/xclip -o");
           die "sandbox not working properly: $clipboard"
-          unless $clipboard =~ /(?:suid|namespace) sandbox.*yes/mi
+          unless $clipboard =~ /namespace sandbox.*yes/mi
               && $clipboard =~ /pid namespaces.*yes/mi
               && $clipboard =~ /network namespaces.*yes/mi
-              && $clipboard =~ /seccomp.*sandbox.*yes/mi;
+              && $clipboard =~ /seccomp.*sandbox.*yes/mi
+              && $clipboard =~ /you are adequately sandboxed/mi;
         };
       };
     }

From bc5ce1f1b05d5d03b72ce16ad0cfde8ac8318a86 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 2 Jul 2015 10:59:34 +0200
Subject: [PATCH 1830/2322] chromium: Update stable and beta channels.

Overview of the updated versions:

stable: 43.0.2357.125 -> 43.0.2357.130
beta:   44.0.2403.52  -> 44.0.2403.61

For the beta channel the following changes were necessary:

 * Drop all patches which were added in c290595 because they apply to
   44.0.2403.52 only. The shipped version of Blink was older than the
   one used for Chromium itself and thus contained just the
   cherry-picked patches from upstream Blink.

 * The ffmpegsumo library is now statically linked the same way as in
   the dev version, so let's not try to put it into the output store
   path.

All channels were built successfully on my Hydra at:

https://headcounter.org/hydra/eval/187176

VM tests did also pass and can be found at:

x86:    https://headcounter.org/hydra/build/707636
x86_64: https://headcounter.org/hydra/build/707637

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/browser.nix  |  2 +-
 .../browsers/chromium/source/default.nix      | 37 ++-----------------
 .../browsers/chromium/source/sources.nix      | 16 ++++----
 3 files changed, 12 insertions(+), 43 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 626a2b8a81a..5c8c25553ee 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -12,7 +12,7 @@ mkChromiumDerivation (base: rec {
     cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
     cp -v "$buildPath/icudtl.dat" "$libExecPath/"
     cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
-    ${optionalString (versionOlder base.version "45.0.0.0") ''
+    ${optionalString (versionOlder base.version "44.0.0.0") ''
       cp -v "$buildPath/libffmpegsumo.so" "$libExecPath/"
     ''}
     cp -v "$buildPath/chrome" "$libExecPath/$packageName"
diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index bb68e4a0ca8..e8ad569adbf 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -18,7 +18,6 @@ let
   ]);
 
   pre44 = versionOlder version "44.0.0.0";
-  is44 = versionOlder version "45.0.0.0" && !pre44;
 
 in stdenv.mkDerivation {
   name = "chromium-source-${version}";
@@ -47,39 +46,9 @@ in stdenv.mkDerivation {
     done
   '';
 
-  patches = let
-    baseURL = "https://codereview.chromium.org/download";
-
-    mkBlinkFix = issue: sha256: fetchpatch {
-      url = "${baseURL}/issue${issue}.diff";
-      inherit sha256;
-      postFetch = ''
-        sed -i -e 's,^\(---\|+++\) *[ab]/,&third_party/WebKit/,' "$out"
-      '';
-    };
-
-    fixes44 = [
-      # WebPluginContainer::setNeedsLayout
-      # https://codereview.chromium.org/1157943002/
-      (mkBlinkFix "1157943002_20001"
-                  "0932yd15zlh2g5a5bbm6qrnfvv22jlfdg8pj0w9z58m5zdzw1p82")
-      # WebRuntimeFeatures::enablePermissionsAPI
-      # https://codereview.chromium.org/1156113007/
-      (mkBlinkFix "1156113007_1"
-                  "1v76brrgdziv1q62ba4bimg0my2dmnkyl68b21nv2vw661v0hzwh")
-      # Revert of https://codereview.chromium.org/1150543002/
-      (fetchpatch {
-        url = "${baseURL}/issue1150543002_1.diff";
-        sha256 = "0x9sya0m1zcb2vcp2vfss88qqdrh6bzcbx2ngfiql7rkbynnpqn6";
-        postFetch = ''
-          ${patchutils}/bin/interdiff "$out" /dev/null > reversed.patch
-          mv reversed.patch "$out"
-        '';
-      })
-    ];
-    pluginPaths = if pre44 then singleton ./nix_plugin_paths_42.patch
-                  else singleton ./nix_plugin_paths_44.patch;
-  in pluginPaths ++ optionals is44 fixes44;
+  patches = if pre44
+            then singleton ./nix_plugin_paths_42.patch
+            else singleton ./nix_plugin_paths_44.patch;
 
   patchPhase = let
     diffmod = sym: "/^${sym} /{s/^${sym} //;${transform ""};s/^/${sym} /}";
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 2ffb8c970e4..86dd127aa6b 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -7,15 +7,15 @@
     sha256bin64 = "1jzmkgiqn17ynbv0xljiifvlj1136jq98zrkd4hdmkgv8xrrzd74";
   };
   beta = {
-    version = "44.0.2403.52";
-    sha256 = "0zgcqbxm2slxpj6i50w7r3xxql1k6kgd51qn8w8gwfzhmad4zxyx";
-    sha256bin32 = "1kfgl2l7j5fhj6wg4i3bsany2rlwspprypdy0z7k3pqiwwyiw658";
-    sha256bin64 = "1sabqqh1hii7appmx6xwabnapf4cv7smsy31nvz063fa5p6h21m8";
+    version = "44.0.2403.61";
+    sha256 = "16bifaqs3fmfms305c1h10kabsyrscxkywf32pl6zwlzjd3y4ncm";
+    sha256bin32 = "1lgqf6bid02pjdzxg1jipfzjqzp5frqxv4bi6q127kky3lz9lmlc";
+    sha256bin64 = "1l6cyfn5mraprisib7q5rgy8vvkc7ky8z91c2iqsikjv7nmrm6hv";
   };
   stable = {
-    version = "43.0.2357.125";
-    sha256 = "01alba50zrc50bn4p3f298khk8fam2rv5wyysz7rq3zrjg8785xg";
-    sha256bin32 = "0527bdlf4nd4b1ydmwn6rnxy377388qb98v9anicfd4bc2p9jjml";
-    sha256bin64 = "0yhgcjaxcpgk32l1sjrgkq447ywcj156a7372v87m22dcwl8fi01";
+    version = "43.0.2357.130";
+    sha256 = "0bh093rfiklwj03my9d6x3118k2msbl7fhrxlndx99cnjd1mbyv2";
+    sha256bin32 = "083scn6dd11lnd0z5yxd6jfgdxj7iaafssccj8a9ybr1ay894ch1";
+    sha256bin64 = "14mfw64ips6nzz6kr8k8dq5253cbqd69hjlc54fl7nqfxi9zw31f";
   };
 }

From 4726690a7454de8cc956df0cfef3b779ede5bdb9 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sat, 4 Jul 2015 03:38:53 +0300
Subject: [PATCH 1831/2322] qtcreator: fix hash

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

diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index 2f8068b9723..199df25d552 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz";
-    sha256 = "0kp7czn9mzncdpq8bx15s3sy13g4xlcdz7y7zy0s9350g4ijs8fx";
+    sha256 = "1asbfphws0aqs92gjgh0iqzr1911kg51r9al44jxpfk88yazjzgm";
   };
 
   # This property can be used in a nix development environment to refer to the Qt package

From 44594e851cc64e0e85c7d1d04042c00ba583d342 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Fri, 3 Jul 2015 22:54:03 -0400
Subject: [PATCH 1832/2322] xsensors: init at 0.70

---
 pkgs/os-specific/linux/xsensors/default.nix   |  22 +++
 .../xsensors/remove-unused-variables.patch    |  39 ++++
 .../xsensors/replace-deprecated-gtk.patch     | 168 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 4 files changed, 231 insertions(+)
 create mode 100644 pkgs/os-specific/linux/xsensors/default.nix
 create mode 100644 pkgs/os-specific/linux/xsensors/remove-unused-variables.patch
 create mode 100644 pkgs/os-specific/linux/xsensors/replace-deprecated-gtk.patch

diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/os-specific/linux/xsensors/default.nix
new file mode 100644
index 00000000000..a392d065e41
--- /dev/null
+++ b/pkgs/os-specific/linux/xsensors/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, lib, fetchurl, gtk2, pkgconfig, lm_sensors }:
+
+stdenv.mkDerivation rec {
+  name = "xsensors-${version}";
+  version = "0.70";
+  src = fetchurl {
+    url = "http://www.linuxhardware.org/xsensors/xsensors-${version}.tar.gz";
+    sha256 = "1siplsfgvcxamyqf44h71jx6jdfmvhfm7mh0y1q8ps4zs6pj2zwh";
+  };
+  buildInputs = [
+    gtk2 pkgconfig lm_sensors
+  ];
+  patches = [
+    ./remove-unused-variables.patch
+    ./replace-deprecated-gtk.patch
+  ];
+  meta = with lib; {
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/os-specific/linux/xsensors/remove-unused-variables.patch b/pkgs/os-specific/linux/xsensors/remove-unused-variables.patch
new file mode 100644
index 00000000000..7da97a0e56e
--- /dev/null
+++ b/pkgs/os-specific/linux/xsensors/remove-unused-variables.patch
@@ -0,0 +1,39 @@
+Author: Nanley Chery <nanleychery@gmail.com>
+From: Jean Delvare <khali@linux-fr.org>
+Subject: Remove declared, but unused variables
+Bug-Debian: http://bugs.debian.org/625435
+---
+--- a/src/gui.c
++++ b/src/gui.c
+@@ -257,10 +257,9 @@
+ 
+ /* Start the sensor info update timer. */
+ gint start_timer( GtkWidget *widget, gpointer data ) {
+-    gint timer;
+ 
+     /* Setup timer for updates. */
+-    timer = g_timeout_add( update_time * 1000, 
++    g_timeout_add( update_time * 1000,
+                              (GtkFunction) update_sensor_data, 
+ 			     (gpointer) data );
+ 
+@@ -287,7 +286,7 @@
+ 
+     /* feature data */
+     updates *head = NULL;
+-    updates *current = NULL, *prev = NULL;
++    updates *current = NULL;
+ 
+     const sensors_feature *feature;
+ 
+@@ -347,10 +346,8 @@
+             new_node->pbar = featpbar;
+ 
+             if ( head == NULL ) {
+-                prev = head;
+                 head = current = new_node;
+             } else {
+-                prev = current;
+                 current = current->next = new_node;
+             }
+ 
diff --git a/pkgs/os-specific/linux/xsensors/replace-deprecated-gtk.patch b/pkgs/os-specific/linux/xsensors/replace-deprecated-gtk.patch
new file mode 100644
index 00000000000..fed4c7dc4c9
--- /dev/null
+++ b/pkgs/os-specific/linux/xsensors/replace-deprecated-gtk.patch
@@ -0,0 +1,168 @@
+Author: Nanley Chery <nanleychery@gmail.com>
+Subject: Update deprecated gtk casts and replace deprecated function calls with their analogous cairo counterparts.
+Bug-Debian: http://bugs.debian.org/622005
+Bug-Debian: http://bugs.debian.org/610321
+---
+--- a/src/gui.c
++++ b/src/gui.c
+@@ -27,10 +27,10 @@
+ GtkWidget *mainwindow = NULL;
+ 
+ GdkColor colorWhite = { 0, 0xFFFF, 0xFFFF, 0xFFFF };
+-    
+-GdkColormap *cmap = NULL;
+ 
+-GdkPixmap *theme = NULL;
++GdkPixbuf *theme = NULL;
++
++cairo_surface_t *surface = NULL;
+ 
+ /* Destroy the main window. */
+ gint destroy_gui( GtkWidget *widget, gpointer data ) {
+@@ -76,17 +76,16 @@
+     }
+ }
+ 
+-static void draw_digits( GtkWidget *widget, const gchar *digits, int highLow )
++static void draw_digits( GtkWidget *widget, cairo_t *cr, const gchar *digits, int highLow )
+ {
+     const gchar *digit = digits;
+     int pos = 0, x = 0, y = 0, w = 0;
+ 
+     while ( *digit ) {
+         get_pm_location( *digit, &x, &y, &w );
+-        gdk_draw_drawable( widget->window,
+-                           widget->style->fg_gc[ GTK_WIDGET_STATE
+-                           (widget) ], theme, x, y + highLow,
+-                           pos, 0, w, 30 );
++        cairo_set_source_surface (cr, surface, pos-x, 0-(y + highLow));
++		cairo_rectangle(cr, pos, 0, w, 30);
++		cairo_fill(cr);
+         pos += w;
+         digit++;
+     }
+@@ -102,6 +101,8 @@
+ 
+     gchar result[7];
+ 
++    cairo_t *cr = gdk_cairo_create(widget->window);
++
+ #ifdef DEBUG_XSENSORS
+     printf( "area.width = %d, area.height = %d\n", event->area.width,
+             event->area.height );
+@@ -117,13 +118,11 @@
+ 
+             /* Display the digits */
+             if ( g_snprintf( result, 6, "%5.0f", current->curvalue ) >= 0 )
+-               draw_digits( widget, result, highLow );
++               draw_digits( widget, cr, result, highLow );
+ 
+             /* Display RPM */
+-            gdk_draw_drawable( widget->window, 
+-                               widget->style->fg_gc[ GTK_WIDGET_STATE 
+-                               (widget) ], theme, 0, 120 + highLow, 
+-                               90, 0, 57, 30 );
++            cairo_set_source_surface (cr, surface, 90-0, 0-(120 + highLow));
++     	    cairo_rectangle(cr, 90, 0, 57, 30);
+             break;
+         case TEMP:
+             if ( current->curvalue > current->curmax )
+@@ -134,17 +133,15 @@
+ 
+             /* Display the digits */
+             if ( g_snprintf( result, 7, "%6.1f", current->curvalue ) >= 0 )
+-               draw_digits( widget, result, highLow );
++               draw_digits( widget, cr, result, highLow );
+ 
+             /* Display degree symbol */
+             if ( tf == FALSE )
+                 x = 0;
+             else
+                 x = 57;
+-            gdk_draw_drawable( widget->window, 
+-                             widget->style->fg_gc[ GTK_WIDGET_STATE 
+-                             (widget) ], theme, x, 60 + highLow, 
+-                             96, 0, 57, 30 );
++            cairo_set_source_surface (cr, surface, 96-x, 0-(60 + highLow));
++     	    cairo_rectangle(cr, 96, 0, 57, 30);
+             
+             break;
+         case VOLT:
+@@ -154,20 +151,17 @@
+             
+             /* Display the digits */
+             if ( g_snprintf( result, 7, "%6.2f", current->curvalue ) >= 0 )
+-               draw_digits( widget, result, highLow );
++               draw_digits( widget, cr, result, highLow );
+ 
+             /* Display V */
+-            gdk_draw_drawable( widget->window, 
+-                             widget->style->fg_gc[ GTK_WIDGET_STATE 
+-                             (widget) ], theme, 114, 60 + highLow, 
+-                             96, 0, 57, 30 );
+-
+-
++            cairo_set_source_surface (cr, surface, 96-114, 0-(60 + highLow));
++     	    cairo_rectangle(cr, 96, 0, 57, 30);
+             break;
+         default:
+             break;
+     }
+-            
++    cairo_fill(cr);
++    cairo_destroy(cr);
+     return TRUE;
+ }
+ 
+@@ -260,7 +254,7 @@
+ 
+     /* Setup timer for updates. */
+     g_timeout_add( update_time * 1000,
+-                             (GtkFunction) update_sensor_data, 
++                             (GSourceFunc) update_sensor_data,
+ 			     (gpointer) data );
+ 
+     return SUCCESS;
+@@ -460,8 +454,6 @@
+     g_signal_connect( G_OBJECT (mainwindow), "delete_event",
+                       G_CALLBACK (destroy_gui), NULL );
+ 
+-    /* Graphics needed for drawing info. */
+-    cmap = gtk_widget_get_colormap( mainwindow );
+ 
+     /* Set up the image file used for displaying characters. */
+     if ( imagefile == NULL ) {
+@@ -481,12 +473,10 @@
+                        "Image file not found in either location!  Exiting!\n" );
+                 exit( 1 );
+             } else {
+-                theme = gdk_pixmap_colormap_create_from_xpm( NULL, cmap,
+-                        NULL, NULL, "./images/default.xpm" );
++                theme = gdk_pixbuf_new_from_file("./images/default.xpm", NULL );
+             }
+         } else {
+-            theme = gdk_pixmap_colormap_create_from_xpm( NULL, cmap,
+-                    NULL, NULL, imagefile );
++            theme = gdk_pixbuf_new_from_file(imagefile, NULL );
+         }
+     } else {
+         if ( stat( imagefile, &sbuf ) != 0 ) {
+@@ -495,11 +485,15 @@
+                     "Image file not found in specified location!  Exiting!\n" );
+             exit( 1 );
+         } else {
+-            theme = gdk_pixmap_colormap_create_from_xpm( NULL, cmap,
+-                    NULL, NULL, imagefile );
++            theme = gdk_pixbuf_new_from_file(imagefile, NULL );
+         }
+     }
+-    
++    surface = cairo_image_surface_create_for_data(gdk_pixbuf_get_pixels(theme),
++                                        CAIRO_FORMAT_RGB24,
++										gdk_pixbuf_get_width(theme),
++										gdk_pixbuf_get_height(theme),
++										gdk_pixbuf_get_rowstride(theme));
++
+     /* Create notebook for sensors. */
+     notebook = gtk_notebook_new( );
+     gtk_widget_modify_bg( notebook, GTK_STATE_NORMAL, &colorWhite );
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c938770195..1cfa21807c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3319,6 +3319,8 @@ let
 
   xsettingsd = callPackage ../tools/X11/xsettingsd { };
 
+  xsensors = callPackage ../os-specific/linux/xsensors { };
+
   xcruiser = callPackage ../applications/misc/xcruiser { };
 
   unarj = callPackage ../tools/archivers/unarj { };

From 1b9737992b5688c5a55c715a24d28a7b765f1bef Mon Sep 17 00:00:00 2001
From: "Ryan Scheel (Havvy)" <ryan.havvy@gmail.com>
Date: Sat, 4 Jul 2015 07:42:44 +0200
Subject: [PATCH 1833/2322] Update io.js (2.3.1 -> 2.3.3)

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

diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix
index 8c90e421944..6fef81300ab 100644
--- a/pkgs/development/web/iojs/default.nix
+++ b/pkgs/development/web/iojs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }:
 
 let
-  version = "2.3.1";
+  version = "2.3.3";
   inherit (stdenv.lib) optional maintainers licenses platforms;
 in stdenv.mkDerivation {
   name = "iojs-${version}";
 
   src = fetchurl {
     url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
-    sha256 = "1vkahs7ky551gl52l8j8f2w8ajasjblqqmhird5ll87wccx8w6f2";
+    sha256 = "12fdz0as1sa34bq4a701qwrznpn7y1wq0yxlr5yw494ifchfm103";
   };
 
   prePatch = ''

From f3bd64120392a63c14de512f06adc2284e10c617 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 29 Jun 2015 17:14:15 +0200
Subject: [PATCH 1834/2322] zandronum: 2.0 -> 2.1

---
 pkgs/games/zandronum/bin.nix     | 8 +++++---
 pkgs/games/zandronum/default.nix | 8 ++++----
 pkgs/games/zandronum/server.nix  | 8 ++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix
index baf91a66622..f7fa9fc643e 100644
--- a/pkgs/games/zandronum/bin.nix
+++ b/pkgs/games/zandronum/bin.nix
@@ -3,6 +3,7 @@
 , bzip2
 , cairo
 , fetchurl
+, fluidsynth
 , fontconfig
 , freetype
 , gdk_pixbuf
@@ -20,16 +21,17 @@
 assert stdenv.system == "x86_64-linux";
 
 stdenv.mkDerivation rec {
-  name = "zandronum-2.0";
+  name = "zandronum-2.1";
   src = fetchurl {
-    url = "http://zandronum.com/downloads/zandronum2.0-linux-x86_64.tar.bz2";
-    sha256 = "1k49az7x0ig40r2xisscpyhfcx9zzivx8w1l1ispj58g6qivicgc";
+    url = "http://zandronum.com/downloads/zandronum2.1-linux-x86_64.tar.bz2";
+    sha256 = "0fhk2gd0lqmc6brbli17ks5ywnlzkjyas1kfdqsf3d96w0z5rz11";
   };
 
   libPath = stdenv.lib.makeLibraryPath [
     atk
     bzip2
     cairo
+    fluidsynth
     fontconfig
     freetype
     gdk_pixbuf
diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix
index ca60c364f0f..812ea268113 100644
--- a/pkgs/games/zandronum/default.nix
+++ b/pkgs/games/zandronum/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchhg, cmake, SDL, mesa, fmod42416, openssl, sqlite, sqlite-amalgamation }:
 
 stdenv.mkDerivation {
-  name = "zandronum-2.0";
+  name = "zandronum-2.1";
   src = fetchhg {
-    url = "https://bitbucket.org/Torr_Samaho/zandronum";
-    rev = "2fc02c0";
-    sha256 = "1syzy0iphm6jj5wag3xyr2fx7vyg2cjcmijhvgw2rc67rww85pv2";
+    url = "https://bitbucket.org/Torr_Samaho/zandronum-stable";
+    rev = "27275a8";
+    sha256 = "00xyrk0d1jrvy6zk059yawgd9b33z0fx4hvzcjvvbn03rqci60yc";
   };
 
   phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ];
diff --git a/pkgs/games/zandronum/server.nix b/pkgs/games/zandronum/server.nix
index 506eee0e54f..f0e0285f87e 100644
--- a/pkgs/games/zandronum/server.nix
+++ b/pkgs/games/zandronum/server.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchhg, cmake, openssl, sqlite, sqlite-amalgamation, SDL }:
 
 stdenv.mkDerivation {
-  name = "zandronum-server-2.0";
+  name = "zandronum-server-2.1";
   src = fetchhg {
-    url = "https://bitbucket.org/Torr_Samaho/zandronum";
-    rev = "2fc02c0";
-    sha256 = "1syzy0iphm6jj5wag3xyr2fx7vyg2cjcmijhvgw2rc67rww85pv2";
+    url = "https://bitbucket.org/Torr_Samaho/zandronum-stable";
+    rev = "27275a8";
+    sha256 = "00xyrk0d1jrvy6zk059yawgd9b33z0fx4hvzcjvvbn03rqci60yc";
   };
 
   phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ];

From 42a5ad5c5ec9b9b309428ede6740e042ec7edaea Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Fri, 3 Jul 2015 23:05:57 +0200
Subject: [PATCH 1835/2322] minidlna: 1.0.25 -> 1.1.4

Changes:
- gettext is needed to build
- Switched to using non-legacy ffmpeg.
- Removed ffmpeg stuff from include path since it causes build errors related to
a time.h header.
- Removed unneeded patch.
- Adjusted NixOS service due to the binary being renamed.
---
 .../modules/services/networking/minidlna.nix  |  2 +-
 pkgs/tools/networking/minidlna/config.patch   | 57 -------------------
 pkgs/tools/networking/minidlna/default.nix    | 13 ++---
 pkgs/top-level/all-packages.nix               |  4 +-
 4 files changed, 7 insertions(+), 69 deletions(-)
 delete mode 100644 pkgs/tools/networking/minidlna/config.patch

diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix
index 51850496e2c..aa28502a12c 100644
--- a/nixos/modules/services/networking/minidlna.nix
+++ b/nixos/modules/services/networking/minidlna.nix
@@ -97,7 +97,7 @@ in
             Type = "forking";
             PIDFile = "/run/minidlna/pid";
             ExecStart =
-              "@${pkgs.minidlna}/sbin/minidlna minidlna -P /run/minidlna/pid" +
+              "@${pkgs.minidlna}/sbin/minidlnad minidlnad -P /run/minidlna/pid" +
               " -f ${pkgs.writeText "minidlna.conf" cfg.config}";
           };
       };
diff --git a/pkgs/tools/networking/minidlna/config.patch b/pkgs/tools/networking/minidlna/config.patch
deleted file mode 100644
index 74442a75656..00000000000
--- a/pkgs/tools/networking/minidlna/config.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -rc minidlna-1.0.24/genconfig.sh minidlna-1.0.24-new/genconfig.sh
-*** minidlna-1.0.24/genconfig.sh	2012-06-24 20:08:26.697884140 +0200
---- minidlna-1.0.24-new/genconfig.sh	2012-06-24 20:10:44.742874979 +0200
-***************
-*** 38,68 ****
-  
-  ${RM} ${CONFIGFILE}
-  
-- # Detect if there are missing headers
-- # NOTE: This check only works with a normal distro
-- [ ! -e "/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING"
-- [ ! -e "/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING"
-- [ ! -e "/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING"
-- [ ! -e "/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING"
-- [ ! -e "/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING"
-- [ ! -e "/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING"
-- [ ! -e "/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING"
-- [ ! -e "/usr/include/ffmpeg/avutil.h" -a \
--   ! -e "/usr/include/libavutil/avutil.h" -a \
--   ! -e "/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING"
-- [ ! -e "/usr/include/ffmpeg/avformat.h" -a \
--   ! -e "/usr/include/libavformat/avformat.h" -a \
--   ! -e "/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING"
-- [ ! -e "/usr/include/ffmpeg/avcodec.h" -a \
--   ! -e "/usr/include/libavcodec/avcodec.h" -a \
--   ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING"
-- if [ -n "$MISSING" ]; then
-- 	echo -e "\nERROR!  Cannot continue."
-- 	echo -e "The following required libraries are either missing, or are missing development headers:\n"
-- 	echo -e "$MISSING\n"
-- 	exit 1
-- fi
-- 
-  echo "/* MiniDLNA Project" >> ${CONFIGFILE}
-  echo " * http://sourceforge.net/projects/minidlna/" >> ${CONFIGFILE}
-  echo " * (c) 2008-2009 Justin Maggard" >> ${CONFIGFILE}
---- 38,43 ----
-diff -rc minidlna-1.0.24/Makefile minidlna-1.0.24-new/Makefile
-*** minidlna-1.0.24/Makefile	2012-06-24 20:16:08.673195909 +0200
---- minidlna-1.0.24-new/Makefile	2012-06-24 20:16:18.615267052 +0200
-***************
-*** 64,70 ****
-  	$(INSTALL) -d $(ETCINSTALLDIR)
-  	$(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
-  
-! minidlna:	$(BASEOBJS) $(LNXOBJS) $(LIBS)
-  	@echo Linking $@
-  	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
-  
---- 64,70 ----
-  	$(INSTALL) -d $(ETCINSTALLDIR)
-  	$(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
-  
-! minidlna:	$(BASEOBJS) $(LNXOBJS) 
-  	@echo Linking $@
-  	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
-  
diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix
index 9db42f09d81..1bf00986393 100644
--- a/pkgs/tools/networking/minidlna/default.nix
+++ b/pkgs/tools/networking/minidlna/default.nix
@@ -1,23 +1,20 @@
-{ stdenv, fetchurl, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite }:
+{ stdenv, fetchurl, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }:
 
-let version = "1.0.25"; in
+let version = "1.1.4"; in
 
 stdenv.mkDerivation rec {
   name = "minidlna-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna_${version}_src.tar.gz";
-    sha256 = "0l987x3bx2apnlihnjbhywgk5b2g9ysiapwclz5vphj2w3xn018p";
+    url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna-${version}.tar.gz";
+    sha256 = "9814c04a2c506a0dd942c4218d30c07dedf90dabffbdef2d308a3f9f23545314";
   };
 
-  patches = [ ./config.patch ];
-
   preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ffmpeg}/include/libavutil -I${ffmpeg}/include/libavcodec -I${ffmpeg}/include/libavformat"
     export makeFlags="INSTALLPREFIX=$out"
   '';
 
-  buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite ];
+  buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ];
 
   meta = {
     description = "Media server software";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c938770195..2e26bbbe892 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1971,9 +1971,7 @@ let
 
   makebootfat = callPackage ../tools/misc/makebootfat { };
 
-  minidlna = callPackage ../tools/networking/minidlna {
-    ffmpeg = ffmpeg_0;
-  };
+  minidlna = callPackage ../tools/networking/minidlna { };
 
   mmv = callPackage ../tools/misc/mmv { };
 

From 737de61912fbf4e654819c3c39786ac5bffa3048 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sat, 4 Jul 2015 03:17:42 -0400
Subject: [PATCH 1836/2322] urxvt-font-size: init

---
 .../urxvt-font-size/default.nix               | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix

diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix
new file mode 100644
index 00000000000..eafa0d6d18b
--- /dev/null
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, xrdb }:
+
+stdenv.mkDerivation {
+  name = "urxvt-font-size-2015-05-22";
+  dontPatchShebangs = true;
+
+  src = fetchFromGitHub {
+    owner = "majutsushi";
+    repo = "urxvt-font-size";
+    rev = "fd5b09c10798c6723bbf771d4d8881cf6563bc69";
+    sha256 = "16m3kkypg3y00x597zx05zy167a0kaqpawz0l591wzb2bv1dz55z";
+  };
+
+  installPhase = ''
+    substituteInPlace font-size \
+      --replace "xrdb -merge" "${xrdb}/bin/xrdb -merge"
+
+    mkdir -p $out/lib/urxvt/perl
+    cp font-size $out/lib/urxvt/perl
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Change the urxvt font size on the fly";
+    homepage = "https://github.com/majutsushi/urxvt-font-size";
+    license = licenses.mit;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1cfa21807c5..33f54b7de86 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12461,9 +12461,10 @@ let
   # urxvt plugins
   urxvt_perls = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perls { };
   urxvt_tabbedex = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-tabbedex { };
+  urxvt_font_size = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-font-size { };
 
   rxvt_unicode-with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix {
-    plugins = [ urxvt_perls urxvt_tabbedex ];
+    plugins = [ urxvt_perls urxvt_tabbedex urxvt_font_size ];
   };
 
   # FIXME: remove somewhere in future

From 2fd9d56f51daaaf2a5743823fd438245ae62732c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 4 Jul 2015 09:42:35 +0200
Subject: [PATCH 1837/2322] nixos/skydns: fixed reference to skydns

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

diff --git a/nixos/modules/services/networking/skydns.nix b/nixos/modules/services/networking/skydns.nix
index 045e908a3b1..3b939091489 100644
--- a/nixos/modules/services/networking/skydns.nix
+++ b/nixos/modules/services/networking/skydns.nix
@@ -55,7 +55,7 @@ in {
     };
 
     package = mkOption {
-      default = pkgs.goPackages.skydns;
+      default = pkgs.skydns;
       type = types.package;
       description = "Skydns package to use.";
     };

From 7aacf74cc79a005944f7294950ee812ae6a2aa5b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 3 Jul 2015 20:56:27 +0200
Subject: [PATCH 1838/2322] cytoolz: init at 0.7.3

---
 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 0d51996499d..f12d2273c47 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2159,6 +2159,22 @@ let
       platforms = platforms.all;
     };
   };
+  
+  cytoolz = buildPythonPackage rec {
+    name = "cytoolz-${version}";
+    version = "0.7.3";
+    
+    src = pkgs.fetchurl{
+      url = "https://pypi.python.org/packages/source/c/cytoolz/cytoolz-${version}.tar.gz";
+      md5 = "e9f0441d9f340a23c60357f68f25d163";
+    };
+    
+    meta = {
+      homepage = "http://github.com/pytoolz/cytoolz/";
+      description = "Cython implementation of Toolz: High performance functional utilities";
+      license = "licenses.bsd3";   
+    };
+  };
 
   cryptacular = buildPythonPackage rec {
     name = "cryptacular-1.4.1";

From 0a3e430e85b86827ab1c71cd5df1b0565bab2a19 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 3 Jul 2015 13:11:18 +0200
Subject: [PATCH 1839/2322] toolz: init at 0.7.2

---
 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 0d51996499d..575420c1bf5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12991,6 +12991,22 @@ let
     };
   };
 
+  toolz = buildPythonPackage rec{
+    name = "toolz-${version}";
+    version = "0.7.2";
+    
+    src = pkgs.fetchurl{
+      url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
+      md5 = "6f045541a9e7ee755b7b00fced4a7fde";
+    };
+    
+    meta = {
+      homepage = "http://github.com/pytoolz/toolz/";
+      description = "List processing tools and functional utilities";
+      license = "licenses.bsd3";   
+    };
+  };
+  
   tox = buildPythonPackage rec {
     name = "tox-1.8.1";
 

From 1eb50ebbf26d0cedc6677dabc78ba5253caf1fa1 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Wed, 1 Jul 2015 00:57:20 +1200
Subject: [PATCH 1840/2322] shellinabox service: intial implementation

---
 nixos/modules/module-list.nix                 |   1 +
 .../services/web-servers/shellinabox.nix      | 122 ++++++++++++++++++
 2 files changed, 123 insertions(+)
 create mode 100644 nixos/modules/services/web-servers/shellinabox.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 76ee1b7f9c6..4f0a4672ece 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -383,6 +383,7 @@
   ./services/web-servers/lighttpd/gitweb.nix
   ./services/web-servers/nginx/default.nix
   ./services/web-servers/phpfpm.nix
+  ./services/web-servers/shellinabox.nix
   ./services/web-servers/tomcat.nix
   ./services/web-servers/uwsgi.nix
   ./services/web-servers/varnish/default.nix
diff --git a/nixos/modules/services/web-servers/shellinabox.nix b/nixos/modules/services/web-servers/shellinabox.nix
new file mode 100644
index 00000000000..58a02ac59c3
--- /dev/null
+++ b/nixos/modules/services/web-servers/shellinabox.nix
@@ -0,0 +1,122 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.shellinabox;
+
+  # If a certificate file is specified, shellinaboxd requires
+  # a file descriptor to retrieve it
+  fd = "3";
+  createFd = optionalString (cfg.certFile != null) "${fd}<${cfg.certFile}";
+
+  # Command line arguments for the shellinabox daemon
+  args = [ "--background" ]
+   ++ optional (! cfg.enableSSL) "--disable-ssl"
+   ++ optional (cfg.certFile != null) "--cert-fd=${fd}"
+   ++ optional (cfg.certDirectory != null) "--cert=${cfg.certDirectory}"
+   ++ cfg.extraOptions;
+
+  # Command to start shellinaboxd
+  cmd = "${pkgs.shellinabox}/bin/shellinaboxd ${concatStringsSep " " args}";
+
+  # Command to start shellinaboxd if certFile is specified
+  wrappedCmd = "${pkgs.bash}/bin/bash -c 'exec ${createFd} && ${cmd}'";
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+    services.shellinabox = {
+      enable = mkEnableOption "shellinabox daemon";
+
+      user = mkOption {
+        type = types.str;
+        default = "root";
+        description = ''
+          User to run shellinaboxd as. If started as root, the server drops
+          privileges by changing to nobody, unless overridden by the
+          <literal>--user</literal> option.
+        '';
+      };
+
+      enableSSL = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether or not to enable SSL (https) support.
+        '';
+      };
+        
+      certDirectory = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        example = "/var/certs";
+        description = ''
+          The daemon will look in this directory far any certificates.
+          If the browser negotiated a Server Name Identification the daemon
+          will look for a matching certificate-SERVERNAME.pem file. If no SNI
+          handshake takes place, it will fall back on using the certificate in the
+          certificate.pem file.
+
+          If no suitable certificate is installed, shellinaboxd will attempt to
+          create a new self-signed certificate. This will only succeed if, after
+          dropping privileges, shellinaboxd has write permissions for this
+          directory.
+        '';
+      };
+
+      certFile = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        example = "/var/certificate.pem";
+        description = "Path to server SSL certificate.";
+      };
+
+      extraOptions = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+        example = [ "--port=443" "--service /:LOGIN" ];
+        description = ''
+          A list of strings to be appended to the command line arguments
+          for shellinaboxd. Please see the manual page
+          <link xlink:href="https://code.google.com/p/shellinabox/wiki/shellinaboxd_man"/>
+          for a full list of available arguments.
+        '';
+      };
+
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    assertions =
+      [ { assertion = cfg.enableSSL == true
+            -> cfg.certDirectory != null || cfg.certFile != null;
+          message = "SSL is enabled for shellinabox, but no certDirectory or certFile has been specefied."; }
+        { assertion = ! (cfg.certDirectory != null && cfg.certFile != null);
+          message = "Cannot set both certDirectory and certFile for shellinabox."; }
+      ];
+
+    systemd.services.shellinaboxd = {
+      description = "Shellinabox Web Server Daemon";
+
+      wantedBy = [ "multi-user.target" ];
+      requires = [ "sshd.service" ];
+      after = [ "sshd.service" ];
+
+      serviceConfig = {
+        Type = "forking";
+        User = "${cfg.user}";
+        ExecStart = "${if cfg.certFile == null then "${cmd}" else "${wrappedCmd}"}";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+      };
+    };
+  };
+}

From 198ea49d8acf25c18b455d2a7f13335a5bbf3089 Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Fri, 3 Jul 2015 02:18:32 +0300
Subject: [PATCH 1841/2322] dot2tex: init at 2.9.0

---
 pkgs/top-level/all-packages.nix    |  2 ++
 pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33f54b7de86..a2d324aeab2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5432,6 +5432,8 @@ let
 
   docutils = pythonPackages.docutils;
 
+  dot2tex = pythonPackages.dot2tex;
+
   doxygen = callPackage ../development/tools/documentation/doxygen {
     qt4 = null;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0d51996499d..73d0d625dc9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16219,5 +16219,24 @@ let
     };
   };
 
+  dot2tex = buildPythonPackage rec {
+    name = "dot2tex-2.9.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/dot2tex/dot2tex-2.9.0.tar.gz";
+      md5 = "2dbaeac905424d0410751235bde4b8b2";
+    };
+
+    propagatedBuildInputs = with self; [
+      pyparsing
+    ];
+
+    meta = {
+      description = "Convert graphs generated by Graphviz to LaTeX friendly formats";
+      homepage = "https://github.com/kjellmf/dot2tex";
+      license = licenses.mit;
+    };
+  };
+
 
 }; in pythonPackages

From b73e91723704ab60c66340b7743c1689ebb665a1 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Fri, 3 Jul 2015 22:59:57 +0200
Subject: [PATCH 1842/2322] chaps: init at version 0.42-6812

Chaps is a PKCS #11 implementation with TPM backend.
---
 pkgs/tools/security/chaps/default.nix         | 81 +++++++++++++++++++
 .../security/chaps/fix_absolute_path.patch    | 18 +++++
 .../chaps/fix_environment_variables.patch     | 42 ++++++++++
 pkgs/tools/security/chaps/fix_scons.patch     | 26 ++++++
 .../security/chaps/insert_prefetches.patch    | 51 ++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 6 files changed, 220 insertions(+)
 create mode 100644 pkgs/tools/security/chaps/default.nix
 create mode 100644 pkgs/tools/security/chaps/fix_absolute_path.patch
 create mode 100644 pkgs/tools/security/chaps/fix_environment_variables.patch
 create mode 100644 pkgs/tools/security/chaps/fix_scons.patch
 create mode 100644 pkgs/tools/security/chaps/insert_prefetches.patch

diff --git a/pkgs/tools/security/chaps/default.nix b/pkgs/tools/security/chaps/default.nix
new file mode 100644
index 00000000000..9a2ae0b5114
--- /dev/null
+++ b/pkgs/tools/security/chaps/default.nix
@@ -0,0 +1,81 @@
+{ stdenv, fetchgit, fetchurl, trousers, leveldb, unzip, scons, pkgconfig
+, glib, dbus_cplusplus, dbus, protobuf, openssl, snappy, pam }:
+
+let
+  src_chromebase = fetchgit {
+    url = "https://chromium.googlesource.com/chromium/src/base.git";
+    rev = "2dfe404711e15e24e79799516400c61b2719d7af";
+    sha256 = "2bd93a3ace4b6767db2c1bd1e16f426c97b8d2133a9cb15f8372b2516cfa65c5";
+  };
+
+  src_gmock = fetchurl {
+    url = "https://googlemock.googlecode.com/files/gmock-1.7.0.zip";
+    sha256 = "0nq98cpnv2jsx2byp4ilam6kydcnziflkc16ikydajmp4mcvpz16";
+  };
+
+  src_platform2 = fetchgit {
+    url = "https://chromium.googlesource.com/chromiumos/platform2";
+    rev = "e999e989eaa71c3db7314fc7b4e20829b2b5473b";
+    sha256 = "bb43ef7918ec6219711cbba3ce91236413738f1341261a1845256b3d6cc9f843";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "chaps-0.42-6812";
+  version = "0.42-6812";
+
+  src = fetchgit {
+    url = "https://github.com/google/chaps-linux";
+    rev = "989aadc45cdb216ca35b0c97d13fc691576fa1d7";
+    sha256 = "c58e08e89d36050cd831116819d555f0e24e7bf11047cb18f2a2eead45ba67be";
+  };
+
+  patches = [ ./fix_absolute_path.patch  ./fix_environment_variables.patch  ./fix_scons.patch  ./insert_prefetches.patch ];
+
+  postPatch = ''
+    substituteInPlace makefile --replace @@NIXOS_SRC_CHROMEBASE@@ ${src_chromebase}
+    substituteInPlace makefile --replace @@NIXOS_SRC_GMOCK@@ ${src_gmock}
+    substituteInPlace makefile --replace @@NIXOS_SRC_PLATFORM2@@ ${src_platform2}
+    substituteInPlace makefile --replace @@NIXOS_LEVELDB@@ ${leveldb}
+    '';
+
+  nativeBuildInputs = [ unzip scons pkgconfig ];
+
+  buildInputs = [ trousers glib dbus_cplusplus dbus protobuf openssl snappy leveldb pam ];
+
+  buildPhase = ''
+    make build
+    '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ${name}/out/chapsd $out/bin/.
+    cp ${name}/out/chaps_client $out/bin/.
+
+    mkdir -p $out/lib
+    cp ${name}/out/libchaps.so.* $out/lib/.
+    mkdir -p $out/lib/security
+    cp ${name}/out/pam_chaps.so $out/lib/security/.
+
+    mkdir -p $out/include
+    cp -r ${name}/out/chaps $out/include/.
+
+    mkdir -p $out/etc/dbus-1/system.d
+    cp ${name}/out/org.chromium.Chaps.conf $out/etc/dbus-1/system.d/.
+    mkdir -p $out/etc/dbus-1/system-services
+    cp ${name}/platform2/chaps/org.chromium.Chaps.service $out/etc/dbus-1/system-services/.
+
+    mkdir -p $out/usr/share/pam-configs/chaps
+    mkdir -p $out/usr/share/man/man8
+    cp ${name}/man/* $out/usr/share/man/man8/.
+    '';
+
+  meta = with stdenv.lib; {
+    description = "PKCS #11 implementation based on trusted platform module (TPM)";
+    homepage = "https://www.chromium.org/developers/design-documents/chaps-technical-design";
+    maintainers = [ maintainers.tstrobel ];
+    platforms = platforms.linux;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/tools/security/chaps/fix_absolute_path.patch b/pkgs/tools/security/chaps/fix_absolute_path.patch
new file mode 100644
index 00000000000..7dbd60c73c4
--- /dev/null
+++ b/pkgs/tools/security/chaps/fix_absolute_path.patch
@@ -0,0 +1,18 @@
+diff --git a/patches/platform2/fix_echo.patch b/patches/platform2/fix_echo.patch
+new file mode 100644
+index 0000000..d2272f6
+--- /dev/null
++++ b/patches/platform2/fix_echo.patch
+@@ -0,0 +1,12 @@
++diff -uNr platform2/common-mk/common.mk platform2-new/common-mk/common.mk
++--- platform2/common-mk/common.mk	2015-07-03 12:07:47.482745292 +0200
+++++ platform2-new/common-mk/common.mk	2015-07-03 12:08:16.868600569 +0200
++@@ -263,7 +263,7 @@
++ $(eval $(call override_var,STRIP,strip))
++ 
++ RMDIR ?= rmdir
++-ECHO = /bin/echo -e
+++ECHO = echo -e
++ 
++ ifeq ($(lastword $(subst /, ,$(CC))),clang)
++ CDRIVER = clang
diff --git a/pkgs/tools/security/chaps/fix_environment_variables.patch b/pkgs/tools/security/chaps/fix_environment_variables.patch
new file mode 100644
index 00000000000..2d7ee0d9a73
--- /dev/null
+++ b/pkgs/tools/security/chaps/fix_environment_variables.patch
@@ -0,0 +1,42 @@
+diff --git a/extrasrc/Makefile b/extrasrc/Makefile
+index fb95845..77125c0 100644
+--- a/extrasrc/Makefile
++++ b/extrasrc/Makefile
+@@ -10,11 +10,11 @@ OUTDIR=$(SRCDIR)/out
+ GMOCK_DIR=$(SRCDIR)/gmock-$(GMOCK_VER)
+ GTEST_DIR=$(GMOCK_DIR)/gtest
+ 
+-INCLUDES="-I$(SRCDIR)/include -I$(SRCDIR)/platform2/libchromeos -isystem $(GTEST_DIR)/include -I$(GMOCK_DIR)/include -I$(SRCDIR)/leveldb/include"
++INCLUDES="-I$(SRCDIR)/include -I$(SRCDIR)/platform2/libchromeos -isystem $(GTEST_DIR)/include -I$(GMOCK_DIR)/include -I$(SRCDIR)/leveldb/include $(NIX_LDFLAG) $(NIX_CFLAGS_COMPILE)"
+ 
+ # To build Chaps, defer to platform2/chaps/Makefile
+ all: libchrome-$(BASE_VER).a libchromeos-$(BASE_VER).a | out
+-	cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR) CXXFLAGS=$(INCLUDES) OUT=$(OUTDIR) CHAPS_VERSION_MAJOR=$(CHAPS_VERSION_MAJOR) CHAPS_VERSION_MINOR=$(CHAPS_VERSION_MINOR) $(MAKE)
++	cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR):$(PKG_CONFIG_PATH) CXXFLAGS=$(INCLUDES) OUT=$(OUTDIR) CHAPS_VERSION_MAJOR=$(CHAPS_VERSION_MAJOR) CHAPS_VERSION_MINOR=$(CHAPS_VERSION_MINOR) $(MAKE)
+ 
+ # To build required Chromium components, defer to scons file.
+ libchrome-$(BASE_VER).a:
+@@ -38,7 +38,7 @@ out/libgmock.a: out/gmock-all.o
+ 	ar -rv $@ $<
+ 
+ test: out/libgtest.a out/libgmock.a libchrome-$(BASE_VER).a libchromeos-$(BASE_VER).a | out
+-	cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR) CXXFLAGS=$(INCLUDES) LDLIBS="-L$(OUTDIR)" OUT=$(OUTDIR) $(MAKE) tests
++	cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR):$(PKG_CONFIG_PATH) CXXFLAGS=$(INCLUDES) LDLIBS="-L$(OUTDIR)" OUT=$(OUTDIR) $(MAKE) tests
+ 
+ clean: clean_chaps clean_chromeos clean_chromebase clean_gmock clean_debian
+ clean_gmock:
+@@ -49,7 +49,7 @@ clean_chromebase:
+ clean_chromeos:
+ 	-BASE_VER=$(BASE_VER) scons -f Sconstruct.libchromeos -c
+ clean_chaps:
+-	-cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR) $(MAKE) clean
++	-cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR):$(PKG_CONFIG_PATH) $(MAKE) clean
+ 	rm -rf out
+ clean_debian:
+ 	dh_clean
+@@ -64,4 +64,4 @@ install_man:
+ 	$(INSTALL) -m 0644 -D man/chapsd.8 $(MANDIR)/man8/chapsd.8
+ 	$(INSTALL) -m 0644 -D man/chaps_client.8 $(MANDIR)/man8/chaps_client.8
+ install: install_man
+-	cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR) CXXFLAGS=$(INCLUDES) OUT=$(OUTDIR) CHAPS_VERSION_MAJOR=$(CHAPS_VERSION_MAJOR) CHAPS_VERSION_MINOR=$(CHAPS_VERSION_MINOR) $(MAKE) install_files
++	cd platform2/chaps && BASE_VER=$(BASE_VER) LINUX_BUILD=1 PKG_CONFIG_PATH=$(SRCDIR):$(PKG_CONFIG_PATH) CXXFLAGS=$(INCLUDES) OUT=$(OUTDIR) CHAPS_VERSION_MAJOR=$(CHAPS_VERSION_MAJOR) CHAPS_VERSION_MINOR=$(CHAPS_VERSION_MINOR) $(MAKE) install_files
diff --git a/pkgs/tools/security/chaps/fix_scons.patch b/pkgs/tools/security/chaps/fix_scons.patch
new file mode 100644
index 00000000000..54843453c86
--- /dev/null
+++ b/pkgs/tools/security/chaps/fix_scons.patch
@@ -0,0 +1,26 @@
+diff --git a/extrasrc/Sconstruct.libchrome b/extrasrc/Sconstruct.libchrome
+index 4feb76d..311fe8a 100644
+--- a/extrasrc/Sconstruct.libchrome
++++ b/extrasrc/Sconstruct.libchrome
+@@ -103,7 +103,7 @@ base_lib = {
+     'pc_libs' : 'glib-2.0',
+ }
+ 
+-env = Environment()
++env = Environment(ENV = os.environ)
+ 
+ BASE_VER = os.environ.get('BASE_VER', '0')
+ GTEST_DIR = os.environ.get('GTEST_DIR', '0')
+diff --git a/extrasrc/Sconstruct.libchromeos b/extrasrc/Sconstruct.libchromeos
+index 1da6001..66f9acb 100644
+--- a/extrasrc/Sconstruct.libchromeos
++++ b/extrasrc/Sconstruct.libchromeos
+@@ -18,7 +18,7 @@ base_lib = {
+     'pc_libs' : 'dbus-c++-1',
+ }
+ 
+-env = Environment()
++env = Environment(ENV = os.environ)
+ 
+ PKG_CONFIG = os.environ.get('PKG_CONFIG', 'pkg-config')
+ BASE_VER = os.environ.get('BASE_VER', '0')
diff --git a/pkgs/tools/security/chaps/insert_prefetches.patch b/pkgs/tools/security/chaps/insert_prefetches.patch
new file mode 100644
index 00000000000..8b8449a6e66
--- /dev/null
+++ b/pkgs/tools/security/chaps/insert_prefetches.patch
@@ -0,0 +1,51 @@
+diff --git a/makefile b/makefile
+index b6865f3..c14f5ec 100644
+--- a/makefile
++++ b/makefile
+@@ -53,8 +53,8 @@ $(SRCDIR)/include/trousers/scoped_tss_type.h: extrasrc/scoped_tss_type.h | $(SRC
+ 	cp $< $@
+ # Chromium includes <leveldb/memenv.h>.  This requires an install of libleveldb-dev that has
+ # memenv support included; move this into a local leveldb/ subdirectory
+-$(SRCDIR)/include/leveldb/memenv.h: /usr/include/leveldb/helpers/memenv.h | $(SRCDIR)/include/leveldb
+-	cp $< $@
++$(SRCDIR)/include/leveldb/memenv.h: $(SRCDIR)/include/leveldb
++	cp @@NIXOS_LEVELDB@@/include/leveldb/helpers/memenv.h $@
+ # Chromium includes <include/testing/gtest/include/gtest/gtest_prod.h>, so have a local copy.
+ $(SRCDIR)/include/testing/gtest/include/gtest/gtest_prod.h: extrasrc/gtest_prod.h | $(SRCDIR)/include/testing/gtest/include/gtest
+ 	cp $< $@
+@@ -80,7 +80,7 @@ GMOCK_DIR=$(SRCDIR)/gmock-$(GMOCK_VERSION)
+ GTEST_DIR=$(GMOCK_DIR)/gtest
+ src_gmock: $(GMOCK_DIR)/LICENSE
+ $(GMOCK_DIR)/LICENSE: | $(SRCDIR)
+-	cd $(SRCDIR) && wget $(GMOCK_URL)
++	cd $(SRCDIR) && cp @@NIXOS_SRC_GMOCK@@ gmock-$(GMOCK_VERSION).zip && chmod +w gmock-$(GMOCK_VERSION).zip
+ 	cd $(SRCDIR) && unzip -q gmock-$(GMOCK_VERSION).zip
+ 	rm $(SRCDIR)/gmock-$(GMOCK_VERSION).zip
+ 	touch $@
+@@ -107,8 +107,7 @@ src_chromebase: $(SRCDIR)/base/base64.h
+ $(SRCDIR)/base: | $(SRCDIR)
+ 	mkdir -p $@
+ $(SRCDIR)/base/base64.h: | $(SRCDIR)/base
+-	git clone $(CHROMEBASE_GIT) $(SRCDIR)/base
+-	cd $(SRCDIR)/base && git checkout $(CHROMEBASE_COMMIT)
++	cp -r @@NIXOS_SRC_CHROMEBASE@@/. $(SRCDIR)/base && chmod -R +w $(SRCDIR)/base
+ 
+ # We need two subdirectories from the platform2 repository from ChromiumOS:
+ #   - chaps/ for the Chaps source code
+@@ -119,14 +118,8 @@ $(SRCDIR)/platform2:
+ PLATFORM2_GIT=https://chromium.googlesource.com/chromiumos/platform2
+ PATCHES=$(wildcard $(CURDIR)/patches/platform2/*.patch)
+ $(SRCDIR)/platform2/chaps/Makefile: | $(SRCDIR)/platform2
+-	cd $(SRCDIR)/platform2 && git init . && git remote add -f origin $(PLATFORM2_GIT)
+-	cd $(SRCDIR)/platform2 && git config core.sparsecheckout true
+-	cd $(SRCDIR)/platform2 && echo "chaps" > .git/info/sparse-checkout
+-	cd $(SRCDIR)/platform2 && echo "libchromeos/chromeos" >> .git/info/sparse-checkout
+-	cd $(SRCDIR)/platform2 && echo "common-mk/common.mk" >> .git/info/sparse-checkout
+-	cd $(SRCDIR)/platform2 && git pull origin master
+-	cd $(SRCDIR)/platform2 && git checkout $(CROS_BRANCH)
+-	cd $(SRCDIR)/platform2 && if [ ! -z "$(PATCHES)" ]; then git am $(PATCHES); fi
++	cd $(SRCDIR)/platform2 && cp -r @@NIXOS_SRC_PLATFORM2@@/. . && chmod -R +w $(SRCDIR)/platform2
++	cd $(SRCDIR)/platform2 && if [ ! -z "$(PATCHES)" ]; then patch -p1 < $(PATCHES); fi
+ 
+ 
+ # Copy man pages
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46daef79b3a..f9727c7bd01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3105,6 +3105,8 @@ let
 
   tpm-tools = callPackage ../tools/security/tpm-tools { };
 
+  chaps = callPackage ../tools/security/chaps { };
+
   trace-cmd = callPackage ../os-specific/linux/trace-cmd { };
 
   traceroute = callPackage ../tools/networking/traceroute { };

From 236366019187b5fbe568764ade67ae034cac796e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 4 Jul 2015 13:04:55 +0200
Subject: [PATCH 1843/2322] jedit: fix build

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

diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix
index 7dfb651d7d3..f66ce799d26 100644
--- a/pkgs/applications/editors/jedit/default.nix
+++ b/pkgs/applications/editors/jedit/default.nix
@@ -3,8 +3,8 @@
 let
   version = "5.2.0";
   bsh = fetchurl {
-    url = http://www.beanshell.org/bsh-2.0b4.jar;
-    sha256 = "1di7hj2yms1m3wa8k70jpw0wzfnrgibpqnvdk33ahfaqi03mqfci";
+    url = http://www.beanshell.org/bsh-2.0b5.jar;
+    sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2";
   };
   bcpg = fetchurl {
     url = http://central.maven.org/maven2/org/bouncycastle/bcpg-jdk16/1.46/bcpg-jdk16-1.46.jar;

From e0d32691a59c947f8970d5dfd11e535248fd292a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 4 Jul 2015 13:55:03 +0200
Subject: [PATCH 1844/2322] pytz: 2013.9 -> 2015.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c829e78d3c4..d9ff8728c48 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10764,16 +10764,18 @@ let
 
 
   pytz = buildPythonPackage rec {
-    name = "pytz-2013.9";
+    name = "pytz-${version}";
+    version = "2015.4";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/pytz/${name}.tar.bz2";
-      md5 = "ec7076947a46a8a3cb33cbf2983a562c";
+      md5 = "39f7375c4b1fa34cdcb4b4765d08f817";
     };
 
     meta = {
       description = "World timezone definitions, modern and historical";
-      homepage = http://pytz.sourceforge.net/;
+      homepage = "http://pythonhosted.org/pytz";
+      license = licenses.mit;
     };
   };
 

From 9d85874aeb6f17bc1b13c1a248f319e1908e1210 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Sat, 4 Jul 2015 05:01:07 -0700
Subject: [PATCH 1845/2322] lmdb: lightning memory-mapped database

---
 lib/licenses.nix                            |  5 +++
 pkgs/development/libraries/lmdb/default.nix | 37 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/libraries/lmdb/default.nix

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 2b259c68069..d0e146f0dea 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -332,6 +332,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "SIL Open Font License 1.1";
   };
 
+  openldap = spdx {
+    spdxId = "OLDAP-2.8";
+    fullName = "Open LDAP Public License v2.8";
+  };
+
   openssl = spdx {
     spdxId = "OpenSSL";
     fullName = "OpenSSL License";
diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
new file mode 100644
index 00000000000..fbf817dd873
--- /dev/null
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  name = "lmdb-${version}";
+  version = "0.9.15";
+
+  src = fetchzip {
+    url = "https://github.com/LMDB/lmdb/archive/LMDB_${version}.tar.gz";
+    sha256 = "0p79fpyh1yx2jg1f0kag5zsdn4spkgs1j3dxibvqdy32wkbpxd0g";
+  };
+
+  postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";
+
+  makeFlags = "prefix=$(out)";
+
+  doCheck = true;
+  checkPhase = "make test";
+
+  preInstall = ''
+    mkdir -p $out/{man/man1,bin,lib,include}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Lightning memory-mapped database";
+    longDescription = ''
+      LMDB is an ultra-fast, ultra-compact key-value embedded data store
+      developed by Symas for the OpenLDAP Project. It uses memory-mapped files,
+      so it has the read performance of a pure in-memory database while still
+      offering the persistence of standard disk-based databases, and is only
+      limited to the size of the virtual address space.
+    '';
+    homepage = http://symas.com/mdb/;
+    maintainers = with maintainers; [ jb55 ];
+    license = licenses.openldap;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d112500e89..f19ad2caedc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6651,6 +6651,8 @@ let
 
   leveldb = callPackage ../development/libraries/leveldb { };
 
+  lmdb = callPackage ../development/libraries/lmdb { };
+
   levmar = callPackage ../development/libraries/levmar { };
 
   leptonica = callPackage ../development/libraries/leptonica {

From be7dce488ae02592be55a7856ae34fc232551027 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 4 Jul 2015 15:22:56 +0200
Subject: [PATCH 1846/2322] patsy: init at 0.3.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c829e78d3c4..75dcb4d619f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8526,7 +8526,24 @@ let
     };
   };
 
-
+  patsy = buildPythonPackage rec {
+    name = "patsy-${version}";
+    version = "0.3.0";
+    
+    src = pkgs.fetchurl{
+      url = "https://pypi.python.org/packages/source/p/patsy/${name}.zip";
+      md5 = "7545518b413136ba8343dcebea07e5e2";
+    };
+    
+    propagatedBuildInputs = with self; [six numpy];
+    
+    meta = {
+      description = "A Python package for describing statistical models";
+      homepage = "https://github.com/pydata/patsy";
+      license = licenses.bsd2;
+    };
+  };
+  
   paste = buildPythonPackage rec {
     name = "paste-1.7.5.1";
     disabled = isPy3k;

From 5a5587ba6d209ac19857274a76b7e07450af527f Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sat, 4 Jul 2015 16:30:24 +0200
Subject: [PATCH 1847/2322] pam_mount: fix PATH issue

---
 pkgs/os-specific/linux/pam_mount/default.nix  | 10 +++++--
 .../insert_utillinux_path_hooks.patch         | 30 +++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/os-specific/linux/pam_mount/insert_utillinux_path_hooks.patch

diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix
index 0cf41276153..a4f52517df4 100644
--- a/pkgs/os-specific/linux/pam_mount/default.nix
+++ b/pkgs/os-specific/linux/pam_mount/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, utillinux, libxml2, pcre, perl, openssl, cryptsetup }:
+{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, utillinux }:
 
 stdenv.mkDerivation rec {
   name = "pam_mount-2.15";
@@ -10,12 +10,18 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ autoconf automake pkgconfig libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ];
 
-  preConfigure = "sh autogen.sh --prefix=$out";
+  patches = [ ./insert_utillinux_path_hooks.patch ];
+
+  preConfigure = ''
+    substituteInPlace src/mtcrypt.c --replace @@NIX_UTILLINUX@@ ${utillinux}/bin
+    sh autogen.sh --prefix=$out
+    '';
 
   makeFlags = "DESTDIR=$(out)";
 
   # Probably a hack, but using DESTDIR and PREFIX makes everything work!
   postInstall = ''
+    mkdir -p $out
     cp -r $out/$out/* $out
     rm -r $out/nix
     '';
diff --git a/pkgs/os-specific/linux/pam_mount/insert_utillinux_path_hooks.patch b/pkgs/os-specific/linux/pam_mount/insert_utillinux_path_hooks.patch
new file mode 100644
index 00000000000..6d9da05da29
--- /dev/null
+++ b/pkgs/os-specific/linux/pam_mount/insert_utillinux_path_hooks.patch
@@ -0,0 +1,30 @@
+diff -uNr pam_mount-2.15_old/src/mtcrypt.c pam_mount-2.15/src/mtcrypt.c
+--- pam_mount-2.15_old/src/mtcrypt.c	2015-07-04 16:00:12.917943336 +0200
++++ pam_mount-2.15/src/mtcrypt.c	2015-07-04 16:03:45.685302493 +0200
+@@ -534,7 +534,7 @@
+ 
+ 	/* candidate for replacement by some libmount calls, I guess. */
+ 	argk = 0;
+-	mount_args[argk++] = "mount";
++	mount_args[argk++] = "@@NIX_UTILLINUX@@/mount";
+ 	if (opt->fstype != NULL) {
+ 		mount_args[argk++] = "-t";
+ 		mount_args[argk++] = opt->fstype;
+@@ -668,7 +668,7 @@
+ 
+ 	if (!opt->no_update)
+ 		pmt_smtab_remove(mntpt, SMTABF_MOUNTPOINT);
+-	rmt_args[argk++] = "mount";
++	rmt_args[argk++] = "@@NIX_UTILLINUX@@/mount";
+ 	rmt_args[argk++] = "-o";
+ 	rmt_args[argk++] = opt->extra_opts;
+ 	rmt_args[argk++] = mntpt;
+@@ -749,7 +749,7 @@
+ 		pmt_smtab_remove(mountpoint, SMTABF_MOUNTPOINT);
+ 	pmt_cmtab_remove(mountpoint);
+ 
+-	umount_args[argk++] = "umount";
++	umount_args[argk++] = "@@NIX_UTILLINUX@@/umount";
+ 	umount_args[argk++] = "-i";
+ 	umount_args[argk++] = mountpoint;
+ 	umount_args[argk]   = NULL;

From 2a45a98e97012b7650b5a2ee9bb54665ca793de8 Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sat, 4 Jul 2015 15:55:15 +0100
Subject: [PATCH 1848/2322] {lib}mediainfo{-gui}: 0.7.74 -> 0.7.75

Changelog:
```
Version 0.7.75, 2015-06-30
+ MXF: consideraing 60 fps timecode tracks with 2 components having a difference of 2 frames as a single timecode
+ EBUCore 1.6: switch to the link of the final XSD
x XDCAM: some directory structures were wrongly detected as XDCAM structure having a XML file
x MXF: SDTI 60 fps times were wrong
x #B927, DPX: date/time specific DPX format was used instead of the ISO-like one
x #B927, EBUCore: invalid content in attribute startDate
x ProRes: streams with apcs CodecID were displayed with an incoherent bit depth instead of no bit depth
```
---
 pkgs/applications/misc/mediainfo-gui/default.nix    | 6 +++---
 pkgs/applications/misc/mediainfo/default.nix        | 6 +++---
 pkgs/development/libraries/libmediainfo/default.nix | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 1055b4de72b..3a597c9de52 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.74";
+  version = "0.7.75";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
-    url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2";
-    sha256 = "06r6inggkb3gmxax182y4y39icxry5hdcvq7syb060l8wxrk14ky";
+    url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
+    sha256 = "1xdsy5z7x7bd251m26h5hcwcmgl6gklxj6h9q025mlnfmcs7pbdy";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 6330d90c178..c9792f3a2af 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.74";
+  version = "0.7.75";
   name = "mediainfo-${version}";
   src = fetchurl {
-    url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2";
-    sha256 = "06r6inggkb3gmxax182y4y39icxry5hdcvq7syb060l8wxrk14ky";
+    url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
+    sha256 = "1xdsy5z7x7bd251m26h5hcwcmgl6gklxj6h9q025mlnfmcs7pbdy";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ];
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 947cee94bd9..5349026085f 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.74";
+  version = "0.7.75";
   name = "libmediainfo-${version}";
   src = fetchurl {
-    url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.bz2";
-    sha256 = "1dn7zwqkl08vafc979i1mx63r2jlr95gfazg4d2cc9v3pav28zpk";
+    url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
+    sha256 = "1im39kd595ia6g41qvwgvszn1s10nwa3q5r2lj2g5fm4kgi0dwhr";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ];

From 8e4edf52dc534bc89dc2249cf8e565a97fd64066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 4 Jul 2015 19:41:18 +0200
Subject: [PATCH 1849/2322] python-namebench: fix error preventing it from
 starting

namebench expects to be run from its own source tree (it uses relative
paths to various resources), make it work.

The current version fails like this:

  $ ./result/bin/namebench.py
  Traceback (most recent call last):
    File "/nix/store/04d29llycr5xcxplfv4gn556nzm1mrl7-python2.7-namebench-1.0.5/bin/.namebench.py-wrapped", line 46, in <module>
      (options, supplied_ns, global_ns, regional_ns) = config.GetConfiguration()
    File "/nix/store/04d29llycr5xcxplfv4gn556nzm1mrl7-python2.7-namebench-1.0.5/lib/python2.7/site-packages/libnamebench/config.py", line 27, in GetConfiguration
      (configured_options, global_ns, regional_ns) = ProcessConfigurationFile(options)
    File "/nix/store/04d29llycr5xcxplfv4gn556nzm1mrl7-python2.7-namebench-1.0.5/lib/python2.7/site-packages/libnamebench/config.py", line 100, in ProcessConfigurationFile
      general = dict(config.items('general'))
    File "/nix/store/z6vp5aix4ks1zdjdry7v7dahg8dd02sy-python-2.7.10/lib/python2.7/ConfigParser.py", line 642, in items
      raise NoSectionError(section)
  ConfigParser.NoSectionError: No section: 'general'
---
 pkgs/top-level/python-packages.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 47fe45b9760..68677264587 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7708,6 +7708,12 @@ let
     # error: invalid command 'test'
     doCheck = false;
 
+    # namebench expects to be run from its own source tree (it uses relative
+    # paths to various resources), make it work.
+    postInstall = ''
+      sed -i "s|import os|import os; os.chdir(\"$out/namebench\")|" "$out/bin/namebench.py"
+    '';
+
     meta = {
       homepage = http://namebench.googlecode.com/;
       description = "Find fastest DNS servers available";

From a7b6e152bbe6c55d2edf09ab8d48c3a4ef53df30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 4 Jul 2015 20:08:02 +0200
Subject: [PATCH 1850/2322] python-namebench: enable GUI support

tkinter apparently doesn't exist for pypy, hence it is disabled for that
interpreter.
---
 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 68677264587..ce1c090f12a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7696,18 +7696,18 @@ let
 
   namebench = buildPythonPackage (rec {
     name = "namebench-1.0.5";
-    disabled = isPy3k;
+    disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
       url = "http://namebench.googlecode.com/files/${name}.tgz";
       sha256 = "6cbde35ce94d1f31e7d48f5d8eec13238b4dbc505675a33f1e183e600c1482c3";
     };
 
-    # No support of GUI yet.
-
     # error: invalid command 'test'
     doCheck = false;
 
+    propagatedBuildInputs = [ self.tkinter ];
+
     # namebench expects to be run from its own source tree (it uses relative
     # paths to various resources), make it work.
     postInstall = ''

From 7f6667f97914a174841016bcf603511564b97fca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 4 Jul 2015 19:42:21 +0200
Subject: [PATCH 1851/2322] python-namebench: bump 1.0.5 -> 1.3.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 ce1c090f12a..a82fe40bf14 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7695,12 +7695,12 @@ let
 
 
   namebench = buildPythonPackage (rec {
-    name = "namebench-1.0.5";
+    name = "namebench-1.3.1";
     disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
-      url = "http://namebench.googlecode.com/files/${name}.tgz";
-      sha256 = "6cbde35ce94d1f31e7d48f5d8eec13238b4dbc505675a33f1e183e600c1482c3";
+      url = "http://namebench.googlecode.com/files/${name}-source.tgz";
+      sha256 = "09clbcd6wxgk4r6qw7hb78h818mvca7lijigy1mlq5y1f3lgkk1h";
     };
 
     # error: invalid command 'test'

From 8f9534ccc3f3c73a8e17a035cfe059830c679251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 4 Jul 2015 20:32:45 +0200
Subject: [PATCH 1852/2322] popcorntime: unbreak tarball job

Fix evaluation error when srcs."${stdenv.system}" does not exist (e.g.
on darwin).
---
 .../video/popcorntime/default.nix             | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
index 0db56cc6fcd..c588833b2f0 100644
--- a/pkgs/applications/video/popcorntime/default.nix
+++ b/pkgs/applications/video/popcorntime/default.nix
@@ -4,20 +4,21 @@
 let
   version = "0.3.7.2";
 
-  srcs = {
-    x86_64-linux = fetchurl {
-      url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux64.tar.xz";
-      sha256 = "0lm9k4fr73a9p00i3xj2ywa4wvjf9csadm0pcz8d6imwwq44sa8b";
-    };
-    i686-linux = fetchurl {
-      url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux32.tar.xz";
-      sha256 = "1dz1cp31qbwamm9pf8ydmzzhnb6d9z73bigdv3y74dgicz3dpr91";
-    };
-  };
-
   popcorntimePackage = stdenv.mkDerivation rec {
     name = "popcorntime-package-${version}";
-    src = srcs."${stdenv.system}";
+    src =
+      if stdenv.system == "x86_64-linux" then
+        fetchurl {
+          url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux64.tar.xz";
+          sha256 = "0lm9k4fr73a9p00i3xj2ywa4wvjf9csadm0pcz8d6imwwq44sa8b";
+        }
+      else if stdenv.system == "i686-linux" then
+        fetchurl {
+          url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux32.tar.xz";
+          sha256 = "1dz1cp31qbwamm9pf8ydmzzhnb6d9z73bigdv3y74dgicz3dpr91";
+        }
+      else
+        throw "Unsupported system ${stdenv.system}";
     sourceRoot = ".";
     installPhase = ''
       mkdir -p $out

From a9c403d38bb0087549cadec6d7151295ba1585d3 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Thu, 2 Jul 2015 17:56:26 -0700
Subject: [PATCH 1853/2322] prometheus-node-exporter: 0.8.1 -> 0.10.0

---
 .../servers/monitoring/prometheus/node_exporter/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
index c60985d3aa7..922c958b3f5 100644
--- a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
@@ -4,22 +4,22 @@ with goPackages;
 
 buildGoPackage rec {
   name = "prometheus-node-exporter-${rev}";
-  rev = "0.8.1";
+  rev = "0.10.0";
   goPackagePath = "github.com/prometheus/node_exporter";
 
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "node_exporter";
     inherit rev;
-    sha256 = "15vp88w0b7h6sryy61qk369yjr3p4qvpch1nbxd9rm51bdgsqyys";
+    sha256 = "0dmczav52v9vi0kxl8gd2s7x7c94g0vzazhyvlq1h3729is2nf0p";
   };
 
   buildInputs = [
-    glog
     go-runit
     ntp
     prometheus.client_golang
     prometheus.client_model
+    prometheus.log
     protobuf
   ];
 

From bcf990c7fdc9b13ee71356edc0e4bfe5a124953a Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Thu, 2 Jul 2015 18:09:22 -0700
Subject: [PATCH 1854/2322] prometheus-alertmanager: 0.0.1 -> 0.0.4

---
 .../monitoring/prometheus/alertmanager/default.nix   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
index 56fcee76278..f2f5eaa6f18 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
@@ -1,23 +1,23 @@
 { stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }:
 
 goPackages.buildGoPackage rec {
-  name = "prometheus-alertmanager-${version}";
-  version = "0.0.1";
+  name = "prometheus-alertmanager-${rev}";
+  rev = "0.0.4";
   goPackagePath = "github.com/prometheus/alertmanager";
 
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "alertmanager";
-    rev = "2b6c5caf89a492b013204e8d7db99fbb78c5dcd4";
-    sha256 = "13rdqnvmx11ks305dlnzv9gwf8c4zjyi5fkwcd69xgjfars2m4f3";
+    inherit rev;
+    sha256 = "0g656rzal7m284mihqdrw23vhs7yr65ax19nvi70jl51wdallv15";
   };
 
   buildInputs = [
-    goPackages.glog
     goPackages.protobuf
     goPackages.fsnotify.v0
     goPackages.httprouter
     goPackages.prometheus.client_golang
+    goPackages.prometheus.log
     goPackages.pushover
     protobuf
     vim
@@ -25,7 +25,7 @@ goPackages.buildGoPackage rec {
 
   buildFlagsArray = ''
     -ldflags=
-        -X main.buildVersion ${version}
+        -X main.buildVersion ${rev}
         -X main.buildBranch master
         -X main.buildUser nix@nixpkgs
         -X main.buildDate 20150101-00:00:00

From afacbf7123a4309093680252ead0a3ebe6a91bf0 Mon Sep 17 00:00:00 2001
From: Aycan iRiCAN <iricanaycan@gmail.com>
Date: Fri, 3 Jul 2015 17:19:39 +0300
Subject: [PATCH 1855/2322] multiple-cursors: init at 20150627

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index c2f06ee920c..c8b1b0bd7c8 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -851,6 +851,17 @@ let self = _self // overrides;
     meta = { license = gpl3Plus; };
   };
 
+  multiple-cursors = melpaBuild rec {
+    pname = "multiple-cursors";
+    version = "20150627";
+    src = fetchFromGitHub {
+      owner  = "magnars";
+      repo   = "multiple-cursors.el";
+      rev    = "9b53e892e6167f930763a3c5aedf8773110a8ae9";
+      sha256 = "0wcrdb137a9aq6dynlqbvypb6m2dj48m899xwy7ilnf2arrmipid";
+    };
+  };
+
   nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {};
 
   org-plus-contrib = melpaBuild rec {

From 807fbc4b57ed17a37efca975b46fc7efc68128fb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Jul 2015 21:57:01 +0300
Subject: [PATCH 1856/2322] baresip: update 0.4.12 -> 0.4.13

---
 .../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 ec269def5b4..5dde5b62dda 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
 }:
 stdenv.mkDerivation rec {
-  version = "0.4.12";
+  version = "0.4.13";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "0f4jfpyvlgvq47yha3ys3kbrpd6c20yxaqki70hl6b91jbhmq9i2";
+    sha256 = "1mndpcclp5cqlm5jfbh37ig8dmga75qxqfinp4dyd1c0wnd0f0jg";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
     cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good

From d7dae65b5cf09f6848d66e86f9c20311e6b5a3dd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Jul 2015 21:57:56 +0300
Subject: [PATCH 1857/2322] pari: update 2.7.3 -> 2.7.4

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

diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 9a3ab13c33e..5719ccb6909 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, gmp, readline }:
 
 stdenv.mkDerivation rec {
-  version = "2.7.3";
+  version = "2.7.4";
   name = "pari-${version}";
 
   src = fetchurl {
     url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
-    sha256 = "02k54m7p47r54lgxqanxvf7pdrss17n8if1qwk5wx0j1px22j0rq";
+    sha256 = "0k1qqagfl6zn7gvwmsqffj6g9yrzqvszwh2mblhmxpjlw1pigfh8";
   };
 
   buildInputs = [gmp readline];

From 5f95a8cc10373c6d14866b9ec5e87ff58f519c31 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Jul 2015 21:59:06 +0300
Subject: [PATCH 1858/2322] Angelscript: update 2.30.0 -> 2.30.1

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

diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix
index 4691b8be564..a6e6cce9a8e 100644
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/pkgs/development/interpreters/angelscript/default.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="angelscript";
-    version = "2.30.0";
+    version = "2.30.1";
     name="${baseName}-${version}";
     url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    sha256 = "00w7h2g6g1lkq9ahsvzyk78nbdzhn1adsrns9mrqb2fbxv2wbz5d";
+    sha256 = "10ym7185h26gzmw5v6wz8zlycw8gzygv0aw87dmgjcyy7qfk74m4";
   };
   buildInputs = [
     unzip

From f7e2b9f89a15a225fcef1d829c5669b30917f5e5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Jul 2015 21:59:31 +0300
Subject: [PATCH 1859/2322] allegro 5 unstable: update 5.1.10 -> 5.1.11

---
 pkgs/development/libraries/allegro/5-unstable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix
index 71a521e2309..dd0df768a68 100644
--- a/pkgs/development/libraries/allegro/5-unstable.nix
+++ b/pkgs/development/libraries/allegro/5-unstable.nix
@@ -16,7 +16,7 @@ let
   sourceInfo = rec {
     baseName="allegro";
     folderSuffix = "-unstable";
-    version = "5.1.10";
+    version = "5.1.11";
     name="${baseName}-${version}";
     project="alleg";
     url="mirror://sourceforge/project/${project}/${baseName}${folderSuffix}/${version}/${name}.tar.gz";
@@ -26,7 +26,7 @@ in
 rec {
   src = a.fetchurl {
     url = sourceInfo.url;
-    sha256 = "13dfs007pyh908bm1hg7hz71y8fr9fj51byh5w149h8dsq2dds78";
+    sha256 = "0zz07gdyc6xflpvkknwgzsyyyh9qiwd69j42rm9cw1ciwcsic1vs";
   };
 
   inherit (sourceInfo) name version;

From f6d0cd012409db702bc218679ca964d13b561380 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Jul 2015 21:59:50 +0300
Subject: [PATCH 1860/2322] eigen: update 3.2.4 -> 3.2.5

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

diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 90f50037dce..0e43b9fb602 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.4";
+  version = "3.2.5";
 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 = "19c6as664a3kxvkhas2cq19r6ag19jw9lcz04sc0kza6i1hlh9xv";
+    sha256 = "1vjixip19lwfia2bjpjwm09j7l20ry75493i6mjsk9djszj61agi";
   };
   
   nativeBuildInputs = [ cmake ];

From b280d6cbc70d7a5720306d29f45b5f35ec1c49dd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Jul 2015 22:00:15 +0300
Subject: [PATCH 1861/2322] scons: update 2.3.4 -> 2.3.5

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

diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 07268867044..9e54be8aa90 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -2,7 +2,7 @@
 
 let
   name = "scons";
-  version = "2.3.4";
+  version = "2.3.5";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/scons/${name}-${version}.tar.gz";
-    sha256 = "0hdlci43wjz8maryj83mz04ir6rwcdrrzpd7cpzvdlzycqhdfmsb";
+    sha256 = "0hlwkrr5fkjpjgmwipp9a2bnc9riqks2pjc3rvjsq0a8j7hr72ca";
   };
 
   buildInputs = [python makeWrapper];

From de78e3ea0c819974ea8eafec5f144edbe14a1a4f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Jul 2015 22:00:54 +0300
Subject: [PATCH 1862/2322] xscreensaver: update 5.32 -> 5.33

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

diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index 1d039e0a440..6734eeac010 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -4,12 +4,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.32";
+  version = "5.33";
   name = "xscreensaver-${version}";
 
   src = fetchurl {
     url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
-    sha256 = "1gckra8lsd383av15r7lv9rszw6mp8n1gpcb5qs5nbrdkl3sclj2";
+    sha256 = "0sy4awsak8yhja86n69bmi8i2c91hfs7zbkwn5y81qfrivh8b41j";
   };
 
   buildInputs =

From e8f4be94e2b4f006e208c130853ce0692b95910d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Jul 2015 22:24:01 +0300
Subject: [PATCH 1863/2322] atop: update 2.1-1 -> 2.2-3

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

diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix
index 17adcabf223..c9a51ae569a 100644
--- a/pkgs/os-specific/linux/atop/default.nix
+++ b/pkgs/os-specific/linux/atop/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, zlib, ncurses}:
 
 stdenv.mkDerivation rec {
-  version = "2.1-1";
+  version = "2.2-3";
   name = "atop-${version}";
 
   src = fetchurl {
     url = "http://www.atoptool.nl/download/atop-${version}.tar.gz";
-    sha256 = "17wqqyym4d02cqmn1l1asah3sld939nlkc84g4ad939kpkzd98ir";
+    sha256 = "0p85isn6zih3xfprjym5xanqzazwqjj8x2mmwqyqpqjv6nibi1f7";
   };
 
   buildInputs = [zlib ncurses];
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
 
   preInstall = ''
     mkdir -p "$out"/{bin,sbin}
+    make systemdinstall $makeFlags
   '';
 
   meta = {

From 2f5e5348419fa3a4ead14d3a5853a518cdb96a71 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Jul 2015 22:24:42 +0300
Subject: [PATCH 1864/2322] eudev: update 3.1.1 -> 3.1.2

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

diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix
index de8ad00acc8..1932fc9d11f 100644
--- a/pkgs/os-specific/linux/eudev/default.nix
+++ b/pkgs/os-specific/linux/eudev/default.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="eudev";
-    version = "3.1.1";
+    version = "3.1.2";
     name="${baseName}-${version}";
     url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz";
-    sha256 = "1r1jbk1fwc4wl0ifm7xzkb2vjd8w1a39hx6mmy4pp4fl2gvcg86k";
+    sha256 = "0wq2w67ip957l5bi21jj3w2rv7s7klcrnlg6zpg1g0fxjfgbd4s3";
   };
   buildInputs = [
     glib pkgconfig gperf utillinux

From 7c5129706f3a636cb2cca0d53788086100285d34 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Jul 2015 22:25:17 +0300
Subject: [PATCH 1865/2322] nginx unstable: update 1.9.1 -> 1.9.2

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

diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
index ae8e2785d5f..907fe98d681 100644
--- a/pkgs/servers/http/nginx/unstable.nix
+++ b/pkgs/servers/http/nginx/unstable.nix
@@ -10,10 +10,10 @@
 with stdenv.lib;
 
 let
-  version = "1.9.1";
+  version = "1.9.2";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "1b8xikrr19p07n28xnar8p8l0vgm7795lmrb2x7r9h4lwvx5bx89";
+    sha256 = "0y7d87v9rvc4xvxaz8cag6zhdg7lfp3z65ain665q02aw5dl5dl0";
   };
 
   rtmp-ext = fetchFromGitHub {

From 8454055ed47a508545f8d9e2acf123901026a446 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Jul 2015 22:25:46 +0300
Subject: [PATCH 1866/2322] GlusterFS: update 3.7.1 -> 3.7.2

---
 pkgs/tools/filesystems/glusterfs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index bfb739fa84a..55e4e17fa1f 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -6,11 +6,11 @@ let
   s = # Generated upstream information 
   rec {
     baseName="glusterfs";
-    version="3.7.1";
+    version="3.7.2";
     name="${baseName}-${version}";
-    hash="0d1bcijwvc3rhr24xsn7nnp0b5xwlwvybamb05jzja5m7hapydpw";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.1/glusterfs-3.7.1.tar.gz";
-    sha256="0d1bcijwvc3rhr24xsn7nnp0b5xwlwvybamb05jzja5m7hapydpw";
+    hash="0cw6p21nnxcvzd8rymd5q0ydlaz4hx4rmv22hwbb39h7a2rvfv79";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.2/glusterfs-3.7.2.tar.gz";
+    sha256="0cw6p21nnxcvzd8rymd5q0ydlaz4hx4rmv22hwbb39h7a2rvfv79";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python ncurses readline

From d2cfc1dec678608a05b88b0a71357d66f0065275 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Jul 2015 22:26:17 +0300
Subject: [PATCH 1867/2322] Mailsend: update 1.17b15 -> 1.18

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

diff --git a/pkgs/tools/networking/mailsend/default.nix b/pkgs/tools/networking/mailsend/default.nix
index a2579c55930..363c22c8bb8 100644
--- a/pkgs/tools/networking/mailsend/default.nix
+++ b/pkgs/tools/networking/mailsend/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="mailsend";
-    version="1.17b15";
+    version="1.18";
     name="${baseName}-${version}";
-    hash="0sxjrv9yn2xyjak9si0gw2zalsrfqqcvz0indq9ap5fyalj1pjvk";
-    url="https://github.com/muquit/mailsend/archive/1.17b15.tar.gz";
-    sha256="0sxjrv9yn2xyjak9si0gw2zalsrfqqcvz0indq9ap5fyalj1pjvk";
+    hash="1fjrb6q7y2dxx0qz7r0wlhqfkjqq1vfh7yb7jl77h5qi5kd5rm46";
+    url="https://github.com/muquit/mailsend/archive/1.18.tar.gz";
+    sha256="1fjrb6q7y2dxx0qz7r0wlhqfkjqq1vfh7yb7jl77h5qi5kd5rm46";
   };
   buildInputs = [
     openssl

From 63a265a6dcaea225583d857098545e12972ed0e8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Jul 2015 22:26:51 +0300
Subject: [PATCH 1868/2322] SBCL: update 1.2.12 -> 1.2.13

---
 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 80f7ea8cc3c..96843abbd45 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.2.12";
+  version = "1.2.13";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "1bf98wi3gz8n09prwmxa38b2mhq69rqq11s9h9swi3avy5wchnxn";
+    sha256 = "018jxd7f39a5aimjzfjdj739m3jq82k0qi59032v48gqrfa3mng6";
   };
 
   buildInputs = [ which ]

From 2e462069a87be8ca4dec083905539b88e9bdf97d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 4 Jul 2015 22:31:38 +0300
Subject: [PATCH 1869/2322] Wine: unstable, staging: update 1.7.43 -> 1.7.46;
 remove updater scripts because with the new layout they don't work anyway

---
 pkgs/misc/emulators/wine/stable.upstream   | 8 --------
 pkgs/misc/emulators/wine/unstable.upstream | 9 ---------
 pkgs/misc/emulators/wine/versions.nix      | 8 ++++----
 3 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/misc/emulators/wine/stable.upstream
 delete mode 100644 pkgs/misc/emulators/wine/unstable.upstream

diff --git a/pkgs/misc/emulators/wine/stable.upstream b/pkgs/misc/emulators/wine/stable.upstream
deleted file mode 100644
index b5913798a88..00000000000
--- a/pkgs/misc/emulators/wine/stable.upstream
+++ /dev/null
@@ -1,8 +0,0 @@
-url http://sourceforge.net/projects/wine/files/Source/
-version_link '[-][0-9]+[.][0-9]*[24680][.]([0-9]+[.])*tar[.][^./]+/download$'
-SF_redirect
-do_overwrite () {
-  ensure_hash
-  set_var_value version "$CURRENT_VERSION"
-  set_var_value sha256 "$CURRENT_HASH"
-}
diff --git a/pkgs/misc/emulators/wine/unstable.upstream b/pkgs/misc/emulators/wine/unstable.upstream
deleted file mode 100644
index fa78360c76a..00000000000
--- a/pkgs/misc/emulators/wine/unstable.upstream
+++ /dev/null
@@ -1,9 +0,0 @@
-url http://sourceforge.net/projects/wine/files/Source/
-attribute_name wineUnstable
-version_link '[.]tar[.][^./]+/download$'
-SF_redirect
-do_overwrite () {
-  ensure_hash
-  set_var_value version "$CURRENT_VERSION"
-  set_var_value sha256 "$CURRENT_HASH"
-}
diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index 84a3ff8f86d..cdb62d4ada7 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -1,7 +1,7 @@
 {
   unstable = {
-    wineVersion = "1.7.43";
-    wineSha256  = "08kqj02m8xc1ppzhs5y83zzykjnz0qliq495rx1n90ybzyd9pm2k";
+    wineVersion = "1.7.46";
+    wineSha256  = "02rmhz64ianls3z9r6nxf97k49bvfmyhwmpjz5a31pknqrn09d4s";
     geckoVersion = "2.36";
     geckoSha256 = "12hjks32yz9jq4w3xhk3y1dy2g3iakqxd7aldrdj51cqiz75g95g";
     gecko64Version = "2.36";
@@ -23,8 +23,8 @@
     #monoSha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
   };
   staging = {
-    version = "1.7.43";
-    sha256 = "01b7npa8hc2nrv4hm16r9ikic4wd34nbz1lvfhy0ali2jbcsaqqb";
+    version = "1.7.46";
+    sha256 = "0nkqqrzx9hprwjzg7ffzirnldxpqa6wn9c1rcyd34k77ym1v44pa";
   };
   winetricks = {
     version = "20150416";

From eafecd1fd2225f8942ad7a4cfa9b1141d2f6a8ec Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Jul 2015 00:24:32 +0300
Subject: [PATCH 1870/2322] perf-tools: update to a fresher git snapshot

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

diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/os-specific/linux/perf-tools/default.nix
index 0273fed3ec4..7c9b319d255 100644
--- a/pkgs/os-specific/linux/perf-tools/default.nix
+++ b/pkgs/os-specific/linux/perf-tools/default.nix
@@ -1,13 +1,13 @@
 { lib, stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation {
-  name = "perf-tools-20150130";
+  name = "perf-tools-20150704";
 
   src = fetchFromGitHub {
     owner = "brendangregg";
     repo = "perf-tools";
-    rev = "85414b01247666c9fefad25a1406c8078011c936";
-    sha256 = "1g15nnndcmxd1k9radcvfpn223pp627vs9wh90yiy73v03g7b8cs";
+    rev = "30ff4758915a98fd43020c1b45a63341208fd8b9";
+    sha256 = "0x59xm96jmpfgik6f9d6q6v85dip3kvi4ncijpghhg59ayyd5i6a";
   };
 
   buildInputs = [ perl ];

From 62da31931c8b7ccbad832954e65e0e09581829c8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Jul 2015 00:30:52 +0300
Subject: [PATCH 1871/2322] Firefox: update 38.0.6 -> 39.0

---
 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 942823a4295..31375bd5a5b 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -16,14 +16,14 @@
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = "38.0.6"; in
+let version = "39.0"; in
 
 stdenv.mkDerivation rec {
   name = "firefox-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
-    sha1 = "d6103cdcc6a6eda029d44104354d3a5cafbf8d45";
+    sha1 = "32785daee7ddb9da8d7509ef095258fc58fe838e";
   };
 
   buildInputs =

From fc53376dac7edae0522e70fc8df097669a9bae83 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Jul 2015 00:31:20 +0300
Subject: [PATCH 1872/2322] libmwaw: update 0.3.4 -> 0.3.5

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

diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix
index b8582a76ed8..2ef10f41d9a 100644
--- a/pkgs/development/libraries/libmwaw/default.nix
+++ b/pkgs/development/libraries/libmwaw/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="libmwaw";
-    version="0.3.4";
+    version="0.3.5";
     name="${baseName}-${version}";
-    hash="1sn95flxrh85qjsg1kk700c1ggxaaccr9j1nnw7x4daw8lky25ac";
-    url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.4/libmwaw-0.3.4.tar.xz";
-    sha256="1sn95flxrh85qjsg1kk700c1ggxaaccr9j1nnw7x4daw8lky25ac";
+    hash="1vx9h419fcfcs0yj071hsg9d2qvkacgca6052m8hv3h743cdmzil";
+    url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.5/libmwaw-0.3.5.tar.xz";
+    sha256="1vx9h419fcfcs0yj071hsg9d2qvkacgca6052m8hv3h743cdmzil";
   };
   buildInputs = [
     boost pkgconfig cppunit zlib libwpg libwpd librevenge

From b3576c284f9d2a525145207f0c63de3ddb03c689 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Jul 2015 00:31:43 +0300
Subject: [PATCH 1873/2322] libodfgen: update 0.1.3 -> 0.1.4

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

diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix
index c5491f96bb5..e8778ff413a 100644
--- a/pkgs/development/libraries/libodfgen/default.nix
+++ b/pkgs/development/libraries/libodfgen/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="libodfgen";
-    version="0.1.3";
+    version="0.1.4";
     name="${baseName}-${version}";
-    hash="1flfh1i4r116aqdlqpgpmyzpcylwba48l7mddj25a2cwgsc9v86k";
-    url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.3/libodfgen-0.1.3.tar.xz";
-    sha256="1flfh1i4r116aqdlqpgpmyzpcylwba48l7mddj25a2cwgsc9v86k";
+    hash="1qgilnsd57ayv9mqh4sg9mkknifr98dv70a35gizxh5cw7c5x6r4";
+    url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.4/libodfgen-0.1.4.tar.xz";
+    sha256="1qgilnsd57ayv9mqh4sg9mkknifr98dv70a35gizxh5cw7c5x6r4";
   };
   buildInputs = [
     boost pkgconfig cppunit zlib libwpg libwpd librevenge

From 92c86c34c5475661b46bc0300ceac5842ac09b39 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Jul 2015 00:32:09 +0300
Subject: [PATCH 1874/2322] libre: update 0.4.12 -> 0.4.13

---
 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 0b9b79f0c60..f73ddfe340e 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.4.12";
+  version = "0.4.13";
   name = "libre-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
-    sha256 = "1wjdcf5wr50d86rysj5haz53v7d58j7sszpc6k5b4mn1x6604i0d";
+    sha256 = "0496nfi7vi6ivnyici5bqs147pwkdqn48w2rajhr5k8jd07pq5qp";
   };
   buildInputs = [zlib openssl];
   makeFlags = [

From 2d99759e51b3ffef1e85d936041c881a218365ce Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Jul 2015 00:32:43 +0300
Subject: [PATCH 1875/2322] LibreOffice: update 4.4.3.2 -> 4.4.4.3

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

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 833b93b8272..b7511804d95 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -24,8 +24,8 @@ let
   langsSpaces = stdenv.lib.concatStringsSep " " langs;
   major = "4";
   minor = "4";
-  patch = "3";
-  tweak = "2";
+  patch = "4";
+  tweak = "3";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
 
@@ -80,14 +80,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "17wfnbwcp7c5cx06c88gmprscfz05qyb5587m72xs6hzr741ygir";
+      sha256 = "1zyfpbdsx0kjkabdpkf0lg7hjnvxsf6hj9ljs8v9iqw3x3b7llib";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "09im7shbka9dfdh6mq31xq106khlyyw6rr1ij69smlkq0kg463g1";
+      sha256 = "1jbbbv63p63mwby52ynz2yk79pb32wsnakhxfhc75ng1br6cpll0";
     };
 
   };
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "0rl9x01ngxwnqwzxkrqy4vks4rb024m75z0w4zidwyp0az0m8qdd";
+    sha256 = "0wns7ny19bsl5ar1rq7n4033rfijl2cjn9l8bj1gwhpqlkd8db1i";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly

From 7b6f2791424d6b1a70ffab8b91783df1a2a8fc5a Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Thu, 2 Jul 2015 16:46:56 +0200
Subject: [PATCH 1876/2322] pam_mount module: integrate pam_mount into PAM of
 NixOS

---
 nixos/modules/config/users-groups.nix |  9 ++++
 nixos/modules/module-list.nix         |  1 +
 nixos/modules/security/pam.nix        | 18 ++++++-
 nixos/modules/security/pam_mount.nix  | 72 +++++++++++++++++++++++++++
 4 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/security/pam_mount.nix

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 9d48edf2f26..478f433b431 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -108,6 +108,15 @@ let
         description = "The user's home directory.";
       };
 
+      cryptHomeLuks = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          Path to encrypted luks device that contains
+          the user's home directory.
+        '';
+      };
+
       shell = mkOption {
         type = types.str;
         default = "/run/current-system/sw/bin/nologin";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 76ee1b7f9c6..6d51c668f1d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -84,6 +84,7 @@
   ./security/grsecurity.nix
   ./security/pam.nix
   ./security/pam_usb.nix
+  ./security/pam_mount.nix
   ./security/polkit.nix
   ./security/prey.nix
   ./security/rngd.nix
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 35622b12ea3..02520fb88cd 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -126,6 +126,14 @@ let
         '';
       };
 
+      pamMount = mkOption {
+        default = config.security.pam.mount.enable;
+        type = types.bool;
+        description = ''
+          Enable PAM mount (pam_mount) system to mount fileystems on user login.
+        '';
+      };
+
       allowNullPassword = mkOption {
         default = false;
         type = types.bool;
@@ -224,7 +232,9 @@ let
           ${optionalString cfg.usbAuth
               "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"}
           ${optionalString cfg.unixAuth
-              "auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth"}
+              "auth ${if (config.security.pam.enableEcryptfs || cfg.pamMount) then "required" else "sufficient"} pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth"}
+          ${optionalString cfg.pamMount
+              "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
           ${optionalString config.security.pam.enableEcryptfs
               "auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
           ${optionalString cfg.otpwAuth
@@ -238,12 +248,14 @@ let
             auth [default=die success=done] ${pam_ccreds}/lib/security/pam_ccreds.so action=validate use_first_pass
             auth sufficient ${pam_ccreds}/lib/security/pam_ccreds.so action=store use_first_pass
           ''}
-          ${optionalString (! config.security.pam.enableEcryptfs) "auth required pam_deny.so"}
+          ${optionalString (!(config.security.pam.enableEcryptfs || cfg.pamMount)) "auth required pam_deny.so"}
 
           # Password management.
           ${optionalString config.security.pam.enableEcryptfs
               "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
           password requisite pam_unix.so nullok sha512
+          ${optionalString cfg.pamMount
+              "password optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
           ${optionalString config.users.ldap.enable
               "password sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
           ${optionalString config.krb5.enable
@@ -280,6 +292,8 @@ let
               "session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf cfg.limits}"}
           ${optionalString (cfg.showMotd && config.users.motd != null)
               "session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd}"}
+          ${optionalString cfg.pamMount
+              "session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
         '';
     };
 
diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix
new file mode 100644
index 00000000000..a5299728348
--- /dev/null
+++ b/nixos/modules/security/pam_mount.nix
@@ -0,0 +1,72 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.security.pam.mount;
+
+  anyPamMount = any (attrByPath ["pamMount"] false) (attrValues config.security.pam.services);
+in
+
+{
+  options = {
+
+    security.pam.mount = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable PAM mount system to mount fileystems on user login.
+        '';
+      };
+
+      extraVolumes = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          List of volume definitions for pam_mount.
+          For more information, visit <link
+          xlink:href="http://pam-mount.sourceforge.net/pam_mount.conf.5.html" />.
+        '';
+      };
+    };
+
+  };
+
+  config = mkIf (cfg.enable || anyPamMount) {
+
+    environment.systemPackages = [ pkgs.pam_mount ];
+    environment.etc = [{
+      target = "security/pam_mount.conf.xml";
+      source =
+        let
+          extraUserVolumes = filterAttrs (n: u: u.cryptHomeLuks != null) config.users.extraUsers;
+          userVolumeEntry = user: "<volume user=\"${user.name}\" path=\"${user.cryptHomeLuks}\" mountpoint=\"${user.home}\" />\n";
+        in
+         pkgs.writeText "pam_mount.conf.xml" ''
+          <?xml version="1.0" encoding="utf-8" ?>
+          <!DOCTYPE pam_mount SYSTEM "pam_mount.conf.xml.dtd">
+          <!-- auto generated from Nixos: modules/config/users-groups.nix -->
+          <pam_mount>
+          <debug enable="0" />
+
+          ${concatStrings (map userVolumeEntry (attrValues extraUserVolumes))}
+          ${concatStringsSep "\n" cfg.extraVolumes}
+
+          <!-- if activated, requires ofl from hxtools to be present -->
+          <logout wait="0" hup="no" term="no" kill="no" />
+          <!-- set PATH variable for pam_mount module -->
+          <path>${pkgs.utillinux}/bin</path>
+          <!-- create mount point if not present -->
+          <mkmountpoint enable="1" remove="true" />
+
+          <!-- specify the binaries to be called -->
+          <cryptmount>${pkgs.pam_mount}/bin/mount.crypt %(VOLUME) %(MNTPT)</cryptmount>
+          <cryptumount>${pkgs.pam_mount}/bin/umount.crypt %(MNTPT)</cryptumount>
+          <pmvarrun>${pkgs.pam_mount}/bin/pmvarrun -u %(USER) -o %(OPERATION)</pmvarrun>
+          </pam_mount>
+          '';
+    }];
+
+  };
+}

From 36f2ec82ccc2b801bec9b3616dfc9e0f88146fcc Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sat, 4 Jul 2015 23:57:59 +0200
Subject: [PATCH 1877/2322] tmp-luks: init at 0.9pre

---
 pkgs/tools/security/tpm-luks/default.nix | 29 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/security/tpm-luks/default.nix

diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix
new file mode 100644
index 00000000000..eda86a4a97f
--- /dev/null
+++ b/pkgs/tools/security/tpm-luks/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, autoreconfHook, gawk, trousers, cryptsetup, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "tpm-luks-${version}";
+  version = "0.9pre";
+
+  src = fetchgit {
+    url = "https://github.com/shpedoikal/tpm-luks/";
+    rev = "3fa3ea4bbd34b5b02e9271e775a338fa49dc834f";
+    sha256 = "37a56f05ad492d3128b07b3cb9dbf85ba8a0dd791329323fb398eb1026dfc89c";
+  };
+
+  buildInputs = [ autoreconfHook gawk trousers cryptsetup openssl ];
+
+  installPhase = ''
+    mkdir -p $out
+    make install DESTDIR=$out
+    mv $out/$out/sbin $out/bin
+    rm -r $out/nix
+    '';
+
+  meta = with stdenv.lib; {
+    description = "LUKS key storage in TPM NVRAM";
+    homepage    = https://github.com/shpedoikal/tpm-luks/;
+    maintainers = [ maintainers.tstrobel ];
+    platforms   = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e90ff4984b8..44e5f6cdb74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3103,6 +3103,8 @@ let
 
   tpm-tools = callPackage ../tools/security/tpm-tools { };
 
+  tpm-luks = callPackage ../tools/security/tpm-luks { };
+
   chaps = callPackage ../tools/security/chaps { };
 
   trace-cmd = callPackage ../os-specific/linux/trace-cmd { };

From d1590482cf3ec36636e26c12a100fcd36b48180f Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Sat, 4 Jul 2015 13:17:29 -0700
Subject: [PATCH 1878/2322] cudatoolkit: generalize derivations, add cuda7

There is not much different between the cudatoolkit
expressions:

  pkgs/development/compilers/cudatoolkit/5.5.nix
  pkgs/development/compilers/cudatoolkit/6.0.nix
  pkgs/development/compilers/cudatoolkit/6.5.nix

This commit removes those and replaces them with

  pkgs/development/compilers/cudatoolkit/generic.nix

and adds cudatoolkit version 7
---
 .../development/compilers/cudatoolkit/5.5.nix | 66 ++---------------
 .../development/compilers/cudatoolkit/6.0.nix | 67 ++---------------
 .../development/compilers/cudatoolkit/6.5.nix | 73 ++-----------------
 .../development/compilers/cudatoolkit/7.0.nix |  7 ++
 .../compilers/cudatoolkit/generic.nix         | 73 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +
 6 files changed, 99 insertions(+), 191 deletions(-)
 create mode 100644 pkgs/development/compilers/cudatoolkit/7.0.nix
 create mode 100644 pkgs/development/compilers/cudatoolkit/generic.nix

diff --git a/pkgs/development/compilers/cudatoolkit/5.5.nix b/pkgs/development/compilers/cudatoolkit/5.5.nix
index b4226163865..c3eb1b6efcf 100644
--- a/pkgs/development/compilers/cudatoolkit/5.5.nix
+++ b/pkgs/development/compilers/cudatoolkit/5.5.nix
@@ -1,62 +1,6 @@
-{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
-, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib
-} :
+{ callPackage, ... } @ args:
 
-stdenv.mkDerivation rec {
-  name = "cudatoolkit-5.5.22";
-
-  dontPatchELF = true;
-  dontStrip = true;
-
-  src =
-    if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_5.5.22_linux_64.run;
-        sha256 = "b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4";
-      }
-    else throw "cudatoolkit does not support platform ${stdenv.system}";
-
-  outputs = [ "out" "sdk" ];
-
-  buildInputs = [ perl ];
-
-  runtimeDependencies = [
-    ncurses expat python zlib
-    xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext
-    gtk2 glib fontconfig freetype unixODBC alsaLib
-  ];
-
-  rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc}/lib64";
-
-  unpackPhase = ''
-    sh $src --keep --noexec
-    cd pkg/run_files
-    sh cuda-linux64-rel-5.5.22-16488124.run --keep --noexec
-    sh cuda-samples-linux-5.5.22-16488124.run --keep --noexec
-    cd pkg
-  '';
-
-  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
-  '';
-
-  installPhase = ''
-    mkdir $out $sdk
-    perl ./install-linux.pl --prefix="$out"
-    rm $out/tools/CUDA_Occupancy_Calculator.xls
-    perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
-    mv $out/include $out/usr_include
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  meta = {
-    license = lib.licenses.unfree;
-  };
-}
+callPackage ./generic.nix (args // rec {
+  version = "5.5.22";
+  sha256 = "b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4";
+})
diff --git a/pkgs/development/compilers/cudatoolkit/6.0.nix b/pkgs/development/compilers/cudatoolkit/6.0.nix
index 49a52fe5d32..200311703a0 100644
--- a/pkgs/development/compilers/cudatoolkit/6.0.nix
+++ b/pkgs/development/compilers/cudatoolkit/6.0.nix
@@ -1,63 +1,6 @@
-{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
-, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib
-} :
-
-stdenv.mkDerivation rec {
-  name = "cudatoolkit-6.0.37";
-
-  dontPatchELF = true;
-  dontStrip = true;
-
-  src =
-    if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run;
-        sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40";
-      }
-    else throw "cudatoolkit does not support platform ${stdenv.system}";
-
-  outputs = [ "out" "sdk" ];
-
-  buildInputs = [ perl ];
-
-  runtimeDependencies = [
-    ncurses expat python zlib
-    xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext
-    gtk2 glib fontconfig freetype unixODBC alsaLib
-  ];
-
-  rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc}/lib64";
-
-  unpackPhase = ''
-    sh $src --keep --noexec
-    cd pkg/run_files
-    sh cuda-linux64-rel-6.0.37-18176142.run --keep --noexec
-    sh cuda-samples-linux-6.0.37-18176142.run --keep --noexec
-    cd pkg
-  '';
-
-  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
-  '';
-
-  installPhase = ''
-    mkdir $out $sdk
-    perl ./install-linux.pl --prefix="$out"
-    rm $out/tools/CUDA_Occupancy_Calculator.xls
-    perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
-    mv $out/include $out/usr_include
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  meta = {
-    license = lib.licenses.unfree;
-  };
-}
+{ callPackage, ... } @ args:
 
+callPackage ./generic.nix (args // rec {
+  version = "6.0.37";
+  sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40";
+})
diff --git a/pkgs/development/compilers/cudatoolkit/6.5.nix b/pkgs/development/compilers/cudatoolkit/6.5.nix
index 268e8e7aeae..3d9a3a50349 100644
--- a/pkgs/development/compilers/cudatoolkit/6.5.nix
+++ b/pkgs/development/compilers/cudatoolkit/6.5.nix
@@ -1,69 +1,6 @@
-{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
-, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
-}:
-
-let version = "6.5.19"; in
-
-stdenv.mkDerivation rec {
-  name = "cudatoolkit-${version}";
-
-  dontPatchELF = true;
-  dontStrip = true;
-
-  src =
-    if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = "http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_${version}_linux_64.run";
-        sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj";
-      }
-    else throw "cudatoolkit does not support platform ${stdenv.system}";
-
-  outputs = [ "out" "sdk" ];
-
-  buildInputs = [ perl ];
-
-  runtimeDependencies = [
-    glibc
-    ncurses expat python zlib
-    xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext
-    gtk2 glib fontconfig freetype unixODBC alsaLib
-  ];
-
-  rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc}/lib64";
-
-  unpackPhase = ''
-    sh $src --keep --noexec
-    cd pkg/run_files
-    sh cuda-linux64-rel-${version}-*.run --keep --noexec
-    sh cuda-samples-linux-${version}-*.run --keep --noexec
-    cd pkg
-  '';
-
-  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
-  '';
-
-  installPhase = ''
-    mkdir $out $sdk
-    perl ./install-linux.pl --prefix="$out"
-    rm $out/tools/CUDA_Occupancy_Calculator.xls
-    perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
-    mv $out/include $out/usr_include
-
-    # let's remove the 32-bit libraries, they confuse the lib64->lib mover
-    rm -rf $out/lib
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  meta = {
-    license = lib.licenses.unfree;
-  };
-}
+{ callPackage, ... } @ args:
 
+callPackage ./generic.nix (args // rec {
+  version = "6.5.19";
+  sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj";
+})
diff --git a/pkgs/development/compilers/cudatoolkit/7.0.nix b/pkgs/development/compilers/cudatoolkit/7.0.nix
new file mode 100644
index 00000000000..152dd6e9274
--- /dev/null
+++ b/pkgs/development/compilers/cudatoolkit/7.0.nix
@@ -0,0 +1,7 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "7.0.28";
+  sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi";
+  url = "http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run";
+})
diff --git a/pkgs/development/compilers/cudatoolkit/generic.nix b/pkgs/development/compilers/cudatoolkit/generic.nix
new file mode 100644
index 00000000000..c42c8057987
--- /dev/null
+++ b/pkgs/development/compilers/cudatoolkit/generic.nix
@@ -0,0 +1,73 @@
+{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
+, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
+# generic inputs
+, version, sha256, url ? null, ...
+} :
+
+let
+  # eg, 5.5.22 => 5_5
+  mkShort = let str  = stdenv.lib.strings;
+                take = stdenv.lib.lists.take;
+            in v: str.concatStringsSep "_" (take 2 (str.splitString "." v));
+  shortVer = mkShort version;
+in stdenv.mkDerivation rec {
+  name = "cudatoolkit-${version}";
+
+  dontPatchELF = true;
+  dontStrip = true;
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = if url != null then url else "http://developer.download.nvidia.com/compute/cuda/${shortVer}/rel/installers/cuda_${version}_linux_64.run";
+        sha256 = sha256;
+      }
+    else throw "cudatoolkit does not support platform ${stdenv.system}";
+
+  outputs = [ "out" "sdk" ];
+
+  buildInputs = [ perl ];
+
+  runtimeDependencies = [
+    ncurses expat python zlib glibc
+    xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext
+    gtk2 glib fontconfig freetype unixODBC alsaLib
+  ];
+
+  rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc}/lib64";
+
+  unpackPhase = ''
+    sh $src --keep --noexec
+    cd pkg/run_files
+    sh cuda-linux64-rel-${version}-*.run --keep --noexec
+    sh cuda-samples-linux-${version}-*.run --keep --noexec
+    cd pkg
+  '';
+
+  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
+  '';
+
+  installPhase = ''
+    mkdir $out $sdk
+    perl ./install-linux.pl --prefix="$out"
+    rm $out/tools/CUDA_Occupancy_Calculator.xls
+    perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
+    mv $out/include $out/usr_include
+
+    # let's remove the 32-bit libraries, they confuse the lib64->lib mover
+    rm -rf $out/lib
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  meta = {
+    license = lib.licenses.unfree;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44e5f6cdb74..f50c6831693 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1184,6 +1184,10 @@ let
     python = python26;
   };
 
+  cudatoolkit7 = callPackage ../development/compilers/cudatoolkit/7.0.nix {
+    python = python26;
+  };
+
   cudatoolkit = cudatoolkit5;
 
   curlFull = curl.override {

From e199d9e844e002852e142268fdc1143000dfbf6f Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sun, 5 Jul 2015 00:10:31 -0400
Subject: [PATCH 1879/2322] urxvt-perl: init at 2015-01-16

Includes two extensions for `urxvt`:

* fullscreen: Toggle fullscreen for terminal
* newterm:    Open a new terminal in your current working directory
---
 .../urxvt-perl/default.nix                    | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix

diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix
new file mode 100644
index 00000000000..dfcdeaa9d4e
--- /dev/null
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, wmctrl }:
+
+stdenv.mkDerivation {
+  name = "urxvt-perl-2015-01-16";
+
+  src = fetchFromGitHub {
+    owner = "effigies";
+    repo = "urxvt-perl";
+    rev = "c3beb9ff09a7139591416c61f8e9458c8a23bea5";
+    sha256 = "1w1p8ng7bwq5hnaprjl1zf073y5l3hdsj7sz7cll6isjswcm6r0s";
+  };
+
+  installPhase = ''
+    substituteInPlace fullscreen \
+      --replace "wmctrl" "${wmctrl}/bin/wmctrl"
+
+    mkdir -p $out/lib/urxvt/perl
+    cp fullscreen $out/lib/urxvt/perl
+    cp newterm $out/lib/urxvt/perl
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Perl extensions for the rxvt-unicode terminal emulator";
+    homepage = "https://github.com/effigies/urxvt-perl";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f50c6831693..0147cefc0fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12469,12 +12469,13 @@ let
   };
 
   # urxvt plugins
+  urxvt_perl = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perl { };
   urxvt_perls = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perls { };
   urxvt_tabbedex = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-tabbedex { };
   urxvt_font_size = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-font-size { };
 
   rxvt_unicode-with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix {
-    plugins = [ urxvt_perls urxvt_tabbedex urxvt_font_size ];
+    plugins = [ urxvt_perl urxvt_perls urxvt_tabbedex urxvt_font_size ];
   };
 
   # FIXME: remove somewhere in future

From 2467c437b7103f5895c163b56484420c5ecc5553 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 5 Jul 2015 09:25:13 +0200
Subject: [PATCH 1880/2322] xdg_utils: Fix wrong substitution of grep command.

Fixes regression introduced by 16406e63b310e832b017bf9ef0473a6aa792f7da.

Not replacing "egrep" with a negated character class on [^e] needs to be
put back into the replacement, because if we have something like:

foo="$(grep xxx)"

The replacement would be something like this:

foo="$/nix/store/.../bin/grep xxx)"

Which will lead to wrong behavior and in cases of for example
"xdg-screensaver", even directly to a syntax error:

xdg-screensaver: line 178: syntax error near unexpected token `('
xdg-screensaver: line 178: `command="/nix/store/.../bin/grep -E
                            "^Exec(\[[^]=]*])?=" "$file" |
                            /nix/store/.../bin/cut -d= -f 2- |
                            first_word`"'

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/X11/xdg-utils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 7ba20480b6f..24b9096d27c 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
       substituteInPlace $item --replace "cut " "${coreutils}/bin/cut "
       substituteInPlace $item --replace "sed " "${gnused}/bin/sed "
       substituteInPlace $item --replace "egrep " "${gnugrep}/bin/egrep "
-      sed -i $item -e "s#[^e]grep #${gnugrep}/bin/grep #g" # Don't replace 'egrep'
+      sed -i $item -re "s#([^e])grep #\1${gnugrep}/bin/grep #g" # Don't replace 'egrep'
       substituteInPlace $item --replace "which " "${which}/bin/which "
       substituteInPlace $item --replace "/usr/bin/file" "${file}/bin/file"
     done

From af3d395cfe4666973e4cf4105a1b05b509ff1bab Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Jul 2015 11:57:38 +0300
Subject: [PATCH 1881/2322] sgtpuzzles: update to revision 10286; rewrite
 completely to avoid reliance on builderDefs features

---
 pkgs/games/sgt-puzzles/default.nix | 47 +++++++++++++-----------------
 pkgs/top-level/all-packages.nix    |  5 +---
 2 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index 8aaf1f0865c..67f74be9e1c 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -1,40 +1,35 @@
-a :  
-let 
-  fetchsvn = a.fetchsvn;
-
-  version = a.lib.attrByPath ["version"] "r8541" a;
-  buildInputs = with a; [
+{stdenv, gtk, pkgconfig, libX11, perl, fetchsvn}:
+let
+  version = "10286";
+  buildInputs = [
     gtk pkgconfig libX11 perl
   ];
 in
-rec {
+stdenv.mkDerivation {
   src = fetchsvn {
    url = svn://svn.tartarus.org/sgt/puzzles;
-   rev = "9773";
-   sha256 = "1m0mmxbcj0zi44dlmhk4h30d9hdy8g9f59r7k7906pgnnyf49611";
-  } + "/";
-
+   rev = version;
+   sha256 = "1mp1s33hjikby7jy6bcjwyzkdwlw1bw9dcc4cg5d80wmzkb0sqv0";
+  };
+  name = "sgt-puzzles-r" + version;
   inherit buildInputs;
-  configureFlags = [];
-  makeFlags = ["prefix=$out" "gamesdir=$out/bin"];
-
-  neededDirs = ["$out/bin" "$out/share"];
-  extraDoc = ["puzzles.txt"];
-
-  mkMakefiles = a.fullDepEntry ''
+  makeFlags = ["prefix=$(out)" "gamesdir=$(out)/bin"];
+  preInstall = ''
+    mkdir -p "$out"/{bin,share/doc/sgtpuzzles}
+    cp puzzles.txt LICENCE README "$out/share/doc/sgtpuzzles"
+    cp LICENCE "$out/share/doc/sgtpuzzles/LICENSE"
+  '';
+  preConfigure = ''
     perl mkfiles.pl
-  '' ["minInit" "doUnpack" "addInputs"];
-
-  setVars = a.noDepEntry ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error"
+    cp Makefile.gtk Makefile
   '';
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["addInputs" "setVars" "mkMakefiles" "doMakeInstall"];
-
-  name = "sgt-puzzles-" + version;
   meta = {
+    inherit version;
     description = "Simon Tatham's portable puzzle collection";
+    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 0147cefc0fb..b16f601e306 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13613,10 +13613,7 @@ let
 
   sdlmame = callPackage ../games/sdlmame { };
 
-  sgtpuzzles = builderDefsPackage (import ../games/sgt-puzzles) {
-    inherit pkgconfig fetchsvn perl gtk;
-    inherit (xlibs) libX11;
-  };
+  sgtpuzzles = callPackage (import ../games/sgt-puzzles) { };
 
   simutrans = callPackage ../games/simutrans { };
   # get binaries without data built by Hydra

From 542a508c634c8c3e71716d82b3db36c3cc2b6f14 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sat, 4 Jul 2015 22:49:48 +0200
Subject: [PATCH 1882/2322] idea: android-studio: update 1.2.1.1 -> 1.2.2.0

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

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index ff6d3d57eff..b2b6d2ddde5 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -212,14 +212,14 @@ in
 
   android-studio = buildAndroidStudio rec {
     name = "android-studio-${version}";
-    version = "1.2.1.1";
-    build = "141.1903250";
+    version = "1.2.2.0";
+    build = "141.1980579";
     description = "Android development environment based on IntelliJ IDEA";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
             "/android-studio-ide-${build}-linux.zip";
-      sha256 = "17n0hsw0655b2w7a3avj5hw6njhv4gayxnsj1bwi9p3dgzr5d5zp";
+      sha256 = "08bayp2kxxg0zdmd1rcfg89g80wmwxf56fzmk5xkz1qg6s9b98a6";
     };
   };
 

From 2285ad1bfa20714daac8ab2f1d3c933598af9c13 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sat, 4 Jul 2015 23:39:28 +0200
Subject: [PATCH 1883/2322] trustedGRUB: GRUB 1 based -> GRUB 2 based

---
 pkgs/tools/misc/grub/trusted.nix | 100 +++++++++++++++++++++++++------
 pkgs/top-level/all-packages.nix  |   5 +-
 2 files changed, 84 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix
index 9f897d7e93a..790870cf302 100644
--- a/pkgs/tools/misc/grub/trusted.nix
+++ b/pkgs/tools/misc/grub/trusted.nix
@@ -1,26 +1,92 @@
-{stdenv, fetchgit, autoconf, automake, buggyBiosCDSupport ? true}:
+{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake
+, gettext, ncurses, libusb, freetype, qemu, devicemapper
+}:
 
-stdenv.mkDerivation {
-  name = "trustedGRUB-1.1.5";
+with stdenv.lib;
+let
+  pcSystems = {
+    "i686-linux".target = "i386";
+    "x86_64-linux".target = "i386";
+  };
+
+  inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems);
+
+  version = "2.0-git-2015-07-04";
+
+  unifont_bdf = fetchurl {
+    url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
+    sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
+  };
+
+  po_src = fetchurl {
+    name = "grub-2.02-beta2.tar.gz";
+    url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.gz";
+    sha256 = "1lr9h3xcx0wwrnkxdnkfjwy08j7g7mdlmmbdip2db4zfgi69h0rm";
+
+  };
+
+in (
+
+stdenv.mkDerivation rec {
+  name = "trustedGRUB-${version}";
 
   src = fetchgit {
-     url = "https://github.com/ts468/TrustedGRUB";
-     rev = "954941c17e14c8f7b18e6cd3043ef5f946866f1c";
-     sha256 = "30c21765dc44f02275e66220d6724ec9cd45496226ca28c6db59a9147aa22685";
+    url = "https://github.com/Sirrix-AG/TrustedGRUB2";
+    rev = "1865d07bdef7f39916790c77103fb85e99de14a4";
+    sha256 = "e6bd9edfeb653e98e585fd691a31533b649b2fca1f4a903c70f6ea371014c9f7";
   };
 
-  # Autoconf/automake required for the splashimage patch.
-  buildInputs = [autoconf automake];
+  nativeBuildInputs = [ autogen flex bison python autoconf automake ];
+  buildInputs = [ ncurses libusb freetype gettext devicemapper ]
+    ++ optional doCheck qemu;
 
-  preConfigure = ''
-    autoreconf
+  preConfigure =
+    '' for i in "tests/util/"*.in
+       do
+         sed -i "$i" -e's|/bin/bash|/bin/sh|g'
+       done
+
+       # Apparently, the QEMU executable is no longer called
+       # `qemu-system-i386', even on i386.
+       #
+       # In addition, use `-nodefaults' to avoid errors like:
+       #
+       #  chardev: opening backend "stdio" failed
+       #  qemu: could not open serial device 'stdio': Invalid argument
+       #
+       # See <http://www.mail-archive.com/qemu-devel@nongnu.org/msg22775.html>.
+       sed -i "tests/util/grub-shell.in" \
+           -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
+    '';
+
+  prePatch =
+    '' tar zxf ${po_src} grub-2.02~beta2/po
+       rm -rf po
+       mv grub-2.02~beta2/po po
+       sh autogen.sh
+       gunzip < "${unifont_bdf}" > "unifont.bdf"
+       sed -i "configure" \
+           -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
+    '';
+
+  patches = [ ./fix-bash-completion.patch ];
+
+  # save target that grub is compiled for
+  grubTarget = if inPCSystems
+               then "${pcSystems.${stdenv.system}.target}-pc"
+               else "";
+
+  doCheck = false;
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    paxmark pms $out/sbin/grub-{probe,bios-setup}
   '';
 
-  meta = {
-    homepage = "http://sourceforge.net/projects/trustedgrub/";
-    repositories.git = https://github.com/ts468/TrustedGRUB;
-    description = "Legacy GRUB bootloader extended with TCG support";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
+  meta = with stdenv.lib; {
+    description = "GRUB 2.0 extended with TCG (TPM) support for integrity measured boot process (trusted boot)";
+    homepage = https://github.com/Sirrix-AG/TrustedGRUB2;
+    license = licenses.gpl3Plus;
+    platforms = platforms.gnu;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e90ff4984b8..1d317a30ad7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1702,10 +1702,7 @@ let
     automake = automake112x; # fails with 13 and 14
   };
 
-  trustedGrub = callPackage_i686 ../tools/misc/grub/trusted.nix {
-    buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
-    automake = automake112x; # fails with 13 and 14
-  };
+  trustedGrub = callPackage_i686 ../tools/misc/grub/trusted.nix { };
 
   grub2 = grub2_full;
 

From 167cf5c0da384a50b6e6720c4a0ee3a53a36b35a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 5 Jul 2015 14:31:46 +0300
Subject: [PATCH 1884/2322] asymptote: Fix source URL

The particular mirror (softlayer-ams.dfl.sourceforge.net) seems to be
down (no DNS entry).
---
 pkgs/tools/graphics/asymptote/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 01f3947cdfa..7a15b00b365 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -10,7 +10,7 @@ let
     version="2.35";
     name="${baseName}-${version}";
     hash="11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z";
-    url="http://softlayer-ams.dl.sourceforge.net/project/asymptote/2.35/asymptote-2.35.src.tgz";
+    url="mirror://sourceforge/asymptote/2.35/asymptote-2.35.src.tgz";
     sha256="11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z";
   };
   buildInputs = [

From 6c8e6aaa24a94ed7cd7de5677e68fc353dad2603 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sun, 5 Jul 2015 13:57:10 +0200
Subject: [PATCH 1885/2322] nixos docker: fix service and test

---
 nixos/modules/virtualisation/docker.nix | 3 +++
 nixos/tests/docker.nix                  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 49170f2220b..ef9cc2280db 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -103,6 +103,9 @@ in
           LimitNPROC = 1048576;
         } // proxy_env;
 
+        path = [ pkgs.kmod ];
+        environment.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
+
         postStart = ''
           while ! [ -e /var/run/docker.sock ]; do
             sleep 0.1
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix
index 63c909ff294..fc6449b28d3 100644
--- a/nixos/tests/docker.nix
+++ b/nixos/tests/docker.nix
@@ -15,8 +15,8 @@ import ./make-test.nix {
     startAll;
 
     $docker->waitForUnit("docker.service");
-    $docker->succeed("tar cv --files-from /dev/null | docker import - scratch");
-    $docker->succeed("docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratch /bin/sleep 10");
+    $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("docker stop sleeping");
   '';

From c9e5218b337d97cbf2e39a53aa61863451132c71 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sun, 5 Jul 2015 14:59:01 +0200
Subject: [PATCH 1886/2322] sbsigntool: init at 0.5

---
 pkgs/tools/security/sbsigntool/autoconf.patch | 19 ++++++++
 pkgs/tools/security/sbsigntool/default.nix    | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 68 insertions(+)
 create mode 100644 pkgs/tools/security/sbsigntool/autoconf.patch
 create mode 100644 pkgs/tools/security/sbsigntool/default.nix

diff --git a/pkgs/tools/security/sbsigntool/autoconf.patch b/pkgs/tools/security/sbsigntool/autoconf.patch
new file mode 100644
index 00000000000..27f5b77c884
--- /dev/null
+++ b/pkgs/tools/security/sbsigntool/autoconf.patch
@@ -0,0 +1,19 @@
+diff -uNr sbsigntool/configure.ac sbsigntool-new/configure.ac
+--- sbsigntool/configure.ac	2015-07-05 12:18:18.932717136 +0200
++++ sbsigntool-new/configure.ac	2015-07-05 14:51:39.659284938 +0200
+@@ -65,7 +65,7 @@
+ 
+ dnl gnu-efi headers require extra include dirs
+ EFI_ARCH=$(uname -m)
+-EFI_CPPFLAGS="-I/usr/include/efi -I/usr/include/efi/$EFI_ARCH \
++EFI_CPPFLAGS="-I@@NIX_GNUEFI@@/include/efi -I@@NIX_GNUEFI@@/include/efi/$EFI_ARCH \
+  -DEFI_FUNCTION_WRAPPER"
+ CPPFLAGS_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $EFI_CPPFLAGS"
+@@ -74,5 +74,5 @@
+ AC_SUBST(EFI_CPPFLAGS, $EFI_CPPFLAGS)
+ 
+ AC_CONFIG_FILES([Makefile src/Makefile lib/ccan/Makefile]
+-		[docs/Makefile tests/Makefile])
++		[docs/Makefile])
+ AC_OUTPUT
diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix
new file mode 100644
index 00000000000..1571720a0b9
--- /dev/null
+++ b/pkgs/tools/security/sbsigntool/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchgit, autoconf, automake, utillinux, openssl, libuuid, gnu-efi
+, binutils, pkgconfig, help2man }:
+
+stdenv.mkDerivation rec {
+  name = "sbsigntool-${version}";
+  version = "0.5";
+
+  src = fetchgit {
+    url = "git://kernel.ubuntu.com/jk/sbsigntool";
+    rev = "951ee95a301674c046f55330cd7460e1314deff2";
+    sha256 = "09k8by0qq8j7ff812l1l9z9frsx5c4cmhj5in3g1sgyz3v55nfy7";
+  };
+
+  patches = [ ./autoconf.patch ];
+
+  buildInputs = [ autoconf automake utillinux openssl libuuid gnu-efi binutils pkgconfig help2man ];
+
+  configurePhase = ''
+    substituteInPlace configure.ac --replace "@@NIX_GNUEFI@@" "${gnu-efi}"
+
+    lib/ccan.git/tools/create-ccan-tree --build-type=automake lib/ccan "talloc read_write_all build_assert array_size"
+    touch AUTHORS
+    touch ChangeLog
+
+    echo "SUBDIRS = lib/ccan src docs" >> Makefile.am
+
+    aclocal
+    autoheader
+    autoconf
+    automake --add-missing -Wno-portability
+
+    ./configure --prefix=$out
+    '';
+
+  installPhase = ''
+    mkdir -p $out
+    make install
+    '';
+
+  meta = with stdenv.lib; {
+    description = "Tools for maintaining UEFI signature databases";
+    homepage    = http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases;
+    maintainers = [ maintainers.tstrobel ];
+    platforms   = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44e5f6cdb74..1a7f972fcff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1719,6 +1719,8 @@ let
     zfsSupport = false;
   };
 
+  sbsigntool = callPackage ../tools/security/sbsigntool { };
+
   gsmartcontrol = callPackage ../tools/misc/gsmartcontrol {
     inherit (gnome) libglademm;
   };

From cb94cce94f80119e61388936c5836f29e2db7dff Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 5 Jul 2015 14:24:59 +0200
Subject: [PATCH 1887/2322] xscreensaver: Fix SHA256 hash of upstream tarball.

The upstream tarball has changed, so I checked why this has happened and
found a tarball with the old SHA256 hash here:

http://fossies.org/linux/misc/xscreensaver-5.33.tar.gz/

After checking the contents of this and the new upstream tarball I found
that the old tarball had only .so, .o and .o.d files which now are no
longer existent in the new tarball.

Seems that the upstream author has accidentally put object files in the
source tarball and has now corrected this mistake.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/misc/screensavers/xscreensaver/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index 6734eeac010..bc1c69c2201 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
-    sha256 = "0sy4awsak8yhja86n69bmi8i2c91hfs7zbkwn5y81qfrivh8b41j";
+    sha256 = "0k9z64ynpcfy19a33lm6g75ry3mb6zilm3dnm0zq9whrj9hw386l";
   };
 
   buildInputs =

From 178014373e5d9fe2315d7da3f9580309a19d949b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Jul 2015 18:52:31 +0300
Subject: [PATCH 1888/2322] E prover: switch to the new location

---
 pkgs/applications/science/logic/eprover/default.nix      | 2 +-
 pkgs/applications/science/logic/eprover/default.upstream | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
index bb0e34d45bc..c04cfffbb14 100644
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -6,7 +6,7 @@ let
     version="1.8";
     name="${baseName}-${version}";
     hash="0bl4dr7k6simwdvdyxhnjkiz4nm5y0nr8bfhc34zk0360i9m6sk3";
-    url="http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_1.8/E.tgz";
+    url="http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_1.8/E.tgz";
     sha256="0bl4dr7k6simwdvdyxhnjkiz4nm5y0nr8bfhc34zk0360i9m6sk3";
   };
 in
diff --git a/pkgs/applications/science/logic/eprover/default.upstream b/pkgs/applications/science/logic/eprover/default.upstream
index fb2d80fafae..f871d4985bb 100644
--- a/pkgs/applications/science/logic/eprover/default.upstream
+++ b/pkgs/applications/science/logic/eprover/default.upstream
@@ -1,3 +1,3 @@
-url http://www4.informatik.tu-muenchen.de/~schulz/E/Download.html
+url http://wwwlehre.dhbw-stuttgart.de/~sschulz/E/Download.html
 version_link '[.]tgz$'
 version '.*[/]V_([0-9.]+)[/].*' '\1'

From d366f5db9ad5ba975a8ce513763805500028dece Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 5 Jul 2015 16:03:01 +0200
Subject: [PATCH 1889/2322] xhyve: init at version 0.1.0

Lightweight Virtualization on OS X Based on bhyve.
---
 .../virtualization/xhyve/default.nix          | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/virtualization/xhyve/default.nix

diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix
new file mode 100644
index 00000000000..9941d34bc89
--- /dev/null
+++ b/pkgs/applications/virtualization/xhyve/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "xhyve-${version}";
+  version = "0.1.0";
+
+  src = fetchurl {
+    url = "https://github.com/mist64/xhyve/archive/v${version}.tar.gz";
+    sha256 = "0nbb9zy4iqmdz2dpyvcl1ynimrrpyd6f6cq8y2p78n1lmgqhrgkm";
+  };
+
+  buildFlags = "CFLAGS=-Wno-pedantic -Wno-shift-sign-overflow";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp build/xhyve $out/bin
+  '';
+
+  meta = {
+    description = "Lightweight Virtualization on OS X Based on bhyve";
+    homepage = "https://github.com/mist64/xhyve";
+    maintainers = lib.maintainers.lnl7;
+    platforms = lib.platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b16f601e306..8928e5f6769 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14946,6 +14946,8 @@ let
 
   xboxdrv = callPackage ../misc/drivers/xboxdrv { };
 
+  xhyve = callPackage ../applications/virtualization/xhyve { };
+
   xinput_calibrator = callPackage ../tools/X11/xinput_calibrator {
     inherit (xlibs) libXi inputproto;
   };

From 65cbbc75b0f9c91037c7eb8e82fea9a48fb2d96e Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sun, 5 Jul 2015 18:54:35 +0200
Subject: [PATCH 1890/2322] grub installation: integrate trustedGRUB + fix
 broken equality check

---
 .../modules/system/boot/loader/grub/grub.nix  | 29 ++++++++++++++++++-
 .../system/boot/loader/grub/install-grub.pl   | 17 +++++++----
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 3c879450ba6..c7cf712e3c2 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -10,7 +10,8 @@ let
 
   realGrub = if cfg.version == 1 then pkgs.grub
     else if cfg.zfsSupport then pkgs.grub2.override { zfsSupport = true; }
-    else pkgs.grub2;
+    else if cfg.enableTrustedboot then pkgs.trustedGrub
+           else pkgs.grub2;
 
   grub =
     # Don't include GRUB if we're only generating a GRUB menu (e.g.,
@@ -37,6 +38,7 @@ let
       grub = f grub;
       grubTarget = f (grub.grubTarget or "");
       shell = "${pkgs.stdenv.shell}";
+      fullName = (builtins.parseDrvName realGrub.name).name;
       fullVersion = (builtins.parseDrvName realGrub.name).version;
       grubEfi = f grubEfi;
       grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else "";
@@ -367,6 +369,15 @@ in
         '';
       };
 
+      enableTrustedboot = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enable trusted boot. Grub will measure all critical components during
+          the boot process to offer TCG (TPM) support.
+        '';
+      };
+
     };
 
   };
@@ -429,6 +440,22 @@ in
           assertion = all (c: c < 2) (mapAttrsToList (_: c: c) bootDeviceCounters);
           message = "You cannot have duplicated devices in mirroredBoots";
         }
+        {
+          assertion = !cfg.enableTrustedboot || cfg.version == 2;
+          message = "Trusted GRUB is only available for GRUB 2";
+        }
+        {
+          assertion = !cfg.efiSupport || !cfg.enableTrustedboot;
+          message = "Trusted GRUB does not have EFI support";
+        }
+        {
+          assertion = !cfg.zfsSupport || !cfg.enableTrustedboot;
+          message = "Trusted GRUB does not have ZFS support";
+        }
+        {
+          assertion = !cfg.enableTrustedboot;
+          message = "Trusted GRUB can break your system. Remove assertion if you want to test trustedGRUB nevertheless.";
+        }
       ] ++ flip concatMap cfg.mirroredBoots (args: [
         {
           assertion = args.devices != [ ];
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index cad9013bf5a..de0a4c7f056 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -433,15 +433,18 @@ foreach my $fn (glob "$bootPath/kernels/*") {
 #
 
 struct(GrubState => {
+    name => '$',
     version => '$',
     efi => '$',
     devices => '$',
     efiMountPoint => '$',
 });
 sub readGrubState {
-    my $defaultGrubState = GrubState->new(version => "", efi => "", devices => "", efiMountPoint => "" );
+    my $defaultGrubState = GrubState->new(name => "", version => "", efi => "", devices => "", efiMountPoint => "" );
     open FILE, "<$bootPath/grub/state" or return $defaultGrubState;
     local $/ = "\n";
+    my $name = <FILE>;
+    chomp($name);
     my $version = <FILE>;
     chomp($version);
     my $efi = <FILE>;
@@ -451,7 +454,7 @@ sub readGrubState {
     my $efiMountPoint = <FILE>;
     chomp($efiMountPoint);
     close FILE;
-    my $grubState = GrubState->new(version => $version, efi => $efi, devices => $devices, efiMountPoint => $efiMountPoint );
+    my $grubState = GrubState->new(name => $name, version => $version, efi => $efi, devices => $devices, efiMountPoint => $efiMountPoint );
     return $grubState
 }
 
@@ -497,10 +500,11 @@ my $prevGrubState = readGrubState();
 my @prevDeviceTargets = split/:/, $prevGrubState->devices;
 
 my $devicesDiffer = scalar (List::Compare->new( '-u', '-a', \@deviceTargets, \@prevDeviceTargets)->get_symmetric_difference() );
-my $versionDiffer = (get("fullVersion") eq \$prevGrubState->version);
-my $efiDiffer = ($efiTarget eq \$prevGrubState->efi);
-my $efiMountPointDiffer = ($efiSysMountPoint eq \$prevGrubState->efiMountPoint);
-my $requireNewInstall = $devicesDiffer || $versionDiffer || $efiDiffer || $efiMountPointDiffer || (($ENV{'NIXOS_INSTALL_GRUB'} // "") eq "1");
+my $nameDiffer = !(get("fullName") eq $prevGrubState->name);
+my $versionDiffer = !(get("fullVersion") eq $prevGrubState->version);
+my $efiDiffer = !($efiTarget eq $prevGrubState->efi);
+my $efiMountPointDiffer = !($efiSysMountPoint eq $prevGrubState->efiMountPoint);
+my $requireNewInstall = $devicesDiffer || $nameDiffer || $versionDiffer || $efiDiffer || $efiMountPointDiffer || (($ENV{'NIXOS_INSTALL_GRUB'} // "") eq "1");
 
 # install a symlink so that grub can detect the boot drive when set
 # as the root directory
@@ -543,6 +547,7 @@ if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both"))
 # update GRUB state file
 if ($requireNewInstall != 0) {
     open FILE, ">$bootPath/grub/state" or die "cannot create $bootPath/grub/state: $!\n";
+    print FILE get("fullName"), "\n" or die;
     print FILE get("fullVersion"), "\n" or die;
     print FILE $efiTarget, "\n" or die;
     print FILE join( ":", @deviceTargets ), "\n" or die;

From 6befeb681810dbd13deda24330f40a3d741ef4e2 Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sun, 5 Jul 2015 13:04:28 +0100
Subject: [PATCH 1891/2322] udisks2 service: Fix ExecStart path

It seems that with the latest update to `udisks2`, the ExecStart path
for the daemon changed from `/lib/udisks2` to `/libexec/udisks2`. This
commit reflects that change for our purposes.
---
 nixos/modules/services/hardware/udisks2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix
index f5b641c7378..fd6d8886348 100644
--- a/nixos/modules/services/hardware/udisks2.nix
+++ b/nixos/modules/services/hardware/udisks2.nix
@@ -46,7 +46,7 @@ with lib;
       serviceConfig = {
         Type = "dbus";
         BusName = "org.freedesktop.UDisks2";
-        ExecStart = "${pkgs.udisks2}/lib/udisks2/udisksd --no-debug";
+        ExecStart = "${pkgs.udisks2}/libexec/udisks2/udisksd --no-debug";
       };
     };
   };

From df4fb819beea9d3cf431ec6f12cbb8ec04c8bd37 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 5 Jul 2015 20:55:12 +0200
Subject: [PATCH 1892/2322] ghc: add release candidate 2 for compiler version
 7.10.2

---
 pkgs/development/compilers/ghc/7.10.2.nix | 56 +++++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix       |  7 +++
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/development/compilers/ghc/7.10.2.nix

diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix
new file mode 100644
index 00000000000..df951271a31
--- /dev/null
+++ b/pkgs/development/compilers/ghc/7.10.2.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv }:
+
+let
+
+  buildMK = ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib"
+    ${stdenv.lib.optionalString stdenv.isDarwin ''
+      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
+      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
+    ''}
+  '';
+
+in
+
+stdenv.mkDerivation rec {
+  version = "7.10.1.20150630";
+  name = "ghc-${version}";
+
+  src = fetchurl {
+    url = "https://downloads.haskell.org/~ghc/7.10.2-rc2/${name}-src.tar.xz";
+    sha256 = "1wxf7jkkgpvvrg3q311c4rca4vsxrqrmnrqg4j4klgj445yj82gb";
+  };
+
+  buildInputs = [ ghc perl ];
+
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+    echo >mk/build.mk "${buildMK}"
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    export NIX_LDFLAGS+=" -no_dtrace_dof"
+  '';
+
+  configureFlags = [
+    "--with-gcc=${stdenv.cc}/bin/cc"
+    "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib"
+  ];
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
+
+  meta = {
+    homepage = "http://haskell.org/ghc";
+    description = "The Glasgow Haskell Compiler";
+    maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
+    inherit (ghc.meta) license platforms;
+  };
+
+}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6b37718afea..8ffa3ce8ebf 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -34,6 +34,9 @@ rec {
     ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix ({ ghc = compiler.ghc784; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
       libiconv = pkgs.darwin.libiconv;
     });
+    ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix ({ ghc = compiler.ghc784; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+      libiconv = pkgs.darwin.libiconv;
+    });
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
       libiconv = pkgs.darwin.libiconv;
     });
@@ -84,6 +87,10 @@ rec {
       ghc = compiler.ghc7101;
       packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
     };
+    ghc7102 = callPackage ../development/haskell-modules {
+      ghc = compiler.ghc7102;
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
+    };
     ghcHEAD = callPackage ../development/haskell-modules {
       ghc = compiler.ghcHEAD;
       packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };

From a87c9af0806aa68974d35cf007d9c1e03a61ed7e Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Sun, 5 Jul 2015 12:00:08 -0700
Subject: [PATCH 1893/2322] fix some double applications of callPackage

---
 pkgs/top-level/all-packages.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac89fafa619..0126504a330 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1172,19 +1172,23 @@ let
 
   cron = callPackage ../tools/system/cron { };
 
-  cudatoolkit5 = callPackage ../development/compilers/cudatoolkit/5.5.nix {
+  cudatoolkit5 = import ../development/compilers/cudatoolkit/5.5.nix {
+    inherit callPackage;
     python = python26;
   };
 
-  cudatoolkit6 = callPackage ../development/compilers/cudatoolkit/6.0.nix {
+  cudatoolkit6 = import ../development/compilers/cudatoolkit/6.0.nix {
+    inherit callPackage;
     python = python26;
   };
 
-  cudatoolkit65 = callPackage ../development/compilers/cudatoolkit/6.5.nix {
+  cudatoolkit65 = import ../development/compilers/cudatoolkit/6.5.nix {
+    inherit callPackage;
     python = python26;
   };
 
-  cudatoolkit7 = callPackage ../development/compilers/cudatoolkit/7.0.nix {
+  cudatoolkit7 = import ../development/compilers/cudatoolkit/7.0.nix {
+    inherit callPackage;
     python = python26;
   };
 
@@ -6091,10 +6095,10 @@ let
 
   fcgi = callPackage ../development/libraries/fcgi { };
 
-  ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { };
-  ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { };
-  ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { };
-  ffmpeg_2_6 = callPackage ../development/libraries/ffmpeg/2.6.nix { };
+  ffmpeg_0_10 = import ../development/libraries/ffmpeg/0.10.nix { inherit callPackage; };
+  ffmpeg_1_2 = import ../development/libraries/ffmpeg/1.2.nix { inherit callPackage; };
+  ffmpeg_2_2 = import ../development/libraries/ffmpeg/2.2.nix { inherit callPackage; };
+  ffmpeg_2_6 = import ../development/libraries/ffmpeg/2.6.nix { inherit callPackage; };
   # Aliases
   ffmpeg_0 = ffmpeg_0_10;
   ffmpeg_1 = ffmpeg_1_2;

From dfea5f25a6a3b67fdde561d3921d4791425e1752 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 25 Jun 2015 13:31:25 +0200
Subject: [PATCH 1894/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/77076157d19d39cebf9fabdf6ca00dc9b3b5e6d9
 with hackage2nix revision 4a9eb87332b3005c00d9b695b1365e675b614e65

---
 .../haskell-modules/hackage-packages.nix      | 2030 +++++++++++------
 1 file changed, 1362 insertions(+), 668 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2bf10c605af..a8e23065aef 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1547,6 +1547,7 @@ self: {
          hscolour lens mtl pandoc pandoc-citeproc pandoc-types parsec
          process split strict temporary transformers
        ];
+       jailbreak = true;
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
@@ -1567,6 +1568,7 @@ self: {
          base BlogLiterately containers diagrams-builder diagrams-lib
          diagrams-rasterific directory filepath JuicyPixels pandoc safe
        ];
+       jailbreak = true;
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2300,13 +2302,12 @@ self: {
      }:
      mkDerivation {
        pname = "Chart";
-       version = "1.4";
-       sha256 = "1pcrbsxv9n9285ihvir62znm2rqfjk913fiv1q5c8ijgjzicfnl2";
+       version = "1.5";
+       sha256 = "1h40322g9nj8hlya6iw9dgvvgzbq816v36vm2vz0lii586j0nqyx";
        buildDepends = [
          array base colour data-default-class lens mtl old-locale
          operational time vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "A library for generating 2D Charts and Plots";
        license = stdenv.lib.licenses.bsd3;
@@ -2318,34 +2319,33 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-cairo";
-       version = "1.4";
-       sha256 = "1s407l8mnczkah708ajpp9mvra3yp2ajyczl0gf8bgd9fq23dp4f";
+       version = "1.5";
+       sha256 = "19p4fg12r91jhhifwlda6rqm2bm0x6bz2fv3dqr2ni1y3cz7v56c";
        buildDepends = [
          array base cairo Chart colour data-default-class lens mtl
          old-locale operational time
        ];
-       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Cairo backend for Charts";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "Chart-diagrams" = callPackage
-    ({ mkDerivation, base, blaze-svg, bytestring, Chart, colour
+    ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour
      , containers, data-default-class, diagrams-core, diagrams-lib
-     , diagrams-postscript, diagrams-svg, lens, mtl, old-locale
-     , operational, SVGFonts, text, time
+     , diagrams-postscript, diagrams-svg, lens, lucid-svg, mtl
+     , old-locale, operational, SVGFonts, text, time
      }:
      mkDerivation {
        pname = "Chart-diagrams";
-       version = "1.4";
-       sha256 = "0qg8kva68394zdd8h0p8zkyjwnl2i6avl2ybr96kqr76iyh3x28k";
+       version = "1.5";
+       sha256 = "1i6l6gvy4vlw98b2r5wr5c7dzp01jwca6c5y0pgq663fnp1pwjph";
        buildDepends = [
-         base blaze-svg bytestring Chart colour containers
+         base blaze-markup bytestring Chart colour containers
          data-default-class diagrams-core diagrams-lib diagrams-postscript
-         diagrams-svg lens mtl old-locale operational SVGFonts text time
+         diagrams-svg lens lucid-svg mtl old-locale operational SVGFonts
+         text time
        ];
-       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Diagrams backend for Charts";
        license = stdenv.lib.licenses.bsd3;
@@ -2358,8 +2358,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-gtk";
-       version = "1.4";
-       sha256 = "1ig132jv3djwnd7lnizbxkwj3f1ngaj775j10vbb1dbq8x8bi2hy";
+       version = "1.5";
+       sha256 = "1iwr31ri4f24yxnmg101y30sg3a03nrmp5nr2id2r471c0f4x2gy";
        buildDepends = [
          array base cairo Chart Chart-cairo colour data-default-class gtk
          mtl old-locale time
@@ -2524,14 +2524,17 @@ self: {
      }) {};
 
   "ClustalParser" = callPackage
-    ({ mkDerivation, base, cmdargs, parsec }:
+    ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec
+     , vector
+     }:
      mkDerivation {
        pname = "ClustalParser";
-       version = "1.0.3";
-       sha256 = "148ibig9nlv6n4qqwch2hqikbhwhkhi2hw4f0xwkvmj3vd3ag8s2";
+       version = "1.1.2";
+       sha256 = "03bkhffbzypcrcssa8hhy23rwxjg5b3qf0j1xwssqar34lp465vi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base cmdargs parsec ];
+       buildDepends = [ base cmdargs either-unwrap parsec vector ];
+       testDepends = [ base hspec parsec ];
        description = "Libary for parsing Clustal tools output";
        license = "GPL";
      }) {};
@@ -3089,6 +3092,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "DCFL" = callPackage
+    ({ mkDerivation, base, HUnit, random }:
+     mkDerivation {
+       pname = "DCFL";
+       version = "0.1.0.0";
+       sha256 = "0nq2nihvgn84ijd9y41a42wl05wwqb70k1r63yfbm6qbmlzw6vns";
+       buildDepends = [ base HUnit random ];
+       jailbreak = true;
+       homepage = "https://github.com/Poincare/DCFL";
+       description = "Communication Free Learning-based constraint solver";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "DMuCheck" = callPackage
     ({ mkDerivation, base, binary, directory, distributed-process
      , distributed-process-simplelocalnet, hint, MuCheck
@@ -3979,16 +3995,16 @@ self: {
      }) {};
 
   "Earley" = callPackage
-    ({ mkDerivation, base, containers, ListLike, tasty, tasty-hunit
+    ({ mkDerivation, base, ListLike, tasty, tasty-hunit
      , tasty-quickcheck, unordered-containers
      }:
      mkDerivation {
        pname = "Earley";
-       version = "0.8.1";
-       sha256 = "0bzm6pwim3fv0d1fv6k3078661vlpc0pcrds4ywsqvgc4hd91myk";
+       version = "0.8.3";
+       sha256 = "0czdpgyxw3n0603hmd8kl8dnz9800df1lnkkf8a95cjd8nx3k8fv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers ListLike unordered-containers ];
+       buildDepends = [ base ListLike unordered-containers ];
        testDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
@@ -4923,6 +4939,24 @@ self: {
        license = "LGPL";
      }) {};
 
+  "Frames" = callPackage
+    ({ mkDerivation, base, ghc-prim, pipes, primitive, readable
+     , template-haskell, text, transformers, vector, vinyl
+     }:
+     mkDerivation {
+       pname = "Frames";
+       version = "0.1.0.0";
+       sha256 = "1c154mv72nc81qghz3fmcymh2zlixpqhafibdmh0vl4srf0jzqcr";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base ghc-prim pipes primitive readable template-haskell text
+         transformers vector vinyl
+       ];
+       description = "Data frames For working with tabular data files";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Frank" = callPackage
     ({ mkDerivation, base, mtl, newtype, she, void }:
      mkDerivation {
@@ -5483,8 +5517,8 @@ self: {
     ({ mkDerivation, base, directory, extra, old-time, process }:
      mkDerivation {
        pname = "GiveYouAHead";
-       version = "0.2.2.0";
-       sha256 = "0qq2kiv9rbch4ps9hsxic9ip0c8z92i0v7hq6vc49hmizdj136ch";
+       version = "0.2.2.3";
+       sha256 = "10f9yl62gwnjmb0mbfffdzhwscpwpvq9gj52zsrz8w6z6sbkijbf";
        buildDepends = [ base directory extra old-time process ];
        homepage = "https://github.com/Qinka/GiveYouAHead/";
        description = "to auto-do somethings";
@@ -8631,18 +8665,17 @@ self: {
      }:
      mkDerivation {
        pname = "IPv6Addr";
-       version = "0.6.0.1";
-       sha256 = "199pgv4y3932i585ak4sa78zvy1w49699lcs18836brvy10b2ch0";
+       version = "0.6.0.2";
+       sha256 = "0qzrida38n92ngrrnmjpdg3vinjjscijz8fsfr7lyffaw55k6pld";
        buildDepends = [
          attoparsec base iproute network network-info random text
        ];
        testDepends = [
          base HUnit test-framework test-framework-hunit text
        ];
-       jailbreak = true;
        homepage = "https://github.com/MichelBoucey/IPv6Addr";
        description = "Library to deal with IPv6 address text representations";
-       license = stdenv.lib.licenses.gpl3;
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "IcoGrid" = callPackage
@@ -13380,10 +13413,8 @@ self: {
      }:
      mkDerivation {
        pname = "SciFlow";
-       version = "0.1.0";
-       revision = "2";
-       sha256 = "0r87hzdpzbmwmh9dg0pnfrbnr1g3x67mgh9f2l96n8mjq7r0sipd";
-       editedCabalFile = "52e1139eb94d0223f664010e71f334a9c04a3e94c4bfbbd7c66069dc931242da";
+       version = "0.2.0";
+       sha256 = "1cvh5c5mj5jy02ky2hjkf7bkjy9wx2187dmf9d71wby9ymklg8ng";
        buildDepends = [
          base bytestring data-default-class mtl shelly template-haskell text
          unordered-containers yaml
@@ -13922,23 +13953,25 @@ self: {
   "Spock" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , case-insensitive, containers, directory, hashable, hspec
-     , hspec-wai, http-types, monad-control, mtl, old-locale
-     , path-pieces, random, reroute, resource-pool, resourcet, stm, text
-     , time, transformers, transformers-base, unordered-containers
-     , vault, wai, wai-extra, warp
+     , hspec-wai, http-types, list-t, monad-control, mtl, old-locale
+     , path-pieces, random, reroute, resource-pool, resourcet, stm
+     , stm-containers, text, time, transformers, transformers-base
+     , unordered-containers, vault, wai, wai-extra, warp
      }:
      mkDerivation {
        pname = "Spock";
-       version = "0.7.9.0";
-       sha256 = "1dlpirivgiqihj9fxvm8yry7d3yiprjn85fbl1w6dqvq4fdsjv9x";
+       version = "0.7.10.0";
+       sha256 = "0agis3cy6ijynbzgwyc2wd08db16yz0qhcjj41l6d7a6804ns8nj";
        buildDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
-         directory hashable http-types monad-control mtl old-locale
-         path-pieces random reroute resource-pool resourcet stm text time
-         transformers transformers-base unordered-containers vault wai
-         wai-extra warp
+         directory hashable http-types list-t monad-control mtl old-locale
+         path-pieces random reroute resource-pool resourcet stm
+         stm-containers text time transformers transformers-base
+         unordered-containers vault wai wai-extra warp
+       ];
+       testDepends = [
+         base hspec hspec-wai http-types reroute stm text wai
        ];
-       testDepends = [ base hspec hspec-wai http-types reroute text wai ];
        homepage = "http://www.spock.li";
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
@@ -15140,14 +15173,13 @@ self: {
      }) {};
 
   "ViennaRNAParser" = callPackage
-    ({ mkDerivation, base, parsec }:
+    ({ mkDerivation, base, hspec, parsec, process }:
      mkDerivation {
        pname = "ViennaRNAParser";
-       version = "1.0.1";
-       revision = "2";
-       sha256 = "0j4vcbbw0f1khrqna33b1dfs4fadfk53arsj8ndjzcwp0za58ji0";
-       editedCabalFile = "312de9a09fbd46cd8785a4761d369ddd022b2589096b857cafa0b4ee610426e0";
-       buildDepends = [ base parsec ];
+       version = "1.2.2";
+       sha256 = "19ck0rgf4zxvk11zhfd0sbvjqln11cg4bzfp5z8zbqdnywhiqinw";
+       buildDepends = [ base parsec process ];
+       testDepends = [ base hspec parsec ];
        description = "Libary for parsing ViennaRNA package output";
        license = "GPL";
      }) {};
@@ -15978,6 +16010,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Yampa-core" = callPackage
+    ({ mkDerivation, base, deepseq, random, vector-space }:
+     mkDerivation {
+       pname = "Yampa-core";
+       version = "0.2.0";
+       sha256 = "06mgmnj8zsnfzg3li3nw4a5lmiz0jkc4hxzilwhh1r84qiki72xp";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base deepseq random vector-space ];
+       testDepends = [ base ];
+       homepage = "https://github.com/ony/Yampa-core";
+       description = "Library for programming hybrid systems";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "YampaSynth" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, HCodecs
      , Yampa
@@ -16202,8 +16249,8 @@ self: {
     ({ mkDerivation, base, parsec, prettify, process, semigroups }:
      mkDerivation {
        pname = "abcnotation";
-       version = "1.8.1";
-       sha256 = "18qb8qdlfi3r8vv8aagsz65iv2clyj9lzn0q29m4gpvzgncsn22n";
+       version = "1.9.0";
+       sha256 = "0vmpgdqasnhj0fbb5wl7ikxmp6kzrlnbixp2yj4x93mh8vrrsk40";
        buildDepends = [ base parsec prettify process semigroups ];
        description = "Haskell representation and parser for ABC notation";
        license = stdenv.lib.licenses.bsd3;
@@ -16734,6 +16781,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "acme-flipping-tables" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "acme-flipping-tables";
+       version = "0";
+       sha256 = "1xl5gwc67acg47fdkgrn7sjvvvnc4sjf5vifph0jb3c7gv93n757";
+       buildDepends = [ base ];
+       homepage = "http://github.com/jystic/acme-flipping-tables";
+       description = "Stop execution with rage";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "acme-hq9plus" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -17943,8 +18002,8 @@ self: {
     ({ mkDerivation, array, base, containers, mtl, random, vector }:
      mkDerivation {
        pname = "aivika";
-       version = "4.1";
-       sha256 = "1w7xj3yjhdgldd1x1cfz7allsxycq0kcdpx46idl665dss2mvj5r";
+       version = "4.1.1";
+       sha256 = "1sxrd9qip3vwq0sxbbm1f5fa5g41xj0raszzv2agag80qyph3ayj";
        buildDepends = [ array base containers mtl random vector ];
        homepage = "http://github.com/dsorokin/aivika";
        description = "A multi-paradigm simulation library";
@@ -18062,8 +18121,8 @@ self: {
     ({ mkDerivation, base, c2hs, mtl, openal }:
      mkDerivation {
        pname = "al";
-       version = "0.1.3.2";
-       sha256 = "0hjxcgblzcx4nfckyr7p0lfxr5csx5d96gcrbrmh0fbdddz1nqpc";
+       version = "0.1.4";
+       sha256 = "1jr707fhsl1jvjidaznxj7xsi6br2v7gzckfhvcrmicd4i98yg1q";
        buildDepends = [ base mtl ];
        buildTools = [ c2hs ];
        pkgconfigDepends = [ openal ];
@@ -19429,6 +19488,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "android-lint-summary" = callPackage
+    ({ mkDerivation, base, basic-prelude, data-default, directory
+     , filemanip, hspec, hxt, lens, mtl, optparse-applicative
+     , QuickCheck, rainbow, stringable, terminal-size, text
+     }:
+     mkDerivation {
+       pname = "android-lint-summary";
+       version = "0.2.1";
+       sha256 = "1sk2mfxfbj6bbsff89jch1x7rhag2yv5331qhal50qf1q7fvzgx1";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base basic-prelude data-default directory filemanip hxt lens mtl
+         optparse-applicative rainbow stringable terminal-size text
+       ];
+       testDepends = [
+         base basic-prelude directory hspec hxt QuickCheck stringable
+       ];
+       homepage = "https://github.com/passy/android-lint-summary";
+       description = "A pretty printer for Android Lint errors";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "angel" = callPackage
     ({ mkDerivation, base, configurator, containers, hspec, mtl
      , old-locale, optparse-applicative, process, stm, text, time
@@ -19437,7 +19519,9 @@ self: {
      mkDerivation {
        pname = "angel";
        version = "0.6.1";
+       revision = "1";
        sha256 = "1wkllv4ziggj3smhghdk5qsgccds9d69rhx1gi079ph7z533w2dc";
+       editedCabalFile = "05dc467ec31281499d5902a77b957243d03ff87e0e4b51aaaa78306049560f28";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -20062,6 +20146,7 @@ self: {
          apiary base bytestring data-default-class filepath Glob parsec
          purescript text transformers types-compat unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/apiary";
        description = "purescript compiler for apiary web framework";
        license = stdenv.lib.licenses.mit;
@@ -20153,9 +20238,9 @@ self: {
      mkDerivation {
        pname = "app-lens";
        version = "0.1.0.0";
-       revision = "1";
+       revision = "2";
        sha256 = "0gizjnc7x1ggryfrm4d87xiyjz9yw6c5y3zp23x40bgmw49zl318";
-       editedCabalFile = "a143bd5aec7a06285e0ef56e76f31e0d8b69f277da57ce4d88a7688355ca86a6";
+       editedCabalFile = "29d9e8cabf54f27b1ccf007530fe698c0895c0bb6a2a6da50b71fafd4c27bd6d";
        buildDepends = [ base containers lens mtl ];
        jailbreak = true;
        homepage = "https://bitbucket.org/kztk/app-lens";
@@ -20668,18 +20753,18 @@ self: {
      }) {};
 
   "arithmoi" = callPackage
-    ({ mkDerivation, array, base, containers, ghc-prim, integer-gmp
-     , mtl, random
+    ({ mkDerivation, array, base, containers, ghc-prim, hspec
+     , integer-gmp, mtl, random
      }:
      mkDerivation {
        pname = "arithmoi";
-       version = "0.4.1.2";
-       sha256 = "0i0cndldf426cc8dv6swqfnljv9lgba9vp1ac4xk0vdbmbwqan9m";
+       version = "0.4.1.3";
+       sha256 = "1j8k0hqg5ddglw9lpbp3qg81s1g01sil1grizlrqfgwx0wj3jqif";
        buildDepends = [
          array base containers ghc-prim integer-gmp mtl random
        ];
+       testDepends = [ base hspec ];
        configureFlags = [ "-f-llvm" ];
-       jailbreak = true;
        homepage = "https://github.com/cartazio/arithmoi";
        description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
        license = stdenv.lib.licenses.mit;
@@ -22055,18 +22140,19 @@ self: {
      }) {};
 
   "autonix-deps" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, containers, errors
-     , filepath, lens, libarchive-conduit, mtl, optparse-applicative
-     , process, regex-tdfa, resourcet, transformers, xml
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, conduit
+     , containers, errors, filepath, lens, libarchive-conduit, mtl
+     , optparse-applicative, process, regex-tdfa, resourcet, semigroups
+     , text, transformers, xml
      }:
      mkDerivation {
        pname = "autonix-deps";
-       version = "0.2.0.0";
-       sha256 = "067q10wdzzv2xv2yak15bxysc935ghgrsm5nq90pfmzmwcv3323a";
+       version = "0.3.0.0";
+       sha256 = "0mp2v6wdm4nlagg3z9xmxd9dfkchazgvbgdphm1nfqzkg8w7ralv";
        buildDepends = [
-         base bytestring conduit containers errors filepath lens
-         libarchive-conduit mtl optparse-applicative process regex-tdfa
-         resourcet transformers xml
+         aeson aeson-pretty base bytestring conduit containers errors
+         filepath lens libarchive-conduit mtl optparse-applicative process
+         regex-tdfa resourcet semigroups text transformers xml
        ];
        description = "Library for Nix expression dependency generation";
        license = stdenv.lib.licenses.bsd3;
@@ -22074,17 +22160,17 @@ self: {
 
   "autonix-deps-kf5" = callPackage
     ({ mkDerivation, autonix-deps, base, bytestring, conduit
-     , containers, filepath, lens, mtl, transformers
+     , containers, filepath, lens, mtl, text, transformers
      }:
      mkDerivation {
        pname = "autonix-deps-kf5";
-       version = "0.2.0.1";
-       sha256 = "11azj8cl5g8fz0bzdh1z1alv9ljdzhgvkb8qr5y0dfsjbbyhz5v0";
+       version = "0.3.0.0";
+       sha256 = "0njmgx2x6018ca1r2xvbi3pq0rigqm4fjkk33q5kzacvmv5ni461";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          autonix-deps base bytestring conduit containers filepath lens mtl
-         transformers
+         text transformers
        ];
        description = "Generate dependencies for KDE 5 Nix expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -22121,10 +22207,11 @@ self: {
     ({ mkDerivation, base, semigroups, vector-space }:
      mkDerivation {
        pname = "average";
-       version = "0.6";
-       sha256 = "0ag2jxhxap8wzdlb23zvly5y09k6kh134rwdxq6dqxlqwfwhsyc9";
+       version = "0.6.1";
+       revision = "1";
+       sha256 = "13qkgkwdcb09s69wzhd3b6dl1nm66lv2hqb51gmr4s64ylgf0a9h";
+       editedCabalFile = "90c8c1d4ece76a1f1b43f1a6bef7ba15340a2bec8e2efbb465884d6b50b5d174";
        buildDepends = [ base semigroups vector-space ];
-       jailbreak = true;
        description = "An average (arithmetic mean) monoid";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22152,6 +22239,7 @@ self: {
          rethinkdb-client-driver scrypt stm text time unordered-containers
          vector
        ];
+       jailbreak = true;
        description = "empty";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22308,8 +22396,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-dynamodb-conduit";
-       version = "0.1.0.5";
-       sha256 = "1s1dxk0489vnb0v6kr0b74265cc0ih84pm80ajg8111blabx8kgf";
+       version = "0.1.0.6";
+       sha256 = "15svx7c8nld8bgwqwy5mwkbniz4c1ifw2rw427gwk7y2py1hq38p";
        buildDepends = [
          aeson attoparsec-trans aws base bytestring conduit containers
          http-conduit http-types json-togo resourcet text transformers
@@ -23298,8 +23386,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, hspec }:
      mkDerivation {
        pname = "base-orphans";
-       version = "0.3.3";
-       sha256 = "1z1xjlk056lfs4na430zw8ckc3b0k5hfn1i0i46i8ny40w8r85pk";
+       version = "0.4.0";
+       sha256 = "06knj296mkhbmfr0b12pfvhzr0bk8p1avabh1llwmx67nnn41r5i";
        buildDepends = [ base ghc-prim ];
        testDepends = [ base hspec ];
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
@@ -26417,8 +26505,8 @@ self: {
      }:
      mkDerivation {
        pname = "blaze-textual";
-       version = "0.2.0.9";
-       sha256 = "1gwy1pjnc2ikxfxn9c751rnydry1hmlfk13k29xnns9vwglf81f0";
+       version = "0.2.1.0";
+       sha256 = "0bbcykkrlgdb6jaz72njriq9if6bzsx52jn26k093f5sn1d7jhhh";
        buildDepends = [
          base blaze-builder bytestring ghc-prim integer-gmp old-locale text
          time vector
@@ -26604,6 +26692,45 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "blubber" = callPackage
+    ({ mkDerivation, base, blubber-server, bytestring, cereal
+     , containers, gloss, network, unix
+     }:
+     mkDerivation {
+       pname = "blubber";
+       version = "0.0.1";
+       sha256 = "0bc30pw6gvw7i6gh58hhkgx2j432zlh2wh4d41abnkjqygifsxsd";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base blubber-server bytestring cereal containers gloss network unix
+       ];
+       homepage = "https://secure.plaimi.net/games/blubber.html";
+       description = "The blubber client; connects to the blubber server";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
+  "blubber-server" = callPackage
+    ({ mkDerivation, base, Cabal, cereal, containers
+     , data-default-class, network, pandoc, process, random, scotty
+     , text, transformers, unix
+     }:
+     mkDerivation {
+       pname = "blubber-server";
+       version = "0.0.1";
+       sha256 = "12f594sl2c2hrxr95bpv911x0bdfpmaflp29mhw2yln2vh64nhj5";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base Cabal cereal containers data-default-class network pandoc
+         process random scotty text transformers unix
+       ];
+       jailbreak = true;
+       homepage = "https://secure.plaimi.net/games/blubber.html";
+       description = "The blubber server, serves blubber clients";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "bluetile" = callPackage
     ({ mkDerivation, base, ConfigFile, containers, directory, filepath
      , glade, gtk, mtl, process, random, regex-compat, unix, utf8-string
@@ -27564,8 +27691,8 @@ self: {
      }:
      mkDerivation {
        pname = "bustle";
-       version = "0.5.0";
-       sha256 = "0wj3abvkpalr40zyqwxi2bwgrfzmnjjg7y577qj2fzv8l5bl2mn0";
+       version = "0.5.1";
+       sha256 = "1mj8zxwjbp35pdslnssb9hz6mr3wapslfr3g265s5gk9kn8iqq06";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -29658,8 +29785,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "2.3.0.0";
-       sha256 = "0znzn73c6cc7jyj460djlhzydkw9jqxhjm62kiz5pv2j7bvpv7aw";
+       version = "2.3.0.1";
+       sha256 = "1a1644lwzarfcjgnhzyi7lp0xhxmzm80h6nini6bcgkm4g4c9h4q";
        buildDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear vector vector-binary-instances
@@ -29693,8 +29820,8 @@ self: {
     ({ mkDerivation, base, casadi, casadi-bindings-internal, vector }:
      mkDerivation {
        pname = "casadi-bindings-core";
-       version = "2.3.0.0";
-       sha256 = "1n892agqknwjs2paszafp6b1xgiz8zfmlxqb2wm0d99487175lcv";
+       version = "2.3.0.1";
+       sha256 = "0agzm3bqb3fii626m40684g7hahj2mhv60xx0smhw78z978cqw57";
        buildDepends = [ base casadi-bindings-internal vector ];
        pkgconfigDepends = [ casadi ];
        description = "autogenerated low level bindings to casadi";
@@ -30136,8 +30263,8 @@ self: {
      }:
      mkDerivation {
        pname = "cblrepo";
-       version = "0.17.0";
-       sha256 = "1q9x31aahm8sr8lnrcdavy2lzi46qh12q3k10hprq7lr3w41ls7d";
+       version = "0.17.1";
+       sha256 = "0yp2z0dpw19r6av71ghlp1pzal7276wlywsmjz5xmkggy04v1xnj";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -30577,21 +30704,20 @@ self: {
   "cgrep" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, bytestring, cmdargs
      , containers, directory, dlist, either, filepath, ghc-prim, mtl
-     , regex-posix, safe, split, stm, stringsearch, unix
+     , regex-posix, safe, split, stm, stringsearch, unix-compat
      , unordered-containers
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.4.12";
-       sha256 = "1iaq554dx21zdphmry9iarakfispv16sa7fp7pf3n764q4jznq47";
+       version = "6.4.15";
+       sha256 = "1i01a4d835yqry9xz10ch4b0522avd1cwp18gf2capmcx49rllvq";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          ansi-terminal array base bytestring cmdargs containers directory
          dlist either filepath ghc-prim mtl regex-posix safe split stm
-         stringsearch unix unordered-containers
+         stringsearch unix-compat unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://awgn.github.io/cgrep/";
        description = "Command line tool";
        license = stdenv.lib.licenses.gpl2;
@@ -30764,6 +30890,7 @@ self: {
        version = "1.0.0";
        sha256 = "130jbbbb1spkbqapxys0bqr0spq6c03x1m259alg5wxnl8xnn4w5";
        buildDepends = [ base Chart ];
+       jailbreak = true;
        description = "Easily render histograms with Chart";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31645,8 +31772,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.5.7";
-       sha256 = "0bia1yqww40prj2n6x4chvfkx05la73056mlpsgilakxwqsab2m7";
+       version = "0.5.9";
+       sha256 = "0rrxql03bdkpna0i8giz1yyq7cr829gchnijlci243aldh8jwwkb";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -31672,8 +31799,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "0.5.6";
-       sha256 = "1dgcnxzk7l7hywv1p268xrm2dfbgfgcvjs5w14vmsfxv1rfzkad0";
+       version = "0.5.8";
+       sha256 = "1cb48q96sx2zr35brc6cywv76wj3vsk24yy5j64k16j1743gh45k";
        buildDepends = [
          aeson attoparsec base bytestring clash-prelude concurrent-supply
          containers deepseq directory errors fgl filepath hashable lens mtl
@@ -31686,17 +31813,17 @@ self: {
      }) {};
 
   "clash-prelude" = callPackage
-    ({ mkDerivation, base, data-default, doctest, ghc-prim
+    ({ mkDerivation, array, base, data-default, doctest, ghc-prim
      , ghc-typelits-natnormalise, Glob, integer-gmp, lens, QuickCheck
      , singletons, template-haskell, th-lift
      }:
      mkDerivation {
        pname = "clash-prelude";
-       version = "0.8.1";
-       sha256 = "1xxjahk78a73jbavd4fwgljdsb23s44z0jdv29n6mdi86bzsn24h";
+       version = "0.9.1";
+       sha256 = "00d4ap4jfw1298g59sfywkjza33s5p5p4n2nc69anwc31lxqnss8";
        buildDepends = [
-         base data-default ghc-prim ghc-typelits-natnormalise integer-gmp
-         lens QuickCheck singletons template-haskell th-lift
+         array base data-default ghc-prim ghc-typelits-natnormalise
+         integer-gmp lens QuickCheck singletons template-haskell th-lift
        ];
        testDepends = [ base doctest Glob ];
        homepage = "http://www.clash-lang.org/";
@@ -31724,8 +31851,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-systemverilog";
-       version = "0.5.5";
-       sha256 = "1dks6saxp24xm478bgx2bkzx4qq6yv79f92z8kw6a2y29c3bjfrg";
+       version = "0.5.7";
+       sha256 = "0s8yqs4h5abamfrawfw95q9p0h8ni98pwyqr76nkvkrybxwykam5";
        buildDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -31742,8 +31869,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-verilog";
-       version = "0.5.5";
-       sha256 = "0wjnjdl9slcrxnd0vz7m6y5jhs6gcaij7f9jjrgfcljq4wmk05rf";
+       version = "0.5.7";
+       sha256 = "04wa7y108hk2bn453dwrr1x71bvxx48hivdpqxsx0gyhya14143j";
        buildDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -31759,8 +31886,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-vhdl";
-       version = "0.5.6";
-       sha256 = "02pjy1l3irn67jaqy6sp2a8cjy2sw100kssyd0nxsz9k0imjzizy";
+       version = "0.5.7.1";
+       sha256 = "1p1lmy07hfzj4wb7f68y03zvih2i8skb2sca9pqj64d6yszqmll8";
        buildDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -31808,8 +31935,8 @@ self: {
      }:
      mkDerivation {
        pname = "classy-prelude";
-       version = "0.12.0.1";
-       sha256 = "0ny5cxkzbjhhsmypsp4sjm7nm0jv2l2kysgcphm6j1l3dr0ck6il";
+       version = "0.12.1.1";
+       sha256 = "04rxmh4jzj4j5dx9i8ndh9ibn01cjdi485n1xvjngx0gs7zqa2k7";
        buildDepends = [
          base basic-prelude bifunctors bytestring chunked-data containers
          dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base
@@ -31832,8 +31959,8 @@ self: {
      }:
      mkDerivation {
        pname = "classy-prelude-conduit";
-       version = "0.12.0";
-       sha256 = "0sby5lbk16f7q3dd3qisv67m1bsgx9v99iwb95crbql3ghi99za1";
+       version = "0.12.0.1";
+       sha256 = "1xv20i31f1za88kkdd00vin9shn9zxhqmwd0ln62cag4xfrmh9xi";
        buildDepends = [
          base bytestring classy-prelude conduit conduit-combinators
          monad-control resourcet transformers void
@@ -31853,8 +31980,8 @@ self: {
      }:
      mkDerivation {
        pname = "classy-prelude-yesod";
-       version = "0.12.0";
-       sha256 = "00w932g8pcv76qd16fjr93vaipnr02p3m5j8zhyqy1w9frc6pnqx";
+       version = "0.12.0.1";
+       sha256 = "00pzlsbsdajzdlna1flrdd1lb98g0vx2b9757m8kfa37h6l443r2";
        buildDepends = [
          aeson base classy-prelude classy-prelude-conduit data-default
          http-conduit http-types persistent yesod yesod-newsfeed
@@ -32337,12 +32464,13 @@ self: {
      }) {};
 
   "clock" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, tasty, tasty-quickcheck }:
      mkDerivation {
        pname = "clock";
-       version = "0.4.6.0";
-       sha256 = "0xrkw13dixj5pv79l10bl0z51kmplbkg30rhbykzx2imvv9rxixr";
+       version = "0.5.1";
+       sha256 = "1ncph7vi2q6ywwc8ysxl1ibw6i5dwfvln88ssfazk8jgpj4iyykw";
        buildDepends = [ base ];
+       testDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/corsis/clock";
        description = "High-resolution clock functions: monotonic, realtime, cputime";
        license = stdenv.lib.licenses.bsd3;
@@ -32535,8 +32663,8 @@ self: {
      }:
      mkDerivation {
        pname = "clustering";
-       version = "0.2.0";
-       sha256 = "0w4glyq1f5ksdjbicq8b0vy0dvnxz6h44dp5iza6gignmxi703as";
+       version = "0.2.1";
+       sha256 = "1jxrgb13zm8bqcsx39fp31lrpna3y0pn7ckcf9q6gljz327c4y2h";
        buildDepends = [
          base binary containers matrices mwc-random parallel primitive
          vector
@@ -33015,23 +33143,24 @@ self: {
   "coinbase-exchange" = callPackage
     ({ mkDerivation, aeson, aeson-casing, base, base64-bytestring
      , byteable, bytestring, conduit, conduit-extra, cryptohash, deepseq
-     , hashable, http-client, http-client-tls, http-conduit, http-types
-     , mtl, network, old-locale, resourcet, scientific, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-th, text, time, transformers
-     , transformers-base, uuid, uuid-aeson, vector, websockets, wuss
+     , exceptions, hashable, http-client, http-client-tls, http-conduit
+     , http-types, mtl, network, old-locale, resourcet, scientific
+     , tasty, tasty-hunit, tasty-quickcheck, tasty-th, text, time
+     , transformers, transformers-base, uuid, uuid-aeson, vector
+     , websockets, wuss
      }:
      mkDerivation {
        pname = "coinbase-exchange";
-       version = "0.2.0.0";
-       sha256 = "1x9cgdj38z1zhrx464rj3qhh8rxqs98mfpqfsnn5yill037p1ig8";
+       version = "0.2.0.2";
+       sha256 = "0mh95pfzdvfqy1frwsqi9fi1wgs1nk1xkzijh1pyjm2paqxzynn2";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson aeson-casing base base64-bytestring byteable bytestring
-         conduit conduit-extra cryptohash deepseq hashable http-client
-         http-client-tls http-conduit http-types mtl network old-locale
-         resourcet scientific text time transformers transformers-base uuid
-         uuid-aeson vector websockets wuss
+         conduit conduit-extra cryptohash deepseq exceptions hashable
+         http-client http-client-tls http-conduit http-types mtl network
+         old-locale resourcet scientific text time transformers
+         transformers-base uuid uuid-aeson vector websockets wuss
        ];
        testDepends = [
          base bytestring http-client-tls http-conduit old-locale tasty
@@ -33779,8 +33908,8 @@ self: {
     ({ mkDerivation, base, contravariant }:
      mkDerivation {
        pname = "composition-extra";
-       version = "1.0.0.1";
-       sha256 = "0i7jzn3grc23nhnp1i4ppbh30nq8pvfn35vz2vdfsivmaa5fnp5v";
+       version = "1.1.0";
+       sha256 = "1mkm0m08g9q6d8vfz33kj5lz0gnwlkmsnj4r5ar4p3slf2kaybz1";
        buildDepends = [ base contravariant ];
        description = "Combinators for unorthodox structure composition";
        license = stdenv.lib.licenses.bsd3;
@@ -35875,10 +36004,9 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "counter";
-       version = "0.1.0.0";
-       sha256 = "1wqbk40izzb6wfwk1qprnqgm5f9mhs2xm7pl1ks8ajv4hdpkrnik";
+       version = "0.1.0.1";
+       sha256 = "0pfg34ph6b7qb3wscvvnqdkqqzkjdjc8wynv35ikgf295bsf3kaz";
        buildDepends = [ base containers ];
-       jailbreak = true;
        homepage = "https://github.com/wei2912/counter";
        description = "An object frequency counter";
        license = stdenv.lib.licenses.mit;
@@ -36118,8 +36246,8 @@ self: {
      }:
      mkDerivation {
        pname = "cql-io";
-       version = "0.14.2";
-       sha256 = "093x4fdvc4rcklcaar49p2c9yghyr6lmmddakfbadzz18aksnq8m";
+       version = "0.14.3";
+       sha256 = "1yg1w4lbfjdj3hfsg8zvr4ajq5v0byvysmwl50355jppmxvgacrn";
        buildDepends = [
          async auto-update base bytestring containers cql cryptohash
          data-default-class exceptions hashable iproute lens monad-control
@@ -36128,7 +36256,7 @@ self: {
        ];
        homepage = "https://github.com/twittner/cql-io/";
        description = "Cassandra CQL client";
-       license = "unknown";
+       license = stdenv.lib.licenses.mpl20;
      }) {};
 
   "cqrs" = callPackage
@@ -38491,6 +38619,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-cell" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "data-cell";
+       version = "1.0.0.1";
+       sha256 = "0x8laijzcglgg5rxk4516f8qiy6825djkxjwyyk35w44ikwv1gxj";
+       buildDepends = [ base ];
+       homepage = "https://github.com/zadarnowski/data-cell";
+       description = "Generic cellular data representation library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-checked" = callPackage
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
@@ -40955,7 +41095,9 @@ self: {
      mkDerivation {
        pname = "descriptive";
        version = "0.0.2";
+       revision = "3";
        sha256 = "0jh0l4assmqsmq9ajsbdl7vn8k6srl0z27kpxwzg1v0nmkkcl48p";
+       editedCabalFile = "0aeae1dd5ab8c21ade57c1e036600b8162cd790823618a9c5894417ba68e2ea2";
        buildDepends = [
          aeson base bifunctors containers mtl text transformers
        ];
@@ -40970,8 +41112,8 @@ self: {
      }:
      mkDerivation {
        pname = "descriptive";
-       version = "0.9.3";
-       sha256 = "1kb6fca7fsg82ij6zlc85p9mfaxr3l5z45sjjcx6zvli1lknmqz0";
+       version = "0.9.4";
+       sha256 = "0bxskc4q6jzpvifnhh6zl77xic0fbni8abf9lipfr1xzarbwcpkr";
        buildDepends = [
          aeson base bifunctors containers mtl scientific text transformers
          vector
@@ -40995,6 +41137,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "deterministic-game-engine" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "deterministic-game-engine";
+       version = "0.1.0.0";
+       sha256 = "0kapl7s59ma8dmip3rd9cvcd4d8gvq0b7r9sflqs8nchs09njhr2";
+       buildDepends = [ base ];
+       testDepends = [ base hspec ];
+       homepage = "https://github.com/TGOlson/deterministic-game-engine";
+       description = "Simple deterministic game engine";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "detrospector" = callPackage
     ({ mkDerivation, base, binary, bytestring, cmdargs, containers
      , hashable, mwc-random, text, unordered-containers, zlib
@@ -41181,6 +41336,7 @@ self: {
          lucid-svg mtl split transformers
        ];
        configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41874,10 +42030,9 @@ self: {
     ({ mkDerivation, base, digestive-functors, lucid, text }:
      mkDerivation {
        pname = "digestive-functors-lucid";
-       version = "0.0.0.2";
-       sha256 = "0ijpfcvsfgb67faqh4nbjvfab8kwc70xcp27a4rdzy9rvkvvhh82";
+       version = "0.0.0.3";
+       sha256 = "1f9vlyh20b4qr7q324mxpkn7wbfp3h80il79rwqd5s5n1xx8ryhm";
        buildDepends = [ base digestive-functors lucid text ];
-       jailbreak = true;
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Lucid frontend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
@@ -41938,8 +42093,8 @@ self: {
      }:
      mkDerivation {
        pname = "digitalocean-kzs";
-       version = "0.1.0.0";
-       sha256 = "0y6n5s285aywjiwq6haxw0siy45crmkv3jj43gfx5svhgs72wfma";
+       version = "0.1.0.3";
+       sha256 = "0w1gbh84sbaab4gn9avjqmwd29rzv0b2dyxqqg22vq1da8g3bzng";
        buildDepends = [
          aeson base bytestring HTTP http-conduit http-types text
          transformers
@@ -43183,6 +43338,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dockerfile" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "dockerfile";
+       version = "0.1.0.1";
+       sha256 = "0980w0fh5xb7azknnmph6rmnzswsjw360ga5ymds2valq2vc0ji9";
+       buildDepends = [ base ];
+       testDepends = [ base hspec ];
+       description = "A simple DSL for describing and generating Dockerfile containers in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "docopt" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
      , parsec, split, template-haskell, th-lift
@@ -45003,19 +45170,19 @@ self: {
 
   "egison" = callPackage
     ({ mkDerivation, array, base, containers, directory, filepath, ghc
-     , ghc-paths, Glob, haskeline, HUnit, mtl, parsec, random
-     , regex-posix, strict-io, test-framework, test-framework-hunit
-     , text, transformers, unordered-containers
+     , ghc-paths, Glob, haskeline, HUnit, mtl, parsec, process, random
+     , regex-tdfa, test-framework, test-framework-hunit, text
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "egison";
-       version = "3.5.6";
-       sha256 = "12czzd8ncpyq13d26syb9z9qz9112irwzymja80kgahy2j55vwly";
+       version = "3.5.9";
+       sha256 = "16d3c4r72f6hv8v7zbcqwjjc1c53895kxjn1m61d2fhz8gmb8yq0";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          array base containers directory filepath ghc ghc-paths haskeline
-         mtl parsec random regex-posix strict-io text transformers
+         mtl parsec process random regex-tdfa text transformers
          unordered-containers
        ];
        testDepends = [
@@ -45023,7 +45190,7 @@ self: {
          transformers
        ];
        homepage = "http://www.egison.org";
-       description = "Programming language with non-linear pattern-matching against unfree data";
+       description = "Programming language with non-linear pattern-matching against non-free data";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -45044,17 +45211,17 @@ self: {
   "egison-tutorial" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , egison, filepath, ghc, ghc-paths, haskeline, mtl, parsec
-     , regex-posix, strict-io, transformers, unordered-containers
+     , regex-posix, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "egison-tutorial";
-       version = "3.5.1";
-       sha256 = "1an7rlk5gf80n38h29akwrnhh6d2hzvg5l2ig13rr3i2n51gjybx";
+       version = "3.5.9";
+       sha256 = "1ay9m7ibl2z19yq9pd3fwghbyki6cawg3w9x42dllncjrwxwlh4m";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          array base bytestring containers directory egison filepath ghc
-         ghc-paths haskeline mtl parsec regex-posix strict-io transformers
+         ghc-paths haskeline mtl parsec regex-posix transformers
          unordered-containers
        ];
        homepage = "http://www.egison.org";
@@ -45907,8 +46074,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io";
-       version = "1.2.7";
-       sha256 = "0giqsx1wknhp5a1dg72wl48j56h38jzc3pw6w8pfhngpc0spl3gf";
+       version = "1.2.9";
+       sha256 = "0ral95ywkni205gmn2q58fpibaf4a1y5dxawkc5rq5j0wnmh465j";
        buildDepends = [
          aeson async attoparsec base base64-bytestring bytestring either
          free monad-loops mwc-random stm stm-delay text transformers
@@ -46168,6 +46335,25 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "envy" = callPackage
+    ({ mkDerivation, base, bytestring, containers, hspec, mtl
+     , QuickCheck, quickcheck-instances, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "envy";
+       version = "0.2.0.0";
+       sha256 = "0hi9nlrr2g32f4cp3ibmdvmqmqhbyps5d9f0v7612fbxhimqrkbq";
+       buildDepends = [
+         base bytestring containers mtl text time transformers
+       ];
+       testDepends = [
+         base bytestring hspec mtl QuickCheck quickcheck-instances text time
+         transformers
+       ];
+       description = "An environmentally friendly way to deal with environment variables";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "epanet-haskell" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -46691,8 +46877,8 @@ self: {
      }:
      mkDerivation {
        pname = "esqueleto";
-       version = "2.2.6";
-       sha256 = "079yiq5idkwvcmjc75m24smyf4f0cvmy2f537v0dx8dgi6nqpr62";
+       version = "2.2.7";
+       sha256 = "1i5gm1riirz8wq2zr2a2fxlnxa7c5rrvywyigbx2gla9xi07dzs6";
        buildDepends = [
          base conduit monad-logger persistent resourcet tagged text
          transformers unordered-containers
@@ -46773,8 +46959,10 @@ self: {
      }:
      mkDerivation {
        pname = "etcd";
-       version = "1.0.4";
-       sha256 = "0s08gryqhvcjvyq3swp2p753xqny3swgni17a2pbdjq300krx8kn";
+       version = "1.0.5";
+       revision = "1";
+       sha256 = "0bqz678mnpw2jpywz2m76923cyq864xn537a9zsqhm6c80gc0vwi";
+       editedCabalFile = "5cdbbc8d2aedc68e82e7c4d0cface390c3c68fb7ee7fb162d8123e42351f98fa";
        buildDepends = [ aeson base bytestring http-conduit text time ];
        testDepends = [ async base hspec MonadRandom mtl text ];
        description = "Client for etcd, a highly-available key value store";
@@ -47185,8 +47373,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "exceptional";
-       version = "0.1.4.3";
-       sha256 = "0rhcqnpw97b9sy87nq7dqwiw8vl91h8yyix68d9sz10s9bi1xnlv";
+       version = "0.1.5.1";
+       revision = "1";
+       sha256 = "1fkz90d776z8fj8p3123ssqwxy9nmz4bgh9gn4nvg0xnvwzc069c";
+       editedCabalFile = "a79514b512d8776f9ae66a80aeb3f604ac9ae1d4c5c98fdd9ea2acc8c312adda";
        buildDepends = [ base ];
        homepage = "https://github.com/pharpend/exceptional";
        description = "Essentially the Maybe type with error messages";
@@ -47218,8 +47408,8 @@ self: {
      }:
      mkDerivation {
        pname = "executable-hash";
-       version = "0.2.0.0";
-       sha256 = "0g733akm65rjdl5mncfyhnqncan985n02vzn0z02689aq8dnav4p";
+       version = "0.2.0.2";
+       sha256 = "103s0095bb71wz3axhzw2w2nm5wfr01r9ypkdvbp22zhmq3xr1bj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -47304,15 +47494,17 @@ self: {
      }) {};
 
   "exp-pairs" = callPackage
-    ({ mkDerivation, base, ghc-prim, matrix, memoize, QuickCheck
-     , random, smallcheck, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck
+    ({ mkDerivation, base, deepseq, generic-deriving, ghc-prim, matrix
+     , memoize, QuickCheck, random, smallcheck, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, wl-pprint
      }:
      mkDerivation {
        pname = "exp-pairs";
-       version = "0.1.2.0";
-       sha256 = "0iz22m8m4pk87xnpdgklw9d6ycf8s3sblyz8g78ykyvf0bf347zs";
-       buildDepends = [ base ghc-prim memoize ];
+       version = "0.1.3.0";
+       sha256 = "033sdkfg94m33qrkw0l3lbs6dm8ssxfdj3jg3p39w63q7va2c0hr";
+       buildDepends = [
+         base deepseq generic-deriving ghc-prim memoize wl-pprint
+       ];
        testDepends = [
          base matrix memoize QuickCheck random smallcheck tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck
@@ -48104,8 +48296,8 @@ self: {
      }:
      mkDerivation {
        pname = "fay";
-       version = "0.23.1.6";
-       sha256 = "02c4lxqmgac95nr00qwwxmq5a0lf46fxjiq4nqc3r6giz2m7i9ik";
+       version = "0.23.1.7";
+       sha256 = "1yjpbbxxjz8hrqb3arcn74i9s936kr44zg2v27kxmhrin4lnrw4b";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -48916,6 +49108,7 @@ self: {
        version = "0.1.1.9";
        sha256 = "06bcj143j85p8m519zn88z6qn4bg5ifrw5pv5yva5x49gc3jq6gc";
        buildDepends = [ base bytestring clock directory zip-archive ];
+       jailbreak = true;
        homepage = "https://github.com/joelwilliamson/file-collection";
        description = "Provide a uniform interface over file archives and directories";
        license = stdenv.lib.licenses.bsd3;
@@ -48956,15 +49149,15 @@ self: {
      }) {};
 
   "file-location" = callPackage
-    ({ mkDerivation, base, containers, lifted-base, process
+    ({ mkDerivation, base, containers, HUnit, lifted-base, process
      , template-haskell, th-orphans, transformers
      }:
      mkDerivation {
        pname = "file-location";
-       version = "0.4.7.1";
-       sha256 = "0p4fj7jjsssn3bdn2z984q2wyngc6cfygbgprzndcw0bxqi78jl4";
+       version = "0.4.9";
+       sha256 = "1p0lz02pvlvq2781542ims3x5vcck35dw4g58bv16y96qarxwady";
        buildDepends = [
-         base containers lifted-base template-haskell th-orphans
+         base containers HUnit lifted-base template-haskell th-orphans
          transformers
        ];
        testDepends = [ base lifted-base process ];
@@ -49879,6 +50072,7 @@ self: {
        testDepends = [ base ];
        description = "Conversions between floating and integral values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "floatshow" = callPackage
@@ -49949,14 +50143,13 @@ self: {
      }:
      mkDerivation {
        pname = "flowdock";
-       version = "0.3.0.0";
-       sha256 = "199n32q64gw6i381kn70x5avrh3r2al1nj3f90nibivpip886zgc";
+       version = "0.3.0.1";
+       sha256 = "1az9wwdng7i3jrjwizzz3690506b3vk1m8h2b96wf59r51qnpr6i";
        buildDepends = [
          aeson base base64-bytestring bytestring http-client http-client-tls
          lens lens-action mtl network pipes pipes-aeson pipes-http
          pipes-parse template-haskell text unordered-containers uuid
        ];
-       jailbreak = true;
        homepage = "https://github.com/brewtown/hs-flowdock";
        description = "Flowdock client library for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -50071,8 +50264,8 @@ self: {
      }:
      mkDerivation {
        pname = "fluent-logger";
-       version = "0.2.3.0";
-       sha256 = "1zmkb36ki30chvjfabm1vn4xzixf8dk2y5ryy72as5c9n6xnkkkq";
+       version = "0.2.3.1";
+       sha256 = "0m97hljfrs5mh5pjbwvnw7b581y7w96qfyjr3d9p1aqbj6nsa6dp";
        buildDepends = [
          base bytestring cereal containers messagepack network
          network-socket-options random stm text time vector
@@ -50296,6 +50489,7 @@ self: {
        homepage = "http://github.com/joom/foma.hs";
        description = "Simple Haskell bindings for Foma";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { foma = null;};
 
   "font-opengl-basic4x6" = callPackage
@@ -51558,11 +51752,11 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "functor-infix";
-       version = "0.0.1";
-       sha256 = "1f8m4nxlr2il9j0ilgw91fhp6mmz5xqlhylavncqwvbcq82362dc";
+       version = "0.0.3";
+       sha256 = "1hpk1q58kwxdpva57hylpqj4ywk6grsi4ks2cqg6lspprqfi60gy";
        buildDepends = [ base template-haskell ];
        homepage = "https://github.com/fmap/functor-infix";
-       description = "Compositions of functors";
+       description = "Infix operators for mapping over compositions of functors. Lots of them.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -51833,6 +52027,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "game-of-life" = callPackage
+    ({ mkDerivation, array, base, hscurses, random, text }:
+     mkDerivation {
+       pname = "game-of-life";
+       version = "0.1.0.4";
+       sha256 = "1d2hy2bb3dgzf3bj0p97hchsznzckirgws8cjm9qh5ba5mk0wl2z";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ array base hscurses random text ];
+       jailbreak = true;
+       homepage = "http://github.com/marcusbuffett/game-of-life";
+       description = "Conway's Game of Life";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "game-probability" = callPackage
     ({ mkDerivation, base, containers, probability, random }:
      mkDerivation {
@@ -52151,6 +52360,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genders" = callPackage
+    ({ mkDerivation, base, bytestring, filepath, genders, hspec
+     , network, vector
+     }:
+     mkDerivation {
+       pname = "genders";
+       version = "0.1.0.1";
+       sha256 = "0jl1sqj9syp31qcn3x6c0pjwj5ligirsc67ahzw2chgpf09bwh8g";
+       buildDepends = [ base bytestring filepath vector ];
+       testDepends = [ base bytestring hspec network vector ];
+       extraLibraries = [ genders ];
+       description = "Bindings to libgenders";
+       license = stdenv.lib.licenses.mit;
+     }) { genders = null;};
+
   "general-prelude" = callPackage
     ({ mkDerivation, base, lens, pointless-fun, strict, system-filepath
      }:
@@ -52212,8 +52436,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-aeson";
-       version = "0.2.0.6";
-       sha256 = "13jlr9dq3d0v9f7hjxq5qxs8llhj8mbnja14xjkxc28vdbnzv62l";
+       version = "0.2.0.7";
+       sha256 = "06qczarf6vzd9wr9ad685v69hvd88zfv5lhry0zkka2bcdqc5wqz";
        buildDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
@@ -52265,8 +52489,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generic-deriving";
-       version = "1.7.0";
-       sha256 = "145bixg4jr0hhw32jznrvl4qjjk7bgjbxlfznqra1s1rnmcyr5v6";
+       version = "1.8.0";
+       sha256 = "1kc6lhdanls6kgpk8xv5xi14lz1sngcd8xn930hkf7ilq4kxkcr6";
        buildDepends = [ base ghc-prim template-haskell ];
        description = "Generic programming library for generalised deriving";
        license = stdenv.lib.licenses.bsd3;
@@ -52391,8 +52615,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-xmlpickler";
-       version = "0.1.0.2";
-       sha256 = "1nc7gi54y144ivgbv9qbyg143s4rvn4w514lgcb6z05sx7cyiajn";
+       version = "0.1.0.3";
+       sha256 = "11vbfsws5agqiv9x6pfh0z6kbvjx6i27wnp5dcjh40z4bz6bjdgy";
        buildDepends = [ base generic-deriving hxt text ];
        testDepends = [
          base hxt hxt-pickle-utils tasty tasty-hunit tasty-th
@@ -52666,20 +52890,20 @@ self: {
 
   "geojson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
-     , filepath, hlint, lens, QuickCheck, semigroups, text, transformers
-     , validation, vector
+     , filepath, hlint, lens, QuickCheck, semigroups, template-haskell
+     , text, transformers, validation, vector
      }:
      mkDerivation {
        pname = "geojson";
-       version = "1.2.0";
-       sha256 = "1i6fyqxqksq657nd3m19qk690l74j4frvsvwhbdyjs07rc0xvbli";
+       version = "1.3.0";
+       sha256 = "18fr5n3nmxlr97b7s9a5x1dx91fcg2fjfhlpxpcglkpwpkhabnqs";
        buildDepends = [
          aeson base lens semigroups text transformers validation vector
        ];
        testDepends = [
          base bytestring directory doctest filepath hlint QuickCheck
+         template-haskell
        ];
-       jailbreak = true;
        homepage = "https://github.com/domdere/hs-geojson";
        description = "A thin GeoJSON Layer above the aeson library";
        license = stdenv.lib.licenses.bsd3;
@@ -52738,8 +52962,8 @@ self: {
      }:
      mkDerivation {
        pname = "getopt-generics";
-       version = "0.7.1";
-       sha256 = "0jrnasd9lw7ffim0ski5b1mdislvs27n0i37lcbv51rgsl5wm458";
+       version = "0.7.1.1";
+       sha256 = "1zhglg3h6a6sx3chq9h6j2r279f2753j026mz8kb9v4lajj5vcn0";
        buildDepends = [
          base base-compat base-orphans generics-sop tagged
        ];
@@ -52766,31 +52990,34 @@ self: {
 
   "gf" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, Cabal, cgi
-     , containers, directory, filepath, fst, happy, haskeline, HTF
-     , httpd-shed, HUnit, json, lifted-base, mtl, network, old-locale
-     , parallel, pretty, process, random, time, time-compat, unix
-     , utf8-string
+     , containers, directory, exceptions, filepath, happy, haskeline
+     , HTF, httpd-shed, HUnit, json, lifted-base, mtl, network
+     , network-uri, old-locale, parallel, pretty, process, random
+     , terminfo, time, time-compat, unix, utf8-string
      }:
      mkDerivation {
        pname = "gf";
-       version = "3.6";
-       revision = "2";
-       sha256 = "10s8vgca36jz7b9sbd3n1in13xifwc7h42qwd58yq1lvk3j1fizx";
-       editedCabalFile = "ad294ebcd390005a243fe6d2203ec51f7ca2ab87a7f2fa7e7e080f0d416cb6a8";
+       version = "3.7";
+       sha256 = "13y01s94pq466jjzb3czxr93bdfh43mvypqp176n0zfp2v9496nb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         array base bytestring cgi containers directory filepath fst
-         haskeline httpd-shed json lifted-base mtl network old-locale
-         parallel pretty process random time time-compat unix utf8-string
+         array base bytestring cgi containers directory exceptions filepath
+         haskeline httpd-shed json lifted-base mtl network network-uri
+         old-locale parallel pretty process random terminfo time time-compat
+         unix utf8-string
        ];
        testDepends = [ base Cabal directory filepath HTF HUnit process ];
        buildTools = [ alex happy ];
-       jailbreak = true;
+       doCheck = false;
+       postPatch = ''
+         sed -i "s|\"-s\"|\"\"|" ./Setup.hs
+         sed -i "s|numJobs (bf bi)++||" ./Setup.hs
+       '';
+       preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build:$LD_LIBRARY_PATH'';
        homepage = "http://www.grammaticalframework.org/";
        description = "Grammatical Framework";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ggtsTC" = callPackage
@@ -52832,14 +53059,14 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-core-html";
-       version = "0.1.2";
-       sha256 = "1yhyi99cbnfk2a65j9v6hinp0rpmc341z55dvqvli1wx5c9i7gf6";
+       version = "0.1.4";
+       sha256 = "1yx22p9572zg2nvmlilbmraqjmws2x47hmin2l9xd0dnck5qhy35";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          base blaze-html bytestring containers mtl parsec process
        ];
-       homepage = "http://github.com/vincenthz/ghc-core-html";
+       homepage = "https://github.com/vincenthz/ghc-core-html";
        description = "Core to HTML display";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -54134,8 +54361,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitit";
-       version = "0.10.7";
-       sha256 = "1gj94z2c2jpdm9bkfnc6wbyhipgbss0j70ql26hn8g3fh1ykcpbj";
+       version = "0.11";
+       sha256 = "1833rxx3c28rvjz1h1nnm0h838zl941zr51r3dp89zn59rs72hn9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -54816,8 +55043,8 @@ self: {
      }:
      mkDerivation {
        pname = "glue";
-       version = "0.1.0.0";
-       sha256 = "1msdvm4a5arw4msp6km667sbvw830wsirvb0pxnjxrhnmy0h03gl";
+       version = "0.1.1.1";
+       sha256 = "1p93cv8c52dbw0lz48yjpfbrj48giyxrwmc9bymfpgjmynda4zab";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -56837,8 +57064,8 @@ self: {
     ({ mkDerivation, base, extra, GiveYouAHead }:
      mkDerivation {
        pname = "gyah-bin";
-       version = "0.2.2.0";
-       sha256 = "16yzkrn5q21nal07jlvzn84maxx94fyrn1lyljd7hazj2lkpcxvw";
+       version = "0.2.2.3";
+       sha256 = "19r2vsi5v43a3wq2vbfh2wfscmbzvcbyd1lqc2xdg4bbla9pf648";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base extra GiveYouAHead ];
@@ -58509,6 +58736,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time
        ];
+       jailbreak = true;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
@@ -58707,19 +58935,19 @@ self: {
      }) {};
 
   "halive" = callPackage
-    ({ mkDerivation, base, bin-package-db, directory, filepath
-     , foreign-store, fsnotify, ghc, ghc-paths, system-filepath
-     , transformers
+    ({ mkDerivation, base, bin-package-db, containers, directory
+     , filepath, foreign-store, fsnotify, ghc, ghc-paths
+     , system-filepath, transformers
      }:
      mkDerivation {
        pname = "halive";
-       version = "0.1.0.3";
-       sha256 = "1m2x50cpxffiywii26vl37lfi77yl7an5ln2h5anmkb3pmajdabc";
+       version = "0.1.0.5";
+       sha256 = "0rxcklxmfk6z9f3alvzszq7g5wik7x9nj43m4vvf6iw1nsjvk580";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base bin-package-db directory filepath foreign-store fsnotify ghc
-         ghc-paths system-filepath transformers
+         base bin-package-db containers directory filepath foreign-store
+         fsnotify ghc ghc-paths system-filepath transformers
        ];
        homepage = "https://github.com/lukexi/halive";
        description = "A live recompiler";
@@ -60024,8 +60252,8 @@ self: {
      }:
      mkDerivation {
        pname = "hashable";
-       version = "1.2.3.2";
-       sha256 = "0h9295pv2sgbaqlwpwbx2bap6nngm0jcdhkqham1wpjwyxqgqrlc";
+       version = "1.2.3.3";
+       sha256 = "0kp4aj0x1iicz9qirpqxxqd8x5g1njbapxk1d90n406w3xykz4pw";
        buildDepends = [ base bytestring ghc-prim integer-gmp text ];
        testDepends = [
          base bytestring ghc-prim HUnit QuickCheck random test-framework
@@ -60048,6 +60276,7 @@ self: {
          base bifunctors bytestring generic-deriving hashable transformers
        ];
        testDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "http://github.com/analytics/hashable-extras/";
        description = "Higher-rank Hashable";
        license = stdenv.lib.licenses.bsd3;
@@ -60739,8 +60968,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-names";
-       version = "0.5.2";
-       sha256 = "0dxv33facklxyy6x9a3xxwv5avfzn6jbigl7zdd2zkvrr6rnz9zf";
+       version = "0.5.3";
+       sha256 = "066mh4qgldh8nspinm97695zdhw5hkpz9mmrnc2a0y0wblggq5sm";
        buildDepends = [
          aeson base bytestring Cabal containers data-lens-light filepath
          haskell-packages haskell-src-exts hse-cpp mtl tagged transformers
@@ -63296,8 +63525,8 @@ self: {
      }:
      mkDerivation {
        pname = "hdocs";
-       version = "0.4.2.1";
-       sha256 = "01pc60nc009ww52kwjx9chjx1vpr4y120dnci61vhr2ylxls1hd4";
+       version = "0.4.3.0";
+       sha256 = "10z4aq9f3gy6cqkhz0dxp0q3rr9625hka3c4w4cbczad2qgciiil";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -64048,8 +64277,8 @@ self: {
     ({ mkDerivation, base, hspec, network-uri, text }:
      mkDerivation {
        pname = "heroku";
-       version = "0.1.2.2";
-       sha256 = "0ixsdjxp3vpgsnx2cibyk80h7yjz7cgkcd3y8ggv8789s9bc4i77";
+       version = "0.1.2.3";
+       sha256 = "1gldsdpnmj7ljrmyvjfwqdmhhml2yp27icl2qqj9pz42pllq4x2k";
        buildDepends = [ base network-uri text ];
        testDepends = [ base hspec network-uri text ];
        homepage = "https://github.com/gregwebs/haskell-heroku";
@@ -64402,6 +64631,39 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "heyefi" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, configurator
+     , containers, directory, errors, exceptions, filemanip, filepath
+     , HandsomeSoup, hspec, HTTP, http-types, hxt, iso8601-time
+     , MissingH, mtl, multipart, old-locale, random, silently, stm, tar
+     , temporary, text, time, transformers, unix, unordered-containers
+     , utf8-string, wai, warp
+     }:
+     mkDerivation {
+       pname = "heyefi";
+       version = "0.1.0.2";
+       sha256 = "0zjhdhigkfh3wrhwynpcqimasifs3qxkv8x2w7bl1ly8amlz7hf4";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring case-insensitive configurator directory errors
+         exceptions filemanip filepath HandsomeSoup HTTP http-types hxt
+         iso8601-time MissingH mtl multipart old-locale random stm tar
+         temporary text time transformers unix unordered-containers
+         utf8-string wai warp
+       ];
+       testDepends = [
+         base bytestring case-insensitive configurator containers directory
+         errors exceptions filemanip filepath HandsomeSoup hspec HTTP
+         http-types hxt iso8601-time MissingH mtl multipart old-locale
+         random silently stm tar temporary text time transformers unix
+         unordered-containers utf8-string wai warp
+       ];
+       homepage = "https://github.com/ryantm/heyefi";
+       description = "A server for Eye-Fi SD cards";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "hfann" = callPackage
     ({ mkDerivation, base, doublefann, fann }:
      mkDerivation {
@@ -66691,7 +66953,9 @@ self: {
      mkDerivation {
        pname = "hnix";
        version = "0.2.0";
+       revision = "1";
        sha256 = "02aygnc0hhg3gsj9z323pq6i6v9ijjj5r6i8g1zx1cnwd51dw1aj";
+       editedCabalFile = "8267f50b3b3fc9736bb1e942fbe425a1a4ef2b96a6b906dff18496ce1e0578d6";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -66736,6 +67000,20 @@ self: {
        license = stdenv.lib.licenses.unfree;
      }) {};
 
+  "ho-rewriting" = callPackage
+    ({ mkDerivation, base, compdata, containers, mtl, patch-combinators
+     }:
+     mkDerivation {
+       pname = "ho-rewriting";
+       version = "0.1";
+       sha256 = "1hmnqck385mhk140kgf8882lfa91bmip4pxbjnfpf62dwh0z39a3";
+       buildDepends = [ base compdata containers mtl patch-combinators ];
+       testDepends = [ base compdata patch-combinators ];
+       homepage = "https://github.com/emilaxelsson/ho-rewriting";
+       description = "Generic rewrite rules with safe treatment of variables and binders";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hoauth" = callPackage
     ({ mkDerivation, base, binary, bytestring, crypto-pubkey-types
      , curl, dataenc, entropy, mtl, old-locale, random, RSA, SHA, time
@@ -67896,27 +68174,25 @@ self: {
      }) {};
 
   "hpack" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, deepseq, directory
-     , filepath, hspec, interpolate, mockery, text, unordered-containers
-     , yaml
+    ({ mkDerivation, aeson, aeson-qq, base, base-compat, deepseq
+     , directory, filepath, hspec, interpolate, mockery, text
+     , unordered-containers, yaml
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.3.2";
-       revision = "1";
-       sha256 = "1y29d7bd297yy1j0cl17q98ibdr26gksvd6fwbwgpx43y5mpq08x";
-       editedCabalFile = "d622462298731362fa33e09dd6b559cf1d6ba676c78864d4da2c1275dca11bae";
-       isLibrary = false;
+       version = "0.4.0";
+       sha256 = "01wqf30zdcgra5vj7d3378lmjh26z1g3z9qp746ly45yz0rpryz2";
+       isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base base-compat deepseq directory filepath text
          unordered-containers yaml
        ];
        testDepends = [
-         aeson base base-compat deepseq directory filepath hspec interpolate
-         mockery text unordered-containers yaml
+         aeson aeson-qq base base-compat deepseq directory filepath hspec
+         interpolate mockery text unordered-containers yaml
        ];
-       homepage = "https://github.com/haskell-tinc/hpack#readme";
+       homepage = "https://github.com/sol/hpack#readme";
        description = "An alternative format for Haskell packages";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -68196,8 +68472,8 @@ self: {
      }:
      mkDerivation {
        pname = "hprotoc";
-       version = "2.0.17";
-       sha256 = "1mfmbggjnpmdpv6a9yhwyplf4g1n45s089qjwhvy1p6drn4mk3hp";
+       version = "2.1.0";
+       sha256 = "18a4wc22yqbqx2n62935q3i9y4kkcxk8r5kcphhbqmzcxf20x7gr";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -68206,7 +68482,7 @@ self: {
          protocol-buffers-descriptor utf8-string
        ];
        buildTools = [ alex ];
-       homepage = "http://code.haskell.org/protocol-buffers/";
+       homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68391,6 +68667,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hreader" = callPackage
+    ({ mkDerivation, base, exceptions, hset, mmorph, monad-control, mtl
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "hreader";
+       version = "0.1.0";
+       sha256 = "102i17879ha49yh87i9k5lxrlrjd1fxcb8k8adidqwghbn55dyjc";
+       buildDepends = [
+         base exceptions hset mmorph monad-control mtl transformers-base
+       ];
+       homepage = "https://bitbucket.org/s9gf4ult/hreader";
+       description = "Generalization of MonadReader and ReaderT";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hricket" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -69577,15 +69869,19 @@ self: {
      }) {};
 
   "hscrtmpl" = callPackage
-    ({ mkDerivation, base, directory, old-locale, process, time }:
+    ({ mkDerivation, base, directory, process, regex-compat, time
+     , time-locale-compat
+     }:
      mkDerivation {
        pname = "hscrtmpl";
-       version = "1.2";
-       sha256 = "1ipk44lc2bdh9yhn30b2hkkymyp2srgsqgfdsy8xbxa8frlabhhg";
+       version = "1.4";
+       sha256 = "1az51cv6wqjdkw0fqgi5s75rmfka3sly85022rhvk44w1vd45iii";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base directory old-locale process time ];
-       homepage = "http://ui3.info/darcs/hscrtmpl/";
+       buildDepends = [
+         base directory process regex-compat time time-locale-compat
+       ];
+       homepage = "http://hub.darcs.net/dino/hscrtmpl";
        description = "Haskell shell script template";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69812,12 +70108,13 @@ self: {
      }) {};
 
   "hset" = callPackage
-    ({ mkDerivation, base, mtl }:
+    ({ mkDerivation, base, HUnit, mtl }:
      mkDerivation {
        pname = "hset";
-       version = "0.0.2";
-       sha256 = "13jq033g20mzvc424g6p1rixhw0gl681dpbc0dlrdpnpk2pm1m7l";
+       version = "1.0.0";
+       sha256 = "16180gzms34fh5s2byp5disazi2bww022dln4q7lv523css3mrcf";
        buildDepends = [ base mtl ];
+       testDepends = [ base HUnit mtl ];
        homepage = "https://bitbucket.org/s9gf4ult/hset";
        description = "Primitive heterogenous read-only set";
        license = stdenv.lib.licenses.bsd3;
@@ -69829,15 +70126,14 @@ self: {
      }:
      mkDerivation {
        pname = "hsexif";
-       version = "0.6.0.1";
-       sha256 = "17vxm7vh8l7bnf5kcw4igkrjwwfzn0byjamaim70095al0ndvrjy";
+       version = "0.6.0.2";
+       sha256 = "1a67cyzfiriyhyacihs47d0427yll91fmbs56fhk82k3mdi74a60";
        buildDepends = [
          base binary bytestring containers iconv text time
        ];
        testDepends = [
          base binary bytestring containers hspec HUnit iconv text time
        ];
-       jailbreak = true;
        homepage = "https://github.com/emmanueltouzery/hsexif";
        description = "EXIF handling library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -70199,17 +70495,15 @@ self: {
 
   "hsmisc" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, old-locale, parsec
-     , regex-compat, time
+     , time
      }:
      mkDerivation {
        pname = "hsmisc";
-       version = "1.1";
-       sha256 = "1n340agvf103g84xndc9fbhq4rhywx611iykmkk10wxi364dv7wg";
-       buildDepends = [
-         base containers mtl old-locale parsec regex-compat time
-       ];
-       testDepends = [ base containers HUnit mtl regex-compat ];
-       homepage = "http://foo/bar/baz.html";
+       version = "1.2";
+       sha256 = "1n2na14a5qaph0f457zvkjwr2zkbgh3mfli2ir5wkm7m1bm671aj";
+       buildDepends = [ base containers mtl old-locale parsec time ];
+       testDepends = [ base containers HUnit mtl ];
+       homepage = "http://hub.darcs.net/dino/hsmisc";
        description = "A collection of miscellaneous modules";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70459,8 +70753,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.1.7";
-       sha256 = "096rfq7ss5hvy1wcc9fdb4svnfiy96p79xh7vj3h7radh2wggfwv";
+       version = "2.1.8";
+       sha256 = "0nfg9pmlvp8gnllfx01sfslhznjs5xa432ag9s2q2r7c17bxfnwf";
        buildDepends = [
          base hspec-core hspec-discover hspec-expectations HUnit QuickCheck
          transformers
@@ -70530,8 +70824,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.1.7";
-       sha256 = "1ifwsqa8ay8f8l96k37rawxjya0qs72bcifxfr5hlz3gagg4a02b";
+       version = "2.1.8";
+       sha256 = "07jhiw0492xcgiidpyizqwaqjja23m35179s12vb54gw4xbh7b6q";
        buildDepends = [
          ansi-terminal async base deepseq hspec-expectations HUnit
          QuickCheck quickcheck-io random setenv tf-random time transformers
@@ -70550,8 +70844,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.1.7";
-       sha256 = "0gh9kn9ds50xl0zin5vbablf4dpfiabi96sz2a4xsxlskfjflhl0";
+       version = "2.1.8";
+       sha256 = "1pyk901rngv1yv4p502qcbbhhw6sgdsdmdwxk1f5r1s7gkvbd9n4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base directory filepath ];
@@ -70562,13 +70856,12 @@ self: {
      }) {};
 
   "hspec-expectations" = callPackage
-    ({ mkDerivation, base, hspec, HUnit, markdown-unlit, silently }:
+    ({ mkDerivation, base, HUnit }:
      mkDerivation {
        pname = "hspec-expectations";
-       version = "0.6.1.1";
-       sha256 = "0f36b2cp2ipbqz9g6lp43nvx8dykkw196wg97kgb07mmnq6gakix";
+       version = "0.7.0";
+       sha256 = "1gzjnmhi6ia2p5i5jlnj4586rkml5af8f7ijgipzs6fczpx7ds4l";
        buildDepends = [ base HUnit ];
-       testDepends = [ base hspec HUnit markdown-unlit silently ];
        homepage = "https://github.com/sol/hspec-expectations#readme";
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
@@ -71593,17 +71886,16 @@ self: {
 
   "html-email-validate" = callPackage
     ({ mkDerivation, attoparsec, base, hspec, QuickCheck
-     , regex-pcre-builtin, text, text-show
+     , regex-pcre-builtin, text
      }:
      mkDerivation {
        pname = "html-email-validate";
-       version = "0.1.0.0";
-       sha256 = "076xiv1r9yzaxr84v211kib6xy9aggal0vgyz565vgwqpfm2hif4";
-       buildDepends = [ attoparsec base text text-show ];
+       version = "0.2.0.0";
+       sha256 = "1bvdmaamxbldb8nndi5f330msj1d0mrj8lapvxqyr333bg3kwaix";
+       buildDepends = [ attoparsec base text ];
        testDepends = [
          attoparsec base hspec QuickCheck regex-pcre-builtin text
        ];
-       jailbreak = true;
        description = "Validating an email address against HTML standard";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71697,20 +71989,20 @@ self: {
      }) {};
 
   "html2hamlet" = callPackage
-    ({ mkDerivation, ascii, base, blaze-builder, bytestring, cmdargs
-     , hamlet, http-enumerator, network, text, xmlhtml
+    ({ mkDerivation, base, bytestring, containers, hamlet, html-conduit
+     , http-conduit, mtl, optparse-declarative, regex-tdfa, text
+     , wl-pprint-text, xml-conduit
      }:
      mkDerivation {
        pname = "html2hamlet";
-       version = "0.1.0";
-       sha256 = "1nh6whpc9xdlmkw4n3lfi8xgfbgvb0lz7dry25j5fgxgvpsa0g9d";
+       version = "0.3.0";
+       sha256 = "1n49dz59nlkvb4ax1h9cfq7nqcwlxcrm372x4373ig6xdzbckdmz";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         ascii base blaze-builder bytestring cmdargs hamlet http-enumerator
-         network text xmlhtml
+         base bytestring containers hamlet html-conduit http-conduit mtl
+         optparse-declarative regex-tdfa text wl-pprint-text xml-conduit
        ];
-       jailbreak = true;
        homepage = "http://github.com/tanakh/html2hamlet";
        description = "HTML to Hamlet converter";
        license = stdenv.lib.licenses.bsd3;
@@ -71892,8 +72184,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.13";
-       sha256 = "1vxjcvwlqp9n8r2lp21mxxklq1ia4bvzl778b7digzhdhpn405mi";
+       version = "0.4.15";
+       sha256 = "0k3ag3ia76s9dyhafaprspbsrbzpl5amyw7cnxv6l76v778ksrrf";
        buildDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -72067,8 +72359,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-conduit";
-       version = "2.1.5";
-       sha256 = "0vk2an6h3h7a5klk9xrf3apfm6xdmqm418yrr7pb56b7w5sfq003";
+       version = "2.1.5.1";
+       sha256 = "1rpp830319hqqazf1gh28jh239a67qksmx2ki3p91h9nsa8lh6w2";
        buildDepends = [
          base bytestring conduit http-client http-client-tls http-types
          lifted-base monad-control mtl resourcet transformers
@@ -72315,7 +72607,9 @@ self: {
      mkDerivation {
        pname = "http-reverse-proxy";
        version = "0.4.2";
+       revision = "1";
        sha256 = "10cd6h1n1fp55jpwcp4nnk64yslxy2cnm7rhzd25xvi5fkhfl61i";
+       editedCabalFile = "3b7a6c0b55cd7eb98d3f020ac08cec7ca052b8ec716f76cfabdcbaef27645db7";
        buildDepends = [
          async base blaze-builder bytestring case-insensitive conduit
          conduit-extra containers data-default-class http-client http-types
@@ -73060,6 +73354,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hwsl2-reducers" = callPackage
+    ({ mkDerivation, base, bytestring, hwsl2, reducers, semigroups }:
+     mkDerivation {
+       pname = "hwsl2-reducers";
+       version = "0.1.0.0";
+       sha256 = "1q7phb2v11gfwlvm0f0jrsm7gc7ga9awd9cp0kkxm2k20mggrg7x";
+       buildDepends = [ base bytestring hwsl2 reducers semigroups ];
+       homepage = "https://github.com/srijs/hwsl2-reducers";
+       description = "Semigroup and Reducer instances for Data.Hash.SL2";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hx" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -73450,10 +73756,10 @@ self: {
     ({ mkDerivation, base, deepseq, primitive, vector }:
      mkDerivation {
        pname = "hybrid-vectors";
-       version = "0.1.2.1";
+       version = "0.2";
        revision = "1";
-       sha256 = "0xh6yvv7jyahzrqihc13g1nlv81v0mzxvaxib5fcyr1njwbcwv59";
-       editedCabalFile = "9adcfe7dc98b64c7a1506a58c7a771bbc244874790b68f8bc7e1c859207632d7";
+       sha256 = "0xdrna6jgn4l0idhv0bn6ic8m7g8pps23ky2f75zwgpqrkflnb41";
+       editedCabalFile = "43a2c8cd2fa6abe7dc526dd99ef9d296394922a3d92ced8138072250fe75eb35";
        buildDepends = [ base deepseq primitive vector ];
        homepage = "http://github.com/ekmett/hybrid-vectors";
        description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors";
@@ -73805,6 +74111,7 @@ self: {
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
+       jailbreak = true;
        homepage = "http://github.com/analytics/hyperloglog";
        description = "An approximate streaming (constant space) unique object counter";
        license = stdenv.lib.licenses.bsd3;
@@ -75438,24 +75745,26 @@ self: {
 
   "inline-c" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
-     , containers, cryptohash, directory, filepath, gsl, gslcblas, 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.3.4";
-       sha256 = "1hn1diaxvg0658j9wy9nsa4fhjzjk4g9f161gb26n5cfymsjnnc3";
+       version = "0.5.4.2";
+       sha256 = "1s38ncb59zr8295k3vr52cmirb9kw2dfpfjbb8hh5c27z1vcmmrz";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          ansi-wl-pprint base binary bytestring containers cryptohash
-         directory filepath mtl parsec parsers QuickCheck template-haskell
-         transformers unordered-containers vector
+         directory filepath hashable mtl parsec parsers QuickCheck
+         template-haskell transformers unordered-containers vector
        ];
        testDepends = [
-         ansi-wl-pprint base containers hspec parsers QuickCheck
-         raw-strings-qq regex-posix template-haskell transformers vector
+         ansi-wl-pprint base containers hashable hspec parsers QuickCheck
+         raw-strings-qq regex-posix template-haskell transformers
+         unordered-containers vector
        ];
        extraLibraries = [ gsl gslcblas ];
        description = "Write Haskell source files including C code inline. No FFI required.";
@@ -75871,8 +76180,8 @@ self: {
      }:
      mkDerivation {
        pname = "intricacy";
-       version = "0.5";
-       sha256 = "1cy8i6iqgka0696d84nqswg90q3a1yn9s480ffx8s1i2sy7msjyg";
+       version = "0.5.5";
+       sha256 = "0jlqxd7nwh3yvy5pni3w4a19wvn2xdrhhhfm9xkf4cs2rqnz525q";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -76845,8 +77154,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ivar-simple";
-       version = "0.3";
-       sha256 = "13if0mqgnc6lsx1acw6395milygqq18sm5vazfkxdhmppsqb91ch";
+       version = "0.3.1";
+       sha256 = "1zn3nr0qmrnpr7jnpwgb4sancflbp9xmk2qyahl0d9vw7agqhwlm";
        buildDepends = [ base ];
        description = "Write once concurrency primitives";
        license = stdenv.lib.licenses.mit;
@@ -77147,7 +77456,7 @@ self: {
 
   "jack" = callPackage
     ({ mkDerivation, array, base, bytestring, enumset, event-list
-     , explicit-exception, libjack2, midi, non-negative, transformers, unix
+     , explicit-exception, jack2, midi, non-negative, transformers, unix
      }:
      mkDerivation {
        pname = "jack";
@@ -77159,25 +77468,25 @@ self: {
          array base bytestring enumset event-list explicit-exception midi
          non-negative transformers unix
        ];
-       pkgconfigDepends = [ libjack2 ];
+       pkgconfigDepends = [ jack2 ];
        homepage = "http://www.haskell.org/haskellwiki/JACK";
        description = "Bindings for the JACK Audio Connection Kit";
        license = "GPL";
-     }) { inherit (pkgs) libjack2;};
+     }) { jack2 = null;};
 
   "jack-bindings" = callPackage
-    ({ mkDerivation, base, c2hs, libjack2, mtl }:
+    ({ mkDerivation, base, c2hs, jack2, mtl }:
      mkDerivation {
        pname = "jack-bindings";
        version = "0.1.1";
        sha256 = "1gmz2qiz7wzydj0rhswbfhwi0zbdcbps29l1lryzqxm8chfc9mbm";
        buildDepends = [ base mtl ];
        buildTools = [ c2hs ];
-       pkgconfigDepends = [ libjack2 ];
+       pkgconfigDepends = [ jack2 ];
        description = "DEPRECATED Bindings to the JACK Audio Connection Kit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libjack2;};
+     }) { jack2 = null;};
 
   "jackminimix" = callPackage
     ({ mkDerivation, base, hosc }:
@@ -77253,22 +77562,23 @@ self: {
      }) {};
 
   "jalla" = callPackage
-    ({ mkDerivation, base, blas, c2hs, cblas, convertible, HUnit
-     , lapacke, mtl, QuickCheck, random, test-framework
+    ({ mkDerivation, base, base-orphans, blas, c2hs, cblas, convertible
+     , HUnit, lapacke, mtl, QuickCheck, random, test-framework
      , test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "jalla";
-       version = "0.2";
-       sha256 = "02n9dfspn648090d3yhk3ngqzjky82ly770qi13d1h13ixbv2lx0";
-       buildDepends = [ base convertible mtl QuickCheck random ];
+       version = "0.2.0.1";
+       sha256 = "122lf1j9hs81yzj6hdv7a7q56846h1ggasbjgvjnk8r34d0xsl40";
+       buildDepends = [
+         base base-orphans convertible mtl QuickCheck random
+       ];
        testDepends = [
          base HUnit QuickCheck random test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
        buildTools = [ c2hs ];
        extraLibraries = [ blas cblas lapacke ];
-       jailbreak = true;
        homepage = "https://github.com/cgo/jalla";
        description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE.";
        license = "GPL";
@@ -78089,8 +78399,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-schema";
-       version = "0.7.3.6";
-       sha256 = "0x1aj5scd0k0qapivn784y5np82fhr982sqvb64jw619aql5s6bv";
+       version = "0.7.3.7";
+       sha256 = "0lrr5zhydb2g36xlpr3mhn0m6bz138gbm0zih3f3qamnsm21mjk5";
        buildDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -78148,8 +78458,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-togo";
-       version = "0.1.0.3";
-       sha256 = "0fl71ij0v4gjjvm5d4624x5fm0si75d9baz07c5ck6da24xgbg0l";
+       version = "0.1.1.0";
+       sha256 = "0aw0dkv1scllj56vj9q07a44vfs88f3k5x1m80y0mivlpz0280l3";
        buildDepends = [
          aeson attoparsec attoparsec-trans base bytestring scientific text
          transformers unordered-containers vector
@@ -78388,8 +78698,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.1.3";
-       sha256 = "024q90vsphh3ka4p2l0xmyvp874jp5a61s4gwmg985v5b54srzh5";
+       version = "0.1.4";
+       sha256 = "07galk5i5lq4dx1njd5851c7jz4qwhw8da76ggxd91f9xpvkmf9y";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -78457,6 +78767,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "kademlia" = callPackage
+    ({ mkDerivation, base, bytestring, containers, mtl, network, stm
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "kademlia";
+       version = "1.0.0.0";
+       revision = "1";
+       sha256 = "0f1kwflpizabzyal3x3p9sra3kxlgm2m14xfxnl4k3bndmj02sdb";
+       editedCabalFile = "2553e98d53372b8d4947c115dd696e33f526f0304e9ed39566e6beec276ca641";
+       buildDepends = [
+         base bytestring containers mtl network stm transformers
+         transformers-compat
+       ];
+       homepage = "https://github.com/froozen/kademlia";
+       description = "An implementation of the Kademlia DHT Protocol";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "kafka-client" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, digest
      , dlist, hspec, hspec-discover, network, process, QuickCheck
@@ -79044,8 +79373,8 @@ self: {
      }:
      mkDerivation {
        pname = "keter";
-       version = "1.4.1";
-       sha256 = "1pxvddb6mkxq4j7w0l3zgvarlj8kvrd4c75mivsia330wzkhc4ay";
+       version = "1.4.2.1";
+       sha256 = "1xwnprbmssvvymwyvcgczlsldplr2va53mzdphqs6969xhhpahh3";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -80464,18 +80793,18 @@ self: {
      }:
      mkDerivation {
        pname = "language-c-quote";
-       version = "0.10.2.2";
-       sha256 = "0y65mlx4zx1n7n6y3gjvzqzr2k8bxbbjn4wsjr8mzpib0gqfqpss";
+       version = "0.11";
+       sha256 = "1v55pmzrsd7nvxdkik0fh5psbycx9cv4j5zwzlv872lzhfsr3lc7";
        buildDepends = [
          array base bytestring containers exception-mtl
          exception-transformers filepath haskell-src-meta mainland-pretty
          mtl srcloc syb symbol template-haskell
        ];
        testDepends = [
-         base HUnit srcloc symbol test-framework test-framework-hunit
+         base bytestring HUnit mainland-pretty srcloc symbol test-framework
+         test-framework-hunit
        ];
        buildTools = [ alex happy ];
-       jailbreak = true;
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
        license = stdenv.lib.licenses.bsd3;
@@ -82828,13 +83157,12 @@ self: {
      }:
      mkDerivation {
        pname = "lilypond";
-       version = "1.8.1";
-       sha256 = "0y60i1rsl6rzdvbx2jj3y660bqlsz6dywwxq8nl4q1g6gr2k97fd";
+       version = "1.9.0";
+       sha256 = "1nb6kkp5gbsbkjbbicyd49ckg2j9dm4a1l9ya4vp38br5j7dn4gw";
        buildDepends = [
          base data-default music-dynamics-literal music-pitch-literal
          prettify process semigroups vector-space
        ];
-       jailbreak = true;
        description = "Bindings to Lilypond";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84212,7 +84540,6 @@ self: {
        homepage = "http://github.com/dmbarbour/haskell-lmdb";
        description = "Lightning MDB bindings";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { lmdb = null;};
 
   "load-env" = callPackage
@@ -84393,6 +84720,7 @@ self: {
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
+       jailbreak = true;
        homepage = "http://github.com/analytics/log-domain/";
        description = "Log-domain arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -85034,23 +85362,24 @@ self: {
      }) {};
 
   "luautils" = callPackage
-    ({ mkDerivation, base, containers, custom-prelude, hslua
+    ({ mkDerivation, base, binary, bytestring, containers, hslua
      , monad-loops, QuickCheck, quickcheck-instances, test-framework
-     , test-framework-quickcheck2, test-framework-th, text
+     , test-framework-quickcheck2, test-framework-th, text, text-binary
      }:
      mkDerivation {
        pname = "luautils";
-       version = "0.1.3";
-       sha256 = "1y0a70sqykc003kazx6bddjp4l7pc6099iqg6w78k7wigzmkld7y";
+       version = "0.1.4";
+       sha256 = "176szfrz1ydnin1zi50235j4f4l87j516yjddmqbmd834dzvk20d";
        buildDepends = [
-         base containers custom-prelude hslua monad-loops text
+         base binary bytestring containers hslua monad-loops text
        ];
        testDepends = [
-         base containers hslua QuickCheck quickcheck-instances
+         base binary containers hslua QuickCheck quickcheck-instances
          test-framework test-framework-quickcheck2 test-framework-th text
+         text-binary
        ];
        description = "Helpers for Haskell integration with Lua";
-       license = "GPL";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "lub" = callPackage
@@ -85404,13 +85733,12 @@ self: {
      }:
      mkDerivation {
        pname = "machinecell";
-       version = "1.3.1";
-       revision = "1";
-       sha256 = "1v4rrjszh6sm2x1nwq33f4xwa41bnls0awhy9qfkap62bpad8fxg";
-       editedCabalFile = "5a7ee43c327694ac753228da8f16d681a60d23b4926132726e2a093ecacb4725";
+       version = "2.0.1";
+       sha256 = "0gl207a97zcs48k6pdr82x9ckg1bc2vn6wachc57gmnspk3j43xd";
        buildDepends = [ arrows base free mtl profunctors semigroups ];
-       testDepends = [ base hspec mtl profunctors QuickCheck ];
-       jailbreak = true;
+       testDepends = [
+         arrows base hspec mtl profunctors QuickCheck semigroups
+       ];
        homepage = "http://github.com/as-capabl/machinecell";
        description = "Arrow based stream transducers";
        license = stdenv.lib.licenses.bsd3;
@@ -85705,8 +86033,8 @@ self: {
     ({ mkDerivation, base, containers, srcloc, text }:
      mkDerivation {
        pname = "mainland-pretty";
-       version = "0.3.0.0";
-       sha256 = "1fqb03rph3zwl46wkfzbm5hsqhyjn2vvwks506mybabqv3sg24kn";
+       version = "0.4.0.0";
+       sha256 = "1nym3qiyjgag6jpra1cfm8b722h8ghi0f2dv74y6migzqh768myl";
        buildDepends = [ base containers srcloc text ];
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "Pretty printing designed for printing source code";
@@ -86746,7 +87074,9 @@ self: {
      mkDerivation {
        pname = "matrices";
        version = "0.4.2";
+       revision = "1";
        sha256 = "1mcv3ihaf15biai6m98jfgv31whgmwbzgagxyj3bfpnilslp98l6";
+       editedCabalFile = "6aabde42e016b428562ed0e983444308c23d79837f04453fe57f60a6cbc02fe4";
        buildDepends = [ base primitive vector ];
        testDepends = [ base tasty tasty-hunit tasty-quickcheck vector ];
        description = "native matrix based on vector";
@@ -87408,14 +87738,14 @@ self: {
 
   "messagepack-rpc" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, messagepack
-     , network-simple, text
+     , network-simple
      }:
      mkDerivation {
        pname = "messagepack-rpc";
-       version = "0.1.0.3";
-       sha256 = "0g9lj3fb81gng3z4kdikwa9vgz73hjdqygzhcqd8fphcynv8j6m1";
+       version = "0.2.0.0";
+       sha256 = "0lx0qyv41pylbz2580zvw4qw07pih4l9sbdd2h99gwkqjpjnc8x8";
        buildDepends = [
-         base bytestring cereal containers messagepack network-simple text
+         base bytestring cereal containers messagepack network-simple
        ];
        homepage = "http://github.com/rodrigosetti/messagepack-rpc";
        description = "Message Pack RPC over TCP";
@@ -88225,16 +88555,15 @@ self: {
      }) {};
 
   "minisat" = callPackage
-    ({ mkDerivation, async, base, zlib }:
+    ({ mkDerivation, async, base }:
      mkDerivation {
        pname = "minisat";
-       version = "0.1.1";
-       sha256 = "1myy23mrhnm7wv6mzyym9jmw8pnlqkfam9dl082i8qll3mxrl83i";
+       version = "0.1.2";
+       sha256 = "089jam2cbwf4m16sgb9wh4zkgbmpfsg647lng3kyjs5d3m02i5dd";
        buildDepends = [ async base ];
-       extraLibraries = [ zlib ];
        description = "A Haskell bundle of the Minisat SAT solver";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) zlib;};
+     }) {};
 
   "ministg" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, monads-tf
@@ -90670,22 +90999,21 @@ self: {
 
   "mueval" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory
-     , extensible-exceptions, filepath, hint, mtl, process, show
-     , simple-reflect, unix, utf8-string
+     , extensible-exceptions, filepath, hint, mtl, process, QuickCheck
+     , show, simple-reflect, unix
      }:
      mkDerivation {
        pname = "mueval";
-       version = "0.9.1.1";
-       revision = "2";
-       sha256 = "0p9qf8lb3c1y87qpl9b4n6v6bjrb9fw3yfg4p7niqdz31454d2pz";
-       editedCabalFile = "26147e2bbac6b9afea949ab81c6072fc89bbff6b7e6678f3ce57c77d26264832";
+       version = "0.9.1.1.2";
+       revision = "1";
+       sha256 = "1h8a0lfbpgx9pjsmb0yld4n12z2nia5kkikjq1qqzk4m8rsknk70";
+       editedCabalFile = "5c6cf1e221928e15536f1dfa46942293acf7b470a442c619ef66529b78c59596";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base Cabal containers directory extensible-exceptions filepath hint
-         mtl process show simple-reflect unix utf8-string
+         mtl process QuickCheck show simple-reflect unix
        ];
-       jailbreak = true;
        homepage = "https://github.com/gwern/mueval";
        description = "Safely evaluate pure Haskell expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -90910,8 +91238,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "multiset";
-       version = "0.2.2";
-       sha256 = "1g14c1zm4rdc8nxvb69k98h542wi24q2lpba1gpqjqspk4d0sjmn";
+       version = "0.3.0";
+       sha256 = "0wpc2v55q6gwn70nlk2x5xd4dk9a8aw2ivl1gr0xhdp1dnn5dhcb";
        buildDepends = [ base containers ];
        description = "The Data.MultiSet container type";
        license = stdenv.lib.licenses.bsd3;
@@ -90947,8 +91275,8 @@ self: {
     ({ mkDerivation, base, hspec, mtl, tagged, transformers }:
      mkDerivation {
        pname = "multistate";
-       version = "0.6.0.0";
-       sha256 = "17b54qy4dgacj0lwy61nf3hbppd950xk9c1yphjn6i6jcr8z66li";
+       version = "0.6.2.0";
+       sha256 = "0s8x0gb332724sd3vcp5yimxpbf85kvg327lg3bb77jvy6cfdzvj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base mtl tagged transformers ];
@@ -91046,8 +91374,8 @@ self: {
     ({ mkDerivation, average, base, semigroups }:
      mkDerivation {
        pname = "music-articulation";
-       version = "1.8.1";
-       sha256 = "1wmj1265bk4fb1qw3vmm6r7a576i8fc2dshrfh3i7w39vy9ywprr";
+       version = "1.9.0";
+       sha256 = "0cxbhk25kn3hpkmb6h0brcf03yyi6kaz3i3l3lv2rzgfxv14a2pg";
        buildDepends = [ average base semigroups ];
        description = "Abstract representation of musical articulation";
        license = stdenv.lib.licenses.bsd3;
@@ -91069,8 +91397,8 @@ self: {
      }:
      mkDerivation {
        pname = "music-dynamics";
-       version = "1.8.1";
-       sha256 = "1rdv9kn3i5m6l9xpfmccdwjkdw0smr9qiaw4p0y79fr9gdqrd6a1";
+       version = "1.9.0";
+       sha256 = "12a11qrdy4p0bczpg2zp8yqw4wdmgfhq5z9ffajlsib2xcs6y8s4";
        buildDepends = [ average base music-dynamics-literal semigroups ];
        description = "Abstract representation of musical dynamics";
        license = stdenv.lib.licenses.bsd3;
@@ -91080,8 +91408,8 @@ self: {
     ({ mkDerivation, base, semigroups }:
      mkDerivation {
        pname = "music-dynamics-literal";
-       version = "1.8.1";
-       sha256 = "1p5r9fj71rvg2hma1r4s4vlxxqzam7iq99hfmn8k92sv7yzjm5na";
+       version = "1.9.0";
+       sha256 = "19bql45aqjfkhvpkfbvfcsc8p1mzg93n966r1yv5rwps6s2x86d5";
        buildDepends = [ base semigroups ];
        description = "Overloaded dynamics literals";
        license = stdenv.lib.licenses.bsd3;
@@ -91106,37 +91434,38 @@ self: {
      }) {};
 
   "music-parts" = callPackage
-    ({ mkDerivation, adjunctions, aeson, base, containers, data-default
-     , lens, music-dynamics, music-pitch, roman-numerals, semigroups
+    ({ mkDerivation, adjunctions, aeson, base, bytestring, cassava
+     , containers, data-default, lens, monadplus, music-dynamics
+     , music-pitch, roman-numerals, semigroups, vector-space
+     , vector-space-points
      }:
      mkDerivation {
        pname = "music-parts";
-       version = "1.8.1";
-       sha256 = "1m0grrqmlj21ld5g381zz1y7s25ngkjq0d5sr3wd7z7ssp44xxs2";
+       version = "1.9.0";
+       sha256 = "1kiz968kcwcyczxg5gl40c7bwgkn86l7qi0ak8p68bm4rmsw9id4";
        buildDepends = [
-         adjunctions aeson base containers data-default lens music-dynamics
-         music-pitch roman-numerals semigroups
+         adjunctions aeson base bytestring cassava containers data-default
+         lens monadplus music-dynamics music-pitch roman-numerals semigroups
+         vector-space vector-space-points
        ];
-       jailbreak = true;
        description = "Musical instruments, parts and playing techniques";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-pitch" = callPackage
-    ({ mkDerivation, base, containers, data-interval, lens
+    ({ mkDerivation, aeson, base, containers, data-interval, lens
      , music-pitch-literal, nats, positive, semigroups, type-unary
      , vector-space, vector-space-points
      }:
      mkDerivation {
        pname = "music-pitch";
-       version = "1.8.1";
-       sha256 = "01wrhzyn7mpa4xk1iyg17clfwyy6ggfg1bz45dvr62pz3gl0sd03";
+       version = "1.9.0";
+       sha256 = "1w5b62il0n8147a3sdvx9ndykfp56nf0kabwpw8khd29cmpff0bz";
        buildDepends = [
-         base containers data-interval lens music-pitch-literal nats
+         aeson base containers data-interval lens music-pitch-literal nats
          positive semigroups type-unary vector-space vector-space-points
        ];
-       jailbreak = true;
        description = "Musical pitch representation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91146,8 +91475,8 @@ self: {
     ({ mkDerivation, base, semigroups }:
      mkDerivation {
        pname = "music-pitch-literal";
-       version = "1.8.1";
-       sha256 = "11qjsxn10lrl3z7yi8h2likasy1g68ybbfzpnx03d01irl5kyzyf";
+       version = "1.9.0";
+       sha256 = "0vsvw7c29qvi69z9gy2zzq9bpajmjd5vs1kll7jw0qbsh28jsqql";
        buildDepends = [ base semigroups ];
        description = "Overloaded pitch literals";
        license = stdenv.lib.licenses.bsd3;
@@ -91163,8 +91492,8 @@ self: {
      }:
      mkDerivation {
        pname = "music-preludes";
-       version = "1.8.1";
-       sha256 = "0apqhv3658i7nrh40ksfxzbi21xvfaix1mm2m3bxid2plbm88qav";
+       version = "1.9.0";
+       sha256 = "1fqw3rz0zrwa5a0l639b0bd6qxiq4zmqcrf0vkrgh03n65r2901q";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -91175,29 +91504,28 @@ self: {
          vector-space vector-space-points
        ];
        testDepends = [ base process tasty tasty-golden ];
-       jailbreak = true;
        description = "Some useful preludes for the Music Suite";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-score" = callPackage
-    ({ mkDerivation, adjunctions, aeson, average, base, bifunctors
-     , colour, comonad, containers, contravariant, distributive, HCodecs
-     , lens, lilypond, monadplus, mtl, music-dynamics-literal
-     , music-pitch-literal, musicxml2, nats, NumInstances, parsec
-     , prettify, process, semigroups, transformers, transformers-compat
-     , vector-space, vector-space-points
+    ({ mkDerivation, adjunctions, aeson, average, base, base-orphans
+     , bifunctors, colour, comonad, containers, contravariant
+     , distributive, HCodecs, lens, lilypond, monadplus, mtl
+     , music-dynamics-literal, music-pitch-literal, musicxml2, nats
+     , NumInstances, parsec, prettify, process, semigroups, transformers
+     , transformers-compat, vector-space, vector-space-points
      }:
      mkDerivation {
        pname = "music-score";
-       version = "1.8.1";
-       sha256 = "1bz93g4v69wkwsamjmgbdxwnv77nwrnvrahj180vjkfwj77f88hq";
+       version = "1.9.0";
+       sha256 = "10cysii04njrjd0qx14fwsjn91ycvfxcs3kvwnb8j24v3svcha10";
        buildDepends = [
-         adjunctions aeson average base bifunctors colour comonad containers
-         contravariant distributive HCodecs lens lilypond monadplus mtl
-         music-dynamics-literal music-pitch-literal musicxml2 nats
-         NumInstances parsec prettify process semigroups transformers
+         adjunctions aeson average base base-orphans bifunctors colour
+         comonad containers contravariant distributive HCodecs lens lilypond
+         monadplus mtl music-dynamics-literal music-pitch-literal musicxml2
+         nats NumInstances parsec prettify process semigroups transformers
          transformers-compat vector-space vector-space-points
        ];
        jailbreak = true;
@@ -91208,18 +91536,19 @@ self: {
 
   "music-sibelius" = callPackage
     ({ mkDerivation, aeson, base, bytestring, lens, monadplus
+     , music-articulation, music-dynamics, music-parts, music-pitch
      , music-pitch-literal, music-preludes, music-score, semigroups
      , unordered-containers
      }:
      mkDerivation {
        pname = "music-sibelius";
-       version = "1.8.1";
-       sha256 = "0g36m4fym11kw2qwciv93zxbxklikmkxbvxlmgi6l9nkjd0n5q9v";
+       version = "1.9.0";
+       sha256 = "1yahz8z81ggcg303i2syzf6bsxq8dmzzzqs3fj89r5kq766275kz";
        buildDepends = [
-         aeson base bytestring lens monadplus music-pitch-literal
+         aeson base bytestring lens monadplus music-articulation
+         music-dynamics music-parts music-pitch music-pitch-literal
          music-preludes music-score semigroups unordered-containers
        ];
-       jailbreak = true;
        description = "Interaction with Sibelius";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91232,8 +91561,8 @@ self: {
      }:
      mkDerivation {
        pname = "music-suite";
-       version = "1.8.1";
-       sha256 = "14hhzmsq5m2h0qq3220xv1gg90sn69whmiysj3y0mw6rcm0zia0f";
+       version = "1.9.0";
+       sha256 = "1nss12cad2vjq2whz5kxsr1r63iwc4pnza0nnf2h2zai3gxzsnn6";
        buildDepends = [
          abcnotation lilypond music-articulation music-dynamics
          music-dynamics-literal music-parts music-pitch music-pitch-literal
@@ -91317,8 +91646,8 @@ self: {
      }:
      mkDerivation {
        pname = "musicxml2";
-       version = "1.8.1";
-       sha256 = "096vm73a4ngl1yc27x7z226difh97zjm5386cy5vw58ndmf1fws7";
+       version = "1.9.0";
+       sha256 = "07axlifkqf0dcqnxfb62x829ygc2y7didsh60x081zw429853fy8";
        buildDepends = [
          base data-default music-dynamics-literal music-pitch-literal nats
          reverse-apply semigroups type-unary xml
@@ -91732,6 +92061,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nagios-plugin-ekg" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, hspec, HUnit
+     , lens, nagios-check, optparse-applicative, text, transformers
+     , unordered-containers, wreq
+     }:
+     mkDerivation {
+       pname = "nagios-plugin-ekg";
+       version = "0.1.1.0";
+       sha256 = "1rk6sphxn93kmayjs0y386g1llhgbw8jpwhfkhlrbv9c395gxkrh";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring containers lens nagios-check
+         optparse-applicative text transformers unordered-containers wreq
+       ];
+       testDepends = [
+         base bytestring hspec HUnit nagios-check text transformers
+       ];
+       homepage = "https://github.com/fractalcat/nagios-plugin-ekg";
+       description = "Monitor ekg metrics via Nagios";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "named-formlet" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers, mtl
      , text, transformers
@@ -91967,6 +92319,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nationstates" = callPackage
+    ({ mkDerivation, base, bytestring, clock, containers, http-client
+     , http-client-tls, http-types, multiset, split, transformers, xml
+     }:
+     mkDerivation {
+       pname = "nationstates";
+       version = "0.1.0.1";
+       sha256 = "0hnn4b94aj29j07jbhb7m7nn7l3wpkkcv76ngn1a5dnamagrwdpd";
+       buildDepends = [
+         base bytestring clock containers http-client http-client-tls
+         http-types multiset split transformers xml
+       ];
+       homepage = "https://github.com/lfairy/nationstates";
+       description = "NationStates API client";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "nats" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -92205,8 +92574,8 @@ self: {
      }:
      mkDerivation {
        pname = "neet";
-       version = "0.3.0.0";
-       sha256 = "1zbpnm0hlcga54x9jbxg748my9s1k2nj97p4haq6pkhbayskz1zi";
+       version = "0.4.0.0";
+       sha256 = "1x0l6cpjc9pjirjndh47asmva8jx5wc6gq8vab1ik2090ph0w1v5";
        buildDepends = [
          base cereal containers graphviz MonadRandom multimap parallel
          random transformers
@@ -92382,8 +92751,8 @@ self: {
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "2.2.0";
-       sha256 = "01daa0hhwgpp33sq1nlgnbkmn15ca8861qf6d7j5ypb9f48c6jr1";
+       version = "3.1.0";
+       sha256 = "128i669x31c4jagnamzlsv3z584rpijpmc832hr96004qkwr692n";
        buildDepends = [
          aeson attoparsec base blaze-html bytestring clay composition
          constraints containers http-media http-types lucid mtl poly-arity
@@ -92929,7 +93298,9 @@ self: {
      mkDerivation {
        pname = "network-carbon";
        version = "1.0.3";
+       revision = "1";
        sha256 = "0wk3rds1d2c6nr9gdz9qgpqhmkqkdkk0rqxzj3rznv0n9m9sylcr";
+       editedCabalFile = "6500f60c0b037a1e680ef3356ce43e27f145efe2cf85f63cb2e670cb344a926d";
        buildDepends = [ 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)";
@@ -93076,8 +93447,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "network-info";
-       version = "0.2.0.6";
-       sha256 = "1ymi2cw3914wvinw0wssmq8m2j4g92q1sd5vi9dxfyb7lrj1gga7";
+       version = "0.2.0.7";
+       sha256 = "0pa0051ji3sr8ax8z1gfgj8x0wvvr20i1zkxs28hq4hdsv1y4dpg";
        buildDepends = [ base ];
        homepage = "http://github.com/jystic/network-info";
        description = "Access the local computer's basic network configuration";
@@ -93405,7 +93776,9 @@ self: {
      mkDerivation {
        pname = "network-transport-amqp";
        version = "0.1.0.0";
+       revision = "2";
        sha256 = "1165xl5g8m423y4nvzwpihzrv6nc9y2dyr6dm4sqp6n1bw4dqqdq";
+       editedCabalFile = "724410b5035d55d170110908838d023a675306faf5fc056ed2a8d68beeb112d4";
        buildDepends = [
          amqp async base bytestring cereal containers exceptions lens-family
          lens-family-th network-transport stm stm-chans string-conv text
@@ -93420,6 +93793,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "network-transport-inmemory" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-accessor
+     , network-transport, network-transport-tests, stm
+     }:
+     mkDerivation {
+       pname = "network-transport-inmemory";
+       version = "0.5.0";
+       sha256 = "1znc4xk6arzi6vr8pfv2vyvak377jpxzzq82r17kz4csdrbnbfw6";
+       buildDepends = [
+         base bytestring containers data-accessor network-transport stm
+       ];
+       testDepends = [ base network-transport network-transport-tests ];
+       homepage = "http://haskell-distributed.github.com";
+       description = "In-memory instantiation of Network.Transport";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "network-transport-tcp" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-accessor
      , network, network-transport, network-transport-tests
@@ -94792,8 +95182,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "observable-sharing";
-       version = "0.2.1.0";
-       sha256 = "11k6wzk3k39d87zbxminz1ga7nw6r96lf5kki40y673n500i4vdc";
+       version = "0.2.1.2";
+       sha256 = "0f2da4bxid9ap21p0l6vf8czg84ifnzq1ljj1h4qy95ydv2bc0za";
        buildDepends = [ base containers ];
        homepage = "https://github.com/atzeus/observable-sharing";
        description = "Simple observable sharing";
@@ -94990,8 +95380,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "old-version";
-       version = "1.1.0";
-       sha256 = "1vlh6wz9khcamlb5pv5gy5bss7bws7b92j8kkyqf6cp22x4dxdlc";
+       version = "1.3.1";
+       sha256 = "19rra617l1rfixpc7s29q1frjk6zlbmp06gzcv03g3hv3f7c4hcf";
        buildDepends = [ base ];
        jailbreak = true;
        description = "Basic versioning library";
@@ -95006,7 +95396,9 @@ self: {
      mkDerivation {
        pname = "olwrapper";
        version = "0.4.1";
+       revision = "1";
        sha256 = "0cnkanaxsrsshk2y37sbvyyzc40k61r57zb0c3jarz583h3yzlai";
+       editedCabalFile = "44d11ed6751baf0383e968d36adca3c1ab49450cb0e147c1496feba468087e90";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -96540,7 +96932,9 @@ self: {
      mkDerivation {
        pname = "pagerduty";
        version = "0.0.3.2";
+       revision = "1";
        sha256 = "0cdn5xmqpfl85nair2ns3dv690wgyfiapks0lnc3aqi8nnly7bws";
+       editedCabalFile = "016fff9ce8abfc6dec19a84ed7043a2d6f6692f2b0f20a845e98a347a1bc48ba";
        buildDepends = [
          aeson base bifunctors bytestring bytestring-conversion conduit
          data-default-class exceptions generics-sop http-client http-types
@@ -96632,7 +97026,7 @@ self: {
   "pandoc" = callPackage
     ({ mkDerivation, aeson, alex, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
-     , cmark, containers, css-text, data-default, deepseq-generics, Diff
+     , cmark, containers, data-default, deepseq-generics, Diff
      , directory, executable-path, extensible-exceptions, filemanip
      , filepath, haddock-library, happy, highlighting-kate, hslua, HTTP
      , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl
@@ -96644,13 +97038,13 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "1.14.0.4";
-       sha256 = "1pzs4ysf7q3sxd8vyydzi5r4n8gjnkvjs3p1phmw4zir3zxmp581";
+       version = "1.15.0.4";
+       sha256 = "1mq7vdcxa7ia0s0l22ysqxpjsib4wvphh4849asswswgywscaq2n";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson alex array base base64-bytestring binary blaze-html
-         blaze-markup bytestring cmark containers css-text data-default
+         blaze-markup bytestring cmark containers data-default
          deepseq-generics directory extensible-exceptions filemanip filepath
          haddock-library happy highlighting-kate hslua HTTP http-client
          http-client-tls http-types JuicyPixels mtl network network-uri
@@ -96665,7 +97059,7 @@ self: {
          test-framework-quickcheck2 text zip-archive
        ];
        configureFlags = [ "-fhttps" "-fmake-pandoc-man-pages" ];
-       homepage = "http://johnmacfarlane.net/pandoc";
+       homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
        license = "GPL";
      }) {};
@@ -96715,6 +97109,7 @@ self: {
          base bytestring containers data-default hspec mtl pandoc
          pandoc-types process yaml
        ];
+       jailbreak = true;
        description = "Pandoc filter for cross-references";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -99020,8 +99415,8 @@ self: {
      }:
      mkDerivation {
        pname = "phash";
-       version = "0.0.4";
-       sha256 = "1bfikigj8bxgqwqz0lxi35s8sck41kjkz2ww1s10bim867h97si0";
+       version = "0.0.5";
+       sha256 = "1bndzncy52swvfk2p1imvxlbiv01qx9qi5mb68jmc22b1d99s6bv";
        buildDepends = [ base ];
        testDepends = [
          base doctest HUnit pHash smallcheck tasty tasty-hunit
@@ -99087,8 +99482,8 @@ self: {
      }:
      mkDerivation {
        pname = "photoname";
-       version = "3.0.1";
-       sha256 = "171vxmjzzwjzb4ixqnkwkg5d1zhswv5377hx79zj8sw68gm1h6b9";
+       version = "3.1";
+       sha256 = "0d44fzflpyw94rfyn9nw9pqklm01vw6nczava2kfj68sq12m94rp";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -99098,8 +99493,8 @@ self: {
          base directory exif filepath HUnit mtl old-locale parsec process
          regex-posix time unix
        ];
-       homepage = "http://ui3.info/d/proj/photoname.html";
-       description = "Rename JPEG photo files based on shoot date";
+       homepage = "http://hub.darcs.net/dino/photoname";
+       description = "Rename photo image files based on EXIF shoot date";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -99325,8 +99720,8 @@ self: {
     ({ mkDerivation, base, enumerator, pipes, transformers }:
      mkDerivation {
        pname = "pipe-enumerator";
-       version = "0.3.0.0";
-       sha256 = "0ralmrhyz88dmnlggmw7kq2gfw5xdb5xypjmmmlgs478z7f2qyd8";
+       version = "0.3.0.1";
+       sha256 = "1nma4pjc472nc9g8b626k7f01rl8z9hsd7j8wsa1ir3r7jb5jpwp";
        buildDepends = [ base enumerator pipes transformers ];
        homepage = "https://github.com/zadarnowski/pipe-enumerator";
        description = "A bidirectional bridge between pipes and iteratees";
@@ -99422,6 +99817,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-bgzf" = callPackage
+    ({ mkDerivation, base, bytestring, mtl, parallel, pipes
+     , streaming-commons
+     }:
+     mkDerivation {
+       pname = "pipes-bgzf";
+       version = "0.2.0.1";
+       sha256 = "04y0wzy8982g64xyxq6rl9xc63n0c8xl8mhyf0x4ivqxnn49iv23";
+       buildDepends = [
+         base bytestring mtl parallel pipes streaming-commons
+       ];
+       description = "Blocked GZip";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipes-binary" = callPackage
     ({ mkDerivation, base, binary, bytestring, ghc-prim
      , lens-family-core, pipes, pipes-bytestring, pipes-parse
@@ -99625,6 +100035,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-fastx" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, pipes
+     , pipes-attoparsec, pipes-bytestring
+     }:
+     mkDerivation {
+       pname = "pipes-fastx";
+       version = "0.3.0.0";
+       sha256 = "0xds11gfacj7m5lz6cssaj4v5z73ycrdmn57f0qxzqdsc2kln9ii";
+       buildDepends = [
+         attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring
+       ];
+       description = "Streaming parsers for Fasta and Fastq";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipes-group" = callPackage
     ({ mkDerivation, base, free, pipes, pipes-parse, transformers }:
      mkDerivation {
@@ -99651,6 +100076,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-illumina" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, pipes
+     , pipes-bgzf
+     }:
+     mkDerivation {
+       pname = "pipes-illumina";
+       version = "0.1.0.0";
+       sha256 = "19s6rkrfvmni914flq37fkbfs6angzl3c40bzg0ddivn4ada7jvn";
+       buildDepends = [
+         base bytestring directory filepath pipes pipes-bgzf
+       ];
+       homepage = "http://github.com/rcallahan/pipes-illumina";
+       description = "Illumina NGS data processing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipes-interleave" = callPackage
     ({ mkDerivation, base, containers, pipes }:
      mkDerivation {
@@ -101004,10 +101445,9 @@ self: {
     ({ mkDerivation, base, nats, semigroups }:
      mkDerivation {
        pname = "positive";
-       version = "0.4";
-       sha256 = "0vj0gd7xln1xihf8dyrr2sm7zh5wg6qvfzy30nslwgvzyn4f14gv";
+       version = "0.4.1";
+       sha256 = "034vlx889sgwvn7g2s1vl3w0nf1vs0c2c1gc0vn77wd9l1vw0hfg";
        buildDepends = [ base nats semigroups ];
-       jailbreak = true;
        description = "Positive integers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101242,7 +101682,7 @@ self: {
   "postgresql-query" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , containers, data-default, either, exceptions, file-embed
-     , haskell-src-meta, monad-control, monad-logger, mtl
+     , haskell-src-meta, hreader, hset, monad-control, monad-logger, mtl
      , postgresql-simple, QuickCheck, quickcheck-assertions
      , quickcheck-instances, resource-pool, semigroups, tasty
      , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, text
@@ -101250,14 +101690,12 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-query";
-       version = "1.2.1";
-       revision = "1";
-       sha256 = "0dkbg55y4dmdka0ks2mz5m1dk17r5gdhkhk3bypjwchb4nyjvx1f";
-       editedCabalFile = "a751cfcead636156595561698606a6ddb945d763156414c71854a718494768e0";
+       version = "1.3.1";
+       sha256 = "19lzpxdfvidhrmmay2g3vxdbx9zcnp6r949lind04wbwwy3pbb0c";
        buildDepends = [
          aeson attoparsec base blaze-builder bytestring containers
-         data-default either exceptions file-embed haskell-src-meta
-         monad-control monad-logger mtl postgresql-simple resource-pool
+         data-default either exceptions file-embed haskell-src-meta hreader
+         hset monad-control monad-logger mtl postgresql-simple resource-pool
          semigroups template-haskell text time transformers
          transformers-base transformers-compat
        ];
@@ -101271,6 +101709,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "postgresql-schema" = callPackage
+    ({ mkDerivation, base, base-prelude, formatting, old-locale
+     , optparse-applicative, shelly, text, time
+     }:
+     mkDerivation {
+       pname = "postgresql-schema";
+       version = "0.1.3";
+       revision = "1";
+       sha256 = "17i4xpal7cf7km3p59p7m1cbc39rgkjwg6dkmhswnr669v40r350";
+       editedCabalFile = "48c36bad1c6796bd2c7211e0002d2aafc5bb0c8dedde4ec9f8ece597335096ce";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base base-prelude formatting old-locale optparse-applicative shelly
+         text time
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/mfine/postgresql-schema";
+       description = "PostgreSQL Schema Management";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "postgresql-simple" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , blaze-builder, blaze-textual, bytestring, case-insensitive
@@ -101364,20 +101824,19 @@ self: {
   "postgresql-typed" = callPackage
     ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
      , containers, cryptohash, haskell-src-meta, network, old-locale
-     , parsec, postgresql-binary, scientific, template-haskell, text
-     , time, utf8-string, uuid
+     , postgresql-binary, scientific, template-haskell, text, time
+     , utf8-string, uuid
      }:
      mkDerivation {
        pname = "postgresql-typed";
-       version = "0.3.3";
-       sha256 = "1fj02d0v9bpdgmzp2xqmz72flhl6pyw7v03kqmwyjhkp9afd4dsh";
+       version = "0.4.0";
+       sha256 = "0w3fbxwiqsl32g4hmkdxyw821nd14dv3i2pwykpx68c9w6vvlmx9";
        buildDepends = [
          aeson array attoparsec base binary bytestring containers cryptohash
-         haskell-src-meta network old-locale parsec postgresql-binary
-         scientific template-haskell text time utf8-string uuid
+         haskell-src-meta network old-locale postgresql-binary scientific
+         template-haskell text time utf8-string uuid
        ];
-       testDepends = [ base network time ];
-       jailbreak = true;
+       testDepends = [ base bytestring network time ];
        homepage = "https://github.com/dylex/postgresql-typed";
        description = "A PostgreSQL access library with compile-time SQL type inference";
        license = stdenv.lib.licenses.bsd3;
@@ -102553,10 +103012,8 @@ self: {
      }:
      mkDerivation {
        pname = "product-profunctors";
-       version = "0.6.1";
-       revision = "3";
-       sha256 = "0phwjngndgsggw2f74k6q43cnnw5w4nvfrfrmkwyz6hgah2zv562";
-       editedCabalFile = "01edcbebd6228c9fc9dbfbb173651e45cbca28cbd1dc55386a59dd24fb0a6ccd";
+       version = "0.6.3";
+       sha256 = "0mkir3anyccjzcqjybnmx4ijz2h0qnps48pc5giaszmfs9nv7p18";
        buildDepends = [ base contravariant profunctors template-haskell ];
        testDepends = [ base profunctors ];
        homepage = "https://github.com/tomjaguarpaw/product-profunctors";
@@ -102808,6 +103265,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "prometheus-client" = callPackage
+    ({ mkDerivation, atomic-primops, base, bytestring, containers
+     , doctest, hspec, mtl, QuickCheck, random-shuffle, stm, time
+     , transformers, utf8-string
+     }:
+     mkDerivation {
+       pname = "prometheus-client";
+       version = "0.1.0.1";
+       sha256 = "0bvp40rdlq8f6rh5v75pgqnmiwz85j960sfi22y7s0r5vykbgh5x";
+       buildDepends = [
+         atomic-primops base bytestring containers mtl stm time transformers
+         utf8-string
+       ];
+       testDepends = [
+         atomic-primops base bytestring containers doctest hspec mtl
+         QuickCheck random-shuffle stm time transformers utf8-string
+       ];
+       homepage = "https://github.com/fimad/prometheus-haskell";
+       description = "Haskell client library for http://prometheus.io.";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "prometheus-metrics-ghc" = callPackage
+    ({ mkDerivation, base, doctest, prometheus-client, utf8-string }:
+     mkDerivation {
+       pname = "prometheus-metrics-ghc";
+       version = "0.1.0.1";
+       sha256 = "15a7hli2fsjmgjnvhdsv1572nqj3i214b0r9bygdang4cjrjv10p";
+       buildDepends = [ base prometheus-client utf8-string ];
+       testDepends = [ base doctest prometheus-client ];
+       homepage = "https://github.com/fimad/prometheus-haskell";
+       description = "Metrics exposing GHC runtime information for use with prometheus-client";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "promise" = callPackage
     ({ mkDerivation, async, base }:
      mkDerivation {
@@ -102833,6 +103325,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "prompt" = callPackage
+    ({ mkDerivation, base, mtl, transformers, transformers-compat }:
+     mkDerivation {
+       pname = "prompt";
+       version = "0.1.0.0";
+       revision = "3";
+       sha256 = "16gnd5spccfjl6q6ybxciy9am5bkrzssi13dxl73zyklj37nf9hq";
+       editedCabalFile = "dc64376a5e4f99f5ef13edbcac5d80610d73f78d4362b9acf75cf90af485f3f9";
+       buildDepends = [ base mtl transformers transformers-compat ];
+       homepage = "https://github.com/mstksg/prompt";
+       description = "Monad (and transformer) for deferred-effect pure prompt-response queries";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "propane" = callPackage
     ({ mkDerivation, base, colour, containers, directory, filepath
      , repa, repa-devil, spawn
@@ -103015,13 +103521,13 @@ self: {
      }:
      mkDerivation {
        pname = "protocol-buffers";
-       version = "2.0.17";
-       sha256 = "12aky44ssgdj6vsjg0yvr8350cym7n6kn7gdaax0nxzpfxrjfy1v";
+       version = "2.1.0";
+       sha256 = "11shs04gv2b9xx13izc6bkgqvvs7gv8k05vviyhscj5rpiihl9zi";
        buildDepends = [
          array base binary bytestring containers directory filepath mtl
          parsec syb utf8-string
        ];
-       homepage = "http://code.haskell.org/protocol-buffers/";
+       homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103031,10 +103537,10 @@ self: {
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
        pname = "protocol-buffers-descriptor";
-       version = "2.0.17";
-       sha256 = "0jl041645d83iqqiw891d2k760jql6djvi2mmjh9lnmp48lwjy3p";
+       version = "2.1.0";
+       sha256 = "1id9pz8mxn7c6z433zib55fkx0s46316y6n2wpjk9zld21a2z5hy";
        buildDepends = [ base bytestring containers protocol-buffers ];
-       homepage = "http://code.haskell.org/protocol-buffers/";
+       homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103615,24 +104121,32 @@ self: {
      }) {};
 
   "purescript" = callPackage
-    ({ mkDerivation, base, boxes, containers, directory, file-embed
-     , filepath, haskeline, mtl, nodejs, optparse-applicative, parsec
-     , pattern-arrows, process, time, transformers, unordered-containers
-     , utf8-string
+    ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base
+     , bower-json, boxes, bytestring, containers, directory, dlist
+     , filepath, Glob, haskeline, HUnit, language-javascript, mtl
+     , nodejs, optparse-applicative, parsec, pattern-arrows, process
+     , safe, semigroups, split, syb, text, time, transformers
+     , transformers-compat, unordered-containers, utf8-string, vector
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.6.9.5";
-       sha256 = "196iq0jaryna4cgg7f07axccbnl5h82fvrjlry6839q05ndl83vf";
+       version = "0.7.0.0";
+       revision = "1";
+       sha256 = "02kb8xk2c3lzm8bdph7q93chgdpjz00mhk76kpr1hjfwr6kniw91";
+       editedCabalFile = "0ec2a8e9a05aab3ca9b407ea66b8501f2bf067f7dfa9e408ff200819e63ff31f";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base boxes containers directory file-embed filepath haskeline mtl
-         optparse-applicative parsec pattern-arrows process time
-         transformers unordered-containers utf8-string
+         aeson aeson-better-errors ansi-wl-pprint base bower-json boxes
+         bytestring containers directory dlist filepath Glob haskeline
+         language-javascript mtl optparse-applicative parsec pattern-arrows
+         process safe semigroups split syb text time transformers
+         transformers-compat unordered-containers utf8-string vector
        ];
        testDepends = [
-         base containers directory filepath mtl parsec process transformers
+         base containers directory filepath Glob haskeline HUnit mtl
+         optparse-applicative parsec process time transformers
+         transformers-compat
        ];
        buildTools = [ nodejs ];
        jailbreak = true;
@@ -105909,18 +106423,20 @@ self: {
 
   "redis-io" = callPackage
     ({ mkDerivation, async, attoparsec, auto-update, base, bytestring
-     , bytestring-conversion, containers, exceptions, monad-control, mtl
-     , network, operational, redis-resp, resource-pool, tasty
-     , tasty-hunit, time, tinylog, transformers, transformers-base
+     , bytestring-conversion, containers, exceptions, iproute
+     , monad-control, mtl, network, operational, redis-resp
+     , resource-pool, semigroups, stm, tasty, tasty-hunit, time, tinylog
+     , transformers, transformers-base
      }:
      mkDerivation {
        pname = "redis-io";
-       version = "0.4.1";
-       sha256 = "0xd0dwkh8l7m75fp7sla8wf07hlgjlgqkpsj9cnwfg4g1gyx2yy2";
+       version = "0.5.1";
+       sha256 = "13zj3d89drqdfq8202y982l7jp0nc3mmnmhwpxxfap0pb69n2s5m";
        buildDepends = [
          attoparsec auto-update base bytestring containers exceptions
-         monad-control mtl network operational redis-resp resource-pool time
-         tinylog transformers transformers-base
+         iproute monad-control mtl network operational redis-resp
+         resource-pool semigroups stm time tinylog transformers
+         transformers-base
        ];
        testDepends = [
          async base bytestring bytestring-conversion containers redis-resp
@@ -105928,7 +106444,7 @@ self: {
        ];
        homepage = "https://github.com/twittner/redis-io/";
        description = "Yet another redis client";
-       license = "unknown";
+       license = stdenv.lib.licenses.mpl20;
      }) {};
 
   "redis-resp" = callPackage
@@ -105939,9 +106455,9 @@ self: {
      mkDerivation {
        pname = "redis-resp";
        version = "0.3.2";
-       revision = "1";
+       revision = "2";
        sha256 = "07lvgq2l2fahhc9z3hjjjpx3n4rzdxl2l2ww9brxnv23432xpz97";
-       editedCabalFile = "74f97af6250dcf3b26d424e5a53a4a9bdcda5de4f7f4d5fc4d6b686f60f6d931";
+       editedCabalFile = "6375e871f3ad78efa6e4780c4e5c026fa4694f27e32f3837679fff42f488877f";
        buildDepends = [
          attoparsec base bytestring bytestring-conversion containers dlist
          double-conversion operational semigroups split transformers
@@ -106305,8 +106821,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-applicative";
-       version = "0.3.1";
-       sha256 = "1klmi101zfpngf8c7fp2ch48kadbw6xs5lg0h00x7wi0zfrdbf0y";
+       version = "0.3.2.1";
+       sha256 = "19swnf6mqjxg7d1wxr4h9drjm51af4hj4ax712n8702xfvfb4jmz";
        buildDepends = [ base containers transformers ];
        testDepends = [
          base containers smallcheck tasty tasty-hunit tasty-smallcheck
@@ -106968,8 +107484,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.5.0.3";
-       sha256 = "0kqhlnyl6gn1mm7ixz284xk78xrk1j80id6s0znpa6lpck2bszfz";
+       version = "0.5.1.0";
+       sha256 = "03n0jg79zirbq2rbp4gpbnr4lrmcv38pv7887d8qi2bm692z5qg5";
        buildDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -107503,13 +108019,14 @@ self: {
      }) {};
 
   "repline" = callPackage
-    ({ mkDerivation, base, containers, haskeline, mtl }:
+    ({ mkDerivation, base, containers, haskeline, mtl, process }:
      mkDerivation {
        pname = "repline";
-       version = "0.1.3.0";
-       sha256 = "0cdbsmcvgrizpkfkzalfzw2lxfh8hcm62h1h1gcly41y0acb5ka5";
-       buildDepends = [ base containers haskeline mtl ];
-       jailbreak = true;
+       version = "0.1.4.0";
+       sha256 = "16qi3lpgymn61nssv9k21v889xszycimp6i5602llnry6ks77bij";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base containers haskeline mtl process ];
        description = "Haskeline wrapper for GHCi-like REPL interfaces";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -107917,8 +108434,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-gen";
-       version = "0.17.0.6";
-       sha256 = "0pkqpycvsdbz2kk6lsq226rkgfrbwh49jky1wcik36yh3s9hfxdq";
+       version = "0.17.1";
+       sha256 = "0rblnqdqajlqkrf5dp03bj16y9nw0kkdjy8ry7j7f6mvkrdccbwl";
        buildDepends = [
          aeson base blaze-html Cabal code-builder directory fclabels
          filepath hashable haskell-src-exts HStringTemplate hxt json-schema
@@ -108114,8 +108631,8 @@ self: {
      }:
      mkDerivation {
        pname = "rethinkdb-client-driver";
-       version = "0.0.18";
-       sha256 = "1zj9b0k9v1pi66m8j36zv2i6dc2r8njlsjalfiifch3knpfadl4z";
+       version = "0.0.19";
+       sha256 = "0yzmypflg133dzy5yj2jmdk450zmr237prjvnaf9343jiy143nyi";
        buildDepends = [
          aeson base binary bytestring hashable mtl network old-locale
          scientific template-haskell text time unordered-containers vector
@@ -108377,23 +108894,23 @@ self: {
 
   "riak" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, blaze-builder
-     , bytestring, containers, monad-control, network
+     , bytestring, containers, HUnit, monad-control, network
      , protocol-buffers-fork, pureMD5, QuickCheck, random, resource-pool
-     , riak-protobuf, test-framework, test-framework-quickcheck2, text
-     , time
+     , riak-protobuf, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time
      }:
      mkDerivation {
        pname = "riak";
-       version = "0.7.2.1";
-       sha256 = "0i7lq6difvl6pskk6j4ajm3q3nliv802h4c74hkmkpqwf5n3pwa7";
+       version = "0.8.0.0";
+       sha256 = "16ncq22vhg62p1v1ch1jc1z3xds1qsr536fg3awvp7a0a8vyq528";
        buildDepends = [
          aeson attoparsec base binary blaze-builder bytestring containers
          monad-control network protocol-buffers-fork pureMD5 random
          resource-pool riak-protobuf text time
        ];
        testDepends = [
-         base bytestring QuickCheck test-framework
-         test-framework-quickcheck2
+         base bytestring containers HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 text
        ];
        homepage = "http://github.com/markhibberd/riak-haskell-client";
        description = "A Haskell client for the Riak decentralized data store";
@@ -108407,8 +108924,8 @@ self: {
      }:
      mkDerivation {
        pname = "riak-protobuf";
-       version = "0.18.0.0";
-       sha256 = "0vs8l2czbqhfgx4iyhqldrrnvdjbbq94pab33sw3nqbwij3012hw";
+       version = "0.19.0.0";
+       sha256 = "1954f8hgibmilqpf72pp2yf8nx9cm60gfk1ypmb99h69lf8d5x1y";
        buildDepends = [
          array base parsec protocol-buffers-descriptor-fork
          protocol-buffers-fork
@@ -108635,6 +109152,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rlglue" = callPackage
+    ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
+     , exceptions, network, network-simple, parsec, random, transformers
+     }:
+     mkDerivation {
+       pname = "rlglue";
+       version = "0.2.2.0";
+       sha256 = "0672j0xjlhyyfq2fbvnfc0gahihpkkcfh7nnbwh1salgy0ykzhq0";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base binary bytestring data-binary-ieee754 exceptions network
+         network-simple parsec random transformers
+       ];
+       jailbreak = true;
+       description = "A Haskell codec for RL-Glue";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "rmonad" = callPackage
     ({ mkDerivation, base, containers, HUnit, suitable, test-framework
      , test-framework-hunit, transformers
@@ -108921,8 +109457,8 @@ self: {
      }:
      mkDerivation {
        pname = "rosa";
-       version = "0.2.0.0";
-       sha256 = "198xzbzkalg7xlngrl52mh1iinipk6b00gnhmh6fnjrj1s61nqq6";
+       version = "0.2.1.0";
+       sha256 = "0qnvv8vyijjgb51pw5zfcmxy96nnnfrsvbg8xrnmq3p34xc168gb";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -111387,15 +111923,17 @@ self: {
      }:
      mkDerivation {
        pname = "second-transfer";
-       version = "0.5.4.0";
-       sha256 = "0942z5pdwy4dck3iprx9qafwzv006vkma0626yfarqqw2k5a4jjb";
+       version = "0.5.5.0";
+       sha256 = "0l973282vvgr65iy2q7xrj608lsny3krdw4mx1ia9mfvga8ybrg8";
        buildDepends = [
          attoparsec base base16-bytestring binary bytestring conduit
          containers exceptions hashable hashtables hslogger http2 lens
          network network-uri text time transformers
        ];
        testDepends = [
-         base bytestring conduit http2 HUnit lens transformers
+         attoparsec base base16-bytestring binary bytestring conduit
+         containers cpphs exceptions hashable hashtables hslogger http2
+         HUnit lens network network-uri text time transformers
        ];
        buildTools = [ cpphs ];
        extraLibraries = [ openssl ];
@@ -111880,6 +112418,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "seqalign" = callPackage
+    ({ mkDerivation, base, bytestring, vector }:
+     mkDerivation {
+       pname = "seqalign";
+       version = "0.2.0.4";
+       sha256 = "01a3fhymyp7279hym03zzz6qkh5h47nq5y1xglar0n46imjr98af";
+       buildDepends = [ base bytestring vector ];
+       description = "Sequence Alignment";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "seqid_0_1_0" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -111994,8 +112543,8 @@ self: {
     ({ mkDerivation, base, bytestring, containers, ghc, transformers }:
      mkDerivation {
        pname = "sequent-core";
-       version = "0.4";
-       sha256 = "07lgzdhywdv2jzzijnx01z587n8bb2smd48v15rir9v17fsfp105";
+       version = "0.5.0.1";
+       sha256 = "1q9rrr0nrnnhdv2jwpwjs1r98g3xdbqi7sfj7zsv1dykzalmc2nd";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base bytestring containers ghc transformers ];
@@ -112267,8 +112816,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-pandoc";
-       version = "0.4.0";
-       sha256 = "07cyw1d12hg5amjrbsmk2m2ch52yav16k8c3sh83xf42f2j05avs";
+       version = "0.4.1";
+       sha256 = "1kfs45z6pja2v4dambivc5cxx8dfr7vrjx38w0cfpmhyi5xz5jdp";
        buildDepends = [
          base bytestring http-media lens pandoc-types semigroupoids
          servant-docs text unordered-containers
@@ -113481,6 +114030,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "should-not-typecheck" = callPackage
+    ({ mkDerivation, base, deepseq, hspec, hspec-expectations, HUnit }:
+     mkDerivation {
+       pname = "should-not-typecheck";
+       version = "2.0";
+       sha256 = "0869dgn7xccnzxhzbjl150x0sdwwgppk06nq448i9xlnhhrk6dkc";
+       buildDepends = [ base deepseq HUnit ];
+       testDepends = [ base deepseq hspec hspec-expectations HUnit ];
+       homepage = "http://github.com/CRogers/should-not-typecheck";
+       description = "A HUnit/hspec assertion library to verify that an expression does not typecheck";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "show" = callPackage
     ({ mkDerivation, base, syb }:
      mkDerivation {
@@ -115098,12 +115660,12 @@ self: {
      }) {};
 
   "smoothie" = callPackage
-    ({ mkDerivation, base, linear, vector }:
+    ({ mkDerivation, aeson, base, linear, vector }:
      mkDerivation {
        pname = "smoothie";
-       version = "0.2.1";
-       sha256 = "07n0qhxhy800nyahfja8qdzk5ygvj4d2l7i2nwh3f3mqy5bp5jyz";
-       buildDepends = [ base linear vector ];
+       version = "0.3.2";
+       sha256 = "0al17y15k7y04dwz5v2bsq003lxzhkhqlbdmbljdr1z17yszcjp6";
+       buildDepends = [ aeson base linear vector ];
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several splines and polynomials";
        license = stdenv.lib.licenses.bsd3;
@@ -115756,13 +116318,18 @@ self: {
      }) {};
 
   "snaplet-hasql" = callPackage
-    ({ mkDerivation, base, hasql, hasql-backend, lens, mtl, snap }:
+    ({ mkDerivation, aeson, base, bytestring, clientsession
+     , configurator, hasql, hasql-backend, lens, mtl, snap, text, time
+     }:
      mkDerivation {
        pname = "snaplet-hasql";
-       version = "0.0.2";
-       sha256 = "1argaxdmr1znjgvhyj8cnbnygj98nan66la9n4knmbizaqy0yw3m";
-       buildDepends = [ base hasql hasql-backend lens mtl snap ];
-       jailbreak = true;
+       version = "1.0.2";
+       sha256 = "08gx096vg0swjc7z10nzlqsnjlr43cp190q4krkf08jb54ln3kcv";
+       buildDepends = [
+         aeson base bytestring clientsession configurator hasql
+         hasql-backend lens mtl snap text time
+       ];
+       homepage = "https://github.com/mikeplus64/snaplet-hasql";
        description = "A Hasql snaplet";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -116735,17 +117302,18 @@ self: {
      }) {};
 
   "som" = callPackage
-    ({ mkDerivation, base, containers, grid, MonadRandom, QuickCheck
-     , random, test-framework, test-framework-quickcheck2
+    ({ mkDerivation, assert, base, containers, deepseq, grid
+     , MonadRandom, QuickCheck, random, test-framework
+     , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "som";
-       version = "8.0.5";
-       sha256 = "1cprlv1mbs722ap3cicgi0haph9xlz2xvcm374857d11ly31wav0";
-       buildDepends = [ base containers grid MonadRandom ];
+       version = "8.0.6";
+       sha256 = "19p62b72xz1yn7fd9k406h98jg8zsyazbscdsljx7fnn0f3v7j9d";
+       buildDepends = [ assert base containers deepseq grid MonadRandom ];
        testDepends = [
-         base containers grid MonadRandom QuickCheck random test-framework
-         test-framework-quickcheck2
+         assert base containers grid MonadRandom QuickCheck random
+         test-framework test-framework-quickcheck2
        ];
        homepage = "https://github.com/mhwombat/som";
        description = "Self-Organising Maps";
@@ -117069,8 +117637,8 @@ self: {
      }:
      mkDerivation {
        pname = "sparse";
-       version = "0.9.1";
-       sha256 = "1pa1h21ca710fdjz60b79jg0v2lr0l11avpiynp9n1cw5bz137fk";
+       version = "0.9.2";
+       sha256 = "0ckjmpnav3rd40ylksrwc0awy4pigv6ngm15z1k6sicw73iyl3pd";
        buildDepends = [
          base contravariant deepseq hybrid-vectors lens primitive
          transformers vector vector-algorithms
@@ -117187,8 +117755,8 @@ self: {
     ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }:
      mkDerivation {
        pname = "spdx";
-       version = "0.0.1.0";
-       sha256 = "0k4lpny0fl6yz92m3040dmsqjcyb5gslf0306hlsqbsbn1gzjjmm";
+       version = "0.1.2.0";
+       sha256 = "0mncj2053w1xsfrsx1472v85ia4spvshw18mp15xp3l6haxq7wxq";
        buildDepends = [ base transformers ];
        testDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/phadej/spdx";
@@ -118217,9 +118785,9 @@ self: {
 
   "stack" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring
-     , base64-bytestring, bifunctors, binary, bytestring, Cabal, conduit
-     , conduit-combinators, conduit-extra, containers, cryptohash
-     , cryptohash-conduit, deepseq, directory, either
+     , base64-bytestring, bifunctors, binary, blaze-builder, bytestring
+     , Cabal, conduit, conduit-combinators, conduit-extra, containers
+     , cryptohash, cryptohash-conduit, deepseq, directory, either
      , enclosed-exceptions, exceptions, fast-logger, file-embed
      , filepath, hashable, hspec, http-client, http-client-tls
      , http-conduit, http-types, lifted-base, monad-control
@@ -118233,23 +118801,25 @@ self: {
      }:
      mkDerivation {
        pname = "stack";
-       version = "0.1.0.0";
-       sha256 = "0ws0d1gran02jag06176w5c2wrc13q5hp82mxdmm9sif93k2cvg6";
+       version = "9.9.9";
+       revision = "2";
+       sha256 = "1kpsza23b22mg970c2qs943khzad38imzsa1xzki2a3xvfiadana";
+       editedCabalFile = "e8298be03ed84f7858e9ce16a677a272c3a31b7e5180e094fa9ee120b03c6299";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson async attoparsec base base16-bytestring base64-bytestring
-         bifunctors binary bytestring Cabal conduit conduit-combinators
-         conduit-extra containers cryptohash cryptohash-conduit deepseq
-         directory either enclosed-exceptions exceptions fast-logger
-         file-embed filepath hashable http-client http-client-tls
-         http-conduit http-types lifted-base monad-control monad-logger
-         monad-loops mtl old-locale optparse-applicative optparse-simple
-         path persistent persistent-sqlite persistent-template pretty
-         process resourcet safe split stm streaming-commons tar
-         template-haskell temporary text time transformers transformers-base
-         unix unordered-containers vector vector-binary-instances void word8
-         yaml zlib
+         bifunctors binary blaze-builder bytestring Cabal conduit
+         conduit-combinators conduit-extra containers cryptohash
+         cryptohash-conduit deepseq directory either enclosed-exceptions
+         exceptions fast-logger file-embed filepath hashable http-client
+         http-client-tls http-conduit http-types lifted-base monad-control
+         monad-logger monad-loops mtl old-locale optparse-applicative
+         optparse-simple path persistent persistent-sqlite
+         persistent-template pretty process resourcet safe split stm
+         streaming-commons tar template-haskell temporary text time
+         transformers transformers-base unix unordered-containers vector
+         vector-binary-instances void word8 yaml zlib
        ];
        testDepends = [
          async base bytestring Cabal conduit conduit-extra containers
@@ -118257,10 +118827,10 @@ self: {
          monad-logger path process resourcet temporary text transformers
          unix-compat
        ];
+       jailbreak = true;
        homepage = "https://github.com/commercialhaskell/stack";
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-prism" = callPackage
@@ -118620,6 +119190,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "stash" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, directory
+     , hashable, text, vector
+     }:
+     mkDerivation {
+       pname = "stash";
+       version = "0.1";
+       sha256 = "01h3s19agw2aa6a0hw8f9k2qibmckqllvnx2yy2w2p1xlw8g9jwm";
+       buildDepends = [
+         aeson attoparsec base bytestring directory hashable text vector
+       ];
+       description = "To be written";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "state" = callPackage
     ({ mkDerivation, arrows, base, mtl }:
      mkDerivation {
@@ -120099,8 +120684,8 @@ self: {
      }:
      mkDerivation {
        pname = "structural-induction";
-       version = "0.2.0.1";
-       sha256 = "0ac5yhx6cbxzcdqy74lp791xwgammsnd8jazx0xy3ngxn4wwf23r";
+       version = "0.3";
+       sha256 = "1wykd33phjmz2aky2dynsxmrmxqpkh4h41majq57lh3dag87cwax";
        buildDepends = [ base containers genifunctors mtl pretty safe ];
        testDepends = [
          base geniplate language-haskell-extract mtl pretty QuickCheck safe
@@ -120267,6 +120852,30 @@ self: {
        license = "GPL";
      }) {};
 
+  "subhask" = callPackage
+    ({ mkDerivation, approximate, base, bloomfilter, bytes, bytestring
+     , cassava, containers, deepseq, erf, gamma, ghc-prim, hmatrix
+     , hyperloglog, lens, monad-primitive, MonadRandom, mtl, parallel
+     , pipes, primitive, QuickCheck, semigroups, template-haskell
+     , test-framework, test-framework-quickcheck2, vector
+     }:
+     mkDerivation {
+       pname = "subhask";
+       version = "0.1.0.1";
+       sha256 = "17r26mccarr9m7wxvax3bmwz94gcaxg732797js1qa12fdnbsn8m";
+       buildDepends = [
+         approximate base bloomfilter bytes bytestring cassava containers
+         deepseq erf gamma ghc-prim hmatrix hyperloglog lens monad-primitive
+         MonadRandom mtl parallel pipes primitive QuickCheck semigroups
+         template-haskell vector
+       ];
+       testDepends = [ base test-framework test-framework-quickcheck2 ];
+       jailbreak = true;
+       homepage = "http://github.com/mikeizbicki/subhask";
+       description = "Type safe interface for programming in subcategories of Hask";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "subnet" = callPackage
     ({ mkDerivation, base, split }:
      mkDerivation {
@@ -120821,6 +121430,7 @@ self: {
        jailbreak = true;
        description = "A simple web server for serving directories, similar to weborf";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syb" = callPackage
@@ -121383,8 +121993,8 @@ self: {
      }:
      mkDerivation {
        pname = "sys-process";
-       version = "0.1.5";
-       sha256 = "1lpysza901xv4942pixbgccpxh4rc8z9v819fb45zyxfakjcywbj";
+       version = "0.1.6";
+       sha256 = "04f6mbkc61qx8wjf95kwxhrqhv2qprl2wa73rkgsq8nc18gicf3q";
        buildDepends = [
          base bifunctors directory filepath lens mtl notzero process
          semigroupoids semigroups transformers
@@ -121874,8 +122484,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "tagged";
-       version = "0.8.0.1";
-       sha256 = "1w1xi107lmp8pfhf9d6hmaji2lp7himx0hqc8gh81w2rpr8g3bjh";
+       version = "0.8.1";
+       sha256 = "1hc2qzhhz5p1xd8k03sklrdnhcflkwhgpl82k6fam8yckww9ipav";
        buildDepends = [ base template-haskell ];
        homepage = "http://github.com/ekmett/tagged";
        description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
@@ -121980,7 +122590,9 @@ self: {
      mkDerivation {
        pname = "taggy";
        version = "0.2.0";
+       revision = "1";
        sha256 = "01q2ccf3a8akaifh79ajnfr5yrjsq4xihq0pl7lsz173n7mhnsy3";
+       editedCabalFile = "0343ad030ba4e9fd651b383e92c213c6c4a6560ec33f561cfcfa9c5493deb50b";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -123620,6 +124232,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "testing-type-modifiers" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "testing-type-modifiers";
+       version = "0.1.0.1";
+       sha256 = "1wh2n95n39ivv6kbqn42vbzrj8zagsmk6f2al2qj40bg5kgdl2q5";
+       buildDepends = [ base ];
+       description = "Data type modifiers for property based testing";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "testloop" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, fsnotify, hint
      , mtl, system-filepath, time, unix
@@ -123719,8 +124342,8 @@ self: {
      }:
      mkDerivation {
        pname = "texmath";
-       version = "0.8.2";
-       sha256 = "1dqx00ai4cgvrih0pwk46iajcpdq6a2dn8ndy1lficgqld6dvdzr";
+       version = "0.8.2.2";
+       sha256 = "1wy2rr18wsn9q06arrxibahpsnr8bqrzsimmpgwji6nxpzc95x51";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -124050,23 +124673,25 @@ self: {
 
   "text-show" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, bytestring
-     , bytestring-builder, ghc-prim, hspec, integer-gmp, nats
-     , QuickCheck, quickcheck-instances, semigroups, tagged
-     , template-haskell, text, transformers, transformers-compat, void
+     , bytestring-builder, containers, generic-deriving, ghc-prim, hspec
+     , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups
+     , tagged, template-haskell, text, transformers, transformers-compat
+     , void
      }:
      mkDerivation {
        pname = "text-show";
-       version = "0.8.1.1";
-       sha256 = "130nqg0fgvnzi5zl0c0cwxjm2jppjmxm9z04g0rv498cl783ag45";
+       version = "1";
+       sha256 = "1ac8pk2nsbzl080r2qqm6jmkq3yq4rx6czfdsfkxydxyklrvi83d";
        buildDepends = [
-         array base base-compat bytestring bytestring-builder ghc-prim
-         integer-gmp nats semigroups tagged template-haskell text
-         transformers void
+         array base base-compat bytestring bytestring-builder containers
+         generic-deriving ghc-prim integer-gmp nats semigroups tagged
+         template-haskell text transformers void
        ];
        testDepends = [
          array base base-compat base-orphans bytestring bytestring-builder
-         ghc-prim hspec nats QuickCheck quickcheck-instances tagged text
-         transformers transformers-compat void
+         generic-deriving ghc-prim hspec nats QuickCheck
+         quickcheck-instances tagged text transformers transformers-compat
+         void
        ];
        homepage = "https://github.com/RyanGlScott/text-show";
        description = "Efficient conversion of values into Text";
@@ -124074,30 +124699,29 @@ self: {
      }) {};
 
   "text-show-instances" = callPackage
-    ({ mkDerivation, base, base-compat, binary, bytestring, containers
-     , directory, haskeline, hoopl, hpc, hspec, old-locale, old-time
-     , pretty, QuickCheck, quickcheck-instances, random, semigroups
-     , tagged, template-haskell, terminfo, text, text-show, time
-     , transformers, transformers-compat, unix, unordered-containers
-     , utf8-string, vector, xhtml
+    ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
+     , containers, directory, 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 = "0.4";
-       sha256 = "1zk3q11dsr8n15r6r9dhqwyh6irqv6s2q7mkgzlgzw1narvllil2";
+       version = "1";
+       sha256 = "0503bb8yy952gs5ywndm0qm2v1z5xm1k09vcwrnsxx979irmpksh";
        buildDepends = [
-         base base-compat binary bytestring containers directory haskeline
-         hoopl hpc old-locale old-time pretty random semigroups tagged
-         template-haskell terminfo text text-show time transformers
-         transformers-compat unix unordered-containers utf8-string vector
-         xhtml
+         base base-compat bifunctors binary bytestring containers directory
+         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
        ];
        testDepends = [
-         base base-compat binary bytestring containers directory haskeline
-         hoopl hpc hspec old-locale old-time pretty QuickCheck
-         quickcheck-instances random semigroups tagged template-haskell
-         terminfo text-show time transformers transformers-compat unix
-         unordered-containers utf8-string vector xhtml
+         base base-compat bifunctors binary bytestring containers directory
+         ghc-prim haskeline hoopl hpc hspec old-locale old-time pretty
+         QuickCheck quickcheck-instances random semigroups tagged
+         template-haskell terminfo 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";
@@ -125587,8 +126211,8 @@ self: {
      }:
      mkDerivation {
        pname = "timeplot";
-       version = "1.0.28";
-       sha256 = "1bazhm0hlhhkw6vhn34hsk8xk0h3k2dlram5xhpnn51g7z2b9v71";
+       version = "1.0.29";
+       sha256 = "01px3hyl5hb114jibjr3p6pda6ppvxv2alk31wwc82dywnjp1srx";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -125596,6 +126220,7 @@ self: {
          containers data-default lens regex-tdfa strptime template-haskell
          time transformers vcs-revision
        ];
+       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Timeplot";
        description = "A tool for visualizing time series from log files";
        license = stdenv.lib.licenses.bsd3;
@@ -125603,20 +126228,18 @@ self: {
      }) {};
 
   "timerep" = callPackage
-    ({ mkDerivation, attoparsec, base, Cabal, cabal-test-quickcheck
-     , monoid-subclasses, QuickCheck, text, time, time-locale-compat
+    ({ mkDerivation, attoparsec, base, monoid-subclasses, QuickCheck
+     , tasty, tasty-hunit, tasty-quickcheck, text, time
      }:
      mkDerivation {
        pname = "timerep";
-       version = "2.0.0";
-       sha256 = "1s2m5z36ll4r2xijw6jv0wblva79jpzz6737l607hn3pvq13nbzz";
-       buildDepends = [
-         attoparsec base monoid-subclasses text time time-locale-compat
-       ];
+       version = "2.0.0.1";
+       sha256 = "0rk3svwx7axp77v92j1gpmnni0jlniw3sz55q5hpa6k43d2jr4b8";
+       buildDepends = [ attoparsec base monoid-subclasses text time ];
        testDepends = [
-         base Cabal cabal-test-quickcheck QuickCheck text time
-         time-locale-compat
+         base QuickCheck tasty tasty-hunit tasty-quickcheck text time
        ];
+       homepage = "https://github.com/HugoDaniel/timerep";
        description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125764,7 +126387,9 @@ self: {
      mkDerivation {
        pname = "tinylog";
        version = "0.12.1";
+       revision = "1";
        sha256 = "1hh70788d0rd35raybix383s6bb3mnibmmpdxwbqybv2dgmm4jq9";
+       editedCabalFile = "b0e1cd3e83f3745355d1183935660d4b02ed152083da7af0ea4f386e155db04d";
        buildDepends = [
          auto-update base bytestring containers double-conversion
          fast-logger text transformers unix-time
@@ -125892,6 +126517,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tld" = callPackage
+    ({ mkDerivation, base, containers, network-uri, template-haskell
+     , text
+     }:
+     mkDerivation {
+       pname = "tld";
+       version = "0.1.0.1";
+       sha256 = "1lda1h8ibkmnhxhnkfd1kj6aybk5w4s3hzhh379zrqbckdl0vfxb";
+       buildDepends = [
+         base containers network-uri template-haskell text
+       ];
+       jailbreak = true;
+       description = "This project separates subdomains, domains, and top-level-domains from URLs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tls" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, async, base, byteable
      , bytestring, cereal, cryptonite, data-default-class, hourglass
@@ -127080,9 +127721,9 @@ self: {
      mkDerivation {
        pname = "ttrie";
        version = "0.1.2";
-       revision = "1";
+       revision = "2";
        sha256 = "09nbba623nxnlg1957sgcrrva3ycwb31asxnxihwjh0wxrqhh1k0";
-       editedCabalFile = "60673b32699d1b010c285811c892a1aa7b8890733083c82148ecd033b4db1222";
+       editedCabalFile = "f517a1ee4ab2eeefe39ec336a793845f84333835c59c3e90f885dd0711f8fbc0";
        buildDepends = [ atomic-primops base hashable primitive stm ];
        testDepends = [
          base containers hashable QuickCheck stm test-framework
@@ -127180,6 +127821,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tuple-generic" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "tuple-generic";
+       version = "0.5.0.0";
+       sha256 = "0cbmiwmwav0g9di1s0sdry9shijqzpb9zaag9dz95w65wgqkfzbw";
+       buildDepends = [ base ];
+       homepage = "http://github.com/aelve/tuple-generic";
+       description = "Generic operations on tuples";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "tuple-hlist" = callPackage
     ({ mkDerivation, base, HList, OneTuple }:
      mkDerivation {
@@ -127225,8 +127878,8 @@ self: {
     ({ mkDerivation, base, containers, template-haskell }:
      mkDerivation {
        pname = "tuple-th";
-       version = "0.2.4";
-       sha256 = "1bhdg1yld8rbkc46fg04l32sk0pxwmbpvp9fmdp2b3snrg8hkvkn";
+       version = "0.2.5";
+       sha256 = "1mrl4vvxmby7sf1paf7hklzidnr6wq55822i73smqyz0xpf3gsjn";
        buildDepends = [ base containers template-haskell ];
        description = "Generate (non-recursive) utility functions for tuples of statically known size";
        license = stdenv.lib.licenses.bsd3;
@@ -127299,6 +127952,7 @@ self: {
          system-filepath temporary text time transformers unix
        ];
        testDepends = [ base doctest ];
+       jailbreak = true;
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128501,19 +129155,20 @@ self: {
 
   "uacpid" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, hslogger
-     , mtl, network, old-locale, process, regex-compat, time, unix
+     , mtl, network, process, regex-compat, time, time-locale-compat
+     , unix
      }:
      mkDerivation {
        pname = "uacpid";
-       version = "1.0.3.0";
-       sha256 = "02l88vpjs6qc0rwa4kn438i1gwc376sj8g2h5xqm3pz7adwfv24a";
+       version = "1.2";
+       sha256 = "1ml02xap95vxvzwqlqp68hfk7yjncf3xc1h13gga0nlhby9rjv14";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base containers directory filepath hslogger mtl network old-locale
-         process regex-compat time unix
+         base containers directory filepath hslogger mtl network process
+         regex-compat time time-locale-compat unix
        ];
-       homepage = "http://ui3.info/d/proj/uacpid.html";
+       homepage = "http://hub.darcs.net/dino/uacpid";
        description = "Userspace Advanced Configuration and Power Interface event daemon";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129899,8 +130554,8 @@ self: {
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.1.5";
-       sha256 = "0pl00n40b1nc3rnvayk8jz9lgv0s1lp33czyg962jdbffwhqgszj";
+       version = "0.1.6";
+       sha256 = "0wz45jrxrj2mqx26nv39hy962acmzchp97lbf3d2mjna9zcd1ij6";
        buildDepends = [ attoparsec base blaze-builder bytestring ];
        testDepends = [
          attoparsec base blaze-builder bytestring derive HUnit lens
@@ -130089,17 +130744,14 @@ self: {
      }) {};
 
   "urlencoded" = callPackage
-    ({ mkDerivation, base, mtl, network, split }:
+    ({ mkDerivation, base, mtl, network, network-uri, split }:
      mkDerivation {
        pname = "urlencoded";
-       version = "0.4.0";
-       revision = "1";
-       sha256 = "0idh70apfxx8bkbsxda4xhb0b5xf4x237dwi4v55ildrhxx4b68k";
-       editedCabalFile = "50c264958ee35f9fedb8b5e7e9640cb46d802b8f64dacc48802993e280c806a9";
+       version = "0.4.1";
+       sha256 = "16b7jxkfva8dyvl4fdg337jmv08aicycj041s79ak9r6zh41hhwi";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base mtl network split ];
-       jailbreak = true;
+       buildDepends = [ base mtl network network-uri split ];
        homepage = "https://github.com/pheaver/urlencoded";
        description = "Generate or process x-www-urlencoded data";
        license = stdenv.lib.licenses.bsd3;
@@ -130343,6 +130995,7 @@ self: {
          attoparsec base bytestring Cabal clock exceptions QuickCheck
          test-framework test-framework-quickcheck2 text
        ];
+       jailbreak = true;
        homepage = "https://github.com/lpeterse/haskell-utc";
        description = "A pragmatic time and date library";
        license = stdenv.lib.licenses.mit;
@@ -131104,8 +131757,8 @@ self: {
      }:
      mkDerivation {
        pname = "vcache-trie";
-       version = "0.1.1";
-       sha256 = "12nfik4fp5snxf8w3kp6r6v327i9izs18aflj90ib0gq267qrlnk";
+       version = "0.2.0";
+       sha256 = "0d56l8339ak9my6c37j3mykmfzz67405xyb90pl0i5lf35mbff32";
        buildDepends = [ array base bytestring bytestring-builder vcache ];
        homepage = "http://github.com/dmbarbour/haskell-vcache-trie";
        description = "patricia tries modeled above VCache";
@@ -132839,6 +133492,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wai-middleware-prometheus" = callPackage
+    ({ mkDerivation, base, bytestring, data-default, doctest
+     , http-types, prometheus-client, text, time, wai
+     }:
+     mkDerivation {
+       pname = "wai-middleware-prometheus";
+       version = "0.1.0.1";
+       sha256 = "0drhprxja1pp0mibs2f4asl4mycy91pvyanxa0h364k9v6fwp93d";
+       buildDepends = [
+         base bytestring data-default http-types prometheus-client text time
+         wai
+       ];
+       testDepends = [ base doctest prometheus-client ];
+       homepage = "https://github.com/fimad/prometheus-haskell";
+       description = "WAI middlware for exposing http://prometheus.io metrics.";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "wai-middleware-route" = callPackage
     ({ mkDerivation, base, bytestring, http-types, HUnit
      , test-framework, test-framework-hunit, text, wai, wai-test
@@ -133056,8 +133727,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-session";
-       version = "0.3.1";
-       sha256 = "1h2z1zahbrlw9r489vd6xjwra7nmy67lmv77gr912zls5fpf9aws";
+       version = "0.3.2";
+       sha256 = "09l3gj8l127iybr8h4xcjxxcgz5b1mcy5iyyaidixnzi7jlrqww3";
        buildDepends = [
          base blaze-builder bytestring containers cookie http-types StateVar
          time transformers vault wai
@@ -133845,8 +134516,8 @@ self: {
      }:
      mkDerivation {
        pname = "webdriver";
-       version = "0.6.1";
-       sha256 = "1464i2hzriimhykgi0sinndyz3r7vajkzpwyp80fc75piq6vr7wi";
+       version = "0.6.2";
+       sha256 = "1cr668vn51bsdwxk6az4dk8zcsgy1y5vhb7xb9mahhbv1anpnzgr";
        buildDepends = [
          aeson attoparsec base base64-bytestring bytestring cond
          data-default directory directory-tree exceptions filepath
@@ -134591,6 +135262,7 @@ self: {
        extraLibraries = [ wlc ];
        description = "Haskell bindings for the wlc library";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { wlc = null;};
 
   "wobsurv" = callPackage
@@ -135526,6 +136198,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "xcp" = callPackage
+    ({ mkDerivation, base, bytestring, containers, mtl, network
+     , transformers
+     }:
+     mkDerivation {
+       pname = "xcp";
+       version = "0.1.0.1";
+       sha256 = "1hx9avr6zinrqar0c1zh0l49gy0d61gch8ff12am7zjxk7lbmmzs";
+       buildDepends = [
+         base bytestring containers mtl network transformers
+       ];
+       description = "Partial implementation of the XCP protocol with ethernet as transport layer";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "xdg-basedir" = callPackage
     ({ mkDerivation, base, directory, filepath }:
      mkDerivation {
@@ -135814,23 +136501,23 @@ self: {
 
   "xlsior" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-markup, bytestring
-     , conduit, conduit-extra, data-default, exceptions, mtl, old-locale
-     , resourcet, scientific, text, time, vector, xml-conduit, xml-types
-     , zip-archive
+     , conduit, conduit-extra, data-default, exceptions, mtl, resourcet
+     , scientific, text, time, time-locale-compat, vector, xml-conduit
+     , xml-types, zip-archive
      }:
      mkDerivation {
        pname = "xlsior";
-       version = "0.1.0.0";
-       sha256 = "0gi8dh3iflny70dfylsin88j176i7nplhsrd09c8a6cbz93w1bd6";
+       version = "0.1.0.1";
+       sha256 = "0dkb3dkc2srvc1951hv6m69z3d7xprsaj7lsdkj9npykqpv6nkgk";
        buildDepends = [
          attoparsec base blaze-markup bytestring conduit conduit-extra
-         data-default exceptions mtl old-locale resourcet scientific text
-         time vector xml-conduit xml-types zip-archive
+         data-default exceptions mtl resourcet scientific text time
+         time-locale-compat vector xml-conduit xml-types zip-archive
        ];
        testDepends = [
-         base blaze-markup bytestring old-locale text time zip-archive
+         base blaze-markup bytestring text time time-locale-compat
+         zip-archive
        ];
-       jailbreak = true;
        description = "Streaming Excel file generation and parsing";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136599,10 +137286,10 @@ self: {
     ({ mkDerivation, base, gtk, xmonad }:
      mkDerivation {
        pname = "xmonad-screenshot";
-       version = "0.1.1.0";
-       sha256 = "1iy6c8dis5jkgamkbbgxvbajz8f03bwhwdwk46l6wvlgmb072wl4";
+       version = "0.1.2";
+       sha256 = "1m7bmdhc1nlwflli1ymnjlmysg9d54w0shpxq05xwmiycg4jbwr1";
        buildDepends = [ base gtk xmonad ];
-       homepage = "http://github.com/supki/xmonad-screenshot";
+       homepage = "https://github.com/supki/xmonad-screenshot";
        description = "Workspaces screenshooting utility for XMonad";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137257,13 +137944,19 @@ self: {
      }) {};
 
   "yampa-glut" = callPackage
-    ({ mkDerivation, base, GLUT, newtype, OpenGL, vector-space, Yampa
+    ({ mkDerivation, base, GLUT, newtype, OpenGL, vector-space
+     , vector-space-opengl, Yampa-core
      }:
      mkDerivation {
        pname = "yampa-glut";
-       version = "0.1.1";
-       sha256 = "0sp4fwi3ibmd32vs7kdak7vrk3i2bayk2flcc617x2ax9250iyhv";
-       buildDepends = [ base GLUT newtype OpenGL vector-space Yampa ];
+       version = "0.1.1.1";
+       sha256 = "0163whn909s4zzmhgnbs0x90ky6kxvr6630g650i69hhqapbihpp";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base GLUT newtype OpenGL vector-space vector-space-opengl
+         Yampa-core
+       ];
        homepage = "https://github.com/ony/yampa-glut";
        description = "Connects Yampa and GLUT";
        license = stdenv.lib.licenses.gpl3;
@@ -137500,21 +138193,21 @@ self: {
      , 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, persistent, persistent-template, random, resourcet
-     , safe, shakespeare, template-haskell, text, time, transformers
-     , unordered-containers, wai, yesod-core, yesod-form
+     , 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.5.1";
-       sha256 = "161gij0r82raih9lvdws4vsknpm36m00ikd17vhhlzz01q9z7l64";
+       version = "1.4.6";
+       sha256 = "0c0h1pivqk276l0l7nlrwpswvg72x39ikyfzbdnmxgmain878v2x";
        buildDepends = [
          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 persistent persistent-template random
+         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
        ];
@@ -137579,13 +138272,12 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-basic";
-       version = "0.1.0.1";
-       sha256 = "1q4fb2s71bg7r282327rsgvgcghq911knm8wf5yfq53s0k4dxkki";
+       version = "0.1.0.2";
+       sha256 = "0b4vyf731wb7idmbqz7n8zm4p7i7y66x94ph7kaxv1jvq05k7bxa";
        buildDepends = [
          base base64-bytestring bytestring exceptions text wai word8 yesod
        ];
        testDepends = [ base hlint hspec text yesod yesod-test ];
-       jailbreak = true;
        description = "Yesod Middleware for HTTP Basic Authentication";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137730,8 +138422,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-oauth2";
-       version = "0.1.1";
-       sha256 = "13z3h1x9n414vi7k2aqpwcxr7839lljwcrpxybazlf82zkwl4kj2";
+       version = "0.1.2";
+       sha256 = "1bprc8n2f591igm5yfrxga7zim5vyib07h413ainhfc7g8pbaky9";
        buildDepends = [
          aeson authenticate base bytestring hoauth2 http-conduit http-types
          lifted-base network-uri random text transformers yesod-auth
@@ -137811,8 +138503,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.10";
-       sha256 = "1h55155l7ca664zdwq1x0c6p43gy35p1vvghpgd0ajzip8lsyfq1";
+       version = "1.4.11";
+       sha256 = "0n9ssbg7iggrgmxn3hb8niqic2rf453a4fqp0g9xx1rz6p323dv2";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -137886,8 +138578,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-core";
-       version = "1.4.11";
-       sha256 = "1lfbpfv43vjxx8r1yf8py64sai14abwwq7395gs45vk059zi5hfs";
+       version = "1.4.12";
+       sha256 = "1sdp2lg88c9gnwr3ffa8kj2vdd3y2kd7ark4qrm4gab07x2qflq3";
        buildDepends = [
          aeson auto-update base blaze-builder blaze-html blaze-markup
          bytestring case-insensitive cereal clientsession conduit
@@ -138461,6 +139153,7 @@ self: {
          mtl purescript regex-tdfa regex-tdfa-text shakespeare system-fileio
          system-filepath template-haskell text time transformers yesod-core
        ];
+       jailbreak = true;
        homepage = "https://github.com/mpietrzak/yesod-purescript";
        description = "PureScript integration for Yesod";
        license = stdenv.lib.licenses.mit;
@@ -138696,8 +139389,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-table";
-       version = "0.1.3";
-       sha256 = "1phbjcry1drl98ivv7yjqvwcray134zh9xqj37p1p7ki1850id3p";
+       version = "1.0.0";
+       sha256 = "0dy1rpwrccp6fcl91wb0f46djdkkzfdh870ylb9339msfgv9zchj";
        buildDepends = [ base containers contravariant text yesod-core ];
        homepage = "https://github.com/andrewthad/yesod-table";
        description = "HTML tables for Yesod";
@@ -139334,8 +140027,8 @@ self: {
      }:
      mkDerivation {
        pname = "yst";
-       version = "0.5.0.3";
-       sha256 = "15r381vsffqyzvgksipik0y9f41sy8ylsmvzw7hih4nrzp0w32ch";
+       version = "0.5.0.4";
+       sha256 = "1bnmh7caj9s6sfj2hhfwdnsg75wci1qw8c3pwryqy57knwcwbvkz";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -139430,6 +140123,7 @@ self: {
        buildDepends = [ base containers mtl ];
        testDepends = [ base hspec QuickCheck ];
        extraLibraries = [ gomp z3 ];
+       preBuild = stdenv.lib.optionalString stdenv.isDarwin "export DYLD_LIBRARY_PATH=${z3}/lib";
        homepage = "http://bitbucket.org/iago/z3-haskell";
        description = "Bindings for the Z3 Theorem Prover";
        license = stdenv.lib.licenses.bsd3;

From d0f1e6626b10e56b9be428083b51562c20bad556 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 25 Jun 2015 12:22:40 +0200
Subject: [PATCH 1895/2322] haskell-socket: test suite tries to access the
 network

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c0d231616d9..6016ab57236 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -327,14 +327,15 @@ self: super: {
   raven-haskell = dontCheck super.raven-haskell;        # http://hydra.cryp.to/build/502053/log/raw
   riak = dontCheck super.riak;                          # http://hydra.cryp.to/build/498763/log/raw
   scotty-binding-play = dontCheck super.scotty-binding-play;
+  serversession-backend-redis = dontCheck super.serversession-backend-redis;
   slack-api = dontCheck super.slack-api;                # https://github.com/mpickering/slack-api/issues/5
+  socket = dontCheck super.socket;
   stackage = dontCheck super.stackage;                  # http://hydra.cryp.to/build/501867/nixlog/1/raw
   textocat-api = dontCheck super.textocat-api;          # http://hydra.cryp.to/build/887011/log/raw
   warp = dontCheck super.warp;                          # http://hydra.cryp.to/build/501073/nixlog/5/raw
   wreq = dontCheck super.wreq;                          # http://hydra.cryp.to/build/501895/nixlog/1/raw
   wreq-sb = dontCheck super.wreq-sb;                    # http://hydra.cryp.to/build/783948/log/raw
   wuss = dontCheck super.wuss;                          # http://hydra.cryp.to/build/875964/nixlog/2/raw
-  serversession-backend-redis = dontCheck super.serversession-backend-redis;
 
   # https://github.com/NICTA/digit/issues/3
   digit = dontCheck super.digit;

From 63406af616898b245ccc6efe58829eba7701e5f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 25 Jun 2015 12:40:39 +0200
Subject: [PATCH 1896/2322] haskell-acme-one exports no library modules, so we
 shouldn't run Haddock

---
 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 6016ab57236..16152dc0468 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -135,6 +135,7 @@ self: super: {
   });
 
   # The Haddock phase fails for one reason or another.
+  acme-one = dontHaddock super.acme-one;
   attoparsec-conduit = dontHaddock super.attoparsec-conduit;
   base-noprelude = dontHaddock super.base-noprelude;
   blaze-builder-conduit = dontHaddock super.blaze-builder-conduit;

From 34f10a82e080fe8fa4f82aff310a4fe14c4384d1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 25 Jun 2015 12:44:01 +0200
Subject: [PATCH 1897/2322] haskell-digitalocean-kzs: can't run its test suite

---
 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 16152dc0468..0aa265656a9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -314,6 +314,7 @@ self: super: {
   bitx-bitcoin = dontCheck super.bitx-bitcoin;          # http://hydra.cryp.to/build/926187/log/raw
   concurrent-dns-cache = dontCheck super.concurrent-dns-cache;
   dbus = dontCheck super.dbus;                          # http://hydra.cryp.to/build/498404/log/raw
+  digitalocean-kzs = dontCheck super.digitalocean-kzs;  # https://github.com/KazumaSATO/digitalocean-kzs/issues/1
   hadoop-rpc = dontCheck super.hadoop-rpc;              # http://hydra.cryp.to/build/527461/nixlog/2/raw
   hasql = dontCheck super.hasql;                        # http://hydra.cryp.to/build/502489/nixlog/4/raw
   hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });

From 101d0db511a992006a5680fad8cbcc1b7d43283b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 25 Jun 2015 12:44:17 +0200
Subject: [PATCH 1898/2322] haskell-hid: build is broken

---
 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 0aa265656a9..52abb9951d8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -884,4 +884,8 @@ self: super: {
   # https://github.com/commercialhaskell/stack/issues/409
   stack = overrideCabal super.stack (drv: { preCheck = "export HOME=$TMPDIR"; doCheck = false; });
 
+  # Missing dependency on some hid-usb library.
+  hid = markBroken super.hid;
+  msi-kb-backlit = dontDistribute super.msi-kb-backlit;
+
 }

From 7871f2d9b1daea314990ffcc39971c3ac329670a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 27 Jun 2015 21:08:42 +0200
Subject: [PATCH 1899/2322] haskell-Frames depends on broken singletons
 library.

---
 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 52abb9951d8..07936619c47 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -806,6 +806,7 @@ self: super: {
   # https://github.com/goldfirere/singletons/issues/118
   clash-lib = dontDistribute super.clash-lib;
   clash-verilog = dontDistribute super.clash-verilog;
+  Frames = dontDistribute super.Frames;
   hgeometry = dontDistribute super.hgeometry;
   hipe = dontDistribute super.hipe;
   singleton-nats = dontDistribute super.singleton-nats;

From 9d69ce4237bb611a09bf058a3f4e05838b06d62b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 26 Jun 2015 14:23:33 +0200
Subject: [PATCH 1900/2322] hackage-packages.nix: drop package "som" to avoid
 invalid references to "assert"

---
 .../haskell-modules/hackage-packages.nix      | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a8e23065aef..8c8dc0961ab 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -117301,25 +117301,6 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {};
 
-  "som" = callPackage
-    ({ mkDerivation, assert, base, containers, deepseq, grid
-     , MonadRandom, QuickCheck, random, test-framework
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "som";
-       version = "8.0.6";
-       sha256 = "19p62b72xz1yn7fd9k406h98jg8zsyazbscdsljx7fnn0f3v7j9d";
-       buildDepends = [ assert base containers deepseq grid MonadRandom ];
-       testDepends = [
-         assert base containers grid MonadRandom QuickCheck random
-         test-framework test-framework-quickcheck2
-       ];
-       homepage = "https://github.com/mhwombat/som";
-       description = "Self-Organising Maps";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
   "sonic-visualiser" = callPackage
     ({ mkDerivation, array, base, bytestring, bzlib, containers, mtl
      , pretty, utf8-string, xml

From 26a9fcdfca785de0077219aa335f574601cbbba2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 5 Jul 2015 00:46:42 +0200
Subject: [PATCH 1901/2322] haskell-hwsl2-reducers depends on broken build
 inputs

---
 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 07936619c47..651c4c8587f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -612,6 +612,7 @@ self: super: {
 
   # https://github.com/srijs/hwsl2/issues/1
   hwsl2 = markBroken super.hwsl2;
+  hwsl2-reducers = dontDistribute super.hwsl2-reducers;
 
   # https://code.google.com/p/linux-music-player/issues/detail?id=1
   mp = markBroken super.mp;

From 2f111381e0c405faadd769ebeb2e45c021bddb99 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 5 Jul 2015 00:48:58 +0200
Subject: [PATCH 1902/2322] haskell-mueval has been fixed upstream.

---
 .../haskell-modules/configuration-common.nix  |  3 -
 .../haskell-modules/mueval-fix.patch          | 90 -------------------
 .../haskell-modules/mueval-nix.patch          | 23 -----
 3 files changed, 116 deletions(-)
 delete mode 100644 pkgs/development/haskell-modules/mueval-fix.patch
 delete mode 100644 pkgs/development/haskell-modules/mueval-nix.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 651c4c8587f..8fec4800601 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -781,9 +781,6 @@ self: super: {
   # Patch to consider NIX_GHC just like xmonad does
   dyre = appendPatch super.dyre ./dyre-nix.patch;
 
-  # https://github.com/gwern/mueval/issues/9
-  mueval = appendPatch (appendPatch super.mueval ./mueval-fix.patch) ./mueval-nix.patch;
-
   # Test suite won't compile against tasty-hunit 0.9.x.
   zlib = dontCheck super.zlib;
 
diff --git a/pkgs/development/haskell-modules/mueval-fix.patch b/pkgs/development/haskell-modules/mueval-fix.patch
deleted file mode 100644
index 62a8f8f61e2..00000000000
--- a/pkgs/development/haskell-modules/mueval-fix.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/Mueval/ArgsParse.hs b/Mueval/ArgsParse.hs
-index 05c8fd9..0c32e27 100644
---- a/Mueval/ArgsParse.hs
-+++ b/Mueval/ArgsParse.hs
-@@ -1,10 +1,9 @@
-+{-# LANGUAGE CPP #-}
- module Mueval.ArgsParse (Options(..), interpreterOpts, getOptions) where
- 
- import Control.Monad (liftM)
- import System.Console.GetOpt
- 
--import qualified Codec.Binary.UTF8.String as Codec (decodeString)
--
- import Mueval.Context (defaultModules, defaultPackages)
- 
- -- | See the results of --help for information on what each option means.
-@@ -98,4 +97,11 @@ header = "Usage: mueval [OPTION...] --expression EXPRESSION..."
- -- | Just give us the end result options; this parsing for
- --   us. Bonus points for handling UTF.
- getOptions :: [String] -> Either (Bool, String) Options
--getOptions = interpreterOpts . map Codec.decodeString
-\ No newline at end of file
-+getOptions = interpreterOpts . map decodeString
-+
-+decodeString :: String -> String
-+#if __GLASGOW_HASKELL__ >= 702
-+decodeString = id
-+#else
-+decodeString = Codec.decodeString
-+#endif
-diff --git a/Mueval/Context.hs b/Mueval/Context.hs
-index 78925cf..548514c 100644
---- a/Mueval/Context.hs
-+++ b/Mueval/Context.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- module Mueval.Context (
-   cleanModules,
-   defaultModules,
-@@ -32,7 +33,9 @@ defaultModules = ["Prelude",
-                   "Control.Monad.Error",
-                   "Control.Monad.Fix",
-                   "Control.Monad.Identity",
-+#if !MIN_VERSION_base(4,7,0)
-                   "Control.Monad.Instances",
-+#endif
-                   "Control.Monad.RWS",
-                   "Control.Monad.Reader",
-                   "Control.Monad.State",
-diff --git a/Mueval/Interpreter.hs b/Mueval/Interpreter.hs
-index 29b771f..6c39482 100644
---- a/Mueval/Interpreter.hs
-+++ b/Mueval/Interpreter.hs
-@@ -1,4 +1,5 @@
- {-# LANGUAGE PatternGuards #-}
-+{-# LANGUAGE FlexibleContexts #-}
- -- TODO: suggest the convenience functions be put into Hint proper?
- module Mueval.Interpreter where
- 
-@@ -12,8 +13,6 @@ import System.Exit (exitFailure)
- import System.FilePath.Posix (takeFileName)
- import qualified Control.Exception.Extensible as E (evaluate,catch,SomeException(..))
- 
--import qualified System.IO.UTF8 as UTF (putStrLn)
--
- import Language.Haskell.Interpreter (eval, set, reset, setImportsQ, loadModules, liftIO,
-                                      installedModulesInScope, languageExtensions,
-                                      typeOf, setTopLevelModules, runInterpreter, glasgowExtensions,
-@@ -100,7 +99,7 @@ mvload lfl = do canonfile <- makeRelativeToCurrentDirectory lfl
- -- flooding. Lambdabot has a similar limit.
- sayIO :: String -> IO ()
- sayIO str = do (out,b) <- render 1024 str
--               UTF.putStrLn out
-+               putStrLn out
-                when b exitFailure
- 
- -- | Oh no, something has gone wrong. If it's a compilation error pretty print
-diff --git a/mueval.cabal b/mueval.cabal
-index 3f9406d..b86d796 100644
---- a/mueval.cabal
-+++ b/mueval.cabal
-@@ -32,7 +32,7 @@ library
-         exposed-modules:     Mueval.Parallel, Mueval.Context, Mueval.Interpreter,
-                              Mueval.ArgsParse, Mueval.Resources
-         build-depends:       base>=4 && < 5, containers, directory, mtl>2, filepath, unix, process,
--                             hint>=0.3.1, show>=0.3, utf8-string, Cabal, extensible-exceptions, simple-reflect
-+                             hint>=0.3.1, show>=0.3, Cabal, extensible-exceptions, simple-reflect
-         ghc-options:         -Wall -static
- 
- executable mueval-core
diff --git a/pkgs/development/haskell-modules/mueval-nix.patch b/pkgs/development/haskell-modules/mueval-nix.patch
deleted file mode 100644
index a1f95120a1f..00000000000
--- a/pkgs/development/haskell-modules/mueval-nix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/Mueval/Interpreter.hs b/Mueval/Interpreter.hs
-index 29b771f..6360ee3 100644
---- a/Mueval/Interpreter.hs
-+++ b/Mueval/Interpreter.hs
-@@ -8,6 +8,7 @@ import Control.Monad.Writer (Any(..),runWriterT,tell)
- import Data.Char (isDigit)
- import Data.List (stripPrefix)
- import System.Directory (copyFile, makeRelativeToCurrentDirectory, removeFile, setCurrentDirectory)
-+import System.Environment (lookupEnv)
- import System.Exit (exitFailure)
- import System.FilePath.Posix (takeFileName)
- import qualified Control.Exception.Extensible as E (evaluate,catch,SomeException(..))
-@@ -47,6 +48,10 @@ interpreter Options { extensions = exts, namedExtensions = nexts,
-                                   -- Explicitly adding ImplicitPrelude because of
-                                   -- http://darcsden.com/jcpetruzza/hint/issue/1
-                                   unless (null lexts) $ set [languageExtensions := (UnknownExtension "ImplicitPrelude" : lexts)]
-+                                  pkgs' <- liftIO $ lookupEnv "NIX_GHC_LIBDIR"
-+                                  case pkgs' of
-+                                    Just pkgs -> unsafeSetGhcOption ("-package-db " ++ pkgs ++ "/package.conf.d")
-+                                    Nothing -> return ()
-                                   when trust $ do
-                                     unsafeSetGhcOption "-fpackage-trust"
-                                     forM_ (trustPkgs >>= words) $ \pkg ->

From b6b13e45f8a9aa5b37a04636fdc9383e4ee7db9d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 5 Jul 2015 20:58:34 +0200
Subject: [PATCH 1903/2322] haskell-lhs2tex: disable Hydra builds to fix
 assrtion error

---
 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 8fec4800601..f4f64d97e55 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -887,4 +887,7 @@ self: super: {
   hid = markBroken super.hid;
   msi-kb-backlit = dontDistribute super.msi-kb-backlit;
 
+  # Hydra no longer allows building texlive packages.
+  lhs2tex = dontDistribute super.lhs2tex;
+
 }

From beffeedccf5210e37b3be89e4f551e4905ebf14b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 5 Jul 2015 21:11:53 +0200
Subject: [PATCH 1904/2322] radicale: update from 0.9 to 0.10

add myself to maintainers
---
 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 a82fe40bf14..04321c9cca9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4167,11 +4167,11 @@ let
   radicale = buildPythonPackage rec {
     name = "radicale-${version}";
     namePrefix = "";
-    version = "0.9";
+    version = "0.10";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/R/Radicale/Radicale-${version}.tar.gz";
-      sha256 = "77bf813fd26f0d359c1a7b7bcce9b842b4503c5516989a4a0a4f648e299e41f7";
+      sha256 = "0r1x23h9raadpdmxnanvhajvkk0ix377mv94jlazr18nfpsj4r8c";
     };
 
     propagatedBuildInputs = with self; [
@@ -4183,7 +4183,7 @@ let
     doCheck = false;
 
     meta = {
-      homepage = "http://www.radicale.org/";
+      homepage = http://www.radicale.org/;
       description = "CalDAV CardDAV server";
       longDescription = ''
         The Radicale Project is a complete CalDAV (calendar) and CardDAV
@@ -4193,7 +4193,7 @@ let
         on mobile phones or computers.
       '';
       license = licenses.gpl3Plus;
-      maintainers = with maintainers; [ edwtjo ];
+      maintainers = with maintainers; [ edwtjo pSub ];
     };
   };
 

From 4ee2d39fbf60e4414d27961e7e0ddf4805719500 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sun, 5 Jul 2015 20:54:36 +0200
Subject: [PATCH 1905/2322] grub installation: fix: simplify code

---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index de0a4c7f056..e8cd45e8221 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -499,11 +499,11 @@ my $efiTarget = getEfiTarget();
 my $prevGrubState = readGrubState();
 my @prevDeviceTargets = split/:/, $prevGrubState->devices;
 
-my $devicesDiffer = scalar (List::Compare->new( '-u', '-a', \@deviceTargets, \@prevDeviceTargets)->get_symmetric_difference() );
-my $nameDiffer = !(get("fullName") eq $prevGrubState->name);
-my $versionDiffer = !(get("fullVersion") eq $prevGrubState->version);
-my $efiDiffer = !($efiTarget eq $prevGrubState->efi);
-my $efiMountPointDiffer = !($efiSysMountPoint eq $prevGrubState->efiMountPoint);
+my $devicesDiffer = scalar (List::Compare->new( '-u', '-a', \@deviceTargets, \@prevDeviceTargets)->get_symmetric_difference());
+my $nameDiffer = get("fullName") ne $prevGrubState->name;
+my $versionDiffer = get("fullVersion") ne $prevGrubState->version;
+my $efiDiffer = $efiTarget ne $prevGrubState->efi;
+my $efiMountPointDiffer = $efiSysMountPoint ne $prevGrubState->efiMountPoint;
 my $requireNewInstall = $devicesDiffer || $nameDiffer || $versionDiffer || $efiDiffer || $efiMountPointDiffer || (($ENV{'NIXOS_INSTALL_GRUB'} // "") eq "1");
 
 # install a symlink so that grub can detect the boot drive when set

From 2b833d5297db1428d70e4389c9da633eb5ea19c5 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 5 Jul 2015 21:01:37 +0100
Subject: [PATCH 1906/2322] haskell-ghc: update head to 20150705

---
 pkgs/development/compilers/ghc/head.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index bc59a53bc17..c92f002a026 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -17,14 +17,14 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "7.11.20150607";
+  version = "7.11.20150705";
   name = "ghc-${version}";
-  rev = "89223ce1340654455a9f3aa9cbf25f30884227fd";
+  rev = "3fabb71a559b493efdfb5bb91907f6a0f696a114";
 
   src = fetchgit {
     url = "git://git.haskell.org/ghc.git";
     inherit rev;
-    sha256 = "1qsv2n5js21kqphq92xlyc91f11fnr9sh1glqzsirc8xr60dg5cs";
+    sha256 = "1c0fsk2yk08x02n6s722d36igc9prrql4wcnr8m8c62wp4yrf25z";
   };
 
   postUnpack = ''

From 799c46e6e71a6079b7a0c149093dee1a5c19751d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 5 Jul 2015 16:50:48 -0700
Subject: [PATCH 1907/2322] libvirt: 1.2.12 -> 1.2.17

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 9c9bf40b8e8..31cd0bac421 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -5,7 +5,7 @@
 , pythonPackages, perlPackages
 }:
 
-let version = "1.2.12"; in
+let version = "1.2.17"; in
 
 assert version == pythonPackages.libvirt.version;
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://libvirt.org/sources/${name}.tar.gz";
-    sha256 = "0sp6xm6iyg5wfjgxiba4rpl527429r22lh241dzxjq25fxzj5xgg";
+    sha256 = "1b9gs3fj6bv9ig3kqmip2ivvsprymi6sslrvp82sw3srn0hayzp0";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 04321c9cca9..ac8a5aa8f92 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15352,11 +15352,11 @@ let
 
   libvirt = pkgs.stdenv.mkDerivation rec {
     name = "libvirt-python-${version}";
-    version = "1.2.12";
+    version = "1.2.17";
 
     src = pkgs.fetchurl {
       url = "http://libvirt.org/sources/python/${name}.tar.gz";
-      sha256 = "17w4mpsp4pxhbzs128ig3gxp12rr0j41mxch8i11dqjrjy7l6bs3";
+      sha256 = "1v9nkfik75bmcrdqzc8al8qf0dsaw56fzfv2kr8s4058290dplzl";
     };
 
     buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ];

From fe705a664cc59172be17c048583bd05286f096c1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 5 Jul 2015 16:51:03 -0700
Subject: [PATCH 1908/2322] gnupg: 2.1.5 -> 2.1.6

---
 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 34561c3c33d..8ef96d4d14e 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -13,11 +13,11 @@ with stdenv.lib;
 assert x11Support -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.1.5";
+  name = "gnupg-2.1.6";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "0k5818r847zplbrwjp6i48s6xb5zy44rny2kmbisd6y3c1qml45m";
+    sha256 = "1zcj5vsrc64zyq7spnx2xlxlq6wxaf5bilpf6gbkp7qr8barlnay";
   };
 
   postPatch = stdenv.lib.optionalString stdenv.isLinux ''

From 06f1e2c61e54e5eee3ff7d953cb4bb84a7de30e8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 5 Jul 2015 16:52:56 -0700
Subject: [PATCH 1909/2322] quassel: Add dependency on qca for crypto

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

diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 5aeafab79e3..a8bd2e801b9 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -2,13 +2,12 @@
 , daemon ? false # build Quassel daemon
 , client ? false # build Quassel client
 , withKDE ? stdenv.isLinux # enable KDE integration
-, ssl ? true # enable SSL support
 , previews ? false # enable webpage previews on hovering over URLs
 , tag ? "" # tag added to the package name
 , kdelibs ? null # optional
 , useQt5 ? false
 , phonon_qt5, libdbusmenu_qt5
-, stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf }:
+, stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf, qca2, qca-qt5 }:
 
 
 assert stdenv.isLinux;
@@ -33,7 +32,7 @@ in with stdenv; mkDerivation rec {
   enableParallelBuilding = true;
 
   buildInputs = [ cmake makeWrapper ]
-    ++ (if useQt5 then [ qt.base ] else [ qt ])
+    ++ (if useQt5 then [ qt.base qca-qt5 ] else [ qt qca2 ])
     ++ (if useQt5 && (monolithic || daemon) then [ qt.script ] else [])
     ++ (if useQt5 && previews then [ qt.webkit qt.webkitwidgets ] else [])
     ++ lib.optional withKDE kdelibs

From c61d048427719d6e0c131f58825331df0a9d4ccc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 5 Jul 2015 16:53:42 -0700
Subject: [PATCH 1910/2322] nixos/quassel: Temporarily switch back to qt4 since
 qt5 tls in quassel is broken

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

diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index 005eb7bd761..579d62884c7 100644
--- a/nixos/modules/services/networking/quassel.nix
+++ b/nixos/modules/services/networking/quassel.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  quassel = pkgs.quasselDaemon_qt5;
+  quassel = pkgs.kde4.quasselDaemon;
   cfg = config.services.quassel;
   user = if cfg.user != null then cfg.user else "quassel";
 in

From 3e61595a3ead55491e0eddbdc16b7c8d09dbe406 Mon Sep 17 00:00:00 2001
From: Robert Irelan <rirelan@gmail.com>
Date: Mon, 15 Jun 2015 08:50:34 +0200
Subject: [PATCH 1911/2322] subsonic: init at 5.2.1

Add package for the Subsonic personal media streamer server
(<http://subsonic.org>).
---
 pkgs/servers/misc/subsonic/default.nix | 34 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/servers/misc/subsonic/default.nix

diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix
new file mode 100644
index 00000000000..dad32139cbe
--- /dev/null
+++ b/pkgs/servers/misc/subsonic/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, jre }:
+
+let version = "5.2.1"; in
+
+stdenv.mkDerivation rec {
+  name = "subsonic-${version}";
+  inherit version;
+
+  src = fetchurl {
+    url = "mirror://sourceforge/subsonic/subsonic-${version}-standalone.tar.gz";
+    sha256 = "523fa8357c961c1ae742a15f0ceaabdd41fcba9137c29d244957922af90ee791";
+  };
+
+  inherit jre;
+
+  # Create temporary directory to extract tarball into to satisfy Nix's need
+  # for a directory to be created in the unpack phase.
+  unpackPhase = ''
+    mkdir ${name}
+    tar -C ${name} -xzf $src
+  '';
+  installPhase = ''
+    mkdir $out
+    cp -r ${name}/* $out
+  '';
+
+  meta = {
+    homepage = http://subsonic.org;
+    description = "Personal media streamer";
+    license = stdenv.lib.licenses.gpl3;
+  };
+
+  phases = ["unpackPhase" "installPhase"];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0126504a330..e360aec89eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3002,6 +3002,8 @@ let
 
   su = shadow.su;
 
+  subsonic = callPackage ../servers/misc/subsonic { };
+
   surfraw = callPackage ../tools/networking/surfraw { };
 
   swec = callPackage ../tools/networking/swec {

From f64a5dd3f365d640cf80e49c4c875cf766ce9aeb Mon Sep 17 00:00:00 2001
From: Robert Irelan <rirelan@gmail.com>
Date: Fri, 3 Jul 2015 17:42:16 -0700
Subject: [PATCH 1912/2322] subsonic service: init

Add a systemd service and UID/GID for the Subsonic personal media
streamer server (<http://subsonic.org>).
---
 nixos/modules/misc/ids.nix               |   2 +
 nixos/modules/module-list.nix            |   1 +
 nixos/modules/services/misc/subsonic.nix | 157 +++++++++++++++++++++++
 3 files changed, 160 insertions(+)
 create mode 100644 nixos/modules/services/misc/subsonic.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 80d6ff20f9b..88c86011017 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -225,6 +225,7 @@
       uwsgi = 201;
       gitit = 202;
       riemanntools = 203;
+      subsonic = 204;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -428,6 +429,7 @@
       uwsgi = 201;
       gitit = 202;
       riemanntools = 203;
+      subsonic = 204;
 
       # 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 c1014bdff2e..d580e269df9 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -218,6 +218,7 @@
   ./services/misc/ripple-data-api.nix
   ./services/misc/rogue.nix
   ./services/misc/siproxd.nix
+  ./services/misc/subsonic.nix
   ./services/misc/svnserve.nix
   ./services/misc/synergy.nix
   ./services/misc/uhub.nix
diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix
new file mode 100644
index 00000000000..3e1a2e8fbb5
--- /dev/null
+++ b/nixos/modules/services/misc/subsonic.nix
@@ -0,0 +1,157 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.subsonic;
+  homeDir = "/var/subsonic";
+
+in
+{
+  options = {
+    services.subsonic = {
+      enable = mkEnableOption "Subsonic daemon";
+
+      home = mkOption {
+        type = types.path;
+        default = "${homeDir}";
+        description = ''
+          The directory where Subsonic will create files.
+          Make sure it is writable.
+        '';
+      };
+
+      host = mkOption {
+        type = types.string;
+        default = "0.0.0.0";
+        description = ''
+          The host name or IP address on which to bind Subsonic.
+          Only relevant if you have multiple network interfaces and want
+          to make Subsonic available on only one of them. The default value
+          will bind Subsonic to all available network interfaces.
+        '';
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 4040;
+        description = ''
+          The port on which Subsonic will listen for
+          incoming HTTP traffic. Set to 0 to disable.
+        '';
+      };
+
+      httpsPort = mkOption {
+        type = types.int;
+        default = 0;
+        description = ''
+          The port on which Subsonic will listen for
+          incoming HTTPS traffic. Set to 0 to disable.
+        '';
+      };
+
+      contextPath = mkOption {
+        type = types.path;
+        default = "/";
+        description = ''
+          The context path, i.e., the last part of the Subsonic
+          URL. Typically '/' or '/subsonic'. Default '/'
+        '';
+      };
+
+      maxMemory = mkOption {
+        type = types.int;
+        default = 100;
+        description = ''
+          The memory limit (max Java heap size) in megabytes.
+          Default: 100
+        '';
+      };
+
+      defaultMusicFolder = mkOption {
+        type = types.path;
+        default = "/var/music";
+        description = ''
+          Configure Subsonic to use this folder for music.  This option
+          only has effect the first time Subsonic is started.
+        '';
+      };
+
+      defaultPodcastFolder = mkOption {
+        type = types.path;
+        default = "/var/music/Podcast";
+        description = ''
+          Configure Subsonic to use this folder for Podcasts.  This option
+          only has effect the first time Subsonic is started.
+        '';
+      };
+
+      defaultPlaylistFolder = mkOption {
+        type = types.path;
+        default = "/var/playlists";
+        description = ''
+          Configure Subsonic to use this folder for playlists.  This option
+          only has effect the first time Subsonic is started.
+        '';
+      };
+
+      transcoders = mkOption {
+        type = types.listOf types.path;
+        default = [ "${pkgs.ffmpeg}/bin/ffmpeg" ];
+        description = ''
+          List of paths to transcoder executables that should be accessible
+          from Subsonic. Symlinks will be created to each executable inside
+          ${cfg.home}/transcoders.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.subsonic = {
+      description = "Personal media streamer";
+      after = [ "local-fs.target" "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = ''
+          ${pkgs.jre}/bin/java -Xmx${toString cfg.maxMemory}m \
+            -Dsubsonic.home=${cfg.home} \
+            -Dsubsonic.host=${cfg.host} \
+            -Dsubsonic.port=${toString cfg.port} \
+            -Dsubsonic.httpsPort=${toString cfg.httpsPort} \
+            -Dsubsonic.contextPath=${cfg.contextPath} \
+            -Dsubsonic.defaultMusicFolder=${cfg.defaultMusicFolder} \
+            -Dsubsonic.defaultPodcastFolder=${cfg.defaultPodcastFolder} \
+            -Dsubsonic.defaultPlaylistFolder=${cfg.defaultPlaylistFolder} \
+            -Djava.awt.headless=true \
+            -verbose:gc \
+            -jar ${pkgs.subsonic}/subsonic-booter-jar-with-dependencies.jar
+        '';
+        # Install transcoders.
+        ExecStartPre = ''
+          ${pkgs.coreutils}/bin/rm -rf ${cfg.home}/transcode ; \
+          ${pkgs.coreutils}/bin/mkdir -p ${cfg.home}/transcode ; \
+          ${pkgs.bash}/bin/bash -c ' \
+            for exe in "$@"; do \
+              ${pkgs.coreutils}/bin/ln -sf "$exe" ${cfg.home}/transcode; \
+            done' IGNORED_FIRST_ARG ${toString cfg.transcoders}
+        '';
+        # Needed for Subsonic to find subsonic.war.
+        WorkingDirectory = "${pkgs.subsonic}";
+        Restart = "always";
+        User = "subsonic";
+        UMask = "0022";
+      };
+    };
+
+    users.extraUsers.subsonic = {
+      description = "Subsonic daemon user";
+      home = homeDir;
+      createHome = true;
+      group = "subsonic";
+      uid = config.ids.uids.subsonic;
+    };
+
+    users.extraGroups.subsonic.gid = config.ids.gids.subsonic;
+  };
+}

From 806291b42e3fdaeeb86d7eb5a736035949df9f63 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <ben@folsomlabs.com>
Date: Sun, 5 Jul 2015 17:47:54 -0700
Subject: [PATCH 1913/2322] iftop: fix Darwin build

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

diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix
index cb1bf546bf6..a7fc4414f2c 100644
--- a/pkgs/tools/networking/iftop/default.nix
+++ b/pkgs/tools/networking/iftop/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   # Explicitly link against libgcc_s, to work around the infamous
   # "libgcc_s.so.1 must be installed for pthread_cancel to work".
-  LDFLAGS = "-lgcc_s";
+  LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
   preConfigure = ''
     cp ${automake}/share/automake*/config.{sub,guess} config
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl2Plus;
     homepage = http://ex-parrot.com/pdw/iftop/;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.mornfall ];
   };
 }

From cb343e7be6445a643a22992871a76e4911af2c49 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 5 Jul 2015 18:34:45 -0700
Subject: [PATCH 1914/2322] nixos/install-grub: Fix symlink installation for
 boot filesystems which don't support symlinking

Some filesystems like fat32 don't support symlinking and need to be
supported on /boot as an efi system partition. Instead of creating the symlink directly in boot, create the symlink in
a temporary directory which has to support symlinking.
---
 .../system/boot/loader/grub/install-grub.pl      | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index e8cd45e8221..c4b1abc8cb0 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -7,6 +7,7 @@ use File::Path;
 use File::stat;
 use File::Copy;
 use File::Slurp;
+use File::Temp;
 require List::Compare;
 use POSIX;
 use Cwd;
@@ -506,14 +507,9 @@ my $efiDiffer = $efiTarget ne $prevGrubState->efi;
 my $efiMountPointDiffer = $efiSysMountPoint ne $prevGrubState->efiMountPoint;
 my $requireNewInstall = $devicesDiffer || $nameDiffer || $versionDiffer || $efiDiffer || $efiMountPointDiffer || (($ENV{'NIXOS_INSTALL_GRUB'} // "") eq "1");
 
-# install a symlink so that grub can detect the boot drive when set
-# as the root directory
-if (! -l "$bootPath/boot") {
-    if (-e "$bootPath/boot") {
-        unlink "$bootPath/boot";
-    }
-    symlink ".", "$bootPath/boot";
-}
+# install a symlink so that grub can detect the boot drive
+my $tmpDir = File::Temp::tempdir(CLEANUP => 1) or die "Failed to create temporary space";
+symlink "$bootPath", "$tmpDir/boot" or die "Failed to symlink $tmpDir/boot";
 
 # install non-EFI GRUB
 if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) {
@@ -521,10 +517,10 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) {
         next if $dev eq "nodev";
         print STDERR "installing the GRUB $grubVersion boot loader on $dev...\n";
         if ($grubTarget eq "") {
-            system("$grub/sbin/grub-install", "--recheck", "--root-directory=$bootPath", Cwd::abs_path($dev)) == 0
+            system("$grub/sbin/grub-install", "--recheck", "--root-directory=$tmpDir", Cwd::abs_path($dev)) == 0
                 or die "$0: installation of GRUB on $dev failed\n";
         } else {
-            system("$grub/sbin/grub-install", "--recheck", "--root-directory=$bootPath", "--target=$grubTarget", Cwd::abs_path($dev)) == 0
+            system("$grub/sbin/grub-install", "--recheck", "--root-directory=$tmpDir", "--target=$grubTarget", Cwd::abs_path($dev)) == 0
                 or die "$0: installation of GRUB on $dev failed\n";
         }
     }

From 4b836fb680116ad5fa85ea2bb43ffeff3be4ec53 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 5 Jul 2015 19:11:56 -0700
Subject: [PATCH 1915/2322] nixos/installer: Add grub2_efi to the store so that
 it is available to install

---
 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 0128fa9f33d..c9abff2ecfc 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -216,7 +216,7 @@ in
 
     # !!! Hack - attributes expected by other modules.
     system.boot.loader.kernelFile = "bzImage";
-    environment.systemPackages = [ pkgs.grub2 pkgs.syslinux ];
+    environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ];
 
     # In stage 1 of the boot, mount the CD as the root FS by label so
     # that we don't need to know its device.  We pass the label of the

From 040c399beb855d11393df13e623df5dc604b1fdb Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sun, 5 Jul 2015 00:28:59 +1200
Subject: [PATCH 1916/2322] vultr: init at 0.1.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ac8a5aa8f92..d2aecc94158 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13568,6 +13568,31 @@ let
     };
   });
 
+  vultr = buildPythonPackage rec {
+    version = "0.1.2";
+    name = "vultr-${version}";
+
+    src = pkgs.fetchFromGitHub {
+        owner = "spry-group";
+        repo = "python-vultr";
+        rev = "${version}";
+        sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h";
+    };
+
+    propagatedBuildInputs = with self; [ requests2 ];
+
+    # Tests disabled. They fail because they try to access the network
+    doCheck = false;
+
+    meta = {
+      description = "Vultr.com API Client";
+      homepage = "https://github.com/spry-group/python-vultr";
+      license = licenses.mit;
+      maintainers = with maintainers; [ lihop ];
+      platforms = platforms.all;
+    };
+  };
+
   waitress = buildPythonPackage rec {
     name = "waitress-0.8.9";
 

From 135426ad16e0f0c15887be8d9f5b78c9cb71920b Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Mon, 6 Jul 2015 07:59:04 +0200
Subject: [PATCH 1917/2322] saga: update from 2.1.4 to 2.2.0

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

diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index bb31b24bf5e..7ba523d3a60 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -2,15 +2,15 @@
   libharu, opencv, vigra, postgresql }:
 
 stdenv.mkDerivation rec {
-  name = "saga-2.1.4";
+  name = "saga-2.2.0";
 
   buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ];
 
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = "http://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.1/SAGA%202.1.4/saga_2.1.4.tar.gz";
-    sha256 = "694e4102f592f512c635328c40fdeff33493f74698d9466bb654baf3247e7b76";
+    url = "http://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.2/SAGA%202.2.0/saga_2.2.0.tar.gz";
+    sha256 = "50b2e642331c817606bc954302e53757c4ffa6f6d6f468e12caeaaa7a182edaf";
   };
 
   meta = {

From 5fee7af3ba3b20b0561bd25a8ccb2c4c1d8d842b Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Mon, 6 Jul 2015 11:02:57 +0300
Subject: [PATCH 1918/2322] ghc:  add haskell.compiler.ghcNokinds, for Richard
 Eisenberg's 'nokinds' branch

---
 doc/haskell-users-guide.xml                   |   1 +
 pkgs/development/compilers/ghc/nokinds.nix    |  74 +++++++++++++
 .../configuration-ghc-nokinds.nix             | 104 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |   7 ++
 4 files changed, 186 insertions(+)
 create mode 100644 pkgs/development/compilers/ghc/nokinds.nix
 create mode 100644 pkgs/development/haskell-modules/configuration-ghc-nokinds.nix

diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml
index ca6c387e8df..e3903ddd411 100644
--- a/doc/haskell-users-guide.xml
+++ b/doc/haskell-users-guide.xml
@@ -136,6 +136,7 @@ haskell.compiler.ghc763         ghc-7.6.3
 haskell.compiler.ghc784         ghc-7.8.4
 haskell.compiler.ghc7101        ghc-7.10.1
 haskell.compiler.ghcHEAD        ghc-7.11.20150402
+haskell.compiler.ghcNokinds     ghc-nokinds-7.11.20150704
 haskell.compiler.ghcjs          ghcjs-0.1.0
 haskell.compiler.jhc            jhc-0.8.2
 haskell.compiler.uhc            uhc-1.1.9.0
diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix
new file mode 100644
index 00000000000..1adb4207f05
--- /dev/null
+++ b/pkgs/development/compilers/ghc/nokinds.nix
@@ -0,0 +1,74 @@
+{ stdenv, fetchgit, ghc, perl, gmp, ncurses, libiconv, autoconf, automake, happy, alex }:
+
+let
+
+  buildMK = ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib"
+    DYNAMIC_BY_DEFAULT = NO
+    SRC_HC_OPTS        = -H64m -O -fasm
+    GhcLibHcOpts       = -O -dcore-lint
+    GhcStage1HcOpts    = -Rghc-timing -O -fasm
+    GhcStage2HcOpts    = -Rghc-timing -O0 -DDEBUG
+    SplitObjs          = NO
+    HADDOCK_DOCS       = NO
+    BUILD_DOCBOOK_HTML = NO
+    BUILD_DOCBOOK_PS   = NO
+    BUILD_DOCBOOK_PDF  = NO
+    LAX_DEPENDENCIES   = YES
+    ${stdenv.lib.optionalString stdenv.isDarwin ''
+      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
+      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
+    ''}
+  '';
+
+in
+
+stdenv.mkDerivation rec {
+  version = "7.11.20150703";
+  name = "ghc-nokinds-${version}";
+  rev = "887170ac254aaacc2d5e29f2565ac61522fd8f61";
+
+  src = fetchgit {
+    url = "https://github.com/goldfirere/ghc.git";
+    inherit rev;
+    sha256 = "010x9ckig76sz97s2ss1j1sf70czqx1cn39nj4xbh49m8n2zvsqf";
+  };
+
+  postUnpack = ''
+    pushd ghc-${builtins.substring 0 7 rev}
+    patchShebangs .
+    ./boot
+    popd
+  '';
+
+  buildInputs = [ ghc perl autoconf automake happy alex ];
+
+  preConfigure = ''
+    echo >mk/build.mk "${buildMK}"
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
+  '';
+
+  configureFlags = [
+    "--with-gcc=${stdenv.cc}/bin/cc"
+    "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib"
+  ];
+
+  enableParallelBuilding = true;
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
+
+  meta = {
+    homepage = "http://haskell.org/ghc";
+    description = "The dependently-typed 'nokinds' branch of the Glasgow Haskell Compiler by Richard Eisenberg";
+    maintainers = with stdenv.lib.maintainers; [ ];
+    inherit (ghc.meta) license platforms;
+  };
+
+}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix b/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix
new file mode 100644
index 00000000000..be78321b38a
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix
@@ -0,0 +1,104 @@
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: {
+
+  # Use the latest LLVM.
+  inherit (pkgs) llvmPackages;
+
+  # Disable GHC 7.11.x core libraries.
+  array = null;
+  base = null;
+  binary = null;
+  bin-package-db = null;
+  bytestring = null;
+  Cabal = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-prim = 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;
+
+  # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
+  jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal;
+
+  # GHC 7.10.x's Haddock binary cannot generate hoogle files.
+  # https://ghc.haskell.org/trac/ghc/ticket/9921
+  mkDerivation = drv: super.mkDerivation (drv // { doHoogle = false; doHaddock = false; });
+
+  # haddock: No input file(s).
+  nats = dontHaddock super.nats;
+  bytestring-builder = dontHaddock super.bytestring-builder;
+
+  alex = dontCheck super.alex;
+
+  # We have time 1.5
+  aeson = disableCabalFlag super.aeson "old-locale";
+
+  # Show works differently for record syntax now, breaking haskell-src-exts' parser tests
+  # https://github.com/haskell-suite/haskell-src-exts/issues/224
+  haskell-src-exts = dontCheck super.haskell-src-exts;
+
+  mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch {
+    url = "https://github.com/snoyberg/mono-traversable/pull/77.patch";
+    sha256 = "1qrvrh3cqfkymi5yb9y9z88rq4n7ag0ac2k00mcnqh4dz1vh4fg1";
+  });
+  yesod-auth = appendPatch super.yesod-auth (pkgs.fetchpatch {
+    url = "https://github.com/yesodweb/yesod/pull/1006.patch";
+    sha256 = "0l6wjj8cfz6jy6j92kywsccafyffhlm5240q82bzirb278adqvar";
+    stripLen = 1;
+  });
+
+  # Setup: At least the following dependencies are missing: base <4.8
+  hspec-expectations = overrideCabal super.hspec-expectations (drv: {
+    patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
+  });
+  utf8-string = overrideCabal super.utf8-string (drv: {
+    patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
+  });
+
+  # bos/attoparsec#92
+  attoparsec = dontCheck super.attoparsec;
+
+  # test suite hangs silently for at least 10 minutes
+  split = dontCheck super.split;
+
+  # Test suite fails with some (seemingly harmless) error.
+  # https://code.google.com/p/scrapyourboilerplate/issues/detail?id=24
+  syb = dontCheck super.syb;
+
+  # Test suite has stricter version bounds
+  retry = dontCheck super.retry;
+
+  # Test suite fails with time >= 1.5
+  http-date = dontCheck super.http-date;
+
+  # Version 1.19.5 fails its test suite.
+  happy = dontCheck super.happy;
+
+  # Workaround for a workaround, see comment for "ghcjs" flag.
+  jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs";
+            in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
+                                          self.webkitgtk3-javascriptcore ];
+
+  # The compat library is empty in the presence of mtl 2.2.x.
+  mtl-compat = dontHaddock super.mtl-compat;
+
+  # Won't work with LLVM 3.5.
+  llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
+
+}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8ffa3ce8ebf..5e3c6d6f0e0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -40,6 +40,9 @@ rec {
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
       libiconv = pkgs.darwin.libiconv;
     });
+    ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+      libiconv = pkgs.darwin.libiconv;
+    });
 
     ghcjs = packages.ghc7101.callPackage ../development/compilers/ghcjs {
       ghc = compiler.ghc7101;
@@ -95,6 +98,10 @@ rec {
       ghc = compiler.ghcHEAD;
       packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
     };
+    ghcNokinds = callPackage ../development/haskell-modules {
+      ghc = compiler.ghcNokinds;
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-nokinds.nix { };
+    };
     ghcjs = callPackage ../development/haskell-modules {
       ghc = compiler.ghcjs;
       packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };

From 945ac597b979084986d81be9ecf649ff3d651494 Mon Sep 17 00:00:00 2001
From: Robbin C <robbinch33@gmail.com>
Date: Wed, 1 Jul 2015 18:54:08 +0800
Subject: [PATCH 1919/2322] gitfs: init at 0.2.5

This adds gitfs, a FUSE filesystem that fully integrates with git.
---
 pkgs/tools/filesystems/gitfs/default.nix | 32 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/filesystems/gitfs/default.nix

diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix
new file mode 100644
index 00000000000..cd79f5db85b
--- /dev/null
+++ b/pkgs/tools/filesystems/gitfs/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, python, buildPythonPackage, pythonPackages }:
+
+buildPythonPackage rec {
+  name = "gitfs-0.2.5";
+
+  src = fetchFromGitHub {
+    owner = "PressLabs";
+    repo = "gitfs";
+    rev = "495c6c52ec3573294ba7b8426ed794eb466cbb82";
+    sha256 = "04yh6b5ivbviqy5k2768ag75cd5kr8k70ar0d801yvc8hnijvphk";
+  };
+
+  patchPhase = ''
+    # requirement checks are unnecessary at runtime
+    echo > requirements.txt
+  '';
+
+  propagatedBuildInputs = with pythonPackages; [ atomiclong fusepy pygit2 ];
+
+  meta = {
+    description = "A FUSE filesystem that fully integrates with git";
+    longDescription = ''
+      A git remote repository's branch can be mounted locally,
+      and any subsequent changes made to the files will be
+      automatically committed to the remote.
+    '';
+    homepage = https://github.com/PressLabs/gitfs;
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.robbinch ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e028080155..3e61e02fa04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1570,6 +1570,8 @@ let
 
   git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { };
 
+  gitfs = callPackage ../tools/filesystems/gitfs { };
+
   gitlab = callPackage ../applications/version-management/gitlab {
     ruby = ruby_2_1_3;
   };

From 505f624e01f8c31110734e82953f9db6014e650c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 6 Jul 2015 11:36:21 +0200
Subject: [PATCH 1920/2322] newtonwars: init at 2015060

---
 pkgs/games/newtonwars/default.nix | 37 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/games/newtonwars/default.nix

diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix
new file mode 100644
index 00000000000..7bbc797b4f1
--- /dev/null
+++ b/pkgs/games/newtonwars/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, makeWrapper, freeglut, mesa }:
+
+stdenv.mkDerivation rec {
+  name = "newtonwars-${version}";
+  version = "20150609";
+
+  src = fetchFromGitHub {
+    owner = "Draradech";
+    repo = "NewtonWars";
+    rev = "98bb99a1797fd0073e0fd25ef9218468d3a9f7cb";
+    sha256 = "0g63fwfcdxxlnqlagj1fb8ngm385gmv8f7p8b4r1z5cny2znxdvs";
+  };
+
+  buildInputs = [ makeWrapper freeglut mesa ];
+
+  patchPhase = ''
+    sed -i "s;font24.raw;$out/share/font24.raw;g" display.c
+  '';
+
+  buildPhase = "sh build-linux.sh";
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share
+    cp nw $out/bin
+    cp font24.raw $out/share
+
+    wrapProgram $out/bin/nw \
+      --prefix LD_LIBRARY_PATH ":" ${freeglut}/lib \
+      --prefix LD_LIBRARY_PATH ":" ${mesa}/lib
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A space battle game with gravity as the main theme";
+    maintainers = with maintainers; [ pSub ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18dd5bd9932..743b714f283 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13553,6 +13553,8 @@ let
 
   njam = callPackage ../games/njam { };
 
+  newtonwars = callPackage ../games/newtonwars { };
+
   oilrush = callPackage ../games/oilrush { };
 
   openra = callPackage ../games/openra { lua = lua5_1; };

From 6b17e009c40216cce95b2dfa2497c34d14900f6d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 6 Jul 2015 11:51:49 +0200
Subject: [PATCH 1921/2322] scala: update from 2.11.6 to 2.11.7

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

diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index 9e55d9f3ac2..289c63f7bcf 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.11.6";
+  name = "scala-2.11.7";
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "10v58jm0wbb4v71sfi03gskd6n84jqn6nvd62x166104c3j4bfj1";
+    sha256 = "1l16571fw5l339wd02w2pnr3556j804zpbsbymnad67f2dpikr7z";
   };
 
   buildInputs = [ jre makeWrapper ] ;

From 25c7e5fafebbb00b12affb9f81f4a70b63c743dc Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 6 Jul 2015 17:37:15 +0200
Subject: [PATCH 1922/2322] notmuch: 0.19 -> 0.20.2

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

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 4304520383e..7cbec61b5e2 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "notmuch-0.19";
+  name = "notmuch-0.20.2";
 
   passthru = {
     pythonSourceRoot = "${name}/bindings/python";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "1szf6c44g209pcjq5nvfhlp3nzcm3lrcwv4spsxmwy13hiaccvrr";
+    sha256 = "1v5dcnlg4km5hfaq0i0qywq5fn66fi0rq4aaibyqkwxz8mis4hgp";
   };
 
   buildInputs = [ bash emacs glib gmime gnupg pkgconfig talloc xapian sphinx python ]

From 2e85f78d205aff636909855c89623918c6ed75d0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 6 Jul 2015 17:46:28 +0200
Subject: [PATCH 1923/2322] libeatmydata: add its own bin/ to PATH, dirty fix
 for #8665

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

diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix
index 8d2d820a230..2fdd1658f19 100644
--- a/pkgs/development/libraries/libeatmydata/default.nix
+++ b/pkgs/development/libraries/libeatmydata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "libeatmydata-82";
@@ -8,6 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "0aavq71bf0yxdgyf8gvyzq086shszzwpbsz5rqkjg4cz0rc5yrqb";
   };
 
+  buildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $out/bin/eatmydata \
+      --prefix PATH : $out/bin
+  '';
+
   meta = {
     homepage = http://www.flamingspork.com/projects/libeatmydata/;
     license = stdenv.lib.licenses.gpl3Plus;

From 3b5c1621ecd21d81045f09e63e94850b971f46b5 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 4 Jun 2015 00:59:11 +0200
Subject: [PATCH 1924/2322] perl-Crypt-OpenSSL-AES: init at 0.02

---
 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 891d72497b5..ea468668b0e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1973,6 +1973,23 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  CryptOpenSSLAES = buildPerlPackage rec {
+    name = "Crypt-OpenSSL-AES-0.02";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/T/TT/TTAR/${name}.tar.gz";
+      sha256 = "b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908";
+    };
+    NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include";
+    NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto";
+    meta = with stdenv.lib; {
+      homepage = https://metacpan.org/release/Crypt-OpenSSL-AES;
+      description = "Perl wrapper around OpenSSL's AES library";
+      license = with licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
+      platforms = platforms.unix;
+    };
+  };
+
   CryptOpenSSLBignum = buildPerlPackage rec {
     name = "Crypt-OpenSSL-Bignum-0.04";
     src = fetchurl {

From a4f69f5a39885e0ae9b3de01750aa3728aba72c1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 6 Jul 2015 18:16:49 +0200
Subject: [PATCH 1925/2322] bitlbee: update from 3.4 to 3.4.1

---
 .../networking/instant-messengers/bitlbee/default.nix  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index 43d11f0a8ff..ddaaa35da55 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -1,15 +1,15 @@
-{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr }:
+{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "bitlbee-3.4";
+  name = "bitlbee-3.4.1";
 
   src = fetchurl {
     url = "mirror://bitlbee/src/${name}.tar.gz";
-    sha256 = "0plx4dryf8i6hz7vghg84z5f6w6rkw1l8ckl4c4wh5zxpd3ddfnf";
+    sha256 = "1qf0ypa9ba5jvsnpg9slmaran16hcc5fnfzbb1sdch1hjhchn2jh";
   };
 
-  buildInputs = [ gnutls glib pkgconfig libotr ]
+  buildInputs = [ gnutls glib pkgconfig libotr python ]
     ++ optional doCheck check;
 
   configureFlags = [
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.bitlbee.org/;
     license = licenses.gpl2Plus;
 
-    maintainers = with maintainers; [ wkennington ];
+    maintainers = with maintainers; [ wkennington pSub ];
     platforms = platforms.gnu;  # arbitrary choice
   };
 }

From b3639275560ee4d1956575e4c825e65b2d15884c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 13:44:37 -0700
Subject: [PATCH 1926/2322] linux-testing: 4.2-rc1

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index ec7e597e871..acfe421ac10 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, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1-rc8";
-  modDirVersion = "4.1.0-rc8";
-  extraMeta.branch = "4.1";
+  version = "4.2-rc1";
+  modDirVersion = "4.2.0-rc1";
+  extraMeta.branch = "4.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "0ia4lajpr3w9iivmwm2d7gqrpv97da5g4j8pkqa7q4mlr86jki2w";
+    sha256 = "0a9zr1jf2c110lvd7wi4jxxk2iw6san31yh8hwlahkkb8kh4wliw";
   };
 
   features.iwlwifi = true;

From 2f752c3097611c370399571f4dcdb1f9c98fa7c0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 3 Jul 2015 05:07:25 +0200
Subject: [PATCH 1927/2322] bobcat: 3.25.01 -> 3.25.02

Adds missing implementation of the member function BigInt::ulong(),
and gets rid of another sourceforge URI.
---
 pkgs/development/libraries/bobcat/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index 791dab2d17a..38dfce7583a 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, gcc49, icmake, libmilter, libX11, openssl, readline
 , utillinux, yodl }:
 
-let version = "3.25.01"; in
-stdenv.mkDerivation rec {
+let version = "3.25.02"; in
+stdenv.mkDerivation {
   name = "bobcat-${version}";
 
   src = fetchurl {
-    sha256 = "07qc10hnjpmc2wq14kw01vfww5i049y0jmdvkiiafw33ffy0wdca";
-    url = "mirror://sourceforge/bobcat/bobcat/${version}/bobcat_${version}.orig.tar.gz";
+    sha256 = "0b1370li4q82fqj982vng9cwkf23k2c1df5jsdcgkrk01r53dxry";
+    url = "mirror://debian/pool/main/b/bobcat/bobcat_${version}.orig.tar.gz";
   };
 
   meta = with stdenv.lib; {

From 5f8104cd45658eaa009edc21a054e4885207604d Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Tue, 7 Jul 2015 00:44:49 +0200
Subject: [PATCH 1928/2322] ocaml-modules.ssl: make openssl
 propagatedBuildInput

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

diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix
index ad75b4a3dac..ef8ce098f3c 100644
--- a/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/pkgs/development/ocaml-modules/ssl/default.nix
@@ -13,7 +13,9 @@ stdenv.mkDerivation {
     sha256 = "0i0j89b10n3xmmawcq4qfwa42133pddw4x5nysmsnpd15srv5gp9";
   };
 
-  buildInputs = [which openssl ocaml findlib];
+  buildInputs = [which ocaml findlib];
+
+  propagatedBuildInputs = [openssl];
 
   dontAddPrefix = true;
 

From 5297371b95edf3db81131bdc1ee5c952c245f7c0 Mon Sep 17 00:00:00 2001
From: Stewart Mackenzie <setori88@gmail.com>
Date: Sun, 7 Jun 2015 12:10:52 +0800
Subject: [PATCH 1929/2322] zerotier-one: service add

---
 nixos/modules/module-list.nix                 |  1 +
 .../services/networking/zerotierone.nix       | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 nixos/modules/services/networking/zerotierone.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 043b0470edf..ea6809f540a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -333,6 +333,7 @@
   ./services/networking/wicd.nix
   ./services/networking/wpa_supplicant.nix
   ./services/networking/xinetd.nix
+  ./services/networking/zerotierone.nix
   ./services/networking/znc.nix
   ./services/printing/cupsd.nix
   ./services/scheduling/atd.nix
diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix
new file mode 100644
index 00000000000..886ea18d980
--- /dev/null
+++ b/nixos/modules/services/networking/zerotierone.nix
@@ -0,0 +1,32 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.zerotierone;
+in
+{
+  options.services.zerotierone.enable = mkEnableOption "ZeroTierOne";
+  
+  config = mkIf cfg.enable {
+    systemd.services.zerotierone = {
+      description = "ZeroTierOne";
+      path = [ pkgs.zerotierone ];
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      preStart =
+        ''
+        mkdir -p /var/lib/zerotier-one
+        chmod 700 /var/lib/zerotier-one
+        chown -R root:root /var/lib/zerotier-one
+        '';
+      serviceConfig = {
+        Type = "forking";
+        User = "root";
+        PIDFile = "/var/lib/zerotier-one/zerotier-one.pid";
+        ExecStart = "${pkgs.zerotierone}/bin/zerotier-one -d";
+      };
+    };
+  environment.systemPackages = [ pkgs.zerotierone ];
+  };
+}

From 84ef883ac23cba7b1c701c12ec3504b47c57a890 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 16:32:07 -0700
Subject: [PATCH 1930/2322] rvm-patchsets: Update

---
 pkgs/development/interpreters/ruby/rvm-patchsets.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
index 7685bafddc9..908b4b36372 100644
--- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix
+++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
@@ -3,6 +3,6 @@
 fetchFromGitHub {
   owner  = "skaes";
   repo   = "rvm-patchsets";
-  rev    = "da2e5b4d81e18154befef1448e037b844cb5a326";
-  sha256 = "0fslnkpirgsm7gjd6g194vd24i3y7kl0ihbq5gr94cgvdzzjgad0";
+  rev    = "68be466019aa592e0321e894487f090aa459d602";
+  sha256 = "12dw5shirnqbw037jg1sqk1aixyzl32w94y2nlan9by3cv7k3643";
 }

From d5cd6eebcdf4e052302a2fa72b13e5c7325fe883 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 16:32:50 -0700
Subject: [PATCH 1931/2322] ruby: Add 2.1.6

---
 .../interpreters/ruby/ruby-2.1.6.nix          | 122 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   3 +-
 2 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/ruby/ruby-2.1.6.nix

diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.6.nix b/pkgs/development/interpreters/ruby/ruby-2.1.6.nix
new file mode 100644
index 00000000000..c9016a338af
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/ruby-2.1.6.nix
@@ -0,0 +1,122 @@
+{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub
+, zlib, zlibSupport ? true
+, openssl, opensslSupport ? true
+, gdbm, gdbmSupport ? true
+, ncurses, readline, cursesSupport ? true
+, groff, docSupport ? false
+, libyaml, yamlSupport ? true
+, libffi, fiddleSupport ? true
+, ruby_2_1_6, autoreconfHook, bison, useRailsExpress ? true
+}:
+
+let
+  op = stdenv.lib.optional;
+  ops = stdenv.lib.optionals;
+  patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
+  config = import ./config.nix fetchgit;
+  baseruby = ruby_2_1_6.override { useRailsExpress = false; };
+in
+
+stdenv.mkDerivation rec {
+  version = with passthru; "${majorVersion}.${minorVersion}.${teenyVersion}-p${patchLevel}";
+
+  name = "ruby-${version}";
+
+  src = if useRailsExpress then fetchFromGitHub {
+    owner  = "ruby";
+    repo   = "ruby";
+    rev    = "v2_1_6";
+    sha256 = "18kbjsbmgv6l3p1qxgmjnhh4jl7xdk3c20ycjpp62vrhq7pyzjsm";
+  } else fetchurl {
+    url = "http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.6.tar.gz";
+    sha256 = "1r4bs8lfwsypbcf8j2lpv3by40729vp5mh697njizj97fjp644qy";
+  };
+
+  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
+  NROFF = "${groff}/bin/nroff";
+
+  buildInputs = ops useRailsExpress [ autoreconfHook bison ]
+    ++ (op fiddleSupport libffi)
+    ++ (ops cursesSupport [ ncurses readline ])
+    ++ (op docSupport groff)
+    ++ (op zlibSupport zlib)
+    ++ (op opensslSupport openssl)
+    ++ (op gdbmSupport gdbm)
+    ++ (op yamlSupport libyaml)
+    # Looks like ruby fails to build on darwin without readline even if curses
+    # support is not enabled, so add readline to the build inputs if curses
+    # support is disabled (if it's enabled, we already have it) and we're
+    # running on darwin
+    ++ (op (!cursesSupport && stdenv.isDarwin) readline);
+
+  enableParallelBuilding = true;
+
+  # Fix a build failure on systems with nix store optimisation.
+  # (The build process attempted to copy file a overwriting file b, where a and
+  # b are hard-linked, which results in cp returning a non-zero exit code.)
+  # https://github.com/NixOS/nixpkgs/issues/4266
+  postUnpack = ''rm "$sourceRoot/enc/unicode/name2ctype.h"'';
+
+  patches = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/01-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/03-display-more-detailed-stack-trace.patch"
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/05-funny-falcon-stc-density.patch"
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/06-funny-falcon-stc-pool-allocation.patch"
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/07-aman-opt-aset-aref-str.patch"
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/08-funny-falcon-method-cache.patch"
+    "${patchSet}/patches/ruby/2.1.6/railsexpress/09-heap-dump-support.patch"
+  ];
+
+  # Ruby >= 2.1.0 tries to download config.{guess,sub}
+  postPatch = ''
+    rm tool/config_files.rb
+    cp ${config}/config.guess tool/
+    cp ${config}/config.sub tool/
+  '';
+
+  configureFlags = ["--enable-shared" ]
+    ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
+    # on darwin, we have /usr/include/tk.h -- so the configure script detects
+    # that tk is installed
+    ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]);
+
+  installFlags = stdenv.lib.optionalString docSupport "install-doc";
+  # Bundler tries to create this directory
+  postInstall = ''
+    # Bundler tries to create this directory
+    mkdir -pv $out/${passthru.gemPath}
+    mkdir -p $out/nix-support
+    cat > $out/nix-support/setup-hook <<EOF
+    addGemPath() {
+      addToSearchPath GEM_PATH \$1/${passthru.gemPath}
+    }
+
+    envHooks+=(addGemPath)
+    EOF
+  '' + lib.optionalString useRailsExpress ''
+    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
+
+    # Prevent the baseruby from being included in the closure.
+    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
+    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
+  '';
+
+  meta = {
+    license = stdenv.lib.licenses.ruby;
+    homepage = "http://www.ruby-lang.org/en/";
+    description = "The Ruby language";
+    platforms = stdenv.lib.platforms.all;
+  };
+
+  passthru = rec {
+    majorVersion = "2";
+    minorVersion = "1";
+    teenyVersion = "6";
+    patchLevel = "0";
+    rubyEngine = "ruby";
+    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
+    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 461933ef551..c8631258908 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5086,6 +5086,7 @@ let
   ruby_2_1_1 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { });
   ruby_2_1_2 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { });
   ruby_2_1_3 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.3.nix { });
+  ruby_2_1_6 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.6.nix { });
   ruby_2_2_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.2.0.nix { });
 
   # Ruby aliases
@@ -5093,7 +5094,7 @@ let
   ruby_1_8 = ruby_1_8_7;
   ruby_1_9 = ruby_1_9_3;
   ruby_2_0 = ruby_2_0_0;
-  ruby_2_1 = ruby_2_1_3;
+  ruby_2_1 = ruby_2_1_6;
   ruby_2_2 = ruby_2_2_0;
 
   rubygemsFun = ruby: builderDefsPackage (import ../development/interpreters/ruby/rubygems.nix) {

From 7fa3e5f8d9324833150414ee3c7cb8e81618423a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 16:33:10 -0700
Subject: [PATCH 1932/2322] ruby: Make 2.1.x the 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 c8631258908..c8bc7e90f33 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5090,7 +5090,7 @@ let
   ruby_2_2_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.2.0.nix { });
 
   # Ruby aliases
-  ruby = ruby_1_9;
+  ruby = ruby_2_1;
   ruby_1_8 = ruby_1_8_7;
   ruby_1_9 = ruby_1_9_3;
   ruby_2_0 = ruby_2_0_0;

From 0f21f3e00bf685e2a4b14b98f400a46bbab9696d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 16:41:36 -0700
Subject: [PATCH 1933/2322] bundler-head: Correct hash

---
 pkgs/development/interpreters/ruby/bundler-head.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix
index 6edc01041f2..2087485e3ef 100644
--- a/pkgs/development/interpreters/ruby/bundler-head.nix
+++ b/pkgs/development/interpreters/ruby/bundler-head.nix
@@ -5,7 +5,7 @@ buildRubyGem {
   src = fetchgit {
     url = "https://github.com/bundler/bundler.git";
     rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157";
-    sha256 = "11pbg71bhp66nyhwk0cpbcn1fhp4amv8sr2vx8dw83dcnqqafn92";
+    sha256 = "1vzm21fc37w89psxfk2fzi64zyb3gyhzr9smd6jk2r2kvgp6d38b";
     leaveDotGit = true;
   };
   dontPatchShebangs = true;

From 8f17099d6a6f978e4d37082c8b1d3d60808a7777 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 16:41:53 -0700
Subject: [PATCH 1934/2322] bundler: 1.9.2 -> 1.10.5

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

diff --git a/pkgs/development/interpreters/ruby/bundler.nix b/pkgs/development/interpreters/ruby/bundler.nix
index 336d4054422..d5278bed885 100644
--- a/pkgs/development/interpreters/ruby/bundler.nix
+++ b/pkgs/development/interpreters/ruby/bundler.nix
@@ -1,9 +1,9 @@
 { buildRubyGem, makeWrapper, ruby, coreutils }:
 
 buildRubyGem {
-  name = "bundler-1.9.2";
+  name = "bundler-1.10.5";
   namePrefix = "";
-  sha256 = "0ck9bnqg7miimggj1d6qlabrsa5h9yaw241fqn15cvqh915209zk";
+  sha256 = "1zkxw6699bbmsamrij2lirscbh0j58p1p3bql22jsxvx34j6w5nc";
   dontPatchShebangs = true;
   postInstall = ''
     find $out -type f -perm +0100 | while read f; do

From 1d7990b0e14dc69e7fbabdd3537032c1fbd94b5d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 16:42:10 -0700
Subject: [PATCH 1935/2322] consul-ui: Update dependencies

---
 pkgs/servers/consul/Gemfile.lock | 10 +++++-----
 pkgs/servers/consul/gemset.nix   | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/servers/consul/Gemfile.lock b/pkgs/servers/consul/Gemfile.lock
index 8ca7428084d..f79b05b481d 100644
--- a/pkgs/servers/consul/Gemfile.lock
+++ b/pkgs/servers/consul/Gemfile.lock
@@ -1,15 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    execjs (2.0.2)
-    json (1.8.1)
-    libv8 (3.16.14.3)
+    execjs (2.3.0)
+    json (1.8.2)
+    libv8 (3.16.14.7)
     ref (1.0.5)
-    sass (3.3.6)
+    sass (3.4.11)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
-    uglifier (2.5.0)
+    uglifier (2.7.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 
diff --git a/pkgs/servers/consul/gemset.nix b/pkgs/servers/consul/gemset.nix
index bf417f8c411..e813fc9b387 100644
--- a/pkgs/servers/consul/gemset.nix
+++ b/pkgs/servers/consul/gemset.nix
@@ -1,23 +1,23 @@
 {
   execjs = {
-    version = "2.0.2";
+    version = "2.3.0";
     source = {
       type = "gem";
-      sha256 = "167kbkyql7nvvwjsgdw5z8j66ngq7kc59gxfwsxhqi5fl1z0jbjs";
+      sha256 = "097v02bhmzc70j7n0yyf8j0z5wms88zcmgpmggby4hnvqxf41y1h";
     };
   };
   json = {
-    version = "1.8.1";
+    version = "1.8.2";
     source = {
       type = "gem";
-      sha256 = "0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn";
+      sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5";
     };
   };
   libv8 = {
-    version = "3.16.14.3";
+    version = "3.16.14.7";
     source = {
       type = "gem";
-      sha256 = "1arjjbmr9zxkyv6pdrihsz1p5cadzmx8308vgfvrhm380ccgridm";
+      sha256 = "0dv5q5n5nf6b8h3fybwmsr3vkj70w4g1jpf6661j3hsv9vp0g4qq";
     };
   };
   ref = {
@@ -28,10 +28,10 @@
     };
   };
   sass = {
-    version = "3.3.6";
+    version = "3.4.11";
     source = {
       type = "gem";
-      sha256 = "0ra0kxx52cgyrq6db7a1vysk984ilshbx40bcf527k8b3fha6k5r";
+      sha256 = "10dncnv7g5v8d1xpw2aaarxjjlm68f7nm02ns2kl8nf3yxi6wzdf";
     };
   };
   therubyracer = {
@@ -46,10 +46,10 @@
     ];
   };
   uglifier = {
-    version = "2.5.0";
+    version = "2.7.0";
     source = {
       type = "gem";
-      sha256 = "0b9kxgyg8cv3g1bp6casndfzfy71jd9xyjxwng0lj90vzqrgjp20";
+      sha256 = "1x1mnakx086l83a3alj690c6n8kfmb4bk243a6m6yz99s15gbxfq";
     };
     dependencies = [
       "execjs"

From 2f28600f2ba1d29aa7b2cb0acd0b8bc7b7b40192 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 17:13:50 -0700
Subject: [PATCH 1936/2322] lvm2: 2.02.120 -> 2.02.124

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

diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 250baa3fbc2..1789018d414 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }:
 
 let
-  version = "2.02.120";
+  version = "2.02.124";
 in
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz";
-    sha256 = "06h8csqjy6b0khi73kklkp10j5yq3j1kxklfaf158c80glpx0swd";
+    sha256 = "0myqs0ajpjmlc56vp4f66x5izhbh7wzzf3408gqnrjmikb5sr9rh";
   };
 
   configureFlags =

From 9eae9dd811b5704c8d8f0d014f0583a43de0911e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 17:14:01 -0700
Subject: [PATCH 1937/2322] gnupg: 2.0.27 -> 2.0.28

---
 pkgs/tools/security/gnupg/20.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index a5fdc2e2692..542baa95efe 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -12,11 +12,11 @@ with stdenv.lib;
 assert x11Support -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.0.27";
+  name = "gnupg-2.0.28";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1wihx7dphacg9fy5wfj93h236lr1w5gwzh7ir3js37wi9cz6sr2p";
+    sha256 = "0k2k399fnhfhhr4dvm8d6vs4ihq6gg06191lzfwikzaqmgj2w2ff";
   };
 
   buildInputs

From 642eb4ca0537ce811354988ee2f9a7ac5799e047 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 17:22:06 -0700
Subject: [PATCH 1938/2322] mesa: 10.5.8 -> 10.6.1

---
 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 ed6ba30626c..be2544091e2 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "10.5.8";
+  version = "10.6.1";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "2866b855c5299a4aed066338c77ff6467c389b2c30ada7647be8758663da2b54";
+    sha256 = "6c80a2b647e57c85dc36e609d9aed17f878f0d8e0cf9ace86d14cf604101e1eb";
   };
 
   prePatch = "patchShebangs .";

From 6aa4714dbad2acf3defe340f0c52dd315a95adf7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 17:37:18 -0700
Subject: [PATCH 1939/2322] coreutils: 8.23 -> 8.24

---
 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 e2d0670a826..d72786fa2ff 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -12,11 +12,11 @@ with { inherit (stdenv.lib) optional optionals optionalString optionalAttrs; };
 
 let
   self = stdenv.mkDerivation rec {
-    name = "coreutils-8.23";
+    name = "coreutils-8.24";
 
     src = fetchurl {
       url = "mirror://gnu/coreutils/${name}.tar.xz";
-      sha256 = "0bdq6yggyl7nkc2pbl6pxhhyx15nyqhz3ds6rfn448n6rxdwlhzc";
+      sha256 = "0w11jw3fb5sslf0f72kxy7llxgk1ia3a6bcw0c9kmvxrlj355mx2";
     };
 
     patches = if stdenv.isCygwin then [ ./coreutils-8.23-4.cygwin.patch ] else null;

From 06e146b2ce5eaaa54ebea061dd5797f89ae2c37c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 17:49:07 -0700
Subject: [PATCH 1940/2322] syslinux: Fix failed loading on gcc5

---
 pkgs/os-specific/linux/syslinux/default.nix   |  3 ++-
 .../os-specific/linux/syslinux/gcc5-fix.patch | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/syslinux/gcc5-fix.patch

diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index 93e5d591a9d..3c01516b081 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "03l5iifwlg1wyb4yh98i0b7pd4j55a1c9y74q1frs47a5dnrilr6";
   };
 
-  patches = [ ./perl-deps.patch ];
+  # gcc5-fix should be in 6.04+, so remove if it fails to apply.
+  patches = [ ./perl-deps.patch ./gcc5-fix.patch ];
 
   buildInputs = [ nasm perl libuuid ];
 
diff --git a/pkgs/os-specific/linux/syslinux/gcc5-fix.patch b/pkgs/os-specific/linux/syslinux/gcc5-fix.patch
new file mode 100644
index 00000000000..dc44b188058
--- /dev/null
+++ b/pkgs/os-specific/linux/syslinux/gcc5-fix.patch
@@ -0,0 +1,26 @@
+diff --git a/com32/include/menu.h b/com32/include/menu.h
+index bc0182f..b0251e4 100644
+--- a/com32/include/menu.h
++++ b/com32/include/menu.h
+@@ -195,7 +195,7 @@ void local_cursor_enable(bool);
+ 
+ static inline int my_isspace(char c)
+ {
+-    return (unsigned char)c <= ' ';
++    return (unsigned char)c <= ' ' || (unsigned char)c == '\x7f';
+ }
+ 
+ int my_isxdigit(char c);
+diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c
+index b7814be..a433fad 100644
+--- a/com32/menu/readconfig.c
++++ b/com32/menu/readconfig.c
+@@ -299,7 +299,7 @@ static char *copy_sysappend_string(char *dst, const char *src)
+     char c;
+ 
+     while ((c = *src++)) {
+-	if (c <= ' ' && c == '\x7f') {
++	if (my_isspace(c)) {
+ 	    if (!was_space)
+ 		*dst++ = '_';
+ 	    was_space = true;

From 3cfc6fa38a1976b43f50b2956e27b454d2775149 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 18:31:03 -0700
Subject: [PATCH 1941/2322] linux-firmware: 2015-05-13 -> 2015-06-30

Use iwlwifi/linux-firmware temporarily since the firmware for kernel
4.1+ is not mainlined in firmware/linux-firmware.
---
 .../linux/firmware/firmware-linux-nonfree/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 8ab80ee1e4d..dc166da3ae1 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2015-05-13";
+  version = "2015-06-30";
 
   src = fetchgit {
-    url = "http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
-    rev = "3161bfa479d5e9ed4f46b57df9bcecbbc4f8eb3c";
-    sha256 = "0np6vwcnas3pzp38man3cs8j5ijs0p3skyzla19sfxzpwmjvfpjq";
+    url = "http://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git";
+    rev = "ea901a57054441907e9b127ad407a8554532f992";
+    sha256 = "00899r0gakdy2vpgq5zbhbxrl4kyczg1kybv1h3m2lrk9a0j7v67";
   };
 
   preInstall = ''

From 7f547126d86fd81cd66bac2c048827b6cb5ee70b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 18:34:11 -0700
Subject: [PATCH 1942/2322] perl: Make 5.22 the default

---
 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 1d2e8e4fe37..0a3a6c2b8a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4908,8 +4908,7 @@ let
     fetchurl = fetchurlBoot;
   };
 
-  # Make perl522 the default once gnulib is updated to support it.
-  perl = perl520;
+  perl = perl522;
 
   php = php56;
 

From 731b4a4371639be9003e8b6778536e1441db7872 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 19:21:21 -0700
Subject: [PATCH 1943/2322] perlPackages: Updates

---
 .../perl-modules/DBD-SQLite/default.nix       |  4 +-
 pkgs/top-level/perl-packages.nix              | 41 ++++++++++---------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix
index fbdcec06d0d..985e7946b6b 100644
--- a/pkgs/development/perl-modules/DBD-SQLite/default.nix
+++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, buildPerlPackage, DBI, sqlite }:
 
 buildPerlPackage rec {
-  name = "DBD-SQLite-1.44";
+  name = "DBD-SQLite-1.48";
 
   src = fetchurl {
     url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/${name}.tar.gz";
-    sha256 = "10r7wv5x4vzn9zbk3c7mhbx6kz76xxd9p357592c0wamj458qlml";
+    sha256 = "19hf0fc4dlnpmxsxx3jjbh2z6d2jafgdlqhwz4irkp2cbl7j75xk";
   };
 
   propagatedBuildInputs = [ DBI ];
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 362aa821ca6..8d4f0a624f6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2545,11 +2545,11 @@ let self = _self // overrides; _self = with self; {
     inherit (pkgs) db;
   };
 
-  DBI = buildPerlPackage {
-    name = "DBI-1.631";
+  DBI = buildPerlPackage rec {
+    name = "DBI-1.633";
     src = fetchurl {
-      url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.631.tar.gz;
-      sha256 = "04fmrnchhwi7jx4niaiv93vmi343hdm3xj04w9zr2m9hhqh782np";
+      url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz";
+      sha256 = "1rsyrzmykl7fxpvxmrjmy3dh9szp639fqdhbccqvywpnr7fbmhg2";
     };
     meta = {
       homepage = http://dbi.perl.org/;
@@ -4005,12 +4005,13 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  FontTTF = buildPerlPackage {
-    name = "Font-TTF-0.48";
+  FontTTF = buildPerlPackage rec {
+    name = "Font-TTF-1.05";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MH/MHOSKEN/Font-TTF-0.48.tar.gz;
-      sha256 = "0lhz7v8ihaj35y6kr7jb971hgc4iqh1nz3qbfkignb9i8b1dw97r";
+      url = "mirror://cpan/authors/id/M/MH/MHOSKEN/${name}.tar.gz";
+      sha256 = "0l7vxag0v3hf7w1kjyjv02zqrjzhg6xczcv60z00l3z0fr78xi16";
     };
+    propagatedBuildInputs = [ IOString ];
   };
 
   ForksSuper = buildPerlPackage {
@@ -4810,10 +4811,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   IOTty = buildPerlPackage rec {
-    name = "IO-Tty-1.10";
+    name = "IO-Tty-1.12";
     src = fetchurl {
       url = "mirror://cpan/authors/id/T/TO/TODDR/${name}.tar.gz";
-      sha256 = "1cgqyv1zg8857inlnfczrrgpqr0r6mmqv29b7jlmxv47s4df59ii";
+      sha256 = "0399anjy3bc0w8xzsc3qx5vcyqryc9gc52lc7wh7i49hsdq8gvx2";
     };
   };
 
@@ -5351,11 +5352,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  LWP = buildPerlPackage {
-    name = "libwww-perl-6.05";
+  LWP = buildPerlPackage rec {
+    name = "libwww-perl-6.13";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/libwww-perl-6.05.tar.gz;
-      sha256 = "08wgwyz7748pv5cyngxia0xl6nragfnhrp4p9s78xhgfyygpj9bv";
+      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
+      sha256 = "1cpqjl59viw50bnbdyn8xzrwzg7g54b2rszw0fifacqrppp17gaz";
     };
     propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPNegotiate HTTPMessage LWPMediaTypes NetHTTP URI WWWRobotRules ];
     doCheck = false; # tries to start a daemon
@@ -8973,10 +8974,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TermReadLineGnu = buildPerlPackage rec {
-    name = "Term-ReadLine-Gnu-1.24";
+    name = "Term-ReadLine-Gnu-1.26";
     src = fetchurl {
       url = "mirror://cpan/authors/id/H/HA/HAYASHI/${name}.tar.gz";
-      sha256 = "0dp18pgn8vl4dh6rgzcp1kzk4j6wjrrxd6sfcrrywy7jg4b7ikfc";
+      sha256 = "1s2dvjbh501c04s5hpf17mwirslmhqmsymg3ri4hcvh5yvp7bw7q";
     };
     buildInputs = [ pkgs.readline pkgs.ncurses ];
     NIX_CFLAGS_LINK = "-lreadline";
@@ -10634,10 +10635,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   XMLLibXML = buildPerlPackage rec {
-    name = "XML-LibXML-2.0115";
+    name = "XML-LibXML-2.0121";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
-      sha256 = "0d6l6idl2920x9xi097fvzfdn9i0s8qa9ksw4bz2w1wh3zsn07zm";
+      sha256 = "1j8d3kmkdlzvyx3khvrcrvp798h50i6zc5i3zm04d81prc8i0hzc";
     };
     SKIP_SAX_INSTALL = 1;
     buildInputs = [ pkgs.libxml2 ];
@@ -10772,10 +10773,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   XMLWriter = buildPerlPackage rec {
-    name = "XML-Writer-0.624";
+    name = "XML-Writer-0.625";
     src = fetchurl {
       url = "mirror://cpan/authors/id/J/JO/JOSEPHW/${name}.tar.gz";
-      sha256 = "0yyz0dh9b4clailbxyi90dfrqpyc6py77rmmz6qmkx7ynlpyxk46";
+      sha256 = "1gjzs570i67ywbv967g8ylb5sg59clwmyrl2yix3jl70dhn55070";
     };
   };
 

From 81ace52e890655248e654093088fc339758cde75 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 19:29:45 -0700
Subject: [PATCH 1944/2322] openssh: Refactor and install sample config files

---
 pkgs/tools/networking/openssh/default.nix | 57 +++++++++++------------
 1 file changed, 26 insertions(+), 31 deletions(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 15c84a79a87..e0f1e3fc48b 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -13,10 +13,9 @@ let
     url = mirror://sourceforge/hpnssh/openssh-6.6p1-hpnssh14v5.diff.gz;
     sha256 = "682b4a6880d224ee0b7447241b684330b731018585f1ba519f46660c10d63950";
   };
-  optionalString = stdenv.lib.optionalString;
 
 in
-
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "openssh-6.8p1";
 
@@ -25,7 +24,7 @@ stdenv.mkDerivation rec {
     sha256 = "03hnrqvjq6ghg1mp3gkarfxh6g3x1n1vjrzpbc5lh9717vklrxiz";
   };
 
-  prePatch = stdenv.lib.optionalString hpnSupport
+  prePatch = optionalString hpnSupport
     ''
       gunzip -c ${hpnSrc} | patch -p1
       export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
@@ -34,43 +33,39 @@ stdenv.mkDerivation rec {
   patches = [ ./locale_archive.patch ];
 
   buildInputs = [ zlib openssl libedit pkgconfig pam ]
-    ++ stdenv.lib.optional withKerberos [ kerberos ];
+    ++ optional withKerberos [ kerberos ];
 
   # I set --disable-strip because later we strip anyway. And it fails to strip
   # properly when cross building.
-  configureFlags =
-    ''
-      --with-mantype=man
-      --with-libedit=yes
-      --disable-strip
-      ${if pam != null then "--with-pam" else "--without-pam"}
-      ${optionalString (etcDir != null) "--sysconfdir=${etcDir}"}
-      ${optionalString withKerberos "--with-kerberos5=${kerberos}"}
-      ${optionalString stdenv.isDarwin "--disable-libutil"}
-    '';
+  configureFlags = [
+    "--localstatedir=/var"
+    "--with-mantype=man"
+    "--with-libedit=yes"
+    "--disable-strip"
+    (if pam != null then "--with-pam" else "--without-pam")
+  ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}"
+    ++ optional withKerberos "--with-kerberos5=${kerberos}"
+    ++ optional stdenv.isDarwin "--disable-libutil";
 
-  preConfigure =
-    ''
-      configureFlags="$configureFlags --with-privsep-path=$out/empty"
-      mkdir -p $out/empty
-    '';
+  preConfigure = ''
+    configureFlagsArray+=("--with-privsep-path=$out/empty")
+    mkdir -p $out/empty
+  '';
 
   enableParallelBuilding = true;
 
-  postInstall =
-    ''
-      # Install ssh-copy-id, it's very useful.
-      cp contrib/ssh-copy-id $out/bin/
-      chmod +x $out/bin/ssh-copy-id
-      cp contrib/ssh-copy-id.1 $out/share/man/man1/
+  postInstall = ''
+    # Install ssh-copy-id, it's very useful.
+    cp contrib/ssh-copy-id $out/bin/
+    chmod +x $out/bin/ssh-copy-id
+    cp contrib/ssh-copy-id.1 $out/share/man/man1/
+  '';
 
-      mkdir -p $out/etc/ssh
-      cp moduli $out/etc/ssh/
-    '';
+  installFlags = [
+    "sysconfdir=\${out}/etc/ssh"
+  ];
 
-  installTargets = "install-nosysconf";
-
-  meta = with stdenv.lib; {
+  meta = {
     homepage = "http://www.openssh.org/";
     description = "An implementation of the SSH protocol";
     license = stdenv.lib.licenses.bsd2;

From 243b2f79cedb87749c01126114c83daa2f86487b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 19:30:02 -0700
Subject: [PATCH 1945/2322] openssh: 6.8p1 -> 6.9p1

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

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index e0f1e3fc48b..357ee2b9f21 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -17,11 +17,11 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "openssh-6.8p1";
+  name = "openssh-6.9p1";
 
   src = fetchurl {
     url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "03hnrqvjq6ghg1mp3gkarfxh6g3x1n1vjrzpbc5lh9717vklrxiz";
+    sha256 = "1zkci5nbpb4frmzj2vr3kv9j47x2h72kvybcpr0d8mzk73sls1vf";
   };
 
   prePatch = optionalString hpnSupport

From 5562750cd037f517e9a73e1fdb2735a5868a8a61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= <masgui@gmail.com>
Date: Tue, 7 Jul 2015 00:00:55 -0400
Subject: [PATCH 1946/2322] Build popcorntime from ci until yts movie outage is
 fixed

Currently the movie tab is broken. It's fixed in the experimental branch (master)

http://status.popcorntime.io/
> * Update - Issue with the subtitles API affects Release 0.3.7-2, Experimental builds are fine
>   May 13, 22:54 EDT
> [...]
> * Identified - The issue with the YTS API (Movies) seems to be related to a bad response for one of the movies. The movies page will continue to be intermittent until the issue is resolved.
>   May 10, 21:29 EDT
> * Investigating - YTS (Movies) is currently unavailable for Popcorn Time release 0.3.7-2, but is still working for the experimental builds. We're looking into what the issue could be and why it's only affecting release 0.3.7-2
>   May 10, 18:34 EDT
---
 .../video/popcorntime/default.nix             | 45 ++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
index c588833b2f0..3b47587360e 100644
--- a/pkgs/applications/video/popcorntime/default.nix
+++ b/pkgs/applications/video/popcorntime/default.nix
@@ -1,24 +1,39 @@
-{ stdenv, fetchurl, runCommand, makeWrapper, node_webkit_0_9
+{ lib, stdenv, fetchurl, runCommand, makeWrapper, node_webkit_0_9,
+  fromCi ? true,
+  build ? "652",
+  version ? if fromCi then "0.3.7-2-0ac62b848" else "0.3.7.2"
 }:
 
 let
-  version = "0.3.7.2";
+  config = 
+    if stdenv.system == "x86_64-linux" then 
+      {sys = "Linux32"; 
+       sha256 = 
+          if fromCi then "06av40b68xy2mv2fp9qg8npqmnvkl00p2jvbm2fdfnpc9jj746iy"
+                    else "0lm9k4fr73a9p00i3xj2ywa4wvjf9csadm0pcz8d6imwwq44sa8b";
+      }
+    else if stdenv.system == "i686-linux" then 
+      {sys = "Linux64"; 
+       sha256 = 
+        if fromCi then "1nr2zaixdr5vqynga7jig3fw9dckcnzcbdmbr8haq4a486x2nq0f"
+                  else "1dz1cp31qbwamm9pf8ydmzzhnb6d9z73bigdv3y74dgicz3dpr91";
+      }
+    else throw "Unsupported system ${stdenv.system}";
+
+  fetchurlConf = 
+    let
+      ciBase = "https://ci.popcorntime.io/job/Popcorn-Experimental/652/artifact/build/releases/Popcorn-Time";
+      relBase = "https://get.popcorntime.io/build";
+    in {
+      url = 
+        if fromCi then "${ciBase}/${lib.toLower config.sys}/Popcorn-Time-${version}-${config.sys}.tar.xz"
+        else "${relBase}/Popcorn-Time-${version}-Linux64.tar.xz";
+      sha256 = config.sha256;
+    };
 
   popcorntimePackage = stdenv.mkDerivation rec {
     name = "popcorntime-package-${version}";
-    src =
-      if stdenv.system == "x86_64-linux" then
-        fetchurl {
-          url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux64.tar.xz";
-          sha256 = "0lm9k4fr73a9p00i3xj2ywa4wvjf9csadm0pcz8d6imwwq44sa8b";
-        }
-      else if stdenv.system == "i686-linux" then
-        fetchurl {
-          url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux32.tar.xz";
-          sha256 = "1dz1cp31qbwamm9pf8ydmzzhnb6d9z73bigdv3y74dgicz3dpr91";
-        }
-      else
-        throw "Unsupported system ${stdenv.system}";
+    src = fetchurl fetchurlConf;
     sourceRoot = ".";
     installPhase = ''
       mkdir -p $out

From f36a9a798e7b9a54bed2042ca77a75b3debf7645 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 7 Jul 2015 00:01:16 -0700
Subject: [PATCH 1947/2322] spidermonkey: Use more system dependencies and fix
 for perl 5.22

---
 .../interpreters/spidermonkey/17.0.nix           | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix
index 41757244c00..7573b546164 100644
--- a/pkgs/development/interpreters/spidermonkey/17.0.nix
+++ b/pkgs/development/interpreters/spidermonkey/17.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip }:
+{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip, libffi, readline }:
 
 stdenv.mkDerivation rec {
   version = "17.0.0";
@@ -11,16 +11,26 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ nspr ];
 
-  buildInputs = [ pkgconfig perl python zip ];
+  buildInputs = [ pkgconfig perl python zip libffi readline ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
 
+  postPatch = ''
+    # Fixes an issue with version detection under perl 5.22.x
+    sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl
+  '';
+
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
     export LIBXUL_DIST=$out
   '';
 
-  configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ];
+  configureFlags = [
+    "--enable-threadsafe"
+    "--with-system-nspr"
+    "--with-system-ffi"
+    "--enable-readline"
+  ];
 
   # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
   preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}";

From 76483363d128007771673b73a6490cb001816e86 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 7 Jul 2015 00:01:33 -0700
Subject: [PATCH 1948/2322] polkit: 0.112 -> 0.113

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

diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 7fe16cec56b..cdeaa0cb1d9 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -15,11 +15,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "polkit-0.112";
+  name = "polkit-0.113";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/polkit/releases/${name}.tar.gz";
-    sha256 = "1xkary7yirdcjdva950nqyhmsz48qhrdsr78zciahj27p8yg95fn";
+    sha256 = "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71";
   };
 
   buildInputs =
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     patchShebangs .
   '' + stdenv.lib.optionalString useSystemd /* bogus chroot detection */ ''
-    sed '/libsystemd-login autoconfigured, but system does not appear to use systemd/s/.*/:/' -i configure
+    sed '/libsystemd autoconfigured/s/.*/:/' -i configure
   ''
     # ‘libpolkit-agent-1.so’ should call the setuid wrapper on
     # NixOS.  Hard-coding the path is kinda ugly.  Maybe we can just

From afd532f7cbd7be568648d72f7117341194c7861e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 6 Jul 2015 19:59:50 -0700
Subject: [PATCH 1949/2322] cups: 2.0.2 -> 2.0.3

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

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 10fd71a0754..0018a2762e7 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -3,7 +3,7 @@
 , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
 }:
 
-let version = "2.0.2"; in
+let version = "2.0.3"; in
 
 with stdenv.lib;
 stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2";
-    sha256 = "12xild9nrhqnrzx8zqh78v3chm4mpp5gf5iamr0h9zb6dgvj11w5";
+    sha256 = "10c84ppc9prx6gcyskmm6fh0rks346yryzd356gkg9whhq26fcdw";
   };
 
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]

From c465170662f99cb0010d7df496d2e55bd0f6479c Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Tue, 7 Jul 2015 00:42:15 +0200
Subject: [PATCH 1950/2322] ocaml-text: 0.6 -> 0.7.1

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

diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix
index c82785e4aa9..8bbf08e3c74 100644
--- a/pkgs/development/ocaml-modules/ocaml-text/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libiconv, ocaml, findlib, ncurses}:
 
 stdenv.mkDerivation {
-  name = "ocaml-text-0.6";
+  name = "ocaml-text-0.7.1";
 
   src = fetchurl {
-    url = https://forge.ocamlcore.org/frs/download.php/937/ocaml-text-0.6.tar.gz;
-    sha256 = "0j8gaak0ajnlmn8knvfygqwwzs7awjv5rfn5cbj6qxqbxhjd5m6g";
+    url = "https://github.com/vbmithr/ocaml-text/archive/0.7.1.tar.gz";
+    sha256 = "0dn096q9gjfj7ibj237mb7lq0742a760zawka6i064qns727qwrg";
   };
 
   buildInputs = [ocaml findlib ncurses libiconv];

From 2dfe7d0513db9c0d88fca289135e9f15a81b8061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 7 Jul 2015 09:47:22 +0200
Subject: [PATCH 1951/2322] i2pd: 0.9.0 -> 0.10.0

---
 pkgs/tools/networking/i2pd/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index f1b32ddb7e7..dd28345a48d 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, boost, cryptopp }:
+{ stdenv, fetchFromGitHub, boost, cryptopp }:
 
 stdenv.mkDerivation rec {
 
-  name = "i2pd-${version}";
-  version = "0.9.0";
+  name = pname + "-" + version;
+  pname = "i2pd";
+  version = "0.10.0";
 
-  src = fetchurl {
-    name = "i2pd-src-${version}.tar.gz";
-    url = "https://github.com/PurpleI2P/i2pd/archive/${version}.tar.gz";
-    sha256 = "1rcf4wc34g2alva9jzj6bz0f88g2f5v1w4418b6lp6chvqi7fhc7";
+  src = fetchFromGitHub {
+    owner = "PurpleI2P";
+    repo = pname;
+    rev = version;
+    sha256 = "11w62rc326rhj2xh06307ngx0fai30qny8ml6n5lrx2y1dzjfxd1";
   };
 
   buildInputs = [ boost cryptopp ];

From 41cf8be4123bbbec5701bf16d0f444e645eb4479 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 7 Jul 2015 09:48:29 +0200
Subject: [PATCH 1952/2322] nixos nix-daemon: lower priority is 19. Closes
 #8675

---
 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 b79a69e2ba8..b5a8a7df9fc 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -143,7 +143,7 @@ in
         default = 0;
         description = ''
           Nix daemon process priority. This priority propagates to build processes.
-          0 is the default Unix process priority, 20 is the lowest.
+          0 is the default Unix process priority, 19 is the lowest.
         '';
       };
 

From 9da5943cac189382cb5b3643543eef5308b8515c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 7 Jul 2015 01:50:02 -0700
Subject: [PATCH 1953/2322] gcc: 4.9.2 -> 4.9.3

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

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 5d525e6d50f..14641faa5fe 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -56,7 +56,7 @@ assert langGo -> langCC;
 with stdenv.lib;
 with builtins;
 
-let version = "4.9.2";
+let version = "4.9.3";
 
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
@@ -212,7 +212,7 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
-    sha256 = "1pbjp4blk2ycaa6r3jmw4ky5f1s9ji3klbqgv8zs2sl5jn1cj810";
+    sha256 = "0zmnm00d2a1hsd41g34bhvxzvxisa2l584q3p447bd91lfjv4ci3";
   };
 
   inherit patches;

From e85dac137e7be8940b08744a88fcb8fe60e70000 Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Thu, 2 Jul 2015 03:18:56 +0200
Subject: [PATCH 1954/2322] sundtek init at 30-06-2015

---
 nixos/modules/module-list.nix           |  1 +
 nixos/modules/services/misc/sundtek.nix | 33 +++++++++++++++++
 pkgs/misc/drivers/sundtek/default.nix   | 48 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 4 files changed, 84 insertions(+)
 create mode 100644 nixos/modules/services/misc/sundtek.nix
 create mode 100644 pkgs/misc/drivers/sundtek/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index d580e269df9..e2d8efcf4c2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -219,6 +219,7 @@
   ./services/misc/rogue.nix
   ./services/misc/siproxd.nix
   ./services/misc/subsonic.nix
+  ./services/misc/sundtek.nix
   ./services/misc/svnserve.nix
   ./services/misc/synergy.nix
   ./services/misc/uhub.nix
diff --git a/nixos/modules/services/misc/sundtek.nix b/nixos/modules/services/misc/sundtek.nix
new file mode 100644
index 00000000000..8438ef79904
--- /dev/null
+++ b/nixos/modules/services/misc/sundtek.nix
@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.sundtek;
+
+in
+{
+  options.services.sundtek = {
+    enable = mkEnableOption "Sundtek driver";
+  };
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.sundtek ];
+
+    systemd.services.sundtek = {
+      description = "Sundtek driver";
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        Type = "oneshot";
+        ExecStart = ''
+          ${pkgs.sundtek}/bin/mediasrv -d -v -p ${pkgs.sundtek}/bin ;\
+          ${pkgs.sundtek}/bin/mediaclient --start=5 --wait-for-devices
+          '';
+        ExecStop = "${pkgs.sundtek}/bin/mediaclient --shutdown";
+        RemainAfterExit = true;
+      };
+    };
+  };
+}
diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix
new file mode 100644
index 00000000000..0ad313a7233
--- /dev/null
+++ b/pkgs/misc/drivers/sundtek/default.nix
@@ -0,0 +1,48 @@
+{ fetchurl, stdenv }:
+
+with stdenv.lib;
+
+let
+  version = "30-06-2015";
+  rpath = makeLibraryPath [ "$out/lib" "$out/bin" ];
+  platform = with stdenv;
+    if isx86_64 then "64bit"
+    else
+    if isi686 then "32bit"
+    else abort "${system} not considered in build derivation. Might still be supported.";
+
+in
+  stdenv.mkDerivation {
+    src = fetchurl {
+      url = "http://www.sundtek.de/media/netinst/${platform}/installer.tar.gz";
+      sha256 = "304d2785b5e9046c78fc092341721fdc404074105e63dd635e838559d42313c3";
+    };
+    name = "sundtek-${version}";
+
+    phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+    sourceRoot = ".";
+
+    installPhase = ''
+      cp -r opt $out
+
+      # add and fix pkg-config file
+      mkdir -p $out/lib/pkgconfig
+      substitute $out/doc/libmedia.pc $out/lib/pkgconfig/libmedia.pc \
+        --replace /opt $out
+    '';
+
+    postFixup = ''
+      find $out -type f -exec \
+        patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \
+        patchelf --set-rpath ${rpath} {} \;
+    '';
+
+    meta = {
+      description = "Sundtek MediaTV driver";
+      maintainers = [ maintainers.simonvandel ];
+      platforms = platforms.unix;
+      license = licenses.unfree;
+      homepage = "http://support.sundtek.com/index.php/topic,1573.0.html";
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8bc7e90f33..bd8ac1e3640 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2978,6 +2978,8 @@ let
 
   suidChroot = callPackage ../tools/system/suid-chroot { };
 
+  sundtek = callPackage ../misc/drivers/sundtek { };
+
   super = callPackage ../tools/security/super { };
 
   ssdeep = callPackage ../tools/security/ssdeep { };

From 5aefc44da9b1589dbed85ed8ba319b75b287bf08 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 7 Jul 2015 11:34:33 +0200
Subject: [PATCH 1955/2322] nixos/kubernetes: fix cadvisor, kubelet
 autoregistration

---
 nixos/modules/services/cluster/kubernetes.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index 86b8817c28c..d00c1aaa105 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -224,7 +224,7 @@ in {
 
       machines = mkOption {
         description = "Kubernetes controller list of machines to schedule to schedule onto";
-        default = [config.networking.hostName];
+        default = [];
         type = types.listOf types.str;
       };
 
@@ -242,6 +242,12 @@ in {
         type = types.bool;
       };
 
+      registerNode = mkOption {
+        description = "Whether to auto register kubelet with API server.";
+        default = true;
+        type = types.bool;
+      };
+
       address = mkOption {
         description = "Kubernetes kubelet info server listening address.";
         default = "0.0.0.0";
@@ -274,7 +280,7 @@ in {
 
       cadvisorPort = mkOption {
         description = "Kubernetes kubelet local cadvisor port.";
-        default = config.services.cadvisor.port;
+        default = 4194;
         type = types.int;
       };
 
@@ -324,7 +330,7 @@ in {
     };
 
     kube2sky = {
-      enable = mkEnableOption "kube2sky dns service";
+      enable = mkEnableOption "Whether to enable kube2sky dns service.";
 
       domain = mkOption  {
         description = "Kuberntes kube2sky domain under which all DNS names will be hosted.";
@@ -445,6 +451,7 @@ in {
           export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH"
           exec ${cfg.package}/bin/kubelet \
             --api-servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers}  \
+            --register-node=${if cfg.kubelet.registerNode then "true" else "false"} \
             --address=${cfg.kubelet.address} \
             --port=${toString cfg.kubelet.port} \
             --hostname-override=${cfg.kubelet.hostname} \
@@ -511,8 +518,6 @@ in {
 
     (mkIf (any (el: el == "node") cfg.roles) {
       virtualisation.docker.enable = mkDefault true;
-      services.cadvisor.enable = mkDefault true;
-      services.cadvisor.port = mkDefault 4194;
       services.kubernetes.kubelet.enable = mkDefault true;
       services.kubernetes.proxy.enable = mkDefault true;
     })

From acc995cf41a8406ffd6e820c38ba31854de865b7 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 7 Jul 2015 11:47:12 +0200
Subject: [PATCH 1956/2322] Add compass, stylesheet authoring environment

---
 pkgs/development/tools/compass/Gemfile      |  3 +
 pkgs/development/tools/compass/Gemfile.lock | 28 +++++++
 pkgs/development/tools/compass/default.nix  | 18 +++++
 pkgs/development/tools/compass/gemset.nix   | 83 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 +-
 5 files changed, 135 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/compass/Gemfile
 create mode 100644 pkgs/development/tools/compass/Gemfile.lock
 create mode 100644 pkgs/development/tools/compass/default.nix
 create mode 100644 pkgs/development/tools/compass/gemset.nix

diff --git a/pkgs/development/tools/compass/Gemfile b/pkgs/development/tools/compass/Gemfile
new file mode 100644
index 00000000000..e85f28cbaff
--- /dev/null
+++ b/pkgs/development/tools/compass/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem 'compass'
diff --git a/pkgs/development/tools/compass/Gemfile.lock b/pkgs/development/tools/compass/Gemfile.lock
new file mode 100644
index 00000000000..9aebd2b15ce
--- /dev/null
+++ b/pkgs/development/tools/compass/Gemfile.lock
@@ -0,0 +1,28 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    chunky_png (1.3.4)
+    compass (1.0.3)
+      chunky_png (~> 1.2)
+      compass-core (~> 1.0.2)
+      compass-import-once (~> 1.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      sass (>= 3.3.13, < 3.5)
+    compass-core (1.0.3)
+      multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
+    ffi (1.9.8)
+    multi_json (1.11.0)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    sass (3.4.13)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  compass
diff --git a/pkgs/development/tools/compass/default.nix b/pkgs/development/tools/compass/default.nix
new file mode 100644
index 00000000000..2b0a5aaf90a
--- /dev/null
+++ b/pkgs/development/tools/compass/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, lib, bundlerEnv, ruby }:
+
+bundlerEnv {
+  name = "compass-1.0.3";
+
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  meta = with lib; {
+    description = "Stylesheet Authoring Environment that makes your website design simpler to implement and easier to maintain.";
+    homepage    = https://github.com/Compass/compass;
+    license     = with licenses; mit;
+    maintainers = with maintainers; [ offline ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/compass/gemset.nix b/pkgs/development/tools/compass/gemset.nix
new file mode 100644
index 00000000000..aaf74f3f33c
--- /dev/null
+++ b/pkgs/development/tools/compass/gemset.nix
@@ -0,0 +1,83 @@
+{
+  "chunky_png" = {
+    version = "1.3.4";
+    source = {
+      type = "gem";
+      sha256 = "0n5xhkj3vffihl3h9s8yjzazqaqcm4p1nyxa1w2dk3fkpzvb0wfw";
+    };
+  };
+  "compass" = {
+    version = "1.0.3";
+    source = {
+      type = "gem";
+      sha256 = "0lfi83w8z75czr0pf0rmj9hda22082h3cmvczl8r1ma9agf88y2c";
+    };
+    dependencies = [
+      "chunky_png"
+      "compass-core"
+      "compass-import-once"
+      "rb-fsevent"
+      "rb-inotify"
+      "sass"
+    ];
+  };
+  "compass-core" = {
+    version = "1.0.3";
+    source = {
+      type = "gem";
+      sha256 = "0yaspqwdmzwdcqviclbs3blq7an16pysrfzylz8q1gxmmd6bpj3a";
+    };
+    dependencies = [
+      "multi_json"
+      "sass"
+    ];
+  };
+  "compass-import-once" = {
+    version = "1.0.5";
+    source = {
+      type = "gem";
+      sha256 = "0bn7gwbfz7jvvdd0qdfqlx67fcb83gyvxqc7dr9fhcnks3z8z5rq";
+    };
+    dependencies = [
+      "sass"
+    ];
+  };
+  "ffi" = {
+    version = "1.9.8";
+    source = {
+      type = "gem";
+      sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879";
+    };
+  };
+  "multi_json" = {
+    version = "1.11.0";
+    source = {
+      type = "gem";
+      sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl";
+    };
+  };
+  "rb-fsevent" = {
+    version = "0.9.4";
+    source = {
+      type = "gem";
+      sha256 = "12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7";
+    };
+  };
+  "rb-inotify" = {
+    version = "0.9.5";
+    source = {
+      type = "gem";
+      sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9";
+    };
+    dependencies = [
+      "ffi"
+    ];
+  };
+  "sass" = {
+    version = "3.4.13";
+    source = {
+      type = "gem";
+      sha256 = "0wxkjm41xr77pnfi06cbwv6vq0ypbni03jpbpskd7rj5b0zr27ig";
+    };
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e90ff4984b8..61a4673d466 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1154,6 +1154,8 @@ let
 
   cloogppl = callPackage ../development/libraries/cloog-ppl { };
 
+  compass = callPackage ../development/tools/compass { };
+
   convmv = callPackage ../tools/misc/convmv { };
 
   cool-retro-term = callPackage ../applications/misc/cool-retro-term { };
@@ -4223,7 +4225,7 @@ let
 
     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

From 9fa19cfcea4ed163f96eeaa5c9c103ad099bea18 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jul 2015 11:56:28 +0200
Subject: [PATCH 1957/2322] apache-httpd: Don't set default content encodings

In general, you don't want a .tar.gz file to be served with
"Content-Encoding: x-gzip", because this causes browsers (like Chrome
or "curl --compressed") to decompress the file on the fly. So you end
up with a .tar rather than .tar.gz file, which is unexpected.

If people want such encodings, they should set them in their own NixOS
configuration.
---
 nixos/modules/services/web-servers/apache-httpd/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 2885fd39652..7350a6a68c7 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -187,9 +187,6 @@ let
     <IfModule mod_mime_magic.c>
         MIMEMagicFile ${httpd}/conf/magic
     </IfModule>
-
-    AddEncoding x-compress Z
-    AddEncoding x-gzip gz tgz
   '';
 
 

From 3a1dc590f499dcfee861bee2f79acaec6c0c6c74 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 7 Jul 2015 13:11:00 +0200
Subject: [PATCH 1958/2322] dwb: update from 2014-12-15 to 2015-07-07

---
 .../networking/browsers/dwb/default.nix           | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index f4b36d5e756..6f6ffd67a53 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk2, gtk2, gnutls, json_c,
-  m4, glib_networking, gsettings_desktop_schemas, dconf }:
+{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk2, gtk2, gnutls
+, json_c, m4, glib_networking, gsettings_desktop_schemas, dconf }:
 
 stdenv.mkDerivation {
-  name = "dwb-2014-12-15";
+  name = "dwb-2015-07-07";
 
   src = fetchgit {
     url = "https://bitbucket.org/0mark/dwb_collect";
-    rev = "b94785470b11a0b6b52eecfc3bae276796b83a0d";
-    sha256 = "09xbifj223mflj62rfhi6q7cvnkpkzkwyyqhkm8w067pdscdhyvs";
+    rev = "9a50dcc7134015c6cb1d26afb77840cf69f7c782";
+    sha256 = "03nyr3c0x5b1jqax0zh407vvi4j47zkj1i52lqs35j2d2sci3lkb";
   };
 
-  buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkitgtk2 gtk2 gnutls json_c m4 ];
+  buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup
+    webkitgtk2 gtk2 gnutls json_c m4 ];
 
   # There are Xlib and gtk warnings therefore I have set Wno-error
   makeFlags = ''PREFIX=$(out) GTK=2 CPPFLAGS="-Wno-error"'';
@@ -27,7 +28,7 @@ stdenv.mkDerivation {
     homepage = http://portix.bitbucket.org/dwb/;
     description = "A lightweight web browser based on the webkit web browser engine and the gtk toolkit";
     platforms = platforms.mesaPlatforms;
-    maintainers = with maintainers;[ pSub ];
+    maintainers = with maintainers; [ pSub ];
     license = licenses.gpl3;
   };
 }

From b7ffacffef2fdf6be1b6e044a1da52efb9d89740 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jul 2015 15:13:31 +0200
Subject: [PATCH 1959/2322] Revert "perl: Make 5.22 the default"

This reverts commit 7f547126d86fd81cd66bac2c048827b6cb5ee70b. We're a
bit too close to release to make such fundamental changes.
---
 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 0a3a6c2b8a5..1d2e8e4fe37 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4908,7 +4908,8 @@ let
     fetchurl = fetchurlBoot;
   };
 
-  perl = perl522;
+  # Make perl522 the default once gnulib is updated to support it.
+  perl = perl520;
 
   php = php56;
 

From 7bab5ee5d017d9124bdb99d48adf331a656cb3ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= <masgui@gmail.com>
Date: Tue, 7 Jul 2015 10:23:40 -0400
Subject: [PATCH 1960/2322] Following name convention for popcorntime

http://nixos.org/nixpkgs/manual/#sec-package-naming
---
 pkgs/applications/video/popcorntime/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
index 3b47587360e..45d8c452111 100644
--- a/pkgs/applications/video/popcorntime/default.nix
+++ b/pkgs/applications/video/popcorntime/default.nix
@@ -32,7 +32,9 @@ let
     };
 
   popcorntimePackage = stdenv.mkDerivation rec {
-    name = "popcorntime-package-${version}";
+    name = 
+      if fromCi then "popcorntime-git-2015-07-07"
+                else "popcorntime-${version}";
     src = fetchurl fetchurlConf;
     sourceRoot = ".";
     installPhase = ''

From afb7655c6854151d84427f1c04600032ad12cace Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 7 Jul 2015 09:31:10 -0500
Subject: [PATCH 1961/2322] nixpkgs: arcanist 20150525 -> 20150707

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 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 dfa83ffb312..a6a457c2b58 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -3,18 +3,18 @@
 let
   libphutil = fetchgit {
     url    = "git://github.com/phacility/libphutil.git";
-    rev    = "672c0f7d5da9be6cda619428a9da3b91a670ea2f";
-    sha256 = "830c7abce7244afa188255a6f288c345004cc4be1c8bbe93afa2aa2f1768f025";
+    rev    = "3753a09dfc7e7ee2626946735e420e5b50480f89";
+    sha256 = "86c2613fed23edff58452ceb9fa98ceb559c7e41abdb6752f87ebcf0f50a1a66";
   };
   arcanist = fetchgit {
     url    = "git://github.com/phacility/arcanist.git";
-    rev    = "64d03ff68bf2ff4ef99186472704df8aface9ef3";
-    sha256 = "e9c5f9a9dcb1be0b7fd6f5fbda865e14277ddb0c1cedd256c459b3540ec6ded7";
+    rev    = "4d6d3feb7fc1fb63789554dddee8e489999c1201";
+    sha256 = "e3a9314544c4430ac6e67ba2ae180a96b009b3ab848ba8712fc2b308cf880372";
   };
 in
 stdenv.mkDerivation rec {
   name    = "arcanist-${version}";
-  version = "20150525";
+  version = "20150707";
 
   src = [ arcanist libphutil ];
   buildInputs = [ php makeWrapper flex ];

From b028c14256d08c1dcb5a26f37edc879885cac20d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 7 Jul 2015 18:25:10 +0200
Subject: [PATCH 1962/2322] python-wrapper: Fix variable name for sed expr.

Regression introduced by 5f557885313088a235762d3cb7fd76ec0b1e6547.

The commit not only changes documentation, but also changed a few
variable names. One of them is $i which now is $f and it contains the
name of the file to wrap.

This was accidentally found by @Profpatsch (thanks!) who found himself
getting the basename of the last patch file to end up in sys.argv[0].
The reason for this is that $i is used in the for loop of the generic
patchPhase and thus is reused later when the Python file is to be
wrapped.

I have also added a small comment noting about this, to be sure that
this won't accidentally occur the next time someone changes variable
names.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/python-modules/generic/wrap.sh | 3 +++
 pkgs/top-level/python-packages.nix              | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index 33b9a06f608..b6d2a66afff 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -37,6 +37,9 @@ wrapPythonProgramsIn() {
             # dont wrap EGG-INFO scripts since they are called from python
             if echo "$f" | grep -qv EGG-INFO/scripts; then
                 echo "wrapping \`$f'..."
+                # The magicalSedExpression will invoke a "$(basename "$f")", so
+                # if you change $f to something else, be sure to also change it
+                # in pkgs/top-level/python-packages.nix!
                 sed -i "$f" -re '@magicalSedExpression@'
                 # wrapProgram creates the executable shell script described
                 # above. The script will set PYTHONPATH and PATH variables.!
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d2aecc94158..3e9e07361dc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -68,7 +68,7 @@ let
           /\\$/{N;br}
           /__future__|^ *(#.*)?$/{n;br}
           ${concatImapStrings mkStringSkipper quoteVariants}
-          /^ *[^# ]/i import sys; sys.argv[0] = '"'$(basename "$i")'"'
+          /^ *[^# ]/i import sys; sys.argv[0] = '"'$(basename "$f")'"'
         }
       '';
     }

From 81396388e59b83f1a663cf4789c08f8574d66171 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 7 Jul 2015 09:50:31 -0700
Subject: [PATCH 1963/2322] spidermonkey: Apply 17 patch to 24

---
 .../interpreters/spidermonkey/24.2.nix           | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.2.nix
index 44fe4f60d53..3a9bd8ad7a4 100644
--- a/pkgs/development/interpreters/spidermonkey/24.2.nix
+++ b/pkgs/development/interpreters/spidermonkey/24.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip }:
+{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip, libffi, readline }:
 
 stdenv.mkDerivation rec {
   version = "24.2.0";
@@ -11,7 +11,12 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ nspr ];
 
-  buildInputs = [ pkgconfig perl python zip ];
+  buildInputs = [ pkgconfig perl python zip libffi readline ];
+
+  postPatch = ''
+    # Fixes an issue with version detection under perl 5.22.x
+    sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl
+  '';
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
 
@@ -20,7 +25,12 @@ stdenv.mkDerivation rec {
     export LIBXUL_DIST=$out
   '';
 
-  configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ];
+  configureFlags = [
+    "--enable-threadsafe"
+    "--with-system-nspr"
+    "--with-system-ffi"
+    "--enable-readline"
+  ];
 
   # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
   preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}";

From 08ff83eab3ade9c923e36f03bc09d297bbe5e9f3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 7 Jul 2015 11:34:50 -0700
Subject: [PATCH 1964/2322] nixos/btrfs: Fix parsing of `btrfs subvolume show`
 with btrfsprogs 4.1

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 2 +-
 nixos/modules/system/boot/loader/grub/install-grub.pl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index a929e1eb826..b768be6a3e0 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -354,7 +354,7 @@ EOF
         if ($status != 0 || join("", @msg) =~ /ERROR:/) {
             die "Failed to retrieve subvolume info for $mountPoint\n";
         }
-        my @ids = join("", @id_info) =~ m/Object ID:[ \t\n]*([^ \t\n]*)/;
+        my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/;
         if ($#ids > 0) {
             die "Btrfs subvol name for $mountPoint listed multiple times in mount\n"
         } elsif ($#ids == 0) {
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index c4b1abc8cb0..34bff727b73 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -186,7 +186,7 @@ sub GrubFs {
                 if ($status != 0) {
                     die "Failed to retrieve subvolume info for @{[$fs->mount]}\n";
                 }
-                my @ids = join("", @id_info) =~ m/Object ID:[ \t\n]*([^ \t\n]*)/;
+                my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/;
                 if ($#ids > 0) {
                     die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"
                 } elsif ($#ids == 0) {

From 6c2e7725081a432aa7e7f1d7b22f6c0d1cd2eb03 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 7 Jul 2015 20:08:02 +0200
Subject: [PATCH 1965/2322] network-uri: re-enable tests

The issue causing compilation failure seems to have been resolved.
---
 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 f4f64d97e55..8c8ca70ca80 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -112,9 +112,6 @@ self: super: {
   # https://github.com/haskell/time/issues/23
   time_1_5_0_1 = dontCheck super.time_1_5_0_1;
 
-  # Cannot compile its own test suite: https://github.com/haskell/network-uri/issues/10.
-  network-uri = dontCheck super.network-uri;
-
   # Help libconfig find it's C language counterpart.
   libconfig = (dontCheck super.libconfig).override { config = pkgs.libconfig; };
 

From 0f63a624f746dae1ea0ea0338629ea0bb53a8f0c Mon Sep 17 00:00:00 2001
From: laMudri <lamudri@gmail.com>
Date: Tue, 7 Jul 2015 20:56:13 +0100
Subject: [PATCH 1966/2322] synaptics: fix to allow for more scrolling choices

---
 .../services/x11/hardware/synaptics.nix       | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index 9e44ce811c3..e967dc91141 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -63,12 +63,30 @@ in {
       twoFingerScroll = mkOption {
         type = types.bool;
         default = false;
-        description = "Whether to enable two-finger drag-scrolling.";
+        description = "Whether to enable two-finger drag-scrolling. Overridden by horizTwoFingerScroll and vertTwoFingerScroll.";
+      };
+
+      horizTwoFingerScroll = mkOption {
+        type = types.bool;
+        default = cfg.twoFingerScroll;
+        description = "Whether to enable horizontal two-finger drag-scrolling.";
+      };
+
+      vertTwoFingerScroll = mkOption {
+        type = types.bool;
+        default = cfg.twoFingerScroll;
+        description = "Whether to enable vertical two-finger drag-scrolling.";
+      };
+
+      horizEdgeScroll = mkOption {
+        type = types.bool;
+        default = ! cfg.horizTwoFingerScroll;
+        description = "Whether to enable horizontal edge drag-scrolling.";
       };
 
       vertEdgeScroll = mkOption {
         type = types.bool;
-        default = ! cfg.twoFingerScroll;
+        default = ! cfg.vertTwoFingerScroll;
         description = "Whether to enable vertical edge drag-scrolling.";
       };
 
@@ -147,9 +165,10 @@ in {
           Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}"
           Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}"
           Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}"
-          Option "VertTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
-          Option "HorizTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
+          Option "VertTwoFingerScroll" "${if cfg.vertTwoFingerScroll then "1" else "0"}"
+          Option "HorizTwoFingerScroll" "${if cfg.horizTwoFingerScroll then "1" else "0"}"
           Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}"
+          Option "HorizEdgeScroll" "${if cfg.horizEdgeScroll then "1" else "0"}"
           ${if cfg.palmDetect then ''Option "PalmDetect" "1"'' else ""}
           ${if cfg.horizontalScroll then "" else ''Option "HorizScrollDelta" "0"''}
           ${cfg.additionalOptions}

From ac91ab371a8b8c6a435a7a6170184e57b8482a70 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 7 Jul 2015 22:32:31 +0200
Subject: [PATCH 1967/2322] perl-BoostGeometryUtils: fix OOM in tests

The included patch from Debian resolves an out-of-memory error occurring
when running the test suite.
---
 .../boost-geometry-utils-fix-oom.patch        | 34 +++++++++++++++++++
 pkgs/top-level/perl-packages.nix              |  4 +++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/perl-modules/boost-geometry-utils-fix-oom.patch

diff --git a/pkgs/development/perl-modules/boost-geometry-utils-fix-oom.patch b/pkgs/development/perl-modules/boost-geometry-utils-fix-oom.patch
new file mode 100644
index 00000000000..cbcce381989
--- /dev/null
+++ b/pkgs/development/perl-modules/boost-geometry-utils-fix-oom.patch
@@ -0,0 +1,34 @@
+From a46f0e41056b48a56c572fe8884d4b5104a8343e Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Sun, 29 Jun 2014 21:51:15 +0300
+Subject: [PATCH] multi_linestring2perl: only extend the array if needed
+
+When the size is 0, we end up extending the stack with
+a negative value. As of Perl 5.19.4, more precisely
+ http://perl5.git.perl.org/perl.git/commit/fc16c3924bd6aa054f21ad5445fecf9b7f39dc36
+this ends up allocating memory for 4G-1 elements.
+
+See Dave Mitchell's comments on perl5-porters:
+ Message-ID: <20140522115758.GX15438@iabyn.com>
+ http://marc.info/?l=perl5-porters&m=140075990913228&w=2
+---
+ src/mline2av.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/mline2av.h b/src/mline2av.h
+index e4b3fc2..d7bacee 100644
+--- a/src/mline2av.h
++++ b/src/mline2av.h
+@@ -9,7 +9,8 @@ multi_linestring2perl(pTHX_ const multi_linestring& mls)
+ {
+   AV* av = newAV();
+   const unsigned int size = mls.size();
+-  av_extend(av, size-1);
++  if (size > 0)
++    av_extend(av, size-1);
+ 
+   for (int i = 0; i < size; i++) {
+     AV* lineav = newAV();
+-- 
+2.0.0
+
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 362aa821ca6..f2dde8aa8fd 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -484,6 +484,10 @@ let self = _self // overrides; _self = with self; {
       sha256 = "1jnihz3029x51a455nxa0jx2z125x38q3vkkggsgdlrvawzxsm00";
     };
     propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsTypemapsDefault ];
+    patches = [
+      # Fix out of memory error on Perl 5.19.4 and later.
+      ../development/perl-modules/boost-geometry-utils-fix-oom.patch
+    ];
   };
 
   BusinessISBN = buildPerlPackage {

From 528fae6dd304ac3c2db4e49fa894b9c7ef575d08 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Tue, 7 Jul 2015 23:32:54 +0200
Subject: [PATCH 1968/2322] diffpdf: init at 2.1.3

---
 pkgs/applications/misc/diffpdf/default.nix    | 53 +++++++++++++++++++
 .../misc/diffpdf/fix_path_poppler_qt4.patch   | 16 ++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 71 insertions(+)
 create mode 100644 pkgs/applications/misc/diffpdf/default.nix
 create mode 100644 pkgs/applications/misc/diffpdf/fix_path_poppler_qt4.patch

diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix
new file mode 100644
index 00000000000..88952f5eb76
--- /dev/null
+++ b/pkgs/applications/misc/diffpdf/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl, qt4, poppler_qt4 }:
+
+stdenv.mkDerivation rec {
+  version = "2.1.3";
+  name = "diffpdf-${version}";
+
+  src = fetchurl {
+    url = "http://www.qtrac.eu/${name}.tar.gz";
+    sha256 = "0cr468fi0d512jjj23r5flfzx957vibc9c25gwwhi0d773h2w566";
+  };
+
+  patches = [ ./fix_path_poppler_qt4.patch ];
+
+  buildInputs = [ qt4 poppler_qt4 ];
+
+  preBuild = ''
+    substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4}
+    [ -e "*.qm" ] && make clean
+    lrelease diffpdf.pro
+    qmake -makefile PREFIX=\$out
+    '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man1
+
+    install -Dpm755 -D diffpdf $out/bin/diffpdf
+    install -Dpm644 -D diffpdf.1 $out/share/man/man1/diffpdf.1
+
+    install -dpm755 $out/share/doc/${name} $out/share/licenses/${name} $out/share/pixmaps $out/share/applications
+    install -Dpm644 CHANGES README help.html $out/share/doc/${name}/
+    install -Dpm644 gpl-2.0.txt $out/share/licenses/${name}/
+    install -Dpm644 images/icon.png $out/share/pixmaps/${name}.png
+
+    cat > $out/share/applications/diffpdf.desktop <<EOF
+    [Desktop Entry]
+    Type=Application
+    Version=1.0
+    Name=diffpdf
+    Comment=PDF diffing tool
+    Exec=$out/bin/diffpdf
+    Terminal=false
+    EOF
+    '';
+
+  meta = {
+    homepage = http://www.qtrac.eu/diffpdfc.html;
+    description = "Tool for diffing pdf files visually or textually";
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
+    platforms = with stdenv.lib.platforms; linux;
+    inherit version;
+  };
+}
diff --git a/pkgs/applications/misc/diffpdf/fix_path_poppler_qt4.patch b/pkgs/applications/misc/diffpdf/fix_path_poppler_qt4.patch
new file mode 100644
index 00000000000..e72cad8b7a2
--- /dev/null
+++ b/pkgs/applications/misc/diffpdf/fix_path_poppler_qt4.patch
@@ -0,0 +1,16 @@
+diff -uNr diffpdf-2.1.3/diffpdf.pro diffpdf-2.1.3-new/diffpdf.pro
+--- diffpdf-2.1.3/diffpdf.pro	2013-10-15 09:01:22.000000000 +0200
++++ diffpdf-2.1.3-new/diffpdf.pro	2015-07-07 23:13:36.445572148 +0200
+@@ -47,9 +47,9 @@
+ 	INCLUDEPATH += /c/poppler_lib/include/poppler/qt4
+ 	LIBS += -Wl,-rpath -Wl,/c/poppler_lib/bin -Wl,-L/c/poppler_lib/bin
+     } else {
+-	exists(/usr/include/poppler/qt4) {
+-	    INCLUDEPATH += /usr/include/poppler/cpp
+-	    INCLUDEPATH += /usr/include/poppler/qt4
++	exists(@@NIX_POPPLER_QT4@@/include/poppler/qt4) {
++	    INCLUDEPATH += @@NIX_POPPLER_QT4@@/include/poppler/cpp
++	    INCLUDEPATH += @@NIX_POPPLER_QT4@@/include/poppler/qt4
+ 	} else {
+ 	    INCLUDEPATH += /usr/local/include/poppler/cpp
+ 	    INCLUDEPATH += /usr/local/include/poppler/qt4
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd8ac1e3640..dd5f83941cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12136,6 +12136,8 @@ let
     openjpeg = openjpeg_2_0;
   };
 
+  diffpdf = callPackage ../applications/misc/diffpdf { };
+
   mypaint = callPackage ../applications/graphics/mypaint { };
 
   mythtv = callPackage ../applications/video/mythtv { };

From 4ea88cc526a73adff8b91b293cb1eee17086f17e Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 7 Jul 2015 00:37:53 -0400
Subject: [PATCH 1969/2322] ruby: fix version 2.2.0

---
 pkgs/development/interpreters/ruby/ruby-2.2.0.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/ruby-2.2.0.nix b/pkgs/development/interpreters/ruby/ruby-2.2.0.nix
index 0fb01a5a535..b6375aa687d 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.2.0.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.2.0.nix
@@ -59,9 +59,8 @@ stdenv.mkDerivation rec {
     "${patchSet}/patches/ruby/2.2.0/railsexpress/05-fix-packed-bitfield-compat-warning-for-older-gccs.patch"
   ];
 
-  # Ruby >= 2.1.0 tries to download config.{guess,sub}
-  postPatch = ''
-    rm tool/config_files.rb
+  postPatch = ops useRailsExpress ''
+    sed -i configure.in -e '/config.guess/d'
     cp ${config}/config.guess tool/
     cp ${config}/config.sub tool/
   '';

From 357324df2698810d274d43040c04e463198ce63f Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 7 Jul 2015 01:58:05 -0400
Subject: [PATCH 1970/2322] ruby: add 2.2.2, bump patch levels

* Adds Ruby 2.2.2
* 1.9.3-p547 -> 1.9.3-p551
* 2.0.0-p481 -> 2.0.0-p645
---
 .../interpreters/ruby/ruby-1.9.3.nix          |  43 +++----
 .../interpreters/ruby/ruby-2.0.0.nix          |  17 ++-
 .../interpreters/ruby/ruby-2.2.2.nix          | 110 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   1 +
 4 files changed, 141 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/development/interpreters/ruby/ruby-2.2.2.nix

diff --git a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix
index c53a012d753..70c0d9a1c9c 100644
--- a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix
+++ b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
     owner  = "ruby";
     repo   = "ruby";
     rev    = "v1_9_3_${passthru.patchLevel}";
-    sha256 = "040x67snfjrql5j7blizpm9j58jhwvh00v8h1h59aq90h52lkj68";
+    sha256 = "1r9xzzxmci2ajb34qb4y1w424mz878zdgzxkfp9w60agldxnb36s";
   } else fetchurl {
     url = "http://cache.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2";
-    sha256 = "0k7g0ahicjnd4sij2pml1p1dcb95ms3k3j1k3169n02kzz9qwn7g";
+    sha256 = "07kpvv2z7g6shflls7fyfga8giifahwlnl30l49qdm9i6izf7idh";
   };
 
   # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@@ -52,24 +52,25 @@ stdenv.mkDerivation rec {
     ./ruby19-parallel-install.patch
     ./bitperfect-rdoc.patch
   ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/01-fix-make-clean.patch"
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/02-railsbench-gc.patch"
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/04-fork-support-for-gc-logging.patch"
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/05-track-live-dataset-size.patch"
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/06-webrick_204_304_keep_alive_fix.patch"
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/07-export-a-few-more-symbols-for-ruby-prof.patch"
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/08-thread-variables.patch"
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/09-faster-loading.patch"
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/10-falcon-st-opt.patch"
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/11-falcon-sparse-array.patch"
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/12-falcon-array-queue.patch"
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/13-railsbench-gc-fixes.patch"
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/14-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/15-configurable-fiber-stack-sizes.patch"
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/16-backport-psych-20.patch"
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/17-fix-missing-c-return-event.patch"
-    "${patchSet}/patches/ruby/1.9.3/p547/railsexpress/18-fix-process-daemon-call.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/01-fix-make-clean.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/02-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/03-railsbench-gc.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/04-display-more-detailed-stack-trace.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/05-fork-support-for-gc-logging.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/06-track-live-dataset-size.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/07-webrick_204_304_keep_alive_fix.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/08-export-a-few-more-symbols-for-ruby-prof.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/09-thread-variables.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/10-faster-loading.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/11-falcon-st-opt.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/12-falcon-sparse-array.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/13-falcon-array-queue.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/14-railsbench-gc-fixes.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/15-show-full-backtrace-on-stack-overflow.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/16-configurable-fiber-stack-sizes.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/17-backport-psych-20.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/18-fix-missing-c-return-event.patch"
+    "${patchSet}/patches/ruby/1.9.3/p${passthru.patchLevel}/railsexpress/19-fix-process-daemon-call.patch"
   ];
 
   configureFlags = [ "--enable-shared" "--enable-pthread" ]
@@ -113,7 +114,7 @@ stdenv.mkDerivation rec {
     majorVersion = "1";
     minorVersion = "9";
     teenyVersion = "3";
-    patchLevel = "547";
+    patchLevel = "551";
     rubyEngine = "ruby";
     libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
     gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
diff --git a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix
index 31408b73807..dc6c70b676d 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix
@@ -25,10 +25,10 @@ stdenv.mkDerivation rec {
     owner  = "ruby";
     repo   = "ruby";
     rev    = "v2_0_0_${passthru.patchLevel}";
-    sha256 = "07ccnxgiqxn5ycmq2wl7j3aqmndm4n358y35kzaivb488ayjg3pj";
+    sha256 = "14bnas1iif2shyaz4ylb0832x96y2mda52x0v0aglkvqmcz1cfxb";
   } else fetchurl {
-    url = "http://cache.ruby-lang.org/pub/ruby/2.0/${name}.tar.bz2";
-    sha256 = "1qnqccyfhx0fykxqbzlxq0yvyvq6q9v32givyfyr303dx7bxlqh7";
+    url = "https://cache.ruby-lang.org/pub/ruby/2.0/${name}.tar.bz2";
+    sha256 = "1sc36qxqhziqbrvp99z4qdx9j0f8r1xhcbb6scb3m4nb02cwzk9d";
   };
 
   # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@@ -51,11 +51,10 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   patches = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.0.0/p481/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.0.0/p481/railsexpress/02-railsexpress-gc.patch"
-    "${patchSet}/patches/ruby/2.0.0/p481/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.0.0/p481/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/2.0.0/p481/railsexpress/05-fix-missing-c-return-event.patch"
+    "${patchSet}/patches/ruby/2.0.0/p${passthru.patchLevel}/railsexpress/01-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.0.0/p${passthru.patchLevel}/railsexpress/02-railsexpress-gc.patch"
+    "${patchSet}/patches/ruby/2.0.0/p${passthru.patchLevel}/railsexpress/03-display-more-detailed-stack-trace.patch"
+    "${patchSet}/patches/ruby/2.0.0/p${passthru.patchLevel}/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
   ];
 
   configureFlags = ["--enable-shared" ]
@@ -96,7 +95,7 @@ stdenv.mkDerivation rec {
     majorVersion = "2";
     minorVersion = "0";
     teenyVersion = "0";
-    patchLevel = "481";
+    patchLevel = "645";
     rubyEngine = "ruby";
     libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
     gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
diff --git a/pkgs/development/interpreters/ruby/ruby-2.2.2.nix b/pkgs/development/interpreters/ruby/ruby-2.2.2.nix
new file mode 100644
index 00000000000..5537d0e8c80
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/ruby-2.2.2.nix
@@ -0,0 +1,110 @@
+{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub
+, zlib, zlibSupport ? true
+, openssl, opensslSupport ? true
+, gdbm, gdbmSupport ? true
+, ncurses, readline, cursesSupport ? true
+, groff, docSupport ? false
+, libyaml, yamlSupport ? true
+, libffi, fiddleSupport ? true
+, ruby_2_2_2, autoreconfHook, bison, useRailsExpress ? true
+}:
+
+let
+  op = stdenv.lib.optional;
+  ops = stdenv.lib.optionals;
+  patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
+  config = import ./config.nix fetchgit;
+  baseruby = ruby_2_2_2.override { useRailsExpress = false; };
+in
+
+stdenv.mkDerivation rec {
+  version = with passthru; "${majorVersion}.${minorVersion}.${teenyVersion}-p${patchLevel}";
+
+  name = "ruby-${version}";
+
+  src = if useRailsExpress then fetchFromGitHub {
+    owner  = "ruby";
+    repo   = "ruby";
+    rev    = "v2_2_2";
+    sha256 = "08mw1ql2ghy483cp8xzzm78q17simn4l6phgm2gah7kjh9y3vbrn";
+  } else fetchurl {
+    url = "http://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.2.tar.gz";
+    sha256 = "0i4v7l8pnam0by2cza12zldlhrffqchwb2m9shlnp7j2gqqhzz2z";
+  };
+
+  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
+  NROFF = "${groff}/bin/nroff";
+
+  buildInputs = ops useRailsExpress [ autoreconfHook bison ]
+    ++ (op fiddleSupport libffi)
+    ++ (ops cursesSupport [ ncurses readline ])
+    ++ (op docSupport groff)
+    ++ (op zlibSupport zlib)
+    ++ (op opensslSupport openssl)
+    ++ (op gdbmSupport gdbm)
+    ++ (op yamlSupport libyaml)
+    # Looks like ruby fails to build on darwin without readline even if curses
+    # support is not enabled, so add readline to the build inputs if curses
+    # support is disabled (if it's enabled, we already have it) and we're
+    # running on darwin
+    ++ (op (!cursesSupport && stdenv.isDarwin) readline);
+
+  enableParallelBuilding = true;
+
+  patches = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.2.2/railsexpress/01-zero-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.2.2/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.2.2/railsexpress/03-display-more-detailed-stack-trace.patch"
+    "${patchSet}/patches/ruby/2.2.2/railsexpress/04-backported-bugfixes-222.patch"
+  ];
+
+  postPatch = ops useRailsExpress ''
+    sed -i configure.in -e '/config.guess/d'
+    cp ${config}/config.guess tool/
+    cp ${config}/config.sub tool/
+  '';
+
+  configureFlags = ["--enable-shared" ]
+    ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
+    # on darwin, we have /usr/include/tk.h -- so the configure script detects
+    # that tk is installed
+    ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]);
+
+  installFlags = stdenv.lib.optionalString docSupport "install-doc";
+  # Bundler tries to create this directory
+  postInstall = ''
+    # Bundler tries to create this directory
+    mkdir -pv $out/${passthru.gemPath}
+    mkdir -p $out/nix-support
+    cat > $out/nix-support/setup-hook <<EOF
+    addGemPath() {
+      addToSearchPath GEM_PATH \$1/${passthru.gemPath}
+    }
+
+    envHooks+=(addGemPath)
+    EOF
+  '' + lib.optionalString useRailsExpress ''
+    rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
+
+    # Prevent the baseruby from being included in the closure.
+    sed -i '/^  CONFIG\["BASERUBY"\]/d' $rbConfig
+    sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
+  '';
+
+  meta = {
+    license = stdenv.lib.licenses.ruby;
+    homepage = "http://www.ruby-lang.org/en/";
+    description = "The Ruby language";
+    platforms = stdenv.lib.platforms.all;
+  };
+
+  passthru = rec {
+    majorVersion = "2";
+    minorVersion = "2";
+    teenyVersion = "0";
+    patchLevel = "0";
+    rubyEngine = "ruby";
+    libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";
+    gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd8ac1e3640..19f6458ac2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5090,6 +5090,7 @@ let
   ruby_2_1_3 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.3.nix { });
   ruby_2_1_6 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.6.nix { });
   ruby_2_2_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.2.0.nix { });
+  ruby_2_2_2 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.2.2.nix { });
 
   # Ruby aliases
   ruby = ruby_2_1;

From 88d5f2c0a5c313de649d25ec10a1666977c05bbc Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 8 Jul 2015 00:22:57 +0200
Subject: [PATCH 1971/2322] pdfdiff: init at 0.92

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

diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix
new file mode 100644
index 00000000000..43b98035343
--- /dev/null
+++ b/pkgs/applications/misc/pdfdiff/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, pythonPackages, fetchurl, xpdf }:
+let
+  py = pythonPackages;
+in
+py.buildPythonPackage rec {
+  name = "pdfdiff-${version}";
+  version = "0.92";
+
+  src = fetchurl {
+    url = "http://www.cs.ox.ac.uk/people/cas.cremers/downloads/software/pdfdiff.py";
+    sha256 = "0zxwjjbklz87wkbhkmsvhc7xmv5php7m2a9vm6ydhmhlxsybf836";
+  };
+
+  buildInputs = [  pythonPackages.wrapPython ];
+
+  doCheck = false;
+
+  phases = [ "unpackPhase" "patchPhase" "installPhase" ];
+
+  unpackPhase = "cp $src pdfdiff.py";
+
+  postPatch = ''
+    sed -i -r 's|pdftotextProgram = "pdftotext"|pdftotextProgram = "${xpdf}/bin/pdftotext"|' pdfdiff.py
+    sed -i -r 's|progName = "pdfdiff.py"|progName = "pdfdiff"|' pdfdiff.py
+    '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp pdfdiff.py $out/bin/pdfdiff
+    chmod +x $out/bin/pdfdiff
+
+    substituteInPlace $out/bin/pdfdiff --replace "#!/usr/bin/python" "#!${pythonPackages.python.interpreter}"
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.cs.ox.ac.uk/people/cas.cremers/misc/pdfdiff.html;
+    description = "Tool to view the difference between two PDF or PS files";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd8ac1e3640..8c766cbef57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12132,6 +12132,8 @@ let
 
   maxlib = callPackage ../applications/audio/pd-plugins/maxlib { };
 
+  pdfdiff = callPackage ../applications/misc/pdfdiff { };
+
   mupdf = callPackage ../applications/misc/mupdf {
     openjpeg = openjpeg_2_0;
   };

From 75f53bc6150a4b524779fa16f21e563a7c8745e3 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 7 Jul 2015 18:37:54 -0400
Subject: [PATCH 1972/2322] ruby: set the default to 2.2.2

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19f6458ac2d..54251592159 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5083,22 +5083,22 @@ let
 
   ruby_1_8_7 = callPackage ../development/interpreters/ruby/ruby-1.8.7.nix { };
   ruby_1_9_3 = callPackage ../development/interpreters/ruby/ruby-1.9.3.nix { };
-  ruby_2_0_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.0.0.nix { });
-  ruby_2_1_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.0.nix { });
-  ruby_2_1_1 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { });
-  ruby_2_1_2 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { });
-  ruby_2_1_3 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.3.nix { });
-  ruby_2_1_6 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.6.nix { });
-  ruby_2_2_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.2.0.nix { });
-  ruby_2_2_2 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.2.2.nix { });
+  ruby_2_0_0 = callPackage ../development/interpreters/ruby/ruby-2.0.0.nix { };
+  ruby_2_1_0 = callPackage ../development/interpreters/ruby/ruby-2.1.0.nix { };
+  ruby_2_1_1 = callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { };
+  ruby_2_1_2 = callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { };
+  ruby_2_1_3 = callPackage ../development/interpreters/ruby/ruby-2.1.3.nix { };
+  ruby_2_1_6 = callPackage ../development/interpreters/ruby/ruby-2.1.6.nix { };
+  ruby_2_2_0 = callPackage ../development/interpreters/ruby/ruby-2.2.0.nix { };
+  ruby_2_2_2 = callPackage ../development/interpreters/ruby/ruby-2.2.2.nix { };
 
   # Ruby aliases
-  ruby = ruby_2_1;
+  ruby = ruby_2_2;
   ruby_1_8 = ruby_1_8_7;
   ruby_1_9 = ruby_1_9_3;
   ruby_2_0 = ruby_2_0_0;
   ruby_2_1 = ruby_2_1_6;
-  ruby_2_2 = ruby_2_2_0;
+  ruby_2_2 = ruby_2_2_2;
 
   rubygemsFun = ruby: builderDefsPackage (import ../development/interpreters/ruby/rubygems.nix) {
     inherit ruby makeWrapper;

From 450c0da6d7a60b54eaf0720d6bcde4a5d23d6639 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Wed, 8 Jul 2015 18:44:30 +1200
Subject: [PATCH 1973/2322] vimPlugins: change wombat256 source to github

See issue #8694. Previously wombat256 was downloading its source from
the vim website using fetchurl. The builder was failing when it tried to
unpack the .vim source file. Using the vim-scripts github repo avoids
this problem.
---
 pkgs/misc/vim-plugins/default.nix      | 18 ++++++++----------
 pkgs/misc/vim-plugins/vim-plugin-names |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index b91a1a2ae10..056f6d1e9d3 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -80,6 +80,7 @@ rec {
   vimshell            = vimshell-vim;
   watchdogs           = vim-watchdogs;
   webapi-vim          = WebAPI;
+  wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
   yankring            = YankRing;
 
   CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
@@ -1315,18 +1316,15 @@ rec {
 
   };
 
-  wombat256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "wombat256";
-    src = fetchurl {
-      url = "http://www.vim.org/scripts/download_script.php?src_id=13400";
-      name = "wombat256mod.vim";
-      sha256 = "1san0jg9sfm6chhnr1wc5nhczlp11ibca0v7i4gf68h9ick9mysn";
+  wombat256-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "wombat256-vim-2010-10-17";
+    src = fetchgit {
+      url = "git://github.com/vim-scripts/wombat256.vim";
+      rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2";
+      sha256 = "2feb7d57ab0a9f2ea44ccd606e540db64ab3285956398a50ecc562d7b8dbcd05";
     };
-    buildInputs = [ unzip ];
     dependencies = [];
-    meta = {
-       url = "http://www.vim.org/scripts/script.php?script_id=2465";
-    };
+
   };
 
 }
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 972754ec2ba..91d7f32fce5 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -57,6 +57,7 @@
 "github:vim-scripts/a.vim"
 "github:vim-scripts/align"
 "github:vim-scripts/tabmerge"
+"github:vim-scripts/wombat256.vim"
 "github:wakatime/vim-wakatime"
 "github:wincent/command-t"
 "matchit.zip"
@@ -97,4 +98,3 @@
 "vim-snippets"
 "vim2hs"
 "vundle"
-"wombat256"

From 13df90ee7e847c786c2a3ed666bfcfacfbab2b88 Mon Sep 17 00:00:00 2001
From: Dan <difrumin@gmail.com>
Date: Wed, 8 Jul 2015 10:19:17 +0300
Subject: [PATCH 1974/2322] libiconv: fix hash on darwin

---
 pkgs/os-specific/darwin/apple-source-releases/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index 92ee9e52726..1d89577012c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -64,7 +64,7 @@ let
     Libc_old        = applePackage "Libc/825_40_1.nix" "825.40.1"    "0xsx1im52gwlmcrv4lnhhhn9dyk5ci6g27k6yvibn9vj8fzjxwcf" {};
     libclosure      = applePackage "libclosure"        "63"          "083v5xhihkkajj2yvz0dwgbi0jl2qvzk22p7pqq1zp3ry85xagrx" {};
     libdispatch     = applePackage "libdispatch"       "339.92.1"    "1lc5033cmkwxy3r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {};
-    libiconv        = applePackage "libiconv"          "41"          "10q7yd35flr893nysn9i04njgks4m3gis7jivb9ra9dcb77gqdcn" {};
+    libiconv        = applePackage "libiconv"          "41"          "0sni1gx6i2h7r4r4hhwbxdir45cp039m4wi74izh4l0pfw7gywad" {};
     Libinfo         = applePackage "Libinfo"           "449.1.3"     "1ix6f7xwjnq9bqgv8w27k4j64bqn1mfhh91nc7ciiv55axpdb9hq" {};
     Libm            = applePackage "Libm"              "2026"        "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {};
     Libnotify       = applePackage "Libnotify"         "121.20.1"    "164rx4za5z74s0mk9x0m1815r1m9kfal8dz3bfaw7figyjd6nqad" {};

From abf2642290a5f891039c8194ddfd84da0b4c9e43 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 8 Jul 2015 10:26:55 +0200
Subject: [PATCH 1975/2322] st: update from 0.5 to 0.6

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

diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index 1dcdf78456d..1ef8f697aee 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -4,11 +4,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "st-0.5";
+  name = "st-0.6";
   
   src = fetchurl {
     url = "http://dl.suckless.org/st/${name}.tar.gz";
-    sha256 = "0knxpzaa86pprng6hak8hx8bw22yw22rpz1ffxjpcvqlz3xdv05f";
+    sha256 = "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5";
   };
 
   configFile = optionalString (conf!=null) (writeText "config.def.h" conf);

From 4e33dd4e993c1b88a50dbb5f6855c569986cd30c Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 7 Jul 2015 11:54:45 +0200
Subject: [PATCH 1976/2322] openshift: init at 1.0.1

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

diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
new file mode 100644
index 00000000000..527ddd99af1
--- /dev/null
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchgit, go, git, which }:
+
+stdenv.mkDerivation rec {
+  name = "openshift-origin-${version}";
+  version = "1.0.1";
+
+  src = fetchgit {
+    url = https://github.com/openshift/origin.git;
+    rev = "1b601951daa44964c9bc7e4a2264d65489e3a58c";
+    sha256 = "0nwyj3cgajmbd356w0362zxkd3p3pply58an2bmi3d3bswp3k89g";
+    leaveDotGit = true;
+    deepClone = true;
+  };
+
+  buildInputs = [ go git which ];
+
+  buildPhase = "hack/build-go.sh";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp _output/local/go/bin/* "$out/bin/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Build, deploy, and manage your applications with Docker and Kubernetes";
+    license = licenses.asl20;
+    homepage = http://www.openshift.org;
+    maintainers = with maintainers; [offline];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e90ff4984b8..1422b687b72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12075,6 +12075,8 @@ let
 
   mutt-kz = callPackage ../applications/networking/mailreaders/mutt-kz { };
 
+  openshift = callPackage ../applications/networking/cluster/openshift { };
+
   panamax_api = callPackage ../applications/networking/cluster/panamax/api {
     ruby = ruby_2_1;
   };

From e987d1c1e32d877d3d214165991a87bc81833c30 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 8 Jul 2015 06:24:38 -0400
Subject: [PATCH 1977/2322] requireFile: Make more flexible

---
 pkgs/build-support/trivial-builders.nix | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 7e73f98db78..d9eeaa31359 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -88,23 +88,33 @@ rec {
     (lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries));
 
   # Require file
-  requireFile = {name, sha256, url ? null, message ? null} :
+  requireFile = { name ? null
+                , sha256 ? null
+                , sha1 ? null
+                , url ? null
+                , message ? null
+                } :
     assert (message != null) || (url != null);
+    assert (sha256 != null) || (sha1 != null);
+    assert (name != null) || (url != null);
     let msg =
       if message != null then message
       else ''
-        Unfortunately, we may not download file ${name} automatically.
+        Unfortunately, we may not download file ${name_} automatically.
         Please, go to ${url}, download it yourself, and add it to the Nix store
         using either
-          nix-store --add-fixed sha256 ${name}
+          nix-store --add-fixed ${hashAlgo} ${name_}
         or
-          nix-prefetch-url file://path/to/${name}
+          nix-prefetch-url --type ${hashAlgo} file://path/to/${name_}
       '';
+      hashAlgo = if sha256 != null then "sha256" else "sha1";
+      hash = if sha256 != null then sha256 else sha1;
+      name_ = if name == null then baseNameOf (toString url) else name;
     in
     stdenv.mkDerivation {
-      inherit name;
-      outputHashAlgo = "sha256";
-      outputHash = sha256;
+      name = name_;
+      outputHashAlgo = hashAlgo;
+      outputHash = hash;
       builder = writeScript "restrict-message" ''
 source ${stdenv}/setup
 cat <<_EOF_

From a5a8bad0e6b7af11ec25dd34a5dba16fef6c5faa Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 8 Jul 2015 06:24:55 -0400
Subject: [PATCH 1978/2322] buildMaven: Handle authenticated repos

---
 pkgs/build-support/build-maven.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix
index 26be7d2aebb..646b3243583 100644
--- a/pkgs/build-support/build-maven.nix
+++ b/pkgs/build-support/build-maven.nix
@@ -1,4 +1,4 @@
-{ stdenv, maven, runCommand, writeText, fetchurl, lib }:
+{ stdenv, maven, runCommand, writeText, fetchurl, lib, requireFile }:
 /* Takes an info file generated by mvn2nix
  * (https://github.com/NixOS/mvn2nix-maven-plugin) and builds the maven
  * project with it.
@@ -15,9 +15,11 @@ infoFile: let
 
   script = writeText "build-maven-repository.sh" ''
     ${lib.concatStrings (map (dep: let
-      inherit (dep) url sha1 groupId artifactId version;
+      inherit (dep) url sha1 groupId artifactId version authenticated;
 
-      fetch = fetchurl { inherit url sha1; };
+      fetch = (if authenticated then requireFile else fetchurl) {
+        inherit url sha1;
+      };
     in ''
       dir=$out/$(echo ${groupId} | sed 's|\.|/|g')/${artifactId}/${version}
       mkdir -p $dir

From e54d0371b9f608967d79abb31f6b0e9893c59dc3 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 8 Jul 2015 12:03:56 +0000
Subject: [PATCH 1979/2322] disnix: bump to version 0.4

---
 .../package-management/disnix/DisnixWebService/default.nix  | 6 +++---
 pkgs/tools/package-management/disnix/default.nix            | 6 +++---
 pkgs/tools/package-management/disnix/disnixos/default.nix   | 6 +++---
 pkgs/tools/package-management/disnix/dysnomia/default.nix   | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
index 4e143bed519..65a90bfae96 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.3";
+  name = "DisnixWebService-0.4";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/20419315/download/4/DisnixWebService-0.3.tar.bz2;
-    sha256 = "03vm84h7div200jr5z28hiwk0fq7i45j0ki18c2h4pmbsd89479i";
+    url = http://hydra.nixos.org/build/23484798/download/4/DisnixWebService-0.4.tar.bz2;
+    sha256 = "1rfzmh4rxip8nq25fvi6vw51xb7h0nch4l06s0xgwwv4gw8p0lhm";
   };
   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 98213d9cf34..39d8132ba09 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.3";
+  name = "disnix-0.4";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/20419300/download/4/disnix-0.3.tar.gz;
-    sha256 = "11yh270r8mgnkz98ax3p4rlc5dh88sxykvsmcpvgaqnqjh1rwd3j";
+    url = http://hydra.nixos.org/build/23484781/download/4/disnix-0.4.tar.gz;
+    sha256 = "1hvjy19br4x7cvgn0rslysrp3w7jfh30s7piq6v9j2b6k6wmh2hk";
   };
   
   buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ];
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 52312ca7191..4603f108d37 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, disnix, socat, pkgconfig, getopt }:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.2";
+  name = "disnixos-0.3";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/20419306/download/3/disnixos-0.2.tar.gz;
-    sha256 = "1xysklly0gvh0np0h3f30sfs5lx6qnwj59l8caynwn46qy596gnx";
+    url = http://hydra.nixos.org/build/23484787/download/3/disnixos-0.3.tar.gz;
+    sha256 = "08v9vbg3727mv4iyzwfnf5x3la2xjj1agbbzm8aaa09q7alqasvw";
   };
   
   buildInputs = [ socat pkgconfig disnix getopt ];
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index 0507ff45dc7..f79250cf018 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;
 
 stdenv.mkDerivation {
-  name = "dysnomia-0.3";
+  name = "dysnomia-0.4";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/20419293/download/1/dysnomia-0.3.tar.gz;
-    sha256 = "09z9ad72wzxjvbc3hynbj9n1y4rrxw1by1wxacjmdqyp46h4b746";
+    url = http://hydra.nixos.org/build/23484767/download/1/dysnomia-0.4.tar.gz;
+    sha256 = "1xyd1gzsy4nlbv2l2lrrs964vvb74yhmb8snr4chf7hcyaybb6cq";
   };
   
   preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";

From 8ff60567ae1eb31e02de16e2f1e9e444592903f8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 7 Jul 2015 14:09:38 +0200
Subject: [PATCH 1980/2322] shairport-sync: 2.3.0 -> 2.3.6.5

- Enable additional backends: pipe, stdout
- Support high-quality resampling with soxr
- Support configuration files, but don't install one
- Cut down on boilerplate code with fetchFromGitHub/autoreconfHook
---
 pkgs/servers/shairport-sync/default.nix | 28 ++++++++++++++-----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix
index 2bfe74900f6..2ee5683a2ca 100644
--- a/pkgs/servers/shairport-sync/default.nix
+++ b/pkgs/servers/shairport-sync/default.nix
@@ -1,36 +1,40 @@
-{ stdenv, fetchurl, openssl, avahi, alsaLib, libdaemon, autoconf, automake, libtool, popt, unzip, pkgconfig, libconfig, libpulseaudio }:
+{ stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsaLib
+, libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }:
 
 stdenv.mkDerivation rec {
-  version = "2.3.0";
+  version = "2.3.6.5";
   name = "shairport-sync-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/mikebrady/shairport-sync/archive/${version}.zip";
-    sha256 = "1kslif2ifrn0frvi39d44wpn53sjahwq0xjc0hd98ycf3xbcgndg";
+  src = fetchFromGitHub {
+    sha256 = "1337y62pnch27s2gr47miip3na1am24xprlc5a27lbr764nr85s3";
+    rev = version;
+    repo = "shairport-sync";
+    owner = "mikebrady";
   };
 
   buildInputs = [
+    autoreconfHook
     openssl
     avahi
     alsaLib
     libdaemon
-    autoconf
-    automake
     pkgconfig
-    libtool
     popt
-    unzip
     libconfig
     libpulseaudio
+    soxr
   ];
 
   enableParallelBuilding = true;
 
-  preConfigure = "autoreconf -vfi";
-  configureFlags = "--with-alsa --with-avahi --with-ssl=openssl --without-initscript --with-pulseaudio";
+  configureFlags = ''
+    --with-alsa --with-pipe --with-pulseaudio --with-stdout
+    --with-avahi --with-ssl=openssl --with-soxr
+    --without-configfiles --without-initscript
+  '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/mikebrady/shairport-sync;
+    inherit (src.meta) homepage;
     description = "Airtunes server and emulator with multi-room capabilities";
     license = licenses.mit;
     platforms = platforms.unix;

From 0b6e9f38caeedde5c0bc741968ed06738949ab15 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 8 Jul 2015 16:07:57 +0200
Subject: [PATCH 1981/2322] python-packages: pgcli 0.17.0 -> 0.18.0

Changes: https://raw.githubusercontent.com/dbcli/pgcli/master/changelog.rst
---
 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 43e7ff13122..c31f34ffae3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8839,22 +8839,21 @@ let
 
   pgcli = buildPythonPackage rec {
     name = "pgcli-${version}";
-    version = "0.17.0";
+    version = "0.18.0";
 
     src = pkgs.fetchFromGitHub {
-      sha256 = "0fnzhsir1m7a2rlh3iqinrz5i38ssfg9p7s60bkyy55614l146yg";
+      sha256 = "1ydi1725ryz9by770kyx06cwrvyvixbg3502brkf5hvbjd8ddzrl";
       rev = "v${version}";
       repo = "pgcli";
       owner = "amjith";
     };
 
-    propagatedBuildInputs = with self; [ click jedi prompt_toolkit psycopg2 pygments sqlparse ];
-
-    postPatch = ''
-      substituteInPlace setup.py --replace "==" ">="
-    '';
+    propagatedBuildInputs = with self; [
+      click configobj prompt_toolkit psycopg2 pygments sqlparse
+    ];
 
     meta = {
+      inherit version;
       description = "Command-line interface for PostgreSQL";
       longDescription = ''
         Rich command-line interface for PostgreSQL with auto-completion and

From 1f2388044930c05c61584bf7a4bdec7a63ef02f4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 8 Jul 2015 17:13:24 +0200
Subject: [PATCH 1982/2322] geolite-legacy: 2015-06-15 -> 2015-07-08

---
 pkgs/data/misc/geolite-legacy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index b6cc2a25266..ae7b344ff0e 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,17 +8,17 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-06-15";
+  version = "2015-07-08";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
   srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz"
-    "1cd25xsw214bdmc657q3a1dcivjnh6ravdsgia2w7q8bq8g61yfp";
+    "0c6jcmlgkybsqiwqwa21igjazf95dj38mn516cqqqfdg7ciaj1d5";
   srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz"
     "1vi82p41vas18yp17yk236pn1xamsi9662aav79fa0hm43i3ydx3";
   srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz"
-    "1z87ng2a2zmqnvxhcmapnarc9w2ycb18vpivvzx893y7fh39h34s";
+    "0x5ihg7qikzc195nix9r0izvbdnj4hy4rznvaxk56rf8yqcigdyv";
   srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
     "0xjzg76vdsayxyy1yyw64w781vad4c9nbhw61slh2qmazdr360g9";
   srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz"

From 92c5355690d2b4530cdaf171717e1b7536d9ba23 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 8 Jul 2015 17:39:05 +0200
Subject: [PATCH 1983/2322] fira-code: init at 0.5

---
 pkgs/data/fonts/fira-code/default.nix | 31 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/data/fonts/fira-code/default.nix

diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix
new file mode 100644
index 00000000000..9855738d6d6
--- /dev/null
+++ b/pkgs/data/fonts/fira-code/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "fira-code-${version}";
+  version = "0.5";
+
+  src = fetchurl {
+    url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode-Regular.otf";
+    sha256 = "1y2jz1v7m0q73rz9vblxgaqkgh9wpp4fp7dq21hdyfhxkk3ss6xk";
+  };
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    cp -v $src $out/share/fonts/opentype/FiraCode-Regular.otf
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/tonsky/FiraCode;
+    description = "Monospace font with programming ligatures";
+    longDescription = ''
+      Fira Code is a monospace font extending the Fira Mono font with
+      a set of ligatures for common programming multi-character
+      combinations.
+    '';
+    license = licenses.ofl;
+    maintainers = [ maintainers.rycee ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d92cfd3c761..f3c84b59d4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10408,6 +10408,8 @@ let
 
   fira = callPackage ../data/fonts/fira { };
 
+  fira-code = callPackage ../data/fonts/fira-code { };
+
   fira-mono = callPackage ../data/fonts/fira-mono { };
 
   font-awesome-ttf = callPackage ../data/fonts/font-awesome-ttf { };

From f9efcd47a1484fc5951372a3e27c09f55217f439 Mon Sep 17 00:00:00 2001
From: Robert Irelan <rirelan@gmail.com>
Date: Wed, 8 Jul 2015 09:19:20 -0700
Subject: [PATCH 1984/2322] subsonic: add telotortium as maintainer

---
 lib/maintainers.nix                    | 1 +
 pkgs/servers/misc/subsonic/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 2aeedbfa9c2..8e8ae4c4988 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -228,6 +228,7 @@
   sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
   tailhook = "Paul Colomiets <paul@colomiets.name>";
   taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
+  telotortium = "Robert Irelan <rirelan@gmail.com>";
   thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
   the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
   theuni = "Christian Theune <ct@flyingcircus.io>";
diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix
index dad32139cbe..4e7ed6712da 100644
--- a/pkgs/servers/misc/subsonic/default.nix
+++ b/pkgs/servers/misc/subsonic/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
     homepage = http://subsonic.org;
     description = "Personal media streamer";
     license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ telotortium ];
   };
 
   phases = ["unpackPhase" "installPhase"];

From 8ead9cf0c51dc03f6a29fbb421fc923fa978ac4b Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Sat, 4 Jul 2015 16:42:54 -0700
Subject: [PATCH 1985/2322] caffe: init at rev 77d66dfc

Initial version of the Caffe deep learning framework from Berkeley
---
 .../science/math/caffe/default.nix            | 70 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 74 insertions(+)
 create mode 100644 pkgs/applications/science/math/caffe/default.nix

diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
new file mode 100644
index 00000000000..fc7d9611529
--- /dev/null
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -0,0 +1,70 @@
+{ stdenv
+, openblas
+, boost
+, cudaSupport ? true
+, cudnnSupport ? false
+, cudnn ? null
+, cudatoolkit7
+, fetchFromGitHub
+, google-gflags
+, glog
+, hdf5
+, leveldb
+, lmdb
+, opencv
+, protobuf
+, snappy
+}:
+
+
+let optional = stdenv.lib.optional;
+in stdenv.mkDerivation rec {
+  # Use git revision because latest "release" is really old
+  name = "caffe-git-2015-07-02";
+
+  src = fetchFromGitHub {
+    owner = "BVLC";
+    repo = "caffe";
+    rev = "77d66dfc907dd875d69bb9fc12dd950b531e464f";
+    sha256 = "0vd4qrc49dhsawj298xpkd5mvi35sh56kdswx3yp8ya4fjajwakx";
+  };
+
+  preConfigure = "mv Makefile.config.example Makefile.config";
+
+  makeFlags = "BLAS=open " +
+              (if !cudaSupport then "CPU_ONLY=1 " else "CUDA_DIR=${cudatoolkit7} ") +
+              (if cudnnSupport then "USE_CUDNN=1 " else "");
+
+  # too many issues with tests to run them for now
+  doCheck = false;
+  checkPhase = "make runtest ${makeFlags}";
+
+  buildInputs = [ openblas boost google-gflags glog hdf5 leveldb lmdb opencv
+                  protobuf snappy ]
+                ++ optional cudaSupport cudatoolkit7
+                ++ optional cudnnSupport cudnn;
+
+  installPhase = ''
+    mkdir -p $out/{bin,share,lib}
+    for bin in $(find build/tools -executable -type f -name '*.bin');
+    do
+      cp $bin $out/bin/$(basename $bin .bin)
+    done
+
+    cp -r build/examples $out/share
+    cp -r build/lib $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Deep learning framework";
+    longDescription = ''
+      Caffe is a deep learning framework made with expression, speed, and
+      modularity in mind. It is developed by the Berkeley Vision and Learning
+      Center (BVLC) and by community contributors.
+    '';
+    homepage = http://caffe.berkeleyvision.org/;
+    maintainers = with maintainers; [ jb55 ];
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d92cfd3c761..139f655110c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14401,6 +14401,10 @@ let
 
   ### SCIENCE / MATH
 
+  caffe = callPackage ../applications/science/math/caffe {
+    cudaSupport = config.caffe.cudaSupport or config.cudaSupport or true;
+  };
+
   ecm = callPackage ../applications/science/math/ecm { };
 
   eukleides = callPackage ../applications/science/math/eukleides {

From c0de3b306be36d7e1f491998c9c096973a430121 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 8 Jul 2015 19:14:36 +0200
Subject: [PATCH 1986/2322] nixos/bitlbee: add hostname, config dir and
 protocols options

---
 nixos/modules/services/networking/bitlbee.nix | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix
index 7276603da16..ca2fff91704 100644
--- a/nixos/modules/services/networking/bitlbee.nix
+++ b/nixos/modules/services/networking/bitlbee.nix
@@ -17,10 +17,12 @@ let
     [settings]
     RunMode = Daemon
     User = bitlbee  
-    ConfigDir = /var/lib/bitlbee      
+    ConfigDir = ${cfg.configDir}
     DaemonInterface = ${cfg.interface}
     DaemonPort = ${toString cfg.portNumber}
     AuthMode = ${cfg.authMode}
+    ${lib.optionalStringv (cfg.hostName != "") "HostName = ${cfg.hostName}"}
+    Protocols = ${cfg.protocols}
     ${cfg.extraSettings}
 
     [defaults]
@@ -73,6 +75,34 @@ in
         ''; 
       };
 
+      hostName = mkOption {
+        default = "";
+        type = types.str;
+        description = ''
+          Normally, BitlBee gets a hostname using getsockname(). If you have a nicer
+          alias for your BitlBee daemon, you can set it here and BitlBee will identify
+          itself with that name instead.
+        '';
+      };
+
+      configDir = mkOption {
+        default = "/var/lib/bitlbee";
+        type = types.path;
+        description = ''
+          Specify an alternative directory to store all the per-user configuration
+          files.
+        '';
+      };
+
+      protocols = mkOption {
+        default = "";
+        type = types.str;
+        description = ''
+          This option allows to remove the support of protocol, even if compiled
+          in. If nothing is given, there are no restrictions.
+        '';
+      };
+
       extraSettings = mkOption {
         default = "";
         description = ''

From 1e4483b1ec7da4b662628f05eb220ea7a9ca1aea Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 8 Jul 2015 19:30:20 +0200
Subject: [PATCH 1987/2322] nixos/bitlbee: fixed protocols option

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

diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix
index ca2fff91704..1ffd57e0621 100644
--- a/nixos/modules/services/networking/bitlbee.nix
+++ b/nixos/modules/services/networking/bitlbee.nix
@@ -22,7 +22,7 @@ let
     DaemonPort = ${toString cfg.portNumber}
     AuthMode = ${cfg.authMode}
     ${lib.optionalStringv (cfg.hostName != "") "HostName = ${cfg.hostName}"}
-    Protocols = ${cfg.protocols}
+    ${lib.optionalString (cfg.protocols != "") "Protocols = ${cfg.protocols}"}
     ${cfg.extraSettings}
 
     [defaults]

From bd82a79fc1c5bee7ec1378a68afbeb6cc5721b40 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 8 Jul 2015 11:28:41 -0700
Subject: [PATCH 1988/2322] xorriso: 1.3.8 -> 1.4.0

---
 pkgs/tools/cd-dvd/xorriso/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix
index c5595fab2e0..29d483f725f 100644
--- a/pkgs/tools/cd-dvd/xorriso/default.nix
+++ b/pkgs/tools/cd-dvd/xorriso/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr }:
 
 stdenv.mkDerivation rec {
-  name = "xorriso-1.3.8";
+  name = "xorriso-1.4.0";
 
   src = fetchurl {
     url = "mirror://gnu/xorriso/${name}.tar.gz";
-    sha256 = "0zhhj9lr9z7hnb2alac54mc28w1l0mbanphhpmy3ylsi8rih84lh";
+    sha256 = "0mhfxn2idkrw1i65a5y4gnb1fig85zpnszb9ax7w4a2v062y1l8b";
   };
 
   doCheck = true;

From 590c46701810c59f4369226fd45244238b0add5f Mon Sep 17 00:00:00 2001
From: Rehno Lindeque <errantkid@gmail.com>
Date: Mon, 6 Jul 2015 18:58:50 +0200
Subject: [PATCH 1989/2322] nodejs: 0.12.0 -> 0.12.6

0.12.5 and 0.12.6 were both critical security releases.
---
 pkgs/development/web/nodejs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 151033bfe24..1e3260bd10f 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -12,7 +12,7 @@ let
     ln -sv /usr/sbin/dtrace $out/bin
   '';
 
-  version = "0.12.0";
+  version = "0.12.6";
 
   deps = {
     inherit openssl zlib libuv;
@@ -36,7 +36,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "0cifd2qhpyrbxx71a4hsagzk24qas8m5zvwcyhx69cz9yhxf404p";
+    sha256 = "1llsl7zl3080zd7jfhhy4d5s9pnhr15niw6vivp9sflpa71mlfvs";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);

From e861889e9922cdf4601ec316bbbaaad0d7cf3d62 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 8 Jul 2015 12:05:31 -0700
Subject: [PATCH 1990/2322] nixos/tests/installer: Add a testcase for fat32
 /boot

---
 nixos/release-combined.nix |  1 +
 nixos/release.nix          |  1 +
 nixos/tests/installer.nix  | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 191d5044341..2d2976ea5b7 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -56,6 +56,7 @@ in rec {
         (all nixos.tests.installer.lvm)
         (all nixos.tests.installer.luksroot)
         (all nixos.tests.installer.separateBoot)
+        (all nixos.tests.installer.separateBootFat)
         (all nixos.tests.installer.simple)
         (all nixos.tests.installer.simpleLabels)
         (all nixos.tests.installer.simpleProvided)
diff --git a/nixos/release.nix b/nixos/release.nix
index a8b6d275f1d..c288adfd206 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -229,6 +229,7 @@ in rec {
   tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test);
   tests.installer.luksroot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).luksroot.test);
   tests.installer.separateBoot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBoot.test);
+  tests.installer.separateBootFat = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBootFat.test);
   tests.installer.simple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simple.test);
   tests.installer.simpleLabels = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleLabels.test);
   tests.installer.simpleProvided = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleProvided.test);
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 32be1ea23b9..4da5c29ca0d 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -254,6 +254,27 @@ in {
         '';
     };
 
+  # Same as the previous, but with fat32 /boot.
+  separateBootFat = makeInstallerTest "separateBootFat"
+    { createPartitions =
+        ''
+          $machine->succeed(
+              "parted /dev/vda mklabel msdos",
+              "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
+              "parted /dev/vda -- mkpart primary linux-swap 50MB 1024M",
+              "parted /dev/vda -- mkpart primary ext2 1024M -1s", # /
+              "udevadm settle",
+              "mkswap /dev/vda2 -L swap",
+              "swapon -L swap",
+              "mkfs.ext3 -L nixos /dev/vda3",
+              "mount LABEL=nixos /mnt",
+              "mkfs.vfat -n BOOT /dev/vda1",
+              "mkdir -p /mnt/boot",
+              "mount LABEL=BOOT /mnt/boot",
+          );
+        '';
+    };
+
   # Create two physical LVM partitions combined into one volume group
   # that contains the logical swap and root partitions.
   lvm = makeInstallerTest "lvm"

From cb3e282cdacdd1e42c4e62712263f515a5ffd128 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 2 Jul 2015 18:59:10 -0700
Subject: [PATCH 1991/2322] unique host deps, otherwise we get 600000 char
 derivations

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

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 07486093da8..fe7bec54ba0 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -147,8 +147,9 @@ let
           __impureHostDeps = attrs.__impureHostDeps or [];
           __propagatedImpureHostDeps = attrs.__propagatedImpureHostDeps or [];
 
-          computedImpureHostDeps           = lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs);
-          computedPropagatedImpureHostDeps = lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs);
+          # TODO: remove lib.unique once nix has a list canonicalization primitive
+          computedImpureHostDeps           = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs));
+          computedPropagatedImpureHostDeps = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs));
         in
         {
           builder = attrs.realBuilder or shell;

From 976d80eb573335e30da57153f959e75b9d76a69b Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 8 Jul 2015 14:14:27 -0700
Subject: [PATCH 1992/2322] map apple sdk frameworks CF to darwin.CF to avoid
 confusion

---
 pkgs/applications/editors/vim/default.nix     |  6 +++
 pkgs/os-specific/darwin/apple-sdk/default.nix |  8 +++-
 .../darwin/apple-sdk/frameworks.nix           |  5 +--
 .../darwin/apple-sdk/impure-deps.nix          | 32 ++++++++++++---
 .../CF/cf-bridging.patch                      | 39 +++++++++++++++++++
 .../apple-source-releases/CF/default.nix      | 14 ++++++-
 pkgs/top-level/all-packages.nix               |  4 +-
 7 files changed, 95 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/CF/cf-bridging.patch

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 385611a167a..e1e920e2c49 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
     sha256 = "1z0qarf6a2smab28g9dnxklhfayn85wx48bnddmyhb9kqzjgqgjc";
   };
 
+  # this makes maintainers very sad
+  # open source CF doesn't have anything NSArray-related, causing linking errors. the
+  # missing symbol is in system CoreFoundation.
+  NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
+    "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
+
   enableParallelBuilding = true;
 
   buildInputs = [ ncurses pkgconfig ]
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index cc1032fc03d..61cc84ca2be 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xar, gzip, cpio }:
+{ stdenv, fetchurl, xar, gzip, cpio, CF }:
 
 let
   # I'd rather not "export" this, since they're somewhat monolithic and encourage bad habits.
@@ -146,5 +146,9 @@ in rec {
     };
   };
 
-  frameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix { inherit frameworks libs; });
+  frameworks = (stdenv.lib.mapAttrs framework (import ./frameworks.nix { inherit frameworks libs; })) // {
+    CoreFoundation = CF;
+  };
+
+  inherit sdk;
 }
diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
index bedf39764a9..8b4b291fb3f 100644
--- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
@@ -26,8 +26,7 @@ with frameworks; with libs; {
   CoreAudio               = [ CoreFoundation IOKit ];
   CoreAudioKit            = [ AudioUnit ];
   CoreData                = [];
-  CoreFoundation          = [];
-  CoreGraphics            = [ Accelerate CoreFoundation IOKit IOSurface ];
+  CoreGraphics            = [ Accelerate CoreFoundation IOKit IOSurface SystemConfiguration ];
   CoreLocation            = [];
   CoreMIDI                = [ CoreFoundation ];
   CoreMIDIServer          = [];
@@ -110,7 +109,7 @@ with frameworks; with libs; {
   Accelerate          = [ CoreWLAN IOBluetooth ];
   ApplicationServices = [ CoreFoundation CoreServices CoreText ImageIO ];
   Carbon              = [ ApplicationServices CoreFoundation CoreServices IOKit Security ];
-  CoreServices        = [ CFNetwork CoreFoundation DiskArbitration Security NetFS OpenDirectory ServiceManagement ];
+  CoreServices        = [ CFNetwork CoreAudio CoreData CoreFoundation DiskArbitration Security NetFS OpenDirectory ServiceManagement ];
   IOBluetooth         = [ IOKit ];
   JavaVM              = [];
   OpenDirectory       = [];
diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
index 8a9860c9c77..c43bb4bf90c 100644
--- a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
@@ -1,9 +1,8 @@
-{
-  CoreFoundation = [
-    "/System/Library/Frameworks/CoreFoundation.framework"
-  ];
+rec {
   CFNetwork = [
     "/System/Library/Frameworks/CFNetwork.framework"
+    "/usr/lib/libsqlite3.dylib"
+    "/usr/lib/libxml2.2.dylib"
   ];
   IOKit = [
     "/System/Library/Frameworks/IOKit.framework"
@@ -13,15 +12,28 @@
   ];
   Security = [
     "/System/Library/Frameworks/Security.framework"
+    "/usr/lib/libbz2.1.0.dylib"
+    "/usr/lib/libpam.2.dylib"
+    "/usr/lib/libxar.1.dylib"
   ];
   CoreServices = [
     "/System/Library/Frameworks/CoreServices.framework"
-  ];
+    "/System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore"
+    "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC"
+    "/System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling"
+    "/usr/lib/libmecabra.dylib"
+    "/usr/lib/libcmph.dylib"
+    "/usr/lib/libiconv.2.dylib"
+    "/usr/lib/libxslt.1.dylib"
+  ] ++ Foundation;
   IOSurface = [
     "/System/Library/Frameworks/IOSurface.framework"
   ];
   CoreGraphics = [
     "/System/Library/Frameworks/CoreGraphics.framework"
+    "/System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport"
+    "/usr/lib/libbsm.0.dylib"
+    "/usr/lib/libz.1.dylib"
   ];
   CoreText = [
     "/System/Library/Frameworks/CoreText.framework"
@@ -31,7 +43,9 @@
   ];
   ApplicationServices = [
     "/System/Library/Frameworks/ApplicationServices.framework"
-  ];
+    "/usr/lib/libcups.2.dylib"
+    "/usr/lib/libresolv.9.dylib"
+  ] ++ AudioToolbox;
   OpenGL = [
     "/System/Library/Frameworks/OpenGL.framework"
   ];
@@ -102,6 +116,10 @@
   Foundation = [
     "/System/Library/Frameworks/Foundation.framework"
     "/usr/lib/libextension.dylib"
+    "/usr/lib/libarchive.2.dylib"
+    "/usr/lib/liblzma.5.dylib"
+    "/usr/lib/liblangid.dylib"
+    "/usr/lib/libCRFSuite.dylib"
   ];
   CoreData = [
     "/System/Library/Frameworks/CoreData.framework"
@@ -131,6 +149,8 @@
   ];
   NetFS = [
     "/System/Library/Frameworks/NetFS.framework"
+    "/System/Library/PrivateFrameworks/NetAuth.framework/Versions/A/NetAuth"
+    "/System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport"
   ];
   Accelerate = [
     "/System/Library/Frameworks/Accelerate.framework"
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/cf-bridging.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/cf-bridging.patch
new file mode 100644
index 00000000000..068a6311a9c
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/CF/cf-bridging.patch
@@ -0,0 +1,39 @@
+diff --git a/CFBase.h b/CFBase.h
+index ffddd2b..e5a926b 100644
+--- a/CFBase.h
++++ b/CFBase.h
+@@ -249,6 +249,33 @@ CF_EXTERN_C_BEGIN
+ #endif
+ #endif
+ 
++#if __has_attribute(objc_bridge) && __has_feature(objc_bridge_id) && __has_feature(objc_bridge_id_on_typedefs)
++
++#ifdef __OBJC__
++@class NSArray;
++@class NSAttributedString;
++@class NSString;
++@class NSNull;
++@class NSCharacterSet;
++@class NSData;
++@class NSDate;
++@class NSTimeZone;
++@class NSDictionary;
++@class NSError;
++@class NSLocale;
++@class NSNumber;
++@class NSSet;
++@class NSURL;
++#endif
++
++#define CF_BRIDGED_TYPE(T)		__attribute__((objc_bridge(T)))
++#define CF_BRIDGED_MUTABLE_TYPE(T)	__attribute__((objc_bridge_mutable(T)))
++#define CF_RELATED_TYPE(T,C,I)		__attribute__((objc_bridge_related(T,C,I)))
++#else
++#define CF_BRIDGED_TYPE(T)
++#define CF_BRIDGED_MUTABLE_TYPE(T)
++#define CF_RELATED_TYPE(T,C,I)
++#endif
+ 
+ CF_EXPORT double kCFCoreFoundationVersionNumber;
+ 
+
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
index 3d4ac89e0a7..f919dde7f69 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
@@ -3,7 +3,16 @@
 appleDerivation {
   buildInputs = [ dyld icu libdispatch launchd libclosure ];
 
-  patches = [ ./add-cf-initialize.patch ./add-cfmachport.patch ];
+  patches = [ ./add-cf-initialize.patch ./add-cfmachport.patch ./cf-bridging.patch ];
+
+  # CFAttributedString.h is in the SDK only, not on opensource.apple.com or github
+  __propagatedImpureHostDeps = [
+    "/System/Library/Frameworks/CoreFoundation.framework"
+    "/usr/lib/libc++.1.dylib"
+    "/usr/lib/libc++abi.dylib"
+    "/usr/lib/libicucore.A.dylib"
+    "/usr/lib/libz.1.dylib"
+  ];
 
   preBuild = ''
     substituteInPlace Makefile \
@@ -35,6 +44,9 @@ appleDerivation {
   '';
 
   postInstall = ''
+    # gross! convince apple to release this as part of CF
+    cp /System/Library/Frameworks/CoreFoundation.framework/Headers/CFAttributedString.h "$out/System/Library/Frameworks/CoreFoundation.framework/Headers"
+
     mv $out/System/* $out
     rmdir $out/System
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6afed1980a8..140136492ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9343,7 +9343,9 @@ let
     cmdline_sdk   = cmdline.sdk;
     cmdline_tools = cmdline.tools;
 
-    apple_sdk = callPackage ../os-specific/darwin/apple-sdk {};
+    apple_sdk = callPackage ../os-specific/darwin/apple-sdk {
+      inherit (darwin) CF;
+    };
 
     libobjc = apple-source-releases.objc4;
   };

From 6f6d873069835f97c1d99e9b2ae21e3a5666c900 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 8 Jul 2015 14:14:46 -0700
Subject: [PATCH 1993/2322] darwin purity: mercurial

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

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 6c58fbd3689..4d8b2fe27c6 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -19,8 +19,9 @@ stdenv.mkDerivation {
   inherit python; # pass it so that the same version can be used in hg2git
   pythonPackages = [ curses ];
 
-  buildInputs = [ python makeWrapper docutils unzip ]
-    ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
+  buildInputs = [ python makeWrapper docutils unzip ];
+
+  propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin ApplicationServices;
 
   makeFlags = "PREFIX=$(out)";
 

From ce5afbbb261d46daded0a2ca6cf773050ac1693d Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 8 Jul 2015 14:14:54 -0700
Subject: [PATCH 1994/2322] update libiconv source hash

---
 pkgs/os-specific/darwin/apple-source-releases/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index 92ee9e52726..1d89577012c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -64,7 +64,7 @@ let
     Libc_old        = applePackage "Libc/825_40_1.nix" "825.40.1"    "0xsx1im52gwlmcrv4lnhhhn9dyk5ci6g27k6yvibn9vj8fzjxwcf" {};
     libclosure      = applePackage "libclosure"        "63"          "083v5xhihkkajj2yvz0dwgbi0jl2qvzk22p7pqq1zp3ry85xagrx" {};
     libdispatch     = applePackage "libdispatch"       "339.92.1"    "1lc5033cmkwxy3r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {};
-    libiconv        = applePackage "libiconv"          "41"          "10q7yd35flr893nysn9i04njgks4m3gis7jivb9ra9dcb77gqdcn" {};
+    libiconv        = applePackage "libiconv"          "41"          "0sni1gx6i2h7r4r4hhwbxdir45cp039m4wi74izh4l0pfw7gywad" {};
     Libinfo         = applePackage "Libinfo"           "449.1.3"     "1ix6f7xwjnq9bqgv8w27k4j64bqn1mfhh91nc7ciiv55axpdb9hq" {};
     Libm            = applePackage "Libm"              "2026"        "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {};
     Libnotify       = applePackage "Libnotify"         "121.20.1"    "164rx4za5z74s0mk9x0m1815r1m9kfal8dz3bfaw7figyjd6nqad" {};

From af22ac6f34a0f124c98268e7df0d483a327d0c7e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 8 Jul 2015 14:15:13 -0700
Subject: [PATCH 1995/2322] ruby: Fix 1.9.3 for libobjc

---
 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 140136492ea..71bf1126cac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5028,7 +5028,9 @@ let
   bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { };
 
   ruby_1_8_7 = callPackage ../development/interpreters/ruby/ruby-1.8.7.nix { };
-  ruby_1_9_3 = callPackage ../development/interpreters/ruby/ruby-1.9.3.nix { };
+  ruby_1_9_3 = callPackage ../development/interpreters/ruby/ruby-1.9.3.nix {
+    inherit (darwin) libobjc;
+  };
   ruby_2_0_0 = callPackage ../development/interpreters/ruby/ruby-2.0.0.nix { };
   ruby_2_1_0 = callPackage ../development/interpreters/ruby/ruby-2.1.0.nix { };
   ruby_2_1_1 = callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { };

From f92c174ccef174dc2c8ef325ab0eab91181e664d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 8 Jul 2015 14:24:42 -0700
Subject: [PATCH 1996/2322] ruby: Correct version string

---
 pkgs/development/interpreters/ruby/ruby-2.2.2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/ruby/ruby-2.2.2.nix b/pkgs/development/interpreters/ruby/ruby-2.2.2.nix
index 5537d0e8c80..0f0fa5245e4 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.2.2.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.2.2.nix
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
   passthru = rec {
     majorVersion = "2";
     minorVersion = "2";
-    teenyVersion = "0";
+    teenyVersion = "2";
     patchLevel = "0";
     rubyEngine = "ruby";
     libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}";

From dae5b3546387bb0e01789b4e5eb82d6d5a02a041 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 8 Jul 2015 15:10:07 -0700
Subject: [PATCH 1997/2322] ruby: Fixup libv8 versions

---
 .../networking/cluster/panamax/ui/Gemfile.lock         |  2 +-
 .../networking/cluster/panamax/ui/gemset.nix           |  8 ++++----
 .../version-management/gitlab/Gemfile.lock             |  2 +-
 pkgs/applications/version-management/gitlab/gemset.nix |  8 ++++----
 .../ruby/bundler-env/default-gem-config.nix            | 10 +---------
 pkgs/servers/consul/Gemfile.lock                       |  2 +-
 pkgs/servers/consul/gemset.nix                         |  4 ++--
 7 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock b/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock
index e1dfc0d4a3d..b273595bbb0 100644
--- a/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock
+++ b/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock
@@ -86,7 +86,7 @@ GEM
       railties (>= 3.2.16)
     json (1.8.2)
     kramdown (1.4.0)
-    libv8 (3.16.14.7)
+    libv8 (3.16.14.11)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
diff --git a/pkgs/applications/networking/cluster/panamax/ui/gemset.nix b/pkgs/applications/networking/cluster/panamax/ui/gemset.nix
index cfb2b6f460f..b41b482edb7 100644
--- a/pkgs/applications/networking/cluster/panamax/ui/gemset.nix
+++ b/pkgs/applications/networking/cluster/panamax/ui/gemset.nix
@@ -332,11 +332,11 @@
       sha256 = "001vy0ymiwbvkdbb9wpqmswv6imliv7xim00gq6rlk0chnbiaq80";
     };
   };
-  "libv8" = {
-    version = "3.16.14.7";
+  libv8 = {
+    version = "3.16.14.11";
     source = {
       type = "gem";
-      sha256 = "0dv5q5n5nf6b8h3fybwmsr3vkj70w4g1jpf6661j3hsv9vp0g4qq";
+      sha256 = "000vbiy78wk5r1f6p7qncab8ldg7qw5pjz7bchn3lw700gpaacxp";
     };
   };
   "mail" = {
@@ -786,4 +786,4 @@
       "railties"
     ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index 314884fa36e..c7db793060e 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -281,7 +281,7 @@ GEM
       addressable (~> 2.3)
     letter_opener (1.1.2)
       launchy (~> 2.2)
-    libv8 (3.16.14.3)
+    libv8 (3.16.14.11)
     listen (2.3.1)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index 392550daae5..21a3b8fe6db 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -1121,11 +1121,11 @@
       "launchy"
     ];
   };
-  "libv8" = {
-    version = "3.16.14.3";
+  libv8 = {
+    version = "3.16.14.11";
     source = {
       type = "gem";
-      sha256 = "1arjjbmr9zxkyv6pdrihsz1p5cadzmx8308vgfvrhm380ccgridm";
+      sha256 = "000vbiy78wk5r1f6p7qncab8ldg7qw5pjz7bchn3lw700gpaacxp";
     };
   };
   "listen" = {
@@ -2395,4 +2395,4 @@
       "nokogiri"
     ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
index 38b7ce530ae..b4e04f6ec90 100644
--- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
+++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
@@ -18,14 +18,13 @@
 # (to make gems behave if necessary).
 
 { lib, fetchurl, writeScript, ruby, libxml2, libxslt, python, stdenv, which
-, libiconv, postgresql, v8, v8_3_16_14, clang, sqlite, zlib, imagemagick
+, libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
 , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql
 }:
 
 let
   v8 = v8_3_16_14;
-
 in
 
 {
@@ -46,13 +45,6 @@ in
     buildFlags = [
       "--with-system-v8=true"
     ];
-    patches = [
-      # see: https://github.com/cowboyd/libv8/pull/161
-      (fetchpatch {
-        url = https://github.com/cstrahan/libv8/commit/c79378bf346d4ed2429af36d745d17c478ffbe96.patch;
-        sha256 = "1l6572cmigc22g249jj8h0xlbig88mj43kdqdbimhw2pmpv3q0rs";
-      })
-    ];
   };
 
   mysql2 = attrs: {
diff --git a/pkgs/servers/consul/Gemfile.lock b/pkgs/servers/consul/Gemfile.lock
index f79b05b481d..cc4df6b2430 100644
--- a/pkgs/servers/consul/Gemfile.lock
+++ b/pkgs/servers/consul/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     execjs (2.3.0)
     json (1.8.2)
-    libv8 (3.16.14.7)
+    libv8 (3.16.14.11)
     ref (1.0.5)
     sass (3.4.11)
     therubyracer (0.12.1)
diff --git a/pkgs/servers/consul/gemset.nix b/pkgs/servers/consul/gemset.nix
index e813fc9b387..f87038775be 100644
--- a/pkgs/servers/consul/gemset.nix
+++ b/pkgs/servers/consul/gemset.nix
@@ -14,10 +14,10 @@
     };
   };
   libv8 = {
-    version = "3.16.14.7";
+    version = "3.16.14.11";
     source = {
       type = "gem";
-      sha256 = "0dv5q5n5nf6b8h3fybwmsr3vkj70w4g1jpf6661j3hsv9vp0g4qq";
+      sha256 = "000vbiy78wk5r1f6p7qncab8ldg7qw5pjz7bchn3lw700gpaacxp";
     };
   };
   ref = {

From c5f61e96b33b2a1440660a847b612bca24557e68 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 8 Jul 2015 15:10:27 -0700
Subject: [PATCH 1998/2322] v8: 3.16.14 -> 3.16.14.11

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

diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix
index b5e1b159321..ba3aae5cf70 100644
--- a/pkgs/development/libraries/v8/3.16.14.nix
+++ b/pkgs/development/libraries/v8/3.16.14.nix
@@ -8,12 +8,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "v8-${version}";
-  version = "3.16.14";
+  version = "3.16.14.11";
 
   src = fetchurl {
     url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
         + "${name}.tar.bz2";
-    sha256 = "073f33zcb7205jp9g5ha5d7j2hfa98zs0jql572nb552z0xw3rkz";
+    sha256 = "1gpf2xvhxfs5ll3m2jlslsx9jfjbmrbz55iq362plflrvf8mbxhj";
   };
 
   configurePhase = stdenv.lib.optionalString stdenv.isDarwin ''

From 813f12447119eb04826ebeece0be90201cb6c9f3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 8 Jul 2015 15:10:41 -0700
Subject: [PATCH 1999/2322] consul-ui: Remove uneeded nodejs

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

diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix
index eb7093ec615..2aaa7b4a131 100644
--- a/pkgs/servers/consul/ui.nix
+++ b/pkgs/servers/consul/ui.nix
@@ -1,4 +1,4 @@
-{ stdenv, goPackages, ruby , nodejs, bundlerEnv }:
+{ stdenv, goPackages, ruby, bundlerEnv }:
 
 let
   # `sass` et al
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   src = goPackages.consul.src;
 
-  buildInputs = [ ruby gems nodejs ];
+  buildInputs = [ ruby gems ];
 
   buildPhase = ''
     # Build ui static files

From 22bc910c1a307ddf488416be79bf013534df1ad0 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 8 Jul 2015 22:44:03 +0200
Subject: [PATCH 2000/2322] coq-fiat: do not run tests on i686

as they require too much memory
---
 pkgs/development/coq-modules/fiat/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/coq-modules/fiat/default.nix b/pkgs/development/coq-modules/fiat/default.nix
index df4ea133cd9..e084497cbf8 100644
--- a/pkgs/development/coq-modules/fiat/default.nix
+++ b/pkgs/development/coq-modules/fiat/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ coq ];
 
   enableParallelBuilding = false;
-  doCheck = true;
+  doCheck = !stdenv.isi686;
 
   unpackPhase = ''
     mkdir fiat

From 76674a3c07a52d99d12095af1386a6e4fd1c7946 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 8 Jul 2015 16:17:25 -0700
Subject: [PATCH 2001/2322] gcc: 4.8.4 -> 4.8.5

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

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 2035e0aaff0..ff1d388b6e2 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -56,7 +56,7 @@ assert langGo -> langCC;
 with stdenv.lib;
 with builtins;
 
-let version = "4.8.4";
+let version = "4.8.5";
 
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
@@ -213,7 +213,7 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
-    sha256 = "15c6gwm6dzsaagamxkak5smdkf1rdfbqqjs9jdbrp3lbg4ism02a";
+    sha256 = "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2";
   };
 
   inherit patches;

From 5ce2cf8a0f7fc213a42a043bbaa740e9b423f91d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 8 Jul 2015 16:18:08 -0700
Subject: [PATCH 2002/2322] v8_3_16_14: Must be build with gcc <= 4.8

---
 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 71bf1126cac..44ce810cd07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8184,6 +8184,7 @@ let
 
   v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix {
     inherit (pythonPackages) gyp;
+    stdenv = overrideCC stdenv gcc48;
   };
 
   v8_3_24_10 = callPackage ../development/libraries/v8/3.24.10.nix {

From 906be98e0d6ff4a47800b6ecf76db96f4223a6dc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 8 Jul 2015 16:21:03 -0700
Subject: [PATCH 2003/2322] isl: Add 0.15.0

And remove the defunct and unused default.nix
---
 .../development/libraries/isl/{default.nix => 0.15.0.nix} | 8 +++-----
 pkgs/top-level/all-packages.nix                           | 3 ++-
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename pkgs/development/libraries/isl/{default.nix => 0.15.0.nix} (71%)

diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/0.15.0.nix
similarity index 71%
rename from pkgs/development/libraries/isl/default.nix
rename to pkgs/development/libraries/isl/0.15.0.nix
index 9518a0c0e65..eca3372ad4d 100644
--- a/pkgs/development/libraries/isl/default.nix
+++ b/pkgs/development/libraries/isl/0.15.0.nix
@@ -1,19 +1,17 @@
 { stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "isl-0.14";
+  name = "isl-0.15";
 
   src = fetchurl {
-    url = "http://isl.gforge.inria.fr/${name}.tar.bz2";
-    sha256 = "0dlg4b85nw4w534525h0fvb7yhb8i4am8kskhmm0ym7qabzh4g3y";
+    url = "http://isl.gforge.inria.fr/${name}.tar.xz";
+    sha256 = "1m922l5bz69lvkcxrib7lvjqwfqsr8rpbzgmb2aq07bp76460jhh";
   };
 
   buildInputs = [ gmp ];
 
   enableParallelBuilding = true;
 
-  doCheck = true;
-
   meta = {
     homepage = http://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44ce810cd07..770c544da5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1899,10 +1899,11 @@ let
 
   ised = callPackage ../tools/misc/ised {};
 
-  isl = isl_0_14;
+  isl = isl_0_15;
   isl_0_11 = callPackage ../development/libraries/isl/0.11.1.nix { };
   isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { };
   isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { };
+  isl_0_15 = callPackage ../development/libraries/isl/0.15.0.nix { };
 
   isync = callPackage ../tools/networking/isync { };
 

From 26e44a0a5ca4e79d5f219b3e185bd53fd6a0d476 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 8 Jul 2015 16:23:42 -0700
Subject: [PATCH 2004/2322] tests/boot: Remove unused store contents

---
 nixos/tests/boot.nix | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix
index 2fdbb0c00b8..6a1d330155e 100644
--- a/nixos/tests/boot.nix
+++ b/nixos/tests/boot.nix
@@ -12,22 +12,7 @@ let
       modules =
         [ ../modules/installer/cd-dvd/installation-cd-minimal.nix
           ../modules/testing/test-instrumentation.nix
-          { key = "serial";
-            boot.loader.grub.timeout = mkOverride 0 0;
-
-            # The test cannot access the network, so any sources we
-            # need must be included in the ISO.
-            isoImage.storeContents =
-              [ pkgs.glibcLocales
-                pkgs.sudo
-                pkgs.docbook5
-                pkgs.docbook5_xsl
-                pkgs.grub
-                pkgs.perlPackages.XMLLibXML
-                pkgs.unionfs-fuse
-                pkgs.gummiboot
-              ];
-          }
+          { key = "serial"; }
         ];
     }).config.system.build.isoImage;
 

From 1fdd432ffabfc81ec7395ebeb0c3d18e96221804 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Wed, 8 Jul 2015 17:03:49 -0700
Subject: [PATCH 2005/2322] ffmpeg: 2.6.3 -> 2.7.1

---
 pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++--
 pkgs/development/libraries/ffmpeg/2.7.nix          | 7 +++++++
 pkgs/top-level/all-packages.nix                    | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/ffmpeg/2.7.nix

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 7d108ba81ef..555576d3a36 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -231,11 +231,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-${version}";
-  version = "2.6.3";
+  version = "2.7.1";
 
   src = fetchurl {
     url = "https://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "1yqc3vm1xrwf866q262qd4nr9d6ifp4gg183pjdc4sl9np0rissr";
+    sha256 = "087pyx1wxvniq3wgj6z80wrb7ampwwsmwndmr7lymzhm4iyvj1vy";
   };
 
   patchPhase = ''patchShebangs .'';
diff --git a/pkgs/development/libraries/ffmpeg/2.7.nix b/pkgs/development/libraries/ffmpeg/2.7.nix
new file mode 100644
index 00000000000..3e4708fdf46
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/2.7.nix
@@ -0,0 +1,7 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}.1";
+  branch = "2.7";
+  sha256 = "087pyx1wxvniq3wgj6z80wrb7ampwwsmwndmr7lymzhm4iyvj1vy";
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4dbd291e304..4efafc67348 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6111,10 +6111,11 @@ let
   ffmpeg_1_2 = import ../development/libraries/ffmpeg/1.2.nix { inherit callPackage; };
   ffmpeg_2_2 = import ../development/libraries/ffmpeg/2.2.nix { inherit callPackage; };
   ffmpeg_2_6 = import ../development/libraries/ffmpeg/2.6.nix { inherit callPackage; };
+  ffmpeg_2_7 = import ../development/libraries/ffmpeg/2.7.nix { inherit callPackage; };
   # Aliases
   ffmpeg_0 = ffmpeg_0_10;
   ffmpeg_1 = ffmpeg_1_2;
-  ffmpeg_2 = ffmpeg_2_6;
+  ffmpeg_2 = ffmpeg_2_7;
   ffmpeg = ffmpeg_2;
 
   ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {

From 98e7674e88162fc0b6517faa962233c8b3ae75e4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 9 Jul 2015 02:39:50 +0200
Subject: [PATCH 2006/2322] nxproxy, libxcomp: nxlibs 3.5.0.{31 -> 32}

Removes the need for patching (for now).
---
 .../libraries/libxcomp/default.nix            |  5 +-
 ...otiation-in-stage-10-error.full+lite.patch | 67 -------------------
 pkgs/tools/admin/nxproxy/default.nix          |  9 +--
 3 files changed, 6 insertions(+), 75 deletions(-)
 delete mode 100644 pkgs/tools/admin/nxproxy/0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch

diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix
index ed9e4b26944..1f1f95b3bb6 100644
--- a/pkgs/development/libraries/libxcomp/default.nix
+++ b/pkgs/development/libraries/libxcomp/default.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchurl, autoreconfHook, libjpeg, libpng12, libX11, zlib }:
 
-let version = "3.5.0.31"; in
+let version = "3.5.0.32"; in
 stdenv.mkDerivation {
   name = "libxcomp-${version}";
 
   src = fetchurl {
-    sha256 = "1hi3xrjzr37zs72djw3k7gj6mn2bsihfw1iysl8l0i85jl6sdfkd";
+    sha256 = "02n5bdc1jsq999agb4w6dmdj5l2wlln2lka84qz6rpswwc59zaxm";
     url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
   };
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "NX compression library";
     homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
     license = licenses.gpl2;
diff --git a/pkgs/tools/admin/nxproxy/0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch b/pkgs/tools/admin/nxproxy/0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch
deleted file mode 100644
index 3d4c584fb07..00000000000
--- a/pkgs/tools/admin/nxproxy/0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit f982cbc85e9ffff24a6a348c3637b54a7e8cbc34
-Author: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
-Date:   Wed May 20 15:47:45 2015 +0200
-
-Fix negotiation in stage 10 error
-
-Problem fixed by adding a select() call to implement a timeout,
-and retrying writes if needed.
-
-v2: backport to nx-libs 3.5.0.x (Mihai Moldovan)
-
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -8073,16 +8073,52 @@ int ReadRemoteData(int fd, char *buffer,
- int WriteLocalData(int fd, const char *buffer, int size)
- {
-   int position = 0;
-+  int ret = 0;
-+  fd_set writeSet;
-+  struct timeval selectTs = {30, 0};
- 
-   while (position < size)
-   {
-+
-+    // A write to a non-blocking socket may fail with EAGAIN. The problem is
-+    // that cache data is done in several writes, and there's no easy way
-+    // to handle failure without rewriting a significant amount of code.
-+    //
-+    // Bailing out of the outer loop would result in restarting the sending
-+    // of the entire cache list, which would confuse the other side.
-+
-+    FD_ZERO(&writeSet);
-+    FD_SET(fd, &writeSet);
-+
-+    ret = select(fd+1, NULL, &writeSet, NULL, &selectTs);
-+
-+    #ifdef DEBUG
-+    *logofs << "Loop: WriteLocalData: select() returned with a code of " << ret << " and remaining timeout of "
-+            << selectTs.tv_sec << " sec, " << selectTs.tv_usec << "usec\n" << logofs_flush;
-+    #endif
-+
-+    if ( ret < 0 )
-+    {
-+      *logofs << "Loop: Error in select() when writing data to FD#" << fd << ": " << strerror(EGET()) << "\n" << logofs_flush;
-+
-+      if ( EGET() == EINTR )
-+        continue;
-+
-+      return -1;
-+    }
-+    else if ( ret == 0 )
-+    {
-+      *logofs << "Loop: Timeout expired in select() when writing data to FD#" << fd << ": " << strerror(EGET()) << "\n" << logofs_flush;
-+      return -1;
-+    }
-+
-     int result = write(fd, buffer + position, size - position);
- 
-     getNewTimestamp();
- 
-     if (result <= 0)
-     {
--      if (result < 0 && EGET() == EINTR)
-+      if (result < 0 && (EGET() == EINTR || EGET() == EAGAIN || EGET() == EWOULDBLOCK))
-       {
-         continue;
-       }
diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix
index 20b8f4059ad..ebcd2afd46f 100644
--- a/pkgs/tools/admin/nxproxy/default.nix
+++ b/pkgs/tools/admin/nxproxy/default.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchurl, autoreconfHook, libxcomp }:
 
-let version = "3.5.0.31"; in
+let version = "3.5.0.32"; in
 stdenv.mkDerivation {
   name = "nxproxy-${version}";
 
   src = fetchurl {
-    sha256 = "1hi3xrjzr37zs72djw3k7gj6mn2bsihfw1iysl8l0i85jl6sdfkd";
+    sha256 = "02n5bdc1jsq999agb4w6dmdj5l2wlln2lka84qz6rpswwc59zaxm";
     url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
   };
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "NX compression proxy";
     homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
     license = licenses.gpl2;
@@ -17,10 +18,6 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ nckx ];
   };
 
-  patches = [
-    ./0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch
-  ];
-
   buildInputs = [ libxcomp ];
   nativeBuildInputs = [ autoreconfHook ];
 

From 070133bfb808ef213b0a37779056c921c1e1158a Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Thu, 9 Jul 2015 13:58:57 +1200
Subject: [PATCH 2007/2322] vimPlugins: add random-vim

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 056f6d1e9d3..02cb1fd983e 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -866,6 +866,17 @@ rec {
 
   };
 
+  random-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "random-vim-2010-10-17";
+    src = fetchgit {
+      url = "git://github.com/vim-scripts/random.vim";
+      rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989";
+      sha256 = "571f4ed0a2d8c66d1c15029fb812a84b55228d07cd2e4bbbc73a33493013fed3";
+    };
+    dependencies = [];
+
+  };
+
   rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "rust-2015-01-29";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 91d7f32fce5..e2096d1a56a 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -56,6 +56,7 @@
 "github:vim-scripts/Colour-Sampler-Pack"
 "github:vim-scripts/a.vim"
 "github:vim-scripts/align"
+"github:vim-scripts/random.vim"
 "github:vim-scripts/tabmerge"
 "github:vim-scripts/wombat256.vim"
 "github:wakatime/vim-wakatime"

From c5c75be0640d6522e9cacd8e5fbe645f20528bd6 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Thu, 9 Jul 2015 14:09:13 +1200
Subject: [PATCH 2008/2322] vimPlugins: add changeColorScheme-vim

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 02cb1fd983e..bc568f73945 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -772,6 +772,17 @@ rec {
 
   };
 
+  changeColorScheme-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "changeColorScheme-vim-2010-10-17";
+    src = fetchgit {
+      url = "git://github.com/vim-scripts/changeColorScheme.vim";
+      rev = "b041d49f828629d72f2232531a230d1ec5de2405";
+      sha256 = "094ccc132dc3991a30feb31bbdd777755294957e843517491345a4999e86cb5f";
+    };
+    dependencies = [];
+
+  };
+
   tabmerge = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "tabmerge-2010-10-17";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index e2096d1a56a..f7b01d8af7f 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -56,6 +56,7 @@
 "github:vim-scripts/Colour-Sampler-Pack"
 "github:vim-scripts/a.vim"
 "github:vim-scripts/align"
+"github:vim-scripts/changeColorSchemes.vim"
 "github:vim-scripts/random.vim"
 "github:vim-scripts/tabmerge"
 "github:vim-scripts/wombat256.vim"

From 1b1374c7f0d39407229bfc68323e068cd02cce56 Mon Sep 17 00:00:00 2001
From: Susan Potter <me@susanpotter.net>
Date: Wed, 8 Jul 2015 21:33:01 -0500
Subject: [PATCH 2009/2322] jruby: update 1.7.20.1 -> 1.7.21

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

diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index bc76e334b55..bc76abb4546 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "jruby-${version}";
 
-  version = "1.7.20.1";
+  version = "1.7.21";
 
   src = fetchurl {
     url = "http://jruby.org.s3.amazonaws.com/downloads/${version}/jruby-bin-${version}.tar.gz";
-    sha1 = "6a6e701a3a5769ec5d53a78660521c37da36e41f";
+    sha1 = "4955b69a913b22f96bd599eff2a133d8d1ed42c6";
   };
 
   buildInputs = [ makeWrapper ];

From 35ca7fae8e2e8e540f37d62f27056e678ace8259 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 9 Jul 2015 01:32:45 -0500
Subject: [PATCH 2010/2322] nixpkgs: git - link git-http-backend into $PATH

This makes it easier for tools (like Phabricator) to find
git-http-backend to enable HTTP(S) transport support.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../version-management/git-and-tools/git/default.nix          | 4 ++++
 1 file changed, 4 insertions(+)

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 ee001917746..54e16eaff1e 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -85,6 +85,10 @@ stdenv.mkDerivation {
       # gitweb.cgi, need to patch so that it's found
       sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \
           $out/share/gitweb/gitweb.cgi
+
+      # Also put git-http-backend into $PATH, so that we can use smart
+      # HTTP(s) transports for pushing
+      ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend
     ''
 
    + (if svnSupport then

From d1221f46e9efb01e06dcaff182e4cad4ca121c0c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 9 Jul 2015 01:32:57 -0500
Subject: [PATCH 2011/2322] nixpkgs: git 2.4.4 -> 2.4.5

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../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 54e16eaff1e..68fd7405ee4 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "2.4.4";
+  version = "2.4.5";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "0q02ygsk1gvn07bb7gnwrp9kr2p405fjj8arpby7851889fv2wzq";
+    sha256 = "15045v9ds1jn7csw4dijlz0ybiw3csh34l444vzgh9g0f9gmy6n3";
   };
 
   patches = [

From 5c57369fc414c634e680ec00b720f67036c5dc4a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 9 Jul 2015 10:38:22 +0200
Subject: [PATCH 2012/2322] cloog: fix build by using isl_0_14 (ZHF)

---
 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 770c544da5f..2c9514a47e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1147,7 +1147,10 @@ let
     inherit (perlPackages) perl AlgorithmDiff RegexpCommon;
   };
 
-  cloog = callPackage ../development/libraries/cloog { };
+  cloog = callPackage ../development/libraries/cloog {
+    isl = isl_0_14;
+  };
+
   cloog_0_18_0 = callPackage ../development/libraries/cloog/0.18.0.nix {
     isl = isl_0_11;
   };

From 33da6ac7659a6b2fb628584d52cc0b8bb59f3986 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 9 Jul 2015 11:05:46 +0200
Subject: [PATCH 2013/2322] go 1.3: fix build on i686 (ZHF)

---
 pkgs/development/compilers/go/1.3.nix         |  2 +-
 .../compilers/go/R_386_GOT32.patch            | 46 +++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/go/R_386_GOT32.patch

diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix
index 52a388aff1f..65b80a7f3af 100644
--- a/pkgs/development/compilers/go/1.3.nix
+++ b/pkgs/development/compilers/go/1.3.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
     sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
   '';
 
-  patches = [ ./cacert-1.2.patch ];
+  patches = [ ./cacert-1.2.patch ./R_386_GOT32.patch ];
 
   GOOS = if stdenv.isDarwin then "darwin" else "linux";
   GOARCH = if stdenv.isDarwin then "amd64"
diff --git a/pkgs/development/compilers/go/R_386_GOT32.patch b/pkgs/development/compilers/go/R_386_GOT32.patch
new file mode 100644
index 00000000000..c029d50168a
--- /dev/null
+++ b/pkgs/development/compilers/go/R_386_GOT32.patch
@@ -0,0 +1,46 @@
+From 609d996fac7f68b34032572b7bde627f658b95f2 Mon Sep 17 00:00:00 2001
+From: Russ Cox <rsc@golang.org>
+Date: Mon, 6 Oct 2014 14:17:48 -0400
+Subject: [PATCH] cmd/8l: accept R_386_GOT32 in push instruction
+
+Fixes #8382.
+
+LGTM=iant
+R=iant
+CC=golang-codereviews
+https://golang.org/cl/149540045
+---
+ src/cmd/8l/asm.c | 18 +++++++++++++-----
+ 1 file changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/src/cmd/8l/asm.c b/src/cmd/8l/asm.c
+index c135dce..98c0424 100644
+--- a/src/cmd/8l/asm.c
++++ b/src/cmd/8l/asm.c
+@@ -117,13 +117,21 @@ adddynrel(LSym *s, Reloc *r)
+ 	case 256 + R_386_GOT32:
+ 		if(targ->type != SDYNIMPORT) {
+ 			// have symbol
+-			// turn MOVL of GOT entry into LEAL of symbol itself
+-			if(r->off < 2 || s->p[r->off-2] != 0x8b) {
+-				diag("unexpected GOT reloc for non-dynamic symbol %s", targ->name);
++			if(r->off >= 2 && s->p[r->off-2] == 0x8b) {
++				// turn MOVL of GOT entry into LEAL of symbol address, relative to GOT.
++				s->p[r->off-2] = 0x8d;
++				r->type = R_GOTOFF;
+ 				return;
+ 			}
+-			s->p[r->off-2] = 0x8d;
+-			r->type = R_GOTOFF;
++			if(r->off >= 2 && s->p[r->off-2] == 0xff && s->p[r->off-1] == 0xb3) {
++				// turn PUSHL of GOT entry into PUSHL of symbol itself.
++				// use unnecessary SS prefix to keep instruction same length.
++				s->p[r->off-2] = 0x36;
++				s->p[r->off-1] = 0x68;
++				r->type = R_ADDR;
++				return;
++			}
++			diag("unexpected GOT reloc for non-dynamic symbol %s", targ->name);
+ 			return;
+ 		}
+ 		addgotsym(ctxt, targ);

From 8f2f1dbb7673fcb94ecf86f396ad0467d142e249 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Thu, 9 Jul 2015 11:11:18 +0200
Subject: [PATCH 2014/2322] qboot: init at pre-release

---
 .../virtualization/qboot/default.nix          | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/virtualization/qboot/default.nix

diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix
new file mode 100644
index 00000000000..e4439ec124f
--- /dev/null
+++ b/pkgs/applications/virtualization/qboot/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation {
+  name = "qboot-pre-release";
+
+  src = fetchgit {
+    url = "https://github.com/yangchengwork/qboot";
+    rev = "b2bdaf4c878ef34f309c8c79613fabd1b9c4bf75";
+    sha256 = "00f24125733d24713880e430f409d6ded416286d209c9fabb45541311b01cf8d";
+  };
+
+  installPhase = ''
+    mkdir -p $out
+    cp bios.bin* $out/.
+    '';
+
+  meta = {
+    description = "A simple x86 firmware for booting Linux";
+    homepage = https://github.com/bonzini/qboot;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
+    platforms = ["x86_64-linux" "i686-linux"];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 139f655110c..0a5e4027520 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9055,6 +9055,8 @@ let
 
   oracleXE = callPackage ../servers/sql/oracle-xe { };
 
+  qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; };
+
   OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; };
   OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; };
   #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios=false; secureBoot=true; };

From 8e56309dd5c7dfc3bf7d82b8b128a2acc2b0532c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 9 Jul 2015 11:48:39 +0200
Subject: [PATCH 2015/2322] botanUnstable: fix installation (ZHF)

---
 pkgs/development/libraries/botan/generic.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index c4a13b55fd8..823e50e3227 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -26,6 +26,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  preInstall = ''
+    if [ -d src/scripts ]; then
+      patchShebangs src/scripts
+    fi
+  '';
+
   postInstall = ''
     cd "$out"/lib/pkgconfig
     ln -s botan-*.pc botan.pc || true

From 88e43eb39bcda5f8fdf41d566bc6799596177cd0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 8 Jul 2015 15:10:33 +0300
Subject: [PATCH 2016/2322] powertop: Patch out path to /sbin/modprobe (close
 #8702)

The modprobe call is made via system(), so an absolute path is not
needed if modprobe is in PATH. Which it is by default at least in
NixOS and Arch.

Fixes #5424.
---
 pkgs/os-specific/linux/powertop/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index befe16f72f2..9e32cd70cfb 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ];
 
+  patchPhase = ''
+    substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe"
+  '';
+
   meta = {
     description = "Analyze power consumption on Intel-based laptops";
     license = stdenv.lib.licenses.gpl2;

From bf86c228b902627046c7e78387b9a5f6e111e770 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 Jul 2015 12:27:04 +0200
Subject: [PATCH 2017/2322] symbola font: update to fix download (fixes #8717)

---
 pkgs/data/fonts/symbola/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix
index 390bf9f523a..5b2113dc57e 100644
--- a/pkgs/data/fonts/symbola/default.nix
+++ b/pkgs/data/fonts/symbola/default.nix
@@ -1,15 +1,15 @@
 {stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "symbola-7.21";
+  name = "symbola-8.00";
 
   src = fetchurl {
     url = "http://users.teilar.gr/~g1951d/Symbola.zip";
-    sha256 = "0sqmvq8c8wn4xq0p25gd2jfyjqi8jhiycqah19wzq1gqkaaw94nq";
+    sha256 = "07bczpl3vqdpg2gakfddhzzgpb6v2wpasv7rwqxkyg9yd9lmbr0s";
   };
   docs_pdf = fetchurl {
     url = "http://users.teilar.gr/~g1951d/Symbola.pdf";
-    sha256 = "0jjjydb6c0glfb6krvdyi9kh5bsx9gz5w66j378bdqgkrvspl0d2";
+    sha256 = "1zmq1ijl0k5hrc6vpa2xp9n1x2zrrd7ng3jwc9yf0qsi3pmkpk0p";
   };
 
   buildInputs = [ unzip ];

From b847dec4a08799dbac25cc6add5f70b1c519e7e0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 9 Jul 2015 12:27:29 +0200
Subject: [PATCH 2018/2322] eudev: disable install-exec-hook target (ZHF)

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

diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix
index 1932fc9d11f..1db5967aab5 100644
--- a/pkgs/os-specific/linux/eudev/default.nix
+++ b/pkgs/os-specific/linux/eudev/default.nix
@@ -26,6 +26,12 @@ stdenv.mkDerivation {
     "hwdb_bin=/var/lib/udev/hwdb.bin"
     "udevrulesdir=/etc/udev/rules.d"
     ];
+
+  preInstall = ''
+    # Disable install-exec-hook target as it conflicts with our move-sbin setup-hook
+    sed -i 's;$(MAKE) $(AM_MAKEFLAGS) install-exec-hook;$(MAKE) $(AM_MAKEFLAGS);g' src/udev/Makefile
+  '';
+
   installFlags =
     [
     "localstatedir=$(TMPDIR)/var"

From bc61f91cc0243b1812407f46e43059c1d5ff43a4 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 8 Jul 2015 20:51:38 +0200
Subject: [PATCH 2019/2322] banner: update from 1.3.2 to 1.3.3

---
 pkgs/games/banner/default.nix | 50 +++++++++--------------------------
 1 file changed, 12 insertions(+), 38 deletions(-)

diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix
index e0dac80a8fe..329a23ae81f 100644
--- a/pkgs/games/banner/default.nix
+++ b/pkgs/games/banner/default.nix
@@ -1,50 +1,24 @@
-{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper }:
+{ stdenv, fetchurl }:
 
-let
-  # Banner depends on two separate libraries. Adding those libraries to
-  # the top-level seems like overkill, though, because no other tools
-  # seems to use them. So we'll build them within this expression.
-  mkDerivation = name: hash: deriv: stdenv.mkDerivation (deriv // {
-    inherit name;
+stdenv.mkDerivation rec {
+  name = "banner-1.3.3";
 
-    src = fetchurl {
-      url = "http://shh.thathost.com/pub-unix/files/${name}.tar.gz";
-      sha256 = hash;
-    };
+  src = fetchurl {
+    url = "http://software.cedar-solutions.com/ftp/software/${name}.tar.gz";
+    sha256 = "1njbgba0gzvrmdkvfjgrnvj0i80yi8k7mpkgyxaj07bmv9kc3h5v";
+  };
 
-    configurePhase = "make dep CC=$CC";
-
-    buildPhase = "make OPTIM='-DNDEBUG -O3' CC=$CC";
-
-    installPhase = ''
-      make INSTBASEDIR=$out install
-      if [ -d $out/man ]; then
-        mkdir -p $out/share
-	mv -v $out/man $out/share/
-      fi
-    '';
-  });
-
-  shhopt = mkDerivation "shhopt-1.1.7" "bae94335124efa6fcc2f0a55cabd68c9c90be935bcdb8054d7e5188e0d5da679" {};
-
-  shhmsg = mkDerivation "shhmsg-1.4.1" "f65d45d3a5e415b541a1975e13fe7c5b58e21df6e9306cc3f7901279a9f6d461" {};
-
-in
-
-mkDerivation "banner-1.3.2" "0dc0ac0667b2e884a7f5ad3e467af68cd0fd5917f8c9aa19188e6452aa1fc6d5" {
-  buildInputs = [shhopt shhmsg];
-
-  meta = {
-    homepage = "http://shh.thathost.com/pub-unix/";
+  meta = with stdenv.lib; {
+    homepage = http://software.cedar-solutions.com/utilities.html;
     description = "Print large banners to ASCII terminals";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
 
     longDescription = ''
       An implementation of the traditional Unix-program used to display
       large characters.
     '';
 
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ simons pSub ];
   };
 }

From cdd999baee7be26635985eed6a62577bd5afd4af Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 9 Jul 2015 12:43:34 +0200
Subject: [PATCH 2020/2322] doc: document dontMoveSbin variable

---
 doc/stdenv.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 4e51db73010..1556ffd057f 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -816,6 +816,12 @@ following:
     stripped.  By default, they are.</para></listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><varname>dontMoveSbin</varname></term>
+    <listitem><para>If set, files in <filename>$out/sbin</filename> are not moved
+    to <filename>$out/bin</filename>. By default, they are.</para></listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><varname>stripAllList</varname></term>
     <listitem><para>List of directories to search for libraries and

From 9b8f66180f42a01e7bea493ed9222e3264649453 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 9 Jul 2015 12:09:44 +0200
Subject: [PATCH 2021/2322] python-hetzner: Update to bugfix version 0.7.3.

Fixes creating of admin accounts, which is used by NixOps to deploy new
servers. Props to @rbvermaa for reporting the issue and testing it with
NixOps.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c31f34ffae3..240e3de4c38 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6222,12 +6222,12 @@ let
 
   hetzner = buildPythonPackage rec {
     name = "hetzner-${version}";
-    version = "0.7.2";
+    version = "0.7.3";
 
     src = pkgs.fetchurl {
       url = "https://github.com/RedMoonStudios/hetzner/archive/"
           + "v${version}.tar.gz";
-      sha256 = "07jnrgy9fkh1hwgsa8491ljz9spazmifqsg92m3xnamja1536qfl";
+      sha256 = "1a0kcwqd1pj5giwh75m2m3jcnr1kd38v40hh64wgly2zp485nm5m";
     };
 
     # not there yet, but coming soon.

From 6d32ae415aca5bc13ed032094b28a41fba5b4961 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 9 Jul 2015 12:57:41 +0200
Subject: [PATCH 2022/2322] heme: fix build by using -lncurses (ZHF)

---
 pkgs/applications/editors/heme/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix
index 092b7ef6865..d377e5cb36f 100644
--- a/pkgs/applications/editors/heme/default.nix
+++ b/pkgs/applications/editors/heme/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile \
       --replace "/usr/local" "$out" \
       --replace "CFLAGS = " "CFLAGS = -I${ncurses}/include " \
-      --replace "LDFLAGS = " "LDFLAGS = -L${ncurses}/lib "
+      --replace "LDFLAGS = " "LDFLAGS = -L${ncurses}/lib " \
+      --replace "-lcurses" "-lncurses"
   '';
   preBuild = ''
     mkdir -p $out/bin

From 0109c5a6fb6a5862f55816d95889056fc2c9a7b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 9 Jul 2015 13:05:04 +0200
Subject: [PATCH 2023/2322] pythonPackages.infoqscraper: init at 0.1.0

---
 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 240e3de4c38..e9163c88252 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6445,6 +6445,30 @@ let
     };
   };
 
+  infoqscraper = buildPythonPackage rec {
+    name = pname + "-" + version;
+    version = "0.1.0";
+    pname = "infoqscraper";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "cykl";
+      repo = pname;
+      rev = "v" + version;
+      sha256 = "07mxp4mla7fwfc032f3mxrhjarnhkjqdxxibf9ba87c93z3dq8jj";
+    };
+
+    buildInputs = with self; [ html5lib ];
+    propagatedBuildInputs = (with self; [ six beautifulsoup4 ])
+                         ++ (with pkgs; [ ffmpeg swftools rtmpdump ]);
+
+    meta = {
+      description = "Discover presentations and/or create a movie consisting of slides and audio track from an infoq url";
+      homepage = "https://github.com/cykl/infoqscraper/wiki";
+      license = licenses.mit;
+      maintainers = with maintainers; [ edwtjo ];
+    };
+  };
+
   iptools = buildPythonPackage rec {
     version = "0.6.1";
     name = "iptools-${version}";

From ad41a600e58a24abf6721d81e9630d4ce3ebd153 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 9 Jul 2015 13:18:21 +0200
Subject: [PATCH 2024/2322] oprofile: update from 0.9.9 to 1.0.0 (ZHF)

fixes the build with recent versions of binutils
---
 .../tools/profiling/oprofile/default.nix      | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix
index 6c7b2a4d9ae..561fea6ef7b 100644
--- a/pkgs/development/tools/profiling/oprofile/default.nix
+++ b/pkgs/development/tools/profiling/oprofile/default.nix
@@ -1,26 +1,18 @@
-{ stdenv, fetchurl, binutils, popt, makeWrapper, gawk, which, gnugrep, zlib
-, pkgconfig
+{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig
 , withGUI ? false , qt4 ? null}:
 
 # libX11 is needed because the Qt build stuff automatically adds `-lX11'.
 assert withGUI -> qt4 != null;
 
 stdenv.mkDerivation rec {
-  name = "oprofile-0.9.9";
+  name = "oprofile-1.0.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/oprofile/${name}.tar.gz";
-    sha256 = "15vm24jhw4xfd55pfw1rlpzfsh4bl1vyjsajs78bi9xbv8038lhy";
+    sha256 = "0nn4wfvwy4nii25y6lwlrnzx9ah4nz0r93yk7hswiy6wxjs10wc4";
   };
 
-  patchPhase = ''
-    sed -i "utils/opcontrol" \
-        -e "s|OPCONTROL=.*$|OPCONTROL=\"$out/bin/opcontrol\"|g ;
-            s|OPDIR=.*$|OPDIR=\"$out/bin\"|g ;
-            s|^PATH=.*$||g"
-  '';
-
-  buildInputs = [ binutils zlib popt makeWrapper gawk which gnugrep pkgconfig ]
+  buildInputs = [ binutils zlib popt pkgconfig ]
     ++ stdenv.lib.optionals withGUI [ qt4 ];
 
   configureFlags = [
@@ -28,11 +20,6 @@ stdenv.mkDerivation rec {
     ]
     ++ stdenv.lib.optional withGUI "--with-qt-dir=${qt4} --enable-gui=qt4";
 
-  postInstall = ''
-    wrapProgram "$out/bin/opcontrol"					\
-       --prefix PATH : "$out/bin:${gawk}/bin:${which}/bin:${gnugrep}/bin"
-  '';
-
   meta = {
     description = "System-wide profiler for Linux";
     longDescription = ''

From 03bd9a363a5019516187715e36567358e98c3f1f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 9 Jul 2015 13:52:26 +0200
Subject: [PATCH 2025/2322] pure: fixed build with gcc 4.9 (ZHF)

Reported upstream https://bitbucket.org/purelang/pure-lang/issues/37
---
 pkgs/development/interpreters/pure/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix
index 2860aceb383..c471a3cdc0f 100644
--- a/pkgs/development/interpreters/pure/default.nix
+++ b/pkgs/development/interpreters/pure/default.nix
@@ -16,6 +16,12 @@ stdenv.mkDerivation rec {
   buildInputs = [ bison flex makeWrapper ];
   propagatedBuildInputs = [ llvm gmp mpfr readline ];
 
+  postPatch = ''
+    for f in expr.cc matcher.cc printer.cc symtable.cc parserdefs.hh; do
+      sed -i '1i\#include <stddef.h>' $f
+    done
+  '';
+
   configureFlags = [ "--enable-release" ];
   doCheck = true;
   checkPhase = ''

From 6782a38364c9699fff39b885708af278d09b3b8b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 9 Jul 2015 14:09:10 +0200
Subject: [PATCH 2026/2322] sdcc: update from 3.4.0 to 3.5.0, fixes build (ZHF)

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

diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix
index 0650fae917a..a246a413f50 100644
--- a/pkgs/development/compilers/sdcc/default.nix
+++ b/pkgs/development/compilers/sdcc/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, bison, flex, boost, gputils ? null }:
 
 stdenv.mkDerivation rec {
-  version = "3.4.0";
+  version = "3.5.0";
   name = "sdcc-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";
-    sha256 = "1yavxffqdfhdyabdza936xxh9wq4cfwa385g26gjapsdp5ighsng";
+    sha256 = "1aazz0yynr694q0rich7r03qls0zvsjc00il14pb4i22c78phagq";
   };
 
   # TODO: remove this comment when gputils != null is tested

From 1278a8ff9b030fac17b505841125e2d7118ff682 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Thu, 9 Jul 2015 14:36:48 +0200
Subject: [PATCH 2027/2322] gdal: update from 1.11.2 to 2.0.0

---
 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 fe7d0869fbd..22a721191dd 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -3,12 +3,12 @@
 , libpng }:
 
 composableDerivation.composableDerivation {} (fixed: rec {
-  version = "1.11.2";
+  version = "2.0.0";
   name = "gdal-${version}";
 
   src = fetchurl {
     url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
-    sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845";
+    sha256 = "53761563ff53c5bf27bff7c4d6cab8bb1634baccefda05348e0f3b7acaf4c9e6";
   };
 
   buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ];

From bb2b683e631dff0d10a235e9c6f3aa688ac79884 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Thu, 9 Jul 2015 14:52:17 +0200
Subject: [PATCH 2028/2322] R: regenerate CRAN and BIOC packages

---
 pkgs/development/r-modules/bioc-packages.nix |  319 +++---
 pkgs/development/r-modules/cran-packages.nix | 1065 +++++++++---------
 pkgs/development/r-modules/default.nix       |    3 -
 3 files changed, 708 insertions(+), 679 deletions(-)

diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix
index 015d6d5537c..60fad74cbfe 100644
--- a/pkgs/development/r-modules/bioc-packages.nix
+++ b/pkgs/development/r-modules/bioc-packages.nix
@@ -21,12 +21,12 @@ AffyExpress = derive { name="AffyExpress"; version="1.35.0"; sha256="1ysn3c8mpnq
 AffyRNADegradation = derive { name="AffyRNADegradation"; version="1.15.0"; sha256="0x7mwlzvcxplvijprch0anwbfmj1qkrxqd9rc6f4p0zf88z2csal"; depends=[affy]; };
 AffyTiling = derive { name="AffyTiling"; version="1.27.0"; sha256="1jqil9hd10cwsqdlxjd7c8s0p9fvrfcqxiw8rfrq117c8dlgl7w6"; depends=[affxparser affy preprocessCore]; };
 AgiMicroRna = derive { name="AgiMicroRna"; version="2.19.0"; sha256="1m1fi6pdqwnfn21a4i7psxdg12bn6bhvcsi43bhwlzxzkrz00257"; depends=[affy affycoretools Biobase limma preprocessCore]; };
-AllelicImbalance = derive { name="AllelicImbalance"; version="1.7.13"; sha256="195pad565yczbxili0zg6329dxnwaj70vhxz3lizm3pbidlv56jn"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges lattice Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; };
-AnalysisPageServer = derive { name="AnalysisPageServer"; version="1.1.1"; sha256="0qbnwxwc205623fmzvhwrhr2jii2bgrd0mcdwi4811pab0dmzf49"; depends=[Biobase graph log4r rjson]; };
-AnnotationDbi = derive { name="AnnotationDbi"; version="1.31.16"; sha256="0dxgcdvbq8vi97i6r64x5s4gngynk2hqdjmhfnbk648sq8h2rbrf"; depends=[Biobase BiocGenerics DBI IRanges RSQLite S4Vectors]; };
-AnnotationForge = derive { name="AnnotationForge"; version="1.11.3"; sha256="1a3fhinjmrxl400p6w452ar31h40lwd8vlf8snsqqk21vs5mmnla"; depends=[AnnotationDbi Biobase BiocGenerics DBI RSQLite S4Vectors]; };
+AllelicImbalance = derive { name="AllelicImbalance"; version="1.7.17"; sha256="0fgqsdlnch5rh04pnzjypgba2n67j3m2aab2yddl0kf0wsmb8zwg"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges lattice Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; };
+AnalysisPageServer = derive { name="AnalysisPageServer"; version="1.1.2"; sha256="057xik4hxaqz1f9m8clq504xa4km2byag546iw20v6i0qa9s1dwi"; depends=[Biobase graph log4r rjson]; };
+AnnotationDbi = derive { name="AnnotationDbi"; version="1.31.17"; sha256="04xkhqnr9hmgxihfhn35a6s68s8x5layl7mf5whwhwxmlcd76lx4"; depends=[Biobase BiocGenerics DBI IRanges RSQLite S4Vectors]; };
+AnnotationForge = derive { name="AnnotationForge"; version="1.11.7"; sha256="00agvwzmnvs8vx2y62x5qd9y09045j74kk9kp69v8m1iqpigs1v0"; depends=[AnnotationDbi Biobase BiocGenerics DBI RSQLite S4Vectors]; };
 AnnotationFuncs = derive { name="AnnotationFuncs"; version="1.19.0"; sha256="1qjvkbqpyhwibdqv1c4n2z5wjnzx0h3kdas3fs33jhb597bxhl1y"; depends=[AnnotationDbi]; };
-AnnotationHub = derive { name="AnnotationHub"; version="2.1.26"; sha256="0py74da9j3j0h0pvf1kvfzf3cixn52x9l5ac7igans4cm5pizr0k"; depends=[AnnotationDbi BiocGenerics BiocInstaller httr interactiveDisplayBase RSQLite S4Vectors]; };
+AnnotationHub = derive { name="AnnotationHub"; version="2.1.28"; sha256="055biw0izf0la405igpp22azgharwhr6xfks32lr4dgbh8n70qjd"; depends=[AnnotationDbi BiocGenerics BiocInstaller httr interactiveDisplayBase RSQLite S4Vectors]; };
 ArrayExpress = derive { name="ArrayExpress"; version="1.29.1"; sha256="0gyckxsmmh81ykf7mj952h2a4z58xrf9lbnmv884hz7zj317lf83"; depends=[affy Biobase limma XML]; };
 ArrayExpressHTS = derive { name="ArrayExpressHTS"; version="1.19.0"; sha256="0qyd9jhkvw4lxqjvix28yzdx08hi7vf77ynlqxcl2q1lb3gmbxar"; depends=[Biobase BiocGenerics biomaRt Biostrings bitops DESeq edgeR GenomicRanges Hmisc IRanges R2HTML RColorBrewer rJava Rsamtools sampling sendmailR ShortRead snow svMisc XML]; };
 ArrayTV = derive { name="ArrayTV"; version="1.7.0"; sha256="11dlq4lmzw0x8z2qrxff6xlcilp95nd71jpdvg3i5yni3ws6z5m1"; depends=[DNAcopy foreach oligoClasses]; };
@@ -41,15 +41,15 @@ BEclear = derive { name="BEclear"; version="1.1.0"; sha256="1icaxkxwr2rkii4fffln
 BGmix = derive { name="BGmix"; version="1.29.0"; sha256="0s2s6ylbw2wvdkn28842ghsflhcmcn156zw3fxmbdnz7xs29qs1f"; depends=[KernSmooth]; };
 BHC = derive { name="BHC"; version="1.21.0"; sha256="0f8qqid4qxw52zjvvm024wcmn0afr7avkr4hr2jfyvs0ga49khx8"; depends=[]; };
 BRAIN = derive { name="BRAIN"; version="1.15.0"; sha256="09yd3xf3h85wdf56p38mnspyqbswl2v8zb81yg0a008p0l5ax8xr"; depends=[Biostrings lattice PolynomF]; };
-BSgenome = derive { name="BSgenome"; version="1.37.1"; sha256="0nmj1wdp1xlkf603sw1h0k3x0jywj3ykaws8sdb4hizb52pgzw8z"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; };
+BSgenome = derive { name="BSgenome"; version="1.37.3"; sha256="1a0qk3lh2qhynsink8ysc16d4pmam2midakh26adn1hqrf6n22gb"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; };
 BUS = derive { name="BUS"; version="1.25.0"; sha256="1n3s0pw4ijgh927mahwqybks8i6ysybp7xn4a86nrbpr2kqhznrd"; depends=[infotheo minet]; };
-BaseSpaceR = derive { name="BaseSpaceR"; version="1.13.1"; sha256="0w7hdzncjds0dji03ldgk4zyrpr3qal2lzdlhlbc8809fjlp3jb9"; depends=[RCurl RJSONIO]; };
+BaseSpaceR = derive { name="BaseSpaceR"; version="1.13.2"; sha256="17g87vfx6yy4cdqxchl9ig6s2vhnpfbarssw80ha6kbqw81jh55h"; depends=[RCurl RJSONIO]; };
 Basic4Cseq = derive { name="Basic4Cseq"; version="1.5.1"; sha256="0a4b11rv5ilv84qqpvf320c3knaajg4hlby5km0zzms3vbisr4hi"; depends=[Biostrings caTools GenomicAlignments GenomicRanges RCircos]; };
 BayesPeak = derive { name="BayesPeak"; version="1.21.0"; sha256="0mz00mk6gmc5g79iifn5hzfwf7s568n6s6wy46vrnnnnr3sk9w49"; depends=[IRanges]; };
-BeadDataPackR = derive { name="BeadDataPackR"; version="1.21.0"; sha256="1h9zq2zjwslgwzz5zghjkszhy9d6bcrpssk6x15a9i0wb6nkrdxm"; depends=[]; };
+BeadDataPackR = derive { name="BeadDataPackR"; version="1.21.1"; sha256="16dh7byvigd6161qznd1k9cz9hp0r50nbrd8nqlsh28zr60pvrj3"; depends=[]; };
 BiGGR = derive { name="BiGGR"; version="1.5.0"; sha256="1q9m870pyhxd1627n94c259094k8jyrg22ni26qpnxkapj18lr0b"; depends=[hyperdraw hypergraph LIM rsbml stringr]; };
-BiRewire = derive { name="BiRewire"; version="2.1.0"; sha256="1rf3j0rfbzyd17ashj99fjahilz4pgil7ch6iyfzipb6894faxwi"; depends=[igraph slam]; };
-BiSeq = derive { name="BiSeq"; version="1.9.1"; sha256="0s8mhynjprg4bpn9p88rzpm6na9581bzmyv4wljsdqlz0wcb87az"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; };
+BiRewire = derive { name="BiRewire"; version="2.1.2"; sha256="08innw83yr3imrgklva9djjx3a5sd7mqfnb70ggi6hia729kar01"; depends=[igraph slam]; };
+BiSeq = derive { name="BiSeq"; version="1.9.2"; sha256="1z401p2y9sa2cs1zwnkvf3968nyv5c7wcbxvldjyl5dg04qw88wn"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; };
 BicARE = derive { name="BicARE"; version="1.27.0"; sha256="19hslc78nijcs6gyxzzcd8856wa1gf5dsrvm4x6r9lprfrk7d7fb"; depends=[Biobase GSEABase multtest]; };
 BioMVCClass = derive { name="BioMVCClass"; version="1.37.0"; sha256="1k4ba98cjaqhy33vsmflnwasi0vxr30dvj6861pz625m87fyp2g6"; depends=[Biobase graph MVCClass Rgraphviz]; };
 BioNet = derive { name="BioNet"; version="1.29.0"; sha256="0q86sfv29y8haq8zhxc93p7zl1nh8aq0yj31hvw8xx6g75xlapaz"; depends=[AnnotationDbi Biobase graph igraph RBGL]; };
@@ -57,9 +57,9 @@ BioSeqClass = derive { name="BioSeqClass"; version="1.27.0"; sha256="1pv7zibcrgb
 Biobase = derive { name="Biobase"; version="2.29.1"; sha256="12cckssh7x4dd8vaapp5nfc5bfcqls8k3rblcfi17z5cpi0jply6"; depends=[BiocGenerics]; };
 BiocCaseStudies = derive { name="BiocCaseStudies"; version="1.31.0"; sha256="05nj9i9y8clf406bjcflj8lsrp9x9iw6my1bdqnxg3nv2krp37xn"; depends=[Biobase]; };
 BiocCheck = derive { name="BiocCheck"; version="1.5.6"; sha256="0gpmrqvj31n73bqljf23wbsw3hp44hl3z1jhc2q86s3mw6hlcfip"; depends=[BiocInstaller biocViews codetools devtools graph httr knitr optparse]; };
-BiocGenerics = derive { name="BiocGenerics"; version="0.15.2"; sha256="16r4jq5yq3xg8s212dngrf6a63ggb87654cf45f4386c56gcczgg"; depends=[]; };
-BiocInstaller = derive { name="BiocInstaller"; version="1.19.6"; sha256="09f3ybmaklac71ixd4imfig7861qc339kpqhjybq97a3yw8zcksa"; depends=[]; };
-BiocParallel = derive { name="BiocParallel"; version="1.3.26"; sha256="1dy3i5ypjxnz57yw2pyfm7778fdficbp6abbsrq79rgr1dvfbqyr"; depends=[futile_logger snow]; };
+BiocGenerics = derive { name="BiocGenerics"; version="0.15.3"; sha256="1wk7mr3jmjr2ljqqlmnpvb3x2cflkkhsyjl2cd4ns0gld4rmmm8x"; depends=[]; };
+BiocInstaller = derive { name="BiocInstaller"; version="1.19.8"; sha256="1jmzvs3sv324n9j6j8mrjpc648650k0sv23xni09x55zq41nm672"; depends=[]; };
+BiocParallel = derive { name="BiocParallel"; version="1.3.31"; sha256="0s47gbrj8cs8wpsac14nj2blqwwr2fkg8fsr61fz5v0j21wrk3kd"; depends=[futile_logger snow]; };
 BiocStyle = derive { name="BiocStyle"; version="1.7.4"; sha256="0wlydy1a3pspnyjg5vl0657z620n5vlhx99hxisskbrsr026mhmg"; depends=[]; };
 Biostrings = derive { name="Biostrings"; version="2.37.2"; sha256="0j6701qgrnphsy9p34sf3s6d91j1zbd824zwv9rsfdmdffbkqq3b"; depends=[BiocGenerics IRanges S4Vectors XVector zlibbioc]; };
 BitSeq = derive { name="BitSeq"; version="1.13.0"; sha256="1d397bcdyi3d35l1q1661spm3xhr7hqlsrjr5a2ybsjs3wqkf4fj"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; };
@@ -83,12 +83,13 @@ CGHnormaliter = derive { name="CGHnormaliter"; version="1.23.0"; sha256="1rd7lbz
 CGHregions = derive { name="CGHregions"; version="1.27.0"; sha256="0ah7cxaq1qvgwxvgp8jzkwyzdqa4yji7ylhdq2whysvc73aciikg"; depends=[Biobase CGHbase]; };
 CMA = derive { name="CMA"; version="1.27.0"; sha256="10bbmlyd8370dr1azrsljlslail5i9pwy8m524laqq85196lf6lv"; depends=[Biobase]; };
 CNAnorm = derive { name="CNAnorm"; version="1.15.0"; sha256="13wraamvj1vr5iiwknz5g1jq8zmq3gqzcsphn156rmxivpkxmk8l"; depends=[DNAcopy]; };
-CNEr = derive { name="CNEr"; version="1.5.3"; sha256="101cf9hpz3ak04xf9i9b6wbmmdjfgawfvxsb4zflv6avjdqnsqbm"; depends=[Biostrings DBI GenomeInfoDb GenomicAlignments GenomicRanges IRanges RSQLite rtracklayer S4Vectors XVector]; };
+CNEr = derive { name="CNEr"; version="1.5.4"; sha256="10qvxgrp6g8yq7gn089v4aq3xyhvi21mml30aszwv718lq5xhcrz"; depends=[Biostrings DBI GenomeInfoDb GenomicAlignments GenomicRanges IRanges RSQLite rtracklayer S4Vectors XVector]; };
 CNORdt = derive { name="CNORdt"; version="1.11.0"; sha256="1c01ra85j04wdwaqzvc3qvva9sf878qcy4xaz8kxd6b49ringcia"; depends=[abind CellNOptR]; };
 CNORfeeder = derive { name="CNORfeeder"; version="1.9.0"; sha256="1d2lskj5vlg0ry3gkm61i1cahf6m9vg2599qj6v8z7w9wmp37cb7"; depends=[CellNOptR graph]; };
 CNORfuzzy = derive { name="CNORfuzzy"; version="1.11.0"; sha256="0kzlad2mkfvqxv4lv8hcc10cspcg31yp49r6pdn2vakif5gbpnz3"; depends=[CellNOptR nloptr]; };
 CNORode = derive { name="CNORode"; version="1.11.0"; sha256="0cmv9s23pcd48fpzg92i5h2g10z49n091f2lnarldsay3sj8wlcy"; depends=[CellNOptR genalg]; };
 CNTools = derive { name="CNTools"; version="1.25.0"; sha256="05k939z92mmqajirl4w872qnh59093dpxk6da5bcmrr43h65dn95"; depends=[genefilter]; };
+CNVPanelizer = derive { name="CNVPanelizer"; version="0.99.6"; sha256="1p5kffb7j8k38gj0h6qs6fhn9yj0i0ap2lbf7zmgi3h5jkx1pwks"; depends=[BiocParallel cn_mops exomeCopy foreach GenomicRanges ggplot2 IRanges matrixStats plyr Rsamtools xlsx]; };
 CNVrd2 = derive { name="CNVrd2"; version="1.7.0"; sha256="18970q33dw51b7jas26dl2cr2ghwjxrllgmqykq0f50b55sv01p7"; depends=[DNAcopy ggplot2 gridExtra IRanges rjags Rsamtools VariantAnnotation]; };
 CNVtools = derive { name="CNVtools"; version="1.63.0"; sha256="005xw4rbp4zdg78jhrq5l4201kq5889py0jh49kfjpk000nvvmj9"; depends=[survival]; };
 CODEX = derive { name="CODEX"; version="1.1.0"; sha256="0k3ncnngblbx8hhv5p31dac4s9asjc8hddn4b0z20zkqncpgs16s"; depends=[GenomeInfoDb Rsamtools]; };
@@ -96,7 +97,7 @@ COHCAP = derive { name="COHCAP"; version="1.7.0"; sha256="0clr1jh4jnq54phsnl90zf
 COMPASS = derive { name="COMPASS"; version="1.7.2"; sha256="0c83fsrmi7d2888pa3lnln42mlbnjgvpxw337vdh3dar1185a5b0"; depends=[abind clue data_table knitr plyr RColorBrewer Rcpp scales]; };
 CORREP = derive { name="CORREP"; version="1.35.0"; sha256="0hlij2ch8r3lv130hvyshb82lfqz2c7kr56bka1ghmg6jp0xf1n6"; depends=[e1071]; };
 COSNet = derive { name="COSNet"; version="1.3.3"; sha256="0l9sn0cki0mxacxv0bwp3cczcl8rscx8g3lnr0r448f13j8198f4"; depends=[]; };
-CRISPRseek = derive { name="CRISPRseek"; version="1.9.1"; sha256="1wrjvnr8i50b9r4h8m84whs5nhqxi1w91c622kid7adwmhzq3ri2"; depends=[BiocGenerics Biostrings BSgenome seqinr]; };
+CRISPRseek = derive { name="CRISPRseek"; version="1.9.2"; sha256="1h004gznxrm2k3l4xdr6iyn97rkkh8n85phskiink815ysm2l9z4"; depends=[BiocGenerics Biostrings BSgenome seqinr]; };
 CRImage = derive { name="CRImage"; version="1.17.0"; sha256="1sab95gngwi7c333n9hnbd9fdvdy9i69pjpx5ic5799s7qr03llw"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; };
 CSAR = derive { name="CSAR"; version="1.21.0"; sha256="1wn7zxmy5ssj2jkk2624j42yv67wdcigp5ksb6fc2kzpgnvqmxl1"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
 CSSP = derive { name="CSSP"; version="1.7.0"; sha256="1ydxj358sfaygzjvh0b042p7gymjyl7nr5cnxrh8c7x2mv2hdh4d"; depends=[]; };
@@ -107,29 +108,29 @@ CausalR = derive { name="CausalR"; version="0.99.12"; sha256="038raljgrdwsp8dzc5
 CellNOptR = derive { name="CellNOptR"; version="1.15.0"; sha256="14x68i7wss44hmfihyqkw340lc0dpsccqsn1l2a0zs0gfkwgw3a5"; depends=[ggplot2 graph hash RBGL RCurl Rgraphviz XML]; };
 CexoR = derive { name="CexoR"; version="1.7.2"; sha256="1rhz97c8avmx9g3zf4vdzqb56v98dlh9xw74nywqvznn7wbq8rvp"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; };
 ChAMP = derive { name="ChAMP"; version="1.7.0"; sha256="0ll50qyq9k8x4bv30dap6g6lpavh7diwxllm501jgg39kp956d08"; depends=[DNAcopy GenomicRanges impute IRanges limma marray minfi plyr preprocessCore RPMM sva wateRmelon]; };
-ChIPQC = derive { name="ChIPQC"; version="1.5.1"; sha256="0nvpq2m267nf3aiv7xvw1fkwnr53qqzhs2nmyhjiqdw9ckias134"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors]; };
+ChIPQC = derive { name="ChIPQC"; version="1.5.2"; sha256="0g630lpzwfbg5hgicg0s906a3a6gidswmidszx0hmn3479fah74m"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors]; };
 ChIPXpress = derive { name="ChIPXpress"; version="1.11.0"; sha256="11aifr69ss1hakrhba985bwz6k1sqkpzvv7gnzn8cgqnzxyr2i6b"; depends=[affy biganalytics bigmemory Biobase frma GEOquery]; };
 ChIPpeakAnno = derive { name="ChIPpeakAnno"; version="3.3.2"; sha256="0ww3ddnvdc561lhz27h8n3ywi1xpx1cbsqk2i8m5rkpykkkkr2dh"; depends=[AnnotationDbi BiocGenerics BiocInstaller biomaRt Biostrings BSgenome GenomicFeatures GenomicRanges graph IRanges limma multtest RBGL VennDiagram]; };
-ChIPseeker = derive { name="ChIPseeker"; version="1.5.4"; sha256="10h2gbc1irzlkv9b12k9z54csaav6qpvjvjbgqzh7dcm03l14fah"; depends=[AnnotationDbi BiocGenerics boot dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gtools IRanges magrittr plotrix plyr RColorBrewer rtracklayer S4Vectors]; };
-ChIPseqR = derive { name="ChIPseqR"; version="1.23.1"; sha256="0di3vh865m84cvl9mkwiqmz8jz5y54q4ayc0fbzjkwh790qxb48j"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; };
+ChIPseeker = derive { name="ChIPseeker"; version="1.5.6"; sha256="0ppv51hd44h15mkw15samdq1awsh1kdfy5p87pj60nmvbl0qj39h"; depends=[AnnotationDbi BiocGenerics boot dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gtools IRanges magrittr plotrix plyr RColorBrewer rtracklayer S4Vectors]; };
+ChIPseqR = derive { name="ChIPseqR"; version="1.23.2"; sha256="1k1vbck7kjyzzgm0hg8hxpq6zfg71rca76q3998fcnnlzsmgvcf4"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; };
 ChIPsim = derive { name="ChIPsim"; version="1.23.1"; sha256="13kniwvwa49n1kc9114ljn1fmzaiyb2nh33if596llql60p7nd23"; depends=[Biostrings IRanges ShortRead XVector]; };
 ChemmineOB = derive { name="ChemmineOB"; version="1.7.1"; sha256="04agfsdzccsvvvis6vy1gg83gfs4nrph950v6bbzgk15ki32rsjz"; depends=[BH BiocGenerics Rcpp zlibbioc]; };
 ChemmineR = derive { name="ChemmineR"; version="2.21.7"; sha256="01riyjdjxnw1fybps1g5sbbcv1yn3mn222wg3w825m7lcb1hg13z"; depends=[BH BiocGenerics DBI digest ggplot2 Rcpp RCurl rjson]; };
 ChromHeatMap = derive { name="ChromHeatMap"; version="1.23.0"; sha256="1z0w201lbhsapx4p0gn9x65zxjbzh8g51jjfcvy61xrqbbyshwv1"; depends=[annotate AnnotationDbi Biobase BiocGenerics IRanges rtracklayer]; };
-ClassifyR = derive { name="ClassifyR"; version="1.3.0"; sha256="0jn7pd3mh6m6cqg5dldn8vmi3ffjhv1hn3gvvy6bl1g80a0xf5mb"; depends=[Biobase BiocParallel locfit ROCR]; };
+ClassifyR = derive { name="ClassifyR"; version="1.3.4"; sha256="1bq4czpmz5s3xpgfhv355xjgwslswj5kpza5nz3ribdqs762943w"; depends=[Biobase BiocParallel locfit ROCR]; };
 Clomial = derive { name="Clomial"; version="1.5.0"; sha256="1kxc0bgfrfj0bbx696513mn8n6vficdsd3ag5pqs5xz2bb7vx4qn"; depends=[matrixStats permute]; };
 Clonality = derive { name="Clonality"; version="1.17.0"; sha256="1irb13wi5lq28nni0b89fy06vvjwpzigfdwfmzjscrmhzdysrfa6"; depends=[DNAcopy]; };
 CoCiteStats = derive { name="CoCiteStats"; version="1.41.0"; sha256="0shp06qy8cvwq0723xc7qxrxv9qhkids3gq3aqqhlvn1s66nw7nq"; depends=[AnnotationDbi]; };
-CoGAPS = derive { name="CoGAPS"; version="2.3.1"; sha256="037abxyw5xkj537di2q3q75isb2qr2h2czr5a6q30g8qzh1xj3ik"; depends=[BH gplots RColorBrewer Rcpp]; };
+CoGAPS = derive { name="CoGAPS"; version="2.3.2"; sha256="0jh5ij66x3isz67mj0jwypyshplk1l1p47n2hvwgq87xmjzv6c8p"; depends=[BH gplots RColorBrewer Rcpp]; };
 CoRegNet = derive { name="CoRegNet"; version="1.5.0"; sha256="14yq1f005fcfmfp88h2fy05gdgbskjws11qbdh0ndx3sf93nzxm2"; depends=[arules igraph shiny]; };
 CompGO = derive { name="CompGO"; version="1.5.0"; sha256="128ib7w0jxba0p32s796i864b73zjfxac56znd0v4wv4vxv3jiv6"; depends=[GenomicFeatures ggplot2 pathview pcaMethods RDAVIDWebService reshape2 Rgraphviz rtracklayer]; };
-ComplexHeatmap = derive { name="ComplexHeatmap"; version="1.1.9"; sha256="127w7bhjmzzav3y6vz3dhr5da37vzl86xriy32rhiyppbxx34s78"; depends=[circlize colorspace GetoptLong RColorBrewer]; };
+ComplexHeatmap = derive { name="ComplexHeatmap"; version="1.2.2"; sha256="0v1mj0n5gjdarwdrl9ir9gms0f3v0gplx4n34zvyszxivh4ph4jj"; depends=[circlize colorspace dendextend GetoptLong RColorBrewer]; };
 ConsensusClusterPlus = derive { name="ConsensusClusterPlus"; version="1.23.0"; sha256="13iikfh234d2z4k487lb3shmnrfijygrf6gz3x481gba2psnbjyw"; depends=[Biobase cluster]; };
 CopyNumber450k = derive { name="CopyNumber450k"; version="1.5.0"; sha256="0mjhmh4shgckv43zvg4yqr17jfi9p9xnc40fwy9fw9c4vjcfsvsj"; depends=[Biobase BiocGenerics DNAcopy minfi preprocessCore]; };
 CopywriteR = derive { name="CopywriteR"; version="2.1.2"; sha256="0lja77qdfbsl9cc1nv4jbrjwiq8bb93ja6na8hqksrrm9g1qs4q4"; depends=[BiocParallel chipseq data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; };
 CorMut = derive { name="CorMut"; version="1.11.0"; sha256="0s92bh3610frxbm0gqvlznay70dy7x61hvc0qgh6xmcyz0llx27g"; depends=[igraph seqinr]; };
 Cormotif = derive { name="Cormotif"; version="1.15.0"; sha256="1v36ylwkxr6yqasckmmj2dkr7s72f39srhwvm93rs1rl7kw4dc4p"; depends=[affy limma]; };
-CoverageView = derive { name="CoverageView"; version="1.5.0"; sha256="0ix1xy0in3nzd1lm9imy1wrm347dib5nfa6105zkc993bnh11wls"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; };
+CoverageView = derive { name="CoverageView"; version="1.5.1"; sha256="0qi8r6vw5c6kmlw12j81jmgn555wd51w80m80gm5n7hqnggpwkh4"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; };
 DART = derive { name="DART"; version="1.17.1"; sha256="1z7lf4d9yjcyikq9j3348z5sxjqaly46c0ls7f9cl8nnqdpw7w42"; depends=[igraph]; };
 DASiR = derive { name="DASiR"; version="1.9.0"; sha256="0b3b7kmhsd6bb1s57c89h495j1ax6779wfca112fq6ba3z4dih3n"; depends=[Biostrings GenomicRanges IRanges XML]; };
 DAVIDQuery = derive { name="DAVIDQuery"; version="1.29.0"; sha256="0gvm6qjx8y61nbnbz66md74pfc4awj4900pjr8q1m5sip5yzbxj2"; depends=[RCurl]; };
@@ -137,51 +138,51 @@ DBChIP = derive { name="DBChIP"; version="1.13.0"; sha256="0gk9kgmyp9540sq5gpbn7
 DECIPHER = derive { name="DECIPHER"; version="1.15.0"; sha256="1kbdsqvkznzsk4ljy91r5ipndwxb8hhkm46qqkakgr24mia3yvl1"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; };
 DEDS = derive { name="DEDS"; version="1.43.0"; sha256="1z049ppkrbyp0xjpiygz5i6rbxbv3vvnvspwz2vv77495v7ykj6z"; depends=[]; };
 DEGraph = derive { name="DEGraph"; version="1.21.0"; sha256="17f04qngcx8y4glr5wiryi8fifbla8fxh8nb6wagnrai5x6vhzis"; depends=[graph KEGGgraph lattice mvtnorm NCIgraph R_methodsS3 R_utils RBGL Rgraphviz rrcov]; };
-DEGreport = derive { name="DEGreport"; version="1.3.0"; sha256="0qz7zmg9r76pwmn4hfpwagaij080pwmj7373h9fiiqk51416pqkq"; depends=[coda edgeR ggplot2 Nozzle_R1 plyr quantreg rjags]; };
+DEGreport = derive { name="DEGreport"; version="1.4.0"; sha256="06l803iy18kkv05b4h46vmzws20c0735m6csfkn2vp3bik8xh4lp"; depends=[coda edgeR ggplot2 Nozzle_R1 plyr quantreg]; };
 DEGseq = derive { name="DEGseq"; version="1.23.0"; sha256="0993f140wwv9z9l53f9g74x7l28bflxq7wdcbilfz7ijhh7isr7p"; depends=[qvalue samr]; };
 DESeq = derive { name="DESeq"; version="1.21.0"; sha256="13f6phdf9g325dlpn38l7zrq3mzldhldil134acxi9p3l50bx23y"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; };
-DESeq2 = derive { name="DESeq2"; version="1.9.10"; sha256="1mvxhw7nzcv2p5kr90yyv29dl8vqcvz9y4z0vgpbl6s4qh741br4"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; };
-DEXSeq = derive { name="DEXSeq"; version="1.15.6"; sha256="19hjrdfl28jma8jb00b0dywqpj07bas623avqaw0c2xns2zrb224"; depends=[Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools statmod stringr]; };
+DESeq2 = derive { name="DESeq2"; version="1.9.21"; sha256="0ywhakri35cz37zlwv760zgmk1z9ldivl0i24mawavccc0hcvrhk"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; };
+DEXSeq = derive { name="DEXSeq"; version="1.15.9"; sha256="0ml4ibzhw38w0mfp0vdbbkisz40rw65yyd71q3ppj7jg4r4ch39a"; depends=[Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools statmod stringr]; };
 DFP = derive { name="DFP"; version="1.27.0"; sha256="0xcipbhfzvrpbm6dh2y3lbvfbwpn4wly32sssfm702zik5wm9dy1"; depends=[Biobase]; };
 DMRcaller = derive { name="DMRcaller"; version="1.1.1"; sha256="1g7q7cwivvb0m2y4fixvbxp51zfag1jv66bdlai3gawr94pcx56y"; depends=[GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; };
 DMRcate = derive { name="DMRcate"; version="1.5.0"; sha256="12q6if9lljia37zwhcc9fpcp9vhkp1qhzchpypwwyn2j4344bmp3"; depends=[limma minfi]; };
 DMRforPairs = derive { name="DMRforPairs"; version="1.5.0"; sha256="0d14qgx07xq7wa687a2znpfw0zcg8ccvxjawkjdbi6ayjwpb6zd7"; depends=[GenomicRanges Gviz R2HTML]; };
 DNAcopy = derive { name="DNAcopy"; version="1.43.0"; sha256="1v1i4bfkblimdmazv29csqr46jaiv8lncihgywvq5wfn8ccr7xl9"; depends=[]; };
 DOQTL = derive { name="DOQTL"; version="1.3.0"; sha256="0g3nyamqdhjg8105kcq6nsgjgqzcxkp04194j82v1xb31baj53bg"; depends=[annotate annotationTools Biobase BiocGenerics biomaRt corpcor GenomicRanges hwriter IRanges mclust QTLRel Rsamtools RUnit S4Vectors XML]; };
-DOSE = derive { name="DOSE"; version="2.7.7"; sha256="0bdn26akwvhw3aksxw68mjn1s462vv9y12v6wlykpp2sla1naywv"; depends=[AnnotationDbi ggplot2 GOSemSim igraph plyr qvalue reshape2 scales]; };
-DSS = derive { name="DSS"; version="2.7.1"; sha256="1vf9j3clb7ac1zm8wx8vi0kmsv6p6533qxv4932gjcs5nn482516"; depends=[Biobase bsseq]; };
+DOSE = derive { name="DOSE"; version="2.7.9"; sha256="0l0rkd7siz251pxgmfv4ijq1l68w3lkjlc83zmhf4ddjf3db07ig"; depends=[AnnotationDbi ggplot2 GOSemSim igraph plyr qvalue reshape2 scales]; };
+DSS = derive { name="DSS"; version="2.7.2"; sha256="01czzgkx6rqpps93vfn8dg2n2hm2nkd887mc955z67845jkrgi2j"; depends=[Biobase bsseq]; };
 DTA = derive { name="DTA"; version="2.15.0"; sha256="0amibwj5mnm2plkf3ys8sgy4lpwr60fnvika0psdrahgb4blmkzp"; depends=[LSD scatterplot3d]; };
 DeconRNASeq = derive { name="DeconRNASeq"; version="1.11.0"; sha256="0665chwpbs2pw753nb2x65cs9r9ghb5123bsrzrv6pz2p3ni8yz7"; depends=[ggplot2 limSolve pcaMethods]; };
 DiffBind = derive { name="DiffBind"; version="1.15.3"; sha256="1akx65vi8razwpfxnvilh4x1vb8qbsfr2q8lygsb3imfrrb83q44"; depends=[amap edgeR GenomicAlignments GenomicRanges gplots IRanges lattice limma locfit RColorBrewer Rsamtools SummarizedExperiment systemPipeR zlibbioc]; };
-DirichletMultinomial = derive { name="DirichletMultinomial"; version="1.11.1"; sha256="1ds5gghxs4nb171cvahnb70s86hpqib6alijjfgdzcax09miw72v"; depends=[IRanges S4Vectors]; };
+DirichletMultinomial = derive { name="DirichletMultinomial"; version="1.11.2"; sha256="01wmvs7alq7gy1nmb5gdbglfs51qdhwysbmmjvh7yyhb8dqbvrj4"; depends=[IRanges S4Vectors]; };
 DriverNet = derive { name="DriverNet"; version="1.9.0"; sha256="0visiafw9m7i0yy70fvnmdkhg9z946sg5hdl5vnvj8c6g3mfacxy"; depends=[]; };
 DrugVsDisease = derive { name="DrugVsDisease"; version="2.9.0"; sha256="1wmw1r0x7kkmp47743aq0pp71wamnf5gsk6bhz6rdvswzb12iyqk"; depends=[affy annotate ArrayExpress BiocGenerics biomaRt GEOquery limma qvalue RUnit xtable]; };
 DupChecker = derive { name="DupChecker"; version="1.7.0"; sha256="02wwwnx3w8rxiassd62xr295paw8py9pqsk1396qb5k773l6bfxv"; depends=[R_utils RCurl]; };
 DynDoc = derive { name="DynDoc"; version="1.47.0"; sha256="0gpmhqav4dx8p86pkh18fpmlki60zqaz00m2zhziiawigbrz41ph"; depends=[]; };
-EBImage = derive { name="EBImage"; version="4.11.2"; sha256="1mnpwf844lgz4agk9w67pyppz6kq6fqbmarpv6pkwc9p3jb05nsy"; depends=[abind BiocGenerics fftwtools jpeg locfit png tiff]; };
-EBSeq = derive { name="EBSeq"; version="1.9.1"; sha256="0c65iiw9qxk6pqmnnjxdncpfvddgbvdfghshb4qpida4zp1yc7sg"; depends=[blockmodeling gplots]; };
+EBImage = derive { name="EBImage"; version="4.11.5"; sha256="15npg7r76avlxq036yis85b91bgl10y4wjjcdnrcn39dbvb50zav"; depends=[abind BiocGenerics fftwtools jpeg locfit png tiff]; };
+EBSeq = derive { name="EBSeq"; version="1.9.2"; sha256="0n3y9ikamcfm786fvqp5b2b4g2fx8hvnicsx1sh4rvrpyab9f5jm"; depends=[blockmodeling gplots]; };
 EBSeqHMM = derive { name="EBSeqHMM"; version="1.3.1"; sha256="0lyf363f1wfgacrj5cyq8n3f3ssl5q400mn2q94cpai6k0qmvgs1"; depends=[EBSeq]; };
 EBarrays = derive { name="EBarrays"; version="2.33.0"; sha256="1zvfqf49chiks5vmj5ki89pvy14bm1cman47n3ybba1gg8z8mw94"; depends=[Biobase cluster lattice]; };
 EBcoexpress = derive { name="EBcoexpress"; version="1.13.0"; sha256="0fl0a7xasqcwvjlgf3h51akyhwpras2865m2idz1nmacm42q1w79"; depends=[EBarrays mclust minqa]; };
-EDASeq = derive { name="EDASeq"; version="2.3.0"; sha256="1myqbcgyah325yh04cb70bgrqpwgikdkda77m4g5g5zn570s6bd3"; depends=[aroma_light Biobase BiocGenerics DESeq IRanges Rsamtools ShortRead]; };
+EDASeq = derive { name="EDASeq"; version="2.3.2"; sha256="0l1mmpy71pqqmqnx4xxn1v0kvsk0cfik98qszczh1ag8wyi1ky3m"; depends=[AnnotationDbi aroma_light Biobase BiocGenerics biomaRt Biostrings DESeq GenomicFeatures GenomicRanges IRanges Rsamtools ShortRead]; };
 EDDA = derive { name="EDDA"; version="1.7.0"; sha256="0dyyhnc9v232njqnrcaq78g2m1qws30qcf6bsswq2di235ymk2g0"; depends=[baySeq DESeq edgeR Rcpp ROCR snow]; };
 ELBOW = derive { name="ELBOW"; version="1.5.0"; sha256="0lnc5hw2x4p9yd561w9dwplf7q2slcaghxsh5796bmyxjxhxanpy"; depends=[]; };
-ELMER = derive { name="ELMER"; version="0.99.8"; sha256="1xvl12f8wmwc8crdl810vkszgxik649w0km581jvpy1azr6z2vjk"; depends=[GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges minfi reshape S4Vectors]; };
+ELMER = derive { name="ELMER"; version="1.00.0"; sha256="1kb7rixq02cc0cwm52acji69p89jq07zsagg7a8qva6gshs94k86"; depends=[GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra IRanges minfi reshape S4Vectors]; };
 EMDomics = derive { name="EMDomics"; version="1.1.0"; sha256="1i2dy2vqig0lkd13xy4yfwq58zyjiqavpmcvg6pvkh2l48ap1jds"; depends=[BiocParallel emdist ggplot2 matrixStats]; };
 ENCODExplorer = derive { name="ENCODExplorer"; version="1.1.3"; sha256="054cm1ldas26gv4xn16w3i25kykwnikj4s83g7sxxdij93m5rmlb"; depends=[jsonlite RSQLite]; };
 ENVISIONQuery = derive { name="ENVISIONQuery"; version="1.17.0"; sha256="1dnlw62hwysij63yc856c2sncgfwdq0rpmcds6i6wigdcfd21w8q"; depends=[rJava XML]; };
-ENmix = derive { name="ENmix"; version="1.1.4"; sha256="1pcbklxcfnfqwlfwax9n8aql2gaak596gph4xqq5xf64mj5f4qqv"; depends=[Biobase doParallel foreach geneplotter MASS minfi preprocessCore sva wateRmelon]; };
+ENmix = derive { name="ENmix"; version="1.1.6"; sha256="069dniqyg0pljbwnl24bv5kfdh5v2j9vbvyxc127ag1isggh9m7b"; depends=[Biobase doParallel foreach geneplotter impute MASS minfi preprocessCore sva wateRmelon]; };
 EasyqpcR = derive { name="EasyqpcR"; version="1.11.1"; sha256="0s2jyg6b14wbyl0c1n89c7bi7p88g7s1rz8d830p9hh2x75ly6zj"; depends=[gWidgetsRGtk2 matrixStats plotrix plyr]; };
 EnrichmentBrowser = derive { name="EnrichmentBrowser"; version="1.3.0"; sha256="1a6w3drh5x20wvxpx1cb5q2h9k6jh65v9hh81924lcp4baplpx31"; depends=[Biobase graph KEGGgraph KEGGREST limma MASS mixtools neaGUI qvalue RColorBrewer Rgraphviz safe SPIA stringr]; };
 ExiMiR = derive { name="ExiMiR"; version="2.11.0"; sha256="1gmfrn3jq4pz5wmijywhxr0kx79534fhrfnqyhjmqq3s9sjn2cbh"; depends=[affy affyio Biobase limma preprocessCore]; };
 ExpressionView = derive { name="ExpressionView"; version="1.21.0"; sha256="026w9f119j26c1078nwg4rhfc54wlb3i56iy8bi0cjpvbm4p698f"; depends=[AnnotationDbi bitops caTools eisa isa2]; };
 FEM = derive { name="FEM"; version="2.3.0"; sha256="112mmah33ar36cpqjwanrfyhdwjfympnvmxwirxbbnk0nfp9cvpr"; depends=[AnnotationDbi corrplot igraph impute limma marray Matrix]; };
-FGNet = derive { name="FGNet"; version="3.3.2"; sha256="000s0f6wki96w5di3gxhn70iwyrnwj5359s3a5ns2a0z0qnr05ww"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; };
+FGNet = derive { name="FGNet"; version="3.3.3"; sha256="026spxqdwwz4654fv4k6lhafckfkiqcryr3az0kcfnn6fzaji2g9"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; };
 FISHalyseR = derive { name="FISHalyseR"; version="1.3.0"; sha256="0xnmww7ldyxghq7mfjc3zhx1qahskmny3088ar0mj9v4iz4a987q"; depends=[abind EBImage]; };
 FRGEpistasis = derive { name="FRGEpistasis"; version="1.5.0"; sha256="1vvcphgirvghzjvic5yq6nl229ryc0y4kp5qd25kgspbcgblg01q"; depends=[fda MASS]; };
 FlowRepositoryR = derive { name="FlowRepositoryR"; version="1.1.1"; sha256="1xxljbdbvxg1dbm82r86frw2bskmfrl6rv98xz0z4jfc0w4ag3pd"; depends=[RCurl XML]; };
 FlowSOM = derive { name="FlowSOM"; version="1.1.0"; sha256="0k5pw46dbhm6nssr5szj251v3479xgky2iipihrdvp5lr5lhxilq"; depends=[BiocGenerics ConsensusClusterPlus flowCore igraph tsne]; };
-FourCSeq = derive { name="FourCSeq"; version="1.3.3"; sha256="1zny041wfg4c9cfdx0kr3a5nsl48zn6fccb8dixp4q61nm621zra"; depends=[Biobase Biostrings DESeq2 fda GenomicAlignments GenomicRanges ggbio ggplot2 gtools LSD Matrix reshape2 Rsamtools rtracklayer SummarizedExperiment]; };
+FourCSeq = derive { name="FourCSeq"; version="1.3.4"; sha256="1csxfr23b3g1k54h4ksnhg7c7d6aw28v32lrrqyq7x7xls9cx2lg"; depends=[Biobase Biostrings DESeq2 fda GenomicAlignments GenomicRanges ggbio ggplot2 gtools LSD Matrix reshape2 Rsamtools rtracklayer SummarizedExperiment]; };
 FunciSNP = derive { name="FunciSNP"; version="1.11.0"; sha256="19kl14yzqr59ngrd5ygr858zbvx23rihlr4vw5bfdy9cgwlvlzab"; depends=[AnnotationDbi ChIPpeakAnno GenomicRanges ggplot2 IRanges plyr reshape Rsamtools rtracklayer scales snpStats VariantAnnotation]; };
 GENE_E = derive { name="GENE.E"; version="1.9.0"; sha256="10c9mw9f619z2ai43qvagj7p1lsqpv90z8vzsyyxym614lvlqfzm"; depends=[RCurl rhdf5]; };
 GENESIS = derive { name="GENESIS"; version="1.1.0"; sha256="01d3yc5rc4y22znr7zf980m458qvnmjxpml353k7bkwyz6xyn0fj"; depends=[GWASTools]; };
@@ -189,25 +190,25 @@ GEOmetadb = derive { name="GEOmetadb"; version="1.29.0"; sha256="1s9x3dbh61xisk5
 GEOquery = derive { name="GEOquery"; version="2.35.4"; sha256="1ny592c1s36a1hkgaqqyss65c190bw5612l23qc9y9qhf4sarq38"; depends=[Biobase RCurl XML]; };
 GEOsubmission = derive { name="GEOsubmission"; version="1.21.0"; sha256="1rr8k4myw7jibibclphj63hp4byk3v0cg37vnyc5b0iacdp8s9gn"; depends=[affy Biobase]; };
 GEWIST = derive { name="GEWIST"; version="1.13.0"; sha256="1mlzyjggv0rh9xk9pifshhdri3vapvzk2h47g75wx57yfapamcwn"; depends=[car]; };
-GGBase = derive { name="GGBase"; version="3.31.1"; sha256="0nyq5rv5mfvvh2h9f1d7b5agwhjagpzjgfm8x0bwpdbz6k691glx"; depends=[AnnotationDbi Biobase BiocGenerics digest genefilter GenomicRanges IRanges limma Matrix S4Vectors snpStats SummarizedExperiment]; };
-GGtools = derive { name="GGtools"; version="5.5.1"; sha256="0r16yc6j68baf7pl3f708ys745px6qgpgbvcjiqqg7vgcj4qyq0h"; 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]; };
+GGBase = derive { name="GGBase"; version="3.31.2"; sha256="0xbkj7dr7xaq3pj4jph5ii78c4ax5b0p6jqmvkv2hr3j70qk3mh2"; depends=[AnnotationDbi Biobase BiocGenerics digest genefilter GenomicRanges IRanges limma Matrix S4Vectors snpStats SummarizedExperiment]; };
+GGtools = derive { name="GGtools"; version="5.5.2"; sha256="13zgfribckaxp2gl15fg1bds9rw9ysbf87mhzxm8qh1rqgkf8rbn"; 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 = derive { name="GLAD"; version="2.33.0"; sha256="19db59ry832vrbk86p1bppr52mwri2pz8iwx5ibg18pxr7pw6jw7"; depends=[]; };
 GOFunction = derive { name="GOFunction"; version="1.17.0"; sha256="0scjk4zlfrqv3z6ii0bvmhj3d880xyc2p5f4hqmfqn6cml0d6ncj"; depends=[AnnotationDbi Biobase graph Rgraphviz SparseM]; };
-GOSemSim = derive { name="GOSemSim"; version="1.27.3"; sha256="0d57my1zmlfsx1d1i55q82s4vzz6v7a7q8h8fkxxzs7wl8pjk5jh"; depends=[AnnotationDbi Rcpp]; };
+GOSemSim = derive { name="GOSemSim"; version="1.27.4"; sha256="0czg7qincsv001caqsswyz94hzj0ykjy1qhva9rg5zhpfjwdahwq"; depends=[AnnotationDbi Rcpp]; };
 GOSim = derive { name="GOSim"; version="1.7.0"; sha256="0dzx6nnd8p4p5v5rsmbpw6wl0i1jq3n4s0qc8z4xnp2n2757r2z4"; depends=[annotate AnnotationDbi cluster corpcor flexmix graph Matrix RBGL Rcpp topGO]; };
-GOTHiC = derive { name="GOTHiC"; version="1.5.2"; sha256="1jxg3hfyy96nwgmpk4ivl2wp3i050n7zahbawiz6d8f2hxcv44zg"; depends=[BiocGenerics Biostrings BSgenome data_table GenomicRanges ggplot2 IRanges rtracklayer S4Vectors ShortRead]; };
-GOexpress = derive { name="GOexpress"; version="1.3.1"; sha256="0wqip9ibzjy73b431wlifb6c01c397wkl7nldpj3mvd25s73p102"; depends=[Biobase biomaRt ggplot2 gplots randomForest RColorBrewer stringr VennDiagram]; };
+GOTHiC = derive { name="GOTHiC"; version="1.5.4"; sha256="15kn6v7q3n188zp2vmkqc3kzxf9645zycl47fr5qw9x6ymqhngbp"; depends=[BiocGenerics Biostrings BSgenome data_table GenomicRanges ggplot2 IRanges rtracklayer S4Vectors ShortRead]; };
+GOexpress = derive { name="GOexpress"; version="1.3.2"; sha256="151hqhyjaq3ggigibw8fc1zb09578p69ih09rj3irf0avpai6rbi"; depends=[Biobase biomaRt ggplot2 gplots randomForest RColorBrewer stringr VennDiagram]; };
 GOstats = derive { name="GOstats"; version="2.35.1"; sha256="1almz6gc2xm3njz8pjvynpnniz7xdd8z5293cfvx91v11lz70v7f"; depends=[annotate AnnotationDbi AnnotationForge Biobase Category graph RBGL]; };
 GOsummaries = derive { name="GOsummaries"; version="2.3.0"; sha256="09c4grz9ljwrz37yv9k6gna9zxk708vxfz2190xz7za0mrql1k3k"; depends=[ggplot2 gProfileR gtable limma plyr Rcpp reshape2]; };
 GRENITS = derive { name="GRENITS"; version="1.21.0"; sha256="1lm0074dw0248vyj9wl99if489dx38ia8wscx61842jyi4qz7r2q"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; };
-GSAR = derive { name="GSAR"; version="1.3.0"; sha256="1mf7v3v7arcrkx1207wsr0ajjqk8ipq2j9fdd6677ard7xvdj6zl"; depends=[igraph]; };
+GSAR = derive { name="GSAR"; version="1.3.2"; sha256="0fqv6lwi94ibwjjv6g0qmc8plc0ghszvjpd73m88080jiaw44yfl"; depends=[igraph]; };
 GSCA = derive { name="GSCA"; version="1.7.0"; sha256="1hv9r59fx1hbjnga26shb8crxji1bzmzjmwfbk1wrlm8dsikjnyg"; depends=[ggplot2 gplots RColorBrewer reshape2 rhdf5 shiny sp]; };
 GSEABase = derive { name="GSEABase"; version="1.31.3"; sha256="1jq3s3pha624gns7d7yf8qqgzq0fm3qgjrkwdkxgbpc7b09baiz0"; depends=[annotate AnnotationDbi Biobase BiocGenerics graph XML]; };
 GSEAlm = derive { name="GSEAlm"; version="1.29.0"; sha256="13ixp6vq9g9ag5rndc40gw64vny70zcj6lll7r7vz06p5i9b6kyk"; depends=[Biobase]; };
 GSRI = derive { name="GSRI"; version="2.17.0"; sha256="158dipqi9mh79d42pv5qsa1gwxz660kl474rdnkd59rnxh7ziyf3"; depends=[Biobase fdrtool genefilter GSEABase les]; };
 GSReg = derive { name="GSReg"; version="1.3.0"; sha256="07s60j68i1r64y8x8r1r9s6w020n41137cf2aj9hrsw6gn4ajh15"; depends=[]; };
 GSVA = derive { name="GSVA"; version="1.17.0"; sha256="0rk1srk95qia5ap69c2lysgv7r8qh50f50v9b569d2v2vjb0hpq5"; depends=[Biobase BiocGenerics GSEABase]; };
-GWASTools = derive { name="GWASTools"; version="1.15.8"; sha256="1rbpvscz7ghssxan02xs14cx7x69wi7vydai9q6ljl7nkazh4hgj"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf ncdf quantsmooth RSQLite sandwich survival]; };
+GWASTools = derive { name="GWASTools"; version="1.15.12"; sha256="04k5grfbrcpwnxxpirzb7x9488q8sq19lg00yn4mhpr7y1znrmpc"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf ncdf quantsmooth RSQLite sandwich survival]; };
 GeneAnswers = derive { name="GeneAnswers"; version="2.11.1"; sha256="15rf8syxhj3332d7f4jkvyby05r3iia7p1ryz1zv629waz6mr4nh"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; };
 GeneExpressionSignature = derive { name="GeneExpressionSignature"; version="1.15.0"; sha256="0wni584412af8a2wzk5r8nf63grw86d6fk74cmwksirw2734mmqs"; depends=[Biobase PGSEA]; };
 GeneGA = derive { name="GeneGA"; version="1.19.0"; sha256="0irfr4q55rda8acchgcqsksh6ija87fryj822nb3d4zklv9raqfv"; depends=[hash seqinr]; };
@@ -221,12 +222,12 @@ GeneticsDesign = derive { name="GeneticsDesign"; version="1.37.0"; sha256="08awf
 GeneticsPed = derive { name="GeneticsPed"; version="1.31.0"; sha256="17fs4gvirji3qp9ik480jpz6qrbq209sjhn57ipkaafvx7rw5j4i"; depends=[gdata genetics MASS]; };
 GenoView = derive { name="GenoView"; version="1.3.0"; sha256="09k9xjmx3qmsfr3a4vrfgs73r0xsymf5m4gl0zjjk4cnfk7bs41v"; depends=[biovizBase GenomicRanges ggbio ggplot2 gridExtra]; };
 GenomeGraphs = derive { name="GenomeGraphs"; version="1.29.0"; sha256="0kl2gapg7hnl4zfsamb3vwmj7z0vag7vd8viwh0pwqj0pd45dswa"; depends=[biomaRt]; };
-GenomeInfoDb = derive { name="GenomeInfoDb"; version="1.5.7"; sha256="1hk3q4wr87wflrcqrpdng70d42irf3v4i6av224pqq3h33j0iwpc"; depends=[BiocGenerics IRanges S4Vectors]; };
-GenomicAlignments = derive { name="GenomicAlignments"; version="1.5.9"; sha256="15zwx5z54cr3ix55m70682n1xxfbbx92z3m0qr7srsn8q9ycc8kj"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
+GenomeInfoDb = derive { name="GenomeInfoDb"; version="1.5.8"; sha256="0kdz1mkn3ljwxcz6v0np7gbb7b7sqxfj80sxrah3bnck2bzg1yra"; depends=[BiocGenerics IRanges S4Vectors]; };
+GenomicAlignments = derive { name="GenomicAlignments"; version="1.5.11"; sha256="1w4wmxcyj0ja9nkn35n5qhhax0b7sh4pjxk2hib71323y80mxlld"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
 GenomicFeatures = derive { name="GenomicFeatures"; version="1.21.13"; sha256="1swk94rqpvfysr3x1r61ypq9vlw1ryc0iw0x6dazfjjchaln0h07"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors]; };
-GenomicFiles = derive { name="GenomicFiles"; version="1.5.3"; sha256="03iq136ff0dymfnwyizq9zyzr3smahwp8p6ifc7yf1hwd0nql3wa"; depends=[BiocGenerics BiocParallel GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; };
-GenomicInteractions = derive { name="GenomicInteractions"; version="1.3.3"; sha256="0z5c8n0xnyxrdhvffyx8mnpj2qhclknn1gjn3ikmw9cprzlbcb6n"; depends=[BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra igraph IRanges plotrix Rsamtools rtracklayer S4Vectors stringr]; };
-GenomicRanges = derive { name="GenomicRanges"; version="1.21.15"; sha256="0sjv8b6vhqpg54v83zkai57xmx0axq7khr35l89b4rc3qd9i8k5c"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; };
+GenomicFiles = derive { name="GenomicFiles"; version="1.5.4"; sha256="13lglgxkqsxgi453dk56ry7amnv6lyddy74fnhhsqinj5ip9k3vw"; depends=[BiocGenerics BiocParallel GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+GenomicInteractions = derive { name="GenomicInteractions"; version="1.3.4"; sha256="1dh9l0abwfc9dkznvpnzsxlggifvh8zfcmb22mc36lnkq42r033d"; depends=[BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra igraph IRanges plotrix Rsamtools rtracklayer S4Vectors stringr]; };
+GenomicRanges = derive { name="GenomicRanges"; version="1.21.16"; sha256="11s14ikk2pj3hycanyjv6s1pild3987gfvf4vnzm6a6ilmqsyqzy"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; };
 GenomicTuples = derive { name="GenomicTuples"; version="1.3.1"; sha256="0i91qs1c84lyh0irhgnbnnvag0j3f48gfxxndk5x0yjf9kpa0hca"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; };
 Genominator = derive { name="Genominator"; version="1.23.0"; sha256="03pacbd3d5q7ykrflg258zcf8yfzm8kc976aw3d38q7agkia69h2"; depends=[BiocGenerics DBI GenomeGraphs IRanges RSQLite]; };
 GlobalAncova = derive { name="GlobalAncova"; version="3.37.0"; sha256="1j35r39plsxlkla2bv7wvg0if5gs2mfy71g6zb65g6ml5cqws45r"; depends=[annotate AnnotationDbi corpcor globaltest]; };
@@ -235,7 +236,7 @@ GraphAT = derive { name="GraphAT"; version="1.41.0"; sha256="1mjd54zy4l7ivy347zn
 GraphAlignment = derive { name="GraphAlignment"; version="1.33.0"; sha256="14zxbw8cj12wr6c2a0a6mfskr9sqf6cdfyz0ccbzy91d1lnrxzdf"; depends=[]; };
 GraphPAC = derive { name="GraphPAC"; version="1.11.0"; sha256="1p0rkc1qz0yf0lxyjfvrpd7nqky855kmhb1pdwxg3ckifnypw5mc"; depends=[igraph iPAC RMallow TSP]; };
 GreyListChIP = derive { name="GreyListChIP"; version="1.1.1"; sha256="0kbl9m37aiyv6yrqg4z352k7dpdpxm7yywymjfa9gdd0rv1cy401"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer]; };
-Gviz = derive { name="Gviz"; version="1.13.2"; sha256="0na13x76dlnddiijxigr4j75xb9dcg32j0gbkqkzjak9azp8szys"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; };
+Gviz = derive { name="Gviz"; version="1.13.3"; sha256="0qbad4r0k7j1z4gg785iv57azp9ljlxv5jngnk9kfif05rd3k7v3"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; };
 HCsnip = derive { name="HCsnip"; version="1.9.0"; sha256="14f881v776xn8lw4lvjc26s72laxs9zph902875f76ykbzygayd9"; depends=[Biobase clusterRepro coin fpc impute randomForestSRC sigaR sm survival]; };
 HDTD = derive { name="HDTD"; version="1.3.2"; sha256="19kzd1sjl0riwisdbrsy9j2pd39lpxwmizrnnj65hrfv6dwaqsgq"; depends=[]; };
 HELP = derive { name="HELP"; version="1.27.0"; sha256="1n2fj316ha2l941biyr9d56pry6n39drwa820rgyrwd116rzx79d"; depends=[Biobase]; };
@@ -248,14 +249,16 @@ HTSeqGenie = derive { name="HTSeqGenie"; version="3.19.0"; sha256="0i9h6qn2fpcp6
 HTqPCR = derive { name="HTqPCR"; version="1.23.0"; sha256="0zp7jbnh5zbrqaq84q1146sb3qg8n0kz6m9v5mi8a9l2fcvg2q09"; depends=[affy Biobase gplots limma RColorBrewer]; };
 Harshlight = derive { name="Harshlight"; version="1.41.0"; sha256="12wpfg785dfn5gwp014dfzk9x8zqvr9qrrs0pq32by576knida5z"; depends=[affy altcdfenvs Biobase]; };
 Heatplus = derive { name="Heatplus"; version="2.15.1"; sha256="1jcrajxvll0hhrsq8qvvyc1sj1nd3dm06n8q25qi9nacnfi865y7"; depends=[]; };
-HiTC = derive { name="HiTC"; version="1.13.1"; sha256="0mhfrxhfd11218pw6yn0l7dn3x5k90s07k53h1gj1j93i64gzzxg"; depends=[Biostrings GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; };
+HiTC = derive { name="HiTC"; version="1.13.2"; sha256="1bkd680n81cd7sdji6gjjljxhlbsrdgn5hwpmi37i83hnryfgf5x"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; };
 HilbertVis = derive { name="HilbertVis"; version="1.27.0"; sha256="1qcyzn86v0xhb9zc1vcia1n53i33sgncbb7lpink5llmjpalacq6"; depends=[lattice]; };
 HilbertVisGUI = derive { name="HilbertVisGUI"; version="1.27.0"; sha256="03jxn398xv97mmvbpl0qymmydhm4i4c36qnw4s22ch7wy3h9x6h8"; depends=[HilbertVis]; };
 HybridMTest = derive { name="HybridMTest"; version="1.13.0"; sha256="0r4j8yllxzwn5r2rvpkqx6w23836lmly8wlshib6p917ky0djw4s"; depends=[Biobase fdrtool MASS survival]; };
 IMPCdata = derive { name="IMPCdata"; version="1.3.0"; sha256="003qvf47bcfcwxkw7zpzdvpnw7xhd2y12n9by2b1ns5i5jka754b"; depends=[rjson]; };
 INPower = derive { name="INPower"; version="1.5.0"; sha256="0msz24bixp7b5a83n40675xq8fglrhbg8972a93x2k8jgb5gdh38"; depends=[mvtnorm]; };
+INSPEcT = derive { name="INSPEcT"; version="0.99.8"; sha256="0pzh0xkh4py6rwnjqz4wqfnk2h08dp5q9gc4cgxls6gl3574i9ny"; depends=[Biobase BiocParallel deSolve GenomicFeatures GenomicRanges IRanges preprocessCore pROC rootSolve]; };
+IONiseR = derive { name="IONiseR"; version="0.99.6"; sha256="1fzp7ncznqw7pmb4sh1qphrk0ham1158q71kiylggbm88wlisky3"; depends=[BiocGenerics Biostrings data_table dplyr ggplot2 magrittr rhdf5 ShortRead tidyr XVector]; };
 IPPD = derive { name="IPPD"; version="1.17.0"; sha256="0afhz5ishr1my9gnksa4dl92lfnb2fnvdpsh3n7kj4j2s8xx0crc"; depends=[bitops digest MASS Matrix XML]; };
-IRanges = derive { name="IRanges"; version="2.3.11"; sha256="06914mn3x097km2i4p8z4zj99msr1dvlqk50ari1djcnww0im251"; depends=[BiocGenerics S4Vectors]; };
+IRanges = derive { name="IRanges"; version="2.3.14"; sha256="0pg6zbdhhpk7h64nma9zrdjxvfk2nwad9b9x8y1qnkki8917a1xd"; depends=[BiocGenerics S4Vectors]; };
 ITALICS = derive { name="ITALICS"; version="2.29.0"; sha256="16l0wq7bxi3nz8f5hggnzddhg07vrcca480ygvmi03cxajxbjr9h"; depends=[affxparser DBI GLAD oligo oligoClasses]; };
 IVAS = derive { name="IVAS"; version="1.1.0"; sha256="15jnmi40bsnyf5yw86gvqppv0g8250lsi74gsjzhm7gijhlxfnrm"; depends=[AnnotationDbi BiocGenerics doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges lme4 Matrix S4Vectors]; };
 Icens = derive { name="Icens"; version="1.41.0"; sha256="1vi2hnzs8z5prggswa6wzr2y53jczkgg09f4vw0pjzkzi7p8bphy"; depends=[survival]; };
@@ -276,7 +279,7 @@ LPEadj = derive { name="LPEadj"; version="1.29.0"; sha256="1734ihzvid5bz2wyh7ysk
 LVSmiRNA = derive { name="LVSmiRNA"; version="1.19.0"; sha256="1z74y8zbg5amsmslb309gi630v8qa1qqgj37214bv5g9ab8xajmj"; depends=[affy Biobase BiocGenerics limma MASS quantreg SparseM vsn zlibbioc]; };
 LiquidAssociation = derive { name="LiquidAssociation"; version="1.23.0"; sha256="178gx8n0ga1ppjk368xacidms1rc2kn301fmdc8rwbcknwvxrwck"; depends=[Biobase geepack]; };
 LowMACA = derive { name="LowMACA"; version="1.1.0"; sha256="0i0pka0jf1yq7vjw1kb9sd2p21gpy4pw855ap815k02i0n7jyny4"; depends=[Biostrings cgdsr data_table motifStack RColorBrewer reshape2 stringr]; };
-M3D = derive { name="M3D"; version="1.3.4"; sha256="0yyhfs8frvyx0dk0k61a4xggqdrspx07jxhhl9q7bld026bv8d9d"; depends=[BiSeq GenomicRanges IRanges]; };
+M3D = derive { name="M3D"; version="1.3.5"; sha256="1pjfl0kdhzw9l59qzgxjkf60w0rjdswm8wc12cyk39190hnalh49"; depends=[BiSeq GenomicRanges IRanges]; };
 MAIT = derive { name="MAIT"; version="1.3.1"; sha256="1kpcns5f9j41sg5694ng4d0w5gil2qwi9s1804gncnnh273jsv5z"; depends=[agricolae CAMERA caret class e1071 gplots MASS pls plsgenomics Rcpp xcms]; };
 MANOR = derive { name="MANOR"; version="1.41.1"; sha256="0i1fk4c72k91i0w84b0swgdbd4igvbcrbcs12dqqxcslnqg44rs2"; depends=[GLAD]; };
 MBASED = derive { name="MBASED"; version="1.3.1"; sha256="0rdsv7qv5x6whb5jx4wzgcv88z6hwmf5ryz84liv7kg1i1pq1adn"; depends=[BiocGenerics BiocParallel GenomicRanges RUnit SummarizedExperiment]; };
@@ -287,8 +290,8 @@ MEDIPS = derive { name="MEDIPS"; version="1.19.2"; sha256="1k4bdvqsp9rrxadz79g4j
 MEDME = derive { name="MEDME"; version="1.29.0"; sha256="1fpi4ri134ii28nfiq2p875xinwvs8icrxvw158g5k7ixy1zx826"; depends=[Biostrings drc MASS]; };
 MEIGOR = derive { name="MEIGOR"; version="1.3.0"; sha256="1kif7m78w0w0qv4fqfby3rknqk56zk83dds3cm4pgv2cii61i9jy"; depends=[CNORode deSolve Rsolnp snowfall]; };
 MGFM = derive { name="MGFM"; version="1.3.0"; sha256="1h2bi2cchfxl0z31pgj6q6pb1jnmqvjy7jv2khp80h7sdr65356i"; depends=[annotate AnnotationDbi]; };
-MIMOSA = derive { name="MIMOSA"; version="1.7.0"; sha256="0kw2f3gk0fxfv393gh2mlnw4hy658j6ga20rhkbza1hzyyz44mvk"; depends=[Biobase coda data_table Formula ggplot2 Kmisc MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; };
-MLInterfaces = derive { name="MLInterfaces"; version="1.49.0"; sha256="0h5pr3lkgr6wb2h8dik2p4zv62p1hx22anxsbzbxsd4k4n9yzxd4"; depends=[annotate Biobase BiocGenerics cluster gdata genefilter MASS pls rda rpart sfsmisc]; };
+MIMOSA = derive { name="MIMOSA"; version="1.7.1"; sha256="1gzm90ii18vvpfd2nnl34mcvbvi49ck4hd7c5yziac8m3gx2f9f2"; depends=[Biobase coda data_table Formula ggplot2 Kmisc MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; };
+MLInterfaces = derive { name="MLInterfaces"; version="1.49.3"; sha256="1c7l9xwyx72hmv4rs24xm4bzj3lzaaj0ax71yw1p008rkgj8ifxz"; depends=[annotate Biobase BiocGenerics cluster fpc gdata genefilter ggvis htmltools MASS pls rda rpart sfsmisc shiny]; };
 MLP = derive { name="MLP"; version="1.17.0"; sha256="1wb6bzxn1paba2fxh62ldsfr4kr0nq2sy21v0pp0qwhfxndyzpdn"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; };
 MLSeq = derive { name="MLSeq"; version="1.7.0"; sha256="0vc5rz4l574hmzwn3q7c4giib0lzs720j0j3alvarb3lmfzx9mhq"; depends=[Biobase caret DESeq2 edgeR limma randomForest]; };
 MMDiff = derive { name="MMDiff"; version="1.9.0"; sha256="0xvnv024cv540m0jv9lrb4s5rvc0mq4gwp6wvdgpnsnqnwi9j556"; depends=[Biobase DiffBind GenomicRanges GMD IRanges Rsamtools]; };
@@ -296,7 +299,7 @@ MPFE = derive { name="MPFE"; version="1.5.0"; sha256="123a6qg761j46bs1ckd6yyr2ig
 MSGFgui = derive { name="MSGFgui"; version="1.3.0"; sha256="0r7izs3wpd7l9agrm3mrr3kmm00s9fzljsjxhk4pzxkjg1ran4hp"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; };
 MSGFplus = derive { name="MSGFplus"; version="1.3.0"; sha256="0q75mygrd56kr9hrrxlmckkgvhcrgvpgvbjdxjmz6jaqp5wfbkf5"; depends=[mzID]; };
 MSnID = derive { name="MSnID"; version="1.3.1"; sha256="0a0r2ikyb0spm110xzn3zzhl8g6xsvmh781d65f10l1iqnd2cqza"; depends=[Biobase data_table doParallel foreach iterators MSnbase mzID ProtGenerics R_cache Rcpp reshape2]; };
-MSnbase = derive { name="MSnbase"; version="1.17.4"; sha256="0ig62281xic977br9ddibcafrad2cwc49cqs7vz5i3gg9nf46iby"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp reshape2 S4Vectors vsn]; };
+MSnbase = derive { name="MSnbase"; version="1.17.11"; sha256="1yrzmanv87rpahpqg40vqx23baahq41w3j7zag8chygr2xhxkjxy"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp reshape2 S4Vectors vsn]; };
 MSstats = derive { name="MSstats"; version="2.7.0"; sha256="0zhv2c769biv6avb4csi7alabk76bfn0ykzwp0lc6ymzggbj9pil"; depends=[ggplot2 gplots limma lme4 marray MSnbase preprocessCore Rcpp reshape]; };
 MVCClass = derive { name="MVCClass"; version="1.43.0"; sha256="1mbhfkvdkxw9xd76dd2pxk947w9wahwdsk9x1wcryrmwcdvaqqcz"; depends=[]; };
 MantelCorr = derive { name="MantelCorr"; version="1.39.0"; sha256="0l255m63q9idv56svs5m5bc4izwqnm3jy2z3kka7sw4xcx13l39g"; depends=[]; };
@@ -312,12 +315,12 @@ MethTargetedNGS = derive { name="MethTargetedNGS"; version="1.1.0"; sha256="0bsp
 MethylAid = derive { name="MethylAid"; version="1.3.1"; sha256="012ypjnw5ky6233dibx2hpryzbr66g86hm14cjfd45fzr08bv08z"; depends=[Biobase BiocGenerics BiocParallel ggplot2 gridBase hexbin matrixStats minfi RColorBrewer shiny]; };
 MethylMix = derive { name="MethylMix"; version="1.3.0"; sha256="181sz3ny79i8gaq3y2k0q56l03ii288lhy8xv1fsh94bjhihjgcd"; depends=[doParallel foreach optimx RColorBrewer RPMM]; };
 MethylSeekR = derive { name="MethylSeekR"; version="1.9.0"; sha256="1hp2qadkkkanp3cs0gqwyvn94qy1v34gcjhx730p55iq1had5dcf"; depends=[BSgenome geneplotter GenomicRanges IRanges mhsmm rtracklayer]; };
-Mfuzz = derive { name="Mfuzz"; version="2.29.1"; sha256="06xzb670y19ry1fr97xw8j3gcagqnyaxlclscx3w1m2qfss5wi15"; depends=[Biobase e1071 tkWidgets]; };
+Mfuzz = derive { name="Mfuzz"; version="2.29.3"; sha256="10qblp4xg6506f1j1v3n0k4m3f5hdrzv2m35szh0xdi2jxlc1m9k"; depends=[Biobase e1071 tkWidgets]; };
 MiChip = derive { name="MiChip"; version="1.23.0"; sha256="0np5drks6nfg3aw8qm899syxv1z56608bhav1jid4ks9fwdi33bb"; depends=[Biobase]; };
 MiPP = derive { name="MiPP"; version="1.41.0"; sha256="1zp8j123fx82xdc3dvn4a17mspw2pdxxlyj4f750vzwc4ma9pj39"; depends=[Biobase e1071 MASS]; };
 MiRaGE = derive { name="MiRaGE"; version="1.11.1"; sha256="1nkvk07kgps9rzh362pczlsq0r7g8b85f4bdbi0ld5p0ijdd02f3"; depends=[AnnotationDbi Biobase BiocGenerics]; };
 MineICA = derive { name="MineICA"; version="1.9.0"; sha256="0gfdnlahsm206vw443ml872dr1k5sg6w9hsdd3gkwzm0lsrxqd7x"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt cluster colorspace fastICA foreach fpc ggplot2 GOstats graph gtools Hmisc igraph JADE lumi marray mclust plyr RColorBrewer Rgraphviz scales xtable]; };
-MinimumDistance = derive { name="MinimumDistance"; version="1.13.2"; sha256="09rpwh75gdn5s5i4vd3nk97ns04q7vfspbm7r0mjjrjnidd0fxlf"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; };
+MinimumDistance = derive { name="MinimumDistance"; version="1.13.3"; sha256="1aha0ab1ki0ab6yaflqmjr19igkaqn84rlxk5h5j612y9qv04pvs"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; };
 Mirsynergy = derive { name="Mirsynergy"; version="1.5.0"; sha256="0nbdnz3m99r3zlkqqya4xs944a3zy0daqxbnf5gn4033z2kgd10s"; depends=[ggplot2 gridExtra igraph Matrix RColorBrewer reshape scales]; };
 MmPalateMiRNA = derive { name="MmPalateMiRNA"; version="1.19.0"; sha256="0pnbzqh90vqcgsh1swvhy8w2k1vj24k5j9m4sb7qwhi2h5y1gzwa"; depends=[Biobase lattice limma statmod vsn xtable]; };
 MoPS = derive { name="MoPS"; version="1.3.0"; sha256="0sf7v7clghm48g2ryainsyvsl67nqq4xha71zc1r5w9fz33xa5mv"; depends=[Biobase]; };
@@ -331,7 +334,7 @@ NOISeq = derive { name="NOISeq"; version="2.11.1"; sha256="13q3v2jphridbjk1059c4
 NTW = derive { name="NTW"; version="1.19.0"; sha256="027rdvy8xpsa70g6x33v4fmzk8gyvd8p3lgf65ac36wcy120gyhl"; depends=[mvtnorm]; };
 NanoStringQCPro = derive { name="NanoStringQCPro"; version="1.1.1"; sha256="0mmbbxhxd7nh7mqzckw0as68ac0nv005liif0laadbz49y6p4rwm"; depends=[AnnotationDbi Biobase knitr NMF png RColorBrewer]; };
 NarrowPeaks = derive { name="NarrowPeaks"; version="1.13.2"; sha256="0cryjprj8y1fgn5xxzsyyv4zdzv5qy8405qkj47kvjbrk0kbr97s"; depends=[BiocGenerics CSAR fda GenomeInfoDb GenomicRanges ICSNP IRanges S4Vectors]; };
-NetPathMiner = derive { name="NetPathMiner"; version="1.5.0"; sha256="0z0bppsvy1zzbx8fspmsgzw7vzf5x649762znaqpfabvy6bpp2xk"; depends=[igraph]; };
+NetPathMiner = derive { name="NetPathMiner"; version="1.5.2"; sha256="0k3vq5l95hapw8hbc00m4pchxwzylp97y20w21g0g1yaf1cf9br0"; depends=[igraph]; };
 NetSAM = derive { name="NetSAM"; version="1.9.0"; sha256="1bdch37kk1clb8cyffrlcr6d5qykk5a5ql3dfi94bw1l0w6v4fjq"; depends=[graph igraph seriation]; };
 NormqPCR = derive { name="NormqPCR"; version="1.15.0"; sha256="0nfjnx5id04nbkda9v66418yzpp88mq2ijsfn8jyg0sfika405nl"; depends=[Biobase qpcR RColorBrewer ReadqPCR]; };
 NuPoP = derive { name="NuPoP"; version="1.19.0"; sha256="1dpqmhbwr1l95vgjxlw3xayjxksa909xj05jbf4x3gafnlkkdvbk"; depends=[]; };
@@ -342,12 +345,12 @@ OSAT = derive { name="OSAT"; version="1.17.0"; sha256="1ky9xb5ls3xnzinsrxrgggb4r
 OTUbase = derive { name="OTUbase"; version="1.19.0"; sha256="0xmp446v57z875lmjkg47f9hx961af9nda658v8qlbjxf1wjw9zb"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; };
 OmicCircos = derive { name="OmicCircos"; version="1.7.0"; sha256="1xil5043hgpypaww1a1wvcxw9im9jmzgdp83p3z71giqiq36dvh4"; depends=[GenomicRanges]; };
 OmicsMarkeR = derive { name="OmicsMarkeR"; version="1.1.0"; sha256="1fw6zfp5jrkvxjb6j48q3n1fqkm1qmmjjvmr70v93hi5jg0an8gy"; depends=[assertive caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; };
-OncoSimulR = derive { name="OncoSimulR"; version="1.3.2"; sha256="0bm4p5wpp32kd90c7mx76d8iy1jxxfssnkg3wrrglcfi0qqzs404"; depends=[data_table graph Rcpp Rgraphviz]; };
+OncoSimulR = derive { name="OncoSimulR"; version="1.99.5"; sha256="0pjn2kirf1b72fvqxjawxcbrsn42brhz09kjnywm611kap329dq2"; depends=[data_table graph gtools igraph Rcpp Rgraphviz]; };
 OperaMate = derive { name="OperaMate"; version="0.99.6"; sha256="0xh57d82rmfcs1a6gj0qcjf585drhzns5k69bwxb7x1xw63wp4kp"; depends=[ggplot2 MASS pheatmap RDAVIDWebService]; };
 OrderedList = derive { name="OrderedList"; version="1.41.0"; sha256="1cw8y5f5h15z0qwg8n4dq7g3ixx2wa332rdsb4w2qqmcqlz79bfp"; depends=[Biobase twilight]; };
-OrganismDbi = derive { name="OrganismDbi"; version="1.11.32"; sha256="15zl741nw38yq07wp8rp5w1jzvyg8cz10dcyirv28rqs9nhz6q7b"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller GenomicFeatures GenomicRanges graph IRanges RBGL RSQLite S4Vectors]; };
+OrganismDbi = derive { name="OrganismDbi"; version="1.11.42"; sha256="0y0v5ngall7iyvx2bqhfkxdnw9alkyab5f6qgpq8dpvr6pvyamyl"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller GenomicFeatures GenomicRanges graph IRanges RBGL RSQLite S4Vectors]; };
 OutlierD = derive { name="OutlierD"; version="1.33.0"; sha256="0bljxmrnlqcngzzv6yxjsim7gd4icyi384vimn5gs869mq9gyrj3"; depends=[Biobase quantreg]; };
-PAA = derive { name="PAA"; version="1.3.0"; sha256="1786prxxf3yk4zgs8qcrnxf9i7b3dwaq21cj2hsz4xsrnskygcs0"; depends=[e1071 limma MASS mRMRe randomForest Rcpp ROCR sva]; };
+PAA = derive { name="PAA"; version="1.3.2"; sha256="1p9900wiy5mmcmwb4l5n8kvsjs3ay6k0k551mpjbwijhk2si7wja"; depends=[e1071 limma MASS mRMRe randomForest Rcpp ROCR sva]; };
 PADOG = derive { name="PADOG"; version="1.11.0"; sha256="0x84k32fmd1zrwjc4f71mq4jslh9bxr4gjbl48k1f5kl5j6hlxj3"; depends=[AnnotationDbi Biobase doRNG foreach GSA limma nlme]; };
 PANR = derive { name="PANR"; version="1.15.0"; sha256="0nc2a10z7i16dz41yhz3zw9h51myxzxbxd1vpc2d8gczks07n6ch"; depends=[igraph MASS pvclust RedeR]; };
 PAPi = derive { name="PAPi"; version="1.9.0"; sha256="1553fxm3ma3p5j10acyk5m2wx4dafp346x0pyxj9aah856h4zkw5"; depends=[KEGGREST svDialogs]; };
@@ -370,19 +373,20 @@ PathNet = derive { name="PathNet"; version="1.9.0"; sha256="1dqai2ys5vfhhqqghh1x
 Pbase = derive { name="Pbase"; version="0.9.0"; sha256="1j0b2ajlsk42kxakh4vhcd9ias1fxr4cna4h52hrinxi9jml9ywx"; depends=[Biobase BiocGenerics biomaRt Biostrings cleaver GenomicRanges Gviz IRanges MSnbase mzID mzR Pviz Rcpp rtracklayer S4Vectors]; };
 PhenStat = derive { name="PhenStat"; version="2.3.0"; sha256="0irasfwks5w5a25zkp0qhasrk5nvahbijsncfbmpimac5cwps1an"; depends=[car logistf MASS nlme nortest]; };
 Polyfit = derive { name="Polyfit"; version="1.3.0"; sha256="0zdd85bshdcf85asq93wbbrj26fa5d6xkmgdyrqg9hawdznj9kip"; depends=[DESeq]; };
+Prize = derive { name="Prize"; version="0.99.16"; sha256="0bm93kipmyypqsp17f316k83gwrfpzqjqhlf44kmb5ris5s1fdyb"; depends=[diagram ggplot2 gplots matrixcalc reshape2 stringr]; };
 ProCoNA = derive { name="ProCoNA"; version="1.7.0"; sha256="1x2wmlhlizd09v4d7q98cfplqqmxcagi43rl9ibdah04n7k35zpd"; depends=[BiocGenerics flashClust GOstats MSnbase WGCNA]; };
 ProtGenerics = derive { name="ProtGenerics"; version="1.1.0"; sha256="1l77j3zl78v86jbxpwnyc0a5q66yds79nirlcvan789hxbggr0i4"; depends=[BiocGenerics]; };
 Pviz = derive { name="Pviz"; version="1.3.0"; sha256="0pvmpxw4dpxxs9lrn9nn44rn36r3l09rwlkh5ph054h56nm80xs1"; depends=[Biostrings biovizBase data_table GenomicRanges Gviz IRanges]; };
-QDNAseq = derive { name="QDNAseq"; version="1.5.0"; sha256="16qp5r8gl81a4arpb6kac387dnc0ng4vilfv1gfqr4rjkpp0gks2"; depends=[Biobase CGHbase CGHcall DNAcopy matrixStats R_utils Rsamtools]; };
+QDNAseq = derive { name="QDNAseq"; version="1.5.1"; sha256="1gykm8r410s9aw75km0f8wnhd0p8gqirszp70g5x97n83r4k6rnq"; depends=[Biobase CGHbase CGHcall DNAcopy matrixStats R_utils Rsamtools]; };
 QUALIFIER = derive { name="QUALIFIER"; version="1.13.0"; sha256="0vk3xx0dmxadxk1wmcnf9cxv7rr4z8624npkmdbqlzb6mxix7p6d"; depends=[Biobase data_table flowCore flowViz flowWorkspace hwriter lattice latticeExtra MASS ncdfFlow reshape XML]; };
 QuartPAC = derive { name="QuartPAC"; version="1.1.0"; sha256="0w92hggwihp2nia9dzg8yjbfsyrcgwq4kpxh96jb8kkmq6kl2l8p"; depends=[data_table GraphPAC iPAC SpacePAC]; };
-QuasR = derive { name="QuasR"; version="1.9.8"; sha256="0ij9lkqld0pkbf6hq731ygzhj1nf864y6rxzys8f4j7g871lbm1w"; depends=[Biobase BiocGenerics BiocInstaller BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rbowtie Rsamtools S4Vectors ShortRead zlibbioc]; };
+QuasR = derive { name="QuasR"; version="1.9.9"; sha256="13md1pq0bg9xdlhvwsys3f7ibqll80viica03h2l4cnhgw26zj52"; depends=[Biobase BiocGenerics BiocInstaller BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rbowtie Rsamtools rtracklayer S4Vectors ShortRead zlibbioc]; };
 R3CPET = derive { name="R3CPET"; version="1.1.0"; sha256="0vwyrqsihnabzqh5r329v3f5zcg2ik51aakvscpp482z0dm2naqh"; depends=[clues clValid data_table DAVIDQuery GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp reshape2 S4Vectors]; };
 R453Plus1Toolbox = derive { name="R453Plus1Toolbox"; version="1.19.1"; sha256="0fp8hx9igfjaj1dvfxs54r5krhsp1hbmlqs9vac3g6ga51268rir"; depends=[Biobase BiocGenerics biomaRt Biostrings BSgenome GenomicRanges IRanges R2HTML Rsamtools S4Vectors ShortRead SummarizedExperiment TeachingDemos VariantAnnotation xtable XVector]; };
 RBGL = derive { name="RBGL"; version="1.45.1"; sha256="0y90pvl3i8pyzxwssciygcd1c1lb8a0rqhpiqgif56075amm71rl"; depends=[graph]; };
 RBM = derive { name="RBM"; version="1.1.0"; sha256="03q7prkrj8y3k8jrnnbjrkmlyv72cxfa8l042df4wajhcbpa4g4l"; depends=[limma marray]; };
 RBioinf = derive { name="RBioinf"; version="1.29.0"; sha256="1cyd18lz3h9b20g6s9azzv9rv9bachh3qsczz84y8lj4kay3qssx"; depends=[graph]; };
-RCASPAR = derive { name="RCASPAR"; version="1.15.0"; sha256="16v55gkqg4jaa7wp4g1l536jv74nlcwkir6796zd85byz2c6aaxh"; depends=[]; };
+RCASPAR = derive { name="RCASPAR"; version="1.15.1"; sha256="125vrkz5gicizf0acpv0f0ijiky5my7rpfyim25vihcsz5fkb0w1"; depends=[]; };
 RCyjs = derive { name="RCyjs"; version="1.1.12"; sha256="1gv31yj0ms7llsg2rca96rh77h1qw3hkjbiskzc3zmpycx5m9m8b"; depends=[BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; };
 RCytoscape = derive { name="RCytoscape"; version="1.19.0"; sha256="0yfmlksi7sz0p9nbgjz2cpqwbwyzzxij3zaqmkp3wqfdk89mxgi7"; depends=[BiocGenerics graph]; };
 RDAVIDWebService = derive { name="RDAVIDWebService"; version="1.7.0"; sha256="07hnj7flfacg9j8c6155nw23zjxcb1v4wj4rkfi8xz5clp80v6xh"; depends=[Category ggplot2 GOstats graph RBGL rJava]; };
@@ -406,22 +410,23 @@ RTCA = derive { name="RTCA"; version="1.21.0"; sha256="1kpfmrjcwmzgih0vib9ckf4c0
 RTCGAToolbox = derive { name="RTCGAToolbox"; version="1.99.4"; sha256="1s78mll5907bpwca0zzhp19p328gwxc88wg98fjk710i0lx67gbi"; depends=[data_table limma RCircos RCurl RJSONIO survival XML]; };
 RTN = derive { name="RTN"; version="1.7.2"; sha256="0k0xwnk0vgbi86435m5rhv2sxdnzwmhgr85zb8dlffr68dqa66ih"; depends=[car data_table ff igraph IRanges limma minet RedeR snow]; };
 RTopper = derive { name="RTopper"; version="1.15.0"; sha256="1bjrrljidnij9zhq6lqsdi6hr35pih2kwwwd5cgmwfff8nfx60kw"; depends=[Biobase limma multtest]; };
-RUVSeq = derive { name="RUVSeq"; version="1.3.0"; sha256="0wi1ydj98l0826sjpm4bfpdklz3735q16vamqzr2b10p3m22xi79"; depends=[EDASeq edgeR MASS]; };
+RUVSeq = derive { name="RUVSeq"; version="1.3.2"; sha256="1fbkiqzwxmwwkznl37ak1fkzms5i49n4hlk9s1c0frbw3cg79nqm"; depends=[Biobase EDASeq edgeR MASS]; };
 RUVcorr = derive { name="RUVcorr"; version="1.1.0"; sha256="1pgsfm17gnqwa9sr19f15h0nx1fhyjj07yhmpwr7s6p3v46qdw33"; depends=[BiocParallel corrplot gridExtra lattice MASS psych reshape2 snowfall]; };
 RUVnormalize = derive { name="RUVnormalize"; version="1.3.0"; sha256="1fqk68rpznz9xc7ricipvrk1anppa33h9m5yv65fjwv4q1d05265"; depends=[Biobase]; };
 RWebServices = derive { name="RWebServices"; version="1.33.1"; sha256="1bxp4zj7r1lrxb7r7l32h6b8hdxb1ryf7dxxj0qhwimh7pmxln31"; depends=[RCurl SJava TypeInfo]; };
 RamiGO = derive { name="RamiGO"; version="1.15.0"; sha256="1q9f2ii5b1xway407gzfpzz6vm6an8p13vmgkw7vb9rldxn85hab"; depends=[graph gsubfn igraph png RCurl RCytoscape]; };
 RankProd = derive { name="RankProd"; version="2.41.0"; sha256="05r8mrgnpfkd7yhcch7nrn9jbapfhvi67h0z9a9nlxlp44mz0qq7"; depends=[]; };
+RareVariantVis = derive { name="RareVariantVis"; version="1.0.0"; sha256="09hww69169c225dmi3rmjhv5j2bxq1c773s1q7048rysgv0har5y"; depends=[BiocGenerics GenomeInfoDb GenomicRanges googleVis IRanges S4Vectors SummarizedExperiment VariantAnnotation]; };
 Rariant = derive { name="Rariant"; version="1.5.0"; sha256="1xwy2xrdk1m1mscnql8cp3az1jx639a9w4mb8bz7jf62z4z4npsi"; depends=[dplyr exomeCopy GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges reshape2 Rsamtools S4Vectors shiny SomaticSignatures VariantAnnotation VGAM]; };
 RbcBook1 = derive { name="RbcBook1"; version="1.37.0"; sha256="03q82zjd725w585rgdn9mbx7ddsv1kdxylsndh26csz573j2myhh"; depends=[Biobase graph rpart]; };
 Rbowtie = derive { name="Rbowtie"; version="1.9.0"; sha256="02wc0pzw9vm1mc7y84ic79jjdi1mh77v8h4gk2pl117pdkgg7nl7"; depends=[]; };
 Rcade = derive { name="Rcade"; version="1.11.0"; sha256="0dqhir9nkkhga3zll4jv9nc4k2kaggxkks2whfw581k9akj1v7x1"; depends=[baySeq GenomicRanges plotrix rgl Rsamtools S4Vectors]; };
-Rchemcpp = derive { name="Rchemcpp"; version="2.7.0"; sha256="0px77l9h4f0kximv7almkyx9lfc67cdvms25mfry5hyv2v2d3qb8"; depends=[ChemmineR Rcpp]; };
+Rchemcpp = derive { name="Rchemcpp"; version="2.7.1"; sha256="11kj3x6vlwns6wx6sr4iwhh2fz2ab6205cj48gayc5753lhqi44m"; depends=[ChemmineR Rcpp]; };
 RchyOptimyx = derive { name="RchyOptimyx"; version="2.9.0"; sha256="1l84zzd4xpz409gl3d3j5ssddgx3i6ik5hqsdggyvnvf1nb2yavn"; depends=[flowType graph Rgraphviz sfsmisc]; };
 Rcpi = derive { name="Rcpi"; version="1.5.0"; sha256="1ap4i41iy9r6xl0dhlry6yz28g5blb057vvddx6ysphaq9gwx6rp"; depends=[Biostrings ChemmineR doParallel fmcsR foreach GOSemSim rcdk RCurl rjson]; };
 Rdisop = derive { name="Rdisop"; version="1.29.0"; sha256="0j40i96k6q94c3238gl3z9kp9dxv00133m9s4zx28z17ayz00h69"; depends=[Rcpp RcppClassic]; };
 ReQON = derive { name="ReQON"; version="1.15.1"; sha256="147fywvb9f9gjg3ij3sh753fs6mkr9b3f1c9j4gws1hmc6ryyn3m"; depends=[rJava Rsamtools seqbias]; };
-ReactomePA = derive { name="ReactomePA"; version="1.13.2"; sha256="0wll3hgf161jyj2pzbybncvikw6idph672s3n048a1fa7nn8abyg"; depends=[AnnotationDbi DOSE graphite igraph]; };
+ReactomePA = derive { name="ReactomePA"; version="1.13.3"; sha256="0lpabqivq5yssvmz2nac3c169pz6hs7s9n9h4cams9pif364c9jv"; depends=[AnnotationDbi DOSE graphite igraph]; };
 ReadqPCR = derive { name="ReadqPCR"; version="1.15.0"; sha256="063swfh992gmibvr9ffsh65i57fdl651gpc39b2y6k9dp2rx8is7"; depends=[affy Biobase]; };
 RedeR = derive { name="RedeR"; version="1.17.0"; sha256="13fmv76jrzxsa1ykzl85zwj0zb3aycyvc5s3h60vlgawfw66z90h"; depends=[igraph RCurl XML]; };
 RefNet = derive { name="RefNet"; version="1.5.0"; sha256="0dzkvrpphbajpcwc3gdqi8lmwfg8a3rljhdnwswvbjg2vraj48s2"; depends=[AnnotationHub BiocGenerics IRanges PSICQUIC RCurl shiny]; };
@@ -434,32 +439,32 @@ Ringo = derive { name="Ringo"; version="1.33.0"; sha256="12qh3aayy317pzb137ds9vq
 Risa = derive { name="Risa"; version="1.11.0"; sha256="1rgyh3yv4ii0xw6ycm0g9b0y6c9nqdq4k8lidmifk0gx835lw7vf"; depends=[affy Biobase biocViews Rcpp xcms]; };
 Rmagpie = derive { name="Rmagpie"; version="1.25.0"; sha256="13mb9aaqmwx1ad4mk0fhxqfql8pjpyaiibip7jawiyji7ghp9iw7"; depends=[Biobase e1071 kernlab pamr]; };
 RmiR = derive { name="RmiR"; version="1.25.0"; sha256="1xc19w8la239ia793qpnpx2h0aavwhidrjf4i87jry2j29npjfzz"; depends=[DBI RSVGTipsDevice]; };
-RnBeads = derive { name="RnBeads"; version="1.1.1"; sha256="1cz26pivf2w57ha03c49nsqnvr93s8s4xqdy2ccdc3rgffvv191g"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr RColorBrewer]; };
+RnBeads = derive { name="RnBeads"; version="1.1.3"; sha256="1yd5gmi2vvkqrv384ndsn7qgp8rzjj6d0i4zsgr33avxnah757m2"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr RColorBrewer]; };
 RnaSeqSampleSize = derive { name="RnaSeqSampleSize"; version="1.1.0"; sha256="0q2w1yd5p9k3pls6ki8yci3r2v4rxi3iy4zk5mafmr7ip0q1rwpp"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp]; };
 Rnits = derive { name="Rnits"; version="1.3.0"; sha256="0hxll8hlv5nc6vijznhzmvbjh1hxmfy9shm2g8al291yi0gfdmk3"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; };
 Roleswitch = derive { name="Roleswitch"; version="1.7.0"; sha256="01b21yyg0d2v10abcbw08zhswh9nb7wj7s3x5kcaaas7671f06ha"; depends=[Biobase biomaRt Biostrings DBI microRNA plotrix pracma reshape]; };
 Rolexa = derive { name="Rolexa"; version="1.25.0"; sha256="1qrf7byimw9s5jp15zmwqk95x34r3yx2npr46gwf1zih06n7kc05"; depends=[Biostrings IRanges mclust ShortRead]; };
 RpsiXML = derive { name="RpsiXML"; version="2.11.0"; sha256="0rvma7vynfh5sjhqnbpagilq54dh0wrvvb3jzykwmrak0dbyk7zh"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; };
-Rqc = derive { name="Rqc"; version="1.3.0"; sha256="06x637d83qv0g0b833r02andj13ipn7dg9xp3lz1rfv5rc1v9m6v"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings ggplot2 IRanges knitr markdown plyr reshape2 S4Vectors ShortRead]; };
-Rsamtools = derive { name="Rsamtools"; version="1.21.8"; sha256="0hv36vmhv37mvn4mqyydyjm3gsfmnizw37jicpb9m2zgc6zgvzha"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; };
-Rsubread = derive { name="Rsubread"; version="1.19.0"; sha256="1vlv6h84bxl8986vqc0j47jgmyx8zn2fawj2w6r6fbblq3n2gnm0"; depends=[]; };
+Rqc = derive { name="Rqc"; version="1.3.1"; sha256="02kc0ki021m4hxhzlmxfrb9p7p2ibdqan5hr9h67vd2dcnp9yaij"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings ggplot2 IRanges knitr markdown plyr reshape2 S4Vectors ShortRead]; };
+Rsamtools = derive { name="Rsamtools"; version="1.21.13"; sha256="0fv0a5f1jb8mj3b2qn6bf9vzzpvn8fgrlhxz492rd3ndvvgnabxc"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; };
+Rsubread = derive { name="Rsubread"; version="1.19.2"; sha256="1xcj13mzw7a8q93kimr61kcl2xvr0mdzvrrqi4j3psbcyf5zn86k"; depends=[]; };
 Rtreemix = derive { name="Rtreemix"; version="1.31.0"; sha256="1z08y8qhc3sv4pwvji4pks46hxpcpwb9yx8y0927bc96a8mqgax4"; depends=[Biobase graph Hmisc]; };
-S4Vectors = derive { name="S4Vectors"; version="0.7.5"; sha256="0fayn794gwndk7rnawmks1armc1znfgllnsdk36fa19fg9g3245r"; depends=[BiocGenerics]; };
+S4Vectors = derive { name="S4Vectors"; version="0.7.10"; sha256="15hyi728raya0x0fl0pp58kk6w4chvx7xv2f7kmp1432pkgvif9p"; depends=[BiocGenerics]; };
 SAGx = derive { name="SAGx"; version="1.43.0"; sha256="111pgl7rzmscgadkbivwa736gpyw1z7zkcj648zq3jhqix569dvd"; depends=[Biobase multtest]; };
-SANTA = derive { name="SANTA"; version="2.5.0"; sha256="1xrgjhja7idfby99ln90q1h6qrvsy1zbxksjccrv25qqmgaiw0ql"; depends=[igraph Matrix snow stringr]; };
+SANTA = derive { name="SANTA"; version="2.5.2"; sha256="0y49ly3ll8qhbnd5yv5nfzc0bq2xcp2nwdg26338qmif4xklzs43"; depends=[igraph Matrix snow]; };
 SBMLR = derive { name="SBMLR"; version="1.65.0"; sha256="1nmw5c32ka6l12cid54mc4diahjhmyg6fngsd646v70rbzgffn7q"; depends=[deSolve XML]; };
 SCAN_UPC = derive { name="SCAN.UPC"; version="2.11.0"; sha256="1gwjd78qfaqv6xh4ys6rr29b82wc8qxk7ysfjcl06j6n0qk1v4s6"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; };
 SELEX = derive { name="SELEX"; version="1.1.0"; sha256="13v2aqphpblwslbnm9yk9lfg31vrc3lz9ds4m8j7584iszmlgnar"; depends=[Biostrings rJava]; };
 SEPA = derive { name="SEPA"; version="0.99.0"; sha256="1mc44amd39x1dvl0kamhbsn2cplg7h5j5v5y2lv1gminfl4xs0sw"; depends=[ggplot2 reshape2 segmented shiny topGO]; };
-SGSeq = derive { name="SGSeq"; version="1.3.7"; sha256="0cr9z0yjbn7n3p4442vjsdr6a0g0nsw6cp0mp7g92vna8lhff4n0"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+SGSeq = derive { name="SGSeq"; version="1.3.12"; sha256="19i39vv0ds79hgjjkp37j49apr1jr5n93zc2dmn1llglyp9qqwyl"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
 SIM = derive { name="SIM"; version="1.39.0"; sha256="1r08h5hkciycv4lh998vm742flim07plysgjvrq9dp4c5q4qrzr5"; depends=[globaltest quantreg quantsmooth]; };
-SIMAT = derive { name="SIMAT"; version="1.1.0"; sha256="1w9pw94p4fiq54vjh132b4j0gj5qq06y0b7crdbhv9ihn6780lpg"; depends=[ggplot2 mzR Rcpp reshape2]; };
+SIMAT = derive { name="SIMAT"; version="1.1.5"; sha256="074r9fyrgkay1xr0i3ps1sn7n24y26w595nssy7bryrvhhd8izbr"; depends=[ggplot2 mzR Rcpp reshape2]; };
 SJava = derive { name="SJava"; version="0.95.1"; sha256="1cl0qybi71srf1ggawxdy128kz8crn8if4yi8c2m6w9ppah9m763"; depends=[]; };
 SLGI = derive { name="SLGI"; version="1.29.0"; sha256="0jhi3nmgnqf8qix90kpz8gqibqvyp02ca07aka7npqls24d3i96f"; depends=[AnnotationDbi Biobase BiocGenerics lattice ScISI]; };
 SLqPCR = derive { name="SLqPCR"; version="1.35.0"; sha256="1p35xgwf3i8ksznz1gi3bddj0816hdljamcb7smdrq0md5fqmpzb"; depends=[]; };
 SMAP = derive { name="SMAP"; version="1.33.0"; sha256="0znl289fclws2vnqgpjnrl8b0s5q4cna3ps3il5783vr64ir88cg"; depends=[]; };
 SNAGEE = derive { name="SNAGEE"; version="1.9.0"; sha256="0sn5b8ah9idbz63y1rjx8brz3h58zvh2sk59l4i48nvrm38g169r"; depends=[]; };
-SNPRelate = derive { name="SNPRelate"; version="1.3.4"; sha256="1m10sa7zlsg8b77xi663jz315fi267g2d59d69a7mzcznxz7xi1z"; depends=[gdsfmt]; };
+SNPRelate = derive { name="SNPRelate"; version="1.3.5"; sha256="0xr839g6a2m5p7fd2dzaz0c263b2cfdpakq5ydk0k1c3xppzly9y"; depends=[gdsfmt]; };
 SNPchip = derive { name="SNPchip"; version="2.15.2"; sha256="1px5ifdsly1z8iwd22vj2xb4pk5jhsa3h2z31scw37b0v4daks50"; depends=[Biobase foreach GenomeInfoDb GenomicRanges IRanges lattice oligoClasses SummarizedExperiment]; };
 SPEM = derive { name="SPEM"; version="1.9.0"; sha256="09klaxlz1ff77jhjsr95g3s4b5m285zf3fl9w4mv5pc8r1viqplf"; depends=[Biobase Rsolnp]; };
 SPIA = derive { name="SPIA"; version="2.21.0"; sha256="0v8m9wfl2kqzzl3k0v7lr7g33ymdnmqi9r2fqyb42mggpq5pwxlm"; depends=[KEGGgraph]; };
@@ -468,15 +473,15 @@ SRAdb = derive { name="SRAdb"; version="1.23.0"; sha256="042y06ds1jdj26jzi51wxb6
 SSPA = derive { name="SSPA"; version="2.9.0"; sha256="1kkvj3s2l6zzvv6pybx38qrnm3i5dxckx2fpc4snlx7km2w175xz"; depends=[lattice limma qvalue]; };
 STAN = derive { name="STAN"; version="1.3.0"; sha256="02qg79aa0j2ns1xswdirgbpwb0dlghd0lbdxgnpmy225wgb7nak6"; depends=[Rsolnp]; };
 STATegRa = derive { name="STATegRa"; version="1.3.1"; sha256="0kfwi5qimg4myx5x0gjwrkhz8cxh2hz1mvxla8yn8v8fkb3ryshj"; depends=[affy Biobase calibrate edgeR foreach ggplot2 gplots gridExtra limma MASS]; };
-STRINGdb = derive { name="STRINGdb"; version="1.9.0"; sha256="0nsl13gb0kjppd4gnpg35ww1dy0gnql7ki6902pxam6pz2m0sp26"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; };
+STRINGdb = derive { name="STRINGdb"; version="1.9.1"; sha256="0w069dd8h1h80av18lh54xszs94d5nps19fzc225zmbdwqy21vx5"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; };
 SVM2CRM = derive { name="SVM2CRM"; version="1.1.0"; sha256="0k3mg9b8i406ssvkzacz60qk000bnd1d5bmcqzc3yrh3w9qv567q"; depends=[AnnotationDbi GenomicRanges IRanges LiblineaR mclust pls ROCR rtracklayer squash verification zoo]; };
-SamSPECTRAL = derive { name="SamSPECTRAL"; version="1.23.2"; sha256="1bm8b6myyafya99af6w6ayngkm8dl85ldma0lf6v0gysmn9dlqkk"; depends=[]; };
+SamSPECTRAL = derive { name="SamSPECTRAL"; version="1.23.4"; sha256="0fqnqffw6q5sja3jkw6ddrachs075s5s7rnpg9fli9lgax5r4rbp"; depends=[]; };
 ScISI = derive { name="ScISI"; version="1.41.0"; sha256="05snqj8qphcmnkrmv42p6zs92dmi09sd06abn5ll5234my5d0vvn"; depends=[annotate AnnotationDbi apComplex RpsiXML]; };
 SemDist = derive { name="SemDist"; version="1.3.0"; sha256="0dvnp3d2s7bc4jv2vm8jikyac2cd23hx7r480g2lkcaic99wbl0s"; depends=[annotate AnnotationDbi]; };
-SeqArray = derive { name="SeqArray"; version="1.9.3"; sha256="062zl6igsf12k7k9c5j0sya3mq57y0vp1giqcj3czv569ipnc93s"; depends=[Biostrings gdsfmt GenomicRanges IRanges S4Vectors VariantAnnotation]; };
+SeqArray = derive { name="SeqArray"; version="1.9.7"; sha256="0gpn5dispfd8scqhgxw8pfgrwkz479ly5q8431mifmbkq8zh34pd"; depends=[Biostrings gdsfmt GenomicRanges IRanges S4Vectors VariantAnnotation]; };
 SeqGSEA = derive { name="SeqGSEA"; version="1.9.0"; sha256="0znabm84qgzf9m4dk64jppn3s5vzz1sjvrdlr7s6jls8jwi8kqqi"; depends=[Biobase biomaRt DESeq doParallel]; };
-SeqVarTools = derive { name="SeqVarTools"; version="1.7.0"; sha256="0nwhz7fpfrbbvcl08g8wflhz8iv660grfq2dq0l5bgqv04x3a19h"; depends=[gdsfmt GenomicRanges GWASExactHW IRanges S4Vectors SeqArray VariantAnnotation]; };
-ShortRead = derive { name="ShortRead"; version="1.27.4"; sha256="1wkpl67rbiwdy5s4hr84bgc4qj4i94d3kkgg527c2xdg7pwd2vx9"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; };
+SeqVarTools = derive { name="SeqVarTools"; version="1.7.1"; sha256="04xfph2iphpmlqws5xmibq1jdkclbal2nrf18w7sblqcv67cff7x"; depends=[gdsfmt GenomicRanges GWASExactHW IRanges S4Vectors SeqArray VariantAnnotation]; };
+ShortRead = derive { name="ShortRead"; version="1.27.5"; sha256="0r9gmbg9fd3n6v8c0l1mjkk9x1v6qrisamm5a1nasqbg3wmhmz5k"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; };
 SigCheck = derive { name="SigCheck"; version="2.1.0"; sha256="012n75gmsifvymbk20pjdv9g8mzmm9bzk98l089ymy5hbddja86b"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; };
 SigFuge = derive { name="SigFuge"; version="1.7.0"; sha256="1b966n3rl4xs3q1vjgkxxfravqr02rdgwyzvr469y757qdqi1day"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; };
 SimBindProfiles = derive { name="SimBindProfiles"; version="1.7.0"; sha256="04m7h5zil05sg9yfgjjzm1p65302fp50vxf8y1jafp1nwqialxwh"; depends=[Biobase limma mclust Ringo]; };
@@ -487,7 +492,7 @@ SpeCond = derive { name="SpeCond"; version="1.23.0"; sha256="0nbbqazxql9mc5idvrc
 SplicingGraphs = derive { name="SplicingGraphs"; version="1.9.1"; sha256="1s3kvaxrrvfndp4imavj0r9zw0rg37cn9xwxhi5zpfd7a784z1xk"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; };
 Starr = derive { name="Starr"; version="1.25.0"; sha256="0553rfkhzzlszhmfcrl7r7n2jmvvz9rqj91x131x3jsmb1qavw57"; depends=[affxparser affy MASS pspline Ringo zlibbioc]; };
 Streamer = derive { name="Streamer"; version="1.15.2"; sha256="0mah1sq797ihy82mvb6vyppggap3nxcpwbnswxf1rw0jxhnjnmll"; depends=[BiocGenerics graph RBGL]; };
-SummarizedExperiment = derive { name="SummarizedExperiment"; version="0.1.5"; sha256="1n29sssjkhaj2rs9qd9g8mq25a63rs04f1kn9hjy67f10i5h1l1n"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
+SummarizedExperiment = derive { name="SummarizedExperiment"; version="0.3.2"; sha256="0k7dmly8g1qhpqx4qv376ixkwvx073ydc5xqi29s81mwp5fq08zi"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
 Sushi = derive { name="Sushi"; version="1.6.1"; sha256="0g1fk0xrn584l49r73crj0bc5z2y6rdzyf54d221r7k119njp3dw"; depends=[biomaRt zoo]; };
 SwimR = derive { name="SwimR"; version="1.7.0"; sha256="07kh24m9d1q3swj3srjybj6lq68s89750fbvlg449px4aq23yrq0"; depends=[gplots heatmap_plus R2HTML signal]; };
 TCC = derive { name="TCC"; version="1.9.0"; sha256="1bihqfvrq3sjs38m2a60swxqcxmgabb1lmsnfrb669imiqc7ramj"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; };
@@ -507,13 +512,14 @@ TransView = derive { name="TransView"; version="1.13.0"; sha256="14fanxl8lqam349
 TurboNorm = derive { name="TurboNorm"; version="1.17.0"; sha256="1f2frh2xnngzpl2q2jxiild98qgnd60c0pz31aisk013nj3jdadq"; depends=[affy convert lattice limma marray]; };
 TypeInfo = derive { name="TypeInfo"; version="1.35.0"; sha256="0rxwfaqg8sg70hiq8frm4pjhs8a17n0rgjra346bsi8cm4a2vyhz"; depends=[]; };
 UNDO = derive { name="UNDO"; version="1.11.0"; sha256="173cdpp0gipwplxdf7ynxqnv8fqfkbyx7xmr5cx396zi8gpq3am4"; depends=[Biobase BiocGenerics boot MASS nnls]; };
-UniProt_ws = derive { name="UniProt.ws"; version="2.9.1"; sha256="0w5rgr5a5mmhrgvgdyxvglflz1z3yl8i8kfrhcavl1apkqv2v0p0"; depends=[AnnotationDbi BiocGenerics RCurl RSQLite]; };
-VanillaICE = derive { name="VanillaICE"; version="1.31.2"; sha256="0szd11zz5nvax9awwh1v3qdg01x7s87a2smacz96fya9acjiclhb"; depends=[Biobase BiocGenerics crlmm data_table foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment]; };
-VariantAnnotation = derive { name="VariantAnnotation"; version="1.15.13"; sha256="1fp09wnvwh981bwysfnvak1qz0ybidz6qim73w1wg32dn2d42p5a"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; };
-VariantFiltering = derive { name="VariantFiltering"; version="1.5.14"; sha256="0r972lvyjcq0wxxnpgd9ym0b7kfjl8nyjkkci2z5gnilpq9ds5fw"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges graph Gviz IRanges RBGL Rsamtools RSQLite S4Vectors shiny VariantAnnotation XVector]; };
+UniProt_ws = derive { name="UniProt.ws"; version="2.9.2"; sha256="0pby1c7y8fxkpdd2knbv8gbxs78ry1dz8q9zqw6bakp831v5kbgw"; depends=[AnnotationDbi BiocGenerics RCurl RSQLite]; };
+VanillaICE = derive { name="VanillaICE"; version="1.31.3"; sha256="0niimjngjx8wq2fylzjdijb2za4w4ia53aqkdnjwjfl78rg2hwch"; depends=[Biobase BiocGenerics crlmm data_table foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment]; };
+VariantAnnotation = derive { name="VariantAnnotation"; version="1.15.19"; sha256="1hqpjwrnyl5hp8vwl68v2cnf868vjf7k0vckjczdcc66wp3g9r70"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; };
+VariantFiltering = derive { name="VariantFiltering"; version="1.5.15"; sha256="1dawzsv358h3p5x7kcml17snpbypgwjl5b0aam2wrsb7qp80sqh7"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges graph Gviz IRanges RBGL Rsamtools RSQLite S4Vectors shiny VariantAnnotation XVector]; };
 VariantTools = derive { name="VariantTools"; version="1.11.0"; sha256="1yyx9l6q3v4igm2ppnrsj9c7p4p0zpkqwjyf9d7b7rqvrk9yjyrv"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges gmapR IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
 Vega = derive { name="Vega"; version="1.17.0"; sha256="1c39112czlw9hgh9gmkwxhhz9kwki48k8lsfmy3hkzxqpxx61h01"; depends=[]; };
 VegaMC = derive { name="VegaMC"; version="3.7.0"; sha256="046wly5sn4vwk3h4bcick8q5dpjrfjq393rqjl8y4v24iqynlyqd"; depends=[Biobase biomaRt genoset]; };
+XBSeq = derive { name="XBSeq"; version="0.99.6"; sha256="1j8hwy2wi4vmc1nnc5xij578w445vqj0v6ngz06rlbdi5kb9k7ls"; depends=[Biobase BiocGenerics DESeq2 ggplot2 locfit matrixStats pracma]; };
 XDE = derive { name="XDE"; version="2.15.0"; sha256="17i8zxb6q4wpsa8lymcnilmr39ip1a54h6rqyl3m7qa8xwb0gv50"; depends=[Biobase BiocGenerics genefilter gtools MergeMaid mvtnorm]; };
 XVector = derive { name="XVector"; version="0.9.1"; sha256="0l5l45i7sx1j51s3wkab207qwbk77i8iazd26isf0yp3rsb84a4c"; depends=[BiocGenerics IRanges S4Vectors]; };
 a4 = derive { name="a4"; version="1.17.0"; sha256="0pn0gm4xkngz72i92h58d0xbpcx04938x4vm0mqsilrjapchripj"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; };
@@ -525,7 +531,7 @@ a4Reporting = derive { name="a4Reporting"; version="1.17.0"; sha256="1fpdkw048gv
 aCGH = derive { name="aCGH"; version="1.47.0"; sha256="095arlryay4gdr6kva7vf9lcby60pyx5bs4vcx586zgwskzpb2ln"; depends=[Biobase cluster multtest survival]; };
 acde = derive { name="acde"; version="0.99.5"; sha256="1bbsfr7a2sivb6dpn06hwj0i95wdlfxzba4a36pakx7nzn6nv76p"; depends=[boot]; };
 adSplit = derive { name="adSplit"; version="1.39.0"; sha256="1jprbqwhksyp9jf05r5dbfzgn30xm16shqsf8yi9b3nr7z2swvwm"; depends=[AnnotationDbi Biobase cluster multtest]; };
-affxparser = derive { name="affxparser"; version="1.41.4"; sha256="11l1d74qvsaknnfa4wwp1jb0v17hwbz5yc8fnvg5qqmdwnblrdjc"; depends=[]; };
+affxparser = derive { name="affxparser"; version="1.41.5"; sha256="0naiv8z07zr1xjnmimx17awnsb9dryiz4w9jx17whrjwdpddx1p5"; depends=[]; };
 affy = derive { name="affy"; version="1.47.1"; sha256="1c9ggyqhj65mj0nq9xsqfmzp4a5705qj67swjpk5bmqajxr390a3"; depends=[affyio Biobase BiocGenerics BiocInstaller preprocessCore zlibbioc]; };
 affyContam = derive { name="affyContam"; version="1.27.0"; sha256="1hd9kchhdjcnkxlf6kcc59jb5a9v67671shvzprraa1lg4800j5x"; depends=[affy Biobase]; };
 affyILM = derive { name="affyILM"; version="1.21.0"; sha256="1gvagg83p4vxp6q72s7camcg5lhxdfy7rmm3a2p2n29267xvcz5x"; depends=[affxparser affy Biobase gcrma]; };
@@ -546,26 +552,26 @@ annmap = derive { name="annmap"; version="1.11.0"; sha256="0s0ifbwra3zczw9h0nqcs
 annotate = derive { name="annotate"; version="1.47.0"; sha256="06nrzkl9g26rrnqvakwkn2yinvgka02a5iivhi9kgjk4g5plcmkw"; depends=[AnnotationDbi Biobase BiocGenerics DBI XML xtable]; };
 annotationTools = derive { name="annotationTools"; version="1.43.0"; sha256="1dqs8f4p1ks03q0lfwm3hs116ahks39hk17knkqs492zcqr83qay"; depends=[Biobase]; };
 anota = derive { name="anota"; version="1.17.0"; sha256="0grdmpdg03wqjs6rk558nvl8vvdi6my0jv06f3h364pk44hrijdn"; depends=[multtest qvalue]; };
-antiProfiles = derive { name="antiProfiles"; version="1.9.0"; sha256="0jyrwk7h3qrka950yqhblavf40yjbyarimrf8d7zbq1kd3licfbf"; depends=[matrixStats]; };
+antiProfiles = derive { name="antiProfiles"; version="1.9.1"; sha256="07gzl7wsvv3x7in7n1fwq4cm8bqhlrxwq6ra1k2556z9z8ad7y33"; depends=[locfit matrixStats]; };
 apComplex = derive { name="apComplex"; version="2.35.0"; sha256="0h9vvz62fbnqqw2qz4kpcr0s40yj7swy0plkdaq51q04p41z016r"; depends=[graph RBGL Rgraphviz]; };
-aroma_light = derive { name="aroma.light"; version="2.5.1"; sha256="0d48c2860gg2qpmqx5i0lzh2n8chb4jdq78f169vlynx49ix3kq7"; depends=[matrixStats R_methodsS3 R_oo R_utils]; };
+aroma_light = derive { name="aroma.light"; version="2.5.2"; sha256="1dw3b06fq0da6ji13x42iqwwidx2ajg8q75svsd5y98dly8jniib"; depends=[matrixStats R_methodsS3 R_oo R_utils]; };
 arrayMvout = derive { name="arrayMvout"; version="1.27.0"; sha256="1czqsd34d8rb9h4vwp2m6ficvi41gbdgrilgbl0fb01vlp79qq0k"; depends=[affy affyContam Biobase lumi mdqc parody simpleaffy]; };
 arrayQuality = derive { name="arrayQuality"; version="1.47.0"; sha256="0f3wvvb1a78hzlxansjfh065vbyh2qk9vz3jna6294zc7k4r7wfb"; depends=[gridBase hexbin limma marray RColorBrewer]; };
 arrayQualityMetrics = derive { name="arrayQualityMetrics"; version="3.25.0"; sha256="0h90j2fj87bvwj1cjy7qq5mnfy4jabqa8ijq23gp3p51qwyh84zr"; depends=[affy affyPLM beadarray Biobase Cairo genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG vsn XML]; };
 attract = derive { name="attract"; version="1.21.0"; sha256="0kl2kgxvm9ix2lwcwilmzcjhxbhx99afn6g6608aq26649q3k2sz"; depends=[AnnotationDbi Biobase cluster GOstats limma]; };
-ballgown = derive { name="ballgown"; version="2.1.0"; sha256="168bpcawi5g6vhwg16585qd6g1pp3kd4baldcd1yk9bkccxaj8xx"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; };
+ballgown = derive { name="ballgown"; version="2.1.1"; sha256="0nb9xhcvdl9zpfix3rsr0dlm7f7smiabbzfiw50psw9mg8wki0dn"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; };
 bamsignals = derive { name="bamsignals"; version="1.1.0"; sha256="1ga4swlqmjg4xnmkk16h0qjh3dpz7n0pra2233j4cz78cn8zvj3p"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; };
 baySeq = derive { name="baySeq"; version="2.3.0"; sha256="1l0is5dcwip7babll7mpsahhj69v1j1d7caq64ak6qhb477pmak5"; depends=[abind GenomicRanges perm]; };
-beadarray = derive { name="beadarray"; version="2.19.0"; sha256="0izc7i65j60k20a86hblkfq6vq2n855vi8qrn42p3gx27s28a20v"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 illuminaio IRanges limma reshape2]; };
+beadarray = derive { name="beadarray"; version="2.19.1"; sha256="0al50lli8ckbr8cs38r6xr5v4rldf6xy7iwl5hbs5avxnibk3s8k"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 illuminaio IRanges limma reshape2]; };
 beadarraySNP = derive { name="beadarraySNP"; version="1.35.0"; sha256="0g6ba4iynfgrm647d5vx6wk9pijg62bdvvz1afz9dimqvjlwybhc"; depends=[Biobase quantsmooth]; };
 betr = derive { name="betr"; version="1.25.0"; sha256="0jd7r069jlfp5fj51xw8k6jpxq5kb364xi9331l06hwijp3msrk6"; depends=[Biobase limma mvtnorm]; };
 bgafun = derive { name="bgafun"; version="1.31.0"; sha256="18wk42h1i06j3swlsac9vnkc7riimk7qap59lygji1p3zvy1nkpx"; depends=[ade4 made4 seqinr]; };
 bgx = derive { name="bgx"; version="1.35.0"; sha256="1cawfanrxq82b24ny050hv4p607k2zhfxllgl8j1j9qm9n4yk4yk"; depends=[affy Biobase gcrma]; };
 bigmemoryExtras = derive { name="bigmemoryExtras"; version="1.13.2"; sha256="0qmrpm4bir0si5xd5v8ih6wnwfprwp4q9hcxbylf1721v9m9wpwv"; depends=[bigmemory Biobase]; };
 bioDist = derive { name="bioDist"; version="1.41.0"; sha256="14a18ky9x36fa8yx3kry23c0vfazxy0lg0j2zkdnr1irngc9wnw5"; depends=[Biobase KernSmooth]; };
-bioassayR = derive { name="bioassayR"; version="1.7.3"; sha256="1m6b2l0y7acpwpb6jjmmhsxdjrrhqnas7c8a2xq50x88l9ks4v68"; depends=[BiocGenerics DBI Matrix rjson RSQLite XML]; };
+bioassayR = derive { name="bioassayR"; version="1.7.7"; sha256="1pflygamq0l0pdps4ay3rl4f8c1njrb55lnl0p2z7mgpj6dbgvf8"; depends=[BiocGenerics DBI Matrix rjson RSQLite XML]; };
 biocGraph = derive { name="biocGraph"; version="1.31.0"; sha256="069n4867pkygrsgfjp6arnnmcvlij03r1a2kbs9jgnpx4knck09i"; depends=[BiocGenerics geneplotter graph Rgraphviz]; };
-biocViews = derive { name="biocViews"; version="1.37.7"; sha256="0d7gwbb9x23gr2h0pl72hzsm2jfj7s3dzbl66gmk6dc0bs7ibw42"; depends=[Biobase graph knitr RBGL RCurl RUnit XML]; };
+biocViews = derive { name="biocViews"; version="1.37.10"; sha256="1wa9avvgmfvl44l7gfsg7ivbsylixh413ckc5p8xryax6scb2kzy"; depends=[Biobase graph knitr RBGL RCurl RUnit XML]; };
 biomaRt = derive { name="biomaRt"; version="2.25.1"; sha256="1dk55qrfxyzgnjk90qy6mfgw04fpwfy4jkhwbmnpnky826mg7bwb"; depends=[AnnotationDbi RCurl XML]; };
 biomvRCNS = derive { name="biomvRCNS"; version="1.9.1"; sha256="0ni7ncip0vx1ipyrgd2kkasw6cmxbr2ha2dsqb0bizyyf2981rnh"; depends=[GenomicRanges Gviz IRanges mvtnorm]; };
 biosvd = derive { name="biosvd"; version="2.5.0"; sha256="0xnc3vpbj5p14w2fwql8vpz9lyvivq3kjmwsr62abn418ampa941"; depends=[Biobase BiocGenerics NMF]; };
@@ -574,7 +580,7 @@ birta = derive { name="birta"; version="1.13.0"; sha256="01lrwg4naks85gcrlg3sk3p
 birte = derive { name="birte"; version="1.3.0"; sha256="0azkl9x2hk826sdpw96ls868jf83yf1v79inyjg7xsilal2slqgf"; depends=[Biobase limma MASS nem Rcpp RcppArmadillo ridge]; };
 blima = derive { name="blima"; version="1.3.0"; sha256="1i7njg1lw76717irmfbpy9pmv8hy7nzyini2wm6625cafizp5xq8"; depends=[beadarray Biobase BiocGenerics]; };
 bridge = derive { name="bridge"; version="1.33.0"; sha256="06iz67amv80az14s8yim25jfsgbxhxbfifbqazsc78ip9gd7lfyv"; depends=[rama]; };
-bsseq = derive { name="bsseq"; version="1.5.3"; sha256="1rdblq7xh5hbghr66iamnpc24yiqrnqfn7pr835m6wag6waxdc3i"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges gtools IRanges locfit matrixStats S4Vectors scales SummarizedExperiment]; };
+bsseq = derive { name="bsseq"; version="1.5.4"; sha256="1hr9h4h099506id4xvh6xm9x40dv5hsiyz8rzj4dxxkq7095h9d1"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges gtools IRanges locfit matrixStats S4Vectors scales SummarizedExperiment]; };
 bumphunter = derive { name="bumphunter"; version="1.9.1"; sha256="0phq9dhrj8fa253a64vwfp75j85vp9142g5gmfy1g1n861xy8r26"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; };
 caOmicsV = derive { name="caOmicsV"; version="0.99.2"; sha256="0y96f64m0liv53vbby866v1ga5nml1506pp6ff4ax7dbg0niiwwn"; depends=[bc3net igraph]; };
 canceR = derive { name="canceR"; version="1.1.2"; sha256="07wikalgmf3vw2dzmri1ia80hfman53mynsk40y549qn8hjija1k"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; };
@@ -599,19 +605,19 @@ cleaver = derive { name="cleaver"; version="1.7.0"; sha256="14vbdagy61imql6z2qaz
 clippda = derive { name="clippda"; version="1.19.0"; sha256="1gd5b2n2qa9bv1n93vcdz8lg8kmn1lv923i3gzq8pcy7fbz7m5cs"; depends=[Biobase lattice limma rgl scatterplot3d statmod]; };
 clipper = derive { name="clipper"; version="1.9.0"; sha256="0py5hdbf8wypw5r9r2d7b3239b83lyrybcvksrmiklv7snw9c2qx"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; };
 clonotypeR = derive { name="clonotypeR"; version="1.7.0"; sha256="1pwwjgln7r7035fdqqfb69fgql91cxfablbwid2m5xkdrwzpb57s"; depends=[]; };
-clst = derive { name="clst"; version="1.17.0"; sha256="0wsn5ins5hz2xq866wh71b7jk4six5cy3hq5ff2a04n20asaiq4i"; depends=[lattice ROC]; };
-clstutils = derive { name="clstutils"; version="1.17.0"; sha256="0bnqmmi5j0iy1zjxlj4b621d9llww4b2wvrq1vcqjm5wfrn7a372"; depends=[ape clst lattice rjson RSQLite]; };
-clusterProfiler = derive { name="clusterProfiler"; version="2.3.3"; sha256="1hsqfl6dp5671y3sr0qxr01fra1b6y44a7jnc94mqdfabsm9a9vx"; depends=[AnnotationDbi DOSE ggplot2 GOSemSim KEGGREST magrittr plyr qvalue topGO]; };
+clst = derive { name="clst"; version="1.17.1"; sha256="08gqxcjchzywvc67nfjmr2i1xxm71i1j00qxdq3zs6p9y4n65qa0"; depends=[lattice ROC]; };
+clstutils = derive { name="clstutils"; version="1.17.1"; sha256="04gwj8mlbqd5l2nas146vk0vzad0z1y4225g935h9baspcmdh3f8"; depends=[ape clst lattice rjson RSQLite]; };
+clusterProfiler = derive { name="clusterProfiler"; version="2.3.6"; sha256="1hfknmad6wix5ciwcfjn80s0y78966gfkifhxa6wxpkddmdhklqw"; depends=[AnnotationDbi DOSE ggplot2 GOSemSim KEGGREST magrittr plyr qvalue topGO]; };
 clusterStab = derive { name="clusterStab"; version="1.41.0"; sha256="0sgj2k70fc3r3s19vxcx95z8s3a42yshl78swxp0qp55kidbhvdp"; depends=[Biobase]; };
 cn_farms = derive { name="cn.farms"; version="1.17.0"; sha256="09xasmanimx3mzis786iwy2nvxqa5rzvrvrz1hpsiyh5y77yrbnb"; depends=[affxparser Biobase DBI DNAcopy ff lattice oligo oligoClasses preprocessCore snow]; };
-cn_mops = derive { name="cn.mops"; version="1.15.0"; sha256="11yds13b65hnhaiqckphcl7hn9z85qv7jpwrp4knscl9y8bs3s78"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools]; };
+cn_mops = derive { name="cn.mops"; version="1.15.1"; sha256="03gr4i1vpyg6h3yyqrdjq1z1dzq9jzdazcrv9045v652qf4jbshr"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools]; };
 cnvGSA = derive { name="cnvGSA"; version="1.13.0"; sha256="1sswh1xwimki8ys08l2h95ajpnm5gr0bscvwilhjw4g2a0y7nibr"; depends=[brglm doParallel foreach GenomicRanges splitstackshape]; };
 coGPS = derive { name="coGPS"; version="1.13.0"; sha256="160cf9ijn5crvhwbqldix1n36jrmn51085sr4whgm765si57wwb4"; depends=[]; };
 coMET = derive { name="coMET"; version="1.1.0"; sha256="01baf156p0ldqhczrin2lsf4jir7158b0db5732jddnl5ayghsi3"; depends=[biomaRt colortools GenomicRanges ggbio ggplot2 gridExtra Gviz hash IRanges psych rtracklayer S4Vectors trackViewer]; };
 coRNAi = derive { name="coRNAi"; version="1.19.0"; sha256="1vidwyq8rnkbi0pfbh3mk8m3qj8acwqn7q6jm35gahy4y3p0nq7x"; depends=[cellHTS2 gplots lattice limma locfit MASS]; };
 cobindR = derive { name="cobindR"; version="1.7.1"; sha256="0mya51pynfdxfap3paylinqg10fpir7flsz1bng0sk34y15jnxbz"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust rtfbs seqinr yaml]; };
-codelink = derive { name="codelink"; version="1.37.0"; sha256="10s8x9j034j9vl7hv9w8ws4kihmw632b177ckiq0gsy2k63iampk"; depends=[annotate Biobase BiocGenerics limma]; };
-cogena = derive { name="cogena"; version="1.1.2"; sha256="0qjcjh65hbllmqzjnmr4vwgn7scs6lfb7g4pxka4w3r2ca444a0v"; depends=[amap Biobase biwt class cluster corrplot devtools doParallel fastcluster foreach ggplot2 gplots kohonen mclust reshape2]; };
+codelink = derive { name="codelink"; version="1.37.4"; sha256="0rn2cbjgb7f9yypdrvk5ahgpghd3pn45pb183rs9fdywivys9a0v"; depends=[annotate Biobase BiocGenerics limma]; };
+cogena = derive { name="cogena"; version="1.1.3"; sha256="074knrfvnhf4fp98dypwzjsp9z15lj7xlgm1wfmnijcwrwf5566p"; depends=[amap Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots igraph kohonen mclust reshape2 STRINGdb]; };
 compEpiTools = derive { name="compEpiTools"; version="1.3.4"; sha256="0y12sn2dh0x2y7nghkh6dm98b4ilg41694shw3m0fcgaz22c30kp"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; };
 compcodeR = derive { name="compcodeR"; version="1.5.3"; sha256="0208sxff40mjizr47zf6yf87irnnjm0gizdk9h5frbizdxl2i9nn"; depends=[caTools edgeR gdata ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS modeest ROCR sm stringr vioplot]; };
 conumee = derive { name="conumee"; version="1.1.0"; sha256="1sxl5m7yfqbzg76n06y1jcv0v75y7wf3ad66zw8v004nz84diaix"; depends=[DNAcopy GenomeInfoDb GenomicRanges IRanges minfi rtracklayer]; };
@@ -622,7 +628,7 @@ cosmiq = derive { name="cosmiq"; version="1.3.0"; sha256="1868sxwlmaqas3w3nrw4bv
 cpvSNP = derive { name="cpvSNP"; version="1.1.0"; sha256="066y409zfz0bway990ygck5lf0vzl6whh212v4rpis1l9bzfv434"; depends=[BiocParallel corpcor GenomicFeatures ggplot2 GSEABase plyr]; };
 cqn = derive { name="cqn"; version="1.15.1"; sha256="1g1ip7lxs82qq0qbhnx90hxmjiypc76p1sgx7yvj5nmp6wp1m5xy"; depends=[mclust nor1mix preprocessCore quantreg]; };
 crlmm = derive { name="crlmm"; version="1.27.0"; sha256="16i3ijqhwp6c2dshk8r7idrjwga3sm1qcafqz9gl4q6b04s5jvym"; depends=[affyio Biobase BiocGenerics ellipse ff foreach illuminaio lattice matrixStats mvtnorm oligoClasses preprocessCore RcppEigen SNPchip VGAM]; };
-csaw = derive { name="csaw"; version="1.3.7"; sha256="0bislfi25l4m5rviccp8nx5ilw9804h4dfxc928a8mxhc8piqgzx"; depends=[AnnotationDbi edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges limma Rsamtools S4Vectors SummarizedExperiment]; };
+csaw = derive { name="csaw"; version="1.3.9"; sha256="10ad0nflzy5ygq7rcn5swpdhxd4rr4y65759pvhji17scsinhswp"; depends=[AnnotationDbi edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges limma Rsamtools S4Vectors SummarizedExperiment]; };
 ctc = derive { name="ctc"; version="1.43.0"; sha256="139rxdvyvv3wvlc5q3581y5hkjkd5smxvb606mlxjb8lww4qmcj8"; depends=[amap]; };
 cummeRbund = derive { name="cummeRbund"; version="2.11.1"; sha256="0nd1a9wi2qvvdhfvkb18ql82bfzhz6fivc7wdfv90mibrd7ypb2a"; depends=[Biobase BiocGenerics fastcluster ggplot2 Gviz plyr reshape2 RSQLite rtracklayer]; };
 customProDB = derive { name="customProDB"; version="1.9.4"; sha256="0ws620i6s9p477zfns0m6qpzzhrsivjziv2gv3gmy19dhfh0ln08"; depends=[AnnotationDbi biomaRt Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr RCurl Rsamtools RSQLite rtracklayer stringr VariantAnnotation]; };
@@ -630,35 +636,37 @@ cycle = derive { name="cycle"; version="1.23.0"; sha256="1fpn41xgnvn77m2bga3j70h
 cytofkit = derive { name="cytofkit"; version="1.1.1"; sha256="0kzy6ylijyypsii5vl77r0wl2s2rhnvj98qbiy96ziijfjmjmfcc"; depends=[Biobase e1071 flowCore ggplot2 gplots reshape Rtsne vegan]; };
 daMA = derive { name="daMA"; version="1.41.0"; sha256="0jfp6kxzys0w8vv8fr5shki79rimiagylvkz5avg2idvzgs2q1w8"; depends=[MASS]; };
 dagLogo = derive { name="dagLogo"; version="1.7.1"; sha256="1mqxhdwiaq9szg5krhxndr1wgl77cgxxxq271a5n53srkbfh77s4"; depends=[biomaRt Biostrings grImport motifStack pheatmap]; };
-ddCt = derive { name="ddCt"; version="1.24.1"; sha256="0am65cwrhy0xijxfg1709rwvdjammdfz4y2g7cyd83d7chfaznxa"; depends=[Biobase BiocGenerics lattice RColorBrewer xtable]; };
+ddCt = derive { name="ddCt"; version="1.24.2"; sha256="06cg2q8sg2685z7salbfyq2xb1mya3avgjrdmi6nw88rr8pxz0w7"; depends=[Biobase BiocGenerics lattice RColorBrewer xtable]; };
 ddgraph = derive { name="ddgraph"; version="1.13.0"; sha256="1krdxmcjrhbw5gdrg68m41m1mhb5q0ijmqhxbvvxzqm3wyh8v2g1"; depends=[bnlearn graph gtools MASS pcalg plotrix RColorBrewer Rcpp]; };
 deepSNV = derive { name="deepSNV"; version="1.15.3"; sha256="1sg4swpna7h4lmpzmqg1x4lqmyx1xq0fckz43gpvpk5s8li6j62h"; depends=[Biostrings GenomicRanges IRanges Rhtslib SummarizedExperiment VariantAnnotation VGAM]; };
 deltaGseg = derive { name="deltaGseg"; version="1.9.0"; sha256="0y8fw4gxmhsr5xrbg1k0s8207mhj6dmlbbmny2dn66c1qlg2bh24"; depends=[changepoint fBasics ggplot2 pvclust reshape scales tseries wavethresh]; };
-derfinder = derive { name="derfinder"; version="1.3.2"; sha256="11syvmgfw7sdl9p5sl0b0q9kkk37xdqil8qz70l0p9m9j1z385sq"; depends=[AnnotationDbi BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; };
-derfinderHelper = derive { name="derfinderHelper"; version="1.3.0"; sha256="0hgj1adh82w2b1gdw6zh8hxij4n5a0bsild66cpb0i8cny8a3ayj"; depends=[IRanges Matrix S4Vectors]; };
-derfinderPlot = derive { name="derfinderPlot"; version="1.3.2"; sha256="1fhgq1nr4qxv6l1qf1g92gw6c9h47i92ybxcr9m88kqp53y6flj4"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 scales]; };
+derfinder = derive { name="derfinder"; version="1.3.3"; sha256="11npavkr27f3c48bp40vgn9klgmpqs2w17gl96qn5g1y2gyvrhk5"; depends=[AnnotationDbi BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; };
+derfinderHelper = derive { name="derfinderHelper"; version="1.3.1"; sha256="03kijh42x1v4ix4gxs1729rifwckaz9npcrd9b3j6xsizx97b4cr"; depends=[IRanges Matrix S4Vectors]; };
+derfinderPlot = derive { name="derfinderPlot"; version="1.3.4"; sha256="1f7x609sknmbn8gsxq75073vfr0qd0k9j7gfi0fxvgnm5f4lkizx"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 scales]; };
 dexus = derive { name="dexus"; version="1.9.0"; sha256="1xnjs6gmzkdj1snwakq73bz8ypnxzzxh8ki9wv0ljfbfwv1j7z53"; depends=[BiocGenerics]; };
 diffGeneAnalysis = derive { name="diffGeneAnalysis"; version="1.51.0"; sha256="1k5as63cd87nnigc0yzaxvhskpnbr7l1ym2bqc57zsm3bwh8xxwb"; depends=[minpack_lm]; };
-diffHic = derive { name="diffHic"; version="1.1.7"; sha256="1h6qlvk7bbdfi0lg86kbd4milp3imgkq79w73gf1am4knpplks1g"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges IRanges limma locfit rhdf5 Rsamtools S4Vectors]; };
+diffHic = derive { name="diffHic"; version="1.1.9"; sha256="0azagkb87v2lxmb5bvjqc9bz8pqnn1a9j3p5r4v8izpqwq23hf75"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges IRanges limma locfit rhdf5 Rsamtools S4Vectors]; };
 diggit = derive { name="diggit"; version="1.1.1"; sha256="0c3zy1d9bzb6asa4clgq738h7dj6md55gclwa244qyx857b58rqv"; depends=[Biobase ks viper]; };
 dks = derive { name="dks"; version="1.15.0"; sha256="1d66jfca6q8ni5vz5zh7fmxwh3y0yvl2p7gal7w55py6wvyssnl3"; depends=[cubature]; };
 domainsignatures = derive { name="domainsignatures"; version="1.29.0"; sha256="1wkypbm5ldwx8y2n16fajf450pwv6zipjdk0176a5rqihaflz80l"; depends=[AnnotationDbi biomaRt prada]; };
 dualKS = derive { name="dualKS"; version="1.29.0"; sha256="1a2wb137x98nmdm8dvnl4msl89mlyvm8f1kqzr6jhdj4wjv2hrg1"; depends=[affy Biobase]; };
 dyebias = derive { name="dyebias"; version="1.27.0"; sha256="095qcnri2g19m363ipdi31xgn20b51mbfv5mgkk21m6fww1npc92"; depends=[Biobase marray]; };
-easyRNASeq = derive { name="easyRNASeq"; version="2.5.2"; sha256="142chhn3p8c22vm9mky2mx32s6d09by99fmrck87nglg0w8l2n9j"; depends=[Biobase BiocGenerics biomaRt Biostrings DESeq edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD Rsamtools S4Vectors ShortRead SummarizedExperiment]; };
+easyRNASeq = derive { name="easyRNASeq"; version="2.5.5"; sha256="0g2n3ayl06bn8khf5pail119i1611nq71vvqfkdh0v30nj9rsbw2"; depends=[Biobase BiocGenerics BiocParallel biomaRt Biostrings DESeq edgeR GenomeInfoDb genomeIntervals GenomicAlignments GenomicRanges IRanges locfit LSD Rsamtools S4Vectors ShortRead SummarizedExperiment]; };
 ecolitk = derive { name="ecolitk"; version="1.41.0"; sha256="0jga35q98bidqjlqynq0cack4gwsm3hw34vgns67v37krjs4hn9f"; depends=[Biobase]; };
 edge = derive { name="edge"; version="2.1.0"; sha256="1xxz8qyagrfr92ldaxlgb8dfpm6nx3lyk6fa4dl0m8yvlr6lw2fa"; depends=[Biobase MASS qvalue snm sva]; };
 edgeR = derive { name="edgeR"; version="3.11.2"; sha256="0df181xjga322phjinlffl0j2mg61pq4p8h3sxx3xz100c6xrahr"; depends=[limma]; };
 eiR = derive { name="eiR"; version="1.9.1"; sha256="01wkz9lc6gi1a98q02c6zyzfsnkk52px60xg3lawp2419dvj2ww3"; depends=[BH BiocGenerics ChemmineR DBI digest RCurl RUnit snow snowfall]; };
 eisa = derive { name="eisa"; version="1.21.0"; sha256="03366q5qj4wdfm4d9lwysmgz3bgwc53zynw2cmsj7w3yg6dj63km"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; };
 ensemblVEP = derive { name="ensemblVEP"; version="1.9.2"; sha256="10xjxafm97jnk7dfi0j1ahyd6hp45r5rpfr206fbiipcq3ha2p9h"; depends=[BiocGenerics Biostrings GenomicRanges VariantAnnotation]; };
-ensembldb = derive { name="ensembldb"; version="1.1.3"; sha256="1vp4bb3i5jw8kmxz1784wxwh2i9m344xhssfv5w4i2k9lx2anqrs"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics DBI GenomeInfoDb GenomicFeatures GenomicRanges Rsamtools RSQLite rtracklayer S4Vectors]; };
-epigenomix = derive { name="epigenomix"; version="1.9.1"; sha256="0jr0ly6sd818yhcpqk685y7fb4q8dd80w18qpwpypgf4ysymv36y"; depends=[beadarray Biobase BiocGenerics GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
-epivizr = derive { name="epivizr"; version="1.7.7"; sha256="00hjvpg6vr0kd1nhyr3dfjqyxy8jfgfkv0lainj48w7lr9ld7y9w"; depends=[Biobase GenomeInfoDb GenomicFeatures GenomicRanges httpuv mime OrganismDbi R6 rjson rtracklayer S4Vectors SummarizedExperiment]; };
-erccdashboard = derive { name="erccdashboard"; version="1.3.0"; sha256="06jvrlp0sfnkrcmyach1q0ry4pzyv2frzg4c0swr193vxv4mx14w"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr QuasiSeq qvalue reshape2 ROCR scales stringr]; };
+ensembldb = derive { name="ensembldb"; version="1.1.5"; sha256="1q32pcg07lgzzavcgx5843ljchklgbscw0qgifrs6d1hidbldjvq"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics DBI GenomeInfoDb GenomicFeatures GenomicRanges Rsamtools RSQLite rtracklayer S4Vectors]; };
+epigenomix = derive { name="epigenomix"; version="1.9.2"; sha256="0l7pa2nyllf7imapbxqavyg3h0ba3wc1bhrhz7a7bc8rr8qyq0w1"; depends=[beadarray Biobase BiocGenerics GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
+epivizr = derive { name="epivizr"; version="1.7.8"; sha256="01z80dbahjbf60d71hiqai5h5i546hvl2j737b4xjca9017g2wsg"; depends=[Biobase GenomeInfoDb GenomicFeatures GenomicRanges httpuv mime OrganismDbi R6 rjson rtracklayer S4Vectors SummarizedExperiment]; };
+erccdashboard = derive { name="erccdashboard"; version="1.3.1"; sha256="10ya8gzd9z3b7kwm9yf7v1cbxpqi1r7ghxwy1sg6b646gf3g580v"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr QuasiSeq qvalue reshape2 ROCR scales stringr]; };
+erma = derive { name="erma"; version="0.1.2"; sha256="046m88bjfkv8xkmz8il6l0zbp0wcr7n6wvsv2lavcyl09qnjghs0"; depends=[BiocGenerics GenomicFiles GenomicRanges ggplot2 rtracklayer S4Vectors]; };
 exomeCopy = derive { name="exomeCopy"; version="1.15.0"; sha256="1047k3whc8pjcrvb10dmykbc3c7ah4fgzsiqxw7asp4ksiqpj5ii"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; };
-exomePeak = derive { name="exomePeak"; version="1.9.0"; sha256="05bdwp8msi9i0hi505pwm4lxa8m0syrws934418sgfhfldlh5sip"; depends=[GenomicFeatures Rsamtools rtracklayer]; };
+exomePeak = derive { name="exomePeak"; version="1.9.1"; sha256="1lvzr8zsa61vj5qhd4yh9n8vmfw759b8gbpp6q9yxz1py1ky16y6"; depends=[GenomicAlignments GenomicFeatures Rsamtools rtracklayer]; };
 explorase = derive { name="explorase"; version="1.33.0"; sha256="0405q21ivvchmb37jksv46kwxgbmyiavznizn39asv6wrsvw62az"; depends=[limma rggobi RGtk2]; };
+fCI = derive { name="fCI"; version="0.99.10"; sha256="1gknc8pqznxkgdgc403s59xl6x9s8cdb5iql0q88kk8jcqc2fgyl"; depends=[FNN gtools psych rgl VennDiagram zoo]; };
 fabia = derive { name="fabia"; version="2.15.0"; sha256="1631f6q30cxzaw7vqjacr44hwzrjbvk0sw3v41zagpbqbbr11swx"; depends=[Biobase]; };
 facopy = derive { name="facopy"; version="1.3.0"; sha256="0nm7jds5c4p471qyzv61byl61frwnf71kkvcdrc876168bd6s9y3"; depends=[annotate cgdsr coin data_table DOSE FactoMineR ggplot2 GOstats graphite gridExtra igraph IRanges MASS nnet reshape2 Rgraphviz scales]; };
 factDesign = derive { name="factDesign"; version="1.45.0"; sha256="08d7ma718s8rdbmk00jdbwn9d1g431iaff7hc4ra421drl95yql1"; depends=[Biobase]; };
@@ -668,7 +676,7 @@ fastseg = derive { name="fastseg"; version="1.15.0"; sha256="12a308lr292nisf0k0w
 fdrame = derive { name="fdrame"; version="1.41.0"; sha256="1zmspa2mm7scv5lx83171hdn48y9vify58jcr6nxw15nj4lqbmsd"; depends=[]; };
 ffpe = derive { name="ffpe"; version="1.13.0"; sha256="0444g47cg6ci1lflmz84vjms0p918iaz65cm6whxx4z3pfjc55ls"; depends=[affy Biobase BiocGenerics lumi methylumi sfsmisc TTR]; };
 flagme = derive { name="flagme"; version="1.25.0"; sha256="0jj8rba2ggimwm709m2c78rpccvp9q8hx83c026pgmrryjv8qbzc"; depends=[CAMERA gplots MASS SparseM xcms]; };
-flipflop = derive { name="flipflop"; version="1.7.2"; sha256="0clwqz14lxg9m4jasjwksvs0afhv9rna2p8h91rgip5d3nhmjsp5"; depends=[GenomicRanges IRanges Matrix]; };
+flipflop = derive { name="flipflop"; version="1.7.3"; sha256="0731qxr479y1acarxd16m0bdy3q0qwgbyrlvp20dvyqs4b5qfj56"; depends=[GenomicRanges IRanges Matrix]; };
 flowBeads = derive { name="flowBeads"; version="1.7.0"; sha256="1knzfj14hwggvc41bba2chrjnl709bh2wxwv268mw18crc1gs140"; depends=[Biobase flowCore knitr rrcov xtable]; };
 flowBin = derive { name="flowBin"; version="1.5.0"; sha256="1728qzxpssh44ayk5bgjwdwzb98xalzciq7pzlcwg1yqgyxz81xv"; depends=[BiocGenerics class flowCore flowFP limma snow]; };
 flowCHIC = derive { name="flowCHIC"; version="1.3.0"; sha256="1g6kkmcja3am6dawdkmhyz9pl9xqivnp95zqxh8vd3a4la0ysazb"; depends=[EBImage flowCore ggplot2 hexbin vegan]; };
@@ -682,7 +690,7 @@ flowFP = derive { name="flowFP"; version="1.27.0"; sha256="15n57slfn0z4vzqhk38mf
 flowFit = derive { name="flowFit"; version="1.7.0"; sha256="079ygak8ysjh44l3gmvlc89x4argw15mlq380j77n19d3wqai8r9"; depends=[flowCore flowViz gplots kza minpack_lm]; };
 flowMap = derive { name="flowMap"; version="1.7.0"; sha256="030dv51xwskrc97kkm72wxbfsq1qj4fy9nknvxaydn3y1r2wakcs"; depends=[abind ade4 doParallel Matrix reshape2 scales]; };
 flowMatch = derive { name="flowMatch"; version="1.5.0"; sha256="1b81aik86m4y8n8khz7kxy2ibky7i06s9jzm4pydh41ypv6h0wv9"; depends=[Biobase flowCore Rcpp]; };
-flowMeans = derive { name="flowMeans"; version="1.23.0"; sha256="0y7dkfz0wjgmyjvsvqcqb9m59xq8bzd8bcp06dd6pgvb33aqlqr4"; depends=[Biobase feature flowCore rrcov]; };
+flowMeans = derive { name="flowMeans"; version="1.28.0"; sha256="038flcv69xn1yiflzl336xfjm93ca6ksgx55aj01inrnf6ks2696"; depends=[Biobase feature flowCore rrcov]; };
 flowMerge = derive { name="flowMerge"; version="2.17.0"; sha256="1sc7xqp4vkgc84by4vmbj0iy0vsrwadglwxbziigjai0ijsgrvfn"; depends=[feature flowClust flowCore foreach graph Rgraphviz rrcov snow]; };
 flowPeaks = derive { name="flowPeaks"; version="1.11.0"; sha256="0ib9mgfq8lmakw2g0hj0dc75ifllpf5s9yfpkq3p5f6qqa8gncqw"; depends=[]; };
 flowPlots = derive { name="flowPlots"; version="1.17.0"; sha256="1y4g2kjdha6qn79cyb9mxkkj33wd2jndrpnpd1p0x1pvnjlyxhas"; depends=[]; };
@@ -694,7 +702,7 @@ flowType = derive { name="flowType"; version="2.7.0"; sha256="0zrwf7h62jd5xgs0kq
 flowUtils = derive { name="flowUtils"; version="1.33.0"; sha256="0r7l8fbi3p1y7ql60czlqhxx4l0fzxv50phwkr5w85jxxldk2pjm"; depends=[Biobase corpcor flowCore flowViz graph RUnit XML]; };
 flowVS = derive { name="flowVS"; version="1.1.0"; sha256="0g1zmcr1wd3xccx2z1akwk177innzrngmxc5r4hjanl37l0skrpq"; depends=[flowCore flowStats flowViz]; };
 flowViz = derive { name="flowViz"; version="1.33.2"; sha256="11qbpf0yw1gjzgw3pb7mnqfvwd60nms4cwrwag8h36a5whfd158c"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; };
-flowWorkspace = derive { name="flowWorkspace"; version="3.15.6"; sha256="111a5kvcz3hyw7269fg6b0885g63f8r02dkzfidfcq2pg4n2sa8w"; depends=[BH Biobase BiocGenerics data_table flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow plyr RBGL RColorBrewer Rcpp Rgraphviz stringr XML]; };
+flowWorkspace = derive { name="flowWorkspace"; version="3.15.12"; sha256="1fw5xg93x92acg2vimp6ks9sxqkqc4vbkghvj4shagnck2zjs0dw"; depends=[BH Biobase BiocGenerics data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow plyr RBGL RColorBrewer Rcpp Rgraphviz stringr XML]; };
 flowcatchR = derive { name="flowcatchR"; version="1.3.0"; sha256="0zgbnfh3sq6s8y81al379lrif67w5xffc6n3fd5y8bp2wmdqmx8b"; depends=[abind BiocParallel colorRamps EBImage rgl]; };
 fmcsR = derive { name="fmcsR"; version="1.11.4"; sha256="1ah1gyrhcyv4kqxi4n8yj14mgjh6v9l820k5hzb7fwbw74kh2pa5"; depends=[BiocGenerics ChemmineR RUnit]; };
 focalCall = derive { name="focalCall"; version="1.3.0"; sha256="1g3vk72xnzy2vsjjq7dnmmxiy29qg2bqij1iim9psb2zd6w387r5"; depends=[CGHcall]; };
@@ -710,7 +718,7 @@ gaggle = derive { name="gaggle"; version="1.37.0"; sha256="1429xffj08m3dgfp6z34n
 gaia = derive { name="gaia"; version="2.13.0"; sha256="10vpz16plzi651aj1f5h3iwz6nzrrdnl9sgx3sgv5wmks2haqij4"; depends=[]; };
 gaucho = derive { name="gaucho"; version="1.5.0"; sha256="0kl8fw1n6dkqmrjp0xri3w2fhx25llrjag7j50m2xh371zfw9chc"; depends=[GA graph heatmap_plus png Rgraphviz]; };
 gcrma = derive { name="gcrma"; version="2.41.0"; sha256="03ncgd26hmj4l0mnnif1cf5qg99ir66d0mafx7wamrr930m17v8x"; depends=[affy affyio Biobase BiocInstaller Biostrings XVector]; };
-gdsfmt = derive { name="gdsfmt"; version="1.5.1"; sha256="04pp9lw0548243k6almy4ckwv7sd805b7kkp87dq3z087h7287s7"; depends=[]; };
+gdsfmt = derive { name="gdsfmt"; version="1.5.6"; sha256="0xncblhsfzwzxmki0mir6khpjb4d5sjc452br8jq0hp9khl9j937"; depends=[]; };
 geNetClassifier = derive { name="geNetClassifier"; version="1.9.2"; sha256="04k1j2hqbs75k250i8b17bb8b84mij0hyb3yk1jl1368mpn5vmhc"; depends=[Biobase e1071 EBarrays minet]; };
 geecc = derive { name="geecc"; version="1.3.0"; sha256="0s955yg31papyny42nnqq711hawk5nn3dqgsf24ldz93vjiif9dr"; depends=[gplots hypergea MASS]; };
 genArise = derive { name="genArise"; version="1.45.0"; sha256="07xyy6wa22sa0ziqvy1dvpmpq11j56aw70kvj834da003yvabmg1"; depends=[locfit tkrplot xtable]; };
@@ -720,8 +728,8 @@ genefilter = derive { name="genefilter"; version="1.51.0"; sha256="0zrav2zw7v67i
 genefu = derive { name="genefu"; version="1.19.0"; sha256="05rzq0dy4v7z57zqdg9v2csj3ncv2n76igbz2a9nvjpmqrgfcqlc"; depends=[amap biomaRt mclust survcomp]; };
 geneplotter = derive { name="geneplotter"; version="1.47.0"; sha256="03vl60rhhfh8imp0ihx83gq9r64gdnh2gjdm7pzi4yc03afqgaw8"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; };
 genoCN = derive { name="genoCN"; version="1.21.0"; sha256="10q16kch3gn6phx1zk3aii87f4liy5l6mp0kvjf29x6aam11l7c7"; depends=[]; };
-genomation = derive { name="genomation"; version="1.1.4"; sha256="1217xm5rqngag4r2r95z7wxwmdlassghwkxqpljqnangix4c0h96"; depends=[GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges plyr readr reshape2 Rsamtools rtracklayer]; };
-genomeIntervals = derive { name="genomeIntervals"; version="1.25.0"; sha256="1dy71hdqw02kv5rqa80w4bfbn247hj6fqqsc12qimk3l60z38rpr"; depends=[BiocGenerics intervals]; };
+genomation = derive { name="genomation"; version="1.1.5"; sha256="0x4pgs7g46giv6z92hqa0fgq3fbw5p2jm5h8qzbwsvir3y7fnf79"; depends=[GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges plyr readr reshape2 Rsamtools rtracklayer]; };
+genomeIntervals = derive { name="genomeIntervals"; version="1.25.2"; sha256="145xg7pjihfg6qmjfmswf33hkxsnq8ml02x6s6y90giyxlmjqisk"; depends=[BiocGenerics GenomeInfoDb GenomicRanges intervals IRanges S4Vectors]; };
 genomes = derive { name="genomes"; version="2.15.0"; sha256="1a172fz97b6xg4w91dcjbdr9kx0grzf71qn2j7zlyz52dcqppybb"; depends=[Biostrings GenomicRanges IRanges RCurl XML]; };
 genoset = derive { name="genoset"; version="1.23.2"; sha256="0j23ym7v47fv2f2j25hfc4xh1113614ixdd1accx9gindbqf72cl"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
 gespeR = derive { name="gespeR"; version="1.1.0"; sha256="0hp2pw4z5kgj4av339v7r43is082c47ms422pwwa5f2pljijz2z6"; depends=[Biobase biomaRt cellHTS2 doParallel foreach ggplot2 glmnet Matrix reshape2]; };
@@ -736,17 +744,17 @@ goseq = derive { name="goseq"; version="1.21.1"; sha256="175xg4qyy2iq9vmxsvd120q
 gpls = derive { name="gpls"; version="1.41.0"; sha256="050db8ag8wpngfkw686r9vjvdgbpz0slrdnmkb0vcm5ijzm172b2"; depends=[]; };
 gprege = derive { name="gprege"; version="1.13.0"; sha256="0z27521mjn5ipjq8wi3fbh2qw4k1q694l8268f8lypr9f357i1q4"; depends=[gptk]; };
 graph = derive { name="graph"; version="1.47.2"; sha256="0db15kd5qf993qdbr7dl2wbw6bgyg3kiqvd1iziqdq6d2vvbpzbj"; depends=[BiocGenerics]; };
-graphite = derive { name="graphite"; version="1.15.0"; sha256="1nzyrc3cwy35m7ijr5pjanvw868yw2d7sl9h3ns8w70af8ih6z14"; depends=[AnnotationDbi BiocGenerics graph]; };
+graphite = derive { name="graphite"; version="1.15.1"; sha256="1q3ybshd9yxivs1b5vj659c45qa8bf7r1dy3idg8g7glh9f2bgnl"; depends=[AnnotationDbi BiocGenerics graph]; };
 groHMM = derive { name="groHMM"; version="1.3.0"; sha256="0kx574xs0k51wwkvm6rbrrgr76ziwkkyqhiy076yzfsfkm3d1jvf"; depends=[GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; };
-gtrellis = derive { name="gtrellis"; version="1.1.0"; sha256="0cr4p22h0xh18pbr1jnz9dr6nv1q5a2bnx4nq5pz9jnn70lg7384"; depends=[circlize GetoptLong]; };
-gwascat = derive { name="gwascat"; version="2.1.3"; sha256="0wjl53zfrn6adwlfrqxj3nqndg753pi03dsm7xxjv7x2rkx1z1k8"; depends=[AnnotationHub BiocGenerics Biostrings GenomeInfoDb GenomicRanges gQTLstats Gviz IRanges Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; };
+gtrellis = derive { name="gtrellis"; version="1.1.1"; sha256="17jflcq97a3a7k735klj6pphn6ixyshggwi0n7b45jgkqi9j5s08"; depends=[circlize GetoptLong]; };
+gwascat = derive { name="gwascat"; version="2.1.4"; sha256="13hvh6rvlh13n9dxx9g1q68qz4mxsvv4sh0kc1931b3vz2mfs0m0"; depends=[AnnotationHub BiocGenerics Biostrings GenomeInfoDb GenomicRanges gQTLstats Gviz IRanges Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; };
 h5vc = derive { name="h5vc"; version="2.3.0"; sha256="1cl00k13x03sm60gfkxmaf6ba9kw4186cnik08zn446fipxqypla"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges reshape rhdf5 Rsamtools S4Vectors]; };
 hapFabia = derive { name="hapFabia"; version="1.11.0"; sha256="1jbj1bxqmvldpbbyq6d854srvzsr14jva1711zn4387b407knz7w"; depends=[Biobase fabia]; };
 hiAnnotator = derive { name="hiAnnotator"; version="1.3.2"; sha256="104d6wp331dvsdk5p9l7m70xr9jrwx0nzlrapi95c0p1nr3wr7bl"; depends=[BSgenome dplyr foreach GenomicRanges ggplot2 iterators rtracklayer scales]; };
 hiReadsProcessor = derive { name="hiReadsProcessor"; version="1.3.0"; sha256="16gcjaiw8j82y5wzcbhh3yjym8xi4dqsf30i64ah6rb30i3bk716"; depends=[BiocGenerics BiocParallel Biostrings GenomicAlignments GenomicRanges hiAnnotator plyr rSFFreader sonicLength xlsx]; };
-hierGWAS = derive { name="hierGWAS"; version="0.99.2"; sha256="1i3ykpslp79y1v156bja971z3g3v1yb7bb2w26gv1p1kd8f57s6d"; depends=[fastcluster fmsb glmnet hlr]; };
+hierGWAS = derive { name="hierGWAS"; version="0.99.2"; sha256="1i3ykpslp79y1v156bja971z3g3v1yb7bb2w26gv1p1kd8f57s6d"; depends=[fastcluster fmsb glmnet]; };
 hopach = derive { name="hopach"; version="2.29.0"; sha256="08hfq74s3a4q94awhw6fiwlfnnv3rhkfpz56jbcyp6bi6y1rrp9d"; depends=[Biobase BiocGenerics cluster]; };
-hpar = derive { name="hpar"; version="1.11.0"; sha256="025hdmb70h2zf4g06spfdm09ni3i4qc21c2hp0mjdp3b2y2f9g9r"; depends=[]; };
+hpar = derive { name="hpar"; version="1.11.1"; sha256="1a00li932y6bgv9a9avpbyxm7h6fxjfgj3gazf0kh1zc5w0r2r1g"; depends=[]; };
 htSeqTools = derive { name="htSeqTools"; version="1.15.1"; sha256="0pv6csw7bgknjm0q42hrf3x22bx3xs0xm9hq9i46plwglq6c8kvn"; depends=[Biobase BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges MASS]; };
 hyperdraw = derive { name="hyperdraw"; version="1.21.0"; sha256="0w1rcaw5fysj257c8ybcvmrdayvkcmfl670ysg2wcp8nrgv6z7vg"; depends=[graph hypergraph Rgraphviz]; };
 hypergraph = derive { name="hypergraph"; version="1.41.0"; sha256="06fvmda8x81bv5bn21pmvpfx9ni01l23q1ph9rh3qj803mwa0d72"; depends=[graph]; };
@@ -766,7 +774,7 @@ impute = derive { name="impute"; version="1.43.0"; sha256="1wp02zd2vgpkalz830kah
 inSilicoDb = derive { name="inSilicoDb"; version="2.5.0"; sha256="1w5irx042z8if0pnvw9ra4a0hm0m1nbc2s9l2j59ww9l2qhj8hiq"; depends=[Biobase RCurl rjson]; };
 inSilicoMerging = derive { name="inSilicoMerging"; version="1.13.0"; sha256="0zaqwachxn3anbjyn0akv0n2djg08475cdxz7c44ja635r1f6y1j"; depends=[Biobase]; };
 intansv = derive { name="intansv"; version="1.9.0"; sha256="0vb5hls1yyw0x0ff2xcjmxplg0gar9g9xvs1bqw96bf9akcr12r9"; depends=[BiocGenerics GenomicRanges ggbio IRanges plyr]; };
-interactiveDisplay = derive { name="interactiveDisplay"; version="1.7.1"; sha256="0xqghsy7s7m2xkngsqjzxrfvs7jy2bqprvx4qm2a8d24q392abs0"; depends=[AnnotationDbi BiocGenerics Category ggplot2 gridSVG interactiveDisplayBase plyr RColorBrewer reshape2 shiny XML]; };
+interactiveDisplay = derive { name="interactiveDisplay"; version="1.7.2"; sha256="1ql4qr5m1xsn3z57p2ndfc4b0zmxgjj0d3gb937ikfljm43jkwyk"; depends=[AnnotationDbi BiocGenerics Category ggplot2 gridSVG interactiveDisplayBase plyr RColorBrewer reshape2 shiny XML]; };
 interactiveDisplayBase = derive { name="interactiveDisplayBase"; version="1.7.0"; sha256="0032ljfx6pj0c11imfhxsxvrcn3gwyb6j29xl8xv48x8z44r0vas"; depends=[BiocGenerics shiny]; };
 inveRsion = derive { name="inveRsion"; version="1.17.0"; sha256="1km1h75dh5q505x1ddlhvyqxy4c10wvlviiz2l8sv3g3m9mbd26h"; depends=[haplo_stats]; };
 iontree = derive { name="iontree"; version="1.15.0"; sha256="0frq4f357n5w08nwz3m7s0hv858kgcnlvxb4907yrg1b11zpfvmm"; depends=[rJava RSQLite XML]; };
@@ -779,14 +787,14 @@ kebabs = derive { name="kebabs"; version="1.3.3"; sha256="10pnr5fd2ni4w69qp30q81
 keggorthology = derive { name="keggorthology"; version="2.21.0"; sha256="1d3dz61llgmdnyqxqwv03pacfs97lzynzpjpmn7grf7bbpybjk2q"; depends=[AnnotationDbi DBI graph]; };
 lapmix = derive { name="lapmix"; version="1.35.0"; sha256="1sps41l210h782bry6n8h55ghnlqn7s5dx0bx2805y5izz01linm"; depends=[Biobase]; };
 les = derive { name="les"; version="1.19.0"; sha256="1b3zcvflwyybrh9pf33a0fn5qz6918sszjf0n666iqd3hh7zph8z"; depends=[boot fdrtool gplots RColorBrewer]; };
-limma = derive { name="limma"; version="3.25.9"; sha256="19kzyja25bchvcnbl8g2xfzi1rypja44312g94qssiyanlw1i2bp"; depends=[]; };
+limma = derive { name="limma"; version="3.25.12"; sha256="1gl13qnbj4w2bzdxf1ml603r1ccyq0wv1ynlrgb8j9sa7z228ri9"; depends=[]; };
 limmaGUI = derive { name="limmaGUI"; version="1.45.0"; sha256="05pqzb5nq3paddq2zw80gvdaf8rvynga8zs24rwzjpz3ylakqngr"; depends=[AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
 lmdme = derive { name="lmdme"; version="1.11.0"; sha256="0j41rfvbhz31vniax7njnslxd94lws4jjfv3hc2s1ihxnj41dcma"; depends=[limma pls]; };
 logicFS = derive { name="logicFS"; version="1.39.0"; sha256="1sz4bxsg76437j42i6cpbqvj5a35q7dwhya4yh1gmknqjrrcrv56"; depends=[LogicReg mcbiopi]; };
 logitT = derive { name="logitT"; version="1.27.0"; sha256="13gglwkvwrc5xr44ynz10qzyksry0wamk9mjlsfb18c2ncbnyypq"; depends=[affy]; };
 lol = derive { name="lol"; version="1.17.1"; sha256="0adj2bg8akb3z0w3wqj6bdlypf9c587k5c2npx0l21hgy4qv7p8k"; depends=[Matrix penalized]; };
-lpNet = derive { name="lpNet"; version="2.1.1"; sha256="15v3mpxrm1qq3hnwwnahziafpy83b35i69qyggdvzszwg1cpn5vi"; depends=[lpSolve nem]; };
-lumi = derive { name="lumi"; version="2.21.1"; sha256="16cg8zsfvw4fc51zr27ymp7a0qc59y0cvp2j7bsfw6ip0avmgkgk"; depends=[affy annotate AnnotationDbi Biobase DBI GenomicFeatures GenomicRanges KernSmooth lattice MASS methylumi mgcv nleqslv preprocessCore RSQLite]; };
+lpNet = derive { name="lpNet"; version="2.1.2"; sha256="0qy2ardh00gf3xkhqphvmdsnsxa4pjrdpcxpjs53nw68bcsbgy9g"; depends=[lpSolve nem]; };
+lumi = derive { name="lumi"; version="2.21.2"; sha256="0nfkzf11lnpvyqng8ns6nf23qkap04fir8cbqngnzm6yddfk33dq"; depends=[affy annotate AnnotationDbi Biobase DBI GenomicFeatures GenomicRanges KernSmooth lattice MASS methylumi mgcv nleqslv preprocessCore RSQLite]; };
 mAPKL = derive { name="mAPKL"; version="1.1.0"; sha256="1knjvwd0z4i70py0dqcngz56j78ylhcxsw8dyxj80ns5jzsdppbx"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene]; };
 mBPCR = derive { name="mBPCR"; version="1.23.0"; sha256="0c0idj213l8gwxkh9sb03dr4jhlbwvkpghldccbjrqnk4jqs4zpp"; depends=[Biobase oligoClasses SNPchip]; };
 mQTL_NMR = derive { name="mQTL.NMR"; version="1.3.0"; sha256="05q3p6pxi5x89z3zyrvdv5p2lzwr3as3zwcg8k0zm70liyczqcbx"; depends=[GenABEL MASS outliers qtl]; };
@@ -819,16 +827,16 @@ metaseqR = derive { name="metaseqR"; version="1.9.0"; sha256="0p8bpnjm73jkng2xry
 methVisual = derive { name="methVisual"; version="1.21.0"; sha256="18kin1ibcc4ilfh59qgb0zilhvhvs0a1gmbg0lbvj2r0kbsk1ryy"; depends=[Biostrings ca gridBase gsubfn IRanges plotrix sqldf]; };
 methyAnalysis = derive { name="methyAnalysis"; version="1.11.0"; sha256="0ka0svxvb76j0xkdx4pbwf2cyplihh45mb953csrapyh5r6hxwkn"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt genefilter GenomeInfoDb GenomicFeatures GenomicRanges genoset Gviz IRanges lumi methylumi rtracklayer S4Vectors VariantAnnotation]; };
 methylMnM = derive { name="methylMnM"; version="1.7.0"; sha256="08y13kkmafn2h55wwkgs1mpskb4i2wpxzzgjdr9gb3ns06qc9799"; depends=[edgeR statmod]; };
-methylPipe = derive { name="methylPipe"; version="1.3.3"; sha256="1skds6ac2s2grb3s5ay0b6j91qmpag8cmqqh0plnqjvh5zdsi733"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; };
-methylumi = derive { name="methylumi"; version="2.15.1"; sha256="02bgqja3zzd3ps8a2r6k9whdvnzi4h44vjmrjgqljmmr40pspqqw"; depends=[annotate AnnotationDbi Biobase BiocGenerics genefilter GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; };
+methylPipe = derive { name="methylPipe"; version="1.3.4"; sha256="17y9xsvl6wgm7kn8g35h3zh7bcqhy7qp2lia6dzx609i04a9br9f"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; };
+methylumi = derive { name="methylumi"; version="2.15.2"; sha256="174hikk5flwylifv7n8n67aps4np06klw240bdzfr347r8yrvikp"; depends=[annotate AnnotationDbi Biobase BiocGenerics genefilter GenomeInfoDb GenomicRanges ggplot2 illuminaio IRanges lattice matrixStats minfi reshape2 S4Vectors scales SummarizedExperiment]; };
 mgsa = derive { name="mgsa"; version="1.17.0"; sha256="1nic4bgk3g3j2l6vr3i3msmid2bz0n7bq8f8zq26n45sr37wb4wq"; depends=[gplots]; };
 miRNApath = derive { name="miRNApath"; version="1.29.0"; sha256="07r37gzn0y5cp4awj2i638i2cn019rnp7b4hnaqi3gc71sdzb25c"; depends=[]; };
 miRNAtap = derive { name="miRNAtap"; version="1.3.0"; sha256="0hmnhbbai04wp8hxrpgq04czfx2c49aihq7iiz86x9hzlj6xhgn6"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; };
 microRNA = derive { name="microRNA"; version="1.27.0"; sha256="1akq1yxc03v7jmpypmr8a9lx5h2nfdjp1y0433lyffbd49wia2gm"; depends=[Biostrings]; };
 minet = derive { name="minet"; version="3.27.0"; sha256="1wnn3nlpa0ymk465ax2s65i3w9xplhwssvng9qs7p3v2z72p9nqp"; depends=[infotheo]; };
-minfi = derive { name="minfi"; version="1.15.7"; sha256="09v8flkn0ja1q9glzfa5bsaflvx7w240w38fp59dgknz4xr1zp3r"; 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]; };
+minfi = derive { name="minfi"; version="1.15.9"; sha256="1q21b57iw8lbzbjq96qmlmccijz0apr9clasrz4nbmbgyn97gba2"; 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 = derive { name="mirIntegrator"; version="0.99.5"; sha256="0r8l1lgf9rdxnr0dvc8r05ahjf3q0r4syy9mzx4p3f04s0c78q3h"; depends=[AnnotationDbi ggplot2 graph Rgraphviz ROntoTools]; };
-missMethyl = derive { name="missMethyl"; version="1.3.1"; sha256="07l7jnw5ixlhhphrxhalkh50swc8jr4pfkgvzf33hiid4g9jkqsk"; depends=[limma methylumi minfi ruv statmod stringr]; };
+missMethyl = derive { name="missMethyl"; version="1.3.2"; sha256="05xk70z813jgwz9darqwh0f9ybycq9krig486b3751dd0xnjgmcq"; depends=[limma methylumi minfi ruv statmod stringr]; };
 mitoODE = derive { name="mitoODE"; version="1.7.0"; sha256="182ifqh1g1yz8rbsxdqgk4hzlz3dwy0d03iklbg39cxy6qhgxqg4"; depends=[KernSmooth MASS minpack_lm]; };
 mmnet = derive { name="mmnet"; version="1.7.0"; sha256="0za8a3j2fzyi15hd7l3ccw5qy3lyl7vihbcbixaw2kb81hmpphsa"; depends=[Biobase biom flexmix ggplot2 igraph KEGGREST Matrix plyr RCurl reshape2 RJSONIO stringr XML]; };
 mogsa = derive { name="mogsa"; version="1.1.3"; sha256="0rzqlm0c4skjgic334nfd2s7p0xk86mv1zbwjk036nwf5lnmdd0i"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; };
@@ -841,11 +849,11 @@ msmsEDA = derive { name="msmsEDA"; version="1.7.0"; sha256="1hywj0vvrqq1zg62gr1r
 msmsTests = derive { name="msmsTests"; version="1.7.0"; sha256="1qvi91shpy02irppq6g6lq43sp3rk2j7n1nfnm2p9767rdhbj13b"; depends=[edgeR msmsEDA MSnbase qvalue]; };
 mtbls2 = derive { name="mtbls2"; version="0.99.8"; sha256="0x5slfyn6gq5bhvpi820g93q2xzs8hb3s5yw4inpra0wpdmnvmkz"; depends=[]; };
 multiscan = derive { name="multiscan"; version="1.29.0"; sha256="0rp1nc8vjr8b0v9bcwrnsvdfklan0zc2cilrmwz1ikz0k5gnc0sq"; depends=[Biobase]; };
-multtest = derive { name="multtest"; version="2.25.1"; sha256="07ywm87prs1lyndwdsccswfhfz28ahasalwhn95vdkk50r7d3drf"; depends=[Biobase BiocGenerics MASS survival]; };
+multtest = derive { name="multtest"; version="2.25.2"; sha256="1gby3am0rp62lsijhbr8yx8y457yhrv2ghdb41kl53r59mw8ba4z"; depends=[Biobase BiocGenerics MASS survival]; };
 muscle = derive { name="muscle"; version="3.11.0"; sha256="1s3apdcd0qj08bswn7smj7b93yv9qar7wrzyfkp5z3m16jgz979x"; depends=[Biostrings]; };
 mvGST = derive { name="mvGST"; version="1.3.0"; sha256="1chskyx9hgymxg57p6y98rw743lapssx18axvl0r9f2zsmmfz9bn"; depends=[annotate AnnotationDbi GOstats gProfileR graph Rgraphviz stringr topGO]; };
-mygene = derive { name="mygene"; version="1.4.0"; sha256="1f1nqf2h679z6j9pshc393qygdygs3s4spz2n7iwr56aqkbnccf6"; depends=[GenomicFeatures Hmisc httr jsonlite S4Vectors sqldf]; };
-mzID = derive { name="mzID"; version="1.7.0"; sha256="0gkkyxb7zk0c8ynddxxv7bym2lzpn8yn1ww6xf9bp9ax1zc021wk"; depends=[doParallel foreach iterators plyr XML]; };
+mygene = derive { name="mygene"; version="1.5.1"; sha256="0f1ck375fqbz3ydjjg9qd9av8jbpc840nv3j83qic8g3r2pck8ij"; depends=[GenomicFeatures Hmisc httr jsonlite S4Vectors sqldf]; };
+mzID = derive { name="mzID"; version="1.7.1"; sha256="1pp0zfffz91g16y1kr81mbham64g00mm3q539ykj5az34g5q1fcm"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; };
 mzR = derive { name="mzR"; version="2.3.1"; sha256="19piyqgdxpi777nd4860d6mp0g4zzcf3wf7q7ilm99jqav9lfrn8"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; };
 ncdfFlow = derive { name="ncdfFlow"; version="2.15.2"; sha256="0s65c26r6q8di73iwpkrx4g3d9dy6v18vna7yy7di5vsgy0phr9l"; depends=[BH Biobase flowCore flowViz Rcpp RcppArmadillo zlibbioc]; };
 neaGUI = derive { name="neaGUI"; version="1.7.0"; sha256="198b0vrr5qp66z4sccwy6rh8sjxpw3qjkdryygg1baxq91ra76p1"; depends=[hwriter]; };
@@ -861,14 +869,14 @@ npGSEA = derive { name="npGSEA"; version="1.5.1"; sha256="0yh0cj6sj4r8sqv8xszpzw
 nucleR = derive { name="nucleR"; version="2.1.0"; sha256="0w9hmrahbk14gijv1ngps70m5f9lijbqr1lgpdbrjcqn7ff96yrq"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; };
 nudge = derive { name="nudge"; version="1.35.0"; sha256="1135k3nz8613vrib7fxmn669f31h5k1szy0r20qwmji28806arrk"; depends=[]; };
 occugene = derive { name="occugene"; version="1.29.0"; sha256="1vlm93r8xxp4dl8yv3hcg618vc5s7wbn7kcw4qpk8kyqaqcjqw2r"; depends=[]; };
-oligo = derive { name="oligo"; version="1.33.0"; sha256="0110j0lv1n1m81z3lvyqb5y0zzjda34i5xb5rm0n1s641f5cw82v"; depends=[affxparser affyio Biobase BiocGenerics Biostrings DBI ff oligoClasses preprocessCore RSQLite zlibbioc]; };
+oligo = derive { name="oligo"; version="1.33.1"; sha256="1vi1jy6nb34sg4hhqwirddg1rgm6rhf3mx1fcjq8blfx9mz6nvzb"; depends=[affxparser affyio Biobase BiocGenerics Biostrings DBI ff oligoClasses preprocessCore RSQLite zlibbioc]; };
 oligoClasses = derive { name="oligoClasses"; version="1.31.1"; sha256="0likyfm4xq6s34l9pj7n3my04zrfvrhrcwd1ydbg7jpss2piy4lm"; depends=[affyio Biobase BiocGenerics BiocInstaller Biostrings ff foreach GenomicRanges IRanges RSQLite S4Vectors SummarizedExperiment]; };
 omicade4 = derive { name="omicade4"; version="1.9.3"; sha256="00dr419qd563d75srypc02j6m5v281995mrh0r6fylz5bmi9bbks"; depends=[ade4 made4]; };
 oneChannelGUI = derive { name="oneChannelGUI"; version="1.35.0"; sha256="1diclgl4zkzzyz705cyqx983bw4zqw03rx7fn9515w0ifl0bk1r4"; depends=[affylmGUI Biobase Biostrings chimera IRanges Rsamtools siggenes tkrplot tkWidgets]; };
 ontoCAT = derive { name="ontoCAT"; version="1.21.0"; sha256="10d0a0fxg2h9gf6d1jbilxxg8irbqb1k526689qkdn2zh0qjvv04"; depends=[rJava]; };
-openCyto = derive { name="openCyto"; version="1.7.0"; sha256="11hhgxfwl6z7s6dzvr9bs3px21mwwv0b203snv6xgzan4wh11iyw"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; };
-oposSOM = derive { name="oposSOM"; version="1.5.1"; sha256="055ya0xvld0c7sl0s9cz7zmpw3ayqbskbya730cskzw5nz104lpg"; depends=[ape Biobase biomaRt fastICA fdrtool igraph KernSmooth pixmap scatterplot3d som]; };
-pRoloc = derive { name="pRoloc"; version="1.9.2"; sha256="1q9xaxz8if6ihs5a3ihbk2ayil1fxs8s34ij7gw7sv8hy6pvpm9s"; 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]; };
+openCyto = derive { name="openCyto"; version="1.7.2"; sha256="1x92yam7zdmsf6x0xqydwz70qmh3gzzi64mbiwrihr8abcjmhjhd"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; };
+oposSOM = derive { name="oposSOM"; version="1.5.2"; sha256="0zvclv05sfgk0mq169igaqhqmx2hqj3iwrxrjgryy276xjywhxcr"; depends=[ape Biobase biomaRt fastICA fdrtool igraph KernSmooth pixmap scatterplot3d som]; };
+pRoloc = derive { name="pRoloc"; version="1.9.3"; sha256="09pi362w1vfcx6fsr6bbsjqq9wq93dzhw0myavxsj11g3pnqh66n"; 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 = derive { name="pRolocGUI"; version="1.3.0"; sha256="1k7r8fhj4fqizk1w76mfcdd9sj3y7vxiq3kzfrkbk674gl1jsgmq"; depends=[MSnbase pRoloc shiny]; };
 paircompviz = derive { name="paircompviz"; version="1.7.0"; sha256="0sf80ji20q6kaqw2747an9b51xxwhl55yj5y7q6j68gif1ndkzl4"; depends=[Rgraphviz]; };
 pandaR = derive { name="pandaR"; version="1.1.0"; sha256="03aa0s1mifq5hyg4xshbjqz9javphgb11135zvfg8cqdq34dzg4m"; depends=[]; };
@@ -900,7 +908,7 @@ plier = derive { name="plier"; version="1.39.0"; sha256="0ws919mrm8q719ssmxsxb4m
 plrs = derive { name="plrs"; version="1.9.0"; sha256="1lwnzbq2f75zh191g8zjljajq1qypvi2abzjsq5vfyqr3jnzpah8"; depends=[Biobase BiocGenerics CGHbase ic_infer marray quadprog Rcsdp]; };
 plw = derive { name="plw"; version="1.29.0"; sha256="0rc31452gnzxxz5rwg932i680xx8azdvailn4id6fnkr5xqr1d5a"; depends=[affy MASS]; };
 pmm = derive { name="pmm"; version="1.1.0"; sha256="05vix8j0rpvnyfkdb043d24vrbpdvkjmb8cqpqbg0knja178c8cg"; depends=[lme4]; };
-podkat = derive { name="podkat"; version="1.1.2"; sha256="1jqb55mnys66grhkx9d5yzf4c6x1vb0g0arfibv7ayzlsgw1cwxx"; depends=[Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp Rsamtools]; };
+podkat = derive { name="podkat"; version="1.1.3"; sha256="0q2in4lbd1y421gn0758kv54i5c92hxlhi14pr70n2jbk2izqf4d"; depends=[Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp Rsamtools]; };
 polyester = derive { name="polyester"; version="1.5.0"; sha256="1qpnabv5c7wi1qw8lp3nvnv4dass7g6chz6blyg3k572p0zhzm47"; depends=[Biostrings IRanges limma logspline S4Vectors]; };
 ppiStats = derive { name="ppiStats"; version="1.35.0"; sha256="10c3lnipwnpg0j938c1hxz1qgysc4n56lmsw7n6cra57zkr0whxj"; depends=[Biobase Category graph lattice RColorBrewer ScISI]; };
 prada = derive { name="prada"; version="1.45.0"; sha256="140fv2yrgdf9ab26k14n0l6yd03vidi5y3dn4d1ybkyc66rx8xpa"; depends=[Biobase BiocGenerics MASS RColorBrewer rrcov]; };
@@ -915,7 +923,7 @@ proteoQC = derive { name="proteoQC"; version="1.5.0"; sha256="1khhy7y1w8pyccc3x1
 puma = derive { name="puma"; version="3.11.0"; sha256="1dgi08p70fifsa42gj4jd1651d8laq03fa52qvicsmwkjxxyd83w"; depends=[affy affyio Biobase mclust oligo]; };
 pvac = derive { name="pvac"; version="1.17.0"; sha256="0r9p96lp15883xix9gbr36pcjy7zg8yniag257mps58xagld0162"; depends=[affy Biobase]; };
 pvca = derive { name="pvca"; version="1.9.0"; sha256="1xi72iwarx3784l5hjf7vmwindsz4fbah5g9y2a2fllr5mjh421b"; depends=[Biobase lme4 Matrix vsn]; };
-pwOmics = derive { name="pwOmics"; version="1.1.7"; sha256="1750jxrdb801ipzkr8y2zkgr79bzxxzsnyvcj4jamifljv49gz5c"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics biomaRt data_table GenomicRanges gplots igraph rBiopaxParser STRINGdb]; };
+pwOmics = derive { name="pwOmics"; version="1.1.8"; sha256="0nayswisdia4p4vxnzf5zgcgpld53rfcb3v7yrxyak4adp0d3lqd"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics biomaRt data_table GenomicRanges gplots igraph rBiopaxParser STRINGdb]; };
 qcmetrics = derive { name="qcmetrics"; version="1.7.0"; sha256="1qrhl7w131yzkvck9ifqf966lmh8f9y9xlmrg2g3dgh29vgww54b"; depends=[Biobase knitr Nozzle_R1 pander S4Vectors xtable]; };
 qpcrNorm = derive { name="qpcrNorm"; version="1.27.0"; sha256="0lmk9ksfrrw8zvhq20kg3kv0aqr8wx342nmw7zxvjv7l8z3d33sf"; depends=[affy Biobase limma]; };
 qpgraph = derive { name="qpgraph"; version="2.3.3"; sha256="1ykijxsg8yc3d1k9ip0p0zqrv75l9ps6q7h1naqw9sjhk6nqwf0g"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; };
@@ -933,7 +941,7 @@ rMAT = derive { name="rMAT"; version="3.19.0"; sha256="0nhmf1hbiqwzb9035405f8asn
 rRDP = derive { name="rRDP"; version="1.3.0"; sha256="0q373nfs4ynjnmq9rp0c0ficnnylwb2gf1j0bzlnxcd2cwz215zv"; depends=[Biostrings]; };
 rSFFreader = derive { name="rSFFreader"; version="0.17.1"; sha256="105qlrjq4777k4ps2h7gmr2ywix9skrylhg4ds3dw0pi6n9a4w8n"; depends=[Biostrings IRanges S4Vectors ShortRead XVector]; };
 rTANDEM = derive { name="rTANDEM"; version="1.9.0"; sha256="08r73kv83w8rfglbqf2zvczj4yix7sfhvrz93wk22nry04jfgccr"; depends=[data_table Rcpp XML]; };
-rTRM = derive { name="rTRM"; version="1.7.0"; sha256="0lqzxcgz36dsvqlx218cc9h785vw3czxsq93z388adraw7i0r55x"; depends=[AnnotationDbi igraph RSQLite]; };
+rTRM = derive { name="rTRM"; version="1.7.1"; sha256="06p38i0hif1kjsy4xa88jhfl5giprq8gfa15zh1yv1qdqhaf1v1m"; depends=[AnnotationDbi DBI igraph RSQLite]; };
 rTRMui = derive { name="rTRMui"; version="1.7.0"; sha256="132cm40hxhb4apdidifbw90jyxhlz0dqxgqsr6awv8q6dy9jpfw4"; depends=[MotifDb rTRM shiny]; };
 rain = derive { name="rain"; version="1.3.0"; sha256="0ak8wbhsglnylzy1jzh9hb2yxqjzmspvj98x10vf3qmgbqc30i4y"; depends=[gmp multtest]; };
 rama = derive { name="rama"; version="1.43.0"; sha256="1siqzb0b9j51b06aijz85xn6c9v4dqvcw7scmrlfpf18dihqaig1"; depends=[]; };
@@ -941,27 +949,28 @@ randPack = derive { name="randPack"; version="1.15.0"; sha256="0m9729h3fia15rcgx
 rbsurv = derive { name="rbsurv"; version="2.27.0"; sha256="1v97vrralg445zn8s3km7vmhlxhkv8bdwcj90fyvd6kfk7gm4xc7"; depends=[Biobase survival]; };
 rcellminer = derive { name="rcellminer"; version="1.1.1"; sha256="04ddqp6kxsdhanp7xfifhcvm8hirb915wl15m2qzwx5xy4l97vry"; depends=[Biobase fingerprint gplots rcdk shiny stringr]; };
 reb = derive { name="reb"; version="1.47.0"; sha256="1lxl4mzfz9b7hmq4fd7bsplxmknb8a3ffwdpddik3wry8rpqzmsd"; depends=[Biobase idiogram]; };
-regionReport = derive { name="regionReport"; version="1.3.4"; sha256="0n5l83izk4xr59f1npp1rwhghn4g19yy8wn2h7q2pb4hwdqa3sfd"; depends=[bumphunter derfinder derfinderPlot devtools GenomeInfoDb GenomicRanges ggbio ggplot2 gridExtra IRanges knitcitations knitr knitrBootstrap mgcv RColorBrewer rmarkdown whisker]; };
+regionReport = derive { name="regionReport"; version="1.3.8"; sha256="0gpifx0x2khqacmmxpxps09scdqfm4n0fns2jx0v54iabhswgafj"; depends=[bumphunter derfinder derfinderPlot devtools GenomeInfoDb GenomicRanges ggbio ggplot2 gridExtra IRanges knitcitations knitr knitrBootstrap mgcv RColorBrewer rmarkdown whisker]; };
 regioneR = derive { name="regioneR"; version="1.1.1"; sha256="1wylrkqiv5lc9rw3mc1by88ckx437jwhlgyg5kasvpry003rm72c"; depends=[BSgenome GenomicRanges memoise rtracklayer]; };
 rfPred = derive { name="rfPred"; version="1.7.0"; sha256="0k1z7bqdjmm668kipz8c74kd9k1vw2pcjbirxdi88clrclz3i47y"; depends=[data_table GenomicRanges IRanges Rsamtools]; };
 rgsepd = derive { name="rgsepd"; version="1.1.0"; sha256="1rvzlzh43j3sj2vrhmg13hl4wq3bg9hml3xq2dpx28lapynywm41"; depends=[AnnotationDbi biomaRt DESeq2 GenomicRanges goseq gplots hash]; };
-rhdf5 = derive { name="rhdf5"; version="2.13.1"; sha256="01ldm91wq6klcs2djpy95m5gvspql2b35q51ba9p5017h3brvrqm"; depends=[zlibbioc]; };
+rhdf5 = derive { name="rhdf5"; version="2.13.4"; sha256="0vby0cpsc22jrq37p3sxj6f3q0l238d28lx0p558mh8nks9fkai1"; depends=[zlibbioc]; };
 riboSeqR = derive { name="riboSeqR"; version="1.3.0"; sha256="0jlh5q1hkxkfvy496hlbwfkl17k36n304yiyz9f0azq5kv7jz1y2"; depends=[abind GenomicRanges]; };
 rnaSeqMap = derive { name="rnaSeqMap"; version="2.27.0"; sha256="1638vikgizcgg4bpfm61ak98smwy74dk5hyx73qjbisd49zvy5nk"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; };
-roar = derive { name="roar"; version="1.5.1"; sha256="1r4m95lw27rrdzfxi52llx50i3vm7k7br198k573ycmm6p941fwk"; depends=[GenomicAlignments GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; };
-rols = derive { name="rols"; version="1.11.2"; sha256="0mzw65knb7y41zamvnx2j3pl10b48y6xb4ajc7297dgf23v8bxms"; depends=[Biobase XML]; };
-rpx = derive { name="rpx"; version="1.5.0"; sha256="1348x8jzc0bjxhyzi5yjrhx0v8jxd3x7slidjzi924aqbnn7shs0"; depends=[RCurl XML]; };
+rnaseqcomp = derive { name="rnaseqcomp"; version="0.99.3"; sha256="0gyz91ayyr1834hr6jg1bnjiiiw4k75j3kn5pfmw9q8v9vg2fcsj"; depends=[RColorBrewer]; };
+roar = derive { name="roar"; version="1.5.2"; sha256="0g0ylr49dvnbyb1kwj20hrh3y3x49n4rbdvg7mpdg1byrygcli3c"; depends=[GenomicAlignments GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; };
+rols = derive { name="rols"; version="1.11.6"; sha256="0wgzvwfq677dkqzzcq071xbh6v47vkcrzw66ch1vg348pcj58z0f"; depends=[Biobase XML]; };
+rpx = derive { name="rpx"; version="1.5.1"; sha256="048qldpx4zsp55jkr8g8vljiyidm9kzv4p1vwh1983y38qbz882v"; depends=[RCurl XML]; };
 rqubic = derive { name="rqubic"; version="1.15.0"; sha256="19n613m7x48wkrfrhnd0ab9018m5dd7rf08qjbgphakwycssfgcw"; depends=[biclust Biobase BiocGenerics]; };
 rsbml = derive { name="rsbml"; version="2.27.0"; sha256="10qmv5gpgqffnr5wqh7zik0l2d1cg0c0m3xak4r4bqmsd1y4dw01"; depends=[BiocGenerics graph]; };
-rtracklayer = derive { name="rtracklayer"; version="1.29.10"; sha256="04p3hpxf5jnyfjh5pign7r4k47pzl9m0g84cq93p8cb2jgywc97a"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; };
+rtracklayer = derive { name="rtracklayer"; version="1.29.12"; sha256="0gz3284d5cy3n0hr5w7x86lraryfi2jdg1yzj2jg6cq0hgga40c1"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; };
 sRAP = derive { name="sRAP"; version="1.9.0"; sha256="0rvnq41gns4ccr6gnfw0xbbi2c2wjl14qh0yr7wj7s4yrxzqr866"; depends=[gplots pls qvalue ROCR WriteXLS]; };
 sSeq = derive { name="sSeq"; version="1.7.0"; sha256="0wcw77cz47wklwsrwwimwryqmyc0lrd9mk2aawk0vx1zkqci1yca"; depends=[caTools RColorBrewer]; };
 safe = derive { name="safe"; version="3.9.0"; sha256="0x1gdzpgrm4m2m64h6y5rayp64j6ckxlr081d3w46zvfb935294a"; depends=[AnnotationDbi Biobase SparseM]; };
-sagenhaft = derive { name="sagenhaft"; version="1.39.0"; sha256="1jr4pi4qz5sapigx5lwrvaw2cjbm03hpisc0kf20id8q8sg4wqqw"; depends=[SparseM]; };
+sagenhaft = derive { name="sagenhaft"; version="1.39.1"; sha256="15aimbx6wn4il0jp12df1q2j7rfrifk84gk3khl6qkzwjd4k58c6"; depends=[SparseM]; };
 sangerseqR = derive { name="sangerseqR"; version="1.5.0"; sha256="0wiqaqzn6n63k1389nqj35k5wn93bq7c99gayblwjrhks0y9fll0"; depends=[Biostrings shiny]; };
 sapFinder = derive { name="sapFinder"; version="1.7.0"; sha256="1xg3scw5ijm1z2l4ha4ik52s97vr10plr9ifs9rdk2l6vh8na6kh"; depends=[pheatmap Rcpp rTANDEM]; };
 saps = derive { name="saps"; version="2.1.0"; sha256="0r6525n8ksxaa5dcvs9419bca1v369251psvwphfsdnfa4xg2n14"; depends=[piano reshape2 survcomp survival]; };
-savR = derive { name="savR"; version="1.7.3"; sha256="0jm5fc4zf4iqdq2qzzigal5r69mllzdx578ixxb9c3hxi55161mc"; depends=[ggplot2 gridExtra reshape2 scales XML]; };
+savR = derive { name="savR"; version="1.7.4"; sha256="1v0rzrh27yl0fx5gcwb04yq2vln3ngisg59614qmmdppc36qf5k6"; depends=[ggplot2 gridExtra reshape2 scales XML]; };
 scsR = derive { name="scsR"; version="1.5.0"; sha256="1n9clp1ldspxbrv4chihv1xhw2fmys13p884cmn037xhwv5b7j3r"; depends=[BiocGenerics Biostrings ggplot2 hash IRanges plyr RColorBrewer sqldf STRINGdb]; };
 segmentSeq = derive { name="segmentSeq"; version="2.3.1"; sha256="005b9a7rhhhcpkac8xyvl9lbzgwjbfpqr49wyn0i9j99v9zw1lfv"; depends=[baySeq GenomicRanges IRanges S4Vectors ShortRead]; };
 seq2pathway = derive { name="seq2pathway"; version="1.1.2"; sha256="1ghanxmfs99h8w2fxn6im3ml7brhhx131k7djbvsm695lvxgqm7a"; depends=[biomaRt GenomicRanges GSA nnet WGCNA]; };
@@ -970,7 +979,7 @@ seqLogo = derive { name="seqLogo"; version="1.35.0"; sha256="1fwg6v536kqgmmjfk3c
 seqPattern = derive { name="seqPattern"; version="1.1.1"; sha256="0lshbskj928c2n7gi6kf22id6rarmbby5ffrlxir0zihh7g7yfxz"; depends=[Biostrings GenomicRanges IRanges KernSmooth plotrix]; };
 seqTools = derive { name="seqTools"; version="1.3.0"; sha256="17n8mz93jx7ggf6w3hm92r9mb224w2spwsyr85amny6x8xrxr7k7"; depends=[zlibbioc]; };
 seqbias = derive { name="seqbias"; version="1.17.0"; sha256="02zlj9nmwhjjmbfw499pf1szpair7ahbijvf6ci30z2g805l1qsk"; depends=[Biostrings GenomicRanges Rsamtools zlibbioc]; };
-seqplots = derive { name="seqplots"; version="1.5.1"; sha256="0xwhrln6bmsfv4rrnnr8mih2dvchxxv7kxdj9mwmwrnsh9ghk4qr"; depends=[Biostrings BSgenome Cairo class DBI digest DT fields GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges jsonlite kohonen plotrix reshape2 RSQLite rtracklayer S4Vectors shiny]; };
+seqplots = derive { name="seqplots"; version="1.6.0"; sha256="1mxllx6v87mk2vm5za97dhyfbwxdmmg1ly39vzacavldlc7hqkgc"; depends=[Biostrings BSgenome Cairo class DBI digest DT fields GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges jsonlite kohonen plotrix reshape2 RSQLite rtracklayer S4Vectors shiny]; };
 shinyMethyl = derive { name="shinyMethyl"; version="1.3.0"; sha256="03wfpaprrg6czkik0xxwq7hkwgdqm3z7frl6vpcq333chnv3nl5z"; depends=[BiocGenerics matrixStats minfi RColorBrewer shiny]; };
 shinyTANDEM = derive { name="shinyTANDEM"; version="1.7.0"; sha256="18fl4kjwhbxnnhifa9kxz6j73pri0kfw08mgrryzdpqbd2p7x70y"; depends=[mixtools rTANDEM shiny xtable]; };
 sigPathway = derive { name="sigPathway"; version="1.37.0"; sha256="1gkkpgibj3snpzs33c4k09b7q029s3jjch7slx7ljaqhdzldbpw4"; depends=[]; };
@@ -985,8 +994,8 @@ sizepower = derive { name="sizepower"; version="1.39.0"; sha256="1xw2r7m2hlg9r5i
 skewr = derive { name="skewr"; version="1.1.0"; sha256="1dd7vn4d7zffvmy1ic139qc5rp647wyw4jqlyy6kc2vil0w8368q"; depends=[IRanges methylumi minfi mixsmsn RColorBrewer wateRmelon]; };
 snapCGH = derive { name="snapCGH"; version="1.39.0"; sha256="11xdijl28mn7znjdv1qgj5z5hhf7xnnpg79pnxr5kj17b06w5509"; depends=[aCGH cluster DNAcopy GLAD limma tilingArray]; };
 snm = derive { name="snm"; version="1.17.0"; sha256="0ckn29nymlml8ldxqq5la1h3bwm2h2c2zcr2sjs5plxl2fga4a0l"; depends=[corpcor lme4]; };
-snpStats = derive { name="snpStats"; version="1.19.0"; sha256="0m42vqjsqh2bjkn5vd5hm4q5r0pi9znxi2qzxxh0c9iai8wjjsca"; depends=[BiocGenerics Matrix survival zlibbioc]; };
-soGGi = derive { name="soGGi"; version="1.1.1"; sha256="17kq195xgsfq5fxvkyfxhkx1rcx4wp0115043snmxhp0vfpp36qv"; depends=[BiocGenerics BiocParallel Biostrings chipseq GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges preprocessCore reshape2 Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
+snpStats = derive { name="snpStats"; version="1.19.1"; sha256="1i4v737mrjjp8b24mihiv53ifgjcs7gaf9c4h2ling6gpasf39z8"; depends=[BiocGenerics Matrix survival zlibbioc]; };
+soGGi = derive { name="soGGi"; version="1.1.2"; sha256="0vqsdlnbdimz1y2q37ycddc3ifykbr9d0hsg47kqh5wjzgsrl4h7"; depends=[BiocGenerics BiocParallel Biostrings chipseq GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges preprocessCore reshape2 Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
 spade = derive { name="spade"; version="1.17.0"; sha256="02ba8ybgcldjmfsxywb0q7drm5nyhg6i72brvbrcgsq2ni0b7cpf"; depends=[Biobase flowCore igraph Rclusterpp]; };
 specL = derive { name="specL"; version="1.3.3"; sha256="17067na171pn55w7znyhrn9bcibjpk7spvdw5l6gzrr5slh49qg8"; depends=[DBI protViz Rcpp RSQLite seqinr]; };
 spikeLI = derive { name="spikeLI"; version="2.29.0"; sha256="1f7in8zcbdz9i1cqdhvdcjl6g71vhz9hgd8whc0x9nf12qa87l7p"; depends=[]; };
@@ -1007,7 +1016,7 @@ survcomp = derive { name="survcomp"; version="1.19.0"; sha256="1czy90l49f0c31kh9
 sva = derive { name="sva"; version="3.15.0"; sha256="0bskn3famgz24kjaz4lrrm94vw07g5d2103h9gh5qzhajdsc2d03"; depends=[genefilter mgcv]; };
 switchBox = derive { name="switchBox"; version="1.3.0"; sha256="0bnb1wqxl3rv8w5rm0jw3x22yy8q27j11hpqnd792fvsz8ssr5h1"; depends=[]; };
 synapter = derive { name="synapter"; version="1.11.0"; sha256="05gv788mx1bzizr07cg5cw98i4xm3qdh8hpys4xvr06as7q65h2g"; depends=[Biobase BiocParallel Biostrings cleaver hwriter knitr lattice MSnbase multtest qvalue RColorBrewer]; };
-systemPipeR = derive { name="systemPipeR"; version="1.3.4"; sha256="16sn8svmxz9yfhhdl3kwq3hgk80rmirz2g4c8z8i9dib3i8i3sia"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicRanges ggplot2 GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; };
+systemPipeR = derive { name="systemPipeR"; version="1.3.11"; sha256="1ssxavb1dwfma6dvd6jp4vnh4xz1nns0d14ccrrslssnch8knn3g"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicRanges ggplot2 GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; };
 tRanslatome = derive { name="tRanslatome"; version="1.7.0"; sha256="1pcr1ghwkmkpsbkqh85yninvgb2za2vdsnax5bjkdj60wfj0d5bc"; depends=[anota Biobase DESeq edgeR GOSemSim gplots Heatplus limma plotrix RankProd samr sigPathway topGO]; };
 ternarynet = derive { name="ternarynet"; version="1.13.0"; sha256="13pnzzlfzgkvqn323xhjvbaqzrk2fjq440ff9hjf09a53g14q7li"; depends=[igraph]; };
 tigre = derive { name="tigre"; version="1.23.0"; sha256="177phidn72rcghb4mqfcr2wbfx5pz2vdw6jh7ahnki7s5q6fkldl"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; };
@@ -1015,9 +1024,9 @@ tilingArray = derive { name="tilingArray"; version="1.47.0"; sha256="1l7ldbzzjxa
 timecourse = derive { name="timecourse"; version="1.41.0"; sha256="1jpbjh4dg71zyhy8vghzqvmkg17aw7azdbhn101j8rdfsf90i8mx"; depends=[Biobase limma marray MASS]; };
 tkWidgets = derive { name="tkWidgets"; version="1.47.0"; sha256="08vhxl7bdhnx0vk8pkm4bxjy9jvg42wy8nhlp04fyjkylfs5d58r"; depends=[DynDoc widgetTools]; };
 topGO = derive { name="topGO"; version="2.21.0"; sha256="0hhglb4zqbjwqywn37h3klz7qgkypl2zmv1afibxjn70xc6wxq46"; depends=[AnnotationDbi Biobase BiocGenerics graph lattice SparseM]; };
-trackViewer = derive { name="trackViewer"; version="1.5.1"; sha256="16xjh6k1v1pp29g2x2n8ywaapf7wgj2l4klmmspa3f8gkzlmxgwz"; depends=[GenomicAlignments GenomicFeatures GenomicRanges Gviz gWidgetstcltk pbapply Rsamtools rtracklayer scales]; };
+trackViewer = derive { name="trackViewer"; version="1.5.2"; sha256="0kr6mkim32khr5zqm7wzrv03g9fvn4imxr0b7h8jl7sl896hv5ks"; depends=[GenomicAlignments GenomicFeatures GenomicRanges Gviz gWidgetstcltk pbapply Rsamtools rtracklayer scales]; };
 tracktables = derive { name="tracktables"; version="1.3.0"; sha256="125z9b0rjvrrbg91bdzqrf3rrw0aajivpyxd1m9k1gcs6jmsaaj3"; depends=[GenomicRanges IRanges RColorBrewer Rsamtools stringr tractor_base XML XVector]; };
-triform = derive { name="triform"; version="1.11.2"; sha256="11vsg3ki9dyl8vpi1q1p0cilhnvz076lk55w6ld4k53sp2h3q0r4"; depends=[BiocGenerics IRanges yaml]; };
+triform = derive { name="triform"; version="1.11.3"; sha256="0j8arzd9zbd37kzz1ndr6ljzz21h7bi33p0iqzy83l5ifidd4kaj"; depends=[BiocGenerics IRanges yaml]; };
 trigger = derive { name="trigger"; version="1.15.0"; sha256="1gsvp2rvry8pg9wfl9rggjfjxd0dcq3lrfkygfsl4jqcwnankpvc"; depends=[corpcor qtl qvalue sva]; };
 trio = derive { name="trio"; version="3.7.1"; sha256="1g3q1pvqq2kp1vck9c7sj000inw5b7q0wvd14yr8096mm6ax8zka"; depends=[]; };
 triplex = derive { name="triplex"; version="1.9.0"; sha256="0a7pyazg2vmk8229x6lvvxcvplj07drqrlvn9cra5ckqhflm3san"; depends=[Biostrings GenomicRanges IRanges S4Vectors XVector]; };
@@ -1027,7 +1036,7 @@ twilight = derive { name="twilight"; version="1.45.0"; sha256="0dzgapk34jzxhdadr
 unifiedWMWqPCR = derive { name="unifiedWMWqPCR"; version="1.5.0"; sha256="055yvgwqjh91cf8d2hsacnbzq2z9c911cy3qd206azqlr6qyjiip"; depends=[BiocGenerics HTqPCR]; };
 vbmp = derive { name="vbmp"; version="1.37.0"; sha256="1i4akvqrwj1r0ahi4vjxl7q780sa5bryj3rd2c5wg0ifd5l95h6s"; depends=[]; };
 viper = derive { name="viper"; version="1.5.1"; sha256="0494601adg93i5gwam73x4x3m7vfg25xly6v2gj4aclaq9v6fpyf"; depends=[Biobase e1071 KernSmooth mixtools]; };
-vsn = derive { name="vsn"; version="3.37.1"; sha256="0qya4csz1vhvshnzrml6d9fbxqrdp2ckh4f38izcbj53y3hhilf9"; depends=[affy Biobase lattice limma]; };
+vsn = derive { name="vsn"; version="3.37.3"; sha256="09mzv7l5j20sx14m63q9ycpacrh2zayywiyckglfgndpc8v9wp08"; depends=[affy Biobase ggplot2 hexbin lattice limma]; };
 vtpnet = derive { name="vtpnet"; version="0.9.0"; sha256="0gbs4pdwy88pjwsn3r2yspnfscz127awhlwym6g1lk8sxkb4mjxc"; depends=[doParallel foreach GenomicRanges graph gwascat]; };
 wateRmelon = derive { name="wateRmelon"; version="1.9.0"; sha256="1lgadzv28j5qqqqsrjzakxmyj1q9j0hps3waa2nn9r7dq4cvallh"; depends=[limma lumi matrixStats methylumi ROC]; };
 wavClusteR = derive { name="wavClusteR"; version="2.3.1"; sha256="0cfh1jiyzs1fijp8p3f4vysvrm7xhrriqdyjrms81pldka4kfv6y"; depends=[Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer seqinr stringr wmtsa]; };
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 7ccca09742b..2f62ede96cf 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -5,10 +5,8 @@
 
 { self, derive }: with self; {
 A3 = derive { name="A3"; version="0.9.2"; sha256="01s7znhph2mr3snpscci3y7nbcisa6kg6hy7im3742r6ah0z3jv7"; depends=[pbapply xtable]; };
-ABCExtremes = derive { name="ABCExtremes"; version="1.0"; sha256="032bc9a6cxy4war95n8v4vaax3q96k2wryjbcipi3z55b2l8hdny"; depends=[combinat SpatialExtremes]; };
 ABCanalysis = derive { name="ABCanalysis"; version="1.0.2"; sha256="1lgf9nhh5a8m4m48l6gd3d3avjqcplp40jzpb7d7y5vgj8cj1bw6"; depends=[Hmisc plotrix]; };
 ABCoptim = derive { name="ABCoptim"; version="0.13.11"; sha256="1j2pbfl5g9x71gq9f7vg6wznsds8sn8dj3q2h5fhjcv58di3gjhl"; depends=[]; };
-ABCp2 = derive { name="ABCp2"; version="1.1"; sha256="0s0lbwlc8nycm7b8vx0v01f8dmy91r1zqcj9zgrlj7dnpg4cpkml"; depends=[MASS]; };
 ACCLMA = derive { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; };
 ACD = derive { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; };
 ACNE = derive { name="ACNE"; version="0.8.0"; sha256="0ps38lljzm2aszqf8fhh74zbdxh46kypmybkw5w7xaf9nv5kcq8g"; depends=[aroma_affymetrix aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
@@ -20,7 +18,8 @@ ADPclust = derive { name="ADPclust"; version="0.6.3"; sha256="0lr4zkjhqr9azqxnxp
 AER = derive { name="AER"; version="1.2-4"; sha256="0cfhnh6ijwvbywk6falfq852jgx969v35j2l1q3cghwj9yggapbh"; depends=[car Formula lmtest sandwich survival zoo]; };
 AFLPsim = derive { name="AFLPsim"; version="0.3-4"; sha256="0xqp1d3cn8rcrsx0yipqh0k4xynv446acxpcammbflsz01xsgx9v"; depends=[adegenet introgress]; };
 AGD = derive { name="AGD"; version="0.35"; sha256="1dk8m3zqvapwhz0677d3b2cbrin14p9adn5annzgjrxgw7ms4mg0"; depends=[gamlss gamlss_dist]; };
-AGSDest = derive { name="AGSDest"; version="2.2"; sha256="00kf786i72bc4a80qswq1iazwqi709pxvzadgfih511plgir6ik2"; depends=[ldbounds]; };
+AGSDest = derive { name="AGSDest"; version="2.3"; sha256="1g8z7ba70zs4i8cb48iwf4iy1q1l76cpiixiac8fixjf1c7a9hxz"; depends=[ldbounds]; };
+AHR = derive { name="AHR"; version="1.2"; sha256="150bj83158l1rks2zcw534py2crbxjgiw54sb0rzvgxwbyh8yz5g"; depends=[etm MASS Rcpp RcppArmadillo survival]; };
 AICcmodavg = derive { name="AICcmodavg"; version="2.0-3"; sha256="1a9jbf3vd77hsf98smjgqchhkc9z8qqp12c1mflln3l0pxx0vk8q"; depends=[lattice MASS Matrix nlme unmarked VGAM xtable]; };
 AID = derive { name="AID"; version="1.5"; sha256="0fpgq2ahl0mdj0sb0p39z2ksslsiwm3hma8d09jmggi3yjbrgqq7"; depends=[MASS nortest tseries]; };
 AIM = derive { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival]; };
@@ -41,13 +40,13 @@ ARPobservation = derive { name="ARPobservation"; version="1.1"; sha256="1cdhn11j
 ARTIVA = derive { name="ARTIVA"; version="1.2.3"; sha256="1jdvsslc8parz7wibcv51fx62brl2mc6i482hz43j1npsms2z1hl"; depends=[gplots igraph MASS]; };
 ARTP = derive { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; };
 ARTool = derive { name="ARTool"; version="0.9.5"; sha256="1wfan4v3498libqgjdgn4l4ihf1khp3smj0lmyxd7vb4iaawlzci"; depends=[car lme4 pbkrtest plyr]; };
-ASMap = derive { name="ASMap"; version="0.4-1"; sha256="0nslmzhf99vl1zkp702xgcrd36xvis45yb5b0hx0mvf4dfv233lm"; depends=[fields gtools lattice qtl]; };
+ASMap = derive { name="ASMap"; version="0.4-4"; sha256="0fgycpnb2qr1j37f7avg75nij4b6h8bsmfl574cjqs6gmchkwfi0"; depends=[fields gtools lattice qtl]; };
 ASPBay = derive { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp RcppArmadillo]; };
 ATE = derive { name="ATE"; version="0.2.0"; sha256="1i46ivb7q61kq11z9v1rlnwad914nsdjcz9bagqx17vjk160mc0a"; depends=[]; };
 ATmet = derive { name="ATmet"; version="1.2"; sha256="047ibxxf5si45zw22zy8a1kpj36q0pd3bsmxwvn0dhf4h65ah0zz"; depends=[DiceDesign lhs metRology msm sensitivity]; };
 AUC = derive { name="AUC"; version="0.3.0"; sha256="0ripcib2qz0m7rgr1kiz68nx8f6p408l1ww7j78ljqik7p3g41g7"; depends=[]; };
 AUCRF = derive { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; };
-AcceptanceSampling = derive { name="AcceptanceSampling"; version="1.0-3"; sha256="1camxmvz8prkvpf3d3rc07bnfphakwdlickqlr4sgzrs4k27rr4f"; depends=[]; };
+AcceptanceSampling = derive { name="AcceptanceSampling"; version="1.0-4"; sha256="0nvbh4cx0vcsqzs7j6vs6pc6yxb4i0fbjfajdnq6fvnv12m9sz41"; depends=[]; };
 Actigraphy = derive { name="Actigraphy"; version="1.2"; sha256="02xxmzjqym46q0fzddmy29i8la9knrna3b46y8849nmbpqvmp3qn"; depends=[fda lattice SDMTools]; };
 ActuDistns = derive { name="ActuDistns"; version="3.0"; sha256="04rff9czcgac80clpv32a1dl0jbyvfsa7wqxyywgk99w672x50i2"; depends=[actuar hypergeo reliaR]; };
 AdMit = derive { name="AdMit"; version="2.0.1"; sha256="0bqzq2pf5449qyr8ff5d3sq0lbsph29ppv6zzf1rbjz06sc5d6ff"; depends=[mvtnorm]; };
@@ -80,6 +79,7 @@ ArfimaMLM = derive { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdx
 ArgumentCheck = derive { name="ArgumentCheck"; version="0.9.0"; sha256="1gyc6bx6sfp7k8cp43l6fic4rfn729h6kl5zqs3ypf4425s7jm3f"; depends=[]; };
 ArrayBin = derive { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[SAGx]; };
 AssetPricing = derive { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[deSolve polynom]; };
+AssocTests = derive { name="AssocTests"; version="0.0-2"; sha256="1sba4b3rrk3ki95z0xs8aj8pcikczn7c66m00ziivsdi8iy10gzg"; depends=[cluster combinat fExtremes mvtnorm]; };
 AssotesteR = derive { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; };
 AsynchLong = derive { name="AsynchLong"; version="1.0"; sha256="097d0zvzjkz3v32qhxdir0xv7kbjkhzy6q5k54w8l4fa2632j3mk"; depends=[]; };
 AtelieR = derive { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58xg9wvqcril8j8yd61lkkmz4b3195zai"; depends=[cairoDevice gWidgetsRGtk2 partitions proto]; };
@@ -94,7 +94,7 @@ BAMMtools = derive { name="BAMMtools"; version="2.0.5"; sha256="1xrhif8872w5rwib
 BANFF = derive { name="BANFF"; version="0.3"; sha256="0z7hwplp12m8sypkndjkjkmanbh67h47k8j9wm60qg6nnyqry9np"; depends=[coda doParallel DPpackage foreach igraph mclust network pscl tmvtnorm]; };
 BANOVA = derive { name="BANOVA"; version="0.2"; sha256="1zgn9wxh4c89rris58hhj5fh37mmy8wjvligr02id7a1pcw177m3"; depends=[coda rjags runjags]; };
 BASIX = derive { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; };
-BAT = derive { name="BAT"; version="1.3.0"; sha256="0a8l3hzlgxyp604dg20qm9hvxl97dyh1lm0hj85p6s6nz0qwi8jy"; depends=[nls2 spatstat vegan]; };
+BAT = derive { name="BAT"; version="1.3.1"; sha256="16zc1pzx9x8xiqwm2c8zm6n6ry1hkc5dy9s4630as7f1cprq0k5v"; depends=[nls2 spatstat vegan]; };
 BAYSTAR = derive { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[coda mvtnorm]; };
 BB = derive { name="BB"; version="2014.10-1"; sha256="1lig3vxhyxy8cnic5bczms8pajmdvwr2ijad1rkdndpglving7x0"; depends=[quadprog]; };
 BBEST = derive { name="BBEST"; version="0.1-4"; sha256="0yqsz97lljlydhphiy0fb7vwbqxpjzn5v0v665c39dlprxv3jg3b"; depends=[DEoptim ggplot2 reshape2 shiny wmtsa]; };
@@ -106,38 +106,38 @@ BCBCSF = derive { name="BCBCSF"; version="1.0-0"; sha256="1ag8wz8a9vh1x4jgppimgc
 BCDating = derive { name="BCDating"; version="0.9.7"; sha256="0z3a95sc481p0n33mhg7qlsf1jynbm1vbfds0n03bsjrwvqkzpb2"; depends=[]; };
 BCE = derive { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; };
 BCEA = derive { name="BCEA"; version="2.1-1"; sha256="1j2zb2icv5b6kwgbjzvidbzvciag89227ina6qcb2m4g6spyxcrm"; depends=[]; };
+BCEE = derive { name="BCEE"; version="1.0"; sha256="0c1fj263qfmg0vba2xf9bkchymcp8zjkwyjysgkkrdflxc4qskdi"; depends=[BMA]; };
 BCEs0 = derive { name="BCEs0"; version="1.1"; sha256="0q63bkmk0kk9p5d3xb0f5srzfrbr743isyw4v2h9ch5yyxizcizb"; depends=[]; };
 BCRA = derive { name="BCRA"; version="1.0"; sha256="1bbxh1kf35h31c4k565kk6grdhp5pnn8vr3nr6vnp32dp4pc05zh"; depends=[]; };
 BDgraph = derive { name="BDgraph"; version="2.19"; sha256="1z1ah2d5mjdfqgi00p2jlslhfd256ksijg3nk307594k2c8psqfp"; depends=[igraph Matrix]; };
 BEANSP = derive { name="BEANSP"; version="1.0"; sha256="0xcb81pk3iidb3dz9l4hm6cwx8hrbg5qz0sfi59yx2f7nsazr4xk"; depends=[]; };
 BEDASSLE = derive { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; };
 BEQI2 = derive { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[jsonlite knitr markdown plyr reshape2 xtable]; };
-BEST = derive { name="BEST"; version="0.2.2"; sha256="160lvrd0zjm1lr8llra6lyz3qsmqhn3bpdlmwingwfimbpb754rz"; depends=[coda rjags]; };
+BEST = derive { name="BEST"; version="0.3.0"; sha256="0sl681ax77nv9a87dhr58yis4x4r7s0m3mywxid1z876zdglsxsp"; depends=[coda jagsUI]; };
 BGLR = derive { name="BGLR"; version="1.0.4"; sha256="1bvk8iifvrcvnb0f1k3v9xxajljsz79ck95191p8alnda64cz0zf"; depends=[]; };
 BGPhazard = derive { name="BGPhazard"; version="1.2.2"; sha256="1v89pjigrjkin9vsf6sa0qhwxvn1a3dy2gqwq3sd9v6y0hrld6ng"; depends=[survival]; };
 BGSIMD = derive { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; };
 BH = derive { name="BH"; version="1.58.0-1"; sha256="17rnwyw9ib2pvm60iixzkbz7ff4fslpifp1nlx4czp42hy67kqpf"; depends=[]; };
-BHH2 = derive { name="BHH2"; version="2012.04-0"; sha256="10ixvjpkqamlddrndpnw5gsdm4gdhp693jdvc0f774ngmf32rbaa"; depends=[]; };
-BHMSMAfMRI = derive { name="BHMSMAfMRI"; version="1.0"; sha256="0j5ivknsr441clgm0b95f2rz4pr29ixvw3dgsi8nb0ffh52dgz7q"; depends=[AnalyzeFMRI fmri wavethresh]; };
+BHH2 = derive { name="BHH2"; version="2015.06.25"; sha256="19c8qjfvg4f3zlrqvrsdmc776f81ghv8w0l3bnbpdbyz7fivc1qw"; depends=[]; };
 BIFIEsurvey = derive { name="BIFIEsurvey"; version="1.2-6"; sha256="1fin5dr1xxr617i4ysfx39gaw6ygbcm4h7j1l38kqnfz18hn6xsq"; depends=[miceadds mitools Rcpp RcppArmadillo TAM]; };
 BIGDAWG = derive { name="BIGDAWG"; version="1.1"; sha256="0rgk2w7d8qq2dahfmiv81v1ydm1by6nabjzjb6iabfk0b8bnwqy2"; depends=[haplo_stats XML]; };
 BIOM_utils = derive { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; };
 BIPOD = derive { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp RcppArmadillo]; };
 BLCOP = derive { name="BLCOP"; version="0.3.1"; sha256="1qfkljw5b1k4b5jd08hw6dsmvgr7vg3kjyib5s13q0mkxvclasym"; depends=[fBasics fMultivar fPortfolio MASS quadprog RUnit timeSeries]; };
 BLR = derive { name="BLR"; version="1.4"; sha256="0wy3c8nnzkdhwb5s1ygdid47hpdx72ryim36mnicrydy0msjivja"; depends=[SuppDists]; };
-BMA = derive { name="BMA"; version="3.18.1"; sha256="0ppcjjcrjrs18lp55hrs0ad7x052v57wd0zdfmvyydlsjbgnsx1p"; depends=[inline leaps robustbase survival]; };
+BMA = derive { name="BMA"; version="3.18.4"; sha256="1lqcvr6p0y2b3n099j6rqvg5sz9i185qh9fcmm83p7czdjwn9yg9"; depends=[inline leaps robustbase rrcov survival]; };
 BMN = derive { name="BMN"; version="1.02"; sha256="12gyq01cn6a9ixqgki1ihx5jrp2gw6jdj7q210rb12xlvj3p6x7w"; depends=[]; };
 BMS = derive { name="BMS"; version="0.3.3"; sha256="1yj9vi8jvhkwpcjkclf0zbah0dayridklpj65ay6r18fyf4crnd2"; depends=[]; };
 BMhyd = derive { name="BMhyd"; version="1.2-2"; sha256="09gb1pq9y3gq9avpaqrlxdsm9iqsxpbnr0bg2mw1vkhc0d5z8zv7"; depends=[corpcor numDeriv]; };
 BNDataGenerator = derive { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; };
 BNPTSclust = derive { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[MASS mvtnorm]; };
 BNPdensity = derive { name="BNPdensity"; version="2015.5"; sha256="0jgdc9dayc57y77bb2yjcn1pb5ahrvbrsmyjkhyl4365sn5njzl8"; depends=[]; };
-BNSP = derive { name="BNSP"; version="1.0.3"; sha256="1q7nxl1lx57dzb5yfpb0966ylyl15x22y9r78r6pxrprrbsnv931"; depends=[]; };
+BNSP = derive { name="BNSP"; version="1.0.5"; sha256="0iyrmrpnx32akcfvd43jh74457l56n5n4pnlyqi9v3cjp4n95fds"; depends=[]; };
 BOG = derive { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
 BOIN = derive { name="BOIN"; version="1.1"; sha256="1ffr6w9ml0mkffgg1vds8fmf8ww7rs375pxk2dqv9nlb9061m97r"; depends=[]; };
 BRugs = derive { name="BRugs"; version="0.8-4"; sha256="0bd5m4nfj25bhjy0d96kna50h5a5a2mdxrl21c1kvxmiwxcx4wrs"; depends=[coda]; };
 BSDA = derive { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; };
-BSGS = derive { name="BSGS"; version="1.0"; sha256="11r7bx9ax84iv3gam02p1hg174ni3d3gv6yj64n0gp2gaj438hv7"; depends=[MASS plyr pscl]; };
+BSGS = derive { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; };
 BSGW = derive { name="BSGW"; version="0.9"; sha256="0df5d0d0kfvwavxbxra36jjs9044q1szq1xm37dvh4wfvvv6igmb"; depends=[survival]; };
 BSSasymp = derive { name="BSSasymp"; version="1.1-0"; sha256="0z3abgvbpmwgzb6b6r5ys3msy97lfdg81p8d19c83aaa6hrngggn"; depends=[fICA JADE]; };
 BSagri = derive { name="BSagri"; version="0.1-8"; sha256="148pr4lkgdi4bwc9lavgj356nh240iazz28xklq14rw4gzhmz2k4"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; };
@@ -148,6 +148,7 @@ BVS = derive { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrn
 BaBooN = derive { name="BaBooN"; version="0.2-0"; sha256="145q2kabjks2ql3m48sfjis5y35l8rcqnr5s176viv9yhfafn351"; depends=[coda Hmisc MASS nnet Rcpp RcppArmadillo]; };
 BaM = derive { name="BaM"; version="0.99"; sha256="1q04va2s876ydlmaalx63r520pfx1qzpjg6hbnl9pvn86b5grnf4"; depends=[bayesm coda foreign MASS mice nnet survival]; };
 BaSTA = derive { name="BaSTA"; version="1.9.3"; sha256="1jfki5lnsvd6fjrld2qp179lyzli61pi2308lkkl1h6vgp11zp2v"; depends=[msm]; };
+Bagidis = derive { name="Bagidis"; version="1.0"; sha256="1prdbkc0qgzkkrkhp43pjyg35q9ivngk8wa4a7khlnfsj21jaraf"; depends=[abind]; };
 BalancedSampling = derive { name="BalancedSampling"; version="1.4"; sha256="0l8jxszd0j27kb58xrn7lvf52mhifqjd1w42cp4kdiax8c6s7421"; depends=[Rcpp]; };
 BatchExperiments = derive { name="BatchExperiments"; version="1.4.1"; sha256="0fg7p0q6avc0kcwcd3z4q3akrr2mkrx2yf9zcd6hhz22l3x4aphz"; depends=[BatchJobs BBmisc checkmate DBI plyr RSQLite]; };
 BatchJobs = derive { name="BatchJobs"; version="1.6"; sha256="1kb99024jih5bycc226bl4jyvbbl1sg72q3m2wnlshl7s8p6vva0"; depends=[BBmisc brew checkmate DBI digest fail RSQLite sendmailR stringr]; };
@@ -157,7 +158,6 @@ BayHaz = derive { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdg
 BaySIC = derive { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; };
 BayesBridge = derive { name="BayesBridge"; version="0.6"; sha256="1j03m465pwq0lhbrfvddjglrzs6px7bc89yvfzj776amm7myqd0l"; depends=[]; };
 BayesCR = derive { name="BayesCR"; version="2.0"; sha256="0cafind5vz81ryw1c7324hyfc6922fsxmjnvddb4mrhis54id2r4"; depends=[mnormt mvtnorm Rlab rootSolve truncdist]; };
-BayesComm = derive { name="BayesComm"; version="0.1-0"; sha256="17hnq4z451g2j3p73awllihhwsdy3grh6ki3qy9bkr064wvzbvcj"; depends=[coda Rcpp RcppArmadillo]; };
 BayesDA = derive { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; };
 BayesFactor = derive { name="BayesFactor"; version="0.9.11-1"; sha256="0vq656q38vlf0ba8g23psk8as1y48y6s8yrvqrppbjx5d9wlm9wv"; depends=[coda gtools Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; };
 BayesGESM = derive { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; };
@@ -181,7 +181,7 @@ BaylorEdPsych = derive { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqw
 BcDiag = derive { name="BcDiag"; version="1.0.8"; sha256="1x9rkr96dgxp88z9qaw72ikcdmdlxnj8vjn3bfv0q27sfyxwb3a5"; depends=[fabia]; };
 Bchron = derive { name="Bchron"; version="4.1.1"; sha256="0dnfz7xpmbygyarh9ai9x3xfsqiizi0zhnxm8bmkvqyb8h7zpghb"; depends=[coda ellipse hdrcde inline MASS mclust]; };
 Bclim = derive { name="Bclim"; version="2.3.1"; sha256="160c9v83bpik73yjj45lr8sdgl8v4ymlkqw424ncc3lficyhvfjg"; depends=[hdrcde MASS mclust statmod]; };
-Benchmarking = derive { name="Benchmarking"; version="0.24"; sha256="18gx8cwip1c03p37apyr9z89p117bz439vfgx91gxbbg1scc8bfp"; depends=[lpSolveAPI ucminf]; };
+Benchmarking = derive { name="Benchmarking"; version="0.26"; sha256="00w7a16lhra6rjylyj26q67mvgbc3wa27a2wmiwjz5yh7wdnh193"; depends=[lpSolveAPI ucminf]; };
 BenfordTests = derive { name="BenfordTests"; version="1.1.1"; sha256="12xzc4gq4h7p18ypbkybrzjj2qh71rgd7nzznij36yv7n6h21mlw"; depends=[]; };
 Bergm = derive { name="Bergm"; version="3.0.1"; sha256="1ngxqpagf8snnwdm82bg8yxbf1zpzd99g32fhw9l4gjx77kpkhl2"; depends=[coda ergm mvtnorm network]; };
 BerlinData = derive { name="BerlinData"; version="1.0.1"; sha256="1shhx4pisi139sc0siawa7gp9psfgxm58qijg5m65nihv7spki75"; depends=[rjson stringr XML]; };
@@ -200,7 +200,7 @@ BioGeoBEARS = derive { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47l
 BioMark = derive { name="BioMark"; version="0.4.2"; sha256="17r4q2migmdk2vqfbr69q07cgdzwpjgs3ijmnm42srs5d3brw8cr"; depends=[glmnet MASS pls st]; };
 BioPhysConnectoR = derive { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[matrixcalc snow]; };
 BioStatR = derive { name="BioStatR"; version="2.0.0"; sha256="1k3z337lj8r06xgrqgi5h67hhkz2s5hggj6dhcciq26i1nzafsw6"; depends=[ggplot2]; };
-Biodem = derive { name="Biodem"; version="0.3"; sha256="0wfyypr46awki2nrvhcjwacmaxrr2wvhdv9hddnf10msssflvshc"; depends=[]; };
+Biodem = derive { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; };
 BiodiversityR = derive { name="BiodiversityR"; version="2.5-2"; sha256="0l23nlibv7wjmkv1jnssaab3iwm2i5wrkzjji2x9rr5131aj82gn"; depends=[Rcmdr vegan]; };
 Biograph = derive { name="Biograph"; version="2.0.4"; sha256="1mik5yvbi28xnyzha8p3xjaa064x29wgn18yx766wha7djxxr353"; depends=[Epi etm ggplot2 lubridate msm mstate mvna plyr reshape survival]; };
 BivarP = derive { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; };
@@ -218,20 +218,18 @@ BoomSpikeSlab = derive { name="BoomSpikeSlab"; version="0.5.2"; sha256="0n7kf0nk
 BootPR = derive { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; };
 Boruta = derive { name="Boruta"; version="4.0.0"; sha256="1r7bl4ab6swhks9cijhqn9gdhp2vjfhwb65fi5rzz0yvzxx97xi8"; depends=[randomForest rFerns]; };
 BradleyTerry2 = derive { name="BradleyTerry2"; version="1.0-6"; sha256="1080q7fw4yfl2y0jh3w2xz342i5yhhhavq40i3902bsmjj8g531d"; depends=[brglm gtools lme4]; };
-BrailleR = derive { name="BrailleR"; version="0.20"; sha256="1cfg5jfhal77n1pmwcj0awhnprqw6bha7q7z3s2m3q4g1ar49shv"; depends=[gridGraphics gridSVG knitr moments nortest rmarkdown xtable]; };
+BrailleR = derive { name="BrailleR"; version="0.22.0"; sha256="13bwy6mcmh57iznm600r34mz757i9dy6f2nb3a2jw1xvk5zsnasz"; depends=[devtools extrafont gridGraphics gridSVG knitr moments nortest rmarkdown xtable]; };
 Brobdingnag = derive { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; };
-Brq = derive { name="Brq"; version="1.0"; sha256="0m01qw0mh9za1gx1vkbyvwny4k5fvmvs9dbp0504q8jqfqf4l1vj"; depends=[quantreg truncnorm]; };
 BsMD = derive { name="BsMD"; version="2013.0718"; sha256="1yvazqlbmm221r7nkhrhi309gkk6vx7ji5xlvf07klya2zg20gcj"; depends=[]; };
 BurStFin = derive { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; };
 BurStMisc = derive { name="BurStMisc"; version="1.00"; sha256="0718a1p7iiqkfhhmnzxggc6hd8sm847n1qh7rfbdl8b0k0bgvnj0"; depends=[]; };
 C50 = derive { name="C50"; version="0.1.0-24"; sha256="17ay0rbm2cg2s27mh09xg0knk7idx6f761sc849m41vsc6pfhzk1"; depends=[partykit]; };
 CADFtest = derive { name="CADFtest"; version="0.3-2"; sha256="00nsnzgjwkif7mbrw7msswjxhi9aysjdx3qg3i4mdmj1rmp7c4dc"; depends=[dynlm sandwich tseries urca]; };
 CALIBERrfimpute = derive { name="CALIBERrfimpute"; version="0.1-6"; sha256="036nwnday098mawc9qlgl3jjjcdjnja1immg6xkq27hvv2xfbz82"; depends=[mice mvtnorm randomForest]; };
-CALINE3 = derive { name="CALINE3"; version="1.0-2"; sha256="07w1kb7wqdi1qslpvpmqcmq6da4h7sgwv3aih4brdprym61c3rkm"; depends=[]; };
 CAM = derive { name="CAM"; version="1.0"; sha256="07mmrz6j8cm6zgaw2zcxgkxb7abd651kb80526r271snjgvpr5bl"; depends=[glmnet Matrix mboost mgcv]; };
 CAMAN = derive { name="CAMAN"; version="0.72"; sha256="10qikirv73d03ssg3sb6w3ih92ms5726b5lqw3x7r5rpbl9179rh"; depends=[mvtnorm sp]; };
-CARBayes = derive { name="CARBayes"; version="4.1"; sha256="0g4b44p3ybb92wrm42ws8yrrdzmxk454w6a3w20fbhfc2zprjilz"; depends=[CARBayesdata coda MASS Rcpp sp spam truncdist]; };
-CARBayesST = derive { name="CARBayesST"; version="1.1"; sha256="03vp6qajag0ak4lcn0ddyxri3ndiwsc4yxi6ym5lr2v6kv674wl6"; depends=[coda Rcpp spam truncdist]; };
+CARBayes = derive { name="CARBayes"; version="4.2"; sha256="1abb2yp5gvgn99dlsfj2cads5d0rjdznf8kghrhr21y3j9kk0aid"; depends=[CARBayesdata coda MASS Rcpp sp spam spdep truncdist]; };
+CARBayesST = derive { name="CARBayesST"; version="2.0"; sha256="1m2alay8iryqgkshdjb7dr30qh2672248anq1srnsydhy3llrhms"; depends=[coda MASS Rcpp spam truncdist]; };
 CARBayesdata = derive { name="CARBayesdata"; version="1.0"; sha256="19dhgkqpdcq1y866arb3qm7wbl348w66yl85kwajkmqgplx2pvaq"; depends=[shapefiles sp]; };
 CARE1 = derive { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; };
 CARLIT = derive { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; };
@@ -247,7 +245,7 @@ CCTpack = derive { name="CCTpack"; version="1.4"; sha256="09s2ysqsz158lrah44rwvs
 CCpop = derive { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; };
 CDFt = derive { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; };
 CDLasso = derive { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; };
-CDM = derive { name="CDM"; version="4.3-0"; sha256="0xryd4l0fqa2m39zcgd6jyi6shlqxc98qgwdpg38csqmbpny4bvm"; depends=[lattice MASS mvtnorm plyr polycor psych Rcpp RcppArmadillo sfsmisc]; };
+CDM = derive { name="CDM"; version="4.4-1"; sha256="0m75h7q60bzn66hrv9w2s21w7yp1qphylrfv8323srnj2q4yqi93"; depends=[lattice MASS mvtnorm plyr polycor psych Rcpp RcppArmadillo sfsmisc]; };
 CDNmoney = derive { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; };
 CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[igraph MASS mvtnorm]; };
 CEC = derive { name="CEC"; version="0.9.3"; sha256="05cgd281p0hxkni4nqb0d4l71aah3f3s6jxdnzgw8lqxaxz4194i"; depends=[]; };
@@ -264,7 +262,6 @@ CIFsmry = derive { name="CIFsmry"; version="1.0.1"; sha256="118vyiiy4iqn86n9xf84
 CINID = derive { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; };
 CINOEDV = derive { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[ggplot2 igraph R_matlab reshape2]; };
 CITAN = derive { name="CITAN"; version="2014.12-1"; sha256="0hiccsg49zgcdm5iwj2vzyqhwyfw6h5fd2gasy6hlakjp102mvy2"; depends=[agop DBI hash RGtk2 RSQLite stringi]; };
-CLAG = derive { name="CLAG"; version="2.18.1"; sha256="0y8m6m01vw3rxwrmxvwhpiy6dd2snr0lhb026l1494y43hhqi3wy"; depends=[]; };
 CLME = derive { name="CLME"; version="2.0-2"; sha256="11krgxn3fvbwknmiz2jyidpbb0svf4frvk99spd7i53m615sai91"; depends=[isotone lme4 MASS prettyR shiny stringr]; };
 CLSOCP = derive { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; };
 CMC = derive { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; };
@@ -278,7 +275,6 @@ CNprep = derive { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kb
 COBRA = derive { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; };
 COMMUNAL = derive { name="COMMUNAL"; version="1.0"; sha256="0smza4q0gnhskyq3fxcrs2hq3lxkyp5xf3zd6zi92962lg6s3w3n"; depends=[cluster clValid fpc rgl]; };
 COMPoissonReg = derive { name="COMPoissonReg"; version="0.3.4"; sha256="1mf2q7phc2bn700yp7i2i6ccj6lrvh8b2dmibqihh76a85j1ycrq"; depends=[]; };
-COP = derive { name="COP"; version="1.0-2"; sha256="1gynknplvx97hjhi7adsgq9r9lqismch1q1pqvgmz0x1wkg4jj40"; depends=[dr MASS]; };
 COPASutils = derive { name="COPASutils"; version="0.1.6"; sha256="0vi7x14ma3i4gabdb04byr4ba0209lklj3d5ql2f2vaxyb4a1hj9"; depends=[dplyr ggplot2 kernlab knitr reshape2 stringr]; };
 CORE = derive { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; };
 CORElearn = derive { name="CORElearn"; version="0.9.46"; sha256="1jwc3sqkbhhmn67x44iyqzvpjsnbrwhgq6yam6h6gf086nv0lmic"; depends=[cluster rpart]; };
@@ -316,7 +312,7 @@ CfEstimateQuantiles = derive { name="CfEstimateQuantiles"; version="1.0"; sha256
 ChainLadder = derive { name="ChainLadder"; version="0.2.0"; sha256="03gwavmimh4isrc6gpn72m52sqx1aj0prshzsb0531g45qxmvw9x"; depends=[actuar Hmisc lattice MASS Matrix reshape2 statmod systemfit tweedie]; };
 ChargeTransport = derive { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; };
 CheckDigit = derive { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; };
-ChemoSpec = derive { name="ChemoSpec"; version="4.0.1"; sha256="08z85g0r38xh57h3f4hdcg8wlaklpqmxvjla1562f3lxbqm1r9k1"; depends=[plyr rgl]; };
+ChemoSpec = derive { name="ChemoSpec"; version="4.0.6"; sha256="0zhqx6b1zp2vlp003rsaj7ayxa0zrk1kmm5xq3q10rkl6xnk0wid"; depends=[plyr rgl]; };
 ChemometricsWithR = derive { name="ChemometricsWithR"; version="0.1.8"; sha256="084da2hx6agryw7bv6img10pqmsdz2mpihbrj6j081lammrik4fj"; depends=[ChemometricsWithRData MASS pls]; };
 ChemometricsWithRData = derive { name="ChemometricsWithRData"; version="0.1.3"; sha256="14l1y4md8hxq8gvip5vgg07vcr0d9yyhm5ckhzk8zwprdabn9a10"; depends=[]; };
 ChoiceModelR = derive { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; };
@@ -330,6 +326,7 @@ Claddis = derive { name="Claddis"; version="0.1"; sha256="1dxsz62x856lpapw5xpvvr
 ClickClust = derive { name="ClickClust"; version="1.1.4"; sha256="17r8jzhzwqa5h04bxdcyv31jhk6c709sx5m1z53jh3yf9zmkilvi"; depends=[]; };
 ClimClass = derive { name="ClimClass"; version="1.0"; sha256="07jl8vwqyyj4q2hav8qbg69yjs73s3kbms5bd9hqs1y938rrp2l5"; depends=[geosphere ggplot2 reshape2]; };
 ClueR = derive { name="ClueR"; version="1.0"; sha256="1ak8pgbzm5xrk7pjnkbiqdwyvvyvrm6k6h50ycc86w3zy7fnqhds"; depends=[e1071]; };
+ClustGeo = derive { name="ClustGeo"; version="1.0"; sha256="0n7i6lwc86cizpn5ibd6k9i41w8fcbh1cdxqm7w52z024w0z40jh"; depends=[FactoMineR plyr rCarto]; };
 ClustMMDD = derive { name="ClustMMDD"; version="1.0.1"; sha256="0pzascdiadhvx4xjxa6kjw5kkmj3izphz2f86jnimyn5fid7cl02"; depends=[Rcpp]; };
 ClustOfVar = derive { name="ClustOfVar"; version="0.8"; sha256="17y8q2g4yjxs2jl1s8n5svxi021nlm0phs1g5hcnfxzpadq84wbs"; depends=[]; };
 ClustVarLV = derive { name="ClustVarLV"; version="1.4.0"; sha256="1dm4vyfq4mf9y2ha32fhirqyss4yjk5zxrb9i3fx4i8kbaw6160z"; depends=[Rcpp]; };
@@ -337,7 +334,7 @@ CoClust = derive { name="CoClust"; version="0.3-1"; sha256="00i0dghd35s91kkkxj1y
 CoImp = derive { name="CoImp"; version="0.2-3"; sha256="04n0drx98hi8hmlb5xwl87ylv03j1ld04vp9d8s5sphvm9bbx690"; depends=[copula gtools locfit nnet]; };
 CoinMinD = derive { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; };
 CollocInfer = derive { name="CollocInfer"; version="1.0.1"; sha256="0wfk3qw28msz3wqm5xmivjgi18kqv1s6w76vh71zq777d6a7al6i"; depends=[deSolve fda MASS Matrix spam]; };
-ColorPalette = derive { name="ColorPalette"; version="1.0-0"; sha256="0mh1fjcl80fc5prrypl42aqj1svzs6600n250a5sah276bd0zzk9"; depends=[]; };
+ColorPalette = derive { name="ColorPalette"; version="1.0-1"; sha256="1dsj5njikx3qm2lnamqqg4qgwwyr11fwx9s5sdi7dkfx3nmf6dac"; depends=[]; };
 CombMSC = derive { name="CombMSC"; version="1.4.2"; sha256="1wkawxisn9alpwrymja8dla8n25z2fhai3l2xhin0b914y2kai09"; depends=[]; };
 CombinS = derive { name="CombinS"; version="1.1"; sha256="18wanir5vqk5i65hd6gr2za1xd26yfa0c3c029dbxsrsczwmb9xi"; depends=[]; };
 CombinePValue = derive { name="CombinePValue"; version="1.0"; sha256="0mlngyz2nq7s39javnnjbb5db93c5sg9daw2szng83mbyfza4hv2"; depends=[]; };
@@ -349,9 +346,12 @@ Comp2ROC = derive { name="Comp2ROC"; version="1.1"; sha256="0vhpw6k9barcx5fl3kw3
 CompGLM = derive { name="CompGLM"; version="1.0"; sha256="04bjal92r0m7is5ygqpd0mdz3fb3pwcr7rc3mbxg9sg57nff3kf5"; depends=[Rcpp]; };
 CompLognormal = derive { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; };
 CompQuadForm = derive { name="CompQuadForm"; version="1.4.1"; sha256="1kv4bdkwidkjw0hgn2krv42p9v1a03p47g0p03lja3flhfbmiifj"; depends=[]; };
+CompR = derive { name="CompR"; version="1.0"; sha256="1k4q0yanvhdh3ksia7d42lxky19yci5vxhmi6h716g9sxzfsjk6b"; depends=[MASS]; };
 CompRandFld = derive { name="CompRandFld"; version="1.0.3-4"; sha256="1a3j5j50fz3f8vkvdmfccv5hn00spk08xanadqxpdy8pn925gqqb"; depends=[]; };
+CompareCausalNetworks = derive { name="CompareCausalNetworks"; version="0.1.1"; sha256="1j3yrgyv7vlgwi50w62q8dpk1zpvrwk9vn0ka0ry6524s9zs0r03"; depends=[Matrix]; };
 CompareTests = derive { name="CompareTests"; version="1.0"; sha256="098axl20jid35pqvgiwk6h91waafigwks6n5f4pg7xxx1fifks4f"; depends=[]; };
 Compind = derive { name="Compind"; version="1.0"; sha256="13gfsbjaciign8cswsibdj9a4rwj5afwrk4g1x4fyihfhnm4qx7m"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff psych]; };
+ComplexAnalysis = derive { name="ComplexAnalysis"; version="1.0"; sha256="1yk0r3iwxirjsksnpwpnrgq4yhni6in9kgxxrs7v51l35zn78kji"; depends=[]; };
 Compounding = derive { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; };
 ConConPiWiFun = derive { name="ConConPiWiFun"; version="0.4.4"; sha256="1dq9nlg04xs2n9g62y4gbl8ay4vsa25d7d7dra7q8zq6a561hzz5"; depends=[Rcpp]; };
 ConSpline = derive { name="ConSpline"; version="1.0"; sha256="04zwnnp8rmzacfl9skd1lybqwxja0527h4xwcx5ki2z8c0zvvpi8"; depends=[coneproj]; };
@@ -365,6 +365,7 @@ Copula_Markov = derive { name="Copula.Markov"; version="1.0"; sha256="028rmpihyz
 CopulaREMADA = derive { name="CopulaREMADA"; version="0.9"; sha256="0fhd4g8157rmkda5dygvnvb50f8dz31wlg1x432g9ra8fw7bdq01"; depends=[matlab statmod tensor]; };
 CopulaRegression = derive { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; };
 CopyDetect = derive { name="CopyDetect"; version="1.1"; sha256="0h9bf7ay5yr6dwk7q28b6xxfzy6smljkq6qwjkzfscy5hnmwxkpa"; depends=[irtoys]; };
+CopyNumber450kCancer = derive { name="CopyNumber450kCancer"; version="1.0.3"; sha256="1rraqp2hi6sa4j4lci1zbvr1q8rm6vrlqwjn81qqc57h4an07540"; depends=[]; };
 CorReg = derive { name="CorReg"; version="1.0.5"; sha256="1b7l17i33bqvdzgqw5vc73fnpdgqbr01456qgmxls80ji8qjiv9x"; depends=[corrplot elasticnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen ridge Rmixmod rpart]; };
 CorrBin = derive { name="CorrBin"; version="1.5"; sha256="1kg8kms76z127j2vmf7v162n0sh2jqylw4i7c35x5sig4q22m9gy"; depends=[boot combinat dirmult geepack mvtnorm]; };
 CorrMixed = derive { name="CorrMixed"; version="0.1-11"; sha256="18n70yx6yysvcn3wsf1zmnp4z2hs3783mr1n0pjp2ph5yd9xk4mg"; depends=[nlme psych]; };
@@ -394,7 +395,6 @@ DALY = derive { name="DALY"; version="1.4.0"; sha256="1gx4q24149q1ipsrinswrm37z1
 DAMOCLES = derive { name="DAMOCLES"; version="1.1"; sha256="07z8mynhqnk1zcvm84w09xzkiy2dfxwhmnpi6gaddr3p0waql4gj"; depends=[ape caper deSolve expm geiger matrixStats picante]; };
 DAMisc = derive { name="DAMisc"; version="1.3"; sha256="0d6fkg0c5a2jx1khv013lmahx5clyzab9w2dsi5zwxnf0jz5m8fc"; depends=[car effects gdata lattice MASS nnet pscl sm xtable]; };
 DATforDCEMRI = derive { name="DATforDCEMRI"; version="0.55"; sha256="0v26a1gi8l21ga5nqcnyfaa7gc8zxq6wk95b96ajgpdybb0l9s53"; depends=[akima lattice locfit matlab R_methodsS3 R_oo xtable]; };
-DBFTest = derive { name="DBFTest"; version="1.0"; sha256="0h83ic16z0lg7grjh4jbrxf672qchqv4zzypm2b1mhmzl01jn1wg"; depends=[]; };
 DBGSA = derive { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; };
 DBI = derive { name="DBI"; version="0.3.1"; sha256="0xj5baxwnhl23rd5nskhjvranrwrc68f3xlyrklglipi41bm69hw"; depends=[]; };
 DBKGrad = derive { name="DBKGrad"; version="1.6"; sha256="0207zx0v1x3zhfbs0h1ssxc1b683k111f90k8ybhknb147104knr"; depends=[lattice minpack_lm SDD TSA]; };
@@ -427,7 +427,7 @@ DOvalidation = derive { name="DOvalidation"; version="0.1.0"; sha256="0vm4sxbchk
 DPpackage = derive { name="DPpackage"; version="1.1-6"; sha256="01qdl6cp6wkddl9fwwpxwvyhb7lpjxis6wnbm2s288y2n9wi4j24"; depends=[MASS nlme survival]; };
 DPw = derive { name="DPw"; version="1.1.3"; sha256="1cw9qig5z2nfp2b3k4ng5hpar9izd3d6jihj93mkc0rqcli2wzp1"; depends=[fOptions]; };
 DSBayes = derive { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; };
-DSL = derive { name="DSL"; version="0.1-5"; sha256="0k320cmim9mvi5cmr6964h9i2jbskh76xws3p6zsfakk63ndg3rr"; depends=[]; };
+DSL = derive { name="DSL"; version="0.1-6"; sha256="0fmqxladifqqcs4mpb8a1az74fyb4gb8l2y5gzqaad3dbiz82qih"; depends=[]; };
 DSpat = derive { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; };
 DSsim = derive { name="DSsim"; version="1.0.3"; sha256="01kkpzs0prcq43y4nmyaw39bgjabr99xxs2hn3fmb4ka46xj0bfb"; depends=[mgcv mrds shapefiles splancs]; };
 DStree = derive { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[Ecdat pec Rcpp rpart rpart_plot survival]; };
@@ -453,7 +453,7 @@ DeducerPlugInScaling = derive { name="DeducerPlugInScaling"; version="0.1-0"; sh
 DeducerSpatial = derive { name="DeducerSpatial"; version="0.7"; sha256="0133qk3yjcifyha7c4pqr5s0hmbci72bzgil2r0sxjmrljs3q727"; depends=[Deducer Hmisc JavaGD maptools OpenStreetMap rgdal scales sp UScensus2010]; };
 DeducerSurvival = derive { name="DeducerSurvival"; version="0.1-0"; sha256="03qk3y4pibvrxbnxbm5rlksw807dvbilip1jbpn1r7k02ibzq676"; depends=[Deducer]; };
 DeducerText = derive { name="DeducerText"; version="0.1-2"; sha256="0if2p9j74wa5rva4iv0i8iax22grl9j7lqcqzqlywjgqwnlzxa05"; depends=[Deducer RColorBrewer SnowballC tm wordcloud]; };
-Delaporte = derive { name="Delaporte"; version="2.2-2"; sha256="1smx8vbi1kvfij00aq0fzj03sxagnzn9vfws0f5973bp3q72x86q"; depends=[Rcpp]; };
+Delaporte = derive { name="Delaporte"; version="2.2-3"; sha256="0iw9y4582rf736jpllw3lc24cqa4q07q9432xdxp4cl5qwgkk40l"; depends=[Rcpp]; };
 Demerelate = derive { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmij5ldrmhcn12s9yxd0rargc5vzvkrwcqpkgylkn"; depends=[Formula fts mlogit sfsmisc vegan]; };
 DendSer = derive { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; };
 Density_T_HoldOut = derive { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; };
@@ -478,7 +478,7 @@ Disake = derive { name="Disake"; version="1.5"; sha256="1fw45fmnir6h34jw8917mhyz
 DiscML = derive { name="DiscML"; version="1.0.1"; sha256="0qkh0yak1kmzxxx0cqb47zgrj8v2s1d5danpibwwg43j138sb73l"; depends=[ape]; };
 DiscreteInverseWeibull = derive { name="DiscreteInverseWeibull"; version="1.0.1"; sha256="0w0s2fixpcmcwids35xx91hll9rf9qbi7155sp90dxd3vr8c939v"; depends=[Rsolnp]; };
 DiscreteLaplace = derive { name="DiscreteLaplace"; version="1.0"; sha256="1mwqvlhgswqp697zjl6yjzqbgazycwwz6dfdvx8s72hdmnlqqr9r"; depends=[]; };
-DiscreteWeibull = derive { name="DiscreteWeibull"; version="1.0"; sha256="0v8za4arqarf20jrw38dzcjxdwfdpn0ss7p5yxbwhylnj7qz207w"; depends=[Rsolnp]; };
+DiscreteWeibull = derive { name="DiscreteWeibull"; version="1.0.1"; sha256="09v34lwaahx0d30zxb4b3r84ryllz1fsmbp5wfr341b5flp20wvg"; depends=[Rsolnp]; };
 DiscriMiner = derive { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; };
 Distance = derive { name="Distance"; version="0.9.3"; sha256="054z9pi8m8gjpax3s2hajvaik4yvfpy8qc4gmpl9bqncrk594pbv"; depends=[mrds]; };
 DistatisR = derive { name="DistatisR"; version="1.0"; sha256="1il00v26q68h5dd5c9lm2jblgn8hs6n0457r13mlw6r7pcj0158j"; depends=[car prettyGraphs]; };
@@ -499,14 +499,14 @@ DynClust = derive { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbz
 DynNom = derive { name="DynNom"; version="1.0.1"; sha256="0gdy3kqj63khm74cdjhfmlnd06ard97h1598rkqwm7c3cng7b98c"; depends=[compare ggplot2 shiny stargazer]; };
 DynTxRegime = derive { name="DynTxRegime"; version="2.1"; sha256="0dxf16zpj6cyx7afbvr4w4d76w4vshbvvkkqla68dbav0yvy7z7i"; depends=[modelObj]; };
 DynamicDistribution = derive { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; };
-EBEN = derive { name="EBEN"; version="1.1.1"; sha256="12nh96avcx4rrbmlr1q046i5ymrsnqvf0ra5ynh58akajfx7wy49"; depends=[]; };
+EBEN = derive { name="EBEN"; version="4.1"; sha256="0xin08w8ay3m31a2alnjdgqzw7nwzjfb19pv5n2j0diar73ds4c5"; depends=[]; };
 EBMAforecast = derive { name="EBMAforecast"; version="0.42"; sha256="161l6jxbzli2g5lcmlp74z320rsvsi80pxk1vc1ypa1hgwz3q80x"; depends=[abind ensembleBMA Hmisc plyr separationplot]; };
 EBS = derive { name="EBS"; version="3.0"; sha256="0nrqglbfr7wagd4xrk5jx0kficjgvk7wqwzqrbs589dkll24sn5b"; depends=[MASS]; };
 EBglmnet = derive { name="EBglmnet"; version="3.6"; sha256="0qjwk5y9bghidha4i937nc0kl1jz4d8g2br6ij8651lf2byj9s1a"; depends=[]; };
 EDISON = derive { name="EDISON"; version="1.1"; sha256="09xw4p4hwj8djq143wfdcqhr2mhwynj4ixj3ma7crhqidgal169p"; depends=[corpcor MASS]; };
 EDR = derive { name="EDR"; version="0.6-5.1"; sha256="10ldygd1ymc4s9gqhhnpipggsiv4rwbgajvdk4mykkg3zmz7cbpm"; depends=[]; };
 EFDR = derive { name="EFDR"; version="0.1.1"; sha256="0jgznwrd40g9xmvhrd7b441g79x41ppfdn6vbsbzc0k5ym1wzb1p"; depends=[doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; };
-EGRET = derive { name="EGRET"; version="2.2.0"; sha256="1a3bvmshmxrnaijl9pklfia0ab94rzn22ywjh9gwn268qai52zjy"; depends=[dataRetrieval fields lubridate survival]; };
+EGRET = derive { name="EGRET"; version="2.3.0"; sha256="07b2wxdciybvm3l579vibdprcxvzl2ym25xba7wlxmrbx37ndx5z"; depends=[dataRetrieval fields lubridate survival]; };
 EIAdata = derive { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszczdr4j4svn2k024462sgj1sn07a4a4z2s"; depends=[plyr XML xts zoo]; };
 EILA = derive { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; };
 EL = derive { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; };
@@ -517,7 +517,6 @@ EMC = derive { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgv
 EMCC = derive { name="EMCC"; version="1.2"; sha256="1qff8yvw7iqdsrqkvwb7m14xh7gcnjcrf8gw00g4j6aq0h0cgk2z"; depends=[EMC MASS mclust]; };
 EMCluster = derive { name="EMCluster"; version="0.2-4"; sha256="0m5cl5mrg6q0ixfpjj1jwd7l5hcldc33lr7n6xgy7p9nlr52mimz"; depends=[MASS]; };
 EMD = derive { name="EMD"; version="1.5.7"; sha256="0m2g7akg9h964d6qr1mj20h9pcb2fcmala3skhl0qpy8qz01w5ck"; depends=[fields locfit]; };
-EMJumpDiffusion = derive { name="EMJumpDiffusion"; version="1.4.1"; sha256="10lw6717yq9vlywn5ilsl0d99fpx3zvc87vf7s0zxswhs81h7x1w"; depends=[]; };
 EMMAgeo = derive { name="EMMAgeo"; version="0.9.1"; sha256="1rxbb666gh9g35m4jqa6y1zjp82s62ha6n92fkjvkk9wm25w6imr"; depends=[GPArotation limSolve shape]; };
 EMMIXcontrasts = derive { name="EMMIXcontrasts"; version="1.0.0"; sha256="1q7bwf7kkpraj38lz5s1lhhghp7a5lzyj5b9x8024g6rh2qlwp7v"; depends=[]; };
 EMMIXskew = derive { name="EMMIXskew"; version="1.0.1"; sha256="16jkq0a9k1gf6gia8r65nwa2lh8zny4jmnq51g2rcqm44s5ylqbh"; depends=[KernSmooth lattice mvtnorm]; };
@@ -547,7 +546,7 @@ EasyStrata = derive { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8i
 EbayesThresh = derive { name="EbayesThresh"; version="1.3.2"; sha256="0n7cr917jrvmgwfqki7shvz9g9zpmbz9z8hm5ax7s8nnfzphrh4g"; depends=[]; };
 Ecdat = derive { name="Ecdat"; version="0.2-7"; sha256="1z9mxx3mvn3vi5drxlzss7gs7vpzg7shinl529bx4jpxqpci90jy"; depends=[Ecfun]; };
 Ecfun = derive { name="Ecfun"; version="0.1-4"; sha256="0h3351pcahrn578lz1pcb7h3chmh0vmwbn9iqll98vibck847gai"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML]; };
-EcoGenetics = derive { name="EcoGenetics"; version="1.2.0"; sha256="090vcbl8gl23335rga1126w6jqvql62kk9wxlfpjz4q11czgdclq"; depends=[adegenet ggplot2 hierfstat party raster rgdal rkt SoDA sp vegan]; };
+EcoGenetics = derive { name="EcoGenetics"; version="1.2.0-1"; sha256="08wa9w8ib0bp386bs6vlfzbdbcxjf8pz97mlfml3dl15092g13x3"; depends=[adegenet ggplot2 party raster rgdal rkt SoDA sp]; };
 EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[DEoptim operators topmodel XML]; };
 EcoSimR = derive { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; };
 EcoTroph = derive { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; };
@@ -555,9 +554,9 @@ EcoVirtual = derive { name="EcoVirtual"; version="0.1"; sha256="1c815kxljk4qhw0z
 EditImputeCont = derive { name="EditImputeCont"; version="1.0.0"; sha256="1ghrax514hm8zymmaifwbls4wpic8qqzlf83p615k3d96p4lb304"; depends=[editrules Rcpp]; };
 EffectLiteR = derive { name="EffectLiteR"; version="0.3-3"; sha256="14v5samvkzpiy0gq6lq1vs5jqi084sq1if2sih0lk57qxz2647qh"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; };
 EffectStars = derive { name="EffectStars"; version="1.5"; sha256="0j2jxxxpcsrsjzszz4mfk3892ain3qkswa1dkpsmfsk4zs06g0s4"; depends=[VGAM]; };
-EffectTreat = derive { name="EffectTreat"; version="0.1-11"; sha256="1ps3jac3wc1v325maf4vx9jkirxbc1dfflr218xbzbgrj0zx9diz"; depends=[]; };
+EffectTreat = derive { name="EffectTreat"; version="0.2"; sha256="0az4ajqq98adxrr1wj8pkv16f2g4gg3dikizvp7qa1amcnpahjx3"; depends=[]; };
 EffectsRelBaseline = derive { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; };
-ElemStatLearn = derive { name="ElemStatLearn"; version="2012.04-0"; sha256="107x2mybadqgw03j3yq8ibq3ljs4fpx90chvsirpylqhv77wsabl"; depends=[]; };
+ElemStatLearn = derive { name="ElemStatLearn"; version="2015.6.26"; sha256="0r8d0fm4yx7iawcsikksd7i01kbyqz3xkdls74f3ngkvj4iq1rqc"; depends=[]; };
 EloRating = derive { name="EloRating"; version="0.43"; sha256="0gzpi4qjiqn0lzjwy37pkz6fg7dkp2hv2dfqgzfk32wsj0bswgab"; depends=[zoo]; };
 ElstonStewart = derive { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[digest kinship2]; };
 EnQuireR = derive { name="EnQuireR"; version="0.10"; sha256="00kyclcr8da79lwpqa1vzkwn6pgf197h2biackwgphb0byhi8ssx"; depends=[FactoMineR MASS Rcmdr SensoMineR]; };
@@ -572,16 +571,17 @@ EnvNicheR = derive { name="EnvNicheR"; version="1.0"; sha256="1vw21gsdrx8gkf1rf8
 EnvStats = derive { name="EnvStats"; version="2.0.1"; sha256="1z909p56dlhr00a5ir55sn5ny51h1wwi85as6arv3cn8c0zqyi74"; depends=[MASS]; };
 EnviroStat = derive { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; };
 Epi = derive { name="Epi"; version="1.1.67"; sha256="12wbzv21whjnzlyqacgqmsgrjbkgj2495y9fwvav5mr21yfrjds3"; depends=[]; };
-EpiContactTrace = derive { name="EpiContactTrace"; version="0.8.8"; sha256="1vlr2xxnyq1i6ky39g8j3pf3m5775bmhii7vpskb0x7nnq161yzb"; depends=[plyr R2HTML Rcpp]; };
+EpiBayes = derive { name="EpiBayes"; version="0.1.2"; sha256="1qfir0dl085c9ib1acsygmj7gihc4ar98k5niqdsgnmji88h17y2"; depends=[coda epiR scales shape]; };
+EpiContactTrace = derive { name="EpiContactTrace"; version="0.9.1"; sha256="10yd24xcydn03rq9kcqcxj5gn25v54ljsm9mgc206g9wf1xx0wjf"; depends=[]; };
 EpiDynamics = derive { name="EpiDynamics"; version="0.2"; sha256="1hqbfysvw2ln8z3as6lfcjlhkzccksngwh2vm25zsgy93gxw3mcc"; depends=[deSolve ggplot2 reshape2]; };
 EpiEstim = derive { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; };
-EpiModel = derive { name="EpiModel"; version="1.1.6"; sha256="0h3bbvk9qyhc0jml2jd21dahi1v00alar67jkzpwnavvmcgd8a3s"; depends=[deSolve doParallel ergm foreach network networkDynamic RColorBrewer statnet_common tergm]; };
+EpiModel = derive { name="EpiModel"; version="1.2.0"; sha256="16vnsgar45y2gr93qzv3c33b11y5j0rys3q2k29mwb0i93f4cf9p"; depends=[deSolve doParallel ergm foreach network networkDynamic RColorBrewer tergm]; };
 Eplot = derive { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; };
 EstCRM = derive { name="EstCRM"; version="1.3"; sha256="0fmnlh0pnprskq01iq3rfassyxq7fywiprvqw0xdlh8yxl3w2c9n"; depends=[Hmisc lattice]; };
 EstSimPDMP = derive { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; };
 EvCombR = derive { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; };
 EvalEst = derive { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[dse setRNG tfplot tframe]; };
-Evapotranspiration = derive { name="Evapotranspiration"; version="1.5"; sha256="181s9wwil07740n79gz2ar9c1bjxy45v4fyxxkqjmdfly72la542"; depends=[zoo]; };
+Evapotranspiration = derive { name="Evapotranspiration"; version="1.6"; sha256="0z15n5vacq6aghcbcwiiyq6kc8cl6pn3ip3axxg9g7bxig2rb8fh"; depends=[zoo]; };
 EvoRAG = derive { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; };
 ExPosition = derive { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; };
 Exact = derive { name="Exact"; version="1.6"; sha256="0d5g5p98yrcd6v56iadsq448hl522shdqln2icmc3yfnya326as7"; depends=[]; };
@@ -595,7 +595,7 @@ ExtDist = derive { name="ExtDist"; version="0.6-3"; sha256="1vsxm578bb70wnz3mxm7
 ExtremeBounds = derive { name="ExtremeBounds"; version="0.1.5"; sha256="1fsrp2dm1bdg5p0qsi2wa8qxrlq065jlazsxzixpjsni910mrb2k"; depends=[Formula]; };
 FACTscorer = derive { name="FACTscorer"; version="0.1.0"; sha256="1gbfpm5szi6w8iyp7ywpqrmdq0wrv5axj29sj9gxjwmjfh5qgqjx"; depends=[]; };
 FADA = derive { name="FADA"; version="1.2"; sha256="1wpjqvhhgvirzcvl8r23iaw63wr8rys19mjy71mn24wg3zwnc2qz"; depends=[crossval elasticnet glmnet MASS mnormt sda sparseLDA]; };
-FAMILY = derive { name="FAMILY"; version="0.1.18"; sha256="1f1s0p721sl27b9xp2wrdyx03kv1bdin4wfknmw1k0nnc94dcnp2"; depends=[pheatmap pROC]; };
+FAMILY = derive { name="FAMILY"; version="0.1.19"; sha256="1912l2zj2cmh8yx8lkg8fpgvfddn6wbi1vrr4yx04mh73gk1s5mk"; depends=[pheatmap pROC]; };
 FAMT = derive { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[impute mnormt]; };
 FAOSTAT = derive { name="FAOSTAT"; version="2.0"; sha256="06z8c964sf73ld4v9vybqjsdxskxp3ssyv0a3mpcs9la5y7n9jaz"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO scales]; };
 FAdist = derive { name="FAdist"; version="2.1"; sha256="1y66ymg0k6kmyq4bclwwlqkp8brkq925ajpp0jqqn39f749c2kji"; depends=[]; };
@@ -639,9 +639,9 @@ FWDselect = derive { name="FWDselect"; version="2.0"; sha256="12hhb2vysg3c9fzh56
 FacPad = derive { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; };
 FactMixtAnalysis = derive { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
 FactoClass = derive { name="FactoClass"; version="1.1.1"; sha256="0m5108g2nhdwqqmkn04l1x0kx32ikkhcz6gki0hpj9hlzrkya5w6"; depends=[ade4 xtable]; };
-FactoMineR = derive { name="FactoMineR"; version="1.30"; sha256="16zxrr1mqv56ipkhz2m8hrhipxynphy9d104zsqbwa0k7336z2b0"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; };
+FactoMineR = derive { name="FactoMineR"; version="1.31.3"; sha256="164pxgy9sn7irk4l31nfpmdmrw9qscwzdmvzr9nc9m36nhmajvkr"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; };
 Factoshiny = derive { name="Factoshiny"; version="1.0.2"; sha256="0wwsv0frn2d6a5l5lr9qzqglznaigc23bq7nhcbfy1wlvsmimnr3"; depends=[FactoMineR shiny]; };
-Fahrmeir = derive { name="Fahrmeir"; version="2012.04-0"; sha256="1axx6r4g6gj1inih41i2az4y0d3jq9x1a6nyj8k7wp51z4z2nbmk"; depends=[]; };
+Fahrmeir = derive { name="Fahrmeir"; version="2015.6.25"; sha256="1ca4m3m4jip7n489yywdfvh6nlhxspg5awxi23spgfnvhrcs9k3y"; depends=[]; };
 Familias = derive { name="Familias"; version="2.2"; sha256="1nhjxn3f063gvi4jvwb8r4fap7f1zbcvb6qa30153yh31yprljls"; depends=[kinship2 paramlink]; };
 FastHCS = derive { name="FastHCS"; version="0.0.5"; sha256="02ds9syqh8wpjrqibdv3kqxcyijclm572daqrj262b4b6211v46x"; depends=[matrixStats Rcpp RcppEigen robustbase]; };
 FastImputation = derive { name="FastImputation"; version="1.2"; sha256="04bz623kcanxcl9z8zl6m7m47pk0szcjrjlgs5v1yl3jnq9m2n7g"; depends=[]; };
@@ -649,10 +649,10 @@ FastKNN = derive { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp
 FastPCS = derive { name="FastPCS"; version="0.1.2"; sha256="1lqb6g65vna2p7kc2y4kc5piy3280nlxl41bdkxkng2icmq14l58"; depends=[matrixStats Rcpp RcppEigen]; };
 FastRCS = derive { name="FastRCS"; version="0.0.6"; sha256="0wjsh37jas8hcb9554ijvwj0k8dx96fjf88bzgy7nbim2byiy8p8"; depends=[matrixStats Rcpp RcppEigen]; };
 FastRWeb = derive { name="FastRWeb"; version="1.1-0"; sha256="1hiabi7ibp69n5wi5x4kwznxhc2i7dxdrqf1fm6ppv7ix0wkjs07"; depends=[Cairo]; };
-FatTailsR = derive { name="FatTailsR"; version="1.0-3"; sha256="0r9n18qlr70p6y4v1xv1lxi1lzm9qp29qy4w51chllqjn15kmv7l"; depends=[minpack_lm]; };
+FatTailsR = derive { name="FatTailsR"; version="1.2-3"; sha256="139hc8axzp0faib0lpj3f6kfwna29vsqjjwflcva8xsghakc1d4r"; depends=[minpack_lm timeSeries]; };
 FeaLect = derive { name="FeaLect"; version="1.10"; sha256="1r7rgcadrqjhxn2g2w16axygsck82fprxg7l14ai11bn4b7h4pmb"; depends=[lars rms]; };
 FeatureHashing = derive { name="FeatureHashing"; version="0.9"; sha256="1xbzmyah22kjrkd7ln1pjzwyn5w0zmhdhs9w1a3p8rjxrwmx6ssf"; depends=[BH digest magrittr Matrix Rcpp]; };
-FedData = derive { name="FedData"; version="1.1.0"; sha256="0s5blfhlizl4lv22lxjhqrwrf10mxgy2cd5z4a9xg05k419q7alr"; depends=[data_table devtools igraph raster RCurl rgdal rgeos soilDB sp]; };
+FedData = derive { name="FedData"; version="2.0.0"; sha256="1c3lfjl1rdd34f0d9gyhvyclqcb83cq1fvf5w88s8d32q6iimigx"; depends=[data_table devtools igraph raster RCurl rgdal rgeos soilDB sp]; };
 FeedbackTS = derive { name="FeedbackTS"; version="1.3.1"; sha256="1zx64wbl5pzqn69bjhshd3nayxx4wlg7n1zwv7ilh68raxfxnbbx"; depends=[geoR mapdata maps proj4 sp]; };
 FieldSim = derive { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[RColorBrewer rgl]; };
 FinAsym = derive { name="FinAsym"; version="1.0"; sha256="0v15ydz4sq9djwcdcfp90mk8l951rry7h91d7asgg53mddbxjj6f"; depends=[]; };
@@ -679,14 +679,16 @@ ForwardSearch = derive { name="ForwardSearch"; version="1.0"; sha256="0yd47832pi
 FourScores = derive { name="FourScores"; version="1.0"; sha256="0d21mrl9bzsvhljv7ymiyck508smp66w9qivrb2rp0p803h9yibm"; depends=[]; };
 FrF2 = derive { name="FrF2"; version="1.7-1"; sha256="0i9hfx7n0g866imdsmalqzs8v95vx08cz97hi8311v1wc3pqsn1j"; depends=[BsMD DoE_base igraph scatterplot3d sfsmisc]; };
 FrF2_catlg128 = derive { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; };
+FractalParameterEstimation = derive { name="FractalParameterEstimation"; version="1.0"; sha256="12v72zn1san2kv82b9y1vd0gzd1fa800yscc63zlq8lfflz47xvz"; depends=[]; };
 Frames2 = derive { name="Frames2"; version="0.1.1"; sha256="004h3w5bfnbbxa8yczlcd8m0bc9xq91dg5ph6yql28ivibw24q1l"; depends=[sampling]; };
 FreeSortR = derive { name="FreeSortR"; version="1.1"; sha256="03z5wmr88gr6raa2cg7w4j6y5vgxr3g8b8axzhbd7jipswr5x1jf"; depends=[ellipse smacof vegan]; };
-FunChisq = derive { name="FunChisq"; version="2.0.2"; sha256="0j767iwf1hr7r532hdkrl9q2xiz997gd3rc7aca18fj743w6ras9"; depends=[BH Rcpp RcppClassic]; };
+FunChisq = derive { name="FunChisq"; version="2.1.0"; sha256="0k5b0kl64yswl5d41yiav9xnqcsqx8n6qc5p2nz5vqjs6qb7mbvd"; depends=[BH Rcpp RcppClassic]; };
 FunCluster = derive { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; };
 FuncMap = derive { name="FuncMap"; version="1.0-3"; sha256="0bhx7y1n75r3jwf5mkx2i2bqfjgzxgsw58nwhfl48ldibgx7h1qs"; depends=[mvbutils]; };
 Funclustering = derive { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp RcppEigen]; };
 FunctionalNetworks = derive { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[Biobase]; };
 FusedPCA = derive { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; };
+FuzzyLP = derive { name="FuzzyLP"; version="0.1-3"; sha256="1c7yynrz0vfvan9mfin2vsrkhhi3sy8c5nya7l8hja0nh1a4bzki"; depends=[FuzzyNumbers ROI ROI_plugin_glpk]; };
 FuzzyNumbers = derive { name="FuzzyNumbers"; version="0.4-1"; sha256="15i0chp43y8xfyzkjrbljmdvgjjx9w1l5ayhvavk9y85pwb147b8"; depends=[]; };
 FuzzyStatProb = derive { name="FuzzyStatProb"; version="2.0.1"; sha256="0cj6dqb5iy4gw7kkip9jvk9djf6dx20078kmb42br8sim1065j8m"; depends=[DEoptim FuzzyNumbers MultinomialCI]; };
 FuzzyToolkitUoN = derive { name="FuzzyToolkitUoN"; version="1.0"; sha256="104s45mmlam67vwpshhpns2mgwvmhnbj8w1918jyk2r5mqibwz06"; depends=[]; };
@@ -705,7 +707,7 @@ GAabbreviate = derive { name="GAabbreviate"; version="1.0"; sha256="0c9407i6dq7p
 GB2 = derive { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; };
 GCAI_bias = derive { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; };
 GCD = derive { name="GCD"; version="3.0.5"; sha256="1ami5xw5xx464pxr9y1z9bb3dvj46vx3wrbh19w4g7sk8yjvh5nl"; depends=[]; };
-GCPM = derive { name="GCPM"; version="1.1.1"; sha256="1wm7nmqj88j1pd2s1lvi6z1fizm3q3cl7vbzp88vbhpij4rnk4jl"; depends=[Rcpp RcppProgress]; };
+GCPM = derive { name="GCPM"; version="1.2"; sha256="034vsy9kjag7c3mzgswbm356cyay908dwnxj63gd93aakknm120x"; depends=[Rcpp RcppProgress]; };
 GDAdata = derive { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; };
 GDAtools = derive { name="GDAtools"; version="1.3"; sha256="1av29mllix0az4n85vxh1344j6jmy103hd78ibjwxalm620rp7ns"; depends=[FactoMineR]; };
 GDELTtools = derive { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; };
@@ -723,8 +725,8 @@ GGally = derive { name="GGally"; version="0.5.0"; sha256="00ix8qafi71l7vhj6268f9
 GHQp = derive { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; };
 GIGrvg = derive { name="GIGrvg"; version="0.3"; sha256="014srgh79g8y9fcj979v3md9qqx9i6b6fx6lw0r0qdrg4v6bvr76"; depends=[]; };
 GISTools = derive { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; };
-GLDEX = derive { name="GLDEX"; version="2.0.0.2"; sha256="16vy50jgk9b57h9f48097m17zrla6ksmi3wm4z2yadfg81sg8721"; depends=[cluster]; };
-GLDreg = derive { name="GLDreg"; version="1.0.2"; sha256="179qjcsfgzcw39gmmwlz9h608cq865kz2lvh76dwgyyn519l3y8g"; depends=[GLDEX]; };
+GLDEX = derive { name="GLDEX"; version="2.0.0.3"; sha256="0ymarfwpm7gagq6wk40n0nsmd14r19pbqbrgigk6cvb8dc2zpbfz"; depends=[cluster]; };
+GLDreg = derive { name="GLDreg"; version="1.0.3"; sha256="0d7cclmmhgaf95bw738d8hz166qsr9df33g73ihy8pla3sg5lr7q"; depends=[GLDEX]; };
 GLSME = derive { name="GLSME"; version="1.0.2"; sha256="1zdqrji8x0f3wjl8bhpbnwdfklihv3ii20iz2y2gsm53yzw7dlwq"; depends=[corpcor mvtnorm]; };
 GMCM = derive { name="GMCM"; version="1.2.1"; sha256="1s45xmbx64h3sb10py8n444jpxcgsz4pc36cz3zinfq55amf8r6r"; depends=[Rcpp RcppArmadillo]; };
 GMD = derive { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; };
@@ -737,23 +739,23 @@ GPArotation = derive { name="GPArotation"; version="2014.11-1"; sha256="15jh5qqq
 GPC = derive { name="GPC"; version="0.1"; sha256="1naqy5g6a0z65wssfic5s7cw9v0zjckk526nian3l98ci22sz0j7"; depends=[ks lars orthopolynom randtoolbox]; };
 GPCSIV = derive { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; };
 GPFDA = derive { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda fda_usc MASS spam]; };
-GPLTR = derive { name="GPLTR"; version="1.1"; sha256="0yp4b3ddvcd6s7rjpbmszl3a0x8qq6s138jjkm135yvbgp1jk5jz"; depends=[rpart]; };
-GPareto = derive { name="GPareto"; version="1.0.0"; sha256="0mzrl4xs7f5rkx0m4lkqy1456dnsa232hprmbg3bpris1rla780b"; depends=[DiceKriging emoa KrigInv MASS pbivnorm pso randtoolbox Rcpp rgenoud]; };
+GPLTR = derive { name="GPLTR"; version="1.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2fal156y7vg9mjkw53y623ms5pix"; depends=[rpart]; };
+GPareto = derive { name="GPareto"; version="1.0.1"; sha256="0wscalc855c99yzy3q154rxvhg0xmzy4a4x37jkf8f45n8sgviif"; depends=[DiceKriging emoa KrigInv MASS pbivnorm pso randtoolbox Rcpp rgenoud]; };
 GPfit = derive { name="GPfit"; version="1.0-0"; sha256="0g0g343ncqsqh88qq9qrf4xv5n3sa980kqbvklcx534dmn6a7n2i"; depends=[lattice lhs]; };
-GPlab = derive { name="GPlab"; version="0.1.0"; sha256="05lp5hm5f9pwqcw88x2206babb8yd0nw5smsd6j555qikx8nv88i"; depends=[MASS numDeriv Rcpp testthat]; };
 GPseq = derive { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; };
 GPvam = derive { name="GPvam"; version="3.0-2"; sha256="160j0zwbcmvzvia1b5p5midf395xfv1frk2w6w3v2zpbn8h6pdz5"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
+GRANBase = derive { name="GRANBase"; version="1.0.12"; sha256="1qfx2zp8vjyqx9rqz23kgl1dj7kz7qkligym8r2l41nc0hinijpi"; depends=[hwriter switchr XML]; };
 GRTo = derive { name="GRTo"; version="1.2"; sha256="0x65g8a39vrb8m3hqajxi0ksmdavz0p6mlamqprkdn9p6ikf5c73"; depends=[bootstrap]; };
 GRaF = derive { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy2c5p51ws38xfz233sjz475snajr"; depends=[dismo]; };
 GSA = derive { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; };
 GSAgm = derive { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; };
-GSE = derive { name="GSE"; version="3.1"; sha256="08xr7w6dsmgs3l8ayihadcvwy0xdzn78fllxa42sk7nfz6waadr3"; depends=[ggplot2 MASS Rcpp RcppArmadillo]; };
+GSE = derive { name="GSE"; version="3.2"; sha256="1zfvwrz4argv47dvxy18bjx19yn0qlqgy501sllxhqxvd1f7780r"; depends=[ggplot2 MASS Rcpp RcppArmadillo rrcov]; };
 GSIF = derive { name="GSIF"; version="0.4-6"; sha256="00m5djgc443678nwnmvgqv070g67pbvp1ci1x8gp7van8knjn5zq"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA sp]; };
-GSM = derive { name="GSM"; version="1.3.1"; sha256="1ay6znw31qnhz5k6fa0aiccr2xxmnj7v3vzrvlk6y5v5smlvybd0"; depends=[gtools]; };
+GSM = derive { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; };
 GUIDE = derive { name="GUIDE"; version="1.0.9"; sha256="1y0y6rwv1khd9bdaz5rl9nmxiangx0jckgihg16wb6hx6kf8kzc1"; depends=[rpanel tkrplot]; };
 GUILDS = derive { name="GUILDS"; version="1.2.1"; sha256="1z90qjgrx16yk956phbifcr7jd3w59h7akzz7p6g5ymrcjzih4qf"; depends=[pracma Rcpp subplex]; };
 GUIProfiler = derive { name="GUIProfiler"; version="0.1.2"; sha256="1k56clda6xr649xfacnigi3c2s7ih1whchwcfqm7aa2d44vv3axz"; depends=[MASS Nozzle_R1]; };
-GUTS = derive { name="GUTS"; version="0.9.3"; sha256="0gyi5vlr1r35qn3gj788lh9xrb7dz03r57hxk11x8w72kv415pih"; depends=[Rcpp]; };
+GUTS = derive { name="GUTS"; version="1.0.0"; sha256="0s64swhs7wpknvycca7qj36kj910anrh9qrbpyfjl9lw8cqa2058"; depends=[Rcpp]; };
 GUniFrac = derive { name="GUniFrac"; version="1.0"; sha256="0xr68yv3h2lwn7sxy8l5p9g1z3q9hihg9jamsyl70jj9b2ic80jn"; depends=[ape vegan]; };
 GWAF = derive { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[coxme geepack lme4]; };
 GWASExactHW = derive { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; };
@@ -768,6 +770,7 @@ Gammareg = derive { name="Gammareg"; version="1.0"; sha256="1a5wibnbd8jg0v8577n1
 GenABEL = derive { name="GenABEL"; version="1.8-0"; sha256="0sd497qvik70iwv7wc8r50rhc5wx153pm8vif738wwqqp43chks3"; depends=[GenABEL_data MASS]; };
 GenABEL_data = derive { name="GenABEL.data"; version="1.0.0"; sha256="0p66fb0gynjx3mnfvnlz45cbn6xf49gwx9mfyxf584xfcggxaa1c"; depends=[]; };
 GenBinomApps = derive { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; };
+GenCAT = derive { name="GenCAT"; version="1.0.1"; sha256="1a6jjfynngcqqacmn8lpjyvm4681n691savz768g0xq7mf4cmijw"; depends=[doParallel dplyr foreach ggplot2]; };
 GenForImp = derive { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; };
 GenKern = derive { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; };
 GenOrd = derive { name="GenOrd"; version="1.3.0"; sha256="07ll15fqcfvrbsd8psbvn9569hcmvghwadzb3h9qxh6pxnl9i5qd"; depends=[MASS Matrix mvtnorm]; };
@@ -794,7 +797,7 @@ GillespieSSA = derive { name="GillespieSSA"; version="0.5-4"; sha256="0bs16g8vm9
 Giza = derive { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[lattice reshape]; };
 GlobalDeviance = derive { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; };
 GlobalFit = derive { name="GlobalFit"; version="1.0"; sha256="0cx4jpr5yhjdqbvnswqjwx7542mnmk73dy99klwg8bsz0c36ii5k"; depends=[sybil]; };
-GlobalOptions = derive { name="GlobalOptions"; version="0.0.6"; sha256="0g10zf3hn4ns7faffqzc9xbscz9p84vcqhlg4jp9jl063ma2pvqm"; depends=[]; };
+GlobalOptions = derive { name="GlobalOptions"; version="0.0.7"; sha256="1vg948xh0ndwkspbf5qb00b28fy9ygda55m5fq8bspq9d2y3c0pc"; depends=[]; };
 Gmisc = derive { name="Gmisc"; version="1.1"; sha256="1dcnnsjxap50zfx984rxgksjcvqgbb9zxxd03186h4669slh1d0d"; depends=[abind forestplot Hmisc htmlTable knitr lattice magrittr Rcpp]; };
 GoFKernel = derive { name="GoFKernel"; version="2.0-5"; sha256="030gcj608nkalscjqs2ad73pwhk4gp5gl1lvm4mc9b39jhki0r70"; depends=[KernSmooth]; };
 GrammR = derive { name="GrammR"; version="1.0.1"; sha256="1dhq4srzxbdbym89dy4gh0c4jjfkljxdnriv4v0yh9g688my1gvn"; depends=[ape cluster GUniFrac gWidgets gWidgetsRGtk2 MASS rgl RGtk2]; };
@@ -803,7 +806,7 @@ GrapheR = derive { name="GrapheR"; version="1.9-84"; sha256="1wwks2a4vzhj1rcspiz
 GrassmannOptim = derive { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; };
 Grid2Polygons = derive { name="Grid2Polygons"; version="0.1-5"; sha256="18hgyx8a75allldsc2ih5i1p7ajkwj2x020cfd2hp18zrc4qyp5n"; depends=[rgeos sp]; };
 GriegSmith = derive { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; };
-GroupSeq = derive { name="GroupSeq"; version="1.3.2"; sha256="16n06jw7f97jhafgl9sfvd163v1walhlpmai1hmhiwjvv341sp13"; depends=[]; };
+GroupSeq = derive { name="GroupSeq"; version="1.3.3"; sha256="0abb18w9jylb1nf6yc6xic6b01f8zfxsm8hsmxk4whivn17ckfp9"; depends=[]; };
 GuardianR = derive { name="GuardianR"; version="0.5"; sha256="0m5arxz4ih84zg8sf2wy2kg38adraa098gb52vwz93dzdm1dhslw"; depends=[RCurl RJSONIO]; };
 Guerry = derive { name="Guerry"; version="1.6-1"; sha256="1hpp49w2kd1npsd709cwg125pw6mrqxfv2nn3lcs1mg2r49ki2bl"; depends=[]; };
 GxM = derive { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; };
@@ -813,17 +816,17 @@ HAPim = derive { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixil
 HBSTM = derive { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[fBasics maps MASS]; };
 HDMD = derive { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[MASS psych]; };
 HDPenReg = derive { name="HDPenReg"; version="0.91"; sha256="0q63pm39ivka64f7rhad6bv0yr1b2b3241ln8gqfnal25qw31w82"; depends=[rtkpp]; };
-HDclassif = derive { name="HDclassif"; version="1.2.3"; sha256="1ss30cjq352cr3v5blpdywycfv2ik200mvj54y8qihc811mash6h"; depends=[MASS]; };
+HDclassif = derive { name="HDclassif"; version="1.3"; sha256="1b80dnaa6m4px0ijpd9yf45v8jl0b9srcmrdyar8fs7lxpc53k2l"; depends=[MASS]; };
 HDtweedie = derive { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; };
 HEAT = derive { name="HEAT"; version="1.2"; sha256="1qifqd06ifl0f5l44mkxapnkwhpm0b82yq6dhfw4f8yhb27wd0z2"; depends=[]; };
 HGNChelper = derive { name="HGNChelper"; version="0.3.1"; sha256="0vidw7gdvr0i4l175ic5ya8q2x2jj0v2vc7fagzrp2mcy7fn1y6a"; depends=[]; };
 HH = derive { name="HH"; version="3.1-19"; sha256="0hm8fk0wqfhkrjm3ycpxd4i8wwm9hi8ihy45a3wayp0p6lqv4rpp"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
-HHG = derive { name="HHG"; version="1.4"; sha256="048jbwhrbgp1pv2j6sw234ykdn7bgpa49slwh3p5547nl2cwjysg"; depends=[]; };
+HHG = derive { name="HHG"; version="1.5"; sha256="0azgl9q3fhaxrjji63kai49jkybdyq1v0ql2jqmg98hynx6s31db"; depends=[]; };
 HI = derive { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; };
 HIV_LifeTables = derive { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; };
 HIest = derive { name="HIest"; version="2.0"; sha256="0ik55kxhzjyg6z6072iz9nfaj7x1nvf91l1kysgvkjccr6jf3y86"; depends=[nnet]; };
 HK80 = derive { name="HK80"; version="0.0.1"; sha256="1qhknrqpspxrdxzf5kakans94db58bbhgpblvpwcyw4jrjmm0ng7"; depends=[]; };
-HLMdiag = derive { name="HLMdiag"; version="0.2.5"; sha256="1yim9m5q1m112aj7zhsw345l32bdj7lbw2mqpcxhjzv1lcknm5lq"; depends=[ggplot2 lme4 MASS Matrix plyr Rcpp RcppArmadillo reshape2]; };
+HLMdiag = derive { name="HLMdiag"; version="0.3.0"; sha256="01j50dwab59467xm2fz5yfp9rn6pxf0isphsczvwmxnyvqw45qxw"; depends=[ggplot2 MASS Matrix mgcv plyr Rcpp RcppArmadillo reshape2 RLRsim]; };
 HLSM = derive { name="HLSM"; version="0.4"; sha256="115215fiaib6ndvzb3gn80l636ddxp0dxrnph8pnh16b3b6q2jnk"; depends=[coda MASS]; };
 HMM = derive { name="HMM"; version="1.0"; sha256="0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw"; depends=[]; };
 HMMCont = derive { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw0pv1q8lfkgmxdr9h4rwv1accril85x"; depends=[]; };
@@ -842,29 +845,28 @@ HTSCluster = derive { name="HTSCluster"; version="2.0.4"; sha256="1kvq118hqxc81n
 HUM = derive { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl]; };
 HW_pval = derive { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; };
 HWEBayes = derive { name="HWEBayes"; version="1.4"; sha256="1rbffx6pn031a278ps9aqxcaq8yi73s5kf60za143ysbfxv9dphw"; depends=[MCMCpack mvtnorm]; };
-HWEintrinsic = derive { name="HWEintrinsic"; version="1.2.1"; sha256="1sg5lrc6kl5rr6f5awp100qpd1679745kixasiddiggzd8fhgb7q"; depends=[]; };
+HWEintrinsic = derive { name="HWEintrinsic"; version="1.2.2"; sha256="035r5bi7m66g351cmrfmf4cj5qqm4fn5pgy3lzsp3gyp2dv0rkg5"; depends=[]; };
 HWxtest = derive { name="HWxtest"; version="1.0.5"; sha256="01pvi87g5sfglbdv38ik9f47fah3gs7d75d6kgn5xkjb6b2af9d7"; depends=[]; };
 HadoopStreaming = derive { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; };
-HandTill2001 = derive { name="HandTill2001"; version="0.2-9"; sha256="1j4ivxarm3k9sj05824lv6b03apyabpciv4mp253vv0yzjcp2bzf"; depends=[]; };
+HandTill2001 = derive { name="HandTill2001"; version="0.2-10"; sha256="02y18dwz06wba4a3d247ib2csgjpw6i67fh5np2fla00qw0f8qc9"; depends=[]; };
 Hankel = derive { name="Hankel"; version="0.0-1"; sha256="0g3b0ji8hw29k0wxxvlnbcm0z91p4vbajbrhm6cqbccjq85lg4si"; depends=[]; };
 HapEstXXR = derive { name="HapEstXXR"; version="0.1-8"; sha256="00p8pziy8q6vki7brpd57c7ckc9zw41c90h47yp9vb3ndanfqavp"; depends=[survival]; };
 Haplin = derive { name="Haplin"; version="5.5"; sha256="12wkj5x1s920xs0xzhxk0dswmwan7x20fw5sj6cx29n013h1gkam"; depends=[DatABEL GenABEL MASS mgcv snow SuppDists]; };
 HaploSim = derive { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; };
 HardyWeinberg = derive { name="HardyWeinberg"; version="1.5.5"; sha256="1kz12301bi2880i9ds7wvc6yb5hvrs3fr5689fm1yygkqfq8zc56"; depends=[mice]; };
 HarmonicRegression = derive { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; };
-HelpersMG = derive { name="HelpersMG"; version="1.1"; sha256="0pk8bcad9dnza803cq1428qlgb74vzq0vzx2q6f2j2hwmfpn13dx"; depends=[coda]; };
+HelpersMG = derive { name="HelpersMG"; version="1.2"; sha256="1a9b7j53a8xfxc5dmm6m5f0ac2mir8yzkhg0fgah4gvbivaaz6nb"; depends=[coda]; };
 HiClimR = derive { name="HiClimR"; version="1.2.1"; sha256="12qq3w20xzw2ih15hw5pzn0h58wv8rczhb4zxcdzc7zbg6i8qas4"; depends=[]; };
 HiCseg = derive { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; };
 HiDimDA = derive { name="HiDimDA"; version="0.2-3"; sha256="0pk7hf8cnwv22p5cbpsh5wd94i1an87ddv80qycgypx4wi0v57hh"; depends=[]; };
 HiDimMaxStable = derive { name="HiDimMaxStable"; version="0.1.1"; sha256="0gscdjm48yyf8h3bn6xjbjlfc1hwbbh5j6v64c0z3d04h9q35c24"; depends=[copula maxLik mnormpow mnormt partitions VGAM]; };
 HiLMM = derive { name="HiLMM"; version="1.1"; sha256="09135cwi6kqrvzdlivm86q1dqn6cbbi6nspdm0c2s700jl49pl5z"; depends=[]; };
 HiPLARM = derive { name="HiPLARM"; version="0.1"; sha256="0af68gfmc89nn1chmqay6ix0zygcp1hmylj02i7l6rx6vb06qw6w"; depends=[Matrix]; };
-HiddenMarkov = derive { name="HiddenMarkov"; version="1.8-3"; sha256="1bgkzj9lmv0rbi5a77brw7w69k2w611jh3d851lfqnwx6gxgzkmc"; depends=[]; };
+HiddenMarkov = derive { name="HiddenMarkov"; version="1.8-4"; sha256="1w3j4dnf6ay0a17kn8zdzy38wind4pqfnwlndf9m9fj8m2scaay8"; depends=[]; };
 HierO = derive { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[bitops RCurl rneos tcltk2 XML]; };
 HighDimOut = derive { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[DMwR FNN foreach ggplot2 plyr proxy]; };
 HistDAWass = derive { name="HistDAWass"; version="0.1.2"; sha256="16c4b9nfl6rbca7zifb2q3c5x60rmj32913hw1f79xs9ffdrnkwr"; depends=[class FactoMineR ggplot2 histogram]; };
 HistData = derive { name="HistData"; version="0.7-5"; sha256="17s64hfs7r77p0wjzpbgz9wp3gjzbly2d0v784f9m2bka8gj6xhr"; depends=[]; };
-HistogramTools = derive { name="HistogramTools"; version="0.3.1"; sha256="0cc3saly5q2kn1gr2mam7g901ddcipmlrn1m0amgrnbkakby2320"; depends=[ash Hmisc stringr]; };
 HiveR = derive { name="HiveR"; version="0.2-28"; sha256="1zz1cg7cf4yyv1bymqlyh50nzj5lgdv4clzm0l2vladcxzjvgk8c"; depends=[jpeg plyr png RColorBrewer rgl tkrgl xtable]; };
 Hmisc = derive { name="Hmisc"; version="3.16-0"; sha256="03d372bld4mikyrvmfw00ljiz6jf7szkmhrlgxs5vqk3v81kkp2f"; depends=[acepack cluster foreign Formula ggplot2 gridExtra gtable lattice latticeExtra nnet proto rpart scales survival]; };
 Holidays = derive { name="Holidays"; version="1.0-6"; sha256="031vddjf7s3pirv041y2mw694db63gjajlbczmmya8b1zp2f3vzk"; depends=[TimeWarp]; };
@@ -873,6 +875,7 @@ HotDeckImputation = derive { name="HotDeckImputation"; version="1.0.0"; sha256="
 Hotelling = derive { name="Hotelling"; version="1.0-2"; sha256="0dzsqnn4c4av23qjnmacwc78i0xg355p1xwfmgipr04ivym0mqn0"; depends=[corpcor]; };
 HyPhy = derive { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; };
 HybridMC = derive { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; };
+HydeNet = derive { name="HydeNet"; version="0.9.0"; sha256="1bb238yv1c93gdlnwjly9sncx9227n4a2qibxkdkqhprwsr241h3"; depends=[broom DiagrammeR dplyr graph gRbase magrittr nnet plyr rjags stringr]; };
 HydroMe = derive { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[minpack_lm nlme]; };
 HyperbolicDist = derive { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; };
 IASD = derive { name="IASD"; version="1.0.7"; sha256="0a25sd82fxnmz3f4iaxhc69cdfb7xmh7wi79wv11sbw9cv2pl7kr"; depends=[]; };
@@ -880,12 +883,12 @@ IAT = derive { name="IAT"; version="0.2"; sha256="0byivq2298sjvpsz5z1w7r31h6z2jq
 IATscores = derive { name="IATscores"; version="0.1-2"; sha256="0grl5m4ccwaxvhg1bziy3vv5jffkvr24z268ws5m4ia20haif0dm"; depends=[dplyr nem qgraph reshape2 stringr]; };
 IBDLabels = derive { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; };
 IBDhaploRtools = derive { name="IBDhaploRtools"; version="1.8"; sha256="1754239pdil6b383mpzyi8zb9l9hzg15dwgn5246v97g1y3mlp5r"; depends=[]; };
-IBDsim = derive { name="IBDsim"; version="0.9-4"; sha256="0cpabz7mnhsrmjrgb23zs5anjrkhwc2005b2inl6p93l47i81fps"; depends=[paramlink]; };
+IBDsim = derive { name="IBDsim"; version="0.9-5"; sha256="0mhn1byrx98892gy30dar69pp3cnfwpzkl86gzqyjcxa2d9zpc77"; depends=[paramlink]; };
 IBHM = derive { name="IBHM"; version="1.1-11"; sha256="1m0zxlybcak2v5c4spgaa39ngb2hryak4xd875jryk1dcnk9c702"; depends=[cmaes DEoptim Rcpp]; };
 IBrokers = derive { name="IBrokers"; version="0.9-12"; sha256="0mhh4kgwrncrcysvnvah6xc7fhx5ywjzn258cs9xj9kzns0jblk6"; depends=[xts zoo]; };
 IC2 = derive { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; };
 ICAFF = derive { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; };
-ICC = derive { name="ICC"; version="2.2.1"; sha256="1xl8x8ddbrk8ma57mybmmv9m096wlpbas7hsmd2c6qzcrlz6i7wa"; depends=[]; };
+ICC = derive { name="ICC"; version="2.3.0"; sha256="0y8zh9715cp9bglxpygqwgigrarq37sj845lk1xl0ydwinl0a6kk"; depends=[]; };
 ICE = derive { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; };
 ICEbox = derive { name="ICEbox"; version="1.0"; sha256="1m3p0b93ksrcsp45m4gszcz01cwbfpj4ldar6l0q3c9lmyqsznx8"; depends=[sfsmisc]; };
 ICEinfer = derive { name="ICEinfer"; version="1.0-1"; sha256="0gjgr1r33w6d5ra0njh15lj46lw6v751yl8iqrdf4a5pazs7w3lm"; depends=[lattice]; };
@@ -923,7 +926,7 @@ IntLik = derive { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99
 InterVA4 = derive { name="InterVA4"; version="1.5"; sha256="0w2klq9dara941d4xz85qrq8dcp7vpc6rrz2k9ry01rsnpdzzybh"; depends=[]; };
 Interact = derive { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; };
 InteractiveIGraph = derive { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; };
-Interatrix = derive { name="Interatrix"; version="1.0"; sha256="1lkkjckxc0fc8hg1livgzrgphqwcp53cib0r0vii5jp4zkcna595"; depends=[MASS tkrplot]; };
+Interatrix = derive { name="Interatrix"; version="1.1.1"; sha256="1ljxgiia0y8wv1rlm5brd0yvs1r7r5wyrs6nykmwrwwya4k34mpz"; depends=[MASS tkrplot]; };
 Interpol = derive { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; };
 Interpol_T = derive { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[chron date]; };
 InvariantCausalPrediction = derive { name="InvariantCausalPrediction"; version="0.3-3"; sha256="00sxfgnzqikp92haqnqi4asq904dcsqqnxmz23lx7508qbfx3vhn"; depends=[glmnet mboost]; };
@@ -940,7 +943,7 @@ JASPAR = derive { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28
 JBTools = derive { name="JBTools"; version="0.7.2.9"; sha256="0bynqn3daqgmi3l9asy34mfwyfjkn35k465dfqqi3xwx6cbzlg5k"; depends=[colorspace foreach gplots plotrix]; };
 JGL = derive { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; };
 JGR = derive { name="JGR"; version="1.7-16"; sha256="0iv659mjsv7apzpzvmq23w514h6yq50hi70ym7jrv948qrzh64pg"; depends=[iplots JavaGD rJava]; };
-JM = derive { name="JM"; version="1.3-0"; sha256="0yn33dvy9kp7xaxlqk11f86qaichdcxpmq04gpnbcs8w8cdjjz3m"; depends=[MASS nlme survival]; };
+JM = derive { name="JM"; version="1.4-0"; sha256="0s23cfr3hinsg5g786ya9yhff6ylgnki6y7sgjf9pgr8fjfcq53s"; depends=[MASS nlme survival]; };
 JMbayes = derive { name="JMbayes"; version="0.7-2"; sha256="087brgljj158my1xc0vmbjkh4hqr0509zf8j4fq1b9lj52z7rdl5"; depends=[MASS nlme survival]; };
 JMdesign = derive { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; };
 JOP = derive { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[dglm Rsolnp]; };
@@ -954,7 +957,7 @@ JointRegBC = derive { name="JointRegBC"; version="0.1.1"; sha256="0w7ygs3pvlqkkb
 Julia = derive { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; };
 KANT = derive { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; };
 KATforDCEMRI = derive { name="KATforDCEMRI"; version="0.740"; sha256="1k8fihd9m26k14rvc5d5x0d9xc3mh8d49hs64p55np1acqfhg2sy"; depends=[locfit matlab R_matlab]; };
-KFAS = derive { name="KFAS"; version="1.1.1"; sha256="16r86kcx5av11j1p0dad8qvcj4dszh3kvcy8zp7kaw247kjvr3pv"; depends=[]; };
+KFAS = derive { name="KFAS"; version="1.1.2"; sha256="18mv0azijcfl4gzalvrh0cavd6svjkr8mdnl9jl6bppvann4dri3"; depends=[]; };
 KFKSDS = derive { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; };
 KMDA = derive { name="KMDA"; version="1.0"; sha256="0x4kjjdd59wvgg699vrj99wqg3s1qbkbskis1c34xv9b8bzcv94j"; depends=[]; };
 KMsurv = derive { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; };
@@ -964,7 +967,7 @@ KRLS = derive { name="KRLS"; version="0.3-7"; sha256="0dx4b68xx3saqlkbpvvrhxjscl
 KappaGUI = derive { name="KappaGUI"; version="1.2"; sha256="014d3lshq3avrncd8ydjpn59zalq46v29jrlz3g76wzr96xf5ckr"; depends=[irr]; };
 KappaV = derive { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[maptools PresenceAbsence rgeos sp]; };
 Kendall = derive { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; };
-KernSmooth = derive { name="KernSmooth"; version="2.23-14"; sha256="1dl22pncdlrlysmny0q89yg1s6iafdh75dh31l2hjy16gzlrbhk0"; depends=[]; };
+KernSmooth = derive { name="KernSmooth"; version="2.23-15"; sha256="1xhha8kw10jv8pv8b61hb5in9qiw3r2a9kdji3qlm991s4zd4wlb"; depends=[]; };
 KernSmoothIRT = derive { name="KernSmoothIRT"; version="6.1"; sha256="1hq4sykddh9sg24qrnccii89nqxmq7hnldhn8wl6y62aj0h1nrqm"; depends=[plotrix Rcpp rgl]; };
 Kernelheaping = derive { name="Kernelheaping"; version="0.9"; sha256="0x42cv28c074zcb023plb3pw5ffrihwbl1jlwm2f4h68q84ra3a4"; depends=[evmix ks MASS plyr sparr]; };
 Kmisc = derive { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[data_table knitr lattice markdown Rcpp]; };
@@ -997,6 +1000,7 @@ LMest = derive { name="LMest"; version="2.1"; sha256="1jbwbmamgxbbipzdpjmr7l9csy
 LOGICOIL = derive { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; };
 LOST = derive { name="LOST"; version="1.1"; sha256="19ar85dykbz0jlzbhlm3pcpffj4cizc6sj3gn93qdvpxkp64jfq9"; depends=[e1071 gdata MASS miscTools pcaMethods shapes]; };
 LPCM = derive { name="LPCM"; version="0.44-8"; sha256="14627wk5azxm3y3a0qfy4qz57nxbdcasnv7djpqhk2gxf5smq19k"; depends=[]; };
+LPM = derive { name="LPM"; version="2.5"; sha256="0n9h4zicqa13p40axhdyic7067ap9vw6hcg58n6af8qb1g3xdi8w"; depends=[fracdiff MASS]; };
 LPS = derive { name="LPS"; version="1.0.10"; sha256="0gf3jmhfki01z8fm5xdx59gxvhgzqd10x2iwa8369iz9dvwbjk8j"; depends=[]; };
 LPStimeSeries = derive { name="LPStimeSeries"; version="1.0-5"; sha256="0jmcy8076w4bzfnxaq2m3s60c1wdmywkwzfyrc19wdm8idf666wh"; depends=[RColorBrewer]; };
 LPTime = derive { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fdnqb86x5s6yzb72hh3nrz50awj1f8nn"; depends=[orthopolynom]; };
@@ -1006,11 +1010,11 @@ LS2Wstat = derive { name="LS2Wstat"; version="2.0-3"; sha256="0wkh1a6xbp3qg5favx
 LSAfun = derive { name="LSAfun"; version="0.4"; sha256="178lbk5f2vjcpxand15l1dlqf77zkxap22i9lid5db1bmqh9rpk9"; depends=[lsa rgl]; };
 LSC = derive { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[fields gam LICORS Matrix RColorBrewer]; };
 LSD = derive { name="LSD"; version="3.0"; sha256="069p33aw6iwikp82b7b8wa77wlyjqwr4hcwvrgaxgwqdgn6jjg3k"; depends=[]; };
+LSDinterface = derive { name="LSDinterface"; version="0.2.1"; sha256="1n8ynb99avn6nlhfnl1k8yn5qywhgin67fzk7b7c4b2dd3bhjd3w"; depends=[abind]; };
 LSMonteCarlo = derive { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[fBasics mvtnorm]; };
 LTPDvar = derive { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; };
 LTR = derive { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; };
 LVMMCOR = derive { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[MASS nlme]; };
-LVQTools = derive { name="LVQTools"; version="1.2"; sha256="06mninrrr49xsh00gfsp0vc418r6pdvq3m6sbnj0ywdyki106mni"; depends=[]; };
 LaF = derive { name="LaF"; version="0.6.2"; sha256="180xsqilpkql8my0dimsxj1kpmb3jl19l6bz8li8m63zii4xmwmp"; depends=[Rcpp]; };
 Lahman = derive { name="Lahman"; version="3.0-1"; sha256="0w7vp3vjxhigyyqmmka4bw5v4pp5z3jzmf0krq8biwzrpx5qp86x"; depends=[]; };
 LakeMetabolizer = derive { name="LakeMetabolizer"; version="1.3.3"; sha256="06mgn5dgdw0gaw1za20cabs4bx6q5bgv0x09imxhskik76kini01"; depends=[plyr rLakeAnalyzer]; };
@@ -1020,7 +1024,7 @@ Laterality = derive { name="Laterality"; version="0.9.3"; sha256="0pl5bfbkzhgxjj
 LatticeKrig = derive { name="LatticeKrig"; version="3.4"; sha256="0qa16sxzj40nk4kmzcb7n4xxn7bqlkx7ar66qpqvh2dvcvi1d70d"; depends=[fields spam]; };
 LeLogicielR = derive { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[gdata IndependenceTests RColorBrewer xtable]; };
 LeafAngle = derive { name="LeafAngle"; version="1.2-1"; sha256="0g3i5300f3rvjz7g7z8s5n8xdcsp41gf1vnr4g36m1likddfpxlx"; depends=[]; };
-LeafArea = derive { name="LeafArea"; version="0.1.0"; sha256="0gl31iv1pqb9w352h70y4x57dgfs4v15391fyhsc221803hk2fdn"; depends=[]; };
+LeafArea = derive { name="LeafArea"; version="0.1.1"; sha256="0k085idzs2ka8pqlmii5xcmbv7wm3syicy36gc183wycibv3ii9f"; depends=[]; };
 LearnBayes = derive { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; };
 LiblineaR = derive { name="LiblineaR"; version="1.94-2"; sha256="11q3xydd4navpfcy9yx0fld8ixb6nvnkc7qxwrhvackiy810q86i"; depends=[]; };
 LifeTables = derive { name="LifeTables"; version="0.2"; sha256="1n4mqypxm0rbi77ykpr6bpzxfxvq8mm9bmfvcqz7k3ajb78cdr0d"; depends=[mclust]; };
@@ -1029,30 +1033,30 @@ LinRegInteractive = derive { name="LinRegInteractive"; version="0.3-1"; sha256="
 LindenmayeR = derive { name="LindenmayeR"; version="0.1.4"; sha256="05aq7qmzb7a6kw24pwlg78ch17y945ggrxqn7l2rypn1vfm0br9x"; depends=[stringr]; };
 LinearizedSVR = derive { name="LinearizedSVR"; version="1.3"; sha256="0h3xmlnd5x37r5hdhcz90z5n1hsbr2ci3m939i89p1x9644i2l5g"; depends=[expectreg kernlab LiblineaR]; };
 Lmoments = derive { name="Lmoments"; version="1.1-6"; sha256="0jffnlamll5mwxrfqrb1qr8kjcn40y57kzd10kkm98vzfjcwg4y4"; depends=[]; };
+LncMod = derive { name="LncMod"; version="1.1"; sha256="08001y7s93i3k3478jqfh9zsgpq6ym1xmdmldi7s76zbfr1nknvy"; depends=[pheatmap survival]; };
 LocFDRPois = derive { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; };
 Lock5Data = derive { name="Lock5Data"; version="2.6"; sha256="0ckaac00ck5vyv0gv25l1zhgkm3char6ks1p4fl3vdl5gdyrc1pp"; depends=[]; };
 LogConcDEAD = derive { name="LogConcDEAD"; version="1.5-9"; sha256="135vkp70q6gn75ds43aq08y13vrsgsgykssmnhrh6545i86vmhhi"; depends=[MASS mvtnorm]; };
 LogicForest = derive { name="LogicForest"; version="2.1.0"; sha256="0zdyyi6wka0568414f1kw91rx04y76n1k11wxd4r8svb5wybjhp5"; depends=[CircStats gtools LogicReg plotrix]; };
-LogicReg = derive { name="LogicReg"; version="1.5.6"; sha256="1izsdv8vcfv7lqq6i5kzawvrdbqizp2pvf5kv198cmav0g0p4ijd"; depends=[survival]; };
-LogisticDx = derive { name="LogisticDx"; version="0.1"; sha256="1w530panmbwf4qplzzj02q9g2lfzrkawxy66ibwdd14z9bwjdclj"; depends=[car data_table gRbase multcomp pROC rms speedglm statmod]; };
+LogicReg = derive { name="LogicReg"; version="1.5.8"; sha256="0hjh4wk7dh1ryc75kipdgmkvhz15h46gr9qc5pk49286h11fbnsi"; depends=[survival]; };
+LogisticDx = derive { name="LogisticDx"; version="0.2"; sha256="0ciygvynnyajpn1glxy6mwj9vbl7iv8a8dfsi6wxjxp2rac68rig"; depends=[aod data_table pROC RColorBrewer rms speedglm statmod]; };
 LogitNet = derive { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; };
 LogrankA = derive { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; };
-LoopAnalyst = derive { name="LoopAnalyst"; version="1.2-3"; sha256="0xbiy1xa2c6acfrzh6p9pa6wrds8ipskxq0f86ia9g5zkp1rjk2j"; depends=[nlme]; };
+LoopAnalyst = derive { name="LoopAnalyst"; version="1.2-4"; sha256="02p46agsdbvw6dpgzahq9hfmy184jrkwa1hhnrcbrsmm54n3m2bx"; depends=[nlme]; };
 LowRankQP = derive { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; };
 Luminescence = derive { name="Luminescence"; version="0.4.4"; sha256="0b7a55aqishi6jwxlpkbakfr38brjd4c61n4mcbsg6nwg7qiz1v7"; depends=[bbmle data_table matrixStats minpack_lm raster Rcpp rgl shape XML zoo]; };
 M3 = derive { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; };
-MADAM = derive { name="MADAM"; version="1.2.2"; sha256="09w5liqa3mpkbyvkwlabcgyg2b4316qpzq7pbpl0wxl74bsh76vq"; depends=[]; };
 MAINT_Data = derive { name="MAINT.Data"; version="0.4"; sha256="0338q1yh7b0mbnmh3rbli8vq0fzxyx4qxx0143p615ahsf68jw1c"; depends=[]; };
 MALDIquant = derive { name="MALDIquant"; version="1.12"; sha256="1grlqplcz41xdr3wlmn246xs3vk8y6qqq0n92srv2crlr8fw2yg2"; depends=[]; };
 MALDIquantForeign = derive { name="MALDIquantForeign"; version="0.9"; sha256="0bs6frqz462hrad16kjvbmq2s66bv3kpriav4hdz5a4klra389gl"; depends=[base64enc digest downloader MALDIquant readBrukerFlexData readMzXmlData XML]; };
 MAMA = derive { name="MAMA"; version="2.2.1"; sha256="1dcyfir6jv28jzvphiqrjns3jh2zg2201iwcvjzbmddl2isk9h0i"; depends=[genefilter GeneMeta gtools MergeMaid metaArray metaMA multtest xtable]; };
-MAMS = derive { name="MAMS"; version="0.4"; sha256="0v4sa8cyjdkg7lrznl7jv8xqm6qf67jf946fd6ymbd0wpd7gxrgp"; depends=[mvtnorm]; };
+MAMS = derive { name="MAMS"; version="0.5"; sha256="0wi21d6cskf6hmlf6sygixhwr70n6qx232dc1wm36ljpk18v6rmh"; depends=[mvtnorm]; };
 MAMSE = derive { name="MAMSE"; version="0.1-3"; sha256="06q6raqbyi9zwg3wzaygqmfs3di55fh4bln3vscdw95kma4hz9km"; depends=[]; };
 MAPA = derive { name="MAPA"; version="1.9"; sha256="1i143x2l6fq4vl8l8cagai580yqv446pdw4gw5qzxp85hgvm8bvg"; depends=[forecast]; };
 MAPLES = derive { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; };
 MAR1 = derive { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[bestglm leaps]; };
 MARSS = derive { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[KFAS mvtnorm nlme]; };
-MASS = derive { name="MASS"; version="7.3-40"; sha256="05mmbhswp5dqjd2c6v9w1z1710sm46d53j3prq8maj6bc9qr634y"; depends=[]; };
+MASS = derive { name="MASS"; version="7.3-42"; sha256="10gv2i0i0ap3yrca53fwx9afl7zri1xfbwncnxi1p58zrwjs54lx"; depends=[]; };
 MASSTIMATE = derive { name="MASSTIMATE"; version="1.2"; sha256="1j9l8b5d518ag9ivzr1z4dd2m23y2ia1wdshx1krmshn8xsd6lwp"; depends=[]; };
 MAT = derive { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp RcppArmadillo]; };
 MATA = derive { name="MATA"; version="0.3"; sha256="006mnc4wqh9vdigfzrzx4csgczi0idvlwb6r23w5mmsfbn0ysdm5"; depends=[]; };
@@ -1092,20 +1096,18 @@ MEMSS = derive { name="MEMSS"; version="0.9-2"; sha256="0wyw8yjs4miwgwdfcnfbzvkx
 MESS = derive { name="MESS"; version="0.3-2"; sha256="0x518awi2mxjh3vq69n1jv4d4dxjxhqfx1py48dijgd6w674d3q8"; depends=[geepack glmnet kinship2 Matrix mvtnorm]; };
 MExPosition = derive { name="MExPosition"; version="2.0.3"; sha256="1l27wp0psfvlkk79fhb8ypf8awardjljg1f37yj42friy9pdfksz"; depends=[ExPosition prettyGraphs]; };
 MF = derive { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; };
-MFDA = derive { name="MFDA"; version="1.1-4"; sha256="0zf21al8ivmsxlf1i7kc01w0jx3s6650a034cdynz7axnxx28ncx"; depends=[gss mvtnorm]; };
 MFHD = derive { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; };
-MGL = derive { name="MGL"; version="1.1"; sha256="17xkrq0wzq1gfa6k1lgf34l4ibwjk6j9rnig3l403zpykmf2ffs6"; depends=[]; };
 MGRASTer = derive { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; };
 MGSDA = derive { name="MGSDA"; version="1.1"; sha256="09z066sfjvx7awxc86gfw066wlz6svj7nxkhlas63a7zfbkiz7hl"; depends=[glmnet MASS]; };
 MHadaptive = derive { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; };
 MIICD = derive { name="MIICD"; version="2.1"; sha256="1lh3pbpxn7lbs68741ydw264qn9rap7kmcw49vnjvvzdp7hf24in"; depends=[MASS mstate survival]; };
-MIIVsem = derive { name="MIIVsem"; version="0.2"; sha256="15sv6fskhdm70vyz6y6wbxw9ghwinvqad7414qkn7lgymn5fm767"; depends=[lavaan Matrix]; };
+MIIVsem = derive { name="MIIVsem"; version="0.3"; sha256="13f5h8mw8bwdw2v47nng3w3qn697bn2jgl1p51qg50g4qn3wrbwk"; depends=[lavaan Matrix]; };
 MILC = derive { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; };
 MIPHENO = derive { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; };
 MImix = derive { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; };
 MInt = derive { name="MInt"; version="1.0.1"; sha256="1nk02baainxk7z083yyajxrnadg2y1dnhr51fianibvph1pjjkl6"; depends=[glasso MASS testthat trust]; };
 MKLE = derive { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; };
-MKmisc = derive { name="MKmisc"; version="0.98"; sha256="0ng6n1x2x1bg60byhpk212pihh7hirbjr4s89lzrwj854z93bv5l"; depends=[RColorBrewer robustbase]; };
+MKmisc = derive { name="MKmisc"; version="0.99"; sha256="071vq4r3206v5bnb3cfar9g3hjgk8crqgs1ky7pzqcxyc439bdc0"; depends=[RColorBrewer robustbase]; };
 MLCIRTwithin = derive { name="MLCIRTwithin"; version="1.0"; sha256="01fp2pyiwpzsby3iwn9w9ry4nksy2llwzawrmba80s5m7mrcljbn"; depends=[limSolve MASS MultiLCIRT]; };
 MLCM = derive { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3y4928chxkggnfwwxp8hqw4r6px"; depends=[]; };
 MLDS = derive { name="MLDS"; version="0.4.3"; sha256="1vql92y2dy1ba5l5xdysqzkzvkrr4bhclmjabn49c8qb2xc2rl40"; depends=[MASS]; };
@@ -1113,9 +1115,8 @@ MLEcens = derive { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4
 MLRMPA = derive { name="MLRMPA"; version="1.0"; sha256="0gfbi70b15ivv76l3i0zlm14cq398nlny40aci3vqxxd0m2lyyx5"; depends=[ClustOfVar]; };
 MLmetrics = derive { name="MLmetrics"; version="1.0.0"; sha256="05j8hwcvfrsslib5k4w3xwkllb3rxdxazsld26zpjf3dc643ag9a"; depends=[]; };
 MM = derive { name="MM"; version="1.6-2"; sha256="1z7i8ggd54qjmlxw9ks686hqgm272lwwhgw2s00d9946rxhb3ffi"; depends=[emulator magic Oarray partitions]; };
-MM2S = derive { name="MM2S"; version="1.0.0"; sha256="0g5x375c58xsihj43dh19hx6vh87f8ppjibik5sb7lxvl1xms49c"; depends=[GSVA kknn lattice pheatmap]; };
+MM2S = derive { name="MM2S"; version="1.0.2"; sha256="03yhxr5sh3idsafa1s8y67717yyk4yspc19r0b2cjr22ca2yhv4c"; depends=[GSVA kknn lattice pheatmap]; };
 MM2Sdata = derive { name="MM2Sdata"; version="1.0.1"; sha256="1prx0gm9shizj45382qhja417y18jp6spk2hmgrzb7sbniyqs5pd"; depends=[Biobase]; };
-MMIX = derive { name="MMIX"; version="1.2"; sha256="02c74qp48ixqh5cjp2006zgg4xz4bgxxq3csyhjl219if19kmj5m"; depends=[]; };
 MMMS = derive { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[glmnet survival]; };
 MMS = derive { name="MMS"; version="3.00"; sha256="06909912v2hr52s8k0a0830lbmdh05dcd7k47vydhbwq3rzf3ahg"; depends=[glmnet Matrix mht]; };
 MNM = derive { name="MNM"; version="1.0-1"; sha256="0fy43jfd7wak2rfdv5hdq7zc0zsxnbz9p69g6sla0zliibafg0q6"; depends=[ellipse ICS ICSNP SpatialNP]; };
@@ -1152,26 +1153,25 @@ MUCflights = derive { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqim
 MVA = derive { name="MVA"; version="1.0-5"; sha256="18x075hjqhrjwxivvrixgs6yc67il3n5p1m7v2wymcf8h2mkki91"; depends=[HSAUR2]; };
 MVB = derive { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; };
 MVN = derive { name="MVN"; version="4.0"; sha256="1ql50ch6qig7r0xnfv5f74k3vc32k04jgmvjbndgyzbacn2ibrm7"; depends=[MASS moments mvoutlier nortest plyr psych robustbase]; };
-MVR = derive { name="MVR"; version="1.20.0"; sha256="1wwzws9116ck14g6xd1svmwc9wkr8piwb24bddnzri388p8qkgb4"; depends=[statmod]; };
-MVar_pt = derive { name="MVar.pt"; version="1.1"; sha256="0jcxsf0c9klnj19j8shiadxrbh3wa7da2vywk352ylirl5vdv2yl"; depends=[]; };
-MXM = derive { name="MXM"; version="0.3.1"; sha256="06sp6hy0dparya6fcfbiyhh0h10r8ai8fmh4rq2fz0dq6prk95ic"; depends=[]; };
+MVR = derive { name="MVR"; version="1.30.1"; sha256="0rs1j2kfa43c0l0vsayrql8fchpyfrrp2hh0cq77pvhpviw4v4ga"; depends=[statmod]; };
+MVar_pt = derive { name="MVar.pt"; version="1.2"; sha256="1p3xjlykg40zz5354drz962wm9bcp9kmz8fd56pza7dlybblv9i8"; depends=[]; };
+MXM = derive { name="MXM"; version="0.4"; sha256="1hb30n31a54z1v11vmkccdq62h73divmjfv6s7d2a5371xldj73f"; depends=[Hmisc MASS ROCR survival TunePareto VGAM]; };
 MaXact = derive { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; };
-Maeswrap = derive { name="Maeswrap"; version="1.4.11"; sha256="15i36xj2bdzhly78614077s8k2z75a1gmzl2crsfgvhyyjdax8r7"; depends=[geometry lattice rgl]; };
+Maeswrap = derive { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; };
 ManyTests = derive { name="ManyTests"; version="1.1"; sha256="11xk3j2q7w6b6ljmp7b8gni0khpmpvcvzwxypy0w8ihi2gaczsxj"; depends=[]; };
 Map2NCBI = derive { name="Map2NCBI"; version="1.0"; sha256="02cgmayrhkyji0cwr6n0f439njq29mzna7sgzkq6ml45njm9m5nh"; depends=[]; };
 MapGAM = derive { name="MapGAM"; version="0.7-5"; sha256="0bpswdi7iic7hsqrwcxwv27n4095m292nv5db6d4mj9gvp13h7i7"; depends=[gam maptools sp]; };
-MareyMap = derive { name="MareyMap"; version="1.2"; sha256="1l7s1ffl9bg1zx5nyb1r3dba188mxiaprdda3gqm2cr1f33jmr51"; depends=[tkrplot]; };
+MareyMap = derive { name="MareyMap"; version="1.3.0"; sha256="1blbz1rr0p4fljk7fz2s4x22xj6fxpvhrx0rl0bjg4mgwi2p61aq"; depends=[tkrplot]; };
 MarkowitzR = derive { name="MarkowitzR"; version="0.1502"; sha256="0srrmzr4msn04w5f6s6qs51db8jccpfj10sighsv1l7d056n2xjn"; depends=[gtools matrixcalc sandwich]; };
 MasterBayes = derive { name="MasterBayes"; version="2.52"; sha256="12ka2l4x6psij7wzbb98lwx5shgwzn5v44qfpiw1i6g236yp0mhm"; depends=[coda genetics gtools kinship2]; };
 MatchIt = derive { name="MatchIt"; version="2.4-21"; sha256="02kii2143i8zywxlf049l841b1y4hqjwkr1cnyv6b8b7y7lz2m5v"; depends=[MASS]; };
 Matching = derive { name="Matching"; version="4.8-3.4"; sha256="04m647342j4yi74ds7ddwnyrf58qdy7k3mc067k3p779qavq2ka1"; depends=[MASS]; };
 MatchingFrontier = derive { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[igraph MASS segmented]; };
-Matrix = derive { name="Matrix"; version="1.2-1"; sha256="0farq1x1qhgzdwqqd4bn3g6hbv91hk5sm2v00vphf0zgj2fg2qm6"; depends=[lattice]; };
+Matrix = derive { name="Matrix"; version="1.2-2"; sha256="0f0a8rl8lx1f0f50fxfq4q37d52hd70a611vvgq3rsb39911j935"; depends=[lattice]; };
 MatrixEQTL = derive { name="MatrixEQTL"; version="2.1.1"; sha256="1bvfhzhvm1psgq51kpjcpp7bidaxcrxdigmv6abfi3jk5kyzn5ik"; depends=[]; };
 MatrixModels = derive { name="MatrixModels"; version="0.4-0"; sha256="1jcjsyha0xmz264g1haj7x8zpzjmp1m0jl39h5bf8r45hhlaxcsa"; depends=[Matrix]; };
 MaxPro = derive { name="MaxPro"; version="3.1-2"; sha256="1y2g8a8yvzb24dj0z82nzfr6ylplb9sbi2dmj7f3pb4s3yr5zm8y"; depends=[nloptr]; };
 MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.2.4"; sha256="04ljjzcqfgy136wviz92gdavqzjhbai1v69nj4kg6vc6nwvkhnbx"; depends=[dplyr rgdal rgeos rvest sp stringr]; };
-McParre = derive { name="McParre"; version="1.0.1"; sha256="16bfca867drbknzc6bylg8paa8p72l23wgjpyvy4pd9z6lpgmhdy"; depends=[MASS]; };
 McSpatial = derive { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
 Mcomp = derive { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[forecast tseries]; };
 MedOr = derive { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; };
@@ -1183,7 +1183,7 @@ MetNorm = derive { name="MetNorm"; version="0.1"; sha256="0vfi3k0yp2dz47gwj1n1av
 MetSizeR = derive { name="MetSizeR"; version="1.1"; sha256="11hdmpvnszr6pn9ihb3zjy9miksz1fs4piry153z4dic8pjydkax"; depends=[cairoDevice gWidgets gWidgetsRGtk2 MetabolAnalyze mvtnorm]; };
 MetStaT = derive { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[abind MASS pls]; };
 MetaDE = derive { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[Biobase combinat impute survival]; };
-MetaLandSim = derive { name="MetaLandSim"; version="0.2"; sha256="0lb058kcqpylw27hlmkxmpndsiw71g865fgapw6d599brgi91a8i"; depends=[Biobase e1071 fgui googleVis maptools raster rgeos sp spatstat spgrass6]; };
+MetaLandSim = derive { name="MetaLandSim"; version="0.3"; sha256="04pyl9p2mqf4sgsfbzc2l0hccnq6z9q1929lq24ip0g8pn2svj96"; depends=[Biobase e1071 fgui googleVis maptools raster rgeos sp spatstat spgrass6]; };
 MetaPCA = derive { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; };
 MetaQC = derive { name="MetaQC"; version="0.1.13"; sha256="11595ggjr46z6xiwmhiyx1sydaq68l18y7mgdwxsg81g03ck9x1r"; depends=[foreach iterators proto]; };
 MetaSKAT = derive { name="MetaSKAT"; version="0.40"; sha256="1jxs32hvsw6wzci9f1rc7sw1dfyazdm2d57wcmhkggfg3hkdn1vv"; depends=[SKAT]; };
@@ -1194,7 +1194,7 @@ MethComp = derive { name="MethComp"; version="1.22.2"; sha256="0f9l36d00x054yqgb
 Methplot = derive { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; };
 Metrics = derive { name="Metrics"; version="0.1.1"; sha256="1yqhlsmhh9sl7qngl85b7qb980s54h13wwznpakyvvwlar64yqrw"; depends=[]; };
 MfUSampler = derive { name="MfUSampler"; version="0.9.1"; sha256="0fw1jw2ljsxmvnaayn7zdrrsnbbkkb5n9nm396321p36bqkf1pk3"; depends=[ars]; };
-MiRSEA = derive { name="MiRSEA"; version="1.0"; sha256="1azabfwd83x6g3fpwdqss5b0rxj8zfmj9972bd0brk8z39wggsrr"; depends=[]; };
+MiRSEA = derive { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; };
 MiST = derive { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; };
 MicSim = derive { name="MicSim"; version="1.0.8"; sha256="0i9vyim7wfnaf1zcs1vz6yc7xkr1hzhqcccbcvg15vkzhr23f8lg"; depends=[chron rlecuyer snowfall]; };
 MicroDatosEs = derive { name="MicroDatosEs"; version="0.6.3.1"; sha256="17ka9bdic8vdr0aabmgm216zm9a8jppxll042b5ric4vzplah17d"; depends=[Hmisc memisc]; };
@@ -1206,7 +1206,7 @@ MissMech = derive { name="MissMech"; version="1.0.2"; sha256="1b7i1balfl1cqr3l4l
 MissingDataGUI = derive { name="MissingDataGUI"; version="0.2-2"; sha256="07a3y8l0r7a0f7zmp5pg2aqkf7hyk8cf562x3m8b38w96vir4vr0"; depends=[cairoDevice GGally ggplot2 gWidgetsRGtk2 reshape]; };
 MitISEM = derive { name="MitISEM"; version="1.0"; sha256="03305ds3rgr29z4idaxzsm83igiygna2sqd5vpixklngsrp8w341"; depends=[mvtnorm]; };
 MixAll = derive { name="MixAll"; version="1.0.2"; sha256="10jwiri659i2h0gkaxc41gjvff4v465syxr0nppn1qqz5910jql0"; depends=[Rcpp rtkpp]; };
-MixGHD = derive { name="MixGHD"; version="1.6"; sha256="0lmv1yspjn9m5kw0zd2sabgy33zd77p0nqfvs9cvy3ldvz35095i"; depends=[Bessel ghyp MASS mclust mixture mvtnorm numDeriv]; };
+MixGHD = derive { name="MixGHD"; version="1.7"; sha256="0cbrm5n6gsa61fpk02l3fky482vc2z9wd48hpv87pck6pd7ihqk9"; depends=[Bessel e1071 ghyp MASS mixture mvtnorm numDeriv]; };
 MixMAP = derive { name="MixMAP"; version="1.3.1"; sha256="0m6m9wi0ain7z96s6z6kmwjisfqm3al6m459y5zr2l1cdbdpxfpv"; depends=[lme4]; };
 MixSim = derive { name="MixSim"; version="1.1-1"; sha256="1a1hrsnm6zv9vag7hq8plrkjr4ak26w7k58wdkgxsjb9r6qzm1yf"; depends=[MASS]; };
 MixedTS = derive { name="MixedTS"; version="1.0.1"; sha256="0ljal2jxscwrv439blavf5gjxbi3k3jfqqmwblzfvc05dqgvdk0b"; depends=[MASS]; };
@@ -1218,23 +1218,22 @@ ModelMap = derive { name="ModelMap"; version="3.0.15"; sha256="1d7qn1p4fv94bdlr6
 Momocs = derive { name="Momocs"; version="0.2-6"; sha256="187w6xyswlg5nac6lbprcwvj63gka832n33vlj2ix810vqyxd0fk"; depends=[ade4 ape jpeg shapes sp spdep]; };
 MonetDB_R = derive { name="MonetDB.R"; version="0.9.7"; sha256="0b5agr3dl0ps7fnqw2fsgzb2ysqzvg2ymhxz3xyn08djgz6w7vkm"; depends=[DBI digest]; };
 MonoPoly = derive { name="MonoPoly"; version="0.2-8"; sha256="0lpqqpahpss4q9iddh2p4h6klsrjhg3v6h1wfb70vy0miyhqb93h"; depends=[quadprog]; };
-Morpho = derive { name="Morpho"; version="2.2"; sha256="03j121ghswr1kwq40krk3b4ycn44l9ga3bp64igknvpnqikp5qcb"; depends=[colorRamps doParallel foreach Matrix Rcpp RcppArmadillo rgl Rvcg yaImpute]; };
+Morpho = derive { name="Morpho"; version="2.3.0"; sha256="0k3qclk1sxlrq7y618wwfwq7v4g1hnikggm4vwacx1v7017kp05y"; depends=[colorRamps doParallel foreach Matrix Rcpp RcppArmadillo rgl Rvcg yaImpute]; };
 MorseGen = derive { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; };
 MortalitySmooth = derive { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[lattice svcm]; };
 MplusAutomation = derive { name="MplusAutomation"; version="0.6-3"; sha256="1zb4drqaswzwssky1bp69p3p8inqfdvxg2ji9bjrzf3vf0b5fl4p"; depends=[boot coda gsubfn lattice plyr texreg xtable]; };
 Mposterior = derive { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp RcppArmadillo]; };
 MuFiCokriging = derive { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; };
-MuMIn = derive { name="MuMIn"; version="1.14.0"; sha256="0zwwwp7979kss5871vp6975maqm8gsc0hn75fxq90l0xcyipxvcy"; depends=[Matrix]; };
+MuMIn = derive { name="MuMIn"; version="1.15.1"; sha256="04fl6m60z7h1a4mik58f8r8s3crx53n4jhg0lg9alnzipaij1qi5"; depends=[Matrix]; };
 MultEq = derive { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; };
 MultNonParam = derive { name="MultNonParam"; version="1.0"; sha256="0xff81wjmyw2d38r0v3n7vv0dasg9rlrc0zrdwsmfd83zpvxqj5m"; depends=[]; };
 MultiCNVDetect = derive { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; };
 MultiLCIRT = derive { name="MultiLCIRT"; version="2.9"; sha256="0anb041nd56rrryhv5w1pb0axxsfkqas177r6yf5h5gbc4vn3758"; depends=[limSolve MASS]; };
 MultiMeta = derive { name="MultiMeta"; version="0.1"; sha256="0gj0wk39fqd21xjcah20jk16jlfrcjarspbjk5xv74c9k4p5gmak"; depends=[expm ggplot2 gtable mvtnorm reshape2]; };
 MultiOrd = derive { name="MultiOrd"; version="2.1"; sha256="12y5cg06qyaz72gk3bi5pqkd55n72rz056y9va49znlsqph09x2x"; depends=[corpcor Matrix mvtnorm psych]; };
-MultiPhen = derive { name="MultiPhen"; version="2.0.0"; sha256="05w7khzyxswlsz4sxhaakbz828zrdya1y8qcsdfc6w7wgl8qpmj9"; depends=[abind epitools gplots HardyWeinberg MASS meta RColorBrewer]; };
+MultiPhen = derive { name="MultiPhen"; version="2.0.1"; sha256="1gvsivx8qz5yl4rc4db8sg2llg8s4bgkg22aanvr01h649a08m16"; depends=[abind epitools gplots HardyWeinberg MASS meta RColorBrewer]; };
 MultiRR = derive { name="MultiRR"; version="1.0"; sha256="0m2v13cygabjbsz0fwxwh03csd3yfdpzk4yfvx8lrim9m90026hz"; depends=[lme4 MASS]; };
 MultiSV = derive { name="MultiSV"; version="0.0-67"; sha256="0924lvkx12aqjxxz8bwqdi4h9xc2acf8aynllx0m45ip5r4gh1g2"; depends=[nlme reshape]; };
-Multiclasstesting = derive { name="Multiclasstesting"; version="1.3.9"; sha256="09y3gnarqv15wgmk545qrwpjwb2ilv2b2kc74cxzcb2p1lflfjzm"; depends=[]; };
 MultinomialCI = derive { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; };
 Myrrix = derive { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; };
 Myrrixjars = derive { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; };
@@ -1244,17 +1243,18 @@ NAPPA = derive { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9
 NB = derive { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; };
 NBDdirichlet = derive { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; };
 NBPSeq = derive { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[qvalue]; };
+NCA = derive { name="NCA"; version="1.0"; sha256="0qi047xvazgzzzjdsdgd6blnj30rsqimkld8was0l5568s1qgpn1"; depends=[Benchmarking gplots quantreg sfa yaml]; };
 NCmisc = derive { name="NCmisc"; version="1.1.4"; sha256="0hbrad72lzp0vi0j9lvpmvdih7vijqghqng1f0hjd8fg8hjvcflg"; depends=[dplyr proftools]; };
 NEff = derive { name="NEff"; version="1.1"; sha256="16ys1fi28kbzg3am9vz1c5pc9x0ac47pl6za04h63lspk99yplzk"; depends=[bit msm]; };
-NHANES = derive { name="NHANES"; version="2.0"; sha256="0bdsccr1g2vnisllnmj2z4sma5hdp2iqm1fpr0kmbv1dnkpmxd41"; depends=[]; };
+NHANES = derive { name="NHANES"; version="2.1.0"; sha256="0aphv3rakfcfrv2km1xyxpj1bxiazy6gwrvs7lyhxmq468fk4c9a"; depends=[]; };
 NHEMOtree = derive { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[emoa partykit rpart sets]; };
 NHMM = derive { name="NHMM"; version="3.5"; sha256="03il5y6vz5zyadydhk3qg6sd6fmsw7md9if1igyy9643mxxm1g0f"; depends=[BayesLogit MASS MCMCpack msm Rcpp]; };
 NHMSAR = derive { name="NHMSAR"; version="1.1"; sha256="1qbgxb684qwcb29x95a48r6bndqwdi1drwzimkhkb2ldm98yga3z"; depends=[caTools glasso lars SIS ucminf]; };
 NHPoisson = derive { name="NHPoisson"; version="3.1"; sha256="1gr682kxgw227yqw9w0iw9lrijsz5iszhnfk0mdhi6m1w9s28kcn"; depends=[car]; };
 NISTnls = derive { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; };
 NISTunits = derive { name="NISTunits"; version="1.0.0"; sha256="156rk3wams52lw3inf55s9v7mi5x29mmb41p8kvryimnzgi904ca"; depends=[]; };
-NLP = derive { name="NLP"; version="0.1-7"; sha256="1r7m6mq7i6xcf2qxzwvwx129fq89gx6f8kxqn76iw5a5nfarq87w"; depends=[]; };
-NLPutils = derive { name="NLPutils"; version="0.0-2"; sha256="1ny1q4b4pd1pl6d3lgv9zfkrw5wjd6pvhwlahj82fr1z3nq46bwb"; depends=[NLP qdap SnowballC]; };
+NLP = derive { name="NLP"; version="0.1-8"; sha256="0vzb4rlr30ncqk2whl2apryab8nladm14p9awwg7mp5r4safs2ys"; depends=[]; };
+NLPutils = derive { name="NLPutils"; version="0.0-3"; sha256="1j6y9z8d4ms6lxrz9wq9ydvsnkf4ca5qps8yxmglx81i152aq216"; depends=[NLP qdap SnowballC]; };
 NLRoot = derive { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; };
 NMF = derive { name="NMF"; version="0.20.6"; sha256="0mmh9bz0zjwd8h9jplz4rq3g94npaqj8s4px51vcv47csssd9k6z"; depends=[cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; };
 NMFN = derive { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; };
@@ -1289,7 +1289,7 @@ NetSim = derive { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnh
 NeuralNetTools = derive { name="NeuralNetTools"; version="1.3.1"; sha256="0nk2rs1rfv1lp99kfmqfcwgli92pljzrf4dgxp5q3icgpyf88kqv"; depends=[ggplot2 neuralnet nnet reshape2 RSNNS scales]; };
 Newdistns = derive { name="Newdistns"; version="2.0"; sha256="1jgv9jl6pvsjgjsbjvmjg8qwjx4gsmp4kd27pbqxldp0qp0q9mjf"; depends=[AdequacyModel]; };
 NightDay = derive { name="NightDay"; version="1.0.1"; sha256="0vkpr2jwhgghiiiaiglaj1b9pz25fcsl628c9nsp9zyl67982wz1"; depends=[maps]; };
-Nippon = derive { name="Nippon"; version="0.5.3"; sha256="02m591aljlaxn95k7sl8gfsviv4ywqv9mrkjf6g19kfrc9pbgjqg"; depends=[maptools]; };
+Nippon = derive { name="Nippon"; version="0.6.1"; sha256="0fby543cxlzyd0vpv4xjiqi1hxrrcdxm2rafq3w3crkfid4qm95g"; depends=[maptools sp]; };
 NlsyLinks = derive { name="NlsyLinks"; version="1.302"; sha256="0m1qvrpdfwql4jdk3nbn80llq83wavimifw630gnazwmkgkcncai"; depends=[lavaan]; };
 NominalLogisticBiplot = derive { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; };
 NonpModelCheck = derive { name="NonpModelCheck"; version="1.0"; sha256="0mgbyp651jfqyfavpv12i9kwqf0cpk2mzh9m0b5k4n759710qv8f"; depends=[dr MASS]; };
@@ -1306,7 +1306,6 @@ OLScurve = derive { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhml
 ONETr = derive { name="ONETr"; version="1.0.2"; sha256="1b0djffn4bx6drq5j87s15dwvnjmvraxs52y4dr6micvd9hifa9a"; depends=[RCurl XML]; };
 OOmisc = derive { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; };
 OPDOE = derive { name="OPDOE"; version="1.0-9"; sha256="0pf8rv5wydc8pl4x57g7bk2swjabaxdgijgsigjy5wihfcb48654"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; };
-OPE = derive { name="OPE"; version="0.7"; sha256="0ld3pr94ii1pmfk99qfwgria6ki2iz2hwmn7pj3cjwprv8jkcjji"; depends=[]; };
 OPI = derive { name="OPI"; version="2.1"; sha256="1pzw5b4gwf1q98547cgq7b363fn72ll0zlvcahy56wc1ci5ny3dd"; depends=[]; };
 ORCI = derive { name="ORCI"; version="1.1"; sha256="0xy5lvz2scz06fphjyhqbdhp4bizmv87a8xykp9dbgx8b4ssnqgz"; depends=[BiasedUrn BlakerCI PropCIs]; };
 ORCME = derive { name="ORCME"; version="2.0.1"; sha256="0wr4z19alyp2cvlpg4bs8sni6nrwnhk11bbr00ycqym39alr2wjw"; depends=[Iso]; };
@@ -1315,12 +1314,14 @@ ORIClust = derive { name="ORIClust"; version="1.0-1"; sha256="1biddddyls2zsg71w4
 ORMDR = derive { name="ORMDR"; version="1.3-2"; sha256="0y7b2aja3zvsd6lm7jal9pabcfxv16r2wh0kyzjkdfanvvgk3wmm"; depends=[]; };
 OUwie = derive { name="OUwie"; version="1.45"; sha256="1g1315g015pcnd7g8k0vngjg7f842nq8ixhmqnj64by4vsafliva"; depends=[ape corpcor lattice nloptr numDeriv phangorn phytools]; };
 Oarray = derive { name="Oarray"; version="1.4-5"; sha256="1w66vqxvqyrp2h6acnbg3xy7cp6j2dgvzmqqk564kvivbn40vyy4"; depends=[]; };
+OasisR = derive { name="OasisR"; version="1.0.0"; sha256="0anw1ncbjjmlnhigcfwm9zqmp4ah5cfbmmm3588k95xxp6xq9vmv"; depends=[rgdal rgeos spdep]; };
 OceanView = derive { name="OceanView"; version="1.0.3"; sha256="0k281r358xg599n3h4avwbhnhgcfdawf36p8k3sxwv29292npkzv"; depends=[plot3D plot3Drgl rgl shape]; };
 Ohmage = derive { name="Ohmage"; version="2.11-4"; sha256="14pga59ikiywyl6xnfd2d8sy323vyn88q9sf101bcwp0s0qczwzg"; depends=[RCurl RJSONIO]; };
 OjaNP = derive { name="OjaNP"; version="0.9-8"; sha256="010l75irgj7nl8yq6crp8d00zjgpv9wg2maw99cj0frhqxvqzbfz"; depends=[ICS ICSNP]; };
 OligoSpecificitySystem = derive { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; };
 OmicKriging = derive { name="OmicKriging"; version="1.3"; sha256="1fj131684faj75jdipmsvb8s684x72is6zz79hwb5wszklk00ind"; depends=[doParallel irlba ROCR]; };
 Oncotree = derive { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; };
+OneArmPhaseTwoStudy = derive { name="OneArmPhaseTwoStudy"; version="0.1.3"; sha256="1jhvd5k99yg2n0g1m09wvbjmjynzxg3aafzsp0r00yf7bra3c6q7"; depends=[Rcpp]; };
 OneTwoSamples = derive { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; };
 OpasnetUtils = derive { name="OpasnetUtils"; version="1.2.0"; sha256="1ckagq14w9923a4x7pk9mfzqcfayi00apwd2kvqzgd0s6355r1q7"; depends=[digest ggplot2 httpRequest plyr RCurl reshape2 rgdal rjson sp triangle xtable]; };
 OpenCL = derive { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; };
@@ -1332,7 +1333,7 @@ OptHedging = derive { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h
 OptInterim = derive { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; };
 OptimalCutpoints = derive { name="OptimalCutpoints"; version="1.1-3"; sha256="1vrbx62080r9sgk9ipjvdrqvikp4gwidp5gi5j92hspk7cp10amg"; depends=[]; };
 OptionPricing = derive { name="OptionPricing"; version="0.1"; sha256="0j98h3fn29xfv7xyp7av459v56chw99pnvmsbqvrv4g77p60f5q2"; depends=[]; };
-OrdFacReg = derive { name="OrdFacReg"; version="1.0.5"; sha256="1if6ghagj2196pc73ankfrcms0snlpibgfca1c6lhj96m1waahg2"; depends=[eha MASS survival]; };
+OrdFacReg = derive { name="OrdFacReg"; version="1.0.6"; sha256="16mavsmp6d8rfmimmp5ynwyzir0gycpg8rhd8cwanlrndyclqlpv"; depends=[eha MASS survival]; };
 OrdLogReg = derive { name="OrdLogReg"; version="1.1"; sha256="18s75pmz1g3yac2rfl41kj8sfflq298qkijnvqlybgxpq98ickxx"; depends=[LogicReg]; };
 OrdMonReg = derive { name="OrdMonReg"; version="1.0.3"; sha256="1xca8pvvq79j484l2rmn4nva8ncx8z51g5diljikck231y8qjqaz"; depends=[]; };
 OrdNor = derive { name="OrdNor"; version="1.0"; sha256="1n6c0d4r1w3n016lzk2i5yyvawk9pgmsbzymbbyq7gx8a80iv32h"; depends=[corpcor GenOrd Matrix mvtnorm]; };
@@ -1371,7 +1372,6 @@ PDQutils = derive { name="PDQutils"; version="0.1.2"; sha256="1782nnw5mag4impfs0
 PDSCE = derive { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; };
 PEIP = derive { name="PEIP"; version="2.0-1"; sha256="0zfvp3ngc4320sh6r6y746zxigr2wqgaqasnlkv3hxhzpzxq08lj"; depends=[bvls Matrix pracma RSEIS]; };
 PEMM = derive { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; };
-PERregress = derive { name="PERregress"; version="1.0-8"; sha256="1rhridhfgvrz14h61psfyr5ll13fvxj4b9fwrnlnc6lyqi01wjlc"; depends=[]; };
 PET = derive { name="PET"; version="0.4.9"; sha256="1ijg6mfh3xrc1gjh6a4nq64psk9yh16yc8nfp7c9837xbjigqq7f"; depends=[adimpro]; };
 PF = derive { name="PF"; version="9.5"; sha256="1y99brdabj78s5kxyv0136s40kaaj3zya9lk4qd0kqk83z2gdawp"; depends=[gdata RColorBrewer xtable]; };
 PGICA = derive { name="PGICA"; version="1.0"; sha256="0qxa5hw2s3mndjvk8lb82pcbyj1kbdclx4j4xa8jq0lcj180abi9"; depends=[fastICA]; };
@@ -1381,12 +1381,10 @@ PHENIX = derive { name="PHENIX"; version="1.2"; sha256="0fnrx2xf6q9ng9pwfxbbbzvc
 PHYLOGR = derive { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; };
 PHeval = derive { name="PHeval"; version="0.5.2"; sha256="1q0cyq7b8d42jgiw7ra9vjdjw1zcxpyg6wgb3zgygkmd744ifggp"; depends=[survival]; };
 PIGE = derive { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[ARTP snowfall survival xtable]; };
-PIGShift = derive { name="PIGShift"; version="1.0.0"; sha256="15cgpi7j5cs4aqdq5cy7535x8ar916d9hd109kc01njrwxp1xr96"; depends=[ape mvtnorm]; };
 PIPS = derive { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; };
 PK = derive { name="PK"; version="1.3-2"; sha256="0162ri9wlm9inryljal48av8yxb326na94kckkigsrklfxb3wkp2"; depends=[]; };
 PKI = derive { name="PKI"; version="0.1-1"; sha256="1m4q43yq8ddig15k0j9yg9hq4yz3yplqp68zl3p9g2shkam60p6w"; depends=[base64enc]; };
 PKPDmodels = derive { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; };
-PKfit = derive { name="PKfit"; version="1.2.5"; sha256="0kym2dwb4f53xmf8dq94jz0zmpaiv8pl956j1bs3h9nhhzlaj83y"; depends=[deSolve minpack_lm optimx]; };
 PKgraph = derive { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; };
 PKreport = derive { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; };
 PLIS = derive { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; depends=[]; };
@@ -1397,7 +1395,7 @@ PMA = derive { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3m
 PMCMR = derive { name="PMCMR"; version="1.1"; sha256="0f3882rjyxlcr183qa9y22bxh8nqp307v065aiy61ii0kizj9f70"; depends=[]; };
 PP = derive { name="PP"; version="0.5.3"; sha256="17y1v2536n7ap0kvllwkmndmdjf4wgwl171c053ph45krv37mscf"; depends=[Rcpp]; };
 PPtree = derive { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
-PPtreeViz = derive { name="PPtreeViz"; version="1.0.3"; sha256="0m0nw6kh8ybgdih2d10b8q8q0wknrbppad8nq8jmq85sm0xrrysj"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo reshape2]; };
+PPtreeViz = derive { name="PPtreeViz"; version="1.1.0"; sha256="0rdic7xdb5brxkhdrfcr7mdzxz1a02kjjkln7vwxnqxrhicx6pwz"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo reshape2]; };
 PRISMA = derive { name="PRISMA"; version="0.2-5"; sha256="06z4z1rbsk5a8kpbs6ymm0m02i8dwbmv783c3l2pn4q3pf6ncmd5"; depends=[ggplot2 gplots Matrix]; };
 PROFANCY = derive { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[igraph lattice Matrix]; };
 PROTOLIDAR = derive { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; };
@@ -1413,7 +1411,7 @@ PTAk = derive { name="PTAk"; version="1.2-9"; sha256="1wbjak8dp53601z39kkpa4ysm2
 PTE = derive { name="PTE"; version="1.0"; sha256="10if2hh69yysi2y82m7is74hmzw2xpxijgb8bhy1d4g9n9lqidfs"; depends=[doParallel]; };
 PVAClone = derive { name="PVAClone"; version="0.1-2"; sha256="0afl2il5wdcwzpyhjkgq8iz16q1086c3ndr4cjlyspgbss9h5l24"; depends=[dclone dcmle]; };
 PVR = derive { name="PVR"; version="0.2.1"; sha256="1p87pj9g0qlc8ja6xdj2amny9pbkaqb34x2y9nkl1nj1pkwjq2s5"; depends=[ape splancs]; };
-Pade = derive { name="Pade"; version="0.1-2"; sha256="144wzwh5wy9hmxd4ng6k601ppvdbqn6hrx210kj266dlapwyg8l2"; depends=[]; };
+Pade = derive { name="Pade"; version="0.1-3"; sha256="0jysdk55gnxa3x0j9v7r7qqqim0wfjph1v3amn08xf5wh5fd68yi"; depends=[]; };
 PairViz = derive { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[graph gtools TSP]; };
 PairedData = derive { name="PairedData"; version="1.0.1"; sha256="025h5wjsh9c78bg6gmg6p6kvv2s6d5x7fzn3mp42mlybq0ry78p0"; depends=[ggplot2 gld lattice MASS mvtnorm]; };
 Paneldata = derive { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; };
@@ -1457,14 +1455,14 @@ PolynomF = derive { name="PolynomF"; version="0.94"; sha256="006ds50ivq91v2jyhgp
 Pomic = derive { name="Pomic"; version="1.0.2"; sha256="1i3zsz7gc4n4vid3yi3srrv04qk1678wqyyw303pfibiyfd4m80q"; depends=[]; };
 PopED = derive { name="PopED"; version="0.2.0"; sha256="00qbwabzjb4ns9y9a4gg73zxpx02xcycbm19bdk9z1mv06fkg9dj"; depends=[codetools dplyr ggplot2 MASS mvtnorm nlme]; };
 PopGenKit = derive { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; };
-PopGenReport = derive { name="PopGenReport"; version="2.1"; sha256="040h7cvnh1xqlbsyg1lkfiz88421myr47r63v466bxidwb17bqg2"; depends=[ade4 adegenet calibrate dismo gap gdistance genetics GGally ggplot2 knitr lattice mmod pegas plyr R_utils raster reshape rgdal RgoogleMaps sp vegan xtable]; };
+PopGenReport = derive { 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 = derive { name="PopGenome"; version="2.1.6"; sha256="1wk5k5f80l7k6haiaikhgaqn67q5n7gm632i3yz3frj1ph7bwjb7"; depends=[ff]; };
-PopVar = derive { name="PopVar"; version="1.1"; sha256="1125yynxdg13r84wzbm2h50yqhw1if0zrkaqlcjvmavymmx0vln2"; depends=[BGLR qtl rrBLUP]; };
+PopVar = derive { name="PopVar"; version="1.2.1"; sha256="09az5wa0zai6axhvrljqdjn74nb7jikqwjqy8f570qxb6jbgfgay"; depends=[BGLR qtl rrBLUP]; };
 PortRisk = derive { name="PortRisk"; version="1.0"; sha256="0vyzvi56lmdlhxpbxcxcfqa8271jv2l45w7x1kzzwl6q0wm4bjln"; depends=[zoo]; };
 PortfolioAnalytics = derive { name="PortfolioAnalytics"; version="1.0.3636"; sha256="0xva3ff8lz05f1jvx8hgn8rpgr658fjhf3xyh9ga1r7dii13ld50"; depends=[foreach PerformanceAnalytics xts zoo]; };
 PottsUtils = derive { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; };
 PoweR = derive { name="PoweR"; version="1.0.4"; sha256="00y0dvrsbvz8mr8mdw7fk17s5dfgm0f641qg96039y6g3hk2rn77"; depends=[Rcpp RcppArmadillo]; };
-Power2Stage = derive { name="Power2Stage"; version="0.3-1"; sha256="0a5llzbhl6s71bh21ka2x50pjissl9gg7f5sskailzcmi60yz2zk"; depends=[PowerTOST]; };
+Power2Stage = derive { name="Power2Stage"; version="0.4-1"; sha256="0g2gvi890hv497h7344j0rnf16k375nlbmxq9v4vh65wkb2bp140"; depends=[PowerTOST]; };
 PowerTOST = derive { name="PowerTOST"; version="1.2-07"; sha256="0d8nbha0jwkz4phiddpfm32kf8hjrkck05y3w60f40110j9f8yy7"; depends=[mvtnorm]; };
 PracTools = derive { name="PracTools"; version="0.2"; sha256="1njnm0rk2z9p3p8wsj881mddqhpayh56gyyis4cwb5b6pc344s9p"; depends=[]; };
 PredictABEL = derive { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; };
@@ -1482,7 +1480,7 @@ PropCIs = derive { name="PropCIs"; version="0.2-5"; sha256="0wnc5h4390w4rglr7gjh
 PropClust = derive { name="PropClust"; version="1.4-2"; sha256="13ac895i7ljayyqcjjmwvwar6wf1j0qssazcb5nlz8rw155qwavs"; depends=[dynamicTreeCut flashClust]; };
 PropScrRand = derive { name="PropScrRand"; version="1.1"; sha256="0cj62dzg4zm8d1g8h7qmviiwm93cwplppbi0p674fmmf1wy84v9s"; depends=[]; };
 PsumtSim = derive { name="PsumtSim"; version="0.4"; sha256="0079kb1bgsxs4cwmn33rbbk2jgq39rdjfgz9k9hc64iyzz0i6na3"; depends=[boot EffectsRelBaseline]; };
-PtProcess = derive { name="PtProcess"; version="3.3-9"; sha256="1pgxi6085l6wwcn354rm8zkrm7nvjmyad6627fh5561y9ksws08k"; depends=[]; };
+PtProcess = derive { name="PtProcess"; version="3.3-10"; sha256="175gdyvj1l1d3vm00p0z4sn1ggaf3hly383ngzx2l029nsrxz0zf"; depends=[]; };
 PubBias = derive { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[R_utils rmeta]; };
 PubMedWordcloud = derive { name="PubMedWordcloud"; version="0.3.2"; sha256="1xn4ygpvj6pm548yj5kjh2l8n59p2caihfpbkykvbkzgf7hq8p00"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; };
 PurBayes = derive { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; };
@@ -1534,7 +1532,7 @@ R330 = derive { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6
 R4CDISC = derive { name="R4CDISC"; version="0.3"; sha256="0443mzkhsbrvsl7vawfpabsdqbqr9yjyyhsw1y07yncy55ylc2v5"; depends=[XML]; };
 R4CouchDB = derive { name="R4CouchDB"; version="0.7.1"; sha256="08s999m1kfjzabng41d5fpkag7nrdbricnw7m4jvj1ssqfnil2hj"; depends=[bitops RCurl RJSONIO]; };
 R4dfp = derive { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; };
-R6 = derive { name="R6"; version="2.0.1"; sha256="0ngm3hl0q3aj067q6q0iqh729z8jx3ydvasj1jw9qrr7bzjh1jn5"; depends=[]; };
+R6 = derive { name="R6"; version="2.1.0"; sha256="0vszmwpc32h3gd5jxr47v338nci69cj30wf0b6hkmwznq34hwdfc"; depends=[]; };
 RAD = derive { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[MASS mvtnorm]; };
 RADami = derive { name="RADami"; version="1.0-3"; sha256="0rg07dsh2rlldajcj0gq5sgsl1i3qa28bsrmq88xcljg5hnr4iqn"; depends=[ape Biostrings geiger phangorn]; };
 RAM = derive { name="RAM"; version="1.2.1"; sha256="11ymhx0nk113cy068s52hjj38y8glv8nh24yljqqvr1fd9fmy64g"; depends=[ade4 ape data_table FD ggmap ggplot2 gplots gridExtra Hmisc labdsv lattice MASS permute phangorn phytools plyr RColorBrewer reshape reshape2 RgoogleMaps scales vegan VennDiagram]; };
@@ -1550,6 +1548,7 @@ RAppArmor = derive { name="RAppArmor"; version="1.0.1"; sha256="06j7ghmzw2rrlk8n
 RArcInfo = derive { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; };
 RAtmosphere = derive { name="RAtmosphere"; version="1.1"; sha256="0mk43bq28hlrjwaycsxca458k8xf00q58czgc17d8yx3kz17a5i0"; depends=[]; };
 RBPcurve = derive { name="RBPcurve"; version="1.0-20"; sha256="1fk2zj16xj8n9jnydzd60crdfsigqd6xs2hq572b9r65ldiikv3z"; depends=[BBmisc checkmate mlr shape TeachingDemos]; };
+RBitly = derive { name="RBitly"; version="0.6.1"; sha256="0lwwx9la3dhjy4r14kn8lgz85wwnk59ammn7jh45z2nyk7zflkdr"; depends=[httr jsonlite stringr]; };
 RCA = derive { name="RCA"; version="1.4.5"; sha256="0s200s28a6gh3dggad52dgqnf0k2jsfrqv1hbg8w2529v4s3dc5i"; depends=[igraph]; };
 RCALI = derive { name="RCALI"; version="0.2-15"; sha256="0w9807dyjghqy1rnv2c0k4kdjlwxzg5fk5r3rsqrmzjj4r8x9g9w"; depends=[splancs]; };
 RCEIM = derive { name="RCEIM"; version="0.2"; sha256="0l3lfx3zqxf310rhvjkn977xchxzi7cbzij3ks0nqlx55x5ica9w"; depends=[]; };
@@ -1561,7 +1560,7 @@ RClimMAWGEN = derive { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10m
 RColorBrewer = derive { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; };
 RConics = derive { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; };
 RCryptsy = derive { name="RCryptsy"; version="0.2"; sha256="1sm6l2jbaxia53dqivii5g7pqbczvjk53c2v2vz65qz1qnrmrybj"; depends=[RCurl RJSONIO]; };
-RCurl = derive { name="RCurl"; version="1.95-4.6"; sha256="145li081kqa07w3bzb5zaad6jkr3zr0hcpkjwar76ybrvc4jyi4s"; depends=[bitops]; };
+RCurl = derive { name="RCurl"; version="1.95-4.7"; sha256="1qsxffqcb3lg3zkq6l1l78bm52szlk4d2y2bnmxn4lg0i4yxfx48"; depends=[bitops]; };
 RDIDQ = derive { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
 RDML = derive { name="RDML"; version="0.8-4"; sha256="0zrzi81rlxz8hrpz19g7v470fh930n5y6brn6mjq52shn0ap742m"; depends=[assertthat dplyr plyr R6 XML]; };
 RDS = derive { name="RDS"; version="0.7-2"; sha256="143pb13wg0ms9zaiilb3ylqj6r6bcy4iqbq19j57z33i1q6ll51c"; depends=[ggplot2 gridExtra igraph reshape2 scales]; };
@@ -1599,7 +1598,6 @@ RGtk2Extras = derive { name="RGtk2Extras"; version="0.6.1"; sha256="19gjz2bk9dix
 RH2 = derive { name="RH2"; version="0.2.3"; sha256="1qbxy600fc8k2xl70liggdgg03ga6a8yad001banqzdmh508wcxl"; depends=[chron rJava RJDBC]; };
 RHRV = derive { name="RHRV"; version="4.0"; sha256="16xmmmw8gsqalbqf59xwpkd2bkfwxrdx8bwdn875bizx7mn0bql7"; depends=[nonlinearTseries tkrplot waveslim]; };
 RHT = derive { name="RHT"; version="1.0"; sha256="1gxf8nhj3y92h8al7l3fxa45wc568kb3cykrbdjlsy2zjacf7fcc"; depends=[]; };
-RHive = derive { name="RHive"; version="2.0-0.2"; sha256="0a1saqqwh6zvz264jkkd6c9abxpsg1j4yfivb5h773i76pzhvqc3"; depends=[rJava]; };
 RI2by2 = derive { name="RI2by2"; version="1.2"; sha256="0387ncq1nhpz8521nwsjybsdpncm56nrwkz68apgihmrbjlmp6m7"; depends=[gtools]; };
 RIFS = derive { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; };
 RIGHT = derive { name="RIGHT"; version="0.2.0"; sha256="1mwm7l5l2hj67j03d895rx1181hax31a0nn3nq7rjcgpbljd2gjx"; depends=[ggplot2 plyr rjson shiny]; };
@@ -1644,7 +1642,7 @@ ROCR = derive { name="ROCR"; version="1.0-7"; sha256="1jay8cm7lgq56i967vm5c2hgax
 ROCS = derive { name="ROCS"; version="1.2"; sha256="1liph11p5dwvm1z5vq7ph5pizzqrm6ami94cq6y5kvm2qyv0jfah"; depends=[rgl]; };
 ROCt = derive { name="ROCt"; version="0.8"; sha256="1k0571gq7igg56qxwf9ibk28v763ji0w9183gs6qp95lpbyp5zwr"; depends=[date relsurv survival]; };
 ROCwoGS = derive { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; };
-RODBC = derive { name="RODBC"; version="1.3-11"; sha256="1j6qv7w4klgwzdx9jf6h4l1x1idn3rka70ql37pbnzga1h5dr9yy"; depends=[]; };
+RODBC = derive { name="RODBC"; version="1.3-12"; sha256="042m7bwjhlzpq2hgzsq0zy4ri3s8ngw3w4qrqh1ag7fprpn55flj"; depends=[]; };
 RODBCext = derive { name="RODBCext"; version="0.2.3"; sha256="0j0774gpnd72mw3x9qv7shiwrk0s5rk8hf0wjq4iy42wwbvql7l6"; depends=[RODBC]; };
 RODM = derive { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; };
 ROI = derive { name="ROI"; version="0.1-0"; sha256="01za8cxjf721m2lxnw352k8g32pglmllk50l7b8yhjwc49k8rl66"; depends=[registry slam]; };
@@ -1663,6 +1661,7 @@ RPEnsemble = derive { name="RPEnsemble"; version="0.2"; sha256="1kbgpbk7gma0vhl0
 RPMG = derive { name="RPMG"; version="2.1-7"; sha256="1nkmnqrys65vg377mys6qzpbwfh43adgy76c6jfdg336nf8qx2wd"; depends=[]; };
 RPMM = derive { name="RPMM"; version="1.20"; sha256="09rwrcd8jz0nii1vx0n3b4daidiq0kp0vf88bvi84y4i06743il7"; depends=[cluster]; };
 RPPairwiseDesign = derive { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; };
+RPPanalyzer = derive { name="RPPanalyzer"; version="1.4.1"; sha256="1i9fcypi33qi7lz6rs1i5mvnbfma15jw6n5is03zdd1cjgrnss8r"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; };
 RPostgreSQL = derive { name="RPostgreSQL"; version="0.4"; sha256="0gpmbpiaiqvjzyl84l2l8v2jnz3h41v8jl99sp1qvvyrjrickra2"; depends=[DBI]; };
 RProtoBuf = derive { name="RProtoBuf"; version="0.4.2"; sha256="0ph6sdw0gys70sjlfimgvjk19rbj4v6p7wk05nar6wh8mabpvb63"; depends=[Rcpp RCurl]; };
 RPublica = derive { name="RPublica"; version="0.1.2"; sha256="1fawjkwfxx3z370132vsjjs3ls316gzxzlxp8b4vzrshx1p7vp3q"; depends=[httr jsonlite RCurl]; };
@@ -1670,7 +1669,7 @@ RPushbullet = derive { name="RPushbullet"; version="0.2.0"; sha256="1h9yvw9kw7df
 RQDA = derive { name="RQDA"; version="0.2-7"; sha256="05h2f5sk0a14bhzqng5xp87li24b6n11p5lcxf9xpy7sbmh5ig6g"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; };
 RQuantLib = derive { name="RQuantLib"; version="0.4.0"; sha256="1p2hd7wa5yi5ian2akb70pjr4glfni4dvwgglyg5pqmmm2j45k2d"; depends=[Rcpp]; };
 RRF = derive { name="RRF"; version="1.6"; sha256="1gp224mracrz53vnxwfvd7bln18v8x7w130wslhfgcdl0n4f2d28"; depends=[]; };
-RRTCS = derive { name="RRTCS"; version="0.0.1"; sha256="05ws5n2ajisdh4gfzmilvkz6jvvbl6fiwkcjzwm8bll2rhl916z4"; depends=[sampling samplingVarEst]; };
+RRTCS = derive { name="RRTCS"; version="0.0.2"; sha256="0lwc0girdsrni6qv0z7bggqhlwlny4amgkayd8s3cdh3m006dn95"; depends=[sampling samplingVarEst]; };
 RRreg = derive { name="RRreg"; version="0.3.0"; sha256="0pip05wk76h436mvcsddhn2p25ihms3yf1lb23k7ygpx6jx4mdn3"; depends=[doParallel foreach]; };
 RSA = derive { name="RSA"; version="0.9.8"; sha256="1pqblhimhj79ss8js0nf8w24ga2kdmgw64rh496iib36g27asn8n"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; };
 RSADBE = derive { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; };
@@ -1750,7 +1749,7 @@ RcmdrPlugin_BCA = derive { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xki
 RcmdrPlugin_DoE = derive { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; };
 RcmdrPlugin_EACSPIR = derive { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; };
 RcmdrPlugin_EBM = derive { name="RcmdrPlugin.EBM"; version="1.0-8"; sha256="0lkj869xdacvnma0qq20fqdsq59jqka2fv5h78f99lybzcb95i11"; depends=[abind epiR Rcmdr]; };
-RcmdrPlugin_EZR = derive { name="RcmdrPlugin.EZR"; version="1.28"; sha256="0by00cnfs0yciy1azqvmcbkbf6r8mr2451xjqqxfd4jwmhg3nrxl"; depends=[Rcmdr]; };
+RcmdrPlugin_EZR = derive { name="RcmdrPlugin.EZR"; version="1.29"; sha256="0ffhvh4542jr7slqr9rb118lfqgd58srcpi2p6y32xmk8s26idnx"; depends=[Rcmdr]; };
 RcmdrPlugin_EcoVirtual = derive { name="RcmdrPlugin.EcoVirtual"; version="0.1"; sha256="00yk09c1d1frwpfq12zvhg4gnc3p63r61abnil623jpr6wh4b2x8"; depends=[EcoVirtual Rcmdr]; };
 RcmdrPlugin_FactoMineR = derive { name="RcmdrPlugin.FactoMineR"; version="1.5-0"; sha256="1hfnn12l3jljqpczpxz4m9ywbmw5rc1c8dpfl4cabrxnh6ymnk1a"; depends=[FactoMineR Rcmdr]; };
 RcmdrPlugin_HH = derive { name="RcmdrPlugin.HH"; version="1.1-43"; sha256="0bn94wcrzvcrzhixh8kyg5gkax762mskhm2wvdfz1sm3n6fc7281"; depends=[HH lattice mgcv Rcmdr]; };
@@ -1759,7 +1758,7 @@ RcmdrPlugin_KMggplot2 = derive { name="RcmdrPlugin.KMggplot2"; version="0.2-0";
 RcmdrPlugin_MA = derive { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[MAd metafor Rcmdr]; };
 RcmdrPlugin_MPAStats = derive { name="RcmdrPlugin.MPAStats"; version="1.1.5"; sha256="0km6yglhn0128kk1xm2mnrkr2lkv3r9zndhlv7h1dkd16aph3vm3"; depends=[ordinal Rcmdr]; };
 RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.8.0.4"; sha256="1qxx685wd974dc2zj7myg0jlxz5s63lkjfycc66f3mcj1qk5j4k6"; depends=[MASS mixlm pls Rcmdr xtable]; };
-RcmdrPlugin_RMTCJags = derive { name="RcmdrPlugin.RMTCJags"; version="1.0"; sha256="0fwzr27pk7p82wj1xbajva1ips15jdfgwxzf7815bcm7x7w9xr8v"; depends=[coda igraph Rcmdr rjags rmeta runjags]; };
+RcmdrPlugin_RMTCJags = derive { name="RcmdrPlugin.RMTCJags"; version="1.0-1"; sha256="1hk8gmv74mngcx2pjgv1zkdh2csixxgd4yqz38bdn1l2zf243czq"; depends=[coda igraph Rcmdr rmeta runjags]; };
 RcmdrPlugin_ROC = derive { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[pROC Rcmdr ResourceSelection ROCR]; };
 RcmdrPlugin_SCDA = derive { name="RcmdrPlugin.SCDA"; version="1.1"; sha256="0pd765ndh8d7hy6spds3r4pi09i0ak4b1ygwczp6yr2zcs1aikbc"; depends=[Rcmdr SCMA SCRT SCVA]; };
 RcmdrPlugin_SLC = derive { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[Rcmdr SLC]; };
@@ -1799,12 +1798,12 @@ RcppDL = derive { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx4
 RcppEigen = derive { name="RcppEigen"; version="0.3.2.4.0"; sha256="1p6lfylj0mh059pxbp198r8nci8f89h0gb11x2pi0jgg7cqbxgh6"; depends=[Matrix Rcpp]; };
 RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp]; };
 RcppFaddeeva = derive { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; };
-RcppGSL = derive { name="RcppGSL"; version="0.2.4"; sha256="1nw1984siwxvihp68g7khr2c4a4nwyb4ll04r5302kksz4nh7mpi"; depends=[Rcpp]; };
+RcppGSL = derive { name="RcppGSL"; version="0.2.5"; sha256="16zvqgn4hkijsg5fxvzm6hq200w8z4189aag10zciw81ka4isqv5"; depends=[Rcpp]; };
 RcppMLPACK = derive { name="RcppMLPACK"; version="1.0.10-2"; sha256="1hdvdk6ni2iganmldarklv635yzgzja36zcpflh5w45c5y3ysqvj"; depends=[BH Rcpp RcppArmadillo]; };
 RcppOctave = derive { name="RcppOctave"; version="0.14.5"; sha256="0dplc2x9fq2jfzfbcxdd45pmiimapqb3xhyjkzd4k6q8xmqjw95p"; depends=[digest pkgmaker Rcpp stringr]; };
 RcppParallel = derive { name="RcppParallel"; version="4.3.14"; sha256="04kch598fqxkclv7ys8s9mqsd9wbzjqk1yjc66drzyycjc8jl9qi"; depends=[]; };
 RcppProgress = derive { name="RcppProgress"; version="0.2.1"; sha256="1dah99679hs6pcaazxyc52xpx5wawk95r2bpx9fx0i33fqs1s4ng"; depends=[Rcpp]; };
-RcppRedis = derive { name="RcppRedis"; version="0.1.3"; sha256="0xpldiny2n121dp7vpj9l3bjvjhbfkdim5cassvvj2wms9q4jvh5"; depends=[RApiSerialize Rcpp]; };
+RcppRedis = derive { name="RcppRedis"; version="0.1.4"; sha256="00cv6yicv247bbx617i4k4hfkl5kiv5q2ky84w3sk3g3f0wnp9np"; depends=[RApiSerialize Rcpp]; };
 RcppRoll = derive { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp]; };
 RcppSMC = derive { name="RcppSMC"; version="0.1.4"; sha256="1gcqffb6rkw029cpzv7bzsxaq0a5b032zjvriw6yjzyrpi944ip7"; depends=[Rcpp]; };
 RcppStreams = derive { name="RcppStreams"; version="0.1.0"; sha256="0pb9ri2jajfh7643wx730bkmpvjvvmip682ynm2yn6x6brjll6jf"; depends=[BH Rcpp]; };
@@ -1822,7 +1821,7 @@ ReacTran = derive { name="ReacTran"; version="1.4.2"; sha256="1yc0k3wgg4yb6cqmjk
 RealVAMS = derive { name="RealVAMS"; version="0.3-1"; sha256="04d4sc3lhlklx1y016rmh3x27m8caxlp53qn2ks5wz52w26pfdhn"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
 RecordLinkage = derive { name="RecordLinkage"; version="0.4-8"; sha256="0wjjrgmz7m11hhsw7dcg3745255xckdgrqp3xlqkyh2kzbyr9rp4"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; };
 Records = derive { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; };
-RedditExtractoR = derive { name="RedditExtractoR"; version="1.0.0"; sha256="197zqivkk00ch6vgh9cdqwjwj6gjfbzrvc0cpra1zk8b3h4qx5na"; depends=[RJSONIO]; };
+RedditExtractoR = derive { name="RedditExtractoR"; version="1.1.1"; sha256="00y9m55isnhx8bl82nc2rpll4aijkcrxqgkayqpp2yxy4rj6klfj"; depends=[RJSONIO]; };
 RefFreeEWAS = derive { name="RefFreeEWAS"; version="1.3"; sha256="1cb1q2nki0d18ia4cmi1sp7qih9hv7g1jk1kyp7vya5gp572z3cd"; depends=[isva]; };
 RefManageR = derive { name="RefManageR"; version="0.8.63"; sha256="17gmdyaqg8swfhpa1n8h1rj7aamrgdcprf56vx643ivhih8kgdj4"; depends=[bibtex lubridate plyr RCurl RJSONIO stringr XML]; };
 RegClust = derive { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; };
@@ -1830,8 +1829,8 @@ RegressionFactory = derive { name="RegressionFactory"; version="0.7.1"; sha256="
 RelValAnalysis = derive { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; };
 Reliability = derive { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; };
 ReliabilityTheory = derive { name="ReliabilityTheory"; version="0.1.4"; sha256="1faab4z3rp0xqc0s0rrkw4kxgyc332xz3sjaz1wd4p6kiydds2hi"; depends=[actuar combinat FRACTION HI igraph mcmc PhaseType sfsmisc]; };
-Renext = derive { name="Renext"; version="2.1-10"; sha256="1c18v9xya73j8qnqvkb4fc7bfvzxnw904z5n9n9rgch70nrccqfn"; depends=[evd numDeriv]; };
-RenextGUI = derive { name="RenextGUI"; version="1.0-2"; sha256="0ghs8bwb6qdyvhghxvdy51cibylgm7bdbzgqsn1nbxam39yhvfv9"; depends=[gWidgets gWidgetstcltk Renext]; };
+Renext = derive { name="Renext"; version="3.0-0"; sha256="0byjr9jf2wmcg9adcxfky544icj6fclyscjj2l93ynwpcs9lmjan"; depends=[evd numDeriv]; };
+RenextGUI = derive { name="RenextGUI"; version="1.3-0"; sha256="0ydq57k5va1l10dxyh4hvk3r6d0wncqx9ncj5bkc5691lamqjmj4"; depends=[gWidgets gWidgetstcltk Renext]; };
 Reol = derive { name="Reol"; version="1.55"; sha256="0147x3fvafc47zd2chgv3b40k480pcjpji8vm1d741i1p6ml448p"; depends=[ape RCurl XML]; };
 ReorderCluster = derive { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp]; };
 RepeatedHighDim = derive { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; };
@@ -1842,10 +1841,9 @@ ResourceSelection = derive { name="ResourceSelection"; version="0.2-4"; sha256="
 RevEcoR = derive { name="RevEcoR"; version="0.99.2"; sha256="100sman51vvwg5xkypmksyyjqdb6g858z29vn7x4kvly8ncw4hfd"; depends=[gtools igraph magrittr Matrix plyr stringr XML]; };
 Rfacebook = derive { name="Rfacebook"; version="0.5"; sha256="0cl4s815i4yxp805j8nhqmva31imbd1xp3yxgi53qwjhagh4i57a"; depends=[httpuv httr rjson]; };
 Rfit = derive { name="Rfit"; version="0.21"; sha256="129z5ivwfxbh3rfwk98jnm6ibq5z9z3r9mhy9gv61jfr4ig78dcn"; depends=[quantreg]; };
-Rglpk = derive { name="Rglpk"; version="0.6-0"; sha256="0g0s63skabr0yqk5s9p66p77z8v3pr3hbnirbgdddlvkpphi08xx"; depends=[slam]; };
+Rglpk = derive { name="Rglpk"; version="0.6-1"; sha256="011l60571zs6h8wmv4r834dg24knyjxhnmxc7yrld3y2qrhcl714"; depends=[slam]; };
 RgoogleMaps = derive { name="RgoogleMaps"; version="1.2.0.7"; sha256="04k7h8hgxvgsccdiysbblplwjvn8m7g8h3anzdlxmmjaamd8l9lw"; depends=[png RJSONIO]; };
-Rhh = derive { name="Rhh"; version="1.0.2"; sha256="0blxim8yrb0qnbkc1z2q24q6ryakggq2zhaa223swla99ahmsny3"; depends=[]; };
-Rhpc = derive { name="Rhpc"; version="0.15-147"; sha256="1cb60vsvv6vj0sa1p9p05d16xi446qqckjzbiz0lmiy7k43nyccm"; depends=[]; };
+Rhpc = derive { name="Rhpc"; version="0.15-176"; sha256="0amnr1x1zvh5y2cblx4wjw5y5wm1815x4rm7w03f0ri9qdk5i8ax"; depends=[]; };
 RhpcBLASctl = derive { name="RhpcBLASctl"; version="0.15-148"; sha256="1carylfz9gafradbdyg7fz2bypr7n72fbm8vhyiinmp0k4s5ipvc"; depends=[]; };
 RidgeFusion = derive { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; };
 Ridit = derive { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; };
@@ -1854,7 +1852,7 @@ Rivivc = derive { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z
 Rjpstatdb = derive { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88wfpqn09y1xrkingfkm3z9jsi2bwrnrjc2iv"; depends=[RCurl XML]; };
 Rlab = derive { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; };
 Rlabkey = derive { name="Rlabkey"; version="2.1.127"; sha256="1bacl4ax9bgn27180hgh6gr4y0bwl3q4y18mc0cyb06yagzci5d9"; depends=[RCurl rjson]; };
-Rlibeemd = derive { name="Rlibeemd"; version="1.3.2"; sha256="0db6x2cry011ymmfy1pxgdyjdn6l93d8wmixp59r51yij2s775xq"; depends=[Rcpp]; };
+Rlibeemd = derive { name="Rlibeemd"; version="1.3.5"; sha256="1z691hfasq0iy9zq14xj5rb7na2gxppdaq8mczhxs8ql0fmsz4lf"; depends=[Rcpp]; };
 Rlinkedin = derive { name="Rlinkedin"; version="0.1"; sha256="0w30zv4a842vckk4yqsh8hhkdz2gy650a0x29aacp77p9y79g9yn"; depends=[httpuv httr XML]; };
 Rmalschains = derive { name="Rmalschains"; version="0.2-2"; sha256="1ki3igj78sk4kk1cvbzrgzjdvw6kbdb7dmqglh6ws2nmr5b6a7fx"; depends=[Rcpp]; };
 Rmisc = derive { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; };
@@ -1895,7 +1893,7 @@ Rsolnp = derive { name="Rsolnp"; version="1.15"; sha256="10w9gd1l62r638sh00fbgcp
 Rsomoclu = derive { name="Rsomoclu"; version="1.4.1"; sha256="0yr0nsm2b7wg1x57db9zclqnqqbmhyax9vgw13ynqirq2ysxxsg6"; depends=[Rcpp]; };
 Rssa = derive { name="Rssa"; version="0.13"; sha256="1prcivlwxky4h33ybky7n3wpn4vj1wm898ifsrhs1j9ywla1m2zf"; depends=[forecast lattice svd]; };
 Rsundials = derive { name="Rsundials"; version="1.6"; sha256="0vrvxsznbclgls4jljc59lyli6cw9k1a3wapfrs6xbkqi8865iif"; depends=[]; };
-Rsymphony = derive { name="Rsymphony"; version="0.1-20"; sha256="10l3z9b51c8xsdfnscwn6g868xn84pfw3dlyj3vrsw3vs7qbi0gl"; depends=[]; };
+Rsymphony = derive { name="Rsymphony"; version="0.1-21"; sha256="0wjj1wlh45fhgbzfqh0rdxrahc68w1gkvzx6kx46m6ww7k6l3pqb"; depends=[]; };
 Rtsne = derive { name="Rtsne"; version="0.10"; sha256="14270gg0fp3imq9rafqj56ld56kzby7yyf5rg9z0wlimm7s72hy5"; depends=[Rcpp]; };
 Rttf2pt1 = derive { name="Rttf2pt1"; version="1.3.3"; sha256="16bnhrg86rzi4g4zf235m1g8amyhcwxpw0wgcxynfiinm2fl4y1n"; depends=[]; };
 Rtts = derive { name="Rtts"; version="0.3.1"; sha256="1zgrkj4y7267d1n8iw1q3pgf2lmmklkslf5211kl7v788zxqr9c5"; depends=[RCurl]; };
@@ -1903,7 +1901,7 @@ Ruchardet = derive { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c34
 Runiversal = derive { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; };
 Runuran = derive { name="Runuran"; version="0.21.0"; sha256="1p33z9h2zj6fx42rlq6yajd6lwvzy4a1a5gs67dz5k1zbza8avw0"; depends=[]; };
 RunuranGUI = derive { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[cairoDevice gWidgets gWidgetsRGtk2 Runuran rvgtest]; };
-Rvcg = derive { name="Rvcg"; version="0.11"; sha256="0id732zhncy6x47qdbyddcm3f8l1r4j53ya4qj3zcf81q15dadw0"; depends=[Rcpp RcppEigen]; };
+Rvcg = derive { name="Rvcg"; version="0.12.2"; sha256="15lj2ba9fwzbqzwwl7wpzij1n983qxmql2fwxjcapkl76hl68kp9"; depends=[Rcpp RcppEigen]; };
 Rvmmin = derive { name="Rvmmin"; version="2013-11.12"; sha256="1ljzydvizbbv0jv5lbfinypkixfy7zsvplisb866f8w45amd152a"; depends=[optextras]; };
 Rwave = derive { name="Rwave"; version="2.4"; sha256="1ynj6higx0j6iv033lx8h3i9hlg5b53nl2gv6fwjny4ygm8b1mjm"; depends=[]; };
 Rwinsteps = derive { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; };
@@ -1937,7 +1935,6 @@ SDD = derive { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvy
 SDDE = derive { name="SDDE"; version="1.0.0"; sha256="1vd96w6qjy7ak85gj1c255fb0ifaffp79k6swqnvskvkq2cc524m"; depends=[doParallel foreach igraph iterators]; };
 SDMTools = derive { name="SDMTools"; version="1.1-221"; sha256="1kacrpamshv7wz83yn45sfbw4m9c44xrrngzcklnwx8gcxx2knm6"; depends=[R_utils]; };
 SDaA = derive { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; };
-SE_IGE = derive { name="SE.IGE"; version="1.0"; sha256="0gx3kdsdl3rjms6fxabxz51z84r9mcy4934l2g43ifrxbyphnias"; depends=[]; };
 SEAsic = derive { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; };
 SECP = derive { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; };
 SEER2R = derive { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; };
@@ -1951,6 +1948,7 @@ SGCS = derive { name="SGCS"; version="2.3"; sha256="1c917g03s50mp96lqhkjagsd2cq9
 SGL = derive { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; };
 SGP = derive { name="SGP"; version="1.2-0.0"; sha256="0v4ljhvfrvl6izprcrw8w36474fjz0v1kpcsg0sx32359amd3zxz"; depends=[Cairo colorspace data_table doParallel foreach gridBase iterators jsonlite plyr quantreg reshape2 RSQLite sn]; };
 SGPdata = derive { name="SGPdata"; version="8.0-0.0"; sha256="0g25s2wcj47394fm16maygafnynizma3mgb3r65b5p9c27swk4v8"; depends=[]; };
+SHELF = derive { name="SHELF"; version="1.0.1"; sha256="0nk63nrj0x1nlbwy885wmsipjcvhs8vqldlc33j4j8k49bkih7sz"; depends=[shiny]; };
 SHIP = derive { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; };
 SID = derive { name="SID"; version="1.0"; sha256="1446zy4rqbw0lpyhnhyd06dzv238dxpdxgmsk34hqv7g3j7q5h1w"; depends=[igraph Matrix pcalg RBGL]; };
 SII = derive { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; };
@@ -1973,7 +1971,6 @@ SMPracticals = derive { name="SMPracticals"; version="1.4-2"; sha256="0apmkmsv2f
 SMR = derive { name="SMR"; version="2.0.1"; sha256="0qy56fmismcjklpf29ic2gi1g8ajdjpxsl0akb9cqzyisyf641ia"; depends=[]; };
 SMVar = derive { name="SMVar"; version="1.3.3"; sha256="17wr4lixy3p32gr4jq02d7zsr88yrbddjsvynzdsdrwbxf4mwqhp"; depends=[]; };
 SNFtool = derive { name="SNFtool"; version="2.2"; sha256="1d84ybsi91mr3ma4jzmr9606hg1q00yg0dn50vkjnyda50igcb1c"; depends=[heatmap_plus]; };
-SNPMClust = derive { name="SNPMClust"; version="1.0"; sha256="1vyag8axrl888qhjsbv7g84hzfsnvxh5ccdcdriamy50c2chkji8"; depends=[MASS mclust]; };
 SNPassoc = derive { name="SNPassoc"; version="1.9-2"; sha256="113byj8zbg6xyxb1qzm76sqfyk3fap0sd90691zzm1x2pbfnb3mh"; depends=[haplo_stats mvtnorm survival]; };
 SNPmaxsel = derive { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[combinat mvtnorm]; };
 SNPtools = derive { name="SNPtools"; version="1.1"; sha256="0l29kiqz4048x7amxx1qzkaw2xnd6lpdsdp5nq3rck9amx2hw64a"; depends=[Biostrings GenomicRanges IRanges Rsamtools]; };
@@ -1994,7 +1991,6 @@ SPECIES = derive { name="SPECIES"; version="1.0"; sha256="0p45llf2wjr467bqr4pblj
 SPEI = derive { name="SPEI"; version="1.6"; sha256="0mbz4nydnzwypfbi1d9fjy09x6133q096qbfrc913dbidzkvfpqv"; depends=[lmomco]; };
 SPIAssay = derive { name="SPIAssay"; version="1.0.0"; sha256="1rwa2iicwdm7z8khlnly0ybrqiisw420anr2pcdd5chxa48h8apg"; depends=[]; };
 SPIn = derive { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; };
-SPMS = derive { name="SPMS"; version="2.0"; sha256="150kb4gjiksp3kc7p9j5zqc4955rq4fb27as71z89h23mkswz5r5"; depends=[Matrix]; };
 SPODT = derive { name="SPODT"; version="0.9-1"; sha256="01yq429a4s63855bwpn2mqjj2k3cz4187kfpi7n7qqdpdvmxz109"; depends=[rgdal sp tree]; };
 SPOT = derive { name="SPOT"; version="1.0.5543"; sha256="0y8rj0wxy8sdk7si9k11i4pb96vp1q78h48ihs4r7d383zykk827"; depends=[AlgDesign emoa MASS mco randomForest rgl rpart rsm twiddler]; };
 SPREDA = derive { name="SPREDA"; version="1.0"; sha256="1dyqsra899fd1nbk1b7vkw8gs455c6pbcvzw84q9iri77186xqhv"; depends=[nlme survival]; };
@@ -2004,14 +2000,15 @@ SPmlficmcm = derive { name="SPmlficmcm"; version="1.3"; sha256="0igybzc6fx6yd8xq
 SQDA = derive { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[limma mvtnorm PDSCE]; };
 SQN = derive { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; };
 SQUAREM = derive { name="SQUAREM"; version="2014.8-1"; sha256="17fn37da4zslbfq5h4f3dfwyw1dxj5y2rgly3vjl2c4k5bnwxxqw"; depends=[]; };
-SRCS = derive { name="SRCS"; version="1.0"; sha256="0aha9fqdigvsx8dvck4y2yb8c7v58rivz50z0xwi0bhwzdddx52f"; depends=[]; };
+SRCS = derive { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; };
 SRRS = derive { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; };
-SSDforR = derive { name="SSDforR"; version="1.4.9"; sha256="1ka6zy77ml4kccfqjszvijh9dvlhzcp7fhsd2zsirsn6sdz0wrp0"; depends=[MASS psych TSA TTR]; };
+SSDforR = derive { name="SSDforR"; version="1.4.10"; sha256="1i9k8ga1dkkds2bbczhsyxhlmq9pj1zbv6lwxchx5wrcbsq54yxi"; depends=[MASS psych TSA TTR]; };
 SSN = derive { name="SSN"; version="1.1.5"; sha256="1iymq6zzs3zfbjkz7h2ss8djdzvw2b3n68qazvw8vnrnkq3iyzry"; depends=[BH igraph lattice maptools MASS RSQLite sp]; };
 SSrat = derive { name="SSrat"; version="1.0"; sha256="1qpsdfdngsgxx3mqgn4avl65w4v5v4jwsh1nnxzfn9iqi9mg4bhi"; depends=[plyr sna]; };
 SSsimple = derive { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; };
 STAR = derive { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[codetools gss mgcv R2HTML survival]; };
 STEPCAM = derive { name="STEPCAM"; version="1.0"; sha256="0lgikdj0mghz5hjm3rlrnnddjhvf9cmm0hwklbdyl3h816gq1jci"; depends=[FD gtools MASS vcd]; };
+STMedianPolish = derive { name="STMedianPolish"; version="0.1"; sha256="1mysmigksrgkgzz7cng5vn8i7q4marq144dpwww30lisw2jgraiq"; depends=[maptools reshape2 sp spacetime zoo]; };
 STPGA = derive { name="STPGA"; version="1.0"; sha256="1kqxzjrxf194n006dr3h5kprb4l7qy8bgm2n6251p0sswpvr70j1"; depends=[]; };
 SUE = derive { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; };
 SVMMaj = derive { name="SVMMaj"; version="0.2-2"; sha256="01njc7drq01r3364081dv9gn37vrql52zbrb60gd559f3jshqx3m"; depends=[kernlab MASS]; };
@@ -2023,7 +2020,7 @@ Sabermetrics = derive { name="Sabermetrics"; version="1.0"; sha256="1x35h1ffy6jn
 Sample_Size = derive { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; };
 SampleSizeMeans = derive { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; };
 SampleSizeProportions = derive { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; };
-SamplerCompare = derive { name="SamplerCompare"; version="1.2.6"; sha256="1n94fp6frawlbxcnvi0v6lhgs3yyc47lj1r46y3jg6zb9z3va3fa"; depends=[mvtnorm]; };
+SamplerCompare = derive { name="SamplerCompare"; version="1.2.7"; sha256="149ipraps9dngmvpy5w5q9a1zgnwqblhawrk6184g52ij33jv4ji"; depends=[mvtnorm]; };
 SamplingStrata = derive { name="SamplingStrata"; version="1.0-3"; sha256="16nrcv5hbbvn4rgckzagi84i7h49bd878mnpknlzmzr5ykzywsay"; depends=[]; };
 Scale = derive { name="Scale"; version="1.0.4"; sha256="1fa3840kji34qpbw6mxfavk8wq0vq0vx2w6ya71idbkxnvwc3y06"; depends=[Hmisc MASS psych]; };
 SciViews = derive { name="SciViews"; version="0.9-5"; sha256="199waafpn0ndg7szwfhw2jlgcx1f0pv7j0vix2vzz60knwm698xb"; depends=[ellipse MASS]; };
@@ -2043,16 +2040,16 @@ SemiMarkov = derive { name="SemiMarkov"; version="1.4.1"; sha256="048hmbcmhqkvqw
 SemiPar = derive { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[cluster MASS nlme]; };
 SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.4"; sha256="038k5vvgrk20n2cbji8qrp9nkg0ck5dcbxnd7wc5hy1l780g4k5g"; depends=[magic mgcv survey trust VGAM VineCopula]; };
 SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.2"; sha256="1k9xmby8hy4k0qn7pjj0rypxj4iqb206ixv92bz7ga0q8zd0nxbr"; depends=[copula gamlss_dist magic Matrix mgcv mvtnorm trust VGAM]; };
-SenSrivastava = derive { name="SenSrivastava"; version="2012-04-0"; sha256="0ki0kl18cj8lkad6q48piyvslkirs8y5rnfa8bvgjxsisxg2ahhp"; depends=[]; };
+SenSrivastava = derive { name="SenSrivastava"; version="2015.6.25"; sha256="0r4p6wafnfww07kq19lfcs96ncfi0qrl8n9ncp441ri9ajwj54qk"; depends=[]; };
 SensitivityCaseControl = derive { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; };
 SensoMineR = derive { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29bbpssl0rqag3w8im4nm9964lr7r012y5wdqhx"; depends=[cluster FactoMineR KernSmooth]; };
 SensusR = derive { name="SensusR"; version="1.0"; sha256="1b5yrb3iiijr7x0r4ga5dlx6yqqk4bvmh1377655s6c7j36sn1xd"; depends=[jsonlite lubridate plyr rworldmap sp]; };
 SeqFeatR = derive { name="SeqFeatR"; version="0.1.7"; sha256="195pkpk9sh99v01mk827axsynwaccygx19i1x0h0ma7bsqlmw1qc"; depends=[ape Biostrings calibrate ggplot2 phangorn plotrix plyr qvalue tcltk2 widgetTools]; };
 SeqGrapheR = derive { name="SeqGrapheR"; version="0.4.8.3"; sha256="03plwa3sc1pg34p1szbz3d0z8y53w7iqm7qn9q6fj72rsnk5spxc"; depends=[Biostrings cairoDevice gWidgets gWidgetsRGtk2 igraph rggobi]; };
-Sequential = derive { name="Sequential"; version="2.0"; sha256="0dndy4a1waxgwj43gq1zb6cqwvrafcr729hhr7qckw5crcmm0iph"; depends=[]; };
+Sequential = derive { name="Sequential"; version="2.0.1"; sha256="11z7d02j97589s5csq5vzsfal3vip5klhm1q8h8pizqjv32i1lv5"; depends=[]; };
 SetMethods = derive { name="SetMethods"; version="1.0"; sha256="0zizvrzyk01w4ncazvifmjm4h5zrpsf6n68n11sc8f5kzny9ia48"; depends=[betareg lattice]; };
 ShapeSelectForest = derive { name="ShapeSelectForest"; version="1.0"; sha256="0jy40aql33xwl4s7y2s3wb6yig4vr6ly6fhz7hn2d59b8428p04q"; depends=[coneproj raster rgdal]; };
-SharpeR = derive { name="SharpeR"; version="0.1501"; sha256="138faypgrfph48wvz600l20ypqzxdir4q43bl9s7vndysya3vsnl"; depends=[matrixcalc]; };
+SharpeR = derive { name="SharpeR"; version="1.0.0"; sha256="107nk8ipqx4mzfhlv5b6k6vx60zi9rmvzk8qaxqic170p4ppcl2z"; depends=[matrixcalc sadists]; };
 ShrinkCovMat = derive { name="ShrinkCovMat"; version="1.1.0"; sha256="1v2rr97wz5521cjy41j5vdqq29xd7696pc1rzw4angsfjrq3fnh4"; depends=[]; };
 SiZer = derive { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; };
 SightabilityModel = derive { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; };
@@ -2080,7 +2077,8 @@ SnowballC = derive { name="SnowballC"; version="0.5.1"; sha256="0kbg33hy6m2hv9js
 SoDA = derive { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; };
 SocialMediaMineR = derive { name="SocialMediaMineR"; version="0.1"; sha256="113nyjncl5yi61hz8i7k60b3f0f9a5vyrd3s72nbmc44cnvr8fci"; depends=[httr jsonlite RCurl]; };
 SocialNetworks = derive { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp]; };
-SocialPosition = derive { name="SocialPosition"; version="1.0"; sha256="0aqx6raskybxwavl7366klhagclq0zlklr5sd0l9h6cz530h3azq"; depends=[]; };
+SocialPosition = derive { name="SocialPosition"; version="1.0.1"; sha256="1rrrjlq6czzhzipvkisbq024ca22v2vzx7wa4ddr9j7hnyyzzpic"; depends=[]; };
+Sofi = derive { name="Sofi"; version="0.0.26"; sha256="0jcnwy308h8qdswapdqpphdx5757a4a6bmrdmyzh0ny52a4w07n1"; depends=[foreign sampling shiny]; };
 SoftClustering = derive { name="SoftClustering"; version="1.1502"; sha256="1pgg9mjpfw55m3ny726vx5wl8gwsdkrxv8xzgmy3aqdlwzhh4bwz"; depends=[]; };
 SoilR = derive { name="SoilR"; version="1.1-23"; sha256="1cryypgnbck5hvkc2izrd8r10q2b97f2p1s46x4dk8p099gck5wg"; depends=[deSolve RUnit]; };
 SortableHTMLTables = derive { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[brew testthat]; };
@@ -2104,7 +2102,7 @@ SpherWave = derive { name="SpherWave"; version="1.2.2"; sha256="1wd9pql97m1zl0ax
 SphericalCubature = derive { name="SphericalCubature"; version="1.0.1"; sha256="0j592zvs07yc6amahlxgdw0k1vqr89gvcq22vcwzkx62igvlf6pv"; depends=[cubature]; };
 SphericalK = derive { name="SphericalK"; version="1.1"; sha256="18h1k0gy65jvzfpsda0ifv3nn3pvzx5ifllxbwh0my6w75c4biqn"; depends=[]; };
 SportsAnalytics = derive { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; };
-StAMPP = derive { name="StAMPP"; version="1.3"; sha256="1igf6arp7glihkv60zc7c0zwfqaf5kcm2d1xr856fj194zxww9ad"; depends=[adegenet doParallel foreach pegas]; };
+StAMPP = derive { name="StAMPP"; version="1.4"; sha256="0rmp5l50dkkldq9xc1abhdxjhbwlqk3i3g0d8w3xissidnz5n31b"; depends=[adegenet doParallel foreach pegas]; };
 StMoMo = derive { name="StMoMo"; version="0.2.0"; sha256="1pddlwf3kns9fzmqddfak6bir0mc1i4bv9cswj5pbhpavsd08r1c"; depends=[fanplot fields forecast gnm MASS reshape2 rootSolve]; };
 StMoSim = derive { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[Rcpp RcppParallel]; };
 StableEstim = derive { name="StableEstim"; version="2.0"; sha256="080khfix88j4656hmdy9l0xpbk9zzw7z7d7f6yvwsbalk3ag18i5"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; };
@@ -2113,7 +2111,7 @@ StanHeaders = derive { name="StanHeaders"; version="2.6.0-10"; sha256="0bw11myc1
 StandardizeText = derive { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; };
 Stat2Data = derive { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; };
 StatDA = derive { name="StatDA"; version="1.6.9"; sha256="01bjygis14b3yfsfkjbvy0zlhjxysjf46cfcw8p4a4lwik3qp03b"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat xtable]; };
-StatDataML = derive { name="StatDataML"; version="1.0-25"; sha256="05s9kbrjl2wsfccgav34b02m06q62r3iyjd0ndr6xcqlw9x2w2ya"; depends=[XML]; };
+StatDataML = derive { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; };
 StatMatch = derive { name="StatMatch"; version="1.2.3"; sha256="10y9xaclxrw65v3k9qwdm7lvvf1kxpssc9nx0f15m8xkw5hhm7pa"; depends=[clue lpSolve proxy RANN survey]; };
 StatMeasures = derive { name="StatMeasures"; version="1.0"; sha256="1bnbz803xx8kqhy1cx545b35si6f10za0mp5z82qfvd4kv9a9izz"; depends=[data_table]; };
 StatMethRank = derive { name="StatMethRank"; version="1.0"; sha256="0mcvwn1f3hylvyg46vigc5wnvhhig5v01ag3y9rap32v85f308zh"; depends=[MASS pmr rjags]; };
@@ -2136,7 +2134,6 @@ SuppDists = derive { name="SuppDists"; version="1.1-9.1"; sha256="1jqsv1lzjblc7s
 Surrogate = derive { name="Surrogate"; version="0.1-61"; sha256="0jifjns0v22risy783a0s71v6sn165wn7w6a47sb7dsdimrvnn9d"; depends=[lattice latticeExtra lme4 MASS msm nlme rgl]; };
 SurvCorr = derive { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields survival]; };
 SurvLong = derive { name="SurvLong"; version="1.0"; sha256="000ywg0sdk9kailiy7ckhq4mkaawl9hh88w6apj5khgpxsyj8aw3"; depends=[]; };
-SurvRegCensCov = derive { name="SurvRegCensCov"; version="1.3"; sha256="1sl17x984ww07aakz6dambn5kznw4hvj4b8ahy2r4mr6wf2dpg5a"; depends=[numDeriv survival]; };
 Survgini = derive { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; };
 SvyNom = derive { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[Hmisc rms survey survival]; };
 SweaveListingUtils = derive { name="SweaveListingUtils"; version="0.6.2"; sha256="0n15gkiil9rlb0dhnkfimhcs09av35b7qx79iba7bx3y7spvzaqy"; depends=[startupmsg]; };
@@ -2145,7 +2142,7 @@ SyNet = derive { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfm
 SynchWave = derive { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; };
 SynergizeR = derive { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RCurl RJSONIO]; };
 Synth = derive { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
-TAM = derive { name="TAM"; version="1.7-1"; sha256="1zsgdilxh7j7ay74a5id7iwm0mz3vf1rcgw7fvclic1ndwwj68z3"; depends=[CDM GPArotation lattice lavaan MASS mirt msm mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc tensor WrightMap]; };
+TAM = derive { name="TAM"; version="1.9-0"; sha256="0ysl77dk2fxzm5x7910sgpc9ajlijrlmja6sq8xac52qbmj9ggd9"; depends=[CDM GPArotation lattice lavaan MASS msm mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc tensor WrightMap]; };
 TANOVA = derive { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; };
 TAQMNGR = derive { name="TAQMNGR"; version="2015.2-1"; sha256="0j7qb15xy4g4ff0cmyjyz4lsalaxxf6zdwbq49j3y80ld0pvwhbk"; depends=[Rcpp]; };
 TBEST = derive { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[fdrtool signal]; };
@@ -2160,7 +2157,7 @@ TED = derive { name="TED"; version="1.1.1"; sha256="0nb2arx7c1m8ymnkmj3jwbcw23vh
 TEEReg = derive { name="TEEReg"; version="1.0"; sha256="1xpr4m8yamifjx7njb7dyqv51rsbjym9c5avflf69r9sazf3n503"; depends=[]; };
 TEQR = derive { name="TEQR"; version="5.0-0"; sha256="04r26qzps7nnvs4s2xpvjf6q456wa29alhsds07xvyqhi972xhs6"; depends=[]; };
 TERAplusB = derive { name="TERAplusB"; version="1.0"; sha256="0mshx615awcf2arm39mgw2gzgpyn7a3f767484g7z4nqqlikwpgc"; depends=[]; };
-TESS = derive { name="TESS"; version="1.2.1"; sha256="15wrbbhrzj66j0z6xhnbf560qg0dzm1yqfbpmx070n3lsa2rdyij"; depends=[ape coda deSolve]; };
+TESS = derive { name="TESS"; version="2.0.0"; sha256="0zsycanxp8fxy1kb9jj38si8w41iasvilbpy20smnnbq6dl46ci4"; depends=[ape coda deSolve Rcpp]; };
 TExPosition = derive { name="TExPosition"; version="2.6.10"; sha256="12rgijlclaipwjjiyng7nwilzixdy6lsvncigcg0vjydhgk97jn1"; depends=[ExPosition prettyGraphs]; };
 TFDEA = derive { name="TFDEA"; version="0.9.8.3"; sha256="0qg4nhlqqj7hc8lg732zz8klbbp3yksnq8q8n4ml3jz8gadrpyj7"; depends=[lpSolveAPI]; };
 TFMPvalue = derive { name="TFMPvalue"; version="0.0.5"; sha256="13bfcwfiyl61cv2ma23fcmv2cvbsyzdbg2pl6l6zg39l6scxf9na"; depends=[Rcpp]; };
@@ -2175,13 +2172,14 @@ TPmsm = derive { name="TPmsm"; version="1.2.0"; sha256="1670b9g6sqlg5xk76x77cph1
 TR8 = derive { name="TR8"; version="0.9.13"; sha256="07wrqwa5gf1l1y3b07mganr5xkzxdzrh6lrv7gf01m9b7bsz564m"; depends=[gdata gWidgets gWidgetstcltk plyr rappdirs RCurl taxize XML]; };
 TRAMPR = derive { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; };
 TRD = derive { name="TRD"; version="1.0"; sha256="1xj3ns9phiz4i70ky2p1q1cr3h6iq2i3dywnap6gqaq0fqmiq2fh"; depends=[Rlab]; };
-TROM = derive { name="TROM"; version="1.0"; sha256="1pr5n6bgjrn60f95395p2x8c2h1q3sx6a7448m0xi0a51wa016xp"; depends=[AnnotationDbi gplots gtools lattice openxlsx RColorBrewer topGO]; };
+TROM = derive { name="TROM"; version="1.1"; sha256="090m6l9x3q203mb6c454ign82zwcxk2appx0z3kr7bqrap245s7n"; depends=[AnnotationDbi gplots gtools lattice openxlsx RColorBrewer topGO]; };
 TRSbook = derive { name="TRSbook"; version="1.0.1"; sha256="1w2yl5pchw2vn9l3qnm1ra9mjy946i5xsxh5n5xdvrcj2kak50x5"; depends=[gdata IndependenceTests RColorBrewer xtable]; };
 TSA = derive { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx"; depends=[leaps locfit mgcv tseries]; };
 TSEN = derive { name="TSEN"; version="1.0"; sha256="1pn313g2ylbjc37rqcakd797vffnh7v0rgg1xl5wjyvcgmm5mxix"; depends=[ncdf]; };
 TSHRC = derive { name="TSHRC"; version="0.1-3"; sha256="18ygg7bqwg1pdqi52l1lf33gcd277895rlf5853yzh7ln2ivssmi"; depends=[]; };
+TSMining = derive { name="TSMining"; version="1.0"; sha256="1n32acagffiw31pr485ly3phx33zw7vj009bvw4lbqpixa1pszj2"; depends=[foreach ggplot2 plyr reshape2]; };
 TSMySQL = derive { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[DBI RMySQL tframe TSdbi TSsql]; };
-TSP = derive { name="TSP"; version="1.1-1"; sha256="0wwzmkgfy55dba9jl3mpbyqciia71px0x0s6708k8kz9vr03m2zs"; depends=[foreach]; };
+TSP = derive { name="TSP"; version="1.1-2"; sha256="1y8vyc0lb5vlqs971zdkil6f78z13cpnzaxw9cqxn6j2a9ji7m0d"; depends=[foreach]; };
 TSPostgreSQL = derive { name="TSPostgreSQL"; version="2015.4-1"; sha256="11201zpbrva6gwc9hg8pynadrps6d8pb3syzba9nyjpv2ck6x3ry"; depends=[DBI RPostgreSQL tframe tframePlus TSdbi TSsql]; };
 TSPred = derive { name="TSPred"; version="2.0"; sha256="0p4msk12n8jc1ss8p7m15rxd0ip7v83c5p78v26nk5dz21a4xprp"; depends=[forecast]; };
 TSSQLite = derive { name="TSSQLite"; version="2015.4-1"; sha256="10z8s967wmapkb56hh2brb5bafgqr8flwh0sr72yqqv0ca2d06sc"; depends=[DBI RSQLite tframe tframePlus TSdbi TSsql]; };
@@ -2211,7 +2209,7 @@ TcGSA = derive { name="TcGSA"; version="0.9.8"; sha256="19gp3pj4p2svrfyviccvv13q
 TeachNet = derive { name="TeachNet"; version="0.7"; sha256="1p39bsf846r7zwz4lrrv2bpyx9yrkqzrnacajwrz3jjqj6qpp6cn"; depends=[]; };
 TeachingDemos = derive { name="TeachingDemos"; version="2.9"; sha256="160xch4812darv77qk2xjblm6nfnna5x2rxy335bwdsdjzcx4x9m"; depends=[]; };
 TeachingSampling = derive { name="TeachingSampling"; version="3.2.2"; sha256="07c1wx7hl246kvj9ah55kdjpag8a9zbzh3jy0680w5nnv8vzsxxs"; depends=[]; };
-TestScorer = derive { name="TestScorer"; version="1.7"; sha256="1rzpy4aa61l21qx2qxrmk16cxrvbygacxk4rkm766769aq2jqa09"; depends=[]; };
+TestScorer = derive { name="TestScorer"; version="1.7.1"; sha256="0zfabkgpwgrr41x033j065hdf1vc2sg4bj9yqfdc6g1pq9kxdmd4"; depends=[]; };
 TestSurvRec = derive { name="TestSurvRec"; version="1.2.1"; sha256="05f5gc8hvz09hx015jzis6ikki9c1brdq7l7a9bxm9bqbcc9f2f9"; depends=[boot survrec]; };
 Thermimage = derive { name="Thermimage"; version="1.0.1"; sha256="16wpmwqfqjghhp4g5wpmgzf0ii2aa0gawcq74rfn4frfizzdy0ad"; depends=[]; };
 Thinknum = derive { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; };
@@ -2230,6 +2228,7 @@ TopKLists = derive { name="TopKLists"; version="1.0.3"; sha256="0687nxsddmlgyz3k
 TraMineR = derive { name="TraMineR"; version="1.8-9"; sha256="0qawgjifz6w7gb06j9q5kbvhf8pn17922mvmgwzva5mykvqfmdic"; depends=[boot RColorBrewer]; };
 TraMineRextras = derive { name="TraMineRextras"; version="0.2.3"; sha256="0b6xh1xhmigjfj9cbk4gdpi1d131cq9ikwgdblcwwrmnrhcjgld6"; depends=[cluster combinat RColorBrewer survival TraMineR]; };
 TrackReconstruction = derive { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; };
+Traitspace = derive { name="Traitspace"; version="1.0"; sha256="1pxyc5brlhsi0bhgr6nmd80kvrb032iwsshdqamicm48jyxn06xb"; depends=[mclust permute]; };
 TreatmentSelection = derive { name="TreatmentSelection"; version="1.1.2"; sha256="1mvrb72yz51gmwqlfg5gsjbi65lqk5j24agddw1br53ymdvjgzq4"; depends=[ggplot2]; };
 TreePar = derive { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; };
 TreeSim = derive { name="TreeSim"; version="2.1"; sha256="01izfzlvrak65mzwpz4bn5cansw10fvfjfvj164f5g0qghg9v84n"; depends=[ape geiger laser]; };
@@ -2264,14 +2263,16 @@ VGAM = derive { name="VGAM"; version="0.9-8"; sha256="0wizv2r1k79ifg9m0z9m2l80bs
 VGAMdata = derive { name="VGAMdata"; version="0.9-7"; sha256="0fkm90nbmj0gjzxmh54qbf90alcbaiz27rs0zc0i5jhh2cv716y6"; depends=[]; };
 VHDClassification = derive { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; };
 VIF = derive { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; };
+VIFCP = derive { name="VIFCP"; version="1.1"; sha256="1xy9bsiz4ixsf7znlcaswcyryj8wf6r778wl11b1c33ip3ibq28x"; depends=[]; };
 VIGoR = derive { name="VIGoR"; version="1.0"; sha256="1c24s917aafqy46b3xlsw8v3afs11nd5bq83vlygpgnz1612jpga"; depends=[]; };
-VIM = derive { name="VIM"; version="4.1.0"; sha256="15nmywg8mhknvivg9bfszif2allim5vf1hjfbfyl053jphjpax26"; depends=[car colorspace data_table e1071 MASS nnet Rcpp robustbase sp vcd]; };
+VIM = derive { name="VIM"; version="4.3.0"; sha256="0gsafvrz5gbav7m728bxnjlyrg4kp418chsnpxpg4dvsgdjnw1fp"; depends=[car colorspace data_table e1071 MASS nnet Rcpp robustbase sp vcd]; };
 VIMGUI = derive { name="VIMGUI"; version="0.9.0"; sha256="195lakyik597sjkq6c5v3881p35111gzmj2r5f5nr53vi6bn4pzm"; depends=[Cairo foreign gWidgetsRGtk2 Hmisc RGtk2 survey tkrplot VIM]; };
 VLF = derive { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; };
 VLMC = derive { name="VLMC"; version="1.4-1"; sha256="0y91cl9pv1d5s8956grdx3y4xa5l1fabrh1wl5hn11fjgyz1dcij"; depends=[MASS]; };
 VNM = derive { name="VNM"; version="4.0"; sha256="0dc2wvj8f09yrsf5lhg6djhfnkgslngs6a13g54d5q9aa4nnxm8w"; depends=[]; };
-VPdtw = derive { name="VPdtw"; version="2.1-10"; sha256="1sipiqbk766czd1jxam3bc2hfq7wsn72x51j5ssn2s2q0gvpl7m1"; depends=[]; };
+VPdtw = derive { name="VPdtw"; version="2.1-11"; sha256="0qsw5mqv36k8mcvwj1ka41z5kc05yn79wv41ai8f5412sbngihlr"; depends=[]; };
 VSURF = derive { name="VSURF"; version="1.0.0"; sha256="1hqn22k66v9zb2qr7sig0zgki9hbfr5442d7mlldnyj3m012m22j"; depends=[doParallel foreach randomForest rpart]; };
+VTrack = derive { name="VTrack"; version="1.11"; sha256="1w8zp7l60mwzppg3gqq0zv5a065y0vdrp2v0x0yl4a8jq0zlvppx"; depends=[doParallel foreach plotKML sp spacetime]; };
 VaRES = derive { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; };
 VarSelLCM = derive { name="VarSelLCM"; version="1.2"; sha256="1pzcadzg1snv2nkdrbhgi6scrd70cawprncm8hs82gcl3r9dscic"; depends=[Rcpp RcppArmadillo]; };
 VarSwapPrice = derive { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; };
@@ -2288,7 +2289,7 @@ VizOR = derive { name="VizOR"; version="0.7-9"; sha256="1xw06y86nsrwpri6asrwh8kc
 Voss = derive { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
 VoxR = derive { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; };
 W2CWM2C = derive { name="W2CWM2C"; version="1.0"; sha256="14q1y4vpmrx8qz5nav8bbjkxqsqk646zcwr8h7yzi7cfa85b4cxz"; depends=[wavemulcor waveslim]; };
-W3CMarkupValidator = derive { name="W3CMarkupValidator"; version="0.1-2"; sha256="162bjf8g94xxif86c6545kjvn2m06v618kna6ic2b3alyx577fww"; depends=[RCurl XML]; };
+W3CMarkupValidator = derive { name="W3CMarkupValidator"; version="0.1-4"; sha256="08697va5n59d7yyv882ya3s2qw94n7c53d8wyavpvhqq9d3n8nwi"; depends=[RCurl XML]; };
 WARN = derive { name="WARN"; version="1.1"; sha256="0rnzsc8vbm116g4cwdivmxqv1zyg4givjrrlahvbf4xl5pbryg6d"; depends=[MASS]; };
 WCE = derive { name="WCE"; version="1.0"; sha256="1kb1z67ymnz8cgwxq6m5fpqgxmmrfiwh2q3x4rhanac2sinagyn4"; depends=[plyr survival]; };
 WCQ = derive { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; };
@@ -2298,16 +2299,15 @@ WMCapacity = derive { name="WMCapacity"; version="0.9.6.6"; sha256="19x6l06srh59
 WMDB = derive { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; };
 WRS2 = derive { name="WRS2"; version="0.3-1"; sha256="11i9zv7p7808v3hvnhjn58yl7mwh26zhis6hh9n73dw3hn22xdng"; depends=[MASS plyr reshape]; };
 WWGbook = derive { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; };
-WaterML = derive { name="WaterML"; version="1.0.0"; sha256="125aivc23qgarndbwxif3xmqjp4n32vyk8cb7f7a2v3y51z332j2"; depends=[httr RJSONIO XML]; };
-Watersheds = derive { name="Watersheds"; version="1.0"; sha256="11hrprl8ldbgk1j1f8z4cb327c8d94x1fc29dpacqck48gdb4wmp"; depends=[lattice maptools rgeos sp splancs]; };
+WaterML = derive { name="WaterML"; version="1.2.3"; sha256="0w9040acrvs2kqh4slkg4pcswzvsbbcpzr2cdvxzhjv6a0im7hyz"; depends=[httr RJSONIO XML]; };
 Wats = derive { name="Wats"; version="0.2-16"; sha256="1wbyyllmjsmh8wb8npzizlfn3hsvfpqp9p3b5wx3zpsavqw839wy"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; };
-WaveCD = derive { name="WaveCD"; version="1.0"; sha256="0gracn8lknw96nnir1m8fg5va3f45vvbiy69rxx8vibnfdg1q3l9"; depends=[lattice waveslim]; };
 WaveletComp = derive { name="WaveletComp"; version="1.0"; sha256="16ghxqjbv39pmgd52im6ilkkh0hpnaw8ns0hwkngpbr479m1grdp"; depends=[]; };
 WeightedCluster = derive { name="WeightedCluster"; version="1.2"; sha256="1d0df284fzfa34fi7b3d7f4zzm9ppyah46rj865446l5pjvl9np3"; depends=[cluster RColorBrewer TraMineR]; };
 WeightedPortTest = derive { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; };
 WhatIf = derive { name="WhatIf"; version="1.5-6"; sha256="02lqvirnf24jn8b2s08z5fjmpilp2z08lww1s793n3pn783adbky"; depends=[lpSolve]; };
 WhiteStripe = derive { name="WhiteStripe"; version="1.1.1"; sha256="1naavgkvgky3lzg5vlz11g589cxr0fgiqz2waz86da1ksk4a19gw"; depends=[mgcv oro_nifti]; };
 WhopGenome = derive { name="WhopGenome"; version="0.9.2"; sha256="0nhl3qanwvyxvkrdc0wngzdx6id0yfzbf9wp170mcsyd4qh7pxzs"; depends=[]; };
+WiSEBoot = derive { name="WiSEBoot"; version="1.0.0"; sha256="1hfazm9zb2b6gzm38xlq672y1x1bqzj0mwvzinz6y65m9kb4l93g"; depends=[wavethresh]; };
 WideLM = derive { name="WideLM"; version="0.1-1"; sha256="0spxl960pgzh0cn1gkw2ayixpi982rr85qajcdqahmn9msk877h8"; depends=[Rcpp]; };
 WikidataR = derive { name="WikidataR"; version="1.0.0"; sha256="061745pz4j9gldbwy6pa5pbxmin84csqpv7r5r8lanvc0m7kgcgx"; depends=[httr jsonlite WikipediR]; };
 WikipediR = derive { name="WikipediR"; version="1.2.0"; sha256="1l9q9yg4z4j0lch9r8xr9q0f8mr0lpzf50ygmkkcvfd5sp7hirmi"; depends=[httr jsonlite]; };
@@ -2315,13 +2315,14 @@ WikipediaR = derive { name="WikipediaR"; version="1.0"; sha256="0kx966q5zn7jq1m7
 WilcoxCV = derive { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; };
 WordPools = derive { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; };
 WrightMap = derive { name="WrightMap"; version="1.1"; sha256="0dmximp549gr37ps56vz8mnlii7753dc5v0wl3s78cymjmnmyr0z"; depends=[]; };
-WriteXLS = derive { name="WriteXLS"; version="3.5.1"; sha256="0grhwwlibdpvzjlm1vc5ykl54jcz0jmg6rkhis00rjn5yqccx0in"; depends=[]; };
+WriteXLS = derive { name="WriteXLS"; version="3.6.1"; sha256="19rifwxfnmb65lf3a8nshyjnq3bn0lpkqfcwslfgjp6y8l7jx7gv"; depends=[]; };
 XBRL = derive { name="XBRL"; version="0.99.16"; sha256="1wrcm8srn185qrba7rig3fvwjz1n2ab296i0jr71vhyp9417h40q"; depends=[Rcpp]; };
 XHWE = derive { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; };
 XLConnect = derive { name="XLConnect"; version="0.2-11"; sha256="02wxnr6h06h125dqszs8mzq4av842g445ndr59xgscxr03fyvi8p"; depends=[rJava XLConnectJars]; };
 XLConnectJars = derive { name="XLConnectJars"; version="0.2-9"; sha256="0js79297himq628cwx5cc3pcq3iv6p16bn4bpd5diyjaya4x27g3"; depends=[rJava]; };
-XML = derive { name="XML"; version="3.98-1.2"; sha256="13rhl534l0cnklxf6zb9y8ykg0k5idg9dxy0nv1vbliz6rw3dr00"; depends=[]; };
+XML = derive { name="XML"; version="3.98-1.3"; sha256="0j9ayp8a35g0227a4zd8nbmvnbfnj5w687jal6qvj4lbhi3va7sy"; depends=[]; };
 XML2R = derive { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[plyr RCurl XML]; };
+XMRF = derive { name="XMRF"; version="1.0"; sha256="0jnyy9pcksfadznidqsbwh8nlqv3k0yppj76q8a2g0aidbdmg2cc"; depends=[glmnet igraph MASS Matrix snowfall]; };
 XNomial = derive { name="XNomial"; version="1.0.1"; sha256="134bwglqhgah7v3w6ir65dch2dwp5h4vldw521ba74l5v9b2j2h4"; depends=[]; };
 XiMpLe = derive { name="XiMpLe"; version="0.03-21"; sha256="1j387jzxh0z9dmhvc0kpjjjzf781sgrw57nwzdqwx6bn09bw509d"; depends=[]; };
 Xmisc = derive { name="Xmisc"; version="0.2.1"; sha256="11gwlcyxhz1p50m68cnqrxmisdk99v8vrsbvyr7k67f0kvsznzs1"; depends=[]; };
@@ -2339,23 +2340,24 @@ ZeligGAM = derive { name="ZeligGAM"; version="0.7-1"; sha256="1643ycx51mnlxwiarf
 ZeligMultilevel = derive { name="ZeligMultilevel"; version="0.7-1"; sha256="00zlambykds4z1c5kx3rpla1kllyp96cxwvbc5lalwdb9i48pp3s"; depends=[lme4 Zelig]; };
 aCRM = derive { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[ada dummies kernelFactory randomForest]; };
 aLFQ = derive { name="aLFQ"; version="1.3.2"; sha256="1963np2b2x7gbpgwcx0rqxd2psfdfmh72ap1y4p7f37ibjm8g45m"; depends=[caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; };
-aRpsDCA = derive { name="aRpsDCA"; version="1.0.0"; sha256="035888scbl5333sz25f9n6xh1zis7l2752p4nhsbs2g44q38l9h6"; depends=[]; };
+aRpsDCA = derive { name="aRpsDCA"; version="1.0.1"; sha256="1hxf3lpdcx8h9gndclppsxr8rs048mi3nysjj1z3fgbpmkqnlxgs"; depends=[]; };
 aRxiv = derive { name="aRxiv"; version="0.5.10"; sha256="1q8nblb0kfdidcj1nwxn0fap87wpkg49z0bgmwayskwv1p860wrh"; depends=[httr XML]; };
 aSPU = derive { name="aSPU"; version="1.35"; sha256="0wlp47wc75mmgh3986npqa72d4jia1jgalfvz7sq62wjsh1wkrbv"; depends=[]; };
+aTSA = derive { name="aTSA"; version="3.1.2"; sha256="1p3spas0sxj08hkb8p6k2fy64w86prlw1hbnrqnrklr0hnkg2g54"; depends=[]; };
 abbyyR = derive { name="abbyyR"; version="0.1"; sha256="03krflrjhq7yx06wacfyxzqvq0v2b17xvcyl8sfnaylrilracwjq"; depends=[httr XML]; };
 abc = derive { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data locfit MASS nnet quantreg]; };
 abc_data = derive { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; };
 abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[corrplot lattice rgl Rglpk]; };
 abctools = derive { name="abctools"; version="1.0.2"; sha256="1wdm42g2maab700fq2shpr1kajpj9m4c4z6k49gghrdzpk1kqxsa"; depends=[abc abind plyr]; };
-abd = derive { name="abd"; version="0.2-7"; sha256="0zkqwdcpz1v9k509vvzfbf9732v43q919hwd9yq3q0dg67d32ai7"; depends=[lattice mosaic nlme]; };
+abd = derive { name="abd"; version="0.2-8"; sha256="191gspqzdv573vaw624ri0f5cm6v4j524bjs74d4a1hn3kn6r9b7"; depends=[lattice mosaic nlme]; };
 abf2 = derive { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; };
 abind = derive { name="abind"; version="1.4-3"; sha256="1km61qygl4g3f91ar15r55b13gl8dra387vhmq0igf0sij3mbhmn"; depends=[]; };
 abn = derive { name="abn"; version="0.85"; sha256="1ml4l4fiqscc1ikv0wsi73rymb9599mpnhmzlfnvv4zp3fkfm6qm"; depends=[Cairo]; };
 abundant = derive { name="abundant"; version="1.0"; sha256="0n2yvq057vq5idi7mynnp15cbsijyyipgbl4p7rqfbbgpk5hy3qb"; depends=[QUIC]; };
-acc = derive { name="acc"; version="1.0.2"; sha256="1z7hncgd43mc84v3wdcqpkp3gxsdyvh7h8s6qvgap2lp04m1j74l"; depends=[mhsmm PhysicalActivity timeDate zoo]; };
+acc = derive { name="acc"; version="1.1.1"; sha256="0q4xq5mmcwb9b86k22c1x7zl4zxqacl62w7mcqrdb03v9xmjn4h4"; depends=[mhsmm PhysicalActivity timeDate zoo]; };
 accelerometry = derive { name="accelerometry"; version="2.2.5"; sha256="00mn09j7y39sc7h5srnnfk2l73vhh6zq7rzc0vckfvs72lncmwv5"; depends=[Rcpp]; };
 accrual = derive { name="accrual"; version="1.1"; sha256="12zlv34pgmhcvisqk3x09hjpmfj91pn56pkjyj483mcf634m9ha4"; depends=[fgui SMPracticals]; };
-accrued = derive { name="accrued"; version="1.2"; sha256="0xkar6kpxf7sq36xqf6cvns2sp5qgqxqjb8hindp59gvlcd2r5a7"; depends=[]; };
+accrued = derive { name="accrued"; version="1.3"; sha256="091abkq7jwlw1gj0691qsv7ikgmn471hnkaadb8v0kxhs44mfq52"; depends=[]; };
 acepack = derive { name="acepack"; version="1.3-3.3"; sha256="13ry3vyys12iplb14jfhmkrl9g5fxg3iijiggq4s4zb5m5436b1y"; depends=[]; };
 acid = derive { name="acid"; version="1.0"; sha256="0m59xnz6435n7j3fggv274g5rap7cpr0zby3aqbaycfdfrp78d1h"; depends=[gamlss gamlss_dist Hmisc]; };
 acm4r = derive { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; };
@@ -2366,7 +2368,7 @@ acs = derive { name="acs"; version="1.2"; sha256="1vw4ghqcz53m3qy7hy2j7nrdinbbqj
 acss = derive { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; };
 acss_data = derive { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; };
 activity = derive { name="activity"; version="1.0"; sha256="1y1vy3kj9n21jvbyl3s5hllfkqp3z1rnn7701c5jxhay5dbdz3p2"; depends=[circular overlap pbapply]; };
-actuar = derive { name="actuar"; version="1.1-8"; sha256="0zdw8dphpp49hr82z44az10vyawj301p8lr0cc7dk96g7xrzmlwa"; depends=[]; };
+actuar = derive { name="actuar"; version="1.1-9"; sha256="00b0gpbvm0aivcjvk91rk3c28fzd3ir8h42b1kpnrgdjrc198im4"; depends=[]; };
 ada = derive { name="ada"; version="2.0-3"; sha256="1c0nj9k628bcl4r8j0rmyp5f1igdjq6qhjxyif6575fvn2gdzmbw"; depends=[rpart]; };
 adabag = derive { name="adabag"; version="4.0"; sha256="0n4zls13f46rxqrx9qkvrifshb3cl8l6ni7zw36pm6fixbz844fk"; depends=[caret mlbench rpart]; };
 adagio = derive { name="adagio"; version="0.5.9"; sha256="1yp9w557advb7dzrdqwkffpdmhn6mk4879lrrjd0d6kv89fwz5yr"; depends=[]; };
@@ -2379,8 +2381,8 @@ additivityTests = derive { name="additivityTests"; version="1.1-4"; sha256="048d
 addreg = derive { name="addreg"; version="2.0"; sha256="1lc8p70di466i061jrbahq4hir4g5a8rns6044jjjg8v7b1y8alc"; depends=[combinat glm2]; };
 ade4 = derive { name="ade4"; version="1.7-2"; sha256="01pchn70jpz8v9l86ng34a2vgn3pv4v5iwxz5n39f685p9lkc2nn"; depends=[]; };
 ade4TkGUI = derive { name="ade4TkGUI"; version="0.2-6"; sha256="010ggsxcmljh0cdba4lcfnsd9r49pwqs6kbw88syfn2qv65hh5kq"; depends=[ade4]; };
-adegenet = derive { name="adegenet"; version="1.4-2"; sha256="13fglxy40rnwi5hsmmvwlfcvfn8dybxyy3k5qhpml8jgpbl3fsdb"; depends=[ade4 ape ggplot2 igraph MASS shiny]; };
-adegraphics = derive { name="adegraphics"; version="1.0-2"; sha256="1jhi761rhrq1k27gxfns46j67x0ajbff6mz9cwl5jkcqg2mbcg8q"; depends=[ade4 KernSmooth lattice RColorBrewer sp]; };
+adegenet = derive { name="adegenet"; version="2.0.0"; sha256="10y4l06k2g42s4vf394dx7pdsqsl0ff2w58mzap1khj90pxyrxdz"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep]; };
+adegraphics = derive { name="adegraphics"; version="1.0-3"; sha256="0i1qln99vdfnxjsbfq80c1c7allsw8ras7hlx7vr0dkdzcp1wy6z"; depends=[ade4 KernSmooth lattice RColorBrewer sp]; };
 adehabitat = derive { name="adehabitat"; version="1.8.17"; sha256="0cy98fd6mcbjc152vv41mnh5xj19xdfag8n950fvffbrpvpgbcpb"; depends=[ade4 shapefiles sp tkrplot]; };
 adehabitatHR = derive { name="adehabitatHR"; version="0.4.13"; sha256="140ar1naf67v996d5p0i2v07g02pf9c4c6h1pjicai5n59s7z72v"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; };
 adehabitatHS = derive { name="adehabitatHS"; version="0.3.11"; sha256="0sbhc1mvdc8pxq56plbgk0ry65chxcv3zjry4151hiv7yxpn39ri"; depends=[ade4 adehabitatHR adehabitatMA sp]; };
@@ -2391,14 +2393,14 @@ adhoc = derive { name="adhoc"; version="1.0"; sha256="193adddarjkc2kk1xncfkm919s
 adimpro = derive { name="adimpro"; version="0.7.8"; sha256="06zwdgl7g4azg2mn7p35may8hsjcvf2dz7dj86zqngjspda123s4"; depends=[]; };
 adlift = derive { name="adlift"; version="1.3-2"; sha256="0nzg16vhm5qg3xzczi3f6cynvp9ym2jsfrc4fdyxq7bwp9kry2i4"; depends=[EbayesThresh]; };
 ads = derive { name="ads"; version="1.5-2.2"; sha256="17k24dihl41jgkkglhnkj7lvvl53dgahjkb5jhfmfgk6i16c7s23"; depends=[ade4 spatstat]; };
-adwave = derive { name="adwave"; version="1.0"; sha256="10cz870n3az7brmf2658g0jrc1x39c69vw37n99m8x6wxxp6ypn8"; depends=[waveslim]; };
+adwave = derive { name="adwave"; version="1.1"; sha256="0kkwgcyxddzmrb8h1w1f4xy2cq40b86q0lxwfdhx25z3zjc4m1ni"; depends=[waveslim]; };
 aemo = derive { name="aemo"; version="0.1.0"; sha256="1iik0rrqkkx9n1qb1pvq5iwxqmvs6vnx8z80hdzb5vqq0lvi1bsx"; depends=[assertthat dplyr lubridate stringr]; };
 afex = derive { name="afex"; version="0.13-145"; sha256="0wyjgxh1rdibj21f8dbwg7f30q1z6jwwpj2dcjx2rh60axvp1dir"; depends=[car coin lme4 Matrix pbkrtest reshape2 stringr]; };
 aftgee = derive { name="aftgee"; version="1.0-0"; sha256="0gfp05r6xvn9fcysbqyzkz916axpsc2d3lb5wmb1v92z1zw3037b"; depends=[BB geepack MASS survival]; };
 agRee = derive { name="agRee"; version="0.3-1"; sha256="1gqbhv44z1r9m54fmrg0frnzsgsp13v5ppmzpv28frz9d8x7sxx6"; depends=[lme4 miscF R2jags]; };
 agop = derive { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[igraph Matrix]; };
 agricolae = derive { name="agricolae"; version="1.2-1"; sha256="1vrc1bjqcp3xk8q41bl3kvjvaj58gw19dv7vwsxn9r6r99hlb3j1"; depends=[cluster klaR MASS nlme spdep]; };
-agridat = derive { name="agridat"; version="1.11"; sha256="1bnkzacwp22dw5vppm4yz583h1dw5d93dlca9i3ba2y9dzsalx0d"; depends=[lattice reshape2]; };
+agridat = derive { name="agridat"; version="1.12"; sha256="1b3dgrp6mkfpfaywqdm22sakadhnl1vlyj1n3rq6bc2f0gf8kcrw"; depends=[lattice reshape2]; };
 agrmt = derive { name="agrmt"; version="1.39"; sha256="0qkl8wikvg635mr8v3n9svdicnb8sl4brrh7px1n5jy71h7cswd7"; depends=[]; };
 agsemisc = derive { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; };
 ahaz = derive { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[Matrix survival]; };
@@ -2409,19 +2411,19 @@ alabama = derive { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx
 ald = derive { name="ald"; version="1.0"; sha256="1vphmqhx6wlzsz3s94jsa4mk6wpacp93wfgpj0vp9ljfb3aplhik"; depends=[]; };
 algstat = derive { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly Rcpp reshape2 stringr]; };
 allan = derive { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; };
-allanvar = derive { name="allanvar"; version="1.0"; sha256="0wpywdr15gb49m9kxrpjfsxlxrm4hwm46x42k8dgc6sihfsqbm22"; depends=[gplots]; };
+allanvar = derive { name="allanvar"; version="1.1"; sha256="142wy1mf4jbp4hy756rz95w24f4j1dgf14f1n5sd09dg4w98j7xg"; depends=[gplots]; };
 alleHap = derive { name="alleHap"; version="0.7.2"; sha256="1x10grrv732a0iidr2c96vbl46553njhvvlq249jxn3y11lfq2gv"; depends=[gtools]; };
 allelematch = derive { name="allelematch"; version="2.5"; sha256="1kws6y3igq6l85cfjrck2dzcfpgr56ridbc6w071h8kjw19mlzas"; depends=[dynamicTreeCut]; };
 allelic = derive { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; };
 alm = derive { name="alm"; version="0.4.0"; sha256="125cl5b1sps33ipsh2pygrw79mhin1qj374lq56ny7c9rp4n9w7p"; depends=[ggplot2 httr jsonlite lubridate plyr reshape reshape2 stringr]; };
-alphaOutlier = derive { name="alphaOutlier"; version="1.0.1"; sha256="1zl80q08vcyvyakfv6cd444m6l5z14p7bv9jf8kpg4dad3d63mhz"; depends=[nleqslv quantreg Rsolnp]; };
+alphaOutlier = derive { name="alphaOutlier"; version="1.1.0"; sha256="0agca8dbypp2r08x7b4pscyz280m4l27ckkcvg1plk412v0n8dq8"; depends=[nleqslv quantreg Rsolnp]; };
 alphahull = derive { name="alphahull"; version="2.0"; sha256="1z8kbh3y5clh3hn018g0fci2psd0l36nz4a08pgg7md2bbhripbl"; depends=[ggplot2 sgeostat spatstat splancs tripack]; };
 alphashape3d = derive { name="alphashape3d"; version="1.1"; sha256="1hfxvzqgirc587vxyggxdqii90nvypzi3wddvd2zdw2h95v9kfyg"; depends=[geometry rgl]; };
 alr3 = derive { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; };
 alr4 = derive { name="alr4"; version="1.0.5"; sha256="0m8jgc4mfni17psf8m0avf0m364vcq5k3c9x807p98ch2z5nsygv"; depends=[car effects]; };
 amap = derive { name="amap"; version="0.8-14"; sha256="1dz37z9v4zvyvqrs4xvpfv468jwvpxav60qn2w0049bw8llj6xdl"; depends=[]; };
 amei = derive { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; };
-amen = derive { name="amen"; version="1.0"; sha256="17kaknfgi39qcg5mhkdyf6cn2l3nn9n2xzvyz1c4piy6inhmj36c"; depends=[]; };
+amen = derive { name="amen"; version="1.1"; sha256="084bl46sxn2sxslcpi9lm22k6x8cz1jld228l0iardy4vmh4cxdk"; depends=[]; };
 aml = derive { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; };
 anacor = derive { name="anacor"; version="1.0-5"; sha256="1m2r5x5spb5nahd9cvnsxwqi0ay2kasmha21rbwj3r99jz1vxkql"; depends=[car colorspace fda rgl scatterplot3d]; };
 analogue = derive { name="analogue"; version="0.16-3"; sha256="0lv8ljf10jdrgrd59pcjdi1wvjfd0j6qb87xzfx5k8kcp9awx4h6"; depends=[brglm lattice MASS mgcv princurve vegan]; };
@@ -2465,7 +2467,7 @@ aqr = derive { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr
 archdata = derive { name="archdata"; version="0.1"; sha256="1k7cpqwgvkwfz25a9db0c8g6ii6xsbhkj3c9alghhaafs7x8n47w"; depends=[]; };
 archetypes = derive { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; };
 archiDART = derive { name="archiDART"; version="1.1"; sha256="1md8y3nq575y9v4gj963y92as54h6bzaysnmjirk634rravps9ja"; depends=[XML]; };
-archivist = derive { name="archivist"; version="1.3"; sha256="1did4s9afmbd4b2xcs674fyk2vz0r08vchjfar1q3ri2mfq4p7x5"; depends=[DBI digest httr lubridate RCurl RSQLite shiny]; };
+archivist = derive { name="archivist"; version="1.5"; sha256="0mcb35bllg82w0373prcai8h58gd6aj1pil90ni81zp7p1pdmcw3"; depends=[DBI digest httr lubridate RCurl RSQLite shiny]; };
 arf3DS4 = derive { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; };
 arfima = derive { name="arfima"; version="1.2-7"; sha256="00mc50hssnv7qj6dn1l3jgx8ca4vjkqirc38rv538xwjgw9mm1ms"; depends=[ltsa]; };
 argosfilter = derive { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; };
@@ -2480,42 +2482,42 @@ aroma_core = derive { name="aroma.core"; version="2.13.1"; sha256="1085qh092sij4
 arqas = derive { name="arqas"; version="1.1"; sha256="1vdx9nfqkdrn6s4h90spb0g5vk7qxm5rg3mr2jkk4n67x7s5cv3x"; depends=[distr doParallel fitdistrplus foreach ggplot2 gridExtra iterators reshape]; };
 arrayhelpers = derive { name="arrayhelpers"; version="0.76-20120816"; sha256="1q80dykcbqbcigv2f9xg1brfm3835i0zvs0810q6kh682a3hpqbi"; depends=[]; };
 ars = derive { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; };
-arules = derive { name="arules"; version="1.1-6"; sha256="0xq0j4phwqw9cx2yzxx8xx4srnjjlv75cd463x959bycsp6fzb5r"; depends=[Matrix]; };
-arulesNBMiner = derive { name="arulesNBMiner"; version="0.1-4"; sha256="05vj7pzzh84xr6d0m16dhzr7bw50hkiyq99vl46zinak648my338"; depends=[arules rJava]; };
+arules = derive { name="arules"; version="1.1-7"; sha256="19wb85swasa3n2wg1bl6aww56294f2icqcmj0x2kjncin964blg2"; depends=[Matrix]; };
+arulesNBMiner = derive { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; };
 arulesSequences = derive { name="arulesSequences"; version="0.2-6"; sha256="1fvph6c8dy3hj0h63h85bzzzka8dx0cc0lcncz9svyahy1j4q3z0"; depends=[arules]; };
-arulesViz = derive { name="arulesViz"; version="1.0-0"; sha256="0g4bqfn8jya992r2wbi044v68mj508h52snrdcd5ijhdhw8xq9xc"; depends=[arules igraph scatterplot3d seriation vcd]; };
+arulesViz = derive { name="arulesViz"; version="1.0-2"; sha256="1lss9xlbdxpcqphczk0i0kib1px30jf2hcygrkhxk8aajnni9ar6"; depends=[arules igraph scatterplot3d seriation vcd]; };
 asVPC = derive { name="asVPC"; version="1.0.2"; sha256="07nfwr0lsfpwgfdgzcdn1svw8dnjfni5ga9q77yjd1bj0wf76ci2"; depends=[ggplot2 plyr]; };
 asbio = derive { name="asbio"; version="1.1-5"; sha256="1br9rhj6nghwx54i2hpjrsdhwg8v38s66cy8fc4pg97zypdnikpj"; depends=[deSolve lattice multcompView mvtnorm pixmap plotrix scatterplot3d tkrplot]; };
 ascii = derive { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; };
-ascrda = derive { name="ascrda"; version="1.15"; sha256="17anzlhcjmrk13s5gs752rsc735y5wvba6r3w1nbv0cnkpnyk8i7"; depends=[class e1071 MASS nnet pamr rda sfsmisc]; };
 asd = derive { name="asd"; version="2.0"; sha256="1nnsbh6g0bhvhp6644zf2l6frr3qnls0s7y7r0g211b5zagq20z3"; depends=[mvtnorm]; };
 ash = derive { name="ash"; version="1.0-14"; sha256="15x16ld25i160asqf4z4difa6zn2yfgl04j8y8nqb0djymdx7a1f"; depends=[]; };
 aspace = derive { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; };
 aspect = derive { name="aspect"; version="1.0-3"; sha256="12wyyr0ms8g3y96jz1x0y52dlma00j20h7hmm8m6y5p1lgk9kmcd"; depends=[]; };
-asremlPlus = derive { name="asremlPlus"; version="1.10-16"; sha256="17k1syfdsg097pawldw5mgy3a325p8k7xk99qpcivcl3pzsmw79q"; depends=[dae ggplot2]; };
-assertive = derive { name="assertive"; version="0.2-4"; sha256="0xc561fi322qd5z7ss2zi69nl3i8i56w8bksgd38fpjigg0x9fwl"; depends=[knitr]; };
-assertr = derive { name="assertr"; version="0.4.1"; sha256="1h77iisvyakccm7v1iqva04s1hn197sjcy28832cagqg89qlsg31"; depends=[dplyr]; };
+asremlPlus = derive { name="asremlPlus"; version="2.0-0"; sha256="1iag76aldb84zwfvy9m3p66ypmc8bz1b3c9yzkf9clk8rlzn53zv"; depends=[dae ggplot2]; };
+assertive = derive { name="assertive"; version="0.2-6"; sha256="1iracxm6af1lbd39zrnjziz31lvwgxi8rry82x8sjlab5l0w6lh9"; depends=[knitr]; };
+assertr = derive { name="assertr"; version="1.0.0"; sha256="0z7cgksjc0a7niar9f26f0512ln0a7cifyqcfrbhar552dnkg33i"; depends=[dplyr lazyeval MASS]; };
 assertthat = derive { name="assertthat"; version="0.1"; sha256="0dwsqajyglfscqilj843qfqn1ndbqpswa7b4l1d633qjk9d68qqk"; depends=[]; };
 assist = derive { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[lattice nlme]; };
 aster = derive { name="aster"; version="0.8-30"; sha256="0vdlimkkmd9ar5v3xrbi9gshvj980l7641brd7cqs78sqf0v71fn"; depends=[trust]; };
 aster2 = derive { name="aster2"; version="0.2-1"; sha256="1gr9hx0mhyan0jy7wsl4ccsx9ahlvhfiq0j1xnffa4m3hzazisn5"; depends=[]; };
 astro = derive { name="astro"; version="1.2"; sha256="1c7zrycgj2n8gz50m94ys1dspilds91s1b2pwaq6df1va17pznby"; depends=[MASS plotrix]; };
 astroFns = derive { name="astroFns"; version="4.1-0"; sha256="0g5q0y067xf1ah91b4lg8mr9imj0d6lgig7gbj3b69fn335k363g"; depends=[]; };
-astrochron = derive { name="astrochron"; version="0.4.2"; sha256="1wrpcngny2b4k0p3xagh5967yvvgxcsp87xcdp4raf4n1v3nk2xx"; depends=[fields IDPmisc multitaper]; };
+astrochron = derive { name="astrochron"; version="0.4.3"; sha256="09c0mhf7an5i0c7v94w2jav13ljbc9d1czn8qwcjmhqgnz54cniz"; depends=[fields IDPmisc multitaper]; };
 astrodatR = derive { name="astrodatR"; version="0.1"; sha256="00689px4znwmlp6qbj6z2a51b7ylx1yrrjpv6zjkvrwpv6lyj9fw"; depends=[]; };
 astrolibR = derive { name="astrolibR"; version="0.1"; sha256="0gkgry5aiz29grp9vdq9zgg6ss47ql08nwcmz1pfvd0g0h9h75l8"; depends=[]; };
 astsa = derive { name="astsa"; version="1.3"; sha256="01bslr6hww029097244r5l4bz4v7z46gpihw39har8h0xicl6ywk"; depends=[]; };
 asympTest = derive { name="asympTest"; version="0.1.3"; sha256="11nlkgws3y8xbz3yli55414a2rkk7367q9q5r2ssa61jaiimibhh"; depends=[]; };
-asypow = derive { name="asypow"; version="2013.9-1"; sha256="0zd42ha30kysjhd6rwxr91k1hhsimw3py2inymbpxgyq4s890whs"; depends=[]; };
+asypow = derive { name="asypow"; version="2015.6.25"; sha256="0il38djkmw5ka7czpalmhq6yycx7flpdpgbd7p5nx52rsjdv49mj"; depends=[]; };
 atmcmc = derive { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; };
 atsd = derive { name="atsd"; version="1.0.8441"; sha256="1jz2bdgvk1wamrm8r9ygprhyf0z3mdk9c1pwlb4bfmwvbnqd0yqa"; depends=[httr RCurl]; };
 attribrisk = derive { name="attribrisk"; version="0.1"; sha256="1zqx53mxz2hh9jyanf3jkadgpj44jbqrk4p13fas91zvhpw9pn5s"; depends=[boot survival]; };
 audio = derive { name="audio"; version="0.1-5"; sha256="1hv4052n2r6jkzkilhkfsk4dj1xhbgk4bhba2ca9nf8ag92jkqml"; depends=[]; };
 audiolyzR = derive { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; };
 audit = derive { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; };
-autoencoder = derive { name="autoencoder"; version="1.0"; sha256="18i6b2vjhlq9f82syw3k88gm9bvklv827nflgzq0xzjnzh6z5nr8"; depends=[]; };
+autoencoder = derive { name="autoencoder"; version="1.1"; sha256="0ly1aanayk28nx6yqfhl7d0zm4vg6rfjikf5ibn8zhmkrfyflj1y"; depends=[]; };
 automap = derive { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[gstat lattice reshape sp]; };
 autopls = derive { name="autopls"; version="1.3"; sha256="1qf5gk1vsz1p5670w7bgzh3b15wvrx1gy6ih4sivw0vj8bcjxbw9"; depends=[pls]; };
+autovarCore = derive { name="autovarCore"; version="1.0-0"; sha256="08h51bh1m3d47nprd5z7v3k3lkrixbxwinr73zd5442wskf4x82v"; depends=[Amelia jsonlite Rcpp urca vars]; };
 aws = derive { name="aws"; version="1.9-4"; sha256="11vbsg4yhnl4995m8gq5gykrlk61y3a618g2zxkc9wdf5z4xqdny"; depends=[awsMethods gsl]; };
 awsMethods = derive { name="awsMethods"; version="1.0-3"; sha256="1r6rbrlc5wbljp2x9aqhhnjblnb3gjm217x0cbmrw1pa0cf7q5jq"; depends=[]; };
 aylmer = derive { name="aylmer"; version="1.0-11"; sha256="1b6dryvfz9yp00nj8lv8j1isnshcgwn9fx41knah9pw7dn4pxkk2"; depends=[Brobdingnag]; };
@@ -2529,13 +2531,12 @@ backShift = derive { name="backShift"; version="0.1.1"; sha256="11mr2pdg63xa5yry
 backtest = derive { name="backtest"; version="0.3-2"; sha256="06q488pynxgis1m6rxc8hgscpy8vimffpi4aamviwb089sjzilnn"; depends=[lattice]; };
 bagRboostR = derive { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; };
 bamdit = derive { name="bamdit"; version="2.0"; sha256="1zqc2iwsa9p3lvqbf87yf6j24i0c5ybpizxp4gkaibg2llaskxki"; depends=[ggplot2 gridExtra R2jags rjags]; };
-bams = derive { name="bams"; version="1.6"; sha256="1pplnpilpydxf7gcs87424cajss74q8cr9pyv2biy4pkvfql0nxl"; depends=[]; };
 bandit = derive { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; };
 barcode = derive { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; };
 bartMachine = derive { name="bartMachine"; version="1.2.0"; sha256="0hcz39397v2y8qgdy67i97j0z5g2qidkkf5p9ydcqp9fp5msshq7"; depends=[car missForest randomForest rJava]; };
 base64 = derive { name="base64"; version="1.1"; sha256="1wn3zj1qlgybzid4nr6hvlyqg1rp2dwfh88vxrfby2fy2ba1nl5x"; depends=[]; };
 base64enc = derive { name="base64enc"; version="0.1-2"; sha256="0d2b7vl08abssfwprfiqc0yscb1gz4xlzlwwbf7y9z19wbyxizh5"; depends=[]; };
-baseline = derive { name="baseline"; version="1.2-0"; sha256="12gjirk9jyq7lmfkp10kcli84bld9n9m6yhcj5z6y4iaq6d8hazq"; depends=[SparseM]; };
+baseline = derive { name="baseline"; version="1.2-1"; sha256="1vk0vf8p080ainhv09fjwfspqckr0123qlzb9dadqk2601bsivgy"; depends=[SparseM]; };
 basicspace = derive { name="basicspace"; version="0.15"; sha256="11aqrai26kdwszznlhrk52jr19syl549qdq3nspbxcn2mj65f5pw"; depends=[]; };
 batade = derive { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; };
 batch = derive { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; };
@@ -2550,10 +2551,9 @@ bayesPop = derive { name="bayesPop"; version="5.3-4"; sha256="1zq0vjkz4b33niwldl
 bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; };
 bayesSurv = derive { name="bayesSurv"; version="2.4"; sha256="014jxlx4w6lzzq9axdk8mwwlppmly0yj9i14zhmngdbr7mxh3f87"; depends=[coda smoothSurv survival]; };
 bayesTFR = derive { name="bayesTFR"; version="4.1-2"; sha256="17qv25yrprj099vx1jj46ycgxnc4ldx6qcqx42h5gz38qqzz2q4s"; depends=[coda MASS mvtnorm wpp2012]; };
-bayesclust = derive { name="bayesclust"; version="3.1"; sha256="0zxjd64nz8c6vg6jwb2xh6kbw41a2pcmlwq5cl6k2kbplqbm2jdf"; depends=[]; };
 bayescount = derive { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; };
-bayesm = derive { name="bayesm"; version="3.0-1"; sha256="06j7zm4y8is5csk9krjv2gvk8j25nd77wk208b8zk5qld7a9q4r5"; depends=[Rcpp RcppArmadillo]; };
-bayesmix = derive { name="bayesmix"; version="0.7-3"; sha256="142132aslmmm35yai4n1d2hqqkczvrnm8ln9gwxvbczmxaggnc01"; depends=[coda rjags]; };
+bayesm = derive { name="bayesm"; version="3.0-2"; sha256="014l14k8fraxjqfch2s6ydgp1mcljvj4cgrznjyz2l35fwj3rcf3"; depends=[Rcpp RcppArmadillo]; };
+bayesmix = derive { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; };
 bayespref = derive { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; };
 bayess = derive { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; };
 bayou = derive { name="bayou"; version="1.0.1"; sha256="0l342a4lsn6b18i2kyk2hr50k69bb7jcw8dlnbi96yf1i58qcdri"; depends=[ape coda denstrip fitdistrplus geiger MASS mnormt phytools Rcpp RcppArmadillo]; };
@@ -2567,11 +2567,10 @@ bcp = derive { name="bcp"; version="3.0.1"; sha256="08sa1az1ljsi00zmj3l7z8p1j5im
 bcpa = derive { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; };
 bcpmeta = derive { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; };
 bcrm = derive { name="bcrm"; version="0.4.4"; sha256="0gcigc7505fsk1m70df3n0dz553adkbs8yz2bhskb4qrw4gbmvr7"; depends=[ggplot2 mvtnorm]; };
-bcrypt = derive { name="bcrypt"; version="0.1"; sha256="0myrxdayrjdx5zvsvdv1cj1cfjnsd0llrvffw7spdnmryli7wbfh"; depends=[openssl]; };
+bcrypt = derive { name="bcrypt"; version="0.2"; sha256="0f4sw1w2k1237wipfva3k9w2a678pvfz0k86jd7djslhyimb6jrq"; depends=[openssl]; };
 bcv = derive { name="bcv"; version="1.0.1"; sha256="0yqcfariw9sw0b8cpljcr7vf5rf0cwr1wbif23icchfaxk2m42gj"; depends=[]; };
 bda = derive { name="bda"; version="5.1.3"; sha256="0v2xki9a1j6y42x03a3rrm746xx4qd3ris1m0k7alh25j3ayhs3p"; depends=[]; };
 bde = derive { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; };
-bdoc = derive { name="bdoc"; version="1.2"; sha256="15d7grc0a1hakkxhgbm2gp0awggzlmsp8zf8abj5bgfih63gcmj2"; depends=[]; };
 bdpv = derive { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g72wbvzlx52mz4ahw700xjc7n"; depends=[]; };
 bdscale = derive { name="bdscale"; version="1.2"; sha256="0j2h7ainfnh78szp355didbkmcl6d5vz1di8nznjarwxncrbgc6g"; depends=[ggplot2 scales]; };
 bdsmatrix = derive { name="bdsmatrix"; version="1.3-2"; sha256="16qhfwk0r1snm9hg32qwz7hizkpwc32m723hjm23m2026gvz2nwy"; depends=[]; };
@@ -2580,7 +2579,6 @@ bdynsys = derive { name="bdynsys"; version="1.3"; sha256="07gfyp0qwq9y1cnh7lhcz7
 beadarrayFilter = derive { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[beadarray RColorBrewer]; };
 beadarrayMSV = derive { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[Biobase geneplotter limma rggobi]; };
 beanplot = derive { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; };
-bear = derive { name="bear"; version="2.6.4"; sha256="1v5rcb7aqzc7zjbbwwcy02z79crxq90mxs32k2gfvf7jzky09hpy"; depends=[gdata ggplot2 ICSNP nlme plotrix png reshape sciplot]; };
 beepr = derive { name="beepr"; version="1.2"; sha256="0w4szy3rgj1bdcanxbcb9agyw38jqp0hc7qsn7j9700vh20zqbln"; depends=[audio stringr]; };
 beeswarm = derive { name="beeswarm"; version="0.2.0"; sha256="05yhddljmls35xdffp7iikgwh3jh5s4b7w5d2gw89w7l8hr62ypz"; depends=[]; };
 benchden = derive { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; };
@@ -2608,7 +2606,7 @@ biasbetareg = derive { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp
 bibtex = derive { name="bibtex"; version="0.4.0"; sha256="0sy1czwjff3kdfnmlkp036qlnw8dzdl5al7izy1cc0535hsijv0d"; depends=[]; };
 biclust = derive { name="biclust"; version="1.2.0"; sha256="03vkj7zp3dl4zbv2gzv9pahcd1018lbv4ixghvv1g0fsbndrybdg"; depends=[colorspace flexclust lattice MASS]; };
 bifactorial = derive { name="bifactorial"; version="1.4.7"; sha256="187zlsqph7m63wf6wajvs6a4a08aax9hiqssgvma6cpkpisfiz4k"; depends=[lattice multcomp mvtnorm Rcpp]; };
-bigGP = derive { name="bigGP"; version="0.1-5"; sha256="0hlfylwinkwz2s8wgqf6qwxrrdx5a02ln13y4arfwwlqi1kw0s4q"; depends=[Rmpi]; };
+bigGP = derive { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; };
 bigRR = derive { name="bigRR"; version="1.3-10"; sha256="08m77r9br6wb9i21smaj4pwwpq3nxdirs542gnkrpakl7bvyp6s3"; depends=[DatABEL hglm]; };
 bigalgebra = derive { name="bigalgebra"; version="0.8.4"; sha256="19rv552ac0q9djc1yvpldkc0lipdf6q143m9dnndpsqs7ayqlr4g"; depends=[BH bigmemory]; };
 biganalytics = derive { name="biganalytics"; version="1.1.1"; sha256="0g45b293c1z9n2z9ab66jsy8yaiqm7bbs2d6pglzwgmmdvwy03qd"; depends=[BH bigmemory]; };
@@ -2627,7 +2625,7 @@ bild = derive { name="bild"; version="1.1-5"; sha256="03has1zi57inicahl52ja006vv
 bimetallic = derive { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; };
 binGroup = derive { name="binGroup"; version="1.1-0"; sha256="1sf7prg2x1ryynf1kz7jr50svmga7kjgd5pi9qm3g2hyimz8mvs4"; depends=[]; };
 binMto = derive { name="binMto"; version="0.0-6"; sha256="1h9s42wk848x15f4glhsh2iikpra64miwlia6xz5dqlzbs4vw86k"; depends=[mvtnorm]; };
-binda = derive { name="binda"; version="1.0.2"; sha256="1hfqx79pq9bn37j8rwv11wsv6d9prph26p2hqmnxilsdxr953ib2"; depends=[entropy]; };
+binda = derive { name="binda"; version="1.0.3"; sha256="15rhxnlif7agblzd09gyllkqkf5d8cc75b4vmp7grx8a6y7w47g0"; depends=[entropy]; };
 bindata = derive { name="bindata"; version="0.9-19"; sha256="15ya21fz1kvq4qsppkn9ypiqvaq8q4vszdcgcymampa7zc07z2ld"; depends=[e1071 mvtnorm]; };
 binequality = derive { name="binequality"; version="0.6.1"; sha256="18pcz5b65zk6fwh597pcbpyy0j7gkxp5swwadxvsa3cainvyd07n"; depends=[gamlss gamlss_cens gamlss_dist ineq survival]; };
 bingat = derive { name="bingat"; version="1.1"; sha256="1pb1yy1xrfvh71pg237lkmi56p8pbam60rii5i5km1i960lq0wc1"; depends=[matrixStats network]; };
@@ -2638,28 +2636,27 @@ binomTools = derive { name="binomTools"; version="1.0-1"; sha256="14594i7iapd6hy
 binomialcftp = derive { name="binomialcftp"; version="1.0"; sha256="00c7ymlxk1xnx3x1814x7bcyir7q5sy4rb82dcpzf2bdly4xa1qr"; depends=[]; };
 binomlogit = derive { name="binomlogit"; version="1.2"; sha256="1njz1g9sciwa8q6h0zd8iw45vg3i1fwcvicj5y8srpk8wqw3qp7k"; depends=[]; };
 binr = derive { name="binr"; version="1.1"; sha256="0kgk91zy7bdrhpkh9c5bi206y9hjwjwzb508i8qqmznqyxmza70r"; depends=[]; };
-binseqtest = derive { name="binseqtest"; version="1.0"; sha256="103nbi3zq9m632665iqz0z79v963ixhd5xrjfx6drwpfp4i69pbl"; depends=[clinfun]; };
+binseqtest = derive { name="binseqtest"; version="1.0.1"; sha256="0snlrwmmmwrl3fj8652rllgays737m020qc3fqv4sfp1vn6aayng"; depends=[clinfun]; };
 bio_infer = derive { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; };
 bio3d = derive { name="bio3d"; version="2.2-2"; sha256="0sqwl27n15sbablw4mcqgf0w2k28jc59wf8yqxrmqbg8cckfsh9j"; depends=[]; };
 bioPN = derive { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
 biogas = derive { name="biogas"; version="1.0.1"; sha256="0fjxfj4c4clyp4gkzm0dl5ls7pbyaxmff56dw59wswijm4na2il7"; depends=[]; };
-biogram = derive { name="biogram"; version="1.1"; sha256="04nkm972x1nzlacfjfk3i4gsqbfhrfaygmmw13hrp47j8snv8r26"; depends=[bit slam]; };
+biogram = derive { name="biogram"; version="1.2"; sha256="1kklidp1nm9jb0nvlhlhxklh4fp86plfsslp4ajnv8i4rc6h0v19"; depends=[bit entropy slam]; };
 biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[Matrix plyr RJSONIO]; };
 biomod2 = derive { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl256ws9namqdcdxq3w5g79ymfpymfav10h3a"; depends=[abind gbm ggplot2 MASS mda nnet pROC randomForest raster rasterVis reshape rpart sp]; };
 bionetdata = derive { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; };
-biopara = derive { name="biopara"; version="1.5"; sha256="1fhhs6lkm3iphlkx6wklh9sgr1mkjkka9wv2m8fnk0xw01bdsyl5"; depends=[]; };
 biorxivr = derive { name="biorxivr"; version="0.1.1"; sha256="0v2jmqpdcci3wwpcrakqcssahy3yx07s265axs14615w74dgd4kl"; depends=[XML]; };
 bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap cluster e1071 rgl scales]; };
-biosignalEMG = derive { name="biosignalEMG"; version="1.0.2"; sha256="0ywb59w3rgac59gif1jba8qi7rjdsdj7y5czj7kv8lf01vd5dl3l"; depends=[]; };
+biosignalEMG = derive { name="biosignalEMG"; version="1.0.3"; sha256="0nbr0d2hf28csv3lhl4af7hhqivwxaa1c1aj2yy1xjvnn6fd8mr3"; depends=[]; };
 biotools = derive { name="biotools"; version="2.1"; sha256="15ncx700v5ignr3gggz5zfspskzpj3kpzsy6rg2y4pnjm1vlndgj"; depends=[boot MASS rpanel tkrplot]; };
 bipartite = derive { name="bipartite"; version="2.05"; sha256="05w3ypdxy2lfygdlvg9xv88dpsf21i60rsbvvz058zwpfzr39hfh"; depends=[fields igraph MASS permute sna vegan]; };
-biplotbootGUI = derive { name="biplotbootGUI"; version="1.0"; sha256="0pgm31nhh1b78a8ciqjxw7gf3j7hh9wjc3myj29jpl92flbqmsw0"; depends=[rgl tcltk2 tkrplot vegan]; };
+biplotbootGUI = derive { name="biplotbootGUI"; version="1.1"; sha256="0k92z9iavvq5v56x2hgkmrf339xl7ns1pvpqb4ban8r1j8glzawi"; depends=[cluster dendroextras MASS rgl shapes tcltk2 tkrplot]; };
 birdring = derive { name="birdring"; version="1.2"; sha256="1jhhvdipsx3kw8n6gw6amm1vq0m83l48dkark9vvi2hpd730ca1y"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; };
 birk = derive { name="birk"; version="1.3.0"; sha256="02h8vh2r1ilmfgx1j3yw9jlzwshqh70nac28qzq1f5mpqll8z1sg"; depends=[]; };
 bisectr = derive { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; };
 bisoreg = derive { name="bisoreg"; version="1.4"; sha256="1ianhk5vrzhwb9ymzvlx9701p5c4iasxyq7nhrvm815dm15rf2wf"; depends=[bootstrap coda monreg R2WinBUGS]; };
 bit = derive { name="bit"; version="1.1-12"; sha256="0a6ig6nnjzq80r2ll4hc74za3xwzbzig6wlyb4dby0knzf3iqa6f"; depends=[]; };
-bit64 = derive { name="bit64"; version="0.9-4"; sha256="1w734l5ayr7w17a3gk2kmkqwz7v5jm830kfhyqmnd15i816lnjb9"; depends=[bit]; };
+bit64 = derive { name="bit64"; version="0.9-5"; sha256="0fz5m3fhvxgwjl76maag7yn0zdw24rx34gy6v77378fajag9yllg"; depends=[bit]; };
 bitops = derive { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; };
 bivarRIpower = derive { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; };
 biwavelet = derive { name="biwavelet"; version="0.17.10"; sha256="0rvlpqfrgajaw5bifc3103ixj2akdhpcxqhgw9fv0r1c5kv98qz0"; depends=[fields]; };
@@ -2689,13 +2686,13 @@ bmrm = derive { name="bmrm"; version="3.0"; sha256="0ix5hfsvs2vnca0l1aflynddw6z8
 bnlearn = derive { name="bnlearn"; version="3.8.1"; sha256="07lh67nw7wpjimim44zpw8h1rq4yqa2sdjcwj95bmyc25hlzv1s1"; depends=[]; };
 bnormnlr = derive { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; };
 bnpmr = derive { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; };
-boa = derive { name="boa"; version="1.1.7-2"; sha256="1n7i0i8jq2sa1kzhbgyqzl9d53wja7fsxd7rligc8xjm0sdsb386"; depends=[]; };
+boa = derive { name="boa"; version="1.1.8-1"; sha256="15nkr24hgv1286h9b6sdhlpljnm98fi5mmpsygl76h24dayy3854"; depends=[]; };
 boilerpipeR = derive { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; };
 bold = derive { name="bold"; version="0.2.6"; sha256="15hnbspp5s293v2jykmirf9rvdgpkd71h431gizz71ssayanzp67"; depends=[assertthat httr jsonlite plyr reshape stringr XML]; };
 boolean3 = derive { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[lattice mvtnorm numDeriv optimx rgenoud rlecuyer]; };
 boostSeq = derive { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; };
 boostr = derive { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; };
-boot = derive { name="boot"; version="1.3-16"; sha256="1fdp3yccsffqpm209dy11085i81cj7g36l34bb94rmd27mqiwrfi"; depends=[]; };
+boot = derive { name="boot"; version="1.3-17"; sha256="1lxjj0sbm9v21f34srrwkniiwbc59ibjh99yry9756ic55h6jyl5"; depends=[]; };
 bootES = derive { name="bootES"; version="1.01"; sha256="00y901d5cjdpzras5w6mv851h5zgp36m5ib6dazs4vqrfpqymva8"; depends=[boot]; };
 bootLR = derive { name="bootLR"; version="0.9"; sha256="0p4hq8nfdd8jw8r8dmlb6va4g7jjnkbsah69hissa9lqawbj9pi7"; depends=[boot]; };
 bootRes = derive { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; };
@@ -2713,12 +2710,11 @@ boussinesq = derive { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1
 boxplotdbl = derive { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; };
 boxr = derive { name="boxr"; version="0.2.6"; sha256="1b7xvblw2a1p8sr1gxrak404d43haa4kk7blnyir1pql8dcw24jd"; depends=[assertthat digest dplyr httpuv httr jsonlite stringr]; };
 bpca = derive { name="bpca"; version="1.2-2"; sha256="05ldz6b2s379mymj8jzvia9x6gj047gwsxvnv3zj9x8b1hvndnd6"; depends=[rgl scatterplot3d]; };
-bpcp = derive { name="bpcp"; version="1.2.5"; sha256="0dzsj0xhvn7jc8nb54191hwpw4sm7g13af5y3sgp9bhvcym8p31q"; depends=[]; };
+bpcp = derive { name="bpcp"; version="1.2.6"; sha256="0yn1d2sjl53b1c4g6b91v8j8d0rymcn25547zi4c7rafz4ips1gl"; depends=[]; };
 bpkde = derive { name="bpkde"; version="1.0-7"; sha256="1ls6rwmbgb2vzsjn34r87ab8rnz3ls61g6f4x3jpglbk0j91f0h8"; depends=[]; };
 bqtl = derive { name="bqtl"; version="1.0-30"; sha256="1v1p3wvqm5hmwpnjqaz8vlpzm036gpzpxsvy7m0v4x7nc5vrq7g6"; depends=[]; };
 brainR = derive { name="brainR"; version="1.2"; sha256="1515v6kk73p4s3vrnkpkilfxfyqrf7b762sq6j364ygsyfybvh2z"; depends=[misc3d oro_nifti rgl]; };
 brainwaver = derive { name="brainwaver"; version="1.6"; sha256="0r79dpd9bbbn34rm29512srzj3m29qgvbryvrp1mwv8mmcsh6ij6"; depends=[waveslim]; };
-branchLars = derive { name="branchLars"; version="1.0"; sha256="1adk9j77ynv7y8q04nvb468ik4nq4ff3j2nbxw596kgg5bg1ymz0"; depends=[lars Rgraphviz]; };
 breakage = derive { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; };
 breakaway = derive { name="breakaway"; version="1.0"; sha256="1agigb3b2ff1p9lx9ndz4hs1sgyv1g2zjb41l5p23370i5gk1nbn"; depends=[]; };
 breakpoint = derive { name="breakpoint"; version="1.1"; sha256="07k5d1jn5ahhml2q9ynpmwjm2ckyrr63qj7svh2ziyb41f5v7mfw"; depends=[doParallel foreach ggplot2 MASS msm]; };
@@ -2726,7 +2722,7 @@ brew = derive { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6y
 brewdata = derive { name="brewdata"; version="0.4"; sha256="1i8i3yhyph212m6jjsij61hz65a5rplxw8y2xqf6daqiisam5q6i"; depends=[RCurl stringdist XML]; };
 brglm = derive { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; };
 bride = derive { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; };
-brms = derive { name="brms"; version="0.2.0"; sha256="1i515sz3paiwwkmgglqzb2gzb2y6m99kp95xaarpawsja8nxi2j0"; depends=[abind coda ggmcmc ggplot2 gridExtra Rcpp]; };
+brms = derive { name="brms"; version="0.3.0"; sha256="0rgh0s1nlyhq41w24bq3qf3xxxzbfrnyrqw4pk0n5syqb7rdmi6m"; depends=[abind coda ggmcmc ggplot2 gridExtra Rcpp]; };
 brnn = derive { name="brnn"; version="0.5"; sha256="0kf2fdgshk8i3jlxjfgpdfq08kzlz3k9s7rdp4bg4lg3khmah9d1"; depends=[Formula]; };
 broman = derive { name="broman"; version="0.55-2"; sha256="04pg362gmxg5lvrv333mjq06lv0q3a1mq6wrbmy87jch6f10lazi"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
 broom = derive { name="broom"; version="0.3.7"; sha256="00z4kwxdqp6g35g4x6js9rc96z8i40hzgvhf5frj9dwfpxclk145"; depends=[dplyr plyr psych stringr tidyr]; };
@@ -2766,7 +2762,7 @@ capwire = derive { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7a
 car = derive { name="car"; version="2.0-25"; sha256="1h7fndsypg9jqfc4xlr8aszjgs477jsvvw4lkpgjxrlb4j779yyj"; depends=[MASS mgcv nnet pbkrtest quantreg]; };
 carcass = derive { name="carcass"; version="1.4"; sha256="16apmiackw194p5n0fivkgd2ymca9bfajasypl82xqyfk6amh088"; depends=[arm expm lme4 MASS survival]; };
 cardidates = derive { name="cardidates"; version="0.4.6"; sha256="02ib56fvn2z63sbinhwnlw123y86h6xazbkzw68sa9klqaxv69yl"; depends=[boot lattice pastecs]; };
-care = derive { name="care"; version="1.1.8"; sha256="0r1j2q23rz54rcx528n53m3hmhvb8ndqjpmmzm6j1y6lmixpqh41"; depends=[corpcor]; };
+care = derive { name="care"; version="1.1.9"; sha256="0fx5cbi1fx3hpyzghn1788rkh91i10z1ngryqc1v3iqqn3akbk4j"; depends=[corpcor]; };
 caret = derive { name="caret"; version="6.0-47"; sha256="0mpmch0435gcszj5yq4p7jpq7y9q8jk1bz3i1c9ij7a73kq2368i"; depends=[BradleyTerry2 car foreach ggplot2 lattice nlme plyr reshape2]; };
 caretEnsemble = derive { name="caretEnsemble"; version="1.0.0"; sha256="16qibyx034gi06rs8wnazfdicvrwpdsys3mvgwmb35qgzldqfizy"; depends=[caret caTools digest ggplot2 gridExtra lattice pbapply plyr]; };
 caribou = derive { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; };
@@ -2781,18 +2777,18 @@ catenary = derive { name="catenary"; version="1.1"; sha256="0khdk61fh8ngr70qf9i2
 cati = derive { name="cati"; version="0.99"; sha256="1xghdqmqfwi0wnzvrd896z4snyjqqs9kw3whmkd3cph8zf0jl931"; depends=[ade4 ape e1071 FD geometry hypervolume mice nlme rasterVis vegan]; };
 catnet = derive { name="catnet"; version="1.14.8"; sha256="03y7ddjyra3cjq7savdgickmw82ncx4k01rn752sks6rpl6bjslc"; depends=[]; };
 catspec = derive { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
-causaleffect = derive { name="causaleffect"; version="1.1.1"; sha256="1rsn3zfi24vv1s03ki0aghw4kjls95dr25473fpbmsrmm8n48cqi"; depends=[ggm igraph XML]; };
-causalsens = derive { name="causalsens"; version="0.1"; sha256="1v72zjplsa073f92qdza1zvwa1fwxlpmh8f6w5z8qcyiwqcbmifr"; depends=[]; };
+causaleffect = derive { name="causaleffect"; version="1.1.3"; sha256="04wbwl40iwyqi1j5ngss9rlsrp21qdr9pcp32ckl9g61qj8f6jxa"; depends=[ggm igraph XML]; };
+causalsens = derive { name="causalsens"; version="0.1.1"; sha256="1z92ckqa07ajm451wrldxx9y43nawlvj2bsz0afxc9mrhjwjg5dh"; depends=[]; };
 cba = derive { name="cba"; version="0.2-14"; sha256="067rm1rfz0rrq8xkzibd81pwvc9rx7ki46bncim4j5ra6i9pn24n"; depends=[proxy]; };
 ccChooser = derive { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; };
 ccaPP = derive { name="ccaPP"; version="0.3.0"; sha256="1wj5yij02372xarhvxsnh43v0l6xb2p8rflmskw6x86vpcdqd6zw"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; };
 cccd = derive { name="cccd"; version="1.5"; sha256="0m364zsrgr7mh1yhl2lqxpaf71gzq3y3pp9qgnj4spiy4iadyy7i"; depends=[deldir FNN igraph proxy]; };
 cccp = derive { name="cccp"; version="0.2-4"; sha256="1hw0xzfdycrnhkym5va430jk1b9ywf7wbm9qyj4a62n210hk4nzc"; depends=[Rcpp RcppArmadillo]; };
-cccrm = derive { name="cccrm"; version="1.1"; sha256="0q7vxzj3lblz5ddgzm8z99k0b0z194963hx96bbkqm4rv705dgb0"; depends=[gdata nlme]; };
+cccrm = derive { name="cccrm"; version="1.2.1"; sha256="180hzxm4z91hh008lysq1f0zky7qngg5z1laa1c119g4rqqcdskl"; depends=[gdata nlme]; };
 ccda = derive { name="ccda"; version="1.1"; sha256="0ya9x1b41l0pjyyfdswjyip0c2v8z7gncbj7cdz0486ad75229x7"; depends=[MASS]; };
 ccgarch = derive { name="ccgarch"; version="0.2.3"; sha256="0angffla3sk9i86v6bbsav95fp3mz5yvq7qfv0fx2v0nd2cx116w"; depends=[]; };
 cchs = derive { name="cchs"; version="0.1.0"; sha256="1x6pzwjdcklkbgr1yalijrcj3g56hj6085fh4pzqbm7xkqcj1mi6"; depends=[survival]; };
-cclust = derive { name="cclust"; version="0.6-19"; sha256="11lzzpr65jw7s0419bdy3w7cq97ysvv52ijb1wgqpa48wh1qbqqd"; depends=[]; };
+cclust = derive { name="cclust"; version="0.6-20"; sha256="1davlnrikfriczdwlprqd46axs9acvz30hhni134cisy11snlq7s"; depends=[]; };
 cda = derive { name="cda"; version="1.5.1"; sha256="09a2jb25219hq6if3bx03lsp94rp2ll9g73dhkdi665y7rlhgqwh"; depends=[dielectric plyr randtoolbox Rcpp RcppArmadillo reshape2 statmod]; };
 cdb = derive { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; };
 cdcsis = derive { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; };
@@ -2801,7 +2797,7 @@ cec2005benchmark = derive { name="cec2005benchmark"; version="1.0.4"; sha256="0b
 cec2013 = derive { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; };
 celestial = derive { name="celestial"; version="1.3"; sha256="0icsrpw8y7r0ls8ch5b25fl4rnvs6x5y2wscmcmpp4fa4x64qqg6"; depends=[RANN]; };
 cellVolumeDist = derive { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[gplots minpack_lm]; };
-cellranger = derive { name="cellranger"; version="0.1.0"; sha256="1nfvh0bd99q7cili0hj6ifcg8r57fxv5k4634b7vkshy5rbc5fw1"; depends=[]; };
+cellranger = derive { name="cellranger"; version="1.0.0"; sha256="1zyf9hxhj1s660xyqp3klc11plfhyzv4fi03p7j2p5grw280cm2x"; depends=[]; };
 cem = derive { name="cem"; version="1.1.16"; sha256="1crljw5ry3hynmfg9xfnbm3ypy57m33885xg39m88gzi6ydrnsvk"; depends=[combinat lattice MatchIt nlme randomForest]; };
 censNID = derive { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; };
 censReg = derive { name="censReg"; version="0.5-20"; sha256="15k7iq4275dyah3r47vgxsx6g6mr7ma53lkv6d1n89bczzys72kx"; depends=[glmmML maxLik miscTools sandwich]; };
@@ -2817,16 +2813,17 @@ cggd = derive { name="cggd"; version="0.8"; sha256="06z0mrxxc02parn9vkjv89qq4yqm
 cgh = derive { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697lybq3jyzz4l8ppgxqwxp4p4d2yqn"; depends=[]; };
 cghFLasso = derive { name="cghFLasso"; version="0.2-1"; sha256="0b1hnjf9g0v47hbz0dy9m6jhcl1ky20yyhhmm8myng2sndcpjsbf"; depends=[]; };
 cghseg = derive { name="cghseg"; version="1.0.2"; sha256="1x7j62aq5c1xj8ss3pys5160y6vny4pa1wvf6xh59ak2zr4xjm9h"; depends=[]; };
+cgwtools = derive { name="cgwtools"; version="3.0"; sha256="01888n056x4c8g0676jnbh6d89hamzxrh33aw6r28mzlnmfy5lmw"; depends=[]; };
 changepoint = derive { name="changepoint"; version="1.1.5"; sha256="090rak3ydlh92w0mpp2sjjx4m9x33clcs77waj20gzxbq38mqdci"; depends=[zoo]; };
 cheb = derive { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; };
 chebpol = derive { name="chebpol"; version="1.3-1367"; sha256="0w1yfnag0sjqjn7g5yn3wd19kkwzcchb491335h70rm360m1kr0y"; depends=[]; };
-checkmate = derive { name="checkmate"; version="1.5.3"; sha256="1d9szbszql0nz1zxplsr0w9f1c9vi11mjr5xg5960slb5v086x0g"; depends=[]; };
+checkmate = derive { name="checkmate"; version="1.6.0"; sha256="0jcqkdw850dndsh6mbyim5zgxgichmkr4yks3zh5fm9ffs1nmqkw"; depends=[]; };
 checkpoint = derive { name="checkpoint"; version="0.3.10"; sha256="147phhsv5g8k23fd355jqjqpjjj8n3s0bblm8mv5c3d0322li7ac"; depends=[]; };
 cheddar = derive { name="cheddar"; version="0.1-629"; sha256="13fmr37jj7dky5jrpr20z1iai9jbnpmwsh2pbzjwvib7561pyd6x"; depends=[]; };
 chemCal = derive { name="chemCal"; version="0.1-34"; sha256="0sn0mhp2d9a9rddfpkiv1pkrmvnv4sy18c1x2ks0lwpaklg78fbs"; depends=[]; };
 chemometrics = derive { name="chemometrics"; version="1.3.9"; sha256="089zlp4ba6yyxjh2p7fcph29lnxyk1gifb44fw7lsslvg19xlgjm"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; };
 chemosensors = derive { name="chemosensors"; version="0.7.8"; sha256="0zphfag0q6zskd301z1dldazzxr2fam6h41cpyivphaxpaljiv0m"; depends=[ggplot2 LearnBayes pls plyr quadprog RColorBrewer reshape2]; };
-cherry = derive { name="cherry"; version="0.5-10"; sha256="0fs4p5k1lwwlin5fj9z91aw59ybp60phjk293imizg6vpai5h39p"; depends=[bitops lpSolve Matrix]; };
+cherry = derive { name="cherry"; version="0.6-11"; sha256="0ixrzbzg559h0qb33b9158rk6w6as2b34b7iq5vzm429cpyzl7l8"; depends=[bitops lpSolve Matrix slam]; };
 childsds = derive { name="childsds"; version="0.5"; sha256="1fmisp6k375harjxsyzpwnd8zh3kd7vlhin18q1svfwdjyy9k3xh"; depends=[]; };
 chillR = derive { name="chillR"; version="0.55"; sha256="1b8lp4dfr3366ism7q2pddqpps3zmsyv5xg9rpyyh9yyl9ga1xhy"; depends=[fields Kendall pls]; };
 chipPCR = derive { name="chipPCR"; version="0.0.8-10"; sha256="1mff7n7ga4sfwvcq7zkjkrl68nybnm2zkn37hmxvnw9yl3ls9lnw"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; };
@@ -2840,9 +2837,9 @@ choroplethrAdmin1 = derive { name="choroplethrAdmin1"; version="1.0.0"; sha256="
 choroplethrMaps = derive { name="choroplethrMaps"; version="1.0"; sha256="00dgwikfxm1p1dqz1ybsxj1j8jcmrwa08m2d3zsww2invd55pk7g"; depends=[]; };
 chromer = derive { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; };
 chromoR = derive { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; };
-chron = derive { name="chron"; version="2.3-45"; sha256="0jkanbisi1bxh35rg0i6sl82f8r9v8va8mf8hknfvwv7p7n3ddpx"; depends=[]; };
+chron = derive { name="chron"; version="2.3-47"; sha256="1xj50kk8b8mbjpszp8i0wbripb5a4b36jcscwlbyap8n4487g34s"; depends=[]; };
 cin = derive { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; };
-circlize = derive { name="circlize"; version="0.2.4"; sha256="0zxd8jcim03cg77zxq9dvwlki51s9jhyaycdif7q6qc598lwwjx1"; depends=[GlobalOptions shape]; };
+circlize = derive { name="circlize"; version="0.2.5"; sha256="0kc58cin98a5w63iz20kwpll7129l1ww455hjjp4yvlpnsr6m038"; depends=[GlobalOptions shape]; };
 circular = derive { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; };
 cit = derive { name="cit"; version="1.4"; sha256="0axmi41bydkj512jscil9mqz9g6f11khl8hi6fci96wnm9x8gw7s"; depends=[]; };
 citbcmst = derive { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
@@ -2850,7 +2847,7 @@ citccmst = derive { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4
 cjoint = derive { name="cjoint"; version="1.0.3"; sha256="0f9yh4rbgqlx12vx336isfxc3lnrl5sgbapld0qfkv93p26in9h6"; depends=[ggplot2 lmtest sandwich]; };
 clValid = derive { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[class cluster]; };
 cladoRcpp = derive { name="cladoRcpp"; version="0.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp RcppArmadillo]; };
-class = derive { name="class"; version="7.3-12"; sha256="14baglhxk8xv3857s9b0immizh7sakk3spa5s4v28ysh7i94wx6i"; depends=[MASS]; };
+class = derive { name="class"; version="7.3-13"; sha256="0y6gms2hbzx45a10n86899hfaxjg3bjn6gfd5jhqzan5dalnp5w1"; depends=[MASS]; };
 classGraph = derive { name="classGraph"; version="0.7-4"; sha256="08cid5bdbciyijlzkx3684gx0cyzcj8myawf4dhcrz00jqrg8v60"; depends=[graph Rgraphviz]; };
 classInt = derive { name="classInt"; version="0.1-22"; sha256="0r9940bv6n43i6vlcgc19bvmcv3zlw0bi9zfs3scvah68rdb7v7l"; depends=[class e1071]; };
 classifly = derive { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; };
@@ -2858,9 +2855,9 @@ classify = derive { name="classify"; version="1.3"; sha256="0134h12h6v06d7ldj9qg
 classyfire = derive { name="classyfire"; version="0.1-2"; sha256="0rar3mi2m1wf14lmahjbpdh1jlnisvgsbx86xbqlb8c0f8zfzxq3"; depends=[boot e1071 ggplot2 neldermead optimbase snowfall]; };
 clere = derive { name="clere"; version="1.1"; sha256="1jna5dqy47mldd557qxl7vr59v5lalhligvm3c4k6b2dfararhfr"; depends=[Rcpp RcppEigen]; };
 clhs = derive { name="clhs"; version="0.5-4"; sha256="0535mpl1dbm9ij1dvj8dsmv4fickdg47by1mvf71lgfk5mjxy5nc"; depends=[ggplot2 plyr raster reshape2 scales sp]; };
-clickstream = derive { name="clickstream"; version="1.1.4"; sha256="0z73phz31j7n49xmwdgv293qbg6ldfgibpd5713qyk7qkhk8hvl7"; depends=[arules data_table igraph plyr Rsolnp]; };
+clickstream = derive { name="clickstream"; version="1.1.5"; sha256="010bf7rxicv43z33zrbmc1j0d0wz52kk7z4czxmljqs3qs6syfn2"; depends=[arules data_table igraph linprog plyr Rsolnp]; };
 clifro = derive { name="clifro"; version="2.4-0"; sha256="1bjsfk4m7hgq8k1mw07zx34ibgmpxjw8sig9jjzsr5mp3v13kwp8"; depends=[ggplot2 lubridate RColorBrewer RCurl reshape2 scales selectr XML]; };
-climdex_pcic = derive { name="climdex.pcic"; version="1.1-5.1"; sha256="0sq5l5dmnwbq9y6zfrq7zp81c8bmxwkvl7y9iq6wi3qcr78ga6zy"; depends=[caTools PCICt Rcpp]; };
+climdex_pcic = derive { name="climdex.pcic"; version="1.1-6"; sha256="0dyhqxrma8g4ny4afv6drr885m88q2b8g1n19yy3yjbrbddyz8yl"; depends=[caTools PCICt Rcpp]; };
 clime = derive { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; };
 climwin = derive { name="climwin"; version="0.0.1"; sha256="1ajkqk6lj2d8gx7arkwrznrkrjvdc5g9789vwaawwczbdavyi8kd"; depends=[evd ggplot2 gridExtra lme4 lubridate MuMIn reshape]; };
 clinUtiDNA = derive { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; };
@@ -2873,14 +2870,14 @@ clpAPI = derive { name="clpAPI"; version="1.2.6"; sha256="1kgzmzf87b0j43ch21anmm
 clue = derive { name="clue"; version="0.3-50"; sha256="0r3lb625a6vhxr7im2slz279zav9i74s0b9srkarqmz1bhaf6ly2"; depends=[cluster]; };
 clues = derive { name="clues"; version="0.5.6"; sha256="1g0pjj4as5wfc7qr3nwkzgxxxp3mrdq7djn8p8qjba6kcdjxak1i"; depends=[]; };
 clustMD = derive { name="clustMD"; version="1.1"; sha256="192li0nx2hwhh5y21xs70vrnzw3wxbzr95f06makaxcrwf4xlp16"; depends=[MASS mclust msm mvtnorm tmvtnorm truncnorm]; };
-cluster = derive { name="cluster"; version="2.0.1"; sha256="09l2vydyabk7x19bblxbjm68vnmifz46m5k3csb1snpbhq6qx52c"; depends=[]; };
+cluster = derive { name="cluster"; version="2.0.2"; sha256="1zk6y68l5lz0yvzr1d5rs45xid2pcjpvhdarwxz074iqb0ha5sih"; depends=[]; };
 cluster_datasets = derive { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; };
 clusterCrit = derive { name="clusterCrit"; version="1.2.5"; sha256="1xwbvvzrh2dz47y4snmhb96mriblk3czy7dp5bmyvckh5papr2xv"; depends=[]; };
 clusterGeneration = derive { name="clusterGeneration"; version="1.3.4"; sha256="1ak8p2sxz3y9scyva7niywyadmppg3yhvn6mwjq7z7cabbcilnbw"; depends=[MASS]; };
 clusterGenomics = derive { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; };
 clusterPower = derive { name="clusterPower"; version="0.5"; sha256="1g2qpvizyk4q3qlgvar436nrfqxwp5y8yi2y6rch9ak5mbg3yzqb"; depends=[lme4]; };
 clusterRepro = derive { name="clusterRepro"; version="0.5-1.1"; sha256="0vsf6cq6d51a4w23ph8kdz2h8dfpzyd6i85049p2wakn1kdvkz5p"; depends=[]; };
-clusterSEs = derive { name="clusterSEs"; version="1.2"; sha256="0ykfwvibps20w62xrdj4cr6w63gig3dyjmdq8m937g8qsmhd74lz"; depends=[lmtest mlogit sandwich]; };
+clusterSEs = derive { name="clusterSEs"; version="2.0"; sha256="18m1d5i2mjv5yhi0zbkqwx9c20x79kqwq8cj62xcl531q1gx4bpq"; depends=[AER Formula lmtest mlogit plm sandwich]; };
 clusterSim = derive { name="clusterSim"; version="0.44-2"; sha256="1xf3byri6mwlf89n896bxffmf3c6yqqh992npg9sqznx955hcggv"; depends=[ade4 cluster e1071 MASS R2HTML rgl]; };
 clusterfly = derive { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[e1071 plyr reshape2 rggobi RGtk2]; };
 clustergas = derive { name="clustergas"; version="1.0"; sha256="1vf4czpwk71yxd26vm5sal0ml20ssjrq4bmk31yzxydpxn495fg8"; depends=[cluster]; };
@@ -2894,11 +2891,11 @@ clv = derive { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahw
 cmaes = derive { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; };
 cmm = derive { name="cmm"; version="0.8"; sha256="1661v2lzxgf4s37wdsrnbsvqwppcr7mbp70i1xsysfzki1z6xr19"; depends=[]; };
 cmprsk = derive { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm"; depends=[survival]; };
-cmprskQR = derive { name="cmprskQR"; version="0.9.0"; sha256="1vnrfhlmmyamkpd8lsfznfpcq0mspkiwn3j23yj4sarfx5n32s9a"; depends=[quantreg survival]; };
 cmrutils = derive { name="cmrutils"; version="1.2-2"; sha256="0gc4sx8g9364sybmrqdjdvddqjd9ps6v205kaw0nqdx30xn96hmm"; depends=[chron]; };
+cmsaf = derive { name="cmsaf"; version="1.4"; sha256="1pdfwsy9cjzikld19dh1fhq16l03wha5pg144wp3j1g78cldyb08"; depends=[fields ncdf4 raster RNetCDF sp]; };
 cmvnorm = derive { name="cmvnorm"; version="1.0-1"; sha256="00cm7zfxbc5md3p6sakan64a6rzz7nbq0bqq9ys2iyxpilxalj3m"; depends=[elliptic emulator]; };
 cna = derive { name="cna"; version="1.0-3"; sha256="1iy0ispazhib30kh5wp3jziiyf0992nrdklrq80n0w3zhjyi21rh"; depends=[]; };
-cncaGUI = derive { name="cncaGUI"; version="0.0-2"; sha256="0iwsaqqnh142syag91rzwwsc9n2qiw4xh5x1gjsgc74ywdm4g5fz"; depends=[rgl tcltk2 tkrplot]; };
+cncaGUI = derive { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; };
 coalescentMCMC = derive { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; };
 coarseDataTools = derive { name="coarseDataTools"; version="0.6-2"; sha256="1nnh61kfw294cxawz9i8yf37ddzsn5s532vvkaz0ychk0390wmi5"; depends=[MCMCpack]; };
 cobs = derive { name="cobs"; version="1.3-0"; sha256="1aly7ir7vzir9wnbhyfbrkl7dbq68f79jwxhqrfpf0v2m5kxhz88"; depends=[quantreg SparseM]; };
@@ -2926,6 +2923,7 @@ colourlovers = derive { name="colourlovers"; version="0.1.4"; sha256="1c5g9z7ckn
 comato = derive { name="comato"; version="1.0"; sha256="03jnvv0sczy13r81aljhj9kv09sl5hrs0n5bn3pdi7ba64zgbjiw"; depends=[cluster clusterSim gdata igraph lattice Matrix XML]; };
 combinat = derive { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; };
 comclim = derive { name="comclim"; version="0.9.4"; sha256="0m6ynccscsrrq70p0drwrwxp4skc630kv1l5smh48pi8kagahj1g"; depends=[]; };
+cometExactTest = derive { name="cometExactTest"; version="0.1.2"; sha256="0d0ccl09vcgj683p0i4g1dhnqnk61smdva4cbw6s6jdr7nqm6xa8"; depends=[]; };
 commandr = derive { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; };
 commentr = derive { name="commentr"; version="0.1"; sha256="0kyi7xd2f2b1avk78bmkbagyjqwwx21hca670n38k1a28kvnjpix"; depends=[stringr]; };
 commonmark = derive { name="commonmark"; version="0.4"; sha256="0canhzzc91fpcg53zms12k382zj4db652vh5cn74xrp73z8yvabk"; depends=[]; };
@@ -2960,6 +2958,7 @@ constrainedKriging = derive { name="constrainedKriging"; version="0.2.4"; sha256
 contfrac = derive { name="contfrac"; version="1.1-9"; sha256="16yl96bmr16a18qfz6y5zf7p02ky1jy2iimcb1wp50g7imlcq840"; depends=[]; };
 conting = derive { name="conting"; version="1.5"; sha256="02vkpzdcwsny40jdcxgjfrx89lw1gq864s3fgswa9bfxfps9p58h"; depends=[BMS coda gtools mvtnorm tseries]; };
 contrast = derive { name="contrast"; version="0.19"; sha256="1kc3scz3msa52lplc79mmn4z99kq1p2vlb18wqxa9q2ma133x6pl"; depends=[rms]; };
+controlTest = derive { name="controlTest"; version="1.0"; sha256="0gzhd92qy3dykwdfwckw6x46bd9m044hcn4bqwpv16af1xbrj963"; depends=[survival]; };
 convevol = derive { name="convevol"; version="1.0"; sha256="05nhpndixvrmiq5paswj7qwsq3k3al34q3j751bic4kb8zhby3fk"; depends=[ape cluster geiger MASS phytools]; };
 cooccur = derive { name="cooccur"; version="1.2"; sha256="0v26aa6j77dmm7pdij4qaz03mxn69aa71rw6n5yl3b9qb0w4k81z"; depends=[ggplot2 gmp reshape2]; };
 cooptrees = derive { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; };
@@ -2974,10 +2973,10 @@ corclass = derive { name="corclass"; version="0.1"; sha256="02mxypdrjwf8psk0j9gg
 corcounts = derive { name="corcounts"; version="1.4"; sha256="0irlx62ql5rp5s7nnjdy6jh723wl4039wn10zxri8ihxwqsyyz3f"; depends=[]; };
 coreNLP = derive { name="coreNLP"; version="0.4-1"; sha256="0a6pc588ddi9qyi5gsnzzvm4k0p5sp5bnjrlsskaymzdq4rp6miz"; depends=[plotrix rJava XML]; };
 coreTDT = derive { name="coreTDT"; version="1.0"; sha256="14rnh61gk3m6g8rq77hm9ybds0px15di2mxm3jiyfdfynx5ng58f"; depends=[]; };
-corpcor = derive { name="corpcor"; version="1.6.7"; sha256="1vfzi17vkvzbqgzhmpdhybb6lli0z9vm9p31cwb8bn8ddlkn5ll4"; depends=[]; };
+corpcor = derive { name="corpcor"; version="1.6.8"; sha256="0gnwqzfhxhxy7zxjzgga9l2npn588jjavqlmv9dag7ciq1kxmzk9"; depends=[]; };
 corpora = derive { name="corpora"; version="0.4-3"; sha256="0zh8mabfy9yqgx7asi4yqv4c0kj59yvyxxaxjgdjy5kkr17zd4g4"; depends=[]; };
 correlate = derive { name="correlate"; version="1.0"; sha256="0hv0i928f49p8n78hd3bcx923l2x0zcs4kwj71ph8gm7s8540fhc"; depends=[]; };
-corrgram = derive { name="corrgram"; version="1.7"; sha256="1zs0i4dhl1c5ms70cmy8cc9qi9y3ssd62brd7jrpagz56sdwwx0k"; depends=[seriation]; };
+corrgram = derive { name="corrgram"; version="1.8"; sha256="0myaf0j2sa895xiczhn6r97j988jxc1bv8wnh9cw2ppxzxqly4rg"; depends=[seriation]; };
 corrplot = derive { name="corrplot"; version="0.73"; sha256="0xnlkb8lhdjcc10drym9ymqzvfwa3kvf955y0k66z5jvabzyjkck"; depends=[]; };
 corrsieve = derive { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; };
 cosinor = derive { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; };
@@ -2991,9 +2990,9 @@ countrycode = derive { name="countrycode"; version="0.18"; sha256="1by3xws2c43ry
 covLCA = derive { name="covLCA"; version="1.0"; sha256="15jsjrlaws1cqyrwvh4lzbhxkb11jmgpmddg98nfrzmjpczn2iw3"; depends=[Matrix mlogit poLCA]; };
 covRobust = derive { name="covRobust"; version="1.1-0"; sha256="1nvy5cqs4g565qj2hhgk5spr58ps2bhas3i752rf7wvrskb89fk7"; depends=[]; };
 covTest = derive { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[glmnet glmpath lars MASS]; };
-covr = derive { name="covr"; version="1.0.0"; sha256="1svq2dcqnd5iwq75nk38lxa3dshiwil2ksd3666713agbqzikgcz"; depends=[crayon devtools htmltools httr jsonlite rex]; };
+covr = derive { name="covr"; version="1.2.0"; sha256="1gavcqqbg211sv52sicrh87vif71dl6n9xfcb6b3giqw897w7vrc"; depends=[crayon devtools htmltools httr jsonlite rex]; };
 covreg = derive { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; };
-cowplot = derive { name="cowplot"; version="0.4.0"; sha256="06zpzqm19lmvlwl6pkhlb4iw8y9mq69xw002yggfnfm5lb3plsgs"; depends=[ggplot2 gtable plyr]; };
+cowplot = derive { name="cowplot"; version="0.5.0"; sha256="1syldi47xl2fbdn3dbclc2xyp2la8xs3hp45qmg9565g4m3ixm14"; depends=[ggplot2 gtable plyr]; };
 coxinterval = derive { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[Matrix survival timereg]; };
 coxme = derive { name="coxme"; version="2.2-5"; sha256="0lpdwpvsgjgmbf55qqhflw4q40xmqm422inkssgn3ladcp68gb1s"; depends=[bdsmatrix Matrix nlme survival]; };
 coxphf = derive { name="coxphf"; version="1.11"; sha256="0494szmhc7qp1qynrqf3kmna26h4ams40qr6w7qj4al54mkp0346"; depends=[survival]; };
@@ -3017,7 +3016,7 @@ crantastic = derive { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2q
 crawl = derive { name="crawl"; version="1.4-1"; sha256="175w5933h5hhhjnrc0l1kg5q24b8pclnf5sf36gj1pmg8s58d1gp"; depends=[mvtnorm raster sp]; };
 crayon = derive { name="crayon"; version="1.3.0"; sha256="1s51ijdsss02d6wwbx2r14vz03w8b17757rh43i7nc1vh36ylbjk"; depends=[memoise]; };
 crblocks = derive { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; };
-crch = derive { name="crch"; version="0.1-0"; sha256="1f4y2dd6lxsryyjjv569bxh1b4ymcnma0m9k7j150anzvkbrgnjn"; depends=[Formula ordinal]; };
+crch = derive { name="crch"; version="0.9-0"; sha256="0kd71lv239sn08f3v63k18dxxn6zbk3m0znx2xrmd4a2akrqwjsj"; depends=[Formula ordinal]; };
 crimCV = derive { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; };
 crimelinkage = derive { name="crimelinkage"; version="0.0.3"; sha256="018ni9jgnm4k8vybz99drsx8phb0ar3x0raa5ydkfpgqp525sayi"; depends=[geosphere igraph]; };
 crmn = derive { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[Biobase pcaMethods]; };
@@ -3025,13 +3024,14 @@ crn = derive { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g1
 crossReg = derive { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; };
 crossdes = derive { name="crossdes"; version="1.1-1"; sha256="1d7lv3ibq1rwxx8kc3ia6l9dbz2dxdd5pnf2vhhjmwm448iamcfd"; depends=[AlgDesign gtools]; };
 crossmatch = derive { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[nbpMatching survival]; };
-crossval = derive { name="crossval"; version="1.0.2"; sha256="1imqmrr86yr2ml9x8cycnlr7d8yymyyypi87kxqjc32s2r16s0cx"; depends=[]; };
+crossval = derive { name="crossval"; version="1.0.3"; sha256="0acpcisg6pkxblyc4j9hiri58h1rn7ay43p5ib5ia8a4a8bnfa4p"; depends=[]; };
 crp_CSFP = derive { name="crp.CSFP"; version="2.0"; sha256="0ji208hn3zimql0xhy8bl7w0vg40szw28fia7k1f7g9z0wbl9xqp"; depends=[MASS]; };
 crqa = derive { name="crqa"; version="1.0.5"; sha256="0kiw90p89mf207mmky98g2d4l9mnhzi4dy08d810nm16wiqabkw4"; depends=[fields Matrix pracma tseriesChaos]; };
 crrSC = derive { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; };
+crrp = derive { name="crrp"; version="1.0"; sha256="1fq54jr6avrli91a4z1hp5img4kghyw1yvjr5xyccsanf9i35x8r"; depends=[cmprsk Matrix survival]; };
 crrstep = derive { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; };
 crs = derive { name="crs"; version="0.15-24"; sha256="08k8vim4n85ll16zpkwbf3riz641kafn699qsg0h746zqzi1kfn7"; depends=[boot np quantreg rgl]; };
-crunch = derive { name="crunch"; version="1.2.1"; sha256="0p3d7iwphywyfb0m9s3fnqhdhf9klgf1cswilaz9ngxfzh5g3df2"; depends=[httr jsonlite RCurl]; };
+crunch = derive { name="crunch"; version="1.3.2"; sha256="021xzhxmid5r9f9c02vkywp498xmgyqcdg0yb20j507dabkbayjr"; depends=[httr jsonlite RCurl]; };
 csSAM = derive { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
 csampling = derive { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; };
 cshapes = derive { name="cshapes"; version="0.4-2"; sha256="015mkh0iwdbhpbk8gpnq48pp026mfidd69rj70arpmg3knd2jvff"; depends=[maptools plyr sp]; };
@@ -3049,16 +3049,18 @@ cudaBayesregData = derive { name="cudaBayesregData"; version="0.3-11"; sha256="1
 cudia = derive { name="cudia"; version="0.1"; sha256="1ms3bc8sp6l3bm75j418mmb707sy3gyvxznhfias3nd4sw7i074x"; depends=[MCMCpack mvtnorm]; };
 cumSeg = derive { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; };
 cumplyr = derive { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; };
-curl = derive { name="curl"; version="0.8"; sha256="1j24w2hswcs3hl47b60rz3scbqpd2s2dfa2fbf1c9xxb3fi1m38w"; depends=[]; };
+curl = derive { name="curl"; version="0.9.1"; sha256="0kz7c6cyhan2c9snizzf1b8ppipxb9hnkfsfkik86y8sw7yhw4jp"; depends=[]; };
 currentSurvival = derive { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[cmprsk survival]; };
 curvHDR = derive { name="curvHDR"; version="1.0-3"; sha256="0rq72prxv2r5nicss9mh4wpkfjvlbb885w85ag4qrqijzq6y8q04"; depends=[feature flowCore geometry hdrcde ks misc3d ptinpoly rgl]; };
 curvetest = derive { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_methodsS3 R_oo]; };
+cusp = derive { name="cusp"; version="2.3.1"; sha256="0fs5zwxh2wrhyqcycz09qskbv57hfw1ag32jk9q12lqxpsxkws8v"; depends=[]; };
 cutoffR = derive { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; };
 cuttlefish_model = derive { name="cuttlefish.model"; version="1.0"; sha256="1rmkfyfd1323g2ymd5gi1aksp160cwy5ha5cjqh5r6fzd8hhqjxs"; depends=[]; };
 cvAUC = derive { name="cvAUC"; version="1.1.0"; sha256="13bk97l5nn97h85iz93zxazhr63n21nwyrpnl856as9qp59yvn64"; depends=[data_table ROCR]; };
 cvTools = derive { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase]; };
 cvplogistic = derive { name="cvplogistic"; version="3.1-0"; sha256="1lm66nn0q7665r64rdslxp35b7drdss4mys42ks54xdydcminns9"; depends=[]; };
 cvq2 = derive { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; };
+cvxbiclustr = derive { name="cvxbiclustr"; version="0.0.1"; sha256="00k75zy8v6qd5fg0h258i5z8ljjkfgkxz45cspysl1ap89d5n7df"; depends=[igraph Matrix]; };
 cvxclustr = derive { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[igraph Matrix]; };
 cwhmisc = derive { name="cwhmisc"; version="5.0"; sha256="0b70ssss48kpjyimwm8hwcx82whg77j40qxaaj4vhhqc8d2bzgd2"; depends=[lattice]; };
 cwm = derive { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; };
@@ -3067,8 +3069,9 @@ cycloids = derive { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bf
 cyphid = derive { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; };
 cytoDiv = derive { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; };
 d3Network = derive { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; };
+d3heatmap = derive { name="d3heatmap"; version="0.6.0"; sha256="1whagc3pyb03j7p3wsphcfivirgh5an5sx4im5iw2g6a9v7zh0gv"; depends=[base64enc dendextend htmlwidgets png scales]; };
 dMod = derive { name="dMod"; version="0.1"; sha256="0170hvgngwxr0qfl7knmj0l2gg053xj5yfd5hkfyjnl6ivcsw3c9"; depends=[cOde ggplot2 trust]; };
-dae = derive { name="dae"; version="2.7-0"; sha256="1pfd3zyvs29ij8xa1ngz2din4srl45rjnjc576h1mz16l7h5kx53"; depends=[ggplot2]; };
+dae = derive { name="dae"; version="2.7-2"; sha256="0b38bwk5c8fzgvkg8jpci4n8cj94zdypc099apfjzy2gkw5l71ym"; depends=[ggplot2]; };
 daewr = derive { name="daewr"; version="1.1-4"; sha256="0pmz4721999vf023hpvsf17k5fgqpwnisnwssmav46glhmzl2cyj"; depends=[BsMD FrF2 lattice]; };
 daff = derive { name="daff"; version="0.1.4"; sha256="1g08m9qyrlwxdy9w18132dc9klz6ayw5jbn700vkzvqibfc1l7cx"; depends=[jsonlite V8]; };
 dafs = derive { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; };
@@ -3081,7 +3084,7 @@ dashboard = derive { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q
 data_table = derive { name="data.table"; version="1.9.4"; sha256="0gsnjjly3mxwfs6q0kjr42vr234mprp8kcyzcsa4dqf2ya2gs1s6"; depends=[chron reshape2]; };
 data_tree = derive { name="data.tree"; version="0.1.6"; sha256="09pk4c5jkj69m6sxa2pbs1wh1w4rsg799w72fx9ib4jv22hjvrhc"; depends=[R6]; };
 dataQualityR = derive { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; };
-dataRetrieval = derive { name="dataRetrieval"; version="2.2.1"; sha256="1mq32blqdsc1zj3l7wbxdc9asl2nkrby5kijdk0rix574cxml9qm"; depends=[lubridate plyr RCurl reshape2 XML]; };
+dataRetrieval = derive { name="dataRetrieval"; version="2.3.0"; sha256="0a9v2k473g4a49w9a1xk1x3xd9hdmc5m5xsqh3790vfx89drza69"; depends=[lubridate plyr RCurl reshape2 XML]; };
 datacheck = derive { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[Hmisc shiny stringr]; };
 dataframes2xls = derive { name="dataframes2xls"; version="0.4.6"; sha256="18m4cbr3pxdn5ynxwd8klwwli3cyfjcn83pl17sn1rbavqlnkq5c"; depends=[]; };
 datalist = derive { name="datalist"; version="0.2"; sha256="0q82wira0sfi63cn66f5cfyd15f19ig7pbmpk56j38a3115l2fmn"; depends=[assertthat]; };
@@ -3107,10 +3110,10 @@ dclone = derive { name="dclone"; version="2.0-0"; sha256="1j8g955rvdgcmc9vnz3xiz
 dcmle = derive { name="dcmle"; version="0.2-4"; sha256="0ddb0x0lwk8jgx05k747sa33d2rrj4g2p4aj0m5bw1c9d5gril0m"; depends=[coda dclone lattice rjags]; };
 dcmr = derive { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; };
 dcv = derive { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; };
-ddalpha = derive { name="ddalpha"; version="1.1.1"; sha256="1i0zchgp5pdfa9p1mpd9svbigbn01jqfl47nnqixzlgz1808929c"; depends=[BH class MASS Rcpp robustbase]; };
-ddeploy = derive { name="ddeploy"; version="1.0.2"; sha256="115k379l39gzddvn0l45l0sr0wyd7r486i28qs2hfyjnk1288vrs"; depends=[httr jsonlite]; };
+ddalpha = derive { name="ddalpha"; version="1.1.2.3"; sha256="1n1502is99gxw84g4a0n8ciq2pr8dpvi7cmzcxqvcpqdjrjdhr20"; depends=[BH class MASS Rcpp robustbase]; };
+ddeploy = derive { name="ddeploy"; version="1.0.4"; sha256="06s4mn93sl33gldda9qab8l3nqig8zq0fh1s2f98igsysmn31br5"; depends=[httr jsonlite]; };
 ddst = derive { name="ddst"; version="1.03"; sha256="0zbqw4qmrh80jjgn8jzbnq3kykj1v5bsg6k751vircc0x9vnig3j"; depends=[evd orthopolynom]; };
-deSolve = derive { name="deSolve"; version="1.11"; sha256="014fbrgzlarg2w27kq9qy7631hvhlf7ldrn5g8x2xibb260832s1"; depends=[]; };
+deSolve = derive { name="deSolve"; version="1.12"; sha256="0npcayl6q2f32b3iflfgs7gg2slg4dfgdcz4awpllza0lwgzyyfj"; depends=[]; };
 deTestSet = derive { name="deTestSet"; version="1.1.2"; sha256="142261xjlz6h9vakiks04rz7hgv9b5j6s77acavd5s5mpi51ysh7"; depends=[deSolve]; };
 deal = derive { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmabbyivc25cbfhcf814avrhpysvpxa"; depends=[]; };
 deamer = derive { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; };
@@ -3131,7 +3134,7 @@ demi = derive { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1
 deming = derive { name="deming"; version="1.0-1"; sha256="00v59qb6qwbwsvcwi59d0c0g3czfz1190ccj4dx6yarizr4g6cy8"; depends=[boot]; };
 demoKde = derive { name="demoKde"; version="0.9-3"; sha256="1nkvsjms1gfvjz5l7zza0cgx4yqmn2kgnax44pysn0zqmhfny8bw"; depends=[]; };
 demography = derive { name="demography"; version="1.18"; sha256="17r7sz5ikngc4qg495wmn99xawmllpx7rw2gpv8q8bypbc47wlfv"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; };
-dendextend = derive { name="dendextend"; version="0.18.3"; sha256="1s6bdkibb066yima31sn8ddp8qrwyx2zc84wf2kixs37ynhw1xi1"; depends=[magrittr whisker]; };
+dendextend = derive { name="dendextend"; version="1.0.1"; sha256="1q2lhl1h1f9ga3anqcdhzksg8kqri6gwl9a8mjzs8yr17cs51ff6"; depends=[magrittr whisker]; };
 dendextendRcpp = derive { name="dendextendRcpp"; version="0.6.1"; sha256="125kjlfcj7y282j5g62c6j5hflvwngrm70waxym0lzr7xldwx7bk"; depends=[dendextend Rcpp]; };
 dendroextras = derive { name="dendroextras"; version="0.2.1"; sha256="0k1w374r4fvfcbzhrgcvklccjggyz755z7wc2vqfi3c5hvdb9ns4"; depends=[]; };
 dendsort = derive { name="dendsort"; version="0.3.2"; sha256="0qj65jraj6ksmsfsrc4f3y8m7x5lqg9bqc9yb5s3bav2r8qjyhv6"; depends=[]; };
@@ -3144,6 +3147,7 @@ depmix = derive { name="depmix"; version="0.9.13"; sha256="1dkwc1bjq19hjzichh78b
 depmixS4 = derive { name="depmixS4"; version="1.3-2"; sha256="18xmn5fv9wszh86ph91yypfnyrxy7j2gqrzzgkb84986fjp2sxlq"; depends=[MASS nnet Rsolnp]; };
 depth = derive { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6jp2qs39g8lxi2nmpbi3m7a6qrgr2q"; depends=[abind circular rgl]; };
 depthTools = derive { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; };
+dequer = derive { name="dequer"; version="1.0"; sha256="1xf2kl6ppgsplqwhxxyak39575bjijh81snq534yndf31pdqqhd7"; depends=[]; };
 descomponer = derive { name="descomponer"; version="1.2"; sha256="08hc3p4l8dy1h2z8ijifwlgidmac9b29g1k725yzwzbdr5jzvnzl"; depends=[taRifx]; };
 descr = derive { name="descr"; version="1.1.1"; sha256="1flnz05j390izwadsv2l5bcxgl6zmq4vzz1aycfifjz75zyqqy8s"; depends=[xtable]; };
 deseasonalize = derive { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[FitAR lattice]; };
@@ -3178,7 +3182,7 @@ difR = derive { name="difR"; version="4.6"; sha256="1803j0ql1g8gdy9i0wy4sz9sbl52
 diffEq = derive { name="diffEq"; version="1.0-1"; sha256="1xmb19hs0x913g45szmm26xx5xp85v182wqf0lnl4raxaf47yhkm"; depends=[bvpSolve deSolve deTestSet ReacTran rootSolve shape]; };
 diffIRT = derive { name="diffIRT"; version="1.4"; sha256="13axwzsrlr1akj4viwsyaplh11krixg3l07qi58c81jrcrmqpgv1"; depends=[statmod]; };
 diffdepprop = derive { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee PropCIs rootSolve]; };
-diffeR = derive { name="diffeR"; version="0.0-2"; sha256="1dkmwr6klqx950g9214n2rbd0p3k668w5217b0nvz6vfp3gczkjz"; depends=[ggplot2 raster rgdal]; };
+diffeR = derive { name="diffeR"; version="0.0-3"; sha256="0r1f39jh0jmlfvvzfvwr84g7xh9d6nkgqaq3kxdf66cggsxwnag4"; depends=[ggplot2 raster rgdal]; };
 diffractometry = derive { name="diffractometry"; version="0.1-8"; sha256="1m6cyf1kxm9xf1z4mn4iz0ggiy9wcyi8ysbgcsk7l78y7nqh1h99"; depends=[]; };
 diffusionMap = derive { name="diffusionMap"; version="1.1-0"; sha256="1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3"; depends=[igraph Matrix scatterplot3d]; };
 digest = derive { name="digest"; version="0.6.8"; sha256="0m9grqv67hhf51lz10whymhw0g0d98466ka694kya5x95hn44qih"; depends=[]; };
@@ -3186,7 +3190,7 @@ digitalPCR = derive { name="digitalPCR"; version="1.0"; sha256="0gjxlw0f2msh2x5j
 dils = derive { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; };
 dinamic = derive { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; };
 diptest = derive { name="diptest"; version="0.75-7"; sha256="0rcgycgp0bf8vhga1wwgfcz3pqs5l26hgzsgf2f97dwfna40i1p1"; depends=[]; };
-directPA = derive { name="directPA"; version="1.1"; sha256="0sri3981vk997qjl3c3zchn3vx0h3pdbnagcvds4bnrpycvn4bz8"; depends=[calibrate rgl]; };
+directPA = derive { name="directPA"; version="1.2"; sha256="0wzmlahqcrb5f3hrlym5gs5wizmgvhndky7zvc98324bq645b56m"; depends=[calibrate rgl]; };
 directlabels = derive { name="directlabels"; version="2013.6.15"; sha256="083cwahz320r4w4jbh62pxmzn1i1hixp398zm8f2fpzh4qp5y44g"; depends=[quadprog]; };
 dirmult = derive { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; };
 discSurv = derive { name="discSurv"; version="1.1.0"; sha256="0jj055w0m749fdd90cqlyklxnjxfjhly179lmg9xfl69w4xrjc2l"; depends=[caret functional Matrix matrixcalc mgcv mvtnorm numDeriv]; };
@@ -3196,8 +3200,7 @@ discreteMTP = derive { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph
 discreteRV = derive { name="discreteRV"; version="1.2.1"; sha256="06gvfn5v54gbal7kpnfcxwaacbq8354yvc47kjipn29bqpw9b6mb"; depends=[MASS plyr]; };
 discretization = derive { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; };
 discrimARTs = derive { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; };
-diseasemapping = derive { name="diseasemapping"; version="1.2.0"; sha256="1l6w1f4zxfp1hrhvmxgijj2kwy7x0na2yf75ifqrbh1i499j8zjq"; depends=[sp]; };
-diskmemoiser = derive { name="diskmemoiser"; version="1.0-1"; sha256="0lacadc3mm1w55sff3lphp3xrr1inn2r382c1z8gf6kzal7c9pd8"; depends=[digest]; };
+diseasemapping = derive { name="diseasemapping"; version="1.2.3"; sha256="151z5w8k0s22hhp5795jf7lx1mhfxhqqg5skwxjrlkbn9yszjxpl"; depends=[sp]; };
 dismo = derive { name="dismo"; version="1.0-12"; sha256="1zm3z9z2ramsp85x96rrnmj5zabm8r7f0wfxrxg2sgddwwqvxpsv"; depends=[raster sp]; };
 disp2D = derive { name="disp2D"; version="1.0"; sha256="0q5bds2r1mqzcwmnj61dmwqv6b0s0scq5h3nim47q3wp0n4gbslz"; depends=[geometry]; };
 disparityfilter = derive { name="disparityfilter"; version="2.1"; sha256="0ld43hd4dr389pd8sncslp707jyfgbx7w1larq75gkzjykc29aqw"; depends=[igraph]; };
@@ -3231,7 +3234,7 @@ dlmap = derive { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0
 dlmodeler = derive { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; };
 dlnm = derive { name="dlnm"; version="2.1.3"; sha256="044khdhk4dgd09cwmidsfa2rgd43h7wnd48bmmrnsvj3314bic0f"; depends=[nlme]; };
 dma = derive { name="dma"; version="1.2-2"; sha256="18v40rr4qx98ap38vr77xxvl7y3a6cqfky3z4s5zc87q6y1z5g2s"; depends=[MASS mnormt]; };
-dmm = derive { name="dmm"; version="1.6-1"; sha256="0bls3ka8fwnsd0v74ncy8nbgxk0a3z1gw9dgm3vibz1lsypfs72a"; depends=[MASS Matrix nadiv pls robustbase]; };
+dmm = derive { name="dmm"; version="1.6-2"; sha256="00wqa33n1zd6gbl658vrz07f6kkhbmdg8f3y9x9n3zq2ygnxrid1"; depends=[MASS Matrix nadiv pls robustbase]; };
 dmt = derive { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; };
 dna = derive { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; };
 dnet = derive { name="dnet"; version="1.0.6"; sha256="0zhv2yfrlhfwjbgbvjzmw3c5g5rj33n8l2npdf6b4nqz0c0hc1jn"; depends=[Biobase graph igraph Matrix Rgraphviz supraHex]; };
@@ -3268,7 +3271,7 @@ drmdel = derive { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn
 dropR = derive { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; };
 drsmooth = derive { name="drsmooth"; version="1.0"; sha256="1cxhj28dkll704kif040vqnp9grb61v891rswvyx7aa9216156px"; depends=[car clinfun DTK mgcv multcomp mvtnorm pgirmess segmented]; };
 ds = derive { name="ds"; version="3.0"; sha256="10xp575l0wh85wg32k3as02kgqm9ax9nx9i5kd5bkimfwg4qv745"; depends=[]; };
-dsample = derive { name="dsample"; version="0.91.1"; sha256="0nxx3x55zj089aq2shk7cg9bgh6xw7jnrr2qmlaq6bflwn58wn1q"; depends=[]; };
+dsample = derive { name="dsample"; version="0.91.1.5"; sha256="02ksm4d9ybz4w7j3c9rjqh262k6rqs1bdhj3p7w5rcaskpc6qz9s"; depends=[]; };
 dse = derive { name="dse"; version="2014.11-1"; sha256="0fl1av8zd0csbsk6fplcxgqsb50qr1baasw2jrqv6h83j2xwph2l"; depends=[setRNG tfplot tframe]; };
 dslice = derive { name="dslice"; version="1.1.4"; sha256="0srqw1kznbjl1v6dpgh7vsrpf9k3zj7j55zw9k50jsbw2z4xqzfw"; depends=[ggplot2 Rcpp scales]; };
 dsm = derive { name="dsm"; version="2.2.5"; sha256="0sfsfzcsqnvjkc5l7h5xq8p2jsgwxfzds75sqs58a0kzagcm1b05"; depends=[ggplot2 mgcv mrds nlme statmod]; };
@@ -3297,12 +3300,12 @@ dynlm = derive { name="dynlm"; version="0.3-3"; sha256="0ym23gv2vkvvnxvzk5kh6xy4
 dynsim = derive { name="dynsim"; version="1.0"; sha256="0w4brs8kcps6gkamkic57nj61iz7zdxq972jwzs17i43wfcrw32c"; depends=[ggplot2 gridExtra MASS]; };
 dynsurv = derive { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1mgv3xpbryi520va3jpd03dx15zrq8zaqg"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
 e1071 = derive { name="e1071"; version="1.6-4"; sha256="0hakqawy8bz4hvjzz9dbc2pbqhaf1qjsgl0agz3qfg63974whw2i"; depends=[class]; };
-eHOF = derive { name="eHOF"; version="1.5.8"; sha256="19zs0krz13m7rbiw72clnhh1rbb6qgzp85ndchqbparw7f9yji1s"; depends=[lattice mgcv]; };
+eHOF = derive { name="eHOF"; version="1.5.9"; sha256="187c85fp7q63ipqd3qzivlv9asm9zc49rvw33j39js03mak4r0d2"; depends=[lattice mgcv]; };
 eRm = derive { name="eRm"; version="0.15-5"; sha256="0g4avcr709brvzcbmqmq35c7zvgx1hkf5nq6djsprzkgvh6rznjn"; depends=[lattice MASS Matrix]; };
 eVenn = derive { name="eVenn"; version="2.2"; sha256="0k6m61z902spxxrc38504l73h022w5v74g39h4azd1ibr35yrl7j"; depends=[]; };
 eaf = derive { name="eaf"; version="1.07"; sha256="0310lrqfm1l0lifak7wa6xn21bzzn27kbrrx0bidj4hibwv7sa4l"; depends=[modeltools]; };
 earlywarnings = derive { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[fields ggplot2 Kendall KernSmooth lmtest moments nortest quadprog som spam tgp tseries]; };
-earth = derive { name="earth"; version="4.4.0"; sha256="1dsqyp93z8a2afvnhms4453cmhn7zbqf5fy18sl43gn616miarpv"; depends=[plotmo TeachingDemos]; };
+earth = derive { name="earth"; version="4.4.2"; sha256="0sdv779j6vd19g5kjzv4aad08pgc9zzdcjah9a2a4dzmkl7grapi"; depends=[plotmo TeachingDemos]; };
 easyanova = derive { name="easyanova"; version="4.0"; sha256="1d8fkgyqzphipvla7x8ipcf0by07iqx8xran15d2q82yq9iik5g9"; depends=[car nlme]; };
 easynls = derive { name="easynls"; version="4.0"; sha256="1j2crqvgsf84bpwzf4qh5xkzn5mhxhfx9c0y3p8dbyn8bg7zc2rf"; depends=[]; };
 ebGenotyping = derive { name="ebGenotyping"; version="1.0"; sha256="07dpvxl9xspkzvzkywclg8whgcw7vyakls38pshfypjpyd6iv8ga"; depends=[]; };
@@ -3310,7 +3313,7 @@ ebSNP = derive { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfv
 eba = derive { name="eba"; version="1.7-1"; sha256="0kxdhl7bc4f570m9rbxxzg748zvq0q7a0slvfr4w1f45vfzhyh17"; depends=[nlme]; };
 ebal = derive { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw2lz7iq4b0ggp316rdqqb5bj9r0"; depends=[]; };
 ebdbNet = derive { name="ebdbNet"; version="1.2.3"; sha256="123iqp8rnm3pac5fvpzq5sqbf8nyfpf05g23nawanid6yv23ba9a"; depends=[igraph]; };
-ecespa = derive { name="ecespa"; version="1.1-7"; sha256="0ynyphc1jnk088041i0yk22bh4ga1v9xwrcghy70q1ipv0z279ph"; depends=[spatstat splancs]; };
+ecespa = derive { name="ecespa"; version="1.1-8"; sha256="0rdjr0ss7a1n66dmvykbs3x944r88l08md2rfkg9w7bxm361ib8p"; depends=[spatstat splancs]; };
 ecipex = derive { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; };
 eco = derive { name="eco"; version="3.1-7"; sha256="0qrl1mq0nc42j4dzqhayzzb56gmkk479wgpxikzgzpj9wv78yd5s"; depends=[MASS]; };
 ecodist = derive { name="ecodist"; version="1.2.9"; sha256="199f3lwwm8r2bnik595m540la1p4z6vbkwfqh9kimy9d0fjp8nps"; depends=[]; };
@@ -3344,7 +3347,7 @@ eigenmodel = derive { name="eigenmodel"; version="1.01"; sha256="0p9n28x5gg46nsz
 eigenprcomp = derive { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; };
 eive = derive { name="eive"; version="2.1"; sha256="1vazl5dnrvljd07csy9rjs4302w09h94i411gffg9fvxn70km7qg"; depends=[Rcpp]; };
 eiwild = derive { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[coda gtools lattice]; };
-elastic = derive { name="elastic"; version="0.4.0"; sha256="03cj0vljad4bkz7zmlp7cr6y734pddngmlzwa1h4ja1nr8nv8xf4"; depends=[httr jsonlite RCurl]; };
+elastic = derive { name="elastic"; version="0.5.0"; sha256="1riivxrzd5cxb81kj0xjp7vli63ds6s8ybbg3sbhjmkcvpyxsylz"; depends=[curl httr jsonlite]; };
 elasticnet = derive { name="elasticnet"; version="1.1"; sha256="1x8rwqb275lz86vi044m1fy8xanmvs7f7irr1vczps1w45nsmqr2"; depends=[lars]; };
 elec = derive { name="elec"; version="0.1.2"; sha256="0f7ahrjb52w8a8l5v00xla6z9afpz2zrckl9v04xalp34snhdwan"; depends=[]; };
 elec_strat = derive { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; };
@@ -3355,7 +3358,6 @@ elmNN = derive { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3
 elrm = derive { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; };
 emIRT = derive { name="emIRT"; version="0.0.5"; sha256="0n94iqdzbml0hx3gd046958vmv3y0hymj5kly53gvvlcidsn15c4"; depends=[pscl Rcpp RcppArmadillo]; };
 embryogrowth = derive { name="embryogrowth"; version="6.0"; sha256="0l08imqagn2w1q8s4f84bb1zlc17zjkfc5qz1gpmqc7dbw9nvxph"; depends=[coda deSolve HelpersMG polynom]; };
-emdatr = derive { name="emdatr"; version="0.3"; sha256="1ccm45al90wa467n19dqs33q2w74in4qnwdrsh94g3d67cw5fsfc"; depends=[RCurl]; };
 emdbook = derive { name="emdbook"; version="1.3.8"; sha256="10qmppacfww8wg1hhd9fpadrvrivrvfgfn1qgm87xlf3a8jpffjj"; depends=[bbmle coda lattice MASS plyr rgl]; };
 emdist = derive { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; };
 emg = derive { name="emg"; version="1.0.6"; sha256="1kzmxs224m6scmk8gg5ckx5c7is99hwgwv28yl26hnrbkm59skyh"; depends=[]; };
@@ -3368,13 +3370,12 @@ empiricalFDR_DESeq2 = derive { name="empiricalFDR.DESeq2"; version="1.0.3"; sha2
 emplik = derive { name="emplik"; version="1.0-1"; sha256="1kwgikdnxh52wsmzrzqv7sp8s55w9q40aq9kpfd3zshkflx7w8g1"; depends=[quantreg]; };
 emplik2 = derive { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; };
 emulator = derive { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; };
-enRich = derive { name="enRich"; version="2.0"; sha256="13ahwdifm33h4h5mvmc49v39fbhiy291rbdwm4c8kxjrqjq9ip66"; depends=[]; };
 enaR = derive { name="enaR"; version="2.8.1"; sha256="1p2vhqd1zxwar5fb16ibvwrzrxl7c574ls6747bkdjzlx7vznrn1"; depends=[gdata MASS network sna stringr]; };
 endogMNP = derive { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; };
 endorse = derive { name="endorse"; version="1.4.1"; sha256="0xyi2cq4k4xa8kr717i4njl6rgjf5z99056jbhp2rbzfyy4sw61d"; depends=[coda]; };
 energy = derive { name="energy"; version="1.6.2"; sha256="008yf4r6546mzk9q515zliqxyjx6w0z19g5wlarg7f4lrzsmqiaw"; depends=[boot]; };
 english = derive { name="english"; version="1.0-1"; sha256="1413axjp2icj9wwnkz3vl4gvrwlgmjpc2djzv5bllbnc4a4dgj24"; depends=[]; };
-enigma = derive { name="enigma"; version="0.1.1"; sha256="1309w9nwh7kd1iivj5kq6sgi10k9ac69n3yl6a52ajqnm9rsg3lm"; depends=[httr jsonlite plyr]; };
+enigma = derive { name="enigma"; version="0.2.0"; sha256="0a45fp9lmxrdwpa7y3sfbgcijw5ss2fz7j2r7qnc0ask1x4yfqr4"; depends=[httr jsonlite plyr]; };
 enpls = derive { name="enpls"; version="1.0"; sha256="1grnabrb0kzjvjvwp9rx1xqfljla0jd5xrkcbwfzmy2ymmbvh6ma"; depends=[doParallel foreach pls]; };
 enrichvs = derive { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; };
 ensembleBMA = derive { name="ensembleBMA"; version="5.1.2"; sha256="0cfasrs1paz60na8by9zk0c5jc48l9djvn6c64ygjl1rapz389d4"; depends=[chron]; };
@@ -3385,7 +3386,7 @@ entropy = derive { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x
 enviPat = derive { name="enviPat"; version="2.0"; sha256="10fzzwlcmrfcppsj06pma8jkp5pfrb2ys70ggb9q4frc5irg5lha"; depends=[]; };
 enviPick = derive { name="enviPick"; version="1.3"; sha256="01wkijvhr8wqjzrhgkvxbnnmb9qsnq0lhkgw93s8nrf8yr3z3awj"; depends=[readMzXmlData shiny]; };
 epade = derive { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; };
-epi2loc = derive { name="epi2loc"; version="1.0-1"; sha256="16abk1v177sg7gmaw42ldf6hf20l7dvyq295zwbq76nxj467khdv"; depends=[pwr]; };
+epiDisplay = derive { name="epiDisplay"; version="3.2.0.6"; sha256="1agqv4b33cdyan29vv63q7jd9z4f2c9klzd6vqiaj7amahkkhgfl"; depends=[foreign MASS nnet survival]; };
 epiR = derive { name="epiR"; version="0.9-62"; sha256="04r0inaa04pc4nj5dippl2qxa4nysk0sabdgp4bzp5zxw33mf55v"; depends=[survival]; };
 epibasix = derive { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; };
 epinet = derive { name="epinet"; version="2.0.9"; sha256="071svl1zcjjb3gvk3vg8xf660bvlz0ypkxy88n3d3f3ir2k26s7b"; depends=[]; };
@@ -3402,13 +3403,12 @@ equivalence = derive { name="equivalence"; version="0.6.0"; sha256="1q17c2bs36f4
 erboost = derive { name="erboost"; version="1.2"; sha256="0afgh0zkl3h3ab4s7wl0cn24qdyhszssai9i390mi7w0p88wgba9"; depends=[lattice]; };
 erer = derive { name="erer"; version="2.3"; sha256="165hngfzbzn403gwdcjkhvlm7jygl57nbpwdmlya2rd43z09kp77"; depends=[ggplot2 lmtest systemfit tseries urca]; };
 ergm = derive { name="ergm"; version="3.4.0"; sha256="1qyj4b22d998qky0rv1h9h0r33vdwr7lw7gpkvbgzf5d44yng33b"; depends=[coda lpSolve Matrix network robustbase statnet_common trust]; };
-ergm_count = derive { name="ergm.count"; version="3.1.1"; sha256="0l66shy5p7h9j3h5gpkn48ps069mdaqbscnnkvmwjfvcc7k5vr8m"; depends=[ergm network statnet_common]; };
+ergm_count = derive { name="ergm.count"; version="3.2.0"; sha256="0qrldigkygr8k8v3njy0pclgv7z64dazknpf0m567i1nz8715yhy"; depends=[ergm network statnet_common]; };
 ergm_graphlets = derive { name="ergm.graphlets"; version="1.0.3"; sha256="0xk45ialjckvjs96k19skk7imilcahgyzfwc74h6yand5q3mg6fz"; depends=[ergm network statnet_common]; };
 ergm_userterms = derive { name="ergm.userterms"; version="3.1.1"; sha256="0pvklvyxi7sjc5041zl8vcisni0jz1283gyjw5mhas9bl47g1cwc"; depends=[ergm network statnet_common]; };
 ergmharris = derive { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; };
 erpR = derive { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; };
 esaBcv = derive { name="esaBcv"; version="1.2.1"; sha256="0hgjcdbiy1a71vsb2vcyp0xmhy6wi4nlh1sqsfb2vxckc95i9i21"; depends=[corpcor svd]; };
-esotericR = derive { name="esotericR"; version="1.0"; sha256="0kl9c2z2mpg3mk8jnl0ssgcf6y0i9jpczms746j8f07ydrcxpf41"; depends=[]; };
 estimability = derive { name="estimability"; version="1.1"; sha256="1inw2ir83bzz40gynwfcjzx7f6v99pqlphq7p3rmql01ikd2b6r9"; depends=[]; };
 estout = derive { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; };
 etable = derive { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[Hmisc xtable]; };
@@ -3427,14 +3427,13 @@ evmix = derive { name="evmix"; version="2.6"; sha256="1rc52mqmzl05n5n1lr990czqgp
 evobiR = derive { name="evobiR"; version="1.0"; sha256="12j01qzc4yrjpxbj39bl29f5ypxwk33c6qf0mjjbgpwn5g6fgsi4"; depends=[ape geiger seqinr stringr taxize]; };
 evolqg = derive { name="evolqg"; version="0.1-5"; sha256="1s9jh14ycymlajc285cczr9m529vv6la4bkv0lgk3dc0557m7q5w"; depends=[ape ggplot2 magrittr mvtnorm phytools plyr Rcpp reshape2 tidyr vegan]; };
 evolvability = derive { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; };
-evora = derive { name="evora"; version="1.0"; sha256="0blq28ldynbq3v6rh0yk89wy1sjp4621h6iwnyyiipqwzihwrhz2"; depends=[Hmisc qvalue]; };
 evt0 = derive { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; };
 evtree = derive { name="evtree"; version="1.0-0"; sha256="0i37lkdfzvgby98888ndd5wzxs7y11sxf9mh6pqpqgwif05p4z3i"; depends=[partykit]; };
-exCon = derive { name="exCon"; version="0.1.5"; sha256="08gq257qp814960ykp16qdk9xpc7ag9mxs1qhnnzlk1v2cnhilaq"; depends=[jsonlite]; };
+exCon = derive { name="exCon"; version="0.1.9"; sha256="0nqnr21rhhb41nqg55fjhv17qmgjz32hl9yq4gzwihjvb53xkf0z"; depends=[jsonlite]; };
 exact2x2 = derive { name="exact2x2"; version="1.4.1"; sha256="1a4cg8j8kdgwkj27qza6xm5x16m9sb2vczb1b9im8k4pas6v6jpk"; depends=[exactci ssanv]; };
 exactLoglinTest = derive { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; };
 exactRankTests = derive { name="exactRankTests"; version="0.8-28"; sha256="1n6rr0wax265y9w341x7m2pqwx3cv8iqx1k5qla29z8lqn4ng1nd"; depends=[]; };
-exactci = derive { name="exactci"; version="1.3-0"; sha256="03mhgpyrgm3cb0hw908wxhi6pxrvcsw4r1lmbx95xn44j1p9zpzk"; depends=[ssanv]; };
+exactci = derive { name="exactci"; version="1.3-1"; sha256="1mhigk1nzd24qhzgd1j96zlf38dr96c1y5jbmy6lz2sw7g4mmvgm"; depends=[ssanv]; };
 exactmeta = derive { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; };
 exams = derive { name="exams"; version="2.0-2"; sha256="1cv01wa3zs31zdc1qk6rsnimbs6m31r0j56syg6yjicfxiwxxm0v"; depends=[]; };
 excursions = derive { name="excursions"; version="2.0.16"; sha256="10z0mix7fx4pb9jpix5d00ch4i6jlvj2337s6ja916q6cczj21qr"; depends=[Matrix sp spam]; };
@@ -3455,7 +3454,6 @@ extfunnel = derive { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jis
 extlasso = derive { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; };
 extraBinomial = derive { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n78kghszwyaz4wzbswqy4p98c3b6alzrc2ldsq6pq5z"; depends=[]; };
 extraTrees = derive { name="extraTrees"; version="1.0.5"; sha256="1rvvp2p9j8ih8fid1n17606pa23bjg3i2659w1l6w0jkb1p23zcx"; depends=[rJava]; };
-extracat = derive { name="extracat"; version="1.7-1"; sha256="1vgxr9j812jjr0i188vv7c1l0d7b73aakvfgsm0agwv7vj8k0rhi"; depends=[colorspace ggplot2 hexbin plyr reshape2 scales TSP]; };
 extrafont = derive { name="extrafont"; version="0.17"; sha256="0b9k2n9sk23bh45hjgnkxpjyvpdrz1hx7kmxvmb4nhlhm1wpsv9g"; depends=[extrafontdb Rttf2pt1]; };
 extrafontdb = derive { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; };
 extremevalues = derive { name="extremevalues"; version="2.3.0"; sha256="1nn67kgf3qd41nmizkbc2cy3128kajsxbxg03fhfgkjdqa0781lq"; depends=[gWidgets gWidgetstcltk]; };
@@ -3527,7 +3525,7 @@ fdasrvf = derive { name="fdasrvf"; version="1.4.2"; sha256="12x04fi0sxs9yh1mf9iy
 fdatest = derive { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; };
 fdrDiscreteNull = derive { name="fdrDiscreteNull"; version="1.0"; sha256="1388a9hjbgblmhx5f3ddk16kigzsik9bvw179d1szk33kadfq2vp"; depends=[edgeR MCMCpack]; };
 fdrci = derive { name="fdrci"; version="2.0"; sha256="0smyl9phl02wghimawvff3h267w3h213jbqpka155i6cfzig9qjy"; depends=[]; };
-fdrtool = derive { name="fdrtool"; version="1.2.14"; sha256="0q4mxm3vxhvxxbkgl9vxs3q93icipg9hz7qcr4vas8cks1hmzbdw"; depends=[]; };
+fdrtool = derive { name="fdrtool"; version="1.2.15"; sha256="1h46frlk7d9f4qx0bg6p55nrm9wwwz2sv6d1nz7061wdfsm69yb5"; depends=[]; };
 fds = derive { name="fds"; version="1.7"; sha256="164f2cbywph7kyn712lfq4d86v22j4y3fg5i9zyz956hipqv0qvw"; depends=[rainbow RCurl]; };
 fdth = derive { name="fdth"; version="1.2-1"; sha256="0rr9p2rns5ws111iqcicrlpcv47fkbxf161yxkkzfs2l3f1kgw14"; depends=[]; };
 feature = derive { name="feature"; version="1.2.11"; sha256="0dgiv9gwyklnw8w0cpchakadc1vqcngjg39cha6gvl2i3csgxz4p"; depends=[ks misc3d rgl]; };
@@ -3563,9 +3561,9 @@ fit_models = derive { name="fit.models"; version="0.5-10"; sha256="06pj26dbnq6mf
 fit4NM = derive { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 tkrplot]; };
 fitDRC = derive { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; };
 fitTetra = derive { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; };
-fitbitScraper = derive { name="fitbitScraper"; version="0.1.3"; sha256="0fh8qm4ws9idx0868rda7v1cs8g61q8zdx1ncyxijbvijhdslfgj"; depends=[httr RJSONIO stringr]; };
+fitbitScraper = derive { name="fitbitScraper"; version="0.1.4"; sha256="0shbi5mmr9fw3cc2hn1yzd1ma9kid53ria9pbfkz1pk81n75krj1"; depends=[httr RJSONIO stringr]; };
 fitdistrplus = derive { name="fitdistrplus"; version="1.0-4"; sha256="02ds5vmxc3rk50c33rxdnpqf2hbx186ss6br29n6538q7734nra9"; depends=[survival]; };
-flam = derive { name="flam"; version="1.0"; sha256="0jyx0wff5zdpnhgxz74k6fxgwdnl7khanahv63af22y0mqpd066f"; depends=[MASS]; };
+flam = derive { name="flam"; version="2.0"; sha256="10pzjdymcxm5yfqgqc2n99j986585ndxccpfvr4jilq4asf3iiaq"; depends=[MASS Rcpp]; };
 flare = derive { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[igraph lattice MASS Matrix]; };
 flashClust = derive { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
 flexCWM = derive { name="flexCWM"; version="1.5"; sha256="1q6nkw6al56wc53sj719c94iv20a9a82pq4s62jnb2flq1pwdaml"; depends=[adehabitat ellipse Flury MASS mclust mixture mnormt numDeriv statmod]; };
@@ -3586,17 +3584,17 @@ fmt = derive { name="fmt"; version="1.0"; sha256="13gsywnyvf9zy5n644g2xyd60f92w2
 foba = derive { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; };
 fontcm = derive { name="fontcm"; version="1.1"; sha256="1z6b4qdgj5vhvjqj90sm1hp0fffi1vxzvq71p0flxybzyb7d15la"; depends=[]; };
 foodweb = derive { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; };
-forams = derive { name="forams"; version="2.0-4"; sha256="1kvxlqdyzb3rqa45hp7jxjm009w0r6h78nr3yh9bqcz594zqidbq"; depends=[vegan]; };
+forams = derive { name="forams"; version="2.0-5"; sha256="1fh3m9896ksv1h7b027yb955bzyv70yafhqvn5crkzalzk3jpb0s"; depends=[vegan]; };
 foreach = derive { name="foreach"; version="1.4.2"; sha256="097zk7cwyjxgw2i8i547y437y0gg2fmyc5g4i8bbkn99004qzzfl"; depends=[codetools iterators]; };
 forecTheta = derive { name="forecTheta"; version="1.0"; sha256="1ip6l27d37xqnmg8w285lq1y5j6akrjrviq4338c8sq075d8hckn"; depends=[forecast]; };
 forecast = derive { name="forecast"; version="6.1"; sha256="1hwv3arcpkkhpj5n2dvpw2fyx687b6x6yakxx55cw9rrka70rx1k"; depends=[colorspace fracdiff nnet Rcpp RcppArmadillo timeDate tseries zoo]; };
-foreign = derive { name="foreign"; version="0.8-63"; sha256="1g5hl8drcmh2c9kpkr4443nw7dsxjwqsqs1q4bnhvw2lizs8bfb2"; depends=[]; };
+foreign = derive { name="foreign"; version="0.8-65"; sha256="03zg48vjqqcq9ri4a53czpyp82hml409g2rmdnmbfw8c1isdqacf"; depends=[]; };
 forensic = derive { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; };
 forensim = derive { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; };
-forestFloor = derive { name="forestFloor"; version="1.4"; sha256="152b5pq9901bdik3dqmn4gb0aiyl8zf8mg88d8xnz839aildp2fw"; depends=[kknn randomForest Rcpp rgl trimTrees]; };
+forestFloor = derive { name="forestFloor"; version="1.5"; sha256="1cpgjj2p4j14h2ks586nq8426k9nlnnwhnxniaack33rdy3axbdp"; depends=[kknn Rcpp rgl trimTrees]; };
 forestplot = derive { name="forestplot"; version="1.1"; sha256="1h28lwqdizs450bm5hb8zfbmx633n8v5bj2p8mi4cl814sjjylr0"; depends=[]; };
 formatR = derive { name="formatR"; version="1.2"; sha256="0dlj728qdm7wmxcxvw1ip64pl4ajgmi8ax69zafrn3306pg9y136"; depends=[]; };
-formula_tools = derive { name="formula.tools"; version="1.5.2"; sha256="1n2rw9zhrgcsjxrm108fs7sysk9jk1gmq0jmg9s7pm7ff76insnj"; depends=[operator_tools]; };
+formula_tools = derive { name="formula.tools"; version="1.5.4"; sha256="1qs7ls757qvh5gdkx32zslgpx1a4zk2vf8bbgjdax02jmlyp2qrp"; depends=[operator_tools]; };
 fortunes = derive { name="fortunes"; version="1.5-2"; sha256="1wv1x055v388ay4gnd1l8y6dgvamyfvmsd0ik9fziygwsaljb049"; depends=[]; };
 forward = derive { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; };
 fossil = derive { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[maps shapefiles sp]; };
@@ -3619,7 +3617,7 @@ freeknotsplines = derive { name="freeknotsplines"; version="1.0"; sha256="19zs42
 freestats = derive { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; };
 freqMAP = derive { name="freqMAP"; version="0.2"; sha256="02hpkqqrxifrr1cxn5brp166jwa8lgl1mcgmq7s8csrbbd900ziv"; depends=[]; };
 freqparcoord = derive { name="freqparcoord"; version="1.0.0"; sha256="0hn5y10yp3j76lqrmj6dsaafamgy4pfxx1p4y92z17s79x29j59q"; depends=[FNN GGally ggplot2 mvtnorm]; };
-freqweights = derive { name="freqweights"; version="1.0.1"; sha256="13wy8nzs888yn7ld96qq3p7k3xjn6s38qdlfb3nqmh52daqcnn7m"; depends=[biglm data_table dplyr FactoMineR fastcluster plyr]; };
+freqweights = derive { name="freqweights"; version="1.0.2"; sha256="183x94j727z6phayy0zy9q4x5fnww8h51ghpmc6jbwc5r40vp4px"; depends=[biglm data_table dplyr FactoMineR fastcluster plyr]; };
 frm = derive { name="frm"; version="1.2.2"; sha256="1dl0vca9r2dams99sc13pfpi0b3yb02x59f4c1jz07zz005c8l23"; depends=[]; };
 frmhet = derive { name="frmhet"; version="1.1.2"; sha256="1a6q5qz22b4sx5l1jz50x1q3bz8sj91dj2cahq28h6ss5b8vfn0y"; depends=[]; };
 frmpd = derive { name="frmpd"; version="1.0.1"; sha256="104frdraawj8g76589kz4csbgzkvs4rgdhgwmb77srhqp5nc8v96"; depends=[]; };
@@ -3642,14 +3640,15 @@ funHDDC = derive { name="funHDDC"; version="1.0"; sha256="038m64yv27wz7ki2gcn94q
 functional = derive { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; };
 funreg = derive { name="funreg"; version="1.1"; sha256="1sxr4mylcpbya197d55yi6d7g5pfspaf59xxbwjgmwgjw06rl76r"; depends=[MASS mgcv mvtnorm]; };
 funtimes = derive { name="funtimes"; version="1.1"; sha256="0z478b57l7hg8b42jyzcdjzs3nn62m2y117xmgbw1gbyf3rcnjkw"; depends=[Jmisc]; };
-futile_any = derive { name="futile.any"; version="1.3.0"; sha256="1c7pj64kz09qzwrxvkp1w1w8mvxwq36zkj6w4b7yyi8v7x3daq2a"; depends=[lambda_r]; };
+futile_any = derive { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; };
 futile_logger = derive { name="futile.logger"; version="1.4.1"; sha256="1plld1icxrcay7llplbd4i8inpg97crpnczk58mbk26j8glqbr51"; depends=[futile_options lambda_r]; };
 futile_matrix = derive { name="futile.matrix"; version="1.2.2"; sha256="1cb975n93ck5fma0gvvbzainp7hv3nr8fc6b3qi8gnxy0d2i029m"; depends=[futile_logger lambda_r lambda_tools RMTstat]; };
 futile_options = derive { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; };
 futile_paradigm = derive { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; };
+future = derive { name="future"; version="0.6.0"; sha256="14lsjay59xfdhqhdyz7v2qkwx5zd8hbkgq6l6vnihvm48rzsdg8v"; depends=[globals listenv]; };
 fuzzyFDR = derive { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; };
 fuzzyMM = derive { name="fuzzyMM"; version="1.0.1"; sha256="1pqfc9b9l2xx5pl45hfildikqjsdgqfhqzi2nbb34026nla5m8vk"; depends=[frbs igraph osmar rgdal rgeos]; };
-fuzzyRankTests = derive { name="fuzzyRankTests"; version="0.3-5"; sha256="1g09506bbpk05a2r2wxjynjs8dmjd2q7x74d83vjscg1kdk4kazq"; depends=[]; };
+fuzzyRankTests = derive { name="fuzzyRankTests"; version="0.3-7"; sha256="0mhml0zzya58yn4wrafxk62agfrck6rryn5klprr416pj83pzcgk"; depends=[]; };
 fwdmsa = derive { name="fwdmsa"; version="0.2"; sha256="0p0kh8am6gajfaixkvq61f12hfbm6chl9372yzn1yilhiyvqdxgp"; depends=[]; };
 fwi_fbp = derive { name="fwi.fbp"; version="1.5"; sha256="08ngg70vi2fca5yblm2gf1lkjjmb6m39d8q6429n7i3jn6ca5nzf"; depends=[]; };
 fwsim = derive { name="fwsim"; version="0.3.3"; sha256="1ix4sl2krlr0b0wfgvy73qhpmkjymqcci3q3v60j20zapi55gxn2"; depends=[Rcpp]; };
@@ -3685,7 +3684,7 @@ gamboostMSM = derive { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch5
 gamclass = derive { name="gamclass"; version="0.55"; sha256="0nhy1qdc221hsnby8j0m2a4x4a8qwfixbaq4gd22rn1xpbsdnfw3"; depends=[ape car DAAG KernSmooth lattice latticeExtra MASS mgcv randomForest rpart]; };
 games = derive { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; };
 gamlr = derive { name="gamlr"; version="1.13-1"; sha256="1y97zsb9shll93f6j7r95296c26dbmxwa1z67ziy0yh4gsgbijc8"; depends=[Matrix]; };
-gamlss = derive { name="gamlss"; version="4.3-4"; sha256="0qbxcfvhy8blswzv8194x9f08p25vhknnm3h4hhz9lp5gh536fbk"; depends=[gamlss_data gamlss_dist MASS nlme survival]; };
+gamlss = derive { name="gamlss"; version="4.3-5"; sha256="167kpr6gnjfas8w944h7gds9mkhyly0q8kr0aa8crgi8g3j5npkn"; depends=[gamlss_data gamlss_dist MASS nlme survival]; };
 gamlss_add = derive { name="gamlss.add"; version="4.3-3"; sha256="0cs4mcpm0ckaim3g8q7m4yb6y3izqgvndzgkqgrwr75cxz0wd4vh"; depends=[gamlss gamlss_dist mgcv nnet rpart]; };
 gamlss_cens = derive { name="gamlss.cens"; version="4.3.1"; sha256="1y3a4b6n86h0r287065kr574ix0qpc2nnjpp8fp49nbpxwxlz962"; depends=[gamlss gamlss_dist survival]; };
 gamlss_data = derive { name="gamlss.data"; version="4.2-7"; sha256="0g3fmqrwxmj14r0p0ai1adq6cs3bd3ys47gjcja035xjiajg6cs2"; depends=[]; };
@@ -3698,6 +3697,7 @@ gamlss_tr = derive { name="gamlss.tr"; version="4.3-1"; sha256="1fdy61i2dmz2qafk
 gamlss_util = derive { name="gamlss.util"; version="4.3-2"; sha256="13facgyd14jl4j09d446jjzs91zwmv85g22gkyyi1hl4i5v5nfc4"; depends=[gamlss gamlss_dist zoo]; };
 gamm4 = derive { name="gamm4"; version="0.2-3"; sha256="19vy5wik9nh77cm25gp3j3j8w8vinwzx5pv90nzdzvx84yvvf0y3"; depends=[lme4 Matrix mgcv]; };
 gammSlice = derive { name="gammSlice"; version="1.3"; sha256="1vw8d0v0awyflh4gmbcf1g9nfx52cys8gpqvag5djri59p0y945a"; depends=[KernSmooth lattice mgcv]; };
+gamsel = derive { name="gamsel"; version="1.7-3"; sha256="02j94va7srdb2wzj4f1b63qx9mlck0harsq140ndjgf9d9c44h01"; depends=[foreach mda]; };
 gaoptim = derive { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; };
 gap = derive { name="gap"; version="1.1-16"; sha256="0xyln7ffapm31cvx4n86ncyg3cdz5d2149qb5h5xx3kf0a8r7gpz"; depends=[]; };
 gapmap = derive { name="gapmap"; version="0.0.2"; sha256="0xykpy3cmbiwwa3s8f4777585r7l441qb9ks6ajym01scqcj3nwl"; depends=[ggplot2 reshape2]; };
@@ -3710,7 +3710,6 @@ gb = derive { name="gb"; version="1.1.8-8"; sha256="18n9wqz82mjxjgzk8vc68kyz3b6l
 gbRd = derive { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; };
 gbm = derive { name="gbm"; version="2.1.1"; sha256="0jkjr09w9cgfb21aznvr9nivxjmj1zxfsl7gafy4mwh719jzygy0"; depends=[lattice survival]; };
 gbm2sas = derive { name="gbm2sas"; version="1.0"; sha256="0khw1nqc4yl2719h3zc70yl26s4lmngfz5iqw00pcv838z8myc0i"; depends=[gbm]; };
-gbs = derive { name="gbs"; version="1.0"; sha256="19zcsvd258ibrj356zlwgryjqylcs56agg3z6d44xbnf8prg05ig"; depends=[nlme]; };
 gcbd = derive { name="gcbd"; version="0.2.5"; sha256="0fkg6vk0jkl6680n1hljyv783j4hd84mql0k4pfblvqafwv4nhm3"; depends=[lattice plyr reshape RSQLite]; };
 gcdnet = derive { name="gcdnet"; version="1.0.4"; sha256="0fmy0li06rahch4ir0xa81yilvrd0zqyhmpl4hfxjahhl3npw370"; depends=[Matrix]; };
 gclus = derive { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; };
@@ -3718,11 +3717,11 @@ gcmr = derive { name="gcmr"; version="0.7.5"; sha256="1z1hdgdasmw3drld8nmkw6cc1x
 gconcord = derive { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; };
 gcookbook = derive { name="gcookbook"; version="1.0"; sha256="0hb52zfi5bl2j0h8lazz4gzhhcvpicb4ld6xm2vkvi4cj47piyy8"; depends=[]; };
 gdalUtils = derive { name="gdalUtils"; version="0.3.1"; sha256="1a6sg3x5yfffa9xrkvc98i2hm3lvna4jw7p89gn2bf74kzphqpmy"; depends=[foreach R_utils sp]; };
-gdata = derive { name="gdata"; version="2.16.1"; sha256="14ssq8z45zf1wwgfgxlc33i6hsdhc0b71kfncfclxz5ahxaqdkdm"; depends=[gtools]; };
+gdata = derive { name="gdata"; version="2.17.0"; sha256="0kiy3jbcszlpmarg311spdsfi5pn89wgy742dxsbzxk8907fr5w0"; depends=[gtools]; };
 gdimap = derive { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; };
 gdistance = derive { name="gdistance"; version="1.1-7"; sha256="1wcpjx76pnkpc6kmqx7bq73qbvzfzjb9s46qb7gi7kabpkya97il"; depends=[igraph Matrix raster sp]; };
 gdm = derive { name="gdm"; version="1.0"; sha256="08wafxvds4sxaxv7mbbkbzilkpfz1xnzdc5jdw3pldvmbgk861vd"; depends=[plyr raster Rcpp reshape2 vegan]; };
-gee = derive { name="gee"; version="4.13-18"; sha256="1s2cjgg4ypw72g710m93g6az763xz6sxw91nd6cwm5jjvr9vb91f"; depends=[]; };
+gee = derive { name="gee"; version="4.13-19"; sha256="14n2fa2jmibw5j8n4qgbl8xbxhapmx4z3zrmkbcci39k9dsyplzb"; depends=[]; };
 geeM = derive { name="geeM"; version="0.7.4"; sha256="0vxgwx6qx2xhhj217d6x7m5y89r0b9xxdd4k3sw0zgfga133ij7w"; depends=[Matrix]; };
 geepack = derive { name="geepack"; version="1.2-0"; sha256="1pxh9nsyj9a40znm4zza4nbi3dkhb96s3azi43p9ivvfj3l21m74"; depends=[]; };
 geesmv = derive { name="geesmv"; version="1.1"; sha256="1xijdjmkg6nw2y1556zbaic969dg23np0wrb9ncknsrhq4aa28pa"; depends=[gee MASS matrixcalc nlme]; };
@@ -3739,16 +3738,17 @@ genalg = derive { name="genalg"; version="0.2.0"; sha256="1wzfamq8k5yhwbdx0wy1w5
 genasis = derive { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[fitdistrplus Kendall]; };
 gendata = derive { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; };
 gender = derive { name="gender"; version="0.4.3"; sha256="0dhwhv2b86arpmyr89g69h8ikw0f2x27ig420jngfb9gxljj9phc"; depends=[devtools dplyr httr jsonlite]; };
-genderizeR = derive { name="genderizeR"; version="1.1.0"; sha256="0hdphzmjqlzwk1gnhncidsdqrbc1lra3a4nl992ap9gfk890rvi4"; depends=[data_table httr magrittr stringr tm]; };
+genderizeR = derive { name="genderizeR"; version="1.2.0"; sha256="1a7vafspdd64wr47k1z391ff1ri5f8bynlgn876khcxzhm2vwdva"; depends=[data_table httr magrittr stringr tm]; };
 geneListPie = derive { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; };
 geneSignatureFinder = derive { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[class cluster survival]; };
 genepi = derive { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; };
 genetics = derive { name="genetics"; version="1.3.8.1"; sha256="0gfbrpz0zp5bgw3s21wrhjfy70laif47wcrjrm6mjgs6xapiw790"; depends=[combinat gdata gtools MASS mvtnorm]; };
 genlasso = derive { name="genlasso"; version="1.3"; sha256="1q4ybg8xzphnqwywwdb7i2q94dlxwpggvisjqqdj39jh2cabda57"; depends=[igraph MASS Matrix]; };
-genoPlotR = derive { name="genoPlotR"; version="0.8.2"; sha256="0q12sg13yn5f3j5gk0qzszp81x52lpwpk3z4cg0bgxi9zbwmw467"; depends=[ade4]; };
+genoPlotR = derive { name="genoPlotR"; version="0.8.4"; sha256="06c4flddv83nwjagnszl0sv92mbxf91qml8awhhxnrs1bna04f1p"; depends=[ade4]; };
 genpathmox = derive { name="genpathmox"; version="0.2"; sha256="1m08j10mrvkrnlgxbhjn3qmjz29p121fc4haww5qrici06nipfdm"; depends=[diagram mice plspm quantreg]; };
 genridge = derive { name="genridge"; version="0.6-5"; sha256="0ms8n1yrga5qqg9ni41ifyw6320aajyrwvjh6d27q1k96j2dicp4"; depends=[car]; };
 gensemble = derive { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; };
+geo = derive { name="geo"; version="1.4-3"; sha256="0yxlafm99ypwf1700nh3hnnpndb6ghwwbi5sp6715zjbkkx94482"; depends=[mapdata maps]; };
 geoBayes = derive { name="geoBayes"; version="0.2.150402"; sha256="123b2xds69clkgjvczkdbl673cahmiprrr1cki2alspryy37icar"; depends=[coda sp]; };
 geoCount = derive { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp RcppArmadillo]; };
 geoR = derive { name="geoR"; version="1.7-5.1"; sha256="10rxlvlsg2avrf63p03a22lnq4ysyc4zq06mxidkjpviwk1kvzqy"; depends=[MASS RandomFields sp splancs]; };
@@ -3757,17 +3757,18 @@ geocodeHERE = derive { name="geocodeHERE"; version="0.1.2"; sha256="0sr8r6f41bpi
 geojsonio = derive { name="geojsonio"; version="0.1.0"; sha256="17nv7xn80sf2nn6fvmlbnbcgg66n6bh8x725wdfnhk3gg1rb64g5"; depends=[httr jsonlite magrittr maptools rgdal rgeos sp V8]; };
 geomapdata = derive { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
 geometry = derive { name="geometry"; version="0.3-5"; sha256="1x1dhdbqnq1wi1r4njj3l1g8yag2dig19rna3a5pwf1j1gxbl0i8"; depends=[magic]; };
-geomorph = derive { name="geomorph"; version="2.1.5"; sha256="0xys2gwin16h4ahcjy3m49sslypilxlcgrnky19vv4aagrydq776"; depends=[ape geiger jpeg phytools rgl]; };
+geomorph = derive { name="geomorph"; version="2.1.6"; sha256="03imyj0ygilphmbyagpnwzzcwnvj8lmxn19ml47j4x8mi96b5jpl"; depends=[ape geiger jpeg phytools rgl]; };
 geonames = derive { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; };
 geophys = derive { name="geophys"; version="1.3-8"; sha256="0nw4m30r46892cf1n575jkfjgdjc14wic9xzmzcnskbk8cd50hp2"; depends=[cluster GEOmap RFOC RPMG RSEIS]; };
 georob = derive { name="georob"; version="0.1-5"; sha256="0awcqcpv82pn2z7lgir73pg2b0whvrrfy55gi0jrjn7lzyakhqaq"; depends=[constrainedKriging lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; };
 geoscale = derive { name="geoscale"; version="2.0"; sha256="0gisds0in32xhw54fxfyxvwxgrfjs871wmqf6l915nr896rlx0bm"; depends=[]; };
-geospacom = derive { name="geospacom"; version="0.5-7"; sha256="00yi2wwnjh2z8xhzfbp1jhh5fhq2z885s0gv937xsin4a63m76fd"; depends=[classInt geosphere maptools rgeos sp]; };
-geosphere = derive { name="geosphere"; version="1.3-13"; sha256="124l1mfqf4qq5qsa0k3r5hkky9q2m2waq2rp4xcym49wr3jysf6c"; depends=[sp]; };
+geospacom = derive { name="geospacom"; version="0.5-8"; sha256="14qyjbq0n43c2zr9gp11gdqgarvmicx3gpq2ql2vjfzrmirxwjgg"; depends=[classInt geosphere maptools rgeos sp]; };
+geosphere = derive { name="geosphere"; version="1.4-3"; sha256="15l5qqazh55l1w9il53j85i5h42sjvkcv0vladgi1axhzyyd41c7"; depends=[sp]; };
 geospt = derive { name="geospt"; version="1.0-1"; sha256="1nv5wn8s4vlbyyzi8is7zsa1vrijp1va0vhi8l2yny8fh22qhjij"; depends=[fields genalg gsl gstat limSolve MASS minqa plyr sgeostat sp TeachingDemos]; };
-geostatsp = derive { name="geostatsp"; version="1.2.1"; sha256="0p93b8mmjsqg7qg1c6v7c5ism8jqf7w21rydck7agh4i64q47s7y"; depends=[abind Matrix numDeriv pracma raster sp]; };
+geosptdb = derive { name="geosptdb"; version="0.5-0"; sha256="0m0dlazhq2za71mi3q8mz2zvz7yrmda7lha02kh9n820bx89v33z"; depends=[FD fields geospt gsl limSolve minqa sp StatMatch]; };
+geostatsp = derive { name="geostatsp"; version="1.3.4"; sha256="0bg26qhqrjrh85dly7i44vkzyi02gbrz7fx76rmx42f4alcsr66r"; depends=[abind Matrix numDeriv raster sp]; };
 geotools = derive { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; };
-geotopbricks = derive { name="geotopbricks"; version="1.3.6"; sha256="1c4v590r27lsz2ld2dsi9dv7fsbfklyqgsjvcrbk4di18nc1hygp"; depends=[raster rgdal stringr zoo]; };
+geotopbricks = derive { name="geotopbricks"; version="1.3.7.2"; sha256="15z4969vgh0jwksqrjsd5m598xbz2ppf1ymvf80id4h0grzh08l5"; depends=[raster rgdal stringr zoo]; };
 geozoo = derive { name="geozoo"; version="0.4.3"; sha256="0nmmmyk0ih5aqpsn7ip4dhgfm7jhcnca8pigyr9794b110icq1rv"; depends=[bitops]; };
 getopt = derive { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz1556xqcmx8nhrlbbhaq4w7gl2ibl87r"; depends=[]; };
 gets = derive { name="gets"; version="0.2"; sha256="0vdg8g588asyzkld9v3rmscx3k727ncxnjzi8qxinlr2zhw9nbcq"; depends=[zoo]; };
@@ -3787,21 +3788,21 @@ ggplot2 = derive { name="ggplot2"; version="1.0.1"; sha256="0794kjqi3lrxb33lr1my
 ggsubplot = derive { name="ggsubplot"; version="0.3.2"; sha256="1rrq47rf95hnwz8c33sbnpvc37sb6v2w37863hyjl6gc0bhyrvzb"; depends=[ggplot2 plyr proto scales stringr]; };
 ggswissmaps = derive { name="ggswissmaps"; version="0.0.2"; sha256="1cl8m9j3d2kf8dbpq09q36v7nwkgz7khqds431l0kmkzq02qhddf"; depends=[ggplot2]; };
 ggtern = derive { name="ggtern"; version="1.0.5.0"; sha256="0ykgz3268381glkrv1gbn9qnyrkxsmihc3srv8zrldbq18zbr0a8"; depends=[ggplot2 gtable MASS plyr proto reshape2 scales sp]; };
-ggthemes = derive { name="ggthemes"; version="2.1.2"; sha256="049fjk0f960sjsnqns2kgk7dvr6jr5rrpxgl8qbxx4idz95bvdi7"; depends=[colorspace ggplot2 proto scales]; };
+ggthemes = derive { name="ggthemes"; version="2.2.1"; sha256="0d6h3ymxwxcii95wggxmyvihnwsl85nlqja2ac34dsfwlv75cc16"; depends=[colorspace ggplot2 proto scales]; };
 ggvis = derive { name="ggvis"; version="0.4.2"; sha256="07arzhczvh2sgqv9h30n32s6l2a3rc98rid2fpz6kp7vlin2pk1g"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; };
 ghyp = derive { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ijhmzyz4qsmy7vfijlilkz0ynn20"; depends=[gplots numDeriv]; };
 giRaph = derive { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; };
 gibbs_met = derive { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; };
 gimme = derive { name="gimme"; version="0.1-1"; sha256="1snzlwq6d86ygpn778m3inlfqpymp0l05pdlrdkm8ip4wgir0hvs"; depends=[lavaan qgraph]; };
-gistr = derive { name="gistr"; version="0.2.0"; sha256="1812qh3f4nwbpqaiq4gfkalfckwqvn84j7v7qfj69gd4jzxcwywz"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; };
+gistr = derive { name="gistr"; version="0.3.0"; sha256="0clwbm2glazn55glf9dmlfv5l0537k1sv84bs8ahhx0slwh7g604"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; };
 git2r = derive { name="git2r"; version="0.10.1"; sha256="1damlhxf3ma0flqw4am42wj2dxk3m232wh0wpl1ikgx0dcfn9l8f"; depends=[]; };
 gitter = derive { name="gitter"; version="1.0.4"; sha256="1pvl8k8mb15mcfz1074y246s9basmi5vbpw2n1ca0d8wm5wdidap"; depends=[EBImage ggplot2 jpeg logging PET tiff]; };
+gkmSVM = derive { name="gkmSVM"; version="0.55"; sha256="1ih4nwsbx0b8d7dsf55ki6hx9kqhanyw2g8na81s7f109dckg2hx"; depends=[kernlab Rcpp seqinr]; };
 glarma = derive { name="glarma"; version="1.3-0"; sha256="0fp354zxkddc4giynhwjlf9mg4sklcmqi0gdn8nxm1pkdpb86rba"; depends=[MASS]; };
 glasso = derive { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; };
-glassomix = derive { name="glassomix"; version="1.2"; sha256="13a2ly0by58z8djq8nbakpyacgb6nkdsqxjq44yw4v2fy3s22z3n"; depends=[glasso huge mvtnorm]; };
 glba = derive { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; };
 glcm = derive { name="glcm"; version="1.2"; sha256="00bkhd4arvg7ahdr5kfvran46b2sywv9i0rlwalx9pmyvjwnzm5b"; depends=[Rcpp RcppArmadillo]; };
-gld = derive { name="gld"; version="2.2.1"; sha256="1x9xlqj87xmk90hn20k1yvnvyndxdbi67yrxrfdhr3lhxabq5msw"; depends=[]; };
+gld = derive { name="gld"; version="2.3"; sha256="072q79aisvygi1pjndvvn2xaczi1xlpd9sjc4f1xspavy567z09d"; depends=[]; };
 gldist = derive { name="gldist"; version="2160.2"; sha256="1dcf3pb4xqvhqj4m3xc3ihzjbzxjspjrnc8819hmlnmdd0csghmx"; depends=[]; };
 glinternet = derive { name="glinternet"; version="1.0.0"; sha256="0aa75xq2w64iknbyl6qw9ckk8v64a96xz0ar1mbqd8zhx0xvibyy"; depends=[]; };
 gllm = derive { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; };
@@ -3838,14 +3839,14 @@ gmp = derive { name="gmp"; version="0.5-12"; sha256="10fpvcli526a8j6jaryn0mwk78c
 gmt = derive { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; };
 gnm = derive { name="gnm"; version="1.0-8"; sha256="1581lzkb1v3y0arrq7x1bg7c91cii87bifxcdi1jzyc5rxj261la"; depends=[MASS Matrix nnet qvcalc relimp]; };
 gnmf = derive { name="gnmf"; version="0.7"; sha256="00y1dx1c66gv769yiwnb91xbr77wpidf36x0n0dzaqfn7s9yh6xq"; depends=[]; };
-gnumeric = derive { name="gnumeric"; version="0.7-2"; sha256="14c7a8aiqvqfbrjb1akpfjwidrzdhrw8a07ask083krki6vbi7hh"; depends=[XML]; };
+gnumeric = derive { name="gnumeric"; version="0.7-4"; sha256="0q9qrwwkrwcdh5c1prh7d8j4raca59vgaxx7rjh36cml372vkrai"; depends=[XML]; };
 goalprog = derive { name="goalprog"; version="1.0-2"; sha256="1h3nd3d53hbz5hl3494lpfjnp1ddklc17nhgw18362jd1nk14awy"; depends=[lpSolve]; };
 gof = derive { name="gof"; version="0.9.1"; sha256="1s12gga9d6yizn2y7lzql4jd80lp5jpyml8ybn7xqswp8am82vpg"; depends=[]; };
 goft = derive { name="goft"; version="1.1"; sha256="19mb2i2iri09v2dgkyl1ral2m7bzyizncnz24niwg13afpwbq12h"; depends=[gPdtest mvShapiroTest]; };
-goftest = derive { name="goftest"; version="1.0-2"; sha256="11xw0cfj71z5smywsds9ijbhf3glxkqnhxmwwdqkv4gjrrr2y1bv"; depends=[]; };
+goftest = derive { name="goftest"; version="1.0-3"; sha256="0rwz8y23dsklwvmd4sxq0bcklsa7l47lbs5lkcdn58jsdzm7bfrq"; depends=[]; };
 gogarch = derive { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fastICA fGarch]; };
-gooJSON = derive { name="gooJSON"; version="1.0.01"; sha256="02sldh5lsrjprc9mbf99jyid7ij62db5f1h60z719gxl4pk6fjms"; depends=[rjson]; };
-googleVis = derive { name="googleVis"; version="0.5.8"; sha256="185pp2sgdw81p9vjkxzx4nrv9fp9jw24mqng7k98ql98p3kw9y21"; depends=[RJSONIO]; };
+googleVis = derive { name="googleVis"; version="0.5.9"; sha256="0r182x6ccpdqkgqmqf26lvajhw954vqzm4bnyvpqif57nnzw4zpx"; depends=[RJSONIO]; };
+googlesheets = derive { name="googlesheets"; version="0.1.0"; sha256="0c3a521i2nw5v6ydz0ci7vbxlzfv3bh39yi7njah25zfbxjgm751"; depends=[cellranger dplyr ggplot2 httr plyr stringr tidyr XML xml2]; };
 goric = derive { name="goric"; version="0.0-8"; sha256="0ayac0yfkxrl13ckc2pwfqnmsrhmbg5bi6iwzx0fmh81vrlp0zrm"; depends=[MASS Matrix mvtnorm nlme quadprog]; };
 govStatJPN = derive { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; };
 gpairs = derive { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode colorspace lattice MASS vcd]; };
@@ -3857,12 +3858,13 @@ gpmap = derive { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw
 gpr = derive { name="gpr"; version="1.1"; sha256="03ywik11kc6cnaqrzzzi94jkrdbd378m3sf26f2vpb7d834nl728"; depends=[]; };
 gptk = derive { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; };
 gputools = derive { name="gputools"; version="0.28"; sha256="0ria03ggcfqgn93gjv2anhvkd3k73c6vfwgka16kf66g1nfzxs4l"; depends=[]; };
+gquad = derive { name="gquad"; version="1.0-0"; sha256="0rfhcc7c0lfn4hqwcbly1kdpna9kr5ryvan279iydysv5iha96rr"; depends=[ape seqinr]; };
 grImport = derive { name="grImport"; version="0.9-0"; sha256="1d8fd7502qj7cirjqdkr1qj51rylw2fz5hs06avfvc2dxs2xwfw1"; depends=[XML]; };
 grade = derive { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; };
 gramEvol = derive { name="gramEvol"; version="2.0-2"; sha256="1xrn5gkr9rxw53i5l2sqcgai9q0w4kyrychf0nq17cvcynw1y1lx"; depends=[]; };
 granova = derive { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; };
 granovaGG = derive { name="granovaGG"; version="1.3"; sha256="1bsxad2h7rmbkmmg5zx6wbpws62dmp7n905gnp17n8cl8c6w2jp9"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; };
-graphicalVAR = derive { name="graphicalVAR"; version="0.1.2"; sha256="0vc2x58z4w1hhvkqpxya3wr78p2b1irfyivc7njxw8a2595rc347"; depends=[glasso glmnet Matrix mvtnorm qgraph Rcpp RcppArmadillo]; };
+graphicalVAR = derive { name="graphicalVAR"; version="0.1.3"; sha256="0awbcx8qb77r4qb90xinp49glwbkvyfb5f5y2qrjk8rr2jd62j0s"; depends=[glasso glmnet Matrix mvtnorm qgraph Rcpp RcppArmadillo]; };
 graphicsQC = derive { name="graphicsQC"; version="1.0-6"; sha256="07kzz0r8rh4m7qqxnlab0d4prr56jz5kspx782byspkcm5l4xrsl"; depends=[XML]; };
 graphscan = derive { name="graphscan"; version="1.0"; sha256="15kdpp2k2gpfr8qq6wr08gva5hlxqha2h48zi1j3p6r766j07082"; depends=[ape rgl snowfall sp]; };
 greport = derive { name="greport"; version="0.5-3"; sha256="0cd7rqzrk1yb22ksbmva1fl9k388bxxm586c20j8k8z5zympi9g1"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; };
@@ -3876,7 +3878,7 @@ gridSVG = derive { name="gridSVG"; version="1.4-3"; sha256="1jgrhckjbvccp5zqbkki
 grnn = derive { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; };
 groc = derive { name="groc"; version="1.0.5"; sha256="1kqcdyq1y80gd62jpn38yz6q1qmg84b7k8qcniip5h948vfzkddg"; depends=[MASS mgcv pls robust robustbase rrcov]; };
 grofit = derive { name="grofit"; version="1.1.1-1"; sha256="1rnym5fxbg3bin2idmymrwvf1fcd646bipbgjd6wby8my69zy4c5"; depends=[]; };
-gromovlab = derive { name="gromovlab"; version="0.6-16"; sha256="0ndi4i91fnndvpp3xmr405a62vq5gjagw2qrvcmq1q6cgg7bj17q"; depends=[cluster glpkAPI igraph phangorn quadprog]; };
+gromovlab = derive { name="gromovlab"; version="0.7-6"; sha256="02s7x23610dbpmrqh7pimspa10v3fnmj48fwmh0a6igd74rmj2mg"; depends=[ape cluster glpkAPI igraph quadprog]; };
 groupRemMap = derive { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; };
 grouped = derive { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; };
 growcurves = derive { name="growcurves"; version="0.2.3.9"; sha256="1f8hh8ppp6bgrb8crm46xrria3vdnz62aya9lhwcdaggfmy7j25l"; depends=[Formula ggplot2 Rcpp RcppArmadillo reshape2 scales testthat]; };
@@ -3890,16 +3892,16 @@ grt = derive { name="grt"; version="0.2"; sha256="0cqjk7yqk2ryx1pgvjd3x8l25hqv92
 gsDesign = derive { name="gsDesign"; version="2.9-3"; sha256="0dd96hciiksf436lpm1q35in06b82p4h09spklf28n0p5hgc9225"; depends=[ggplot2 plyr RUnit stringr xtable]; };
 gsalib = derive { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; };
 gsarima = derive { name="gsarima"; version="0.1-4"; sha256="1ay3iamnvg7mbnl1xaxxcyic559bdnfspy883w2bwgy20yhr34yg"; depends=[MASS]; };
-gsbDesign = derive { name="gsbDesign"; version="0.96-2"; sha256="0sk4a66z9bqi3aa2ky9472p9znfm93kc9p5igdmvii4dr0syyfxd"; depends=[gsDesign lattice]; };
+gsbDesign = derive { name="gsbDesign"; version="0.96-3"; sha256="03q2lxz6x4zpwnn15a7mda2qv0d5xrsz563y7103gnmdxnxqqsbc"; depends=[gsDesign lattice]; };
 gset = derive { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc MCMCpack mvtnorm]; };
 gsg = derive { name="gsg"; version="2.0"; sha256="17fjl7aw1s814krnszxd4y1d4210bnkrf4kb2fwsycqwcwms5pm7"; depends=[boot mgcv mvtnorm numDeriv]; };
 gsheet = derive { name="gsheet"; version="0.1.0"; sha256="02mclvkq9lpp57ii8k3wj8cqjii9zsg4nl4i7zsa8b88r2bjmf9r"; depends=[dplyr rvest stringr]; };
 gskat = derive { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; };
 gsl = derive { name="gsl"; version="1.9-10"; sha256="06n21p0k2ki6nb725a6sxwlb4p7xc5jhg11nq9c3z3dj39r0qgbd"; depends=[]; };
 gsmoothr = derive { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; };
-gss = derive { name="gss"; version="2.1-4"; sha256="0vmyz3q7b2chzmvrwx6bk2yj5kmaxym6lznyrddxgf7xzjipvlii"; depends=[]; };
-gsscopu = derive { name="gsscopu"; version="0.9-2"; sha256="0hg2ry9rhnn51g368fg1zxswx826y3m0yn2wjb2g5rw4a4zn1frr"; depends=[gss]; };
-gstat = derive { name="gstat"; version="1.0-23"; sha256="0as4afwlwzmi37k8sbm0kssin8mikrny88smb71c0wf616yba4xi"; depends=[FNN lattice sp spacetime zoo]; };
+gss = derive { name="gss"; version="2.1-5"; sha256="19bysbh6n04psv0mgvlhkpkc463f6zfiwbdsvd28fakbzcwwm8h2"; depends=[]; };
+gsscopu = derive { name="gsscopu"; version="0.9-3"; sha256="0bvhhs5wn4y1dcff2g87f80jdn3i4mdbvdbydsbx80ng38rfxhhg"; depends=[gss]; };
+gstat = derive { name="gstat"; version="1.0-25"; sha256="19vs45mf2jpzfhd9c4gn5k0hdn652awg5bcbbjl4ixd52xiya2py"; depends=[FNN lattice sp spacetime zoo]; };
 gsubfn = derive { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"; depends=[proto]; };
 gsw = derive { name="gsw"; version="1.0-3"; sha256="0ca3h567r23bdldic7labk1vbz8hhslw568lacbdcikm8q16hk72"; depends=[]; };
 gtable = derive { name="gtable"; version="0.1.2"; sha256="0k9hfj6r5y238gqh92s3cbdn34biczx3zfh79ix5xq0c5vkai2xh"; depends=[]; };
@@ -3988,13 +3990,13 @@ histmdl = derive { name="histmdl"; version="0.4-1"; sha256="0kiz95hdi658j5s7aqlf
 histogram = derive { name="histogram"; version="0.0-23"; sha256="0hrhk423wdybqbvgsjn7dxgb95bkvmbh573q1696634hvzfdm68c"; depends=[]; };
 historydata = derive { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; };
 hitandrun = derive { name="hitandrun"; version="0.5-1"; sha256="0qgja0xw6687hr9qw4cwl9gq1vbv8gdnh6fkq2wx5cahgjz1p3bj"; depends=[rcdd]; };
-hive = derive { name="hive"; version="0.1-16"; sha256="1xaxnr8nfkji2b5f5dq2h01pkl20rm24wxnf1y1xv695v3j58ibd"; depends=[rJava XML]; };
-hlr = derive { name="hlr"; version="0.0-4"; sha256="04w1hzjfg2ly9vm9ynh676fy74d9ncy3a1mak209z2ddgr3m7r2y"; depends=[MASS]; };
+hive = derive { name="hive"; version="0.2-0"; sha256="0ywakjphy67c4hwbh6prs4pgq5ifd8x8inxjkigjiqz6jx3z852v"; depends=[rJava XML]; };
 hmeasure = derive { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; };
 hmm_discnp = derive { name="hmm.discnp"; version="0.2-3"; sha256="1r9xxgsqh5pw9incldaxnsqhyanhd4jwm6w0ix1k43i53dw4diyr"; depends=[]; };
 hmmm = derive { name="hmmm"; version="1.0-3"; sha256="0yjx5i13jbv7vzxn84m6305124ri7jnym0bxbdj46s6l7lw025a9"; depends=[MASS mvtnorm quadprog]; };
 hnp = derive { name="hnp"; version="1.0"; sha256="1sxbgz57js1vxhz309dnj6jhw4y6c0pzk0a9xk8avacicnv0bxhr"; depends=[MASS]; };
-hoardeR = derive { name="hoardeR"; version="0.0-2"; sha256="1k9a469h6fmr1br93dsk4q14h2bw8225l0v5sfp2wyr8sfpwm1dg"; depends=[httr stringr XML]; };
+hoa = derive { name="hoa"; version="2.1.1"; sha256="0ph83z28200q488nj5zbprzxxh7nskp0rx62s1qngai2iy4zfnj8"; depends=[statmod survival]; };
+hoardeR = derive { name="hoardeR"; version="0.1"; sha256="1a3kf676mchrla9g0b619dx09ihxvlmahgwlbwqny6zwr49w7vzl"; depends=[httr MASS R_utils stringr XML]; };
 holdem = derive { name="holdem"; version="1.1"; sha256="07h4cbg7hx91hc6ypi6hbalzdd9qz9rfhjgk5sq1srnangwwnxlw"; depends=[]; };
 homals = derive { name="homals"; version="1.0-5"; sha256="1azrwvdzn379in2sz9d94w2f2xp0d6iiayrv0bws44kvdzr95aqm"; depends=[ape rgl scatterplot3d]; };
 homeR = derive { name="homeR"; version="0.1"; sha256="0yq93b3wkgbnwzpyhx9c73sb9xgz7m3z4p5rflk3lmc0p53h81g5"; depends=[]; };
@@ -4006,19 +4008,20 @@ howmany = derive { name="howmany"; version="0.3-1"; sha256="045ck8qahfg2swbgyf7d
 hpcwld = derive { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgzh1bivrvrsr8lgxxw3sbkw88lwb40"; depends=[multicool partitions]; };
 hpoPlot = derive { name="hpoPlot"; version="2.0"; sha256="080jzi1zw510clbbkmf2wkwbfgna06kfz91i7d90b9pqi7krj28j"; depends=[functional magrittr Rgraphviz]; };
 hqmisc = derive { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; };
+hqreg = derive { name="hqreg"; version="0.9"; sha256="1091qrs31iabnms0z15f1mliaq69k9snxsscfizh8rws2vqhrjvr"; depends=[]; };
 hrr = derive { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; };
-hsdar = derive { name="hsdar"; version="0.1.5"; sha256="1ii83dpndshq8d00f3dxrzcxqplcc5b85b9cixxbda5bpvrlkpg1"; depends=[raster rgdal rootSolve signal sp]; };
+hsdar = derive { name="hsdar"; version="0.2.1"; sha256="0353601af5n8dkz7adxzqig30pwbli2yvb5lx5lb5ihaq706yr51"; depends=[raster rgdal rootSolve signal sp]; };
 hsicCCA = derive { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
 hsmm = derive { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; };
 hsphase = derive { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[Rcpp RcppArmadillo snowfall]; };
 htmlTable = derive { name="htmlTable"; version="1.3"; sha256="00zcismapanyb68657gng5l6g3hsmpls84naracshj4gfk2l1cfs"; depends=[knitr magrittr stringr]; };
 htmltools = derive { name="htmltools"; version="0.2.6"; sha256="1gp6f6388xy3cvnb08q08vraidjp740gfxlafdd19m2s04v5hncz"; depends=[digest]; };
-htmlwidgets = derive { name="htmlwidgets"; version="0.4"; sha256="079y3b3d4na582a1wmb5nc5cyrmmld4v7c1vc08cbfsg43w026zn"; depends=[htmltools jsonlite yaml]; };
-hts = derive { name="hts"; version="4.4"; sha256="1dpm669lc4khjkcs49m1nh7i61sclsqy7xbcn4mqqjhfgs7sg7sk"; depends=[forecast SparseM]; };
+htmlwidgets = derive { name="htmlwidgets"; version="0.5"; sha256="1d583kk7g29r4sq0y1scri7fs48z6q17c051nyjywcvnpy4lvi8j"; depends=[htmltools jsonlite yaml]; };
+hts = derive { name="hts"; version="4.5"; sha256="1bjribmfczkx139z73b0cl3lzlw5n2byyyc5inqv9qgayz0dc6cp"; depends=[forecast Matrix Rcpp RcppEigen SparseM]; };
 httk = derive { name="httk"; version="1.2"; sha256="016njh1cm21bmdrn94cbsmf36gzcwfg21bqp8nl100qb16d6yqq6"; depends=[deSolve msm]; };
 httpRequest = derive { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; };
 httpuv = derive { name="httpuv"; version="1.3.2"; sha256="0vp3bz1nxi0ladlgi1r6wd480y0m2m0gsba2hrs73s9b8afrfh6v"; depends=[Rcpp]; };
-httr = derive { name="httr"; version="0.6.1"; sha256="111l6ygwnrzcqwny6ds62np0r2f6x0il7abapq00j1y86nk4p6l6"; depends=[digest jsonlite mime R6 RCurl stringr]; };
+httr = derive { name="httr"; version="1.0.0"; sha256="1yprw8p4g8026jhravgg1hdwj1g51cpdgycyr5a58jwm4i5f79cq"; depends=[curl digest jsonlite mime R6 stringr]; };
 huge = derive { name="huge"; version="1.2.6"; sha256="11njfd4i8q950apga6sdk84p4wk4qvp8bpg6yz9lgjrgj2hn14n2"; depends=[igraph lattice MASS Matrix]; };
 humanFormat = derive { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; };
 hwde = derive { name="hwde"; version="0.64"; sha256="1is39zknssqm98577sdjg8gn3h9wsraih19a9nd6n8mxdcsqivh4"; depends=[]; };
@@ -4041,7 +4044,7 @@ hypervolume = derive { name="hypervolume"; version="1.3.0"; sha256="07pnbkdqm4js
 hypothesestest = derive { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; };
 hysteresis = derive { name="hysteresis"; version="2.5"; sha256="1b1dd2367pjbg4jnn65l2jcj38ljz7adpdg8f5b9rj1rw7qgikfl"; depends=[car MASS msm]; };
 hzar = derive { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[coda foreach MCMCpack]; };
-iBATCGH = derive { name="iBATCGH"; version="1.2"; sha256="0py83q8fcrh0kjysvljx22b7s2gsccq19rzvwf3alq8vl59sm48i"; depends=[msm Rcpp RcppArmadillo]; };
+iBATCGH = derive { name="iBATCGH"; version="1.3"; sha256="0pnkkabzi57czcwd9i15nwv8ggwvyxmvn1wam7yrrrbvmi17lmrm"; depends=[msm Rcpp RcppArmadillo]; };
 iBUGS = derive { name="iBUGS"; version="0.1.4"; sha256="0vsxy8pnbix0rg7ksgywx7kypqb5ngkxhldh3cisjkvdv638ybps"; depends=[gWidgetsRGtk2 R2WinBUGS]; };
 iC10 = derive { name="iC10"; version="1.1.2"; sha256="1ncxdjw9ary0bs3fvnvyqp356gi4wa177sllkizq71fzn75a03x3"; depends=[iC10TrainingData pamr]; };
 iC10TrainingData = derive { name="iC10TrainingData"; version="1.0.1"; sha256="1x1kgxiib9l7whm2kmbv1s912hgpl7rdpqpn67nlkiswnr27hqn4"; depends=[]; };
@@ -4050,6 +4053,7 @@ iDynoR = derive { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6
 iFad = derive { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[coda MASS Rlab ROCR]; };
 iFes = derive { name="iFes"; version="1.0"; sha256="0in6wy6w567188gylnlvcsk3r3w2nln9h60rj7ng1qwqawrvgwxp"; depends=[doParallel foreach ROCR]; };
 iGasso = derive { name="iGasso"; version="1.2"; sha256="123487slizsmw5b0imwqll8n03navx30kvawr6jfibbjfdd8vfn7"; depends=[CompQuadForm lattice]; };
+iNEXT = derive { name="iNEXT"; version="2.0.3"; sha256="1b9sq19g3qd1q47bmgsw16lwn3r7wgrbiiaa8pc67lbrar5iip9v"; depends=[ggplot2]; };
 iRefR = derive { name="iRefR"; version="1.13"; sha256="17kjfga62xc4s1kii5clxszbag2dr1dyxfm7jasr20prx28ya6pp"; depends=[graph igraph RBGL]; };
 iRegression = derive { name="iRegression"; version="1.2"; sha256="1fn25xnrvgx2ayhss136rxn1h3c9pvq2gmb5kbp92vsf07klvh6v"; depends=[mgcv]; };
 iRepro = derive { name="iRepro"; version="1.0"; sha256="1knncn47pl411r31z1r5ipsiyagcpjbc2gb972n7l3539pcpf0zy"; depends=[]; };
@@ -4068,8 +4072,9 @@ icamix = derive { name="icamix"; version="1.0.2"; sha256="0rpqx9q5p3nb5gd76zlkql
 icapca = derive { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; };
 iccbeta = derive { name="iccbeta"; version="1.0"; sha256="0zsf2b5nrv39pssi5walf82892fr8p1f802c96hjjknh78q7gh0h"; depends=[lme4 Rcpp RcppArmadillo]; };
 icd9 = derive { name="icd9"; version="1.2"; sha256="0d0dgd5951chyfimzjb00cphdvqzml8p8wr7sad3qfhv44dsypn7"; depends=[checkmate Rcpp]; };
-icenReg = derive { name="icenReg"; version="1.2.4"; sha256="0fqwg1xmks9zkmbnr1dala4b13l85ibqfd96w4vvrfhmvakqra1r"; depends=[foreach survival]; };
+icenReg = derive { name="icenReg"; version="1.2.5"; sha256="1qw0c0y0hykb79p55lnvjk9zbxr0gva299i46cj8clcwyh2ivfga"; depends=[foreach survival]; };
 icensmis = derive { name="icensmis"; version="1.2.1"; sha256="1h4l9irip4hv34hr92j8756qgmy455mfdblr7ypgsgvr27cgax8h"; depends=[Rcpp]; };
+icsw = derive { name="icsw"; version="0.9"; sha256="0lmq9l9sy0fz3yjj2sj8f19iy26913caibf7d9zb9w9n6cqskvlx"; depends=[]; };
 idbg = derive { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; };
 identity = derive { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; };
 idm = derive { name="idm"; version="1.0"; sha256="001zvhw38qgq1l66yxz5kchvjspijdvqwgrdvh5ykiqifi8kc5xm"; depends=[animation ca corpcor dummies ggplot2]; };
@@ -4080,14 +4085,14 @@ ifctools = derive { name="ifctools"; version="0.3.1"; sha256="0lr1d4z2gzninqchfz
 ifs = derive { name="ifs"; version="0.1.4"; sha256="0fzani8rnn4rdwlghq967hhi4zfjnk3gwpk3v6wys738xj7yfwp1"; depends=[]; };
 ifultools = derive { name="ifultools"; version="2.0-1"; sha256="16lrmajyfa15akgjq71w9xlfsr4y9aqfw7y0jf6gydaz4y6jq9b9"; depends=[MASS splus2R]; };
 ig_vancouver_2014_topcolour = derive { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; };
-igraph = derive { name="igraph"; version="0.7.1"; sha256="1nvb30zjjw861idbd8zap9qqg22k87zdi6qqvjf1s29v7hkx7kq7"; depends=[Matrix]; };
-igraphdata = derive { name="igraphdata"; version="0.2.2"; sha256="0lmgz9zglz0rn0iyjs9kdcm1xp09kh21sv91wnj74666jp0wsg4x"; depends=[]; };
+igraph = derive { name="igraph"; version="1.0.1"; sha256="00jnm8v3kvxpxav5klld2z2nnkcpj4sdwv4ksipddy5mp04ysr6w"; depends=[irlba magrittr Matrix NMF]; };
+igraphdata = derive { name="igraphdata"; version="1.0.0"; sha256="1b8almybmsgmjhp6lhxqqbv34kn2hpw9b08g911ip89hmlypd97s"; depends=[]; };
 igraphtosonia = derive { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; };
 ihs = derive { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; };
 iki_dataclim = derive { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[climdex_pcic lubridate PCICt zoo]; };
 ilc = derive { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; };
 imguR = derive { name="imguR"; version="1.0.0"; sha256="0yhlir0qxi6hjmqlmmklwd4vkymc5bzv9id9dlis1fr1f8a64vwp"; depends=[httr jpeg png RCurl]; };
-import = derive { name="import"; version="1.0.2"; sha256="1m6xnj08faf5ahb0ga4z13x3pwhvw2gh4wg72m9wcfcyr0rp74lx"; depends=[]; };
+import = derive { name="import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; };
 imprProbEst = derive { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; };
 imputeLCMD = derive { name="imputeLCMD"; version="2.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[impute norm pcaMethods tmvtnorm]; };
 imputeMDR = derive { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; };
@@ -4095,7 +4100,6 @@ imputeR = derive { name="imputeR"; version="1.0.0"; sha256="18rx70w7xb33m84ifxl3
 in2extRemes = derive { name="in2extRemes"; version="1.0-1"; sha256="0k5qczs54b7bl71my8xmnqly91g7c5skj0lm2g8dk4hgrx6wwsrf"; depends=[extRemes]; };
 inTrees = derive { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089gzdz1smga6ssj8cxxccyyzci6px85j1"; depends=[arules gbm RRF xtable]; };
 inarmix = derive { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp]; };
-incReg = derive { name="incReg"; version="1.0"; sha256="1kckx64hn8g9wvjg7g9xild5hclim1rs7z2m7rgmbdwlbayxpwgv"; depends=[car]; };
 indicoio = derive { name="indicoio"; version="0.3"; sha256="04c2j4l103fiiibf83z7iq95wfnlv9rj46cyp9xy68bzqkbwdi3m"; depends=[httr png rjson stringr]; };
 indicspecies = derive { name="indicspecies"; version="1.7.5"; sha256="16m4pnfnmaskin4aaalm2cmv3vwzg94045max8nhkgw02kpskz1r"; depends=[permute]; };
 ineq = derive { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; };
@@ -4123,9 +4127,10 @@ intamapInteractive = derive { name="intamapInteractive"; version="1.1-10"; sha25
 intcox = derive { name="intcox"; version="0.9.3"; sha256="1m1lzmymh2pk570k6nxq3nj7wxkvs1s3nvz8cb456fnv72ng8fap"; depends=[survival]; };
 interAdapt = derive { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; };
 interferenceCI = derive { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; };
-intergraph = derive { name="intergraph"; version="2.0-1"; sha256="03ycay3x4wd3j7r0mad9qgi4h77krapg613ans3jf9qa4ys2njlv"; depends=[igraph network]; };
+intergraph = derive { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; };
 internetarchive = derive { name="internetarchive"; version="0.1.2"; sha256="08gbkqbzx963c1jy3a540fsd0ff9ylr7la1clwjn46lp4cc4yv1h"; depends=[dplyr httr jsonlite]; };
-interpretR = derive { name="interpretR"; version="0.2.2"; sha256="048qhq9mf3qna48v8ml7hfa7imrsrhrl0hrb44arh1ik3i5a2xx6"; depends=[AUC randomForest]; };
+interplot = derive { name="interplot"; version="0.1.0.1"; sha256="0a5n4s35v4vxfcynq9dpymc9dfwr0p1zf2974yljgsh5az6iarjk"; depends=[abind arm ggplot2]; };
+interpretR = derive { name="interpretR"; version="0.2.3"; sha256="1y2j91dm0p6yy9qwkllmlmk8n2b9ics4d40cmq8b0fk3rk61vh59"; depends=[AUC randomForest]; };
 interval = derive { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; };
 intervals = derive { name="intervals"; version="0.15.0"; sha256="0lvxaq5ia7hj65n00awz454a2vdxpskxjw45wsakgh0sc60hk8yz"; depends=[]; };
 interventionalDBN = derive { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; };
@@ -4143,6 +4148,7 @@ ipfp = derive { name="ipfp"; version="1.0"; sha256="1hpfbgygnpnl3fpx7zl728jyw00y
 iplots = derive { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[png rJava]; };
 ipred = derive { name="ipred"; version="0.9-4"; sha256="0rig1sj0jqv2rrkgcr6fhr8477wxirxwnwk533l7rn6qr90prjwp"; depends=[class MASS nnet prodlim rpart survival]; };
 ips = derive { name="ips"; version="0.0-7"; sha256="0r4394xbchv6czad9jz4ijnfz8ss3wfdvh7ixrdxic2xrw0ic90v"; depends=[ape colorspace XML]; };
+iptools = derive { name="iptools"; version="0.2.0"; sha256="010vqz8rnaljjk0prcbsx25aqkrr78x32vcbx8589vwlvy10ka0f"; depends=[BH Rcpp]; };
 iqLearn = derive { name="iqLearn"; version="1.3"; sha256="05f2spnzyqzbbgwz9llf4x5r6fsz5gxa1ckykv6wxg4sirdqccm1"; depends=[]; };
 irace = derive { name="irace"; version="1.06"; sha256="10dizzjds1aszvyh0fn6ahqvgn2x6sg3lwb7rca8zhgphrjg92bl"; depends=[]; };
 irlba = derive { name="irlba"; version="1.0.3"; sha256="1h2ymk9hg9xj2075w715742j23jl7kqa4cgzl1jvr48gcysq5byy"; depends=[Matrix]; };
@@ -4168,11 +4174,10 @@ itertools = derive { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj
 itertools2 = derive { name="itertools2"; version="0.1.1"; sha256="0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96"; depends=[iterators]; };
 itree = derive { name="itree"; version="0.1"; sha256="164zgr142hcp9plnbccs6m823p4m0prk73bvp54bc7bqnqmc3d9a"; depends=[]; };
 its = derive { name="its"; version="1.1.8"; sha256="1g9qmdrw7qiw0xiryf7bf5m9prrba7r11jyzprzdglc1akizav8a"; depends=[Hmisc]; };
-itsadug = derive { name="itsadug"; version="0.8"; sha256="1lphbw1d1x1bs625rnr9jl3zyaqr8rka8d0v2v3cf3crywc3lzhn"; depends=[mgcv]; };
+itsadug = derive { name="itsadug"; version="1.0.1"; sha256="0vazyg5pqvp9iidkhbm33l0g1sb8q3f6mig03ss8biia0hg2qb5i"; depends=[mgcv]; };
 itsmr = derive { name="itsmr"; version="1.5"; sha256="0l9m5is6d6pkpfkihx0jir5iv8zmqqav8vh9bkkpqv5iz61p4kxb"; depends=[]; };
 ivbma = derive { name="ivbma"; version="1.05"; sha256="0d7kg6pkdx1aj1i6kqs2r7j1klxxwymml63qnrq6a6fia3ck9kk9"; depends=[]; };
 ivfixed = derive { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; };
-ivivc = derive { name="ivivc"; version="0.2.2"; sha256="1qychbszcg9lmbmrnpv65xcv1i5k2xarsa374fs6gw7zlp5nrvap"; depends=[deSolve minpack_lm optimx png reshape sciplot]; };
 ivlewbel = derive { name="ivlewbel"; version="1.1"; sha256="0ykcfikm2i28s3fm6zzx8cjvpwhksg8an0rfr0b35gf7p69brgag"; depends=[gmm lmtest plyr]; };
 ivmodel = derive { name="ivmodel"; version="1.0"; sha256="14ic49vyikx5fiz2ccjmd53f0vcg3jh3fs6fqhl8w3hm9z9x4qvz"; depends=[Matrix]; };
 ivpack = derive { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER lmtest sandwich]; };
@@ -4182,15 +4187,15 @@ jSonarR = derive { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as
 jaatha = derive { name="jaatha"; version="2.7.0"; sha256="1ibk84x38j03hbdrf9pi0bi025fxlk2ysqxmfrqiqr4zq2rzhbvp"; depends=[phyclust Rcpp reshape2]; };
 jackstraw = derive { name="jackstraw"; version="1.0"; sha256="1irfzivy7c9fb2pr98flx05s5hkk6sid1hkd5b3k9m9mgs6ixbfy"; depends=[corpcor]; };
 jagsUI = derive { name="jagsUI"; version="1.3.7"; sha256="1zdrqxzjip4lgf99b4z76gvlhbmh0gcbkpghrlrj3j25wqzgn5y0"; depends=[coda lattice rjags]; };
-james_analysis = derive { name="james.analysis"; version="1.0.0"; sha256="01nbwhph22nfl0biwcgvb1q76jp79qj7qfn2fxpyx2dkkhzxzrmv"; depends=[naturalsort rjson]; };
+james_analysis = derive { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; };
 jiebaR = derive { name="jiebaR"; version="0.5"; sha256="1x41jqc1ai3v1fn9f65dk7k4g2llf3pk9z3bwqihb95qf80mhd4v"; depends=[jiebaRD Rcpp]; };
 jiebaRD = derive { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; };
 jmetrik = derive { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; };
 joineR = derive { name="joineR"; version="1.0-3"; sha256="0q98nswbxk5dz8sazzd66jhlg7hv5x7wyzcvjc6zkr6ffvrl8xj7"; depends=[boot gdata lattice MASS nlme statmod survival]; };
-joint_Cox = derive { name="joint.Cox"; version="1.1"; sha256="1zkj9ynxq521s23dz93m63valjf4amm19dcmcm8844fvnzbr7z4h"; depends=[]; };
+joint_Cox = derive { name="joint.Cox"; version="2.0"; sha256="0fdplzyh0ayw5d4b5rc9miisnwn5anmf8dv0a4dxnqnndjc2hjpx"; depends=[]; };
 jointDiag = derive { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; };
 jointPm = derive { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; };
-jomo = derive { name="jomo"; version="1.1-0"; sha256="109k9cpkf8wpw1z0g1ilglydx1k9jki2a675q6b19ip2zf2cinsz"; depends=[]; };
+jomo = derive { name="jomo"; version="1.2-0"; sha256="1vwvmxyndrxyyw9slwbkpa0kap8ymc3pqc4k0pxhwjgpy7k1xyvx"; depends=[]; };
 jpeg = derive { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; };
 js = derive { name="js"; version="0.2"; sha256="1dxyyrmwwq07l6pdqsvxscpciy4h1021h9ymx8hi2vqvv0mdrz76"; depends=[V8]; };
 jsonlite = derive { name="jsonlite"; version="0.9.16"; sha256="12whrj9shnf8wd3a5yi9zcvinhgvik9nb2wp6202j869jdwxq5ym"; depends=[]; };
@@ -4200,12 +4205,13 @@ kappaSize = derive { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyi
 kappalab = derive { name="kappalab"; version="0.4-6"; sha256="0dmzy0d7azzfpnzbf8b7a6zgmmfwzfiybz8610asajyfsj36gszl"; depends=[kernlab lpSolve quadprog]; };
 kaps = derive { name="kaps"; version="1.0.2"; sha256="0jg4smbq51v88i3815icb284j97iam09pc52rv3izxa57nv9a0gz"; depends=[coin Formula survival]; };
 kcirt = derive { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; };
-kdecopula = derive { name="kdecopula"; version="0.0.1"; sha256="100b3adwm95zspzzfm9lcbfic71knvzn2d3hs4k4mq187339sdlg"; depends=[cubature lattice locfit Rcpp RcppArmadillo VineCopula]; };
+kdecopula = derive { name="kdecopula"; version="0.0.2"; sha256="11cg9avdsdrkffbapxm9qskr0xplvs1djzrpk8gp5wknvmlg483z"; depends=[cubature lattice locfit Rcpp RcppArmadillo VineCopula]; };
 kdetrees = derive { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; };
 kedd = derive { name="kedd"; version="1.0.2"; sha256="11mfgjr1pl56y4rcychs8xjgazy3vhg1xasr37fd0g32g7w3lxqg"; depends=[]; };
 kelvin = derive { name="kelvin"; version="1.2-2"; sha256="0fl2yxc0dpmkhq3f7711gd08i7jlzlfncin1d6q251dfnmwd7rzf"; depends=[Bessel]; };
 kequate = derive { name="kequate"; version="1.4.0"; sha256="0vr45y4f6x3080pf3k53nifavf8mfhikz54nis66c53fs9rp0jwf"; depends=[equateIRT ltm]; };
 kerdiest = derive { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; };
+kergp = derive { name="kergp"; version="0.1.0"; sha256="00p3iziz6kjm1v7rpqa2lls1xgp2w3q754mj1x6bj24kx69xpc7g"; depends=[MASS numDeriv Rcpp testthat]; };
 kernelFactory = derive { name="kernelFactory"; version="0.2.2"; sha256="1ms6732s17vx120xr2l423qmj0h880r522zsgp474pq3fxc0mr48"; depends=[AUC genalg kernlab randomForest]; };
 kernlab = derive { name="kernlab"; version="0.9-20"; sha256="0gwl3v8gxidzfmvwa2icqla8ypdgnmvcwxf54iwrvvy2csjx0w27"; depends=[]; };
 keypress = derive { name="keypress"; version="1.0.0"; sha256="16msbanmbv2kf09qvl8bd9rf1vr7xgcjzjhzngyfyxv90va3k86b"; depends=[]; };
@@ -4213,7 +4219,7 @@ kfigr = derive { name="kfigr"; version="1.1.0"; sha256="1mnnd603s741h1vp99q6d8lw
 kimisc = derive { name="kimisc"; version="0.2-1"; sha256="1nbhw1q0p87w4z326wj5b4k0xdv0ybkgcc59b3cqbqhrdx8zsvql"; depends=[plyr]; };
 kin_cohort = derive { name="kin.cohort"; version="0.6"; sha256="13gnjk58m5kya9wj87klwm6h7cdqi61ba6y0cg9k1hgbc1ajy3s8"; depends=[survival]; };
 kineticF = derive { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm MASS plotrix sp splancs]; };
-kinfit = derive { name="kinfit"; version="1.1.13"; sha256="1av33f4wns6qp79wyww70f7fsfybcqm83nby1ia65sjp2dz04dk1"; depends=[]; };
+kinfit = derive { name="kinfit"; version="1.1.14"; sha256="0gb43pghgllb9gzh8jzzpfmc46snv02ln4g3yqsdah3cyqnck0ih"; depends=[]; };
 kinship2 = derive { name="kinship2"; version="1.6.0"; sha256="06f544yk61i1xq0rm0r5gpzwfl6rvzyg7gz8z86bjyxg0z44h3vy"; depends=[Matrix quadprog]; };
 kintone = derive { name="kintone"; version="0.1.1"; sha256="13c82vkapks9j2crrb4awnhl60ld8b1r7xmy9yv4zzch868kcl5g"; depends=[RCurl rjson]; };
 kissmig = derive { name="kissmig"; version="1.0-3"; sha256="1pi1x3gdbqrhr1km1hqj15k8wyrgs697fnxgjgxga1irbn8bi482"; depends=[raster]; };
@@ -4230,6 +4236,7 @@ kml = derive { name="kml"; version="2.3.1"; sha256="1bnd8ssbhijxd9c9x7qn96jdkj1f
 kml3d = derive { name="kml3d"; version="2.3"; sha256="0dlpxp8bbrwgblrl1hnc1ip592abc6sdcl87s4m6jwgfaxjcq7a8"; depends=[clv kml longitudinalData misc3d rgl]; };
 kmlcov = derive { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; };
 kmodR = derive { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; };
+knitLatex = derive { name="knitLatex"; version="0.9.0"; sha256="1igacc2sx8897wmnhh8kngd0fq6zqbi30chy5c8jw60zc38mi3wi"; depends=[knitr]; };
 knitcitations = derive { name="knitcitations"; version="1.0.6"; sha256="18jfrzazbk8cy9i7qvmmrn8c5cmkxvmdd894jpvak2gplxvsdx91"; depends=[digest httr RefManageR]; };
 knitr = derive { name="knitr"; version="1.10.5"; sha256="1qxpsnjwb4bdq44k3nglfrznpvqaqj18njx4imbpk3njzcjif7a7"; depends=[digest evaluate formatR highr markdown stringr yaml]; };
 knitrBootstrap = derive { name="knitrBootstrap"; version="0.9.0"; sha256="1cw5dvhjiypk6847qypxphfl9an54qjvd6qv029znhwijsg56mmg"; depends=[knitr markdown]; };
@@ -4237,7 +4244,7 @@ knnGarden = derive { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pz
 knnIndep = derive { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; };
 knncat = derive { name="knncat"; version="1.2.2"; sha256="1d392910y3yy46j8my1a7m0xkij2rc6vwq5fg22qk00vqli8drz2"; depends=[]; };
 knockoff = derive { name="knockoff"; version="0.2.1"; sha256="197icnyxxmi6f0v0p2zm4910grbgkfjkd3xql79ny04ik047v0kp"; depends=[glmnet RJSONIO]; };
-koRpus = derive { name="koRpus"; version="0.05-5"; sha256="03rw0yb67y652j8hcr5m4c0py0rr3gp87y0hdxpypd81rkikwhfm"; depends=[]; };
+koRpus = derive { name="koRpus"; version="0.05-6"; sha256="00mvdk9akicvy61bx83iyfzaamwpsjk0w7xg6yg26581dbc7wif1"; depends=[]; };
 kobe = derive { name="kobe"; version="1.3.2"; sha256="1z64jwrq6ddpm22cvk2swmxl1j7qyz0ddk3880c7zfq6gk7f9bxl"; depends=[coda emdbook ggplot2 MASS plyr reshape]; };
 kofnGA = derive { name="kofnGA"; version="1.1"; sha256="1ykk3rmyrv8c556rl3wp0i1d522dghaq4qk5acg06hhk9j9962fg"; depends=[]; };
 kohonen = derive { name="kohonen"; version="2.0.18"; sha256="08inl7rx30gjpqbdbhccy65bingimzgi4lckfvs0r6lba04a1f8l"; depends=[class MASS]; };
@@ -4259,7 +4266,7 @@ kzs = derive { name="kzs"; version="1.4"; sha256="1srffwfg0ps8zx0c6hs2rc2y2p01qj
 l2boost = derive { name="l2boost"; version="1.0"; sha256="1p0sbvlnax4ba4wjkh3r0bmjs601k590g7bdfk6wxvlj42jxcnkl"; depends=[MASS]; };
 laGP = derive { name="laGP"; version="1.1-5"; sha256="15p958c95a68gr2xs8aw0l0sp0appv6islfbidlvxm8ph252hw6d"; depends=[tgp]; };
 labdsv = derive { name="labdsv"; version="1.7-0"; sha256="1r5vbmdijcrw0n3phdmfv8wiy7s08pidvhac4pnsxfmf98f74jby"; depends=[cluster MASS mgcv rgl]; };
-label_switching = derive { name="label.switching"; version="1.3"; sha256="05kbxvrp0lm5913lhy7pgxr9cq64sm5hiz6ydmmgfmbmfirrcqyx"; depends=[combinat lpSolve]; };
+label_switching = derive { name="label.switching"; version="1.4"; sha256="1b498l3zb05yywkx8lbd9q9h92md2n4kyjvq62903k1wqp65nhvj"; depends=[combinat lpSolve]; };
 labeledLoop = derive { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; };
 labeling = derive { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; };
 labeltodendro = derive { name="labeltodendro"; version="1.3"; sha256="13kpmv26zzjf5iwpr4vs797irplmaixp1agx5v80wr4lvd2hirvg"; depends=[]; };
@@ -4281,38 +4288,39 @@ lasso2 = derive { name="lasso2"; version="1.2-19"; sha256="0zkwjsd42a6z4gylq9xbs
 lassoscore = derive { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; };
 lassoshooting = derive { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; };
 latdiag = derive { name="latdiag"; version="0.2-1"; sha256="1xjy6as3wjrl2y1lc5fgrbhqqcvrhdan89mpgvk9cpx71wxv95vc"; depends=[]; };
-latentnet = derive { name="latentnet"; version="2.7.0"; sha256="0g0a2s00f6rc9r6vmwm32489qqiwihcllmypc2wgqwayfmy8innn"; depends=[abind coda ergm mvtnorm network sna statnet_common]; };
+latentnet = derive { name="latentnet"; version="2.7.1"; sha256="0bjac9cid11pmhmi2gb4h3p4h9m57ngxx7p73a07afmfjk9p7h5m"; depends=[abind coda ergm mvtnorm network sna statnet_common]; };
+latex2exp = derive { name="latex2exp"; version="0.3.1"; sha256="09sk3zs5ip4xm3q7pzhmp7nnwjkwr5x1v4y1afccl6px04qdkd6j"; depends=[magrittr stringr]; };
 lattice = derive { name="lattice"; version="0.20-31"; sha256="1b3m3rg1zd8ssk5jjswk5y93js89vh6939kfajh6i6wphndxigb1"; depends=[]; };
 latticeDensity = derive { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[spam spatstat spdep splancs]; };
 latticeExtra = derive { name="latticeExtra"; version="0.6-26"; sha256="16x00sg76mga8p5q5ybaxs34q0ibml8wq91822faj5fmg7r1050d"; depends=[lattice RColorBrewer]; };
-lava = derive { name="lava"; version="1.4.0"; sha256="0zf62xk2j1gbwxqglq6lsxs3f7fb0hynnlfh1w870xz8imgf20yp"; depends=[numDeriv]; };
+lava = derive { name="lava"; version="1.4.1"; sha256="1xwyfn31nr8sppxy25a7p8yhf5isq4ah0dd45plhfclnlwrycr1l"; depends=[numDeriv]; };
 lava_tobit = derive { name="lava.tobit"; version="0.4-7"; sha256="1da98d5pndlbbw37k64fmr2mi1hvkhjxsmm3y9p4b772pz9i1pvj"; depends=[lava mvtnorm survival]; };
 lavaan = derive { name="lavaan"; version="0.5-18"; sha256="0ih5wvhmxln3w5h7q5w6gsmbs3w8118l9hc2afgsnzpg8a5jy1n3"; depends=[MASS mnormt pbivnorm quadprog]; };
 lavaan_survey = derive { name="lavaan.survey"; version="1.1"; sha256="1vscv165kilkc00pgs2s9qn404l3rv45zc9kzmrghxz42jsy04zc"; depends=[lavaan MASS Matrix survey]; };
 lawn = derive { name="lawn"; version="0.1.0"; sha256="0vv2qmz6a692ammh3jxnpq3b669s8cx61krmb97jlwjy2nb6r81i"; depends=[jsonlite magrittr V8]; };
-lawstat = derive { name="lawstat"; version="2.5"; sha256="01y00jfapmh3bmrmz740flkahw0b8im8sp5ac8hsp4pf9k09cvws"; depends=[Hmisc Kendall mvtnorm VGAM]; };
+lawstat = derive { name="lawstat"; version="3.0"; sha256="0398bf4jv0gnq54v6m7zl5sixspnvfwc3x3z492i38l215pc38kx"; depends=[Hmisc Kendall mvtnorm VGAM]; };
 lazy = derive { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; };
 lazyData = derive { name="lazyData"; version="1.0.3"; sha256="1i4jry54id8hhfla77pwk3rj2cci6na36hxj7k35k8lx666fdam2"; depends=[]; };
-lazyWeave = derive { name="lazyWeave"; version="2.2.5"; sha256="18j31lbbplxvrz4wnq7hfw9qcx1s0y4c34lbxwly2wyrvzjhxybl"; depends=[Hmisc survival]; };
 lazyeval = derive { name="lazyeval"; version="0.1.10"; sha256="02qfpn2fmy78vx4jxr7g7rhqzcm1kcivfwai7lbh0vvpawia0qwh"; depends=[]; };
-lba = derive { name="lba"; version="1.0"; sha256="108kfffwpvl6rjcmmxswprxxqcv1sj7w9mmca4pwaiprad7p7x59"; depends=[alabama ca MASS plotrix]; };
+lba = derive { name="lba"; version="1.2"; sha256="0zfln5dc4v3yaqgdbg22nq3z2by7jnbbi9mwwwvkr4j1z70knpqg"; depends=[alabama ca MASS plotrix]; };
 lbfgs = derive { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; };
 lbfgsb3 = derive { name="lbfgsb3"; version="2015-2.13"; sha256="1jpy0j52w8kc8qnwcavjp3smvdwm1qgmswa9jyljpf72ln237vqw"; depends=[numDeriv]; };
 lbiassurv = derive { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; };
 lcd = derive { name="lcd"; version="0.7-3"; sha256="1jnnw15d4s8yb5z5jnzvmlrxv5x6n3h7wcdiz2nw4vfiqncnpwx4"; depends=[ggm igraph MASS]; };
 lcda = derive { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; };
 lcmm = derive { name="lcmm"; version="1.7.2"; sha256="1sg5vx3nx8ik5z2c2pi3p9h5b5k0z7m1jc404jkv3gr17nilcp4i"; depends=[survival]; };
-lctools = derive { name="lctools"; version="0.2-2"; sha256="0yf30gjqp7adjw0l129xzmaj2wmc6hbqhdw35dfwwcxk5nys5dq0"; depends=[reshape weights]; };
+lctools = derive { name="lctools"; version="0.2-3"; sha256="167905fimgslx9rkvwqfr905cm5w88pzii847g9j0bwfgkm2m4rp"; depends=[reshape weights]; };
 lda = derive { name="lda"; version="1.3.2"; sha256="1iizsksp8wz34ji7p2kc6npxz9rzhs6217793nfri6y6mq23vs8z"; depends=[]; };
 ldbounds = derive { name="ldbounds"; version="1.1-1"; sha256="15ixrq615x64zmi6dryq3ww0dqxd0qf5xx1bs3w934sf99l46bhs"; depends=[lattice]; };
 ldlasso = derive { name="ldlasso"; version="3.2"; sha256="0ij68zvgm8dfd2qwx6h6ygndac29qa0ddpf11z959v06n8jsnk11"; depends=[GenABEL quadprog]; };
 ldr = derive { name="ldr"; version="1.3.3"; sha256="1c48qm388zlya186qmsbxxdcg1mdv3nc3i96lqb40yhcx2yshbip"; depends=[GrassmannOptim Matrix]; };
 leaderCluster = derive { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; };
+leaflet = derive { name="leaflet"; version="1.0.0"; sha256="1s49nk1wzcdim3cqv4lq4kpvny1hvcnm1sbman9f5h8zgbi7f93n"; depends=[base64enc htmltools htmlwidgets magrittr markdown png raster RColorBrewer scales sp]; };
 leafletR = derive { name="leafletR"; version="0.3-3"; sha256="00xdmlv6wc47lzlm43d2klyzcqljsgrfrmd5cv8brkvvcsyj57kq"; depends=[brew jsonlite]; };
 leapp = derive { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[corpcor MASS sva]; };
 leaps = derive { name="leaps"; version="2.9"; sha256="1ax9v983401hvb6cdswkc1k7j62j8yk6ds22qdj24vdidhdz5979"; depends=[]; };
 learningr = derive { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; };
-learnstats = derive { name="learnstats"; version="0.1.0"; sha256="03rlyh7ynxxvnkx8r8611ss36aqc8mdk6w2kjajmmsdwzp81lgnc"; depends=[ggplot2 Rcmdr RcmdrPlugin_epack rmarkdown shiny]; };
+learnstats = derive { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; };
 lefse = derive { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape fBasics geiger picante SDMTools vegan]; };
 leiv = derive { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; };
 lessR = derive { name="lessR"; version="3.3.1"; sha256="1nwvkxi9q7fsjgrfpa16ry54cyk2ja5cy4cq0xzqya6wn04mbicg"; depends=[car foreign gdata leaps MBESS triangle]; };
@@ -4320,14 +4328,14 @@ lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4
 letsR = derive { name="letsR"; version="2.1"; sha256="0jgc6k2hbpbr7kl42n01mff7pzjz60zd8mchrfhzgd797pwcqlbq"; depends=[fields geosphere maps maptools raster rgdal sp XML]; };
 lfactors = derive { name="lfactors"; version="0.4.0"; sha256="1f4p5mp6m11njrj421vjl5398laicgyg8m04srshfmpi74hf1nb9"; depends=[]; };
 lfe = derive { name="lfe"; version="2.3-1709"; sha256="0q6va05n38225a7sbk0ykdrygzjk6js6afm2vyy5fac1hbvihb05"; depends=[Formula Matrix xtable]; };
-lfl = derive { name="lfl"; version="1.1"; sha256="1hrdhp2r17qwns5hya9sl03q93h934whqyqsn8mdrsavc64i649v"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; };
+lfl = derive { name="lfl"; version="1.2"; sha256="0l922sjpdiy4ifhizl1l2azzwg83j8fy8j5bvwx6yd3fvxas51ns"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; };
 lfstat = derive { name="lfstat"; version="0.6.1"; sha256="0i3zrinvjxlg9w5zqrv8wzy15vxvi2gw3jrlfs4rddkxnp98ya9d"; depends=[lattice latticeExtra lmom lmomRFA]; };
 lga = derive { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; };
 lgarch = derive { name="lgarch"; version="0.5"; sha256="01y5p3w4i1yfxb647pkdazqn9yac1p6jp7rk92ddxnvvjb6fdp59"; depends=[zoo]; };
 lgcp = derive { name="lgcp"; version="1.3-9"; sha256="093rxvb4irmf04nx1j5zrgh8k0jw78zl9qrmkn314vaqyn3b4608"; depends=[fields iterators maptools Matrix ncdf RandomFields raster rgeos rpanel sp spatstat]; };
 lgtdl = derive { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypdky9rypy607mr8brwimjn8k1f0gx4"; depends=[]; };
 lhs = derive { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; };
-libamtrack = derive { name="libamtrack"; version="0.6.1"; sha256="0kg3lp1f40hymr2nxq7immxnqryavad91xp6l6x4qyp0cb02870a"; depends=[]; };
+libamtrack = derive { name="libamtrack"; version="0.6.2"; sha256="1wmy3baqbmmzc4w1b3w2z3qvsi61khl6a6rlc22i58gnprmgzrph"; depends=[]; };
 lifecontingencies = derive { name="lifecontingencies"; version="1.1.6"; sha256="07gvq93p2f8s4a43h596xmzifnx1jwnfyg5giqhlfvxnq6wdbvrr"; depends=[markovchain Rcpp]; };
 likeLTD = derive { name="likeLTD"; version="5.5.0"; sha256="111wdszkk2bdi9sz6gfih32kib0ig9bp4xlq6wl5r5zx3nrlj5zb"; depends=[DEoptim gdata ggplot2 gtools rtf]; };
 likelihood = derive { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; };
@@ -4338,7 +4346,7 @@ limitplot = derive { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh
 linLIR = derive { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; };
 linbin = derive { name="linbin"; version="0.1.0"; sha256="0812m19kfscb0d23rv0llziapd269r7zlm2yq8h3yp8c8jl8gdb1"; depends=[]; };
 lineup = derive { name="lineup"; version="0.34-1"; sha256="0p6gxbv8xdrhgk8zdlnqrybald9vqz717czb49b123h84rjr2f19"; depends=[class qtl]; };
-linkR = derive { name="linkR"; version="1.0.0"; sha256="1l936i74h1s42w1d7nn220rjygc6n0jkjidvix1df2wlacnswzpg"; depends=[svgViewR]; };
+linkR = derive { name="linkR"; version="1.0.1"; sha256="0ayscl0i4flh31l5j8730h5lpqi30p8f2l3nvbd3i2mhp54gpcdx"; depends=[svgViewR]; };
 linkcomm = derive { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[dynamicTreeCut igraph RColorBrewer]; };
 linkim = derive { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; };
 linprog = derive { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; };
@@ -4355,7 +4363,7 @@ lllcrc = derive { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhysc
 lm_beta = derive { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; };
 lm_br = derive { name="lm.br"; version="2.6"; sha256="1f7cxd6ksspgpz2lnppyb466lgis5isk0bj8z4bjiwk4abg4lg3i"; depends=[Rcpp]; };
 lmSupport = derive { name="lmSupport"; version="2.9.2"; sha256="0mdl5ih7zzxynawxx4prh08nq451x74bfw4ga7cygl2ahi6vqq50"; depends=[AICcmodavg car gvlma lme4 pbkrtest psych]; };
-lme4 = derive { name="lme4"; version="1.1-7"; sha256="0v9vl9rspakyw2dmcl5lbhv1nlg10yhgdvi3gpfnizln7xw9ksyp"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; };
+lme4 = derive { name="lme4"; version="1.1-8"; sha256="0ag9rhdb7q3rsmd8qc7iq88cc0lbmkng2q0pfvdp9cg6lczi0zr0"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; };
 lmeNB = derive { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; };
 lmeNBBayes = derive { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; };
 lmeSplines = derive { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; };
@@ -4366,7 +4374,6 @@ lmerTest = derive { name="lmerTest"; version="2.0-25"; sha256="13psyrll5srxahyk4
 lmf = derive { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; };
 lmfor = derive { name="lmfor"; version="1.1"; sha256="0bbcgpcx0xjla128w80xlxp6i6hnrk4wjwqih66zvyjaf5sz7wx9"; depends=[MASS nlme]; };
 lmm = derive { name="lmm"; version="1.0"; sha256="0x5ikb1db99dsn476mf4253dlznlxa1cwnykg1nwnm2vy5qym2fq"; depends=[]; };
-lmmfit = derive { name="lmmfit"; version="1.0"; sha256="06mzmx7md7qw5mfhgdljc7i40sx9yrx7j57xbbp3fhl2zs1dpb4g"; depends=[MASS nlme]; };
 lmmlasso = derive { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; };
 lmmot = derive { name="lmmot"; version="0.1.2"; sha256="1c7cn1g1fl8nwjzm78a8qgw9da170f1q0z5vxl446f167ix5ppkp"; depends=[MASS maxLik]; };
 lmms = derive { name="lmms"; version="1.2"; sha256="12wli7iwnihq42pa1jy1ml4y3l93grwrv9n7vpgp5wp1hj4d1s8c"; depends=[gdata ggplot2 gplots lmeSplines nlme reshape]; };
@@ -4388,24 +4395,26 @@ log4r = derive { name="log4r"; version="0.2"; sha256="07q8m7z2sxm6n25a62invf76qa
 logbin = derive { name="logbin"; version="1.2"; sha256="1jfkg5rx51hm2skwwafqiw6ajdijdm0cniral3j5flidinsbsbcm"; depends=[glm2]; };
 logconPH = derive { name="logconPH"; version="1.5"; sha256="05fkibgh5nzs8c4f39kzg4zyh2dfhg1k69hlx7l8p442snajsg92"; depends=[]; };
 logconcens = derive { name="logconcens"; version="0.16-4"; sha256="11bk03kjlb747g54axmb0nayz226g41xvanbw79aij76vjbglv7y"; depends=[]; };
-logcondens = derive { name="logcondens"; version="2.1.3"; sha256="0fg7dsila67k80kbh1m1l69pb0pwwr893lkian7a8abx3a1qclij"; depends=[ks]; };
+logcondens = derive { name="logcondens"; version="2.1.4"; sha256="0y1x0bvalrhrl329l9a0mssc8kc060ml2hgz18qyw3chd24x3dmz"; depends=[ks]; };
 logcondens_mode = derive { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[distr logcondens]; };
-logcondiscr = derive { name="logcondiscr"; version="1.0.5"; sha256="170rg4rqch0mlhmc1zc59h271b57y3xfxrc3gh9pwvc9r11gw7k5"; depends=[cobs Matrix mvtnorm]; };
+logcondiscr = derive { name="logcondiscr"; version="1.0.6"; sha256="08wwxsrpflwbzgs6vb3r0f52hscxz1f4q0xabr1yqns06gir1kxd"; depends=[cobs Matrix mvtnorm]; };
 logging = derive { name="logging"; version="0.7-103"; sha256="1sp7q217awizb6l8c9p5dix6skpq8j7w8i088x4mm0fc0qr1ba5c"; depends=[]; };
 logistf = derive { name="logistf"; version="1.21"; sha256="0cwbmd0mvj4wywpx7p4lhs70nhab7bfl6fzz2c4snn3ma6sy7x8c"; depends=[mgcv mice]; };
 logitchoice = derive { name="logitchoice"; version="0.9.4"; sha256="1vkw7cwp7nwrsj9ifn4gz21zbw9da5rph9lr3w466zxkzdkbldqj"; depends=[]; };
 logitnorm = derive { name="logitnorm"; version="0.8.29"; sha256="0wbdxh3n44nzb6c0ahyd8gndfql1y56fns2bkmzqi3nxy9blhx18"; depends=[]; };
 loglognorm = derive { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; };
 logmult = derive { name="logmult"; version="0.6.2"; sha256="0i6sabg56x52aw5n7i61ick4n0hsbs28iagyzp0nvd2qrvz8p9ma"; depends=[gnm qvcalc]; };
-logspline = derive { name="logspline"; version="2.1.5"; sha256="18hpzcg71v3zjzp92whgxgn7w87cadgxr65pp7nv6m5pvj130i3p"; depends=[]; };
+logspline = derive { name="logspline"; version="2.1.8"; sha256="1y0vdrvk8bmqm4rpfr90cdw0y4sk8xgr73g1nwbcjffz10m7qmz4"; depends=[]; };
 lokern = derive { name="lokern"; version="1.1-6"; sha256="0iixxs23zsb0qadppcwmwf6vbxcjnm8zmwyz1xkkmhrpp06sa3jw"; depends=[sfsmisc]; };
 lomb = derive { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; };
 longCatEDA = derive { name="longCatEDA"; version="0.17"; sha256="1yb0117ycj4079590mrx3lg9m5k7xd1dhb779r3rmnww94pmvja9"; depends=[]; };
 longclust = derive { name="longclust"; version="1.2"; sha256="1m270fyvfz0w19p9xdv7ihy19nhrhjq2akymbp774073crznmmw0"; depends=[]; };
-longitudinal = derive { name="longitudinal"; version="1.1.11"; sha256="0rzi177v9k6gy1wv06vf81r1q0ml81ssf83v0z8rpmx5j91d71ac"; depends=[corpcor]; };
+longitudinal = derive { name="longitudinal"; version="1.1.12"; sha256="1d83ws28nxi3kw5lgd5n5y7865djq7ky72fw3ddi1fkkhg1r9y6l"; depends=[corpcor]; };
 longitudinalData = derive { name="longitudinalData"; version="2.3"; sha256="0ld2saga04if2zp3ylz720q8451f7a7aiva5hpj471wxd0948592"; depends=[class clv misc3d rgl]; };
 longmemo = derive { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; };
 longpower = derive { name="longpower"; version="1.0-11"; sha256="1l1icy653d67wlvigcya8glhqh2746cr1vh1khx36qjhfjz6wgyf"; depends=[lme4 Matrix nlme]; };
+longurl = derive { name="longurl"; version="0.1.0"; sha256="1iz25m583gmzl8rkrrikydm3a8g67whzxp9lwysrjpnpqsly82vz"; depends=[dplyr httr pbapply]; };
+loo = derive { name="loo"; version="0.1.0"; sha256="1j471ihvqkc4f7l2aaw9k50qg80617njg72wiavbqmw8skp1gs2a"; depends=[matrixStats]; };
 loop = derive { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; };
 loopr = derive { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[dplyr lazyeval magrittr plyr R6]; };
 lordif = derive { name="lordif"; version="0.2-2"; sha256="0898k5w9wky318k8x0zknjqdzdify0yyrnb1506j341l4n1bm04s"; depends=[Hmisc ltm MASS msm mvtnorm polycor rms sfsmisc]; };
@@ -4437,7 +4446,7 @@ ltsbase = derive { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jf
 ltsk = derive { name="ltsk"; version="1.0.3"; sha256="17l4mwggd4s39l6x1b6gvwgd6gjl0h37wfis1i6l9k6hiaqhb6vr"; depends=[fields]; };
 lubridate = derive { name="lubridate"; version="1.3.3"; sha256="1f07z3f90vbghsarwjzn2nj6qz8qyfkqalszx8cb5kliijdkwy8z"; depends=[memoise plyr stringr]; };
 luca = derive { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[genetics survival]; };
-lucid = derive { name="lucid"; version="1.2"; sha256="1rvc5d7sb0bcncw79g13i1rxjicngbpln9hq0qfdi7yx9hhrdpnz"; depends=[nlme]; };
+lucid = derive { name="lucid"; version="1.3"; sha256="018vp4xibxr7aanffcvhmppsh7vjsjrqqc41iavyasjbamj3hyck"; depends=[nlme]; };
 lunar = derive { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; };
 lvm4net = derive { name="lvm4net"; version="0.2"; sha256="0al0answp3rngq69bl3ch6ylil22wdp1c047yi5gbga853p7db0c"; depends=[ellipse ergm igraph MASS network]; };
 lxb = derive { name="lxb"; version="1.3"; sha256="0mvjk0s9bzvznjy0cxjsqv28f6jjzvr713b2346ym4cm0y4l3mir"; depends=[]; };
@@ -4450,7 +4459,7 @@ mQTL = derive { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf
 mRMRe = derive { name="mRMRe"; version="2.0.5"; sha256="1lhpamjy8dbk3lzjj0wj041cg99rw6925i9fq297c93jxq562414"; depends=[igraph survival]; };
 mRm = derive { name="mRm"; version="1.1.5"; sha256="0sbpk7z4ij917nw8wyvnm87iav95ybqrzvmsjy3r8nyq55bjzyn7"; depends=[]; };
 maRketSim = derive { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcqgxqkw805s4mr6qp89blgpmpxy8gdrbfj93m4"; depends=[]; };
-maSAE = derive { name="maSAE"; version="0.1-2"; sha256="18a1zbfmjhrmi3fgqd7vaicpsca59kp8r1003pwl7l4032p32fxk"; depends=[]; };
+maSAE = derive { name="maSAE"; version="0.1-3"; sha256="1im837kdmpgk1073iqgqz194b1i005i88w7wl50hdgw07hizlk18"; depends=[]; };
 maboost = derive { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[C50 rpart]; };
 mada = derive { name="mada"; version="0.5.7"; sha256="0a2m1rb4d143v9732392xzvbg6x1k3l0g3zscgbx64m21kxshmgb"; depends=[ellipse mvmeta mvtnorm]; };
 mads = derive { name="mads"; version="0.1.2"; sha256="1hbanfa1wnfvfs0g8dcf5z4439v0pp3rqhxahiis03jlfxzgd841"; depends=[mrds]; };
@@ -4463,13 +4472,13 @@ mailR = derive { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslp
 makeProject = derive { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; };
 mallet = derive { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; };
 managelocalrepo = derive { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; };
-manifestoR = derive { name="manifestoR"; version="1.0-1"; sha256="1008bz2vsmhx0sx6kc55z8dhlfinbadagz4hd0p50c4q86ibl7lh"; depends=[dplyr functional httr jsonlite NLP psych tm zoo]; };
+manifestoR = derive { name="manifestoR"; version="1.0-3"; sha256="0p048ly4rkz08952s6d9cxwvxghba0g5xwx4v04kvjw3p8v9b7cq"; depends=[dplyr functional httr jsonlite NLP psych tm zoo]; };
 manipulate = derive { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; };
 mapDK = derive { name="mapDK"; version="0.3.0"; sha256="03ksg47caxx3y97p3nsflwpc7i788jw874cixr9gjz756avwkmwp"; depends=[ggplot2 stringi]; };
 mapStats = derive { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; };
 mapdata = derive { name="mapdata"; version="2.2-3"; sha256="1fhj34cgq6rniy0339qv2ghbs0aiq38h9jfwx7szb83yj37v7wm6"; depends=[maps]; };
 mapfit = derive { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; };
-mapmisc = derive { name="mapmisc"; version="1.2.4"; sha256="07h237sgsycagn61rharb09q9s8da777hzngh4py1sbv6gfyqpv8"; depends=[raster sp]; };
+mapmisc = derive { name="mapmisc"; version="1.3.1"; sha256="0ijxy42k5j85mz2pm0g8fs0fliy0pjkfd2jmisfxgrn1h4sz2d3p"; depends=[raster sp]; };
 mapplots = derive { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; };
 mapproj = derive { name="mapproj"; version="1.2-2"; sha256="1fdb72hvcp6jm7rhvs8zdkya6ifs92lfqnmq5vj5amwckkxfidc6"; depends=[maps]; };
 maps = derive { name="maps"; version="2.3-9"; sha256="1gzy81sl4vpr4hsnh4jsp5rd26jdkzsw99qxwfmbadjyf55q06wv"; depends=[]; };
@@ -4481,24 +4490,25 @@ marelac = derive { name="marelac"; version="2.1.4"; sha256="0mm1rmaxrbhk6r9z62ns
 marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; };
 markdown = derive { name="markdown"; version="0.7.7"; sha256="00j1hlib3il50azs2vlcyhi0bjpx1r50mxr9w9dl5g1bwjjc71hb"; depends=[mime]; };
 marked = derive { name="marked"; version="1.1.8"; sha256="1xsg0iy8mcy9b98bxmjr3y413xwblbhks3fcydbvjnry0k03gd5i"; depends=[coda expm ggplot2 lme4 Matrix numDeriv optimx plyr R2admb Rcpp truncnorm]; };
-markovchain = derive { name="markovchain"; version="0.3"; sha256="176cdp99a1d2n8awzpx1mhlvqqp8wc7x37ha03pdsd8hmsb05m5g"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
+markophylo = derive { name="markophylo"; version="1.0.1"; sha256="17lzmjb34ky0y5hjijfxhxnry0b3vrmfs0q9iyd293wngmjs6r0s"; depends=[Rcpp RcppArmadillo]; };
+markovchain = derive { name="markovchain"; version="0.3.1"; sha256="067rib4sxcqq8wwf139x6k4b37caw1wslv0lbss9nzwhv50bxgvd"; depends=[expm igraph matlab Matrix MultinomialCI Rcpp RcppArmadillo RcppParallel]; };
 marl = derive { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; };
 marmap = derive { name="marmap"; version="0.9.2"; sha256="1csi6v6z2p3nmyqwy8bmbj036693rzmxrc317g0a45gsqxggp3n4"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf plotrix raster reshape2 RSQLite shape sp]; };
 marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
 matR = derive { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[BIOM_utils MGRASTer]; };
-matchingMarkets = derive { name="matchingMarkets"; version="0.1-4"; sha256="096yknmzla2qq2vkaxna5f8mclayjn5baff3cm8ik95zy7j3lrjp"; depends=[lpSolve partitions Rcpp RcppArmadillo RcppProgress]; };
+matchingMarkets = derive { name="matchingMarkets"; version="0.1-5"; sha256="09nybpws50mpbnbsv8796hdxy894fld89xjs4q1yx0km180yrhww"; depends=[lpSolve partitions Rcpp RcppArmadillo RcppProgress]; };
 matchingR = derive { name="matchingR"; version="1.0.1"; sha256="0qqk2zcyj0m3r9q0lclb39gdrjqqjlaxvk3cxpfah7hxhhkrk4mc"; depends=[Rcpp RcppArmadillo]; };
 mathgraph = derive { name="mathgraph"; version="0.9-11"; sha256="0xikgzn24p0qqlrmaydmjk5yz5pq2rilsvpx86n3p2k2fc3wpwjy"; depends=[]; };
 matie = derive { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[cba dfoptim gplots igraph mvtnorm seriation]; };
 matlab = derive { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; };
 matpow = derive { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; };
-matrixStats = derive { name="matrixStats"; version="0.14.0"; sha256="1glm3h6d4c6bl3svnfk6fyj59linfc7s6fyrs0nlcwizs4371nis"; depends=[]; };
+matrixStats = derive { name="matrixStats"; version="0.14.2"; sha256="1lxm6wlxav5vrzi4n8f5kky8nrbfhpvcdf15qrz83br18yl06bqj"; depends=[]; };
 matrixcalc = derive { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; };
 matrixpls = derive { name="matrixpls"; version="0.5.0"; sha256="0r1qpfbvaq24d30ck5c5zwsss4rqhl12g3hhmij3cn55hmv26azq"; depends=[assertive lavaan MASS matrixcalc psych]; };
 maxLik = derive { name="maxLik"; version="1.2-4"; sha256="1b2qr16s2w76nxqdlq3hflpg0sjnn8mlzas7082y8xpxw3cknpdz"; depends=[miscTools sandwich]; };
 maxent = derive { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[Rcpp SparseM tm]; };
 maxlike = derive { name="maxlike"; version="0.1-5"; sha256="0h544wr7qsyb70vmbk648hfyb6arrsb41gw39svcin412rhw9k9j"; depends=[raster]; };
-maxstat = derive { name="maxstat"; version="0.7-22"; sha256="0fgpc5y3c5cidy7hxil10hxzdjxfmag2pp2ksh02z9smb8m0sdqb"; depends=[exactRankTests mvtnorm]; };
+maxstat = derive { name="maxstat"; version="0.7-23"; sha256="1dp2gp0zsf3l5vd43ixxx7039ybcw84x9zf526pk1p2j7pxwsbay"; depends=[exactRankTests mvtnorm]; };
 mbbefd = derive { name="mbbefd"; version="0.7"; sha256="0l8dq1j1ky83jl1cka0mrjcf7rcby36jkp0zn7wmpnxjrmdrixgb"; depends=[actuar gsl Rcpp]; };
 mbest = derive { name="mbest"; version="0.3"; sha256="0j6v6c1s11gvzwcnj5dnd9anj11hpmy7c83c8ribb7lx75mwj4k4"; depends=[lme4]; };
 mblm = derive { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; };
@@ -4515,7 +4525,7 @@ mcgibbsit = derive { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh469
 mcheatmaps = derive { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; };
 mcll = derive { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; };
 mclogit = derive { name="mclogit"; version="0.3-1"; sha256="0zyms6v9qjh6a5ccahfanarp4sg49yingb8wpjcz61skqvm8j7qx"; depends=[Matrix]; };
-mclust = derive { name="mclust"; version="5.0.1"; sha256="10h8y4a0v1vq01v8i92yr3dcxfq74xsm44nh0ldh1a4d6j270zyp"; depends=[]; };
+mclust = derive { name="mclust"; version="5.0.2"; sha256="1ilhgiigrnvw5l85vk54xdvlirqhp5wb404i0mh2jyzccr9pjml5"; depends=[]; };
 mcmc = derive { name="mcmc"; version="0.9-3"; sha256="148l28nb1qv82x2hj46c26yhn0lw8x5jsrp2dav9sbysv1bdj2f8"; depends=[]; };
 mcmcplots = derive { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda colorspace denstrip sfsmisc]; };
 mcmcse = derive { name="mcmcse"; version="1.0-1"; sha256="1jn5hl6aw83qmwccyfmcsvcymx9cp4d3qnfzzqvlw22x26rx88r6"; depends=[]; };
@@ -4531,8 +4541,8 @@ mdsdt = derive { name="mdsdt"; version="1.0"; sha256="0ngf2p6lm32124qyfh18zlgf0d
 measuRing = derive { name="measuRing"; version="0.3"; sha256="16lgvk9lm0vjy50das0qq0h0z683hh94spjcdmkljmxxzwmzfl4b"; depends=[pastecs png tiff]; };
 meboot = derive { name="meboot"; version="1.4-6"; sha256="17wjvc375vnya1lhkj10nsn68k1j3zy036031qca3wxx6wqw9kzx"; depends=[dynlm nlme]; };
 medSTC = derive { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; };
-mederrRank = derive { name="mederrRank"; version="0.0.7"; sha256="08jbqmb418qb7v2x6lm4wig1pfzzfx6fhb49mbfhlkbmssbqsjfq"; depends=[BB numDeriv]; };
-medflex = derive { name="medflex"; version="0.5-0"; sha256="06zp0la99ly2vpm97l3qm289inyd0bxgkjd4cv15mvc47w9c9x9x"; depends=[boot Matrix multcomp sandwich]; };
+mederrRank = derive { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; };
+medflex = derive { name="medflex"; version="0.5-1"; sha256="0ljqg7bf2zicyc1qbr5d6lvsdppilmsqv6blrdg2vf1zyz3xyfxx"; depends=[boot Matrix multcomp sandwich]; };
 mediation = derive { name="mediation"; version="4.4.4"; sha256="00w4c51v0xvc8pfpxqn73l8r2j12sv1wf5kj3yjq8g08dgzynham"; depends=[Hmisc lpSolve MASS Matrix mvtnorm sandwich]; };
 medicalrisk = derive { name="medicalrisk"; version="1.1"; sha256="1fb8zp426zcqsnb35sgywnz44lpssa1acfa2aha9bnvyazif3s90"; depends=[hash plyr reshape2]; };
 mefa = derive { name="mefa"; version="3.2-5"; sha256="037vpnwclyj6xgycznh6g6qlirlgy3sjnkjqb1046q80b5ywv2ni"; depends=[]; };
@@ -4543,11 +4553,10 @@ mem = derive { name="mem"; version="1.4"; sha256="1d3fgllh7fhlfz3rz2jm31r8vn7msz
 memgene = derive { name="memgene"; version="1.0"; sha256="00b1mi2hvzzps542mh2p96s27kjqkpcic7djklfcwnfn1m4bz0i5"; depends=[ade4 gdistance raster vegan]; };
 memisc = derive { name="memisc"; version="0.97"; sha256="069siqkw7ll9n1crsl3yjhybwz0w52576q504cylpvlxx3jm9hfs"; depends=[lattice MASS]; };
 memoise = derive { name="memoise"; version="0.2.1"; sha256="19wm4b3kq6xva43kga3xydnl7ybl5mq7b4y2fczgzzjz63jd75y4"; depends=[digest]; };
-memuse = derive { name="memuse"; version="1.1"; sha256="1i6l3d885b4v01hlkl50m401bwi7akydhh52gf4kya5khanb8n2b"; depends=[]; };
-merror = derive { name="merror"; version="2.0.1"; sha256="09v62f7ycywasid3b7x52dhidplwdbx9fd0855b40jklfy469bkn"; depends=[]; };
+memuse = derive { name="memuse"; version="2.5"; sha256="1a34803k41644yw1h3msywslsfjvnxi5c9yjw0b73znzy76wh6wv"; depends=[]; };
 metRology = derive { name="metRology"; version="0.9-17"; sha256="1g4gv3mpii71i6imfwqg9d5iwfx03bq4lizzhx7dy39b2mj7jd4q"; depends=[MASS numDeriv]; };
-meta = derive { name="meta"; version="4.2-0"; sha256="1cbrgy3ry70l52da02vx2qflxhnqw7kmy6r10d9wzhmc1gf85snp"; depends=[]; };
-metaLik = derive { name="metaLik"; version="0.41.0"; sha256="08wiriq6cm02d0b0q34056y5249daidpjzkwzgjq6dh55v5fp2s4"; depends=[]; };
+meta = derive { name="meta"; version="4.3-0"; sha256="1dxgixvnpzhvivqgzk85x6541ayfhl2wcil4sp95q5ca9hi4wz0z"; depends=[]; };
+metaLik = derive { name="metaLik"; version="0.42.0"; sha256="1rk5mwgmgnqq2hrzbh936hzw3aa815l12r1a1qywap5ggmmyhszl"; depends=[]; };
 metaMA = derive { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[limma SMVar]; };
 metaMix = derive { name="metaMix"; version="0.2"; sha256="0xlsdgincxwjzyr4i8qfmfw2wvgf41qbmyhf2rxcbarf7rmwhmqf"; depends=[data_table ggplot2 gtools Matrix Rmpi]; };
 metaRNASeq = derive { name="metaRNASeq"; version="1.0.2"; sha256="1xz7df7ypq4326yg429pgxd6aldp14c3h3qi20j5nqr5xgsdgzqa"; depends=[]; };
@@ -4561,9 +4570,10 @@ metagear = derive { name="metagear"; version="0.1"; sha256="1c00y7p7063f3c1ar17r
 metagen = derive { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[BatchExperiments BatchJobs BBmisc ggplot2 lhs MASS metafor ParamHelpers plyr]; };
 metamisc = derive { name="metamisc"; version="0.1.1"; sha256="1cvlsix3b857xdw6anqhqsrfwxpnf4rbzg4ybf6aw7vcdc05zgwd"; depends=[bbmle coda ellipse mvtnorm rjags]; };
 metap = derive { name="metap"; version="0.6"; sha256="1iy5cmwrlsr70z0qnqn30n15knsfclg383815a2a8yqpg5gs4953"; depends=[]; };
-metaplus = derive { name="metaplus"; version="0.7-2"; sha256="1d9528z78vmkmv67s29g87kfdwydfwx4cnbcdmd0kq8rch9zjk07"; depends=[bbmle boot lme4 MASS metafor numDeriv]; };
+metaplus = derive { name="metaplus"; version="0.7-4"; sha256="0pqlx7s3gvi2zjgv8cfxdk1n1p4gm8788w5r3smfmxykbk1hfwa8"; depends=[bbmle boot lme4 MASS metafor numDeriv]; };
 metasens = derive { name="metasens"; version="0.2-0"; sha256="13mncikxzg8cnpbw78ird1xkrjlivmjibhrk700vdx1hygzwi6x0"; depends=[meta]; };
 metatest = derive { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; };
+meteo = derive { name="meteo"; version="0.1-4"; sha256="17zspzxfj0jz19lqcxd04dh3sdi32k93dxlc4w5jgfdgy9wfq1c6"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; };
 meteoForecast = derive { name="meteoForecast"; version="0.45"; sha256="0p74w5zcibzw2vpbyl4jb2wzpz0pki1n1l66hjs6dnkrn52zph95"; depends=[ncdf raster sp zoo]; };
 meteogRam = derive { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; };
 metricsgraphics = derive { name="metricsgraphics"; version="0.8.5"; sha256="05rjx19qzf2r2hxf8y490xd29n3qy40rp38s2ni989m1p0bzc6c9"; depends=[htmltools htmlwidgets magrittr]; };
@@ -4592,7 +4602,7 @@ micromap = derive { name="micromap"; version="1.9.2"; sha256="1x4v0ibbpfz471dp46
 micromapST = derive { name="micromapST"; version="1.0.5"; sha256="1n9mzyl5dj21165j0j99brkqq7c54j3cg6r21ifdzffj2dx29wh0"; depends=[RColorBrewer]; };
 micropan = derive { name="micropan"; version="1.0"; sha256="0qnxm6z2pk1wibchj6rhn3hld77dzl5qgvzl4v9n16ywlgdv09ai"; depends=[igraph]; };
 midasr = derive { name="midasr"; version="0.4"; sha256="190qliv7v80rr3jh9yvchwl3ch7nf5b8p90iywp8qkaav5r8rcdy"; depends=[forecast MASS Matrix numDeriv optimx sandwich]; };
-migest = derive { name="migest"; version="1.6"; sha256="1mjjcba74nk10kdbsaphih3zdyaqmf02hrv13s34klwdwkp3nv0m"; depends=[]; };
+migest = derive { name="migest"; version="1.7"; sha256="13yzdkikxy0mq60zjbc4wq69ja7dps10bwxzsp8v3awr1r75zpaz"; depends=[]; };
 migration_indices = derive { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; };
 migui = derive { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[arm gWidgets2 mi]; };
 mime = derive { name="mime"; version="0.3"; sha256="1i9f9z88cahvb5whdgmp0ipk0b9glk0xn8ik519vzpydnn1slvxk"; depends=[]; };
@@ -4614,13 +4624,14 @@ miscF = derive { name="miscF"; version="0.1-2"; sha256="195rb9acdirfhap0z35yvcci
 miscFuncs = derive { name="miscFuncs"; version="1.2-7"; sha256="1cnhd23fi6akr3fsr2b85s5cn36ksy4h3c4iyyjqcpc49wa819d0"; depends=[mvtnorm roxygen2]; };
 miscTools = derive { name="miscTools"; version="0.6-16"; sha256="19mslb64lm8srrmml1v40rfkxhqw02bplw0yjv7qnkqj44hcqfw1"; depends=[]; };
 miscset = derive { name="miscset"; version="0.4"; sha256="04cl8a2chcynfn5rljqw2ll4ry0wqaslqgjh9ny8ax3hcvyvmmwl"; depends=[data_table gridExtra Rcpp xtable]; };
+missDeaths = derive { name="missDeaths"; version="1.0"; sha256="15r25rdp8idpj9b5g8cwg729r48cwgmbgj78kgcf0laky9ld2n6r"; depends=[mitools Rcpp relsurv rms survival]; };
 missForest = derive { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; };
-missMDA = derive { name="missMDA"; version="1.7.3"; sha256="1wg4rgziw2f8asdxi2a5dx1mn4z0sd1lf9a8fp7dg29bnv82brmh"; depends=[FactoMineR]; };
+missMDA = derive { name="missMDA"; version="1.8.2"; sha256="0rb48psaffvlp3i2d1xv9fk949gpnck85v4ysfzw203r2r4rdhmm"; depends=[FactoMineR]; };
 mistat = derive { name="mistat"; version="1.0-3"; sha256="12fykqkcqfxn8m8wwpw69f7h2f24c5yhg4fw50jsifhcj40kk29q"; depends=[]; };
 mistral = derive { name="mistral"; version="1.1-1"; sha256="19zkc5ddjzw17y70x3l6maljsfvg0295xyzx7kavmjrws74jx4rc"; depends=[DiceKriging e1071 kernlab Matrix mvtnorm rgenoud]; };
 mitml = derive { name="mitml"; version="0.2-2"; sha256="11pgwa1cxf1i2qkm8gyzxsjkhg40r75gk2k1lwaqpqgi7vs3drbs"; depends=[haven pan]; };
 mitools = derive { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; };
-mix = derive { name="mix"; version="1.0-8"; sha256="0wlp6wkn8dwwnjfq3qzk0hjb3xsjh5ld5zxbd6nf12awpkwa1j9y"; depends=[]; };
+mix = derive { name="mix"; version="1.0-9"; sha256="08729y6ih3yixcc4a6m8fszg6pjc0s02iq47339b9gj16p82b74z"; depends=[]; };
 mixAK = derive { name="mixAK"; version="4.0-5"; sha256="1kdcia6j2dw4q1rbrswx9h8ivzrnw8hrg5a206jykmsdbngbifx5"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
 mixOmics = derive { name="mixOmics"; version="5.0-4"; sha256="020cy0x7qf6x7lb1aqfr6qflf08k2phnygcjr7lq4z8q9v502qyh"; depends=[igraph lattice MASS pheatmap RGCCA rgl]; };
 mixPHM = derive { name="mixPHM"; version="0.7-1"; sha256="0v75xv06m40jqq0c4y1gvdrmyddxs814djbpyq61fv8cn22fn7wx"; depends=[lattice survival]; };
@@ -4642,13 +4653,13 @@ mixtox = derive { name="mixtox"; version="1.0"; sha256="059vjrz9isyrdqk2ij4b11da
 mixture = derive { name="mixture"; version="1.4"; sha256="0k9pzcgfjyp0rmcma26kr2n8rcwmijznmdpvqidgl3jay20c87ca"; depends=[]; };
 mizer = derive { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[ggplot2 plyr reshape2]; };
 mkde = derive { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; };
-mkin = derive { name="mkin"; version="0.9-35"; sha256="0ac71wkl8b034l1bbv8qr5ynvpl8l9j31ych5v5pf6mmqs62bwnr"; depends=[deSolve FME minpack_lm rootSolve]; };
+mkin = derive { name="mkin"; version="0.9-39"; sha256="14yya9fkslk9vplszdxxfa2q1di42nnly67irpl5ry4sgl21nnfp"; depends=[deSolve FME inline minpack_lm rootSolve]; };
 mkssd = derive { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; };
 mlDNA = derive { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[e1071 igraph pROC randomForest ROCR rsgcc snowfall]; };
 mlPhaser = derive { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; };
 mlVAR = derive { name="mlVAR"; version="0.1.0"; sha256="0xychak3xdqnsl9z1ifi0niqsrdc10f6frl6zg162mzpil33wp3g"; depends=[arm lme4 plyr qgraph]; };
 mlbench = derive { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; };
-mldr = derive { name="mldr"; version="0.1.70"; sha256="08yiglqzlqxlfrxd7l12x59h7a38skrkkf8w7jh620ab7a7w1gyg"; depends=[circlize shiny XML]; };
+mldr = derive { name="mldr"; version="0.2.25"; sha256="0rwh7gs5qw08x1bx03156qf8bav3yacwi0vzz4yk722gd0wzi88j"; depends=[circlize shiny XML]; };
 mlearning = derive { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class e1071 ipred MASS nnet randomForest]; };
 mlegp = derive { name="mlegp"; version="3.1.4"; sha256="1932544irhzhf6a8rjyh66j57h9awlhwd6xam603bamfg106cmg2"; depends=[]; };
 mleur = derive { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; };
@@ -4677,9 +4688,10 @@ mnlogit = derive { name="mnlogit"; version="1.2.2"; sha256="01wvlmkf9ddcmsb8pw08
 mnormpow = derive { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; };
 mnormt = derive { name="mnormt"; version="1.5-3"; sha256="1mw5fk4q5cnj2x2938di58179fr51l396qd61i6y5vwmcccj0kn9"; depends=[]; };
 modMax = derive { name="modMax"; version="1.0"; sha256="0p8vnlbw53lqbaq3819jhixq6ns2lwxf56w2md7y98rshf92h474"; depends=[gtools igraph]; };
+modQR = derive { name="modQR"; version="0.1.0"; sha256="0k9rqwi0amq8cln1a6i58xb19cpkjq0qca4vsgq1r2x1370hf9fq"; depends=[geometry lpSolve]; };
 modTempEff = derive { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; };
 modeest = derive { name="modeest"; version="2.1"; sha256="0l4y7yhkgsxycdd2lck0g8g6k2r059hwlrrcpl46md3rva4jgbnp"; depends=[]; };
-modehunt = derive { name="modehunt"; version="1.0.6"; sha256="15rq1yyrjhsn2rlkyiqj36jvji635hy6jsih845mfxdpn4vnssa3"; depends=[]; };
+modehunt = derive { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; };
 modelObj = derive { name="modelObj"; version="1.0"; sha256="0r4smak9hni9pzih4nzkpv3bq18acrsmmxs1a13wq3pgjfvkwa63"; depends=[]; };
 modelfree = derive { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; };
 modeltools = derive { name="modeltools"; version="0.2-21"; sha256="0ynds453xprxv0jqqzi3blnv5w6vrdww9pvd1sq4lrr5ar3k3cq7"; depends=[]; };
@@ -4703,10 +4715,10 @@ morse = derive { name="morse"; version="1.0.2"; sha256="044aljv48mfq6yj9i77yqf03
 mosaic = derive { name="mosaic"; version="0.10.0"; sha256="0hhln6kfxdk6z4rmi3378cs18ziwa5awi53ylnx5kva7f42m5jxr"; depends=[car dplyr ggdendro ggplot2 gridExtra lattice latticeExtra lazyeval MASS mosaicData plyr readr reshape2]; };
 mosaicData = derive { name="mosaicData"; version="0.9.1"; sha256="0gxnw3x806pm97x1043qq3qf1cwn1z1771cayp3xlh5khn5bijk7"; depends=[]; };
 moult = derive { name="moult"; version="1.4"; sha256="0nglf7wijp2v66fpyh88glbn1glp8vvkbvpc1g6136bg6ahbbkkl"; depends=[Formula Matrix]; };
-mountainplot = derive { name="mountainplot"; version="1.0"; sha256="1hjmzig0s4vjlkpqhvf4v6z2gd8ljy14z5n1m9y21is9yp2cy6xf"; depends=[lattice]; };
+mountainplot = derive { name="mountainplot"; version="1.1"; sha256="1l3m7jgq70g83mmfhlwzj5gkdnwgl14g9ljpk6j7z7qxapzva3bb"; depends=[lattice]; };
 mousetrack = derive { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; };
 movMF = derive { name="movMF"; version="0.2-0"; sha256="1p9ay7w93gyx4janw23iwg2j0wkvnvzalaa20n1rlahhmh327g7i"; depends=[clue skmeans slam]; };
-move = derive { name="move"; version="1.4.496"; sha256="0p20c6rqxk299pqd10icq4a59yn152jfnwh6sw48sg8cc9wp24k3"; depends=[geosphere raster rgdal sp]; };
+move = derive { name="move"; version="1.5.514"; sha256="18rf9d0xxs48l0bk9vvr2sxnm7rcr38cgar0y5xgmh8fdf6dsl65"; depends=[geosphere raster rgdal sp]; };
 mp = derive { name="mp"; version="0.2.0"; sha256="1vpjrx04yn1rdmrhj42rhc757cj02sghrv0i5jfm4k2y28ab7qh1"; depends=[Rcpp RcppArmadillo svd]; };
 mpMap = derive { name="mpMap"; version="1.14"; sha256="0gmhg5ps8yli8699a5aw26skfbjxx4zpp0paqxxdc0zl28l0pdff"; depends=[gdata qtl seriation wgaim]; };
 mpa = derive { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; };
@@ -4752,17 +4764,17 @@ multiAssetOptions = derive { name="multiAssetOptions"; version="0.1-1"; sha256="
 multiDimBio = derive { name="multiDimBio"; version="0.3.3"; sha256="1aj6yam31mr0abjb6m5m85r1w71snha4s7h4ikyw66sc73xkmb9m"; depends=[ggplot2 lme4 MASS misc3d pcaMethods RColorBrewer]; };
 multiPIM = derive { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; };
 multiband = derive { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl05zncvvig6hs4nl1h9wkrkc24rxx9risw9k9"; depends=[]; };
-multibiplotGUI = derive { name="multibiplotGUI"; version="0.0-1"; sha256="14zgn86zwwdchhr5dzqxxxsf0dy6kny4ixvd77y08454lni0a69r"; depends=[rgl RODBC tkrplot]; };
+multibiplotGUI = derive { name="multibiplotGUI"; version="1.0"; sha256="0ig7r4p8mq594cjwclbqwjk8saqkvjqjbbnnxj1hc1sdj7qdlcpf"; depends=[cluster dendroextras Matrix rgl shapes tcltk2 tkrplot]; };
 multic = derive { name="multic"; version="0.3.8.1"; sha256="06lc9kn0z3s7x00hz8vj903q0c6cncnj4v3ygvd2yvkgcbhfvjd0"; depends=[]; };
 multicon = derive { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[abind foreach mvtnorm psych sciplot]; };
 multicool = derive { name="multicool"; version="0.1-6"; sha256="0hzwxrcsz7dm4ilv8rpkcwi61ssym94ki8ayssfh2r2ghy9w9xlw"; depends=[Rcpp]; };
 multigroup = derive { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; };
 multilevel = derive { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[MASS nlme]; };
 multilevelPSA = derive { name="multilevelPSA"; version="1.2.2"; sha256="0z3qnv14sdkfvyw2wjrfz26r7sr7vv3rlr8n4gf99rwv6k34bdsg"; depends=[ggplot2 party plyr proto PSAgraphics psych reshape xtable]; };
-multimark = derive { name="multimark"; version="1.1.4"; sha256="045lfgzxwz4m1y5gny2y92cmix6wxi1sl486gajal2scfib31rgv"; depends=[Brobdingnag coda Matrix mvtnorm RMark statmod]; };
+multimark = derive { name="multimark"; version="1.2.0"; sha256="0gc8dla4npgf1g17k7cqphkm82lywh12zvc82ga5446w3ihpvllg"; depends=[Brobdingnag coda Matrix mvtnorm RMark statmod]; };
 multinbmod = derive { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
 multinomRob = derive { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; };
-multipleNCC = derive { name="multipleNCC"; version="1.0"; sha256="13z6yq77h1r6kp8wgza58c6yp9a1gqm0w36x534mxbhcmingdw9f"; depends=[gam survival]; };
+multipleNCC = derive { name="multipleNCC"; version="1.1"; sha256="134a8zm0xz2h9yclc9v2linx881gb3n5x51msifpnm641giamzfd"; depends=[mgcv survival]; };
 multiplex = derive { name="multiplex"; version="1.6"; sha256="052qjqkwf2sp4w7hv5gj9x3vhwjpa6k10sr969283z7aw6c1yb4g"; depends=[]; };
 multipol = derive { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; };
 multirich = derive { name="multirich"; version="2.0.2"; sha256="1lqc4np45p9ar9l8l1m5bdh98fsmhvzj8s0b2mcp9cqrvnhp1irc"; depends=[]; };
@@ -4820,16 +4832,16 @@ nFCA = derive { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w
 nFactors = derive { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[boot lattice MASS psych]; };
 nLTT = derive { name="nLTT"; version="1.1"; sha256="0hrrwil7vcym7zjbnzviw13p60y14w660vndvc2lm5lmhbb8nhcn"; depends=[ape coda deSolve]; };
 nabor = derive { name="nabor"; version="0.4.6"; sha256="0kd0h8n5yrn16vrfdchdiqzws05q0fm8z577p20dm18gdcs2vbxv"; depends=[BH Rcpp RcppEigen]; };
-nadiv = derive { name="nadiv"; version="2.13.3"; sha256="0ph05a1yvphij41fgm4gnvijqni29n4jx2my6s0pd9l67bwa56c8"; depends=[Matrix]; };
+nadiv = derive { name="nadiv"; version="2.14.0"; sha256="07wrzj5vkz7hgxmlpl4d39crs5bz1xylpq0w13r5w95rwnmn6jzm"; depends=[Matrix]; };
 namespace = derive { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
 nanop = derive { name="nanop"; version="2.0-5"; sha256="0zdn2hgp516hcqpc2w2vzhhalcr05dlw539zj3afzi75w8rwb71z"; depends=[distrEx rgl]; };
 nasaweather = derive { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; };
-nat = derive { name="nat"; version="1.6.6"; sha256="0jqpj9hrz8xqikl84b9nzi1hh82cmry18vpca7s8dl4824yadkrw"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; };
+nat = derive { name="nat"; version="1.7.0"; sha256="1bdkndj4klvm8i19sw60gpqhbdbsmxn3rrk0iyhd097k96qipkj6"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; };
 nat_nblast = derive { name="nat.nblast"; version="1.5"; sha256="1slpk126fwgn90j3aazlf3pw2ij050dghc1yqadv6mjcj82qpm5i"; depends=[dendroextras nabor nat plyr rgl spam]; };
-nat_templatebrains = derive { name="nat.templatebrains"; version="0.4.1"; sha256="06vqnrwcara4ljkf5wbwqbsfx1ypd8xsv8pbrs5x6hyj5jxnnvaz"; depends=[nat rgl]; };
-nat_utils = derive { name="nat.utils"; version="0.4.2"; sha256="0k5bdqwrbq82bb9ld90ia7b4vjaczba20h231a129rkszsy6sz9v"; depends=[]; };
+nat_templatebrains = derive { name="nat.templatebrains"; version="0.6"; sha256="1qhkpvfpzyzf9qcfdc2a53fqhlxqcrvbb08glwkxmjs49is3fy3k"; depends=[digest igraph nat rappdirs rgl]; };
+nat_utils = derive { name="nat.utils"; version="0.5.1"; sha256="12g87ar795xfbz7wljksb24x9hqvcirjr50y4mbpx1427r0l7clv"; depends=[]; };
 naturalsort = derive { name="naturalsort"; version="0.1.2"; sha256="0m8a8z0n5zmmgpmpn5w87j2jfsz1igz3x133z3q25h8jlyaxy750"; depends=[]; };
-nbconvertR = derive { name="nbconvertR"; version="1.0"; sha256="1yjsw5aq68ya4k1nl2n6q5d5z5yzqskgnpj3gms67ha3dhmz78jr"; depends=[]; };
+nbconvertR = derive { name="nbconvertR"; version="1.0.1"; sha256="1wj8kj7zs6ldy5jc1dh7r637hyllnqk4qns5q767s72zj35kq6s4"; depends=[]; };
 nbpMatching = derive { name="nbpMatching"; version="1.4.5"; sha256="1bglrzhap9rar6c8c2c5009l1ljq44mys66jpafw4xyw2pq7djqg"; depends=[Hmisc MASS]; };
 ncappc = derive { name="ncappc"; version="0.1"; sha256="1145y9k718245mzs8q33mjwcln79dmiyawy771zrk3kpxhfb5985"; depends=[ggplot2 gridExtra gtable knitr lattice PerformanceAnalytics reshape2 scales xtable]; };
 ncbit = derive { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; };
@@ -4850,10 +4862,10 @@ neotoma = derive { name="neotoma"; version="1.3.0"; sha256="0a5fmas441zl479vfndg
 nephro = derive { name="nephro"; version="1.1"; sha256="06lxkk67n5whgc78vrr7gxvnrz38pxlsj4plj02zv9fwlzbb9h6p"; depends=[]; };
 nestedRanksTest = derive { name="nestedRanksTest"; version="0.2"; sha256="0r08jp8036cz2dl1mjf4qvv5qdcvsrad3cwj88x31xx35c4dnjgj"; depends=[]; };
 netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[AnnotationDbi graph igraph kernlab Matrix ROCR samr]; };
-netassoc = derive { name="netassoc"; version="0.4.3"; sha256="153zgnmk9qjcxhfdy9g1fkgjx0vpyv55gmj4spk664igvw6kicf3"; depends=[igraph]; };
+netassoc = derive { name="netassoc"; version="0.4.7"; sha256="1i40njarcdddlclsizd7p9bvan70lc32d9a3qjgdp5bs6mm9l4kx"; depends=[igraph]; };
 netgen = derive { name="netgen"; version="1.1"; sha256="0wbsssskhih6fyb0xfpnd3sjp25z8h0jyy3437ykgh7g24hh0i1z"; depends=[BBmisc checkmate ggplot2 igraph lhs lpSolve mvtnorm stringr]; };
 netgsa = derive { name="netgsa"; version="2.0"; sha256="04id2wcrmi0lqvn4a8qhqkc3z076b8xd7jhw9hsmaz21g9cxdfx8"; depends=[corpcor cvTools glasso glmnet igraph]; };
-netmeta = derive { name="netmeta"; version="0.7-0"; sha256="0nsy817bj3fh4sz632pljyjn7jphg9w389hhdcyjvkb7i43c9v5c"; depends=[magic meta]; };
+netmeta = derive { name="netmeta"; version="0.8-0"; sha256="0qadg3h9aa3qx51hvqikzb5s087r5ihmp6ffxg5x1bmw86yfi2bq"; depends=[magic meta]; };
 nets = derive { name="nets"; version="0.1"; sha256="0zshiavdi1z8mq6q93vsyb5wx5nq37qln9gcyvamvi2pgy5xg4k2"; depends=[igraph]; };
 nettools = derive { name="nettools"; version="1.0.1"; sha256="13fw316r31g9cjlbyy9qfccsyagxb6pyvn5k32f166b7vj92mk1q"; depends=[combinat dtw igraph Matrix minerva minet rootSolve WGCNA]; };
 netweavers = derive { name="netweavers"; version="1.1"; sha256="0p8hb3m0lbkf0pw9vdhv94spdba432klpqgn07jvxfhfhmr8cyz0"; depends=[Biobase BiocGenerics igraph limma]; };
@@ -4868,7 +4880,7 @@ neuRosim = derive { name="neuRosim"; version="0.2-12"; sha256="1hsnw9xipdr74fydq
 neural = derive { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; };
 neuralnet = derive { name="neuralnet"; version="1.32"; sha256="0p9r5j8q0flv15wn5s6qi9if7npna107l1ffv37nzx1b4vgswnl9"; depends=[MASS]; };
 neuroblastoma = derive { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; };
-neuroim = derive { name="neuroim"; version="0.0.3"; sha256="0n5jkyvdaiigv51s5bb508w5xkh0qkd1zbs67nnms14s1664fhiz"; depends=[abind hash iterators Matrix stringr yaImpute]; };
+neuroim = derive { name="neuroim"; version="0.0.4"; sha256="1xz7695l5xpc28jdmpirk4f9s1d3zg5cxzhk89hknkl1wyxc15hx"; depends=[abind assertthat hash iterators Matrix Rcpp stringr yaImpute]; };
 ngram = derive { name="ngram"; version="1.1"; sha256="0p5wm55anch1i0y3478f5d4sivs7q8j3kwlg89nk3337win06499"; depends=[]; };
 ngramr = derive { name="ngramr"; version="1.4.5"; sha256="1cqapla0lknxl669w5x3av9nr4vy9qrfznznqj22xlqaj0p53c18"; depends=[ggplot2 httr plyr RCurl reshape2 rjson scales stringr]; };
 ngramrr = derive { name="ngramrr"; version="0.1.1"; sha256="1h12nm0dg2mkq5b2zn12cij24nl8inqn04m4jxdi1lr6r81y1wsq"; depends=[tau]; };
@@ -4876,10 +4888,9 @@ ngspatial = derive { name="ngspatial"; version="1.0-5"; sha256="0dd7gm6irq08054n
 nhlscrapr = derive { name="nhlscrapr"; version="1.8"; sha256="0y2shw3g84flh88a15czdsb62xwdqxhvzkn4kpbn0k9ddyfzxc48"; depends=[biglm bitops RCurl rjson]; };
 nice = derive { name="nice"; version="0.4"; sha256="1alq8n8pchn9v0fvwrifdisazkh519x109bqgnpgnwf79wblmnhy"; depends=[]; };
 nicheROVER = derive { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; };
-nlADG = derive { name="nlADG"; version="0.1-0"; sha256="0nvd5hzd1p81jwx5p7js86wblgg615vdnpbvy5rhmhf1ig583z1b"; depends=[ggm]; };
 nlWaldTest = derive { name="nlWaldTest"; version="1.0.1"; sha256="1rwpkkddivpcamhsp22nmy5gz2006y9kbdzj8lhh20s1vsyhn2b3"; depends=[numDeriv stringr]; };
 nleqslv = derive { name="nleqslv"; version="2.8"; sha256="1jkf02mcz16d8h8b7h5m13lpx6z2shpap5vncapszwa9js6vps67"; depends=[]; };
-nlme = derive { name="nlme"; version="3.1-120"; sha256="1ji8nrf714nf18by9g7k4czkgnj1cq464pvjv195c5fnhwhmpmjc"; depends=[lattice]; };
+nlme = derive { name="nlme"; version="3.1-121"; sha256="15cki2xn1d3bsb20kav18kmdj9r3v7kz89wmh8c7qcx75qbmr3zd"; depends=[lattice]; };
 nlmeODE = derive { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; };
 nlmeU = derive { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; };
 nlmrt = derive { name="nlmrt"; version="2013-9.25"; sha256="0z2ih61rpqzk64qagiwbx396vwb28jhqk8b4kxchca0il3fzqqav"; depends=[]; };
@@ -4893,7 +4904,7 @@ nlstools = derive { name="nlstools"; version="1.0-1"; sha256="00m2x587gvrbgs7wdk
 nlt = derive { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[adlift EbayesThresh]; };
 nlts = derive { name="nlts"; version="0.2-0"; sha256="14kvzc1p4anj9f7pg005pcbmc4k0917r49pvqys9a0a51ira67vb"; depends=[acepack locfit]; };
 nmcdr = derive { name="nmcdr"; version="0.3.0"; sha256="1557pdv7mqdjwpm6d9zw3zfbm1s8ai3rasd66nigscmlq102w745"; depends=[CDFt]; };
-nnet = derive { name="nnet"; version="7.3-9"; sha256="1z1lhi35w5l7l645d764w9h4aiv6hapjv8fwb9b51b36vyg1r0zg"; depends=[]; };
+nnet = derive { name="nnet"; version="7.3-10"; sha256="0jmhl86bki1a21na2ln5m69kqkj856891jwy73nl8qcr51vl0q7i"; depends=[]; };
 nnlasso = derive { name="nnlasso"; version="0.2"; sha256="1q1psc6s5xw2nsz09q20n5rksq07gx21q9ap22dr7haln5jrvpzr"; depends=[]; };
 nnls = derive { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; };
 nodeHarvest = derive { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; };
@@ -4926,7 +4937,7 @@ npbr = derive { name="npbr"; version="1.1"; sha256="011zmz1s6kkdgylkl6dc79dpardg
 npcp = derive { name="npcp"; version="0.1-1"; sha256="0b2mqx0zrvai5aw6b47qpi4bwcfjrv0bh8ahrgx7n1sf045grm3a"; depends=[]; };
 npde = derive { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; };
 nplplot = derive { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; };
-nplr = derive { name="nplr"; version="0.1-1"; sha256="0br7flriqbig8frq0j4lxiv6i8bwgsj422faln85ga93hnlky0a1"; depends=[]; };
+nplr = derive { name="nplr"; version="0.1-2"; sha256="1xs02i14kgggf1gfs612l2jk37z60dxqgrxs6rswzchvlyzwcxd0"; depends=[]; };
 npmlreg = derive { name="npmlreg"; version="0.46-1"; sha256="1gddl6diw8ix8vz7n1r4ps9cjx3q00mafpapskjk7pcz69m6hfv1"; depends=[statmod]; };
 npmv = derive { name="npmv"; version="2.2"; sha256="1aqlx1y3bxbqp13q0vajwffj8srb6s04d5r2h08m9fk5hhp9l3jf"; depends=[Formula]; };
 nppbib = derive { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; };
@@ -4947,6 +4958,7 @@ nutshell_audioscrobbler = derive { name="nutshell.audioscrobbler"; version="1.0"
 nutshell_bbdb = derive { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; };
 nws = derive { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; };
 nycflights13 = derive { name="nycflights13"; version="0.1"; sha256="15bqaphxwqpdzr4bkn6qgbjb3knja5hk34qxjd6xhpjzkgfs5c0b"; depends=[]; };
+oapackage = derive { name="oapackage"; version="2.0.22"; sha256="0qskkzb4xlxz2qkxapcckxfwc5fv0s80kbndsvzcy3pqjzrykvys"; depends=[RcppEigen]; };
 oaxaca = derive { name="oaxaca"; version="0.1.2"; sha256="1ghdrpjp2p4nlwskvs8n8d8ixzf3cdq9k9q49zvq8ag0dhwyswzd"; depends=[Formula ggplot2 reshape2]; };
 objectProperties = derive { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals]; };
 objectSignals = derive { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; };
@@ -4975,13 +4987,13 @@ onlinePCA = derive { name="onlinePCA"; version="1.0-1"; sha256="0gca0ijcc30b3z5i
 onls = derive { name="onls"; version="0.1-0"; sha256="1kfgikswddly9lar6wa1hhz89rap0pql9h181s7i68wa20xdg05z"; depends=[minpack_lm]; };
 opefimor = derive { name="opefimor"; version="1.1"; sha256="0xv57l38wx3w67h312g5xcpi9m7ggd6crqvqjh5gddq0g1g93bjq"; depends=[]; };
 openNLP = derive { name="openNLP"; version="0.2-5"; sha256="0jc4ii6zsj0pf6nlx3l0db18p6whp047gzvc7q0dbwpa8q4il2mb"; depends=[NLP openNLPdata rJava]; };
-openNLPdata = derive { name="openNLPdata"; version="1.5.3-1"; sha256="1a048irgv56yi2lvhpqh8vh4dl7g7zfg934qypjxg8mcdcqi820y"; depends=[rJava]; };
+openNLPdata = derive { name="openNLPdata"; version="1.5.3-2"; sha256="1472gg651cdd5d9xjxrzl3k7np77liqnh6ysv1kjrf4sfx13pp9q"; depends=[rJava]; };
 openair = derive { name="openair"; version="1.5"; sha256="0swhaldfhz6zgs50aws18kypilv15k7w99nqcmb7y0wgvkkwda2h"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval mapdata mapproj maps mgcv plyr RColorBrewer Rcpp reshape2 RgoogleMaps]; };
 opencpu = derive { name="opencpu"; version="1.4.6"; sha256="19anprhkwqw2kii417qy3laalrlj207zfvklc05m0vz9sra7sxj0"; depends=[brew devtools evaluate httpuv httr jsonlite knitr openssl]; };
 openintro = derive { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; };
 openssl = derive { name="openssl"; version="0.4"; sha256="1gfhzxjjssid2z8xmw3vnnd4gj2f6a3zzazkhpg9b1ymmcp9b288"; depends=[]; };
 opentraj = derive { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; };
-openxlsx = derive { name="openxlsx"; version="2.4.0"; sha256="1jzq3lz9qivsprmn8aibwiidcwsanlnfpmsz2ccw3650gdgk3zdk"; depends=[Rcpp]; };
+openxlsx = derive { name="openxlsx"; version="3.0.0"; sha256="1vx5qmhlyrlwrswbhd95jjcsldcdpdp7gs341dmham26sdzdx658"; depends=[Rcpp]; };
 operator_tools = derive { name="operator.tools"; version="1.4.4"; sha256="1ridxi3pbylb4flfgn371n1v9796rnd1ndxhh6ijyzpysqqmwi08"; depends=[]; };
 operators = derive { name="operators"; version="0.1-7"; sha256="1qik9ihv5blz77bzsnrslf665ndpa8vp3xldqsgvs4gr5bg5algw"; depends=[]; };
 ops = derive { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; };
@@ -5010,7 +5022,7 @@ ordPens = derive { name="ordPens"; version="0.3-1"; sha256="0yzf3qzi4p7xqimihjvr
 orddom = derive { name="orddom"; version="3.1"; sha256="165axs15fvwhrp89xd87l81q3h2qjll1vrwcsap645cwvb85nwsh"; depends=[psych]; };
 orderbook = derive { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[hash lattice]; };
 orderedLasso = derive { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8xscvambcb1y70gqqi5819a2gxh02h4pnyjn8axql"; depends=[ggplot2 Iso Matrix quadprog reshape2]; };
-ordinal = derive { name="ordinal"; version="2015.1-21"; sha256="1vhkxdsapmah09vzy6xd00kb1ck02vbiyamv5ccflxdbdmch1q1y"; depends=[MASS Matrix ucminf]; };
+ordinal = derive { name="ordinal"; version="2015.6-28"; sha256="0lckjzjq2k8rlibrjf5s0ccf17vcvns5pgzvjjnl3wibr2ff4czs"; depends=[MASS Matrix ucminf]; };
 ordinalCont = derive { name="ordinalCont"; version="0.4"; sha256="1inms74l4zx6r526xd0v79v18bcqa76xwsgfvap0fizyv2dvgpim"; depends=[boot fastGHQuad ucminf]; };
 ordinalgmifs = derive { name="ordinalgmifs"; version="1.0.2"; sha256="1rbn2mb516hdr0chny1849m1aq0vb0vmr636b4fp914l5zh75vgi"; depends=[]; };
 ore = derive { name="ore"; version="1.1.0"; sha256="1khgjd5fl8vi9n9pj4nbai6fbfbiwzc121a0gf7dfk727iid8whq"; depends=[]; };
@@ -5072,17 +5084,19 @@ panelAR = derive { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqw
 panelaggregation = derive { name="panelaggregation"; version="0.1"; sha256="19426hab4rvgn8k2c7x327k4ymihas59jbys0nmrfgg074x0xdnm"; depends=[data_table]; };
 papeR = derive { name="papeR"; version="0.6-1"; sha256="1h3mfapn31qphaly01j5pw2ci65g4z0wh4m1wf5r808cspn0mya0"; depends=[car gmodels]; };
 parallelMCMCcombine = derive { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; };
+parallelML = derive { name="parallelML"; version="1.2"; sha256="05j0rb81i8342m8drwgmgi1w30q96yf501d83cdq4zhjbchphbl1"; depends=[doParallel foreach]; };
 parallelMap = derive { name="parallelMap"; version="1.3"; sha256="026d018fr2a43cbh8bi2dklzr9fxjzdw5qyq84g2i18v5ibr6bd5"; depends=[BBmisc checkmate]; };
-parallelSVM = derive { name="parallelSVM"; version="0.1-8"; sha256="19hmagv95nx8aw8xylk5vvpxw9a4fsa68r9q0x6irhq50wmah93r"; depends=[doParallel e1071 foreach]; };
+parallelSVM = derive { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; };
 parallelize_dynamic = derive { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; };
-paramlink = derive { name="paramlink"; version="0.9-6"; sha256="0pazllkjbqzvl9vmpvr67lkcsd960mipcd1p1nf00y8hknrwh7qp"; depends=[kinship2 maxLik]; };
+paramlink = derive { name="paramlink"; version="0.9-7"; sha256="02h7znac93v8ibra3ni2psxc9lpfhiiw4q8asfyrx400345ifk5b"; depends=[kinship2 maxLik]; };
 paran = derive { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; };
 parboost = derive { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[caret doParallel glmnet iterators mboost party plyr]; };
 parcor = derive { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[Epi GeneNet glmnet MASS ppls]; };
 parfm = derive { name="parfm"; version="2.5.8"; sha256="05bzmm5ahaip5apsv84fbqy8bag9pkkfsxvqw1cbcvlbr2zyxfgp"; depends=[eha msm survival]; };
 parfossil = derive { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq5j0r3jnnrzw1q412dbvmakipyw2yx2l2s7jn"; depends=[foreach fossil]; };
-parma = derive { name="parma"; version="1.5-1"; sha256="0qrq3bx0amri9b3s6bym4znnk140jjd2abnvqyihaj4bf2glbl0g"; depends=[corpcor FRAPO nloptr quadprog Rglpk slam]; };
+parma = derive { name="parma"; version="1.5-2"; sha256="1yvk0wfcc1mgz2bif6hvw5l7zclbv4pz1cki0ymslrmxapjqnsz8"; depends=[corpcor FRAPO nloptr quadprog Rglpk slam truncnorm]; };
 parmigene = derive { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; };
+parsec = derive { name="parsec"; version="1.1"; sha256="02sj2n34n4c6db5s15hbprcx1appasyj8vh2c8my2mppfrk7cnc7"; depends=[]; };
 parsedate = derive { name="parsedate"; version="1.1.1"; sha256="0mr97rw4fzg2v9dh5d4x0b76d5s56gi6zilq69yjhbx78w46apzc"; depends=[]; };
 partDSA = derive { name="partDSA"; version="0.9.10"; sha256="1j6ihgyjiy8dnr89xkqvl1dkmdswvknffq7zc15civy0h781azv6"; depends=[survival]; };
 partialAR = derive { name="partialAR"; version="1.0.5"; sha256="1d8nbv3rkf0p4vg8mlb1l5cqzgsqqhigwiq2bnd4npak6fq6syvg"; depends=[data_table FKF ggplot2 MASS plot3D Rcpp tseries urca zoo]; };
@@ -5100,7 +5114,7 @@ pastecs = derive { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5
 pastis = derive { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[ape caper]; };
 patchDVI = derive { name="patchDVI"; version="1.9.1616"; sha256="1akdlzw8v2p1zz09bm88d63jyxj7fv5h50p459p9ml4yc816xvji"; depends=[]; };
 patchPlot = derive { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; };
-patchSynctex = derive { name="patchSynctex"; version="0.1-2"; sha256="1ssjs4mcsjad7g0yfi5sxwfyywsziry81rzwb4sly3afw8g538p9"; depends=[stringr]; };
+patchSynctex = derive { name="patchSynctex"; version="0.1-3"; sha256="0gbbdszrprshcpnpbnvqmx0wlij2d36fw94ssfbx11d7fmjpaj37"; depends=[stringr]; };
 pathClass = derive { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[affy Biobase igraph kernlab lpSolve ROCR svmpath]; };
 pathdiagram = derive { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95nwhk9214kcfpb1qrmw249mjaza7i9gijmlicraxz"; depends=[shape]; };
 pathmox = derive { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; };
@@ -5122,14 +5136,13 @@ pbkrtest = derive { name="pbkrtest"; version="0.4-2"; sha256="1yppp24a8rl36x6sn1
 pbo = derive { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; };
 pbs = derive { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
 pcIRT = derive { name="pcIRT"; version="0.1"; sha256="0vfbbmnp4jyrbi5d9gz1krh707aazbrqfcgc3rjrwwyjld11wyzn"; depends=[combinat]; };
-pca3d = derive { name="pca3d"; version="0.3"; sha256="01nc4p68r7bnly18q8rkhnnj6vq9mwbb5hhdcblan6nhhlzhnld0"; depends=[rgl]; };
-pcaBootPlot = derive { name="pcaBootPlot"; version="0.1.0"; sha256="0h5i5qh4lhnhh7n9k1map10gvw70f7576gnxhjjc6l03sngm0yp7"; depends=[RColorBrewer]; };
+pca3d = derive { name="pca3d"; version="0.8"; sha256="03ghncfpma1fwby8kxm0v90l795mknz8s4y81l24f3n7mmhighn6"; depends=[ellipse rgl]; };
+pcaBootPlot = derive { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; };
 pcaL1 = derive { name="pcaL1"; version="1.3"; sha256="026cgi812kvbkmaryd3lyqnb1m78i3ql2phlvsd2r691y1j8w532"; depends=[]; };
 pcaPP = derive { name="pcaPP"; version="1.9-60"; sha256="1rqq4zgik7cgnnnm8il1rxamp6q9isznac8fhryfsfdcawclfjws"; depends=[mvtnorm]; };
-pcalg = derive { name="pcalg"; version="2.2-0"; sha256="1cgir5h9g8v3kjmdqnnjsc0z1f8wl3flnnxnk9y7km82x5pby0m7"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
+pcalg = derive { name="pcalg"; version="2.2-2"; sha256="1cfjzknrlykxs42kyjjy4b09d8qkpl7kjivx0w8dxbgs03r6cmkl"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
 pcg = derive { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; };
 pcnetmeta = derive { name="pcnetmeta"; version="2.2.1"; sha256="0y4sn1aby38c458667fsy2ndq64i8kknmzdc32mbvzd530p1yxai"; depends=[coda rjags]; };
-pcrcoal = derive { name="pcrcoal"; version="1.1"; sha256="17mm13xpmghachiqr7v2691jk39mbfsadpg028gs3iiwmh0pksa0"; depends=[ape ggplot2 phylosim]; };
 pcse = derive { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; };
 pdR = derive { name="pdR"; version="1.3"; sha256="0y81nlvq5vwf6021m5ns6j4l44c5456jkbs2x9y7jfkw6r3v2ddf"; depends=[]; };
 pdc = derive { name="pdc"; version="1.0.2"; sha256="0d7p65rkwrh39njhszdrbv25z4jz27746y1qyhqmhkxmvkx6g1fl"; depends=[]; };
@@ -5146,7 +5159,7 @@ pedgene = derive { name="pedgene"; version="2.1"; sha256="0nmp1s0i5b4h45p3f4rvvi
 pedigree = derive { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; };
 pedigreemm = derive { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; };
 pedometrics = derive { name="pedometrics"; version="0.6-2"; sha256="137685gyd7k9vpjnsy6h280cdbl15bchrizfnalnz6nizi0q85lj"; depends=[car gstat Hmisc lattice latticeExtra MASS moments pbapply plyr Rcpp sp spsurvey xtable]; };
-pegas = derive { name="pegas"; version="0.8"; sha256="0074r6vsnvdc0gkqhb3cb4dybpgp4ryf38lrfkk8vrs3y9gb7hdh"; depends=[adegenet ape]; };
+pegas = derive { name="pegas"; version="0.8-1"; sha256="116r709qp9hcvmvfn6xsis13284nl429sfc9d91p1c7fy8fl46q5"; depends=[adegenet ape]; };
 penDvine = derive { name="penDvine"; version="0.2.2"; sha256="054vw99z68pk0bi4yzdmvx13x8n75sj2371l8w2yady1lqjj4qi7"; depends=[fda lattice Matrix quadprog TSP]; };
 penMSM = derive { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp]; };
 penalized = derive { name="penalized"; version="0.9-45"; sha256="0svmhsh0lv3d571jyhk73zd9slcd6xnp3p0l1ijab9gl2rjhlzz5"; depends=[survival]; };
@@ -5158,12 +5171,11 @@ pensim = derive { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgn
 peperr = derive { name="peperr"; version="1.1-7"; sha256="01a6sxcmb8v2iz2xdwhdnr92k3w2vn3hr0hg9b6mkpzjf4n45q3k"; depends=[snowfall survival]; };
 peplib = derive { name="peplib"; version="1.5.1"; sha256="1bdgmwbk76ryl5gxcgf3slds92yilg9p1x1lx0hnzzwcgx99wif3"; depends=[]; };
 peptider = derive { name="peptider"; version="0.2"; sha256="1mrwa5pcmc0vbs7n39003bxia2hd6msjkl0j0b21d05accbvzph1"; depends=[discreteRV dplyr plyr]; };
-pequod = derive { name="pequod"; version="0.0-3"; sha256="14nag0bd2icg294y7n47c6xlw54rrdia887d2ni6achjqgwvffzh"; depends=[car ggplot2]; };
+pequod = derive { name="pequod"; version="0.0-4"; sha256="12gmdfhi4dh5zhy3mwgjlpwhkqj8irwbcj13f0z23001hpis3wmh"; depends=[car ggplot2]; };
 perARMA = derive { name="perARMA"; version="1.5"; sha256="1d9vrxv8r6qgxhaz3pv8n34c526gi5cd8w7wxy9qc914y8kplmzr"; depends=[corpcor gnm matlab Matrix signal]; };
 performanceEstimation = derive { name="performanceEstimation"; version="1.0.1"; sha256="102f6h8cqmfb1ch9amf9qhm4p5r8i8236z8yfpg645vbkcc3i78n"; depends=[doParallel foreach ggplot2]; };
 perm = derive { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; };
 permGPU = derive { name="permGPU"; version="0.14.6"; sha256="1h01nfq8hn7i29xanma70q6s5mj83znbb2lg9x7bjgdrgj38vy2m"; depends=[Biobase foreach RUnit survival]; };
-permtest = derive { name="permtest"; version="1.2"; sha256="1sciyjs840h004zg8bwclq0j0n22anvjvx3fz62y4dzblrynhrci"; depends=[]; };
 permute = derive { name="permute"; version="0.8-4"; sha256="1z5pmq9dy93rpsdb73waqrqmnvvi9ygx1v5l81a2n1j1kb4lmksv"; depends=[]; };
 perry = derive { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; };
 persiandictionary = derive { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; };
@@ -5180,16 +5192,15 @@ phalen = derive { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q7
 phangorn = derive { name="phangorn"; version="1.99-13"; sha256="1d6awphvzkznqvp30bxdi6j6chlakfxrvmkk9a4by21fxa29xmp9"; depends=[ape igraph Matrix nnls quadprog]; };
 phaseR = derive { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; };
 phcfM = derive { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; };
-pheatmap = derive { name="pheatmap"; version="1.0.2"; sha256="0nmq5w2jcljbd81v428xl4mvqzrm4vxxlwyhkimi4hj8a9rqw743"; depends=[gtable RColorBrewer scales]; };
+pheatmap = derive { name="pheatmap"; version="1.0.7"; sha256="0dvflwkwvnlh36w5z3ai1q2rgclrgs1qzh01nxgz9kd23imqp0q8"; depends=[gtable RColorBrewer scales]; };
 phenability = derive { name="phenability"; version="2.0"; sha256="0can8qgdpfr4h6jfg23cnwh7hhmwv6538wg2jla9w138la7rhpd1"; depends=[calibrate]; };
 phenex = derive { name="phenex"; version="1.0-7"; sha256="0q563cv9lskikf3ls0idp56lirw9gxn71rgxp9xn8an05gwdg0xr"; depends=[]; };
 phenmod = derive { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat lattice pheno RColorBrewer]; };
 pheno = derive { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme quantreg SparseM]; };
 pheno2geno = derive { name="pheno2geno"; version="1.3.1"; sha256="1k1hw5qxrwxy502zkcfcz0nxjqmvdk1fgghjc512vq7x5znblz3v"; depends=[mixtools qtl VGAM]; };
-phenology = derive { name="phenology"; version="4.2"; sha256="141k2rfjmrx0cfzzcdf3q67chxq1jqp524rxcpdq3m7bnbkv67k3"; depends=[coda fields HelpersMG shiny zoo]; };
+phenology = derive { name="phenology"; version="4.2.4"; sha256="1074sr1p3bjz4f2zsswp5m60qs7axp9ngsk1l76gi2zpv95xay6s"; depends=[coda fields HelpersMG shiny zoo]; };
 phia = derive { name="phia"; version="0.2-0"; sha256="1v2znss1snqrn3bpd0513jmw0x39p9vpwdc60klx725yrr2cfznw"; depends=[car Matrix]; };
 phmm = derive { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02vxdmb0xcc1jdbayjr5jrn9m1zk"; depends=[lattice Matrix survival]; };
-phom = derive { name="phom"; version="1.0.3"; sha256="0x05p6fn4kycilal65k7dy6h3w5i3ca9w93ryp4gqd4lp50l1749"; depends=[Rcpp]; };
 phonR = derive { name="phonR"; version="1.0-3"; sha256="09wzsq92jkxy6cd89czshpj1hsp56v9jbgqr5a06rm6bv3spa31i"; depends=[deldir plotrix splancs]; };
 phonTools = derive { name="phonTools"; version="0.2-2.0"; sha256="1wd1a5506p3ny6vi9pq6yg9gbz082fxw4l3cxsplkdpqgkhryrww"; depends=[]; };
 phreeqc = derive { name="phreeqc"; version="1.0-9102"; sha256="09vwqd4mf64l76vgg32vm9vkc8ra6cls9nvrp3ckkj9l2fwcnbzf"; depends=[]; };
@@ -5199,21 +5210,21 @@ phylin = derive { name="phylin"; version="1.0"; sha256="10pbs4adsyp43i89jb3xi0m5
 phyloTop = derive { name="phyloTop"; version="1.1.1"; sha256="046myyr01c4zc6sfy7r6p2vswkqqqd3w4k173gjbjazl1ims1sjs"; depends=[ape igraph NHPoisson phylobase]; };
 phylobase = derive { name="phylobase"; version="0.6.8"; sha256="0xj7x4cdfp0yadvjhdkw1ai3yd081ri4gpdg0n5g0z13cjaa6mjh"; depends=[ade4 ape Rcpp]; };
 phyloclim = derive { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; };
-phylocurve = derive { name="phylocurve"; version="1.2.0"; sha256="13yv9q2p141gwvpr413v688iwx9ljf2x315gsc2rxx8q9bbj79dr"; depends=[abind ape drc dtw geiger GPfit phylolm phytools]; };
+phylocurve = derive { name="phylocurve"; version="1.3.0"; sha256="014y7l2q3yjzj2iq9a6aspnd7dkvjfwnz46rs7x6l45jy41494wb"; depends=[abind ape drc dtw geiger GPfit phylolm phytools]; };
 phyloland = derive { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; };
 phylolm = derive { name="phylolm"; version="2.2"; sha256="1x1mi1mcq3ijbqhr0951scqzv4zza0r3fcs0hh4gpbr8z49b6d98"; depends=[ape]; };
-phylosim = derive { name="phylosim"; version="2.1.1"; sha256="0rrz5c7zl2hjalwm6m8pydikiwmiq2dybx2yhzp0ps2bcsn02lhn"; depends=[ape compoisson ggplot2 R_methodsS3 R_oo]; };
 phylotools = derive { name="phylotools"; version="0.1.2"; sha256="19w7xzk6sk1g9br7vwv338nvszzh0lk5rdzf0khiywka31bbsjyb"; depends=[ape fields picante seqRFLP spaa]; };
 phyreg = derive { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; };
 physiology = derive { name="physiology"; version="0.2.2"; sha256="0z394smbnmlrnp9ms5vjczc3avrcn5nxm8np5y58k86x470w6npz"; depends=[]; };
 phytools = derive { name="phytools"; version="0.4-56"; sha256="18cib7yjlbzdpfs5piwx5cw0h7fk26s04wsb2vdfiybr306a9jk2"; depends=[animation ape clusterGeneration maps mnormt msm numDeriv phangorn plotrix scatterplot3d]; };
 phytotools = derive { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; };
-pi0 = derive { name="pi0"; version="1.3-250"; sha256="1561zvf1hcd05iqy245c0z23mi8ypk6q3lkfldcr55cs67w4lmz6"; depends=[Iso kernlab limSolve LowRankQP Matrix numDeriv quadprog qvalue rgl scatterplot3d]; };
+pi0 = derive { name="pi0"; version="1.4-0"; sha256="0qwyfan21k23q4dilnl7hqjghzm8n2qfw21wbvnidr6n9hf2fjjs"; depends=[Iso kernlab limSolve LowRankQP Matrix numDeriv quadprog qvalue rgl scatterplot3d]; };
 picante = derive { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape nlme vegan]; };
 picasso = derive { name="picasso"; version="0.3.0"; sha256="0z314akr1x2a28hh5hbb7mzkyaxsj4dfkdmx10l6gqllgk9j5qca"; depends=[igraph lattice MASS Matrix]; };
+pid = derive { name="pid"; version="0.13"; sha256="1cn8pc86xkb4dngashglfwlj7sjj4xaamfgglxkcsp0wxaiy9rfg"; depends=[ggplot2]; };
 pingr = derive { name="pingr"; version="1.1.0"; sha256="0j03qcsyckv3zh2v4m8wz8kyfl0k8qi71rm20rc0spy1s9ng7fcb"; depends=[]; };
 pipe_design = derive { name="pipe.design"; version="0.2"; sha256="1hmc4g3bnpwicjr53xz8yhhshnfhd2fqx9c6v4af8wvnqpy7mlpq"; depends=[ggplot2 gtools]; };
-pipeR = derive { name="pipeR"; version="0.6"; sha256="15hq6i1cv072jpw71slij534s85xljkjk2ygxpkgq3cyngbq3jxb"; depends=[]; };
+pipeR = derive { name="pipeR"; version="0.6.0.6"; sha256="1d7vmccvh5ir26cv26mk0ay69rqmwmp0mgwjal9avfn9vrxq1fq3"; depends=[]; };
 pitchRx = derive { name="pitchRx"; version="1.7"; sha256="0mx948bahw0zr0915hz9lcws7iq2l0ikgx4gjnnfhhpiii86xs57"; depends=[ggplot2 hexbin MASS mgcv plyr XML2R]; };
 pixmap = derive { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; };
 pkgKitten = derive { name="pkgKitten"; version="0.1.3"; sha256="1f7jkriib1f19mc5mdrymg5xzdcyclfvh1220agy4lpyprxgza0f"; depends=[]; };
@@ -5222,7 +5233,7 @@ pks = derive { name="pks"; version="0.3-1"; sha256="1nr36k960yv71yfxkzchjk814sf9
 plRasch = derive { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; };
 plan = derive { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; };
 planar = derive { name="planar"; version="1.5.2"; sha256="1w843qk88x3kzi4q79d5ifzgp975dj4ih93g2g6fa6wh529j4w3h"; depends=[cubature dielectric plyr Rcpp RcppArmadillo reshape2 statmod]; };
-planor = derive { name="planor"; version="0.2-3"; sha256="1j550zqm3h4kz7jz4fkgp0z92skwpyxz0lnr7pfif4pya1mxd6f9"; depends=[conf_design]; };
+planor = derive { name="planor"; version="0.2-4"; sha256="0k5rhrnv2spsj2a94msgw03yyv0hzrf8kvlnbhfj1dl7sb1l92a1"; depends=[conf_design]; };
 plantecophys = derive { name="plantecophys"; version="0.6"; sha256="1gxc84njpii82p6n04djbp4n9wni49lxfvmljqz48r643hv48a7h"; depends=[]; };
 plaqr = derive { name="plaqr"; version="1.0"; sha256="1vv15zqnmir5hi9ivyifzrc1rkn1sn5qj61by66iczmlmhqh17h8"; depends=[quantreg]; };
 playwith = derive { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[cairoDevice gridBase gWidgets gWidgetsRGtk2 lattice RGtk2]; };
@@ -5240,7 +5251,7 @@ plotKML = derive { name="plotKML"; version="0.5-2"; sha256="006f6j3k2yb20zcmx2lq
 plotMCMC = derive { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; };
 plotROC = derive { name="plotROC"; version="1.3.3"; sha256="090fpj3b5vp0r2zrn38yxiy205mk9kx1fpwp0g8rl4bsa88v4c9y"; depends=[ggplot2 gridSVG shiny]; };
 plotSEMM = derive { name="plotSEMM"; version="2.0"; sha256="0n30m1nz9fnilbgxg5jcmx2bsscdvz5mkjkyrgx7yr3alazkaimd"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; };
-plotmo = derive { name="plotmo"; version="3.1.2"; sha256="13f821w1y7xr535yqykcr3mmrndrg47xk6cfqkyd1z2maw50n2hs"; depends=[plotrix TeachingDemos]; };
+plotmo = derive { name="plotmo"; version="3.1.3"; sha256="0jdam773azxi5pv2ix4gc0zl3xji0rdlb7v5m51z1j0l93z50mk6"; depends=[plotrix TeachingDemos]; };
 plotpc = derive { name="plotpc"; version="1.0.3"; sha256="0dw9k702a67c2k77dl4k2747lhsr84x41qrgj5mp9jnyfq6naciq"; depends=[]; };
 plotrix = derive { name="plotrix"; version="3.5-12"; sha256="13gffp7zp46wal83609652x48i63zb5i20x6ycmgc97l4nanhrfi"; depends=[]; };
 pls = derive { name="pls"; version="2.4-3"; sha256="114ka4766x8fx0zvvr7cylky1jsy542nj6s7sb2dwv8zjhbclkhn"; depends=[]; };
@@ -5256,6 +5267,7 @@ plumbr = derive { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj
 plus = derive { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; };
 plusser = derive { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[lubridate plyr RCurl RJSONIO]; };
 plyr = derive { name="plyr"; version="1.8.3"; sha256="06v4zxawpjz37rp2q2ii5q43g664z9s29j4ydn0cz3crn7lzl6pk"; depends=[Rcpp]; };
+pmc = derive { name="pmc"; version="1.0.0"; sha256="156kgjq8p9y02lp8rklq73wr7k7sm0wjihh2q6qziv4vgbqg157c"; depends=[dplyr geiger ggplot2 ouch tidyr]; };
 pmcgd = derive { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; };
 pmclust = derive { name="pmclust"; version="0.1-6"; sha256="05zjx4psvk5zjmr0iwwwig990g6h04ajn5wi0xi8bqv046r47q3h"; depends=[MASS pbdMPI rlecuyer]; };
 pmg = derive { name="pmg"; version="0.9-43"; sha256="0i7d50m4w7p8ipyx2d3qmc54aiqvw0ls8igkk8s1xc7k8ympfqi6"; depends=[foreign gWidgets gWidgetsRGtk2 lattice MASS proto]; };
@@ -5263,6 +5275,7 @@ pmlr = derive { name="pmlr"; version="1.0"; sha256="1z3hbw4wabpai1q8kbn77nzxqzia
 pmml = derive { name="pmml"; version="1.4.2"; sha256="0588sph67zs58knf4g3fd7c84i2yag81igr882jgbaxhfhxrpk6n"; depends=[survival XML]; };
 pmmlTransformations = derive { name="pmmlTransformations"; version="1.2.2"; sha256="1p31lakhqwk0qhb565j2sjcfsjsx0i5v8kj8779ryjyvy7717m6m"; depends=[]; };
 pmr = derive { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; };
+pnf = derive { name="pnf"; version="0.1.1"; sha256="0kasq27dnjwqzlzybc8m3wv9jwyag6z38ayv88msa7lxcnibr34i"; depends=[]; };
 png = derive { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; };
 pnmtrem = derive { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; };
 pnn = derive { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; };
@@ -5277,13 +5290,13 @@ poisDoubleSamp = derive { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf
 poisson_glm_mix = derive { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; };
 poistweedie = derive { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; };
 polidata = derive { name="polidata"; version="0.1.0"; sha256="07641v0dnn161kyxx7viplkf8c3r51hd4hd5pzmcph4y4387r01i"; depends=[jsonlite RCurl]; };
-pollstR = derive { name="pollstR"; version="1.2.0"; sha256="1a1qjblxylzpwb1qpy2yyk39022isp8aajds5glspxndapmd4akb"; depends=[httr jsonlite plyr]; };
-polspline = derive { name="polspline"; version="1.1.9"; sha256="1n08dhwpf53slk1zib491kii54x9h16g3jgr2kxxpyc5xfv4yj26"; depends=[]; };
+pollstR = derive { name="pollstR"; version="1.2.1"; sha256="0sny330a0d8jicsgyc1qa2mwhxgxng50w2fv3ml1nncml8b88k40"; depends=[httr jsonlite plyr]; };
+polspline = derive { name="polspline"; version="1.1.11"; sha256="000b8mb7q5614pxrrfkbwyl39lqj3rbf13ghgkn0234v9y2i6j76"; depends=[]; };
 polyCub = derive { name="polyCub"; version="0.5-2"; sha256="1j28ia53za3sh9q7q1g5bnmlb5mbzf44bcwzv0919lvkw01f2lvj"; depends=[sp spatstat]; };
 polySegratio = derive { name="polySegratio"; version="0.2-4"; sha256="05kvj475zhlrmp7rm691cfs28igp4ac2cn2xxf7axx09v1nq33db"; depends=[gdata]; };
 polySegratioMM = derive { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[coda gtools lattice polySegratio]; };
 polyaAeppli = derive { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; };
-polyapost = derive { name="polyapost"; version="1.1-6"; sha256="1wk85nl2p9plnaavjdr4bqxxhjc84ynv53bh2v1rmq87jymw40b1"; depends=[boot]; };
+polyapost = derive { name="polyapost"; version="1.4-2"; sha256="0nr8mw0k79kz5zd1k81kz0i940vmlzqqscn1z1yaik0rx8i7mhs7"; depends=[boot rcdd]; };
 polyclip = derive { name="polyclip"; version="1.3-2"; sha256="0gsckb5nwfq1w48g67pszk3ndzvj63r8rp7vhh77idizaczkv0r1"; depends=[]; };
 polycor = derive { name="polycor"; version="0.7-8"; sha256="0hvww5grl68dff23069smfk3isysyi5n2jm4qmaynrk0m3yvhxwn"; depends=[mvtnorm sfsmisc]; };
 polynom = derive { name="polynom"; version="1.3-8"; sha256="05lng88c8cwj65cav31hsrca9nbrqn5rmcz79b17issyk2j0g86p"; depends=[]; };
@@ -5292,7 +5305,7 @@ polytomous = derive { name="polytomous"; version="0.1.6"; sha256="137qcnncih1lm2
 polywog = derive { name="polywog"; version="0.4-0"; sha256="0wl9br0g4kgi3nz2fq28nsk6fw0ll0y715v4vz8lv3pvfwc7518j"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; };
 pom = derive { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; };
 pomp = derive { name="pomp"; version="0.65-1"; sha256="1fxfbqa6lb4x0d4h29in8crhac32aw71chyjyvnhadfqynxhhv4k"; depends=[coda deSolve mvtnorm nloptr subplex]; };
-pooh = derive { name="pooh"; version="0.3"; sha256="1wcv77vjjp62c5l1mplnkk4vhy2scjrq96cjx58w5jdj46lban2h"; depends=[]; };
+pooh = derive { name="pooh"; version="0.3-1"; sha256="0fn711jyn18byfc2nq3y154k8rb39vpnfw1a0xw73pqp1cwd2i73"; depends=[]; };
 popKorn = derive { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; };
 popRange = derive { name="popRange"; version="1.1.3"; sha256="0kkz6va0p8zv3skaqqcpw42014d9x9x4ilx0czz91qf46h61jgb0"; depends=[findpython]; };
 popReconstruct = derive { name="popReconstruct"; version="1.0-4"; sha256="14lp0hfnzbiw81fnq7gzpr4lxyfh3g0428rm9jwjh631irz3fcc9"; depends=[coda]; };
@@ -5301,21 +5314,21 @@ popdemo = derive { name="popdemo"; version="0.1-4"; sha256="0syhmm8fnxbsdzj75y7d
 popgen = derive { name="popgen"; version="1.0-3"; sha256="00rgfwmmiharfxqlpy21n3jbxwr5whzdg8psqylkjf83ls2myqzm"; depends=[cluster]; };
 popgraph = derive { name="popgraph"; version="1.4"; sha256="1z6w6vj3vl2w10hvzwmkw4d475bqcd6ys92xnn445ag6vpq0cvxq"; depends=[ggplot2 igraph MASS Matrix sampling sp]; };
 poplite = derive { name="poplite"; version="0.99.16"; sha256="0yp1hfda2k6c5x0gbcfxj9h6igzx3ra05xs7g88wjz76yxp3wb6w"; depends=[DBI dplyr igraph lazyeval RSQLite]; };
-poppr = derive { name="poppr"; version="1.1.5"; sha256="0whk06gwm171b5j2vcfqi7rdwczv109g7bw2gfnzhz4fm46nhmfk"; depends=[ade4 adegenet ape ggplot2 igraph pegas phangorn reshape2 vegan]; };
+poppr = derive { name="poppr"; version="2.0.0"; sha256="1n3vdrfcwfjrxa9fff39g59kdyxs3lhykg24vppy4ngjv2yhph3y"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph pegas phangorn reshape2 shiny vegan]; };
 popsom = derive { name="popsom"; version="2.3"; sha256="0hdg1nx8mlpqw9aj2q08sb20frsc5jnbvqpfalf5kyvlygnhxdlc"; depends=[fields som]; };
 portes = derive { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5inkv2cwgzd0zi6ky0vvrc3abchqsjm2ck"; depends=[]; };
 portfolio = derive { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; };
 portfolioSim = derive { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; };
-potts = derive { name="potts"; version="0.5-3"; sha256="1pddz8d4p69wzr51zy3bnbwka1a2dr7civh72qi0rpdsrfm4jxl6"; depends=[]; };
+potts = derive { name="potts"; version="0.5-4"; sha256="1818md2mdkf47r5vcqawnn84lanir9q6r72kf41lq4zbjkk2yazv"; depends=[]; };
 poweRlaw = derive { name="poweRlaw"; version="0.30.2"; sha256="1b4ngqsh5gywksb3y9cj1yjkhxs4081svwgxwf8gpsa7fnl9c0fl"; depends=[VGAM]; };
 powell = derive { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; };
 powerAnalysis = derive { name="powerAnalysis"; version="0.2"; sha256="15ff3wnn37sjkiyycgh16g7gwl3l321fbw12kv621dad5bki14jl"; depends=[]; };
-powerGWASinteraction = derive { name="powerGWASinteraction"; version="1.1.1"; sha256="0xwyqlblhdnnv6pd2jpmz11s95zg7ylh1wa2q03zj8df330jcl70"; depends=[mvtnorm pwr]; };
+powerGWASinteraction = derive { name="powerGWASinteraction"; version="1.1.3"; sha256="1i8gfsk9qzx54yn661i4x9k7n7b6r1jd808wv1hcq7870mzyb27k"; depends=[mvtnorm pwr]; };
 powerMediation = derive { name="powerMediation"; version="0.2.4"; sha256="1b4hzai52fb0kk04az3rdbfk2vldfkhsa4gx7g98lbsvw4gh9imb"; depends=[]; };
 powerSurvEpi = derive { name="powerSurvEpi"; version="0.0.6"; sha256="1jsbrj35m296mkk47zcpb2haain6bf23k0xzphnb4sq8f06cmq1p"; depends=[survival]; };
 powerpkg = derive { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; };
 ppcor = derive { name="ppcor"; version="1.0"; sha256="18l5adjysack86ws61xh89z5xfr83v932a0pn6ad8i8py3nd85fj"; depends=[]; };
-ppiPre = derive { name="ppiPre"; version="1.7"; sha256="12my8xqb3zbiji6z6ip079gh8rkfi700pbbj1acrnrcflxz2wqzx"; depends=[AnnotationDbi e1071 GOSemSim igraph]; };
+ppiPre = derive { name="ppiPre"; version="1.8"; sha256="030jgpm91vjrjas93avxfvs0hrvdzw79p6ghfn81lakc06jjv5j8"; depends=[AnnotationDbi e1071 GOSemSim igraph]; };
 ppls = derive { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; };
 ppmlasso = derive { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; };
 pps = derive { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; };
@@ -5326,9 +5339,8 @@ pracma = derive { name="pracma"; version="1.8.3"; sha256="06711w5451gb22667i5dx2
 pragma = derive { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; };
 prais = derive { name="prais"; version="0.1.1"; sha256="0vv6h12gsbipi0gnq0w6xh6qvnvc0ydn341g1gnn3zc2n7cx8zcn"; depends=[]; };
 praktikum = derive { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; };
-prc = derive { name="prc"; version="2014.11-4"; sha256="0r4c0s80fdzc9ifbfy8aaqi7164blqgiv3vbzp9x70c4dfl3lwxx"; depends=[kyotil nlme]; };
+prc = derive { name="prc"; version="2015.6-24"; sha256="0sf664zqcq6xylhd7rvm2l2xj3f4j6llaj7j4b4847wfxnas2j02"; depends=[kyotil nlme]; };
 precintcon = derive { name="precintcon"; version="2.1"; sha256="0cadia7d2pzhnfw00m4k6qgnajv61hj879pafqnnfs6synbp3px6"; depends=[ggplot2 scales]; };
-predfinitepop = derive { name="predfinitepop"; version="1.0"; sha256="1x5ri1kvd1rd9bjp2ygqwl68yp6hyb6aly22bs5kdwv2vn9nlq9w"; depends=[]; };
 predictmeans = derive { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[ggplot2 lattice lme4 nlme pbkrtest plyr]; };
 predmixcor = derive { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; };
 prefmod = derive { name="prefmod"; version="0.8-32"; sha256="0v5r195gzbfi6jbqz8r1x2fzj3anqxf4hxaxb9krm9rkwgphrwpi"; depends=[colorspace gnm]; };
@@ -5342,6 +5354,7 @@ prevalence = derive { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sg
 prim = derive { name="prim"; version="1.0.15"; sha256="008a8fm4as5b6j70xxwiipywhbg1wmdbgjz9r7qfnivcpfarxv7f"; depends=[misc3d rgl]; };
 primer = derive { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; };
 primerTree = derive { name="primerTree"; version="1.0.1"; sha256="068j5a2rh8f1h1y7rv2xacnvkn2darzvp1adhi3hqkmwsb3znhjk"; depends=[ape directlabels foreach ggplot2 gridExtra httr lubridate plyr scales stringr XML]; };
+primes = derive { name="primes"; version="0.1.0"; sha256="0hhkgpkadvai9xcivfalsvr5w0irsxygyz3p2zngwl3g5rvvh5g9"; depends=[Rcpp]; };
 princurve = derive { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6ann978ilwhh58qi443q25z01qzxml4b5jzsd7w"; depends=[]; };
 prinsimp = derive { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; };
 prob = derive { name="prob"; version="0.9-5"; sha256="05skjqimzhnk99z864466dc8qx58pavrky320il91yqyr8b98j8b"; depends=[combinat fAsianOptions hypergeo VGAM]; };
@@ -5357,6 +5370,7 @@ proftools = derive { name="proftools"; version="0.1-0"; sha256="1wzkrz7zr2pjw5id
 prognosticROC = derive { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; };
 progress = derive { name="progress"; version="1.0.2"; sha256="1dpcfvdg1rf0fd4whcn7k09x70s7jhz8p7nqkm9p13b4nhil76sj"; depends=[prettyunits R6]; };
 proj4 = derive { name="proj4"; version="1.0-8"; sha256="06r3lavgixrsa52d1v31laqcbw6fb9xn23akv39hvaib78diglv9"; depends=[]; };
+prop_comb_RR = derive { name="prop.comb.RR"; version="1.0"; sha256="01l8gr4qv8w9k3c885j1k93pzyifqcrv9bcgjpxa2m9z4qvl9k6c"; depends=[rootSolve]; };
 propOverlap = derive { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[Biobase]; };
 propagate = derive { name="propagate"; version="1.0-4"; sha256="18vyh4i4zlsmggfyd4w0zrznk75m84k08p1qa9crind04n5581j1"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; };
 prospectr = derive { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[foreach iterators Rcpp RcppArmadillo]; };
@@ -5369,22 +5383,23 @@ protoclass = derive { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8
 protoclust = derive { name="protoclust"; version="1.5"; sha256="03qhqfqdz45s8c1p8c6sqs10i6c2ilx4fz8wkpwas3j78lgylskg"; depends=[]; };
 protr = derive { name="protr"; version="0.5-1"; sha256="1ji0vpy9rrrvbsfwi4823ywi5zbwl57zw1glxllxgwyv9l6v4bpb"; depends=[]; };
 provenance = derive { name="provenance"; version="0.2"; sha256="07wgfb5hmdd4nddl42wpqsx9vzayvngrgmcsssilbm5qbrvgv4sr"; depends=[MASS shapes smacof vegan]; };
-proxy = derive { name="proxy"; version="0.4-14"; sha256="1ijip1jmpm7dg11yv2rjcpkpg4p30m9acddbn49fbss9kcpl5b5i"; depends=[]; };
-pryr = derive { name="pryr"; version="0.1.1"; sha256="00j81iwf2mka1a953nrgar0r4wcfi4n5nl8pidnhw51lyh2285d8"; depends=[codetools Rcpp stringr]; };
+proxy = derive { name="proxy"; version="0.4-15"; sha256="17qnrihxyyyj0lx6hka4mwkgy764ha4jx00a822xjnnbygk81iqv"; depends=[]; };
+pryr = derive { name="pryr"; version="0.1.2"; sha256="1in350a8hxwf580afavasvn3jc7x2p1b7nlwmj1scakfz74vghk5"; depends=[codetools Rcpp stringr]; };
 psData = derive { name="psData"; version="0.1.2"; sha256="0w8kzivqrh1b6gq803rfd10drxdwgy0cxb5sff273m6jxzak52f2"; depends=[countrycode DataCombine foreign xlsx]; };
 psbcGroup = derive { name="psbcGroup"; version="1.1"; sha256="17kpxddvy9m87i9r1hazc8g6mm35p1452ngz80byhgw9p0jkvn5p"; depends=[LearnBayes mvtnorm SuppDists]; };
 pscl = derive { name="pscl"; version="1.4.9"; sha256="15fij6n43hry1plgzrak9vmk9xbb7n4v2frv997bhwxbs6jhhfhf"; depends=[lattice MASS]; };
+pscore = derive { name="pscore"; version="0.1-2"; sha256="1sfkxs2kv8lq87j3q9ci7j38c7gzfkp2l36lwcdhiidr2nls2x0c"; depends=[ggplot2 lavaan reshape2]; };
 psd = derive { name="psd"; version="1.0-1"; sha256="1ssda4g98m0bk6gkrb7c6ylfsd2a84fq4yhp472n4k8wd73mkdn6"; depends=[RColorBrewer Rcpp RcppArmadillo signal zoo]; };
-pse = derive { name="pse"; version="0.4.0"; sha256="1ln6b5ch99fmmcsfn8m8fl4ir7cadwq5ckggwizw9cbllw3drv0b"; depends=[boot Hmisc]; };
+pse = derive { name="pse"; version="0.4.2"; sha256="063l4lck7c2ils0klf3pk3vkqhmskhz0m537fnjhwzd7c85wdv4x"; depends=[boot Hmisc]; };
 pseudo = derive { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[geepack KMsurv]; };
 psgp = derive { name="psgp"; version="0.3-6"; sha256="0h9gyadfy0djj32pgwhg8vy2gfn7i7yj5nnsm6pvfypc3k71s2wf"; depends=[automap gstat intamap Rcpp RcppArmadillo]; };
 psidR = derive { name="psidR"; version="1.3"; sha256="1jdxbjvc309b1bs81v57kc1g7lgfdz84bfakh9qwh8wgjqbjr06i"; depends=[data_table foreign RCurl SAScii]; };
 pso = derive { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; };
 pspearman = derive { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; };
-pspline = derive { name="pspline"; version="1.0-16"; sha256="170apwfv2lbf2rggzzynrf9vi2mr0y15sm4zy8djxxpzv217iaf7"; depends=[]; };
+pspline = derive { name="pspline"; version="1.0-17"; sha256="1n3mhj6q7a1v2k8xkbwji27dihcy3845wp50sx14hy4nbay5kf1r"; depends=[]; };
 pssm = derive { name="pssm"; version="1.0"; sha256="1af5zvznh04vz5psbmq3xxclm2zh4gl4gxi1ps6aqmiqjpm57dwq"; depends=[abind MASS MHadaptive numDeriv]; };
 psy = derive { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; };
-psych = derive { name="psych"; version="1.5.4"; sha256="04n0rfr7i5yhr5ph0fdp9yrmc8m2i4zbf7bh5pvx7s7lfs08z84a"; depends=[mnormt]; };
+psych = derive { name="psych"; version="1.5.6"; sha256="17h0dmkycsz7m11g59j7cfihp28m55lq1nxycprafm5gz9bjnsbv"; depends=[mnormt]; };
 psychometric = derive { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; };
 psychomix = derive { name="psychomix"; version="1.1-2"; sha256="0kah36ps9d0dr594vfk9fy2ag2grknjjgvmkf9vzm0ny52cisc72"; depends=[flexmix Formula lattice modeltools psychotools]; };
 psychotools = derive { name="psychotools"; version="0.4-0"; sha256="17qwlxj00i0aqwf39hwr6mmxa6jy0j6dxfrp9p1xskbgi5cnvslk"; depends=[]; };
@@ -5393,8 +5408,8 @@ psyphy = derive { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97cr
 psytabs = derive { name="psytabs"; version="0.5"; sha256="0jcsv771ndf0fv76982rbv099ii4l55a8bj1mhgr54838ins0gg7"; depends=[lavaan mokken plyr psych R2HTML rtf semTools]; };
 pt = derive { name="pt"; version="1.0"; sha256="0hjijfmc9dip3ys8xg44w0fwvyzyjyjl9hpwm7j2nzg3plv6i1fz"; depends=[]; };
 ptinpoly = derive { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; };
-ptw = derive { name="ptw"; version="1.0-7"; sha256="195pa6hj3y9spyc7yxfgr8alkp48a7ccnyp64r6fyjwj6ds08b64"; depends=[]; };
-pubmed_mineR = derive { name="pubmed.mineR"; version="1.0.3.1"; sha256="1q1y3sshv5c56qgbbrrlnb1nhg052n8g2vrx32vhg304rqircxkm"; depends=[boot R2HTML RCurl XML]; };
+ptw = derive { name="ptw"; version="1.9-10"; sha256="0p73bn5qnhbjfjvhqpmwbccw0wkk0yxy5m5svy1kly5y8grylhyx"; depends=[nloptr]; };
+pubmed_mineR = derive { name="pubmed.mineR"; version="1.0.4"; sha256="044xc8yjk2qm4ppvk666ddk6kfznif6jwb49yrypxvg61ffg2s3j"; depends=[boot R2HTML RCurl XML]; };
 pullword = derive { name="pullword"; version="0.1"; sha256="1mxv63q2nfnhxcn8m17d40w792l1i7diykg6h0i42pj0rsa4ww36"; depends=[RCurl]; };
 pumilioR = derive { name="pumilioR"; version="1.3"; sha256="1zmcdp978p73bh9fdshxlrzgfg18j007xgxgr439rq90bwiwva6j"; depends=[RCurl XML]; };
 pushoverr = derive { name="pushoverr"; version="0.1.4"; sha256="1qa7cajgri3dwlvbpwn244m92n3q3apl4m5420mzsa9ngnmm8hj1"; depends=[httr]; };
@@ -5405,7 +5420,7 @@ pvrank = derive { name="pvrank"; version="1.0"; sha256="0kvy0b1x7q23pjw2ckyqzyh3
 pvsR = derive { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[httr nnet XML]; };
 pwr = derive { name="pwr"; version="1.1-2"; sha256="1czganj70qszz32yx2jprhr8h9a2lpg67gwfwfjf8kpk97qvkalj"; depends=[]; };
 pwt = derive { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; };
-pwt8 = derive { name="pwt8"; version="8.0-0"; sha256="12cgyban6waj0cxz9gb35s5v0v29rmx67ipzalzdnrjp5nsmy431"; depends=[]; };
+pwt8 = derive { name="pwt8"; version="8.1-0"; sha256="0jvskkn3c4m2lfxm9ivm8g96kcd7ynlmjpjqbrd6sqivas0z46r2"; depends=[]; };
 pxR = derive { name="pxR"; version="0.40.0"; sha256="08s62kzdgak7mjzyhd32qn93q5l7sj01vhsk7fjg9nxjvm78xxka"; depends=[plyr reshape2 RJSONIO stringr]; };
 pxweb = derive { name="pxweb"; version="0.5.54"; sha256="17vg480b54mcv9jbkci1rrn6zi90zzw098xzrcw3kvp583as9mar"; depends=[data_table httr plyr RJSONIO stringr]; };
 pycno = derive { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; };
@@ -5417,17 +5432,16 @@ qat = derive { name="qat"; version="0.73"; sha256="1fff4sv1n3i0gfgj83sy4pygxalif
 qcc = derive { name="qcc"; version="2.6"; sha256="0bsdgpsqvkz2w1qanxwx8kvrpkpzs9jgw8ml2lyqhmhqbxyg125r"; depends=[MASS]; };
 qclust = derive { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm0zy0gyn3brc1mf9jv8gmkl941cp3"; depends=[mclust mvtnorm]; };
 qcr = derive { name="qcr"; version="0.1-18"; sha256="16dfda3rwivsdhp7j5izzbk2rzwfabfmxgpq4kjc4h7r90n2vly2"; depends=[qcc]; };
-qdap = derive { name="qdap"; version="2.2.1"; sha256="0gix6l0h6q0c2pl38d3qp3pzs1m3j96rcb9n6q9k1nh0002vfnsg"; 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]; };
+qdap = derive { name="qdap"; version="2.2.2"; sha256="06y4a35ki7cml5sgr5q8cc8wh6rwv4xcrd7rki18ykyjhq4y4gc6"; 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 = derive { name="qdapDictionaries"; version="1.0.6"; sha256="1icivvsi33494ycd7vfqm9zx2g2rc1m3dygs3bi0ndi798z1cvx2"; depends=[]; };
 qdapRegex = derive { name="qdapRegex"; version="0.3.2"; sha256="1hygkck4wilm2f2cg5q82a867608j3dqp7wqj3kbnh5a970lw41y"; depends=[stringi]; };
 qdapTools = derive { name="qdapTools"; version="1.1.0"; sha256="0k3mvcjj2fg2v3z8jm2z02zmrpgjpwbpcaanmp2vlykqzacsrl52"; depends=[chron data_table RCurl XML]; };
 qdm = derive { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; };
 qgraph = derive { name="qgraph"; version="1.3.1"; sha256="1wmpsgmzl9qg4vjjjlbxqav3ck7p26gidsqv3qryx56jx54164wg"; depends=[colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix plyr png psych reshape2 sem sna]; };
 qgtools = derive { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[MASS Matrix]; };
-qicharts = derive { name="qicharts"; version="0.1.3"; sha256="1f9flcz4w5s6rahk2bkddwjwba72q8himgaqdgza8phaksdzm58v"; depends=[lattice latticeExtra]; };
+qicharts = derive { name="qicharts"; version="0.2.0"; sha256="0dinkcaz3dgi4r8nxzy57czi7b0192c4b9y5wbiqqf1l7b1zjqlp"; depends=[lattice latticeExtra]; };
 qiimer = derive { name="qiimer"; version="0.9.2"; sha256="08625hz2n7yk9zk1k9sa46n2ggbw5qs0mlqkmzyjjh3qlnb1354a"; depends=[pheatmap]; };
 qlcMatrix = derive { name="qlcMatrix"; version="0.9.4"; sha256="1nkk712h9nnaqshw766mvk72w6gq9abyry4q1a0ghn0naq3gyl0s"; depends=[Matrix slam]; };
-qlspack = derive { name="qlspack"; version="2.2"; sha256="0b9sqvnvldhd8vymajrbql0vn70rml13jgsq5ihm6skzq5qms7y6"; depends=[geepack]; };
 qmap = derive { name="qmap"; version="1.0-3"; sha256="1c7qvmd5whi446nzssqvhz1j2mpx22nlzzdrcql84v18ry0dr18m"; depends=[fitdistrplus]; };
 qmethod = derive { name="qmethod"; version="1.3.1"; sha256="01yj8fr6d615lydb7111lb9qhkg1c6xy8gp2225as53mzbsc890i"; depends=[digest GPArotation knitr psych xtable]; };
 qmrparser = derive { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; };
@@ -5462,7 +5476,7 @@ quantification = derive { name="quantification"; version="0.1.0"; sha256="098738
 quantmod = derive { name="quantmod"; version="0.4-4"; sha256="0a8gr2qb2b2w58zyxbyz3dbprmyiwf5cd62xqv4d3rk29l7vk4n8"; depends=[TTR xts zoo]; };
 quantreg = derive { name="quantreg"; version="5.11"; sha256="0pyc1zknkjyvaix76bn84l90zavajsc7jx17x0zanllnh34siizp"; depends=[SparseM]; };
 quantregForest = derive { name="quantregForest"; version="1.0"; sha256="11mnb32vz6m2g7nggip2y251rkwn6wr7jwdh0hqvl0pgalmipb84"; depends=[randomForest]; };
-quantregGrowth = derive { name="quantregGrowth"; version="0.3-0"; sha256="0iyqd4gf780xqj2gcinlx0h6r6wy4vc7sp8r4qa1s638qcrp3qwa"; depends=[quantreg]; };
+quantregGrowth = derive { name="quantregGrowth"; version="0.3-1"; sha256="0cm4ac9rn5vhqhi7f5qiilym1vp7x6bglwghw22b70nf9zvcap9h"; depends=[quantreg]; };
 quantspec = derive { name="quantspec"; version="1.0-3"; sha256="1g4arhhybw021dnz0imdfwwj328gc8yw75cgnnd00skdc402cfhk"; depends=[abind quantreg Rcpp snowfall zoo]; };
 questionr = derive { name="questionr"; version="0.4.3"; sha256="13mmmjxg9vkn53dp9hng330bkilzdf2zqisgs21ng08b6p9dv7n4"; depends=[classInt highr htmltools shiny]; };
 queueing = derive { name="queueing"; version="0.2.5"; sha256="11a44aqq0s50vdbn7rhijajqw1rrcj1qnyjjd8dn1cc5nvq141k7"; depends=[]; };
@@ -5479,17 +5493,17 @@ r4ss = derive { name="r4ss"; version="1.22.1"; sha256="1rjnglwa3i8rlzyqqr5h8yh7v
 rARPACK = derive { name="rARPACK"; version="0.7-0"; sha256="1r1ypa56wkxvll9yqr50f3x2krimi22lwyrkksf5zf6laksmiq1w"; depends=[Matrix Rcpp RcppEigen]; };
 rAltmetric = derive { name="rAltmetric"; version="0.6"; sha256="0ym8p9rq64ig3vlaimk38rmc2h1315bphx7v1rd6g4gypgx4ym15"; depends=[ggplot2 plyr png RCurl reshape2 RJSONIO]; };
 rAverage = derive { name="rAverage"; version="0.4-13"; sha256="0yfy81p99a3cb31cagxdvby7l2hcc60g3mnfizd9nvgamdmw08sy"; depends=[]; };
-rAvis = derive { name="rAvis"; version="0.1.2"; sha256="0m5dl8as0vmmsd3j0z0xwcpq55yfax42fa67qn4lsnaglyqmd4lm"; depends=[gdata maptools raster RCurl rgdal scales scrapeR sp stringr XML]; };
+rAvis = derive { name="rAvis"; version="0.1.4"; sha256="0svplnrn8rrr59v04nr1pz7d5r4dr1kdl0bd3kg8c3azxv47mxbp"; depends=[gdata maptools raster RCurl rgdal scales scrapeR sp stringr XML]; };
 rBeta2009 = derive { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; };
 rCMA = derive { name="rCMA"; version="1.1"; sha256="0dswshg80hbgcib5x9w791sh71q5s4435q8sm9dh170v4ngbax0w"; depends=[]; };
 rCUR = derive { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[lattice MASS Matrix]; };
 rCarto = derive { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[classInt maptools RColorBrewer]; };
 rChoiceDialogs = derive { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; };
 rClinicalCodes = derive { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[RCurl rjson stringr tm XML]; };
-rDEA = derive { name="rDEA"; version="1.1-1"; sha256="17j7cz08nd5sgr1z75jlrdjl9ffkdhmzmqcyrf1qcy36v9i2fqzk"; depends=[maxLik slam truncnorm truncreg]; };
+rDEA = derive { name="rDEA"; version="1.2-1"; sha256="0zm9vnysj5j3kq8n8ljgxqn45jf1c6cg7mcvpd36bs75kz03bwig"; depends=[maxLik slam truncnorm truncreg]; };
 rDNA = derive { name="rDNA"; version="1.30.1"; sha256="12h83zirv55sryc1zww97ws8kvsym1z7p7y5d4w43nam8mi3fpcd"; depends=[rJava]; };
 rDVR = derive { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; };
-rEMM = derive { name="rEMM"; version="1.0-9"; sha256="0b3g30s8nw107y5yg113xdw1s2h96mq0j5cldj01z3j676idjgw5"; depends=[clusterGeneration igraph MASS proxy]; };
+rEMM = derive { name="rEMM"; version="1.0-10"; sha256="0yngddddrc8fwqda79vc3sz58c1amns69ycn7rbyfzqwiifsvdjk"; depends=[clusterGeneration igraph MASS proxy]; };
 rFDSN = derive { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; };
 rFerns = derive { name="rFerns"; version="1.1.0"; sha256="00ddb9zwf4hqkx9qmrndz182mg69mb5fyg0v0v4b32sy4sixnps5"; depends=[]; };
 rGammaGamma = derive { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; };
@@ -5499,7 +5513,7 @@ rJPSGCS = derive { name="rJPSGCS"; version="0.2-7"; sha256="1j8lc56q20b0qkl20r8m
 rJava = derive { name="rJava"; version="0.9-6"; sha256="008g6s6rcb5lnz5y2a2rs4iq85a4nl522g714s1w1r153qcc0jz0"; depends=[]; };
 rJavax = derive { name="rJavax"; version="0.3"; sha256="0sv2fjinp4wmdfvcpgm4hv8v3fkiiv84ywqyr4hz86j50ncd79km"; depends=[rJava]; };
 rJython = derive { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; };
-rLTP = derive { name="rLTP"; version="0.1"; sha256="0dv8jj8rgcx4cbbs10sqdblcznxgm9ld5md922ghnka4ymar244m"; depends=[RCurl]; };
+rLTP = derive { name="rLTP"; version="0.1.2"; sha256="1cr0r3v7d09bss16fxls341l71i9wkg91hr2hiyr4cl5fg35zzgb"; depends=[RCurl]; };
 rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.7.6"; sha256="03gdr4swy3dq6vkq4q44sdn7slgjzcqzd2pmhac4bghgzgk3zgj8"; depends=[plyr]; };
 rLiDAR = derive { name="rLiDAR"; version="0.1"; sha256="1zm3c3xpxk1ll0cq589k1kf69wgn93qmaqkvpgcjib0ay35q7c7f"; depends=[bitops deldir geometry plyr raster rgl sp spatstat]; };
 rLindo = derive { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; };
@@ -5525,11 +5539,11 @@ rags2ridges = derive { name="rags2ridges"; version="1.4"; sha256="1vwd39vp8xdrcz
 rainbow = derive { name="rainbow"; version="3.3"; sha256="0xiqljshkdhhkdgcvz5n9qgbxgxskpxbq14vbpil9nqw2syj9xvj"; depends=[cluster colorspace hdrcde ks MASS pcaPP]; };
 raincpc = derive { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; };
 rainfreq = derive { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; };
-ramify = derive { name="ramify"; version="0.3.0"; sha256="1pysv802pyab06zl41b71x91527fw1smw4x2lcj2xc3p95yb4zb9"; depends=[]; };
+ramify = derive { name="ramify"; version="0.3.1"; sha256="1anma8kwfhm4k74fakpifrymnrjxmmk48jf1apxkg3406xcxy020"; depends=[]; };
 ramps = derive { name="ramps"; version="0.6-13"; sha256="1y7jaajzbf6d9xwr0rg0qr43l8kncgwbpfy5rpka90g3244v8nwz"; depends=[coda fields maps Matrix nlme]; };
 randNames = derive { name="randNames"; version="0.2"; sha256="0mgfwdbadfvxg1dp8aqp2c24lkhz3bi9ssmym4ns6xjq088l3ldh"; depends=[dplyr httr jsonlite]; };
 randaes = derive { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; };
-random = derive { name="random"; version="0.2.4"; sha256="17d1gcdymgcc08hx3998vs0x70fn8gxw2a1ycm9z7xrasx03g7kn"; depends=[curl]; };
+random = derive { name="random"; version="0.2.5"; sha256="0n96zv3b95msahpzdwfqsd9i9bq2z94flxxm8ghnqb0b75qcsdg0"; depends=[curl]; };
 random_polychor_pa = derive { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; };
 randomForest = derive { name="randomForest"; version="4.6-10"; sha256="0glj08w6sbabr3n71kzd5w3jb7vhrys8rq904j27a4xk0qp4s5lv"; depends=[]; };
 randomForestSRC = derive { name="randomForestSRC"; version="1.6.1"; sha256="174ky1wwdpq6wkn8hanfpfgy55jf6v1hlm6k688gjs0515y5490r"; depends=[]; };
@@ -5538,7 +5552,7 @@ randomLCA = derive { name="randomLCA"; version="1.0-2"; sha256="14v6jmsbyzmavxjd
 randomNames = derive { name="randomNames"; version="0.0-8"; sha256="10fhqxnnw6gk5g8jnb83hh2nvvj65g8mwy7rfln8yzq93gjxnykm"; depends=[data_table]; };
 randomUniformForest = derive { name="randomUniformForest"; version="1.1.5"; sha256="1amr3m7h5xcb8gahrr58233chsnx1naf9x5vpjy9p5ivh71xcxf7"; depends=[cluster doParallel foreach ggplot2 gtools iterators MASS pROC Rcpp]; };
 randomizationInference = derive { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[matrixStats permute]; };
-randomizeBE = derive { name="randomizeBE"; version="0.3-1"; sha256="06hj614wp9lb348qwyqgw5zk2vn0m81bkwz4jprgjd72kpy8kv1h"; depends=[]; };
+randomizeBE = derive { name="randomizeBE"; version="0.3-2"; sha256="1mkq1fpr7bwlk01246qy6w175jcc94q8sb3pyjkdr8yms6iqk8i7"; depends=[]; };
 randomizr = derive { name="randomizr"; version="0.2.2"; sha256="0g870sr8zjfl1dh3ay14kd6v6jg2qw86w2wcdzr8f201xy5i1fgr"; depends=[]; };
 randtests = derive { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; };
 randtoolbox = derive { name="randtoolbox"; version="1.16"; sha256="03z4g2mmdywsgl95xbj80awirkgrghdk2kwhsh58p00aq4bpl5ff"; depends=[rngWELL]; };
@@ -5551,7 +5565,7 @@ rapportools = derive { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12a
 rareGE = derive { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; };
 rareNMtests = derive { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; };
 rasclass = derive { name="rasclass"; version="0.2.1"; sha256="04g2sirxrf16xjmyn4zcci757k7sgvsjbg0qjfr5phbr1rssy9qf"; depends=[car e1071 nnet randomForest RSNNS]; };
-raster = derive { name="raster"; version="2.3-40"; sha256="1swfhf6c70ybvlkw5v2wg0zbzsmzn63n9fkwj4sfp3n08flikma2"; depends=[sp]; };
+raster = derive { name="raster"; version="2.4-15"; sha256="0p2wrzagdj1v7ambj2grjg10xzahb5z1nz1qdxjf1p0v10hf3pfx"; depends=[Rcpp sp]; };
 rasterVis = derive { name="rasterVis"; version="0.35"; sha256="0kdpng32b3l0hsf24zzj5m5srcka1wr26dpxfjxxsyilg6frp83r"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp zoo]; };
 rateratio_test = derive { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; };
 raters = derive { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; };
@@ -5562,14 +5576,14 @@ rbamtools = derive { name="rbamtools"; version="2.10.0"; sha256="00y5393nac4x1vz
 rbefdata = derive { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; };
 rbenchmark = derive { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; };
 rbhl = derive { name="rbhl"; version="0.1.0"; sha256="1m2n1qczhhdlv9pkmw9dlqi2wmdw8wac8d557c4rk0vnzwzgpgpi"; depends=[httr plyr RJSONIO XML]; };
-rbison = derive { name="rbison"; version="0.4.5"; sha256="1bvirsil4674r5xb0ksmzdrg0km988rsmq93mr0q6a089zw9lhna"; depends=[dplyr ggplot2 gridExtra httr jsonlite mapproj maptools plyr sp]; };
+rbison = derive { name="rbison"; version="0.4.8"; sha256="10kwlf7vrzw2rhsdwih5lcvjw0bz0n88mp74ayc9331d8j226214"; depends=[dplyr ggplot2 httr jsonlite mapproj plyr sp]; };
 rbitcoinchartsapi = derive { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RCurl RJSONIO]; };
 rbmn = derive { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; };
 rbounds = derive { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; };
 rbugs = derive { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; };
 rbundler = derive { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; };
 rcbalance = derive { name="rcbalance"; version="1.6"; sha256="0nbwsisx4ajdccywwvpg2xcaf8b4b25zij2qcb39yzmlz0yk6jjz"; depends=[MASS plyr]; };
-rcdd = derive { name="rcdd"; version="1.1-8"; sha256="09bb92rp44palx9dvc9pb0gdmb1g22289xjk8p9s918lalc6i9aw"; depends=[]; };
+rcdd = derive { name="rcdd"; version="1.1-9"; sha256="1mwg9prf7196b7r262ggdqsfq1i7czm1a0apk4j5014cxzyb6j5s"; depends=[]; };
 rcdk = derive { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint iterators png rcdklibs rJava]; };
 rcdklibs = derive { name="rcdklibs"; version="1.5.8.4"; sha256="0mzkr23f4d639vhxfdbg44hzxapmpqkhc084ikcj93gjwvdz903k"; depends=[rJava]; };
 rchallenge = derive { name="rchallenge"; version="1.1"; sha256="1qad0mcadr3zw5r37rgwnqf4ic9brlw3zl5n4jcxyaj324fj4pa3"; depends=[knitr rmarkdown]; };
@@ -5601,9 +5615,8 @@ rebird = derive { name="rebird"; version="0.1.1"; sha256="0s8wmp2sghs56ppca57fjf
 rebmix = derive { name="rebmix"; version="2.7.1"; sha256="1m3mmqi4kfai0hx2khkblqairp59fgh0japg23rgib1djmdcqb4n"; depends=[]; };
 rebus = derive { name="rebus"; version="0.0-5"; sha256="06rl6knnk93k537hhjx4r55hq6hssij7xc426ilki329vwfi5kyf"; depends=[]; };
 recalls = derive { name="recalls"; version="0.1.0"; sha256="121r2lf32x4yq8zxx6pbnphs7ygn382ns85qxws6jnqzy52q41vh"; depends=[RCurl RJSONIO]; };
-reccsim = derive { name="reccsim"; version="0.9-1"; sha256="17nsp91xq20vfwjfwav80qjs2wc7gwpmrdnwv7lc61baq0kkcs7k"; depends=[]; };
 recluster = derive { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; };
-recommenderlab = derive { name="recommenderlab"; version="0.1-5"; sha256="1hpgd2la4wnlxx5h8cjni4i978hdssr041zrg851lpjrkbxmxfsi"; depends=[arules Matrix proxy registry]; };
+recommenderlab = derive { name="recommenderlab"; version="0.1-6"; sha256="1ds1zvjgn3k7pha8pf3x7q0403zjf45b9hjsw3ixfzd747kwkaw0"; depends=[arules Matrix proxy registry]; };
 recommenderlabBX = derive { name="recommenderlabBX"; version="0.1-0"; sha256="0dl79cxarsfp8l4nxnns05jwnjygigjhwpjrr4lzx4nvsfxmgsr2"; depends=[recommenderlab]; };
 recommenderlabJester = derive { name="recommenderlabJester"; version="0.1-0"; sha256="1m5jg8gs16cwwwcnjzqkyzwyip8fshrwhmqz8g7nlf6g3p9347rl"; depends=[recommenderlab]; };
 reconstructr = derive { name="reconstructr"; version="1.1.0"; sha256="1kswvpmhk3zzwm4nv6pjb80ww95n9bd4q9j7bhk9kql8v5mnfg5m"; depends=[Rcpp]; };
@@ -5618,8 +5631,8 @@ refund = derive { name="refund"; version="0.1-11"; sha256="1afsxab1jivs4vj6diqh7
 refund_wave = derive { name="refund.wave"; version="0.1"; sha256="1vnhg7gi5r8scwivqjwhrv72sq8asnm4whx3jk39saphdxpk5hxv"; depends=[glmnet wavethresh]; };
 regRSM = derive { name="regRSM"; version="0.4"; sha256="1rg74jqj8rw69q6my0n4alflx7mgfwng35ff72bxwjhn9ghhj347"; depends=[]; };
 regexr = derive { name="regexr"; version="1.0.2"; sha256="1mr8qmiz9bgq5v6f065z40aj9zllidsv6gg8mjc28zxmkz5zn6gp"; depends=[]; };
-registry = derive { name="registry"; version="0.2"; sha256="1ifv9sql70kylfj12cdb1j1zpk3ix728m8qj46sf1zyc5mhll01s"; depends=[]; };
-reglogit = derive { name="reglogit"; version="1.2-2"; sha256="0nq60s8l860z6nd52l6c77vamis7hl2j667gkxry0jir2pxsk4jp"; depends=[boot Matrix mvtnorm]; };
+registry = derive { name="registry"; version="0.3"; sha256="0c7lscfxncwwd8zp46h2xfw9gw14dypqv6m2kx85xjhjh0xw99aq"; depends=[]; };
+reglogit = derive { name="reglogit"; version="1.2-4"; sha256="0ma1wddxhmja268ddkpcvskqf4lwq61brswnm600fms8ks7r78d3"; depends=[boot Matrix mvtnorm]; };
 regpro = derive { name="regpro"; version="0.1.0"; sha256="0d47ffsqx1633pmf3abi7wksyng2g71mz2z9nb2zqdak794l1n44"; depends=[denpro]; };
 regress = derive { name="regress"; version="1.3-14"; sha256="0qnks28fr8siq95iiiqyvz82cbdg14i18rj7g9rqyjhiam12fshl"; depends=[]; };
 regsubseq = derive { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; };
@@ -5640,21 +5653,21 @@ relsurv = derive { name="relsurv"; version="2.0-5"; sha256="0lwmdz1hm46qlkvfvvyc
 remMap = derive { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; };
 remix = derive { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[ascii Hmisc plyr survival]; };
 remote = derive { name="remote"; version="1.0.0"; sha256="09840z50x5i8bsi49s3asqhcz84z16pyq9w50yay4h8x82w3hfh3"; depends=[foreach raster Rcpp]; };
-rentrez = derive { name="rentrez"; version="0.4.1"; sha256="1prpzfq5106f0r5z4ffjvs9qkmfaf67icj8k1wngqwmvl2wg88gq"; depends=[httr jsonlite XML]; };
+rentrez = derive { name="rentrez"; version="0.4.2"; sha256="00rf5bnp9d6jy93b1y30sf4vszai7zcp57r6n9d72krk9ha8ld9n"; depends=[httr jsonlite XML]; };
 repfdr = derive { name="repfdr"; version="1.1-3"; sha256="15f7x7vqwlpyzvzsybyz825a9dmglbrngjmajrsqlwffypgxjvi8"; depends=[]; };
 repijson = derive { name="repijson"; version="0.1.0"; sha256="16iypvsmh5r9pk2k6npp17ya5dgkxihsj29pppd3zvdpm3vvd8k1"; depends=[geojsonio ggplot2 jsonlite OutbreakTools plyr sp]; };
 replicatedpp2w = derive { name="replicatedpp2w"; version="0.1-1"; sha256="0q6mfrdjpx6nh4xgr5i7ka3xvnx9585xdhni020q4pm05rhimid2"; depends=[spatstat]; };
-replicationInterval = derive { name="replicationInterval"; version="0.3"; sha256="1zqs114514xj59dlkhw5kmq73grghmb3i5rnnq05qzgf5wjn581i"; depends=[MBESS]; };
+replicationInterval = derive { name="replicationInterval"; version="1.0.0"; sha256="1ll6gyibd41kasc3sn6hvydc6xaacx6h5q5nhj09ha36x4lgr0gb"; depends=[MBESS]; };
 repmis = derive { name="repmis"; version="0.4.4"; sha256="12sw9l2nifkvri5kvgf0br7yqqmjlq5rj58g6yik8gh7wwy5157z"; depends=[data_table digest httr plyr R_cache]; };
 repolr = derive { name="repolr"; version="2.0"; sha256="10wg07sfxcxzswf3zh5sx2cm9dxjx11zymy82a4q9awnacb5gp9b"; depends=[gee]; };
 reportRx = derive { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[aod cmprsk geoR reshape stringr survival xtable]; };
 reportr = derive { name="reportr"; version="1.1.2"; sha256="0lxnmay9vgg7dsa3scszx3v4lb6m3bv6kjl0dk7hrl7bd67azdrk"; depends=[]; };
 reports = derive { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdxb8gsvzi6v794fh81x4la9davz6w1fnxh"; depends=[]; };
-reporttools = derive { name="reporttools"; version="1.1.1"; sha256="0cnxzq679f860z063j3pbm2c5qcaz45g73khj9rdp3if0cci8ikj"; depends=[xtable]; };
+reporttools = derive { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; };
 repra = derive { name="repra"; version="0.4.2"; sha256="1djcs83z8ckpmsbyzscnysmy45z28kswzm852176b9pip21mb1w8"; depends=[assertthat data_table dplyr ggplot2 Rcpp reshape2]; };
 represent = derive { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
 reproducer = derive { name="reproducer"; version="0.1.3"; sha256="1pz2l123xc16m1pqi95khg9r267s25igcyjgr7hn9gy623cqgzah"; depends=[ggplot2 gridExtra metafor openxlsx RColorBrewer tm wordcloud xtable]; };
-rerddap = derive { name="rerddap"; version="0.1.0"; sha256="1a58vsm1m9ybafda6pak0fa7kdfscslq9855a5r2x12bzqy98k4f"; depends=[data_table digest dplyr httr jsonlite ncdf xml2]; };
+rerddap = derive { name="rerddap"; version="0.2.0"; sha256="15p3nh421k7pavjgpmj7lah8mnld3g3zmqima4v2vs81yrg72s24"; depends=[data_table digest dplyr httr jsonlite ncdf xml2]; };
 resample = derive { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; };
 resemble = derive { name="resemble"; version="1.1.1"; sha256="0mz5mxm6p1drfx2s9dx35m2bnvirr8lkjjh5b4vdk9p2cdv1qkkv"; depends=[foreach iterators pls Rcpp RcppArmadillo]; };
 reshape = derive { name="reshape"; version="0.8.5"; sha256="08jm9fb02g1fp9vmiqmc0yki6n3rnnp2ph1rk8n9lb5c1s390f4k"; depends=[plyr]; };
@@ -5683,9 +5696,9 @@ rforensicbatwing = derive { name="rforensicbatwing"; version="1.3"; sha256="0ff4
 rgabriel = derive { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; };
 rgam = derive { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp RcppArmadillo]; };
 rgauges = derive { name="rgauges"; version="0.2.0"; sha256="0p42hh32wcjcchsalpsan52kvz6nd1gw28xnydqgfzkzcqkl22dd"; depends=[data_table ggplot2 gridExtra httr lubridate plyr reshape2 scales]; };
-rgbif = derive { name="rgbif"; version="0.8.4"; sha256="13rcqqa19w3gzab4xg006kj7m5zj4x1hbxpam8yg1r3n9dad1bjz"; depends=[data_table ggplot2 httr jsonlite magrittr V8 whisker XML]; };
+rgbif = derive { name="rgbif"; version="0.8.6"; sha256="03pbqg82xqwzi0x86qpcgznxwvivrai16j5bpv8y21ipxv6dy3xw"; depends=[data_table ggplot2 httr jsonlite magrittr V8 whisker XML]; };
 rgcvpack = derive { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; };
-rgdal = derive { name="rgdal"; version="0.9-3"; sha256="011vw2pgaxgbba0a0c5ha2n0haljbn00z5km13fhgqlvhhdhzd6n"; depends=[sp]; };
+rgdal = derive { name="rgdal"; version="1.0-4"; sha256="0c0fwq11ql1spw3791x7yd8fcmi0rlsxvk2bhf0951kvc99vbyv9"; depends=[sp]; };
 rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w8c0whcxpchsx7bwjzk1q5sfqxswclqq0g"; depends=[]; };
 rgeos = derive { name="rgeos"; version="0.3-11"; sha256="1x5fna4n5ck0wfdrplj5q5cvv289fzsmlr95q86na78lvwn14fzl"; depends=[sp]; };
 rgexf = derive { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; };
@@ -5696,6 +5709,7 @@ rgp = derive { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq
 rgpui = derive { name="rgpui"; version="0.1-2"; sha256="0sh5wj4f2wj6g3r7xaq95q89n0qjavchi5kfi6sj1j34ykybbs3g"; depends=[emoa rgp shiny]; };
 rgr = derive { name="rgr"; version="1.1.11"; sha256="01hlj3nqzfsffr4k7d3iyp4mfqs1sy94d0scy64wh9kkplrzkh4i"; depends=[fastICA MASS]; };
 rgrass7 = derive { name="rgrass7"; version="0.1-0"; sha256="19fwf3gaq25x3imj9kc1112cf9dhafp0d1gjly2xh2gz1kam5wl6"; depends=[sp XML]; };
+rhandsontable = derive { name="rhandsontable"; version="0.1"; sha256="0nssb7gqx3rsc2mbic2mlzldq5vpmp97qv9c62d7pkbxxwxlm1f0"; depends=[htmlwidgets jsonlite magrittr]; };
 rhosp = derive { name="rhosp"; version="1.06"; sha256="0kii29w292kffxablqnmgvl127jwsriz0p5y5d1xd6n8yzji79j3"; depends=[]; };
 ri = derive { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; };
 riceware = derive { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; };
@@ -5704,8 +5718,6 @@ ridge = derive { name="ridge"; version="2.1-3"; sha256="1i5klabnv328kgy7p11nwdid
 ridigbio = derive { name="ridigbio"; version="0.2.2"; sha256="065pad7pprax1mgqikjrl4nygyw5mjr80j21072zb7qcki9ag2k5"; depends=[httr jsonlite]; };
 rinat = derive { name="rinat"; version="0.1.4"; sha256="1m5k1wcinm6is3mf86314scgy3xfifz7ly7il5zgqyg9jkkpywbz"; depends=[ggplot2 httr jsonlite maps plyr]; };
 rindex = derive { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; };
-ringbuffer = derive { name="ringbuffer"; version="1.1"; sha256="1jj6zdvqlkc30bnxapg0sjl5ci5kq76611smqc4jc8adzhzwrh3f"; depends=[]; };
-ringscale = derive { name="ringscale"; version="0.1.2"; sha256="1gnnapkvxmkfws8dw41gj9h3svy3h6mi4zv413aykg9vrmy7d3rp"; depends=[FITSio]; };
 rio = derive { name="rio"; version="0.2"; sha256="0v64zkxcs2bajdh9hqlhacc6msy7l3h31cvcxpj6in5hb3m1wfv3"; depends=[curl data_table foreign haven jsonlite openxlsx readODS readxl XML]; };
 rioja = derive { name="rioja"; version="0.9-5"; sha256="0bi80d8ffn1kgs0b45ia8rj057id8l3mnph16y5wc5nr8fndxrm4"; depends=[gdata lattice mgcv vegan]; };
 ripa = derive { name="ripa"; version="2.0-2"; sha256="0n1gaga0d4bb9qdlm7gksa1nwi4y28kbgwr3icwqgihf1bfb9m81"; depends=[Rcpp]; };
@@ -5715,7 +5727,7 @@ risksetROC = derive { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf
 rite = derive { name="rite"; version="0.3.4"; sha256="196ashcfj5p52qpnpnrkg7vxq87v7vhf1d7z40mk134gmxk2784j"; depends=[knitr markdown RCurl tcltk2]; };
 riv = derive { name="riv"; version="2.0-4"; sha256="1c9k62plqgxcgcm2j1s26hqvgww96n6bfjz2yk7m3p2wf8gkkyam"; depends=[MASS quantreg rrcov]; };
 rivernet = derive { name="rivernet"; version="1.0"; sha256="0za5k00k9vivpq4wr1xqc4aw7mlcxhjj2b3iiip1qy13fg7bhbjm"; depends=[]; };
-riverplot = derive { name="riverplot"; version="0.3"; sha256="1x02ci6744k3lsqh53vmpmv957b5wwr1idvn16nzixvzknixryq8"; depends=[]; };
+riverplot = derive { name="riverplot"; version="0.5"; sha256="024i1w08c51bflmw608zizif6419xx40sk6pibnqyjnk74p6y7sm"; depends=[]; };
 rivervis = derive { name="rivervis"; version="0.46.0"; sha256="19jsl5g46jcbc0kg47bsif1wrw9z9brgvwdcxqjc89shnx3hzzfv"; depends=[]; };
 rivr = derive { name="rivr"; version="0.9.2"; sha256="1xz7l7j8adhlzdasx9ljrh8z6cx017pl6761z8q4ixpcgr3vf5ws"; depends=[Rcpp reshape2]; };
 rjade = derive { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; };
@@ -5737,7 +5749,7 @@ rmarkdown = derive { name="rmarkdown"; version="0.7"; sha256="19vp2kipzw073llgvn
 rmatio = derive { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j46g4dgjy9q1c647rqd9i14hvfrpxzcfa"; depends=[lattice Matrix]; };
 rmeta = derive { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; };
 rmetasim = derive { name="rmetasim"; version="2.0.4"; sha256="1a3bhiybzdvgqnnyh3d31d6vdsp4mi33sv8ks9b9xd9r369npk86"; depends=[ade4 ape gtools]; };
-rmgarch = derive { name="rmgarch"; version="1.2-8"; sha256="19q35kzyzzs19b4xgslrnl8ihlx1wlmrwfdimnq8racfx0y46lm5"; depends=[Bessel ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; };
+rmgarch = derive { name="rmgarch"; version="1.2-9"; sha256="0nwhjypcfzaamg5kdmlx2lp5pr2xpjxdx15j5vs5ki8kvy65hzqj"; depends=[Bessel ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; };
 rminer = derive { name="rminer"; version="1.4"; sha256="07s971fpl16l4ryrbb24zwy1xx6dwia1ms4hrcpnpz3kb8f6ydda"; depends=[adabag Cubist e1071 kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart]; };
 rmngb = derive { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; };
 rmongodb = derive { name="rmongodb"; version="1.8.0"; sha256="035a76ak6wi21hdvgzzbggz0qnb53rrr2wfx97ngc8ijwhw8hjh7"; depends=[jsonlite plyr]; };
@@ -5752,8 +5764,8 @@ rngSetSeed = derive { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqk
 rngWELL = derive { name="rngWELL"; version="0.10-3"; sha256="1wijscc0s6h1ipc1r8h179y94s1bzf409xlpiyr1njaxvvvpwvw1"; depends=[]; };
 rngtools = derive { name="rngtools"; version="1.2.4"; sha256="1fcgfqrrb48z37xgy8sffx91p9irp39yqzxv7nqp1x2hnwsrh097"; depends=[digest pkgmaker stringr]; };
 rngwell19937 = derive { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; };
-rnoaa = derive { name="rnoaa"; version="0.3.3"; sha256="12iwyl0nr6d8xpl5vcqwli4rlh79y8l13sfj34457klqdzmrg126"; depends=[data_table digest ggplot2 httr jsonlite lubridate maptools plyr RCurl rgdal rgeos scales sp stringr XML]; };
-rnrfa = derive { name="rnrfa"; version="0.1.5"; sha256="0lpa0gmf9j9adq0p41jgayzcwg6220bihnsfqj55d217mfalbhnd"; depends=[RCurl rgdal rjson sp stringr XML2R zoo]; };
+rnoaa = derive { name="rnoaa"; version="0.4.2"; sha256="14fd1mp7ydpqj0wqr3nyysks36dj7bmcyirpsbrn6pjjdasn6a0s"; depends=[dplyr ggplot2 httr jsonlite lubridate rgdal scales tidyr XML]; };
+rnrfa = derive { name="rnrfa"; version="0.2.0"; sha256="0hyy2hb2a6kslp7mplgrcd9506snq311alk51hqygr4zr6k15zl1"; depends=[RCurl rgdal rjson sp stringr XML2R zoo]; };
 robCompositions = derive { name="robCompositions"; version="1.9.1"; sha256="1n8mbm62ywp1wnccv85ydm91bzp05i4fjvyriid8751pcb4zndn9"; depends=[GGally MASS pls robustbase rrcov sROC]; };
 robcor = derive { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; };
 robeth = derive { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; };
@@ -5785,7 +5797,7 @@ rowr = derive { name="rowr"; version="1.1.2"; sha256="1hvj17n3fy1jaaz551s1icjv1k
 roxygen2 = derive { name="roxygen2"; version="4.1.1"; sha256="0qr562p3jb9kqim6mj344956pikmq1137gv1p086b4k90h5c3wyd"; depends=[brew digest Rcpp stringr]; };
 royston = derive { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; };
 rpanel = derive { name="rpanel"; version="1.1-3"; sha256="1wm0dcbyvxz4ily8skz2yda44n74x2nmc4pg11ja0yvk038gjfns"; depends=[]; };
-rpart = derive { name="rpart"; version="4.1-9"; sha256="108zsalgmp4mj66m2mxr56qrh3yz0pxfij81gri224r5brypqak1"; depends=[]; };
+rpart = derive { name="rpart"; version="4.1-10"; sha256="119dvh2cpab4vq9blvbkil5hgq6w018amiwlda3ii0fki39axpf5"; depends=[]; };
 rpart_plot = derive { name="rpart.plot"; version="1.5.2"; sha256="0aw0bhd0bliih7fsvnfkdkxq65v3v3fl88irp8vxrdblqgjyc09x"; depends=[rpart]; };
 rpart_utils = derive { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; };
 rpartScore = derive { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; };
@@ -5794,7 +5806,7 @@ rpf = derive { name="rpf"; version="0.45"; sha256="1d22wjhv14rl16kljn42j4hba30x2
 rpg = derive { name="rpg"; version="1.4"; sha256="0sisn5l1qxlqg6jq4lzr7w3axkaw5jlpz8vl9gp2hs0spxsjhcyn"; depends=[RApiSerialize Rcpp uuid]; };
 rphast = derive { name="rphast"; version="1.6"; sha256="0ni8969bj3pv0wl8l0v352pqw2d5mlshsdw1rb6wlxk7qzfi5cl2"; depends=[]; };
 rplexos = derive { name="rplexos"; version="1.1.1"; sha256="1s3srk5f1ciy43vblwsy7wrwp2k2j5q52dfl4vjg69i63bh9yrpf"; depends=[data_table DBI doParallel dplyr foreach lubridate Rcpp RSQLite stringi tidyr]; };
-rplos = derive { name="rplos"; version="0.4.7"; sha256="0d6p6cgjmfv615mpvp6vxm92gxfdi6fn4mp0ixhj2gkm1hmpwwc5"; depends=[dplyr ggplot2 httr jsonlite lubridate plyr reshape2 solr whisker XML]; };
+rplos = derive { name="rplos"; version="0.5.0"; sha256="1ajwm413w7p41ifrp4flskgaqilrs3shzjbb2wnmwgwcnnkw43h9"; depends=[dplyr ggplot2 httr jsonlite lubridate plyr reshape2 solr whisker]; };
 rplotengine = derive { name="rplotengine"; version="1.0-5"; sha256="1wwpfnr5vi8z26alm8y5gply0y4iniagimldzy2z696djzz8p8p8"; depends=[xtable]; };
 rportfolios = derive { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; };
 rprime = derive { name="rprime"; version="0.1.0"; sha256="1v6n1qi0i7x8xgizbyvp1mnwc316lsan4rvam44fgjj45fcd79gd"; depends=[assertthat plyr stringi stringr]; };
@@ -5809,7 +5821,7 @@ rrBlupMethod6 = derive { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhr
 rrcov = derive { name="rrcov"; version="1.3-8"; sha256="0f71khnsvd95yh6y1hnl62vqjp1z3wg74g8jvg2q28v1ysk68p1b"; depends=[cluster lattice mvtnorm pcaPP robustbase]; };
 rrcovHD = derive { name="rrcovHD"; version="0.2-3"; sha256="18k5c590wbi0kmx4nl1mkv7h6339as0s4jcr9am8v9v3w4pn0xni"; depends=[pcaPP pls robustbase rrcov spls]; };
 rrcovNA = derive { name="rrcovNA"; version="0.4-7"; sha256="1b3ffcs1szwswsayz8q3w87wndd7xbcg5rqamhjr2damgialx3bq"; depends=[cluster lattice norm robustbase rrcov]; };
-rredis = derive { name="rredis"; version="1.6.9"; sha256="00fgrhyj6bai0kc18c2m1fsk9ja5c9q7m6dpsb8wsn4gs79mw3sc"; depends=[]; };
+rredis = derive { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; };
 rriskDistributions = derive { name="rriskDistributions"; version="2.1"; sha256="1sc0bj5sivclbq0grif99vclnlhg1k9dz4xdvng6vv392xkwbmfd"; depends=[eha mc2d msm tkrplot]; };
 rrlda = derive { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[glasso matrixcalc mvoutlier pcaPP]; };
 rrules = derive { name="rrules"; version="0.1-0"; sha256="0f9msp289akzricjrm8dvfbh2dihfbszr7ms4fld1cr30zssajin"; depends=[]; };
@@ -5819,7 +5831,7 @@ rscala = derive { name="rscala"; version="1.0.6"; sha256="065ll2xza09hi05w4hq35j
 rscproxy = derive { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; };
 rsdepth = derive { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
 rsdmx = derive { name="rsdmx"; version="0.4-6"; sha256="0hsf0jkp31qfvl4pxaqxwz1fvwgmqld3rnbk9g29g5bqwld40syc"; depends=[plyr RCurl XML]; };
-rseedcalc = derive { name="rseedcalc"; version="1.2"; sha256="1di9bzwxyxm9gs14ks9z6sixi656hz9xwmq3aaqh53cjjr1ka0rc"; depends=[]; };
+rseedcalc = derive { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; };
 rsem = derive { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[lavaan MASS]; };
 rsgcc = derive { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; };
 rsig = derive { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k6xyiwrhw08vhzz6mf3jxlqsh"; depends=[BBmisc glmnet Matrix superpc survcomp survival]; };
@@ -5833,7 +5845,7 @@ rstiefel = derive { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9l
 rstream = derive { name="rstream"; version="1.3.2"; sha256="1habswhdlx7l92s9p9554px4kf9f9mhk5vkdq2fv4wk3381c0fgi"; depends=[]; };
 rstudioapi = derive { name="rstudioapi"; version="0.3.1"; sha256="0q7671d924nzqsqhs8d9p7l907bcam56wjwm7vvz44xgj0saj8bs"; depends=[]; };
 rsubgroup = derive { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[foreign rJava]; };
-rsunlight = derive { name="rsunlight"; version="0.3.0"; sha256="148byg8180657ny01xny28sdawbq87hf89f8c1rzfjl5qwcxmbqd"; depends=[assertthat httr jsonlite plyr stringr]; };
+rsunlight = derive { name="rsunlight"; version="0.4.0"; sha256="0hmpmf0ma0bycb65bq18q4y78187y9rq0vsj2d8hdmkksvyqjviy"; depends=[httr jsonlite plyr stringr]; };
 rtable = derive { name="rtable"; version="0.1.0"; sha256="1jp7bd782ply2xb8p8xnmrds2w62bp7l2v4vlvbv1468kxhlfgf2"; depends=[knitr ReporteRs shiny tidyr xtable]; };
 rtape = derive { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; };
 rtdists = derive { name="rtdists"; version="0.2-6"; sha256="1f2yv4qq27i1fc0ys3kk31lsnbdzrmrk44widnxd19hxn4r05cs6"; depends=[evd gsl msm]; };
@@ -5847,6 +5859,7 @@ rts = derive { name="rts"; version="1.0-3"; sha256="0jqk0p2q1vx9l6zf9pbc5k3lsw4h
 rtype = derive { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; };
 rucm = derive { name="rucm"; version="0.4"; sha256="1s3q6wfp9nb50rqsaq6h2wb48qvxncmlf8l4gm18pr25wkangfxq"; depends=[KFAS]; };
 rugarch = derive { name="rugarch"; version="1.3-4"; sha256="1za92hqfaws8azf2zml1q8mlbirrdw3rb4rvwg6sclfx7z7gsqkh"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; };
+runittotestthat = derive { name="runittotestthat"; version="0.0-2"; sha256="15zdcvqkr5ivq6wk6dw8k6diginc6z7mdc18pswim90d99j2g9sm"; depends=[assertive RUnit]; };
 runjags = derive { name="runjags"; version="2.0.1-4"; sha256="1any5f7paf8a8yyvk594iixvh1l1dc87pil292sd1pq1lh2510lw"; depends=[coda lattice]; };
 ruv = derive { name="ruv"; version="0.9.5"; sha256="19n2zrbfg6kzks395iiv1wbz2zf1j25aap3iy3d8yspmasqxi93x"; depends=[]; };
 rv = derive { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrfb37hzkyy5szai52nqr2xij"; depends=[]; };
@@ -5854,7 +5867,7 @@ rvHPDT = derive { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn2
 rvTDT = derive { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; };
 rvalues = derive { name="rvalues"; version="0.3"; sha256="0fkf0gngrx1rfa67blzf3xxjwhlp2m2jplxw3z3j9vgl6ray0nqs"; depends=[]; };
 rversions = derive { name="rversions"; version="1.0.1"; sha256="1qqar1cg8218dr4hp09629jx6yvwcnwxzp8grnqcmhbc5xyx76ch"; depends=[curl xml2]; };
-rvertnet = derive { name="rvertnet"; version="0.2.2"; sha256="14afdf0mflpa2arxdy44y8mak9j3cg2cgk97idd7k4pi8vf6q0jg"; depends=[data_table ggplot2 httr jsonlite maps plyr]; };
+rvertnet = derive { name="rvertnet"; version="0.3.0"; sha256="12gsd9p5v0kqdzrjksz10s54h3v3a79njahgajpz6qf3sm6f3jmj"; depends=[dplyr ggplot2 httr jsonlite maps plyr]; };
 rvest = derive { name="rvest"; version="0.2.0"; sha256="1bg9l0wzh9xs7rpacl8s6q33hkjvv85vsl8079qsri0lr856wni7"; depends=[httr magrittr selectr XML]; };
 rvgtest = derive { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
 rworldmap = derive { name="rworldmap"; version="1.3-1"; sha256="0wrg6ap39bq88sv5axxd90yyqafn77amk5429pxd9v5a2hdm3g8w"; depends=[fields maptools sp]; };
@@ -5874,7 +5887,7 @@ sac = derive { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9
 saccades = derive { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; };
 sadists = derive { name="sadists"; version="0.2.1"; sha256="0m3rlbhgzl0xvx8bcaswbi9nsrgfhdmkywx7ynayl6q0lmslhk6a"; depends=[hypergeo orthopolynom PDQutils]; };
 sads = derive { name="sads"; version="0.2.1"; sha256="08rr3ixz6phrpdwpqk08sk8a5znggd84d7wc1zpm62kfppy0d2hc"; depends=[bbmle GUILDS MASS poilog VGAM]; };
-sae = derive { name="sae"; version="1.0-5"; sha256="05jvzq4cqb78pgdlxf8vlanx3v10n5njlw7g666nrnziy9ak8z4f"; depends=[MASS nlme]; };
+sae = derive { name="sae"; version="1.1"; sha256="1izww27cqd94yrfbszbzy44plznxsirzn0752ag7xw7qzm5ywp3d"; depends=[MASS nlme]; };
 sae2 = derive { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; };
 saeSim = derive { name="saeSim"; version="0.7.0"; sha256="03zfw18fvx8blh9iijh3rnglg8zbsvd9dq3kqv6ajz3hwr90z29g"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; };
 saemix = derive { name="saemix"; version="1.2"; sha256="1whwn54iiapdfig6qpzji3z3skir6jrs34dq78zlynibgrg95hx6"; depends=[]; };
@@ -5883,8 +5896,9 @@ safeBinaryRegression = derive { name="safeBinaryRegression"; version="0.1-3"; sh
 safi = derive { name="safi"; version="1.0"; sha256="1km58w57kdmyfj4a97zhnjcka4q4pxm8r2br01qq2niaihpbzp98"; depends=[]; };
 sampSurf = derive { name="sampSurf"; version="0.7-3"; sha256="165y2z9bhf7cyrh177fk87apqpgzyn69gf53f9mmii931cyykihw"; depends=[boot raster rasterVis sp]; };
 sampleSelection = derive { name="sampleSelection"; version="1.0-2"; sha256="1hzvvwvqp6v9d6ldm17kx3g8pbgngw2pxklny0b3man47zh5jshc"; depends=[Formula maxLik miscTools systemfit]; };
+samplesize = derive { name="samplesize"; version="0.2-2"; sha256="1sfyzrws6zy3m5dqyp1hqs6y5znkxfpayznz59a54s03r8c7xizk"; depends=[]; };
 samplesize4surveys = derive { name="samplesize4surveys"; version="2.4.0.900"; sha256="199g2gsbv1w1acn7nnlv2wbrhq7lc1mx8vvs1w9a9a8dkxdmml0g"; depends=[TeachingSampling]; };
-sampling = derive { name="sampling"; version="2.6"; sha256="11r8p29kwc0ggycbv7sm1zmazmfm4p5207l764ad4znjib0cab6p"; depends=[lpSolve MASS]; };
+sampling = derive { name="sampling"; version="2.7"; sha256="0xp0djpgns2lbgshrpxcmqa7c180ds3ymqa5asyxxl74yiric7xi"; depends=[lpSolve MASS]; };
 samplingEstimates = derive { name="samplingEstimates"; version="0.1-3"; sha256="1srdchlpxksfdqhf5qdvl7nz0qsxkxww7hzqj0q71asbzlq3am3p"; depends=[samplingVarEst]; };
 samplingVarEst = derive { name="samplingVarEst"; version="0.9-9"; sha256="04wgsq3sh69iy8p07ch210p22n5mds7cxp5s6zggzamqpf0hpnw7"; depends=[]; };
 samplingbook = derive { name="samplingbook"; version="1.2.0"; sha256="1vynz6hsnz5d0vg66f8k67h24rb809k9chb4waymk6vwnp8lksz9"; depends=[pps sampling survey]; };
@@ -5900,16 +5914,18 @@ saves = derive { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6
 saws = derive { name="saws"; version="0.9-6.1"; sha256="0w40j6xczqs74z1z3na4510w06px7yn55s2mw9mddd6736l56fv1"; depends=[gee]; };
 sbgcop = derive { name="sbgcop"; version="0.975"; sha256="0f47mvwbsym4khwgl0ic3pqkw3jwdah9a48qi3q93d46p2xich61"; depends=[]; };
 sbioPN = derive { name="sbioPN"; version="1.1.0"; sha256="0yvg55xnkhm35hfl7rldy2grb26hm4a68jr4x9n45fs7hhdylxri"; depends=[]; };
+sbmSDP = derive { name="sbmSDP"; version="0.2"; sha256="1sl46lqi6w0s7ghv4bywhic56cm2vib3kawprga760m6igargx4y"; depends=[Rcpp RcppArmadillo]; };
 sca = derive { name="sca"; version="0.8-9"; sha256="024yxm1rlyz3hx9viv2nb6rapy938diaknc3nzkgq0ffky2gf0s3"; depends=[]; };
 scaRabee = derive { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; };
 scagnostics = derive { name="scagnostics"; version="0.2-4"; sha256="0fhc7d2nfhm8w6s6z1ls6i8d7c90h4q7rb92rz8pgq3xh031hpcf"; depends=[rJava]; };
 scales = derive { name="scales"; version="0.2.5"; sha256="12xrmn1vh64dl46bq7n7pa427aicb2ifjrby9in3m32nyvir0kac"; depends=[dichromat labeling munsell plyr RColorBrewer Rcpp]; };
 scalreg = derive { name="scalreg"; version="1.0"; sha256="06iqij1cyiw55ijzk2byrwh3m5iwsra7clx8l4v69rc236q8zbdi"; depends=[lars MASS]; };
-scam = derive { name="scam"; version="1.1-8"; sha256="1190xdahr4cx50qn32lxqm3p8m9c3968qx6f5mpyicaw34j9whz4"; depends=[Matrix mgcv]; };
+scam = derive { name="scam"; version="1.1-9"; sha256="1hx8y324bgwvv888d34wq0nnmqalfh5f26b5n36saaizm4a12wyf"; depends=[Matrix mgcv]; };
 scape = derive { name="scape"; version="2.2-0"; sha256="0dgbh65fg6i5x4lpfkshn382zcc4jk1wp62pwd2l2f59pyfb92a3"; depends=[coda Hmisc lattice]; };
 scar = derive { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; };
+scatterD3 = derive { name="scatterD3"; version="0.1.1"; sha256="1xrs1a68x29fyzg6a3frr3nlapi1k6nk3ndg54fm6f54k8hvxdf3"; depends=[htmlwidgets]; };
 scatterplot3d = derive { name="scatterplot3d"; version="0.3-35"; sha256="1w0r7cyz01rzmgcf2x7wa4xs88ga6fd67wksyjyzrh2pdcbc56yx"; depends=[]; };
-schoRsch = derive { name="schoRsch"; version="1.1"; sha256="0bi2vn9qr49yy3g45xgglqn1b5b6z8cbn9phzmqjc1v7rn80s5zg"; depends=[]; };
+schoRsch = derive { name="schoRsch"; version="1.2"; sha256="1dz4mws227a5h3kkmpnz06liy9n3k01ihvcxxwnj8283w3b23bci"; depends=[]; };
 scholar = derive { name="scholar"; version="0.1.2"; sha256="1h1a6psgmiifi7p87ar3fr0mcfmg44yh4683dmqxrxrfcvgaxvca"; depends=[plyr R_cache stringr XML]; };
 schoolmath = derive { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; };
 schwartz97 = derive { name="schwartz97"; version="0.0.6"; sha256="0l34f30l75zrg3n377jp0cw7m88cqkgzy6ql78mrx8ra88aspfzn"; depends=[FKF mvtnorm RUnit]; };
@@ -5924,15 +5940,16 @@ scrime = derive { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0y
 scriptests = derive { name="scriptests"; version="1.0-15"; sha256="1f55rnz4zbywyn79l2ac2600k95fwxgnyh1wzxvyxjh4qcg50plv"; depends=[]; };
 scrm = derive { name="scrm"; version="1.6.0-2"; sha256="1a3m56j4ca526mjhc7h0967k5bja336dw1bpna119l5yic6hkc1n"; depends=[Rcpp]; };
 scrypt = derive { name="scrypt"; version="0.1.0"; sha256="1hc1rziigwggdx2pvklldkw88mdzbwa8b8a2a0ip4cm1w6flsl9n"; depends=[Rcpp]; };
-scuba = derive { name="scuba"; version="1.7-0"; sha256="11mdc8pj552ag36ib4sfbjv8r0psa6wnb13spz0v3rbaslz25hpw"; depends=[]; };
-sda = derive { name="sda"; version="1.3.6"; sha256="1igdkgpxlni4d8h5k912aikbd66jqkabzq144xlgd2vp3kcbw4ly"; depends=[corpcor entropy fdrtool]; };
+scuba = derive { name="scuba"; version="1.8-0"; sha256="1hlgvbcx7xmpaaszyqvhdwvwmf8z209jkf6aap205l3xkkc692c4"; depends=[]; };
+sdPrior = derive { name="sdPrior"; version="0.2"; sha256="12aiddnwhlvvnh9f5jivrs4ml0g6hm9pg828xk39d8kzz43alwzg"; depends=[caTools GB2 MASS]; };
+sda = derive { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; };
 sdcMicro = derive { name="sdcMicro"; version="4.5.0"; sha256="1cz34g6si7f8kgybcvcsr0lkcspqp3vrkvfqsfdjd0mb8lv5pbjj"; depends=[brew car cluster data_table e1071 knitr MASS Rcpp robustbase sets xtable]; };
 sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.2.0"; sha256="0bhrpric17y1ljm18a00i6bkxfq1cpljfkib8qbb4jyj5s50f3ps"; depends=[cairoDevice foreign gWidgets gWidgetsRGtk2 Hmisc sdcMicro vcd]; };
 sdcTable = derive { name="sdcTable"; version="0.18.1"; sha256="18l6d6q6pawvswj1v9mfmcg4m94dkp38yd2mnndz9l7qmvf6n7kx"; depends=[data_table lpSolveAPI Rcpp Rglpk stringr]; };
 sdcTarget = derive { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; };
 sddpack = derive { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
 sde = derive { name="sde"; version="2.0.13"; sha256="194dkwrww9win5chhlffjv1xkhpxx2bcv6hf81xaqk7pdf7ifj80"; depends=[fda MASS zoo]; };
-sdef = derive { name="sdef"; version="1.5"; sha256="1xmx3nfjjfh6zw1vq7iip4rnshh40azja83xyvnz04jcv574vhxm"; depends=[]; };
+sdef = derive { name="sdef"; version="1.6"; sha256="1y1l5fl7lh636kyvc2hwssdnifl055nrz3riplj4qqw88lkm1mk8"; depends=[]; };
 sdmvspecies = derive { name="sdmvspecies"; version="0.3.1"; sha256="1rpbj55598862vb4bwrvcbskm10xibsvx58fpvkn58zbm6ab2534"; depends=[ggplot2 GPArotation psych raster]; };
 sdnet = derive { name="sdnet"; version="2.03.3"; sha256="1884pil3brm7llczacxda6gki501ddyc5m8ggqjix64kbvw37slv"; depends=[]; };
 sdprisk = derive { name="sdprisk"; version="1.1-3"; sha256="1rwzi112fjckzxmhagpg60qm9a35fqx8g8xaypxsmnml6q00ysiq"; depends=[numDeriv PolynomF rootSolve]; };
@@ -5951,23 +5968,23 @@ secrlinear = derive { name="secrlinear"; version="1.0.5"; sha256="084d0spshf3lh1
 seedy = derive { name="seedy"; version="1.2"; sha256="1m800b2faaih4xjsl3jwrqd177jjygbvrf9mb1h84hdzy095b5c0"; depends=[]; };
 seeg = derive { name="seeg"; version="1.0"; sha256="1d45vl075p4qbd74gpaa8aw1h82p9n633fym10yp9bmcv4gwksg6"; depends=[car sgeostat spatstat]; };
 seem = derive { name="seem"; version="1.0"; sha256="0cjdi9c89bqvrx9gzxph958cfqicc1qfnzsair0gvsk3cxsrw6bf"; depends=[]; };
-seewave = derive { name="seewave"; version="1.7.6"; sha256="1sh2i9hb8v0awhczvkj803lmdvg5p1fla685xb3s2a3if1q5zc5i"; depends=[fftw tuneR]; };
+seewave = derive { name="seewave"; version="2.0.1"; sha256="1xp3frkvzhd6qyp5f3y2w98p5j7adzgn5bj6gzs39cgwb3019zl9"; depends=[tuneR]; };
 seg = derive { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; };
 segmag = derive { name="segmag"; version="1.2.2"; sha256="130saznhssg0qsc34fcw80x92mmqhjgizrb4fxpjsg7a8jjrclp8"; depends=[Rcpp]; };
 segmented = derive { name="segmented"; version="0.5-1.1"; sha256="0rkbhg8wwqk08jfd29sh4ifx427kmd4mfqrssllckha9hcglqhz7"; depends=[]; };
 seismic = derive { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; };
 seismicRoll = derive { name="seismicRoll"; version="1.0.1"; sha256="1lls2gbx994j7y3kwpf00ngga5qlzqxwc3cy9x21gy9iq2s8hn0x"; depends=[Rcpp]; };
-selectMeta = derive { name="selectMeta"; version="1.0.7"; sha256="1ibiiddl9km8dahfc3kdpl42k43fx4mqgqibxgv5q8zbcp2829p9"; depends=[DEoptim]; };
+selectMeta = derive { name="selectMeta"; version="1.0.8"; sha256="0i0wzx5ggd60y26lnn4qk4n8h27ahll9732026ppks1djx14cdy0"; depends=[DEoptim]; };
 selectiongain = derive { name="selectiongain"; version="2.0.40"; sha256="1xzvz747242wfv789dl3gqvgbc8l1c4i2r3p95766ypcjw51j55d"; depends=[mvtnorm]; };
 selectr = derive { name="selectr"; version="0.2-3"; sha256="1ppm1f6mwfwbq92iwacyjn46k1d8148j4zykmjvw8as6c8blgap1"; depends=[stringr XML]; };
 selectspm = derive { name="selectspm"; version="0.1"; sha256="0bihyjaacpyjnm5vznix8krw2sqmy62in33hmb5yj4yidwz1gpv0"; depends=[ecespa spatstat]; };
-selfea = derive { name="selfea"; version="1.0"; sha256="02ncccyjgdpp9hkd278jg8x1c3566fqhfmmh423596b1slzs8gqm"; depends=[MASS plyr pwr]; };
+selfea = derive { name="selfea"; version="1.0.1"; sha256="0zyxbd5vg8nhigill3ndcvavzbb9sbh5bz6yrdsvzy8i5gzpspvx"; depends=[ggplot2 MASS plyr pwr]; };
 selfingTree = derive { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; };
 sem = derive { name="sem"; version="3.1-6"; sha256="1gx0j3ignpmgy3qvnp0qjmhlzbxj0wjfr6jfs9d29cnq8b38p73c"; depends=[boot DiagrammeR MASS matrixcalc mi]; };
 semGOF = derive { name="semGOF"; version="0.2-0"; sha256="1lsv72yaza80jqadmah7v2cpfqfay57y12hcz6brvia6bmr5qagb"; depends=[MASS matrixcalc sem]; };
 semPLS = derive { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; };
 semPlot = derive { name="semPlot"; version="1.0.1"; sha256="0sdp970qb4mz5vzncfmqxvg1z12gmiyqi3yaz9x2drm3rgzavy83"; depends=[colorspace corpcor igraph lavaan lisrelToR plyr qgraph rockchalk sem XML]; };
-semTools = derive { name="semTools"; version="0.4-6"; sha256="1rxs6kwfc4bp273i9p25v4mc2sm91fkgsg178ifd4d3235xawcvz"; depends=[lavaan]; };
+semTools = derive { name="semTools"; version="0.4-9"; sha256="1fiw6ajksbzsvrfs5wq7l4bwnp8jd068w6ifklv3jwsbyqa4lvkf"; depends=[lavaan]; };
 semdiag = derive { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; };
 semiArtificial = derive { name="semiArtificial"; version="1.2.0"; sha256="11pwdqpsf5d5g74s2b8ixmrh2khkha3d4akzlkn652s98qr55dpc"; depends=[cluster CORElearn fpc MASS mclust nnet RSNNS timeDate timeSeries]; };
 semisupKernelPCA = derive { name="semisupKernelPCA"; version="0.1.5"; sha256="1v8wdq63b1gqicj8c9a24k0w7cc0bkg0mnc9z5mklsfcl7g0g6k9"; depends=[datautils irlba]; };
@@ -5983,23 +6000,23 @@ sensory = derive { name="sensory"; version="1.0"; sha256="0mfjj3lsx5i8bc8ikhqwyc
 separationplot = derive { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; };
 seqCBS = derive { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; };
 seqDesign = derive { name="seqDesign"; version="1.1"; sha256="1694swd8ik9fbiflmnw4xpq82kq18rqzkw0dv5pvq30c47xjgamv"; depends=[survival xtable]; };
-seqMeta = derive { name="seqMeta"; version="1.5"; sha256="1igag08qkfvkx83w6jjyfmjpxil9wvag1yfnxp3pqbglj9l99pmn"; depends=[CompQuadForm coxme Matrix survival]; };
+seqMeta = derive { name="seqMeta"; version="1.6.0"; sha256="1ha6vsaapac6p18r5df2z39vzsb9qr6kyb9g6h53km588zk280zl"; depends=[CompQuadForm coxme Matrix survival]; };
 seqPERM = derive { name="seqPERM"; version="1.0"; sha256="1i8ai4gxybh08wxjh96m6xlqxhh7ch0xihjs879snmy4zqfi0pap"; depends=[]; };
 seqRFLP = derive { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; };
 seqinr = derive { name="seqinr"; version="3.1-3"; sha256="0bbjfwbqg74wsamb3iz01g0ssdpdpg65gh00y9xlnpk4wb990n4n"; depends=[ade4]; };
-seqminer = derive { name="seqminer"; version="4.2"; sha256="026minlmqf4n6pznkzkm6daqa7pj7hmis0i2azdy2m56a9hkj52z"; depends=[stringr]; };
+seqminer = derive { name="seqminer"; version="4.5"; sha256="18s2gvc55fx3x4bnfa580gqhrc62pz4az2i9dvbpnnk4aazj3ny8"; depends=[]; };
 seqmon = derive { name="seqmon"; version="0.2"; sha256="075hc6vgl1w3nisrihf5w6mkkg9q601jsqxm9hk9yagyvvd7d78w"; depends=[]; };
 sequences = derive { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; };
 sequenza = derive { name="sequenza"; version="2.1.1"; sha256="0vrdmfy8qyzjflyl5skcy9mazl56py5gzb1kn1xh2hiv3mshdrfx"; depends=[copynumber squash]; };
-seriation = derive { name="seriation"; version="1.1-0"; sha256="0lbkv005ws4khwp12mygrpvxxdz8g5a7q2xl62k43sz6vj7cp8cn"; depends=[cluster colorspace gclus gplots MASS registry TSP]; };
+seriation = derive { name="seriation"; version="1.1-1"; sha256="127dg4n85phaj9r4y8898clh6sm78rk8pjk6v6zxfy79f7a1k96d"; depends=[cluster colorspace gclus gplots MASS registry TSP]; };
 seroincidence = derive { name="seroincidence"; version="1.0.4"; sha256="0m3hlbv3277qyhqi3liwbna7czd6kdc7gqaxc7xn5x8d2hsc45hk"; depends=[]; };
 servr = derive { name="servr"; version="0.2"; sha256="0gah99snaj8lk5zfzbxi3jwvpnlff9diz9gqv4qalfxpmb7fp6lc"; depends=[httpuv jsonlite mime]; };
 sesem = derive { name="sesem"; version="1.0.1"; sha256="0s4xkv6bc5nxhj09mk9agnj11b9h7swccs9jrn4lg3fy12vqhf5a"; depends=[gplots lavaan mgcv]; };
 session = derive { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; };
 setRNG = derive { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; };
-sets = derive { name="sets"; version="1.0-14"; sha256="1wfg4yc3p7zqcj2z3lb5knv6l3lw4pf20s3rkpz4yj4nsb41zs4g"; depends=[]; };
+sets = derive { name="sets"; version="1.0-15"; sha256="12qzgigjsz6y52qnxhx5yv91y38crlyivnzcijwhfix9lbyynrbg"; depends=[]; };
 settings = derive { name="settings"; version="0.2.2"; sha256="0bssy42kkb1aww9yndkyw3bj1jn3akvwsvhj0cz16r3a7jfcav7h"; depends=[]; };
-setwidth = derive { name="setwidth"; version="1.0-3"; sha256="1s6m24kmkafscgibgfldm70m57bv4gs0m7fdki18nwdi1rvwpkbf"; depends=[]; };
+setwidth = derive { name="setwidth"; version="1.0-4"; sha256="0i565phbfj0rff13nyz6sy8cn4cch4fcjfgkns3z6c94w11b4703"; depends=[]; };
 severity = derive { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; };
 sfa = derive { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; };
 sfsmisc = derive { name="sfsmisc"; version="1.0-27"; sha256="16hkm0ylwipc1zqsi8fiwyqvl9hpjgl7kyvgamibxlbp1y669qgm"; depends=[]; };
@@ -6028,7 +6045,7 @@ shinyRGL = derive { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk6
 shinyTree = derive { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; };
 shinybootstrap2 = derive { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; };
 shinydashboard = derive { name="shinydashboard"; version="0.5.0"; sha256="1q2g0vdid14id489ybfhf6x67bmc4g2zhamw3vx9piqvdlfmnqg5"; depends=[htmltools shiny]; };
-shinyjs = derive { name="shinyjs"; version="0.0.6.2"; sha256="0z9lw680bhfzm40j1ffy6y3vfxjkz9457w62rjrw32nssv8vjqvs"; depends=[shiny]; };
+shinyjs = derive { name="shinyjs"; version="0.0.7.0"; sha256="0yrv7qy7wbsi45gqia3vl0s7mi758j7qbkmh2hdbfs0aj7jxgr7y"; depends=[shiny]; };
 shinythemes = derive { name="shinythemes"; version="1.0.1"; sha256="0wv579cxjlnd7wkfqzy2x3qk7d1abql1nhw10rx1c4c808vsylkw"; depends=[shiny]; };
 shopifyr = derive { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[R6 RCurl RJSONIO]; };
 shotGroups = derive { name="shotGroups"; version="0.6"; sha256="0khcgzli6114yqrglmsvhr8rwkkkwdkd06b50isbc24vpv6xbfx9"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; };
@@ -6046,7 +6063,7 @@ sig = derive { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4
 sigclust = derive { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; };
 sigloc = derive { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[ellipse nleqslv]; };
 signal = derive { name="signal"; version="0.7-5"; sha256="0v6zmy25ikkrc2ravaj7k1qzxm3zdvj6g0d55lkyjv7pb3kl5m1k"; depends=[MASS]; };
-signal_hsmm = derive { name="signal.hsmm"; version="1.2.1"; sha256="0nxhksvwkidmp5x27hxmwxbv747lrwa19b4vi6dx72hny8prgvpc"; depends=[biogram seqinr shiny]; };
+signalHsmm = derive { name="signalHsmm"; version="1.3"; sha256="0hx389ibk473mfycc8sj96ppz9hri4x9ni05fv32zvzxy8b9i9jv"; depends=[biogram Rcpp seqinr shiny]; };
 signmedian_test = derive { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; };
 simFrame = derive { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; };
 simMSM = derive { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[mvna survival]; };
@@ -6064,25 +6081,26 @@ simexaft = derive { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gq
 simone = derive { name="simone"; version="1.0-2"; sha256="071krim64s7fjwvwq7bjr0pw33mw9am9wpyypcy4gs7g1hj8wcir"; depends=[mixer]; };
 simpleNeural = derive { name="simpleNeural"; version="0.1.1"; sha256="0rm6kvz1mppvgcvwsgg3nz6ci37l95ins64g0jh4rw6lfmy0grjc"; depends=[]; };
 simpleboot = derive { name="simpleboot"; version="1.1-3"; sha256="1qprjisfflhzg8ll12p3q1zcfdiyc45glic2j9cw9nhx5rb065fk"; depends=[boot]; };
-simplexreg = derive { name="simplexreg"; version="1.0"; sha256="144kljh968i7n2d21r4204i4h952mfrkfc8b5r6x760msgjphxvh"; depends=[Formula plotrix]; };
+simplexreg = derive { name="simplexreg"; version="1.1"; sha256="0iyrkynhrkdix27r105wv0yn5yc8cgrf6hlv4byi9mz6y05f9i7p"; depends=[Formula plotrix]; };
 simrel = derive { name="simrel"; version="1.0-1"; sha256="0905rjqh8c08vyg090h0i7sx89vdryignslldzfz2r5yrszl4ga8"; depends=[FrF2 sfsmisc]; };
 simsalapar = derive { name="simsalapar"; version="1.0-5"; sha256="1z3dwylfrl08pq2k5ppfma3ijh356qc7wwdvgyp3wmw1bcq1amyf"; depends=[colorspace gridBase sfsmisc]; };
-simsem = derive { name="simsem"; version="0.5-8"; sha256="1kir1c0g5xb4gzmpvx13qp071b3d5v0br3093q394wzp22d816xk"; depends=[lavaan]; };
+simsem = derive { name="simsem"; version="0.5-11"; sha256="0k93wck82wpxrckf7g8x7iik0134wmz5n8y2d086lb24ic2231zz"; depends=[lavaan]; };
 siplab = derive { name="siplab"; version="1.1"; sha256="1b5drhla4p7n1y1cp7kqwqzw0b286kgij9j6wsks5vjgy5qfal1x"; depends=[spatstat]; };
 sirad = derive { name="sirad"; version="2.0-7"; sha256="009icj1jil757vvsf88sgmdz40swrx1qvrhnx7wwj7p3dlh78pvw"; depends=[ncdf raster RNetCDF zoo]; };
-sirt = derive { name="sirt"; version="1.7-0"; sha256="12z1gk92rll5lxycv3gvz6y5ia5pbysq5fr3y62xn3wwgm2vrpch"; depends=[CDM coda combinat gtools ic_infer igraph lavaan lavaan_survey MASS Matrix mirt mvtnorm pbivnorm psych qgraph Rcpp RcppArmadillo semPlot sfsmisc sm survey TAM]; };
+sirt = derive { name="sirt"; version="1.8-9"; sha256="19kkn2a18kpv6vk45xbi3662mfbmcrz06aq994fzynar2nbix3f0"; depends=[CDM coda combinat gtools ic_infer igraph lavaan lavaan_survey MASS Matrix mirt mvtnorm pbivnorm psych qgraph Rcpp RcppArmadillo semPlot sfsmisc sm survey TAM]; };
 sisVIVE = derive { name="sisVIVE"; version="1.1"; sha256="1p1l07pgd88ap3bp0zwinnzda07pfg6cn92ync2pkqn5l0gmfxbs"; depends=[lars]; };
 sisus = derive { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[coda gdata gtools MASS moments polyapost rcdd RColorBrewer]; };
 sitar = derive { name="sitar"; version="1.0.2"; sha256="0z9r3z512s0gpkcpdbi45qdl40rp4jacpm9k0c5pjilwiga6p07z"; depends=[nlme quantreg]; };
 sitools = derive { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; };
 sivipm = derive { name="sivipm"; version="1.0-0"; sha256="1r548kfsi90rzisx37nw3w9vwj3gs4ck5zhwlskbdzgigb78spfp"; depends=[seqinr]; };
-sjPlot = derive { name="sjPlot"; version="1.8.1"; sha256="0na5c9fd4irnf1vhqhxgdhwpqyqfsqdxz47gx65r9qq294bhwc75"; depends=[car dplyr ggplot2 MASS psych scales sjmisc tidyr]; };
+sjPlot = derive { name="sjPlot"; version="1.8.2"; sha256="1fnqsayg31gk0qggs3024i4nrdardfqqsyggf8l8c6zamcx680fa"; depends=[car dplyr ggplot2 MASS psych scales sjmisc tidyr]; };
 sjdbc = derive { name="sjdbc"; version="1.5.0-71"; sha256="0i9wdfadfcabayq78ilcn6x6y5csazbsgd60vssa2hdff0ncgvk1"; depends=[rJava]; };
-sjmisc = derive { name="sjmisc"; version="1.0.2"; sha256="1hgmm5yjgnd2n3k0gjcv58pv0wxzx5pia38ycjix4vyjgbp01kq0"; depends=[MASS]; };
+sjmisc = derive { name="sjmisc"; version="1.0.3"; sha256="0yar8nr1jrazjngaxnawdhh75l5z47rc84nzvv8yz8kxb46pmgy6"; depends=[MASS]; };
 skatMeta = derive { name="skatMeta"; version="1.4.3"; sha256="0bknv066ya4yl4hl4y02d9lglq2wkl9c2j1shzg3d64dg4sjvbak"; depends=[CompQuadForm coxme Matrix survival]; };
 skda = derive { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
+skellam = derive { name="skellam"; version="0.1.3"; sha256="1w46ri4k8xg07phl7j4cb5b3qndplr027n047wzc15xcjliggg89"; depends=[]; };
 skewt = derive { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; };
-skmeans = derive { name="skmeans"; version="0.2-6"; sha256="02zw2y7s13hb6mx9w2yr5s2v1p5yxg3k67bhrl92g9n2jkbim3ni"; depends=[clue cluster slam]; };
+skmeans = derive { name="skmeans"; version="0.2-7"; sha256="007069ikrqcjj7yh4xc3jx85rj38av817lhmcw9gdnz7d0dr5h06"; depends=[clue cluster slam]; };
 sla = derive { name="sla"; version="0.1"; sha256="0fr5n65ppwsh9z7a6rma9ak0bl8x3nz7v25lij7wb5nrf3sl74yb"; depends=[]; };
 slackr = derive { name="slackr"; version="1.2"; sha256="1ymj3x52wyp0mp41xnnycg0vhdmv8whimwk1hzfsqr30pccnvn9j"; depends=[data_table ggplot2 httr jsonlite]; };
 slam = derive { name="slam"; version="0.1-32"; sha256="000636dwj4kmj5w1w5s6bqixh78m7262y3fgizj7rfhcnc2gz7ad"; depends=[]; };
@@ -6116,7 +6134,7 @@ smoothSurv = derive { name="smoothSurv"; version="1.5-2"; sha256="07yr97nzp4mfj3
 smoother = derive { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; };
 smoothie = derive { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; };
 smoothmest = derive { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; };
-smoothtail = derive { name="smoothtail"; version="2.0.3"; sha256="0yr3j5mq1h9pd72kyi9z6wzly9cqkscim814yi710y79l03gp0fd"; depends=[logcondens]; };
+smoothtail = derive { name="smoothtail"; version="2.0.4"; sha256="0wbz9r9a7a3pjkdrsxhkjfm2qrbz4jrpsx4s1vm3kz7czkh55yg7"; depends=[logcondens]; };
 sms = derive { name="sms"; version="2.3"; sha256="0grxyp590hj2rvw1fw3yidzkl8nqqp5a14bp9xfpdph2nyas61qq"; depends=[doParallel foreach]; };
 smss = derive { name="smss"; version="1.0-1"; sha256="17a0x92hxzn212yiz87n7ssyi3bdhnyawxk1kkmk46q1ss22a1pm"; depends=[]; };
 sn = derive { name="sn"; version="1.2-2"; sha256="1fsl2qjgk7lcjxszdfs7s159qwy6gyg7bsxpfg0l5rcf2mlbwf8m"; depends=[mnormt numDeriv]; };
@@ -6125,7 +6143,7 @@ snapshot = derive { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh
 snht = derive { name="snht"; version="1.0.2"; sha256="1rs9q8fmvz3x21ymbmgmgkqr7hqf3ya3xb33zj31px799jlldpb9"; depends=[ggplot2 gridExtra mgcv plyr reshape zoo]; };
 snipEM = derive { name="snipEM"; version="1.0"; sha256="0f98c3ycl0g0l3sgjgk7xrjp6ss7n8zzlyzvpcb6agc60cnw3w03"; depends=[GSE MASS mvtnorm Rcpp RcppArmadillo]; };
 snow = derive { name="snow"; version="0.3-13"; sha256="1habq43ncac9609xky3nqfkbq52cz36dg8jbdihag269z1kazdnf"; depends=[]; };
-snowFT = derive { name="snowFT"; version="1.3-0"; sha256="10hhhzzzyz1ph7c8k08s79h4pdwq4jk8bh47y37ww0yjq0fd6gik"; depends=[snow]; };
+snowFT = derive { name="snowFT"; version="1.4-0"; sha256="0gw2kn80jh1a6sg6ni9kj6ikvyq29c9dmx52k9m6gzcfpa7l0qbk"; depends=[rlecuyer snow]; };
 snowfall = derive { name="snowfall"; version="1.84-6"; sha256="1n9v9m4c02pspgkxfmq7zdk41s2vjcsk06b0kz9km4xy1x7k0hsg"; depends=[snow]; };
 snp_plotter = derive { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; };
 snpEnrichment = derive { name="snpEnrichment"; version="1.6.3"; sha256="0hg1cgyr4nlrqfv60aky8ljwh46ldslca3jmb6v6criyz6knqdv3"; depends=[snpStats]; };
@@ -6139,7 +6157,7 @@ softImpute = derive { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m14
 softclassval = derive { name="softclassval"; version="1.0-20150416"; sha256="1zrf0nmyy4pfs4dzardghzznw1ahl21w4nykfh2pp8il4dpi21fs"; depends=[arrayhelpers svUnit]; };
 soil_spec = derive { name="soil.spec"; version="2.1.4"; sha256="129iqr6fdvlchq56jmy34s6qc2j5fcfir6pa5as5prw0djyvbdv0"; depends=[GSIF hexView KernSmooth pls sp wavelets]; };
 soilDB = derive { name="soilDB"; version="1.5-4"; sha256="1n8ybryrg88m12qb6bwiqs04dxgbs4nv8ay27d2vi0xrkqhs99k2"; depends=[aqp Hmisc plyr RCurl sp XML]; };
-soilphysics = derive { name="soilphysics"; version="2.3"; sha256="1d64jaw5ra1l0za2kpigqfdf52a5zrxy9j9g2g7f5yffqsp0jwb5"; depends=[MASS rpanel]; };
+soilphysics = derive { name="soilphysics"; version="2.4"; sha256="0mxh9jv7klk85zb30agg9c60d0y6v7rxapmvmmkc985ih94r5685"; depends=[MASS rpanel]; };
 soilprofile = derive { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; };
 soiltexture = derive { name="soiltexture"; version="1.3.3"; sha256="1a0j10f6mxwrslqd4fvc1nqvsh47ly1nyhc6l0qq1iz6ffqd37mx"; depends=[MASS sp]; };
 soilwater = derive { name="soilwater"; version="1.0.1"; sha256="08rz1i5dsgwfvfd4sl5x9j970v82v3kny0rqg1zbdnr53vp2xc7j"; depends=[]; };
@@ -6155,10 +6173,10 @@ somplot = derive { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8
 sonicLength = derive { name="sonicLength"; version="1.4.4"; sha256="1v46xzx3jxxxs2biyrq6xbv2lhpz1i95la93hj6dl4jfyikmx0im"; depends=[]; };
 soobench = derive { name="soobench"; version="1.0-73"; sha256="1y2r061pd4kr0kdgp8db3qy2aj07jdiyvy2py4fmwg6b8pcf9y0l"; depends=[]; };
 sortinghat = derive { name="sortinghat"; version="0.1"; sha256="1wrxwhdp3gj1ra0rgldnmc0w019bnjb6z9j20c5p1ab09x4dmlny"; depends=[bdsmatrix MASS mvtnorm]; };
-sorvi = derive { name="sorvi"; version="0.7.20"; sha256="1cd0lg74lfdbkp314i40asc3vshs1acb20wz1cxzg62vyz6ia055"; depends=[ggplot2 plyr RColorBrewer reshape XML]; };
+sorvi = derive { name="sorvi"; version="0.7.26"; sha256="19lfrc4bdiljs437w3a2bpf7abnkv0934dh929bbj2w1w8rzghjn"; depends=[dplyr ggplot2 RColorBrewer reshape2]; };
 sos = derive { name="sos"; version="1.3-8"; sha256="0vcgq8hpgdnlmkxc7qh1jqigr0gvm9x3w4ijbhma7x4i5fx3c2il"; depends=[brew]; };
 sos4R = derive { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6la32xf928rsiznbywpxghnypsrcgg"; depends=[RCurl sp XML]; };
-sotkanet = derive { name="sotkanet"; version="0.9.10"; sha256="0nshd6caxxayr7w39d6ildz42aarr3ff8iyfpwjd544yhblkj7jh"; depends=[ggplot2 RCurl rjson]; };
+sotkanet = derive { name="sotkanet"; version="0.9.14"; sha256="11yly63kda8qrj0hkbd5y4zclvqazjvg2cv1a2g83sskd15zxxgj"; depends=[RCurl rjson]; };
 soundecology = derive { name="soundecology"; version="1.3"; sha256="1kcmsas359xcwqd0lxffr5p996jikqdag6idibq57qb6rnz3hgfz"; depends=[ineq oce pracma seewave tuneR vegan]; };
 source_gist = derive { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; };
 sp = derive { name="sp"; version="1.1-1"; sha256="1485jylvwbf99snbmp0xs13h5wlvfgwf04cbny4zgn43nipsvsik"; depends=[lattice]; };
@@ -6201,25 +6219,25 @@ spartan = derive { name="spartan"; version="2.2.1"; sha256="1syrvx3gmgsi3f49j27z
 spatcounts = derive { name="spatcounts"; version="1.1"; sha256="0rp8054aiwc62r1m3l4v5dh3cavbs5h2yb01453bw9rwis1pj2qm"; depends=[]; };
 spate = derive { name="spate"; version="1.4"; sha256="1cr63qm3hgz6viw6ynzjv7q5ckfsan7zhbp224gz4cgx5yjg0pn3"; depends=[mvtnorm truncnorm]; };
 spatgraphs = derive { name="spatgraphs"; version="2.62"; sha256="1h7sv6qc5zhaiaqlrzagrlc2mxlasdzilmi5q9nrd1vsdzsqxvb4"; depends=[]; };
-spatial = derive { name="spatial"; version="7.3-9"; sha256="12qhfqmznij1jddjklhlqzywcfw2hww8sff7b2m6mjxlky08p5jg"; depends=[]; };
+spatial = derive { name="spatial"; version="7.3-10"; sha256="0jcx476b7jpl16aqixr3h10sp0n9bwrk5jf2xgyd9sdifiba1xzk"; depends=[]; };
 spatial_gev_bma = derive { name="spatial.gev.bma"; version="1.0"; sha256="1rjn0gsbgiv69brhnm0zj25ya3nyfh4yf6jizng85mvss3viv3hj"; depends=[coda msm SpatialExtremes]; };
 spatial_tools = derive { name="spatial.tools"; version="1.4.8"; sha256="0qnsjfx974na87p3n7sp711sc13v6dmpvb2kjpvscixs8rsy03y1"; depends=[abind doParallel foreach iterators mmap raster rgdal]; };
-spatialCovariance = derive { name="spatialCovariance"; version="0.6-8"; sha256="06z6jz9sadqc382w07ysnnlhqc96hxaasz9wncbhipd4cd1y4daa"; depends=[]; };
+spatialCovariance = derive { name="spatialCovariance"; version="0.6-9"; sha256="1m86s9a059spp97y37dcirrgjshcqzpdj11cq92vji624w4nrhlb"; depends=[]; };
 spatialEco = derive { name="spatialEco"; version="0.1-1"; sha256="1k7xdgg541mwr9rk3h8pi7hgb61wza14azvmbxqd92m29p2yqn00"; depends=[cluster RANN raster RCurl rgeos rms SDMTools sp spatstat spdep]; };
 spatialTailDep = derive { name="spatialTailDep"; version="1.0.2"; sha256="107yldc43pgbadxdisnc7vq8vyvcps1b1isyvxd0kyf59xldiq47"; depends=[cubature mvtnorm SpatialExtremes]; };
 spatialkernel = derive { name="spatialkernel"; version="0.4-19"; sha256="0gbl6lrbaxzv2f975k0vd6ghrljgf1kjazld3hm7781kv1f87lji"; depends=[]; };
 spatialnbda = derive { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; };
 spatialprobit = derive { name="spatialprobit"; version="0.9-10"; sha256="1z88nss69pixazqk3b6rpyc7mjryfznrgw9swfyfxky0bsdfj6mv"; depends=[Matrix mvtnorm spdep tmvtnorm]; };
 spatialsegregation = derive { name="spatialsegregation"; version="2.40"; sha256="0kpna2198nrj93bjsdgvj85wnjfj18psdq919fjnnhbzgzdkxs7l"; depends=[spatstat]; };
-spatstat = derive { name="spatstat"; version="1.42-1"; sha256="10889xg5l7vjmlv79dhdayifplzxhnykhhgjpsn54rncz0k0hd0p"; depends=[abind deldir goftest Matrix mgcv polyclip tensor]; };
+spatstat = derive { name="spatstat"; version="1.42-2"; sha256="1wsdxl711p4vhaz69if1whjfrj81xkr6d2piw5hz0l04c6dcbac9"; depends=[abind deldir goftest Matrix mgcv polyclip tensor]; };
 spatsurv = derive { name="spatsurv"; version="0.9-9"; sha256="1zvf8n4isaxi8n47qvgw6zqrgsnf3g6jpm19k6w6zbp9v5r8fw7r"; depends=[fields geostatsp iterators Matrix RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; };
 spc = derive { name="spc"; version="0.5.1"; sha256="1299lhk8snrhm7xpq0ccmq5kmpapc13rxcyvljs4c7frj645rwz4"; depends=[]; };
 spca = derive { name="spca"; version="0.6.0"; sha256="156bz3w3999vhjpsa9cs21rf2r9hv49vw1pfak0r37kbvf2d4rm6"; depends=[MASS]; };
-spcadjust = derive { name="spcadjust"; version="0.1-3"; sha256="1l6m4aisk780znpjr7lnlh0z42rbc2jyblv17hafbr1siymrasc2"; depends=[]; };
+spcadjust = derive { name="spcadjust"; version="0.9"; sha256="05w32bznv6s5jwwv4l1392zng6ia36205j88d0i6l9hcbp2g599a"; depends=[]; };
 spcosa = derive { name="spcosa"; version="0.3-5"; sha256="15q0f2sfhm1b13zs5a50yfvqhgcn4fyncf0h5ivin2k9g5xvq4k4"; depends=[ggplot2 rJava sp]; };
 spcov = derive { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; };
 spcr = derive { name="spcr"; version="1.2.1"; sha256="0cm59cfw3c24i1br08fdzsz426ldljxb41pdrmbmma4a69jkv1sb"; depends=[]; };
-spd = derive { name="spd"; version="2.0-0"; sha256="0aznzj68gynhx295gdb4sb7xxjiya4vbdg3gshfs0mwg1qzrhxy9"; depends=[KernSmooth]; };
+spd = derive { name="spd"; version="2.0-1"; sha256="00zxh4ri47b61jkcjf5idl9hhlfld6rhczsnhmjsax59884f2i8m"; depends=[KernSmooth]; };
 spdep = derive { name="spdep"; version="0.5-88"; sha256="1m2bxbf472xq7wr76znjirslx3hb1ylk6lp7x5003ka3i2zpakxn"; depends=[boot coda deldir LearnBayes MASS Matrix nlme sp]; };
 spdynmod = derive { name="spdynmod"; version="1.0"; sha256="05gaaln14lrrds43l2f9hw43c86gswyzymz97hc3mci1cgiwfwbz"; depends=[animation deSolve raster]; };
 spe = derive { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; };
@@ -6227,10 +6245,10 @@ speaq = derive { name="speaq"; version="1.2.1"; sha256="0glvw1jdyc8w8b8m7l74d0rl
 speccalt = derive { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; };
 specificity = derive { name="specificity"; version="0.1.1"; sha256="1gvlyx9crkzm3yyp1ln5j9czcg83k7grm6ijabhl919gjjr1p60n"; depends=[car]; };
 spectral_methods = derive { name="spectral.methods"; version="0.7.2.133"; sha256="0k8kpk94d2qzqdk3fnf6h9jmwdyp8h3klr0ilm5siwq5wkcz339l"; depends=[abind DistributionUtils foreach JBTools ncdf_tools nnet raster RColorBrewer RNetCDF Rssa]; };
-spectralGP = derive { name="spectralGP"; version="1.3.2"; sha256="0gzkwi3npb97y06gvsidaq75h8lg1cvkq8mr9hxp9n7ib6n924v9"; depends=[]; };
+spectralGP = derive { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; };
 speedglm = derive { name="speedglm"; version="0.3"; sha256="07pq0ymg7x9c9pq79d476slca43jv4682iackd446glw2qffac1y"; depends=[MASS Matrix]; };
 speff2trial = derive { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; };
-sperich = derive { name="sperich"; version="1.5-5"; sha256="0xwzyfx3z06lapvhzdzrfr9hw2hm8d0cyfmc29p5fcplmjm24idh"; depends=[]; };
+sperich = derive { name="sperich"; version="1.5-7"; sha256="1apgq5nsl6nw674dy7bc7r7z962wcmqsia5n67a8n6c5lcgcif3f"; depends=[foreach rgdal SDMTools sp]; };
 sperrorest = derive { name="sperrorest"; version="0.2-1"; sha256="17jq8r98pq3hsyiinxg30lddxwpwi696srsvm3lfxrzk11076j6v"; depends=[ROCR rpart]; };
 spfrontier = derive { name="spfrontier"; version="0.1.12"; sha256="1jy1604gppis7vbn55pv13bywy1aqwzshwj03bbfln0qxikzqzi0"; depends=[ezsim maxLik moments mvtnorm spdep tmvtnorm]; };
 spgrass6 = derive { name="spgrass6"; version="0.8-6"; sha256="0vpv2vycd6rdnwm1f73733x1nclhr2x4x1s5116szskni77b0pii"; depends=[sp XML]; };
@@ -6251,7 +6269,8 @@ splus2R = derive { name="splus2R"; version="1.2-0"; sha256="0kmyr1azyh0m518kzwvv
 splusTimeDate = derive { name="splusTimeDate"; version="2.5.0-135"; sha256="0hghggdcr70vfjx4npj37nmd96qvgrp1gpwa9bznvjkvyfawwy6i"; depends=[]; };
 splusTimeSeries = derive { name="splusTimeSeries"; version="1.5.0-73"; sha256="1csk0ffgg1bi2k1m2bbxl6aqqqxf6i8sc8d4azip8ck7rn8vya46"; depends=[splusTimeDate]; };
 spnet = derive { name="spnet"; version="0.9.0.6"; sha256="1kbf53ww2wdr2nsml9zhzd80dhi48izw1nwjszv9jqidd6nk7v29"; depends=[shape sp]; };
-spocc = derive { name="spocc"; version="0.2.4"; sha256="0hhjdx3vgzfwf368pvmapgb5hll659mwkyzvgagvzz90sm44134a"; depends=[AntWeb ecoengine ggmap ggplot2 gistr httr leafletR lubridate maptools rbison RColorBrewer rebird rgbif rgdal rgeos rinat rworldmap sp whisker]; };
+spocc = derive { name="spocc"; version="0.3.0"; sha256="110rd0blr5s8rnw0z5hwyg60xf22dr0jnb0c8qyywhf2q9xy6vln"; depends=[AntWeb ecoengine httr jsonlite lubridate rbison rebird rgbif rvertnet V8 whisker]; };
+spoccutils = derive { name="spoccutils"; version="0.1.0"; sha256="1al7hydwwzqd8ky91ggklf7lk42g79cx24i47gapd84jnwmmkq56"; depends=[ggmap ggplot2 gistr httr leafletR RColorBrewer rworldmap sp spocc]; };
 sporm = derive { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; };
 sprex = derive { name="sprex"; version="1.1"; sha256="1lwkdi8g1dlfdnxxvspgpz6f5h2gml176xhfrcxa9gcy3y9rlcpm"; depends=[]; };
 sprint = derive { name="sprint"; version="1.0.7"; sha256="1yzx1qjpxx9yc0hbm1mmha5b7aq13iflq66af597b7yj6abm7zjp"; depends=[boot e1071 ff randomForest rlecuyer]; };
@@ -6270,7 +6289,7 @@ squash = derive { name="squash"; version="1.0.6"; sha256="16iplngzzlif999z821a9b
 sra = derive { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; };
 srd = derive { name="srd"; version="1.0"; sha256="04j2gj7fn7p2rm34haayswrfhn6w5lln439d07m9g4c020kqqsr3"; depends=[animation colorspace plyr stringr survival]; };
 ss3sim = derive { name="ss3sim"; version="0.8.2"; sha256="1gj3kf4ccd5n2jr4sm50gny5x1zq4brkhqgw0nww41spnimascfr"; depends=[gtools lubridate plyr r4ss reshape2]; };
-ssanv = derive { name="ssanv"; version="1.0-2"; sha256="18ib0djqxjpp4xgvsffwqgxqljpwc24ysxj26phpr6p8kdl3hr2f"; depends=[]; };
+ssanv = derive { name="ssanv"; version="1.1"; sha256="17a4a5azxm5h2vxia16frcwdyd36phpfm7fi40q6mnnrwbpkzsjd"; depends=[]; };
 sscor = derive { name="sscor"; version="0.1"; sha256="0bvj6kzkjgdjwia907if8jlicygkh5gnk3s159gv9wvc50rjjab3"; depends=[mvtnorm pcaPP robustbase]; };
 ssd = derive { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; };
 sse = derive { name="sse"; version="0.5-4"; sha256="126dc4gk0hynwfz887d3wdcs7xacmmjhpf82sbhmhvg73dc1r5jz"; depends=[lattice]; };
@@ -6285,9 +6304,8 @@ sspse = derive { name="sspse"; version="0.5-1"; sha256="0gih9d0g4kp08c4v01p699la
 sss = derive { name="sss"; version="0.0-11"; sha256="0k7p1ws0w7wg9wyxcg1zpk8q6kr32l3jl6yd9r4qmzq04dwqrdgz"; depends=[plyr XML]; };
 ssvd = derive { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; };
 ssym = derive { name="ssym"; version="1.5.3"; sha256="0d8d0s9k87w7mxlvkzj307wkmxghc0qzhn7crm3fvcb1phf115p8"; depends=[Formula GIGrvg normalp numDeriv survival]; };
-st = derive { name="st"; version="1.2.4"; sha256="1lnrzz7kc21mrs8xrqs21fcwd92d5kzhvfiq36j02982n18f6c64"; depends=[corpcor fdrtool sda]; };
+st = derive { name="st"; version="1.2.5"; sha256="0dnyfjcz37gjjv87nrabb11gw2dlkqhq3mrxdpkzahx0w0g0q0pb"; depends=[corpcor fdrtool sda]; };
 staTools = derive { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; };
-stab = derive { name="stab"; version="0.1.9"; sha256="1awf8bj3c4wvs818g4wfmw23vdhv06kn229cmhqbr7dsz933vwwf"; depends=[MASS reshape]; };
 stabledist = derive { name="stabledist"; version="0.7-0"; sha256="06xd3kkyand0gzyj5phxlfjyygn5jlsq7gbwh62pc390by7ld2c7"; depends=[]; };
 stabs = derive { name="stabs"; version="0.5-1"; sha256="0mlwbf8wf38mr39si31i4iz00hpsmchbhgagwgsf3x9422zpq92p"; depends=[]; };
 stackoverflow = derive { name="stackoverflow"; version="0.1.2"; sha256="1psw96iscgsx11drmcnh0yjg2jjcaa4akmywh337i6gbgam8kj61"; depends=[]; };
@@ -6301,16 +6319,16 @@ statar = derive { name="statar"; version="0.3.0"; sha256="0ynvabdyp5vy90gz7c9ywb
 statcheck = derive { name="statcheck"; version="1.0.1"; sha256="01b40bjagkj6hfyq9ppdlaafwgykv8p9s8sm0abd3if82ivdpixj"; depends=[plyr]; };
 statebins = derive { name="statebins"; version="1.0"; sha256="1mqky4nb31xjhn922csvv8ps2fwgcgazxs56rcn3ka32c59a4mmg"; depends=[ggplot2 gridExtra RColorBrewer scales]; };
 statfi = derive { name="statfi"; version="0.9.8"; sha256="0kg9bj2mmd95ysg604rcg4szqx3whbqm14fwivnd110jgfy20gk2"; depends=[pxR]; };
-stationaRy = derive { name="stationaRy"; version="0.2"; sha256="1ylamq6mc0hq3hq17w7s1v9dv7wdzyn4afxh1zy739532p0xxm41"; depends=[downloader lubridate plyr proj4 sp]; };
+stationaRy = derive { name="stationaRy"; version="0.3"; sha256="151hsda3j8ii40v5z6nh6ypahrl0b2zlfdii75xlrpwryb7n3cq6"; depends=[downloader dplyr plyr readr]; };
 statmod = derive { name="statmod"; version="1.4.21"; sha256="138lh9qa25w6vaksbq43iqisj4c8hvmkjc3q81fn7m8b7zlnz6da"; depends=[]; };
 statnet = derive { name="statnet"; version="2014.2.0"; sha256="0xp8xnqb32wzkxfm7f34z6mnsd9id8an5829n16czwldj9vv6s10"; depends=[ergm ergm_count latentnet network networkDynamic sna statnet_common tergm]; };
 statnet_common = derive { name="statnet.common"; version="3.2.2"; sha256="1xdkc1pyf6wfb86dwz6bkjli5qw6yz6dvlxwp5bpgkpg83aa9n7g"; depends=[]; };
 statnetWeb = derive { name="statnetWeb"; version="0.3.4"; sha256="1nkis4l6yzpjcwxryskqfjgc2naxplzjc3gpp6xvpl0pcvw9mdk7"; depends=[ergm network RColorBrewer shiny sna]; };
-stcm = derive { name="stcm"; version="0.1.0"; sha256="0j2yhmg6m69igg3ilrf7rq3l37aqab7h4fx08k3gfgc8005w7ils"; depends=[caret dendextend ggplot2 magrittr plyr QCA randomForest XML]; };
+stcm = derive { name="stcm"; version="0.1.1"; sha256="05p0lp0p1mgcsf3mi3qgx42pgpv04m5wfmqa14gp63ialkl9pgx5"; depends=[caret dendextend ggplot2 magrittr plyr QCA randomForest XML]; };
 steepness = derive { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; };
 stellaR = derive { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; };
 stepPlr = derive { name="stepPlr"; version="0.92"; sha256="16j32sk7ri4jdgss7vw5zz7s42rxk7rs376iyxzzpy1zcc9b64rv"; depends=[]; };
-stepR = derive { name="stepR"; version="1.0-2"; sha256="1z2jncjhaxzxw5kqa8s3jlsl9blz3b7hlnzr3phfhwmb1hr6r56k"; depends=[]; };
+stepR = derive { name="stepR"; version="1.0-3"; sha256="0c35bb6ba507cgjhzz7dnzidsjxd9r01r355b85j2fcsvcj4agwg"; depends=[]; };
 stepp = derive { name="stepp"; version="3.0-11"; sha256="0jrwfvcgh3sjm3zag93kjyny2qqsyiw988vnx6jw7s31bv9g0d6s"; depends=[car survival]; };
 stepwise = derive { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; };
 stheoreme = derive { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq8yybr2jwgk3w7s2msgjhlp1vazy8959s65"; depends=[]; };
@@ -6321,7 +6339,7 @@ stm = derive { name="stm"; version="1.0.8"; sha256="0dnzkqh3hnnjm0wmzpn48bwylmh4
 stmCorrViz = derive { name="stmCorrViz"; version="1.1"; sha256="03bjxil8v4ixgbabg2gq78xgqy4s3wh89hq1z5598gxysz12z3ji"; depends=[jsonlite stm]; };
 stocc = derive { name="stocc"; version="1.23"; sha256="183rv1l1hpa691f3xf455bv8dzdw6ac79zg3v99zksli6i7c8jdz"; depends=[coda fields Matrix truncnorm]; };
 stochprofML = derive { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; };
-stochvol = derive { name="stochvol"; version="1.1.1"; sha256="1cfav3i7w5i3rayajdybjmwvmqvqj58zk8sk0icw52r5l4ki2d6s"; depends=[coda Rcpp]; };
+stochvol = derive { name="stochvol"; version="1.1.3"; sha256="077pky9k2cvakm4ap38hby8xdjc4d7b20qndyy2skk1622kmr0w6"; depends=[coda Rcpp]; };
 stockPortfolio = derive { name="stockPortfolio"; version="1.2"; sha256="0k5ss6lf9yhcvc4hwqmcfpdn6qkbq5kaw0arldkl46391kac3bd1"; depends=[]; };
 stocks = derive { name="stocks"; version="1.1.1"; sha256="1qwd16bw40w2ns7b0n9wm8l344r4vyk27rmg0vr5512zsrcjkcfb"; depends=[rbenchmark Rcpp]; };
 stoichcalc = derive { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; };
@@ -6333,14 +6351,14 @@ strataG = derive { name="strataG"; version="0.9.4"; sha256="0lxp6s0gfqxyla7mx19f
 stratification = derive { name="stratification"; version="2.2-5"; sha256="0cgr49gvh12s6rr43878jxjkir7b7absqgbfsvj1bjlf2r3gyqy9"; depends=[]; };
 stratigraph = derive { name="stratigraph"; version="0.66"; sha256="1idn5rwar9pxp1vsra68wrlhagmc92y5rs7vn4h63p35p357qdwz"; depends=[]; };
 straweib = derive { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; };
-stream = derive { name="stream"; version="1.1-4"; sha256="1pz9ck6rxxwnzrhixs015k3sy2gl8hwxyxwr56ykpkrcn6kgzm3f"; depends=[animation clue cluster clusterGeneration fpc MASS mlbench proxy Rcpp]; };
-streamMOA = derive { name="streamMOA"; version="1.1-0"; sha256="0h45saz5jf9jfsajy987ljpfpm2cxigyqkgmybd0m3aqyrqlljbc"; depends=[rJava stream]; };
+stream = derive { name="stream"; version="1.1-5"; sha256="10g3wwvwppp3fqrpxdlypfiq9y43sffx2hp7dha33ray565scrda"; depends=[animation clue cluster clusterGeneration fpc MASS mlbench proxy Rcpp]; };
+streamMOA = derive { name="streamMOA"; version="1.1-1"; sha256="1yfy5cpwk6z6f9j3mvvz69wpqnmrismsmxmx9fx6mjcs1zwgfyhb"; depends=[rJava stream]; };
 streamR = derive { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23xk5d25jkm3qr7rfj2kc5j5vgsih6kr0gl"; depends=[RCurl rjson]; };
 stremo = derive { name="stremo"; version="0.2"; sha256="13b9xnd8ykxrm8gnakh0ixbsb7yppqv3isga8dsz473wzy82y6h1"; depends=[lavaan MASS numDeriv]; };
 stressr = derive { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; };
-stringdist = derive { name="stringdist"; version="0.9.0"; sha256="0304a3qyssq2l2c7da5a90fca32n3ph5jixqnqvb3jwzdb8dxm2f"; depends=[]; };
+stringdist = derive { name="stringdist"; version="0.9.2"; sha256="13cwp2ic4v48r6h1gjbb1kn4m88d69z7wnhwyxsh64lqlhaz1xsm"; depends=[]; };
 stringgaussnet = derive { name="stringgaussnet"; version="1.0"; sha256="11pkvbq2lddwhrwrpspqhjkma4ixl9hv8w7m4jrnlx8dkabibw25"; depends=[AnnotationDbi biomaRt httr igraph limma pspearman RCurl RJSONIO simone VennDiagram]; };
-stringi = derive { name="stringi"; version="0.4-1"; sha256="01ig59cmvrk9vfh4l84i2h4vgddfspyrxwh3am33apv8r8vr4bnj"; depends=[]; };
+stringi = derive { name="stringi"; version="0.5-5"; sha256="183wrrjhpgl1wbnn9lhghyvhz7l2mc64mpcmzplckal7y9j7pmhw"; depends=[]; };
 stringr = derive { name="stringr"; version="1.0.0"; sha256="0jnz6r9yqyf7dschr2fnn1slg4wn6b4ik5q00j4zrh43bfw7s9pq"; depends=[magrittr stringi]; };
 strucchange = derive { name="strucchange"; version="1.5-1"; sha256="0cdgvl6kphm2i59bmnppn1y3kv65ml111bk7yzpcx7vv8wh2w3kl"; depends=[sandwich zoo]; };
 structSSI = derive { name="structSSI"; version="1.1.1"; sha256="06rwmrgqc4qy4x0bhlshjdsjxfmp5fr9d1wjglhlb1gbp72fmkdv"; depends=[ggplot2 igraph multtest reshape2 rjson]; };
@@ -6384,7 +6402,7 @@ survexp_fr = derive { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5
 survey = derive { name="survey"; version="3.30-3"; sha256="0vcyph1vpnl4xaqd85ffh1gm0dqhvgr3343q0mlycmyq485x0idy"; depends=[]; };
 surveydata = derive { name="surveydata"; version="0.1-14"; sha256="1zcp3wb7yhsa59cl4bdw7p08vpviypvfa9hggwc60w7ashpky73i"; depends=[plyr stringr]; };
 surveyeditor = derive { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; };
-survival = derive { name="survival"; version="2.38-2"; sha256="1qy9iav9h459ligpxqhg7rbn6ai39xij5qjyig7pcwmpgxqvdj69"; depends=[]; };
+survival = derive { name="survival"; version="2.38-3"; sha256="1hkji557sz4q86pp7xj3h4cdwsnfl1mlj4c6c917mnbijj3bm215"; depends=[]; };
 survivalMPL = derive { name="survivalMPL"; version="0.1.1"; sha256="0c4hr2q50snd5qm2drg4qzfkcz4klxr4jba6xpc8n2i8wn573cvc"; depends=[survival]; };
 survivalROC = derive { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; };
 survrec = derive { name="survrec"; version="1.2-2"; sha256="0b77ncr1wg2xqqg1bv1bvb48kmd9h3ja2dysiggvprzjrj7hdlmx"; depends=[boot]; };
@@ -6405,7 +6423,7 @@ svapls = derive { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22
 svcm = derive { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; };
 svd = derive { name="svd"; version="0.3.3-2"; sha256="064y4iq4rj2h35fhi6749wkffg37ppj29g9aw7h156c2rqvhxcln"; depends=[]; };
 svdvisual = derive { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; };
-svgViewR = derive { name="svgViewR"; version="1.0.0"; sha256="0js3mc5lxzfwbnc30mn9k9g9jiy2aivqs08x0zcg9dir5n7gs9sg"; depends=[]; };
+svgViewR = derive { name="svgViewR"; version="1.0.1"; sha256="1ggw5w5xjqp33z6nzszimcab3vkv4rliiilhcqbhppqlnhjb8nab"; depends=[]; };
 svmpath = derive { name="svmpath"; version="0.953"; sha256="0hqga4cwy1az8cckh3nkknbq1ag67f4m5xdg271f2jxvnmhdv6wv"; depends=[]; };
 svyPVpack = derive { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; };
 swamp = derive { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots impute MASS]; };
@@ -6413,9 +6431,9 @@ sweidnumbr = derive { name="sweidnumbr"; version="0.6.0"; sha256="1qdak16jnm436m
 swfscMisc = derive { name="swfscMisc"; version="1.0.3"; sha256="0ciwvxpafpc6an58r1ffkab8kj4np6l2kbpkijnqnfbf6cya0aim"; depends=[mapdata maps]; };
 swirl = derive { name="swirl"; version="2.2.21"; sha256="0lpin7frm1a6y9lz0nyykhvydr1qbx85iqy24sm52r1vxycv2r8h"; depends=[digest httr RCurl stringr testthat yaml]; };
 switchnpreg = derive { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; };
-switchr = derive { name="switchr"; version="0.9.6"; sha256="0w1nf6jncs85hqbvddcrmdx9y1gd5702ab9180v9icp7al06kxzp"; depends=[]; };
+switchr = derive { name="switchr"; version="0.9.10"; sha256="02595b4mhhgm8j1abmk78z27fz27kr0mg01d7hf7n6yv6ybhn0qz"; depends=[]; };
 switchrGist = derive { name="switchrGist"; version="0.2.1"; sha256="0n8fzzsxm0m4yic133q07vki803zywhijadymrgyq7qlx3d1m97d"; depends=[gistr httpuv RJSONIO switchr]; };
-sybil = derive { name="sybil"; version="1.2.6"; sha256="1d7q0dvpqxay86dy4zbllv78dsh0amr8n7wl0vkrb8jbakq4afip"; depends=[lattice Matrix]; };
+sybil = derive { name="sybil"; version="1.3.0"; sha256="1wprxwxyh5vzi263x1s7vdnyjgmyh3lha9ld2qqyjabrkg6wjzwg"; depends=[lattice Matrix]; };
 sybilDynFBA = derive { name="sybilDynFBA"; version="0.0.2"; sha256="1sqk6dwwfrwvgkwk6mra0i1dszhhvcwm58ax6m89sxk8n0nbmr4b"; depends=[sybil]; };
 sybilEFBA = derive { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j8ixqd2pj43hhyr99vjdh7c106lsmqd1pifa4"; depends=[Matrix sybil]; };
 sybilSBML = derive { name="sybilSBML"; version="2.0.8"; sha256="1sxp0naws7d1ak0xna1sy87zzjrravwax0qvcd6vy4p0f39z06ci"; depends=[Matrix sybil]; };
@@ -6430,7 +6448,7 @@ synbreedData = derive { name="synbreedData"; version="1.5"; sha256="16wv9r7p0n87
 synchronicity = derive { name="synchronicity"; version="1.1.4"; sha256="0hcxwgf1irswwabgl0b6vb9q09nhxc1ljsm195lc8ql49sfj9mfz"; depends=[BH bigmemory_sri]; };
 synchrony = derive { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; };
 synlik = derive { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Matrix Rcpp RcppArmadillo]; };
-synthpop = derive { name="synthpop"; version="1.1-0"; sha256="1j9d0jpmr8dva2c7gd6z1q0a3qdxkvmm83xlv08dxkbvsfbzvmmr"; depends=[coefplot foreign ggplot2 lattice MASS nnet party plyr proto rpart]; };
+synthpop = derive { name="synthpop"; version="1.1-1"; sha256="0l65pbjcc163dqalkz1dil5bpfb9f3p4wx6hpr7z4g0ir58anbip"; depends=[coefplot foreign ggplot2 lattice MASS nnet party plyr proto rpart]; };
 sysfonts = derive { name="sysfonts"; version="0.5"; sha256="1vppj3jnag88351f8xfk9ds8gbbij3m55iq5rxbnrzy89c04zpzp"; depends=[]; };
 systemfit = derive { name="systemfit"; version="1.1-16"; sha256="0b34cpwhmsmq7dcr3gymdvanj3q493aczgz3af7b14bsp3bbwpw6"; depends=[car lmtest MASS Matrix sandwich]; };
 systemicrisk = derive { name="systemicrisk"; version="0.2"; sha256="06061hca2x9hj0caann69j6x2jgy8bq40nxs27iqb3zfqp2cz44f"; depends=[lpSolve Rcpp]; };
@@ -6438,6 +6456,7 @@ syuzhet = derive { name="syuzhet"; version="0.2.0"; sha256="1l83wjiv1xsxw4wrcgcj
 taRifx = derive { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[plyr reshape2]; };
 taRifx_geo = derive { name="taRifx.geo"; version="1.0.6"; sha256="0w7nwp3kvidqhwaxaiq267h99akkrj6xgkviwj0w01511m2lzghs"; depends=[RCurl rgdal rgeos RJSONIO sp taRifx]; };
 tab = derive { name="tab"; version="3.1.1"; sha256="05wypi4v9r2qlgwafd9f58vnxn2c4fnz18l8xpb24nhdgm35adqy"; depends=[gee survey survival]; };
+taber = derive { name="taber"; version="0.0.1"; sha256="1dqcsxl82s96rlw5jx8wzdvx351qd9jz6npfrhnwifr7vxhl2prd"; depends=[dplyr magrittr]; };
 table1xls = derive { name="table1xls"; version="0.3.1"; sha256="0zd93wrdj4q0ph375qlgdhpqm3n8s941vks5h07ks9gc8id1bnx5"; depends=[XLConnect]; };
 tableone = derive { name="tableone"; version="0.6.3"; sha256="0r91vzq3whz949kxg9q9bf413r41cxqsjvmicmb4najhwzhdr9fv"; depends=[e1071 gmodels]; };
 tableplot = derive { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; };
@@ -6445,7 +6464,8 @@ tables = derive { name="tables"; version="0.7.79"; sha256="05f23y5ff961ksx4fnmwp
 tabplot = derive { name="tabplot"; version="1.1"; sha256="0vyc6b6h540sqwhrza2ijg7ghw2x8rla827b8qy2sh0ckm0ybjrx"; depends=[ffbase]; };
 tabplotd3 = derive { name="tabplotd3"; version="0.3.3"; sha256="0mbj45vb17wlnndpkhvq7xaawsb814x7zxa4rqbfgidvbm1p3abv"; depends=[brew httpuv RJSONIO Rook tabplot]; };
 tabuSearch = derive { name="tabuSearch"; version="1.1"; sha256="0bri03jksm314xy537dldbdvgyq6sywfmpmj2g2acdcli31kkpq0"; depends=[]; };
-tagcloud = derive { name="tagcloud"; version="0.5"; sha256="0d6h54p20pjnh1y7bw381nqbml1hv5x71gm33mgrzcib7mqa0c0b"; depends=[RColorBrewer Rcpp]; };
+tagcloud = derive { name="tagcloud"; version="0.6"; sha256="04zrh029n8pjlxlr6pdd7xhqqhavbrj3fhvhj6ygzlvi2jslxnwl"; depends=[RColorBrewer Rcpp]; };
+tailloss = derive { name="tailloss"; version="1.0"; sha256="0lmjgjs6d94b70i10vx66fyvlxm5swwqbcjsnqa3lmldzz6m4jc1"; depends=[MASS]; };
 tau = derive { name="tau"; version="0.0-18"; sha256="04rj3jrcz4h60dqm1xmnmpr52csz1s7rf2wv6ivybgyvbq0w2ijf"; depends=[]; };
 tawny = derive { name="tawny"; version="2.1.2"; sha256="0ihg3qlng8swak1dfpbnlx5xc45d1i9rgqawmqa97v5m91smfa71"; depends=[futile_logger futile_matrix lambda_r lambda_tools PerformanceAnalytics quantmod tawny_types xts zoo]; };
 tawny_types = derive { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdczjn5ymsp2fqq0ijnlniyf3bc08ibd8yd1jcdyjnj"; depends=[futile_logger futile_options lambda_r lambda_tools quantmod xts zoo]; };
@@ -6455,7 +6475,6 @@ tbdiag = derive { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyr
 tcR = derive { name="tcR"; version="2.0"; sha256="05y3nbqdaxry7jwph6z2v8d2304xh791l0vviywyghrw7b2hqw9q"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 roxygen2 stringdist]; };
 tcltk2 = derive { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; };
 tclust = derive { name="tclust"; version="1.2-3"; sha256="0a1b7yp4l9wf6ic5czizyl2cnxrc1virj0icr8i6m1vv23jd8jfp"; depends=[cluster mclust mvtnorm sn]; };
-tdm = derive { name="tdm"; version="3.0.3"; sha256="01xy090h9idw05jssfgdarbqp5d1vsiir5x7fr1ylaz0k8ai23d4"; depends=[coda deSolve png rjags]; };
 tdr = derive { name="tdr"; version="0.11"; sha256="1ga1lczqj5pka2yz7igxfm83xmkx7lla8pz6ryij0ybn284agszs"; depends=[ggplot2 lattice RColorBrewer]; };
 tdthap = derive { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; };
 teigen = derive { name="teigen"; version="2.0.81"; sha256="1bssfn487dg1nc7fv73ksciiifnk1mvaqvp8a3gjmrb7bzfyzby7"; depends=[]; };
@@ -6498,7 +6517,7 @@ tiger = derive { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp
 tigerstats = derive { name="tigerstats"; version="0.2-6"; sha256="0niibqhqpjxgq3m7xp0icf98k531ncmm853scvqp5icv2yz5ivav"; depends=[abd ggplot2 lattice MASS mosaic mosaicData]; };
 tightClust = derive { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; };
 tikzDevice = derive { name="tikzDevice"; version="0.8.1"; sha256="0262szfzv4yrfal19giinrphra1kfcm2arfckql4rf2zsq13rw35"; depends=[filehash]; };
-tileHMM = derive { name="tileHMM"; version="1.0-6"; sha256="18vqj7fdh4knnjk9s7yk2bgn3qwqz92fmm5fdny21gi0wl4qgdsd"; depends=[]; };
+tileHMM = derive { name="tileHMM"; version="1.0-7"; sha256="1ks4b6h15982jh3ls9fz8hq9ac1wf5hfjsvdqcmnba8n3m5zm651"; depends=[corpcor st]; };
 timeDate = derive { name="timeDate"; version="3012.100"; sha256="0cn4h23y2y2bbg62qgm79xx4cvfla5xbpmi9hbdvkvpmm5yfyqk2"; depends=[]; };
 timeROC = derive { name="timeROC"; version="0.3"; sha256="0xl6gpb5ayppzp08wwry4i051rm40lzfx43jw2yn3jy2p3nrcakb"; depends=[mvtnorm pec]; };
 timeSeq = derive { name="timeSeq"; version="1.0.0"; sha256="1b7jcld1h3xsp3nl2nk9nqsgdg1pdi4m54hgsdlvivk9zzv3k6wr"; depends=[doParallel edgeR foreach gss lattice pheatmap reshape]; };
@@ -6509,7 +6528,7 @@ timeordered = derive { name="timeordered"; version="0.9.8"; sha256="1j0x2v22ybyl
 timereg = derive { name="timereg"; version="1.8.9"; sha256="12l8sz10ic8d34jd7ik8szg2d51pr949nsss20c5l5g3kfnvqkkh"; depends=[lava numDeriv survival]; };
 timesboot = derive { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; };
 timeseriesdb = derive { name="timeseriesdb"; version="0.2.1"; sha256="0150zs8c8184jzry33aki21prmpnxp3rclp84q6igwxi4grdhlr0"; depends=[DBI reshape2 RJSONIO RPostgreSQL shiny xts zoo]; };
-timetools = derive { name="timetools"; version="1.6.5"; sha256="1ni1dqzkdrzmvr0sbnfdh7kcsd5sgfggfl6w7nqviidcff5dbc9g"; depends=[]; };
+timetools = derive { name="timetools"; version="1.7.0"; sha256="14g2fnc9jvy7s615cq36821z8x2ww304vnm4krhy36knayrd6z7c"; depends=[]; };
 timetree = derive { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[phangorn XML]; };
 timma = derive { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[QCA Rcpp RcppArmadillo reshape2]; };
 timsac = derive { name="timsac"; version="1.3.3"; sha256="0jg9mjzzfl94z4dqb2kz0aiccpclnbyf9p08x3a3cw1y6wqmzrmy"; depends=[]; };
@@ -6522,7 +6541,7 @@ tlemix = derive { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx
 tlm = derive { name="tlm"; version="0.1.3"; sha256="1jj8yihq4b13wavflkkv91m9ba2l5ar3vcwp1ss6iymyf3hzdgiv"; depends=[boot]; };
 tlmec = derive { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; };
 tlnise = derive { name="tlnise"; version="2.0"; sha256="1vh998vqj359249n9zmw04rsivb7nlbdfgzf20pgh2sndm3rh8qz"; depends=[]; };
-tm = derive { name="tm"; version="0.6-1"; sha256="0i32gwic6vi7fkw05vg3rk8lmszzmy6gm9f5hrj0xckx7sf1ilfq"; depends=[NLP slam]; };
+tm = derive { name="tm"; version="0.6-2"; sha256="0q7plaqgc2ypihnz3dyjv2pwa0aimd4kv5i2z6m7aycc4wkmc7j4"; depends=[NLP slam]; };
 tm_plugin_alceste = derive { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; };
 tm_plugin_dc = derive { name="tm.plugin.dc"; version="0.2-7"; sha256="1ikkxp5jdr385yqvhknvkvs97039jw964pcm6dl1k66nbdv1q59i"; depends=[DSL NLP slam tm]; };
 tm_plugin_europresse = derive { name="tm.plugin.europresse"; version="1.2"; sha256="1sgm9wnzlphl4qhc69nj5im4y1qs6b0vssmn5j98fbc3xlxiyzjx"; depends=[NLP tm XML]; };
@@ -6534,11 +6553,12 @@ tmap = derive { name="tmap"; version="1.0"; sha256="1807zh2yjgcpjrl1g83ahby7857l
 tmg = derive { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp RcppEigen]; };
 tmle = derive { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99wg8a2xyvfgvbyvx3jfxkgk33mybbm"; depends=[SuperLearner]; };
 tmle_npvi = derive { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[geometry MASS Matrix R_methodsS3 R_oo R_utils]; };
+tmod = derive { name="tmod"; version="0.19"; sha256="0wnj2dfp3jjvr8xl43kw86b3xgqd1662zjagzb9ayznx5vi2k5zb"; depends=[beeswarm pca3d tagcloud XML]; };
 tmvtnorm = derive { name="tmvtnorm"; version="1.4-9"; sha256="1dacdhqv6bb29a81bmxp8hxy4hragpg8mb5kql4cp59q08zmizyi"; depends=[gmm Matrix mvtnorm]; };
 tnet = derive { name="tnet"; version="3.0.11"; sha256="00hifb145w0a9f5qi3gx16lm1qg621jp523vswb8h86jqmxcczbc"; depends=[igraph survival]; };
 toOrdinal = derive { name="toOrdinal"; version="0.0-1"; sha256="1rr6liw0krzdarc9gd406mf242n3hl38bn52xphr1g0riq5y2m4q"; depends=[]; };
 tolerance = derive { name="tolerance"; version="1.1.0"; sha256="1mrgvrdlawrmbz8bhq9cxqgn4fxvn18f1gjf9f9s8fvfnc4nda96"; depends=[rgl]; };
-topicmodels = derive { name="topicmodels"; version="0.2-1"; sha256="1if1pdx4jnfx3xi37xs411qv3h449vkwxzzqd7krxaxbj3gqq7n9"; depends=[modeltools slam tm]; };
+topicmodels = derive { name="topicmodels"; version="0.2-2"; sha256="1nk3jgibs881isaadawyc377f4491af97jaqywc0z905wkzi008r"; depends=[modeltools slam tm]; };
 topmodel = derive { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; };
 topologyGSA = derive { name="topologyGSA"; version="1.4.4"; sha256="092f57gpm8jlb2y4j74a6dx1lwqjdgcm3yrm1yzy4511j6vg0axh"; depends=[fields graph gRbase qpgraph]; };
 topsis = derive { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; };
@@ -6556,16 +6576,18 @@ traj = derive { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5
 trajectories = derive { name="trajectories"; version="0.1-3"; sha256="1lk2mxfsf8x8idhb4dcj9lqvkjwm2yarvjid42xr2a9wwylvz9vq"; depends=[lattice sp spacetime]; };
 translate = derive { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; };
 translateR = derive { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; };
+translateSPSS2R = derive { name="translateSPSS2R"; version="1.0.0"; sha256="11qnf44aq0dykcsv29faa9r4fcw9cc9rkgczsqx3mngvg3bilada"; depends=[car data_table e1071 foreign Hmisc plyr stringr tidyr zoo]; };
+translation_ko = derive { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; };
 transport = derive { name="transport"; version="0.6-3"; sha256="1sldlccsprzan1liyslzp9wzz3d36khyr6zri773npvnss9pa67w"; depends=[]; };
 trapezoid = derive { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; };
 treatSens = derive { name="treatSens"; version="1.1"; sha256="1h49idgv3rsday8xdj3rfqflj42ya9i5sg7cm1026arff1yqxxz8"; depends=[]; };
-tree = derive { name="tree"; version="1.0-35"; sha256="1cxn73rlr8s3qbq3icdh1v3jbbz913ns6xk6yzgk30ncifw4iq6g"; depends=[]; };
+tree = derive { name="tree"; version="1.0-36"; sha256="0kqsmjw77p7n2awnlbnwny65rmmwb6z37x9rv1k4iqvvf8xbphg1"; depends=[]; };
 treeClust = derive { name="treeClust"; version="1.0-0"; sha256="1xn6m031vx12wcyyh04yb68cw416a6v5wd8rcp5f9jqirv1hp4xb"; depends=[cluster rpart]; };
 treebase = derive { name="treebase"; version="0.1.1"; sha256="00xjmvnfh8f05w0076f5rlqa6w5yw0xiqpk076j3ixsv8z6m10hy"; depends=[ape data_table RCurl reshape2 XML]; };
 treeclim = derive { name="treeclim"; version="1.0.11"; sha256="09i7zxwdrbfgridxsm20r554nyvwp40ngc47isy16a7f1q3rwjah"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; };
 treecm = derive { name="treecm"; version="1.2.1"; sha256="02al6iz25pay7y1qmbpy04nw8dj9c5r7km6q5k3v3jdkfal6cm6k"; depends=[plyr]; };
 treelet = derive { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; };
-treemap = derive { name="treemap"; version="2.2"; sha256="0h4wkjw12n9awqsvrs72nmsxq3d5as3zjy8kyhw7715h1cvry769"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; };
+treemap = derive { name="treemap"; version="2.3"; sha256="1isf39ja356w0bpv6jww6pm6ldvd34jd49myhjic6vh2yskh556x"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; };
 treeperm = derive { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; };
 treethresh = derive { name="treethresh"; version="0.1-8"; sha256="1xkbqlr9gkpw6axzl7v5aipackhvy873yrpwn2b9zqr35pj06pr6"; depends=[EbayesThresh wavethresh]; };
 trend = derive { name="trend"; version="0.0.1"; sha256="05awwsqp8vm2p00dq2hkb7dglwf45djw2xx2q2mq33blrlhn31sw"; depends=[]; };
@@ -6584,7 +6606,7 @@ truncdist = derive { name="truncdist"; version="1.0-1"; sha256="0aszs6rz8nydyf2d
 truncgof = derive { name="truncgof"; version="0.6-0"; sha256="0b499i9zjwvva5jfl9fj02jjrgy8myxqfjwa0cjg0jrpgxczgwg8"; depends=[MASS]; };
 truncnorm = derive { name="truncnorm"; version="1.0-7"; sha256="1qac05z50618y4bw1d7yznsli1bv82s0g8h37iacrjrdkv87bmy7"; depends=[]; };
 truncreg = derive { name="truncreg"; version="0.2-1"; sha256="0qvdfj93phk1s2p4n0rmpf8x9gj5n1j75h4z424mrg10r24699rd"; depends=[maxLik]; };
-trust = derive { name="trust"; version="0.1-6"; sha256="1jghgwnazhqgyn2k0b3x4n8swncyy6dzlkv86chv98zw4s3bnlak"; depends=[]; };
+trust = derive { name="trust"; version="0.1-7"; sha256="013gmiqb6frzsl6fsb5pqfdapwdxas0llg954hlcvgki9al5mlg3"; depends=[]; };
 trustOptim = derive { name="trustOptim"; version="0.8.5"; sha256="1y9krw2z5skkwgfdjagl8l04l9sbiqbk1fbxp30wrf4qj3pba5w6"; depends=[Matrix Rcpp RcppEigen]; };
 tsDyn = derive { name="tsDyn"; version="0.9-43"; sha256="0fhqfwhac1ac1vakwll41m54l88b1c5y34hln5i1y2ngvhy277l1"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; };
 tsModel = derive { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; };
@@ -6595,18 +6617,19 @@ tsc = derive { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw
 tscount = derive { name="tscount"; version="1.0.0"; sha256="0n01biifzjfvnj3zhrn87qigf4l1kij2zfqf6876qz8rps1jz626"; depends=[ltsa]; };
 tseries = derive { name="tseries"; version="0.10-34"; sha256="068mjgjcsvgpynkvga8lv430cg8zhlr9frj5yapsxni2vj534pqj"; depends=[quadprog zoo]; };
 tseriesChaos = derive { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; };
+tseriesEntropy = derive { name="tseriesEntropy"; version="0.5-12"; sha256="0z9354mlj0nh829ccwwhs53q5myfp31x9n6kv1k8gmvz5xma40kh"; depends=[cubature]; };
 tsfa = derive { name="tsfa"; version="2014.10-1"; sha256="0gkgl55v08dr288nf8r769f96qri7qbi5src7y6azrykb37nz6iz"; depends=[dse EvalEst GPArotation setRNG tfplot tframe]; };
 tsintermittent = derive { name="tsintermittent"; version="1.5"; sha256="1qziwdpxfc2v010bk2cnhkrajza0z7lrrsjg06m49msyk5bk62z1"; depends=[MAPA]; };
-tslars = derive { name="tslars"; version="1.0"; sha256="0ylpn4jxmrck7hna3j420kw2yhsrklrq2664w85z30xij3zrrrci"; depends=[]; };
 tsne = derive { name="tsne"; version="0.1-2"; sha256="12q5s79r2949zhm61byd4dbgw6sz3bmxzcwr8b0wlp8g1xg4bhy6"; depends=[]; };
 tsoutliers = derive { name="tsoutliers"; version="0.6"; sha256="1cyh56i7dsnclphi81fab6k8vkdqv8ing2zmpfsjq4gvq76p7piw"; depends=[forecast KFKSDS polynom stsm]; };
-tspmeta = derive { name="tspmeta"; version="1.1"; sha256="11kr5avf67v2cxy3k1yrpv9lcbmiprd0w43w7zvizhsij58h13vm"; depends=[BBmisc fpc ggplot2 MASS splancs stringr TSP vegan]; };
+tspmeta = derive { name="tspmeta"; version="1.2"; sha256="028jbbd0pwpbjq4r6jcc1h0p7c4djcb9d2mvgzw1rmpphaxjvrkd"; depends=[BBmisc checkmate fpc ggplot2 MASS splancs stringr TSP vegan]; };
 ttScreening = derive { name="ttScreening"; version="1.5"; sha256="0qn8lkvgvqpmm368fwpqkm09yaj9mw42mjlikyiwpv2wrgbpmg9n"; depends=[corpcor limma MASS matrixStats sva]; };
 tth = derive { name="tth"; version="4.3-2"; sha256="1gs8xjljklvs0pavvn9f59y09hw7x2da58a46b5x01g08i0j8h1d"; depends=[]; };
 ttutils = derive { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; };
 ttwa = derive { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; };
 tufterhandout = derive { name="tufterhandout"; version="1.2.1"; sha256="04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw"; depends=[knitr rmarkdown]; };
 tumblR = derive { name="tumblR"; version="1.1"; sha256="0gl6q6rff9bp21gvi3bz8kmwbhimxqrv1mmzwshl1ys9r7d4dvps"; depends=[httr RCurl RJSONIO stringr]; };
+tumgr = derive { name="tumgr"; version="0.0.2"; sha256="1vnknvl9xim84iv3hfjpb8yw7jf638qxz8j79w47hlqwj3qn7alq"; depends=[minpack_lm]; };
 tuneR = derive { name="tuneR"; version="1.2.1"; sha256="1f6mdkfwfy6r62sbwq37sylvcji6f3mj9w13sgicxjn6swbszf57"; depends=[signal]; };
 tuple = derive { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; };
 turboEM = derive { name="turboEM"; version="2014.8-1"; sha256="0g9nm1m542hslz8272n5qz6h59criyf71l2w218dvq34bcjcd3yy"; depends=[doParallel foreach iterators numDeriv quantreg]; };
@@ -6624,20 +6647,22 @@ txtplot = derive { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1
 ucbthesis = derive { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; };
 ucminf = derive { name="ucminf"; version="1.1-3"; sha256="19gmbz32rhrdagvhf2s901lvi1r6273wzznry5daryq6w1jx5z3v"; depends=[]; };
 udunits2 = derive { name="udunits2"; version="0.6"; sha256="1dlxcx7yw7yqpimnfikdraqcmjsjz7js0j24li0879dzwrqa27ja"; depends=[]; };
-ump = derive { name="ump"; version="0.5-4"; sha256="05nd9bnysp8gaw916h7hk425banffcm0xfygalbp7brl71q0zby6"; depends=[]; };
-unbalanced = derive { name="unbalanced"; version="1.1"; sha256="0crkykmyxbag4ri2zikz4r22bf92r3v6q1lfdcvwdvv27slhyfn2"; depends=[FNN RANN]; };
+ump = derive { name="ump"; version="0.5-6"; sha256="1nd6miz9scc6llckafl73pxiqh0ycfhlsmn2l0swcvjxpj3kb0zv"; depends=[]; };
+unbalanced = derive { name="unbalanced"; version="2.0"; sha256="18hy9nnq42s1viij0a5i9wzrrfmmbf7y3yzjzymz2wnrx4f2pqwv"; depends=[doParallel FNN foreach mlr RANN]; };
 unbalhaar = derive { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; };
+unfoldr = derive { name="unfoldr"; version="0.3"; sha256="1zc2a4c228lhflsiypn8z6yn3fl0hr3dpmpzdxfrrijzbfai9215"; depends=[]; };
 uniCox = derive { name="uniCox"; version="1.0"; sha256="1glgk6k8gwxk3haqaswd2gmr7a2hgwjkwk2i1qc5ya7gg8svyavv"; depends=[survival]; };
 uniReg = derive { name="uniReg"; version="1.0"; sha256="1xl19dqnxxibgiiny9ysll2z8j1i70qrszf4xbacq1a6z31vm840"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; };
 uniftest = derive { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; };
 uniqtag = derive { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; };
+uniqueAtomMat = derive { name="uniqueAtomMat"; version="0.1-0"; sha256="0fizkxxppq00ngqvag4zbk6x7jpv6blgjr3w4p5iqc5p615z2yrb"; depends=[]; };
 unittest = derive { name="unittest"; version="1.2-0"; sha256="1g3f36kikxrzsiyhwpl73q2si5k28drcwvvrqzsqmfyhbjb14555"; depends=[]; };
 unmarked = derive { name="unmarked"; version="0.10-6"; sha256="07mw9rg4i81fqdkgkpcb7kd7235hn4nyxpbf5b8vxzsly81ffpz7"; depends=[lattice plyr Rcpp RcppArmadillo reshape]; };
 untb = derive { name="untb"; version="1.7-2"; sha256="1ha0xj94sz1r325qb4sb5hla9hw1gbqr76703vk792x9696skhji"; depends=[Brobdingnag partitions polynom]; };
 upclass = derive { name="upclass"; version="2.0"; sha256="0jkxn6jgglw6pzzbcvi1pnq4hwfach3xbi13zwml4i83s3n5b0vg"; depends=[mclust]; };
 uplift = derive { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; };
 urca = derive { name="urca"; version="1.2-8"; sha256="0gyjb99m6w6h701vmsav16jpfl5276vlyaagizax8k20ns9ddl4b"; depends=[nlme]; };
-urltools = derive { name="urltools"; version="1.1.0"; sha256="0l0fqc1zvn8ps1cxxnpglbyfdwibyxaj3c2ivz8js8vphcr5i9zp"; depends=[Rcpp]; };
+urltools = derive { name="urltools"; version="1.2.0"; sha256="0fn84xb9yykpl2lccl75f675braaswfsr8p17grvnaplf8hpl8gj"; depends=[Rcpp]; };
 usdm = derive { name="usdm"; version="1.1-12"; sha256="0padc9ppfisnjg1nzw5csv2zki6dby7487lis8pixf1hhbinsnci"; depends=[raster]; };
 useful = derive { name="useful"; version="1.1.8"; sha256="1lzl7rr9qxqa0ga6ml7qi7wi02fd4isgpfskvi3igy10iw1zv3hb"; depends=[ggplot2 plyr scales]; };
 userfriendlyscience = derive { name="userfriendlyscience"; version="0.3-0"; sha256="0gz59n315dbjlyh6fdqihr1x458wplnd43q2gw9s6f9b55359m2c"; depends=[car fBasics foreign GGally ggplot2 GPArotation knitr lavaan ltm MASS MBESS mosaic plyr psych pwr SuppDists xtable]; };
@@ -6649,26 +6674,24 @@ uuid = derive { name="uuid"; version="0.1-1"; sha256="1b35h2n86233zb6dwkgxxlvnll
 vacem = derive { name="vacem"; version="0.1-1"; sha256="0lh32hj4g1hsa45v6pmfyj1hw0klk8gr1k451lvs4hzpkkcwkqbn"; depends=[foreach]; };
 varComp = derive { name="varComp"; version="0.1-360"; sha256="18xazjx102j6v1jgswxjdqjb0hq6hd646yhwb7bcplqyls9hzha0"; depends=[CompQuadForm MASS Matrix mvtnorm nlme quadprog RLRsim SPA3G]; };
 varSelRF = derive { name="varSelRF"; version="0.7-5"; sha256="1800d9vvkqpxjvmiqdr610hw7ji79j0wsbl823s097dndmv51axk"; depends=[randomForest]; };
-varSelectIP = derive { name="varSelectIP"; version="0.2-1"; sha256="180lzsg48hnlcmhpk0a5yzmy2syw8yr7f5npnyspx3897hjag1vp"; depends=[MASS mvtnorm]; };
 varbvs = derive { name="varbvs"; version="1.0"; sha256="0ywgb6ibijffjjzqqb5lvh1lk5qznwwiq7kbsyzkwcxbp8xkabjw"; depends=[]; };
-vardiag = derive { name="vardiag"; version="0.2-0"; sha256="0avj900zx4nr67dk08n0n6arxx2cb2ymm0kd5xxnzsmyrmwm40mm"; depends=[]; };
+vardiag = derive { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; };
 vardpoor = derive { name="vardpoor"; version="0.3.2"; sha256="0vb684yhvafdmzphx4vv8gqih10x3mj8vmwshppwfgd3jp76dnps"; depends=[data_table foreach gdata laeken MASS plyr reshape2 stringr]; };
 vars = derive { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[lmtest MASS sandwich strucchange urca]; };
 vartors = derive { name="vartors"; version="0.2.6"; sha256="04dynqs903clllk9nyynh3dr7msxn5rr5jmw6ql86ppd5w3da0rl"; depends=[]; };
 vbdm = derive { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; };
 vbsr = derive { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; };
-vcd = derive { name="vcd"; version="1.4-0"; sha256="0gp137hlkg1wm8bhfdpswz0g05a4biprfa5r9i1fz5w0myqgpxca"; depends=[colorspace lmtest MASS]; };
+vcd = derive { name="vcd"; version="1.4-1"; sha256="1529q8gysqzpgphsnqdwqqr630i4k1kr0zdbmxqq5wpy5r97fk5g"; depends=[colorspace lmtest MASS]; };
 vcdExtra = derive { name="vcdExtra"; version="0.6-8"; sha256="00nxvq5fn5il3lmip8ag22cqc2sxlbl1rqw5zxp309wp4nrm5i2v"; depends=[gnm MASS vcd]; };
 vcrpart = derive { name="vcrpart"; version="0.3-3"; sha256="0rnf9cwynfwr956hwj4kxqiqq3cdw4wf5ia73s7adxixh5kpqxqa"; depends=[nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; };
 vdg = derive { name="vdg"; version="1.1"; sha256="08bl7835m5c62lgaghgnd80zlbic6i80sjfxdr39a715bxpr8g3b"; depends=[ggplot2 gridExtra proxy quantreg]; };
 vdmR = derive { name="vdmR"; version="0.1.1"; sha256="0hmn7xgi1dzril6jdwxkpxp8isin0kxn3yb5fmcyfjhf03kcv4d4"; depends=[dplyr GGally ggplot2 gridSVG maptools plyr rjson Rook]; };
 vec2dtransf = derive { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; };
 vecsets = derive { name="vecsets"; version="1.1"; sha256="0k27g3frc9y9z2qlm19kfpls6wl0422dilhdlk6096f1fp3mc6ij"; depends=[]; };
-vectoptim = derive { name="vectoptim"; version="0.2"; sha256="1n19sipx5r0qy08jmrbsrf0kgwgl31np88wc1zyc2bkx8h1zkmf2"; depends=[doParallel foreach]; };
 vegan = derive { name="vegan"; version="2.3-0"; sha256="1zlz2zq0818735db4l8gfwwxxd5dc0xnx6v8cq6mfclkw1qhcdpx"; depends=[cluster lattice MASS mgcv permute]; };
 vegan3d = derive { name="vegan3d"; version="0.65-1"; sha256="03rzv7l2jjrahj3492ysalyizkv24by35nrhd1bnlb1s88sav7sr"; depends=[rgl scatterplot3d vegan]; };
 vegclust = derive { name="vegclust"; version="1.6.3"; sha256="0l6j4sgzfqvcypx2dszpnsd1sivk33pixlgf9abqifp45skpkwfg"; depends=[sp vegan]; };
-vegdata = derive { name="vegdata"; version="0.6.9"; sha256="1a8b8wwsxq8090cj8pxw1digllmc2rnby8immjfmbi5rzjbksgi3"; depends=[foreign XML]; };
+vegdata = derive { name="vegdata"; version="0.7"; sha256="1h0prrpsiywqx2h49hrr3h9i4515vbgqb2yxfpp81zv2pipa353b"; depends=[foreign XML]; };
 vegetarian = derive { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
 venneuler = derive { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; };
 verification = derive { name="verification"; version="1.41"; sha256="1c8l0kqk02xijr4yhgpmhlqsflm3wizybkwpzmlnfanh8vzn49g2"; depends=[boot CircStats dtw fields MASS]; };
@@ -6678,6 +6701,7 @@ violinmplot = derive { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988x
 vioplot = derive { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; };
 viopoints = derive { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
 virtualspecies = derive { name="virtualspecies"; version="1.1"; sha256="0znrb6xqyzddd1r999rhx6ix6wgpj1laf5bcns7zgmq6zb39j74s"; depends=[ade4 dismo raster rworldmap]; };
+visNetwork = derive { name="visNetwork"; version="0.0.4"; sha256="0609zg6n8f0nddzvwm6bhi1xysxw2z197jvidycwd45f68qfg0ld"; depends=[htmlwidgets magrittr rjson]; };
 visreg = derive { name="visreg"; version="2.2-0"; sha256="1hnyrfgyk5fign5l35aql2q7q4mmw3jby5pkv696h8k1mc8qq096"; depends=[lattice]; };
 visualFields = derive { name="visualFields"; version="0.4.2"; sha256="14plg94g4znl8n6798na2rivjjamjgayqkk1qwn1nx5df040l4q5"; depends=[flip gridBase Hmisc matrixStats]; };
 visualize = derive { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; };
@@ -6697,7 +6721,6 @@ wahc = derive { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3
 walkscoreAPI = derive { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
 wasim = derive { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[fast MASS qualV tiger]; };
 waterData = derive { name="waterData"; version="1.0.4"; sha256="0wk49f079jfbjncyirdvq50wswf9g361iivshjfhyndv83gbqrzk"; depends=[lattice latticeExtra XML]; };
-waterfall = derive { name="waterfall"; version="0.9.9.20121030"; sha256="140s5639ayd9qgn4i1s1qk541vi34ndzdcqpaps7q53g42n8akfw"; depends=[lattice]; };
 waveband = derive { name="waveband"; version="4.6"; sha256="1y2qi2zb8l2ap6f8ihnpq2yavic464bl5mp5yv1dscbk0nmfn966"; depends=[wavethresh]; };
 waved = derive { name="waved"; version="1.1-2"; sha256="17pr9qhz0dbbcr78vwm964d9zd7yrfrqvadr1lwf756bsrscmlg3"; depends=[]; };
 wavelets = derive { name="wavelets"; version="0.3-0"; sha256="141s7z7wxl5plxp7xp7wczswlcvb18a4h3n881l9qc4ny9p7gfpa"; depends=[]; };
@@ -6709,16 +6732,16 @@ weatherData = derive { name="weatherData"; version="0.4.1"; sha256="19ynb9w52ay1
 webchem = derive { name="webchem"; version="0.0.1"; sha256="0hfsjaffxz78mxxh2wx5api2blnpg5y16lyc0jf1zmq7zkhccx3l"; depends=[RCurl RJSONIO XML]; };
 webutils = derive { name="webutils"; version="0.3"; sha256="1wzpwigc5mmdnz453qr4s1viaslgdrcg238n25qcg4xjakmnxrss"; depends=[jsonlite]; };
 webvis = derive { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m0daqr7fqiw3xy1lg0i0qn9cpvi348f"; depends=[]; };
-weightedKmeans = derive { name="weightedKmeans"; version="1.2.0"; sha256="140cvl1jwwqyvcsf7pbsxh9k4bynd7c1q159pp7ia1f1sgimxafb"; depends=[clv lattice latticeExtra]; };
 weightedScores = derive { name="weightedScores"; version="0.9.1"; sha256="0wd2ymxy8yh3l4xd3xgifbihi89h53wy6n84x7x26px12c70q8fa"; depends=[mvtnorm rootSolve]; };
 weights = derive { name="weights"; version="0.80"; sha256="147fgs99sg1agq081ikj2fhb4b2vzsppdg1h1w036bb92vsjb0g5"; depends=[gdata Hmisc]; };
 weirs = derive { name="weirs"; version="0.24"; sha256="15iffimdr01m92wq6srb49vf900c3cbipj99sk7rxbqbdzbb0y6g"; depends=[]; };
 wesanderson = derive { name="wesanderson"; version="0.3.2"; sha256="17acf9ydi2sw7q887ni9ly12mdmip66ix6gdkh68rncj8sx3csrd"; depends=[]; };
 wfe = derive { name="wfe"; version="1.3"; sha256="16b39i60x10kw6yz44ff19h638s9lsgnz8azc76zl9b8s64jliya"; depends=[arm MASS Matrix]; };
-wgaim = derive { name="wgaim"; version="1.4-8"; sha256="1x1dgxw1viswdqd1k1gfbpipzhgy13lhncji0wlsgpcgfa40ap1a"; depends=[lattice qtl]; };
+wgaim = derive { name="wgaim"; version="1.4-10"; sha256="0wf6j7f7hn2cnsb9yi28rjl7sa60zjggg62i00039b7gxcznxj1r"; depends=[lattice qtl]; };
 wgsea = derive { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[snpStats]; };
 whisker = derive { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; };
 whoami = derive { name="whoami"; version="1.1.0"; sha256="15mj1s0dfr9y14b23nx0506r0vz48bm1f6mf0fi7b390q0zmndq7"; depends=[httr jsonlite]; };
+whoapi = derive { name="whoapi"; version="0.1.0"; sha256="01hi47da4i482ma7fzyk7ivs0xalinh7g9hjkynk9kr7xq1dj8ci"; depends=[httr]; };
 widals = derive { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; };
 widenet = derive { name="widenet"; version="0.1-2"; sha256="1nimm8szbg82vg00f5c7b3f3sk0gplssbl4ggasjnh7dl621vfny"; depends=[glmnet relaxnet]; };
 wikibooks = derive { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; };
@@ -6744,8 +6767,8 @@ wrassp = derive { name="wrassp"; version="0.1.3"; sha256="1xza4w5dgc6gda9ybmq386
 write_snns = derive { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
 wrspathrow = derive { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[raster rgdal rgeos sp wrspathrowData]; };
 wrspathrowData = derive { name="wrspathrowData"; version="1.0"; sha256="0a1aggcll0fmkwfg4h7rs4j5h3v1bh95dkbriwrb0bx0cikg63x3"; depends=[]; };
-wskm = derive { name="wskm"; version="1.4.19"; sha256="16smir0b4pxkaxgr2vclq8kprpwn0y3fb43ba79q94d6m5hm844y"; depends=[clv lattice latticeExtra]; };
-wsrf = derive { name="wsrf"; version="1.5.14"; sha256="0j0zlnazz40sv02fl8m5z7rv877m6ak2cms2q3ivy344k8ynjs0m"; depends=[Rcpp]; };
+wskm = derive { name="wskm"; version="1.4.28"; sha256="0d9hcriakg6fxzc8wjsahc4zkyjza31mb9dv2h4xcf8298xa96i4"; depends=[clv lattice latticeExtra]; };
+wsrf = derive { name="wsrf"; version="1.5.24"; sha256="0wgc4whxfsdl5wcr2i6bj9nvn49kfg35ldl7s8ca9aqmii7m5rzl"; depends=[Rcpp]; };
 wtcrsk = derive { name="wtcrsk"; version="1.3"; sha256="1viddyms2d9q2hb9z788fcs8vp7gp6vzlsszcnyxgganfjsd85zy"; depends=[]; };
 wux = derive { name="wux"; version="2.0-2"; sha256="0y0pn1hr94wgr6v8xac4hf3g137rx1zr1vdplgpjz1k5v41xvagk"; depends=[abind class corpcor fields gdata Hmisc ncdf reshape rgdal rgeos rworldmap sp stringr]; };
 x_ent = derive { name="x.ent"; version="1.1.2"; sha256="0wbbhsnlm5yln72h648nz3y5w83kq9qvpw0pk56lsc1bafps712p"; depends=[ggplot2 jsonlite opencpu rJava statmod stringr venneuler xtable]; };
@@ -6769,7 +6792,7 @@ yacca = derive { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11ms
 yaml = derive { name="yaml"; version="2.1.13"; sha256="18kz5mfn7qpif5pn91w4vbrc5bkycsj85vwm5wxwzjlb02i9mxi6"; depends=[]; };
 ycinterextra = derive { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; };
 yhat = derive { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[boot miscTools plotrix yacca]; };
-yhatr = derive { name="yhatr"; version="0.13.4"; sha256="1z1i48nhyadn1l00sw50qif2zyjvy1jbvq91chnapfdbjjsgfv2x"; depends=[httr jsonlite plyr RCurl rjson stringr]; };
+yhatr = derive { name="yhatr"; version="0.13.6"; sha256="0g08ass0vrqcmw1zfybiaqbrspcwyf4bsmcmzbz3nzdlkgwbn3bh"; depends=[httr jsonlite plyr RCurl rjson stringr]; };
 ykmeans = derive { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; };
 yuima = derive { name="yuima"; version="1.0.71"; sha256="0aqb87jlvlq6iw2mlngiylvayd6y2wrc82zl1za442gqq8py00if"; depends=[cubature expm mvtnorm zoo]; };
 zCompositions = derive { name="zCompositions"; version="1.0.3"; sha256="0lxy201ys9dvv8c09q8wbks1c2jkjyd1bbrxhjr7zi9j7m0parl7"; depends=[MASS NADA truncnorm]; };
@@ -6785,5 +6808,5 @@ zooaRch = derive { name="zooaRch"; version="1.0"; sha256="1krzwrk2cknlsmd3hn8c2l
 zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[filehash jpeg mlearning png svDialogs svMisc]; };
 zoom = derive { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; };
 ztable = derive { name="ztable"; version="0.1.5"; sha256="1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r"; depends=[]; };
-zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; };
+zyp = derive { 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 34dbf4cba52..7d9cd92b75b 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -417,7 +417,6 @@ let
     "BEQI2"
     "betapart"
     "betaper"
-    "BHMSMAfMRI"
     "BiodiversityR"
     "BioGeoBEARS"
     "bio_infer"
@@ -607,7 +606,6 @@ let
     "rgl"
     "RHRV"
     "rich"
-    "ringscale"
     "rioja"
     "ripa"
     "rite"
@@ -1155,7 +1153,6 @@ let
     "immunoClust" # build is broken
     "imputeR" # depends on broken package nlopt-2.4.2
     "in2extRemes" # depends on broken package nlopt-2.4.2
-    "incReg" # depends on broken package nlopt-2.4.2
     "inferference" # depends on broken package nlopt-2.4.2
     "influence_ME" # depends on broken package nlopt-2.4.2
     "inSilicoMerging" # build is broken

From 4d49006a0f8ebdf32416779167bcb783834f9629 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 9 Jul 2015 15:00:31 +0200
Subject: [PATCH 2029/2322] rocksdb: fix build (ZHF)

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

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 7759aa79981..004e5e57de4 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
   # Environment vars used for building certain configurations
   PORTABLE = "1";
   USE_SSE = "1";
+  CMAKE_CXX_FLAGS = "-std=gnu++11";
   JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc";
 
   buildFlags = [

From 5c9f437d2fc1409fd5281458fe66c07817078d77 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Jul 2015 15:09:01 +0200
Subject: [PATCH 2030/2322] linux: 3.14.46 -> 3.14.47

CVE-2014-7822
---
 pkgs/os-specific/linux/kernel/linux-3.14.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-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 103fbcbcfb9..90a6a59ed4a 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.46";
+  version = "3.14.47";
   # Remember to update grsecurity!
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1ran8fi1ldc89x3gpxwkkfl64mln4sl0rq5bbl8imlca5nljmzkb";
+    sha256 = "1hh24p0axh0kn49b0rqfmb1h74a0ry1pgy0ps1hgxs5x3lxby783";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index ed202d77b38..d305359061a 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -65,10 +65,10 @@ rec {
   };
 
   grsecurity_stable = grsecPatch
-    { kversion  = "3.14.46";
-      revision  = "201506300711";
+    { kversion  = "3.14.47";
+      revision  = "201507050832";
       branch    = "stable";
-      sha256    = "0xjqh7yc4vzgbnql16aylla9b0cjh442sywp8bvkh0ny5m3rj64l";
+      sha256    = "0sv7aa7ca2n5jiz4j5vvji1x2p7cb1ah71h1iqmk0981dqs0isp8";
     };
 
   grsecurity_unstable = grsecPatch

From dc626693352250f21f0d2c6492757e6a916bcfc6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 7 Jul 2015 15:01:36 +0200
Subject: [PATCH 2031/2322] =?UTF-8?q?Set=20=E2=80=98allowSubstitutes=20=3D?=
 =?UTF-8?q?=20false=E2=80=99=20on=20various=20derivations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reduces the number of binary cache requests. See
https://github.com/NixOS/nix/commit/b64988bb3585478676585a0f0aecbcf4e11d4432.
---
 nixos/modules/services/hardware/udev.nix      |  3 +++
 nixos/modules/services/system/dbus.nix        |  3 +++
 nixos/modules/system/activation/top-level.nix |  1 +
 nixos/modules/system/boot/systemd-lib.nix     | 16 +++++++++++++---
 nixos/modules/system/etc/etc.nix              |  1 +
 pkgs/build-support/trivial-builders.nix       |  1 +
 6 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 50588e44958..fc89de777e8 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -28,7 +28,10 @@ let
   # Perform substitutions in all udev rules files.
   udevRules = stdenv.mkDerivation {
     name = "udev-rules";
+
     preferLocalBuild = true;
+    allowSubstitutes = false;
+
     buildCommand = ''
       mkdir -p $out
       shopt -s nullglob
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 853b458cf58..5c20901427c 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -12,7 +12,10 @@ let
 
   configDir = pkgs.stdenv.mkDerivation {
     name = "dbus-conf";
+
     preferLocalBuild = true;
+    allowSubstitutes = false;
+
     buildCommand = ''
       mkdir -p $out
 
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index b19fea57f6b..83930079816 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -101,6 +101,7 @@ let
     if [] == failed then pkgs.stdenv.mkDerivation {
       name = "nixos-${config.system.nixosVersion}";
       preferLocalBuild = true;
+      allowSubstitutes = false;
       buildCommand = systemBuilder;
 
       inherit (pkgs) utillinux coreutils;
diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix
index 873fff15d38..8acaa5212f5 100644
--- a/nixos/modules/system/boot/systemd-lib.nix
+++ b/nixos/modules/system/boot/systemd-lib.nix
@@ -13,13 +13,20 @@ rec {
       pathSafeName = lib.replaceChars ["@" ":" "\\"] ["-" "-" "-"] name;
     in
     if unit.enable then
-      pkgs.runCommand "unit-${pathSafeName}" { preferLocalBuild = true; inherit (unit) text; }
+      pkgs.runCommand "unit-${pathSafeName}"
+        { preferLocalBuild = true;
+          allowSubstitutes = false;
+          inherit (unit) text;
+        }
         ''
           mkdir -p $out
           echo -n "$text" > $out/${shellEscape name}
         ''
     else
-      pkgs.runCommand "unit-${pathSafeName}-disabled" { preferLocalBuild = true; }
+      pkgs.runCommand "unit-${pathSafeName}-disabled"
+        { preferLocalBuild = true;
+          allowSubstitutes = false;
+        }
         ''
           mkdir -p $out
           ln -s /dev/null $out/${shellEscape name}
@@ -89,7 +96,10 @@ rec {
         as));
 
   generateUnits = type: units: upstreamUnits: upstreamWants:
-    pkgs.runCommand "${type}-units" { preferLocalBuild = true; } ''
+    pkgs.runCommand "${type}-units"
+      { preferLocalBuild = true;
+        allowSubstitutes = false;
+      } ''
       mkdir -p $out
 
       # Copy the upstream systemd units we're interested in.
diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix
index b57b03bcf96..300ae0acda5 100644
--- a/nixos/modules/system/etc/etc.nix
+++ b/nixos/modules/system/etc/etc.nix
@@ -14,6 +14,7 @@ let
     builder = ./make-etc.sh;
 
     preferLocalBuild = true;
+    allowSubstitutes = false;
 
     /* !!! Use toXML. */
     sources = map (x: x.source) etc';
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index d9eeaa31359..9203425b20a 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -23,6 +23,7 @@ rec {
         passAsFile = [ "text" ];
         # Pointless to do this on a remote machine.
         preferLocalBuild = true;
+        allowSubstitutes = false;
       }
       ''
         n=$out${destination}

From 9539db1ec3f7482c96b19893bcfad06d6ec6532c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Jul 2015 15:15:52 +0200
Subject: [PATCH 2032/2322] openssl: Update to 1.0.1p

---
 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 d05e3f21e8a..b9224dad110 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -8,14 +8,14 @@ let
     stdenv.cross;
 in
 stdenv.mkDerivation rec {
-  name = "openssl-1.0.1o";
+  name = "openssl-1.0.1p";
 
   src = fetchurl {
     urls = [
       "http://www.openssl.org/source/${name}.tar.gz"
       "http://openssl.linux-mirror.org/source/${name}.tar.gz"
     ];
-    sha1 = "b003e3382607ef2c6d85b51e4ed7a4c0a76b8d5a";
+    sha1 = "9d1977cc89242cd11471269ece2ed4650947c046";
   };
 
   patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch

From 5e156b9db78a7639c7a7de6964b7a9188431f895 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Jul 2015 15:17:14 +0200
Subject: [PATCH 2033/2322] openssl: Update to 1.0.2d

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

diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix
index 2320d7c8a45..28254cb390d 100644
--- a/pkgs/development/libraries/openssl/1.0.2.x.nix
+++ b/pkgs/development/libraries/openssl/1.0.2.x.nix
@@ -8,14 +8,14 @@ let
     stdenv.cross;
 in
 stdenv.mkDerivation rec {
-  name = "openssl-1.0.2c";
+  name = "openssl-1.0.2d";
 
   src = fetchurl {
     urls = [
       "http://www.openssl.org/source/${name}.tar.gz"
       "http://openssl.linux-mirror.org/source/${name}.tar.gz"
     ];
-    sha1 = "6e4a5e91159eb32383296c7c83ac0e59b83a0a44";
+    sha1 = "d01d17b44663e8ffa6a33a5a30053779d9593c3d";
   };
 
   patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch;

From 7ec18455b2ce51c2df0172e247856ac2a891f37a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 9 Jul 2015 15:21:43 +0200
Subject: [PATCH 2034/2322] shhmsg: init at 1.4.2

---
 pkgs/development/libraries/shhmsg/default.nix | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/shhmsg/default.nix

diff --git a/pkgs/development/libraries/shhmsg/default.nix b/pkgs/development/libraries/shhmsg/default.nix
new file mode 100644
index 00000000000..5f14a7bb5ee
--- /dev/null
+++ b/pkgs/development/libraries/shhmsg/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "shhmsg-1.4.2";
+
+  src = fetchurl {
+    url = "http://shh.thathost.com/pub-unix/files/${name}.tar.gz";
+    sha256 = "0ax02fzqpaxr7d30l5xbndy1s5vgg1ag643c7zwiw2wj1czrxil8";
+  };
+
+  installFlags = "INSTBASEDIR=$(out)";
+
+  meta = with stdenv.lib; {
+    description = "A library for displaying messages";
+    homepage = http://shh.thathost.com/pub-unix/;
+    license = licenses.artistic1;
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 689f43c7664..8437427ca7c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8034,6 +8034,8 @@ let
 
   sfsexp = callPackage ../development/libraries/sfsexp {};
 
+  shhmsg = callPackage ../development/libraries/shhmsg { };
+
   silgraphite = callPackage ../development/libraries/silgraphite {};
   graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {};
 

From d1c2fd81f66b058e847412937be189e2b98bb1d1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 9 Jul 2015 15:23:25 +0200
Subject: [PATCH 2035/2322] shhopt: init at 1.1.7

---
 pkgs/development/libraries/shhopt/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/shhopt/default.nix

diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/development/libraries/shhopt/default.nix
new file mode 100644
index 00000000000..dbac4c85961
--- /dev/null
+++ b/pkgs/development/libraries/shhopt/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "shhopt-1.1.7";
+
+  src = fetchurl {
+    url = "http://shh.thathost.com/pub-unix/files/${name}.tar.gz";
+    sha256 = "0yd6bl6qw675sxa81nxw6plhpjf9d2ywlm8a5z66zyjf28sl7sds";
+  };
+
+  installFlags = "INSTBASEDIR=$(out)";
+
+  meta = with stdenv.lib; {
+    description = "A library for parsing command line options";
+    homepage = http://shh.thathost.com/pub-unix/;
+    license = licenses.artistic1;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8437427ca7c..8b92885de60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8036,6 +8036,8 @@ let
 
   shhmsg = callPackage ../development/libraries/shhmsg { };
 
+  shhopt = callPackage ../development/libraries/shhopt { };
+
   silgraphite = callPackage ../development/libraries/silgraphite {};
   graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {};
 

From 1e3a12bf22b86f03f4b4a0dcbe03806cd1abc281 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 9 Jul 2015 15:24:00 +0200
Subject: [PATCH 2036/2322] snake4: init at 1.0.14

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

diff --git a/pkgs/games/snake4/default.nix b/pkgs/games/snake4/default.nix
new file mode 100644
index 00000000000..081604d2ce8
--- /dev/null
+++ b/pkgs/games/snake4/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, shhmsg, shhopt, xlibs }:
+
+stdenv.mkDerivation rec {
+  name = "snake4-1.0.14";
+
+  src = fetchurl {
+    url = "http://shh.thathost.com/pub-unix/files/${name}.tar.gz";
+    sha256 = "14cng9l857np42zixp440mbc8y5675frb6lhsds53j1cws9cncw9";
+  };
+
+  buildInputs = with xlibs; [ shhmsg shhopt libX11 libXt libXpm libXaw libXext];
+
+  preInstall = ''
+    substituteInPlace Makefile --replace "-o \$(OWNER) -g \$(GROUP)" ""
+  '';
+  
+  installFlags = [ "INSTLIBDIR=$(out)/lib"
+                   "INSTBINDIR=$(out)/bin"
+                   "INSTMANDIR=$(out)/man" ];
+
+  meta = with stdenv.lib; {
+    description = "A game starring a fruit-eating snake";
+    homepage = http://shh.thathost.com/pub-unix/html/snake4.html;
+    license = licenses.artistic1;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b92885de60..e6ad3607854 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13648,6 +13648,8 @@ let
   # get binaries without data built by Hydra
   simutrans_binaries = lowPrio simutrans.binaries;
 
+  snake4 = callPackage ../games/snake4 { };
+
   soi = callPackage ../games/soi {};
 
   # You still can override by passing more arguments.

From e4b583a5d0ab86ee6d5d5c2e6dc27675f4b5598a Mon Sep 17 00:00:00 2001
From: Russell O'Connor <oconnorr@google.com>
Date: Thu, 9 Jul 2015 14:43:59 +0000
Subject: [PATCH 2037/2322] cassandra-driver: fix package attribute name

Use a hyphen instead of camelCase.
---
 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 e9163c88252..bf6bd84b38a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1710,7 +1710,7 @@ let
     };
   };
 
-  cassandraDriver = buildPythonPackage rec {
+  cassandra-driver = buildPythonPackage rec {
     name = "cassandra-driver-2.6.0c2";
 
     src = pkgs.fetchurl {

From aca6eb1fdbb57f935cdd4d1ce8bc801789070819 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 9 Jul 2015 17:31:14 +0200
Subject: [PATCH 2038/2322] blender: Update to 2.75a

---
 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 c0420d6ac67..01299dc671d 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -10,11 +10,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "blender-2.75";
+  name = "blender-2.75a";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "1r3qyj57g06ir424q7szxkyb6h0b7laq7f126158kgs94xpkhlsz";
+    sha256 = "09lxb2li70p6fg7hbakin9ffy3b3101c1gdjqi3pykks5q3h9sq4";
   };
 
   buildInputs =

From ed0d387a6df25b8727a3bd72806ee775bc5d8ac7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 8 Jul 2015 17:21:47 -0700
Subject: [PATCH 2039/2322] gtk3: 3.16.4 -> 3.16.5

---
 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 ac0fc53e755..60b71f24aff 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -10,7 +10,7 @@ assert cupsSupport -> cups != null;
 
 let
   ver_maj = "3.16";
-  ver_min = "4";
+  ver_min = "5";
   version = "${ver_maj}.${ver_min}";
 in
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "13pwj12m55mbhdaiar57q2ivdsm3lm5ycyhvm8gak0fblkbxpr8y";
+    sha256 = "13pwj12m55mbhdaiar57q2ivdsm3lm5ycyhvm8gak0fblkbxpr8a";
   };
 
   nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];

From b477600cc00622030bbd99279b519b4f8f26847e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 9 Jul 2015 10:30:55 -0700
Subject: [PATCH 2040/2322] gcc5: Use 5.2 snapshot to fix bugs noticed in
 syslinux and chromium with gcc5.1

---
 pkgs/development/compilers/gcc/5/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 323a87bc774..1cb0662da13 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -57,7 +57,7 @@ assert langGo -> langCC;
 with stdenv.lib;
 with builtins;
 
-let version = "5.1.0";
+let version = "5.2.0-RC-20150707";
 
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
@@ -209,8 +209,8 @@ stdenv.mkDerivation ({
   builder = ../builder.sh;
 
   src = fetchurl {
-    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
-    sha256 = "1bd5vj4px3s8nlakbgrh38ynxq4s654m6nxz7lrj03mvkkwgvnmp";
+    url = "http://mirrors-usa.go-parts.com/gcc/snapshots/${version}/gcc-${version}.tar.bz2";
+    sha256 = "1bjdpybw5gk58n737wzy9c0nna9pdqf9177pmb94icyc8qgy0a7z";
   };
 
   inherit patches;

From 2054af839d4912fc9d593cdb19ba1ebd72fca9c9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 9 Jul 2015 10:38:09 -0700
Subject: [PATCH 2041/2322] libressl: 2.1.6 -> 2.2.1

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

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index ef4638eea27..093f644c096 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libressl-${version}";
-  version = "2.1.6";
+  version = "2.2.1";
 
   src = fetchurl {
     url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "1a2k6sby6a1d0hf4hns6d13cvyck2i0figbkf1q0301vggcnv0jg";
+    sha256 = "0bapzvxrg09p4hlzdhsvk0ljc3gsjj4ixjpf09dn0fzwmd81fcsg";
   };
 
   enableParallelBuilding = true;

From 57edfb51334e2bd7438056c0394c7a64c97366ee Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 9 Jul 2015 10:45:14 -0700
Subject: [PATCH 2042/2322] gtk3: Fix hash in
 ed0d387a6df25b8727a3bd72806ee775bc5d8ac7

---
 pkgs/development/libraries/gtk+/3.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 60b71f24aff..f8398618727 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "13pwj12m55mbhdaiar57q2ivdsm3lm5ycyhvm8gak0fblkbxpr8a";
+    sha256 = "0cdwykh4086f7fl4dkybgpyxyb1jcmxbfin2az42z5pb4z8rjz5q";
   };
 
   nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];

From 0723117f4c6866552c00356037e28e2143a6f751 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 9 Jul 2015 20:19:07 +0200
Subject: [PATCH 2043/2322] haproxy: update from 1.5.11 to 1.5.14, fixes
 CVE-2015-3281

---
 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 4119afa5228..de8488ab3a8 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   majorVersion = "1.5";
-  version = "${majorVersion}.11";
+  version = "${majorVersion}.14";
   name = "haproxy-${version}";
 
   src = fetchurl {
     url = "http://haproxy.1wt.eu/download/${majorVersion}/src/${name}.tar.gz";
-    sha256 = "1gwkyy06c8bw5vcjv82hai554zrd415jjsb1iafg01c4k1ia8nlb";
+    sha256 = "16cg1jmy2d8mq2ypwifsvhbyp4pyrj0zm0r818sx0r4hchwdsrcm";
   };
 
   buildInputs = [ openssl ];

From 5d88acfa7067605519dea67d82b9840c847cb8b8 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 9 Jul 2015 20:24:15 +0200
Subject: [PATCH 2044/2322] haskell-presburger: enable tests

The tests compile (and pass) since release of presburger version 1.3.1.
---
 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 8c8ca70ca80..b581db8aa06 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -88,9 +88,6 @@ self: super: {
   yices-easy = dontDistribute super.yices-easy;
   yices-painless = dontDistribute super.yices-painless;
 
-  # The test suite refers to its own library with an invalid version constraint.
-  presburger = dontCheck super.presburger;
-
   # Won't find it's header files without help.
   sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
 

From 36ce0e2876c98d4745639d226e4d7e2fad5ad21c Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Thu, 9 Jul 2015 21:16:24 +0200
Subject: [PATCH 2045/2322] Update syncthing 0.11.10 -> 0.11.13

---
 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 22727dcc07a..1a3430b128f 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,12 +4,12 @@ with goPackages;
 
 buildGoPackage rec {
   name = "syncthing-${version}";
-  version = "0.11.10";
+  version = "0.11.13";
   goPackagePath = "github.com/syncthing/syncthing";
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "f8260d17519ff71232ab60551b444c0138d3391426ab2ef7f9f8e4d2fdac7c40";
+    sha256 = "07045f4c24e546f4e8307acedeb5fe72b023db57bbf4d73b56d7fe2c75d694dc";
   };
 
   subPackages = [ "cmd/syncthing" ];

From 3a96152c2ce75423e70302b070fc577652538496 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 9 Jul 2015 21:55:15 +0200
Subject: [PATCH 2046/2322] wvstreams: compile with gcc46, potentially fixes
 #8725

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

diff --git a/pkgs/development/libraries/wvstreams/default.nix b/pkgs/development/libraries/wvstreams/default.nix
index ecfc9b88a0e..b879cf37a31 100644
--- a/pkgs/development/libraries/wvstreams/default.nix
+++ b/pkgs/development/libraries/wvstreams/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, dbus, zlib, openssl, readline, perl }:
+{ stdenv, gcc46, fetchurl, qt4, dbus, zlib, openssl, readline, perl }:
 
 stdenv.mkDerivation {
   name = "wvstreams-4.6.1";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     sed -e '1i#include <unistd.h>' -i $(find . -name '*.c' -o -name '*.cc')
   '';
 
-  buildInputs = [ qt4 dbus zlib openssl readline perl ];
+  buildInputs = [ gcc46 qt4 dbus zlib openssl readline perl ];
 
   meta = {
     description = "Network programming library in C++";

From 710c4b2cb58cfba82633bcaedd7cf50a4d9b591b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 9 Jul 2015 22:22:58 +0200
Subject: [PATCH 2047/2322] calibre: fix build by using qt54

---
 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 fe6a3932af9..787b5e80528 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qt53, icu, sqlite
+, imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite
 , pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp
 , xdg_utils
 }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg
-      fontconfig podofo qt53 pil chmlib icu sqlite libusb1 libmtp xdg_utils
+      fontconfig podofo qt5.base pil chmlib icu sqlite libusb1 libmtp xdg_utils
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
       pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
       pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw

From ac594b303d2efb978245626fa18aa7d8cc056af3 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 9 Jul 2015 23:02:05 +0200
Subject: [PATCH 2048/2322] haskell-http-media: enable tests

The test suite builds and runs OK since version 0.6.2.
---
 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 b581db8aa06..d6cbc29a573 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -217,9 +217,6 @@ self: super: {
   # https://github.com/haskell/bytestring/issues/41
   bytestring_0_10_6_0 = dontCheck super.bytestring_0_10_6_0;
 
-  # https://github.com/zmthy/http-media/issues/6
-  http-media = dontCheck super.http-media;
-
   # tests don't compile for some odd reason
   jwt = dontCheck super.jwt;
 

From 2c327ca48e4cc57e3de7144e4f0c68023c2704f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 10 Jul 2015 00:23:18 +0200
Subject: [PATCH 2049/2322] activator: 1.3.2 -> 1.3.5

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

diff --git a/pkgs/development/tools/activator/default.nix b/pkgs/development/tools/activator/default.nix
index 72bed9d46ca..9d187b1018c 100644
--- a/pkgs/development/tools/activator/default.nix
+++ b/pkgs/development/tools/activator/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
 
   name = "${pname}-${version}";
   pname = "activator";
-  version = "1.3.2";
+  version = "1.3.5";
 
   src = fetchurl {
     url = "http://downloads.typesafe.com/typesafe-${pname}/${version}/typesafe-${name}.zip";
-    sha256 = "0a6x4w63829fbp13gk1l37p6di11lfmgla26gqnr065vzpkg90y6";
+    sha256 = "19mcrp1ky652wwh3360ia0irc0c2xjcnn9rdal1rmkkzsqn4jx0b";
   };
 
   buildInputs = [ unzip jre ];

From 036722ab7c073dc65e0754464b639fc519e9fb4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 10 Jul 2015 01:36:47 +0200
Subject: [PATCH 2050/2322] spark: 1.1.1 -> 1.4.0

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

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 1852f21d27a..1147c4b64a1 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name    = "spark-${version}";
-  version = "1.1.1";
+  version = "1.4.0";
 
   src = fetchurl {
-    url    = "http://d3kbcqa49mib13.cloudfront.net/${name}-bin-cdh4.tgz";
-    sha256 = "1k0lw8aq5is3gnsrm8q24s0knga6kb3c9xsca20g11fy8b0y4nvk";
+    url    = "mirror://apache/spark/${name}/${name}-bin-cdh4.tgz";
+    sha256 = "1w60xzzg9mcymin1pmqwx1mvcqmdpfyxhd2dmw5alhnrzi21ycxi";
   };
 
   buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]

From db3602b5d6a928a69cc00d837d513817bdabe1c4 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Fri, 10 Jul 2015 10:18:29 +1000
Subject: [PATCH 2051/2322] gnupg: fix build on darwin

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

diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 542baa95efe..016b22916ea 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
 
   buildInputs
     = [ readline zlib libgpgerror libgcrypt libassuan libksba pth
-        openldap bzip2 libusb curl libiconv ];
+        openldap bzip2 curl libiconv ]
+        ++ stdenv.lib.optional (!stdenv.isDarwin) libusb;
 
   patchPhase = ''
     find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i

From 97a2fcdc24164179ba71cf5f0816d8502e8c49f4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 9 Jul 2015 17:30:13 -0700
Subject: [PATCH 2052/2322] bluez5: 5.31 -> 5.32

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

diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index 03c3d5943fe..1cc990f797b 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -5,11 +5,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "bluez-5.31";
+  name = "bluez-5.32";
    
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
-    sha256 = "13w1cdybwyb9pww64hp8dwxqq9zs58wh1mq8sslsknb6b3663dn4";
+    sha256 = "1xspdw87h2mpy5q36q7225yizgcvxlag1b8qi13h9v6b07kkakzy";
   };
 
   pythonPath = with pythonPackages;

From bf32753cd9f68201885891e1715444e8d6f8c022 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 9 Jul 2015 17:30:26 -0700
Subject: [PATCH 2053/2322] hdparm: 9.45 -> 9.48

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

diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix
index a0cd09fbf35..538d8d4ab83 100644
--- a/pkgs/os-specific/linux/hdparm/default.nix
+++ b/pkgs/os-specific/linux/hdparm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "hdparm-9.45";
+  name = "hdparm-9.48";
 
   src = fetchurl {
     url = "mirror://sourceforge/hdparm/${name}.tar.gz";
-    sha256 = "0sc6yf3k6sd7n6a2ig2my9fjlqpak3znlyw7jw4cz5d9asm1rc13";
+    sha256 = "1vpvlkrksfwx8lxq1p1nk3ddyzgrwy3rgxpn9kslchdh3jkv95yf";
   };
 
   preBuild = ''

From 07ba299003d79959f378945cc09e5c8cd437af0f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 9 Jul 2015 17:31:06 -0700
Subject: [PATCH 2054/2322] libunistring: 0.9.3 -> 0.9.6

---
 .../libraries/libunistring/default.nix        | 34 +++++--------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 667d620c501..7f32f37a704 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -1,24 +1,24 @@
 { fetchurl, stdenv, libiconv }:
 
-stdenv.mkDerivation (rec {
-  name = "libunistring-0.9.3";
+stdenv.mkDerivation rec {
+  name = "libunistring-0.9.6";
 
   src = fetchurl {
     url = "mirror://gnu/libunistring/${name}.tar.gz";
-    sha256 = "18q620269xzpw39dwvr9zpilnl2dkw5z5kz3mxaadnpv4k3kw3b1";
+    sha256 = "0ixxmgpgh2v8ifm6hbwsjxl023myk3dfnj7wnvmqjivza31fw9cn";
   };
 
   patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ];
 
-  propagatedBuildInputs =
-    stdenv.lib.optional ((! (stdenv ? glibc))
-                         || (stdenv ? cross &&
-                             stdenv.cross.config == "i686-pc-mingw32"))
-     libiconv;
+  propagatedBuildInputs = [ libiconv ];
+
+  configureFlags = [
+    "--with-libiconv-prefix=${libiconv}"
+  ];
 
   # XXX: There are test failures on non-GNU systems, see
   # http://lists.gnu.org/archive/html/bug-libunistring/2010-02/msg00004.html .
-  doCheck = (stdenv ? glibc);
+  doCheck = stdenv ? glibc;
 
   meta = {
     homepage = http://www.gnu.org/software/libunistring/;
@@ -52,19 +52,3 @@ stdenv.mkDerivation (rec {
     platforms = stdenv.lib.platforms.all;
   };
 }
-
-//
-
-# On Cygwin Libtool is unable to find `libiconv.dll' if there's no explicit
-# `-L/path/to/libiconv' argument on the linker's command line; and since it
-# can't find the dll, it will only create a static library.
-(if (stdenv ? glibc)
- then {}
- else { configureFlags = "--with-libiconv-prefix=${libiconv}"; })
-
-//
-
-# Don't run the native `strip' when cross-compiling.
-(if (stdenv ? cross)
- then { dontStrip = true; }
- else { }))

From 64be54b84fe4ec05b7090244ac28ac91b6610702 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 9 Jul 2015 17:31:36 -0700
Subject: [PATCH 2055/2322] libidn: 1.30 -> 1.31

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

diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 44aa546fe00..4c781da6308 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "libidn-1.30";
+  name = "libidn-1.31";
 
   src = fetchurl {
     url = "mirror://gnu/libidn/${name}.tar.gz";
-    sha256 = "0lxh5r1z8gsk4jxx3rv8aasjv8p53j4y04kvfn2w30a0syagrf9r";
+    sha256 = "026z12mczlag443ms9n954h36pi3m7iva9jfw8y4ispsj772zpxg";
   };
 
   doCheck = ! stdenv.isDarwin;

From bf492548a27aca1068fe75d162cad77000134704 Mon Sep 17 00:00:00 2001
From: Robert Irelan <rirelan@gmail.com>
Date: Sun, 5 Jul 2015 23:21:00 -0700
Subject: [PATCH 2056/2322] rustc: 1.0.0 -> 1.1.0

---
 pkgs/development/compilers/rustc/1.0.0.nix   | 16 ----------
 pkgs/development/compilers/rustc/default.nix | 33 ++++++++++++++++++++
 pkgs/development/compilers/rustc/generic.nix |  2 +-
 pkgs/top-level/all-packages.nix              |  2 +-
 4 files changed, 35 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/development/compilers/rustc/1.0.0.nix
 create mode 100644 pkgs/development/compilers/rustc/default.nix

diff --git a/pkgs/development/compilers/rustc/1.0.0.nix b/pkgs/development/compilers/rustc/1.0.0.nix
deleted file mode 100644
index 5bb03b592b9..00000000000
--- a/pkgs/development/compilers/rustc/1.0.0.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, callPackage }:
-callPackage ./generic.nix {
-  shortVersion = "1.0.0";
-  isRelease = true;
-  srcSha = "14brziw91d3r88fa1kvpvhap5ws4z8h2mas7h6k9lpsc2zl9blak";
-  snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec";
-  snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349";
-  snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234";
-  snapshotHashDarwin64 = "5f35d9c920b8083a7420ef8cf5b00d5ef3085dfa";
-  snapshotDate = "2015-03-27";
-  snapshotRev = "5520801";
-  patches = [
-    ./patches/beta.patch
-    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
-  configureFlags = [ "--release-channel=stable" ];
-}
diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix
new file mode 100644
index 00000000000..b61a407223c
--- /dev/null
+++ b/pkgs/development/compilers/rustc/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, callPackage }:
+callPackage ./generic.nix {
+  shortVersion = "1.1.0";
+  isRelease = true;
+  srcSha = "0lsfrclj5imxy6129ggya7rb2h04cgqq53f75z2jv40y5xk25sy8";
+
+  /* Rust is bootstrapped from an earlier built version. We need
+  to fetch these earlier versions, which vary per platform.
+  The shapshot info you want can be found at
+  https://github.com/rust-lang/rust/blob/{$shortVersion}/src/snapshots.txt
+  with the set you want at the top.
+  */
+
+  # linux-i386
+  snapshotHashLinux686 = "0bc8cffdce611fb71fd7d3d8e7cdbfaf748a4f16";
+
+  # linux-x86_64
+  snapshotHashLinux64 = "94089740e48167c5975c92c139ae9c286764012f";
+
+  # macos-i386
+  snapshotHashDarwin686 = "54cc35e76497e6e94fddf38d6e40e9d168491ddb";
+
+  # macos-x86_64
+  snapshotHashDarwin64 = "43a1c1fba0d1dfee4c2ca310d506f8f5f51b3f6f";
+
+  snapshotDate = "2015-04-27";
+  snapshotRev = "857ef6e";
+
+  patches = [
+    ./patches/beta.patch
+    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
+  configureFlags = [ "--release-channel=stable" ];
+}
diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix
index d1091643f77..b8d232b82a3 100644
--- a/pkgs/development/compilers/rustc/generic.nix
+++ b/pkgs/development/compilers/rustc/generic.nix
@@ -62,7 +62,7 @@ let version = if isRelease then
     meta = with stdenv.lib; {
       homepage = http://www.rust-lang.org/;
       description = "A safe, concurrent, practical language";
-      maintainers = with maintainers; [ madjar cstrahan wizeman globin ];
+      maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy ];
       license = [ licenses.mit licenses.asl20 ];
       platforms = platforms.linux;
     };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6ad3607854..022be12ab0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4653,7 +4653,7 @@ let
   };
 
   rustcMaster = callPackage ../development/compilers/rustc/head.nix {};
-  rustc = callPackage ../development/compilers/rustc/1.0.0.nix {};
+  rustc = callPackage ../development/compilers/rustc/default.nix {};
 
   rustPlatform = rustStable;
 

From cf2f3f60cac7cd83efb4ffac019e41d83d678d5a Mon Sep 17 00:00:00 2001
From: Robert Irelan <rirelan@gmail.com>
Date: Mon, 6 Jul 2015 23:14:38 -0700
Subject: [PATCH 2057/2322] rustCargoPlatform: run on stable Rust

Use stable Rust now that Cargo builds on stable Rust.
---
 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 022be12ab0e..74b49c60a7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4661,7 +4661,7 @@ let
   rustUnstable = recurseIntoAttrs (makeRustPlatform rustcMaster cargo rustUnstable);
 
   # rust platform to build cargo itself (with cargoSnapshot)
-  rustCargoPlatform = makeRustPlatform rustcMaster cargoSnapshot rustCargoPlatform;
+  rustCargoPlatform = makeRustPlatform rustc cargoSnapshot rustCargoPlatform;
 
   makeRustPlatform = rustc: cargo: self:
     let

From e6ee86b9410dd5e3e081c7ce6ba316bd216bc240 Mon Sep 17 00:00:00 2001
From: Robert Irelan <rirelan@gmail.com>
Date: Tue, 7 Jul 2015 08:29:08 -0700
Subject: [PATCH 2058/2322] cargoSnapshot: 2015-04-02 -> 2015-06-17, hide from
 nix-env

Update snapshot to avoid rust-lang/cargo#976, which otherwise breaks the
build.

Also move the `cargoSnapshot` derivation inside a set in
pkgs/top-level/all-packages.nix in order to hide the `cargo-snapshot`
packages from `nix-env -qa`, since it's only used to build the `cargo`
package.
---
 .../tools/build-managers/cargo/snapshot.nix            | 10 +++++-----
 pkgs/top-level/all-packages.nix                        |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix
index a76fb4601e8..f24bcc2d9ab 100644
--- a/pkgs/development/tools/build-managers/cargo/snapshot.nix
+++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix
@@ -2,19 +2,19 @@
 
 /* Cargo binary snapshot */
 
-let snapshotDate = "2015-04-02";
+let snapshotDate = "2015-06-17";
 in
 
 with ((import ./common.nix) { inherit stdenv; version = "snapshot-${snapshotDate}"; });
 
 let snapshotHash = if stdenv.system == "i686-linux"
-      then "ba6c162680d5509d89ba2363d7cae2047f40c034"
+      then "g2h9l35123r72hqdwayd9h79kspfb4y9"
       else if stdenv.system == "x86_64-linux"
-      then "94f715c9a52809a639f2ce6f8b1d5215a0c272b5"
+      then "fnx2rf1j8zvrplcc7xzf89czn0hf3397"
       else if stdenv.system == "i686-darwin"
-      then "cf333f16f89bfd50e8ce461c6f81ca30d33f7f73"
+      then "3viz3fi2jx18qjwrc90nfhm9cik59my6"
       else if stdenv.system == "x86_64-darwin"
-      then "1f7008a6ec860e2bc7580e71bdf320ac518ddeb8"
+      then "h2bf3db4vwz5cjjkn98lxayivdc6dflp"
       else throw "no snapshot for platform ${stdenv.system}";
     snapshotName = "cargo-nightly-${platform}.tar.gz";
 in
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74b49c60a7b..b8ee263f169 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4661,7 +4661,7 @@ let
   rustUnstable = recurseIntoAttrs (makeRustPlatform rustcMaster cargo rustUnstable);
 
   # rust platform to build cargo itself (with cargoSnapshot)
-  rustCargoPlatform = makeRustPlatform rustc cargoSnapshot rustCargoPlatform;
+  rustCargoPlatform = makeRustPlatform rustc cargoSnapshot.cargo rustCargoPlatform;
 
   makeRustPlatform = rustc: cargo: self:
     let
@@ -5316,7 +5316,9 @@ let
     rustPlatform = rustCargoPlatform;
   };
 
-  cargoSnapshot = callPackage ../development/tools/build-managers/cargo/snapshot.nix { };
+  cargoSnapshot = {
+    cargo = callPackage ../development/tools/build-managers/cargo/snapshot.nix { };
+  };
 
   casperjs = callPackage ../development/tools/casperjs { };
 

From 322edf09e0727b51f0b7f2bfced9fed716eb1163 Mon Sep 17 00:00:00 2001
From: Robert Irelan <rirelan@gmail.com>
Date: Mon, 6 Jul 2015 23:12:14 -0700
Subject: [PATCH 2059/2322] rustRegistry: 2015-06-12-020d1f3 ->
 2015-07-07-fd9e3e4

---
 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 fe723a038e2..9d74ab88fc0 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,15 +7,15 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2015-06-12";
-  rev = "020d1f3344ed8e7bd8fa740372bb7f03675fa708";
+  version = "2015-07-07";
+  rev = "fd9e3e4a350f5df0d975913bcc29d2051a509199";
 
   src = fetchFromGitHub {
       inherit rev;
 
       owner = "rust-lang";
       repo = "crates.io-index";
-      sha256 = "0vkr0k1ga0jskvl8ss7m5m66b4wwi7ibjj5qw0x0khcg1b5skkq6";
+      sha256 = "1vm28gfq4fmialz5ab8cxk5q1kdf6hlg3ni41qpy9k61pp9bqdwr";
   };
 
 in

From 48f44bfa697151f1d7efe5f3c19073917dd40c24 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 9 Jul 2015 21:01:13 -0700
Subject: [PATCH 2060/2322] grub2: 2015-05-14 -> 2015-07-05

---
 pkgs/tools/misc/grub/2.0x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index e33290e9852..f8f0f088079 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -20,7 +20,7 @@ let
   canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems);
   inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems);
 
-  version = "2.02-git-2015-05-14";
+  version = "2.x-2015-07-05";
 
   unifont_bdf = fetchurl {
     url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
@@ -43,8 +43,8 @@ stdenv.mkDerivation rec {
 
   src = fetchFromSavannah {
     repo = "grub";
-    rev = "5370dcfdae66b60cff3507ad925300a679fe4117";
-    sha256 = "1v4a3shcgfxjifwddmn3d0lyg3db1d3k87x5nchy7cyiss55jx1s";
+    rev = "0d7c7f751dc5a8338497bef8b38f78153c4f0464";
+    sha256 = "1vkd7na3kp9ri4xsd3zznvnrjzz1qsz62fycg941pm2k18r3m7xd";
   };
 
   nativeBuildInputs = [ autogen flex bison python autoconf automake ];

From 51972d427e332b92b928183fc9a25624dfd18075 Mon Sep 17 00:00:00 2001
From: Robert Irelan <rirelan@gmail.com>
Date: Mon, 6 Jul 2015 21:17:05 -0700
Subject: [PATCH 2061/2322] cargo: 2015-05-13 -> 0.3.0

Rename cargo to use a version number rather than a date because Cargo
has started releasing packages using version numbers.
---
 pkgs/development/tools/build-managers/cargo/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index e7a45f1c348..d849ad5de94 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
 , cmake, zlib }:
 
-with ((import ./common.nix) { inherit stdenv; version = "2015-05-13"; });
+with ((import ./common.nix) { inherit stdenv; version = "0.3.0"; });
 
 with rustPlatform;
 
@@ -10,12 +10,12 @@ buildRustPackage rec {
 
   src = fetchgit {
     url = "https://github.com/rust-lang/cargo.git";
-    rev = "d814fcbf8efda3027d54c09e11aa7eaf0006a83c";
-    sha256 = "0sppd3x2cacmbnypcjip44amnh66lrrbwwzsbz8rqf3nq2ah496x";
+    rev = "refs/tags/0.3.0";
+    sha256 = "1ckb2xd7nm8357imw6b1ci2ar8grnihzan94kvmjrijq6sz8yv9i";
     leaveDotGit = true;
   };
 
-  depsSha256 = "1b0mpdxmp7inkg59n2phjwzpz5gx22wqg9rfd1s01a5ylara37jw";
+  depsSha256 = "1sgdr2akd9xrfmf5g0lbf842b2pdj1ymxk37my0cf2x349rjsf0w";
 
   buildInputs = [ file curl pkgconfig python openssl cmake zlib ];
 

From e30c99d40ae921fdd72236654d867028cf8eddb0 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Fri, 10 Jul 2015 09:33:08 +0200
Subject: [PATCH 2062/2322] gdal: adding version 1.11.2 for merkaartor and
 openscenegraph

---
 pkgs/applications/misc/merkaartor/default.nix |  4 +-
 .../libraries/gdal/gdal-1_11_2.nix            | 59 +++++++++++++++++++
 .../libraries/openscenegraph/default.nix      |  2 +-
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/gdal/gdal-1_11_2.nix

diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index 932e5bb4830..221b459f84a 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, qt4, boost, proj, gdal}:
+{stdenv, fetchurl, qt4, boost, proj, gdal_1_11_2}:
 
 stdenv.mkDerivation rec {
   name = "merkaartor-0.18.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     qmake -makefile PREFIX=$out
   '';
 
-  buildInputs = [ qt4 boost proj gdal ];
+  buildInputs = [ qt4 boost proj gdal_1_11_2 ];
 
   meta = {
     description = "An openstreetmap editor";
diff --git a/pkgs/development/libraries/gdal/gdal-1_11_2.nix b/pkgs/development/libraries/gdal/gdal-1_11_2.nix
new file mode 100644
index 00000000000..fe7d0869fbd
--- /dev/null
+++ b/pkgs/development/libraries/gdal/gdal-1_11_2.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
+, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl
+, libpng }:
+
+composableDerivation.composableDerivation {} (fixed: rec {
+  version = "1.11.2";
+  name = "gdal-${version}";
+
+  src = fetchurl {
+    url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
+    sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845";
+  };
+
+  buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ];
+
+  patches = [
+    # This ensures that the python package is installed into gdal's prefix,
+    # rather than trying to install into python's prefix.
+    ./python.patch
+  ];
+
+  # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults.
+  # Unset CC and CXX as they confuse libtool.
+  preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX";
+
+  configureFlags = [
+    "--with-jpeg=${libjpeg}"
+    "--with-libtiff=${libtiff}" # optional (without largetiff support)
+    "--with-libpng=${libpng}"   # optional
+    "--with-libz=${zlib}"       # optional
+
+    "--with-pg=${postgresql}/bin/pg_config"
+    "--with-mysql=${mysql.lib}/bin/mysql_config"
+    "--with-geotiff=${libgeotiff}"
+    "--with-python"               # optional
+    "--with-static-proj4=${proj}" # optional
+    "--with-geos=${geos}/bin/geos-config"# optional
+  ];
+
+  # Prevent this:
+  #
+  #   Checking .pth file support in /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/
+  #   /nix/store/pbi1lgank10fy0xpjckbdpgacqw34dsz-python-2.7.9/bin/python -E -c pass
+  #   TEST FAILED: /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ does NOT support .pth files
+  #   error: bad install directory or PYTHONPATH
+  preBuild = ''
+    pythonInstallDir=$out/lib/${python.libPrefix}/site-packages
+    mkdir -p $pythonInstallDir
+    export PYTHONPATH=''${PYTHONPATH:+''${PYTHONPATH}:}$pythonInstallDir
+  '';
+
+  meta = {
+    description = "Translator library for raster geospatial data formats";
+    homepage = http://www.gdal.org/;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+})
diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index 9be9f838632..5fb73eae276 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -1,6 +1,6 @@
 x@{builderDefsPackage
   , cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng
-  , coin3d, jasper, gdal, xproto, libX11, libXmu, freeglut, mesa
+  , coin3d, jasper, gdal_1_11_2, xproto, libX11, libXmu, freeglut, mesa
   , doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2
   , curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL
   , qt4, poppler, librsvg, gtk
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 689f43c7664..f71d8224164 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6246,6 +6246,8 @@ let
 
   gdal = callPackage ../development/libraries/gdal { };
 
+  gdal_1_11_2 = callPackage ../development/libraries/gdal/gdal-1_11_2.nix { };
+
   gdcm = callPackage ../development/libraries/gdcm { };
 
   ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {};

From d9a4fc2df94f73970fb35fc656ca4603e3d6a4f2 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 8 Jul 2015 11:07:50 +0200
Subject: [PATCH 2063/2322] pythonPackages.pep257: init at 0.3.2

pep257 is a static analysis tool for checking compliance with Python PEP 257.
I stay with pep257-0.3.2 because newer versions does nos satisfy requirements
for pytest-pep257.
---
 pkgs/top-level/python-packages.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c31f34ffae3..850bcaae6b2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8765,6 +8765,23 @@ let
     };
   };
 
+  pep257 = buildPythonPackage rec {
+    name = "pep257-${version}";
+    version = "0.3.2";
+
+    src = pkgs.fetchurl {
+      url = "https://github.com/GreenSteam/pep257/archive/${version}.tar.gz";
+      sha256 = "0v8aq0xzsa7clazszxl42904c3jpq69lg8a5hg754bqcqf72hfrn";
+    };
+
+    meta = {
+      homepage = https://github.com/GreenSteam/pep257/;
+      description = "Python docstring style checker";
+      longDescription = "Static analysis tool for checking compliance with Python PEP 257.";
+      lecense = licenses.mit;
+    };
+  };
+
   percol = buildPythonPackage rec {
     name = "percol-${version}";
     version = "0.0.8";

From 20f47e3abd02f3373900e689c6e6a68b2a00204b Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 8 Jul 2015 11:36:42 +0200
Subject: [PATCH 2064/2322] pythonPackages.pytestpep257: init at 0.0.1

---
 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 850bcaae6b2..3619de2f478 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2452,6 +2452,24 @@ let
     };
   };
 
+  pytestpep257 = buildPythonPackage rec {
+     name = "pytest-pep257-${version}";
+     version = "0.0.1";
+
+     src = pkgs.fetchurl {
+       url = "https://pypi.python.org/packages/source/p/pytest-pep257/${name}.tar.gz";
+       sha256 = "003vdkxpx37n0kjqpwgj3314hwk2jfz3nz58db7xh68bf8xy75lk";
+     };
+
+     propagatedBuildInputs = with self ; [ pytest pep257 ];
+
+     meta = {
+       homepage = https://github.com/anderslime/pytest-pep257;
+       description = "py.test plugin for PEP257";
+       license = licenses.mit;
+     };
+  };
+
   pytestquickcheck = buildPythonPackage rec {
     name = "pytest-quickcheck-0.8.2";
 

From 2caa3b7d502c6913d979b2bb2208b627a8f22adb Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 9 Jul 2015 09:43:29 +0200
Subject: [PATCH 2065/2322] python3Packages.dnspython3: init at 1.12.0

---
 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 c31f34ffae3..4d820029210 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2800,6 +2800,25 @@ let
     };
   };
 
+  dnspython3 = buildPythonPackage rec {
+    name = "dnspython3-${version}";
+    version = "1.12.0";
+
+    disabled = (!isPy3k);
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/dnspython3/${name}.zip";
+      sha256 = "138wxj702vx6zni9g2y8dbgbpin95v6hk23rh2kwfr3q4130jqz9";
+    };
+
+    meta = {
+      description = "A DNS toolkit for Python 3.x";
+      homepage = http://www.dnspython.org;
+      # BSD-like, check http://www.dnspython.org/LICENSE for details
+      license = licenses.free;
+    };
+  };
+
   docker = buildPythonPackage rec {
     name = "docker-py-1.1.0";
 

From 976e34cd6cfa45b9cdeb5fe40ada8d7484108807 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 9 Jul 2015 10:39:19 +0200
Subject: [PATCH 2066/2322] python3Packages.sleekxmpp: init at 1.2.5

---
 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 4d820029210..16bbd6ef009 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7810,6 +7810,25 @@ let
     };
   };
 
+  sleekxmpp = buildPythonPackage rec {
+    name = "sleekxmpp-${version}";
+    version = "1.2.5";
+
+    disabled = (!isPy3k);
+
+    propagatedBuildInputs = with self ; [ dnspython3 pyasn1 ];
+
+    src = pkgs.fetchurl {
+      url = "https://github.com/fritzy/SleekXMPP/archive/${version}.tar.gz";
+      sha256 = "1hqs2w5d7x532psfqipd2wl1mkmsaak83jvp1rh9rv406fzp9h67";
+    };
+
+    meta = {
+      description = "XMPP library for Python";
+      license = licenses.mit;
+      homepage = "http://sleekxmpp.com/";
+    };
+  };
 
   netaddr = buildPythonPackage rec {
     name = "netaddr-0.7.5";

From 097ffe89cd063d834928b9f135e9adba5982f7d1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 10 Jul 2015 02:21:05 -0700
Subject: [PATCH 2067/2322] gcc48: Pin to the latest supported version of isl

---
 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 2c9514a47e7..9697f543724 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3770,6 +3770,8 @@ let
     # be passed.
     cross = null;
     libcCross = if crossSystem != null then libcCross else null;
+
+    isl = isl_0_14;
   }));
 
   gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 {

From b4e5181dde01c6938825484f210120b54f1a7d2a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 10 Jul 2015 11:56:04 +0200
Subject: [PATCH 2068/2322] CONTRIBUTING: add some notes about commit policy

---
 CONTRIBUTING.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 764508ca25f..9938604eef5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -67,3 +67,13 @@
 * Don't create additional commits, do
   * `git rebase -i`
   * `git push --force` to your branch.
+
+## Commit policy
+
+* Commits must be sufficiently tested before being merged, both the master and staging branches.
+* Hydra builds for master and stagingshould not be used as testing platform, it's a build farm for changes that have been already tested.
+* Master should only see non-breaking commits that do not cause mass rebuilds.
+* Staging should only see non-breaking mass-rebuild commits. That means it's not to be used for testing, changes must have been well tested already. [Read policy here](http://comments.gmane.org/gmane.linux.distributions.nixos/13447).
+* If staging is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. [Keep an eye on the staging evaluations here](http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations).
+* When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people installation forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from @edolstra.
+

From 6c6a06b99f0263b82323824d6eebb4ba77c503dd Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 10 Jul 2015 12:58:56 +0200
Subject: [PATCH 2069/2322] httping: Enable SSL support

---
 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 9389d17900b..a0ec6a5513c 100644
--- a/pkgs/tools/networking/httping/default.nix
+++ b/pkgs/tools/networking/httping/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, ncurses }:
+{ stdenv, fetchurl, gettext, ncurses, openssl }:
 
 stdenv.mkDerivation rec {
   name = "httping-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1110r3gpsj9xmybdw7w4zkhj3zmn5mnv2nq0ijbvrywbn019zdfs";
   };
 
-  buildInputs = [ ncurses ];
+  buildInputs = [ ncurses openssl ];
   nativeBuildInputs = [ gettext ];
 
   makeFlags = [

From 007e2889129bb817e4e0c4220eba0c52461810fc Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 10 Jul 2015 18:20:29 +0200
Subject: [PATCH 2070/2322] bind: update from 9.10.2 to 9.10.2-P2, fixes
 CVE-2015-4620

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

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index fbfa2d8d9b7..92050beae8a 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, openssl, libtool, perl, libxml2 }:
 
-let version = "9.10.2"; in
+let version = "9.10.2-P2"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "163s8pvqj4lyryvfzkc6acbys7gw1by5dqwilggiwp54ia8bg6vg";
+    sha256 = "0pvcnwd4rzfk3l35ys72p14ly9k857wbn1lxzd4ayjk3i2pz1rmi";
   };
 
   patchPhase = ''

From 8280f5a6024a748a52c46893caf052c0782e78ed Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 10 Jul 2015 18:51:54 +0200
Subject: [PATCH 2071/2322] blink: use gnutls33, fixes #8234

---
 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 e6ad3607854..b3e7849dd1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -743,7 +743,9 @@ let
 
   bitbucket-cli = pythonPackages.bitbucket-cli;
 
-  blink = callPackage ../applications/networking/instant-messengers/blink { };
+  blink = callPackage ../applications/networking/instant-messengers/blink {
+    gnutls = gnutls33;
+  };
 
   blitz = callPackage ../development/libraries/blitz { };
 

From 4977855101c3cd5efa6aec6190e4e467da4b26a8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 10 Jul 2015 18:52:32 +0200
Subject: [PATCH 2072/2322] pythonPackages.sipsimple: update from 2.4.0 to
 2.5.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 e9163c88252..3a6d88545ec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12224,19 +12224,19 @@ let
 
   sipsimple = buildPythonPackage rec {
     name = "sipsimple-${version}";
-    version = "2.4.0";
+    version = "2.5.0";
     disabled = isPy3k;
 
     configurePhase = "find -name 'configure' -exec chmod a+x {} \\; ; find -name 'aconfigure' -exec chmod a+x {} \\; ; ${python}/bin/${python.executable} setup.py build_ext --pjsip-clean-compile";
 
     src = pkgs.fetchurl {
       url = "http://download.ag-projects.com/SipClient/python-${name}.tar.gz";
-      sha256 = "f66543c680f22aa3cf86f55373a01a2bb699366a1be5e257c417d018696b6840";
+      sha256 = "1k97pdpqjs5dw7v73082jpqhv6xhlrdy987qbdb9a9zvfiz7q8sj";
     };
 
     propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml ];
 
-    buildInputs = with pkgs; [ alsaLib ffmpeg libv4l pkgconfig sqlite ];
+    buildInputs = with pkgs; [ alsaLib ffmpeg libv4l pkgconfig sqlite libvpx ];
 
     installPhase = "${python}/bin/${python.executable} setup.py install --prefix=$out";
 

From 2c31cb1c36cc6a1a7fd3c65d589fae5c66a42f1d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 10 Jul 2015 18:53:04 +0200
Subject: [PATCH 2073/2322] blink: update from 1.3.0 to 1.4.0

---
 .../instant-messengers/blink/default.nix      | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix
index c4cfc0b6776..addbc060977 100644
--- a/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, pythonPackages, pyqt4, cython, libvncserver, zlib, twisted, gnutls }:
+{ stdenv, fetchurl, pythonPackages, pyqt4, cython, libvncserver, zlib, twisted
+, gnutls, libvpx }:
 
 pythonPackages.buildPythonPackage rec {
   name = "blink-${version}";
-  version = "1.3.0";
+  version = "1.4.0";
   
   src = fetchurl {
     url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz";
-    sha256 = "388a0ca72ad99087cd87b78a4c449f9c079117920bfc50d7843853b8f942d045";
+    sha256 = "0vd4ky4djhrrlmfpz7g43bxjynhpql4d3s9jdirh21kc8d1bgayk";
   };
 
   patches = [ ./pythonpath.patch ];
@@ -14,17 +15,21 @@ pythonPackages.buildPythonPackage rec {
     sed -i 's|@out@|'"''${out}"'|g' blink/resources.py
   '';
 
-  propagatedBuildInputs = [ pyqt4 pythonPackages.cjson pythonPackages.sipsimple twisted ];
+  propagatedBuildInputs = with pythonPackages;[ pyqt4 cjson sipsimple twisted
+    ];
 
-  buildInputs = [ cython zlib libvncserver ];
+  buildInputs = [ cython zlib libvncserver libvpx ];
 
   postInstall = ''
     wrapProgram $out/bin/blink \
-      --prefix LD_LIBRARY_PATH : ${gnutls}/lib
+      --prefix LD_LIBRARY_PATH ":" ${gnutls}/lib
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://icanblink.com/;
     description = "A state of the art, easy to use SIP client";
+    platforms = platforms.linux;
+    license = licenses.mit;
+    maintainers = with maintainers; [ pSub ];
   };
 }

From f72beea75e98bb7d38d4481a6765ed0f85fd4e2c Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 9 Jul 2015 15:42:31 -0700
Subject: [PATCH 2074/2322] darwin purity: nodejs-0.10

---
 pkgs/development/web/nodejs/v0_10.nix         | 24 +++++++++----------
 .../darwin/apple-sdk/frameworks.nix           |  3 ++-
 .../darwin/apple-sdk/impure-deps.nix          | 13 +++++++++-
 pkgs/top-level/all-packages.nix               |  7 ++++--
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix
index 739a0ff9389..eaa3c6386cb 100644
--- a/pkgs/development/web/nodejs/v0_10.nix
+++ b/pkgs/development/web/nodejs/v0_10.nix
@@ -1,13 +1,11 @@
 { stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares
-, pkgconfig, runCommand, which
+, pkgconfig, runCommand, which, libtool
+
+# apple frameworks
+, CoreServices, ApplicationServices, Carbon, Foundation
 }:
 
 let
-  dtrace = runCommand "dtrace-native" {} ''
-    mkdir -p $out/bin
-    ln -sv /usr/sbin/dtrace $out/bin
-  '';
-
   version = "0.10.38";
 
   # !!! Should we also do shared libuv?
@@ -37,21 +35,23 @@ in stdenv.mkDerivation {
     sha256 = "12xpa9jzry5g0j41908498qqs8v0q6miqkv6mggyzas8bvnshgai";
   };
 
-  configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);
+  configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++
+    stdenv.lib.optional stdenv.isDarwin "--without-dtrace";
 
   prePatch = ''
-    sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure
+    patchShebangs .
   '';
 
-  patches = if stdenv.isDarwin then [ ./no-xcode.patch ] else null;
+  patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode.patch;
 
-  postPatch = if stdenv.isDarwin then ''
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch})
-  '' else null;
+  '';
 
   buildInputs = [ python which ]
     ++ (optional stdenv.isLinux utillinux)
-    ++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ];
+    ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool CoreServices ApplicationServices Foundation ];
+  propagatedBuildInputs = optionals stdenv.isDarwin [ Carbon ];
   setupHook = ./setup-hook.sh;
 
   passthru.interpreterName = "nodejs-0.10";
diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
index 8b4b291fb3f..ca700a9be7e 100644
--- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
@@ -108,7 +108,8 @@ with frameworks; with libs; {
   # Umbrellas
   Accelerate          = [ CoreWLAN IOBluetooth ];
   ApplicationServices = [ CoreFoundation CoreServices CoreText ImageIO ];
-  Carbon              = [ ApplicationServices CoreFoundation CoreServices IOKit Security ];
+  Carbon              = [ ApplicationServices CoreFoundation CoreServices IOKit Security QuartzCore ];
+  CoreBluetooth       = [];
   CoreServices        = [ CFNetwork CoreAudio CoreData CoreFoundation DiskArbitration Security NetFS OpenDirectory ServiceManagement ];
   IOBluetooth         = [ IOKit ];
   JavaVM              = [];
diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
index c43bb4bf90c..0d2f2728406 100644
--- a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
@@ -54,6 +54,7 @@ rec {
   ];
   QuartzCore = [
     "/System/Library/Frameworks/QuartzCore.framework"
+    "/System/Library/PrivateFrameworks/CrashReporterSupport.framework/Versions/A/CrashReporterSupport"
   ];
   PCSC = [
     "/System/Library/Frameworks/PCSC.framework"
@@ -131,6 +132,14 @@ rec {
   ];
   Carbon = [
     "/System/Library/Frameworks/Carbon.framework"
+    "/System/Library/PrivateFrameworks/CoreUI.framework/Versions/A/CoreUI"
+    "/System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv"
+    "/System/Library/PrivateFrameworks/IconServices.framework/Versions/A/IconServices"
+    "/System/Library/PrivateFrameworks/ChunkingLibrary.framework/Versions/A/ChunkingLibrary"
+    "/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity"
+    "/System/Library/PrivateFrameworks/Sharing.framework/Versions/A/Sharing"
+    "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Apple80211"
+    "/System/Library/PrivateFrameworks/GenerationalStorage.framework/Versions/A/GenerationalStorage"
   ];
   CoreAudio = [
     "/System/Library/Frameworks/CoreAudio.framework"
@@ -169,7 +178,9 @@ rec {
   ];
   IOBluetooth = [
     "/System/Library/Frameworks/IOBluetooth.framework"
-    "/System/Library/Frameworks/CoreBluetooth.framework/Versions/A/CoreBluetooth"
+  ] ++ AudioUnit ++ CoreBluetooth;
+  CoreBluetooth = [
+    "/System/Library/Frameworks/CoreBluetooth.framework"
   ];
   SecurityFoundation = [
     "/System/Library/Frameworks/SecurityFoundation.framework"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9697f543724..29262aee6ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2007,9 +2007,12 @@ let
     libtool = darwin.cctools;
   };
   nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; };
-  nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { };
+  nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix {
+    libtool = darwin.cctools;
+    inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation;
+  };
 
-  nodejs = if stdenv.system == "armv5tel-linux" then
+  nodejs = if stdenv.system == "armv5tel-linux" || stdenv.isDarwin then
     nodejs-0_10
   else
     nodejs-0_12;

From 7393c6c69d32ba844f2bf9bb88530ac3eb99a968 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 9 Jul 2015 15:42:47 -0700
Subject: [PATCH 2075/2322] modernize rubies

---
 pkgs/development/interpreters/ruby/ruby-2.2.0.nix | 4 +++-
 pkgs/development/interpreters/ruby/ruby-2.2.2.nix | 4 +++-
 pkgs/top-level/all-packages.nix                   | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/ruby-2.2.0.nix b/pkgs/development/interpreters/ruby/ruby-2.2.0.nix
index b6375aa687d..e22e64681a3 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.2.0.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.2.0.nix
@@ -7,6 +7,7 @@
 , libyaml, yamlSupport ? true
 , libffi, fiddleSupport ? true
 , ruby_2_2_0, autoreconfHook, bison, useRailsExpress ? true
+, libiconv, libobjc, libunwind
 }:
 
 let
@@ -47,7 +48,8 @@ stdenv.mkDerivation rec {
     # support is not enabled, so add readline to the build inputs if curses
     # support is disabled (if it's enabled, we already have it) and we're
     # running on darwin
-    ++ (op (!cursesSupport && stdenv.isDarwin) readline);
+    ++ (op (!cursesSupport && stdenv.isDarwin) readline)
+    ++ (ops stdenv.isDarwin [ libiconv libobjc libunwind ]);
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/interpreters/ruby/ruby-2.2.2.nix b/pkgs/development/interpreters/ruby/ruby-2.2.2.nix
index 5537d0e8c80..d75c21fa0b1 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.2.2.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.2.2.nix
@@ -7,6 +7,7 @@
 , libyaml, yamlSupport ? true
 , libffi, fiddleSupport ? true
 , ruby_2_2_2, autoreconfHook, bison, useRailsExpress ? true
+, libiconv, libobjc, libunwind
 }:
 
 let
@@ -47,7 +48,8 @@ stdenv.mkDerivation rec {
     # support is not enabled, so add readline to the build inputs if curses
     # support is disabled (if it's enabled, we already have it) and we're
     # running on darwin
-    ++ (op (!cursesSupport && stdenv.isDarwin) readline);
+    ++ (op (!cursesSupport && stdenv.isDarwin) readline)
+    ++ (ops stdenv.isDarwin [ libiconv libobjc libunwind ]);
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29262aee6ab..2736481473e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5047,7 +5047,9 @@ let
   ruby_2_1_3 = callPackage ../development/interpreters/ruby/ruby-2.1.3.nix { };
   ruby_2_1_6 = callPackage ../development/interpreters/ruby/ruby-2.1.6.nix { };
   ruby_2_2_0 = callPackage ../development/interpreters/ruby/ruby-2.2.0.nix { };
-  ruby_2_2_2 = callPackage ../development/interpreters/ruby/ruby-2.2.2.nix { };
+  ruby_2_2_2 = callPackage ../development/interpreters/ruby/ruby-2.2.2.nix {
+    inherit (darwin) libobjc libunwind;
+  };
 
   # Ruby aliases
   ruby = ruby_2_2;

From 5b3e50dedc0a1f03bddd7bc82f1d615300b7b0c5 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 9 Jul 2015 15:43:01 -0700
Subject: [PATCH 2076/2322] use lib functions to clean up nodejs

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

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 3f8d1c1f00a..daa37d5d246 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -37,15 +37,10 @@ in stdenv.mkDerivation {
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];
 
   prePatch = ''
-    sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure
+    patchShebangs .
   '';
 
-  patches = if stdenv.isDarwin then [ ./no-xcode.patch ] else null;
-
-
-  preBuild = if stdenv.isDarwin then ''
-    patchShebangs .
-  '' else null;
+  patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode.patch;
 
   buildInputs = [ python which ]
     ++ (optional stdenv.isLinux utillinux)

From 43c72cb6afdf7625fa04b6218a116b4c3badf9d2 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sun, 21 Jun 2015 20:29:33 -0700
Subject: [PATCH 2077/2322] add security-tool

---
 .../build-managers/gnustep/make/default.nix   |  31 +++++
 .../build-managers/gnustep/xcode/default.nix  |  23 ++++
 pkgs/os-specific/darwin/apple-sdk/default.nix |   4 +-
 .../apple-source-releases/configd/default.nix |   2 +
 .../darwin/apple-source-releases/default.nix  |  44 ++++--
 .../apple-source-releases/libauto/default.nix |   7 +-
 .../libsecurity_apple_csp/GNUmakefile         |  11 ++
 .../libsecurity_apple_csp/default.nix         |  31 +++++
 .../libsecurity_apple_cspdl/GNUmakefile       |  10 ++
 .../libsecurity_apple_cspdl/default.nix       |  16 +++
 .../libsecurity_apple_file_dl/GNUmakefile     |  10 ++
 .../libsecurity_apple_file_dl/default.nix     |  17 +++
 .../libsecurity_apple_x509_cl/GNUmakefile     |  10 ++
 .../libsecurity_apple_x509_cl/default.nix     |  18 +++
 .../libsecurity_apple_x509_tp/GNUmakefile     |  10 ++
 .../libsecurity_apple_x509_tp/default.nix     |  19 +++
 .../libsecurity_asn1/GNUmakefile              |  11 ++
 .../libsecurity_asn1/default.nix              |  14 ++
 .../libsecurity_cdsa_client/GNUmakefile       |  10 ++
 .../libsecurity_cdsa_client/default.nix       |   8 ++
 .../libsecurity_cdsa_plugin/GNUmakefile       |  10 ++
 .../libsecurity_cdsa_plugin/default.nix       |  15 ++
 .../libsecurity_cdsa_utilities/GNUmakefile    |  13 ++
 .../libsecurity_cdsa_utilities/default.nix    |  13 ++
 .../handletemplates.patch                     |  19 +++
 .../libsecurity_cdsa_utils/GNUmakefile        |  13 ++
 .../libsecurity_cdsa_utils/default.nix        |   8 ++
 .../libsecurity_codesigning/GNUmakefile       |  10 ++
 .../libsecurity_codesigning/default.nix       |   7 +
 .../libsecurity_cssm/GNUmakefile              |  11 ++
 .../libsecurity_cssm/default.nix              |  14 ++
 .../libsecurity_filedb/GNUmakefile            |  10 ++
 .../libsecurity_filedb/default.nix            |  13 ++
 .../libsecurity_generic/default.nix           |  58 ++++++++
 .../libsecurity_generic/impure_deps.nix       | 129 ++++++++++++++++++
 .../libsecurity_keychain/GNUmakefile          |  10 ++
 .../libsecurity_keychain/default.nix          |  47 +++++++
 .../libsecurity_mds/GNUmakefile               |  10 ++
 .../libsecurity_mds/default.nix               |  11 ++
 .../libsecurity_ocspd/GNUmakefile             |  10 ++
 .../libsecurity_ocspd/default.nix             |  20 +++
 .../libsecurity_pkcs12/GNUmakefile            |  11 ++
 .../libsecurity_pkcs12/default.nix            |  15 ++
 .../libsecurity_sd_cspdl/GNUmakefile          |  10 ++
 .../libsecurity_sd_cspdl/default.nix          |  10 ++
 .../libsecurity_utilities/GNUmakefile         |  11 ++
 .../libsecurity_utilities/default.nix         |  23 ++++
 .../libsecurityd/GNUmakefile                  |  11 ++
 .../libsecurityd/default.nix                  |  23 ++++
 .../libsecurityd/xdr-arity.patch              |  79 +++++++++++
 .../security_dotmac_tp/GNUmakefile            |   8 ++
 .../security_dotmac_tp/default.nix            |   4 +
 .../darwin/osx-private-sdk/default.nix        |  46 ++-----
 pkgs/os-specific/darwin/osx-sdk/default.nix   |   4 +-
 .../darwin/security-tool/GNUmakefile          |  14 ++
 .../darwin/security-tool/default.nix          |  83 +++++++++--
 .../darwin/security-tool/impure-deps.nix      | 129 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  10 +-
 58 files changed, 1186 insertions(+), 62 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/gnustep/make/default.nix
 create mode 100644 pkgs/development/tools/build-managers/gnustep/xcode/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_cspdl/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_cspdl/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_file_dl/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_file_dl/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_client/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_client/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/handletemplates.patch
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_mds/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_mds/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_sd_cspdl/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_sd_cspdl/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurityd/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libsecurityd/xdr-arity.patch
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/security_dotmac_tp/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/security_dotmac_tp/default.nix
 create mode 100644 pkgs/os-specific/darwin/security-tool/GNUmakefile
 create mode 100644 pkgs/os-specific/darwin/security-tool/impure-deps.nix

diff --git a/pkgs/development/tools/build-managers/gnustep/make/default.nix b/pkgs/development/tools/build-managers/gnustep/make/default.nix
new file mode 100644
index 00000000000..7fa9aad72db
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnustep/make/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "make-${version}";
+  version = "1.0";
+
+  src = fetchurl {
+    url = "http://ftpmain.gnustep.org/pub/gnustep/core/gnustep-make-2.6.6.tar.gz";
+    sha256 = "07cqr8x17bia9w6clbmiv7ay6r9nplrjz2cyzinv4w7zfpc19vxw";
+  };
+
+  patchPhase = ''
+    substituteInPlace GNUmakefile.in \
+      --replace which type \
+      --replace 'tooldir = $(DESTDIR)' 'tooldir = ' \
+      --replace 'makedir = $(DESTDIR)' 'makedir = ' \
+      --replace 'mandir  = $(DESTDIR)' 'mandir  = '
+
+    substituteInPlace FilesystemLayouts/apple \
+      --replace /usr/local ""
+  '';
+
+  installFlags = "DESTDIR=$(out)";
+
+  postInstall = ''
+    mkdir -p $out/nix-support
+    cat >$out/nix-support/setup-hook <<EOF
+      . $out/Library/GNUstep/Makefiles/GNUstep.sh
+    EOF
+  '';
+}
diff --git a/pkgs/development/tools/build-managers/gnustep/xcode/default.nix b/pkgs/development/tools/build-managers/gnustep/xcode/default.nix
new file mode 100644
index 00000000000..4f31c6df6d8
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gnustep/xcode/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchgit, gnustep-make, Foundation, libobjc }:
+
+stdenv.mkDerivation rec {
+  name = "xcode-${version}";
+  version = "1.0";
+
+  makeFlags = "messages=yes";
+
+  installFlags = "DESTDIR=$(out)";
+
+  __impureHostDeps = [
+    "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation"
+    "/usr/lib/libextension.dylib"
+  ];
+
+  buildInputs = [ gnustep-make Foundation libobjc ];
+
+  src = fetchgit {
+    url = "https://github.com/gnustep/xcode";
+    rev = "cc5016794e44f9998674120a5e4625aa09ca455a";
+    sha256 = "85420f3f61091b2e4548cf5e99d886cb9c72cf07b8b9fae3eebc87e7b6b7e54a";
+  };
+}
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 61cc84ca2be..33d0e5eb385 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -1,9 +1,7 @@
 { stdenv, fetchurl, xar, gzip, cpio, CF }:
 
 let
-  # I'd rather not "export" this, since they're somewhat monolithic and encourage bad habits.
-  # Also, the include directory inside here should be captured (almost?) entirely by our more
-  # precise Apple package structure, so with any luck it's unnecessary.
+  # sadly needs to be exported because security_tool needs it
   sdk = stdenv.mkDerivation rec {
     version = "10.9";
     name    = "MacOS_SDK-${version}";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
index 3427081bfaa..8687f3fe532 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
@@ -1,6 +1,8 @@
 { stdenv, appleDerivation, launchd, bootstrap_cmds, xnu, ppp, IOKit, eap8021x, Security }:
 
 appleDerivation {
+  meta.broken = stdenv.cc.nativeLibc;
+
   buildInputs = [ launchd bootstrap_cmds xnu ppp IOKit eap8021x ];
 
   propagatedBuildInputs = [ Security ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index 1d89577012c..f29a2b5b911 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -6,19 +6,24 @@ let
     inherit sha256;
   };
 
+  appleDerivation_ = name: version: sha256: attrs: stdenv.mkDerivation ({
+    inherit version;
+    name = "${name}-${version}";
+  } // (if attrs ? srcs then {} else {
+    src  = fetchApple version sha256 name;
+  }) // attrs);
+
   applePackage = namePath: version: sha256:
     let
       name = builtins.elemAt (stdenv.lib.splitString "/" namePath) 0;
-
-      appleDerivation = attrs: stdenv.mkDerivation ({
-        inherit version;
-        name = "${name}-${version}";
-      } // (if attrs ? srcs then {} else {
-        src  = fetchApple version sha256 name;
-      }) // attrs);
+      appleDerivation = appleDerivation_ name version sha256;
       callPackage = pkgs.newScope (packages // pkgs.darwin // { inherit appleDerivation name version; });
     in callPackage (./. + builtins.toPath "/${namePath}");
 
+  libsecPackage = pkgs.callPackage ./libsecurity_generic {
+    inherit applePackage appleDerivation_;
+  };
+
   IOKitSpecs = {
     IOAudioFamily                        = fetchApple "197.4.2"    "1dmrczdmbdkvnhjbv233wx4xczgpf5wjrhr83aizrwpks5avkxbr";
     IOFireWireFamily                     = fetchApple "455.4.0"    "034n2v6z7lf1cx3sp3309z4sn8mkchjcrsf177iag46yzlzcjgfl";
@@ -66,11 +71,12 @@ let
     libdispatch     = applePackage "libdispatch"       "339.92.1"    "1lc5033cmkwxy3r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {};
     libiconv        = applePackage "libiconv"          "41"          "0sni1gx6i2h7r4r4hhwbxdir45cp039m4wi74izh4l0pfw7gywad" {};
     Libinfo         = applePackage "Libinfo"           "449.1.3"     "1ix6f7xwjnq9bqgv8w27k4j64bqn1mfhh91nc7ciiv55axpdb9hq" {};
-    Libm            = applePackage "Libm"              "2026"        "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {};
+    Libm            = applePackage "Libm"              "2026"        "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {}; # This is from 10.7 !! :(
     Libnotify       = applePackage "Libnotify"         "121.20.1"    "164rx4za5z74s0mk9x0m1815r1m9kfal8dz3bfaw7figyjd6nqad" {};
     libpthread      = applePackage "libpthread"        "105.1.4"     "09vwwahcvmxvx2xl0890gkp91n61dld29j73y2pa597bqkag2qpg" {};
     libresolv       = applePackage "libresolv"         "54"          "028mp2smd744ryxwl8cqz4njv8h540sdw3an1yl7yxqcs04r0p4b" {};
     Libsystem       = applePackage "Libsystem"         "1197.1.1"    "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {};
+    libutil         = applePackage "libutil"           "38"          "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {};
     libunwind       = applePackage "libunwind"         "35.3"        "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {};
     mDNSResponder   = applePackage "mDNSResponder"     "522.92.1"    "1cp87qda1s7brriv413i71yggm8yqfwv64vknrnqv24fcb8hzbmy" {};
     objc4           = applePackage "objc4"             "551.1"       "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {};
@@ -79,5 +85,27 @@ let
     removefile      = applePackage "removefile"        "33"          "0ycvp7cnv40952a1jyhm258p6gg5xzh30x86z5gb204x80knw30y" {};
     Security        = applePackage "Security"          "55471.14.18" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {};
     xnu             = applePackage "xnu"               "2422.115.4"  "1ssw5fzvgix20bw6y13c39ib0zs7ykpig3irlwbaccpjpci5jl0s" {};
+
+    libsecurity_apple_csp      = libsecPackage "libsecurity_apple_csp"      "55003"    "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {};
+    libsecurity_apple_cspdl    = libsecPackage "libsecurity_apple_cspdl"    "55000"    "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {};
+    libsecurity_apple_file_dl  = libsecPackage "libsecurity_apple_file_dl"  "55000"    "1dfqani3n135i3iqmafc1k9awmz6s0a78zifhk15rx5a8ps870bl" {};
+    libsecurity_apple_x509_cl  = libsecPackage "libsecurity_apple_x509_cl"  "55004"    "1gji2i080560s08k1nigsla1zdmi6slyv97xaj5vqxjpxb0g1xf5" {};
+    libsecurity_apple_x509_tp  = libsecPackage "libsecurity_apple_x509_tp"  "55009.3"  "1bsms3nvi62wbvjviwjhjhzhylad8g6vmvlj3ngd0wyd0ywxrs46" {};
+    libsecurity_asn1           = libsecPackage "libsecurity_asn1"           "55000.2"  "0i8aakjxdfj0lqcgqmbip32g7r4h57xhs8w0sxfvfl45q22s782w" {};
+    libsecurity_cdsa_client    = libsecPackage "libsecurity_cdsa_client"    "55000"    "127jxnypkycy8zqwicfv333h11318m00gd37jnswbrpg44xd1wdy" {};
+    libsecurity_cdsa_plugin    = libsecPackage "libsecurity_cdsa_plugin"    "55001"    "0ifmx85rs51i7zjm015s8kc2dqyrlvbr39lw9xzxgd2ds33i4lfj" {};
+    libsecurity_cdsa_utilities = libsecPackage "libsecurity_cdsa_utilities" "55006"    "1kzsl0prvfa8a0m3j3pcxq06aix1csgayd3lzx27iqg84c8mhzan" {};
+    libsecurity_cdsa_utils     = libsecPackage "libsecurity_cdsa_utils"     "55000"    "0q55jizav6n0lkj7lcmcr2mjdhnbnnn525fa9ipwgvzbspihw0g6" {};
+    libsecurity_codesigning    = libsecPackage "libsecurity_codesigning"    "55037.15" "0vf5nj2g383b4hknlp51qll5pm8z4qbf56dnc16n3wm8gj82iasy" {};
+    libsecurity_cssm           = libsecPackage "libsecurity_cssm"           "55005.5"  "0l6ia533bhr8kqp2wa712bnzzzisif3kbn7h3bzzf4nps4wmwzn4" {};
+    libsecurity_filedb         = libsecPackage "libsecurity_filedb"         "55016.1"  "1r0ik95xapdl6l2lhd079vpq41jjgshz2hqb8490gpy5wyc49cxb" {};
+    libsecurity_keychain       = libsecPackage "libsecurity_keychain"       "55050.9"  "15wf2slcgyns61kk7jndgm9h22vidyphh9x15x8viyprra9bkhja" {};
+    libsecurity_mds            = libsecPackage "libsecurity_mds"            "55000"    "0vin5hnzvkx2rdzaaj2gxmx38amxlyh6j24a8gc22y09d74p5lzs" {};
+    libsecurity_ocspd          = libsecPackage "libsecurity_ocspd"          "55010"    "1bxzpihc6w0ji4x8810a4lfkq83787yhjl60xm24bv1prhqcm73b" {};
+    libsecurity_pkcs12         = libsecPackage "libsecurity_pkcs12"         "55000"    "1yq8p2sp39q40fxshb256b7jn9lvmpymgpm8yz9kqrf980xddgsg" {};
+    libsecurity_sd_cspdl       = libsecPackage "libsecurity_sd_cspdl"       "55003"    "10v76xycfnvz1n0zqfbwn3yh4w880lbssqhkn23iim3ihxgm5pbd" {};
+    libsecurity_utilities      = libsecPackage "libsecurity_utilities"      "55030.3"  "0ayycfy9jm0n0c7ih9f3m69ynh8hs80v8yicq47aa1h9wclbxg8r" {};
+    libsecurityd               = libsecPackage "libsecurityd"               "55004"    "1ywm2qj8l7rhaxy5biwxsyavd0d09d4bzchm03nlvwl313p2747x" {};
+    security_dotmac_tp         = libsecPackage "security_dotmac_tp"         "55107.1"  "1l4fi9qhrghj0pkvywi8da22bh06c5bv3l40a621b5g258na50pl" {};
   };
 in packages
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 1c61297c7d5..2003bb6e55e 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix
@@ -1,9 +1,14 @@
-{ stdenv, appleDerivation }:
+{ stdenv, appleDerivation, libdispatch, Libsystem }:
 
 appleDerivation {
+  # these are included in the pure libc
+  buildInputs = stdenv.lib.optionals stdenv.cc.nativeLibc [ libdispatch Libsystem ];
+
   buildPhase = ''
     cp ${./auto_dtrace.h} ./auto_dtrace.h
 
+    substituteInPlace ThreadLocalCollector.h --replace SubZone.h Subzone.h
+
     substituteInPlace auto_zone.cpp \
       --replace "#include <msgtracer_client.h>" ''$'#include <asl.h>\nstatic void msgtracer_log_with_keys(...) { };'
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/GNUmakefile
new file mode 100644
index 00000000000..ca263228fde
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/GNUmakefile
@@ -0,0 +1,11 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_apple_csp
+
+security_apple_csp_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_apple_csp_HEADER_FILES_DIR = lib
+
+security_apple_csp_CC_FILES = $(wildcard lib/*.cpp)
+security_apple_csp_C_FILES = $(wildcard lib/*.c)
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix
new file mode 100644
index 00000000000..add46454cbe
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix
@@ -0,0 +1,31 @@
+{ appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_utilities, osx_private_sdk, stdenv }:
+appleDerivation {
+  buildInputs = [
+    libsecurity_cdsa_utilities
+    libsecurity_utilities
+    libsecurity_cdsa_plugin
+    libsecurity_asn1
+    libsecurity_cdsa_utils
+  ];
+  NIX_CFLAGS_COMPILE = "-Iopen_ssl";
+  patchPhase = ''
+    for file in lib/BlockCryptor.h lib/RSA_DSA_signature.h lib/castContext.h \
+      lib/RawSigner.h lib/MD2Object.h lib/HMACSHA1.h lib/bfContext.h lib/rc4Context.h; do
+      substituteInPlace ''$file --replace \
+        '"CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h"' \
+        '"${apple_sdk.sdk}/include/MacTypes.h"'
+    done
+
+    for file in lib/castContext.h lib/gladmanContext.h lib/desContext.h lib/rc4Context.h; do
+      substituteInPlace ''$file --replace \
+        '/usr/local/include/CommonCrypto/CommonCryptorSPI.h' \
+        '${osx_private_sdk}/usr/include/CommonCrypto/CommonCryptorSPI.h'
+    done
+    
+    substituteInPlace lib/opensshWrap.cpp --replace RSA_DSA_Keys.h RSA_DSA_keys.h
+  '' + stdenv.lib.optionalString (!stdenv.cc.nativeLibc) ''
+    substituteInPlace lib/pbkdf2.c --replace \
+      '<CoreServices/../Frameworks/CarbonCore.framework/Headers/ConditionalMacros.h>' \
+      '"${stdenv.libc}/include/ConditionalMacros.h"'
+  '';
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_cspdl/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_cspdl/GNUmakefile
new file mode 100644
index 00000000000..a0d48cf4965
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_cspdl/GNUmakefile
@@ -0,0 +1,10 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_apple_cspdl
+
+security_apple_cspdl_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_apple_cspdl_HEADER_FILES_DIR = lib
+
+security_apple_cspdl_CC_FILES = $(wildcard lib/*.cpp)
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_cspdl/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_cspdl/default.nix
new file mode 100644
index 00000000000..b80d4c8aad2
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_cspdl/default.nix
@@ -0,0 +1,16 @@
+{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_keychain, libsecurity_utilities, libsecurityd }:
+appleDerivation {
+  buildInputs = [
+    libsecurity_cdsa_plugin
+    libsecurity_cdsa_utilities
+    libsecurity_utilities
+    libsecurityd
+    libsecurity_cdsa_client
+    libsecurity_keychain
+  ];
+  patchPhase = ''
+    for file in lib/*; do
+      sed -i 's/#include <\(.*\)>/#include "\1"/' ''$file
+    done
+  '';
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_file_dl/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_file_dl/GNUmakefile
new file mode 100644
index 00000000000..f52829c644d
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_file_dl/GNUmakefile
@@ -0,0 +1,10 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_apple_file_dl
+
+security_apple_file_dl_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_apple_file_dl_HEADER_FILES_DIR = lib
+
+security_apple_file_dl_CC_FILES = $(wildcard lib/*.cpp)
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_file_dl/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_file_dl/default.nix
new file mode 100644
index 00000000000..0eb2ee10fd8
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_file_dl/default.nix
@@ -0,0 +1,17 @@
+{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_filedb, libsecurity_keychain, libsecurity_utilities, libsecurityd }:
+appleDerivation {
+  buildInputs = [
+    libsecurity_cdsa_plugin
+    libsecurity_cdsa_utilities
+    libsecurity_utilities
+    libsecurityd
+    libsecurity_cdsa_client
+    libsecurity_keychain
+    libsecurity_filedb
+  ];
+  patchPhase = ''
+    for file in lib/*; do
+      sed -i 's/#include <\(.*\)>/#include "\1"/' ''$file
+    done
+  '';
+}
\ No newline at end of file
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/GNUmakefile
new file mode 100644
index 00000000000..c7c9c3d4e79
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/GNUmakefile
@@ -0,0 +1,10 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_apple_x509_cl
+
+security_apple_x509_cl_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_apple_x509_cl_HEADER_FILES_DIR = lib
+
+security_apple_x509_cl_CC_FILES = $(wildcard lib/*.cpp)
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/default.nix
new file mode 100644
index 00000000000..d2f15e19ccf
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/default.nix
@@ -0,0 +1,18 @@
+{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_filedb, libsecurity_keychain, libsecurity_utilities, libsecurityd, osx_private_sdk }:
+appleDerivation {
+  buildInputs = [
+    libsecurity_cdsa_plugin
+    libsecurity_cdsa_utilities
+    libsecurity_utilities
+    libsecurityd
+    libsecurity_cdsa_client
+    libsecurity_keychain
+    libsecurity_filedb
+    libsecurity_asn1
+  ];
+  patchPhase = ''
+    for file in lib/*; do
+      sed -i 's/#include <\(.*\)>/#include "\1"/' ''$file
+    done
+  '';
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile
new file mode 100644
index 00000000000..083a8a85d17
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile
@@ -0,0 +1,10 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_apple_x509_tp
+
+security_apple_x509_tp_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_apple_x509_tp_HEADER_FILES_DIR = lib
+
+security_apple_x509_tp_CC_FILES = $(wildcard lib/*.cpp)
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/default.nix
new file mode 100644
index 00000000000..6410c134f89
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/default.nix
@@ -0,0 +1,19 @@
+{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_filedb, libsecurity_keychain, libsecurity_ocspd, libsecurity_utilities, libsecurityd }:
+appleDerivation {
+  buildInputs = [
+    libsecurity_cdsa_plugin
+    libsecurity_cdsa_utilities
+    libsecurity_utilities
+    libsecurityd
+    libsecurity_cdsa_client
+    libsecurity_keychain
+    libsecurity_filedb
+    libsecurity_asn1
+    libsecurity_ocspd
+  ];
+  patchPhase = ''
+    for file in lib/*; do
+      sed -i 's/#include <\(.*\)>/#include "\1"/' ''$file
+    done
+  '';
+}
\ No newline at end of file
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/GNUmakefile
new file mode 100644
index 00000000000..1c3c4f0b25b
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/GNUmakefile
@@ -0,0 +1,11 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_asn1
+
+security_asn1_C_FILES = $(wildcard lib/*.c)
+security_asn1_CC_FILES = $(wildcard lib/*.cpp)
+
+security_asn1_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_asn1_HEADER_FILES_DIR = lib
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/default.nix
new file mode 100644
index 00000000000..ab11d893d19
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/default.nix
@@ -0,0 +1,14 @@
+{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }:
+appleDerivation {
+  __propagatedImpureHostDeps = [
+    "/System/Library/Frameworks/Security.framework/Security"
+    "/System/Library/Frameworks/Security.framework/Resources"
+    "/System/Library/Frameworks/Security.framework/PlugIns"
+    "/System/Library/Frameworks/Security.framework/XPCServices"
+    "/System/Library/Frameworks/Security.framework/Versions"
+  ];
+  propagatedBuildInputs = [
+    libsecurity_utilities
+    libsecurity_cdsa_utilities
+  ];
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_client/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_client/GNUmakefile
new file mode 100644
index 00000000000..91fb6bb679e
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_client/GNUmakefile
@@ -0,0 +1,10 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_cdsa_client
+
+security_cdsa_client_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_cdsa_client_HEADER_FILES_DIR = lib
+
+security_cdsa_client_CC_FILES = $(wildcard lib/*.cpp)
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_client/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_client/default.nix
new file mode 100644
index 00000000000..2ecad568bf7
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_client/default.nix
@@ -0,0 +1,8 @@
+{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, libsecurityd }:
+appleDerivation {
+  buildInputs = [
+    libsecurity_utilities
+    libsecurity_cdsa_utilities
+    libsecurityd
+  ];
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/GNUmakefile
new file mode 100644
index 00000000000..9e1260f9b9c
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/GNUmakefile
@@ -0,0 +1,10 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_cdsa_plugin
+
+security_cdsa_plugin_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_cdsa_plugin_HEADER_FILES_DIR = lib
+
+security_cdsa_plugin_CC_FILES = $(wildcard lib/*.cpp)
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/default.nix
new file mode 100644
index 00000000000..b0c35f0e30c
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/default.nix
@@ -0,0 +1,15 @@
+{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_cssm, libsecurity_utilities, osx_private_sdk, perl }:
+appleDerivation {
+  buildInputs = [
+    libsecurity_cdsa_utilities
+    libsecurity_utilities
+    perl
+  ];
+  patchPhase = ''
+    unpackFile ${libsecurity_cssm.src}
+    cp libsecurity_cssm*/lib/cssm{dli,aci,cli,cspi,tpi}.h lib
+  '';
+  preBuild = ''
+    perl lib/generator.pl lib lib/generator.cfg lib lib || exit 1
+  '';
+}
\ No newline at end of file
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/GNUmakefile
new file mode 100644
index 00000000000..24bc1fe7e3a
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/GNUmakefile
@@ -0,0 +1,13 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_cdsa_utilities
+
+security_cdsa_utilities_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_cdsa_utilities_HEADER_FILES_DIR = lib
+
+security_cdsa_utilities_CC_FILES = $(wildcard lib/*.cpp) lib/Schema.cpp lib/KeySchema.cpp
+
+lib/%.cpp: lib/%.m4
+	m4 $< > $@
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/default.nix
new file mode 100644
index 00000000000..6f2436f2149
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/default.nix
@@ -0,0 +1,13 @@
+{ CommonCrypto, appleDerivation, libsecurity_codesigning, libsecurity_utilities, m4, osx_private_sdk }:
+appleDerivation {
+  buildInputs = [
+    libsecurity_utilities
+    m4
+  ];
+  patchPhase = ''
+    patch -p1 < ${./handletemplates.patch}
+    unpackFile ${libsecurity_codesigning.src}
+    mv libsecurity_codesigning*/lib security_codesigning
+  '';
+  NIX_CFLAGS_COMPILE = "-I${CommonCrypto}/include/CommonCrypto";
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/handletemplates.patch b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/handletemplates.patch
new file mode 100644
index 00000000000..e5a703b2a08
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/handletemplates.patch
@@ -0,0 +1,19 @@
+--- a/lib/handletemplates.h  1969-12-31 16:00:01.000000000 -0800
++++ b/lib/handletemplates.h  1969-12-31 16:00:01.000000000 -0800
+@@ -32,6 +32,7 @@
+ #include <security_utilities/threading.h>
+ #include <security_utilities/globalizer.h>
+ #include <security_cdsa_utilities/cssmerrors.h>
++#include <vector>
+ 
+ #if __GNUC__ > 2
+ #include <ext/hash_map>
+@@ -129,7 +130,7 @@
+     // @@@  Remove when 4003540 is fixed
+     template <class Subtype>
+     static void findAllRefs(std::vector<_Handle> &refs) {
+-        state().findAllRefs<Subtype>(refs);
++        state().template findAllRefs<Subtype>(refs);
+     }
+     
+ protected:
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/GNUmakefile
new file mode 100644
index 00000000000..7b5b7dc186a
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/GNUmakefile
@@ -0,0 +1,13 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_cdsa_utils
+
+security_cdsa_utils_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_cdsa_utils_HEADER_FILES_DIR = lib
+
+security_cdsa_utils_CC_FILES = $(wildcard lib/*.cpp)
+
+lib/%.cpp: lib/%.m4
+	m4 $< > $@
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix
new file mode 100644
index 00000000000..d9b594bc47c
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix
@@ -0,0 +1,8 @@
+{ Security, appleDerivation, apple_sdk, cppcheck, libsecurity_cdsa_utilities, libsecurity_utilities, m4, osx_private_sdk }:
+appleDerivation {
+  buildInputs = [
+    libsecurity_utilities
+    libsecurity_cdsa_utilities
+    m4
+  ];
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/GNUmakefile
new file mode 100644
index 00000000000..e923b962c26
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/GNUmakefile
@@ -0,0 +1,10 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_codesigning
+
+security_codesigning_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_codesigning_HEADER_FILES_DIR = lib
+
+security_codesigning_CC_FILES = $(wildcard lib/*.cpp)
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix
new file mode 100644
index 00000000000..c5ba9cc8d7e
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix
@@ -0,0 +1,7 @@
+{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities }:
+appleDerivation {
+  buildInputs = [
+    libsecurity_utilities
+    libsecurity_cdsa_utilities
+  ];
+}
\ No newline at end of file
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/GNUmakefile
new file mode 100644
index 00000000000..c7835aaa9b0
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/GNUmakefile
@@ -0,0 +1,11 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_cssm
+
+security_cssm_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_cssm_HEADER_FILES_DIR = lib
+
+security_cssm_CC_FILES = $(wildcard lib/*.cpp)
+security_cssm_C_FILES = $(wildcard lib/*.c)
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix
new file mode 100644
index 00000000000..053dea134c7
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix
@@ -0,0 +1,14 @@
+{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_codesigning, libsecurity_utilities, perl }:
+appleDerivation {
+  buildInputs = [
+    libsecurity_utilities
+    libsecurity_cdsa_utilities
+    libsecurity_cdsa_client
+    perl
+    libsecurity_cdsa_plugin
+  ];
+  preBuild = ''
+    mkdir derived_src
+    perl lib/generator.pl lib lib/generator.cfg derived_src
+  '';
+}
\ No newline at end of file
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/GNUmakefile
new file mode 100644
index 00000000000..4359810c56b
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/GNUmakefile
@@ -0,0 +1,10 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_filedb
+
+security_filedb_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_filedb_HEADER_FILES_DIR = lib
+
+security_filedb_CC_FILES = $(wildcard lib/*.cpp)
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix
new file mode 100644
index 00000000000..86cc2a390db
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix
@@ -0,0 +1,13 @@
+{ appleDerivation, apple_sdk, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }:
+appleDerivation {
+  buildInputs = [
+    libsecurity_utilities
+    libsecurity_cdsa_utilities
+    libsecurity_cdsa_plugin
+  ];
+  patchPhase = ''
+    cp ${osx_private_sdk}/usr/local/include/sandbox_private.h .
+    substituteInPlace sandbox_private.h --replace '<sandbox.h>' '"${apple_sdk.sdk}/include/sandbox.h"'
+    substituteInPlace lib/AtomicFile.cpp --replace '<sandbox.h>' '"sandbox_private.h"'
+  '';
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
new file mode 100644
index 00000000000..a94b9b455ef
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
@@ -0,0 +1,58 @@
+{ appleDerivation_, applePackage, pkgs, stdenv }:
+name: version: sha256: args: let
+  n = stdenv.lib.removePrefix "lib" name;
+  makeFile = ../. + builtins.toPath "/${name}/GNUmakefile";
+  appleDerivation = appleDerivation_ name version sha256;
+  in applePackage name version sha256 (args // {
+    appleDerivation = a:
+    appleDerivation (stdenv.lib.mergeAttrsConcatenateValues {
+      __impureHostDeps = import ./impure_deps.nix;
+
+      patchPhase = ''
+        # allows including <Security/some-private-header.h>
+        ln -s ${pkgs.darwin.osx_private_sdk}/System/Library/Frameworks/Security.framework/Versions/A/PrivateHeaders Security
+
+        grep -Rl MacErrors.h . | while read file; do
+          substituteInPlace "''$file" --replace \
+            '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \
+            '"${pkgs.darwin.apple_sdk.sdk}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"'
+        done || true # grep returns 1 if it can't find the string
+        
+        grep -Rl MacTypes.h . | while read file; do
+          substituteInPlace "''$file" --replace \
+            '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>' \
+            '"${pkgs.darwin.apple_sdk.sdk}/include/MacTypes.h"'
+        done || true # grep returns 1 if it can't find the string
+      '';
+      preBuild = ''
+        ln -s lib ${n}
+        makeFlagsArray=(-j''$NIX_BUILD_CORES)
+      '';
+      buildInputs = [
+        pkgs.gnustep-make
+      ];
+      makeFlags = [
+        "-f${makeFile}"
+        "MAKEFILE_NAME=${makeFile}"
+        "GNUSTEP_ABSOLUTE_INSTALL_PATHS=yes"
+        "LIB_LINK_INSTALL_DIR=\$(out)/lib"
+      ];
+      installFlags = [
+        "${n}_INSTALL_DIR=\$(out)/lib"
+        "${n}_HEADER_FILES_INSTALL_DIR=\$(out)/include/${n}"
+        "GNUSTEP_HEADERS="
+      ];
+      NIX_CFLAGS_COMPILE = [
+        "-isystem lib"
+        "-iframework ${pkgs.darwin.Security}/Library/Frameworks"
+        "-I."
+        "-Wno-deprecated-declarations"
+      ];
+      NIX_LDFLAGS = with pkgs.darwin; with apple_sdk.frameworks; [
+        "-L${libobjc}/lib"
+        "-F${Foundation}/Library/Frameworks"
+        "-F${AppKit}/Library/Frameworks"
+        "-no_dtrace_dof"
+      ];
+    } a);
+  })
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix
new file mode 100644
index 00000000000..7725b9f3d1a
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix
@@ -0,0 +1,129 @@
+# generated using a ruby script
+[
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Accelerate"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vImage.framework/Versions/A/vImage"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLinearAlgebra.dylib"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvDSP.dylib"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvMisc.dylib"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/vecLib"
+  "/System/Library/Frameworks/AppKit.framework/Versions/C/AppKit"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontParser.dylib"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontRegistry.dylib"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSync.framework/Versions/A/ColorSync"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis"
+  "/System/Library/Frameworks/AudioToolbox.framework/Versions/A/AudioToolbox"
+  "/System/Library/Frameworks/AudioUnit.framework/Versions/A/AudioUnit"
+  "/System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork"
+  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/CarbonSound.framework/Versions/A/CarbonSound"
+  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox"
+  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Ink.framework/Versions/A/Ink"
+  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition"
+  "/System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio"
+  "/System/Library/Frameworks/CoreBluetooth.framework/Versions/A/CoreBluetooth"
+  "/System/Library/Frameworks/CoreData.framework/Versions/A/CoreData"
+  "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"
+  "/System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit"
+  "/System/Library/Frameworks/CoreText.framework/Versions/A/CoreText"
+  "/System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo"
+  "/System/Library/Frameworks/CoreWLAN.framework/Versions/A/CoreWLAN"
+  "/System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration"
+  "/System/Library/Frameworks/Foundation.framework/Versions/C/Foundation"
+  "/System/Library/Frameworks/GSS.framework/Versions/A/GSS"
+  "/System/Library/Frameworks/IOBluetooth.framework/Versions/A/IOBluetooth"
+  "/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit"
+  "/System/Library/Frameworks/IOSurface.framework/Versions/A/IOSurface"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libGIF.dylib"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJP2.dylib"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libRadiance.dylib"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib"
+  "/System/Library/Frameworks/Kerberos.framework/Versions/A/Kerberos"
+  "/System/Library/Frameworks/NetFS.framework/Versions/A/NetFS"
+  "/System/Library/Frameworks/OpenCL.framework/Versions/A/OpenCL"
+  "/System/Library/Frameworks/OpenDirectory.framework/Versions/A/Frameworks/CFOpenDirectory.framework/Versions/A/CFOpenDirectory"
+  "/System/Library/Frameworks/OpenDirectory.framework/Versions/A/OpenDirectory"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCVMSPluginSupport.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCoreVMClient.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGFXShared.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLImage.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL"
+  "/System/Library/Frameworks/QuartzCore.framework/Versions/A/Frameworks/CoreImage.framework/Versions/A/CoreImage"
+  "/System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore"
+  "/System/Library/Frameworks/Security.framework/Versions/A/Security"
+  "/System/Library/Frameworks/SecurityFoundation.framework/Versions/A/SecurityFoundation"
+  "/System/Library/Frameworks/ServiceManagement.framework/Versions/A/ServiceManagement"
+  "/System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration"
+  "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Apple80211"
+  "/System/Library/PrivateFrameworks/AppleJPEG.framework/Versions/A/AppleJPEG"
+  "/System/Library/PrivateFrameworks/AppleVPA.framework/Versions/A/AppleVPA"
+  "/System/Library/PrivateFrameworks/Backup.framework/Versions/A/Backup"
+  "/System/Library/PrivateFrameworks/ChunkingLibrary.framework/Versions/A/ChunkingLibrary"
+  "/System/Library/PrivateFrameworks/CommonAuth.framework/Versions/A/CommonAuth"
+  "/System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/CoreSymbolication"
+  "/System/Library/PrivateFrameworks/CoreUI.framework/Versions/A/CoreUI"
+  "/System/Library/PrivateFrameworks/CoreWiFi.framework/Versions/A/CoreWiFi"
+  "/System/Library/PrivateFrameworks/CrashReporterSupport.framework/Versions/A/CrashReporterSupport"
+  "/System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore"
+  "/System/Library/PrivateFrameworks/DebugSymbols.framework/Versions/A/DebugSymbols"
+  "/System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv"
+  "/System/Library/PrivateFrameworks/FaceCore.framework/Versions/A/FaceCore"
+  "/System/Library/PrivateFrameworks/GenerationalStorage.framework/Versions/A/GenerationalStorage"
+  "/System/Library/PrivateFrameworks/Heimdal.framework/Versions/A/Heimdal"
+  "/System/Library/PrivateFrameworks/IconServices.framework/Versions/A/IconServices"
+  "/System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling"
+  "/System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport"
+  "/System/Library/PrivateFrameworks/NetAuth.framework/Versions/A/NetAuth"
+  "/System/Library/PrivateFrameworks/PerformanceAnalysis.framework/Versions/A/PerformanceAnalysis"
+  "/System/Library/PrivateFrameworks/RemoteViewServices.framework/Versions/A/RemoteViewServices"
+  "/System/Library/PrivateFrameworks/Sharing.framework/Versions/A/Sharing"
+  "/System/Library/PrivateFrameworks/SpeechRecognitionCore.framework/Versions/A/SpeechRecognitionCore"
+  "/System/Library/PrivateFrameworks/Symbolication.framework/Versions/A/Symbolication"
+  "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC"
+  "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation"
+  "/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity"
+  "/System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport"
+  "/usr/lib/libCRFSuite.dylib"
+  "/usr/lib/libOpenScriptingUtil.dylib"
+  "/usr/lib/libarchive.2.dylib"
+  "/usr/lib/libbsm.0.dylib"
+  "/usr/lib/libbz2.1.0.dylib"
+  "/usr/lib/libc++.1.dylib"
+  "/usr/lib/libc++abi.dylib"
+  "/usr/lib/libcmph.dylib"
+  "/usr/lib/libcups.2.dylib"
+  "/usr/lib/libextension.dylib"
+  "/usr/lib/libheimdal-asn1.dylib"
+  "/usr/lib/libiconv.2.dylib"
+  "/usr/lib/libicucore.A.dylib"
+  "/usr/lib/liblangid.dylib"
+  "/usr/lib/liblzma.5.dylib"
+  "/usr/lib/libmecabra.dylib"
+  "/usr/lib/libpam.2.dylib"
+  "/usr/lib/libresolv.9.dylib"
+  "/usr/lib/libsqlite3.dylib"
+  "/usr/lib/libxar.1.dylib"
+  "/usr/lib/libxml2.2.dylib"
+  "/usr/lib/libxslt.1.dylib"
+  "/usr/lib/libz.1.dylib"
+]
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/GNUmakefile
new file mode 100644
index 00000000000..8830006f00e
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/GNUmakefile
@@ -0,0 +1,10 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_keychain
+
+security_keychain_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_keychain_HEADER_FILES_DIR = lib
+
+security_keychain_CC_FILES = $(wildcard lib/*.cpp)
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
new file mode 100644
index 00000000000..de97950b765
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
@@ -0,0 +1,47 @@
+{ CF, Security, appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_ocspd, libsecurity_pkcs12, libsecurity_utilities, libsecurityd, openssl, osx_private_sdk, security_dotmac_tp }:
+appleDerivation {
+  buildInputs = [
+    libsecurity_utilities
+    libsecurity_cdsa_client
+    libsecurity_cdsa_utilities
+    libsecurityd
+    CF
+    libsecurity_asn1
+    libsecurity_pkcs12
+    libsecurity_cdsa_utils
+    openssl
+    libsecurity_ocspd
+    security_dotmac_tp
+  ];
+  patchPhase = ''
+    substituteInPlace lib/Keychains.cpp --replace DLDbListCFPref.h DLDBListCFPref.h
+    
+    substituteInPlace lib/SecCertificate.cpp --replace '#include <Security/SecCertificatePriv.h>' ""
+    
+    cp ${osx_private_sdk}/usr/include/xpc/private.h xpc
+    cp ${apple_sdk.sdk}/include/xpc/*.h xpc
+    cp ${osx_private_sdk}/usr/local/include/sandbox_private.h lib/sandbox.h
+    
+    substituteInPlace lib/SecItemPriv.h \
+      --replace "extern CFTypeRef kSecAttrAccessGroup" "extern const CFTypeRef kSecAttrAccessGroup" \
+      --replace "extern CFTypeRef kSecAttrIsSensitive" "extern const CFTypeRef kSecAttrIsSensitive" \
+      --replace "extern CFTypeRef kSecAttrIsExtractable" "extern const CFTypeRef kSecAttrIsExtractable"
+    
+    substituteInPlace lib/Keychains.cpp --replace \
+      '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \
+      '"${apple_sdk.sdk}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"'
+    
+    substituteInPlace lib/CertificateValues.cpp --replace \
+      '#include <Security/SecCertificatePriv.h>' ""
+    
+    substituteInPlace lib/DLDBListCFPref.cpp --replace \
+      'dispatch_once_t AppSandboxChecked;' ''$'namespace Security {\ndispatch_once_t AppSandboxChecked;' \
+      --replace 'return mLoginDLDbIdentifier;' 'return mLoginDLDbIdentifier; }' \
+      --replace '_xpc_runtime_is_app_sandboxed()' 'false'
+      # hope that doesn't hurt anything
+
+    substituteInPlace lib/KCEventNotifier.h --replace \
+      'CoreFoundation/CFNotificationCenter.h' \
+      '${apple_sdk.sdk}/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/CFNotificationCenter.h'
+  '';
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_mds/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_mds/GNUmakefile
new file mode 100644
index 00000000000..119a43621fb
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_mds/GNUmakefile
@@ -0,0 +1,10 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_mds
+
+security_mds_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_mds_HEADER_FILES_DIR = lib
+
+security_mds_CC_FILES = $(wildcard lib/*.cpp)
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_mds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_mds/default.nix
new file mode 100644
index 00000000000..cd691f71e95
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_mds/default.nix
@@ -0,0 +1,11 @@
+{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_filedb, libsecurity_utilities, libsecurityd }:
+appleDerivation {
+  buildInputs = [
+    libsecurity_cdsa_plugin
+    libsecurity_cdsa_utilities
+    libsecurity_filedb
+    libsecurity_utilities
+    libsecurity_cdsa_client
+    libsecurityd
+  ];
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/GNUmakefile
new file mode 100644
index 00000000000..140c5a909a6
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/GNUmakefile
@@ -0,0 +1,10 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_ocspd
+
+security_ocspd_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_ocspd_HEADER_FILES_DIR = lib
+
+security_ocspd_CC_FILES = $(wildcard lib/*.cpp)
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/default.nix
new file mode 100644
index 00000000000..25701442d2b
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/default.nix
@@ -0,0 +1,20 @@
+{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }:
+appleDerivation {
+  buildInputs = [
+    libsecurity_utilities
+    libsecurity_cdsa_utilities
+    bootstrap_cmds
+  ];
+  postUnpack = ''
+    pushd libsecurity*
+    ls -lah
+    mkdir -p lib
+    cp common/* lib
+    cp client/* lib
+    popd
+  '';
+  preBuild = ''
+    make -f mig/mig.mk SRCROOT=. BUILT_PRODUCTS_DIR=. || exit 1
+    cp derived_src/* lib
+  '';
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/GNUmakefile
new file mode 100644
index 00000000000..b2af7e72c41
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/GNUmakefile
@@ -0,0 +1,11 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_pkcs12
+
+security_pkcs12_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_pkcs12_HEADER_FILES_DIR = lib
+
+security_pkcs12_CC_FILES = $(wildcard lib/*.cpp)
+security_pkcs12_C_FILES = $(wildcard lib/*.c)
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/default.nix
new file mode 100644
index 00000000000..f84c2d8963f
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/default.nix
@@ -0,0 +1,15 @@
+{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utils, libsecurity_keychain, osx_private_sdk }:
+appleDerivation {
+  patchPhase = ''
+    substituteInPlace lib/pkcsoids.h --replace '#error' '#warning'
+  '';
+  preBuild = ''
+    unpackFile ${libsecurity_keychain.src}
+    mv libsecurity_keychain*/lib security_keychain
+  '';
+  buildInputs = [
+    libsecurity_asn1
+    libsecurity_cdsa_utils
+    libsecurity_cdsa_client
+  ];
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_sd_cspdl/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_sd_cspdl/GNUmakefile
new file mode 100644
index 00000000000..47a1c609d06
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_sd_cspdl/GNUmakefile
@@ -0,0 +1,10 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_sd_cspdl
+
+security_sd_cspdl_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_sd_cspdl_HEADER_FILES_DIR = lib
+
+security_sd_cspdl_CC_FILES = $(wildcard lib/*.cpp)
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_sd_cspdl/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_sd_cspdl/default.nix
new file mode 100644
index 00000000000..22491091661
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_sd_cspdl/default.nix
@@ -0,0 +1,10 @@
+{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_utilities, libsecurityd }:
+appleDerivation {
+  buildInputs = [
+    libsecurity_cdsa_plugin
+    libsecurity_utilities
+    libsecurity_cdsa_utilities
+    libsecurityd
+    libsecurity_cdsa_client
+  ];
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/GNUmakefile
new file mode 100644
index 00000000000..d3ba09142c9
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/GNUmakefile
@@ -0,0 +1,11 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_utilities
+
+security_utilities_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_utilities_HEADER_FILES_DIR = lib
+
+security_utilities_C_FILES = $(wildcard lib/*.c)
+security_utilities_CC_FILES = $(wildcard lib/*.cpp)
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
new file mode 100644
index 00000000000..8cc74e2210f
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
@@ -0,0 +1,23 @@
+{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, libsecurity_codesigning, osx_private_sdk, sqlite, stdenv }:
+appleDerivation {
+  buildInputs = [
+    libauto
+    libobjc
+    IOKit
+    sqlite
+    apple_sdk.frameworks.PCSC
+  ];
+  patchPhase = ''
+    substituteInPlace lib/errors.h --replace \
+      '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>' \
+      '"MacTypes.h"'
+    substituteInPlace lib/debugging.cpp --replace PATH_MAX 1024
+    substituteInPlace lib/superblob.h --replace 'result->at' 'result->template at'
+    substituteInPlace lib/ccaudit.cpp --replace '<bsm/libbsm.h>' '"bsm/libbsm.h"'
+    
+    cp ${osx_private_sdk}/usr/include/security_utilities/utilities_dtrace.h lib
+    cp -R ${osx_private_sdk}/usr/local/include/bsm lib
+  '' + stdenv.lib.optionalString (!stdenv.cc.nativeLibc) ''
+    substituteInPlace lib/vproc++.cpp --replace /usr/local/include/vproc_priv.h ${stdenv.libc}/include/vproc_priv.h
+  '';
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/GNUmakefile
new file mode 100644
index 00000000000..6058043e79f
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/GNUmakefile
@@ -0,0 +1,11 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = securityd
+
+securityd_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+securityd_HEADER_FILES_DIR = lib
+
+securityd_CC_FILES = $(wildcard lib/*.cpp)
+securityd_C_FILES = $(wildcard lib/*.c)
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix
new file mode 100644
index 00000000000..d311f678337
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix
@@ -0,0 +1,23 @@
+{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }:
+appleDerivation {
+  buildInputs = [
+    libsecurity_cdsa_utilities
+    libsecurity_utilities
+    bootstrap_cmds
+  ];
+  patchPhase = ''
+    unpackFile ${libsecurity_cdsa_client.src}
+    mv libsecurity_cdsa_client*/lib security_cdsa_client
+    ln -s lib securityd_client
+    
+    patch -p1 < ${./xdr-arity.patch}
+  '';
+  preBuild = ''
+    make -f mig/mig.mk SRCROOT=. BUILT_PRODUCTS_DIR=.
+    cp derived_src/* lib
+    rm lib/ucspClientC.c
+  '';
+  postInstall = ''
+    ln -s ''$out/include/securityd ''$out/include/securityd_client
+  '';
+}
\ No newline at end of file
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/xdr-arity.patch b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/xdr-arity.patch
new file mode 100644
index 00000000000..5d0328629f1
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/xdr-arity.patch
@@ -0,0 +1,79 @@
+diff --git a/lib/sec_xdr.c b/lib/sec_xdr.c
+index fe5f038..6239b6c 100644
+--- a/lib/sec_xdr.c
++++ b/lib/sec_xdr.c
+@@ -223,7 +223,7 @@ bool_t copyin(void *data, xdrproc_t proc, void** copy, u_int *size)
+     sec_xdrmem_create(&xdr, (char *)xdr_data, length, XDR_ENCODE);
+ 
+     // cast to void* - function can go both ways (xdr->x_op) 
+-    if (proc(&xdr, data)) {
++    if (proc(&xdr, data, 0)) {
+         *copy = xdr_data;
+         if (size) *size = length;
+         return (TRUE);
+@@ -261,7 +261,7 @@ bool_t copyout(const void *copy, u_int size, xdrproc_t proc, void **data, u_int
+     if (!sec_xdr_arena_init(&arena, &xdr, length_out ? length_out : length_required, length_out ? *data : NULL))
+         return (FALSE);
+ 
+-    if (proc(&xdr, data))
++    if (proc(&xdr, data, 0))
+     {
+         *length = length_required;
+         return (TRUE);
+@@ -284,7 +284,7 @@ bool_t copyout_chunked(const void *copy, u_int size, xdrproc_t proc, void **data
+ 
+     void *data_out = NULL;
+ 
+-    if (proc(&xdr, &data_out))
++    if (proc(&xdr, &data_out, 0))
+     {
+         *data = data_out;
+         return (TRUE);
+diff --git a/lib/sec_xdr_array.c b/lib/sec_xdr_array.c
+index 152a71b..e5ec1ad 100644
+--- a/lib/sec_xdr_array.c
++++ b/lib/sec_xdr_array.c
+@@ -147,7 +147,7 @@ sec_xdr_array(XDR *xdrs, uint8_t **addrp, u_int *sizep, u_int maxsize, u_int els
+     for (i = 0; (i < c) && stat; i++) {
+         if ((xdrs->x_op == XDR_DECODE) && sizeof_alloc)
+             memset(obj, 0, elsize);
+-        stat = (*elproc)(xdrs, target);
++        stat = (*elproc)(xdrs, target, 0);
+         if ((xdrs->x_op == XDR_ENCODE) || !sizeof_alloc)
+             target += elsize;
+     }
+diff --git a/lib/sec_xdr_reference.c b/lib/sec_xdr_reference.c
+index a66fb37..ab5b4c4 100644
+--- a/lib/sec_xdr_reference.c
++++ b/lib/sec_xdr_reference.c
+@@ -121,7 +121,7 @@ sec_xdr_reference(XDR *xdrs, uint8_t **pp, u_int size, xdrproc_t proc)
+                 break;
+             }
+ 
+-    stat = (*proc)(xdrs, loc);
++    stat = (*proc)(xdrs, loc, 0);
+ 
+     if (xdrs->x_op == XDR_FREE) {
+         sec_mem_free(xdrs, loc, size);
+diff --git a/lib/sec_xdr_sizeof.c b/lib/sec_xdr_sizeof.c
+index a18bcd0..8c33dbc 100644
+--- a/lib/sec_xdr_sizeof.c
++++ b/lib/sec_xdr_sizeof.c
+@@ -190,7 +190,7 @@ sec_xdr_sizeof_in(func, data)
+ 
+     sec_xdr_arena_allocator_t size_alloc;
+     sec_xdr_arena_init_size_alloc(&size_alloc, &x);
+-    stat = func(&x, data);
++    stat = func(&x, data, 0);
+     if (x.x_private)
+         free(x.x_private);
+     return (stat == TRUE ? (unsigned) x.x_handy: 0);
+@@ -210,7 +210,7 @@ sec_xdr_sizeof_out(copy, size, func, data)
+ 
+     sec_xdr_arena_allocator_t size_alloc;
+     sec_xdr_arena_init_size_alloc(&size_alloc, &x);
+-    stat = func(&x, data);
++    stat = func(&x, data, 0);
+     if (size_alloc.data)
+         free(size_alloc.data);
+     return (stat == TRUE ? (unsigned long)size_alloc.offset : 0);
diff --git a/pkgs/os-specific/darwin/apple-source-releases/security_dotmac_tp/GNUmakefile b/pkgs/os-specific/darwin/apple-source-releases/security_dotmac_tp/GNUmakefile
new file mode 100644
index 00000000000..6f6a50bd57a
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/security_dotmac_tp/GNUmakefile
@@ -0,0 +1,8 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+LIBRARY_NAME = security_dotmac_tp
+
+security_dotmac_tp_HEADER_FILES = $(notdir $(wildcard lib/*.h))
+security_dotmac_tp_HEADER_FILES_DIR = lib
+
+include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/pkgs/os-specific/darwin/apple-source-releases/security_dotmac_tp/default.nix b/pkgs/os-specific/darwin/apple-source-releases/security_dotmac_tp/default.nix
new file mode 100644
index 00000000000..bfbfb945957
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/security_dotmac_tp/default.nix
@@ -0,0 +1,4 @@
+{ appleDerivation }:
+
+appleDerivation {
+}
diff --git a/pkgs/os-specific/darwin/osx-private-sdk/default.nix b/pkgs/os-specific/darwin/osx-private-sdk/default.nix
index 85e1dc50f35..febcb6b5d0c 100644
--- a/pkgs/os-specific/darwin/osx-private-sdk/default.nix
+++ b/pkgs/os-specific/darwin/osx-private-sdk/default.nix
@@ -1,34 +1,16 @@
-{ stdenv, fetchFromGitHub, python, osx_sdk }:
+{ stdenv, fetchzip }:
 
-let
-  sdkVersion = "10.9";
-in stdenv.mkDerivation {
-  name = "PrivateMacOSX${sdkVersion}.sdk";
-
-  src = fetchFromGitHub {
-    owner  = "copumpkin";
-    repo   = "OSXPrivateSDK";
-    rev    = "bde9cba13e6ae62a8e4e0f405008ea719526e7ad";
-    sha256 = "1vj3fxwp32irxjk987p7a223sm5bl5rrlajcvgy69k0wb0fp0krc";
-  };
-
-  buildInputs = [ python ];
-
-  configurePhase = "true";
-
-  buildPhase = ''
-    python PrivateSDK.py -i ${osx_sdk}/Developer/SDKs/MacOSX${sdkVersion}.sdk -o PrivateMacOSX${sdkVersion}.sdk
-  '';
-
-  installPhase = ''
-    mkdir -p $out/Developer/SDKs/
-    mv PrivateMacOSX${sdkVersion}.sdk $out/Developer/SDKs
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A private Mac OS ${sdkVersion} SDK, suitable for building many of Apple's open source releases";
-    maintainers = with maintainers; [ copumpkin ];
-    platforms   = platforms.darwin;
-    license     = licenses.unfree;
-  };
+let full = stdenv.lib.overrideDerivation (fetchzip {
+  url = "https://github.com/samdmarshall/OSXPrivateSDK/tarball/69bf3c7f7140ed6ab2b6684b427bd457209858fe";
+  name = "osx-private-sdk-10.9";
+  sha256 = "1agl4kyry6m7yz3sql5mrbvmd1xkmb4nbq976phcpk19inans1zm";
+}) (drv: {
+  postFetch = ''
+    unpackFile() {
+      tar xzf "$1"
+    }
+  '' + drv.postFetch;
+}); in {
+  outPath = "${full}/PrivateSDK10.9";
+  passthru.sdk10 = "${full}/PrivateSDK10.10";
 }
diff --git a/pkgs/os-specific/darwin/osx-sdk/default.nix b/pkgs/os-specific/darwin/osx-sdk/default.nix
index 612bf003743..875479b4f29 100644
--- a/pkgs/os-specific/darwin/osx-sdk/default.nix
+++ b/pkgs/os-specific/darwin/osx-sdk/default.nix
@@ -2,7 +2,7 @@
 
 let
   version = "10.9";
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
   name = "MacOSX10.9.sdk";
 
   src = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk";
@@ -23,4 +23,4 @@ in stdenv.mkDerivation {
     platforms   = platforms.darwin;
     license     = licenses.unfree;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/os-specific/darwin/security-tool/GNUmakefile b/pkgs/os-specific/darwin/security-tool/GNUmakefile
new file mode 100644
index 00000000000..ae25f6a67c0
--- /dev/null
+++ b/pkgs/os-specific/darwin/security-tool/GNUmakefile
@@ -0,0 +1,14 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+TOOL_NAME = security
+security_C_FILES = $(wildcard *.c)
+security_CC_FILES = $(wildcard *.cpp)
+
+security_LDFLAGS = \
+	-lsecurity_cdsa_utilities -lsecurity_cdsa_utils -lsecurity_keychain -lsecurity_cssm \
+	-lsecurity_cdsa_client -lsecurity_utilities -lsecurity_asn1 -lsecurity_mds \
+	-lsecurity_cdsa_plugin -lsecurity_pkcs12 -lsecurity_apple_csp -lsecurity_apple_cspdl \
+	-lsecurity_apple_file_dl -lsecurity_apple_x509_cl -lsecurity_apple_x509_tp \
+	-lsecurity_sd_cspdl -lsecurity_filedb -lsecurityd -framework Security -framework PCSC
+
+include $(GNUSTEP_MAKEFILES)/tool.make
diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix
index 49d61f392c5..ac495b63c0a 100644
--- a/pkgs/os-specific/darwin/security-tool/default.nix
+++ b/pkgs/os-specific/darwin/security-tool/default.nix
@@ -1,30 +1,85 @@
-{ stdenv, fetchurl, osx_private_sdk }:
+{ CoreServices, Foundation, PCSC, Security, apple_sdk, fetchurl, gnustep-make, libobjc, libsecurity_apple_csp, libsecurity_apple_cspdl, libsecurity_apple_file_dl, libsecurity_apple_x509_cl, libsecurity_apple_x509_tp, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_cssm, libsecurity_filedb, libsecurity_keychain, libsecurity_mds, libsecurity_pkcs12, libsecurity_sd_cspdl, libsecurity_utilities, libsecurityd, osx_private_sdk, stdenv }:
 
 stdenv.mkDerivation rec {
-	version = "55115";
-  name    = "SecurityTool-${version}";
+  version = "55115";
+  name = "SecurityTool-${version}";
 
   src = fetchurl {
     url = "http://opensource.apple.com/tarballs/SecurityTool/SecurityTool-${version}.tar.gz";
     sha256 = "0apcz4vy2z5645jhrs60wj3w27mncjjqv42h5lln36g6qs2n9113";
   };
 
-  configurePhase = "";
+  __propagatedImpureHostDeps = import ./impure-deps.nix;
 
-  # Someday we shall purge this impurity!
-  buildPhase = ''
-    /usr/bin/xcodebuild SDKROOT=${osx_private_sdk}/Developer/SDKs/PrivateMacOSX10.9.sdk/
+  patchPhase = ''
+    # copied from libsecurity_generic
+    ln -s ${osx_private_sdk}/System/Library/Frameworks/Security.framework/Versions/A/PrivateHeaders Security
+
+    substituteInPlace cmsutil.c --replace \
+      '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \
+      '"${apple_sdk.sdk}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"'
+    substituteInPlace createFVMaster.c --replace \
+      '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \
+      '"${apple_sdk.sdk}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"'
   '';
 
-  installPhase = ''
-    mkdir -p $out/bin/
-    cp build/Release/security $out/bin
+  postUnpack = ''
+    unpackFile ${Security.src}
+    cp Security-*/utilities/src/fileIo.c SecurityTool*
+    cp Security-*/utilities/src/fileIo.h SecurityTool*
   '';
 
+  preBuild = ''
+    makeFlagsArray=(-j''$NIX_BUILD_CORES)
+  '';
+
+  NIX_LDFLAGS = "-no_dtrace_dof";
+
+  makeFlags = "-f ${./GNUmakefile} MAKEFILE_NAME=${./GNUmakefile}";
+
+  installFlags = [
+    "security_INSTALL_DIR=\$(out)/bin"
+  ];
+
+  buildInputs = [
+    gnustep-make
+    Security
+    Foundation
+    libsecurity_asn1
+    libsecurity_utilities
+    libsecurity_cdsa_utilities
+    libobjc
+    libsecurity_cdsa_client
+    libsecurity_keychain
+    libsecurity_cssm
+    libsecurity_cdsa_utils
+    libsecurity_mds
+    libsecurity_cdsa_plugin
+    libsecurity_apple_csp
+    libsecurity_apple_cspdl
+    libsecurity_apple_file_dl
+    libsecurity_apple_x509_cl
+    libsecurity_apple_x509_tp
+    libsecurity_pkcs12
+    libsecurity_sd_cspdl
+    libsecurity_filedb
+    libsecurityd
+  ];
+
+  NIX_CFLAGS_COMPILE = [
+    "-F${Security}/Library/Frameworks"
+    "-F${PCSC}/Library/Frameworks"
+    "-Wno-deprecated-declarations"
+  ];
+
   meta = with stdenv.lib; {
     description = "Command line interface to Mac OS X keychains and Security framework";
-    maintainers = with maintainers; [ copumpkin ];
-    platforms   = platforms.darwin;
-    license     = licenses.apsl20;
+    maintainers = with maintainers; [
+      copumpkin
+      joelteon
+    ];
+    platforms = platforms.darwin;
+    license = licenses.apsl20;
   };
-}
\ No newline at end of file
+}
+
diff --git a/pkgs/os-specific/darwin/security-tool/impure-deps.nix b/pkgs/os-specific/darwin/security-tool/impure-deps.nix
new file mode 100644
index 00000000000..0d9da595349
--- /dev/null
+++ b/pkgs/os-specific/darwin/security-tool/impure-deps.nix
@@ -0,0 +1,129 @@
+[
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Accelerate"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vImage.framework/Versions/A/vImage"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLinearAlgebra.dylib"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvDSP.dylib"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvMisc.dylib"
+  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/vecLib"
+  "/System/Library/Frameworks/AppKit.framework/Versions/C/AppKit"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontParser.dylib"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontRegistry.dylib"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSync.framework/Versions/A/ColorSync"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD"
+  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis"
+  "/System/Library/Frameworks/AudioToolbox.framework/Versions/A/AudioToolbox"
+  "/System/Library/Frameworks/AudioUnit.framework/Versions/A/AudioUnit"
+  "/System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork"
+  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/CarbonSound.framework/Versions/A/CarbonSound"
+  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox"
+  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Ink.framework/Versions/A/Ink"
+  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition"
+  "/System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio"
+  "/System/Library/Frameworks/CoreBluetooth.framework/Versions/A/CoreBluetooth"
+  "/System/Library/Frameworks/CoreData.framework/Versions/A/CoreData"
+  "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"
+  "/System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices"
+  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit"
+  "/System/Library/Frameworks/CoreText.framework/Versions/A/CoreText"
+  "/System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo"
+  "/System/Library/Frameworks/CoreWLAN.framework/Versions/A/CoreWLAN"
+  "/System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration"
+  "/System/Library/Frameworks/Foundation.framework/Versions/C/Foundation"
+  "/System/Library/Frameworks/GSS.framework/Versions/A/GSS"
+  "/System/Library/Frameworks/IOBluetooth.framework/Versions/A/IOBluetooth"
+  "/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit"
+  "/System/Library/Frameworks/IOSurface.framework/Versions/A/IOSurface"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libGIF.dylib"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJP2.dylib"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libRadiance.dylib"
+  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib"
+  "/System/Library/Frameworks/Kerberos.framework/Versions/A/Kerberos"
+  "/System/Library/Frameworks/NetFS.framework/Versions/A/NetFS"
+  "/System/Library/Frameworks/OpenCL.framework/Versions/A/OpenCL"
+  "/System/Library/Frameworks/OpenDirectory.framework/Versions/A/Frameworks/CFOpenDirectory.framework/Versions/A/CFOpenDirectory"
+  "/System/Library/Frameworks/OpenDirectory.framework/Versions/A/OpenDirectory"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCVMSPluginSupport.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCoreVMClient.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGFXShared.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLImage.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib"
+  "/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL"
+  "/System/Library/Frameworks/PCSC.framework/Versions/A/PCSC"
+  "/System/Library/Frameworks/QuartzCore.framework/Versions/A/Frameworks/CoreImage.framework/Versions/A/CoreImage"
+  "/System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore"
+  "/System/Library/Frameworks/Security.framework/Versions/A/Security"
+  "/System/Library/Frameworks/SecurityFoundation.framework/Versions/A/SecurityFoundation"
+  "/System/Library/Frameworks/ServiceManagement.framework/Versions/A/ServiceManagement"
+  "/System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration"
+  "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Apple80211"
+  "/System/Library/PrivateFrameworks/AppleJPEG.framework/Versions/A/AppleJPEG"
+  "/System/Library/PrivateFrameworks/AppleVPA.framework/Versions/A/AppleVPA"
+  "/System/Library/PrivateFrameworks/Backup.framework/Versions/A/Backup"
+  "/System/Library/PrivateFrameworks/ChunkingLibrary.framework/Versions/A/ChunkingLibrary"
+  "/System/Library/PrivateFrameworks/CommonAuth.framework/Versions/A/CommonAuth"
+  "/System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/CoreSymbolication"
+  "/System/Library/PrivateFrameworks/CoreUI.framework/Versions/A/CoreUI"
+  "/System/Library/PrivateFrameworks/CoreWiFi.framework/Versions/A/CoreWiFi"
+  "/System/Library/PrivateFrameworks/CrashReporterSupport.framework/Versions/A/CrashReporterSupport"
+  "/System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore"
+  "/System/Library/PrivateFrameworks/DebugSymbols.framework/Versions/A/DebugSymbols"
+  "/System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv"
+  "/System/Library/PrivateFrameworks/FaceCore.framework/Versions/A/FaceCore"
+  "/System/Library/PrivateFrameworks/GenerationalStorage.framework/Versions/A/GenerationalStorage"
+  "/System/Library/PrivateFrameworks/Heimdal.framework/Versions/A/Heimdal"
+  "/System/Library/PrivateFrameworks/IconServices.framework/Versions/A/IconServices"
+  "/System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling"
+  "/System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport"
+  "/System/Library/PrivateFrameworks/NetAuth.framework/Versions/A/NetAuth"
+  "/System/Library/PrivateFrameworks/PerformanceAnalysis.framework/Versions/A/PerformanceAnalysis"
+  "/System/Library/PrivateFrameworks/RemoteViewServices.framework/Versions/A/RemoteViewServices"
+  "/System/Library/PrivateFrameworks/Sharing.framework/Versions/A/Sharing"
+  "/System/Library/PrivateFrameworks/SpeechRecognitionCore.framework/Versions/A/SpeechRecognitionCore"
+  "/System/Library/PrivateFrameworks/Symbolication.framework/Versions/A/Symbolication"
+  "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC"
+  "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation"
+  "/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity"
+  "/System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport"
+  "/usr/lib/libCRFSuite.dylib"
+  "/usr/lib/libOpenScriptingUtil.dylib"
+  "/usr/lib/libarchive.2.dylib"
+  "/usr/lib/libbsm.0.dylib"
+  "/usr/lib/libbz2.1.0.dylib"
+  "/usr/lib/libc++.1.dylib"
+  "/usr/lib/libc++abi.dylib"
+  "/usr/lib/libcmph.dylib"
+  "/usr/lib/libcups.2.dylib"
+  "/usr/lib/libextension.dylib"
+  "/usr/lib/libheimdal-asn1.dylib"
+  "/usr/lib/libiconv.2.dylib"
+  "/usr/lib/libicucore.A.dylib"
+  "/usr/lib/liblangid.dylib"
+  "/usr/lib/liblzma.5.dylib"
+  "/usr/lib/libmecabra.dylib"
+  "/usr/lib/libpam.2.dylib"
+  "/usr/lib/libresolv.9.dylib"
+  "/usr/lib/libsqlite3.dylib"
+  "/usr/lib/libxar.1.dylib"
+  "/usr/lib/libxml2.2.dylib"
+  "/usr/lib/libxslt.1.dylib"
+  "/usr/lib/libz.1.dylib"
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2736481473e..7b620f174b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9348,9 +9348,9 @@ let
     xcode = callPackage ../os-specific/darwin/xcode {};
 
     osx_sdk = callPackage ../os-specific/darwin/osx-sdk {};
-    osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk { inherit osx_sdk; };
+    osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk {};
 
-    security_tool = callPackage ../os-specific/darwin/security-tool { inherit osx_private_sdk; };
+    security_tool = (newScope (darwin.apple_sdk.frameworks // darwin)) ../os-specific/darwin/security-tool { };
 
     binutils = callPackage ../os-specific/darwin/binutils { inherit cctools; };
 
@@ -9364,6 +9364,12 @@ let
     libobjc = apple-source-releases.objc4;
   };
 
+  gnustep-make = callPackage ../development/tools/build-managers/gnustep/make {};
+  gnustep-xcode = callPackage ../development/tools/build-managers/gnustep/xcode {
+    inherit (darwin.apple_sdk.frameworks) Foundation;
+    inherit (darwin) libobjc;
+  };
+
   devicemapper = lvm2;
 
   disk_indicator = callPackage ../os-specific/linux/disk-indicator { };

From 7851df44541588c8b089b863b6cd1239ed41e2aa Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 30 Jun 2015 16:10:51 -0700
Subject: [PATCH 2078/2322] fix input propagation on security-tool

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

diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix
index ac495b63c0a..e1e51e6a7c9 100644
--- a/pkgs/os-specific/darwin/security-tool/default.nix
+++ b/pkgs/os-specific/darwin/security-tool/default.nix
@@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
     sha256 = "0apcz4vy2z5645jhrs60wj3w27mncjjqv42h5lln36g6qs2n9113";
   };
 
-  __propagatedImpureHostDeps = import ./impure-deps.nix;
-
   patchPhase = ''
     # copied from libsecurity_generic
     ln -s ${osx_private_sdk}/System/Library/Frameworks/Security.framework/Versions/A/PrivateHeaders Security
@@ -41,10 +39,10 @@ stdenv.mkDerivation rec {
     "security_INSTALL_DIR=\$(out)/bin"
   ];
 
+  propagatedBuildInputs = [ Security PCSC Foundation ];
+
   buildInputs = [
     gnustep-make
-    Security
-    Foundation
     libsecurity_asn1
     libsecurity_utilities
     libsecurity_cdsa_utilities

From ac3acae7a5a2884fda5751fbd62a8a56580de4b8 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 30 Jun 2015 16:11:16 -0700
Subject: [PATCH 2079/2322] use security_tool in x509-system

---
 .../haskell-modules/configuration-common.nix       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c70fb5c0bc7..ad9f0b2c54a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -209,12 +209,14 @@ self: super: {
   # Prevents needing to add security_tool as a build tool to all of x509-system's
   # dependencies.
   # TODO: use pkgs.darwin.security_tool once we can build it
-  x509-system = let security_tool = "/usr";
-  in overrideCabal super.x509-system (drv: {
-    patchPhase = (drv.patchPhase or "") + pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin ''
-      substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security
-    '';
-  });
+  x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc
+    then let inherit (pkgs.darwin) security_tool;
+      in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
+        patchPhase = (drv.patchPhase or "") + ''
+          substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security
+        '';
+      })
+    else super.x509-system;
 
   double-conversion = if !pkgs.stdenv.isDarwin
     then super.double-conversion

From 0f763a12bf5dc926f045f040fd708012db9f8f53 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 2 Jul 2015 18:59:30 -0700
Subject: [PATCH 2080/2322] update PCSC dependencies

---
 pkgs/os-specific/darwin/apple-sdk/frameworks.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
index ca700a9be7e..222168d39da 100644
--- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
@@ -76,7 +76,7 @@ with frameworks; with libs; {
   OpenAL                  = [];
   OpenCL                  = [ IOSurface OpenGL ];
   OpenGL                  = [];
-  PCSC                    = [];
+  PCSC                    = [ CoreData ];
   PreferencePanes         = [];
   PubSub                  = [];
   Python                  = [ ApplicationServices ];

From 630bff3b7d51637d18fbf820dd21e5985f8c7e8f Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 2 Jul 2015 18:59:59 -0700
Subject: [PATCH 2081/2322] remove unused security-tool deps file

---
 .../darwin/security-tool/impure-deps.nix      | 129 ------------------
 1 file changed, 129 deletions(-)
 delete mode 100644 pkgs/os-specific/darwin/security-tool/impure-deps.nix

diff --git a/pkgs/os-specific/darwin/security-tool/impure-deps.nix b/pkgs/os-specific/darwin/security-tool/impure-deps.nix
deleted file mode 100644
index 0d9da595349..00000000000
--- a/pkgs/os-specific/darwin/security-tool/impure-deps.nix
+++ /dev/null
@@ -1,129 +0,0 @@
-[
-  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Accelerate"
-  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vImage.framework/Versions/A/vImage"
-  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib"
-  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib"
-  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLinearAlgebra.dylib"
-  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvDSP.dylib"
-  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvMisc.dylib"
-  "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/vecLib"
-  "/System/Library/Frameworks/AppKit.framework/Versions/C/AppKit"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontParser.dylib"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontRegistry.dylib"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSync.framework/Versions/A/ColorSync"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD"
-  "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis"
-  "/System/Library/Frameworks/AudioToolbox.framework/Versions/A/AudioToolbox"
-  "/System/Library/Frameworks/AudioUnit.framework/Versions/A/AudioUnit"
-  "/System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork"
-  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/CarbonSound.framework/Versions/A/CarbonSound"
-  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox"
-  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Ink.framework/Versions/A/Ink"
-  "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition"
-  "/System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio"
-  "/System/Library/Frameworks/CoreBluetooth.framework/Versions/A/CoreBluetooth"
-  "/System/Library/Frameworks/CoreData.framework/Versions/A/CoreData"
-  "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"
-  "/System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices"
-  "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit"
-  "/System/Library/Frameworks/CoreText.framework/Versions/A/CoreText"
-  "/System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo"
-  "/System/Library/Frameworks/CoreWLAN.framework/Versions/A/CoreWLAN"
-  "/System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration"
-  "/System/Library/Frameworks/Foundation.framework/Versions/C/Foundation"
-  "/System/Library/Frameworks/GSS.framework/Versions/A/GSS"
-  "/System/Library/Frameworks/IOBluetooth.framework/Versions/A/IOBluetooth"
-  "/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit"
-  "/System/Library/Frameworks/IOSurface.framework/Versions/A/IOSurface"
-  "/System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO"
-  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libGIF.dylib"
-  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJP2.dylib"
-  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib"
-  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib"
-  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libRadiance.dylib"
-  "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib"
-  "/System/Library/Frameworks/Kerberos.framework/Versions/A/Kerberos"
-  "/System/Library/Frameworks/NetFS.framework/Versions/A/NetFS"
-  "/System/Library/Frameworks/OpenCL.framework/Versions/A/OpenCL"
-  "/System/Library/Frameworks/OpenDirectory.framework/Versions/A/Frameworks/CFOpenDirectory.framework/Versions/A/CFOpenDirectory"
-  "/System/Library/Frameworks/OpenDirectory.framework/Versions/A/OpenDirectory"
-  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCVMSPluginSupport.dylib"
-  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCoreVMClient.dylib"
-  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGFXShared.dylib"
-  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
-  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLImage.dylib"
-  "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib"
-  "/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL"
-  "/System/Library/Frameworks/PCSC.framework/Versions/A/PCSC"
-  "/System/Library/Frameworks/QuartzCore.framework/Versions/A/Frameworks/CoreImage.framework/Versions/A/CoreImage"
-  "/System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore"
-  "/System/Library/Frameworks/Security.framework/Versions/A/Security"
-  "/System/Library/Frameworks/SecurityFoundation.framework/Versions/A/SecurityFoundation"
-  "/System/Library/Frameworks/ServiceManagement.framework/Versions/A/ServiceManagement"
-  "/System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration"
-  "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Apple80211"
-  "/System/Library/PrivateFrameworks/AppleJPEG.framework/Versions/A/AppleJPEG"
-  "/System/Library/PrivateFrameworks/AppleVPA.framework/Versions/A/AppleVPA"
-  "/System/Library/PrivateFrameworks/Backup.framework/Versions/A/Backup"
-  "/System/Library/PrivateFrameworks/ChunkingLibrary.framework/Versions/A/ChunkingLibrary"
-  "/System/Library/PrivateFrameworks/CommonAuth.framework/Versions/A/CommonAuth"
-  "/System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/CoreSymbolication"
-  "/System/Library/PrivateFrameworks/CoreUI.framework/Versions/A/CoreUI"
-  "/System/Library/PrivateFrameworks/CoreWiFi.framework/Versions/A/CoreWiFi"
-  "/System/Library/PrivateFrameworks/CrashReporterSupport.framework/Versions/A/CrashReporterSupport"
-  "/System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore"
-  "/System/Library/PrivateFrameworks/DebugSymbols.framework/Versions/A/DebugSymbols"
-  "/System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv"
-  "/System/Library/PrivateFrameworks/FaceCore.framework/Versions/A/FaceCore"
-  "/System/Library/PrivateFrameworks/GenerationalStorage.framework/Versions/A/GenerationalStorage"
-  "/System/Library/PrivateFrameworks/Heimdal.framework/Versions/A/Heimdal"
-  "/System/Library/PrivateFrameworks/IconServices.framework/Versions/A/IconServices"
-  "/System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling"
-  "/System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport"
-  "/System/Library/PrivateFrameworks/NetAuth.framework/Versions/A/NetAuth"
-  "/System/Library/PrivateFrameworks/PerformanceAnalysis.framework/Versions/A/PerformanceAnalysis"
-  "/System/Library/PrivateFrameworks/RemoteViewServices.framework/Versions/A/RemoteViewServices"
-  "/System/Library/PrivateFrameworks/Sharing.framework/Versions/A/Sharing"
-  "/System/Library/PrivateFrameworks/SpeechRecognitionCore.framework/Versions/A/SpeechRecognitionCore"
-  "/System/Library/PrivateFrameworks/Symbolication.framework/Versions/A/Symbolication"
-  "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC"
-  "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation"
-  "/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity"
-  "/System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport"
-  "/usr/lib/libCRFSuite.dylib"
-  "/usr/lib/libOpenScriptingUtil.dylib"
-  "/usr/lib/libarchive.2.dylib"
-  "/usr/lib/libbsm.0.dylib"
-  "/usr/lib/libbz2.1.0.dylib"
-  "/usr/lib/libc++.1.dylib"
-  "/usr/lib/libc++abi.dylib"
-  "/usr/lib/libcmph.dylib"
-  "/usr/lib/libcups.2.dylib"
-  "/usr/lib/libextension.dylib"
-  "/usr/lib/libheimdal-asn1.dylib"
-  "/usr/lib/libiconv.2.dylib"
-  "/usr/lib/libicucore.A.dylib"
-  "/usr/lib/liblangid.dylib"
-  "/usr/lib/liblzma.5.dylib"
-  "/usr/lib/libmecabra.dylib"
-  "/usr/lib/libpam.2.dylib"
-  "/usr/lib/libresolv.9.dylib"
-  "/usr/lib/libsqlite3.dylib"
-  "/usr/lib/libxar.1.dylib"
-  "/usr/lib/libxml2.2.dylib"
-  "/usr/lib/libxslt.1.dylib"
-  "/usr/lib/libz.1.dylib"
-]

From 066412c7b0bd175ae2d22e97745e01f38454ce53 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sun, 5 Jul 2015 01:41:56 -0700
Subject: [PATCH 2082/2322] clean up propagated stuff for x509-system

---
 .../development/haskell-modules/configuration-common.nix | 4 +++-
 pkgs/os-specific/darwin/apple-sdk/impure-deps.nix        | 8 ++++++++
 pkgs/os-specific/darwin/security-tool/default.nix        | 9 +++++++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ad9f0b2c54a..3586fd0a232 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -208,13 +208,15 @@ self: super: {
 
   # Prevents needing to add security_tool as a build tool to all of x509-system's
   # dependencies.
-  # TODO: use pkgs.darwin.security_tool once we can build it
   x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc
     then let inherit (pkgs.darwin) security_tool;
       in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
         patchPhase = (drv.patchPhase or "") + ''
           substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security
         '';
+        __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [
+          "/System/Library/Keychains"
+        ];
       })
     else super.x509-system;
 
diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
index 0d2f2728406..54a6dcfaeaf 100644
--- a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
@@ -16,6 +16,12 @@ rec {
     "/usr/lib/libpam.2.dylib"
     "/usr/lib/libxar.1.dylib"
   ];
+  GSS = [
+    "/System/Library/Frameworks/GSS.framework"
+  ];
+  Kerberos = [
+    "/System/Library/Frameworks/Kerberos.framework"
+  ];
   CoreServices = [
     "/System/Library/Frameworks/CoreServices.framework"
     "/System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore"
@@ -76,6 +82,8 @@ rec {
     "/System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv"
     "/System/Library/PrivateFrameworks/FaceCore.framework/Versions/A/FaceCore"
     "/System/Library/PrivateFrameworks/GenerationalStorage.framework/Versions/A/GenerationalStorage"
+    "/System/Library/PrivateFrameworks/Heimdal.framework/Heimdal"
+    "/System/Library/PrivateFrameworks/Heimdal.framework/Versions/Current"
     "/System/Library/PrivateFrameworks/Heimdal.framework/Versions/A/Heimdal"
     "/System/Library/PrivateFrameworks/IconServices.framework/Versions/A/IconServices"
     "/System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling"
diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix
index e1e51e6a7c9..866d006238d 100644
--- a/pkgs/os-specific/darwin/security-tool/default.nix
+++ b/pkgs/os-specific/darwin/security-tool/default.nix
@@ -1,4 +1,4 @@
-{ CoreServices, Foundation, PCSC, Security, apple_sdk, fetchurl, gnustep-make, libobjc, libsecurity_apple_csp, libsecurity_apple_cspdl, libsecurity_apple_file_dl, libsecurity_apple_x509_cl, libsecurity_apple_x509_tp, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_cssm, libsecurity_filedb, libsecurity_keychain, libsecurity_mds, libsecurity_pkcs12, libsecurity_sd_cspdl, libsecurity_utilities, libsecurityd, osx_private_sdk, stdenv }:
+{ CoreServices, Foundation, PCSC, Security, GSS, Kerberos, makeWrapper, apple_sdk, fetchurl, gnustep-make, libobjc, libsecurity_apple_csp, libsecurity_apple_cspdl, libsecurity_apple_file_dl, libsecurity_apple_x509_cl, libsecurity_apple_x509_tp, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_cssm, libsecurity_filedb, libsecurity_keychain, libsecurity_mds, libsecurity_pkcs12, libsecurity_sd_cspdl, libsecurity_utilities, libsecurityd, osx_private_sdk, stdenv }:
 
 stdenv.mkDerivation rec {
   version = "55115";
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     "security_INSTALL_DIR=\$(out)/bin"
   ];
 
-  propagatedBuildInputs = [ Security PCSC Foundation ];
+  propagatedBuildInputs = [ GSS Kerberos Security PCSC Foundation ];
 
   buildInputs = [
     gnustep-make
@@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
     libsecurity_sd_cspdl
     libsecurity_filedb
     libsecurityd
+    makeWrapper
   ];
 
   NIX_CFLAGS_COMPILE = [
@@ -70,6 +71,10 @@ stdenv.mkDerivation rec {
     "-Wno-deprecated-declarations"
   ];
 
+  postInstall = ''
+    wrapProgram $out/bin/security --set DYLD_INSERT_LIBRARIES /usr/lib/libsqlite3.dylib
+  '';
+
   meta = with stdenv.lib; {
     description = "Command line interface to Mac OS X keychains and Security framework";
     maintainers = with maintainers; [

From e1f2930213e5c6ae6f8198032b3e4fb3e7d42dc7 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 9 Jul 2015 10:58:28 +0200
Subject: [PATCH 2083/2322] poezio: init at 0.8.1

---
 lib/maintainers.nix                           |  1 +
 .../poezio/fix_requirements.patch             | 11 ++++++++
 .../poezio/make_default_config_writable.patch | 25 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/python-packages.nix            | 26 +++++++++++++++++++
 5 files changed, 65 insertions(+)
 create mode 100644 pkgs/development/python-modules/poezio/fix_requirements.patch
 create mode 100644 pkgs/development/python-modules/poezio/make_default_config_writable.patch

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8e8ae4c4988..026a874a779 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -140,6 +140,7 @@
   linus = "Linus Arver <linusarver@gmail.com>";
   lnl7 = "Daiderd Jordan <daiderd@gmail.com>";
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
+  lsix = "Lancelot SIX <lsix@lancelotsix.com>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
   magnetophon = "Bart Brouns <bart@magnetophon.nl>";
diff --git a/pkgs/development/python-modules/poezio/fix_requirements.patch b/pkgs/development/python-modules/poezio/fix_requirements.patch
new file mode 100644
index 00000000000..99b022c0e78
--- /dev/null
+++ b/pkgs/development/python-modules/poezio/fix_requirements.patch
@@ -0,0 +1,11 @@
+--- a/setup.py	2014-03-20 22:27:14.000000000 +0100
++++ b/setup.py	2015-07-10 21:18:30.156196111 +0200
+@@ -49,7 +49,7 @@
+        scripts = ['scripts/poezio'],
+        data_files = [('share/man/man1/', ['data/poezio.1'])],
+ 
+-       install_requires = ['sleekxmpp==1.2.4',
++       install_requires = ['sleekxmpp==1.2.5',
+                            'dnspython3>=1.11.1'],
+        extras_require = {'OTR plugin': 'python-potr>=1.0',
+                          'Screen autoaway plugin': 'pyinotify==0.9.4'}
diff --git a/pkgs/development/python-modules/poezio/make_default_config_writable.patch b/pkgs/development/python-modules/poezio/make_default_config_writable.patch
new file mode 100644
index 00000000000..aa431dcc928
--- /dev/null
+++ b/pkgs/development/python-modules/poezio/make_default_config_writable.patch
@@ -0,0 +1,25 @@
+diff -ruN a/src/config.py b/src/config.py
+--- a/src/config.py	2014-03-20 22:27:05.000000000 +0100
++++ b/src/config.py	2015-07-10 21:24:37.583136078 +0200
+@@ -18,6 +18,7 @@
+ 
+ import os
+ import logging
++import stat
+ 
+ from configparser import RawConfigParser, NoOptionError, NoSectionError
+ from os import environ, makedirs, path, remove
+@@ -279,6 +280,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)
++
+     firstrun = True
+ 
+ try:
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 689f43c7664..340cdf39084 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12322,6 +12322,8 @@ let
 
   plugin-torture = callPackage ../applications/audio/plugin-torture { };
 
+  poezio = python3Packages.poezio;
+
   pommed = callPackage ../os-specific/linux/pommed {
     inherit (xorg) libXpm;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 16bbd6ef009..9a43d971d1e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16401,5 +16401,31 @@ let
     };
   };
 
+  poezio = buildPythonPackage rec {
+    name = "poezio-${version}";
+    version = "0.8.1";
+
+    namePrefix = "";
+    disabled = (!isPy3k);
+    propagatedBuildInputs = with self ; [ dnspython3 sleekxmpp ];
+
+   patches =
+   let patch_base = ../development/python-modules/poezio ;
+   in [ "${patch_base}/make_default_config_writable.patch"
+        "${patch_base}/fix_requirements.patch"
+      ];
+
+    src = pkgs.fetchurl {
+      url = "http://dev.louiz.org/attachments/download/52/${name}.tar.xz";
+      sha256 = "0n3phh3lc82609ssfvqvd4papvhykd1sf2bm88dggh2x4mypwjff";
+    };
+
+    meta = {
+      description = "Free console XMPP client";
+      homepage = http://poez.io;
+      license = licenses.mit;
+      maintainers = [ maintainers.lsix ];
+    };
+  };
 
 }; in pythonPackages

From f495ae308532cc7b97f81a8d9e43c9ff079c96bb Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Fri, 10 Jul 2015 21:54:11 +0100
Subject: [PATCH 2084/2322] CONTRIBUTING.md: Some minor clean-ups

---
 CONTRIBUTING.md | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9938604eef5..f3b325ed297 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,7 +20,7 @@
         git checkout -b 'fix/pkg-name-update'
         ```
   * Please avoid working directly on the `master` branch.
-* Make commits of logical units. 
+* Make commits of logical units.
   * If you removed pkgs, made some major NixOS changes etc., write about them in `nixos/doc/manual/release-notes/rl-unstable.xml`.
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * Format the commit in a following way:
@@ -37,12 +37,12 @@
     * `nginx service: refactor config generation`
 * Test your changes. If you work with
   * nixpkgs:
-    * update pkg -> 
+    * update pkg ->
       * `nix-env -i pkg-name -f <path to your local nixpkgs folder>`
-    * add pkg -> 
+    * add pkg ->
       * Make sure it's in `pkgs/top-level/all-packages.nix`
       * `nix-env -i pkg-name -f <path to your local nixpkgs folder>`
-    * _If you don't want to install pkg in you profile_. 
+    * _If you don't want to install pkg in you profile_.
       * `nix-build -A pkg-attribute-name <path to your local nixpkgs folder>/default.nix` and check results in the folder `result`. It will appear in the same directory where you did `nix-build`.
     * If you did `nix-env -i pkg-name` you can do `nix-env -e pkg-name` to uninstall it from your system.
   * NixOS and its modules:
@@ -70,10 +70,9 @@
 
 ## Commit policy
 
-* Commits must be sufficiently tested before being merged, both the master and staging branches.
-* Hydra builds for master and stagingshould not be used as testing platform, it's a build farm for changes that have been already tested.
+* Commits must be sufficiently tested before being merged, both for the master and staging branches.
+* Hydra builds for master and staging should not be used as testing platform, it's a build farm for changes that have been already tested.
 * Master should only see non-breaking commits that do not cause mass rebuilds.
-* Staging should only see non-breaking mass-rebuild commits. That means it's not to be used for testing, changes must have been well tested already. [Read policy here](http://comments.gmane.org/gmane.linux.distributions.nixos/13447).
+* Staging should only see non-breaking mass-rebuild commits. That means it's not to be used for testing, and changes must have been well tested already. [Read policy here](http://comments.gmane.org/gmane.linux.distributions.nixos/13447).
 * If staging is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. [Keep an eye on the staging evaluations here](http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations).
-* When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people installation forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from @edolstra.
-
+* When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people's installations forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from @edolstra.

From a2b3fe28a883c3d4695d250262c39bba1b34f966 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 10 Jul 2015 14:00:47 -0700
Subject: [PATCH 2085/2322] make bootstrap files buildable in sandbox

---
 pkgs/stdenv/pure-darwin/default.nix | 32 +++++++++++++++--------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/pkgs/stdenv/pure-darwin/default.nix b/pkgs/stdenv/pure-darwin/default.nix
index 79925a2edfd..92c6f321d36 100644
--- a/pkgs/stdenv/pure-darwin/default.nix
+++ b/pkgs/stdenv/pure-darwin/default.nix
@@ -5,11 +5,26 @@
 }:
 
 let
-  fetch = { file, sha256 }: import <nix/fetchurl.nix> {
+  # libSystem and its transitive dependencies. Get used to this; it's a recurring theme in darwin land
+  libSystemClosure = [
+    "/usr/lib/libSystem.dylib"
+    "/usr/lib/libSystem.B.dylib"
+    "/usr/lib/libobjc.A.dylib"
+    "/usr/lib/libobjc.dylib"
+    "/usr/lib/libauto.dylib"
+    "/usr/lib/libc++abi.dylib"
+    "/usr/lib/libc++.1.dylib"
+    "/usr/lib/libDiagnosticMessagesClient.dylib"
+    "/usr/lib/system"
+  ];
+
+  fetch = { file, sha256 }: derivation ((import <nix/fetchurl.nix> {
     url = "https://dl.dropboxusercontent.com/u/2857322/${file}";
     inherit sha256;
     executable = true;
-  };
+  }).drvAttrs // {
+    __impureHostDeps = libSystemClosure;
+  });
 
   bootstrapFiles = {
     sh    = fetch { file = "sh";    sha256 = "1qakpg37vl61jnkplz13m3g1csqr85cg8ybp6jwiv6apmg26isnm"; };
@@ -30,19 +45,6 @@ in rec {
     export CMAKE_OSX_ARCHITECTURES=x86_64
   '';
 
-  # libSystem and its transitive dependencies. Get used to this; it's a recurring theme in darwin land
-  libSystemClosure = [
-    "/usr/lib/libSystem.dylib"
-    "/usr/lib/libSystem.B.dylib"
-    "/usr/lib/libobjc.A.dylib"
-    "/usr/lib/libobjc.dylib"
-    "/usr/lib/libauto.dylib"
-    "/usr/lib/libc++abi.dylib"
-    "/usr/lib/libc++.1.dylib"
-    "/usr/lib/libDiagnosticMessagesClient.dylib"
-    "/usr/lib/system"
-  ];
-
   # The one dependency of /bin/sh :(
   binShClosure = [ "/usr/lib/libncurses.5.4.dylib" ];
 

From 29993682a27f1ce33668879ea52084caae1ed08b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 11 Jul 2015 01:43:28 +0200
Subject: [PATCH 2086/2322] virtualbox+guest: Update to major version 5.0.0.

The official press release on major changes:

https://www.oracle.com/corporate/pressrelease/oracle-vm-virtualbox-5-070915.html

More details on the changes can be found here:

https://www.virtualbox.org/wiki/Changelog

Built and tested using the Virtualbox NixOS VM test successfully on my
machine but I haven't tested it outside of the NixOS VM test, so please
open an issue if I have fucked up this update.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 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 31a14830034..a1a38931410 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -14,7 +14,7 @@ with stdenv.lib;
 let
   buildType = "release";
 
-  version = "4.3.28"; # changes ./guest-additions as well
+  version = "5.0.0"; # changes ./guest-additions as well
 
   forEachModule = action: ''
     for mod in \
@@ -35,13 +35,13 @@ let
   '';
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "100309";
+  extpackRevision = "101573";
   extensionPack = requireFile rec {
     name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
     # IMPORTANT: Hash must be base16 encoded because it's used as an input to
     # VBoxExtPackHelperApp!
     # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS
-    sha256 = "72e101d9dc5eabeb76d1ab5bd6d2f817a11c89adfe8bb72cc5d614a2eef532d1";
+    sha256 = "c357e36368883df821ed092d261890a95c75e50422b75848c40ad20984086a7a";
     message = ''
       In order to use the extension pack, you need to comply with the VirtualBox Personal Use
       and Evaluation License (PUEL) by downloading the related binaries from:
@@ -60,7 +60,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31";
+    sha256 = "bb71356c8f82012c9b5ae16e12302eb111c71ae7b063ada7688fbfa8aa10c2f7";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 0d856063522..b56e80eb3b6 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "9f52e186d6c9407b2676d4b2ed1cdf96940ec129cc2bd92e54b24526271a9733";
+    sha256 = "7b61f523db7ba75aebc4c7bb0cae2da92674fa72299e4a006c5c67517f7d786b";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";

From d29eb63542ea36faedbed637a9f0a29ac111a807 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 10 Jul 2015 18:48:14 -0700
Subject: [PATCH 2087/2322] node v0.10 doesn't work either. update libuv on
 darwin only

---
 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 2736481473e..4e35870192f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2003,7 +2003,9 @@ let
   ninka = callPackage ../development/tools/misc/ninka { };
 
   nodejs-0_12 = callPackage ../development/web/nodejs {
-    libuv = libuvVersions.v1_2_0;
+    libuv = if stdenv.isDarwin
+      then libuvVersions.v1_6_1
+      else libuvVersions.v1_2_0;
     libtool = darwin.cctools;
   };
   nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; };
@@ -2012,7 +2014,7 @@ let
     inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation;
   };
 
-  nodejs = if stdenv.system == "armv5tel-linux" || stdenv.isDarwin then
+  nodejs = if stdenv.system == "armv5tel-linux" then
     nodejs-0_10
   else
     nodejs-0_12;

From e6e08dc2744487d6e77f71e2034faaa94ea4d40a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 11 Jul 2015 08:35:15 +0200
Subject: [PATCH 2088/2322] unifont: 7.0.06 -> 8.0.01

---
 pkgs/data/fonts/unifont/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index 6b2a4ffe960..e6fe5afa9b1 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "unifont-${version}";
-  version = "7.0.06";
+  version = "8.0.01";
 
   ttf = fetchurl {
-    url = "http://unifoundry.com/pub/${name}/font-builds/${name}.ttf";
-    sha256 = "0qmk06rwhxs43n1xbwj14fanbih60zqli002qhy0609da24r3957";
+    url = "http://fossies.org/linux/unifont/font/precompiled/${name}.ttf";
+    sha256 = "0g4g2n024072cdrs2wjp7xmkr3i9dm52a5g9hiafxjgj5a45c8kl";
   };
 
   pcf = fetchurl {
-    url = "http://unifoundry.com/pub/${name}/font-builds/${name}.pcf.gz";
-    sha256 = "1wplig57wpc79mlqamhknn39cibg5z8dvbyibp1490ljcjs1dxdc";
+    url = "http://fossies.org/linux/unifont/font/precompiled/${name}.pcf.gz";
+    sha256 = "0mpdy2k7z9s60x8i6sbv64p9wrihfwgrw81x5yj13rl6x7zzghr8";
   };
 
   buildInputs = [ mkfontscale mkfontdir ];

From 750404a19304b2554dce873da7f4721a6382148c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 11 Jul 2015 08:35:41 +0200
Subject: [PATCH 2089/2322] fira: 4.103 -> 4.104

---
 pkgs/data/fonts/fira/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix
index 6646fcb86b1..b8db1132b7c 100644
--- a/pkgs/data/fonts/fira/default.nix
+++ b/pkgs/data/fonts/fira/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "fira-4.103";
+  name = "fira-4.104";
 
   src = fetchurl {
-    url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4103.zip;
-    sha256 = "1nw5icg3134qq2qfspvj2kclsv3965szby2lfcr65imf7lj4k52z";
+    url = http://www.carrois.com/downloads/fira_4_1/FiraFonts4104.zip;
+    sha256 = "1i8l0x2wdx4pw7j52lgy8qcx0wqj0azwjiq0wa9kg26x78bdfk2d";
   };
 
   buildInputs = [unzip];
   phases = [ "unpackPhase" "installPhase" ];
-  sourceRoot = "FiraFonts4103";
+  sourceRoot = "FiraFonts4104";
 
   installPhase = ''
     mkdir -p $out/share/fonts/opentype

From 67636e3adefd5661e66c0338d7289b6cfa440101 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 11 Jul 2015 08:36:04 +0200
Subject: [PATCH 2090/2322] fira-mono: 3.203 -> 3.204

---
 pkgs/data/fonts/fira-mono/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix
index a01f2a62424..976fb68d79f 100644
--- a/pkgs/data/fonts/fira-mono/default.nix
+++ b/pkgs/data/fonts/fira-mono/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "fira-mono-3.203";
+  name = "fira-mono-3.204";
 
   src = fetchurl {
-    url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3203.zip;
-    sha256 = "0qaplpmsqys42a49x8d15ca2gqw1v6a6k2d56ja1j38dmr2qmpv4";
+    url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3204.zip;
+    sha256 = "0pnsw7b1i5vkwq0kny4lxzly4h8rlwkj610rykhax6zayfbnz62a";
   };
 
   buildInputs = [ unzip ];
   phases = [ "unpackPhase" "installPhase" ];
-  sourceRoot = "FiraMonoFonts3203";
+  sourceRoot = "FiraMonoFonts3204";
 
   installPhase = ''
     mkdir -p $out/share/fonts/opentype

From a36be69832aeba0186eaeda5033cfd78b45f4cef Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 11 Jul 2015 10:25:36 +0200
Subject: [PATCH 2091/2322] gnome3.gnome-user-share: fix build (ZHF)

Binary was splitted in webdav and bluetooth component. See

https://github.com/GNOME/gnome-user-share/commit/d6eb26cca2c96a92f7420407229c0a332b4dc439
---
 pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
index 2f158be4e0d..2d563e1f7b5 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    wrapProgram "$out/libexec/gnome-user-share" \
+    wrapProgram "$out/libexec/gnome-user-share-webdav" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
       --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';

From 329c2b2e8b0985fe80ce002fc63820bbd88c7e1e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 10 Jul 2015 20:46:03 +0200
Subject: [PATCH 2092/2322] multipledispatch: init at 0.4.8

---
 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 3a6d88545ec..eadfcae655e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7574,6 +7574,21 @@ let
     propagatedBuildInputs = with self; [ eventlib application gnutls ];
   };
 
+  multipledispatch = buildPythonPackage rec {
+    name = "multipledispatch-${version}";
+    version = "0.4.8";
+   
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/m/multipledispatch/${name}.tar.gz";
+      sha256 = "07d41fb3ed25e8424536e48a8566f88a0f9926ca4b6174bff6aa16c98251b92e";
+    };
+    
+    meta = {
+      homepage = http://github.com/mrocklin/multipledispatch/;
+      description = "A relatively sane approach to multiple dispatch in Python";
+      license = licenses.bsd3;
+    };
+  };
 
   munkres = buildPythonPackage rec {
     name = "munkres-1.0.6";

From 071304f26d452cd7ea0f8d9ce82cf0170906e02a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 11 Jul 2015 11:51:48 +0200
Subject: [PATCH 2093/2322] ruby_2_2_0: pass libobjc and libunwind

---
 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 d2b0f884a87..07f2796c93e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5048,7 +5048,9 @@ let
   ruby_2_1_2 = callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { };
   ruby_2_1_3 = callPackage ../development/interpreters/ruby/ruby-2.1.3.nix { };
   ruby_2_1_6 = callPackage ../development/interpreters/ruby/ruby-2.1.6.nix { };
-  ruby_2_2_0 = callPackage ../development/interpreters/ruby/ruby-2.2.0.nix { };
+  ruby_2_2_0 = callPackage ../development/interpreters/ruby/ruby-2.2.0.nix {
+    inherit (darwin) libobjc libunwind;
+  };
   ruby_2_2_2 = callPackage ../development/interpreters/ruby/ruby-2.2.2.nix {
     inherit (darwin) libobjc libunwind;
   };

From cb6edaca03eae0005df184f1a2f205140afe4c88 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Jul 2015 10:20:28 +0000
Subject: [PATCH 2094/2322] pystache: init at 0.5.4

---
 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 c324ae1c00c..706357c074a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9941,6 +9941,22 @@ let
       maintainers = with maintainers; [ koral ];
     };
   };
+  
+  pystache = buildPythonPackage rec {
+    name = "pystache-${version}";
+    version = "0.5.4";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pystache/${name}.tar.gz";
+      sha256 = "f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a";
+    };
+    
+    meta = {
+      description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et";
+      homepage = https://github.com/defunkt/pystache;
+      license = licenses.mit;
+    };
+  };
 
   PyStemmer = buildPythonPackage (rec {
     name = "PyStemmer-1.3.0";

From 21036330372c7ab5f2e512bfe98a0f202d3f4add Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Jul 2015 10:22:22 +0000
Subject: [PATCH 2095/2322] colorama: 0.2.5 -> 0.3.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c324ae1c00c..936d348c6f2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1854,19 +1854,16 @@ let
 
 
   colorama = buildPythonPackage rec {
-    name = "colorama-0.2.5";
+    name = "colorama-${version}";
+    version = "0.3.3";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/c/colorama/colorama-0.2.5.tar.gz";
-      md5 = "308c6e38917bdbfc4d3b0783c614897d";
+      url = "https://pypi.python.org/packages/source/c/colorama/${name}.tar.gz";
+      sha256 = "eb21f2ba718fbf357afdfdf6f641ab393901c7ca8d9f37edd0bee4806ffa269c";
     };
 
-    propagatedBuildInputs = with self; [ self.clientform ];
-
-    doCheck = false;
-
     meta = {
-      homepage = http://code.google.com/p/colorama/;
+      homepage = https://github.com/tartley/colorama;
       license = "bsd";
       description = "Cross-platform colored terminal text";
     };

From 3c47a9980c43c51c65ae4a6ba87d2c252612ff5c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 11 Jul 2015 12:20:09 +0200
Subject: [PATCH 2096/2322] crackxls: do not use march=native and mtune=native

patch is from @dezgeg and is contained in #8530
---
 pkgs/tools/security/crackxls/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix
index 37e3e048a76..48210c11ad9 100644
--- a/pkgs/tools/security/crackxls/default.nix
+++ b/pkgs/tools/security/crackxls/default.nix
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig autoconf automake openssl libgsf gmp ];
 
+  patchPhase = ''
+    substituteInPlace Makefile.in \
+      --replace '-march=native' "" \
+      --replace '-mtune=native' ""
+  '';
+
   installPhase =
   ''
     mkdir $out/bin

From c88ec978dbbe115697548e7de2646450870dc8e7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Jul 2015 14:11:24 +0200
Subject: [PATCH 2097/2322] decorator: 3.4.0 -> 3.4.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3a6d88545ec..3de2e266a7f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2647,19 +2647,21 @@ let
   };
 
   decorator = buildPythonPackage rec {
-    name = "decorator-3.4.0";
+    name = "decorator-${version}";
+    version = "3.4.2";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/d/decorator/${name}.tar.gz";
-      md5 = "1e8756f719d746e2fc0dd28b41251356";
+      sha256 = "7320002ce61dea6aa24adc945d9d7831b3669553158905cdd12f5d0027b54b44";
     };
 
     meta = {
       homepage = http://pypi.python.org/pypi/decorator;
+      description = "Better living through Python with decorators";
+      license = licenses.mit;
     };
   };
 
-
   deform = buildPythonPackage rec {
     name = "deform-2.0a2";
 

From 3c163467aa87686ad92dd774854d20e91a0e731d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <ikervagyok@gmail.com>
Date: Sat, 11 Jul 2015 14:22:39 +0200
Subject: [PATCH 2098/2322] btrfs-progs: 4.1 -> 4.1.1

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

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 7b29e0a783b..3ec04859237 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }:
 
-let version = "4.1"; in
+let version = "4.1.1"; in
 
 stdenv.mkDerivation (rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "1s5pzvi30mivxgbkx7nbqn38pfiw20rdnd6xiqsyfj7rpffzzimb";
+    sha256 = "1d01f2i5fnnhkp184kfv8b9l37v1dmvqwqr22k71x6k2ss7nkwmp";
   };
 
   buildInputs = [

From 5d28543192d46e0deef0480abb83220296cfdc4d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 5 Jul 2015 21:09:17 +0200
Subject: [PATCH 2099/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/72f0e8d41dce574e3f832eb9b6e37c92ce107edb
 with hackage2nix revision 365f4f335ce8e3f384f6cc62b7a46796031610cc

---
 .../haskell-modules/hackage-packages.nix      | 1001 ++++++++++-------
 1 file changed, 614 insertions(+), 387 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8c8dc0961ab..a522133b721 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2529,8 +2529,8 @@ self: {
      }:
      mkDerivation {
        pname = "ClustalParser";
-       version = "1.1.2";
-       sha256 = "03bkhffbzypcrcssa8hhy23rwxjg5b3qf0j1xwssqar34lp465vi";
+       version = "1.1.3";
+       sha256 = "1xblyxmwbhmfkm2d2a87qnryk6mg5n1zarzr9d3xjh9qx3mbbclb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base cmdargs either-unwrap parsec vector ];
@@ -3093,13 +3093,12 @@ self: {
      }) {};
 
   "DCFL" = callPackage
-    ({ mkDerivation, base, HUnit, random }:
+    ({ mkDerivation, base, deepseq, HUnit, parallel, random }:
      mkDerivation {
        pname = "DCFL";
-       version = "0.1.0.0";
-       sha256 = "0nq2nihvgn84ijd9y41a42wl05wwqb70k1r63yfbm6qbmlzw6vns";
-       buildDepends = [ base HUnit random ];
-       jailbreak = true;
+       version = "0.1.6.0";
+       sha256 = "10f0c3y0y39rmvvvrvz426srb18wsv4qfzzx9r9zjac2m14b96jx";
+       buildDepends = [ base deepseq HUnit parallel random ];
        homepage = "https://github.com/Poincare/DCFL";
        description = "Communication Free Learning-based constraint solver";
        license = stdenv.lib.licenses.mit;
@@ -4945,8 +4944,8 @@ self: {
      }:
      mkDerivation {
        pname = "Frames";
-       version = "0.1.0.0";
-       sha256 = "1c154mv72nc81qghz3fmcymh2zlixpqhafibdmh0vl4srf0jzqcr";
+       version = "0.1.1.1";
+       sha256 = "117nqwvxbvcdnma582801im0fp2bg129m0cick43qa7cn9ky1drz";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -5067,8 +5066,8 @@ self: {
     ({ mkDerivation, base, libX11, mesa, OpenGL }:
      mkDerivation {
        pname = "GLFW";
-       version = "0.5.2.2";
-       sha256 = "0yqvfkg9p5h5bv3ak6b89am9kan9lbcq26kg1wk53xl6mz1aaijf";
+       version = "0.5.2.4";
+       sha256 = "1aac9xz943h3jjbx22kmvzmbzqw7k6cl2qsh1kr4nnx83pxrxz28";
        buildDepends = [ base OpenGL ];
        extraLibraries = [ libX11 mesa ];
        homepage = "http://haskell.org/haskellwiki/GLFW";
@@ -7854,8 +7853,8 @@ self: {
      }:
      mkDerivation {
        pname = "HaskellNet";
-       version = "0.4.4";
-       sha256 = "0df5q28y1x5irnzm5ma65b6ny6dds0375bzj6xczsw6xrlxaj3br";
+       version = "0.4.5";
+       sha256 = "1d34zknk8knjsw1w3bl91z8qc47vqb6mhfh6rq1rm93na616i3p5";
        buildDepends = [
          array base base64-string bytestring cryptohash mime-mail mtl
          network old-time pretty text
@@ -8990,8 +8989,8 @@ self: {
      }:
      mkDerivation {
        pname = "JsonGrammar";
-       version = "1.0.1";
-       sha256 = "0y29199vjs1rxpsl0af66696y1awfhslqq30x4ps2ajs9zhhfkn2";
+       version = "1.0.2";
+       sha256 = "0baywdqdj0r73rfxm5zk51bgsl014s19j01wnzarfbhak8cpwcdf";
        buildDepends = [
          aeson attoparsec base bytestring containers hashable
          language-typescript mtl semigroups stack-prism template-haskell
@@ -9001,7 +9000,6 @@ self: {
          aeson base HUnit language-typescript stack-prism test-framework
          test-framework-hunit text
        ];
-       jailbreak = true;
        homepage = "https://github.com/MedeaMelana/JsonGrammar2";
        description = "Combinators for bidirectional JSON parsing";
        license = stdenv.lib.licenses.bsd3;
@@ -11428,14 +11426,13 @@ self: {
      }:
      mkDerivation {
        pname = "OpenSCAD";
-       version = "0.3.0.1";
-       sha256 = "1cczhagc77rfdpwf6x993rdwmmgssph4dlr87dq1mnwh0ixhf33j";
+       version = "0.3.0.2";
+       sha256 = "04b7n6905qvvz8az8zhsjjg8jcf71y5yby7svy2mqzavq2azjm8x";
        buildDepends = [ base colour containers filepath semigroups ];
        testDepends = [
          base Cabal colour containers deepseq filepath HUnit semigroups
          tasty tasty-hunit testpack
        ];
-       jailbreak = true;
        homepage = "https://chiselapp.com/user/mwm/repository/OpenSCAD/";
        description = "ADT wrapper and renderer for OpenSCAD models";
        license = stdenv.lib.licenses.bsd3;
@@ -15022,6 +15019,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Updater" = callPackage
+    ({ mkDerivation, base, stm }:
+     mkDerivation {
+       pname = "Updater";
+       version = "0.1";
+       sha256 = "0wd6ydj6s44mxncg817f9ar4cwxjxakb9m5a4p6yxhzgkwcl7hp2";
+       buildDepends = [ base stm ];
+       homepage = "https://github.com/yokto/Updater";
+       description = "Monadic FRP library based on stm";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "UrlDisp" = callPackage
     ({ mkDerivation, base, cgi, MaybeT, mtl }:
      mkDerivation {
@@ -15068,8 +15077,8 @@ self: {
      }:
      mkDerivation {
        pname = "VKHS";
-       version = "0.5.3";
-       sha256 = "06wjfnmws68mgflszsrd5f4g9x1vihvn8srym9ixgfv51m9hzl24";
+       version = "0.5.4";
+       sha256 = "0621x6mqa1qplswirxnzpzn24520qvl5ii1wyvqm8nfb69sbqzpg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -15176,8 +15185,8 @@ self: {
     ({ mkDerivation, base, hspec, parsec, process }:
      mkDerivation {
        pname = "ViennaRNAParser";
-       version = "1.2.2";
-       sha256 = "19ck0rgf4zxvk11zhfd0sbvjqln11cg4bzfp5z8zbqdnywhiqinw";
+       version = "1.2.4";
+       sha256 = "0gjn6sb7njd1mp211f3vk7ishc0fawl2npaq4np81pls7i24va8g";
        buildDepends = [ base parsec process ];
        testDepends = [ base hspec parsec ];
        description = "Libary for parsing ViennaRNA package output";
@@ -17131,6 +17140,7 @@ self: {
        testDepends = [
          base lens linear QuickCheck semigroupoids semigroups vector
        ];
+       jailbreak = true;
        description = "Abstractions for animation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18301,8 +18311,8 @@ self: {
     ({ mkDerivation, base, uglymemo, vector }:
      mkDerivation {
        pname = "align";
-       version = "0.1.0.0";
-       sha256 = "038zc4c9s0fpga1rpacmv5qvarn43lkhmkpcx6waxxa6gqnpv8i5";
+       version = "0.1.1.0";
+       sha256 = "02rgg0haaj9c4xlk351kz6l2lqa9mdrm9rjgxbh5hm43shriiffw";
        buildDepends = [ base uglymemo vector ];
        description = "Sequence alignment algorithms";
        license = stdenv.lib.licenses.bsd3;
@@ -18592,10 +18602,9 @@ self: {
     ({ mkDerivation, base, composition }:
      mkDerivation {
        pname = "altcomposition";
-       version = "0.2.1.0";
-       sha256 = "1j1kh4wylndyz0zs70v63x5gdhbwa9gpkn1vm108bhhjy79rgmnh";
+       version = "0.2.2.0";
+       sha256 = "0893802bwdmywl5jh5d6mdf7l4h4qyc5y53mp39xc5lx6dsiq1d9";
        buildDepends = [ base composition ];
-       jailbreak = true;
        homepage = "https://github.com/jcristovao/altcomposition";
        description = "Alternative combinators for unorthodox function composition";
        license = stdenv.lib.licenses.bsd3;
@@ -20058,9 +20067,9 @@ self: {
      mkDerivation {
        pname = "apiary-logger";
        version = "1.4.0";
-       revision = "2";
+       revision = "3";
        sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48";
-       editedCabalFile = "ce71ccd5e0a1f20777b17efdc536aab8f43a3468f54fa14609c635aa731ce944";
+       editedCabalFile = "03f6b1ac0e588631c2deed8459e527f935a74a86c15455c3f509270ba5bbd5f7";
        buildDepends = [
          apiary base data-default-class fast-logger lifted-base
          monad-control monad-logger transformers transformers-base
@@ -20411,8 +20420,8 @@ self: {
      }:
      mkDerivation {
        pname = "approximate";
-       version = "0.2.2";
-       sha256 = "1ym9f9vr83ks9lrdl54jaxw3ds2n943m6kqafwnzyypigcj3psxq";
+       version = "0.2.2.1";
+       sha256 = "1h09257l7rfy64fiwr4d1jyq6vcfhly3hrn314rkfp6rkzxpvh79";
        buildDepends = [
          base binary bytes cereal comonad deepseq ghc-prim hashable
          hashable-extras lens log-domain pointed safecopy semigroupoids
@@ -21554,8 +21563,8 @@ self: {
      }:
      mkDerivation {
        pname = "atom-basic";
-       version = "0.0.1.1";
-       sha256 = "0i39rnrfpq4k2p107grhhv0rka8qpd9bb7pvhrbks1m2dxb6pq2v";
+       version = "0.2.1";
+       sha256 = "1i3qjjn15h6n642b8prahd99fb9la2j4f0ci110bs8jydmacs36m";
        buildDepends = [
          base base64-bytestring bytestring network network-uri old-locale
          text time
@@ -21655,15 +21664,15 @@ self: {
      }:
      mkDerivation {
        pname = "atomic-write";
-       version = "0.2.0.3";
-       sha256 = "0hs157shwaqhqbd063wmfb8amkf2kppg7k4j0lhfflq1gzjbsprm";
+       version = "0.2.0.4";
+       sha256 = "1y09vyxv1fdlkzz7r27snrjhi19msqj06cjdwy7mgbjb6v7z46w9";
        buildDepends = [
          base bytestring directory filepath temporary text unix-compat
        ];
        testDepends = [
          base bytestring directory filepath hspec temporary text unix-compat
        ];
-       jailbreak = true;
+       homepage = "https://github.com/stackbuilders/atomic-write";
        description = "Atomically write to a file";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -21735,16 +21744,16 @@ self: {
      }:
      mkDerivation {
        pname = "attoparsec";
-       version = "0.13.0.0";
-       sha256 = "12b4xi6nlnhpwz8apn4mk880mkhcv1sfvf4j3z1h5dgkadi2zgbi";
+       version = "0.13.0.1";
+       sha256 = "0cprkr7bl4lrr80pz8mryb4rbfwdgpsrl7g0fbcaybhl8p5hm26f";
        buildDepends = [
          array base bytestring containers deepseq scientific text
          transformers
        ];
        testDepends = [
-         array base bytestring deepseq QuickCheck quickcheck-unicode
-         scientific test-framework test-framework-quickcheck2 text
-         transformers vector
+         array base bytestring containers deepseq QuickCheck
+         quickcheck-unicode scientific test-framework
+         test-framework-quickcheck2 text transformers vector
        ];
        homepage = "https://github.com/bos/attoparsec";
        description = "Fast combinator parsing for bytestrings and text";
@@ -22131,8 +22140,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "auto-update";
-       version = "0.1.2.1";
-       sha256 = "0cj1pjf22x02h3d1ln1p69g90kz2dfsiq04ahfq29jj4ny525lwp";
+       version = "0.1.2.2";
+       sha256 = "1ns4c5mqhnm7hsiqxf1ivjs5fflyq92b16ldzrcl0p85631h0c3v";
        buildDepends = [ base ];
        homepage = "https://github.com/yesodweb/wai";
        description = "Efficiently run periodic, on-demand actions";
@@ -22889,8 +22898,8 @@ self: {
      }:
      mkDerivation {
        pname = "b9";
-       version = "0.5.7";
-       sha256 = "1ffj3ql27826dv20pz98xg3wsaylfsrwgggwxwipw6l2jypk3z7i";
+       version = "0.5.8";
+       sha256 = "0r8gjgmy9v655kza2c6ilngr4glijizgjddq0125s11pd40hzhvi";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -23557,6 +23566,21 @@ self: {
        license = "unknown";
      }) {};
 
+  "base91" = callPackage
+    ({ mkDerivation, base, bytestring, QuickCheck, text }:
+     mkDerivation {
+       pname = "base91";
+       version = "0.2.0";
+       sha256 = "10pa2gz9kwp0a4h7kzgnhbf2v897lpq5n5v927adlav9kqc1i41y";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base bytestring text ];
+       testDepends = [ base bytestring QuickCheck text ];
+       homepage = "https://github.com/ajg/base91";
+       description = "A Base91 Encoder & Decoder";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bash" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
      , hxt-regex-xmlschema, mtl, SHA, shell-escape
@@ -24315,6 +24339,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bimap-server" = callPackage
+    ({ mkDerivation, aeson, base, bimap, binary, directory, http-types
+     , unix, wai, warp
+     }:
+     mkDerivation {
+       pname = "bimap-server";
+       version = "0.1.0.1";
+       sha256 = "0dgmiv1pzzrq22778a2l46knxfk5rh2vw331gcqhxx0jb23d3pq9";
+       buildDepends = [
+         aeson base bimap binary directory http-types unix wai warp
+       ];
+       description = "Two-column database server";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bimaps" = callPackage
     ({ mkDerivation, aeson, base, binary, cereal, containers, deepseq
      , hashable, primitive, QuickCheck, storable-tuple
@@ -27799,20 +27838,29 @@ self: {
      }:
      mkDerivation {
        pname = "bytes";
-       version = "0.15";
-       revision = "1";
-       sha256 = "0898qlpf74ax33hm6hbla9kcjrldk26sc5yj3gdp99yb3qb5swz6";
-       editedCabalFile = "94dc3ad697fbfd70c7cf77a2e0c9bf4307a0f396012738537b931fc3b4e58386";
+       version = "0.15.0.1";
+       sha256 = "1qlqih83bx2vh5g15wffh4v9cfb5lv6jkj6i1xncd2imw5ynfi08";
        buildDepends = [
          base binary bytestring cereal containers mtl text time transformers
          transformers-compat void
        ];
        testDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/analytics/bytes";
+       homepage = "https://github.com/ekmett/bytes";
        description = "Sharing code for serialization between binary and cereal";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "byteset" = callPackage
+    ({ mkDerivation, base, binary }:
+     mkDerivation {
+       pname = "byteset";
+       version = "0.1.1.0";
+       sha256 = "18dg863wbbjh95yial4gy6vi5spwygp0l7dfx6bj00lz4xdrqj8k";
+       buildDepends = [ base binary ];
+       description = "Set of bytes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bytestring_0_10_6_0" = callPackage
     ({ mkDerivation, base, byteorder, deepseq, directory, dlist
      , ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random
@@ -27880,8 +27928,8 @@ self: {
      }:
      mkDerivation {
        pname = "bytestring-conversion";
-       version = "0.3.0";
-       sha256 = "0wc5k0cis3hkd5hq875sbj39bf9c0gayyjmg638pnbc8x6v44fqm";
+       version = "0.3.1";
+       sha256 = "1y2fhwz632sp7n0iw87lz2g8vks4jgxz2kw99kysgivxfd4fmdqk";
        buildDepends = [
          attoparsec base bytestring case-insensitive double-conversion text
        ];
@@ -27890,7 +27938,7 @@ self: {
        ];
        homepage = "https://github.com/twittner/bytestring-conversion/";
        description = "Type-classes to convert values to and from ByteString";
-       license = "unknown";
+       license = stdenv.lib.licenses.mpl20;
      }) {};
 
   "bytestring-csv" = callPackage
@@ -30709,8 +30757,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.4.15";
-       sha256 = "1i01a4d835yqry9xz10ch4b0522avd1cwp18gf2capmcx49rllvq";
+       version = "6.4.16";
+       sha256 = "0mvd80gn6z8iyy8y43drjzmq479zh2zsz3swmlmgvmbvsb1kchlb";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -33016,8 +33064,8 @@ self: {
      }:
      mkDerivation {
        pname = "codecov-haskell";
-       version = "0.3.0";
-       sha256 = "0rvjplgrn5s4jg861gg2zx92lsb1p5qqwpnwzhz27ascvby978pf";
+       version = "0.4.0.2";
+       sha256 = "0y1vv9iayjvikjfp4y41m4gypybxd1lq3pv4154nvbjpfapmndsw";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -34034,12 +34082,11 @@ self: {
      }:
      mkDerivation {
        pname = "conceit";
-       version = "0.3.1.0";
-       sha256 = "1nllcnwjzf7brsmgrrqfil0fppqinysmwcpr1k5ralrhaabwk64l";
+       version = "0.3.2.0";
+       sha256 = "16pj90dnjn5v16ym2gglx895c9lc5qhrry4wydqyn4f0j7rm6drg";
        buildDepends = [
          base bifunctors exceptions mtl semigroupoids transformers void
        ];
-       jailbreak = true;
        description = "Concurrent actions that may fail";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -36146,8 +36193,8 @@ self: {
     ({ mkDerivation, array, base, containers, parallel }:
      mkDerivation {
        pname = "cpsa";
-       version = "2.5.0";
-       sha256 = "1pdcpgfxba55sg19awcds8l6lw48waaz4dh43dlyb666hmhb2adh";
+       version = "2.5.1";
+       sha256 = "1lgscv3jkfzr35fwx7aymsgjg3i3sszxdc0hxmrbna8ba509cizk";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ array base containers parallel ];
@@ -36222,8 +36269,8 @@ self: {
      }:
      mkDerivation {
        pname = "cql";
-       version = "3.0.3";
-       sha256 = "0bqr28rg7cacg2qypid6jpdxq273qafn3k5z6kgaksy7db69zxym";
+       version = "3.0.4";
+       sha256 = "0b4yfmfxb4j039s5il321bc65dmbcbxqvaiqk97ly4fcc8pmdld9";
        buildDepends = [
          base bytestring cereal Decimal iproute network template-haskell
          text time transformers uuid
@@ -36234,7 +36281,7 @@ self: {
        ];
        homepage = "https://github.com/twittner/cql/";
        description = "Cassandra CQL binary protocol";
-       license = "unknown";
+       license = stdenv.lib.licenses.mpl20;
      }) {};
 
   "cql-io" = callPackage
@@ -36246,8 +36293,8 @@ self: {
      }:
      mkDerivation {
        pname = "cql-io";
-       version = "0.14.3";
-       sha256 = "1yg1w4lbfjdj3hfsg8zvr4ajq5v0byvysmwl50355jppmxvgacrn";
+       version = "0.14.4";
+       sha256 = "09nkp0c8brh87x93ib5ss010kh2izzs05ad7gmf7q54zw6qxask2";
        buildDepends = [
          async auto-update base bytestring containers cql cryptohash
          data-default-class exceptions hashable iproute lens monad-control
@@ -37177,27 +37224,6 @@ self: {
      }) {};
 
   "cryptonite" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim
-     , integer-gmp, memory, tasty, tasty-hunit, tasty-kat
-     , tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "cryptonite";
-       version = "0.4";
-       sha256 = "0328nvw9k8bf6kc1h3kkhxgb1f4k5ay20439zszmlag6i3c3x9v2";
-       buildDepends = [
-         base bytestring deepseq ghc-prim integer-gmp memory
-       ];
-       testDepends = [
-         base byteable bytestring memory tasty tasty-hunit tasty-kat
-         tasty-quickcheck
-       ];
-       homepage = "https://github.com/vincenthz/cryptonite";
-       description = "Cryptography Primitives sink";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cryptonite_0_5" = callPackage
     ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim
      , integer-gmp, memory, tasty, tasty-hunit, tasty-kat
      , tasty-quickcheck
@@ -37268,8 +37294,8 @@ self: {
     ({ mkDerivation, base, csound-expression, transformers }:
      mkDerivation {
        pname = "csound-catalog";
-       version = "0.2.1";
-       sha256 = "0shbiykfxmh627bq9xf3zhs0x5g4q2d60vkw1gjqa8cgvl67v94n";
+       version = "0.2.2";
+       sha256 = "0rrd0gk6z16ydpn90i4siy3p7d1qxb14q022r3mqmj792c1v6z5p";
        buildDepends = [ base csound-expression transformers ];
        homepage = "https://github.com/anton-k/csound-catalog";
        description = "a gallery of Csound instruments";
@@ -37284,8 +37310,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression";
-       version = "4.7.1";
-       sha256 = "1zrllrj4jd26w7z080js2l9j939sbbcbp4zjdl37c68wsvc59qr9";
+       version = "4.8.1";
+       sha256 = "0mag076inyg9hs37anq7g7545wfjaphk831h8jj1fykp8iag95l4";
        buildDepends = [
          base Boolean colour csound-expression-dynamic
          csound-expression-opcodes csound-expression-typed data-default
@@ -37337,8 +37363,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-typed";
-       version = "0.0.7.5";
-       sha256 = "1cazjx5xa81zxjds8xg4xdqp42y0izs0gx07684bshcvsz2hp91s";
+       version = "0.0.7.6";
+       sha256 = "01zi1hychx6vinxpqh7zdcj6jrlcpp86v7cmdzzq42z44apg8d3y";
        buildDepends = [
          base Boolean colour containers csound-expression-dynamic
          data-default deepseq ghc-prim stable-maps temporal-media
@@ -37354,8 +37380,8 @@ self: {
     ({ mkDerivation, base, csound-expression, transformers }:
      mkDerivation {
        pname = "csound-sampler";
-       version = "0.0.6.1";
-       sha256 = "0gxgzhn8qrr59asrcclfwsnlmd2g3qy8pk1ah8ivn42g97c3r0mf";
+       version = "0.0.6.2";
+       sha256 = "0qgz3k6cw5hzp5la051xnmg3697p7yfdamn8r6mp7ca4fai311h0";
        buildDepends = [ base csound-expression transformers ];
        homepage = "https://github.com/anton-k/csound-sampler";
        description = "A musical sampler based on Csound";
@@ -38623,8 +38649,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "data-cell";
-       version = "1.0.0.1";
-       sha256 = "0x8laijzcglgg5rxk4516f8qiy6825djkxjwyyk35w44ikwv1gxj";
+       version = "1.0.0.2";
+       sha256 = "03liak61gr90i48rd4dlm5lhr8z9v02nn6kdy33sinbpm6313agr";
        buildDepends = [ base ];
        homepage = "https://github.com/zadarnowski/data-cell";
        description = "Generic cellular data representation library";
@@ -41138,12 +41164,12 @@ self: {
      }) {};
 
   "deterministic-game-engine" = callPackage
-    ({ mkDerivation, base, hspec }:
+    ({ mkDerivation, base, hspec, mtl }:
      mkDerivation {
        pname = "deterministic-game-engine";
-       version = "0.1.0.0";
-       sha256 = "0kapl7s59ma8dmip3rd9cvcd4d8gvq0b7r9sflqs8nchs09njhr2";
-       buildDepends = [ base ];
+       version = "0.2.1";
+       sha256 = "0igs10h0mj8xxw9z57icx4y7mb7ag6m4cg7qiqk3b41xipxqn1ig";
+       buildDepends = [ base mtl ];
        testDepends = [ base hspec ];
        homepage = "https://github.com/TGOlson/deterministic-game-engine";
        description = "Simple deterministic game engine";
@@ -41405,6 +41431,7 @@ self: {
          base containers diagrams-lib HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41423,6 +41450,7 @@ self: {
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl semigroups unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41464,6 +41492,7 @@ self: {
          base containers haskell-src-exts lens parsec QuickCheck tasty
          tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
@@ -41531,6 +41560,7 @@ self: {
          process semigroups system-filepath tagged text transformers
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
@@ -43059,8 +43089,8 @@ self: {
      }:
      mkDerivation {
        pname = "diversity";
-       version = "0.6.3.0";
-       sha256 = "176ichmxfkgjqrlpanpdbni54bzd6zp8hrqbknvg8cfa7faly2lx";
+       version = "0.7.0.0";
+       sha256 = "04zmqsdpplps0xnhndpvfhxq2mfhnxbj1nzspw28ky7pcps1w621";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -45354,13 +45384,12 @@ self: {
      }:
      mkDerivation {
        pname = "ekg";
-       version = "0.4.0.6";
-       sha256 = "0s3snpak9kighii4gsq9svc92qiqcr46jw0v02f98jgfqbi9wanc";
+       version = "0.4.0.7";
+       sha256 = "0isq39a1c8laiigxi5yqv7d6798xc828xh4p0zan0a6m6glrmygr";
        buildDepends = [
          aeson base bytestring ekg-core filepath network snap-core
          snap-server text time transformers unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/tibbe/ekg";
        description = "Remote monitoring of processes";
        license = stdenv.lib.licenses.bsd3;
@@ -45391,8 +45420,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-carbon";
-       version = "1.0.3";
-       sha256 = "0138r186w56qxkrm0akzx60j25gkhg0a9nbhhhjj3f3igaxjm6br";
+       version = "1.0.4";
+       sha256 = "0l1gg13wxyivcxcsmzq6wv7ma4vk6afxjmw7f9n9dc3zdga0v772";
        buildDepends = [
          base ekg-core network network-carbon text time unordered-containers
          vector
@@ -45843,6 +45872,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "emacs-keys" = callPackage
+    ({ mkDerivation, base, doctest, split, tasty, tasty-hspec
+     , tasty-quickcheck, template-haskell, th-lift, xkbcommon
+     }:
+     mkDerivation {
+       pname = "emacs-keys";
+       version = "0.0.2.0";
+       sha256 = "12zxvjmlp06rjlhb7iaz7qrzb7cr1rgqg5ql5vv3lkz7z84h82ph";
+       buildDepends = [ base split template-haskell th-lift xkbcommon ];
+       testDepends = [
+         base doctest tasty tasty-hspec tasty-quickcheck xkbcommon
+       ];
+       homepage = "https://github.com/cocreature/emacs-keys";
+       description = "library to parse emacs style keybinding into the modifiers and the chars";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "email" = callPackage
     ({ mkDerivation, array, base, bytestring, encoding, HaskellNet
      , hsemail, old-locale, old-time, parsec, process, time
@@ -46914,6 +46960,7 @@ self: {
        version = "1.1.0.1";
        sha256 = "1sf378qhmsxxazkk7nn1d7nvrq1ladsfvkzshqjwsnyl5pgj7sgq";
        buildDepends = [ ad base distributive lens linear reflection ];
+       jailbreak = true;
        homepage = "https://github.com/GaloisInc/estimator";
        description = "State-space estimation algorithms such as Kalman Filters";
        license = stdenv.lib.licenses.bsd3;
@@ -48118,10 +48165,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-logger";
-       version = "2.3.1";
-       revision = "1";
-       sha256 = "02smmj62jir0c4ix929xy7zsd03djp53hxps0wgqga1f123gksri";
-       editedCabalFile = "9823350b03eb3ff26c7088f9ea871ff54996b4545f534c268d988f72a126ccea";
+       version = "2.4.0";
+       sha256 = "1hh5rll2q4dpshplyk0hciknvypx3v2hd102hf0f2z5h70d4xzsc";
        buildDepends = [
          array auto-update base bytestring bytestring-builder directory
          filepath text
@@ -50570,6 +50615,7 @@ self: {
        version = "0.4.0.1";
        sha256 = "1qchmhn6hp91gzds6yqjn4kssp7n3g7vqhl919wf8d3nn4ykz3av";
        buildDepends = [ base containers data-default-class lens linear ];
+       jailbreak = true;
        description = "Simple force-directed layout";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55348,8 +55394,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-oauth2";
-       version = "0.1.0";
-       sha256 = "0sn86raxvgzp4hjmg5b0gm5ibhiys5jimvxgds13qxbgrgcvvwh6";
+       version = "0.2.0";
+       sha256 = "15aqwbr8wb1ghzy0r0k3fvfr187d9s3zz21lp07ci9pyz8ln8z08";
        buildDepends = [ aeson base bytestring HTTP http-conduit ];
        testDepends = [
          base bytestring hspec http-conduit http-types load-env
@@ -60687,22 +60733,19 @@ self: {
   "haskell-awk" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, doctest
      , easy-file, exceptions, filepath, haskell-src-exts, hint, hspec
-     , HUnit, MonadCatchIO-mtl, mtl, network, process, stringsearch
-     , temporary, test-framework, test-framework-hunit, time
-     , transformers
+     , HUnit, mtl, network, process, stringsearch, temporary
+     , test-framework, test-framework-hunit, time, transformers
      }:
      mkDerivation {
        pname = "haskell-awk";
-       version = "1.1";
-       revision = "3";
-       sha256 = "0ic21rfm35jp7476pm6ggkp4faqsn9rhvzb58b497ilgj9wzv1dp";
-       editedCabalFile = "dda4e94c57a8fce2f7d269dc09363ee84b71b33863bf1601347fa5a4b1a55698";
+       version = "1.1.1";
+       sha256 = "0s6vzfsqh2wwsp98l8zpg6cvh7jwz5wha44idz3yavhmy6z08zgd";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base bytestring containers directory easy-file exceptions filepath
-         haskell-src-exts hint MonadCatchIO-mtl mtl network process
-         stringsearch time transformers
+         haskell-src-exts hint mtl network process stringsearch time
+         transformers
        ];
        testDepends = [
          base bytestring containers directory doctest easy-file exceptions
@@ -60710,7 +60753,6 @@ self: {
          stringsearch temporary test-framework test-framework-hunit time
          transformers
        ];
-       jailbreak = true;
        description = "Transform text from the command-line using Haskell expressions";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63412,17 +63454,17 @@ self: {
 
   "hdevtools" = callPackage
     ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc
-     , ghc-paths, network, syb, time, unix
+     , ghc-paths, network, process, syb, time, unix
      }:
      mkDerivation {
        pname = "hdevtools";
-       version = "0.1.0.9";
-       sha256 = "0wwwsh0fi16j5ybsqplwzr0srijjlqs8ywjakqnh25xsvjzmlh66";
+       version = "0.1.1.9";
+       sha256 = "0cwgm4yws4irrrpk2jvgvgr74w7gn9ilcidb9flkxfh7kqwsjxac";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base Cabal cmdargs directory filepath ghc ghc-paths network syb
-         time unix
+         base Cabal cmdargs directory filepath ghc ghc-paths network process
+         syb time unix
        ];
        homepage = "https://github.com/schell/hdevtools/";
        description = "Persistent GHC powered background server for FAST haskell development tools";
@@ -68175,22 +68217,22 @@ self: {
 
   "hpack" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat, deepseq
-     , directory, filepath, hspec, interpolate, mockery, text
+     , directory, filepath, Glob, hspec, interpolate, mockery, text
      , unordered-containers, yaml
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.4.0";
-       sha256 = "01wqf30zdcgra5vj7d3378lmjh26z1g3z9qp746ly45yz0rpryz2";
+       version = "0.5.1";
+       sha256 = "1bbmwan9la5agys1jw95z1immy36pgk93n5x90vsm674dwcj5hrk";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson base base-compat deepseq directory filepath text
+         aeson base base-compat deepseq directory filepath Glob text
          unordered-containers yaml
        ];
        testDepends = [
-         aeson aeson-qq base base-compat deepseq directory filepath hspec
-         interpolate mockery text unordered-containers yaml
+         aeson aeson-qq base base-compat deepseq directory filepath Glob
+         hspec interpolate mockery text unordered-containers yaml
        ];
        homepage = "https://github.com/sol/hpack#readme";
        description = "An alternative format for Haskell packages";
@@ -68472,8 +68514,8 @@ self: {
      }:
      mkDerivation {
        pname = "hprotoc";
-       version = "2.1.0";
-       sha256 = "18a4wc22yqbqx2n62935q3i9y4kkcxk8r5kcphhbqmzcxf20x7gr";
+       version = "2.1.3";
+       sha256 = "1fy2bnk8jlakfgvap9ma5qxyvqgl25dbqk7a7n9m4q0z8ba0s1di";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -69329,8 +69371,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsb2hs";
-       version = "0.3";
-       sha256 = "16awid7ybqbnja77swphq3csg476pk8l6ygjl5r5ndprahzkdrh5";
+       version = "0.3.1";
+       sha256 = "1n7rj2q87j544d82alxhrsqhz4ix8qpwxpw3l2np7wjl0n101n4a";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -70111,8 +70153,8 @@ self: {
     ({ mkDerivation, base, HUnit, mtl }:
      mkDerivation {
        pname = "hset";
-       version = "1.0.0";
-       sha256 = "16180gzms34fh5s2byp5disazi2bww022dln4q7lv523css3mrcf";
+       version = "1.0.1";
+       sha256 = "1iix3syq0cvpiwf6qr6hvcxii6qlzwqcnm416pvndcm7ymkhw04v";
        buildDepends = [ base mtl ];
        testDepends = [ base HUnit mtl ];
        homepage = "https://bitbucket.org/s9gf4ult/hset";
@@ -70126,8 +70168,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsexif";
-       version = "0.6.0.2";
-       sha256 = "1a67cyzfiriyhyacihs47d0427yll91fmbs56fhk82k3mdi74a60";
+       version = "0.6.0.3";
+       sha256 = "02jpp2p8xmhmx6srpcm330k73x306h34ik2rdavfwpgw5mjk88hl";
        buildDepends = [
          base binary bytestring containers iconv text time
        ];
@@ -70709,20 +70751,22 @@ self: {
 
   "hsparql" = callPackage
     ({ mkDerivation, base, bytestring, containers, HTTP, http-types
-     , HUnit, MissingH, mtl, network, rdf4h, test-framework
+     , HUnit, MissingH, mtl, network, network-uri, rdf4h, test-framework
      , test-framework-hunit, text, wai, warp, xml
      }:
      mkDerivation {
        pname = "hsparql";
-       version = "0.2.5";
-       sha256 = "1rhkl5l414w6pp3q3x0pkahghyagq3fwlny61vn0rpxlyihcin42";
+       version = "0.2.6";
+       sha256 = "1vgdp4gz7zwh1n3iilg6kwdasfy4w48pjjgj6swr17k37irwzal4";
        buildDepends = [
-         base bytestring HTTP MissingH mtl network rdf4h text xml
+         base bytestring HTTP MissingH mtl network network-uri rdf4h text
+         xml
        ];
        testDepends = [
-         base containers http-types HUnit rdf4h test-framework
+         base containers http-types HUnit network-uri rdf4h test-framework
          test-framework-hunit text wai warp
        ];
+       jailbreak = true;
        homepage = "https://github.com/robstewart57/hsparql";
        description = "A SPARQL query generator and DSL, and a client to query a SPARQL server";
        license = stdenv.lib.licenses.bsd3;
@@ -70762,7 +70806,6 @@ self: {
        testDepends = [
          base directory hspec-core hspec-meta stringbuilder
        ];
-       doCheck = false;
        homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -71806,18 +71849,19 @@ self: {
      }) {};
 
   "htar" = callPackage
-    ({ mkDerivation, base, bytestring, bzlib, directory, filepath, tar
-     , time, zlib
+    ({ mkDerivation, base, bytestring, bzlib, directory, filepath
+     , old-locale, tar, time, zlib
      }:
      mkDerivation {
        pname = "htar";
-       version = "0.4.0.1";
-       sha256 = "17zxk0fig5sh967zz33k8as132i2ghazpj5w93vl6hw8d1hrj2n6";
+       version = "0.4.0.2";
+       sha256 = "15m57vq0hcfk2dqamh2c624icv3smcqjgswy58glcclxz7f8ly3z";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base bytestring bzlib directory filepath tar time zlib
+         base bytestring bzlib directory filepath old-locale tar time zlib
        ];
+       jailbreak = true;
        description = "Command-line tar archive utility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72743,25 +72787,26 @@ self: {
      }) {};
 
   "http2" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, array, base, blaze-builder
-     , bytestring, containers, directory, doctest, filepath, Glob, hex
-     , hspec, PSQueue, text, unordered-containers, vector, word8
+    ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
+     , bytestring-builder, containers, directory, doctest, filepath
+     , Glob, hex, hspec, mwc-random, stm, text, unordered-containers
+     , vector, word8
      }:
      mkDerivation {
        pname = "http2";
-       version = "0.9.1";
-       sha256 = "1aqc8rhnh1l3f3fq6n9vjgamxjxjip52f9j01caaccrylahy57mm";
+       version = "1.0.1";
+       sha256 = "1iw1k3xs79xfzwgykpbyvfsdns4ljfmvf1v98jjklimrzsmlsgz3";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson aeson-pretty array base blaze-builder bytestring containers
-         directory filepath hex PSQueue text unordered-containers vector
-         word8
+         aeson aeson-pretty array base bytestring bytestring-builder
+         containers directory filepath hex mwc-random stm text
+         unordered-containers vector word8
        ];
        testDepends = [
-         aeson aeson-pretty array base blaze-builder bytestring containers
-         directory doctest filepath Glob hex hspec PSQueue text
-         unordered-containers vector word8
+         aeson aeson-pretty array base bytestring bytestring-builder
+         containers directory doctest filepath Glob hex hspec mwc-random stm
+         text unordered-containers vector word8
        ];
        description = "HTTP/2.0 library including frames and HPACK";
        license = stdenv.lib.licenses.bsd3;
@@ -74098,10 +74143,8 @@ self: {
      }:
      mkDerivation {
        pname = "hyperloglog";
-       version = "0.3.1";
-       revision = "1";
-       sha256 = "13pmqkqldy5n274rld9acdypp39f51qmc9v14kwpw95lkpd9bxnl";
-       editedCabalFile = "9656873f269cef1f68eaa95e106bb49f6f5f5538bef06d82244d566e344c3ef6";
+       version = "0.3.3";
+       sha256 = "033841498nnlczypd87xjwlxcka9w5cj7881qpb94xd0dwllagnc";
        buildDepends = [
          approximate base binary bits bytes cereal cereal-vector comonad
          deepseq distributive generic-deriving hashable hashable-extras lens
@@ -75456,8 +75499,11 @@ self: {
      mkDerivation {
        pname = "index-core";
        version = "1.0.2";
+       revision = "1";
        sha256 = "0sj69r9mavw1s17lhh7af9n5vrb60gk5lm6v593sp0rs77canldw";
+       editedCabalFile = "97808339bd2ac8a5c79ed99e716e2e8e941234421fde3930b370e0bbc734b063";
        buildDepends = [ base ];
+       jailbreak = true;
        description = "Indexed Types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76544,10 +76590,8 @@ self: {
      }:
      mkDerivation {
        pname = "iproute";
-       version = "1.4.0";
-       revision = "1";
-       sha256 = "00f4xddz9js73bsy15zsznmnad2psq7wg1ha7pmhdmdw5zlmqvad";
-       editedCabalFile = "c3781d19d6853f9d7c8308f716521cfe3e4d2c2851d91025e1d75003ca5cd35b";
+       version = "1.5.0";
+       sha256 = "0mr5dwzvsik5v59fy5lpnj6qabgc8cwbybil5hb6gqqvd0y26fz3";
        buildDepends = [ appar base byteorder containers network ];
        testDepends = [
          appar base byteorder containers doctest hspec network QuickCheck
@@ -77588,18 +77632,18 @@ self: {
   "jammittools" = callPackage
     ({ mkDerivation, base, boxes, bytestring, conduit, conduit-audio
      , containers, directory, filepath, HPDF, JuicyPixels, process
-     , property-list, resourcet, temporary, transformers, vector
+     , resourcet, temporary, text, transformers, vector, xml
      }:
      mkDerivation {
        pname = "jammittools";
-       version = "0.4.1.1";
-       sha256 = "0caqvq7pl0jbka915xqy3sljjmwc2adk1hkm2775vnsvswh9nysg";
+       version = "0.5";
+       sha256 = "1rjmwxp078mq47b879ylfz4g2p9irgh4jrrg1vknwham46nj8hzn";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base boxes bytestring conduit conduit-audio containers directory
-         filepath HPDF JuicyPixels process property-list resourcet temporary
-         transformers vector
+         filepath HPDF JuicyPixels process resourcet temporary text
+         transformers vector xml
        ];
        homepage = "https://github.com/mtolly/jammittools";
        description = "Export sheet music and audio from Windows/Mac app Jammit";
@@ -78352,8 +78396,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc-client";
-       version = "0.1.4.0";
-       sha256 = "1lcjwf6j6j3azrrmbdhffm8a27d6gn48zrgp3w89x9ckgflyby22";
+       version = "0.2.0.0";
+       sha256 = "13mc23dpyn9zsv1gfb913g8w8csjgnk5xrbbyhxgmam9kslpbxjj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -78365,6 +78409,7 @@ self: {
          scientific test-framework test-framework-hunit
          test-framework-quickcheck2 text unordered-containers vector
        ];
+       homepage = "https://github.com/grayjay/json-rpc-client";
        description = "JSON-RPC 2.0 on the client side.";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -78376,8 +78421,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc-server";
-       version = "0.1.6.0";
-       sha256 = "0qlmv4l0p70rij18m380myw2p1mhdq432kc0yky3n8rx8n29dlfq";
+       version = "0.2.0.0";
+       sha256 = "08v2bvswn0a0jhd0gd83f2lxr0n0nirl9xav7zj3y3bjdkxwlkys";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -78387,6 +78432,7 @@ self: {
          aeson base bytestring HUnit mtl test-framework test-framework-hunit
          text unordered-containers vector
        ];
+       homepage = "https://github.com/grayjay/json-rpc-server";
        description = "JSON-RPC 2.0 on the server side.";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -81828,7 +81874,7 @@ self: {
 
   "leksah" = callPackage
     ({ mkDerivation, array, base, binary, binary-shared, blaze-html
-     , bytestring, Cabal, conduit, containers, deepseq, directory
+     , bytestring, Cabal, conduit, containers, cpphs, deepseq, directory
      , executable-path, filepath, ghc, ghcjs-codemirror, ghcjs-dom, gio
      , glib, gtk3, gtksourceview3, hamlet, haskell-src-exts, hlint
      , hslogger, jsaddle, leksah-server, lens, ltk, monad-loops, mtl
@@ -81839,13 +81885,13 @@ self: {
      }:
      mkDerivation {
        pname = "leksah";
-       version = "0.15.0.5";
-       sha256 = "0k2mbhzjjs8a6bg83iwsjw454pm42179wr2l4vh35cvc5bxii33w";
+       version = "0.15.0.6";
+       sha256 = "0hr0d4cl0gh58svpk9dji00rsypkplndd5q5av4bx2v34bx0v0rh";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          array base binary binary-shared blaze-html bytestring Cabal conduit
-         containers deepseq directory executable-path filepath ghc
+         containers cpphs deepseq directory executable-path filepath ghc
          ghcjs-codemirror ghcjs-dom gio glib gtk3 gtksourceview3 hamlet
          haskell-src-exts hlint hslogger jsaddle leksah-server lens ltk mtl
          network network-uri old-time parsec pretty pretty-show QuickCheck
@@ -81874,8 +81920,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah-server";
-       version = "0.15.0.3";
-       sha256 = "1lh4jwm6x5axhhv5micd03wgv063p71z6vdmszsjpkhfsi9pmgh3";
+       version = "0.15.0.4";
+       sha256 = "0zjdzsv9vwhsabkkyf47gfsca4b1yqjgd2vlvb0qm7ca9gymd0ic";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -81913,25 +81959,25 @@ self: {
      }) {};
 
   "lens" = callPackage
-    ({ mkDerivation, array, base, bifunctors, bytestring, comonad
-     , containers, contravariant, deepseq, directory, distributive
-     , doctest, exceptions, filepath, free, generic-deriving, ghc-prim
-     , hashable, hlint, HUnit, kan-extensions, mtl, nats, parallel
-     , profunctors, QuickCheck, reflection, semigroupoids, semigroups
-     , simple-reflect, tagged, template-haskell, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, text, transformers, transformers-compat
-     , unordered-containers, vector, void
+    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
+     , comonad, containers, contravariant, deepseq, directory
+     , distributive, doctest, exceptions, filepath, free
+     , generic-deriving, ghc-prim, hashable, hlint, HUnit
+     , kan-extensions, mtl, nats, parallel, profunctors, QuickCheck
+     , reflection, semigroupoids, semigroups, simple-reflect, tagged
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, test-framework-th, text, transformers
+     , transformers-compat, unordered-containers, vector, void
      }:
      mkDerivation {
        pname = "lens";
-       version = "4.11";
-       sha256 = "1699jbsdgffnhzpy6c2k6ld13crqibm7vc3x2gx95gwzx5hlccxm";
+       version = "4.11.1";
+       sha256 = "1f3xyz9y6510nbskc15brjdg226qpwgjnzddc29kg0g79x5wwcpi";
        buildDepends = [
-         array base 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
+         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
        ];
        testDepends = [
@@ -82077,8 +82123,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens-simple";
-       version = "0.1.0.6";
-       sha256 = "097zxi3g9ziadiwg4sk96gfjv0jrv4sd3kkpv1hdwjqw1x1dknd3";
+       version = "0.1.0.7";
+       sha256 = "08ynx0zhll603srdmgqf9pgdbzn4i9ry99hs7m35kwaj21whrq5q";
        buildDepends = [
          base lens-family lens-family-core lens-family-th mtl transformers
        ];
@@ -83274,10 +83320,8 @@ self: {
      }:
      mkDerivation {
        pname = "linear";
-       version = "1.18.1.1";
-       revision = "2";
-       sha256 = "1qgpv6c3q4ljqc3223iyj49piqs9xx58zmnpvg76wkaygsnnzq9p";
-       editedCabalFile = "8c57bd840e0c9ab84b032d65a2a48ed6d20da4fb780f0d89d8c53adccc632ba4";
+       version = "1.19";
+       sha256 = "1i5wbp6dbmdmys6scqyn0iiz4qhsj6m4v2ipicqx7nrl490vbivf";
        buildDepends = [
          adjunctions base binary bytes cereal containers deepseq
          distributive ghc-prim hashable lens reflection semigroupoids
@@ -84540,14 +84584,14 @@ self: {
        homepage = "http://github.com/dmbarbour/haskell-lmdb";
        description = "Lightning MDB bindings";
        license = stdenv.lib.licenses.bsd2;
-     }) { lmdb = null;};
+     }) { inherit (pkgs) lmdb;};
 
   "load-env" = callPackage
     ({ mkDerivation, base, directory, hspec, HUnit, parsec }:
      mkDerivation {
        pname = "load-env";
-       version = "0.1.0";
-       sha256 = "1yvnb42i1pzmvs2mjfjl8crxyr6ghw00dhrv548pmks1q5md8z75";
+       version = "0.1.1";
+       sha256 = "05pxxplp96pcnzk61xcckxnxljl3hjl13ckn4xrr93zmlw49rqwg";
        buildDepends = [ base directory parsec ];
        testDepends = [ base directory hspec HUnit parsec ];
        description = "Load environment variables from a file";
@@ -84709,8 +84753,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-domain";
-       version = "0.10.1";
-       sha256 = "0gbs902l5fh5pqhcj31g0a5d2irjx11sw3jhk69c9hcfssclnd8h";
+       version = "0.10.1.1";
+       sha256 = "084mzaha7g00yxxy4hgl2dia73hzch91961gjvrb20wv6zxf8f7g";
        buildDepends = [
          base binary bytes cereal comonad deepseq distributive
          generic-deriving hashable hashable-extras safecopy semigroupoids
@@ -87873,8 +87917,8 @@ self: {
      }:
      mkDerivation {
        pname = "metrics";
-       version = "0.3.0.1";
-       sha256 = "1mj4x5pq9mch71vk5cqi2wjaqjhgsllvjbsz7yyv6sg4cps63d8l";
+       version = "0.3.0.2";
+       sha256 = "00iwairgi9lvb4f8iz4d834v8vq1f4awr34nl72fbkqgccdq1whd";
        buildDepends = [
          ansi-terminal base bytestring containers lens mtl mwc-random
          primitive text time unix unordered-containers vector
@@ -88208,8 +88252,8 @@ self: {
      }:
      mkDerivation {
        pname = "mighttpd2";
-       version = "3.2.8";
-       sha256 = "07fjmflyblyhrkj0477d83dqfkvcq4g2sh7g40x5yr3iawi1kdsp";
+       version = "3.2.9";
+       sha256 = "0gxdf9xkw1w4cdb8cdq1slj5x1ch39kxrqhnaxdkb8w4jdxqbj5p";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -89294,8 +89338,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-logger";
-       version = "0.3.13.1";
-       sha256 = "0mwdihxly22axrjs9g741zab2yyrm6zy73di99m7lvg8jdj4m2r6";
+       version = "0.3.13.2";
+       sha256 = "1cp2npa5mzn3yss1di151ikw7hx4slc99cvx8gipdwp1696kqf61";
        buildDepends = [
          base blaze-builder bytestring conduit conduit-extra exceptions
          fast-logger lifted-base monad-control monad-loops mtl resourcet stm
@@ -93116,8 +93160,8 @@ self: {
      }:
      mkDerivation {
        pname = "network";
-       version = "2.6.2.0";
-       sha256 = "0szkzllpc6vs72fz7nykf5y7vc8mvqfv6h4sshfwmdazl2zv03n5";
+       version = "2.6.2.1";
+       sha256 = "1yhvpd4wigz165jvyvw9zslx7lgqdj63jh3zv5s74b5ykdfa3zd3";
        buildDepends = [ base bytestring unix ];
        testDepends = [
          base bytestring HUnit test-framework test-framework-hunit
@@ -95380,8 +95424,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "old-version";
-       version = "1.3.1";
-       sha256 = "19rra617l1rfixpc7s29q1frjk6zlbmp06gzcv03g3hv3f7c4hcf";
+       version = "1.3.2";
+       sha256 = "0mh8xkcwx7p0vrg8gqza019k4faw7zw703mrin8ii85igq9sg70i";
        buildDepends = [ base ];
        jailbreak = true;
        description = "Basic versioning library";
@@ -97058,7 +97102,7 @@ self: {
          process QuickCheck syb test-framework test-framework-hunit
          test-framework-quickcheck2 text zip-archive
        ];
-       configureFlags = [ "-fhttps" "-fmake-pandoc-man-pages" ];
+       configureFlags = [ "-fhttps" ];
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
        license = "GPL";
@@ -97384,12 +97428,11 @@ self: {
      }:
      mkDerivation {
        pname = "parcom-lib";
-       version = "0.8.0.2";
-       sha256 = "14afqaq4r556rf1wmjd14682dph8ji2b9r4dx1mjlxyr096l84h6";
+       version = "0.8.0.3";
+       sha256 = "0xkxkqswpkqr9xcpg52v845kkxg8z20r26yih8l2vwkym5cj49ab";
        buildDepends = [
          base bytestring containers mtl text transformers utf8-string word8
        ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/tdammers/parcom-lib";
        description = "A simple parser-combinator library, a bit like Parsec but without the frills";
        license = stdenv.lib.licenses.bsd3;
@@ -99720,8 +99763,8 @@ self: {
     ({ mkDerivation, base, enumerator, pipes, transformers }:
      mkDerivation {
        pname = "pipe-enumerator";
-       version = "0.3.0.1";
-       sha256 = "1nma4pjc472nc9g8b626k7f01rl8z9hsd7j8wsa1ir3r7jb5jpwp";
+       version = "0.3.0.2";
+       sha256 = "0h6k00k85pn0jajk3rvvfnrfwlkllprhv00x0qd9zg9gg7lf7zkc";
        buildDepends = [ base enumerator pipes transformers ];
        homepage = "https://github.com/zadarnowski/pipe-enumerator";
        description = "A bidirectional bridge between pipes and iteratees";
@@ -99869,6 +99912,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-cellular" = callPackage
+    ({ mkDerivation, base, bytestring, data-cell, pipes }:
+     mkDerivation {
+       pname = "pipes-cellular";
+       version = "0.0.0.1";
+       sha256 = "0j0ayzvc9k3fmd9j37p41z50nqp4hwyywashcvng23qgp7m4ahdc";
+       buildDepends = [ base bytestring data-cell pipes ];
+       homepage = "https://github.com/zadarnowski/pipes-cellular";
+       description = "Pipes-based combinators for cellular data processing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "pipes-cellular-csv" = callPackage
+    ({ mkDerivation, base, bytestring, data-cell, pipes, pipes-cellular
+     }:
+     mkDerivation {
+       pname = "pipes-cellular-csv";
+       version = "1.0.0.0";
+       sha256 = "1lzism9rrs1569lhbjl6b49c461igmpgvxq6pnnpfvnqbps56vc9";
+       buildDepends = [ base bytestring data-cell pipes pipes-cellular ];
+       homepage = "https://github.com/zadarnowski/pipes-cellular-csv";
+       description = "Efficient pipes-based cellular CSV codec";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipes-cereal-plus" = callPackage
     ({ mkDerivation, base, bytestring, cereal-plus, errors, mtl, pipes
      , pipes-bytestring, text
@@ -100197,8 +100265,8 @@ self: {
     ({ mkDerivation, base, pipes, transformers }:
      mkDerivation {
        pname = "pipes-parse";
-       version = "3.0.2";
-       sha256 = "1d5lhh8knk0hmvd9wv2ihs5z9ybyvhd1n7qaazqkazqkyl14pd08";
+       version = "3.0.3";
+       sha256 = "00sslgh1h1n114adc0k2w23wk19pzmf2mh5zn37w40jdganrhlpm";
        buildDepends = [ base pipes transformers ];
        description = "Parsing infrastructure for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
@@ -101644,6 +101712,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "postgresql-cube" = callPackage
+    ({ mkDerivation, base, bytestring, postgresql-simple }:
+     mkDerivation {
+       pname = "postgresql-cube";
+       version = "0.1.0.0";
+       sha256 = "0jla8rxnrk995qxyp5dgwm2d6yrcafyz5mj7yqr6v5jyzh6b59c3";
+       buildDepends = [ base bytestring postgresql-simple ];
+       description = "Cube support for postgresql-simple";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "postgresql-libpq" = callPackage
     ({ mkDerivation, base, bytestring, postgresql }:
      mkDerivation {
@@ -101690,8 +101769,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-query";
-       version = "1.3.1";
-       sha256 = "19lzpxdfvidhrmmay2g3vxdbx9zcnp6r949lind04wbwwy3pbb0c";
+       version = "1.4.0";
+       sha256 = "0ba5sslcjmfvjm1s3sf1ym7lgzgxx0p5gzdgby1r2y20i5cswfsr";
        buildDepends = [
          aeson attoparsec base blaze-builder bytestring containers
          data-default either exceptions file-embed haskell-src-meta hreader
@@ -102895,8 +102974,8 @@ self: {
      }:
      mkDerivation {
        pname = "process-streaming";
-       version = "0.7.2.1";
-       sha256 = "118ig98xi2jdh966483d37wx5wa5mcm7qyfnrb1xszw2nqcivvvx";
+       version = "0.7.2.2";
+       sha256 = "0jmhl7jdrznbf9w9cpwh98apghhcnb9vadj94sjxfh288k21ckb3";
        buildDepends = [
          base bifunctors bytestring conceit containers contravariant foldl
          free pipes pipes-bytestring pipes-concurrency pipes-parse
@@ -102910,7 +102989,6 @@ self: {
          pipes-safe pipes-text process semigroups tasty tasty-hunit text
          transformers transformers-compat void
        ];
-       jailbreak = true;
        description = "Streaming interface to system processes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103329,10 +103407,8 @@ self: {
     ({ mkDerivation, base, mtl, transformers, transformers-compat }:
      mkDerivation {
        pname = "prompt";
-       version = "0.1.0.0";
-       revision = "3";
-       sha256 = "16gnd5spccfjl6q6ybxciy9am5bkrzssi13dxl73zyklj37nf9hq";
-       editedCabalFile = "dc64376a5e4f99f5ef13edbcac5d80610d73f78d4362b9acf75cf90af485f3f9";
+       version = "0.1.1.0";
+       sha256 = "13ayvs1irsa1hqy6y6ca99dr20vwvy9g10zjrqshvj48i5ra2j4g";
        buildDepends = [ base mtl transformers transformers-compat ];
        homepage = "https://github.com/mstksg/prompt";
        description = "Monad (and transformer) for deferred-effect pure prompt-response queries";
@@ -103521,8 +103597,8 @@ self: {
      }:
      mkDerivation {
        pname = "protocol-buffers";
-       version = "2.1.0";
-       sha256 = "11shs04gv2b9xx13izc6bkgqvvs7gv8k05vviyhscj5rpiihl9zi";
+       version = "2.1.3";
+       sha256 = "1ys0291js4mdfxqjk09lrmf33g7dh4rzq562f471ac98zwc5q588";
        buildDepends = [
          array base binary bytestring containers directory filepath mtl
          parsec syb utf8-string
@@ -103537,8 +103613,8 @@ self: {
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
        pname = "protocol-buffers-descriptor";
-       version = "2.1.0";
-       sha256 = "1id9pz8mxn7c6z433zib55fkx0s46316y6n2wpjk9zld21a2z5hy";
+       version = "2.1.3";
+       sha256 = "04iw8bfq9i89xvx2dn16cwv4w9zv3ljgngm6aac6imp7za4mvjzf";
        buildDepends = [ base bytestring containers protocol-buffers ];
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
@@ -105000,6 +105076,42 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "quiver" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "quiver";
+       version = "0.0.0.6";
+       sha256 = "0g9qfspzamxxn8zvl698g9f8y3alm4js7i7k9wa737pgv47lzqbz";
+       buildDepends = [ base ];
+       homepage = "https://github.com/zadarnowski/quiver";
+       description = "Quiver finite stream processing library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "quiver-bytestring" = callPackage
+    ({ mkDerivation, base, bytestring, quiver }:
+     mkDerivation {
+       pname = "quiver-bytestring";
+       version = "0.0.0.1";
+       sha256 = "03lw2yi4a3d5nd7xqlcs4pmf0rcbfw3n4s36wgaxy4wn3bhh3300";
+       buildDepends = [ base bytestring quiver ];
+       homepage = "https://github.com/zadarnowski/quiver-bytestring";
+       description = "Quiver combinators for bytestring streaming";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "quiver-cell" = callPackage
+    ({ mkDerivation, base, data-cell, quiver }:
+     mkDerivation {
+       pname = "quiver-cell";
+       version = "0.0.0.1";
+       sha256 = "1bz74xigj99v9hh4i6m6z4h9f0l09rnbs108npnl953v0bqi44qi";
+       buildDepends = [ base data-cell quiver ];
+       homepage = "https://github.com/zadarnowski/quiver-cell";
+       description = "Quiver combinators for cellular data processing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "quoridor-hs" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , directory, dlist, exceptions, filepath, hex, HUnit, mtl, network
@@ -107484,8 +107596,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.5.1.0";
-       sha256 = "03n0jg79zirbq2rbp4gpbnr4lrmcv38pv7887d8qi2bm692z5qg5";
+       version = "0.5.1.1";
+       sha256 = "1gs2ip483paqw01wipd5x5vf27l1w887dv7ah0icgjshwg84ff1p";
        buildDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -107522,8 +107634,8 @@ self: {
     ({ mkDerivation, base, relational-query, relational-query-HDBC }:
      mkDerivation {
        pname = "relational-record";
-       version = "0.1.1.0";
-       sha256 = "1rxwlp49a1i4y2qnzjwjwp92ggphd92ikcgxpmkiw6a6frspy3zs";
+       version = "0.1.2.0";
+       sha256 = "00cb3yb4gin6kq7yz3jbkhm372z3vhq97h2l1xk0xja8xi8mfhn6";
        buildDepends = [ base relational-query relational-query-HDBC ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Meta package of Relational Record";
@@ -107538,8 +107650,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-record-examples";
-       version = "0.2.0.0";
-       sha256 = "0gm9gpyhhvlxzw6xykmlw6qhinjfnq5x9fny4yhfi1mfp80gwfhx";
+       version = "0.2.0.2";
+       sha256 = "0jpzn739xl1ylz6aja1czvkg4gjbgkag56pcja31mfx9xiv5jnmf";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -108206,14 +108318,13 @@ self: {
      }:
      mkDerivation {
        pname = "resolve-trivial-conflicts";
-       version = "0.2.0.2";
-       sha256 = "1xfafd85q7mk3lb9xy7wfishg3zfzhnvrbzd6r5akmpbpgvf2ddk";
+       version = "0.3.0.1";
+       sha256 = "1a045adxq1n2xjff9ccw6nfb87867w54pihmbybxcwfnkr6ymq26";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          ansi-terminal base Diff directory filepath mtl process unix
        ];
-       jailbreak = true;
        homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts";
        description = "Remove trivial conflict markers in a git repository";
        license = stdenv.lib.licenses.gpl2;
@@ -108434,8 +108545,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-gen";
-       version = "0.17.1";
-       sha256 = "0rblnqdqajlqkrf5dp03bj16y9nw0kkdjy8ry7j7f6mvkrdccbwl";
+       version = "0.17.1.1";
+       sha256 = "0gr5wv0gb2niq3i7ggzrr5g9hs3fwxss5hivw5ircrbp9s1xm7bl";
        buildDepends = [
          aeson base blaze-html Cabal code-builder directory fclabels
          filepath hashable haskell-src-exts HStringTemplate hxt json-schema
@@ -109979,8 +110090,8 @@ self: {
      }:
      mkDerivation {
        pname = "ruler";
-       version = "0.4.0.1";
-       sha256 = "1caca7353zhpfwrssp2pzmw8jk5sqjxh1nr2h6lpsy964kfa3m69";
+       version = "0.4.0.2";
+       sha256 = "1kcca2h3gvp63s9frnq4dmhaiw5pxhk5ji86bar0cwyrc9all8v5";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -110732,15 +110843,16 @@ self: {
      }) {};
 
   "satchmo" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, directory
-     , lens, minisat, mtl, process
+    ({ mkDerivation, array, async, base, bytestring, containers
+     , directory, minisat, mtl, process
      }:
      mkDerivation {
        pname = "satchmo";
-       version = "2.9.7.1";
-       sha256 = "1wrbf5mnk4f1m40dw2pyp66g76rvhqbxv7qwdx6lha2wjx7z1020";
+       version = "2.9.7.3";
+       sha256 = "1gkb3whi0sv51jxb3x4dpam532fv3wbn1dyp9sc2c7mdjnv24kn8";
        buildDepends = [
-         array base bytestring containers directory lens minisat mtl process
+         array async base bytestring containers directory minisat mtl
+         process
        ];
        testDepends = [ array base ];
        homepage = "https://github.com/jwaldmann/satchmo";
@@ -111384,31 +111496,6 @@ self: {
      }) {};
 
   "scotty" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring
-     , case-insensitive, data-default, hspec, hspec-wai, http-types
-     , lifted-base, monad-control, mtl, regex-compat, text, transformers
-     , transformers-base, wai, wai-extra, warp
-     }:
-     mkDerivation {
-       pname = "scotty";
-       version = "0.9.1";
-       revision = "2";
-       sha256 = "0w07ghnd7l8ibfbl8p74lwn8gxy3z28mp0rlv5crma3yh42irsqm";
-       editedCabalFile = "e37bd4bbb4da4e6d20bd8a29a5c3ca13476643e796a3463a20cbcbd2437bfde7";
-       buildDepends = [
-         aeson base blaze-builder bytestring case-insensitive data-default
-         http-types monad-control mtl regex-compat text transformers
-         transformers-base wai wai-extra warp
-       ];
-       testDepends = [
-         base bytestring hspec hspec-wai http-types lifted-base text wai
-       ];
-       homepage = "https://github.com/scotty-web/scotty";
-       description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "scotty_0_10_1" = callPackage
     ({ mkDerivation, aeson, async, base, blaze-builder, bytestring
      , case-insensitive, data-default-class, directory, hspec, hspec-wai
      , http-types, lifted-base, monad-control, mtl, nats, network
@@ -111756,12 +111843,11 @@ self: {
     ({ mkDerivation, base, SDL2, sdl2, SDL2_image }:
      mkDerivation {
        pname = "sdl2-image";
-       version = "0.1.3.1";
-       sha256 = "1czkx3b9grdka0plgpxrk48vygaxc9mfl772kjpm0wvvwgywk9sf";
+       version = "0.1.3.2";
+       sha256 = "0gps89yy4jzmlh5cdvs94mhmqlakqb99ldall3rirqdfhdv2wysj";
        buildDepends = [ base sdl2 ];
        extraLibraries = [ SDL2 ];
        pkgconfigDepends = [ SDL2 SDL2_image ];
-       jailbreak = true;
        description = "Haskell binding to sdl2-image";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111923,8 +112009,8 @@ self: {
      }:
      mkDerivation {
        pname = "second-transfer";
-       version = "0.5.5.0";
-       sha256 = "0l973282vvgr65iy2q7xrj608lsny3krdw4mx1ia9mfvga8ybrg8";
+       version = "0.5.5.1";
+       sha256 = "06ldrfzp96w7q99nhhhjhay6g0gsvg16x64hwjih1nswcj9rpl6x";
        buildDepends = [
          attoparsec base base16-bytestring binary bytestring conduit
          containers exceptions hashable hashtables hslogger http2 lens
@@ -111937,6 +112023,7 @@ self: {
        ];
        buildTools = [ cpphs ];
        extraLibraries = [ openssl ];
+       jailbreak = true;
        homepage = "https://www.httptwo.com/second-transfer/";
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
@@ -112654,8 +112741,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.4.2";
-       sha256 = "0zna0x70jlxa2nis4v6knqlyxxkyvv2lmwyixp31xhdcp1yl2lqh";
+       version = "0.4.3";
+       sha256 = "0mqiigf6bxrcnjgizv9kw23xf55ck453z2hz68pzqqbjzs34iqb4";
        buildDepends = [
          aeson attoparsec base bytestring bytestring-conversion
          case-insensitive http-media http-types network-uri
@@ -112675,8 +112762,8 @@ self: {
     ({ mkDerivation, base, blaze-html, http-media, servant }:
      mkDerivation {
        pname = "servant-blaze";
-       version = "0.4.2";
-       sha256 = "0jank0v3cp6cbr571q4pqdfxfbfzm5v8r6rq8csz9yfkhg6x97bg";
+       version = "0.4.3";
+       sha256 = "0pcdslar68yfviacrvyc6rb9d972m1irz4k7wd1xxnm5y60v0wyl";
        buildDepends = [ base blaze-html http-media servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Blaze-html support for servant";
@@ -112692,8 +112779,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.4.2";
-       sha256 = "0rcjqvx76mih4pfhxgrm30czznz68agdhflanqsslv2g33vzls55";
+       version = "0.4.3";
+       sha256 = "0baqrhhhfmyx0389abp503mhh8fjv18i3qhmdsvn46blb4c0cnkx";
        buildDepends = [
          aeson attoparsec base bytestring either exceptions http-client
          http-client-tls http-media http-types network-uri safe servant
@@ -112716,8 +112803,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.4.2";
-       sha256 = "1s70zrs8hiphz94vkcm9gim1xs4dj943a73d2jypyijd4p0k5q5j";
+       version = "0.4.3";
+       sha256 = "13rnn2z9bxrcrxqkndhnbkmsp27907lscsl4vrryxx37i94bf1qj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -112725,7 +112812,7 @@ self: {
          hashable http-media http-types lens servant string-conversions text
          unordered-containers
        ];
-       testDepends = [ aeson base hspec servant string-conversions ];
+       testDepends = [ aeson base hspec lens servant string-conversions ];
        homepage = "http://haskell-servant.github.io/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
@@ -112760,8 +112847,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-examples";
-       version = "0.4.2";
-       sha256 = "1nmgzkn0nv3p0bzr5ny0yx0g45fzf5qx7s868jp1nq7wbfd3yc0i";
+       version = "0.4.3";
+       sha256 = "0p57731ji84mikvymi458x27i4nk66046xmra6lrvc2fxs5gspmh";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -112782,8 +112869,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-jquery";
-       version = "0.4.2";
-       sha256 = "14ixqnxwm24gc457y0z7rw6z31w2s29sg913vvax641nazfr6yfm";
+       version = "0.4.3";
+       sha256 = "1rslqlg6p7indrcalvq85knwgsi4wdznz5cbblq1i5j4297yc1gj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -112802,8 +112889,8 @@ self: {
     ({ mkDerivation, base, http-media, lucid, servant }:
      mkDerivation {
        pname = "servant-lucid";
-       version = "0.4.2";
-       sha256 = "1aapj4fwjijg9k56x5n9andfwfkffcv37rfvsbpdxhkvwzvmmdpq";
+       version = "0.4.3";
+       sha256 = "0js3f23iwgr2wi54pv37hhsln1x6vmfd5mnsxnzdmppzvb9f19wk";
        buildDepends = [ base http-media lucid servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Servant support for lucid";
@@ -112899,8 +112986,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.4.2";
-       sha256 = "054xfkl6pxc39ahhch8i9s1aj2p3sd10ah9cknknbkjcyhynjzk4";
+       version = "0.4.3";
+       sha256 = "0xi5g3xqn4fl57fbhw2avm26g7k8zmd1c215yw5ria9dbjrvlqha";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -113561,8 +113648,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-language-c";
-       version = "0.7.1";
-       sha256 = "035pqmxqkydl62i1yz2r3a3fzc3p4zw83y5p56ngjjywksy9w68m";
+       version = "0.8.0";
+       sha256 = "1b7yi1cprgiyx06dnhc94shmfx5n1am7zhgiwg6g0bk2gg20im35";
        buildDepends = [
          base data-default-class fclabels process shake split
          unordered-containers
@@ -113840,8 +113927,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring, containers, vector }:
      mkDerivation {
        pname = "shell-escape";
-       version = "0.1.2";
-       sha256 = "1wdkc2l7g33czh6ws735szl3nm5lq8aqjjjcr6xm4l5km67alnxh";
+       version = "0.2.0";
+       sha256 = "0jms5hdl8zrpxwypq9998798krspclivprirrcq59r179alrng72";
        buildDepends = [ base binary bytestring containers vector ];
        homepage = "http://github.com/solidsnack/shell-escape";
        description = "Shell escaping library";
@@ -115211,6 +115298,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sjsp" = callPackage
+    ({ mkDerivation, alex, base, blaze-builder, bytestring, filepath
+     , ghc-prim, happy, language-javascript, syb, unordered-containers
+     }:
+     mkDerivation {
+       pname = "sjsp";
+       version = "0.1.0";
+       revision = "1";
+       sha256 = "0x76hrzm0ikijsf5n425bagzin2x463mcmlnjqvinrb6ni47f4bl";
+       editedCabalFile = "309e00100db2c1bae2d292c485f2dc1a68e1c72a848a2142c3f0637c494dd727";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base blaze-builder bytestring filepath ghc-prim language-javascript
+         syb unordered-containers
+       ];
+       buildTools = [ alex happy ];
+       description = "Simple JavaScript Profiler";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "skein" = callPackage
     ({ mkDerivation, base, bytestring, cereal, crypto-api, filepath
      , hspec, tagged
@@ -115228,6 +115336,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "skeleton" = callPackage
+    ({ mkDerivation, argparser, attoparsec, base, bytestring, filepath
+     , hex, posix-escape, process, time
+     }:
+     mkDerivation {
+       pname = "skeleton";
+       version = "0.1.0.0";
+       sha256 = "10bcw4l4w7myrbpmalg4mvpcyzbrnr8dafsplxkjlb6bnhc33scb";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         argparser attoparsec base bytestring filepath hex posix-escape
+         process time
+       ];
+       description = "a tool to access the OSX keychain";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "skell" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers
      , http-types, text, wai
@@ -115666,6 +115792,7 @@ self: {
        version = "0.3.2";
        sha256 = "0al17y15k7y04dwz5v2bsq003lxzhkhqlbdmbljdr1z17yszcjp6";
        buildDepends = [ aeson base linear vector ];
+       jailbreak = true;
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several splines and polynomials";
        license = stdenv.lib.licenses.bsd3;
@@ -115740,15 +115867,14 @@ self: {
      }:
      mkDerivation {
        pname = "smtp-mail-ng";
-       version = "0.1.0.1";
-       sha256 = "1r177mpyjr3bdnzghfwjamin6jna7qs33b9kfl36qg2l959qn49n";
+       version = "0.1.0.2";
+       sha256 = "0jvjb3ps22p71b0vq7lgfyxmhjbzhsc3crs0cv3qsnkhz4ghvgbh";
        buildDepends = [
          attoparsec base base16-bytestring base64-bytestring bytestring
          crypto-random cryptohash filepath haskeline mime-mail mtl network
          stringsearch text tls transformers transformers-compat x509-store
          x509-system
        ];
-       jailbreak = true;
        homepage = "https://github.com/avieth/smtp-mail-ng";
        description = "An SMTP client EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -115919,21 +116045,20 @@ self: {
      , blaze-builder, blaze-builder-enumerator, bytestring
      , bytestring-mmap, case-insensitive, containers, deepseq, directory
      , enumerator, filepath, hashable, HUnit, MonadCatchIO-transformers
-     , mtl, random, regex-posix, text, time, unix, unix-compat
-     , unordered-containers, vector, zlib-enum
+     , mtl, old-locale, random, regex-posix, text, time, unix
+     , unix-compat, unordered-containers, vector, zlib-enum
      }:
      mkDerivation {
        pname = "snap-core";
-       version = "0.9.7.0";
-       revision = "1";
-       sha256 = "0ambk7q35v76ww62m4y6j45ga63c141zi3wxkgazybbazk5i36nw";
-       editedCabalFile = "052dd91058bbdf948c75693679c257ae4511bcf8c46428f975d8d31e78e860a4";
+       version = "0.9.7.2";
+       sha256 = "0lgnflwcjyiinrm75dy1flr37bvjn3yljx53cvlsb3ccfnxqwsjj";
        buildDepends = [
          attoparsec attoparsec-enumerator base blaze-builder
          blaze-builder-enumerator bytestring bytestring-mmap
          case-insensitive containers deepseq directory enumerator filepath
-         hashable HUnit MonadCatchIO-transformers mtl random regex-posix
-         text time unix unix-compat unordered-containers vector zlib-enum
+         hashable HUnit MonadCatchIO-transformers mtl old-locale random
+         regex-posix text time unix unix-compat unordered-containers vector
+         zlib-enum
        ];
        homepage = "http://snapframework.com/";
        description = "Snap: A Haskell Web Framework (core interfaces and types)";
@@ -116617,16 +116742,16 @@ self: {
 
   "snaplet-purescript" = callPackage
     ({ mkDerivation, base, configurator, mtl, raw-strings-qq, shelly
-     , snap, snap-core, text
+     , snap, snap-core, text, transformers
      }:
      mkDerivation {
        pname = "snaplet-purescript";
-       version = "0.2.0.0";
-       sha256 = "0f9014v92j5rgy0x6j965d4gay0ipz668rv7rp3m56qnghc8vp5h";
+       version = "0.3.0.0";
+       sha256 = "1dapzqyxj7s6j4drp0szldjxrhm77r4yvbjxs79155a58mj9p1wn";
        buildDepends = [
          base configurator mtl raw-strings-qq shelly snap snap-core text
+         transformers
        ];
-       jailbreak = true;
        description = "Automatic (re)compilation of purescript projects";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117183,8 +117308,8 @@ self: {
     ({ mkDerivation, async, base, bytestring }:
      mkDerivation {
        pname = "socket";
-       version = "0.5.1.0";
-       sha256 = "1kmaw7m44iq1mk643y3kif9g2dmcyirnsv2y7gvf6c12xwrf5adh";
+       version = "0.5.2.0";
+       sha256 = "0mika886mqzjzm14sby3qdlwdlnd20xwl2d2n1faalgimjl1149y";
        buildDepends = [ base bytestring ];
        testDepends = [ async base bytestring ];
        homepage = "https://github.com/lpeterse/haskell-socket";
@@ -118783,9 +118908,9 @@ self: {
      mkDerivation {
        pname = "stack";
        version = "9.9.9";
-       revision = "2";
+       revision = "4";
        sha256 = "1kpsza23b22mg970c2qs943khzad38imzsa1xzki2a3xvfiadana";
-       editedCabalFile = "e8298be03ed84f7858e9ce16a677a272c3a31b7e5180e094fa9ee120b03c6299";
+       editedCabalFile = "5ff7356010e14ec43684d11fcec6e34f47f794cc48a258919568cc27c72ffd34";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -120446,10 +120571,9 @@ self: {
     ({ mkDerivation, base, bytestring, text, utf8-string }:
      mkDerivation {
        pname = "string-convert";
-       version = "2.0.0";
-       sha256 = "1wwx7j6qvb93yc0r2hdah1rgbi96r2mjhmibx72d4x7idhn0xsd9";
+       version = "2.0.1";
+       sha256 = "0lx9bc7czwzbf8rky8k02kgi6w3pjfz6ydig9i9ll83zy70l9208";
        buildDepends = [ base bytestring text utf8-string ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/tdammers/string-convert";
        description = "Provide universal string conversions between any two string-like types";
        license = stdenv.lib.licenses.bsd3;
@@ -121546,12 +121670,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sync-mht" = callPackage
+    ({ mkDerivation, array, base, base16-bytestring, byteable
+     , bytestring, cereal, containers, cryptohash, directory, filepath
+     , io-streams, mtl, process, text, transformers, unix
+     }:
+     mkDerivation {
+       pname = "sync-mht";
+       version = "0.2.1.0";
+       sha256 = "1yrpsh676ajcqlaq0vdrdzkdi27l4ih0m2jm7r1wdz3yzw4mrr20";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         array base base16-bytestring byteable bytestring cereal containers
+         cryptohash directory filepath io-streams mtl process text
+         transformers unix
+       ];
+       jailbreak = true;
+       description = "Fast incremental file transfer using Merke-Hash-Trees";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "synchronous-channels" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "synchronous-channels";
-       version = "0.1";
-       sha256 = "0j9ikxd7mihy2ljb8s14lz50nj8x30siffpdznlzs7ps0s97cszh";
+       version = "0.2";
+       sha256 = "0xzpjq3h3mqdi553v7p6xm3i74nvbhz5igjlhfh6snlmr7p1cdvb";
        buildDepends = [ base ];
        description = "Synchronous communication channels";
        license = stdenv.lib.licenses.bsd3;
@@ -122868,10 +123013,9 @@ self: {
     ({ mkDerivation, base, containers, mtl, safe, text }:
      mkDerivation {
        pname = "tamper";
-       version = "0.4.0";
-       sha256 = "16ca5c4w0qmar1nv4m91cwrjw38ql76lphxd25d063d5v77lwr8z";
+       version = "0.4.1";
+       sha256 = "1nkfcai9l6z6hvjixq8nny1466f8shc5432hr8l17llqcwpbzv5p";
        buildDepends = [ base containers mtl safe text ];
-       jailbreak = true;
        description = "An HTML templating system similar to Blaze, implemented as a monad transformer of sorts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122888,6 +123032,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tar_0_4_2_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, directory, filepath
+     , old-time, QuickCheck, tasty, tasty-quickcheck, time
+     }:
+     mkDerivation {
+       pname = "tar";
+       version = "0.4.2.0";
+       sha256 = "00z0bdj29hrhxwwj1drsn137ny1ia5rl0f64m876f10fr4p5j2c3";
+       buildDepends = [ array base bytestring directory filepath time ];
+       testDepends = [
+         array base bytestring directory filepath old-time QuickCheck tasty
+         tasty-quickcheck time
+       ];
+       description = "Reading, writing and manipulating \".tar\" archive files.";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tardis" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -123567,8 +123728,8 @@ self: {
     ({ mkDerivation, base, Boolean }:
      mkDerivation {
        pname = "temporal-media";
-       version = "0.5.0";
-       sha256 = "1pjw781rkki4nv0xsn35jhrad2xxxks0lpqsx3zg5rzrvvxqd3b6";
+       version = "0.6.0";
+       sha256 = "0mpi97lqh4mqv6flgcrwzbv8ihlxhxzf5z2xd87wxpzvcglx2n0n";
        buildDepends = [ base Boolean ];
        homepage = "https://github.com/anton-k/temporal-media";
        description = "data types for temporal media";
@@ -123579,8 +123740,8 @@ self: {
     ({ mkDerivation, base, data-default, temporal-media, vector }:
      mkDerivation {
        pname = "temporal-music-notation";
-       version = "0.4.0";
-       sha256 = "1flf4dfyj87yiyhqdrm2bph8vcsmhp5rwg3k4npbxxzdgr8z9g92";
+       version = "0.4.1";
+       sha256 = "09mx6bfz0lxyy7z0srl4372qv42fyymc5pqxkyxj7mhf872y4biv";
        buildDepends = [ base data-default temporal-media vector ];
        homepage = "https://github.com/anton-k/temporal-music-notation";
        description = "music notation";
@@ -124661,8 +124822,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-show";
-       version = "1";
-       sha256 = "1ac8pk2nsbzl080r2qqm6jmkq3yq4rx6czfdsfkxydxyklrvi83d";
+       version = "2";
+       sha256 = "152nccaz9m337rrv7i6z1vjj73xdcp410fgxcs8imhr125fs6r2z";
        buildDepends = [
          array base base-compat bytestring bytestring-builder containers
          generic-deriving ghc-prim integer-gmp nats semigroups tagged
@@ -124689,8 +124850,10 @@ self: {
      }:
      mkDerivation {
        pname = "text-show-instances";
-       version = "1";
-       sha256 = "0503bb8yy952gs5ywndm0qm2v1z5xm1k09vcwrnsxx979irmpksh";
+       version = "2";
+       revision = "1";
+       sha256 = "1k9blq670jsph1jkrw01hf4k6ga8i3xy5nfs299xj17nni8hjci8";
+       editedCabalFile = "e0610e22ef001feb5271583c1719c2ebdef23ac4179deaabba23a21d6c2ac7b0";
        buildDepends = [
          base base-compat bifunctors binary bytestring containers directory
          haskeline hoopl hpc old-locale old-time pretty random semigroups
@@ -124773,6 +124936,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text1" = callPackage
+    ({ mkDerivation, base, binary, directory, doctest, filepath, lens
+     , QuickCheck, semigroups, template-haskell, text
+     }:
+     mkDerivation {
+       pname = "text1";
+       version = "0.0.1";
+       sha256 = "15nb4izk4j0hg2hhynrjd5vjnpg240rlcp489w4hm4b4nmpdd4cj";
+       buildDepends = [ base binary lens semigroups text ];
+       testDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/NICTA/text1";
+       description = "Non-empty values of `Data.Text`.";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "textPlot" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
@@ -125239,21 +125419,23 @@ self: {
   "themplate" = callPackage
     ({ mkDerivation, base, configurator, directory, either, errors
      , filepath, optparse-applicative, text, transformers
+     , transformers-compat
      }:
      mkDerivation {
        pname = "themplate";
-       version = "1.1";
+       version = "1.2";
        revision = "1";
-       sha256 = "1bjiiwhbwq6am7269gzsaqq6hpvy45x4pkq0kq7qm2j4bzrmfr14";
-       editedCabalFile = "02239e2cf43fa8f2b4fc9c68ad3561aef40af2348e962cb4f2bb5d7d839ad8da";
+       sha256 = "0ingf6f4d2a93jdcw0lij7l02gr7mfk97svhda94wx0k1lmj2li3";
+       editedCabalFile = "9562873914a204ed7daf91844f70592385a93b6c348798dc8772b439436ca109";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          base configurator directory either errors filepath
-         optparse-applicative text transformers
+         optparse-applicative text transformers transformers-compat
        ];
+       jailbreak = true;
        homepage = "http://github.com/bennofs/themplate/";
-       description = "themplate";
+       description = "Project templating tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -127921,19 +128103,20 @@ self: {
 
   "turtle" = callPackage
     ({ mkDerivation, async, base, clock, directory, doctest, foldl
-     , managed, process, system-fileio, system-filepath, temporary, text
-     , time, transformers, unix
+     , hostname, managed, optional-args, optparse-applicative, process
+     , system-fileio, system-filepath, temporary, text, time
+     , transformers, unix
      }:
      mkDerivation {
        pname = "turtle";
-       version = "1.1.1";
-       sha256 = "1dgzzsylbri2p8wyf1xfww8la9vccb7yac0b0g2lf0b1ix4gphym";
+       version = "1.2.0";
+       sha256 = "0324bh4kb7xqdzvgqr6hbm7cna4a4d6x907l73sx63j87hqiwah4";
        buildDepends = [
-         async base clock directory foldl managed process system-fileio
-         system-filepath temporary text time transformers unix
+         async base clock directory foldl hostname managed optional-args
+         optparse-applicative process system-fileio system-filepath
+         temporary text time transformers unix
        ];
        testDepends = [ base doctest ];
-       jailbreak = true;
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129755,6 +129938,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uniform-io" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, data-default-class
+     , iproute, network, openssl, transformers, word8
+     }:
+     mkDerivation {
+       pname = "uniform-io";
+       version = "0.1.0.0";
+       sha256 = "1xb934jvj3gk6lw2xdm22p8yayybqk823pk0ssly7kz2dyzrqzz7";
+       buildDepends = [
+         attoparsec base bytestring data-default-class iproute network
+         transformers word8
+       ];
+       extraLibraries = [ openssl ];
+       homepage = "https://sealgram.com/git/haskell/uniform-io";
+       description = "Uniform IO over files, network, watever";
+       license = stdenv.lib.licenses.mit;
+     }) { inherit (pkgs) openssl;};
+
   "uniform-pair" = callPackage
     ({ mkDerivation, base, ShowF }:
      mkDerivation {
@@ -132810,8 +133011,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai";
-       version = "3.0.2.3";
-       sha256 = "1mrry121xjgd2h69m35khgsiicrwhg7ysa7mzm6bw3ac41xc08ns";
+       version = "3.0.3.0";
+       sha256 = "044djv5r10g92cg7wvz8zlxsyjhnr2mqb1gf3gr9a1rjlcsv8zn4";
        buildDepends = [
          base blaze-builder bytestring http-types network text vault
        ];
@@ -132832,8 +133033,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-app-file-cgi";
-       version = "3.0.7";
-       sha256 = "0ggxsnqk0wc47l98sykhyq7qwfys58y4048v1pqdd35w4p92qhbr";
+       version = "3.0.8";
+       sha256 = "0adj4s8hxr9rpmqf6899cjaw6axwzw5jvw325wv2qxv3yp4x3w5x";
        buildDepends = [
          array attoparsec attoparsec-conduit base blaze-builder blaze-html
          bytestring case-insensitive conduit conduit-extra containers
@@ -132861,8 +133062,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-app-static";
-       version = "3.1.0";
-       sha256 = "0zajsav11v5r6c5k2ls1cfc6bz1zalasxpl03hvh5fww5f1vn9iq";
+       version = "3.1.0.1";
+       sha256 = "1z542ivy5x4qj9kizkbbvhz5pn54rcxrs6cc52199khxkfc07gdm";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -132974,8 +133175,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-extra";
-       version = "3.0.7.1";
-       sha256 = "1jfpqqnavk2v7wn4fhpc1fish67wfyicmsl84l234v47wsbz9r13";
+       version = "3.0.8.1";
+       sha256 = "0ay8cjxk8lplcdg2l89m9dprf6z6pcypljdsiwb17hkyiv36myl9";
        buildDepends = [
          ansi-terminal base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -132984,8 +133185,8 @@ self: {
          unix unix-compat vault void wai wai-logger word8
        ];
        testDepends = [
-         base blaze-builder bytestring cookie fast-logger hspec http-types
-         HUnit resourcet text time transformers wai zlib
+         base blaze-builder bytestring case-insensitive cookie fast-logger
+         hspec http-types HUnit resourcet text time transformers wai zlib
        ];
        homepage = "http://github.com/yesodweb/wai";
        description = "Provides some basic WAI handlers and middleware";
@@ -133063,8 +133264,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-handler-launch";
-       version = "3.0.0.3";
-       sha256 = "1nx90z37f296gqh0m9rgvw7899jizpclb6fbwhp98byy9s2ssabl";
+       version = "3.0.0.4";
+       sha256 = "1qfisa19rhlx241jr90mz8x844pp5yx1z8xbmflvj81gpnvsgh7i";
        buildDepends = [
          base blaze-builder bytestring http-types process streaming-commons
          transformers wai warp
@@ -133845,8 +134046,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-websockets";
-       version = "3.0.0.5";
-       sha256 = "1gqivkjdvln6xpkhcr6k75gk2qvjp6mr691902w3m6xpcdv1q5z0";
+       version = "3.0.0.6";
+       sha256 = "0i8r5r8l3z6fk7a466n48ralq33kdihc8g91ia4z22cqhl0zkizy";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -133855,7 +134056,7 @@ self: {
          websockets
        ];
        homepage = "http://github.com/yesodweb/wai";
-       description = "Provide a bridge betweeen WAI and the websockets package";
+       description = "Provide a bridge between WAI and the websockets package";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -136928,8 +137129,8 @@ self: {
     ({ mkDerivation, base, deepseq, text }:
      mkDerivation {
        pname = "xml-types";
-       version = "0.3.5";
-       sha256 = "0vddb60a5yi7cxwyxik7vwnlrpwmvfz7jq20pdp355q61qc842sa";
+       version = "0.3.6";
+       sha256 = "1jgqxsa9p2q3h6nymbfmvhldqrqlwrhrzmwadlyc0li50x0d8dwr";
        buildDepends = [ base deepseq text ];
        homepage = "https://john-millikin.com/software/haskell-xml/";
        description = "Basic types for representing XML";
@@ -137273,7 +137474,6 @@ self: {
        homepage = "https://github.com/supki/xmonad-screenshot";
        description = "Workspaces screenshooting utility for XMonad";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-utils" = callPackage
@@ -139263,6 +139463,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-sass" = callPackage
+    ({ mkDerivation, base, data-default, hsass, shakespeare
+     , template-haskell, text, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-sass";
+       version = "0.1.0.0";
+       sha256 = "0faizfb44i52yijakfnazx86fs78vi9gnbiw2w42rh4r8gncjbvx";
+       buildDepends = [
+         base data-default hsass shakespeare template-haskell text
+         yesod-core
+       ];
+       jailbreak = true;
+       description = "A simple quasiquoter to include sass code in yesod";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yesod-session-redis" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, cookie
      , hedis, mtl, network, pool-conduit, random, text, time, wai
@@ -139340,20 +139557,19 @@ self: {
     ({ mkDerivation, aeson, base, blaze-builder, blaze-markup
      , bytestring, data-default, directory, filepath, hamlet, hspec
      , HUnit, language-javascript, mime-types, shakespeare
-     , shakespeare-css, shakespeare-js, template-haskell, text, yesod
-     , yesod-core, yesod-static, yesod-test
+     , template-haskell, text, yesod, yesod-core, yesod-static
+     , yesod-test
      }:
      mkDerivation {
        pname = "yesod-static-angular";
-       version = "0.1.4";
-       sha256 = "0yqqy2fpnrqhlljm3pk8d5nxqp1fiqnyf1cd4h6c8yfrs46w41d5";
+       version = "0.1.5";
+       sha256 = "0ddw307vd1zaknxc74y1k0hwg872y651snk1g72jqhbigcixl3ck";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base blaze-builder blaze-markup bytestring data-default
          directory filepath hamlet language-javascript mime-types
-         shakespeare shakespeare-css shakespeare-js template-haskell text
-         yesod yesod-core yesod-static
+         shakespeare template-haskell text yesod yesod-core yesod-static
        ];
        testDepends = [
          base bytestring hamlet hspec HUnit shakespeare template-haskell
@@ -140683,6 +140899,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "zoom-refs" = callPackage
+    ({ mkDerivation, base, lens, stm }:
+     mkDerivation {
+       pname = "zoom-refs";
+       version = "0.0.0.0";
+       sha256 = "0pbnwgsfl4rgmgsq30snki34xh9iaky01jnxycppf0h93mbdv01p";
+       buildDepends = [ base lens stm ];
+       description = "Zoom (~ Functor) and pairing (~ Applicative) for mutable references";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "zot" = callPackage
     ({ mkDerivation, base, monads-tf }:
      mkDerivation {

From b096c39ca21c971333e2a5d4c289473cced09186 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 5 Jul 2015 21:11:58 +0200
Subject: [PATCH 2100/2322] haskell-wai-session has been fixed upstream.

---
 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 d6cbc29a573..8b28588b3ba 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -866,10 +866,6 @@ self: super: {
   # https://github.com/yesodweb/serversession/issues/1
   serversession = dontCheck super.serversession;
 
-  # https://github.com/singpolyma/wai-session/issues/8
-  wai-session = markBroken super.wai-session;
-  serversession-frontend-wai = dontDistribute super.serversession-frontend-wai;
-
   # https://github.com/commercialhaskell/stack/issues/408
   # https://github.com/commercialhaskell/stack/issues/409
   stack = overrideCabal super.stack (drv: { preCheck = "export HOME=$TMPDIR"; doCheck = false; });

From 33c3e62fbb839b4b02a2d80aa1e0003eb589df59 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Mon, 6 Jul 2015 16:17:25 -0700
Subject: [PATCH 2101/2322] haskellPackages.vcache: unmark broken

* unmark haskellPackages.vcache as broken
* unmark haskellPackages.vcache-trie as broken

No longer broken since the addition of lmdb in

9d85874aeb6f17bc1b13c1a248f319e1908e1210
---
 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 8b28588b3ba..f8ed07b3aad 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -608,10 +608,6 @@ self: super: {
   # https://code.google.com/p/linux-music-player/issues/detail?id=1
   mp = markBroken super.mp;
 
-  # Depends on broken lmdb package.
-  vcache = markBroken super.vcache;
-  vcache-trie = markBroken super.vcache-trie;
-
   # https://github.com/afcowie/http-streams/issues/80
   http-streams = dontCheck super.http-streams;
 

From 841cfa9764d917fc920a7a95ca27e5263b96b995 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 7 Jul 2015 13:46:09 +0200
Subject: [PATCH 2102/2322] haskell-hspec: break infinite recursion in
 testDepends

Suggested by @Fuuzetsu in https://github.com/NixOS/nixpkgs/issues/8664.
---
 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 f8ed07b3aad..a6424b9e44d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -14,6 +14,7 @@ self: super: {
   # Break infinite recursions.
   Dust-crypto = dontCheck super.Dust-crypto;
   hasql-postgres = dontCheck super.hasql-postgres;
+  hspec = super.hspec.override { stringbuilder = dontCheck super.stringbuilder; };
   hspec-expectations = dontCheck super.hspec-expectations;
   HTTP = dontCheck super.HTTP;
   mwc-random = dontCheck super.mwc-random;

From 6d457c60bb71030b533b494a8dad260fa2274ae3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 7 Jul 2015 13:48:02 +0200
Subject: [PATCH 2103/2322] haskell-hspec-expectations: re-enable the test
 suite

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a6424b9e44d..fd3e70eaed8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -15,7 +15,6 @@ self: super: {
   Dust-crypto = dontCheck super.Dust-crypto;
   hasql-postgres = dontCheck super.hasql-postgres;
   hspec = super.hspec.override { stringbuilder = dontCheck super.stringbuilder; };
-  hspec-expectations = dontCheck super.hspec-expectations;
   HTTP = dontCheck super.HTTP;
   mwc-random = dontCheck super.mwc-random;
   nanospec = dontCheck super.nanospec;

From b650fe30002b6354a891641c7529222dbe292ba3 Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sat, 11 Jul 2015 17:08:09 +0100
Subject: [PATCH 2104/2322] rainbowstream: 1.2.5 -> 1.2.7

Unfortunately I was unable to locate a changelog. This was built and run
locally to ensure the update works.
---
 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 3a6d88545ec..4ea50bc1408 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7326,11 +7326,11 @@ let
 
   rainbowstream = buildPythonPackage rec {
     name = "rainbowstream-${version}";
-    version = "1.2.5";
+    version = "1.2.7";
 
     src = pkgs.fetchurl {
       url    = "https://pypi.python.org/packages/source/r/rainbowstream/${name}.tar.gz";
-      sha256 = "1fch1vckzf4nmq67fk2jgfxpvyygviavx8di4xhjq2mib9nfc3mr";
+      sha256 = "1jvv07w9n7ca251l92alm2yq9w82sb7lvxz6if3gc3nbqzc587rf";
     };
 
     doCheck = false;

From 2d77e49f6cf8616d896e311bad47d9b625a38b23 Mon Sep 17 00:00:00 2001
From: "Ryan Scheel (Havvy)" <ryan.havvy@gmail.com>
Date: Sat, 11 Jul 2015 19:00:31 +0200
Subject: [PATCH 2105/2322] Update io.js (v2.3.3 -> v2.3.4)

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

diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix
index 6fef81300ab..1f7db61090e 100644
--- a/pkgs/development/web/iojs/default.nix
+++ b/pkgs/development/web/iojs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }:
 
 let
-  version = "2.3.3";
+  version = "2.3.4";
   inherit (stdenv.lib) optional maintainers licenses platforms;
 in stdenv.mkDerivation {
   name = "iojs-${version}";
 
   src = fetchurl {
     url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
-    sha256 = "12fdz0as1sa34bq4a701qwrznpn7y1wq0yxlr5yw494ifchfm103";
+    sha256 = "1h9cjrs93c8rdycc0ahhc27wv826211aljvfmxfg8jdmg6nvibhq";
   };
 
   prePatch = ''

From 21743decf36588a3760480fdb3f2d3ef1d782631 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Sat, 11 Jul 2015 15:05:32 -0700
Subject: [PATCH 2106/2322] pythonPackages.gmpy: init at 1.17

---
 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 3a6d88545ec..bea5b75012e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3319,6 +3319,25 @@ let
     propagatedBuildInputs = with self; [ gflags iso8601 ipaddr httplib2 google_apputils google_api_python_client ];
   };
 
+  gmpy = buildPythonPackage rec {
+    name = "gmpy-1.17";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/g/gmpy/${name}.zip";
+      md5 = "2bf419076b06e107167e219f60ac6d27";
+    };
+
+    buildInputs = [
+      pkgs.gcc
+      pkgs.gmp
+    ];
+
+    meta = {
+      description = "GMP or MPIR interface to Python 2.4+ and 3.x";
+      homepage = http://code.google.com/p/gmpy/;
+    };
+  };
+
   gmusicapi = with pkgs; pythonPackages.buildPythonPackage rec {
     name = "gmusicapi-4.0.0";
 

From f420f927f6d23153ae9885da630cfdf3b9efec62 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Sat, 11 Jul 2015 15:06:23 -0700
Subject: [PATCH 2107/2322] pythonPackages.gmpy2: init at 2.0.6

---
 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 bea5b75012e..d912e67eca0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3338,6 +3338,28 @@ let
     };
   };
 
+  gmpy2 = buildPythonPackage rec {
+    name = "gmpy2-2.0.6";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/g/gmpy2/${name}.zip";
+      md5 = "7365d880953ba54c2cdcf171c7e19b2b";
+    };
+
+    buildInputs = [
+      pkgs.gcc
+      pkgs.gmp
+      pkgs.mpfr
+      pkgs.libmpc
+    ];
+
+    meta = {
+      description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x";
+      homepage = http://code.google.com/p/gmpy/;
+      license = licenses.gpl3Plus;
+    };
+  };
+
   gmusicapi = with pkgs; pythonPackages.buildPythonPackage rec {
     name = "gmusicapi-4.0.0";
 

From 962f68f39029b5f961a1aa0af64e5b8e5368db1a Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Sat, 11 Jul 2015 15:09:46 -0700
Subject: [PATCH 2108/2322] tribler: 5.5.x-25411 -> 6.4.3

---
 .../networking/p2p/tribler/default.nix        | 47 ++++++++++++-------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 5bc228f9a6b..fed8f8ad31f 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -1,33 +1,44 @@
-{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools
+{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar
 , enablePlayer ? false, vlc ? null }:
 
-let rev = "25411"; in
 
-stdenv.mkDerivation {
-  name = "tribler-5.5.21-pre${rev}";
+stdenv.mkDerivation rec {
+  name = "tribler-${version}";
+  version = "v6.4.3";
 
-  src = fetchsvn {
-    url = http://svn.tribler.org/abc/branches/release-5.5.x;
-    inherit rev;
-    sha256 = "17c9svy4zjchzihk6mf0kh4lnvaxjfmgfmimyby5w0d3cwbw49zx";
+  src = fetchurl {
+    url = "https://github.com/Tribler/tribler/releases/download/${version}/Tribler-${version}.tar.xz";
+    sha256 = "1n5qi3jlby41w60zg6dvl933ypyiflq3rb0qkwhxi4b26s3vwvgr";
   };
 
-  buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ];
+  buildInputs = [
+    pythonPackages.python
+    pythonPackages.wrapPython
+    makeWrapper
+  ];
 
-  pythonPath =
-    [ pythonPackages.wxPython pythonPackages.curses pythonPackages.apsw
-      pythonPackages.setuptools pythonPackages.m2crypto pythonPackages.sqlite3
-    ];
+  pythonPath = [
+    libtorrentRasterbar
+    pythonPackages.wxPython
+    pythonPackages.curses
+    pythonPackages.apsw
+    pythonPackages.twisted
+    pythonPackages.gmpy
+    pythonPackages.netifaces
+    pythonPackages.pil
+    pythonPackages.pycrypto
+    pythonPackages.pyasn1
+    pythonPackages.requests
+    pythonPackages.setuptools
+    pythonPackages.m2crypto
+    pythonPackages.sqlite3
+  ];
 
   installPhase =
     ''
-      substituteInPlace Tribler/Core/NATFirewall/guessip.py \
-          --replace /bin/netstat ${nettools}/bin/netstat \
-          --replace /sbin/ifconfig ${nettools}/sbin/ifconfig
-    
       # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH.
       wrapPythonPrograms
-      
+
       mkdir -p $out/share/tribler
       cp -prvd Tribler $out/share/tribler/
 

From ef5dafd66d4adb036708b72e015970c458c27d13 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sun, 12 Jul 2015 00:44:29 +0200
Subject: [PATCH 2109/2322] lua-nginx-module: Update from v0.9.16rc1 to v0.9.16

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

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 87a4cc398a9..e799cb8214a 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -57,8 +57,8 @@ let
   lua-ext = fetchFromGitHub {
     owner = "openresty";
     repo = "lua-nginx-module";
-    rev = "v0.9.16rc1";
-    sha256 = "0fdrzfkzdrxykbyxrpas7ns6kxzjf9s6h0fj7k4423wfwybi0kic";
+    rev = "v0.9.16";
+    sha256 = "0dvdam228jhsrayb22ishljdkgib08bakh8ygn84sq0c2xbidzlp";
   };
 
   set-misc-ext = fetchFromGitHub {

From 7e021a0fd636587ff7908387f8c2fd97d34c772a Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sun, 12 Jul 2015 00:46:18 +0200
Subject: [PATCH 2110/2322] nginx package: Allow adding arbitrary modules

---
 pkgs/servers/http/nginx/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index e799cb8214a..7888a772e2a 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -8,6 +8,7 @@
 , ngx_lua ? false
 , set_misc ? false
 , fluent ? false
+, extraModules ? []
 }:
 
 with stdenv.lib;
@@ -133,7 +134,8 @@ stdenv.mkDerivation rec {
     ++ optional set_misc "--add-module=${set-misc-ext}"
     ++ optionals (elem stdenv.system (with platforms; linux ++ freebsd)) 
         [ "--with-file-aio" "--with-aio_module" ]
-    ++ optional fluent "--add-module=${fluentd}";
+    ++ optional fluent "--add-module=${fluentd}"
+    ++ (map (m: "--add-module=${m}") extraModules);
 
 
   additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized";

From 5f308b50e4b4536406ab38a1f19de3d9a8681c17 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sat, 11 Jul 2015 16:04:27 -0700
Subject: [PATCH 2111/2322] add system keychains to security-tool's propagated
 inputs

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 pkgs/os-specific/darwin/security-tool/default.nix         | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3586fd0a232..232ea3630e4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -214,9 +214,6 @@ self: super: {
         patchPhase = (drv.patchPhase or "") + ''
           substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security
         '';
-        __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [
-          "/System/Library/Keychains"
-        ];
       })
     else super.x509-system;
 
diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix
index 866d006238d..7cff4fc3eef 100644
--- a/pkgs/os-specific/darwin/security-tool/default.nix
+++ b/pkgs/os-specific/darwin/security-tool/default.nix
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ GSS Kerberos Security PCSC Foundation ];
 
+  __propagatedImpureHostDeps = [ "/System/Library/Keychains" ];
+
   buildInputs = [
     gnustep-make
     libsecurity_asn1

From 682dc3ee70c7a24b0eac93189bf66a2eb331f0a0 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sat, 11 Jul 2015 16:04:36 -0700
Subject: [PATCH 2112/2322] link yesod-bin with cocoa

---
 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 232ea3630e4..75e47e7ce77 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -897,6 +897,10 @@ self: super: {
   wai-session = markBroken super.wai-session;
   serversession-frontend-wai = dontDistribute super.serversession-frontend-wai;
 
+  yesod-bin = if pkgs.stdenv.isDarwin
+    then addBuildDepend super.yesod-bin pkgs.darwin.apple_sdk.frameworks.Cocoa
+    else super.yesod-bin;
+
   # https://github.com/commercialhaskell/stack/issues/408
   # https://github.com/commercialhaskell/stack/issues/409
   stack = overrideCabal super.stack (drv: { preCheck = "export HOME=$TMPDIR"; doCheck = false; });

From 2767e93843ac8e0d216d7eb566e0d0d86ed73068 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sat, 11 Jul 2015 16:04:47 -0700
Subject: [PATCH 2113/2322] darwin purity: go-1.4

---
 pkgs/development/compilers/go/1.4.nix | 16 +++++++++++++---
 pkgs/top-level/all-packages.nix       |  4 +++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 12642eeace5..d42873ab975 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, Security, goPackages }:
+{ stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, goPackages
+
+, Security }:
 
 let
   loader386 = "${glibc}/lib/ld-linux.so.2";
@@ -17,8 +19,9 @@ stdenv.mkDerivation rec {
 
   # perl is used for testing go vet
   buildInputs = [ bison bash makeWrapper perl ]
-             ++ lib.optionals stdenv.isLinux [ glibc ]
-             ++ lib.optionals stdenv.isDarwin [ Security ];
+             ++ lib.optionals stdenv.isLinux [ glibc ];
+
+  propagatedBuildInputs = lib.optional stdenv.isDarwin Security;
 
   # I'm not sure what go wants from its 'src', but the go installation manual
   # describes an installation keeping the src.
@@ -56,6 +59,13 @@ stdenv.mkDerivation rec {
     sed -i 's,/lib/ld-linux.so.3,${loaderArm},' src/cmd/5l/asm.c
     sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
     sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
+  '' + lib.optionalString stdenv.isDarwin ''
+    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 '/TestRead0/areturn' src/os/os_test.go
+    sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
+
+    touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
   '';
 
   patches = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07f2796c93e..3d4910ff30d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3958,7 +3958,9 @@ let
 
   go_1_3 = callPackage ../development/compilers/go/1.3.nix { };
 
-  go_1_4 = callPackage ../development/compilers/go/1.4.nix { inherit (darwin) Security; };
+  go_1_4 = callPackage ../development/compilers/go/1.4.nix {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   go = go_1_4;
 

From d3a4fe374f26e450e2a3ea8bf66d1f616af488e3 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sat, 11 Jul 2015 16:04:58 -0700
Subject: [PATCH 2114/2322] update framework impure deps

---
 pkgs/os-specific/darwin/apple-sdk/frameworks.nix  | 2 +-
 pkgs/os-specific/darwin/apple-sdk/impure-deps.nix | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
index 222168d39da..9da2dd74c71 100644
--- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
@@ -89,7 +89,7 @@ with frameworks; with libs; {
   ScreenSaver             = [];
   Scripting               = [];
   ScriptingBridge         = [];
-  Security                = [ CoreFoundation ];
+  Security                = [ CoreFoundation IOKit ];
   SecurityFoundation      = [];
   SecurityInterface       = [ Security ];
   ServiceManagement       = [ CoreFoundation Security ];
diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
index 54a6dcfaeaf..e2fdef60001 100644
--- a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
@@ -12,9 +12,12 @@ rec {
   ];
   Security = [
     "/System/Library/Frameworks/Security.framework"
+    "/usr/lib/libbsm.0.dylib"
     "/usr/lib/libbz2.1.0.dylib"
     "/usr/lib/libpam.2.dylib"
     "/usr/lib/libxar.1.dylib"
+    "/usr/lib/libxml2.2.dylib"
+    "/usr/lib/libsqlite3.dylib"
   ];
   GSS = [
     "/System/Library/Frameworks/GSS.framework"

From b59685de83195a5450932d97975a25237a4989c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Jul 2015 02:38:26 +0200
Subject: [PATCH 2115/2322] r-stringi: fix 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 7d9cd92b75b..ab50d9d0c3c 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -334,6 +334,7 @@ let
     sprint = [ pkgs.openmpi ];
     ssanv = [ pkgs.proj ];
     stsm = [ pkgs.gsl ];
+    stringi = [ pkgs.icu ];
     survSNP = [ pkgs.gsl ];
     sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype ];
     TAQMNGR = [ pkgs.zlib ];

From 7064dd1f887edf4bec3d34281d3bf1c3d8b234ea Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sun, 12 Jul 2015 11:39:09 +0900
Subject: [PATCH 2116/2322] thunderbird-bin: 38.0.1 -> 38.1.0

---
 .../mailreaders/thunderbird-bin/sources.nix   | 234 +++++++++---------
 1 file changed, 117 insertions(+), 117 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index 66f2fa87e39..241b43bc1f1 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -4,123 +4,123 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "38.0.1";
+  version = "38.1.0";
   sources = [
-    { locale = "ar"; arch = "linux-i686"; sha1 = "b61125483c46602e64ab7c4b56ff2f9612453ad3"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "4ac5de506c61fc769e6805f599cb7131b243812c"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "07ea0b98e651e650d2f11322b5c8ce55bb083217"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "b0b37462e0bb5443f408724b62421e59ae68389b"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "61feae6377bcca63225ba945b7067dad8eb5a0fa"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "b58385f605b7a08f17e06faa922899c42a2076c0"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "ddbb0681076511828c91373354aa9a3861ee3943"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "734acaa1870773d9ccf687e65d553797b3d00bca"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "32ad3307c919ec10bcbb9f99f8d37bb5daec5903"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "4e87b8ff753b1680b0b9b5149fc75238bff91c6d"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "b319d6f853311b103c439a482ee12652d751e22f"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "0254d1edcc2b1fbc8cec01c96482c381d34be88b"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "deb0caf34895379b2e7dd01871c510f92ba96561"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "f580f9044bb115b3077ba012fe1b3be289853911"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "045f3d7adade1133325e6607971ec70cad85c91a"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "9fc2fa5a44886db96bcdb4d23d69593954a84ca2"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "6fb9ca5be336db1b149e4ac6e53e51fd32fbd84e"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "517dfd262c4f23fba743299381f51f7863cd32d7"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "bdd5d63545fb09540a5ff8ada7d421deb865dc61"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "fa4f26001b4281f4bd9b741a897e1a420c40b604"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "566603c44ba6df21d7504bfb49ea235f5cb64e00"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "60675d5905838ac54c0c2a961d88d021c446ec50"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "74feac72b6ad05b00a6c4495f751f106b77b3997"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "fbb936459a2287117e5638ef78ba1d647f4be41f"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "eedbcc1df60912b2f5be83dc2459cd06914b91f5"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "ead82b60f2b07a63ff84ed6f35f9527c1b030c24"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "17ed78e8f063f39a7c73795e9a251f187dc2a04c"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "42f427fe628cbc182459f66a7d87d78845d50e57"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "9f264dbd88d96149a92601e33dbed497189b281d"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "a8df74c9655501ee9e4c876b05e14b9a2605a591"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "4e467b8e662345bba07ec768055899175823764b"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "96994e1c9b6e8d27d1b7bf91a2d0d47b25d67bcb"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "db1574237be55846c386138b55beacf247cdf8b8"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "1e474e7001a14bfba44e933cca875b10032b22fc"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "3385f3aa8432a66b4f400158ba079808a0982c6b"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "aad77f411f5c3a6161bbb6b80566d9065e15c8a0"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "98820960354c89dc9e7178b3c783df733597ef27"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "77c3946d778ccea30f22a08f38d5336110d87d43"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "63c7a82cbfc8d5c52424244ccab51868aa498416"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "a590ff89b5616463ce32091c09c0b74d6f6a8773"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "4e7902977f83139926131db13731632a9c4e105c"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "2d7a1e725ae2aad6dfcc2e9d891999a40a242fe9"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "fad0d47e75d9191d85d5d1e6bf2f9f4f5ec08fb2"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "ab42e792567affd3007848822eb26afc2bea0e94"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "3faa798e14f9acd36a120b9f4e9c961c27df825c"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "afe90e25771a101286365d37470f00c52a8f2392"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "aed0d96aa093a9f168c702d4e1c39d5c6077df3b"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "e3faf40265be42ca2c0412a97b4ac689c9d5d6a4"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "1ef2f1f69c042a2aeb340df9faf9019df19dbf35"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "bc026a910ea03aa795d59d81836ec5dd6efb1370"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "87a2923688d5a9eb63b8a41200ba5afc6c00d954"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "5067560a1a56d6cbbb163d2b73bce68451956413"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "74605669d56d0cc6e93fecce04d52771680f39f6"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "d749c4ad35a02c01e50358d11a1d7034ad402bce"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "1e0a75dfa4627afa34e2348c71c64501b6ebac12"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "43f703566076db2e3b08703d6e3faac336ffff88"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "b1bc08f9fd116d022c9c2710a9e25d176a1ee2a7"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "8fe7b6923d46f30ffbac5a97fe9bde7625a9bc26"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "93f2e69df2c32eb2c33d9a6bf91c00224f5de9e8"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "52341cf14ddb124bd591f161eb2c3c566307e6c0"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "733d6833cb71d5bd6727991c76f7907b4efeb1c9"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "2a5fe37753a3399ea8626615493fe3cac4b79586"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "0d1bf6bf337598d6e72762716264cb2662ab542c"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "5dbe72779e2c58cb0d0224e08582cfb1358fc47b"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "7bf51283965c48dad5aac2bffbd8223e83bc5c6f"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "2634b404ca6a9f6a3a194c911ca514311646461f"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "82ed3c27de426361f2cb73c9a34197d2548546d5"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "9e9a0eda6fd9354a06071b580686a5387ad291ec"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "e1416907d5748d10a5b0e74c4687787e7343db57"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "629ad488888ad62e60bd340e17d565af76b48337"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "d58c886482404929c18fe25cf3aece121eb6a8e7"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "e0cfc0a747aae13cf5cf54db6b72e72a5780372f"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "a2e5612b0007a11f74cb3fe330e2234d84f5d35c"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "eba10f9d0de6b9937f297ec742e05df53460bfec"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "a1ce06ca18bf93ff87c91fd8677dbe06eadf1159"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "180b531bf58f08d89c668b578a3c7c5380900f9f"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "484546422728623005a2d20470c7f6d06870ce96"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "f4526c827dcf1d0a11d38bd834807eb4b7f2923f"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "c75275e6a8a19213ea5eb063c8988634bbbe13cc"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "0fce05e81e0bb2bf6f7ce051cdee10ceaaaee4cb"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "6d8657b489008122b0a3dabc3b9bb5112529ae16"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "b5eff0843c96947d5aa7f7f74ec899630cb9e039"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "f2359b80b8afad50aab695d3cc14e461c21e46e3"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "b946a90928e0c7a389dbcf5728c08e7fc5042025"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "dbc60c45551b8db4be970efed6a397bf81d108e6"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "77c53b3a401dbfc930f2c5d94ebe6f1a090954e7"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "290f420ba933251168dce7c8e588541cdec886da"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "7c40435683e29fd3c7b541cd3ed2a69e39a14245"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "93d016bd3dfbd8b7ad4d8eceb94a638f6e66e751"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "2d05ef4da4eac47ee2b37d9d207a20b875ab6c3f"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "4c80bf8509b725c861ee744676e5f8229edd9acd"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "60406c09cef691b892dfffffe05d06182a0f5b03"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "f7f98b929f290a757dcd67d2f0abc09272e1524f"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "f73185d1c4d78247154ff4133092f12bcace0189"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "bc78cf179d1145771bc3d76808f47c3074aa848f"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "b6cd85fe49e367d36f75c89596cc6826de936c03"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "cc7468c85efaae4ad8f3c4dd629c07420095d6b7"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "51236372848448ad80210d340ba5f03b851b1434"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "1cd44cdb36f17d922b04e6f1f31721495b30d9a8"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "604de9669330503ea07e24d6f65c2586c6748730"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "ea9f909fd9b7c9125fc109db81ed313bad19ca26"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "d71c0b6d31940f24562a74b30349ecd4645b0ee9"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "0c4193b4dc6eae8b5f9515ca8a534f127ee083d8"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "cd254aabf8c7cf63c83bec1005ef0e9f540eed7c"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "9944dd6c0cb20bcd8f513c0cdabe62245b0212dc"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "7452f16a96293f871ac9ac99b37f7b855b8e2acf"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "2036043c9edcaf3e85c2c9b33ae4166d339c3185"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "6b4018c8c4f6f6161f51b1fd629fa5c0ddf452d2"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "af09c61146d407ab2e6baa3f71ce859a246cb559"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "8b41790e1c6941c1b46c1e06b21c6254fee49c51"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "fbaee422c7746c10e2537fbc8fdf86d322e49a6c"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "65d5ce60fc3848c46b88c5e7229e25f412e1d5bf"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "b865c22c6c60d21ba00a60a54a9d03a5c34254cf"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "648dec573c9d0f680be469bad8b38fe6d3550899"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "b3f58a6053079be6231f843f05daf481c39edf6d"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "bab9d483870909d705fa77bcfb9d8c08966bae50"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "0b5babaeec839aedb879b98dc540a3c44e1c0a39"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "c70e123c8e04a8366e2a96a948006caf3b084d2f"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "a17ad952ce2ec1dfe6dc797b4377ae694930578c"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "dbf6b871e6ac7a5701a5e8ce1aa1c974e43c62db"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "e7f9d73339eb55d374a172445c11da33ecff8f8f"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "b619fc248f8cd704eebbf92bd999949e0a0d2935"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "09cb9ee2b5a9d25430467961657a4d60610437d2"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "c8b63f07ee7ac0d2f4e18f6e401d012c8bfcceae"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "d20033996503ad6f690e8fe8f8201bf02c453c98"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "f8b45a57a2ed4ce232d20224afdc6c4e0338743a"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "567ac67210f34a267e53f74f31cc91131f07eaa7"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "9cef9f6a5fbca4e1d0bc912dddf07200f1f8f8a4"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "346d439ea1092f3c9a7d7077bb2fe3910d672935"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "b099cc648318d7826949110d75851108f8dd2669"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "3b72f45ccd22beb2fdfbc92014b4a3ccfa80e76b"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "e38710c2d1f90202813d95b2fde32fdde4d4091e"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "12a179f42fb8c3a11fc5985667e4f604e14ba8c5"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "6407a7b3cd5b4dcb306823a4085c85f960c292f9"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "9c49871f3ff4ecfe33077c6ebf05e166d19651a0"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "8d6299fe5998113da4c623083957a204296affd5"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "06a6c73f4a640060ae7b8aa02011558d2767acb2"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "8fffb7568b982c1202de754cb2a2e8fcb16910f5"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "31a8674c191829fa4abeb403053b8266f23b983c"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "bb86a2aafcf5d6d358eeda8e572956b90ca1e275"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "3db0fafa71f7e1fe0cc9036c343d12aa35988e04"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "4ddd0c373b00621fa271a1301e75930f5acc6657"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "6e240781d53a1853ee5be2eee18cdcb17949a228"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "d203791c4ce8da5d2e68a3485f3bed8933f929d3"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "0e4097922c16620c04bb68cd3474f813cf8c60e0"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "39bfc23dd04a59f3465e8a0b583ca72fc9bc2c8a"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "82887b30873baff493688a3d9b2b8acb0e335ed1"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "d48e6977535776e5547969c486abb68f4a7f70d2"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "d9aad735745addbbe619ce51c6b793ce10a967bf"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "c429c1b6e38523b9912d5c9ae1425a48075fb2fd"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "9fe1aaab4c8f53b4d01b1374511121a3cba3b38d"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "b5759e44971e09703f4112499c85347fc30a5ef1"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "0e91e95057246a9843faca8a0c53b772f329d51d"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "b5cf9660cc877d3ca6943f4d365f02f3b5eb4ffa"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "116118d2e4540502c2b71c9d1fcf121923016d8d"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "fdbefa73fb355d4a97b7be2cc7f2785757c62d72"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "f9055260509b2bc85a7e8a95d13c90be4443054f"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "a5b880cea53c7ae278f6d6bb70208d697d2aa928"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "77ca3d79ff9d8ebef0dac367b0025515663d11b0"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "40f3c82cc93286032facea886636e95558ecedf3"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "1ecc581714b9ee079bea5de14cffdd35cea8a253"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "e5c270d9f4443068ba83dd6dcd7fb1bc318a8957"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "c6db2b2d54257eb9376a95a63a8ec630661b859f"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "bb561dd4a2cd0e72f6ec8d4abd7d30505603fbdf"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "00d3aa2504711fa89190068427e9c8c3fdb20f8e"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "4f0950bf70cea56969bf044d459799d54675b0ef"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "dbfc82675022ddf4ca69bd64aedd62b7c670b6e0"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "7c28e93a85543021861eb9314d3661edda04b086"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "b39ac627848ade0617430e284fed55d3ae846b8d"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "3ae901876dbe64fa30969dedc1d60e092a4f7924"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "0d20bc9316882548fa3ce9797af3fdc95ff88cfe"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "3a94683a81a76ce73453f2b3466c256b3e3e1e66"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "88998fc8b637cbde34c37120e637ebd1a080f75b"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "374cc24a23cc80c552044c43dbc2547d9adb2661"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "1a6ad2c0d105daadf68db573871f45e6a83a8781"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "a43817b520218e6f5b83365bb6d5784f82fd3c61"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "be03aa731ca6385f447d21e5b089fce89abdb605"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "dcadd18432c9dbd31c23ba260c1b278e96620c55"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "e40cba8fb39620ac3e065e27ae9bb2756d5f0808"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "81d7b1212a49d3e3f4cce405bb32ab8b57b53183"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "d1719489c95ad26dee243f4b13a7a3c13c80731a"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "a5a86761df367d015d6b63f85db7c091be9f7557"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "cb934acf447a20761fb61be41a5093011962ed74"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "b08541d43c30c64df64f1fa9e3e444a00a1ce66b"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "5f6b9a343ad93c969ff864775cacbf008fd5683c"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "e1551063d40661de6a0067bb6d51ad0e89ad08f6"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "9c07080670ec9f1a57aec634f81cfd73defd9ccf"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "44eeb1185f75ba2a8e4a34c161161862a12dc54c"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "26d12843a80bcbe4ea8008429bd075794e9dab20"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "89fec10ec8be9a298fed4ae5ebda68b117ee35ad"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "13bea7053d38cb7d00950cf4d13fe06cab33b4e7"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "1c927583ab814caac16ece34156110826ddbdf37"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "1c8ca9891483fe489f26b82d5b81562223af1210"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "88db986d9de826407f1692c1fddc64068eb190bb"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "db25c5d46fbab8692882bf32422eb334a5790ed4"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "a50bf1a7277a7bbbc162a547916abae63a49becd"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "b4500262a14c781546966bc713c1a574b29bd221"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "196c388eb6bc00099196cc6774fa2fa327b36d81"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "19e5c34a64a0a2d7258f285ad3d4182e0c1859e2"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "cf17768842cdbfc3fb4f922655e102ace1420b4c"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "60cb1312edde3d610ba7b786f7e0030066c097fc"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "82535ac23e75f77767a844735b5950109ed7ef15"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "15bdb9f7b06ad28ab5bb6a219afc2cf98bd94689"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "ba4aa04ea6380d6ca9e5776806f478da3a18acf2"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "30319593b61aa454c72e372c47c97fd98e425cfa"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "364734483184c769370ca2948dc9335bfe6fe1ba"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "5b5bf58fb96072590d4d3e9e1f7239c352910b49"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "bee00bc517deaa46d5e409d80b54f19bf8133e44"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "17d313829c47fc57256181b5a916605860f5c20f"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "69d536b6c14b29a86503cf9d492e20318e6ca550"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "01e1fa5218459dc6e32d7a4d51bd120bc96c3f13"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "24cfbe861062ba1f3e5847b4b05c925a2db52518"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "b01bd9bff5d31998f69cbc18c31df3798346d5bb"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "ab0a0ffc3816923384f519caef4b07830526a3b1"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "e310ae1b0f32c67ccc03097fe9917f37eca3b271"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "2d746d4743ca5be9dfb082129f2527ef4453e8f8"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "9053948612aa9de8898d7e3606eb08d855fff41a"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "b3c621a120756aba91c985deb06a31051b63468f"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "ef7480dc06af7376387a27da47e49bd2e5078453"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "c23f9b1832ab1d0317d09017c5a39824638da921"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha1 = "eea8f9b4832b6bdc61b0cd4dedb5d78aae02c953"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "75f4856b28f589098599a786a242681a911ff92e"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "5ca3104abb9636ffcd5cdf913b14f48ba2a03977"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "8edb7885b506d1b4288bded01dccb00b89c929f2"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "2776e9dc93263ac8c7cf757e0a03f71b0a3d2a9c"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "7ec1dc5df673394c3e61293d92d369045a0d2bd6"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "1582f2552bc644729ffcb0d42b405e065a56ca9c"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "5e24d1ce8e6b74883dabb70dc1ac03c034e6e659"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "f8df723a211049e853628b5f2dd7240b4216871c"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "2cb69569638090ae09d552e95aaae40b876144e3"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "ca3790624a90e49e7271bccf3870a8da629df074"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "ebe6e83ee9f2fce3823d01c4900231bc00682fba"; }
   ];
 }

From cc802f4940a09f813102663e1c3d313d6a9ae1aa Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 12 Jul 2015 04:41:17 +0200
Subject: [PATCH 2117/2322] postfix: 2.11.4 -> 2.11.5

---
 pkgs/servers/mail/postfix/2.11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/postfix/2.11.nix b/pkgs/servers/mail/postfix/2.11.nix
index 817f559cbd5..bfd10fb591b 100644
--- a/pkgs/servers/mail/postfix/2.11.nix
+++ b/pkgs/servers/mail/postfix/2.11.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
 
   name = "postfix-${version}";
 
-  version = "2.11.4";
+  version = "2.11.5";
 
   src = fetchurl {
     url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz";
-    sha256 = "07h3rdfgs449hb49rxcx4iapib0l0zchnhscgn4h00wcnlflq5gl";
+    sha256 = "11riz8ggaa09pi8d6xv2807qp7yjn918mrylfvkfwmvcdlgwck0a";
   };
 
   patches = [ ./postfix-2.11.0.patch ];

From d83459df91b08dea064ab9a795f8e471e3397f57 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 12 Jul 2015 04:39:09 +0200
Subject: [PATCH 2118/2322] rofi: 0.15.5 -> 0.15.7

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

diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 55f63d99ce2..88512deb982 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "rofi-${version}";
-  version = "0.15.5";
+  version = "0.15.7";
 
   src = fetchurl {
     url = "https://github.com/DaveDavenport/rofi/archive/${version}.tar.gz";
-    sha256 = "16dffwxqxcx5krb6v1m6gh0r6d0a4hwl0jq4fdyblcv9xid5hxf5";
+    sha256 = "0alygwc82shkg9lmy8r5vmgd84imx1f9pndrisjpisl8h28dw5dq";
   };
 
   buildInputs = [ autoconf automake pkgconfig libX11 libXinerama libXft pango

From 69364f136e5881b093584ca2bcd14903ab951eea Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sun, 12 Jul 2015 11:56:20 +0900
Subject: [PATCH 2119/2322] flashplayer: 11.2.202.468 -> 11.2.202.481

---
 .../browsers/mozilla-plugins/flashplayer-11/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index cff6f33a49d..7eed1b9a04d 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -36,7 +36,7 @@
 
 let
   # -> http://get.adobe.com/flashplayer/
-  version = "11.2.202.468";
+  version = "11.2.202.481";
 
   src =
     if stdenv.system == "x86_64-linux" then
@@ -47,7 +47,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "1vybrw5cwhl4zz9z4fy1lnvs60zz382blas7kann7wj8r4pvx0zl";
+        sha256 = "151di671xqywjif3v4hbsfw55jyd5x5qjq2zc92xw367pssi29yz";
       }
     else if stdenv.system == "i686-linux" then
       if debug then
@@ -60,7 +60,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "1bczdgda040nnfmr9sq4q1a0dy9zbnq76g4dsjw3md4glxkmqv8l";
+        sha256 = "05ydrw1ykp49b409bkpvizhf1bz1xmfxa7alfdnabvg90vkfvyvn";
       }
     else throw "Flash Player is not supported on this platform";
 

From 452910527123dccd205e828dcee3748ed9d78bc7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 11 Jul 2015 20:10:40 -0700
Subject: [PATCH 2120/2322] kernel: 3.10.82 -> 3.10.84

---
 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 42b90a48097..3d2b683ee72 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, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.82";
+  version = "3.10.84";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "177rzyd9mxvbacy242abk7annhlm48rbdspr78y5qqsqsgihh88y";
+    sha256 = "042cybswcxxzi22h96i4h73a4hcb4drhifs6l9jqlqamdn6xabd3";
   };
 
   features.iwlwifi = true;

From 680e2ced04abb76063075930356731764f3c1eca Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 11 Jul 2015 20:11:00 -0700
Subject: [PATCH 2121/2322] kernel: 3.18.17 -> 3.18.18

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 843172581cc..b0b4c6ed5bd 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.18.17";
+  version = "3.18.18";
   extraMeta.branch = "3.18";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "08512kqvy91jh26jld2h3d9xq3wsfbyylzawjgn75x4r5li6y5ha";
+    sha256 = "1fcd4xfnywwb3grdvcnf39njwzb40v10rnzagxqmancsaqy253jv";
   };
 
   features.iwlwifi = true;

From 75b7938ba23845aa845c23a7058bb73322dc1202 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 11 Jul 2015 20:11:20 -0700
Subject: [PATCH 2122/2322] kernel: 4.1.1 -> 4.1.2

---
 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 5d9a026f614..5405ae9956d 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, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1.1";
+  version = "4.1.2";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "12bfih081cbqlgmgq1fqdvvpxga5saj4kkvhawsl4fpg4mybrml8";
+    sha256 = "1mdyjhnzhh254cblahqmpsk226z006z6sm9dmwvg6jlhpsw4cjhy";
   };
 
   features.iwlwifi = true;

From 3284b216a4fc1a758bcfc33ca093a0ad24841430 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 11 Jul 2015 20:11:12 -0700
Subject: [PATCH 2123/2322] kernel: 4.0.7 -> 4.0.8

---
 pkgs/os-specific/linux/kernel/linux-4.0.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-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix
index 3ea4257a1e9..8607bcf70cf 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.0.7";
+  version = "4.0.8";
   # Remember to update grsecurity!
   extraMeta.branch = "4.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "01c68w6lygzjzllv7xgnd1hm3339rs0fvd8q26n6bdfa95aj554m";
+    sha256 = "1cggqi5kdan818xw5g5wmapcsf501f5m9bympsy6a2cpphknfdmn";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index d305359061a..2ef35db1270 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -72,10 +72,10 @@ rec {
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "4.0.7";
-      revision  = "201506300712";
+    { kversion  = "4.0.8";
+      revision  = "201507111211";
       branch    = "test";
-      sha256    = "0rw0wx5nc244m2q7f9y832mmkv8gb8yv1rn1w2pyq8brckiswni7";
+      sha256    = "1p9ym8hbwaan9pgxgn8k4rm3n33wl8ag1fzmyr5f4mxs634wgwgx";
     };
 
   grsec_fix_path =

From 0245b287965c821f7ddf92bc230996850a492e3b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 11 Jul 2015 20:10:53 -0700
Subject: [PATCH 2124/2322] kernel: 3.14.47 -> 3.14.48

---
 pkgs/os-specific/linux/kernel/linux-3.14.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-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 90a6a59ed4a..377f0271aea 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.47";
+  version = "3.14.48";
   # Remember to update grsecurity!
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1hh24p0axh0kn49b0rqfmb1h74a0ry1pgy0ps1hgxs5x3lxby783";
+    sha256 = "098a7kjfw4jf0f7h6z57f2719jfz3y3jjlcd8y6d95xvhy7xxyw9";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 2ef35db1270..a8fc0166508 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -65,10 +65,10 @@ rec {
   };
 
   grsecurity_stable = grsecPatch
-    { kversion  = "3.14.47";
-      revision  = "201507050832";
+    { kversion  = "3.14.48";
+      revision  = "201507111210";
       branch    = "stable";
-      sha256    = "0sv7aa7ca2n5jiz4j5vvji1x2p7cb1ah71h1iqmk0981dqs0isp8";
+      sha256    = "0phmqlkx6vqlv79ppf6g4wsx7rwsvwpakpkm9xsq8qazffk7s9qk";
     };
 
   grsecurity_unstable = grsecPatch

From a21ead3d62069ddaa5b4f7f6c618a39a412967e5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 29 Jun 2015 12:58:07 +0200
Subject: [PATCH 2125/2322] jool: init at 3.3.2

Jool is a SIIT and a NAT64 implementation for Linux.
---
 pkgs/os-specific/linux/jool/cli.nix     | 22 ++++++++++++++++++
 pkgs/os-specific/linux/jool/default.nix | 30 +++++++++++++++++++++++++
 pkgs/os-specific/linux/jool/source.nix  |  9 ++++++++
 pkgs/top-level/all-packages.nix         |  3 +++
 4 files changed, 64 insertions(+)
 create mode 100644 pkgs/os-specific/linux/jool/cli.nix
 create mode 100644 pkgs/os-specific/linux/jool/default.nix
 create mode 100644 pkgs/os-specific/linux/jool/source.nix

diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix
new file mode 100644
index 00000000000..8fb37ed1c5b
--- /dev/null
+++ b/pkgs/os-specific/linux/jool/cli.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchzip, autoreconfHook, pkgconfig, libnl }:
+
+let
+  sourceAttrs = (import ./source.nix) { inherit fetchzip; };
+in
+
+stdenv.mkDerivation {
+  name = "jool-cli-${sourceAttrs.version}";
+
+  src = sourceAttrs.src;
+
+  sourceRoot = "Jool-${sourceAttrs.version}.zip/usr";
+
+  buildInputs = [ autoreconfHook pkgconfig libnl ];
+
+  meta = with stdenv.lib; {
+    homepage = https://www.jool.mx/;
+    description = "Fairly compliant SIIT and Stateful NAT64 for Linux - CLI tools";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix
new file mode 100644
index 00000000000..fdb2f041a65
--- /dev/null
+++ b/pkgs/os-specific/linux/jool/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchzip, kernel }:
+
+let
+  sourceAttrs = (import ./source.nix) { inherit fetchzip; };
+in
+
+stdenv.mkDerivation {
+  name = "jool-${sourceAttrs.version}-${kernel.version}";
+
+  src = sourceAttrs.src;
+
+  prePatch = ''
+    sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i mod/*/Makefile
+  '';
+
+  buildPhase = ''
+    make -C mod
+  '';
+
+  installPhase = ''
+    make -C mod modules_install INSTALL_MOD_PATH=$out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://www.jool.mx/;
+    description = "Fairly compliant SIIT and Stateful NAT64 for Linux - kernel modules";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix
new file mode 100644
index 00000000000..196167667e0
--- /dev/null
+++ b/pkgs/os-specific/linux/jool/source.nix
@@ -0,0 +1,9 @@
+{ fetchzip }:
+
+rec {
+  version = "3.3.2";
+  src = fetchzip {
+    url = "https://www.jool.mx/download/Jool-${version}.zip";
+    sha256 = "0hc6vlxzmjrgf7vjcwprdqcbx3biq8kphks5k725mrd9rb84drgw";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3e7849dd1a..fafb11bb6da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9550,6 +9550,8 @@ let
 
   jfbview = callPackage ../os-specific/linux/jfbview { };
 
+  jool-cli = callPackage ../os-specific/linux/jool/cli.nix { };
+
   jujuutils = callPackage ../os-specific/linux/jujuutils { };
 
   kbd = callPackage ../os-specific/linux/kbd { };
@@ -9792,6 +9794,7 @@ let
 
     klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { });
 
+    jool = callPackage ../os-specific/linux/jool { };
 
     /* compiles but has to be integrated into the kernel somehow
        Let's have it uncommented and finish it..

From 98fb18af3ed0a0315a28ed017e2e88146e28453c Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Sat, 11 Jul 2015 21:17:59 -0700
Subject: [PATCH 2126/2322] python-2.6: mark broken because being insecure for
 years

---
 pkgs/development/interpreters/python/2.6/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 29e3ecd20b1..28f53f8ca95 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -9,7 +9,6 @@ let
   majorVersion = "2.6";
   version = "${majorVersion}.9";
 
-  # python 2.6 will receive security fixes until Oct 2013
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
     sha256 = "0hbfs2691b60c7arbysbzr0w9528d5pl8a4x7mq5psh6a2cvprya";
@@ -118,6 +117,10 @@ let
       license = stdenv.lib.licenses.psfl;
       platforms = stdenv.lib.platforms.all;
       maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ];
+      # 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;
     };
   };
 

From 452745d5abde81ae295e71b6c67d15e1fd1f8bd3 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Sat, 11 Jul 2015 21:31:35 -0700
Subject: [PATCH 2127/2322] cudatoolkit65, cudatoolkit7: use python-2.7

@vcunat confirms they still build
---
 pkgs/top-level/all-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3e7849dd1a..d84df90324b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1188,12 +1188,10 @@ let
 
   cudatoolkit65 = import ../development/compilers/cudatoolkit/6.5.nix {
     inherit callPackage;
-    python = python26;
   };
 
   cudatoolkit7 = import ../development/compilers/cudatoolkit/7.0.nix {
     inherit callPackage;
-    python = python26;
   };
 
   cudatoolkit = cudatoolkit5;

From 2e49828d9ce7a33b4d8061c0d127aa860ce86a5a Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sun, 12 Jul 2015 20:25:54 +1200
Subject: [PATCH 2128/2322] firefox sync-server service: make path to paster
 executable absolute

The systemd service was ignoring ExecStart because the path to the
paster executable was not absolute. Because ExecStart was ignored, the
service would not start.
---
 nixos/modules/services/networking/firefox/sync-server.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix
index 79f32f3358c..70d2d72ca8b 100644
--- a/nixos/modules/services/networking/firefox/sync-server.nix
+++ b/nixos/modules/services/networking/firefox/sync-server.nix
@@ -135,7 +135,7 @@ in
           echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')"
         fi
       '';
-      serviceConfig.ExecStart = "paster serve ${syncServerIni}";
+      serviceConfig.ExecStart = "${pkgs.pythonPackages.pasteScript}/bin/paster serve ${syncServerIni}";
     };
 
   };

From 88c7e86706a5492ad270ba36a9f711a626bccdc6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Jul 2015 09:00:13 +0000
Subject: [PATCH 2129/2322] datashape: init at 0.4.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 377afc06624..3a08244463e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2565,6 +2565,23 @@ let
     };
   });
 
+  datashape = buildPythonPackage rec {
+    name = "datashape-${version}";
+    version = "0.4.6";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/D/DataShape/${name}.tar.gz";
+      sha256 = "0caa86a4347f1b0c45f3890d78d0b89662189c7dd6df3a8e5ff3532ae8bc434f";    
+    };
+    
+    propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ];
+    
+    meta = {
+      homepage = https://github.com/ContinuumIO/datashape;
+      description = "A data description language";
+      license = licenses.bsd2;
+    };
+  };
 
   dateutil = buildPythonPackage (rec {
     name = "dateutil-2.2";

From df8d620bf395affad6b989098ca6ab021fbcb30f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Jul 2015 09:24:42 +0000
Subject: [PATCH 2130/2322] odo: init at 0.3.3

---
 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 377afc06624..bb0963fcb80 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8324,6 +8324,24 @@ let
     };
   });
 
+  odo = buildPythonPackage rec {
+    name = "odo-${version}";
+    version= "0.3.3";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/o/odo/${name}.tar.gz";
+      sha256 = "2499ee86c26c74daa28f21ed235ca331911065950deea5169ebdb7d5dae6ebef";
+    };
+    
+    propagatedBuildInputs = with self; [ datashape numpy pandas toolz multipledispatch networkx ];
+    
+    meta = {
+      homepage = https://github.com/ContinuumIO/odo;
+      description = "Data migration utilities";
+      license = licenses.bsd4;
+    };
+  };
+  
   offtrac = buildPythonPackage rec {
     name = "offtrac-0.1.0";
     meta.maintainers = with maintainers; [ mornfall ];

From 0731489953dfd6f5a9f6949729f5383a517b2e18 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Sun, 12 Jul 2015 12:09:40 +0200
Subject: [PATCH 2131/2322] all tests: added meta.maintainers section

---
 nixos/lib/testing.nix             | 12 ++++++++----
 nixos/release.nix                 |  2 --
 nixos/tests/avahi.nix             |  8 +++++---
 nixos/tests/bittorrent.nix        |  3 +++
 nixos/tests/blivet.nix            |  3 +++
 nixos/tests/cadvisor.nix          |  7 +++++--
 nixos/tests/check-filesystems.nix |  3 +++
 nixos/tests/chromium.nix          |  3 +++
 nixos/tests/cjdns.nix             |  7 +++++--
 nixos/tests/containers.nix        |  7 +++++--
 nixos/tests/docker-registry.nix   |  7 +++++--
 nixos/tests/docker.nix            |  8 +++++---
 nixos/tests/etcd.nix              |  7 +++++--
 nixos/tests/firefox.nix           |  3 +++
 nixos/tests/firewall.nix          |  8 +++++---
 nixos/tests/fleet.nix             |  7 +++++--
 nixos/tests/gitlab.nix            |  7 +++++--
 nixos/tests/gnome3.nix            |  8 +++++---
 nixos/tests/i3wm.nix              |  7 +++++--
 nixos/tests/influxdb.nix          |  7 +++++--
 nixos/tests/installer.nix         |  7 +++++--
 nixos/tests/ipv6.nix              |  8 +++++---
 nixos/tests/jenkins.nix           |  7 +++++--
 nixos/tests/kde4.nix              |  3 +++
 nixos/tests/kexec.nix             |  8 +++++---
 nixos/tests/kubernetes.nix        |  7 +++++--
 nixos/tests/lightdm.nix           |  7 +++++--
 nixos/tests/login.nix             |  3 +++
 nixos/tests/logstash.nix          |  7 +++++--
 nixos/tests/mesos.nix             |  7 +++++--
 nixos/tests/misc.nix              |  8 +++++---
 nixos/tests/mpich.nix             |  7 +++++--
 nixos/tests/mumble.nix            |  5 ++++-
 nixos/tests/munin.nix             |  7 +++++--
 nixos/tests/mysql-replication.nix |  5 ++++-
 nixos/tests/mysql.nix             |  7 +++++--
 nixos/tests/nat.nix               |  5 ++++-
 nixos/tests/networking-proxy.nix  |  8 +++++---
 nixos/tests/networking.nix        |  5 ++++-
 nixos/tests/nfs.nix               |  6 ++++--
 nixos/tests/nsd.nix               |  7 +++++--
 nixos/tests/openssh.nix           |  3 +++
 nixos/tests/panamax.nix           |  7 +++++--
 nixos/tests/peerflix.nix          |  8 +++++---
 nixos/tests/phabricator.nix       |  3 +++
 nixos/tests/printing.nix          |  4 +++-
 nixos/tests/proxy.nix             |  6 ++++--
 nixos/tests/quake3.nix            |  5 ++++-
 nixos/tests/rabbitmq.nix          |  3 +++
 nixos/tests/simple.nix            |  7 +++++--
 nixos/tests/subversion.nix        |  5 ++++-
 nixos/tests/tomcat.nix            |  8 +++++---
 nixos/tests/trac.nix              |  3 +++
 nixos/tests/udisks2.nix           |  3 +++
 nixos/tests/virtualbox.nix        |  3 +++
 nixos/tests/xfce.nix              |  8 +++++---
 56 files changed, 242 insertions(+), 92 deletions(-)

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index ee254ae187f..59d05f87d5f 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -122,12 +122,16 @@ rec {
             ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"}
         ''; # "
 
-      test = runTests driver;
+      passMeta = drv: drv // lib.optionalAttrs (t ? meta) {
+        meta = (drv.meta or {}) // t.meta;
+      };
 
-      report = releaseTools.gcovReport { coverageRuns = [ test ]; };
-
-    in (if makeCoverageReport then report else test) // { inherit nodes driver test; };
+      test = passMeta (runTests driver);
+      report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; });
 
+    in (if makeCoverageReport then report else test) // { 
+      inherit nodes driver test; 
+    };
 
   runInMachine =
     { drv
diff --git a/nixos/release.nix b/nixos/release.nix
index c288adfd206..cf0a00dd254 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -330,7 +330,5 @@ in rec {
         services.postgresql.package = pkgs.postgresql93;
         environment.systemPackages = [ pkgs.php ];
       });
-
   };
-
 }
diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix
index 3898ddb4e8e..a39104f603e 100644
--- a/nixos/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
@@ -1,7 +1,9 @@
 # Test whether `avahi-daemon' and `libnss-mdns' work as expected.
-
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ... } : {
   name = "avahi";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow wizeman ];
+  };
 
   nodes = {
     one =
@@ -52,4 +54,4 @@ import ./make-test.nix {
        $two->succeed("getent hosts one.local >&2");
        $two->succeed("getent hosts two.local >&2");
     '';
-}
+})
diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 0d0f00212a0..95bba075612 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -24,6 +24,9 @@ in
 
 {
   name = "bittorrent";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ iElectric eelco chaoflow rob wkennington ];
+  };
 
   nodes =
     { tracker =
diff --git a/nixos/tests/blivet.nix b/nixos/tests/blivet.nix
index 72c2a33f87e..33a79e65efe 100644
--- a/nixos/tests/blivet.nix
+++ b/nixos/tests/blivet.nix
@@ -1,5 +1,8 @@
 import ./make-test.nix ({ pkgs, ... }: with pkgs.pythonPackages; rec {
   name = "blivet";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ aszlig ];
+  };
 
   machine = {
     environment.systemPackages = [ pkgs.python blivet mock ];
diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix
index 225bf1a7483..1644cb856ce 100644
--- a/nixos/tests/cadvisor.nix
+++ b/nixos/tests/cadvisor.nix
@@ -1,5 +1,8 @@
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ... } : {
   name = "cadvisor";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ offline ];
+  };
 
   nodes = {
     machine = { config, pkgs, ... }: {
@@ -27,4 +30,4 @@ import ./make-test.nix {
       $influxdb->waitForUnit("cadvisor.service");
       $influxdb->succeed("curl http://localhost:8080/containers/");
     '';
-}
+})
diff --git a/nixos/tests/check-filesystems.nix b/nixos/tests/check-filesystems.nix
index 71aa9649840..cb9ff25f977 100644
--- a/nixos/tests/check-filesystems.nix
+++ b/nixos/tests/check-filesystems.nix
@@ -7,6 +7,9 @@ with import ../lib/build-vms.nix { inherit nixos nixpkgs system; };
 
 rec {
   name = "check-filesystems";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow ];
+  };
 
   nodes = {
     share = {pkgs, config, ...}: {
diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 6c2302594b9..26e179c3944 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -8,6 +8,9 @@ import ./make-test.nix (
 , ...
 }: rec {
   name = "chromium";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ aszlig ];
+  };
 
   enableOCR = true;
 
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index 45164234b1b..2cae63fdda4 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -22,8 +22,11 @@ let
 
 in
 
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "cjdns";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ emery ];
+  };
 
   nodes = rec
     { # Alice finds peers over over ETHInterface.
@@ -119,4 +122,4 @@ import ./make-test.nix {
 
       $bob->succeed("curl --fail -g http://[$aliceIp6]");
     '';
-}
+})
\ No newline at end of file
diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix
index e40a8100a06..c429f9c7b71 100644
--- a/nixos/tests/containers.nix
+++ b/nixos/tests/containers.nix
@@ -1,7 +1,10 @@
 # Test for NixOS' container support.
 
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "containers";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ aristid aszlig eelco chaoflow ];
+  };
 
   machine =
     { config, pkgs, ... }:
@@ -113,4 +116,4 @@ import ./make-test.nix {
       $machine->fail("nixos-container destroy webserver");
     '';
 
-}
+})
diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix
index cc3c4774680..eed3284202f 100644
--- a/nixos/tests/docker-registry.nix
+++ b/nixos/tests/docker-registry.nix
@@ -1,7 +1,10 @@
 # This test runs docker-registry and check if it works
 
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "docker-registry";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ offline ];
+  };
 
   nodes = {
     registry = { config, pkgs, ... }: {
@@ -37,4 +40,4 @@ import ./make-test.nix {
     $client2->succeed("docker pull registry:8080/scratch");
     $client2->succeed("docker images | grep scratch");
   '';
-}
+})
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix
index fc6449b28d3..babb2b8e00e 100644
--- a/nixos/tests/docker.nix
+++ b/nixos/tests/docker.nix
@@ -1,7 +1,10 @@
 # This test runs docker and checks if simple container starts
 
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "docker";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ offline ];
+  };
 
   nodes = {
     docker =
@@ -20,5 +23,4 @@ import ./make-test.nix {
     $docker->succeed("docker ps | grep sleeping");
     $docker->succeed("docker stop sleeping");
   '';
-
-}
+})
diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix
index ace5e05b170..8a4e7fffce0 100644
--- a/nixos/tests/etcd.nix
+++ b/nixos/tests/etcd.nix
@@ -1,7 +1,10 @@
 # This test runs etcd as single node, multy node and using discovery
 
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ... } : {
   name = "etcd";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ offline ];
+  };
 
   nodes = {
     simple =
@@ -105,4 +108,4 @@ import ./make-test.nix {
       $discovery2->waitUntilSucceeds("etcdctl get /foo/bar | grep 'Hello world'");
     };
   '';
-}
+})
diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index 77a6f6ac9e7..67a2779afc2 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -1,5 +1,8 @@
 import ./make-test.nix ({ pkgs, ... }: {
   name = "firefox";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow shlevy ];
+  };
 
   machine =
     { config, pkgs, ... }:
diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix
index 16922508c7c..9faf19f0359 100644
--- a/nixos/tests/firewall.nix
+++ b/nixos/tests/firewall.nix
@@ -1,7 +1,10 @@
 # Test the firewall module.
 
-import ./make-test.nix {
+import ./make-test.nix ( { pkgs, ... } : {
   name = "firewall";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow ];
+  };
 
   nodes =
     { walled =
@@ -44,5 +47,4 @@ import ./make-test.nix {
       $walled->stopJob("firewall");
       $attacker->succeed("curl -v http://walled/ >&2");
     '';
-
-}
+})
diff --git a/nixos/tests/fleet.nix b/nixos/tests/fleet.nix
index c60f596b6f5..67c95446526 100644
--- a/nixos/tests/fleet.nix
+++ b/nixos/tests/fleet.nix
@@ -1,5 +1,8 @@
-import ./make-test.nix rec {
+import ./make-test.nix ({ pkgs, ...} : rec {
   name = "simple";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ offline ];
+  };
 
   nodes = {
     node1 =
@@ -70,4 +73,4 @@ import ./make-test.nix rec {
       $node1->succeed("fleetctl stop hello.service");
       $node1->succeed("fleetctl destroy hello.service");
     '';
-}
+})
diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix
index 27c65fe47e8..bce862b4ad8 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@@ -1,7 +1,10 @@
 # This test runs gitlab and checks if it works
 
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "gitlab";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ iElectric offline ];
+  };
 
   nodes = {
     gitlab = { config, pkgs, ... }: {
@@ -18,4 +21,4 @@ import ./make-test.nix {
     $gitlab->waitForUnit("gitlab-sidekiq.service");
     $gitlab->waitUntilSucceeds("curl http://localhost:8080/users/sign_in");
   '';
-}
+})
diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index 6f2925e52fa..f5e0159f1c7 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -1,5 +1,8 @@
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "gnome3";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ iElectric eelco chaoflow lethalman ];
+  };
 
   machine =
     { config, pkgs, ... }:
@@ -28,5 +31,4 @@ import ./make-test.nix {
       $machine->sleep(20);
       $machine->screenshot("screen");
     '';
-
-}
+})
diff --git a/nixos/tests/i3wm.nix b/nixos/tests/i3wm.nix
index 0966dba8a3c..627a150f641 100644
--- a/nixos/tests/i3wm.nix
+++ b/nixos/tests/i3wm.nix
@@ -1,5 +1,8 @@
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "i3wm";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ aszlig ];
+  };
 
   machine = { lib, pkgs, ... }: {
     imports = [ ./common/x11.nix ./common/user-account.nix ];
@@ -25,4 +28,4 @@ import ./make-test.nix {
     $machine->sleep(1);
     $machine->screenshot("terminal");
   '';
-}
+})
diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix
index 9f8ea061b96..0408d8983ad 100644
--- a/nixos/tests/influxdb.nix
+++ b/nixos/tests/influxdb.nix
@@ -1,7 +1,10 @@
 # This test runs influxdb and checks if influxdb is up and running
 
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "influxdb";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ chaoflow offline ];
+  };
 
   nodes = {
     one = { config, pkgs, ... }: {
@@ -33,4 +36,4 @@ import ./make-test.nix {
         --data-urlencode 'q=select * from foo limit 1' | grep 6666
     ~);
   '';
-}
+})
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 4da5c29ca0d..b2e1abc26ee 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -149,12 +149,15 @@ let
   makeInstallerTest = name:
     { createPartitions, preBootCommands ? "", extraConfig ? ""
     , grubVersion ? 2, grubDevice ? "/dev/vda"
-    , grubIdentifier ? "uuid", enableOCR ? false
+    , grubIdentifier ? "uuid", enableOCR ? false, meta ? {}
     }:
     makeTest {
       inherit enableOCR;
       name = "installer-" + name;
-
+      meta = with pkgs.stdenv.lib.maintainers; {
+        # put global maintainers here, individuals go into makeInstallerTest fkt call
+        maintainers = [ wkennington ] ++ (meta.maintainers or []);
+      };
       nodes = {
 
         # The configuration of the machine used to run "nixos-install". It
diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix
index 017511ea45c..4e2e6379cad 100644
--- a/nixos/tests/ipv6.nix
+++ b/nixos/tests/ipv6.nix
@@ -1,8 +1,11 @@
 # Test of IPv6 functionality in NixOS, including whether router
 # solicication/advertisement using radvd works.
 
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "ipv6";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow ];
+  };
 
   nodes =
     { client = { config, pkgs, ... }: { };
@@ -73,5 +76,4 @@ import ./make-test.nix {
 
       # TODO: test reachability of a machine on another network.
     '';
-
-}
+})
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index d737038380d..804cecd700c 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -3,8 +3,11 @@
 #   2. jenkins user can be extended on both master and slave
 #   3. jenkins service not started on slave node
 
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "jenkins";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ bjornfor coconnor iElectric eelco chaoflow ];
+  };
 
   nodes = {
 
@@ -41,4 +44,4 @@ import ./make-test.nix {
 
     $slave->mustFail("systemctl is-enabled jenkins.service");
   '';
-}
+})
\ No newline at end of file
diff --git a/nixos/tests/kde4.nix b/nixos/tests/kde4.nix
index dd2574fd02a..981813ba2bd 100644
--- a/nixos/tests/kde4.nix
+++ b/nixos/tests/kde4.nix
@@ -1,5 +1,8 @@
 import ./make-test.nix ({ pkgs, ... }: {
   name = "kde4";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ iElectric eelco chaoflow ];
+  };
 
   machine =
     { config, pkgs, ... }:
diff --git a/nixos/tests/kexec.nix b/nixos/tests/kexec.nix
index 0f0565a60e9..0f5ddef7b1a 100644
--- a/nixos/tests/kexec.nix
+++ b/nixos/tests/kexec.nix
@@ -1,7 +1,10 @@
 # Test whether fast reboots via kexec work.
 
-import ./make-test.nix  {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "kexec";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow ];
+  };
 
   machine = { config, pkgs, ... }:
     { virtualisation.vlans = [ ]; };
@@ -13,5 +16,4 @@ import ./make-test.nix  {
       $machine->{connected} = 0;
       $machine->waitForUnit("multi-user.target");
     '';
-
-}
+})
diff --git a/nixos/tests/kubernetes.nix b/nixos/tests/kubernetes.nix
index 0a9eda930ba..b19ea67b0ba 100644
--- a/nixos/tests/kubernetes.nix
+++ b/nixos/tests/kubernetes.nix
@@ -1,7 +1,10 @@
 # This test runs two node kubernetes cluster and checks if simple redis pod works
 
-import ./make-test.nix rec {
+import ./make-test.nix ({ pkgs, ...} : rec {
   name = "kubernetes";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ offline ];
+  };
 
   redisMaster = builtins.toFile "redis-master-pod.yaml" ''
       id: redis-master-pod
@@ -176,4 +179,4 @@ import ./make-test.nix rec {
     }
 
   '';
-}
+})
diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix
index dba20a49dbd..b355081ffd6 100644
--- a/nixos/tests/lightdm.nix
+++ b/nixos/tests/lightdm.nix
@@ -1,5 +1,8 @@
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "lightdm";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ aszlig ];
+  };
 
   machine = { lib, ... }: {
     imports = [ ./common/user-account.nix ];
@@ -22,4 +25,4 @@ import ./make-test.nix {
     $machine->waitForText(qr/^\d{2}(?::\d{2}){2} (?:AM|PM)$/m);
     $machine->screenshot("session");
   '';
-}
+})
diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix
index e8373219ca6..e793d89567b 100644
--- a/nixos/tests/login.nix
+++ b/nixos/tests/login.nix
@@ -2,6 +2,9 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
 
 {
   name = "login";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow ];
+  };
 
   machine =
     { config, pkgs, lib, ... }:
diff --git a/nixos/tests/logstash.nix b/nixos/tests/logstash.nix
index 7284cde7a33..317ea063e17 100644
--- a/nixos/tests/logstash.nix
+++ b/nixos/tests/logstash.nix
@@ -1,8 +1,11 @@
 # This test runs logstash and checks if messages flows and
 # elasticsearch is started.
 
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "logstash";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow offline ];
+  };
 
   nodes = {
     one =
@@ -37,4 +40,4 @@ import ./make-test.nix {
     $one->fail("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep dragons");
     $one->waitUntilSucceeds("curl -s http://127.0.0.1:9200/_status?pretty=true | grep logstash");
   '';
-}
+})
diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix
index 040f613c596..3610603aeba 100644
--- a/nixos/tests/mesos.nix
+++ b/nixos/tests/mesos.nix
@@ -1,5 +1,8 @@
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "simple";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ offline ];
+  };
 
   machine = { config, pkgs, ... }: {
     services.zookeeper.enable = true;
@@ -26,4 +29,4 @@ import ./make-test.nix {
       $machine->waitForUnit("mesos-master.service");
       $machine->waitForUnit("mesos-slave.service");
     '';
-}
+})
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index b44af5316be..ecec89226d6 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -1,7 +1,10 @@
 # Miscellaneous small tests that don't warrant their own VM run.
 
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "misc";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow ];
+  };
 
   machine =
     { config, lib, pkgs, ... }:
@@ -107,5 +110,4 @@ import ./make-test.nix {
           $machine->succeed("nix-store -qR /run/current-system | grep nixos-");
       };
     '';
-
-}
+})
diff --git a/nixos/tests/mpich.nix b/nixos/tests/mpich.nix
index a4ef7b62426..a28e41deb31 100644
--- a/nixos/tests/mpich.nix
+++ b/nixos/tests/mpich.nix
@@ -1,7 +1,10 @@
 # Simple example to showcase distributed tests using NixOS VMs.
 
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "mpich";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow ];
+  };
 
   nodes = {
     master =
@@ -35,4 +38,4 @@ import ./make-test.nix {
 
        $master->succeed("mpiexec -n 2 ./example >&2");
     '';
-}
+})
diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix
index 3759d73355d..35f44002699 100644
--- a/nixos/tests/mumble.nix
+++ b/nixos/tests/mumble.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix (
+import ./make-test.nix ({ pkgs, ...} : 
 
 let
   client = { config, pkgs, ... }: {
@@ -8,6 +8,9 @@ let
 in
 {
   name = "mumble";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ thoughtpolice eelco chaoflow ];
+  };
 
   nodes = {
     server = { config, pkgs, ... }: {
diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix
index 1e51453df83..16015d33552 100644
--- a/nixos/tests/munin.nix
+++ b/nixos/tests/munin.nix
@@ -1,8 +1,11 @@
 # This test runs basic munin setup with node and cron job running on the same
 # machine.
 
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "munin";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ iElectric eelco chaoflow ];
+  };
 
   nodes = {
     one =
@@ -29,4 +32,4 @@ import ./make-test.nix {
     $one->waitForFile("/var/lib/munin/one/one-uptime-uptime-g.rrd");
     $one->waitForFile("/var/www/munin/one/index.html");
   '';
-}
+})
diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
index 5786fdbc58c..0cd8c4484bd 100644
--- a/nixos/tests/mysql-replication.nix
+++ b/nixos/tests/mysql-replication.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix (
+import ./make-test.nix ({ pkgs, ...} :
 
 let
   replicateUser = "replicate";
@@ -7,6 +7,9 @@ in
 
 {
   name = "mysql-replication";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow shlevy ];
+  };
 
   nodes = {
     master =
diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix
index 0a753b9b625..58841161777 100644
--- a/nixos/tests/mysql.nix
+++ b/nixos/tests/mysql.nix
@@ -1,5 +1,8 @@
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "mysql";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow shlevy ];
+  };
 
   nodes = {
     master =
@@ -20,4 +23,4 @@ import ./make-test.nix {
     $master->sleep(10); # Hopefully this is long enough!!
     $master->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
   '';
-}
+})
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index c4d2614f785..4fbf6446268 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -3,12 +3,15 @@
 # client on the inside network, a server on the outside network, and a
 # router connected to both that performs Network Address Translation
 # for the client.
-import ./make-test.nix ({ withFirewall, ... }:
+import ./make-test.nix ({ pkgs, withFirewall, ... }:
   let
     unit = if withFirewall then "firewall" else "nat";
   in
   {
     name = "nat${if withFirewall then "WithFirewall" else "Standalone"}";
+  meta = with pkgs.stdenv.lib.maintainers; {
+      maintainers = [ eelco chaoflow rob wkennington ];
+    };
 
     nodes =
       { client =
diff --git a/nixos/tests/networking-proxy.nix b/nixos/tests/networking-proxy.nix
index 30844805ebf..4c572573140 100644
--- a/nixos/tests/networking-proxy.nix
+++ b/nixos/tests/networking-proxy.nix
@@ -10,8 +10,11 @@ let default-config = {
 
         virtualisation.memorySize = 128;
       };
-in import ./make-test.nix {
+in import ./make-test.nix ({ pkgs, ...} : {
   name = "networking-proxy";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [  ];
+  };
 
   nodes = {
     # no proxy
@@ -105,5 +108,4 @@ in import ./make-test.nix {
       $machine4->mustSucceed("su - alice -c 'env | grep -i ftp_proxy | grep 000'");
       $machine4->mustSucceed("su - alice -c 'env | grep -i no_proxy | grep 131415'");
     '';
-
-}
+})
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 2ea96ecb7ca..6a7f63702c4 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ networkd, test, ... }:
+import ./make-test.nix ({ pkgs, networkd, test, ... }:
   let
     router = { config, pkgs, ... }:
       with pkgs.lib;
@@ -389,4 +389,7 @@ import ./make-test.nix ({ networkd, test, ... }:
     case = testCases.${test};
   in case // {
     name = "${case.name}-Networking-${if networkd then "Networkd" else "Scripted"}";
+    meta = with pkgs.stdenv.lib.maintainers; {
+      maintainers = [ wkennington ];
+    };
   })
diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix
index 216fea7784a..963776dd2ac 100644
--- a/nixos/tests/nfs.nix
+++ b/nixos/tests/nfs.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ version ? 4, ... }:
+import ./make-test.nix ({ pkgs, version ? 4, ... }:
 
 let
 
@@ -18,6 +18,9 @@ in
 
 {
   name = "nfs";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow wkennington ];
+  };
 
   nodes =
     { client1 = client;
@@ -83,5 +86,4 @@ in
       my $duration = time - $t1;
       die "shutdown took too long ($duration seconds)" if $duration > 30;
     '';
-
 })
diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix
index c2331931cdd..0b1082056f6 100644
--- a/nixos/tests/nsd.nix
+++ b/nixos/tests/nsd.nix
@@ -5,8 +5,11 @@ let
     # for a host utility with IPv6 support
     environment.systemPackages = [ pkgs.bind ];
   };
-in import ./make-test.nix {
+in import ./make-test.nix ({ pkgs, ...} : {
   name = "nsd";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ aszlig ];
+  };
 
   nodes = {
     clientv4 = { lib, nodes, ... }: {
@@ -80,4 +83,4 @@ in import ./make-test.nix {
       };
     }
   '';
-}
+})
diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix
index 692618c5a84..34f9fccb79b 100644
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@@ -17,6 +17,9 @@ let
 
 in {
   name = "openssh";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ aszlig eelco chaoflow ];
+  };
 
   nodes = {
 
diff --git a/nixos/tests/panamax.nix b/nixos/tests/panamax.nix
index 80af8a19be1..088aa79f8c6 100644
--- a/nixos/tests/panamax.nix
+++ b/nixos/tests/panamax.nix
@@ -1,5 +1,8 @@
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "panamax";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ offline ];
+  };
 
   machine = { config, pkgs, ... }: {
     services.panamax.enable = true;
@@ -15,4 +18,4 @@ import ./make-test.nix {
       $machine->succeed("curl --fail http://localhost:8888/ > /dev/null");
       $machine->shutdown;
     '';
-}
+})
diff --git a/nixos/tests/peerflix.nix b/nixos/tests/peerflix.nix
index 739936a10b2..eb729f22f91 100644
--- a/nixos/tests/peerflix.nix
+++ b/nixos/tests/peerflix.nix
@@ -1,7 +1,10 @@
 # This test runs peerflix and checks if peerflix starts
 
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "peerflix";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ offline ];
+  };
 
   nodes = {
     peerflix =
@@ -17,5 +20,4 @@ import ./make-test.nix {
     $peerflix->waitForUnit("peerflix.service");
     $peerflix->waitUntilSucceeds("curl localhost:9000");
   '';
-
-}
+})
diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix
index 0fe31f66502..3bf83ab6665 100644
--- a/nixos/tests/phabricator.nix
+++ b/nixos/tests/phabricator.nix
@@ -1,5 +1,8 @@
 import ./make-test.nix ({ pkgs, ... }: {
   name = "phabricator";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ chaoflow ];
+  };
 
   nodes = {
     storage =
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 1e3a0057c65..b1c2e74136c 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -2,6 +2,9 @@
 
 import ./make-test.nix ({pkgs, ... }: {
   name = "printing";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ iElectric eelco chaoflow jgeerds vcunat ];
+  };
 
   nodes = {
 
@@ -90,5 +93,4 @@ import ./make-test.nix ({pkgs, ... }: {
           };
       }
     '';
-
 })
diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix
index 8350bc5c6a4..1653c9b2fda 100644
--- a/nixos/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix (
+import ./make-test.nix ({ pkgs, ...} : 
 
 let
 
@@ -15,6 +15,9 @@ in
 
 {
   name = "proxy";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow ];
+  };
 
   nodes =
     { proxy =
@@ -89,5 +92,4 @@ in
       $backend2->unblock;
       $client->succeed("curl --fail http://proxy/");
     '';
-
 })
diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix
index e0e6d6eaadb..c72d94e11a8 100644
--- a/nixos/tests/quake3.nix
+++ b/nixos/tests/quake3.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix (
+import ./make-test.nix ({ pkgs, ...} :
 
 let
 
@@ -14,6 +14,9 @@ in
 
 rec {
   name = "quake3";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ iElectric eelco chaoflow ];
+  };
 
   # TODO: lcov doesn't work atm
   #makeCoverageReport = true;
diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix
index 3ef3f92764c..23a7e2ed538 100644
--- a/nixos/tests/rabbitmq.nix
+++ b/nixos/tests/rabbitmq.nix
@@ -2,6 +2,9 @@
 
 import ./make-test.nix ({ pkgs, ... }: {
   name = "rabbitmq";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow offline ];
+  };
 
   nodes = {
     one = { config, pkgs, ... }: {
diff --git a/nixos/tests/simple.nix b/nixos/tests/simple.nix
index 1cd9058f9e5..287712be316 100644
--- a/nixos/tests/simple.nix
+++ b/nixos/tests/simple.nix
@@ -1,5 +1,8 @@
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "simple";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco ];
+  };
 
   machine = { config, pkgs, ... }: { };
 
@@ -9,4 +12,4 @@ import ./make-test.nix {
       $machine->waitForUnit("multi-user.target");
       $machine->shutdown;
     '';
-}
+})
diff --git a/nixos/tests/subversion.nix b/nixos/tests/subversion.nix
index 50277edbdd8..a8e33a6f7e5 100644
--- a/nixos/tests/subversion.nix
+++ b/nixos/tests/subversion.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix (
+import ./make-test.nix ({ pkgs, ...} : 
 
 let
 
@@ -33,6 +33,9 @@ in
 
 {
   name = "subversion";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow ];
+  };
 
   nodes =
     { webserver =
diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix
index f3ee3477b5a..92680d82ba8 100644
--- a/nixos/tests/tomcat.nix
+++ b/nixos/tests/tomcat.nix
@@ -1,5 +1,8 @@
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "tomcat";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow ];
+  };
 
   nodes = {
     server =
@@ -25,5 +28,4 @@ import ./make-test.nix {
     $client->succeed("curl --fail http://server/examples/servlets/servlet/HelloWorldExample");
     $client->succeed("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp");
   '';
-
-}
+})
diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix
index 87a2d328b4a..e7d9759ae0c 100644
--- a/nixos/tests/trac.nix
+++ b/nixos/tests/trac.nix
@@ -1,5 +1,8 @@
 import ./make-test.nix ({ pkgs, ... }: {
   name = "trac";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow ];
+  };
 
   nodes = {
     storage =
diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix
index 1d2f79e4f6c..72d51c0051c 100644
--- a/nixos/tests/udisks2.nix
+++ b/nixos/tests/udisks2.nix
@@ -11,6 +11,9 @@ in
 
 {
   name = "udisks2";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow ];
+  };
 
   machine =
     { config, pkgs, ... }:
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 827481879a3..f94d219aba6 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -298,6 +298,9 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let
 
 in {
   name = "virtualbox";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ aszlig wkennington ];
+  };
 
   machine = { pkgs, lib, config, ... }: {
     imports = let
diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix
index ced0c6b9826..c131ef7dc8c 100644
--- a/nixos/tests/xfce.nix
+++ b/nixos/tests/xfce.nix
@@ -1,5 +1,8 @@
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ...} : {
   name = "xfce";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow shlevy ];
+  };
 
   machine =
     { config, pkgs, ... }:
@@ -28,5 +31,4 @@ import ./make-test.nix {
       $machine->sleep(10);
       $machine->screenshot("screen");
     '';
-
-}
+})

From 4338031c5915d88470682dd716df7e79dcd9bcdc Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Sun, 12 Jul 2015 14:26:21 +0300
Subject: [PATCH 2132/2322] vagrant: 1.7.2 -> 1.7.3

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

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 16b6981fdb8..97136aa255e 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -4,7 +4,7 @@
 assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
 
 let
-  version = "1.7.2";
+  version = "1.7.3";
   rake = buildRubyGem {
     inherit ruby;
     name = "rake-10.3.2";
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url    = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_x86_64.deb";
-        sha256 = "0s1rwzpcp0nc7v04fvbd5vsqfm79q2v23sr9ahniw09lf5c1qzwx";
+        sha256 = "0zg2sdxgrmwqvzqw4z8d6ji8d0cby33nggv0n9ncjxp0wjiv8nkm";
       }
     else
       fetchurl {
         url    = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_i686.deb";
-        sha256 = "1yj8iyhsgj6j3r7p3ppmsz01j6vnxqb18rjhsbp2sz45kbfs1wxz";
+        sha256 = "0r23w49jwl3c3g4nns5xnrsrqyfkqsgln91cj30hxkw50d0ldpvs";
       };
 
   meta = with stdenv.lib; {

From c211a8aa598493b990939cf01b857c4ea6904aec Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Jul 2015 11:32:05 +0000
Subject: [PATCH 2133/2322] ptyprocess: init at 0.5

---
 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 377afc06624..4b4ed896c1e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10503,6 +10503,21 @@ let
     propagatedBuildInputs = with self; [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl];
   };
 
+  ptyprocess = buildPythonPackage rec {
+    name = "ptyprocess-${version}";
+    version = "0.5";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/ptyprocess/${name}.tar.gz";
+      sha256= "dcb78fb2197b49ca1b7b2f37b047bc89c0da7a90f90bd5bc17c3ce388bb6ef59";
+    };
+    
+    meta = {
+      description = "Run a subprocess in a pseudo terminal";
+      homepage = https://github.com/pexpect/ptyprocess;
+      license = licenses.isc;
+    };
+  };
 
   pylibacl = buildPythonPackage (rec {
     name = "pylibacl-0.5.1";

From 3a0707f0c7823b30bd0264768756671b6eb1b4c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 11 Jul 2015 19:57:28 +0200
Subject: [PATCH 2134/2322] Move the details from CONTRIBUTING.md to the manual
 #8734

---
 CONTRIBUTING.md            |  68 +--------
 doc/manual.xml             |   1 +
 doc/submitting-changes.xml | 283 +++++++++++++++++++++++++++++++++++++
 3 files changed, 285 insertions(+), 67 deletions(-)
 create mode 100644 doc/submitting-changes.xml

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f3b325ed297..85af24b8f3d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,72 +7,6 @@
   * Clearly describe the issue including steps to reproduce when it is a bug.
   * Include information what version of nixpkgs and Nix are you using (nixos-version or git revision).
 
-## Making patches
-
-* Read [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/).
-* Fork the repository on GitHub.
-* Create a branch for your future fix.
-  * You can make branch from a commit of your local `nixos-version`. That will help you to avoid additional local compilations. Because you will recieve packages from binary cache.
-    * For example: `nixos-version` returns `15.05.git.0998212 (Dingo)`. So you can do:
-
-        ```bash
-        git checkout 0998212
-        git checkout -b 'fix/pkg-name-update'
-        ```
-  * Please avoid working directly on the `master` branch.
-* Make commits of logical units.
-  * If you removed pkgs, made some major NixOS changes etc., write about them in `nixos/doc/manual/release-notes/rl-unstable.xml`.
-* Check for unnecessary whitespace with `git diff --check` before committing.
-* Format the commit in a following way:
-
-        ```
-        (pkg-name | service-name): (from -> to | init at version | refactor | etc)
-
-        Additional information.
-        ```
-  * Examples:
-    * `nginx: init at 2.0.1`
-    * `firefox: 3.0 -> 3.1.1`
-    * `hydra service: add bazBaz option`
-    * `nginx service: refactor config generation`
-* Test your changes. If you work with
-  * nixpkgs:
-    * update pkg ->
-      * `nix-env -i pkg-name -f <path to your local nixpkgs folder>`
-    * add pkg ->
-      * Make sure it's in `pkgs/top-level/all-packages.nix`
-      * `nix-env -i pkg-name -f <path to your local nixpkgs folder>`
-    * _If you don't want to install pkg in you profile_.
-      * `nix-build -A pkg-attribute-name <path to your local nixpkgs folder>/default.nix` and check results in the folder `result`. It will appear in the same directory where you did `nix-build`.
-    * If you did `nix-env -i pkg-name` you can do `nix-env -e pkg-name` to uninstall it from your system.
-  * NixOS and its modules:
-    * You can add new module to your NixOS configuration file (usually it's `/etc/nixos/configuration.nix`).
-    And do `sudo nixos-rebuild test -I nixpkgs=<path to your local nixpkgs folder> --fast`.
-* If you have commits `pkg-name: oh, forgot to insert whitespace`: squash commits in this case. Use `git rebase -i`.
-* Rebase you branch against current `master`.
-
 ## Submitting changes
 
-* Push your changes to your fork of nixpkgs.
-* Create pull request:
-  * Write the title in format `(pkg-name | service): improvement`.
-    * If you update the pkg, write versions `from -> to`.
-  * Write in comment if you have tested your patch. Do not rely much on `TravisCI`.
-  * If you make an improvement, write about your motivation.
-  * Notify maintainers of the package. For example add to the message: `cc @jagajaga @domenkozar`.
-
-## Hotfixing pull requests
-
-* Make the appropriate changes in you branch.
-* Don't create additional commits, do
-  * `git rebase -i`
-  * `git push --force` to your branch.
-
-## Commit policy
-
-* Commits must be sufficiently tested before being merged, both for the master and staging branches.
-* Hydra builds for master and staging should not be used as testing platform, it's a build farm for changes that have been already tested.
-* Master should only see non-breaking commits that do not cause mass rebuilds.
-* Staging should only see non-breaking mass-rebuild commits. That means it's not to be used for testing, and changes must have been well tested already. [Read policy here](http://comments.gmane.org/gmane.linux.distributions.nixos/13447).
-* If staging is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. [Keep an eye on the staging evaluations here](http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations).
-* When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people's installations forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from @edolstra.
+See the nixpkgs manual for details on how to [Submit changes to nixpkgs](http://nixos.org/nixpkgs/manual/#chap-submitting-changes).
diff --git a/doc/manual.xml b/doc/manual.xml
index 1321f4b7ad2..801d8eeed62 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -11,6 +11,7 @@
 
   <xi:include href="introduction.xml" />
   <xi:include href="quick-start.xml" />
+  <xi:include href="submitting-changes.xml" />
   <xi:include href="stdenv.xml" />
   <xi:include href="packageconfig.xml" />
   <xi:include href="functions.xml" />
diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml
new file mode 100644
index 00000000000..fe331d08250
--- /dev/null
+++ b/doc/submitting-changes.xml
@@ -0,0 +1,283 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="chap-submitting-changes">
+
+<title>Submitting changes</title>
+
+<section>
+<title>Making patches</title>
+
+<itemizedlist>
+<listitem>
+<para>Read <link xlink:href="https://nixos.org/nixpkgs/manual/">Manual (How to write packages for Nix)</link>.</para>
+</listitem>
+
+<listitem>
+<para>Fork the repository on GitHub.</para>
+</listitem>
+
+<listitem>
+<para>Create a branch for your future fix.
+
+<itemizedlist>
+<listitem>
+<para>You can make branch from a commit of your local <command>nixos-version</command>. That will help you to avoid additional local compilations. Because you will receive packages from binary cache.
+
+<itemizedlist>
+<listitem>
+<para>For example: <command>nixos-version</command> returns <command>15.05.git.0998212 (Dingo)</command>. So you can do:</para>
+</listitem>
+</itemizedlist>
+
+<screen>
+$ git checkout 0998212
+$ git checkout -b 'fix/pkg-name-update'
+</screen>
+</para>
+</listitem>
+
+<listitem>
+<para>Please avoid working directly on the <command>master</command> branch.</para>
+</listitem>
+</itemizedlist>
+</para>
+</listitem>
+
+<listitem>
+<para>Make commits of logical units.
+
+<itemizedlist>
+<listitem>
+<para>If you removed pkgs, made some major NixOS changes etc., write about them in <command>nixos/doc/manual/release-notes/rl-unstable.xml</command>.</para>
+</listitem>
+</itemizedlist>
+</para>
+</listitem>
+
+<listitem>
+<para>Check for unnecessary whitespace with <command>git diff --check</command> before committing.</para>
+</listitem>
+
+<listitem>
+<para>Format the commit in a following way:</para>
+<programlisting>
+(pkg-name | service-name): (from -> to | init at version | refactor | etc)
+Additional information.
+</programlisting>
+
+<itemizedlist>
+<listitem>
+<para>Examples:
+
+<itemizedlist>
+<listitem>
+<para>
+<command>nginx: init at 2.0.1</command>
+</para>
+</listitem>
+
+<listitem>
+<para>
+<command>firefox: 3.0 -> 3.1.1</command>
+</para>
+</listitem>
+
+<listitem>
+<para>
+<command>hydra service: add bazBaz option</command>
+</para>
+</listitem>
+
+<listitem>
+<para>
+<command>nginx service: refactor config generation</command>
+</para>
+</listitem>
+</itemizedlist>
+</para>
+</listitem>
+</itemizedlist>
+</listitem>
+
+<listitem>
+<para>Test your changes. If you work with
+
+<itemizedlist>
+<listitem>
+<para>nixpkgs:
+
+<itemizedlist>
+<listitem>
+<para>update pkg ->
+
+<itemizedlist>
+<listitem>
+<para>
+<command>nix-env -i pkg-name -f &lt;path to your local nixpkgs folder&gt;</command>
+</para>
+</listitem>
+</itemizedlist>
+</para>
+</listitem>
+
+<listitem>
+<para>add pkg ->
+
+<itemizedlist>
+<listitem>
+<para>Make sure it's in <command>pkgs/top-level/all-packages.nix</command>
+</para>
+</listitem>
+
+<listitem>
+<para>
+<command>nix-env -i pkg-name -f &lt;path to your local nixpkgs folder&gt;</command>
+</para>
+</listitem>
+</itemizedlist>
+</para>
+</listitem>
+
+<listitem>
+<para>
+<emphasis>If you don't want to install pkg in you profile</emphasis>.
+
+<itemizedlist>
+<listitem>
+<para>
+<command>nix-build -A pkg-attribute-name &lt;path to your local nixpkgs folder&gt;/default.nix</command> and check results in the folder <command>result</command>. It will appear in the same directory where you did <command>nix-build</command>.</para>
+</listitem>
+</itemizedlist>
+</para>
+</listitem>
+
+<listitem>
+<para>If you did <command>nix-env -i pkg-name</command> you can do <command>nix-env -e pkg-name</command> to uninstall it from your system.</para>
+</listitem>
+</itemizedlist>
+</para>
+</listitem>
+
+<listitem>
+<para>NixOS and its modules:
+
+<itemizedlist>
+<listitem>
+<para>You can add new module to your NixOS configuration file (usually it's <command>/etc/nixos/configuration.nix</command>).
+            And do <command>sudo nixos-rebuild test -I nixpkgs=&lt;path to your local nixpkgs folder&gt; --fast</command>.</para>
+</listitem>
+</itemizedlist>
+</para>
+</listitem>
+</itemizedlist>
+</para>
+</listitem>
+
+<listitem>
+<para>If you have commits <command>pkg-name: oh, forgot to insert whitespace</command>: squash commits in this case. Use <command>git rebase -i</command>.</para>
+</listitem>
+
+<listitem>
+<para>Rebase you branch against current <command>master</command>.</para>
+</listitem>
+</itemizedlist>
+</section>
+
+<section>
+<title>Submitting changes</title>
+
+<itemizedlist>
+<listitem>
+<para>Push your changes to your fork of nixpkgs.</para>
+</listitem>
+
+<listitem>
+<para>Create pull request:
+
+<itemizedlist>
+<listitem>
+<para>Write the title in format <command>(pkg-name | service): improvement</command>.
+
+<itemizedlist>
+<listitem>
+<para>If you update the pkg, write versions <command>from -> to</command>.</para>
+</listitem>
+</itemizedlist>
+</para>
+</listitem>
+
+<listitem>
+<para>Write in comment if you have tested your patch. Do not rely much on <command>TravisCI</command>.</para>
+</listitem>
+
+<listitem>
+<para>If you make an improvement, write about your motivation.</para>
+</listitem>
+
+<listitem>
+<para>Notify maintainers of the package. For example add to the message: <command>cc @jagajaga @domenkozar</command>.</para>
+</listitem>
+</itemizedlist>
+</para>
+</listitem>
+</itemizedlist>
+</section>
+
+<section>
+<title>Hotfixing pull requests</title>
+
+<itemizedlist>
+<listitem>
+<para>Make the appropriate changes in you branch.</para>
+</listitem>
+
+<listitem>
+<para>Don't create additional commits, do
+
+<itemizedlist>
+<listitem>
+<para><command>git rebase -i</command></para>
+</listitem>
+<listitem>
+<para>
+<command>git push --force</command> to your branch.</para>
+</listitem>
+</itemizedlist>
+</para>
+</listitem>
+
+</itemizedlist>
+</section>
+
+<section>
+<title>Commit policy</title>
+
+<itemizedlist>
+<listitem>
+<para>Commits must be sufficiently tested before being merged, both for the master and staging branches.</para>
+</listitem>
+
+<listitem>
+<para>Hydra builds for master and staging should not be used as testing platform, it's a build farm for changes that have been already tested.</para>
+</listitem>
+
+<listitem>
+<para>Master should only see non-breaking commits that do not cause mass rebuilds.</para>
+</listitem>
+
+<listitem>
+<para>Staging should only see non-breaking mass-rebuild commits. That means it's not to be used for testing, and changes must have been well tested already. <link xlink:href="http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read policy here</link>.</para>
+</listitem>
+
+<listitem>
+<para>If staging is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days, merge into master, then resume development on staging. <link xlink:href="http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations">Keep an eye on the staging evaluations here</link>.</para>
+</listitem>
+
+<listitem>
+<para>When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people's installations forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from @edolstra.</para>
+</listitem>
+</itemizedlist>
+
+</section>
+</chapter>
+

From 8a1a97c35c0dfbe3db648335961da6550ff63ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 12 Jul 2015 13:35:56 +0200
Subject: [PATCH 2135/2322] Move the submitting-changes down, after coding
 conventions

---
 doc/manual.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual.xml b/doc/manual.xml
index 801d8eeed62..1f1f50f75fb 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -11,7 +11,6 @@
 
   <xi:include href="introduction.xml" />
   <xi:include href="quick-start.xml" />
-  <xi:include href="submitting-changes.xml" />
   <xi:include href="stdenv.xml" />
   <xi:include href="packageconfig.xml" />
   <xi:include href="functions.xml" />
@@ -19,6 +18,7 @@
   <xi:include href="language-support.xml" />
   <xi:include href="package-notes.xml" />
   <xi:include href="coding-conventions.xml" />
+  <xi:include href="submitting-changes.xml" />
   <xi:include href="haskell-users-guide.xml" />
   <xi:include href="contributing.xml" />
 

From 3a3062192c0de978d6c95d26f2ab1f33184b4921 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Jul 2015 11:33:26 +0000
Subject: [PATCH 2136/2322] terminado: init at 0.5

A dependency for IPython 3.2 Notebook
---
 pkgs/top-level/python-packages.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4b4ed896c1e..f84fe9eb051 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12973,7 +12973,24 @@ let
     };
   };
 
-
+  terminado = buildPythonPackage rec {
+    name = "terminado-${version}";
+    version = "0.5";
+    
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/t/terminado/${name}.tar.gz";
+      sha256 = "63e893eff1ba84f1ee7c4bfcca7676ba1de6394538bb9aa80cbbc8866cb875b6";
+    };
+    
+    propagatedBuildInputs = with self; [ ptyprocess tornado ];
+    
+    meta = {
+      description = "Terminals served to term.js using Tornado websockets";
+      homepage = https://github.com/takluyver/terminado;
+      licenses = licenses.bsd2;
+    };
+  };
+  
   testscenarios = buildPythonPackage rec {
     name = "testscenarios-${version}";
     version = "0.4";

From dcc2b6148e530ad96d5f1a4c60ef5169b68baf69 Mon Sep 17 00:00:00 2001
From: Maciek Starzyk <mstarzyk@gmail.com>
Date: Sun, 12 Jul 2015 15:33:01 +0200
Subject: [PATCH 2137/2322] fish: 2.1.2 -> 2.2.0

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

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 119a3593cec..2460c511850 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "fish-${version}";
-  version = "2.1.2";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "http://fishshell.com/files/${version}/${name}.tar.gz";
-    sha256 = "1pgnz5lapm4qk48a13k9698jaswybzlbz2nyc621d852ldf0vhn6";
+    sha256 = "0ympqz7llmf0hafxwglykplw6j5cz82yhlrw50lw4bnf2kykjqx7";
   };
 
   buildInputs = [ ncurses libiconv ];

From 3c5a6eb3138510a165b4f50b337cc9c44268f158 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Jul 2015 12:53:57 +0000
Subject: [PATCH 2138/2322] cython: 0.20.1 -> 0.22.1

---
 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 377afc06624..c3fbfe87a66 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2187,11 +2187,12 @@ let
   };
 
   cython = buildPythonPackage rec {
-    name = "Cython-0.20.1";
+    name = "Cython-${version}";
+    version = "0.22.1";
 
     src = pkgs.fetchurl {
       url = "http://www.cython.org/release/${name}.tar.gz";
-      sha256 = "0v3nc9z5ynnnjdgcgkyy5g9wazmkjv53nnpjal1v3mr199s6799i";
+      sha256 = "7fff120e65e7b66edb4a42823f5642bad3bc1e5601bf882d66aee50248cf0682";
     };
 
     setupPyBuildFlags = ["--build-base=$out"];
@@ -2199,8 +2200,10 @@ let
     buildInputs = with self; [ pkgs.pkgconfig ];
 
     meta = {
-      description = "An interpreter to help writing C extensions for Python 2";
+      description = "An optimising static compiler for both the Python programming language and the extended Cython programming language";
       platforms = platforms.all;
+      homepage = http://cython.org;
+      license = licenses.asl20;
     };
   };
   

From 74f4b0d27ad8bd086e57d14b37e3d6d496cb0692 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 12 Jul 2015 15:42:05 +0200
Subject: [PATCH 2139/2322] filezilla: update from 3.11.0.2 to 3.12.0.2

---
 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 98e2f613760..2e8a28d03c8 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 }:
 
-let version = "3.11.0.2"; in
+let version = "3.12.0.2"; in
 stdenv.mkDerivation {
   name = "filezilla-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "1nc9d46jwz3x9dd6na1ds8rq8a797xr29r9wkhgxv6y20cla06rl";
+    sha256 = "038xgvajn0nq1dzw1pac3xwhmil1y17vhadd2hx0vl4lrp16yabs";
   };
 
   configureFlags = [

From 532678fa8bb137bb1f321b083b96459e65767a3b Mon Sep 17 00:00:00 2001
From: Leonardo Cecchi <leonardoce@interfree.it>
Date: Fri, 10 Jul 2015 10:29:51 +0200
Subject: [PATCH 2140/2322] bleachbit: init at 1.8

---
 lib/maintainers.nix                          |  1 +
 pkgs/applications/misc/bleachbit/default.nix | 34 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/misc/bleachbit/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8e8ae4c4988..157d2be7f90 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -133,6 +133,7 @@
   kragniz = "Louis Taylor <kragniz@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
   lassulus = "Lassulus <lassulus@gmail.com>";
+  leonardoce = "Leonardo Cecchi <leonardo.cecchi@gmail.com>";
   lethalman = "Luca Bruno <lucabru@src.gnome.org>";
   lhvwb = "Nathaniel Baxter <nathaniel.baxter@gmail.com>";
   lihop = "Leroy Hopson <nixos@leroy.geek.nz>";
diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix
new file mode 100644
index 00000000000..511455ba6bb
--- /dev/null
+++ b/pkgs/applications/misc/bleachbit/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, pythonPackages, fetchurl }:
+pythonPackages.buildPythonPackage rec {
+  name = "bleachbit-${version}";
+  version = "1.8";
+
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/bleachbit/bleachbit-1.8.tar.bz2";
+    sha256 = "dbf50fcbf24b8b3dd1c4325cd62352628d089f88a76eab804df5d90c872ee592";
+  };
+
+  buildInputs = [  pythonPackages.wrapPython ];
+
+  doCheck = false;
+
+  postInstall = ''
+    mkdir -p $out/bin
+    cp bleachbit.py $out/bin/bleachbit
+    chmod +x $out/bin/bleachbit
+
+    substituteInPlace $out/bin/bleachbit --replace "#!/usr/bin/env python" "#!${pythonPackages.python.interpreter}"
+  '';
+
+  propagatedBuildInputs = with pythonPackages; [ pygtk sqlite3 ];
+
+  meta = {
+    homepage = "http://bleachbit.sourceforge.net";
+    description = "A program to clean your computer";
+    longDescription = "BleachBit helps you easily clean your computer to free space and maintain privacy.";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ leonardoce ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d84df90324b..facbfb996fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10749,6 +10749,8 @@ let
 
   bitmeter = callPackage ../applications/audio/bitmeter { };
 
+  bleachbit = callPackage ../applications/misc/bleachbit { };
+
   blender = callPackage  ../applications/misc/blender {
     python = python34;
   };

From bb182c7944b34395e34d34e8d7706d53e0e65847 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 9 Jul 2015 19:23:39 +0200
Subject: [PATCH 2141/2322] rustcMaster: 2015-05-13 -> 2015-07-01

---
 pkgs/development/compilers/rustc/generic.nix  |  7 +++
 pkgs/development/compilers/rustc/head.nix     | 20 +++---
 .../compilers/rustc/patches/head.patch        | 61 +++++--------------
 3 files changed, 33 insertions(+), 55 deletions(-)

diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix
index b8d232b82a3..f9e45873857 100644
--- a/pkgs/development/compilers/rustc/generic.nix
+++ b/pkgs/development/compilers/rustc/generic.nix
@@ -125,11 +125,18 @@ stdenv.mkDerivation {
       --subst-var-by "ccPath" "${stdenv.cc}/bin/cc"
     substituteInPlace src/librustc_back/archive.rs \
       --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar"
+    substituteInPlace src/librustc_back/target/mod.rs \
+      --subst-var-by "ccPath" "${stdenv.cc}/bin/cc" \
+      --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar"
 
     substituteInPlace src/rust-installer/gen-install-script.sh \
       --replace /bin/echo "${coreutils}/bin/echo"
     substituteInPlace src/rust-installer/gen-installer.sh \
       --replace /bin/echo "${coreutils}/bin/echo"
+
+    # Workaround for NixOS/nixpkgs#8676
+    substituteInPlace mk/rustllvm.mk \
+      --replace "\$\$(subst  /,//," "\$\$(subst /,/,"
   '';
 
   buildInputs = [ which file perl curl python27 makeWrapper git valgrind procps ];
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 5e5b41e8b25..2e890f2fb76 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -1,16 +1,16 @@
 { stdenv, callPackage }:
 callPackage ./generic.nix {
-  shortVersion = "1.0.0-dev";
+  shortVersion = "2015-07-01";
   isRelease = false;
-  # src rev for master on 2015-05-13
-  srcRev = "67433c1a309d3c9457e49f15e80a2d927d165996";
-  srcSha = "0idc3nh0sfjlv7m9710azx7n6awzwj6mhw3aybsb9bbagzy2sdsg";
-  snapshotHashLinux686 = "0bc8cffdce611fb71fd7d3d8e7cdbfaf748a4f16";
-  snapshotHashLinux64 = "94089740e48167c5975c92c139ae9c286764012f";
-  snapshotHashDarwin686 = "54cc35e76497e6e94fddf38d6e40e9d168491ddb";
-  snapshotHashDarwin64 = "43a1c1fba0d1dfee4c2ca310d506f8f5f51b3f6f";
-  snapshotDate = "2015-04-27";
-  snapshotRev = "857ef6e";
+  # src rev for master on 2015-07-01
+  srcRev = "bf3c979ec";
+  srcSha = "1xp2fjffz5bwxfs37w80bdhy9lv091ps7xbnsvxid2i91rbxfrkk";
+  snapshotHashLinux686 = "a6f22e481eabf098cc65bda97bf7e434a1fcc20b";
+  snapshotHashLinux64 = "5fd8698fdfe953e6c4d86cf4fa1d5f3a0053248c";
+  snapshotHashDarwin686 = "9a273324a6b63a40f67a553029c0a9fb692ffd1f";
+  snapshotHashDarwin64 = "e5b12cb7c179fc98fa905a3c84803645d946a6ae";
+  snapshotDate = "2015-05-24";
+  snapshotRev = "ba0e1cd";
   patches = [
     ./patches/head.patch
   ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
diff --git a/pkgs/development/compilers/rustc/patches/head.patch b/pkgs/development/compilers/rustc/patches/head.patch
index cd2320e84df..d7bede68682 100644
--- a/pkgs/development/compilers/rustc/patches/head.patch
+++ b/pkgs/development/compilers/rustc/patches/head.patch
@@ -1,49 +1,20 @@
-diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh
-index ca59b1c..65ee7bf 100755
---- a/src/etc/local_stage0.sh
-+++ b/src/etc/local_stage0.sh
-@@ -50,11 +50,6 @@ if [ -z $TARG_DIR ]; then
- fi
- 
- cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/
--cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/
--cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
--cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
--cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
--cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
- 
- # do not fail if one of the above fails, as all we need is a working rustc!
- exit 0
-diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs
-index 9f5751c..c98828f 100644
---- a/src/librustc_back/archive.rs
-+++ b/src/librustc_back/archive.rs
-@@ -57,7 +57,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
-           paths: &[&Path]) -> Output {
-     let ar = match *maybe_ar_prog {
-         Some(ref ar) => &ar[..],
--        None => "ar"
-+        None => "@arPath@"
-     };
-     let mut cmd = Command::new(ar);
- 
-diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
-index ad77735..1764f71 100644
---- a/src/librustc_trans/back/link.rs
-+++ b/src/librustc_trans/back/link.rs
-@@ -360,8 +360,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
- 
- pub fn get_cc_prog(sess: &Session) -> String {
-     match sess.opts.cg.linker {
--        Some(ref linker) => return linker.to_string(),
--        None => sess.target.target.options.linker.clone(),
-+        Some(ref linker) => linker.to_string(),
-+        None => "@ccPath@".to_string(),
-     }
- }
- 
+diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
+index a42f861..bda4bde 100644
+--- a/src/librustc_back/target/mod.rs
++++ b/src/librustc_back/target/mod.rs
+@@ -172,8 +172,8 @@ impl Default for TargetOptions {
+     /// incomplete, and if used for compilation, will certainly not work.
+     fn default() -> TargetOptions {
+         TargetOptions {
+-            linker: "cc".to_string(),
+-            ar: "ar".to_string(),
++            linker: "@ccPath@".to_string(), // ignore-tidy-linelength
++            ar: "@arPath@".to_string(), // ignore-tidy-linelength
+             pre_link_args: Vec::new(),
+             post_link_args: Vec::new(),
+             cpu: "generic".to_string(),
 diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs
-index 8b5e6f8..480ad79 100644
+index 2772fc8..3d37b08 100644
 --- a/src/test/run-pass/issue-20797.rs
 +++ b/src/test/run-pass/issue-20797.rs
 @@ -97,7 +97,7 @@ impl<S: Strategy> Iterator for Subpaths<S> {

From c87ee37b551fb3dba7f2980f0dbc7269a6984029 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sun, 12 Jul 2015 17:23:36 +0200
Subject: [PATCH 2142/2322] rustc: Remove redundant "/default.nix" path

---
 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 0e8b4af22e8..d8a48fb2fcb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4653,7 +4653,7 @@ let
   };
 
   rustcMaster = callPackage ../development/compilers/rustc/head.nix {};
-  rustc = callPackage ../development/compilers/rustc/default.nix {};
+  rustc = callPackage ../development/compilers/rustc {};
 
   rustPlatform = rustStable;
 

From 48f5247342dec080cbf5ab68919a538ed4a579bb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Jul 2015 20:32:16 +0200
Subject: [PATCH 2143/2322] stellarium: update to version 0.13.3

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

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index ddcf5ba7152..3af4b6e84b6 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -2,11 +2,11 @@
 , libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "stellarium-0.13.2";
+  name = "stellarium-0.13.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/stellarium/${name}.tar.gz";
-    sha256 = "1asrq1v6vjzxd2zz92brdfs5f5b1qf8zwd7k2dpg3dl4shl8wwg5";
+    sha256 = "1ml6z2xda4vx61agdz54x8fw1b115gwc7rcy0zhz1jh6g5jvf0ij";
   };
 
   buildInputs = [ cmake freetype libpng mesa gettext openssl qt5.base qt5.quick1 perl libiconv ];

From 5fbd08968bf3dca1f5773359e4f50ddc529823e0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 12 Jul 2015 20:36:25 +0300
Subject: [PATCH 2144/2322] can-utils: Source is now hosted at GitHub

Gitorious doesn't exist any more.
---
 pkgs/os-specific/linux/can-utils/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix
index 6a3fbd33d68..f181db0c5e3 100644
--- a/pkgs/os-specific/linux/can-utils/default.nix
+++ b/pkgs/os-specific/linux/can-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "can-utils-${version}";
@@ -6,10 +6,11 @@ stdenv.mkDerivation rec {
   # latest commit in git master as version number.
   version = "20140227";
 
-  src = fetchgit {
-    url = "https://git.gitorious.org/linux-can/can-utils.git";
+  src = fetchFromGitHub {
+    owner = "linux-can";
+    repo = "can-utils";
     rev = "67a2bdcd336e6becfa5784742e18c88dbeddc973";
-    sha256 = "0pnnjl141wf3kbf256m6qz9mxz0144z36qqb43skialzcnlhga38";
+    sha256 = "1v73b0nk1kb3kp5nbxp4xiygny6nfjgjnm7zgzrjgryvdrnws32z";
   };
 
   preConfigure = ''makeFlagsArray+=(PREFIX="$out")'';

From 5c08963fed2f983299f4e0fe594a0118d4faeac8 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 12 Jul 2015 20:12:53 +0300
Subject: [PATCH 2145/2322] xonsh: Don't use fetchurl on dynamically generated
 GitHub tarballs

Just use fetchFromGitHub instead.
---
 pkgs/shells/xonsh/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 3849c96ec13..6b33f5833d8 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, python3Packages}:
+{stdenv, fetchFromGitHub, python3Packages}:
 
 python3Packages.buildPythonPackage rec {
   name = "xonsh-${version}";
@@ -16,9 +16,11 @@ python3Packages.buildPythonPackage rec {
 
   propagatedBuildInputs = [ python3Packages.ply ];
 
-  src = fetchurl {
-    url = "https://github.com/scopatz/xonsh/archive/${version}.zip";
-    sha256 = "0p2d7p892w77ii8yy51vpw7jlz2y53k8g61m7l8bar3hr3qrl306";
+  src = fetchFromGitHub {
+    owner = "scopatz";
+    repo = "xonsh";
+    rev = version;
+    sha256 = "04qnjqpz5y38g22irpph13j2a4hy7mk9pqvqz1mfimaf8zgmyh1n";
   };
 
   meta = with stdenv.lib; {

From 91cbd8a3b269ed1246c9e22da495dfbeaa4e9de3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 12 Jul 2015 20:46:03 +0300
Subject: [PATCH 2146/2322] firejail: Fix source URL

This particular sf.net mirror is down.
---
 pkgs/os-specific/linux/firejail/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 99c99cd3662..af08d404b82 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -6,7 +6,7 @@ let
     version="0.9.26";
     name="${baseName}-${version}";
     hash="12n0kj95hfkzv4jir7j9x0mdpg20bq0fgifjsz1dbsmqi2cspdlq";
-    url="http://softlayer-ams.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.26-rc2.tar.bz2";
+    url="mirror://sourceforge/firejail/firejail/firejail-0.9.26-rc2.tar.bz2";
     sha256="12n0kj95hfkzv4jir7j9x0mdpg20bq0fgifjsz1dbsmqi2cspdlq";
   };
   buildInputs = [

From e7a01d6ff0cf6b8b97cf889d9e3bcfbd583cc71b Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 12 Jul 2015 18:17:50 +0200
Subject: [PATCH 2147/2322] vifm: 0.7.8 -> 0.8

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

diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix
index 5ff010005e4..3852acfc9f3 100644
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/pkgs/applications/misc/vifm/default.nix
@@ -2,14 +2,14 @@
 
 let
   name = "vifm-${version}";
-  version = "0.7.8";
+  version = "0.8";
 
 in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2";
-    sha256 = "00vnkr60ci6qwh95kzx399xm97g26svxl9i0y77qv99q41nb5ysx";
+    sha256 = "1syyvdcgwnvjxzmpf9f4gfi0ipwmlavg11zr7wiz8qplvi86psv9";
   };
 
   buildInputs = [ utillinux ncurses file libX11 which groff ];

From de34441ead85b69da31b8876e669e3c03b938f3e Mon Sep 17 00:00:00 2001
From: "Ryan Scheel (Havvy)" <ryan.havvy@gmail.com>
Date: Sun, 12 Jul 2015 21:37:40 +0200
Subject: [PATCH 2148/2322] nodejs: 0.12.6 -> 0.12.7

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

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 1e3260bd10f..4c7aa967872 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -12,7 +12,7 @@ let
     ln -sv /usr/sbin/dtrace $out/bin
   '';
 
-  version = "0.12.6";
+  version = "0.12.7";
 
   deps = {
     inherit openssl zlib libuv;
@@ -36,7 +36,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "1llsl7zl3080zd7jfhhy4d5s9pnhr15niw6vivp9sflpa71mlfvs";
+    sha256 = "17gk29zbw58l0sjjfw86acp39pkiblnq0gsq1jdrd70w0pgn8gdj";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);

From 45906587ac56a4a68269ae7db97a8334745ce6c2 Mon Sep 17 00:00:00 2001
From: Renzo Carbonara <gnuk0001@gmail.com>
Date: Sun, 12 Jul 2015 17:29:04 -0300
Subject: [PATCH 2149/2322] Bump nodejs's libuv dependency to v1.6.1

Fixes #8781
---
 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 d8a48fb2fcb..e3a26e6102d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1998,7 +1998,7 @@ let
 
   ninka = callPackage ../development/tools/misc/ninka { };
 
-  nodejs-0_12 = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; };
+  nodejs-0_12 = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_6_1; };
   nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; };
   nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { };
 

From 4d154c3371b047d350382d814e06c5febc99150e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 12 Jul 2015 23:02:12 +0200
Subject: [PATCH 2150/2322] purePackages.stldict: fix build with gcc 4.9 (ZHF)

---
 pkgs/development/pure-modules/stldict/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/pure-modules/stldict/default.nix b/pkgs/development/pure-modules/stldict/default.nix
index abfc0d0fdef..4ade515faa8 100644
--- a/pkgs/development/pure-modules/stldict/default.nix
+++ b/pkgs/development/pure-modules/stldict/default.nix
@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "5b894ae6dc574c7022258e2732bea649c82c959ec4d0be13fb5a3e8ba8488f28";
   };
 
+  postPatch = ''
+    for f in hashdict.cc orddict.cc; do
+      sed -i '1i\#include <stddef.h>' $f
+    done
+  '';
+
   buildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ pure ];
   makeFlags = "libdir=$(out)/lib prefix=$(out)/";

From e79a63758d0eabb6e01083f28cb5e40314aae43e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 12 Jul 2015 23:18:16 +0200
Subject: [PATCH 2151/2322] purePackages.stllib: fix build with gcc 4.9 (ZHF)

---
 pkgs/development/pure-modules/stllib/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/pure-modules/stllib/default.nix b/pkgs/development/pure-modules/stllib/default.nix
index 3be7bccf2a4..02c96d975ec 100644
--- a/pkgs/development/pure-modules/stllib/default.nix
+++ b/pkgs/development/pure-modules/stllib/default.nix
@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "1d550764fc2f8ba6ddbd1fbd3da2d6965b69e2c992747265d9ebe4f16aa5e455";
   };
 
+  postPatch = ''
+    for f in pure-stlmap/{stlmap.cpp,stlmmap.cpp,stlhmap.cpp}; do
+      sed -i '1i\#include <cstddef>' $f
+    done
+  '';
+
   buildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ pure ];
   makeFlags = "libdir=$(out)/lib prefix=$(out)/";

From 6e5d34cac74383ee08212a08d3a11fde5a5224a4 Mon Sep 17 00:00:00 2001
From: RoboNickBot <nicklewchenko92@gmail.com>
Date: Sun, 12 Jul 2015 21:09:55 +0000
Subject: [PATCH 2152/2322] emacs-moe-theme: init at 1.0

Added the delightfully colorful "moe-theme" to the emacs package-set.

Tested; builds and works in the packaged emacs

https://github.com/kuanyui/moe-theme.el
---
 pkgs/top-level/emacs-packages.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index c8b1b0bd7c8..ef2b505eaa5 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -839,6 +839,18 @@ let self = _self // overrides;
     meta = { license = gpl3Plus; };
   };
 
+  moe-theme = melpaBuild rec {
+    pname   = "moe-theme";
+    version = "1.0";
+    src = fetchFromGitHub {
+      owner  = "kuanyui";
+      repo   = "${pname}.el";
+      rev    = "39384a7a9e6886f3a3d79efac4009fcd800a4a14";
+      sha256 = "0i7m15x9sij5wh0gwbijsis8a4jm8izywj7xprk21644ndskvfiz";
+    };
+    meta = { license = gpl3Plus; };
+  };
+
   monokai-theme = melpaBuild rec {
     pname   = "monokai-theme";
     version = "1.0.0";

From dc608ff2373af5ad50e5e48084d2f0bae4bed9ed Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 12 Jul 2015 23:41:10 +0200
Subject: [PATCH 2153/2322] sbsigntool: fix build (ZHF)

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

diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix
index 1571720a0b9..4cc5e2505d1 100644
--- a/pkgs/tools/security/sbsigntool/default.nix
+++ b/pkgs/tools/security/sbsigntool/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./autoconf.patch ];
 
+  prePatch = "patchShebangs .";
+
   buildInputs = [ autoconf automake utillinux openssl libuuid gnu-efi binutils pkgconfig help2man ];
 
   configurePhase = ''

From 3514a828fba0cf24dcd4daf21e4376cb7554d668 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 12 Jul 2015 23:55:24 +0200
Subject: [PATCH 2154/2322] stg-puzzles: fix build (ZHF)

---
 pkgs/games/sgt-puzzles/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index 67f74be9e1c..e23801b2220 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   makeFlags = ["prefix=$(out)" "gamesdir=$(out)/bin"];
   preInstall = ''
     mkdir -p "$out"/{bin,share/doc/sgtpuzzles}
-    cp puzzles.txt LICENCE README "$out/share/doc/sgtpuzzles"
+    cp gamedesc.txt LICENCE README "$out/share/doc/sgtpuzzles"
     cp LICENCE "$out/share/doc/sgtpuzzles/LICENSE"
   '';
   preConfigure = ''

From 335cc971be64bc85f5977d794685641b69f88e68 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 9 Jul 2015 12:27:42 +0200
Subject: [PATCH 2155/2322] flycheck: correct description & use src's homepage

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

diff --git a/pkgs/applications/editors/emacs-modes/flycheck/default.nix b/pkgs/applications/editors/emacs-modes/flycheck/default.nix
index 98eab4d477c..2a3c4382836 100644
--- a/pkgs/applications/editors/emacs-modes/flycheck/default.nix
+++ b/pkgs/applications/editors/emacs-modes/flycheck/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, emacs, let-alist, dash, texinfo }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "flycheck-0.22-64-g90dbc2d";
 
   src = fetchFromGitHub {
@@ -24,8 +24,8 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "https://github.com/magit/git-modes";
-    description = "Emacs modes for various Git-related files";
+    inherit (src.meta) homepage;
+    description = "Modern on-the-fly syntax checking for GNU Emacs";
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [ simons ];
   };

From 2ad7463144b4917db34aac7ec7bfaf78e06c4391 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 2 Jul 2015 23:04:52 +0300
Subject: [PATCH 2156/2322] pythonPackages.magic: Fix loading libmagic.so

Even with the previous `python.patch` file around, libmagic.so isn't
found. Instead patch it to use an absolute path, using a similar
approach that is used by the `python_magic` package (which is another
libmagic python wrapper library as well).
---
 pkgs/tools/misc/file/python.patch  | 11 -----------
 pkgs/top-level/python-packages.nix |  5 ++++-
 2 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 pkgs/tools/misc/file/python.patch

diff --git a/pkgs/tools/misc/file/python.patch b/pkgs/tools/misc/file/python.patch
deleted file mode 100644
index 8ecbc9a81fd..00000000000
--- a/pkgs/tools/misc/file/python.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- file-5.11/python/magic.py	2011-09-22 18:57:41.000000000 +0200
-+++ file-5.11/python/magic.py.1	2012-04-30 15:00:31.750213810 +0200
-@@ -13,7 +13,7 @@
-     Loads the shared library through ctypes and returns a library
-     L{ctypes.CDLL} instance 
-     """
--    return ctypes.cdll.LoadLibrary(find_library('magic'))
-+    return ctypes.CDLL('libmagic.so')
- 
- _libraries = {}
- _libraries['magic'] = _init()
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 377afc06624..c847a586b9b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7042,7 +7042,10 @@ let
 
     src = pkgs.file.src;
 
-    patches = [ ../tools/misc/file/python.patch ];
+    patchPhase = ''
+      substituteInPlace python/magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic.so'"
+    '';
+
     buildInputs = with self; [ python pkgs.file ];
 
     preConfigure = "cd python";

From 8655eb71af109708bbc37c06321b0d7a579fb9cb Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 2 Jul 2015 23:14:58 +0300
Subject: [PATCH 2157/2322] pythonPackages.debian: init at 0.1.23

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c847a586b9b..d4814571990 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1117,6 +1117,17 @@ let
     };
   };
 
+  debian = buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "python-debian";
+    version = "0.1.23";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/${pname}/${name}.tar.gz";
+      sha256 = "193faznwnjc3n5991wyzim6h9gyq1zxifmfrnpm3avgkh7ahyynh";
+    };
+    propagatedBuildInputs = with self; [ chardet six ];
+  };
+
   defusedxml = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "defusedxml";

From 3b81288a5844fc43d4d9b6a3fe2aea46204a756b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 2 Jul 2015 23:16:20 +0300
Subject: [PATCH 2158/2322] debbindiff: init at version 26
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn: set namePrefix = "" to align attrname/pkgname, break overlong
lines, change patchPhase into postPatch so that 'patches' can still be
used.]
---
 pkgs/tools/misc/debbindiff/default.nix | 46 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/tools/misc/debbindiff/default.nix

diff --git a/pkgs/tools/misc/debbindiff/default.nix b/pkgs/tools/misc/debbindiff/default.nix
new file mode 100644
index 00000000000..f5fcb37324e
--- /dev/null
+++ b/pkgs/tools/misc/debbindiff/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchgit, pythonPackages, docutils
+, acl, binutils, bzip2, cdrkit, cpio, diffutils, e2fsprogs, file, gettext
+, gnupg, gzip, pdftk, poppler_utils, rpm, squashfsTools, unzip, vim, xz
+}:
+
+pythonPackages.buildPythonPackage rec {
+  name = "debbindiff-${version}";
+  version = "26";
+
+  namePrefix = "";
+
+  src = fetchgit {
+    url = "git://anonscm.debian.org/reproducible/debbindiff.git";
+    rev = "refs/tags/${version}";
+    sha256 = "18637gc7c92mwcpx3dvh6xild0sb9bwsgfcrjplmh7s8frvlvkv6";
+  };
+
+  postPatch = ''
+    # Different pkg name in debian
+    sed -i setup.py -e "s@'magic'@'Magic-file-extensions'@"
+
+    # Upstream doesn't provide a PKG-INFO file
+    sed -i setup.py -e "/'rpm',/d"
+  '';
+
+  # Still missing these tools: ghc javap showttf sng
+  propagatedBuildInputs = (with pythonPackages; [ debian magic ]) ++
+    [ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg
+      gzip pdftk poppler_utils rpm squashfsTools unzip vim xz ];
+
+  doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
+
+  postInstall = ''
+    mv $out/bin/debbindiff.py $out/bin/debbindiff
+    mkdir -p $out/share/man/man1
+    ${docutils}/bin/rst2man.py debian/debbindiff.1.rst $out/share/man/man1/debbindiff.1
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Highlight differences between two builds of Debian packages, and even other kind of files";
+    homepage = https://wiki.debian.org/ReproducibleBuilds;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6995b93f925..c1f5961f305 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1240,6 +1240,8 @@ let
 
   dcfldd = callPackage ../tools/system/dcfldd { };
 
+  debbindiff = callPackage ../tools/misc/debbindiff { };
+
   debian_devscripts = callPackage ../tools/misc/debian-devscripts {
     inherit (perlPackages) CryptSSLeay LWP TimeDate DBFile FileDesktopEntry;
   };

From e4268c9ae085e74a14dc65bee8e51ee3bb5e8500 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 13 Jul 2015 10:50:39 +0200
Subject: [PATCH 2159/2322] libspatialite: fix download URL

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

diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix
index 43c2a9089b7..eb3917b1192 100644
--- a/pkgs/development/libraries/libspatialite/default.nix
+++ b/pkgs/development/libraries/libspatialite/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libspatialite-4.2.0";
 
   src = fetchurl {
-    url = "http://www.gaia-gis.it/gaia-sins/${name}.tar.gz";
+    url = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/${name}.tar.gz";
     sha256 = "0b9ipmp09y2ij7yajyjsh0zcwps8n5g88lzfzlkph33lail8l4wz";
   };
 

From 1e9561ff393e07d935d62cfaeb609d0c77040ebb Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 13 Jul 2015 13:43:11 +0200
Subject: [PATCH 2160/2322] bareos: fix build (ZHF)

---
 pkgs/tools/backup/bareos/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix
index 016e3c5d51e..32702a4e16d 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool
+{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex
 , readline ? null, openssl ? null, python ? null, ncurses ? null
 , sqlite ? null, postgresql ? null, libmysql ? null, zlib ? null, lzo ? null
 , acl ? null, glusterfs ? null, libceph ? null, libcap ? null
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig nettools gettext readline openssl python
+    pkgconfig nettools gettext readline openssl python flex
     ncurses sqlite postgresql libmysql zlib lzo acl glusterfs libceph libcap
   ];
 
@@ -65,6 +65,7 @@ stdenv.mkDerivation rec {
     "sysconfdir=\${out}/etc"
     "working_dir=\${TMPDIR}"
     "log_dir=\${TMPDIR}"
+    "sbindir=\${out}/bin"
   ];
 
   meta = with stdenv.lib; {

From 3cee0c8524f35686d8d7afa4d06d9a8704947e13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Mon, 13 Jul 2015 14:27:56 +0200
Subject: [PATCH 2161/2322] jsoncpp: the shared lib was not being built

Since the last version update only the static lib was built, and even that was
removed in the last commit. Fix shared ones, which is what we want. Also, add
myself to maintainers.
---
 pkgs/development/libraries/jsoncpp/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index 9e5ac769616..8bb1d40b2a9 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -20,19 +20,25 @@ stdenv.mkDerivation rec {
     export sourceRoot=${src.name}
   '';
 
+  # Hack to be able to run the test, broken because we use
+  # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install
+  preBuild = ''
+    export LD_LIBRARY_PATH="`pwd`/src/lib_json:$LD_LIBRARY_PATH"
+  '';
+
   nativeBuildInputs = [ cmake python ];
 
   cmakeFlags = [
-    "-DJSONCPP_WITH_CMAKE_PACKAGE=1"
+    "-DJSONCPP_LIB_BUILD_SHARED=ON"
+    "-DJSONCPP_LIB_BUILD_STATIC=OFF"
+    "-DJSONCPP_WITH_CMAKE_PACKAGE=ON"
   ];
 
-  postInstall = "rm $out/lib/*.a";
-
   meta = {
     inherit version;
     homepage = https://github.com/open-source-parsers/jsoncpp;
     description = "A simple API to manipulate JSON data in C++";
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+    maintainers = with stdenv.lib.maintainers; [ ttuegel page ];
     license = stdenv.lib.licenses.mit;
     branch = "1.6";
   };

From 1e95b76c6792ed6e830075c97b1b5c43760ec210 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Mon, 13 Jul 2015 14:49:50 +0200
Subject: [PATCH 2162/2322] nsd: 4.1.2 -> 4.1.3

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

diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index d3f6cc24e3b..218c7dc73f1 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -13,11 +13,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nsd-4.1.2";
+  name = "nsd-4.1.3";
 
   src = fetchurl {
     url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
-    sha256 = "0kb4jcckf4di9c88c09vb8ngbq19yh8njrp16yk2cic8p1dvf545";
+    sha256 = "1r8p5lqj7i6xi4k04jr1n9r1p8gwy3547hzsi8xags6krnav4z09";
   };
 
   buildInputs = [ libevent openssl ];

From baab714b2ef8243d3160265062dd6e8c84e45ee3 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Mon, 13 Jul 2015 15:11:18 +0200
Subject: [PATCH 2163/2322] charybdis service: fix preStart script

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

diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix
index 91729ebd60a..2f7d006b881 100644
--- a/nixos/modules/services/networking/charybdis.nix
+++ b/nixos/modules/services/networking/charybdis.nix
@@ -85,10 +85,8 @@ in
         PermissionsStartOnly = true; # preStart needs to run with root permissions
       };
       preStart = ''
-        if ! test -d /var/lib/charybdis; then
-          ${coreutils}/bin/mkdir -p ${cfg.statedir}
-          ${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.statedir}
-        fi
+        ${coreutils}/bin/mkdir -p ${cfg.statedir}
+        ${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.statedir}
       '';
 
     };

From ad00306e224b0a74afcebb07b55e2d205dc1aea8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 13 Jul 2015 16:14:54 +0200
Subject: [PATCH 2164/2322] python-packages: odo: licenses.{bsd4 ->
 bsdOriginal}

---
 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 b545180f3a3..77b83cbfabf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8443,7 +8443,7 @@ let
     meta = {
       homepage = https://github.com/ContinuumIO/odo;
       description = "Data migration utilities";
-      license = licenses.bsd4;
+      license = licenses.bsdOriginal;
     };
   };
   

From 7b38cb699db5d1e08ead7bd8de1bd50c095d3082 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Jul 2015 16:18:52 +0200
Subject: [PATCH 2165/2322] services.openssh.knownHosts.*.publicKey: Update
 description and add example

Note that it's no longer allowed to have multiple public keys
separated by a newline.
---
 nixos/modules/services/networking/ssh/sshd.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index bc89ea2d3cd..4be2b5fe0c0 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -244,13 +244,12 @@ in
           publicKey = mkOption {
             default = null;
             type = types.nullOr types.str;
+            example = "ecdsa-sha2-nistp521 AAAAE2VjZHN...UEPg==";
             description = ''
               The public key data for the host. You can fetch a public key
               from a running SSH server with the <command>ssh-keyscan</command>
               command. The public key should not include any host names, only
-              the key type and the key itself. It is allowed to add several
-              lines here, each line will be treated as type/key pair and the
-              host names will be prepended to each line.
+              the key type and the key itself.
             '';
           };
           publicKeyFile = mkOption {

From c59818f6306635111d9bfc359df00e82fe27aef3 Mon Sep 17 00:00:00 2001
From: Boris Sukholitko <boriss@gmail.com>
Date: Sat, 11 Jul 2015 14:11:14 +0300
Subject: [PATCH 2166/2322] pahole: init at 1decb1b

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

diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix
new file mode 100644
index 00000000000..739cc7e5143
--- /dev/null
+++ b/pkgs/development/tools/misc/pahole/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchgit, cmake, elfutils, zlib }:
+
+stdenv.mkDerivation {
+  name = "pahole-head";
+  src = fetchgit {
+    url = https://git.kernel.org/pub/scm/devel/pahole/pahole.git;
+    sha256 = "05f8a14ea6c200c20e9c6738593b38e4ced73a9cef86499ccd7af910eb9b74b3";
+    rev = "1decb1bc4a412a0902b7b25190d755a875022d03";
+  };
+  buildInputs = [ cmake elfutils zlib ];
+
+  postInstall = ''
+    for p in $out/bin/*; do
+      rpath=`patchelf --print-rpath $p`:$out
+      patchelf --set-rpath $rpath $p
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://git.kernel.org/cgit/devel/pahole/pahole.git/;
+    description = "Pahole and other DWARF utils";
+    license = licenses.gpl2;
+
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bosu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3e7849dd1a..573f8f870af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13368,6 +13368,8 @@ let
     qt = qt4;
   };
 
+  pahole = callPackage ../development/tools/misc/pahole {};
+
   yed = callPackage ../applications/graphics/yed {};
 
   ykpers = callPackage ../applications/misc/ykpers {};

From baad6a62c9518c8c8c2d5a6e334adc0d3dd76210 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Jul 2015 17:32:29 +0200
Subject: [PATCH 2167/2322] Bump version

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

diff --git a/.version b/.version
index 7c3643d5fb2..8e0b5950288 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-15.06
\ No newline at end of file
+15.07
\ No newline at end of file

From fd06533def4948b3f42ceded8df6e15892f82b78 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Jul 2015 17:55:49 +0200
Subject: [PATCH 2168/2322] nixos-install: Don't barf if btrfs is missing

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index b768be6a3e0..a2dbe31e0d8 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -311,9 +311,9 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
 
     # Maybe this is a bind-mount of a filesystem we saw earlier?
     if (defined $fsByDev{$fields[2]}) {
-        # Make sure this isn't a btrfs subvolume
-        my ($status, @msg) = runCommand("btrfs subvol show $rootDir$mountPoint");
-        if (join("", @msg) =~ /ERROR:/) {
+        # Make sure this isn't a btrfs subvolume.
+        my $msg = `btrfs subvol show $rootDir$mountPoint`;
+        if ($? != 0 || $msg =~ /ERROR:/s) {
             my $path = $fields[3]; $path = "" if $path eq "/";
             my $base = $fsByDev{$fields[2]};
             $base = "" if $base eq "/";

From 9b863fac6b812f78754b1fcc89e64e93f59acd42 Mon Sep 17 00:00:00 2001
From: James Felix Black <james_black@apple.com>
Date: Sun, 12 Jul 2015 20:00:43 +0200
Subject: [PATCH 2169/2322] notion: init at 3-2015061300

The notion (not-ion) window manager [1], plus optional (defaulted to
true) Xft/pango support (via [2]). Defined a license (notion uses a
modified LGPL).

As per [3], changes:

  1. renamed option from pango -> xft, better to reflect the actual
     nature of the patch;
  2. modified the patch to replace the postPatch changes to system-autodeteck.mk;
  3. commited the patch to the nixpkgs repo;
  4. removed 'fallbackFont' as an option. Use a sensible default, instead.

Many stylistic changes, thanks to @lethalman.

[1] http://notion.sourceforge.net
[2] http://sourceforge.net/p/notion/feature-requests/47/
[3] https://github.com/NixOS/nixpkgs/pull/8789
---
 lib/licenses.nix                              |   5 +
 lib/maintainers.nix                           |   1 +
 .../window-managers/notion/default.nix        |  33 +
 .../notion/notion-xft_nixos.diff              | 662 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 5 files changed, 703 insertions(+)
 create mode 100644 pkgs/applications/window-managers/notion/default.nix
 create mode 100644 pkgs/applications/window-managers/notion/notion-xft_nixos.diff

diff --git a/lib/licenses.nix b/lib/licenses.nix
index d0e146f0dea..5769f9e4915 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -327,6 +327,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName  = "University of Illinois/NCSA Open Source License";
   };
 
+  notion_lgpl = {
+    url = "https://raw.githubusercontent.com/raboof/notion/master/LICENSE";
+    fullName = "Notion modified LGPL";
+  };
+  
   ofl = spdx {
     spdxId = "OFL-1.1";
     fullName = "SIL Open Font License 1.1";
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 157d2be7f90..497a1951068 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -117,6 +117,7 @@
   jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>";
   jb55 = "William Casarin <bill@casarin.me>";
   jcumming = "Jack Cummings <jack@mudshark.org>";
+  jfb = "James Felix Black <james@yamtime.com>";
   jgeerds = "Jascha Geerds <jg@ekby.de>";
   jirkamarsik = "Jirka Marsik <jiri.marsik89@gmail.com>";
   joachifm = "Joachim Fasting <joachifm@fastmail.fm>";
diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix
new file mode 100644
index 00000000000..cd43c06d33e
--- /dev/null
+++ b/pkgs/applications/window-managers/notion/default.nix
@@ -0,0 +1,33 @@
+{
+  enableXft ? true, libXft ? null,
+  patches ? [],
+  stdenv, fetchurl,
+  lua, gettext, groff,
+  pkgconfig, busybox,
+  x11, libXinerama, libXrandr, libX11
+}:
+
+assert enableXft -> libXft != null;
+
+stdenv.mkDerivation {
+  name     = "notion";
+  version  = "3-2015061300";
+  meta = with stdenv.lib; {
+    description = "Tiling tabbed window manager, follow-on to the ion window manager";
+    homepage = http://notion.sourceforge.net;
+    platforms = platforms.linux;
+    license   = licenses.notion_lgpl;
+    maintainers = [maintainers.jfb];
+  };
+  src = fetchurl {
+    url = https://github.com/raboof/notion/archive/3-2015061300.tar.gz;
+    sha256 = "3c9d9f35a9fb0d17c263b76fe28f7a1a4a05b7d6140545524cc1effd98c5c305";
+  };
+
+  patches = patches ++ stdenv.lib.optional enableXft ./notion-xft_nixos.diff;
+  postPatch = "substituteInPlace system-autodetect.mk --replace '#PRELOAD_MODULES=1' 'PRELOAD_MODULES=1'";
+  buildInputs = [x11 lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft;
+
+  buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";
+  installFlags = "PREFIX=\${out}";
+}
diff --git a/pkgs/applications/window-managers/notion/notion-xft_nixos.diff b/pkgs/applications/window-managers/notion/notion-xft_nixos.diff
new file mode 100644
index 00000000000..542aa446c3f
--- /dev/null
+++ b/pkgs/applications/window-managers/notion/notion-xft_nixos.diff
@@ -0,0 +1,662 @@
+diff -ur notion-3-2015061300/de/brush.c notion-3-2015061300-PATCHED/de/brush.c
+--- notion-3-2015061300/de/brush.c	2015-06-13 10:37:26.000000000 -0400
++++ notion-3-2015061300-PATCHED/de/brush.c	2015-07-13 10:37:23.093298917 -0400
+@@ -48,6 +48,9 @@
+     
+     gr_stylespec_init(&brush->current_attr);
+     
++#ifdef XFT
++    brush->draw=NULL;
++#endif /* XFT */
+     style->usecount++;
+ 
+     if(!grbrush_init(&(brush->grbrush))){
+@@ -128,6 +131,10 @@
+ {
+     destyle_unref(brush->d);
+     brush->d=NULL;
++#ifdef XFT
++    if(brush->draw!=NULL)
++        XftDrawDestroy(brush->draw);
++#endif /* XFT */
+     gr_stylespec_unalloc(&brush->current_attr);
+     grbrush_deinit(&(brush->grbrush));
+ }
+@@ -139,6 +146,21 @@
+ }
+ 
+ 
++#ifdef XFT
++XftDraw *debrush_get_draw(DEBrush *brush, Drawable d)
++{
++    if(brush->draw==NULL)
++        brush->draw=XftDrawCreate(ioncore_g.dpy, d,
++                                  XftDEDefaultVisual(),
++                                  DefaultColormap(ioncore_g.dpy,
++                                  0));
++    else
++        XftDrawChange(brush->draw, d);
++
++    return brush->draw;
++}
++#endif
++
+ /*}}}*/
+ 
+ 
+diff -ur notion-3-2015061300/de/brush.h notion-3-2015061300-PATCHED/de/brush.h
+--- notion-3-2015061300/de/brush.h	2015-06-13 10:37:26.000000000 -0400
++++ notion-3-2015061300-PATCHED/de/brush.h	2015-07-13 10:37:23.096298747 -0400
+@@ -15,6 +15,10 @@
+ #include <ioncore/gr.h>
+ #include <ioncore/rectangle.h>
+ 
++#ifdef XFT
++#include <X11/Xft/Xft.h>
++#endif /* XFT */
++
+ INTRCLASS(DEBrush);
+ 
+ #include "style.h"
+@@ -33,6 +37,9 @@
+ DECLCLASS(DEBrush){
+     GrBrush grbrush;
+     DEStyle *d;
++#ifdef XFT
++    XftDraw *draw;
++#endif
+     DEBrushExtrasFn *extras_fn;
+     int indicator_w;
+     Window win;
+@@ -108,5 +115,8 @@
+ extern void debrush_fill_area(DEBrush *brush, const WRectangle *geom);
+ extern void debrush_clear_area(DEBrush *brush, const WRectangle *geom);
+ 
++#ifdef XFT
++XftDraw *debrush_get_draw(DEBrush *brush, Drawable d);
++#endif
+ 
+ #endif /* ION_DE_BRUSH_H */
+diff -ur notion-3-2015061300/de/colour.c notion-3-2015061300-PATCHED/de/colour.c
+--- notion-3-2015061300/de/colour.c	2015-06-13 10:37:26.000000000 -0400
++++ notion-3-2015061300-PATCHED/de/colour.c	2015-07-13 10:37:23.098298633 -0400
+@@ -12,9 +12,21 @@
+ 
+ bool de_alloc_colour(WRootWin *rootwin, DEColour *ret, const char *name)
+ {
++#ifndef XFT
+     XColor c;
+     bool ok=FALSE;
++#else /* XFT */
++    if(name==NULL)
++        return FALSE;
++    return XftColorAllocName(
++        ioncore_g.dpy,
++        XftDEDefaultVisual(),
++        rootwin->default_cmap,
++        name,
++        ret);
++#endif /* XFT */
+ 
++#ifndef XFT
+     if(name==NULL)
+         return FALSE;
+ 
+@@ -25,11 +37,13 @@
+     }
+     
+     return ok;
++#endif /* ! XFT */
+ }
+ 
+ 
+ bool de_duplicate_colour(WRootWin *rootwin, DEColour in, DEColour *out)
+ {
++#ifndef XFT
+     XColor c;
+     c.pixel=in;
+     XQueryColor(ioncore_g.dpy, rootwin->default_cmap, &c);
+@@ -38,11 +52,20 @@
+         return TRUE;
+     }
+     return FALSE;
++#else /* XFT */
++    return XftColorAllocName(
++        ioncore_g.dpy,
++        XftDEDefaultVisual(),
++        rootwin->default_cmap,
++        &(in.color),
++        out);
++#endif /* XFT */
+ }
+ 
+ 
+ void de_free_colour_group(WRootWin *rootwin, DEColourGroup *cg)
+ {
++#ifndef XFT
+     DEColour pixels[5];
+     
+     pixels[0]=cg->bg;
+@@ -54,15 +77,26 @@
+     XFreeColors(ioncore_g.dpy, rootwin->default_cmap, pixels, 5, 0);
+     
+     gr_stylespec_unalloc(&cg->spec);
++#else /* XFT */
++    de_free_colour(rootwin, cg->bg);
++    de_free_colour(rootwin, cg->fg);
++    de_free_colour(rootwin, cg->hl);
++    de_free_colour(rootwin, cg->sh);
++    de_free_colour(rootwin, cg->pad);
++#endif /* XFT */
+ }
+ 
+ 
+ void de_free_colour(WRootWin *rootwin, DEColour col)
+ {
++#ifndef XFT
+     DEColour pixels[1];
+     
+     pixels[0]=col;
+     
+     XFreeColors(ioncore_g.dpy, rootwin->default_cmap, pixels, 1, 0);
++#else /* XFT */
++    XftColorFree(ioncore_g.dpy, XftDEDefaultVisual(), rootwin->default_cmap, &col);
++#endif /* XFT */
+ }
+ 
+diff -ur notion-3-2015061300/de/colour.h notion-3-2015061300-PATCHED/de/colour.h
+--- notion-3-2015061300/de/colour.h	2015-06-13 10:37:26.000000000 -0400
++++ notion-3-2015061300-PATCHED/de/colour.h	2015-07-13 10:37:23.099298576 -0400
+@@ -12,12 +12,19 @@
+ #include <ioncore/common.h>
+ #include <ioncore/global.h>
+ #include <ioncore/rootwin.h>
++#ifdef XFT
++#include <X11/Xft/Xft.h>
++#endif /* XFT */
+ 
+ 
+ INTRSTRUCT(DEColourGroup);
+ 
+ 
++#ifndef XFT
+ typedef unsigned long DEColour;
++#else /* XFT */
++typedef XftColor DEColour;
++#endif /* XFT */
+ 
+ 
+ DECLSTRUCT(DEColourGroup){
+@@ -34,5 +41,6 @@
+ bool de_duplicate_colour(WRootWin *rootwin, DEColour in, DEColour *out);
+ void de_free_colour_group(WRootWin *rootwin, DEColourGroup *cg);
+ void de_free_colour(WRootWin *rootwin, DEColour col);
++#define XftDEDefaultVisual()    DefaultVisual(ioncore_g.dpy, 0)
+ 
+ #endif /* ION_DE_COLOUR_H */
+diff -ur notion-3-2015061300/de/draw.c notion-3-2015061300-PATCHED/de/draw.c
+--- notion-3-2015061300/de/draw.c	2015-06-13 10:37:26.000000000 -0400
++++ notion-3-2015061300-PATCHED/de/draw.c	2015-07-13 10:37:23.109298008 -0400
+@@ -20,6 +20,14 @@
+ #include <X11/extensions/shape.h>
+ 
+ 
++#ifndef XFT
++#define PIXEL(x) x
++#else /* XFT */
++#define PIXEL(x) x.pixel
++#endif /* XFT */
++
++
++
+ /*{{{ Colour group lookup */
+ 
+ 
+@@ -84,8 +92,7 @@
+     w--;
+     h--;
+ 
+-    XSetForeground(ioncore_g.dpy, gc, tlc);
+-
++    XSetForeground(ioncore_g.dpy, gc, PIXEL(tlc));
+     
+     a=(br!=0);
+     b=0;
+@@ -104,7 +111,7 @@
+     }
+ 
+     
+-    XSetForeground(ioncore_g.dpy, gc, brc);
++    XSetForeground(ioncore_g.dpy, gc, PIXEL(brc));
+ 
+     a=(tl!=0);
+     b=0;
+@@ -141,23 +148,23 @@
+                             GrBorderLine line)
+ {
+     if(line==GR_BORDERLINE_LEFT && geom->h>0 && tl>0){
+-        XSetForeground(ioncore_g.dpy, gc, tlc);
+-        XSetBackground(ioncore_g.dpy, gc, tlc);
++        XSetForeground(ioncore_g.dpy, gc, PIXEL(tlc));
++        XSetBackground(ioncore_g.dpy, gc, PIXEL(tlc));
+         XFillRectangle(ioncore_g.dpy, win, gc, geom->x, geom->y, tl, geom->h);
+         geom->x+=tl;
+     }else if(line==GR_BORDERLINE_TOP && geom->w>0 && tl>0){
+-        XSetForeground(ioncore_g.dpy, gc, tlc);
+-        XSetBackground(ioncore_g.dpy, gc, tlc);
++        XSetForeground(ioncore_g.dpy, gc, PIXEL(tlc));
++        XSetBackground(ioncore_g.dpy, gc, PIXEL(tlc));
+         XFillRectangle(ioncore_g.dpy, win, gc, geom->x, geom->y, geom->w, tl);
+         geom->y+=tl;
+     }else if(line==GR_BORDERLINE_RIGHT && geom->h>0 && br>0){
+-        XSetForeground(ioncore_g.dpy, gc, brc);
+-        XSetBackground(ioncore_g.dpy, gc, brc);
++        XSetForeground(ioncore_g.dpy, gc, PIXEL(brc));
++        XSetBackground(ioncore_g.dpy, gc, PIXEL(brc));
+         XFillRectangle(ioncore_g.dpy, win, gc, geom->x+geom->w-br, geom->y, br, geom->h);
+         geom->w-=br;
+     }else if(line==GR_BORDERLINE_BOTTOM && geom->w>0 && br>0){
+-        XSetForeground(ioncore_g.dpy, gc, brc);
+-        XSetBackground(ioncore_g.dpy, gc, brc);
++        XSetForeground(ioncore_g.dpy, gc, PIXEL(brc));
++        XSetBackground(ioncore_g.dpy, gc, PIXEL(brc));
+         XFillRectangle(ioncore_g.dpy, win, gc, geom->x, geom->y+geom->h-br, geom->w, br);
+         geom->h-=br;
+     }
+@@ -388,7 +395,7 @@
+     }
+     
+     if(ISSET(a2, GR_ATTR(tagged)) || ISSET(a1, GR_ATTR(tagged))){
+-        XSetForeground(ioncore_g.dpy, d->copy_gc, cg->fg);
++        XSetForeground(ioncore_g.dpy, d->copy_gc, PIXEL(cg->fg));
+             
+         copy_masked(brush, d->tag_pixmap, brush->win, 0, 0,
+                     d->tag_pixmap_w, d->tag_pixmap_h,
+@@ -437,7 +444,7 @@
+     GC gc=brush->d->normal_gc;
+     
+     if(TRUE/*needfill*/){
+-        XSetForeground(ioncore_g.dpy, gc, cg->bg);
++        XSetForeground(ioncore_g.dpy, gc, PIXEL(cg->bg));
+         XFillRectangle(ioncore_g.dpy, brush->win, gc, geom->x, geom->y, 
+                        geom->w, geom->h);
+     }
+@@ -605,7 +612,7 @@
+         attr.background_pixmap=ParentRelative;
+     }else{
+         attrflags=CWBackPixel;
+-        attr.background_pixel=brush->d->cgrp.bg;
++        attr.background_pixel=brush->d->PIXEL(cgrp.bg);
+     }
+     
+     XChangeWindowAttributes(ioncore_g.dpy, brush->win, attrflags, &attr);
+@@ -621,7 +628,7 @@
+     if(cg==NULL)
+         return;
+     
+-    XSetForeground(ioncore_g.dpy, gc, cg->bg);
++    XSetForeground(ioncore_g.dpy, gc, PIXEL(cg->bg));
+     XFillRectangle(ioncore_g.dpy, brush->win, gc, 
+                    geom->x, geom->y, geom->w, geom->h);
+ }
+diff -ur notion-3-2015061300/de/font.c notion-3-2015061300-PATCHED/de/font.c
+--- notion-3-2015061300/de/font.c	2015-06-13 10:37:26.000000000 -0400
++++ notion-3-2015061300-PATCHED/de/font.c	2015-07-13 10:37:23.118297497 -0400
+@@ -13,7 +13,9 @@
+ #include <ioncore/common.h>
+ #include <ioncore/log.h>
+ #include "font.h"
++#ifndef XFT
+ #include "fontset.h"
++#endif /* ! XFT */
+ #include "brush.h"
+ #include "precompose.h"
+ 
+@@ -106,6 +108,9 @@
+ 
+ DEFont *de_load_font(const char *fontname)
+ {
++#ifdef XFT
++    XftFont *font;
++#endif
+     DEFont *fnt;
+     XFontSet fontset=NULL;
+     XFontStruct *fontstruct=NULL;
+@@ -120,7 +125,8 @@
+             return fnt;
+         }
+     }
+-    
++
++#ifndef XFT
+     if(ioncore_g.use_mb && !(ioncore_g.enc_utf8 && iso10646_font(fontname))){
+         LOG(DEBUG, FONT, "Loading fontset %s", fontname); 
+         fontset=de_create_font_set(fontname);
+@@ -149,13 +155,34 @@
+         return NULL;
+     }
+     
++#else /* XFT */
++    if(strncmp(fontname, "xft:", 4)==0){
++        font=XftFontOpenName(ioncore_g.dpy, DefaultScreen(ioncore_g.dpy),
++                 fontname+4);
++    }else{
++        font=XftFontOpenXlfd(ioncore_g.dpy, DefaultScreen(ioncore_g.dpy), fontname);
++    }
++    
++    if(font==NULL){
++        if(strcmp(fontname, CF_FALLBACK_FONT_NAME)!=0){
++            warn(TR("Could not load font \"%s\", trying \"%s\""),
++             fontname, CF_FALLBACK_FONT_NAME);
++            return de_load_font(CF_FALLBACK_FONT_NAME);
++        }
++        return NULL;
++    }
++#endif /* XFT */
+     fnt=ALLOC(DEFont);
+     
+     if(fnt==NULL)
+         return NULL;
+     
++#ifndef XFT
+     fnt->fontset=fontset;
+     fnt->fontstruct=fontstruct;
++#else
++    fnt->font=font;
++#endif
+     fnt->pattern=scopy(fontname);
+     fnt->next=NULL;
+     fnt->prev=NULL;
+@@ -175,11 +202,13 @@
+     style->font=font;
+     font->refcount++;
+     
++#ifndef XFT
+     if(style->font->fontstruct!=NULL){
+         XSetFont(ioncore_g.dpy, style->normal_gc, 
+                  style->font->fontstruct->fid);
+     }
+ 
++#endif /* ! XFT */
+     return TRUE;
+ }
+ 
+@@ -194,11 +223,13 @@
+     if(style->font==NULL)
+         return FALSE;
+     
++#ifndef XFT
+     if(style->font->fontstruct!=NULL){
+         XSetFont(ioncore_g.dpy, style->normal_gc, 
+                  style->font->fontstruct->fid);
+     }
+     
++#endif /* ! XFT */
+     return TRUE;
+ }
+ 
+@@ -208,10 +239,15 @@
+     if(--font->refcount!=0)
+         return;
+     
++#ifndef XFT
+     if(font->fontset!=NULL)
+         XFreeFontSet(ioncore_g.dpy, font->fontset);
+     if(font->fontstruct!=NULL)
+         XFreeFont(ioncore_g.dpy, font->fontstruct);
++#else /* XFT */
++    if(font->font!=NULL)
++        XftFontClose(ioncore_g.dpy, font->font);
++#endif /* XFT */
+     if(font->pattern!=NULL)
+         free(font->pattern);
+     
+@@ -239,6 +275,7 @@
+ 
+ void defont_get_font_extents(DEFont *font, GrFontExtents *fnte)
+ {
++#ifndef XFT
+     if(font->fontset!=NULL){
+         XFontSetExtents *ext=XExtentsOfFontSet(font->fontset);
+         if(ext==NULL)
+@@ -254,7 +291,14 @@
+         fnte->baseline=fnt->ascent;
+         return;
+     }
+-    
++#else /* XFT */
++    if(font->font!=NULL){
++        fnte->max_height=font->font->ascent+font->font->descent;
++        fnte->max_width=font->font->max_advance_width;
++        fnte->baseline=font->font->ascent;
++        return;
++    }
++#endif /* XFT */
+ fail:
+     DE_RESET_FONT_EXTENTS(fnte);
+ }
+@@ -271,6 +315,7 @@
+ 
+ uint defont_get_text_width(DEFont *font, const char *text, uint len)
+ {
++#ifndef XFT
+     if(font->fontset!=NULL){
+         XRectangle lext;
+ #ifdef CF_DE_USE_XUTF8
+@@ -298,6 +343,18 @@
+     }else{
+         return 0;
+     }
++#else /* XFT */
++    if(font->font!=NULL){
++        XGlyphInfo extents;
++        if(ioncore_g.enc_utf8)
++            XftTextExtentsUtf8(ioncore_g.dpy, font->font, (XftChar8 *)text, len, &extents);
++        else
++            XftTextExtents8(ioncore_g.dpy, font->font, (XftChar8 *)text, len, &extents);
++        return extents.xOff;
++    }else{
++        return 0;
++    }
++#endif /* XFT */
+ }
+ 
+ 
+@@ -307,6 +364,7 @@
+ /*{{{ String drawing */
+ 
+ 
++#ifndef XFT
+ void debrush_do_draw_string_default(DEBrush *brush, int x, int y,
+                                     const char *str, int len, bool needfill, 
+                                     DEColourGroup *colours)
+@@ -366,6 +424,43 @@
+     }
+ }
+ 
++#else /* XFT */
++void debrush_do_draw_string_default(DEBrush *brush, 
++                                    int x, int y, const char *str,
++                                    int len, bool needfill, 
++                                    DEColourGroup *colours)
++{
++    Window win = brush->win;
++    GC gc=brush->d->normal_gc;
++    XftDraw *draw;
++    XftFont *font;
++    
++    if(brush->d->font==NULL)
++        return;
++
++    font=brush->d->font->font;
++    draw=debrush_get_draw(brush, win);
++
++    if(needfill){
++        XGlyphInfo extents;
++        if(ioncore_g.enc_utf8){
++            XftTextExtentsUtf8(ioncore_g.dpy, font, (XftChar8 *)str, len,
++                               &extents);
++        }else{
++            XftTextExtents8(ioncore_g.dpy, font, (XftChar8 *)str, len, &extents);
++            XftDrawRect(draw, &(colours->bg), x-extents.x, y-extents.y,
++                        extents.width+10, extents.height);
++        }
++    }
++
++    if(ioncore_g.enc_utf8){
++        XftDrawStringUtf8(draw, &(colours->fg), font, x, y, (XftChar8 *)str,
++                          len);
++    }else{
++        XftDrawString8(draw, &(colours->fg), font, x, y, (XftChar8 *)str, len);
++    }
++}
++#endif /* XFT */
+ 
+ void debrush_do_draw_string(DEBrush *brush, int x, int y,
+                             const char *str, int len, bool needfill, 
+diff -ur notion-3-2015061300/de/font.h notion-3-2015061300-PATCHED/de/font.h
+--- notion-3-2015061300/de/font.h	2015-06-13 10:37:26.000000000 -0400
++++ notion-3-2015061300-PATCHED/de/font.h	2015-07-13 10:37:23.119297440 -0400
+@@ -12,6 +12,9 @@
+ 
+ #include <ioncore/common.h>
+ #include <ioncore/gr.h>
++#ifdef XFT
++#include <X11/Xft/Xft.h>
++#endif /* XFT */
+ 
+ INTRSTRUCT(DEFont);
+ 
+@@ -27,6 +30,9 @@
+     int refcount;
+     XFontSet fontset;
+     XFontStruct *fontstruct;
++#ifdef XFT /* XFT */
++    XftFont *font;
++#endif /* XFT */
+     DEFont *next, *prev;
+ };
+ 
+diff -ur notion-3-2015061300/de/init.c notion-3-2015061300-PATCHED/de/init.c
+--- notion-3-2015061300/de/init.c	2015-06-13 10:37:26.000000000 -0400
++++ notion-3-2015061300-PATCHED/de/init.c	2015-07-13 10:37:23.122297270 -0400
+@@ -165,17 +165,26 @@
+ {
+     bool bgset;
+     DEColour padinh;
+-    
++    DEColour black, white;
++
++#ifdef XFT
++    de_alloc_colour(rootwin, &black, "black");
++    de_alloc_colour(rootwin, &white, "white");
++#else
++    black=DE_BLACK(rootwin);
++    white=DE_WHITE(rootwin);
++#endif
++
+     de_get_colour(rootwin, &(cg->hl), tab, "highlight_colour",
+-                  (based_on ? based_on->cgrp.hl : DE_WHITE(rootwin)));
++                  (based_on ? based_on->cgrp.hl : white));
+     de_get_colour(rootwin, &(cg->sh), tab, "shadow_colour",
+-                  (based_on ? based_on->cgrp.sh : DE_WHITE(rootwin)));
++                  (based_on ? based_on->cgrp.sh : white));
+     de_get_colour(rootwin, &(cg->fg), tab, "foreground_colour",
+-                  (based_on ? based_on->cgrp.fg : DE_WHITE(rootwin)));
++                  (based_on ? based_on->cgrp.fg : white));
+     bgset=de_get_colour(rootwin, &(cg->bg), tab, "background_colour",
+-                        (based_on ? based_on->cgrp.bg : DE_BLACK(rootwin)));
++                        (based_on ? based_on->cgrp.bg : black));
+                         
+-    padinh=(based_on ? based_on->cgrp.pad : DE_WHITE(rootwin));
++    padinh=(based_on ? based_on->cgrp.pad : white);
+     
+     de_get_colour_(rootwin, &(cg->pad), tab, "padding_colour", 
+                    (bgset ? cg->bg : padinh), padinh);
+diff -ur notion-3-2015061300/de/style.c notion-3-2015061300-PATCHED/de/style.c
+--- notion-3-2015061300/de/style.c	2015-06-13 10:37:26.000000000 -0400
++++ notion-3-2015061300-PATCHED/de/style.c	2015-07-13 10:37:23.128296929 -0400
+@@ -70,10 +70,17 @@
+     /*gcv.function=GXclear;*/
+     gcv.stipple=stipple_pixmap;
+     gcvmask=GCFillStyle|GCStipple/*|GCFunction*/;
++#ifndef XFT
+     if(style->font!=NULL && style->font->fontstruct!=NULL){
+         gcv.font=style->font->fontstruct->fid;
+         gcvmask|=GCFont;
+     }
++#else /* XFT */
++//    if(style->font!=NULL){
++//        gcv.font=style->font;
++//        gcvmask|=GCFont;
++//    }
++#endif /* XFT */
+ 
+     style->stipple_gc=XCreateGC(dpy, root, gcvmask, &gcv);
+     XCopyGC(dpy, style->normal_gc, 
+@@ -201,6 +208,14 @@
+ 
+ bool destyle_init(DEStyle *style, WRootWin *rootwin, const char *name)
+ {
++    DEColour black, white;
++#ifdef XFT
++    de_alloc_colour(rootwin, &black, "black");
++    de_alloc_colour(rootwin, &white, "white");
++#else
++    black=DE_BLACK(rootwin);
++    white=DE_WHITE(rootwin);
++#endif /* XFT */
+     if(!gr_stylespec_load(&style->spec, name))
+         return FALSE;
+     
+@@ -223,11 +238,11 @@
+     style->textalign=DEALIGN_CENTER;
+ 
+     style->cgrp_alloced=FALSE;
+-    style->cgrp.bg=DE_BLACK(rootwin);
+-    style->cgrp.pad=DE_BLACK(rootwin);
+-    style->cgrp.fg=DE_WHITE(rootwin);
+-    style->cgrp.hl=DE_WHITE(rootwin);
+-    style->cgrp.sh=DE_WHITE(rootwin);
++    style->cgrp.bg=black;
++    style->cgrp.pad=black;
++    style->cgrp.fg=white;
++    style->cgrp.hl=white;
++    style->cgrp.sh=white;
+     gr_stylespec_init(&style->cgrp.spec);
+     
+     style->font=NULL;
+diff -ur notion-3-2015061300/de/style.h notion-3-2015061300-PATCHED/de/style.h
+--- notion-3-2015061300/de/style.h	2015-06-13 10:37:26.000000000 -0400
++++ notion-3-2015061300-PATCHED/de/style.h	2015-07-13 10:37:23.130296815 -0400
+@@ -80,6 +80,7 @@
+     Pixmap tag_pixmap;
+     int tag_pixmap_w;
+     int tag_pixmap_h;
++    int xft_style;
+     
+     DEStyle *next, *prev;
+ };
+diff -ur notion-3-2015061300/system-autodetect.mk notion-3-2015061300-PATCHED/system-autodetect.mk
+--- notion-3-2015061300/system-autodetect.mk	2015-06-13 10:37:26.000000000 -0400
++++ notion-3-2015061300-PATCHED/system-autodetect.mk	2015-07-13 10:38:14.921332013 -0400
+@@ -103,6 +103,19 @@
+ 
+ 
+ ##
++## Xft support
++##
++
++USE_XFT=1
++
++ifeq ($(USE_XFT),1)
++EXTRA_INCLUDES += `pkg-config xft --cflags`
++EXTRA_LIBS += `pkg-config xft --libs`
++DEFINES += -DXFT -DCF_FALLBACK_FONT_NAME=\"Sans\"
++endif
++
++
++##
+ ## Localisation
+ ##
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6b9bd71988..a01115b579e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12112,6 +12112,8 @@ let
 
   mutt-kz = callPackage ../applications/networking/mailreaders/mutt-kz { };
 
+  notion = callPackage ../applications/window-managers/notion { };
+
   openshift = callPackage ../applications/networking/cluster/openshift { };
 
   panamax_api = callPackage ../applications/networking/cluster/panamax/api {

From 13e83251a0bd69cf3ab99fa78f571d71932b79ee Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 13 Jul 2015 19:30:01 +0200
Subject: [PATCH 2170/2322] virtualbox: Fix load of libpulse.so at runtime.

Within fractions* of a second, the beautifully crafted history and
branching mechanisms of SVN found out the exact revision which caused
this to be visible in version 5.x but not in version 4.x:

https://www.virtualbox.org/changeset?old_path=%2Fvbox%2Ftrunk&old=30933&new_path=%2Fvbox%2Ftrunk&new=30934

Also note the very short URL and the informative changeset message which
shows you exactly what was the issue, I think.

Be warned however, it may contain traces of history amnesia, revision
epilepsy and other related diseases.

As for the issue itself: This was very much broken in 4.x as well, but
it didn't show an error message in the UI. The PulseAudio library is
loaded at runtime and it's not able to do that unless it's in
LD_LIBRARY_PATH.

Now, we're doing the same as with the ALSA libraries: We're hardcoding
the path to the shared object file in patchPhase.

Thanks to @devhell for reporting and testing.

*: Might be off several minutes or hours due to rounding errors in
   floating point arithmetic.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: devhell <"^"@regexmail.net>
Tested-by: devhell <"^"@regexmail.net>
---
 pkgs/applications/virtualization/virtualbox/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index a1a38931410..3250dc419d1 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -81,7 +81,12 @@ in stdenv.mkDerivation {
     ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2
     ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2
     find . -type f -iname '*makefile*' -exec sed -i -e 's/depmod -a/:/g' {} +
-    sed -e 's@"libasound.so.2"@"${alsaLib}/lib/libasound.so.2"@g' -i src/VBox/Main/xml/Settings.cpp src/VBox/Devices/Audio/alsa_stubs.c
+    sed -i -e '
+      s@"libasound.so.2"@"${alsaLib}/lib/libasound.so.2"@g
+      ${optionalString pulseSupport ''
+      s@"libpulse.so.0"@"${libpulseaudio}/lib/libpulse.so.0"@g
+      ''}
+    ' src/VBox/Main/xml/Settings.cpp src/VBox/Devices/Audio/{alsa,pulse}_stubs.c
     export USER=nix
     set +x
   '';

From daef191d8d7d1f488e0347bd2ab887b8c88316be Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 13 Jul 2015 21:16:12 +0200
Subject: [PATCH 2171/2322] python-packages.nix: strip trailing whitespace

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 77b83cbfabf..963e2a449c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2214,20 +2214,20 @@ let
       license = licenses.asl20;
     };
   };
-  
+
   cytoolz = buildPythonPackage rec {
     name = "cytoolz-${version}";
     version = "0.7.3";
-    
+
     src = pkgs.fetchurl{
       url = "https://pypi.python.org/packages/source/c/cytoolz/cytoolz-${version}.tar.gz";
       md5 = "e9f0441d9f340a23c60357f68f25d163";
     };
-    
+
     meta = {
       homepage = "http://github.com/pytoolz/cytoolz/";
       description = "Cython implementation of Toolz: High performance functional utilities";
-      license = "licenses.bsd3";   
+      license = "licenses.bsd3";
     };
   };
 
@@ -2597,14 +2597,14 @@ let
   datashape = buildPythonPackage rec {
     name = "datashape-${version}";
     version = "0.4.6";
-    
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/D/DataShape/${name}.tar.gz";
-      sha256 = "0caa86a4347f1b0c45f3890d78d0b89662189c7dd6df3a8e5ff3532ae8bc434f";    
+      sha256 = "0caa86a4347f1b0c45f3890d78d0b89662189c7dd6df3a8e5ff3532ae8bc434f";
     };
-    
+
     propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ];
-    
+
     meta = {
       homepage = https://github.com/ContinuumIO/datashape;
       description = "A data description language";
@@ -7669,12 +7669,12 @@ let
   multipledispatch = buildPythonPackage rec {
     name = "multipledispatch-${version}";
     version = "0.4.8";
-   
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/m/multipledispatch/${name}.tar.gz";
       sha256 = "07d41fb3ed25e8424536e48a8566f88a0f9926ca4b6174bff6aa16c98251b92e";
     };
-    
+
     meta = {
       homepage = http://github.com/mrocklin/multipledispatch/;
       description = "A relatively sane approach to multiple dispatch in Python";
@@ -8432,21 +8432,21 @@ let
   odo = buildPythonPackage rec {
     name = "odo-${version}";
     version= "0.3.3";
-    
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/o/odo/${name}.tar.gz";
       sha256 = "2499ee86c26c74daa28f21ed235ca331911065950deea5169ebdb7d5dae6ebef";
     };
-    
+
     propagatedBuildInputs = with self; [ datashape numpy pandas toolz multipledispatch networkx ];
-    
+
     meta = {
       homepage = https://github.com/ContinuumIO/odo;
       description = "Data migration utilities";
       license = licenses.bsdOriginal;
     };
   };
-  
+
   offtrac = buildPythonPackage rec {
     name = "offtrac-0.1.0";
     meta.maintainers = with maintainers; [ mornfall ];
@@ -8707,21 +8707,21 @@ let
   patsy = buildPythonPackage rec {
     name = "patsy-${version}";
     version = "0.3.0";
-    
+
     src = pkgs.fetchurl{
       url = "https://pypi.python.org/packages/source/p/patsy/${name}.zip";
       md5 = "7545518b413136ba8343dcebea07e5e2";
     };
-    
+
     propagatedBuildInputs = with self; [six numpy];
-    
+
     meta = {
       description = "A Python package for describing statistical models";
       homepage = "https://github.com/pydata/patsy";
       license = licenses.bsd2;
     };
   };
-  
+
   paste = buildPythonPackage rec {
     name = "paste-1.7.5.1";
     disabled = isPy3k;
@@ -10662,12 +10662,12 @@ let
   ptyprocess = buildPythonPackage rec {
     name = "ptyprocess-${version}";
     version = "0.5";
-    
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/ptyprocess/${name}.tar.gz";
       sha256= "dcb78fb2197b49ca1b7b2f37b047bc89c0da7a90f90bd5bc17c3ce388bb6ef59";
     };
-    
+
     meta = {
       description = "Run a subprocess in a pseudo terminal";
       homepage = https://github.com/pexpect/ptyprocess;
@@ -13132,21 +13132,21 @@ let
   terminado = buildPythonPackage rec {
     name = "terminado-${version}";
     version = "0.5";
-    
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/t/terminado/${name}.tar.gz";
       sha256 = "63e893eff1ba84f1ee7c4bfcca7676ba1de6394538bb9aa80cbbc8866cb875b6";
     };
-    
+
     propagatedBuildInputs = with self; [ ptyprocess tornado ];
-    
+
     meta = {
       description = "Terminals served to term.js using Tornado websockets";
       homepage = https://github.com/takluyver/terminado;
       licenses = licenses.bsd2;
     };
   };
-  
+
   testscenarios = buildPythonPackage rec {
     name = "testscenarios-${version}";
     version = "0.4";
@@ -13292,19 +13292,19 @@ let
   toolz = buildPythonPackage rec{
     name = "toolz-${version}";
     version = "0.7.2";
-    
+
     src = pkgs.fetchurl{
       url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
       md5 = "6f045541a9e7ee755b7b00fced4a7fde";
     };
-    
+
     meta = {
       homepage = "http://github.com/pytoolz/toolz/";
       description = "List processing tools and functional utilities";
-      license = "licenses.bsd3";   
+      license = "licenses.bsd3";
     };
   };
-  
+
   tox = buildPythonPackage rec {
     name = "tox-1.8.1";
 

From 41f3ff68b598b6f7e4f2f4dd295b5d06d1cd05ea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 13 Jul 2015 21:18:08 +0200
Subject: [PATCH 2172/2322] python-packages.nix: strip more trailing whitespace

---
 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 963e2a449c9..ad152d25f75 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10437,16 +10437,16 @@ let
       maintainers = with maintainers; [ koral ];
     };
   };
-  
+
   pystache = buildPythonPackage rec {
     name = "pystache-${version}";
     version = "0.5.4";
-    
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pystache/${name}.tar.gz";
       sha256 = "f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a";
     };
-    
+
     meta = {
       description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et";
       homepage = https://github.com/defunkt/pystache;

From fc7c18a99221385060cdc0a3ba7c1d7a3dc62e55 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 10 Jul 2015 11:18:04 -0700
Subject: [PATCH 2173/2322] mumble: 1.2.9 -> 1.2.10

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

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 4eabdadc487..aececbb6130 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -15,11 +15,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "mumble-${version}";
-  version = "1.2.9";
+  version = "1.2.10";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mumble/${name}.tar.gz";
-    sha256 = "1frc6b284cl36czrsrg47mnmg1im0pjqscp877gz2rrjc62pxlab";
+    url = "https://github.com/mumble-voip/mumble/releases/download/${version}/${name}.tar.gz";
+    sha256 = "012vm0xf84x13414jlsx964c5a1nwnbn41jnspkciajlxxipldn6";
   };
 
   patches = optional jackSupport ./mumble-jack-support.patch;

From b2ae45bd770fc14134e51382d28e06f695f785a1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 10 Jul 2015 11:07:39 -0700
Subject: [PATCH 2174/2322] btrfsProgs: Cleanup some old build changes

The change of optimization flags should be safe for all platforms as
the default for most applications is -O2. It is also unecessary to
forcefully link against libgcc_s as btrfsprogs no longer errors when
scrubbing without this linkage.
---
 pkgs/tools/filesystems/btrfsprogs/default.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 3ec04859237..95b34ed8960 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -1,9 +1,10 @@
 { stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
-, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }:
+, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
+}:
 
 let version = "4.1.1"; in
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
@@ -16,10 +17,9 @@ stdenv.mkDerivation (rec {
     asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
   ];
 
-  # for btrfs to get the rpath to libgcc_s, needed for pthread_cancel to work
-  NIX_CFLAGS_LINK = "-lgcc_s";
-
-  makeFlags = "prefix=$(out)";
+  # gcc bug with -O1 on ARM with gcc 4.8
+  # This should be fine on all platforms so apply universally
+  patchPhase = "sed -i s/-O1/-O2/ configure";
 
   meta = with stdenv.lib; {
     description = "Utilities for the btrfs filesystem";
@@ -28,7 +28,4 @@ stdenv.mkDerivation (rec {
     maintainers = with maintainers; [ raskin wkennington ];
     platforms = platforms.linux;
   };
-} // (if stdenv.isArm then {
-  # gcc bug with -O1 on ARM
-  patchPhase = "sed -i s/-O1/-O2/ configure";
-} else {}))
+}

From 7e3c95a0b813394b1a41b73e078d3ffd9e951979 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 13 Jul 2015 17:45:08 +0200
Subject: [PATCH 2175/2322] sqlitebrowser: init at 3.7.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn: add name=... to fetchzip.]
---
 .../tools/database/sqlitebrowser/default.nix  | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/tools/database/sqlitebrowser/default.nix

diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
new file mode 100644
index 00000000000..e5c2060b5e9
--- /dev/null
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchzip, qt4, sqlite, cmake }:
+
+stdenv.mkDerivation rec {
+  version = "3.7.0";
+  name = "sqlitebrowser-${version}";
+
+  src = fetchzip {
+    name = "${name}-src";
+    url = "https://github.com/sqlitebrowser/sqlitebrowser/archive/v${version}.tar.gz";
+    sha256 = "1zsgylnxk4lyg7p6k6pv8d3mh1k0wkfcplh5c5da3x3i9a3qs78j";
+  };
+
+  buildInputs = [ qt4 sqlite cmake ];
+
+  meta = with stdenv.lib; {
+    description = "DB Browser for SQLite";
+    homepage = "http://sqlitebrowser.org/";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.matthiasbeyer ];
+    platforms = platforms.linux; # can only test on linux
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6b9bd71988..889022a60ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5734,6 +5734,8 @@ let
     flex = flex_2_5_35;
   };
 
+  sqlitebrowser = callPackage ../development/tools/database/sqlitebrowser { };
+
   sselp = callPackage ../tools/X11/sselp{ };
 
   stm32flash = callPackage ../development/tools/misc/stm32flash { };

From d253b3d875d2bae84afbc141754b286e18e2fb7d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 13 Jul 2015 13:48:59 -0700
Subject: [PATCH 2176/2322] coreutils: Skip sparse cp test as it fails reliably
 with btrfs on ubuntu 14.04

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

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index d72786fa2ff..c9d8f0ad602 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -24,6 +24,7 @@ let
     # The test tends to fail on btrfs and maybe other unusual filesystems.
     postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
       sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh
+      sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh
     '';
 
     nativeBuildInputs = [ perl ];

From d3284944a12d442df233830f1e72bd59357f3dfa Mon Sep 17 00:00:00 2001
From: Maciek Starzyk <mstarzyk@gmail.com>
Date: Mon, 13 Jul 2015 23:43:25 +0200
Subject: [PATCH 2177/2322] obnam: 1.8 -> 1.12

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

diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index bf71f9397cb..910fe332d25 100644
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -2,17 +2,17 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "obnam-${version}";
-  version = "1.8";
+  version = "1.12";
 
   namePrefix = "";
 
   src = fetchurl rec {
-    url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.gz";
-    sha256 = "0190yz65hfdq69xws4h1izxz59by0b437d7z1l4cf5ixkv16j17p";
+    url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";
+    sha256 = "09b9j2mygv1dsrq424j535c92wvlbzpwgzcgg7x922dxrnsdsxpr";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];
-  propagatedBuildInputs = [ pycrypto pythonPackages.paramiko pythonPackages.tracing pythonPackages.ttystatus pythonPackages.cliapp pythonPackages.larch ];
+  propagatedBuildInputs = [ pycrypto pythonPackages.paramiko pythonPackages.tracing pythonPackages.ttystatus pythonPackages.cliapp pythonPackages.larch pythonPackages.pyyaml ];
 
   doCheck = false;
 

From be65ac7c32e3d23ecc5964f11cc8e3c658128ec3 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Mon, 13 Jul 2015 23:46:38 +0200
Subject: [PATCH 2178/2322] Issue 8152 - Reduce number of attribute set created
 by replaceChars.

---
 lib/strings.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 39112407c57..d9f7f6c2db8 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -107,11 +107,13 @@ rec {
   # replaceChars ["<" ">"] ["&lt;" "&gt;"] "<foo>" returns "&lt;foo&gt;".
   replaceChars = del: new: s:
     let
+      substList = lib.zipLists del new;
       subst = c:
-        (lib.fold
-          (sub: res: if sub.fst == c then sub else res)
-          {fst = c; snd = c;} (lib.zipLists del new)
-        ).snd;
+        let found = lib.findFirst (sub: sub.fst == c) null substList; in
+        if found == null then
+          c
+        else
+          found.snd;
     in
       stringAsChars subst s;
 

From 05a8ad5a806cf915c1e636e18763dec48d842214 Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Mon, 13 Jul 2015 16:50:46 -0500
Subject: [PATCH 2179/2322] flexget: 1.2.278 -> 1.2.337

---
 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 ad152d25f75..85cf0e63915 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5538,13 +5538,13 @@ let
   };
 
   flexget = buildPythonPackage rec {
-    version = "1.2.278";
+    version = "1.2.337";
     name = "FlexGet-${version}";
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/F/FlexGet/${name}.tar.gz";
-      md5 = "9c8e41d9e59d53cf2c720661b2880719";
+      md5 = "2c249c43bc594726f908b1425a8b8081";
     };
 
     doCheck = false;

From 368fee5ff323ee7c1e4b72f9245dc6d893173a73 Mon Sep 17 00:00:00 2001
From: Sam Griffin <sam.griffin@gmail.com>
Date: Sun, 12 Jul 2015 23:43:53 -0400
Subject: [PATCH 2180/2322] bitcoin: 0.10.2 -> 0.11.0

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

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index 7be2b90551e..bdd0335fe3b 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -6,14 +6,14 @@ with stdenv.lib;
 stdenv.mkDerivation rec{
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  core_version = "0.10.2";
+  core_version = "0.11.0";
   version = core_version;
 
   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"
            ];
-    sha256 = "cddf96c71d0a35524fde93380981cf0cf0b51441454a3a68b9be491b9239bfec";
+    sha256 = "51ba1756addfa71567559e3f22331c1d908a63571891287689fff7113035d09f";
   };
 
   buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib

From 45135c0256b15f80dafbd281107ca489d2c09735 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 14 Jul 2015 07:31:18 +0200
Subject: [PATCH 2181/2322] linux-testing: Update to version 4.2.0-rc2.

Upstream diff of changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/diff/?id=v4.2-rc2&id2=v4.2-rc1&dt=2

Not tested on my machine right now (well, it's "testing" after all), but
verified the SHA256 from two different connections.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index acfe421ac10..0c31c558c47 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, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.2-rc1";
-  modDirVersion = "4.2.0-rc1";
+  version = "4.2-rc2";
+  modDirVersion = "4.2.0-rc2";
   extraMeta.branch = "4.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "0a9zr1jf2c110lvd7wi4jxxk2iw6san31yh8hwlahkkb8kh4wliw";
+    sha256 = "068g71ns8d2j66hppmnssilf185p33w7argb0r2w9kplqq2ac99w";
   };
 
   features.iwlwifi = true;

From 52b78864a8ffd8ccf121dd207019b4dfaa6e48cd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 13 Jul 2015 23:53:13 -0700
Subject: [PATCH 2182/2322] firmware-linux-nonfree: 2015-06-30 -> 2015-07-12

---
 .../linux/firmware/firmware-linux-nonfree/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 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 dc166da3ae1..bbe35fe9699 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2015-06-30";
+  version = "2015-07-12";
 
   src = fetchgit {
     url = "http://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git";
-    rev = "ea901a57054441907e9b127ad407a8554532f992";
-    sha256 = "00899r0gakdy2vpgq5zbhbxrl4kyczg1kybv1h3m2lrk9a0j7v67";
+    rev = "5e6d7a9d70b562c60471e234f78137020d65ccbf";
+    sha256 = "06gvjdqpbayfv696hxn9xjkbzddj1hy6z9aahi156lvj96qb9z49";
   };
 
   preInstall = ''

From 2fb8194bfefafad3c10c544cf5d9588ec3a73eae Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Tue, 14 Jul 2015 03:11:40 -0500
Subject: [PATCH 2183/2322] gnome-terminal: use GIO_EXTRA_MODULES in wrapper

This fixes an issue where gnome-terminal uses the memory GSettings
backend and does not persist settings across sessions.
---
 pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
index 4a07dbee129..ccc56cfdb31 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
@@ -24,7 +24,9 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     for f in "$out/libexec/gnome-terminal-server"; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
+      wrapProgram "$f" \
+        --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
+        --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
     done
   '';
 

From 562f760f204baed1303ef8fa1fb3372c1086ca34 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Tue, 14 Jul 2015 08:25:35 +0000
Subject: [PATCH 2184/2322] xurls: init at 0.6.0

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

diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix
new file mode 100644
index 00000000000..15581744173
--- /dev/null
+++ b/pkgs/tools/text/xurls/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, go }:
+
+stdenv.mkDerivation rec {
+  version = "0.6.0";
+  name = "xurls-${version}";
+
+  src = fetchFromGitHub {
+    owner = "mvdan";
+    repo = "xurls";
+    rev = "v${version}";
+    sha256 = "0v9qfvvwy0pq7wp5q19y4a61mcc1sj8vkhvhb8bk603gzprfs10z";
+  };
+
+  buildInputs = [ go ];
+
+  buildPhase = ''
+    mkdir -p src/github.com/mvdan
+    ln -s $(pwd) src/github.com/mvdan/xurls
+    export GOPATH=$(pwd)
+    cd cmd/xurls
+    go build -v
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv xurls $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Extract urls from text";
+    homepage = https://github.com/mvdan/xurls;
+    maintainers = [ maintainers.koral ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59090e1ced9..b7b51e1ecc0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3412,6 +3412,8 @@ let
 
   xtreemfs = callPackage ../tools/filesystems/xtreemfs {};
 
+  xurls = callPackage ../tools/text/xurls {};
+
   xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };
 
   xvkbd = callPackage ../tools/X11/xvkbd {

From cb46ba4b1624b13f461884e362c0a45fdde265cb Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 14 Jul 2015 10:32:26 +0200
Subject: [PATCH 2185/2322] CONTRIBUTING: link to latest hydra build of nixpkgs
 manual

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 85af24b8f3d..b92308622ee 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,4 +9,4 @@
 
 ## Submitting changes
 
-See the nixpkgs manual for details on how to [Submit changes to nixpkgs](http://nixos.org/nixpkgs/manual/#chap-submitting-changes).
+See the nixpkgs manual for details on how to [Submit changes to nixpkgs](http://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download-by-type/doc/manual#chap-submitting-changes).

From 7e2082c16f5ccc709dd9062e63f176fdcdd1badc Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 14 Jul 2015 05:58:54 -0400
Subject: [PATCH 2186/2322] Export info from build-maven

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

diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix
index 646b3243583..a1faf8060be 100644
--- a/pkgs/build-support/build-maven.nix
+++ b/pkgs/build-support/build-maven.nix
@@ -42,7 +42,7 @@ infoFile: let
 
   src = dirOf infoFile;
 in {
-  inherit repo settings;
+  inherit repo settings info;
 
   build = stdenv.mkDerivation {
     name = "${info.project.artifactId}-${info.project.version}.jar";

From a6b455bbaecb42679e5d1ade51433d62ee21bd03 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Wed, 13 May 2015 22:44:04 +0200
Subject: [PATCH 2187/2322] NixOS modules: Add error context on module
 arguments evaluation.

---
 lib/modules.nix                               | 19 ++++++++++++++-----
 lib/tests/modules.sh                          | 12 ++++++++++--
 .../modules/define-_module-args-custom.nix    |  7 +++++++
 ....nix => define-enable-with-custom-arg.nix} |  1 -
 lib/tests/modules/import-custom-arg.nix       |  6 ++++++
 5 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 lib/tests/modules/define-_module-args-custom.nix
 rename lib/tests/modules/{custom-arg-define-enable.nix => define-enable-with-custom-arg.nix} (67%)
 create mode 100644 lib/tests/modules/import-custom-arg.nix

diff --git a/lib/modules.nix b/lib/modules.nix
index 73dbdd371f6..ea600127617 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -91,9 +91,11 @@ rec {
     let
       toClosureList = file: parentKey: imap (n: x:
         if isAttrs x || isFunction x then
-          unifyModuleSyntax file "${parentKey}:anon-${toString n}" (unpackSubmodule applyIfFunction x args)
+          let key = "${parentKey}:anon-${toString n}"; in
+          unifyModuleSyntax file key (unpackSubmodule (applyIfFunction key) x args)
         else
-          unifyModuleSyntax (toString x) (toString x) (applyIfFunction (import x) args));
+          let file = toString x; key = toString x; in
+          unifyModuleSyntax file key (applyIfFunction key (import x) args));
     in
       builtins.genericClosure {
         startSet = toClosureList unknownModule "" modules;
@@ -122,7 +124,7 @@ rec {
         config = removeAttrs m ["key" "_file" "require" "imports"];
       };
 
-  applyIfFunction = f: arg@{ config, options, lib, ... }: if isFunction f then
+  applyIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then
     let
       # Module arguments are resolved in a strict manner when attribute set
       # deconstruction is used.  As the arguments are now defined with the
@@ -137,11 +139,18 @@ rec {
       # not their values.  The values are forwarding the result of the
       # evaluation of the option.
       requiredArgs = builtins.attrNames (builtins.functionArgs f);
+      context = name: ''while evaluating the module argument `${name}' in "${key}":'';
       extraArgs = builtins.listToAttrs (map (name: {
         inherit name;
-        value = config._module.args.${name};
+        value = addErrorContext (context name)
+          (args.${name} or config._module.args.${name});
       }) requiredArgs);
-    in f (extraArgs // arg)
+
+      # Note: we append in the opposite order such that we can add an error
+      # context on the explicited arguments of "args" too. This update
+      # operator is used to make the "args@{ ... }: with args.lib;" notation
+      # works.
+    in f (args // extraArgs)
   else
     f;
 
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 66c6f560fbe..65de8e378c7 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -12,7 +12,7 @@ evalConfig() {
     local attr=$1
     shift;
     local script="import ./default.nix { modules = [ $@ ];}"
-    nix-instantiate --timeout 1 -E "$script" -A "$attr" --eval-only
+    nix-instantiate --timeout 1 -E "$script" -A "$attr" --eval-only --show-trace
 }
 
 reportFailure() {
@@ -100,7 +100,15 @@ checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-if-enabl
 checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-enable-if.nix
 
 # Check _module.args.
-checkConfigOutput "true" config.enable ./declare-enable.nix ./custom-arg-define-enable.nix
+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.*:' "$@"
+checkConfigOutput "true" "$@" ./define-_module-args-custom.nix
+
+# Check that using _module.args on imports cause infinite recursions, with
+# the proper error context.
+set -- "$@" ./define-_module-args-custom.nix ./import-custom-arg.nix
+checkConfigError 'while evaluating the module argument .*custom.* in .*import-custom-arg.nix.*:' "$@"
+checkConfigError 'infinite recursion encountered' "$@"
 
 # Check _module.check.
 set -- config.enable ./declare-enable.nix ./define-enable.nix ./define-loaOfSub-foo.nix
diff --git a/lib/tests/modules/define-_module-args-custom.nix b/lib/tests/modules/define-_module-args-custom.nix
new file mode 100644
index 00000000000..e565fd215a5
--- /dev/null
+++ b/lib/tests/modules/define-_module-args-custom.nix
@@ -0,0 +1,7 @@
+{ lib, ... }:
+
+{
+  config = {
+    _module.args.custom = true;
+  };
+}
diff --git a/lib/tests/modules/custom-arg-define-enable.nix b/lib/tests/modules/define-enable-with-custom-arg.nix
similarity index 67%
rename from lib/tests/modules/custom-arg-define-enable.nix
rename to lib/tests/modules/define-enable-with-custom-arg.nix
index f04d30dd9b9..7da74671d14 100644
--- a/lib/tests/modules/custom-arg-define-enable.nix
+++ b/lib/tests/modules/define-enable-with-custom-arg.nix
@@ -2,7 +2,6 @@
 
 {
   config = {
-    _module.args.custom = true;
     enable = custom;
   };
 }
diff --git a/lib/tests/modules/import-custom-arg.nix b/lib/tests/modules/import-custom-arg.nix
new file mode 100644
index 00000000000..3e687b661c1
--- /dev/null
+++ b/lib/tests/modules/import-custom-arg.nix
@@ -0,0 +1,6 @@
+{ lib, custom, ... }:
+
+{
+  imports = []
+  ++ lib.optional custom ./define-enable-force.nix;
+}

From 4c0e44c34c84cd4d4764e9b48206b463d2fbef5a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 14 Jul 2015 16:01:46 +0200
Subject: [PATCH 2188/2322] Make OpenJDK release-critical

Currently there are no tests that depend on the JDK. Since we don't
want a release with a broken JDK, make it an explicit dependency of
the "tested" jobs.
---
 nixos/release-combined.nix | 1 +
 nixos/release-small.nix    | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 2d2976ea5b7..52a1dcf9932 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -90,6 +90,7 @@ in rec {
 
         nixpkgs.tarball
         (all nixpkgs.emacs)
+        (all nixpkgs.jdk)
       ];
   });
 
diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index 11155c85369..8e53064f99d 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -87,7 +87,10 @@ in rec {
     };
     constituents =
       let all = x: map (system: x.${system}) supportedSystems; in
-      [ nixpkgs.tarball ] ++ lib.collect lib.isDerivation nixos;
+      [ nixpkgs.tarball
+        (all nixpkgs.jdk)
+      ]
+      ++ lib.collect lib.isDerivation nixos;
   });
 
 }

From be5ad1d07c21e9e2bab697098a35859a51f20650 Mon Sep 17 00:00:00 2001
From: James Felix Black <james_black@apple.com>
Date: Tue, 14 Jul 2015 12:35:35 -0400
Subject: [PATCH 2189/2322] window-manager service: add notion

Add the notion window manager to the windowManager service definition.
---
 .../services/x11/window-managers/default.nix  |  1 +
 .../services/x11/window-managers/notion.nix   | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 nixos/modules/services/x11/window-managers/notion.nix

diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index 097e4fe70d5..a8b1044ad36 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -16,6 +16,7 @@ in
     ./i3.nix
     ./metacity.nix
     ./openbox.nix
+    ./notion.nix
     ./ratpoison.nix
     ./sawfish.nix
     ./stumpwm.nix
diff --git a/nixos/modules/services/x11/window-managers/notion.nix b/nixos/modules/services/x11/window-managers/notion.nix
new file mode 100644
index 00000000000..1bfc2a86e96
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/notion.nix
@@ -0,0 +1,32 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.windowManager.notion;
+in
+
+{
+  options = {
+    services.xserver.windowManager.notion = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the notion tiling window manager.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.windowManager = {
+      session = [{
+        name = "notion";
+        start = ''
+          ${pkgs.notion}/bin/notion &
+          waitPID=$!
+        '';
+      }];
+    };
+    environment.systemPackages = [ pkgs.notion ];
+  };
+}

From ad4e17e94b8cda554df76dae08c189239fe6462b Mon Sep 17 00:00:00 2001
From: Maciek Starzyk <mstarzyk@gmail.com>
Date: Tue, 14 Jul 2015 21:42:04 +0200
Subject: [PATCH 2190/2322] fish: Fixed "Could not autoload item 'seq'..."

---
 pkgs/shells/fish/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 2460c511850..12cd864ca7c 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, python, which, groff, gettext, man_db, bc, libiconv }:
+{ stdenv, fetchurl, ncurses, python, which, groff, gettext, man_db, bc, libiconv, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "fish-${version}";
@@ -15,10 +15,12 @@ stdenv.mkDerivation rec {
   # Python: Autocompletion generated from manpages and config editing
   propagatedBuildInputs = [ python which groff gettext ]
                           ++ stdenv.lib.optional (!stdenv.isDarwin) man_db
-                          ++ [ bc ];
+                          ++ [ bc coreutils ];
 
   postInstall = ''
-    sed -i "s|bc|${bc}/bin/bc|" "$out/share/fish/functions/seq.fish"
+    sed -e "s|bc|${bc}/bin/bc|" \
+        -e "s|/usr/bin/seq|${coreutils}/bin/seq|" \
+        -i "$out/share/fish/functions/seq.fish"
     sed -i "s|which |${which}/bin/which |" "$out/share/fish/functions/type.fish"
     sed -i "s|nroff |${groff}/bin/nroff |" "$out/share/fish/functions/__fish_print_help.fish"
     sed -e "s|gettext |${gettext}/bin/gettext |" \

From 3f2de3eb64fea48a3da646d125b309c0e7f3f1db Mon Sep 17 00:00:00 2001
From: Leonardo Cecchi <leonardoce@interfree.it>
Date: Mon, 13 Jul 2015 09:20:43 +0200
Subject: [PATCH 2191/2322] leo-editor: init at 5.1

---
 .../editors/leo-editor/default.nix            | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/editors/leo-editor/default.nix

diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix
new file mode 100644
index 00000000000..4c7e3cc08af
--- /dev/null
+++ b/pkgs/applications/editors/leo-editor/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, pythonPackages, fetchgit }:
+pythonPackages.buildPythonPackage rec {
+  name = "leo-editor-${version}";
+  version = "5.1";
+
+  namePrefix = "";
+
+  src = fetchgit {
+    url = "https://github.com/leo-editor/leo-editor";
+    rev = "refs/tags/Leo-${version}-final";
+    sha256 = "3cc5259609890bbde9cfee71f4f60b959b3f5b740f7d403c99ea2d9796b4758e";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [ pyqt4 sqlite3 ];
+
+  meta = {
+    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 = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ leonardoce ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6b9bd71988..ec46f3edd2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11845,6 +11845,8 @@ let
     inherit (gnome) libglade;
   };
 
+  leo-editor = callPackage ../applications/editors/leo-editor { };
+
   libowfat = callPackage ../development/libraries/libowfat { };
 
   librecad = callPackage ../applications/misc/librecad { };

From 60accda79fe13fa938c6237be9af7e1f60e2ed46 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 11 Jul 2015 16:07:09 +0200
Subject: [PATCH 2192/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/21cfa3410f4c71291518489cd304338bb9ce04d6
 with hackage2nix revision 83984e1765a544aca95833068c828b1c8456dba9

---
 .../haskell-modules/hackage-packages.nix      | 1240 +++++++++++------
 1 file changed, 822 insertions(+), 418 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a522133b721..c62f9071c5f 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -233,27 +233,28 @@ self: {
      }) {};
 
   "ADPfusion" = callPackage
-    ({ mkDerivation, base, bits, mmorph, monad-primitive, mtl
-     , OrderedBits, primitive, PrimitiveArray, QuickCheck, strict
-     , template-haskell, test-framework, test-framework-quickcheck2
-     , test-framework-th, transformers, tuple, vector
+    ({ mkDerivation, base, bits, containers, ghc-prim, mmorph
+     , monad-primitive, mtl, OrderedBits, primitive, PrimitiveArray
+     , QuickCheck, strict, template-haskell, test-framework
+     , test-framework-quickcheck2, test-framework-th, th-orphans
+     , transformers, tuple, vector
      }:
      mkDerivation {
        pname = "ADPfusion";
-       version = "0.4.0.2";
-       sha256 = "1wawzavw7sx7lwvgqa88a34rrazl54z44cwc5mznp2ynfivk5qlq";
+       version = "0.4.1.0";
+       sha256 = "1x75kb01080hkm00a26vsqy13qgmmsi7xjbcv180v14lh0dm7yjn";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base bits mmorph monad-primitive mtl OrderedBits primitive
-         PrimitiveArray QuickCheck strict template-haskell transformers
-         tuple vector
+         base bits containers ghc-prim mmorph monad-primitive mtl
+         OrderedBits primitive PrimitiveArray QuickCheck strict
+         template-haskell th-orphans transformers tuple vector
        ];
        testDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
-       homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/";
+       homepage = "https://github.com/choener/ADPfusion";
        description = "Efficient, high-level dynamic programming";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -742,6 +743,7 @@ self: {
          ADPfusion base containers fmlist FormalGrammars GrammarProducts
          PrimitiveArray vector
        ];
+       jailbreak = true;
        homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/";
        description = "Collection of alignment algorithms";
        license = stdenv.lib.licenses.gpl3;
@@ -1161,6 +1163,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "BenchmarkHistory" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, deepseq, directory
+     , statistics, time, vector
+     }:
+     mkDerivation {
+       pname = "BenchmarkHistory";
+       version = "0.0.0.1";
+       sha256 = "07qdadcs76h7yd0k4hn3x3yqdiq7hp5lflxbxxlicx76k20fgl99";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring cassava deepseq directory statistics time vector
+       ];
+       homepage = "https://github.com/choener/BenchmarkHistory";
+       description = "Benchmark functions with history";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "BerkeleyDB" = callPackage
     ({ mkDerivation, base, bytestring, db, extensible-exceptions }:
      mkDerivation {
@@ -1537,8 +1557,8 @@ self: {
      }:
      mkDerivation {
        pname = "BlogLiterately";
-       version = "0.8.1";
-       sha256 = "01k71scq4p7iw52m47f24xj21w0dsibhp4kyyl62g69h3iciyhm0";
+       version = "0.8.1.1";
+       sha256 = "02q0i2p892adpmi7p4hh8666qzrpi76bxwljf575hiaz018yixlb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -1547,7 +1567,6 @@ self: {
          hscolour lens mtl pandoc pandoc-citeproc pandoc-types parsec
          process split strict temporary transformers
        ];
-       jailbreak = true;
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
@@ -1560,15 +1579,14 @@ self: {
      }:
      mkDerivation {
        pname = "BlogLiterately-diagrams";
-       version = "0.2";
-       sha256 = "12idyzr560m921f4d83m3x2y2gcx9g8dvjbdh8rfjbsc7hqi60rb";
+       version = "0.2.0.1";
+       sha256 = "190wny2ggqahsiv5ar23pndf3ngparb5mrrjp7his5crp6xvk66m";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base BlogLiterately containers diagrams-builder diagrams-lib
          diagrams-rasterific directory filepath JuicyPixels pandoc safe
        ];
-       jailbreak = true;
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2308,6 +2326,7 @@ self: {
          array base colour data-default-class lens mtl old-locale
          operational time vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "A library for generating 2D Charts and Plots";
        license = stdenv.lib.licenses.bsd3;
@@ -2325,6 +2344,7 @@ self: {
          array base cairo Chart colour data-default-class lens mtl
          old-locale operational time
        ];
+       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Cairo backend for Charts";
        license = stdenv.lib.licenses.bsd3;
@@ -2346,6 +2366,7 @@ self: {
          diagrams-svg lens lucid-svg mtl old-locale operational SVGFonts
          text time
        ];
+       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Diagrams backend for Charts";
        license = stdenv.lib.licenses.bsd3;
@@ -4015,8 +4036,8 @@ self: {
      }:
      mkDerivation {
        pname = "Ebnf2ps";
-       version = "1.0.12";
-       sha256 = "1rd0pxj2bfx06z1p0sy8kdhyfg1y51gn1bhr71j33czls6m9ry8c";
+       version = "1.0.13";
+       sha256 = "1ymfj2n23n1j37p5nw8xwhfccx4xc6wyf3372dr9gxv232jk8znz";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ array base containers directory old-time unix ];
@@ -4904,6 +4925,7 @@ self: {
          template-haskell text transformers trifecta unordered-containers
          vector
        ];
+       jailbreak = true;
        homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/";
        description = "(Context-free) grammars in formal language theory";
        license = stdenv.lib.licenses.gpl3;
@@ -8147,15 +8169,14 @@ self: {
      }:
      mkDerivation {
        pname = "Hoed";
-       version = "0.2.1";
-       sha256 = "1lfmkyv5c11b0kglf2456ng0r0j78rfwzims8l0a65lff7bkahbv";
+       version = "0.2.2";
+       sha256 = "0b6jljwn8dq2szhz3k9axfphv3yi0zq7rhligvlwa5p8hr49wblx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          array base containers directory filepath libgraph mtl process
          RBTree regex-posix template-haskell threepenny-gui
        ];
-       jailbreak = true;
        homepage = "http://maartenfaddegon.nl";
        description = "Lighweight algorithmic debugging based on observing intermediate values and the cost centre stack";
        license = stdenv.lib.licenses.bsd3;
@@ -8884,13 +8905,16 @@ self: {
      mkDerivation {
        pname = "JSONb";
        version = "1.0.8";
+       revision = "1";
        sha256 = "16gjdlajqvwvq1znyq3vqxfa9vq4xs0ywxpm93v0y1rgmzcfqzj7";
+       editedCabalFile = "47b2855a9c5769eadfdbb4eaddca6c66e6de21432d555162f2cc4dcde6e0861a";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          attoparsec base bytestring bytestring-nums bytestring-trie
          containers utf8-string
        ];
+       jailbreak = true;
        homepage = "http://github.com/solidsnack/JSONb/";
        description = "JSON parser that uses byte strings";
        license = stdenv.lib.licenses.bsd3;
@@ -10375,6 +10399,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "MonadStack" = callPackage
+    ({ mkDerivation, base, mtl }:
+     mkDerivation {
+       pname = "MonadStack";
+       version = "0.1.0.3";
+       sha256 = "0fsnc17dxmv3qnmz54gw3wy2camgp23ip9jfi543xqks0l8n7gcz";
+       buildDepends = [ base mtl ];
+       homepage = "https://github.com/bhurt/MonadStack";
+       description = "Generalizing lift to monad stacks";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "Monadius" = callPackage
     ({ mkDerivation, array, base, directory, GLUT, OpenGL }:
      mkDerivation {
@@ -11515,8 +11551,8 @@ self: {
      }:
      mkDerivation {
        pname = "OrderedBits";
-       version = "0.0.0.1";
-       sha256 = "1q272m1rjsgbp3w4jx36r84b3n29j1ggpqqxjyyhlkidm7w4h6lm";
+       version = "0.0.0.2";
+       sha256 = "10scfjvng05vsx4clvzkfq128vf1qwwvc0zikkzx4b96pjxf80i2";
        buildDepends = [
          base bits primitive QuickCheck vector vector-algorithms
        ];
@@ -11524,8 +11560,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
-       jailbreak = true;
-       homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
+       homepage = "https://github.com/choener/OrderedBits";
        description = "Efficient ordered (by popcount) enumeration of bits";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -12043,8 +12078,8 @@ self: {
      }:
      mkDerivation {
        pname = "PrimitiveArray";
-       version = "0.6.0.0";
-       sha256 = "13j9jqf09fj93slizb99wpn3d0c3zxj8ld5vl894dif7vw7hjmz9";
+       version = "0.6.1.0";
+       sha256 = "1annz4pkz66jxcwzgq3b897vigf8b23aprv0vx1xyly9bbccdpcn";
        buildDepends = [
          aeson base binary bits cereal deepseq OrderedBits primitive
          QuickCheck vector vector-binary-instances vector-th-unbox
@@ -12053,8 +12088,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
-       jailbreak = true;
-       homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/";
+       homepage = "https://github.com/choener/PrimitiveArray";
        description = "Efficient multidimensional arrays";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -12370,8 +12404,8 @@ self: {
      }:
      mkDerivation {
        pname = "Quickson";
-       version = "0.1.1";
-       sha256 = "0v2h8446gb86z2yvhqrhbkyj8yj0s9d33gbig6752lfjn31zxrcy";
+       version = "0.2";
+       sha256 = "1mr8ilcjlwxcpbblk6l6w022qbf4ngzd0q62fc9k1kjb0w1palbg";
        buildDepends = [ aeson attoparsec base bytestring either text ];
        homepage = "https://github.com/ssadler/quickson";
        description = "Quick JSON extractions with Aeson";
@@ -14162,8 +14196,8 @@ self: {
      }:
      mkDerivation {
        pname = "StrappedTemplates";
-       version = "0.2.0.0";
-       sha256 = "0l2zdn3brrlsii9j14gfg7nfjvwswqgsnm7l4hcy51a6k0s3pnn7";
+       version = "0.2.0.2";
+       sha256 = "0x0nsrzb2r9pwp353ksxwik48iw17whmsclfj07qrqxchdwrjy6h";
        buildDepends = [
          base blaze-builder bytestring containers filemanip filepath mtl
          parsec text transformers
@@ -15029,6 +15063,7 @@ self: {
        homepage = "https://github.com/yokto/Updater";
        description = "Monadic FRP library based on stm";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "UrlDisp" = callPackage
@@ -15185,8 +15220,8 @@ self: {
     ({ mkDerivation, base, hspec, parsec, process }:
      mkDerivation {
        pname = "ViennaRNAParser";
-       version = "1.2.4";
-       sha256 = "0gjn6sb7njd1mp211f3vk7ishc0fawl2npaq4np81pls7i24va8g";
+       version = "1.2.5";
+       sha256 = "0kc3b49g52dh0a4q8v5ir7pwa0x8s6rclmqjhkj95v1070ag4w0f";
        buildDepends = [ base parsec process ];
        testDepends = [ base hspec parsec ];
        description = "Libary for parsing ViennaRNA package output";
@@ -16719,6 +16754,21 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "acme-box" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "acme-box";
+       version = "0.0.0.0";
+       sha256 = "0n6mawj9kq6s84j4yxwqabhni7kzgvhmhxi9dw1mrwnxkh5ial8v";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base ];
+       testDepends = [ base ];
+       homepage = "http://github.com/drwebb/acme-box";
+       description = "A full featured empty project";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "acme-cadre" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -17113,6 +17163,7 @@ self: {
        homepage = "https://github.com/ion1/acme-zero-one";
        description = "The absorbing element of package dependencies";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "action-permutations" = callPackage
@@ -17216,8 +17267,8 @@ self: {
      }:
      mkDerivation {
        pname = "ad";
-       version = "4.2.2";
-       sha256 = "032ch6gjg88zfiwid4f1f7rms86z4x7jfmq496cgr50ycx9gsjxf";
+       version = "4.2.3";
+       sha256 = "0w9nd8llzcjb91x1d3mh5482pavbx1jpn8w2ahm6ydjwvijjd9r5";
        buildDepends = [
          array base comonad containers data-reify erf free nats reflection
          transformers
@@ -17501,8 +17552,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-better-errors";
-       version = "0.8.0";
-       sha256 = "1synbykzdkrkdys9xl0y9yarbi7ya0ij62smambi9ndz474ngb95";
+       version = "0.9.0";
+       sha256 = "00b9mjf636pfgg50961y86qbkpix19x5pvbzlha0mr0icqqaan76";
        buildDepends = [
          aeson base bytestring dlist mtl scientific text transformers
          transformers-compat unordered-containers vector void
@@ -18012,8 +18063,8 @@ self: {
     ({ mkDerivation, array, base, containers, mtl, random, vector }:
      mkDerivation {
        pname = "aivika";
-       version = "4.1.1";
-       sha256 = "1sxrd9qip3vwq0sxbbm1f5fa5g41xj0raszzv2agag80qyph3ayj";
+       version = "4.2";
+       sha256 = "0pg1wqssqqdjd0cafimsy8ibmxfyjk16w10ibkj13a6ggzfn75j1";
        buildDepends = [ array base containers mtl random vector ];
        homepage = "http://github.com/dsorokin/aivika";
        description = "A multi-paradigm simulation library";
@@ -18060,8 +18111,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment-chart";
-       version = "4.0.3";
-       sha256 = "1c5xzp0n67fg799cdf6aqc7sxbv3dy6nkiilyc5hlr8bg3r20bpd";
+       version = "4.2";
+       sha256 = "15aqq8mmjybi7kkrfsmablf7ymi328p9y6nsr8pc7sv144fadaf0";
        buildDepends = [
          aivika aivika-experiment array base Chart colour containers
          data-default-class filepath lens mtl split
@@ -18311,8 +18362,8 @@ self: {
     ({ mkDerivation, base, uglymemo, vector }:
      mkDerivation {
        pname = "align";
-       version = "0.1.1.0";
-       sha256 = "02rgg0haaj9c4xlk351kz6l2lqa9mdrm9rjgxbh5hm43shriiffw";
+       version = "0.1.1.1";
+       sha256 = "1a9a7vmv4sh0aps3cbx2i02i1n9k62pzcahs7swflw0r1b4gzdzv";
        buildDepends = [ base uglymemo vector ];
        description = "Sequence alignment algorithms";
        license = stdenv.lib.licenses.bsd3;
@@ -18617,7 +18668,9 @@ self: {
      mkDerivation {
        pname = "alternative-io";
        version = "0.0.1";
+       revision = "1";
        sha256 = "01hypbci3hw2czkmx78ls51ycx518ich4k753jgv0z8ilrq8isch";
+       editedCabalFile = "982094590ae1e54131d4b1285eaec6d4160717a2864858f90a3511522fc591d6";
        buildDepends = [
          base lifted-base monad-control transformers transformers-base
        ];
@@ -18685,6 +18738,7 @@ self: {
        homepage = "https://github.com/dbp/amazon-emailer-client-snap";
        description = "Client library for amazon-emailer daemon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazon-products" = callPackage
@@ -19418,6 +19472,7 @@ self: {
        homepage = "https://github.com/dbp/analyze-client";
        description = "Client for analyze service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "anansi" = callPackage
@@ -19518,6 +19573,7 @@ self: {
        homepage = "https://github.com/passy/android-lint-summary";
        description = "A pretty printer for Android Lint errors";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "angel" = callPackage
@@ -20159,6 +20215,7 @@ self: {
        homepage = "https://github.com/philopon/apiary";
        description = "purescript compiler for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apiary-session" = callPackage
@@ -20964,8 +21021,8 @@ self: {
      }:
      mkDerivation {
        pname = "arx";
-       version = "0.2.0";
-       sha256 = "04af1a8b3njhv4gbn799p1dwryjdq3z54cws796iskm9628ds3yq";
+       version = "0.2.1";
+       sha256 = "0w29sdzhc54jjl7d0f3irq2s0kisd66amf0li0h9x7r00j72lvwx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -21563,8 +21620,8 @@ self: {
      }:
      mkDerivation {
        pname = "atom-basic";
-       version = "0.2.1";
-       sha256 = "1i3qjjn15h6n642b8prahd99fb9la2j4f0ci110bs8jydmacs36m";
+       version = "0.2.2";
+       sha256 = "1n9illmrkrd1gr3imjvclzny8kjx7d0mak9yvyc129gfb9ap52cd";
        buildDepends = [
          base base64-bytestring bytestring network network-uri old-locale
          text time
@@ -23203,8 +23260,8 @@ self: {
      }:
      mkDerivation {
        pname = "banwords";
-       version = "0.2.0.0";
-       sha256 = "18k39zgc5n9bxabv0wkiay9h3phx75mfr4kqpcp1hlpikn4h6wxx";
+       version = "0.2.0.1";
+       sha256 = "13mnz060yi1j6gsxknn1ara34s4ymdswysypj8d94k1741jv89yn";
        buildDepends = [
          attoparsec base bytestring data-default text vector
        ];
@@ -23212,7 +23269,6 @@ self: {
          attoparsec base HUnit test-framework test-framework-hunit text
          vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/fanjam/banwords";
        description = "Generalized word blacklister";
        license = stdenv.lib.licenses.mit;
@@ -23567,17 +23623,19 @@ self: {
      }) {};
 
   "base91" = callPackage
-    ({ mkDerivation, base, bytestring, QuickCheck, text }:
+    ({ mkDerivation, base, bytestring, mono-traversable, QuickCheck
+     , text
+     }:
      mkDerivation {
        pname = "base91";
-       version = "0.2.0";
-       sha256 = "10pa2gz9kwp0a4h7kzgnhbf2v897lpq5n5v927adlav9kqc1i41y";
+       version = "2.1.0";
+       sha256 = "1lz9s7w5nlp4naj9jzwb73im0vbs5nlrddg18irjz64sgq3qd2nn";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring text ];
-       testDepends = [ base bytestring QuickCheck text ];
+       buildDepends = [ base bytestring mono-traversable text ];
+       testDepends = [ base bytestring mono-traversable QuickCheck text ];
        homepage = "https://github.com/ajg/base91";
-       description = "A Base91 Encoder & Decoder";
+       description = "A Generic Base91 Encoder & Decoder";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -26285,6 +26343,7 @@ self: {
        homepage = "https://github.com/ku-fpg/blank-canvas/wiki";
        description = "HTML5 Canvas Graphics Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blas" = callPackage
@@ -27073,8 +27132,8 @@ self: {
      }:
      mkDerivation {
        pname = "bound";
-       version = "1.0.5";
-       sha256 = "1vk2d8c0nvfk28a9l5d6vnxk48lha2xsp64bd7c1p3x8lygxj88f";
+       version = "1.0.6";
+       sha256 = "0i1q6pv7d7vy9agb6yzj0mi8hq8154wv17qhwkf4jd87k07xv76v";
        buildDepends = [
          base bifunctors binary bytes cereal comonad hashable
          hashable-extras prelude-extras profunctors transformers
@@ -27459,19 +27518,20 @@ self: {
 
   "buffer-builder" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
-     , deepseq, HUnit, mtl, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-th, text, unordered-containers, vector
+     , deepseq, HUnit, mtl, quickcheck-instances, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-th, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "buffer-builder";
-       version = "0.2.2.2";
-       sha256 = "1mqia6rjnz5as8qv780yhxn7iyw2bxh5fx2d83x7assr6vn2489w";
+       version = "0.2.4.0";
+       sha256 = "1krhzcd6jwfi2rclkzrvmlzr8mz1kcll481w890yi64vb65j5cn2";
        buildDepends = [
          base bytestring mtl text unordered-containers vector
        ];
        testDepends = [
-         aeson attoparsec base bytestring criterion deepseq HUnit tasty
-         tasty-hunit tasty-quickcheck tasty-th text vector
+         aeson attoparsec base bytestring criterion deepseq HUnit
+         quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th
+         text vector
        ];
        homepage = "https://github.com/chadaustin/buffer-builder";
        description = "Library for efficiently building up buffers, one piece at a time";
@@ -30402,8 +30462,8 @@ self: {
      }:
      mkDerivation {
        pname = "cef";
-       version = "0.1.1";
-       sha256 = "045sh0mfpwjpr3vc7bax89hv7aq29ak0xqhmyldj2p8allcfrv24";
+       version = "0.1.2";
+       sha256 = "0f5qj5xhmlys09i4vis3ricz0ym2hmdn53kgcb1qk23y0m4s94ci";
        buildDepends = [ base bytestring text time ];
        testDepends = [ base directory doctest filepath ];
        homepage = "http://github.com/picussecurity/haskell-cef.git";
@@ -30596,7 +30656,9 @@ self: {
      mkDerivation {
        pname = "cf";
        version = "0.4.1";
+       revision = "1";
        sha256 = "1z8hqd06nrrbgmg2gpryalhnk4z0sxm7is46sgpy09x9p6xd0fqx";
+       editedCabalFile = "9fd574edfce6ea014201ccc3591638de0574f251290bcf0f44a8a00338131692";
        buildDepends = [ base ];
        testDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -31820,8 +31882,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.5.9";
-       sha256 = "0rrxql03bdkpna0i8giz1yyq7cr829gchnijlci243aldh8jwwkb";
+       version = "0.5.10";
+       sha256 = "02zv08mkx228fxx1hdraaqmiv1mfq6rgsr3gflh0awyf6x5g6jzn";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -31847,8 +31909,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "0.5.8";
-       sha256 = "1cb48q96sx2zr35brc6cywv76wj3vsk24yy5j64k16j1743gh45k";
+       version = "0.5.9";
+       sha256 = "1kh40vy5sqxpb2akzwyc7k7z251lg3h3a12qj2vq4vkgwx5xcqkh";
        buildDepends = [
          aeson attoparsec base bytestring clash-prelude concurrent-supply
          containers deepseq directory errors fgl filepath hashable lens mtl
@@ -31934,8 +31996,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-vhdl";
-       version = "0.5.7.1";
-       sha256 = "1p1lmy07hfzj4wb7f68y03zvih2i8skb2sca9pqj64d6yszqmll8";
+       version = "0.5.8";
+       sha256 = "08qplvnal8jjqy8rkivgn53n8qpzk232dslqxypx6ky6fks3bc0w";
        buildDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
@@ -32088,6 +32150,7 @@ self: {
        ];
        buildTools = [ hsx2hs ];
        extraLibraries = [ openssl ];
+       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "A secure, reliable content management system (CMS) and blogging platform";
        license = stdenv.lib.licenses.bsd3;
@@ -38112,7 +38175,7 @@ self: {
     ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary
      , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist
      , dataenc, directory, filepath, FindBin, ghc, hashable, haskeline
-     , html, HTTP, HUnit, mmap, mtl, network, old-locale, old-time
+     , html, HTTP, HUnit, mmap, mtl, network, network-uri, old-time
      , parsec, process, QuickCheck, random, regex-applicative
      , regex-compat-tdfa, shelly, split, tar, terminfo, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, time
@@ -38121,14 +38184,14 @@ self: {
      }:
      mkDerivation {
        pname = "darcs";
-       version = "2.10.0";
-       sha256 = "0dkby6bqv8dnv6zbvhz9yrablqkzi2szfsmrhmjk1934gczxpcsj";
+       version = "2.10.1";
+       sha256 = "157faxxzziaj79ln1qqvrii1vnafyknfbnmgl4y5krw06ys6bvzi";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          array attoparsec base base16-bytestring binary bytestring
          containers cryptohash data-ordlist dataenc directory filepath
-         hashable haskeline html HTTP mmap mtl network old-locale old-time
+         hashable haskeline html HTTP mmap mtl network network-uri old-time
          parsec process random regex-applicative regex-compat-tdfa tar
          terminfo text time transformers transformers-compat unix
          unix-compat utf8-string vector zip-archive zlib
@@ -38142,7 +38205,6 @@ self: {
        ];
        extraLibraries = [ curl ];
        configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
-       jailbreak = true;
        postInstall = ''
          mkdir -p $out/etc/bash_completion.d
          mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
@@ -38967,6 +39029,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-flagset" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "data-flagset";
+       version = "1.0.0.0";
+       sha256 = "0ygvzrcb2vskjf203svk9wpv8lw4447rd218zvys4a0787ss1aw2";
+       buildDepends = [ base ];
+       description = "An efficient data type for sets of flags";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "data-fresh" = callPackage
     ({ mkDerivation, base, free, transformers }:
      mkDerivation {
@@ -41385,6 +41458,7 @@ self: {
          optparse-applicative pango split statestack transformers unix
          vector
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Cairo backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41404,9 +41478,11 @@ self: {
          diagrams-core diagrams-lib lens mtl NumInstances
          optparse-applicative statestack text
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-contrib" = callPackage
@@ -41478,8 +41554,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-haddock";
-       version = "0.3.0.4";
-       sha256 = "19dv368clrpjv2s0wd2ha61v80hlx4bkmy7qr9bgasaj3xxx3yqn";
+       version = "0.3.0.5";
+       sha256 = "00118bnxkgfg4s4h825bl9v1mdb8cfv27l6licmx8z0dch3all9k";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -41505,15 +41581,12 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-hsqml";
-       version = "0.0.0.2";
-       revision = "1";
-       sha256 = "065jh6a24g25g1113iz4ml9vnrzpk2lyrf873jzq9x6awhi6ifng";
-       editedCabalFile = "bb0ff98c3522df34b9d9700a03600269cbb78d3e2a6796e6011778c315959490";
+       version = "0.1.0.0";
+       sha256 = "1j1n9bamb1fyfgbmiyqssyzh93fahmg48yb7z3z18rrxmn04rnax";
        buildDepends = [
          base colour containers diagrams-core diagrams-lib hsqml lens text
          transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/marcinmrotek/diagrams-hsqml";
        description = "HsQML (Qt5) backend for Diagrams";
        license = stdenv.lib.licenses.bsd3;
@@ -41534,6 +41607,7 @@ self: {
          diagrams-lib lens mtl NumInstances optparse-applicative split
          statestack static-canvas text
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41594,8 +41668,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-pgf";
-       version = "0.1.0.1";
-       sha256 = "0q19qb1cxgkhg9z24kxgy80swbfc1bnrkzmv40kz997rlfz7qaiz";
+       version = "0.1.0.2";
+       sha256 = "1lwwr143nlvpxpkdvsbq4z4bs7qhbx636p6hi6w448xmbniq90rj";
        buildDepends = [
          base bytestring bytestring-builder colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels mtl
@@ -41621,6 +41695,7 @@ self: {
          filepath hashable lens monoid-extras mtl semigroups split
          statestack
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41656,6 +41731,7 @@ self: {
          diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl
          optparse-applicative Rasterific split unix
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
@@ -41689,18 +41765,20 @@ self: {
     ({ mkDerivation, base, base64-bytestring, bytestring, colour
      , containers, diagrams-core, diagrams-lib, directory, filepath
      , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl
-     , old-time, optparse-applicative, process, split, text, time
+     , old-time, optparse-applicative, process, semigroups, split, text
+     , time
      }:
      mkDerivation {
        pname = "diagrams-svg";
-       version = "1.3.1.2";
-       sha256 = "1kz70v0nccswd4df3240gy6liln4hi165zn8rm6f3palkxcfw3m3";
+       version = "1.3.1.3";
+       sha256 = "0migb5vjlslbxlmbqxl0qdrpsi0ghbiq86rjna57g804r149n7ni";
        buildDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg
-         monoid-extras mtl old-time optparse-applicative process split text
-         time
+         monoid-extras mtl old-time optparse-applicative process semigroups
+         split text time
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "SVG backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41988,6 +42066,7 @@ self: {
          aeson base bytestring digestive-functors HUnit mtl scientific tasty
          tasty-hunit text
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/digestive-functors-aeson";
        description = "Run digestive-functors forms against JSON";
        license = stdenv.lib.licenses.gpl3;
@@ -42375,18 +42454,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "directory_1_2_2_1" = callPackage
-    ({ mkDerivation, base, filepath, python, time, unix, which }:
+  "directory_1_2_3_0" = callPackage
+    ({ mkDerivation, base, filepath, time, unix }:
      mkDerivation {
        pname = "directory";
-       version = "1.2.2.1";
-       sha256 = "0ikhkmgzmpxvgl9w1piv168sbwkrvn0l2xdx9zb4sw75ci1ymb1y";
+       version = "1.2.3.0";
+       sha256 = "1511nw0hgy6sg82xfimg8rbbf43vcqn6gw076m96b9zcy1dzijln";
        buildDepends = [ base filepath time unix ];
-       testDepends = [ base python which ];
+       testDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
-     }) { python = null;  which = null;};
+     }) {};
 
   "directory-layout" = callPackage
     ({ mkDerivation, base, bytestring, command-qq, containers
@@ -43320,18 +43398,23 @@ self: {
 
   "docker" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
-     , lens, network-uri, pipes, pipes-bytestring, pipes-http
-     , pipes-text, text, wreq
+     , http-types, lens, lens-aeson, network-uri, pipes
+     , pipes-bytestring, pipes-http, pipes-text, process, QuickCheck
+     , tasty, tasty-hunit, tasty-quickcheck, text, wreq
      }:
      mkDerivation {
        pname = "docker";
-       version = "0.1.0.1";
-       sha256 = "0jp7jsacxxzfbz0sdmzwwl9nj8xyfg889zxsw4mg87jxasmll3g2";
+       version = "0.2.0.2";
+       sha256 = "0iv36j8ixjbxlwbpw426lj5z39kwd3mrpb5qqw7c2nxkfp2dr0gi";
        buildDepends = [
-         aeson base bytestring containers data-default lens network-uri
-         pipes pipes-bytestring pipes-http pipes-text text wreq
+         aeson base bytestring containers data-default lens lens-aeson
+         network-uri pipes pipes-bytestring pipes-http pipes-text text wreq
+       ];
+       testDepends = [
+         aeson base bytestring containers data-default http-types lens
+         lens-aeson pipes pipes-bytestring pipes-http pipes-text process
+         QuickCheck tasty tasty-hunit tasty-quickcheck text wreq
        ];
-       jailbreak = true;
        homepage = "https://github.com/denibertovic/docker-hs";
        description = "Haskell wrapper for Docker Remote API";
        license = stdenv.lib.licenses.bsd3;
@@ -43341,27 +43424,28 @@ self: {
   "dockercook" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring
      , conduit, conduit-combinators, conduit-extra, cryptohash
-     , directory, filepath, hashable, hslogger, HTF, monad-logger, mtl
-     , optparse-applicative, persistent-sqlite, persistent-template
+     , directory, filepath, hashable, hslogger, HTF, lens, monad-logger
+     , mtl, optparse-applicative, persistent-sqlite, persistent-template
      , process, regex-compat, resourcet, retry, stm, streaming-commons
      , system-filepath, temporary, text, time, transformers, unix
-     , unordered-containers, vector
+     , unordered-containers, vector, wreq
      }:
      mkDerivation {
        pname = "dockercook";
-       version = "0.4.0.0";
-       sha256 = "1v74zcbk53daxlqgr5b8d900dvyj8kizmz7cwka18a2rz8zi0vbw";
+       version = "0.4.3.0";
+       sha256 = "0gsaw0qbbd3a017w82hwvmrv0ygxki2c8ls3b6hfc38a17ja68vc";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          attoparsec base base16-bytestring bytestring conduit
          conduit-combinators conduit-extra cryptohash directory filepath
-         hashable hslogger monad-logger mtl optparse-applicative
+         hashable hslogger lens monad-logger mtl optparse-applicative
          persistent-sqlite persistent-template process regex-compat
          resourcet retry stm streaming-commons system-filepath temporary
-         text time transformers unix unordered-containers vector
+         text time transformers unix unordered-containers vector wreq
        ];
        testDepends = [ base HTF text vector ];
+       jailbreak = true;
        homepage = "https://github.com/factisresearch/dockercook";
        description = "A build tool for multiple docker image layers";
        license = stdenv.lib.licenses.mit;
@@ -43404,8 +43488,8 @@ self: {
      }:
      mkDerivation {
        pname = "doctest";
-       version = "0.10.0";
-       sha256 = "161k9brapz6hbwl3naar07kpfsgqp4b52i5nfsbxsqa2a9al40kb";
+       version = "0.10.1";
+       sha256 = "1jbyhzbi2hfrfg7vbkpj6vriaap8cn99nnmzwcfscwaijz09jyrm";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -43761,6 +43845,7 @@ self: {
          aeson base bytestring data-default-class http-client http-types
          reflection scientific text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/dozens-hs";
        description = "dozens api library";
        license = stdenv.lib.licenses.mit;
@@ -44994,15 +45079,19 @@ self: {
      }) {};
 
   "edit-distance" = callPackage
-    ({ mkDerivation, array, base, containers, random }:
+    ({ mkDerivation, array, base, containers, QuickCheck, random
+     , test-framework, test-framework-quickcheck2
+     }:
      mkDerivation {
        pname = "edit-distance";
-       version = "0.2.1.3";
-       sha256 = "1insr7a1yazilqrx5f3pnkcr1fsvn4iaisw18rhayc0bnndfbcm0";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.2.1";
+       sha256 = "0jkca97zyv23yyilp3jydcrzxqhyk27swhzh82llvban5zp8b21y";
        buildDepends = [ array base containers random ];
-       homepage = "http://github.com/batterseapower/edit-distance";
+       testDepends = [
+         array base containers QuickCheck random test-framework
+         test-framework-quickcheck2
+       ];
+       homepage = "http://github.com/phadej/edit-distance";
        description = "Levenshtein and restricted Damerau-Levenshtein edit distances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45189,10 +45278,9 @@ self: {
     ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "effin";
-       version = "0.2.1.3";
-       sha256 = "0iv3va8lhfikk9mssg6sx2yzvdq6yh53gnv53gl9dwll8pnj8fhh";
+       version = "0.3.0.1";
+       sha256 = "0rckxjdkw5p4yy1kizj1z8kp7sxfxxhh9s7714jsn9in7lc4lsif";
        buildDepends = [ base mtl ];
-       jailbreak = true;
        homepage = "https://github.com/YellPika/effin";
        description = "A Typeable-free implementation of extensible effects";
        license = stdenv.lib.licenses.bsd3;
@@ -45857,8 +45945,8 @@ self: {
      }:
      mkDerivation {
        pname = "elocrypt";
-       version = "0.4.0";
-       sha256 = "0n19364jzifnb08pxzlsb05hpqz327zsfz138g0py3zy38wibszx";
+       version = "0.4.1";
+       sha256 = "1hssxqhm962hr41mvjnrs4h74121nmvlbww0g9nyk10mx71rcbcg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base MonadRandom random ];
@@ -46839,7 +46927,9 @@ self: {
      mkDerivation {
        pname = "ersatz";
        version = "0.3";
+       revision = "3";
        sha256 = "1hq6cdw1rvwc0289saz36x2imwwnj203hqk2lsbkbhyghdvqmpbr";
+       editedCabalFile = "aafa6482bcf20d998dfc122b780b0378ec05187235252f4715e98bac02fc5b6c";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -46847,6 +46937,7 @@ self: {
          process temporary transformers unordered-containers
        ];
        testDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/ersatz";
        description = "A monad for expressing SAT or QSAT problems using observable sharing";
        license = stdenv.lib.licenses.bsd3;
@@ -47033,15 +47124,17 @@ self: {
      }) {};
 
   "ether" = callPackage
-    ({ mkDerivation, base, mtl, newtype-generics, QuickCheck, tasty
-     , tasty-quickcheck, template-haskell, transformers
+    ({ mkDerivation, base, mmorph, monad-control, mtl, newtype-generics
+     , QuickCheck, tasty, tasty-quickcheck, template-haskell
+     , transformers, transformers-base, transformers-lift
      }:
      mkDerivation {
        pname = "ether";
-       version = "0.2.1.0";
-       sha256 = "1iwi3whaxnpwfdghw1rli9dxqh1c28hhxkdvl4wslj0vc014h3di";
+       version = "0.3.0.0";
+       sha256 = "1k8g01ypck0w6sp6f3w3asdakzjg6k8m1sz58c2r5iz3z1v9b04m";
        buildDepends = [
-         base mtl newtype-generics template-haskell transformers
+         base mmorph monad-control mtl newtype-generics template-haskell
+         transformers transformers-base transformers-lift
        ];
        testDepends = [
          base mtl QuickCheck tasty tasty-quickcheck transformers
@@ -47176,6 +47269,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "event" = callPackage
+    ({ mkDerivation, base, containers, semigroups, transformers }:
+     mkDerivation {
+       pname = "event";
+       version = "0.1.1";
+       sha256 = "191d72dbaddxl2ql2860145iwfsrx2jrbcsylfq7028vmzzxqqm6";
+       buildDepends = [ base containers semigroups transformers ];
+       description = "Monoidal, monadic and first-class events";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "event-driven" = callPackage
     ({ mkDerivation, base, monads-tf, yjtools }:
      mkDerivation {
@@ -48166,7 +48270,9 @@ self: {
      mkDerivation {
        pname = "fast-logger";
        version = "2.4.0";
+       revision = "3";
        sha256 = "1hh5rll2q4dpshplyk0hciknvypx3v2hd102hf0f2z5h70d4xzsc";
+       editedCabalFile = "af5edf5e05ecd782e1d87b9d5730c5a9eb1016ac01fb1a377dda1cd8e88a274b";
        buildDepends = [
          array auto-update base bytestring bytestring-builder directory
          filepath text
@@ -48214,8 +48320,8 @@ self: {
     ({ mkDerivation, base, bytestring, tagsoup, text, text-icu }:
      mkDerivation {
        pname = "fast-tagsoup";
-       version = "1.0.6";
-       sha256 = "0d1h57flg9iq4psfpwcqq91giljqcjz9lhd7nhdrk08pzdla09iq";
+       version = "1.0.7";
+       sha256 = "089karddj08z0lfr83r2x070j67i2s0aq2s1qi5i66vw335y91d8";
        buildDepends = [ base bytestring tagsoup text text-icu ];
        homepage = "https://github.com/vshabanov/fast-tagsoup";
        description = "Fast parser for tagsoup package";
@@ -48942,16 +49048,18 @@ self: {
      }) {};
 
   "ffmpeg-light" = callPackage
-    ({ mkDerivation, base, ffmpeg, JuicyPixels, libavcodec, libavformat
-     , libswscale, mtl, transformers, vector
+    ({ mkDerivation, base, either, exceptions, ffmpeg, JuicyPixels
+     , libavcodec, libavformat, libswscale, mtl, transformers, vector
      }:
      mkDerivation {
        pname = "ffmpeg-light";
-       version = "0.8.1";
-       sha256 = "08hydkqpk72s5bnc7h133jdz0x5msbxf7r1149hb2pqaqffid569";
+       version = "0.8.2";
+       sha256 = "13pkdsjsw1h6gscpp2jwly1w81jj3rpb27ssa0w7gi2qhjcg1inw";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base JuicyPixels mtl transformers vector ];
+       buildDepends = [
+         base either exceptions JuicyPixels mtl transformers vector
+       ];
        pkgconfigDepends = [ ffmpeg libavcodec libavformat libswscale ];
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
@@ -49027,6 +49135,7 @@ self: {
        testDepends = [ base containers fgl hspec QuickCheck ];
        description = "QuickCheck support for fgl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fgl-extras-decompositions" = callPackage
@@ -49428,26 +49537,26 @@ self: {
     ({ mkDerivation, attoparsec, base, conduit, conduit-combinators
      , conduit-extra, directory, doctest, either, exceptions, filepath
      , hspec, mmorph, monad-control, mtl, regex-posix, semigroups
-     , streaming-commons, system-filepath, text, time, transformers
-     , transformers-base, unix, unix-compat
+     , streaming-commons, text, time, transformers, transformers-base
+     , unix, unix-compat
      }:
      mkDerivation {
        pname = "find-conduit";
-       version = "0.4.3";
-       sha256 = "05s1whyqmv1nxcbrrfhfn8lcqb2cwyz1wa2im8b976i14qgw65lm";
+       version = "0.4.4";
+       sha256 = "15p1aj8lckmvnrq8a8wz6sbs0d2qbcjgachf5sgpf2lv57hzxksz";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          attoparsec base conduit conduit-combinators conduit-extra either
          exceptions filepath mmorph monad-control mtl regex-posix semigroups
-         streaming-commons system-filepath text time transformers
-         transformers-base unix unix-compat
+         streaming-commons text time transformers transformers-base unix
+         unix-compat
        ];
        testDepends = [
          attoparsec base conduit conduit-combinators directory doctest
          either exceptions filepath hspec mmorph monad-control mtl
-         regex-posix semigroups streaming-commons system-filepath text time
-         transformers transformers-base unix-compat
+         regex-posix semigroups streaming-commons text time transformers
+         transformers-base unix-compat
        ];
        description = "A file-finding conduit that allows user control over traversals";
        license = stdenv.lib.licenses.mit;
@@ -50472,8 +50581,8 @@ self: {
      }:
      mkDerivation {
        pname = "folds";
-       version = "0.6.2";
-       sha256 = "13zdmf7szdy9ka5dw0vgzbfmndm7w8fz7ryz5h2z5hsqg9am2qqa";
+       version = "0.6.3";
+       sha256 = "1p8vr71vqzn0h4j5rz3wh7fsvsaaig52ds7sx8r2c8klbdf91zd4";
        buildDepends = [
          base comonad contravariant lens pointed profunctors reflection
          semigroupoids tagged transformers vector
@@ -50482,7 +50591,6 @@ self: {
          base bytestring deepseq directory doctest filepath mtl semigroups
        ];
        configureFlags = [ "-f-test-hlint" ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/folds";
        description = "Beautiful Folding";
        license = stdenv.lib.licenses.bsd3;
@@ -50774,10 +50882,8 @@ self: {
      }:
      mkDerivation {
        pname = "formatting";
-       version = "6.2.0";
-       revision = "1";
-       sha256 = "13w2322djffajqdy48lwfngcrbh5pc9ivhy1w5zgxcjqc0amlv5v";
-       editedCabalFile = "299d43483dfe38a5e95061fb943cb63fa252d7fd38212c42e9bb022f49407a89";
+       version = "6.2.2";
+       sha256 = "04ilp8zkzkab3x4v5kczpa58k5jr67yg9fq4prj7xrj81kixgp2g";
        buildDepends = [
          base clock old-locale scientific text text-format time
        ];
@@ -51144,6 +51250,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "free-http" = callPackage
+    ({ mkDerivation, base, bytestring, free, http-client, http-types
+     , mtl, QuickCheck, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "free-http";
+       version = "0.1.1.1";
+       sha256 = "1gifjrz7bmrcyv6pc6gl55vw0vmnzjzjhvslwvj8p8c8xbv2fxrh";
+       buildDepends = [
+         base bytestring free http-client http-types mtl QuickCheck text
+         time transformers
+       ];
+       homepage = "https://github.com/aaronlevin/free-http";
+       description = "An HTTP Client based on Free Monads";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "free-operational" = callPackage
     ({ mkDerivation, base, comonad-transformers, free, kan-extensions
      , mtl, transformers
@@ -51442,6 +51565,47 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "frpnow" = callPackage
+    ({ mkDerivation, base, containers, mtl, transformers }:
+     mkDerivation {
+       pname = "frpnow";
+       version = "0.11";
+       sha256 = "0lvlgn1bv9flhs9x3i5zf1zd6l7nd4i3asscc0nmqmpnidcmlkcn";
+       buildDepends = [ base containers mtl transformers ];
+       homepage = "https://github.com/atzeus/FRPNow";
+       description = "Principled practical FRP";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "frpnow-gloss" = callPackage
+    ({ mkDerivation, base, containers, frpnow, gloss, mtl, transformers
+     }:
+     mkDerivation {
+       pname = "frpnow-gloss";
+       version = "0.12";
+       sha256 = "1xywqcif16r3x4qckz3n6k5mp2pya4vj35h0jrh4rd1sspnhi99i";
+       buildDepends = [ base containers frpnow gloss mtl transformers ];
+       homepage = "https://github.com/atzeus/FRPNow";
+       description = "Program awesome stuff with Gloss and frpnow!";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "frpnow-gtk" = callPackage
+    ({ mkDerivation, base, containers, frpnow, glib, gtk, mtl
+     , transformers
+     }:
+     mkDerivation {
+       pname = "frpnow-gtk";
+       version = "0.11";
+       sha256 = "0yq9pgjlmzg5pzcky7z7n2ks82x92dp5pjacr6h3w8mdrhhhk80c";
+       buildDepends = [
+         base containers frpnow glib gtk mtl transformers
+       ];
+       homepage = "https://github.com/atzeus/FRPNow";
+       description = "Program GUIs with GTK and frpnow!";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "frquotes" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -52086,6 +52250,7 @@ self: {
        homepage = "http://github.com/marcusbuffett/game-of-life";
        description = "Conway's Game of Life";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "game-probability" = callPackage
@@ -52419,6 +52584,7 @@ self: {
        extraLibraries = [ genders ];
        description = "Bindings to libgenders";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { genders = null;};
 
   "general-prelude" = callPackage
@@ -52483,7 +52649,9 @@ self: {
      mkDerivation {
        pname = "generic-aeson";
        version = "0.2.0.7";
+       revision = "1";
        sha256 = "06qczarf6vzd9wr9ad685v69hvd88zfv5lhry0zkka2bcdqc5wqz";
+       editedCabalFile = "f14b6017d6c92b2fc7a585bc81fd2ee286c8d73338cf1eb5964006bffeb70abd";
        buildDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
@@ -52950,6 +53118,7 @@ self: {
          base bytestring directory doctest filepath hlint QuickCheck
          template-haskell
        ];
+       jailbreak = true;
        homepage = "https://github.com/domdere/hs-geojson";
        description = "A thin GeoJSON Layer above the aeson library";
        license = stdenv.lib.licenses.bsd3;
@@ -53960,8 +54129,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "5.20150617";
-       sha256 = "0m4dbzjmjyjpxbplykil1k64mj2lq5xf2yz7dy406248cscc8drd";
+       version = "5.20150710";
+       sha256 = "0q7q8ikgv3dhvs3vad04z1bfa6l92v97jrh0n4zqc0c44wx9a3wp";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -56640,8 +56809,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk";
-       version = "0.13.8.1";
-       sha256 = "1p1s67swsiq8kr1l07zpghmyzww882kgzz38z41ykwzwj471zqjp";
+       version = "0.13.9";
+       sha256 = "1mdz3s03y69713cr3grn8gawimykk8rs1f9vgch8a8q04ivhkq0j";
        buildDepends = [
          array base bytestring cairo containers gio glib mtl pango text
        ];
@@ -56933,8 +57102,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk3";
-       version = "0.13.8";
-       sha256 = "18z1drng10l3z2arn2lrwsdaxx8q9yrdvdhzixya1vhs8za3m4pk";
+       version = "0.13.9";
+       sha256 = "1zmcvp295sknc2h529nprclw11lnwp79dniyyg573wc99bdzijvr";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -58762,8 +58931,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.7.1.0";
-       sha256 = "11lv7p8c4vka2rf47f1fhyvfax7rjb1i1i12mlrikj16vvsrixh2";
+       version = "4.7.2.0";
+       sha256 = "0krj7kaikdbxiqkcd5c3pyhp3zchgy74dzx336f8x1ywlja4802r";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -58782,12 +58951,25 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time
        ];
-       jailbreak = true;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hakyll-R" = callPackage
+    ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process
+     }:
+     mkDerivation {
+       pname = "hakyll-R";
+       version = "0.1.0.3";
+       sha256 = "0sr0mpyhjr7ajg227rfylhv2950vip6zkryalxp39m1xv0dh2rb3";
+       buildDepends = [ base directory filepath hakyll pandoc process ];
+       jailbreak = true;
+       description = "A package allowing to write Hakyll blog posts in Rmd";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hakyll-agda" = callPackage
     ({ mkDerivation, Agda, base, containers, directory, filepath
      , hakyll, mtl, pandoc, transformers, xhtml
@@ -62812,8 +62994,8 @@ self: {
      }:
      mkDerivation {
        pname = "haxr";
-       version = "3000.11";
-       sha256 = "0gydwh9q76wk2qimy9i1ba6ii6a977nih534iz6rgqfhrkcck8mz";
+       version = "3000.11.1";
+       sha256 = "07rz03n0v9nflzid0vx5qh5hc7fmlq9c9kkk35slljv7lwmxw0qh";
        buildDepends = [
          array base base-compat base64-bytestring blaze-builder bytestring
          HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat
@@ -63191,8 +63373,8 @@ self: {
      }:
      mkDerivation {
        pname = "hcltest";
-       version = "0.3.6";
-       sha256 = "145l3kfxi1slngcmh4dnn09hhpr5v6s5nppk0i5a5jzxpp2yx6sd";
+       version = "0.3.7";
+       sha256 = "1hqx0khbxypq4hqq1hq0ybyadd7m6bpd6rzc3zya3w0s7kwk0dgd";
        buildDepends = [
          base bytestring directory dlist either filepath free lens mmorph
          monad-control mtl optparse-applicative process random-shuffle split
@@ -63847,20 +64029,18 @@ self: {
 
   "heist" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
-     , bytestring, containers, directory, directory-tree, dlist, errors
+     , bytestring, containers, directory, directory-tree, dlist, either
      , filepath, hashable, map-syntax, MonadCatchIO-transformers, mtl
      , process, random, text, time, transformers, unordered-containers
      , vector, xmlhtml
      }:
      mkDerivation {
        pname = "heist";
-       version = "0.14.1";
-       revision = "4";
-       sha256 = "11g6nrg9xn9ypwrz7mj3hqjhg45ia1miihh1ydls7vfdm2fqlagy";
-       editedCabalFile = "d61d5b4f4b360c12b46179000fe761037a23182489362188c929476a42248876";
+       version = "0.14.1.1";
+       sha256 = "0hwf8d20lw4gn5mal8iqd62npr2859541h3md451hjlbwpjyqd19";
        buildDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
-         containers directory directory-tree dlist errors filepath hashable
+         containers directory directory-tree dlist either filepath hashable
          map-syntax MonadCatchIO-transformers mtl process random text time
          transformers unordered-containers vector xmlhtml
        ];
@@ -65246,8 +65426,8 @@ self: {
      }:
      mkDerivation {
        pname = "higher-leveldb";
-       version = "0.2.1.0";
-       sha256 = "13bwh9jg7smh8vwgrih79ivi073690l9nn478r5m0w64gbkvdm5p";
+       version = "0.3.0.0";
+       sha256 = "0lghf21l3s4fmwnp3dsndzxqhamgppczzydkvnqlmx1x9jk5g1b6";
        buildDepends = [
          base bytestring cereal data-default leveldb-haskell lifted-base
          monad-control mtl resourcet transformers transformers-base
@@ -65256,7 +65436,6 @@ self: {
          base bytestring cereal hspec leveldb-haskell lifted-base
          monad-control mtl process resourcet transformers transformers-base
        ];
-       jailbreak = true;
        homepage = "https://github.com/jeremyjh/higher-leveldb";
        description = "A rich monadic API for working with leveldb databases";
        license = stdenv.lib.licenses.bsd3;
@@ -66057,14 +66236,13 @@ self: {
      }:
      mkDerivation {
        pname = "hjsonpointer";
-       version = "0.2.0.2";
-       sha256 = "1jf5cd77m1jvdlsblx9c3l5z9gdnkw0lii0z3zpzpcr275sxff0h";
+       version = "0.2.0.3";
+       sha256 = "13n0fzhd2fmy7k5iafmg3cxd2lmpsfvvbg1a0q793wz5f3glw0l3";
        buildDepends = [ aeson base text unordered-containers vector ];
        testDepends = [
          aeson base http-types HUnit test-framework test-framework-hunit
          text unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/seagreen/hjsonpointer";
        description = "JSON Pointer library";
        license = stdenv.lib.licenses.mit;
@@ -66079,8 +66257,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "0.6.0.0";
-       sha256 = "01v2nb77bp94jx9va757b2iimvvi9p73aqw7izyrqp1li4gd6yq2";
+       version = "0.6.0.1";
+       sha256 = "1m7fg179khkmyhnhqa32gbaf2dgg27i4n36fafqm60pyc5kzhz69";
        buildDepends = [
          aeson base bytestring file-embed hashable hjsonpointer http-client
          http-types regexpr scientific text unordered-containers vector
@@ -66161,29 +66339,27 @@ self: {
     ({ mkDerivation, base, base-compat, cmdargs, containers, csv
      , directory, filepath, haskeline, hledger-lib, HUnit, mtl
      , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa
-     , regexpr, safe, shakespeare, shakespeare-text, split, tabular
-     , terminfo, test-framework, test-framework-hunit, text, time
-     , transformers, utf8-string, wizards
+     , safe, shakespeare, split, tabular, terminfo, test-framework
+     , test-framework-hunit, text, time, transformers
+     , unordered-containers, utf8-string, wizards
      }:
      mkDerivation {
        pname = "hledger";
-       version = "0.25.1";
-       sha256 = "1z3qpa8p6z7lil67ikimfzvlppsaz3yn58ljc5mkqv3cz6rss9q3";
+       version = "0.26";
+       sha256 = "1gixj6i99rqbn6ziwpni2scgv9sdd3yvxj6d3i1ivirmsx2rd3bm";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base base-compat cmdargs containers csv directory filepath
          haskeline hledger-lib HUnit mtl mtl-compat old-time parsec
-         pretty-show process regex-tdfa regexpr safe shakespeare
-         shakespeare-text split tabular terminfo text time utf8-string
-         wizards
+         pretty-show process regex-tdfa safe shakespeare split tabular
+         terminfo text time unordered-containers utf8-string wizards
        ];
        testDepends = [
          base base-compat cmdargs containers csv directory filepath
          haskeline hledger-lib HUnit mtl mtl-compat old-time parsec
-         pretty-show process regex-tdfa regexpr safe shakespeare
-         shakespeare-text split tabular test-framework test-framework-hunit
-         text time transformers wizards
+         pretty-show process regex-tdfa safe shakespeare split tabular
+         test-framework test-framework-hunit text time transformers wizards
        ];
        homepage = "http://hledger.org";
        description = "The main command-line interface for the hledger accounting tool";
@@ -66220,6 +66396,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base hledger-lib time ];
+       jailbreak = true;
        homepage = "https://github.com/gebner/hledger-diff";
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
@@ -66245,8 +66422,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-irr";
-       version = "0.1.1.6";
-       sha256 = "1w8f69ssr7g50w4mikfakznrw7y0lqcjr78ad5bwz37ppi4fhdvj";
+       version = "0.1.1.7";
+       sha256 = "1gi7v5xsx1hv4lljlx19v4rwvnh7raglxzh4mgyiwlnwqybc2cr4";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base Cabal Decimal hledger-lib statistics time ];
@@ -66257,25 +66434,24 @@ self: {
   "hledger-lib" = callPackage
     ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring
      , cmdargs, containers, csv, Decimal, directory, filepath, HUnit
-     , mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa
-     , regexpr, safe, split, test-framework, test-framework-hunit, time
-     , transformers, utf8-string
+     , mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa, safe
+     , split, test-framework, test-framework-hunit, time, transformers
+     , utf8-string
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "0.25.1";
-       sha256 = "1p8khkpwiqxhm9ycg4vcgqsggrxzlp55b34ckhsdrfzjdphxq60i";
+       version = "0.26";
+       sha256 = "0cm5d65kfxha6280q9iibrj4a0p5g6srfl28x1f8vay41xjg80nh";
        buildDepends = [
          array base base-compat blaze-markup bytestring cmdargs containers
          csv Decimal directory filepath HUnit mtl mtl-compat old-time parsec
-         pretty-show regex-tdfa regexpr safe split time transformers
-         utf8-string
+         pretty-show regex-tdfa safe split time transformers utf8-string
        ];
        testDepends = [
          array base base-compat blaze-markup cmdargs containers csv Decimal
          directory filepath HUnit mtl mtl-compat old-time parsec pretty-show
-         regex-tdfa regexpr safe split test-framework test-framework-hunit
-         time transformers
+         regex-tdfa safe split test-framework test-framework-hunit time
+         transformers
        ];
        homepage = "http://hledger.org";
        description = "Core data types, parsers and utilities for the hledger accounting tool";
@@ -66306,24 +66482,24 @@ self: {
     ({ mkDerivation, base, base-compat, blaze-html, blaze-markup
      , bytestring, clientsession, cmdargs, conduit-extra, data-default
      , directory, filepath, hjsmin, hledger, hledger-lib, hspec
-     , http-client, http-conduit, HUnit, json, network-conduit, parsec
-     , regexpr, safe, shakespeare, template-haskell, text, time
-     , transformers, wai, wai-extra, wai-handler-launch, warp, yaml
-     , yesod, yesod-core, yesod-form, yesod-static, yesod-test
+     , http-client, http-conduit, HUnit, json, parsec, safe, shakespeare
+     , template-haskell, text, time, transformers, wai, wai-extra
+     , wai-handler-launch, warp, yaml, yesod, yesod-core, yesod-form
+     , yesod-static, yesod-test
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "0.25.1";
-       sha256 = "07al1vlrh5v71zzghn5q5krdygqa63icbg33n0hlvc42mghc6rsk";
+       version = "0.26";
+       sha256 = "019r4jy0kss62ya883rgzkc6lkp14f0dfkdfiahpl4587fcvpxsi";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base base-compat blaze-html blaze-markup bytestring clientsession
          cmdargs conduit-extra data-default directory filepath hjsmin
-         hledger hledger-lib http-client http-conduit HUnit json
-         network-conduit parsec regexpr safe shakespeare template-haskell
-         text time transformers wai wai-extra wai-handler-launch warp yaml
-         yesod yesod-core yesod-form yesod-static
+         hledger hledger-lib http-client http-conduit HUnit json parsec safe
+         shakespeare template-haskell text time transformers wai wai-extra
+         wai-handler-launch warp yaml yesod yesod-core yesod-form
+         yesod-static
        ];
        testDepends = [ base base-compat hspec yesod yesod-test ];
        homepage = "http://hledger.org";
@@ -66392,13 +66568,13 @@ self: {
     ({ mkDerivation, base, hspec, sass }:
      mkDerivation {
        pname = "hlibsass";
-       version = "0.1.3.0";
-       sha256 = "10mrvpiwmcaijckrcg45zw2zb17fgx43rm4qfi32glvgkakd2zqf";
+       version = "0.1.4.0";
+       sha256 = "062qsg5mr0qsa5ah1d0xx7njkpn4j4g6x4sv3skgvgc9855gywr6";
        buildDepends = [ base ];
        testDepends = [ base hspec ];
        extraLibraries = [ sass ];
        homepage = "https://github.com/jakubfijalkowski/hlibsass";
-       description = "Low-level bindings to libsass";
+       description = "Low-level bindings to Libsass";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { sass = null;};
@@ -66601,8 +66777,8 @@ self: {
     ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex }:
      mkDerivation {
        pname = "hmatrix-gsl-stats";
-       version = "0.4";
-       sha256 = "08rrvn833psl0fic1zvhgv2ymgj16cdrfwv003fiapphnqxcpj9a";
+       version = "0.4.1";
+       sha256 = "113gi92xdck75zrllpncrnm72fj8wd2wcbf237jflkpbqcmzf8zq";
        buildDepends = [ base binary hmatrix storable-complex ];
        pkgconfigDepends = [ gsl ];
        homepage = "http://code.haskell.org/hmatrix-gsl-stats";
@@ -66852,14 +67028,14 @@ self: {
      }:
      mkDerivation {
        pname = "hmm-hmatrix";
-       version = "0.0";
-       sha256 = "0gcjasj6115gwjh2m680wrg3fmm8zchk6isb2wmlyfvib27963jm";
+       version = "0.0.1";
+       sha256 = "1kkikv3spnvqms59980p8aappw3wh26y9qs2c8ykia5fpz9zag4h";
        buildDepends = [
          array base containers explicit-exception hmatrix lazy-csv non-empty
          random semigroups transformers utility-ht
        ];
        jailbreak = true;
-       homepage = "http://code.haskell.org/~thielema/hmm-hmatrix";
+       homepage = "http://hub.darcs.net/thielema/hmm-hmatrix";
        description = "Hidden Markov Models using HMatrix primitives";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67010,6 +67186,7 @@ self: {
        homepage = "http://github.com/jwiegley/hnix";
        description = "Haskell implementation of the Nix language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hnn" = callPackage
@@ -67432,12 +67609,12 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "honk";
-       version = "1.2.0.0";
-       sha256 = "0aql3rqhx7jj1k0csx5rhb5kqsf1r28rvr7rl9axzkc9imz53wvx";
+       version = "1.3.0.0";
+       sha256 = "102jw5j89amgvz3k3b05plpw9pjkhg1rjpjpcvpxq11x8mfdxyhf";
        buildDepends = [ base ];
-       homepage = "http://lfairy.github.io/honk/";
+       homepage = "https://lambda.xyz/honk/";
        description = "Cross-platform interface to the PC speaker";
-       license = "unknown";
+       license = stdenv.lib.licenses.asl20;
      }) {};
 
   "hoobuddy" = callPackage
@@ -68222,8 +68399,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.5.1";
-       sha256 = "1bbmwan9la5agys1jw95z1immy36pgk93n5x90vsm674dwcj5hrk";
+       version = "0.5.2";
+       sha256 = "12671fsydxxkdpk47nmzm9qc5vlss6802bypx690z8c982s4vbr1";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -69332,18 +69509,20 @@ self: {
      }) { xenctrl = null;};
 
   "hsass" = callPackage
-    ({ mkDerivation, base, data-default-class, filepath, hlibsass
-     , hspec, hspec-discover, monad-loops, mtl, temporary
+    ({ mkDerivation, base, bytestring, data-default-class, filepath
+     , hlibsass, hspec, hspec-discover, monad-loops, temporary
+     , transformers
      }:
      mkDerivation {
        pname = "hsass";
-       version = "0.2.0";
-       sha256 = "0s7p1mv8vwlpgrvnalsfkynd8ps1ndla2yssaq6v650f0vx36jsf";
+       version = "0.3.0";
+       sha256 = "15x5f8zcikg1bh10sk5b2gqjfldgp4jdgwhl2k20i6h8mxjkpmdf";
        buildDepends = [
-         base data-default-class filepath hlibsass monad-loops mtl
+         base bytestring data-default-class filepath hlibsass monad-loops
+         transformers
        ];
        testDepends = [
-         base data-default-class hspec hspec-discover temporary
+         base bytestring data-default-class hspec hspec-discover temporary
        ];
        homepage = "https://github.com/jakubfijalkowski/hsass";
        description = "Integrating Sass into Haskell applications";
@@ -70766,7 +70945,6 @@ self: {
          base containers http-types HUnit network-uri rdf4h test-framework
          test-framework-hunit text wai warp
        ];
-       jailbreak = true;
        homepage = "https://github.com/robstewart57/hsparql";
        description = "A SPARQL query generator and DSL, and a client to query a SPARQL server";
        license = stdenv.lib.licenses.bsd3;
@@ -71094,6 +71272,7 @@ self: {
        homepage = "https://github.com/dbp/hspec-snap";
        description = "A library for testing with Hspec and the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-test-framework" = callPackage
@@ -71864,6 +72043,7 @@ self: {
        jailbreak = true;
        description = "Command-line tar archive utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "htiled" = callPackage
@@ -72228,8 +72408,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.15";
-       sha256 = "0k3ag3ia76s9dyhafaprspbsrbzpl5amyw7cnxv6l76v778ksrrf";
+       version = "0.4.16";
+       sha256 = "1ghz498h3c0n1wfkxgkh9zd8l6yik650505hihnayp4wcykc1p82";
        buildDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -72794,8 +72974,8 @@ self: {
      }:
      mkDerivation {
        pname = "http2";
-       version = "1.0.1";
-       sha256 = "1iw1k3xs79xfzwgykpbyvfsdns4ljfmvf1v98jjklimrzsmlsgz3";
+       version = "1.0.2";
+       sha256 = "0wkzphzxzzvqm947l759vxnl6g60nrx7jygyxdlxfgxi51fd7gap";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -74143,8 +74323,8 @@ self: {
      }:
      mkDerivation {
        pname = "hyperloglog";
-       version = "0.3.3";
-       sha256 = "033841498nnlczypd87xjwlxcka9w5cj7881qpb94xd0dwllagnc";
+       version = "0.3.3.1";
+       sha256 = "1ns0vz80byssmi39mgdkprpwy26szbmfqqzs1lb6amqf7nx4i14l";
        buildDepends = [
          approximate base binary bits bytes cereal cereal-vector comonad
          deepseq distributive generic-deriving hashable hashable-extras lens
@@ -74721,8 +74901,8 @@ self: {
      }:
      mkDerivation {
        pname = "ig";
-       version = "0.2.2";
-       sha256 = "0qg9786sih7bcmdvmih5qg8p0j8r7vh78cp5yaw2f9rldica9a4k";
+       version = "0.3";
+       sha256 = "1sg1dbwjvhixy7qgchg6a2nh76jyp3qlwancj3fcn7c87fmhxdqg";
        buildDepends = [
          aeson base base16-bytestring bytestring conduit conduit-extra
          crypto-api cryptohash cryptohash-cryptoapi data-default
@@ -75798,8 +75978,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-c";
-       version = "0.5.4.2";
-       sha256 = "1s38ncb59zr8295k3vr52cmirb9kw2dfpfjbb8hh5c27z1vcmmrz";
+       version = "0.5.4.3";
+       sha256 = "03b15dz0bm26bv9jkpjdgmqii3fw1ifj6zwmysibir50jxlbx9pk";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -76591,7 +76771,9 @@ self: {
      mkDerivation {
        pname = "iproute";
        version = "1.5.0";
+       revision = "1";
        sha256 = "0mr5dwzvsik5v59fy5lpnj6qabgc8cwbybil5hb6gqqvd0y26fz3";
+       editedCabalFile = "f601b3319004e7b4a4636c89996ea78fd084e9b10d15d679d7ae58e822fe19b8";
        buildDepends = [ appar base byteorder containers network ];
        testDepends = [
          appar base byteorder containers doctest hspec network QuickCheck
@@ -76757,9 +76939,9 @@ self: {
      mkDerivation {
        pname = "irc-core";
        version = "1.1.0.1";
-       revision = "2";
+       revision = "3";
        sha256 = "01n10wcnq4h2wpmxl1rh9zgqayk3mllbz563fg8qw1k01n7q9257";
-       editedCabalFile = "dd561722689f1891016d9ea0ce11ef7752853160fc8da43625f803839f55059c";
+       editedCabalFile = "a2be33ee630d69381c0103cf25743005688f53220d02552cc99ed7131eefdadf";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -77500,7 +77682,8 @@ self: {
 
   "jack" = callPackage
     ({ mkDerivation, array, base, bytestring, enumset, event-list
-     , explicit-exception, jack2, midi, non-negative, transformers, unix
+     , explicit-exception, libjack2, midi, non-negative, transformers
+     , unix
      }:
      mkDerivation {
        pname = "jack";
@@ -77512,25 +77695,25 @@ self: {
          array base bytestring enumset event-list explicit-exception midi
          non-negative transformers unix
        ];
-       pkgconfigDepends = [ jack2 ];
+       pkgconfigDepends = [ libjack2 ];
        homepage = "http://www.haskell.org/haskellwiki/JACK";
        description = "Bindings for the JACK Audio Connection Kit";
        license = "GPL";
-     }) { jack2 = null;};
+     }) { inherit (pkgs) libjack2;};
 
   "jack-bindings" = callPackage
-    ({ mkDerivation, base, c2hs, jack2, mtl }:
+    ({ mkDerivation, base, c2hs, libjack2, mtl }:
      mkDerivation {
        pname = "jack-bindings";
        version = "0.1.1";
        sha256 = "1gmz2qiz7wzydj0rhswbfhwi0zbdcbps29l1lryzqxm8chfc9mbm";
        buildDepends = [ base mtl ];
        buildTools = [ c2hs ];
-       pkgconfigDepends = [ jack2 ];
+       pkgconfigDepends = [ libjack2 ];
        description = "DEPRECATED Bindings to the JACK Audio Connection Kit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { jack2 = null;};
+     }) { inherit (pkgs) libjack2;};
 
   "jackminimix" = callPackage
     ({ mkDerivation, base, hosc }:
@@ -77636,8 +77819,8 @@ self: {
      }:
      mkDerivation {
        pname = "jammittools";
-       version = "0.5";
-       sha256 = "1rjmwxp078mq47b879ylfz4g2p9irgh4jrrg1vknwham46nj8hzn";
+       version = "0.5.0.1";
+       sha256 = "1qfa90hi0kcylfw3p4m2qx5n4ni14426ssffj63hixqrqcnz60gx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -78103,21 +78286,18 @@ self: {
      }) {};
 
   "jsaddle" = callPackage
-    ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell
-     , text, transformers, webkitgtk3, webkitgtk3-javascriptcore
+    ({ mkDerivation, base, hslogger, lens, template-haskell, text
+     , transformers
      }:
      mkDerivation {
        pname = "jsaddle";
        version = "0.2.0.5";
        sha256 = "0avl5gvq3sv2fk524hazfk1xgb9rlyqqqrvnxb63psjds7s6rxp1";
-       buildDepends = [
-         base lens template-haskell text transformers webkitgtk3
-         webkitgtk3-javascriptcore
-       ];
+       buildDepends = [ base lens template-haskell text transformers ];
        testDepends = [
-         base glib gtk3 hslogger lens template-haskell text transformers
-         webkitgtk3 webkitgtk3-javascriptcore
+         base hslogger lens template-haskell text transformers
        ];
+       jailbreak = true;
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -78199,6 +78379,7 @@ self: {
        buildDepends = [
          aeson base indexed indexed-free lens lens-aeson text
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/json-assertions.git";
        description = "Test that your (Aeson) JSON encoding matches your expectations";
        license = stdenv.lib.licenses.bsd3;
@@ -78226,6 +78407,7 @@ self: {
          hashable hflags lens mtl pretty process QuickCheck scientific
          smallcheck text uniplate unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/mgajda/json-autotype";
        description = "Automatic type declaration for JSON input data";
        license = stdenv.lib.licenses.bsd3;
@@ -78446,7 +78628,9 @@ self: {
      mkDerivation {
        pname = "json-schema";
        version = "0.7.3.7";
+       revision = "1";
        sha256 = "0lrr5zhydb2g36xlpr3mhn0m6bz138gbm0zih3f3qamnsm21mjk5";
+       editedCabalFile = "94b50ebb4b1aa921270db172dbef2ed18c85846d147d1526ec9c85ea0be1705a";
        buildDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -78901,6 +79085,7 @@ self: {
        homepage = "https://github.com/ku-fpg/kansas-comet/";
        description = "A JavaScript push mechanism based on the comet idiom";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kansas-lava" = callPackage
@@ -79381,6 +79566,7 @@ self: {
        homepage = "http://keera.co.uk/projects/keera-posture";
        description = "Get notifications when your sitting posture is inappropriate";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keiretsu" = callPackage
@@ -81238,6 +81424,7 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-python" = callPackage
@@ -81880,13 +82067,13 @@ self: {
      , hslogger, jsaddle, leksah-server, lens, ltk, monad-loops, mtl
      , network, network-uri, old-time, parsec, pretty, pretty-show
      , QuickCheck, regex-base, regex-tdfa, regex-tdfa-text, shakespeare
-     , strict, text, time, transformers, unix, utf8-string, vado, vcsgui
-     , vcswrapper, webkitgtk3, webkitgtk3-javascriptcore
+     , stm, strict, text, time, transformers, unix, utf8-string, vado
+     , vcsgui, vcswrapper, webkitgtk3, webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "leksah";
-       version = "0.15.0.6";
-       sha256 = "0hr0d4cl0gh58svpk9dji00rsypkplndd5q5av4bx2v34bx0v0rh";
+       version = "0.15.1.0";
+       sha256 = "0skvn5n69ir63q91jaj5qdhk8cxvic61g9ar5wck0gwpzdjcfl6w";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -81895,13 +82082,13 @@ self: {
          ghcjs-codemirror ghcjs-dom gio glib gtk3 gtksourceview3 hamlet
          haskell-src-exts hlint hslogger jsaddle leksah-server lens ltk mtl
          network network-uri old-time parsec pretty pretty-show QuickCheck
-         regex-base regex-tdfa regex-tdfa-text shakespeare strict text time
-         transformers unix utf8-string vado vcsgui vcswrapper webkitgtk3
-         webkitgtk3-javascriptcore
+         regex-base regex-tdfa regex-tdfa-text shakespeare stm strict text
+         time transformers unix utf8-string vado vcsgui vcswrapper
+         webkitgtk3 webkitgtk3-javascriptcore
        ];
        testDepends = [
          base Cabal containers glib gtk3 gtksourceview3 hslogger
-         leksah-server ltk monad-loops QuickCheck text transformers
+         leksah-server ltk monad-loops QuickCheck stm text transformers
          webkitgtk3
        ];
        homepage = "http://www.leksah.org";
@@ -81971,8 +82158,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens";
-       version = "4.11.1";
-       sha256 = "1f3xyz9y6510nbskc15brjdg226qpwgjnzddc29kg0g79x5wwcpi";
+       version = "4.12";
+       sha256 = "195fhzw8z15zrbav7mdzia052g7sfy7zm5banjkk3azsb9mjvvan";
        buildDepends = [
          array base base-orphans bifunctors bytestring comonad containers
          contravariant distributive exceptions filepath free ghc-prim
@@ -82202,8 +82389,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "0.1.2.4";
-       sha256 = "1iv3lk4jjp7yvqhfnqxsg8rgkbwzjhmnny6rrqk3njir76b378ra";
+       version = "0.1.2.6";
+       sha256 = "0pn4x75l04qs95h9ca5chvxbivnb29h4d8415n4r2b1gmx4apn0w";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -82614,8 +82801,8 @@ self: {
      }:
      mkDerivation {
        pname = "libgraph";
-       version = "1.4";
-       sha256 = "0j4rjwcp85cwfzvqvmxkxrvldfhz6k8ws3qjf29lzr0yrk1vfbjm";
+       version = "1.5";
+       sha256 = "0pyync48lr2silvm3cdmn11zmv355hcmmaj6rm7lb365mqv444i1";
        buildDepends = [
          array base containers monads-tf process union-find
        ];
@@ -82860,6 +83047,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "libravatar" = callPackage
+    ({ mkDerivation, base, bytestring, crypto-api, dns, network-uri
+     , pureMD5, random, SHA, url, utf8-string
+     }:
+     mkDerivation {
+       pname = "libravatar";
+       version = "0.1.0.1";
+       sha256 = "00rdnhxwp1h4ax3cwlmqa6digzl1b8br5ajg7k0dsydb9ik171x5";
+       buildDepends = [
+         base bytestring crypto-api dns network-uri pureMD5 random SHA url
+         utf8-string
+       ];
+       homepage = "http://rel4tion.org/projects/libravatar/";
+       description = "Use Libravatar, the decentralized avatar delivery service";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "libssh2" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, libssh2, network, ssh2
      , syb, time
@@ -83320,8 +83524,8 @@ self: {
      }:
      mkDerivation {
        pname = "linear";
-       version = "1.19";
-       sha256 = "1i5wbp6dbmdmys6scqyn0iiz4qhsj6m4v2ipicqx7nrl490vbivf";
+       version = "1.19.1.2";
+       sha256 = "1bxzy4735xc0zdxmwrspmjcn4p61kjwzxi8agjfx7w1dsyah2if3";
        buildDepends = [
          adjunctions base binary bytes cereal containers deepseq
          distributive ghc-prim hashable lens reflection semigroupoids
@@ -83443,8 +83647,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }:
      mkDerivation {
        pname = "linearscan";
-       version = "0.6.0.0";
-       sha256 = "0lprqpdrimrkdd2jmvbp9lpjnknr7a9bpiwh0rcx1jp5f777xfys";
+       version = "0.7.0";
+       sha256 = "13sfwkjg94q47lfxw5zddi8xpf4az07g88yq5pvgnh3vs5xggwip";
        buildDepends = [ base containers ghc-prim mtl transformers ];
        homepage = "http://github.com/jwiegley/linearscan";
        description = "Linear scan register allocator, formally verified in Coq";
@@ -83455,20 +83659,20 @@ self: {
   "linearscan-hoopl" = callPackage
     ({ mkDerivation, base, containers, deepseq, free, fuzzcheck, hoopl
      , hspec, hspec-expectations, lens-family-core, linearscan
-     , QuickCheck, tardis, transformers
+     , QuickCheck, transformers
      }:
      mkDerivation {
        pname = "linearscan-hoopl";
-       version = "0.6.0.0";
-       sha256 = "0sag9590df05fs46fv846hqwwiab85i9dsx4xn4y9w4islxi8hkb";
+       version = "0.7.0";
+       sha256 = "1zvzgcj5yln6g3mqljgcyjpjj2visiigd7qwl70l1zclz5zcfynv";
        buildDepends = [
-         base containers free hoopl linearscan QuickCheck tardis
-         transformers
+         base containers free hoopl linearscan QuickCheck transformers
        ];
        testDepends = [
          base containers deepseq fuzzcheck hoopl hspec hspec-expectations
-         lens-family-core linearscan QuickCheck tardis transformers
+         lens-family-core linearscan QuickCheck transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/jwiegley/linearscan-hoopl";
        description = "Makes it easy to use the linearscan register allocator with Hoopl";
        license = stdenv.lib.licenses.bsd3;
@@ -85066,6 +85270,7 @@ self: {
        version = "0.1.1.0";
        sha256 = "02x02m98ka1y8f1jjqwfwmsyx29g583gnr4jdm5syqxfr0dz6c52";
        buildDepends = [ base effin ];
+       jailbreak = true;
        homepage = "https://github.com/konn/loop-effin";
        description = "control-monad-loop port for effin";
        license = stdenv.lib.licenses.bsd3;
@@ -85424,6 +85629,7 @@ self: {
        ];
        description = "Helpers for Haskell integration with Lua";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lub" = callPackage
@@ -85477,8 +85683,8 @@ self: {
     ({ mkDerivation, base, blaze-builder, lucid, text, transformers }:
      mkDerivation {
        pname = "lucid-svg";
-       version = "0.4.0.4";
-       sha256 = "16clq3dvi7s08w9ddl8k205050lx9ma69050wyhv4nc5zhmjdq12";
+       version = "0.5.0.0";
+       sha256 = "1p7ipdy0nmqfg1b038a1b5nd3xh2779d2gnw4h683mm5jcbf0mvj";
        buildDepends = [ base blaze-builder lucid text transformers ];
        homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git";
        description = "DSL for SVG using lucid for HTML";
@@ -85778,7 +85984,9 @@ self: {
      mkDerivation {
        pname = "machinecell";
        version = "2.0.1";
+       revision = "1";
        sha256 = "0gl207a97zcs48k6pdr82x9ckg1bc2vn6wachc57gmnspk3j43xd";
+       editedCabalFile = "5470f26ae4ebbbe5f88e6c70d3193a28ce9e5f94fd48b76c4ef576fcac92ac7d";
        buildDepends = [ arrows base free mtl profunctors semigroups ];
        testDepends = [
          arrows base hspec mtl profunctors QuickCheck semigroups
@@ -90426,6 +90634,7 @@ self: {
        homepage = "https://github.com/SumAll/moonshine";
        description = "A web service framework for Haskell, similar in purpose to dropwizard";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "morfette" = callPackage
@@ -92126,6 +92335,7 @@ self: {
        homepage = "https://github.com/fractalcat/nagios-plugin-ekg";
        description = "Monitor ekg metrics via Nagios";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "named-formlet" = callPackage
@@ -92365,15 +92575,15 @@ self: {
 
   "nationstates" = callPackage
     ({ mkDerivation, base, bytestring, clock, containers, http-client
-     , http-client-tls, http-types, multiset, split, transformers, xml
+     , http-client-tls, http-types, multiset, transformers, xml
      }:
      mkDerivation {
        pname = "nationstates";
-       version = "0.1.0.1";
-       sha256 = "0hnn4b94aj29j07jbhb7m7nn7l3wpkkcv76ngn1a5dnamagrwdpd";
+       version = "0.1.0.2";
+       sha256 = "0h01dxf8f2h18cx6ag67370l492jvyqh15ijipxzr1gwmkmnymrl";
        buildDepends = [
          base bytestring clock containers http-client http-client-tls
-         http-types multiset split transformers xml
+         http-types multiset transformers xml
        ];
        homepage = "https://github.com/lfairy/nationstates";
        description = "NationStates API client";
@@ -94303,6 +94513,7 @@ self: {
        ];
        description = "Generate nix expressions from npm packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nixos-types" = callPackage
@@ -95424,10 +95635,9 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "old-version";
-       version = "1.3.2";
-       sha256 = "0mh8xkcwx7p0vrg8gqza019k4faw7zw703mrin8ii85igq9sg70i";
+       version = "1.4.2";
+       sha256 = "1sqga2fmrc702k2grv2kw32wg0yy8qy94cs1jl6112xk6lb79qb3";
        buildDepends = [ base ];
-       jailbreak = true;
        description = "Basic versioning library";
        license = "unknown";
      }) {};
@@ -95452,6 +95662,7 @@ self: {
        jailbreak = true;
        description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "omaketex" = callPackage
@@ -96166,6 +96377,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "operational-class" = callPackage
+    ({ mkDerivation, base, operational, transformers }:
+     mkDerivation {
+       pname = "operational-class";
+       version = "0.3.0.0";
+       sha256 = "02z766b5a6fa7dgmw3qa1xryijf2im9n79gnjq0m5pd2hv5vja4b";
+       buildDepends = [ base operational transformers ];
+       homepage = "https://github.com/srijs/haskell-operational-class";
+       description = "MonadProgram typeclass for the operational package";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "opml" = callPackage
     ({ mkDerivation, base, directory, xml }:
      mkDerivation {
@@ -96579,6 +96802,26 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "orgmode" = callPackage
+    ({ mkDerivation, base, containers, hspec, HStringTemplate, network
+     , network-uri, parsec, QuickCheck, random, regex-posix, syb, text
+     }:
+     mkDerivation {
+       pname = "orgmode";
+       version = "0.1.0.0";
+       sha256 = "084dzafa8pm2hs346zk3x3agzzcxay7ca9r40s6sh61vfc6hbwg0";
+       buildDepends = [
+         base containers HStringTemplate parsec regex-posix syb text
+       ];
+       testDepends = [
+         base containers hspec HStringTemplate network network-uri parsec
+         QuickCheck random regex-posix syb text
+       ];
+       jailbreak = true;
+       description = "Org Mode library for haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "orgmode-parse" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , free, hashable, HUnit, old-locale, tasty, tasty-hunit, text
@@ -97082,8 +97325,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "1.15.0.4";
-       sha256 = "1mq7vdcxa7ia0s0l22ysqxpjsib4wvphh4849asswswgywscaq2n";
+       version = "1.15.0.5";
+       sha256 = "0js3k6kvq506yssx5d4wwx9hsd0pm81k8g0rpd7wi2aixibs2jj2";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -97141,8 +97384,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.2.1";
-       sha256 = "1hr2jfbzanpqbkvsfcbzvlfsnzba11hdrmvc3j63fwqk931qi2jm";
+       version = "0.1.2.2";
+       sha256 = "1ynxg9d3ssq9bby073j40913z11xap6gpf8hkjl0h0ll3mx89vb9";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -97188,6 +97431,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-placetable" = callPackage
+    ({ mkDerivation, base, explicit-exception, pandoc-types
+     , spreadsheet
+     }:
+     mkDerivation {
+       pname = "pandoc-placetable";
+       version = "0.1.1";
+       sha256 = "196x22f76mvd072yzj6vcynrp459zmlg84l42rwx4syhnvn1ca8d";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base explicit-exception pandoc-types spreadsheet
+       ];
+       homepage = "https://github.com/mb21/pandoc-placetable";
+       description = "Pandoc filter to include CSV files";
+       license = "GPL";
+     }) {};
+
   "pandoc-types" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , deepseq-generics, ghc-prim, syb
@@ -99299,6 +99560,7 @@ self: {
        homepage = "https://github.com/BardurArantsson/pg-harness";
        description = "REST service and library for creating/consuming temporary PostgreSQL databases";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pg-harness-client" = callPackage
@@ -99330,6 +99592,7 @@ self: {
        homepage = "https://github.com/BardurArantsson/pg-harness";
        description = "REST service for creating temporary PostgreSQL databases";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pgdl" = callPackage
@@ -99701,10 +99964,9 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "picosat";
-       version = "0.1.2";
-       sha256 = "0x43fbhlinqflrvv548bxjrslnnsprklqig6iv9l8q9xv83scrvg";
+       version = "0.1.3";
+       sha256 = "1ljgarjvhw7qi06bjykgbd17s27h73gdj21rpi5x4ddv9fb68k9p";
        buildDepends = [ base ];
-       jailbreak = true;
        homepage = "https://github.com/sdiehl/haskell-picosat";
        description = "Bindings to the PicoSAT solver";
        license = stdenv.lib.licenses.mit;
@@ -101808,6 +102070,7 @@ self: {
        homepage = "https://github.com/mfine/postgresql-schema";
        description = "PostgreSQL Schema Management";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple" = callPackage
@@ -101985,6 +102248,7 @@ self: {
        ];
        description = "SMTP server library to receive emails from within Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postmark" = callPackage
@@ -103010,6 +103274,7 @@ self: {
        jailbreak = true;
        description = "Web graphic applications with processing.js.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "processor-creative-kit" = callPackage
@@ -103439,8 +103704,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "2.5.0";
-       sha256 = "120pamm3rg2iahbl23y90wbcwdhgjvvsfzlkhi61c97xfybvb08c";
+       version = "2.6.0";
+       sha256 = "1q9l5bp7sg9lciz8c5qzxmwnfb7b195f8zgdcvzfcx50i3hpxxad";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -104206,10 +104471,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.7.0.0";
-       revision = "1";
-       sha256 = "02kb8xk2c3lzm8bdph7q93chgdpjz00mhk76kpr1hjfwr6kniw91";
-       editedCabalFile = "0ec2a8e9a05aab3ca9b407ea66b8501f2bf067f7dfa9e408ff200819e63ff31f";
+       version = "0.7.1.0";
+       sha256 = "1hnrqs1dkcrwa1xrnrikcymm65inxfh9jznfb2xqczd9vyn8j518";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -104229,6 +104492,7 @@ self: {
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) nodejs;};
 
   "push-notify" = callPackage
@@ -104719,6 +104983,7 @@ self: {
        jailbreak = true;
        description = "Quenya verb conjugator";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "querystring-pickle" = callPackage
@@ -105112,6 +105377,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "quiver-csv" = callPackage
+    ({ mkDerivation, base, bytestring, data-cell, quiver
+     , quiver-bytestring
+     }:
+     mkDerivation {
+       pname = "quiver-csv";
+       version = "0.0.0.1";
+       sha256 = "0s5m6qhpir5i1n3ifrcr4if4ysk52cwi9pxm354mdw1859h5lmx9";
+       buildDepends = [
+         base bytestring data-cell quiver quiver-bytestring
+       ];
+       homepage = "https://github.com/zadarnowski/quiver-csv";
+       description = "Quiver combinators for cellular CSV data processing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "quoridor-hs" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , directory, dlist, exceptions, filepath, hex, HUnit, mtl, network
@@ -105277,6 +105559,7 @@ self: {
        sha256 = "1ic6163igf0c815crccss42czdhnrg3y8rfqr05wqy0m4vza0nx4";
        buildDepends = [ base bytestring lens process text ];
        testDepends = [ base bytestring lens process QuickCheck text ];
+       jailbreak = true;
        homepage = "https://www.github.com/massysett/rainbow";
        description = "Print text to terminal with colors and effects";
        license = stdenv.lib.licenses.bsd3;
@@ -105608,8 +105891,8 @@ self: {
      }:
      mkDerivation {
        pname = "range";
-       version = "0.1.1.0";
-       sha256 = "1cqy6lz7mr0n2zrrn9qxvgp8q7yj0drri1885m1crmvx4xd1dfp2";
+       version = "0.1.1.1";
+       sha256 = "05xcy4r97yyqr72cqpr5rq514zygbwa2hfnhilvgzrh3cmk61n0p";
        buildDepends = [ base parsec ];
        testDepends = [
          base Cabal QuickCheck random test-framework
@@ -105877,25 +106160,28 @@ self: {
      }) {};
 
   "rdf4h" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, hashable
-     , HTTP, HUnit, hxt, knob, network, network-uri, parsec, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, unordered-containers
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , directory, fgl, hashable, HTTP, HUnit, hxt, knob, network
+     , network-uri, parsec, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text
+     , text-binary, unordered-containers
      }:
      mkDerivation {
        pname = "rdf4h";
-       version = "1.3.0";
-       sha256 = "0d6jqhfiy1zlvbf04n7q8qmq2ql0vrd0lpfaxsmqwwnz5ip297jp";
+       version = "1.3.1";
+       sha256 = "0mcswyjlvhnv4rvapanfmxf2brsp5b9r1ps22n3rlhpa3mfw72rc";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base bytestring containers directory hashable HTTP hxt network
-         network-uri parsec text unordered-containers
+         base binary bytestring containers deepseq directory fgl hashable
+         HTTP hxt network network-uri parsec text text-binary
+         unordered-containers
        ];
        testDepends = [
-         base bytestring containers hashable HTTP HUnit hxt knob network
-         network-uri parsec QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 text unordered-containers
+         base bytestring containers deepseq fgl hashable HTTP HUnit hxt knob
+         network network-uri parsec QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 text
+         unordered-containers
        ];
        homepage = "https://github.com/robstewart57/rdf4h";
        description = "A library for RDF processing in Haskell";
@@ -106787,8 +107073,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "reflection";
-       version = "1.5.2.1";
-       sha256 = "1pynmkhdxq5vxbjs7rxiv3mg8avidxg4cnghanp75846s4s6ggg5";
+       version = "2";
+       sha256 = "1hlrji6wyqr892a78px7wilhywyiqdfdmnr7zp4c641qks4rw6gf";
        buildDepends = [ base template-haskell ];
        homepage = "http://github.com/ekmett/reflection";
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
@@ -106862,6 +107148,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reflex-dom-contrib" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, bytestring, containers
+     , data-default, ghcjs-base, ghcjs-dom, http-types, lens, mtl
+     , readable, reflex, reflex-dom, string-conv, text, time
+     }:
+     mkDerivation {
+       pname = "reflex-dom-contrib";
+       version = "0.1";
+       sha256 = "1xqw1i5wldfamjyav7fbw3001hdnbj4x3phlr216ybw3ndxrjklc";
+       buildDepends = [
+         aeson base bifunctors bytestring containers data-default ghcjs-base
+         ghcjs-dom http-types lens mtl readable reflex reflex-dom
+         string-conv text time
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/reflex-frp/reflex-dom-contrib";
+       description = "A playground for experimenting with infrastructure and common code for reflex applications";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) { ghcjs-base = null;};
+
   "reform" = callPackage
     ({ mkDerivation, base, containers, mtl, text }:
      mkDerivation {
@@ -107414,6 +107721,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "regress" = callPackage
+    ({ mkDerivation, ad, base, vector }:
+     mkDerivation {
+       pname = "regress";
+       version = "0.1.1";
+       sha256 = "00b4n4gw5y0mpayb0zlkvz91nfrpbspz22kqhpvdnxbb4zcz7pnj";
+       buildDepends = [ ad base vector ];
+       homepage = "https://github.com/alpmestan/regress";
+       description = "Linear and logistic regression through automatic differentiation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "regular" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -108318,8 +108637,8 @@ self: {
      }:
      mkDerivation {
        pname = "resolve-trivial-conflicts";
-       version = "0.3.0.1";
-       sha256 = "1a045adxq1n2xjff9ccw6nfb87867w54pihmbybxcwfnkr6ymq26";
+       version = "0.3.0.2";
+       sha256 = "1d64hg2nwhqzm720w25xgb4wv2akg0kv3iwwh2ivc57zp525xpcq";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -108546,7 +108865,9 @@ self: {
      mkDerivation {
        pname = "rest-gen";
        version = "0.17.1.1";
+       revision = "1";
        sha256 = "0gr5wv0gb2niq3i7ggzrr5g9hs3fwxss5hivw5ircrbp9s1xm7bl";
+       editedCabalFile = "9d5c13bbf90373aed094821bd2005822fccd5949e0c88a2a63870d90f7c76ee4";
        buildDepends = [
          aeson base blaze-html Cabal code-builder directory fclabels
          filepath hashable haskell-src-exts HStringTemplate hxt json-schema
@@ -110038,15 +110359,16 @@ self: {
      }) {};
 
   "rubberband" = callPackage
-    ({ mkDerivation, base, rubberband, vector }:
+    ({ mkDerivation, base, c2hs, rubberband, vector }:
      mkDerivation {
        pname = "rubberband";
-       version = "0.1.0.1";
-       sha256 = "03dhmk4sad20xjic8li1bmwfxril9j6fffcwkf575pd51ds7kghf";
+       version = "0.1.0.2";
+       sha256 = "15j402a7vwrx6sjn29jrby4qxc27c1aa4mkbalssn8jlpjhlpffm";
        buildDepends = [ base vector ];
+       testDepends = [ base ];
+       buildTools = [ c2hs ];
        extraLibraries = [ rubberband ];
        pkgconfigDepends = [ rubberband ];
-       jailbreak = true;
        homepage = "https://github.com/mtolly/rubberband";
        description = "Binding to the C++ audio stretching library Rubber Band";
        license = stdenv.lib.licenses.gpl3;
@@ -111493,6 +111815,7 @@ self: {
        homepage = "https://github.com/echaozh/scottish";
        description = "scotty with batteries included";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty" = callPackage
@@ -111504,8 +111827,8 @@ self: {
      }:
      mkDerivation {
        pname = "scotty";
-       version = "0.10.1";
-       sha256 = "0rz7m12pqyrw1ihvg7lhciy5lvn1g5mmdrbcyc5z32icqys3qi8v";
+       version = "0.10.2";
+       sha256 = "0jlw82brnvc4cbpws0dq3qxn4rnb3z6rx6cfiarqwas14x4k3kl6";
        buildDepends = [
          aeson base blaze-builder bytestring case-insensitive
          data-default-class http-types monad-control mtl nats network
@@ -111609,6 +111932,7 @@ self: {
        homepage = "https://github.com/scotty-web/scotty-hastache";
        description = "Easy Mustache templating support for Scotty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-session" = callPackage
@@ -111628,6 +111952,7 @@ self: {
        homepage = "https://github.com/agrafix/scotty-session";
        description = "Adding session functionality to scotty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-tls" = callPackage
@@ -111640,6 +111965,7 @@ self: {
        homepage = "https://github.com/dmjio/scotty-tls.git";
        description = "TLS for Scotty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scp-streams" = callPackage
@@ -112741,8 +113067,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.4.3";
-       sha256 = "0mqiigf6bxrcnjgizv9kw23xf55ck453z2hz68pzqqbjzs34iqb4";
+       version = "0.4.3.1";
+       sha256 = "1lbnd4mmn7q0bb091il18g1y8ixsi81s64q8lpfpm5sq4dsn1x6l";
        buildDepends = [
          aeson attoparsec base bytestring bytestring-conversion
          case-insensitive http-media http-types network-uri
@@ -112762,8 +113088,8 @@ self: {
     ({ mkDerivation, base, blaze-html, http-media, servant }:
      mkDerivation {
        pname = "servant-blaze";
-       version = "0.4.3";
-       sha256 = "0pcdslar68yfviacrvyc6rb9d972m1irz4k7wd1xxnm5y60v0wyl";
+       version = "0.4.3.1";
+       sha256 = "017y41z82smy848y6a73232rlidiimdxawb048lnrs9z53ai46cn";
        buildDepends = [ base blaze-html http-media servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Blaze-html support for servant";
@@ -112779,8 +113105,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.4.3";
-       sha256 = "0baqrhhhfmyx0389abp503mhh8fjv18i3qhmdsvn46blb4c0cnkx";
+       version = "0.4.3.1";
+       sha256 = "15b6aww76bw87zps3n3sv5zl4q1h9l9ds72r9g8kn0r53r3vw6ig";
        buildDepends = [
          aeson attoparsec base bytestring either exceptions http-client
          http-client-tls http-media http-types network-uri safe servant
@@ -112803,8 +113129,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.4.3";
-       sha256 = "13rnn2z9bxrcrxqkndhnbkmsp27907lscsl4vrryxx37i94bf1qj";
+       version = "0.4.3.1";
+       sha256 = "0kzk4089xnr22gw929babknc9rnjq3wp1rk9fq881l49z8pvvl4r";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -112821,18 +113147,19 @@ self: {
   "servant-ede" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ede, either, filepath
      , http-media, http-types, semigroups, servant, servant-server, text
-     , transformers, unordered-containers, wai, warp
+     , transformers, unordered-containers, vector, wai, warp
+     , xss-sanitize
      }:
      mkDerivation {
        pname = "servant-ede";
-       version = "0.4.0.1";
-       sha256 = "1yxqjd6dk5bhh6qwjshm1fcizsm1vd5nk8sdbfdasgsfw6ynlgfp";
+       version = "0.5";
+       sha256 = "0lq9kd96lzkyx35n46q0yxk44lirpnh9gv4wji8i8qjqf18fkg6c";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base bytestring ede either filepath http-media http-types
          semigroups servant servant-server text transformers
-         unordered-containers wai warp
+         unordered-containers vector wai warp xss-sanitize
        ];
        homepage = "http://github.com/alpmestan/servant-ede";
        description = "Combinators for rendering EDE templates in servant web applications";
@@ -112847,8 +113174,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-examples";
-       version = "0.4.3";
-       sha256 = "0p57731ji84mikvymi458x27i4nk66046xmra6lrvc2fxs5gspmh";
+       version = "0.4.3.1";
+       sha256 = "1ypsdpmp8rx6qcwvbw5scc0y41c1jnpn96wxy6wcik1rkc2zjxfq";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -112869,8 +113196,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-jquery";
-       version = "0.4.3";
-       sha256 = "1rslqlg6p7indrcalvq85knwgsi4wdznz5cbblq1i5j4297yc1gj";
+       version = "0.4.3.1";
+       sha256 = "13ngnbpip7nps3c8i2r9220i9i9kgf5s5w8s0wjkhb25xfbmnwwx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -112889,8 +113216,8 @@ self: {
     ({ mkDerivation, base, http-media, lucid, servant }:
      mkDerivation {
        pname = "servant-lucid";
-       version = "0.4.3";
-       sha256 = "0js3f23iwgr2wi54pv37hhsln1x6vmfd5mnsxnzdmppzvb9f19wk";
+       version = "0.4.3.1";
+       sha256 = "1pgvd3khap4gnnpsi2rrp64rz0182xyy9bqglsvg7f7nfmyprgpq";
        buildDepends = [ base http-media lucid servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Servant support for lucid";
@@ -112986,8 +113313,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.4.3";
-       sha256 = "0xi5g3xqn4fl57fbhw2avm26g7k8zmd1c215yw5ria9dbjrvlqha";
+       version = "0.4.3.1";
+       sha256 = "1qdsv7zr9byjrm7yir8alm1zv0ckb81r6akwdvqfa88a581yz7jx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -113117,6 +113444,7 @@ self: {
        homepage = "https://github.com/yesodweb/serversession";
        description = "Snap bindings for serversession";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession-frontend-wai" = callPackage
@@ -113717,7 +114045,9 @@ self: {
      mkDerivation {
        pname = "shakespeare";
        version = "2.0.5";
+       revision = "1";
        sha256 = "0jdmmrglzqzpj4cfiyab3kfr0vlz1rfc893nrq94b1rg4vwh1zzh";
+       editedCabalFile = "c3cde3794b87e5f99500aac7199a66ad95985ba716170551fe40e82452a61ebc";
        buildDepends = [
          aeson base blaze-html blaze-markup bytestring containers directory
          exceptions ghc-prim parsec process template-haskell text time
@@ -115352,6 +115682,7 @@ self: {
        ];
        description = "a tool to access the OSX keychain";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skell" = callPackage
@@ -115438,8 +115769,8 @@ self: {
      }:
      mkDerivation {
        pname = "slack-api";
-       version = "0.4";
-       sha256 = "1xwpcvk906v2w995gsk8g41ml46w1r8h1gybsspkx6s6z6whhik5";
+       version = "0.5";
+       sha256 = "1jjm7qzb1s2z8c7ikwsvz2bp7f3dx3qcqw7kcas42xp0ziwnl50m";
        buildDepends = [
          aeson base bytestring containers errors HsOpenSSL io-streams lens
          lens-aeson monad-loops mtl network network-uri openssl-streams text
@@ -115789,12 +116120,11 @@ self: {
     ({ mkDerivation, aeson, base, linear, vector }:
      mkDerivation {
        pname = "smoothie";
-       version = "0.3.2";
-       sha256 = "0al17y15k7y04dwz5v2bsq003lxzhkhqlbdmbljdr1z17yszcjp6";
+       version = "0.3.3.2";
+       sha256 = "0jkcy45rxq14ma11h4dakv8ixwzynlml02yd3nmncmlm8vzpah8n";
        buildDepends = [ aeson base linear vector ];
-       jailbreak = true;
        homepage = "https://github.com/phaazon/smoothie";
-       description = "Smooth curves via several splines and polynomials";
+       description = "Smooth curves via several interpolation modes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -115878,6 +116208,7 @@ self: {
        homepage = "https://github.com/avieth/smtp-mail-ng";
        description = "An SMTP client EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smtp2mta" = callPackage
@@ -115914,6 +116245,7 @@ self: {
        homepage = "https://github.com/enzoh/smtps-gmail";
        description = "Gmail SMTP Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snake-game" = callPackage
@@ -115955,6 +116287,7 @@ self: {
        homepage = "http://snapframework.com/";
        description = "Top-level package for the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-accept" = callPackage
@@ -116001,6 +116334,7 @@ self: {
        homepage = "https://github.com/dzhus/snap-auth-cli";
        description = "Command-line tool to manage Snap AuthManager database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-blaze" = callPackage
@@ -116081,6 +116415,7 @@ self: {
        homepage = "http://github.com/ocharles/snap-cors";
        description = "Add CORS headers to Snap applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-elm" = callPackage
@@ -116115,6 +116450,7 @@ self: {
        homepage = "http://github.com/ocharles/snap-error-collector";
        description = "Collect errors in batches and dispatch them";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-extras" = callPackage
@@ -116291,6 +116627,7 @@ self: {
        homepage = "https://github.com/lukerandall/snap-web-routes";
        description = "Type safe URLs for Snap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-acid-state" = callPackage
@@ -116303,6 +116640,7 @@ self: {
        homepage = "https://github.com/mightybyte/snaplet-acid-state";
        description = "acid-state snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-actionlog" = callPackage
@@ -116347,6 +116685,7 @@ self: {
        homepage = "https://github.com/ixmatus/snaplet-amqp";
        description = "Snap framework snaplet for the AMQP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-auth-acid" = callPackage
@@ -116386,6 +116725,7 @@ self: {
        homepage = "https://github.com/AtticHacker/snaplet-coffee";
        description = "CoffeeScript for Snap, auto-compilation and pre-compilation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-css-min" = callPackage
@@ -116440,6 +116780,7 @@ self: {
        homepage = "https://github.com/faylang/snaplet-fay";
        description = "Fay integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-hasql" = callPackage
@@ -116457,6 +116798,7 @@ self: {
        homepage = "https://github.com/mikeplus64/snaplet-hasql";
        description = "A Hasql snaplet";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-haxl" = callPackage
@@ -116515,6 +116857,7 @@ self: {
        homepage = "https://github.com/ixmatus/snaplet-logger";
        description = "Snap framework snaplet for the Logger API library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-i18n" = callPackage
@@ -116555,6 +116898,7 @@ self: {
        homepage = "https://github.com/ixmatus/snaplet-influxdb";
        description = "Snap framework snaplet for the InfluxDB library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-lss" = callPackage
@@ -116590,6 +116934,7 @@ self: {
        homepage = "https://github.com/ixmatus/snaplet-mandrill";
        description = "Snap framework snaplet for the Mandrill API library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-mongoDB" = callPackage
@@ -116699,6 +117044,7 @@ self: {
        homepage = "https://github.com/soostone/snaplet-persistent";
        description = "persistent snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-postgresql-simple" = callPackage
@@ -116718,9 +117064,11 @@ self: {
          MonadCatchIO-transformers mtl postgresql-simple
          resource-pool-catchio snap text transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/mightybyte/snaplet-postgresql-simple";
        description = "postgresql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-postmark" = callPackage
@@ -116738,6 +117086,7 @@ self: {
        homepage = "https://github.com/LukeHoersten/snaplet-postmark";
        description = "Postmark snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-purescript" = callPackage
@@ -116773,6 +117122,7 @@ self: {
        homepage = "http://github.com/mikeplus64/snaplet-recaptcha";
        description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-redis" = callPackage
@@ -116790,6 +117140,7 @@ self: {
        homepage = "https://github.com/dzhus/snaplet-redis/";
        description = "Redis support for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-redson" = callPackage
@@ -116869,6 +117220,7 @@ self: {
        homepage = "https://github.com/lukerandall/snaplet-sass";
        description = "Sass integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-sedna" = callPackage
@@ -116952,6 +117304,7 @@ self: {
        homepage = "https://github.com/LukeHoersten/snaplet-stripe";
        description = "Stripe snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-tasks" = callPackage
@@ -117358,6 +117711,7 @@ self: {
        homepage = "https://github.com/lpeterse/haskell-socket-sctp";
        description = "STCP socket extensions library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { sctp = null;};
 
   "socketio" = callPackage
@@ -117861,8 +118215,8 @@ self: {
     ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }:
      mkDerivation {
        pname = "spdx";
-       version = "0.1.2.0";
-       sha256 = "0mncj2053w1xsfrsx1472v85ia4spvshw18mp15xp3l6haxq7wxq";
+       version = "0.2.0.0";
+       sha256 = "0hxzkmyi90cbr7w8mjlp2azbkyp8gvjpv28c57lpvxw2xvyavgjq";
        buildDepends = [ base transformers ];
        testDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/phadej/spdx";
@@ -118115,6 +118469,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "splay" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "splay";
+       version = "0.0.6";
+       sha256 = "1mq5n62lg2jbhzbl1py7yhnhdyxa0gn2xmihb9cm5r7p75p5wacl";
+       buildDepends = [ base ];
+       description = "Generic splay-based sequence representation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "splaytree" = callPackage
     ({ mkDerivation, base, containers, deepseq, QuickCheck
      , test-framework, test-framework-quickcheck2
@@ -118853,13 +119218,12 @@ self: {
      }) {};
 
   "stable-memo" = callPackage
-    ({ mkDerivation, base, ghc-prim, hashtables, tagged }:
+    ({ mkDerivation, base, ghc-prim, hashtables }:
      mkDerivation {
        pname = "stable-memo";
-       version = "0.3.0";
-       sha256 = "0a218ilzx1bgwirfp6v6bzgwwkx8l60q1xnxq347xas750wjn8a8";
-       buildDepends = [ base ghc-prim hashtables tagged ];
-       jailbreak = true;
+       version = "0.3.1";
+       sha256 = "1rv578311cvn7ym08vxxi18dhic50w7ms6cjn77vh032b8fxr3gx";
+       buildDepends = [ base ghc-prim hashtables ];
        description = "Memoization based on argument identity";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -119443,10 +119807,9 @@ self: {
     ({ mkDerivation, base, double-conversion, free, mtl, text }:
      mkDerivation {
        pname = "static-canvas";
-       version = "0.2.0.1";
-       sha256 = "14zglnvlra4p85zc4vkgwrpfjf7mrz9dw4ppi369vsfwnw2sgwkq";
+       version = "0.2.0.2";
+       sha256 = "1lphx10wljylsbjwlw5p7bsjh5gf2fj1sl09556y814r11a6rjff";
        buildDepends = [ base double-conversion free mtl text ];
-       jailbreak = true;
        homepage = "https://github.com/jeffreyrosenbluth/static-canvas";
        description = "DSL to generate HTML5 Canvas javascript";
        license = stdenv.lib.licenses.bsd3;
@@ -120392,12 +120755,11 @@ self: {
      }:
      mkDerivation {
        pname = "streams";
-       version = "3.2";
-       sha256 = "1pms4wiispnpzysq44fcvspdxmbwk47rfcpcyshnnhpw7c7qngni";
+       version = "3.2.1";
+       sha256 = "1xyrsb55dg7v3pris0hc0yqdlqaymxb6g286wrbc7h2lva5wrva4";
        buildDepends = [
          adjunctions base comonad distributive semigroupoids semigroups
        ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/streams/issues";
        description = "Various Haskell 2010 stream comonads";
        license = stdenv.lib.licenses.bsd3;
@@ -120979,6 +121341,7 @@ self: {
        homepage = "http://github.com/mikeizbicki/subhask";
        description = "Type safe interface for programming in subcategories of Hask";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "subnet" = callPackage
@@ -122684,8 +123047,8 @@ self: {
      }:
      mkDerivation {
        pname = "tagged-transformer";
-       version = "0.7.1";
-       sha256 = "1qgfx546pj4aqdblb4gddfxp642snn5dx4kxj3sn5q7c9lsgdh8j";
+       version = "0.8";
+       sha256 = "13jzfrzcgbh3g3qssv08r8i8j2l5c5y84blc1m90rhyyvx2zizn7";
        buildDepends = [
          base comonad contravariant distributive exceptions mtl reflection
          semigroupoids tagged
@@ -122880,15 +123243,12 @@ self: {
      }) {};
 
   "takahashi" = callPackage
-    ({ mkDerivation, base, mtl, reasonable-lens, reasonable-operational
-     }:
+    ({ mkDerivation, base, lens, monad-skeleton, mtl }:
      mkDerivation {
        pname = "takahashi";
-       version = "0.2.0.2";
-       revision = "1";
-       sha256 = "0iwwmb0przjjgfz9xav4whgqh09dq4ndil29dmq2bp81wryay0l4";
-       editedCabalFile = "907771d78ac3db503a9d832bae2dcc3a20d03a3a7698ff7769cb9e84703b27a1";
-       buildDepends = [ base mtl reasonable-lens reasonable-operational ];
+       version = "0.2.2.0";
+       sha256 = "0flr87m1yjxcv1r64bvrx1gm9dpp6xvj2lj14pi99pipywgw4kgs";
+       buildDepends = [ base lens monad-skeleton mtl ];
        description = "create slide for presentation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124565,8 +124925,8 @@ self: {
     ({ mkDerivation, base, binary, text }:
      mkDerivation {
        pname = "text-binary";
-       version = "0.2.0";
-       sha256 = "09njl6afnj2yjqn3mg3ry4qsd5jjjh51malk6kn2zzihldb9z5b2";
+       version = "0.2.1";
+       sha256 = "00paqwnngd9l88zhah9wqg4wr41mrs30xm49w8xq337yxcvz48nz";
        buildDepends = [ base binary text ];
        homepage = "https://github.com/kawu/text-binary";
        description = "Binary instances for text types";
@@ -124778,8 +125138,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-regex-replace";
-       version = "0.1.0.1";
-       sha256 = "1xnpfj1890l2zqqhr6b95qpqacpssi8qzgqgnpdxml8wfzan8xwl";
+       version = "0.1.1.0";
+       sha256 = "0p8xjw6srlb23giqrb3qay1hd1jq3gd9im0v7fnr8yifc0ri6piz";
        buildDepends = [ attoparsec base text text-icu ];
        testDepends = [ base hspec QuickCheck smallcheck text text-icu ];
        jailbreak = true;
@@ -124850,10 +125210,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-show-instances";
-       version = "2";
-       revision = "1";
-       sha256 = "1k9blq670jsph1jkrw01hf4k6ga8i3xy5nfs299xj17nni8hjci8";
-       editedCabalFile = "e0610e22ef001feb5271583c1719c2ebdef23ac4179deaabba23a21d6c2ac7b0";
+       version = "2.0.1";
+       sha256 = "1k5lwkfg8vrrmhm0xir1shplygvh2xki2dw13z56xrkkm8ygv3cx";
        buildDepends = [
          base base-compat bifunctors binary bytestring containers directory
          haskeline hoopl hpc old-locale old-time pretty random semigroups
@@ -124936,6 +125294,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-zipper" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "text-zipper";
+       version = "0.1.1";
+       sha256 = "0g8w7kyvqmjx4psj0cicv4bxn1ngx0giqyz8fyfhdr6v8wd9r410";
+       buildDepends = [ base text ];
+       description = "A text editor zipper library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "text1" = callPackage
     ({ mkDerivation, base, binary, directory, doctest, filepath, lens
      , QuickCheck, semigroups, template-haskell, text
@@ -127127,6 +127496,7 @@ self: {
          adjunctions base base-compat bytes containers distributive keys
          linear reflection semigroups vector
        ];
+       jailbreak = true;
        description = "Dense and sparse total maps";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -127183,20 +127553,17 @@ self: {
 
   "tpdb" = callPackage
     ({ mkDerivation, base, bytestring, containers, filepath, hashable
-     , HaXml, hxt, mtl, parsec, pretty, time, wl-pprint-text
+     , HaXml, hxt, mtl, parsec, pretty, text, time, wl-pprint-text
      }:
      mkDerivation {
        pname = "tpdb";
-       version = "1.1.1";
-       sha256 = "1wsjf7ds8xnfx4q3cjv5vwspyrvyq73439w9v4v3qrmmj5qcm7p9";
+       version = "1.2.0";
+       sha256 = "12l4a6p8jn03q71d3qi2zkv63k53brmha5hm6dwrp0sb8bv3qmb0";
        buildDepends = [
-         base containers filepath hashable HaXml hxt mtl parsec time
-         wl-pprint-text
-       ];
-       testDepends = [
-         base bytestring containers hashable HaXml hxt parsec pretty time
+         base containers filepath hashable HaXml hxt mtl parsec text time
          wl-pprint-text
        ];
+       testDepends = [ base bytestring HaXml pretty ];
        homepage = "https://github.com/jwaldmann/haskell-tpdb";
        description = "Data Type for Rewriting Systems";
        license = "GPL";
@@ -127448,6 +127815,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "transformers-lift" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "transformers-lift";
+       version = "0.1.0.0";
+       sha256 = "0fmd6v8a5r1x66v4cyb0adbajddm3mn1k43ryks01x1c3yw0p0sj";
+       buildDepends = [ base transformers ];
+       description = "Ad-hoc type classes for lifting";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "transformers-runnable" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -127924,8 +128302,8 @@ self: {
     ({ mkDerivation, base, comonad, free, mtl, transformers }:
      mkDerivation {
        pname = "tubes";
-       version = "0.2.2.1";
-       sha256 = "1zl7rnkind38a4ixxwq9qqxllrqi6aig6jnamda3r4nw1xh3ysxw";
+       version = "0.2.2.3";
+       sha256 = "0qmg2w4sjm0q1h6ajkv3i576zsi2ndbacjsn5sibcwjbdpkpwmdr";
        buildDepends = [ base comonad free mtl transformers ];
        homepage = "https://github.com/gatlin/tubes";
        description = "Effectful, iteratee-inspired stream processing based on a free monad";
@@ -129496,18 +129874,18 @@ self: {
 
   "uhttpc" = callPackage
     ({ mkDerivation, async, base, bytestring, bytestring-lexing
-     , cmdargs, deepseq, network
+     , deepseq, network, network-uri, optparse-applicative
      }:
      mkDerivation {
        pname = "uhttpc";
-       version = "0.1.0.0";
-       sha256 = "116x62yq51xb5z0ndvf0q42plw442lf275b0z2wyvcyl3m5mpmhd";
+       version = "0.1.1.0";
+       sha256 = "1knf8r8zq8nnidmbj1blazjxkpngczs55jjx0phnnxlc026ppynb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         async base bytestring bytestring-lexing cmdargs deepseq network
+         async base bytestring bytestring-lexing deepseq network network-uri
+         optparse-applicative
        ];
-       jailbreak = true;
        homepage = "https://github.com/hvr/uhttpc";
        description = "Minimal HTTP client library optimized for benchmarking";
        license = stdenv.lib.licenses.gpl3;
@@ -132105,6 +132483,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector_0_11_0_0" = callPackage
+    ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
+     , random, template-haskell, test-framework
+     , test-framework-quickcheck2, transformers
+     }:
+     mkDerivation {
+       pname = "vector";
+       version = "0.11.0.0";
+       sha256 = "1r1jlksy7b0kb0fy00g64isk6nyd9wzzdq31gx5v1wn38knj0lqa";
+       buildDepends = [ base deepseq ghc-prim primitive ];
+       testDepends = [
+         base QuickCheck random template-haskell test-framework
+         test-framework-quickcheck2 transformers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/haskell/vector";
+       description = "Efficient Arrays";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "vector-algorithms" = callPackage
     ({ mkDerivation, base, bytestring, containers, mtl, mwc-random
      , primitive, QuickCheck, vector
@@ -133175,8 +133573,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-extra";
-       version = "3.0.8.1";
-       sha256 = "0ay8cjxk8lplcdg2l89m9dprf6z6pcypljdsiwb17hkyiv36myl9";
+       version = "3.0.8.2";
+       sha256 = "0j6yvwzw1mpamx0phplgang4gcjv25dhqvngfmzmh5fk76npmxr9";
        buildDepends = [
          ansi-terminal base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -134409,6 +134807,7 @@ self: {
        homepage = "https://github.com/fpco/web-fpco";
        description = "Wrappers for web frameworks to ease usage with the FP Complete environment";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-mongrel2" = callPackage
@@ -134473,7 +134872,9 @@ self: {
      mkDerivation {
        pname = "web-routes";
        version = "0.27.9";
+       revision = "2";
        sha256 = "1azccgcnksz4c4pm1nayvjiq3m192zz21cnc0fm89hdixvqck346";
+       editedCabalFile = "542f5d20616359b0897018bbd347ce7f0dc948c4e031e8a5383ed85cb931406b";
        buildDepends = [
          base blaze-builder bytestring exceptions ghc-prim http-types mtl
          parsec split text utf8-string
@@ -135442,6 +135843,7 @@ self: {
        ];
        buildTools = [ c2hs ];
        extraLibraries = [ wlc ];
+       jailbreak = true;
        description = "Haskell bindings for the wlc library";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136275,6 +136677,7 @@ self: {
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "Utility for X509 certificate and chain";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x509-validation" = callPackage
@@ -138006,8 +138409,8 @@ self: {
      }:
      mkDerivation {
        pname = "yaml-light-lens";
-       version = "0.3.1.10";
-       sha256 = "1hpjzml8bw5n4lv82x3j6h8dzkz53mbhhsc7dhp79hwn75nq3aiz";
+       version = "0.3.3";
+       sha256 = "0apl8j5i8mbn1rqmv4wk5rhhh2zcpfqsh2q6d1sl798x96c72v8y";
        buildDepends = [
          base bytestring bytestring-lexing containers lens yaml-light
        ];
@@ -138141,6 +138544,7 @@ self: {
        homepage = "https://github.com/ony/yampa-glut";
        description = "Connects Yampa and GLUT";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yampa2048" = callPackage
@@ -138784,17 +139188,17 @@ self: {
      }) {};
 
   "yesod-crud" = callPackage
-    ({ mkDerivation, base, classy-prelude, containers, monad-control
-     , persistent, random, stm, uuid, yesod-core, yesod-form
-     , yesod-persistent
+    ({ mkDerivation, base, classy-prelude, containers, MissingH
+     , monad-control, persistent, random, safe, stm, uuid, yesod-core
+     , yesod-form, yesod-persistent
      }:
      mkDerivation {
        pname = "yesod-crud";
-       version = "0.1.1";
-       sha256 = "06m24i27842pc599zrmj5nv0afx8ci07961gjagdsc02zhpx7896";
+       version = "0.1.2";
+       sha256 = "0krjhskrjgymgp0nclggnivy03hmlvfy8c9d9ks4s14jw82rnhf1";
        buildDepends = [
-         base classy-prelude containers monad-control persistent random stm
-         uuid yesod-core yesod-form yesod-persistent
+         base classy-prelude containers MissingH monad-control persistent
+         random safe stm uuid yesod-core yesod-form yesod-persistent
        ];
        jailbreak = true;
        homepage = "https://github.com/league/yesod-crud";
@@ -139469,8 +139873,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-sass";
-       version = "0.1.0.0";
-       sha256 = "0faizfb44i52yijakfnazx86fs78vi9gnbiw2w42rh4r8gncjbvx";
+       version = "0.1.1.0";
+       sha256 = "19l93rx70xbyllwddyq0c8326cfqyvx13hpvj71k9mbwkis16ccx";
        buildDepends = [
          base data-default hsass shakespeare template-haskell text
          yesod-core
@@ -139562,8 +139966,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-static-angular";
-       version = "0.1.5";
-       sha256 = "0ddw307vd1zaknxc74y1k0hwg872y651snk1g72jqhbigcixl3ck";
+       version = "0.1.6";
+       sha256 = "17dqk60076la64n4j6bndg9ya16q764j2cl07s2dlldw4z1g4sn1";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -139575,7 +139979,7 @@ self: {
          base bytestring hamlet hspec HUnit shakespeare template-haskell
          text yesod-core yesod-static yesod-test
        ];
-       homepage = "https://bitbucket.org/wuzzeb/yesod-static-generators";
+       homepage = "https://bitbucket.org/wuzzeb/yesod-static-angular";
        description = "Yesod generators for embedding AngularJs code into yesod-static at compile time";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;

From 8b9c862ccde2fb9363b5fcca365dec1879a14293 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 13 Jul 2015 07:05:15 -0400
Subject: [PATCH 2193/2322] Don't try to build haddock for aeson-applicative.

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 +++
 1 file changed, 3 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 f2e0fb056e7..d7371c5b97b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -272,4 +272,7 @@ self: super: {
   # Won't work with LLVM 3.5.
   llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
 
+  # Inexplicable haddock failure
+  # https://github.com/gregwebs/aeson-applicative/issues/2
+  aeson-applicative = dontHaddock super.aeson-applicative;
 }

From 7f9cc5dc6112f896179594ea6c05b8d88d1f13db Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 14 Jul 2015 22:39:34 +0200
Subject: [PATCH 2194/2322] stellarium: build with qt5Full to fix run-time
 crashes

The build with the modularized qt expression succeeded, but the resulting binary
would crash immediately, complaining about the lack of a "qt.labs.shader" module.
This patch works around that issue.
---
 pkgs/applications/science/astronomy/stellarium/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 3af4b6e84b6..e77e848bed2 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt5, perl
-, libiconv }:
+{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt5Full, perl, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "stellarium-0.13.3";
@@ -9,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1ml6z2xda4vx61agdz54x8fw1b115gwc7rcy0zhz1jh6g5jvf0ij";
   };
 
-  buildInputs = [ cmake freetype libpng mesa gettext openssl qt5.base qt5.quick1 perl libiconv ];
+  buildInputs = [ cmake freetype libpng mesa gettext openssl perl libiconv qt5Full ];
 
   enableParallelBuilding = true;
 

From a932d14dd94d4ab629403629111ec10edefc74cd Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Tue, 14 Jul 2015 08:17:13 +0200
Subject: [PATCH 2195/2322] syncthing: 0.11.13 -> 0.11.15

---
 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 1a3430b128f..449886a5de4 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,12 +4,12 @@ with goPackages;
 
 buildGoPackage rec {
   name = "syncthing-${version}";
-  version = "0.11.13";
+  version = "0.11.15";
   goPackagePath = "github.com/syncthing/syncthing";
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "07045f4c24e546f4e8307acedeb5fe72b023db57bbf4d73b56d7fe2c75d694dc";
+    sha256 = "8afd0a0999c7d7d285f361589330421c00012da86ce91623c5ad6b96d8fb9695";
   };
 
   subPackages = [ "cmd/syncthing" ];

From 4f4fa581999fffe787882413f0cb5f00754bb2f2 Mon Sep 17 00:00:00 2001
From: Brandon Carrell <brandoncarrell@gmail.com>
Date: Tue, 14 Jul 2015 19:18:08 -0400
Subject: [PATCH 2196/2322] cassandra-1.2: Add package.

- Add myself to maintainers.
- Add package to all-packages.nix.
---
 lib/maintainers.nix                  |  1 +
 pkgs/servers/nosql/cassandra/1.2.nix | 52 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  1 +
 3 files changed, 54 insertions(+)
 create mode 100644 pkgs/servers/nosql/cassandra/1.2.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 73156ac0b25..0c76df9c044 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -35,6 +35,7 @@
   aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";
   balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@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>";
   bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>";
diff --git a/pkgs/servers/nosql/cassandra/1.2.nix b/pkgs/servers/nosql/cassandra/1.2.nix
new file mode 100644
index 00000000000..75992ceb9ef
--- /dev/null
+++ b/pkgs/servers/nosql/cassandra/1.2.nix
@@ -0,0 +1,52 @@
+{ stdenv
+, fetchurl
+, jre
+, python
+, makeWrapper
+, gawk
+, bash
+, getopt
+, procps
+}:
+
+let
+
+  version = "1.2.19";
+  sha256 = "0zkq3ggpk8ra2siar43vmrn6lmvn902p1g2lrgb46ak1vii6w30w";
+
+in
+
+stdenv.mkDerivation rec {
+  name = "cassandra-${version}";
+
+  src = fetchurl {
+    inherit sha256;
+    url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir $out
+    mv * $out
+
+    for cmd in cassandra nodetool sstablekeys sstableloader sstableupgrade
+      do wrapProgram $out/bin/$cmd \
+        --set JAVA_HOME ${jre} \
+        --prefix PATH : ${bash}/bin \
+        --prefix PATH : ${getopt}/bin \
+        --prefix PATH : ${gawk}/bin \
+        --prefix PATH : ${procps}/bin
+    done
+
+    wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = http://cassandra.apache.org/;
+    description = "A massively scalable open source NoSQL database";
+    platforms = with platforms; all;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ bcarrell ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b294e25929..1755ac2b673 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8798,6 +8798,7 @@ let
 
   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 = cassandra_2_1;

From e7fe54e80cb96d237ec58f791e940ff0900c6629 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 15 Jul 2015 09:52:03 +0900
Subject: [PATCH 2197/2322] oraclejdk: 8u45 -> 8u51

---
 pkgs/development/compilers/oraclejdk/jdk8-linux.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
index 014ed0db7c2..b92521a044a 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "45";
+  patchVersion = "51";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "1y1zymydd1azv14r0hh12zjr8k64wa8wfdbz8sn1css84aqwl87d";
-  sha256_x86_64 = "0v9ilahx03isxdzh4ryv1bqmmzppckickz22hvgzs785769cm67j";
+  sha256_i686 = "0awzgs090n2cj6a5mlla0pgxk0y6aslhm6024pqrnxgai1fkmm1z";
+  sha256_x86_64 = "1wggrcr2gjwkv5bawgcw86h6rhyzw0jphxm1sfwcvhjirh99056p";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";

From a42b2e5f8560feac487536098ce7bdee9334094c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 14 Jul 2015 22:58:17 +0200
Subject: [PATCH 2198/2322] netsniff-ng 0.5.9-21-g8c75168 -> 0.5.9-27-g3beaa23

Functional changes:
- trafgen: Print min packet size in error message
- flowtop man: Add note about activating netfilter connection tracking
- flowtop: Fix flows disappearing
- flowtop: Fix hanging while waiting for collector
---
 pkgs/tools/networking/netsniff-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index feeb505b4c5..fb289f640bb 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -2,7 +2,7 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-let version = "0.5.9-21-g8c75168"; in
+let version = "0.5.9-27-g3beaa23"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "8c75168ed5005f70955dd4ade93dec6abf481852";
-    sha256 = "10awwwmpm555wl1z07pz20cq1lsy37r36m0aamck9ri5vyq6fdzw";
+    rev = "3beaa23d4d33b51a392b56f110c8773151ac19cc";
+    sha256 = "0k6p57zynrs0ffnvrhbcnfkmvrj6ay2bxpj44ggm7bv327ckdzm7";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

From 94c94926f563c31e814e08b908f0382f2d6f7cad Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 15 Jul 2015 02:24:06 +0200
Subject: [PATCH 2199/2322] mksh 50d -> 51

R51 is a strongly recommended feature release.
Changes: <https://www.mirbsd.org/mksh.htm#clog>.

Release number changed to match Nix versioning rules ("R51" -> 51).

cc maintainer @AndersonTorres
---
 pkgs/shells/mksh/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index 28359bb555d..397b38180eb 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -1,17 +1,15 @@
 { stdenv, fetchurl, groff }:
 
-with stdenv.lib;
-stdenv.mkDerivation rec {
-
+let version = "51"; in
+stdenv.mkDerivation {
   name = "mksh-${version}";
-  version = "R50d";
 
   src = fetchurl {
     urls = [
-      "http://www.mirbsd.org/MirOS/dist/mir/mksh/${name}.tgz"
-      "http://pub.allbsd.org/MirOS/dist/mir/mksh/${name}.tgz"
+      "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
+      "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
     ];
-    sha256 = "10prcdffwziksq9sw96c1r09h4kg2zwznybrggzmjfa6l4k8h9m2";
+    sha256 = "1pyscl3w4aw067a5hb8mczy3z545jz1dwx9n2b09k09xydgsmvlz";
   };
 
   buildInputs = [ groff ];
@@ -31,7 +29,8 @@ stdenv.mkDerivation rec {
     install -D -m 644 dot.mkshrc $out/share/mksh/mkshrc
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
+    inherit version;
     description = "MirBSD Korn Shell";
     longDescription = ''
       The MirBSD Korn Shell is a DFSG-free and OSD-compliant (and OSI
@@ -41,7 +40,7 @@ stdenv.mkDerivation rec {
       systems.
     '';
     homepage = "https://www.mirbsd.org/mksh.htm";
-    license = stdenv.lib.licenses.free;
+    license = licenses.free;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.unix;
   };

From da9b997233e42db4e15fcb7381b06a1b22ab906d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 15 Jul 2015 02:37:11 +0200
Subject: [PATCH 2200/2322] libkeyfinder 0.11 -> 2.1

---
 .../libraries/libkeyfinder/default.nix          | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix
index f0e75b34059..12c360b3263 100644
--- a/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/pkgs/development/libraries/libkeyfinder/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, boost, fftw, qt5 }:
+{ stdenv, fetchFromGitHub, fftw, qt5 }:
 
-let version = "0.11"; in
+let version = "2.1"; in
 stdenv.mkDerivation {
   name = "libkeyfinder-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0674gykdi1nffvba5rv6fsp0zw02w1gkpn9grh8w983xf13ykbz9";
+    sha256 = "07kc0cl6kirgmpdgkgmp6r3yvyf7b1w569z01g8rfl1cig80qdc7";
     rev = "v${version}";
     repo = "libKeyFinder";
     owner = "ibsh";
@@ -21,10 +21,11 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ fftw qt5.base ];
-  propagatedBuildInputs = [ boost ];
 
-  patchPhase = ''
-    substituteInPlace LibKeyFinder.pro --replace "/usr/local" "$out"
+  postPatch = ''
+    substituteInPlace LibKeyFinder.pro \
+      --replace "/usr/local" "$out" \
+      --replace "-stdlib=libc++" ""
   '';
 
   configurePhase = ''
@@ -35,6 +36,8 @@ stdenv.mkDerivation {
 
   postInstall = ''
     mkdir -p $out/include/keyfinder
-    cp *.h $out/include/keyfinder
+    install -m644 *.h $out/include/keyfinder
+    mkdir -p $out/lib
+    cp -a lib*.so* $out/lib
   '';
 }

From 82cac9f9acfd5c6fefd84b20c9ad07677cb1c43a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 15 Jul 2015 03:00:19 +0200
Subject: [PATCH 2201/2322] keyfinder 1.16 -> 2.00

---
 pkgs/applications/audio/keyfinder/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix
index d3438e1ada4..edbedb1c013 100644
--- a/pkgs/applications/audio/keyfinder/default.nix
+++ b/pkgs/applications/audio/keyfinder/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qt5, taglib }:
 
-let version = "1.26"; in
+let version = "2.00"; in
 stdenv.mkDerivation {
   name = "keyfinder-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1sfnywc6jdpm03344i6i4pz13mqa4i5agagj4k6252m63cqmjkrc";
+    sha256 = "16gyvvws93fyvx5qb2x9qhsg4bn710kgdh6q9sl2dwfsx6npkh9m";
     rev = version;
     repo = "is_KeyFinder";
     owner = "ibsh";
@@ -32,10 +32,14 @@ stdenv.mkDerivation {
   # TODO: upgrade libav when "Audio sample format conversion failed" is fixed
   buildInputs = [ libav_0_8 libkeyfinder qt5.base qt5.xmlpatterns taglib ];
 
-  configurePhase = ''
+  postPatch = ''
     substituteInPlace is_KeyFinder.pro \
        --replace "keyfinder.0" "keyfinder" \
-       --replace '$$[QT_INSTALL_PREFIX]' "$out"
+       --replace '$$[QT_INSTALL_PREFIX]' "$out" \
+       --replace "-stdlib=libc++" ""
+  '';
+
+  configurePhase = ''
     qmake
   '';
 

From 828f9ea8ccca208eb949d0f062ecc23717739510 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 15 Jul 2015 03:12:11 +0200
Subject: [PATCH 2202/2322] keyfinder-cli: use old libkeyfinder 0.11 "for now"

The tool doesn't compile against versions 2.x.
Also, fix the incorrect version number & use src.meta.homepage.
---
 .../audio/keyfinder-cli/default.nix           |  9 +++--
 .../libraries/libkeyfinder/0.11.nix           | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/libkeyfinder/0.11.nix

diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix
index 1f008e56c15..d5de42f6a6e 100644
--- a/pkgs/applications/audio/keyfinder-cli/default.nix
+++ b/pkgs/applications/audio/keyfinder-cli/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, libav, libkeyfinder }:
+{ stdenv, fetchFromGitHub, libav, libkeyfinder_0_11 }:
 
-let version = "20150130"; in
+let version = "20150201"; in
 stdenv.mkDerivation rec {
   name = "keyfinder-cli-${version}";
 
@@ -12,19 +12,20 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
+    inherit version;
+    inherit (src.meta) homepage;
     description = "Musical key detection for digital audio (command-line tool)";
     longDescription = ''
       This small utility is the automation-oriented DJ's best friend. By making
       use of Ibrahim Sha'ath's high quality libKeyFinder library, it can be
       used to estimate the musical key of many different audio formats.
     '';
-    homepage = https://github.com/EvanPurkhiser/keyfinder-cli;
     license = licenses.gpl3Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ libav libkeyfinder ];
+  buildInputs = [ libav libkeyfinder_0_11 ];
 
   makeFlagsArray = "PREFIX=$(out)";
 
diff --git a/pkgs/development/libraries/libkeyfinder/0.11.nix b/pkgs/development/libraries/libkeyfinder/0.11.nix
new file mode 100644
index 00000000000..f0e75b34059
--- /dev/null
+++ b/pkgs/development/libraries/libkeyfinder/0.11.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, boost, fftw, qt5 }:
+
+let version = "0.11"; in
+stdenv.mkDerivation {
+  name = "libkeyfinder-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "0674gykdi1nffvba5rv6fsp0zw02w1gkpn9grh8w983xf13ykbz9";
+    rev = "v${version}";
+    repo = "libKeyFinder";
+    owner = "ibsh";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Musical key detection for digital audio (C++ library)";
+    homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
+    license = licenses.gpl3Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ fftw qt5.base ];
+  propagatedBuildInputs = [ boost ];
+
+  patchPhase = ''
+    substituteInPlace LibKeyFinder.pro --replace "/usr/local" "$out"
+  '';
+
+  configurePhase = ''
+    qmake
+  '';
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    mkdir -p $out/include/keyfinder
+    cp *.h $out/include/keyfinder
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b294e25929..dca528a4fdd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7098,6 +7098,7 @@ let
 
   libkate = callPackage ../development/libraries/libkate { };
 
+  libkeyfinder_0_11 = callPackage ../development/libraries/libkeyfinder/0.11.nix { };
   libkeyfinder = callPackage ../development/libraries/libkeyfinder { };
 
   libksba = callPackage ../development/libraries/libksba { };

From 90938a3264a8e64a24a3384f70e9f57dadc8791a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 15 Jul 2015 05:16:06 +0300
Subject: [PATCH 2203/2322] numix-icon-theme: Don't use fetchurl on dynamically
 generated GitHub tarballs

Use fetchFromGitHub instead. As a bonus, unzip isn't needed anymore.
---
 pkgs/data/icons/numix-icon-theme/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index d6ca570ba52..54d4e06be28 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   version = "2c11fbfcee";
 
   package-name = "numix-icon-theme";
-  
+
   name = "${package-name}-20150302";
 
-  buildInputs = [ unzip ];
-  
-  src = fetchurl {
-    url = "https://github.com/numixproject/${package-name}/archive/${version}.zip";
-    sha256 = "61dc170b8a70b20a9075f06e1668d6bd8907a6db0ef9e3568c473296d0f351e1";
+  src = fetchFromGitHub {
+    owner = "numixproject";
+    repo = package-name;
+    rev = version;
+    sha256 = "1bjh2j4vqk9s31syv7ig3hwpp5z0n6sx74iz332y0wdz6ngj5x08";
   };
 
   dontBuild = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     install -dm 755 $out/share/icons
     cp -dr --no-preserve='ownership' Numix{,-Light} $out/share/icons/
   '';
-  
+
   meta = {
     description = "Numix icon theme";
     homepage = https://numixproject.org;

From 6f9cc87bf5a089b35080b3a8e8c6e662bfeb04b5 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 15 Jul 2015 10:13:58 +0200
Subject: [PATCH 2204/2322] diffpdf: fix icon

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

diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix
index 88952f5eb76..aefa4f755b8 100644
--- a/pkgs/applications/misc/diffpdf/default.nix
+++ b/pkgs/applications/misc/diffpdf/default.nix
@@ -26,16 +26,18 @@ stdenv.mkDerivation rec {
     install -Dpm755 -D diffpdf $out/bin/diffpdf
     install -Dpm644 -D diffpdf.1 $out/share/man/man1/diffpdf.1
 
-    install -dpm755 $out/share/doc/${name} $out/share/licenses/${name} $out/share/pixmaps $out/share/applications
+    install -dpm755 $out/share/doc/${name} $out/share/licenses/${name} $out/share/icons $out/share/pixmaps $out/share/applications
     install -Dpm644 CHANGES README help.html $out/share/doc/${name}/
     install -Dpm644 gpl-2.0.txt $out/share/licenses/${name}/
-    install -Dpm644 images/icon.png $out/share/pixmaps/${name}.png
+    install -Dpm644 images/icon.png $out/share/icons/diffpdf.png
+    install -Dpm644 images/icon.png $out/share/pixmaps/diffpdf.png
 
     cat > $out/share/applications/diffpdf.desktop <<EOF
     [Desktop Entry]
     Type=Application
     Version=1.0
     Name=diffpdf
+    Icon=diffpdf
     Comment=PDF diffing tool
     Exec=$out/bin/diffpdf
     Terminal=false

From e0da9ec935d4c2ed36ef8be312c36a1636dcf884 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Wed, 15 Jul 2015 10:13:16 +0200
Subject: [PATCH 2205/2322] tpmmanager: init at 0.8.1

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

diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix
new file mode 100644
index 00000000000..85a1c72b349
--- /dev/null
+++ b/pkgs/applications/misc/tpmmanager/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchgit, qt4, trousers }:
+
+stdenv.mkDerivation rec {
+  version = "0.8.1";
+  name = "tpmmanager-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/Sirrix-AG/TPMManager";
+    rev = "9f989206635a6d2c1342576c90fa73eb239519cd";
+    sha256 = "24a606f88fed67ed0d0e61dc220295e9e1ab8db3ef3d028fa34b04ff30652d8e";
+  };
+
+  buildInputs = [ qt4 trousers ];
+
+  preBuild = ''
+    qmake -makefile PREFIX=\$out
+    '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -Dpm755 -D bin/tpmmanager $out/bin/tpmmanager
+
+    mkdir -p $out/share/applications
+    cat > $out/share/applications/tpmmanager.desktop <<EOF
+    [Desktop Entry]
+    Type=Application
+    Version=1.0
+    Name=tpmmanager
+    Comment=TPM manager
+    Exec=$out/bin/tpmmanager
+    Terminal=false
+    EOF
+    '';
+
+  meta = {
+    homepage = https://projects.sirrix.com/trac/tpmmanager;
+    description = "Tool for managing the TPM";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
+    platforms = with stdenv.lib.platforms; linux;
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 139f655110c..20cbf371823 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3114,6 +3114,8 @@ let
 
   torsocks = callPackage ../tools/security/tor/torsocks.nix { };
 
+  tpmmanager = callPackage ../applications/misc/tpmmanager { };
+
   tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { };
 
   tpm-tools = callPackage ../tools/security/tpm-tools { };

From 127300a51d8776dc0118065004443959c7722aee Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sat, 11 Jul 2015 13:50:24 +0200
Subject: [PATCH 2206/2322] tpm-luks: update -> git-2015-07-11

---
 pkgs/tools/security/tpm-luks/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix
index eda86a4a97f..70dbc65040d 100644
--- a/pkgs/tools/security/tpm-luks/default.nix
+++ b/pkgs/tools/security/tpm-luks/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "tpm-luks-${version}";
-  version = "0.9pre";
+  version = "git-2015-07-11";
 
   src = fetchgit {
-    url = "https://github.com/shpedoikal/tpm-luks/";
-    rev = "3fa3ea4bbd34b5b02e9271e775a338fa49dc834f";
-    sha256 = "37a56f05ad492d3128b07b3cb9dbf85ba8a0dd791329323fb398eb1026dfc89c";
+    url = "https://github.com/momiji/tpm-luks";
+    rev = "c9c5b7fdddbcdac1cd4d2ea6baddd0617cc88ffa";
+    sha256 = "fdd451caddb4e51ede3f2406245e1ace57389596e85aa402c9f2606303707539";
   };
 
   buildInputs = [ autoreconfHook gawk trousers cryptsetup openssl ];

From c930bf1f36b54f9fdf12459fb58c4b1ebad67d6a Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 15 Jul 2015 10:18:14 +0200
Subject: [PATCH 2207/2322] motuclient: init at 1.0.8

---
 pkgs/top-level/all-packages.nix    |  2 ++
 pkgs/top-level/python-packages.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dca528a4fdd..e7321e2211b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2215,6 +2215,8 @@ let
     inherit (perlPackages) IOTty;
   };
 
+  motuclient = python27Packages.motuclient;
+
   mpage = callPackage ../tools/text/mpage { };
 
   mr = callPackage ../applications/version-management/mr { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 119b06e1f42..e73af3ba413 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3839,6 +3839,32 @@ let
     };
   };
 
+  motuclient = buildPythonPackage rec {
+    name = "motu-client-${version}";
+    version = "1.0.8";
+
+    namePrefix = "";
+    disabled = !isPy27;
+
+    src = pkgs.fetchurl {
+      url = "https://gitlab.com/lsix/motu-client/repository/archive.tar.gz?ref=${name}";
+      sha256 = "1d2hbws085hxf5hb1wsdlacy8skwn2sswr1b2xv18fbw5ckbqi8i";
+    };
+
+    meta = {
+      homepage = https://gitlab.com/lsix/motu-client;
+      description = "CLI to query oceanographic data to Motu servers";
+      longDescription = ''
+        Access data from (motu)[http://sourceforge.net/projects/cls-motu/] servers.
+        This is a refactored fork of the original release in order to simplify integration,
+        deployment and packaging. Upstream code can be found at
+        http://sourceforge.net/projects/cls-motu/ .
+      '';
+      license = licenses.lgpl3Plus;
+      maintainers = [ maintainers.lsix ];
+    };
+  };
+
   mwlib-ext = buildPythonPackage rec {
     version = "0.13.2";
     name = "mwlib.ext-${version}";

From 82d2960f15942bdf8594a400d70ca907e5b23647 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 15 Jul 2015 10:29:51 +0200
Subject: [PATCH 2208/2322] libusb1: fix on darwin

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

diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 160e53714fb..5fb9d5460ac 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
-  preFixup = ''
+  preFixup = stdenv.lib.optionalString stdenv.isLinux ''
     sed 's,-ludev,-L${udev}/lib -ludev,' -i $out/lib/libusb-1.0.la
   '';
 

From 90cad1bc0cf785dd3a1a74e1308122ff3c74ae52 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Thu, 9 Jul 2015 16:27:10 +0200
Subject: [PATCH 2209/2322] cbfstool: init at git-2015-07-09

---
 .../virtualization/cbfstool/default.nix       | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/virtualization/cbfstool/default.nix

diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/applications/virtualization/cbfstool/default.nix
new file mode 100644
index 00000000000..d99f569d7e6
--- /dev/null
+++ b/pkgs/applications/virtualization/cbfstool/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchgit, iasl, flex, bison }:
+
+stdenv.mkDerivation rec {
+  name = "cbfstool-${version}";
+  version = "git-2015-07-09";
+
+  src = fetchgit {
+    url = "http://review.coreboot.org/p/coreboot";
+    rev = "5d866213f42fd22aed80abb5a91d74f6d485ac3f";
+    sha256 = "148155829jbabsgg1inmcpqmwbg0fgp8a685bzybv9j4ibasi0z2";
+  };
+
+  buildInputs = [ iasl flex bison ];
+
+  buildPhase = ''
+    export LEX=${flex}/bin/flex
+    make -C util/cbfstool
+    '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp util/cbfstool/cbfstool $out/bin
+    cp util/cbfstool/fmaptool $out/bin
+    cp util/cbfstool/rmodtool $out/bin
+    '';
+
+  meta = with stdenv.lib; {
+    description = "CBFS tool";
+    homepage = http://www.coreboot.org;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.tstrobel ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 139f655110c..deab02ff389 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9061,6 +9061,8 @@ let
 
   seabios = callPackage ../applications/virtualization/seabios { };
 
+  cbfstool = callPackage ../applications/virtualization/cbfstool { };
+
   pgpool92 = pgpool.override { postgresql = postgresql92; };
   pgpool93 = pgpool.override { postgresql = postgresql93; };
   pgpool94 = pgpool.override { postgresql = postgresql94; };

From 369febb9569bdd3ddb76d8de2db6e27441d13e9f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 15 Jul 2015 01:58:02 -0700
Subject: [PATCH 2210/2322] btrfsprogs: 4.1.1 -> 4.1.2

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

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 95b34ed8960..a9f507ec7f1 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -2,14 +2,14 @@
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
 }:
 
-let version = "4.1.1"; in
+let version = "4.1.2"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "1d01f2i5fnnhkp184kfv8b9l37v1dmvqwqr22k71x6k2ss7nkwmp";
+    sha256 = "04ig3gbfq0zccyqrcrl21g1kp1snqxaflb0i09izp2l6l3361nv2";
   };
 
   buildInputs = [

From a643e25286ee390cf2ccec91710283405c60255c Mon Sep 17 00:00:00 2001
From: lostdj <lostdj@gmail.com>
Date: Wed, 15 Jul 2015 13:08:53 +0300
Subject: [PATCH 2211/2322] SmartGitHg: 6.5.7 -> 6.5.9

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

diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index f2a2fadae8c..ccea8ffb3f2 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  the_version = "6_5_7";
+  the_version = "6_5_9";
 
 in
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "http://www.syntevo.com/downloads/smartgit/" +
           "smartgit-generic-${the_version}.tar.gz";
-    sha256 = "0db4dxp0dl173z9r8n25zdl1il240p751d2f77cw0nmyibik7q4l";
+    sha256 = "09bvx1jgaqfxg8qv9f306bgh3k057shsi2xllxv1vw3xf0pvkbwa";
   };
 
   buildInputs = [

From 0b9f605a2dab388259d593195429c47dbcc5641b Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Wed, 15 Jul 2015 08:08:46 -0300
Subject: [PATCH 2212/2322] Mednafen: Updates

Mednafen: 0.9.36.4 -> 0.9.38.5
Server: 0.5.1 -> 0.5.2
---
 pkgs/misc/emulators/mednafen/default.nix | 4 ++--
 pkgs/misc/emulators/mednafen/server.nix  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
index e87ac98c838..825968c6163 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   name = "mednafen-${version}";
-  version = "0.9.36.4";
+  version = "0.9.38.5";
 
   src = fetchurl {
     url = "http://downloads.sourceforge.net/project/mednafen/Mednafen/${version}/${name}.tar.bz2";
-    sha256 = "0s6dhdar6y64fah2ij98a9gskm0rzcbqdbksicnba8cakc87nsfy";
+    sha256 = "1s1qwwlhkxr0vhzvlc1m0ib9lj7cws3cldm2mbjz4b421nxfdi8h";
   };
 
   buildInputs = with stdenv.lib;
diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix
index ce361ef9fbc..60e458222d3 100644
--- a/pkgs/misc/emulators/mednafen/server.nix
+++ b/pkgs/misc/emulators/mednafen/server.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "mednafen-server-${version}";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchurl {
     url = "http://downloads.sourceforge.net/project/mednafen/Mednafen-Server/${version}/${name}.tar.gz";
-    sha256="0c5wvg938y3h4n5lb0dl8pvmjzphhkbba34r6ikpvdahq166ps4j";
+    sha256="06fal6hwrb8gw94yp7plhcz55109128cgp35m7zs5vvjf1zfhcs9";
   };
 
   postInstall = ''

From 8506dfdd801ec68f99fed8235aea8ae3fe7924ee Mon Sep 17 00:00:00 2001
From: Tom Dimiduk <tom@dimiduk.net>
Date: Wed, 15 Jul 2015 08:18:19 -0400
Subject: [PATCH 2213/2322] Update stripe-haskell to a working version (1.4 had
 broken tests which was stopping it from installing)

---
 pkgs/development/haskell-modules/hackage-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c62f9071c5f..86a98e6f3f4 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -121097,8 +121097,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-haskell";
-       version = "0.1.4.0";
-       sha256 = "09s699h2b641bakcgf3f2cwdqb4qb37b4y31vpcq3k8pkbmhy8sf";
+       version = "0.1.4.1";
+       sha256 = "a0ffc70616d4eb86a9e0e0fcb1751cc48f3b6f618d07cf2bb96090276d64d218";
        buildDepends = [
          aeson base bytestring either HsOpenSSL http-streams io-streams mtl
          random text time transformers unordered-containers

From 517451df97573940f987ac1962a21a98a9529716 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Wed, 15 Jul 2015 09:28:13 -0300
Subject: [PATCH 2214/2322] FS-UAE: 2.4.1 -> 2.4.3

---
 pkgs/misc/emulators/fs-uae/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix
index 545691fa4d0..89f4e2338b4 100644
--- a/pkgs/misc/emulators/fs-uae/default.nix
+++ b/pkgs/misc/emulators/fs-uae/default.nix
@@ -5,11 +5,11 @@ with stdenv.lib;
 stdenv.mkDerivation rec{
 
   name = "fs-uae-${version}";
-  version = "2.4.1";
+  version = "2.4.3";
 
   src = fetchurl {
     urls = [ "http://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz" ];
-    sha256 = "05gvnrkl1aclq1a6z57k6rmdnsg2ghyjcscwq0w5dhc5vcalv6f0";
+    sha256 = "05wngvpqj8kj4wzi5jzzhvs19iljb3m6ba1l2hk4rz68b400ndv6";
   };
 
   buildInputs = [ pkgconfig gettext gtk SDL zlib glib openal mesa lua freetype ];
@@ -33,3 +33,5 @@ stdenv.mkDerivation rec{
     maintainers = [ maintainers.AndersonTorres ];
   };
 }
+# TODO: testing and Python GUI support
+# TODO: SDL2 support

From b9c32340a7467dca7a01856af55ad06b02cb8934 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 15 Jul 2015 12:23:35 +0200
Subject: [PATCH 2215/2322] Gnuradio: 3.7.5.1 -> 3.7.7.1.

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

diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index 888d39c3732..a5cc1ae0932 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnuradio-${version}";
-  version = "3.7.5.1";
+  version = "3.7.7.1";
 
   src = fetchurl {
     url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz";
-    sha256 = "0gg4i8s1z5pcfk8d7n7baxv3lx2cjcizimvbziraj27lcbvpmwar";
+    sha256 = "0kjqav1rdyi60vq85djmigyrgh606ga625icwj15iarlqwzv29rb";
   };
 
   buildInputs = [

From 022527a5e1b2b63e94cacb8a73397d3d9066010b Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 15 Jul 2015 12:24:03 +0200
Subject: [PATCH 2216/2322] Gnuradio: Add gnuradio-wrapper and gnuradio-full.

gnuradio-wrapper is a simple derivation wrapping $(gnuradio)/bin/* to
make other blocks (from `extraPackages') available.

gnuradio-full uses gnuradio-wrapper to build gnuradio with blocks from
gnuradio-osmosdr (therefore allowing the use of rtl-sdr, hackrf, the
ccc-camp2015 badge, and similar).
---
 pkgs/applications/misc/gnuradio/wrapper.nix | 23 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  6 ++++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/misc/gnuradio/wrapper.nix

diff --git a/pkgs/applications/misc/gnuradio/wrapper.nix b/pkgs/applications/misc/gnuradio/wrapper.nix
new file mode 100644
index 00000000000..cc8dbde273b
--- /dev/null
+++ b/pkgs/applications/misc/gnuradio/wrapper.nix
@@ -0,0 +1,23 @@
+{ stdenv, gnuradio, makeWrapper, python
+, extraPackages ? [] }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation {
+  name = (appendToName "with-packages" gnuradio).name;
+  buildInputs = [ makeWrapper python ];
+
+  buildCommand = ''
+    mkdir -p $out/bin
+    ln -s "${gnuradio}"/bin/* $out/bin/
+
+    for file in "$out"/bin/*; do
+        wrapProgram "$file" \
+            --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":"
+                                      (map (path: "$(toPythonPath ${path})") extraPackages)} \
+            --prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages}
+    done
+
+  '';
+  inherit (gnuradio) meta;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index acfc7525f5e..4a0d25cd157 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11309,6 +11309,12 @@ let
     fftw = fftwFloat;
   };
 
+  gnuradio-wrapper = callPackage ../applications/misc/gnuradio/wrapper.nix { };
+
+  gnuradio-full = gnuradio-wrapper.override {
+    extraPackages = [ gnuradio-osmosdr ];
+  };
+
   gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { };
 
   goldendict = callPackage ../applications/misc/goldendict { };

From 2926f3aa2c18549b8ce895b4056d48598d78d0ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 13 Jul 2015 22:58:03 +0200
Subject: [PATCH 2217/2322] fgallery: init at 1.7

fgallery is a static photo gallery generator.

http://www.thregr.org/~wavexx/software/fgallery/
---
 pkgs/tools/graphics/fgallery/default.nix | 48 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  4 ++
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/tools/graphics/fgallery/default.nix

diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix
new file mode 100644
index 00000000000..4b0531aa1ce
--- /dev/null
+++ b/pkgs/tools/graphics/fgallery/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, unzip, makeWrapper, perl, ImageExifTool, JSON
+, coreutils, zip, imagemagick, pngcrush, lcms2, fbida
+}:
+
+# TODO: add optional dependencies (snippet from fgallery source):
+#
+# if(system("jpegoptim -V >/dev/null 2>&1")) {
+#   $jpegoptim = 0;
+# }
+# if($facedet && system("facedetect -h >/dev/null 2>&1")) {
+#   fatal("cannot run \"facedetect\" (see http://www.thregr.org/~wavexx/hacks/facedetect/)");
+
+stdenv.mkDerivation rec {
+  name = "fgallery-1.7";
+
+  src = fetchurl {
+    url = "http://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip";
+    sha256 = "1iix6p8viwnsq3zn9vg99sx20nmgk2p5als3j1lk914nz3anvai4";
+  };
+
+  buildInputs = [ unzip makeWrapper perl ImageExifTool JSON ];
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    mkdir -p "$out/share/fgallery"
+
+    cp -r * "$out/share/fgallery"
+    ln -s -r "$out/share/fgallery/fgallery" "$out/bin/fgallery"
+
+    # Don't preserve file attributes when copying files to output directories.
+    # (fgallery copies parts of itself to each output directory, and without
+    # this change the read-only nix store causes some bumps in the workflow.)
+    sed -i -e "s|'cp'|'cp', '--no-preserve=all'|g" "$out/share/fgallery/fgallery"
+
+    wrapProgram "$out/share/fgallery/fgallery" \
+        --set PERL5LIB "$PERL5LIB" \
+        --set PATH "${stdenv.lib.makeSearchPath "bin"
+                     [ coreutils zip imagemagick pngcrush lcms2 fbida ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Static photo gallery generator";
+    homepage = http://www.thregr.org/~wavexx/software/fgallery/;
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a0d25cd157..616f3f918e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1454,6 +1454,10 @@ let
 
   fdm = callPackage ../tools/networking/fdm {};
 
+  fgallery = callPackage ../tools/graphics/fgallery {
+    inherit (perlPackages) ImageExifTool JSON;
+  };
+
   flannel = callPackage ../tools/networking/flannel { };
 
   flashbench = callPackage ../os-specific/linux/flashbench { };

From ae2b537d68b511165792c5e16aa4a750b03abc28 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Wed, 15 Jul 2015 14:36:58 +0000
Subject: [PATCH 2218/2322] update django minor versions (including security
 fixes)

---
 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 e73af3ba413..45de46ef679 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4904,12 +4904,12 @@ let
 
   django_1_8 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.8";
+    version = "1.8.3";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
-      sha256 = "04mlx3920r46vn69alrf4bmv1xqp7m6k1xzwgr798rjcrd1assq6";
+      sha256 = "1fjv63rdm45j5057zb7qj4ya4pjwig1jpbwcr0bk1mazq3y59dib";
     };
 
     # error: invalid command 'test'
@@ -4929,12 +4929,12 @@ let
 
   django_1_7 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.7.7";
+    version = "1.7.9";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz";
-      sha256 = "0crfpnf246c25887by2fjlxinp4rnhya4ksqfydcls9m0s9gh5j8";
+      sha256 = "0q3q46yjjsqwp0ywrkbqwiac13rdvzrd5dchdbnzh3yjwpj9ygsg";
     };
 
     # error: invalid command 'test'
@@ -4999,11 +4999,11 @@ let
 
   django_1_4 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.4.20";
+    version = "1.4.21";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz";
-      sha256 = "1cgb23afinmbvbaryvy3yj5m40h68mq6gvadcqyv3j64cja73b2q";
+      sha256 = "1x5wk3yh6ydbp4sgsxl4qjmdvcazphwkmmm99lfdb04645sijkwk";
     };
 
     # error: invalid command 'test'

From d68d929291072fe654eb4880b7bb0e3497e19f94 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 15 Jul 2015 18:19:46 +0200
Subject: [PATCH 2219/2322] dtach: fix CVE-2012-3368

---
 pkgs/tools/misc/dtach/default.nix             |  2 +
 pkgs/tools/misc/dtach/fix-CVE-2012-3368.patch | 49 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/tools/misc/dtach/fix-CVE-2012-3368.patch

diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix
index 7ceecc3690a..000f6cd0f93 100644
--- a/pkgs/tools/misc/dtach/default.nix
+++ b/pkgs/tools/misc/dtach/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "16614ebddf8ab2811d3dc0e7f329c7de88929ac6a9632d4cb4aef7fe11b8f2a9";
   };
 
+  patches = [ ./fix-CVE-2012-3368.patch ];
+
   installPhase = ''
     mkdir -p $out/bin
     cp dtach $out/bin/dtach
diff --git a/pkgs/tools/misc/dtach/fix-CVE-2012-3368.patch b/pkgs/tools/misc/dtach/fix-CVE-2012-3368.patch
new file mode 100644
index 00000000000..9e556d9325f
--- /dev/null
+++ b/pkgs/tools/misc/dtach/fix-CVE-2012-3368.patch
@@ -0,0 +1,49 @@
+Fix error handling for read from stdin in attach.c
+
+attach.c did not correctly handle a read from stdin when read returned
+an error. The code assigned the return value of read to pkt.len (an
+unsigned char) before checking the value. This prevented the error check
+from working correctly, since an unsigned integer can never be < 0.
+
+A packet with an invalid length was then sent to the master, which then
+sent 255 bytes of garbage to the program.
+
+Fix the bug in attach.c and the unchecked packet length bug in master.c.
+
+Report and initial patch by Enrico Scholz.
+
+--- a/master.c	2012/07/01 21:26:10	1.14
++++ b/master.c	2012/07/01 21:44:34	1.15
+@@ -351,7 +351,10 @@
+ 
+ 	/* Push out data to the program. */
+ 	if (pkt.type == MSG_PUSH)
+-		write(the_pty.fd, pkt.u.buf, pkt.len);
++	{
++		if (pkt.len <= sizeof(pkt.u.buf))
++			write(the_pty.fd, pkt.u.buf, pkt.len);
++	}
+ 
+ 	/* Attach or detach from the program. */
+ 	else if (pkt.type == MSG_ATTACH)
+--- a/attach.c	2012/07/01 21:26:10	1.12
++++ b/attach.c	2012/07/01 21:44:34	1.13
+@@ -237,12 +237,16 @@
+ 		/* stdin activity */
+ 		if (n > 0 && FD_ISSET(0, &readfds))
+ 		{
++			ssize_t len;
++
+ 			pkt.type = MSG_PUSH;
+ 			memset(pkt.u.buf, 0, sizeof(pkt.u.buf));
+-			pkt.len = read(0, pkt.u.buf, sizeof(pkt.u.buf));
++			len = read(0, pkt.u.buf, sizeof(pkt.u.buf));
+ 
+-			if (pkt.len <= 0)
++			if (len <= 0)
+ 				exit(1);
++
++			pkt.len = len;
+ 			process_kbd(s, &pkt);
+ 			n--;
+ 		}

From 1c5c4e91d7bccd436182ad71f4a59fcf8caa07c9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 15 Jul 2015 19:40:56 +0200
Subject: [PATCH 2220/2322] pypy: fix build (ZHF)

---
 pkgs/development/interpreters/pypy/default.nix    | 15 ++++++++++++---
 pkgs/development/interpreters/pypy/setup-hook.sh  |  4 ++--
 .../python-modules/setuptools/default.nix         |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix
index a453fd3e1a9..0ff1c431719 100644
--- a/pkgs/development/interpreters/pypy/default.nix
+++ b/pkgs/development/interpreters/pypy/default.nix
@@ -49,16 +49,25 @@ let
         --replace "libraries=['curses']" "libraries=['ncurses']"
 
       # tkinter hints
-      substituteInPlace lib_pypy/_tkinter/tklib.py \
+      substituteInPlace lib_pypy/_tkinter/tklib_build.py \
         --replace "'/usr/include/tcl'" "'${tk}/include', '${tcl}/include'" \
-        --replace "linklibs=['tcl', 'tk']" "linklibs=['${tcl.libPrefix}', '${tk.libPrefix}']" \
+        --replace "linklibs = ['tcl' + _ver, 'tk' + _ver]" "linklibs=['${tcl.libPrefix}', '${tk.libPrefix}']" \
         --replace "libdirs = []" "libdirs = ['${tk}/lib', '${tcl}/lib']"
 
-      sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']@" lib_pypy/_sqlite3.py
+      sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']@" lib_pypy/_sqlite3_build.py
     '';
 
     setupHook = ./setup-hook.sh;
 
+    postBuild = ''
+      cd ./lib_pypy
+        ../pypy-c ./_audioop_build.py
+        ../pypy-c ./_curses_build.py
+        ../pypy-c ./_sqlite3_build.py
+        ../pypy-c ./_tkinter/tklib_build.py
+      cd ..
+    '';
+
     doCheck = true;
     checkPhase = ''
        export TERMINFO="${ncurses}/share/terminfo/";
diff --git a/pkgs/development/interpreters/pypy/setup-hook.sh b/pkgs/development/interpreters/pypy/setup-hook.sh
index 057e619ebc8..c82179d9e87 100644
--- a/pkgs/development/interpreters/pypy/setup-hook.sh
+++ b/pkgs/development/interpreters/pypy/setup-hook.sh
@@ -1,12 +1,12 @@
 addPythonPath() {
-    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.5/site-packages
+    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.6/site-packages
 }
 
 toPythonPath() {
     local paths="$1"
     local result=
     for i in $paths; do
-        p="$i/lib/pypy2.5/site-packages"
+        p="$i/lib/pypy2.6/site-packages"
         result="${result}${result:+:}$p"
     done
     echo $result
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 01fe4668679..5db34a9d49d 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     ''
       dst=$out/lib/${python.libPrefix}/site-packages
       mkdir -p $dst
-      PYTHONPATH="$dst:$PYTHONPATH"
+      export PYTHONPATH="$dst:$PYTHONPATH"
       ${python}/bin/${python.executable} setup.py install --prefix=$out --install-lib=$out/lib/${python.libPrefix}/site-packages
       wrapPythonPrograms
     '';

From 1e2718ed51c830928dcdd416ffd6f2b023dfc86a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 15 Jul 2015 12:25:21 -0700
Subject: [PATCH 2221/2322] lsof: 4.88 -> 4.89

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

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index af9145bc409..53bbcf22842 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -1,11 +1,12 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "lsof-4.88";
+stdenv.mkDerivation rec {
+  name = "lsof-${version}";
+  version = "4.89";
 
   src = fetchurl {
-    url = "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/lsof_4.88.tar.bz2";
-    sha256 = "16y9wm26rg81mihnzcbdg8h8vhxmq8kn62ssxb8cqydp4q79nvzy";
+    url = "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/lsof_${version}.tar.bz2";
+    sha256 = "061p18v0mhzq517791xkjs8a5dfynq1418a1mwxpji69zp2jzb41";
   };
 
   unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";

From b48e49ddc39e6554fe67c4ba070da8ae2008b1fe Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 15 Jul 2015 12:42:40 -0700
Subject: [PATCH 2222/2322] gnutls: 3.3.15 -> 3.3.16

---
 pkgs/development/libraries/gnutls/3.3.nix | 4 ++--
 pkgs/top-level/all-packages.nix           | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.3.nix b/pkgs/development/libraries/gnutls/3.3.nix
index a2c04506a6c..bd95ce07254 100644
--- a/pkgs/development/libraries/gnutls/3.3.nix
+++ b/pkgs/development/libraries/gnutls/3.3.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.3.15";
+  version = "3.3.16";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.lz";
-    sha256 = "166nynb055vlh6dm1gaqwpcnf4mp7ks8lz2yvm7dlsrkbh3swj5m";
+    sha256 = "1jl5n02mh83ygrrk7rq8vwylv5gdr3wccqs1ynvzr749fd2wq637";
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f39c4dc040..38784d7a3b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6414,7 +6414,6 @@ let
 
   gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix {
     guileBindings = config.gnutls.guile or false;
-    nettle = nettle27;
   };
 
   gnutls34 = callPackage ../development/libraries/gnutls/3.4.nix {

From 08ef62c1009c27db1c6a5750c80c4af01ee791f2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 15 Jul 2015 12:48:02 -0700
Subject: [PATCH 2223/2322] gnutls: 3.4.2 -> 3.4.3

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

diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix
index 614834252fa..0558e4127c4 100644
--- a/pkgs/development/libraries/gnutls/3.4.nix
+++ b/pkgs/development/libraries/gnutls/3.4.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.4.2";
+  version = "3.4.3";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.lz";
-    sha256 = "1wzasbrs4ncq4yisqyvifl7mzlyyg1pb0idr4fhjmcfpi13sxlaw";
+    sha256 = "1q4adb1xi9pl00iy3cqs4r1qmwllv1g1r44p6xsg6n65dpyf53q2";
   };
 })

From be0f468926ff805b9fae4bba87a0fc8b628cbc1a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 15 Jul 2015 12:55:39 -0700
Subject: [PATCH 2224/2322] samba: 4.2.1 -> 4.2.3

---
 pkgs/servers/samba/4.x.nix      | 4 ++--
 pkgs/top-level/all-packages.nix | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 1d957a8ec60..1f89e959c4b 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -19,11 +19,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "samba-4.2.1";
+  name = "samba-4.2.3";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
-    sha256 = "1hsakc8h6rs48xr6i55m90pd53hpxcqjjnlwq8i2rp0nq4ws5sip";
+    sha256 = "0z2c17d2id0m59mfdxdljhizp97l29clmw6g5zp93n0q92pabpxn";
   };
 
   patches =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38784d7a3b1..232cabe6b93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9178,7 +9178,6 @@ let
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
     kerberos = null;  # Bundle kerberos because samba uses internal, non-stable functions
-    gnutls = gnutls33;
     # enableLDAP
   };
 

From 66bc50a968372140f9e9fe367d172acb721fb147 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 15 Jul 2015 22:12:29 +0200
Subject: [PATCH 2225/2322] vsftpd: fix CVE-2015-1419

Adds patch from Debian.
---
 pkgs/servers/ftp/vsftpd/CVE-2015-1419.patch | 104 ++++++++++++++++++++
 pkgs/servers/ftp/vsftpd/default.nix         |   2 +
 2 files changed, 106 insertions(+)
 create mode 100644 pkgs/servers/ftp/vsftpd/CVE-2015-1419.patch

diff --git a/pkgs/servers/ftp/vsftpd/CVE-2015-1419.patch b/pkgs/servers/ftp/vsftpd/CVE-2015-1419.patch
new file mode 100644
index 00000000000..0a614439511
--- /dev/null
+++ b/pkgs/servers/ftp/vsftpd/CVE-2015-1419.patch
@@ -0,0 +1,104 @@
+Description: CVE-2015-1419: config option deny_file is not handled correctly
+Author: Marcus Meissner <meissner@suse.com>
+Origin: https://bugzilla.novell.com/show_bug.cgi?id=CVE-2015-1419
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776922
+Last-Update: 2015-02-24
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/ls.c
+===================================================================
+--- trunk.orig/ls.c
++++ trunk/ls.c
+@@ -7,6 +7,7 @@
+  * Would you believe, code to handle directory listing.
+  */
+ 
++#include <stdlib.h>
+ #include "ls.h"
+ #include "access.h"
+ #include "defs.h"
+@@ -243,11 +244,42 @@ vsf_filename_passes_filter(const struct
+   struct mystr temp_str = INIT_MYSTR;
+   struct mystr brace_list_str = INIT_MYSTR;
+   struct mystr new_filter_str = INIT_MYSTR;
++  struct mystr normalize_filename_str = INIT_MYSTR;
++  const char *normname;
++  const char *path;
+   int ret = 0;
+   char last_token = 0;
+   int must_match_at_current_pos = 1;
++
+   str_copy(&filter_remain_str, p_filter_str);
+-  str_copy(&name_remain_str, p_filename_str);
++
++  /* normalize filepath */
++  path = str_strdup(p_filename_str);
++  normname = realpath(path, NULL);
++  if (normname == NULL)
++     goto out;
++  str_alloc_text(&normalize_filename_str, normname);
++
++  if (!str_isempty (&filter_remain_str) && !str_isempty(&normalize_filename_str)) {
++    if (str_get_char_at(p_filter_str, 0) == '/') {
++      if (str_get_char_at(&normalize_filename_str, 0) != '/') {
++        str_getcwd (&name_remain_str);
++
++        if (str_getlen(&name_remain_str) > 1) /* cwd != root dir */
++          str_append_char (&name_remain_str, '/');
++
++        str_append_str (&name_remain_str, &normalize_filename_str);
++      }
++      else
++       str_copy (&name_remain_str, &normalize_filename_str);
++    } else {
++      if (str_get_char_at(p_filter_str, 0) != '{')
++        str_basename (&name_remain_str, &normalize_filename_str);
++      else
++        str_copy (&name_remain_str, &normalize_filename_str);
++    }
++  } else
++    str_copy(&name_remain_str, &normalize_filename_str);
+ 
+   while (!str_isempty(&filter_remain_str) && *iters < VSFTP_MATCHITERS_MAX)
+   {
+@@ -379,6 +411,9 @@ vsf_filename_passes_filter(const struct
+     ret = 0;
+   }
+ out:
++  free((char*) normname);
++  free((char*) path);
++  str_free(&normalize_filename_str);
+   str_free(&filter_remain_str);
+   str_free(&name_remain_str);
+   str_free(&temp_str);
+Index: trunk/str.c
+===================================================================
+--- trunk.orig/str.c
++++ trunk/str.c
+@@ -723,3 +723,14 @@ str_replace_unprintable(struct mystr* p_
+   }
+ }
+ 
++void
++str_basename (struct mystr* d_str, const struct mystr* path)
++{
++  static struct mystr tmp;
++
++  str_copy (&tmp, path);
++  str_split_char_reverse(&tmp, d_str, '/');
++
++  if (str_isempty(d_str))
++   str_copy (d_str, path);
++}
+Index: trunk/str.h
+===================================================================
+--- trunk.orig/str.h
++++ trunk/str.h
+@@ -101,6 +101,7 @@ void str_replace_unprintable(struct myst
+ int str_atoi(const struct mystr* p_str);
+ filesize_t str_a_to_filesize_t(const struct mystr* p_str);
+ unsigned int str_octal_to_uint(const struct mystr* p_str);
++void str_basename (struct mystr* d_str, const struct mystr* path);
+ 
+ /* PURPOSE: Extract a line of text (delimited by \n or EOF) from a string
+  * buffer, starting at character position 'p_pos'. The extracted line will
diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix
index 3b9b32898e2..f1ddf87e8c6 100644
--- a/pkgs/servers/ftp/vsftpd/default.nix
+++ b/pkgs/servers/ftp/vsftpd/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0mjy345wszskz1vnk83360c1y37arwgap3gwz8hy13sjqpig0imy";
   };
 
+  patches = [ ./CVE-2015-1419.patch ];
+
   preConfigure = stdenv.lib.optionalString sslEnable ''
     echo "Will enable SSL"
     sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h

From e431602983977872c175cafc60c80c94a53e6e6c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 15 Jul 2015 23:48:58 +0300
Subject: [PATCH 2226/2322] Update cl-unification source

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

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 5e2bdd0cc54..d98994b1233 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -75,11 +75,10 @@ let lispPackages = rec {
     version = "cvs-2013-10-28";
     description = "";
     deps = [];
-    src = pkgs.fetchcvs {
-      sha256 = "a574b7f9615232366e3e5e7ee400d60dbff23f6d0e1def5a3c77aafdfd786e6a";
-      date = ''2013-10-28'';
-      module = ''cl-unification'';
-      cvsRoot = '':pserver:anonymous:anonymous@common-lisp.net:/project/cl-unification/cvsroot'';
+    src = pkgs.fetchgit {
+      url = "https://gitlab.common-lisp.net/cl-unification/cl-unification.git";
+      sha256 = "01k2k7n98flnzm6mipk4xq2rqmjkjg8rcv4dsgifyxhqjwqf0l24";
+      rev = ''283c94d38d11c806a1fc9db022f0b54dced93bab'';
     };
   };
 

From 44c9eddd64fb0a79c73a76e3a5babf8c32787d86 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 15 Jul 2015 23:51:39 +0300
Subject: [PATCH 2227/2322] Update cl-smtp source

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

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index d98994b1233..566b42efdcf 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -541,12 +541,11 @@ let lispPackages = rec {
     version = "cvs-2014-11-15";
     description = "SMTP client library";
     deps = [cl-ssl cl-base64 flexi-streams trivial-gray-streams usocket];
-    # Source type: cvs
-    src = pkgs.fetchcvs {
-      sha256 = "15b7lvayn1izzfism7s7rcw2mv1hwgp9l2lgb5na9qxmqzjlw0r9";
-      date = ''2014-11-15'';
-      module = ''cl-smtp'';
-      cvsRoot = '':pserver:anonymous:anonymous@common-lisp.net:/project/cl-smtp/cvsroot'';
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = "https://gitlab.common-lisp.net/cl-smtp/cl-smtp.git";
+      sha256 = "1i66x351cj114r2i8j6bhif5fcysfq5ia91hv7ksjqa4q7rfmpw2";
+      rev = ''2bf946c1d561c0085dba6d6337e3e53d9711a5d2'';
     };
   };
 

From e6e02133d6be3c7a1346d2b8826c37f4443ee42d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 15 Jul 2015 23:52:21 +0300
Subject: [PATCH 2228/2322] Fix version strings for switch from CVS

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

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 566b42efdcf..07372153032 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -72,7 +72,7 @@ let lispPackages = rec {
 
   cl-unification = buildLispPackage rec {
     baseName = "cl-unification";
-    version = "cvs-2013-10-28";
+    version = "git-2015-07-01";
     description = "";
     deps = [];
     src = pkgs.fetchgit {
@@ -538,7 +538,7 @@ let lispPackages = rec {
 
   cl-smtp = buildLispPackage rec {
     baseName = "cl-smtp";
-    version = "cvs-2014-11-15";
+    version = "git-2015-07-01";
     description = "SMTP client library";
     deps = [cl-ssl cl-base64 flexi-streams trivial-gray-streams usocket];
     # Source type: git

From 01e37fe92dedabdaa7b9f047de1c59f8a43de45e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 15 Jul 2015 16:10:57 -0500
Subject: [PATCH 2229/2322] pkgs: mariadb 10.0.19 -> 10.0.20

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 7ca962b6f47..cad03cbd1ff 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "mariadb-${version}";
-  version = "10.0.19";
+  version = "10.0.20";
 
   src = fetchurl {
     url    = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz";
-    sha256 = "0cm1j4805ypbmrhajn4ar5rqsis1p5haxs7c04b6k540gmfmxgrg";
+    sha256 = "0ywb730l68mxvmpik1x2ndbdaaks6dmc17pxspspm5wlqxinjkrs";
   };
 
   buildInputs = [ cmake ncurses openssl zlib pcre libxml2 boost judy bison libevent ]

From 11947a55c855164d6aa9e429227f21f3989046b2 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 15 Jul 2015 23:23:53 +0200
Subject: [PATCH 2230/2322] libwmf: fix some security issues

The added patches (sourced from Debian) fixes the following security
issues:

  - CVE-2006-3376
  - CVE-2009-1364
  - CVE-2015-0848
  - CVE-2015-4588
  - CVE-2015-4695
  - CVE-2015-4696
---
 .../libraries/libwmf/CVE-2006-3376.patch      |  28 +++
 .../libraries/libwmf/CVE-2009-1364.patch      |  11 ++
 .../libwmf/CVE-2015-0848+4588+4695+4696.patch | 186 ++++++++++++++++++
 pkgs/development/libraries/libwmf/default.nix |   5 +
 4 files changed, 230 insertions(+)
 create mode 100644 pkgs/development/libraries/libwmf/CVE-2006-3376.patch
 create mode 100644 pkgs/development/libraries/libwmf/CVE-2009-1364.patch
 create mode 100644 pkgs/development/libraries/libwmf/CVE-2015-0848+4588+4695+4696.patch

diff --git a/pkgs/development/libraries/libwmf/CVE-2006-3376.patch b/pkgs/development/libraries/libwmf/CVE-2006-3376.patch
new file mode 100644
index 00000000000..4c7519d9c10
--- /dev/null
+++ b/pkgs/development/libraries/libwmf/CVE-2006-3376.patch
@@ -0,0 +1,28 @@
+--- libwmf-0.2.8.4.orig/src/player.c
++++ libwmf-0.2.8.4/src/player.c
+@@ -23,6 +23,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <math.h>
+ 
+@@ -132,8 +133,14 @@
+ 		}
+ 	}
+ 
+-/*	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char));
+- */	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
++	if (MAX_REC_SIZE(API) > UINT32_MAX / 2)
++	{
++		API->err = wmf_E_InsMem;
++		WMF_DEBUG (API,"bailing...");
++		return (API->err);
++	}
++
++ 	P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
+ 
+ 	if (ERR (API))
+ 	{	WMF_DEBUG (API,"bailing...");
+
diff --git a/pkgs/development/libraries/libwmf/CVE-2009-1364.patch b/pkgs/development/libraries/libwmf/CVE-2009-1364.patch
new file mode 100644
index 00000000000..e2a4501662c
--- /dev/null
+++ b/pkgs/development/libraries/libwmf/CVE-2009-1364.patch
@@ -0,0 +1,11 @@
+--- libwmf-0.2.8.4.orig/src/extra/gd/gd_clip.c
++++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c
+@@ -70,6 +70,7 @@
+ 	{	more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle));
+ 		if (more == 0) return;
+ 		im->clip->max += 8;
++		im->clip->list = more;
+ 	}
+ 	im->clip->list[im->clip->count] = (*rect);
+ 	im->clip->count++;
+
diff --git a/pkgs/development/libraries/libwmf/CVE-2015-0848+4588+4695+4696.patch b/pkgs/development/libraries/libwmf/CVE-2015-0848+4588+4695+4696.patch
new file mode 100644
index 00000000000..54d47800298
--- /dev/null
+++ b/pkgs/development/libraries/libwmf/CVE-2015-0848+4588+4695+4696.patch
@@ -0,0 +1,186 @@
+--- libwmf-0.2.8.4.orig/src/player/meta.h
++++ libwmf-0.2.8.4/src/player/meta.h
+@@ -1565,7 +1565,7 @@ static int meta_rgn_create (wmfAPI* API,
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -2142,7 +2142,7 @@ static int meta_dib_brush (wmfAPI* API,w
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -2593,9 +2593,10 @@ static int meta_dc_restore (wmfAPI* API,
+ 		polyrect.BR = 0;
+ 
+ 		polyrect.count = 0;
++	
++		if (FR->region_clip) FR->region_clip (API,&polyrect);
+ 	}
+ 
+-	if (FR->region_clip) FR->region_clip (API,&polyrect);
+ 
+ 	return (changed);
+ }
+@@ -3067,7 +3068,7 @@ static int meta_pen_create (wmfAPI* API,
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3181,7 +3182,7 @@ static int meta_brush_create (wmfAPI* AP
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3288,7 +3289,7 @@ static int meta_font_create (wmfAPI* API
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3396,7 +3397,7 @@ static int meta_palette_create (wmfAPI*
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+--- libwmf-0.2.8.4.orig/src/ipa/ipa.h
++++ libwmf-0.2.8.4/src/ipa/ipa.h
+@@ -48,7 +48,7 @@ static int            ReadBlobByte (BMPS
+ static unsigned short ReadBlobLSBShort (BMPSource*);
+ static unsigned long  ReadBlobLSBLong (BMPSource*);
+ static long           TellBlob (BMPSource*);
+-static void           DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*);
++static int            DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*);
+ static void           ReadBMPImage (wmfAPI*,wmfBMP*,BMPSource*);
+ static int            ExtractColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned int,unsigned int);
+ static void           SetColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned char,unsigned int,unsigned int);
+--- libwmf-0.2.8.4.orig/src/ipa/ipa/bmp.h
++++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h
+@@ -859,7 +859,7 @@ static long TellBlob (BMPSource* src)
+ %
+ %
+ */
+-static void DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels)
++static int DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels)
+ {	int byte;
+ 	int count;
+ 	int i;
+@@ -870,12 +870,14 @@ static void DecodeImage (wmfAPI* API,wmf
+ 	U32 u;
+ 
+ 	unsigned char* q;
++	unsigned char* end;
+ 
+ 	for (u = 0; u < ((U32) bmp->width * (U32) bmp->height); u++) pixels[u] = 0;
+ 
+ 	byte = 0;
+ 	x = 0;
+ 	q = pixels;
++	end = pixels + bmp->width * bmp->height;
+ 
+ 	for (y = 0; y < bmp->height; )
+ 	{	count = ReadBlobByte (src);
+@@ -884,7 +886,10 @@ static void DecodeImage (wmfAPI* API,wmf
+ 		{	/* Encoded mode. */
+ 			byte = ReadBlobByte (src);
+ 			for (i = 0; i < count; i++)
+-			{	if (compression == 1)
++			{	
++				if (q == end)
++					return 0;
++			 	if (compression == 1)
+ 				{	(*(q++)) = (unsigned char) byte;
+ 				}
+ 				else
+@@ -896,13 +901,15 @@ static void DecodeImage (wmfAPI* API,wmf
+ 		else
+ 		{	/* Escape mode. */
+ 			count = ReadBlobByte (src);
+-			if (count == 0x01) return;
++			if (count == 0x01) return 1;
+ 			switch (count)
+ 			{
+ 			case 0x00:
+ 			 {	/* End of line. */
+ 				x = 0;
+ 				y++;
++				if (y >= bmp->height)
++					return 0;
+ 				q = pixels + y * bmp->width;
+ 				break;
+ 			 }
+@@ -910,13 +917,20 @@ static void DecodeImage (wmfAPI* API,wmf
+ 			 {	/* Delta mode. */
+ 				x += ReadBlobByte (src);
+ 				y += ReadBlobByte (src);
++				if (y >= bmp->height)
++					return 0;
++				if (x >= bmp->width)
++					return 0;
+ 				q = pixels + y * bmp->width + x;
+ 				break;
+ 			 }
+ 			default:
+ 			 {	/* Absolute mode. */
+ 				for (i = 0; i < count; i++)
+-				{	if (compression == 1)
++				{
++					if (q == end)
++						return 0;
++					if (compression == 1)
+ 					{	(*(q++)) = ReadBlobByte (src);
+ 					}
+ 					else
+@@ -943,7 +957,7 @@ static void DecodeImage (wmfAPI* API,wmf
+ 	byte = ReadBlobByte (src);  /* end of line */
+ 	byte = ReadBlobByte (src);
+ 
+-	return;
++	return 1;
+ }
+ 
+ /*
+@@ -1143,8 +1157,18 @@ static void ReadBMPImage (wmfAPI* API,wm
+ 		}
+ 	}
+ 	else
+-	{	/* Convert run-length encoded raster pixels. */
+-		DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image);
++	{
++		if (bmp_info.bits_per_pixel == 8)	/* Convert run-length encoded raster pixels. */
++		{
++			if (!DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image))
++			{	WMF_ERROR (API,"corrupt bmp");
++				API->err = wmf_E_BadFormat;
++			}
++		}
++		else
++		{	WMF_ERROR (API,"Unexpected pixel depth");
++			API->err = wmf_E_BadFormat;
++		}
+ 	}
+ 
+ 	if (ERR (API))
diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix
index 95740882a93..bdede8f18cf 100644
--- a/pkgs/development/libraries/libwmf/default.nix
+++ b/pkgs/development/libraries/libwmf/default.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ zlib imagemagick libpng pkgconfig glib freetype libjpeg libxml2 ];
 
+  patches = [
+    ./CVE-2006-3376.patch ./CVE-2009-1364.patch
+    ./CVE-2015-0848+4588+4695+4696.patch
+  ];
+
   meta = {
     description = "WMF library from wvWare";
   };

From 9ad01e41deee835ee5f9261efd3ed497862c995d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 7 Mar 2015 14:20:01 +0100
Subject: [PATCH 2231/2322] eplot: init at 2.07

Create plots quickly with gnuplot.

http://liris.cnrs.fr/christian.wolf/software/eplot/
---
 pkgs/tools/graphics/eplot/default.nix | 47 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/tools/graphics/eplot/default.nix

diff --git a/pkgs/tools/graphics/eplot/default.nix b/pkgs/tools/graphics/eplot/default.nix
new file mode 100644
index 00000000000..a98a5e0aaec
--- /dev/null
+++ b/pkgs/tools/graphics/eplot/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, gnuplot, ruby }:
+
+stdenv.mkDerivation rec {
+  name = "eplot-2.07";
+
+  # Upstream has been contacted (2015-03) regarding providing versioned
+  # download URLs. Initial response was positive, but no action yet.
+  src = fetchurl {
+    url = "http://liris.cnrs.fr/christian.wolf/software/eplot/download/eplot";
+    sha256 = "0y9x82i3sfpgxsqz2w42r6iad6ph7vxb7np1xbwapx5iipciclw5";
+  };
+
+  ecSrc = fetchurl {
+    url = "http://liris.cnrs.fr/christian.wolf/software/eplot/download/ec";
+    sha256 = "0fg31g8mrcx14h2rjcf091cbd924n19z55iscaiflspifya30yhd";
+  };
+
+  buildInputs = [ ruby ];
+
+  unpackPhase = "true";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp "$src" "$out/bin/eplot"
+    cp "$ecSrc" "$out/bin/ec"
+    chmod +x "$out/bin/"*
+
+    sed -i -e "s|gnuplot -persist|${gnuplot}/bin/gnuplot -persist|" "$out/bin/eplot"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Create plots quickly with gnuplot";
+    longDescription = ''
+      eplot ("easy gnuplot") is a ruby script which allows to pipe data easily
+      through gnuplot and create plots quickly, which can be saved in
+      postscript, PDF, PNG or EMF files. Plotting of multiple files into a
+      single diagram is supported.
+
+      This package also includes the complementary 'ec' tool (say "extract
+      column").
+    '';
+    homepage = http://liris.cnrs.fr/christian.wolf/software/eplot/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 232cabe6b93..aa4a59e54f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1396,6 +1396,8 @@ let
 
   enscript = callPackage ../tools/text/enscript { };
 
+  eplot = callPackage ../tools/graphics/eplot { };
+
   ethtool = callPackage ../tools/misc/ethtool { };
 
   eternity = callPackage ../games/eternity-engine { };

From 6281c618cf992c387556e4b00ffb6646a2268264 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 15 Jul 2015 15:30:39 -0700
Subject: [PATCH 2232/2322] lightdm: Fix location of loaders.cache after
 49821433242c4f44cff038a039ead3bc9741fbf1

---
 nixos/modules/services/x11/display-managers/lightdm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index d05edabca62..bc8f478c7d8 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -33,7 +33,7 @@ let
       makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \
         $out/greeter \
         --prefix PATH : "${pkgs.glibc}/bin" \
-        --set GDK_PIXBUF_MODULE_FILE "$(find ${theme} -name loaders.cache)" \
+        --set GDK_PIXBUF_MODULE_FILE "${pkgs.gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
         --set GTK_PATH "${theme}:${pkgs.gtk3}" \
         --set GTK_EXE_PREFIX "${theme}" \
         --set GTK_DATA_PREFIX "${theme}" \

From 1306c11b94351551c63dd23ba8b107fee2028fc2 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 16 Jul 2015 02:43:27 +0200
Subject: [PATCH 2233/2322] bitlbee service: fix typo

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

diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix
index 1ffd57e0621..27b7dd71d9e 100644
--- a/nixos/modules/services/networking/bitlbee.nix
+++ b/nixos/modules/services/networking/bitlbee.nix
@@ -21,7 +21,7 @@ let
     DaemonInterface = ${cfg.interface}
     DaemonPort = ${toString cfg.portNumber}
     AuthMode = ${cfg.authMode}
-    ${lib.optionalStringv (cfg.hostName != "") "HostName = ${cfg.hostName}"}
+    ${lib.optionalString (cfg.hostName != "") "HostName = ${cfg.hostName}"}
     ${lib.optionalString (cfg.protocols != "") "Protocols = ${cfg.protocols}"}
     ${cfg.extraSettings}
 

From c284b83678af1e8ce89f222025fa8993302a4eab Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 15 Jul 2015 17:45:19 -0700
Subject: [PATCH 2234/2322] setuptools: 7.0 -> 18.0.1

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

diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 01fe4668679..477d6f4b3a1 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   shortName = "setuptools-${version}";
   name = "${python.executable}-${shortName}";
 
-  version = "7.0";
+  version = "18.0.1";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz";
-    sha256 = "0qg07f035agwcz9m0p3kgdjs18xpl3h00rv28aqsfdyz1wm1m76x";
+    sha256 = "152b4qlpqc54939vfx5ipjpgx0kln02n3ywpm6x25pqysngwjjad";
   };
 
   buildInputs = [ python wrapPython distutils-cfg ];

From c1c757cea4f47a6ee3cec8f8db217bc92335b7fb Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 15 Jul 2015 17:46:31 -0700
Subject: [PATCH 2235/2322] ceph: 9.0.1 -> 9.0.2

---
 pkgs/tools/filesystems/ceph/dev.nix           |  6 ++--
 .../filesystems/ceph/fix-pythonpath.patch     | 31 +++++++++++++++++++
 pkgs/tools/filesystems/ceph/generic.nix       | 12 +++++--
 3 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/tools/filesystems/ceph/fix-pythonpath.patch

diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
index 3a9aacbcd30..5cc183d1053 100644
--- a/pkgs/tools/filesystems/ceph/dev.nix
+++ b/pkgs/tools/filesystems/ceph/dev.nix
@@ -1,11 +1,13 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "9.0.1";
+  version = "9.0.2";
 
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1sq6gim7dik04lih5krwm4qpnf2blby3xj2vz9n4cknjnj0dbg7x";
+    sha256 = "0kydjyvb1566mh33p6dlljfx1r4cfdj8ic4i19h5r9vavkc46nf0";
   };
+
+  patches = [ ./fix-pythonpath.patch ];
 })
diff --git a/pkgs/tools/filesystems/ceph/fix-pythonpath.patch b/pkgs/tools/filesystems/ceph/fix-pythonpath.patch
new file mode 100644
index 00000000000..7458a46aca1
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/fix-pythonpath.patch
@@ -0,0 +1,31 @@
+diff --git a/src/Makefile-env.am b/src/Makefile-env.am
+index e176596..384e230 100644
+--- a/src/Makefile-env.am
++++ b/src/Makefile-env.am
+@@ -40,7 +40,7 @@ check_SCRIPTS =
+ export VERBOSE = true
+ 
+ # python unit tests need to know where the scripts are located
+-export PYTHONPATH=$(top_srcdir)/src/pybind
++export PYTHONPATH+=:$(top_srcdir)/src/pybind
+ 
+ # when doing a debug build, make sure to make the targets
+ if WITH_DEBUG
+diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am
+index 3e5ad03..66d6683 100644
+--- a/src/ceph-detect-init/Makefile.am
++++ b/src/ceph-detect-init/Makefile.am
+@@ -64,9 +64,10 @@ install-data-local::
+ 	if test "$(DESTDIR)" ; then \
+ 		if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
+ 			options=--install-layout=deb ; \
+-		else \
+-			options=--prefix=/usr ; \
+ 		fi ; \
+ 		root="--root=$(DESTDIR)" ; \
+ 	fi ; \
+-	python setup.py install $$root $$options
++	if test "$(prefix)"; then \
++		prefix="--prefix=$(prefix)" ; \
++	fi ; \
++	python setup.py install $$prefix $$root $$options
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 4d358d6a9c5..b899192aa3c 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -113,7 +113,9 @@ stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]
-    ++ optionals (versionAtLeast version "10.0.0") [ pythonPackages.setuptools ];
+    ++ optionals (versionAtLeast version "9.0.2") [
+      pythonPackages.setuptools pythonPackages.argparse
+    ];
   buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
     boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib
   ] ++ optional (versionAtLeast version "9.0.0") [
@@ -147,7 +149,7 @@ stdenv.mkDerivation {
   preConfigure = ''
     # Ceph expects the arch command to be usable during configure
     # for detecting the assembly type
-    mkdir mybin
+    mkdir -p mybin
     echo "#${stdenv.shell} -e" >> mybin/arch
     echo "uname -m" >> mybin/arch
     chmod +x mybin/arch
@@ -157,6 +159,10 @@ stdenv.mkDerivation {
 
     # Fix the python site-packages install directory
     sed -i "s,\(PYTHON\(\|_EXEC\)_PREFIX=\).*,\1'$lib',g" configure
+
+    # Fix the PYTHONPATH for installing ceph-detect-init to $out
+    mkdir -p "$(toPythonPath $out)"
+    export PYTHONPATH="$(toPythonPath $out):$PYTHONPATH"
   '';
 
   configureFlags = [
@@ -200,7 +206,7 @@ stdenv.mkDerivation {
   ] ++ optional (versionAtLeast version "9.0.1") [
     (mkWith   false                        "tcmalloc-minimal"    null)
     (mkWith   false                        "valgrind"            null)
-  ] ++ optional (versionAtLeast version "10.0.0") [
+  ] ++ optional (versionAtLeast version "9.0.2") [
     (mkWith   true                         "man-pages"           null)
     (mkWith   true                         "systemd-libexec-dir" "\${TMPDIR}")
   ];

From 3adb0e713c5336460846d8ec804a540ee2b508e8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 15 Jul 2015 17:46:45 -0700
Subject: [PATCH 2236/2322] ceph: 2015-06-06 -> 2015-07-15

---
 pkgs/tools/filesystems/ceph/git.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
index df209b080b0..341c24c04a3 100644
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ b/pkgs/tools/filesystems/ceph/git.nix
@@ -1,11 +1,13 @@
 { callPackage, fetchgit, git, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-06-06";
+  version = "2015-07-15";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
-    rev = "efededa0107eebd4abc0e08dd34200d6ca175626";
-    sha256 = "18lcn4misyvgjh7r0vkal480x23yr8pcjwzl4k4hbrpqmm97znp9";
+    rev = "66dcbaed3c3c8e4b5367ba1cd2859271e692e7e0";
+    sha256 = "05jba4zjrkksrra6rz4kby8vv4ja8fa73wvwcw3yn3mn1x9kyz2g";
   };
+
+  patches = [ ./fix-pythonpath.patch ];
 })

From ec5f94fbcc882895c538eefe304f995b5079135f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 15 Jul 2015 17:54:27 -0700
Subject: [PATCH 2237/2322] chromium: Minor updates

Notably a version bump for
 Flash Player to 18.0.0.209-r1
---
 .../browsers/chromium/source/sources.nix      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 86dd127aa6b..5410293a792 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,21 +1,21 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
-    version = "45.0.2431.0";
-    sha256 = "0irlrym8r1wa6zb5bg4paxy3h5fg300k5c9vkj3xmhdp567clfja";
-    sha256bin32 = "1lfrd7x7cav5mr7pg0a3d4a9dyy6f0rklarprfrcvqwipjkddb3f";
-    sha256bin64 = "1jzmkgiqn17ynbv0xljiifvlj1136jq98zrkd4hdmkgv8xrrzd74";
+    version = "45.0.2454.6";
+    sha256 = "09bhbq3hvsfiac7w6ajd6n1lcdzf2isg1s9sqabrnx9blyds7msh";
+    sha256bin32 = "1f38rfd9v91inhd9m2sfcj4bpvq5f03zn8ypvacr9mpwc47rylx3";
+    sha256bin64 = "1bfjpjisa0hqiy8kmmgh2mr6zyifpmhr7k5ai44h5szf36768bn6";
   };
   beta = {
-    version = "44.0.2403.61";
-    sha256 = "16bifaqs3fmfms305c1h10kabsyrscxkywf32pl6zwlzjd3y4ncm";
-    sha256bin32 = "1lgqf6bid02pjdzxg1jipfzjqzp5frqxv4bi6q127kky3lz9lmlc";
-    sha256bin64 = "1l6cyfn5mraprisib7q5rgy8vvkc7ky8z91c2iqsikjv7nmrm6hv";
+    version = "44.0.2403.89";
+    sha256 = "161shml5w2i0crl57hkfnizgmii6d70lxxg4rjxmays8g6lrmpds";
+    sha256bin32 = "1vk022m9kz9fw82sd94zqzi988ald3p2vlha7pz5wm2dgibwr25g";
+    sha256bin64 = "0kvrpqy3fpfzchly65nrh8z2z2i49xpa3pm2k7k18sn0x4bycji0";
   };
   stable = {
-    version = "43.0.2357.130";
-    sha256 = "0bh093rfiklwj03my9d6x3118k2msbl7fhrxlndx99cnjd1mbyv2";
-    sha256bin32 = "083scn6dd11lnd0z5yxd6jfgdxj7iaafssccj8a9ybr1ay894ch1";
-    sha256bin64 = "14mfw64ips6nzz6kr8k8dq5253cbqd69hjlc54fl7nqfxi9zw31f";
+    version = "43.0.2357.134";
+    sha256 = "0nbn25pl3rgyqmy4p5dqr0v08xzkm08lpzsaxzszqpa4w7ivp8fk";
+    sha256bin32 = "1xmybw4vs8x2rrg43f7x7yn763wfzr5f8d1jpq49r42qr365q6vs";
+    sha256bin64 = "1y79135pmkhvv4cdhdy93jhm0jdx132a6spqqyyhbcr2sn26cq62";
   };
 }

From 60d19b3adcec8d9d45240559e587467559d07184 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 16 Jul 2015 10:36:29 +0200
Subject: [PATCH 2238/2322] Revert "gnupg: fix build on darwin"

This reverts commit db3602b5d6a928a69cc00d837d513817bdabe1c4.

Fixed libusb build by 82d2960f15942bdf8594a400d70ca907e5b23647
---
 pkgs/tools/security/gnupg/20.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 016b22916ea..542baa95efe 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -21,8 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs
     = [ readline zlib libgpgerror libgcrypt libassuan libksba pth
-        openldap bzip2 curl libiconv ]
-        ++ stdenv.lib.optional (!stdenv.isDarwin) libusb;
+        openldap bzip2 libusb curl libiconv ];
 
   patchPhase = ''
     find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i

From ff94a3f57e75fa894378e0620024382977385cbc Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 16 Jul 2015 10:04:11 +0000
Subject: [PATCH 2239/2322] pythonPackages.alembic: 0.6.6 -> 0.7.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 45de46ef679..bbb5421d706 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -293,11 +293,11 @@ let
 
 
   alembic = buildPythonPackage rec {
-    name = "alembic-0.6.6";
+    name = "alembic-0.7.6";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/alembic/${name}.tar.gz";
-      md5 = "71e4a8f6849e1527abfc4ea33d51f37c";
+      sha256 = "0qgglnxsn470ncyipm33j3d5nf5ny2g3wq7fxyy9fv2x4rhs8kw6";
     };
 
     buildInputs = with self; [ nose mock ];

From b7155460719ba2c8b0b276fad3fdd22441eac9f9 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 16 Jul 2015 14:35:31 +0000
Subject: [PATCH 2240/2322] Make fetchBower a bit more like a normal
 mkDerivation, which is easier to test. Also, in some cases, the result of
 fetchBower is different depending on the value of $out. For now, it seems
 that it works best if using a local output directory before copying to $out.

(cherry picked from commit aa4c6b027163abe0891f9ad438899f9679298a64)
---
 pkgs/build-support/fetchbower/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix
index 11af6dbedf1..7c6b1a8a098 100644
--- a/pkgs/build-support/fetchbower/default.nix
+++ b/pkgs/build-support/fetchbower/default.nix
@@ -1,9 +1,11 @@
 { stdenv, fetch-bower, git }: name: version: target: outputHash: stdenv.mkDerivation {
   name = "${name}-${version}";
-  realBuilder = "${fetch-bower}/bin/fetch-bower";
-  args = [ name version target ];
+  buildCommand = ''
+    out=$PWD/out fetch-bower ${name} ${version} ${target}
+    cp -R out $out
+  '';
   outputHashMode = "recursive";
   outputHashAlgo = "sha256";
   inherit outputHash;
-  PATH = "${git}/bin";
+  buildInputs = [git fetch-bower];
 }

From aaa44b7c57a4e5666e2cdb173845253fbefe0146 Mon Sep 17 00:00:00 2001
From: Robin Gloster <robin@loc-com.de>
Date: Thu, 16 Jul 2015 19:29:08 +0000
Subject: [PATCH 2241/2322] phpstorm: 8.0.3 -> 9.0

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

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index b2b6d2ddde5..5d13cf6a4ce 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -297,13 +297,13 @@ in
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "8.0.3";
-    build = "PS-139.1348";
+    version = "9.0";
+    build = "PS-141.1912";
     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 = "1x67nfr3nap93cx7yhdrp02xvp1v6g74zy7hdmhx41sal7hzy49b";
+      sha256 = "1n6p8xiv0nrs6yf0250mpga291msnrfamv573dva9f17cc3df2pp";
     };
   };
 

From 6a1519c6311bc2791b242cfdb6a9b1a3557e7fdb Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 16 Jul 2015 22:01:43 +0200
Subject: [PATCH 2242/2322] gmic: init at 1.6.5.0

---
 pkgs/tools/graphics/gmic/default.nix | 40 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/tools/graphics/gmic/default.nix

diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
new file mode 100644
index 00000000000..f0115239f00
--- /dev/null
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, fftw, zlib, libjpeg, libtiff, libpng }:
+
+stdenv.mkDerivation rec {
+  name = "gmic-${version}";
+  version = "1.6.5.0";
+
+  src = fetchurl {
+    url = "http://gmic.eu/files/source/gmic_${version}.tar.gz";
+    sha256 = "1vb6zm5zpqfnzxjvb9yfvczaqacm55rf010ib0yk9f28b17qrjgb";
+  };
+
+  buildInputs = [ fftw zlib libjpeg libtiff libpng ];
+
+  sourceRoot = "${name}/src";
+
+  preBuild = ''
+    buildFlagsArray=( \
+      CURL_CFLAGS= CURL_LIBS= \
+      EXR_CFLAGS= EXR_LIBS= \
+      OPENCV_CFLAGS= OPENCV_LIBS= \
+      X11_CFLAGS="-Dcimg_display=0" X11_LIBS= \
+      cli \
+    )
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/man/man1
+
+    cp -v gmic $out/bin/
+    cp -v ../man/gmic.1.gz $out/share/man/man1/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "G'MIC is an open and full-featured framework for image processing";
+    homepage = http://gmic.eu/;
+    license = licenses.cecill20;
+    maintainers = [ maintainers.rycee ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 616f3f918e4..49f62512295 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -882,6 +882,8 @@ let
 
   gist = callPackage ../tools/text/gist { };
 
+  gmic = callPackage ../tools/graphics/gmic { };
+
   mcrl = callPackage ../tools/misc/mcrl { };
 
   mcrl2 = callPackage ../tools/misc/mcrl2 { };

From cf8309ef34b9ec18bc9aeca9e63f984e1be19b56 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 16 Jul 2015 14:09:08 -0700
Subject: [PATCH 2243/2322] gcc: 5.2.0-rc-20150707 -> 5.2.0

---
 pkgs/development/compilers/gcc/5/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 1cb0662da13..5e6acea35df 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -57,7 +57,7 @@ assert langGo -> langCC;
 with stdenv.lib;
 with builtins;
 
-let version = "5.2.0-RC-20150707";
+let version = "5.2.0";
 
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
@@ -209,8 +209,8 @@ stdenv.mkDerivation ({
   builder = ../builder.sh;
 
   src = fetchurl {
-    url = "http://mirrors-usa.go-parts.com/gcc/snapshots/${version}/gcc-${version}.tar.bz2";
-    sha256 = "1bjdpybw5gk58n737wzy9c0nna9pdqf9177pmb94icyc8qgy0a7z";
+    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
+    sha256 = "1bccp8a106xwz3wkixn65ngxif112vn90qf95m6lzpgpnl25p0sz";
   };
 
   inherit patches;

From 12ec56030e036dc5e54375186feda77d745e3c94 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 16 Jul 2015 23:27:04 +0200
Subject: [PATCH 2244/2322] socat2pre: 2.0.0-b7 -> 2.0.0-b8

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

diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix
index 9f9e8dbe374..2d4438b5759 100644
--- a/pkgs/tools/networking/socat/2.x.nix
+++ b/pkgs/tools/networking/socat/2.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "socat-2.0.0-b7";
+  name = "socat-2.0.0-b8";
 
   src = fetchurl {
     url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
-    sha256 = "0h6k9ccrnziw03j0if7myrd28vcc97nwz1bifmbrkp5jkpk69ygk";
+    sha256 = "1slkv1hhcp9a6c88h6yl5cs0z9g60fp2ja6865s6kywqp6fmf168";
   };
 
   buildInputs = [ openssl ];

From 664af7b909e262a458446495ba332502c4da0e45 Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Thu, 16 Jul 2015 15:10:16 -0500
Subject: [PATCH 2245/2322] obs-studio: 0.10.0 -> 0.11.1

This version also adds a curl dependency.
---
 pkgs/applications/video/obs-studio/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 953f0c3a8b2..b231aad07cc 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -7,6 +7,7 @@
 , qt5
 , libv4l
 , x264
+, curl
 
 , pulseaudioSupport ? false
 , libpulseaudio
@@ -16,14 +17,15 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "0.10.0";
+  version = "0.11.1";
 
   src = fetchurl {
     url = "https://github.com/jp9000/obs-studio/archive/${version}.tar.gz";
-    sha256 = "1xms48gl20pr9g8bv8ygykh6m99c3wjphsavr4hb1d5263r9f4in";
+    sha256 = "12g1y6y8ixvgvwk75x7qgq0j06d5khd0w3if6kahswlc58q65fm8";
   };
 
   buildInputs = [ cmake
+                  curl
                   ffmpeg
                   jansson
                   libv4l

From 541f6617f94d991cb10804038ce4efcb080a88fd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 16 Jul 2015 19:19:44 -0700
Subject: [PATCH 2246/2322] libinput: 0.17.0 -> 0.20.0

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

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 28880a3ac68..f02b0af8270 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -15,11 +15,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-0.17.0";
+  name = "libinput-0.20.0";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "1nr8zg99hk6lz2g2kdvlz13i7cwvrsakakrn3c1w2id7wcxj9nxp";
+    sha256 = "0p8jswag33qjjxd8766hzk460bzhzhw32b6hl2i17aygjz7dynqp";
   };
 
   configureFlags = [

From 97d8c1cb239d992de20ed970b5128e6c49ef380d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 16 Jul 2015 19:25:30 -0700
Subject: [PATCH 2247/2322] tinc: 1.0.25 -> 1.0.26

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

diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix
index eddd3bc31c4..df3465969bb 100644
--- a/pkgs/tools/networking/tinc/default.nix
+++ b/pkgs/tools/networking/tinc/default.nix
@@ -1,20 +1,20 @@
 {stdenv, fetchurl, lzo, openssl, zlib}:
 
 stdenv.mkDerivation rec {
-  version = "1.0.25";
+  version = "1.0.26";
   name = "tinc-${version}";
 
   src = fetchurl {
     url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
-    sha256 = "0cziyiwsfcvk12dahqwi5wh0q326yhayy8ijnrjp7mwlwmacbhf5";
+    sha256 = "08ds8s32cjslms1q227ihd6jz35583v378ij4pknfa5xngfijhrb";
   };
 
   buildInputs = [ lzo openssl zlib ];
 
-  configureFlags = ''
-    --localstatedir=/var
-    --sysconfdir=/etc
-  '';
+  configureFlags = [
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+  ];
 
   meta = { 
     description = "VPN daemon with full mesh routing";

From d7b917e6120a5ae011528446d9c421f549cfdc75 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 16 Jul 2015 19:25:55 -0700
Subject: [PATCH 2248/2322] git: 2.4.5 -> 2.4.6

---
 .../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 68fd7405ee4..9702a95133c 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "2.4.5";
+  version = "2.4.6";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "15045v9ds1jn7csw4dijlz0ybiw3csh34l444vzgh9g0f9gmy6n3";
+    sha256 = "1djkjjv491nk6g8rzrb4n75yqdfp3xpiv569nqblaiq33ibl9ndx";
   };
 
   patches = [

From da5e25dcaa7549b1e1159b6ab3b9b9654fe67f45 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 16 Jul 2015 19:29:10 -0700
Subject: [PATCH 2249/2322] tinc: 2015-06-20 -> 2015-07-17

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

diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index f05ffdd6a46..3a89922ca9e 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "tinc-1.1pre-2015-06-20";
+  name = "tinc-1.1pre-2015-07-17";
 
   src = fetchgit {
     url = "git://tinc-vpn.org/tinc";
-    rev = "ebffa40aa7832459f63801e3a91cc741e6b339a8";
-    sha256 = "0yp40n5cgfadd7lmi28qv7cf5s14qqw5ga76y5xd0fjpacv6akcp";
+    rev = "f92c3446f2052a59d1e6a28f1bc7cec278cb1e48";
+    sha256 = "1y15fk4i6jm9w3qkami2vgp5zfrm5frjxwfmwr4xiw23bmy9cgim";
   };
 
   buildInputs = [ autoreconfHook texinfo ncurses readline zlib lzo openssl ];

From 967abfc78660d0e49a32eac8fe19cec4b6b79d5c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 16 Jul 2015 20:06:50 -0700
Subject: [PATCH 2250/2322] efivar: 0.20 -> 0.21

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

diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index d0c84d52daa..a9c3ebd0252 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -2,19 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "efivar-${version}";
-  version = "0.20";
+  version = "0.21";
 
   src = fetchFromGitHub {
     owner = "rhinstaller";
     repo = "efivar";
     rev = version;
-    sha256 = "14c8x9dhi4scj42n1cf513b551c1ccm8lwpaqx8h8ydpm2k35qi4";
+    sha256 = "0iakv8prvl61mb2wnll02sxlg3kfzh3d4qb41d0bklmnljjkqr8p";
   };
 
   buildInputs = [ popt ];
 
-  # 0.20 Relies on symbols from libdl.so which breaks efibootmgr
-  NIX_LDFLAGS = "-ldl";
+  # 0.21 Has build warnings so disable -Werror
+  postPatch = ''
+    sed -i 's,-Werror,,g' Make.defaults
+  '';
 
   installFlags = [
     "libdir=$(out)/lib"

From c46e424c8fa5e5b1b94d6c31bec5ccaa9ed7ad3a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Jul 2015 18:08:11 +0200
Subject: [PATCH 2251/2322] Remove obsolete reference to /media

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

diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml
index 9cf29e5dc57..a699e74e5f6 100644
--- a/nixos/doc/manual/development/writing-modules.xml
+++ b/nixos/doc/manual/development/writing-modules.xml
@@ -158,7 +158,7 @@ let locatedb = "/var/cache/locatedb"; in
         script =
           ''
             mkdir -m 0755 -p $(dirname ${locatedb})
-            exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /media /run'
+            exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /run'
           '';
       };
 
@@ -172,4 +172,4 @@ let locatedb = "/var/cache/locatedb"; in
 <xi:include href="option-declarations.xml" />
 <xi:include href="option-def.xml" />
 
-</chapter>
\ No newline at end of file
+</chapter>

From b1623385d0b5a578637911f4e8a13972af240448 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 Jul 2015 18:08:23 +0200
Subject: [PATCH 2252/2322] nixos-generate-config: Container improvements

---
 .../installer/tools/nixos-generate-config.pl   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index a2dbe31e0d8..187ea7635eb 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -70,7 +70,7 @@ my @attrs = ();
 my @kernelModules = ();
 my @initrdKernelModules = ();
 my @modulePackages = ();
-my @imports = ("<nixpkgs/nixos/modules/installer/scan/not-detected.nix>");
+my @imports;
 
 
 sub debug {
@@ -245,6 +245,18 @@ if ($virt eq "qemu" || $virt eq "kvm" || $virt eq "bochs") {
 }
 
 
+# Pull in NixOS configuration for containers.
+if ($virt eq "systemd-nspawn") {
+    push @attrs, "boot.isContainer = true;";
+}
+
+
+# Provide firmware for devices that are not detected by this script,
+# unless we're in a VM/container.
+push @imports, "<nixpkgs/nixos/modules/installer/scan/not-detected.nix>"
+    if $virt eq "none";
+
+
 # For a device name like /dev/sda1, find a more stable path like
 # /dev/disk/by-uuid/X or /dev/disk/by-label/Y.
 sub findStableDevPath {
@@ -459,14 +471,14 @@ if ($showHardwareConfig) {
     if ($force || ! -e $fn) {
         print STDERR "writing $fn...\n";
 
-        my $bootloaderConfig;
+        my $bootloaderConfig = "";
         if (-e "/sys/firmware/efi/efivars") {
             $bootLoaderConfig = <<EOF;
   # Use the gummiboot efi boot loader.
   boot.loader.gummiboot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 EOF
-        } else {
+        } elsif ($virt ne "systemd-nspawn") {
             $bootLoaderConfig = <<EOF;
   # Use the GRUB 2 boot loader.
   boot.loader.grub.enable = true;

From c871eccb3a4fc900793aeffff0cc7b246047883f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 15 Jul 2015 00:09:44 +0200
Subject: [PATCH 2253/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/9b4b64034778b6c12a2002fc97581cf99c24c58a
 with hackage2nix revision 3606ad40536a2dae452307184b9bd70a2eff8c89

---
 .../haskell-modules/hackage-packages.nix      | 518 ++++++++++++------
 1 file changed, 347 insertions(+), 171 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 86a98e6f3f4..ccb560fb74d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -241,8 +241,8 @@ self: {
      }:
      mkDerivation {
        pname = "ADPfusion";
-       version = "0.4.1.0";
-       sha256 = "1x75kb01080hkm00a26vsqy13qgmmsi7xjbcv180v14lh0dm7yjn";
+       version = "0.4.1.1";
+       sha256 = "06ff9f4wdf7dr0v2cwhzsjn00bmaijgqznhnyf5fp9jyw8ffbbzp";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -737,14 +737,13 @@ self: {
      }:
      mkDerivation {
        pname = "AlignmentAlgorithms";
-       version = "0.0.1.2";
-       sha256 = "1y9c0q34dc2y508sfxgyrgdjg39f4j7h9fjqaykx95dlv383xsjq";
+       version = "0.0.2.0";
+       sha256 = "110vhp7kdg9l5j3w19wbimmfpq4c05xgx680vb938r1pgpx9s76r";
        buildDepends = [
          ADPfusion base containers fmlist FormalGrammars GrammarProducts
          PrimitiveArray vector
        ];
-       jailbreak = true;
-       homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/";
+       homepage = "https://github.com/choener/AlignmentAlgorithms";
        description = "Collection of alignment algorithms";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -1412,15 +1411,28 @@ self: {
      }) {};
 
   "BiobaseTypes" = callPackage
-    ({ mkDerivation, base, primitive, vector }:
+    ({ mkDerivation, aeson, base, binary, cereal, cereal-text
+     , data-default, deepseq, hashable, log-domain, primitive
+     , PrimitiveArray, QuickCheck, stringable, test-framework
+     , test-framework-quickcheck2, test-framework-th, text, text-binary
+     , vector, vector-binary-instances, vector-th-unbox
+     }:
      mkDerivation {
        pname = "BiobaseTypes";
-       version = "0.0.2.2";
-       sha256 = "03h7a95njbsl67bbg7wfxjjlibsqhkm62f04hhv6s14cgrvh0b3g";
-       buildDepends = [ base primitive vector ];
-       jailbreak = true;
-       description = "(deprecated) Ring class, with several instances";
-       license = stdenv.lib.licenses.gpl3;
+       version = "0.1.1.0";
+       sha256 = "1z3vhxqqyc1bn1byvld21psi7am8zwmxsa7aiqshppw5hqyslwvl";
+       buildDepends = [
+         aeson base binary cereal cereal-text data-default deepseq hashable
+         log-domain primitive PrimitiveArray QuickCheck stringable text
+         text-binary vector vector-binary-instances vector-th-unbox
+       ];
+       testDepends = [
+         base QuickCheck test-framework test-framework-quickcheck2
+         test-framework-th
+       ];
+       homepage = "https://github.com/choener/BiobaseTypes";
+       description = "Collection of types for bioinformatics";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -1443,24 +1455,23 @@ self: {
 
   "BiobaseXNA" = callPackage
     ({ mkDerivation, aeson, base, bimaps, binary, bytes, bytestring
-     , cereal, cereal-vector, cmdargs, containers, csv, file-embed
-     , hashable, lens, primitive, PrimitiveArray, split, text, tuple
-     , vector, vector-binary-instances, vector-th-unbox
+     , cereal, cereal-vector, cmdargs, containers, csv, deepseq
+     , file-embed, hashable, lens, primitive, PrimitiveArray, split
+     , text, tuple, vector, vector-binary-instances, vector-th-unbox
      }:
      mkDerivation {
        pname = "BiobaseXNA";
-       version = "0.9.1.1";
-       sha256 = "1r9axc6g4fqc3sb47km3pfadx193s68ign8ac4va9wj8a5hilbgq";
+       version = "0.9.2.0";
+       sha256 = "1ck6yba372w3cbzgifcbfdd2m4nfyy7zd8zygkji3zbxymz2ak18";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base bimaps binary bytes bytestring cereal cereal-vector
-         cmdargs containers csv file-embed hashable lens primitive
+         cmdargs containers csv deepseq file-embed hashable lens primitive
          PrimitiveArray split text tuple vector vector-binary-instances
          vector-th-unbox
        ];
-       jailbreak = true;
-       homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
+       homepage = "https://github.com/choener/BiobaseXNA";
        description = "Efficient RNA/DNA representations";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -4915,8 +4926,8 @@ self: {
      }:
      mkDerivation {
        pname = "FormalGrammars";
-       version = "0.2.0.0";
-       sha256 = "0qx2r4gvims7s7ki7sanwvyws4ykf7cwxsxpwy3krr2rfqhmhp75";
+       version = "0.2.1.0";
+       sha256 = "10b7hcwzxnl31wdfdbakcaapihhnwx8lwj0znidvgkk7hyirnx2n";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -4925,8 +4936,7 @@ self: {
          template-haskell text transformers trifecta unordered-containers
          vector
        ];
-       jailbreak = true;
-       homepage = "http://www.bioinf.uni-leipzig.de/Software/gADP/";
+       homepage = "https://github.com/choener/FormalGrammars";
        description = "(Context-free) grammars in formal language theory";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -4966,8 +4976,8 @@ self: {
      }:
      mkDerivation {
        pname = "Frames";
-       version = "0.1.1.1";
-       sha256 = "117nqwvxbvcdnma582801im0fp2bg129m0cick43qa7cn9ky1drz";
+       version = "0.1.2";
+       sha256 = "11444jhck56y2iclgn1daj087qpi99pznk3w82vhbya3pdvrkjac";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -5475,6 +5485,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "GenussFold" = callPackage
+    ({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring
+     , cmdargs, containers, data-default, FormalGrammars, lens, mtl
+     , PrimitiveArray, QuickCheck, semigroups, template-haskell
+     , test-framework, test-framework-quickcheck2, test-framework-th
+     , text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "GenussFold";
+       version = "0.0.0.2";
+       sha256 = "1byshl3wa637nnvwxa80r9p1azgvgbczp5j77hpqaxacxkx1q0sm";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         ADPfusion ansi-wl-pprint base bytestring cmdargs containers
+         data-default FormalGrammars lens mtl PrimitiveArray semigroups
+         template-haskell text transformers unordered-containers vector
+       ];
+       testDepends = [
+         base QuickCheck test-framework test-framework-quickcheck2
+         test-framework-th
+       ];
+       homepage = "https://github.com/choener/GenussFold";
+       description = "MCFGs for Genus-1 RNA Pseudoknots";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "GeoIp" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-mmap, syb }:
      mkDerivation {
@@ -5690,22 +5727,23 @@ self: {
      }) {};
 
   "GrammarProducts" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
-     , data-default, FormalGrammars, lens, newtype, parsers, semigroups
-     , template-haskell, transformers, trifecta
+    ({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring
+     , containers, data-default, FormalGrammars, lens, newtype, parsers
+     , PrimitiveArray, semigroups, template-haskell, transformers
+     , trifecta
      }:
      mkDerivation {
        pname = "GrammarProducts";
-       version = "0.1.0.0";
-       sha256 = "1is934sdflkhi8idprdihdb7knsi8gi0gd4rdnhn4cd8xjvkicgk";
+       version = "0.1.1.0";
+       sha256 = "026sjppwk0g10zyw64rds1fifdi7d6p7jzri35cl6hxc33fqdiy3";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         ansi-wl-pprint base bytestring containers data-default
-         FormalGrammars lens newtype parsers semigroups template-haskell
-         transformers trifecta
+         ADPfusion ansi-wl-pprint base bytestring containers data-default
+         FormalGrammars lens newtype parsers PrimitiveArray semigroups
+         template-haskell transformers trifecta
        ];
-       homepage = "http://www.bioinf.uni-leipzig.de/gADP/";
+       homepage = "https://github.com/choener/GrammarProducts";
        description = "Grammar products and higher-dimensional grammars";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -15012,13 +15050,16 @@ self: {
      }) {};
 
   "Unique" = callPackage
-    ({ mkDerivation, base, containers, hashable, unordered-containers
+    ({ mkDerivation, base, containers, extra, hashable
+     , unordered-containers
      }:
      mkDerivation {
        pname = "Unique";
-       version = "0.4";
-       sha256 = "0la9gxr7kl0s606kl5szb1sw3xwh9pnd1ak6iwlxi7b0bm9syik1";
-       buildDepends = [ base containers hashable unordered-containers ];
+       version = "0.4.2";
+       sha256 = "0riyn68bi6wxz2mhqlywva6a1ngfr4k3gglp12dkhcmllh5l3dc2";
+       buildDepends = [
+         base containers extra hashable unordered-containers
+       ];
        jailbreak = true;
        description = "It provides the functionality like unix \"uniq\" utility";
        license = stdenv.lib.licenses.bsd3;
@@ -17030,6 +17071,18 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "acme-operators" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "acme-operators";
+       version = "0.2.0.0";
+       sha256 = "1wf12iphv12srygdvhy7xyja453dzjmm6kd9l2qp00fx986zd01w";
+       buildDepends = [ base ];
+       homepage = "https://github.com/phadej/acme-operators#readme";
+       description = "Operators of base, all in one place!";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "acme-php" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -17712,8 +17765,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-schema";
-       version = "0.3.0.6";
-       sha256 = "0q1ml5q99lwqgppih9zq24nx01z6idcflz30pvl6bljv0xr52wp2";
+       version = "0.3.0.7";
+       sha256 = "1r84ih3bhnzfl3hl6a4ph4x2l25ls11py3mrxqd04kcpyqzsll5g";
        buildDepends = [
          aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck
          regex-base regex-compat regex-pcre scientific syb template-haskell
@@ -18359,12 +18412,12 @@ self: {
      }) {};
 
   "align" = callPackage
-    ({ mkDerivation, base, uglymemo, vector }:
+    ({ mkDerivation, base, containers, transformers, vector }:
      mkDerivation {
        pname = "align";
-       version = "0.1.1.1";
-       sha256 = "1a9a7vmv4sh0aps3cbx2i02i1n9k62pzcahs7swflw0r1b4gzdzv";
-       buildDepends = [ base uglymemo vector ];
+       version = "0.1.1.2";
+       sha256 = "1bv7x687ga563kdnl23smrspljq32bkaarq4zdg071glqckrffq9";
+       buildDepends = [ base containers transformers vector ];
        description = "Sequence alignment algorithms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24420,17 +24473,14 @@ self: {
      }:
      mkDerivation {
        pname = "bimaps";
-       version = "0.0.0.1";
-       sha256 = "0d2gfgamfmgwqzhbv45s2irabqcchlymn151yyd0d0sfsvl26vl6";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.0.0.2";
+       sha256 = "1wipia9lil9r7lhsf9rk82k8ydy5c97qsixg0fia0ms5chmdr7qw";
        buildDepends = [
          aeson base binary cereal containers deepseq hashable primitive
          QuickCheck storable-tuple unordered-containers vector
          vector-binary-instances vector-th-unbox
        ];
-       jailbreak = true;
-       homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
+       homepage = "https://github.com/choener/bimaps";
        description = "bijections with multiple implementations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -26733,7 +26783,7 @@ self: {
      }) {};
 
   "bloodhound" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
      , data-default-class, directory, doctest, doctest-prop, exceptions
      , filepath, hspec, http-client, http-types, mtl, QuickCheck
      , quickcheck-properties, semigroups, text, time, transformers
@@ -26741,17 +26791,18 @@ self: {
      }:
      mkDerivation {
        pname = "bloodhound";
-       version = "0.6.0.1";
-       sha256 = "0xnq8iph7dmc3bd2lvbbjdqqgwjynqz7pywh7qkclqn8rz27flfi";
+       version = "0.7.0.1";
+       sha256 = "1r66nb6vbq1pbh2a97wmsk9iav16ac4ppj5yjv3s5l8qc0rydmjs";
        buildDepends = [
-         aeson base bytestring containers data-default-class exceptions
-         http-client http-types mtl semigroups text time transformers
-         uri-bytestring vector
+         aeson base blaze-builder bytestring containers data-default-class
+         exceptions http-client http-types mtl semigroups text time
+         transformers uri-bytestring vector
        ];
        testDepends = [
-         aeson base containers directory doctest doctest-prop filepath hspec
-         http-client http-types mtl QuickCheck quickcheck-properties
-         semigroups text time unordered-containers vector
+         aeson base bytestring containers directory doctest doctest-prop
+         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";
@@ -30119,10 +30170,8 @@ self: {
      }:
      mkDerivation {
        pname = "cassava";
-       version = "0.4.3.0";
-       revision = "1";
-       sha256 = "0pwcxv1mdn0p6hw2w5fiw4w75mnxphngzj62jw3nbd80bswdp2x3";
-       editedCabalFile = "6410ddebd594ccd8c068cbfb6b064ac43bcebb48fb74cbc25078c89f55e051a7";
+       version = "0.4.3.1";
+       sha256 = "1b62zx6fna0nx3qvs316bwc39l8qan9fpm82f1p28ipkyq0ym2g3";
        buildDepends = [
          array attoparsec base blaze-builder bytestring containers deepseq
          hashable text unordered-containers vector
@@ -32845,8 +32894,8 @@ self: {
     ({ mkDerivation, base, bytestring, HUnit, text }:
      mkDerivation {
        pname = "cmark";
-       version = "0.3.4";
-       sha256 = "0cmrh524s2in66vb51hzfrbxq7z8afh243c8x1378s9hxk0r6xya";
+       version = "0.4.0.1";
+       sha256 = "1kimba33r0f2ify0sxy7x9npqarb9xaw8hih1z6vvf1bkjsji0v3";
        buildDepends = [ base bytestring text ];
        testDepends = [ base HUnit text ];
        homepage = "https://github.com/jgm/commonmark-hs";
@@ -34820,8 +34869,8 @@ self: {
      }:
      mkDerivation {
        pname = "configifier";
-       version = "0.0.4";
-       sha256 = "0wd32v9a0jmz9v732z2ph8spb2kh89zj48350kvvappfbqdfh09a";
+       version = "0.0.5";
+       sha256 = "0k3r8i2mb06kvrqfln0birwd92bwx8m55wpahnbbzs35i35p60vz";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -35156,6 +35205,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "consumers" = callPackage
+    ({ mkDerivation, base, containers, exceptions, hpqtypes
+     , lifted-base, lifted-threads, log, monad-control, mtl, stm, time
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "consumers";
+       version = "0.1";
+       sha256 = "0y977lhxcaxjw6c760fifmisxn62lji0qs8aqgyag6jmzmkfymdb";
+       buildDepends = [
+         base containers exceptions hpqtypes lifted-base lifted-threads log
+         monad-control mtl stm time transformers-base
+       ];
+       homepage = "https://github.com/scrive/consumers";
+       description = "Concurrent PostgreSQL data consumers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "container-classes" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -41424,8 +41491,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-builder";
-       version = "0.7.0.4";
-       sha256 = "1nxb6fpcjkcwyihhd0dj9zs72flhhg4g9g7r2xlbdi5l7j3kpkjg";
+       version = "0.7.1";
+       sha256 = "1cfmklds0l2jyn7p2hldq0riq4m01dxfg9cran6sx65a7d82x96d";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -42056,8 +42123,8 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-aeson";
-       version = "1.1.15";
-       sha256 = "19zjn3cykxyrk0dblmrvbrmggnsxigfxvhjnjmrq60z1iljvrqrr";
+       version = "1.1.16";
+       sha256 = "0v01applw92imi3yr6drd1bqig1l1mlps1ia2i1dcln1sh31ms9y";
        buildDepends = [
          aeson base containers digestive-functors lens lens-aeson safe text
          vector
@@ -42066,7 +42133,6 @@ self: {
          aeson base bytestring digestive-functors HUnit mtl scientific tasty
          tasty-hunit text
        ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/digestive-functors-aeson";
        description = "Run digestive-functors forms against JSON";
        license = stdenv.lib.licenses.gpl3;
@@ -46208,8 +46274,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io";
-       version = "1.2.9";
-       sha256 = "0ral95ywkni205gmn2q58fpibaf4a1y5dxawkc5rq5j0wnmh465j";
+       version = "1.2.10";
+       sha256 = "02wc4fdwrnaw934bxk39bfndzn2rjdcaa3rifcj84ap750fx16h0";
        buildDepends = [
          aeson async attoparsec base base64-bytestring bytestring either
          free monad-loops mwc-random stm stm-delay text transformers
@@ -47014,8 +47080,8 @@ self: {
      }:
      mkDerivation {
        pname = "esqueleto";
-       version = "2.2.7";
-       sha256 = "1i5gm1riirz8wq2zr2a2fxlnxa7c5rrvywyigbx2gla9xi07dzs6";
+       version = "2.2.10";
+       sha256 = "0chxxcy52xrhdq7pgwzq3vk9filrrc3mdnx6j26r2ih56j1ac02l";
        buildDepends = [
          base conduit monad-logger persistent resourcet tagged text
          transformers unordered-containers
@@ -51256,8 +51322,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-http";
-       version = "0.1.1.1";
-       sha256 = "1gifjrz7bmrcyv6pc6gl55vw0vmnzjzjhvslwvj8p8c8xbv2fxrh";
+       version = "0.1.1.3";
+       sha256 = "1gmafmi0mrmbm7a08cxiz96s43k4sc38wvzrnmcrqcl44a1n38fm";
        buildDepends = [
          base bytestring free http-client http-types mtl QuickCheck text
          time transformers
@@ -51569,8 +51635,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, transformers }:
      mkDerivation {
        pname = "frpnow";
-       version = "0.11";
-       sha256 = "0lvlgn1bv9flhs9x3i5zf1zd6l7nd4i3asscc0nmqmpnidcmlkcn";
+       version = "0.13";
+       sha256 = "13dvyf1zwzvcpal7zp1jx5ns49a01jsjn3pz0iqdrph7qgll2aqr";
        buildDepends = [ base containers mtl transformers ];
        homepage = "https://github.com/atzeus/FRPNow";
        description = "Principled practical FRP";
@@ -53177,8 +53243,8 @@ self: {
      }:
      mkDerivation {
        pname = "getopt-generics";
-       version = "0.7.1.1";
-       sha256 = "1zhglg3h6a6sx3chq9h6j2r279f2753j026mz8kb9v4lajj5vcn0";
+       version = "0.8";
+       sha256 = "0qxdr9y3dvr4w7hhbgkianaijsqfh36gfwh1blhbr1nf7cv9khmd";
        buildDepends = [
          base base-compat base-orphans generics-sop tagged
        ];
@@ -62790,18 +62856,18 @@ self: {
 
   "hat" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , haskeline, haskell-src-exts, old-locale, old-time, process
-     , random
+     , haskeline, haskell-src-exts, old-locale, old-time, polyparse
+     , process, random
      }:
      mkDerivation {
        pname = "hat";
-       version = "2.8.0.0";
-       sha256 = "06qb34g2kxsldkgpw02xs7cknhj6igfwgjxi2fxyr2856y8laj0j";
+       version = "2.9.0.0";
+       sha256 = "05sbgq1mliahdn4qj7flgw7klrm67r2mz7gxs03i6lx6mi3phm9f";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base bytestring containers directory filepath haskeline
-         haskell-src-exts old-locale old-time process random
+         haskell-src-exts old-locale old-time polyparse process random
        ];
        homepage = "http://projects.haskell.org/hat/";
        description = "The Haskell tracer, generating and viewing Haskell execution traces";
@@ -63040,8 +63106,8 @@ self: {
      }) {};
 
   "hayland" = callPackage
-    ({ mkDerivation, base, data-flags, process, template-haskell, time
-     , wayland-client, wayland-cursor, wayland-egl, wayland-server, xml
+    ({ mkDerivation, base, data-flags, mesa, process, template-haskell
+     , time, wayland, xml
      }:
      mkDerivation {
        pname = "hayland";
@@ -63053,15 +63119,12 @@ self: {
          base data-flags process template-haskell time xml
        ];
        testDepends = [ base process xml ];
-       extraLibraries = [
-         wayland-client wayland-cursor wayland-egl wayland-server
-       ];
+       extraLibraries = [ mesa wayland ];
        jailbreak = true;
        description = "Haskell bindings for the C Wayland library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { wayland-client = null;  wayland-cursor = null;
-          wayland-egl = null;  wayland-server = null;};
+     }) { inherit (pkgs) mesa;  inherit (pkgs) wayland;};
 
   "hayoo-cli" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
@@ -68399,8 +68462,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.5.2";
-       sha256 = "12671fsydxxkdpk47nmzm9qc5vlss6802bypx690z8c982s4vbr1";
+       version = "0.5.4";
+       sha256 = "1ghj80w5hx736hkr9z827s4f2fli5r4y0q3ka9ay706k5lj0g9xa";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -73566,8 +73629,8 @@ self: {
      }:
      mkDerivation {
        pname = "hwsl2";
-       version = "0.3.0.1";
-       sha256 = "1zs1wlnvh316n914mrlihrd4njbnq9n070ckq5f7hbax37v3h9p5";
+       version = "0.3.2.0";
+       sha256 = "0y3k9xlhzvscbwzrhxgiqf9s3724zak1nbnf6lcaynpzk4p8jmm1";
        buildDepends = [ base bytestring ];
        testDepends = [
          base bytestring Cabal cabal-test-quickcheck QuickCheck
@@ -73579,6 +73642,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hwsl2-bytevector" = callPackage
+    ({ mkDerivation, base, bytestring, fingertree, hwsl2 }:
+     mkDerivation {
+       pname = "hwsl2-bytevector";
+       version = "0.1.0.0";
+       sha256 = "0kfsc85k4vgdbkryrw80rgpjzzbavwqqzqylc95h80vm7xnlg2p9";
+       buildDepends = [ base bytestring fingertree hwsl2 ];
+       homepage = "https://github.com/srijs/hwsl2-haskell-bytevector";
+       description = "A hashed byte-vector based on algebraic hashes and finger trees";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hwsl2-reducers" = callPackage
     ({ mkDerivation, base, bytestring, hwsl2, reducers, semigroups }:
      mkDerivation {
@@ -76068,12 +76143,58 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "instant-aeson" = callPackage
+    ({ mkDerivation, aeson, base, instant-generics, tasty
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "instant-aeson";
+       version = "0.1";
+       sha256 = "1idxwd0wxy6xziwlwnjwgbv9canpvwbnigrcjn3kvl0j7nld6wvj";
+       buildDepends = [ aeson base instant-generics ];
+       testDepends = [
+         aeson base instant-generics tasty tasty-quickcheck
+       ];
+       jailbreak = true;
+       description = "Generic Aeson instances through instant-generics";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "instant-bytes" = callPackage
+    ({ mkDerivation, base, bytes, instant-generics, tasty
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "instant-bytes";
+       version = "0.1";
+       sha256 = "0gjj7ix1dxlbk1im2ww3qpfx4m40vg0hl7n9ribnlx2krw53mmm1";
+       buildDepends = [ base bytes instant-generics ];
+       testDepends = [
+         base bytes instant-generics tasty tasty-quickcheck
+       ];
+       jailbreak = true;
+       description = "Generic Serial instances through instant-generics";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "instant-deepseq" = callPackage
+    ({ mkDerivation, base, deepseq, instant-generics }:
+     mkDerivation {
+       pname = "instant-deepseq";
+       version = "0.1";
+       sha256 = "13w4ilnjm6m9idqkxzp0l91f156n097zlhmpny1lamy5brvzpls0";
+       buildDepends = [ base deepseq instant-generics ];
+       jailbreak = true;
+       description = "Generic NFData instances through instant-generics";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "instant-generics" = callPackage
     ({ mkDerivation, base, containers, syb, template-haskell }:
      mkDerivation {
        pname = "instant-generics";
-       version = "0.4.1";
-       sha256 = "1jcs6spa3g8mazgpivn61gz4c740ks19rkz9sh24ns6n4q53zdvq";
+       version = "0.5";
+       sha256 = "174avn0jjxv4h04m6k85gvv6x3kvrlwhcbhqg9ih0ps5mp7crmvr";
        buildDepends = [ base containers syb template-haskell ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
        description = "Generic programming library with a sum of products view";
@@ -76081,6 +76202,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "instant-hashable" = callPackage
+    ({ mkDerivation, base, hashable, instant-generics }:
+     mkDerivation {
+       pname = "instant-hashable";
+       version = "0.1";
+       sha256 = "0bqn9na0pxkkffmwwz6p4rgv11fq2mn724sk4l7nxv44k7vrirz2";
+       buildDepends = [ base hashable instant-generics ];
+       jailbreak = true;
+       description = "Generic Hashable instances through instant-generics";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "instant-zipper" = callPackage
     ({ mkDerivation, base, instant-generics, mtl }:
      mkDerivation {
@@ -78374,12 +78507,11 @@ self: {
      }:
      mkDerivation {
        pname = "json-assertions";
-       version = "1.0.6";
-       sha256 = "00bjmbx4rbbijdhcpbnbjilfm030ml2lpvsf4c89vx1fyzin1nrj";
+       version = "1.0.7";
+       sha256 = "1x73szyqb6w1hnhb4ab8dfc7hwn12avj4304jnr8lyxjg08hfaqa";
        buildDepends = [
          aeson base indexed indexed-free lens lens-aeson text
        ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/json-assertions.git";
        description = "Test that your (Aeson) JSON encoding matches your expectations";
        license = stdenv.lib.licenses.bsd3;
@@ -82158,8 +82290,10 @@ self: {
      }:
      mkDerivation {
        pname = "lens";
-       version = "4.12";
-       sha256 = "195fhzw8z15zrbav7mdzia052g7sfy7zm5banjkk3azsb9mjvvan";
+       version = "4.12.1";
+       revision = "1";
+       sha256 = "0rzi0z5vz78v99f1hk8izixhxf3linz3xjkancg8x65g03brwl33";
+       editedCabalFile = "fedce7a783a5a622bb19e00145e775ff8ea7d797f71fd22c9eb2257672b7f741";
        buildDepends = [
          array base base-orphans bifunctors bytestring comonad containers
          contravariant distributive exceptions filepath free ghc-prim
@@ -82207,9 +82341,9 @@ self: {
      mkDerivation {
        pname = "lens-aeson";
        version = "1.0.0.4";
-       revision = "1";
+       revision = "2";
        sha256 = "0zjl645y4bwg3pvld8z4vj9rdpdy6fja2cx63d85k37zp5n98y7v";
-       editedCabalFile = "252661ca9f157ea5cb0aa6684c50fa1b84a2a3ed300c2eaec9ffb82eb18e7ddd";
+       editedCabalFile = "f9ddeac68a237cb5dbe8ab7457fb7529bdeeb675c5e80bc122e196255072393d";
        buildDepends = [
          aeson attoparsec base bytestring lens scientific text
          unordered-containers vector
@@ -83524,8 +83658,8 @@ self: {
      }:
      mkDerivation {
        pname = "linear";
-       version = "1.19.1.2";
-       sha256 = "1bxzy4735xc0zdxmwrspmjcn4p61kjwzxi8agjfx7w1dsyah2if3";
+       version = "1.19.1.3";
+       sha256 = "1hprmhs1nm6l81kpnnznz92l66j10z4asn3g3l9c47165q881592";
        buildDepends = [
          adjunctions base binary bytes cereal containers deepseq
          distributive ghc-prim hashable lens reflection semigroupoids
@@ -83536,7 +83670,6 @@ self: {
          base binary bytestring directory doctest filepath HUnit lens
          simple-reflect test-framework test-framework-hunit
        ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/linear/";
        description = "Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
@@ -86823,8 +86956,8 @@ self: {
      }:
      mkDerivation {
        pname = "mangopay";
-       version = "1.11.2";
-       sha256 = "06f1gj877cnhjp5dh4gxza9vr6x3l2c3ppschdhkyj1ly65q3z5q";
+       version = "1.11.3";
+       sha256 = "1w9p0na0am2hl8f32qgkdym00kjjnavv1wxp6f4vh9msa6cfw6yl";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -87341,10 +87474,8 @@ self: {
      }:
      mkDerivation {
        pname = "matrix";
-       version = "0.3.4.3";
-       revision = "1";
-       sha256 = "1nshgxiza384xh7h22qgbwa75bylc1l3gh6dsm51axapr1ldi8gg";
-       editedCabalFile = "f586a9d89c7279218a0436d0b8a6adaabc22414caca30774904821bd40cc5ace";
+       version = "0.3.4.4";
+       sha256 = "03aaw60x8849rsrcqc8n0d3k8a6dp8naxnqfq2xq776q5zbbcrpv";
        buildDepends = [ base deepseq loop primitive vector ];
        testDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A native implementation of matrix operations";
@@ -89779,12 +89910,9 @@ self: {
     ({ mkDerivation, base, extensible-exceptions, transformers }:
      mkDerivation {
        pname = "monad-peel";
-       version = "0.1.1";
-       revision = "1";
-       sha256 = "0n3cxa94wd3hjvy9jgf3d8p7qfb9jaaf29simjya7rlcb673pg3l";
-       editedCabalFile = "64e1f99ea3e8c36d5d4e86794d1fc02966e7036b43ae4e1dcf01ade192962611";
+       version = "0.2";
+       sha256 = "1cg6j2qhh14ryn4766dwx57g50qalzcv79rx9ysdgkskkjs6fiix";
        buildDepends = [ base extensible-exceptions transformers ];
-       jailbreak = true;
        homepage = "http://andersk.mit.edu/haskell/monad-peel/";
        description = "Lift control operations like exception catching through monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -90444,8 +90572,8 @@ self: {
      }:
      mkDerivation {
        pname = "monoid-subclasses";
-       version = "0.4.1";
-       sha256 = "0wgy0cqi2x12xn1sbxwfbwzj6bii2b6rhf8gi4q2jja5nh04a4vz";
+       version = "0.4.1.1";
+       sha256 = "0r2ypb85qz88jz70pr4rgygwsdslaw781s0d3svd6s7xfibi9hww";
        buildDepends = [ base bytestring containers primes text vector ];
        testDepends = [
          base bytestring containers primes QuickCheck quickcheck-instances
@@ -97325,8 +97453,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "1.15.0.5";
-       sha256 = "0js3k6kvq506yssx5d4wwx9hsd0pm81k8g0rpd7wi2aixibs2jj2";
+       version = "1.15.0.6";
+       sha256 = "0ipdy5wl2qb8nvmdka9si17hvxn38xmv5pzpb9v5lvaj8a0rcl6r";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -97455,14 +97583,14 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-types";
-       version = "1.12.4.4";
-       sha256 = "0qk62cn8j3ml0fc12ikfw0pp2b6gqlfn96n5jv9dvyajxqxrby5g";
+       version = "1.12.4.5";
+       sha256 = "0yw7mkhx63320vqabql2iqnmkrwh1qs670sicqpcvv73dchdp8c7";
        buildDepends = [
          aeson base bytestring containers deepseq-generics ghc-prim syb
        ];
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Types for representing a structured document";
-       license = "GPL";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "pandoc-unlit" = callPackage
@@ -100223,8 +100351,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-cliff";
-       version = "0.10.0.2";
-       sha256 = "1j912dshjf2pdj87rlib4nqd00i99hz74cxhrf2ddlaabml9fs98";
+       version = "0.10.0.4";
+       sha256 = "0czgzmfl5rs0p63x24zr4pcl01a0wy93hx8wpin9k61yfx7bb4ix";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -102292,6 +102420,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) adns;  inherit (pkgs) openssl;};
 
+  "potato-tool" = callPackage
+    ({ mkDerivation, base, binary, bytestring, split }:
+     mkDerivation {
+       pname = "potato-tool";
+       version = "0.1.0.1";
+       sha256 = "02y6syz54vc4brbpy4760xd2jlwbfqghn7k2ccy4kxz4xzhm9cdw";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ base binary bytestring split ];
+       homepage = "https://github.com/RossMeikleham/Potato_Tool";
+       description = "Command line Dreamcast VMU filesystem toolset";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "potrace" = callPackage
     ({ mkDerivation, base, bindings-potrace, bytestring, containers
      , data-default, JuicyPixels, vector
@@ -103995,8 +104137,8 @@ self: {
      }:
      mkDerivation {
        pname = "pseudo-boolean";
-       version = "0.1.1.0";
-       sha256 = "0j80pwmp8jpkmh0k76v9mqa3xcbdhb0r4sgq1nkfdf4gm5mn7v03";
+       version = "0.1.2.0";
+       sha256 = "13bgv7kkglajrvng7vcy7qv9x8xlm0nrv8in8zh5w5m6xl7i5wkz";
        buildDepends = [
          attoparsec base bytestring bytestring-builder containers deepseq
          dlist hashable parsec
@@ -105555,11 +105697,10 @@ self: {
      }:
      mkDerivation {
        pname = "rainbow";
-       version = "0.26.0.4";
-       sha256 = "1ic6163igf0c815crccss42czdhnrg3y8rfqr05wqy0m4vza0nx4";
+       version = "0.26.0.6";
+       sha256 = "1v0za967cp1205fkbwglf28yn2pslp7dvyqb3rbym3j7r3pby3zc";
        buildDepends = [ base bytestring lens process text ];
        testDepends = [ base bytestring lens process QuickCheck text ];
-       jailbreak = true;
        homepage = "https://www.github.com/massysett/rainbow";
        description = "Print text to terminal with colors and effects";
        license = stdenv.lib.licenses.bsd3;
@@ -105582,16 +105723,16 @@ self: {
      }) {};
 
   "rainbox" = callPackage
-    ({ mkDerivation, base, bytestring, containers, QuickCheck, rainbow
-     , tasty, tasty-quickcheck, text
+    ({ mkDerivation, base, bytestring, containers, lens, QuickCheck
+     , rainbow, tasty, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "rainbox";
-       version = "0.16.0.0";
-       sha256 = "0aihr386m1n5p0d4iym5rvg74ihdm180sm6b4mqmiihhl00lr1p2";
-       buildDepends = [ base bytestring containers rainbow text ];
+       version = "0.18.0.2";
+       sha256 = "1dczbs4y8yzvp132cfy0fl1jv2zf2nm6d3zn4j4pmy2p8cxs1g4v";
+       buildDepends = [ base bytestring containers lens rainbow text ];
        testDepends = [
-         base bytestring containers QuickCheck rainbow tasty
+         base bytestring containers lens QuickCheck rainbow tasty
          tasty-quickcheck text
        ];
        homepage = "http://www.github.com/massysett/rainbox";
@@ -108317,6 +108458,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "repa-linear-algebra" = callPackage
+    ({ mkDerivation, base, hmatrix, repa, vector }:
+     mkDerivation {
+       pname = "repa-linear-algebra";
+       version = "0.0.0.0";
+       sha256 = "1y16rmdygxay46xbm617g944aazml48izzmkx46avvqvjyql96w1";
+       buildDepends = [ base hmatrix repa vector ];
+       homepage = "https://github.com/marcinmrotek/repa-linear-algebra";
+       description = "HMatrix operations for Repa";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "repa-plugin" = callPackage
     ({ mkDerivation, base, containers, ddc-base, ddc-core
      , ddc-core-flow, ddc-core-simpl, ghc, mtl
@@ -114434,6 +114587,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shortcut-links" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "shortcut-links";
+       version = "0.3.0.0";
+       sha256 = "14g1s2gb1jc52zifn00n1w35qckv7p620rqhpn7rfhymlz6b07rz";
+       buildDepends = [ base text ];
+       homepage = "http://github.com/aelve/shortcut-links";
+       description = "Link shortcuts for use in text markup";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "shorten-strings" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -116117,12 +116282,12 @@ self: {
      }) {};
 
   "smoothie" = callPackage
-    ({ mkDerivation, aeson, base, linear, vector }:
+    ({ mkDerivation, aeson, base, linear, text, vector }:
      mkDerivation {
        pname = "smoothie";
-       version = "0.3.3.2";
-       sha256 = "0jkcy45rxq14ma11h4dakv8ixwzynlml02yd3nmncmlm8vzpah8n";
-       buildDepends = [ aeson base linear vector ];
+       version = "0.4";
+       sha256 = "0j8nwc44q9l7wf4m3z7r32b7if7is21k3xgmi2206r4i1yxc869j";
+       buildDepends = [ aeson base linear text vector ];
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
        license = stdenv.lib.licenses.bsd3;
@@ -117573,8 +117738,8 @@ self: {
      }:
      mkDerivation {
        pname = "soap";
-       version = "0.2.2.5";
-       sha256 = "1imh9g2my0d981prai69yr9yf7linvaijcn80zlyaz44pasxnrw7";
+       version = "0.2.2.7";
+       sha256 = "02yirl0pr680pbwbh9z0awyk4blgdd0rir8x1gyydyn6v5dg736i";
        buildDepends = [
          base bytestring conduit configurator data-default exceptions
          http-client http-types iconv mtl resourcet text
@@ -117689,8 +117854,8 @@ self: {
      }:
      mkDerivation {
        pname = "socket-io";
-       version = "1.3.2";
-       sha256 = "0bqrglnp54hd777lq92ia7z9vwmj1dq24m7lbiqhzvvb63p9mv4i";
+       version = "1.3.3";
+       sha256 = "1gy8g8bxjjj1hifkhvid6v8amml0gpp6gbfpih3v0grbi5aci0w7";
        buildDepends = [
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
@@ -121098,10 +121263,10 @@ self: {
      mkDerivation {
        pname = "stripe-haskell";
        version = "0.1.4.1";
-       sha256 = "a0ffc70616d4eb86a9e0e0fcb1751cc48f3b6f618d07cf2bb96090276d64d218";
+       sha256 = "066jcinjg430p4mwy1wdc5pkp3y43isv3z70w2lqdsyl2q3cgzx0";
        buildDepends = [
-         aeson base bytestring either HsOpenSSL http-streams io-streams mtl
-         random text time transformers unordered-containers
+         aeson base bytestring either HsOpenSSL hspec http-streams
+         io-streams mtl random text time transformers unordered-containers
        ];
        testDepends = [
          aeson base bytestring either HsOpenSSL hspec http-streams random
@@ -125311,8 +125476,8 @@ self: {
      }:
      mkDerivation {
        pname = "text1";
-       version = "0.0.1";
-       sha256 = "15nb4izk4j0hg2hhynrjd5vjnpg240rlcp489w4hm4b4nmpdd4cj";
+       version = "0.0.2";
+       sha256 = "0xkp0kw4xm8ppkhzplcx79cx9d5slk8qb8amcjiiy71ihj87b0vi";
        buildDepends = [ base binary lens semigroups text ];
        testDepends = [
          base directory doctest filepath QuickCheck template-haskell
@@ -125678,8 +125843,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-orphans";
-       version = "0.12.1";
-       sha256 = "11vndilqcx9scbb988xzpaj823g65a7b7vx6jzf9r3nb808kyb2j";
+       version = "0.12.2";
+       sha256 = "0435l20vzsr6p4app6riyf242hcqizbypf4f5v17wjy3ihw0jddb";
        buildDepends = [
          base mtl nats template-haskell th-lift th-reify-many
        ];
@@ -125738,18 +125903,18 @@ self: {
      }) {};
 
   "th-typegraph" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, data-default
-     , deepseq, ghc-prim, haskell-src-exts, hspec, hspec-core, lens, mtl
-     , syb, template-haskell, text, th-desugar, th-orphans
-     , th-reify-many
+    ({ mkDerivation, array, base, base-compat, bytestring, containers
+     , data-default, deepseq, ghc-prim, haskell-src-exts, hspec
+     , hspec-core, lens, mtl, set-extra, syb, template-haskell, text
+     , th-desugar, th-orphans, th-reify-many
      }:
      mkDerivation {
        pname = "th-typegraph";
-       version = "0.18";
-       sha256 = "0z47q4sj5z3ajv17d4rda8zaqbbay36x1z6vy8i5c1g6971y8vs5";
+       version = "0.21";
+       sha256 = "1w4k466snhkcdg30kzzc2vwiz2p46ybks1bbyf3nazc322zxryq0";
        buildDepends = [
-         base containers data-default haskell-src-exts lens mtl syb
-         template-haskell th-desugar th-orphans
+         base base-compat containers data-default haskell-src-exts lens mtl
+         set-extra syb template-haskell th-desugar th-orphans
        ];
        testDepends = [
          array base bytestring containers data-default deepseq ghc-prim
@@ -139873,13 +140038,12 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-sass";
-       version = "0.1.1.0";
-       sha256 = "19l93rx70xbyllwddyq0c8326cfqyvx13hpvj71k9mbwkis16ccx";
+       version = "0.1.2.0";
+       sha256 = "0mxk007csmzbrx169jlbg07vqm7ixjrfvjy6xa2lfd5g1xpc7s94";
        buildDepends = [
          base data-default hsass shakespeare template-haskell text
          yesod-core
        ];
-       jailbreak = true;
        description = "A simple quasiquoter to include sass code in yesod";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -140097,8 +140261,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-transloadit";
-       version = "0.2.0.0";
-       sha256 = "0zr36i9bpf2x8jav31gb2gc3i8hyfn7k1yizvbk2zcjcp9iiphhw";
+       version = "0.2.1.0";
+       sha256 = "1x4sbjzlx5kxwcsywb90milk5s7shgggsqjsq7zrys28w079y00k";
        buildDepends = [
          aeson base byteable bytestring cryptohash lens lens-aeson
          old-locale shakespeare text time transformers yesod yesod-core
@@ -140829,6 +140993,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "zero" = callPackage
+    ({ mkDerivation, base, semigroups }:
+     mkDerivation {
+       pname = "zero";
+       version = "0.1.1";
+       sha256 = "1ksmhp7lvgapi9mp3q5i5prxgrxsamnvv0883nbw09vfpvg9ms2l";
+       buildDepends = [ base semigroups ];
+       homepage = "https://github.com/phaazon/zero";
+       description = "Semigroups with absorption";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "zeromq-haskell" = callPackage
     ({ mkDerivation, base, bytestring, containers, QuickCheck
      , test-framework, test-framework-quickcheck2, zeromq

From 32a81524fe99f541b1a8601c7e800d27e681b934 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 17 Jul 2015 14:13:40 +0200
Subject: [PATCH 2254/2322] release-lib: rename config option "inHydra" to
 "allowTexliveBuilds"

Also, take the value of that attribute as an argument to the module so
that Hydra maintainers who don't mind building TexLive have a chance to
do so.
---
 pkgs/tools/typesetting/tex/texlive/default.nix | 2 +-
 pkgs/top-level/release-lib.nix                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 7e0a165ae89..fe8809e8263 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -1,7 +1,7 @@
 args : with args;
 
 rec {
-  src = assert !config.inHydra or false; fetchurl {
+  src = assert config.allowTexliveBuilds or false; fetchurl {
     url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140926.35254.orig.tar.xz;
     sha256 = "1c39x059jhn5jsy6i9j3akjbkm1kmmzssy1jyi1aw20rl2vp86w3";
   };
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 8c66964ba72..ab26ba2fe74 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -1,4 +1,4 @@
-{ supportedSystems, packageSet ? (import ./all-packages.nix) }:
+{ supportedSystems, packageSet ? (import ./all-packages.nix), allowTexliveBuilds ? false }:
 
 with import ../../lib;
 
@@ -7,7 +7,7 @@ rec {
   # Ensure that we don't build packages marked as unfree.
   allPackages = args: packageSet (args // {
     config.allowUnfree = false;
-    config.inHydra = true;
+    config.allowTexliveBuilds = allowTexliveBuilds;
   });
 
   pkgs = pkgsFor "x86_64-linux";

From a5de21c230c596d7be99bf31ad3ca07124d973c1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 17 Jul 2015 15:33:49 +0200
Subject: [PATCH 2255/2322] release-lib.nix: set inHydra anyways, it might be
 useful some day

---
 pkgs/top-level/release-lib.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index ab26ba2fe74..15380ea43c8 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -8,6 +8,7 @@ rec {
   allPackages = args: packageSet (args // {
     config.allowUnfree = false;
     config.allowTexliveBuilds = allowTexliveBuilds;
+    config.inHydra = true;
   });
 
   pkgs = pkgsFor "x86_64-linux";

From 19e5fd60b332a35986f3a3776e47e8e039bbf192 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Fri, 17 Jul 2015 17:01:07 +0300
Subject: [PATCH 2256/2322] slim: use nixos theme by default

---
 nixos/modules/services/x11/display-managers/slim.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index c7fbfa85e33..545f4283828 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -56,7 +56,10 @@ in
 
       theme = mkOption {
         type = types.nullOr types.path;
-        default = null;
+        default = pkgs.fetchurl {
+          url    = https://github.com/jagajaga/nixos-slim-theme/archive/1.1.tar.gz;
+          sha256 = "66c3020a6716130a20c3898567339b990fbd7888a3b7bbcb688f6544d1c05c31";
+        };
         example = literalExample ''
           pkgs.fetchurl {
             url = "mirror://sourceforge/slim.berlios/slim-wave.tar.gz";

From 15be920354d899cc2e5dfd1b52d1039f942d1777 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 17 Jul 2015 17:00:20 +0200
Subject: [PATCH 2257/2322] doc: gnu hello is much simpler than cpio

This patch changes the documentation about simple packages. cpio was
listed as simplest possible package, which is not true anymore, gnu
hello is much simpler.
---
 doc/quick-start.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/quick-start.xml b/doc/quick-start.xml
index c0f96f87152..8d51f4c30e6 100644
--- a/doc/quick-start.xml
+++ b/doc/quick-start.xml
@@ -55,18 +55,18 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen>
       <itemizedlist>
 
         <listitem>
-          <para>GNU cpio: <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>.
-          The simplest possible package.  The generic builder in
-          <varname>stdenv</varname> does everything for you.  It has
-          no dependencies beyond <varname>stdenv</varname>.</para>
+          <para>GNU Hello: <link
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/ex-2/default.nix"><filename>pkgs/applications/misc/hello/ex-2/default.nix</filename></link>.
+          Trivial package, which specifies some <varname>meta</varname>
+          attributes which is good practice.</para>
         </listitem>
 
         <listitem>
-          <para>GNU Hello: <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/ex-2/default.nix"><filename>pkgs/applications/misc/hello/ex-2/default.nix</filename></link>.
-          Also trivial, but it specifies some <varname>meta</varname>
-          attributes which is good practice.</para>
+          <para>GNU cpio: <link
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>.
+          Also a simple package. The generic builder in
+          <varname>stdenv</varname> does everything for you. It has
+          no dependencies beyond <varname>stdenv</varname>.</para>
         </listitem>
 
         <listitem>

From 6e5308df3f12013f81548e2311c81535e2c1f12e Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 18 Jul 2015 00:19:39 +0900
Subject: [PATCH 2258/2322] flashplayer: 11.2.202.481 -> 11.2.202.491

---
 .../browsers/mozilla-plugins/flashplayer-11/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index 7eed1b9a04d..0ded56b8aba 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -36,7 +36,7 @@
 
 let
   # -> http://get.adobe.com/flashplayer/
-  version = "11.2.202.481";
+  version = "11.2.202.491";
 
   src =
     if stdenv.system == "x86_64-linux" then
@@ -47,7 +47,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "151di671xqywjif3v4hbsfw55jyd5x5qjq2zc92xw367pssi29yz";
+        sha256 = "150zlnkq8jhhphfmyzdrpgi1y2sniqgx0a5ij994in3gvari9gpl";
       }
     else if stdenv.system == "i686-linux" then
       if debug then
@@ -60,7 +60,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "05ydrw1ykp49b409bkpvizhf1bz1xmfxa7alfdnabvg90vkfvyvn";
+        sha256 = "0lwff46gjazjv04fpck0nhv47b4z1x79n09q5444npm1w5zjfgxy";
       }
     else throw "Flash Player is not supported on this platform";
 

From 5ec54be2354eb2da52f267f95d6ef6224c7167d0 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 17 Jul 2015 17:51:11 +0200
Subject: [PATCH 2259/2322] znc: add back 1.4 because xchat does not support
 TLS

---
 pkgs/applications/networking/znc/1.4.nix | 35 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/networking/znc/1.4.nix

diff --git a/pkgs/applications/networking/znc/1.4.nix b/pkgs/applications/networking/znc/1.4.nix
new file mode 100644
index 00000000000..fdd02aac0b5
--- /dev/null
+++ b/pkgs/applications/networking/znc/1.4.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, openssl, pkgconfig
+, withPerl ? false, perl
+, withPython ? false, python3
+, withTcl ? false, tcl
+, withCyrus ? true, cyrus_sasl
+}:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "znc-1.4";
+
+  src = fetchurl {
+    url = "http://znc.in/releases/${name}.tar.gz";
+    sha256 = "0lkv58pq4d5lzcyx8v8anzinx0sx0zw0js4jij13jb8qxp88zsc6";
+  };
+
+  buildInputs = [ openssl pkgconfig ]
+    ++ optional withPerl perl
+    ++ optional withPython python3
+    ++ optional withTcl tcl
+    ++ optional withCyrus cyrus_sasl;
+
+  configureFlags = optionalString withPerl "--enable-perl "
+    + optionalString withPython "--enable-python "
+    + optionalString withTcl "--enable-tcl --with-tcl=${tcl}/lib "
+    + optionalString withCyrus "--enable-cyrus ";
+
+  meta = with stdenv.lib; {
+    description = "Advanced IRC bouncer";
+    homepage = http://wiki.znc.in/ZNC;
+    maintainers = with maintainers; [ viric ];
+    license = licenses.asl20;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2b7a112538..cdb271b3664 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15077,6 +15077,8 @@ let
 
   znc = callPackage ../applications/networking/znc { };
 
+  znc_14 = callPackage ../applications/networking/znc/1.4.nix { };
+
   zncModules = recurseIntoAttrs (
     callPackage ../applications/networking/znc/modules.nix { }
   );

From 883517f37cd8970c2b3adb812a6c55a758d8b61a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 17 Jul 2015 18:09:50 +0200
Subject: [PATCH 2260/2322] phpfpm: use latest php

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

diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix
index 8551e3ccdeb..41dbfff41cf 100644
--- a/nixos/modules/services/web-servers/phpfpm.nix
+++ b/nixos/modules/services/web-servers/phpfpm.nix
@@ -36,7 +36,7 @@ in {
       };
 
       phpPackage = mkOption {
-        default = pkgs.php54;
+        default = pkgs.php;
         description = ''
           The PHP package to use for running the FPM service.
         '';

From fc5b0f826f0ca42270428f58631731f156436645 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 17 Jul 2015 18:18:43 +0200
Subject: [PATCH 2261/2322] release notes: phpfpm now using default php instead
 of php54

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

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 0af85374566..0b7750b0591 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -171,6 +171,13 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.cabal-install
  </para>
 </listitem>
 
+<listitem>
+  <para>
+    The <literal>phpfpm</literal> is now using the default PHP version
+    (<literal>pkgs.php</literal>) instead of PHP 5.4 (<literal>pkgs.php54</literal>).
+  </para>
+</listitem>
+
 </itemizedlist>
 </para>
 

From 026f09cea59f4e21e2c99a41e15a8a3bdf8abcb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 7 Jul 2015 12:10:32 +0200
Subject: [PATCH 2262/2322] Updating gtkwave 3.3.64 to 3.3.66

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

diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 1a5b1f92276..36c3b7e899d 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}:
 stdenv.mkDerivation rec {
-  name = "gtkwave-3.3.64";
+  name = "gtkwave-3.3.66";
 
   src = fetchurl {
     url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "05bisdh82rsbs0pj0687dzbp0s30p3wzq4gypb9bbjaxwnrmdsfs";
+    sha256 = "17mrmgr6zzl1x1qml0wmjjhcbw7bg3w4mqy60rsy0z6gxd8hikh4";
   };
 
   buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ];

From ce597e1e1b6d1a59b10e39bb1fa16979ff0d1bf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 17 Jul 2015 18:22:27 +0200
Subject: [PATCH 2263/2322] updating tor to 0.2.6.10

I checked the tarball signature.

I fixed the optimised build (broken since 2013) and I added seccomp.
---
 pkgs/tools/security/tor/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index bfa1a0ab9f4..525259bdb02 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, libevent, openssl, zlib, torsocks }:
+{ stdenv, fetchurl, libevent, openssl, zlib, torsocks, libseccomp }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.2.6.9";
+  name = "tor-0.2.6.10";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz";
-    sha256 = "171gjhapymfzql3bbx5qndgkamcfdl6lincrqlr7i3d9i6njjv2a";
+    sha256 = "0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d";
   };
 
   # Note: torsocks is specified as a dependency, as the distributed
   # 'torify' wrapper attempts to use it; although there is no
   # ./configure time check for any of this.
-  buildInputs = [ libevent openssl zlib torsocks ];
+  buildInputs = [ libevent openssl zlib torsocks libseccomp ];
 
-  CFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";
+  NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";
 
   # Patch 'torify' to point directly to torsocks.
   patchPhase = ''

From 5e7850f08838a7823d2a99c48f8f5f0acf61d9cb Mon Sep 17 00:00:00 2001
From: Robin Gloster <robin@loc-com.de>
Date: Fri, 17 Jul 2015 16:33:49 +0000
Subject: [PATCH 2264/2322] php70: init at 7.0beta1

The first beta of php7 has been released. This enables developers to
test their code for breakage in preparation for the stable release and
allows us to make sure we don't have any bugs in the packaging prior to
the stable release.
---
 pkgs/development/interpreters/php/7.0.nix     |  8 +++++++
 .../interpreters/php/fix-paths-php7.patch     | 23 +++++++++++++++++++
 pkgs/development/interpreters/php/generic.nix | 20 +++++++++++-----
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/interpreters/php/7.0.nix
 create mode 100644 pkgs/development/interpreters/php/fix-paths-php7.patch

diff --git a/pkgs/development/interpreters/php/7.0.nix b/pkgs/development/interpreters/php/7.0.nix
new file mode 100644
index 00000000000..1369cf4a219
--- /dev/null
+++ b/pkgs/development/interpreters/php/7.0.nix
@@ -0,0 +1,8 @@
+{ callPackage, apacheHttpd  }:
+callPackage ./generic.nix {
+  phpVersion = "7.0.0beta1";
+  url = "https://downloads.php.net/~ab/php-7.0.0beta1.tar.bz2";
+  sha = "1pj3ysfhswg2r370ivp33fv9zbcl3yvhmxgnc731k08hv6hmd984";
+  apacheHttpd = apacheHttpd;
+  php7 = true;
+}
diff --git a/pkgs/development/interpreters/php/fix-paths-php7.patch b/pkgs/development/interpreters/php/fix-paths-php7.patch
new file mode 100644
index 00000000000..2b9e4ad0ebb
--- /dev/null
+++ b/pkgs/development/interpreters/php/fix-paths-php7.patch
@@ -0,0 +1,23 @@
+--- php-7.0.0beta1/configure	    2015-07-10 12:11:41.810045613 +0000
++++ php-7.0.0beta1-new/configure	2015-07-17 16:10:21.775528267 +0000
+@@ -6172,7 +6172,7 @@
+     as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5
+   fi
+ 
+-  APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
++  APXS_LIBEXECDIR="$prefix/modules"
+   if test -z `$APXS -q SYSCONFDIR`; then
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+@@ -37303,9 +37303,7 @@
+ 
+ 
+ if test "$PHP_GETTEXT" != "no"; then
+-  for i in $PHP_GETTEXT /usr/local /usr; do
+-    test -r $i/include/libintl.h && GETTEXT_DIR=$i && break
+-  done
++  GETTEXT_DIR=$PHP_GETTEXT
+ 
+   if test -z "$GETTEXT_DIR"; then
+     as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5
+
diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix
index 33b5b0f9024..065ce21bf10 100644
--- a/pkgs/development/interpreters/php/generic.nix
+++ b/pkgs/development/interpreters/php/generic.nix
@@ -4,7 +4,8 @@
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
 , uwimap, pam, gmp
 
-, phpVersion, apacheHttpd, sha }:
+, phpVersion, apacheHttpd, sha
+, php7 ? false, url ? null }:
 
 let
   libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
@@ -212,7 +213,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     imapSupport = config.php.imap or true;
     ldapSupport = config.php.ldap or true;
     mhashSupport = config.php.mhash or true;
-    mysqlSupport = config.php.mysql or true;
+    mysqlSupport = (!php7) && (config.php.mysql or true);
     mysqliSupport = config.php.mysqli or true;
     pdo_mysqlSupport = config.php.pdo_mysql or true;
     libxml2Support = config.php.libxml2 or true;
@@ -220,7 +221,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     bcmathSupport = config.php.bcmath or true;
     socketsSupport = config.php.sockets or true;
     curlSupport = config.php.curl or true;
-    curlWrappersSupport = config.php.curlWrappers or true;
+    curlWrappersSupport = (!php7) && (config.php.curlWrappers or true);
     gettextSupport = config.php.gettext or true;
     pcntlSupport = config.php.pcntl or true;
     postgresqlSupport = config.php.postgresql or true;
@@ -241,7 +242,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     ftpSupport = config.php.ftp or true;
     fpmSupport = config.php.fpm or true;
     gmpSupport = config.php.gmp or true;
-    mssqlSupport = config.php.mssql or (!stdenv.isDarwin);
+    mssqlSupport = (!php7) && (config.php.mssql or (!stdenv.isDarwin));
     ztsSupport = config.php.zts or false;
     calendarSupport = config.php.calendar or true;
   };
@@ -267,7 +268,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
   '';
 
   src = fetchurl {
-    url = "http://www.php.net/distributions/php-${version}.tar.bz2";
+    url = if url == null then
+      "http://www.php.net/distributions/php-${version}.tar.bz2"
+    else
+      url;
     sha256 = sha;
   };
 
@@ -278,6 +282,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     maintainers = with maintainers; [ globin ];
   };
 
-  patches = [ ./fix-paths.patch ];
+  patches = if !php7 then
+    [ ./fix-paths.patch ]
+  else
+    [ ./fix-paths-php7.patch ]
+  ;
 
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18aeb39ac4b..9fd664bd339 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5003,6 +5003,8 @@ let
 
   php56 = callPackage ../development/interpreters/php/5.6.nix { };
 
+  php70 = callPackage ../development/interpreters/php/7.0.nix { };
+
   picoc = callPackage ../development/interpreters/picoc {};
 
   picolisp = callPackage ../development/interpreters/picolisp {};

From 4efbe9620569c977cab38609de34e00d81c819fd Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 17 Jul 2015 19:00:16 +0200
Subject: [PATCH 2265/2322] pypy: fix two libraries (ZHF)

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

diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix
index 0ff1c431719..143bab57534 100644
--- a/pkgs/development/interpreters/pypy/default.nix
+++ b/pkgs/development/interpreters/pypy/default.nix
@@ -63,7 +63,9 @@ let
       cd ./lib_pypy
         ../pypy-c ./_audioop_build.py
         ../pypy-c ./_curses_build.py
+        ../pypy-c ./_pwdgrp_build.py
         ../pypy-c ./_sqlite3_build.py
+        ../pypy-c ./_syslog_build.py
         ../pypy-c ./_tkinter/tklib_build.py
       cd ..
     '';

From 711692f18e1f3c3c24ddf6927d514bed3ee5edf9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 17 Jul 2015 14:12:49 -0700
Subject: [PATCH 2266/2322] llvm: 3.6.1 -> 3.6.2

---
 pkgs/development/compilers/llvm/3.6/clang/default.nix  | 2 +-
 pkgs/development/compilers/llvm/3.6/default.nix        | 6 +++---
 pkgs/development/compilers/llvm/3.6/libc++/default.nix | 2 +-
 pkgs/development/compilers/llvm/3.6/libc++abi.nix      | 2 +-
 pkgs/development/compilers/llvm/3.6/lldb.nix           | 2 +-
 pkgs/development/compilers/llvm/3.6/llvm.nix           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.6/clang/default.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix
index 93c45c4efb4..2827e073903 100644
--- a/pkgs/development/compilers/llvm/3.6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix
@@ -6,7 +6,7 @@ in stdenv.mkDerivation {
   name = "clang-${version}";
 
   unpackPhase = ''
-    unpackFile ${fetch "cfe" "1myssbxlyln0nggfz04nfrbzdckljksmaxp82nq7hrmqjc62vybl"}
+    unpackFile ${fetch "cfe" "1wwr8s6lzr324hv4s1k6na4j5zv6n9kdhi14s4kb9b13d93814df"}
     mv cfe-${version}.src clang
     sourceRoot=$PWD/clang
     unpackFile ${clang-tools-extra_src}
diff --git a/pkgs/development/compilers/llvm/3.6/default.nix b/pkgs/development/compilers/llvm/3.6/default.nix
index d95ffe47326..65d81711f9e 100644
--- a/pkgs/development/compilers/llvm/3.6/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/default.nix
@@ -2,7 +2,7 @@
 let
   callPackage = newScope (self // { inherit stdenv isl version fetch; });
 
-  version = "3.6.1";
+  version = "3.6.2";
 
   fetch = fetch_v version;
   fetch_v = ver: name: sha256: fetchurl {
@@ -10,8 +10,8 @@ let
     inherit sha256;
   };
 
-  compiler-rt_src = fetch "compiler-rt" "17v4gf4y5krgkrd12r95hfxbw5q4c4jlf3513kqlfq5yfw663gzw";
-  clang-tools-extra_src = fetch "clang-tools-extra" "1dljzdk2jmrwyh8z92rljxl9wzdggp74i9f6g8aajl6mf3c71vpl";
+  compiler-rt_src = fetch "compiler-rt" "11qx8d3pbfqjaj2x207pvlvzihbs1z2xbw4crpz7aid6h1yz6bqg";
+  clang-tools-extra_src = fetch "clang-tools-extra" "1ssgs1108gnsggyx9wcl4hmq196f5ix0y1j7ygfh3xcqsckwc3ka";
 
   self = {
     llvm = callPackage ./llvm.nix {
diff --git a/pkgs/development/compilers/llvm/3.6/libc++/default.nix b/pkgs/development/compilers/llvm/3.6/libc++/default.nix
index d83ca83bbae..81c1d96afc8 100644
--- a/pkgs/development/compilers/llvm/3.6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/libc++/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
-  src = fetch "libcxx" "1yf0ns4cvvirp1ml5a8h29lysnw5c23715b09x68v5zkxhxnap2s";
+  src = fetch "libcxx" "10cbgi1nfksjrlgvbsx8pkcqxsgkszdqy5cj2zgwj2c2yi9d9wsj";
 
   # instead of allowing libc++ to link with /usr/lib/libc++abi.dylib,
   # force it to link with our copy
diff --git a/pkgs/development/compilers/llvm/3.6/libc++abi.nix b/pkgs/development/compilers/llvm/3.6/libc++abi.nix
index 53a01c95c8a..8979ce314c8 100644
--- a/pkgs/development/compilers/llvm/3.6/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.6/libc++abi.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libc++abi-${version}";
 
-  src = fetch "libcxxabi" "0pgimy1b5vj4favzdz2830n917fyz65hm3khdgkbgnfs43s8g0xw";
+  src = fetch "libcxxabi" "16xh54rlnbip4f2bwwbdm1sd6bkqky35jgp7fndnns0llpjqrd3g";
 
   buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind;
 
diff --git a/pkgs/development/compilers/llvm/3.6/lldb.nix b/pkgs/development/compilers/llvm/3.6/lldb.nix
index 334810917fa..cee99bbbdea 100644
--- a/pkgs/development/compilers/llvm/3.6/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.6/lldb.nix
@@ -15,7 +15,7 @@
 stdenv.mkDerivation {
   name = "lldb-${version}";
 
-  src = fetch "lldb" "1fmaz7zcc1f54ns4x8rx9nvhh4pyrhbz103bl02sv1cfwxj5ryyf";
+  src = fetch "lldb" "1a93cpmlcnpyglgcyfjb3n7c33683wfhwzn36azpv6wicimwj3cl";
 
   patchPhase = ''
     sed -i 's|/usr/bin/env||' \
diff --git a/pkgs/development/compilers/llvm/3.6/llvm.nix b/pkgs/development/compilers/llvm/3.6/llvm.nix
index 2d6f29aacea..d757b9314c3 100644
--- a/pkgs/development/compilers/llvm/3.6/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.6/llvm.nix
@@ -15,7 +15,7 @@
 }:
 
 let
-  src = fetch "llvm" "0ypwcqrld91jn0zz4mkdksl2mbb0ds9lh5gf0xkbb81sj4awc01g";
+  src = fetch "llvm" "153vcvj8gvgwakzr4j0kndc0b7wn91c2g1vy2vg24s6spxcc23gn";
 in stdenv.mkDerivation rec {
   name = "llvm-${version}";
 

From 038d29121e32e1ea31bc9d587565f21b8be64ca3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 17 Jul 2015 14:15:23 -0700
Subject: [PATCH 2267/2322] swig2: 2.0.11 -> 2.0.12

---
 pkgs/development/tools/misc/swig/2.x.nix | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix
index b51ce0f2d5a..5cfc39a5254 100644
--- a/pkgs/development/tools/misc/swig/2.x.nix
+++ b/pkgs/development/tools/misc/swig/2.x.nix
@@ -1,15 +1,28 @@
-{ stdenv, fetchurl, pcre }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "swig-2.0.11";
+  name = "swig-${version}";
+  version = "2.0.12";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/swig/${name}.tar.gz";
-    sha256 = "0kj21b6syp62vx68r1j6azv9033kng68pxm1k79pm4skkzr0ny33";
+  src = fetchFromGitHub {
+    owner = "swig";
+    repo = "swig";
+    rev = "rel-${version}";
+    sha256 = "0khm9gh5pczfcihr0pbicaicc4v9kjm5ip2alvkhmbb3ga6njkcm";
   };
 
+  nativeBuildInputs = [ autoconf automake libtool bison ];
   buildInputs = [ pcre ];
 
+  postPatch = ''
+    # Disable ccache documentation as it need yodl
+    sed -i '/man1/d' CCache/Makefile.in
+  '';
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
   meta = {
     description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
 

From f74c74ec401599424d424d4aae8e575ea5a5d89b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 17 Jul 2015 14:15:36 -0700
Subject: [PATCH 2268/2322] swig3: 3.0.2 -> 3.0.6

---
 pkgs/development/tools/misc/swig/3.x.nix | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix
index 1a02c88bb71..88e73276a77 100644
--- a/pkgs/development/tools/misc/swig/3.x.nix
+++ b/pkgs/development/tools/misc/swig/3.x.nix
@@ -1,15 +1,28 @@
-{ stdenv, fetchurl, pcre }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "swig-3.0.2";
+  name = "swig-${version}";
+  version = "3.0.6";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/swig/${name}.tar.gz";
-    sha256 = "04vqrij3k6pcq41y7rzl5rmhnghqg905f11wyrqw7vdwr9brcrm2";
+  src = fetchFromGitHub {
+    owner = "swig";
+    repo = "swig";
+    rev = "rel-${version}";
+    sha256 = "1y8rlrkqs9h5cyp75s1i9rvrj35kkcwjjw65dyv3xy1skgfxb6w8";
   };
 
+  nativeBuildInputs = [ autoconf automake libtool bison ];
   buildInputs = [ pcre ];
 
+  postPatch = ''
+    # Disable ccache documentation as it need yodl
+    sed -i '/man1/d' CCache/Makefile.in
+  '';
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
   meta = {
     description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
 

From 11639466593f0beecd78f7c50e1ac8d7c1009677 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 17 Jul 2015 14:15:51 -0700
Subject: [PATCH 2269/2322] swig: Make 3.x the default

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6771a220bc0..9c44dd5ad57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5706,12 +5706,10 @@ let
 
   strace = callPackage ../development/tools/misc/strace { };
 
-  swig = callPackage ../development/tools/misc/swig { };
-
+  swig1 = callPackage ../development/tools/misc/swig { };
   swig2 = callPackage ../development/tools/misc/swig/2.x.nix { };
-
   swig3 = callPackage ../development/tools/misc/swig/3.x.nix { };
-
+  swig = swig3;
   swigWithJava = swig;
 
   swfmill = callPackage ../tools/video/swfmill { };
@@ -9291,7 +9289,7 @@ let
     perl = perl516; # ${perl}/.../CORE/handy.h:124:34: error: 'bool' undeclared
   };
 
-  apparmor_2_9 = callPackage ../os-specific/linux/apparmor/2.9 { swig = swig2; };
+  apparmor_2_9 = callPackage ../os-specific/linux/apparmor/2.9 { };
   libapparmor = apparmor_2_9.libapparmor;
   apparmor-pam = apparmor_2_9.apparmor-pam;
   apparmor-parser = apparmor_2_9.apparmor-parser;

From 440954ab8846d9c081b4d1aacd9621ef5da6926e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 17 Jul 2015 14:16:26 -0700
Subject: [PATCH 2270/2322] mesa: 10.6.1 -> 10.6.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 be2544091e2..9d7fa4ae406 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "10.6.1";
+  version = "10.6.2";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "6c80a2b647e57c85dc36e609d9aed17f878f0d8e0cf9ace86d14cf604101e1eb";
+    sha256 = "05753d3db4212900927b9894221a1669a10f56786e86a7e818b6e18a0817dca9";
   };
 
   prePatch = "patchShebangs .";

From 42ccbd995088bc6a243e68ca03688370675b00c3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 17 Jul 2015 14:34:19 -0700
Subject: [PATCH 2271/2322] boost: Add 1.58 and make it the default

---
 pkgs/development/libraries/boost/1.58.nix | 40 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  3 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/boost/1.58.nix

diff --git a/pkgs/development/libraries/boost/1.58.nix b/pkgs/development/libraries/boost/1.58.nix
new file mode 100644
index 00000000000..aa010494bf7
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.58.nix
@@ -0,0 +1,40 @@
+{ stdenv, callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.58.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_58_0.tar.bz2";
+    sha256 = "1rfkqxns60171q62cppiyzj8pmsbwp1l8jd7p6crriryqd7j1z7x";
+  };
+
+  patches = if stdenv.isCygwin then [
+      ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch
+      ./cygwin-fedora-boost-1.50.0-pool.patch
+      ./cygwin-fedora-boost-1.57.0-mpl-print.patch
+      ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch
+      ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch
+      ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch
+      ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch
+      ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch
+      ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch
+      ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch
+      ./cygwin-fedora-boost-1.57.0-move-is_class.patch
+      ./cygwin-1.40.0-cstdint-cygwin.patch
+      ./cygwin-1.57.0-asio-cygwin.patch
+      ./cygwin-1.55.0-asio-MSG_EOR.patch
+      ./cygwin-1.57.0-config-cygwin.patch
+      ./cygwin-1.57.0-context-cygwin.patch
+      ./cygwin-1.57.0-filesystem-cygwin.patch
+      ./cygwin-1.55.0-interlocked-cygwin.patch
+      ./cygwin-1.40.0-iostreams-cygwin.patch
+      ./cygwin-1.57.0-locale-cygwin.patch
+      ./cygwin-1.57.0-log-cygwin.patch
+      ./cygwin-1.40.0-python-cygwin.patch
+      ./cygwin-1.40.0-regex-cygwin.patch
+      ./cygwin-1.57.0-smart_ptr-cygwin.patch
+      ./cygwin-1.57.0-system-cygwin.patch
+      ./cygwin-1.45.0-jam-cygwin.patch
+      ./cygwin-1.50.0-jam-pep3149.patch
+    ] else null;
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c44dd5ad57..4e06ba047dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5863,7 +5863,8 @@ let
   boost155 = callPackage ../development/libraries/boost/1.55.nix { };
   boost156 = callPackage ../development/libraries/boost/1.56.nix { };
   boost157 = callPackage ../development/libraries/boost/1.57.nix { };
-  boost = boost157;
+  boost158 = callPackage ../development/libraries/boost/1.58.nix { };
+  boost = boost158;
 
   boost_process = callPackage ../development/libraries/boost-process { };
 

From 67ebbc9a78c6f72f61f4254edb59b9cd643f3f07 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 15 Jul 2015 14:30:41 -0700
Subject: [PATCH 2272/2322] nghttp2: 1.0.2 -> 1.1.1

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

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index e5e4f1cfff3..129a65d3203 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -34,12 +34,12 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${prefix}nghttp2-${version}";
-  version = "1.0.2";
+  version = "1.1.1";
 
   # Don't use fetchFromGitHub since this needs a bootstrap curl
   src = fetchurl {
     url = "http://pub.wak.io/nixos/tarballs/nghttp2-${version}.tar.bz2";
-    sha256 = "633dd6d5d1f29a4d802d6c9e5b9eeb0b9104f35652396f26999a27515b6c1c14";
+    sha256 = "9659e8598c8481f1bf8e63ba4f828f5283053df62a51fa8324cb55ea7a51b80c";
   };
 
   # Configure script searches for a symbol which does not exist in jemalloc on Darwin

From 35664f45691fd8063a129db03ba82ad10441d9fc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 10 Jul 2015 10:33:40 -0700
Subject: [PATCH 2273/2322] gettext: 0.19.4 -> 0.19.5

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

diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index f86a15cb0d6..45139ede5a2 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libiconv, xz }:
 
 stdenv.mkDerivation (rec {
-  name = "gettext-0.19.4";
+  name = "gettext-0.19.5";
 
   src = fetchurl {
     url = "mirror://gnu/gettext/${name}.tar.gz";
-    sha256 = "0gvz86m4cs8bdf3mwmwsyx6lrq4ydfxgadrgd9jlx32z3bnz3jca";
+    sha256 = "0fppvj4l9maa9q1swvhnv96hsqxx90vcjbdyjhqpir3ll55q2n0j";
   };
 
   LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else "";

From fd5f56dc50da725e1fb20dbe4396ef929ef8bb3d Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 10 Jul 2015 10:58:15 -0700
Subject: [PATCH 2274/2322] file: 5.23 -> 5.24

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

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index e3dc7bcb533..81f6bb2d485 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "file-5.23";
+  name = "file-5.24";
 
   buildInputs = [ zlib ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
       "ftp://ftp.astron.com/pub/file/${name}.tar.gz"
       "http://distfiles.macports.org/file/${name}.tar.gz"
     ];
-    sha256 = "0z0mwqayrrf3w734rjp9rysf0y8az191ff7fxjsxyb1y2kzv72ic";
+    sha256 = "0z0mwqayrrf3w734rjp9rysf0y8az191ff7fxjsxyb1y2kzv72ia";
   };
 
   meta = {

From e6d4367e9263dcb72806a85d78791600d88b8b81 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 13 Jul 2015 12:45:23 -0700
Subject: [PATCH 2275/2322] ed: 1.10 -> 1.12

---
 pkgs/applications/editors/ed/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index bccd7754efb..1bff18185f1 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -1,14 +1,16 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "ed-1.10";
+  name = "ed-1.12";
 
   src = fetchurl {
     # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping
     #url = "mirror://gnu/ed/${name}.tar.gz";
-    url = "http://pkgs.fedoraproject.org/repo/extras/ed/${name}.tar.bz2"
-      + "/38204d4c690a17a989e802ba01b45e98/${name}.tar.bz2";
-    sha256 = "16qvshl8470f3znjfrrci3lzllqkzc6disk5kygzsg9hh4f6wysq";
+    # When updating, please make sure the sources pulled match those upstream by
+    # Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum`
+    # in the resulting directory
+    url = "http://fossies.org/linux/privat/${name}.tar.gz";
+    sha256 = "111ci6x43bcmylqhrzr32l0q8pplmpb4kiq5pb6cyp0yxkb2dhgj";
   };
 
   /* FIXME: Tests currently fail on Darwin:

From 754f21df19706007e16e2f5e0cfefa53d8d6bcc6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 13 Jul 2015 16:11:23 -0700
Subject: [PATCH 2276/2322] file: Fix hash

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

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 81f6bb2d485..7d991a41556 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
       "ftp://ftp.astron.com/pub/file/${name}.tar.gz"
       "http://distfiles.macports.org/file/${name}.tar.gz"
     ];
-    sha256 = "0z0mwqayrrf3w734rjp9rysf0y8az191ff7fxjsxyb1y2kzv72ia";
+    sha256 = "1kjhqwmi1sjw8jcf6li725c59wm00zajrdfwgkwqxs295vgb6b40";
   };
 
   meta = {

From 4877451d2ef6f60b461055efe020b159ca90bddc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 15 Jul 2015 12:28:51 -0700
Subject: [PATCH 2277/2322] gettext: 0.19.5 -> 0.19.5.1

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

diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 45139ede5a2..4b6fd2008e8 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libiconv, xz }:
 
 stdenv.mkDerivation (rec {
-  name = "gettext-0.19.5";
+  name = "gettext-0.19.5.1";
 
   src = fetchurl {
     url = "mirror://gnu/gettext/${name}.tar.gz";
-    sha256 = "0fppvj4l9maa9q1swvhnv96hsqxx90vcjbdyjhqpir3ll55q2n0j";
+    sha256 = "0cbp498ckjwj7qr8b9pmkry8hkhldgkvg5yix8hi9c8z1hxxb651";
   };
 
   LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else "";

From 83f295f1af1893dc59b66c20581e36eb65c1abdc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 17 Jul 2015 15:41:50 -0700
Subject: [PATCH 2278/2322] mpfr: 3.1.2 -> 3.1.3

---
 pkgs/development/libraries/mpfr/default.nix   |   15 +-
 .../development/libraries/mpfr/upstream.patch | 1699 +++++++++++++++++
 2 files changed, 1703 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/libraries/mpfr/upstream.patch

diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index 555351bddc3..e1809d544d1 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -1,26 +1,19 @@
 { stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "mpfr-3.1.2";
+  name = "mpfr-3.1.3";
 
   src = fetchurl {
     url = "mirror://gnu/mpfr/${name}.tar.bz2";
-    sha256 = "0sqvpfkzamxdr87anzakf9dhkfh15lfmm5bsqajk02h1mxh3zivr";
+    sha256 = "1z8akfw9wbmq91vrx04bw86mmnxw2sw5qm5cr8ix5b3w2mcv8fzn";
   };
 
+  patches = [ ./upstream.patch ];
+
   # mpfr.h requires gmp.h
   propagatedBuildInputs = [ gmp ];
 
-  CFLAGS = "-I${gmp}/include";
-  LDFLAGS = if stdenv.isDarwin then "-L${gmp}/lib" else null;
-
   configureFlags =
-    /* Work around a FreeBSD bug that otherwise leads to segfaults in the test suite:
-          http://hydra.bordeaux.inria.fr/build/34862
-          http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00015.html
-          http://www.freebsd.org/cgi/query-pr.cgi?pr=161344
-      */
-    stdenv.lib.optional (stdenv.isSunOS or stdenv.isFreeBSD) "--disable-thread-safe" ++
     stdenv.lib.optional stdenv.is64bit "--with-pic";
 
   doCheck = true;
diff --git a/pkgs/development/libraries/mpfr/upstream.patch b/pkgs/development/libraries/mpfr/upstream.patch
new file mode 100644
index 00000000000..77933160524
--- /dev/null
+++ b/pkgs/development/libraries/mpfr/upstream.patch
@@ -0,0 +1,1699 @@
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-07-02 10:49:23.950112879 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-07-02 10:49:24.042113845 +0000
+@@ -0,0 +1 @@
++lngamma-and-doc
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-06-19 19:55:09.000000000 +0000
++++ mpfr-3.1.3-b/VERSION	2015-07-02 10:49:24.042113845 +0000
+@@ -1 +1 @@
+-3.1.3
++3.1.3-p1
+diff -Naurd mpfr-3.1.3-a/doc/mpfr.texi mpfr-3.1.3-b/doc/mpfr.texi
+--- mpfr-3.1.3-a/doc/mpfr.texi	2015-06-19 19:55:11.000000000 +0000
++++ mpfr-3.1.3-b/doc/mpfr.texi	2015-07-02 10:49:24.018113593 +0000
+@@ -810,13 +810,17 @@
+ When the input point is in the closure of the domain of the mathematical
+ function and an input argument is +0 (resp.@: @minus{}0), one considers
+ the limit when the corresponding argument approaches 0 from above
+-(resp.@: below). If the limit is not defined (e.g., @code{mpfr_log} on
+-@minus{}0), the behavior is specified in the description of the MPFR function.
++(resp.@: below), if possible. If the limit is not defined (e.g.,
++@code{mpfr_sqrt} and @code{mpfr_log} on @minus{}0), the behavior is
++specified in the description of the MPFR function, but must be consistent
++with the rule from the above paragraph (e.g., @code{mpfr_log} on @pom{}0
++gives @minus{}Inf).
+ 
+ When the result is equal to 0, its sign is determined by considering the
+ limit as if the input point were not in the domain: If one approaches 0
+ from above (resp.@: below), the result is +0 (resp.@: @minus{}0);
+-for example, @code{mpfr_sin} on +0 gives +0.
++for example, @code{mpfr_sin} on @minus{}0 gives @minus{}0 and
++@code{mpfr_acos} on 1 gives +0 (in all rounding modes).
+ In the other cases, the sign is specified in the description of the MPFR
+ function; for example @code{mpfr_max} on @minus{}0 and +0 gives +0.
+ 
+@@ -832,8 +836,8 @@
+ @c that advantages in practice), like for any bug fix.
+ Example: @code{mpfr_hypot} on (NaN,0) gives NaN, but @code{mpfr_hypot}
+ on (NaN,+Inf) gives +Inf (as specified in @ref{Special Functions}),
+-since for any finite input @var{x}, @code{mpfr_hypot} on (@var{x},+Inf)
+-gives +Inf.
++since for any finite or infinite input @var{x}, @code{mpfr_hypot} on
++(@var{x},+Inf) gives +Inf.
+ 
+ @node Exceptions, Memory Handling, Floating-Point Values on Special Numbers, MPFR Basics
+ @comment  node-name,  next,  previous,  up
+@@ -1581,7 +1585,8 @@
+ @deftypefunx int mpfr_add_z (mpfr_t @var{rop}, mpfr_t @var{op1}, mpz_t @var{op2}, mpfr_rnd_t @var{rnd})
+ @deftypefunx int mpfr_add_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{@var{op1} + @var{op2}} rounded in the direction
+-@var{rnd}. For types having no signed zero, it is considered unsigned
++@var{rnd}.  The IEEE-754 rules are used, in particular for signed zeros.
++But for types having no signed zeros, 0 is considered unsigned
+ (i.e., (+0) + 0 = (+0) and (@minus{}0) + 0 = (@minus{}0)).
+ The @code{mpfr_add_d} function assumes that the radix of the @code{double} type
+ is a power of 2, with a precision at most that declared by the C implementation
+@@ -1599,7 +1604,8 @@
+ @deftypefunx int mpfr_sub_z (mpfr_t @var{rop}, mpfr_t @var{op1}, mpz_t @var{op2}, mpfr_rnd_t @var{rnd})
+ @deftypefunx int mpfr_sub_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{@var{op1} - @var{op2}} rounded in the direction
+-@var{rnd}. For types having no signed zero, it is considered unsigned
++@var{rnd}.  The IEEE-754 rules are used, in particular for signed zeros.
++But for types having no signed zeros, 0 is considered unsigned
+ (i.e., (+0) @minus{} 0 = (+0), (@minus{}0) @minus{} 0 = (@minus{}0),
+ 0 @minus{} (+0) = (@minus{}0) and 0 @minus{} (@minus{}0) = (+0)).
+ The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_d_sub}
+@@ -1615,7 +1621,7 @@
+ Set @var{rop} to @math{@var{op1} @GMPtimes{} @var{op2}} rounded in the
+ direction @var{rnd}.
+ When a result is zero, its sign is the product of the signs of the operands
+-(for types having no signed zero, it is considered positive).
++(for types having no signed zeros, 0 is considered positive).
+ The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_mul_d}.
+ @end deftypefun
+ 
+@@ -1635,7 +1641,7 @@
+ @deftypefunx int mpfr_div_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{@var{op1}/@var{op2}} rounded in the direction @var{rnd}.
+ When a result is zero, its sign is the product of the signs of the operands
+-(for types having no signed zero, it is considered positive).
++(for types having no signed zeros, 0 is considered positive).
+ The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_d_div}
+ and @code{mpfr_div_d}.
+ @end deftypefun
+@@ -1643,15 +1649,18 @@
+ @deftypefun int mpfr_sqrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+ @deftypefunx int mpfr_sqrt_ui (mpfr_t @var{rop}, unsigned long int @var{op}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @m{\sqrt{@var{op}}, the square root of @var{op}}
+-rounded in the direction @var{rnd} (set @var{rop} to @minus{}0 if @var{op} is
+-@minus{}0, to be consistent with the IEEE 754 standard).
++rounded in the direction @var{rnd}.  Set @var{rop} to @minus{}0 if
++@var{op} is @minus{}0, to be consistent with the IEEE 754 standard.
+ Set @var{rop} to NaN if @var{op} is negative.
+ @end deftypefun
+ 
+ @deftypefun int mpfr_rec_sqrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @m{1/\sqrt{@var{op}}, the reciprocal square root of @var{op}}
+-rounded in the direction @var{rnd}. Set @var{rop} to +Inf if @var{op} is
+-@pom{}0, +0 if @var{op} is +Inf, and NaN if @var{op} is negative.
++rounded in the direction @var{rnd}.  Set @var{rop} to +Inf if @var{op} is
++@pom{}0, +0 if @var{op} is +Inf, and NaN if @var{op} is negative.  Warning!
++Therefore the result on @minus{}0 is different from the one of the rSqrt
++function recommended by the IEEE 754-2008 standard (Section 9.2.1), which
++is @minus{}Inf instead of +Inf.
+ @end deftypefun
+ 
+ @deftypefun int mpfr_cbrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+@@ -1832,7 +1841,9 @@
+ @m{\log_2 @var{op}, log2(@var{op})} or
+ @m{\log_{10} @var{op}, log10(@var{op})}, respectively,
+ rounded in the direction @var{rnd}.
+-Set @var{rop} to @minus{}Inf if @var{op} is @minus{}0
++Set @var{rop} to +0 if @var{op} is 1 (in all rounding modes),
++for consistency with the ISO C99 and IEEE 754-2008 standards.
++Set @var{rop} to @minus{}Inf if @var{op} is @pom{}0
+ (i.e., the sign of the zero has no influence on the result).
+ @end deftypefun
+ 
+@@ -2003,8 +2014,11 @@
+ @deftypefun int mpfr_lngamma (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to the value of the logarithm of the Gamma function on @var{op},
+ rounded in the direction @var{rnd}.
+-When @math{@minus{}2@var{k}@minus{}1 @le{} @var{op} @le{} @minus{}2@var{k}},
+-@var{k} being a non-negative integer, @var{rop} is set to NaN.
++When @var{op} is 1 or 2, set @var{rop} to +0 (in all rounding modes).
++When @var{op} is an infinity or a nonpositive integer, set @var{rop} to +Inf,
++following the general rules on special values.
++When @math{@minus{}2@var{k}@minus{}1 < @var{op} < @minus{}2@var{k}},
++@var{k} being a nonnegative integer, set @var{rop} to NaN@.
+ See also @code{mpfr_lgamma}.
+ @end deftypefun
+ 
+@@ -2012,10 +2026,11 @@
+ Set @var{rop} to the value of the logarithm of the absolute value of the
+ Gamma function on @var{op}, rounded in the direction @var{rnd}. The sign
+ (1 or @minus{}1) of Gamma(@var{op}) is returned in the object pointed to
+-by @var{signp}. When @var{op} is an infinity or a non-positive integer, set
+-@var{rop} to +Inf. When @var{op} is NaN, @minus{}Inf or a negative integer,
+-*@var{signp} is undefined, and when @var{op} is @pom{}0, *@var{signp} is
+-the sign of the zero.
++by @var{signp}.
++When @var{op} is 1 or 2, set @var{rop} to +0 (in all rounding modes).
++When @var{op} is an infinity or a nonpositive integer, set @var{rop} to +Inf.
++When @var{op} is NaN, @minus{}Inf or a negative integer, *@var{signp} is
++undefined, and when @var{op} is @pom{}0, *@var{signp} is the sign of the zero.
+ @end deftypefun
+ 
+ @deftypefun int mpfr_digamma (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+@@ -2064,7 +2079,10 @@
+ @deftypefunx int mpfr_fms (mpfr_t @var{rop}, mpfr_t @var{op1}, mpfr_t @var{op2}, mpfr_t @var{op3}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{(@var{op1} @GMPtimes{} @var{op2}) + @var{op3}}
+ (resp.@: @math{(@var{op1} @GMPtimes{} @var{op2}) - @var{op3}})
+-rounded in the direction @var{rnd}.
++rounded in the direction @var{rnd}.  Concerning special values (signed zeros,
++infinities, NaN), these functions behave like a multiplication followed by a
++separate addition or subtraction.  That is, the fused operation matters only
++for rounding.
+ @end deftypefun
+ 
+ @deftypefun int mpfr_agm (mpfr_t @var{rop}, mpfr_t @var{op1}, mpfr_t @var{op2}, mpfr_rnd_t @var{rnd})
+@@ -2089,8 +2107,8 @@
+ i.e., $\sqrt{x^2+y^2}$,
+ @end tex
+ rounded in the direction @var{rnd}.
+-Special values are handled as described in Section F.9.4.3 of
+-the ISO C99 and IEEE 754-2008 standards:
++Special values are handled as described in the ISO C99 (Section F.9.4.3)
++and IEEE 754-2008 (Section 9.2.1) standards:
+ If @var{x} or @var{y} is an infinity, then +Inf is returned in @var{rop},
+ even if the other number is NaN.
+ @end deftypefun
+diff -Naurd mpfr-3.1.3-a/doc/mpfr.info mpfr-3.1.3-b/doc/mpfr.info
+--- mpfr-3.1.3-a/doc/mpfr.info	2015-06-19 19:55:53.000000000 +0000
++++ mpfr-3.1.3-b/doc/mpfr.info	2015-07-02 10:49:38.718267817 +0000
+@@ -1,4 +1,4 @@
+-This is mpfr.info, produced by makeinfo version 5.2 from mpfr.texi.
++This is mpfr.info, produced by makeinfo version 6.0 from mpfr.texi.
+ 
+ This manual documents how to install and use the Multiple Precision
+ Floating-Point Reliable Library, version 3.1.3.
+@@ -55,7 +55,7 @@
+ MPFR Copying Conditions
+ ***********************
+ 
+-The GNU MPFR library (or MPFR for short) is "free"; this means that
++The GNU MPFR library (or MPFR for short) is “free”; this means that
+ everyone is free to use it and free to redistribute it on a free basis.
+ The library is not in the public domain; it is copyrighted and there are
+ restrictions on its distribution, but these restrictions are designed to
+@@ -418,7 +418,7 @@
+ 4.2 Nomenclature and Types
+ ==========================
+ 
+-A "floating-point number", or "float" for short, is an arbitrary
++A “floating-point number”, or “float” for short, is an arbitrary
+ precision significand (also called mantissa) with a limited precision
+ exponent.  The C data type for such objects is ‘mpfr_t’ (internally
+ defined as a one-element array of a structure, and ‘mpfr_ptr’ is the C
+@@ -432,7 +432,7 @@
+ to the other functions supported by MPFR. Unless documented otherwise,
+ the sign bit of a NaN is unspecified.
+ 
+-The "precision" is the number of bits used to represent the significand
++The “precision” is the number of bits used to represent the significand
+ of a floating-point number; the corresponding C data type is
+ ‘mpfr_prec_t’.  The precision can be any integer between ‘MPFR_PREC_MIN’
+ and ‘MPFR_PREC_MAX’.  In the current implementation, ‘MPFR_PREC_MIN’ is
+@@ -446,7 +446,7 @@
+ may abort, crash or have undefined behavior (depending on your C
+ implementation).
+ 
+-The "rounding mode" specifies the way to round the result of a
++The “rounding mode” specifies the way to round the result of a
+ floating-point operation, in case the exact result can not be
+ represented exactly in the destination significand; the corresponding C
+ data type is ‘mpfr_rnd_t’.
+@@ -499,14 +499,14 @@
+ representable numbers, it is rounded to the one with the least
+ significant bit set to zero.  For example, the number 2.5, which is
+ represented by (10.1) in binary, is rounded to (10.0)=2 with a precision
+-of two bits, and not to (11.0)=3.  This rule avoids the "drift"
++of two bits, and not to (11.0)=3.  This rule avoids the “drift”
+ phenomenon mentioned by Knuth in volume 2 of The Art of Computer
+ Programming (Section 4.2.2).
+ 
+    Most MPFR functions take as first argument the destination variable,
+ as second and following arguments the input variables, as last argument
+ a rounding mode, and have a return value of type ‘int’, called the
+-"ternary value".  The value stored in the destination variable is
++“ternary value”.  The value stored in the destination variable is
+ correctly rounded, i.e., MPFR behaves as if it computed the result with
+ an infinite precision, then rounded it to the precision of this
+ variable.  The input variables are regarded as exact (in particular,
+@@ -572,15 +572,18 @@
+    When the input point is in the closure of the domain of the
+ mathematical function and an input argument is +0 (resp. −0), one
+ considers the limit when the corresponding argument approaches 0 from
+-above (resp. below).  If the limit is not defined (e.g., ‘mpfr_log’ on
+-−0), the behavior is specified in the description of the MPFR function.
++above (resp. below), if possible.  If the limit is not defined (e.g.,
++‘mpfr_sqrt’ and ‘mpfr_log’ on −0), the behavior is specified in the
++description of the MPFR function, but must be consistent with the rule
++from the above paragraph (e.g., ‘mpfr_log’ on ±0 gives −Inf).
+ 
+    When the result is equal to 0, its sign is determined by considering
+ the limit as if the input point were not in the domain: If one
+ approaches 0 from above (resp. below), the result is +0 (resp. −0); for
+-example, ‘mpfr_sin’ on +0 gives +0.  In the other cases, the sign is
+-specified in the description of the MPFR function; for example
+-‘mpfr_max’ on −0 and +0 gives +0.
++example, ‘mpfr_sin’ on −0 gives −0 and ‘mpfr_acos’ on 1 gives +0 (in all
++rounding modes).  In the other cases, the sign is specified in the
++description of the MPFR function; for example ‘mpfr_max’ on −0 and +0
++gives +0.
+ 
+    When the input point is not in the closure of the domain of the
+ function, the result is NaN. Example: ‘mpfr_sqrt’ on −17 gives NaN.
+@@ -590,8 +593,8 @@
+ numbers; such a case is always explicitly specified in *note MPFR
+ Interface::.  Example: ‘mpfr_hypot’ on (NaN,0) gives NaN, but
+ ‘mpfr_hypot’ on (NaN,+Inf) gives +Inf (as specified in *note Special
+-Functions::), since for any finite input X, ‘mpfr_hypot’ on (X,+Inf)
+-gives +Inf.
++Functions::), since for any finite or infinite input X, ‘mpfr_hypot’ on
++(X,+Inf) gives +Inf.
+ 
+ 
+ File: mpfr.info,  Node: Exceptions,  Next: Memory Handling,  Prev: Floating-Point Values on Special Numbers,  Up: MPFR Basics
+@@ -1253,8 +1256,9 @@
+           mpfr_rnd_t RND)
+  -- Function: int mpfr_add_q (mpfr_t ROP, mpfr_t OP1, mpq_t OP2,
+           mpfr_rnd_t RND)
+-     Set ROP to OP1 + OP2 rounded in the direction RND.  For types
+-     having no signed zero, it is considered unsigned (i.e., (+0) + 0 =
++     Set ROP to OP1 + OP2 rounded in the direction RND.  The IEEE-754
++     rules are used, in particular for signed zeros.  But for types
++     having no signed zeros, 0 is considered unsigned (i.e., (+0) + 0 =
+      (+0) and (−0) + 0 = (−0)).  The ‘mpfr_add_d’ function assumes that
+      the radix of the ‘double’ type is a power of 2, with a precision at
+      most that declared by the C implementation (macro
+@@ -1280,8 +1284,9 @@
+           mpfr_rnd_t RND)
+  -- Function: int mpfr_sub_q (mpfr_t ROP, mpfr_t OP1, mpq_t OP2,
+           mpfr_rnd_t RND)
+-     Set ROP to OP1 - OP2 rounded in the direction RND.  For types
+-     having no signed zero, it is considered unsigned (i.e., (+0) − 0 =
++     Set ROP to OP1 - OP2 rounded in the direction RND.  The IEEE-754
++     rules are used, in particular for signed zeros.  But for types
++     having no signed zeros, 0 is considered unsigned (i.e., (+0) − 0 =
+      (+0), (−0) − 0 = (−0), 0 − (+0) = (−0) and 0 − (−0) = (+0)).  The
+      same restrictions than for ‘mpfr_add_d’ apply to ‘mpfr_d_sub’ and
+      ‘mpfr_sub_d’.
+@@ -1300,7 +1305,7 @@
+           mpfr_rnd_t RND)
+      Set ROP to OP1 times OP2 rounded in the direction RND.  When a
+      result is zero, its sign is the product of the signs of the
+-     operands (for types having no signed zero, it is considered
++     operands (for types having no signed zeros, 0 is considered
+      positive).  The same restrictions than for ‘mpfr_add_d’ apply to
+      ‘mpfr_mul_d’.
+ 
+@@ -1327,21 +1332,24 @@
+           mpfr_rnd_t RND)
+      Set ROP to OP1/OP2 rounded in the direction RND.  When a result is
+      zero, its sign is the product of the signs of the operands (for
+-     types having no signed zero, it is considered positive).  The same
++     types having no signed zeros, 0 is considered positive).  The same
+      restrictions than for ‘mpfr_add_d’ apply to ‘mpfr_d_div’ and
+      ‘mpfr_div_d’.
+ 
+  -- Function: int mpfr_sqrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+  -- Function: int mpfr_sqrt_ui (mpfr_t ROP, unsigned long int OP,
+           mpfr_rnd_t RND)
+-     Set ROP to the square root of OP rounded in the direction RND (set
+-     ROP to −0 if OP is −0, to be consistent with the IEEE 754
+-     standard).  Set ROP to NaN if OP is negative.
++     Set ROP to the square root of OP rounded in the direction RND.  Set
++     ROP to −0 if OP is −0, to be consistent with the IEEE 754 standard.
++     Set ROP to NaN if OP is negative.
+ 
+  -- Function: int mpfr_rec_sqrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+      Set ROP to the reciprocal square root of OP rounded in the
+      direction RND.  Set ROP to +Inf if OP is ±0, +0 if OP is +Inf, and
+-     NaN if OP is negative.
++     NaN if OP is negative.  Warning!  Therefore the result on −0 is
++     different from the one of the rSqrt function recommended by the
++     IEEE 754-2008 standard (Section 9.2.1), which is −Inf instead of
++     +Inf.
+ 
+  -- Function: int mpfr_cbrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+  -- Function: int mpfr_root (mpfr_t ROP, mpfr_t OP, unsigned long int K,
+@@ -1515,8 +1523,10 @@
+  -- Function: int mpfr_log2 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+  -- Function: int mpfr_log10 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+      Set ROP to the natural logarithm of OP, log2(OP) or log10(OP),
+-     respectively, rounded in the direction RND.  Set ROP to −Inf if OP
+-     is −0 (i.e., the sign of the zero has no influence on the result).
++     respectively, rounded in the direction RND.  Set ROP to +0 if OP is
++     1 (in all rounding modes), for consistency with the ISO C99 and
++     IEEE 754-2008 standards.  Set ROP to −Inf if OP is ±0 (i.e., the
++     sign of the zero has no influence on the result).
+ 
+  -- Function: int mpfr_exp (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+  -- Function: int mpfr_exp2 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+@@ -1649,17 +1659,21 @@
+ 
+  -- Function: int mpfr_lngamma (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+      Set ROP to the value of the logarithm of the Gamma function on OP,
+-     rounded in the direction RND.  When −2K−1 <= OP <= −2K, K being a
+-     non-negative integer, ROP is set to NaN. See also ‘mpfr_lgamma’.
++     rounded in the direction RND.  When OP is 1 or 2, set ROP to +0 (in
++     all rounding modes).  When OP is an infinity or a nonpositive
++     integer, set ROP to +Inf, following the general rules on special
++     values.  When −2K−1 < OP < −2K, K being a nonnegative integer, set
++     ROP to NaN.  See also ‘mpfr_lgamma’.
+ 
+  -- Function: int mpfr_lgamma (mpfr_t ROP, int *SIGNP, mpfr_t OP,
+           mpfr_rnd_t RND)
+      Set ROP to the value of the logarithm of the absolute value of the
+      Gamma function on OP, rounded in the direction RND.  The sign (1 or
+      −1) of Gamma(OP) is returned in the object pointed to by SIGNP.
+-     When OP is an infinity or a non-positive integer, set ROP to +Inf.
+-     When OP is NaN, −Inf or a negative integer, *SIGNP is undefined,
+-     and when OP is ±0, *SIGNP is the sign of the zero.
++     When OP is 1 or 2, set ROP to +0 (in all rounding modes).  When OP
++     is an infinity or a nonpositive integer, set ROP to +Inf.  When OP
++     is NaN, −Inf or a negative integer, *SIGNP is undefined, and when
++     OP is ±0, *SIGNP is the sign of the zero.
+ 
+  -- Function: int mpfr_digamma (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+      Set ROP to the value of the Digamma (sometimes also called Psi)
+@@ -1703,7 +1717,10 @@
+  -- Function: int mpfr_fms (mpfr_t ROP, mpfr_t OP1, mpfr_t OP2, mpfr_t
+           OP3, mpfr_rnd_t RND)
+      Set ROP to (OP1 times OP2) + OP3 (resp. (OP1 times OP2) - OP3)
+-     rounded in the direction RND.
++     rounded in the direction RND.  Concerning special values (signed
++     zeros, infinities, NaN), these functions behave like a
++     multiplication followed by a separate addition or subtraction.
++     That is, the fused operation matters only for rounding.
+ 
+  -- Function: int mpfr_agm (mpfr_t ROP, mpfr_t OP1, mpfr_t OP2,
+           mpfr_rnd_t RND)
+@@ -1717,9 +1734,10 @@
+           RND)
+      Set ROP to the Euclidean norm of X and Y, i.e., the square root of
+      the sum of the squares of X and Y, rounded in the direction RND.
+-     Special values are handled as described in Section F.9.4.3 of the
+-     ISO C99 and IEEE 754-2008 standards: If X or Y is an infinity, then
+-     +Inf is returned in ROP, even if the other number is NaN.
++     Special values are handled as described in the ISO C99 (Section
++     F.9.4.3) and IEEE 754-2008 (Section 9.2.1) standards: If X or Y is
++     an infinity, then +Inf is returned in ROP, even if the other number
++     is NaN.
+ 
+  -- Function: int mpfr_ai (mpfr_t ROP, mpfr_t X, mpfr_rnd_t RND)
+      Set ROP to the value of the Airy function Ai on X, rounded in the
+@@ -2670,7 +2688,7 @@
+ 5.16 Internals
+ ==============
+ 
+-A "limb" means the part of a multi-precision number that fits in a
++A “limb” means the part of a multi-precision number that fits in a
+ single word.  Usually a limb contains 32 or 64 bits.  The C data type
+ for a limb is ‘mp_limb_t’.
+ 
+@@ -3140,7 +3158,7 @@
+   0. PREAMBLE
+ 
+      The purpose of this License is to make a manual, textbook, or other
+-     functional and useful document "free" in the sense of freedom: to
++     functional and useful document “free” in the sense of freedom: to
+      assure everyone the effective freedom to copy and redistribute it,
+      with or without modifying it, either commercially or
+      noncommercially.  Secondarily, this License preserves for the
+@@ -3655,9 +3673,9 @@
+ * Menu:
+ 
+ * mpfr_abs:                              Basic Arithmetic Functions.
+-                                                              (line 160)
+-* mpfr_acos:                             Special Functions.   (line  51)
+-* mpfr_acosh:                            Special Functions.   (line 115)
++                                                              (line 165)
++* mpfr_acos:                             Special Functions.   (line  53)
++* mpfr_acosh:                            Special Functions.   (line 117)
+ * mpfr_add:                              Basic Arithmetic Functions.
+                                                               (line   6)
+ * mpfr_add_d:                            Basic Arithmetic Functions.
+@@ -3670,15 +3688,15 @@
+                                                               (line   8)
+ * mpfr_add_z:                            Basic Arithmetic Functions.
+                                                               (line  14)
+-* mpfr_agm:                              Special Functions.   (line 210)
+-* mpfr_ai:                               Special Functions.   (line 226)
+-* mpfr_asin:                             Special Functions.   (line  52)
+-* mpfr_asinh:                            Special Functions.   (line 116)
++* mpfr_agm:                              Special Functions.   (line 219)
++* mpfr_ai:                               Special Functions.   (line 236)
++* mpfr_asin:                             Special Functions.   (line  54)
++* mpfr_asinh:                            Special Functions.   (line 118)
+ * mpfr_asprintf:                         Formatted Output Functions.
+                                                               (line 193)
+-* mpfr_atan:                             Special Functions.   (line  53)
+-* mpfr_atan2:                            Special Functions.   (line  63)
+-* mpfr_atanh:                            Special Functions.   (line 117)
++* mpfr_atan:                             Special Functions.   (line  55)
++* mpfr_atan2:                            Special Functions.   (line  65)
++* mpfr_atanh:                            Special Functions.   (line 119)
+ * mpfr_buildopt_decimal_p:               Miscellaneous Functions.
+                                                               (line 162)
+ * mpfr_buildopt_gmpinternals_p:          Miscellaneous Functions.
+@@ -3690,7 +3708,7 @@
+ * mpfr_can_round:                        Rounding Related Functions.
+                                                               (line  39)
+ * mpfr_cbrt:                             Basic Arithmetic Functions.
+-                                                              (line 108)
++                                                              (line 113)
+ * mpfr_ceil:                             Integer Related Functions.
+                                                               (line   7)
+ * mpfr_check_range:                      Exception Related Functions.
+@@ -3735,18 +3753,18 @@
+                                                               (line  27)
+ * mpfr_cmp_z:                            Comparison Functions.
+                                                               (line  11)
+-* mpfr_const_catalan:                    Special Functions.   (line 237)
+-* mpfr_const_euler:                      Special Functions.   (line 236)
+-* mpfr_const_log2:                       Special Functions.   (line 234)
+-* mpfr_const_pi:                         Special Functions.   (line 235)
++* mpfr_const_catalan:                    Special Functions.   (line 247)
++* mpfr_const_euler:                      Special Functions.   (line 246)
++* mpfr_const_log2:                       Special Functions.   (line 244)
++* mpfr_const_pi:                         Special Functions.   (line 245)
+ * mpfr_copysign:                         Miscellaneous Functions.
+                                                               (line 109)
+-* mpfr_cos:                              Special Functions.   (line  29)
+-* mpfr_cosh:                             Special Functions.   (line  95)
+-* mpfr_cot:                              Special Functions.   (line  47)
+-* mpfr_coth:                             Special Functions.   (line 111)
+-* mpfr_csc:                              Special Functions.   (line  46)
+-* mpfr_csch:                             Special Functions.   (line 110)
++* mpfr_cos:                              Special Functions.   (line  31)
++* mpfr_cosh:                             Special Functions.   (line  97)
++* mpfr_cot:                              Special Functions.   (line  49)
++* mpfr_coth:                             Special Functions.   (line 113)
++* mpfr_csc:                              Special Functions.   (line  48)
++* mpfr_csch:                             Special Functions.   (line 112)
+ * mpfr_custom_get_exp:                   Custom Interface.    (line  75)
+ * mpfr_custom_get_kind:                  Custom Interface.    (line  65)
+ * mpfr_custom_get_significand:           Custom Interface.    (line  70)
+@@ -3756,47 +3774,47 @@
+ * mpfr_custom_move:                      Custom Interface.    (line  82)
+ * MPFR_DECL_INIT:                        Initialization Functions.
+                                                               (line  74)
+-* mpfr_digamma:                          Special Functions.   (line 166)
++* mpfr_digamma:                          Special Functions.   (line 172)
+ * mpfr_dim:                              Basic Arithmetic Functions.
+-                                                              (line 166)
++                                                              (line 171)
+ * mpfr_div:                              Basic Arithmetic Functions.
+-                                                              (line  72)
++                                                              (line  74)
+ * mpfr_divby0_p:                         Exception Related Functions.
+                                                               (line 134)
+ * mpfr_div_2exp:                         Compatibility with MPF.
+                                                               (line  49)
+ * mpfr_div_2si:                          Basic Arithmetic Functions.
+-                                                              (line 181)
++                                                              (line 186)
+ * mpfr_div_2ui:                          Basic Arithmetic Functions.
+-                                                              (line 179)
++                                                              (line 184)
+ * mpfr_div_d:                            Basic Arithmetic Functions.
+-                                                              (line  84)
++                                                              (line  86)
+ * mpfr_div_q:                            Basic Arithmetic Functions.
+-                                                              (line  88)
++                                                              (line  90)
+ * mpfr_div_si:                           Basic Arithmetic Functions.
+-                                                              (line  80)
++                                                              (line  82)
+ * mpfr_div_ui:                           Basic Arithmetic Functions.
+-                                                              (line  76)
++                                                              (line  78)
+ * mpfr_div_z:                            Basic Arithmetic Functions.
+-                                                              (line  86)
++                                                              (line  88)
+ * mpfr_d_div:                            Basic Arithmetic Functions.
+-                                                              (line  82)
++                                                              (line  84)
+ * mpfr_d_sub:                            Basic Arithmetic Functions.
+-                                                              (line  35)
+-* mpfr_eint:                             Special Functions.   (line 133)
++                                                              (line  36)
++* mpfr_eint:                             Special Functions.   (line 135)
+ * mpfr_eq:                               Compatibility with MPF.
+                                                               (line  28)
+ * mpfr_equal_p:                          Comparison Functions.
+                                                               (line  59)
+ * mpfr_erangeflag_p:                     Exception Related Functions.
+                                                               (line 137)
+-* mpfr_erf:                              Special Functions.   (line 177)
+-* mpfr_erfc:                             Special Functions.   (line 178)
+-* mpfr_exp:                              Special Functions.   (line  23)
+-* mpfr_exp10:                            Special Functions.   (line  25)
+-* mpfr_exp2:                             Special Functions.   (line  24)
+-* mpfr_expm1:                            Special Functions.   (line 129)
+-* mpfr_fac_ui:                           Special Functions.   (line 121)
++* mpfr_erf:                              Special Functions.   (line 183)
++* mpfr_erfc:                             Special Functions.   (line 184)
++* mpfr_exp:                              Special Functions.   (line  25)
++* mpfr_exp10:                            Special Functions.   (line  27)
++* mpfr_exp2:                             Special Functions.   (line  26)
++* mpfr_expm1:                            Special Functions.   (line 131)
++* mpfr_fac_ui:                           Special Functions.   (line 123)
+ * mpfr_fits_intmax_p:                    Conversion Functions.
+                                                               (line 150)
+ * mpfr_fits_sint_p:                      Conversion Functions.
+@@ -3815,20 +3833,20 @@
+                                                               (line 147)
+ * mpfr_floor:                            Integer Related Functions.
+                                                               (line   8)
+-* mpfr_fma:                              Special Functions.   (line 203)
++* mpfr_fma:                              Special Functions.   (line 209)
+ * mpfr_fmod:                             Integer Related Functions.
+                                                               (line  92)
+-* mpfr_fms:                              Special Functions.   (line 205)
++* mpfr_fms:                              Special Functions.   (line 211)
+ * mpfr_fprintf:                          Formatted Output Functions.
+                                                               (line 157)
+ * mpfr_frac:                             Integer Related Functions.
+                                                               (line  76)
+-* mpfr_free_cache:                       Special Functions.   (line 244)
++* mpfr_free_cache:                       Special Functions.   (line 254)
+ * mpfr_free_str:                         Conversion Functions.
+                                                               (line 137)
+ * mpfr_frexp:                            Conversion Functions.
+                                                               (line  45)
+-* mpfr_gamma:                            Special Functions.   (line 148)
++* mpfr_gamma:                            Special Functions.   (line 150)
+ * mpfr_get_d:                            Conversion Functions.
+                                                               (line   7)
+ * mpfr_get_decimal64:                    Conversion Functions.
+@@ -3887,7 +3905,7 @@
+                                                               (line  56)
+ * mpfr_greater_p:                        Comparison Functions.
+                                                               (line  55)
+-* mpfr_hypot:                            Special Functions.   (line 218)
++* mpfr_hypot:                            Special Functions.   (line 227)
+ * mpfr_inexflag_p:                       Exception Related Functions.
+                                                               (line 136)
+ * mpfr_inf_p:                            Comparison Functions.
+@@ -3922,21 +3940,21 @@
+                                                               (line  31)
+ * mpfr_integer_p:                        Integer Related Functions.
+                                                               (line 119)
+-* mpfr_j0:                               Special Functions.   (line 182)
+-* mpfr_j1:                               Special Functions.   (line 183)
+-* mpfr_jn:                               Special Functions.   (line 184)
++* mpfr_j0:                               Special Functions.   (line 188)
++* mpfr_j1:                               Special Functions.   (line 189)
++* mpfr_jn:                               Special Functions.   (line 190)
+ * mpfr_lessequal_p:                      Comparison Functions.
+                                                               (line  58)
+ * mpfr_lessgreater_p:                    Comparison Functions.
+                                                               (line  64)
+ * mpfr_less_p:                           Comparison Functions.
+                                                               (line  57)
+-* mpfr_lgamma:                           Special Functions.   (line 157)
+-* mpfr_li2:                              Special Functions.   (line 143)
+-* mpfr_lngamma:                          Special Functions.   (line 152)
++* mpfr_lgamma:                           Special Functions.   (line 162)
++* mpfr_li2:                              Special Functions.   (line 145)
++* mpfr_lngamma:                          Special Functions.   (line 154)
+ * mpfr_log:                              Special Functions.   (line  16)
+ * mpfr_log10:                            Special Functions.   (line  18)
+-* mpfr_log1p:                            Special Functions.   (line 125)
++* mpfr_log1p:                            Special Functions.   (line 127)
+ * mpfr_log2:                             Special Functions.   (line  17)
+ * mpfr_max:                              Miscellaneous Functions.
+                                                               (line  22)
+@@ -3947,29 +3965,29 @@
+ * mpfr_modf:                             Integer Related Functions.
+                                                               (line  82)
+ * mpfr_mul:                              Basic Arithmetic Functions.
+-                                                              (line  51)
++                                                              (line  53)
+ * mpfr_mul_2exp:                         Compatibility with MPF.
+                                                               (line  47)
+ * mpfr_mul_2si:                          Basic Arithmetic Functions.
+-                                                              (line 174)
++                                                              (line 179)
+ * mpfr_mul_2ui:                          Basic Arithmetic Functions.
+-                                                              (line 172)
++                                                              (line 177)
+ * mpfr_mul_d:                            Basic Arithmetic Functions.
+-                                                              (line  57)
++                                                              (line  59)
+ * mpfr_mul_q:                            Basic Arithmetic Functions.
+-                                                              (line  61)
++                                                              (line  63)
+ * mpfr_mul_si:                           Basic Arithmetic Functions.
+-                                                              (line  55)
++                                                              (line  57)
+ * mpfr_mul_ui:                           Basic Arithmetic Functions.
+-                                                              (line  53)
++                                                              (line  55)
+ * mpfr_mul_z:                            Basic Arithmetic Functions.
+-                                                              (line  59)
++                                                              (line  61)
+ * mpfr_nanflag_p:                        Exception Related Functions.
+                                                               (line 135)
+ * mpfr_nan_p:                            Comparison Functions.
+                                                               (line  39)
+ * mpfr_neg:                              Basic Arithmetic Functions.
+-                                                              (line 159)
++                                                              (line 164)
+ * mpfr_nextabove:                        Miscellaneous Functions.
+                                                               (line  15)
+ * mpfr_nextbelow:                        Miscellaneous Functions.
+@@ -3983,13 +4001,13 @@
+ * mpfr_overflow_p:                       Exception Related Functions.
+                                                               (line 133)
+ * mpfr_pow:                              Basic Arithmetic Functions.
+-                                                              (line 116)
++                                                              (line 121)
+ * mpfr_pow_si:                           Basic Arithmetic Functions.
+-                                                              (line 120)
++                                                              (line 125)
+ * mpfr_pow_ui:                           Basic Arithmetic Functions.
+-                                                              (line 118)
++                                                              (line 123)
+ * mpfr_pow_z:                            Basic Arithmetic Functions.
+-                                                              (line 122)
++                                                              (line 127)
+ * mpfr_prec_round:                       Rounding Related Functions.
+                                                               (line  13)
+ * ‘mpfr_prec_t’:                         Nomenclature and Types.
+@@ -3999,7 +4017,7 @@
+ * mpfr_print_rnd_mode:                   Rounding Related Functions.
+                                                               (line  71)
+ * mpfr_rec_sqrt:                         Basic Arithmetic Functions.
+-                                                              (line 103)
++                                                              (line 105)
+ * mpfr_regular_p:                        Comparison Functions.
+                                                               (line  43)
+ * mpfr_reldiff:                          Compatibility with MPF.
+@@ -4021,11 +4039,11 @@
+ * ‘mpfr_rnd_t’:                          Nomenclature and Types.
+                                                               (line  34)
+ * mpfr_root:                             Basic Arithmetic Functions.
+-                                                              (line 109)
++                                                              (line 114)
+ * mpfr_round:                            Integer Related Functions.
+                                                               (line   9)
+-* mpfr_sec:                              Special Functions.   (line  45)
+-* mpfr_sech:                             Special Functions.   (line 109)
++* mpfr_sec:                              Special Functions.   (line  47)
++* mpfr_sech:                             Special Functions.   (line 111)
+ * mpfr_set:                              Assignment Functions.
+                                                               (line   9)
+ * mpfr_setsign:                          Miscellaneous Functions.
+@@ -4100,57 +4118,57 @@
+                                                               (line  49)
+ * mpfr_signbit:                          Miscellaneous Functions.
+                                                               (line  99)
+-* mpfr_sin:                              Special Functions.   (line  30)
+-* mpfr_sinh:                             Special Functions.   (line  96)
+-* mpfr_sinh_cosh:                        Special Functions.   (line 101)
+-* mpfr_sin_cos:                          Special Functions.   (line  35)
++* mpfr_sin:                              Special Functions.   (line  32)
++* mpfr_sinh:                             Special Functions.   (line  98)
++* mpfr_sinh_cosh:                        Special Functions.   (line 103)
++* mpfr_sin_cos:                          Special Functions.   (line  37)
+ * mpfr_si_div:                           Basic Arithmetic Functions.
+-                                                              (line  78)
++                                                              (line  80)
+ * mpfr_si_sub:                           Basic Arithmetic Functions.
+-                                                              (line  31)
++                                                              (line  32)
+ * mpfr_snprintf:                         Formatted Output Functions.
+                                                               (line 180)
+ * mpfr_sprintf:                          Formatted Output Functions.
+                                                               (line 170)
+ * mpfr_sqr:                              Basic Arithmetic Functions.
+-                                                              (line  69)
++                                                              (line  71)
+ * mpfr_sqrt:                             Basic Arithmetic Functions.
+-                                                              (line  96)
++                                                              (line  98)
+ * mpfr_sqrt_ui:                          Basic Arithmetic Functions.
+-                                                              (line  97)
++                                                              (line  99)
+ * mpfr_strtofr:                          Assignment Functions.
+                                                               (line  80)
+ * mpfr_sub:                              Basic Arithmetic Functions.
+-                                                              (line  25)
++                                                              (line  26)
+ * mpfr_subnormalize:                     Exception Related Functions.
+                                                               (line  60)
+ * mpfr_sub_d:                            Basic Arithmetic Functions.
+-                                                              (line  37)
++                                                              (line  38)
+ * mpfr_sub_q:                            Basic Arithmetic Functions.
+-                                                              (line  43)
++                                                              (line  44)
+ * mpfr_sub_si:                           Basic Arithmetic Functions.
+-                                                              (line  33)
++                                                              (line  34)
+ * mpfr_sub_ui:                           Basic Arithmetic Functions.
+-                                                              (line  29)
++                                                              (line  30)
+ * mpfr_sub_z:                            Basic Arithmetic Functions.
+-                                                              (line  41)
+-* mpfr_sum:                              Special Functions.   (line 252)
++                                                              (line  42)
++* mpfr_sum:                              Special Functions.   (line 262)
+ * mpfr_swap:                             Assignment Functions.
+                                                               (line 150)
+ * ‘mpfr_t’:                              Nomenclature and Types.
+                                                               (line   6)
+-* mpfr_tan:                              Special Functions.   (line  31)
+-* mpfr_tanh:                             Special Functions.   (line  97)
++* mpfr_tan:                              Special Functions.   (line  33)
++* mpfr_tanh:                             Special Functions.   (line  99)
+ * mpfr_trunc:                            Integer Related Functions.
+                                                               (line  10)
+ * mpfr_ui_div:                           Basic Arithmetic Functions.
+-                                                              (line  74)
++                                                              (line  76)
+ * mpfr_ui_pow:                           Basic Arithmetic Functions.
+-                                                              (line 126)
++                                                              (line 131)
+ * mpfr_ui_pow_ui:                        Basic Arithmetic Functions.
+-                                                              (line 124)
++                                                              (line 129)
+ * mpfr_ui_sub:                           Basic Arithmetic Functions.
+-                                                              (line  27)
++                                                              (line  28)
+ * mpfr_underflow_p:                      Exception Related Functions.
+                                                               (line 132)
+ * mpfr_unordered_p:                      Comparison Functions.
+@@ -4181,61 +4199,61 @@
+                                                               (line 182)
+ * mpfr_vsprintf:                         Formatted Output Functions.
+                                                               (line 171)
+-* mpfr_y0:                               Special Functions.   (line 193)
+-* mpfr_y1:                               Special Functions.   (line 194)
+-* mpfr_yn:                               Special Functions.   (line 195)
++* mpfr_y0:                               Special Functions.   (line 199)
++* mpfr_y1:                               Special Functions.   (line 200)
++* mpfr_yn:                               Special Functions.   (line 201)
+ * mpfr_zero_p:                           Comparison Functions.
+                                                               (line  42)
+-* mpfr_zeta:                             Special Functions.   (line 171)
+-* mpfr_zeta_ui:                          Special Functions.   (line 172)
++* mpfr_zeta:                             Special Functions.   (line 177)
++* mpfr_zeta_ui:                          Special Functions.   (line 178)
+ * mpfr_z_sub:                            Basic Arithmetic Functions.
+-                                                              (line  39)
++                                                              (line  40)
+ 
+ 
+ 
+ Tag Table:
+ Node: Top775
+ Node: Copying2007
+-Node: Introduction to MPFR3766
+-Node: Installing MPFR5880
+-Node: Reporting Bugs11323
+-Node: MPFR Basics13353
+-Node: Headers and Libraries13669
+-Node: Nomenclature and Types16828
+-Node: MPFR Variable Conventions18874
+-Node: Rounding Modes20418
+-Ref: ternary value21544
+-Node: Floating-Point Values on Special Numbers23526
+-Node: Exceptions26572
+-Node: Memory Handling29749
+-Node: MPFR Interface30894
+-Node: Initialization Functions33008
+-Node: Assignment Functions40318
+-Node: Combined Initialization and Assignment Functions49673
+-Node: Conversion Functions50974
+-Node: Basic Arithmetic Functions60035
+-Node: Comparison Functions69200
+-Node: Special Functions72687
+-Node: Input and Output Functions86672
+-Node: Formatted Output Functions88644
+-Node: Integer Related Functions98431
+-Node: Rounding Related Functions105051
+-Node: Miscellaneous Functions108888
+-Node: Exception Related Functions117568
+-Node: Compatibility with MPF124386
+-Node: Custom Interface127127
+-Node: Internals131526
+-Node: API Compatibility133066
+-Node: Type and Macro Changes134995
+-Node: Added Functions137844
+-Node: Changed Functions141132
+-Node: Removed Functions145545
+-Node: Other Changes145973
+-Node: Contributors147576
+-Node: References150219
+-Node: GNU Free Documentation License151973
+-Node: Concept Index174562
+-Node: Function and Type Index180659
++Node: Introduction to MPFR3770
++Node: Installing MPFR5884
++Node: Reporting Bugs11327
++Node: MPFR Basics13357
++Node: Headers and Libraries13673
++Node: Nomenclature and Types16832
++Node: MPFR Variable Conventions18894
++Node: Rounding Modes20438
++Ref: ternary value21568
++Node: Floating-Point Values on Special Numbers23554
++Node: Exceptions26813
++Node: Memory Handling29990
++Node: MPFR Interface31135
++Node: Initialization Functions33249
++Node: Assignment Functions40559
++Node: Combined Initialization and Assignment Functions49914
++Node: Conversion Functions51215
++Node: Basic Arithmetic Functions60276
++Node: Comparison Functions69777
++Node: Special Functions73264
++Node: Input and Output Functions87862
++Node: Formatted Output Functions89834
++Node: Integer Related Functions99621
++Node: Rounding Related Functions106241
++Node: Miscellaneous Functions110078
++Node: Exception Related Functions118758
++Node: Compatibility with MPF125576
++Node: Custom Interface128317
++Node: Internals132716
++Node: API Compatibility134260
++Node: Type and Macro Changes136189
++Node: Added Functions139038
++Node: Changed Functions142326
++Node: Removed Functions146739
++Node: Other Changes147167
++Node: Contributors148770
++Node: References151413
++Node: GNU Free Documentation License153167
++Node: Concept Index175760
++Node: Function and Type Index181857
+ 
+ End Tag Table
+ 
+diff -Naurd mpfr-3.1.3-a/src/lngamma.c mpfr-3.1.3-b/src/lngamma.c
+--- mpfr-3.1.3-a/src/lngamma.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/lngamma.c	2015-07-02 10:49:24.018113593 +0000
+@@ -603,16 +603,17 @@
+       mpfr_get_prec (y), mpfr_log_prec, y, inex));
+ 
+   /* special cases */
+-  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x)))
++  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x) ||
++                     (MPFR_IS_NEG (x) && mpfr_integer_p (x))))
+     {
+-      if (MPFR_IS_NAN (x) || MPFR_IS_NEG (x))
++      if (MPFR_IS_NAN (x))
+         {
+           MPFR_SET_NAN (y);
+           MPFR_RET_NAN;
+         }
+-      else /* lngamma(+Inf) = lngamma(+0) = +Inf */
++      else /* lngamma(+/-Inf) = lngamma(nonpositive integer) = +Inf */
+         {
+-          if (MPFR_IS_ZERO (x))
++          if (!MPFR_IS_INF (x))
+             mpfr_set_divby0 ();
+           MPFR_SET_INF (y);
+           MPFR_SET_POS (y);
+@@ -620,8 +621,8 @@
+         }
+     }
+ 
+-  /* if x < 0 and -2k-1 <= x <= -2k, then lngamma(x) = NaN */
+-  if (MPFR_IS_NEG (x) && (unit_bit (x) == 0 || mpfr_integer_p (x)))
++  /* if -2k-1 < x < -2k <= 0, then lngamma(x) = NaN */
++  if (MPFR_IS_NEG (x) && unit_bit (x) == 0)
+     {
+       MPFR_SET_NAN (y);
+       MPFR_RET_NAN;
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-07-02 10:49:24.038113803 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3"
++#define MPFR_VERSION_STRING "3.1.3-p1"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-07-02 10:49:24.042113845 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3";
++  return "3.1.3-p1";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tlngamma.c mpfr-3.1.3-b/tests/tlngamma.c
+--- mpfr-3.1.3-a/tests/tlngamma.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/tests/tlngamma.c	2015-07-02 10:49:24.018113593 +0000
+@@ -33,7 +33,7 @@
+ special (void)
+ {
+   mpfr_t x, y;
+-  int inex;
++  int i, inex;
+ 
+   mpfr_init (x);
+   mpfr_init (y);
+@@ -46,25 +46,29 @@
+       exit (1);
+     }
+ 
+-  mpfr_set_inf (x, -1);
++  mpfr_set_inf (x, 1);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_nan_p (y))
++  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || __gmpfr_flags != 0)
+     {
+-      printf ("Error for lngamma(-Inf)\n");
++      printf ("Error for lngamma(+Inf)\n");
+       exit (1);
+     }
+ 
+-  mpfr_set_inf (x, 1);
++  mpfr_set_inf (x, -1);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0)
++  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || __gmpfr_flags != 0)
+     {
+-      printf ("Error for lngamma(+Inf)\n");
++      printf ("Error for lngamma(-Inf)\n");
+       exit (1);
+     }
+ 
+   mpfr_set_ui (x, 0, MPFR_RNDN);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0)
++  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
++      __gmpfr_flags != MPFR_FLAGS_DIVBY0)
+     {
+       printf ("Error for lngamma(+0)\n");
+       exit (1);
+@@ -72,32 +76,58 @@
+ 
+   mpfr_set_ui (x, 0, MPFR_RNDN);
+   mpfr_neg (x, x, MPFR_RNDN);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_nan_p (y))
++  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
++      __gmpfr_flags != MPFR_FLAGS_DIVBY0)
+     {
+       printf ("Error for lngamma(-0)\n");
+       exit (1);
+     }
+ 
+   mpfr_set_ui (x, 1, MPFR_RNDN);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (MPFR_IS_NAN (y) || mpfr_cmp_ui (y, 0) || MPFR_IS_NEG (y))
++  if (mpfr_cmp_ui0 (y, 0) || MPFR_IS_NEG (y))
+     {
+       printf ("Error for lngamma(1)\n");
+       exit (1);
+     }
+ 
+-  mpfr_set_si (x, -1, MPFR_RNDN);
+-  mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_nan_p (y))
++  for (i = 1; i <= 5; i++)
+     {
+-      printf ("Error for lngamma(-1)\n");
+-      exit (1);
++      int c;
++
++      mpfr_set_si (x, -i, MPFR_RNDN);
++      mpfr_clear_flags ();
++      mpfr_lngamma (y, x, MPFR_RNDN);
++      if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
++          __gmpfr_flags != MPFR_FLAGS_DIVBY0)
++        {
++          printf ("Error for lngamma(-%d)\n", i);
++          exit (1);
++        }
++      if (i & 1)
++        {
++          mpfr_nextabove (x);
++          c = '+';
++        }
++      else
++        {
++          mpfr_nextbelow (x);
++          c = '-';
++        }
++      mpfr_lngamma (y, x, MPFR_RNDN);
++      if (!mpfr_nan_p (y))
++        {
++          printf ("Error for lngamma(-%d%cepsilon)\n", i, c);
++          exit (1);
++        }
+     }
+ 
+   mpfr_set_ui (x, 2, MPFR_RNDN);
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (MPFR_IS_NAN (y) || mpfr_cmp_ui (y, 0) || MPFR_IS_NEG (y))
++  if (mpfr_cmp_ui0 (y, 0) || MPFR_IS_NEG (y))
+     {
+       printf ("Error for lngamma(2)\n");
+       exit (1);
+@@ -127,7 +157,7 @@
+   mpfr_set_str (x, CHECK_X2, 10, MPFR_RNDN);
+   mpfr_lngamma (y, x, MPFR_RNDN);
+   mpfr_set_str (x, CHECK_Y2, 10, MPFR_RNDN);
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (y, x))
++  if (mpfr_cmp0 (y, x))
+     {
+       printf ("mpfr_lngamma("CHECK_X2") is wrong:\n"
+               "expected ");
+@@ -143,7 +173,7 @@
+   mpfr_lngamma (y, x, MPFR_RNDU);
+   mpfr_set_prec (x, 175);
+   mpfr_set_str_binary (x, "0.1010001100011101101011001101110010100001000001000001110011000001101100001111001001000101011011100100010101011110100111110101010100010011010010000101010111001100011000101111E7");
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error in mpfr_lngamma (1)\n");
+       exit (1);
+@@ -155,7 +185,7 @@
+   mpfr_lngamma (x, y, MPFR_RNDZ);
+   mpfr_set_prec (y, 21);
+   mpfr_set_str_binary (y, "0.111000101000001100101E9");
+-  if (MPFR_IS_NAN (x) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error in mpfr_lngamma (120)\n");
+       printf ("Expected "); mpfr_print_binary (y); puts ("");
+@@ -169,7 +199,7 @@
+   inex = mpfr_lngamma (y, x, MPFR_RNDN);
+   mpfr_set_prec (x, 206);
+   mpfr_set_str_binary (x, "0.10000111011000000011100010101001100110001110000111100011000100100110110010001011011110101001111011110110000001010100111011010000000011100110110101100111000111010011110010000100010111101010001101000110101001E13");
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error in mpfr_lngamma (768)\n");
+       exit (1);
+@@ -185,7 +215,7 @@
+   mpfr_set_str_binary (x, "0.1100E-66");
+   mpfr_lngamma (y, x, MPFR_RNDN);
+   mpfr_set_str_binary (x, "0.1100E6");
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error for lngamma(0.1100E-66)\n");
+       exit (1);
+@@ -199,7 +229,7 @@
+   mpfr_lngamma (y, x, MPFR_RNDN);
+   mpfr_set_prec (x, 32);
+   mpfr_set_str_binary (x, "-0.10001000111011111011000010100010E207");
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error for lngamma(-2^199+0.5)\n");
+       printf ("Got        ");
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-07-02 10:50:08.046573308 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-07-02 10:50:08.126574142 +0000
+@@ -0,0 +1 @@
++muldiv-2exp-overflow
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-07-02 10:49:24.042113845 +0000
++++ mpfr-3.1.3-b/VERSION	2015-07-02 10:50:08.126574142 +0000
+@@ -1 +1 @@
+-3.1.3-p1
++3.1.3-p2
+diff -Naurd mpfr-3.1.3-a/src/div_2si.c mpfr-3.1.3-b/src/div_2si.c
+--- mpfr-3.1.3-a/src/div_2si.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/div_2si.c	2015-07-02 10:50:08.106573933 +0000
+@@ -49,7 +49,7 @@
+             rnd_mode = MPFR_RNDZ;
+           return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
+         }
+-      else if (MPFR_UNLIKELY(n < 0 && (__gmpfr_emax < MPFR_EMIN_MIN - n ||
++      else if (MPFR_UNLIKELY(n <= 0 && (__gmpfr_emax < MPFR_EMIN_MIN - n ||
+                                        exp > __gmpfr_emax + n)) )
+         return mpfr_overflow (y, rnd_mode, MPFR_SIGN(y));
+ 
+diff -Naurd mpfr-3.1.3-a/src/div_2ui.c mpfr-3.1.3-b/src/div_2ui.c
+--- mpfr-3.1.3-a/src/div_2ui.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/div_2ui.c	2015-07-02 10:50:08.106573933 +0000
+@@ -32,7 +32,7 @@
+      rnd_mode),
+     ("y[%Pu]=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inexact));
+ 
+-  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x)))
++  if (MPFR_UNLIKELY (n == 0 || MPFR_IS_SINGULAR (x)))
+     return mpfr_set (y, x, rnd_mode);
+   else
+     {
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-07-02 10:49:24.038113803 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-07-02 10:50:08.126574142 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3-p1"
++#define MPFR_VERSION_STRING "3.1.3-p2"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/mul_2si.c mpfr-3.1.3-b/src/mul_2si.c
+--- mpfr-3.1.3-a/src/mul_2si.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/mul_2si.c	2015-07-02 10:50:08.106573933 +0000
+@@ -39,7 +39,7 @@
+     {
+       mpfr_exp_t exp = MPFR_GET_EXP (x);
+       MPFR_SETRAW (inexact, y, x, exp, rnd_mode);
+-      if (MPFR_UNLIKELY( n > 0 && (__gmpfr_emax < MPFR_EMIN_MIN + n ||
++      if (MPFR_UNLIKELY(n >= 0 && (__gmpfr_emax < MPFR_EMIN_MIN + n ||
+                                    exp > __gmpfr_emax - n)))
+         return mpfr_overflow (y, rnd_mode, MPFR_SIGN(y));
+       else if (MPFR_UNLIKELY(n < 0 && (__gmpfr_emin > MPFR_EMAX_MAX + n ||
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-07-02 10:49:24.042113845 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-07-02 10:50:08.126574142 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3-p1";
++  return "3.1.3-p2";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tmul_2exp.c mpfr-3.1.3-b/tests/tmul_2exp.c
+--- mpfr-3.1.3-a/tests/tmul_2exp.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/tests/tmul_2exp.c	2015-07-02 10:50:08.106573933 +0000
+@@ -242,6 +242,76 @@
+   large (MPFR_EMAX_MAX);
+ }
+ 
++/* Cases where the function overflows on n = 0 when rounding is like
++   away from zero. */
++static void
++overflow0 (mpfr_exp_t emax)
++{
++  mpfr_exp_t old_emax;
++  mpfr_t x, y1, y2;
++  int neg, r, op;
++  static char *sop[4] = { "mul_2ui", "mul_2si", "div_2ui", "div_2si" };
++
++  old_emax = mpfr_get_emax ();
++  set_emax (emax);
++
++  mpfr_init2 (x, 8);
++  mpfr_inits2 (6, y1, y2, (mpfr_ptr) 0);
++
++  mpfr_set_inf (x, 1);
++  mpfr_nextbelow (x);
++
++  for (neg = 0; neg <= 1; neg++)
++    {
++      RND_LOOP (r)
++        {
++          int inex1, inex2;
++          unsigned int flags1, flags2;
++
++          /* Even if there isn't an overflow (rounding ~ toward zero),
++             the result is the same as the one of an overflow. */
++          inex1 = mpfr_overflow (y1, (mpfr_rnd_t) r, neg ? -1 : 1);
++          flags1 = MPFR_FLAGS_INEXACT;
++          if (mpfr_inf_p (y1))
++            flags1 |= MPFR_FLAGS_OVERFLOW;
++          for (op = 0; op < 4; op++)
++            {
++              mpfr_clear_flags ();
++              inex2 =
++                op == 0 ? mpfr_mul_2ui (y2, x, 0, (mpfr_rnd_t) r) :
++                op == 1 ? mpfr_mul_2si (y2, x, 0, (mpfr_rnd_t) r) :
++                op == 2 ? mpfr_div_2ui (y2, x, 0, (mpfr_rnd_t) r) :
++                op == 3 ? mpfr_div_2si (y2, x, 0, (mpfr_rnd_t) r) :
++                (MPFR_ASSERTN (0), 0);
++              flags2 = __gmpfr_flags;
++              if (!(mpfr_equal_p (y1, y2) &&
++                    SAME_SIGN (inex1, inex2) &&
++                    flags1 == flags2))
++                {
++                  printf ("Error in overflow0 for %s, mpfr_%s, emax = %"
++                          MPFR_EXP_FSPEC "d,\nx = ",
++                          mpfr_print_rnd_mode ((mpfr_rnd_t) r), sop[op],
++                          (mpfr_eexp_t) emax);
++                  mpfr_dump (x);
++                  printf ("Expected ");
++                  mpfr_dump (y1);
++                  printf ("  with inex = %d, flags =", inex1);
++                  flags_out (flags1);
++                  printf ("Got      ");
++                  mpfr_dump (y2);
++                  printf ("  with inex = %d, flags =", inex2);
++                  flags_out (flags2);
++                  exit (1);
++                }
++            }
++        }
++      mpfr_neg (x, x, MPFR_RNDN);
++    }
++
++  mpfr_clears (x, y1, y2, (mpfr_ptr) 0);
++  set_emax (old_emax);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -334,6 +404,11 @@
+   underflow0 ();
+   large0 ();
+ 
++  if (mpfr_get_emax () != MPFR_EMAX_MAX)
++    overflow0 (mpfr_get_emax ());
++  overflow0 (MPFR_EMAX_MAX);
++  overflow0 (-1);
++
+   tests_end_mpfr ();
+   return 0;
+ }
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-07-17 08:54:48.592799981 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-07-17 08:54:48.616811495 +0000
+@@ -0,0 +1 @@
++muldiv-2exp-underflow
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-07-02 10:50:08.126574142 +0000
++++ mpfr-3.1.3-b/VERSION	2015-07-17 08:54:48.616811495 +0000
+@@ -1 +1 @@
+-3.1.3-p2
++3.1.3-p3
+diff -Naurd mpfr-3.1.3-a/src/div_2si.c mpfr-3.1.3-b/src/div_2si.c
+--- mpfr-3.1.3-a/src/div_2si.c	2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/src/div_2si.c	2015-07-17 08:54:48.608807656 +0000
+@@ -45,7 +45,8 @@
+           if (rnd_mode == MPFR_RNDN &&
+               (__gmpfr_emin > MPFR_EMAX_MAX - (n - 1) ||
+                exp < __gmpfr_emin + (n - 1) ||
+-               (inexact >= 0 && mpfr_powerof2_raw (y))))
++               ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
++                mpfr_powerof2_raw (y))))
+             rnd_mode = MPFR_RNDZ;
+           return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
+         }
+diff -Naurd mpfr-3.1.3-a/src/div_2ui.c mpfr-3.1.3-b/src/div_2ui.c
+--- mpfr-3.1.3-a/src/div_2ui.c	2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/src/div_2ui.c	2015-07-17 08:54:48.608807656 +0000
+@@ -44,7 +44,9 @@
+       if (MPFR_UNLIKELY (n >= diffexp))  /* exp - n <= emin - 1 */
+         {
+           if (rnd_mode == MPFR_RNDN &&
+-              (n > diffexp || (inexact >= 0 && mpfr_powerof2_raw (y))))
++              (n > diffexp ||
++               ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
++                mpfr_powerof2_raw (y))))
+             rnd_mode = MPFR_RNDZ;
+           return mpfr_underflow (y, rnd_mode, MPFR_SIGN (y));
+         }
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-07-02 10:50:08.126574142 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-07-17 08:54:48.616811495 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3-p2"
++#define MPFR_VERSION_STRING "3.1.3-p3"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/mul_2si.c mpfr-3.1.3-b/src/mul_2si.c
+--- mpfr-3.1.3-a/src/mul_2si.c	2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/src/mul_2si.c	2015-07-17 08:54:48.608807656 +0000
+@@ -48,7 +48,8 @@
+           if (rnd_mode == MPFR_RNDN &&
+               (__gmpfr_emin > MPFR_EMAX_MAX + (n + 1) ||
+                exp < __gmpfr_emin - (n + 1) ||
+-               (inexact >= 0 && mpfr_powerof2_raw (y))))
++               ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
++                mpfr_powerof2_raw (y))))
+             rnd_mode = MPFR_RNDZ;
+           return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
+         }
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-07-02 10:50:08.126574142 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-07-17 08:54:48.616811495 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3-p2";
++  return "3.1.3-p3";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tmul_2exp.c mpfr-3.1.3-b/tests/tmul_2exp.c
+--- mpfr-3.1.3-a/tests/tmul_2exp.c	2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/tests/tmul_2exp.c	2015-07-17 08:54:48.608807656 +0000
+@@ -50,77 +50,82 @@
+ {
+   mpfr_t x, y, z1, z2;
+   mpfr_exp_t emin;
+-  int i, k;
++  int i, k, s;
+   int prec;
+   int rnd;
+   int div;
+   int inex1, inex2;
+   unsigned int flags1, flags2;
+ 
+-  /* Test mul_2si(x, e - k), div_2si(x, k - e) and div_2ui(x, k - e)
+-   * with emin = e, x = 1 + i/16, i in { -1, 0, 1 }, and k = 1 to 4,
+-   * by comparing the result with the one of a simple division.
++  /* Test mul_2si(x, e - k), div_2si(x, k - e) and div_2ui(x, k - e) with
++   * emin = e, x = s * (1 + i/16), i in { -1, 0, 1 }, s in { -1, 1 }, and
++   * k = 1 to 4, by comparing the result with the one of a simple division.
+    */
+   emin = mpfr_get_emin ();
+   set_emin (e);
+   mpfr_inits2 (8, x, y, (mpfr_ptr) 0);
+   for (i = 15; i <= 17; i++)
+-    {
+-      inex1 = mpfr_set_ui_2exp (x, i, -4, MPFR_RNDN);
+-      MPFR_ASSERTN (inex1 == 0);
+-      for (prec = 6; prec >= 3; prec -= 3)
+-        {
+-          mpfr_inits2 (prec, z1, z2, (mpfr_ptr) 0);
+-          RND_LOOP (rnd)
+-            for (k = 1; k <= 4; k++)
+-              {
+-                /* The following one is assumed to be correct. */
+-                inex1 = mpfr_mul_2si (y, x, e, MPFR_RNDN);
+-                MPFR_ASSERTN (inex1 == 0);
+-                inex1 = mpfr_set_ui (z1, 1 << k, MPFR_RNDN);
+-                MPFR_ASSERTN (inex1 == 0);
+-                mpfr_clear_flags ();
+-                /* Do not use mpfr_div_ui to avoid the optimization
+-                   by mpfr_div_2si. */
+-                inex1 = mpfr_div (z1, y, z1, (mpfr_rnd_t) rnd);
+-                flags1 = __gmpfr_flags;
+-
+-              for (div = 0; div <= 2; div++)
++    for (s = 1; s >= -1; s -= 2)
++      {
++        inex1 = mpfr_set_si_2exp (x, s * i, -4, MPFR_RNDN);
++        MPFR_ASSERTN (inex1 == 0);
++        for (prec = 6; prec >= 3; prec -= 3)
++          {
++            mpfr_inits2 (prec, z1, z2, (mpfr_ptr) 0);
++            RND_LOOP (rnd)
++              for (k = 1; k <= 4; k++)
+                 {
++                  /* The following one is assumed to be correct. */
++                  inex1 = mpfr_mul_2si (y, x, e, MPFR_RNDN);
++                  MPFR_ASSERTN (inex1 == 0);
++                  inex1 = mpfr_set_ui (z1, 1 << k, MPFR_RNDN);
++                  MPFR_ASSERTN (inex1 == 0);
+                   mpfr_clear_flags ();
+-                  inex2 = div == 0 ?
+-                    mpfr_mul_2si (z2, x, e - k, (mpfr_rnd_t) rnd) : div == 1 ?
+-                    mpfr_div_2si (z2, x, k - e, (mpfr_rnd_t) rnd) :
+-                    mpfr_div_2ui (z2, x, k - e, (mpfr_rnd_t) rnd);
+-                  flags2 = __gmpfr_flags;
+-                  if (flags1 == flags2 && SAME_SIGN (inex1, inex2) &&
+-                      mpfr_equal_p (z1, z2))
+-                    continue;
+-                  printf ("Error in underflow(");
+-                  if (e == MPFR_EMIN_MIN)
+-                    printf ("MPFR_EMIN_MIN");
+-                  else if (e == emin)
+-                    printf ("default emin");
+-                  else if (e >= LONG_MIN)
+-                    printf ("%ld", (long) e);
+-                  else
+-                    printf ("<LONG_MIN");
+-                  printf (") with mpfr_%s,\nx = %d/16, prec = %d, k = %d, "
+-                          "%s\n", div == 0 ? "mul_2si" : div == 1 ?
+-                          "div_2si" : "div_2ui", i, prec, k,
+-                          mpfr_print_rnd_mode ((mpfr_rnd_t) rnd));
+-                  printf ("Expected ");
+-                  mpfr_out_str (stdout, 16, 0, z1, MPFR_RNDN);
+-                  printf (", inex = %d, flags = %u\n", SIGN (inex1), flags1);
+-                  printf ("Got      ");
+-                  mpfr_out_str (stdout, 16, 0, z2, MPFR_RNDN);
+-                  printf (", inex = %d, flags = %u\n", SIGN (inex2), flags2);
+-                  exit (1);
+-                }  /* div */
+-              }  /* k */
+-          mpfr_clears (z1, z2, (mpfr_ptr) 0);
+-        }  /* prec */
+-    }  /* i */
++                  /* Do not use mpfr_div_ui to avoid the optimization
++                     by mpfr_div_2si. */
++                  inex1 = mpfr_div (z1, y, z1, (mpfr_rnd_t) rnd);
++                  flags1 = __gmpfr_flags;
++
++                  for (div = 0; div <= 2; div++)
++                    {
++                      mpfr_clear_flags ();
++                      inex2 =
++                        div == 0 ?
++                        mpfr_mul_2si (z2, x, e - k, (mpfr_rnd_t) rnd) :
++                        div == 1 ?
++                        mpfr_div_2si (z2, x, k - e, (mpfr_rnd_t) rnd) :
++                        mpfr_div_2ui (z2, x, k - e, (mpfr_rnd_t) rnd);
++                      flags2 = __gmpfr_flags;
++                      if (flags1 == flags2 && SAME_SIGN (inex1, inex2) &&
++                          mpfr_equal_p (z1, z2))
++                        continue;
++                      printf ("Error in underflow(");
++                      if (e == MPFR_EMIN_MIN)
++                        printf ("MPFR_EMIN_MIN");
++                      else if (e == emin)
++                        printf ("default emin");
++                      else if (e >= LONG_MIN)
++                        printf ("%ld", (long) e);
++                      else
++                        printf ("<LONG_MIN");
++                      printf (") with mpfr_%s,\nx = %d/16, prec = %d, k = %d,"
++                              " %s\n", div == 0 ? "mul_2si" : div == 1 ?
++                              "div_2si" : "div_2ui", s * i, prec, k,
++                              mpfr_print_rnd_mode ((mpfr_rnd_t) rnd));
++                      printf ("Expected ");
++                      mpfr_out_str (stdout, 16, 0, z1, MPFR_RNDN);
++                      printf (", inex = %d, flags = %u\n",
++                              SIGN (inex1), flags1);
++                      printf ("Got      ");
++                      mpfr_out_str (stdout, 16, 0, z2, MPFR_RNDN);
++                      printf (", inex = %d, flags = %u\n",
++                              SIGN (inex2), flags2);
++                      exit (1);
++                    }  /* div */
++                }  /* k */
++            mpfr_clears (z1, z2, (mpfr_ptr) 0);
++          }  /* prec */
++      }  /* i */
+   mpfr_clears (x, y, (mpfr_ptr) 0);
+   set_emin (emin);
+ }
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-07-17 08:58:21.094987384 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-07-17 08:58:21.118986898 +0000
+@@ -0,0 +1 @@
++frexp
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-07-17 08:54:48.616811495 +0000
++++ mpfr-3.1.3-b/VERSION	2015-07-17 08:58:21.118986898 +0000
+@@ -1 +1 @@
+-3.1.3-p3
++3.1.3-p4
+diff -Naurd mpfr-3.1.3-a/src/frexp.c mpfr-3.1.3-b/src/frexp.c
+--- mpfr-3.1.3-a/src/frexp.c	2015-06-19 19:55:09.000000000 +0000
++++ mpfr-3.1.3-b/src/frexp.c	2015-07-17 08:58:21.106987142 +0000
+@@ -26,6 +26,13 @@
+ mpfr_frexp (mpfr_exp_t *exp, mpfr_ptr y, mpfr_srcptr x, mpfr_rnd_t rnd)
+ {
+   int inex;
++  unsigned int saved_flags = __gmpfr_flags;
++  MPFR_BLOCK_DECL (flags);
++
++  MPFR_LOG_FUNC
++    (("x[%Pu]=%.*Rg rnd=%d", mpfr_get_prec (x), mpfr_log_prec, x, rnd),
++     ("y[%Pu]=%.*Rg exp=%" MPFR_EXP_FSPEC "d inex=%d", mpfr_get_prec (y),
++      mpfr_log_prec, y, (mpfr_eexp_t) *exp, inex));
+ 
+   if (MPFR_UNLIKELY(MPFR_IS_SINGULAR(x)))
+     {
+@@ -49,8 +56,32 @@
+         }
+     }
+ 
+-  inex = mpfr_set (y, x, rnd);
++  MPFR_BLOCK (flags, inex = mpfr_set (y, x, rnd));
++  __gmpfr_flags = saved_flags;
++
++  /* Possible overflow due to the rounding, no possible underflow. */
++
++  if (MPFR_UNLIKELY (MPFR_OVERFLOW (flags)))
++    {
++      int inex2;
++
++      /* An overflow here means that the exponent of y would be larger than
++         the one of x, thus x would be rounded to the next power of 2, and
++         the returned y should be 1/2 in absolute value, rounded (i.e. with
++         possible underflow or overflow). This also implies that x and y are
++         different objects, so that the exponent of x has not been lost. */
++      MPFR_LOG_MSG (("Internal overflow\n", 0));
++      MPFR_ASSERTD (x != y);
++      *exp = MPFR_GET_EXP (x) + 1;
++      inex2 = mpfr_set_si_2exp (y, MPFR_INT_SIGN (x), -1, rnd);
++      MPFR_LOG_MSG (("inex=%d inex2=%d\n", inex, inex2));
++      if (inex2 != 0)
++        inex = inex2;
++      MPFR_RET (inex);
++    }
++
+   *exp = MPFR_GET_EXP (y);
+-  MPFR_SET_EXP (y, 0);
++  /* Do not use MPFR_SET_EXP because the range has not been checked yet. */
++  MPFR_EXP (y) = 0;
+   return mpfr_check_range (y, inex, rnd);
+ }
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-07-17 08:54:48.616811495 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-07-17 08:58:21.114986979 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3-p3"
++#define MPFR_VERSION_STRING "3.1.3-p4"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-07-17 08:54:48.616811495 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-07-17 08:58:21.118986898 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3-p3";
++  return "3.1.3-p4";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tfrexp.c mpfr-3.1.3-b/tests/tfrexp.c
+--- mpfr-3.1.3-a/tests/tfrexp.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/tests/tfrexp.c	2015-07-17 08:58:21.106987142 +0000
+@@ -129,12 +129,115 @@
+   mpfr_clear (x);
+ }
+ 
++static void check1 (void)
++{
++  mpfr_exp_t emin, emax, e;
++  mpfr_t x, y1, y2;
++  int r, neg, red;
++
++  emin = mpfr_get_emin ();
++  emax = mpfr_get_emax ();
++  set_emin (MPFR_EMIN_MIN);
++  set_emax (MPFR_EMAX_MAX);
++
++  mpfr_init2 (x, 7);
++  mpfr_inits2 (4, y1, y2, (mpfr_ptr) 0);
++
++  mpfr_set_ui_2exp (x, 1, -2, MPFR_RNDN);
++  while (mpfr_regular_p (x))
++    {
++      /* Test the exponents up to 3 and with the maximum exponent
++         (to check potential intermediate overflow). */
++      if (MPFR_GET_EXP (x) == 4)
++        mpfr_set_exp (x, MPFR_EMAX_MAX);
++      e = MPFR_GET_EXP (x);
++      for (neg = 0; neg < 2; neg++)
++        {
++          RND_LOOP (r)
++            {
++              int inex1, inex2;
++              mpfr_exp_t e1, e2;
++              unsigned int flags1, flags2;
++
++              for (red = 0; red < 2; red++)
++                {
++                  if (red)
++                    {
++                      /* e1: exponent of the rounded value of x. */
++                      MPFR_ASSERTN (e1 == e || e1 == e + 1);
++                      set_emin (e);
++                      set_emax (e);
++                      mpfr_clear_flags ();
++                      inex1 = e1 < 0 ?
++                        mpfr_mul_2ui (y1, x, -e1, (mpfr_rnd_t) r) :
++                        mpfr_div_2ui (y1, x, e1, (mpfr_rnd_t) r);
++                      flags1 = __gmpfr_flags;
++                    }
++                  else
++                    {
++                      inex1 = mpfr_set (y1, x, (mpfr_rnd_t) r);
++                      e1 = MPFR_IS_INF (y1) ? e + 1 : MPFR_GET_EXP (y1);
++                      flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0;
++                    }
++                  mpfr_clear_flags ();
++                  inex2 = mpfr_frexp (&e2, y2, x, (mpfr_rnd_t) r);
++                  flags2 = __gmpfr_flags;
++                  set_emin (MPFR_EMIN_MIN);
++                  set_emax (MPFR_EMAX_MAX);
++                  if ((!red || e == 0) &&
++                      (! mpfr_regular_p (y2) || MPFR_GET_EXP (y2) != 0))
++                    {
++                      printf ("Error in check1 for %s, red = %d, x = ",
++                              mpfr_print_rnd_mode ((mpfr_rnd_t) r), red);
++                      mpfr_dump (x);
++                      printf ("Expected 1/2 <= |y| < 1, got y = ");
++                      mpfr_dump (y2);
++                      exit (1);
++                    }
++                  if (!red)
++                    {
++                      if (e2 > 0)
++                        mpfr_mul_2ui (y2, y2, e2, MPFR_RNDN);
++                      else if (e2 < 0)
++                        mpfr_div_2ui (y2, y2, -e2, MPFR_RNDN);
++                    }
++                  if (! (SAME_SIGN (inex1, inex2) &&
++                         mpfr_equal_p (y1, y2) &&
++                         flags1 == flags2))
++                    {
++                      printf ("Error in check1 for %s, red = %d, x = ",
++                              mpfr_print_rnd_mode ((mpfr_rnd_t) r), red);
++                      mpfr_dump (x);
++                      printf ("Expected y1 = ");
++                      mpfr_dump (y1);
++                      printf ("Got      y2 = ");
++                      mpfr_dump (y2);
++                      printf ("Expected inex ~= %d, got %d\n", inex1, inex2);
++                      printf ("Expected flags:");
++                      flags_out (flags1);
++                      printf ("Got flags:     ");
++                      flags_out (flags2);
++                      exit (1);
++                    }
++                }
++            }
++          mpfr_neg (x, x, MPFR_RNDN);
++        }
++      mpfr_nextabove (x);
++    }
++
++  mpfr_clears (x, y1, y2, (mpfr_ptr) 0);
++  set_emin (emin);
++  set_emax (emax);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+   tests_start_mpfr ();
+ 
+   check_special ();
++  check1 ();
+ 
+   tests_end_mpfr ();
+   return 0;

From be488763491b63235913ce8834fe2cd36671425c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 17 Jul 2015 18:00:40 -0700
Subject: [PATCH 2279/2322] openjdk: 8u40b27 -> 8u60b24

---
 .../openjdk/JDK-8074312-hotspot.patch         | 11 ---------
 .../compilers/openjdk/openjdk8.nix            | 23 +++++++++----------
 2 files changed, 11 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch

diff --git a/pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch b/pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch
deleted file mode 100644
index 85722a1d365..00000000000
--- a/pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r 61edd5c7412e make/linux/Makefile
---- a/hotspot/make/linux/Makefile	Mon Mar 02 18:12:06 2015 +0000
-+++ b/hotspot/make/linux/Makefile	Tue Mar 03 15:58:13 2015 +0100
-@@ -233,7 +233,7 @@
- # Solaris 2.5.1, 2.6).
- # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
-
--SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
-+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4%
- OS_VERSION := $(shell uname -r)
- EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix
index 530391c8e7d..8afa770cdb2 100644
--- a/pkgs/development/compilers/openjdk/openjdk8.nix
+++ b/pkgs/development/compilers/openjdk/openjdk8.nix
@@ -3,42 +3,42 @@
 
 , minimal ? false } :
 let
-  update = "40";
-  build = "27";
-  baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u40";
+  update = "60";
+  build = "24";
+  baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
   repover = "jdk8u${update}-b${build}";
   paxflags = if stdenv.isi686 then "msp" else "m";
   jdk8 = fetchurl {
              url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = "0ra05jngvvy2g1da5b9anrp86m812g2wlkxpijc82kxv6c3h6g28";
+             sha256 = "1gxfyz5kdl3xgfmn6gr65hj66zh5p67y1g0hxdbps1h8gcc6iqwp";
           };
   langtools = fetchurl {
              url = "${baseurl}/langtools/archive/${repover}.tar.gz";
-             sha256 = "0r9zdq13kgqqm8rgr36qf03h23psxcwzvdqffsncd4jvbfap3n5f";
+             sha256 = "0a8kmfcnw92hvhivmpa9g22k1lvcr64zjw7x1gjj1j6zx7r579ck";
           };
   hotspot = fetchurl {
              url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
-             sha256 = "07v3z38v5fdsx3g28c4pkdq76cdmnc4qflf1wb3lz46lhy230hkd";
+             sha256 = "0k68wqwg5fz8i2za9dg2zfx4db5zcbls31vk2abrqrwp31ik0y4y";
           };
   corba = fetchurl {
              url = "${baseurl}/corba/archive/${repover}.tar.gz";
-             sha256 = "0y20468f2yi14lijbd732f2mlgrn718pyfji3279l2rm4ad7r7pl";
+             sha256 = "0rc8m5jrwjzrbxnzbhxjm265z23ky6v11g8sgcb6flr0l636fwvn";
           };
   jdk = fetchurl {
              url = "${baseurl}/jdk/archive/${repover}.tar.gz";
-             sha256 = "1sgfxmkq6z3vj9yq9kszr42b1ijvsknlss353jpcmyr1lljhyvfg";
+             sha256 = "11c90zz728p30zc6zas9ip67n9sd09i0v6afxs608k9s451057wr";
           };
   jaxws = fetchurl {
              url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
-             sha256 = "08p3657d0871pz0g5fg157az9q38r5h2zs49dm7512sc9qrn5c06";
+             sha256 = "15pzczqwrr47qv51bsisjylilhljban8938n1436hsjd5k1dhhwn";
           };
   jaxp = fetchurl {
              url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
-             sha256 = "1f1vlrvlvnjbyh8d168smizvmkcm076zc496sxk6njqamby16ip2";
+             sha256 = "0gcc7pb07yl76drcynpz5gjjv3y6s1c0k4kfp9fayha5f624k1fb";
           };
   nashorn = fetchurl {
              url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
-             sha256 = "1llf3l4483kd8m1a77n7y9fgvm6fa63nim3qhp5z4gnw68ldbhra";
+             sha256 = "00g849wwqxljqpml6r7rv3pscj0ma0jaamyvxsxlfxbqvwid93ai";
           };
   openjdk8 = stdenv.mkDerivation {
     name = "openjdk-8u${update}b${build}";
@@ -66,7 +66,6 @@ let
       ./fix-java-home-jdk8.patch
       ./read-truststore-from-env-jdk8.patch
       ./currency-date-range-jdk8.patch
-      ./JDK-8074312-hotspot.patch
     ];
 
     preConfigure = ''

From 7fe69244af791a1d452d64b40efd92a45dac7570 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 17 Jul 2015 18:33:19 -0700
Subject: [PATCH 2280/2322] mesa: Fix dlopen patch

---
 .../libraries/mesa/dlopen-absolute-paths.diff | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff
index 2b239e760ba..251272f5ce8 100644
--- a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff
+++ b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff
@@ -1,13 +1,28 @@
 diff --git a/src/loader/loader.c b/src/loader/loader.c
-index 666d015..4d7a9be 100644
+index 4fdf3c2..0cd62b5 100644
 --- a/src/loader/loader.c
 +++ b/src/loader/loader.c
-@@ -101,7 +101,7 @@ static void *
+@@ -112,7 +112,6 @@ static void *udev_handle = NULL;
+ static void *
  udev_dlopen_handle(void)
  {
-    if (!udev_handle) {
--      udev_handle = dlopen("libudev.so.1", RTLD_LOCAL | RTLD_LAZY);
-+      udev_handle = dlopen("@udev@/lib/libudev.so.1", RTLD_LOCAL | RTLD_LAZY);
+-   char name[80];
+    unsigned flags = RTLD_NOLOAD | RTLD_LOCAL | RTLD_LAZY;
+    int version;
  
-       if (!udev_handle) {
-          /* libudev.so.1 changed the return types of the two unref functions
+@@ -125,12 +124,9 @@ udev_dlopen_handle(void)
+ 
+    /* First try opening an already linked libudev, then try loading one */
+    do {
+-      for (version = 1; version >= 0; version--) {
+-         snprintf(name, sizeof(name), "libudev.so.%d", version);
+-         udev_handle = dlopen(name, flags);
+-         if (udev_handle)
+-            return udev_handle;
+-      }
++      udev_handle = dlopen("@udev@/lib/libudev.so", flags);
++      if (udev_handle)
++          return udev_handle;
+ 
+       if ((flags & RTLD_NOLOAD) == 0)
+          break;

From 8420f5c483f46bd43115cf9ca457b69399d79d69 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 17 Jul 2015 20:39:12 -0700
Subject: [PATCH 2281/2322] ceph: Boost 1.58 compat

---
 pkgs/tools/filesystems/ceph/0.80.nix | 1 +
 pkgs/tools/filesystems/ceph/0.94.nix | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/ceph/0.80.nix b/pkgs/tools/filesystems/ceph/0.80.nix
index 302a65f626b..ffb52f3fa5b 100644
--- a/pkgs/tools/filesystems/ceph/0.80.nix
+++ b/pkgs/tools/filesystems/ceph/0.80.nix
@@ -12,5 +12,6 @@ callPackage ./generic.nix (args // rec {
   patches = [
     ./0001-Cleanup-boost-optionals.patch
     ./fix-pgrefdebugging.patch
+    ./boost-158.patch
   ];
 })
diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix
index 9b9455b9061..4dca90e5f27 100644
--- a/pkgs/tools/filesystems/ceph/0.94.nix
+++ b/pkgs/tools/filesystems/ceph/0.94.nix
@@ -9,5 +9,8 @@ callPackage ./generic.nix (args // rec {
     sha256 = "1nhqzmxv7bz93b8rbd88wgmw9icm2lhmc94dfscgh23kfpipyd6l";
   };
 
-  patches = [ ./fix-pgrefdebugging.patch ];
+  patches = [
+    ./fix-pgrefdebugging.patch
+    ./boost-158.patch
+  ];
 })

From 068db75d6833a4224d77e3248ce1f29c52d63499 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 17 Jul 2015 20:40:24 -0700
Subject: [PATCH 2282/2322] unifi: 4.6.3 -> 4.6.6

---
 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 2f3230d148e..b19ccd8db8d 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 = "4.6.3";
+  version = "4.6.6";
 
   src = fetchurl {
     url = "http://dl.ubnt.com/unifi/${version}/UniFi.unix.zip";
-    sha256 = "046qx7ghz5b1s4kg6aqvdiq7ck589c8x2cc3x03crcdjjj33rirq";
+    sha256 = "0c9j5h4dyivfdic1y2q3nvhzajzagskzxyj7009icmy3fzgkv3y5";
   };
 
   buildInputs = [ unzip ];

From 3d17e2d6583a80a84f6467e9e1044bf20088fb8a Mon Sep 17 00:00:00 2001
From: Boris Sukholitko <boriss@gmail.com>
Date: Thu, 16 Jul 2015 17:43:36 +0300
Subject: [PATCH 2283/2322] cpptest: init at 1.1.2

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

diff --git a/pkgs/development/libraries/cpptest/default.nix b/pkgs/development/libraries/cpptest/default.nix
new file mode 100644
index 00000000000..8bffeebd024
--- /dev/null
+++ b/pkgs/development/libraries/cpptest/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "cpptest-1.1.2";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/cpptest/cpptest/${name}/${name}.tar.gz";
+    sha256 = "09v070a9dv6zq6hgj4v67i31zsis3s96psrnhlq9g4vhdcaxykwy";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://cpptest.sourceforge.net/;
+    description = "Simple C++ unit testing framework";
+    maintainers = with maintainers; [ bosu ];
+    license = stdenv.lib.licenses.lgpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa4a59e54f7..1b444261353 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5406,6 +5406,8 @@ let
 
   framac = callPackage ../development/tools/analysis/frama-c { };
 
+  cpptest = callPackage ../development/libraries/cpptest { };
+
   cppi = callPackage ../development/tools/misc/cppi { };
 
   cproto = callPackage ../development/tools/misc/cproto { };

From 225ae4c5f8a11183fffbc0f78c988f0a2cf3d16f Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Mon, 13 Jul 2015 21:28:36 -0700
Subject: [PATCH 2284/2322] tribler: strip pngs (close #8810)

This prevents libpng exceptions from being thrown.
Accepted upstream: https://github.com/Tribler/tribler/pull/1561
---
 pkgs/applications/networking/p2p/tribler/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index fed8f8ad31f..a96d0f9cc67 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar
+{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick
 , enablePlayer ? false, vlc ? null }:
 
 
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
     pythonPackages.python
     pythonPackages.wrapPython
     makeWrapper
+    imagemagick
   ];
 
   pythonPath = [
@@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
 
   installPhase =
     ''
+      find . -name '*.png' -exec convert -strip {} {} \;
       # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH.
       wrapPythonPrograms
 

From b80a497b8580ea0b527b7d29362dd5edb1cac816 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Tue, 7 Jul 2015 16:40:12 -0700
Subject: [PATCH 2285/2322] mirrors: more imagemagick mirrors (close #8695)

This is more-or-less the mirrors modifications from #8302.
---
 pkgs/build-support/fetchurl/mirrors.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 1f5e92da88a..2f6a4d36327 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -153,7 +153,12 @@ rec {
   imagemagick = [
     http://www.imagemagick.org/download/
     ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ # also contains older versions removed from most mirrors
+    http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/
     ftp://ftp.imagemagick.org/pub/ImageMagick/
+    http://ftp.fifi.org/ImageMagick/
+    ftp://ftp.fifi.org/ImageMagick/
+    http://imagemagick.mirrorcatalogs.com/
+    ftp://imagemagick.mirrorcatalogs.com/imagemagick
   ];
 
   # CPAN mirrors.

From 0a00e06f91880d54f7e2711db3ad26644917e795 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 Jul 2015 10:23:16 +0200
Subject: [PATCH 2286/2322] libao: fix list nesting

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

diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index ee92da283a6..18ff4dcb7c8 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig libcap ] ++
-    lib.optional stdenv.isLinux (if usePulseAudio then [ libpulseaudio ] else [ alsaLib ]);
+    lib.optional stdenv.isLinux (if usePulseAudio then libpulseaudio else alsaLib);
 
   meta = {
     longDescription = ''

From 19d6b78cc53fac5f8a6145238e13384d178430fe Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 18 Jul 2015 11:44:54 +0200
Subject: [PATCH 2287/2322] nano: 2.4.1 -> 2.4.2

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

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 11137d1a962..9fc223d81da 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -11,10 +11,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.4.1";
+  version = "2.4.2";
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.gz";
-    sha256 = "1li99ycnva40hiavm9lf34gjny74mj469x6ismrfm6wv3dgfn33a";
+    sha256 = "1fb5gzdm3jdx1f2vyanjvdmppaz082lf4kinyffnssgmzhc7zkf8";
   };
   buildInputs = [ ncurses ] ++ optional enableNls gettext;
   configureFlags = ''

From 3dc7f41d6d8788ec1bd2a1c9df78df7046150659 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 17 Jul 2015 10:07:07 -0500
Subject: [PATCH 2288/2322] add kde-frameworks-5.12

---
 .../libraries/kde-frameworks-5.12/default.nix |  217 ++
 .../kde-frameworks-5.12/dependencies.sh       |   22 +
 .../0001-extra-cmake-modules-paths.patch      |   74 +
 .../kauth/kauth-policy-install.patch          |   13 +
 ...utils-pluginselector-follow-symlinks.patch |   13 +
 ...igwidgets-helpclient-follow-symlinks.patch |   13 +
 .../kdoctools-no-find-docbook-xml.patch       |   12 +
 .../kinit/0001-kinit-libpath.patch            |   42 +
 .../kpackage/0001-allow-external-paths.patch  |   25 +
 ...service-kbuildsycoca-follow-symlinks.patch |   13 +
 ...ce-kbuildsycoca-no-canonicalize-path.patch |   13 +
 .../0001-no-qcoreapplication.patch            |   48 +
 .../kde-frameworks-5.12/packages.json         | 2116 +++++++++++++++++
 .../libraries/kde-frameworks-5.12/packages.sh |   22 +
 .../plasma-framework-external-paths.patch     |   13 +
 .../kde-frameworks-5.12/renames.json          |   71 +
 .../kde-frameworks-5.12/setup-hook.sh         |    1 +
 pkgs/top-level/all-packages.nix               |    3 +-
 18 files changed, 2730 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.12/default.nix
 create mode 100755 pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.12/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.12/kauth/kauth-policy-install.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.12/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.12/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.12/kdoctools/kdoctools-no-find-docbook-xml.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.12/kinit/0001-kinit-libpath.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.12/kpackage/0001-allow-external-paths.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.12/ktexteditor/0001-no-qcoreapplication.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.12/packages.json
 create mode 100755 pkgs/development/libraries/kde-frameworks-5.12/packages.sh
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.12/plasma-framework/plasma-framework-external-paths.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.12/renames.json
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.12/setup-hook.sh

diff --git a/pkgs/development/libraries/kde-frameworks-5.12/default.nix b/pkgs/development/libraries/kde-frameworks-5.12/default.nix
new file mode 100644
index 00000000000..d5bb3f78ce8
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/default.nix
@@ -0,0 +1,217 @@
+# Maintainer's Notes:
+#
+# Minor updates:
+#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
+#     releases updates that include only the changed packages; in this case,
+#     multiple URLs can be provided and the results will be merged.
+#  2. Run ./manifest.sh and ./dependencies.sh.
+#  3. Build and enjoy.
+#
+# Major updates:
+#  We prefer not to immediately overwrite older versions with major updates, so
+#  make a copy of this directory first. After copying, be sure to delete ./tmp
+#  if it exists. Then follow the minor update instructions.
+
+{ pkgs, newScope, qt5 ? null, debug ? false }:
+
+let inherit (pkgs) autonix stdenv symlinkJoin; in
+
+with autonix; let inherit (stdenv) lib; in
+
+let
+  qt5_ = if qt5 != null then qt5 else pkgs.qt54;
+in
+
+let
+
+  qt5 = qt5_;
+
+  super =
+    let json = builtins.fromJSON (builtins.readFile ./packages.json);
+        mirrorUrl = n: pkg: pkg // {
+          src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
+        };
+        renames = builtins.fromJSON (builtins.readFile ./renames.json);
+        propagated = [ "extra-cmake-modules" ];
+        native = [
+          "bison"
+          "extra-cmake-modules"
+          "flex"
+          "kdoctools"
+          "ki18n"
+          "libxslt"
+          "perl"
+          "pythoninterp"
+        ];
+        user = [
+          "qt5"
+          "qt5core"
+          "qt5dbus"
+          "qt5gui"
+          "qt5qml"
+          "qt5quick"
+          "qt5svg"
+          "qt5webkitwidgets"
+          "qt5widgets"
+          "qt5x11extras"
+          "shareddesktopontologies"
+          "sharedmimeinfo"
+        ];
+    in lib.fold (f: attrs: f attrs) json [
+      (lib.mapAttrs kdePackage)
+      (userEnvDeps user)
+      (nativeDeps native)
+      (propagateDeps propagated)
+      (renameDeps renames)
+      (lib.mapAttrs mirrorUrl)
+    ];
+
+  kdePackage = name: pkg:
+    let defaultOverride = drv: drv // {
+          setupHook = ./setup-hook.sh;
+          cmakeFlags =
+            (drv.cmakeFlags or [])
+            ++ [ "-DBUILD_TESTING=OFF" ]
+            ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+          meta = {
+            license = with stdenv.lib.licenses; [
+              lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+            ];
+            platforms = stdenv.lib.platforms.linux;
+            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+            homepage = "http://www.kde.org";
+          };
+        };
+        callPackage = newScope {
+          inherit (stdenv) mkDerivation;
+          inherit (pkgs) fetchurl;
+          inherit scope;
+        };
+    in mkPackage callPackage defaultOverride name pkg;
+
+  scope =
+    # packages in this collection
+    self //
+    # packages pinned to this version of Qt 5
+    {
+      dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
+      phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
+      polkit_qt5 = pkgs.polkit_qt5.override { inherit qt5; };
+      qt5 = qt5.base;
+      qt5core = qt5.base;
+      qt5dbus = qt5.base;
+      qt5gui = qt5.base;
+      qt5linguisttools = qt5.tools;
+      qt5qml = [qt5.declarative qt5.graphicaleffects];
+      qt5quick = [qt5.quickcontrols qt5.graphicaleffects];
+      qt5script = qt5.script;
+      qt5svg = qt5.svg;
+      qt5webkitwidgets = qt5.webkit;
+      qt5widgets = qt5.base;
+      qt5x11extras = qt5.x11extras;
+      qt5xmlpatterns = qt5.xmlpatterns;
+    } //
+    # packages from the nixpkgs collection
+    (with pkgs;
+      {
+        inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme
+                libgcrypt libgit2 modemmanager networkmanager perl
+                perlPackages qimageblitz xlibs zlib;
+        boost = boost156;
+        gif = giflib;
+        glib2 = glib;
+        jpeg = libjpeg;
+        libintl = gettext;
+        liblzma = lzma;
+        pythoninterp = python;
+        pythonlibrary = python;
+        sharedmimeinfo = shared_mime_info;
+      }
+    );
+
+  self = super // {
+    extra-cmake-modules = overrideDerivation super.extra-cmake-modules (drv: {
+      buildInputs = [];
+      nativeBuildInputs = [];
+      propagatedBuildInputs = [];
+      propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
+      propagatedUserEnvPkgs = [];
+      cmakeFlags = ["-DBUILD_TESTING=OFF"];
+      patches = [./extra-cmake-modules/0001-extra-cmake-modules-paths.patch];
+      meta = {
+        license = stdenv.lib.licenses.bsd2;
+        platforms = stdenv.lib.platforms.linux;
+        maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+        homepage = "http://www.kde.org";
+      };
+    });
+
+    frameworkintegration = extendDerivation super.frameworkintegration {
+      buildInputs = [ scope.xlibs.libXcursor ];
+    };
+
+    kauth = extendDerivation super.kauth {
+      buildInputs = [ scope.polkit_qt5 ];
+      patches = [ ./kauth/kauth-policy-install.patch ];
+    };
+
+    kcmutils = extendDerivation super.kcmutils {
+      patches = [ ./kcmutils/kcmutils-pluginselector-follow-symlinks.patch ];
+    };
+
+    kconfigwidgets = extendDerivation super.kconfigwidgets {
+      patches = [ ./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch ];
+    };
+
+    kdelibs4support = extendDerivation super.kdelibs4support {
+      buildInputs = [ scope.networkmanager scope.xlibs.libSM ];
+      cmakeFlags = [
+        "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook"
+        "-DDocBookXML4_DTD_VERSION=4.5"
+      ];
+    };
+
+    kdoctools = extendDerivation super.kdoctools {
+      propagatedNativeBuildInputs = [ scope.perl scope.perlPackages.URI ];
+      cmakeFlags = [
+        "-DDocBookXML4_DTD_DIR=${scope.docbook_xml_dtd_45}/xml/dtd/docbook"
+        "-DDocBookXML4_DTD_VERSION=4.5"
+        "-DDocBookXSL_DIR=${scope.docbook5_xsl}/xml/xsl/docbook"
+      ];
+      patches = [ ./kdoctools/kdoctools-no-find-docbook-xml.patch ];
+    };
+
+    ki18n = extendDerivation super.ki18n {
+      propagatedNativeBuildInputs = with scope; [ libintl pythoninterp ];
+    };
+
+    kimageformats = extendDerivation super.kimageformats {
+      NIX_CFLAGS_COMPILE = "-I${pkgs.ilmbase}/include/OpenEXR";
+    };
+
+    kinit = extendDerivation super.kinit {
+      patches = [./kinit/0001-kinit-libpath.patch];
+    };
+
+    kpackage = extendDerivation super.kpackage {
+      patches = [ ./kpackage/0001-allow-external-paths.patch ];
+    };
+
+    kservice = extendDerivation super.kservice {
+      buildInputs = [ scope.kwindowsystem ];
+      patches = [
+        ./kservice/kservice-kbuildsycoca-follow-symlinks.patch
+        ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
+      ];
+    };
+
+    ktexteditor = extendDerivation super.ktexteditor {
+      patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
+    };
+
+    networkmanager-qt = extendDerivation super.networkmanager-qt {
+      propagatedBuildInputs = [ scope.networkmanager ];
+    };
+  };
+
+in self
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh
new file mode 100755
index 00000000000..2b220244c59
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/dependencies.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# This script rebuilds dependencies.nix.
+# You must run manifest.sh first to download the packages.
+
+# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
+# If you are working on the packages, this is probably what you want.
+
+# You can also pass the path to a source tree where you have built
+# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
+# probably what you want.
+
+manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix')
+
+autonixDepsKf5=""
+if [[ -z $1 ]]; then
+    autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin
+else
+    autonixDepsKF5="$1/dist/build/kf5-deps"
+fi
+
+exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.12/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
new file mode 100644
index 00000000000..9717716faf5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
@@ -0,0 +1,74 @@
+From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Fri, 20 Feb 2015 23:17:39 -0600
+Subject: [PATCH] extra-cmake-modules paths
+
+---
+ kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
+ 1 file changed, 4 insertions(+), 33 deletions(-)
+
+diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
+index b7cd34d..2f868ac 100644
+--- a/kde-modules/KDEInstallDirs.cmake
++++ b/kde-modules/KDEInstallDirs.cmake
+@@ -193,37 +193,8 @@
+ # (To distribute this file outside of extra-cmake-modules, substitute the full
+ #  License text for the above reference.)
+ 
+-# Figure out what the default install directory for libraries should be.
+-# This is based on the logic in GNUInstallDirs, but simplified (the
+-# GNUInstallDirs code deals with re-configuring, but that is dealt with
+-# by the _define_* macros in this module).
++# The default library directory on NixOS is *always* /lib.
+ set(_LIBDIR_DEFAULT "lib")
+-# Override this default 'lib' with 'lib64' iff:
+-#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
+-#  - we are NOT on debian
+-#  - we are on a 64 bits system
+-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
+-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
+-# See http://wiki.debian.org/Multiarch
+-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
+-   AND NOT CMAKE_CROSSCOMPILING)
+-  if (EXISTS "/etc/debian_version") # is this a debian system ?
+-    if(CMAKE_LIBRARY_ARCHITECTURE)
+-      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+-    endif()
+-  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
+-    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
+-      message(AUTHOR_WARNING
+-        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
+-        "Please enable at least one language before including KDEInstallDirs.")
+-    else()
+-      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+-        set(_LIBDIR_DEFAULT "lib64")
+-      endif()
+-    endif()
+-  endif()
+-endif()
+ 
+ set(_gnu_install_dirs_vars
+     BINDIR
+@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
+         "QtQuick2 imports"
+         QML_INSTALL_DIR)
+ else()
+-    _define_relative(QTPLUGINDIR LIBDIR "plugins"
++    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
+         "Qt plugins"
+         QT_PLUGIN_INSTALL_DIR)
+ 
+-    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
++    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
+         "QtQuick1 imports"
+         IMPORTS_INSTALL_DIR)
+ 
+-    _define_relative(QMLDIR LIBDIR "qml"
++    _define_relative(QMLDIR LIBDIR "qt5/qml"
+         "QtQuick2 imports"
+         QML_INSTALL_DIR)
+ endif()
+-- 
+2.3.0
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.12/kauth/kauth-policy-install.patch
new file mode 100644
index 00000000000..340155256f2
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/kauth/kauth-policy-install.patch
@@ -0,0 +1,13 @@
+diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
+index e859ec7..9a8ab18 100644
+--- a/KF5AuthConfig.cmake.in
++++ b/KF5AuthConfig.cmake.in
+@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
+ 
+ set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
+ set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
+-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
++set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
+ set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
+ 
+ find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.12/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
new file mode 100644
index 00000000000..47b8dfad180
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
+index c63241b..2243f94 100644
+--- a/src/kpluginselector.cpp
++++ b/src/kpluginselector.cpp
+@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
+     QStringList desktopFileNames;
+     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
+     Q_FOREACH (const QString &dir, dirs) {
+-        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
++        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             desktopFileNames.append(it.next());
+         }
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.12/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
new file mode 100644
index 00000000000..3bd946cbd84
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
+index 53a331e..80fbb01 100644
+--- a/src/khelpclient.cpp
++++ b/src/khelpclient.cpp
+@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
+     QString docPath;
+     const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
+     Q_FOREACH (const QString &dir, desktopDirs) {
+-        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
++        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             const QString desktopPath(it.next());
+             KDesktopFile desktopFile(desktopPath);
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.12/kdoctools/kdoctools-no-find-docbook-xml.patch
new file mode 100644
index 00000000000..4e3a33efab3
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/kdoctools/kdoctools-no-find-docbook-xml.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c4863c..f731775 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
+                       )
+ 
+ 
+-find_package(DocBookXML4 "4.5")
+ 
+ set_package_properties(DocBookXML4 PROPERTIES
+                        TYPE REQUIRED
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.12/kinit/0001-kinit-libpath.patch
new file mode 100644
index 00000000000..9c76079a382
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/kinit/0001-kinit-libpath.patch
@@ -0,0 +1,42 @@
+From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sat, 13 Jun 2015 08:57:55 -0500
+Subject: [PATCH] kinit libpath
+
+---
+ src/kdeinit/kinit.cpp | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
+index 9e775b6..0ac5646 100644
+--- a/src/kdeinit/kinit.cpp
++++ b/src/kdeinit/kinit.cpp
+@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
+         if (!libpath.isEmpty()) {
+             if (!l.load()) {
+                 if (libpath_relative) {
+-                    // NB: Because Qt makes the actual dlopen() call, the
+-                    //     RUNPATH of kdeinit is *not* respected - see
+-                    //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945
+-                    //     - so we try hacking it in ourselves
+-                    QString install_lib_dir = QFile::decodeName(
+-                            CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
+-                    libpath = install_lib_dir + libpath;
+-                    l.setFileName(libpath);
++                  // Use QT_PLUGIN_PATH to find shared library directories
++                  // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5
++                  // shared libraries should be in /lib/qt5/plugins/../../
++                  const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
++                  const QString up = QString::fromLocal8Bit("/../../");
++                  const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
++                  Q_FOREACH (const QString &path, paths) {
++                    l.setFileName(path + up + libpath);
+                     l.load();
++                    if (l.isLoaded()) break;
++                  }
+                 }
+             }
+             if (!l.isLoaded()) {
+-- 
+2.4.2
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.12/kpackage/0001-allow-external-paths.patch
new file mode 100644
index 00000000000..440e979c008
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/kpackage/0001-allow-external-paths.patch
@@ -0,0 +1,25 @@
+From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 28 Jan 2015 07:15:30 -0600
+Subject: [PATCH] allow external paths
+
+---
+ src/kpackage/package.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
+index eb4a09b..f70f1a1 100644
+--- a/src/kpackage/package.cpp
++++ b/src/kpackage/package.cpp
+@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate()
+     : QSharedData(),
+       fallbackPackage(0),
+       metadata(0),
+-      externalPaths(false),
++      externalPaths(true),
+       valid(false),
+       checkedValid(false)
+ {
+-- 
+2.1.4
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch
new file mode 100644
index 00000000000..e9bc418544a
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-follow-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp
+index 69b1427..9c37a49 100644
+--- a/src/kbuildsycoca/kbuildsycoca.cpp
++++ b/src/kbuildsycoca/kbuildsycoca.cpp
+@@ -227,7 +227,7 @@ bool KBuildSycoca::build()
+         QStringList relFiles;
+         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory);
+         Q_FOREACH (const QString &dir, dirs) {
+-            QDirIterator it(dir, QDirIterator::Subdirectories);
++            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+             while (it.hasNext()) {
+                 const QString filePath = it.next();
+                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
new file mode 100644
index 00000000000..7e21ebfe86f
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
@@ -0,0 +1,13 @@
+diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp
+index 2eb1275..e39a36f 100644
+--- a/src/kbuildsycoca/vfolder_menu.cpp
++++ b/src/kbuildsycoca/vfolder_menu.cpp
+@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
+     }
+ 
+     if (!relative) {
+-        QString resolved = QDir(dir).canonicalPath();
++        QString resolved = QDir::cleanPath(dir);
+         if (!resolved.isEmpty()) {
+             dir = resolved;
+         }
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.12/ktexteditor/0001-no-qcoreapplication.patch
new file mode 100644
index 00000000000..c2e77a537c5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/ktexteditor/0001-no-qcoreapplication.patch
@@ -0,0 +1,48 @@
+From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sun, 15 Feb 2015 19:09:17 -0600
+Subject: [PATCH] no qcoreapplication
+
+---
+ src/syntax/data/katehighlightingindexer.cpp | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp
+index 3f02e8c..d1a865b 100644
+--- a/src/syntax/data/katehighlightingindexer.cpp
++++ b/src/syntax/data/katehighlightingindexer.cpp
+@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName)
+ 
+ int main(int argc, char *argv[])
+ {
+-    // get app instance
+-    QCoreApplication app(argc, argv);
+-    
+     // ensure enough arguments are passed
+-    if (app.arguments().size() < 3)
++    if (argc < 3)
+         return 1;
+ 
+     // open schema
+     QXmlSchema schema;
+-    if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
++    if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
+         return 2;
+ 
+-    const QString hlFilenamesListing = app.arguments().value(3);
++    const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
+     if (hlFilenamesListing.isEmpty()) {
+         return 1;
+     }
+@@ -127,7 +124,7 @@ int main(int argc, char *argv[])
+         return anyError;
+     
+     // create outfile, after all has worked!
+-    QFile outFile(app.arguments().at(1));
++    QFile outFile(QString::fromLocal8Bit(argv[1]));
+     if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
+         return 7;
+ 
+-- 
+2.1.4
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/packages.json b/pkgs/development/libraries/kde-frameworks-5.12/packages.json
new file mode 100644
index 00000000000..f5951517266
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/packages.json
@@ -0,0 +1,2116 @@
+{
+    "kwallet": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5gui"
+        ],
+        "name": "kwallet-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kwallet-5.12.0.tar.xz",
+            "name": "kwallet-5.12.0.tar.xz",
+            "sha256": "0i45qf4j42172jr4mz3xzw589frp4xw86b2j3rhgzipfi26cx3zd"
+        },
+        "buildInputs": [
+            "ecm",
+            "gpgme",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5gpgmepp",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5notifications",
+            "kf5service",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "libgcrypt",
+            "qt5",
+            "qt5dbus",
+            "qt5gui",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kdewebkit": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5webkitwidgets"
+        ],
+        "name": "kdewebkit-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kdewebkit-5.12.0.tar.xz",
+            "name": "kdewebkit-5.12.0.tar.xz",
+            "sha256": "09r0bvjgvb9ar13whr4ar21r4kzjwa4zipn6iqzx9n0xxwn2mxjv"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5jobwidgets",
+            "kf5kio",
+            "kf5parts",
+            "kf5service",
+            "kf5wallet",
+            "qt5",
+            "qt5core",
+            "qt5network",
+            "qt5webkitwidgets",
+            "qt5widgets"
+        ]
+    },
+    "kbookmarks": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5widgetsaddons",
+            "qt5widgets",
+            "qt5xml"
+        ],
+        "name": "kbookmarks-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kbookmarks-5.12.0.tar.xz",
+            "name": "kbookmarks-5.12.0.tar.xz",
+            "sha256": "07xayi77h9wg2f4pnwgjbicbfqk42lphqvcha9sn97p0hnzl1g5h"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5codecs",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5iconthemes",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "bluez-qt": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "bluez-qt-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/bluez-qt-5.12.0.tar.xz",
+            "name": "bluez-qt-5.12.0.tar.xz",
+            "sha256": "1asgcvspwra52ywfk6v4mv1fdxkshyh5zyqnwljbbs1a1n8g8gl0"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5network",
+            "qt5qml",
+            "qt5quicktest",
+            "qt5test"
+        ]
+    },
+    "threadweaver": {
+        "nativeBuildInputs": [
+            "cmake",
+            "snippetextractor"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "threadweaver-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/threadweaver-5.12.0.tar.xz",
+            "name": "threadweaver-5.12.0.tar.xz",
+            "sha256": "1xswh5k48n3nq5v8zgc3qyldky8pq3xgsbsgjg1is5pgayw4j08b"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5threadweaver",
+            "qt5",
+            "qt5core",
+            "qt5network",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kcompletion": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kcompletion-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kcompletion-5.12.0.tar.xz",
+            "name": "kcompletion-5.12.0.tar.xz",
+            "sha256": "0g4gvc9r0l7ng7jv0hkp8khhlckgwzpix5hsjjcmzggfkhsl4sj0"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kwidgetsaddons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kwidgetsaddons-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kwidgetsaddons-5.12.0.tar.xz",
+            "name": "kwidgetsaddons-5.12.0.tar.xz",
+            "sha256": "12n3c3j6nawrhgc9mqk627q1brjvbdxkm52g0mnm5c5ql953gqs6"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5test",
+            "qt5uitools",
+            "qt5widgets"
+        ]
+    },
+    "kxmlrpcclient": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5kio"
+        ],
+        "name": "kxmlrpcclient-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kxmlrpcclient-5.12.0.tar.xz",
+            "name": "kxmlrpcclient-5.12.0.tar.xz",
+            "sha256": "1ysw61kcx0i6il6r782jdyr2a9n8hy0j5mgpd7slr57mrcfgsivd"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5i18n",
+            "kf5kio",
+            "qt5test"
+        ]
+    },
+    "extra-cmake-modules": {
+        "nativeBuildInputs": [
+            "cmake",
+            "qcollectiongenerator_executable",
+            "sphinx_executable"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "extra-cmake-modules-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/extra-cmake-modules-5.12.0.tar.xz",
+            "name": "extra-cmake-modules-5.12.0.tar.xz",
+            "sha256": "14n77sn493m8kzr42wv13mdgxpnbx7x64bvw37ircrx8wmf4002i"
+        },
+        "buildInputs": [
+            "agg",
+            "blitz",
+            "bluez",
+            "eigen2",
+            "enchant",
+            "ffmpeg",
+            "flac",
+            "flex",
+            "gobject",
+            "gstreamer",
+            "lcms",
+            "libart",
+            "libxslt",
+            "openexr",
+            "pcre",
+            "qca2",
+            "qimageblitz",
+            "qt5core",
+            "qt5linguisttools",
+            "sqlite",
+            "strigi",
+            "usb",
+            "xine",
+            "xmms"
+        ]
+    },
+    "kidletime": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kidletime-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kidletime-5.12.0.tar.xz",
+            "name": "kidletime-5.12.0.tar.xz",
+            "sha256": "1rpvj4q07sc17an4274pcszdsqjdl8x33ln3lmw5x2q27v5d22qc"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5dbus",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "x11_xcb",
+            "xcb"
+        ]
+    },
+    "kitemmodels": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kitemmodels-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kitemmodels-5.12.0.tar.xz",
+            "name": "kitemmodels-5.12.0.tar.xz",
+            "sha256": "0wmsb59svzk0iay9ynbjbdgqxph1cpvifvvnlxc67a5nzhgk5cms"
+        },
+        "buildInputs": [
+            "ecm",
+            "grantlee",
+            "qt5",
+            "qt5core",
+            "qt5quickwidgets",
+            "qt5script",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "attica": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "attica-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/attica-5.12.0.tar.xz",
+            "name": "attica-5.12.0.tar.xz",
+            "sha256": "05311rr7zsfwzq3569gg2gkq6rksvhdji1x0jv8zxax5a1n40gc7"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5core",
+            "qt5network",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kwindowsystem": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kwindowsystem-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kwindowsystem-5.12.0.tar.xz",
+            "name": "kwindowsystem-5.12.0.tar.xz",
+            "sha256": "0fjxhf07r186cmp0mjvinrwxg4z90zlyvycqhy0n18fdp67szckl"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5test",
+            "qt5widgets",
+            "qt5winextras",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "ki18n": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ki18n-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/ki18n-5.12.0.tar.xz",
+            "name": "ki18n-5.12.0.tar.xz",
+            "sha256": "11bivhaiqk8rlnz288ghnbjp3i2kdivmrzscjjnyqw25rpjj4drz"
+        },
+        "buildInputs": [
+            "ecm",
+            "libintl",
+            "qt5",
+            "qt5concurrent",
+            "qt5core",
+            "qt5script",
+            "qt5test"
+        ]
+    },
+    "knewstuff": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5attica",
+            "kf5service",
+            "kf5xmlgui",
+            "qt5widgets"
+        ],
+        "name": "knewstuff-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/knewstuff-5.12.0.tar.xz",
+            "name": "knewstuff-5.12.0.tar.xz",
+            "sha256": "03zxj81a4hy46azh047xxfmr4mjp8ri7hzcxspi31hmr8gf1hxv9"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5archive",
+            "kf5attica",
+            "kf5completion",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kio",
+            "kf5service",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kdelibs4support": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kdewin",
+            "kf5archive",
+            "kf5auth",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5designerplugin",
+            "kf5doctools",
+            "kf5emoticons",
+            "kf5guiaddons",
+            "kf5iconthemes",
+            "kf5init",
+            "kf5itemmodels",
+            "kf5kdelibs4support",
+            "kf5notifications",
+            "kf5parts",
+            "kf5textwidgets",
+            "kf5unitconversion",
+            "kf5windowsystem",
+            "qt5dbus",
+            "qt5printsupport",
+            "qt5xml"
+        ],
+        "name": "kdelibs4support-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/portingAids/kdelibs4support-5.12.0.tar.xz",
+            "name": "kdelibs4support-5.12.0.tar.xz",
+            "sha256": "0hbs1gwqgx4sc8cma1q5pyanf2kj5brfz9dph5xcf32bijz2ds4f"
+        },
+        "buildInputs": [
+            "agg",
+            "blitz",
+            "bluez",
+            "docbookxml4",
+            "ecm",
+            "eigen2",
+            "enchant",
+            "ffmpeg",
+            "flac",
+            "gobject",
+            "gstreamer",
+            "kdewin",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5designerplugin",
+            "kf5doctools",
+            "kf5globalaccel",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5notifications",
+            "kf5parts",
+            "kf5service",
+            "kf5textwidgets",
+            "kf5unitconversion",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "lcms",
+            "libart",
+            "networkmanager",
+            "openexr",
+            "openssl",
+            "pcre",
+            "qca2",
+            "qimageblitz",
+            "qntrack",
+            "qt5",
+            "qt5concurrent",
+            "qt5dbus",
+            "qt5designer",
+            "qt5network",
+            "qt5printsupport",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "sqlite",
+            "usb",
+            "x11",
+            "xine",
+            "xmms"
+        ]
+    },
+    "sonnet": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "sonnet-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/sonnet-5.12.0.tar.xz",
+            "name": "sonnet-5.12.0.tar.xz",
+            "sha256": "1rr5dbs9477mf8lacmk5dcvw0h3s597l4miwm4j3rmn9jpvlcm1l"
+        },
+        "buildInputs": [
+            "aspell",
+            "ecm",
+            "enchant",
+            "hspell",
+            "hunspell",
+            "qt5",
+            "qt5test",
+            "qt5widgets",
+            "zlib"
+        ]
+    },
+    "networkmanager-qt": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "networkmanager-qt-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/networkmanager-qt-5.12.0.tar.xz",
+            "name": "networkmanager-qt-5.12.0.tar.xz",
+            "sha256": "0znwp1nyw47dpq48m1c1y250msm2lh9hipzjmgvh2mqr60vvy094"
+        },
+        "buildInputs": [
+            "ecm",
+            "networkmanager",
+            "qt4",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5network",
+            "qt5test"
+        ]
+    },
+    "solid": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "solid-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/solid-5.12.0.tar.xz",
+            "name": "solid-5.12.0.tar.xz",
+            "sha256": "0s3xjrc5v350s0w26jpzb427h0nx6bhqldv7qswknrqir5x6zymj"
+        },
+        "buildInputs": [
+            "bison",
+            "ecm",
+            "flex",
+            "iokit",
+            "mediaplayerinfo",
+            "qt5",
+            "qt5concurrent",
+            "qt5dbus",
+            "qt5network",
+            "qt5qml",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml",
+            "udev"
+        ]
+    },
+    "modemmanager-qt": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "modemmanager-qt-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/modemmanager-qt-5.12.0.tar.xz",
+            "name": "modemmanager-qt-5.12.0.tar.xz",
+            "sha256": "1s9ayfpkpkkrqss3x2swb2fzg5zxja8qkawwy59crf9xjfk3gwxi"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5modemmanagerqt",
+            "modemmanager",
+            "qt4",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "kactivities": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kactivities-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kactivities-5.12.0.tar.xz",
+            "name": "kactivities-5.12.0.tar.xz",
+            "sha256": "1rv5fb5gx7nkksy857aqbsvgkkw0fc0zs8yab3b4hyv4ybqx4j2q"
+        },
+        "buildInputs": [
+            "boost",
+            "ecm",
+            "kf5",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5declarative",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5kcmutils",
+            "kf5kio",
+            "kf5service",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5dbus",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5quickwidgets",
+            "qt5sql",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kpeople": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kpeople-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kpeople-5.12.0.tar.xz",
+            "name": "kpeople-5.12.0.tar.xz",
+            "sha256": "0p8qamrxcfxb0f7fsrjn1k5vhi8hmd2iph6b5bjblfpwgw2f44r8"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5itemviews",
+            "kf5service",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5dbus",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5sql",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kcrash": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kcrash-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kcrash-5.12.0.tar.xz",
+            "name": "kcrash-5.12.0.tar.xz",
+            "sha256": "00m69f0wrykrdhiyasfpwykrkh4r05hldr8yjvw2sn62gb1s45pg"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5core",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "kglobalaccel": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5dbus",
+            "qt5widgets"
+        ],
+        "name": "kglobalaccel-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kglobalaccel-5.12.0.tar.xz",
+            "name": "kglobalaccel-5.12.0.tar.xz",
+            "sha256": "1p8kj31m4lyy6dr85383v6j8bg622xmw3x8kyiijlckd1zf2bmr8"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "kitemviews": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kitemviews-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kitemviews-5.12.0.tar.xz",
+            "name": "kitemviews-5.12.0.tar.xz",
+            "sha256": "0swlp9kynsw708mm9b4bh2r9rcwqxqmkwaga4gg33cjchf0y8862"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kplotting": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kplotting-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kplotting-5.12.0.tar.xz",
+            "name": "kplotting-5.12.0.tar.xz",
+            "sha256": "1xh0lbi7fxsz3gj2y762r9md85l8fp0l6kj5577444k4vswgaial"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kauth": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5coreaddons"
+        ],
+        "name": "kauth-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kauth-5.12.0.tar.xz",
+            "name": "kauth-5.12.0.tar.xz",
+            "sha256": "1ky3f16z4w0p97yzdfn3v4qs50wcir5p18cq6sakjhp95fxj1m2y"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "plasma-framework": {
+        "nativeBuildInputs": [
+            "cmake",
+            "sh"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5package",
+            "kf5service"
+        ],
+        "name": "plasma-framework-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/plasma-framework-5.12.0.tar.xz",
+            "name": "plasma-framework-5.12.0.tar.xz",
+            "sha256": "07ma5nr3v3r9x9gc5sb3rhghci8cl0mm11f8dfawl3bvyzzhq3hm"
+        },
+        "buildInputs": [
+            "ecm",
+            "egl",
+            "gpgme",
+            "kactivities",
+            "kcoreaddons",
+            "kde4support",
+            "kdeclarative",
+            "kdepimlibs",
+            "kdesu",
+            "kf5",
+            "kf5activities",
+            "kf5archive",
+            "kf5auth",
+            "kf5bookmarks",
+            "kf5codecs",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5declarative",
+            "kf5doctools",
+            "kf5globalaccel",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5idletime",
+            "kf5init",
+            "kf5itemmodels",
+            "kf5itemviews",
+            "kf5jobwidgets",
+            "kf5js",
+            "kf5karchive",
+            "kf5kauth",
+            "kf5kbookmarks",
+            "kf5kcodecs",
+            "kf5kcompletion",
+            "kf5kconfig",
+            "kf5kconfigwidgets",
+            "kf5kcoreaddons",
+            "kf5kcrash",
+            "kf5kdbusaddons",
+            "kf5kde4support",
+            "kf5kdeclarative",
+            "kf5kdesu",
+            "kf5kdoctools",
+            "kf5kf5globalaccel",
+            "kf5kguiaddons",
+            "kf5ki18n",
+            "kf5kiconthemes",
+            "kf5kidletime",
+            "kf5kinit",
+            "kf5kio",
+            "kf5kjobwidgets",
+            "kf5kjs",
+            "kf5knotifications",
+            "kf5kparts",
+            "kf5kross",
+            "kf5kservice",
+            "kf5ktextwidgets",
+            "kf5kunitconversion",
+            "kf5kwallet",
+            "kf5kwidgetsaddons",
+            "kf5kwindowsystem",
+            "kf5notifications",
+            "kf5package",
+            "kf5parts",
+            "kf5service",
+            "kf5solid",
+            "kf5sonnet",
+            "kf5su",
+            "kf5textwidgets",
+            "kf5threadweaver",
+            "kf5unitconversion",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "opengl",
+            "qca2",
+            "qt5",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5script",
+            "qt5sql",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "solid",
+            "x11",
+            "xcb"
+        ]
+    },
+    "kguiaddons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5gui"
+        ],
+        "name": "kguiaddons-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kguiaddons-5.12.0.tar.xz",
+            "name": "kguiaddons-5.12.0.tar.xz",
+            "sha256": "0s49vn617vaddnrpryivrpwmcdb95xincx2x86bsybdsss8nawp3"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5gui",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "kservice": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5config",
+            "kf5coreaddons"
+        ],
+        "name": "kservice-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kservice-5.12.0.tar.xz",
+            "name": "kservice-5.12.0.tar.xz",
+            "sha256": "12zfxvzv34hbcwi325izlahr65cgd465hsj29ib3lgr0aadi8r0b"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "qt5",
+            "qt5concurrent",
+            "qt5dbus",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "khtml": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5archive",
+            "kf5bookmarks",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5js",
+            "kf5kio",
+            "kf5notifications",
+            "kf5parts",
+            "kf5sonnet",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5core"
+        ],
+        "name": "khtml-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/portingAids/khtml-5.12.0.tar.xz",
+            "name": "khtml-5.12.0.tar.xz",
+            "sha256": "0f76x8zy81dd7y0qwkf7drwa3k2f4yzbr13w2i89yaa078l7p9sw"
+        },
+        "buildInputs": [
+            "ecm",
+            "gif",
+            "jpeg",
+            "kdewin",
+            "kf5archive",
+            "kf5codecs",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5js",
+            "kf5kio",
+            "kf5notifications",
+            "kf5parts",
+            "kf5sonnet",
+            "kf5textwidgets",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "openssl",
+            "perl",
+            "phonon4qt5",
+            "png",
+            "qt5",
+            "qt5test",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "kded": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kded-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kded-5.12.0.tar.xz",
+            "name": "kded-5.12.0.tar.xz",
+            "sha256": "1876gc1kkz41kcmy78lnl212paygfhj0syvswbdpx3nq4gyyrkyx"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5crash",
+            "kf5dbusaddons",
+            "kf5doctools",
+            "kf5init",
+            "kf5service",
+            "qt5"
+        ]
+    },
+    "kpty": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5coreaddons"
+        ],
+        "name": "kpty-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kpty-5.12.0.tar.xz",
+            "name": "kpty-5.12.0.tar.xz",
+            "sha256": "0gpvjdsag5fmdz5fmjna7wb6j64cpwzfk6rljg938xg0pidms6wc"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5i18n",
+            "qt5",
+            "utempter"
+        ]
+    },
+    "kross": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5parts",
+            "kf5widgetsaddons",
+            "qt5script",
+            "qt5widgets",
+            "qt5xml"
+        ],
+        "name": "kross-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/portingAids/kross-5.12.0.tar.xz",
+            "name": "kross-5.12.0.tar.xz",
+            "sha256": "1s7vxsp992y8r39m1val4mylfcl084wsj391y5z333cdryr4wqwq"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5completion",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5parts",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5script",
+            "qt5test",
+            "qt5uitools",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kxmlgui": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5config",
+            "kf5configwidgets",
+            "qt5dbus",
+            "qt5widgets",
+            "qt5xml"
+        ],
+        "name": "kxmlgui-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kxmlgui-5.12.0.tar.xz",
+            "name": "kxmlgui-5.12.0.tar.xz",
+            "sha256": "1v9nf3hrymikgy3d7lh9xcyw8dx1ndl8gsgmzfbxjli60fjniiyl"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5attica",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5globalaccel",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5dbus",
+            "qt5network",
+            "qt5printsupport",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kconfig": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5xml"
+        ],
+        "name": "kconfig-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kconfig-5.12.0.tar.xz",
+            "name": "kconfig-5.12.0.tar.xz",
+            "sha256": "1dxdf01kswigv7cdad9zjxg5iri479hi8gib3b72pwm24m0wc5ac"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5",
+            "qt5concurrent",
+            "qt5core",
+            "qt5gui",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "kinit": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kinit-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kinit-5.12.0.tar.xz",
+            "name": "kinit-5.12.0.tar.xz",
+            "sha256": "19w1wgv9javrfmfq52bdvaazd3hqlf6hwdw09hc5935b043zx6cz"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5crash",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5kio",
+            "kf5service",
+            "kf5windowsystem",
+            "libcap",
+            "qt5",
+            "x11"
+        ]
+    },
+    "kpackage": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5coreaddons"
+        ],
+        "name": "kpackage-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kpackage-5.12.0.tar.xz",
+            "name": "kpackage-5.12.0.tar.xz",
+            "sha256": "1a8cn1zqv930nmda8n45fnwc5al1iw7xdgqvydbgds7q0mqwg7l5"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5archive",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "qt5",
+            "qt5core",
+            "qt5test"
+        ]
+    },
+    "karchive": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "karchive-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/karchive-5.12.0.tar.xz",
+            "name": "karchive-5.12.0.tar.xz",
+            "sha256": "0dh6pskw1picj3f6a4bbhd9j9ki8l738x7f9dxfwcx05mzsliyl8"
+        },
+        "buildInputs": [
+            "bzip2",
+            "ecm",
+            "kf5archive",
+            "liblzma",
+            "qt5core",
+            "qt5test",
+            "zlib"
+        ]
+    },
+    "kdesu": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5pty"
+        ],
+        "name": "kdesu-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kdesu-5.12.0.tar.xz",
+            "name": "kdesu-5.12.0.tar.xz",
+            "sha256": "1ks695j7wnb7j6vca7a3cb0ii0li4g7sdyksvqsmkxbb1rrpg11f"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5pty",
+            "kf5service",
+            "qt5core",
+            "x11"
+        ]
+    },
+    "kimageformats": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kimageformats-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kimageformats-5.12.0.tar.xz",
+            "name": "kimageformats-5.12.0.tar.xz",
+            "sha256": "1h91xwj4xjv8z5a9hnid7zqcs35cwxv6hf3kwaag35vllm2cs0s7"
+        },
+        "buildInputs": [
+            "ecm",
+            "jasper",
+            "openexr",
+            "qt5gui",
+            "qt5printsupport",
+            "qt5test"
+        ]
+    },
+    "kmediaplayer": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5parts"
+        ],
+        "name": "kmediaplayer-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/portingAids/kmediaplayer-5.12.0.tar.xz",
+            "name": "kmediaplayer-5.12.0.tar.xz",
+            "sha256": "0yr5jjpfnjgfrzqpksl85k6jsgihdb5spf0k9478ryyzpzw3as15"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5parts",
+            "kf5xmlgui",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "ktexteditor": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "ktexteditor-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/ktexteditor-5.12.0.tar.xz",
+            "name": "ktexteditor-5.12.0.tar.xz",
+            "sha256": "09fcyxanl744mrbpxw5sa1bvf18d9hcs305jaim8bgfw58gz7prl"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5archive",
+            "kf5config",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5parts",
+            "kf5sonnet",
+            "libgit2",
+            "perl",
+            "qt5",
+            "qt5core",
+            "qt5printsupport",
+            "qt5script",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml",
+            "qt5xmlpatterns"
+        ]
+    },
+    "kdesignerplugin": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kdesignerplugin-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kdesignerplugin-5.12.0.tar.xz",
+            "name": "kdesignerplugin-5.12.0.tar.xz",
+            "sha256": "05n5pfqabmmy5y8dvk7xz51nyky4k44vxhv7k9fq231cza07w3dg"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5kio",
+            "kf5plotting",
+            "kf5sonnet",
+            "kf5textwidgets",
+            "kf5webkit",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5core",
+            "qt5designer",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kparts": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5kio",
+            "kf5textwidgets",
+            "kf5xmlgui"
+        ],
+        "name": "kparts-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kparts-5.12.0.tar.xz",
+            "name": "kparts-5.12.0.tar.xz",
+            "sha256": "075iqmjdmg8jlbmnpp4jjfr4way4i4c5zwg4c1d4cgd14rr9vm1r"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5jobwidgets",
+            "kf5kio",
+            "kf5notifications",
+            "kf5service",
+            "kf5textwidgets",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "qt5",
+            "qt5core",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kcmutils": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5configwidgets",
+            "kf5service"
+        ],
+        "name": "kcmutils-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kcmutils-5.12.0.tar.xz",
+            "name": "kcmutils-5.12.0.tar.xz",
+            "sha256": "1bnrybzfzhb98ihxcvxjgd6agbr16grhdp8zrbq0lhqbaivyfrzd"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5declarative",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5package",
+            "kf5service",
+            "kf5xmlgui",
+            "qt5",
+            "qt5dbus",
+            "qt5qml",
+            "qt5quick",
+            "qt5widgets"
+        ]
+    },
+    "frameworkintegration": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5configwidgets",
+            "kf5iconthemes"
+        ],
+        "name": "frameworkintegration-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/frameworkintegration-5.12.0.tar.xz",
+            "name": "frameworkintegration-5.12.0.tar.xz",
+            "sha256": "0pi1gsc2k681f7913ald5d4i53riv2nwj09plalkabydh8kcd55j"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5notifications",
+            "kf5widgetsaddons",
+            "oxygenfont",
+            "qt5",
+            "qt5dbus",
+            "qt5qml",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11",
+            "xcb"
+        ]
+    },
+    "kiconthemes": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "kiconthemes-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kiconthemes-5.12.0.tar.xz",
+            "name": "kiconthemes-5.12.0.tar.xz",
+            "sha256": "0myaqpi1pavjyf2pyvkb2v87vwpyzwd2bvm5bh88va1p1kw747a5"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5itemviews",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5dbus",
+            "qt5svg",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kjs": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kjs-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/portingAids/kjs-5.12.0.tar.xz",
+            "name": "kjs-5.12.0.tar.xz",
+            "sha256": "1ajcnpphn3vdkx4xwb762bvj0ws7l2h5sxq53cz3lzvznn9q99ps"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5doctools",
+            "pcre",
+            "perl",
+            "qt5core",
+            "qt5test"
+        ]
+    },
+    "knotifyconfig": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "knotifyconfig-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/knotifyconfig-5.12.0.tar.xz",
+            "name": "knotifyconfig-5.12.0.tar.xz",
+            "sha256": "0gznp2m7hlrbl6y7d3p8g6nwdgpk1h2iyy810cs6cjhs5n7b7bfk"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5kio",
+            "kf5notifications",
+            "kf5widgetsaddons",
+            "kf5xmlgui",
+            "phonon4qt5",
+            "qt5",
+            "qt5dbus",
+            "qt5optional_components",
+            "qt5test",
+            "qt5texttospeech",
+            "qt5widgets"
+        ]
+    },
+    "kio": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5bookmarks",
+            "kf5completion",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5itemviews",
+            "kf5jobwidgets",
+            "kf5service",
+            "kf5solid",
+            "kf5xmlgui",
+            "qt5network"
+        ],
+        "name": "kio-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kio-5.12.0.tar.xz",
+            "name": "kio-5.12.0.tar.xz",
+            "sha256": "139jngyaa1rm159qj0ivjk9bd18rb6sp9n8290xsqwpfvs6ixn7w"
+        },
+        "buildInputs": [
+            "acl",
+            "ecm",
+            "gssapi",
+            "kf5archive",
+            "kf5bookmarks",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5coreaddons",
+            "kf5dbusaddons",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5itemviews",
+            "kf5jobwidgets",
+            "kf5notifications",
+            "kf5service",
+            "kf5solid",
+            "kf5textwidgets",
+            "kf5wallet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "kf5xmlgui",
+            "libxml2",
+            "libxslt",
+            "openssl",
+            "qt5",
+            "qt5concurrent",
+            "qt5core",
+            "qt5dbus",
+            "qt5network",
+            "qt5script",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "qt5xml",
+            "strigi",
+            "x11",
+            "zlib"
+        ]
+    },
+    "kunitconversion": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kunitconversion-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kunitconversion-5.12.0.tar.xz",
+            "name": "kunitconversion-5.12.0.tar.xz",
+            "sha256": "0gmxqjryjzhhr75clbs7swd765asfaf0b7ivnqk99j0dzdg1yh8m"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5i18n",
+            "qt5",
+            "qt5core",
+            "qt5network",
+            "qt5test",
+            "qt5xml"
+        ]
+    },
+    "kdnssd": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5network"
+        ],
+        "name": "kdnssd-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kdnssd-5.12.0.tar.xz",
+            "name": "kdnssd-5.12.0.tar.xz",
+            "sha256": "1v8nml6fmabail6d9wybfqmg02kymg15x5ng4vc08z9wrn1jvxrd"
+        },
+        "buildInputs": [
+            "avahi",
+            "dnssd",
+            "ecm",
+            "qt5",
+            "qt5dbus",
+            "qt5network"
+        ]
+    },
+    "knotifications": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5widgets"
+        ],
+        "name": "knotifications-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/knotifications-5.12.0.tar.xz",
+            "name": "knotifications-5.12.0.tar.xz",
+            "sha256": "08clp98lpplk2k6c4r1l01yh16ssn4ipfc6w8wiahqipp6gzw1bv"
+        },
+        "buildInputs": [
+            "dbusmenu-qt5",
+            "ecm",
+            "kf5codecs",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5iconthemes",
+            "kf5service",
+            "kf5windowsystem",
+            "phonon4qt5",
+            "qt5",
+            "qt5dbus",
+            "qt5optional_components",
+            "qt5test",
+            "qt5texttospeech",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "kdbusaddons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5dbus"
+        ],
+        "name": "kdbusaddons-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kdbusaddons-5.12.0.tar.xz",
+            "name": "kdbusaddons-5.12.0.tar.xz",
+            "sha256": "1nfanafpsi67lmszf8lf3zyjghb3j0jfbc5s7vsa19zbxz9dsh3d"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5dbus",
+            "qt5test",
+            "qt5x11extras"
+        ]
+    },
+    "kemoticons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5service",
+            "qt5gui"
+        ],
+        "name": "kemoticons-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kemoticons-5.12.0.tar.xz",
+            "name": "kemoticons-5.12.0.tar.xz",
+            "sha256": "11wm832xv59vlwnlq314vr7j151mfv7s5xsgab1h0w1ypf8nbggv"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5archive",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5service",
+            "qt5",
+            "qt5gui",
+            "qt5test",
+            "qt5widgets",
+            "qt5xml"
+        ]
+    },
+    "kdoctools": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kdoctools-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kdoctools-5.12.0.tar.xz",
+            "name": "kdoctools-5.12.0.tar.xz",
+            "sha256": "0if3lss9ywwkpcgb8k6vi6b35vl5xxy77gdsbmvd2w2r83p2s6n4"
+        },
+        "buildInputs": [
+            "docbookxml4",
+            "docbookxsl",
+            "ecm",
+            "kf5archive",
+            "kf5doctools",
+            "kf5i18n",
+            "libxml2",
+            "libxslt",
+            "qt5core"
+        ]
+    },
+    "kapidox": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [],
+        "name": "kapidox-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kapidox-5.12.0.tar.xz",
+            "name": "kapidox-5.12.0.tar.xz",
+            "sha256": "0pcmyp92l63klxjz3valpk9kr9rh3ny663hqlfj1qcbl5qx10fic"
+        },
+        "buildInputs": [
+            "pythoninterp"
+        ]
+    },
+    "kcoreaddons": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kcoreaddons-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kcoreaddons-5.12.0.tar.xz",
+            "name": "kcoreaddons-5.12.0.tar.xz",
+            "sha256": "1w113966p2wsr6ddwifzpc6lvx2hpr2qziq7kn4ycjpq3fc6whl7"
+        },
+        "buildInputs": [
+            "ecm",
+            "fam",
+            "qt5",
+            "qt5core",
+            "qt5test",
+            "qt5widgets",
+            "sharedmimeinfo"
+        ]
+    },
+    "krunner": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5plasma",
+            "qt5core"
+        ],
+        "name": "krunner-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/portingAids/krunner-5.12.0.tar.xz",
+            "name": "krunner-5.12.0.tar.xz",
+            "sha256": "167zz32q5ghxc672yp372livdr37wx24769726izhfhqh22gqbpz"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5i18n",
+            "kf5kio",
+            "kf5plasma",
+            "kf5service",
+            "kf5solid",
+            "kf5threadweaver",
+            "qt5",
+            "qt5gui",
+            "qt5quick",
+            "qt5test",
+            "qt5widgets"
+        ]
+    },
+    "kjobwidgets": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5coreaddons",
+            "qt5widgets"
+        ],
+        "name": "kjobwidgets-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kjobwidgets-5.12.0.tar.xz",
+            "name": "kjobwidgets-5.12.0.tar.xz",
+            "sha256": "1vrxcsy4jad2dzjhwlb44l18fckb1h5p3f4w6q8493clribc27kj"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5coreaddons",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5dbus",
+            "qt5test",
+            "qt5widgets",
+            "qt5x11extras",
+            "x11"
+        ]
+    },
+    "kcodecs": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "qt5core"
+        ],
+        "name": "kcodecs-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kcodecs-5.12.0.tar.xz",
+            "name": "kcodecs-5.12.0.tar.xz",
+            "sha256": "1xwz1ipf53azhcpm91c8q1q1i5v4avbnfapgz45hr223ilfkdmpy"
+        },
+        "buildInputs": [
+            "ecm",
+            "qt5core",
+            "qt5test"
+        ]
+    },
+    "kconfigwidgets": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5auth",
+            "kf5codecs",
+            "kf5config",
+            "kf5widgetsaddons"
+        ],
+        "name": "kconfigwidgets-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kconfigwidgets-5.12.0.tar.xz",
+            "name": "kconfigwidgets-5.12.0.tar.xz",
+            "sha256": "1xwk6alrfpgm3pblhdglzglazvjp9i5kzcg212ngad8q9z05c4jg"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5auth",
+            "kf5codecs",
+            "kf5config",
+            "kf5coreaddons",
+            "kf5doctools",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5widgetsaddons",
+            "qt5",
+            "qt5test"
+        ]
+    },
+    "kdeclarative": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5config",
+            "kf5package",
+            "qt5qml"
+        ],
+        "name": "kdeclarative-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/kdeclarative-5.12.0.tar.xz",
+            "name": "kdeclarative-5.12.0.tar.xz",
+            "sha256": "0k6c6ar5xi0m2p4s81p0057i13zpihakniscx5v9yz1ncv7sl8gm"
+        },
+        "buildInputs": [
+            "activeapp",
+            "ecm",
+            "epoxy",
+            "kf5config",
+            "kf5globalaccel",
+            "kf5guiaddons",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5kio",
+            "kf5package",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5gui",
+            "qt5qml",
+            "qt5quick",
+            "qt5test"
+        ]
+    },
+    "ktextwidgets": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5i18n",
+            "kf5sonnet",
+            "qt5widgets"
+        ],
+        "name": "ktextwidgets-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/ktextwidgets-5.12.0.tar.xz",
+            "name": "ktextwidgets-5.12.0.tar.xz",
+            "sha256": "0m2813dm3xs9q2rwvbkynckgbbh0q51swhibhdyirggl1xc8vvf0"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5completion",
+            "kf5config",
+            "kf5configwidgets",
+            "kf5i18n",
+            "kf5iconthemes",
+            "kf5service",
+            "kf5sonnet",
+            "kf5widgetsaddons",
+            "kf5windowsystem",
+            "qt5",
+            "qt5optional_components",
+            "qt5test",
+            "qt5texttospeech",
+            "qt5widgets"
+        ]
+    },
+    "kjsembed": {
+        "nativeBuildInputs": [
+            "cmake"
+        ],
+        "propagatedNativeBuildInputs": [],
+        "propagatedUserEnvPkgs": [],
+        "propagatedBuildInputs": [
+            "kf5i18n",
+            "kf5js"
+        ],
+        "name": "kjsembed-5.12.0",
+        "src": {
+            "url": "stable/frameworks/5.12/portingAids/kjsembed-5.12.0.tar.xz",
+            "name": "kjsembed-5.12.0.tar.xz",
+            "sha256": "0fmgpi0c62y2658xaf0d825azywmpy77vg97k788liqy0d1ykhvh"
+        },
+        "buildInputs": [
+            "ecm",
+            "kf5doctools",
+            "kf5i18n",
+            "kf5js",
+            "qt5"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/packages.sh b/pkgs/development/libraries/kde-frameworks-5.12/packages.sh
new file mode 100755
index 00000000000..7cce2d05fc9
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/packages.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -x
+
+origin="$(pwd)"
+
+# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
+KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
+
+alias nix-build="nix-build --no-out-link \"$origin/../../../..\""
+
+# The extra slash at the end of the URL is necessary to stop wget
+# from recursing over the whole server! (No, it's not a bug.)
+$(nix-build -A autonix.manifest) \
+    "${KDE_MIRROR}/stable/frameworks/5.12/" \
+    "$@" -A '*.tar.xz'
+
+AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}
+
+$AUTONIX_DEPS_KF5 manifest.json
+
+rm manifest.json
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.12/plasma-framework/plasma-framework-external-paths.patch
new file mode 100644
index 00000000000..9a22c0bdbcd
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/plasma-framework/plasma-framework-external-paths.patch
@@ -0,0 +1,13 @@
+diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp
+index 07b3c90..84417e3 100644
+--- a/src/plasma/package.cpp
++++ b/src/plasma/package.cpp
+@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate()
+       servicePrefix("plasma-applet-"),
+       fallbackPackage(0),
+       metadata(0),
+-      externalPaths(false),
++      externalPaths(true),
+       valid(false),
+       checkedValid(false)
+ {
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/renames.json b/pkgs/development/libraries/kde-frameworks-5.12/renames.json
new file mode 100644
index 00000000000..e469d582b1c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/renames.json
@@ -0,0 +1,71 @@
+{
+    "kf5widgetsaddons": "kwidgetsaddons",
+    "kf5texteditor": "ktexteditor",
+    "kf5designerplugin": "kdesignerplugin",
+    "kf5bookmarks": "kbookmarks",
+    "kf5frameworkintegration": "frameworkintegration",
+    "kf5package": "kpackage",
+    "kf5archive": "karchive",
+    "kf5plasma": "plasma-framework",
+    "kf5kcmutils": "kcmutils",
+    "kf5configwidgets": "kconfigwidgets",
+    "ctest": "attica",
+    "kf5kio": "kio",
+    "kf5networkmanagerqt": "networkmanager-qt",
+    "kf5coreaddons": "kcoreaddons",
+    "kf5guiaddons": "kguiaddons",
+    "kf5jobwidgets": "kjobwidgets",
+    "kf5modemmanagerqt": "modemmanager-qt",
+    "kf5runner": "krunner",
+    "kf5globalaccel": "kglobalaccel",
+    "kf5dbusaddons": "kdbusaddons",
+    "kf5crash": "kcrash",
+    "kf5itemviews": "kitemviews",
+    "kf5doctools": "kdoctools",
+    "kf5i18n": "ki18n",
+    "kf5webkit": "kdewebkit",
+    "kf5newstuff": "knewstuff",
+    "kded": "kded",
+    "kf5notifications": "knotifications",
+    "kf5activitiesexperimentalstats": "kactivities",
+    "kf5dnssd": "kdnssd",
+    "kf5notifyconfig": "knotifyconfig",
+    "kf5iconthemes": "kiconthemes",
+    "kf5js": "kjs",
+    "kf5kde4support": "kdelibs4support",
+    "kf5parts": "kparts",
+    "backend": "plasma-framework",
+    "kf5completion": "kcompletion",
+    "kf5threadweaver": "threadweaver",
+    "kf5mediaplayer": "kmediaplayer",
+    "kf5plasmaquick": "plasma-framework",
+    "kf5wallet": "kwallet",
+    "kf5xmlgui": "kxmlgui",
+    "kf5attica": "attica",
+    "kf5declarative": "kdeclarative",
+    "kf5config": "kconfig",
+    "kf5init": "kinit",
+    "kf5textwidgets": "ktextwidgets",
+    "kf5jsembed": "kjsembed",
+    "kf5codecs": "kcodecs",
+    "kf5service": "kservice",
+    "kf5sonnet": "sonnet",
+    "kf5kdelibs4support": "kdelibs4support",
+    "kf5pty": "kpty",
+    "kf5solid": "solid",
+    "kf5auth": "kauth",
+    "ecm": "extra-cmake-modules",
+    "kf5activities": "kactivities",
+    "kf5plotting": "kplotting",
+    "kf5people": "kpeople",
+    "kf5emoticons": "kemoticons",
+    "kf5kross": "kross",
+    "kf5su": "kdesu",
+    "kf5khtml": "khtml",
+    "kf5unitconversion": "kunitconversion",
+    "kf5idletime": "kidletime",
+    "kf5bluezqt": "bluez-qt",
+    "kf5windowsystem": "kwindowsystem",
+    "kf5xmlrpcclient": "kxmlrpcclient",
+    "kf5itemmodels": "kitemmodels"
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/kde-frameworks-5.12/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.12/setup-hook.sh
new file mode 100644
index 00000000000..a8d9b7e0e36
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.12/setup-hook.sh
@@ -0,0 +1 @@
+addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2b7a112538..7bbe2250852 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6659,7 +6659,8 @@ let
   };
 
   kf510 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.10 { });
-  kf5_latest = kf510;
+  kf512 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.12 { });
+  kf5_latest = kf512;
   kf5_stable = kf510;
 
   kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };

From db5335a662d4547c53c0c746e2ece93efa992e9e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 18 Jul 2015 05:31:41 -0500
Subject: [PATCH 2289/2322] kf512: fix bluez-qt udev rules path

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

diff --git a/pkgs/development/libraries/kde-frameworks-5.12/default.nix b/pkgs/development/libraries/kde-frameworks-5.12/default.nix
index d5bb3f78ce8..e2ae5aa7940 100644
--- a/pkgs/development/libraries/kde-frameworks-5.12/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.12/default.nix
@@ -130,6 +130,13 @@ let
     );
 
   self = super // {
+    bluez-qt = overrideDerivation super.bluez-qt (drv: {
+      preConfigure = ''
+        substituteInPlace CMakeLists.txt \
+          --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
+      '';
+    });
+
     extra-cmake-modules = overrideDerivation super.extra-cmake-modules (drv: {
       buildInputs = [];
       nativeBuildInputs = [];

From 479e248e42216bd3c9c82197756f62298f64c051 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 18 Jul 2015 05:32:00 -0500
Subject: [PATCH 2290/2322] kf512: add missing dependencies for kwallet

---
 pkgs/development/libraries/kde-frameworks-5.12/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/kde-frameworks-5.12/default.nix b/pkgs/development/libraries/kde-frameworks-5.12/default.nix
index e2ae5aa7940..d8f51fe7eb7 100644
--- a/pkgs/development/libraries/kde-frameworks-5.12/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.12/default.nix
@@ -216,6 +216,10 @@ let
       patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
     };
 
+    kwallet = extendDerivation super.kwallet {
+      buildInputs = [ scope.kdoctools ];
+    };
+
     networkmanager-qt = extendDerivation super.networkmanager-qt {
       propagatedBuildInputs = [ scope.networkmanager ];
     };

From ff6fd0ea86cc99a54b9a01f858a569c1941942ba Mon Sep 17 00:00:00 2001
From: Boris Sukholitko <boriss@gmail.com>
Date: Sat, 18 Jul 2015 14:17:46 +0300
Subject: [PATCH 2291/2322] uriparser: init at 0.8.2

---
 .../libraries/uriparser/default.nix           | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/uriparser/default.nix

diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix
new file mode 100644
index 00000000000..76aec25a792
--- /dev/null
+++ b/pkgs/development/libraries/uriparser/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, cpptest, pkgconfig, doxygen, graphviz }:
+
+stdenv.mkDerivation rec {
+  name = "uriparser-0.8.2";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/uriparser/Sources/0.8.2/${name}.tar.bz2";
+    sha256 = "13sh7slys3y5gfscc40g2r3hkjjywjvxlcqr77ifjrazc6q6cvkd";
+  };
+
+  buildInputs = [ cpptest pkgconfig doxygen graphviz ];
+
+  meta = with stdenv.lib; {
+    homepage = http://uriparser.sourceforge.net/;
+    description = "Strictly RFC 3986 compliant URI parsing library";
+    maintainers = with maintainers; [ bosu ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c4a95d7c0a..21735bd27e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3184,6 +3184,8 @@ let
 
   upx = callPackage ../tools/compression/upx { };
 
+  uriparser = callPackage ../development/libraries/uriparser {};
+
   urlview = callPackage ../applications/misc/urlview {};
 
   usbmuxd = callPackage ../tools/misc/usbmuxd {};

From b370c759fdfb1312133c85203264c7aeca152e3a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 18 Jul 2015 12:29:54 -0500
Subject: [PATCH 2292/2322] update to plasma-5.3.2

---
 pkgs/desktops/plasma-5.3/packages.json | 288 ++++++++++++-------------
 pkgs/desktops/plasma-5.3/packages.sh   |   2 +-
 2 files changed, 145 insertions(+), 145 deletions(-)

diff --git a/pkgs/desktops/plasma-5.3/packages.json b/pkgs/desktops/plasma-5.3/packages.json
index 22f7c05de5a..ea8c47a4678 100644
--- a/pkgs/desktops/plasma-5.3/packages.json
+++ b/pkgs/desktops/plasma-5.3/packages.json
@@ -8,11 +8,11 @@
         "propagatedBuildInputs": [
             "qt5core"
         ],
-        "name": "bluez-qt-5.3.1",
+        "name": "bluez-qt-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/bluez-qt-5.3.1.tar.xz",
-            "name": "bluez-qt-5.3.1.tar.xz",
-            "sha256": "13i5ybmkf6xg49jh5fbbayxg3gp5h8g1gayc0mdc4cwzx1v6g70l"
+            "url": "stable/plasma/5.3.2/bluez-qt-5.3.2.tar.xz",
+            "name": "bluez-qt-5.3.2.tar.xz",
+            "sha256": "0bc9pi8zbfh66h3p9i76hq1jh7ygavax3zw2wygl269f1k92brlh"
         },
         "buildInputs": [
             "ecm",
@@ -32,11 +32,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kmenuedit-5.3.1",
+        "name": "kmenuedit-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/kmenuedit-5.3.1.tar.xz",
-            "name": "kmenuedit-5.3.1.tar.xz",
-            "sha256": "0vyy3xb32nb2qxfv3qvrrzlnck6gas0gwyncbn4rzimaygm2vzqz"
+            "url": "stable/plasma/5.3.2/kmenuedit-5.3.2.tar.xz",
+            "name": "kmenuedit-5.3.2.tar.xz",
+            "sha256": "13nsjh698h09ai6b7r8zi2hlkkxfv8c00b5b6dl0pb2b474a16di"
         },
         "buildInputs": [
             "ecm",
@@ -62,11 +62,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "plasma-nm-5.3.1",
+        "name": "plasma-nm-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/plasma-nm-5.3.1.tar.xz",
-            "name": "plasma-nm-5.3.1.tar.xz",
-            "sha256": "0jgrz9j2228aya7n1dg4npicsbgv93f8n80b9yjax8mrd6qhq55k"
+            "url": "stable/plasma/5.3.2/plasma-nm-5.3.2.tar.xz",
+            "name": "plasma-nm-5.3.2.tar.xz",
+            "sha256": "0w3cs66rn7k4fzsr7qihzcgxjwmp2safnfr78lp69md59clc45ag"
         },
         "buildInputs": [
             "ecm",
@@ -112,11 +112,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "khotkeys-5.3.1",
+        "name": "khotkeys-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/khotkeys-5.3.1.tar.xz",
-            "name": "khotkeys-5.3.1.tar.xz",
-            "sha256": "11mzrjzk2j9x32mg77d2al19b4iin0rfxs710mhsjbgriq144smv"
+            "url": "stable/plasma/5.3.2/khotkeys-5.3.2.tar.xz",
+            "name": "khotkeys-5.3.2.tar.xz",
+            "sha256": "0f7z6vwkmi54jbvvqgyxn1mvh1gjwmrihj3afd4w7zd4cbyf61ka"
         },
         "buildInputs": [
             "ecm",
@@ -142,11 +142,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "plasma-workspace-wallpapers-5.3.1",
+        "name": "plasma-workspace-wallpapers-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/plasma-workspace-wallpapers-5.3.1.tar.xz",
-            "name": "plasma-workspace-wallpapers-5.3.1.tar.xz",
-            "sha256": "1y6gdzs0qxiw4hl9r6v3blcm8gq61wapagn6sj5ixagvwlhf2w5y"
+            "url": "stable/plasma/5.3.2/plasma-workspace-wallpapers-5.3.2.tar.xz",
+            "name": "plasma-workspace-wallpapers-5.3.2.tar.xz",
+            "sha256": "1h3w824dv5yyjz6l9vsi6lddlb5xxmmaqdvvacz7qypy06f808aa"
         },
         "buildInputs": [
             "ecm"
@@ -159,11 +159,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kscreen-5.3.1",
+        "name": "kscreen-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/kscreen-5.3.1.tar.xz",
-            "name": "kscreen-5.3.1.tar.xz",
-            "sha256": "008ys3glpvpcvjh7n2gls3m13q9qswmnc5l2lz4zs1dvcrk5z7yr"
+            "url": "stable/plasma/5.3.2/kscreen-5.3.2.tar.xz",
+            "name": "kscreen-5.3.2.tar.xz",
+            "sha256": "15dnraav3sn5rcz88nj3h6n95w4jiynn45n29pfv7yc3p41yahwd"
         },
         "buildInputs": [
             "ecm",
@@ -187,11 +187,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "oxygen-fonts-5.3.1",
+        "name": "oxygen-fonts-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/oxygen-fonts-5.3.1.tar.xz",
-            "name": "oxygen-fonts-5.3.1.tar.xz",
-            "sha256": "0zp81c4s0xvr1d0nvlssk3k3456farz157sqnjvgbsarxnzmgppv"
+            "url": "stable/plasma/5.3.2/oxygen-fonts-5.3.2.tar.xz",
+            "name": "oxygen-fonts-5.3.2.tar.xz",
+            "sha256": "0x78fbllqd8ssxlr2d0xy76pvr4v6f5xans4mvr3f3aa6xhr05ya"
         },
         "buildInputs": [
             "ecm"
@@ -204,11 +204,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "breeze-5.3.1",
+        "name": "breeze-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/breeze-5.3.1.tar.xz",
-            "name": "breeze-5.3.1.tar.xz",
-            "sha256": "0sh7vgg3dz0cs6mqs4c3ygw5qg4lcjm0vdh4mm4xfxnizagkqrr5"
+            "url": "stable/plasma/5.3.2/breeze-5.3.2.tar.xz",
+            "name": "breeze-5.3.2.tar.xz",
+            "sha256": "0rnw5cblz6rdcx4n6x2wwr0blrk2xlkkq1gsbr06c969hp9gq4iy"
         },
         "buildInputs": [
             "ecm",
@@ -239,11 +239,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "oxygen-5.3.1",
+        "name": "oxygen-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/oxygen-5.3.1.tar.xz",
-            "name": "oxygen-5.3.1.tar.xz",
-            "sha256": "03b8rxgspkv5p8mfb53v92bi62cqp7rcma2fjarmgw4ri5w6cwx9"
+            "url": "stable/plasma/5.3.2/oxygen-5.3.2.tar.xz",
+            "name": "oxygen-5.3.2.tar.xz",
+            "sha256": "19z18n7zq8616r1dwvnw0s73wxh114d3z952x3p3z42dhl0lkrw0"
         },
         "buildInputs": [
             "ecm",
@@ -278,11 +278,11 @@
         "propagatedBuildInputs": [
             "kf5sysguard"
         ],
-        "name": "plasma-workspace-5.3.1",
+        "name": "plasma-workspace-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/plasma-workspace-5.3.1.tar.xz",
-            "name": "plasma-workspace-5.3.1.tar.xz",
-            "sha256": "1cjg8rhwhm015fg36idn4shddcy6sjnb4y0x9vmxbsdvfx2nnhr1"
+            "url": "stable/plasma/5.3.2/plasma-workspace-5.3.2.tar.xz",
+            "name": "plasma-workspace-5.3.2.tar.xz",
+            "sha256": "1i2lz9acxl63nd6nlvgvnv7lm3nq4bvj2kyj2lmd97f5xx3sara1"
         },
         "buildInputs": [
             "dbusmenu-qt5",
@@ -351,11 +351,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kwrited-5.3.1",
+        "name": "kwrited-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/kwrited-5.3.1.tar.xz",
-            "name": "kwrited-5.3.1.tar.xz",
-            "sha256": "0qivfycr4ak5zsplnzv968sya2rc3vz9z6h8gv4b2scf99zjp2g8"
+            "url": "stable/plasma/5.3.2/kwrited-5.3.2.tar.xz",
+            "name": "kwrited-5.3.2.tar.xz",
+            "sha256": "1h499rpp7jss5vikapm1247xn1bg5axq4bwwfr6frlyq03vcpga1"
         },
         "buildInputs": [
             "ecm",
@@ -378,11 +378,11 @@
         "propagatedBuildInputs": [
             "qt5core"
         ],
-        "name": "plasma-desktop-5.3.1",
+        "name": "plasma-desktop-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/plasma-desktop-5.3.1.tar.xz",
-            "name": "plasma-desktop-5.3.1.tar.xz",
-            "sha256": "079v2pbpgn1gr03l3qcxk3rsgbip318xpjbni4vxf08fhsh1ixlp"
+            "url": "stable/plasma/5.3.2/plasma-desktop-5.3.2.tar.xz",
+            "name": "plasma-desktop-5.3.2.tar.xz",
+            "sha256": "190g0nmm97a0403nvyp1478fpk8r3d7jkxpg0mif9nvws25qfvz1"
         },
         "buildInputs": [
             "boost",
@@ -457,11 +457,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "systemsettings-5.3.1",
+        "name": "systemsettings-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/systemsettings-5.3.1.tar.xz",
-            "name": "systemsettings-5.3.1.tar.xz",
-            "sha256": "06m3r31dr0ivhn25fg0sg8pbxyzvm8slsmqkqsm4cbypg028axx0"
+            "url": "stable/plasma/5.3.2/systemsettings-5.3.2.tar.xz",
+            "name": "systemsettings-5.3.2.tar.xz",
+            "sha256": "0lgl15hfr3na3v1dry8r5bd7z3d8jlrzh6a3avq9l9297lwfgaxd"
         },
         "buildInputs": [
             "ecm",
@@ -491,11 +491,11 @@
         "propagatedBuildInputs": [
             "qt5core"
         ],
-        "name": "libkscreen-5.3.1",
+        "name": "libkscreen-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/libkscreen-5.3.1.tar.xz",
-            "name": "libkscreen-5.3.1.tar.xz",
-            "sha256": "00g401yfiyqh09ajkinlkzhfpb7lsy0wpnrk1ba8vm4wmcvkp63l"
+            "url": "stable/plasma/5.3.2/libkscreen-5.3.2.tar.xz",
+            "name": "libkscreen-5.3.2.tar.xz",
+            "sha256": "1k6j4nxy41d2jgwydi0ah2v0idn6zhb1lmxziyrcshqpklhwiff2"
         },
         "buildInputs": [
             "doxygen",
@@ -517,11 +517,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "plasma-sdk-5.3.1",
+        "name": "plasma-sdk-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/plasma-sdk-5.3.1.tar.xz",
-            "name": "plasma-sdk-5.3.1.tar.xz",
-            "sha256": "157742d7wm21y4g7gs0483jd4sd6q2a0ppyk3mr544nagydvpqfs"
+            "url": "stable/plasma/5.3.2/plasma-sdk-5.3.2.tar.xz",
+            "name": "plasma-sdk-5.3.2.tar.xz",
+            "sha256": "13vkxbayxggj4bx1l40rspck59j4l736gr5hg0sd1j7hmlwcys2z"
         },
         "buildInputs": [
             "activeapp",
@@ -570,11 +570,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kwin-5.3.1",
+        "name": "kwin-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/kwin-5.3.1.tar.xz",
-            "name": "kwin-5.3.1.tar.xz",
-            "sha256": "04bxf45lcbmnl8fks1k6j6i0sk7x5abzhmyrziliz2yx5kyi4m36"
+            "url": "stable/plasma/5.3.2/kwin-5.3.2.tar.xz",
+            "name": "kwin-5.3.2.tar.xz",
+            "sha256": "0p2pf6aq9zy0l4f7px2p0wj1kfgax8qjmal6yn3mifx1al244xvz"
         },
         "buildInputs": [
             "ecm",
@@ -633,11 +633,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdeplasma-addons-5.3.1",
+        "name": "kdeplasma-addons-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/kdeplasma-addons-5.3.1.tar.xz",
-            "name": "kdeplasma-addons-5.3.1.tar.xz",
-            "sha256": "1myk3508jqgalyqa1rlx1dq5afppvhvsnd7irf4wywpgls20nwnv"
+            "url": "stable/plasma/5.3.2/kdeplasma-addons-5.3.2.tar.xz",
+            "name": "kdeplasma-addons-5.3.2.tar.xz",
+            "sha256": "08k3736ssir41r37y3f6bdf52l1whkr7q5qc2rfhbzm6c9lhqvn4"
         },
         "buildInputs": [
             "ecm",
@@ -686,11 +686,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "sddm-kcm-5.3.1",
+        "name": "sddm-kcm-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/sddm-kcm-5.3.1.tar.xz",
-            "name": "sddm-kcm-5.3.1.tar.xz",
-            "sha256": "16viwz7b8s77g5fqw7g7asrrk44fif4fmmif7g3bkmq7rncd3hw9"
+            "url": "stable/plasma/5.3.2/sddm-kcm-5.3.2.tar.xz",
+            "name": "sddm-kcm-5.3.2.tar.xz",
+            "sha256": "17pk95xqr08gjn16i4gs7gnp2ksc6082myywdarywf66nz4whind"
         },
         "buildInputs": [
             "ecm",
@@ -720,11 +720,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "khelpcenter-5.3.1",
+        "name": "khelpcenter-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/khelpcenter-5.3.1.tar.xz",
-            "name": "khelpcenter-5.3.1.tar.xz",
-            "sha256": "0dik353w6ri6mfkvkz3v5xva6x59zlbz1sj522li0gbd73x4bzf2"
+            "url": "stable/plasma/5.3.2/khelpcenter-5.3.2.tar.xz",
+            "name": "khelpcenter-5.3.2.tar.xz",
+            "sha256": "1nd4kj4zhw21lfdj6yrmww2rx629mia5w0fb769y5wdas82w9wb3"
         },
         "buildInputs": [
             "ecm",
@@ -747,11 +747,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "bluedevil-5.3.1",
+        "name": "bluedevil-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/bluedevil-5.3.1.tar.xz",
-            "name": "bluedevil-5.3.1.tar.xz",
-            "sha256": "050hpiifrhm2vzab527anfncdf04cikz5149iabz3aflxcvabqpl"
+            "url": "stable/plasma/5.3.2/bluedevil-5.3.2.tar.xz",
+            "name": "bluedevil-5.3.2.tar.xz",
+            "sha256": "0pdm4fpr4piaqd52nbyv3plib4z6y9dr7qgbh1cfk3bzfwi1jwn8"
         },
         "buildInputs": [
             "ecm",
@@ -782,11 +782,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ksysguard-5.3.1",
+        "name": "ksysguard-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/ksysguard-5.3.1.tar.xz",
-            "name": "ksysguard-5.3.1.tar.xz",
-            "sha256": "1z1qgf5qskzf4r524lf75pdyw7gdwrx2yr8nac9622hvgrfh7yhj"
+            "url": "stable/plasma/5.3.2/ksysguard-5.3.2.tar.xz",
+            "name": "ksysguard-5.3.2.tar.xz",
+            "sha256": "1vf2gdihrvfjrlkg5dmpg9f5yqgxawqa2cf8h9f96n2n0cd46gq7"
         },
         "buildInputs": [
             "ecm",
@@ -817,11 +817,11 @@
             "qt5core",
             "xapian"
         ],
-        "name": "baloo-5.9.1",
+        "name": "baloo-5.9.2",
         "src": {
-            "url": "stable/plasma/5.3.1/baloo-5.9.1.tar.xz",
-            "name": "baloo-5.9.1.tar.xz",
-            "sha256": "0wx9n3l4f1ibddvhbiharhgd20s8hzs64b2c0686bm82qmbkkl7n"
+            "url": "stable/plasma/5.3.2/baloo-5.9.2.tar.xz",
+            "name": "baloo-5.9.2.tar.xz",
+            "sha256": "1rhrdri90xb4g23x92nv72x19lxrdzkzc16w5ivbglrnq5ipga8w"
         },
         "buildInputs": [
             "ecm",
@@ -852,11 +852,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-cli-tools-5.3.1",
+        "name": "kde-cli-tools-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/kde-cli-tools-5.3.1.tar.xz",
-            "name": "kde-cli-tools-5.3.1.tar.xz",
-            "sha256": "0x4k3yi4qccvfp4ia75alihcivk4slwsx8i0wdb00qjl1nj7jbc1"
+            "url": "stable/plasma/5.3.2/kde-cli-tools-5.3.2.tar.xz",
+            "name": "kde-cli-tools-5.3.2.tar.xz",
+            "sha256": "1ac36rhffw85yzck4mqj1l4yj20g6yrjxi40vrkakln5j26vxb3x"
         },
         "buildInputs": [
             "ecm",
@@ -884,11 +884,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "milou-5.3.1",
+        "name": "milou-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/milou-5.3.1.tar.xz",
-            "name": "milou-5.3.1.tar.xz",
-            "sha256": "17xw62pngq3bb7vkbkn8c099ivsf1xmns0f65v7j112yqpz33b8a"
+            "url": "stable/plasma/5.3.2/milou-5.3.2.tar.xz",
+            "name": "milou-5.3.2.tar.xz",
+            "sha256": "1wlnis5ph7vxg7wj410qs8qvdc2b0s8ji1vgqpv0g19zhkph95kw"
         },
         "buildInputs": [
             "ecm",
@@ -915,11 +915,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "powerdevil-5.3.1",
+        "name": "powerdevil-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/powerdevil-5.3.1.tar.xz",
-            "name": "powerdevil-5.3.1.tar.xz",
-            "sha256": "07kcqd7qzblapxnwczfdj4vwb8s6s8mp7qhl4mb663f2a0z6fn8l"
+            "url": "stable/plasma/5.3.2/powerdevil-5.3.2.tar.xz",
+            "name": "powerdevil-5.3.2.tar.xz",
+            "sha256": "1zyfqi9qppra2hw0i18wil1xym84pgqdgmh9yn577c778grr4kgk"
         },
         "buildInputs": [
             "ecm",
@@ -959,11 +959,11 @@
             "qt5network",
             "qt5widgets"
         ],
-        "name": "libksysguard-5.3.1",
+        "name": "libksysguard-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/libksysguard-5.3.1.tar.xz",
-            "name": "libksysguard-5.3.1.tar.xz",
-            "sha256": "115iwqq4y6pnhqsa5yn30q6wdpad5v48m7hjrn7jbpm3gsiwq1ym"
+            "url": "stable/plasma/5.3.2/libksysguard-5.3.2.tar.xz",
+            "name": "libksysguard-5.3.2.tar.xz",
+            "sha256": "137dr7p4q3aldm7fs2rldchq4d3irij4rpqc3c799blrgmdrp98p"
         },
         "buildInputs": [
             "ecm",
@@ -998,11 +998,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "plasma-mediacenter-5.3.1",
+        "name": "plasma-mediacenter-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/plasma-mediacenter-5.3.1.tar.xz",
-            "name": "plasma-mediacenter-5.3.1.tar.xz",
-            "sha256": "0h8dpyszn7hk7b1y1m9qb83gzjnp8ymslpranxdan36r5bm2ayd8"
+            "url": "stable/plasma/5.3.2/plasma-mediacenter-5.3.2.tar.xz",
+            "name": "plasma-mediacenter-5.3.2.tar.xz",
+            "sha256": "0nlkzhyfi87k2r567h0hdlj1a9115mwxac55yjg7j3bpm7jr36g6"
         },
         "buildInputs": [
             "ecm",
@@ -1041,11 +1041,11 @@
         "propagatedBuildInputs": [
             "qt5core"
         ],
-        "name": "kfilemetadata-5.9.1",
+        "name": "kfilemetadata-5.9.2",
         "src": {
-            "url": "stable/plasma/5.3.1/kfilemetadata-5.9.1.tar.xz",
-            "name": "kfilemetadata-5.9.1.tar.xz",
-            "sha256": "02gffgwbic4h8zdknp32cczplw3cc9ahg483aa3frhhgvgvrq8hs"
+            "url": "stable/plasma/5.3.2/kfilemetadata-5.9.2.tar.xz",
+            "name": "kfilemetadata-5.9.2.tar.xz",
+            "sha256": "070m5v54birqwh8cmik6n80nbcfjh38lay4w5i3ic0hqj6as2n89"
         },
         "buildInputs": [
             "ecm",
@@ -1070,11 +1070,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-gtk-config-5.3.1",
+        "name": "kde-gtk-config-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/kde-gtk-config-5.3.1.tar.xz",
-            "name": "kde-gtk-config-5.3.1.tar.xz",
-            "sha256": "1frykdckgrfbiyjshdkjv6hp8mrpfz3g461w6snb65yly02qjb5l"
+            "url": "stable/plasma/5.3.2/kde-gtk-config-5.3.2.tar.xz",
+            "name": "kde-gtk-config-5.3.2.tar.xz",
+            "sha256": "0rw4yv8svbjnv06pqva81m9xvpl75bvka53kckz0nqi6v96rdg2m"
         },
         "buildInputs": [
             "ecm",
@@ -1103,11 +1103,11 @@
         "propagatedBuildInputs": [
             "qt5gui"
         ],
-        "name": "kwayland-5.3.1",
+        "name": "kwayland-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/kwayland-5.3.1.tar.xz",
-            "name": "kwayland-5.3.1.tar.xz",
-            "sha256": "1vsdsf00py6i16zwbwpplq1v7m3fy1j0dskvkb080wm0fskz1r8f"
+            "url": "stable/plasma/5.3.2/kwayland-5.3.2.tar.xz",
+            "name": "kwayland-5.3.2.tar.xz",
+            "sha256": "1z8k3vhrbfmnbaaji2akzgqvwm990cqk1jqd3crgzv26pbhinvci"
         },
         "buildInputs": [
             "ecm",
@@ -1132,11 +1132,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ksshaskpass-5.3.1",
+        "name": "ksshaskpass-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/ksshaskpass-5.3.1.tar.xz",
-            "name": "ksshaskpass-5.3.1.tar.xz",
-            "sha256": "0ids7vbi46bdd5dbjgv0wfv4rfv03kpln5vr3rwavah892q1dad2"
+            "url": "stable/plasma/5.3.2/ksshaskpass-5.3.2.tar.xz",
+            "name": "ksshaskpass-5.3.2.tar.xz",
+            "sha256": "1v4p02141pd7xkyfxmhf7lf5385krri2zdh3vb90d8pr802mv3g7"
         },
         "buildInputs": [
             "ecm",
@@ -1157,11 +1157,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kinfocenter-5.3.1",
+        "name": "kinfocenter-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/kinfocenter-5.3.1.tar.xz",
-            "name": "kinfocenter-5.3.1.tar.xz",
-            "sha256": "02gqlidh9pb924vhhaxnidpjz3cb32r6icikhcv7csrll13wgp1a"
+            "url": "stable/plasma/5.3.2/kinfocenter-5.3.2.tar.xz",
+            "name": "kinfocenter-5.3.2.tar.xz",
+            "sha256": "1w8q9xq2rl1g8axf7n7l7cq49ahhw0r1zc0sdgv4409k5iwsrikr"
         },
         "buildInputs": [
             "ecm",
@@ -1203,11 +1203,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "polkit-kde-agent-1-5.3.1",
+        "name": "polkit-kde-agent-1-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/polkit-kde-agent-1-5.3.1.tar.xz",
-            "name": "polkit-kde-agent-1-5.3.1.tar.xz",
-            "sha256": "01ragaa1r144g25kqdc157d7lbq69cclanaljgwkvs2mn0ib031c"
+            "url": "stable/plasma/5.3.2/polkit-kde-agent-1-5.3.2.tar.xz",
+            "name": "polkit-kde-agent-1-5.3.2.tar.xz",
+            "sha256": "0khbkgd3s0b2xl062rcxqimym8f3c9y6xadl5av27d4d78ayqmfn"
         },
         "buildInputs": [
             "ecm",
@@ -1237,11 +1237,11 @@
         "propagatedBuildInputs": [
             "qt5gui"
         ],
-        "name": "kdecoration-5.3.1",
+        "name": "kdecoration-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/kdecoration-5.3.1.tar.xz",
-            "name": "kdecoration-5.3.1.tar.xz",
-            "sha256": "19qxz5ivrjq9a1shk7mjin0r9v37g33l762nf7lb1xf29y13mhsn"
+            "url": "stable/plasma/5.3.2/kdecoration-5.3.2.tar.xz",
+            "name": "kdecoration-5.3.2.tar.xz",
+            "sha256": "192infj8s4rd3jwiy8fcvbg265zvng4xbmwj7a3bqz4h9jcrjc7v"
         },
         "buildInputs": [
             "ecm",
@@ -1259,11 +1259,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kio-extras-5.3.1",
+        "name": "kio-extras-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/kio-extras-5.3.1.tar.xz",
-            "name": "kio-extras-5.3.1.tar.xz",
-            "sha256": "1m1gc0m9xhapnchiicsn93spylczkggj8c79ixgk99b1ha7vbc87"
+            "url": "stable/plasma/5.3.2/kio-extras-5.3.2.tar.xz",
+            "name": "kio-extras-5.3.2.tar.xz",
+            "sha256": "1vfp203mmpqvwa9dqkkpgz9rgk07f11pwhg5drvkw03azi9hbjbw"
         },
         "buildInputs": [
             "ecm",
@@ -1308,11 +1308,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "muon-5.3.1",
+        "name": "muon-5.3.2",
         "src": {
-            "url": "stable/plasma/5.3.1/muon-5.3.1.tar.xz",
-            "name": "muon-5.3.1.tar.xz",
-            "sha256": "0k2c625d9i5gyyvdzlajkb0kcvss60lhs7qssil1a4w34ch3zfmk"
+            "url": "stable/plasma/5.3.2/muon-5.3.2.tar.xz",
+            "name": "muon-5.3.2.tar.xz",
+            "sha256": "0c2c94yirfrkcxp30gf77xzy9gmgznx0kkhn93idggdhc4qdyf9z"
         },
         "buildInputs": [
             "akabeiclient",
diff --git a/pkgs/desktops/plasma-5.3/packages.sh b/pkgs/desktops/plasma-5.3/packages.sh
index 3c8e0757552..c43c47296d6 100755
--- a/pkgs/desktops/plasma-5.3/packages.sh
+++ b/pkgs/desktops/plasma-5.3/packages.sh
@@ -12,7 +12,7 @@ alias nix-build="nix-build --no-out-link \"$origin/../../..\""
 # The extra slash at the end of the URL is necessary to stop wget
 # from recursing over the whole server! (No, it's not a bug.)
 $(nix-build -A autonix.manifest) \
-    "${KDE_MIRROR}/stable/plasma/5.3.1/" \
+    "${KDE_MIRROR}/stable/plasma/5.3.2/" \
     "$@" -A '*.tar.xz'
 
 AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}

From 9c9be239518c589f34cfba60730b1932809770ca Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 18 Jul 2015 12:30:14 -0500
Subject: [PATCH 2293/2322] plasma53: update startkde patches for
 plasma-workspace-5.3.2

---
 pkgs/desktops/plasma-5.3/default.nix          |  6 ++---
 .../0001-startkde-NixOS-patches.patch         | 24 ++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index c9e26f7264c..f9026b5843a 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -124,8 +124,8 @@ let
     } //
     # packages from nixpkgs
     (with pkgs; {
-      inherit attr bash cairo cmake dbus epoxy exiv2 ffmpeg freetype
-              glib gnugrep gnused gtk2 gtk3 libinput libssh
+      inherit attr bash cairo cmake coreutils dbus epoxy exiv2 ffmpeg
+              freetype glib gnugrep gnused gtk2 gtk3 libinput libssh
               modemmanager openconnect openexr pam pango qt4 samba
               socat substituteAll taglib utillinux wayland xapian
               xkeyboard_config xlibs xorg;
@@ -233,7 +233,7 @@ let
       patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ];
       buildInputs = with scope.xlibs; [ libSM libXcursor scope.pam ];
 
-      inherit (scope) bash gnused gnugrep socat;
+      inherit (scope) bash coreutils gnused gnugrep socat;
       inherit (scope) kconfig kinit kservice qt5tools;
       inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
       dbus_tools = scope.dbus.tools;
diff --git a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
index 86c6dd857be..bef2867f343 100644
--- a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
+++ b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
@@ -1,14 +1,14 @@
-From ff61c8ba856328a60e29938466b69d0bb38a357f Mon Sep 17 00:00:00 2001
+From f124d2204cff11ae0ff0d6c788d268b746180407 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Tue, 2 Jun 2015 11:21:43 -0500
-Subject: [PATCH] startkde: NixOS patches
+Date: Sat, 18 Jul 2015 12:13:08 -0500
+Subject: [PATCH] startkde NixOS patches
 
 ---
- startkde/startkde.cmake | 218 ++++++++++++++++++++----------------------------
- 1 file changed, 89 insertions(+), 129 deletions(-)
+ startkde/startkde.cmake | 222 ++++++++++++++++++++----------------------------
+ 1 file changed, 91 insertions(+), 131 deletions(-)
 
 diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 24e5c1b..e7bdd32 100644
+index 6f93108..26cc2fc 100644
 --- a/startkde/startkde.cmake
 +++ b/startkde/startkde.cmake
 @@ -1,8 +1,31 @@
@@ -62,7 +62,8 @@ index 24e5c1b..e7bdd32 100644
 -fi
 -
  # Check if a KDE session already is running and whether it's possible to connect to X
- kcheckrunning
+-kcheckrunning
++@out@/bin/kcheckrunning
  kcheckrunning_result=$?
  if test $kcheckrunning_result -eq 0 ; then
 -	echo "KDE seems to be already running on this display."
@@ -129,7 +130,8 @@ index 24e5c1b..e7bdd32 100644
 -    }
 -fi
 -
- kstartupconfig5
+-kstartupconfig5
++@out@/bin/kstartupconfig5
  returncode=$?
  if test $returncode -ne 0; then
 -    xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
@@ -141,7 +143,7 @@ index 24e5c1b..e7bdd32 100644
 -if test "$kdeglobals_kscreen_scalefactor" -ne 1; then
 -    export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
 -fi
-+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | tr "\n" ":")
++XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @coreutils@/bin/tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | @coreutils@/bin/tr "\n" ":")
 +export XCURSOR_PATH
  
  # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
@@ -391,7 +393,7 @@ index 24e5c1b..e7bdd32 100644
  for prefix in `echo "$scriptpath"`; do
 -  for file in `ls "$prefix"/shutdown 2> /dev/null | egrep -v '(~|\.bak)$'`; do
 +  for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do
-     test -x "$prefix$file" && "$prefix$file"
+     test -x "$prefix/shutdown/$file" && "$prefix/shutdown/$file"
    done
  done
  
@@ -405,5 +407,5 @@ index 24e5c1b..e7bdd32 100644
  
  echo 'startkde: Done.'  1>&2
 -- 
-2.4.1
+2.4.5
 

From b9895740ba3de2d4083f6e3aab3feb78d3f40866 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 18 Jul 2015 20:31:18 +0200
Subject: [PATCH 2294/2322] dnscrypt-proxy: 1.5.0 -> 1.6.0

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

diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index e975cb1e738..94c74da3644 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dnscrypt-proxy-${version}";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchurl {
     url = "http://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2";
-    sha256 = "1cp3ivxngrihil6i7b659d39v9v6iwjs16s2kj9wz1anzyx0j6nx";
+    sha256 = "0zfw9vi9qbsc55awncyigqfqp25v5adqk6jpg1jdfkmbqqfykk70";
   };
 
   buildInputs = [ libsodium ];

From f46bbbce4951c576ac9d59bfe8e022cb6c04989e Mon Sep 17 00:00:00 2001
From: Stewart Mackenzie <setori88@gmail.com>
Date: Sun, 19 Jul 2015 02:33:43 +0800
Subject: [PATCH 2295/2322] boot: correct sha256

---
 pkgs/development/tools/build-managers/boot/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix
index d4fddbb1791..778019ea541 100644
--- a/pkgs/development/tools/build-managers/boot/default.nix
+++ b/pkgs/development/tools/build-managers/boot/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/boot-clj/boot/releases/download/${version}/boot.sh";
-    sha256 = "12c24aqvwq8kj6iiac18rp0n8vlzacl7dd95m983yz24w885chc0";
+    sha256 = "0hvznr0z5ck32wpaqhjv2fr9365b8h0h8brnsmwijpv699l0rf1c";
   };
 
   inherit jdk;

From 84aea56778f659cec22384fc649f6e84e817104e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 17 Jul 2015 21:20:19 +0200
Subject: [PATCH 2296/2322] netsniff-ng: 0.5.9-{27-g3beaa23 -> 34-g95c4582}

Several flowtop fixes/enhancements.
---
 pkgs/tools/networking/netsniff-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index fb289f640bb..51d25ac16a4 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -2,7 +2,7 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-let version = "0.5.9-27-g3beaa23"; in
+let version = "0.5.9-34-g95c4582"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "3beaa23d4d33b51a392b56f110c8773151ac19cc";
-    sha256 = "0k6p57zynrs0ffnvrhbcnfkmvrj6ay2bxpj44ggm7bv327ckdzm7";
+    rev = "95c4582b742fd4fa58e5f14971164b941b0f730d";
+    sha256 = "0anai392n8zx8vcjbjg776lbiwrv95x2dbd8rypbqfzmj8nhzric";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

From 55e8754010150a8ddd14103451f577c3af5280ef Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sat, 18 Jul 2015 14:52:32 -0700
Subject: [PATCH 2297/2322] fix perl package platforms

---
 pkgs/development/perl-modules/DBD-Pg/default.nix | 2 +-
 pkgs/top-level/perl-packages.nix                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix
index f6c8bcc2e2f..6dbefa7111f 100644
--- a/pkgs/development/perl-modules/DBD-Pg/default.nix
+++ b/pkgs/development/perl-modules/DBD-Pg/default.nix
@@ -17,6 +17,6 @@ buildPerlPackage rec {
     homepage = http://search.cpan.org/dist/DBD-Pg/;
     description = "DBI PostgreSQL interface";
     license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 97b98605cc2..6848be462b9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6052,7 +6052,7 @@ let self = _self // overrides; _self = with self; {
       description = "A postmodern object system for Perl 5";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = [ maintainers.eelco ];
-      platforms   = stdenv.lib.platforms.linux;
+      platforms   = stdenv.lib.platforms.unix;
     };
   };
 

From e4e8c5f5b52be47fd696759c46963cbb41a59f03 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 18 Jul 2015 15:51:41 -0500
Subject: [PATCH 2298/2322] update to kde-applications-15.04.3

---
 .../applications/kde-apps-15.04/packages.json | 1808 ++++++++---------
 pkgs/applications/kde-apps-15.04/packages.sh  |    2 +-
 2 files changed, 905 insertions(+), 905 deletions(-)

diff --git a/pkgs/applications/kde-apps-15.04/packages.json b/pkgs/applications/kde-apps-15.04/packages.json
index 7c0251c9441..fef1a4610bf 100644
--- a/pkgs/applications/kde-apps-15.04/packages.json
+++ b/pkgs/applications/kde-apps-15.04/packages.json
@@ -6,11 +6,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "libkexiv2-15.04.2",
+        "name": "libkexiv2-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/libkexiv2-15.04.2.tar.xz",
-            "name": "libkexiv2-15.04.2.tar.xz",
-            "sha256": "0nycanbbk50flb92bgk9zddpny8fb74k2b5fb26x33msx04854vb"
+            "url": "stable/applications/15.04.3/src/libkexiv2-15.04.3.tar.xz",
+            "name": "libkexiv2-15.04.3.tar.xz",
+            "sha256": "0f5cfkdlqmngpj0sr9i6w2n57jgnhj6j6gvr8cc26n11zrdv9w04"
         },
         "buildInputs": [
             "exiv2",
@@ -24,11 +24,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-bg-15.04.2",
+        "name": "kde-l10n-bg-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-bg-15.04.2.tar.xz",
-            "name": "kde-l10n-bg-15.04.2.tar.xz",
-            "sha256": "1jap82rz52a43rad33hidsyvvzm3s4ma5yk75clv5f8fhnjc946k"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-bg-15.04.3.tar.xz",
+            "name": "kde-l10n-bg-15.04.3.tar.xz",
+            "sha256": "1s2qm9dlih7yfs83pywkn1q5mk9xik70rmzqvp1fj0zj66gxhf9i"
         },
         "buildInputs": [
             "ecm",
@@ -45,11 +45,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kqtquickcharts-15.04.2",
+        "name": "kqtquickcharts-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kqtquickcharts-15.04.2.tar.xz",
-            "name": "kqtquickcharts-15.04.2.tar.xz",
-            "sha256": "02fclmqa845cd6gll89m2fi382syani9r84w0hnnsyc77dqrlqi6"
+            "url": "stable/applications/15.04.3/src/kqtquickcharts-15.04.3.tar.xz",
+            "name": "kqtquickcharts-15.04.3.tar.xz",
+            "sha256": "1fmyyiy2ahxxbf9cy5aqpb5zvcqk0yrig9h586hzhw028mdblj5a"
         },
         "buildInputs": [
             "kde4"
@@ -63,11 +63,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "palapeli-15.04.2",
+        "name": "palapeli-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/palapeli-15.04.2.tar.xz",
-            "name": "palapeli-15.04.2.tar.xz",
-            "sha256": "0jsgbddk631z010dam8khbcq9qphkgax9rbgn26r9cv29cfd0h5j"
+            "url": "stable/applications/15.04.3/src/palapeli-15.04.3.tar.xz",
+            "name": "palapeli-15.04.3.tar.xz",
+            "sha256": "04l94nwwzqgsf54hg0yrbmv5fc2lljcgpxg4fcfbp8j58ypqv6kq"
         },
         "buildInputs": [
             "kde4",
@@ -82,11 +82,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kmahjongg-15.04.2",
+        "name": "kmahjongg-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kmahjongg-15.04.2.tar.xz",
-            "name": "kmahjongg-15.04.2.tar.xz",
-            "sha256": "17jlb1nr2i79s4m3srv0fm4zwqqknabfa0zwb6y5bdlk9bjpphaq"
+            "url": "stable/applications/15.04.3/src/kmahjongg-15.04.3.tar.xz",
+            "name": "kmahjongg-15.04.3.tar.xz",
+            "sha256": "1066qmvkxzi83mnd736ldfqm6qmdwwj7bw1daixfarkr2mws7i51"
         },
         "buildInputs": [
             "kde4",
@@ -103,11 +103,11 @@
         "propagatedBuildInputs": [
             "qt5core"
         ],
-        "name": "analitza-15.04.2",
+        "name": "analitza-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/analitza-15.04.2.tar.xz",
-            "name": "analitza-15.04.2.tar.xz",
-            "sha256": "117mw7c74vxh6mp76lxw1jc231b2zvif8d721dl5nshggkxhmf9j"
+            "url": "stable/applications/15.04.3/src/analitza-15.04.3.tar.xz",
+            "name": "analitza-15.04.3.tar.xz",
+            "sha256": "0ljydfchs0928damms87k5v049w9g021k42y1a000z3z09154rm2"
         },
         "buildInputs": [
             "ecm",
@@ -131,11 +131,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kfourinline-15.04.2",
+        "name": "kfourinline-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kfourinline-15.04.2.tar.xz",
-            "name": "kfourinline-15.04.2.tar.xz",
-            "sha256": "1r53xqvgsvy1las85jccya2xxfk43bwzbzr6lp2vny1624g3vhdc"
+            "url": "stable/applications/15.04.3/src/kfourinline-15.04.3.tar.xz",
+            "name": "kfourinline-15.04.3.tar.xz",
+            "sha256": "07rxjp7i9nhgy57zrh21qmc8352b915ykny6jsds80jrc2fl8hbs"
         },
         "buildInputs": [
             "ecm",
@@ -172,11 +172,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "juk-15.04.2",
+        "name": "juk-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/juk-15.04.2.tar.xz",
-            "name": "juk-15.04.2.tar.xz",
-            "sha256": "08lwi7yakry6cwrr0hxmrb9h2nm5xkx39bwfsphrd4vkyfd94awp"
+            "url": "stable/applications/15.04.3/src/juk-15.04.3.tar.xz",
+            "name": "juk-15.04.3.tar.xz",
+            "sha256": "1zdax89bzpmxs6yi196ybd805y9k6p7cgnnn9c7kba35zn96wj91"
         },
         "buildInputs": [
             "kde4",
@@ -191,11 +191,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-id-15.04.2",
+        "name": "kde-l10n-id-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-id-15.04.2.tar.xz",
-            "name": "kde-l10n-id-15.04.2.tar.xz",
-            "sha256": "1vadznjjy32brc76d2wzq31xf69dq2fxipg8rhvjh2f8cy068blf"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-id-15.04.3.tar.xz",
+            "name": "kde-l10n-id-15.04.3.tar.xz",
+            "sha256": "1rhn68s7zxaifm92i33ik99hc51p242hpqr4d0pdsgwnjbp2n76w"
         },
         "buildInputs": [
             "ecm",
@@ -212,11 +212,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-wallpapers-15.04.2",
+        "name": "kde-wallpapers-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-wallpapers-15.04.2.tar.xz",
-            "name": "kde-wallpapers-15.04.2.tar.xz",
-            "sha256": "1qcj8qdryqsqv430bmzv0hir7gbqbfw9sc3x7i4692h8cwvzkw5d"
+            "url": "stable/applications/15.04.3/src/kde-wallpapers-15.04.3.tar.xz",
+            "name": "kde-wallpapers-15.04.3.tar.xz",
+            "sha256": "1s2kgxx97jvl2xsnpz7cqzpg22j1mvybbvv793gpa8awsfsvhddw"
         },
         "buildInputs": [
             "kde4"
@@ -229,11 +229,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "libkipi-15.04.2",
+        "name": "libkipi-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/libkipi-15.04.2.tar.xz",
-            "name": "libkipi-15.04.2.tar.xz",
-            "sha256": "1fn671kjmin20bgi6h34fvcn3811ms34i9xbpxc3vv2s4sgn2v72"
+            "url": "stable/applications/15.04.3/src/libkipi-15.04.3.tar.xz",
+            "name": "libkipi-15.04.3.tar.xz",
+            "sha256": "05ryh1lkghlkn7877k5nspmrny1ijx0vgwimv4bmlc6faifpgfjx"
         },
         "buildInputs": [
             "kde4"
@@ -246,11 +246,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "artikulate-15.04.2",
+        "name": "artikulate-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/artikulate-15.04.2.tar.xz",
-            "name": "artikulate-15.04.2.tar.xz",
-            "sha256": "1hi57rl5ibs28l5w3gwciv9yi9gw7q22say8w5b34b5kjw0cyg2v"
+            "url": "stable/applications/15.04.3/src/artikulate-15.04.3.tar.xz",
+            "name": "artikulate-15.04.3.tar.xz",
+            "sha256": "17nmlh58vxlidgw2g060kvpscch14813zcpzhdykq0mr3293a05z"
         },
         "buildInputs": [
             "kde4",
@@ -265,11 +265,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-it-15.04.2",
+        "name": "kde-l10n-it-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-it-15.04.2.tar.xz",
-            "name": "kde-l10n-it-15.04.2.tar.xz",
-            "sha256": "156j8dj9c44j6mbqka3d0rpkdp2wg5hj7l1kzd2lb0ybvk7vr0r0"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-it-15.04.3.tar.xz",
+            "name": "kde-l10n-it-15.04.3.tar.xz",
+            "sha256": "1azijn9zz650r899d1ybvlj0qmiwgsyg9m5qd7iln0hxa01fw89i"
         },
         "buildInputs": [
             "ecm",
@@ -286,11 +286,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-da-15.04.2",
+        "name": "kde-l10n-da-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-da-15.04.2.tar.xz",
-            "name": "kde-l10n-da-15.04.2.tar.xz",
-            "sha256": "1np194cir3wh9sm8pqr4s3sx3k8p4rdndvpx7vgw63jlazrw4rlj"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-da-15.04.3.tar.xz",
+            "name": "kde-l10n-da-15.04.3.tar.xz",
+            "sha256": "182dyyx7knny4rs19aiwxd19c355z2fm93psck0ja4rgwhs1qxr3"
         },
         "buildInputs": [
             "ecm",
@@ -307,11 +307,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-km-15.04.2",
+        "name": "kde-l10n-km-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-km-15.04.2.tar.xz",
-            "name": "kde-l10n-km-15.04.2.tar.xz",
-            "sha256": "1bs10bgnzqwj9adq6xl1y534br74hcvickf2ylw27wqgszwzvd18"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-km-15.04.3.tar.xz",
+            "name": "kde-l10n-km-15.04.3.tar.xz",
+            "sha256": "0f9wkks5mrh9ap8810d9k46dbhqvhn6g8wwfb777iss18jx6g8jd"
         },
         "buildInputs": [
             "ecm",
@@ -328,11 +328,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-ca_valencia-15.04.2",
+        "name": "kde-l10n-ca_valencia-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ca@valencia-15.04.2.tar.xz",
-            "name": "kde-l10n-ca_valencia-15.04.2.tar.xz",
-            "sha256": "0cg2is4lzy9fxz37ciy3ddjd5z1i2ni8gg5pq7v7hz7fqa8bb3w6"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ca@valencia-15.04.3.tar.xz",
+            "name": "kde-l10n-ca_valencia-15.04.3.tar.xz",
+            "sha256": "0h21x45hbm0iahf3c8qjfc9cdx5z36js40bqr5klzm7xvwpc596p"
         },
         "buildInputs": [
             "ecm",
@@ -349,11 +349,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-wa-15.04.2",
+        "name": "kde-l10n-wa-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-wa-15.04.2.tar.xz",
-            "name": "kde-l10n-wa-15.04.2.tar.xz",
-            "sha256": "10vzzwhgnxx5rj7h99b63kgpak2mkmdjr7381w7q1iwq816qxxy8"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-wa-15.04.3.tar.xz",
+            "name": "kde-l10n-wa-15.04.3.tar.xz",
+            "sha256": "10lidmp54db9f8f3xzf2samvi6s0mck0azhyyiz17amcrfj28nkp"
         },
         "buildInputs": [
             "ecm",
@@ -370,11 +370,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "libkomparediff2-15.04.2",
+        "name": "libkomparediff2-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/libkomparediff2-15.04.2.tar.xz",
-            "name": "libkomparediff2-15.04.2.tar.xz",
-            "sha256": "0qj9ih96v3r2l9nq68z4y175nhizl8rmd4nypswy5lzi7k8m9q99"
+            "url": "stable/applications/15.04.3/src/libkomparediff2-15.04.3.tar.xz",
+            "name": "libkomparediff2-15.04.3.tar.xz",
+            "sha256": "1i9y5qjxcg5yl5q8ldczy3cssn3rw9p04wcjqx347faqv3dy4nxf"
         },
         "buildInputs": [
             "ecm",
@@ -398,11 +398,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kwalletmanager-15.04.2",
+        "name": "kwalletmanager-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kwalletmanager-15.04.2.tar.xz",
-            "name": "kwalletmanager-15.04.2.tar.xz",
-            "sha256": "0wch3bm2c7xjbrjvn1ka3iyawi6h6snfab7dzp6na8n4ck7y9s4p"
+            "url": "stable/applications/15.04.3/src/kwalletmanager-15.04.3.tar.xz",
+            "name": "kwalletmanager-15.04.3.tar.xz",
+            "sha256": "1h5c4vjspzw29j0xqlwaxpdk7k3n0zlkjram25hy3c3vs40hihil"
         },
         "buildInputs": [
             "kde4"
@@ -415,11 +415,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ktp-auth-handler-15.04.2",
+        "name": "ktp-auth-handler-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ktp-auth-handler-15.04.2.tar.xz",
-            "name": "ktp-auth-handler-15.04.2.tar.xz",
-            "sha256": "1fp1yks0k2mfn9kqfsy5y27ibpfjvmlx4h1ah6sy5mmqvh96s04h"
+            "url": "stable/applications/15.04.3/src/ktp-auth-handler-15.04.3.tar.xz",
+            "name": "ktp-auth-handler-15.04.3.tar.xz",
+            "sha256": "0782lzh3ykk50cpdrh5djvxlgsp88hirbhivdpnwp8bcck3iiha9"
         },
         "buildInputs": [
             "accountsqt5",
@@ -450,11 +450,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-ga-15.04.2",
+        "name": "kde-l10n-ga-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ga-15.04.2.tar.xz",
-            "name": "kde-l10n-ga-15.04.2.tar.xz",
-            "sha256": "0wn2q9vbaqkhb60q7x70b2j3yh8k21y4isk5js2ardzz1gpzmrxk"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ga-15.04.3.tar.xz",
+            "name": "kde-l10n-ga-15.04.3.tar.xz",
+            "sha256": "1h83illxc04i0m116rxy8x23s22fksmxb9kaimn3bglbcd5jgi95"
         },
         "buildInputs": [
             "ecm",
@@ -471,11 +471,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ksnapshot-15.04.2",
+        "name": "ksnapshot-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ksnapshot-15.04.2.tar.xz",
-            "name": "ksnapshot-15.04.2.tar.xz",
-            "sha256": "1zpc9pasw5r68rmkaz8la75hbp9na4114j7w0a9fcgjlvllaij57"
+            "url": "stable/applications/15.04.3/src/ksnapshot-15.04.3.tar.xz",
+            "name": "ksnapshot-15.04.3.tar.xz",
+            "sha256": "00mj98bdbldw9klfw7qd332migh0gfzdy7pq89am8n2rbp84a0jw"
         },
         "buildInputs": [
             "kde4",
@@ -489,11 +489,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kreversi-15.04.2",
+        "name": "kreversi-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kreversi-15.04.2.tar.xz",
-            "name": "kreversi-15.04.2.tar.xz",
-            "sha256": "0qzwk8yj5dk01n6w1jmrqncy48cpg2xriqqiachx4gh878f2y4cs"
+            "url": "stable/applications/15.04.3/src/kreversi-15.04.3.tar.xz",
+            "name": "kreversi-15.04.3.tar.xz",
+            "sha256": "0nhg2jz0y79yhq68ax10l06sh1dkwn1mjh2qmkhsc6ks80wfq0lp"
         },
         "buildInputs": [
             "kde4",
@@ -508,11 +508,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kmix-15.04.2",
+        "name": "kmix-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kmix-15.04.2.tar.xz",
-            "name": "kmix-15.04.2.tar.xz",
-            "sha256": "0g601dmd7f0j70y50xkw4y8vpb5xgjz938m266sklkkwjdcf2fg9"
+            "url": "stable/applications/15.04.3/src/kmix-15.04.3.tar.xz",
+            "name": "kmix-15.04.3.tar.xz",
+            "sha256": "1sjh9a4xp981h91ydlxbsxhz0sxdd5ajwn5zn39r3hnfnxh8vx9l"
         },
         "buildInputs": [
             "alsa",
@@ -540,11 +540,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "signon-kwallet-extension-15.04.2",
+        "name": "signon-kwallet-extension-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/signon-kwallet-extension-15.04.2.tar.xz",
-            "name": "signon-kwallet-extension-15.04.2.tar.xz",
-            "sha256": "0bp1j0hc0a7lwmzi97hymd83vb5x8ks4m4a1k3h2h86wq3gnnfyj"
+            "url": "stable/applications/15.04.3/src/signon-kwallet-extension-15.04.3.tar.xz",
+            "name": "signon-kwallet-extension-15.04.3.tar.xz",
+            "sha256": "07waf72xwgpdska42ydi9pifs2d2l7idaf0jwamrqrwf5s19vdf0"
         },
         "buildInputs": [
             "ecm",
@@ -564,11 +564,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-es-15.04.2",
+        "name": "kde-l10n-es-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-es-15.04.2.tar.xz",
-            "name": "kde-l10n-es-15.04.2.tar.xz",
-            "sha256": "1clrjb4wgwx8ijykrdylfgscwimkawpaq13a32m6dka4ipk58399"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-es-15.04.3.tar.xz",
+            "name": "kde-l10n-es-15.04.3.tar.xz",
+            "sha256": "0nqz9lal9f2s0ryydyy0xxh53q2pxjmpbhkad1l9107shjsy9ry7"
         },
         "buildInputs": [
             "ecm",
@@ -585,11 +585,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kompare-15.04.2",
+        "name": "kompare-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kompare-15.04.2.tar.xz",
-            "name": "kompare-15.04.2.tar.xz",
-            "sha256": "0c3kyfqz6mp4mj0ryhjgqwp2x93bj0nsbgp2vf9rgvkcdvhd6fqk"
+            "url": "stable/applications/15.04.3/src/kompare-15.04.3.tar.xz",
+            "name": "kompare-15.04.3.tar.xz",
+            "sha256": "1dl0sddskmxm2h6qshgmv06glk740ih0ldw6d9vvlk9a4mnpk3yw"
         },
         "buildInputs": [
             "ecm",
@@ -617,11 +617,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdiamond-15.04.2",
+        "name": "kdiamond-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdiamond-15.04.2.tar.xz",
-            "name": "kdiamond-15.04.2.tar.xz",
-            "sha256": "1k0w2d0ysvwhvmsn0smi1s5dwrcwdnqfzny5dgblc3p62xw1wm1j"
+            "url": "stable/applications/15.04.3/src/kdiamond-15.04.3.tar.xz",
+            "name": "kdiamond-15.04.3.tar.xz",
+            "sha256": "066bf4vjcfnidj7yw04g0wdz09wqskvbjskljwndgx178bwb1zn1"
         },
         "buildInputs": [
             "ecm",
@@ -652,11 +652,11 @@
             "qt5widgets",
             "signonqt5"
         ],
-        "name": "kaccounts-integration-15.04.2",
+        "name": "kaccounts-integration-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kaccounts-integration-15.04.2.tar.xz",
-            "name": "kaccounts-integration-15.04.2.tar.xz",
-            "sha256": "1586bv0h98rqbigrcsqx51nvzxk0zzxvqcxgncnjxknn4rhdkk86"
+            "url": "stable/applications/15.04.3/src/kaccounts-integration-15.04.3.tar.xz",
+            "name": "kaccounts-integration-15.04.3.tar.xz",
+            "sha256": "1rx957mbx8fjy0i9al3axpwsqkydgzp2ksqa0lisjcp59sw93zsf"
         },
         "buildInputs": [
             "accountsqt5",
@@ -686,11 +686,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-gl-15.04.2",
+        "name": "kde-l10n-gl-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-gl-15.04.2.tar.xz",
-            "name": "kde-l10n-gl-15.04.2.tar.xz",
-            "sha256": "1mnyc9ms863s3x6l85kfglz7q8h9faqgkv7vcf8qfjs1vs6qbh6x"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-gl-15.04.3.tar.xz",
+            "name": "kde-l10n-gl-15.04.3.tar.xz",
+            "sha256": "09j27a65nbk4l96yjhfpk409va7vk5cq7s77h6wpy8pa1vdgl944"
         },
         "buildInputs": [
             "ecm",
@@ -707,11 +707,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kwordquiz-15.04.2",
+        "name": "kwordquiz-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kwordquiz-15.04.2.tar.xz",
-            "name": "kwordquiz-15.04.2.tar.xz",
-            "sha256": "0irs4nchd0fwxvv4c9wxww6vbi97ffz4rihwg1p5jipcad2l13ch"
+            "url": "stable/applications/15.04.3/src/kwordquiz-15.04.3.tar.xz",
+            "name": "kwordquiz-15.04.3.tar.xz",
+            "sha256": "00r977c2pi7v512j1h7lr3vs4mxqz6cvfz94a5nicp7khnqy9ysq"
         },
         "buildInputs": [
             "ecm",
@@ -747,11 +747,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kigo-15.04.2",
+        "name": "kigo-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kigo-15.04.2.tar.xz",
-            "name": "kigo-15.04.2.tar.xz",
-            "sha256": "00hhdhv905l1y79i2vsz65r7vqbz2vlzl57y4sdcjpk65ababcrc"
+            "url": "stable/applications/15.04.3/src/kigo-15.04.3.tar.xz",
+            "name": "kigo-15.04.3.tar.xz",
+            "sha256": "0zhs5lhmd44kzr50ccb9f0dbdpnb2g2cgc7fwr4jsccfd5yz6974"
         },
         "buildInputs": [
             "kde4",
@@ -765,11 +765,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ktp-desktop-applets-15.04.2",
+        "name": "ktp-desktop-applets-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ktp-desktop-applets-15.04.2.tar.xz",
-            "name": "ktp-desktop-applets-15.04.2.tar.xz",
-            "sha256": "00jlhfm7sbg73y9zbkjicz7wr8740qi3ifm493m2f37cndljllhn"
+            "url": "stable/applications/15.04.3/src/ktp-desktop-applets-15.04.3.tar.xz",
+            "name": "ktp-desktop-applets-15.04.3.tar.xz",
+            "sha256": "038d7wlgrzwyyldxb1iq2yha8plkmxwvmi7wf6gs8q1nwy7dfwvw"
         },
         "buildInputs": [
             "ecm",
@@ -787,11 +787,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kolourpaint-15.04.2",
+        "name": "kolourpaint-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kolourpaint-15.04.2.tar.xz",
-            "name": "kolourpaint-15.04.2.tar.xz",
-            "sha256": "04rly3wrh8hibaps90mphvbb35d9c308czfmnhqxyk6np4bfvrk6"
+            "url": "stable/applications/15.04.3/src/kolourpaint-15.04.3.tar.xz",
+            "name": "kolourpaint-15.04.3.tar.xz",
+            "sha256": "0lyik49wpa9wngj7y2yraklkl2fl1g7jnbyjzcircczaq9s644fk"
         },
         "buildInputs": [
             "kde4",
@@ -808,11 +808,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kapptemplate-15.04.2",
+        "name": "kapptemplate-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kapptemplate-15.04.2.tar.xz",
-            "name": "kapptemplate-15.04.2.tar.xz",
-            "sha256": "092wysas8zfhz8af4fvizbn148c4jhj4vk2cy6z94qih8hnry294"
+            "url": "stable/applications/15.04.3/src/kapptemplate-15.04.3.tar.xz",
+            "name": "kapptemplate-15.04.3.tar.xz",
+            "sha256": "0hs063g2khrghrglwy7r1amrj46xr39dlh1gnbbfpadc5fmk2x6s"
         },
         "buildInputs": [
             "ecm",
@@ -842,11 +842,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdegraphics-thumbnailers-15.04.2",
+        "name": "kdegraphics-thumbnailers-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdegraphics-thumbnailers-15.04.2.tar.xz",
-            "name": "kdegraphics-thumbnailers-15.04.2.tar.xz",
-            "sha256": "15w0bli83ykqdxv37zpmdgf66gkqmb3gf1wxqfhw241pfcqbsxc3"
+            "url": "stable/applications/15.04.3/src/kdegraphics-thumbnailers-15.04.3.tar.xz",
+            "name": "kdegraphics-thumbnailers-15.04.3.tar.xz",
+            "sha256": "07cc7mp1c59hccn30670yzvmbr14f78whyxz5dwcwxpbcgaklq1a"
         },
         "buildInputs": [
             "kdcraw",
@@ -861,11 +861,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-pt_BR-15.04.2",
+        "name": "kde-l10n-pt_BR-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-pt_BR-15.04.2.tar.xz",
-            "name": "kde-l10n-pt_BR-15.04.2.tar.xz",
-            "sha256": "0xfcid4xqcjnlq83ql4rlhb8swn2y9ixzfyx3zbdwjjlkaaqmnr4"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-pt_BR-15.04.3.tar.xz",
+            "name": "kde-l10n-pt_BR-15.04.3.tar.xz",
+            "sha256": "0yyfk4whymblp4gy0zxvyri254x898lmg78n07amzddxz22dml5f"
         },
         "buildInputs": [
             "ecm",
@@ -882,11 +882,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ksystemlog-15.04.2",
+        "name": "ksystemlog-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ksystemlog-15.04.2.tar.xz",
-            "name": "ksystemlog-15.04.2.tar.xz",
-            "sha256": "00il9r3n5756n0n6k515fdm9z7mfa1gd1n6kac4vr7yldvll9wh1"
+            "url": "stable/applications/15.04.3/src/ksystemlog-15.04.3.tar.xz",
+            "name": "ksystemlog-15.04.3.tar.xz",
+            "sha256": "117xkjgqrivyjyzh4jz3z5xvcj2l1f3x665kgc3rrw4y4zpwwcnm"
         },
         "buildInputs": [
             "kde4"
@@ -899,11 +899,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kuser-15.04.2",
+        "name": "kuser-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kuser-15.04.2.tar.xz",
-            "name": "kuser-15.04.2.tar.xz",
-            "sha256": "0b2q616nzqjb0q9as71x2njdjlcd3576rkwnyv5acjgb5bq7wgg4"
+            "url": "stable/applications/15.04.3/src/kuser-15.04.3.tar.xz",
+            "name": "kuser-15.04.3.tar.xz",
+            "sha256": "1q1f9l3lwcszpfiyfjaf7cjbw325cfjpbkc6rfvl3jp157w5nr4m"
         },
         "buildInputs": [
             "kde4",
@@ -917,11 +917,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "libksane-15.04.2",
+        "name": "libksane-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/libksane-15.04.2.tar.xz",
-            "name": "libksane-15.04.2.tar.xz",
-            "sha256": "0s2jmp1596qnjff2fqmlmg3qzfhf2wjfvazkrrndfr6dzn4sz72s"
+            "url": "stable/applications/15.04.3/src/libksane-15.04.3.tar.xz",
+            "name": "libksane-15.04.3.tar.xz",
+            "sha256": "0i5ynf3g2i6vlhzl5cga8imprblmdz418cfkznwkw1yj35g236c3"
         },
         "buildInputs": []
     },
@@ -932,11 +932,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "knavalbattle-15.04.2",
+        "name": "knavalbattle-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/knavalbattle-15.04.2.tar.xz",
-            "name": "knavalbattle-15.04.2.tar.xz",
-            "sha256": "15pmbj230rhiyxx2cz1wsx29zp0p4my54i8099yv943w8wswwy8x"
+            "url": "stable/applications/15.04.3/src/knavalbattle-15.04.3.tar.xz",
+            "name": "knavalbattle-15.04.3.tar.xz",
+            "sha256": "10nri1fvi057cvb6qwlhqyv9x1rjavsdhhipgrdhqpzmm0y84sd1"
         },
         "buildInputs": [
             "kde4",
@@ -950,11 +950,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kaccessible-15.04.2",
+        "name": "kaccessible-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kaccessible-15.04.2.tar.xz",
-            "name": "kaccessible-15.04.2.tar.xz",
-            "sha256": "1aa4c5r0bm0azm8dhkvnrk87669vp397xzz0v0d3ih7ffmh72il1"
+            "url": "stable/applications/15.04.3/src/kaccessible-15.04.3.tar.xz",
+            "name": "kaccessible-15.04.3.tar.xz",
+            "sha256": "1a413cv32xsqx9aalkrqh3ybw6phvh4ckgzr15kxca3lc78zw00s"
         },
         "buildInputs": [
             "kde4",
@@ -970,11 +970,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "knetwalk-15.04.2",
+        "name": "knetwalk-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/knetwalk-15.04.2.tar.xz",
-            "name": "knetwalk-15.04.2.tar.xz",
-            "sha256": "0j2zkh87wd2xhd0aaad40cjq1na4kg18y0bnpiqdgwgmvvss18cn"
+            "url": "stable/applications/15.04.3/src/knetwalk-15.04.3.tar.xz",
+            "name": "knetwalk-15.04.3.tar.xz",
+            "sha256": "1bmn1avq2xpvrvaryzl25izdh7xn1c5pdxll51kj7l017590pa43"
         },
         "buildInputs": [
             "ecm",
@@ -1008,11 +1008,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdewebdev-15.04.2",
+        "name": "kdewebdev-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdewebdev-15.04.2.tar.xz",
-            "name": "kdewebdev-15.04.2.tar.xz",
-            "sha256": "0cq2zyi4j6z70ghy8x1hhi3bgph6ql2k71vllfc37gb5h8gqpfh4"
+            "url": "stable/applications/15.04.3/src/kdewebdev-15.04.3.tar.xz",
+            "name": "kdewebdev-15.04.3.tar.xz",
+            "sha256": "05wxb6swr3dpjw8vvsz9ylznx2rcjg2glzj9blnckkd7wl35r3q1"
         },
         "buildInputs": [
             "kde4",
@@ -1029,11 +1029,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kget-15.04.2",
+        "name": "kget-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kget-15.04.2.tar.xz",
-            "name": "kget-15.04.2.tar.xz",
-            "sha256": "0cc7rva5yig01kfih1im0ncf0jk7hq1pwyqr9486n024161fc1n0"
+            "url": "stable/applications/15.04.3/src/kget-15.04.3.tar.xz",
+            "name": "kget-15.04.3.tar.xz",
+            "sha256": "17wlqx55r3yrnl149rydmmdksll9wg40dnqqq45knv2gx9mdxlwg"
         },
         "buildInputs": [
             "boost",
@@ -1057,11 +1057,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kalzium-15.04.2",
+        "name": "kalzium-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kalzium-15.04.2.tar.xz",
-            "name": "kalzium-15.04.2.tar.xz",
-            "sha256": "1mcfw1l0qqzr212ysgppva8s4dn3dfhzqh712fc3kd416azz985x"
+            "url": "stable/applications/15.04.3/src/kalzium-15.04.3.tar.xz",
+            "name": "kalzium-15.04.3.tar.xz",
+            "sha256": "0hdffpyhg8dk4hhnkg0isizrdz65wbgndr6zja733p7n3gsrias6"
         },
         "buildInputs": [
             "kde4",
@@ -1075,11 +1075,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "marble-15.04.2",
+        "name": "marble-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/marble-15.04.2.tar.xz",
-            "name": "marble-15.04.2.tar.xz",
-            "sha256": "1jwh0vqdzj7r039pg84rh6jk4dznyanirv286v8anf23s3mjwf6a"
+            "url": "stable/applications/15.04.3/src/marble-15.04.3.tar.xz",
+            "name": "marble-15.04.3.tar.xz",
+            "sha256": "1fjbfarf8zp1d7ailvx017qb28sjk318r2jdb7pz5x8x4yl6b82s"
         },
         "buildInputs": [
             "kde4",
@@ -1121,11 +1121,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kig-15.04.2",
+        "name": "kig-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kig-15.04.2.tar.xz",
-            "name": "kig-15.04.2.tar.xz",
-            "sha256": "19wv15ji7f0m0zzymw11g28sa5n1kyhpnqbcgpfkaqxynv2fn4cv"
+            "url": "stable/applications/15.04.3/src/kig-15.04.3.tar.xz",
+            "name": "kig-15.04.3.tar.xz",
+            "sha256": "1k19pfp8b4k3spfcs70fgjhk78jkhbb7bfilyzf0ahzrjcpgp8c8"
         },
         "buildInputs": [
             "boostpython",
@@ -1153,11 +1153,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kiten-15.04.2",
+        "name": "kiten-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kiten-15.04.2.tar.xz",
-            "name": "kiten-15.04.2.tar.xz",
-            "sha256": "0yr7i1k3qpifwy2a58b899nfglkyf8gdrbakhdd9j2rlyyk3hya3"
+            "url": "stable/applications/15.04.3/src/kiten-15.04.3.tar.xz",
+            "name": "kiten-15.04.3.tar.xz",
+            "sha256": "0f4kmm01ikn54dy2z2lnv0kdqx7rn77mnfrwv25470h6ar4w89w1"
         },
         "buildInputs": [
             "ecm",
@@ -1183,11 +1183,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ktp-contact-list-15.04.2",
+        "name": "ktp-contact-list-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ktp-contact-list-15.04.2.tar.xz",
-            "name": "ktp-contact-list-15.04.2.tar.xz",
-            "sha256": "10zjv2imp03p2wh9vj217skx5fmmscb5l8nwlcv7mlh0b74mlx5n"
+            "url": "stable/applications/15.04.3/src/ktp-contact-list-15.04.3.tar.xz",
+            "name": "ktp-contact-list-15.04.3.tar.xz",
+            "sha256": "02vvp0i2bi3j7gk037pqzfhn44khln0wddwbql3kq49v4q2i5s7d"
         },
         "buildInputs": [
             "ecm",
@@ -1216,11 +1216,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-pt-15.04.2",
+        "name": "kde-l10n-pt-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-pt-15.04.2.tar.xz",
-            "name": "kde-l10n-pt-15.04.2.tar.xz",
-            "sha256": "0bkdm2skvkaqspfq7rsqwahm6h17j46fd97wkqrkmdswgnbn14fw"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-pt-15.04.3.tar.xz",
+            "name": "kde-l10n-pt-15.04.3.tar.xz",
+            "sha256": "0gy7y8xns0kxl7n8wa073xypnyvdyq56gz1ahj0k8mpadfak6vk0"
         },
         "buildInputs": [
             "ecm",
@@ -1237,11 +1237,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-fr-15.04.2",
+        "name": "kde-l10n-fr-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-fr-15.04.2.tar.xz",
-            "name": "kde-l10n-fr-15.04.2.tar.xz",
-            "sha256": "1rgy0qw313wk39f8lxb812kfh7i0b3fqgdz1dv22mpd143ywz0xr"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-fr-15.04.3.tar.xz",
+            "name": "kde-l10n-fr-15.04.3.tar.xz",
+            "sha256": "0z1ga48y5zih85cdmb165kyxm9z7ydhxykj4ci40ckdqiwzjhkag"
         },
         "buildInputs": [
             "ecm",
@@ -1258,11 +1258,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kmouth-15.04.2",
+        "name": "kmouth-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kmouth-15.04.2.tar.xz",
-            "name": "kmouth-15.04.2.tar.xz",
-            "sha256": "1hjn1fb5c7a5yw0yzsb7v3wdgq1wyqj7zs7jw71gsgkq3sy0as47"
+            "url": "stable/applications/15.04.3/src/kmouth-15.04.3.tar.xz",
+            "name": "kmouth-15.04.3.tar.xz",
+            "sha256": "1ak1nvc0y0yi1gd9kdhhjw64j6fkf7bw11nnxxhpq9gvgmyyfm7r"
         },
         "buildInputs": [
             "kde4"
@@ -1275,11 +1275,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "filelight-15.04.2",
+        "name": "filelight-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/filelight-15.04.2.tar.xz",
-            "name": "filelight-15.04.2.tar.xz",
-            "sha256": "0ynrirvrisswaia9894wd4b6f97h04bd3w9zlv28nc9ck1p2d5zv"
+            "url": "stable/applications/15.04.3/src/filelight-15.04.3.tar.xz",
+            "name": "filelight-15.04.3.tar.xz",
+            "sha256": "05ak727bkij70zc5lr458snq346ndc32r5icjz6jgmyxqxsdk17d"
         },
         "buildInputs": [
             "ecm",
@@ -1306,11 +1306,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdesdk-kioslaves-15.04.2",
+        "name": "kdesdk-kioslaves-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdesdk-kioslaves-15.04.2.tar.xz",
-            "name": "kdesdk-kioslaves-15.04.2.tar.xz",
-            "sha256": "0fpmn0cv95jicxq6zbxivarlyhmjbi3a2brnz9xb4jznx06c2cz8"
+            "url": "stable/applications/15.04.3/src/kdesdk-kioslaves-15.04.3.tar.xz",
+            "name": "kdesdk-kioslaves-15.04.3.tar.xz",
+            "sha256": "0f5cjlssylgr42bnrsdaw64xl17zr0sl989digqg47hrd7np1zf7"
         },
         "buildInputs": [
             "kde4",
@@ -1325,11 +1325,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-baseapps-15.04.2",
+        "name": "kde-baseapps-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-baseapps-15.04.2.tar.xz",
-            "name": "kde-baseapps-15.04.2.tar.xz",
-            "sha256": "0yqg1z6c9ma8cfhpb21jgk5hcpg0dscm89sy5jxwflg1n355jkhv"
+            "url": "stable/applications/15.04.3/src/kde-baseapps-15.04.3.tar.xz",
+            "name": "kde-baseapps-15.04.3.tar.xz",
+            "sha256": "1inkzj984qy0ab4ks5m002phs6a00cjfn25gri9jglcqn3jzy85a"
         },
         "buildInputs": [
             "baloo",
@@ -1350,11 +1350,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ksirk-15.04.2",
+        "name": "ksirk-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ksirk-15.04.2.tar.xz",
-            "name": "ksirk-15.04.2.tar.xz",
-            "sha256": "0w6j3z8vzj3wnnwkpm2gv533jkjwdx8f2m6hnqa3ckzashmlqx7w"
+            "url": "stable/applications/15.04.3/src/ksirk-15.04.3.tar.xz",
+            "name": "ksirk-15.04.3.tar.xz",
+            "sha256": "1km9423k6hdkb58and8sqz0wwyab8k6k4jg534xppjph7x8a3rm0"
         },
         "buildInputs": [
             "kde4",
@@ -1369,11 +1369,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "killbots-15.04.2",
+        "name": "killbots-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/killbots-15.04.2.tar.xz",
-            "name": "killbots-15.04.2.tar.xz",
-            "sha256": "1xr7857fi5l5h6d6fsyqsb803h29gprfsxz4h73scnnn70bkkm9q"
+            "url": "stable/applications/15.04.3/src/killbots-15.04.3.tar.xz",
+            "name": "killbots-15.04.3.tar.xz",
+            "sha256": "10pvgwmc2s8cz6cz7lr3gracia654qzwjh3b01z3sha7gjfd5ly2"
         },
         "buildInputs": [
             "ecm",
@@ -1403,11 +1403,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kjumpingcube-15.04.2",
+        "name": "kjumpingcube-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kjumpingcube-15.04.2.tar.xz",
-            "name": "kjumpingcube-15.04.2.tar.xz",
-            "sha256": "04c0klbgsnp6brf8zml8sz6iyi9m7gidwpgdzrrnnhzwfpgaf9zc"
+            "url": "stable/applications/15.04.3/src/kjumpingcube-15.04.3.tar.xz",
+            "name": "kjumpingcube-15.04.3.tar.xz",
+            "sha256": "0ls4v7ip4vh5h9jn9966bwr00aic64psmwnp96j6zmvrlkmz5saf"
         },
         "buildInputs": [
             "ecm",
@@ -1444,11 +1444,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-sr-15.04.2",
+        "name": "kde-l10n-sr-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-sr-15.04.2.tar.xz",
-            "name": "kde-l10n-sr-15.04.2.tar.xz",
-            "sha256": "1pwwvj7s6ivmx6c5gh6dvfrvi5xp66b40fsnn04zwsp0iamxkdqi"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-sr-15.04.3.tar.xz",
+            "name": "kde-l10n-sr-15.04.3.tar.xz",
+            "sha256": "03mpd7cf4zh144jwl0lzv68jbl2805idx68a2zfy50jifbx9k8qa"
         },
         "buildInputs": [
             "ecm",
@@ -1465,11 +1465,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-et-15.04.2",
+        "name": "kde-l10n-et-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-et-15.04.2.tar.xz",
-            "name": "kde-l10n-et-15.04.2.tar.xz",
-            "sha256": "1w08blhf6adlj0yanfac2b3kk0ag3gbazjdywz9cf21ks6ni6bsn"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-et-15.04.3.tar.xz",
+            "name": "kde-l10n-et-15.04.3.tar.xz",
+            "sha256": "10jqj02dz1bklabrda8h0hd6gvfxhfxa7mfl7zdn142xz6qs1194"
         },
         "buildInputs": [
             "ecm",
@@ -1486,11 +1486,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kmag-15.04.2",
+        "name": "kmag-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kmag-15.04.2.tar.xz",
-            "name": "kmag-15.04.2.tar.xz",
-            "sha256": "1kbxhq9mfjxswds60pa6v1ixc8grn0m1f84da7s18ph5r1wdpkr3"
+            "url": "stable/applications/15.04.3/src/kmag-15.04.3.tar.xz",
+            "name": "kmag-15.04.3.tar.xz",
+            "sha256": "1k2jnqjm1ky6mgqlyz47c4n6ivqlnyva25siyrx466anzbjn5ffp"
         },
         "buildInputs": [
             "kde4",
@@ -1504,11 +1504,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdenetwork-strigi-analyzers-15.04.2",
+        "name": "kdenetwork-strigi-analyzers-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdenetwork-strigi-analyzers-15.04.2.tar.xz",
-            "name": "kdenetwork-strigi-analyzers-15.04.2.tar.xz",
-            "sha256": "13bc2a1m64k6iki12kpynf3f1wijxch8rg9nn7xc8rl3bjms8x9k"
+            "url": "stable/applications/15.04.3/src/kdenetwork-strigi-analyzers-15.04.3.tar.xz",
+            "name": "kdenetwork-strigi-analyzers-15.04.3.tar.xz",
+            "sha256": "04xikfhzdl56vkz9zsk1whcikwdwqbs72y9mam40wd9qr0pzfxcw"
         },
         "buildInputs": [
             "boost",
@@ -1523,11 +1523,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kcharselect-15.04.2",
+        "name": "kcharselect-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kcharselect-15.04.2.tar.xz",
-            "name": "kcharselect-15.04.2.tar.xz",
-            "sha256": "084qzv8x6262xsl5n4ynkm3zsqf2wdlj5gn4y9jql7in1b92w293"
+            "url": "stable/applications/15.04.3/src/kcharselect-15.04.3.tar.xz",
+            "name": "kcharselect-15.04.3.tar.xz",
+            "sha256": "12p85b7yplmm4v8v9znq0r4p8y3m2f088brdvlxgmb04x5158m9s"
         },
         "buildInputs": [
             "ecm",
@@ -1548,11 +1548,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdegraphics-strigi-analyzer-15.04.2",
+        "name": "kdegraphics-strigi-analyzer-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdegraphics-strigi-analyzer-15.04.2.tar.xz",
-            "name": "kdegraphics-strigi-analyzer-15.04.2.tar.xz",
-            "sha256": "1gf6n1bdhbizfgpbn1p81gzz09a028dadij7gn016vkfczjkl1k8"
+            "url": "stable/applications/15.04.3/src/kdegraphics-strigi-analyzer-15.04.3.tar.xz",
+            "name": "kdegraphics-strigi-analyzer-15.04.3.tar.xz",
+            "sha256": "1mya983vbkxa1q0lwn7gz0fc52y8cdkpadkvfnzal5kpbwvbh96r"
         },
         "buildInputs": [
             "kde4",
@@ -1571,11 +1571,11 @@
             "kf5configwidgets",
             "qt5gui"
         ],
-        "name": "libkmahjongg-15.04.2",
+        "name": "libkmahjongg-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/libkmahjongg-15.04.2.tar.xz",
-            "name": "libkmahjongg-15.04.2.tar.xz",
-            "sha256": "1xrdv1p5gjzg4cs35y2kmd49lwiinl1wqaw76y5lq3p303k7vvm1"
+            "url": "stable/applications/15.04.3/src/libkmahjongg-15.04.3.tar.xz",
+            "name": "libkmahjongg-15.04.3.tar.xz",
+            "sha256": "0b0zrb3bbkphqq96gc8y5xn28g19l5c60pr0s1h5rmm70021ixk6"
         },
         "buildInputs": [
             "ecm",
@@ -1600,11 +1600,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ktp-kded-module-15.04.2",
+        "name": "ktp-kded-module-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ktp-kded-module-15.04.2.tar.xz",
-            "name": "ktp-kded-module-15.04.2.tar.xz",
-            "sha256": "1a7jfa8lqb24dpckiix13lhdgb18rv4v9ib908jqqqnk8rphac5n"
+            "url": "stable/applications/15.04.3/src/ktp-kded-module-15.04.3.tar.xz",
+            "name": "ktp-kded-module-15.04.3.tar.xz",
+            "sha256": "1zr0h1yzn9m4b4xld8lp5dx4xx6phw6fnp0z3i27mjbr0a1n6qa1"
         },
         "buildInputs": [
             "ecm",
@@ -1633,11 +1633,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ktuberling-15.04.2",
+        "name": "ktuberling-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ktuberling-15.04.2.tar.xz",
-            "name": "ktuberling-15.04.2.tar.xz",
-            "sha256": "1kf2gwxwh0v9lai5lwbgd9d8d27d9p6vxj6i4291w5wv9plld9my"
+            "url": "stable/applications/15.04.3/src/ktuberling-15.04.3.tar.xz",
+            "name": "ktuberling-15.04.3.tar.xz",
+            "sha256": "0alxdrjzalngg2y1fyzcsgglsqjk4gcihkndmr25s0c663fzdrrn"
         },
         "buildInputs": [
             "kde4",
@@ -1651,11 +1651,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kcron-15.04.2",
+        "name": "kcron-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kcron-15.04.2.tar.xz",
-            "name": "kcron-15.04.2.tar.xz",
-            "sha256": "0fszrwgsib82glm0hi2iq11b8z3w8j14vp8hqfxp8ccggk1a0xaf"
+            "url": "stable/applications/15.04.3/src/kcron-15.04.3.tar.xz",
+            "name": "kcron-15.04.3.tar.xz",
+            "sha256": "0kwhzfmlgcj3fbi9kj08lnikz37z3gpywfcx940d4gw4n9hg26av"
         },
         "buildInputs": [
             "ecm",
@@ -1678,11 +1678,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-nl-15.04.2",
+        "name": "kde-l10n-nl-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-nl-15.04.2.tar.xz",
-            "name": "kde-l10n-nl-15.04.2.tar.xz",
-            "sha256": "0l4frxfrpii14iisjnnpzz0yja6mb6qlz05v1wn6sqqqvv8snq17"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-nl-15.04.3.tar.xz",
+            "name": "kde-l10n-nl-15.04.3.tar.xz",
+            "sha256": "0id9rl05jp3ff6jd22qnfzs40dlnijsr2mkfwzvnf08h3nk6c8id"
         },
         "buildInputs": [
             "ecm",
@@ -1699,11 +1699,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "parley-15.04.2",
+        "name": "parley-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/parley-15.04.2.tar.xz",
-            "name": "parley-15.04.2.tar.xz",
-            "sha256": "1xzjpm8vfxp7g5497n95r3x4pbs6s29jaf6rlkb3lm72x7yml7fc"
+            "url": "stable/applications/15.04.3/src/parley-15.04.3.tar.xz",
+            "name": "parley-15.04.3.tar.xz",
+            "sha256": "1lvqih1vav234jvf18z00kdd6hn8vq7pm9659bchn02j5ic110d3"
         },
         "buildInputs": [
             "ecm",
@@ -1744,11 +1744,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kgoldrunner-15.04.2",
+        "name": "kgoldrunner-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kgoldrunner-15.04.2.tar.xz",
-            "name": "kgoldrunner-15.04.2.tar.xz",
-            "sha256": "1x5pza747k69wx54fiparqx43pk112cma2pq6c4ndycrm5lqxg5v"
+            "url": "stable/applications/15.04.3/src/kgoldrunner-15.04.3.tar.xz",
+            "name": "kgoldrunner-15.04.3.tar.xz",
+            "sha256": "171q6v3nivr64vq2wn25hfv1zhrrmlf97rd128nxscb4qzk0zcnm"
         },
         "buildInputs": [
             "kde4",
@@ -1762,11 +1762,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kiriki-15.04.2",
+        "name": "kiriki-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kiriki-15.04.2.tar.xz",
-            "name": "kiriki-15.04.2.tar.xz",
-            "sha256": "0sdpswz6gvk03sza5n7n9kf6xi0p7azkgkn27hn0ydh5fm7rfi98"
+            "url": "stable/applications/15.04.3/src/kiriki-15.04.3.tar.xz",
+            "name": "kiriki-15.04.3.tar.xz",
+            "sha256": "14s37qs7f0qgpms1syakjj9amkwa0d1va8yrbmlwfbk5dvx953ls"
         },
         "buildInputs": [
             "kde4",
@@ -1780,11 +1780,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "sweeper-15.04.2",
+        "name": "sweeper-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/sweeper-15.04.2.tar.xz",
-            "name": "sweeper-15.04.2.tar.xz",
-            "sha256": "0nyl587zrmz4aynbp7g7415gczilmb02h79s4xpfxilmxc9910w3"
+            "url": "stable/applications/15.04.3/src/sweeper-15.04.3.tar.xz",
+            "name": "sweeper-15.04.3.tar.xz",
+            "sha256": "156vmxapddlbdhwpdal2s2jr8i4zbn1yccpafqnn8qf0k0384v0l"
         },
         "buildInputs": [
             "kde4"
@@ -1797,11 +1797,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "lokalize-15.04.2",
+        "name": "lokalize-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/lokalize-15.04.2.tar.xz",
-            "name": "lokalize-15.04.2.tar.xz",
-            "sha256": "1hj36k0arfqbyyxccbk6n9skc38a7g6vs3l4r0pdz40b4s65l4hz"
+            "url": "stable/applications/15.04.3/src/lokalize-15.04.3.tar.xz",
+            "name": "lokalize-15.04.3.tar.xz",
+            "sha256": "1dpbzcgx32n27v2k39w944dzl0i2pph84a02ck4c8864w31d0vf5"
         },
         "buildInputs": [
             "ecm",
@@ -1832,11 +1832,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kbounce-15.04.2",
+        "name": "kbounce-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kbounce-15.04.2.tar.xz",
-            "name": "kbounce-15.04.2.tar.xz",
-            "sha256": "094cwq972h36mznl9snc52248vag1myxlndykagv13kdj7jwynx8"
+            "url": "stable/applications/15.04.3/src/kbounce-15.04.3.tar.xz",
+            "name": "kbounce-15.04.3.tar.xz",
+            "sha256": "1i0hyc3hb9qibqynkvi9n98a1gcvanw8k6rg0vngifzc3nv4750g"
         },
         "buildInputs": [
             "ecm",
@@ -1869,11 +1869,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-eo-15.04.2",
+        "name": "kde-l10n-eo-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-eo-15.04.2.tar.xz",
-            "name": "kde-l10n-eo-15.04.2.tar.xz",
-            "sha256": "020zq1ygjkpx5y2isqqp3chk0s1jcd29zy6fwr6jyxvj0260fa8q"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-eo-15.04.3.tar.xz",
+            "name": "kde-l10n-eo-15.04.3.tar.xz",
+            "sha256": "0ac3mmflgnfy3qgsbl8938cf2j0961xh5vvhxwk7wp5j0y1g7nd0"
         },
         "buildInputs": [
             "ecm",
@@ -1890,11 +1890,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-is-15.04.2",
+        "name": "kde-l10n-is-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-is-15.04.2.tar.xz",
-            "name": "kde-l10n-is-15.04.2.tar.xz",
-            "sha256": "0xf361dsvlg525w10y1p638ksrb5x381sw322rs14dlpqn89ywl0"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-is-15.04.3.tar.xz",
+            "name": "kde-l10n-is-15.04.3.tar.xz",
+            "sha256": "0lv7hcq6qp422y0byv8sak7wf62ws1ssmyggm6izsxaw01z6di9m"
         },
         "buildInputs": [
             "ecm",
@@ -1911,11 +1911,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-sl-15.04.2",
+        "name": "kde-l10n-sl-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-sl-15.04.2.tar.xz",
-            "name": "kde-l10n-sl-15.04.2.tar.xz",
-            "sha256": "03chmprkais0cq3z4j9xzy3lq91imf3q4mcaccpknla247a8viqf"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-sl-15.04.3.tar.xz",
+            "name": "kde-l10n-sl-15.04.3.tar.xz",
+            "sha256": "12zg0wbdrvx61qqdv11mx99ncxsnbs6ywf2qa2s5pv9ccj81zl0y"
         },
         "buildInputs": [
             "ecm",
@@ -1932,11 +1932,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "libkcompactdisc-15.04.2",
+        "name": "libkcompactdisc-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/libkcompactdisc-15.04.2.tar.xz",
-            "name": "libkcompactdisc-15.04.2.tar.xz",
-            "sha256": "14qryxim0fhx7npbicv1pvkr42544jzplfmng7z2cjxx4c636j9v"
+            "url": "stable/applications/15.04.3/src/libkcompactdisc-15.04.3.tar.xz",
+            "name": "libkcompactdisc-15.04.3.tar.xz",
+            "sha256": "0xfb10zvrmvp9hxzh05mk75wd2q8c17kd28kxzy6vzsys1ml23fy"
         },
         "buildInputs": [
             "alsa",
@@ -1950,11 +1950,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "picmi-15.04.2",
+        "name": "picmi-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/picmi-15.04.2.tar.xz",
-            "name": "picmi-15.04.2.tar.xz",
-            "sha256": "06dz8552rfydirvmnibvpw0ahg4f2za82qkv2j2crfqm2iigp9rv"
+            "url": "stable/applications/15.04.3/src/picmi-15.04.3.tar.xz",
+            "name": "picmi-15.04.3.tar.xz",
+            "sha256": "08r5k1hs4ja724d3hgq17cwjr96xqhi09l1fr1ls6hrij6vw2qaj"
         },
         "buildInputs": [
             "kde4",
@@ -1969,11 +1969,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "superkaramba-15.04.2",
+        "name": "superkaramba-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/superkaramba-15.04.2.tar.xz",
-            "name": "superkaramba-15.04.2.tar.xz",
-            "sha256": "1x8kxj2ndpnpfbxk33rqyq64y1chlll8j3331skzss9117fsp7z1"
+            "url": "stable/applications/15.04.3/src/superkaramba-15.04.3.tar.xz",
+            "name": "superkaramba-15.04.3.tar.xz",
+            "sha256": "1qd2gi0jllqr2f3wmv5n3smljfgirray8hba5k062ka3fjl6ssqx"
         },
         "buildInputs": [
             "kde4",
@@ -1988,11 +1988,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "gwenview-15.04.2",
+        "name": "gwenview-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/gwenview-15.04.2.tar.xz",
-            "name": "gwenview-15.04.2.tar.xz",
-            "sha256": "1c1fqwgq91s0c9f85g3i3dwaq16r260jj4wx4xcr3qi4bm12lq5k"
+            "url": "stable/applications/15.04.3/src/gwenview-15.04.3.tar.xz",
+            "name": "gwenview-15.04.3.tar.xz",
+            "sha256": "16p6dz8z63h5d6l5cjz61shpd30bawxgcasn55g6v7gk6rxdrvn2"
         },
         "buildInputs": [
             "ecm",
@@ -2028,11 +2028,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-fa-15.04.2",
+        "name": "kde-l10n-fa-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-fa-15.04.2.tar.xz",
-            "name": "kde-l10n-fa-15.04.2.tar.xz",
-            "sha256": "0kb7lxvgbdwlyi1rli7xrk4ykdnljdcm0clkgl1bla6vgxhlc7mj"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-fa-15.04.3.tar.xz",
+            "name": "kde-l10n-fa-15.04.3.tar.xz",
+            "sha256": "0fslss3bz1kzjca3zy923sq8p54jyl1bvqk1qsmv3lmws2881djl"
         },
         "buildInputs": [
             "ecm",
@@ -2049,11 +2049,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kpat-15.04.2",
+        "name": "kpat-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kpat-15.04.2.tar.xz",
-            "name": "kpat-15.04.2.tar.xz",
-            "sha256": "0vhrq3ssfqwpkrx355v91gg1kdl8sjfpkp4fqyi9h36nps7qdiqj"
+            "url": "stable/applications/15.04.3/src/kpat-15.04.3.tar.xz",
+            "name": "kpat-15.04.3.tar.xz",
+            "sha256": "08zb9r291wig1iwh3j7h493ncjfj55255f3pf5ag9nrq44ykvk11"
         },
         "buildInputs": [
             "ecm",
@@ -2093,11 +2093,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "klettres-15.04.2",
+        "name": "klettres-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/klettres-15.04.2.tar.xz",
-            "name": "klettres-15.04.2.tar.xz",
-            "sha256": "1rmf5hpc9zwaham157xzn3dvh0z6scpr2i38i513b0ji0kdizikc"
+            "url": "stable/applications/15.04.3/src/klettres-15.04.3.tar.xz",
+            "name": "klettres-15.04.3.tar.xz",
+            "sha256": "0pqdjm5ixkfrxbp20ypgqx18wxyk0mnrmv2bqf6nk3ybwrdfb5y5"
         },
         "buildInputs": [
             "ecm",
@@ -2127,11 +2127,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdelibs-4.14.9",
+        "name": "kdelibs-4.14.10",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdelibs-4.14.9.tar.xz",
-            "name": "kdelibs-4.14.9.tar.xz",
-            "sha256": "07klv3hxgq1w85lx2myw131r4v3fd726fljipkd7arwzp8mbwcix"
+            "url": "stable/applications/15.04.3/src/kdelibs-4.14.10.tar.xz",
+            "name": "kdelibs-4.14.10.tar.xz",
+            "sha256": "156ajl4al6s2vqyl920yxd2rrs7b77348233xa3bgg5jn2ysgx80"
         },
         "buildInputs": [
             "acl",
@@ -2200,11 +2200,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "katomic-15.04.2",
+        "name": "katomic-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/katomic-15.04.2.tar.xz",
-            "name": "katomic-15.04.2.tar.xz",
-            "sha256": "1gpg01ngqmfkiwzfcx686x2yzd4sjlp5xkdrgdwy20czl1i6rras"
+            "url": "stable/applications/15.04.3/src/katomic-15.04.3.tar.xz",
+            "name": "katomic-15.04.3.tar.xz",
+            "sha256": "0j3khd1yiyq2y9c4rm36cf79frml7xhzb1jgxab6hshyzcr10lc3"
         },
         "buildInputs": [
             "ecm",
@@ -2233,11 +2233,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kollision-15.04.2",
+        "name": "kollision-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kollision-15.04.2.tar.xz",
-            "name": "kollision-15.04.2.tar.xz",
-            "sha256": "0jqjg6dr2ff5qb5f23kfd017m1lm7h2rim6q8dkbxk4xm92f5kqi"
+            "url": "stable/applications/15.04.3/src/kollision-15.04.3.tar.xz",
+            "name": "kollision-15.04.3.tar.xz",
+            "sha256": "0x45mjm6irhgrv0jmpaxa55d38h1m3c4jry5hmv8r8x4c7l7z565"
         },
         "buildInputs": [
             "ecm",
@@ -2271,11 +2271,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "klines-15.04.2",
+        "name": "klines-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/klines-15.04.2.tar.xz",
-            "name": "klines-15.04.2.tar.xz",
-            "sha256": "11ksr0khyj29bbzcavpxm4kc109m2g2gbhi4qhsyanfj8a0811az"
+            "url": "stable/applications/15.04.3/src/klines-15.04.3.tar.xz",
+            "name": "klines-15.04.3.tar.xz",
+            "sha256": "0v5r720i996qq8hrlz8x9avrdh0dnqxbxz7h1wr4mhmz5iqj2s9c"
         },
         "buildInputs": [
             "ecm",
@@ -2310,11 +2310,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-ru-15.04.2",
+        "name": "kde-l10n-ru-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ru-15.04.2.tar.xz",
-            "name": "kde-l10n-ru-15.04.2.tar.xz",
-            "sha256": "155mbg25anmdy6vgz3fsn4p8m7c8syfwiy70jsgqv9751dvkajlk"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ru-15.04.3.tar.xz",
+            "name": "kde-l10n-ru-15.04.3.tar.xz",
+            "sha256": "0blm1fmvx7i0dzvf46qngq7cb9p16pw93v3j4bf63r24671w40xj"
         },
         "buildInputs": [
             "ecm",
@@ -2331,11 +2331,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kcalc-15.04.2",
+        "name": "kcalc-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kcalc-15.04.2.tar.xz",
-            "name": "kcalc-15.04.2.tar.xz",
-            "sha256": "0sk431vrz8xc12fc6qfdlxcnkr5yl729pk450pj90xm6x0jj24lp"
+            "url": "stable/applications/15.04.3/src/kcalc-15.04.3.tar.xz",
+            "name": "kcalc-15.04.3.tar.xz",
+            "sha256": "0hxva8l2x5v6k2ry25zzzral6cdia1ypk1iz37qfnb20myfv7x6q"
         },
         "buildInputs": [
             "ecm",
@@ -2361,11 +2361,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-mr-15.04.2",
+        "name": "kde-l10n-mr-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-mr-15.04.2.tar.xz",
-            "name": "kde-l10n-mr-15.04.2.tar.xz",
-            "sha256": "1clmi1vflqi63kihv9ljkbns4r0v7yb65zkdv642kdcfmwz9kgw8"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-mr-15.04.3.tar.xz",
+            "name": "kde-l10n-mr-15.04.3.tar.xz",
+            "sha256": "1yvjwcdsnf5pf8izb8fifsd2rsrvmkw704iw5m6yzh7fzdy6qyhg"
         },
         "buildInputs": [
             "ecm",
@@ -2382,11 +2382,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "lskat-15.04.2",
+        "name": "lskat-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/lskat-15.04.2.tar.xz",
-            "name": "lskat-15.04.2.tar.xz",
-            "sha256": "1ydmglbihijpsgq29nz3sg3g8sja9nzqd7czpg8z8zy9gylh6cl4"
+            "url": "stable/applications/15.04.3/src/lskat-15.04.3.tar.xz",
+            "name": "lskat-15.04.3.tar.xz",
+            "sha256": "188pq09afxyapwnx7bc4v5hc5224049q2nkywgnl161sl8jhb40v"
         },
         "buildInputs": [
             "kde4",
@@ -2400,11 +2400,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kcolorchooser-15.04.2",
+        "name": "kcolorchooser-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kcolorchooser-15.04.2.tar.xz",
-            "name": "kcolorchooser-15.04.2.tar.xz",
-            "sha256": "1hypa5q9vfk3imc6fng7li3jkh51phsk2cq1sjri1czl547ij38h"
+            "url": "stable/applications/15.04.3/src/kcolorchooser-15.04.3.tar.xz",
+            "name": "kcolorchooser-15.04.3.tar.xz",
+            "sha256": "1rq4r3sn3rhd6whqhchzy2cvpqik43naikh8sdzinwpp968sbz0l"
         },
         "buildInputs": [
             "kde4"
@@ -2417,11 +2417,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-kk-15.04.2",
+        "name": "kde-l10n-kk-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-kk-15.04.2.tar.xz",
-            "name": "kde-l10n-kk-15.04.2.tar.xz",
-            "sha256": "0xgncx5xbhnzxzpzaawvj9d19s8zzdrc76qa986xf37zahjv7v1r"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-kk-15.04.3.tar.xz",
+            "name": "kde-l10n-kk-15.04.3.tar.xz",
+            "sha256": "0ywz646pv3dfbhbsijrk7l47l96hw3n7mds2zplmw5624wlfz7dn"
         },
         "buildInputs": [
             "ecm",
@@ -2438,11 +2438,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kblocks-15.04.2",
+        "name": "kblocks-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kblocks-15.04.2.tar.xz",
-            "name": "kblocks-15.04.2.tar.xz",
-            "sha256": "1bpvw5sghg7qiqs97p0xn7b23jgmzk590kmdjcwigfz788ac4ylv"
+            "url": "stable/applications/15.04.3/src/kblocks-15.04.3.tar.xz",
+            "name": "kblocks-15.04.3.tar.xz",
+            "sha256": "1iizgcj75ayr4ckpw85igcy8r6ia594sshgy1x5yir4i2jiaxr1m"
         },
         "buildInputs": [
             "ecm",
@@ -2478,11 +2478,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-lt-15.04.2",
+        "name": "kde-l10n-lt-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-lt-15.04.2.tar.xz",
-            "name": "kde-l10n-lt-15.04.2.tar.xz",
-            "sha256": "03vwx16wwihq0qlzs8w1rdlld0951x0yr9w36bvjsrl985n500ip"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-lt-15.04.3.tar.xz",
+            "name": "kde-l10n-lt-15.04.3.tar.xz",
+            "sha256": "1y8a7py2r3b35kvjmzpw4vgzjjmfhl44bjd0qjsyh4323q6mc4lw"
         },
         "buildInputs": [
             "ecm",
@@ -2499,11 +2499,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-cs-15.04.2",
+        "name": "kde-l10n-cs-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-cs-15.04.2.tar.xz",
-            "name": "kde-l10n-cs-15.04.2.tar.xz",
-            "sha256": "0ks75clbhywql9pgchxi5phc50n9qama5v4crngwkxfbs2lhp05d"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-cs-15.04.3.tar.xz",
+            "name": "kde-l10n-cs-15.04.3.tar.xz",
+            "sha256": "0pjvyhg2x85l2ns5zhhyn4ij26l3kaq7yf4nb3qh67radqm4kd3w"
         },
         "buildInputs": [
             "ecm",
@@ -2520,11 +2520,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kblackbox-15.04.2",
+        "name": "kblackbox-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kblackbox-15.04.2.tar.xz",
-            "name": "kblackbox-15.04.2.tar.xz",
-            "sha256": "1ib9a9pp9mdp2kbz2gb4lnrlf66v7170y4qrg24vmvpsa7csgmx3"
+            "url": "stable/applications/15.04.3/src/kblackbox-15.04.3.tar.xz",
+            "name": "kblackbox-15.04.3.tar.xz",
+            "sha256": "1al2qzfy9773zqs6f98zqi110dmzlaa60a45pzfmmamjlh0nf5ay"
         },
         "buildInputs": [
             "ecm",
@@ -2548,11 +2548,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "libkdeedu-15.04.2",
+        "name": "libkdeedu-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/libkdeedu-15.04.2.tar.xz",
-            "name": "libkdeedu-15.04.2.tar.xz",
-            "sha256": "1pvipdv3zhqpnmz4x68jdfml2hjamlb591r9qcibw1pzgx7bz77q"
+            "url": "stable/applications/15.04.3/src/libkdeedu-15.04.3.tar.xz",
+            "name": "libkdeedu-15.04.3.tar.xz",
+            "sha256": "0sm3aqchxmv6nap003mpklk6yrkqlqrp5zlyvc6hn764mjm80mxr"
         },
         "buildInputs": [
             "kde4"
@@ -2565,11 +2565,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "amor-15.04.2",
+        "name": "amor-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/amor-15.04.2.tar.xz",
-            "name": "amor-15.04.2.tar.xz",
-            "sha256": "1kbdarrf2jxr5f458m28fg19g29xpj5n7fb9w2311052xaywf0rr"
+            "url": "stable/applications/15.04.3/src/amor-15.04.3.tar.xz",
+            "name": "amor-15.04.3.tar.xz",
+            "sha256": "197vvdw6zsn19j5xnddaz60xsmk6hv4846hxvqsybi3k0sldnb8f"
         },
         "buildInputs": [
             "kde4"
@@ -2582,11 +2582,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-eu-15.04.2",
+        "name": "kde-l10n-eu-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-eu-15.04.2.tar.xz",
-            "name": "kde-l10n-eu-15.04.2.tar.xz",
-            "sha256": "18bry21g828n0rvaq4510pj8fb4f49jn5yxvf1jm6qn3wcfg5qws"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-eu-15.04.3.tar.xz",
+            "name": "kde-l10n-eu-15.04.3.tar.xz",
+            "sha256": "0cq453v58yw4nkj3a3zmk0994779f6ay1vvgmk8fz6ychy1sx4mw"
         },
         "buildInputs": [
             "ecm",
@@ -2603,11 +2603,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kamera-15.04.2",
+        "name": "kamera-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kamera-15.04.2.tar.xz",
-            "name": "kamera-15.04.2.tar.xz",
-            "sha256": "01r16868mdmpfjwzz7wa1qykc6lif9yi7fp0zxyk5hy77wp4jwdy"
+            "url": "stable/applications/15.04.3/src/kamera-15.04.3.tar.xz",
+            "name": "kamera-15.04.3.tar.xz",
+            "sha256": "1xngcscz2cj3x292gf1fn6yigbq7nafwf4k3f2dgghb8yxnxzqrz"
         },
         "buildInputs": [
             "gphoto2",
@@ -2621,11 +2621,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "pairs-15.04.2",
+        "name": "pairs-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/pairs-15.04.2.tar.xz",
-            "name": "pairs-15.04.2.tar.xz",
-            "sha256": "11hbzh8nk38m1n61vcyzz1v6q1fpwyiv9l6s05mrsm4krny2bi4a"
+            "url": "stable/applications/15.04.3/src/pairs-15.04.3.tar.xz",
+            "name": "pairs-15.04.3.tar.xz",
+            "sha256": "1pzmxahr82rwahvcn8573qnw843nfyrqpmffngz02lj7fhxc7n9v"
         },
         "buildInputs": [
             "kde4"
@@ -2638,11 +2638,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "dragon-15.04.2",
+        "name": "dragon-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/dragon-15.04.2.tar.xz",
-            "name": "dragon-15.04.2.tar.xz",
-            "sha256": "0kf692d3wsj32iry3dl148f4i04y9y26nc9v4skpwf5pvsgp2d5s"
+            "url": "stable/applications/15.04.3/src/dragon-15.04.3.tar.xz",
+            "name": "dragon-15.04.3.tar.xz",
+            "sha256": "0i1zl23hsf9rykd415xjh5p2v1cmkifwljxhvqyhn1x4bv729mk1"
         },
         "buildInputs": [
             "kde4"
@@ -2655,11 +2655,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kmplot-15.04.2",
+        "name": "kmplot-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kmplot-15.04.2.tar.xz",
-            "name": "kmplot-15.04.2.tar.xz",
-            "sha256": "0p1qkhmdn7wqggk1z4c8mwbgrk7daxgfjg6yhhscaj13ikg2l4qc"
+            "url": "stable/applications/15.04.3/src/kmplot-15.04.3.tar.xz",
+            "name": "kmplot-15.04.3.tar.xz",
+            "sha256": "1ymhw5iwdksbh6il0ivcagmhv0qchxmh17bawkd20bn2yh8w9njd"
         },
         "buildInputs": [
             "ecm",
@@ -2684,11 +2684,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-base-artwork-15.04.2",
+        "name": "kde-base-artwork-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-base-artwork-15.04.2.tar.xz",
-            "name": "kde-base-artwork-15.04.2.tar.xz",
-            "sha256": "0if4i3zag7hzgrf89bswfg7c95m066phjs89fk4ss45ak25rgddy"
+            "url": "stable/applications/15.04.3/src/kde-base-artwork-15.04.3.tar.xz",
+            "name": "kde-base-artwork-15.04.3.tar.xz",
+            "sha256": "10g3335ghz4pkyqqym8ay7lm6aw85gkk1y8bykpskyzpgv9kpc7r"
         },
         "buildInputs": [
             "kde4"
@@ -2701,11 +2701,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "blinken-15.04.2",
+        "name": "blinken-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/blinken-15.04.2.tar.xz",
-            "name": "blinken-15.04.2.tar.xz",
-            "sha256": "1k0idsbqnhmrlnsl8l45wkipb6hch1imrkxglxl1xw0pr0s7c8rg"
+            "url": "stable/applications/15.04.3/src/blinken-15.04.3.tar.xz",
+            "name": "blinken-15.04.3.tar.xz",
+            "sha256": "0ngg0l75vshcw288kd1141038dq1ayggid6g9r1c6djm7is17fn0"
         },
         "buildInputs": [
             "ecm",
@@ -2729,11 +2729,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "konquest-15.04.2",
+        "name": "konquest-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/konquest-15.04.2.tar.xz",
-            "name": "konquest-15.04.2.tar.xz",
-            "sha256": "1w03w8nxkbz9ng2spa3pc5gmigajm7k8dcz2j1nly44a6g85rxnn"
+            "url": "stable/applications/15.04.3/src/konquest-15.04.3.tar.xz",
+            "name": "konquest-15.04.3.tar.xz",
+            "sha256": "092z41v548yns87n677ic3jqcjs11lya7znakw1wg8il2iq4p8ad"
         },
         "buildInputs": [
             "kde4",
@@ -2747,11 +2747,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-he-15.04.2",
+        "name": "kde-l10n-he-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-he-15.04.2.tar.xz",
-            "name": "kde-l10n-he-15.04.2.tar.xz",
-            "sha256": "04kayv647nj3hrxl0863gks5z53v1ax9pafncm70ls79rzz95zsa"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-he-15.04.3.tar.xz",
+            "name": "kde-l10n-he-15.04.3.tar.xz",
+            "sha256": "083c5gxxgvibg5xryyh919h4sli3z129cwqi8x9bjzmqdjd1b3a7"
         },
         "buildInputs": [
             "ecm",
@@ -2768,11 +2768,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "bovo-15.04.2",
+        "name": "bovo-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/bovo-15.04.2.tar.xz",
-            "name": "bovo-15.04.2.tar.xz",
-            "sha256": "00w5d9mapy4f634ys1k45fhpa50h5299y9q6wann9phrmf8kj8y2"
+            "url": "stable/applications/15.04.3/src/bovo-15.04.3.tar.xz",
+            "name": "bovo-15.04.3.tar.xz",
+            "sha256": "0fjvxvz8f3vr8sv8grpkwyhfvbcv7hayvsvmw7f1gpiamq7m7aab"
         },
         "buildInputs": [
             "ecm",
@@ -2798,11 +2798,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ktimer-15.04.2",
+        "name": "ktimer-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ktimer-15.04.2.tar.xz",
-            "name": "ktimer-15.04.2.tar.xz",
-            "sha256": "19ah9r92i8r4059apvv1aj25hvkhq3dw9vmvi5r8sxrdbd3m0yw0"
+            "url": "stable/applications/15.04.3/src/ktimer-15.04.3.tar.xz",
+            "name": "ktimer-15.04.3.tar.xz",
+            "sha256": "1pixq0nh6n4rm4pvpabrly2wxsq58a719k7fj70w6a541chsmy77"
         },
         "buildInputs": [
             "ecm",
@@ -2827,11 +2827,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-hu-15.04.2",
+        "name": "kde-l10n-hu-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-hu-15.04.2.tar.xz",
-            "name": "kde-l10n-hu-15.04.2.tar.xz",
-            "sha256": "1ilhnp6x3lahhc0rkhn2zv6g9ck8w7b9qaw8fgqkiz0n19hv564f"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-hu-15.04.3.tar.xz",
+            "name": "kde-l10n-hu-15.04.3.tar.xz",
+            "sha256": "0ql1yh5hmzdxmr6dnzsl08rxmvgrb4zcs6rk1r0jqkcfnwlhdf53"
         },
         "buildInputs": [
             "ecm",
@@ -2848,11 +2848,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-ro-15.04.2",
+        "name": "kde-l10n-ro-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ro-15.04.2.tar.xz",
-            "name": "kde-l10n-ro-15.04.2.tar.xz",
-            "sha256": "05pgpshvs08inygighi3ya0bl49238l96sgqql0377cm9cw2hj9l"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ro-15.04.3.tar.xz",
+            "name": "kde-l10n-ro-15.04.3.tar.xz",
+            "sha256": "0ix4p8alq6xrsgbwv23xijcnwpd8gcf96zsd59bfpmvykxqmwpdq"
         },
         "buildInputs": [
             "ecm",
@@ -2869,11 +2869,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-sv-15.04.2",
+        "name": "kde-l10n-sv-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-sv-15.04.2.tar.xz",
-            "name": "kde-l10n-sv-15.04.2.tar.xz",
-            "sha256": "11mnbalw3lpdgv3bbhhh658cs34impi7gymhcw129il0jsc5yz53"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-sv-15.04.3.tar.xz",
+            "name": "kde-l10n-sv-15.04.3.tar.xz",
+            "sha256": "0qpkl0dqw6jwb0xy1adjibhabga32hzk0rhwl75dw7bw257aka6f"
         },
         "buildInputs": [
             "ecm",
@@ -2890,11 +2890,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kgamma-15.04.2",
+        "name": "kgamma-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kgamma-15.04.2.tar.xz",
-            "name": "kgamma-15.04.2.tar.xz",
-            "sha256": "08ia2skz3w6zwzm9jlgiyrlxnn7mx83d78350plr5k6qrszn483l"
+            "url": "stable/applications/15.04.3/src/kgamma-15.04.3.tar.xz",
+            "name": "kgamma-15.04.3.tar.xz",
+            "sha256": "0wdx2xv2jkhdlbcy46ylg6c2aib4rj1gfbwc7zxwfcm52amra6a8"
         },
         "buildInputs": [
             "kde4",
@@ -2908,11 +2908,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kanagram-15.04.2",
+        "name": "kanagram-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kanagram-15.04.2.tar.xz",
-            "name": "kanagram-15.04.2.tar.xz",
-            "sha256": "1zqjms2ai4bpfmbf136q94gbl59vjszlfsp8xi0pmpp138yii9a8"
+            "url": "stable/applications/15.04.3/src/kanagram-15.04.3.tar.xz",
+            "name": "kanagram-15.04.3.tar.xz",
+            "sha256": "18aix8r0ziprk2i8hdp6jis2i5b23q2r46x3y4lncgxs1ldgv74b"
         },
         "buildInputs": [
             "ecm",
@@ -2944,11 +2944,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kstars-15.04.2",
+        "name": "kstars-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kstars-15.04.2.tar.xz",
-            "name": "kstars-15.04.2.tar.xz",
-            "sha256": "01mzd0qbfjx6fzbaii6al6r62frygf9psi4av1227p3drwmnxrz6"
+            "url": "stable/applications/15.04.3/src/kstars-15.04.3.tar.xz",
+            "name": "kstars-15.04.3.tar.xz",
+            "sha256": "1lnspbgg037id7jq2fjf3p7rr819jd0h4hs21hxqifcsx2qm90qp"
         },
         "buildInputs": [
             "astrometrynet",
@@ -2995,11 +2995,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdeartwork-15.04.2",
+        "name": "kdeartwork-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdeartwork-15.04.2.tar.xz",
-            "name": "kdeartwork-15.04.2.tar.xz",
-            "sha256": "0dhm6n5x8pq4nl8f5gnr2cdgy3fjkqyhij9gdxqan5s7rhfq7j4n"
+            "url": "stable/applications/15.04.3/src/kdeartwork-15.04.3.tar.xz",
+            "name": "kdeartwork-15.04.3.tar.xz",
+            "sha256": "1ay8xwnniy9gd4vfnnd9h5i1yybv4w5fjpycn58xdkhwf0zi229p"
         },
         "buildInputs": [
             "eigen3",
@@ -3017,11 +3017,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kfloppy-15.04.2",
+        "name": "kfloppy-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kfloppy-15.04.2.tar.xz",
-            "name": "kfloppy-15.04.2.tar.xz",
-            "sha256": "0r8cgmwa0b9r6dl5vslw4g03mm3qvrswqhk4pdbph3iw1qykxypw"
+            "url": "stable/applications/15.04.3/src/kfloppy-15.04.3.tar.xz",
+            "name": "kfloppy-15.04.3.tar.xz",
+            "sha256": "0jzvcm1kkb0zzvmb96zl2xv0ya4a3ilirqq8zwjgzh36s06y1h7j"
         },
         "buildInputs": [
             "kde4"
@@ -3034,11 +3034,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "jovie-15.04.2",
+        "name": "jovie-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/jovie-15.04.2.tar.xz",
-            "name": "jovie-15.04.2.tar.xz",
-            "sha256": "0lc751p2s96qjqh7dccjm498m7c370dcsm5bxqks9imyi9l7syyx"
+            "url": "stable/applications/15.04.3/src/jovie-15.04.3.tar.xz",
+            "name": "jovie-15.04.3.tar.xz",
+            "sha256": "02bfx985wggmb8bbca6yz5hgfjxg0zniqsbxap3h4baiba5n2rpn"
         },
         "buildInputs": [
             "kde4",
@@ -3053,11 +3053,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-zh_TW-15.04.2",
+        "name": "kde-l10n-zh_TW-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-zh_TW-15.04.2.tar.xz",
-            "name": "kde-l10n-zh_TW-15.04.2.tar.xz",
-            "sha256": "1gvr4k48qjwgw9qsv3rlz210slqdvsxvqxwsy7j5ndcjfs2724wi"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-zh_TW-15.04.3.tar.xz",
+            "name": "kde-l10n-zh_TW-15.04.3.tar.xz",
+            "sha256": "1p19mzpa0cm7x5afc6x9j7xr83850hrz9fvn27h4gdc8s0gbmc9m"
         },
         "buildInputs": [
             "ecm",
@@ -3074,11 +3074,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kscd-15.04.2",
+        "name": "kscd-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kscd-15.04.2.tar.xz",
-            "name": "kscd-15.04.2.tar.xz",
-            "sha256": "1066yavabxax059fwgp0rmspfsy065x0nisci0ybyfh0y9m8m48j"
+            "url": "stable/applications/15.04.3/src/kscd-15.04.3.tar.xz",
+            "name": "kscd-15.04.3.tar.xz",
+            "sha256": "0dy41w2vc53qks0z19azrwmf6p1y4jrh7bycj81prh2dinnpkra1"
         },
         "buildInputs": [
             "alsa",
@@ -3094,11 +3094,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-uk-15.04.2",
+        "name": "kde-l10n-uk-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-uk-15.04.2.tar.xz",
-            "name": "kde-l10n-uk-15.04.2.tar.xz",
-            "sha256": "1hbwwj1k4g4z6wkrxd3aalbhvsqvnzgv56s1m748vp7196d7h6wk"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-uk-15.04.3.tar.xz",
+            "name": "kde-l10n-uk-15.04.3.tar.xz",
+            "sha256": "19xwxm3bjwjxzr7axr5my6n6pm12jn9gz6xrxxjpdnf1b8386y48"
         },
         "buildInputs": [
             "ecm",
@@ -3115,11 +3115,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "konsole-15.04.2",
+        "name": "konsole-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/konsole-15.04.2.tar.xz",
-            "name": "konsole-15.04.2.tar.xz",
-            "sha256": "1cy71kfv1f9bq3y3n73brm6wzl03qgcvx5rg0kflx3ihjl1aclgc"
+            "url": "stable/applications/15.04.3/src/konsole-15.04.3.tar.xz",
+            "name": "konsole-15.04.3.tar.xz",
+            "sha256": "147cx1ana0z5hg0vx0zgqavizk65s17a2pmyxd3fhdy3ad3c2ld0"
         },
         "buildInputs": [
             "ecm",
@@ -3161,11 +3161,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kruler-15.04.2",
+        "name": "kruler-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kruler-15.04.2.tar.xz",
-            "name": "kruler-15.04.2.tar.xz",
-            "sha256": "0rl81v1lhljfqvz98zfvnfbnylxn3l9qzy7b33hfkpmm9bjkp0i2"
+            "url": "stable/applications/15.04.3/src/kruler-15.04.3.tar.xz",
+            "name": "kruler-15.04.3.tar.xz",
+            "sha256": "0ljssj6fqbpzsc7rvm8vyy6mpzll443w1xxbrima0dgvdc656lx0"
         },
         "buildInputs": [
             "ecm",
@@ -3190,11 +3190,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kubrick-15.04.2",
+        "name": "kubrick-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kubrick-15.04.2.tar.xz",
-            "name": "kubrick-15.04.2.tar.xz",
-            "sha256": "16ndnx92mb307qjkwljdbgp69aamk268yqn2w9w8y4yjhmvsmx3d"
+            "url": "stable/applications/15.04.3/src/kubrick-15.04.3.tar.xz",
+            "name": "kubrick-15.04.3.tar.xz",
+            "sha256": "1gvamla9pxd0dj0yc8108pr31f1yf79x6ng87gmbi10nriw4dz27"
         },
         "buildInputs": [
             "kde4",
@@ -3209,11 +3209,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdenetwork-filesharing-15.04.2",
+        "name": "kdenetwork-filesharing-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdenetwork-filesharing-15.04.2.tar.xz",
-            "name": "kdenetwork-filesharing-15.04.2.tar.xz",
-            "sha256": "0l7s9a8ngwvz11bk5d5q4vxi0xvqc2jk62zcqq0mjiznd3vwiqdy"
+            "url": "stable/applications/15.04.3/src/kdenetwork-filesharing-15.04.3.tar.xz",
+            "name": "kdenetwork-filesharing-15.04.3.tar.xz",
+            "sha256": "083j6159sjcq0d8j2n6id6fyha5a4wk4ii7sl177md63xsl4xax1"
         },
         "buildInputs": [
             "kde4"
@@ -3226,11 +3226,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "dolphin-plugins-15.04.2",
+        "name": "dolphin-plugins-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/dolphin-plugins-15.04.2.tar.xz",
-            "name": "dolphin-plugins-15.04.2.tar.xz",
-            "sha256": "19hyki0k06bma2a236w45hip6gb8fzwcm51qx8xxbii4di6qrkvx"
+            "url": "stable/applications/15.04.3/src/dolphin-plugins-15.04.3.tar.xz",
+            "name": "dolphin-plugins-15.04.3.tar.xz",
+            "sha256": "0pfrydfb7qn3r5zjs6x83i05fqvzizrw0idh1faqv5br4hra9pzp"
         },
         "buildInputs": [
             "kde4",
@@ -3244,11 +3244,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kmines-15.04.2",
+        "name": "kmines-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kmines-15.04.2.tar.xz",
-            "name": "kmines-15.04.2.tar.xz",
-            "sha256": "1n49vzbyiiya0inxp0kydh47mm5m2qgm8x3n6yj9hjhllvjm885s"
+            "url": "stable/applications/15.04.3/src/kmines-15.04.3.tar.xz",
+            "name": "kmines-15.04.3.tar.xz",
+            "sha256": "0p8bfk8brh9y32qk9rpqcvpxk8if3y2m9mzh5mmg6d5bqv4r8v5a"
         },
         "buildInputs": [
             "ecm",
@@ -3278,11 +3278,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kspaceduel-15.04.2",
+        "name": "kspaceduel-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kspaceduel-15.04.2.tar.xz",
-            "name": "kspaceduel-15.04.2.tar.xz",
-            "sha256": "07pgrdywj0jbvqw21qkblax30jym9x8y94ig5jn3jl19ax7a8wqy"
+            "url": "stable/applications/15.04.3/src/kspaceduel-15.04.3.tar.xz",
+            "name": "kspaceduel-15.04.3.tar.xz",
+            "sha256": "1w4b1vd6p16fg7j08sbmhd3cqd8n1y6xm761yziz20mkkgr1yvjm"
         },
         "buildInputs": [
             "kde4",
@@ -3296,11 +3296,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-tr-15.04.2",
+        "name": "kde-l10n-tr-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-tr-15.04.2.tar.xz",
-            "name": "kde-l10n-tr-15.04.2.tar.xz",
-            "sha256": "1ddbxlf9bqd3zqwxfhygfmy15prhh0albp83saprk94bbdirp0lq"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-tr-15.04.3.tar.xz",
+            "name": "kde-l10n-tr-15.04.3.tar.xz",
+            "sha256": "0p201cjaf67ixcfdmqvxmigz5frly3w036ry15hmkqq3l2hz6q4l"
         },
         "buildInputs": [
             "ecm",
@@ -3317,11 +3317,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "libkdcraw-15.04.2",
+        "name": "libkdcraw-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/libkdcraw-15.04.2.tar.xz",
-            "name": "libkdcraw-15.04.2.tar.xz",
-            "sha256": "1j277ydzn35hzk5v0vf50giw1j3yibskpkb4kr5kirszs8m2yqkf"
+            "url": "stable/applications/15.04.3/src/libkdcraw-15.04.3.tar.xz",
+            "name": "libkdcraw-15.04.3.tar.xz",
+            "sha256": "0hi5i07qzvw8mbk1yrv8w8l5zhbzgnfvvpv44ym56pcz4a9fmjfg"
         },
         "buildInputs": [
             "kde4",
@@ -3335,11 +3335,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ktp-approver-15.04.2",
+        "name": "ktp-approver-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ktp-approver-15.04.2.tar.xz",
-            "name": "ktp-approver-15.04.2.tar.xz",
-            "sha256": "1qik158frx7208adk7r573a85y8xjd1q8r9yw4fb592hvlkdk3i7"
+            "url": "stable/applications/15.04.3/src/ktp-approver-15.04.3.tar.xz",
+            "name": "ktp-approver-15.04.3.tar.xz",
+            "sha256": "051398wxm9cfnid2dvi4sycb61iygj8smg8f5xdfm31mfxdva3hn"
         },
         "buildInputs": [
             "ecm",
@@ -3362,11 +3362,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ktp-contact-runner-15.04.2",
+        "name": "ktp-contact-runner-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ktp-contact-runner-15.04.2.tar.xz",
-            "name": "ktp-contact-runner-15.04.2.tar.xz",
-            "sha256": "00r8z9zg9g1lpr6jmkr5l0n4w7zsskl35spral6ibbnnvfcv7jrf"
+            "url": "stable/applications/15.04.3/src/ktp-contact-runner-15.04.3.tar.xz",
+            "name": "ktp-contact-runner-15.04.3.tar.xz",
+            "sha256": "0bv83if7mwqwsblpnmdf87k6fvvjb21i6kwa7i1q9vnr7avka0yg"
         },
         "buildInputs": [
             "ecm",
@@ -3390,11 +3390,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdepim-runtime-4.14.9",
+        "name": "kdepim-runtime-4.14.10",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdepim-runtime-4.14.9.tar.xz",
-            "name": "kdepim-runtime-4.14.9.tar.xz",
-            "sha256": "0h6q08j5i2lhvlv92daxdyf7vncisbx0ya11vh45wmbv30xv2cl0"
+            "url": "stable/applications/15.04.3/src/kdepim-runtime-4.14.10.tar.xz",
+            "name": "kdepim-runtime-4.14.10.tar.xz",
+            "sha256": "0lndmza6x4969g9dgyl3p5zqh371nm1x8gciqy13wv34g0r1x3fn"
         },
         "buildInputs": [
             "accountsqt",
@@ -3421,11 +3421,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "print-manager-15.04.2",
+        "name": "print-manager-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/print-manager-15.04.2.tar.xz",
-            "name": "print-manager-15.04.2.tar.xz",
-            "sha256": "0hry52ypcchzbsvg5y4mw2h494l3cp4lqflhw48pilgzmz6pa1rk"
+            "url": "stable/applications/15.04.3/src/print-manager-15.04.3.tar.xz",
+            "name": "print-manager-15.04.3.tar.xz",
+            "sha256": "15mmypcxmgrypapss3nzi3vjrbmw7f547jbpbmsprcpij1klip6q"
         },
         "buildInputs": [
             "cups",
@@ -3460,11 +3460,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "oxygen-icons-15.04.2",
+        "name": "oxygen-icons-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/oxygen-icons-15.04.2.tar.xz",
-            "name": "oxygen-icons-15.04.2.tar.xz",
-            "sha256": "1xwa8y6alrk6faf6bw3wc0y2vxjx32wzl9ncywisb4823xc8njbi"
+            "url": "stable/applications/15.04.3/src/oxygen-icons-15.04.3.tar.xz",
+            "name": "oxygen-icons-15.04.3.tar.xz",
+            "sha256": "07npzyrbw2fn1qd04imnv7cz0sisk7yllrwr2y21yr2i1gbncfqk"
         },
         "buildInputs": []
     },
@@ -3475,11 +3475,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "umbrello-15.04.2",
+        "name": "umbrello-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/umbrello-15.04.2.tar.xz",
-            "name": "umbrello-15.04.2.tar.xz",
-            "sha256": "08bz8lg2arrwsnf0gjjjrf6bihrv9bdz8n4hdvilhpy0ls78v2va"
+            "url": "stable/applications/15.04.3/src/umbrello-15.04.3.tar.xz",
+            "name": "umbrello-15.04.3.tar.xz",
+            "sha256": "0qil8814zc3pa11xqf0lz3lwkvp57j3iahhjzaw7famn8vfzjpmh"
         },
         "buildInputs": [
             "kde4",
@@ -3494,11 +3494,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-ar-15.04.2",
+        "name": "kde-l10n-ar-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ar-15.04.2.tar.xz",
-            "name": "kde-l10n-ar-15.04.2.tar.xz",
-            "sha256": "05wspvz4fk6xy3d9zjgrj7kzj213hhkv7fvs43iy2l4vm8b3vski"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ar-15.04.3.tar.xz",
+            "name": "kde-l10n-ar-15.04.3.tar.xz",
+            "sha256": "19kzdyjcrbjp5hwccvzyi2fd3gy3pm8yay64jpg9iln28ahzbx3b"
         },
         "buildInputs": [
             "ecm",
@@ -3515,11 +3515,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ktp-filetransfer-handler-15.04.2",
+        "name": "ktp-filetransfer-handler-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ktp-filetransfer-handler-15.04.2.tar.xz",
-            "name": "ktp-filetransfer-handler-15.04.2.tar.xz",
-            "sha256": "15y53z3kbbvk6vg1f3ns88mq6c9hmd41s2ayixhg109nwp7q0177"
+            "url": "stable/applications/15.04.3/src/ktp-filetransfer-handler-15.04.3.tar.xz",
+            "name": "ktp-filetransfer-handler-15.04.3.tar.xz",
+            "sha256": "12z8zcrj2nhlhh1kyx565aaacczh7884hnid6rzrb2fmm58sx39h"
         },
         "buildInputs": [
             "ecm",
@@ -3544,11 +3544,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdepimlibs-4.14.9",
+        "name": "kdepimlibs-4.14.10",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdepimlibs-4.14.9.tar.xz",
-            "name": "kdepimlibs-4.14.9.tar.xz",
-            "sha256": "0mjbaszc14ilvcjmr7aqy41py7yfriz1glvwpbr89z9nqjvy62yj"
+            "url": "stable/applications/15.04.3/src/kdepimlibs-4.14.10.tar.xz",
+            "name": "kdepimlibs-4.14.10.tar.xz",
+            "sha256": "1hl4wmdsp3lswvzvspy8h9x31n38z9gj6l50plhz3v6nmna9dk68"
         },
         "buildInputs": [
             "akonadi",
@@ -3573,11 +3573,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "step-15.04.2",
+        "name": "step-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/step-15.04.2.tar.xz",
-            "name": "step-15.04.2.tar.xz",
-            "sha256": "0skcnrdb3gcl8z2krmhi38dz5gr9a0bzvfgiv953bbr93hkjsscf"
+            "url": "stable/applications/15.04.3/src/step-15.04.3.tar.xz",
+            "name": "step-15.04.3.tar.xz",
+            "sha256": "1nnjyw4jrqwdx0n34xw897kwq543vzyia8csyiadiqdq9hyzmlpg"
         },
         "buildInputs": [
             "ecm",
@@ -3609,11 +3609,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kmousetool-15.04.2",
+        "name": "kmousetool-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kmousetool-15.04.2.tar.xz",
-            "name": "kmousetool-15.04.2.tar.xz",
-            "sha256": "1nkn25zg6bb4pc7s93f6igcpspy1a1wlzh2ckmm2613594jh1qr9"
+            "url": "stable/applications/15.04.3/src/kmousetool-15.04.3.tar.xz",
+            "name": "kmousetool-15.04.3.tar.xz",
+            "sha256": "1allf52fw55fcwxzg43cqjhfan060xyv4avmqjf43bn23h25fmjs"
         },
         "buildInputs": [
             "kde4"
@@ -3626,11 +3626,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-ja-15.04.2",
+        "name": "kde-l10n-ja-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ja-15.04.2.tar.xz",
-            "name": "kde-l10n-ja-15.04.2.tar.xz",
-            "sha256": "02b3243zbnrkygnbiq7nxrl2sq6ssi27kpn9382aa8b19w96gcsz"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ja-15.04.3.tar.xz",
+            "name": "kde-l10n-ja-15.04.3.tar.xz",
+            "sha256": "1423jd7lkldnqslvww1ypvmdgzbydlibjy19gmrazlsnmfrp6zzs"
         },
         "buildInputs": [
             "ecm",
@@ -3647,11 +3647,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdenlive-15.04.2",
+        "name": "kdenlive-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdenlive-15.04.2.tar.xz",
-            "name": "kdenlive-15.04.2.tar.xz",
-            "sha256": "1q17b5gihcgi5svs123h0vl25ij4ajybk16is9hjyfpmhkl7nyfa"
+            "url": "stable/applications/15.04.3/src/kdenlive-15.04.3.tar.xz",
+            "name": "kdenlive-15.04.3.tar.xz",
+            "sha256": "17v5r0fcb0j52a89v6ygsbap03cg4ah5v5jqy2lpck8y57vslvgv"
         },
         "buildInputs": [
             "ecm",
@@ -3696,11 +3696,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kbreakout-15.04.2",
+        "name": "kbreakout-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kbreakout-15.04.2.tar.xz",
-            "name": "kbreakout-15.04.2.tar.xz",
-            "sha256": "1wrggwcgyc6vlxy0zx8y69lvz0njalbfw54sgnrnc8ka65mjr0pg"
+            "url": "stable/applications/15.04.3/src/kbreakout-15.04.3.tar.xz",
+            "name": "kbreakout-15.04.3.tar.xz",
+            "sha256": "1wpc1r8xgz985514iiym49268rn4qa6msbslmc55r6bgyawjm1g1"
         },
         "buildInputs": [
             "ecm",
@@ -3734,11 +3734,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-workspace-4.11.20",
+        "name": "kde-workspace-4.11.21",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-workspace-4.11.20.tar.xz",
-            "name": "kde-workspace-4.11.20.tar.xz",
-            "sha256": "06n4aq0mi36d1ssqbvwxgy6jc18q70xp772i58ni0akw0ckrp33c"
+            "url": "stable/applications/15.04.3/src/kde-workspace-4.11.21.tar.xz",
+            "name": "kde-workspace-4.11.21.tar.xz",
+            "sha256": "13vwgzz838nlqryh8nhlx70c5msyl5alrqdqlcamncxg0a4cd5ki"
         },
         "buildInputs": [
             "akonadi",
@@ -3785,11 +3785,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ffmpegthumbs-15.04.2",
+        "name": "ffmpegthumbs-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ffmpegthumbs-15.04.2.tar.xz",
-            "name": "ffmpegthumbs-15.04.2.tar.xz",
-            "sha256": "122mfd85yzkmyg1wzz7fz4v0jnxxifinckc9rb5ydjlj3c85y9qg"
+            "url": "stable/applications/15.04.3/src/ffmpegthumbs-15.04.3.tar.xz",
+            "name": "ffmpegthumbs-15.04.3.tar.xz",
+            "sha256": "1di5v6bpf8zvw243dc7rdrzynvvwgnk6pnckg9zafhwsds6br5wc"
         },
         "buildInputs": [
             "ffmpeg",
@@ -3803,11 +3803,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ktux-15.04.2",
+        "name": "ktux-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ktux-15.04.2.tar.xz",
-            "name": "ktux-15.04.2.tar.xz",
-            "sha256": "0pdgbqbk3iwjywvhm6bzwqc6acfnyjixj2j3yxczn2k6fy5k0vkf"
+            "url": "stable/applications/15.04.3/src/ktux-15.04.3.tar.xz",
+            "name": "ktux-15.04.3.tar.xz",
+            "sha256": "00b6fl056pcxdsgqzv81by10l8xpbijk8589nd0dmj74kca31qrn"
         },
         "buildInputs": [
             "kde4",
@@ -3821,11 +3821,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-dev-utils-15.04.2",
+        "name": "kde-dev-utils-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-dev-utils-15.04.2.tar.xz",
-            "name": "kde-dev-utils-15.04.2.tar.xz",
-            "sha256": "100kia4fd6gc10mh1nmadrm60wwnciyq5nlm0m4c1cjbp9ypyfh5"
+            "url": "stable/applications/15.04.3/src/kde-dev-utils-15.04.3.tar.xz",
+            "name": "kde-dev-utils-15.04.3.tar.xz",
+            "sha256": "0mykd3w2l0yfi18b8jpzdvhy2dzm9avwzfpbsscb8s19vsarqf2x"
         },
         "buildInputs": [
             "kde4"
@@ -3838,11 +3838,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "libkeduvocdocument-15.04.2",
+        "name": "libkeduvocdocument-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/libkeduvocdocument-15.04.2.tar.xz",
-            "name": "libkeduvocdocument-15.04.2.tar.xz",
-            "sha256": "13hzs4lrlrnyya3321iqky2nxjlh65fs2lr0nbl3g6k9wxdxlqfw"
+            "url": "stable/applications/15.04.3/src/libkeduvocdocument-15.04.3.tar.xz",
+            "name": "libkeduvocdocument-15.04.3.tar.xz",
+            "sha256": "1lx72m98x60ddzhqlf5jmnw64jh5pzh02hs4gv9vsgsvbjiizmix"
         },
         "buildInputs": [
             "ecm",
@@ -3862,11 +3862,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-pl-15.04.2",
+        "name": "kde-l10n-pl-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-pl-15.04.2.tar.xz",
-            "name": "kde-l10n-pl-15.04.2.tar.xz",
-            "sha256": "1zs799470abqq9hxgik0wka2im6fi12057jg6id7fi9d58h3lyap"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-pl-15.04.3.tar.xz",
+            "name": "kde-l10n-pl-15.04.3.tar.xz",
+            "sha256": "1kzhwhf2jxmvkr3070qfhn51d7i44ni62dacghssdiisxkcvw0xi"
         },
         "buildInputs": [
             "ecm",
@@ -3883,11 +3883,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ktp-send-file-15.04.2",
+        "name": "ktp-send-file-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ktp-send-file-15.04.2.tar.xz",
-            "name": "ktp-send-file-15.04.2.tar.xz",
-            "sha256": "1jygvxc8ajy6p6qhpfwj0chc0571x50h7n2nzwqiz3nhs3avqxnx"
+            "url": "stable/applications/15.04.3/src/ktp-send-file-15.04.3.tar.xz",
+            "name": "ktp-send-file-15.04.3.tar.xz",
+            "sha256": "1yv4gmgcgi4rlxkispmlrlzi8jp3v1mfansh6w21lafallf3k8kf"
         },
         "buildInputs": [
             "ecm",
@@ -3908,11 +3908,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "cantor-15.04.2",
+        "name": "cantor-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/cantor-15.04.2.tar.xz",
-            "name": "cantor-15.04.2.tar.xz",
-            "sha256": "0y7gs13s38swvicfw9wlxgqr96bvny4d2rsvnkb0cn1d68vmb7jm"
+            "url": "stable/applications/15.04.3/src/cantor-15.04.3.tar.xz",
+            "name": "cantor-15.04.3.tar.xz",
+            "sha256": "02n2pavs8wqngjm9lnw0g1ipdyv42d2pzii57p3nwplfhr8n0ia4"
         },
         "buildInputs": [
             "analitza5",
@@ -3949,11 +3949,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "libkcddb-15.04.2",
+        "name": "libkcddb-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/libkcddb-15.04.2.tar.xz",
-            "name": "libkcddb-15.04.2.tar.xz",
-            "sha256": "1yrmvy8kldhh312dk4kipr15hr4zhsg2yj645naybfh2dya89q6m"
+            "url": "stable/applications/15.04.3/src/libkcddb-15.04.3.tar.xz",
+            "name": "libkcddb-15.04.3.tar.xz",
+            "sha256": "0050h4g99wxggiqibfgrmc9zyqkv1l49x0h2k1r32gxl9lf6iid8"
         },
         "buildInputs": [
             "kde4",
@@ -3967,11 +3967,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "bomber-15.04.2",
+        "name": "bomber-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/bomber-15.04.2.tar.xz",
-            "name": "bomber-15.04.2.tar.xz",
-            "sha256": "1xn52p5apfbm3iyjq1hw2mg5isl3jcbq4x8wfzil2vp3ir16f1j3"
+            "url": "stable/applications/15.04.3/src/bomber-15.04.3.tar.xz",
+            "name": "bomber-15.04.3.tar.xz",
+            "sha256": "15b79l3m280miaf32w9m48w5rysrizv7kqpc4dg8pwp7i4zbjigc"
         },
         "buildInputs": [
             "ecm",
@@ -3996,11 +3996,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "libkface-15.04.2",
+        "name": "libkface-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/libkface-15.04.2.tar.xz",
-            "name": "libkface-15.04.2.tar.xz",
-            "sha256": "08xc93jjplqc6y0m9q6krwplfjj2cklvbw8m9dhhv1w6mn8qp8r3"
+            "url": "stable/applications/15.04.3/src/libkface-15.04.3.tar.xz",
+            "name": "libkface-15.04.3.tar.xz",
+            "sha256": "1k3m8qhqw7xlqg0biidp5ckc1z73m0syxw20shjbmzhhwag5qlql"
         },
         "buildInputs": [
             "kde4",
@@ -4014,11 +4014,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-nb-15.04.2",
+        "name": "kde-l10n-nb-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-nb-15.04.2.tar.xz",
-            "name": "kde-l10n-nb-15.04.2.tar.xz",
-            "sha256": "16ya60pxn30rpwidijcycmjxm8c61hiykzfirba73i0pkzq13nij"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-nb-15.04.3.tar.xz",
+            "name": "kde-l10n-nb-15.04.3.tar.xz",
+            "sha256": "0p07mwcdk2anazcx2f86dxywmkpgxb5qnwlaah9zfqzlv915v4mp"
         },
         "buildInputs": [
             "ecm",
@@ -4035,11 +4035,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kturtle-15.04.2",
+        "name": "kturtle-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kturtle-15.04.2.tar.xz",
-            "name": "kturtle-15.04.2.tar.xz",
-            "sha256": "0xgb2ahzyg88iz1dgvbc5n17fbds56mixcfk4mmi2hgycckjk910"
+            "url": "stable/applications/15.04.3/src/kturtle-15.04.3.tar.xz",
+            "name": "kturtle-15.04.3.tar.xz",
+            "sha256": "0qxymwmd7fdqqzbkj7jjziddmgr01vhnfhfy891m6mzrmhak6dcb"
         },
         "buildInputs": [
             "ecm",
@@ -4062,11 +4062,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "svgpart-15.04.2",
+        "name": "svgpart-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/svgpart-15.04.2.tar.xz",
-            "name": "svgpart-15.04.2.tar.xz",
-            "sha256": "09f9zfppa82zxzrm7b1c7q6hn3dry0rwzz3xpx26dsh219qaax29"
+            "url": "stable/applications/15.04.3/src/svgpart-15.04.3.tar.xz",
+            "name": "svgpart-15.04.3.tar.xz",
+            "sha256": "1b6apnppn2qal1jc0z1mfss71dscvfx2i8wr25wq6mzy8y1ajwzr"
         },
         "buildInputs": [
             "kde4"
@@ -4079,11 +4079,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdegraphics-mobipocket-15.04.2",
+        "name": "kdegraphics-mobipocket-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdegraphics-mobipocket-15.04.2.tar.xz",
-            "name": "kdegraphics-mobipocket-15.04.2.tar.xz",
-            "sha256": "1y3w477bws206fx1rymvp9dr7z8bxy1l2p0cdawlnbir9bamsnnc"
+            "url": "stable/applications/15.04.3/src/kdegraphics-mobipocket-15.04.3.tar.xz",
+            "name": "kdegraphics-mobipocket-15.04.3.tar.xz",
+            "sha256": "123fa5x6zdnm2c18i02azp9ingr2vkrxsrhfafa38v5b4y3jki6g"
         },
         "buildInputs": [
             "kde4",
@@ -4097,11 +4097,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "krfb-15.04.2",
+        "name": "krfb-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/krfb-15.04.2.tar.xz",
-            "name": "krfb-15.04.2.tar.xz",
-            "sha256": "1ynvwvhkshjrh1d1rifawzwv0srqj9wlqhhiv5nr8lwd4m29pdj2"
+            "url": "stable/applications/15.04.3/src/krfb-15.04.3.tar.xz",
+            "name": "krfb-15.04.3.tar.xz",
+            "sha256": "0pa2xnbgg6rlb3my92kc4kr0sgifrjf8r0j594sdsyfz960hzd2l"
         },
         "buildInputs": [
             "kde4",
@@ -4117,11 +4117,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-ko-15.04.2",
+        "name": "kde-l10n-ko-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ko-15.04.2.tar.xz",
-            "name": "kde-l10n-ko-15.04.2.tar.xz",
-            "sha256": "1knsgxhgz0cvxk0y460zyzk5n9q0rk8p3cdf0wlpxf7z8wvxcab0"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ko-15.04.3.tar.xz",
+            "name": "kde-l10n-ko-15.04.3.tar.xz",
+            "sha256": "0qs4mcds85rs4kqhck7n450makj295bnfrjlx2hgx1bzk8jpgl19"
         },
         "buildInputs": [
             "ecm",
@@ -4138,11 +4138,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "libkgeomap-15.04.2",
+        "name": "libkgeomap-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/libkgeomap-15.04.2.tar.xz",
-            "name": "libkgeomap-15.04.2.tar.xz",
-            "sha256": "091jl7zdcvj91xqr6fh8vvn5wrbg86ykczj43lgvnnph28h1xpyh"
+            "url": "stable/applications/15.04.3/src/libkgeomap-15.04.3.tar.xz",
+            "name": "libkgeomap-15.04.3.tar.xz",
+            "sha256": "1h0w1vdnxawgibp479vh1rsqz17gps459wxcixwxmcgb4xxrf1dk"
         },
         "buildInputs": [
             "kde4",
@@ -4158,11 +4158,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kalgebra-15.04.2",
+        "name": "kalgebra-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kalgebra-15.04.2.tar.xz",
-            "name": "kalgebra-15.04.2.tar.xz",
-            "sha256": "1h8rpikyigx9804pn0624g83ja1wlb2m4hfc29jpi4j6va4h8j4f"
+            "url": "stable/applications/15.04.3/src/kalgebra-15.04.3.tar.xz",
+            "name": "kalgebra-15.04.3.tar.xz",
+            "sha256": "1h67lcxsvsccqk66k6xs1ah2nb1p05p1mcdkcbqjfs0bpw8mby5z"
         },
         "buildInputs": [
             "analitza5",
@@ -4193,11 +4193,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "rocs-15.04.2",
+        "name": "rocs-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/rocs-15.04.2.tar.xz",
-            "name": "rocs-15.04.2.tar.xz",
-            "sha256": "0zgxgbmmc3wy0k0s6dx7gprw4dl1rgdrq2ah98zr658bpwkkm9aw"
+            "url": "stable/applications/15.04.3/src/rocs-15.04.3.tar.xz",
+            "name": "rocs-15.04.3.tar.xz",
+            "sha256": "123kj345nh1pq1d3w04k2ssf26q2hp6w8mnvlpza4fgav9lrw57m"
         },
         "buildInputs": [
             "boost",
@@ -4235,11 +4235,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kbruch-15.04.2",
+        "name": "kbruch-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kbruch-15.04.2.tar.xz",
-            "name": "kbruch-15.04.2.tar.xz",
-            "sha256": "0w1fw3lydp5znk3n5fhg30gj7mxi7v6y7hv46wl01cysd73m7825"
+            "url": "stable/applications/15.04.3/src/kbruch-15.04.3.tar.xz",
+            "name": "kbruch-15.04.3.tar.xz",
+            "sha256": "0fivkpa5cr5ahhh1h1z90vl1sr35ks0kmw2mnpk42wgpgipdfbfx"
         },
         "buildInputs": [
             "ecm",
@@ -4262,11 +4262,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ksudoku-15.04.2",
+        "name": "ksudoku-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ksudoku-15.04.2.tar.xz",
-            "name": "ksudoku-15.04.2.tar.xz",
-            "sha256": "1xn2d7aiqv0q3lg5iwhjp2abwq2ssxa8gdjawvj40xq4zffr0wna"
+            "url": "stable/applications/15.04.3/src/ksudoku-15.04.3.tar.xz",
+            "name": "ksudoku-15.04.3.tar.xz",
+            "sha256": "130v3fhhcxf2fkrhkgb7lqjdv4h7kwzn6z133hmqd617s53pnmfw"
         },
         "buildInputs": [
             "kde4",
@@ -4281,11 +4281,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-el-15.04.2",
+        "name": "kde-l10n-el-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-el-15.04.2.tar.xz",
-            "name": "kde-l10n-el-15.04.2.tar.xz",
-            "sha256": "1y2q5vqm9xkv2yxzwqxrsyqnd8zdfzz5vyza3g4aisawh3xhwq25"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-el-15.04.3.tar.xz",
+            "name": "kde-l10n-el-15.04.3.tar.xz",
+            "sha256": "1h5hj8li66h5p309rcyk4f6sahdgs25ihdfy673bd7hjz51hk3da"
         },
         "buildInputs": [
             "ecm",
@@ -4302,11 +4302,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kopete-15.04.2",
+        "name": "kopete-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kopete-15.04.2.tar.xz",
-            "name": "kopete-15.04.2.tar.xz",
-            "sha256": "1zvf0y7f8r97lvwcspp2bwph5wsh1rcac9hp6vg0hkama3iqfbk3"
+            "url": "stable/applications/15.04.3/src/kopete-15.04.3.tar.xz",
+            "name": "kopete-15.04.3.tar.xz",
+            "sha256": "07d51in5h6f07gf12pr2fb2w7gkwyca04ra8vy7m373lrkv71i35"
         },
         "buildInputs": [
             "alsa",
@@ -4350,11 +4350,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-de-15.04.2",
+        "name": "kde-l10n-de-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-de-15.04.2.tar.xz",
-            "name": "kde-l10n-de-15.04.2.tar.xz",
-            "sha256": "0fvb169pl9ibppiinc2sq164i7cikn7qxvycdv1whk3bcv376rrh"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-de-15.04.3.tar.xz",
+            "name": "kde-l10n-de-15.04.3.tar.xz",
+            "sha256": "1yvc9z5fzhpv6xvc2r69fvfxhr6p6fp2b7hpfs7l0v2p1vlw59fl"
         },
         "buildInputs": [
             "ecm",
@@ -4371,11 +4371,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-nds-15.04.2",
+        "name": "kde-l10n-nds-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-nds-15.04.2.tar.xz",
-            "name": "kde-l10n-nds-15.04.2.tar.xz",
-            "sha256": "0ryjlw2d9lrzzf08v1vscjr6mp2ckpbd0f2hkxg0ck8wgn7c2mxd"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-nds-15.04.3.tar.xz",
+            "name": "kde-l10n-nds-15.04.3.tar.xz",
+            "sha256": "135ibbcddyqw65v0gvb1cvd6d736wwdvqy2q819808z44ylah8ha"
         },
         "buildInputs": [
             "ecm",
@@ -4392,11 +4392,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-pa-15.04.2",
+        "name": "kde-l10n-pa-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-pa-15.04.2.tar.xz",
-            "name": "kde-l10n-pa-15.04.2.tar.xz",
-            "sha256": "1wi9l74fln9q92l1qmxgb2223gwkb6x2v753mzm7607hbcx9y8dx"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-pa-15.04.3.tar.xz",
+            "name": "kde-l10n-pa-15.04.3.tar.xz",
+            "sha256": "0dksyld8jn3qngnb7r4g0ir2zy6c7dm2gx8ws5zz3k7ism61fqby"
         },
         "buildInputs": [
             "ecm",
@@ -4424,11 +4424,11 @@
             "qt5gui",
             "qt5widgets"
         ],
-        "name": "okteta-15.04.2",
+        "name": "okteta-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/okteta-15.04.2.tar.xz",
-            "name": "okteta-15.04.2.tar.xz",
-            "sha256": "00y3kcl57crwkycd7ahf9cw20bnjwzjrxnlkvdpqansmcqvmmih5"
+            "url": "stable/applications/15.04.3/src/okteta-15.04.3.tar.xz",
+            "name": "okteta-15.04.3.tar.xz",
+            "sha256": "1z52n88kjkzjdsvyr0sksh0kmjya5gwjra6gnjaqfd25nbralgnc"
         },
         "buildInputs": [
             "ecm",
@@ -4469,11 +4469,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ktp-accounts-kcm-15.04.2",
+        "name": "ktp-accounts-kcm-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ktp-accounts-kcm-15.04.2.tar.xz",
-            "name": "ktp-accounts-kcm-15.04.2.tar.xz",
-            "sha256": "1icmsax7abwfjavmq9vn2l3hj7hbjdhky60hga52sdnw7hy58n01"
+            "url": "stable/applications/15.04.3/src/ktp-accounts-kcm-15.04.3.tar.xz",
+            "name": "ktp-accounts-kcm-15.04.3.tar.xz",
+            "sha256": "00gvcps8h5bi612fwyy5xgb855avv7ad4gfhbbpqz2bykgsjfgj7"
         },
         "buildInputs": [
             "accountsfiledir",
@@ -4506,11 +4506,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "zeroconf-ioslave-15.04.2",
+        "name": "zeroconf-ioslave-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/zeroconf-ioslave-15.04.2.tar.xz",
-            "name": "zeroconf-ioslave-15.04.2.tar.xz",
-            "sha256": "0129dc6r1sfxjg3bdfbnprgvf7iricshw1l879cw2lzb7wmqdpm9"
+            "url": "stable/applications/15.04.3/src/zeroconf-ioslave-15.04.3.tar.xz",
+            "name": "zeroconf-ioslave-15.04.3.tar.xz",
+            "sha256": "141hfbcikpwsr9il3ysjslprcqp1687ncrrhjw3h1qq5pdm8z96p"
         },
         "buildInputs": [
             "kde4"
@@ -4523,11 +4523,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kremotecontrol-15.04.2",
+        "name": "kremotecontrol-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kremotecontrol-15.04.2.tar.xz",
-            "name": "kremotecontrol-15.04.2.tar.xz",
-            "sha256": "0npdbdjcfa8y7lmzl80fgbvv94hj2v0fc1lfmii0k0xnb6jv8cvl"
+            "url": "stable/applications/15.04.3/src/kremotecontrol-15.04.3.tar.xz",
+            "name": "kremotecontrol-15.04.3.tar.xz",
+            "sha256": "0zia5j0svgprglckfkf9vb7d5dkgggil7a2qc55yhpr2ihnvryvl"
         },
         "buildInputs": [
             "kde4",
@@ -4541,11 +4541,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-bs-15.04.2",
+        "name": "kde-l10n-bs-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-bs-15.04.2.tar.xz",
-            "name": "kde-l10n-bs-15.04.2.tar.xz",
-            "sha256": "0vlsij3zfbqlcl9xg3iwvyi112d8i00rjbrpwc15lyhw19xzjakb"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-bs-15.04.3.tar.xz",
+            "name": "kde-l10n-bs-15.04.3.tar.xz",
+            "sha256": "0lf1nxf068fyl7vck3vqdzaj8f5mpq3lzs10rg5qkm3a3qli0drc"
         },
         "buildInputs": [
             "ecm",
@@ -4562,11 +4562,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ark-15.04.2",
+        "name": "ark-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ark-15.04.2.tar.xz",
-            "name": "ark-15.04.2.tar.xz",
-            "sha256": "0pssyyk8kf0qy9vh71kx3h5f1fs26k21cql97mfsl4hz181mfxkq"
+            "url": "stable/applications/15.04.3/src/ark-15.04.3.tar.xz",
+            "name": "ark-15.04.3.tar.xz",
+            "sha256": "1065i6vs1cswjd0lb7b01b7fl6k5p73pfbp5nfzjxi9a1sl4sql5"
         },
         "buildInputs": [
             "bzip2",
@@ -4597,11 +4597,11 @@
             "qt5widgets",
             "qt5xml"
         ],
-        "name": "libkdegames-15.04.2",
+        "name": "libkdegames-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/libkdegames-15.04.2.tar.xz",
-            "name": "libkdegames-15.04.2.tar.xz",
-            "sha256": "0r3mnbc4ka8whmdjadnr6wyac4bwfv6w01l6nm2k7gsq2n38q2yj"
+            "url": "stable/applications/15.04.3/src/libkdegames-15.04.3.tar.xz",
+            "name": "libkdegames-15.04.3.tar.xz",
+            "sha256": "051bn6f3f1blzxkm16lqnplwba9c6q0ig6ah819vadw7qbmls44n"
         },
         "buildInputs": [
             "ecm",
@@ -4648,11 +4648,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-hi-15.04.2",
+        "name": "kde-l10n-hi-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-hi-15.04.2.tar.xz",
-            "name": "kde-l10n-hi-15.04.2.tar.xz",
-            "sha256": "1yqk7wva2r6smasgxzw6f1pw43z1jddf4br1rzq3k7f18np89im7"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-hi-15.04.3.tar.xz",
+            "name": "kde-l10n-hi-15.04.3.tar.xz",
+            "sha256": "1xjicw98r69jlby116xy3g5z6kbblry1h0wfrsyp1m8s8fm4f2gm"
         },
         "buildInputs": [
             "ecm",
@@ -4669,11 +4669,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "cervisia-15.04.2",
+        "name": "cervisia-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/cervisia-15.04.2.tar.xz",
-            "name": "cervisia-15.04.2.tar.xz",
-            "sha256": "10a6k6x5mxcp3ark71rjcsbvi9q7r7sqc0pqx6wqg8wrvqng776i"
+            "url": "stable/applications/15.04.3/src/cervisia-15.04.3.tar.xz",
+            "name": "cervisia-15.04.3.tar.xz",
+            "sha256": "18fl0krby18y94xqc8g78rplgsidqwzxwvv4j3xypsjvhaalrw7q"
         },
         "buildInputs": [
             "kde4"
@@ -4686,11 +4686,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-en_GB-15.04.2",
+        "name": "kde-l10n-en_GB-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-en_GB-15.04.2.tar.xz",
-            "name": "kde-l10n-en_GB-15.04.2.tar.xz",
-            "sha256": "10db8pnbbxc35shx0f7vfiz0glm9kb521b99iksjkwnxpss9kyvx"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-en_GB-15.04.3.tar.xz",
+            "name": "kde-l10n-en_GB-15.04.3.tar.xz",
+            "sha256": "0wlca0rp01x8z4ff26db8nsiafly2frk4fvxsw86rc7cwb15ck7q"
         },
         "buildInputs": [
             "ecm",
@@ -4707,11 +4707,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kapman-15.04.2",
+        "name": "kapman-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kapman-15.04.2.tar.xz",
-            "name": "kapman-15.04.2.tar.xz",
-            "sha256": "1jxxs2ljfci9llfv1pyybrw10nbajk06k8yhw4yswn23j544049a"
+            "url": "stable/applications/15.04.3/src/kapman-15.04.3.tar.xz",
+            "name": "kapman-15.04.3.tar.xz",
+            "sha256": "0avlvf4nw89xa224g5h53rf4xmmb32z25ia4ilpiaglsm5lavkf8"
         },
         "buildInputs": [
             "ecm",
@@ -4738,11 +4738,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdeedu-data-15.04.2",
+        "name": "kdeedu-data-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdeedu-data-15.04.2.tar.xz",
-            "name": "kdeedu-data-15.04.2.tar.xz",
-            "sha256": "04m14g1b8bkngawjx3x9sdla7p10dhxqwvfv29nkm1lblmc547ia"
+            "url": "stable/applications/15.04.3/src/kdeedu-data-15.04.3.tar.xz",
+            "name": "kdeedu-data-15.04.3.tar.xz",
+            "sha256": "14k0dcbhxkfpb7rwrp08lzd3m201v3gahv1cd9hy1wzga513kbm2"
         },
         "buildInputs": [
             "ecm"
@@ -4755,11 +4755,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kgeography-15.04.2",
+        "name": "kgeography-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kgeography-15.04.2.tar.xz",
-            "name": "kgeography-15.04.2.tar.xz",
-            "sha256": "1iddjjpvyimbc9p0z2qzqc2v1q48pvm1d6qd4pdbycshpcm4wjwd"
+            "url": "stable/applications/15.04.3/src/kgeography-15.04.3.tar.xz",
+            "name": "kgeography-15.04.3.tar.xz",
+            "sha256": "1qra3j6zrwihm5c896adh0acy7lgbkpcw8ja22dv519926slbi84"
         },
         "buildInputs": [
             "ecm",
@@ -4785,11 +4785,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdesdk-thumbnailers-15.04.2",
+        "name": "kdesdk-thumbnailers-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdesdk-thumbnailers-15.04.2.tar.xz",
-            "name": "kdesdk-thumbnailers-15.04.2.tar.xz",
-            "sha256": "048i3xy580gpgbk9m42wv2v0cf1gk2zlx52dvf4izczracsvl2n7"
+            "url": "stable/applications/15.04.3/src/kdesdk-thumbnailers-15.04.3.tar.xz",
+            "name": "kdesdk-thumbnailers-15.04.3.tar.xz",
+            "sha256": "06vznwg9fhrky5bf46hfaxw4dyh9nfr0v0slh77ys0szn18cns7c"
         },
         "buildInputs": [
             "gettextpo",
@@ -4803,11 +4803,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kppp-15.04.2",
+        "name": "kppp-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kppp-15.04.2.tar.xz",
-            "name": "kppp-15.04.2.tar.xz",
-            "sha256": "0g89b800v06p1ymxdm7g04ajdmdh86y740hnzr0r64rdhsxq0wn9"
+            "url": "stable/applications/15.04.3/src/kppp-15.04.3.tar.xz",
+            "name": "kppp-15.04.3.tar.xz",
+            "sha256": "0ibmc0axcxg4x4dcwdjhq4mgvfrcm18n2g12qd2b27czhiffbq7b"
         },
         "buildInputs": [
             "kde4"
@@ -4820,11 +4820,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-ug-15.04.2",
+        "name": "kde-l10n-ug-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ug-15.04.2.tar.xz",
-            "name": "kde-l10n-ug-15.04.2.tar.xz",
-            "sha256": "0ck01ygnz7ycfpff7g2zyix0zv19ia8csmggvyv07lp0k84asxr1"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ug-15.04.3.tar.xz",
+            "name": "kde-l10n-ug-15.04.3.tar.xz",
+            "sha256": "1mrgcx242jnh32kz522jnc3wihn7a72231pibw6sh2hmykcv5yjl"
         },
         "buildInputs": [
             "ecm",
@@ -4841,11 +4841,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kgpg-15.04.2",
+        "name": "kgpg-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kgpg-15.04.2.tar.xz",
-            "name": "kgpg-15.04.2.tar.xz",
-            "sha256": "1z3p0131hvnj3mm53n3q1hdkpvi77x1k8gv1bi3wblqin41dgmfx"
+            "url": "stable/applications/15.04.3/src/kgpg-15.04.3.tar.xz",
+            "name": "kgpg-15.04.3.tar.xz",
+            "sha256": "13hswfxfs4h58aizydl4v8i8zlac0k7qp5br7aqa5p9fpaj8496b"
         },
         "buildInputs": [
             "gpgme",
@@ -4860,11 +4860,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-lv-15.04.2",
+        "name": "kde-l10n-lv-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-lv-15.04.2.tar.xz",
-            "name": "kde-l10n-lv-15.04.2.tar.xz",
-            "sha256": "1skw7d5yxdy7vd2z6fnslcp7xpwjrvxzgl7kd9shvj7px988bfng"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-lv-15.04.3.tar.xz",
+            "name": "kde-l10n-lv-15.04.3.tar.xz",
+            "sha256": "1ac377lba57wjmnqr9jqjmq8qn9a15hvydbnbj35akqchppcvpk2"
         },
         "buildInputs": [
             "ecm",
@@ -4881,11 +4881,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-hr-15.04.2",
+        "name": "kde-l10n-hr-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-hr-15.04.2.tar.xz",
-            "name": "kde-l10n-hr-15.04.2.tar.xz",
-            "sha256": "0r5hfhdnjj9j0zzs6yr7a6hc1aidki5far9njn88c78ialw4y9kn"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-hr-15.04.3.tar.xz",
+            "name": "kde-l10n-hr-15.04.3.tar.xz",
+            "sha256": "12n0s8a8iy1bldnjzhg9jiy896c9vyj5zj23mxlbmzchz5gz9bby"
         },
         "buildInputs": [
             "ecm",
@@ -4902,11 +4902,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-ca-15.04.2",
+        "name": "kde-l10n-ca-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ca-15.04.2.tar.xz",
-            "name": "kde-l10n-ca-15.04.2.tar.xz",
-            "sha256": "00imm41b9769j0pwgcgavdcwmy59qwnab3qkf8xq22899fvadq7b"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ca-15.04.3.tar.xz",
+            "name": "kde-l10n-ca-15.04.3.tar.xz",
+            "sha256": "1yag38xhairw08zm0q5qrwzria3hzs75cipgf4xrwii946rx3g44"
         },
         "buildInputs": [
             "ecm",
@@ -4923,11 +4923,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "mplayerthumbs-15.04.2",
+        "name": "mplayerthumbs-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/mplayerthumbs-15.04.2.tar.xz",
-            "name": "mplayerthumbs-15.04.2.tar.xz",
-            "sha256": "0lgag714pqpqnf6v9dz5xlriswcyqvjnj309gk0wji523hny3mim"
+            "url": "stable/applications/15.04.3/src/mplayerthumbs-15.04.3.tar.xz",
+            "name": "mplayerthumbs-15.04.3.tar.xz",
+            "sha256": "0ah79wl2qi15y874ds39f53pz2qsc0iwy7h33jzrqmy85sx92g71"
         },
         "buildInputs": [
             "kde4"
@@ -4940,11 +4940,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kate-15.04.2",
+        "name": "kate-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kate-15.04.2.tar.xz",
-            "name": "kate-15.04.2.tar.xz",
-            "sha256": "1llsg7ywl9mwl4gc25vw44v708r9k960c2lgqkfjpxnxpjlwk5vp"
+            "url": "stable/applications/15.04.3/src/kate-15.04.3.tar.xz",
+            "name": "kate-15.04.3.tar.xz",
+            "sha256": "0lr0f23ylv6rlm3yqzkrklnj9c0rsfnsmn0gnkd7bw7hwcgb0wfz"
         },
         "buildInputs": [
             "ecm",
@@ -4971,11 +4971,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ksaneplugin-15.04.2",
+        "name": "ksaneplugin-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ksaneplugin-15.04.2.tar.xz",
-            "name": "ksaneplugin-15.04.2.tar.xz",
-            "sha256": "0s69h4swdcxagv45v8y0kbg4ik3pyl7asiryvz9dip7yznwlxlz9"
+            "url": "stable/applications/15.04.3/src/ksaneplugin-15.04.3.tar.xz",
+            "name": "ksaneplugin-15.04.3.tar.xz",
+            "sha256": "1zy2ybdgihji4blz9vwfmnw0k1b8s60qfhpjcmrgzlbc4kp0wag7"
         },
         "buildInputs": [
             "kde4",
@@ -4991,11 +4991,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-runtime-15.04.2",
+        "name": "kde-runtime-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-runtime-15.04.2.tar.xz",
-            "name": "kde-runtime-15.04.2.tar.xz",
-            "sha256": "1bcg5g6b8vij6zf1s6y4m5296yqiaavgbfcg1xzfcs8b5l7pckrn"
+            "url": "stable/applications/15.04.3/src/kde-runtime-15.04.3.tar.xz",
+            "name": "kde-runtime-15.04.3.tar.xz",
+            "sha256": "0fyd9wksb7lxqsbq24q2vhy35a7pfr9mqa1xgpx5rjcml3n1vlpq"
         },
         "buildInputs": [
             "alsa",
@@ -5032,11 +5032,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ktp-text-ui-15.04.2",
+        "name": "ktp-text-ui-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ktp-text-ui-15.04.2.tar.xz",
-            "name": "ktp-text-ui-15.04.2.tar.xz",
-            "sha256": "15kh8jwysvzlxrp4r4vhnla0lmwpxcyaf3gyy2lz0lb1k2k368n4"
+            "url": "stable/applications/15.04.3/src/ktp-text-ui-15.04.3.tar.xz",
+            "name": "ktp-text-ui-15.04.3.tar.xz",
+            "sha256": "0my4gxw73pmpi45xa2s3ny933kmbfal733iq235vpsqqmdyz7mah"
         },
         "buildInputs": [
             "ecm",
@@ -5071,11 +5071,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kaccounts-providers-15.04.2",
+        "name": "kaccounts-providers-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kaccounts-providers-15.04.2.tar.xz",
-            "name": "kaccounts-providers-15.04.2.tar.xz",
-            "sha256": "1a2mwv1lvmnw7apb94w4620ip3d3p8xxp3ff0yg633x60g0wnkiv"
+            "url": "stable/applications/15.04.3/src/kaccounts-providers-15.04.3.tar.xz",
+            "name": "kaccounts-providers-15.04.3.tar.xz",
+            "sha256": "0lpdcjqqrl3c9l6asfqjbas79g145i6a8ix6dhzc8s77vp1wqxil"
         },
         "buildInputs": [
             "accountsfiledir",
@@ -5090,11 +5090,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kteatime-15.04.2",
+        "name": "kteatime-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kteatime-15.04.2.tar.xz",
-            "name": "kteatime-15.04.2.tar.xz",
-            "sha256": "0cpy6z6nxys307247l9rcms9f4n2qpnvij1c20s0bcb03n5ya0vp"
+            "url": "stable/applications/15.04.3/src/kteatime-15.04.3.tar.xz",
+            "name": "kteatime-15.04.3.tar.xz",
+            "sha256": "1359y527nlwzb6jhid5wl3y93ajxawbjd1hf0pmfg5pxpy7aykzg"
         },
         "buildInputs": [
             "ecm",
@@ -5122,11 +5122,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "krdc-15.04.2",
+        "name": "krdc-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/krdc-15.04.2.tar.xz",
-            "name": "krdc-15.04.2.tar.xz",
-            "sha256": "0m7jmwrzihzm8iswzvw5ajz4yiaxdsprdkhgl1a59hgm7wgrp8yg"
+            "url": "stable/applications/15.04.3/src/krdc-15.04.3.tar.xz",
+            "name": "krdc-15.04.3.tar.xz",
+            "sha256": "0ylq0dpn45cp1s3y3gb7mrvkjx798knpfmb50lhl3397z1niw4zv"
         },
         "buildInputs": [
             "kde4",
@@ -5142,11 +5142,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "klickety-15.04.2",
+        "name": "klickety-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/klickety-15.04.2.tar.xz",
-            "name": "klickety-15.04.2.tar.xz",
-            "sha256": "149jka949jcpd75kg9rk2xa6m3hvkaiif57a35bg2pdzs41dqnn5"
+            "url": "stable/applications/15.04.3/src/klickety-15.04.3.tar.xz",
+            "name": "klickety-15.04.3.tar.xz",
+            "sha256": "0zxnclm74l77f6lwz74wkk831sidwcsd6lc94p853gngmrra5a0c"
         },
         "buildInputs": [
             "kde4",
@@ -5160,11 +5160,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kolf-15.04.2",
+        "name": "kolf-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kolf-15.04.2.tar.xz",
-            "name": "kolf-15.04.2.tar.xz",
-            "sha256": "0fifvpsp6nbr58r1pammynw4zh4k9z51vgm5xbcl1k6pblh6hn6l"
+            "url": "stable/applications/15.04.3/src/kolf-15.04.3.tar.xz",
+            "name": "kolf-15.04.3.tar.xz",
+            "sha256": "1vhhy3pffp4f92zm1k1ksx18gvv404jfa6p28ybsp23fb22z8f90"
         },
         "buildInputs": [
             "kde4",
@@ -5178,11 +5178,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ktouch-15.04.2",
+        "name": "ktouch-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ktouch-15.04.2.tar.xz",
-            "name": "ktouch-15.04.2.tar.xz",
-            "sha256": "18f0r9d0hs1prrwj33iwik9ipdf3hyf316yz7jbg3iyygp8xa1wf"
+            "url": "stable/applications/15.04.3/src/ktouch-15.04.3.tar.xz",
+            "name": "ktouch-15.04.3.tar.xz",
+            "sha256": "03xvj2rpamw5b6bpbiqkk01jhnkhcqi3c4rxhd0dxqi3da0r1211"
         },
         "buildInputs": [
             "kde4",
@@ -5198,11 +5198,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdepim-4.14.9",
+        "name": "kdepim-4.14.10",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdepim-4.14.9.tar.xz",
-            "name": "kdepim-4.14.9.tar.xz",
-            "sha256": "0l4nfcf0k958w37bzmbfpvs96yba0r22q16z4d1ksqbyrr6v7ycf"
+            "url": "stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz",
+            "name": "kdepim-4.14.10.tar.xz",
+            "sha256": "1qmpbgwchjzfrw8nyvx5ibd6zl05w4kn341519w334r5h5dqdbgd"
         },
         "buildInputs": [
             "akonadi",
@@ -5228,11 +5228,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "poxml-15.04.2",
+        "name": "poxml-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/poxml-15.04.2.tar.xz",
-            "name": "poxml-15.04.2.tar.xz",
-            "sha256": "09rvf4yzrncc0q3975mwj37a3pm0l07r3jnqzhbapdkkwjqs9ad3"
+            "url": "stable/applications/15.04.3/src/poxml-15.04.3.tar.xz",
+            "name": "poxml-15.04.3.tar.xz",
+            "sha256": "1n49q5rrhi878jwcvgzy8cri2dd2ycv24m4b0js7j1vxl3cy26n9"
         },
         "buildInputs": [
             "gettext",
@@ -5247,11 +5247,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "okular-15.04.2",
+        "name": "okular-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/okular-15.04.2.tar.xz",
-            "name": "okular-15.04.2.tar.xz",
-            "sha256": "0cqqh4f4ymyx7204ba0afy2hscayd8aqg8dpbv13xxhs8m1aa3p7"
+            "url": "stable/applications/15.04.3/src/okular-15.04.3.tar.xz",
+            "name": "okular-15.04.3.tar.xz",
+            "sha256": "03mmdvnjbaaph4zdpddpfs55v7idn95cf1wvxv540flx3qzn9s7z"
         },
         "buildInputs": [
             "activeapp",
@@ -5280,11 +5280,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-fi-15.04.2",
+        "name": "kde-l10n-fi-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-fi-15.04.2.tar.xz",
-            "name": "kde-l10n-fi-15.04.2.tar.xz",
-            "sha256": "0zpkcs64g5si5r5q075vkva41sx39qp30hycdzhvbs72hkjkp6m8"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-fi-15.04.3.tar.xz",
+            "name": "kde-l10n-fi-15.04.3.tar.xz",
+            "sha256": "07vk6c62g1fywpqbvaa29gwgl4prcyxk4l1j15cj2zwrkl35hi20"
         },
         "buildInputs": [
             "ecm",
@@ -5305,11 +5305,11 @@
             "telepathyloggerqt",
             "telepathyqt5"
         ],
-        "name": "ktp-common-internals-15.04.2",
+        "name": "ktp-common-internals-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ktp-common-internals-15.04.2.tar.xz",
-            "name": "ktp-common-internals-15.04.2.tar.xz",
-            "sha256": "0b255d8yf8xi426kpsqb3s1dqsqvypk485pw327kvqg2jj2jdmiq"
+            "url": "stable/applications/15.04.3/src/ktp-common-internals-15.04.3.tar.xz",
+            "name": "ktp-common-internals-15.04.3.tar.xz",
+            "sha256": "1i59k2063590y1nbzbpgdmnxyk4nap2sazr57pi8y4lqzzycr7qv"
         },
         "buildInputs": [
             "accountsqt5",
@@ -5347,11 +5347,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kcachegrind-15.04.2",
+        "name": "kcachegrind-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kcachegrind-15.04.2.tar.xz",
-            "name": "kcachegrind-15.04.2.tar.xz",
-            "sha256": "1f3iqjd4dk3agk6kw096199yrd8ag3zjx9zz58gvlkdww9rlap13"
+            "url": "stable/applications/15.04.3/src/kcachegrind-15.04.3.tar.xz",
+            "name": "kcachegrind-15.04.3.tar.xz",
+            "sha256": "1njlky2gsp9ac00id7kk0m19ygwfp5wpzjncmzvkcx65gdafhnwi"
         },
         "buildInputs": [
             "kde4"
@@ -5364,11 +5364,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdf-15.04.2",
+        "name": "kdf-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdf-15.04.2.tar.xz",
-            "name": "kdf-15.04.2.tar.xz",
-            "sha256": "17mb2hmbm1r0rq5nnh0xmrv3gqcs0ywan8jvxagvli350xgrn2ck"
+            "url": "stable/applications/15.04.3/src/kdf-15.04.3.tar.xz",
+            "name": "kdf-15.04.3.tar.xz",
+            "sha256": "1s8jhz9k4c913fzp88gxsrpxp183vk3rpj497aj0qqh5xrl4pz7a"
         },
         "buildInputs": [
             "kde4"
@@ -5381,11 +5381,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kajongg-15.04.2",
+        "name": "kajongg-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kajongg-15.04.2.tar.xz",
-            "name": "kajongg-15.04.2.tar.xz",
-            "sha256": "1ih2gz0i4r1pbx0ys6wi0fgwwh6c5mlq1hy8qfhbb1kanpl0v30k"
+            "url": "stable/applications/15.04.3/src/kajongg-15.04.3.tar.xz",
+            "name": "kajongg-15.04.3.tar.xz",
+            "sha256": "0gs7h6mx9ngvk2vhn4qn3qbcyf18aw97r1j7if4hqc3lr836zpbg"
         },
         "buildInputs": [
             "kde4",
@@ -5399,11 +5399,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ksquares-15.04.2",
+        "name": "ksquares-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ksquares-15.04.2.tar.xz",
-            "name": "ksquares-15.04.2.tar.xz",
-            "sha256": "01h8kcahn72lh9hdqljz9fx9wdh3gx7rk7fk0xpc7fh0qqwcdv9i"
+            "url": "stable/applications/15.04.3/src/ksquares-15.04.3.tar.xz",
+            "name": "ksquares-15.04.3.tar.xz",
+            "sha256": "0pczn92b0bbgqwqcah4dlhsj5qwqcm0v58j5schpxqvsxz7p26jx"
         },
         "buildInputs": [
             "ecm",
@@ -5432,11 +5432,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kshisen-15.04.2",
+        "name": "kshisen-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kshisen-15.04.2.tar.xz",
-            "name": "kshisen-15.04.2.tar.xz",
-            "sha256": "0syx9x96zm4hlmpz644sn2rfb4phyzrgvcr0kl38l9aj1i56q81a"
+            "url": "stable/applications/15.04.3/src/kshisen-15.04.3.tar.xz",
+            "name": "kshisen-15.04.3.tar.xz",
+            "sha256": "0kagbvw8kilv5908d4b20b7ayj8y44p8bm3av3rijvvz0mn7b4zx"
         },
         "buildInputs": [
             "ecm",
@@ -5464,11 +5464,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-nn-15.04.2",
+        "name": "kde-l10n-nn-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-nn-15.04.2.tar.xz",
-            "name": "kde-l10n-nn-15.04.2.tar.xz",
-            "sha256": "0j0nn7qk7shq5xi9zma0fl7fibsaindsai8lrvfvaphrbdylp3cx"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-nn-15.04.3.tar.xz",
+            "name": "kde-l10n-nn-15.04.3.tar.xz",
+            "sha256": "1xizqrxakgfa3hqfcdm4q97vgzj0lsx8np2jr4xvmd94bh2caw56"
         },
         "buildInputs": [
             "ecm",
@@ -5485,11 +5485,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kdesdk-strigi-analyzers-15.04.2",
+        "name": "kdesdk-strigi-analyzers-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kdesdk-strigi-analyzers-15.04.2.tar.xz",
-            "name": "kdesdk-strigi-analyzers-15.04.2.tar.xz",
-            "sha256": "0wbm6q02zkqbvcq716v468mjxw3zd8xcjqyc3vvz80zfgpbm2dnd"
+            "url": "stable/applications/15.04.3/src/kdesdk-strigi-analyzers-15.04.3.tar.xz",
+            "name": "kdesdk-strigi-analyzers-15.04.3.tar.xz",
+            "sha256": "0n821gwvj2il1zf5s6nqaq58i5r4pn2vzcck1yl2y901shqw6vzb"
         },
         "buildInputs": [
             "kde4",
@@ -5503,11 +5503,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-zh_CN-15.04.2",
+        "name": "kde-l10n-zh_CN-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-zh_CN-15.04.2.tar.xz",
-            "name": "kde-l10n-zh_CN-15.04.2.tar.xz",
-            "sha256": "08p3nlyigw1mxqajm2z0gs2ils8aymizmb3iiprnzi3zgcnbg45y"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-zh_CN-15.04.3.tar.xz",
+            "name": "kde-l10n-zh_CN-15.04.3.tar.xz",
+            "sha256": "0i3d9dqcb5222k9ys7n14lp9llv7pdcc1fwymnmzrsszr38vd24j"
         },
         "buildInputs": [
             "ecm",
@@ -5524,11 +5524,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "ksnakeduel-15.04.2",
+        "name": "ksnakeduel-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/ksnakeduel-15.04.2.tar.xz",
-            "name": "ksnakeduel-15.04.2.tar.xz",
-            "sha256": "1zzwkc6k6315a02il4sp4zswz0i1031bcvsvxrpxb45s4rqhds3b"
+            "url": "stable/applications/15.04.3/src/ksnakeduel-15.04.3.tar.xz",
+            "name": "ksnakeduel-15.04.3.tar.xz",
+            "sha256": "08q6r4r5d29ikiqpbx8mfw79nxjjphw2r2capkbs3bd6ly30bzpx"
         },
         "buildInputs": [
             "kde4",
@@ -5542,11 +5542,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-ia-15.04.2",
+        "name": "kde-l10n-ia-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-ia-15.04.2.tar.xz",
-            "name": "kde-l10n-ia-15.04.2.tar.xz",
-            "sha256": "0rg8zwwmwwm373fnsrcj3cdx88c1z674n398kyv3v6xdi31j2f5p"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ia-15.04.3.tar.xz",
+            "name": "kde-l10n-ia-15.04.3.tar.xz",
+            "sha256": "17b42p7jw5nb97fp88lbg2f2pqy1zcsavisfp2h8wmd8sk4hfpd1"
         },
         "buildInputs": [
             "ecm",
@@ -5563,11 +5563,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "granatier-15.04.2",
+        "name": "granatier-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/granatier-15.04.2.tar.xz",
-            "name": "granatier-15.04.2.tar.xz",
-            "sha256": "1jcxnm1hy6s6g6yls8ljcrhhp3qsp58gcs46hy4s25nacx5m4kh6"
+            "url": "stable/applications/15.04.3/src/granatier-15.04.3.tar.xz",
+            "name": "granatier-15.04.3.tar.xz",
+            "sha256": "1bi6p2xzgxzn6wdfjmxpxfms8z2cksgkkhsa6p0ngd6ln8plmdj9"
         },
         "buildInputs": [
             "ecm",
@@ -5598,11 +5598,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-dev-scripts-15.04.2",
+        "name": "kde-dev-scripts-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-dev-scripts-15.04.2.tar.xz",
-            "name": "kde-dev-scripts-15.04.2.tar.xz",
-            "sha256": "07lliwm96m2nvwa52vsch9x85vxxj7cqlvfm3ynv8nw49pmlkdi5"
+            "url": "stable/applications/15.04.3/src/kde-dev-scripts-15.04.3.tar.xz",
+            "name": "kde-dev-scripts-15.04.3.tar.xz",
+            "sha256": "0isa27ijgcqjcsh30cjg6hbrzpfwm1vjv1zi2blxxnfwmq2n1j0l"
         },
         "buildInputs": [
             "ecm",
@@ -5617,11 +5617,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "khangman-15.04.2",
+        "name": "khangman-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/khangman-15.04.2.tar.xz",
-            "name": "khangman-15.04.2.tar.xz",
-            "sha256": "0wpgm0ipm9n6lhyiymf0ncmw8lgz2pc0fh4ghs4n692ihipiw4xf"
+            "url": "stable/applications/15.04.3/src/khangman-15.04.3.tar.xz",
+            "name": "khangman-15.04.3.tar.xz",
+            "sha256": "13rbm2g29hvjia1c28r0svw5xjgvr133vqgkhp8b5vsrvz9kqjrn"
         },
         "buildInputs": [
             "ecm",
@@ -5654,11 +5654,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "kde-l10n-sk-15.04.2",
+        "name": "kde-l10n-sk-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/kde-l10n/kde-l10n-sk-15.04.2.tar.xz",
-            "name": "kde-l10n-sk-15.04.2.tar.xz",
-            "sha256": "1nhvb2kdlxfvch0hly80lm4z17kijy860z2pk23n65r8lmhngf07"
+            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-sk-15.04.3.tar.xz",
+            "name": "kde-l10n-sk-15.04.3.tar.xz",
+            "sha256": "05vvxphhapc4kc90a4p2f7j447varc4jz69n6y0fkh0xg2rpk12j"
         },
         "buildInputs": [
             "ecm",
@@ -5675,11 +5675,11 @@
         "propagatedNativeBuildInputs": [],
         "propagatedUserEnvPkgs": [],
         "propagatedBuildInputs": [],
-        "name": "audiocd-kio-15.04.2",
+        "name": "audiocd-kio-15.04.3",
         "src": {
-            "url": "stable/applications/15.04.2/src/audiocd-kio-15.04.2.tar.xz",
-            "name": "audiocd-kio-15.04.2.tar.xz",
-            "sha256": "1vxqabysh3mjmrzaxz2kldx2a6w07rxf1adka1fwp2yhajb1bzlh"
+            "url": "stable/applications/15.04.3/src/audiocd-kio-15.04.3.tar.xz",
+            "name": "audiocd-kio-15.04.3.tar.xz",
+            "sha256": "0fwrjz4bkxinkzk52yv52jx2i6r9rm1nip056kddk718rqr224qi"
         },
         "buildInputs": [
             "cdparanoia",
diff --git a/pkgs/applications/kde-apps-15.04/packages.sh b/pkgs/applications/kde-apps-15.04/packages.sh
index 49c125a9f1a..875141341a7 100755
--- a/pkgs/applications/kde-apps-15.04/packages.sh
+++ b/pkgs/applications/kde-apps-15.04/packages.sh
@@ -12,7 +12,7 @@ alias nix-build="nix-build --no-out-link \"$origin/../../..\""
 # The extra slash at the end of the URL is necessary to stop wget
 # from recursing over the whole server! (No, it's not a bug.)
 $(nix-build -A autonix.manifest) \
-    "${KDE_MIRROR}/stable/applications/15.04.2/" \
+    "${KDE_MIRROR}/stable/applications/15.04.3/" \
     "$@" -A '*.tar.xz'
 
 AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellngPackages.autonix-deps-kf5)/bin/kf5-deps"}

From 317dd06aa438fb2e49a578a7bbefc5ed677cdc13 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 17 Jul 2015 11:40:14 +0200
Subject: [PATCH 2299/2322] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/a5ae0949a8bb0c896d05b0faec6f514c7fd39666
 with hackage2nix revision 3606ad40536a2dae452307184b9bd70a2eff8c89

---
 .../haskell-modules/hackage-packages.nix      | 85 ++++++++++++-------
 1 file changed, 53 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ccb560fb74d..3d5a00e2d8c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -14066,8 +14066,8 @@ self: {
      }:
      mkDerivation {
        pname = "Spock-digestive";
-       version = "0.1.0.0";
-       sha256 = "044cw2hfgwa21kjbmby5asfmdjahhadk8iyqk221pixddw7z6s67";
+       version = "0.1.0.1";
+       sha256 = "13766v5y43jmdh7m3q1790ppw2chwg3g29dfh1zacxw7n1gmhlyl";
        buildDepends = [
          base digestive-functors http-types mtl Spock text
          unordered-containers wai
@@ -19630,16 +19630,15 @@ self: {
      }) {};
 
   "angel" = callPackage
-    ({ mkDerivation, base, configurator, containers, hspec, mtl
-     , old-locale, optparse-applicative, process, stm, text, time
-     , transformers, unix, unordered-containers
+    ({ mkDerivation, base, configurator, containers, mtl, old-locale
+     , optparse-applicative, process, stm, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, unix
+     , unordered-containers
      }:
      mkDerivation {
        pname = "angel";
-       version = "0.6.1";
-       revision = "1";
-       sha256 = "1wkllv4ziggj3smhghdk5qsgccds9d69rhx1gi079ph7z533w2dc";
-       editedCabalFile = "05dc467ec31281499d5902a77b957243d03ff87e0e4b51aaaa78306049560f28";
+       version = "0.6.2";
+       sha256 = "0n73w8lczsncagf2041lq1963mnsmw9albwy0n5qbhqx9030pzya";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -19647,8 +19646,9 @@ self: {
          process stm text time transformers unix unordered-containers
        ];
        testDepends = [
-         base configurator containers hspec mtl old-locale process stm text
-         time transformers unix unordered-containers
+         base configurator containers mtl old-locale process stm tasty
+         tasty-hunit tasty-quickcheck text time transformers unix
+         unordered-containers
        ];
        homepage = "http://github.com/MichaelXavier/Angel";
        description = "Process management and supervision daemon";
@@ -74608,6 +74608,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ib-api" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, network }:
+     mkDerivation {
+       pname = "ib-api";
+       version = "0.1.0.0";
+       sha256 = "1030bj90myx5x3y297qmlmnzppfnh5d3cmwglqj1s7i6nyrh86k5";
+       buildDepends = [ attoparsec base bytestring network ];
+       jailbreak = true;
+       homepage = "https://github.com/rbermani/ib-api";
+       description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "iban" = callPackage
     ({ mkDerivation, base, containers, HUnit, iso3166-country-codes
      , tasty, tasty-hunit, text, unordered-containers
@@ -78525,8 +78538,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-autotype";
-       version = "1.0.6";
-       sha256 = "1s8zizl0mxc4vy1s050sgfv8abzq8qp844ih5xywn2wccp090gc7";
+       version = "1.0.7";
+       sha256 = "11x6am3hqzhai0dm02pk20l5pk5bpj434z8ic4b8lksnv8l5zq46";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -78539,7 +78552,6 @@ self: {
          hashable hflags lens mtl pretty process QuickCheck scientific
          smallcheck text uniplate unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/mgajda/json-autotype";
        description = "Automatic type declaration for JSON input data";
        license = stdenv.lib.licenses.bsd3;
@@ -102424,8 +102436,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring, split }:
      mkDerivation {
        pname = "potato-tool";
-       version = "0.1.0.1";
-       sha256 = "02y6syz54vc4brbpy4760xd2jlwbfqghn7k2ccy4kxz4xzhm9cdw";
+       version = "0.1.0.2";
+       sha256 = "1d95y8nchzzy3zaq1dsm94b7nhrlxhwpq7yn9dr1nisz43f4j7bx";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base binary bytestring split ];
@@ -105740,6 +105752,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rake" = callPackage
+    ({ mkDerivation, base, containers, text }:
+     mkDerivation {
+       pname = "rake";
+       version = "0.0.1";
+       sha256 = "0cn22xg7r80f61z8pf7i0rqqag4qx43rhlfpncgkv5b6vcrsafpn";
+       buildDepends = [ base containers text ];
+       homepage = "http://github.com/toschoo/Haskell-Libs";
+       description = "Rapid Automatic Keyword Extraction (RAKE)";
+       license = "LGPL";
+     }) {};
+
   "rakhana" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, lens
      , mtl, pipes, scientific, transformers, vector, zlib
@@ -109017,10 +109041,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-gen";
-       version = "0.17.1.1";
-       revision = "1";
-       sha256 = "0gr5wv0gb2niq3i7ggzrr5g9hs3fwxss5hivw5ircrbp9s1xm7bl";
-       editedCabalFile = "9d5c13bbf90373aed094821bd2005822fccd5949e0c88a2a63870d90f7c76ee4";
+       version = "0.17.1.2";
+       sha256 = "05imgbal0b6ab1i8b1896y1qm956ci7r0xx3qnkjbb6vxdl51vaa";
        buildDepends = [
          aeson base blaze-html Cabal code-builder directory fclabels
          filepath hashable haskell-src-exts HStringTemplate hxt json-schema
@@ -125476,8 +125498,8 @@ self: {
      }:
      mkDerivation {
        pname = "text1";
-       version = "0.0.2";
-       sha256 = "0xkp0kw4xm8ppkhzplcx79cx9d5slk8qb8amcjiiy71ihj87b0vi";
+       version = "0.0.3";
+       sha256 = "0l3xh8hv5xwfib63llikhnp4w3jx8nwc2rmj4sy7yd5acxgj39sc";
        buildDepends = [ base binary lens semigroups text ];
        testDepends = [
          base directory doctest filepath QuickCheck template-haskell
@@ -126948,12 +126970,11 @@ self: {
      }:
      mkDerivation {
        pname = "timers";
-       version = "0.2.0.2";
-       sha256 = "0ivlgpc45iss44pjmcxprwg98zh68fkpym0y19vx5ysacy6p04yh";
+       version = "0.2.0.3";
+       sha256 = "0q4w41jdhf5ildcdl94lgfn06fg275hf04dpah3l6vva24d8alj5";
        buildDepends = [
          base lifted-base monad-control suspend transformers-base
        ];
-       jailbreak = true;
        description = "Simple package that implements timers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137377,8 +137398,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-conduit";
-       version = "1.3.0";
-       sha256 = "0kcwfr02gnldal4dq2am9kc36j76cjx0japi5r5wms2c1az95r1l";
+       version = "1.3.1";
+       sha256 = "094gkf3j7xk42km9zlkjdz0bicwxcf4207q1yalwi69zfnqmprhr";
        buildDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          conduit conduit-extra containers data-default deepseq monad-control
@@ -137390,7 +137411,7 @@ self: {
        ];
        homepage = "http://github.com/snoyberg/xml";
        description = "Pure-Haskell utilities for dealing with XML with the conduit package";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "xml-conduit-parse" = callPackage
@@ -140154,8 +140175,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-table";
-       version = "1.0.0";
-       sha256 = "0dy1rpwrccp6fcl91wb0f46djdkkzfdh870ylb9339msfgv9zchj";
+       version = "1.0.1";
+       sha256 = "0ixypahxrm23pahjq972r8kc4h2a14fidf1cx3wiip8wxfhc9jsi";
        buildDepends = [ base containers contravariant text yesod-core ];
        homepage = "https://github.com/andrewthad/yesod-table";
        description = "HTML tables for Yesod";
@@ -140997,8 +141018,8 @@ self: {
     ({ mkDerivation, base, semigroups }:
      mkDerivation {
        pname = "zero";
-       version = "0.1.1";
-       sha256 = "1ksmhp7lvgapi9mp3q5i5prxgrxsamnvv0883nbw09vfpvg9ms2l";
+       version = "0.1.2";
+       sha256 = "01hfsi29g42b4jj3ahddv1ry7qgav17pwpngipz8igq2w81v1y9p";
        buildDepends = [ base semigroups ];
        homepage = "https://github.com/phaazon/zero";
        description = "Semigroups with absorption";

From 5e4f1adc8af01215535e47fa8c5c42fd98661b01 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 17 Jul 2015 18:01:41 +0200
Subject: [PATCH 2300/2322] haskell-hwsl2: fix build by disabling the test
 suite

---
 pkgs/development/haskell-modules/configuration-common.nix     | 4 ----
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a59219786c9..837fa79859d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -619,10 +619,6 @@ self: super: {
   # https://github.com/jwiegley/simple-conduit/issues/2
   simple-conduit = markBroken super.simple-conduit;
 
-  # https://github.com/srijs/hwsl2/issues/1
-  hwsl2 = markBroken super.hwsl2;
-  hwsl2-reducers = dontDistribute super.hwsl2-reducers;
-
   # https://code.google.com/p/linux-music-player/issues/detail?id=1
   mp = markBroken super.mp;
 
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 de0fdacb3f9..ca7c0f56bc1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -268,4 +268,8 @@ self: super: {
   # Inexplicable haddock failure
   # https://github.com/gregwebs/aeson-applicative/issues/2
   aeson-applicative = dontHaddock super.aeson-applicative;
+
+  # GHC 7.10.1 is affected by https://github.com/srijs/hwsl2/issues/1.
+  hwsl2 = dontCheck super.hwsl2;
+
 }

From 6cd9a820ad5d4b15744c6f89c85a4fac96a4c29a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 17 Jun 2015 16:40:21 +0200
Subject: [PATCH 2301/2322] haskell: extend generic builder to support upcoming
 format change from cabal2nix

---
 .../haskell-modules/generic-builder.nix       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index c0505d6e3c6..2af3d964619 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -6,9 +6,9 @@
 , version, revision ? null
 , sha256 ? null
 , src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; }
-, buildDepends ? []
+, buildDepends ? [], libraryHaskellDepends ? [], executableHaskellDepends ? []
 , buildTarget ? ""
-, buildTools ? []
+, buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? []
 , configureFlags ? []
 , description ? ""
 , doCheck ? stdenv.lib.versionOlder "7.4" ghc.version
@@ -19,7 +19,7 @@
 , enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
 , enableSplitObjs ? !stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013
 , enableStaticLibraries ? true
-, extraLibraries ? []
+, extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
 , homepage ? "http://hackage.haskell.org/package/${pname}"
 , hydraPlatforms ? ghc.meta.hydraPlatforms or ghc.meta.platforms
 , hyperlinkSource ? true
@@ -29,9 +29,9 @@
 , maintainers ? []
 , doHaddock ? true
 , passthru ? {}
-, pkgconfigDepends ? []
+, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? []
 , platforms ? ghc.meta.platforms
-, testDepends ? []
+, testDepends ? [], testHaskellDepends ? [], testSystemDepends ? []
 , testTarget ? ""
 , broken ? false
 , preUnpack ? "", postUnpack ? ""
@@ -84,7 +84,7 @@ let
     (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")
     (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")
+    (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
     (enableFeature enableSplitObjs "split-objs")
     (enableFeature enableLibraryProfiling "library-profiling")
     (enableFeature enableSharedLibraries "shared")
@@ -105,11 +105,11 @@ let
   isHaskellPkg = x: (x ? pname) && (x ? version) && (x ? env);
   isSystemPkg = x: !isHaskellPkg x;
 
-  propagatedBuildInputs = buildDepends;
-  otherBuildInputs = extraLibraries ++
-                     buildTools ++
-                     optionals (pkgconfigDepends != []) ([pkgconfig] ++ pkgconfigDepends) ++
-                     optionals doCheck testDepends;
+  propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
+  otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
+                     buildTools ++ libraryToolDepends ++ executableToolDepends ++
+                     optionals (pkgconfigDepends != []) ([pkgconfig] ++ pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends) ++
+                     optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends);
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
 
   haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs;

From d54659fe9628fc460b4b591fac84dfe4b1841231 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 Jul 2015 11:15:27 +0200
Subject: [PATCH 2302/2322] libreoffice: work around a build problem

Started on staging and just hidden by #7524, most likely.
Now it builds and runs for me. Only the "development build" tag is strange.

/cc #8844, maintainers @viric, @7c6f434c.
---
 pkgs/applications/office/libreoffice/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index b7511804d95..c053c886e92 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
 
   postUnpack = ''
     mkdir -v $sourceRoot/src
-  '' + (stdenv.lib.concatMapStrings (f: "ln -sv ${f} $sourceRoot/src/${f.outputHash}-${f.name}\nln -sv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party)
+  '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party)
   + ''
     ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name}
     ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name}

From 6437b2108d7d0a576d290f9d3071c47665c86a90 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 Jul 2015 10:46:17 +0200
Subject: [PATCH 2303/2322] libdrm: update and add valgrind dependency

I couldn't find an easy way around this new build-time dependency,
unfortunately. It creates some new mass-rebuild chains...
---
 pkgs/development/libraries/libdrm/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index b223bd962e7..7a30d36e4d7 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }:
+{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev, valgrind }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.61";
+  name = "libdrm-2.4.62";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "8b549092c8961a393a7e1d9a1bccddcea8e2af67c0d7d7c67babb9fc3b47699c";
+    sha256 = "906c294bdbe1c94c3ca084305d61a6e5a8367f3b4986e6cc13b1e9b3f75931dc";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libpthreadstubs libpciaccess ]
+  buildInputs = [ libpthreadstubs libpciaccess valgrind ]
     ++ stdenv.lib.optional stdenv.isLinux udev;
 
   patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;

From 79dea486c1c93990da084677b2b05fd9493e9cb0 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 19 Jul 2015 12:43:05 +0200
Subject: [PATCH 2304/2322] mdp: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index aa2045cc8e8..a7617ec8358 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.0";
+  version = "1.0.1";
   name = "mdp-${version}";
 
   src = fetchurl {
     url = "https://github.com/visit1985/mdp/archive/${version}.tar.gz";
-    sha256 = "1xkmzcwa5ml1xfv92brwirnm00a44jkj7wpfimxbny98zgmad8vn";
+    sha256 = "0vmr0ymq06r50yags9nv6fk4f890b82a7bvxg697vrgs04i2x4dy";
   };
 
   makeFlags = "PREFIX=$(out)";

From cd46c76d1b58d1a7922179cca187fce013c3bdc9 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 19 Jul 2015 12:40:50 +0200
Subject: [PATCH 2305/2322] khard: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 2eda8acf4b8..4bf39860989 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgs, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "0.4.0";
+  version = "0.4.1";
   name = "khard-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
-    sha256 = "0xvg8725297faw5mk7ka4xjc968vq3ix7izd4vmsaqysl43gnh21";
+    sha256 = "09yibjzly711hwpg345n653rz47llvrj4shnlcxd8snzvg8m5gri";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From dcea8514348007cef8374989e1c1bb1cc59f178a 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 Jul 2015 11:57:32 +0200
Subject: [PATCH 2306/2322] mesa: tweak the patch after 7fe69244af7

In particular, do not try dlopening libudev by a non-absolute path.
/cc @wkennington.
---
 .../libraries/mesa/dlopen-absolute-paths.diff | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff
index 251272f5ce8..a4bb6a72b13 100644
--- a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff
+++ b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff
@@ -1,28 +1,22 @@
-diff --git a/src/loader/loader.c b/src/loader/loader.c
-index 4fdf3c2..0cd62b5 100644
+diff --git a/loader.c b/loader.c
+index 4fdf3c2..69ea22d 100644
 --- a/src/loader/loader.c
 +++ b/src/loader/loader.c
-@@ -112,7 +112,6 @@ static void *udev_handle = NULL;
+@@ -112,7 +112,7 @@ static void *udev_handle = NULL;
  static void *
  udev_dlopen_handle(void)
  {
 -   char name[80];
++   char name[256];
     unsigned flags = RTLD_NOLOAD | RTLD_LOCAL | RTLD_LAZY;
     int version;
  
-@@ -125,12 +124,9 @@ udev_dlopen_handle(void)
- 
+@@ -126,7 +126,7 @@ udev_dlopen_handle(void)
     /* First try opening an already linked libudev, then try loading one */
     do {
--      for (version = 1; version >= 0; version--) {
+       for (version = 1; version >= 0; version--) {
 -         snprintf(name, sizeof(name), "libudev.so.%d", version);
--         udev_handle = dlopen(name, flags);
--         if (udev_handle)
--            return udev_handle;
--      }
-+      udev_handle = dlopen("@udev@/lib/libudev.so", flags);
-+      if (udev_handle)
-+          return udev_handle;
- 
-       if ((flags & RTLD_NOLOAD) == 0)
-          break;
++         snprintf(name, sizeof(name), "@udev@/lib/libudev.so.%d", version);
+          udev_handle = dlopen(name, flags);
+          if (udev_handle)
+             return udev_handle;

From 00dfcfb76ab2e61c14d134e7645498cdad81b7bc 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 Jul 2015 12:26:54 +0200
Subject: [PATCH 2307/2322] xorg: driver updates

Also fixup tarball list after e4316b8c171,
and drop a patch integrated in the update.
---
 pkgs/servers/x11/xorg/default.nix       | 22 +++++++++++-----------
 pkgs/servers/x11/xorg/overrides.nix     |  5 -----
 pkgs/servers/x11/xorg/tarballs-7.7.list |  8 ++++----
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f0fdb67f30e..576f6920896 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1445,11 +1445,11 @@ let
   }) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputlibinput = (mkDerivation "xf86inputlibinput" {
-    name = "xf86-input-libinput-0.10.0";
+    name = "xf86-input-libinput-0.12.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-libinput-0.10.0.tar.bz2;
-      sha256 = "1w1v83qlr7n4iqgd7grmhx0gbz1fhsnpk88j4a136dk4xmc069x4";
+      url = mirror://xorg/individual/driver/xf86-input-libinput-0.12.0.tar.bz2;
+      sha256 = "1mi6m1a32xc43na46amfqz0025952whiy3w4wz0wx0d34jf933yv";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
   }) // {inherit inputproto xorgserver xproto ;};
@@ -1475,14 +1475,14 @@ let
   }) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
 
   xf86inputvmmouse = (mkDerivation "xf86inputvmmouse" {
-    name = "xf86-input-vmmouse-13.0.0";
+    name = "xf86-input-vmmouse-13.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2;
-      sha256 = "0b31ap9wp7nwpnihz8m7bz3p0hhaipxxhl652nw4v380cq1vdkq4";
+      url = mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2;
+      sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a";
     };
-    buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
+    buildInputs = [pkgconfig inputproto udev randrproto xorgserver xproto ];
+  }) // {inherit inputproto udev randrproto xorgserver xproto ;};
 
   xf86inputvoid = (mkDerivation "xf86inputvoid" {
     name = "xf86-input-void-1.4.1";
@@ -1815,11 +1815,11 @@ let
   }) // {inherit randrproto videoproto xorgserver xproto ;};
 
   xf86videovesa = (mkDerivation "xf86videovesa" {
-    name = "xf86-video-vesa-2.3.3";
+    name = "xf86-video-vesa-2.3.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-vesa-2.3.3.tar.bz2;
-      sha256 = "1y5fsg0c4bgmh1cfsbnaaf388fppyy02i7mcy9vax78flkjpb2yf";
+      url = mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2;
+      sha256 = "1haiw8r1z8ihk68d0jqph2wsld13w4qkl86biq46fvyxg7cg9pbv";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
   }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 0fc70fb6e17..fdec469d1ff 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -226,11 +226,6 @@ in
       "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d"
       "--with-udev-rules-dir=$(out)/lib/udev/rules.d"
     ];
-    patches = [( args.fetchpatch {
-      url = "http://cgit.freedesktop.org/xorg/driver/xf86-input-vmmouse/patch/"
-        + "?id=1cbbc03c4b37d57760c57bd2e0b0f89d744a5795";
-      sha256 = "1qkhwj2yal0cz15lv9557d10ylvxlq05ibq43pm2rrvqdg3mb6h4";
-    })];
   };
 
   xf86videoati = attrs: attrs // {
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 932d4f1236f..73c6cc88c8a 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -121,10 +121,10 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-evdev-2.9.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-libinput-0.10.0.tar.bz2
+mirror://xorg/individual/driver/xf86-input-libinput-0.12.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-synaptics-1.8.2.tar.bz2
-mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.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-ark-0.7.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2
@@ -158,7 +158,7 @@ mirror://xorg/individual/driver/xf86-video-tdfx-1.4.6.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/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2
-mirror://xorg/individual/driver/xf86-video-vesa-2.3.3.tar.bz2
+mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2
@@ -179,7 +179,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.16.4.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.17.2.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 a06de72c2f4fa407d3fa7f349ec64ffc997bce51 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 Jul 2015 13:01:12 +0200
Subject: [PATCH 2308/2322] harfbuzz: small update

---
 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 311bfe2c209..216bad19790 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,11 +8,11 @@
 # (icu is a ~30 MB dependency, the rest is very small in comparison)
 
 stdenv.mkDerivation rec {
-  name = "harfbuzz-0.9.40";
+  name = "harfbuzz-0.9.41";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
-    sha256 = "07rjp05axas96fp23lpf8l2yyfdj9yib4m0qjv592vdyhcsxaw8p";
+    sha256 = "0z05vj3va43adzxn026fpdvdd533q5zrs5dcxaz3gd021hysa6nq";
   };
 
   configureFlags = [

From bde4ea1a8b412ab79d4c6e5ff8ddbb32b0f19a7c 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 Jul 2015 13:01:27 +0200
Subject: [PATCH 2309/2322] poppler: small update

/cc maintainer @ttuegel.
---
 pkgs/development/libraries/poppler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index c79cdfd4466..4b7debda638 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -5,8 +5,8 @@
 }:
 
 let
-  version = "0.32.0"; # even major numbers are stable
-  sha256 = "162vfbvbz0frvqyk00ldsbl49h4bj8i8wn0ngfl30xg1lldy6qs9";
+  version = "0.34.0"; # even major numbers are stable
+  sha256 = "1c2wa4pfzqmvzq1jpp3ps5nmzz745gcg8dnpwqpfdccy5ydbm90v";
 in
 stdenv.mkDerivation rec {
   name = "poppler-${suffix}-${version}";

From 1be2acd1317aadc8e1a08d17312e524fb5fc2a43 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 Jul 2015 13:18:08 +0200
Subject: [PATCH 2310/2322] xkeyboard-config: updates

Also drop Esperanto patch for now, as it doesn't apply anymore
and there are some Esperanto variants inside. Discussed:
https://github.com/NixOS/nixpkgs/commit/fa5a583098
---
 pkgs/servers/x11/xorg/default.nix             |  6 +-
 pkgs/servers/x11/xorg/overrides.nix           |  5 +-
 pkgs/servers/x11/xorg/tarballs-7.7.list       |  2 +-
 .../x11/xorg/xkeyboard-config-eo.patch        | 71 -------------------
 4 files changed, 6 insertions(+), 78 deletions(-)
 delete mode 100644 pkgs/servers/x11/xorg/xkeyboard-config-eo.patch

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 576f6920896..6b7f51412cc 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1975,11 +1975,11 @@ let
   }) // {inherit inputproto libX11 libXaw xproto libXt ;};
 
   xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
-    name = "xkeyboard-config-2.11";
+    name = "xkeyboard-config-2.15";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2;
-      sha256 = "0xkdyyi759hzls42hp4j3q2lc35n4j6b2g44ilx5qarci5h584p7";
+      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.15.tar.bz2;
+      sha256 = "1grqdy5a9f2dii3y24fn0p3kz4q5g9j2kh3jcj2402rgrbvkqi0f";
     };
     buildInputs = [pkgconfig libX11 xproto ];
   }) // {inherit libX11 xproto ;};
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index fdec469d1ff..283eb683ffc 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -256,15 +256,14 @@ in
   };
 
   xkbcomp = attrs: attrs // {
-    configureFlags = "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb"; 
+    configureFlags = "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb";
   };
 
   xkeyboardconfig = attrs: attrs // {
 
     buildInputs = attrs.buildInputs ++ [args.intltool];
 
-    #TODO: resurrect patches for US_intl?
-    patches = [ ./xkeyboard-config-eo.patch ];
+    #TODO: resurrect patches for US_intl or Esperanto?
 
     # 1: compatibility for X11/xkb location
     # 2: I think pkgconfig/ is supposed to be in /lib/
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 73c6cc88c8a..7522743310a 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -171,7 +171,7 @@ mirror://xorg/individual/app/xinput-1.6.1.tar.bz2
 mirror://xorg/individual/app/xkbcomp-1.3.0.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.11.tar.bz2
+mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.15.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
diff --git a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch b/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch
deleted file mode 100644
index f288a5c0f6d..00000000000
--- a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/rules/base.xml.in b/rules/base.xml.in
-index ec321f8..e9c3546 100644
---- a/rules/base.xml.in
-+++ b/rules/base.xml.in
-@@ -1786,6 +1786,13 @@
-     </layout>
-     <layout>
-       <configItem>
-+        <name>eo</name>
-+        <_shortDescription>Esp</_shortDescription>
-+        <_description>Esperanto</_description>
-+      </configItem>
-+    </layout>
-+    <layout>
-+      <configItem>
-         <name>ir</name>
-         <_shortDescription>Irn</_shortDescription>
-         <_description>Iran</_description>
-diff --git a/symbols/Makefile.am b/symbols/Makefile.am
-index 97c816d..d7e3a4e 100644
---- a/symbols/Makefile.am
-+++ b/symbols/Makefile.am
-@@ -10,7 +10,7 @@ bt by braille \
- ca cd \
- ch cn cz \
- de dk \
--ee es et epo \
-+ee eo es et epo \
- fi fo fr \
- gb ge gh gn \
- gr hr hu \
-diff --git a/symbols/Makefile.in b/symbols/Makefile.in
-index b5be077..5cddcc7 100644
---- a/symbols/Makefile.in
-+++ b/symbols/Makefile.in
-@@ -222,7 +222,7 @@ bt by braille \
- ca cd \
- ch cn cz \
- de dk \
--ee es et epo \
-+ee eo es et epo \
- fi fo fr \
- gb ge gh gn \
- gr hr hu \
-diff --git a/symbols/eo b/symbols/eo
-new file mode 100644
-index 0000000..d6358c9
---- /dev/null
-+++ b/symbols/eo
-@@ -0,0 +1,21 @@
-+// $XFree86$
-+
-+partial alphanumeric_keys
-+xkb_symbols "basic" {
-+
-+     // Describes the differences between a very simple en_US
-+     // keyboard and a simple Esperanto keyboard
-+     // Press AltGr or Windows Menu key together with C, H, J, S, U
-+     // to get accented letters.
-+     // 2001 by Radovan Garabik <garabik@melkor.dnp.fmph.uniba.sk>
-+
-+    key.type = "FOUR_LEVEL";
-+
-+    key <AD02>  { [w,W, ubreve,Ubreve ] };
-+    key <AD07>  { [u,U, ubreve, Ubreve ] };
-+    key <AC02>  { [s,S, scircumflex,    Scircumflex ] };
-+    key <AC05>  { [g,G, gcircumflex,Gcircumflex ] };
-+    key <AC06>  { [h,H, hcircumflex,Hcircumflex ] };
-+    key <AC07>  { [j,J, jcircumflex,Jcircumflex ] };
-+    key <AB03>  { [c,C, ccircumflex,Ccircumflex ] };
-+};

From 8fa00ad16e08243ac3a8126e4e8f5dfdbd7bbb5c Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 19 Jul 2015 13:09:51 +0200
Subject: [PATCH 2311/2322] pkginfo: init at 1.2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ad08df9a874..08c0cfee510 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2272,6 +2272,33 @@ let
     };
   };
 
+  pkginfo = buildPythonPackage rec {
+    version = "1.2.1";
+    name = "pkginfo-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pkginfo/${name}.tar.gz";
+      sha256 = "0g0g6avplfqw1adzqybbrh1a2z0kfjl8qn3annkrc7w3ibz6sgxd";
+    };
+
+    doCheck = false; # I don't know why, but with doCheck = true it fails.
+
+    meta = {
+      homepage = https://pypi.python.org/pypi/pkginfo;
+      license = licenses.mit;
+      description = "Query metadatdata from sdists / bdists / installed packages.";
+
+      longDescription = ''
+        This package provides an API for querying the distutils metadata
+        written in the PKG-INFO file inside a source distriubtion (an sdist)
+        or a binary distribution (e.g., created by running bdist_egg). It can
+        also query the EGG-INFO directory of an installed distribution, and the
+        *.egg-info stored in a “development checkout” (e.g, created by running
+        setup.py develop).
+      '';
+    };
+  };
+
   pretend = buildPythonPackage rec {
     name = "pretend-1.0.8";
 

From 20882964f518acb2aba364a25d03c96fd149821a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 12 Jul 2015 12:26:31 +0200
Subject: [PATCH 2312/2322] zlog: init at 1.2.12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn: add name= to fetchzip, remove unneeded -r flag from sed.]
---
 pkgs/development/libraries/zlog/default.nix | 34 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/libraries/zlog/default.nix

diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix
new file mode 100644
index 00000000000..d3dc41371de
--- /dev/null
+++ b/pkgs/development/libraries/zlog/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  version = "1.2.12";
+  name = "zlog-${version}";
+
+  src = fetchzip {
+    name = "${name}-src";
+    url = "https://github.com/HardySimpson/zlog/archive/${version}.tar.gz";
+    sha256 = "1ychld0dcfdak2wnmkj941i0xav6ynlb3n6hz1kz03yy74ll2fqi";
+  };
+
+  configurePhase = ''
+    sed -i 's;-Werror;;' src/makefile
+  '';
+
+  buildPhase = ''
+    mkdir -p $out
+    make PREFIX=$out
+  '';
+
+  installPhase = ''
+    make PREFIX=$out install
+  '';
+
+  meta = with stdenv.lib; {
+    description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library";
+    homepage = http://hardysimpson.github.com/zlog;
+    license = licenses.lgpl21;
+    platforms = platforms.linux; # cannot test on something else
+    maintainers = [ maintainers.matthiasbeyer ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14d256c277a..45921934073 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8396,6 +8396,8 @@ let
     fetchurl = fetchurlBoot;
   };
 
+  zlog = callPackage ../development/libraries/zlog { };
+
   zlibStatic = lowPrio (appendToName "static" (callPackage ../development/libraries/zlib {
     static = true;
   }));

From a296639b9e3e4ad3e9f8d54e7863425e8fa943a1 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sun, 19 Jul 2015 13:21:30 +0100
Subject: [PATCH 2313/2322] udevil: New package

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

diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix
new file mode 100644
index 00000000000..5ba80348d1f
--- /dev/null
+++ b/pkgs/applications/misc/udevil/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, intltool, glib, pkgconfig, udev, utillinux, acl }:
+stdenv.mkDerivation {
+  name = "udevil-0.4.4";
+  src = fetchurl {
+    url = https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz;
+    sha256 = "0z1bhaayambrcn7bgnrqk445k50ifabmw8q4i9qj49nnbcvxhbxd";
+  };
+  buildInputs = [ intltool glib pkgconfig udev ];
+  configurePhase = ''
+    substituteInPlace src/Makefile.am --replace "-o root -g root" ""
+    substituteInPlace src/Makefile.in --replace "-o root -g root" ""
+    ./configure \
+      --prefix=$out \
+      --with-mount-prog=${utillinux}/bin/mount \
+      --with-umount-prog=${utillinux}/bin/umount \
+      --with-losetup-prog=${utillinux}/bin/losetup \
+      --with-setfacl-prog=${acl}/bin/setfacl \
+      --sysconfdir=$prefix/etc
+  '';
+  preConfigure = ''
+    cat src/Makefile.am
+    exit 2
+  '';
+  meta = {
+    description = "A command line Linux program which mounts and unmounts removable devices without a password, shows device info, and monitors device changes";
+    homepage = https://ignorantguru.github.io/udevil/;
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45921934073..c81e7ad77a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15107,4 +15107,6 @@ let
 
   hbase = callPackage ../servers/hbase {};
 
+  udevil = callPackage ../applications/misc/udevil {};
+
 }; in self; in pkgs

From 08c192a40b25c21144d690f3fb2d7fb4abff1bc3 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sun, 19 Jul 2015 13:22:04 +0100
Subject: [PATCH 2314/2322] devmon: New service

---
 nixos/modules/module-list.nix          |  1 +
 nixos/modules/services/misc/devmon.nix | 28 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 nixos/modules/services/misc/devmon.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f74b16f678f..f771bced5ef 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -189,6 +189,7 @@
   ./services/misc/cpuminer-cryptonight.nix
   ./services/misc/cgminer.nix
   ./services/misc/confd.nix
+  ./services/misc/devmon.nix
   ./services/misc/dictd.nix
   ./services/misc/disnix.nix
   ./services/misc/docker-registry.nix
diff --git a/nixos/modules/services/misc/devmon.nix b/nixos/modules/services/misc/devmon.nix
new file mode 100644
index 00000000000..7a1f7c2e079
--- /dev/null
+++ b/nixos/modules/services/misc/devmon.nix
@@ -0,0 +1,28 @@
+{ pkgs, config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.devmon;
+
+in {
+  options = {
+    services.devmon = {
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable devmon, an automatic device mounting daemon.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.devmon = {
+      description = "devmon automatic device mounting daemon";
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.udevil ];
+      serviceConfig.ExecStart = "${pkgs.udevil}/bin/devmon";
+    };
+  };
+}

From 79d020de49ed3a963763893b06d205ca4a32225e Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Sun, 19 Jul 2015 15:58:50 +0200
Subject: [PATCH 2315/2322] syncthing: 0.11.15 -> 0.11.16

---
 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 449886a5de4..02a51a3cbad 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,12 +4,12 @@ with goPackages;
 
 buildGoPackage rec {
   name = "syncthing-${version}";
-  version = "0.11.15";
+  version = "0.11.16";
   goPackagePath = "github.com/syncthing/syncthing";
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "8afd0a0999c7d7d285f361589330421c00012da86ce91623c5ad6b96d8fb9695";
+    sha256 = "f9b5c2de7e2b6592cccb0222c48b9baa2497dce519824a75923d40cc722ab937";
   };
 
   subPackages = [ "cmd/syncthing" ];

From 88be5eb371fd9c7844fa4253c5597dc1b22cf2e3 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sun, 19 Jul 2015 16:45:10 +0200
Subject: [PATCH 2316/2322] gstreamer-vaapi: 0.5.10 -> 0.6.0

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

diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index a1f936e20af..349b5093a3b 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -5,17 +5,17 @@
 
 stdenv.mkDerivation rec {
   name = "gst-vaapi-${version}";
-  version = "0.5.10";
+  version = "0.6.0";
 
   src = fetchurl {
     url = "${meta.homepage}/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.bz2";
-    sha256 = "179wnz4c4gnw9ibfgjrad9b44icygadaknsgjfw24lr2pz3kdlhd";
+    sha256 = "1f3ji0h0x49w4wpqc0widraa9kvq0b47idrdxq4znjb8c1bwd97n";
   };
 
   nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ];
 
   buildInputs = with stdenv.lib; [ gstreamer gst-plugins-base gst-plugins-bad libva libdrm udev
-    xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr mesa nasm libvpx ];
+    xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM xorg.libICE mesa nasm libvpx ];
 
   preConfigure = "
     export GST_PLUGIN_PATH_1_0=$out/lib/gstreamer-1.0

From f796345f6afa0b6027a8bc61206e7d338483a9e3 Mon Sep 17 00:00:00 2001
From: Rowan Blush <row@n.blu.sh>
Date: Wed, 15 Jul 2015 23:29:43 -0700
Subject: [PATCH 2317/2322] calcurse: init at 4.0.0

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

diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix
new file mode 100644
index 00000000000..9211ef0ab83
--- /dev/null
+++ b/pkgs/applications/misc/calcurse/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, ncurses, gettext}:
+
+stdenv.mkDerivation {
+  name = "calcurse-4.0.0";
+
+  src = fetchurl {
+    url = http://calcurse.org/files/calcurse-4.0.0.tar.gz;
+    sha256 = "0d33cpkbhyidvm3xx6iw9ljqdvl6477c2kcwix3bs63nj0ch06v2";
+  };
+
+  buildInputs = [ncurses gettext];
+
+  meta = {
+    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
+      system reminds users of upcoming deadlines, the curses based interface can be
+      customized to suit user needs and a very powerful set of command line options can
+      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;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa4a59e54f7..b17e62fe486 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10797,6 +10797,8 @@ let
       inherit (gnome) libglade;
   };
 
+  calcurse = callPackage ../applications/misc/calcurse { };
+
   calibre = callPackage ../applications/misc/calibre {
     inherit (pythonPackages) pyqt5 sip_4_16;
   };

From 8d4f9d8d6b5988cf7a40ce28ba01591d95501ad0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 19 Jul 2015 12:03:14 -0700
Subject: [PATCH 2318/2322] ceph: Add missing boost 1.58 compat patch

---
 pkgs/tools/filesystems/ceph/boost-158.patch | 27 +++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 pkgs/tools/filesystems/ceph/boost-158.patch

diff --git a/pkgs/tools/filesystems/ceph/boost-158.patch b/pkgs/tools/filesystems/ceph/boost-158.patch
new file mode 100644
index 00000000000..11a1d55c494
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/boost-158.patch
@@ -0,0 +1,27 @@
+From e7b196a4a091c0ea258866559ba06e7ed0cc4247 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <kchai@redhat.com>
+Date: Fri, 8 May 2015 15:21:20 +0800
+Subject: [PATCH] mon: remove unused variable
+
+* as a side effect, this change silences
+  http://tracker.ceph.com/issues/11576
+
+Fixes: #11576
+Signed-off-by: Kefu Chai <kchai@redhat.com>
+---
+ src/mon/OSDMonitor.cc | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
+index 73dcd5f..7caaa45 100644
+--- a/src/mon/OSDMonitor.cc
++++ b/src/mon/OSDMonitor.cc
+@@ -3174,8 +3174,6 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
+   } else if (prefix == "osd crush get-tunable") {
+     string tunable;
+     cmd_getval(g_ceph_context, cmdmap, "tunable", tunable);
+-    int value;
+-    cmd_getval(g_ceph_context, cmdmap, "value", value);
+     ostringstream rss;
+     if (f)
+       f->open_object_section("tunable");

From 33ff74ced6faad7fe15b3724c453d8646e10b6e5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 19 Jul 2015 12:04:50 -0700
Subject: [PATCH 2319/2322] libdrm: Remove valgrind as a dependency

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

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 7a30d36e4d7..775a8f92047 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libpthreadstubs libpciaccess valgrind ]
+  buildInputs = [ libpthreadstubs libpciaccess ]
     ++ stdenv.lib.optional stdenv.isLinux udev;
 
   patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   preConfigure = stdenv.lib.optionalString stdenv.isDarwin
     "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
 
-  configureFlags = [ "--enable-freedreno" ]
+  configureFlags = [ "--enable-freedreno" "--disable-valgrind" ]
     ++ stdenv.lib.optional stdenv.isLinux "--enable-udev"
     ++ stdenv.lib.optional stdenv.isDarwin "-C";
 

From 8734f01830613b8d8670e813236df180b40611b1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 19 Jul 2015 12:09:14 -0700
Subject: [PATCH 2320/2322] sudo: 1.8.13 -> 1.8.14p1

---
 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 b6ae48c5d83..69ef5328868 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.13";
+  name = "sudo-1.8.14p1";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "09asw1hpxc39a6hhydr8n33m2pni1b5m37vaj7b00761ybnyax73";
+    sha256 = "1806kxnkjibky8y04s4f9mpj0403v4b6sqdnmyaa98mnq3qwsb5i";
   };
 
   configureFlags = [

From 70a1e7afd8b328fad1712bcb14a940962deaae73 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 19 Jul 2015 12:21:45 -0700
Subject: [PATCH 2321/2322] pam: 1.2.0 -> 1.2.1

Fixes CVE-2015-3238
---
 pkgs/os-specific/linux/pam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 29cfa64b22d..f7cadd469d7 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "linux-pam-${version}";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchurl {
     url = "http://www.linux-pam.org/library/Linux-PAM-${version}.tar.bz2";
-    sha256 = "192y2fgf24a5qsg7rl1mzgw5axs5lg8kqamkfff2x50yjv2ym2yd";
+    sha256 = "1n9lnf9gjs72kbj1g354v1xhi2j27aqaah15vykh7cnkq08i4arl";
   };
 
   nativeBuildInputs = [ flex ];

From d8a8ed12bb255bf891bd3e92611f2feee6f68eab Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sun, 19 Jul 2015 11:42:51 +0100
Subject: [PATCH 2322/2322] canto-{curses,daemon}: 0.9.{3,1} -> 0.9.{4,3}

Close #8884.
A very detailed changelog and discussion can be found here:

http://codezen.org/canto-ng/news/

This change was built locally and tested by me. There will be changes
noticable in the `canto-curses` interface since color support has been
reworked. For more details follow the hint in `canto-curses` or read the
changelog/manual liked to above. There also have been many
under-the-hood improvements which can also be found in the link above.
---
 .../networking/feedreaders/canto-curses/default.nix           | 4 ++--
 .../networking/feedreaders/canto-daemon/default.nix           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
index 0a65f8dd70f..a73cf63e76b 100644
--- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, python34Packages, readline, ncurses, canto-daemon }:
 
 python34Packages.buildPythonPackage rec {
-  version = "0.9.3";
+  version = "0.9.4";
   name = "canto-curses-${version}";
 
   src = fetchFromGitHub {
     owner = "themoken";
     repo = "canto-curses";
     rev = "v${version}";
-    sha256 = "1k3rbniyfdbqhbkclgrrvfjgvfl5if4c2rbgpcb6l2l5v6i1y742";
+    sha256 = "0g1ckcb9xcfb0af17zssiqcrfry87agx578vd40nb6gbw90ql4fn";
   };
 
   buildInputs = [ readline ncurses canto-daemon ];
diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
index bf564dd4327..63fefae9dfe 100644
--- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python34Packages, }:
 
 python34Packages.buildPythonPackage rec {
-  version = "0.9.1";
+  version = "0.9.3";
   name = "canto-daemon-${version}";
   namePrefix = "";
 
@@ -9,7 +9,7 @@ python34Packages.buildPythonPackage rec {
     owner = "themoken";
     repo = "canto-next";
     rev = "v${version}";
-    sha256 = "14lh6x0yz2asspwdi1ims01589r79q0dv77vq61gfjk5wiwfbdwa";
+    sha256 = "1x875qdyhab89nwwa2bzbfvcrkx34zwyy8dlbxm8wg3vz9b78l61";
   };
 
   propagatedBuildInputs = with python34Packages; [ feedparser ];